]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
l10n: zh_CN: Update Git Glossary: SHA-1
[thirdparty/git.git] / po / zh_CN.po
CommitLineData
c04f5ac3
JX
1# Chinese translations for Git package
2# Git 软件包的简体中文翻译.
07432cef 3# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
c04f5ac3 4# This file is distributed under the same license as the Git package.
814ff314 5# Contributors:
c04f5ac3 6# - Jiang Xin <worldhello.net AT gmail.com>
bbdf0acc
JX
7# - Lian Cheng <rhythm.mail AT gmail.com>
8# - Ray Chen <oldsharp AT gmail.com>
c04f5ac3 9# - Riku <lu.riku AT gmail.com>
bbdf0acc
JX
10# - Thynson <lanxingcan AT gmail.com>
11# - ws3389 <willsmith3389 AT gmail.com>
12# - Wang Sheng <wangsheng2008love AT 163.com>
13# - Yichao Yu <yyc1992 AT gmail.com>
c04f5ac3 14# - Zhuang Ya <zhuangya AT me.com>
c04f5ac3 15#
160fb2b2
JX
16# Git glossary for Chinese translators
17#
18# English | Chinese
19# ---------------------------------+--------------------------------------
20# 3-way merge | 三方合并
21# abbreviate | 简写(的 SHA-1 值)
22# alternate object database | 备用对象库
23# amend | 修补
24# ancestor | 祖先,祖先提交
25# annotated tag | 附注标签
26# bare repository | 纯仓库
27# bisect | 二分查找
28# blob object | 数据对象
29# branch | 分支
30# bundle | 包
31# bypass | 绕过
32# cache | 索引(的别称)
33# chain | (提交)链
34# changeset | 变更集
35# checkout | 检出
36# checksum | 校验,校验和
37# cherry-picking | 拣选
38# clean | 干净(的工作区)
39# clone | 克隆
40# commit | 提交
41# commit object | 提交对象
42# commit-ish (also committish) | 提交号
43# conflict | 冲突
44# core Git | 核心 Git 工具
45# DAG | 有向无环图
46# dangling object | 摇摆对象
47# detached HEAD | 分离头指针
48# directory | 目录
49# dirty | 脏(的工作区)
50# dumb HTTP | 哑 HTTP 协议
51# evil merge | 坏合并(合并引入了父提交没有的修改)
52# fast-forward | 快进
53# fetch | 获取
54# file system | 文件系统
55# fork | 派生,复刻
56# Git archive | 仓库(对于 arch 用户)
57# gitfile | gitfile(仓库链接文件)
58# grafts | (提交)嫁接
59# hash | 哈希值
60# HEAD | HEAD(头指针,亦即当前分支)
61# head | 头、分支
62# head ref | 分支
63# header | 头信息
64# hook | 钩子
65# hunk | 补丁片段
66# index | 索引
67# index entry | 索引条目
68# loose object | 松散对象
69# loose refs | 松散引用
70# master | master(默认分支名)
71# merge | 合并
72# object | 对象
73# object database | 对象库
74# object identifier | 对象标识符
75# object name | 对象名称
76# object type | 对象类型
77# octopus | 章鱼式合并(两分支以上的合并)
78# origin | origin(默认的远程名称)
79# pack | 包
80# pack index | 包索引
81# packfile | 包文件
82# parent | 父提交
83# patch | 补丁
84# pathspec | 路径规格
85# pattern | 模式
86# pickaxe | pickaxe
87# plumbing | 管件(Git 底层核心命令的别称)
88# porcelain | 瓷件(Git 上层封装命令的别称)
89# prune | 清除
90# pull | 拉,拉取
91# push | 推,推送
92# reachable | 可达
93# rebase | 变基
94# ref | 引用
95# reflog | 引用日志
96# refspec | 引用规格
97# remote | 远程,远程仓库
98# remote-tracking branch | 远程跟踪分支
99# replay | 重放
100# repo | 仓库
101# repository | 仓库
102# resolve | (冲突)解决
103# revert | 还原
104# revision | 版本
105# rewind | 回退
106# SCM | 源代码管理(工具)
ee7589bb 107# SHA-1 | SHA-1(安全哈希算法1)
160fb2b2
JX
108# shallow repository | 浅(克隆)仓库
109# signed tag | 签名标签
110# smart HTTP | 智能 HTTP 协议
111# squash | 压缩
112# stage | n. 暂存区(即索引); v. 暂存
113# stash | n. 进度保存; v. 保存进度
114# submodule | 子模组
115# symref | 符号引用
116# tag | 标签
117# tag object | 标签对象
118# tagger | 打标签者
119# topic branch | 主题分支
120# track | 跟踪
121# tree | 树(工作区或树对象)
122# tree object | 树对象
123# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
124# unmerged index | 未合并索引
125# unpack | 解包
126# unreachable object | 不可达对象
127# unstage | 取消暂存
128# upstream | 上游
129# upstream branch | 上游分支
130# working tree | 工作区
131#
c04f5ac3
JX
132msgid ""
133msgstr ""
134"Project-Id-Version: Git\n"
135"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
5bb01d4f 136"POT-Creation-Date: 2015-07-14 07:19+0800\n"
160fb2b2 137"PO-Revision-Date: 2015-08-04 00:43+0800\n"
c04f5ac3 138"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
7aea43ff 139"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
c04f5ac3
JX
140"Language: zh_CN\n"
141"MIME-Version: 1.0\n"
142"Content-Type: text/plain; charset=UTF-8\n"
143"Content-Transfer-Encoding: 8bit\n"
5ae481e0 144"Plural-Forms: nplurals=2; plural=(n != 1);\n"
c04f5ac3 145
6c94aba5 146#: advice.c:55
c04f5ac3
JX
147#, c-format
148msgid "hint: %.*s\n"
149msgstr "提示:%.*s\n"
150
6acbf033 151#: advice.c:88
c04f5ac3 152msgid ""
6acbf033 153"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 154"as appropriate to mark resolution and make a commit."
c04f5ac3 155msgstr ""
d9d56b23 156"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
220c313c 157"解决方案并提交。"
c04f5ac3 158
220c313c 159#: archive.c:11
814ff314
JX
160msgid "git archive [<options>] <tree-ish> [<path>...]"
161msgstr "git archive [<选项>] <树或提交> [<路径>...]"
ef317cd5 162
220c313c 163#: archive.c:12
ef317cd5 164msgid "git archive --list"
07432cef 165msgstr "git archive --list"
ef317cd5 166
220c313c 167#: archive.c:13
ef317cd5 168msgid ""
814ff314 169"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
ef317cd5 170msgstr ""
160fb2b2 171"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
ef317cd5 172
220c313c 173#: archive.c:14
ef317cd5 174msgid "git archive --remote <repo> [--exec <cmd>] --list"
160fb2b2 175msgstr "git archive --remote <仓库> [--exec <命令>] --list"
ef317cd5 176
7aea43ff 177#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327
90314792
JX
178#, c-format
179msgid "pathspec '%s' did not match any files"
160fb2b2 180msgstr "路径规格 '%s' 未匹配任何文件"
90314792 181
04cb2f28 182#: archive.c:427
ef317cd5 183msgid "fmt"
07432cef 184msgstr "格式"
ef317cd5 185
04cb2f28 186#: archive.c:427
ef317cd5 187msgid "archive format"
07432cef 188msgstr "归档格式"
ef317cd5 189
04cb2f28 190#: archive.c:428 builtin/log.c:1204
ef317cd5 191msgid "prefix"
07432cef 192msgstr "前缀"
ef317cd5 193
04cb2f28 194#: archive.c:429
ef317cd5 195msgid "prepend prefix to each pathname in the archive"
07432cef 196msgstr "为归档中每个路径名加上前缀"
ef317cd5 197
814ff314
JX
198#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516
199#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986
7aea43ff 200#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99
814ff314 201#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394
7aea43ff 202#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150
ef317cd5
JX
203msgid "file"
204msgstr "文件"
205
04cb2f28 206#: archive.c:431 builtin/archive.c:89
ef317cd5 207msgid "write the archive to this file"
07432cef 208msgstr "归档写入此文件"
ef317cd5 209
04cb2f28 210#: archive.c:433
ef317cd5 211msgid "read .gitattributes in working directory"
07432cef 212msgstr "读取工作区中的 .gitattributes"
ef317cd5 213
04cb2f28 214#: archive.c:434
ef317cd5 215msgid "report archived files on stderr"
07432cef 216msgstr "在标准错误上报告归档文件"
ef317cd5 217
04cb2f28 218#: archive.c:435
ef317cd5 219msgid "store only"
07432cef 220msgstr "只存储"
ef317cd5 221
04cb2f28 222#: archive.c:436
ef317cd5 223msgid "compress faster"
07432cef 224msgstr "压缩速度更快"
ef317cd5 225
04cb2f28 226#: archive.c:444
ef317cd5 227msgid "compress better"
07432cef 228msgstr "压缩效果更好"
ef317cd5 229
04cb2f28 230#: archive.c:447
ef317cd5 231msgid "list supported archive formats"
07432cef 232msgstr "列出支持的归档格式"
ef317cd5 233
7aea43ff 234#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77
ef317cd5 235msgid "repo"
160fb2b2 236msgstr "仓库"
ef317cd5 237
04cb2f28 238#: archive.c:450 builtin/archive.c:91
ef317cd5 239msgid "retrieve the archive from remote repository <repo>"
160fb2b2 240msgstr "从远程仓库(<仓库>)提取归档文件"
ef317cd5 241
04cb2f28 242#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
ef317cd5 243msgid "command"
07432cef 244msgstr "命令"
ef317cd5 245
04cb2f28 246#: archive.c:452 builtin/archive.c:93
ef317cd5 247msgid "path to the remote git-upload-archive command"
07432cef
WS
248msgstr "远程 git-upload-archive 命令的路径"
249
7aea43ff 250#: attr.c:265
07432cef 251msgid ""
a7409dfb 252"Negative patterns are ignored in git attributes\n"
07432cef 253"Use '\\!' for literal leading exclamation."
ef317cd5 254msgstr ""
a7409dfb 255"负值模版在 git attributes 中被忽略\n"
07432cef 256"当字符串确实要以感叹号开始时,使用 '\\!'。"
ef317cd5 257
4dcdc3d8
JX
258#: branch.c:60
259#, c-format
260msgid "Not setting branch %s as its own upstream."
261msgstr "未设置分支 %s 作为它自己的上游。"
262
6c94aba5 263#: branch.c:83
4dcdc3d8
JX
264#, c-format
265msgid "Branch %s set up to track remote branch %s from %s by rebasing."
266msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
267
6c94aba5 268#: branch.c:84
4dcdc3d8
JX
269#, c-format
270msgid "Branch %s set up to track remote branch %s from %s."
271msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
272
6c94aba5 273#: branch.c:88
4dcdc3d8
JX
274#, c-format
275msgid "Branch %s set up to track local branch %s by rebasing."
276msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
277
6c94aba5 278#: branch.c:89
4dcdc3d8
JX
279#, c-format
280msgid "Branch %s set up to track local branch %s."
281msgstr "分支 %s 设置为跟踪本地分支 %s。"
282
6c94aba5 283#: branch.c:94
4dcdc3d8
JX
284#, c-format
285msgid "Branch %s set up to track remote ref %s by rebasing."
286msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
287
6c94aba5 288#: branch.c:95
4dcdc3d8
JX
289#, c-format
290msgid "Branch %s set up to track remote ref %s."
291msgstr "分支 %s 设置为跟踪远程引用 %s。"
292
6c94aba5 293#: branch.c:99
4dcdc3d8
JX
294#, c-format
295msgid "Branch %s set up to track local ref %s by rebasing."
296msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
297
6c94aba5 298#: branch.c:100
4dcdc3d8
JX
299#, c-format
300msgid "Branch %s set up to track local ref %s."
301msgstr "分支 %s 设置为跟踪本地引用 %s。"
302
6c94aba5 303#: branch.c:133
4dcdc3d8
JX
304#, c-format
305msgid "Not tracking: ambiguous information for ref %s"
306msgstr "未跟踪:引用 %s 有歧义"
307
220c313c 308#: branch.c:162
4dcdc3d8
JX
309#, c-format
310msgid "'%s' is not a valid branch name."
311msgstr "'%s' 不是一个有效的分支名称。"
312
220c313c 313#: branch.c:167
4dcdc3d8
JX
314#, c-format
315msgid "A branch named '%s' already exists."
316msgstr "一个分支名 '%s' 已经存在。"
317
220c313c 318#: branch.c:175
4dcdc3d8
JX
319msgid "Cannot force update the current branch."
320msgstr "无法强制更新当前分支。"
321
220c313c 322#: branch.c:195
1003b3a5
JX
323#, c-format
324msgid "Cannot setup tracking information; starting point '%s' is not a branch."
325msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
326
220c313c 327#: branch.c:197
1003b3a5
JX
328#, c-format
329msgid "the requested upstream branch '%s' does not exist"
330msgstr "请求的上游分支 '%s' 不存在"
331
220c313c 332#: branch.c:199
1003b3a5
JX
333msgid ""
334"\n"
335"If you are planning on basing your work on an upstream\n"
336"branch that already exists at the remote, you may need to\n"
337"run \"git fetch\" to retrieve it.\n"
338"\n"
339"If you are planning to push out a new local branch that\n"
340"will track its remote counterpart, you may want to use\n"
341"\"git push -u\" to set the upstream config as you push."
342msgstr ""
343"\n"
344"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
345"您可能需要执行 \"git fetch\" 来获取分支。\n"
346"\n"
347"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
348"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
349
220c313c 350#: branch.c:243
4dcdc3d8
JX
351#, c-format
352msgid "Not a valid object name: '%s'."
353msgstr "不是一个有效的对象名:'%s'。"
354
220c313c 355#: branch.c:263
4dcdc3d8
JX
356#, c-format
357msgid "Ambiguous object name: '%s'."
358msgstr "歧义的对象名:'%s'。"
359
220c313c 360#: branch.c:268
4dcdc3d8
JX
361#, c-format
362msgid "Not a valid branch point: '%s'."
363msgstr "无效的分支点:'%s'。"
364
220c313c 365#: bundle.c:34
8ada9598
JX
366#, c-format
367msgid "'%s' does not look like a v2 bundle file"
81809b99 368msgstr "'%s' 不像是一个 v2 版本的包文件"
8ada9598 369
220c313c 370#: bundle.c:61
81809b99 371#, c-format
8ada9598 372msgid "unrecognized header: %s%s (%d)"
81809b99 373msgstr "未能识别的包头:%s%s (%d)"
8ada9598 374
44f518e6 375#: bundle.c:87 builtin/commit.c:766
8ada9598
JX
376#, c-format
377msgid "could not open '%s'"
378msgstr "不能打开 '%s'"
379
220c313c 380#: bundle.c:139
8ada9598 381msgid "Repository lacks these prerequisite commits:"
160fb2b2 382msgstr "仓库中缺少这些必备的提交:"
8ada9598 383
814ff314 384#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
7aea43ff
JX
385#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330
386#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358
90314792 387#: builtin/shortlog.c:158
8ada9598
JX
388msgid "revision walk setup failed"
389msgstr "版本遍历设置失败"
390
220c313c 391#: bundle.c:185
8ada9598 392#, c-format
1003b3a5
JX
393msgid "The bundle contains this ref:"
394msgid_plural "The bundle contains these %d refs:"
395msgstr[0] "这个包中含有这个引用:"
396msgstr[1] "这个包中含有 %d 个引用:"
8ada9598 397
220c313c 398#: bundle.c:192
6792b93b
JX
399msgid "The bundle records a complete history."
400msgstr "这个包记录一个完整历史。"
401
220c313c 402#: bundle.c:194
8ada9598 403#, c-format
1003b3a5
JX
404msgid "The bundle requires this ref:"
405msgid_plural "The bundle requires these %d refs:"
406msgstr[0] "这个包需要这个引用:"
407msgstr[1] "这个包需要 %d 个引用:"
8ada9598 408
9aeb4c2b
JX
409#: bundle.c:251
410msgid "Could not spawn pack-objects"
411msgstr "不能生成 pack-objects 进程"
412
413#: bundle.c:269
414msgid "pack-objects died"
415msgstr "pack-objects 终止"
416
417#: bundle.c:309
8ada9598 418msgid "rev-list died"
81809b99 419msgstr "rev-list 终止"
8ada9598 420
9aeb4c2b 421#: bundle.c:358
8ada9598
JX
422#, c-format
423msgid "ref '%s' is excluded by the rev-list options"
81809b99 424msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 425
814ff314 426#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
9aeb4c2b
JX
427#, c-format
428msgid "unrecognized argument: %s"
429msgstr "未能识别的参数:%s"
430
814ff314 431#: bundle.c:443
8ada9598 432msgid "Refusing to create empty bundle."
81809b99 433msgstr "不能创建空包。"
8ada9598 434
814ff314 435#: bundle.c:453
81809b99 436#, c-format
8ada9598 437msgid "cannot create '%s'"
81809b99 438msgstr "不能创建 '%s'"
8ada9598 439
814ff314 440#: bundle.c:474
8ada9598 441msgid "index-pack died"
81809b99 442msgstr "index-pack 终止"
8ada9598 443
1e607449 444#: color.c:260
220c313c
JX
445#, c-format
446msgid "invalid color value: %.*s"
447msgstr "无效的颜色值:%.*s"
448
6acbf033 449#: commit.c:40
c04f5ac3
JX
450#, c-format
451msgid "could not parse %s"
452msgstr "不能解析 %s"
453
6acbf033 454#: commit.c:42
c04f5ac3
JX
455#, c-format
456msgid "%s %s is not a commit!"
457msgstr "%s %s 不是一个提交!"
458
459#: compat/obstack.c:406 compat/obstack.c:408
460msgid "memory exhausted"
461msgstr "内存耗尽"
462
814ff314 463#: config.c:474 config.c:476
220c313c
JX
464#, c-format
465msgid "bad config file line %d in %s"
466msgstr "配置文件 %2$s 出错于第 %1$d 行"
467
814ff314 468#: config.c:592
220c313c
JX
469#, c-format
470msgid "bad numeric config value '%s' for '%s' in %s: %s"
471msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
472
814ff314 473#: config.c:594
220c313c
JX
474#, c-format
475msgid "bad numeric config value '%s' for '%s': %s"
476msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
477
814ff314 478#: config.c:679
220c313c
JX
479#, c-format
480msgid "failed to expand user dir in: '%s'"
481msgstr "无法扩展 '%s' 中的用户目录"
482
814ff314 483#: config.c:757 config.c:768
220c313c
JX
484#, c-format
485msgid "bad zlib compression level %d"
486msgstr "错误的 zlib 压缩级别 %d"
487
814ff314 488#: config.c:890
220c313c
JX
489#, c-format
490msgid "invalid mode for object creation: %s"
491msgstr "无效的对象创建模式:%s"
492
814ff314 493#: config.c:1216
220c313c
JX
494msgid "unable to parse command-line config"
495msgstr "无法解析命令行中的配置"
496
814ff314 497#: config.c:1277
220c313c
JX
498msgid "unknown error occured while reading the configuration files"
499msgstr "在读取配置文件时遇到未知错误"
500
814ff314 501#: config.c:1601
220c313c
JX
502#, c-format
503msgid "unable to parse '%s' from command-line config"
504msgstr "无法解析命令行配置中的 '%s'"
505
814ff314 506#: config.c:1603
220c313c
JX
507#, c-format
508msgid "bad config variable '%s' in file '%s' at line %d"
509msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
510
814ff314 511#: config.c:1662
220c313c
JX
512#, c-format
513msgid "%s has multiple values"
514msgstr "%s 有多个取值"
515
516#: connected.c:69
c04f5ac3
JX
517msgid "Could not run 'git rev-list'"
518msgstr "不能执行 'git rev-list'"
519
220c313c 520#: connected.c:89
c04f5ac3
JX
521#, c-format
522msgid "failed write to rev-list: %s"
523msgstr "无法写入 rev-list:%s"
524
220c313c 525#: connected.c:97
c04f5ac3
JX
526#, c-format
527msgid "failed to close rev-list's stdin: %s"
528msgstr "无法关闭 rev-list 的标准输入:%s"
529
8ada9598
JX
530#: date.c:95
531msgid "in the future"
81809b99 532msgstr "在将来"
8ada9598
JX
533
534#: date.c:101
535#, c-format
536msgid "%lu second ago"
537msgid_plural "%lu seconds ago"
6c94aba5
JX
538msgstr[0] "%lu 秒钟前"
539msgstr[1] "%lu 秒钟前"
8ada9598
JX
540
541#: date.c:108
542#, c-format
543msgid "%lu minute ago"
544msgid_plural "%lu minutes ago"
6c94aba5
JX
545msgstr[0] "%lu 分钟前"
546msgstr[1] "%lu 分钟前"
8ada9598
JX
547
548#: date.c:115
549#, c-format
550msgid "%lu hour ago"
551msgid_plural "%lu hours ago"
6c94aba5
JX
552msgstr[0] "%lu 小时前"
553msgstr[1] "%lu 小时前"
8ada9598
JX
554
555#: date.c:122
556#, c-format
557msgid "%lu day ago"
558msgid_plural "%lu days ago"
6c94aba5
JX
559msgstr[0] "%lu 天前"
560msgstr[1] "%lu 天前"
8ada9598
JX
561
562#: date.c:128
563#, c-format
564msgid "%lu week ago"
565msgid_plural "%lu weeks ago"
6c94aba5
JX
566msgstr[0] "%lu 周前"
567msgstr[1] "%lu 周前"
8ada9598
JX
568
569#: date.c:135
570#, c-format
571msgid "%lu month ago"
572msgid_plural "%lu months ago"
6c94aba5
JX
573msgstr[0] "%lu 个月前"
574msgstr[1] "%lu 个月前"
8ada9598
JX
575
576#: date.c:146
577#, c-format
578msgid "%lu year"
579msgid_plural "%lu years"
81809b99 580msgstr[0] "%lu 年"
5ae481e0 581msgstr[1] "%lu 年"
8ada9598 582
6c94aba5 583#. TRANSLATORS: "%s" is "<n> years"
8ada9598
JX
584#: date.c:149
585#, c-format
586msgid "%s, %lu month ago"
587msgid_plural "%s, %lu months ago"
6c94aba5
JX
588msgstr[0] "%s %lu 个月前"
589msgstr[1] "%s %lu 个月前"
8ada9598
JX
590
591#: date.c:154 date.c:159
592#, c-format
593msgid "%lu year ago"
594msgid_plural "%lu years ago"
81809b99 595msgstr[0] "%lu 年前"
5ae481e0 596msgstr[1] "%lu 年前"
8ada9598 597
cfff71a9
JX
598#: diffcore-order.c:24
599#, c-format
600msgid "failed to read orderfile '%s'"
601msgstr "无法读取排序文件 '%s'"
602
814ff314 603#: diffcore-rename.c:536
6c94aba5
JX
604msgid "Performing inexact rename detection"
605msgstr "正在进行非精确的重命名检测"
606
90e6ef53 607# 译者:注意保持前导空格
6acbf033 608#: diff.c:114
c04f5ac3 609#, c-format
07432cef
WS
610msgid " Failed to parse dirstat cut-off percentage '%s'\n"
611msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
c04f5ac3 612
90e6ef53 613# 译者:注意保持前导空格
6acbf033 614#: diff.c:119
c04f5ac3 615#, c-format
07432cef
WS
616msgid " Unknown dirstat parameter '%s'\n"
617msgstr " 未知的 dirstat 参数 '%s'\n"
c04f5ac3 618
6acbf033 619#: diff.c:214
07432cef
WS
620#, c-format
621msgid "Unknown value for 'diff.submodule' config variable: '%s'"
622msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
623
220c313c 624#: diff.c:266
c04f5ac3
JX
625#, c-format
626msgid ""
627"Found errors in 'diff.dirstat' config variable:\n"
628"%s"
629msgstr ""
90e6ef53 630"发现配置变量 'diff.dirstat' 中的错误:\n"
c04f5ac3
JX
631"%s"
632
7aea43ff 633#: diff.c:2997
6acbf033
JX
634#, c-format
635msgid "external diff died, stopping at %s"
636msgstr "外部 diff 退出,停止在 %s"
637
7aea43ff 638#: diff.c:3393
6acbf033
JX
639msgid "--follow requires exactly one pathspec"
640msgstr "--follow 参数后只跟一个 pathspec"
641
7aea43ff 642#: diff.c:3556
c04f5ac3
JX
643#, c-format
644msgid ""
645"Failed to parse --dirstat/-X option parameter:\n"
646"%s"
647msgstr ""
648"无法解析 --dirstat/-X 选项的参数:\n"
649"%s"
650
7aea43ff 651#: diff.c:3570
07432cef
WS
652#, c-format
653msgid "Failed to parse --submodule option parameter: '%s'"
654msgstr "无法解析 --submodule 选项的参数:'%s'"
655
7aea43ff
JX
656#: dir.c:1852
657msgid "failed to get kernel name and information"
658msgstr "无法获得内核名称和信息"
659
660#: dir.c:1945
661msgid "Untracked cache is disabled on this system."
662msgstr "缓存未跟踪文件在本系统被禁用"
663
220c313c 664#: gpg-interface.c:129 gpg-interface.c:200
c04f5ac3
JX
665msgid "could not run gpg."
666msgstr "不能执行 gpg。"
667
220c313c 668#: gpg-interface.c:141
c04f5ac3
JX
669msgid "gpg did not accept the data"
670msgstr "gpg 没有接受数据"
671
220c313c 672#: gpg-interface.c:152
c04f5ac3
JX
673msgid "gpg failed to sign the data"
674msgstr "gpg 无法为数据签名"
675
220c313c 676#: gpg-interface.c:185
a77c07d9
JX
677#, c-format
678msgid "could not create temporary file '%s': %s"
679msgstr "不能创建临时文件 '%s':%s"
680
220c313c 681#: gpg-interface.c:188
a77c07d9
JX
682#, c-format
683msgid "failed writing detached signature to '%s': %s"
684msgstr "无法将分离式签名写入 '%s':%s"
685
220c313c 686#: grep.c:1718
7ac1c0ad
JX
687#, c-format
688msgid "'%s': unable to read %s"
689msgstr "'%s':无法读取 %s"
690
220c313c 691#: grep.c:1735
7ac1c0ad
JX
692#, c-format
693msgid "'%s': %s"
694msgstr "'%s':%s"
695
220c313c 696#: grep.c:1746
7ac1c0ad
JX
697#, c-format
698msgid "'%s': short read %s"
699msgstr "'%s':读取不完整 %s"
700
6acbf033 701#: help.c:207
81809b99 702#, c-format
8ada9598 703msgid "available git commands in '%s'"
81809b99 704msgstr "在 '%s' 下可用的 git 命令"
8ada9598 705
6acbf033 706#: help.c:214
8ada9598 707msgid "git commands available from elsewhere on your $PATH"
81809b99 708msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
8ada9598 709
7aea43ff
JX
710#: help.c:246
711msgid "These are common Git commands used in various situations:"
712msgstr "这些是各种场合常见的 Git 命令:"
a77c07d9 713
7aea43ff 714#: help.c:311
c04f5ac3
JX
715#, c-format
716msgid ""
717"'%s' appears to be a git command, but we were not\n"
718"able to execute it. Maybe git-%s is broken?"
719msgstr ""
720"'%s' 像是一个 git 命令,但却无法运行。\n"
721"可能是 git-%s 受损?"
722
7aea43ff 723#: help.c:368
8ada9598 724msgid "Uh oh. Your system reports no Git commands at all."
81809b99 725msgstr "唉呀,您的系统中未发现 Git 命令。"
8ada9598 726
7aea43ff 727#: help.c:390
8ada9598
JX
728#, c-format
729msgid ""
730"WARNING: You called a Git command named '%s', which does not exist.\n"
731"Continuing under the assumption that you meant '%s'"
732msgstr ""
81809b99
JX
733"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
734"是 '%s'"
8ada9598 735
7aea43ff 736#: help.c:395
8ada9598
JX
737#, c-format
738msgid "in %0.1f seconds automatically..."
81809b99 739msgstr "在 %0.1f 秒钟后自动运行..."
8ada9598 740
7aea43ff 741#: help.c:402
8ada9598
JX
742#, c-format
743msgid "git: '%s' is not a git command. See 'git --help'."
81809b99 744msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
8ada9598 745
7aea43ff 746#: help.c:406 help.c:466
8ada9598
JX
747msgid ""
748"\n"
749"Did you mean this?"
750msgid_plural ""
751"\n"
752"Did you mean one of these?"
753msgstr[0] ""
81809b99
JX
754"\n"
755"您指的是这个么?"
756msgstr[1] ""
757"\n"
195febda 758"您指的是这其中的某一个么?"
8ada9598 759
7aea43ff 760#: help.c:462
2e8451e8
JX
761#, c-format
762msgid "%s: %s - %s"
763msgstr "%s:%s - %s"
764
7aea43ff 765#: lockfile.c:345
220c313c
JX
766msgid "BUG: reopen a lockfile that is still open"
767msgstr "BUG: 重新打开一个仍打开着的锁文件"
768
7aea43ff 769#: lockfile.c:347
220c313c
JX
770msgid "BUG: reopen a lockfile that has been committed"
771msgstr "BUG: 重新打开一个已提交的锁文件"
772
773#: merge.c:41
07432cef
WS
774msgid "failed to read the cache"
775msgstr "无法读取缓存"
776
5bb01d4f
JX
777#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
778#: builtin/clone.c:647
07432cef
WS
779msgid "unable to write new index file"
780msgstr "无法写新的索引文件"
781
220c313c 782#: merge-recursive.c:189
649900bc
JX
783#, c-format
784msgid "(bad commit)\n"
785msgstr "(坏提交)\n"
786
220c313c 787#: merge-recursive.c:209
649900bc
JX
788#, c-format
789msgid "addinfo_cache failed for path '%s'"
790msgstr "为路径 '%s' addinfo_cache 失败"
791
220c313c 792#: merge-recursive.c:270
649900bc
JX
793msgid "error building trees"
794msgstr "无法创建树"
795
7aea43ff 796#: merge-recursive.c:687
649900bc
JX
797#, c-format
798msgid "failed to create path '%s'%s"
799msgstr "无法创建路径 '%s'%s"
800
7aea43ff 801#: merge-recursive.c:698
649900bc
JX
802#, c-format
803msgid "Removing %s to make room for subdirectory\n"
804msgstr "删除 %s 以便为子目录留出空间\n"
805
7aea43ff 806#: merge-recursive.c:712 merge-recursive.c:733
649900bc
JX
807msgid ": perhaps a D/F conflict?"
808msgstr ":可能是一个目录/文件冲突?"
809
7aea43ff 810#: merge-recursive.c:723
649900bc
JX
811#, c-format
812msgid "refusing to lose untracked file at '%s'"
813msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
814
7aea43ff 815#: merge-recursive.c:763
649900bc
JX
816#, c-format
817msgid "cannot read object %s '%s'"
818msgstr "不能读取对象 %s '%s'"
819
7aea43ff 820#: merge-recursive.c:765
649900bc
JX
821#, c-format
822msgid "blob expected for %s '%s'"
160fb2b2 823msgstr "%s '%s' 应为数据对象"
649900bc 824
5bb01d4f 825#: merge-recursive.c:788 builtin/clone.c:306
649900bc
JX
826#, c-format
827msgid "failed to open '%s'"
828msgstr "无法打开 '%s'"
829
7aea43ff 830#: merge-recursive.c:796
649900bc
JX
831#, c-format
832msgid "failed to symlink '%s'"
833msgstr "无法创建符号链接 '%s'"
834
7aea43ff 835#: merge-recursive.c:799
649900bc
JX
836#, c-format
837msgid "do not know what to do with %06o %s '%s'"
838msgstr "不知道如何处理 %06o %s '%s'"
839
7aea43ff 840#: merge-recursive.c:937
649900bc
JX
841msgid "Failed to execute internal merge"
842msgstr "无法执行内部合并"
843
7aea43ff 844#: merge-recursive.c:941
649900bc
JX
845#, c-format
846msgid "Unable to add %s to database"
847msgstr "不能添加 %s 至对象库"
848
7aea43ff 849#: merge-recursive.c:957
649900bc
JX
850msgid "unsupported object type in the tree"
851msgstr "在树中有不支持的对象类型"
852
7aea43ff 853#: merge-recursive.c:1032 merge-recursive.c:1046
649900bc
JX
854#, c-format
855msgid ""
856"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
857"in tree."
858msgstr ""
859"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
860"的版本被保留。"
861
7aea43ff 862#: merge-recursive.c:1038 merge-recursive.c:1051
649900bc
JX
863#, c-format
864msgid ""
865"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
866"in tree at %s."
867msgstr ""
868"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
869"的版本保留于 %8$s 中。"
870
7aea43ff 871#: merge-recursive.c:1092
649900bc
JX
872msgid "rename"
873msgstr "重命名"
874
7aea43ff 875#: merge-recursive.c:1092
649900bc
JX
876msgid "renamed"
877msgstr "重命名"
878
7aea43ff 879#: merge-recursive.c:1148
649900bc
JX
880#, c-format
881msgid "%s is a directory in %s adding as %s instead"
882msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
883
7aea43ff 884#: merge-recursive.c:1170
649900bc
JX
885#, c-format
886msgid ""
887"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
888"\"->\"%s\" in \"%s\"%s"
889msgstr ""
890"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
891"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
892
7aea43ff 893#: merge-recursive.c:1175
649900bc
JX
894msgid " (left unresolved)"
895msgstr "(留下未解决)"
896
7aea43ff 897#: merge-recursive.c:1229
649900bc
JX
898#, c-format
899msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
900msgstr ""
901"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
902"%5$s"
903
7aea43ff 904#: merge-recursive.c:1259
649900bc
JX
905#, c-format
906msgid "Renaming %s to %s and %s to %s instead"
07432cef 907msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
649900bc 908
7aea43ff 909#: merge-recursive.c:1458
649900bc
JX
910#, c-format
911msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
912msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
913
7aea43ff 914#: merge-recursive.c:1468
649900bc
JX
915#, c-format
916msgid "Adding merged %s"
917msgstr "添加合并后的 %s"
918
7aea43ff 919#: merge-recursive.c:1473 merge-recursive.c:1671
649900bc
JX
920#, c-format
921msgid "Adding as %s instead"
922msgstr "而是以 %s 为名添加"
923
7aea43ff 924#: merge-recursive.c:1524
649900bc
JX
925#, c-format
926msgid "cannot read object %s"
927msgstr "不能读取对象 %s"
928
7aea43ff 929#: merge-recursive.c:1527
649900bc
JX
930#, c-format
931msgid "object %s is not a blob"
160fb2b2 932msgstr "对象 %s 不是一个数据对象"
649900bc 933
7aea43ff 934#: merge-recursive.c:1575
649900bc
JX
935msgid "modify"
936msgstr "修改"
937
7aea43ff 938#: merge-recursive.c:1575
649900bc
JX
939msgid "modified"
940msgstr "修改"
941
7aea43ff 942#: merge-recursive.c:1585
649900bc
JX
943msgid "content"
944msgstr "内容"
945
7aea43ff 946#: merge-recursive.c:1592
649900bc
JX
947msgid "add/add"
948msgstr "添加/添加"
949
7aea43ff 950#: merge-recursive.c:1626
649900bc
JX
951#, c-format
952msgid "Skipped %s (merged same as existing)"
953msgstr "略过 %s(已经做过相同合并)"
954
7aea43ff 955#: merge-recursive.c:1640
649900bc
JX
956#, c-format
957msgid "Auto-merging %s"
958msgstr "自动合并 %s"
959
7aea43ff 960#: merge-recursive.c:1644 git-submodule.sh:1150
649900bc
JX
961msgid "submodule"
962msgstr "子模组"
963
7aea43ff 964#: merge-recursive.c:1645
649900bc
JX
965#, c-format
966msgid "CONFLICT (%s): Merge conflict in %s"
967msgstr "冲突(%s):合并冲突于 %s"
968
7aea43ff 969#: merge-recursive.c:1731
649900bc
JX
970#, c-format
971msgid "Removing %s"
972msgstr "删除 %s"
973
7aea43ff 974#: merge-recursive.c:1756
649900bc
JX
975msgid "file/directory"
976msgstr "文件/目录"
977
7aea43ff 978#: merge-recursive.c:1762
649900bc
JX
979msgid "directory/file"
980msgstr "目录/文件"
981
7aea43ff 982#: merge-recursive.c:1767
649900bc
JX
983#, c-format
984msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
985msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
986
7aea43ff 987#: merge-recursive.c:1777
649900bc
JX
988#, c-format
989msgid "Adding %s"
990msgstr "添加 %s"
991
7aea43ff 992#: merge-recursive.c:1794
649900bc
JX
993msgid "Fatal merge failure, shouldn't happen."
994msgstr "严重的合并错误,不应发生。"
995
7aea43ff 996#: merge-recursive.c:1813
649900bc
JX
997msgid "Already up-to-date!"
998msgstr "已经是最新的!"
999
7aea43ff 1000#: merge-recursive.c:1822
649900bc
JX
1001#, c-format
1002msgid "merging of trees %s and %s failed"
1003msgstr "无法合并树 %s 和 %s"
1004
7aea43ff 1005#: merge-recursive.c:1852
649900bc
JX
1006#, c-format
1007msgid "Unprocessed path??? %s"
1008msgstr "未处理的路径??? %s"
1009
7aea43ff 1010#: merge-recursive.c:1900
649900bc
JX
1011msgid "Merging:"
1012msgstr "合并:"
1013
7aea43ff 1014#: merge-recursive.c:1913
649900bc 1015#, c-format
e5e38ce4
JX
1016msgid "found %u common ancestor:"
1017msgid_plural "found %u common ancestors:"
1018msgstr[0] "发现 %u 个共同祖先:"
1019msgstr[1] "发现 %u 个共同祖先:"
649900bc 1020
7aea43ff 1021#: merge-recursive.c:1950
649900bc
JX
1022msgid "merge returned no commit"
1023msgstr "合并未返回提交"
1024
7aea43ff 1025#: merge-recursive.c:2007
649900bc
JX
1026#, c-format
1027msgid "Could not parse object '%s'"
1028msgstr "不能解析对象 '%s'"
1029
7aea43ff 1030#: merge-recursive.c:2018 builtin/merge.c:645
649900bc
JX
1031msgid "Unable to write index."
1032msgstr "不能写入索引。"
1033
6acbf033 1034#: notes-utils.c:41
2e8451e8
JX
1035msgid "Cannot commit uninitialized/unreferenced notes tree"
1036msgstr "不能提交未初始化/未引用的注解树"
1037
04cb2f28 1038#: notes-utils.c:82
2e8451e8
JX
1039#, c-format
1040msgid "Bad notes.rewriteMode value: '%s'"
1041msgstr "坏的 notes.rewriteMode 值:'%s'"
1042
04cb2f28 1043#: notes-utils.c:92
2e8451e8
JX
1044#, c-format
1045msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1046msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
1047
1048#. TRANSLATORS: The first %s is the name of the
1049#. environment variable, the second %s is its value
04cb2f28 1050#: notes-utils.c:119
2e8451e8
JX
1051#, c-format
1052msgid "Bad %s value: '%s'"
1053msgstr "坏的 %s 值:'%s'"
1054
7aea43ff 1055#: object.c:242
1003b3a5
JX
1056#, c-format
1057msgid "unable to parse object: %s"
1058msgstr "不能解析对象:%s"
1059
220c313c 1060#: parse-options.c:546
8ada9598 1061msgid "..."
81809b99 1062msgstr "..."
8ada9598 1063
220c313c 1064#: parse-options.c:564
81809b99 1065#, c-format
8ada9598 1066msgid "usage: %s"
81809b99 1067msgstr "用法:%s"
8ada9598
JX
1068
1069#. TRANSLATORS: the colon here should align with the
1070#. one in "usage: %s" translation
220c313c 1071#: parse-options.c:568
81809b99 1072#, c-format
8ada9598 1073msgid " or: %s"
81809b99 1074msgstr " 或:%s"
8ada9598
JX
1075
1076# 译者:为保证在输出中对齐,注意调整句中空格!
220c313c 1077#: parse-options.c:571
81809b99 1078#, c-format
8ada9598 1079msgid " %s"
81809b99 1080msgstr " %s"
8ada9598 1081
220c313c 1082#: parse-options.c:605
63af42fe
JX
1083msgid "-NUM"
1084msgstr "-数字"
1085
cfff71a9 1086#: pathspec.c:133
90314792 1087msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
160fb2b2 1088msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
90314792 1089
cfff71a9 1090#: pathspec.c:143
90314792
JX
1091msgid ""
1092"global 'literal' pathspec setting is incompatible with all other global "
1093"pathspec settings"
160fb2b2 1094msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
90314792 1095
cfff71a9 1096#: pathspec.c:177
90314792 1097msgid "invalid parameter for pathspec magic 'prefix'"
160fb2b2 1098msgstr "路径规格包含无效的神奇前缀"
90314792 1099
cfff71a9 1100#: pathspec.c:183
90314792
JX
1101#, c-format
1102msgid "Invalid pathspec magic '%.*s' in '%s'"
160fb2b2 1103msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
90314792 1104
cfff71a9 1105#: pathspec.c:187
90314792
JX
1106#, c-format
1107msgid "Missing ')' at the end of pathspec magic in '%s'"
160fb2b2 1108msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
90314792 1109
cfff71a9 1110#: pathspec.c:205
90314792
JX
1111#, c-format
1112msgid "Unimplemented pathspec magic '%c' in '%s'"
160fb2b2 1113msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
90314792 1114
cfff71a9 1115#: pathspec.c:230
a77c07d9 1116#, c-format
90314792
JX
1117msgid "%s: 'literal' and 'glob' are incompatible"
1118msgstr "%s:'literal' 和 'glob' 不兼容"
a77c07d9 1119
cfff71a9 1120#: pathspec.c:241
a77c07d9 1121#, c-format
90314792 1122msgid "%s: '%s' is outside repository"
160fb2b2 1123msgstr "%s:'%s' 在仓库之外"
a77c07d9 1124
cfff71a9 1125#: pathspec.c:291
90314792
JX
1126#, c-format
1127msgid "Pathspec '%s' is in submodule '%.*s'"
160fb2b2 1128msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
90314792 1129
cfff71a9 1130#: pathspec.c:353
90314792
JX
1131#, c-format
1132msgid "%s: pathspec magic not supported by this command: %s"
160fb2b2 1133msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
90314792 1134
6acbf033 1135#: pathspec.c:432
90314792
JX
1136#, c-format
1137msgid "pathspec '%s' is beyond a symbolic link"
160fb2b2 1138msgstr "路径规格 '%s' 位于符号链接中"
90314792 1139
6acbf033 1140#: pathspec.c:441
cfff71a9
JX
1141msgid ""
1142"There is nothing to exclude from by :(exclude) patterns.\n"
1143"Perhaps you forgot to add either ':/' or '.' ?"
1144msgstr ""
1145"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1146"添加 ':/' 或 '.' ?"
1147
220c313c
JX
1148#: pretty.c:968
1149msgid "unable to parse --pretty format"
1150msgstr "不能解析 --pretty 格式"
1151
7aea43ff 1152#: progress.c:236
6c94aba5
JX
1153msgid "done"
1154msgstr "完成"
1155
7aea43ff 1156#: read-cache.c:1295
6c94aba5
JX
1157#, c-format
1158msgid ""
1159"index.version set, but the value is invalid.\n"
1160"Using version %i"
1161msgstr ""
1162"设置了 index.version,但是取值无效。\n"
1163"使用版本 %i"
1164
7aea43ff 1165#: read-cache.c:1305
6c94aba5
JX
1166#, c-format
1167msgid ""
1168"GIT_INDEX_VERSION set, but the value is invalid.\n"
1169"Using version %i"
1170msgstr ""
1171"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1172"使用版本 %i"
1173
7aea43ff 1174#: remote.c:792
cfff71a9
JX
1175#, c-format
1176msgid "Cannot fetch both %s and %s to %s"
1177msgstr "不能同时获取 %s 和 %s 至 %s"
1178
7aea43ff 1179#: remote.c:796
cfff71a9
JX
1180#, c-format
1181msgid "%s usually tracks %s, not %s"
1182msgstr "%s 通常跟踪 %s,而非 %s"
1183
7aea43ff 1184#: remote.c:800
cfff71a9
JX
1185#, c-format
1186msgid "%s tracks both %s and %s"
1187msgstr "%s 同时跟踪 %s 和 %s"
1188
7aea43ff 1189#: remote.c:808
cfff71a9
JX
1190msgid "Internal error"
1191msgstr "内部错误"
1192
7aea43ff
JX
1193#: remote.c:1723 remote.c:1766
1194msgid "HEAD does not point to a branch"
1195msgstr "HEAD 没有指向一个分支"
1196
1197#: remote.c:1732
1198#, c-format
1199msgid "no such branch: '%s'"
1200msgstr "没有此分支:'%s'"
1201
1202#: remote.c:1735
1203#, c-format
1204msgid "no upstream configured for branch '%s'"
1205msgstr "尚未给分支 '%s' 设置上游"
1206
1207#: remote.c:1741
1208#, c-format
1209msgid "upstream branch '%s' not stored as a remote-tracking branch"
1210msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1211
1212#: remote.c:1756
1213#, c-format
1214msgid "push destination '%s' on remote '%s' has no local tracking branch"
1215msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1216
1217#: remote.c:1771
1218#, c-format
1219msgid "branch '%s' has no remote for pushing"
1220msgstr "分支 '%s' 没有设置要推送的远程服务器"
1221
1222#: remote.c:1782
1223#, c-format
1224msgid "push refspecs for '%s' do not include '%s'"
160fb2b2 1225msgstr "向 '%s' 推送引用规格未包含 '%s'"
7aea43ff
JX
1226
1227#: remote.c:1795
1228msgid "push has no destination (push.default is 'nothing')"
1229msgstr "推送无目标(push.default 是 'nothing')"
1230
1231#: remote.c:1817
1232msgid "cannot resolve 'simple' push to a single destination"
1233msgstr "无法解析 'simple' 推送至一个单独的目标"
1234
1235#: remote.c:2124
90314792
JX
1236#, c-format
1237msgid "Your branch is based on '%s', but the upstream is gone.\n"
1238msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1239
7aea43ff 1240#: remote.c:2128
90314792
JX
1241msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1242msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1243
7aea43ff 1244#: remote.c:2131
90314792
JX
1245#, c-format
1246msgid "Your branch is up-to-date with '%s'.\n"
1247msgstr "您的分支与上游分支 '%s' 一致。\n"
1248
7aea43ff 1249#: remote.c:2135
c04f5ac3
JX
1250#, c-format
1251msgid "Your branch is ahead of '%s' by %d commit.\n"
1252msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1253msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5ae481e0 1254msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
c04f5ac3 1255
7aea43ff 1256#: remote.c:2141
07432cef
WS
1257msgid " (use \"git push\" to publish your local commits)\n"
1258msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1259
7aea43ff 1260#: remote.c:2144
c04f5ac3
JX
1261#, c-format
1262msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1263msgid_plural ""
1264"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
90e6ef53 1265msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5ae481e0 1266msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 1267
07432cef 1268# 译者:注意保持前导空格
7aea43ff 1269#: remote.c:2152
07432cef
WS
1270msgid " (use \"git pull\" to update your local branch)\n"
1271msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1272
7aea43ff 1273#: remote.c:2155
c04f5ac3
JX
1274#, c-format
1275msgid ""
1276"Your branch and '%s' have diverged,\n"
1277"and have %d and %d different commit each, respectively.\n"
1278msgid_plural ""
1279"Your branch and '%s' have diverged,\n"
1280"and have %d and %d different commits each, respectively.\n"
1281msgstr[0] ""
1282"您的分支和 '%s' 出现了偏离,\n"
195febda 1283"并且分别有 %d 和 %d 处不同的提交。\n"
5ae481e0
JX
1284msgstr[1] ""
1285"您的分支和 '%s' 出现了偏离,\n"
195febda 1286"并且分别有 %d 和 %d 处不同的提交。\n"
c04f5ac3 1287
07432cef 1288# 译者:注意保持前导空格
7aea43ff 1289#: remote.c:2165
07432cef
WS
1290msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1291msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1292
7aea43ff 1293#: revision.c:2366
814ff314
JX
1294msgid "--first-parent is incompatible with --bisect"
1295msgstr "--first-parent 与 --bisect 不兼容"
1296
1297#: run-command.c:83
2e8451e8
JX
1298msgid "open /dev/null failed"
1299msgstr "不能打开 /dev/null"
1300
814ff314 1301#: run-command.c:85
2e8451e8
JX
1302#, c-format
1303msgid "dup2(%d,%d) failed"
1304msgstr "不能调用 dup2(%d,%d)"
1305
814ff314 1306#: send-pack.c:272
220c313c
JX
1307msgid "failed to sign the push certificate"
1308msgstr "无法为推送证书签名"
1309
7aea43ff 1310#: send-pack.c:378
220c313c
JX
1311msgid "the receiving end does not support --signed push"
1312msgstr "接收端不支持签名推送"
1313
7aea43ff 1314#: send-pack.c:389
44f518e6
JX
1315msgid "the receiving end does not support --atomic push"
1316msgstr "接收端不支持原子推送"
814ff314 1317
7aea43ff
JX
1318#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
1319#: builtin/merge.c:983
c04f5ac3
JX
1320#, c-format
1321msgid "Could not open '%s' for writing"
90e6ef53 1322msgstr "不能为写入打开 '%s'"
c04f5ac3 1323
7aea43ff
JX
1324#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
1325#: builtin/merge.c:988
c04f5ac3
JX
1326#, c-format
1327msgid "Could not write to '%s'"
90e6ef53 1328msgstr "不能写入 '%s'"
c04f5ac3 1329
220c313c 1330#: sequencer.c:195
14c8bced
JX
1331msgid ""
1332"after resolving the conflicts, mark the corrected paths\n"
1333"with 'git add <paths>' or 'git rm <paths>'"
1334msgstr ""
d9d56b23 1335"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
14c8bced
JX
1336"命令标记修正后的文件"
1337
220c313c 1338#: sequencer.c:198
c04f5ac3
JX
1339msgid ""
1340"after resolving the conflicts, mark the corrected paths\n"
1341"with 'git add <paths>' or 'git rm <paths>'\n"
1342"and commit the result with 'git commit'"
1343msgstr ""
d9d56b23 1344"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
c04f5ac3
JX
1345"对修正后的文件做标记,然后用 'git commit' 提交"
1346
814ff314 1347#: sequencer.c:211 sequencer.c:861 sequencer.c:944
c04f5ac3
JX
1348#, c-format
1349msgid "Could not write to %s"
1350msgstr "不能写入 %s"
1351
220c313c 1352#: sequencer.c:214
c04f5ac3
JX
1353#, c-format
1354msgid "Error wrapping up %s"
1355msgstr "错误收尾 %s"
1356
220c313c 1357#: sequencer.c:229
c04f5ac3
JX
1358msgid "Your local changes would be overwritten by cherry-pick."
1359msgstr "您的本地修改将被拣选操作覆盖。"
1360
220c313c 1361#: sequencer.c:231
c04f5ac3
JX
1362msgid "Your local changes would be overwritten by revert."
1363msgstr "您的本地修改将被还原操作覆盖。"
1364
220c313c 1365#: sequencer.c:234
c04f5ac3
JX
1366msgid "Commit your changes or stash them to proceed."
1367msgstr "提交您的修改或保存进度后再继续。"
1368
1369#. TRANSLATORS: %s will be "revert" or "cherry-pick"
04cb2f28 1370#: sequencer.c:321
c04f5ac3
JX
1371#, c-format
1372msgid "%s: Unable to write new index file"
90e6ef53 1373msgstr "%s:无法写入新索引文件"
c04f5ac3 1374
04cb2f28 1375#: sequencer.c:339
8ada9598 1376msgid "Could not resolve HEAD commit\n"
81809b99 1377msgstr "不能解析 HEAD 提交\n"
8ada9598 1378
04cb2f28 1379#: sequencer.c:359
8ada9598 1380msgid "Unable to update cache tree\n"
81809b99 1381msgstr "不能更新缓存\n"
8ada9598 1382
814ff314 1383#: sequencer.c:411
81809b99 1384#, c-format
8ada9598 1385msgid "Could not parse commit %s\n"
81809b99 1386msgstr "不能解析提交 %s\n"
8ada9598 1387
814ff314 1388#: sequencer.c:416
81809b99 1389#, c-format
8ada9598 1390msgid "Could not parse parent commit %s\n"
81809b99 1391msgstr "不能解析父提交 %s\n"
8ada9598 1392
814ff314 1393#: sequencer.c:482
c04f5ac3 1394msgid "Your index file is unmerged."
90e6ef53 1395msgstr "您的索引文件未完成合并。"
c04f5ac3 1396
814ff314 1397#: sequencer.c:501
c04f5ac3
JX
1398#, c-format
1399msgid "Commit %s is a merge but no -m option was given."
1400msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1401
814ff314 1402#: sequencer.c:509
c04f5ac3
JX
1403#, c-format
1404msgid "Commit %s does not have parent %d"
1405msgstr "提交 %s 没有父提交 %d"
1406
814ff314 1407#: sequencer.c:513
c04f5ac3
JX
1408#, c-format
1409msgid "Mainline was specified but commit %s is not a merge."
90e6ef53 1410msgstr "指定了主线但提交 %s 不是一个合并。"
c04f5ac3
JX
1411
1412#. TRANSLATORS: The first %s will be "revert" or
1413#. "cherry-pick", the second %s a SHA1
814ff314 1414#: sequencer.c:526
c04f5ac3
JX
1415#, c-format
1416msgid "%s: cannot parse parent commit %s"
1417msgstr "%s:不能解析父提交 %s"
1418
814ff314 1419#: sequencer.c:530
c04f5ac3
JX
1420#, c-format
1421msgid "Cannot get commit message for %s"
1422msgstr "不能得到 %s 的提交说明"
1423
814ff314 1424#: sequencer.c:616
c04f5ac3
JX
1425#, c-format
1426msgid "could not revert %s... %s"
1427msgstr "不能还原 %s... %s"
1428
814ff314 1429#: sequencer.c:617
c04f5ac3
JX
1430#, c-format
1431msgid "could not apply %s... %s"
1432msgstr "不能应用 %s... %s"
1433
814ff314 1434#: sequencer.c:653
c04f5ac3
JX
1435msgid "empty commit set passed"
1436msgstr "提供了空的提交集"
1437
814ff314 1438#: sequencer.c:661
c04f5ac3
JX
1439#, c-format
1440msgid "git %s: failed to read the index"
90e6ef53 1441msgstr "git %s:无法读取索引"
c04f5ac3 1442
814ff314 1443#: sequencer.c:665
c04f5ac3
JX
1444#, c-format
1445msgid "git %s: failed to refresh the index"
90e6ef53 1446msgstr "git %s:无法刷新索引"
c04f5ac3 1447
814ff314 1448#: sequencer.c:725
c04f5ac3
JX
1449#, c-format
1450msgid "Cannot %s during a %s"
90e6ef53 1451msgstr "无法 %s 在一个 %s 过程中"
c04f5ac3 1452
814ff314 1453#: sequencer.c:747
c04f5ac3
JX
1454#, c-format
1455msgid "Could not parse line %d."
90e6ef53 1456msgstr "不能解析第 %d 行。"
c04f5ac3 1457
814ff314 1458#: sequencer.c:752
c04f5ac3 1459msgid "No commits parsed."
7e238ab7 1460msgstr "没有提交被解析。"
c04f5ac3 1461
814ff314 1462#: sequencer.c:765
c04f5ac3
JX
1463#, c-format
1464msgid "Could not open %s"
1465msgstr "不能打开 %s"
1466
814ff314 1467#: sequencer.c:769
c04f5ac3
JX
1468#, c-format
1469msgid "Could not read %s."
1470msgstr "不能读取 %s。"
1471
814ff314 1472#: sequencer.c:776
c04f5ac3
JX
1473#, c-format
1474msgid "Unusable instruction sheet: %s"
1475msgstr "无用的指令表单:%s"
1476
814ff314 1477#: sequencer.c:806
c04f5ac3
JX
1478#, c-format
1479msgid "Invalid key: %s"
1480msgstr "无效键名:%s"
1481
814ff314 1482#: sequencer.c:809
c04f5ac3
JX
1483#, c-format
1484msgid "Invalid value for %s: %s"
81809b99 1485msgstr "%s 的值无效:%s"
c04f5ac3 1486
814ff314 1487#: sequencer.c:821
c04f5ac3
JX
1488#, c-format
1489msgid "Malformed options sheet: %s"
1490msgstr "非法的选项表单:%s"
1491
814ff314 1492#: sequencer.c:842
c04f5ac3
JX
1493msgid "a cherry-pick or revert is already in progress"
1494msgstr "一个拣选或还原操作已在进行"
1495
814ff314 1496#: sequencer.c:843
c04f5ac3
JX
1497msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1498msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1499
814ff314 1500#: sequencer.c:847
c04f5ac3
JX
1501#, c-format
1502msgid "Could not create sequencer directory %s"
90e6ef53 1503msgstr "不能创建序列目录 %s"
c04f5ac3 1504
814ff314 1505#: sequencer.c:863 sequencer.c:948
c04f5ac3
JX
1506#, c-format
1507msgid "Error wrapping up %s."
1508msgstr "错误收尾 %s。"
1509
814ff314 1510#: sequencer.c:882 sequencer.c:1018
c04f5ac3 1511msgid "no cherry-pick or revert in progress"
195febda 1512msgstr "拣选或还原操作并未进行"
c04f5ac3 1513
814ff314 1514#: sequencer.c:884
c04f5ac3
JX
1515msgid "cannot resolve HEAD"
1516msgstr "不能解析 HEAD"
1517
814ff314 1518#: sequencer.c:886
c04f5ac3 1519msgid "cannot abort from a branch yet to be born"
90e6ef53 1520msgstr "不能从尚未建立的分支终止"
c04f5ac3 1521
7aea43ff 1522#: sequencer.c:908 builtin/apply.c:4291
c04f5ac3
JX
1523#, c-format
1524msgid "cannot open %s: %s"
1525msgstr "不能打开 %s:%s"
1526
814ff314 1527#: sequencer.c:911
c04f5ac3
JX
1528#, c-format
1529msgid "cannot read %s: %s"
1530msgstr "不能读取 %s:%s"
1531
814ff314 1532#: sequencer.c:912
c04f5ac3 1533msgid "unexpected end of file"
9aafc933 1534msgstr "意外的文件结束"
c04f5ac3 1535
814ff314 1536#: sequencer.c:918
c04f5ac3
JX
1537#, c-format
1538msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
90e6ef53 1539msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
c04f5ac3 1540
814ff314 1541#: sequencer.c:941
c04f5ac3
JX
1542#, c-format
1543msgid "Could not format %s."
1544msgstr "不能格式化 %s。"
1545
814ff314 1546#: sequencer.c:1086
4dcdc3d8
JX
1547#, c-format
1548msgid "%s: can't cherry-pick a %s"
1549msgstr "%s:不能拣选一个%s"
1550
814ff314 1551#: sequencer.c:1089
4dcdc3d8
JX
1552#, c-format
1553msgid "%s: bad revision"
1554msgstr "%s:错误的版本"
1555
814ff314 1556#: sequencer.c:1123
c04f5ac3
JX
1557msgid "Can't revert as initial commit"
1558msgstr "不能作为初始提交还原"
1559
814ff314 1560#: sequencer.c:1124
c04f5ac3
JX
1561msgid "Can't cherry-pick into empty head"
1562msgstr "不能拣选到空分支"
1563
7aea43ff
JX
1564#: setup.c:243
1565#, c-format
1566msgid "failed to read %s"
1567msgstr "无法读取 %s"
1568
1569#: sha1_name.c:453
2e8451e8
JX
1570msgid ""
1571"Git normally never creates a ref that ends with 40 hex characters\n"
1572"because it will be ignored when you just specify 40-hex. These refs\n"
1573"may be created by mistake. For example,\n"
1574"\n"
1575" git checkout -b $br $(git rev-parse ...)\n"
1576"\n"
1577"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1578"examine these refs and maybe delete them. Turn this message off by\n"
b1894384 1579"running \"git config advice.objectNameWarning false\""
2e8451e8
JX
1580msgstr ""
1581"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1582"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1583"\n"
1584" git checkout -b $br $(git rev-parse ...)\n"
1585"\n"
1586"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
b1894384 1587"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
2e8451e8
JX
1588"命令关闭本消息通知。"
1589
90314792
JX
1590#: submodule.c:64 submodule.c:98
1591msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1592msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1593
1594#: submodule.c:68 submodule.c:102
1595#, c-format
1596msgid "Could not find section in .gitmodules where path=%s"
1597msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1598
90314792
JX
1599#: submodule.c:76
1600#, c-format
1601msgid "Could not update .gitmodules entry %s"
1602msgstr "不能更新 .gitmodules 条目 %s"
1603
90314792
JX
1604#: submodule.c:109
1605#, c-format
1606msgid "Could not remove .gitmodules entry for %s"
1607msgstr "无法移除 %s 的 .gitmodules 条目"
1608
6c94aba5 1609#: submodule.c:120
90314792
JX
1610msgid "staging updated .gitmodules failed"
1611msgstr "将更新后 .gitmodules 添加暂存区失败"
1612
7aea43ff 1613#: submodule.c:1115
90314792
JX
1614#, c-format
1615msgid "Could not set core.worktree in %s"
1616msgstr "不能在 %s 中设置 core.worktree"
1617
814ff314
JX
1618#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1619#: trailer.c:561
220c313c
JX
1620#, c-format
1621msgid "unknown value '%s' for key '%s'"
1622msgstr "键 '%2$s' 的未知取值 '%1$s'"
1623
814ff314 1624#: trailer.c:543 trailer.c:548 builtin/remote.c:290
220c313c
JX
1625#, c-format
1626msgid "more than one %s"
1627msgstr "多于一个 %s"
1628
814ff314 1629#: trailer.c:581
220c313c 1630#, c-format
9aeb4c2b
JX
1631msgid "empty trailer token in trailer '%.*s'"
1632msgstr "签名 '%.*s' 的键为空"
220c313c 1633
814ff314 1634#: trailer.c:701
220c313c
JX
1635#, c-format
1636msgid "could not read input file '%s'"
1637msgstr "不能读取输入文件 '%s'"
1638
814ff314 1639#: trailer.c:704
220c313c
JX
1640msgid "could not read from stdin"
1641msgstr "不能自标准输入读取"
1642
7aea43ff 1643#: unpack-trees.c:203
6c94aba5
JX
1644msgid "Checking out files"
1645msgstr "正在检出文件"
1646
90314792
JX
1647#: urlmatch.c:120
1648msgid "invalid URL scheme name or missing '://' suffix"
1649msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1650
1651#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1652#, c-format
1653msgid "invalid %XX escape sequence"
1654msgstr "无效的 %XX 转义序列"
1655
1656#: urlmatch.c:172
1657msgid "missing host and scheme is not 'file:'"
4375c10e 1658msgstr "缺失主机名且 URL 方案不是 'file:'"
90314792
JX
1659
1660#: urlmatch.c:189
1661msgid "a 'file:' URL may not have a port number"
1662msgstr "一个 'file:' URL 不应该包含端口号"
1663
1664#: urlmatch.c:199
1665msgid "invalid characters in host name"
1666msgstr "主机名中包含无效的字符"
1667
1668#: urlmatch.c:244 urlmatch.c:255
1669msgid "invalid port number"
1670msgstr "无效的端口号"
1671
1672#: urlmatch.c:322
1673msgid "invalid '..' path segment"
1674msgstr "无效的 '..' 路径片段"
1675
814ff314 1676#: wrapper.c:523
07432cef 1677#, c-format
ef317cd5 1678msgid "unable to access '%s': %s"
07432cef
WS
1679msgstr "不能访问 '%s':%s"
1680
814ff314 1681#: wrapper.c:544
07432cef
WS
1682#, c-format
1683msgid "unable to access '%s'"
1684msgstr "不能访问 '%s'"
ef317cd5 1685
814ff314 1686#: wrapper.c:555
d691f479
JX
1687#, c-format
1688msgid "unable to look up current user in the passwd file: %s"
07432cef 1689msgstr "无法在口令文件中查询到当前用户:%s"
d691f479 1690
814ff314 1691#: wrapper.c:556
d691f479
JX
1692msgid "no such user"
1693msgstr "无此用户"
1694
814ff314 1695#: wrapper.c:564
220c313c
JX
1696msgid "unable to get current working directory"
1697msgstr "不能获取当前工作目录"
1698
7aea43ff
JX
1699#: wrapper.c:575
1700#, c-format
1701msgid "could not open %s for writing"
1702msgstr "不能写入 %s"
1703
1704#: wrapper.c:587
1705#, c-format
1706msgid "could not write to %s"
1707msgstr "不能写入 %s"
1708
1709#: wrapper.c:593
1710#, c-format
1711msgid "could not close %s"
1712msgstr "不能关闭 %s"
1713
cfff71a9 1714#: wt-status.c:150
c04f5ac3
JX
1715msgid "Unmerged paths:"
1716msgstr "未合并的路径:"
1717
90e6ef53 1718# 译者:注意保持前导空格
cfff71a9 1719#: wt-status.c:177 wt-status.c:204
c04f5ac3
JX
1720#, c-format
1721msgid " (use \"git reset %s <file>...\" to unstage)"
160fb2b2 1722msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
c04f5ac3 1723
90e6ef53 1724# 译者:注意保持前导空格
cfff71a9 1725#: wt-status.c:179 wt-status.c:206
c04f5ac3 1726msgid " (use \"git rm --cached <file>...\" to unstage)"
160fb2b2 1727msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
c04f5ac3 1728
90e6ef53 1729# 译者:注意保持前导空格
cfff71a9 1730#: wt-status.c:183
6792b93b 1731msgid " (use \"git add <file>...\" to mark resolution)"
d9d56b23 1732msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
6792b93b
JX
1733
1734# 译者:注意保持前导空格
cfff71a9 1735#: wt-status.c:185 wt-status.c:189
c04f5ac3 1736msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
d9d56b23 1737msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
c04f5ac3 1738
6792b93b 1739# 译者:注意保持前导空格
cfff71a9 1740#: wt-status.c:187
6792b93b 1741msgid " (use \"git rm <file>...\" to mark resolution)"
d9d56b23 1742msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
6792b93b 1743
7aea43ff 1744#: wt-status.c:198 wt-status.c:881
c04f5ac3
JX
1745msgid "Changes to be committed:"
1746msgstr "要提交的变更:"
1747
7aea43ff 1748#: wt-status.c:216 wt-status.c:890
c04f5ac3 1749msgid "Changes not staged for commit:"
7e238ab7 1750msgstr "尚未暂存以备提交的变更:"
c04f5ac3 1751
90e6ef53 1752# 译者:注意保持前导空格
cfff71a9 1753#: wt-status.c:220
c04f5ac3 1754msgid " (use \"git add <file>...\" to update what will be committed)"
d9d56b23 1755msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
c04f5ac3 1756
90e6ef53 1757# 译者:注意保持前导空格
cfff71a9 1758#: wt-status.c:222
c04f5ac3 1759msgid " (use \"git add/rm <file>...\" to update what will be committed)"
d9d56b23 1760msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
c04f5ac3 1761
90e6ef53 1762# 译者:注意保持前导空格
cfff71a9 1763#: wt-status.c:223
c04f5ac3
JX
1764msgid ""
1765" (use \"git checkout -- <file>...\" to discard changes in working directory)"
d9d56b23 1766msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
c04f5ac3 1767
90e6ef53 1768# 译者:注意保持前导空格
cfff71a9 1769#: wt-status.c:225
c04f5ac3
JX
1770msgid " (commit or discard the untracked or modified content in submodules)"
1771msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1772
90e6ef53 1773# 译者:注意保持前导空格
cfff71a9 1774#: wt-status.c:237
c04f5ac3
JX
1775#, c-format
1776msgid " (use \"git %s <file>...\" to include in what will be committed)"
d9d56b23 1777msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
c04f5ac3 1778
6c94aba5 1779#: wt-status.c:252
c04f5ac3
JX
1780msgid "both deleted:"
1781msgstr "双方删除:"
1782
6c94aba5 1783#: wt-status.c:254
c04f5ac3
JX
1784msgid "added by us:"
1785msgstr "由我们添加:"
1786
6c94aba5 1787#: wt-status.c:256
c04f5ac3
JX
1788msgid "deleted by them:"
1789msgstr "由他们删除:"
1790
6c94aba5 1791#: wt-status.c:258
c04f5ac3
JX
1792msgid "added by them:"
1793msgstr "由他们添加:"
1794
6c94aba5 1795#: wt-status.c:260
c04f5ac3
JX
1796msgid "deleted by us:"
1797msgstr "由我们删除:"
1798
6c94aba5 1799#: wt-status.c:262
c04f5ac3
JX
1800msgid "both added:"
1801msgstr "双方添加:"
1802
6c94aba5 1803#: wt-status.c:264
c04f5ac3
JX
1804msgid "both modified:"
1805msgstr "双方修改:"
1806
6c94aba5
JX
1807#: wt-status.c:266
1808#, c-format
1809msgid "bug: unhandled unmerged status %x"
1810msgstr "bug:无法处理的未合并状态 %x"
cfff71a9 1811
6c94aba5
JX
1812#: wt-status.c:274
1813msgid "new file:"
1814msgstr "新文件:"
cfff71a9 1815
6c94aba5
JX
1816#: wt-status.c:276
1817msgid "copied:"
1818msgstr "拷贝:"
cfff71a9 1819
6c94aba5
JX
1820#: wt-status.c:278
1821msgid "deleted:"
1822msgstr "删除:"
cfff71a9 1823
6c94aba5
JX
1824#: wt-status.c:280
1825msgid "modified:"
1826msgstr "修改:"
1827
1828#: wt-status.c:282
1829msgid "renamed:"
1830msgstr "重命名:"
1831
1832#: wt-status.c:284
1833msgid "typechange:"
1834msgstr "类型变更:"
1835
1836#: wt-status.c:286
1837msgid "unknown:"
1838msgstr "未知:"
cfff71a9 1839
6c94aba5
JX
1840#: wt-status.c:288
1841msgid "unmerged:"
1842msgstr "未合并:"
cfff71a9 1843
90e6ef53 1844# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1845#: wt-status.c:370
c04f5ac3 1846msgid "new commits, "
aa9565f7 1847msgstr "新提交, "
c04f5ac3 1848
90e6ef53 1849# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1850#: wt-status.c:372
c04f5ac3 1851msgid "modified content, "
aa9565f7 1852msgstr "修改的内容, "
c04f5ac3 1853
90e6ef53 1854# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1855#: wt-status.c:374
c04f5ac3 1856msgid "untracked content, "
aa9565f7 1857msgstr "未跟踪的内容, "
c04f5ac3 1858
6c94aba5 1859#: wt-status.c:391
c04f5ac3
JX
1860#, c-format
1861msgid "bug: unhandled diff status %c"
6c94aba5 1862msgstr "bug:无法处理的差异状态 %c"
c04f5ac3 1863
7aea43ff 1864#: wt-status.c:755
90314792
JX
1865msgid "Submodules changed but not updated:"
1866msgstr "子模组已修改但尚未更新:"
1867
7aea43ff 1868#: wt-status.c:757
90314792
JX
1869msgid "Submodule changes to be committed:"
1870msgstr "要提交的子模组变更:"
1871
7aea43ff 1872#: wt-status.c:838
cfff71a9
JX
1873msgid ""
1874"Do not touch the line above.\n"
1875"Everything below will be removed."
1876msgstr ""
1877"不要改动上面的一行。\n"
1878"下面的所有内容均将被删除。"
1879
7aea43ff 1880#: wt-status.c:949
6792b93b 1881msgid "You have unmerged paths."
195febda 1882msgstr "您有尚未合并的路径。"
6792b93b
JX
1883
1884# 译者:注意保持前导空格
7aea43ff 1885#: wt-status.c:952
6792b93b
JX
1886msgid " (fix conflicts and run \"git commit\")"
1887msgstr " (解决冲突并运行 \"git commit\")"
1888
7aea43ff 1889#: wt-status.c:955
6792b93b
JX
1890msgid "All conflicts fixed but you are still merging."
1891msgstr "所有冲突已解决但您仍处于合并中。"
1892
1893# 译者:注意保持前导空格
7aea43ff 1894#: wt-status.c:958
6792b93b
JX
1895msgid " (use \"git commit\" to conclude merge)"
1896msgstr " (使用 \"git commit\" 结束合并)"
1897
7aea43ff 1898#: wt-status.c:968
6792b93b 1899msgid "You are in the middle of an am session."
98b2761d 1900msgstr "您正处于 am 操作过程中。"
6792b93b 1901
7aea43ff 1902#: wt-status.c:971
6792b93b
JX
1903msgid "The current patch is empty."
1904msgstr "当前的补丁为空。"
1905
1906# 译者:注意保持前导空格
7aea43ff 1907#: wt-status.c:975
2e8451e8
JX
1908msgid " (fix conflicts and then run \"git am --continue\")"
1909msgstr " (解决冲突,然后运行 \"git am --continue\")"
6792b93b
JX
1910
1911# 译者:注意保持前导空格
7aea43ff 1912#: wt-status.c:977
6792b93b
JX
1913msgid " (use \"git am --skip\" to skip this patch)"
1914msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1915
1916# 译者:注意保持前导空格
7aea43ff 1917#: wt-status.c:979
6792b93b
JX
1918msgid " (use \"git am --abort\" to restore the original branch)"
1919msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1920
7aea43ff 1921#: wt-status.c:1039 wt-status.c:1056
63af42fe
JX
1922#, c-format
1923msgid "You are currently rebasing branch '%s' on '%s'."
98b2761d 1924msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
63af42fe 1925
7aea43ff 1926#: wt-status.c:1044 wt-status.c:1061
6792b93b 1927msgid "You are currently rebasing."
98b2761d 1928msgstr "您在执行变基操作。"
6792b93b
JX
1929
1930# 译者:注意保持前导空格
7aea43ff 1931#: wt-status.c:1047
6792b93b
JX
1932msgid " (fix conflicts and then run \"git rebase --continue\")"
1933msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1934
1935# 译者:注意保持前导空格
7aea43ff 1936#: wt-status.c:1049
6792b93b
JX
1937msgid " (use \"git rebase --skip\" to skip this patch)"
1938msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1939
1940# 译者:注意保持前导空格
7aea43ff 1941#: wt-status.c:1051
6792b93b
JX
1942msgid " (use \"git rebase --abort\" to check out the original branch)"
1943msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1944
1945# 译者:注意保持前导空格
7aea43ff 1946#: wt-status.c:1064
6792b93b
JX
1947msgid " (all conflicts fixed: run \"git rebase --continue\")"
1948msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1949
7aea43ff 1950#: wt-status.c:1068
63af42fe
JX
1951#, c-format
1952msgid ""
1953"You are currently splitting a commit while rebasing branch '%s' on '%s'."
98b2761d 1954msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
63af42fe 1955
7aea43ff 1956#: wt-status.c:1073
6792b93b 1957msgid "You are currently splitting a commit during a rebase."
98b2761d 1958msgstr "您在执行变基操作时拆分提交。"
6792b93b
JX
1959
1960# 译者:注意保持前导空格
7aea43ff 1961#: wt-status.c:1076
6792b93b
JX
1962msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1963msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1964
7aea43ff 1965#: wt-status.c:1080
63af42fe
JX
1966#, c-format
1967msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
98b2761d 1968msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
63af42fe 1969
7aea43ff 1970#: wt-status.c:1085
6792b93b 1971msgid "You are currently editing a commit during a rebase."
98b2761d 1972msgstr "您在执行变基操作时编辑提交。"
6792b93b
JX
1973
1974# 译者:注意保持前导空格
7aea43ff 1975#: wt-status.c:1088
6792b93b
JX
1976msgid " (use \"git commit --amend\" to amend the current commit)"
1977msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1978
1979# 译者:注意保持前导空格
7aea43ff 1980#: wt-status.c:1090
6792b93b
JX
1981msgid ""
1982" (use \"git rebase --continue\" once you are satisfied with your changes)"
195febda 1983msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
6792b93b 1984
7aea43ff 1985#: wt-status.c:1100
90314792
JX
1986#, c-format
1987msgid "You are currently cherry-picking commit %s."
98b2761d 1988msgstr "您在执行拣选提交 %s 的操作。"
6792b93b 1989
2e8451e8 1990# 译者:注意保持前导空格
7aea43ff 1991#: wt-status.c:1105
2e8451e8
JX
1992msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1993msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1994
6792b93b 1995# 译者:注意保持前导空格
7aea43ff 1996#: wt-status.c:1108
2e8451e8
JX
1997msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1998msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
6792b93b 1999
2e8451e8 2000# 译者:注意保持前导空格
7aea43ff 2001#: wt-status.c:1110
2e8451e8
JX
2002msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2003msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
2004
7aea43ff 2005#: wt-status.c:1119
1003b3a5
JX
2006#, c-format
2007msgid "You are currently reverting commit %s."
98b2761d 2008msgstr "您在执行反转提交 %s 的操作。"
1003b3a5
JX
2009
2010# 译者:注意保持前导空格
7aea43ff 2011#: wt-status.c:1124
1003b3a5
JX
2012msgid " (fix conflicts and run \"git revert --continue\")"
2013msgstr " (解决冲突并运行 \"git revert --continue\")"
2014
2015# 译者:注意保持前导空格
7aea43ff 2016#: wt-status.c:1127
1003b3a5
JX
2017msgid " (all conflicts fixed: run \"git revert --continue\")"
2018msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
2019
2020# 译者:注意保持前导空格
7aea43ff 2021#: wt-status.c:1129
1003b3a5
JX
2022msgid " (use \"git revert --abort\" to cancel the revert operation)"
2023msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
2024
7aea43ff 2025#: wt-status.c:1140
63af42fe 2026#, c-format
1003b3a5 2027msgid "You are currently bisecting, started from branch '%s'."
98b2761d 2028msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
63af42fe 2029
7aea43ff 2030#: wt-status.c:1144
6792b93b 2031msgid "You are currently bisecting."
98b2761d 2032msgstr "您在执行二分查找操作。"
6792b93b
JX
2033
2034# 译者:注意保持前导空格
7aea43ff 2035#: wt-status.c:1147
6792b93b
JX
2036msgid " (use \"git bisect reset\" to get back to the original branch)"
2037msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
2038
7aea43ff 2039#: wt-status.c:1324
c04f5ac3
JX
2040msgid "On branch "
2041msgstr "位于分支 "
2042
7aea43ff 2043#: wt-status.c:1331
2e8451e8 2044msgid "rebase in progress; onto "
98b2761d 2045msgstr "变基操作正在进行中;至 "
2e8451e8 2046
7aea43ff 2047#: wt-status.c:1336
1003b3a5
JX
2048msgid "HEAD detached at "
2049msgstr "头指针分离于 "
2050
7aea43ff 2051#: wt-status.c:1338
1003b3a5
JX
2052msgid "HEAD detached from "
2053msgstr "头指针分离自 "
2054
7aea43ff 2055#: wt-status.c:1341
c04f5ac3
JX
2056msgid "Not currently on any branch."
2057msgstr "当前不在任何分支上。"
2058
7aea43ff 2059#: wt-status.c:1358
c04f5ac3
JX
2060msgid "Initial commit"
2061msgstr "初始提交"
2062
7aea43ff 2063#: wt-status.c:1372
ef317cd5 2064msgid "Untracked files"
07432cef 2065msgstr "未跟踪的文件"
c04f5ac3 2066
7aea43ff 2067#: wt-status.c:1374
ef317cd5 2068msgid "Ignored files"
07432cef 2069msgstr "忽略的文件"
c04f5ac3 2070
7aea43ff 2071#: wt-status.c:1378
1003b3a5 2072#, c-format
4dcdc3d8
JX
2073msgid ""
2074"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2075"may speed it up, but you have to be careful not to forget to add\n"
2076"new files yourself (see 'git help status')."
2077msgstr ""
2078"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
2079"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1003b3a5 2080
7aea43ff 2081#: wt-status.c:1384
c04f5ac3
JX
2082#, c-format
2083msgid "Untracked files not listed%s"
2084msgstr "未跟踪的文件没有列出%s"
2085
7e238ab7 2086# 译者:中文字符串拼接,可删除前导空格
7aea43ff 2087#: wt-status.c:1386
c04f5ac3 2088msgid " (use -u option to show untracked files)"
7e238ab7 2089msgstr "(使用 -u 参数显示未跟踪的文件)"
c04f5ac3 2090
7aea43ff 2091#: wt-status.c:1392
c04f5ac3
JX
2092msgid "No changes"
2093msgstr "没有修改"
2094
7aea43ff 2095#: wt-status.c:1397
07432cef 2096#, c-format
ef317cd5 2097msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
07432cef 2098msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
c04f5ac3 2099
7aea43ff 2100#: wt-status.c:1400
07432cef 2101#, c-format
ef317cd5 2102msgid "no changes added to commit\n"
07432cef 2103msgstr "修改尚未加入提交\n"
c04f5ac3 2104
7aea43ff 2105#: wt-status.c:1403
07432cef 2106#, c-format
ef317cd5
JX
2107msgid ""
2108"nothing added to commit but untracked files present (use \"git add\" to "
2109"track)\n"
07432cef 2110msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
c04f5ac3 2111
7aea43ff 2112#: wt-status.c:1406
07432cef 2113#, c-format
ef317cd5 2114msgid "nothing added to commit but untracked files present\n"
07432cef 2115msgstr "提交为空,但是存在尚未跟踪的文件\n"
c04f5ac3 2116
7e238ab7 2117# 译者:中文字符串拼接,可删除前导空格
7aea43ff 2118#: wt-status.c:1409
07432cef 2119#, c-format
ef317cd5 2120msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
07432cef 2121msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
c04f5ac3 2122
7aea43ff 2123#: wt-status.c:1412 wt-status.c:1417
07432cef 2124#, c-format
ef317cd5 2125msgid "nothing to commit\n"
07432cef 2126msgstr "无文件要提交\n"
ef317cd5 2127
7e238ab7 2128# 译者:中文字符串拼接,可删除前导空格
7aea43ff 2129#: wt-status.c:1415
07432cef 2130#, c-format
ef317cd5 2131msgid "nothing to commit (use -u to show untracked files)\n"
07432cef 2132msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
c04f5ac3 2133
7e238ab7 2134# 译者:中文字符串拼接,可删除前导空格
7aea43ff 2135#: wt-status.c:1419
07432cef 2136#, c-format
ef317cd5 2137msgid "nothing to commit, working directory clean\n"
07432cef 2138msgstr "无文件要提交,干净的工作区\n"
c04f5ac3 2139
7aea43ff 2140#: wt-status.c:1528
c04f5ac3 2141msgid "HEAD (no branch)"
61bc0753 2142msgstr "HEAD(非分支)"
c04f5ac3 2143
90e6ef53 2144# 译者:注意保持句尾空格
7aea43ff 2145#: wt-status.c:1534
c04f5ac3
JX
2146msgid "Initial commit on "
2147msgstr "初始提交于 "
2148
7aea43ff 2149#: wt-status.c:1561
90314792
JX
2150msgid "gone"
2151msgstr "丢失"
2152
90e6ef53 2153# 译者:注意保持句尾空格
7aea43ff 2154#: wt-status.c:1563 wt-status.c:1571
c04f5ac3
JX
2155msgid "behind "
2156msgstr "落后 "
2157
5bb01d4f 2158#: compat/precompose_utf8.c:55 builtin/clone.c:345
a77c07d9
JX
2159#, c-format
2160msgid "failed to unlink '%s'"
2161msgstr "无法删除 '%s'"
2162
220c313c 2163#: builtin/add.c:22
814ff314 2164msgid "git add [<options>] [--] <pathspec>..."
160fb2b2 2165msgstr "git add [<选项>] [--] <路径规格>..."
ef317cd5 2166
220c313c 2167#: builtin/add.c:65
c04f5ac3
JX
2168#, c-format
2169msgid "unexpected diff status %c"
2170msgstr "意外的差异状态 %c"
2171
44f518e6 2172#: builtin/add.c:70 builtin/commit.c:277
c04f5ac3
JX
2173msgid "updating files failed"
2174msgstr "更新文件失败"
2175
220c313c 2176#: builtin/add.c:80
c04f5ac3
JX
2177#, c-format
2178msgid "remove '%s'\n"
2179msgstr "删除 '%s'\n"
2180
220c313c 2181#: builtin/add.c:134
c04f5ac3 2182msgid "Unstaged changes after refreshing the index:"
90e6ef53 2183msgstr "刷新索引之后尚未被暂存的变更:"
c04f5ac3 2184
7aea43ff 2185#: builtin/add.c:194 builtin/rev-parse.c:796
c04f5ac3 2186msgid "Could not read the index"
90e6ef53 2187msgstr "不能读取索引"
c04f5ac3 2188
220c313c 2189#: builtin/add.c:205
c04f5ac3
JX
2190#, c-format
2191msgid "Could not open '%s' for writing."
195febda 2192msgstr "不能打开 '%s' 以写入。"
c04f5ac3 2193
220c313c 2194#: builtin/add.c:209
c04f5ac3 2195msgid "Could not write patch"
195febda 2196msgstr "不能生成补丁"
c04f5ac3 2197
7aea43ff
JX
2198#: builtin/add.c:212
2199msgid "editing patch failed"
2200msgstr "编辑补丁失败"
2201
2202#: builtin/add.c:215
c04f5ac3
JX
2203#, c-format
2204msgid "Could not stat '%s'"
90e6ef53 2205msgstr "不能查看文件状态 '%s'"
c04f5ac3 2206
7aea43ff 2207#: builtin/add.c:217
c04f5ac3
JX
2208msgid "Empty patch. Aborted."
2209msgstr "空补丁。异常终止。"
2210
7aea43ff 2211#: builtin/add.c:222
8ada9598
JX
2212#, c-format
2213msgid "Could not apply '%s'"
2214msgstr "不能应用 '%s'"
2215
7aea43ff 2216#: builtin/add.c:232
8ada9598 2217msgid "The following paths are ignored by one of your .gitignore files:\n"
195febda 2218msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 2219
7aea43ff
JX
2220#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110
2221#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369
2222#: builtin/rm.c:268
ef317cd5 2223msgid "dry run"
07432cef 2224msgstr "演习"
ef317cd5 2225
7aea43ff
JX
2226#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
2227#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616
220c313c 2228#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
ef317cd5
JX
2229msgid "be verbose"
2230msgstr "冗长输出"
2231
7aea43ff 2232#: builtin/add.c:252
ef317cd5 2233msgid "interactive picking"
07432cef 2234msgstr "交互式拣选"
ef317cd5 2235
5bb01d4f 2236#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
ef317cd5 2237msgid "select hunks interactively"
07432cef 2238msgstr "交互式挑选数据块"
ef317cd5 2239
7aea43ff 2240#: builtin/add.c:254
ef317cd5 2241msgid "edit current diff and apply"
07432cef 2242msgstr "编辑当前差异并应用"
ef317cd5 2243
7aea43ff 2244#: builtin/add.c:255
ef317cd5 2245msgid "allow adding otherwise ignored files"
07432cef 2246msgstr "允许添加忽略的文件"
ef317cd5 2247
7aea43ff 2248#: builtin/add.c:256
ef317cd5 2249msgid "update tracked files"
07432cef 2250msgstr "更新已跟踪的文件"
ef317cd5 2251
7aea43ff 2252#: builtin/add.c:257
ef317cd5 2253msgid "record only the fact that the path will be added later"
07432cef 2254msgstr "只记录,该路径稍后再添加"
ef317cd5 2255
7aea43ff 2256#: builtin/add.c:258
ef317cd5 2257msgid "add changes from all tracked and untracked files"
07432cef 2258msgstr "添加所有改变的已跟踪文件和未跟踪文件"
ef317cd5 2259
7aea43ff 2260#: builtin/add.c:261
4dcdc3d8
JX
2261msgid "ignore paths removed in the working tree (same as --no-all)"
2262msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2263
7aea43ff 2264#: builtin/add.c:263
ef317cd5 2265msgid "don't add, only refresh the index"
07432cef 2266msgstr "不添加,只刷新索引"
ef317cd5 2267
7aea43ff 2268#: builtin/add.c:264
ef317cd5 2269msgid "just skip files which cannot be added because of errors"
07432cef 2270msgstr "跳过因出错不能添加的文件"
ef317cd5 2271
7aea43ff 2272#: builtin/add.c:265
ef317cd5 2273msgid "check if - even missing - files are ignored in dry run"
07432cef 2274msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
ef317cd5 2275
7aea43ff 2276#: builtin/add.c:287
8ada9598
JX
2277#, c-format
2278msgid "Use -f if you really want to add them.\n"
2279msgstr "使用 -f 参数如果您确实要添加它们。\n"
2280
7aea43ff 2281#: builtin/add.c:294
8ada9598
JX
2282msgid "adding files failed"
2283msgstr "添加文件失败"
2284
7aea43ff 2285#: builtin/add.c:330
8ada9598
JX
2286msgid "-A and -u are mutually incompatible"
2287msgstr "-A 和 -u 选项互斥"
2288
7aea43ff 2289#: builtin/add.c:337
8ada9598 2290msgid "Option --ignore-missing can only be used together with --dry-run"
649900bc 2291msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 2292
7aea43ff 2293#: builtin/add.c:358
8ada9598
JX
2294#, c-format
2295msgid "Nothing specified, nothing added.\n"
2296msgstr "没有指定文件,也没有文件被添加。\n"
2297
7aea43ff 2298#: builtin/add.c:359
8ada9598
JX
2299#, c-format
2300msgid "Maybe you wanted to say 'git add .'?\n"
2301msgstr "也许您想要执行 'git add .'?\n"
2302
7aea43ff
JX
2303#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918
2304#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
8ada9598
JX
2305msgid "index file corrupt"
2306msgstr "索引文件损坏"
2307
7aea43ff 2308#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
8ada9598
JX
2309msgid "Unable to write new index file"
2310msgstr "无法写入新索引文件"
2311
814ff314
JX
2312#: builtin/apply.c:59
2313msgid "git apply [<options>] [<patch>...]"
2314msgstr "git apply [<选项>] [<补丁>...]"
8ada9598 2315
814ff314 2316#: builtin/apply.c:112
81809b99 2317#, c-format
8ada9598 2318msgid "unrecognized whitespace option '%s'"
81809b99 2319msgstr "未能识别的空白字符选项 '%s'"
8ada9598 2320
814ff314 2321#: builtin/apply.c:127
81809b99 2322#, c-format
8ada9598 2323msgid "unrecognized whitespace ignore option '%s'"
81809b99 2324msgstr "未能识别的空白字符忽略选项 '%s'"
8ada9598 2325
814ff314 2326#: builtin/apply.c:822
8ada9598
JX
2327#, c-format
2328msgid "Cannot prepare timestamp regexp %s"
81809b99 2329msgstr "无法准备时间戳正则表达式 %s"
8ada9598 2330
814ff314 2331#: builtin/apply.c:831
8ada9598
JX
2332#, c-format
2333msgid "regexec returned %d for input: %s"
81809b99 2334msgstr "regexec 返回 %d,输入为:%s"
8ada9598 2335
814ff314 2336#: builtin/apply.c:912
81809b99 2337#, c-format
8ada9598 2338msgid "unable to find filename in patch at line %d"
81809b99 2339msgstr "不能在补丁的第 %d 行找到文件名"
8ada9598 2340
814ff314 2341#: builtin/apply.c:944
8ada9598
JX
2342#, c-format
2343msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
9aafc933 2344msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
8ada9598 2345
814ff314 2346#: builtin/apply.c:948
8ada9598
JX
2347#, c-format
2348msgid "git apply: bad git-diff - inconsistent new filename on line %d"
81809b99 2349msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
8ada9598 2350
814ff314 2351#: builtin/apply.c:949
8ada9598
JX
2352#, c-format
2353msgid "git apply: bad git-diff - inconsistent old filename on line %d"
81809b99 2354msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
8ada9598 2355
814ff314 2356#: builtin/apply.c:956
8ada9598
JX
2357#, c-format
2358msgid "git apply: bad git-diff - expected /dev/null on line %d"
9aafc933 2359msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
8ada9598 2360
814ff314 2361#: builtin/apply.c:1419
8ada9598
JX
2362#, c-format
2363msgid "recount: unexpected line: %.*s"
81809b99 2364msgstr "recount:意外的行:%.*s"
8ada9598 2365
814ff314 2366#: builtin/apply.c:1476
8ada9598
JX
2367#, c-format
2368msgid "patch fragment without header at line %d: %.*s"
81809b99 2369msgstr "第 %d 行的补丁片段没有头信息:%.*s"
8ada9598 2370
814ff314 2371#: builtin/apply.c:1493
8ada9598
JX
2372#, c-format
2373msgid ""
2374"git diff header lacks filename information when removing %d leading pathname "
2375"component (line %d)"
2376msgid_plural ""
2377"git diff header lacks filename information when removing %d leading pathname "
2378"components (line %d)"
5ae481e0
JX
2379msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2380msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
8ada9598 2381
7aea43ff 2382#: builtin/apply.c:1659
8ada9598 2383msgid "new file depends on old contents"
81809b99 2384msgstr "新文件依赖旧内容"
8ada9598 2385
7aea43ff 2386#: builtin/apply.c:1661
8ada9598 2387msgid "deleted file still has contents"
81809b99 2388msgstr "删除的文件仍有内容"
8ada9598 2389
7aea43ff 2390#: builtin/apply.c:1687
8ada9598
JX
2391#, c-format
2392msgid "corrupt patch at line %d"
195febda 2393msgstr "补丁在第 %d 行损坏"
8ada9598 2394
7aea43ff 2395#: builtin/apply.c:1723
8ada9598
JX
2396#, c-format
2397msgid "new file %s depends on old contents"
81809b99 2398msgstr "新文件 %s 依赖旧内容"
8ada9598 2399
7aea43ff 2400#: builtin/apply.c:1725
8ada9598
JX
2401#, c-format
2402msgid "deleted file %s still has contents"
81809b99 2403msgstr "删除的文件 %s 仍有内容"
8ada9598 2404
7aea43ff 2405#: builtin/apply.c:1728
8ada9598
JX
2406#, c-format
2407msgid "** warning: file %s becomes empty but is not deleted"
81809b99 2408msgstr "** 警告:文件 %s 成为空文件但并未删除"
8ada9598 2409
7aea43ff 2410#: builtin/apply.c:1874
8ada9598
JX
2411#, c-format
2412msgid "corrupt binary patch at line %d: %.*s"
81809b99 2413msgstr "二进制补丁在第 %d 行损坏:%.*s"
8ada9598 2414
7aea43ff 2415#: builtin/apply.c:1903
8ada9598
JX
2416#, c-format
2417msgid "unrecognized binary patch at line %d"
81809b99 2418msgstr "未能识别的二进制补丁位于第 %d 行"
8ada9598 2419
7aea43ff 2420#: builtin/apply.c:2054
8ada9598
JX
2421#, c-format
2422msgid "patch with only garbage at line %d"
81809b99 2423msgstr "补丁文件的第 %d 行只有垃圾数据"
8ada9598 2424
7aea43ff 2425#: builtin/apply.c:2144
81809b99 2426#, c-format
8ada9598 2427msgid "unable to read symlink %s"
81809b99 2428msgstr "无法读取符号链接 %s"
8ada9598 2429
7aea43ff 2430#: builtin/apply.c:2148
81809b99 2431#, c-format
8ada9598 2432msgid "unable to open or read %s"
81809b99 2433msgstr "不能打开或读取 %s"
8ada9598 2434
7aea43ff 2435#: builtin/apply.c:2781
81809b99 2436#, c-format
8ada9598 2437msgid "invalid start of line: '%c'"
81809b99 2438msgstr "无效的行首字符:'%c'"
8ada9598 2439
7aea43ff 2440#: builtin/apply.c:2900
8ada9598
JX
2441#, c-format
2442msgid "Hunk #%d succeeded at %d (offset %d line)."
2443msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
07432cef
WS
2444msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2445msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
8ada9598 2446
7aea43ff 2447#: builtin/apply.c:2912
8ada9598
JX
2448#, c-format
2449msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
81809b99 2450msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
8ada9598 2451
7aea43ff 2452#: builtin/apply.c:2918
8ada9598
JX
2453#, c-format
2454msgid ""
2455"while searching for:\n"
2456"%.*s"
2457msgstr ""
81809b99
JX
2458"当查询:\n"
2459"%.*s"
8ada9598 2460
7aea43ff 2461#: builtin/apply.c:2938
8ada9598
JX
2462#, c-format
2463msgid "missing binary patch data for '%s'"
81809b99 2464msgstr "缺失 '%s' 的二进制补丁数据"
8ada9598 2465
7aea43ff 2466#: builtin/apply.c:3039
8ada9598
JX
2467#, c-format
2468msgid "binary patch does not apply to '%s'"
81809b99 2469msgstr "二进制补丁未应用到 '%s'"
8ada9598 2470
7aea43ff 2471#: builtin/apply.c:3045
8ada9598
JX
2472#, c-format
2473msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
9aafc933 2474msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
8ada9598 2475
7aea43ff 2476#: builtin/apply.c:3066
8ada9598
JX
2477#, c-format
2478msgid "patch failed: %s:%ld"
81809b99 2479msgstr "打补丁失败:%s:%ld"
8ada9598 2480
7aea43ff 2481#: builtin/apply.c:3190
8ada9598 2482#, c-format
23ff3338
JX
2483msgid "cannot checkout %s"
2484msgstr "不能检出 %s"
8ada9598 2485
7aea43ff 2486#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
81809b99 2487#, c-format
8ada9598 2488msgid "read of %s failed"
81809b99 2489msgstr "读取 %s 失败"
8ada9598 2490
7aea43ff 2491#: builtin/apply.c:3243
814ff314
JX
2492#, c-format
2493msgid "reading from '%s' beyond a symbolic link"
2494msgstr "读取位于符号链接中的 '%s'"
2495
7aea43ff 2496#: builtin/apply.c:3271 builtin/apply.c:3493
81809b99 2497#, c-format
23ff3338
JX
2498msgid "path %s has been renamed/deleted"
2499msgstr "路径 %s 已经被重命名/删除"
8ada9598 2500
7aea43ff 2501#: builtin/apply.c:3352 builtin/apply.c:3507
8ada9598 2502#, c-format
23ff3338
JX
2503msgid "%s: does not exist in index"
2504msgstr "%s:不存在于索引中"
8ada9598 2505
7aea43ff 2506#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
81809b99 2507#, c-format
8ada9598 2508msgid "%s: %s"
81809b99 2509msgstr "%s:%s"
8ada9598 2510
7aea43ff 2511#: builtin/apply.c:3361 builtin/apply.c:3515
81809b99 2512#, c-format
8ada9598 2513msgid "%s: does not match index"
81809b99 2514msgstr "%s:和索引不匹配"
8ada9598 2515
7aea43ff 2516#: builtin/apply.c:3463
23ff3338
JX
2517msgid "removal patch leaves file contents"
2518msgstr "移除补丁仍留下了文件内容"
2519
7aea43ff 2520#: builtin/apply.c:3532
8ada9598
JX
2521#, c-format
2522msgid "%s: wrong type"
81809b99 2523msgstr "%s:错误类型"
8ada9598 2524
7aea43ff 2525#: builtin/apply.c:3534
8ada9598
JX
2526#, c-format
2527msgid "%s has type %o, expected %o"
9aafc933 2528msgstr "%s 的类型是 %o,应为 %o"
8ada9598 2529
7aea43ff 2530#: builtin/apply.c:3693 builtin/apply.c:3695
814ff314
JX
2531#, c-format
2532msgid "invalid path '%s'"
2533msgstr "无效路径 '%s'"
2534
7aea43ff 2535#: builtin/apply.c:3750
81809b99 2536#, c-format
8ada9598 2537msgid "%s: already exists in index"
81809b99 2538msgstr "%s:已经存在于索引中"
8ada9598 2539
7aea43ff 2540#: builtin/apply.c:3753
23ff3338
JX
2541#, c-format
2542msgid "%s: already exists in working directory"
2543msgstr "%s:已经存在于工作区中"
2544
7aea43ff 2545#: builtin/apply.c:3773
d691f479
JX
2546#, c-format
2547msgid "new mode (%o) of %s does not match old mode (%o)"
2548msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
8ada9598 2549
7aea43ff 2550#: builtin/apply.c:3778
8ada9598 2551#, c-format
d691f479
JX
2552msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2553msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2554
7aea43ff 2555#: builtin/apply.c:3798
814ff314
JX
2556#, c-format
2557msgid "affected file '%s' is beyond a symbolic link"
2558msgstr "受影响的文件 '%s' 位于符号链接中"
2559
7aea43ff 2560#: builtin/apply.c:3802
d691f479 2561#, c-format
8ada9598 2562msgid "%s: patch does not apply"
81809b99 2563msgstr "%s:补丁未应用"
8ada9598 2564
7aea43ff 2565#: builtin/apply.c:3816
8ada9598
JX
2566#, c-format
2567msgid "Checking patch %s..."
81809b99 2568msgstr "检查补丁 %s..."
8ada9598 2569
5bb01d4f 2570#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
8ada9598
JX
2571#, c-format
2572msgid "make_cache_entry failed for path '%s'"
2573msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2574
7aea43ff 2575#: builtin/apply.c:4052
81809b99 2576#, c-format
8ada9598 2577msgid "unable to remove %s from index"
81809b99 2578msgstr "不能从索引中移除 %s"
8ada9598 2579
7aea43ff 2580#: builtin/apply.c:4081
8ada9598 2581#, c-format
2e8451e8
JX
2582msgid "corrupt patch for submodule %s"
2583msgstr "子模组 %s 损坏的补丁"
8ada9598 2584
7aea43ff 2585#: builtin/apply.c:4085
81809b99 2586#, c-format
8ada9598 2587msgid "unable to stat newly created file '%s'"
81809b99 2588msgstr "不能枚举新建文件 '%s' 的状态"
8ada9598 2589
7aea43ff 2590#: builtin/apply.c:4090
8ada9598
JX
2591#, c-format
2592msgid "unable to create backing store for newly created file %s"
81809b99 2593msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 2594
7aea43ff 2595#: builtin/apply.c:4093 builtin/apply.c:4201
81809b99 2596#, c-format
8ada9598 2597msgid "unable to add cache entry for %s"
81809b99 2598msgstr "无法为 %s 添加缓存条目"
8ada9598 2599
7aea43ff 2600#: builtin/apply.c:4126
81809b99 2601#, c-format
8ada9598 2602msgid "closing file '%s'"
81809b99 2603msgstr "关闭文件 '%s'"
8ada9598 2604
7aea43ff 2605#: builtin/apply.c:4175
81809b99 2606#, c-format
8ada9598 2607msgid "unable to write file '%s' mode %o"
81809b99 2608msgstr "不能写文件 '%s' 权限 %o"
8ada9598 2609
7aea43ff 2610#: builtin/apply.c:4262
8ada9598
JX
2611#, c-format
2612msgid "Applied patch %s cleanly."
81809b99 2613msgstr "成功应用补丁 %s。"
8ada9598 2614
7aea43ff 2615#: builtin/apply.c:4270
8ada9598 2616msgid "internal error"
81809b99 2617msgstr "内部错误"
8ada9598 2618
7aea43ff 2619#: builtin/apply.c:4273
8ada9598
JX
2620#, c-format
2621msgid "Applying patch %%s with %d reject..."
2622msgid_plural "Applying patch %%s with %d rejects..."
195febda
T
2623msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2624msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
8ada9598 2625
7aea43ff 2626#: builtin/apply.c:4283
8ada9598
JX
2627#, c-format
2628msgid "truncating .rej filename to %.*s.rej"
81809b99 2629msgstr "截短 .rej 文件名为 %.*s.rej"
8ada9598 2630
7aea43ff 2631#: builtin/apply.c:4304
8ada9598
JX
2632#, c-format
2633msgid "Hunk #%d applied cleanly."
81809b99 2634msgstr "第 #%d 个片段成功应用。"
8ada9598 2635
7aea43ff 2636#: builtin/apply.c:4307
8ada9598
JX
2637#, c-format
2638msgid "Rejected hunk #%d."
81809b99 2639msgstr "拒绝第 #%d 个片段。"
8ada9598 2640
7aea43ff 2641#: builtin/apply.c:4397
8ada9598 2642msgid "unrecognized input"
81809b99 2643msgstr "未能识别的输入"
8ada9598 2644
7aea43ff 2645#: builtin/apply.c:4408
8ada9598 2646msgid "unable to read index file"
81809b99 2647msgstr "无法读取索引文件"
8ada9598 2648
7aea43ff 2649#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85
814ff314 2650#: builtin/fetch.c:92
8ada9598 2651msgid "path"
81809b99 2652msgstr "路径"
8ada9598 2653
7aea43ff 2654#: builtin/apply.c:4526
8ada9598 2655msgid "don't apply changes matching the given path"
81809b99 2656msgstr "不要应用与给出路径向匹配的变更"
8ada9598 2657
7aea43ff 2658#: builtin/apply.c:4529
8ada9598 2659msgid "apply changes matching the given path"
81809b99 2660msgstr "应用与给出路径向匹配的变更"
8ada9598 2661
7aea43ff 2662#: builtin/apply.c:4531
8ada9598 2663msgid "num"
81809b99 2664msgstr "数字"
8ada9598 2665
7aea43ff 2666#: builtin/apply.c:4532
8ada9598 2667msgid "remove <num> leading slashes from traditional diff paths"
07432cef 2668msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
8ada9598 2669
7aea43ff 2670#: builtin/apply.c:4535
8ada9598 2671msgid "ignore additions made by the patch"
81809b99 2672msgstr "忽略补丁中的添加的文件"
8ada9598 2673
7aea43ff 2674#: builtin/apply.c:4537
8ada9598 2675msgid "instead of applying the patch, output diffstat for the input"
81809b99 2676msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
8ada9598 2677
7aea43ff 2678#: builtin/apply.c:4541
ef317cd5 2679msgid "show number of added and deleted lines in decimal notation"
07432cef 2680msgstr "以十进制数显示添加和删除的行数"
8ada9598 2681
7aea43ff 2682#: builtin/apply.c:4543
8ada9598 2683msgid "instead of applying the patch, output a summary for the input"
81809b99 2684msgstr "不应用补丁,而是显示输入的概要"
8ada9598 2685
7aea43ff 2686#: builtin/apply.c:4545
8ada9598 2687msgid "instead of applying the patch, see if the patch is applicable"
81809b99 2688msgstr "不应用补丁,而是查看补丁是否可应用"
8ada9598 2689
7aea43ff 2690#: builtin/apply.c:4547
8ada9598 2691msgid "make sure the patch is applicable to the current index"
81809b99 2692msgstr "确认补丁可以应用到当前索引"
8ada9598 2693
7aea43ff 2694#: builtin/apply.c:4549
8ada9598 2695msgid "apply a patch without touching the working tree"
81809b99 2696msgstr "应用补丁而不修改工作区"
8ada9598 2697
7aea43ff 2698#: builtin/apply.c:4551
814ff314
JX
2699msgid "accept a patch that touches outside the working area"
2700msgstr "接受修改工作区之外文件的补丁"
2701
7aea43ff 2702#: builtin/apply.c:4553
8ada9598 2703msgid "also apply the patch (use with --stat/--summary/--check)"
195febda 2704msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
8ada9598 2705
7aea43ff 2706#: builtin/apply.c:4555
23ff3338 2707msgid "attempt three-way merge if a patch does not apply"
160fb2b2 2708msgstr "如果一个补丁不能应用则尝试三方合并"
23ff3338 2709
7aea43ff 2710#: builtin/apply.c:4557
8ada9598 2711msgid "build a temporary index based on embedded index information"
81809b99 2712msgstr "创建一个临时索引基于嵌入的索引信息"
8ada9598 2713
7aea43ff 2714#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
8ada9598 2715msgid "paths are separated with NUL character"
81809b99 2716msgstr "路径以 NUL 字符分隔"
8ada9598 2717
7aea43ff 2718#: builtin/apply.c:4562
8ada9598 2719msgid "ensure at least <n> lines of context match"
81809b99 2720msgstr "确保至少匹配 <n> 行上下文"
8ada9598 2721
7aea43ff 2722#: builtin/apply.c:4563
8ada9598 2723msgid "action"
81809b99 2724msgstr "动作"
8ada9598 2725
7aea43ff 2726#: builtin/apply.c:4564
8ada9598 2727msgid "detect new or modified lines that have whitespace errors"
81809b99 2728msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 2729
7aea43ff 2730#: builtin/apply.c:4567 builtin/apply.c:4570
8ada9598 2731msgid "ignore changes in whitespace when finding context"
81809b99 2732msgstr "查找上下文时忽略空白字符的变更"
8ada9598 2733
7aea43ff 2734#: builtin/apply.c:4573
8ada9598 2735msgid "apply the patch in reverse"
81809b99 2736msgstr "反向应用补丁"
8ada9598 2737
7aea43ff 2738#: builtin/apply.c:4575
8ada9598 2739msgid "don't expect at least one line of context"
81809b99 2740msgstr "无需至少一行上下文"
8ada9598 2741
7aea43ff 2742#: builtin/apply.c:4577
8ada9598 2743msgid "leave the rejected hunks in corresponding *.rej files"
81809b99 2744msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 2745
7aea43ff 2746#: builtin/apply.c:4579
8ada9598 2747msgid "allow overlapping hunks"
81809b99 2748msgstr "允许重叠的补丁片段"
8ada9598 2749
7aea43ff 2750#: builtin/apply.c:4582
8ada9598 2751msgid "tolerate incorrectly detected missing new-line at the end of file"
195febda 2752msgstr "允许不正确的文件末尾换行符"
c04f5ac3 2753
7aea43ff 2754#: builtin/apply.c:4585
8ada9598 2755msgid "do not trust the line counts in the hunk headers"
81809b99 2756msgstr "不信任补丁片段的头信息中的行号"
c04f5ac3 2757
7aea43ff 2758#: builtin/apply.c:4587
8ada9598 2759msgid "root"
81809b99 2760msgstr "根目录"
c04f5ac3 2761
7aea43ff 2762#: builtin/apply.c:4588
8ada9598 2763msgid "prepend <root> to all filenames"
81809b99 2764msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 2765
7aea43ff 2766#: builtin/apply.c:4610
23ff3338 2767msgid "--3way outside a repository"
160fb2b2 2768msgstr "--3way 在一个仓库之外"
23ff3338 2769
7aea43ff 2770#: builtin/apply.c:4618
8ada9598 2771msgid "--index outside a repository"
160fb2b2 2772msgstr "--index 在一个仓库之外"
c04f5ac3 2773
7aea43ff 2774#: builtin/apply.c:4621
8ada9598 2775msgid "--cached outside a repository"
160fb2b2 2776msgstr "--cached 在一个仓库之外"
c04f5ac3 2777
7aea43ff 2778#: builtin/apply.c:4640
81809b99 2779#, c-format
8ada9598 2780msgid "can't open patch '%s'"
81809b99 2781msgstr "不能打开补丁 '%s'"
c04f5ac3 2782
7aea43ff 2783#: builtin/apply.c:4654
c04f5ac3 2784#, c-format
8ada9598
JX
2785msgid "squelched %d whitespace error"
2786msgid_plural "squelched %d whitespace errors"
81809b99 2787msgstr[0] "抑制下仍有 %d 个空白字符误用"
5ae481e0 2788msgstr[1] "抑制下仍有 %d 个空白字符误用"
c04f5ac3 2789
7aea43ff 2790#: builtin/apply.c:4660 builtin/apply.c:4670
8ada9598
JX
2791#, c-format
2792msgid "%d line adds whitespace errors."
2793msgid_plural "%d lines add whitespace errors."
81809b99 2794msgstr[0] "%d 行有空白字符误用。"
5ae481e0 2795msgstr[1] "%d 行有空白字符误用。"
c04f5ac3
JX
2796
2797#: builtin/archive.c:17
2798#, c-format
2799msgid "could not create archive file '%s'"
90e6ef53 2800msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
2801
2802#: builtin/archive.c:20
2803msgid "could not redirect output"
195febda 2804msgstr "不能重定向输出"
c04f5ac3
JX
2805
2806#: builtin/archive.c:37
2807msgid "git archive: Remote with no URL"
4375c10e 2808msgstr "git archive:未提供远程 URL"
c04f5ac3
JX
2809
2810#: builtin/archive.c:58
2811msgid "git archive: expected ACK/NAK, got EOF"
4375c10e 2812msgstr "git archive:应为 ACK/NACK,却得到 EOF"
c04f5ac3 2813
1003b3a5 2814#: builtin/archive.c:61
c04f5ac3
JX
2815#, c-format
2816msgid "git archive: NACK %s"
90e6ef53 2817msgstr "git archive:NACK %s"
c04f5ac3 2818
1003b3a5 2819#: builtin/archive.c:63
c04f5ac3
JX
2820#, c-format
2821msgid "remote error: %s"
2822msgstr "远程错误:%s"
2823
1003b3a5 2824#: builtin/archive.c:64
c04f5ac3 2825msgid "git archive: protocol error"
90e6ef53 2826msgstr "git archive:协议错误"
c04f5ac3 2827
1003b3a5 2828#: builtin/archive.c:68
c04f5ac3 2829msgid "git archive: expected a flush"
195febda 2830msgstr "git archive:应为刷新"
c04f5ac3 2831
ef317cd5
JX
2832#: builtin/bisect--helper.c:7
2833msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 2834msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5
JX
2835
2836#: builtin/bisect--helper.c:17
2837msgid "perform 'git bisect next'"
07432cef 2838msgstr "执行 'git bisect next'"
ef317cd5
JX
2839
2840#: builtin/bisect--helper.c:19
2841msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 2842msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 2843
7aea43ff
JX
2844#: builtin/blame.c:31
2845msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
2846msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 2847
7aea43ff 2848#: builtin/blame.c:36
814ff314
JX
2849msgid "<rev-opts> are documented in git-rev-list(1)"
2850msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 2851
814ff314 2852#: builtin/blame.c:2500
ef317cd5 2853msgid "Show blame entries as we find them, incrementally"
07432cef 2854msgstr "增量式地显示发现的 blame 条目"
ef317cd5 2855
814ff314 2856#: builtin/blame.c:2501
ef317cd5 2857msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 2858msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 2859
814ff314 2860#: builtin/blame.c:2502
ef317cd5 2861msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 2862msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 2863
814ff314 2864#: builtin/blame.c:2503
ef317cd5 2865msgid "Show work cost statistics"
07432cef 2866msgstr "显示命令消耗统计"
ef317cd5 2867
814ff314 2868#: builtin/blame.c:2504
ef317cd5 2869msgid "Show output score for blame entries"
07432cef 2870msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 2871
814ff314 2872#: builtin/blame.c:2505
ef317cd5 2873msgid "Show original filename (Default: auto)"
07432cef 2874msgstr "显示原始文件名(默认:自动)"
ef317cd5 2875
814ff314 2876#: builtin/blame.c:2506
ef317cd5 2877msgid "Show original linenumber (Default: off)"
07432cef 2878msgstr "显示原始的行号(默认:关闭)"
ef317cd5 2879
814ff314 2880#: builtin/blame.c:2507
ef317cd5 2881msgid "Show in a format designed for machine consumption"
07432cef 2882msgstr "显示为一个适合机器读取的格式"
ef317cd5 2883
814ff314 2884#: builtin/blame.c:2508
ef317cd5 2885msgid "Show porcelain format with per-line commit information"
07432cef 2886msgstr "为每一行显示机器适用的提交信息"
ef317cd5 2887
814ff314 2888#: builtin/blame.c:2509
ef317cd5 2889msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 2890msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 2891
814ff314 2892#: builtin/blame.c:2510
ef317cd5 2893msgid "Show raw timestamp (Default: off)"
07432cef 2894msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 2895
814ff314 2896#: builtin/blame.c:2511
ef317cd5 2897msgid "Show long commit SHA1 (Default: off)"
4375c10e 2898msgstr "显示长的 SHA1 提交号(默认:关闭)"
ef317cd5 2899
814ff314 2900#: builtin/blame.c:2512
ef317cd5 2901msgid "Suppress author name and timestamp (Default: off)"
07432cef 2902msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 2903
814ff314 2904#: builtin/blame.c:2513
ef317cd5 2905msgid "Show author email instead of name (Default: off)"
07432cef 2906msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 2907
814ff314 2908#: builtin/blame.c:2514
ef317cd5 2909msgid "Ignore whitespace differences"
07432cef 2910msgstr "忽略空白差异"
ef317cd5 2911
814ff314 2912#: builtin/blame.c:2515
ef317cd5 2913msgid "Spend extra cycles to find better match"
07432cef 2914msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 2915
814ff314 2916#: builtin/blame.c:2516
ef317cd5 2917msgid "Use revisions from <file> instead of calling git-rev-list"
d9d56b23 2918msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 2919
814ff314 2920#: builtin/blame.c:2517
ef317cd5 2921msgid "Use <file>'s contents as the final image"
d9d56b23 2922msgstr "使用 <文件> 的内容作为最终的图片"
ef317cd5 2923
814ff314 2924#: builtin/blame.c:2518 builtin/blame.c:2519
ef317cd5 2925msgid "score"
07432cef 2926msgstr "得分"
ef317cd5 2927
814ff314 2928#: builtin/blame.c:2518
ef317cd5 2929msgid "Find line copies within and across files"
07432cef 2930msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 2931
814ff314 2932#: builtin/blame.c:2519
ef317cd5 2933msgid "Find line movements within and across files"
07432cef 2934msgstr "找到文件内及跨文件的行移动"
ef317cd5 2935
814ff314 2936#: builtin/blame.c:2520
ef317cd5 2937msgid "n,m"
07432cef 2938msgstr "n,m"
ef317cd5 2939
814ff314 2940#: builtin/blame.c:2520
ef317cd5 2941msgid "Process only line range n,m, counting from 1"
07432cef 2942msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 2943
6c94aba5
JX
2944#. TRANSLATORS: This string is used to tell us the maximum
2945#. display width for a relative timestamp in "git blame"
2946#. output. For C locale, "4 years, 11 months ago", which
2947#. takes 22 places, is the longest among various forms of
2948#. relative timestamps, but your language may need more or
2949#. fewer display columns.
814ff314 2950#: builtin/blame.c:2601
6c94aba5
JX
2951msgid "4 years, 11 months ago"
2952msgstr "4 年 11 个月前"
2953
1003b3a5 2954#: builtin/branch.c:24
814ff314
JX
2955msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
2956msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
ef317cd5 2957
1003b3a5 2958#: builtin/branch.c:25
814ff314
JX
2959msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
2960msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 2961
1003b3a5 2962#: builtin/branch.c:26
814ff314
JX
2963msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
2964msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 2965
1003b3a5 2966#: builtin/branch.c:27
814ff314
JX
2967msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
2968msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 2969
90e6ef53 2970# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
7aea43ff 2971#: builtin/branch.c:150
c04f5ac3
JX
2972#, c-format
2973msgid ""
2974"deleting branch '%s' that has been merged to\n"
2975" '%s', but not yet merged to HEAD."
2976msgstr ""
70fc47bf 2977"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
2978" '%s',但未合并到 HEAD。"
2979
90e6ef53 2980# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
7aea43ff 2981#: builtin/branch.c:154
c04f5ac3
JX
2982#, c-format
2983msgid ""
2984"not deleting branch '%s' that is not yet merged to\n"
2985" '%s', even though it is merged to HEAD."
2986msgstr ""
70fc47bf
T
2987"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2988" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 2989
7aea43ff 2990#: builtin/branch.c:168
07432cef
WS
2991#, c-format
2992msgid "Couldn't look up commit object for '%s'"
2993msgstr "无法查询 '%s' 指向的提交对象"
2994
7aea43ff 2995#: builtin/branch.c:172
07432cef
WS
2996#, c-format
2997msgid ""
2998"The branch '%s' is not fully merged.\n"
2999"If you are sure you want to delete it, run 'git branch -D %s'."
3000msgstr ""
3001"分支 '%s' 没有完全合并。\n"
3002"如果您确认要删除它,执行 'git branch -D %s'。"
3003
7aea43ff 3004#: builtin/branch.c:185
07432cef
WS
3005msgid "Update of config-file failed"
3006msgstr "无法更新 config 文件"
3007
7aea43ff 3008#: builtin/branch.c:213
c04f5ac3 3009msgid "cannot use -a with -d"
649900bc 3010msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 3011
7aea43ff 3012#: builtin/branch.c:219
c04f5ac3
JX
3013msgid "Couldn't look up commit object for HEAD"
3014msgstr "无法查询 HEAD 指向的提交对象"
3015
7aea43ff 3016#: builtin/branch.c:227
c04f5ac3
JX
3017#, c-format
3018msgid "Cannot delete the branch '%s' which you are currently on."
3019msgstr "无法删除您当前所在的分支 '%s'。"
3020
7aea43ff 3021#: builtin/branch.c:243
5ae481e0 3022#, c-format
7aea43ff
JX
3023msgid "remote-tracking branch '%s' not found."
3024msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 3025
7aea43ff 3026#: builtin/branch.c:244
81809b99 3027#, c-format
8ada9598 3028msgid "branch '%s' not found."
81809b99 3029msgstr "分支 '%s' 未发现。"
8ada9598 3030
7aea43ff 3031#: builtin/branch.c:258
81809b99 3032#, c-format
7aea43ff
JX
3033msgid "Error deleting remote-tracking branch '%s'"
3034msgstr "无法删除远程跟踪分支 '%s'"
c04f5ac3 3035
7aea43ff 3036#: builtin/branch.c:259
81809b99 3037#, c-format
8ada9598 3038msgid "Error deleting branch '%s'"
7aea43ff 3039msgstr "无法删除分支 '%s'"
8ada9598 3040
7aea43ff 3041#: builtin/branch.c:266
81809b99 3042#, c-format
7aea43ff
JX
3043msgid "Deleted remote-tracking branch %s (was %s).\n"
3044msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 3045
7aea43ff 3046#: builtin/branch.c:267
81809b99 3047#, c-format
8ada9598 3048msgid "Deleted branch %s (was %s).\n"
81809b99 3049msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 3050
7aea43ff 3051#: builtin/branch.c:368
c04f5ac3
JX
3052#, c-format
3053msgid "branch '%s' does not point at a commit"
3054msgstr "分支 '%s' 未指向一个提交"
3055
7aea43ff 3056#: builtin/branch.c:451
81809b99 3057#, c-format
90314792
JX
3058msgid "[%s: gone]"
3059msgstr "[%s: 丢失]"
3060
7aea43ff 3061#: builtin/branch.c:456
90314792
JX
3062#, c-format
3063msgid "[%s]"
3064msgstr "[%s]"
3065
7aea43ff 3066#: builtin/branch.c:461
90314792 3067#, c-format
8ada9598 3068msgid "[%s: behind %d]"
81809b99 3069msgstr "[%s:落后 %d]"
c04f5ac3 3070
7aea43ff 3071#: builtin/branch.c:463
81809b99 3072#, c-format
8ada9598 3073msgid "[behind %d]"
81809b99 3074msgstr "[落后 %d]"
8ada9598 3075
7aea43ff 3076#: builtin/branch.c:467
81809b99 3077#, c-format
8ada9598 3078msgid "[%s: ahead %d]"
81809b99 3079msgstr "[%s:领先 %d]"
c04f5ac3 3080
7aea43ff 3081#: builtin/branch.c:469
81809b99 3082#, c-format
8ada9598 3083msgid "[ahead %d]"
81809b99 3084msgstr "[领先 %d]"
8ada9598 3085
7aea43ff 3086#: builtin/branch.c:472
81809b99 3087#, c-format
8ada9598 3088msgid "[%s: ahead %d, behind %d]"
81809b99 3089msgstr "[%s:领先 %d,落后 %d]"
8ada9598 3090
7aea43ff 3091#: builtin/branch.c:475
81809b99 3092#, c-format
8ada9598 3093msgid "[ahead %d, behind %d]"
81809b99 3094msgstr "[领先 %d,落后 %d]"
c04f5ac3 3095
7aea43ff 3096#: builtin/branch.c:488
a77c07d9
JX
3097msgid " **** invalid ref ****"
3098msgstr " **** 无效引用 ****"
3099
7aea43ff 3100#: builtin/branch.c:579
1003b3a5
JX
3101#, c-format
3102msgid "(no branch, rebasing %s)"
3103msgstr "(非分支,正变基 %s)"
3104
7aea43ff 3105#: builtin/branch.c:582
1003b3a5
JX
3106#, c-format
3107msgid "(no branch, bisect started on %s)"
3108msgstr "(非分支,二分查找开始于 %s)"
3109
7aea43ff 3110#: builtin/branch.c:588
1003b3a5 3111#, c-format
814ff314
JX
3112msgid "(HEAD detached at %s)"
3113msgstr "(头指针分离于 %s)"
1003b3a5 3114
7aea43ff 3115#: builtin/branch.c:591
814ff314
JX
3116#, c-format
3117msgid "(HEAD detached from %s)"
3118msgstr "(头指针分离自 %s)"
3119
7aea43ff 3120#: builtin/branch.c:595
c04f5ac3
JX
3121msgid "(no branch)"
3122msgstr "(非分支)"
3123
7aea43ff 3124#: builtin/branch.c:642
a77c07d9
JX
3125#, c-format
3126msgid "object '%s' does not point to a commit"
3127msgstr "对象 '%s' 没有指向一个提交"
3128
7aea43ff 3129#: builtin/branch.c:690
c04f5ac3 3130msgid "some refs could not be read"
90e6ef53 3131msgstr "一些引用不能读取"
c04f5ac3 3132
7aea43ff 3133#: builtin/branch.c:703
c04f5ac3 3134msgid "cannot rename the current branch while not on any."
90e6ef53 3135msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 3136
7aea43ff 3137#: builtin/branch.c:713
c04f5ac3
JX
3138#, c-format
3139msgid "Invalid branch name: '%s'"
3140msgstr "无效的分支名:'%s'"
3141
7aea43ff 3142#: builtin/branch.c:728
c04f5ac3
JX
3143msgid "Branch rename failed"
3144msgstr "分支重命名失败"
3145
7aea43ff 3146#: builtin/branch.c:732
c04f5ac3
JX
3147#, c-format
3148msgid "Renamed a misnamed branch '%s' away"
3149msgstr "重命名掉一个错误命名的旧分支 '%s'"
3150
7aea43ff 3151#: builtin/branch.c:736
c04f5ac3
JX
3152#, c-format
3153msgid "Branch renamed to %s, but HEAD is not updated!"
3154msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3155
7aea43ff 3156#: builtin/branch.c:743
c04f5ac3
JX
3157msgid "Branch is renamed, but update of config-file failed"
3158msgstr "分支被重命名,但更新 config 文件失败"
3159
7aea43ff 3160#: builtin/branch.c:758
c04f5ac3
JX
3161#, c-format
3162msgid "malformed object name %s"
3163msgstr "非法的对象名 %s"
3164
7aea43ff 3165#: builtin/branch.c:780
81809b99 3166#, c-format
8ada9598 3167msgid "could not write branch description template: %s"
81809b99 3168msgstr "不能写分支描述模版:%s"
c04f5ac3 3169
7aea43ff 3170#: builtin/branch.c:810
ef317cd5 3171msgid "Generic options"
07432cef 3172msgstr "通用选项"
c04f5ac3 3173
7aea43ff 3174#: builtin/branch.c:812
ef317cd5 3175msgid "show hash and subject, give twice for upstream branch"
07432cef 3176msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 3177
7aea43ff 3178#: builtin/branch.c:813
ef317cd5 3179msgid "suppress informational messages"
07432cef 3180msgstr "不显示信息"
8ada9598 3181
7aea43ff 3182#: builtin/branch.c:814
ef317cd5 3183msgid "set up tracking mode (see git-pull(1))"
07432cef 3184msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 3185
7aea43ff 3186#: builtin/branch.c:816
ef317cd5 3187msgid "change upstream info"
07432cef 3188msgstr "改变上游信息"
c04f5ac3 3189
7aea43ff 3190#: builtin/branch.c:820
ef317cd5 3191msgid "use colored output"
07432cef 3192msgstr "使用彩色输出"
c04f5ac3 3193
7aea43ff 3194#: builtin/branch.c:821
ef317cd5 3195msgid "act on remote-tracking branches"
07432cef 3196msgstr "作用于远程跟踪分支"
c04f5ac3 3197
7aea43ff
JX
3198#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851
3199#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582
3200#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616
220c313c 3201#: builtin/tag.c:622
ef317cd5 3202msgid "commit"
07432cef 3203msgstr "提交"
c04f5ac3 3204
7aea43ff 3205#: builtin/branch.c:825 builtin/branch.c:831
ef317cd5 3206msgid "print only branches that contain the commit"
07432cef 3207msgstr "只打印包含该提交的分支"
c04f5ac3 3208
7aea43ff 3209#: builtin/branch.c:837
ef317cd5 3210msgid "Specific git-branch actions:"
07432cef 3211msgstr "具体的 git-branch 动作:"
c04f5ac3 3212
7aea43ff 3213#: builtin/branch.c:838
ef317cd5 3214msgid "list both remote-tracking and local branches"
07432cef 3215msgstr "列出远程跟踪及本地分支"
c04f5ac3 3216
7aea43ff 3217#: builtin/branch.c:840
ef317cd5 3218msgid "delete fully merged branch"
07432cef 3219msgstr "删除完全合并的分支"
c04f5ac3 3220
7aea43ff 3221#: builtin/branch.c:841
ef317cd5 3222msgid "delete branch (even if not merged)"
07432cef 3223msgstr "删除分支(即使没有合并)"
c04f5ac3 3224
7aea43ff 3225#: builtin/branch.c:842
ef317cd5 3226msgid "move/rename a branch and its reflog"
07432cef 3227msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 3228
7aea43ff 3229#: builtin/branch.c:843
ef317cd5 3230msgid "move/rename a branch, even if target exists"
07432cef 3231msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 3232
7aea43ff 3233#: builtin/branch.c:844
ef317cd5 3234msgid "list branch names"
07432cef 3235msgstr "列出分支名"
c04f5ac3 3236
7aea43ff 3237#: builtin/branch.c:845
ef317cd5 3238msgid "create the branch's reflog"
07432cef 3239msgstr "创建分支的引用日志"
ef317cd5 3240
7aea43ff 3241#: builtin/branch.c:847
ef317cd5 3242msgid "edit the description for the branch"
07432cef 3243msgstr "标记分支的描述"
ef317cd5 3244
7aea43ff 3245#: builtin/branch.c:848
04cb2f28
JX
3246msgid "force creation, move/rename, deletion"
3247msgstr "强制创建、移动/重命名、删除"
ef317cd5 3248
7aea43ff 3249#: builtin/branch.c:851
ef317cd5 3250msgid "print only not merged branches"
07432cef 3251msgstr "只打印没有合并的分支"
ef317cd5 3252
7aea43ff 3253#: builtin/branch.c:857
ef317cd5 3254msgid "print only merged branches"
07432cef 3255msgstr "只打印合并的分支"
ef317cd5 3256
7aea43ff 3257#: builtin/branch.c:861
ef317cd5 3258msgid "list branches in columns"
07432cef 3259msgstr "以列的方式显示分支"
ef317cd5 3260
7aea43ff 3261#: builtin/branch.c:874
c04f5ac3
JX
3262msgid "Failed to resolve HEAD as a valid ref."
3263msgstr "无法将 HEAD 解析为有效引用。"
3264
5bb01d4f 3265#: builtin/branch.c:878 builtin/clone.c:622
c04f5ac3 3266msgid "HEAD not found below refs/heads!"
90e6ef53 3267msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 3268
7aea43ff 3269#: builtin/branch.c:900
8ada9598 3270msgid "--column and --verbose are incompatible"
81809b99 3271msgstr "--column 和 --verbose 不兼容"
8ada9598 3272
7aea43ff 3273#: builtin/branch.c:911 builtin/branch.c:950
a77c07d9
JX
3274msgid "branch name required"
3275msgstr "必须提供分支名"
3276
7aea43ff 3277#: builtin/branch.c:926
a77c07d9
JX
3278msgid "Cannot give description to detached HEAD"
3279msgstr "不能向分离头指针提供描述"
3280
7aea43ff 3281#: builtin/branch.c:931
a77c07d9
JX
3282msgid "cannot edit description of more than one branch"
3283msgstr "不能为一个以上的分支编辑描述"
3284
7aea43ff 3285#: builtin/branch.c:938
a77c07d9
JX
3286#, c-format
3287msgid "No commit on branch '%s' yet."
3288msgstr "分支 '%s' 尚无提交。"
3289
7aea43ff 3290#: builtin/branch.c:941
a77c07d9
JX
3291#, c-format
3292msgid "No branch named '%s'."
3293msgstr "没有分支 '%s'。"
3294
7aea43ff 3295#: builtin/branch.c:956
a77c07d9
JX
3296msgid "too many branches for a rename operation"
3297msgstr "为重命名操作提供了太多的分支名"
3298
7aea43ff 3299#: builtin/branch.c:961
1003b3a5
JX
3300msgid "too many branches to set new upstream"
3301msgstr "为设置新上游提供了太多的分支名"
3302
7aea43ff 3303#: builtin/branch.c:965
1003b3a5
JX
3304#, c-format
3305msgid ""
3306"could not set upstream of HEAD to %s when it does not point to any branch."
3307msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3308
7aea43ff 3309#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011
1003b3a5
JX
3310#, c-format
3311msgid "no such branch '%s'"
3312msgstr "没有此分支 '%s'"
3313
7aea43ff 3314#: builtin/branch.c:972
07432cef 3315#, c-format
ef317cd5 3316msgid "branch '%s' does not exist"
07432cef 3317msgstr "分支 '%s' 不存在"
ef317cd5 3318
7aea43ff 3319#: builtin/branch.c:984
1003b3a5
JX
3320msgid "too many branches to unset upstream"
3321msgstr "为取消上游设置操作提供了太多的分支名"
3322
7aea43ff 3323#: builtin/branch.c:988
1003b3a5
JX
3324msgid "could not unset upstream of HEAD when it does not point to any branch."
3325msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3326
7aea43ff 3327#: builtin/branch.c:994
ef317cd5
JX
3328#, c-format
3329msgid "Branch '%s' has no upstream information"
07432cef 3330msgstr "分支 '%s' 没有上游信息"
ef317cd5 3331
7aea43ff 3332#: builtin/branch.c:1008
1003b3a5
JX
3333msgid "it does not make sense to create 'HEAD' manually"
3334msgstr "手工创建 'HEAD' 没有意义"
3335
7aea43ff 3336#: builtin/branch.c:1014
c04f5ac3
JX
3337msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3338msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3339
7aea43ff 3340#: builtin/branch.c:1017
ef317cd5
JX
3341#, c-format
3342msgid ""
3343"The --set-upstream flag is deprecated and will be removed. Consider using --"
3344"track or --set-upstream-to\n"
3345msgstr ""
07432cef 3346"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
ef317cd5 3347
7aea43ff 3348#: builtin/branch.c:1034
ef317cd5
JX
3349#, c-format
3350msgid ""
3351"\n"
3352"If you wanted to make '%s' track '%s', do this:\n"
3353"\n"
3354msgstr ""
07432cef
WS
3355"\n"
3356"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3357"\n"
ef317cd5 3358
7aea43ff 3359#: builtin/branch.c:1035
07432cef 3360#, c-format
ef317cd5 3361msgid " git branch -d %s\n"
07432cef 3362msgstr " git branch -d %s\n"
ef317cd5 3363
7aea43ff 3364#: builtin/branch.c:1036
ef317cd5
JX
3365#, c-format
3366msgid " git branch --set-upstream-to %s\n"
07432cef 3367msgstr " git branch --set-upstream-to %s\n"
ef317cd5 3368
7aea43ff 3369#: builtin/bundle.c:51
c04f5ac3
JX
3370#, c-format
3371msgid "%s is okay\n"
3372msgstr "%s 可以\n"
3373
7aea43ff 3374#: builtin/bundle.c:64
c04f5ac3 3375msgid "Need a repository to create a bundle."
160fb2b2 3376msgstr "需要一个仓库来创建包。"
c04f5ac3 3377
7aea43ff 3378#: builtin/bundle.c:68
c04f5ac3 3379msgid "Need a repository to unbundle."
160fb2b2 3380msgstr "需要一个仓库来解包。"
c04f5ac3 3381
7aea43ff
JX
3382#: builtin/cat-file.c:369
3383msgid ""
3384"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3385"<type>|--textconv) <object>"
3386msgstr ""
3387"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
3388">|--textconv) <对象>"
ef317cd5 3389
7aea43ff
JX
3390#: builtin/cat-file.c:370
3391msgid ""
3392"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
3393"objects>"
3394msgstr ""
3395"git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>"
ef317cd5 3396
7aea43ff 3397#: builtin/cat-file.c:407
ef317cd5 3398msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 3399msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 3400
7aea43ff 3401#: builtin/cat-file.c:408
ef317cd5 3402msgid "show object type"
07432cef 3403msgstr "显示对象类型"
ef317cd5 3404
7aea43ff 3405#: builtin/cat-file.c:409
ef317cd5 3406msgid "show object size"
07432cef 3407msgstr "显示对象大小"
ef317cd5 3408
7aea43ff 3409#: builtin/cat-file.c:411
ef317cd5 3410msgid "exit with zero when there's no error"
07432cef 3411msgstr "当没有错误时退出并返回零"
ef317cd5 3412
7aea43ff 3413#: builtin/cat-file.c:412
ef317cd5 3414msgid "pretty-print object's content"
07432cef 3415msgstr "美观地打印对象的内容"
ef317cd5 3416
7aea43ff 3417#: builtin/cat-file.c:414
ef317cd5 3418msgid "for blob objects, run textconv on object's content"
160fb2b2 3419msgstr "对于数据对象,对其内容执行 textconv"
ef317cd5 3420
7aea43ff
JX
3421#: builtin/cat-file.c:416
3422msgid "allow -s and -t to work with broken/corrupt objects"
3423msgstr "允许 -s 和 -t 对损坏的对象生效"
3424
3425#: builtin/cat-file.c:418
ef317cd5 3426msgid "show info and content of objects fed from the standard input"
07432cef 3427msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 3428
7aea43ff 3429#: builtin/cat-file.c:421
ef317cd5 3430msgid "show info about objects fed from the standard input"
07432cef 3431msgstr "显示从标准输入提供的对象的信息"
ef317cd5 3432
7aea43ff
JX
3433#: builtin/cat-file.c:424
3434msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3435msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
3436
ef317cd5 3437#: builtin/check-attr.c:11
814ff314
JX
3438msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3439msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5
JX
3440
3441#: builtin/check-attr.c:12
814ff314
JX
3442msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
3443msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"
ef317cd5
JX
3444
3445#: builtin/check-attr.c:19
3446msgid "report all attributes set on file"
07432cef 3447msgstr "报告设置在文件上的所有属性"
ef317cd5
JX
3448
3449#: builtin/check-attr.c:20
3450msgid "use .gitattributes only from the index"
07432cef 3451msgstr "只使用索引中的 .gitattributes"
ef317cd5 3452
7aea43ff 3453#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
ef317cd5 3454msgid "read file names from stdin"
07432cef 3455msgstr "从标准输入读出文件名"
ef317cd5 3456
a77c07d9 3457#: builtin/check-attr.c:23 builtin/check-ignore.c:24
90314792
JX
3458msgid "terminate input and output records by a NUL character"
3459msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 3460
5bb01d4f 3461#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
a77c07d9
JX
3462msgid "suppress progress reporting"
3463msgstr "不显示进度报告"
3464
2e8451e8
JX
3465#: builtin/check-ignore.c:26
3466msgid "show non-matching input paths"
3467msgstr "显示未匹配的输入路径"
3468
90314792
JX
3469#: builtin/check-ignore.c:28
3470msgid "ignore index when checking"
3471msgstr "检查时忽略索引"
3472
3473#: builtin/check-ignore.c:154
a77c07d9
JX
3474msgid "cannot specify pathnames with --stdin"
3475msgstr "不能同时提供路径及 --stdin 参数"
3476
90314792 3477#: builtin/check-ignore.c:157
a77c07d9
JX
3478msgid "-z only makes sense with --stdin"
3479msgstr "-z 需要和 --stdin 参数共用才有意义"
3480
90314792 3481#: builtin/check-ignore.c:159
a77c07d9
JX
3482msgid "no path specified"
3483msgstr "未指定路径"
3484
90314792 3485#: builtin/check-ignore.c:163
a77c07d9
JX
3486msgid "--quiet is only valid with a single pathname"
3487msgstr "参数 --quiet 只在提供一个路径名时有效"
3488
90314792 3489#: builtin/check-ignore.c:165
a77c07d9
JX
3490msgid "cannot have both --quiet and --verbose"
3491msgstr "不能同时提供 --quiet 和 --verbose 参数"
3492
90314792 3493#: builtin/check-ignore.c:168
2e8451e8
JX
3494msgid "--non-matching is only valid with --verbose"
3495msgstr "--non-matching 选项只在使用 --verbose 时有效"
3496
3497#: builtin/check-mailmap.c:8
814ff314
JX
3498msgid "git check-mailmap [<options>] <contact>..."
3499msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8
JX
3500
3501#: builtin/check-mailmap.c:13
3502msgid "also read contacts from stdin"
3503msgstr "还从标准输入读取联系地址"
3504
3505#: builtin/check-mailmap.c:24
3506#, c-format
3507msgid "unable to parse contact: %s"
3508msgstr "不能解析联系地址:%s"
3509
3510#: builtin/check-mailmap.c:47
3511msgid "no contacts specified"
3512msgstr "未指定联系地址"
3513
ef317cd5 3514#: builtin/checkout-index.c:126
814ff314
JX
3515msgid "git checkout-index [<options>] [--] [<file>...]"
3516msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 3517
6acbf033 3518#: builtin/checkout-index.c:188
ef317cd5 3519msgid "check out all files in the index"
07432cef 3520msgstr "检出索引区的所有文件"
ef317cd5 3521
6acbf033 3522#: builtin/checkout-index.c:189
ef317cd5 3523msgid "force overwrite of existing files"
07432cef 3524msgstr "强制覆盖现有的文件"
ef317cd5 3525
6acbf033 3526#: builtin/checkout-index.c:191
ef317cd5 3527msgid "no warning for existing files and files not in index"
07432cef 3528msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 3529
6acbf033 3530#: builtin/checkout-index.c:193
ef317cd5 3531msgid "don't checkout new files"
07432cef 3532msgstr "不检出新文件"
ef317cd5 3533
6acbf033 3534#: builtin/checkout-index.c:195
ef317cd5 3535msgid "update stat information in the index file"
07432cef 3536msgstr "更新索引中文件的状态信息"
ef317cd5 3537
6acbf033 3538#: builtin/checkout-index.c:201
ef317cd5 3539msgid "read list of paths from the standard input"
07432cef 3540msgstr "从标准输入读取路径列表"
ef317cd5 3541
6acbf033 3542#: builtin/checkout-index.c:203
ef317cd5 3543msgid "write the content to temporary files"
07432cef 3544msgstr "将内容写入临时文件"
ef317cd5 3545
6acbf033 3546#: builtin/checkout-index.c:204 builtin/column.c:30
ef317cd5 3547msgid "string"
07432cef 3548msgstr "字符串"
ef317cd5 3549
6acbf033 3550#: builtin/checkout-index.c:205
ef317cd5 3551msgid "when creating files, prepend <string>"
4375c10e 3552msgstr "在创建文件时,在前面加上 <字符串>"
ef317cd5 3553
6acbf033 3554#: builtin/checkout-index.c:208
ef317cd5 3555msgid "copy out the files from named stage"
07432cef 3556msgstr "从指定暂存区中拷出文件"
ef317cd5 3557
5bb01d4f 3558#: builtin/checkout.c:24
814ff314
JX
3559msgid "git checkout [<options>] <branch>"
3560msgstr "git checkout [<选项>] <分支>"
ef317cd5 3561
5bb01d4f 3562#: builtin/checkout.c:25
814ff314
JX
3563msgid "git checkout [<options>] [<branch>] -- <file>..."
3564msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 3565
5bb01d4f 3566#: builtin/checkout.c:134 builtin/checkout.c:167
c04f5ac3
JX
3567#, c-format
3568msgid "path '%s' does not have our version"
3569msgstr "路径 '%s' 没有我们的版本"
3570
5bb01d4f 3571#: builtin/checkout.c:136 builtin/checkout.c:169
c04f5ac3
JX
3572#, c-format
3573msgid "path '%s' does not have their version"
3574msgstr "路径 '%s' 没有他们的版本"
3575
5bb01d4f 3576#: builtin/checkout.c:152
c04f5ac3
JX
3577#, c-format
3578msgid "path '%s' does not have all necessary versions"
3579msgstr "路径 '%s' 没有全部必须的版本"
3580
5bb01d4f 3581#: builtin/checkout.c:196
c04f5ac3
JX
3582#, c-format
3583msgid "path '%s' does not have necessary versions"
3584msgstr "路径 '%s' 没有必须的版本"
3585
5bb01d4f 3586#: builtin/checkout.c:213
c04f5ac3
JX
3587#, c-format
3588msgid "path '%s': cannot merge"
90e6ef53 3589msgstr "path '%s':无法合并"
c04f5ac3 3590
5bb01d4f 3591#: builtin/checkout.c:230
c04f5ac3
JX
3592#, c-format
3593msgid "Unable to add merge result for '%s'"
3594msgstr "无法为 '%s' 添加合并结果"
3595
5bb01d4f
JX
3596#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
3597#: builtin/checkout.c:260
07432cef 3598#, c-format
ef317cd5 3599msgid "'%s' cannot be used with updating paths"
07432cef 3600msgstr "'%s' 不能在更新路径时使用"
ef317cd5 3601
5bb01d4f 3602#: builtin/checkout.c:263 builtin/checkout.c:266
07432cef 3603#, c-format
ef317cd5 3604msgid "'%s' cannot be used with %s"
07432cef 3605msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 3606
5bb01d4f 3607#: builtin/checkout.c:269
ef317cd5
JX
3608#, c-format
3609msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 3610msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 3611
5bb01d4f 3612#: builtin/checkout.c:280 builtin/checkout.c:474
c04f5ac3 3613msgid "corrupt index file"
90e6ef53 3614msgstr "损坏的索引文件"
c04f5ac3 3615
5bb01d4f 3616#: builtin/checkout.c:340 builtin/checkout.c:347
c04f5ac3
JX
3617#, c-format
3618msgid "path '%s' is unmerged"
3619msgstr "路径 '%s' 未合并"
3620
5bb01d4f 3621#: builtin/checkout.c:496
c04f5ac3 3622msgid "you need to resolve your current index first"
90e6ef53 3623msgstr "您需要先解决当前索引的冲突"
c04f5ac3 3624
5bb01d4f 3625#: builtin/checkout.c:627
c04f5ac3
JX
3626#, c-format
3627msgid "Can not do reflog for '%s'\n"
90e6ef53 3628msgstr "不能对 '%s' 执行 reflog 操作\n"
c04f5ac3 3629
5bb01d4f 3630#: builtin/checkout.c:663
c04f5ac3
JX
3631msgid "HEAD is now at"
3632msgstr "HEAD 目前位于"
3633
5bb01d4f 3634#: builtin/checkout.c:670
c04f5ac3
JX
3635#, c-format
3636msgid "Reset branch '%s'\n"
3637msgstr "重置分支 '%s'\n"
3638
5bb01d4f 3639#: builtin/checkout.c:673
c04f5ac3
JX
3640#, c-format
3641msgid "Already on '%s'\n"
3642msgstr "已经位于 '%s'\n"
3643
5bb01d4f 3644#: builtin/checkout.c:677
c04f5ac3
JX
3645#, c-format
3646msgid "Switched to and reset branch '%s'\n"
3647msgstr "切换并重置分支 '%s'\n"
3648
5bb01d4f 3649#: builtin/checkout.c:679 builtin/checkout.c:1134
c04f5ac3
JX
3650#, c-format
3651msgid "Switched to a new branch '%s'\n"
3652msgstr "切换到一个新分支 '%s'\n"
3653
5bb01d4f 3654#: builtin/checkout.c:681
c04f5ac3
JX
3655#, c-format
3656msgid "Switched to branch '%s'\n"
3657msgstr "切换到分支 '%s'\n"
3658
90e6ef53 3659# 译者:注意保持前导空格
5bb01d4f 3660#: builtin/checkout.c:733
c04f5ac3
JX
3661#, c-format
3662msgid " ... and %d more.\n"
90e6ef53 3663msgstr " ... 及其它 %d 个。\n"
c04f5ac3 3664
5bb01d4f 3665#: builtin/checkout.c:739
c04f5ac3
JX
3666#, c-format
3667msgid ""
3668"Warning: you are leaving %d commit behind, not connected to\n"
3669"any of your branches:\n"
3670"\n"
3671"%s\n"
3672msgid_plural ""
3673"Warning: you are leaving %d commits behind, not connected to\n"
3674"any of your branches:\n"
3675"\n"
3676"%s\n"
3677msgstr[0] ""
3678"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3679"\n"
3680"%s\n"
5ae481e0
JX
3681msgstr[1] ""
3682"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3683"\n"
3684"%s\n"
c04f5ac3 3685
5bb01d4f 3686#: builtin/checkout.c:758
c04f5ac3
JX
3687#, c-format
3688msgid ""
7aea43ff
JX
3689"If you want to keep it by creating a new branch, this may be a good time\n"
3690"to do so with:\n"
3691"\n"
3692" git branch <new-branch-name> %s\n"
3693"\n"
3694msgid_plural ""
c04f5ac3
JX
3695"If you want to keep them by creating a new branch, this may be a good time\n"
3696"to do so with:\n"
3697"\n"
814ff314 3698" git branch <new-branch-name> %s\n"
c04f5ac3 3699"\n"
7aea43ff
JX
3700msgstr[0] ""
3701"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
3702"如下操作:\n"
3703"\n"
3704" git branch <新分支名> %s\n"
3705"\n"
3706msgstr[1] ""
3707"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
3708"如下操作:\n"
3709"\n"
814ff314 3710" git branch <新分支名> %s\n"
c04f5ac3
JX
3711"\n"
3712
5bb01d4f 3713#: builtin/checkout.c:794
c04f5ac3
JX
3714msgid "internal error in revision walk"
3715msgstr "在版本遍历时遇到内部错误"
3716
5bb01d4f 3717#: builtin/checkout.c:798
c04f5ac3
JX
3718msgid "Previous HEAD position was"
3719msgstr "之前的 HEAD 位置是"
3720
5bb01d4f 3721#: builtin/checkout.c:825 builtin/checkout.c:1129
c04f5ac3 3722msgid "You are on a branch yet to be born"
90e6ef53 3723msgstr "您位于一个尚未初始化的分支"
c04f5ac3 3724
5bb01d4f 3725#: builtin/checkout.c:931
7aea43ff
JX
3726#, c-format
3727msgid "'%s' is already checked out at '%s'"
3728msgstr "'%s' 已经检出到 '%s'"
3729
5bb01d4f 3730#: builtin/checkout.c:1036
90314792
JX
3731#, c-format
3732msgid "only one reference expected, %d given."
3733msgstr "只要一个引用,却给出了 %d 个"
3734
5bb01d4f 3735#: builtin/checkout.c:1075
c04f5ac3
JX
3736#, c-format
3737msgid "invalid reference: %s"
3738msgstr "无效引用:%s"
3739
5bb01d4f 3740#: builtin/checkout.c:1104
c04f5ac3
JX
3741#, c-format
3742msgid "reference is not a tree: %s"
3743msgstr "引用不是一个树:%s"
3744
5bb01d4f 3745#: builtin/checkout.c:1143
ef317cd5 3746msgid "paths cannot be used with switching branches"
07432cef 3747msgstr "路径不能和切换分支同时使用"
c04f5ac3 3748
5bb01d4f 3749#: builtin/checkout.c:1146 builtin/checkout.c:1150
07432cef 3750#, c-format
ef317cd5 3751msgid "'%s' cannot be used with switching branches"
07432cef 3752msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 3753
5bb01d4f
JX
3754#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
3755#: builtin/checkout.c:1165
07432cef 3756#, c-format
ef317cd5 3757msgid "'%s' cannot be used with '%s'"
07432cef 3758msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 3759
5bb01d4f 3760#: builtin/checkout.c:1170
07432cef 3761#, c-format
ef317cd5 3762msgid "Cannot switch branch to a non-commit '%s'"
07432cef 3763msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 3764
5bb01d4f
JX
3765#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
3766#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
3767#: builtin/worktree.c:284
ef317cd5 3768msgid "branch"
07432cef 3769msgstr "分支"
c04f5ac3 3770
5bb01d4f 3771#: builtin/checkout.c:1204
ef317cd5 3772msgid "create and checkout a new branch"
07432cef 3773msgstr "创建并检出一个新的分支"
c04f5ac3 3774
5bb01d4f 3775#: builtin/checkout.c:1206
ef317cd5 3776msgid "create/reset and checkout a branch"
07432cef 3777msgstr "创建/重置并检出一个分支"
c04f5ac3 3778
5bb01d4f 3779#: builtin/checkout.c:1207
ef317cd5 3780msgid "create reflog for new branch"
07432cef 3781msgstr "为新的分支创建引用日志"
ef317cd5 3782
5bb01d4f 3783#: builtin/checkout.c:1208
ef317cd5 3784msgid "detach the HEAD at named commit"
07432cef 3785msgstr "成为指向该提交的分离头指针"
ef317cd5 3786
5bb01d4f 3787#: builtin/checkout.c:1209
ef317cd5 3788msgid "set upstream info for new branch"
07432cef 3789msgstr "为新的分支设置上游信息"
ef317cd5 3790
5bb01d4f 3791#: builtin/checkout.c:1211
6c94aba5 3792msgid "new-branch"
07432cef 3793msgstr "新分支"
ef317cd5 3794
5bb01d4f 3795#: builtin/checkout.c:1211
ef317cd5 3796msgid "new unparented branch"
07432cef 3797msgstr "新的没有父提交的分支"
ef317cd5 3798
5bb01d4f 3799#: builtin/checkout.c:1212
ef317cd5 3800msgid "checkout our version for unmerged files"
07432cef 3801msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 3802
5bb01d4f 3803#: builtin/checkout.c:1214
ef317cd5 3804msgid "checkout their version for unmerged files"
07432cef 3805msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 3806
5bb01d4f 3807#: builtin/checkout.c:1216
ef317cd5 3808msgid "force checkout (throw away local modifications)"
07432cef 3809msgstr "强制检出(丢弃本地修改)"
c04f5ac3 3810
5bb01d4f 3811#: builtin/checkout.c:1217
ef317cd5 3812msgid "perform a 3-way merge with the new branch"
160fb2b2 3813msgstr "和新的分支执行三方合并"
ef317cd5 3814
5bb01d4f 3815#: builtin/checkout.c:1218 builtin/merge.c:227
ef317cd5 3816msgid "update ignored files (default)"
07432cef 3817msgstr "更新忽略的文件(默认)"
c04f5ac3 3818
5bb01d4f 3819#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
ef317cd5 3820msgid "style"
07432cef 3821msgstr "风格"
ef317cd5 3822
5bb01d4f 3823#: builtin/checkout.c:1220
ef317cd5 3824msgid "conflict style (merge or diff3)"
07432cef 3825msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 3826
5bb01d4f 3827#: builtin/checkout.c:1223
4dcdc3d8
JX
3828msgid "do not limit pathspecs to sparse entries only"
3829msgstr "对路径不做稀疏检出的限制"
3830
5bb01d4f 3831#: builtin/checkout.c:1225
814ff314
JX
3832msgid "second guess 'git checkout <no-such-branch>'"
3833msgstr "二次猜测'git checkout <无此分支>'"
ef317cd5 3834
5bb01d4f 3835#: builtin/checkout.c:1227
7aea43ff
JX
3836msgid "do not check if another worktree is holding the given ref"
3837msgstr "不检查指定的引用是否被其他工作区所占用"
3838
5bb01d4f 3839#: builtin/checkout.c:1252
ef317cd5 3840msgid "-b, -B and --orphan are mutually exclusive"
07432cef 3841msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 3842
5bb01d4f 3843#: builtin/checkout.c:1269
ef317cd5
JX
3844msgid "--track needs a branch name"
3845msgstr "--track 需要一个分支名"
3846
5bb01d4f 3847#: builtin/checkout.c:1274
ef317cd5
JX
3848msgid "Missing branch name; try -b"
3849msgstr "缺少分支名;尝试 -b"
3850
5bb01d4f 3851#: builtin/checkout.c:1310
c04f5ac3 3852msgid "invalid path specification"
90e6ef53 3853msgstr "无效的路径规格"
c04f5ac3 3854
5bb01d4f 3855#: builtin/checkout.c:1317
07432cef 3856#, c-format
c04f5ac3 3857msgid ""
ef317cd5 3858"Cannot update paths and switch to branch '%s' at the same time.\n"
c04f5ac3
JX
3859"Did you intend to checkout '%s' which can not be resolved as commit?"
3860msgstr ""
07432cef
WS
3861"不能同时更新路径并切换到分支'%s'。\n"
3862"您是想要检出 '%s' 但其未能解析为提交么?"
c04f5ac3 3863
5bb01d4f 3864#: builtin/checkout.c:1322
07432cef 3865#, c-format
ef317cd5 3866msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 3867msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 3868
5bb01d4f 3869#: builtin/checkout.c:1326
c04f5ac3
JX
3870msgid ""
3871"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3872"checking out of the index."
3873msgstr ""
90e6ef53 3874"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 3875
90314792 3876#: builtin/clean.c:26
2e8451e8
JX
3877msgid ""
3878"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3879msgstr ""
3880"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 3881
90314792 3882#: builtin/clean.c:30
07432cef
WS
3883#, c-format
3884msgid "Removing %s\n"
3885msgstr "正删除 %s\n"
3886
90314792 3887#: builtin/clean.c:31
07432cef
WS
3888#, c-format
3889msgid "Would remove %s\n"
3890msgstr "将删除 %s\n"
3891
90314792 3892#: builtin/clean.c:32
07432cef
WS
3893#, c-format
3894msgid "Skipping repository %s\n"
160fb2b2 3895msgstr "忽略仓库 %s\n"
07432cef 3896
90314792 3897#: builtin/clean.c:33
07432cef
WS
3898#, c-format
3899msgid "Would skip repository %s\n"
160fb2b2 3900msgstr "将忽略仓库 %s\n"
07432cef 3901
90314792 3902#: builtin/clean.c:34
07432cef
WS
3903#, c-format
3904msgid "failed to remove %s"
3905msgstr "无法删除 %s"
3906
6c94aba5 3907#: builtin/clean.c:295
2e8451e8
JX
3908msgid ""
3909"Prompt help:\n"
3910"1 - select a numbered item\n"
3911"foo - select item based on unique prefix\n"
3912" - (empty) select nothing"
3913msgstr ""
3914"帮助:\n"
3915"1 - 通过编号选择一个选项\n"
3916"foo - 通过标题选择一个选项\n"
3917" - (空)什么也不选择"
3918
6c94aba5 3919#: builtin/clean.c:299
2e8451e8
JX
3920msgid ""
3921"Prompt help:\n"
3922"1 - select a single item\n"
3923"3-5 - select a range of items\n"
3924"2-3,6-9 - select multiple ranges\n"
3925"foo - select item based on unique prefix\n"
3926"-... - unselect specified items\n"
3927"* - choose all items\n"
3928" - (empty) finish selecting"
3929msgstr ""
3930"帮助:\n"
3931"1 - 选择一个选项\n"
3932"3-5 - 选择一个范围内的所有选项\n"
3933"2-3,6-9 - 选择多个范围内的所有选项\n"
3934"foo - 通过标题选择一个选项\n"
3935"-... - 反选特定的选项\n"
3936"* - 选择所有选项\n"
3937" - (空)结束选择"
3938
7aea43ff 3939#: builtin/clean.c:515
2e8451e8
JX
3940#, c-format
3941msgid "Huh (%s)?"
3942msgstr "嗯(%s)?"
3943
7aea43ff 3944#: builtin/clean.c:657
2e8451e8
JX
3945#, c-format
3946msgid "Input ignore patterns>> "
3947msgstr "输入模版以排除条目>> "
3948
7aea43ff 3949#: builtin/clean.c:694
2e8451e8
JX
3950#, c-format
3951msgid "WARNING: Cannot find items matched by: %s"
3952msgstr "警告:无法找到和 %s 匹配的条目"
3953
7aea43ff 3954#: builtin/clean.c:715
2e8451e8
JX
3955msgid "Select items to delete"
3956msgstr "选择要删除的条目"
3957
814ff314 3958#. TRANSLATORS: Make sure to keep [y/N] as is
7aea43ff 3959#: builtin/clean.c:756
2e8451e8 3960#, c-format
814ff314
JX
3961msgid "Remove %s [y/N]? "
3962msgstr "删除 %s [y/N]?"
2e8451e8 3963
7aea43ff 3964#: builtin/clean.c:781
2e8451e8
JX
3965msgid "Bye."
3966msgstr "再见。"
3967
7aea43ff 3968#: builtin/clean.c:789
2e8451e8
JX
3969msgid ""
3970"clean - start cleaning\n"
3971"filter by pattern - exclude items from deletion\n"
3972"select by numbers - select items to be deleted by numbers\n"
3973"ask each - confirm each deletion (like \"rm -i\")\n"
3974"quit - stop cleaning\n"
3975"help - this screen\n"
3976"? - help for prompt selection"
3977msgstr ""
3978"clean - 开始清理\n"
3979"filter by pattern - 通过模版排除要删除的条目\n"
3980"select by numbers - 通过数字选择要删除的条目\n"
3981"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3982"quit - 停止删除并退出\n"
3983"help - 显示本帮助\n"
3984"? - 显示如何在提示符下选择的帮助"
3985
7aea43ff 3986#: builtin/clean.c:816
2e8451e8
JX
3987msgid "*** Commands ***"
3988msgstr "*** 命令 ***"
3989
7aea43ff 3990#: builtin/clean.c:817
2e8451e8
JX
3991msgid "What now"
3992msgstr "请选择"
3993
7aea43ff 3994#: builtin/clean.c:825
2e8451e8
JX
3995msgid "Would remove the following item:"
3996msgid_plural "Would remove the following items:"
3997msgstr[0] "将删除如下条目:"
3998msgstr[1] "将删除如下条目:"
3999
7aea43ff 4000#: builtin/clean.c:842
2e8451e8
JX
4001msgid "No more files to clean, exiting."
4002msgstr "没有要清理的文件,退出。"
4003
7aea43ff 4004#: builtin/clean.c:873
ef317cd5 4005msgid "do not print names of files removed"
07432cef 4006msgstr "不打印删除文件的名称"
ef317cd5 4007
7aea43ff 4008#: builtin/clean.c:875
ef317cd5 4009msgid "force"
07432cef 4010msgstr "强制"
ef317cd5 4011
7aea43ff 4012#: builtin/clean.c:876
2e8451e8
JX
4013msgid "interactive cleaning"
4014msgstr "交互式清除"
4015
7aea43ff 4016#: builtin/clean.c:878
ef317cd5 4017msgid "remove whole directories"
07432cef 4018msgstr "删除整个目录"
ef317cd5 4019
7aea43ff
JX
4020#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714
4021#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
ef317cd5 4022msgid "pattern"
07432cef 4023msgstr "模式"
ef317cd5 4024
7aea43ff 4025#: builtin/clean.c:880
ef317cd5 4026msgid "add <pattern> to ignore rules"
4375c10e 4027msgstr "添加 <模式> 到忽略规则"
ef317cd5 4028
7aea43ff 4029#: builtin/clean.c:881
ef317cd5 4030msgid "remove ignored files, too"
07432cef 4031msgstr "也删除忽略的文件"
ef317cd5 4032
7aea43ff 4033#: builtin/clean.c:883
ef317cd5 4034msgid "remove only ignored files"
07432cef 4035msgstr "只删除忽略的文件"
c04f5ac3 4036
7aea43ff 4037#: builtin/clean.c:901
c04f5ac3 4038msgid "-x and -X cannot be used together"
649900bc 4039msgstr "-x 和 -X 不能同时使用"
c04f5ac3 4040
7aea43ff 4041#: builtin/clean.c:905
c04f5ac3 4042msgid ""
6c94aba5 4043"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 4044"clean"
c04f5ac3 4045msgstr ""
2e8451e8 4046"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 4047
7aea43ff 4048#: builtin/clean.c:908
c04f5ac3 4049msgid ""
6c94aba5 4050"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 4051"refusing to clean"
c04f5ac3 4052msgstr ""
2e8451e8 4053"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 4054
220c313c 4055#: builtin/clone.c:37
814ff314 4056msgid "git clone [<options>] [--] <repo> [<dir>]"
160fb2b2 4057msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
ef317cd5 4058
7aea43ff 4059#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224
814ff314 4060#: builtin/push.c:523
ef317cd5 4061msgid "force progress reporting"
07432cef 4062msgstr "强制显示进度报告"
ef317cd5 4063
7aea43ff 4064#: builtin/clone.c:59
ef317cd5 4065msgid "don't create a checkout"
07432cef 4066msgstr "不创建一个检出"
ef317cd5 4067
7aea43ff 4068#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503
ef317cd5 4069msgid "create a bare repository"
160fb2b2 4070msgstr "创建一个纯仓库"
ef317cd5 4071
7aea43ff 4072#: builtin/clone.c:64
ef317cd5 4073msgid "create a mirror repository (implies bare)"
160fb2b2 4074msgstr "创建一个镜像仓库(也是纯仓库)"
ef317cd5 4075
7aea43ff 4076#: builtin/clone.c:66
ef317cd5 4077msgid "to clone from a local repository"
160fb2b2 4078msgstr "从本地仓库克隆"
ef317cd5 4079
7aea43ff 4080#: builtin/clone.c:68
ef317cd5 4081msgid "don't use local hardlinks, always copy"
07432cef 4082msgstr "不使用本地硬链接,始终复制"
ef317cd5 4083
7aea43ff 4084#: builtin/clone.c:70
ef317cd5 4085msgid "setup as shared repository"
160fb2b2 4086msgstr "设置为共享仓库"
ef317cd5 4087
7aea43ff 4088#: builtin/clone.c:72 builtin/clone.c:74
ef317cd5 4089msgid "initialize submodules in the clone"
07432cef 4090msgstr "在克隆时初始化子模组"
ef317cd5 4091
7aea43ff 4092#: builtin/clone.c:75 builtin/init-db.c:500
ef317cd5 4093msgid "template-directory"
07432cef 4094msgstr "模板目录"
ef317cd5 4095
7aea43ff 4096#: builtin/clone.c:76 builtin/init-db.c:501
ef317cd5 4097msgid "directory from which templates will be used"
07432cef 4098msgstr "模板目录将被使用"
ef317cd5 4099
7aea43ff 4100#: builtin/clone.c:78
ef317cd5 4101msgid "reference repository"
160fb2b2 4102msgstr "参考仓库"
ef317cd5 4103
7aea43ff
JX
4104#: builtin/clone.c:80
4105msgid "use --reference only while cloning"
160fb2b2 4106msgstr "仅在克隆时参考 --reference 指向的本地仓库"
7aea43ff
JX
4107
4108#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
ef317cd5 4109msgid "name"
07432cef 4110msgstr "名称"
ef317cd5 4111
7aea43ff 4112#: builtin/clone.c:82
ef317cd5 4113msgid "use <name> instead of 'origin' to track upstream"
4375c10e 4114msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
ef317cd5 4115
7aea43ff 4116#: builtin/clone.c:84
ef317cd5 4117msgid "checkout <branch> instead of the remote's HEAD"
4375c10e 4118msgstr "检出 <分支> 而不是远程 HEAD"
ef317cd5 4119
7aea43ff 4120#: builtin/clone.c:86
ef317cd5 4121msgid "path to git-upload-pack on the remote"
07432cef 4122msgstr "远程 git-upload-pack 路径"
ef317cd5 4123
7aea43ff 4124#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659
ef317cd5 4125msgid "depth"
07432cef 4126msgstr "深度"
ef317cd5 4127
7aea43ff 4128#: builtin/clone.c:88
ef317cd5 4129msgid "create a shallow clone of that depth"
07432cef 4130msgstr "创建一个指定深度的浅克隆"
ef317cd5 4131
7aea43ff 4132#: builtin/clone.c:90
ef317cd5 4133msgid "clone only one branch, HEAD or --branch"
07432cef 4134msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 4135
7aea43ff 4136#: builtin/clone.c:91 builtin/init-db.c:509
ef317cd5 4137msgid "gitdir"
07432cef 4138msgstr "git目录"
ef317cd5 4139
7aea43ff 4140#: builtin/clone.c:92 builtin/init-db.c:510
ef317cd5 4141msgid "separate git dir from working tree"
07432cef 4142msgstr "git目录和工作区分离"
ef317cd5 4143
7aea43ff 4144#: builtin/clone.c:93
ef317cd5 4145msgid "key=value"
07432cef 4146msgstr "key=value"
ef317cd5 4147
7aea43ff 4148#: builtin/clone.c:94
ef317cd5 4149msgid "set config inside the new repository"
160fb2b2 4150msgstr "在新仓库中设置配置信息"
ef317cd5 4151
5bb01d4f 4152#: builtin/clone.c:240
c04f5ac3 4153#, c-format
4dcdc3d8 4154msgid "reference repository '%s' is not a local repository."
160fb2b2 4155msgstr "参考仓库 '%s' 不是一个本地仓库。"
c04f5ac3 4156
5bb01d4f 4157#: builtin/clone.c:244
cfff71a9
JX
4158#, c-format
4159msgid "reference repository '%s' is shallow"
160fb2b2 4160msgstr "参考仓库 '%s' 是一个浅克隆"
cfff71a9 4161
5bb01d4f 4162#: builtin/clone.c:247
cfff71a9
JX
4163#, c-format
4164msgid "reference repository '%s' is grafted"
160fb2b2 4165msgstr "参考仓库 '%s' 已被嫁接"
cfff71a9 4166
5bb01d4f 4167#: builtin/clone.c:310
c04f5ac3
JX
4168#, c-format
4169msgid "failed to create directory '%s'"
90e6ef53 4170msgstr "无法创建目录 '%s'"
c04f5ac3 4171
5bb01d4f 4172#: builtin/clone.c:312 builtin/diff.c:84
c04f5ac3
JX
4173#, c-format
4174msgid "failed to stat '%s'"
90e6ef53 4175msgstr "无法枚举 '%s' 状态"
c04f5ac3 4176
5bb01d4f 4177#: builtin/clone.c:314
c04f5ac3
JX
4178#, c-format
4179msgid "%s exists and is not a directory"
4180msgstr "%s 存在且不是一个目录"
4181
5bb01d4f 4182#: builtin/clone.c:328
c04f5ac3
JX
4183#, c-format
4184msgid "failed to stat %s\n"
90e6ef53 4185msgstr "无法枚举 %s 状态\n"
c04f5ac3 4186
5bb01d4f 4187#: builtin/clone.c:350
c04f5ac3
JX
4188#, c-format
4189msgid "failed to create link '%s'"
90e6ef53 4190msgstr "无法创建链接 '%s'"
c04f5ac3 4191
5bb01d4f 4192#: builtin/clone.c:354
c04f5ac3
JX
4193#, c-format
4194msgid "failed to copy file to '%s'"
90e6ef53 4195msgstr "无法拷贝文件至 '%s'"
c04f5ac3 4196
5bb01d4f 4197#: builtin/clone.c:377 builtin/clone.c:551
c04f5ac3
JX
4198#, c-format
4199msgid "done.\n"
4200msgstr "完成。\n"
4201
5bb01d4f 4202#: builtin/clone.c:389
1003b3a5
JX
4203msgid ""
4204"Clone succeeded, but checkout failed.\n"
4205"You can inspect what was checked out with 'git status'\n"
4206"and retry the checkout with 'git checkout -f HEAD'\n"
4207msgstr ""
4208"克隆成功,但是检出失败。\n"
4209"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4210"'git checkout -f HEAD' 重试\n"
4211
5bb01d4f 4212#: builtin/clone.c:466
c04f5ac3
JX
4213#, c-format
4214msgid "Could not find remote branch %s to clone."
90e6ef53 4215msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 4216
5bb01d4f 4217#: builtin/clone.c:546
2e8451e8
JX
4218#, c-format
4219msgid "Checking connectivity... "
4220msgstr "检查连接... "
4221
5bb01d4f 4222#: builtin/clone.c:549
1003b3a5
JX
4223msgid "remote did not send all necessary objects"
4224msgstr "远程没有发送所有必须的对象"
4225
5bb01d4f 4226#: builtin/clone.c:613
c04f5ac3
JX
4227msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4228msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4229
5bb01d4f 4230#: builtin/clone.c:644
1003b3a5
JX
4231msgid "unable to checkout working tree"
4232msgstr "不能检出工作区"
4233
5bb01d4f 4234#: builtin/clone.c:731
04cb2f28
JX
4235msgid "cannot repack to clean up"
4236msgstr "无法执行 repack 来清理"
4237
5bb01d4f 4238#: builtin/clone.c:733
04cb2f28
JX
4239msgid "cannot unlink temporary alternates file"
4240msgstr "无法删除临时的 alternates 文件"
4241
5bb01d4f 4242#: builtin/clone.c:763
c04f5ac3
JX
4243msgid "Too many arguments."
4244msgstr "太多参数。"
4245
5bb01d4f 4246#: builtin/clone.c:767
c04f5ac3 4247msgid "You must specify a repository to clone."
160fb2b2 4248msgstr "您必须指定一个仓库来克隆。"
c04f5ac3 4249
5bb01d4f 4250#: builtin/clone.c:778
c04f5ac3
JX
4251#, c-format
4252msgid "--bare and --origin %s options are incompatible."
4253msgstr "--bare 和 --origin %s 选项不兼容。"
4254
5bb01d4f 4255#: builtin/clone.c:781
07432cef
WS
4256msgid "--bare and --separate-git-dir are incompatible."
4257msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4258
5bb01d4f 4259#: builtin/clone.c:794
c04f5ac3
JX
4260#, c-format
4261msgid "repository '%s' does not exist"
160fb2b2 4262msgstr "仓库 '%s' 不存在"
c04f5ac3 4263
5bb01d4f 4264#: builtin/clone.c:800 builtin/fetch.c:1160
cfff71a9
JX
4265#, c-format
4266msgid "depth %s is not a positive number"
4267msgstr "深度 %s 不是一个正数"
4268
5bb01d4f 4269#: builtin/clone.c:810
c04f5ac3
JX
4270#, c-format
4271msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 4272msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 4273
5bb01d4f 4274#: builtin/clone.c:820
c04f5ac3
JX
4275#, c-format
4276msgid "working tree '%s' already exists."
4277msgstr "工作区 '%s' 已经存在。"
4278
5bb01d4f
JX
4279#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
4280#: builtin/worktree.c:220
4281#, c-format
4282msgid "could not create leading directories of '%s'"
4283msgstr "不能为 '%s' 创建先导目录"
4284
4285#: builtin/clone.c:838
c04f5ac3 4286#, c-format
814ff314
JX
4287msgid "could not create work tree dir '%s'"
4288msgstr "不能创建工作区目录 '%s'"
c04f5ac3 4289
5bb01d4f 4290#: builtin/clone.c:856
c04f5ac3
JX
4291#, c-format
4292msgid "Cloning into bare repository '%s'...\n"
160fb2b2 4293msgstr "克隆到纯仓库 '%s'...\n"
c04f5ac3 4294
5bb01d4f 4295#: builtin/clone.c:858
c04f5ac3
JX
4296#, c-format
4297msgid "Cloning into '%s'...\n"
4298msgstr "正克隆到 '%s'...\n"
4299
5bb01d4f 4300#: builtin/clone.c:883
04cb2f28
JX
4301msgid "--dissociate given, but there is no --reference"
4302msgstr "提供了参数 --dissociate,但未提供 --reference"
4303
5bb01d4f 4304#: builtin/clone.c:900
6acbf033
JX
4305msgid "--depth is ignored in local clones; use file:// instead."
4306msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4307
5bb01d4f 4308#: builtin/clone.c:903
6acbf033 4309msgid "source repository is shallow, ignoring --local"
160fb2b2 4310msgstr "源仓库是浅克隆,忽略 --local"
6acbf033 4311
5bb01d4f 4312#: builtin/clone.c:908
6acbf033
JX
4313msgid "--local is ignored"
4314msgstr "--local 被忽略"
4315
5bb01d4f 4316#: builtin/clone.c:912
c04f5ac3
JX
4317#, c-format
4318msgid "Don't know how to clone %s"
4319msgstr "不知道如何克隆 %s"
4320
5bb01d4f 4321#: builtin/clone.c:961 builtin/clone.c:969
c04f5ac3
JX
4322#, c-format
4323msgid "Remote branch %s not found in upstream %s"
4324msgstr "远程分支 %s 在上游 %s 未发现"
4325
5bb01d4f 4326#: builtin/clone.c:972
c04f5ac3 4327msgid "You appear to have cloned an empty repository."
160fb2b2 4328msgstr "您似乎克隆了一个空仓库。"
c04f5ac3 4329
ef317cd5 4330#: builtin/column.c:9
814ff314
JX
4331msgid "git column [<options>]"
4332msgstr "git column [<选项>]"
ef317cd5
JX
4333
4334#: builtin/column.c:26
4335msgid "lookup config vars"
07432cef 4336msgstr "查找配置变量"
ef317cd5
JX
4337
4338#: builtin/column.c:27 builtin/column.c:28
ef317cd5 4339msgid "layout to use"
07432cef 4340msgstr "要使用的布局"
ef317cd5
JX
4341
4342#: builtin/column.c:29
4343msgid "Maximum width"
07432cef 4344msgstr "最大宽度"
ef317cd5
JX
4345
4346#: builtin/column.c:30
4347msgid "Padding space on left border"
07432cef 4348msgstr "左边框的填充空间"
ef317cd5
JX
4349
4350#: builtin/column.c:31
4351msgid "Padding space on right border"
07432cef 4352msgstr "右边框的填充空间"
ef317cd5
JX
4353
4354#: builtin/column.c:32
4355msgid "Padding space between columns"
07432cef 4356msgstr "两列之间的填充空间"
ef317cd5 4357
8ada9598
JX
4358#: builtin/column.c:51
4359msgid "--command must be the first argument"
81809b99 4360msgstr "--command 必须是第一个参数"
8ada9598 4361
220c313c 4362#: builtin/commit.c:37
814ff314 4363msgid "git commit [<options>] [--] <pathspec>..."
160fb2b2 4364msgstr "git commit [<选项>] [--] <路径规格>..."
ef317cd5 4365
220c313c 4366#: builtin/commit.c:42
814ff314 4367msgid "git status [<options>] [--] <pathspec>..."
160fb2b2 4368msgstr "git status [<选项>] [--] <路径规格>..."
ef317cd5 4369
220c313c
JX
4370#: builtin/commit.c:47
4371msgid ""
4372"Your name and email address were configured automatically based\n"
4373"on your username and hostname. Please check that they are accurate.\n"
4374"You can suppress this message by setting them explicitly. Run the\n"
4375"following command and follow the instructions in your editor to edit\n"
4376"your configuration file:\n"
4377"\n"
4378" git config --global --edit\n"
4379"\n"
4380"After doing this, you may fix the identity used for this commit with:\n"
4381"\n"
4382" git commit --amend --reset-author\n"
4383msgstr ""
4384"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4385"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4386"中编辑您的配置文件:\n"
4387"\n"
4388" git config --global --edit\n"
4389"\n"
4390"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4391"\n"
4392" git commit --amend --reset-author\n"
4393
4394#: builtin/commit.c:60
c04f5ac3
JX
4395msgid ""
4396"Your name and email address were configured automatically based\n"
4397"on your username and hostname. Please check that they are accurate.\n"
4398"You can suppress this message by setting them explicitly:\n"
4399"\n"
4400" git config --global user.name \"Your Name\"\n"
4401" git config --global user.email you@example.com\n"
4402"\n"
4403"After doing this, you may fix the identity used for this commit with:\n"
4404"\n"
4405" git commit --amend --reset-author\n"
4406msgstr ""
90e6ef53 4407"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
220c313c 4408"与否。您可以对其进行设置以免再出现本提示信息:\n"
c04f5ac3
JX
4409"\n"
4410" git config --global user.name \"Your Name\"\n"
4411" git config --global user.email you@example.com\n"
4412"\n"
90e6ef53 4413"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
4414"\n"
4415" git commit --amend --reset-author\n"
4416
220c313c 4417#: builtin/commit.c:72
c04f5ac3
JX
4418msgid ""
4419"You asked to amend the most recent commit, but doing so would make\n"
4420"it empty. You can repeat your command with --allow-empty, or you can\n"
4421"remove the commit entirely with \"git reset HEAD^\".\n"
4422msgstr ""
1b150dc9
T
4423"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4424"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 4425
220c313c 4426#: builtin/commit.c:77
c04f5ac3
JX
4427msgid ""
4428"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4429"If you wish to commit it anyway, use:\n"
4430"\n"
4431" git commit --allow-empty\n"
4432"\n"
c04f5ac3 4433msgstr ""
a9ce4543
T
4434"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4435"也要提交,使用命令:\n"
c04f5ac3
JX
4436"\n"
4437" git commit --allow-empty\n"
4438"\n"
c04f5ac3 4439
220c313c 4440#: builtin/commit.c:84
b1894384
JX
4441msgid "Otherwise, please use 'git reset'\n"
4442msgstr "否则,请使用命令 'git reset'\n"
4443
220c313c 4444#: builtin/commit.c:87
b1894384
JX
4445msgid ""
4446"If you wish to skip this commit, use:\n"
4447"\n"
4448" git reset\n"
4449"\n"
4450"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4451"the remaining commits.\n"
4452msgstr ""
4453"如果您想跳过这个提交,使用命令:\n"
4454"\n"
4455" git reset\n"
4456"\n"
4457"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4458"操作。\n"
4459
44f518e6 4460#: builtin/commit.c:304
c04f5ac3 4461msgid "failed to unpack HEAD tree object"
90e6ef53 4462msgstr "无法解包 HEAD 树对象"
c04f5ac3 4463
44f518e6 4464#: builtin/commit.c:344
c04f5ac3 4465msgid "unable to create temporary index"
90e6ef53 4466msgstr "不能创建临时索引"
c04f5ac3 4467
44f518e6 4468#: builtin/commit.c:350
c04f5ac3
JX
4469msgid "interactive add failed"
4470msgstr "交互式添加失败"
4471
44f518e6 4472#: builtin/commit.c:361
220c313c
JX
4473msgid "unable to write index file"
4474msgstr "无法写入索引文件"
4475
44f518e6 4476#: builtin/commit.c:363
220c313c
JX
4477msgid "unable to update temporary index"
4478msgstr "无法更新临时索引"
4479
44f518e6 4480#: builtin/commit.c:365
220c313c
JX
4481msgid "Failed to update main cache tree"
4482msgstr "不能更新树的主缓存"
4483
44f518e6 4484#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
c04f5ac3 4485msgid "unable to write new_index file"
90e6ef53 4486msgstr "无法写 new_index 文件"
c04f5ac3 4487
44f518e6 4488#: builtin/commit.c:445
8ada9598 4489msgid "cannot do a partial commit during a merge."
81809b99 4490msgstr "在合并过程中不能做部分提交。"
c04f5ac3 4491
44f518e6 4492#: builtin/commit.c:447
8ada9598 4493msgid "cannot do a partial commit during a cherry-pick."
81809b99 4494msgstr "在拣选过程中不能做部分提交。"
8ada9598 4495
44f518e6 4496#: builtin/commit.c:456
c04f5ac3 4497msgid "cannot read the index"
90e6ef53 4498msgstr "无法读取索引"
c04f5ac3 4499
44f518e6 4500#: builtin/commit.c:475
c04f5ac3 4501msgid "unable to write temporary index file"
90e6ef53 4502msgstr "无法写临时索引文件"
c04f5ac3 4503
44f518e6 4504#: builtin/commit.c:580
220c313c
JX
4505#, c-format
4506msgid "commit '%s' lacks author header"
4507msgstr "提交 '%s' 缺少作者信息"
4508
44f518e6 4509#: builtin/commit.c:582
c04f5ac3 4510#, c-format
220c313c
JX
4511msgid "commit '%s' has malformed author line"
4512msgstr "提交 '%s' 有非法的作者信息"
c04f5ac3 4513
44f518e6 4514#: builtin/commit.c:601
c04f5ac3
JX
4515msgid "malformed --author parameter"
4516msgstr "非法的 --author 参数"
4517
44f518e6 4518#: builtin/commit.c:609
c04f5ac3 4519#, c-format
6acbf033
JX
4520msgid "invalid date format: %s"
4521msgstr "无效的日期格式:%s"
4522
44f518e6 4523#: builtin/commit.c:653
6acbf033
JX
4524msgid ""
4525"unable to select a comment character that is not used\n"
4526"in the current commit message"
4527msgstr "无法选择一个未被当前提交说明使用的注释字符"
4528
44f518e6 4529#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
c04f5ac3
JX
4530#, c-format
4531msgid "could not lookup commit %s"
4532msgstr "不能查询提交 %s"
4533
44f518e6 4534#: builtin/commit.c:702 builtin/shortlog.c:273
c04f5ac3
JX
4535#, c-format
4536msgid "(reading log message from standard input)\n"
90e6ef53 4537msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 4538
44f518e6 4539#: builtin/commit.c:704
c04f5ac3 4540msgid "could not read log from standard input"
90e6ef53 4541msgstr "不能从标准输入中读取日志信息"
c04f5ac3 4542
44f518e6 4543#: builtin/commit.c:708
c04f5ac3
JX
4544#, c-format
4545msgid "could not read log file '%s'"
90e6ef53 4546msgstr "不能读取日志文件 '%s'"
c04f5ac3 4547
44f518e6 4548#: builtin/commit.c:730
c04f5ac3 4549msgid "could not read MERGE_MSG"
90e6ef53 4550msgstr "不能读取 MERGE_MSG"
c04f5ac3 4551
44f518e6 4552#: builtin/commit.c:734
c04f5ac3 4553msgid "could not read SQUASH_MSG"
90e6ef53 4554msgstr "不能读取 SQUASH_MSG"
c04f5ac3 4555
7aea43ff 4556#: builtin/commit.c:738 builtin/merge.c:1079
c04f5ac3
JX
4557#, c-format
4558msgid "could not read '%s'"
90e6ef53 4559msgstr "不能读取 '%s'"
c04f5ac3 4560
44f518e6 4561#: builtin/commit.c:785
c04f5ac3 4562msgid "could not write commit template"
90e6ef53 4563msgstr "不能写提交模版"
c04f5ac3 4564
44f518e6 4565#: builtin/commit.c:803
81809b99 4566#, c-format
c04f5ac3
JX
4567msgid ""
4568"\n"
8ada9598 4569"It looks like you may be committing a merge.\n"
c04f5ac3
JX
4570"If this is not correct, please remove the file\n"
4571"\t%s\n"
4572"and try again.\n"
4573msgstr ""
4574"\n"
649900bc 4575"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
4576"\t%s\n"
4577"然后重试。\n"
4578
44f518e6 4579#: builtin/commit.c:808
81809b99 4580#, c-format
8ada9598
JX
4581msgid ""
4582"\n"
4583"It looks like you may be committing a cherry-pick.\n"
4584"If this is not correct, please remove the file\n"
4585"\t%s\n"
4586"and try again.\n"
4587msgstr ""
4588"\n"
649900bc 4589"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
4590"\t%s\n"
4591"然后重试。\n"
c04f5ac3 4592
44f518e6 4593#: builtin/commit.c:821
a77c07d9 4594#, c-format
c04f5ac3 4595msgid ""
8ada9598 4596"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 4597"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 4598msgstr ""
a77c07d9 4599"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 4600"说明将会终止提交。\n"
c04f5ac3 4601
44f518e6 4602#: builtin/commit.c:828
a77c07d9 4603#, c-format
c04f5ac3 4604msgid ""
8ada9598 4605"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 4606"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
4607"An empty message aborts the commit.\n"
4608msgstr ""
a77c07d9
JX
4609"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4610"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 4611
90e6ef53 4612# 译者:为保证在输出中对齐,注意调整句中空格!
44f518e6 4613#: builtin/commit.c:848
6acbf033
JX
4614#, c-format
4615msgid "%sAuthor: %.*s <%.*s>"
4616msgstr "%s作者: %.*s <%.*s>"
4617
4618# 译者:为保证在输出中对齐,注意调整句中空格!
44f518e6 4619#: builtin/commit.c:856
c04f5ac3 4620#, c-format
6acbf033
JX
4621msgid "%sDate: %s"
4622msgstr "%s日期: %s"
c04f5ac3 4623
90e6ef53 4624# 译者:为保证在输出中对齐,注意调整句中空格!
44f518e6 4625#: builtin/commit.c:863
c04f5ac3 4626#, c-format
6acbf033
JX
4627msgid "%sCommitter: %.*s <%.*s>"
4628msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 4629
44f518e6 4630#: builtin/commit.c:881
c04f5ac3 4631msgid "Cannot read index"
90e6ef53 4632msgstr "无法读取索引"
c04f5ac3 4633
44f518e6 4634#: builtin/commit.c:938
c04f5ac3
JX
4635msgid "Error building trees"
4636msgstr "无法创建树对象"
4637
44f518e6 4638#: builtin/commit.c:953 builtin/tag.c:495
c04f5ac3
JX
4639#, c-format
4640msgid "Please supply the message using either -m or -F option.\n"
07432cef 4641msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 4642
44f518e6 4643#: builtin/commit.c:1055
c04f5ac3 4644#, c-format
814ff314
JX
4645msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4646msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 4647
44f518e6 4648#: builtin/commit.c:1070 builtin/commit.c:1310
c04f5ac3
JX
4649#, c-format
4650msgid "Invalid untracked files mode '%s'"
90e6ef53 4651msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 4652
44f518e6 4653#: builtin/commit.c:1107
2e8451e8
JX
4654msgid "--long and -z are incompatible"
4655msgstr "--long 和 -z 选项不兼容"
4656
44f518e6 4657#: builtin/commit.c:1137
c04f5ac3
JX
4658msgid "Using both --reset-author and --author does not make sense"
4659msgstr "同时使用 --reset-author 和 --author 没有意义"
4660
44f518e6 4661#: builtin/commit.c:1146
c04f5ac3 4662msgid "You have nothing to amend."
90e6ef53 4663msgstr "您没有可修补的提交。"
c04f5ac3 4664
44f518e6 4665#: builtin/commit.c:1149
8ada9598 4666msgid "You are in the middle of a merge -- cannot amend."
81809b99 4667msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 4668
44f518e6 4669#: builtin/commit.c:1151
8ada9598 4670msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 4671msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 4672
44f518e6 4673#: builtin/commit.c:1154
c04f5ac3 4674msgid "Options --squash and --fixup cannot be used together"
649900bc 4675msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 4676
44f518e6 4677#: builtin/commit.c:1164
c04f5ac3
JX
4678msgid "Only one of -c/-C/-F/--fixup can be used."
4679msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4680
44f518e6 4681#: builtin/commit.c:1166
c04f5ac3 4682msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 4683msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 4684
44f518e6 4685#: builtin/commit.c:1174
c04f5ac3 4686msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 4687msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 4688
44f518e6 4689#: builtin/commit.c:1191
c04f5ac3
JX
4690msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4691msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4692
44f518e6 4693#: builtin/commit.c:1193
c04f5ac3
JX
4694msgid "No paths with --include/--only does not make sense."
4695msgstr "参数 --include/--only 不跟路径没有意义。"
4696
44f518e6 4697#: builtin/commit.c:1195
c04f5ac3 4698msgid "Clever... amending the last one with dirty index."
160fb2b2 4699msgstr "聪明... 用脏索引修补最后一个提交。"
c04f5ac3 4700
44f518e6 4701#: builtin/commit.c:1197
6c94aba5
JX
4702msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4703msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
c04f5ac3 4704
44f518e6 4705#: builtin/commit.c:1209 builtin/tag.c:728
c04f5ac3
JX
4706#, c-format
4707msgid "Invalid cleanup mode %s"
4708msgstr "无效的清理模式 %s"
4709
44f518e6 4710#: builtin/commit.c:1214
c04f5ac3 4711msgid "Paths with -a does not make sense."
649900bc 4712msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 4713
7aea43ff 4714#: builtin/commit.c:1324 builtin/commit.c:1603
ef317cd5 4715msgid "show status concisely"
07432cef 4716msgstr "以简洁的格式显示状态"
ef317cd5 4717
7aea43ff 4718#: builtin/commit.c:1326 builtin/commit.c:1605
ef317cd5 4719msgid "show branch information"
07432cef 4720msgstr "显示分支信息"
ef317cd5 4721
7aea43ff 4722#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509
ef317cd5 4723msgid "machine-readable output"
07432cef
WS
4724msgstr "机器可读的输出"
4725
7aea43ff 4726#: builtin/commit.c:1331 builtin/commit.c:1609
07432cef
WS
4727msgid "show status in long format (default)"
4728msgstr "以长格式显示状态(默认)"
ef317cd5 4729
7aea43ff 4730#: builtin/commit.c:1334 builtin/commit.c:1612
ef317cd5 4731msgid "terminate entries with NUL"
4375c10e 4732msgstr "条目以 NUL 字符结尾"
ef317cd5 4733
7aea43ff 4734#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980
220c313c 4735#: builtin/fast-export.c:983 builtin/tag.c:603
ef317cd5 4736msgid "mode"
07432cef 4737msgstr "模式"
ef317cd5 4738
7aea43ff 4739#: builtin/commit.c:1337 builtin/commit.c:1615
ef317cd5 4740msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 4741msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 4742
44f518e6 4743#: builtin/commit.c:1340
ef317cd5 4744msgid "show ignored files"
07432cef 4745msgstr "显示忽略的文件"
ef317cd5 4746
7aea43ff 4747#: builtin/commit.c:1341 parse-options.h:152
ef317cd5
JX
4748msgid "when"
4749msgstr "何时"
4750
44f518e6 4751#: builtin/commit.c:1342
ef317cd5
JX
4752msgid ""
4753"ignore changes to submodules, optional when: all, dirty, untracked. "
4754"(Default: all)"
4755msgstr ""
07432cef 4756"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 4757
44f518e6 4758#: builtin/commit.c:1344
ef317cd5 4759msgid "list untracked files in columns"
07432cef 4760msgstr "以列的方式显示未跟踪的文件"
ef317cd5 4761
7aea43ff 4762#: builtin/commit.c:1430
c04f5ac3
JX
4763msgid "couldn't look up newly created commit"
4764msgstr "无法找到新创建的提交"
4765
7aea43ff 4766#: builtin/commit.c:1432
c04f5ac3 4767msgid "could not parse newly created commit"
90e6ef53 4768msgstr "不能解析新创建的提交"
c04f5ac3 4769
7aea43ff 4770#: builtin/commit.c:1477
c04f5ac3
JX
4771msgid "detached HEAD"
4772msgstr "分离头指针"
4773
7e238ab7 4774# 译者:中文字符串拼接,可删除前导空格
7aea43ff 4775#: builtin/commit.c:1480
c04f5ac3 4776msgid " (root-commit)"
7e238ab7 4777msgstr "(根提交)"
c04f5ac3 4778
7aea43ff 4779#: builtin/commit.c:1573
ef317cd5 4780msgid "suppress summary after successful commit"
07432cef 4781msgstr "提交成功后不显示概述信息"
c04f5ac3 4782
7aea43ff 4783#: builtin/commit.c:1574
ef317cd5 4784msgid "show diff in commit message template"
07432cef 4785msgstr "在提交说明模板里显示差异"
c04f5ac3 4786
7aea43ff 4787#: builtin/commit.c:1576
ef317cd5 4788msgid "Commit message options"
07432cef 4789msgstr "提交说明选项"
c04f5ac3 4790
7aea43ff 4791#: builtin/commit.c:1577 builtin/tag.c:601
ef317cd5 4792msgid "read message from file"
07432cef 4793msgstr "从文件中读取提交说明"
c04f5ac3 4794
7aea43ff 4795#: builtin/commit.c:1578
ef317cd5 4796msgid "author"
07432cef 4797msgstr "作者"
c04f5ac3 4798
7aea43ff 4799#: builtin/commit.c:1578
ef317cd5 4800msgid "override author for commit"
07432cef 4801msgstr "提交时覆盖作者"
73a60cd2 4802
7aea43ff 4803#: builtin/commit.c:1579 builtin/gc.c:280
ef317cd5 4804msgid "date"
07432cef 4805msgstr "日期"
c04f5ac3 4806
7aea43ff 4807#: builtin/commit.c:1579
ef317cd5 4808msgid "override date for commit"
07432cef 4809msgstr "提交时覆盖日期"
c04f5ac3 4810
7aea43ff 4811#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391
04cb2f28 4812#: builtin/notes.c:554 builtin/tag.c:599
ef317cd5 4813msgid "message"
07432cef 4814msgstr "说明"
c04f5ac3 4815
7aea43ff 4816#: builtin/commit.c:1580
ef317cd5 4817msgid "commit message"
07432cef 4818msgstr "提交说明"
ef317cd5 4819
7aea43ff 4820#: builtin/commit.c:1581
ef317cd5 4821msgid "reuse and edit message from specified commit"
07432cef 4822msgstr "重用并编辑指定提交的提交说明"
ef317cd5 4823
7aea43ff 4824#: builtin/commit.c:1582
ef317cd5 4825msgid "reuse message from specified commit"
07432cef 4826msgstr "重用指定提交的提交说明"
ef317cd5 4827
7aea43ff 4828#: builtin/commit.c:1583
ef317cd5 4829msgid "use autosquash formatted message to fixup specified commit"
07432cef 4830msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 4831
7aea43ff 4832#: builtin/commit.c:1584
ef317cd5 4833msgid "use autosquash formatted message to squash specified commit"
07432cef 4834msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 4835
7aea43ff 4836#: builtin/commit.c:1585
ef317cd5 4837msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 4838msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 4839
7aea43ff 4840#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86
ef317cd5 4841msgid "add Signed-off-by:"
07432cef 4842msgstr "添加 Signed-off-by: 签名"
ef317cd5 4843
7aea43ff 4844#: builtin/commit.c:1587
ef317cd5 4845msgid "use specified template file"
07432cef 4846msgstr "使用指定的模板文件"
ef317cd5 4847
7aea43ff 4848#: builtin/commit.c:1588
ef317cd5 4849msgid "force edit of commit"
07432cef 4850msgstr "强制编辑提交"
ef317cd5 4851
07432cef 4852# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
7aea43ff 4853#: builtin/commit.c:1589
ef317cd5 4854msgid "default"
07432cef 4855msgstr "default"
ef317cd5 4856
7aea43ff 4857#: builtin/commit.c:1589 builtin/tag.c:604
ef317cd5 4858msgid "how to strip spaces and #comments from message"
07432cef 4859msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 4860
7aea43ff 4861#: builtin/commit.c:1590
ef317cd5 4862msgid "include status in commit message template"
07432cef 4863msgstr "在提交说明模板里包含状态信息"
ef317cd5 4864
7aea43ff 4865#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92
220c313c 4866#: builtin/tag.c:605
6c94aba5
JX
4867msgid "key-id"
4868msgstr "key-id"
ef317cd5 4869
7aea43ff 4870#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93
ef317cd5 4871msgid "GPG sign commit"
07432cef 4872msgstr "GPG 提交签名"
ef317cd5 4873
7aea43ff 4874#: builtin/commit.c:1595
ef317cd5 4875msgid "Commit contents options"
07432cef 4876msgstr "提交内容选项"
ef317cd5 4877
7aea43ff 4878#: builtin/commit.c:1596
ef317cd5 4879msgid "commit all changed files"
07432cef 4880msgstr "提交所有改动的文件"
ef317cd5 4881
7aea43ff 4882#: builtin/commit.c:1597
ef317cd5 4883msgid "add specified files to index for commit"
07432cef 4884msgstr "添加指定的文件到索引区等待提交"
ef317cd5 4885
7aea43ff 4886#: builtin/commit.c:1598
ef317cd5 4887msgid "interactively add files"
07432cef 4888msgstr "交互式添加文件"
ef317cd5 4889
7aea43ff 4890#: builtin/commit.c:1599
ef317cd5 4891msgid "interactively add changes"
07432cef 4892msgstr "交互式添加变更"
ef317cd5 4893
7aea43ff 4894#: builtin/commit.c:1600
ef317cd5 4895msgid "commit only specified files"
07432cef 4896msgstr "只提交指定的文件"
ef317cd5 4897
7aea43ff 4898#: builtin/commit.c:1601
ef317cd5 4899msgid "bypass pre-commit hook"
07432cef 4900msgstr "绕过 pre-commit 钩子"
ef317cd5 4901
7aea43ff 4902#: builtin/commit.c:1602
ef317cd5 4903msgid "show what would be committed"
07432cef 4904msgstr "显示将要提交的内容"
ef317cd5 4905
7aea43ff 4906#: builtin/commit.c:1613
ef317cd5 4907msgid "amend previous commit"
07432cef 4908msgstr "修改先前的提交"
ef317cd5 4909
7aea43ff 4910#: builtin/commit.c:1614
ef317cd5 4911msgid "bypass post-rewrite hook"
07432cef 4912msgstr "绕过 post-rewrite 钩子"
ef317cd5 4913
7aea43ff 4914#: builtin/commit.c:1619
ef317cd5 4915msgid "ok to record an empty change"
07432cef 4916msgstr "允许一个空提交"
ef317cd5 4917
7aea43ff 4918#: builtin/commit.c:1621
ef317cd5 4919msgid "ok to record a change with an empty message"
07432cef 4920msgstr "允许空的提交说明"
ef317cd5 4921
7aea43ff 4922#: builtin/commit.c:1650
c04f5ac3 4923msgid "could not parse HEAD commit"
90e6ef53 4924msgstr "不能解析 HEAD 提交"
c04f5ac3 4925
7aea43ff 4926#: builtin/commit.c:1689 builtin/merge.c:1076
c04f5ac3
JX
4927#, c-format
4928msgid "could not open '%s' for reading"
90e6ef53 4929msgstr "不能为读入打开 '%s'"
c04f5ac3 4930
7aea43ff 4931#: builtin/commit.c:1696
c04f5ac3
JX
4932#, c-format
4933msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 4934msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 4935
7aea43ff 4936#: builtin/commit.c:1703
c04f5ac3 4937msgid "could not read MERGE_MODE"
90e6ef53 4938msgstr "不能读取 MERGE_MODE"
c04f5ac3 4939
7aea43ff 4940#: builtin/commit.c:1722
c04f5ac3
JX
4941#, c-format
4942msgid "could not read commit message: %s"
90e6ef53 4943msgstr "不能读取提交说明:%s"
c04f5ac3 4944
7aea43ff 4945#: builtin/commit.c:1733
73a60cd2
JX
4946#, c-format
4947msgid "Aborting commit; you did not edit the message.\n"
4948msgstr "终止提交;您未更改来自模版的提交说明。\n"
4949
7aea43ff 4950#: builtin/commit.c:1738
c04f5ac3
JX
4951#, c-format
4952msgid "Aborting commit due to empty commit message.\n"
4953msgstr "终止提交因为提交说明为空。\n"
4954
7aea43ff 4955#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854
c04f5ac3 4956msgid "failed to write commit object"
90e6ef53 4957msgstr "无法写提交对象"
c04f5ac3 4958
7aea43ff 4959#: builtin/commit.c:1786
c04f5ac3
JX
4960msgid ""
4961"Repository has been updated, but unable to write\n"
220c313c 4962"new_index file. Check that disk is not full and quota is\n"
c04f5ac3
JX
4963"not exceeded, and then \"git reset HEAD\" to recover."
4964msgstr ""
160fb2b2 4965"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
90e6ef53 4966"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 4967
90314792 4968#: builtin/config.c:8
814ff314
JX
4969msgid "git config [<options>]"
4970msgstr "git config [<选项>]"
ef317cd5 4971
6c94aba5 4972#: builtin/config.c:53
ef317cd5 4973msgid "Config file location"
07432cef 4974msgstr "配置文件位置"
ef317cd5 4975
6c94aba5 4976#: builtin/config.c:54
ef317cd5 4977msgid "use global config file"
07432cef 4978msgstr "使用全局配置文件"
ef317cd5 4979
6c94aba5 4980#: builtin/config.c:55
ef317cd5 4981msgid "use system config file"
07432cef 4982msgstr "使用系统级配置文件"
ef317cd5 4983
6c94aba5 4984#: builtin/config.c:56
ef317cd5 4985msgid "use repository config file"
160fb2b2 4986msgstr "使用仓库级配置文件"
ef317cd5 4987
6c94aba5 4988#: builtin/config.c:57
ef317cd5 4989msgid "use given config file"
07432cef 4990msgstr "使用指定的配置文件"
ef317cd5 4991
6c94aba5 4992#: builtin/config.c:58
2e8451e8 4993msgid "blob-id"
4375c10e 4994msgstr "数据对象 ID"
2e8451e8 4995
6c94aba5 4996#: builtin/config.c:58
2e8451e8
JX
4997msgid "read config from given blob object"
4998msgstr "从给定的数据对象读取配置"
4999
6c94aba5 5000#: builtin/config.c:59
ef317cd5 5001msgid "Action"
07432cef 5002msgstr "操作"
ef317cd5 5003
6c94aba5 5004#: builtin/config.c:60
ef317cd5 5005msgid "get value: name [value-regex]"
07432cef 5006msgstr "获取值:name [value-regex]"
ef317cd5 5007
6c94aba5 5008#: builtin/config.c:61
ef317cd5 5009msgid "get all values: key [value-regex]"
07432cef 5010msgstr "获得所有的值:key [value-regex]"
ef317cd5 5011
6c94aba5 5012#: builtin/config.c:62
ef317cd5 5013msgid "get values for regexp: name-regex [value-regex]"
07432cef 5014msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 5015
6c94aba5 5016#: builtin/config.c:63
90314792
JX
5017msgid "get value specific for the URL: section[.var] URL"
5018msgstr "获得 URL 取值:section[.var] URL"
5019
6c94aba5 5020#: builtin/config.c:64
ef317cd5 5021msgid "replace all matching variables: name value [value_regex]"
07432cef 5022msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 5023
6c94aba5 5024#: builtin/config.c:65
ef317cd5 5025msgid "add a new variable: name value"
07432cef 5026msgstr "添加一个新的变量:name value"
ef317cd5 5027
6c94aba5 5028#: builtin/config.c:66
ef317cd5 5029msgid "remove a variable: name [value-regex]"
07432cef 5030msgstr "删除一个变量:name [value-regex]"
ef317cd5 5031
6c94aba5 5032#: builtin/config.c:67
ef317cd5 5033msgid "remove all matches: name [value-regex]"
07432cef 5034msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 5035
6c94aba5 5036#: builtin/config.c:68
ef317cd5 5037msgid "rename section: old-name new-name"
07432cef 5038msgstr "重命名小节:old-name new-name"
ef317cd5 5039
6c94aba5 5040#: builtin/config.c:69
ef317cd5 5041msgid "remove a section: name"
07432cef 5042msgstr "删除一个小节:name"
ef317cd5 5043
6c94aba5 5044#: builtin/config.c:70
ef317cd5 5045msgid "list all"
07432cef 5046msgstr "列出所有"
ef317cd5 5047
6c94aba5 5048#: builtin/config.c:71
ef317cd5 5049msgid "open an editor"
07432cef 5050msgstr "打开一个编辑器"
ef317cd5 5051
6c94aba5 5052#: builtin/config.c:72
04cb2f28
JX
5053msgid "find the color configured: slot [default]"
5054msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 5055
6c94aba5 5056#: builtin/config.c:73
04cb2f28
JX
5057msgid "find the color setting: slot [stdout-is-tty]"
5058msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 5059
6c94aba5 5060#: builtin/config.c:74
ef317cd5 5061msgid "Type"
07432cef 5062msgstr "类型"
ef317cd5 5063
6c94aba5 5064#: builtin/config.c:75
ef317cd5 5065msgid "value is \"true\" or \"false\""
07432cef 5066msgstr "值是 \"true\" 或 \"false\""
ef317cd5 5067
6c94aba5 5068#: builtin/config.c:76
ef317cd5 5069msgid "value is decimal number"
07432cef 5070msgstr "值是十进制数"
ef317cd5 5071
6c94aba5 5072#: builtin/config.c:77
ef317cd5 5073msgid "value is --bool or --int"
07432cef 5074msgstr "值是 --bool or --int"
ef317cd5 5075
6c94aba5 5076#: builtin/config.c:78
ef317cd5 5077msgid "value is a path (file or directory name)"
07432cef 5078msgstr "值是一个路径(文件或目录名)"
ef317cd5 5079
6c94aba5 5080#: builtin/config.c:79
ef317cd5 5081msgid "Other"
07432cef 5082msgstr "其它"
ef317cd5 5083
6c94aba5 5084#: builtin/config.c:80
ef317cd5 5085msgid "terminate values with NUL byte"
4375c10e 5086msgstr "终止值是 NUL 字节"
ef317cd5 5087
6c94aba5 5088#: builtin/config.c:81
ef317cd5 5089msgid "respect include directives on lookup"
07432cef 5090msgstr "查询时参照 include 指令递归查找"
ef317cd5 5091
04cb2f28 5092#: builtin/config.c:316
220c313c 5093msgid "unable to parse default color value"
160fb2b2 5094msgstr "不能解析默认颜色值"
220c313c 5095
04cb2f28 5096#: builtin/config.c:457
220c313c
JX
5097#, c-format
5098msgid ""
5099"# This is Git's per-user configuration file.\n"
7aea43ff 5100"[user]\n"
220c313c 5101"# Please adapt and uncomment the following lines:\n"
7aea43ff 5102"#\tname = %s\n"
220c313c
JX
5103"#\temail = %s\n"
5104msgstr ""
5105"# This is Git's per-user configuration file.\n"
7aea43ff 5106"[user]\n"
220c313c 5107"# Please adapt and uncomment the following lines:\n"
7aea43ff 5108"#\tname = %s\n"
220c313c
JX
5109"#\temail = %s\n"
5110
7aea43ff 5111#: builtin/config.c:587
220c313c
JX
5112#, c-format
5113msgid "cannot create configuration file %s"
5114msgstr "不能创建配置文件 %s"
5115
5116#: builtin/count-objects.c:55
4dcdc3d8
JX
5117msgid "git count-objects [-v] [-H | --human-readable]"
5118msgstr "git count-objects [-v] [-H | --human-readable]"
5119
220c313c 5120#: builtin/count-objects.c:65
4dcdc3d8
JX
5121msgid "print sizes in human readable format"
5122msgstr "以用户可读的格式显示大小"
ef317cd5 5123
220c313c 5124#: builtin/describe.c:17
814ff314
JX
5125msgid "git describe [<options>] [<commit-ish>...]"
5126msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 5127
220c313c 5128#: builtin/describe.c:18
814ff314
JX
5129msgid "git describe [<options>] --dirty"
5130msgstr "git describe [<选项>] --dirty"
ef317cd5 5131
220c313c 5132#: builtin/describe.c:217
c04f5ac3
JX
5133#, c-format
5134msgid "annotated tag %s not available"
55a16ee4 5135msgstr "附注标签 %s 无效"
c04f5ac3 5136
220c313c 5137#: builtin/describe.c:221
c04f5ac3
JX
5138#, c-format
5139msgid "annotated tag %s has no embedded name"
55a16ee4 5140msgstr "附注标签 %s 没有嵌入名称"
c04f5ac3 5141
220c313c 5142#: builtin/describe.c:223
c04f5ac3
JX
5143#, c-format
5144msgid "tag '%s' is really '%s' here"
55a16ee4 5145msgstr "标签 '%s' 的确是在 '%s'"
c04f5ac3 5146
220c313c 5147#: builtin/describe.c:250 builtin/log.c:452
c04f5ac3
JX
5148#, c-format
5149msgid "Not a valid object name %s"
5150msgstr "不是一个有效的对象名 %s"
5151
220c313c 5152#: builtin/describe.c:253
c04f5ac3
JX
5153#, c-format
5154msgid "%s is not a valid '%s' object"
5155msgstr "%s 不是一个有效的 '%s' 对象"
5156
220c313c 5157#: builtin/describe.c:270
c04f5ac3
JX
5158#, c-format
5159msgid "no tag exactly matches '%s'"
55a16ee4 5160msgstr "没有标签准确匹配 '%s'"
c04f5ac3 5161
220c313c 5162#: builtin/describe.c:272
c04f5ac3
JX
5163#, c-format
5164msgid "searching to describe %s\n"
5165msgstr "搜索描述 %s\n"
5166
220c313c 5167#: builtin/describe.c:319
c04f5ac3
JX
5168#, c-format
5169msgid "finished search at %s\n"
5170msgstr "完成搜索 %s\n"
5171
220c313c 5172#: builtin/describe.c:346
c04f5ac3
JX
5173#, c-format
5174msgid ""
5175"No annotated tags can describe '%s'.\n"
5176"However, there were unannotated tags: try --tags."
5177msgstr ""
55a16ee4
RC
5178"没有附注标签能描述 '%s'。\n"
5179"然而,存在未附注标签:尝试 --tags。"
c04f5ac3 5180
220c313c 5181#: builtin/describe.c:350
c04f5ac3
JX
5182#, c-format
5183msgid ""
5184"No tags can describe '%s'.\n"
5185"Try --always, or create some tags."
5186msgstr ""
55a16ee4
RC
5187"没有标签能描述 '%s'。\n"
5188"尝试 --always,或者创建一些标签。"
c04f5ac3 5189
220c313c 5190#: builtin/describe.c:371
c04f5ac3
JX
5191#, c-format
5192msgid "traversed %lu commits\n"
5193msgstr "已遍历 %lu 个提交\n"
5194
220c313c 5195#: builtin/describe.c:374
c04f5ac3
JX
5196#, c-format
5197msgid ""
5198"more than %i tags found; listed %i most recent\n"
5199"gave up search at %s\n"
5200msgstr ""
55a16ee4 5201"发现多于 %i 个标签,列出最近的 %i 个\n"
90e6ef53 5202"在 %s 放弃搜索\n"
c04f5ac3 5203
220c313c 5204#: builtin/describe.c:396
ef317cd5 5205msgid "find the tag that comes after the commit"
55a16ee4 5206msgstr "寻找该提交之后的标签"
ef317cd5 5207
220c313c 5208#: builtin/describe.c:397
ef317cd5 5209msgid "debug search strategy on stderr"
07432cef 5210msgstr "在标准错误上调试搜索策略"
ef317cd5 5211
220c313c 5212#: builtin/describe.c:398
1003b3a5
JX
5213msgid "use any ref"
5214msgstr "使用任意引用"
5215
220c313c 5216#: builtin/describe.c:399
1003b3a5 5217msgid "use any tag, even unannotated"
55a16ee4 5218msgstr "使用任意标签,即使未附带注释"
ef317cd5 5219
220c313c 5220#: builtin/describe.c:400
ef317cd5 5221msgid "always use long format"
07432cef 5222msgstr "始终使用长提交号格式"
ef317cd5 5223
220c313c 5224#: builtin/describe.c:401
2e8451e8
JX
5225msgid "only follow first parent"
5226msgstr "只跟随第一个父提交"
5227
220c313c 5228#: builtin/describe.c:404
ef317cd5 5229msgid "only output exact matches"
07432cef 5230msgstr "只输出精确匹配"
ef317cd5 5231
220c313c 5232#: builtin/describe.c:406
ef317cd5 5233msgid "consider <n> most recent tags (default: 10)"
55a16ee4 5234msgstr "考虑最近 <n> 个标签(默认:10)"
ef317cd5 5235
220c313c 5236#: builtin/describe.c:408
ef317cd5 5237msgid "only consider tags matching <pattern>"
55a16ee4 5238msgstr "只考虑匹配 <模式> 的标签"
ef317cd5 5239
220c313c 5240#: builtin/describe.c:410 builtin/name-rev.c:318
ef317cd5 5241msgid "show abbreviated commit object as fallback"
07432cef 5242msgstr "显示简写的提交号作为后备"
ef317cd5 5243
220c313c 5244#: builtin/describe.c:411
ef317cd5 5245msgid "mark"
07432cef 5246msgstr "标记"
ef317cd5 5247
220c313c 5248#: builtin/describe.c:412
ef317cd5 5249msgid "append <mark> on dirty working tree (default: \"-dirty\")"
160fb2b2 5250msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
ef317cd5 5251
220c313c 5252#: builtin/describe.c:430
c04f5ac3
JX
5253msgid "--long is incompatible with --abbrev=0"
5254msgstr "--long 与 --abbrev=0 不兼容"
5255
220c313c 5256#: builtin/describe.c:456
c04f5ac3 5257msgid "No names found, cannot describe anything."
90e6ef53 5258msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 5259
220c313c 5260#: builtin/describe.c:476
a8a5406a 5261msgid "--dirty is incompatible with commit-ishes"
649900bc 5262msgstr "--dirty 不能与提交同时使用"
c04f5ac3 5263
220c313c 5264#: builtin/diff.c:86
c04f5ac3
JX
5265#, c-format
5266msgid "'%s': not a regular file or symlink"
5267msgstr "'%s':不是一个正规文件或符号链接"
5268
220c313c 5269#: builtin/diff.c:237
c04f5ac3
JX
5270#, c-format
5271msgid "invalid option: %s"
5272msgstr "无效选项:%s"
5273
220c313c 5274#: builtin/diff.c:358
c04f5ac3 5275msgid "Not a git repository"
160fb2b2 5276msgstr "不是一个 git 仓库"
c04f5ac3 5277
220c313c 5278#: builtin/diff.c:401
c04f5ac3
JX
5279#, c-format
5280msgid "invalid object '%s' given."
5281msgstr "提供了无效对象 '%s'。"
5282
220c313c 5283#: builtin/diff.c:410
c04f5ac3
JX
5284#, c-format
5285msgid "more than two blobs given: '%s'"
160fb2b2 5286msgstr "提供了超过两个数据对象:'%s'"
c04f5ac3 5287
220c313c 5288#: builtin/diff.c:417
c04f5ac3
JX
5289#, c-format
5290msgid "unhandled object '%s' given."
6c94aba5 5291msgstr "无法处理的对象 '%s'。"
c04f5ac3 5292
220c313c 5293#: builtin/fast-export.c:24
ef317cd5 5294msgid "git fast-export [rev-list-opts]"
07432cef 5295msgstr "git fast-export [rev-list-opts]"
ef317cd5 5296
220c313c 5297#: builtin/fast-export.c:979
ef317cd5 5298msgid "show progress after <n> objects"
07432cef 5299msgstr "在 <n> 个对象之后显示进度"
ef317cd5 5300
220c313c 5301#: builtin/fast-export.c:981
ef317cd5 5302msgid "select handling of signed tags"
55a16ee4 5303msgstr "选择如何处理签名标签"
ef317cd5 5304
220c313c 5305#: builtin/fast-export.c:984
ef317cd5 5306msgid "select handling of tags that tag filtered objects"
55a16ee4 5307msgstr "选择当标签指向被过滤对象时该标签的处理方式"
ef317cd5 5308
220c313c 5309#: builtin/fast-export.c:987
ef317cd5 5310msgid "Dump marks to this file"
07432cef 5311msgstr "把标记存储到这个文件"
ef317cd5 5312
220c313c 5313#: builtin/fast-export.c:989
ef317cd5 5314msgid "Import marks from this file"
07432cef 5315msgstr "从这个文件导入标记"
ef317cd5 5316
220c313c 5317#: builtin/fast-export.c:991
ef317cd5 5318msgid "Fake a tagger when tags lack one"
55a16ee4 5319msgstr "当标签缺少标记者字段时,假装提供一个"
ef317cd5 5320
220c313c 5321#: builtin/fast-export.c:993
ef317cd5 5322msgid "Output full tree for each commit"
07432cef 5323msgstr "每次提交都输出整个树"
ef317cd5 5324
220c313c 5325#: builtin/fast-export.c:995
ef317cd5 5326msgid "Use the done feature to terminate the stream"
07432cef 5327msgstr "使用 done 功能来终止流"
ef317cd5 5328
220c313c 5329#: builtin/fast-export.c:996
ef317cd5 5330msgid "Skip output of blob data"
07432cef 5331msgstr "跳过数据对象的输出"
ef317cd5 5332
220c313c 5333#: builtin/fast-export.c:997
6acbf033 5334msgid "refspec"
160fb2b2 5335msgstr "引用规格"
6acbf033 5336
220c313c 5337#: builtin/fast-export.c:998
6acbf033 5338msgid "Apply refspec to exported refs"
160fb2b2 5339msgstr "对导出的引用应用引用规格"
6acbf033 5340
220c313c
JX
5341#: builtin/fast-export.c:999
5342msgid "anonymize output"
5343msgstr "匿名输出"
5344
814ff314 5345#: builtin/fetch.c:19
ef317cd5 5346msgid "git fetch [<options>] [<repository> [<refspec>...]]"
160fb2b2 5347msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
ef317cd5 5348
814ff314 5349#: builtin/fetch.c:20
ef317cd5 5350msgid "git fetch [<options>] <group>"
07432cef 5351msgstr "git fetch [<选项>] <组>"
ef317cd5 5352
814ff314 5353#: builtin/fetch.c:21
ef317cd5 5354msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
160fb2b2 5355msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
ef317cd5 5356
814ff314 5357#: builtin/fetch.c:22
ef317cd5 5358msgid "git fetch --all [<options>]"
07432cef 5359msgstr "git fetch --all [<选项>]"
ef317cd5 5360
814ff314 5361#: builtin/fetch.c:89
ef317cd5 5362msgid "fetch from all remotes"
07432cef 5363msgstr "从所有的远程抓取"
ef317cd5 5364
814ff314 5365#: builtin/fetch.c:91
ef317cd5 5366msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 5367msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 5368
814ff314 5369#: builtin/fetch.c:93
ef317cd5 5370msgid "path to upload pack on remote end"
07432cef 5371msgstr "上传包到远程的路径"
ef317cd5 5372
814ff314 5373#: builtin/fetch.c:94
ef317cd5 5374msgid "force overwrite of local branch"
07432cef 5375msgstr "强制覆盖本地分支"
ef317cd5 5376
814ff314 5377#: builtin/fetch.c:96
ef317cd5 5378msgid "fetch from multiple remotes"
07432cef 5379msgstr "从多个远程抓取"
ef317cd5 5380
814ff314 5381#: builtin/fetch.c:98
ef317cd5 5382msgid "fetch all tags and associated objects"
55a16ee4 5383msgstr "抓取所有的标签和关联对象"
ef317cd5 5384
814ff314 5385#: builtin/fetch.c:100
ef317cd5 5386msgid "do not fetch all tags (--no-tags)"
55a16ee4 5387msgstr "不抓取任何标签(--no-tags)"
ef317cd5 5388
814ff314 5389#: builtin/fetch.c:102
ef317cd5 5390msgid "prune remote-tracking branches no longer on remote"
07432cef 5391msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 5392
07432cef 5393# 译者:可选值,不能翻译
814ff314 5394#: builtin/fetch.c:103
ef317cd5 5395msgid "on-demand"
07432cef 5396msgstr "on-demand"
ef317cd5 5397
814ff314 5398#: builtin/fetch.c:104
ef317cd5 5399msgid "control recursive fetching of submodules"
07432cef 5400msgstr "控制子模组的递归抓取"
ef317cd5 5401
814ff314 5402#: builtin/fetch.c:108
ef317cd5 5403msgid "keep downloaded pack"
07432cef 5404msgstr "保持下载包"
ef317cd5 5405
814ff314 5406#: builtin/fetch.c:110
ef317cd5 5407msgid "allow updating of HEAD ref"
07432cef 5408msgstr "允许更新 HEAD 引用"
ef317cd5 5409
814ff314 5410#: builtin/fetch.c:113
ef317cd5 5411msgid "deepen history of shallow clone"
07432cef 5412msgstr "深化浅克隆的历史"
ef317cd5 5413
814ff314 5414#: builtin/fetch.c:115
a77c07d9 5415msgid "convert to a complete repository"
160fb2b2 5416msgstr "转换为一个完整的仓库"
a77c07d9 5417
814ff314 5418#: builtin/fetch.c:117 builtin/log.c:1208
ef317cd5 5419msgid "dir"
07432cef 5420msgstr "目录"
ef317cd5 5421
814ff314 5422#: builtin/fetch.c:118
ef317cd5 5423msgid "prepend this to submodule path output"
07432cef 5424msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 5425
814ff314 5426#: builtin/fetch.c:121
ef317cd5 5427msgid "default mode for recursion"
07432cef 5428msgstr "递归的默认模式"
ef317cd5 5429
814ff314 5430#: builtin/fetch.c:123
cfff71a9
JX
5431msgid "accept refs that update .git/shallow"
5432msgstr "接受更新 .git/shallow 的引用"
5433
814ff314 5434#: builtin/fetch.c:124
6acbf033
JX
5435msgid "refmap"
5436msgstr "引用映射"
5437
814ff314 5438#: builtin/fetch.c:125
6acbf033
JX
5439msgid "specify fetch refmap"
5440msgstr "指定获取操作的引用映射"
5441
7aea43ff 5442#: builtin/fetch.c:377
c04f5ac3
JX
5443msgid "Couldn't find remote ref HEAD"
5444msgstr "无法发现远程 HEAD 引用"
5445
7aea43ff 5446#: builtin/fetch.c:457
c04f5ac3
JX
5447#, c-format
5448msgid "object %s not found"
5449msgstr "对象 %s 未发现"
5450
7aea43ff 5451#: builtin/fetch.c:462
c04f5ac3
JX
5452msgid "[up to date]"
5453msgstr "[最新]"
5454
7aea43ff 5455#: builtin/fetch.c:476
c04f5ac3
JX
5456#, c-format
5457msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5458msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5459
7aea43ff 5460#: builtin/fetch.c:477 builtin/fetch.c:563
c04f5ac3
JX
5461msgid "[rejected]"
5462msgstr "[已拒绝]"
5463
7aea43ff 5464#: builtin/fetch.c:488
c04f5ac3 5465msgid "[tag update]"
55a16ee4 5466msgstr "[标签更新]"
c04f5ac3 5467
90e6ef53 5468# 译者:注意保持前导空格
7aea43ff 5469#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543
c04f5ac3
JX
5470msgid " (unable to update local ref)"
5471msgstr " (不能更新本地引用)"
5472
7aea43ff 5473#: builtin/fetch.c:508
c04f5ac3 5474msgid "[new tag]"
55a16ee4 5475msgstr "[新标签]"
c04f5ac3 5476
7aea43ff 5477#: builtin/fetch.c:511
c04f5ac3
JX
5478msgid "[new branch]"
5479msgstr "[新分支]"
5480
7aea43ff 5481#: builtin/fetch.c:514
170e9899
JX
5482msgid "[new ref]"
5483msgstr "[新引用]"
5484
7aea43ff 5485#: builtin/fetch.c:559
c04f5ac3
JX
5486msgid "unable to update local ref"
5487msgstr "不能更新本地引用"
5488
7aea43ff 5489#: builtin/fetch.c:559
c04f5ac3
JX
5490msgid "forced update"
5491msgstr "强制更新"
5492
7aea43ff 5493#: builtin/fetch.c:565
c04f5ac3 5494msgid "(non-fast-forward)"
90e6ef53 5495msgstr "(非快进式)"
c04f5ac3 5496
7aea43ff 5497#: builtin/fetch.c:599 builtin/fetch.c:832
c04f5ac3
JX
5498#, c-format
5499msgid "cannot open %s: %s\n"
5500msgstr "无法打开 %s:%s\n"
5501
7aea43ff 5502#: builtin/fetch.c:608
c04f5ac3
JX
5503#, c-format
5504msgid "%s did not send all necessary objects\n"
5505msgstr "%s 未发送所有必须的对象\n"
5506
7aea43ff 5507#: builtin/fetch.c:626
cfff71a9
JX
5508#, c-format
5509msgid "reject %s because shallow roots are not allowed to be updated"
5510msgstr "拒绝 %s 因为浅克隆不允许被更新"
5511
7aea43ff 5512#: builtin/fetch.c:714 builtin/fetch.c:797
c04f5ac3
JX
5513#, c-format
5514msgid "From %.*s\n"
5515msgstr "来自 %.*s\n"
5516
7aea43ff 5517#: builtin/fetch.c:725
c04f5ac3
JX
5518#, c-format
5519msgid ""
5520"some local refs could not be updated; try running\n"
5521" 'git remote prune %s' to remove any old, conflicting branches"
5522msgstr ""
5523"一些本地引用不能被更新;尝试运行\n"
5524" 'git remote prune %s' 来删除旧的、有冲突的分支"
5525
90e6ef53 5526# 译者:注意保持前导空格
7aea43ff 5527#: builtin/fetch.c:777
81809b99 5528#, c-format
8ada9598 5529msgid " (%s will become dangling)"
07432cef 5530msgstr " (%s 将成为摇摆状态)"
c04f5ac3 5531
90e6ef53 5532# 译者:注意保持前导空格
7aea43ff 5533#: builtin/fetch.c:778
81809b99 5534#, c-format
8ada9598 5535msgid " (%s has become dangling)"
07432cef 5536msgstr " (%s 已成为摇摆状态)"
c04f5ac3 5537
7aea43ff 5538#: builtin/fetch.c:802
c04f5ac3
JX
5539msgid "[deleted]"
5540msgstr "[已删除]"
5541
7aea43ff 5542#: builtin/fetch.c:803 builtin/remote.c:1057
c04f5ac3
JX
5543msgid "(none)"
5544msgstr "(无)"
5545
7aea43ff 5546#: builtin/fetch.c:822
c04f5ac3
JX
5547#, c-format
5548msgid "Refusing to fetch into current branch %s of non-bare repository"
160fb2b2 5549msgstr "拒绝获取到非纯仓库的当前分支 %s"
c04f5ac3 5550
7aea43ff 5551#: builtin/fetch.c:841
c04f5ac3
JX
5552#, c-format
5553msgid "Option \"%s\" value \"%s\" is not valid for %s"
5554msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5555
7aea43ff 5556#: builtin/fetch.c:844
c04f5ac3
JX
5557#, c-format
5558msgid "Option \"%s\" is ignored for %s\n"
81809b99 5559msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 5560
7aea43ff 5561#: builtin/fetch.c:900
90314792
JX
5562#, c-format
5563msgid "Don't know how to fetch from %s"
5564msgstr "不知道如何从 %s 获取"
5565
7aea43ff 5566#: builtin/fetch.c:1063
c04f5ac3
JX
5567#, c-format
5568msgid "Fetching %s\n"
d4a8e00b 5569msgstr "正在获取 %s\n"
c04f5ac3 5570
7aea43ff 5571#: builtin/fetch.c:1065 builtin/remote.c:90
c04f5ac3
JX
5572#, c-format
5573msgid "Could not fetch %s"
5574msgstr "不能获取 %s"
5575
7aea43ff 5576#: builtin/fetch.c:1083
c04f5ac3
JX
5577msgid ""
5578"No remote repository specified. Please, specify either a URL or a\n"
5579"remote name from which new revisions should be fetched."
4375c10e 5580msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
c04f5ac3 5581
7aea43ff 5582#: builtin/fetch.c:1106
c04f5ac3 5583msgid "You need to specify a tag name."
55a16ee4 5584msgstr "您需要指定一个标签名称。"
c04f5ac3 5585
7aea43ff 5586#: builtin/fetch.c:1148
a77c07d9
JX
5587msgid "--depth and --unshallow cannot be used together"
5588msgstr "--depth 和 --unshallow 不能同时使用"
5589
7aea43ff 5590#: builtin/fetch.c:1150
a77c07d9 5591msgid "--unshallow on a complete repository does not make sense"
160fb2b2 5592msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
a77c07d9 5593
7aea43ff 5594#: builtin/fetch.c:1173
c04f5ac3 5595msgid "fetch --all does not take a repository argument"
160fb2b2 5596msgstr "fetch --all 不能带一个仓库参数"
c04f5ac3 5597
7aea43ff 5598#: builtin/fetch.c:1175
c04f5ac3 5599msgid "fetch --all does not make sense with refspecs"
160fb2b2 5600msgstr "fetch --all 带引用规格没有任何意义"
c04f5ac3 5601
7aea43ff 5602#: builtin/fetch.c:1186
c04f5ac3
JX
5603#, c-format
5604msgid "No such remote or remote group: %s"
5605msgstr "没有这样的远程或远程组:%s"
5606
7aea43ff 5607#: builtin/fetch.c:1194
c04f5ac3 5608msgid "Fetching a group and specifying refspecs does not make sense"
160fb2b2 5609msgstr "获取组并指定引用规格没有意义"
c04f5ac3 5610
ef317cd5 5611#: builtin/fmt-merge-msg.c:13
814ff314
JX
5612msgid ""
5613"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
5614msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 5615
7aea43ff 5616#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698
04cb2f28 5617#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
7aea43ff
JX
5618#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590
5619#: parse-options.h:131 parse-options.h:238
ef317cd5 5620msgid "n"
07432cef 5621msgstr "n"
c04f5ac3 5622
7aea43ff 5623#: builtin/fmt-merge-msg.c:669
ef317cd5 5624msgid "populate log with at most <n> entries from shortlog"
07432cef 5625msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 5626
7aea43ff 5627#: builtin/fmt-merge-msg.c:672
ef317cd5 5628msgid "alias for --log (deprecated)"
07432cef 5629msgstr "参数 --log 的别名(已弃用)"
ef317cd5 5630
7aea43ff 5631#: builtin/fmt-merge-msg.c:675
ef317cd5 5632msgid "text"
07432cef 5633msgstr "文本"
ef317cd5 5634
7aea43ff 5635#: builtin/fmt-merge-msg.c:676
ef317cd5 5636msgid "use <text> as start of message"
07432cef 5637msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 5638
7aea43ff 5639#: builtin/fmt-merge-msg.c:677
ef317cd5 5640msgid "file to read from"
07432cef 5641msgstr "从文件中读取"
ef317cd5 5642
7aea43ff 5643#: builtin/for-each-ref.c:687
220c313c
JX
5644msgid "unable to parse format"
5645msgstr "不能解析格式"
5646
7aea43ff 5647#: builtin/for-each-ref.c:1083
814ff314
JX
5648msgid "git for-each-ref [<options>] [<pattern>]"
5649msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 5650
7aea43ff 5651#: builtin/for-each-ref.c:1098
ef317cd5 5652msgid "quote placeholders suitably for shells"
07432cef 5653msgstr "引用占位符适用于 shells"
ef317cd5 5654
7aea43ff 5655#: builtin/for-each-ref.c:1100
ef317cd5 5656msgid "quote placeholders suitably for perl"
07432cef 5657msgstr "引用占位符适用于 perl"
ef317cd5 5658
7aea43ff 5659#: builtin/for-each-ref.c:1102
ef317cd5 5660msgid "quote placeholders suitably for python"
07432cef 5661msgstr "引用占位符适用于 python"
ef317cd5 5662
7aea43ff 5663#: builtin/for-each-ref.c:1104
04cb2f28
JX
5664msgid "quote placeholders suitably for Tcl"
5665msgstr "引用占位符适用于 Tcl"
ef317cd5 5666
7aea43ff 5667#: builtin/for-each-ref.c:1107
ef317cd5 5668msgid "show only <n> matched refs"
07432cef 5669msgstr "只显示 <n> 个匹配的引用"
ef317cd5 5670
7aea43ff 5671#: builtin/for-each-ref.c:1108 builtin/replace.c:438
ef317cd5 5672msgid "format"
07432cef 5673msgstr "格式"
ef317cd5 5674
7aea43ff 5675#: builtin/for-each-ref.c:1108
ef317cd5 5676msgid "format to use for the output"
07432cef 5677msgstr "输出格式"
ef317cd5 5678
7aea43ff 5679#: builtin/for-each-ref.c:1109
ef317cd5 5680msgid "key"
07432cef 5681msgstr "key"
ef317cd5 5682
7aea43ff 5683#: builtin/for-each-ref.c:1110
ef317cd5 5684msgid "field name to sort on"
07432cef 5685msgstr "排序的字段名"
ef317cd5 5686
5bb01d4f 5687#: builtin/fsck.c:147 builtin/prune.c:137
6c94aba5
JX
5688msgid "Checking connectivity"
5689msgstr "检查连接中"
5690
7aea43ff 5691#: builtin/fsck.c:548
6c94aba5
JX
5692msgid "Checking object directories"
5693msgstr "检查对象目录中"
5694
7aea43ff 5695#: builtin/fsck.c:611
814ff314
JX
5696msgid "git fsck [<options>] [<object>...]"
5697msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 5698
7aea43ff 5699#: builtin/fsck.c:617
ef317cd5 5700msgid "show unreachable objects"
07432cef 5701msgstr "显示不可达的对象"
ef317cd5 5702
7aea43ff 5703#: builtin/fsck.c:618
ef317cd5 5704msgid "show dangling objects"
07432cef 5705msgstr "显示摇摆的对象"
ef317cd5 5706
7aea43ff 5707#: builtin/fsck.c:619
ef317cd5 5708msgid "report tags"
55a16ee4 5709msgstr "报告标签"
ef317cd5 5710
7aea43ff 5711#: builtin/fsck.c:620
ef317cd5 5712msgid "report root nodes"
07432cef 5713msgstr "报告根节点"
ef317cd5 5714
7aea43ff 5715#: builtin/fsck.c:621
ef317cd5 5716msgid "make index objects head nodes"
07432cef 5717msgstr "将索引亦作为检查的头节点"
ef317cd5 5718
7aea43ff 5719#: builtin/fsck.c:622
ef317cd5 5720msgid "make reflogs head nodes (default)"
07432cef 5721msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 5722
7aea43ff 5723#: builtin/fsck.c:623
ef317cd5 5724msgid "also consider packs and alternate objects"
07432cef 5725msgstr "也考虑包和备用对象"
ef317cd5 5726
7aea43ff 5727#: builtin/fsck.c:624
ef317cd5 5728msgid "enable more strict checking"
07432cef 5729msgstr "启用更严格的检查"
ef317cd5 5730
7aea43ff 5731#: builtin/fsck.c:626
ef317cd5 5732msgid "write dangling objects in .git/lost-found"
07432cef 5733msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5 5734
5bb01d4f 5735#: builtin/fsck.c:627 builtin/prune.c:107
ef317cd5 5736msgid "show progress"
07432cef 5737msgstr "显示进度"
ef317cd5 5738
7aea43ff 5739#: builtin/fsck.c:677
6c94aba5
JX
5740msgid "Checking objects"
5741msgstr "检查对象中"
5742
cfff71a9 5743#: builtin/gc.c:24
814ff314
JX
5744msgid "git gc [<options>]"
5745msgstr "git gc [<选项>]"
ef317cd5 5746
7aea43ff 5747#: builtin/gc.c:67
c04f5ac3 5748#, c-format
7aea43ff
JX
5749msgid "Invalid %s: '%s'"
5750msgstr "无效 %s:'%s'"
c04f5ac3 5751
7aea43ff 5752#: builtin/gc.c:112
c04f5ac3
JX
5753#, c-format
5754msgid "insanely long object directory %.*s"
5755msgstr "不正常的长对象目录 %.*s"
5756
7aea43ff 5757#: builtin/gc.c:281
ef317cd5 5758msgid "prune unreferenced objects"
07432cef 5759msgstr "清除未引用的对象"
ef317cd5 5760
7aea43ff 5761#: builtin/gc.c:283
ef317cd5 5762msgid "be more thorough (increased runtime)"
07432cef 5763msgstr "更彻底(增加运行时间)"
ef317cd5 5764
7aea43ff 5765#: builtin/gc.c:284
ef317cd5 5766msgid "enable auto-gc mode"
07432cef 5767msgstr "启用自动垃圾回收模式"
ef317cd5 5768
7aea43ff 5769#: builtin/gc.c:285
90314792
JX
5770msgid "force running gc even if there may be another gc running"
5771msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5772
7aea43ff 5773#: builtin/gc.c:327
c04f5ac3 5774#, c-format
6c94aba5 5775msgid "Auto packing the repository in background for optimum performance.\n"
160fb2b2 5776msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6c94aba5 5777
7aea43ff 5778#: builtin/gc.c:329
6c94aba5
JX
5779#, c-format
5780msgid "Auto packing the repository for optimum performance.\n"
160fb2b2 5781msgstr "自动打包仓库以求最佳性能。\n"
6c94aba5 5782
7aea43ff 5783#: builtin/gc.c:330
6c94aba5
JX
5784#, c-format
5785msgid "See \"git help gc\" for manual housekeeping.\n"
5786msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 5787
7aea43ff 5788#: builtin/gc.c:348
90314792
JX
5789#, c-format
5790msgid ""
5791"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5792msgstr ""
5793"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5794
7aea43ff 5795#: builtin/gc.c:376
c04f5ac3
JX
5796msgid ""
5797"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 5798msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 5799
90314792 5800#: builtin/grep.c:23
814ff314
JX
5801msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
5802msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 5803
90314792 5804#: builtin/grep.c:218
c04f5ac3
JX
5805#, c-format
5806msgid "grep: failed to create thread: %s"
90e6ef53 5807msgstr "grep:无法创建线程:%s"
c04f5ac3 5808
6acbf033 5809#: builtin/grep.c:441 builtin/grep.c:476
c04f5ac3
JX
5810#, c-format
5811msgid "unable to read tree (%s)"
90e6ef53 5812msgstr "无法读取树(%s)"
c04f5ac3 5813
6acbf033 5814#: builtin/grep.c:491
c04f5ac3
JX
5815#, c-format
5816msgid "unable to grep from object of type %s"
5817msgstr "无法抓取来自于 %s 类型的对象"
5818
6acbf033 5819#: builtin/grep.c:547
c04f5ac3
JX
5820#, c-format
5821msgid "switch `%c' expects a numerical value"
5822msgstr "开关 `%c' 期望一个数字值"
5823
6acbf033 5824#: builtin/grep.c:564
c04f5ac3
JX
5825#, c-format
5826msgid "cannot open '%s'"
5827msgstr "不能打开 '%s'"
5828
6acbf033 5829#: builtin/grep.c:638
ef317cd5 5830msgid "search in index instead of in the work tree"
07432cef 5831msgstr "在索引区搜索而不是在工作区"
ef317cd5 5832
6acbf033 5833#: builtin/grep.c:640
ef317cd5 5834msgid "find in contents not managed by git"
07432cef 5835msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
5836
5837# 译者:中文字符串拼接,可删除前导空格
6acbf033 5838#: builtin/grep.c:642
ef317cd5 5839msgid "search in both tracked and untracked files"
07432cef 5840msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 5841
6acbf033 5842#: builtin/grep.c:644
814ff314
JX
5843msgid "ignore files specified via '.gitignore'"
5844msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 5845
6acbf033 5846#: builtin/grep.c:647
ef317cd5 5847msgid "show non-matching lines"
07432cef 5848msgstr "显示未匹配的行"
ef317cd5 5849
6acbf033 5850#: builtin/grep.c:649
ef317cd5 5851msgid "case insensitive matching"
07432cef 5852msgstr "不区分大小写匹配"
ef317cd5 5853
6acbf033 5854#: builtin/grep.c:651
ef317cd5 5855msgid "match patterns only at word boundaries"
07432cef 5856msgstr "只在单词边界匹配模式"
ef317cd5 5857
6acbf033 5858#: builtin/grep.c:653
ef317cd5 5859msgid "process binary files as text"
07432cef 5860msgstr "把二进制文件当做文本处理"
ef317cd5 5861
6acbf033 5862#: builtin/grep.c:655
ef317cd5 5863msgid "don't match patterns in binary files"
07432cef 5864msgstr "不在二进制文件中匹配模式"
ef317cd5 5865
6acbf033 5866#: builtin/grep.c:658
90314792
JX
5867msgid "process binary files with textconv filters"
5868msgstr "用 textconv 过滤器处理二进制文件"
5869
6acbf033 5870#: builtin/grep.c:660
ef317cd5 5871msgid "descend at most <depth> levels"
07432cef 5872msgstr "最多以指定的深度向下寻找"
ef317cd5 5873
6acbf033 5874#: builtin/grep.c:664
ef317cd5 5875msgid "use extended POSIX regular expressions"
07432cef 5876msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 5877
6acbf033 5878#: builtin/grep.c:667
ef317cd5 5879msgid "use basic POSIX regular expressions (default)"
07432cef 5880msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 5881
6acbf033 5882#: builtin/grep.c:670
ef317cd5 5883msgid "interpret patterns as fixed strings"
07432cef 5884msgstr "把模式解析为固定的字符串"
ef317cd5 5885
6acbf033 5886#: builtin/grep.c:673
ef317cd5 5887msgid "use Perl-compatible regular expressions"
07432cef 5888msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 5889
6acbf033 5890#: builtin/grep.c:676
ef317cd5 5891msgid "show line numbers"
07432cef 5892msgstr "显示行号"
ef317cd5 5893
6acbf033 5894#: builtin/grep.c:677
ef317cd5 5895msgid "don't show filenames"
07432cef 5896msgstr "不显示文件名"
ef317cd5 5897
6acbf033 5898#: builtin/grep.c:678
ef317cd5 5899msgid "show filenames"
07432cef 5900msgstr "显示文件名"
ef317cd5 5901
6acbf033 5902#: builtin/grep.c:680
ef317cd5 5903msgid "show filenames relative to top directory"
07432cef 5904msgstr "显示相对于顶级目录的文件名"
ef317cd5 5905
6acbf033 5906#: builtin/grep.c:682
ef317cd5 5907msgid "show only filenames instead of matching lines"
07432cef 5908msgstr "只显示文件名而不显示匹配的行"
ef317cd5 5909
6acbf033 5910#: builtin/grep.c:684
ef317cd5 5911msgid "synonym for --files-with-matches"
07432cef 5912msgstr "和 --files-with-matches 同义"
ef317cd5 5913
6acbf033 5914#: builtin/grep.c:687
ef317cd5 5915msgid "show only the names of files without match"
07432cef 5916msgstr "只显示未匹配的文件名"
ef317cd5 5917
6acbf033 5918#: builtin/grep.c:689
ef317cd5 5919msgid "print NUL after filenames"
07432cef 5920msgstr "在文件名后输出 NUL 字符"
ef317cd5 5921
6acbf033 5922#: builtin/grep.c:691
ef317cd5 5923msgid "show the number of matches instead of matching lines"
07432cef 5924msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 5925
6acbf033 5926#: builtin/grep.c:692
ef317cd5 5927msgid "highlight matches"
07432cef 5928msgstr "高亮显示匹配项"
ef317cd5 5929
6acbf033 5930#: builtin/grep.c:694
ef317cd5 5931msgid "print empty line between matches from different files"
07432cef 5932msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 5933
6acbf033 5934#: builtin/grep.c:696
ef317cd5 5935msgid "show filename only once above matches from same file"
07432cef 5936msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 5937
6acbf033 5938#: builtin/grep.c:699
ef317cd5 5939msgid "show <n> context lines before and after matches"
07432cef 5940msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 5941
6acbf033 5942#: builtin/grep.c:702
ef317cd5 5943msgid "show <n> context lines before matches"
07432cef 5944msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 5945
6acbf033 5946#: builtin/grep.c:704
ef317cd5 5947msgid "show <n> context lines after matches"
07432cef 5948msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 5949
6acbf033 5950#: builtin/grep.c:705
ef317cd5 5951msgid "shortcut for -C NUM"
07432cef 5952msgstr "快捷键 -C 数字"
ef317cd5 5953
6acbf033 5954#: builtin/grep.c:708
ef317cd5 5955msgid "show a line with the function name before matches"
07432cef 5956msgstr "在匹配的前面显示一行函数名"
ef317cd5 5957
6acbf033 5958#: builtin/grep.c:710
ef317cd5 5959msgid "show the surrounding function"
07432cef 5960msgstr "显示所在函数的前后内容"
ef317cd5 5961
6acbf033 5962#: builtin/grep.c:713
ef317cd5 5963msgid "read patterns from file"
07432cef 5964msgstr "从文件读取模式"
ef317cd5 5965
6acbf033 5966#: builtin/grep.c:715
ef317cd5 5967msgid "match <pattern>"
07432cef 5968msgstr "匹配 <模式>"
ef317cd5 5969
6acbf033 5970#: builtin/grep.c:717
ef317cd5 5971msgid "combine patterns specified with -e"
07432cef 5972msgstr "组合用 -e 参数设定的模式"
ef317cd5 5973
6acbf033 5974#: builtin/grep.c:729
ef317cd5 5975msgid "indicate hit with exit status without output"
07432cef 5976msgstr "不输出,而用退出码标识命中状态"
ef317cd5 5977
6acbf033 5978#: builtin/grep.c:731
ef317cd5 5979msgid "show only matches from files that match all patterns"
07432cef 5980msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 5981
6acbf033 5982#: builtin/grep.c:733
07432cef
WS
5983msgid "show parse tree for grep expression"
5984msgstr "显示 grep 表达式的解析树"
5985
6acbf033 5986#: builtin/grep.c:737
ef317cd5 5987msgid "pager"
07432cef 5988msgstr "分页"
ef317cd5 5989
6acbf033 5990#: builtin/grep.c:737
ef317cd5 5991msgid "show matching files in the pager"
07432cef 5992msgstr "分页显示匹配的文件"
ef317cd5 5993
6acbf033 5994#: builtin/grep.c:740
ef317cd5 5995msgid "allow calling of grep(1) (ignored by this build)"
07432cef 5996msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 5997
7aea43ff 5998#: builtin/grep.c:741 builtin/show-ref.c:189
ef317cd5 5999msgid "show usage"
07432cef 6000msgstr "显示用法"
ef317cd5 6001
6acbf033 6002#: builtin/grep.c:808
c04f5ac3
JX
6003msgid "no pattern given."
6004msgstr "未提供模式匹配。"
6005
6acbf033 6006#: builtin/grep.c:866
c04f5ac3
JX
6007msgid "--open-files-in-pager only works on the worktree"
6008msgstr "--open-files-in-pager 仅用于工作区"
6009
6acbf033 6010#: builtin/grep.c:892
c04f5ac3 6011msgid "--cached or --untracked cannot be used with --no-index."
649900bc 6012msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 6013
6acbf033 6014#: builtin/grep.c:897
c04f5ac3 6015msgid "--no-index or --untracked cannot be used with revs."
649900bc 6016msgstr "--no-index 或 --untracked 不能和版本同时使用。"
c04f5ac3 6017
6acbf033 6018#: builtin/grep.c:900
c04f5ac3 6019msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 6020msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 6021
6acbf033 6022#: builtin/grep.c:908
c04f5ac3
JX
6023msgid "both --cached and trees are given."
6024msgstr "同时给出了 --cached 和树对象。"
6025
7aea43ff 6026#: builtin/hash-object.c:80
ef317cd5 6027msgid ""
814ff314
JX
6028"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6029"[--] <file>..."
ef317cd5 6030msgstr ""
814ff314
JX
6031"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
6032"[--] <文件>..."
ef317cd5 6033
7aea43ff 6034#: builtin/hash-object.c:81
ef317cd5 6035msgid "git hash-object --stdin-paths < <list-of-paths>"
07432cef 6036msgstr "git hash-object --stdin-paths < <路径列表>"
ef317cd5 6037
7aea43ff 6038#: builtin/hash-object.c:92 builtin/tag.c:612
ef317cd5 6039msgid "type"
07432cef 6040msgstr "类型"
ef317cd5 6041
7aea43ff 6042#: builtin/hash-object.c:92
ef317cd5 6043msgid "object type"
07432cef 6044msgstr "对象类型"
ef317cd5 6045
7aea43ff 6046#: builtin/hash-object.c:93
ef317cd5 6047msgid "write the object into the object database"
07432cef 6048msgstr "将对象写入对象数据库"
ef317cd5 6049
7aea43ff 6050#: builtin/hash-object.c:95
ef317cd5 6051msgid "read the object from stdin"
07432cef 6052msgstr "从标准输入读取对象"
ef317cd5 6053
7aea43ff 6054#: builtin/hash-object.c:97
ef317cd5 6055msgid "store file as is without filters"
07432cef 6056msgstr "原样存储文件不使用过滤器"
ef317cd5 6057
7aea43ff 6058#: builtin/hash-object.c:98
220c313c
JX
6059msgid ""
6060"just hash any random garbage to create corrupt objects for debugging Git"
6061msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
6062
7aea43ff 6063#: builtin/hash-object.c:99
ef317cd5 6064msgid "process file as it were from this path"
07432cef 6065msgstr "处理文件并假设其来自于此路径"
ef317cd5 6066
2e8451e8 6067#: builtin/help.c:41
ef317cd5 6068msgid "print all available commands"
07432cef 6069msgstr "打印所有可用的命令"
ef317cd5 6070
2e8451e8 6071#: builtin/help.c:42
4dcdc3d8
JX
6072msgid "print list of useful guides"
6073msgstr "显示有用的指南列表"
6074
2e8451e8 6075#: builtin/help.c:43
ef317cd5 6076msgid "show man page"
07432cef 6077msgstr "显示 man 手册"
ef317cd5 6078
2e8451e8 6079#: builtin/help.c:44
ef317cd5 6080msgid "show manual in web browser"
07432cef 6081msgstr "在 web 浏览器中显示手册"
ef317cd5 6082
2e8451e8 6083#: builtin/help.c:46
ef317cd5 6084msgid "show info page"
07432cef 6085msgstr "显示 info 手册"
ef317cd5 6086
2e8451e8 6087#: builtin/help.c:52
814ff314
JX
6088msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6089msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
ef317cd5 6090
2e8451e8 6091#: builtin/help.c:64
81809b99 6092#, c-format
8ada9598 6093msgid "unrecognized help format '%s'"
81809b99 6094msgstr "未能识别的帮助格式 '%s'"
8ada9598 6095
220c313c 6096#: builtin/help.c:91
8ada9598 6097msgid "Failed to start emacsclient."
81809b99 6098msgstr "无法启动 emacsclient。"
8ada9598 6099
220c313c 6100#: builtin/help.c:104
8ada9598 6101msgid "Failed to parse emacsclient version."
81809b99 6102msgstr "无法解析 emacsclient 版本。"
8ada9598 6103
220c313c 6104#: builtin/help.c:112
8ada9598
JX
6105#, c-format
6106msgid "emacsclient version '%d' too old (< 22)."
07432cef 6107msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 6108
220c313c 6109#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
81809b99 6110#, c-format
8ada9598 6111msgid "failed to exec '%s': %s"
81809b99 6112msgstr "无法执行 '%s':%s"
8ada9598 6113
220c313c 6114#: builtin/help.c:215
8ada9598
JX
6115#, c-format
6116msgid ""
6117"'%s': path for unsupported man viewer.\n"
6118"Please consider using 'man.<tool>.cmd' instead."
6119msgstr ""
81809b99 6120"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 6121"请使用 'man.<工具>.cmd'。"
8ada9598 6122
220c313c 6123#: builtin/help.c:227
8ada9598
JX
6124#, c-format
6125msgid ""
6126"'%s': cmd for supported man viewer.\n"
6127"Please consider using 'man.<tool>.path' instead."
6128msgstr ""
81809b99 6129"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 6130"请使用 'man.<工具>.path'。"
8ada9598 6131
04cb2f28 6132#: builtin/help.c:354
8ada9598
JX
6133#, c-format
6134msgid "'%s': unknown man viewer."
81809b99 6135msgstr "'%s':未知的 man 查看器。"
8ada9598 6136
04cb2f28 6137#: builtin/help.c:371
8ada9598 6138msgid "no man viewer handled the request"
81809b99 6139msgstr "没有 man 查看器处理此请求"
8ada9598 6140
04cb2f28 6141#: builtin/help.c:379
8ada9598 6142msgid "no info viewer handled the request"
81809b99 6143msgstr "没有 info 查看器处理此请求"
8ada9598 6144
04cb2f28 6145#: builtin/help.c:428
4dcdc3d8
JX
6146msgid "Defining attributes per path"
6147msgstr "定义路径的属性"
6148
04cb2f28 6149#: builtin/help.c:429
220c313c
JX
6150msgid "Everyday Git With 20 Commands Or So"
6151msgstr "每一天 Git 常用的约 20 条命令"
6152
04cb2f28 6153#: builtin/help.c:430
4dcdc3d8
JX
6154msgid "A Git glossary"
6155msgstr "Git 词汇表"
6156
04cb2f28 6157#: builtin/help.c:431
4dcdc3d8
JX
6158msgid "Specifies intentionally untracked files to ignore"
6159msgstr "忽略指定的未跟踪文件"
6160
04cb2f28 6161#: builtin/help.c:432
4dcdc3d8
JX
6162msgid "Defining submodule properties"
6163msgstr "定义子模组属性"
6164
04cb2f28 6165#: builtin/help.c:433
4dcdc3d8
JX
6166msgid "Specifying revisions and ranges for Git"
6167msgstr "指定 Git 的版本和版本范围"
6168
04cb2f28 6169#: builtin/help.c:434
4dcdc3d8
JX
6170msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6171msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6172
04cb2f28 6173#: builtin/help.c:435
4dcdc3d8
JX
6174msgid "An overview of recommended workflows with Git"
6175msgstr "Git 推荐的工作流概览"
6176
04cb2f28 6177#: builtin/help.c:447
4dcdc3d8
JX
6178msgid "The common Git guides are:\n"
6179msgstr "最常用的 Git 向导有:\n"
6180
04cb2f28 6181#: builtin/help.c:468 builtin/help.c:485
8ada9598
JX
6182#, c-format
6183msgid "usage: %s%s"
81809b99 6184msgstr "用法:%s%s"
8ada9598 6185
04cb2f28 6186#: builtin/help.c:501
8ada9598
JX
6187#, c-format
6188msgid "`git %s' is aliased to `%s'"
81809b99 6189msgstr "`git %s' 是 `%s' 的别名"
8ada9598 6190
7aea43ff 6191#: builtin/index-pack.c:151
6acbf033
JX
6192#, c-format
6193msgid "unable to open %s"
6194msgstr "不能打开 %s"
6195
7aea43ff 6196#: builtin/index-pack.c:201
8ada9598
JX
6197#, c-format
6198msgid "object type mismatch at %s"
81809b99 6199msgstr "%s 的对象类型不匹配"
8ada9598 6200
7aea43ff 6201#: builtin/index-pack.c:221
6acbf033
JX
6202#, c-format
6203msgid "did not receive expected object %s"
6204msgstr "未能获取期望的对象 %s"
8ada9598 6205
7aea43ff 6206#: builtin/index-pack.c:224
6acbf033
JX
6207#, c-format
6208msgid "object %s: expected type %s, found %s"
6209msgstr "对象 %s:期待类型 %s,却是 %s"
6210
7aea43ff 6211#: builtin/index-pack.c:266
81809b99 6212#, c-format
8ada9598
JX
6213msgid "cannot fill %d byte"
6214msgid_plural "cannot fill %d bytes"
81809b99 6215msgstr[0] "无法填充 %d 字节"
5ae481e0 6216msgstr[1] "无法填充 %d 字节"
8ada9598 6217
7aea43ff 6218#: builtin/index-pack.c:276
8ada9598 6219msgid "early EOF"
81809b99 6220msgstr "过早的文件结束符(EOF)"
8ada9598 6221
7aea43ff 6222#: builtin/index-pack.c:277
8ada9598 6223msgid "read error on input"
81809b99 6224msgstr "输入上的读错误"
8ada9598 6225
7aea43ff 6226#: builtin/index-pack.c:289
8ada9598 6227msgid "used more bytes than were available"
81809b99 6228msgstr "用掉了超过可用的字节"
8ada9598 6229
7aea43ff 6230#: builtin/index-pack.c:296
8ada9598 6231msgid "pack too large for current definition of off_t"
81809b99 6232msgstr "包太大超过了当前 off_t 的定义"
8ada9598 6233
7aea43ff 6234#: builtin/index-pack.c:312
81809b99 6235#, c-format
8ada9598 6236msgid "unable to create '%s'"
81809b99 6237msgstr "不能创建 '%s'"
8ada9598 6238
7aea43ff 6239#: builtin/index-pack.c:317
81809b99 6240#, c-format
8ada9598 6241msgid "cannot open packfile '%s'"
81809b99 6242msgstr "无法打开包文件 '%s'"
8ada9598 6243
7aea43ff 6244#: builtin/index-pack.c:331
8ada9598 6245msgid "pack signature mismatch"
81809b99 6246msgstr "包签名不匹配"
8ada9598 6247
7aea43ff 6248#: builtin/index-pack.c:333
ef317cd5
JX
6249#, c-format
6250msgid "pack version %<PRIu32> unsupported"
07432cef 6251msgstr "不支持包版本 %<PRIu32>"
ef317cd5 6252
7aea43ff 6253#: builtin/index-pack.c:351
8ada9598
JX
6254#, c-format
6255msgid "pack has bad object at offset %lu: %s"
81809b99 6256msgstr "包中有错误的对象位于 %lu:%s"
8ada9598 6257
7aea43ff 6258#: builtin/index-pack.c:472
8ada9598
JX
6259#, c-format
6260msgid "inflate returned %d"
81809b99 6261msgstr "解压缩返回 %d"
8ada9598 6262
7aea43ff 6263#: builtin/index-pack.c:521
8ada9598 6264msgid "offset value overflow for delta base object"
81809b99 6265msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 6266
7aea43ff 6267#: builtin/index-pack.c:529
8ada9598 6268msgid "delta base offset is out of bound"
81809b99 6269msgstr "delta 基准偏移越界"
8ada9598 6270
7aea43ff 6271#: builtin/index-pack.c:537
81809b99 6272#, c-format
8ada9598 6273msgid "unknown object type %d"
81809b99 6274msgstr "未知对象类型 %d"
8ada9598 6275
7aea43ff 6276#: builtin/index-pack.c:568
8ada9598 6277msgid "cannot pread pack file"
81809b99 6278msgstr "无法读取包文件"
8ada9598 6279
7aea43ff 6280#: builtin/index-pack.c:570
8ada9598
JX
6281#, c-format
6282msgid "premature end of pack file, %lu byte missing"
6283msgid_plural "premature end of pack file, %lu bytes missing"
81809b99 6284msgstr[0] "包文件过早结束,缺少 %lu 字节"
5ae481e0 6285msgstr[1] "包文件过早结束,缺少 %lu 字节"
8ada9598 6286
7aea43ff 6287#: builtin/index-pack.c:596
8ada9598 6288msgid "serious inflate inconsistency"
81809b99 6289msgstr "解压缩严重的不一致"
8ada9598 6290
7aea43ff
JX
6291#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771
6292#: builtin/index-pack.c:805 builtin/index-pack.c:814
8ada9598
JX
6293#, c-format
6294msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 6295msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 6296
7aea43ff 6297#: builtin/index-pack.c:745 builtin/pack-objects.c:162
814ff314 6298#: builtin/pack-objects.c:254
6792b93b
JX
6299#, c-format
6300msgid "unable to read %s"
6301msgstr "不能读 %s"
6302
7aea43ff 6303#: builtin/index-pack.c:811
6792b93b
JX
6304#, c-format
6305msgid "cannot read existing object %s"
6306msgstr "不能读取现存对象 %s"
6307
7aea43ff 6308#: builtin/index-pack.c:825
81809b99 6309#, c-format
8ada9598 6310msgid "invalid blob object %s"
160fb2b2 6311msgstr "无效的数据对象 %s"
8ada9598 6312
7aea43ff 6313#: builtin/index-pack.c:839
81809b99 6314#, c-format
8ada9598 6315msgid "invalid %s"
81809b99 6316msgstr "无效的 %s"
8ada9598 6317
7aea43ff 6318#: builtin/index-pack.c:843
8ada9598 6319msgid "Error in object"
81809b99 6320msgstr "对象中出错"
8ada9598 6321
7aea43ff 6322#: builtin/index-pack.c:845
8ada9598
JX
6323#, c-format
6324msgid "Not all child objects of %s are reachable"
81809b99 6325msgstr "%s 的所有子对象并非都可达"
8ada9598 6326
7aea43ff 6327#: builtin/index-pack.c:917 builtin/index-pack.c:948
8ada9598 6328msgid "failed to apply delta"
81809b99 6329msgstr "无法应用 delta"
8ada9598 6330
7aea43ff 6331#: builtin/index-pack.c:1118
8ada9598 6332msgid "Receiving objects"
81809b99 6333msgstr "接收对象中"
8ada9598 6334
7aea43ff 6335#: builtin/index-pack.c:1118
8ada9598 6336msgid "Indexing objects"
81809b99 6337msgstr "索引对象中"
8ada9598 6338
7aea43ff 6339#: builtin/index-pack.c:1150
8ada9598 6340msgid "pack is corrupted (SHA1 mismatch)"
81809b99 6341msgstr "包冲突(SHA1 不匹配)"
8ada9598 6342
7aea43ff 6343#: builtin/index-pack.c:1155
8ada9598 6344msgid "cannot fstat packfile"
81809b99 6345msgstr "不能枚举包文件状态"
8ada9598 6346
7aea43ff 6347#: builtin/index-pack.c:1158
8ada9598 6348msgid "pack has junk at the end"
81809b99 6349msgstr "包的结尾有垃圾数据"
8ada9598 6350
7aea43ff 6351#: builtin/index-pack.c:1169
6792b93b
JX
6352msgid "confusion beyond insanity in parse_pack_objects()"
6353msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6354
7aea43ff 6355#: builtin/index-pack.c:1194
8ada9598 6356msgid "Resolving deltas"
81809b99 6357msgstr "处理 delta 中"
8ada9598 6358
7aea43ff 6359#: builtin/index-pack.c:1205
07432cef 6360#, c-format
ef317cd5 6361msgid "unable to create thread: %s"
07432cef 6362msgstr "不能创建线程:%s"
ef317cd5 6363
7aea43ff 6364#: builtin/index-pack.c:1247
8ada9598 6365msgid "confusion beyond insanity"
81809b99 6366msgstr "不可理喻"
8ada9598 6367
7aea43ff 6368#: builtin/index-pack.c:1253
ef317cd5
JX
6369#, c-format
6370msgid "completed with %d local objects"
07432cef 6371msgstr "完成 %d 个本地对象"
ef317cd5 6372
7aea43ff 6373#: builtin/index-pack.c:1263
ef317cd5
JX
6374#, c-format
6375msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 6376msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 6377
7aea43ff 6378#: builtin/index-pack.c:1267
8ada9598
JX
6379#, c-format
6380msgid "pack has %d unresolved delta"
6381msgid_plural "pack has %d unresolved deltas"
81809b99 6382msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 6383msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 6384
7aea43ff 6385#: builtin/index-pack.c:1291
81809b99 6386#, c-format
8ada9598 6387msgid "unable to deflate appended object (%d)"
07432cef 6388msgstr "不能压缩附加对象(%d)"
8ada9598 6389
7aea43ff 6390#: builtin/index-pack.c:1367
8ada9598
JX
6391#, c-format
6392msgid "local object %s is corrupt"
81809b99 6393msgstr "本地对象 %s 已损坏"
8ada9598 6394
7aea43ff 6395#: builtin/index-pack.c:1391
8ada9598 6396msgid "error while closing pack file"
81809b99 6397msgstr "关闭包文件时出错"
8ada9598 6398
7aea43ff 6399#: builtin/index-pack.c:1404
81809b99 6400#, c-format
8ada9598 6401msgid "cannot write keep file '%s'"
81809b99 6402msgstr "无法写保留文件 '%s'"
8ada9598 6403
7aea43ff 6404#: builtin/index-pack.c:1412
81809b99 6405#, c-format
8ada9598 6406msgid "cannot close written keep file '%s'"
81809b99 6407msgstr "无法关闭保留文件 '%s'"
8ada9598 6408
7aea43ff 6409#: builtin/index-pack.c:1425
8ada9598 6410msgid "cannot store pack file"
81809b99 6411msgstr "无法存储包文件"
8ada9598 6412
7aea43ff 6413#: builtin/index-pack.c:1436
8ada9598 6414msgid "cannot store index file"
81809b99 6415msgstr "无法存储索引文件"
8ada9598 6416
7aea43ff 6417#: builtin/index-pack.c:1469
07432cef 6418#, c-format
ef317cd5 6419msgid "bad pack.indexversion=%<PRIu32>"
07432cef 6420msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 6421
7aea43ff 6422#: builtin/index-pack.c:1475
ef317cd5
JX
6423#, c-format
6424msgid "invalid number of threads specified (%d)"
07432cef 6425msgstr "指定的线程数无效(%d)"
ef317cd5 6426
7aea43ff 6427#: builtin/index-pack.c:1479 builtin/index-pack.c:1658
ef317cd5
JX
6428#, c-format
6429msgid "no threads support, ignoring %s"
07432cef 6430msgstr "没有线程支持,忽略 %s"
ef317cd5 6431
7aea43ff 6432#: builtin/index-pack.c:1537
81809b99 6433#, c-format
8ada9598 6434msgid "Cannot open existing pack file '%s'"
81809b99 6435msgstr "无法打开现存包文件 '%s'"
8ada9598 6436
7aea43ff 6437#: builtin/index-pack.c:1539
81809b99 6438#, c-format
8ada9598 6439msgid "Cannot open existing pack idx file for '%s'"
81809b99 6440msgstr "无法为 %s 打开包索引文件"
8ada9598 6441
7aea43ff 6442#: builtin/index-pack.c:1586
81809b99 6443#, c-format
8ada9598
JX
6444msgid "non delta: %d object"
6445msgid_plural "non delta: %d objects"
81809b99 6446msgstr[0] "非 delta:%d 个对象"
5ae481e0 6447msgstr[1] "非 delta:%d 个对象"
8ada9598 6448
7aea43ff 6449#: builtin/index-pack.c:1593
8ada9598
JX
6450#, c-format
6451msgid "chain length = %d: %lu object"
6452msgid_plural "chain length = %d: %lu objects"
81809b99 6453msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 6454msgstr[1] "链长 = %d: %lu 对象"
8ada9598 6455
7aea43ff 6456#: builtin/index-pack.c:1622
8ada9598 6457msgid "Cannot come back to cwd"
81809b99 6458msgstr "无法返回当前工作目录"
8ada9598 6459
7aea43ff
JX
6460#: builtin/index-pack.c:1670 builtin/index-pack.c:1673
6461#: builtin/index-pack.c:1685 builtin/index-pack.c:1689
81809b99 6462#, c-format
8ada9598 6463msgid "bad %s"
81809b99 6464msgstr "错误选项 %s"
8ada9598 6465
7aea43ff 6466#: builtin/index-pack.c:1703
8ada9598 6467msgid "--fix-thin cannot be used without --stdin"
649900bc 6468msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 6469
7aea43ff 6470#: builtin/index-pack.c:1707 builtin/index-pack.c:1716
8ada9598
JX
6471#, c-format
6472msgid "packfile name '%s' does not end with '.pack'"
dbd6cced 6473msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
8ada9598 6474
7aea43ff 6475#: builtin/index-pack.c:1724
8ada9598 6476msgid "--verify with no packfile name given"
dbd6cced 6477msgstr "--verify 没有提供包文件名参数"
8ada9598 6478
c04f5ac3
JX
6479#: builtin/init-db.c:35
6480#, c-format
6481msgid "Could not make %s writable by group"
6482msgstr "不能设置 %s 为组可写"
6483
6484#: builtin/init-db.c:62
6485#, c-format
6486msgid "insanely long template name %s"
6487msgstr "太长的模版名 %s"
6488
6489#: builtin/init-db.c:67
6490#, c-format
6491msgid "cannot stat '%s'"
6492msgstr "不能枚举 '%s' 状态"
6493
6494#: builtin/init-db.c:73
6495#, c-format
6496msgid "cannot stat template '%s'"
6497msgstr "不能枚举模版 '%s' 状态"
6498
6499#: builtin/init-db.c:80
6500#, c-format
6501msgid "cannot opendir '%s'"
6502msgstr "不能打开目录 '%s'"
6503
6504#: builtin/init-db.c:97
6505#, c-format
6506msgid "cannot readlink '%s'"
6507msgstr "不能读取链接 '%s'"
6508
6509#: builtin/init-db.c:99
6510#, c-format
6511msgid "insanely long symlink %s"
6512msgstr "太长的符号链接 %s"
6513
6514#: builtin/init-db.c:102
6515#, c-format
6516msgid "cannot symlink '%s' '%s'"
90e6ef53 6517msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3
JX
6518
6519#: builtin/init-db.c:106
6520#, c-format
6521msgid "cannot copy '%s' to '%s'"
6522msgstr "不能拷贝 '%s' 至 '%s'"
6523
6524#: builtin/init-db.c:110
6525#, c-format
6526msgid "ignoring template %s"
6527msgstr "忽略模版 %s"
6528
04cb2f28 6529#: builtin/init-db.c:136
c04f5ac3
JX
6530#, c-format
6531msgid "insanely long template path %s"
6532msgstr "太长的模版路径 %s"
6533
04cb2f28 6534#: builtin/init-db.c:144
c04f5ac3
JX
6535#, c-format
6536msgid "templates not found %s"
6537msgstr "模版未找到 %s"
6538
04cb2f28 6539#: builtin/init-db.c:157
c04f5ac3
JX
6540#, c-format
6541msgid "not copying templates of a wrong format version %d from '%s'"
81809b99 6542msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
c04f5ac3 6543
7aea43ff 6544#: builtin/init-db.c:211
c04f5ac3
JX
6545#, c-format
6546msgid "insane git directory %s"
6547msgstr "不正常的 git 目录 %s"
6548
7aea43ff 6549#: builtin/init-db.c:343 builtin/init-db.c:346
c04f5ac3
JX
6550#, c-format
6551msgid "%s already exists"
6552msgstr "%s 已经存在"
6553
7aea43ff 6554#: builtin/init-db.c:374
c04f5ac3
JX
6555#, c-format
6556msgid "unable to handle file type %d"
6557msgstr "不能处理 %d 类型的文件"
6558
7aea43ff 6559#: builtin/init-db.c:377
c04f5ac3
JX
6560#, c-format
6561msgid "unable to move %s to %s"
6562msgstr "不能移动 %s 至 %s"
6563
6c94aba5
JX
6564#. TRANSLATORS: The first '%s' is either "Reinitialized
6565#. existing" or "Initialized empty", the second " shared" or
6566#. "", and the last '%s%s' is the verbatim directory name.
7aea43ff 6567#: builtin/init-db.c:433
c04f5ac3
JX
6568#, c-format
6569msgid "%s%s Git repository in %s%s\n"
160fb2b2 6570msgstr "%s%s Git 仓库于 %s%s\n"
c04f5ac3 6571
7aea43ff 6572#: builtin/init-db.c:434
c04f5ac3
JX
6573msgid "Reinitialized existing"
6574msgstr "重新初始化现存的"
6575
7aea43ff 6576#: builtin/init-db.c:434
c04f5ac3
JX
6577msgid "Initialized empty"
6578msgstr "初始化空的"
6579
7e238ab7 6580# 译者:中文字符串拼接,可删除前导空格
7aea43ff 6581#: builtin/init-db.c:435
c04f5ac3 6582msgid " shared"
90e6ef53 6583msgstr "共享"
c04f5ac3 6584
7aea43ff 6585#: builtin/init-db.c:482
ef317cd5 6586msgid ""
a77c07d9 6587"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 6588"shared[=<permissions>]] [<directory>]"
ef317cd5 6589msgstr ""
07432cef 6590"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 6591"[<目录>]"
ef317cd5 6592
7aea43ff 6593#: builtin/init-db.c:505
ef317cd5 6594msgid "permissions"
07432cef 6595msgstr "权限"
ef317cd5 6596
7aea43ff 6597#: builtin/init-db.c:506
ef317cd5 6598msgid "specify that the git repository is to be shared amongst several users"
160fb2b2 6599msgstr "指定 git 仓库是多个用户之间共享的"
ef317cd5 6600
7aea43ff 6601#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171
ef317cd5 6602msgid "be quiet"
07432cef 6603msgstr "保持安静"
ef317cd5 6604
7aea43ff 6605#: builtin/init-db.c:540 builtin/init-db.c:545
c04f5ac3
JX
6606#, c-format
6607msgid "cannot mkdir %s"
6608msgstr "不能创建目录 %s"
6609
7aea43ff 6610#: builtin/init-db.c:549
c04f5ac3
JX
6611#, c-format
6612msgid "cannot chdir to %s"
6613msgstr "不能切换目录到 %s"
6614
7aea43ff 6615#: builtin/init-db.c:570
c04f5ac3
JX
6616#, c-format
6617msgid ""
6618"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6619"dir=<directory>)"
1e607449 6620msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 6621
7aea43ff 6622#: builtin/init-db.c:598
c04f5ac3
JX
6623#, c-format
6624msgid "Cannot access work tree '%s'"
6625msgstr "不能访问工作区 '%s'"
6626
220c313c
JX
6627#: builtin/interpret-trailers.c:15
6628msgid ""
6629"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6630"[<file>...]"
6631msgstr ""
6632"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
6633">...]"
6634
6635#: builtin/interpret-trailers.c:25
6636msgid "trim empty trailers"
6637msgstr "删除空签名"
6638
6639#: builtin/interpret-trailers.c:26
6640msgid "trailer"
6641msgstr "签名"
6642
6643#: builtin/interpret-trailers.c:27
6644msgid "trailer(s) to add"
6645msgstr "要添加的签名"
6646
2e8451e8 6647#: builtin/log.c:41
7aea43ff 6648msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 6649msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 6650
2e8451e8 6651#: builtin/log.c:42
814ff314
JX
6652msgid "git show [<options>] <object>..."
6653msgstr "git show [<选项>] <对象>..."
ef317cd5 6654
220c313c
JX
6655#: builtin/log.c:81
6656#, c-format
6657msgid "invalid --decorate option: %s"
6658msgstr "无效的 --decorate 选项:%s"
6659
6acbf033 6660#: builtin/log.c:127
ef317cd5 6661msgid "suppress diff output"
07432cef 6662msgstr "不显示差异输出"
ef317cd5 6663
6acbf033 6664#: builtin/log.c:128
ef317cd5 6665msgid "show source"
07432cef 6666msgstr "显示源"
ef317cd5 6667
6acbf033 6668#: builtin/log.c:129
07432cef
WS
6669msgid "Use mail map file"
6670msgstr "使用邮件映射文件"
6671
6acbf033 6672#: builtin/log.c:130
ef317cd5 6673msgid "decorate options"
07432cef 6674msgstr "修饰选项"
ef317cd5 6675
220c313c
JX
6676#: builtin/log.c:133
6677msgid "Process line range n,m in file, counting from 1"
6678msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
6679
6acbf033 6680#: builtin/log.c:229
c04f5ac3
JX
6681#, c-format
6682msgid "Final output: %d %s\n"
6683msgstr "最终输出:%d %s\n"
6684
220c313c
JX
6685#: builtin/log.c:458
6686#, c-format
6687msgid "git show %s: bad file"
6688msgstr "git show %s: 损坏的文件"
6689
6690#: builtin/log.c:472 builtin/log.c:564
c04f5ac3
JX
6691#, c-format
6692msgid "Could not read object %s"
90e6ef53 6693msgstr "不能读取对象 %s"
c04f5ac3 6694
220c313c 6695#: builtin/log.c:588
c04f5ac3
JX
6696#, c-format
6697msgid "Unknown type: %d"
6698msgstr "未知类型:%d"
6699
220c313c 6700#: builtin/log.c:689
c04f5ac3
JX
6701msgid "format.headers without value"
6702msgstr "format.headers 没有值"
6703
220c313c 6704#: builtin/log.c:773
c04f5ac3
JX
6705msgid "name of output directory is too long"
6706msgstr "输出目录名太长"
6707
220c313c 6708#: builtin/log.c:789
c04f5ac3
JX
6709#, c-format
6710msgid "Cannot open patch file %s"
6711msgstr "无法打开补丁文件 %s"
6712
220c313c 6713#: builtin/log.c:803
c04f5ac3
JX
6714msgid "Need exactly one range."
6715msgstr "只需要一个范围。"
6716
7aea43ff 6717#: builtin/log.c:813
c04f5ac3
JX
6718msgid "Not a range."
6719msgstr "不是一个范围。"
6720
220c313c 6721#: builtin/log.c:919
c04f5ac3
JX
6722msgid "Cover letter needs email format"
6723msgstr "信封需要邮件地址格式"
6724
220c313c 6725#: builtin/log.c:998
c04f5ac3
JX
6726#, c-format
6727msgid "insane in-reply-to: %s"
6728msgstr "不正常的 in-reply-to:%s"
6729
220c313c 6730#: builtin/log.c:1026
814ff314
JX
6731msgid "git format-patch [<options>] [<since> | <revision-range>]"
6732msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 6733
220c313c 6734#: builtin/log.c:1071
c04f5ac3
JX
6735msgid "Two output directories?"
6736msgstr "两个输出目录?"
6737
220c313c 6738#: builtin/log.c:1186
ef317cd5 6739msgid "use [PATCH n/m] even with a single patch"
07432cef 6740msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 6741
220c313c 6742#: builtin/log.c:1189
ef317cd5 6743msgid "use [PATCH] even with multiple patches"
07432cef 6744msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 6745
220c313c 6746#: builtin/log.c:1193
ef317cd5 6747msgid "print patches to standard out"
07432cef 6748msgstr "打印补丁到标准输出"
c04f5ac3 6749
220c313c 6750#: builtin/log.c:1195
ef317cd5 6751msgid "generate a cover letter"
07432cef 6752msgstr "生成一封附信"
c04f5ac3 6753
220c313c 6754#: builtin/log.c:1197
ef317cd5 6755msgid "use simple number sequence for output file names"
07432cef 6756msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 6757
220c313c 6758#: builtin/log.c:1198
ef317cd5 6759msgid "sfx"
07432cef 6760msgstr "后缀"
ef317cd5 6761
220c313c 6762#: builtin/log.c:1199
ef317cd5 6763msgid "use <sfx> instead of '.patch'"
07432cef 6764msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 6765
220c313c 6766#: builtin/log.c:1201
ef317cd5 6767msgid "start numbering patches at <n> instead of 1"
07432cef
WS
6768msgstr "补丁以 <n> 开始编号,而不是1"
6769
220c313c 6770#: builtin/log.c:1203
07432cef
WS
6771msgid "mark the series as Nth re-roll"
6772msgstr "标记补丁系列是第几次重制"
ef317cd5 6773
220c313c 6774#: builtin/log.c:1205
ef317cd5 6775msgid "Use [<prefix>] instead of [PATCH]"
07432cef 6776msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 6777
220c313c 6778#: builtin/log.c:1208
ef317cd5 6779msgid "store resulting files in <dir>"
d9d56b23 6780msgstr "把结果文件存储在 <目录>"
ef317cd5 6781
220c313c 6782#: builtin/log.c:1211
ef317cd5 6783msgid "don't strip/add [PATCH]"
07432cef 6784msgstr "不删除/添加 [PATCH]"
ef317cd5 6785
220c313c 6786#: builtin/log.c:1214
ef317cd5 6787msgid "don't output binary diffs"
07432cef 6788msgstr "不输出二进制差异"
ef317cd5 6789
220c313c 6790#: builtin/log.c:1216
ef317cd5 6791msgid "don't include a patch matching a commit upstream"
07432cef 6792msgstr "不包含已在上游提交中的补丁"
ef317cd5 6793
220c313c 6794#: builtin/log.c:1218
ef317cd5 6795msgid "show patch format instead of default (patch + stat)"
07432cef 6796msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 6797
220c313c 6798#: builtin/log.c:1220
ef317cd5 6799msgid "Messaging"
07432cef 6800msgstr "邮件发送"
ef317cd5 6801
220c313c 6802#: builtin/log.c:1221
ef317cd5 6803msgid "header"
07432cef 6804msgstr "header"
ef317cd5 6805
220c313c 6806#: builtin/log.c:1222
ef317cd5 6807msgid "add email header"
07432cef 6808msgstr "添加邮件头"
ef317cd5 6809
220c313c 6810#: builtin/log.c:1223 builtin/log.c:1225
ef317cd5 6811msgid "email"
07432cef 6812msgstr "邮件地址"
ef317cd5 6813
220c313c 6814#: builtin/log.c:1223
ef317cd5 6815msgid "add To: header"
07432cef 6816msgstr "添加收件人"
ef317cd5 6817
220c313c 6818#: builtin/log.c:1225
ef317cd5 6819msgid "add Cc: header"
07432cef 6820msgstr "添加抄送"
ef317cd5 6821
220c313c 6822#: builtin/log.c:1227
2e8451e8 6823msgid "ident"
d9d56b23 6824msgstr "标识"
2e8451e8 6825
220c313c 6826#: builtin/log.c:1228
2e8451e8 6827msgid "set From address to <ident> (or committer ident if absent)"
4375c10e 6828msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
2e8451e8 6829
220c313c 6830#: builtin/log.c:1230
ef317cd5 6831msgid "message-id"
d9d56b23 6832msgstr "邮件标识"
ef317cd5 6833
220c313c 6834#: builtin/log.c:1231
ef317cd5 6835msgid "make first mail a reply to <message-id>"
d9d56b23 6836msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 6837
220c313c 6838#: builtin/log.c:1232 builtin/log.c:1235
ef317cd5 6839msgid "boundary"
07432cef 6840msgstr "边界"
ef317cd5 6841
220c313c 6842#: builtin/log.c:1233
ef317cd5 6843msgid "attach the patch"
07432cef 6844msgstr "附件方式添加补丁"
ef317cd5 6845
220c313c 6846#: builtin/log.c:1236
ef317cd5 6847msgid "inline the patch"
07432cef 6848msgstr "内联显示补丁"
ef317cd5 6849
220c313c 6850#: builtin/log.c:1240
ef317cd5 6851msgid "enable message threading, styles: shallow, deep"
07432cef 6852msgstr "启用邮件线索,风格:浅,深"
ef317cd5 6853
220c313c 6854#: builtin/log.c:1242
ef317cd5 6855msgid "signature"
07432cef 6856msgstr "签名"
ef317cd5 6857
220c313c 6858#: builtin/log.c:1243
ef317cd5 6859msgid "add a signature"
07432cef 6860msgstr "添加一个签名"
ef317cd5 6861
220c313c 6862#: builtin/log.c:1245
6acbf033
JX
6863msgid "add a signature from a file"
6864msgstr "从文件添加一个签名"
6865
220c313c 6866#: builtin/log.c:1246
ef317cd5 6867msgid "don't print the patch filenames"
07432cef 6868msgstr "不要打印补丁文件名"
ef317cd5 6869
220c313c 6870#: builtin/log.c:1320
2e8451e8
JX
6871#, c-format
6872msgid "invalid ident line: %s"
6873msgstr "包含无效的身份标识:%s"
6874
220c313c 6875#: builtin/log.c:1335
c04f5ac3
JX
6876msgid "-n and -k are mutually exclusive."
6877msgstr "-n 和 -k 互斥。"
6878
220c313c 6879#: builtin/log.c:1337
c04f5ac3
JX
6880msgid "--subject-prefix and -k are mutually exclusive."
6881msgstr "--subject-prefix 和 -k 互斥。"
6882
220c313c 6883#: builtin/log.c:1345
c04f5ac3
JX
6884msgid "--name-only does not make sense"
6885msgstr "--name-only 无意义"
6886
220c313c 6887#: builtin/log.c:1347
c04f5ac3
JX
6888msgid "--name-status does not make sense"
6889msgstr "--name-status 无意义"
6890
220c313c 6891#: builtin/log.c:1349
c04f5ac3
JX
6892msgid "--check does not make sense"
6893msgstr "--check 无意义"
6894
220c313c 6895#: builtin/log.c:1372
c04f5ac3
JX
6896msgid "standard output, or directory, which one?"
6897msgstr "标准输出或目录,哪一个?"
6898
220c313c 6899#: builtin/log.c:1374
c04f5ac3
JX
6900#, c-format
6901msgid "Could not create directory '%s'"
90e6ef53 6902msgstr "不能创建目录 '%s'"
c04f5ac3 6903
220c313c 6904#: builtin/log.c:1472
6acbf033
JX
6905#, c-format
6906msgid "unable to read signature file '%s'"
6907msgstr "无法读取签名文件 '%s'"
6908
220c313c 6909#: builtin/log.c:1535
c04f5ac3
JX
6910msgid "Failed to create output files"
6911msgstr "无法创建输出文件"
6912
220c313c 6913#: builtin/log.c:1583
ef317cd5 6914msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 6915msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 6916
7aea43ff 6917#: builtin/log.c:1637
c04f5ac3
JX
6918#, c-format
6919msgid ""
6920"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 6921msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 6922
7aea43ff 6923#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662
c04f5ac3
JX
6924#, c-format
6925msgid "Unknown commit %s"
6926msgstr "未知提交 %s"
6927
814ff314
JX
6928#: builtin/ls-files.c:358
6929msgid "git ls-files [<options>] [<file>...]"
6930msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 6931
814ff314 6932#: builtin/ls-files.c:415
ef317cd5 6933msgid "identify the file status with tags"
07432cef 6934msgstr "用标签标识文件的状态"
ef317cd5 6935
814ff314 6936#: builtin/ls-files.c:417
ef317cd5 6937msgid "use lowercase letters for 'assume unchanged' files"
07432cef 6938msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 6939
814ff314 6940#: builtin/ls-files.c:419
ef317cd5 6941msgid "show cached files in the output (default)"
07432cef 6942msgstr "显示缓存的文件(默认)"
ef317cd5 6943
814ff314 6944#: builtin/ls-files.c:421
ef317cd5 6945msgid "show deleted files in the output"
07432cef 6946msgstr "显示已删除的文件"
ef317cd5 6947
814ff314 6948#: builtin/ls-files.c:423
ef317cd5 6949msgid "show modified files in the output"
07432cef 6950msgstr "显示已修改的文件"
ef317cd5 6951
814ff314 6952#: builtin/ls-files.c:425
ef317cd5 6953msgid "show other files in the output"
07432cef 6954msgstr "显示其它文件"
ef317cd5 6955
814ff314 6956#: builtin/ls-files.c:427
ef317cd5 6957msgid "show ignored files in the output"
07432cef 6958msgstr "显示忽略的文件"
ef317cd5 6959
814ff314 6960#: builtin/ls-files.c:430
ef317cd5 6961msgid "show staged contents' object name in the output"
07432cef 6962msgstr "显示暂存区内容的对象名称"
ef317cd5 6963
814ff314 6964#: builtin/ls-files.c:432
ef317cd5 6965msgid "show files on the filesystem that need to be removed"
07432cef 6966msgstr "显示文件系统需要删除的文件"
ef317cd5 6967
814ff314 6968#: builtin/ls-files.c:434
220c313c 6969msgid "show 'other' directories' names only"
07432cef 6970msgstr "只显示“其他”目录的名称"
ef317cd5 6971
814ff314 6972#: builtin/ls-files.c:437
ef317cd5 6973msgid "don't show empty directories"
07432cef 6974msgstr "不显示空目录"
ef317cd5 6975
814ff314 6976#: builtin/ls-files.c:440
ef317cd5 6977msgid "show unmerged files in the output"
07432cef 6978msgstr "显示未合并的文件"
ef317cd5 6979
814ff314 6980#: builtin/ls-files.c:442
ef317cd5 6981msgid "show resolve-undo information"
07432cef 6982msgstr "显示 resolve-undo 信息"
ef317cd5 6983
814ff314 6984#: builtin/ls-files.c:444
ef317cd5 6985msgid "skip files matching pattern"
07432cef 6986msgstr "匹配排除文件的模式"
ef317cd5 6987
814ff314 6988#: builtin/ls-files.c:447
ef317cd5 6989msgid "exclude patterns are read from <file>"
07432cef 6990msgstr "从 <文件> 中读取排除模式"
ef317cd5 6991
814ff314 6992#: builtin/ls-files.c:450
ef317cd5 6993msgid "read additional per-directory exclude patterns in <file>"
07432cef 6994msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 6995
814ff314 6996#: builtin/ls-files.c:452
ef317cd5 6997msgid "add the standard git exclusions"
07432cef 6998msgstr "添加标准的 git 排除"
ef317cd5 6999
814ff314 7000#: builtin/ls-files.c:455
ef317cd5 7001msgid "make the output relative to the project top directory"
07432cef 7002msgstr "显示相对于顶级目录的文件名"
ef317cd5 7003
814ff314 7004#: builtin/ls-files.c:458
ef317cd5 7005msgid "if any <file> is not in the index, treat this as an error"
07432cef 7006msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 7007
814ff314 7008#: builtin/ls-files.c:459
ef317cd5 7009msgid "tree-ish"
07432cef 7010msgstr "树或提交"
ef317cd5 7011
814ff314 7012#: builtin/ls-files.c:460
ef317cd5 7013msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 7014msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 7015
814ff314 7016#: builtin/ls-files.c:462
ef317cd5 7017msgid "show debugging data"
07432cef 7018msgstr "显示调试数据"
ef317cd5 7019
90314792 7020#: builtin/ls-tree.c:28
ef317cd5 7021msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 7022msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5 7023
04cb2f28 7024#: builtin/ls-tree.c:127
ef317cd5 7025msgid "only show trees"
07432cef 7026msgstr "只显示树"
ef317cd5 7027
04cb2f28 7028#: builtin/ls-tree.c:129
ef317cd5 7029msgid "recurse into subtrees"
07432cef 7030msgstr "递归到子树"
ef317cd5 7031
04cb2f28 7032#: builtin/ls-tree.c:131
ef317cd5 7033msgid "show trees when recursing"
07432cef 7034msgstr "当递归时显示树"
ef317cd5 7035
04cb2f28 7036#: builtin/ls-tree.c:134
ef317cd5 7037msgid "terminate entries with NUL byte"
4375c10e 7038msgstr "条目以 NUL 字符终止"
ef317cd5 7039
04cb2f28 7040#: builtin/ls-tree.c:135
ef317cd5 7041msgid "include object size"
07432cef 7042msgstr "包括对象大小"
ef317cd5 7043
04cb2f28 7044#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
ef317cd5 7045msgid "list only filenames"
07432cef 7046msgstr "只列出文件名"
ef317cd5 7047
04cb2f28 7048#: builtin/ls-tree.c:142
ef317cd5 7049msgid "use full path names"
07432cef 7050msgstr "使用文件的全路径"
ef317cd5 7051
04cb2f28 7052#: builtin/ls-tree.c:144
ef317cd5 7053msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 7054msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 7055
04cb2f28 7056#: builtin/merge.c:45
814ff314
JX
7057msgid "git merge [<options>] [<commit>...]"
7058msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 7059
04cb2f28 7060#: builtin/merge.c:46
814ff314
JX
7061msgid "git merge [<options>] <msg> HEAD <commit>"
7062msgstr "git merge [<选项>] <说明> HEAD <提交>"
ef317cd5 7063
04cb2f28 7064#: builtin/merge.c:47
ef317cd5 7065msgid "git merge --abort"
07432cef 7066msgstr "git merge --abort"
ef317cd5 7067
04cb2f28 7068#: builtin/merge.c:100
c04f5ac3
JX
7069msgid "switch `m' requires a value"
7070msgstr "开关 `m' 需要一个值"
7071
04cb2f28 7072#: builtin/merge.c:137
c04f5ac3
JX
7073#, c-format
7074msgid "Could not find merge strategy '%s'.\n"
90e6ef53 7075msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 7076
04cb2f28 7077#: builtin/merge.c:138
c04f5ac3
JX
7078#, c-format
7079msgid "Available strategies are:"
7080msgstr "可用的策略有:"
7081
04cb2f28 7082#: builtin/merge.c:143
c04f5ac3
JX
7083#, c-format
7084msgid "Available custom strategies are:"
7085msgstr "可用的自定义策略有:"
7086
04cb2f28 7087#: builtin/merge.c:193
ef317cd5 7088msgid "do not show a diffstat at the end of the merge"
07432cef 7089msgstr "在合并的最后不显示差异统计"
ef317cd5 7090
04cb2f28 7091#: builtin/merge.c:196
ef317cd5 7092msgid "show a diffstat at the end of the merge"
07432cef 7093msgstr "在合并的最后显示差异统计"
ef317cd5 7094
04cb2f28 7095#: builtin/merge.c:197
ef317cd5 7096msgid "(synonym to --stat)"
07432cef 7097msgstr "(和 --stat 同义)"
ef317cd5 7098
04cb2f28 7099#: builtin/merge.c:199
ef317cd5 7100msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 7101msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 7102
04cb2f28 7103#: builtin/merge.c:202
ef317cd5 7104msgid "create a single commit instead of doing a merge"
07432cef 7105msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 7106
04cb2f28 7107#: builtin/merge.c:204
ef317cd5 7108msgid "perform a commit if the merge succeeds (default)"
07432cef 7109msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 7110
04cb2f28 7111#: builtin/merge.c:206
ef317cd5 7112msgid "edit message before committing"
07432cef 7113msgstr "在提交前编辑提交说明"
ef317cd5 7114
04cb2f28 7115#: builtin/merge.c:207
ef317cd5 7116msgid "allow fast-forward (default)"
07432cef 7117msgstr "允许快进(默认)"
ef317cd5 7118
04cb2f28 7119#: builtin/merge.c:209
ef317cd5 7120msgid "abort if fast-forward is not possible"
07432cef 7121msgstr "如果不能快进就放弃合并"
ef317cd5 7122
04cb2f28 7123#: builtin/merge.c:213
1003b3a5
JX
7124msgid "Verify that the named commit has a valid GPG signature"
7125msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7126
04cb2f28 7127#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
ef317cd5 7128msgid "strategy"
07432cef 7129msgstr "策略"
ef317cd5 7130
04cb2f28 7131#: builtin/merge.c:215
ef317cd5 7132msgid "merge strategy to use"
07432cef 7133msgstr "要使用的合并策略"
ef317cd5 7134
04cb2f28 7135#: builtin/merge.c:216
ef317cd5 7136msgid "option=value"
07432cef 7137msgstr "option=value"
ef317cd5 7138
04cb2f28 7139#: builtin/merge.c:217
ef317cd5 7140msgid "option for selected merge strategy"
07432cef 7141msgstr "所选的合并策略的选项"
ef317cd5 7142
04cb2f28 7143#: builtin/merge.c:219
ef317cd5 7144msgid "merge commit message (for a non-fast-forward merge)"
07432cef 7145msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 7146
04cb2f28 7147#: builtin/merge.c:223
ef317cd5 7148msgid "abort the current in-progress merge"
07432cef 7149msgstr "放弃当前正在进行的合并"
ef317cd5 7150
04cb2f28 7151#: builtin/merge.c:251
c04f5ac3
JX
7152msgid "could not run stash."
7153msgstr "不能进行进度保存。"
7154
04cb2f28 7155#: builtin/merge.c:256
c04f5ac3
JX
7156msgid "stash failed"
7157msgstr "进度保存失败"
7158
04cb2f28 7159#: builtin/merge.c:261
c04f5ac3
JX
7160#, c-format
7161msgid "not a valid object: %s"
7162msgstr "不是一个有效对象:%s"
7163
04cb2f28 7164#: builtin/merge.c:280 builtin/merge.c:297
c04f5ac3
JX
7165msgid "read-tree failed"
7166msgstr "读取树失败"
7167
90e6ef53 7168# 译者:注意保持前导空格
04cb2f28 7169#: builtin/merge.c:327
c04f5ac3
JX
7170msgid " (nothing to squash)"
7171msgstr " (无可压缩)"
7172
04cb2f28 7173#: builtin/merge.c:340
c04f5ac3
JX
7174#, c-format
7175msgid "Squash commit -- not updating HEAD\n"
7176msgstr "压缩提交 -- 未更新 HEAD\n"
7177
04cb2f28 7178#: builtin/merge.c:372
c04f5ac3
JX
7179msgid "Writing SQUASH_MSG"
7180msgstr "写入 SQUASH_MSG"
7181
04cb2f28 7182#: builtin/merge.c:374
c04f5ac3
JX
7183msgid "Finishing SQUASH_MSG"
7184msgstr "完成 SQUASH_MSG"
7185
04cb2f28 7186#: builtin/merge.c:397
c04f5ac3
JX
7187#, c-format
7188msgid "No merge message -- not updating HEAD\n"
7189msgstr "无合并信息 -- 未更新 HEAD\n"
7190
04cb2f28 7191#: builtin/merge.c:447
c04f5ac3
JX
7192#, c-format
7193msgid "'%s' does not point to a commit"
7194msgstr "'%s' 没有指向一个提交"
7195
7aea43ff 7196#: builtin/merge.c:537
c04f5ac3
JX
7197#, c-format
7198msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 7199msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 7200
7aea43ff 7201#: builtin/merge.c:632
c04f5ac3
JX
7202msgid "git write-tree failed to write a tree"
7203msgstr "git write-tree 无法写入一树对象"
7204
7aea43ff 7205#: builtin/merge.c:656
c04f5ac3
JX
7206msgid "Not handling anything other than two heads merge."
7207msgstr "不能处理两个头合并之外的任何操作。"
7208
7aea43ff 7209#: builtin/merge.c:670
c04f5ac3
JX
7210#, c-format
7211msgid "Unknown option for merge-recursive: -X%s"
7212msgstr "merge-recursive 的未知选项:-X%s"
7213
7aea43ff 7214#: builtin/merge.c:683
c04f5ac3
JX
7215#, c-format
7216msgid "unable to write %s"
7217msgstr "不能写 %s"
7218
7aea43ff 7219#: builtin/merge.c:772
c04f5ac3
JX
7220#, c-format
7221msgid "Could not read from '%s'"
7222msgstr "不能从 '%s' 读取"
7223
7aea43ff 7224#: builtin/merge.c:781
c04f5ac3
JX
7225#, c-format
7226msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7227msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7228
7aea43ff 7229#: builtin/merge.c:787
a77c07d9 7230#, c-format
c04f5ac3
JX
7231msgid ""
7232"Please enter a commit message to explain why this merge is necessary,\n"
7233"especially if it merges an updated upstream into a topic branch.\n"
7234"\n"
a77c07d9 7235"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
7236"the commit.\n"
7237msgstr ""
7238"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
7239"合并到主题分支。\n"
7240"\n"
a77c07d9 7241"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 7242
7aea43ff 7243#: builtin/merge.c:811
c04f5ac3
JX
7244msgid "Empty commit message."
7245msgstr "空提交信息。"
7246
7aea43ff 7247#: builtin/merge.c:823
c04f5ac3
JX
7248#, c-format
7249msgid "Wonderful.\n"
7250msgstr "太棒了。\n"
7251
7aea43ff 7252#: builtin/merge.c:878
c04f5ac3
JX
7253#, c-format
7254msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7255msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7256
7aea43ff 7257#: builtin/merge.c:894
c04f5ac3
JX
7258#, c-format
7259msgid "'%s' is not a commit"
7260msgstr "'%s' 不是一个提交"
7261
7aea43ff 7262#: builtin/merge.c:935
c04f5ac3 7263msgid "No current branch."
90e6ef53 7264msgstr "没有当前分支。"
c04f5ac3 7265
7aea43ff 7266#: builtin/merge.c:937
c04f5ac3 7267msgid "No remote for the current branch."
160fb2b2 7268msgstr "当前分支没有对应的远程仓库。"
c04f5ac3 7269
7aea43ff 7270#: builtin/merge.c:939
c04f5ac3 7271msgid "No default upstream defined for the current branch."
90e6ef53 7272msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 7273
7aea43ff 7274#: builtin/merge.c:944
170e9899 7275#, c-format
2e8451e8
JX
7276msgid "No remote-tracking branch for %s from %s"
7277msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 7278
7aea43ff
JX
7279#: builtin/merge.c:1081
7280#, c-format
7281msgid "could not close '%s'"
7282msgstr "不能关闭 '%s'"
7283
7284#: builtin/merge.c:1208
c04f5ac3 7285msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 7286msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 7287
7aea43ff 7288#: builtin/merge.c:1224
c04f5ac3
JX
7289msgid ""
7290"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 7291"Please, commit your changes before you merge."
c04f5ac3
JX
7292msgstr ""
7293"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 7294"请在合并前先提交您的修改。"
c04f5ac3 7295
7aea43ff 7296#: builtin/merge.c:1227 git-pull.sh:74
c04f5ac3
JX
7297msgid "You have not concluded your merge (MERGE_HEAD exists)."
7298msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
7299
7aea43ff 7300#: builtin/merge.c:1231
c04f5ac3
JX
7301msgid ""
7302"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 7303"Please, commit your changes before you merge."
c04f5ac3
JX
7304msgstr ""
7305"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 7306"请在合并前先提交您的修改。"
c04f5ac3 7307
7aea43ff 7308#: builtin/merge.c:1234
c04f5ac3
JX
7309msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7310msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7311
7aea43ff 7312#: builtin/merge.c:1243
c04f5ac3 7313msgid "You cannot combine --squash with --no-ff."
649900bc 7314msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 7315
7aea43ff 7316#: builtin/merge.c:1251
c04f5ac3 7317msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 7318msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 7319
7aea43ff 7320#: builtin/merge.c:1268
c04f5ac3
JX
7321msgid "Squash commit into empty head not supported yet"
7322msgstr "尚不支持到空分支的压缩提交"
7323
7aea43ff 7324#: builtin/merge.c:1270
c04f5ac3
JX
7325msgid "Non-fast-forward commit does not make sense into an empty head"
7326msgstr "到空分支的非快进式提交没有意义"
7327
7aea43ff 7328#: builtin/merge.c:1276
2e8451e8
JX
7329#, c-format
7330msgid "%s - not something we can merge"
7331msgstr "%s - 不能被合并"
7332
7aea43ff
JX
7333#: builtin/merge.c:1278
7334msgid "Can merge only exactly one commit into empty head"
7335msgstr "只能将一个提交合并到空分支上"
7336
7337#: builtin/merge.c:1333
1003b3a5
JX
7338#, c-format
7339msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7340msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7341
7aea43ff 7342#: builtin/merge.c:1336
1003b3a5
JX
7343#, c-format
7344msgid "Commit %s has a bad GPG signature allegedly by %s."
7345msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7346
7aea43ff 7347#: builtin/merge.c:1339
1003b3a5
JX
7348#, c-format
7349msgid "Commit %s does not have a GPG signature."
7350msgstr "提交 %s 没有一个 GPG 签名。"
7351
7aea43ff 7352#: builtin/merge.c:1342
1003b3a5
JX
7353#, c-format
7354msgid "Commit %s has a good GPG signature by %s\n"
7355msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7356
7aea43ff 7357#: builtin/merge.c:1423
c04f5ac3
JX
7358#, c-format
7359msgid "Updating %s..%s\n"
7360msgstr "更新 %s..%s\n"
7361
7aea43ff 7362#: builtin/merge.c:1462
c04f5ac3
JX
7363#, c-format
7364msgid "Trying really trivial in-index merge...\n"
90e6ef53 7365msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 7366
7aea43ff 7367#: builtin/merge.c:1469
c04f5ac3
JX
7368#, c-format
7369msgid "Nope.\n"
7370msgstr "无。\n"
7371
7aea43ff 7372#: builtin/merge.c:1501
c04f5ac3 7373msgid "Not possible to fast-forward, aborting."
1aabac65 7374msgstr "无法快进,终止。"
c04f5ac3 7375
7aea43ff 7376#: builtin/merge.c:1524 builtin/merge.c:1603
c04f5ac3
JX
7377#, c-format
7378msgid "Rewinding the tree to pristine...\n"
7379msgstr "将树回滚至原始状态...\n"
7380
7aea43ff 7381#: builtin/merge.c:1528
c04f5ac3
JX
7382#, c-format
7383msgid "Trying merge strategy %s...\n"
7384msgstr "尝试合并策略 %s...\n"
7385
7aea43ff 7386#: builtin/merge.c:1594
c04f5ac3
JX
7387#, c-format
7388msgid "No merge strategy handled the merge.\n"
7389msgstr "没有合并策略处理此合并。\n"
7390
7aea43ff 7391#: builtin/merge.c:1596
c04f5ac3
JX
7392#, c-format
7393msgid "Merge with strategy %s failed.\n"
7394msgstr "使用策略 %s 合并失败。\n"
7395
7aea43ff 7396#: builtin/merge.c:1605
c04f5ac3
JX
7397#, c-format
7398msgid "Using the %s to prepare resolving by hand.\n"
7399msgstr "使用 %s 以准备手工解决。\n"
7400
7aea43ff 7401#: builtin/merge.c:1617
c04f5ac3
JX
7402#, c-format
7403msgid "Automatic merge went well; stopped before committing as requested\n"
7404msgstr "自动合并进展顺利,按要求在提交前停止\n"
7405
cfff71a9 7406#: builtin/merge-base.c:29
814ff314
JX
7407msgid "git merge-base [-a | --all] <commit> <commit>..."
7408msgstr "git merge-base [-a | --all] <提交> <提交>..."
ef317cd5 7409
cfff71a9 7410#: builtin/merge-base.c:30
814ff314
JX
7411msgid "git merge-base [-a | --all] --octopus <commit>..."
7412msgstr "git merge-base [-a | --all] --octopus <提交>..."
ef317cd5 7413
cfff71a9 7414#: builtin/merge-base.c:31
ef317cd5 7415msgid "git merge-base --independent <commit>..."
07432cef 7416msgstr "git merge-base --independent <提交>..."
ef317cd5 7417
cfff71a9 7418#: builtin/merge-base.c:32
ef317cd5 7419msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 7420msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5 7421
cfff71a9
JX
7422#: builtin/merge-base.c:33
7423msgid "git merge-base --fork-point <ref> [<commit>]"
d9d56b23 7424msgstr "git merge-base --fork-point <引用> [<提交>]"
cfff71a9
JX
7425
7426#: builtin/merge-base.c:214
ef317cd5 7427msgid "output all common ancestors"
07432cef 7428msgstr "输出所有共同的祖先"
ef317cd5 7429
cfff71a9 7430#: builtin/merge-base.c:216
ef317cd5 7431msgid "find ancestors for a single n-way merge"
07432cef 7432msgstr "查找一个多路合并的祖先提交"
ef317cd5 7433
cfff71a9 7434#: builtin/merge-base.c:218
ef317cd5 7435msgid "list revs not reachable from others"
07432cef 7436msgstr "显示不能被其他访问到的版本"
ef317cd5 7437
cfff71a9 7438#: builtin/merge-base.c:220
ef317cd5 7439msgid "is the first one ancestor of the other?"
07432cef 7440msgstr "第一个是其他的祖先提交么?"
ef317cd5 7441
cfff71a9
JX
7442#: builtin/merge-base.c:222
7443msgid "find where <commit> forked from reflog of <ref>"
160fb2b2 7444msgstr "根据引用日志 <引用> 查找 <提交> 的派生处"
cfff71a9 7445
ef317cd5
JX
7446#: builtin/merge-file.c:8
7447msgid ""
814ff314
JX
7448"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7449"<orig-file> <file2>"
ef317cd5 7450msgstr ""
814ff314
JX
7451"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7452"件> <文件2>"
ef317cd5
JX
7453
7454#: builtin/merge-file.c:33
7455msgid "send results to standard output"
07432cef 7456msgstr "将结果发送到标准输出"
ef317cd5
JX
7457
7458#: builtin/merge-file.c:34
7459msgid "use a diff3 based merge"
07432cef 7460msgstr "使用基于 diff3 的合并"
ef317cd5
JX
7461
7462#: builtin/merge-file.c:35
7463msgid "for conflicts, use our version"
07432cef 7464msgstr "如果冲突,使用我们的版本"
ef317cd5
JX
7465
7466#: builtin/merge-file.c:37
7467msgid "for conflicts, use their version"
07432cef 7468msgstr "如果冲突,使用他们的版本"
ef317cd5
JX
7469
7470#: builtin/merge-file.c:39
7471msgid "for conflicts, use a union version"
07432cef 7472msgstr "如果冲突,使用联合版本"
ef317cd5
JX
7473
7474#: builtin/merge-file.c:42
7475msgid "for conflicts, use this marker size"
07432cef 7476msgstr "如果冲突,使用指定长度的标记"
ef317cd5
JX
7477
7478#: builtin/merge-file.c:43
7479msgid "do not warn about conflicts"
07432cef 7480msgstr "不要警告冲突"
ef317cd5
JX
7481
7482#: builtin/merge-file.c:45
814ff314
JX
7483msgid "set labels for file1/orig-file/file2"
7484msgstr "为 文件1/初始文件/文件2 设置标签"
c04f5ac3 7485
6c94aba5 7486#: builtin/mktree.c:64
ef317cd5 7487msgid "git mktree [-z] [--missing] [--batch]"
07432cef 7488msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 7489
6c94aba5 7490#: builtin/mktree.c:150
ef317cd5 7491msgid "input is NUL terminated"
07432cef 7492msgstr "输入以 NUL 字符终止"
c04f5ac3 7493
6c94aba5 7494#: builtin/mktree.c:151 builtin/write-tree.c:24
ef317cd5 7495msgid "allow missing objects"
07432cef 7496msgstr "允许丢失的对象"
c04f5ac3 7497
6c94aba5 7498#: builtin/mktree.c:152
ef317cd5 7499msgid "allow creation of more than one tree"
07432cef 7500msgstr "允许创建一个以上的树"
c04f5ac3 7501
90314792 7502#: builtin/mv.c:15
814ff314
JX
7503msgid "git mv [<options>] <source>... <destination>"
7504msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 7505
220c313c
JX
7506#: builtin/mv.c:69
7507#, c-format
7508msgid "Directory %s is in index and no submodule?"
7509msgstr "目录 %s 在索引中并且不是子模组?"
7510
cfff71a9 7511#: builtin/mv.c:71
220c313c 7512msgid "Please stage your changes to .gitmodules or stash them to proceed"
160fb2b2 7513msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
220c313c
JX
7514
7515#: builtin/mv.c:89
7516#, c-format
7517msgid "%.*s is in index"
7518msgstr "%.*s 在索引中"
7519
7520#: builtin/mv.c:111
ef317cd5 7521msgid "force move/rename even if target exists"
07432cef 7522msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 7523
220c313c 7524#: builtin/mv.c:112
ef317cd5 7525msgid "skip move/rename errors"
07432cef 7526msgstr "跳过移动/重命名错误"
c04f5ac3 7527
220c313c
JX
7528#: builtin/mv.c:151
7529#, c-format
7530msgid "destination '%s' is not a directory"
7531msgstr "目标 '%s' 不是一个目录"
7532
7533#: builtin/mv.c:162
c04f5ac3
JX
7534#, c-format
7535msgid "Checking rename of '%s' to '%s'\n"
7536msgstr "检查 '%s' 到 '%s' 的重命名\n"
7537
220c313c 7538#: builtin/mv.c:166
c04f5ac3
JX
7539msgid "bad source"
7540msgstr "坏的源"
7541
220c313c 7542#: builtin/mv.c:169
c04f5ac3
JX
7543msgid "can not move directory into itself"
7544msgstr "不能将目录移动到自身"
7545
220c313c 7546#: builtin/mv.c:172
c04f5ac3
JX
7547msgid "cannot move directory over file"
7548msgstr "不能将目录移动到文件"
7549
220c313c 7550#: builtin/mv.c:181
c04f5ac3
JX
7551msgid "source directory is empty"
7552msgstr "源目录为空"
7553
220c313c 7554#: builtin/mv.c:206
c04f5ac3
JX
7555msgid "not under version control"
7556msgstr "不在版本控制之下"
7557
220c313c 7558#: builtin/mv.c:209
c04f5ac3
JX
7559msgid "destination exists"
7560msgstr "目标已存在"
7561
220c313c 7562#: builtin/mv.c:217
c04f5ac3
JX
7563#, c-format
7564msgid "overwriting '%s'"
7565msgstr "覆盖 '%s'"
7566
220c313c 7567#: builtin/mv.c:220
c04f5ac3
JX
7568msgid "Cannot overwrite"
7569msgstr "不能覆盖"
7570
220c313c 7571#: builtin/mv.c:223
c04f5ac3
JX
7572msgid "multiple sources for the same target"
7573msgstr "同一目标具有多个源"
7574
220c313c 7575#: builtin/mv.c:225
cfff71a9
JX
7576msgid "destination directory does not exist"
7577msgstr "目标目录不存在"
7578
220c313c 7579#: builtin/mv.c:232
c04f5ac3
JX
7580#, c-format
7581msgid "%s, source=%s, destination=%s"
7582msgstr "%s,源=%s,目标=%s"
7583
220c313c 7584#: builtin/mv.c:253
c04f5ac3
JX
7585#, c-format
7586msgid "Renaming %s to %s\n"
7587msgstr "重命名 %s 至 %s\n"
7588
7aea43ff 7589#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361
c04f5ac3
JX
7590#, c-format
7591msgid "renaming '%s' failed"
7592msgstr "重命名 '%s' 失败"
7593
6acbf033 7594#: builtin/name-rev.c:255
814ff314
JX
7595msgid "git name-rev [<options>] <commit>..."
7596msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 7597
6acbf033 7598#: builtin/name-rev.c:256
814ff314
JX
7599msgid "git name-rev [<options>] --all"
7600msgstr "git name-rev [<选项>] --all"
ef317cd5 7601
6acbf033 7602#: builtin/name-rev.c:257
814ff314
JX
7603msgid "git name-rev [<options>] --stdin"
7604msgstr "git name-rev [<选项>] --stdin"
ef317cd5 7605
6acbf033 7606#: builtin/name-rev.c:309
ef317cd5 7607msgid "print only names (no SHA-1)"
07432cef 7608msgstr "只打印名称(无 SHA-1)"
ef317cd5 7609
6acbf033 7610#: builtin/name-rev.c:310
ef317cd5 7611msgid "only use tags to name the commits"
55a16ee4 7612msgstr "只使用标签来命名提交"
ef317cd5 7613
6acbf033 7614#: builtin/name-rev.c:312
ef317cd5 7615msgid "only use refs matching <pattern>"
07432cef 7616msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 7617
6acbf033 7618#: builtin/name-rev.c:314
ef317cd5 7619msgid "list all commits reachable from all refs"
07432cef 7620msgstr "列出可以从所有引用访问的提交"
ef317cd5 7621
6acbf033 7622#: builtin/name-rev.c:315
ef317cd5 7623msgid "read from stdin"
07432cef 7624msgstr "从标准输入读取"
ef317cd5 7625
6acbf033 7626#: builtin/name-rev.c:316
90314792
JX
7627msgid "allow to print `undefined` names (default)"
7628msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 7629
6acbf033 7630#: builtin/name-rev.c:322
2e8451e8 7631msgid "dereference tags in the input (internal use)"
55a16ee4 7632msgstr "反向解析输入中的标签(内部使用)"
2e8451e8
JX
7633
7634#: builtin/notes.c:24
814ff314 7635msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 7636msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 7637
2e8451e8 7638#: builtin/notes.c:25
ef317cd5 7639msgid ""
814ff314 7640"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 7641"| (-c | -C) <object>] [<object>]"
ef317cd5 7642msgstr ""
04cb2f28
JX
7643"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
7644"| (-c | -C) <对象>] [<对象>]"
ef317cd5 7645
2e8451e8 7646#: builtin/notes.c:26
814ff314 7647msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 7648msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 7649
2e8451e8 7650#: builtin/notes.c:27
ef317cd5 7651msgid ""
814ff314 7652"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 7653"(-c | -C) <object>] [<object>]"
ef317cd5 7654msgstr ""
04cb2f28
JX
7655"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
7656"(-c | -C) <对象>] [<对象>]"
ef317cd5 7657
2e8451e8 7658#: builtin/notes.c:28
814ff314 7659msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 7660msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 7661
2e8451e8 7662#: builtin/notes.c:29
814ff314 7663msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 7664msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 7665
2e8451e8 7666#: builtin/notes.c:30
ef317cd5 7667msgid ""
814ff314 7668"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 7669msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 7670
2e8451e8 7671#: builtin/notes.c:31
ef317cd5 7672msgid "git notes merge --commit [-v | -q]"
07432cef 7673msgstr "git notes merge --commit [-v | -q]"
ef317cd5 7674
2e8451e8 7675#: builtin/notes.c:32
ef317cd5 7676msgid "git notes merge --abort [-v | -q]"
07432cef 7677msgstr "git notes merge --abort [-v | -q]"
ef317cd5 7678
2e8451e8 7679#: builtin/notes.c:33
814ff314 7680msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 7681msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 7682
2e8451e8 7683#: builtin/notes.c:34
814ff314 7684msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
07432cef 7685msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
ef317cd5 7686
2e8451e8 7687#: builtin/notes.c:35
814ff314 7688msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 7689msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 7690
2e8451e8 7691#: builtin/notes.c:40
ef317cd5 7692msgid "git notes [list [<object>]]"
07432cef 7693msgstr "git notes [list [<对象>]]"
ef317cd5 7694
2e8451e8 7695#: builtin/notes.c:45
ef317cd5 7696msgid "git notes add [<options>] [<object>]"
07432cef 7697msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 7698
2e8451e8 7699#: builtin/notes.c:50
ef317cd5 7700msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 7701msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 7702
2e8451e8 7703#: builtin/notes.c:51
ef317cd5 7704msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 7705msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 7706
2e8451e8 7707#: builtin/notes.c:56
ef317cd5 7708msgid "git notes append [<options>] [<object>]"
07432cef 7709msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 7710
2e8451e8 7711#: builtin/notes.c:61
ef317cd5 7712msgid "git notes edit [<object>]"
07432cef 7713msgstr "git notes edit [<对象>]"
ef317cd5 7714
2e8451e8 7715#: builtin/notes.c:66
ef317cd5 7716msgid "git notes show [<object>]"
07432cef 7717msgstr "git notes show [<对象>]"
ef317cd5 7718
2e8451e8 7719#: builtin/notes.c:71
814ff314 7720msgid "git notes merge [<options>] <notes-ref>"
07432cef 7721msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 7722
2e8451e8 7723#: builtin/notes.c:72
ef317cd5 7724msgid "git notes merge --commit [<options>]"
07432cef 7725msgstr "git notes merge --commit [<选项>]"
ef317cd5 7726
2e8451e8 7727#: builtin/notes.c:73
ef317cd5 7728msgid "git notes merge --abort [<options>]"
07432cef 7729msgstr "git notes merge --abort [<选项>]"
ef317cd5 7730
2e8451e8 7731#: builtin/notes.c:78
ef317cd5 7732msgid "git notes remove [<object>]"
07432cef 7733msgstr "git notes remove [<对象>]"
ef317cd5 7734
2e8451e8 7735#: builtin/notes.c:83
ef317cd5 7736msgid "git notes prune [<options>]"
07432cef 7737msgstr "git notes prune [<选项>]"
ef317cd5 7738
2e8451e8 7739#: builtin/notes.c:88
ef317cd5 7740msgid "git notes get-ref"
07432cef 7741msgstr "git notes get-ref"
ef317cd5 7742
04cb2f28 7743#: builtin/notes.c:146
c04f5ac3
JX
7744#, c-format
7745msgid "unable to start 'show' for object '%s'"
7746msgstr "不能为对象 '%s' 开始 'show'"
7747
04cb2f28 7748#: builtin/notes.c:150
a77c07d9
JX
7749msgid "could not read 'show' output"
7750msgstr "不能读取 'show' 的输出"
c04f5ac3 7751
04cb2f28 7752#: builtin/notes.c:158
c04f5ac3
JX
7753#, c-format
7754msgid "failed to finish 'show' for object '%s'"
7755msgstr "无法为对象 '%s' 完成 'show'"
7756
04cb2f28 7757#: builtin/notes.c:173 builtin/tag.c:477
c04f5ac3
JX
7758#, c-format
7759msgid "could not create file '%s'"
7760msgstr "不能创建文件 '%s'"
7761
04cb2f28 7762#: builtin/notes.c:192
c04f5ac3
JX
7763msgid "Please supply the note contents using either -m or -F option"
7764msgstr "请通过 -m 或 -F 选项为注解提供内容"
7765
04cb2f28 7766#: builtin/notes.c:201
c04f5ac3
JX
7767msgid "unable to write note object"
7768msgstr "不能写注解对象"
7769
04cb2f28 7770#: builtin/notes.c:203
c04f5ac3 7771#, c-format
220c313c
JX
7772msgid "The note contents have been left in %s"
7773msgstr "注解内容被留在 %s 中"
c04f5ac3 7774
04cb2f28 7775#: builtin/notes.c:231 builtin/tag.c:693
c04f5ac3
JX
7776#, c-format
7777msgid "cannot read '%s'"
7778msgstr "不能读取 '%s'"
7779
04cb2f28 7780#: builtin/notes.c:233 builtin/tag.c:696
c04f5ac3
JX
7781#, c-format
7782msgid "could not open or read '%s'"
7783msgstr "不能打开或读取 '%s'"
7784
04cb2f28
JX
7785#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
7786#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
7787#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
7788#: builtin/notes.c:854 builtin/tag.c:709
c04f5ac3
JX
7789#, c-format
7790msgid "Failed to resolve '%s' as a valid ref."
90e6ef53 7791msgstr "无法解析 '%s' 为一个有效引用。"
c04f5ac3 7792
04cb2f28 7793#: builtin/notes.c:255
c04f5ac3
JX
7794#, c-format
7795msgid "Failed to read object '%s'."
7796msgstr "无法读取对象 '%s'。"
7797
04cb2f28 7798#: builtin/notes.c:259
6c94aba5
JX
7799#, c-format
7800msgid "Cannot read note data from non-blob object '%s'."
7801msgstr "不能从非数据对象 '%s' 中读取注解数据"
7802
04cb2f28 7803#: builtin/notes.c:299
c04f5ac3
JX
7804#, c-format
7805msgid "Malformed input line: '%s'."
7806msgstr "非法的输入行:'%s'。"
7807
04cb2f28 7808#: builtin/notes.c:314
c04f5ac3
JX
7809#, c-format
7810msgid "Failed to copy notes from '%s' to '%s'"
90e6ef53 7811msgstr "无法从 '%s' 到 '%s' 拷贝注解"
c04f5ac3 7812
04cb2f28
JX
7813#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
7814#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
7815#: builtin/notes.c:919
c04f5ac3
JX
7816msgid "too many parameters"
7817msgstr "参数太多"
7818
04cb2f28 7819#: builtin/notes.c:371 builtin/notes.c:658
c04f5ac3
JX
7820#, c-format
7821msgid "No note found for object %s."
7822msgstr "未发现对象 %s 的注解。"
7823
04cb2f28 7824#: builtin/notes.c:392 builtin/notes.c:555
ef317cd5 7825msgid "note contents as a string"
07432cef 7826msgstr "注解内容作为一个字符串"
ef317cd5 7827
04cb2f28 7828#: builtin/notes.c:395 builtin/notes.c:558
ef317cd5 7829msgid "note contents in a file"
07432cef 7830msgstr "注解内容到一个文件中"
ef317cd5 7831
04cb2f28
JX
7832#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
7833#: builtin/notes.c:563 builtin/tag.c:628
ef317cd5 7834msgid "object"
07432cef 7835msgstr "对象"
ef317cd5 7836
04cb2f28 7837#: builtin/notes.c:398 builtin/notes.c:561
ef317cd5 7838msgid "reuse and edit specified note object"
07432cef 7839msgstr "重用和编辑指定的注解对象"
ef317cd5 7840
04cb2f28 7841#: builtin/notes.c:401 builtin/notes.c:564
ef317cd5 7842msgid "reuse specified note object"
07432cef 7843msgstr "重用指定的注解对象"
ef317cd5 7844
04cb2f28
JX
7845#: builtin/notes.c:404 builtin/notes.c:567
7846msgid "allow storing empty note"
7847msgstr "允许保存空白注释"
7848
7849#: builtin/notes.c:405 builtin/notes.c:476
ef317cd5 7850msgid "replace existing notes"
07432cef 7851msgstr "替换已存在的注解"
ef317cd5 7852
04cb2f28 7853#: builtin/notes.c:430
c04f5ac3
JX
7854#, c-format
7855msgid ""
7856"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7857"existing notes"
7858msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7859
04cb2f28 7860#: builtin/notes.c:445 builtin/notes.c:524
c04f5ac3
JX
7861#, c-format
7862msgid "Overwriting existing notes for object %s\n"
7863msgstr "覆盖对象 %s 现存注解\n"
7864
04cb2f28
JX
7865#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
7866#, c-format
7867msgid "Removing note for object %s\n"
7868msgstr "删除对象 %s 的注解\n"
7869
7870#: builtin/notes.c:477
ef317cd5 7871msgid "read objects from stdin"
07432cef 7872msgstr "从标准输入读取对象"
ef317cd5 7873
04cb2f28 7874#: builtin/notes.c:479
ef317cd5 7875msgid "load rewriting config for <command> (implies --stdin)"
07432cef 7876msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 7877
04cb2f28 7878#: builtin/notes.c:497
c04f5ac3
JX
7879msgid "too few parameters"
7880msgstr "参数太少"
7881
04cb2f28 7882#: builtin/notes.c:518
c04f5ac3
JX
7883#, c-format
7884msgid ""
7885"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7886"existing notes"
7887msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7888
04cb2f28 7889#: builtin/notes.c:530
c04f5ac3
JX
7890#, c-format
7891msgid "Missing notes on source object %s. Cannot copy."
7892msgstr "源对象 %s 缺少注解。不能拷贝。"
7893
04cb2f28 7894#: builtin/notes.c:582
ef317cd5
JX
7895#, c-format
7896msgid ""
7897"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7898"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7899msgstr ""
7900"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7901"请换用 'git notes add -f -m/-F/-c/-C'。\n"
7902
04cb2f28 7903#: builtin/notes.c:750
ef317cd5 7904msgid "General options"
07432cef 7905msgstr "通用选项"
ef317cd5 7906
04cb2f28 7907#: builtin/notes.c:752
ef317cd5 7908msgid "Merge options"
07432cef 7909msgstr "合并选项"
ef317cd5 7910
04cb2f28 7911#: builtin/notes.c:754
ef317cd5
JX
7912msgid ""
7913"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7914"cat_sort_uniq)"
07432cef 7915msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 7916
04cb2f28 7917#: builtin/notes.c:756
ef317cd5 7918msgid "Committing unmerged notes"
07432cef 7919msgstr "提交未合并的注解"
ef317cd5 7920
04cb2f28 7921#: builtin/notes.c:758
ef317cd5 7922msgid "finalize notes merge by committing unmerged notes"
07432cef 7923msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 7924
04cb2f28 7925#: builtin/notes.c:760
ef317cd5 7926msgid "Aborting notes merge resolution"
07432cef 7927msgstr "中止注解合并的方案"
ef317cd5 7928
04cb2f28 7929#: builtin/notes.c:762
ef317cd5 7930msgid "abort notes merge"
07432cef 7931msgstr "中止注解合并"
ef317cd5 7932
04cb2f28 7933#: builtin/notes.c:857
ef317cd5
JX
7934#, c-format
7935msgid "Object %s has no note\n"
7936msgstr "对象 %s 没有注解\n"
7937
04cb2f28 7938#: builtin/notes.c:869
ef317cd5 7939msgid "attempt to remove non-existent note is not an error"
07432cef 7940msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 7941
04cb2f28 7942#: builtin/notes.c:872
ef317cd5 7943msgid "read object names from the standard input"
07432cef 7944msgstr "从标准输入读取对象名称"
ef317cd5 7945
04cb2f28 7946#: builtin/notes.c:953
6c94aba5 7947msgid "notes-ref"
07432cef 7948msgstr "注解引用"
ef317cd5 7949
04cb2f28 7950#: builtin/notes.c:954
814ff314 7951msgid "use notes from <notes-ref>"
07432cef 7952msgstr "从 <注解引用> 使用注解"
ef317cd5 7953
7aea43ff 7954#: builtin/notes.c:989 builtin/remote.c:1618
ef317cd5
JX
7955#, c-format
7956msgid "Unknown subcommand: %s"
7957msgstr "未知子命令:%s"
7958
220c313c 7959#: builtin/pack-objects.c:28
ef317cd5 7960msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
07432cef 7961msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
ef317cd5 7962
220c313c 7963#: builtin/pack-objects.c:29
ef317cd5 7964msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
07432cef 7965msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
ef317cd5 7966
814ff314 7967#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
ef317cd5
JX
7968#, c-format
7969msgid "deflate error (%d)"
7970msgstr "压缩错误 (%d)"
7971
814ff314 7972#: builtin/pack-objects.c:771
6c94aba5
JX
7973msgid "Writing objects"
7974msgstr "写入对象中"
7975
7aea43ff 7976#: builtin/pack-objects.c:1011
6c94aba5
JX
7977msgid "disabling bitmap writing, as some objects are not being packed"
7978msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7979
7aea43ff 7980#: builtin/pack-objects.c:2171
6c94aba5
JX
7981msgid "Compressing objects"
7982msgstr "压缩对象中"
7983
7aea43ff 7984#: builtin/pack-objects.c:2568
ef317cd5
JX
7985#, c-format
7986msgid "unsupported index version %s"
7987msgstr "不支持的索引版本 %s"
7988
7aea43ff 7989#: builtin/pack-objects.c:2572
ef317cd5
JX
7990#, c-format
7991msgid "bad index version '%s'"
7992msgstr "坏的索引版本 '%s'"
7993
7aea43ff 7994#: builtin/pack-objects.c:2595
ef317cd5
JX
7995#, c-format
7996msgid "option %s does not accept negative form"
7997msgstr "选项 %s 不接受否定格式"
7998
7aea43ff 7999#: builtin/pack-objects.c:2599
ef317cd5
JX
8000#, c-format
8001msgid "unable to parse value '%s' for option %s"
8002msgstr "不能解析选项 %1$s 的值 '%2$s'"
8003
7aea43ff 8004#: builtin/pack-objects.c:2619
ef317cd5 8005msgid "do not show progress meter"
07432cef 8006msgstr "不显示进度表"
ef317cd5 8007
7aea43ff 8008#: builtin/pack-objects.c:2621
ef317cd5 8009msgid "show progress meter"
07432cef 8010msgstr "显示进度表"
ef317cd5 8011
7aea43ff 8012#: builtin/pack-objects.c:2623
ef317cd5 8013msgid "show progress meter during object writing phase"
07432cef 8014msgstr "在对象写入阶段显示进度表"
ef317cd5 8015
7aea43ff 8016#: builtin/pack-objects.c:2626
ef317cd5 8017msgid "similar to --all-progress when progress meter is shown"
07432cef 8018msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 8019
7aea43ff 8020#: builtin/pack-objects.c:2627
ef317cd5 8021msgid "version[,offset]"
07432cef 8022msgstr "版本[,偏移]"
ef317cd5 8023
7aea43ff 8024#: builtin/pack-objects.c:2628
ef317cd5 8025msgid "write the pack index file in the specified idx format version"
07432cef 8026msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 8027
7aea43ff 8028#: builtin/pack-objects.c:2631
ef317cd5 8029msgid "maximum size of each output pack file"
07432cef 8030msgstr "每个输出包的最大尺寸"
ef317cd5 8031
7aea43ff 8032#: builtin/pack-objects.c:2633
ef317cd5 8033msgid "ignore borrowed objects from alternate object store"
160fb2b2 8034msgstr "忽略从备用对象存储里借用对象"
ef317cd5 8035
7aea43ff 8036#: builtin/pack-objects.c:2635
ef317cd5 8037msgid "ignore packed objects"
07432cef 8038msgstr "忽略包对象"
ef317cd5 8039
7aea43ff 8040#: builtin/pack-objects.c:2637
ef317cd5 8041msgid "limit pack window by objects"
07432cef 8042msgstr "限制打包窗口的对象数"
ef317cd5 8043
7aea43ff 8044#: builtin/pack-objects.c:2639
ef317cd5 8045msgid "limit pack window by memory in addition to object limit"
07432cef 8046msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 8047
7aea43ff 8048#: builtin/pack-objects.c:2641
ef317cd5 8049msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 8050msgstr "打包允许的 delta 链的最大长度"
ef317cd5 8051
7aea43ff 8052#: builtin/pack-objects.c:2643
ef317cd5 8053msgid "reuse existing deltas"
07432cef 8054msgstr "重用已存在的 deltas"
ef317cd5 8055
7aea43ff 8056#: builtin/pack-objects.c:2645
ef317cd5 8057msgid "reuse existing objects"
07432cef 8058msgstr "重用已存在的对象"
ef317cd5 8059
7aea43ff 8060#: builtin/pack-objects.c:2647
ef317cd5 8061msgid "use OFS_DELTA objects"
07432cef 8062msgstr "使用 OFS_DELTA 对象"
ef317cd5 8063
7aea43ff 8064#: builtin/pack-objects.c:2649
ef317cd5 8065msgid "use threads when searching for best delta matches"
07432cef 8066msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 8067
7aea43ff 8068#: builtin/pack-objects.c:2651
ef317cd5 8069msgid "do not create an empty pack output"
07432cef 8070msgstr "不创建空的包输出"
ef317cd5 8071
7aea43ff 8072#: builtin/pack-objects.c:2653
ef317cd5 8073msgid "read revision arguments from standard input"
d9d56b23 8074msgstr "从标准输入读取版本号参数"
ef317cd5 8075
7aea43ff 8076#: builtin/pack-objects.c:2655
ef317cd5 8077msgid "limit the objects to those that are not yet packed"
07432cef 8078msgstr "限制那些尚未打包的对象"
ef317cd5 8079
7aea43ff 8080#: builtin/pack-objects.c:2658
ef317cd5 8081msgid "include objects reachable from any reference"
07432cef 8082msgstr "包括可以从任何引用访问到的对象"
ef317cd5 8083
7aea43ff 8084#: builtin/pack-objects.c:2661
ef317cd5 8085msgid "include objects referred by reflog entries"
07432cef 8086msgstr "包括被引用日志引用到的对象"
ef317cd5 8087
7aea43ff 8088#: builtin/pack-objects.c:2664
220c313c
JX
8089msgid "include objects referred to by the index"
8090msgstr "包括被索引引用到的对象"
8091
7aea43ff 8092#: builtin/pack-objects.c:2667
ef317cd5 8093msgid "output pack to stdout"
07432cef 8094msgstr "输出包到标准输出"
ef317cd5 8095
7aea43ff 8096#: builtin/pack-objects.c:2669
ef317cd5 8097msgid "include tag objects that refer to objects to be packed"
53438e8f 8098msgstr "包括那些引用了待打包对象的标签对象"
ef317cd5 8099
7aea43ff 8100#: builtin/pack-objects.c:2671
ef317cd5 8101msgid "keep unreachable objects"
07432cef 8102msgstr "维持不可达的对象"
ef317cd5 8103
7aea43ff 8104#: builtin/pack-objects.c:2672 parse-options.h:139
ef317cd5
JX
8105msgid "time"
8106msgstr "时间"
8107
7aea43ff 8108#: builtin/pack-objects.c:2673
ef317cd5 8109msgid "unpack unreachable objects newer than <time>"
07432cef 8110msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 8111
7aea43ff 8112#: builtin/pack-objects.c:2676
ef317cd5 8113msgid "create thin packs"
07432cef 8114msgstr "创建精简包"
ef317cd5 8115
7aea43ff 8116#: builtin/pack-objects.c:2678
04cb2f28 8117msgid "create packs suitable for shallow fetches"
160fb2b2 8118msgstr "创建适合浅克隆仓库获取的包"
04cb2f28 8119
7aea43ff 8120#: builtin/pack-objects.c:2680
ef317cd5 8121msgid "ignore packs that have companion .keep file"
07432cef 8122msgstr "忽略配有 .keep 文件的包"
ef317cd5 8123
7aea43ff 8124#: builtin/pack-objects.c:2682
ef317cd5 8125msgid "pack compression level"
07432cef 8126msgstr "打包压缩级别"
ef317cd5 8127
7aea43ff 8128#: builtin/pack-objects.c:2684
ef317cd5 8129msgid "do not hide commits by grafts"
cfff71a9 8130msgstr "显示被嫁接隐藏的提交"
ef317cd5 8131
7aea43ff 8132#: builtin/pack-objects.c:2686
6c94aba5
JX
8133msgid "use a bitmap index if available to speed up counting objects"
8134msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8135
7aea43ff 8136#: builtin/pack-objects.c:2688
6c94aba5
JX
8137msgid "write a bitmap index together with the pack index"
8138msgstr "在建立包索引的同时创建 bitmap 索引"
8139
7aea43ff 8140#: builtin/pack-objects.c:2779
6c94aba5
JX
8141msgid "Counting objects"
8142msgstr "对象计数中"
8143
ef317cd5 8144#: builtin/pack-refs.c:6
814ff314
JX
8145msgid "git pack-refs [<options>]"
8146msgstr "git pack-refs [<选项>]"
c04f5ac3 8147
ef317cd5
JX
8148#: builtin/pack-refs.c:14
8149msgid "pack everything"
07432cef 8150msgstr "打包一切"
c04f5ac3 8151
ef317cd5
JX
8152#: builtin/pack-refs.c:15
8153msgid "prune loose refs (default)"
07432cef 8154msgstr "清除松散的引用(默认)"
c04f5ac3 8155
ef317cd5 8156#: builtin/prune-packed.c:7
814ff314
JX
8157msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8158msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 8159
220c313c 8160#: builtin/prune-packed.c:40
6c94aba5
JX
8161msgid "Removing duplicate objects"
8162msgstr "正在删除重复对象"
8163
5bb01d4f 8164#: builtin/prune.c:11
ef317cd5 8165msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
07432cef 8166msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7ac1c0ad 8167
5bb01d4f 8168#: builtin/prune.c:105 builtin/worktree.c:112
ef317cd5 8169msgid "do not remove, show only"
07432cef 8170msgstr "不删除,只显示"
7ac1c0ad 8171
5bb01d4f 8172#: builtin/prune.c:106 builtin/worktree.c:113
ef317cd5 8173msgid "report pruned objects"
07432cef 8174msgstr "报告清除的对象"
7ac1c0ad 8175
5bb01d4f 8176#: builtin/prune.c:109 builtin/worktree.c:115
ef317cd5 8177msgid "expire objects older than <time>"
07432cef 8178msgstr "使早于给定时间的对象过期"
ef317cd5
JX
8179
8180#: builtin/push.c:14
ef317cd5 8181msgid "git push [<options>] [<repository> [<refspec>...]]"
160fb2b2 8182msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
7ac1c0ad 8183
6c94aba5 8184#: builtin/push.c:85
c04f5ac3 8185msgid "tag shorthand without <tag>"
55a16ee4 8186msgstr "标签后面未提供 <标签> 参数"
c04f5ac3 8187
6c94aba5 8188#: builtin/push.c:95
c04f5ac3 8189msgid "--delete only accepts plain target ref names"
90e6ef53 8190msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 8191
6acbf033 8192#: builtin/push.c:139
8ada9598
JX
8193msgid ""
8194"\n"
8195"To choose either option permanently, see push.default in 'git help config'."
8196msgstr ""
81809b99
JX
8197"\n"
8198"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 8199
6acbf033 8200#: builtin/push.c:142
8ada9598
JX
8201#, c-format
8202msgid ""
8203"The upstream branch of your current branch does not match\n"
8204"the name of your current branch. To push to the upstream branch\n"
8205"on the remote, use\n"
8206"\n"
8207" git push %s HEAD:%s\n"
8208"\n"
8209"To push to the branch of the same name on the remote, use\n"
8210"\n"
8211" git push %s %s\n"
8212"%s"
8213msgstr ""
81809b99
JX
8214"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
8215"上游分支,使用\n"
8216"\n"
8217" git push %s HEAD:%s\n"
8218"\n"
8219"为推送至远程同名分支,使用\n"
8220"\n"
8221" git push %s %s\n"
8222"%s"
8ada9598 8223
6acbf033 8224#: builtin/push.c:157
c04f5ac3
JX
8225#, c-format
8226msgid ""
8227"You are not currently on a branch.\n"
8228"To push the history leading to the current (detached HEAD)\n"
8229"state now, use\n"
8230"\n"
8231" git push %s HEAD:<name-of-remote-branch>\n"
8232msgstr ""
8233"您当前不在一个分支上。\n"
90e6ef53 8234"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 8235"\n"
d9d56b23 8236" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 8237
6acbf033 8238#: builtin/push.c:171
c04f5ac3
JX
8239#, c-format
8240msgid ""
8241"The current branch %s has no upstream branch.\n"
8242"To push the current branch and set the remote as upstream, use\n"
8243"\n"
8244" git push --set-upstream %s %s\n"
8245msgstr ""
8246"当前分支 %s 没有对应的上游分支。\n"
8247"为推送当前分支并建立与远程上游的跟踪,使用\n"
8248"\n"
8249" git push --set-upstream %s %s\n"
8250
6acbf033 8251#: builtin/push.c:179
c04f5ac3
JX
8252#, c-format
8253msgid "The current branch %s has multiple upstream branches, refusing to push."
8254msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8255
6acbf033 8256#: builtin/push.c:182
73a60cd2
JX
8257#, c-format
8258msgid ""
8259"You are pushing to remote '%s', which is not the upstream of\n"
8260"your current branch '%s', without telling me what to push\n"
8261"to update which remote branch."
8262msgstr ""
8263"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8264"而没有告诉我要推送什么、更新哪个远程分支。"
8265
c160d03f 8266# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
6acbf033 8267#: builtin/push.c:205
c160d03f 8268msgid ""
6c94aba5 8269"push.default is unset; its implicit value has changed in\n"
c160d03f 8270"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6c94aba5 8271"and maintain the traditional behavior, use:\n"
c160d03f
JX
8272"\n"
8273" git config --global push.default matching\n"
8274"\n"
8275"To squelch this message and adopt the new behavior now, use:\n"
8276"\n"
8277" git config --global push.default simple\n"
8278"\n"
cfff71a9
JX
8279"When push.default is set to 'matching', git will push local branches\n"
8280"to the remote branches that already exist with the same name.\n"
8281"\n"
6c94aba5 8282"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
cfff71a9
JX
8283"behavior, which only pushes the current branch to the corresponding\n"
8284"remote branch that 'git pull' uses to update the current branch.\n"
8285"\n"
c160d03f
JX
8286"See 'git help config' and search for 'push.default' for further "
8287"information.\n"
8288"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8289"'current' instead of 'simple' if you sometimes use older versions of Git)"
8290msgstr ""
6c94aba5 8291"push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
cfff71a9 8292"变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
c160d03f
JX
8293"\n"
8294" git config --global push.default matching\n"
8295"\n"
8296"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8297"\n"
8298" git config --global push.default simple\n"
8299"\n"
cfff71a9
JX
8300"当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8301"本地分支。\n"
8302"\n"
160fb2b2 8303"从 Git 2.0 开始,Git 默认采用更为保守的 'simple' 模式,只推送当前\n"
cfff71a9
JX
8304"分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8305"\n"
c160d03f
JX
8306"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8307"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
90314792 8308"为保持兼容,请用 'current' 代替 'simple')"
c160d03f 8309
6acbf033 8310#: builtin/push.c:272
c04f5ac3
JX
8311msgid ""
8312"You didn't specify any refspecs to push, and push.default is \"nothing\"."
160fb2b2 8313msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
c04f5ac3 8314
6acbf033 8315#: builtin/push.c:279
170e9899
JX
8316msgid ""
8317"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
8318"its remote counterpart. Integrate the remote changes (e.g.\n"
8319"'git pull ...') before pushing again.\n"
170e9899
JX
8320"See the 'Note about fast-forwards' in 'git push --help' for details."
8321msgstr ""
eff6d3a9 8322"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 8323"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 8324"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 8325
6acbf033 8326#: builtin/push.c:285
170e9899
JX
8327msgid ""
8328"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
8329"counterpart. Check out this branch and integrate the remote changes\n"
8330"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
8331"See the 'Note about fast-forwards' in 'git push --help' for details."
8332msgstr ""
eff6d3a9 8333"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 8334"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 8335"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 8336
6acbf033 8337#: builtin/push.c:291
07432cef 8338msgid ""
a77c07d9
JX
8339"Updates were rejected because the remote contains work that you do\n"
8340"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
8341"to the same ref. You may want to first integrate the remote changes\n"
8342"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
8343"See the 'Note about fast-forwards' in 'git push --help' for details."
8344msgstr ""
160fb2b2
JX
8345"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
8346"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
2e8451e8 8347"(如 'git pull ...')。\n"
a77c07d9
JX
8348"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8349
6acbf033 8350#: builtin/push.c:298
a77c07d9 8351msgid "Updates were rejected because the tag already exists in the remote."
55a16ee4 8352msgstr "更新被拒绝,因为该标签在远程已经存在。"
a77c07d9 8353
6acbf033 8354#: builtin/push.c:301
a77c07d9
JX
8355msgid ""
8356"You cannot update a remote ref that points at a non-commit object,\n"
8357"or update a remote ref to make it point at a non-commit object,\n"
8358"without using the '--force' option.\n"
8359msgstr ""
8360"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
8361"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 8362
6acbf033 8363#: builtin/push.c:360
c04f5ac3
JX
8364#, c-format
8365msgid "Pushing to %s\n"
8366msgstr "推送到 %s\n"
8367
6acbf033 8368#: builtin/push.c:364
c04f5ac3
JX
8369#, c-format
8370msgid "failed to push some refs to '%s'"
8371msgstr "无法推送一些引用到 '%s'"
8372
6acbf033 8373#: builtin/push.c:394
c04f5ac3
JX
8374#, c-format
8375msgid "bad repository '%s'"
160fb2b2 8376msgstr "坏的仓库 '%s'"
c04f5ac3 8377
6acbf033 8378#: builtin/push.c:395
c04f5ac3
JX
8379msgid ""
8380"No configured push destination.\n"
8381"Either specify the URL from the command-line or configure a remote "
8382"repository using\n"
8383"\n"
8384" git remote add <name> <url>\n"
8385"\n"
8386"and then push using the remote name\n"
8387"\n"
8388" git push <name>\n"
8389msgstr ""
90e6ef53 8390"没有配置推送目标。\n"
4375c10e 8391"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
c04f5ac3 8392"\n"
d9d56b23 8393" git remote add <名称> <地址>\n"
c04f5ac3 8394"\n"
160fb2b2 8395"然后使用该远程仓库名执行推送\n"
c04f5ac3 8396"\n"
d9d56b23 8397" git push <名称>\n"
c04f5ac3 8398
6acbf033 8399#: builtin/push.c:410
c04f5ac3
JX
8400msgid "--all and --tags are incompatible"
8401msgstr "--all 和 --tags 不兼容"
8402
6acbf033 8403#: builtin/push.c:411
c04f5ac3 8404msgid "--all can't be combined with refspecs"
160fb2b2 8405msgstr "--all 不能和引用规格同时使用"
c04f5ac3 8406
6acbf033 8407#: builtin/push.c:416
c04f5ac3
JX
8408msgid "--mirror and --tags are incompatible"
8409msgstr "--mirror 和 --tags 不兼容"
8410
6acbf033 8411#: builtin/push.c:417
c04f5ac3 8412msgid "--mirror can't be combined with refspecs"
160fb2b2 8413msgstr "--mirror 不能和引用规格同时使用"
c04f5ac3 8414
6acbf033 8415#: builtin/push.c:422
c04f5ac3
JX
8416msgid "--all and --mirror are incompatible"
8417msgstr "--all 和 --mirror 不兼容"
8418
814ff314 8419#: builtin/push.c:502
ef317cd5 8420msgid "repository"
160fb2b2 8421msgstr "仓库"
ef317cd5 8422
814ff314 8423#: builtin/push.c:503
ef317cd5 8424msgid "push all refs"
07432cef 8425msgstr "推送所有引用"
ef317cd5 8426
814ff314 8427#: builtin/push.c:504
ef317cd5 8428msgid "mirror all refs"
07432cef 8429msgstr "镜像所有引用"
ef317cd5 8430
814ff314 8431#: builtin/push.c:506
ef317cd5 8432msgid "delete refs"
07432cef 8433msgstr "删除引用"
ef317cd5 8434
814ff314 8435#: builtin/push.c:507
ef317cd5 8436msgid "push tags (can't be used with --all or --mirror)"
55a16ee4 8437msgstr "推送标签(不能使用 --all or --mirror)"
ef317cd5 8438
814ff314 8439#: builtin/push.c:510
ef317cd5
JX
8440msgid "force updates"
8441msgstr "强制更新"
8442
814ff314 8443#: builtin/push.c:512
90314792
JX
8444msgid "refname>:<expect"
8445msgstr "引用名>:<期望值"
8446
814ff314 8447#: builtin/push.c:513
90314792
JX
8448msgid "require old value of ref to be at this value"
8449msgstr "要求引用旧的取值为设定值"
8450
814ff314 8451#: builtin/push.c:516
ef317cd5 8452msgid "control recursive pushing of submodules"
07432cef 8453msgstr "控制子模组的递归推送"
ef317cd5 8454
814ff314 8455#: builtin/push.c:518
ef317cd5 8456msgid "use thin pack"
07432cef 8457msgstr "使用精简打包"
ef317cd5 8458
814ff314 8459#: builtin/push.c:519 builtin/push.c:520
ef317cd5 8460msgid "receive pack program"
07432cef 8461msgstr "接收包程序"
ef317cd5 8462
814ff314 8463#: builtin/push.c:521
ef317cd5 8464msgid "set upstream for git pull/status"
07432cef 8465msgstr "设置 git pull/status 的上游"
ef317cd5 8466
814ff314 8467#: builtin/push.c:524
ef317cd5 8468msgid "prune locally removed refs"
07432cef 8469msgstr "清除本地删除的引用"
ef317cd5 8470
814ff314 8471#: builtin/push.c:526
a77c07d9
JX
8472msgid "bypass pre-push hook"
8473msgstr "绕过 pre-push 钩子"
8474
814ff314 8475#: builtin/push.c:527
1003b3a5 8476msgid "push missing but relevant tags"
55a16ee4 8477msgstr "推送缺失但有关的标签"
1003b3a5 8478
814ff314 8479#: builtin/push.c:529
220c313c
JX
8480msgid "GPG sign the push"
8481msgstr "用 GPG 为推送签名"
8482
814ff314
JX
8483#: builtin/push.c:530
8484msgid "request atomic transaction on remote side"
8485msgstr "需要远端支持原子事务"
8486
8487#: builtin/push.c:539
c04f5ac3
JX
8488msgid "--delete is incompatible with --all, --mirror and --tags"
8489msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8490
814ff314 8491#: builtin/push.c:541
c04f5ac3
JX
8492msgid "--delete doesn't make sense without any refs"
8493msgstr "--delete 未接任何引用没有意义"
8494
220c313c 8495#: builtin/read-tree.c:37
ef317cd5
JX
8496msgid ""
8497"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8498"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8499"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8500msgstr ""
07432cef
WS
8501"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8502"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8503"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
ef317cd5 8504
220c313c 8505#: builtin/read-tree.c:110
ef317cd5 8506msgid "write resulting index to <file>"
d9d56b23 8507msgstr "将索引结果写入 <文件>"
ef317cd5 8508
220c313c 8509#: builtin/read-tree.c:113
ef317cd5 8510msgid "only empty the index"
07432cef 8511msgstr "只是清空索引"
ef317cd5 8512
220c313c 8513#: builtin/read-tree.c:115
ef317cd5 8514msgid "Merging"
07432cef 8515msgstr "合并"
ef317cd5 8516
220c313c 8517#: builtin/read-tree.c:117
ef317cd5 8518msgid "perform a merge in addition to a read"
07432cef 8519msgstr "读取之余再执行一个合并"
ef317cd5 8520
220c313c 8521#: builtin/read-tree.c:119
ef317cd5 8522msgid "3-way merge if no file level merging required"
160fb2b2 8523msgstr "如果没有文件级合并需要,执行三方合并"
ef317cd5 8524
220c313c 8525#: builtin/read-tree.c:121
ef317cd5 8526msgid "3-way merge in presence of adds and removes"
160fb2b2 8527msgstr "存在添加和删除时,也执行三方合并"
ef317cd5 8528
220c313c 8529#: builtin/read-tree.c:123
ef317cd5 8530msgid "same as -m, but discard unmerged entries"
07432cef 8531msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 8532
220c313c 8533#: builtin/read-tree.c:124
ef317cd5 8534msgid "<subdirectory>/"
07432cef 8535msgstr "<子目录>/"
ef317cd5 8536
220c313c 8537#: builtin/read-tree.c:125
ef317cd5 8538msgid "read the tree into the index under <subdirectory>/"
07432cef 8539msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 8540
220c313c 8541#: builtin/read-tree.c:128
ef317cd5 8542msgid "update working tree with merge result"
07432cef 8543msgstr "用合并的结果更新工作区"
ef317cd5 8544
220c313c 8545#: builtin/read-tree.c:130
ef317cd5 8546msgid "gitignore"
07432cef 8547msgstr "gitignore"
ef317cd5 8548
220c313c 8549#: builtin/read-tree.c:131
ef317cd5 8550msgid "allow explicitly ignored files to be overwritten"
07432cef 8551msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 8552
220c313c 8553#: builtin/read-tree.c:134
ef317cd5 8554msgid "don't check the working tree after merging"
07432cef 8555msgstr "合并后不检查工作区"
ef317cd5 8556
220c313c 8557#: builtin/read-tree.c:135
ef317cd5 8558msgid "don't update the index or the work tree"
07432cef 8559msgstr "不更新索引区和工作区"
ef317cd5 8560
220c313c 8561#: builtin/read-tree.c:137
ef317cd5 8562msgid "skip applying sparse checkout filter"
07432cef 8563msgstr "跳过应用稀疏检出过滤器"
ef317cd5 8564
220c313c 8565#: builtin/read-tree.c:139
ef317cd5 8566msgid "debug unpack-trees"
07432cef 8567msgstr "调试 unpack-trees"
ef317cd5 8568
7aea43ff 8569#: builtin/reflog.c:430
2e8451e8
JX
8570#, c-format
8571msgid "%s' for '%s' is not a valid timestamp"
8572msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8573
7aea43ff 8574#: builtin/reflog.c:547 builtin/reflog.c:552
2e8451e8
JX
8575#, c-format
8576msgid "'%s' is not a valid timestamp"
8577msgstr "'%s' 不是一个有效的时间戳"
8578
cfff71a9 8579#: builtin/remote.c:12
ef317cd5 8580msgid "git remote [-v | --verbose]"
07432cef 8581msgstr "git remote [-v | --verbose]"
ef317cd5 8582
cfff71a9 8583#: builtin/remote.c:13
ef317cd5 8584msgid ""
814ff314 8585"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
8586"mirror=<fetch|push>] <name> <url>"
8587msgstr ""
814ff314 8588"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 8589"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 8590
cfff71a9 8591#: builtin/remote.c:14 builtin/remote.c:33
ef317cd5 8592msgid "git remote rename <old> <new>"
07432cef 8593msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 8594
cfff71a9 8595#: builtin/remote.c:15 builtin/remote.c:38
ef317cd5 8596msgid "git remote remove <name>"
07432cef 8597msgstr "git remote remove <名称>"
ef317cd5 8598
814ff314
JX
8599#: builtin/remote.c:16 builtin/remote.c:43
8600msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8601msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 8602
cfff71a9 8603#: builtin/remote.c:17
ef317cd5 8604msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 8605msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 8606
cfff71a9 8607#: builtin/remote.c:18
ef317cd5 8608msgid "git remote prune [-n | --dry-run] <name>"
07432cef 8609msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 8610
cfff71a9 8611#: builtin/remote.c:19
ef317cd5
JX
8612msgid ""
8613"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 8614msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 8615
cfff71a9 8616#: builtin/remote.c:20
ef317cd5 8617msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 8618msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 8619
cfff71a9 8620#: builtin/remote.c:21 builtin/remote.c:69
ef317cd5 8621msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 8622msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 8623
cfff71a9 8624#: builtin/remote.c:22 builtin/remote.c:70
ef317cd5 8625msgid "git remote set-url --add <name> <newurl>"
07432cef 8626msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 8627
cfff71a9 8628#: builtin/remote.c:23 builtin/remote.c:71
ef317cd5 8629msgid "git remote set-url --delete <name> <url>"
07432cef 8630msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 8631
cfff71a9 8632#: builtin/remote.c:28
ef317cd5 8633msgid "git remote add [<options>] <name> <url>"
07432cef 8634msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 8635
cfff71a9 8636#: builtin/remote.c:48
ef317cd5 8637msgid "git remote set-branches <name> <branch>..."
07432cef 8638msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 8639
cfff71a9 8640#: builtin/remote.c:49
ef317cd5 8641msgid "git remote set-branches --add <name> <branch>..."
07432cef 8642msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 8643
cfff71a9 8644#: builtin/remote.c:54
ef317cd5 8645msgid "git remote show [<options>] <name>"
07432cef 8646msgstr "git remote show [<选项>] <名称>"
ef317cd5 8647
cfff71a9 8648#: builtin/remote.c:59
ef317cd5 8649msgid "git remote prune [<options>] <name>"
07432cef 8650msgstr "git remote prune [<选项>] <名称>"
ef317cd5 8651
cfff71a9 8652#: builtin/remote.c:64
ef317cd5 8653msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 8654msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 8655
cfff71a9 8656#: builtin/remote.c:88
81809b99 8657#, c-format
8ada9598 8658msgid "Updating %s"
81809b99 8659msgstr "更新 %s 中"
8ada9598 8660
cfff71a9 8661#: builtin/remote.c:120
8ada9598
JX
8662msgid ""
8663"--mirror is dangerous and deprecated; please\n"
8664"\t use --mirror=fetch or --mirror=push instead"
8665msgstr ""
81809b99
JX
8666"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8667"\t 或 --mirror=push"
8ada9598 8668
cfff71a9 8669#: builtin/remote.c:137
81809b99 8670#, c-format
8ada9598 8671msgid "unknown mirror argument: %s"
81809b99 8672msgstr "未知的镜像参数:%s"
8ada9598 8673
cfff71a9 8674#: builtin/remote.c:153
ef317cd5 8675msgid "fetch the remote branches"
07432cef 8676msgstr "抓取远程的分支"
ef317cd5 8677
cfff71a9 8678#: builtin/remote.c:155
ef317cd5 8679msgid "import all tags and associated objects when fetching"
55a16ee4 8680msgstr "抓取时导入所有的标签和关联对象"
ef317cd5 8681
cfff71a9 8682#: builtin/remote.c:158
ef317cd5 8683msgid "or do not fetch any tag at all (--no-tags)"
55a16ee4 8684msgstr "或不抓取任何标签(--no-tags)"
ef317cd5 8685
cfff71a9 8686#: builtin/remote.c:160
ef317cd5 8687msgid "branch(es) to track"
07432cef 8688msgstr "跟踪的分支"
ef317cd5 8689
cfff71a9 8690#: builtin/remote.c:161
ef317cd5 8691msgid "master branch"
07432cef 8692msgstr "主线分支"
ef317cd5 8693
cfff71a9 8694#: builtin/remote.c:162
ef317cd5 8695msgid "push|fetch"
07432cef 8696msgstr "push|fetch"
ef317cd5 8697
cfff71a9 8698#: builtin/remote.c:163
ef317cd5 8699msgid "set up remote as a mirror to push to or fetch from"
07432cef 8700msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 8701
cfff71a9 8702#: builtin/remote.c:175
8ada9598 8703msgid "specifying a master branch makes no sense with --mirror"
81809b99 8704msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 8705
cfff71a9 8706#: builtin/remote.c:177
8ada9598 8707msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 8708msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 8709
7aea43ff 8710#: builtin/remote.c:187 builtin/remote.c:640
81809b99 8711#, c-format
8ada9598 8712msgid "remote %s already exists."
81809b99 8713msgstr "远程 %s 已经存在。"
8ada9598 8714
7aea43ff 8715#: builtin/remote.c:191 builtin/remote.c:644
81809b99 8716#, c-format
8ada9598 8717msgid "'%s' is not a valid remote name"
81809b99 8718msgstr "'%s' 不是一个有效的远程名称"
8ada9598 8719
d9d56b23 8720#: builtin/remote.c:235
81809b99 8721#, c-format
8ada9598 8722msgid "Could not setup master '%s'"
81809b99 8723msgstr "无法设置 master '%s'"
8ada9598 8724
d9d56b23 8725#: builtin/remote.c:335
81809b99 8726#, c-format
8ada9598 8727msgid "Could not get fetch map for refspec %s"
160fb2b2 8728msgstr "无法得到引用规格 %s 的获取列表"
8ada9598 8729
d9d56b23 8730#: builtin/remote.c:436 builtin/remote.c:444
8ada9598 8731msgid "(matching)"
81809b99 8732msgstr "(匹配)"
8ada9598 8733
d9d56b23 8734#: builtin/remote.c:448
8ada9598 8735msgid "(delete)"
81809b99 8736msgstr "(删除)"
8ada9598 8737
7aea43ff 8738#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
81809b99 8739#, c-format
8ada9598 8740msgid "Could not append '%s' to '%s'"
81809b99 8741msgstr "不能添加 '%s' 至 '%s'"
8ada9598 8742
7aea43ff 8743#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892
81809b99 8744#, c-format
8ada9598 8745msgid "No such remote: %s"
81809b99 8746msgstr "没有这样的远程:%s"
8ada9598 8747
7aea43ff 8748#: builtin/remote.c:650
81809b99 8749#, c-format
8ada9598 8750msgid "Could not rename config section '%s' to '%s'"
81809b99 8751msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 8752
7aea43ff 8753#: builtin/remote.c:656 builtin/remote.c:844
81809b99 8754#, c-format
8ada9598 8755msgid "Could not remove config section '%s'"
81809b99 8756msgstr "不能移除配置小节 '%s'"
8ada9598 8757
7aea43ff 8758#: builtin/remote.c:671
8ada9598
JX
8759#, c-format
8760msgid ""
d691f479 8761"Not updating non-default fetch refspec\n"
8ada9598
JX
8762"\t%s\n"
8763"\tPlease update the configuration manually if necessary."
8764msgstr ""
160fb2b2 8765"没有更新非默认的获取引用规格\n"
81809b99
JX
8766"\t%s\n"
8767"\t如果必要请手动更新配置。"
8ada9598 8768
7aea43ff 8769#: builtin/remote.c:677
81809b99 8770#, c-format
8ada9598 8771msgid "Could not append '%s'"
81809b99 8772msgstr "不能追加 '%s'"
8ada9598 8773
7aea43ff 8774#: builtin/remote.c:688
81809b99 8775#, c-format
8ada9598 8776msgid "Could not set '%s'"
81809b99 8777msgstr "不能设置 '%s'"
8ada9598 8778
7aea43ff 8779#: builtin/remote.c:710
81809b99 8780#, c-format
8ada9598 8781msgid "deleting '%s' failed"
81809b99 8782msgstr "删除 '%s' 失败"
8ada9598 8783
7aea43ff 8784#: builtin/remote.c:744
81809b99 8785#, c-format
8ada9598 8786msgid "creating '%s' failed"
81809b99 8787msgstr "创建 '%s' 失败"
8ada9598 8788
7aea43ff 8789#: builtin/remote.c:763
81809b99 8790#, c-format
8ada9598 8791msgid "Could not remove branch %s"
81809b99 8792msgstr "无法移除分支 %s"
8ada9598 8793
7aea43ff 8794#: builtin/remote.c:830
8ada9598
JX
8795msgid ""
8796"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8797"to delete it, use:"
8798msgid_plural ""
8799"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8800"to delete them, use:"
5ae481e0
JX
8801msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8802msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 8803
7aea43ff 8804#: builtin/remote.c:945
8ada9598
JX
8805#, c-format
8806msgid " new (next fetch will store in remotes/%s)"
81809b99 8807msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 8808
7aea43ff 8809#: builtin/remote.c:948
8ada9598 8810msgid " tracked"
81809b99 8811msgstr " 已跟踪"
8ada9598 8812
7aea43ff 8813#: builtin/remote.c:950
8ada9598 8814msgid " stale (use 'git remote prune' to remove)"
81809b99 8815msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 8816
7aea43ff 8817#: builtin/remote.c:952
8ada9598 8818msgid " ???"
81809b99 8819msgstr " ???"
8ada9598 8820
7aea43ff 8821#: builtin/remote.c:993
8ada9598
JX
8822#, c-format
8823msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 8824msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 8825
7aea43ff 8826#: builtin/remote.c:1000
81809b99 8827#, c-format
8ada9598 8828msgid "rebases onto remote %s"
81809b99 8829msgstr "变基到远程 %s"
8ada9598 8830
7aea43ff 8831#: builtin/remote.c:1003
81809b99 8832#, c-format
8ada9598 8833msgid " merges with remote %s"
81809b99 8834msgstr " 与远程 %s 合并"
8ada9598 8835
7aea43ff 8836#: builtin/remote.c:1004
8ada9598 8837msgid " and with remote"
81809b99 8838msgstr " 且有远程"
8ada9598 8839
7aea43ff 8840#: builtin/remote.c:1006
81809b99 8841#, c-format
8ada9598 8842msgid "merges with remote %s"
81809b99 8843msgstr "与远程 %s 合并"
8ada9598 8844
7aea43ff 8845#: builtin/remote.c:1007
8ada9598 8846msgid " and with remote"
81809b99 8847msgstr " 且有远程"
8ada9598 8848
7aea43ff 8849#: builtin/remote.c:1053
8ada9598 8850msgid "create"
81809b99 8851msgstr "创建"
8ada9598 8852
7aea43ff 8853#: builtin/remote.c:1056
8ada9598 8854msgid "delete"
81809b99 8855msgstr "删除"
8ada9598 8856
7aea43ff 8857#: builtin/remote.c:1060
8ada9598 8858msgid "up to date"
81809b99 8859msgstr "最新"
8ada9598 8860
7aea43ff 8861#: builtin/remote.c:1063
8ada9598 8862msgid "fast-forwardable"
81809b99 8863msgstr "可快进"
8ada9598 8864
7aea43ff 8865#: builtin/remote.c:1066
8ada9598 8866msgid "local out of date"
81809b99 8867msgstr "本地已过时"
8ada9598 8868
7aea43ff 8869#: builtin/remote.c:1073
8ada9598
JX
8870#, c-format
8871msgid " %-*s forces to %-*s (%s)"
81809b99 8872msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 8873
7aea43ff 8874#: builtin/remote.c:1076
8ada9598
JX
8875#, c-format
8876msgid " %-*s pushes to %-*s (%s)"
81809b99 8877msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 8878
7aea43ff 8879#: builtin/remote.c:1080
8ada9598
JX
8880#, c-format
8881msgid " %-*s forces to %s"
81809b99 8882msgstr " %-*s 强制推送至 %s"
8ada9598 8883
7aea43ff 8884#: builtin/remote.c:1083
8ada9598
JX
8885#, c-format
8886msgid " %-*s pushes to %s"
81809b99 8887msgstr " %-*s 推送至 %s"
8ada9598 8888
7aea43ff 8889#: builtin/remote.c:1151
ef317cd5 8890msgid "do not query remotes"
07432cef 8891msgstr "不查询远程"
ef317cd5 8892
7aea43ff 8893#: builtin/remote.c:1178
81809b99 8894#, c-format
8ada9598 8895msgid "* remote %s"
81809b99 8896msgstr "* 远程 %s"
8ada9598 8897
7aea43ff 8898#: builtin/remote.c:1179
8ada9598
JX
8899#, c-format
8900msgid " Fetch URL: %s"
81809b99 8901msgstr " 获取地址:%s"
8ada9598 8902
7aea43ff 8903#: builtin/remote.c:1180 builtin/remote.c:1331
8ada9598 8904msgid "(no URL)"
81809b99 8905msgstr "(无 URL)"
8ada9598 8906
7aea43ff 8907#: builtin/remote.c:1189 builtin/remote.c:1191
8ada9598
JX
8908#, c-format
8909msgid " Push URL: %s"
81809b99 8910msgstr " 推送地址:%s"
8ada9598 8911
7aea43ff 8912#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197
81809b99 8913#, c-format
8ada9598 8914msgid " HEAD branch: %s"
4375c10e 8915msgstr " HEAD 分支:%s"
8ada9598 8916
7aea43ff 8917#: builtin/remote.c:1199
8ada9598
JX
8918#, c-format
8919msgid ""
8920" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 8921msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 8922
7aea43ff 8923#: builtin/remote.c:1211
81809b99 8924#, c-format
8ada9598
JX
8925msgid " Remote branch:%s"
8926msgid_plural " Remote branches:%s"
81809b99 8927msgstr[0] " 远程分支:%s"
5ae481e0 8928msgstr[1] " 远程分支:%s"
8ada9598 8929
81809b99 8930# 译者:中文字符串拼接,可删除前导空格
7aea43ff 8931#: builtin/remote.c:1214 builtin/remote.c:1241
8ada9598 8932msgid " (status not queried)"
81809b99 8933msgstr "(状态未查询)"
8ada9598 8934
7aea43ff 8935#: builtin/remote.c:1223
8ada9598
JX
8936msgid " Local branch configured for 'git pull':"
8937msgid_plural " Local branches configured for 'git pull':"
81809b99 8938msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 8939msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 8940
7aea43ff 8941#: builtin/remote.c:1231
8ada9598 8942msgid " Local refs will be mirrored by 'git push'"
81809b99 8943msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 8944
7aea43ff 8945#: builtin/remote.c:1238
81809b99 8946#, c-format
8ada9598
JX
8947msgid " Local ref configured for 'git push'%s:"
8948msgid_plural " Local refs configured for 'git push'%s:"
81809b99 8949msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 8950msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 8951
7aea43ff 8952#: builtin/remote.c:1259
ef317cd5 8953msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 8954msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 8955
7aea43ff 8956#: builtin/remote.c:1261
ef317cd5 8957msgid "delete refs/remotes/<name>/HEAD"
07432cef 8958msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 8959
7aea43ff 8960#: builtin/remote.c:1276
8ada9598 8961msgid "Cannot determine remote HEAD"
81809b99 8962msgstr "无法确定远程 HEAD"
8ada9598 8963
7aea43ff 8964#: builtin/remote.c:1278
8ada9598 8965msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 8966msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 8967
7aea43ff 8968#: builtin/remote.c:1288
81809b99 8969#, c-format
8ada9598 8970msgid "Could not delete %s"
81809b99 8971msgstr "无法删除 %s"
8ada9598 8972
7aea43ff 8973#: builtin/remote.c:1296
81809b99 8974#, c-format
8ada9598 8975msgid "Not a valid ref: %s"
81809b99 8976msgstr "不是一个有效引用:%s"
8ada9598 8977
7aea43ff 8978#: builtin/remote.c:1298
81809b99 8979#, c-format
8ada9598 8980msgid "Could not setup %s"
81809b99 8981msgstr "不能设置 %s"
8ada9598
JX
8982
8983# 译者:注意保持前导空格
7aea43ff 8984#: builtin/remote.c:1316
81809b99 8985#, c-format
8ada9598 8986msgid " %s will become dangling!"
07432cef 8987msgstr " %s 将成为摇摆状态!"
8ada9598
JX
8988
8989# 译者:注意保持前导空格
7aea43ff 8990#: builtin/remote.c:1317
81809b99 8991#, c-format
8ada9598 8992msgid " %s has become dangling!"
07432cef 8993msgstr " %s 已成为摇摆状态!"
8ada9598 8994
7aea43ff 8995#: builtin/remote.c:1327
81809b99 8996#, c-format
8ada9598 8997msgid "Pruning %s"
81809b99 8998msgstr "修剪 %s"
8ada9598 8999
7aea43ff 9000#: builtin/remote.c:1328
8ada9598
JX
9001#, c-format
9002msgid "URL: %s"
81809b99 9003msgstr "URL:%s"
8ada9598 9004
7aea43ff 9005#: builtin/remote.c:1351
8ada9598
JX
9006#, c-format
9007msgid " * [would prune] %s"
81809b99 9008msgstr " * [将删除] %s"
8ada9598 9009
7aea43ff 9010#: builtin/remote.c:1354
8ada9598
JX
9011#, c-format
9012msgid " * [pruned] %s"
81809b99 9013msgstr " * [已删除] %s"
8ada9598 9014
7aea43ff 9015#: builtin/remote.c:1399
ef317cd5 9016msgid "prune remotes after fetching"
07432cef 9017msgstr "抓取后清除远程"
ef317cd5 9018
7aea43ff 9019#: builtin/remote.c:1465 builtin/remote.c:1539
81809b99 9020#, c-format
8ada9598 9021msgid "No such remote '%s'"
81809b99 9022msgstr "没有此远程 '%s'"
8ada9598 9023
7aea43ff 9024#: builtin/remote.c:1485
ef317cd5 9025msgid "add branch"
07432cef 9026msgstr "添加分支"
ef317cd5 9027
7aea43ff 9028#: builtin/remote.c:1492
8ada9598 9029msgid "no remote specified"
81809b99 9030msgstr "未指定远程"
8ada9598 9031
7aea43ff 9032#: builtin/remote.c:1514
ef317cd5 9033msgid "manipulate push URLs"
07432cef 9034msgstr "操作推送 URLS"
ef317cd5 9035
7aea43ff 9036#: builtin/remote.c:1516
ef317cd5 9037msgid "add URL"
07432cef 9038msgstr "添加 URL"
ef317cd5 9039
7aea43ff 9040#: builtin/remote.c:1518
ef317cd5 9041msgid "delete URLs"
07432cef 9042msgstr "删除 URLS"
ef317cd5 9043
7aea43ff 9044#: builtin/remote.c:1525
8ada9598 9045msgid "--add --delete doesn't make sense"
81809b99 9046msgstr "--add --delete 无意义"
8ada9598 9047
7aea43ff 9048#: builtin/remote.c:1565
81809b99 9049#, c-format
8ada9598 9050msgid "Invalid old URL pattern: %s"
4375c10e 9051msgstr "无效的旧 URL 匹配模版:%s"
8ada9598 9052
7aea43ff 9053#: builtin/remote.c:1573
81809b99 9054#, c-format
8ada9598 9055msgid "No such URL found: %s"
4375c10e 9056msgstr "未找到此 URL:%s"
8ada9598 9057
7aea43ff 9058#: builtin/remote.c:1575
8ada9598 9059msgid "Will not delete all non-push URLs"
4375c10e 9060msgstr "将不会删除所有非推送 URL 地址"
8ada9598 9061
7aea43ff 9062#: builtin/remote.c:1589
ef317cd5 9063msgid "be verbose; must be placed before a subcommand"
07432cef 9064msgstr "冗长输出;必须置于子命令之前"
ef317cd5 9065
6acbf033 9066#: builtin/repack.c:17
814ff314
JX
9067msgid "git repack [<options>]"
9068msgstr "git repack [<选项>]"
90314792 9069
04cb2f28 9070#: builtin/repack.c:159
90314792
JX
9071msgid "pack everything in a single pack"
9072msgstr "所有内容打包到一个包文件中"
9073
04cb2f28 9074#: builtin/repack.c:161
90314792
JX
9075msgid "same as -a, and turn unreachable objects loose"
9076msgstr "和 -a 相同,并将不可达的对象设为松散对象"
9077
04cb2f28 9078#: builtin/repack.c:164
90314792
JX
9079msgid "remove redundant packs, and run git-prune-packed"
9080msgstr "删除多余的包,运行 git-prune-packed"
9081
04cb2f28 9082#: builtin/repack.c:166
90314792
JX
9083msgid "pass --no-reuse-delta to git-pack-objects"
9084msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9085
04cb2f28 9086#: builtin/repack.c:168
90314792
JX
9087msgid "pass --no-reuse-object to git-pack-objects"
9088msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9089
04cb2f28 9090#: builtin/repack.c:170
90314792
JX
9091msgid "do not run git-update-server-info"
9092msgstr "不运行 git-update-server-info"
9093
04cb2f28 9094#: builtin/repack.c:173
90314792
JX
9095msgid "pass --local to git-pack-objects"
9096msgstr "向 git-pack-objects 传递参数 --local"
9097
04cb2f28 9098#: builtin/repack.c:175
6c94aba5
JX
9099msgid "write bitmap index"
9100msgstr "写 bitmap 索引"
9101
04cb2f28 9102#: builtin/repack.c:176
90314792
JX
9103msgid "approxidate"
9104msgstr "近似日期"
9105
04cb2f28 9106#: builtin/repack.c:177
90314792
JX
9107msgid "with -A, do not loosen objects older than this"
9108msgstr "使用 -A,不要将早于给定时间的对象过期"
9109
04cb2f28 9110#: builtin/repack.c:179
90314792
JX
9111msgid "size of the window used for delta compression"
9112msgstr "用于增量压缩的窗口值"
9113
04cb2f28 9114#: builtin/repack.c:180 builtin/repack.c:184
8376b58d
JX
9115msgid "bytes"
9116msgstr "字节"
9117
04cb2f28 9118#: builtin/repack.c:181
90314792
JX
9119msgid "same as the above, but limit memory size instead of entries count"
9120msgstr "和上面的相似,但限制内存大小而非条目数"
9121
04cb2f28 9122#: builtin/repack.c:183
90314792
JX
9123msgid "limits the maximum delta depth"
9124msgstr "限制最大增量深度"
9125
04cb2f28 9126#: builtin/repack.c:185
90314792 9127msgid "maximum size of each packfile"
dbd6cced 9128msgstr "每个包文件的最大尺寸"
90314792 9129
04cb2f28 9130#: builtin/repack.c:187
6c94aba5
JX
9131msgid "repack objects in packs marked with .keep"
9132msgstr "对标记为 .keep 的包中的对象重新打包"
9133
7aea43ff 9134#: builtin/repack.c:377
90314792
JX
9135#, c-format
9136msgid "removing '%s' failed"
9137msgstr "删除 '%s' 失败"
9138
6acbf033 9139#: builtin/replace.c:19
ef317cd5 9140msgid "git replace [-f] <object> <replacement>"
07432cef 9141msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 9142
6acbf033
JX
9143#: builtin/replace.c:20
9144msgid "git replace [-f] --edit <object>"
9145msgstr "git replace [-f] --edit <对象>"
9146
9147#: builtin/replace.c:21
9148msgid "git replace [-f] --graft <commit> [<parent>...]"
9149msgstr "git replace [-f] --graft <提交> [<父提交>...]"
9150
9151#: builtin/replace.c:22
ef317cd5 9152msgid "git replace -d <object>..."
07432cef 9153msgstr "git replace -d <对象>..."
ef317cd5 9154
6acbf033 9155#: builtin/replace.c:23
cfff71a9
JX
9156msgid "git replace [--format=<format>] [-l [<pattern>]]"
9157msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 9158
220c313c 9159#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
6acbf033
JX
9160#, c-format
9161msgid "Not a valid object name: '%s'"
9162msgstr "不是一个有效的对象名:'%s'"
9163
220c313c 9164#: builtin/replace.c:355
6acbf033
JX
9165#, c-format
9166msgid "bad mergetag in commit '%s'"
55a16ee4 9167msgstr "提交 '%s' 中含有损坏的合并标签"
6acbf033 9168
220c313c 9169#: builtin/replace.c:357
6acbf033
JX
9170#, c-format
9171msgid "malformed mergetag in commit '%s'"
55a16ee4 9172msgstr "提交 '%s' 中含有非法的合并标签"
6acbf033 9173
220c313c 9174#: builtin/replace.c:368
6acbf033
JX
9175#, c-format
9176msgid ""
9177"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9178"instead of --graft"
55a16ee4 9179msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
6acbf033 9180
220c313c 9181#: builtin/replace.c:401
6acbf033
JX
9182#, c-format
9183msgid "the original commit '%s' has a gpg signature."
9184msgstr "原始提交 '%s' 中包含一个 GPG 签名"
9185
220c313c 9186#: builtin/replace.c:402
6acbf033
JX
9187msgid "the signature will be removed in the replacement commit!"
9188msgstr "在替换的提交中签名将被移除!"
9189
220c313c 9190#: builtin/replace.c:408
6acbf033
JX
9191#, c-format
9192msgid "could not write replacement commit for: '%s'"
9193msgstr "不能为 '%s' 写替换提交"
9194
220c313c 9195#: builtin/replace.c:432
ef317cd5 9196msgid "list replace refs"
07432cef 9197msgstr "列出替换的引用"
ef317cd5 9198
220c313c 9199#: builtin/replace.c:433
ef317cd5 9200msgid "delete replace refs"
07432cef 9201msgstr "删除替换的引用"
ef317cd5 9202
220c313c 9203#: builtin/replace.c:434
6acbf033
JX
9204msgid "edit existing object"
9205msgstr "编辑现存的对象"
9206
220c313c 9207#: builtin/replace.c:435
6acbf033
JX
9208msgid "change a commit's parents"
9209msgstr "修改一个提交的父提交"
9210
220c313c 9211#: builtin/replace.c:436
ef317cd5 9212msgid "replace the ref if it exists"
07432cef 9213msgstr "如果存在则替换引用"
ef317cd5 9214
220c313c 9215#: builtin/replace.c:437
6acbf033
JX
9216msgid "do not pretty-print contents for --edit"
9217msgstr "不要为 --edit 操作美观显示内容"
9218
220c313c 9219#: builtin/replace.c:438
cfff71a9
JX
9220msgid "use this format"
9221msgstr "使用此格式"
9222
90314792 9223#: builtin/rerere.c:12
814ff314
JX
9224msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9225msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 9226
90314792 9227#: builtin/rerere.c:57
ef317cd5 9228msgid "register clean resolutions in index"
07432cef 9229msgstr "在索引中注册干净的解决方案"
ef317cd5 9230
220c313c 9231#: builtin/reset.c:26
ef317cd5
JX
9232msgid ""
9233"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 9234msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 9235
220c313c 9236#: builtin/reset.c:27
07432cef
WS
9237msgid "git reset [-q] <tree-ish> [--] <paths>..."
9238msgstr "git reset [-q] <树或提交> [--] <路径>..."
ef317cd5 9239
220c313c 9240#: builtin/reset.c:28
07432cef
WS
9241msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9242msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 9243
220c313c 9244#: builtin/reset.c:34
c04f5ac3
JX
9245msgid "mixed"
9246msgstr "混杂"
9247
220c313c 9248#: builtin/reset.c:34
c04f5ac3
JX
9249msgid "soft"
9250msgstr "软性"
9251
220c313c 9252#: builtin/reset.c:34
c04f5ac3
JX
9253msgid "hard"
9254msgstr "硬性"
9255
220c313c 9256#: builtin/reset.c:34
8ada9598
JX
9257msgid "merge"
9258msgstr "合并"
9259
220c313c 9260#: builtin/reset.c:34
c04f5ac3
JX
9261msgid "keep"
9262msgstr "保持"
9263
220c313c 9264#: builtin/reset.c:74
c04f5ac3
JX
9265msgid "You do not have a valid HEAD."
9266msgstr "您没有一个有效的 HEAD。"
9267
220c313c 9268#: builtin/reset.c:76
c04f5ac3
JX
9269msgid "Failed to find tree of HEAD."
9270msgstr "无法找到 HEAD 指向的树。"
9271
220c313c 9272#: builtin/reset.c:82
c04f5ac3
JX
9273#, c-format
9274msgid "Failed to find tree of %s."
9275msgstr "无法找到 %s 指向的树。"
9276
220c313c 9277#: builtin/reset.c:100
c04f5ac3
JX
9278#, c-format
9279msgid "HEAD is now at %s"
9280msgstr "HEAD 现在位于 %s"
9281
90e6ef53 9282# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9283#: builtin/reset.c:183
c04f5ac3
JX
9284#, c-format
9285msgid "Cannot do a %s reset in the middle of a merge."
9286msgstr "在合并过程中不能做%s重置操作。"
9287
220c313c 9288#: builtin/reset.c:276
ef317cd5 9289msgid "be quiet, only report errors"
07432cef 9290msgstr "安静模式,只报告错误"
ef317cd5 9291
220c313c 9292#: builtin/reset.c:278
ef317cd5 9293msgid "reset HEAD and index"
07432cef 9294msgstr "重置 HEAD 和索引"
ef317cd5 9295
220c313c 9296#: builtin/reset.c:279
ef317cd5 9297msgid "reset only HEAD"
07432cef 9298msgstr "只重置 HEAD"
ef317cd5 9299
220c313c 9300#: builtin/reset.c:281 builtin/reset.c:283
ef317cd5 9301msgid "reset HEAD, index and working tree"
07432cef 9302msgstr "重置 HEAD、索引和工作区"
ef317cd5 9303
220c313c 9304#: builtin/reset.c:285
ef317cd5 9305msgid "reset HEAD but keep local changes"
07432cef 9306msgstr "重置 HEAD 但保存本地变更"
ef317cd5 9307
220c313c 9308#: builtin/reset.c:288
6c94aba5
JX
9309msgid "record only the fact that removed paths will be added later"
9310msgstr "将删除的路径标记为稍后添加"
9311
220c313c 9312#: builtin/reset.c:305
07432cef
WS
9313#, c-format
9314msgid "Failed to resolve '%s' as a valid revision."
9315msgstr "无法将 '%s' 解析为一个有效的版本。"
9316
220c313c 9317#: builtin/reset.c:308 builtin/reset.c:316
c04f5ac3
JX
9318#, c-format
9319msgid "Could not parse object '%s'."
9320msgstr "不能解析对象 '%s'。"
9321
220c313c 9322#: builtin/reset.c:313
07432cef
WS
9323#, c-format
9324msgid "Failed to resolve '%s' as a valid tree."
9325msgstr "无法将 '%s' 解析为一个有效的树对象。"
9326
220c313c 9327#: builtin/reset.c:322
c04f5ac3 9328msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 9329msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 9330
220c313c 9331#: builtin/reset.c:331
c04f5ac3 9332msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 9333msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 9334
90e6ef53 9335# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9336#: builtin/reset.c:333
c04f5ac3
JX
9337#, c-format
9338msgid "Cannot do %s reset with paths."
9339msgstr "不能带路径进行%s重置。"
9340
90e6ef53 9341# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9342#: builtin/reset.c:343
c04f5ac3
JX
9343#, c-format
9344msgid "%s reset is not allowed in a bare repository"
160fb2b2 9345msgstr "不能对纯仓库进行%s重置"
c04f5ac3 9346
220c313c 9347#: builtin/reset.c:347
6c94aba5
JX
9348msgid "-N can only be used with --mixed"
9349msgstr "-N 只能和 --mixed 同时使用"
9350
220c313c 9351#: builtin/reset.c:364
90314792 9352msgid "Unstaged changes after reset:"
160fb2b2 9353msgstr "重置后取消暂存的变更:"
90314792 9354
220c313c 9355#: builtin/reset.c:370
ef317cd5
JX
9356#, c-format
9357msgid "Could not reset index file to revision '%s'."
9358msgstr "不能重置索引文件至版本 '%s'。"
9359
220c313c 9360#: builtin/reset.c:374
07432cef
WS
9361msgid "Could not write new index file."
9362msgstr "不能写入新的索引文件。"
9363
220c313c 9364#: builtin/rev-parse.c:361
814ff314
JX
9365msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
9366msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 9367
220c313c 9368#: builtin/rev-parse.c:366
ef317cd5 9369msgid "keep the `--` passed as an arg"
07432cef 9370msgstr "保持 `--` 作为一个参数传递"
ef317cd5 9371
220c313c 9372#: builtin/rev-parse.c:368
ef317cd5 9373msgid "stop parsing after the first non-option argument"
07432cef 9374msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 9375
220c313c 9376#: builtin/rev-parse.c:371
cfff71a9
JX
9377msgid "output in stuck long form"
9378msgstr "以固定长格式输出"
9379
220c313c 9380#: builtin/rev-parse.c:499
ef317cd5 9381msgid ""
814ff314 9382"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 9383" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 9384" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
9385"\n"
9386"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9387msgstr ""
814ff314 9388"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 9389" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 9390" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
9391"\n"
9392"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5
JX
9393
9394#: builtin/revert.c:22
814ff314
JX
9395msgid "git revert [<options>] <commit-ish>..."
9396msgstr "git revert [<选项>] <提交号>..."
ef317cd5
JX
9397
9398#: builtin/revert.c:23
9399msgid "git revert <subcommand>"
07432cef 9400msgstr "git revert <子命令>"
ef317cd5
JX
9401
9402#: builtin/revert.c:28
814ff314
JX
9403msgid "git cherry-pick [<options>] <commit-ish>..."
9404msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5
JX
9405
9406#: builtin/revert.c:29
ef317cd5 9407msgid "git cherry-pick <subcommand>"
07432cef 9408msgstr "git cherry-pick <子命令>"
ef317cd5 9409
90314792 9410#: builtin/revert.c:71
ef317cd5
JX
9411#, c-format
9412msgid "%s: %s cannot be used with %s"
9413msgstr "%s:%s 不能和 %s 同时使用"
9414
90314792 9415#: builtin/revert.c:80
ef317cd5 9416msgid "end revert or cherry-pick sequence"
07432cef 9417msgstr "终止反转或拣选操作"
ef317cd5 9418
90314792 9419#: builtin/revert.c:81
ef317cd5 9420msgid "resume revert or cherry-pick sequence"
07432cef 9421msgstr "继续反转或拣选操作"
ef317cd5 9422
90314792 9423#: builtin/revert.c:82
ef317cd5 9424msgid "cancel revert or cherry-pick sequence"
07432cef 9425msgstr "取消反转或拣选操作"
ef317cd5 9426
90314792 9427#: builtin/revert.c:83
ef317cd5 9428msgid "don't automatically commit"
07432cef 9429msgstr "不要自动提交"
ef317cd5 9430
90314792 9431#: builtin/revert.c:84
ef317cd5 9432msgid "edit the commit message"
07432cef 9433msgstr "编辑提交说明"
ef317cd5 9434
90314792 9435#: builtin/revert.c:87
ef317cd5 9436msgid "parent number"
07432cef 9437msgstr "父编号"
ef317cd5 9438
90314792 9439#: builtin/revert.c:89
ef317cd5 9440msgid "merge strategy"
07432cef 9441msgstr "合并策略"
ef317cd5 9442
90314792 9443#: builtin/revert.c:90
ef317cd5 9444msgid "option"
07432cef 9445msgstr "选项"
ef317cd5 9446
90314792 9447#: builtin/revert.c:91
ef317cd5 9448msgid "option for merge strategy"
07432cef 9449msgstr "合并策略的选项"
ef317cd5 9450
6c94aba5 9451#: builtin/revert.c:104
ef317cd5 9452msgid "append commit name"
07432cef 9453msgstr "追加提交名称"
ef317cd5 9454
6c94aba5 9455#: builtin/revert.c:105
ef317cd5 9456msgid "allow fast-forward"
07432cef 9457msgstr "允许快进式"
c04f5ac3 9458
6c94aba5 9459#: builtin/revert.c:106
ef317cd5 9460msgid "preserve initially empty commits"
07432cef 9461msgstr "保留初始化的空提交"
ef317cd5 9462
6c94aba5 9463#: builtin/revert.c:107
ef317cd5 9464msgid "allow commits with empty messages"
07432cef 9465msgstr "允许提交说明为空"
c04f5ac3 9466
6c94aba5 9467#: builtin/revert.c:108
ef317cd5 9468msgid "keep redundant, empty commits"
07432cef 9469msgstr "保持多余的、空的提交"
ef317cd5 9470
6c94aba5 9471#: builtin/revert.c:112
c04f5ac3
JX
9472msgid "program error"
9473msgstr "程序错误"
9474
6c94aba5 9475#: builtin/revert.c:197
c04f5ac3
JX
9476msgid "revert failed"
9477msgstr "还原失败"
9478
6c94aba5 9479#: builtin/revert.c:212
c04f5ac3
JX
9480msgid "cherry-pick failed"
9481msgstr "拣选失败"
9482
90314792 9483#: builtin/rm.c:17
814ff314
JX
9484msgid "git rm [<options>] [--] <file>..."
9485msgstr "git rm [<选项>] [--] <文件>..."
07432cef 9486
90314792 9487#: builtin/rm.c:65
2e8451e8
JX
9488msgid ""
9489"the following submodule (or one of its nested submodules)\n"
9490"uses a .git directory:"
9491msgid_plural ""
220c313c 9492"the following submodules (or one of their nested submodules)\n"
2e8451e8 9493"use a .git directory:"
220c313c
JX
9494msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9495msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
2e8451e8 9496
90314792 9497#: builtin/rm.c:71
07432cef 9498msgid ""
2e8451e8 9499"\n"
07432cef
WS
9500"(use 'rm -rf' if you really want to remove it including all of its history)"
9501msgstr ""
2e8451e8 9502"\n"
07432cef 9503"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
ef317cd5 9504
7aea43ff 9505#: builtin/rm.c:230
c04f5ac3 9506msgid ""
2e8451e8
JX
9507"the following file has staged content different from both the\n"
9508"file and the HEAD:"
9509msgid_plural ""
9510"the following files have staged content different from both the\n"
9511"file and the HEAD:"
9512msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9513msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9514
7aea43ff 9515#: builtin/rm.c:235
2e8451e8
JX
9516msgid ""
9517"\n"
c04f5ac3
JX
9518"(use -f to force removal)"
9519msgstr ""
2e8451e8 9520"\n"
c04f5ac3
JX
9521"(使用 -f 强制删除)"
9522
7aea43ff 9523#: builtin/rm.c:239
2e8451e8
JX
9524msgid "the following file has changes staged in the index:"
9525msgid_plural "the following files have changes staged in the index:"
160fb2b2
JX
9526msgstr[0] "下列文件索引中有变更"
9527msgstr[1] "下列文件索引中有变更"
c04f5ac3 9528
7aea43ff 9529#: builtin/rm.c:243 builtin/rm.c:254
c04f5ac3 9530msgid ""
2e8451e8 9531"\n"
c04f5ac3
JX
9532"(use --cached to keep the file, or -f to force removal)"
9533msgstr ""
2e8451e8
JX
9534"\n"
9535"(使用 --cached 保留本地文件,或用 -f 强制删除)"
9536
7aea43ff 9537#: builtin/rm.c:251
2e8451e8
JX
9538msgid "the following file has local modifications:"
9539msgid_plural "the following files have local modifications:"
9540msgstr[0] "如下文件有本地修改:"
9541msgstr[1] "如下文件有本地修改:"
c04f5ac3 9542
7aea43ff 9543#: builtin/rm.c:269
ef317cd5 9544msgid "do not list removed files"
07432cef 9545msgstr "不列出删除的文件"
ef317cd5 9546
7aea43ff 9547#: builtin/rm.c:270
ef317cd5 9548msgid "only remove from the index"
07432cef 9549msgstr "只从索引区删除"
ef317cd5 9550
7aea43ff 9551#: builtin/rm.c:271
ef317cd5 9552msgid "override the up-to-date check"
07432cef 9553msgstr "忽略文件更新状态检查"
ef317cd5 9554
7aea43ff 9555#: builtin/rm.c:272
ef317cd5 9556msgid "allow recursive removal"
07432cef 9557msgstr "允许递归删除"
ef317cd5 9558
7aea43ff 9559#: builtin/rm.c:274
ef317cd5 9560msgid "exit with a zero status even if nothing matched"
07432cef 9561msgstr "即使没有匹配,也以零状态退出"
ef317cd5 9562
7aea43ff 9563#: builtin/rm.c:317
220c313c
JX
9564msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9565msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
9566
7aea43ff 9567#: builtin/rm.c:335
c04f5ac3
JX
9568#, c-format
9569msgid "not removing '%s' recursively without -r"
9570msgstr "未提供 -r 选项不会递归删除 '%s'"
9571
7aea43ff 9572#: builtin/rm.c:374
c04f5ac3
JX
9573#, c-format
9574msgid "git rm: unable to remove %s"
9575msgstr "git rm:不能删除 %s"
9576
ef317cd5 9577#: builtin/shortlog.c:13
814ff314 9578msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
4dcdc3d8 9579msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
ef317cd5 9580
4dcdc3d8 9581#: builtin/shortlog.c:131
c04f5ac3
JX
9582#, c-format
9583msgid "Missing author: %s"
9584msgstr "缺少作者:%s"
9585
90314792 9586#: builtin/shortlog.c:230
ef317cd5 9587msgid "sort output according to the number of commits per author"
07432cef 9588msgstr "根据每个作者的提交数量排序"
ef317cd5 9589
90314792 9590#: builtin/shortlog.c:232
ef317cd5 9591msgid "Suppress commit descriptions, only provides commit count"
07432cef 9592msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 9593
90314792 9594#: builtin/shortlog.c:234
ef317cd5 9595msgid "Show the email address of each author"
07432cef 9596msgstr "显示每个作者的电子邮件地址"
ef317cd5 9597
90314792 9598#: builtin/shortlog.c:235
ef317cd5 9599msgid "w[,i1[,i2]]"
07432cef 9600msgstr "w[,i1[,i2]]"
ef317cd5 9601
90314792 9602#: builtin/shortlog.c:236
ef317cd5 9603msgid "Linewrap output"
07432cef 9604msgstr "折行输出"
ef317cd5
JX
9605
9606#: builtin/show-branch.c:9
9607msgid ""
814ff314 9608"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
9609"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9610"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9611"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 9612msgstr ""
814ff314 9613"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
9614"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
9615"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9616"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 9617
d9d56b23 9618#: builtin/show-branch.c:13
814ff314
JX
9619msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
9620msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
ef317cd5 9621
7aea43ff 9622#: builtin/show-branch.c:659
ef317cd5 9623msgid "show remote-tracking and local branches"
07432cef 9624msgstr "显示远程跟踪的和本地的分支"
ef317cd5 9625
7aea43ff 9626#: builtin/show-branch.c:661
ef317cd5 9627msgid "show remote-tracking branches"
07432cef 9628msgstr "显示远程跟踪的分支"
ef317cd5 9629
7aea43ff 9630#: builtin/show-branch.c:663
ef317cd5 9631msgid "color '*!+-' corresponding to the branch"
07432cef 9632msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 9633
7aea43ff 9634#: builtin/show-branch.c:665
ef317cd5 9635msgid "show <n> more commits after the common ancestor"
07432cef 9636msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 9637
7aea43ff 9638#: builtin/show-branch.c:667
ef317cd5 9639msgid "synonym to more=-1"
07432cef 9640msgstr "和 more=-1 同义"
ef317cd5 9641
7aea43ff 9642#: builtin/show-branch.c:668
ef317cd5 9643msgid "suppress naming strings"
07432cef 9644msgstr "不显示字符串命名"
ef317cd5 9645
7aea43ff 9646#: builtin/show-branch.c:670
ef317cd5 9647msgid "include the current branch"
07432cef 9648msgstr "包括当前分支"
ef317cd5 9649
7aea43ff 9650#: builtin/show-branch.c:672
ef317cd5 9651msgid "name commits with their object names"
07432cef 9652msgstr "以对象名字命名提交"
ef317cd5 9653
7aea43ff 9654#: builtin/show-branch.c:674
ef317cd5 9655msgid "show possible merge bases"
07432cef 9656msgstr "显示可能合并的基线"
ef317cd5 9657
7aea43ff 9658#: builtin/show-branch.c:676
ef317cd5 9659msgid "show refs unreachable from any other ref"
07432cef 9660msgstr "显示没有任何引用的的引用"
ef317cd5 9661
7aea43ff 9662#: builtin/show-branch.c:678
ef317cd5 9663msgid "show commits in topological order"
07432cef 9664msgstr "以拓扑顺序显示提交"
ef317cd5 9665
7aea43ff 9666#: builtin/show-branch.c:681
ef317cd5 9667msgid "show only commits not on the first branch"
07432cef 9668msgstr "只显示不在第一个分支上的提交"
ef317cd5 9669
7aea43ff 9670#: builtin/show-branch.c:683
ef317cd5 9671msgid "show merges reachable from only one tip"
07432cef 9672msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 9673
7aea43ff 9674#: builtin/show-branch.c:685
2e8451e8
JX
9675msgid "topologically sort, maintaining date order where possible"
9676msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 9677
7aea43ff 9678#: builtin/show-branch.c:688
ef317cd5 9679msgid "<n>[,<base>]"
07432cef 9680msgstr "<n>[,<base>]"
ef317cd5 9681
7aea43ff 9682#: builtin/show-branch.c:689
ef317cd5 9683msgid "show <n> most recent ref-log entries starting at base"
07432cef 9684msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
ef317cd5
JX
9685
9686#: builtin/show-ref.c:10
9687msgid ""
814ff314
JX
9688"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9689"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 9690msgstr ""
814ff314
JX
9691"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9692"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5
JX
9693
9694#: builtin/show-ref.c:11
9695msgid "git show-ref --exclude-existing[=pattern] < ref-list"
07432cef 9696msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
ef317cd5 9697
7aea43ff 9698#: builtin/show-ref.c:170
ef317cd5 9699msgid "only show tags (can be combined with heads)"
55a16ee4 9700msgstr "只显示标签(可以和头共用)"
ef317cd5 9701
7aea43ff 9702#: builtin/show-ref.c:171
ef317cd5 9703msgid "only show heads (can be combined with tags)"
55a16ee4 9704msgstr "只显示头(可以和标签共用)"
ef317cd5 9705
7aea43ff 9706#: builtin/show-ref.c:172
ef317cd5 9707msgid "stricter reference checking, requires exact ref path"
07432cef 9708msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 9709
7aea43ff 9710#: builtin/show-ref.c:175 builtin/show-ref.c:177
2e8451e8
JX
9711msgid "show the HEAD reference, even if it would be filtered out"
9712msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 9713
7aea43ff 9714#: builtin/show-ref.c:179
ef317cd5 9715msgid "dereference tags into object IDs"
4375c10e 9716msgstr "转换标签到对象 ID"
ef317cd5 9717
7aea43ff 9718#: builtin/show-ref.c:181
ef317cd5 9719msgid "only show SHA1 hash using <n> digits"
07432cef 9720msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 9721
7aea43ff 9722#: builtin/show-ref.c:185
ef317cd5 9723msgid "do not print results to stdout (useful with --verify)"
07432cef 9724msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 9725
7aea43ff 9726#: builtin/show-ref.c:187
ef317cd5 9727msgid "show refs from stdin that aren't in local repository"
160fb2b2 9728msgstr "显示从标准输入中读入的不在本地仓库中的引用"
ef317cd5
JX
9729
9730#: builtin/symbolic-ref.c:7
814ff314
JX
9731msgid "git symbolic-ref [<options>] <name> [<ref>]"
9732msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef
WS
9733
9734#: builtin/symbolic-ref.c:8
814ff314
JX
9735msgid "git symbolic-ref -d [-q] <name>"
9736msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 9737
07432cef 9738#: builtin/symbolic-ref.c:40
ef317cd5 9739msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
9740msgstr "不显示非符号(分离的)引用的错误信息"
9741
9742#: builtin/symbolic-ref.c:41
9743msgid "delete symbolic ref"
9744msgstr "删除符号引用"
ef317cd5 9745
07432cef 9746#: builtin/symbolic-ref.c:42
ef317cd5 9747msgid "shorten ref output"
07432cef 9748msgstr "简短的引用输出"
ef317cd5 9749
04cb2f28 9750#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
ef317cd5 9751msgid "reason"
07432cef 9752msgstr "原因"
ef317cd5 9753
04cb2f28 9754#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
ef317cd5 9755msgid "reason of the update"
07432cef 9756msgstr "更新的原因"
ef317cd5
JX
9757
9758#: builtin/tag.c:22
9759msgid ""
814ff314
JX
9760"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
9761"[<head>]"
9762msgstr ""
9763"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
ef317cd5
JX
9764
9765#: builtin/tag.c:23
9766msgid "git tag -d <tagname>..."
07432cef 9767msgstr "git tag -d <标签名>..."
ef317cd5
JX
9768
9769#: builtin/tag.c:24
9770msgid ""
814ff314 9771"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
ef317cd5
JX
9772"\t\t[<pattern>...]"
9773msgstr ""
814ff314 9774"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]"
ef317cd5
JX
9775
9776#: builtin/tag.c:26
9777msgid "git tag -v <tagname>..."
07432cef 9778msgstr "git tag -v <标签名>..."
ef317cd5 9779
6acbf033 9780#: builtin/tag.c:69
7ac1c0ad
JX
9781#, c-format
9782msgid "malformed object at '%s'"
9783msgstr "非法的对象于 '%s'"
9784
6acbf033 9785#: builtin/tag.c:301
c04f5ac3
JX
9786#, c-format
9787msgid "tag name too long: %.*s..."
55a16ee4 9788msgstr "标签名称太长:%.*s..."
c04f5ac3 9789
6acbf033 9790#: builtin/tag.c:306
c04f5ac3
JX
9791#, c-format
9792msgid "tag '%s' not found."
55a16ee4 9793msgstr "未发现标签 '%s'。"
c04f5ac3 9794
6acbf033 9795#: builtin/tag.c:321
c04f5ac3
JX
9796#, c-format
9797msgid "Deleted tag '%s' (was %s)\n"
55a16ee4 9798msgstr "已删除标签 '%s'(曾为 %s)\n"
c04f5ac3 9799
6acbf033 9800#: builtin/tag.c:333
c04f5ac3
JX
9801#, c-format
9802msgid "could not verify the tag '%s'"
55a16ee4 9803msgstr "不能校验该标签 '%s'"
c04f5ac3 9804
6acbf033 9805#: builtin/tag.c:343
a77c07d9 9806#, c-format
c04f5ac3
JX
9807msgid ""
9808"\n"
6acbf033
JX
9809"Write a message for tag:\n"
9810" %s\n"
a77c07d9 9811"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
9812msgstr ""
9813"\n"
55a16ee4 9814"输入一个标签说明:\n"
6acbf033 9815" %s\n"
a77c07d9 9816"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 9817
6acbf033 9818#: builtin/tag.c:347
a77c07d9 9819#, c-format
c04f5ac3
JX
9820msgid ""
9821"\n"
6acbf033
JX
9822"Write a message for tag:\n"
9823" %s\n"
a77c07d9 9824"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 9825"want to.\n"
c04f5ac3
JX
9826msgstr ""
9827"\n"
55a16ee4 9828"输入一个标签说明:\n"
6acbf033 9829" %s\n"
a77c07d9 9830"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 9831
6acbf033
JX
9832#: builtin/tag.c:371
9833#, c-format
9834msgid "unsupported sort specification '%s'"
9835msgstr "不支持的排序规格 '%s'"
9836
9837#: builtin/tag.c:373
9838#, c-format
9839msgid "unsupported sort specification '%s' in variable '%s'"
9840msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9841
9842#: builtin/tag.c:428
c04f5ac3 9843msgid "unable to sign the tag"
55a16ee4 9844msgstr "无法签署标签"
c04f5ac3 9845
6acbf033 9846#: builtin/tag.c:430
c04f5ac3 9847msgid "unable to write tag file"
55a16ee4 9848msgstr "无法写标签文件"
c04f5ac3 9849
6acbf033 9850#: builtin/tag.c:455
c04f5ac3 9851msgid "bad object type."
90e6ef53 9852msgstr "坏的对象类型。"
c04f5ac3 9853
6acbf033 9854#: builtin/tag.c:468
c04f5ac3 9855msgid "tag header too big."
55a16ee4 9856msgstr "标签头信息太大。"
c04f5ac3 9857
6acbf033 9858#: builtin/tag.c:504
c04f5ac3 9859msgid "no tag message?"
55a16ee4 9860msgstr "无标签说明?"
c04f5ac3 9861
6acbf033 9862#: builtin/tag.c:510
c04f5ac3
JX
9863#, c-format
9864msgid "The tag message has been left in %s\n"
55a16ee4 9865msgstr "标签说明被保留在 %s\n"
c04f5ac3 9866
6acbf033 9867#: builtin/tag.c:559
7ac1c0ad
JX
9868msgid "switch 'points-at' requires an object"
9869msgstr "开关 'points-at' 需要一个对象"
9870
6acbf033 9871#: builtin/tag.c:561
7ac1c0ad
JX
9872#, c-format
9873msgid "malformed object name '%s'"
9874msgstr "非法的对象名 '%s'"
9875
220c313c 9876#: builtin/tag.c:589
ef317cd5 9877msgid "list tag names"
55a16ee4 9878msgstr "列出标签名称"
ef317cd5 9879
220c313c 9880#: builtin/tag.c:591
ef317cd5 9881msgid "print <n> lines of each tag message"
55a16ee4 9882msgstr "每个标签信息打印 <n> 行"
ef317cd5 9883
220c313c 9884#: builtin/tag.c:593
ef317cd5 9885msgid "delete tags"
55a16ee4 9886msgstr "删除标签"
ef317cd5 9887
220c313c 9888#: builtin/tag.c:594
ef317cd5 9889msgid "verify tags"
55a16ee4 9890msgstr "验证标签"
ef317cd5 9891
220c313c 9892#: builtin/tag.c:596
ef317cd5 9893msgid "Tag creation options"
55a16ee4 9894msgstr "标签创建选项"
ef317cd5 9895
220c313c 9896#: builtin/tag.c:598
ef317cd5 9897msgid "annotated tag, needs a message"
55a16ee4 9898msgstr "附注标签,需要一个说明"
ef317cd5 9899
220c313c 9900#: builtin/tag.c:600
ef317cd5 9901msgid "tag message"
55a16ee4 9902msgstr "标签说明"
ef317cd5 9903
220c313c 9904#: builtin/tag.c:602
ef317cd5 9905msgid "annotated and GPG-signed tag"
55a16ee4 9906msgstr "附注并附加 GPG 签名的标签"
ef317cd5 9907
220c313c 9908#: builtin/tag.c:606
ef317cd5 9909msgid "use another key to sign the tag"
55a16ee4 9910msgstr "使用另外的私钥签名该标签"
ef317cd5 9911
220c313c 9912#: builtin/tag.c:607
ef317cd5 9913msgid "replace the tag if exists"
55a16ee4 9914msgstr "如果存在,替换现有的标签"
ef317cd5 9915
814ff314
JX
9916#: builtin/tag.c:609
9917msgid "Tag listing options"
55a16ee4 9918msgstr "标签列表选项"
814ff314
JX
9919
9920#: builtin/tag.c:610
ef317cd5 9921msgid "show tag list in columns"
55a16ee4 9922msgstr "以列的方式显示标签列表"
ef317cd5 9923
814ff314 9924#: builtin/tag.c:612
6c94aba5 9925msgid "sort tags"
55a16ee4 9926msgstr "排序标签"
6c94aba5 9927
220c313c 9928#: builtin/tag.c:617 builtin/tag.c:623
ef317cd5 9929msgid "print only tags that contain the commit"
55a16ee4 9930msgstr "只打印包含提交的标签"
ef317cd5 9931
220c313c 9932#: builtin/tag.c:629
ef317cd5 9933msgid "print only tags of the object"
55a16ee4 9934msgstr "只打印对象的标签"
ef317cd5 9935
220c313c 9936#: builtin/tag.c:655
8ada9598 9937msgid "--column and -n are incompatible"
81809b99 9938msgstr "--column 和 -n 不兼容"
8ada9598 9939
220c313c 9940#: builtin/tag.c:667
6c94aba5
JX
9941msgid "--sort and -n are incompatible"
9942msgstr "--sort 和 -n 不兼容"
9943
220c313c 9944#: builtin/tag.c:674
c04f5ac3 9945msgid "-n option is only allowed with -l."
649900bc 9946msgstr "-n 选项只允许和 -l 同时使用。"
c04f5ac3 9947
220c313c 9948#: builtin/tag.c:676
c04f5ac3 9949msgid "--contains option is only allowed with -l."
649900bc 9950msgstr "--contains 选项只允许和 -l 同时使用。"
c04f5ac3 9951
220c313c 9952#: builtin/tag.c:678
7ac1c0ad 9953msgid "--points-at option is only allowed with -l."
649900bc 9954msgstr "--points-at 选项只允许和 -l 同时使用。"
7ac1c0ad 9955
220c313c 9956#: builtin/tag.c:686
c04f5ac3
JX
9957msgid "only one -F or -m option is allowed."
9958msgstr "只允许一个 -F 或 -m 选项。"
9959
220c313c 9960#: builtin/tag.c:706
c04f5ac3
JX
9961msgid "too many params"
9962msgstr "太多参数"
9963
220c313c 9964#: builtin/tag.c:712
c04f5ac3
JX
9965#, c-format
9966msgid "'%s' is not a valid tag name."
55a16ee4 9967msgstr "'%s' 不是一个有效的标签名称。"
c04f5ac3 9968
220c313c 9969#: builtin/tag.c:717
c04f5ac3
JX
9970#, c-format
9971msgid "tag '%s' already exists"
55a16ee4 9972msgstr "标签 '%s' 已存在"
c04f5ac3 9973
220c313c 9974#: builtin/tag.c:741
c04f5ac3
JX
9975#, c-format
9976msgid "Updated tag '%s' (was %s)\n"
55a16ee4 9977msgstr "已更新标签 '%s'(曾为 %s)\n"
c04f5ac3 9978
220c313c 9979#: builtin/unpack-objects.c:489
6c94aba5
JX
9980msgid "Unpacking objects"
9981msgstr "展开对象中"
9982
7aea43ff
JX
9983#: builtin/update-index.c:70
9984#, c-format
9985msgid "failed to create directory %s"
9986msgstr "无法创建目录 %s"
9987
9988#: builtin/update-index.c:76
9989#, c-format
9990msgid "failed to stat %s"
9991msgstr "无法枚举 %s 状态"
9992
9993#: builtin/update-index.c:86
9994#, c-format
9995msgid "failed to create file %s"
9996msgstr "无法创建文件 %s"
9997
9998#: builtin/update-index.c:94
9999#, c-format
10000msgid "failed to delete file %s"
10001msgstr "无法删除文件 %s"
10002
10003#: builtin/update-index.c:101 builtin/update-index.c:203
10004#, c-format
10005msgid "failed to delete directory %s"
10006msgstr "无法删除目录 %s"
10007
10008#: builtin/update-index.c:124
10009#, c-format
10010msgid "Testing "
10011msgstr "正在测试 "
10012
10013#: builtin/update-index.c:136
10014msgid "directory stat info does not change after adding a new file"
10015msgstr "添加一个新文件后,目录的状态信息未改变"
10016
10017#: builtin/update-index.c:149
10018msgid "directory stat info does not change after adding a new directory"
10019msgstr "添加一个新目录后,目录的状态信息未改变"
10020
10021#: builtin/update-index.c:162
10022msgid "directory stat info changes after updating a file"
10023msgstr "更新一个文件后,目录的状态信息被修改"
10024
10025#: builtin/update-index.c:173
10026msgid "directory stat info changes after adding a file inside subdirectory"
10027msgstr "在子目录中添加文件后,目录的状态信息被修改"
10028
10029#: builtin/update-index.c:184
10030msgid "directory stat info does not change after deleting a file"
10031msgstr "删除一个文件后,目录的状态信息未改变"
10032
10033#: builtin/update-index.c:197
10034msgid "directory stat info does not change after deleting a directory"
10035msgstr "删除一个目录后,目录的状态信息未改变"
10036
10037#: builtin/update-index.c:204
10038msgid " OK"
10039msgstr " OK"
10040
10041#: builtin/update-index.c:564
814ff314
JX
10042msgid "git update-index [<options>] [--] [<file>...]"
10043msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 10044
7aea43ff 10045#: builtin/update-index.c:918
ef317cd5 10046msgid "continue refresh even when index needs update"
07432cef 10047msgstr "当索引需要更新时继续刷新"
8ada9598 10048
7aea43ff 10049#: builtin/update-index.c:921
ef317cd5 10050msgid "refresh: ignore submodules"
07432cef 10051msgstr "刷新:忽略子模组"
8ada9598 10052
7aea43ff 10053#: builtin/update-index.c:924
ef317cd5 10054msgid "do not ignore new files"
07432cef 10055msgstr "不忽略新的文件"
8ada9598 10056
7aea43ff 10057#: builtin/update-index.c:926
ef317cd5 10058msgid "let files replace directories and vice-versa"
07432cef 10059msgstr "让文件替换目录(反之亦然)"
ef317cd5 10060
7aea43ff 10061#: builtin/update-index.c:928
ef317cd5 10062msgid "notice files missing from worktree"
07432cef 10063msgstr "通知文件从工作区丢失"
ef317cd5 10064
7aea43ff 10065#: builtin/update-index.c:930
ef317cd5 10066msgid "refresh even if index contains unmerged entries"
07432cef 10067msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 10068
7aea43ff 10069#: builtin/update-index.c:933
ef317cd5 10070msgid "refresh stat information"
07432cef 10071msgstr "刷新统计信息"
ef317cd5 10072
7aea43ff 10073#: builtin/update-index.c:937
ef317cd5 10074msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 10075msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 10076
7aea43ff 10077#: builtin/update-index.c:941
6c94aba5 10078msgid "<mode>,<object>,<path>"
d9d56b23 10079msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 10080
7aea43ff 10081#: builtin/update-index.c:942
ef317cd5 10082msgid "add the specified entry to the index"
07432cef 10083msgstr "添加指定的条目到索引区"
ef317cd5 10084
7aea43ff 10085#: builtin/update-index.c:946
ef317cd5 10086msgid "(+/-)x"
07432cef 10087msgstr "(+/-)x"
ef317cd5 10088
7aea43ff 10089#: builtin/update-index.c:947
ef317cd5 10090msgid "override the executable bit of the listed files"
07432cef 10091msgstr "覆盖列表里文件的可执行位"
ef317cd5 10092
7aea43ff 10093#: builtin/update-index.c:951
ef317cd5 10094msgid "mark files as \"not changing\""
07432cef 10095msgstr "把文件标记为 \"没有变更\""
ef317cd5 10096
7aea43ff 10097#: builtin/update-index.c:954
ef317cd5 10098msgid "clear assumed-unchanged bit"
07432cef 10099msgstr "清除 assumed-unchanged 位"
ef317cd5 10100
7aea43ff 10101#: builtin/update-index.c:957
ef317cd5 10102msgid "mark files as \"index-only\""
07432cef 10103msgstr "把文件标记为 \"仅索引\""
ef317cd5 10104
7aea43ff 10105#: builtin/update-index.c:960
ef317cd5 10106msgid "clear skip-worktree bit"
07432cef 10107msgstr "清除 skip-worktree 位"
ef317cd5 10108
7aea43ff 10109#: builtin/update-index.c:963
ef317cd5 10110msgid "add to index only; do not add content to object database"
07432cef 10111msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 10112
7aea43ff 10113#: builtin/update-index.c:965
ef317cd5 10114msgid "remove named paths even if present in worktree"
07432cef 10115msgstr "即使存在工作区里,也删除路径"
ef317cd5 10116
7aea43ff 10117#: builtin/update-index.c:967
ef317cd5 10118msgid "with --stdin: input lines are terminated by null bytes"
07432cef 10119msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 10120
7aea43ff 10121#: builtin/update-index.c:969
ef317cd5 10122msgid "read list of paths to be updated from standard input"
07432cef 10123msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 10124
7aea43ff 10125#: builtin/update-index.c:973
ef317cd5 10126msgid "add entries from standard input to the index"
07432cef 10127msgstr "从标准输入添加条目到索引区"
ef317cd5 10128
7aea43ff 10129#: builtin/update-index.c:977
ef317cd5 10130msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 10131msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 10132
7aea43ff 10133#: builtin/update-index.c:981
ef317cd5 10134msgid "only update entries that differ from HEAD"
07432cef 10135msgstr "只更新与 HEAD 不同的条目"
ef317cd5 10136
7aea43ff 10137#: builtin/update-index.c:985
ef317cd5 10138msgid "ignore files missing from worktree"
07432cef 10139msgstr "忽略工作区丢失的文件"
ef317cd5 10140
7aea43ff 10141#: builtin/update-index.c:988
ef317cd5 10142msgid "report actions to standard output"
07432cef 10143msgstr "在标准输出显示操作"
ef317cd5 10144
7aea43ff 10145#: builtin/update-index.c:990
ef317cd5 10146msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 10147msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 10148
7aea43ff 10149#: builtin/update-index.c:994
ef317cd5 10150msgid "write index in this format"
07432cef 10151msgstr "以这种格式写入索引区"
ef317cd5 10152
7aea43ff 10153#: builtin/update-index.c:996
6acbf033
JX
10154msgid "enable or disable split index"
10155msgstr "启用或禁用索引拆分"
10156
7aea43ff
JX
10157#: builtin/update-index.c:998
10158msgid "enable/disable untracked cache"
10159msgstr "启用/禁用对未跟踪文件的缓存"
10160
10161#: builtin/update-index.c:1000
10162msgid "enable untracked cache without testing the filesystem"
10163msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
10164
90314792 10165#: builtin/update-ref.c:9
814ff314
JX
10166msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10167msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 10168
90314792 10169#: builtin/update-ref.c:10
814ff314
JX
10170msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
10171msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792
JX
10172
10173#: builtin/update-ref.c:11
814ff314
JX
10174msgid "git update-ref [<options>] --stdin [-z]"
10175msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 10176
04cb2f28 10177#: builtin/update-ref.c:359
ef317cd5 10178msgid "delete the reference"
07432cef 10179msgstr "删除引用"
ef317cd5 10180
04cb2f28 10181#: builtin/update-ref.c:361
ef317cd5 10182msgid "update <refname> not the one it points to"
07432cef 10183msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 10184
04cb2f28 10185#: builtin/update-ref.c:362
90314792
JX
10186msgid "stdin has NUL-terminated arguments"
10187msgstr "标准输入有以 NUL 字符终止的参数"
10188
04cb2f28 10189#: builtin/update-ref.c:363
90314792
JX
10190msgid "read updates from stdin"
10191msgstr "从标准输入读取更新"
10192
ef317cd5
JX
10193#: builtin/update-server-info.c:6
10194msgid "git update-server-info [--force]"
07432cef 10195msgstr "git update-server-info [--force]"
ef317cd5
JX
10196
10197#: builtin/update-server-info.c:14
10198msgid "update the info files from scratch"
07432cef 10199msgstr "从头开始更新文件信息"
ef317cd5 10200
6acbf033 10201#: builtin/verify-commit.c:17
814ff314
JX
10202msgid "git verify-commit [-v | --verbose] <commit>..."
10203msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033
JX
10204
10205#: builtin/verify-commit.c:75
10206msgid "print commit contents"
10207msgstr "打印提交内容"
10208
220c313c 10209#: builtin/verify-pack.c:54
814ff314
JX
10210msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10211msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 10212
220c313c 10213#: builtin/verify-pack.c:64
ef317cd5
JX
10214msgid "verbose"
10215msgstr "冗长输出"
10216
220c313c 10217#: builtin/verify-pack.c:66
ef317cd5 10218msgid "show statistics only"
07432cef 10219msgstr "只显示统计"
ef317cd5
JX
10220
10221#: builtin/verify-tag.c:17
814ff314
JX
10222msgid "git verify-tag [-v | --verbose] <tag>..."
10223msgstr "git verify-tag [-v | --verbose] <标签>..."
ef317cd5
JX
10224
10225#: builtin/verify-tag.c:73
10226msgid "print tag contents"
55a16ee4 10227msgstr "打印标签内容"
ef317cd5 10228
5bb01d4f
JX
10229#: builtin/worktree.c:11
10230msgid "git worktree add [<options>] <path> <branch>"
10231msgstr "git worktree add [<选项>] <路径> <分支>"
10232
10233#: builtin/worktree.c:12
10234msgid "git worktree prune [<options>]"
10235msgstr "git worktree prune [<选项>]"
10236
10237#: builtin/worktree.c:27
10238#, c-format
10239msgid "Removing worktrees/%s: not a valid directory"
10240msgstr "删除工作区/%s:不是一个有效的目录"
10241
10242#: builtin/worktree.c:33
10243#, c-format
10244msgid "Removing worktrees/%s: gitdir file does not exist"
10245msgstr "删除 worktrees/%s:gitdir 文件不存在"
10246
10247#: builtin/worktree.c:38
10248#, c-format
10249msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
10250msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
10251
10252#: builtin/worktree.c:49
10253#, c-format
10254msgid "Removing worktrees/%s: invalid gitdir file"
10255msgstr "删除 worktrees/%s:无效的 gitdir 文件"
10256
10257#: builtin/worktree.c:65
10258#, c-format
10259msgid "Removing worktrees/%s: gitdir file points to non-existent location"
10260msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
10261
10262#: builtin/worktree.c:100
10263#, c-format
10264msgid "failed to remove: %s"
10265msgstr "无法删除:%s"
10266
10267#: builtin/worktree.c:186
10268#, c-format
10269msgid "'%s' already exists"
10270msgstr "'%s' 已经存在"
10271
10272#: builtin/worktree.c:207
10273#, c-format
10274msgid "could not create directory of '%s'"
10275msgstr "不能创建目录 '%s'"
10276
10277#: builtin/worktree.c:241
10278msgid "unable to resolve HEAD"
10279msgstr "不能解析 HEAD"
10280
10281#: builtin/worktree.c:249
10282#, c-format
10283msgid "Enter %s (identifier %s)"
10284msgstr "输入 %s (标识符 %s)"
10285
10286#: builtin/worktree.c:281
10287msgid "checkout <branch> even if already checked out in other worktree"
10288msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
10289
10290#: builtin/worktree.c:283
10291msgid "create a new branch"
10292msgstr "创建一个新分支"
10293
10294#: builtin/worktree.c:285
10295msgid "create or reset a branch"
10296msgstr "创建或重置一个分支"
10297
10298#: builtin/worktree.c:286
10299msgid "detach HEAD at named commit"
10300msgstr "HEAD 从指定的提交分离"
10301
10302#: builtin/worktree.c:292
10303msgid "-b and -B are mutually exclusive"
10304msgstr "-b 和 -B 互斥"
10305
ef317cd5
JX
10306#: builtin/write-tree.c:13
10307msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 10308msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5
JX
10309
10310#: builtin/write-tree.c:26
10311msgid "<prefix>/"
07432cef 10312msgstr "<前缀>/"
ef317cd5
JX
10313
10314#: builtin/write-tree.c:27
10315msgid "write tree object for a subdirectory <prefix>"
07432cef 10316msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5
JX
10317
10318#: builtin/write-tree.c:30
10319msgid "only useful for debugging"
07432cef 10320msgstr "只对调试有用"
ef317cd5 10321
220c313c
JX
10322#: credential-cache--daemon.c:267
10323msgid "print debugging messages to stderr"
10324msgstr "调试信息输出到标准错误"
10325
d9d56b23 10326#: git.c:14
4dcdc3d8 10327msgid ""
220c313c 10328"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8
JX
10329"concept guides. See 'git help <command>' or 'git help <concept>'\n"
10330"to read about a specific subcommand or concept."
10331msgstr ""
220c313c
JX
10332"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
10333"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
10334"帮助。"
8ada9598 10335
7aea43ff
JX
10336#: common-cmds.h:10
10337msgid "start a working area (see also: git help tutorial)"
10338msgstr "开始一个工作区(参见:git help tutorial)"
10339
10340#: common-cmds.h:11
10341msgid "work on the current change (see also: git help everyday)"
10342msgstr "在当前变更上工作(参见:git help everyday)"
10343
10344#: common-cmds.h:12
10345msgid "examine the history and state (see also: git help revisions)"
10346msgstr "检查历史和状态(参见:git help revisions)"
10347
10348#: common-cmds.h:13
10349msgid "grow, mark and tweak your common history"
10350msgstr "扩展、标记和调校您的历史记录"
10351
10352#: common-cmds.h:14
10353msgid "collaborate (see also: git help workflows)"
10354msgstr "协同(参见:git help workflows)"
10355
10356#: common-cmds.h:18
8ada9598 10357msgid "Add file contents to the index"
81809b99 10358msgstr "添加文件内容至索引"
8ada9598 10359
7aea43ff 10360#: common-cmds.h:19
8ada9598 10361msgid "Find by binary search the change that introduced a bug"
81809b99 10362msgstr "通过二分查找定位引入 bug 的变更"
8ada9598 10363
7aea43ff 10364#: common-cmds.h:20
8ada9598 10365msgid "List, create, or delete branches"
81809b99 10366msgstr "列出、创建或删除分支"
8ada9598 10367
7aea43ff 10368#: common-cmds.h:21
5bb01d4f
JX
10369msgid "Switch branches or restore working tree files"
10370msgstr "切换分支或恢复工作区文件"
8ada9598 10371
7aea43ff 10372#: common-cmds.h:22
8ada9598 10373msgid "Clone a repository into a new directory"
160fb2b2 10374msgstr "克隆一个仓库到一个新目录"
8ada9598 10375
7aea43ff 10376#: common-cmds.h:23
8ada9598 10377msgid "Record changes to the repository"
160fb2b2 10378msgstr "记录变更到仓库"
8ada9598 10379
7aea43ff 10380#: common-cmds.h:24
8ada9598 10381msgid "Show changes between commits, commit and working tree, etc"
81809b99 10382msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 10383
7aea43ff 10384#: common-cmds.h:25
8ada9598 10385msgid "Download objects and refs from another repository"
160fb2b2 10386msgstr "从另外一个仓库下载对象和引用"
8ada9598 10387
7aea43ff 10388#: common-cmds.h:26
8ada9598 10389msgid "Print lines matching a pattern"
81809b99 10390msgstr "输出和模式匹配的行"
8ada9598 10391
7aea43ff 10392#: common-cmds.h:27
a77c07d9 10393msgid "Create an empty Git repository or reinitialize an existing one"
160fb2b2 10394msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
8ada9598 10395
7aea43ff 10396#: common-cmds.h:28
8ada9598 10397msgid "Show commit logs"
81809b99 10398msgstr "显示提交日志"
8ada9598 10399
7aea43ff 10400#: common-cmds.h:29
8ada9598 10401msgid "Join two or more development histories together"
81809b99 10402msgstr "合并两个或更多开发历史"
8ada9598 10403
7aea43ff 10404#: common-cmds.h:30
8ada9598 10405msgid "Move or rename a file, a directory, or a symlink"
81809b99 10406msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 10407
7aea43ff 10408#: common-cmds.h:31
2e8451e8 10409msgid "Fetch from and integrate with another repository or a local branch"
160fb2b2 10410msgstr "获取并整合另外的仓库或一个本地分支"
8ada9598 10411
7aea43ff 10412#: common-cmds.h:32
8ada9598 10413msgid "Update remote refs along with associated objects"
81809b99 10414msgstr "更新远程引用和相关的对象"
8ada9598 10415
7aea43ff 10416#: common-cmds.h:33
8ada9598 10417msgid "Forward-port local commits to the updated upstream head"
81809b99 10418msgstr "本地提交转移至更新后的上游分支中"
8ada9598 10419
7aea43ff 10420#: common-cmds.h:34
8ada9598 10421msgid "Reset current HEAD to the specified state"
4375c10e 10422msgstr "重置当前 HEAD 到指定状态"
8ada9598 10423
7aea43ff 10424#: common-cmds.h:35
8ada9598 10425msgid "Remove files from the working tree and from the index"
81809b99 10426msgstr "从工作区和索引中删除文件"
8ada9598 10427
7aea43ff 10428#: common-cmds.h:36
8ada9598 10429msgid "Show various types of objects"
81809b99 10430msgstr "显示各种类型的对象"
8ada9598 10431
7aea43ff 10432#: common-cmds.h:37
8ada9598 10433msgid "Show the working tree status"
81809b99 10434msgstr "显示工作区状态"
8ada9598 10435
7aea43ff 10436#: common-cmds.h:38
8ada9598 10437msgid "Create, list, delete or verify a tag object signed with GPG"
4375c10e 10438msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
8ada9598 10439
7aea43ff 10440#: parse-options.h:142
220c313c
JX
10441msgid "expiry-date"
10442msgstr "到期时间"
10443
7aea43ff 10444#: parse-options.h:157
220c313c
JX
10445msgid "no-op (backward compatibility)"
10446msgstr "空操作(向后兼容)"
10447
7aea43ff 10448#: parse-options.h:231
220c313c
JX
10449msgid "be more verbose"
10450msgstr "更加详细"
10451
7aea43ff 10452#: parse-options.h:233
220c313c
JX
10453msgid "be more quiet"
10454msgstr "更加安静"
10455
7aea43ff 10456#: parse-options.h:239
220c313c
JX
10457msgid "use <n> digits to display SHA-1s"
10458msgstr "用 <n> 位数字显示 SHA-1 哈希值"
10459
10460#: rerere.h:27
10461msgid "update the index with reused conflict resolution if possible"
10462msgstr "如果可能,重用冲突解决更新索引"
10463
04cb2f28 10464#: git-am.sh:53
c04f5ac3
JX
10465msgid "You need to set your committer info first"
10466msgstr "您需要先设置你的提交者信息"
10467
7aea43ff 10468#: git-am.sh:100
b694fbb1
JX
10469msgid ""
10470"You seem to have moved HEAD since the last 'am' failure.\n"
10471"Not rewinding to ORIG_HEAD"
6792b93b 10472msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
b694fbb1 10473
7aea43ff 10474#: git-am.sh:110
b694fbb1
JX
10475#, sh-format
10476msgid ""
2e8451e8 10477"When you have resolved this problem, run \"$cmdline --continue\".\n"
649900bc
JX
10478"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
10479"To restore the original branch and stop patching, run \"$cmdline --abort\"."
b694fbb1 10480msgstr ""
2e8451e8 10481"当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
b694fbb1
JX
10482"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
10483"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10484
7aea43ff 10485#: git-am.sh:126
b694fbb1 10486msgid "Cannot fall back to three-way merge."
160fb2b2 10487msgstr "无法求助于三方合并。"
b694fbb1 10488
7aea43ff 10489#: git-am.sh:142
c04f5ac3 10490msgid "Repository lacks necessary blobs to fall back on 3-way merge."
160fb2b2 10491msgstr "仓库缺乏必要的数据对象以进行三方合并。"
649900bc 10492
7aea43ff 10493#: git-am.sh:144
649900bc 10494msgid "Using index info to reconstruct a base tree..."
160fb2b2 10495msgstr "使用索引来重建一个(三方合并的)基础目录树..."
c04f5ac3 10496
7aea43ff 10497#: git-am.sh:159
c04f5ac3
JX
10498msgid ""
10499"Did you hand edit your patch?\n"
10500"It does not apply to blobs recorded in its index."
10501msgstr ""
10502"您是否曾手动编辑过您的补丁?\n"
160fb2b2 10503"无法应用补丁到索引中的数据对象上。"
c04f5ac3 10504
7aea43ff 10505#: git-am.sh:168
c04f5ac3 10506msgid "Falling back to patching base and 3-way merge..."
160fb2b2 10507msgstr "转而在基础版本上打补丁及进行三方合并..."
c04f5ac3 10508
7aea43ff 10509#: git-am.sh:185
649900bc
JX
10510msgid "Failed to merge in the changes."
10511msgstr "无法合并变更。"
10512
7aea43ff 10513#: git-am.sh:280
c04f5ac3
JX
10514msgid "Only one StGIT patch series can be applied at once"
10515msgstr "一次只能有一个 StGIT 补丁队列被应用"
10516
7aea43ff 10517#: git-am.sh:367
c04f5ac3
JX
10518#, sh-format
10519msgid "Patch format $patch_format is not supported."
10520msgstr "不支持 $patch_format 补丁格式。"
10521
7aea43ff 10522#: git-am.sh:369
c04f5ac3
JX
10523msgid "Patch format detection failed."
10524msgstr "补丁格式检测失败。"
10525
7aea43ff 10526#: git-am.sh:407
649900bc
JX
10527msgid ""
10528"The -b/--binary option has been a no-op for long time, and\n"
10529"it will be removed. Please do not use it anymore."
10530msgstr ""
10531"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
10532"请不要再使用它了。"
c04f5ac3 10533
7aea43ff 10534#: git-am.sh:507
c04f5ac3
JX
10535#, sh-format
10536msgid "previous rebase directory $dotest still exists but mbox given."
2e8451e8 10537msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
c04f5ac3 10538
7aea43ff 10539#: git-am.sh:512
c04f5ac3
JX
10540msgid "Please make up your mind. --skip or --abort?"
10541msgstr "请下决心。--skip 或是 --abort ?"
10542
7aea43ff 10543#: git-am.sh:560
2e8451e8
JX
10544#, sh-format
10545msgid ""
10546"Stray $dotest directory found.\n"
10547"Use \"git am --abort\" to remove it."
10548msgstr ""
10549"发现了错误的 $dotest 目录。\n"
10550"使用 \"git am --abort\" 删除它。"
10551
7aea43ff 10552#: git-am.sh:568
c04f5ac3
JX
10553msgid "Resolve operation not in progress, we are not resuming."
10554msgstr "解决操作未进行,我们不会继续。"
10555
7aea43ff 10556#: git-am.sh:635
c04f5ac3
JX
10557#, sh-format
10558msgid "Dirty index: cannot apply patches (dirty: $files)"
160fb2b2 10559msgstr "脏索引:不能应用补丁(脏文件:$files)"
c04f5ac3 10560
7aea43ff 10561#: git-am.sh:747
b694fbb1
JX
10562#, sh-format
10563msgid ""
10564"Patch is empty. Was it split wrong?\n"
10565"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
10566"To restore the original branch and stop patching run \"$cmdline --abort\"."
10567msgstr ""
10568"补丁为空。是不是切分错误?\n"
10569"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
10570"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10571
7aea43ff 10572#: git-am.sh:774
b694fbb1
JX
10573msgid "Patch does not have a valid e-mail address."
10574msgstr "补丁中没有一个有效的邮件地址。"
10575
7aea43ff 10576#: git-am.sh:821
c04f5ac3 10577msgid "cannot be interactive without stdin connected to a terminal."
90e6ef53 10578msgstr "标准输入没有和终端关联,不能进行交互式操作。"
c04f5ac3 10579
7aea43ff 10580#: git-am.sh:825
b694fbb1
JX
10581msgid "Commit Body is:"
10582msgstr "提交内容为:"
10583
90e6ef53 10584# 译者:注意保持句尾空格
c04f5ac3
JX
10585#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
10586#. in your translation. The program will only accept English
10587#. input at this point.
7aea43ff 10588#: git-am.sh:832
c04f5ac3
JX
10589msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10590msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10591
7aea43ff 10592#: git-am.sh:868
c04f5ac3
JX
10593#, sh-format
10594msgid "Applying: $FIRSTLINE"
10595msgstr "正应用:$FIRSTLINE"
10596
7aea43ff 10597#: git-am.sh:889
b694fbb1
JX
10598msgid ""
10599"No changes - did you forget to use 'git add'?\n"
10600"If there is nothing left to stage, chances are that something else\n"
10601"already introduced the same changes; you might want to skip this patch."
10602msgstr ""
10603"没有变更 —— 您是不是忘了执行 'git add'?\n"
10604"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
10605"您也许想要跳过这个补丁。"
10606
7aea43ff 10607#: git-am.sh:897
b694fbb1
JX
10608msgid ""
10609"You still have unmerged paths in your index\n"
10610"did you forget to use 'git add'?"
6792b93b 10611msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
b694fbb1 10612
7aea43ff 10613#: git-am.sh:913
c04f5ac3 10614msgid "No changes -- Patch already applied."
63af42fe 10615msgstr "没有变更 —— 补丁已经应用过。"
c04f5ac3 10616
7aea43ff 10617#: git-am.sh:923
b694fbb1
JX
10618#, sh-format
10619msgid "Patch failed at $msgnum $FIRSTLINE"
10620msgstr "补丁失败于 $msgnum $FIRSTLINE"
10621
7aea43ff 10622#: git-am.sh:926
ef317cd5
JX
10623#, sh-format
10624msgid ""
10625"The copy of the patch that failed is found in:\n"
10626" $dotest/patch"
10627msgstr ""
07432cef
WS
10628"失败的补丁文件副本位于:\n"
10629" $dotest/patch"
ef317cd5 10630
7aea43ff 10631#: git-am.sh:945
c04f5ac3
JX
10632msgid "applying to an empty history"
10633msgstr "正应用到一个空历史上"
10634
b694fbb1
JX
10635#: git-bisect.sh:48
10636msgid "You need to start by \"git bisect start\""
10637msgstr "您需要执行 \"git bisect start\" 来开始"
10638
90e6ef53 10639# 译者:注意保持句尾空格
c04f5ac3
JX
10640#. TRANSLATORS: Make sure to include [Y] and [n] in your
10641#. translation. The program will only accept English input
10642#. at this point.
10643#: git-bisect.sh:54
10644msgid "Do you want me to do it for you [Y/n]? "
10645msgstr "您想让我为您这样做么[Y/n]? "
10646
10647#: git-bisect.sh:95
10648#, sh-format
10649msgid "unrecognised option: '$arg'"
81809b99 10650msgstr "未能识别的选项:'$arg'"
c04f5ac3
JX
10651
10652#: git-bisect.sh:99
10653#, sh-format
10654msgid "'$arg' does not appear to be a valid revision"
10655msgstr "'$arg' 看起来不像是一个有效的版本"
10656
10657#: git-bisect.sh:117
10658msgid "Bad HEAD - I need a HEAD"
10659msgstr "坏的 HEAD - 我需要一个 HEAD"
10660
10661#: git-bisect.sh:130
10662#, sh-format
10663msgid ""
814ff314 10664"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
d9d56b23 10665msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
c04f5ac3
JX
10666
10667#: git-bisect.sh:140
cfff71a9
JX
10668msgid "won't bisect on cg-seek'ed tree"
10669msgstr "不会在做了 cg-seek 的树上做二分查找"
c04f5ac3
JX
10670
10671#: git-bisect.sh:144
10672msgid "Bad HEAD - strange symbolic ref"
90e6ef53 10673msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3
JX
10674
10675#: git-bisect.sh:189
10676#, sh-format
10677msgid "Bad bisect_write argument: $state"
90e6ef53 10678msgstr "坏的 bisect_write 参数:$state"
c04f5ac3
JX
10679
10680#: git-bisect.sh:218
10681#, sh-format
10682msgid "Bad rev input: $arg"
90e6ef53 10683msgstr "输入坏的版本:$arg"
c04f5ac3
JX
10684
10685#: git-bisect.sh:232
10686msgid "Please call 'bisect_state' with at least one argument."
10687msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
10688
10689#: git-bisect.sh:244
10690#, sh-format
10691msgid "Bad rev input: $rev"
10692msgstr "输入坏的版本:$rev"
10693
04cb2f28 10694#: git-bisect.sh:253
c04f5ac3
JX
10695msgid "'git bisect bad' can take only one argument."
10696msgstr "'git bisect bad' 只能带一个参数。"
10697
04cb2f28 10698#: git-bisect.sh:276
b694fbb1
JX
10699msgid "Warning: bisecting only with a bad commit."
10700msgstr "警告:在仅有一个坏提交下进行二分查找。"
10701
90e6ef53 10702# 译者:注意保持句尾空格
c04f5ac3
JX
10703#. TRANSLATORS: Make sure to include [Y] and [n] in your
10704#. translation. The program will only accept English input
10705#. at this point.
04cb2f28 10706#: git-bisect.sh:282
c04f5ac3
JX
10707msgid "Are you sure [Y/n]? "
10708msgstr "您确认么[Y/n]? "
10709
04cb2f28 10710#: git-bisect.sh:292
b694fbb1 10711msgid ""
220c313c 10712"You need to give me at least one good and one bad revision.\n"
b694fbb1
JX
10713"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10714msgstr ""
10715"您需要给我至少一个好版本和一个坏版本。\n"
220c313c 10716"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
b694fbb1 10717
04cb2f28 10718#: git-bisect.sh:295
b694fbb1
JX
10719msgid ""
10720"You need to start by \"git bisect start\".\n"
220c313c 10721"You then need to give me at least one good and one bad revision.\n"
b694fbb1
JX
10722"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10723msgstr ""
10724"您需要执行 \"git bisect start\" 来开始。\n"
10725"然后需要提供我至少一个好版本和一个坏版本。\n"
220c313c 10726"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
b694fbb1 10727
04cb2f28 10728#: git-bisect.sh:366 git-bisect.sh:493
b694fbb1
JX
10729msgid "We are not bisecting."
10730msgstr "我们没有在二分查找。"
10731
04cb2f28 10732#: git-bisect.sh:373
c04f5ac3
JX
10733#, sh-format
10734msgid "'$invalid' is not a valid commit"
10735msgstr "'$invalid' 不是一个有效的提交"
10736
04cb2f28 10737#: git-bisect.sh:382
c04f5ac3
JX
10738#, sh-format
10739msgid ""
10740"Could not check out original HEAD '$branch'.\n"
10741"Try 'git bisect reset <commit>'."
10742msgstr ""
10743"不能检出原始 HEAD '$branch'。\n"
07432cef 10744"尝试 'git bisect reset <提交>'。"
c04f5ac3 10745
04cb2f28 10746#: git-bisect.sh:409
c04f5ac3
JX
10747msgid "No logfile given"
10748msgstr "未提供日志文件"
10749
04cb2f28 10750#: git-bisect.sh:410
c04f5ac3
JX
10751#, sh-format
10752msgid "cannot read $file for replaying"
10753msgstr "不能读取 $file 来重放"
10754
04cb2f28 10755#: git-bisect.sh:427
c04f5ac3
JX
10756msgid "?? what are you talking about?"
10757msgstr "?? 您在说什么?"
10758
04cb2f28 10759#: git-bisect.sh:439
b694fbb1
JX
10760#, sh-format
10761msgid "running $command"
10762msgstr "运行 $command"
10763
04cb2f28 10764#: git-bisect.sh:446
b694fbb1
JX
10765#, sh-format
10766msgid ""
10767"bisect run failed:\n"
10768"exit code $res from '$command' is < 0 or >= 128"
10769msgstr ""
10770"二分查找运行失败:\n"
07432cef 10771"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 10772
04cb2f28 10773#: git-bisect.sh:472
b694fbb1
JX
10774msgid "bisect run cannot continue any more"
10775msgstr "二分查找不能继续运行"
10776
04cb2f28 10777#: git-bisect.sh:478
b694fbb1
JX
10778#, sh-format
10779msgid ""
10780"bisect run failed:\n"
10781"'bisect_state $state' exited with error code $res"
10782msgstr ""
10783"二分查找运行失败:\n"
10784"'bisect_state $state' 退出码为 $res"
10785
04cb2f28 10786#: git-bisect.sh:485
b694fbb1
JX
10787msgid "bisect run success"
10788msgstr "二分查找运行成功"
c04f5ac3 10789
7aea43ff 10790#: git-pull.sh:61
c04f5ac3
JX
10791msgid ""
10792"Pull is not possible because you have unmerged files.\n"
10793"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 10794"as appropriate to mark resolution and make a commit."
c04f5ac3 10795msgstr ""
90e6ef53 10796"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
d9d56b23 10797"然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
c04f5ac3 10798
7aea43ff 10799#: git-pull.sh:65
c04f5ac3 10800msgid "Pull is not possible because you have unmerged files."
90e6ef53 10801msgstr "Pull 不可用,因为您尚有未合并的文件。"
c04f5ac3 10802
7aea43ff 10803#: git-pull.sh:71
220c313c
JX
10804msgid ""
10805"You have not concluded your merge (MERGE_HEAD exists).\n"
10806"Please, commit your changes before you can merge."
10807msgstr ""
10808"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10809"请在合并前先提交您的修改。"
10810
7aea43ff 10811#: git-pull.sh:285
c04f5ac3 10812msgid "updating an unborn branch with changes added to the index"
90e6ef53 10813msgstr "更新尚未诞生的分支,变更添加至索引"
c04f5ac3 10814
7aea43ff 10815#: git-pull.sh:311
b694fbb1
JX
10816#, sh-format
10817msgid ""
10818"Warning: fetch updated the current branch head.\n"
10819"Warning: fast-forwarding your working tree from\n"
10820"Warning: commit $orig_head."
10821msgstr ""
10822"警告:fetch 更新了当前的分支。您的工作区\n"
10823"警告:从原提交 $orig_head 快进。"
10824
7aea43ff 10825#: git-pull.sh:336
c04f5ac3
JX
10826msgid "Cannot merge multiple branches into empty head"
10827msgstr "无法将多个分支合并到空分支"
10828
7aea43ff 10829#: git-pull.sh:340
c04f5ac3
JX
10830msgid "Cannot rebase onto multiple branches"
10831msgstr "无法变基到多个分支"
10832
6c94aba5 10833#: git-rebase.sh:57
649900bc
JX
10834msgid ""
10835"When you have resolved this problem, run \"git rebase --continue\".\n"
10836"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10837"To check out the original branch and stop rebasing, run \"git rebase --abort"
10838"\"."
10839msgstr ""
10840"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10841"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10842"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10843
6acbf033 10844#: git-rebase.sh:165
2e8451e8
JX
10845msgid "Applied autostash."
10846msgstr "成功应用 autostash。"
10847
6acbf033 10848#: git-rebase.sh:168
2e8451e8
JX
10849#, sh-format
10850msgid "Cannot store $stash_sha1"
10851msgstr "无法保存 $stash_sha1"
10852
6acbf033 10853#: git-rebase.sh:169
2e8451e8
JX
10854msgid ""
10855"Applying autostash resulted in conflicts.\n"
10856"Your changes are safe in the stash.\n"
b1894384 10857"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
2e8451e8
JX
10858msgstr ""
10859"应用 autostash 导致冲突。\n"
10860"您的修改安全地保存在 stash 中。\n"
10861"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10862
6acbf033 10863#: git-rebase.sh:208
649900bc 10864msgid "The pre-rebase hook refused to rebase."
98b2761d 10865msgstr "钩子 pre-rebase 拒绝变基操作。"
649900bc 10866
6acbf033 10867#: git-rebase.sh:213
649900bc
JX
10868msgid "It looks like git-am is in progress. Cannot rebase."
10869msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10870
6acbf033 10871#: git-rebase.sh:351
649900bc
JX
10872msgid "The --exec option must be used with the --interactive option"
10873msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10874
6acbf033 10875#: git-rebase.sh:356
649900bc
JX
10876msgid "No rebase in progress?"
10877msgstr "没有正在进行的变基?"
10878
6acbf033 10879#: git-rebase.sh:367
07432cef
WS
10880msgid "The --edit-todo action can only be used during interactive rebase."
10881msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10882
6acbf033 10883#: git-rebase.sh:374
649900bc
JX
10884msgid "Cannot read HEAD"
10885msgstr "不能读取 HEAD"
10886
6acbf033 10887#: git-rebase.sh:377
649900bc
JX
10888msgid ""
10889"You must edit all merge conflicts and then\n"
10890"mark them as resolved using git add"
10891msgstr ""
10892"您必须编辑所有的合并冲突,然后通过 git add\n"
10893"命令将它们标记为已解决"
10894
6acbf033 10895#: git-rebase.sh:395
649900bc
JX
10896#, sh-format
10897msgid "Could not move back to $head_name"
10898msgstr "无法移回 $head_name"
10899
6acbf033 10900#: git-rebase.sh:414
649900bc
JX
10901#, sh-format
10902msgid ""
10903"It seems that there is already a $state_dir_base directory, and\n"
10904"I wonder if you are in the middle of another rebase. If that is the\n"
10905"case, please try\n"
10906"\t$cmd_live_rebase\n"
10907"If that is not the case, please\n"
10908"\t$cmd_clear_stale_rebase\n"
10909"and run me again. I am stopping in case you still have something\n"
10910"valuable there."
10911msgstr ""
98b2761d
JX
10912"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10913"过程中。 如果是这样,请执行\n"
649900bc
JX
10914"\t$cmd_live_rebase\n"
10915"如果不是这样,请执行\n"
10916"\t$cmd_clear_stale_rebase\n"
98b2761d 10917"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
649900bc 10918
6acbf033 10919#: git-rebase.sh:465
649900bc
JX
10920#, sh-format
10921msgid "invalid upstream $upstream_name"
10922msgstr "无效的上游 $upstream_name"
10923
6acbf033 10924#: git-rebase.sh:489
649900bc
JX
10925#, sh-format
10926msgid "$onto_name: there are more than one merge bases"
10927msgstr "$onto_name: 有一个以上的合并基准"
10928
6acbf033 10929#: git-rebase.sh:492 git-rebase.sh:496
649900bc
JX
10930#, sh-format
10931msgid "$onto_name: there is no merge base"
10932msgstr "$onto_name: 没有合并基准"
10933
6acbf033 10934#: git-rebase.sh:501
649900bc
JX
10935#, sh-format
10936msgid "Does not point to a valid commit: $onto_name"
10937msgstr "没有指向一个有效的提交:$onto_name"
10938
6acbf033 10939#: git-rebase.sh:524
649900bc
JX
10940#, sh-format
10941msgid "fatal: no such branch: $branch_name"
10942msgstr "严重错误:无此分支:$branch_name"
10943
6acbf033 10944#: git-rebase.sh:557
2e8451e8
JX
10945msgid "Cannot autostash"
10946msgstr "无法 autostash"
10947
6acbf033 10948#: git-rebase.sh:562
2e8451e8
JX
10949#, sh-format
10950msgid "Created autostash: $stash_abbrev"
10951msgstr "创建了 autostash: $stash_abbrev"
10952
6acbf033 10953#: git-rebase.sh:566
649900bc
JX
10954msgid "Please commit or stash them."
10955msgstr "请提交或为它们保存进度。"
10956
6acbf033 10957#: git-rebase.sh:586
649900bc
JX
10958#, sh-format
10959msgid "Current branch $branch_name is up to date."
10960msgstr "当前分支 $branch_name 是最新的。"
10961
6acbf033 10962#: git-rebase.sh:590
649900bc
JX
10963#, sh-format
10964msgid "Current branch $branch_name is up to date, rebase forced."
10965msgstr "当前分支 $branch_name 是最新的,强制变基。"
10966
6acbf033 10967#: git-rebase.sh:601
649900bc
JX
10968#, sh-format
10969msgid "Changes from $mb to $onto:"
10970msgstr "变更从 $mb 到 $onto:"
10971
6acbf033 10972#: git-rebase.sh:610
649900bc 10973msgid "First, rewinding head to replay your work on top of it..."
160fb2b2 10974msgstr "首先,回退分支以便在上面重放您的工作..."
649900bc 10975
6acbf033 10976#: git-rebase.sh:620
649900bc
JX
10977#, sh-format
10978msgid "Fast-forwarded $branch_name to $onto_name."
10979msgstr "快进 $branch_name 至 $onto_name。"
10980
c04f5ac3
JX
10981#: git-stash.sh:51
10982msgid "git stash clear with parameters is unimplemented"
10983msgstr "git stash clear 不支持参数"
10984
10985#: git-stash.sh:74
10986msgid "You do not have the initial commit yet"
10987msgstr "您尚未建立初始提交"
10988
10989#: git-stash.sh:89
10990msgid "Cannot save the current index state"
90e6ef53 10991msgstr "无法保存当前索引状态"
c04f5ac3 10992
6acbf033 10993#: git-stash.sh:124 git-stash.sh:137
c04f5ac3
JX
10994msgid "Cannot save the current worktree state"
10995msgstr "无法保存当前工作区状态"
10996
6acbf033 10997#: git-stash.sh:141
c04f5ac3 10998msgid "No changes selected"
90e6ef53 10999msgstr "没有选择变更"
c04f5ac3 11000
6acbf033 11001#: git-stash.sh:144
c04f5ac3 11002msgid "Cannot remove temporary index (can't happen)"
90e6ef53 11003msgstr "无法删除临时索引(不应发生)"
c04f5ac3 11004
6acbf033 11005#: git-stash.sh:157
c04f5ac3
JX
11006msgid "Cannot record working tree state"
11007msgstr "不能记录工作区状态"
11008
6acbf033 11009#: git-stash.sh:191
2e8451e8
JX
11010#, sh-format
11011msgid "Cannot update $ref_stash with $w_commit"
11012msgstr "无法用 $w_commit 更新 $ref_stash"
11013
b694fbb1
JX
11014#. TRANSLATORS: $option is an invalid option, like
11015#. `--blah-blah'. The 7 spaces at the beginning of the
11016#. second line correspond to "error: ". So you should line
11017#. up the second line with however many characters the
11018#. translation of "error: " takes in your language. E.g. in
11019#. English this is:
11020#.
11021#. $ git stash save --blah-blah 2>&1 | head -n 2
11022#. error: unknown option for 'stash save': --blah-blah
11023#. To provide a message, use git stash save -- '--blah-blah'
7aea43ff 11024#: git-stash.sh:241
b694fbb1
JX
11025#, sh-format
11026msgid ""
11027"error: unknown option for 'stash save': $option\n"
11028" To provide a message, use git stash save -- '$option'"
11029msgstr ""
11030"错误:'stash save' 的未知选项:$option\n"
11031" 要提供一个描述信息,使用 git stash save -- '$option'"
11032
7aea43ff 11033#: git-stash.sh:262
c04f5ac3
JX
11034msgid "No local changes to save"
11035msgstr "没有要保存的本地修改"
11036
7aea43ff 11037#: git-stash.sh:266
c04f5ac3 11038msgid "Cannot initialize stash"
90e6ef53 11039msgstr "无法初始化 stash"
c04f5ac3 11040
7aea43ff 11041#: git-stash.sh:270
c04f5ac3
JX
11042msgid "Cannot save the current status"
11043msgstr "无法保存当前状态"
11044
7aea43ff 11045#: git-stash.sh:288
c04f5ac3
JX
11046msgid "Cannot remove worktree changes"
11047msgstr "无法删除工作区变更"
11048
7aea43ff
JX
11049#: git-stash.sh:389
11050#, sh-format
11051msgid "unknown option: $opt"
11052msgstr "未知选项: $opt"
11053
11054#: git-stash.sh:399
c04f5ac3 11055msgid "No stash found."
90e6ef53 11056msgstr "未发现 stash。"
c04f5ac3 11057
7aea43ff 11058#: git-stash.sh:406
c04f5ac3
JX
11059#, sh-format
11060msgid "Too many revisions specified: $REV"
90e6ef53 11061msgstr "指定了太多的版本:$REV"
c04f5ac3 11062
7aea43ff 11063#: git-stash.sh:412
c04f5ac3 11064#, sh-format
220c313c
JX
11065msgid "$reference is not a valid reference"
11066msgstr "$reference 不是一个有效的引用"
c04f5ac3 11067
7aea43ff 11068#: git-stash.sh:440
c04f5ac3
JX
11069#, sh-format
11070msgid "'$args' is not a stash-like commit"
90e6ef53 11071msgstr "'$args' 不是 stash 样提交"
c04f5ac3 11072
7aea43ff 11073#: git-stash.sh:451
c04f5ac3
JX
11074#, sh-format
11075msgid "'$args' is not a stash reference"
90e6ef53 11076msgstr "'$args' 不是一个 stash 引用"
c04f5ac3 11077
7aea43ff 11078#: git-stash.sh:459
c04f5ac3 11079msgid "unable to refresh index"
90e6ef53 11080msgstr "无法刷新索引"
c04f5ac3 11081
7aea43ff 11082#: git-stash.sh:463
c04f5ac3
JX
11083msgid "Cannot apply a stash in the middle of a merge"
11084msgstr "无法在合并过程中恢复进度"
11085
7aea43ff 11086#: git-stash.sh:471
c04f5ac3 11087msgid "Conflicts in index. Try without --index."
90e6ef53 11088msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 11089
7aea43ff 11090#: git-stash.sh:473
c04f5ac3 11091msgid "Could not save index tree"
90e6ef53 11092msgstr "不能保存索引树"
c04f5ac3 11093
7aea43ff 11094#: git-stash.sh:507
c04f5ac3 11095msgid "Cannot unstage modified files"
160fb2b2 11096msgstr "无法将修改的文件取消暂存"
c04f5ac3 11097
7aea43ff 11098#: git-stash.sh:522
b694fbb1
JX
11099msgid "Index was not unstashed."
11100msgstr "索引的进度没有被恢复。"
11101
7aea43ff 11102#: git-stash.sh:545
c04f5ac3
JX
11103#, sh-format
11104msgid "Dropped ${REV} ($s)"
11105msgstr "丢弃了 ${REV} ($s)"
11106
7aea43ff 11107#: git-stash.sh:546
c04f5ac3
JX
11108#, sh-format
11109msgid "${REV}: Could not drop stash entry"
90e6ef53 11110msgstr "${REV}:不能丢弃进度条目"
c04f5ac3 11111
7aea43ff 11112#: git-stash.sh:554
c04f5ac3
JX
11113msgid "No branch name specified"
11114msgstr "未指定分支名"
11115
7aea43ff 11116#: git-stash.sh:626
c04f5ac3
JX
11117msgid "(To restore them type \"git stash apply\")"
11118msgstr "(为恢复数据输入 \"git stash apply\")"
11119
2e8451e8 11120#: git-submodule.sh:95
c04f5ac3
JX
11121#, sh-format
11122msgid "cannot strip one component off url '$remoteurl'"
11123msgstr "无法从 url '$remoteurl' 剥离一个组件"
11124
2e8451e8 11125#: git-submodule.sh:237
c04f5ac3 11126#, sh-format
170e9899
JX
11127msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
11128msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
c04f5ac3 11129
6c94aba5 11130#: git-submodule.sh:287
c04f5ac3 11131#, sh-format
170e9899
JX
11132msgid "Clone of '$url' into submodule path '$sm_path' failed"
11133msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
c04f5ac3 11134
6acbf033 11135#: git-submodule.sh:296
dac1de7d
JX
11136#, sh-format
11137msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
07432cef 11138msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
dac1de7d 11139
6acbf033 11140#: git-submodule.sh:406
2e8451e8
JX
11141msgid "Relative path can only be used from the toplevel of the working tree"
11142msgstr "只能在工作区的顶级目录中使用相对路径"
11143
6acbf033 11144#: git-submodule.sh:416
c04f5ac3
JX
11145#, sh-format
11146msgid "repo URL: '$repo' must be absolute or begin with ./|../"
4375c10e 11147msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
c04f5ac3 11148
6acbf033 11149#: git-submodule.sh:433
c04f5ac3 11150#, sh-format
170e9899
JX
11151msgid "'$sm_path' already exists in the index"
11152msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 11153
6acbf033 11154#: git-submodule.sh:437
b694fbb1
JX
11155#, sh-format
11156msgid ""
11157"The following path is ignored by one of your .gitignore files:\n"
11158"$sm_path\n"
11159"Use -f if you really want to add it."
11160msgstr ""
11161"以下路径被您的一个 .gitignore 文件所忽略:\n"
11162"$sm_path\n"
11163"如果您确实想添加它,使用 -f 参数。"
11164
6acbf033 11165#: git-submodule.sh:455
b694fbb1
JX
11166#, sh-format
11167msgid "Adding existing repo at '$sm_path' to the index"
160fb2b2 11168msgstr "添加位于 '$sm_path' 的现存仓库到索引"
b694fbb1 11169
6acbf033 11170#: git-submodule.sh:457
c04f5ac3 11171#, sh-format
170e9899 11172msgid "'$sm_path' already exists and is not a valid git repo"
160fb2b2 11173msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
c04f5ac3 11174
6acbf033 11175#: git-submodule.sh:465
07432cef
WS
11176#, sh-format
11177msgid "A git directory for '$sm_name' is found locally with remote(s):"
160fb2b2 11178msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
07432cef 11179
6acbf033 11180#: git-submodule.sh:467
07432cef
WS
11181#, sh-format
11182msgid ""
11183"If you want to reuse this local git directory instead of cloning again from"
11184msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11185
6acbf033 11186#: git-submodule.sh:469
07432cef
WS
11187#, sh-format
11188msgid ""
11189"use the '--force' option. If the local git directory is not the correct repo"
160fb2b2 11190msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
07432cef 11191
6acbf033 11192#: git-submodule.sh:470
07432cef
WS
11193#, sh-format
11194msgid ""
11195"or you are unsure what this means choose another name with the '--name' "
11196"option."
11197msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11198
6acbf033 11199#: git-submodule.sh:472
07432cef
WS
11200#, sh-format
11201msgid "Reactivating local git directory for submodule '$sm_name'."
11202msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11203
6acbf033 11204#: git-submodule.sh:484
c04f5ac3 11205#, sh-format
170e9899
JX
11206msgid "Unable to checkout submodule '$sm_path'"
11207msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 11208
6acbf033 11209#: git-submodule.sh:489
c04f5ac3 11210#, sh-format
170e9899
JX
11211msgid "Failed to add submodule '$sm_path'"
11212msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 11213
6acbf033 11214#: git-submodule.sh:498
c04f5ac3 11215#, sh-format
170e9899
JX
11216msgid "Failed to register submodule '$sm_path'"
11217msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 11218
6acbf033 11219#: git-submodule.sh:542
c04f5ac3 11220#, sh-format
2e8451e8
JX
11221msgid "Entering '$prefix$displaypath'"
11222msgstr "正在进入 '$prefix$displaypath'"
c04f5ac3 11223
6acbf033 11224#: git-submodule.sh:562
c04f5ac3 11225#, sh-format
2e8451e8
JX
11226msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11227msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
c04f5ac3 11228
6acbf033 11229#: git-submodule.sh:608
c04f5ac3 11230#, sh-format
2e8451e8
JX
11231msgid "No url found for submodule path '$displaypath' in .gitmodules"
11232msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
c04f5ac3 11233
6acbf033 11234#: git-submodule.sh:617
c04f5ac3 11235#, sh-format
2e8451e8
JX
11236msgid "Failed to register url for submodule path '$displaypath'"
11237msgstr "无法为子模组路径 '$displaypath' 注册 url"
c04f5ac3 11238
6acbf033 11239#: git-submodule.sh:619
c04f5ac3 11240#, sh-format
2e8451e8
JX
11241msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11242msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
c04f5ac3 11243
6acbf033 11244#: git-submodule.sh:636
d691f479 11245#, sh-format
2e8451e8
JX
11246msgid "Failed to register update mode for submodule path '$displaypath'"
11247msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
d691f479 11248
6acbf033 11249#: git-submodule.sh:674
1003b3a5
JX
11250#, sh-format
11251msgid "Use '.' if you really want to deinitialize all submodules"
11252msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
11253
6acbf033 11254#: git-submodule.sh:691
1003b3a5 11255#, sh-format
2e8451e8
JX
11256msgid "Submodule work tree '$displaypath' contains a .git directory"
11257msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
1003b3a5 11258
6acbf033 11259#: git-submodule.sh:692
1003b3a5
JX
11260#, sh-format
11261msgid ""
11262"(use 'rm -rf' if you really want to remove it including all of its history)"
11263msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11264
6acbf033 11265#: git-submodule.sh:698
c04f5ac3
JX
11266#, sh-format
11267msgid ""
2e8451e8 11268"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
1003b3a5 11269"discard them"
2e8451e8 11270msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
1003b3a5 11271
6acbf033 11272#: git-submodule.sh:701
1003b3a5 11273#, sh-format
2e8451e8
JX
11274msgid "Cleared directory '$displaypath'"
11275msgstr "已清除目录 '$displaypath'"
1003b3a5 11276
6acbf033 11277#: git-submodule.sh:702
1003b3a5 11278#, sh-format
2e8451e8
JX
11279msgid "Could not remove submodule work tree '$displaypath'"
11280msgstr "无法移除子模组工作区 '$displaypath'"
1003b3a5 11281
6acbf033 11282#: git-submodule.sh:705
1003b3a5 11283#, sh-format
2e8451e8
JX
11284msgid "Could not create empty submodule directory '$displaypath'"
11285msgstr "不能创建空的子模组目录 '$displaypath'"
1003b3a5 11286
6acbf033 11287#: git-submodule.sh:714
1003b3a5 11288#, sh-format
2e8451e8
JX
11289msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11290msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
1003b3a5 11291
6acbf033 11292#: git-submodule.sh:830
1003b3a5
JX
11293#, sh-format
11294msgid ""
2e8451e8 11295"Submodule path '$displaypath' not initialized\n"
c04f5ac3
JX
11296"Maybe you want to use 'update --init'?"
11297msgstr ""
2e8451e8 11298"子模组路径 '$displaypath' 没有初始化\n"
90e6ef53 11299"也许您想用 'update --init'?"
c04f5ac3 11300
6acbf033 11301#: git-submodule.sh:843
c04f5ac3 11302#, sh-format
2e8451e8
JX
11303msgid "Unable to find current revision in submodule path '$displaypath'"
11304msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 11305
6acbf033 11306#: git-submodule.sh:852
c04f5ac3 11307#, sh-format
170e9899
JX
11308msgid "Unable to fetch in submodule path '$sm_path'"
11309msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 11310
6acbf033 11311#: git-submodule.sh:876
2e8451e8
JX
11312#, sh-format
11313msgid "Unable to fetch in submodule path '$displaypath'"
11314msgstr "无法在子模组路径 '$displaypath' 中获取"
11315
6acbf033 11316#: git-submodule.sh:890
6c94aba5
JX
11317#, sh-format
11318msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11319msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
11320
6acbf033 11321#: git-submodule.sh:891
c04f5ac3 11322#, sh-format
6c94aba5
JX
11323msgid "Submodule path '$displaypath': checked out '$sha1'"
11324msgstr "子模组路径 '$displaypath':检出 '$sha1'"
11325
6acbf033 11326#: git-submodule.sh:895
6c94aba5 11327#, sh-format
2e8451e8
JX
11328msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11329msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 11330
6acbf033 11331#: git-submodule.sh:896
c04f5ac3 11332#, sh-format
2e8451e8
JX
11333msgid "Submodule path '$displaypath': rebased into '$sha1'"
11334msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 11335
6acbf033 11336#: git-submodule.sh:901
c04f5ac3 11337#, sh-format
2e8451e8
JX
11338msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11339msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 11340
6acbf033 11341#: git-submodule.sh:902
c04f5ac3 11342#, sh-format
2e8451e8
JX
11343msgid "Submodule path '$displaypath': merged in '$sha1'"
11344msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 11345
6acbf033 11346#: git-submodule.sh:907
c04f5ac3 11347#, sh-format
2e8451e8
JX
11348msgid ""
11349"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
11350msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
c04f5ac3 11351
6acbf033 11352#: git-submodule.sh:908
c04f5ac3 11353#, sh-format
2e8451e8
JX
11354msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11355msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
c04f5ac3 11356
6acbf033 11357#: git-submodule.sh:938
2e8451e8
JX
11358#, sh-format
11359msgid "Failed to recurse into submodule path '$displaypath'"
11360msgstr "无法递归进子模组路径 '$displaypath'"
11361
6acbf033 11362#: git-submodule.sh:1046
649900bc
JX
11363msgid "The --cached option cannot be used with the --files option"
11364msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1 11365
6acbf033 11366#: git-submodule.sh:1098
b694fbb1
JX
11367#, sh-format
11368msgid "unexpected mode $mod_dst"
11369msgstr "意外的模式 $mod_dst"
c04f5ac3 11370
90e6ef53 11371# 译者:注意保持前导空格
6acbf033 11372#: git-submodule.sh:1118
c04f5ac3 11373#, sh-format
2e8451e8
JX
11374msgid " Warn: $display_name doesn't contain commit $sha1_src"
11375msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 11376
90e6ef53 11377# 译者:注意保持前导空格
6acbf033 11378#: git-submodule.sh:1121
c04f5ac3 11379#, sh-format
2e8451e8
JX
11380msgid " Warn: $display_name doesn't contain commit $sha1_dst"
11381msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 11382
90e6ef53 11383# 译者:注意保持前导空格
6acbf033 11384#: git-submodule.sh:1124
c04f5ac3 11385#, sh-format
2e8451e8
JX
11386msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11387msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 11388
6acbf033 11389#: git-submodule.sh:1149
c04f5ac3 11390msgid "blob"
07432cef 11391msgstr "数据对象"
c04f5ac3 11392
6acbf033 11393#: git-submodule.sh:1267
1003b3a5
JX
11394#, sh-format
11395msgid "Failed to recurse into submodule path '$sm_path'"
11396msgstr "无法递归进子模组路径 '$sm_path'"
11397
6acbf033 11398#: git-submodule.sh:1331
c04f5ac3 11399#, sh-format
2e8451e8
JX
11400msgid "Synchronizing submodule url for '$displaypath'"
11401msgstr "为 '$displaypath' 同步子模组 url"