]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
Merge branch 'master' of github.com:jiangxin/git into master
[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 | 提交
667599e8 41# commit message | 提交说明
160fb2b2
JX
42# commit object | 提交对象
43# commit-ish (also committish) | 提交号
44# conflict | 冲突
45# core Git | 核心 Git 工具
46# DAG | 有向无环图
47# dangling object | 摇摆对象
48# detached HEAD | 分离头指针
49# directory | 目录
50# dirty | 脏(的工作区)
755c831b 51# dumb HTTP protocol | 哑 HTTP 协议
160fb2b2
JX
52# evil merge | 坏合并(合并引入了父提交没有的修改)
53# fast-forward | 快进
54# fetch | 获取
55# file system | 文件系统
e397e7e3 56# fork | 派生
160fb2b2
JX
57# Git archive | 仓库(对于 arch 用户)
58# gitfile | gitfile(仓库链接文件)
59# grafts | (提交)嫁接
60# hash | 哈希值
61# HEAD | HEAD(头指针,亦即当前分支)
62# head | 头、分支
63# head ref | 分支
64# header | 头信息
65# hook | 钩子
66# hunk | 补丁片段
67# index | 索引
68# index entry | 索引条目
69# loose object | 松散对象
70# loose refs | 松散引用
71# master | master(默认分支名)
72# merge | 合并
73# object | 对象
74# object database | 对象库
75# object identifier | 对象标识符
76# object name | 对象名称
77# object type | 对象类型
78# octopus | 章鱼式合并(两分支以上的合并)
79# origin | origin(默认的远程名称)
80# pack | 包
81# pack index | 包索引
82# packfile | 包文件
83# parent | 父提交
84# patch | 补丁
85# pathspec | 路径规格
86# pattern | 模式
12e59059 87# pickaxe | 挖掘
160fb2b2
JX
88# plumbing | 管件(Git 底层核心命令的别称)
89# porcelain | 瓷件(Git 上层封装命令的别称)
90# prune | 清除
91# pull | 拉,拉取
92# push | 推,推送
93# reachable | 可达
94# rebase | 变基
95# ref | 引用
96# reflog | 引用日志
97# refspec | 引用规格
98# remote | 远程,远程仓库
99# remote-tracking branch | 远程跟踪分支
100# replay | 重放
101# repo | 仓库
102# repository | 仓库
103# resolve | (冲突)解决
104# revert | 还原
105# revision | 版本
106# rewind | 回退
107# SCM | 源代码管理(工具)
ee7589bb 108# SHA-1 | SHA-1(安全哈希算法1)
160fb2b2
JX
109# shallow repository | 浅(克隆)仓库
110# signed tag | 签名标签
755c831b 111# smart HTTP protocol | 智能 HTTP 协议
160fb2b2
JX
112# squash | 压缩
113# stage | n. 暂存区(即索引); v. 暂存
114# stash | n. 进度保存; v. 保存进度
115# submodule | 子模组
116# symref | 符号引用
933c015e 117# tag | n. 标签; v. 打标签
160fb2b2
JX
118# tag object | 标签对象
119# tagger | 打标签者
120# topic branch | 主题分支
121# track | 跟踪
122# tree | 树(工作区或树对象)
123# tree object | 树对象
124# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
125# unmerged index | 未合并索引
126# unpack | 解包
127# unreachable object | 不可达对象
128# unstage | 取消暂存
129# upstream | 上游
130# upstream branch | 上游分支
131# working tree | 工作区
132#
c04f5ac3
JX
133msgid ""
134msgstr ""
135"Project-Id-Version: Git\n"
136"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
5bb01d4f 137"POT-Creation-Date: 2015-07-14 07:19+0800\n"
160fb2b2 138"PO-Revision-Date: 2015-08-04 00:43+0800\n"
c04f5ac3 139"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
7aea43ff 140"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
c04f5ac3
JX
141"Language: zh_CN\n"
142"MIME-Version: 1.0\n"
143"Content-Type: text/plain; charset=UTF-8\n"
144"Content-Transfer-Encoding: 8bit\n"
5ae481e0 145"Plural-Forms: nplurals=2; plural=(n != 1);\n"
c04f5ac3 146
6c94aba5 147#: advice.c:55
c04f5ac3
JX
148#, c-format
149msgid "hint: %.*s\n"
150msgstr "提示:%.*s\n"
151
6acbf033 152#: advice.c:88
c04f5ac3 153msgid ""
6acbf033 154"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 155"as appropriate to mark resolution and make a commit."
c04f5ac3 156msgstr ""
d9d56b23 157"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
220c313c 158"解决方案并提交。"
c04f5ac3 159
220c313c 160#: archive.c:11
814ff314
JX
161msgid "git archive [<options>] <tree-ish> [<path>...]"
162msgstr "git archive [<选项>] <树或提交> [<路径>...]"
ef317cd5 163
220c313c 164#: archive.c:12
ef317cd5 165msgid "git archive --list"
07432cef 166msgstr "git archive --list"
ef317cd5 167
220c313c 168#: archive.c:13
ef317cd5 169msgid ""
814ff314 170"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
ef317cd5 171msgstr ""
160fb2b2 172"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
ef317cd5 173
220c313c 174#: archive.c:14
ef317cd5 175msgid "git archive --remote <repo> [--exec <cmd>] --list"
160fb2b2 176msgstr "git archive --remote <仓库> [--exec <命令>] --list"
ef317cd5 177
7aea43ff 178#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327
90314792
JX
179#, c-format
180msgid "pathspec '%s' did not match any files"
160fb2b2 181msgstr "路径规格 '%s' 未匹配任何文件"
90314792 182
04cb2f28 183#: archive.c:427
ef317cd5 184msgid "fmt"
07432cef 185msgstr "格式"
ef317cd5 186
04cb2f28 187#: archive.c:427
ef317cd5 188msgid "archive format"
07432cef 189msgstr "归档格式"
ef317cd5 190
04cb2f28 191#: archive.c:428 builtin/log.c:1204
ef317cd5 192msgid "prefix"
07432cef 193msgstr "前缀"
ef317cd5 194
04cb2f28 195#: archive.c:429
ef317cd5 196msgid "prepend prefix to each pathname in the archive"
07432cef 197msgstr "为归档中每个路径名加上前缀"
ef317cd5 198
814ff314
JX
199#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516
200#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986
7aea43ff 201#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99
814ff314 202#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394
7aea43ff 203#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150
ef317cd5
JX
204msgid "file"
205msgstr "文件"
206
04cb2f28 207#: archive.c:431 builtin/archive.c:89
ef317cd5 208msgid "write the archive to this file"
07432cef 209msgstr "归档写入此文件"
ef317cd5 210
04cb2f28 211#: archive.c:433
ef317cd5 212msgid "read .gitattributes in working directory"
07432cef 213msgstr "读取工作区中的 .gitattributes"
ef317cd5 214
04cb2f28 215#: archive.c:434
ef317cd5 216msgid "report archived files on stderr"
07432cef 217msgstr "在标准错误上报告归档文件"
ef317cd5 218
04cb2f28 219#: archive.c:435
ef317cd5 220msgid "store only"
07432cef 221msgstr "只存储"
ef317cd5 222
04cb2f28 223#: archive.c:436
ef317cd5 224msgid "compress faster"
07432cef 225msgstr "压缩速度更快"
ef317cd5 226
04cb2f28 227#: archive.c:444
ef317cd5 228msgid "compress better"
07432cef 229msgstr "压缩效果更好"
ef317cd5 230
04cb2f28 231#: archive.c:447
ef317cd5 232msgid "list supported archive formats"
07432cef 233msgstr "列出支持的归档格式"
ef317cd5 234
7aea43ff 235#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77
ef317cd5 236msgid "repo"
160fb2b2 237msgstr "仓库"
ef317cd5 238
04cb2f28 239#: archive.c:450 builtin/archive.c:91
ef317cd5 240msgid "retrieve the archive from remote repository <repo>"
160fb2b2 241msgstr "从远程仓库(<仓库>)提取归档文件"
ef317cd5 242
04cb2f28 243#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
ef317cd5 244msgid "command"
07432cef 245msgstr "命令"
ef317cd5 246
04cb2f28 247#: archive.c:452 builtin/archive.c:93
ef317cd5 248msgid "path to the remote git-upload-archive command"
07432cef
WS
249msgstr "远程 git-upload-archive 命令的路径"
250
7aea43ff 251#: attr.c:265
07432cef 252msgid ""
a7409dfb 253"Negative patterns are ignored in git attributes\n"
07432cef 254"Use '\\!' for literal leading exclamation."
ef317cd5 255msgstr ""
a7409dfb 256"负值模版在 git attributes 中被忽略\n"
07432cef 257"当字符串确实要以感叹号开始时,使用 '\\!'。"
ef317cd5 258
4dcdc3d8
JX
259#: branch.c:60
260#, c-format
261msgid "Not setting branch %s as its own upstream."
262msgstr "未设置分支 %s 作为它自己的上游。"
263
6c94aba5 264#: branch.c:83
4dcdc3d8
JX
265#, c-format
266msgid "Branch %s set up to track remote branch %s from %s by rebasing."
267msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
268
6c94aba5 269#: branch.c:84
4dcdc3d8
JX
270#, c-format
271msgid "Branch %s set up to track remote branch %s from %s."
272msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
273
6c94aba5 274#: branch.c:88
4dcdc3d8
JX
275#, c-format
276msgid "Branch %s set up to track local branch %s by rebasing."
277msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
278
6c94aba5 279#: branch.c:89
4dcdc3d8
JX
280#, c-format
281msgid "Branch %s set up to track local branch %s."
282msgstr "分支 %s 设置为跟踪本地分支 %s。"
283
6c94aba5 284#: branch.c:94
4dcdc3d8
JX
285#, c-format
286msgid "Branch %s set up to track remote ref %s by rebasing."
287msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
288
6c94aba5 289#: branch.c:95
4dcdc3d8
JX
290#, c-format
291msgid "Branch %s set up to track remote ref %s."
292msgstr "分支 %s 设置为跟踪远程引用 %s。"
293
6c94aba5 294#: branch.c:99
4dcdc3d8
JX
295#, c-format
296msgid "Branch %s set up to track local ref %s by rebasing."
297msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
298
6c94aba5 299#: branch.c:100
4dcdc3d8
JX
300#, c-format
301msgid "Branch %s set up to track local ref %s."
302msgstr "分支 %s 设置为跟踪本地引用 %s。"
303
6c94aba5 304#: branch.c:133
4dcdc3d8
JX
305#, c-format
306msgid "Not tracking: ambiguous information for ref %s"
307msgstr "未跟踪:引用 %s 有歧义"
308
220c313c 309#: branch.c:162
4dcdc3d8
JX
310#, c-format
311msgid "'%s' is not a valid branch name."
312msgstr "'%s' 不是一个有效的分支名称。"
313
220c313c 314#: branch.c:167
4dcdc3d8
JX
315#, c-format
316msgid "A branch named '%s' already exists."
317msgstr "一个分支名 '%s' 已经存在。"
318
220c313c 319#: branch.c:175
4dcdc3d8
JX
320msgid "Cannot force update the current branch."
321msgstr "无法强制更新当前分支。"
322
220c313c 323#: branch.c:195
1003b3a5
JX
324#, c-format
325msgid "Cannot setup tracking information; starting point '%s' is not a branch."
326msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
327
220c313c 328#: branch.c:197
1003b3a5
JX
329#, c-format
330msgid "the requested upstream branch '%s' does not exist"
331msgstr "请求的上游分支 '%s' 不存在"
332
220c313c 333#: branch.c:199
1003b3a5
JX
334msgid ""
335"\n"
336"If you are planning on basing your work on an upstream\n"
337"branch that already exists at the remote, you may need to\n"
338"run \"git fetch\" to retrieve it.\n"
339"\n"
340"If you are planning to push out a new local branch that\n"
341"will track its remote counterpart, you may want to use\n"
342"\"git push -u\" to set the upstream config as you push."
343msgstr ""
344"\n"
345"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
346"您可能需要执行 \"git fetch\" 来获取分支。\n"
347"\n"
348"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
349"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
350
220c313c 351#: branch.c:243
4dcdc3d8
JX
352#, c-format
353msgid "Not a valid object name: '%s'."
354msgstr "不是一个有效的对象名:'%s'。"
355
220c313c 356#: branch.c:263
4dcdc3d8
JX
357#, c-format
358msgid "Ambiguous object name: '%s'."
359msgstr "歧义的对象名:'%s'。"
360
220c313c 361#: branch.c:268
4dcdc3d8
JX
362#, c-format
363msgid "Not a valid branch point: '%s'."
364msgstr "无效的分支点:'%s'。"
365
220c313c 366#: bundle.c:34
8ada9598
JX
367#, c-format
368msgid "'%s' does not look like a v2 bundle file"
81809b99 369msgstr "'%s' 不像是一个 v2 版本的包文件"
8ada9598 370
220c313c 371#: bundle.c:61
81809b99 372#, c-format
8ada9598 373msgid "unrecognized header: %s%s (%d)"
81809b99 374msgstr "未能识别的包头:%s%s (%d)"
8ada9598 375
44f518e6 376#: bundle.c:87 builtin/commit.c:766
8ada9598
JX
377#, c-format
378msgid "could not open '%s'"
379msgstr "不能打开 '%s'"
380
220c313c 381#: bundle.c:139
8ada9598 382msgid "Repository lacks these prerequisite commits:"
160fb2b2 383msgstr "仓库中缺少这些必备的提交:"
8ada9598 384
814ff314 385#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
7aea43ff
JX
386#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330
387#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358
90314792 388#: builtin/shortlog.c:158
8ada9598
JX
389msgid "revision walk setup failed"
390msgstr "版本遍历设置失败"
391
220c313c 392#: bundle.c:185
8ada9598 393#, c-format
1003b3a5
JX
394msgid "The bundle contains this ref:"
395msgid_plural "The bundle contains these %d refs:"
396msgstr[0] "这个包中含有这个引用:"
397msgstr[1] "这个包中含有 %d 个引用:"
8ada9598 398
220c313c 399#: bundle.c:192
6792b93b
JX
400msgid "The bundle records a complete history."
401msgstr "这个包记录一个完整历史。"
402
220c313c 403#: bundle.c:194
8ada9598 404#, c-format
1003b3a5
JX
405msgid "The bundle requires this ref:"
406msgid_plural "The bundle requires these %d refs:"
407msgstr[0] "这个包需要这个引用:"
408msgstr[1] "这个包需要 %d 个引用:"
8ada9598 409
9aeb4c2b
JX
410#: bundle.c:251
411msgid "Could not spawn pack-objects"
412msgstr "不能生成 pack-objects 进程"
413
414#: bundle.c:269
415msgid "pack-objects died"
416msgstr "pack-objects 终止"
417
418#: bundle.c:309
8ada9598 419msgid "rev-list died"
81809b99 420msgstr "rev-list 终止"
8ada9598 421
9aeb4c2b 422#: bundle.c:358
8ada9598
JX
423#, c-format
424msgid "ref '%s' is excluded by the rev-list options"
81809b99 425msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 426
814ff314 427#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
9aeb4c2b
JX
428#, c-format
429msgid "unrecognized argument: %s"
430msgstr "未能识别的参数:%s"
431
814ff314 432#: bundle.c:443
8ada9598 433msgid "Refusing to create empty bundle."
81809b99 434msgstr "不能创建空包。"
8ada9598 435
814ff314 436#: bundle.c:453
81809b99 437#, c-format
8ada9598 438msgid "cannot create '%s'"
81809b99 439msgstr "不能创建 '%s'"
8ada9598 440
814ff314 441#: bundle.c:474
8ada9598 442msgid "index-pack died"
81809b99 443msgstr "index-pack 终止"
8ada9598 444
1e607449 445#: color.c:260
220c313c
JX
446#, c-format
447msgid "invalid color value: %.*s"
448msgstr "无效的颜色值:%.*s"
449
6acbf033 450#: commit.c:40
c04f5ac3
JX
451#, c-format
452msgid "could not parse %s"
453msgstr "不能解析 %s"
454
6acbf033 455#: commit.c:42
c04f5ac3
JX
456#, c-format
457msgid "%s %s is not a commit!"
458msgstr "%s %s 不是一个提交!"
459
460#: compat/obstack.c:406 compat/obstack.c:408
461msgid "memory exhausted"
462msgstr "内存耗尽"
463
814ff314 464#: config.c:474 config.c:476
220c313c
JX
465#, c-format
466msgid "bad config file line %d in %s"
467msgstr "配置文件 %2$s 出错于第 %1$d 行"
468
814ff314 469#: config.c:592
220c313c
JX
470#, c-format
471msgid "bad numeric config value '%s' for '%s' in %s: %s"
472msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
473
814ff314 474#: config.c:594
220c313c
JX
475#, c-format
476msgid "bad numeric config value '%s' for '%s': %s"
477msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
478
814ff314 479#: config.c:679
220c313c
JX
480#, c-format
481msgid "failed to expand user dir in: '%s'"
482msgstr "无法扩展 '%s' 中的用户目录"
483
814ff314 484#: config.c:757 config.c:768
220c313c
JX
485#, c-format
486msgid "bad zlib compression level %d"
487msgstr "错误的 zlib 压缩级别 %d"
488
814ff314 489#: config.c:890
220c313c
JX
490#, c-format
491msgid "invalid mode for object creation: %s"
492msgstr "无效的对象创建模式:%s"
493
814ff314 494#: config.c:1216
220c313c
JX
495msgid "unable to parse command-line config"
496msgstr "无法解析命令行中的配置"
497
814ff314 498#: config.c:1277
220c313c
JX
499msgid "unknown error occured while reading the configuration files"
500msgstr "在读取配置文件时遇到未知错误"
501
814ff314 502#: config.c:1601
220c313c
JX
503#, c-format
504msgid "unable to parse '%s' from command-line config"
505msgstr "无法解析命令行配置中的 '%s'"
506
814ff314 507#: config.c:1603
220c313c
JX
508#, c-format
509msgid "bad config variable '%s' in file '%s' at line %d"
510msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
511
814ff314 512#: config.c:1662
220c313c
JX
513#, c-format
514msgid "%s has multiple values"
515msgstr "%s 有多个取值"
516
517#: connected.c:69
c04f5ac3
JX
518msgid "Could not run 'git rev-list'"
519msgstr "不能执行 'git rev-list'"
520
220c313c 521#: connected.c:89
c04f5ac3
JX
522#, c-format
523msgid "failed write to rev-list: %s"
524msgstr "无法写入 rev-list:%s"
525
220c313c 526#: connected.c:97
c04f5ac3
JX
527#, c-format
528msgid "failed to close rev-list's stdin: %s"
529msgstr "无法关闭 rev-list 的标准输入:%s"
530
8ada9598
JX
531#: date.c:95
532msgid "in the future"
81809b99 533msgstr "在将来"
8ada9598
JX
534
535#: date.c:101
536#, c-format
537msgid "%lu second ago"
538msgid_plural "%lu seconds ago"
6c94aba5
JX
539msgstr[0] "%lu 秒钟前"
540msgstr[1] "%lu 秒钟前"
8ada9598
JX
541
542#: date.c:108
543#, c-format
544msgid "%lu minute ago"
545msgid_plural "%lu minutes ago"
6c94aba5
JX
546msgstr[0] "%lu 分钟前"
547msgstr[1] "%lu 分钟前"
8ada9598
JX
548
549#: date.c:115
550#, c-format
551msgid "%lu hour ago"
552msgid_plural "%lu hours ago"
6c94aba5
JX
553msgstr[0] "%lu 小时前"
554msgstr[1] "%lu 小时前"
8ada9598
JX
555
556#: date.c:122
557#, c-format
558msgid "%lu day ago"
559msgid_plural "%lu days ago"
6c94aba5
JX
560msgstr[0] "%lu 天前"
561msgstr[1] "%lu 天前"
8ada9598
JX
562
563#: date.c:128
564#, c-format
565msgid "%lu week ago"
566msgid_plural "%lu weeks ago"
6c94aba5
JX
567msgstr[0] "%lu 周前"
568msgstr[1] "%lu 周前"
8ada9598
JX
569
570#: date.c:135
571#, c-format
572msgid "%lu month ago"
573msgid_plural "%lu months ago"
6c94aba5
JX
574msgstr[0] "%lu 个月前"
575msgstr[1] "%lu 个月前"
8ada9598
JX
576
577#: date.c:146
578#, c-format
579msgid "%lu year"
580msgid_plural "%lu years"
81809b99 581msgstr[0] "%lu 年"
5ae481e0 582msgstr[1] "%lu 年"
8ada9598 583
6c94aba5 584#. TRANSLATORS: "%s" is "<n> years"
8ada9598
JX
585#: date.c:149
586#, c-format
587msgid "%s, %lu month ago"
588msgid_plural "%s, %lu months ago"
6c94aba5
JX
589msgstr[0] "%s %lu 个月前"
590msgstr[1] "%s %lu 个月前"
8ada9598
JX
591
592#: date.c:154 date.c:159
593#, c-format
594msgid "%lu year ago"
595msgid_plural "%lu years ago"
81809b99 596msgstr[0] "%lu 年前"
5ae481e0 597msgstr[1] "%lu 年前"
8ada9598 598
cfff71a9
JX
599#: diffcore-order.c:24
600#, c-format
601msgid "failed to read orderfile '%s'"
602msgstr "无法读取排序文件 '%s'"
603
814ff314 604#: diffcore-rename.c:536
6c94aba5
JX
605msgid "Performing inexact rename detection"
606msgstr "正在进行非精确的重命名检测"
607
90e6ef53 608# 译者:注意保持前导空格
6acbf033 609#: diff.c:114
c04f5ac3 610#, c-format
07432cef
WS
611msgid " Failed to parse dirstat cut-off percentage '%s'\n"
612msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
c04f5ac3 613
90e6ef53 614# 译者:注意保持前导空格
6acbf033 615#: diff.c:119
c04f5ac3 616#, c-format
07432cef
WS
617msgid " Unknown dirstat parameter '%s'\n"
618msgstr " 未知的 dirstat 参数 '%s'\n"
c04f5ac3 619
6acbf033 620#: diff.c:214
07432cef
WS
621#, c-format
622msgid "Unknown value for 'diff.submodule' config variable: '%s'"
623msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
624
220c313c 625#: diff.c:266
c04f5ac3
JX
626#, c-format
627msgid ""
628"Found errors in 'diff.dirstat' config variable:\n"
629"%s"
630msgstr ""
90e6ef53 631"发现配置变量 'diff.dirstat' 中的错误:\n"
c04f5ac3
JX
632"%s"
633
7aea43ff 634#: diff.c:2997
6acbf033
JX
635#, c-format
636msgid "external diff died, stopping at %s"
637msgstr "外部 diff 退出,停止在 %s"
638
7aea43ff 639#: diff.c:3393
6acbf033
JX
640msgid "--follow requires exactly one pathspec"
641msgstr "--follow 参数后只跟一个 pathspec"
642
7aea43ff 643#: diff.c:3556
c04f5ac3
JX
644#, c-format
645msgid ""
646"Failed to parse --dirstat/-X option parameter:\n"
647"%s"
648msgstr ""
649"无法解析 --dirstat/-X 选项的参数:\n"
650"%s"
651
7aea43ff 652#: diff.c:3570
07432cef
WS
653#, c-format
654msgid "Failed to parse --submodule option parameter: '%s'"
655msgstr "无法解析 --submodule 选项的参数:'%s'"
656
7aea43ff
JX
657#: dir.c:1852
658msgid "failed to get kernel name and information"
659msgstr "无法获得内核名称和信息"
660
661#: dir.c:1945
662msgid "Untracked cache is disabled on this system."
663msgstr "缓存未跟踪文件在本系统被禁用"
664
220c313c 665#: gpg-interface.c:129 gpg-interface.c:200
c04f5ac3
JX
666msgid "could not run gpg."
667msgstr "不能执行 gpg。"
668
220c313c 669#: gpg-interface.c:141
c04f5ac3
JX
670msgid "gpg did not accept the data"
671msgstr "gpg 没有接受数据"
672
220c313c 673#: gpg-interface.c:152
c04f5ac3
JX
674msgid "gpg failed to sign the data"
675msgstr "gpg 无法为数据签名"
676
220c313c 677#: gpg-interface.c:185
a77c07d9
JX
678#, c-format
679msgid "could not create temporary file '%s': %s"
680msgstr "不能创建临时文件 '%s':%s"
681
220c313c 682#: gpg-interface.c:188
a77c07d9
JX
683#, c-format
684msgid "failed writing detached signature to '%s': %s"
685msgstr "无法将分离式签名写入 '%s':%s"
686
220c313c 687#: grep.c:1718
7ac1c0ad
JX
688#, c-format
689msgid "'%s': unable to read %s"
690msgstr "'%s':无法读取 %s"
691
220c313c 692#: grep.c:1735
7ac1c0ad
JX
693#, c-format
694msgid "'%s': %s"
695msgstr "'%s':%s"
696
220c313c 697#: grep.c:1746
7ac1c0ad
JX
698#, c-format
699msgid "'%s': short read %s"
700msgstr "'%s':读取不完整 %s"
701
6acbf033 702#: help.c:207
81809b99 703#, c-format
8ada9598 704msgid "available git commands in '%s'"
81809b99 705msgstr "在 '%s' 下可用的 git 命令"
8ada9598 706
6acbf033 707#: help.c:214
8ada9598 708msgid "git commands available from elsewhere on your $PATH"
81809b99 709msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
8ada9598 710
7aea43ff
JX
711#: help.c:246
712msgid "These are common Git commands used in various situations:"
713msgstr "这些是各种场合常见的 Git 命令:"
a77c07d9 714
7aea43ff 715#: help.c:311
c04f5ac3
JX
716#, c-format
717msgid ""
718"'%s' appears to be a git command, but we were not\n"
719"able to execute it. Maybe git-%s is broken?"
720msgstr ""
721"'%s' 像是一个 git 命令,但却无法运行。\n"
722"可能是 git-%s 受损?"
723
7aea43ff 724#: help.c:368
8ada9598 725msgid "Uh oh. Your system reports no Git commands at all."
81809b99 726msgstr "唉呀,您的系统中未发现 Git 命令。"
8ada9598 727
7aea43ff 728#: help.c:390
8ada9598
JX
729#, c-format
730msgid ""
731"WARNING: You called a Git command named '%s', which does not exist.\n"
732"Continuing under the assumption that you meant '%s'"
733msgstr ""
81809b99
JX
734"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
735"是 '%s'"
8ada9598 736
7aea43ff 737#: help.c:395
8ada9598
JX
738#, c-format
739msgid "in %0.1f seconds automatically..."
81809b99 740msgstr "在 %0.1f 秒钟后自动运行..."
8ada9598 741
7aea43ff 742#: help.c:402
8ada9598
JX
743#, c-format
744msgid "git: '%s' is not a git command. See 'git --help'."
81809b99 745msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
8ada9598 746
7aea43ff 747#: help.c:406 help.c:466
8ada9598
JX
748msgid ""
749"\n"
750"Did you mean this?"
751msgid_plural ""
752"\n"
753"Did you mean one of these?"
754msgstr[0] ""
81809b99
JX
755"\n"
756"您指的是这个么?"
757msgstr[1] ""
758"\n"
195febda 759"您指的是这其中的某一个么?"
8ada9598 760
7aea43ff 761#: help.c:462
2e8451e8
JX
762#, c-format
763msgid "%s: %s - %s"
764msgstr "%s:%s - %s"
765
7aea43ff 766#: lockfile.c:345
220c313c
JX
767msgid "BUG: reopen a lockfile that is still open"
768msgstr "BUG: 重新打开一个仍打开着的锁文件"
769
7aea43ff 770#: lockfile.c:347
220c313c
JX
771msgid "BUG: reopen a lockfile that has been committed"
772msgstr "BUG: 重新打开一个已提交的锁文件"
773
774#: merge.c:41
07432cef
WS
775msgid "failed to read the cache"
776msgstr "无法读取缓存"
777
5bb01d4f
JX
778#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
779#: builtin/clone.c:647
07432cef
WS
780msgid "unable to write new index file"
781msgstr "无法写新的索引文件"
782
220c313c 783#: merge-recursive.c:189
649900bc
JX
784#, c-format
785msgid "(bad commit)\n"
786msgstr "(坏提交)\n"
787
220c313c 788#: merge-recursive.c:209
649900bc
JX
789#, c-format
790msgid "addinfo_cache failed for path '%s'"
791msgstr "为路径 '%s' addinfo_cache 失败"
792
220c313c 793#: merge-recursive.c:270
649900bc
JX
794msgid "error building trees"
795msgstr "无法创建树"
796
7aea43ff 797#: merge-recursive.c:687
649900bc
JX
798#, c-format
799msgid "failed to create path '%s'%s"
800msgstr "无法创建路径 '%s'%s"
801
7aea43ff 802#: merge-recursive.c:698
649900bc
JX
803#, c-format
804msgid "Removing %s to make room for subdirectory\n"
805msgstr "删除 %s 以便为子目录留出空间\n"
806
7aea43ff 807#: merge-recursive.c:712 merge-recursive.c:733
649900bc
JX
808msgid ": perhaps a D/F conflict?"
809msgstr ":可能是一个目录/文件冲突?"
810
7aea43ff 811#: merge-recursive.c:723
649900bc
JX
812#, c-format
813msgid "refusing to lose untracked file at '%s'"
814msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
815
7aea43ff 816#: merge-recursive.c:763
649900bc
JX
817#, c-format
818msgid "cannot read object %s '%s'"
819msgstr "不能读取对象 %s '%s'"
820
7aea43ff 821#: merge-recursive.c:765
649900bc
JX
822#, c-format
823msgid "blob expected for %s '%s'"
160fb2b2 824msgstr "%s '%s' 应为数据对象"
649900bc 825
5bb01d4f 826#: merge-recursive.c:788 builtin/clone.c:306
649900bc
JX
827#, c-format
828msgid "failed to open '%s'"
829msgstr "无法打开 '%s'"
830
7aea43ff 831#: merge-recursive.c:796
649900bc
JX
832#, c-format
833msgid "failed to symlink '%s'"
834msgstr "无法创建符号链接 '%s'"
835
7aea43ff 836#: merge-recursive.c:799
649900bc
JX
837#, c-format
838msgid "do not know what to do with %06o %s '%s'"
839msgstr "不知道如何处理 %06o %s '%s'"
840
7aea43ff 841#: merge-recursive.c:937
649900bc
JX
842msgid "Failed to execute internal merge"
843msgstr "无法执行内部合并"
844
7aea43ff 845#: merge-recursive.c:941
649900bc
JX
846#, c-format
847msgid "Unable to add %s to database"
848msgstr "不能添加 %s 至对象库"
849
7aea43ff 850#: merge-recursive.c:957
649900bc
JX
851msgid "unsupported object type in the tree"
852msgstr "在树中有不支持的对象类型"
853
7aea43ff 854#: merge-recursive.c:1032 merge-recursive.c:1046
649900bc
JX
855#, c-format
856msgid ""
857"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
858"in tree."
859msgstr ""
860"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
861"的版本被保留。"
862
7aea43ff 863#: merge-recursive.c:1038 merge-recursive.c:1051
649900bc
JX
864#, c-format
865msgid ""
866"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
867"in tree at %s."
868msgstr ""
869"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
870"的版本保留于 %8$s 中。"
871
7aea43ff 872#: merge-recursive.c:1092
649900bc
JX
873msgid "rename"
874msgstr "重命名"
875
7aea43ff 876#: merge-recursive.c:1092
649900bc
JX
877msgid "renamed"
878msgstr "重命名"
879
7aea43ff 880#: merge-recursive.c:1148
649900bc
JX
881#, c-format
882msgid "%s is a directory in %s adding as %s instead"
883msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
884
7aea43ff 885#: merge-recursive.c:1170
649900bc
JX
886#, c-format
887msgid ""
888"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
889"\"->\"%s\" in \"%s\"%s"
890msgstr ""
891"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
892"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
893
7aea43ff 894#: merge-recursive.c:1175
649900bc
JX
895msgid " (left unresolved)"
896msgstr "(留下未解决)"
897
7aea43ff 898#: merge-recursive.c:1229
649900bc
JX
899#, c-format
900msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
901msgstr ""
902"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
903"%5$s"
904
7aea43ff 905#: merge-recursive.c:1259
649900bc
JX
906#, c-format
907msgid "Renaming %s to %s and %s to %s instead"
07432cef 908msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
649900bc 909
7aea43ff 910#: merge-recursive.c:1458
649900bc
JX
911#, c-format
912msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
913msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
914
7aea43ff 915#: merge-recursive.c:1468
649900bc
JX
916#, c-format
917msgid "Adding merged %s"
918msgstr "添加合并后的 %s"
919
7aea43ff 920#: merge-recursive.c:1473 merge-recursive.c:1671
649900bc
JX
921#, c-format
922msgid "Adding as %s instead"
923msgstr "而是以 %s 为名添加"
924
7aea43ff 925#: merge-recursive.c:1524
649900bc
JX
926#, c-format
927msgid "cannot read object %s"
928msgstr "不能读取对象 %s"
929
7aea43ff 930#: merge-recursive.c:1527
649900bc
JX
931#, c-format
932msgid "object %s is not a blob"
160fb2b2 933msgstr "对象 %s 不是一个数据对象"
649900bc 934
7aea43ff 935#: merge-recursive.c:1575
649900bc
JX
936msgid "modify"
937msgstr "修改"
938
7aea43ff 939#: merge-recursive.c:1575
649900bc
JX
940msgid "modified"
941msgstr "修改"
942
7aea43ff 943#: merge-recursive.c:1585
649900bc
JX
944msgid "content"
945msgstr "内容"
946
7aea43ff 947#: merge-recursive.c:1592
649900bc
JX
948msgid "add/add"
949msgstr "添加/添加"
950
7aea43ff 951#: merge-recursive.c:1626
649900bc
JX
952#, c-format
953msgid "Skipped %s (merged same as existing)"
954msgstr "略过 %s(已经做过相同合并)"
955
7aea43ff 956#: merge-recursive.c:1640
649900bc
JX
957#, c-format
958msgid "Auto-merging %s"
959msgstr "自动合并 %s"
960
7aea43ff 961#: merge-recursive.c:1644 git-submodule.sh:1150
649900bc
JX
962msgid "submodule"
963msgstr "子模组"
964
7aea43ff 965#: merge-recursive.c:1645
649900bc
JX
966#, c-format
967msgid "CONFLICT (%s): Merge conflict in %s"
968msgstr "冲突(%s):合并冲突于 %s"
969
7aea43ff 970#: merge-recursive.c:1731
649900bc
JX
971#, c-format
972msgid "Removing %s"
973msgstr "删除 %s"
974
7aea43ff 975#: merge-recursive.c:1756
649900bc
JX
976msgid "file/directory"
977msgstr "文件/目录"
978
7aea43ff 979#: merge-recursive.c:1762
649900bc
JX
980msgid "directory/file"
981msgstr "目录/文件"
982
7aea43ff 983#: merge-recursive.c:1767
649900bc
JX
984#, c-format
985msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
986msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
987
7aea43ff 988#: merge-recursive.c:1777
649900bc
JX
989#, c-format
990msgid "Adding %s"
991msgstr "添加 %s"
992
7aea43ff 993#: merge-recursive.c:1794
649900bc
JX
994msgid "Fatal merge failure, shouldn't happen."
995msgstr "严重的合并错误,不应发生。"
996
7aea43ff 997#: merge-recursive.c:1813
649900bc
JX
998msgid "Already up-to-date!"
999msgstr "已经是最新的!"
1000
7aea43ff 1001#: merge-recursive.c:1822
649900bc
JX
1002#, c-format
1003msgid "merging of trees %s and %s failed"
1004msgstr "无法合并树 %s 和 %s"
1005
7aea43ff 1006#: merge-recursive.c:1852
649900bc
JX
1007#, c-format
1008msgid "Unprocessed path??? %s"
1009msgstr "未处理的路径??? %s"
1010
7aea43ff 1011#: merge-recursive.c:1900
649900bc
JX
1012msgid "Merging:"
1013msgstr "合并:"
1014
7aea43ff 1015#: merge-recursive.c:1913
649900bc 1016#, c-format
e5e38ce4
JX
1017msgid "found %u common ancestor:"
1018msgid_plural "found %u common ancestors:"
1019msgstr[0] "发现 %u 个共同祖先:"
1020msgstr[1] "发现 %u 个共同祖先:"
649900bc 1021
7aea43ff 1022#: merge-recursive.c:1950
649900bc
JX
1023msgid "merge returned no commit"
1024msgstr "合并未返回提交"
1025
7aea43ff 1026#: merge-recursive.c:2007
649900bc
JX
1027#, c-format
1028msgid "Could not parse object '%s'"
1029msgstr "不能解析对象 '%s'"
1030
7aea43ff 1031#: merge-recursive.c:2018 builtin/merge.c:645
649900bc
JX
1032msgid "Unable to write index."
1033msgstr "不能写入索引。"
1034
6acbf033 1035#: notes-utils.c:41
2e8451e8
JX
1036msgid "Cannot commit uninitialized/unreferenced notes tree"
1037msgstr "不能提交未初始化/未引用的注解树"
1038
04cb2f28 1039#: notes-utils.c:82
2e8451e8
JX
1040#, c-format
1041msgid "Bad notes.rewriteMode value: '%s'"
1042msgstr "坏的 notes.rewriteMode 值:'%s'"
1043
04cb2f28 1044#: notes-utils.c:92
2e8451e8
JX
1045#, c-format
1046msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1047msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
1048
1049#. TRANSLATORS: The first %s is the name of the
1050#. environment variable, the second %s is its value
04cb2f28 1051#: notes-utils.c:119
2e8451e8
JX
1052#, c-format
1053msgid "Bad %s value: '%s'"
1054msgstr "坏的 %s 值:'%s'"
1055
7aea43ff 1056#: object.c:242
1003b3a5
JX
1057#, c-format
1058msgid "unable to parse object: %s"
1059msgstr "不能解析对象:%s"
1060
220c313c 1061#: parse-options.c:546
8ada9598 1062msgid "..."
81809b99 1063msgstr "..."
8ada9598 1064
220c313c 1065#: parse-options.c:564
81809b99 1066#, c-format
8ada9598 1067msgid "usage: %s"
81809b99 1068msgstr "用法:%s"
8ada9598
JX
1069
1070#. TRANSLATORS: the colon here should align with the
1071#. one in "usage: %s" translation
220c313c 1072#: parse-options.c:568
81809b99 1073#, c-format
8ada9598 1074msgid " or: %s"
81809b99 1075msgstr " 或:%s"
8ada9598
JX
1076
1077# 译者:为保证在输出中对齐,注意调整句中空格!
220c313c 1078#: parse-options.c:571
81809b99 1079#, c-format
8ada9598 1080msgid " %s"
81809b99 1081msgstr " %s"
8ada9598 1082
220c313c 1083#: parse-options.c:605
63af42fe
JX
1084msgid "-NUM"
1085msgstr "-数字"
1086
cfff71a9 1087#: pathspec.c:133
90314792 1088msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
160fb2b2 1089msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
90314792 1090
cfff71a9 1091#: pathspec.c:143
90314792
JX
1092msgid ""
1093"global 'literal' pathspec setting is incompatible with all other global "
1094"pathspec settings"
160fb2b2 1095msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
90314792 1096
cfff71a9 1097#: pathspec.c:177
90314792 1098msgid "invalid parameter for pathspec magic 'prefix'"
160fb2b2 1099msgstr "路径规格包含无效的神奇前缀"
90314792 1100
cfff71a9 1101#: pathspec.c:183
90314792
JX
1102#, c-format
1103msgid "Invalid pathspec magic '%.*s' in '%s'"
160fb2b2 1104msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
90314792 1105
cfff71a9 1106#: pathspec.c:187
90314792
JX
1107#, c-format
1108msgid "Missing ')' at the end of pathspec magic in '%s'"
160fb2b2 1109msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
90314792 1110
cfff71a9 1111#: pathspec.c:205
90314792
JX
1112#, c-format
1113msgid "Unimplemented pathspec magic '%c' in '%s'"
160fb2b2 1114msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
90314792 1115
cfff71a9 1116#: pathspec.c:230
a77c07d9 1117#, c-format
90314792
JX
1118msgid "%s: 'literal' and 'glob' are incompatible"
1119msgstr "%s:'literal' 和 'glob' 不兼容"
a77c07d9 1120
cfff71a9 1121#: pathspec.c:241
a77c07d9 1122#, c-format
90314792 1123msgid "%s: '%s' is outside repository"
160fb2b2 1124msgstr "%s:'%s' 在仓库之外"
a77c07d9 1125
cfff71a9 1126#: pathspec.c:291
90314792
JX
1127#, c-format
1128msgid "Pathspec '%s' is in submodule '%.*s'"
160fb2b2 1129msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
90314792 1130
cfff71a9 1131#: pathspec.c:353
90314792
JX
1132#, c-format
1133msgid "%s: pathspec magic not supported by this command: %s"
160fb2b2 1134msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
90314792 1135
6acbf033 1136#: pathspec.c:432
90314792
JX
1137#, c-format
1138msgid "pathspec '%s' is beyond a symbolic link"
160fb2b2 1139msgstr "路径规格 '%s' 位于符号链接中"
90314792 1140
6acbf033 1141#: pathspec.c:441
cfff71a9
JX
1142msgid ""
1143"There is nothing to exclude from by :(exclude) patterns.\n"
1144"Perhaps you forgot to add either ':/' or '.' ?"
1145msgstr ""
1146"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1147"添加 ':/' 或 '.' ?"
1148
220c313c
JX
1149#: pretty.c:968
1150msgid "unable to parse --pretty format"
1151msgstr "不能解析 --pretty 格式"
1152
7aea43ff 1153#: progress.c:236
6c94aba5
JX
1154msgid "done"
1155msgstr "完成"
1156
7aea43ff 1157#: read-cache.c:1295
6c94aba5
JX
1158#, c-format
1159msgid ""
1160"index.version set, but the value is invalid.\n"
1161"Using version %i"
1162msgstr ""
1163"设置了 index.version,但是取值无效。\n"
1164"使用版本 %i"
1165
7aea43ff 1166#: read-cache.c:1305
6c94aba5
JX
1167#, c-format
1168msgid ""
1169"GIT_INDEX_VERSION set, but the value is invalid.\n"
1170"Using version %i"
1171msgstr ""
1172"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1173"使用版本 %i"
1174
7aea43ff 1175#: remote.c:792
cfff71a9
JX
1176#, c-format
1177msgid "Cannot fetch both %s and %s to %s"
1178msgstr "不能同时获取 %s 和 %s 至 %s"
1179
7aea43ff 1180#: remote.c:796
cfff71a9
JX
1181#, c-format
1182msgid "%s usually tracks %s, not %s"
1183msgstr "%s 通常跟踪 %s,而非 %s"
1184
7aea43ff 1185#: remote.c:800
cfff71a9
JX
1186#, c-format
1187msgid "%s tracks both %s and %s"
1188msgstr "%s 同时跟踪 %s 和 %s"
1189
7aea43ff 1190#: remote.c:808
cfff71a9
JX
1191msgid "Internal error"
1192msgstr "内部错误"
1193
7aea43ff
JX
1194#: remote.c:1723 remote.c:1766
1195msgid "HEAD does not point to a branch"
1196msgstr "HEAD 没有指向一个分支"
1197
1198#: remote.c:1732
1199#, c-format
1200msgid "no such branch: '%s'"
1201msgstr "没有此分支:'%s'"
1202
1203#: remote.c:1735
1204#, c-format
1205msgid "no upstream configured for branch '%s'"
1206msgstr "尚未给分支 '%s' 设置上游"
1207
1208#: remote.c:1741
1209#, c-format
1210msgid "upstream branch '%s' not stored as a remote-tracking branch"
1211msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1212
1213#: remote.c:1756
1214#, c-format
1215msgid "push destination '%s' on remote '%s' has no local tracking branch"
1216msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1217
1218#: remote.c:1771
1219#, c-format
1220msgid "branch '%s' has no remote for pushing"
1221msgstr "分支 '%s' 没有设置要推送的远程服务器"
1222
1223#: remote.c:1782
1224#, c-format
1225msgid "push refspecs for '%s' do not include '%s'"
160fb2b2 1226msgstr "向 '%s' 推送引用规格未包含 '%s'"
7aea43ff
JX
1227
1228#: remote.c:1795
1229msgid "push has no destination (push.default is 'nothing')"
1230msgstr "推送无目标(push.default 是 'nothing')"
1231
1232#: remote.c:1817
1233msgid "cannot resolve 'simple' push to a single destination"
1234msgstr "无法解析 'simple' 推送至一个单独的目标"
1235
1236#: remote.c:2124
90314792
JX
1237#, c-format
1238msgid "Your branch is based on '%s', but the upstream is gone.\n"
1239msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1240
7aea43ff 1241#: remote.c:2128
90314792
JX
1242msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1243msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1244
7aea43ff 1245#: remote.c:2131
90314792
JX
1246#, c-format
1247msgid "Your branch is up-to-date with '%s'.\n"
1248msgstr "您的分支与上游分支 '%s' 一致。\n"
1249
7aea43ff 1250#: remote.c:2135
c04f5ac3
JX
1251#, c-format
1252msgid "Your branch is ahead of '%s' by %d commit.\n"
1253msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1254msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5ae481e0 1255msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
c04f5ac3 1256
7aea43ff 1257#: remote.c:2141
07432cef
WS
1258msgid " (use \"git push\" to publish your local commits)\n"
1259msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1260
7aea43ff 1261#: remote.c:2144
c04f5ac3
JX
1262#, c-format
1263msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1264msgid_plural ""
1265"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
90e6ef53 1266msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5ae481e0 1267msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 1268
07432cef 1269# 译者:注意保持前导空格
7aea43ff 1270#: remote.c:2152
07432cef
WS
1271msgid " (use \"git pull\" to update your local branch)\n"
1272msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1273
7aea43ff 1274#: remote.c:2155
c04f5ac3
JX
1275#, c-format
1276msgid ""
1277"Your branch and '%s' have diverged,\n"
1278"and have %d and %d different commit each, respectively.\n"
1279msgid_plural ""
1280"Your branch and '%s' have diverged,\n"
1281"and have %d and %d different commits each, respectively.\n"
1282msgstr[0] ""
1283"您的分支和 '%s' 出现了偏离,\n"
195febda 1284"并且分别有 %d 和 %d 处不同的提交。\n"
5ae481e0
JX
1285msgstr[1] ""
1286"您的分支和 '%s' 出现了偏离,\n"
195febda 1287"并且分别有 %d 和 %d 处不同的提交。\n"
c04f5ac3 1288
07432cef 1289# 译者:注意保持前导空格
7aea43ff 1290#: remote.c:2165
07432cef
WS
1291msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1292msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1293
7aea43ff 1294#: revision.c:2366
814ff314
JX
1295msgid "--first-parent is incompatible with --bisect"
1296msgstr "--first-parent 与 --bisect 不兼容"
1297
1298#: run-command.c:83
2e8451e8
JX
1299msgid "open /dev/null failed"
1300msgstr "不能打开 /dev/null"
1301
814ff314 1302#: run-command.c:85
2e8451e8
JX
1303#, c-format
1304msgid "dup2(%d,%d) failed"
1305msgstr "不能调用 dup2(%d,%d)"
1306
814ff314 1307#: send-pack.c:272
220c313c
JX
1308msgid "failed to sign the push certificate"
1309msgstr "无法为推送证书签名"
1310
7aea43ff 1311#: send-pack.c:378
220c313c
JX
1312msgid "the receiving end does not support --signed push"
1313msgstr "接收端不支持签名推送"
1314
7aea43ff 1315#: send-pack.c:389
44f518e6
JX
1316msgid "the receiving end does not support --atomic push"
1317msgstr "接收端不支持原子推送"
814ff314 1318
7aea43ff
JX
1319#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
1320#: builtin/merge.c:983
c04f5ac3
JX
1321#, c-format
1322msgid "Could not open '%s' for writing"
90e6ef53 1323msgstr "不能为写入打开 '%s'"
c04f5ac3 1324
7aea43ff
JX
1325#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
1326#: builtin/merge.c:988
c04f5ac3
JX
1327#, c-format
1328msgid "Could not write to '%s'"
90e6ef53 1329msgstr "不能写入 '%s'"
c04f5ac3 1330
220c313c 1331#: sequencer.c:195
14c8bced
JX
1332msgid ""
1333"after resolving the conflicts, mark the corrected paths\n"
1334"with 'git add <paths>' or 'git rm <paths>'"
1335msgstr ""
d9d56b23 1336"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
14c8bced
JX
1337"命令标记修正后的文件"
1338
220c313c 1339#: sequencer.c:198
c04f5ac3
JX
1340msgid ""
1341"after resolving the conflicts, mark the corrected paths\n"
1342"with 'git add <paths>' or 'git rm <paths>'\n"
1343"and commit the result with 'git commit'"
1344msgstr ""
d9d56b23 1345"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
c04f5ac3
JX
1346"对修正后的文件做标记,然后用 'git commit' 提交"
1347
814ff314 1348#: sequencer.c:211 sequencer.c:861 sequencer.c:944
c04f5ac3
JX
1349#, c-format
1350msgid "Could not write to %s"
1351msgstr "不能写入 %s"
1352
220c313c 1353#: sequencer.c:214
c04f5ac3
JX
1354#, c-format
1355msgid "Error wrapping up %s"
1356msgstr "错误收尾 %s"
1357
220c313c 1358#: sequencer.c:229
c04f5ac3
JX
1359msgid "Your local changes would be overwritten by cherry-pick."
1360msgstr "您的本地修改将被拣选操作覆盖。"
1361
220c313c 1362#: sequencer.c:231
c04f5ac3
JX
1363msgid "Your local changes would be overwritten by revert."
1364msgstr "您的本地修改将被还原操作覆盖。"
1365
220c313c 1366#: sequencer.c:234
c04f5ac3
JX
1367msgid "Commit your changes or stash them to proceed."
1368msgstr "提交您的修改或保存进度后再继续。"
1369
1370#. TRANSLATORS: %s will be "revert" or "cherry-pick"
04cb2f28 1371#: sequencer.c:321
c04f5ac3
JX
1372#, c-format
1373msgid "%s: Unable to write new index file"
90e6ef53 1374msgstr "%s:无法写入新索引文件"
c04f5ac3 1375
04cb2f28 1376#: sequencer.c:339
8ada9598 1377msgid "Could not resolve HEAD commit\n"
81809b99 1378msgstr "不能解析 HEAD 提交\n"
8ada9598 1379
04cb2f28 1380#: sequencer.c:359
8ada9598 1381msgid "Unable to update cache tree\n"
81809b99 1382msgstr "不能更新缓存\n"
8ada9598 1383
814ff314 1384#: sequencer.c:411
81809b99 1385#, c-format
8ada9598 1386msgid "Could not parse commit %s\n"
81809b99 1387msgstr "不能解析提交 %s\n"
8ada9598 1388
814ff314 1389#: sequencer.c:416
81809b99 1390#, c-format
8ada9598 1391msgid "Could not parse parent commit %s\n"
81809b99 1392msgstr "不能解析父提交 %s\n"
8ada9598 1393
814ff314 1394#: sequencer.c:482
c04f5ac3 1395msgid "Your index file is unmerged."
90e6ef53 1396msgstr "您的索引文件未完成合并。"
c04f5ac3 1397
814ff314 1398#: sequencer.c:501
c04f5ac3
JX
1399#, c-format
1400msgid "Commit %s is a merge but no -m option was given."
1401msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1402
814ff314 1403#: sequencer.c:509
c04f5ac3
JX
1404#, c-format
1405msgid "Commit %s does not have parent %d"
1406msgstr "提交 %s 没有父提交 %d"
1407
814ff314 1408#: sequencer.c:513
c04f5ac3
JX
1409#, c-format
1410msgid "Mainline was specified but commit %s is not a merge."
90e6ef53 1411msgstr "指定了主线但提交 %s 不是一个合并。"
c04f5ac3
JX
1412
1413#. TRANSLATORS: The first %s will be "revert" or
1414#. "cherry-pick", the second %s a SHA1
814ff314 1415#: sequencer.c:526
c04f5ac3
JX
1416#, c-format
1417msgid "%s: cannot parse parent commit %s"
1418msgstr "%s:不能解析父提交 %s"
1419
814ff314 1420#: sequencer.c:530
c04f5ac3
JX
1421#, c-format
1422msgid "Cannot get commit message for %s"
1423msgstr "不能得到 %s 的提交说明"
1424
814ff314 1425#: sequencer.c:616
c04f5ac3
JX
1426#, c-format
1427msgid "could not revert %s... %s"
1428msgstr "不能还原 %s... %s"
1429
814ff314 1430#: sequencer.c:617
c04f5ac3
JX
1431#, c-format
1432msgid "could not apply %s... %s"
1433msgstr "不能应用 %s... %s"
1434
814ff314 1435#: sequencer.c:653
c04f5ac3
JX
1436msgid "empty commit set passed"
1437msgstr "提供了空的提交集"
1438
814ff314 1439#: sequencer.c:661
c04f5ac3
JX
1440#, c-format
1441msgid "git %s: failed to read the index"
90e6ef53 1442msgstr "git %s:无法读取索引"
c04f5ac3 1443
814ff314 1444#: sequencer.c:665
c04f5ac3
JX
1445#, c-format
1446msgid "git %s: failed to refresh the index"
90e6ef53 1447msgstr "git %s:无法刷新索引"
c04f5ac3 1448
814ff314 1449#: sequencer.c:725
c04f5ac3
JX
1450#, c-format
1451msgid "Cannot %s during a %s"
90e6ef53 1452msgstr "无法 %s 在一个 %s 过程中"
c04f5ac3 1453
814ff314 1454#: sequencer.c:747
c04f5ac3
JX
1455#, c-format
1456msgid "Could not parse line %d."
90e6ef53 1457msgstr "不能解析第 %d 行。"
c04f5ac3 1458
814ff314 1459#: sequencer.c:752
c04f5ac3 1460msgid "No commits parsed."
7e238ab7 1461msgstr "没有提交被解析。"
c04f5ac3 1462
814ff314 1463#: sequencer.c:765
c04f5ac3
JX
1464#, c-format
1465msgid "Could not open %s"
1466msgstr "不能打开 %s"
1467
814ff314 1468#: sequencer.c:769
c04f5ac3
JX
1469#, c-format
1470msgid "Could not read %s."
1471msgstr "不能读取 %s。"
1472
814ff314 1473#: sequencer.c:776
c04f5ac3
JX
1474#, c-format
1475msgid "Unusable instruction sheet: %s"
1476msgstr "无用的指令表单:%s"
1477
814ff314 1478#: sequencer.c:806
c04f5ac3
JX
1479#, c-format
1480msgid "Invalid key: %s"
1481msgstr "无效键名:%s"
1482
814ff314 1483#: sequencer.c:809
c04f5ac3
JX
1484#, c-format
1485msgid "Invalid value for %s: %s"
81809b99 1486msgstr "%s 的值无效:%s"
c04f5ac3 1487
814ff314 1488#: sequencer.c:821
c04f5ac3
JX
1489#, c-format
1490msgid "Malformed options sheet: %s"
1491msgstr "非法的选项表单:%s"
1492
814ff314 1493#: sequencer.c:842
c04f5ac3
JX
1494msgid "a cherry-pick or revert is already in progress"
1495msgstr "一个拣选或还原操作已在进行"
1496
814ff314 1497#: sequencer.c:843
c04f5ac3
JX
1498msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1499msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1500
814ff314 1501#: sequencer.c:847
c04f5ac3
JX
1502#, c-format
1503msgid "Could not create sequencer directory %s"
90e6ef53 1504msgstr "不能创建序列目录 %s"
c04f5ac3 1505
814ff314 1506#: sequencer.c:863 sequencer.c:948
c04f5ac3
JX
1507#, c-format
1508msgid "Error wrapping up %s."
1509msgstr "错误收尾 %s。"
1510
814ff314 1511#: sequencer.c:882 sequencer.c:1018
c04f5ac3 1512msgid "no cherry-pick or revert in progress"
195febda 1513msgstr "拣选或还原操作并未进行"
c04f5ac3 1514
814ff314 1515#: sequencer.c:884
c04f5ac3
JX
1516msgid "cannot resolve HEAD"
1517msgstr "不能解析 HEAD"
1518
814ff314 1519#: sequencer.c:886
c04f5ac3 1520msgid "cannot abort from a branch yet to be born"
90e6ef53 1521msgstr "不能从尚未建立的分支终止"
c04f5ac3 1522
7aea43ff 1523#: sequencer.c:908 builtin/apply.c:4291
c04f5ac3
JX
1524#, c-format
1525msgid "cannot open %s: %s"
1526msgstr "不能打开 %s:%s"
1527
814ff314 1528#: sequencer.c:911
c04f5ac3
JX
1529#, c-format
1530msgid "cannot read %s: %s"
1531msgstr "不能读取 %s:%s"
1532
814ff314 1533#: sequencer.c:912
c04f5ac3 1534msgid "unexpected end of file"
9aafc933 1535msgstr "意外的文件结束"
c04f5ac3 1536
814ff314 1537#: sequencer.c:918
c04f5ac3
JX
1538#, c-format
1539msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
90e6ef53 1540msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
c04f5ac3 1541
814ff314 1542#: sequencer.c:941
c04f5ac3
JX
1543#, c-format
1544msgid "Could not format %s."
1545msgstr "不能格式化 %s。"
1546
814ff314 1547#: sequencer.c:1086
4dcdc3d8
JX
1548#, c-format
1549msgid "%s: can't cherry-pick a %s"
1550msgstr "%s:不能拣选一个%s"
1551
814ff314 1552#: sequencer.c:1089
4dcdc3d8
JX
1553#, c-format
1554msgid "%s: bad revision"
1555msgstr "%s:错误的版本"
1556
814ff314 1557#: sequencer.c:1123
c04f5ac3
JX
1558msgid "Can't revert as initial commit"
1559msgstr "不能作为初始提交还原"
1560
814ff314 1561#: sequencer.c:1124
c04f5ac3
JX
1562msgid "Can't cherry-pick into empty head"
1563msgstr "不能拣选到空分支"
1564
7aea43ff
JX
1565#: setup.c:243
1566#, c-format
1567msgid "failed to read %s"
1568msgstr "无法读取 %s"
1569
1570#: sha1_name.c:453
2e8451e8
JX
1571msgid ""
1572"Git normally never creates a ref that ends with 40 hex characters\n"
1573"because it will be ignored when you just specify 40-hex. These refs\n"
1574"may be created by mistake. For example,\n"
1575"\n"
1576" git checkout -b $br $(git rev-parse ...)\n"
1577"\n"
1578"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1579"examine these refs and maybe delete them. Turn this message off by\n"
b1894384 1580"running \"git config advice.objectNameWarning false\""
2e8451e8
JX
1581msgstr ""
1582"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1583"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1584"\n"
1585" git checkout -b $br $(git rev-parse ...)\n"
1586"\n"
1587"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
b1894384 1588"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
2e8451e8
JX
1589"命令关闭本消息通知。"
1590
90314792
JX
1591#: submodule.c:64 submodule.c:98
1592msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1593msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1594
1595#: submodule.c:68 submodule.c:102
1596#, c-format
1597msgid "Could not find section in .gitmodules where path=%s"
1598msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1599
90314792
JX
1600#: submodule.c:76
1601#, c-format
1602msgid "Could not update .gitmodules entry %s"
1603msgstr "不能更新 .gitmodules 条目 %s"
1604
90314792
JX
1605#: submodule.c:109
1606#, c-format
1607msgid "Could not remove .gitmodules entry for %s"
1608msgstr "无法移除 %s 的 .gitmodules 条目"
1609
6c94aba5 1610#: submodule.c:120
90314792
JX
1611msgid "staging updated .gitmodules failed"
1612msgstr "将更新后 .gitmodules 添加暂存区失败"
1613
7aea43ff 1614#: submodule.c:1115
90314792
JX
1615#, c-format
1616msgid "Could not set core.worktree in %s"
1617msgstr "不能在 %s 中设置 core.worktree"
1618
814ff314
JX
1619#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1620#: trailer.c:561
220c313c
JX
1621#, c-format
1622msgid "unknown value '%s' for key '%s'"
1623msgstr "键 '%2$s' 的未知取值 '%1$s'"
1624
814ff314 1625#: trailer.c:543 trailer.c:548 builtin/remote.c:290
220c313c
JX
1626#, c-format
1627msgid "more than one %s"
1628msgstr "多于一个 %s"
1629
814ff314 1630#: trailer.c:581
220c313c 1631#, c-format
9aeb4c2b
JX
1632msgid "empty trailer token in trailer '%.*s'"
1633msgstr "签名 '%.*s' 的键为空"
220c313c 1634
814ff314 1635#: trailer.c:701
220c313c
JX
1636#, c-format
1637msgid "could not read input file '%s'"
1638msgstr "不能读取输入文件 '%s'"
1639
814ff314 1640#: trailer.c:704
220c313c
JX
1641msgid "could not read from stdin"
1642msgstr "不能自标准输入读取"
1643
7aea43ff 1644#: unpack-trees.c:203
6c94aba5
JX
1645msgid "Checking out files"
1646msgstr "正在检出文件"
1647
90314792
JX
1648#: urlmatch.c:120
1649msgid "invalid URL scheme name or missing '://' suffix"
1650msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1651
1652#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1653#, c-format
1654msgid "invalid %XX escape sequence"
1655msgstr "无效的 %XX 转义序列"
1656
1657#: urlmatch.c:172
1658msgid "missing host and scheme is not 'file:'"
4375c10e 1659msgstr "缺失主机名且 URL 方案不是 'file:'"
90314792
JX
1660
1661#: urlmatch.c:189
1662msgid "a 'file:' URL may not have a port number"
1663msgstr "一个 'file:' URL 不应该包含端口号"
1664
1665#: urlmatch.c:199
1666msgid "invalid characters in host name"
1667msgstr "主机名中包含无效的字符"
1668
1669#: urlmatch.c:244 urlmatch.c:255
1670msgid "invalid port number"
1671msgstr "无效的端口号"
1672
1673#: urlmatch.c:322
1674msgid "invalid '..' path segment"
1675msgstr "无效的 '..' 路径片段"
1676
814ff314 1677#: wrapper.c:523
07432cef 1678#, c-format
ef317cd5 1679msgid "unable to access '%s': %s"
07432cef
WS
1680msgstr "不能访问 '%s':%s"
1681
814ff314 1682#: wrapper.c:544
07432cef
WS
1683#, c-format
1684msgid "unable to access '%s'"
1685msgstr "不能访问 '%s'"
ef317cd5 1686
814ff314 1687#: wrapper.c:555
d691f479
JX
1688#, c-format
1689msgid "unable to look up current user in the passwd file: %s"
07432cef 1690msgstr "无法在口令文件中查询到当前用户:%s"
d691f479 1691
814ff314 1692#: wrapper.c:556
d691f479
JX
1693msgid "no such user"
1694msgstr "无此用户"
1695
814ff314 1696#: wrapper.c:564
220c313c
JX
1697msgid "unable to get current working directory"
1698msgstr "不能获取当前工作目录"
1699
7aea43ff
JX
1700#: wrapper.c:575
1701#, c-format
1702msgid "could not open %s for writing"
1703msgstr "不能写入 %s"
1704
1705#: wrapper.c:587
1706#, c-format
1707msgid "could not write to %s"
1708msgstr "不能写入 %s"
1709
1710#: wrapper.c:593
1711#, c-format
1712msgid "could not close %s"
1713msgstr "不能关闭 %s"
1714
cfff71a9 1715#: wt-status.c:150
c04f5ac3
JX
1716msgid "Unmerged paths:"
1717msgstr "未合并的路径:"
1718
90e6ef53 1719# 译者:注意保持前导空格
cfff71a9 1720#: wt-status.c:177 wt-status.c:204
c04f5ac3
JX
1721#, c-format
1722msgid " (use \"git reset %s <file>...\" to unstage)"
160fb2b2 1723msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
c04f5ac3 1724
90e6ef53 1725# 译者:注意保持前导空格
cfff71a9 1726#: wt-status.c:179 wt-status.c:206
c04f5ac3 1727msgid " (use \"git rm --cached <file>...\" to unstage)"
160fb2b2 1728msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
c04f5ac3 1729
90e6ef53 1730# 译者:注意保持前导空格
cfff71a9 1731#: wt-status.c:183
6792b93b 1732msgid " (use \"git add <file>...\" to mark resolution)"
d9d56b23 1733msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
6792b93b
JX
1734
1735# 译者:注意保持前导空格
cfff71a9 1736#: wt-status.c:185 wt-status.c:189
c04f5ac3 1737msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
d9d56b23 1738msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
c04f5ac3 1739
6792b93b 1740# 译者:注意保持前导空格
cfff71a9 1741#: wt-status.c:187
6792b93b 1742msgid " (use \"git rm <file>...\" to mark resolution)"
d9d56b23 1743msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
6792b93b 1744
7aea43ff 1745#: wt-status.c:198 wt-status.c:881
c04f5ac3
JX
1746msgid "Changes to be committed:"
1747msgstr "要提交的变更:"
1748
7aea43ff 1749#: wt-status.c:216 wt-status.c:890
c04f5ac3 1750msgid "Changes not staged for commit:"
7e238ab7 1751msgstr "尚未暂存以备提交的变更:"
c04f5ac3 1752
90e6ef53 1753# 译者:注意保持前导空格
cfff71a9 1754#: wt-status.c:220
c04f5ac3 1755msgid " (use \"git add <file>...\" to update what will be committed)"
d9d56b23 1756msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
c04f5ac3 1757
90e6ef53 1758# 译者:注意保持前导空格
cfff71a9 1759#: wt-status.c:222
c04f5ac3 1760msgid " (use \"git add/rm <file>...\" to update what will be committed)"
d9d56b23 1761msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
c04f5ac3 1762
90e6ef53 1763# 译者:注意保持前导空格
cfff71a9 1764#: wt-status.c:223
c04f5ac3
JX
1765msgid ""
1766" (use \"git checkout -- <file>...\" to discard changes in working directory)"
d9d56b23 1767msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
c04f5ac3 1768
90e6ef53 1769# 译者:注意保持前导空格
cfff71a9 1770#: wt-status.c:225
c04f5ac3
JX
1771msgid " (commit or discard the untracked or modified content in submodules)"
1772msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1773
90e6ef53 1774# 译者:注意保持前导空格
cfff71a9 1775#: wt-status.c:237
c04f5ac3
JX
1776#, c-format
1777msgid " (use \"git %s <file>...\" to include in what will be committed)"
d9d56b23 1778msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
c04f5ac3 1779
6c94aba5 1780#: wt-status.c:252
c04f5ac3
JX
1781msgid "both deleted:"
1782msgstr "双方删除:"
1783
6c94aba5 1784#: wt-status.c:254
c04f5ac3
JX
1785msgid "added by us:"
1786msgstr "由我们添加:"
1787
6c94aba5 1788#: wt-status.c:256
c04f5ac3
JX
1789msgid "deleted by them:"
1790msgstr "由他们删除:"
1791
6c94aba5 1792#: wt-status.c:258
c04f5ac3
JX
1793msgid "added by them:"
1794msgstr "由他们添加:"
1795
6c94aba5 1796#: wt-status.c:260
c04f5ac3
JX
1797msgid "deleted by us:"
1798msgstr "由我们删除:"
1799
6c94aba5 1800#: wt-status.c:262
c04f5ac3
JX
1801msgid "both added:"
1802msgstr "双方添加:"
1803
6c94aba5 1804#: wt-status.c:264
c04f5ac3
JX
1805msgid "both modified:"
1806msgstr "双方修改:"
1807
6c94aba5
JX
1808#: wt-status.c:266
1809#, c-format
1810msgid "bug: unhandled unmerged status %x"
1811msgstr "bug:无法处理的未合并状态 %x"
cfff71a9 1812
6c94aba5
JX
1813#: wt-status.c:274
1814msgid "new file:"
1815msgstr "新文件:"
cfff71a9 1816
6c94aba5
JX
1817#: wt-status.c:276
1818msgid "copied:"
1819msgstr "拷贝:"
cfff71a9 1820
6c94aba5
JX
1821#: wt-status.c:278
1822msgid "deleted:"
1823msgstr "删除:"
cfff71a9 1824
6c94aba5
JX
1825#: wt-status.c:280
1826msgid "modified:"
1827msgstr "修改:"
1828
1829#: wt-status.c:282
1830msgid "renamed:"
1831msgstr "重命名:"
1832
1833#: wt-status.c:284
1834msgid "typechange:"
1835msgstr "类型变更:"
1836
1837#: wt-status.c:286
1838msgid "unknown:"
1839msgstr "未知:"
cfff71a9 1840
6c94aba5
JX
1841#: wt-status.c:288
1842msgid "unmerged:"
1843msgstr "未合并:"
cfff71a9 1844
90e6ef53 1845# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1846#: wt-status.c:370
c04f5ac3 1847msgid "new commits, "
aa9565f7 1848msgstr "新提交, "
c04f5ac3 1849
90e6ef53 1850# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1851#: wt-status.c:372
c04f5ac3 1852msgid "modified content, "
aa9565f7 1853msgstr "修改的内容, "
c04f5ac3 1854
90e6ef53 1855# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1856#: wt-status.c:374
c04f5ac3 1857msgid "untracked content, "
aa9565f7 1858msgstr "未跟踪的内容, "
c04f5ac3 1859
6c94aba5 1860#: wt-status.c:391
c04f5ac3
JX
1861#, c-format
1862msgid "bug: unhandled diff status %c"
6c94aba5 1863msgstr "bug:无法处理的差异状态 %c"
c04f5ac3 1864
7aea43ff 1865#: wt-status.c:755
90314792
JX
1866msgid "Submodules changed but not updated:"
1867msgstr "子模组已修改但尚未更新:"
1868
7aea43ff 1869#: wt-status.c:757
90314792
JX
1870msgid "Submodule changes to be committed:"
1871msgstr "要提交的子模组变更:"
1872
7aea43ff 1873#: wt-status.c:838
cfff71a9
JX
1874msgid ""
1875"Do not touch the line above.\n"
1876"Everything below will be removed."
1877msgstr ""
1878"不要改动上面的一行。\n"
1879"下面的所有内容均将被删除。"
1880
7aea43ff 1881#: wt-status.c:949
6792b93b 1882msgid "You have unmerged paths."
195febda 1883msgstr "您有尚未合并的路径。"
6792b93b
JX
1884
1885# 译者:注意保持前导空格
7aea43ff 1886#: wt-status.c:952
6792b93b
JX
1887msgid " (fix conflicts and run \"git commit\")"
1888msgstr " (解决冲突并运行 \"git commit\")"
1889
7aea43ff 1890#: wt-status.c:955
6792b93b
JX
1891msgid "All conflicts fixed but you are still merging."
1892msgstr "所有冲突已解决但您仍处于合并中。"
1893
1894# 译者:注意保持前导空格
7aea43ff 1895#: wt-status.c:958
6792b93b
JX
1896msgid " (use \"git commit\" to conclude merge)"
1897msgstr " (使用 \"git commit\" 结束合并)"
1898
7aea43ff 1899#: wt-status.c:968
6792b93b 1900msgid "You are in the middle of an am session."
98b2761d 1901msgstr "您正处于 am 操作过程中。"
6792b93b 1902
7aea43ff 1903#: wt-status.c:971
6792b93b
JX
1904msgid "The current patch is empty."
1905msgstr "当前的补丁为空。"
1906
1907# 译者:注意保持前导空格
7aea43ff 1908#: wt-status.c:975
2e8451e8
JX
1909msgid " (fix conflicts and then run \"git am --continue\")"
1910msgstr " (解决冲突,然后运行 \"git am --continue\")"
6792b93b
JX
1911
1912# 译者:注意保持前导空格
7aea43ff 1913#: wt-status.c:977
6792b93b
JX
1914msgid " (use \"git am --skip\" to skip this patch)"
1915msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1916
1917# 译者:注意保持前导空格
7aea43ff 1918#: wt-status.c:979
6792b93b
JX
1919msgid " (use \"git am --abort\" to restore the original branch)"
1920msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1921
7aea43ff 1922#: wt-status.c:1039 wt-status.c:1056
63af42fe
JX
1923#, c-format
1924msgid "You are currently rebasing branch '%s' on '%s'."
98b2761d 1925msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
63af42fe 1926
7aea43ff 1927#: wt-status.c:1044 wt-status.c:1061
6792b93b 1928msgid "You are currently rebasing."
98b2761d 1929msgstr "您在执行变基操作。"
6792b93b
JX
1930
1931# 译者:注意保持前导空格
7aea43ff 1932#: wt-status.c:1047
6792b93b
JX
1933msgid " (fix conflicts and then run \"git rebase --continue\")"
1934msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1935
1936# 译者:注意保持前导空格
7aea43ff 1937#: wt-status.c:1049
6792b93b
JX
1938msgid " (use \"git rebase --skip\" to skip this patch)"
1939msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1940
1941# 译者:注意保持前导空格
7aea43ff 1942#: wt-status.c:1051
6792b93b
JX
1943msgid " (use \"git rebase --abort\" to check out the original branch)"
1944msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1945
1946# 译者:注意保持前导空格
7aea43ff 1947#: wt-status.c:1064
6792b93b
JX
1948msgid " (all conflicts fixed: run \"git rebase --continue\")"
1949msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1950
7aea43ff 1951#: wt-status.c:1068
63af42fe
JX
1952#, c-format
1953msgid ""
1954"You are currently splitting a commit while rebasing branch '%s' on '%s'."
98b2761d 1955msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
63af42fe 1956
7aea43ff 1957#: wt-status.c:1073
6792b93b 1958msgid "You are currently splitting a commit during a rebase."
98b2761d 1959msgstr "您在执行变基操作时拆分提交。"
6792b93b
JX
1960
1961# 译者:注意保持前导空格
7aea43ff 1962#: wt-status.c:1076
6792b93b
JX
1963msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1964msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1965
7aea43ff 1966#: wt-status.c:1080
63af42fe
JX
1967#, c-format
1968msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
98b2761d 1969msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
63af42fe 1970
7aea43ff 1971#: wt-status.c:1085
6792b93b 1972msgid "You are currently editing a commit during a rebase."
98b2761d 1973msgstr "您在执行变基操作时编辑提交。"
6792b93b
JX
1974
1975# 译者:注意保持前导空格
7aea43ff 1976#: wt-status.c:1088
6792b93b
JX
1977msgid " (use \"git commit --amend\" to amend the current commit)"
1978msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1979
1980# 译者:注意保持前导空格
7aea43ff 1981#: wt-status.c:1090
6792b93b
JX
1982msgid ""
1983" (use \"git rebase --continue\" once you are satisfied with your changes)"
195febda 1984msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
6792b93b 1985
7aea43ff 1986#: wt-status.c:1100
90314792
JX
1987#, c-format
1988msgid "You are currently cherry-picking commit %s."
98b2761d 1989msgstr "您在执行拣选提交 %s 的操作。"
6792b93b 1990
2e8451e8 1991# 译者:注意保持前导空格
7aea43ff 1992#: wt-status.c:1105
2e8451e8
JX
1993msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1994msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1995
6792b93b 1996# 译者:注意保持前导空格
7aea43ff 1997#: wt-status.c:1108
2e8451e8
JX
1998msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1999msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
6792b93b 2000
2e8451e8 2001# 译者:注意保持前导空格
7aea43ff 2002#: wt-status.c:1110
2e8451e8
JX
2003msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2004msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
2005
7aea43ff 2006#: wt-status.c:1119
1003b3a5
JX
2007#, c-format
2008msgid "You are currently reverting commit %s."
98b2761d 2009msgstr "您在执行反转提交 %s 的操作。"
1003b3a5
JX
2010
2011# 译者:注意保持前导空格
7aea43ff 2012#: wt-status.c:1124
1003b3a5
JX
2013msgid " (fix conflicts and run \"git revert --continue\")"
2014msgstr " (解决冲突并运行 \"git revert --continue\")"
2015
2016# 译者:注意保持前导空格
7aea43ff 2017#: wt-status.c:1127
1003b3a5
JX
2018msgid " (all conflicts fixed: run \"git revert --continue\")"
2019msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
2020
2021# 译者:注意保持前导空格
7aea43ff 2022#: wt-status.c:1129
1003b3a5
JX
2023msgid " (use \"git revert --abort\" to cancel the revert operation)"
2024msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
2025
7aea43ff 2026#: wt-status.c:1140
63af42fe 2027#, c-format
1003b3a5 2028msgid "You are currently bisecting, started from branch '%s'."
98b2761d 2029msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
63af42fe 2030
7aea43ff 2031#: wt-status.c:1144
6792b93b 2032msgid "You are currently bisecting."
98b2761d 2033msgstr "您在执行二分查找操作。"
6792b93b
JX
2034
2035# 译者:注意保持前导空格
7aea43ff 2036#: wt-status.c:1147
6792b93b
JX
2037msgid " (use \"git bisect reset\" to get back to the original branch)"
2038msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
2039
7aea43ff 2040#: wt-status.c:1324
c04f5ac3
JX
2041msgid "On branch "
2042msgstr "位于分支 "
2043
7aea43ff 2044#: wt-status.c:1331
2e8451e8 2045msgid "rebase in progress; onto "
98b2761d 2046msgstr "变基操作正在进行中;至 "
2e8451e8 2047
7aea43ff 2048#: wt-status.c:1336
1003b3a5
JX
2049msgid "HEAD detached at "
2050msgstr "头指针分离于 "
2051
7aea43ff 2052#: wt-status.c:1338
1003b3a5
JX
2053msgid "HEAD detached from "
2054msgstr "头指针分离自 "
2055
7aea43ff 2056#: wt-status.c:1341
c04f5ac3
JX
2057msgid "Not currently on any branch."
2058msgstr "当前不在任何分支上。"
2059
7aea43ff 2060#: wt-status.c:1358
c04f5ac3
JX
2061msgid "Initial commit"
2062msgstr "初始提交"
2063
7aea43ff 2064#: wt-status.c:1372
ef317cd5 2065msgid "Untracked files"
07432cef 2066msgstr "未跟踪的文件"
c04f5ac3 2067
7aea43ff 2068#: wt-status.c:1374
ef317cd5 2069msgid "Ignored files"
07432cef 2070msgstr "忽略的文件"
c04f5ac3 2071
7aea43ff 2072#: wt-status.c:1378
1003b3a5 2073#, c-format
4dcdc3d8
JX
2074msgid ""
2075"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2076"may speed it up, but you have to be careful not to forget to add\n"
2077"new files yourself (see 'git help status')."
2078msgstr ""
2079"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
2080"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1003b3a5 2081
7aea43ff 2082#: wt-status.c:1384
c04f5ac3
JX
2083#, c-format
2084msgid "Untracked files not listed%s"
2085msgstr "未跟踪的文件没有列出%s"
2086
7e238ab7 2087# 译者:中文字符串拼接,可删除前导空格
7aea43ff 2088#: wt-status.c:1386
c04f5ac3 2089msgid " (use -u option to show untracked files)"
7e238ab7 2090msgstr "(使用 -u 参数显示未跟踪的文件)"
c04f5ac3 2091
7aea43ff 2092#: wt-status.c:1392
c04f5ac3
JX
2093msgid "No changes"
2094msgstr "没有修改"
2095
7aea43ff 2096#: wt-status.c:1397
07432cef 2097#, c-format
ef317cd5 2098msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
07432cef 2099msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
c04f5ac3 2100
7aea43ff 2101#: wt-status.c:1400
07432cef 2102#, c-format
ef317cd5 2103msgid "no changes added to commit\n"
07432cef 2104msgstr "修改尚未加入提交\n"
c04f5ac3 2105
7aea43ff 2106#: wt-status.c:1403
07432cef 2107#, c-format
ef317cd5
JX
2108msgid ""
2109"nothing added to commit but untracked files present (use \"git add\" to "
2110"track)\n"
07432cef 2111msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
c04f5ac3 2112
7aea43ff 2113#: wt-status.c:1406
07432cef 2114#, c-format
ef317cd5 2115msgid "nothing added to commit but untracked files present\n"
07432cef 2116msgstr "提交为空,但是存在尚未跟踪的文件\n"
c04f5ac3 2117
7e238ab7 2118# 译者:中文字符串拼接,可删除前导空格
7aea43ff 2119#: wt-status.c:1409
07432cef 2120#, c-format
ef317cd5 2121msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
07432cef 2122msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
c04f5ac3 2123
7aea43ff 2124#: wt-status.c:1412 wt-status.c:1417
07432cef 2125#, c-format
ef317cd5 2126msgid "nothing to commit\n"
07432cef 2127msgstr "无文件要提交\n"
ef317cd5 2128
7e238ab7 2129# 译者:中文字符串拼接,可删除前导空格
7aea43ff 2130#: wt-status.c:1415
07432cef 2131#, c-format
ef317cd5 2132msgid "nothing to commit (use -u to show untracked files)\n"
07432cef 2133msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
c04f5ac3 2134
7e238ab7 2135# 译者:中文字符串拼接,可删除前导空格
7aea43ff 2136#: wt-status.c:1419
07432cef 2137#, c-format
ef317cd5 2138msgid "nothing to commit, working directory clean\n"
07432cef 2139msgstr "无文件要提交,干净的工作区\n"
c04f5ac3 2140
7aea43ff 2141#: wt-status.c:1528
c04f5ac3 2142msgid "HEAD (no branch)"
61bc0753 2143msgstr "HEAD(非分支)"
c04f5ac3 2144
90e6ef53 2145# 译者:注意保持句尾空格
7aea43ff 2146#: wt-status.c:1534
c04f5ac3
JX
2147msgid "Initial commit on "
2148msgstr "初始提交于 "
2149
7aea43ff 2150#: wt-status.c:1561
90314792
JX
2151msgid "gone"
2152msgstr "丢失"
2153
90e6ef53 2154# 译者:注意保持句尾空格
7aea43ff 2155#: wt-status.c:1563 wt-status.c:1571
c04f5ac3
JX
2156msgid "behind "
2157msgstr "落后 "
2158
5bb01d4f 2159#: compat/precompose_utf8.c:55 builtin/clone.c:345
a77c07d9
JX
2160#, c-format
2161msgid "failed to unlink '%s'"
2162msgstr "无法删除 '%s'"
2163
220c313c 2164#: builtin/add.c:22
814ff314 2165msgid "git add [<options>] [--] <pathspec>..."
160fb2b2 2166msgstr "git add [<选项>] [--] <路径规格>..."
ef317cd5 2167
220c313c 2168#: builtin/add.c:65
c04f5ac3
JX
2169#, c-format
2170msgid "unexpected diff status %c"
2171msgstr "意外的差异状态 %c"
2172
44f518e6 2173#: builtin/add.c:70 builtin/commit.c:277
c04f5ac3
JX
2174msgid "updating files failed"
2175msgstr "更新文件失败"
2176
220c313c 2177#: builtin/add.c:80
c04f5ac3
JX
2178#, c-format
2179msgid "remove '%s'\n"
2180msgstr "删除 '%s'\n"
2181
220c313c 2182#: builtin/add.c:134
c04f5ac3 2183msgid "Unstaged changes after refreshing the index:"
90e6ef53 2184msgstr "刷新索引之后尚未被暂存的变更:"
c04f5ac3 2185
7aea43ff 2186#: builtin/add.c:194 builtin/rev-parse.c:796
c04f5ac3 2187msgid "Could not read the index"
90e6ef53 2188msgstr "不能读取索引"
c04f5ac3 2189
220c313c 2190#: builtin/add.c:205
c04f5ac3
JX
2191#, c-format
2192msgid "Could not open '%s' for writing."
195febda 2193msgstr "不能打开 '%s' 以写入。"
c04f5ac3 2194
220c313c 2195#: builtin/add.c:209
c04f5ac3 2196msgid "Could not write patch"
195febda 2197msgstr "不能生成补丁"
c04f5ac3 2198
7aea43ff
JX
2199#: builtin/add.c:212
2200msgid "editing patch failed"
2201msgstr "编辑补丁失败"
2202
2203#: builtin/add.c:215
c04f5ac3
JX
2204#, c-format
2205msgid "Could not stat '%s'"
90e6ef53 2206msgstr "不能查看文件状态 '%s'"
c04f5ac3 2207
7aea43ff 2208#: builtin/add.c:217
c04f5ac3
JX
2209msgid "Empty patch. Aborted."
2210msgstr "空补丁。异常终止。"
2211
7aea43ff 2212#: builtin/add.c:222
8ada9598
JX
2213#, c-format
2214msgid "Could not apply '%s'"
2215msgstr "不能应用 '%s'"
2216
7aea43ff 2217#: builtin/add.c:232
8ada9598 2218msgid "The following paths are ignored by one of your .gitignore files:\n"
195febda 2219msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 2220
7aea43ff
JX
2221#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110
2222#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369
2223#: builtin/rm.c:268
ef317cd5 2224msgid "dry run"
07432cef 2225msgstr "演习"
ef317cd5 2226
7aea43ff
JX
2227#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
2228#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616
220c313c 2229#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
ef317cd5
JX
2230msgid "be verbose"
2231msgstr "冗长输出"
2232
7aea43ff 2233#: builtin/add.c:252
ef317cd5 2234msgid "interactive picking"
07432cef 2235msgstr "交互式拣选"
ef317cd5 2236
5bb01d4f 2237#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
ef317cd5 2238msgid "select hunks interactively"
07432cef 2239msgstr "交互式挑选数据块"
ef317cd5 2240
7aea43ff 2241#: builtin/add.c:254
ef317cd5 2242msgid "edit current diff and apply"
07432cef 2243msgstr "编辑当前差异并应用"
ef317cd5 2244
7aea43ff 2245#: builtin/add.c:255
ef317cd5 2246msgid "allow adding otherwise ignored files"
07432cef 2247msgstr "允许添加忽略的文件"
ef317cd5 2248
7aea43ff 2249#: builtin/add.c:256
ef317cd5 2250msgid "update tracked files"
07432cef 2251msgstr "更新已跟踪的文件"
ef317cd5 2252
7aea43ff 2253#: builtin/add.c:257
ef317cd5 2254msgid "record only the fact that the path will be added later"
07432cef 2255msgstr "只记录,该路径稍后再添加"
ef317cd5 2256
7aea43ff 2257#: builtin/add.c:258
ef317cd5 2258msgid "add changes from all tracked and untracked files"
07432cef 2259msgstr "添加所有改变的已跟踪文件和未跟踪文件"
ef317cd5 2260
7aea43ff 2261#: builtin/add.c:261
4dcdc3d8
JX
2262msgid "ignore paths removed in the working tree (same as --no-all)"
2263msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2264
7aea43ff 2265#: builtin/add.c:263
ef317cd5 2266msgid "don't add, only refresh the index"
07432cef 2267msgstr "不添加,只刷新索引"
ef317cd5 2268
7aea43ff 2269#: builtin/add.c:264
ef317cd5 2270msgid "just skip files which cannot be added because of errors"
07432cef 2271msgstr "跳过因出错不能添加的文件"
ef317cd5 2272
7aea43ff 2273#: builtin/add.c:265
ef317cd5 2274msgid "check if - even missing - files are ignored in dry run"
07432cef 2275msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
ef317cd5 2276
7aea43ff 2277#: builtin/add.c:287
8ada9598
JX
2278#, c-format
2279msgid "Use -f if you really want to add them.\n"
2280msgstr "使用 -f 参数如果您确实要添加它们。\n"
2281
7aea43ff 2282#: builtin/add.c:294
8ada9598
JX
2283msgid "adding files failed"
2284msgstr "添加文件失败"
2285
7aea43ff 2286#: builtin/add.c:330
8ada9598
JX
2287msgid "-A and -u are mutually incompatible"
2288msgstr "-A 和 -u 选项互斥"
2289
7aea43ff 2290#: builtin/add.c:337
8ada9598 2291msgid "Option --ignore-missing can only be used together with --dry-run"
649900bc 2292msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 2293
7aea43ff 2294#: builtin/add.c:358
8ada9598
JX
2295#, c-format
2296msgid "Nothing specified, nothing added.\n"
2297msgstr "没有指定文件,也没有文件被添加。\n"
2298
7aea43ff 2299#: builtin/add.c:359
8ada9598
JX
2300#, c-format
2301msgid "Maybe you wanted to say 'git add .'?\n"
2302msgstr "也许您想要执行 'git add .'?\n"
2303
7aea43ff
JX
2304#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918
2305#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
8ada9598
JX
2306msgid "index file corrupt"
2307msgstr "索引文件损坏"
2308
7aea43ff 2309#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
8ada9598
JX
2310msgid "Unable to write new index file"
2311msgstr "无法写入新索引文件"
2312
814ff314
JX
2313#: builtin/apply.c:59
2314msgid "git apply [<options>] [<patch>...]"
2315msgstr "git apply [<选项>] [<补丁>...]"
8ada9598 2316
814ff314 2317#: builtin/apply.c:112
81809b99 2318#, c-format
8ada9598 2319msgid "unrecognized whitespace option '%s'"
81809b99 2320msgstr "未能识别的空白字符选项 '%s'"
8ada9598 2321
814ff314 2322#: builtin/apply.c:127
81809b99 2323#, c-format
8ada9598 2324msgid "unrecognized whitespace ignore option '%s'"
81809b99 2325msgstr "未能识别的空白字符忽略选项 '%s'"
8ada9598 2326
814ff314 2327#: builtin/apply.c:822
8ada9598
JX
2328#, c-format
2329msgid "Cannot prepare timestamp regexp %s"
81809b99 2330msgstr "无法准备时间戳正则表达式 %s"
8ada9598 2331
814ff314 2332#: builtin/apply.c:831
8ada9598
JX
2333#, c-format
2334msgid "regexec returned %d for input: %s"
81809b99 2335msgstr "regexec 返回 %d,输入为:%s"
8ada9598 2336
814ff314 2337#: builtin/apply.c:912
81809b99 2338#, c-format
8ada9598 2339msgid "unable to find filename in patch at line %d"
81809b99 2340msgstr "不能在补丁的第 %d 行找到文件名"
8ada9598 2341
814ff314 2342#: builtin/apply.c:944
8ada9598
JX
2343#, c-format
2344msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
9aafc933 2345msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
8ada9598 2346
814ff314 2347#: builtin/apply.c:948
8ada9598
JX
2348#, c-format
2349msgid "git apply: bad git-diff - inconsistent new filename on line %d"
81809b99 2350msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
8ada9598 2351
814ff314 2352#: builtin/apply.c:949
8ada9598
JX
2353#, c-format
2354msgid "git apply: bad git-diff - inconsistent old filename on line %d"
81809b99 2355msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
8ada9598 2356
814ff314 2357#: builtin/apply.c:956
8ada9598
JX
2358#, c-format
2359msgid "git apply: bad git-diff - expected /dev/null on line %d"
9aafc933 2360msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
8ada9598 2361
814ff314 2362#: builtin/apply.c:1419
8ada9598
JX
2363#, c-format
2364msgid "recount: unexpected line: %.*s"
81809b99 2365msgstr "recount:意外的行:%.*s"
8ada9598 2366
814ff314 2367#: builtin/apply.c:1476
8ada9598
JX
2368#, c-format
2369msgid "patch fragment without header at line %d: %.*s"
81809b99 2370msgstr "第 %d 行的补丁片段没有头信息:%.*s"
8ada9598 2371
814ff314 2372#: builtin/apply.c:1493
8ada9598
JX
2373#, c-format
2374msgid ""
2375"git diff header lacks filename information when removing %d leading pathname "
2376"component (line %d)"
2377msgid_plural ""
2378"git diff header lacks filename information when removing %d leading pathname "
2379"components (line %d)"
5ae481e0
JX
2380msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2381msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
8ada9598 2382
7aea43ff 2383#: builtin/apply.c:1659
8ada9598 2384msgid "new file depends on old contents"
81809b99 2385msgstr "新文件依赖旧内容"
8ada9598 2386
7aea43ff 2387#: builtin/apply.c:1661
8ada9598 2388msgid "deleted file still has contents"
81809b99 2389msgstr "删除的文件仍有内容"
8ada9598 2390
7aea43ff 2391#: builtin/apply.c:1687
8ada9598
JX
2392#, c-format
2393msgid "corrupt patch at line %d"
195febda 2394msgstr "补丁在第 %d 行损坏"
8ada9598 2395
7aea43ff 2396#: builtin/apply.c:1723
8ada9598
JX
2397#, c-format
2398msgid "new file %s depends on old contents"
81809b99 2399msgstr "新文件 %s 依赖旧内容"
8ada9598 2400
7aea43ff 2401#: builtin/apply.c:1725
8ada9598
JX
2402#, c-format
2403msgid "deleted file %s still has contents"
81809b99 2404msgstr "删除的文件 %s 仍有内容"
8ada9598 2405
7aea43ff 2406#: builtin/apply.c:1728
8ada9598
JX
2407#, c-format
2408msgid "** warning: file %s becomes empty but is not deleted"
81809b99 2409msgstr "** 警告:文件 %s 成为空文件但并未删除"
8ada9598 2410
7aea43ff 2411#: builtin/apply.c:1874
8ada9598
JX
2412#, c-format
2413msgid "corrupt binary patch at line %d: %.*s"
81809b99 2414msgstr "二进制补丁在第 %d 行损坏:%.*s"
8ada9598 2415
7aea43ff 2416#: builtin/apply.c:1903
8ada9598
JX
2417#, c-format
2418msgid "unrecognized binary patch at line %d"
81809b99 2419msgstr "未能识别的二进制补丁位于第 %d 行"
8ada9598 2420
7aea43ff 2421#: builtin/apply.c:2054
8ada9598
JX
2422#, c-format
2423msgid "patch with only garbage at line %d"
81809b99 2424msgstr "补丁文件的第 %d 行只有垃圾数据"
8ada9598 2425
7aea43ff 2426#: builtin/apply.c:2144
81809b99 2427#, c-format
8ada9598 2428msgid "unable to read symlink %s"
81809b99 2429msgstr "无法读取符号链接 %s"
8ada9598 2430
7aea43ff 2431#: builtin/apply.c:2148
81809b99 2432#, c-format
8ada9598 2433msgid "unable to open or read %s"
81809b99 2434msgstr "不能打开或读取 %s"
8ada9598 2435
7aea43ff 2436#: builtin/apply.c:2781
81809b99 2437#, c-format
8ada9598 2438msgid "invalid start of line: '%c'"
81809b99 2439msgstr "无效的行首字符:'%c'"
8ada9598 2440
7aea43ff 2441#: builtin/apply.c:2900
8ada9598
JX
2442#, c-format
2443msgid "Hunk #%d succeeded at %d (offset %d line)."
2444msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
07432cef
WS
2445msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2446msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
8ada9598 2447
7aea43ff 2448#: builtin/apply.c:2912
8ada9598
JX
2449#, c-format
2450msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
81809b99 2451msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
8ada9598 2452
7aea43ff 2453#: builtin/apply.c:2918
8ada9598
JX
2454#, c-format
2455msgid ""
2456"while searching for:\n"
2457"%.*s"
2458msgstr ""
81809b99
JX
2459"当查询:\n"
2460"%.*s"
8ada9598 2461
7aea43ff 2462#: builtin/apply.c:2938
8ada9598
JX
2463#, c-format
2464msgid "missing binary patch data for '%s'"
81809b99 2465msgstr "缺失 '%s' 的二进制补丁数据"
8ada9598 2466
7aea43ff 2467#: builtin/apply.c:3039
8ada9598
JX
2468#, c-format
2469msgid "binary patch does not apply to '%s'"
81809b99 2470msgstr "二进制补丁未应用到 '%s'"
8ada9598 2471
7aea43ff 2472#: builtin/apply.c:3045
8ada9598
JX
2473#, c-format
2474msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
9aafc933 2475msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
8ada9598 2476
7aea43ff 2477#: builtin/apply.c:3066
8ada9598
JX
2478#, c-format
2479msgid "patch failed: %s:%ld"
81809b99 2480msgstr "打补丁失败:%s:%ld"
8ada9598 2481
7aea43ff 2482#: builtin/apply.c:3190
8ada9598 2483#, c-format
23ff3338
JX
2484msgid "cannot checkout %s"
2485msgstr "不能检出 %s"
8ada9598 2486
7aea43ff 2487#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
81809b99 2488#, c-format
8ada9598 2489msgid "read of %s failed"
81809b99 2490msgstr "读取 %s 失败"
8ada9598 2491
7aea43ff 2492#: builtin/apply.c:3243
814ff314
JX
2493#, c-format
2494msgid "reading from '%s' beyond a symbolic link"
2495msgstr "读取位于符号链接中的 '%s'"
2496
7aea43ff 2497#: builtin/apply.c:3271 builtin/apply.c:3493
81809b99 2498#, c-format
23ff3338
JX
2499msgid "path %s has been renamed/deleted"
2500msgstr "路径 %s 已经被重命名/删除"
8ada9598 2501
7aea43ff 2502#: builtin/apply.c:3352 builtin/apply.c:3507
8ada9598 2503#, c-format
23ff3338
JX
2504msgid "%s: does not exist in index"
2505msgstr "%s:不存在于索引中"
8ada9598 2506
7aea43ff 2507#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
81809b99 2508#, c-format
8ada9598 2509msgid "%s: %s"
81809b99 2510msgstr "%s:%s"
8ada9598 2511
7aea43ff 2512#: builtin/apply.c:3361 builtin/apply.c:3515
81809b99 2513#, c-format
8ada9598 2514msgid "%s: does not match index"
81809b99 2515msgstr "%s:和索引不匹配"
8ada9598 2516
7aea43ff 2517#: builtin/apply.c:3463
23ff3338
JX
2518msgid "removal patch leaves file contents"
2519msgstr "移除补丁仍留下了文件内容"
2520
7aea43ff 2521#: builtin/apply.c:3532
8ada9598
JX
2522#, c-format
2523msgid "%s: wrong type"
81809b99 2524msgstr "%s:错误类型"
8ada9598 2525
7aea43ff 2526#: builtin/apply.c:3534
8ada9598
JX
2527#, c-format
2528msgid "%s has type %o, expected %o"
9aafc933 2529msgstr "%s 的类型是 %o,应为 %o"
8ada9598 2530
7aea43ff 2531#: builtin/apply.c:3693 builtin/apply.c:3695
814ff314
JX
2532#, c-format
2533msgid "invalid path '%s'"
2534msgstr "无效路径 '%s'"
2535
7aea43ff 2536#: builtin/apply.c:3750
81809b99 2537#, c-format
8ada9598 2538msgid "%s: already exists in index"
81809b99 2539msgstr "%s:已经存在于索引中"
8ada9598 2540
7aea43ff 2541#: builtin/apply.c:3753
23ff3338
JX
2542#, c-format
2543msgid "%s: already exists in working directory"
2544msgstr "%s:已经存在于工作区中"
2545
7aea43ff 2546#: builtin/apply.c:3773
d691f479
JX
2547#, c-format
2548msgid "new mode (%o) of %s does not match old mode (%o)"
2549msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
8ada9598 2550
7aea43ff 2551#: builtin/apply.c:3778
8ada9598 2552#, c-format
d691f479
JX
2553msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2554msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2555
7aea43ff 2556#: builtin/apply.c:3798
814ff314
JX
2557#, c-format
2558msgid "affected file '%s' is beyond a symbolic link"
2559msgstr "受影响的文件 '%s' 位于符号链接中"
2560
7aea43ff 2561#: builtin/apply.c:3802
d691f479 2562#, c-format
8ada9598 2563msgid "%s: patch does not apply"
81809b99 2564msgstr "%s:补丁未应用"
8ada9598 2565
7aea43ff 2566#: builtin/apply.c:3816
8ada9598
JX
2567#, c-format
2568msgid "Checking patch %s..."
81809b99 2569msgstr "检查补丁 %s..."
8ada9598 2570
5bb01d4f 2571#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
8ada9598
JX
2572#, c-format
2573msgid "make_cache_entry failed for path '%s'"
2574msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2575
7aea43ff 2576#: builtin/apply.c:4052
81809b99 2577#, c-format
8ada9598 2578msgid "unable to remove %s from index"
81809b99 2579msgstr "不能从索引中移除 %s"
8ada9598 2580
7aea43ff 2581#: builtin/apply.c:4081
8ada9598 2582#, c-format
2e8451e8
JX
2583msgid "corrupt patch for submodule %s"
2584msgstr "子模组 %s 损坏的补丁"
8ada9598 2585
7aea43ff 2586#: builtin/apply.c:4085
81809b99 2587#, c-format
8ada9598 2588msgid "unable to stat newly created file '%s'"
81809b99 2589msgstr "不能枚举新建文件 '%s' 的状态"
8ada9598 2590
7aea43ff 2591#: builtin/apply.c:4090
8ada9598
JX
2592#, c-format
2593msgid "unable to create backing store for newly created file %s"
81809b99 2594msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 2595
7aea43ff 2596#: builtin/apply.c:4093 builtin/apply.c:4201
81809b99 2597#, c-format
8ada9598 2598msgid "unable to add cache entry for %s"
81809b99 2599msgstr "无法为 %s 添加缓存条目"
8ada9598 2600
7aea43ff 2601#: builtin/apply.c:4126
81809b99 2602#, c-format
8ada9598 2603msgid "closing file '%s'"
81809b99 2604msgstr "关闭文件 '%s'"
8ada9598 2605
7aea43ff 2606#: builtin/apply.c:4175
81809b99 2607#, c-format
8ada9598 2608msgid "unable to write file '%s' mode %o"
81809b99 2609msgstr "不能写文件 '%s' 权限 %o"
8ada9598 2610
7aea43ff 2611#: builtin/apply.c:4262
8ada9598
JX
2612#, c-format
2613msgid "Applied patch %s cleanly."
81809b99 2614msgstr "成功应用补丁 %s。"
8ada9598 2615
7aea43ff 2616#: builtin/apply.c:4270
8ada9598 2617msgid "internal error"
81809b99 2618msgstr "内部错误"
8ada9598 2619
7aea43ff 2620#: builtin/apply.c:4273
8ada9598
JX
2621#, c-format
2622msgid "Applying patch %%s with %d reject..."
2623msgid_plural "Applying patch %%s with %d rejects..."
195febda
T
2624msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2625msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
8ada9598 2626
7aea43ff 2627#: builtin/apply.c:4283
8ada9598
JX
2628#, c-format
2629msgid "truncating .rej filename to %.*s.rej"
81809b99 2630msgstr "截短 .rej 文件名为 %.*s.rej"
8ada9598 2631
7aea43ff 2632#: builtin/apply.c:4304
8ada9598
JX
2633#, c-format
2634msgid "Hunk #%d applied cleanly."
81809b99 2635msgstr "第 #%d 个片段成功应用。"
8ada9598 2636
7aea43ff 2637#: builtin/apply.c:4307
8ada9598
JX
2638#, c-format
2639msgid "Rejected hunk #%d."
81809b99 2640msgstr "拒绝第 #%d 个片段。"
8ada9598 2641
7aea43ff 2642#: builtin/apply.c:4397
8ada9598 2643msgid "unrecognized input"
81809b99 2644msgstr "未能识别的输入"
8ada9598 2645
7aea43ff 2646#: builtin/apply.c:4408
8ada9598 2647msgid "unable to read index file"
81809b99 2648msgstr "无法读取索引文件"
8ada9598 2649
7aea43ff 2650#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85
814ff314 2651#: builtin/fetch.c:92
8ada9598 2652msgid "path"
81809b99 2653msgstr "路径"
8ada9598 2654
7aea43ff 2655#: builtin/apply.c:4526
8ada9598 2656msgid "don't apply changes matching the given path"
81809b99 2657msgstr "不要应用与给出路径向匹配的变更"
8ada9598 2658
7aea43ff 2659#: builtin/apply.c:4529
8ada9598 2660msgid "apply changes matching the given path"
81809b99 2661msgstr "应用与给出路径向匹配的变更"
8ada9598 2662
7aea43ff 2663#: builtin/apply.c:4531
8ada9598 2664msgid "num"
81809b99 2665msgstr "数字"
8ada9598 2666
7aea43ff 2667#: builtin/apply.c:4532
8ada9598 2668msgid "remove <num> leading slashes from traditional diff paths"
07432cef 2669msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
8ada9598 2670
7aea43ff 2671#: builtin/apply.c:4535
8ada9598 2672msgid "ignore additions made by the patch"
81809b99 2673msgstr "忽略补丁中的添加的文件"
8ada9598 2674
7aea43ff 2675#: builtin/apply.c:4537
8ada9598 2676msgid "instead of applying the patch, output diffstat for the input"
81809b99 2677msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
8ada9598 2678
7aea43ff 2679#: builtin/apply.c:4541
ef317cd5 2680msgid "show number of added and deleted lines in decimal notation"
07432cef 2681msgstr "以十进制数显示添加和删除的行数"
8ada9598 2682
7aea43ff 2683#: builtin/apply.c:4543
8ada9598 2684msgid "instead of applying the patch, output a summary for the input"
81809b99 2685msgstr "不应用补丁,而是显示输入的概要"
8ada9598 2686
7aea43ff 2687#: builtin/apply.c:4545
8ada9598 2688msgid "instead of applying the patch, see if the patch is applicable"
81809b99 2689msgstr "不应用补丁,而是查看补丁是否可应用"
8ada9598 2690
7aea43ff 2691#: builtin/apply.c:4547
8ada9598 2692msgid "make sure the patch is applicable to the current index"
81809b99 2693msgstr "确认补丁可以应用到当前索引"
8ada9598 2694
7aea43ff 2695#: builtin/apply.c:4549
8ada9598 2696msgid "apply a patch without touching the working tree"
81809b99 2697msgstr "应用补丁而不修改工作区"
8ada9598 2698
7aea43ff 2699#: builtin/apply.c:4551
814ff314
JX
2700msgid "accept a patch that touches outside the working area"
2701msgstr "接受修改工作区之外文件的补丁"
2702
7aea43ff 2703#: builtin/apply.c:4553
8ada9598 2704msgid "also apply the patch (use with --stat/--summary/--check)"
195febda 2705msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
8ada9598 2706
7aea43ff 2707#: builtin/apply.c:4555
23ff3338 2708msgid "attempt three-way merge if a patch does not apply"
160fb2b2 2709msgstr "如果一个补丁不能应用则尝试三方合并"
23ff3338 2710
7aea43ff 2711#: builtin/apply.c:4557
8ada9598 2712msgid "build a temporary index based on embedded index information"
81809b99 2713msgstr "创建一个临时索引基于嵌入的索引信息"
8ada9598 2714
7aea43ff 2715#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
8ada9598 2716msgid "paths are separated with NUL character"
81809b99 2717msgstr "路径以 NUL 字符分隔"
8ada9598 2718
7aea43ff 2719#: builtin/apply.c:4562
8ada9598 2720msgid "ensure at least <n> lines of context match"
81809b99 2721msgstr "确保至少匹配 <n> 行上下文"
8ada9598 2722
7aea43ff 2723#: builtin/apply.c:4563
8ada9598 2724msgid "action"
81809b99 2725msgstr "动作"
8ada9598 2726
7aea43ff 2727#: builtin/apply.c:4564
8ada9598 2728msgid "detect new or modified lines that have whitespace errors"
81809b99 2729msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 2730
7aea43ff 2731#: builtin/apply.c:4567 builtin/apply.c:4570
8ada9598 2732msgid "ignore changes in whitespace when finding context"
81809b99 2733msgstr "查找上下文时忽略空白字符的变更"
8ada9598 2734
7aea43ff 2735#: builtin/apply.c:4573
8ada9598 2736msgid "apply the patch in reverse"
81809b99 2737msgstr "反向应用补丁"
8ada9598 2738
7aea43ff 2739#: builtin/apply.c:4575
8ada9598 2740msgid "don't expect at least one line of context"
81809b99 2741msgstr "无需至少一行上下文"
8ada9598 2742
7aea43ff 2743#: builtin/apply.c:4577
8ada9598 2744msgid "leave the rejected hunks in corresponding *.rej files"
81809b99 2745msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 2746
7aea43ff 2747#: builtin/apply.c:4579
8ada9598 2748msgid "allow overlapping hunks"
81809b99 2749msgstr "允许重叠的补丁片段"
8ada9598 2750
7aea43ff 2751#: builtin/apply.c:4582
8ada9598 2752msgid "tolerate incorrectly detected missing new-line at the end of file"
195febda 2753msgstr "允许不正确的文件末尾换行符"
c04f5ac3 2754
7aea43ff 2755#: builtin/apply.c:4585
8ada9598 2756msgid "do not trust the line counts in the hunk headers"
81809b99 2757msgstr "不信任补丁片段的头信息中的行号"
c04f5ac3 2758
7aea43ff 2759#: builtin/apply.c:4587
8ada9598 2760msgid "root"
81809b99 2761msgstr "根目录"
c04f5ac3 2762
7aea43ff 2763#: builtin/apply.c:4588
8ada9598 2764msgid "prepend <root> to all filenames"
81809b99 2765msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 2766
7aea43ff 2767#: builtin/apply.c:4610
23ff3338 2768msgid "--3way outside a repository"
160fb2b2 2769msgstr "--3way 在一个仓库之外"
23ff3338 2770
7aea43ff 2771#: builtin/apply.c:4618
8ada9598 2772msgid "--index outside a repository"
160fb2b2 2773msgstr "--index 在一个仓库之外"
c04f5ac3 2774
7aea43ff 2775#: builtin/apply.c:4621
8ada9598 2776msgid "--cached outside a repository"
160fb2b2 2777msgstr "--cached 在一个仓库之外"
c04f5ac3 2778
7aea43ff 2779#: builtin/apply.c:4640
81809b99 2780#, c-format
8ada9598 2781msgid "can't open patch '%s'"
81809b99 2782msgstr "不能打开补丁 '%s'"
c04f5ac3 2783
7aea43ff 2784#: builtin/apply.c:4654
c04f5ac3 2785#, c-format
8ada9598
JX
2786msgid "squelched %d whitespace error"
2787msgid_plural "squelched %d whitespace errors"
81809b99 2788msgstr[0] "抑制下仍有 %d 个空白字符误用"
5ae481e0 2789msgstr[1] "抑制下仍有 %d 个空白字符误用"
c04f5ac3 2790
7aea43ff 2791#: builtin/apply.c:4660 builtin/apply.c:4670
8ada9598
JX
2792#, c-format
2793msgid "%d line adds whitespace errors."
2794msgid_plural "%d lines add whitespace errors."
81809b99 2795msgstr[0] "%d 行有空白字符误用。"
5ae481e0 2796msgstr[1] "%d 行有空白字符误用。"
c04f5ac3
JX
2797
2798#: builtin/archive.c:17
2799#, c-format
2800msgid "could not create archive file '%s'"
90e6ef53 2801msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
2802
2803#: builtin/archive.c:20
2804msgid "could not redirect output"
195febda 2805msgstr "不能重定向输出"
c04f5ac3
JX
2806
2807#: builtin/archive.c:37
2808msgid "git archive: Remote with no URL"
4375c10e 2809msgstr "git archive:未提供远程 URL"
c04f5ac3
JX
2810
2811#: builtin/archive.c:58
2812msgid "git archive: expected ACK/NAK, got EOF"
4375c10e 2813msgstr "git archive:应为 ACK/NACK,却得到 EOF"
c04f5ac3 2814
1003b3a5 2815#: builtin/archive.c:61
c04f5ac3
JX
2816#, c-format
2817msgid "git archive: NACK %s"
90e6ef53 2818msgstr "git archive:NACK %s"
c04f5ac3 2819
1003b3a5 2820#: builtin/archive.c:63
c04f5ac3
JX
2821#, c-format
2822msgid "remote error: %s"
2823msgstr "远程错误:%s"
2824
1003b3a5 2825#: builtin/archive.c:64
c04f5ac3 2826msgid "git archive: protocol error"
90e6ef53 2827msgstr "git archive:协议错误"
c04f5ac3 2828
1003b3a5 2829#: builtin/archive.c:68
c04f5ac3 2830msgid "git archive: expected a flush"
195febda 2831msgstr "git archive:应为刷新"
c04f5ac3 2832
ef317cd5
JX
2833#: builtin/bisect--helper.c:7
2834msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 2835msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5
JX
2836
2837#: builtin/bisect--helper.c:17
2838msgid "perform 'git bisect next'"
07432cef 2839msgstr "执行 'git bisect next'"
ef317cd5
JX
2840
2841#: builtin/bisect--helper.c:19
2842msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 2843msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 2844
7aea43ff
JX
2845#: builtin/blame.c:31
2846msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
2847msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 2848
7aea43ff 2849#: builtin/blame.c:36
814ff314
JX
2850msgid "<rev-opts> are documented in git-rev-list(1)"
2851msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 2852
814ff314 2853#: builtin/blame.c:2500
ef317cd5 2854msgid "Show blame entries as we find them, incrementally"
07432cef 2855msgstr "增量式地显示发现的 blame 条目"
ef317cd5 2856
814ff314 2857#: builtin/blame.c:2501
ef317cd5 2858msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 2859msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 2860
814ff314 2861#: builtin/blame.c:2502
ef317cd5 2862msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 2863msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 2864
814ff314 2865#: builtin/blame.c:2503
ef317cd5 2866msgid "Show work cost statistics"
07432cef 2867msgstr "显示命令消耗统计"
ef317cd5 2868
814ff314 2869#: builtin/blame.c:2504
ef317cd5 2870msgid "Show output score for blame entries"
07432cef 2871msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 2872
814ff314 2873#: builtin/blame.c:2505
ef317cd5 2874msgid "Show original filename (Default: auto)"
07432cef 2875msgstr "显示原始文件名(默认:自动)"
ef317cd5 2876
814ff314 2877#: builtin/blame.c:2506
ef317cd5 2878msgid "Show original linenumber (Default: off)"
07432cef 2879msgstr "显示原始的行号(默认:关闭)"
ef317cd5 2880
814ff314 2881#: builtin/blame.c:2507
ef317cd5 2882msgid "Show in a format designed for machine consumption"
07432cef 2883msgstr "显示为一个适合机器读取的格式"
ef317cd5 2884
814ff314 2885#: builtin/blame.c:2508
ef317cd5 2886msgid "Show porcelain format with per-line commit information"
07432cef 2887msgstr "为每一行显示机器适用的提交信息"
ef317cd5 2888
814ff314 2889#: builtin/blame.c:2509
ef317cd5 2890msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 2891msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 2892
814ff314 2893#: builtin/blame.c:2510
ef317cd5 2894msgid "Show raw timestamp (Default: off)"
07432cef 2895msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 2896
814ff314 2897#: builtin/blame.c:2511
ef317cd5 2898msgid "Show long commit SHA1 (Default: off)"
4375c10e 2899msgstr "显示长的 SHA1 提交号(默认:关闭)"
ef317cd5 2900
814ff314 2901#: builtin/blame.c:2512
ef317cd5 2902msgid "Suppress author name and timestamp (Default: off)"
07432cef 2903msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 2904
814ff314 2905#: builtin/blame.c:2513
ef317cd5 2906msgid "Show author email instead of name (Default: off)"
07432cef 2907msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 2908
814ff314 2909#: builtin/blame.c:2514
ef317cd5 2910msgid "Ignore whitespace differences"
07432cef 2911msgstr "忽略空白差异"
ef317cd5 2912
814ff314 2913#: builtin/blame.c:2515
ef317cd5 2914msgid "Spend extra cycles to find better match"
07432cef 2915msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 2916
814ff314 2917#: builtin/blame.c:2516
ef317cd5 2918msgid "Use revisions from <file> instead of calling git-rev-list"
d9d56b23 2919msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 2920
814ff314 2921#: builtin/blame.c:2517
ef317cd5 2922msgid "Use <file>'s contents as the final image"
d9d56b23 2923msgstr "使用 <文件> 的内容作为最终的图片"
ef317cd5 2924
814ff314 2925#: builtin/blame.c:2518 builtin/blame.c:2519
ef317cd5 2926msgid "score"
07432cef 2927msgstr "得分"
ef317cd5 2928
814ff314 2929#: builtin/blame.c:2518
ef317cd5 2930msgid "Find line copies within and across files"
07432cef 2931msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 2932
814ff314 2933#: builtin/blame.c:2519
ef317cd5 2934msgid "Find line movements within and across files"
07432cef 2935msgstr "找到文件内及跨文件的行移动"
ef317cd5 2936
814ff314 2937#: builtin/blame.c:2520
ef317cd5 2938msgid "n,m"
07432cef 2939msgstr "n,m"
ef317cd5 2940
814ff314 2941#: builtin/blame.c:2520
ef317cd5 2942msgid "Process only line range n,m, counting from 1"
07432cef 2943msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 2944
6c94aba5
JX
2945#. TRANSLATORS: This string is used to tell us the maximum
2946#. display width for a relative timestamp in "git blame"
2947#. output. For C locale, "4 years, 11 months ago", which
2948#. takes 22 places, is the longest among various forms of
2949#. relative timestamps, but your language may need more or
2950#. fewer display columns.
814ff314 2951#: builtin/blame.c:2601
6c94aba5
JX
2952msgid "4 years, 11 months ago"
2953msgstr "4 年 11 个月前"
2954
1003b3a5 2955#: builtin/branch.c:24
814ff314
JX
2956msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
2957msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
ef317cd5 2958
1003b3a5 2959#: builtin/branch.c:25
814ff314
JX
2960msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
2961msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 2962
1003b3a5 2963#: builtin/branch.c:26
814ff314
JX
2964msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
2965msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 2966
1003b3a5 2967#: builtin/branch.c:27
814ff314
JX
2968msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
2969msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 2970
90e6ef53 2971# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
7aea43ff 2972#: builtin/branch.c:150
c04f5ac3
JX
2973#, c-format
2974msgid ""
2975"deleting branch '%s' that has been merged to\n"
2976" '%s', but not yet merged to HEAD."
2977msgstr ""
70fc47bf 2978"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
2979" '%s',但未合并到 HEAD。"
2980
90e6ef53 2981# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
7aea43ff 2982#: builtin/branch.c:154
c04f5ac3
JX
2983#, c-format
2984msgid ""
2985"not deleting branch '%s' that is not yet merged to\n"
2986" '%s', even though it is merged to HEAD."
2987msgstr ""
70fc47bf
T
2988"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2989" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 2990
7aea43ff 2991#: builtin/branch.c:168
07432cef
WS
2992#, c-format
2993msgid "Couldn't look up commit object for '%s'"
2994msgstr "无法查询 '%s' 指向的提交对象"
2995
7aea43ff 2996#: builtin/branch.c:172
07432cef
WS
2997#, c-format
2998msgid ""
2999"The branch '%s' is not fully merged.\n"
3000"If you are sure you want to delete it, run 'git branch -D %s'."
3001msgstr ""
3002"分支 '%s' 没有完全合并。\n"
3003"如果您确认要删除它,执行 'git branch -D %s'。"
3004
7aea43ff 3005#: builtin/branch.c:185
07432cef
WS
3006msgid "Update of config-file failed"
3007msgstr "无法更新 config 文件"
3008
7aea43ff 3009#: builtin/branch.c:213
c04f5ac3 3010msgid "cannot use -a with -d"
649900bc 3011msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 3012
7aea43ff 3013#: builtin/branch.c:219
c04f5ac3
JX
3014msgid "Couldn't look up commit object for HEAD"
3015msgstr "无法查询 HEAD 指向的提交对象"
3016
7aea43ff 3017#: builtin/branch.c:227
c04f5ac3
JX
3018#, c-format
3019msgid "Cannot delete the branch '%s' which you are currently on."
3020msgstr "无法删除您当前所在的分支 '%s'。"
3021
7aea43ff 3022#: builtin/branch.c:243
5ae481e0 3023#, c-format
7aea43ff
JX
3024msgid "remote-tracking branch '%s' not found."
3025msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 3026
7aea43ff 3027#: builtin/branch.c:244
81809b99 3028#, c-format
8ada9598 3029msgid "branch '%s' not found."
81809b99 3030msgstr "分支 '%s' 未发现。"
8ada9598 3031
7aea43ff 3032#: builtin/branch.c:258
81809b99 3033#, c-format
7aea43ff
JX
3034msgid "Error deleting remote-tracking branch '%s'"
3035msgstr "无法删除远程跟踪分支 '%s'"
c04f5ac3 3036
7aea43ff 3037#: builtin/branch.c:259
81809b99 3038#, c-format
8ada9598 3039msgid "Error deleting branch '%s'"
7aea43ff 3040msgstr "无法删除分支 '%s'"
8ada9598 3041
7aea43ff 3042#: builtin/branch.c:266
81809b99 3043#, c-format
7aea43ff
JX
3044msgid "Deleted remote-tracking branch %s (was %s).\n"
3045msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 3046
7aea43ff 3047#: builtin/branch.c:267
81809b99 3048#, c-format
8ada9598 3049msgid "Deleted branch %s (was %s).\n"
81809b99 3050msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 3051
7aea43ff 3052#: builtin/branch.c:368
c04f5ac3
JX
3053#, c-format
3054msgid "branch '%s' does not point at a commit"
3055msgstr "分支 '%s' 未指向一个提交"
3056
7aea43ff 3057#: builtin/branch.c:451
81809b99 3058#, c-format
90314792
JX
3059msgid "[%s: gone]"
3060msgstr "[%s: 丢失]"
3061
7aea43ff 3062#: builtin/branch.c:456
90314792
JX
3063#, c-format
3064msgid "[%s]"
3065msgstr "[%s]"
3066
7aea43ff 3067#: builtin/branch.c:461
90314792 3068#, c-format
8ada9598 3069msgid "[%s: behind %d]"
81809b99 3070msgstr "[%s:落后 %d]"
c04f5ac3 3071
7aea43ff 3072#: builtin/branch.c:463
81809b99 3073#, c-format
8ada9598 3074msgid "[behind %d]"
81809b99 3075msgstr "[落后 %d]"
8ada9598 3076
7aea43ff 3077#: builtin/branch.c:467
81809b99 3078#, c-format
8ada9598 3079msgid "[%s: ahead %d]"
81809b99 3080msgstr "[%s:领先 %d]"
c04f5ac3 3081
7aea43ff 3082#: builtin/branch.c:469
81809b99 3083#, c-format
8ada9598 3084msgid "[ahead %d]"
81809b99 3085msgstr "[领先 %d]"
8ada9598 3086
7aea43ff 3087#: builtin/branch.c:472
81809b99 3088#, c-format
8ada9598 3089msgid "[%s: ahead %d, behind %d]"
81809b99 3090msgstr "[%s:领先 %d,落后 %d]"
8ada9598 3091
7aea43ff 3092#: builtin/branch.c:475
81809b99 3093#, c-format
8ada9598 3094msgid "[ahead %d, behind %d]"
81809b99 3095msgstr "[领先 %d,落后 %d]"
c04f5ac3 3096
7aea43ff 3097#: builtin/branch.c:488
a77c07d9
JX
3098msgid " **** invalid ref ****"
3099msgstr " **** 无效引用 ****"
3100
7aea43ff 3101#: builtin/branch.c:579
1003b3a5
JX
3102#, c-format
3103msgid "(no branch, rebasing %s)"
3104msgstr "(非分支,正变基 %s)"
3105
7aea43ff 3106#: builtin/branch.c:582
1003b3a5
JX
3107#, c-format
3108msgid "(no branch, bisect started on %s)"
3109msgstr "(非分支,二分查找开始于 %s)"
3110
7aea43ff 3111#: builtin/branch.c:588
1003b3a5 3112#, c-format
814ff314
JX
3113msgid "(HEAD detached at %s)"
3114msgstr "(头指针分离于 %s)"
1003b3a5 3115
7aea43ff 3116#: builtin/branch.c:591
814ff314
JX
3117#, c-format
3118msgid "(HEAD detached from %s)"
3119msgstr "(头指针分离自 %s)"
3120
7aea43ff 3121#: builtin/branch.c:595
c04f5ac3
JX
3122msgid "(no branch)"
3123msgstr "(非分支)"
3124
7aea43ff 3125#: builtin/branch.c:642
a77c07d9
JX
3126#, c-format
3127msgid "object '%s' does not point to a commit"
3128msgstr "对象 '%s' 没有指向一个提交"
3129
7aea43ff 3130#: builtin/branch.c:690
c04f5ac3 3131msgid "some refs could not be read"
90e6ef53 3132msgstr "一些引用不能读取"
c04f5ac3 3133
7aea43ff 3134#: builtin/branch.c:703
c04f5ac3 3135msgid "cannot rename the current branch while not on any."
90e6ef53 3136msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 3137
7aea43ff 3138#: builtin/branch.c:713
c04f5ac3
JX
3139#, c-format
3140msgid "Invalid branch name: '%s'"
3141msgstr "无效的分支名:'%s'"
3142
7aea43ff 3143#: builtin/branch.c:728
c04f5ac3
JX
3144msgid "Branch rename failed"
3145msgstr "分支重命名失败"
3146
7aea43ff 3147#: builtin/branch.c:732
c04f5ac3
JX
3148#, c-format
3149msgid "Renamed a misnamed branch '%s' away"
3150msgstr "重命名掉一个错误命名的旧分支 '%s'"
3151
7aea43ff 3152#: builtin/branch.c:736
c04f5ac3
JX
3153#, c-format
3154msgid "Branch renamed to %s, but HEAD is not updated!"
3155msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3156
7aea43ff 3157#: builtin/branch.c:743
c04f5ac3
JX
3158msgid "Branch is renamed, but update of config-file failed"
3159msgstr "分支被重命名,但更新 config 文件失败"
3160
7aea43ff 3161#: builtin/branch.c:758
c04f5ac3
JX
3162#, c-format
3163msgid "malformed object name %s"
3164msgstr "非法的对象名 %s"
3165
7aea43ff 3166#: builtin/branch.c:780
81809b99 3167#, c-format
8ada9598 3168msgid "could not write branch description template: %s"
81809b99 3169msgstr "不能写分支描述模版:%s"
c04f5ac3 3170
7aea43ff 3171#: builtin/branch.c:810
ef317cd5 3172msgid "Generic options"
07432cef 3173msgstr "通用选项"
c04f5ac3 3174
7aea43ff 3175#: builtin/branch.c:812
ef317cd5 3176msgid "show hash and subject, give twice for upstream branch"
07432cef 3177msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 3178
7aea43ff 3179#: builtin/branch.c:813
ef317cd5 3180msgid "suppress informational messages"
07432cef 3181msgstr "不显示信息"
8ada9598 3182
7aea43ff 3183#: builtin/branch.c:814
ef317cd5 3184msgid "set up tracking mode (see git-pull(1))"
07432cef 3185msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 3186
7aea43ff 3187#: builtin/branch.c:816
ef317cd5 3188msgid "change upstream info"
07432cef 3189msgstr "改变上游信息"
c04f5ac3 3190
7aea43ff 3191#: builtin/branch.c:820
ef317cd5 3192msgid "use colored output"
07432cef 3193msgstr "使用彩色输出"
c04f5ac3 3194
7aea43ff 3195#: builtin/branch.c:821
ef317cd5 3196msgid "act on remote-tracking branches"
07432cef 3197msgstr "作用于远程跟踪分支"
c04f5ac3 3198
7aea43ff
JX
3199#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851
3200#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582
3201#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616
220c313c 3202#: builtin/tag.c:622
ef317cd5 3203msgid "commit"
07432cef 3204msgstr "提交"
c04f5ac3 3205
7aea43ff 3206#: builtin/branch.c:825 builtin/branch.c:831
ef317cd5 3207msgid "print only branches that contain the commit"
07432cef 3208msgstr "只打印包含该提交的分支"
c04f5ac3 3209
7aea43ff 3210#: builtin/branch.c:837
ef317cd5 3211msgid "Specific git-branch actions:"
07432cef 3212msgstr "具体的 git-branch 动作:"
c04f5ac3 3213
7aea43ff 3214#: builtin/branch.c:838
ef317cd5 3215msgid "list both remote-tracking and local branches"
07432cef 3216msgstr "列出远程跟踪及本地分支"
c04f5ac3 3217
7aea43ff 3218#: builtin/branch.c:840
ef317cd5 3219msgid "delete fully merged branch"
07432cef 3220msgstr "删除完全合并的分支"
c04f5ac3 3221
7aea43ff 3222#: builtin/branch.c:841
ef317cd5 3223msgid "delete branch (even if not merged)"
07432cef 3224msgstr "删除分支(即使没有合并)"
c04f5ac3 3225
7aea43ff 3226#: builtin/branch.c:842
ef317cd5 3227msgid "move/rename a branch and its reflog"
07432cef 3228msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 3229
7aea43ff 3230#: builtin/branch.c:843
ef317cd5 3231msgid "move/rename a branch, even if target exists"
07432cef 3232msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 3233
7aea43ff 3234#: builtin/branch.c:844
ef317cd5 3235msgid "list branch names"
07432cef 3236msgstr "列出分支名"
c04f5ac3 3237
7aea43ff 3238#: builtin/branch.c:845
ef317cd5 3239msgid "create the branch's reflog"
07432cef 3240msgstr "创建分支的引用日志"
ef317cd5 3241
7aea43ff 3242#: builtin/branch.c:847
ef317cd5 3243msgid "edit the description for the branch"
07432cef 3244msgstr "标记分支的描述"
ef317cd5 3245
7aea43ff 3246#: builtin/branch.c:848
04cb2f28
JX
3247msgid "force creation, move/rename, deletion"
3248msgstr "强制创建、移动/重命名、删除"
ef317cd5 3249
7aea43ff 3250#: builtin/branch.c:851
ef317cd5 3251msgid "print only not merged branches"
07432cef 3252msgstr "只打印没有合并的分支"
ef317cd5 3253
7aea43ff 3254#: builtin/branch.c:857
ef317cd5 3255msgid "print only merged branches"
07432cef 3256msgstr "只打印合并的分支"
ef317cd5 3257
7aea43ff 3258#: builtin/branch.c:861
ef317cd5 3259msgid "list branches in columns"
07432cef 3260msgstr "以列的方式显示分支"
ef317cd5 3261
7aea43ff 3262#: builtin/branch.c:874
c04f5ac3
JX
3263msgid "Failed to resolve HEAD as a valid ref."
3264msgstr "无法将 HEAD 解析为有效引用。"
3265
5bb01d4f 3266#: builtin/branch.c:878 builtin/clone.c:622
c04f5ac3 3267msgid "HEAD not found below refs/heads!"
90e6ef53 3268msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 3269
7aea43ff 3270#: builtin/branch.c:900
8ada9598 3271msgid "--column and --verbose are incompatible"
81809b99 3272msgstr "--column 和 --verbose 不兼容"
8ada9598 3273
7aea43ff 3274#: builtin/branch.c:911 builtin/branch.c:950
a77c07d9
JX
3275msgid "branch name required"
3276msgstr "必须提供分支名"
3277
7aea43ff 3278#: builtin/branch.c:926
a77c07d9
JX
3279msgid "Cannot give description to detached HEAD"
3280msgstr "不能向分离头指针提供描述"
3281
7aea43ff 3282#: builtin/branch.c:931
a77c07d9
JX
3283msgid "cannot edit description of more than one branch"
3284msgstr "不能为一个以上的分支编辑描述"
3285
7aea43ff 3286#: builtin/branch.c:938
a77c07d9
JX
3287#, c-format
3288msgid "No commit on branch '%s' yet."
3289msgstr "分支 '%s' 尚无提交。"
3290
7aea43ff 3291#: builtin/branch.c:941
a77c07d9
JX
3292#, c-format
3293msgid "No branch named '%s'."
3294msgstr "没有分支 '%s'。"
3295
7aea43ff 3296#: builtin/branch.c:956
a77c07d9
JX
3297msgid "too many branches for a rename operation"
3298msgstr "为重命名操作提供了太多的分支名"
3299
7aea43ff 3300#: builtin/branch.c:961
1003b3a5
JX
3301msgid "too many branches to set new upstream"
3302msgstr "为设置新上游提供了太多的分支名"
3303
7aea43ff 3304#: builtin/branch.c:965
1003b3a5
JX
3305#, c-format
3306msgid ""
3307"could not set upstream of HEAD to %s when it does not point to any branch."
3308msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3309
7aea43ff 3310#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011
1003b3a5
JX
3311#, c-format
3312msgid "no such branch '%s'"
3313msgstr "没有此分支 '%s'"
3314
7aea43ff 3315#: builtin/branch.c:972
07432cef 3316#, c-format
ef317cd5 3317msgid "branch '%s' does not exist"
07432cef 3318msgstr "分支 '%s' 不存在"
ef317cd5 3319
7aea43ff 3320#: builtin/branch.c:984
1003b3a5
JX
3321msgid "too many branches to unset upstream"
3322msgstr "为取消上游设置操作提供了太多的分支名"
3323
7aea43ff 3324#: builtin/branch.c:988
1003b3a5
JX
3325msgid "could not unset upstream of HEAD when it does not point to any branch."
3326msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3327
7aea43ff 3328#: builtin/branch.c:994
ef317cd5
JX
3329#, c-format
3330msgid "Branch '%s' has no upstream information"
07432cef 3331msgstr "分支 '%s' 没有上游信息"
ef317cd5 3332
7aea43ff 3333#: builtin/branch.c:1008
1003b3a5
JX
3334msgid "it does not make sense to create 'HEAD' manually"
3335msgstr "手工创建 'HEAD' 没有意义"
3336
7aea43ff 3337#: builtin/branch.c:1014
c04f5ac3
JX
3338msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3339msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3340
7aea43ff 3341#: builtin/branch.c:1017
ef317cd5
JX
3342#, c-format
3343msgid ""
3344"The --set-upstream flag is deprecated and will be removed. Consider using --"
3345"track or --set-upstream-to\n"
3346msgstr ""
07432cef 3347"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
ef317cd5 3348
7aea43ff 3349#: builtin/branch.c:1034
ef317cd5
JX
3350#, c-format
3351msgid ""
3352"\n"
3353"If you wanted to make '%s' track '%s', do this:\n"
3354"\n"
3355msgstr ""
07432cef
WS
3356"\n"
3357"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3358"\n"
ef317cd5 3359
7aea43ff 3360#: builtin/branch.c:1035
07432cef 3361#, c-format
ef317cd5 3362msgid " git branch -d %s\n"
07432cef 3363msgstr " git branch -d %s\n"
ef317cd5 3364
7aea43ff 3365#: builtin/branch.c:1036
ef317cd5
JX
3366#, c-format
3367msgid " git branch --set-upstream-to %s\n"
07432cef 3368msgstr " git branch --set-upstream-to %s\n"
ef317cd5 3369
7aea43ff 3370#: builtin/bundle.c:51
c04f5ac3
JX
3371#, c-format
3372msgid "%s is okay\n"
3373msgstr "%s 可以\n"
3374
7aea43ff 3375#: builtin/bundle.c:64
c04f5ac3 3376msgid "Need a repository to create a bundle."
160fb2b2 3377msgstr "需要一个仓库来创建包。"
c04f5ac3 3378
7aea43ff 3379#: builtin/bundle.c:68
c04f5ac3 3380msgid "Need a repository to unbundle."
160fb2b2 3381msgstr "需要一个仓库来解包。"
c04f5ac3 3382
7aea43ff
JX
3383#: builtin/cat-file.c:369
3384msgid ""
3385"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3386"<type>|--textconv) <object>"
3387msgstr ""
3388"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
3389">|--textconv) <对象>"
ef317cd5 3390
7aea43ff
JX
3391#: builtin/cat-file.c:370
3392msgid ""
3393"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
3394"objects>"
3395msgstr ""
3396"git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>"
ef317cd5 3397
7aea43ff 3398#: builtin/cat-file.c:407
ef317cd5 3399msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 3400msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 3401
7aea43ff 3402#: builtin/cat-file.c:408
ef317cd5 3403msgid "show object type"
07432cef 3404msgstr "显示对象类型"
ef317cd5 3405
7aea43ff 3406#: builtin/cat-file.c:409
ef317cd5 3407msgid "show object size"
07432cef 3408msgstr "显示对象大小"
ef317cd5 3409
7aea43ff 3410#: builtin/cat-file.c:411
ef317cd5 3411msgid "exit with zero when there's no error"
07432cef 3412msgstr "当没有错误时退出并返回零"
ef317cd5 3413
7aea43ff 3414#: builtin/cat-file.c:412
ef317cd5 3415msgid "pretty-print object's content"
07432cef 3416msgstr "美观地打印对象的内容"
ef317cd5 3417
7aea43ff 3418#: builtin/cat-file.c:414
ef317cd5 3419msgid "for blob objects, run textconv on object's content"
160fb2b2 3420msgstr "对于数据对象,对其内容执行 textconv"
ef317cd5 3421
7aea43ff
JX
3422#: builtin/cat-file.c:416
3423msgid "allow -s and -t to work with broken/corrupt objects"
3424msgstr "允许 -s 和 -t 对损坏的对象生效"
3425
3426#: builtin/cat-file.c:418
ef317cd5 3427msgid "show info and content of objects fed from the standard input"
07432cef 3428msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 3429
7aea43ff 3430#: builtin/cat-file.c:421
ef317cd5 3431msgid "show info about objects fed from the standard input"
07432cef 3432msgstr "显示从标准输入提供的对象的信息"
ef317cd5 3433
7aea43ff
JX
3434#: builtin/cat-file.c:424
3435msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3436msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
3437
ef317cd5 3438#: builtin/check-attr.c:11
814ff314
JX
3439msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3440msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5
JX
3441
3442#: builtin/check-attr.c:12
814ff314
JX
3443msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
3444msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"
ef317cd5
JX
3445
3446#: builtin/check-attr.c:19
3447msgid "report all attributes set on file"
07432cef 3448msgstr "报告设置在文件上的所有属性"
ef317cd5
JX
3449
3450#: builtin/check-attr.c:20
3451msgid "use .gitattributes only from the index"
07432cef 3452msgstr "只使用索引中的 .gitattributes"
ef317cd5 3453
7aea43ff 3454#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
ef317cd5 3455msgid "read file names from stdin"
07432cef 3456msgstr "从标准输入读出文件名"
ef317cd5 3457
a77c07d9 3458#: builtin/check-attr.c:23 builtin/check-ignore.c:24
90314792
JX
3459msgid "terminate input and output records by a NUL character"
3460msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 3461
5bb01d4f 3462#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
a77c07d9
JX
3463msgid "suppress progress reporting"
3464msgstr "不显示进度报告"
3465
2e8451e8
JX
3466#: builtin/check-ignore.c:26
3467msgid "show non-matching input paths"
3468msgstr "显示未匹配的输入路径"
3469
90314792
JX
3470#: builtin/check-ignore.c:28
3471msgid "ignore index when checking"
3472msgstr "检查时忽略索引"
3473
3474#: builtin/check-ignore.c:154
a77c07d9
JX
3475msgid "cannot specify pathnames with --stdin"
3476msgstr "不能同时提供路径及 --stdin 参数"
3477
90314792 3478#: builtin/check-ignore.c:157
a77c07d9
JX
3479msgid "-z only makes sense with --stdin"
3480msgstr "-z 需要和 --stdin 参数共用才有意义"
3481
90314792 3482#: builtin/check-ignore.c:159
a77c07d9
JX
3483msgid "no path specified"
3484msgstr "未指定路径"
3485
90314792 3486#: builtin/check-ignore.c:163
a77c07d9
JX
3487msgid "--quiet is only valid with a single pathname"
3488msgstr "参数 --quiet 只在提供一个路径名时有效"
3489
90314792 3490#: builtin/check-ignore.c:165
a77c07d9
JX
3491msgid "cannot have both --quiet and --verbose"
3492msgstr "不能同时提供 --quiet 和 --verbose 参数"
3493
90314792 3494#: builtin/check-ignore.c:168
2e8451e8
JX
3495msgid "--non-matching is only valid with --verbose"
3496msgstr "--non-matching 选项只在使用 --verbose 时有效"
3497
3498#: builtin/check-mailmap.c:8
814ff314
JX
3499msgid "git check-mailmap [<options>] <contact>..."
3500msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8
JX
3501
3502#: builtin/check-mailmap.c:13
3503msgid "also read contacts from stdin"
3504msgstr "还从标准输入读取联系地址"
3505
3506#: builtin/check-mailmap.c:24
3507#, c-format
3508msgid "unable to parse contact: %s"
3509msgstr "不能解析联系地址:%s"
3510
3511#: builtin/check-mailmap.c:47
3512msgid "no contacts specified"
3513msgstr "未指定联系地址"
3514
ef317cd5 3515#: builtin/checkout-index.c:126
814ff314
JX
3516msgid "git checkout-index [<options>] [--] [<file>...]"
3517msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 3518
6acbf033 3519#: builtin/checkout-index.c:188
ef317cd5 3520msgid "check out all files in the index"
07432cef 3521msgstr "检出索引区的所有文件"
ef317cd5 3522
6acbf033 3523#: builtin/checkout-index.c:189
ef317cd5 3524msgid "force overwrite of existing files"
07432cef 3525msgstr "强制覆盖现有的文件"
ef317cd5 3526
6acbf033 3527#: builtin/checkout-index.c:191
ef317cd5 3528msgid "no warning for existing files and files not in index"
07432cef 3529msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 3530
6acbf033 3531#: builtin/checkout-index.c:193
ef317cd5 3532msgid "don't checkout new files"
07432cef 3533msgstr "不检出新文件"
ef317cd5 3534
6acbf033 3535#: builtin/checkout-index.c:195
ef317cd5 3536msgid "update stat information in the index file"
07432cef 3537msgstr "更新索引中文件的状态信息"
ef317cd5 3538
6acbf033 3539#: builtin/checkout-index.c:201
ef317cd5 3540msgid "read list of paths from the standard input"
07432cef 3541msgstr "从标准输入读取路径列表"
ef317cd5 3542
6acbf033 3543#: builtin/checkout-index.c:203
ef317cd5 3544msgid "write the content to temporary files"
07432cef 3545msgstr "将内容写入临时文件"
ef317cd5 3546
6acbf033 3547#: builtin/checkout-index.c:204 builtin/column.c:30
ef317cd5 3548msgid "string"
07432cef 3549msgstr "字符串"
ef317cd5 3550
6acbf033 3551#: builtin/checkout-index.c:205
ef317cd5 3552msgid "when creating files, prepend <string>"
4375c10e 3553msgstr "在创建文件时,在前面加上 <字符串>"
ef317cd5 3554
6acbf033 3555#: builtin/checkout-index.c:208
ef317cd5 3556msgid "copy out the files from named stage"
07432cef 3557msgstr "从指定暂存区中拷出文件"
ef317cd5 3558
5bb01d4f 3559#: builtin/checkout.c:24
814ff314
JX
3560msgid "git checkout [<options>] <branch>"
3561msgstr "git checkout [<选项>] <分支>"
ef317cd5 3562
5bb01d4f 3563#: builtin/checkout.c:25
814ff314
JX
3564msgid "git checkout [<options>] [<branch>] -- <file>..."
3565msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 3566
5bb01d4f 3567#: builtin/checkout.c:134 builtin/checkout.c:167
c04f5ac3
JX
3568#, c-format
3569msgid "path '%s' does not have our version"
3570msgstr "路径 '%s' 没有我们的版本"
3571
5bb01d4f 3572#: builtin/checkout.c:136 builtin/checkout.c:169
c04f5ac3
JX
3573#, c-format
3574msgid "path '%s' does not have their version"
3575msgstr "路径 '%s' 没有他们的版本"
3576
5bb01d4f 3577#: builtin/checkout.c:152
c04f5ac3
JX
3578#, c-format
3579msgid "path '%s' does not have all necessary versions"
3580msgstr "路径 '%s' 没有全部必须的版本"
3581
5bb01d4f 3582#: builtin/checkout.c:196
c04f5ac3
JX
3583#, c-format
3584msgid "path '%s' does not have necessary versions"
3585msgstr "路径 '%s' 没有必须的版本"
3586
5bb01d4f 3587#: builtin/checkout.c:213
c04f5ac3
JX
3588#, c-format
3589msgid "path '%s': cannot merge"
90e6ef53 3590msgstr "path '%s':无法合并"
c04f5ac3 3591
5bb01d4f 3592#: builtin/checkout.c:230
c04f5ac3
JX
3593#, c-format
3594msgid "Unable to add merge result for '%s'"
3595msgstr "无法为 '%s' 添加合并结果"
3596
5bb01d4f
JX
3597#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
3598#: builtin/checkout.c:260
07432cef 3599#, c-format
ef317cd5 3600msgid "'%s' cannot be used with updating paths"
07432cef 3601msgstr "'%s' 不能在更新路径时使用"
ef317cd5 3602
5bb01d4f 3603#: builtin/checkout.c:263 builtin/checkout.c:266
07432cef 3604#, c-format
ef317cd5 3605msgid "'%s' cannot be used with %s"
07432cef 3606msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 3607
5bb01d4f 3608#: builtin/checkout.c:269
ef317cd5
JX
3609#, c-format
3610msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 3611msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 3612
5bb01d4f 3613#: builtin/checkout.c:280 builtin/checkout.c:474
c04f5ac3 3614msgid "corrupt index file"
90e6ef53 3615msgstr "损坏的索引文件"
c04f5ac3 3616
5bb01d4f 3617#: builtin/checkout.c:340 builtin/checkout.c:347
c04f5ac3
JX
3618#, c-format
3619msgid "path '%s' is unmerged"
3620msgstr "路径 '%s' 未合并"
3621
5bb01d4f 3622#: builtin/checkout.c:496
c04f5ac3 3623msgid "you need to resolve your current index first"
90e6ef53 3624msgstr "您需要先解决当前索引的冲突"
c04f5ac3 3625
5bb01d4f 3626#: builtin/checkout.c:627
c04f5ac3
JX
3627#, c-format
3628msgid "Can not do reflog for '%s'\n"
90e6ef53 3629msgstr "不能对 '%s' 执行 reflog 操作\n"
c04f5ac3 3630
5bb01d4f 3631#: builtin/checkout.c:663
c04f5ac3
JX
3632msgid "HEAD is now at"
3633msgstr "HEAD 目前位于"
3634
5bb01d4f 3635#: builtin/checkout.c:670
c04f5ac3
JX
3636#, c-format
3637msgid "Reset branch '%s'\n"
3638msgstr "重置分支 '%s'\n"
3639
5bb01d4f 3640#: builtin/checkout.c:673
c04f5ac3
JX
3641#, c-format
3642msgid "Already on '%s'\n"
3643msgstr "已经位于 '%s'\n"
3644
5bb01d4f 3645#: builtin/checkout.c:677
c04f5ac3
JX
3646#, c-format
3647msgid "Switched to and reset branch '%s'\n"
3648msgstr "切换并重置分支 '%s'\n"
3649
5bb01d4f 3650#: builtin/checkout.c:679 builtin/checkout.c:1134
c04f5ac3
JX
3651#, c-format
3652msgid "Switched to a new branch '%s'\n"
3653msgstr "切换到一个新分支 '%s'\n"
3654
5bb01d4f 3655#: builtin/checkout.c:681
c04f5ac3
JX
3656#, c-format
3657msgid "Switched to branch '%s'\n"
3658msgstr "切换到分支 '%s'\n"
3659
90e6ef53 3660# 译者:注意保持前导空格
5bb01d4f 3661#: builtin/checkout.c:733
c04f5ac3
JX
3662#, c-format
3663msgid " ... and %d more.\n"
90e6ef53 3664msgstr " ... 及其它 %d 个。\n"
c04f5ac3 3665
5bb01d4f 3666#: builtin/checkout.c:739
c04f5ac3
JX
3667#, c-format
3668msgid ""
3669"Warning: you are leaving %d commit behind, not connected to\n"
3670"any of your branches:\n"
3671"\n"
3672"%s\n"
3673msgid_plural ""
3674"Warning: you are leaving %d commits behind, not connected to\n"
3675"any of your branches:\n"
3676"\n"
3677"%s\n"
3678msgstr[0] ""
3679"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3680"\n"
3681"%s\n"
5ae481e0
JX
3682msgstr[1] ""
3683"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3684"\n"
3685"%s\n"
c04f5ac3 3686
5bb01d4f 3687#: builtin/checkout.c:758
c04f5ac3
JX
3688#, c-format
3689msgid ""
7aea43ff
JX
3690"If you want to keep it by creating a new branch, this may be a good time\n"
3691"to do so with:\n"
3692"\n"
3693" git branch <new-branch-name> %s\n"
3694"\n"
3695msgid_plural ""
c04f5ac3
JX
3696"If you want to keep them by creating a new branch, this may be a good time\n"
3697"to do so with:\n"
3698"\n"
814ff314 3699" git branch <new-branch-name> %s\n"
c04f5ac3 3700"\n"
7aea43ff
JX
3701msgstr[0] ""
3702"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
3703"如下操作:\n"
3704"\n"
3705" git branch <新分支名> %s\n"
3706"\n"
3707msgstr[1] ""
3708"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
3709"如下操作:\n"
3710"\n"
814ff314 3711" git branch <新分支名> %s\n"
c04f5ac3
JX
3712"\n"
3713
5bb01d4f 3714#: builtin/checkout.c:794
c04f5ac3
JX
3715msgid "internal error in revision walk"
3716msgstr "在版本遍历时遇到内部错误"
3717
5bb01d4f 3718#: builtin/checkout.c:798
c04f5ac3
JX
3719msgid "Previous HEAD position was"
3720msgstr "之前的 HEAD 位置是"
3721
5bb01d4f 3722#: builtin/checkout.c:825 builtin/checkout.c:1129
c04f5ac3 3723msgid "You are on a branch yet to be born"
90e6ef53 3724msgstr "您位于一个尚未初始化的分支"
c04f5ac3 3725
5bb01d4f 3726#: builtin/checkout.c:931
7aea43ff
JX
3727#, c-format
3728msgid "'%s' is already checked out at '%s'"
3729msgstr "'%s' 已经检出到 '%s'"
3730
5bb01d4f 3731#: builtin/checkout.c:1036
90314792
JX
3732#, c-format
3733msgid "only one reference expected, %d given."
3734msgstr "只要一个引用,却给出了 %d 个"
3735
5bb01d4f 3736#: builtin/checkout.c:1075
c04f5ac3
JX
3737#, c-format
3738msgid "invalid reference: %s"
3739msgstr "无效引用:%s"
3740
5bb01d4f 3741#: builtin/checkout.c:1104
c04f5ac3
JX
3742#, c-format
3743msgid "reference is not a tree: %s"
3744msgstr "引用不是一个树:%s"
3745
5bb01d4f 3746#: builtin/checkout.c:1143
ef317cd5 3747msgid "paths cannot be used with switching branches"
07432cef 3748msgstr "路径不能和切换分支同时使用"
c04f5ac3 3749
5bb01d4f 3750#: builtin/checkout.c:1146 builtin/checkout.c:1150
07432cef 3751#, c-format
ef317cd5 3752msgid "'%s' cannot be used with switching branches"
07432cef 3753msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 3754
5bb01d4f
JX
3755#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
3756#: builtin/checkout.c:1165
07432cef 3757#, c-format
ef317cd5 3758msgid "'%s' cannot be used with '%s'"
07432cef 3759msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 3760
5bb01d4f 3761#: builtin/checkout.c:1170
07432cef 3762#, c-format
ef317cd5 3763msgid "Cannot switch branch to a non-commit '%s'"
07432cef 3764msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 3765
5bb01d4f
JX
3766#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
3767#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
3768#: builtin/worktree.c:284
ef317cd5 3769msgid "branch"
07432cef 3770msgstr "分支"
c04f5ac3 3771
5bb01d4f 3772#: builtin/checkout.c:1204
ef317cd5 3773msgid "create and checkout a new branch"
07432cef 3774msgstr "创建并检出一个新的分支"
c04f5ac3 3775
5bb01d4f 3776#: builtin/checkout.c:1206
ef317cd5 3777msgid "create/reset and checkout a branch"
07432cef 3778msgstr "创建/重置并检出一个分支"
c04f5ac3 3779
5bb01d4f 3780#: builtin/checkout.c:1207
ef317cd5 3781msgid "create reflog for new branch"
07432cef 3782msgstr "为新的分支创建引用日志"
ef317cd5 3783
5bb01d4f 3784#: builtin/checkout.c:1208
ef317cd5 3785msgid "detach the HEAD at named commit"
07432cef 3786msgstr "成为指向该提交的分离头指针"
ef317cd5 3787
5bb01d4f 3788#: builtin/checkout.c:1209
ef317cd5 3789msgid "set upstream info for new branch"
07432cef 3790msgstr "为新的分支设置上游信息"
ef317cd5 3791
5bb01d4f 3792#: builtin/checkout.c:1211
6c94aba5 3793msgid "new-branch"
07432cef 3794msgstr "新分支"
ef317cd5 3795
5bb01d4f 3796#: builtin/checkout.c:1211
ef317cd5 3797msgid "new unparented branch"
07432cef 3798msgstr "新的没有父提交的分支"
ef317cd5 3799
5bb01d4f 3800#: builtin/checkout.c:1212
ef317cd5 3801msgid "checkout our version for unmerged files"
07432cef 3802msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 3803
5bb01d4f 3804#: builtin/checkout.c:1214
ef317cd5 3805msgid "checkout their version for unmerged files"
07432cef 3806msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 3807
5bb01d4f 3808#: builtin/checkout.c:1216
ef317cd5 3809msgid "force checkout (throw away local modifications)"
07432cef 3810msgstr "强制检出(丢弃本地修改)"
c04f5ac3 3811
5bb01d4f 3812#: builtin/checkout.c:1217
ef317cd5 3813msgid "perform a 3-way merge with the new branch"
160fb2b2 3814msgstr "和新的分支执行三方合并"
ef317cd5 3815
5bb01d4f 3816#: builtin/checkout.c:1218 builtin/merge.c:227
ef317cd5 3817msgid "update ignored files (default)"
07432cef 3818msgstr "更新忽略的文件(默认)"
c04f5ac3 3819
5bb01d4f 3820#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
ef317cd5 3821msgid "style"
07432cef 3822msgstr "风格"
ef317cd5 3823
5bb01d4f 3824#: builtin/checkout.c:1220
ef317cd5 3825msgid "conflict style (merge or diff3)"
07432cef 3826msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 3827
5bb01d4f 3828#: builtin/checkout.c:1223
4dcdc3d8
JX
3829msgid "do not limit pathspecs to sparse entries only"
3830msgstr "对路径不做稀疏检出的限制"
3831
5bb01d4f 3832#: builtin/checkout.c:1225
814ff314
JX
3833msgid "second guess 'git checkout <no-such-branch>'"
3834msgstr "二次猜测'git checkout <无此分支>'"
ef317cd5 3835
5bb01d4f 3836#: builtin/checkout.c:1227
7aea43ff
JX
3837msgid "do not check if another worktree is holding the given ref"
3838msgstr "不检查指定的引用是否被其他工作区所占用"
3839
5bb01d4f 3840#: builtin/checkout.c:1252
ef317cd5 3841msgid "-b, -B and --orphan are mutually exclusive"
07432cef 3842msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 3843
5bb01d4f 3844#: builtin/checkout.c:1269
ef317cd5
JX
3845msgid "--track needs a branch name"
3846msgstr "--track 需要一个分支名"
3847
5bb01d4f 3848#: builtin/checkout.c:1274
ef317cd5
JX
3849msgid "Missing branch name; try -b"
3850msgstr "缺少分支名;尝试 -b"
3851
5bb01d4f 3852#: builtin/checkout.c:1310
c04f5ac3 3853msgid "invalid path specification"
90e6ef53 3854msgstr "无效的路径规格"
c04f5ac3 3855
5bb01d4f 3856#: builtin/checkout.c:1317
07432cef 3857#, c-format
c04f5ac3 3858msgid ""
ef317cd5 3859"Cannot update paths and switch to branch '%s' at the same time.\n"
c04f5ac3
JX
3860"Did you intend to checkout '%s' which can not be resolved as commit?"
3861msgstr ""
07432cef
WS
3862"不能同时更新路径并切换到分支'%s'。\n"
3863"您是想要检出 '%s' 但其未能解析为提交么?"
c04f5ac3 3864
5bb01d4f 3865#: builtin/checkout.c:1322
07432cef 3866#, c-format
ef317cd5 3867msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 3868msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 3869
5bb01d4f 3870#: builtin/checkout.c:1326
c04f5ac3
JX
3871msgid ""
3872"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3873"checking out of the index."
3874msgstr ""
90e6ef53 3875"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 3876
90314792 3877#: builtin/clean.c:26
2e8451e8
JX
3878msgid ""
3879"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3880msgstr ""
3881"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 3882
90314792 3883#: builtin/clean.c:30
07432cef
WS
3884#, c-format
3885msgid "Removing %s\n"
3886msgstr "正删除 %s\n"
3887
90314792 3888#: builtin/clean.c:31
07432cef
WS
3889#, c-format
3890msgid "Would remove %s\n"
3891msgstr "将删除 %s\n"
3892
90314792 3893#: builtin/clean.c:32
07432cef
WS
3894#, c-format
3895msgid "Skipping repository %s\n"
160fb2b2 3896msgstr "忽略仓库 %s\n"
07432cef 3897
90314792 3898#: builtin/clean.c:33
07432cef
WS
3899#, c-format
3900msgid "Would skip repository %s\n"
160fb2b2 3901msgstr "将忽略仓库 %s\n"
07432cef 3902
90314792 3903#: builtin/clean.c:34
07432cef
WS
3904#, c-format
3905msgid "failed to remove %s"
3906msgstr "无法删除 %s"
3907
6c94aba5 3908#: builtin/clean.c:295
2e8451e8
JX
3909msgid ""
3910"Prompt help:\n"
3911"1 - select a numbered item\n"
3912"foo - select item based on unique prefix\n"
3913" - (empty) select nothing"
3914msgstr ""
3915"帮助:\n"
3916"1 - 通过编号选择一个选项\n"
3917"foo - 通过标题选择一个选项\n"
3918" - (空)什么也不选择"
3919
6c94aba5 3920#: builtin/clean.c:299
2e8451e8
JX
3921msgid ""
3922"Prompt help:\n"
3923"1 - select a single item\n"
3924"3-5 - select a range of items\n"
3925"2-3,6-9 - select multiple ranges\n"
3926"foo - select item based on unique prefix\n"
3927"-... - unselect specified items\n"
3928"* - choose all items\n"
3929" - (empty) finish selecting"
3930msgstr ""
3931"帮助:\n"
3932"1 - 选择一个选项\n"
3933"3-5 - 选择一个范围内的所有选项\n"
3934"2-3,6-9 - 选择多个范围内的所有选项\n"
3935"foo - 通过标题选择一个选项\n"
3936"-... - 反选特定的选项\n"
3937"* - 选择所有选项\n"
3938" - (空)结束选择"
3939
7aea43ff 3940#: builtin/clean.c:515
2e8451e8
JX
3941#, c-format
3942msgid "Huh (%s)?"
3943msgstr "嗯(%s)?"
3944
7aea43ff 3945#: builtin/clean.c:657
2e8451e8
JX
3946#, c-format
3947msgid "Input ignore patterns>> "
3948msgstr "输入模版以排除条目>> "
3949
7aea43ff 3950#: builtin/clean.c:694
2e8451e8
JX
3951#, c-format
3952msgid "WARNING: Cannot find items matched by: %s"
3953msgstr "警告:无法找到和 %s 匹配的条目"
3954
7aea43ff 3955#: builtin/clean.c:715
2e8451e8
JX
3956msgid "Select items to delete"
3957msgstr "选择要删除的条目"
3958
814ff314 3959#. TRANSLATORS: Make sure to keep [y/N] as is
7aea43ff 3960#: builtin/clean.c:756
2e8451e8 3961#, c-format
814ff314
JX
3962msgid "Remove %s [y/N]? "
3963msgstr "删除 %s [y/N]?"
2e8451e8 3964
7aea43ff 3965#: builtin/clean.c:781
2e8451e8
JX
3966msgid "Bye."
3967msgstr "再见。"
3968
7aea43ff 3969#: builtin/clean.c:789
2e8451e8
JX
3970msgid ""
3971"clean - start cleaning\n"
3972"filter by pattern - exclude items from deletion\n"
3973"select by numbers - select items to be deleted by numbers\n"
3974"ask each - confirm each deletion (like \"rm -i\")\n"
3975"quit - stop cleaning\n"
3976"help - this screen\n"
3977"? - help for prompt selection"
3978msgstr ""
3979"clean - 开始清理\n"
3980"filter by pattern - 通过模版排除要删除的条目\n"
3981"select by numbers - 通过数字选择要删除的条目\n"
3982"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3983"quit - 停止删除并退出\n"
3984"help - 显示本帮助\n"
3985"? - 显示如何在提示符下选择的帮助"
3986
7aea43ff 3987#: builtin/clean.c:816
2e8451e8
JX
3988msgid "*** Commands ***"
3989msgstr "*** 命令 ***"
3990
7aea43ff 3991#: builtin/clean.c:817
2e8451e8
JX
3992msgid "What now"
3993msgstr "请选择"
3994
7aea43ff 3995#: builtin/clean.c:825
2e8451e8
JX
3996msgid "Would remove the following item:"
3997msgid_plural "Would remove the following items:"
3998msgstr[0] "将删除如下条目:"
3999msgstr[1] "将删除如下条目:"
4000
7aea43ff 4001#: builtin/clean.c:842
2e8451e8
JX
4002msgid "No more files to clean, exiting."
4003msgstr "没有要清理的文件,退出。"
4004
7aea43ff 4005#: builtin/clean.c:873
ef317cd5 4006msgid "do not print names of files removed"
07432cef 4007msgstr "不打印删除文件的名称"
ef317cd5 4008
7aea43ff 4009#: builtin/clean.c:875
ef317cd5 4010msgid "force"
07432cef 4011msgstr "强制"
ef317cd5 4012
7aea43ff 4013#: builtin/clean.c:876
2e8451e8
JX
4014msgid "interactive cleaning"
4015msgstr "交互式清除"
4016
7aea43ff 4017#: builtin/clean.c:878
ef317cd5 4018msgid "remove whole directories"
07432cef 4019msgstr "删除整个目录"
ef317cd5 4020
7aea43ff
JX
4021#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714
4022#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
ef317cd5 4023msgid "pattern"
07432cef 4024msgstr "模式"
ef317cd5 4025
7aea43ff 4026#: builtin/clean.c:880
ef317cd5 4027msgid "add <pattern> to ignore rules"
4375c10e 4028msgstr "添加 <模式> 到忽略规则"
ef317cd5 4029
7aea43ff 4030#: builtin/clean.c:881
ef317cd5 4031msgid "remove ignored files, too"
07432cef 4032msgstr "也删除忽略的文件"
ef317cd5 4033
7aea43ff 4034#: builtin/clean.c:883
ef317cd5 4035msgid "remove only ignored files"
07432cef 4036msgstr "只删除忽略的文件"
c04f5ac3 4037
7aea43ff 4038#: builtin/clean.c:901
c04f5ac3 4039msgid "-x and -X cannot be used together"
649900bc 4040msgstr "-x 和 -X 不能同时使用"
c04f5ac3 4041
7aea43ff 4042#: builtin/clean.c:905
c04f5ac3 4043msgid ""
6c94aba5 4044"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 4045"clean"
c04f5ac3 4046msgstr ""
2e8451e8 4047"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 4048
7aea43ff 4049#: builtin/clean.c:908
c04f5ac3 4050msgid ""
6c94aba5 4051"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 4052"refusing to clean"
c04f5ac3 4053msgstr ""
2e8451e8 4054"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 4055
220c313c 4056#: builtin/clone.c:37
814ff314 4057msgid "git clone [<options>] [--] <repo> [<dir>]"
160fb2b2 4058msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
ef317cd5 4059
7aea43ff 4060#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224
814ff314 4061#: builtin/push.c:523
ef317cd5 4062msgid "force progress reporting"
07432cef 4063msgstr "强制显示进度报告"
ef317cd5 4064
7aea43ff 4065#: builtin/clone.c:59
ef317cd5 4066msgid "don't create a checkout"
07432cef 4067msgstr "不创建一个检出"
ef317cd5 4068
7aea43ff 4069#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503
ef317cd5 4070msgid "create a bare repository"
160fb2b2 4071msgstr "创建一个纯仓库"
ef317cd5 4072
7aea43ff 4073#: builtin/clone.c:64
ef317cd5 4074msgid "create a mirror repository (implies bare)"
160fb2b2 4075msgstr "创建一个镜像仓库(也是纯仓库)"
ef317cd5 4076
7aea43ff 4077#: builtin/clone.c:66
ef317cd5 4078msgid "to clone from a local repository"
160fb2b2 4079msgstr "从本地仓库克隆"
ef317cd5 4080
7aea43ff 4081#: builtin/clone.c:68
ef317cd5 4082msgid "don't use local hardlinks, always copy"
07432cef 4083msgstr "不使用本地硬链接,始终复制"
ef317cd5 4084
7aea43ff 4085#: builtin/clone.c:70
ef317cd5 4086msgid "setup as shared repository"
160fb2b2 4087msgstr "设置为共享仓库"
ef317cd5 4088
7aea43ff 4089#: builtin/clone.c:72 builtin/clone.c:74
ef317cd5 4090msgid "initialize submodules in the clone"
07432cef 4091msgstr "在克隆时初始化子模组"
ef317cd5 4092
7aea43ff 4093#: builtin/clone.c:75 builtin/init-db.c:500
ef317cd5 4094msgid "template-directory"
07432cef 4095msgstr "模板目录"
ef317cd5 4096
7aea43ff 4097#: builtin/clone.c:76 builtin/init-db.c:501
ef317cd5 4098msgid "directory from which templates will be used"
07432cef 4099msgstr "模板目录将被使用"
ef317cd5 4100
7aea43ff 4101#: builtin/clone.c:78
ef317cd5 4102msgid "reference repository"
160fb2b2 4103msgstr "参考仓库"
ef317cd5 4104
7aea43ff
JX
4105#: builtin/clone.c:80
4106msgid "use --reference only while cloning"
160fb2b2 4107msgstr "仅在克隆时参考 --reference 指向的本地仓库"
7aea43ff
JX
4108
4109#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
ef317cd5 4110msgid "name"
07432cef 4111msgstr "名称"
ef317cd5 4112
7aea43ff 4113#: builtin/clone.c:82
ef317cd5 4114msgid "use <name> instead of 'origin' to track upstream"
4375c10e 4115msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
ef317cd5 4116
7aea43ff 4117#: builtin/clone.c:84
ef317cd5 4118msgid "checkout <branch> instead of the remote's HEAD"
4375c10e 4119msgstr "检出 <分支> 而不是远程 HEAD"
ef317cd5 4120
7aea43ff 4121#: builtin/clone.c:86
ef317cd5 4122msgid "path to git-upload-pack on the remote"
07432cef 4123msgstr "远程 git-upload-pack 路径"
ef317cd5 4124
7aea43ff 4125#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659
ef317cd5 4126msgid "depth"
07432cef 4127msgstr "深度"
ef317cd5 4128
7aea43ff 4129#: builtin/clone.c:88
ef317cd5 4130msgid "create a shallow clone of that depth"
07432cef 4131msgstr "创建一个指定深度的浅克隆"
ef317cd5 4132
7aea43ff 4133#: builtin/clone.c:90
ef317cd5 4134msgid "clone only one branch, HEAD or --branch"
07432cef 4135msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 4136
7aea43ff 4137#: builtin/clone.c:91 builtin/init-db.c:509
ef317cd5 4138msgid "gitdir"
07432cef 4139msgstr "git目录"
ef317cd5 4140
7aea43ff 4141#: builtin/clone.c:92 builtin/init-db.c:510
ef317cd5 4142msgid "separate git dir from working tree"
07432cef 4143msgstr "git目录和工作区分离"
ef317cd5 4144
7aea43ff 4145#: builtin/clone.c:93
ef317cd5 4146msgid "key=value"
07432cef 4147msgstr "key=value"
ef317cd5 4148
7aea43ff 4149#: builtin/clone.c:94
ef317cd5 4150msgid "set config inside the new repository"
160fb2b2 4151msgstr "在新仓库中设置配置信息"
ef317cd5 4152
5bb01d4f 4153#: builtin/clone.c:240
c04f5ac3 4154#, c-format
4dcdc3d8 4155msgid "reference repository '%s' is not a local repository."
160fb2b2 4156msgstr "参考仓库 '%s' 不是一个本地仓库。"
c04f5ac3 4157
5bb01d4f 4158#: builtin/clone.c:244
cfff71a9
JX
4159#, c-format
4160msgid "reference repository '%s' is shallow"
160fb2b2 4161msgstr "参考仓库 '%s' 是一个浅克隆"
cfff71a9 4162
5bb01d4f 4163#: builtin/clone.c:247
cfff71a9
JX
4164#, c-format
4165msgid "reference repository '%s' is grafted"
160fb2b2 4166msgstr "参考仓库 '%s' 已被嫁接"
cfff71a9 4167
5bb01d4f 4168#: builtin/clone.c:310
c04f5ac3
JX
4169#, c-format
4170msgid "failed to create directory '%s'"
90e6ef53 4171msgstr "无法创建目录 '%s'"
c04f5ac3 4172
5bb01d4f 4173#: builtin/clone.c:312 builtin/diff.c:84
c04f5ac3
JX
4174#, c-format
4175msgid "failed to stat '%s'"
90e6ef53 4176msgstr "无法枚举 '%s' 状态"
c04f5ac3 4177
5bb01d4f 4178#: builtin/clone.c:314
c04f5ac3
JX
4179#, c-format
4180msgid "%s exists and is not a directory"
4181msgstr "%s 存在且不是一个目录"
4182
5bb01d4f 4183#: builtin/clone.c:328
c04f5ac3
JX
4184#, c-format
4185msgid "failed to stat %s\n"
90e6ef53 4186msgstr "无法枚举 %s 状态\n"
c04f5ac3 4187
5bb01d4f 4188#: builtin/clone.c:350
c04f5ac3
JX
4189#, c-format
4190msgid "failed to create link '%s'"
90e6ef53 4191msgstr "无法创建链接 '%s'"
c04f5ac3 4192
5bb01d4f 4193#: builtin/clone.c:354
c04f5ac3
JX
4194#, c-format
4195msgid "failed to copy file to '%s'"
90e6ef53 4196msgstr "无法拷贝文件至 '%s'"
c04f5ac3 4197
5bb01d4f 4198#: builtin/clone.c:377 builtin/clone.c:551
c04f5ac3
JX
4199#, c-format
4200msgid "done.\n"
4201msgstr "完成。\n"
4202
5bb01d4f 4203#: builtin/clone.c:389
1003b3a5
JX
4204msgid ""
4205"Clone succeeded, but checkout failed.\n"
4206"You can inspect what was checked out with 'git status'\n"
4207"and retry the checkout with 'git checkout -f HEAD'\n"
4208msgstr ""
4209"克隆成功,但是检出失败。\n"
4210"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4211"'git checkout -f HEAD' 重试\n"
4212
5bb01d4f 4213#: builtin/clone.c:466
c04f5ac3
JX
4214#, c-format
4215msgid "Could not find remote branch %s to clone."
90e6ef53 4216msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 4217
5bb01d4f 4218#: builtin/clone.c:546
2e8451e8
JX
4219#, c-format
4220msgid "Checking connectivity... "
4221msgstr "检查连接... "
4222
5bb01d4f 4223#: builtin/clone.c:549
1003b3a5
JX
4224msgid "remote did not send all necessary objects"
4225msgstr "远程没有发送所有必须的对象"
4226
5bb01d4f 4227#: builtin/clone.c:613
c04f5ac3
JX
4228msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4229msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4230
5bb01d4f 4231#: builtin/clone.c:644
1003b3a5
JX
4232msgid "unable to checkout working tree"
4233msgstr "不能检出工作区"
4234
5bb01d4f 4235#: builtin/clone.c:731
04cb2f28
JX
4236msgid "cannot repack to clean up"
4237msgstr "无法执行 repack 来清理"
4238
5bb01d4f 4239#: builtin/clone.c:733
04cb2f28
JX
4240msgid "cannot unlink temporary alternates file"
4241msgstr "无法删除临时的 alternates 文件"
4242
5bb01d4f 4243#: builtin/clone.c:763
c04f5ac3
JX
4244msgid "Too many arguments."
4245msgstr "太多参数。"
4246
5bb01d4f 4247#: builtin/clone.c:767
c04f5ac3 4248msgid "You must specify a repository to clone."
160fb2b2 4249msgstr "您必须指定一个仓库来克隆。"
c04f5ac3 4250
5bb01d4f 4251#: builtin/clone.c:778
c04f5ac3
JX
4252#, c-format
4253msgid "--bare and --origin %s options are incompatible."
4254msgstr "--bare 和 --origin %s 选项不兼容。"
4255
5bb01d4f 4256#: builtin/clone.c:781
07432cef
WS
4257msgid "--bare and --separate-git-dir are incompatible."
4258msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4259
5bb01d4f 4260#: builtin/clone.c:794
c04f5ac3
JX
4261#, c-format
4262msgid "repository '%s' does not exist"
160fb2b2 4263msgstr "仓库 '%s' 不存在"
c04f5ac3 4264
5bb01d4f 4265#: builtin/clone.c:800 builtin/fetch.c:1160
cfff71a9
JX
4266#, c-format
4267msgid "depth %s is not a positive number"
4268msgstr "深度 %s 不是一个正数"
4269
5bb01d4f 4270#: builtin/clone.c:810
c04f5ac3
JX
4271#, c-format
4272msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 4273msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 4274
5bb01d4f 4275#: builtin/clone.c:820
c04f5ac3
JX
4276#, c-format
4277msgid "working tree '%s' already exists."
4278msgstr "工作区 '%s' 已经存在。"
4279
5bb01d4f
JX
4280#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
4281#: builtin/worktree.c:220
4282#, c-format
4283msgid "could not create leading directories of '%s'"
4284msgstr "不能为 '%s' 创建先导目录"
4285
4286#: builtin/clone.c:838
c04f5ac3 4287#, c-format
814ff314
JX
4288msgid "could not create work tree dir '%s'"
4289msgstr "不能创建工作区目录 '%s'"
c04f5ac3 4290
5bb01d4f 4291#: builtin/clone.c:856
c04f5ac3
JX
4292#, c-format
4293msgid "Cloning into bare repository '%s'...\n"
160fb2b2 4294msgstr "克隆到纯仓库 '%s'...\n"
c04f5ac3 4295
5bb01d4f 4296#: builtin/clone.c:858
c04f5ac3
JX
4297#, c-format
4298msgid "Cloning into '%s'...\n"
4299msgstr "正克隆到 '%s'...\n"
4300
5bb01d4f 4301#: builtin/clone.c:883
04cb2f28
JX
4302msgid "--dissociate given, but there is no --reference"
4303msgstr "提供了参数 --dissociate,但未提供 --reference"
4304
5bb01d4f 4305#: builtin/clone.c:900
6acbf033
JX
4306msgid "--depth is ignored in local clones; use file:// instead."
4307msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4308
5bb01d4f 4309#: builtin/clone.c:903
6acbf033 4310msgid "source repository is shallow, ignoring --local"
160fb2b2 4311msgstr "源仓库是浅克隆,忽略 --local"
6acbf033 4312
5bb01d4f 4313#: builtin/clone.c:908
6acbf033
JX
4314msgid "--local is ignored"
4315msgstr "--local 被忽略"
4316
5bb01d4f 4317#: builtin/clone.c:912
c04f5ac3
JX
4318#, c-format
4319msgid "Don't know how to clone %s"
4320msgstr "不知道如何克隆 %s"
4321
5bb01d4f 4322#: builtin/clone.c:961 builtin/clone.c:969
c04f5ac3
JX
4323#, c-format
4324msgid "Remote branch %s not found in upstream %s"
4325msgstr "远程分支 %s 在上游 %s 未发现"
4326
5bb01d4f 4327#: builtin/clone.c:972
c04f5ac3 4328msgid "You appear to have cloned an empty repository."
160fb2b2 4329msgstr "您似乎克隆了一个空仓库。"
c04f5ac3 4330
ef317cd5 4331#: builtin/column.c:9
814ff314
JX
4332msgid "git column [<options>]"
4333msgstr "git column [<选项>]"
ef317cd5
JX
4334
4335#: builtin/column.c:26
4336msgid "lookup config vars"
07432cef 4337msgstr "查找配置变量"
ef317cd5
JX
4338
4339#: builtin/column.c:27 builtin/column.c:28
ef317cd5 4340msgid "layout to use"
07432cef 4341msgstr "要使用的布局"
ef317cd5
JX
4342
4343#: builtin/column.c:29
4344msgid "Maximum width"
07432cef 4345msgstr "最大宽度"
ef317cd5
JX
4346
4347#: builtin/column.c:30
4348msgid "Padding space on left border"
07432cef 4349msgstr "左边框的填充空间"
ef317cd5
JX
4350
4351#: builtin/column.c:31
4352msgid "Padding space on right border"
07432cef 4353msgstr "右边框的填充空间"
ef317cd5
JX
4354
4355#: builtin/column.c:32
4356msgid "Padding space between columns"
07432cef 4357msgstr "两列之间的填充空间"
ef317cd5 4358
8ada9598
JX
4359#: builtin/column.c:51
4360msgid "--command must be the first argument"
81809b99 4361msgstr "--command 必须是第一个参数"
8ada9598 4362
220c313c 4363#: builtin/commit.c:37
814ff314 4364msgid "git commit [<options>] [--] <pathspec>..."
160fb2b2 4365msgstr "git commit [<选项>] [--] <路径规格>..."
ef317cd5 4366
220c313c 4367#: builtin/commit.c:42
814ff314 4368msgid "git status [<options>] [--] <pathspec>..."
160fb2b2 4369msgstr "git status [<选项>] [--] <路径规格>..."
ef317cd5 4370
220c313c
JX
4371#: builtin/commit.c:47
4372msgid ""
4373"Your name and email address were configured automatically based\n"
4374"on your username and hostname. Please check that they are accurate.\n"
4375"You can suppress this message by setting them explicitly. Run the\n"
4376"following command and follow the instructions in your editor to edit\n"
4377"your configuration file:\n"
4378"\n"
4379" git config --global --edit\n"
4380"\n"
4381"After doing this, you may fix the identity used for this commit with:\n"
4382"\n"
4383" git commit --amend --reset-author\n"
4384msgstr ""
4385"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4386"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4387"中编辑您的配置文件:\n"
4388"\n"
4389" git config --global --edit\n"
4390"\n"
4391"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4392"\n"
4393" git commit --amend --reset-author\n"
4394
4395#: builtin/commit.c:60
c04f5ac3
JX
4396msgid ""
4397"Your name and email address were configured automatically based\n"
4398"on your username and hostname. Please check that they are accurate.\n"
4399"You can suppress this message by setting them explicitly:\n"
4400"\n"
4401" git config --global user.name \"Your Name\"\n"
4402" git config --global user.email you@example.com\n"
4403"\n"
4404"After doing this, you may fix the identity used for this commit with:\n"
4405"\n"
4406" git commit --amend --reset-author\n"
4407msgstr ""
90e6ef53 4408"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
220c313c 4409"与否。您可以对其进行设置以免再出现本提示信息:\n"
c04f5ac3
JX
4410"\n"
4411" git config --global user.name \"Your Name\"\n"
4412" git config --global user.email you@example.com\n"
4413"\n"
90e6ef53 4414"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
4415"\n"
4416" git commit --amend --reset-author\n"
4417
220c313c 4418#: builtin/commit.c:72
c04f5ac3
JX
4419msgid ""
4420"You asked to amend the most recent commit, but doing so would make\n"
4421"it empty. You can repeat your command with --allow-empty, or you can\n"
4422"remove the commit entirely with \"git reset HEAD^\".\n"
4423msgstr ""
1b150dc9
T
4424"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4425"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 4426
220c313c 4427#: builtin/commit.c:77
c04f5ac3
JX
4428msgid ""
4429"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4430"If you wish to commit it anyway, use:\n"
4431"\n"
4432" git commit --allow-empty\n"
4433"\n"
c04f5ac3 4434msgstr ""
a9ce4543
T
4435"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4436"也要提交,使用命令:\n"
c04f5ac3
JX
4437"\n"
4438" git commit --allow-empty\n"
4439"\n"
c04f5ac3 4440
220c313c 4441#: builtin/commit.c:84
b1894384
JX
4442msgid "Otherwise, please use 'git reset'\n"
4443msgstr "否则,请使用命令 'git reset'\n"
4444
220c313c 4445#: builtin/commit.c:87
b1894384
JX
4446msgid ""
4447"If you wish to skip this commit, use:\n"
4448"\n"
4449" git reset\n"
4450"\n"
4451"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4452"the remaining commits.\n"
4453msgstr ""
4454"如果您想跳过这个提交,使用命令:\n"
4455"\n"
4456" git reset\n"
4457"\n"
4458"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4459"操作。\n"
4460
44f518e6 4461#: builtin/commit.c:304
c04f5ac3 4462msgid "failed to unpack HEAD tree object"
90e6ef53 4463msgstr "无法解包 HEAD 树对象"
c04f5ac3 4464
44f518e6 4465#: builtin/commit.c:344
c04f5ac3 4466msgid "unable to create temporary index"
90e6ef53 4467msgstr "不能创建临时索引"
c04f5ac3 4468
44f518e6 4469#: builtin/commit.c:350
c04f5ac3
JX
4470msgid "interactive add failed"
4471msgstr "交互式添加失败"
4472
44f518e6 4473#: builtin/commit.c:361
220c313c
JX
4474msgid "unable to write index file"
4475msgstr "无法写入索引文件"
4476
44f518e6 4477#: builtin/commit.c:363
220c313c
JX
4478msgid "unable to update temporary index"
4479msgstr "无法更新临时索引"
4480
44f518e6 4481#: builtin/commit.c:365
220c313c
JX
4482msgid "Failed to update main cache tree"
4483msgstr "不能更新树的主缓存"
4484
44f518e6 4485#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
c04f5ac3 4486msgid "unable to write new_index file"
90e6ef53 4487msgstr "无法写 new_index 文件"
c04f5ac3 4488
44f518e6 4489#: builtin/commit.c:445
8ada9598 4490msgid "cannot do a partial commit during a merge."
81809b99 4491msgstr "在合并过程中不能做部分提交。"
c04f5ac3 4492
44f518e6 4493#: builtin/commit.c:447
8ada9598 4494msgid "cannot do a partial commit during a cherry-pick."
81809b99 4495msgstr "在拣选过程中不能做部分提交。"
8ada9598 4496
44f518e6 4497#: builtin/commit.c:456
c04f5ac3 4498msgid "cannot read the index"
90e6ef53 4499msgstr "无法读取索引"
c04f5ac3 4500
44f518e6 4501#: builtin/commit.c:475
c04f5ac3 4502msgid "unable to write temporary index file"
90e6ef53 4503msgstr "无法写临时索引文件"
c04f5ac3 4504
44f518e6 4505#: builtin/commit.c:580
220c313c
JX
4506#, c-format
4507msgid "commit '%s' lacks author header"
4508msgstr "提交 '%s' 缺少作者信息"
4509
44f518e6 4510#: builtin/commit.c:582
c04f5ac3 4511#, c-format
220c313c
JX
4512msgid "commit '%s' has malformed author line"
4513msgstr "提交 '%s' 有非法的作者信息"
c04f5ac3 4514
44f518e6 4515#: builtin/commit.c:601
c04f5ac3
JX
4516msgid "malformed --author parameter"
4517msgstr "非法的 --author 参数"
4518
44f518e6 4519#: builtin/commit.c:609
c04f5ac3 4520#, c-format
6acbf033
JX
4521msgid "invalid date format: %s"
4522msgstr "无效的日期格式:%s"
4523
44f518e6 4524#: builtin/commit.c:653
6acbf033
JX
4525msgid ""
4526"unable to select a comment character that is not used\n"
4527"in the current commit message"
4528msgstr "无法选择一个未被当前提交说明使用的注释字符"
4529
44f518e6 4530#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
c04f5ac3
JX
4531#, c-format
4532msgid "could not lookup commit %s"
4533msgstr "不能查询提交 %s"
4534
44f518e6 4535#: builtin/commit.c:702 builtin/shortlog.c:273
c04f5ac3
JX
4536#, c-format
4537msgid "(reading log message from standard input)\n"
90e6ef53 4538msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 4539
44f518e6 4540#: builtin/commit.c:704
c04f5ac3 4541msgid "could not read log from standard input"
90e6ef53 4542msgstr "不能从标准输入中读取日志信息"
c04f5ac3 4543
44f518e6 4544#: builtin/commit.c:708
c04f5ac3
JX
4545#, c-format
4546msgid "could not read log file '%s'"
90e6ef53 4547msgstr "不能读取日志文件 '%s'"
c04f5ac3 4548
44f518e6 4549#: builtin/commit.c:730
c04f5ac3 4550msgid "could not read MERGE_MSG"
90e6ef53 4551msgstr "不能读取 MERGE_MSG"
c04f5ac3 4552
44f518e6 4553#: builtin/commit.c:734
c04f5ac3 4554msgid "could not read SQUASH_MSG"
90e6ef53 4555msgstr "不能读取 SQUASH_MSG"
c04f5ac3 4556
7aea43ff 4557#: builtin/commit.c:738 builtin/merge.c:1079
c04f5ac3
JX
4558#, c-format
4559msgid "could not read '%s'"
90e6ef53 4560msgstr "不能读取 '%s'"
c04f5ac3 4561
44f518e6 4562#: builtin/commit.c:785
c04f5ac3 4563msgid "could not write commit template"
90e6ef53 4564msgstr "不能写提交模版"
c04f5ac3 4565
44f518e6 4566#: builtin/commit.c:803
81809b99 4567#, c-format
c04f5ac3
JX
4568msgid ""
4569"\n"
8ada9598 4570"It looks like you may be committing a merge.\n"
c04f5ac3
JX
4571"If this is not correct, please remove the file\n"
4572"\t%s\n"
4573"and try again.\n"
4574msgstr ""
4575"\n"
649900bc 4576"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
4577"\t%s\n"
4578"然后重试。\n"
4579
44f518e6 4580#: builtin/commit.c:808
81809b99 4581#, c-format
8ada9598
JX
4582msgid ""
4583"\n"
4584"It looks like you may be committing a cherry-pick.\n"
4585"If this is not correct, please remove the file\n"
4586"\t%s\n"
4587"and try again.\n"
4588msgstr ""
4589"\n"
649900bc 4590"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
4591"\t%s\n"
4592"然后重试。\n"
c04f5ac3 4593
44f518e6 4594#: builtin/commit.c:821
a77c07d9 4595#, c-format
c04f5ac3 4596msgid ""
8ada9598 4597"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 4598"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 4599msgstr ""
a77c07d9 4600"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 4601"说明将会终止提交。\n"
c04f5ac3 4602
44f518e6 4603#: builtin/commit.c:828
a77c07d9 4604#, c-format
c04f5ac3 4605msgid ""
8ada9598 4606"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 4607"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
4608"An empty message aborts the commit.\n"
4609msgstr ""
a77c07d9
JX
4610"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4611"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 4612
90e6ef53 4613# 译者:为保证在输出中对齐,注意调整句中空格!
44f518e6 4614#: builtin/commit.c:848
6acbf033
JX
4615#, c-format
4616msgid "%sAuthor: %.*s <%.*s>"
4617msgstr "%s作者: %.*s <%.*s>"
4618
4619# 译者:为保证在输出中对齐,注意调整句中空格!
44f518e6 4620#: builtin/commit.c:856
c04f5ac3 4621#, c-format
6acbf033
JX
4622msgid "%sDate: %s"
4623msgstr "%s日期: %s"
c04f5ac3 4624
90e6ef53 4625# 译者:为保证在输出中对齐,注意调整句中空格!
44f518e6 4626#: builtin/commit.c:863
c04f5ac3 4627#, c-format
6acbf033
JX
4628msgid "%sCommitter: %.*s <%.*s>"
4629msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 4630
44f518e6 4631#: builtin/commit.c:881
c04f5ac3 4632msgid "Cannot read index"
90e6ef53 4633msgstr "无法读取索引"
c04f5ac3 4634
44f518e6 4635#: builtin/commit.c:938
c04f5ac3
JX
4636msgid "Error building trees"
4637msgstr "无法创建树对象"
4638
44f518e6 4639#: builtin/commit.c:953 builtin/tag.c:495
c04f5ac3
JX
4640#, c-format
4641msgid "Please supply the message using either -m or -F option.\n"
07432cef 4642msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 4643
44f518e6 4644#: builtin/commit.c:1055
c04f5ac3 4645#, c-format
814ff314
JX
4646msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4647msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 4648
44f518e6 4649#: builtin/commit.c:1070 builtin/commit.c:1310
c04f5ac3
JX
4650#, c-format
4651msgid "Invalid untracked files mode '%s'"
90e6ef53 4652msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 4653
44f518e6 4654#: builtin/commit.c:1107
2e8451e8
JX
4655msgid "--long and -z are incompatible"
4656msgstr "--long 和 -z 选项不兼容"
4657
44f518e6 4658#: builtin/commit.c:1137
c04f5ac3
JX
4659msgid "Using both --reset-author and --author does not make sense"
4660msgstr "同时使用 --reset-author 和 --author 没有意义"
4661
44f518e6 4662#: builtin/commit.c:1146
c04f5ac3 4663msgid "You have nothing to amend."
90e6ef53 4664msgstr "您没有可修补的提交。"
c04f5ac3 4665
44f518e6 4666#: builtin/commit.c:1149
8ada9598 4667msgid "You are in the middle of a merge -- cannot amend."
81809b99 4668msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 4669
44f518e6 4670#: builtin/commit.c:1151
8ada9598 4671msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 4672msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 4673
44f518e6 4674#: builtin/commit.c:1154
c04f5ac3 4675msgid "Options --squash and --fixup cannot be used together"
649900bc 4676msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 4677
44f518e6 4678#: builtin/commit.c:1164
c04f5ac3
JX
4679msgid "Only one of -c/-C/-F/--fixup can be used."
4680msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4681
44f518e6 4682#: builtin/commit.c:1166
c04f5ac3 4683msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 4684msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 4685
44f518e6 4686#: builtin/commit.c:1174
c04f5ac3 4687msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 4688msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 4689
44f518e6 4690#: builtin/commit.c:1191
c04f5ac3
JX
4691msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4692msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4693
44f518e6 4694#: builtin/commit.c:1193
c04f5ac3
JX
4695msgid "No paths with --include/--only does not make sense."
4696msgstr "参数 --include/--only 不跟路径没有意义。"
4697
44f518e6 4698#: builtin/commit.c:1195
c04f5ac3 4699msgid "Clever... amending the last one with dirty index."
160fb2b2 4700msgstr "聪明... 用脏索引修补最后一个提交。"
c04f5ac3 4701
44f518e6 4702#: builtin/commit.c:1197
6c94aba5
JX
4703msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4704msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
c04f5ac3 4705
44f518e6 4706#: builtin/commit.c:1209 builtin/tag.c:728
c04f5ac3
JX
4707#, c-format
4708msgid "Invalid cleanup mode %s"
4709msgstr "无效的清理模式 %s"
4710
44f518e6 4711#: builtin/commit.c:1214
c04f5ac3 4712msgid "Paths with -a does not make sense."
649900bc 4713msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 4714
7aea43ff 4715#: builtin/commit.c:1324 builtin/commit.c:1603
ef317cd5 4716msgid "show status concisely"
07432cef 4717msgstr "以简洁的格式显示状态"
ef317cd5 4718
7aea43ff 4719#: builtin/commit.c:1326 builtin/commit.c:1605
ef317cd5 4720msgid "show branch information"
07432cef 4721msgstr "显示分支信息"
ef317cd5 4722
7aea43ff 4723#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509
ef317cd5 4724msgid "machine-readable output"
07432cef
WS
4725msgstr "机器可读的输出"
4726
7aea43ff 4727#: builtin/commit.c:1331 builtin/commit.c:1609
07432cef
WS
4728msgid "show status in long format (default)"
4729msgstr "以长格式显示状态(默认)"
ef317cd5 4730
7aea43ff 4731#: builtin/commit.c:1334 builtin/commit.c:1612
ef317cd5 4732msgid "terminate entries with NUL"
4375c10e 4733msgstr "条目以 NUL 字符结尾"
ef317cd5 4734
7aea43ff 4735#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980
220c313c 4736#: builtin/fast-export.c:983 builtin/tag.c:603
ef317cd5 4737msgid "mode"
07432cef 4738msgstr "模式"
ef317cd5 4739
7aea43ff 4740#: builtin/commit.c:1337 builtin/commit.c:1615
ef317cd5 4741msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 4742msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 4743
44f518e6 4744#: builtin/commit.c:1340
ef317cd5 4745msgid "show ignored files"
07432cef 4746msgstr "显示忽略的文件"
ef317cd5 4747
7aea43ff 4748#: builtin/commit.c:1341 parse-options.h:152
ef317cd5
JX
4749msgid "when"
4750msgstr "何时"
4751
44f518e6 4752#: builtin/commit.c:1342
ef317cd5
JX
4753msgid ""
4754"ignore changes to submodules, optional when: all, dirty, untracked. "
4755"(Default: all)"
4756msgstr ""
07432cef 4757"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 4758
44f518e6 4759#: builtin/commit.c:1344
ef317cd5 4760msgid "list untracked files in columns"
07432cef 4761msgstr "以列的方式显示未跟踪的文件"
ef317cd5 4762
7aea43ff 4763#: builtin/commit.c:1430
c04f5ac3
JX
4764msgid "couldn't look up newly created commit"
4765msgstr "无法找到新创建的提交"
4766
7aea43ff 4767#: builtin/commit.c:1432
c04f5ac3 4768msgid "could not parse newly created commit"
90e6ef53 4769msgstr "不能解析新创建的提交"
c04f5ac3 4770
7aea43ff 4771#: builtin/commit.c:1477
c04f5ac3
JX
4772msgid "detached HEAD"
4773msgstr "分离头指针"
4774
7e238ab7 4775# 译者:中文字符串拼接,可删除前导空格
7aea43ff 4776#: builtin/commit.c:1480
c04f5ac3 4777msgid " (root-commit)"
7e238ab7 4778msgstr "(根提交)"
c04f5ac3 4779
7aea43ff 4780#: builtin/commit.c:1573
ef317cd5 4781msgid "suppress summary after successful commit"
07432cef 4782msgstr "提交成功后不显示概述信息"
c04f5ac3 4783
7aea43ff 4784#: builtin/commit.c:1574
ef317cd5 4785msgid "show diff in commit message template"
07432cef 4786msgstr "在提交说明模板里显示差异"
c04f5ac3 4787
7aea43ff 4788#: builtin/commit.c:1576
ef317cd5 4789msgid "Commit message options"
07432cef 4790msgstr "提交说明选项"
c04f5ac3 4791
7aea43ff 4792#: builtin/commit.c:1577 builtin/tag.c:601
ef317cd5 4793msgid "read message from file"
07432cef 4794msgstr "从文件中读取提交说明"
c04f5ac3 4795
7aea43ff 4796#: builtin/commit.c:1578
ef317cd5 4797msgid "author"
07432cef 4798msgstr "作者"
c04f5ac3 4799
7aea43ff 4800#: builtin/commit.c:1578
ef317cd5 4801msgid "override author for commit"
07432cef 4802msgstr "提交时覆盖作者"
73a60cd2 4803
7aea43ff 4804#: builtin/commit.c:1579 builtin/gc.c:280
ef317cd5 4805msgid "date"
07432cef 4806msgstr "日期"
c04f5ac3 4807
7aea43ff 4808#: builtin/commit.c:1579
ef317cd5 4809msgid "override date for commit"
07432cef 4810msgstr "提交时覆盖日期"
c04f5ac3 4811
7aea43ff 4812#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391
04cb2f28 4813#: builtin/notes.c:554 builtin/tag.c:599
ef317cd5 4814msgid "message"
07432cef 4815msgstr "说明"
c04f5ac3 4816
7aea43ff 4817#: builtin/commit.c:1580
ef317cd5 4818msgid "commit message"
07432cef 4819msgstr "提交说明"
ef317cd5 4820
7aea43ff 4821#: builtin/commit.c:1581
ef317cd5 4822msgid "reuse and edit message from specified commit"
07432cef 4823msgstr "重用并编辑指定提交的提交说明"
ef317cd5 4824
7aea43ff 4825#: builtin/commit.c:1582
ef317cd5 4826msgid "reuse message from specified commit"
07432cef 4827msgstr "重用指定提交的提交说明"
ef317cd5 4828
7aea43ff 4829#: builtin/commit.c:1583
ef317cd5 4830msgid "use autosquash formatted message to fixup specified commit"
07432cef 4831msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 4832
7aea43ff 4833#: builtin/commit.c:1584
ef317cd5 4834msgid "use autosquash formatted message to squash specified commit"
07432cef 4835msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 4836
7aea43ff 4837#: builtin/commit.c:1585
ef317cd5 4838msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 4839msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 4840
7aea43ff 4841#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86
ef317cd5 4842msgid "add Signed-off-by:"
07432cef 4843msgstr "添加 Signed-off-by: 签名"
ef317cd5 4844
7aea43ff 4845#: builtin/commit.c:1587
ef317cd5 4846msgid "use specified template file"
07432cef 4847msgstr "使用指定的模板文件"
ef317cd5 4848
7aea43ff 4849#: builtin/commit.c:1588
ef317cd5 4850msgid "force edit of commit"
07432cef 4851msgstr "强制编辑提交"
ef317cd5 4852
07432cef 4853# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
7aea43ff 4854#: builtin/commit.c:1589
ef317cd5 4855msgid "default"
07432cef 4856msgstr "default"
ef317cd5 4857
7aea43ff 4858#: builtin/commit.c:1589 builtin/tag.c:604
ef317cd5 4859msgid "how to strip spaces and #comments from message"
07432cef 4860msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 4861
7aea43ff 4862#: builtin/commit.c:1590
ef317cd5 4863msgid "include status in commit message template"
07432cef 4864msgstr "在提交说明模板里包含状态信息"
ef317cd5 4865
7aea43ff 4866#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92
220c313c 4867#: builtin/tag.c:605
6c94aba5
JX
4868msgid "key-id"
4869msgstr "key-id"
ef317cd5 4870
7aea43ff 4871#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93
ef317cd5 4872msgid "GPG sign commit"
07432cef 4873msgstr "GPG 提交签名"
ef317cd5 4874
7aea43ff 4875#: builtin/commit.c:1595
ef317cd5 4876msgid "Commit contents options"
07432cef 4877msgstr "提交内容选项"
ef317cd5 4878
7aea43ff 4879#: builtin/commit.c:1596
ef317cd5 4880msgid "commit all changed files"
07432cef 4881msgstr "提交所有改动的文件"
ef317cd5 4882
7aea43ff 4883#: builtin/commit.c:1597
ef317cd5 4884msgid "add specified files to index for commit"
07432cef 4885msgstr "添加指定的文件到索引区等待提交"
ef317cd5 4886
7aea43ff 4887#: builtin/commit.c:1598
ef317cd5 4888msgid "interactively add files"
07432cef 4889msgstr "交互式添加文件"
ef317cd5 4890
7aea43ff 4891#: builtin/commit.c:1599
ef317cd5 4892msgid "interactively add changes"
07432cef 4893msgstr "交互式添加变更"
ef317cd5 4894
7aea43ff 4895#: builtin/commit.c:1600
ef317cd5 4896msgid "commit only specified files"
07432cef 4897msgstr "只提交指定的文件"
ef317cd5 4898
7aea43ff 4899#: builtin/commit.c:1601
ef317cd5 4900msgid "bypass pre-commit hook"
07432cef 4901msgstr "绕过 pre-commit 钩子"
ef317cd5 4902
7aea43ff 4903#: builtin/commit.c:1602
ef317cd5 4904msgid "show what would be committed"
07432cef 4905msgstr "显示将要提交的内容"
ef317cd5 4906
7aea43ff 4907#: builtin/commit.c:1613
ef317cd5 4908msgid "amend previous commit"
07432cef 4909msgstr "修改先前的提交"
ef317cd5 4910
7aea43ff 4911#: builtin/commit.c:1614
ef317cd5 4912msgid "bypass post-rewrite hook"
07432cef 4913msgstr "绕过 post-rewrite 钩子"
ef317cd5 4914
7aea43ff 4915#: builtin/commit.c:1619
ef317cd5 4916msgid "ok to record an empty change"
07432cef 4917msgstr "允许一个空提交"
ef317cd5 4918
7aea43ff 4919#: builtin/commit.c:1621
ef317cd5 4920msgid "ok to record a change with an empty message"
07432cef 4921msgstr "允许空的提交说明"
ef317cd5 4922
7aea43ff 4923#: builtin/commit.c:1650
c04f5ac3 4924msgid "could not parse HEAD commit"
90e6ef53 4925msgstr "不能解析 HEAD 提交"
c04f5ac3 4926
7aea43ff 4927#: builtin/commit.c:1689 builtin/merge.c:1076
c04f5ac3
JX
4928#, c-format
4929msgid "could not open '%s' for reading"
90e6ef53 4930msgstr "不能为读入打开 '%s'"
c04f5ac3 4931
7aea43ff 4932#: builtin/commit.c:1696
c04f5ac3
JX
4933#, c-format
4934msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 4935msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 4936
7aea43ff 4937#: builtin/commit.c:1703
c04f5ac3 4938msgid "could not read MERGE_MODE"
90e6ef53 4939msgstr "不能读取 MERGE_MODE"
c04f5ac3 4940
7aea43ff 4941#: builtin/commit.c:1722
c04f5ac3
JX
4942#, c-format
4943msgid "could not read commit message: %s"
90e6ef53 4944msgstr "不能读取提交说明:%s"
c04f5ac3 4945
7aea43ff 4946#: builtin/commit.c:1733
73a60cd2
JX
4947#, c-format
4948msgid "Aborting commit; you did not edit the message.\n"
4949msgstr "终止提交;您未更改来自模版的提交说明。\n"
4950
7aea43ff 4951#: builtin/commit.c:1738
c04f5ac3
JX
4952#, c-format
4953msgid "Aborting commit due to empty commit message.\n"
4954msgstr "终止提交因为提交说明为空。\n"
4955
7aea43ff 4956#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854
c04f5ac3 4957msgid "failed to write commit object"
90e6ef53 4958msgstr "无法写提交对象"
c04f5ac3 4959
7aea43ff 4960#: builtin/commit.c:1786
c04f5ac3
JX
4961msgid ""
4962"Repository has been updated, but unable to write\n"
220c313c 4963"new_index file. Check that disk is not full and quota is\n"
c04f5ac3
JX
4964"not exceeded, and then \"git reset HEAD\" to recover."
4965msgstr ""
160fb2b2 4966"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
90e6ef53 4967"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 4968
90314792 4969#: builtin/config.c:8
814ff314
JX
4970msgid "git config [<options>]"
4971msgstr "git config [<选项>]"
ef317cd5 4972
6c94aba5 4973#: builtin/config.c:53
ef317cd5 4974msgid "Config file location"
07432cef 4975msgstr "配置文件位置"
ef317cd5 4976
6c94aba5 4977#: builtin/config.c:54
ef317cd5 4978msgid "use global config file"
07432cef 4979msgstr "使用全局配置文件"
ef317cd5 4980
6c94aba5 4981#: builtin/config.c:55
ef317cd5 4982msgid "use system config file"
07432cef 4983msgstr "使用系统级配置文件"
ef317cd5 4984
6c94aba5 4985#: builtin/config.c:56
ef317cd5 4986msgid "use repository config file"
160fb2b2 4987msgstr "使用仓库级配置文件"
ef317cd5 4988
6c94aba5 4989#: builtin/config.c:57
ef317cd5 4990msgid "use given config file"
07432cef 4991msgstr "使用指定的配置文件"
ef317cd5 4992
6c94aba5 4993#: builtin/config.c:58
2e8451e8 4994msgid "blob-id"
4375c10e 4995msgstr "数据对象 ID"
2e8451e8 4996
6c94aba5 4997#: builtin/config.c:58
2e8451e8
JX
4998msgid "read config from given blob object"
4999msgstr "从给定的数据对象读取配置"
5000
6c94aba5 5001#: builtin/config.c:59
ef317cd5 5002msgid "Action"
07432cef 5003msgstr "操作"
ef317cd5 5004
6c94aba5 5005#: builtin/config.c:60
ef317cd5 5006msgid "get value: name [value-regex]"
07432cef 5007msgstr "获取值:name [value-regex]"
ef317cd5 5008
6c94aba5 5009#: builtin/config.c:61
ef317cd5 5010msgid "get all values: key [value-regex]"
07432cef 5011msgstr "获得所有的值:key [value-regex]"
ef317cd5 5012
6c94aba5 5013#: builtin/config.c:62
ef317cd5 5014msgid "get values for regexp: name-regex [value-regex]"
07432cef 5015msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 5016
6c94aba5 5017#: builtin/config.c:63
90314792
JX
5018msgid "get value specific for the URL: section[.var] URL"
5019msgstr "获得 URL 取值:section[.var] URL"
5020
6c94aba5 5021#: builtin/config.c:64
ef317cd5 5022msgid "replace all matching variables: name value [value_regex]"
07432cef 5023msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 5024
6c94aba5 5025#: builtin/config.c:65
ef317cd5 5026msgid "add a new variable: name value"
07432cef 5027msgstr "添加一个新的变量:name value"
ef317cd5 5028
6c94aba5 5029#: builtin/config.c:66
ef317cd5 5030msgid "remove a variable: name [value-regex]"
07432cef 5031msgstr "删除一个变量:name [value-regex]"
ef317cd5 5032
6c94aba5 5033#: builtin/config.c:67
ef317cd5 5034msgid "remove all matches: name [value-regex]"
07432cef 5035msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 5036
6c94aba5 5037#: builtin/config.c:68
ef317cd5 5038msgid "rename section: old-name new-name"
07432cef 5039msgstr "重命名小节:old-name new-name"
ef317cd5 5040
6c94aba5 5041#: builtin/config.c:69
ef317cd5 5042msgid "remove a section: name"
07432cef 5043msgstr "删除一个小节:name"
ef317cd5 5044
6c94aba5 5045#: builtin/config.c:70
ef317cd5 5046msgid "list all"
07432cef 5047msgstr "列出所有"
ef317cd5 5048
6c94aba5 5049#: builtin/config.c:71
ef317cd5 5050msgid "open an editor"
07432cef 5051msgstr "打开一个编辑器"
ef317cd5 5052
6c94aba5 5053#: builtin/config.c:72
04cb2f28
JX
5054msgid "find the color configured: slot [default]"
5055msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 5056
6c94aba5 5057#: builtin/config.c:73
04cb2f28
JX
5058msgid "find the color setting: slot [stdout-is-tty]"
5059msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 5060
6c94aba5 5061#: builtin/config.c:74
ef317cd5 5062msgid "Type"
07432cef 5063msgstr "类型"
ef317cd5 5064
6c94aba5 5065#: builtin/config.c:75
ef317cd5 5066msgid "value is \"true\" or \"false\""
07432cef 5067msgstr "值是 \"true\" 或 \"false\""
ef317cd5 5068
6c94aba5 5069#: builtin/config.c:76
ef317cd5 5070msgid "value is decimal number"
07432cef 5071msgstr "值是十进制数"
ef317cd5 5072
6c94aba5 5073#: builtin/config.c:77
ef317cd5 5074msgid "value is --bool or --int"
07432cef 5075msgstr "值是 --bool or --int"
ef317cd5 5076
6c94aba5 5077#: builtin/config.c:78
ef317cd5 5078msgid "value is a path (file or directory name)"
07432cef 5079msgstr "值是一个路径(文件或目录名)"
ef317cd5 5080
6c94aba5 5081#: builtin/config.c:79
ef317cd5 5082msgid "Other"
07432cef 5083msgstr "其它"
ef317cd5 5084
6c94aba5 5085#: builtin/config.c:80
ef317cd5 5086msgid "terminate values with NUL byte"
4375c10e 5087msgstr "终止值是 NUL 字节"
ef317cd5 5088
6c94aba5 5089#: builtin/config.c:81
ef317cd5 5090msgid "respect include directives on lookup"
07432cef 5091msgstr "查询时参照 include 指令递归查找"
ef317cd5 5092
04cb2f28 5093#: builtin/config.c:316
220c313c 5094msgid "unable to parse default color value"
160fb2b2 5095msgstr "不能解析默认颜色值"
220c313c 5096
04cb2f28 5097#: builtin/config.c:457
220c313c
JX
5098#, c-format
5099msgid ""
5100"# This is Git's per-user configuration file.\n"
7aea43ff 5101"[user]\n"
220c313c 5102"# Please adapt and uncomment the following lines:\n"
7aea43ff 5103"#\tname = %s\n"
220c313c
JX
5104"#\temail = %s\n"
5105msgstr ""
5106"# This is Git's per-user configuration file.\n"
7aea43ff 5107"[user]\n"
220c313c 5108"# Please adapt and uncomment the following lines:\n"
7aea43ff 5109"#\tname = %s\n"
220c313c
JX
5110"#\temail = %s\n"
5111
7aea43ff 5112#: builtin/config.c:587
220c313c
JX
5113#, c-format
5114msgid "cannot create configuration file %s"
5115msgstr "不能创建配置文件 %s"
5116
5117#: builtin/count-objects.c:55
4dcdc3d8
JX
5118msgid "git count-objects [-v] [-H | --human-readable]"
5119msgstr "git count-objects [-v] [-H | --human-readable]"
5120
220c313c 5121#: builtin/count-objects.c:65
4dcdc3d8
JX
5122msgid "print sizes in human readable format"
5123msgstr "以用户可读的格式显示大小"
ef317cd5 5124
220c313c 5125#: builtin/describe.c:17
814ff314
JX
5126msgid "git describe [<options>] [<commit-ish>...]"
5127msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 5128
220c313c 5129#: builtin/describe.c:18
814ff314
JX
5130msgid "git describe [<options>] --dirty"
5131msgstr "git describe [<选项>] --dirty"
ef317cd5 5132
220c313c 5133#: builtin/describe.c:217
c04f5ac3
JX
5134#, c-format
5135msgid "annotated tag %s not available"
55a16ee4 5136msgstr "附注标签 %s 无效"
c04f5ac3 5137
220c313c 5138#: builtin/describe.c:221
c04f5ac3
JX
5139#, c-format
5140msgid "annotated tag %s has no embedded name"
55a16ee4 5141msgstr "附注标签 %s 没有嵌入名称"
c04f5ac3 5142
220c313c 5143#: builtin/describe.c:223
c04f5ac3
JX
5144#, c-format
5145msgid "tag '%s' is really '%s' here"
55a16ee4 5146msgstr "标签 '%s' 的确是在 '%s'"
c04f5ac3 5147
220c313c 5148#: builtin/describe.c:250 builtin/log.c:452
c04f5ac3
JX
5149#, c-format
5150msgid "Not a valid object name %s"
5151msgstr "不是一个有效的对象名 %s"
5152
220c313c 5153#: builtin/describe.c:253
c04f5ac3
JX
5154#, c-format
5155msgid "%s is not a valid '%s' object"
5156msgstr "%s 不是一个有效的 '%s' 对象"
5157
220c313c 5158#: builtin/describe.c:270
c04f5ac3
JX
5159#, c-format
5160msgid "no tag exactly matches '%s'"
55a16ee4 5161msgstr "没有标签准确匹配 '%s'"
c04f5ac3 5162
220c313c 5163#: builtin/describe.c:272
c04f5ac3
JX
5164#, c-format
5165msgid "searching to describe %s\n"
5166msgstr "搜索描述 %s\n"
5167
220c313c 5168#: builtin/describe.c:319
c04f5ac3
JX
5169#, c-format
5170msgid "finished search at %s\n"
5171msgstr "完成搜索 %s\n"
5172
220c313c 5173#: builtin/describe.c:346
c04f5ac3
JX
5174#, c-format
5175msgid ""
5176"No annotated tags can describe '%s'.\n"
5177"However, there were unannotated tags: try --tags."
5178msgstr ""
55a16ee4
RC
5179"没有附注标签能描述 '%s'。\n"
5180"然而,存在未附注标签:尝试 --tags。"
c04f5ac3 5181
220c313c 5182#: builtin/describe.c:350
c04f5ac3
JX
5183#, c-format
5184msgid ""
5185"No tags can describe '%s'.\n"
5186"Try --always, or create some tags."
5187msgstr ""
55a16ee4
RC
5188"没有标签能描述 '%s'。\n"
5189"尝试 --always,或者创建一些标签。"
c04f5ac3 5190
220c313c 5191#: builtin/describe.c:371
c04f5ac3
JX
5192#, c-format
5193msgid "traversed %lu commits\n"
5194msgstr "已遍历 %lu 个提交\n"
5195
220c313c 5196#: builtin/describe.c:374
c04f5ac3
JX
5197#, c-format
5198msgid ""
5199"more than %i tags found; listed %i most recent\n"
5200"gave up search at %s\n"
5201msgstr ""
55a16ee4 5202"发现多于 %i 个标签,列出最近的 %i 个\n"
90e6ef53 5203"在 %s 放弃搜索\n"
c04f5ac3 5204
220c313c 5205#: builtin/describe.c:396
ef317cd5 5206msgid "find the tag that comes after the commit"
55a16ee4 5207msgstr "寻找该提交之后的标签"
ef317cd5 5208
220c313c 5209#: builtin/describe.c:397
ef317cd5 5210msgid "debug search strategy on stderr"
07432cef 5211msgstr "在标准错误上调试搜索策略"
ef317cd5 5212
220c313c 5213#: builtin/describe.c:398
1003b3a5
JX
5214msgid "use any ref"
5215msgstr "使用任意引用"
5216
220c313c 5217#: builtin/describe.c:399
1003b3a5 5218msgid "use any tag, even unannotated"
55a16ee4 5219msgstr "使用任意标签,即使未附带注释"
ef317cd5 5220
220c313c 5221#: builtin/describe.c:400
ef317cd5 5222msgid "always use long format"
07432cef 5223msgstr "始终使用长提交号格式"
ef317cd5 5224
220c313c 5225#: builtin/describe.c:401
2e8451e8
JX
5226msgid "only follow first parent"
5227msgstr "只跟随第一个父提交"
5228
220c313c 5229#: builtin/describe.c:404
ef317cd5 5230msgid "only output exact matches"
07432cef 5231msgstr "只输出精确匹配"
ef317cd5 5232
220c313c 5233#: builtin/describe.c:406
ef317cd5 5234msgid "consider <n> most recent tags (default: 10)"
55a16ee4 5235msgstr "考虑最近 <n> 个标签(默认:10)"
ef317cd5 5236
220c313c 5237#: builtin/describe.c:408
ef317cd5 5238msgid "only consider tags matching <pattern>"
55a16ee4 5239msgstr "只考虑匹配 <模式> 的标签"
ef317cd5 5240
220c313c 5241#: builtin/describe.c:410 builtin/name-rev.c:318
ef317cd5 5242msgid "show abbreviated commit object as fallback"
07432cef 5243msgstr "显示简写的提交号作为后备"
ef317cd5 5244
220c313c 5245#: builtin/describe.c:411
ef317cd5 5246msgid "mark"
07432cef 5247msgstr "标记"
ef317cd5 5248
220c313c 5249#: builtin/describe.c:412
ef317cd5 5250msgid "append <mark> on dirty working tree (default: \"-dirty\")"
160fb2b2 5251msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
ef317cd5 5252
220c313c 5253#: builtin/describe.c:430
c04f5ac3
JX
5254msgid "--long is incompatible with --abbrev=0"
5255msgstr "--long 与 --abbrev=0 不兼容"
5256
220c313c 5257#: builtin/describe.c:456
c04f5ac3 5258msgid "No names found, cannot describe anything."
90e6ef53 5259msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 5260
220c313c 5261#: builtin/describe.c:476
a8a5406a 5262msgid "--dirty is incompatible with commit-ishes"
649900bc 5263msgstr "--dirty 不能与提交同时使用"
c04f5ac3 5264
220c313c 5265#: builtin/diff.c:86
c04f5ac3
JX
5266#, c-format
5267msgid "'%s': not a regular file or symlink"
5268msgstr "'%s':不是一个正规文件或符号链接"
5269
220c313c 5270#: builtin/diff.c:237
c04f5ac3
JX
5271#, c-format
5272msgid "invalid option: %s"
5273msgstr "无效选项:%s"
5274
220c313c 5275#: builtin/diff.c:358
c04f5ac3 5276msgid "Not a git repository"
160fb2b2 5277msgstr "不是一个 git 仓库"
c04f5ac3 5278
220c313c 5279#: builtin/diff.c:401
c04f5ac3
JX
5280#, c-format
5281msgid "invalid object '%s' given."
5282msgstr "提供了无效对象 '%s'。"
5283
220c313c 5284#: builtin/diff.c:410
c04f5ac3
JX
5285#, c-format
5286msgid "more than two blobs given: '%s'"
160fb2b2 5287msgstr "提供了超过两个数据对象:'%s'"
c04f5ac3 5288
220c313c 5289#: builtin/diff.c:417
c04f5ac3
JX
5290#, c-format
5291msgid "unhandled object '%s' given."
6c94aba5 5292msgstr "无法处理的对象 '%s'。"
c04f5ac3 5293
220c313c 5294#: builtin/fast-export.c:24
ef317cd5 5295msgid "git fast-export [rev-list-opts]"
07432cef 5296msgstr "git fast-export [rev-list-opts]"
ef317cd5 5297
220c313c 5298#: builtin/fast-export.c:979
ef317cd5 5299msgid "show progress after <n> objects"
07432cef 5300msgstr "在 <n> 个对象之后显示进度"
ef317cd5 5301
220c313c 5302#: builtin/fast-export.c:981
ef317cd5 5303msgid "select handling of signed tags"
55a16ee4 5304msgstr "选择如何处理签名标签"
ef317cd5 5305
220c313c 5306#: builtin/fast-export.c:984
ef317cd5 5307msgid "select handling of tags that tag filtered objects"
55a16ee4 5308msgstr "选择当标签指向被过滤对象时该标签的处理方式"
ef317cd5 5309
220c313c 5310#: builtin/fast-export.c:987
ef317cd5 5311msgid "Dump marks to this file"
07432cef 5312msgstr "把标记存储到这个文件"
ef317cd5 5313
220c313c 5314#: builtin/fast-export.c:989
ef317cd5 5315msgid "Import marks from this file"
07432cef 5316msgstr "从这个文件导入标记"
ef317cd5 5317
220c313c 5318#: builtin/fast-export.c:991
ef317cd5 5319msgid "Fake a tagger when tags lack one"
55a16ee4 5320msgstr "当标签缺少标记者字段时,假装提供一个"
ef317cd5 5321
220c313c 5322#: builtin/fast-export.c:993
ef317cd5 5323msgid "Output full tree for each commit"
07432cef 5324msgstr "每次提交都输出整个树"
ef317cd5 5325
220c313c 5326#: builtin/fast-export.c:995
ef317cd5 5327msgid "Use the done feature to terminate the stream"
07432cef 5328msgstr "使用 done 功能来终止流"
ef317cd5 5329
220c313c 5330#: builtin/fast-export.c:996
ef317cd5 5331msgid "Skip output of blob data"
07432cef 5332msgstr "跳过数据对象的输出"
ef317cd5 5333
220c313c 5334#: builtin/fast-export.c:997
6acbf033 5335msgid "refspec"
160fb2b2 5336msgstr "引用规格"
6acbf033 5337
220c313c 5338#: builtin/fast-export.c:998
6acbf033 5339msgid "Apply refspec to exported refs"
160fb2b2 5340msgstr "对导出的引用应用引用规格"
6acbf033 5341
220c313c
JX
5342#: builtin/fast-export.c:999
5343msgid "anonymize output"
5344msgstr "匿名输出"
5345
814ff314 5346#: builtin/fetch.c:19
ef317cd5 5347msgid "git fetch [<options>] [<repository> [<refspec>...]]"
160fb2b2 5348msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
ef317cd5 5349
814ff314 5350#: builtin/fetch.c:20
ef317cd5 5351msgid "git fetch [<options>] <group>"
07432cef 5352msgstr "git fetch [<选项>] <组>"
ef317cd5 5353
814ff314 5354#: builtin/fetch.c:21
ef317cd5 5355msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
160fb2b2 5356msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
ef317cd5 5357
814ff314 5358#: builtin/fetch.c:22
ef317cd5 5359msgid "git fetch --all [<options>]"
07432cef 5360msgstr "git fetch --all [<选项>]"
ef317cd5 5361
814ff314 5362#: builtin/fetch.c:89
ef317cd5 5363msgid "fetch from all remotes"
07432cef 5364msgstr "从所有的远程抓取"
ef317cd5 5365
814ff314 5366#: builtin/fetch.c:91
ef317cd5 5367msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 5368msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 5369
814ff314 5370#: builtin/fetch.c:93
ef317cd5 5371msgid "path to upload pack on remote end"
07432cef 5372msgstr "上传包到远程的路径"
ef317cd5 5373
814ff314 5374#: builtin/fetch.c:94
ef317cd5 5375msgid "force overwrite of local branch"
07432cef 5376msgstr "强制覆盖本地分支"
ef317cd5 5377
814ff314 5378#: builtin/fetch.c:96
ef317cd5 5379msgid "fetch from multiple remotes"
07432cef 5380msgstr "从多个远程抓取"
ef317cd5 5381
814ff314 5382#: builtin/fetch.c:98
ef317cd5 5383msgid "fetch all tags and associated objects"
55a16ee4 5384msgstr "抓取所有的标签和关联对象"
ef317cd5 5385
814ff314 5386#: builtin/fetch.c:100
ef317cd5 5387msgid "do not fetch all tags (--no-tags)"
55a16ee4 5388msgstr "不抓取任何标签(--no-tags)"
ef317cd5 5389
814ff314 5390#: builtin/fetch.c:102
ef317cd5 5391msgid "prune remote-tracking branches no longer on remote"
07432cef 5392msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 5393
07432cef 5394# 译者:可选值,不能翻译
814ff314 5395#: builtin/fetch.c:103
ef317cd5 5396msgid "on-demand"
07432cef 5397msgstr "on-demand"
ef317cd5 5398
814ff314 5399#: builtin/fetch.c:104
ef317cd5 5400msgid "control recursive fetching of submodules"
07432cef 5401msgstr "控制子模组的递归抓取"
ef317cd5 5402
814ff314 5403#: builtin/fetch.c:108
ef317cd5 5404msgid "keep downloaded pack"
07432cef 5405msgstr "保持下载包"
ef317cd5 5406
814ff314 5407#: builtin/fetch.c:110
ef317cd5 5408msgid "allow updating of HEAD ref"
07432cef 5409msgstr "允许更新 HEAD 引用"
ef317cd5 5410
814ff314 5411#: builtin/fetch.c:113
ef317cd5 5412msgid "deepen history of shallow clone"
07432cef 5413msgstr "深化浅克隆的历史"
ef317cd5 5414
814ff314 5415#: builtin/fetch.c:115
a77c07d9 5416msgid "convert to a complete repository"
160fb2b2 5417msgstr "转换为一个完整的仓库"
a77c07d9 5418
814ff314 5419#: builtin/fetch.c:117 builtin/log.c:1208
ef317cd5 5420msgid "dir"
07432cef 5421msgstr "目录"
ef317cd5 5422
814ff314 5423#: builtin/fetch.c:118
ef317cd5 5424msgid "prepend this to submodule path output"
07432cef 5425msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 5426
814ff314 5427#: builtin/fetch.c:121
ef317cd5 5428msgid "default mode for recursion"
07432cef 5429msgstr "递归的默认模式"
ef317cd5 5430
814ff314 5431#: builtin/fetch.c:123
cfff71a9
JX
5432msgid "accept refs that update .git/shallow"
5433msgstr "接受更新 .git/shallow 的引用"
5434
814ff314 5435#: builtin/fetch.c:124
6acbf033
JX
5436msgid "refmap"
5437msgstr "引用映射"
5438
814ff314 5439#: builtin/fetch.c:125
6acbf033
JX
5440msgid "specify fetch refmap"
5441msgstr "指定获取操作的引用映射"
5442
7aea43ff 5443#: builtin/fetch.c:377
c04f5ac3
JX
5444msgid "Couldn't find remote ref HEAD"
5445msgstr "无法发现远程 HEAD 引用"
5446
7aea43ff 5447#: builtin/fetch.c:457
c04f5ac3
JX
5448#, c-format
5449msgid "object %s not found"
5450msgstr "对象 %s 未发现"
5451
7aea43ff 5452#: builtin/fetch.c:462
c04f5ac3
JX
5453msgid "[up to date]"
5454msgstr "[最新]"
5455
7aea43ff 5456#: builtin/fetch.c:476
c04f5ac3
JX
5457#, c-format
5458msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5459msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5460
7aea43ff 5461#: builtin/fetch.c:477 builtin/fetch.c:563
c04f5ac3
JX
5462msgid "[rejected]"
5463msgstr "[已拒绝]"
5464
7aea43ff 5465#: builtin/fetch.c:488
c04f5ac3 5466msgid "[tag update]"
55a16ee4 5467msgstr "[标签更新]"
c04f5ac3 5468
90e6ef53 5469# 译者:注意保持前导空格
7aea43ff 5470#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543
c04f5ac3
JX
5471msgid " (unable to update local ref)"
5472msgstr " (不能更新本地引用)"
5473
7aea43ff 5474#: builtin/fetch.c:508
c04f5ac3 5475msgid "[new tag]"
55a16ee4 5476msgstr "[新标签]"
c04f5ac3 5477
7aea43ff 5478#: builtin/fetch.c:511
c04f5ac3
JX
5479msgid "[new branch]"
5480msgstr "[新分支]"
5481
7aea43ff 5482#: builtin/fetch.c:514
170e9899
JX
5483msgid "[new ref]"
5484msgstr "[新引用]"
5485
7aea43ff 5486#: builtin/fetch.c:559
c04f5ac3
JX
5487msgid "unable to update local ref"
5488msgstr "不能更新本地引用"
5489
7aea43ff 5490#: builtin/fetch.c:559
c04f5ac3
JX
5491msgid "forced update"
5492msgstr "强制更新"
5493
7aea43ff 5494#: builtin/fetch.c:565
c04f5ac3 5495msgid "(non-fast-forward)"
90e6ef53 5496msgstr "(非快进式)"
c04f5ac3 5497
7aea43ff 5498#: builtin/fetch.c:599 builtin/fetch.c:832
c04f5ac3
JX
5499#, c-format
5500msgid "cannot open %s: %s\n"
5501msgstr "无法打开 %s:%s\n"
5502
7aea43ff 5503#: builtin/fetch.c:608
c04f5ac3
JX
5504#, c-format
5505msgid "%s did not send all necessary objects\n"
5506msgstr "%s 未发送所有必须的对象\n"
5507
7aea43ff 5508#: builtin/fetch.c:626
cfff71a9
JX
5509#, c-format
5510msgid "reject %s because shallow roots are not allowed to be updated"
5511msgstr "拒绝 %s 因为浅克隆不允许被更新"
5512
7aea43ff 5513#: builtin/fetch.c:714 builtin/fetch.c:797
c04f5ac3
JX
5514#, c-format
5515msgid "From %.*s\n"
5516msgstr "来自 %.*s\n"
5517
7aea43ff 5518#: builtin/fetch.c:725
c04f5ac3
JX
5519#, c-format
5520msgid ""
5521"some local refs could not be updated; try running\n"
5522" 'git remote prune %s' to remove any old, conflicting branches"
5523msgstr ""
5524"一些本地引用不能被更新;尝试运行\n"
5525" 'git remote prune %s' 来删除旧的、有冲突的分支"
5526
90e6ef53 5527# 译者:注意保持前导空格
7aea43ff 5528#: builtin/fetch.c:777
81809b99 5529#, c-format
8ada9598 5530msgid " (%s will become dangling)"
07432cef 5531msgstr " (%s 将成为摇摆状态)"
c04f5ac3 5532
90e6ef53 5533# 译者:注意保持前导空格
7aea43ff 5534#: builtin/fetch.c:778
81809b99 5535#, c-format
8ada9598 5536msgid " (%s has become dangling)"
07432cef 5537msgstr " (%s 已成为摇摆状态)"
c04f5ac3 5538
7aea43ff 5539#: builtin/fetch.c:802
c04f5ac3
JX
5540msgid "[deleted]"
5541msgstr "[已删除]"
5542
7aea43ff 5543#: builtin/fetch.c:803 builtin/remote.c:1057
c04f5ac3
JX
5544msgid "(none)"
5545msgstr "(无)"
5546
7aea43ff 5547#: builtin/fetch.c:822
c04f5ac3
JX
5548#, c-format
5549msgid "Refusing to fetch into current branch %s of non-bare repository"
160fb2b2 5550msgstr "拒绝获取到非纯仓库的当前分支 %s"
c04f5ac3 5551
7aea43ff 5552#: builtin/fetch.c:841
c04f5ac3
JX
5553#, c-format
5554msgid "Option \"%s\" value \"%s\" is not valid for %s"
5555msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5556
7aea43ff 5557#: builtin/fetch.c:844
c04f5ac3
JX
5558#, c-format
5559msgid "Option \"%s\" is ignored for %s\n"
81809b99 5560msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 5561
7aea43ff 5562#: builtin/fetch.c:900
90314792
JX
5563#, c-format
5564msgid "Don't know how to fetch from %s"
5565msgstr "不知道如何从 %s 获取"
5566
7aea43ff 5567#: builtin/fetch.c:1063
c04f5ac3
JX
5568#, c-format
5569msgid "Fetching %s\n"
d4a8e00b 5570msgstr "正在获取 %s\n"
c04f5ac3 5571
7aea43ff 5572#: builtin/fetch.c:1065 builtin/remote.c:90
c04f5ac3
JX
5573#, c-format
5574msgid "Could not fetch %s"
5575msgstr "不能获取 %s"
5576
7aea43ff 5577#: builtin/fetch.c:1083
c04f5ac3
JX
5578msgid ""
5579"No remote repository specified. Please, specify either a URL or a\n"
5580"remote name from which new revisions should be fetched."
4375c10e 5581msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
c04f5ac3 5582
7aea43ff 5583#: builtin/fetch.c:1106
c04f5ac3 5584msgid "You need to specify a tag name."
55a16ee4 5585msgstr "您需要指定一个标签名称。"
c04f5ac3 5586
7aea43ff 5587#: builtin/fetch.c:1148
a77c07d9
JX
5588msgid "--depth and --unshallow cannot be used together"
5589msgstr "--depth 和 --unshallow 不能同时使用"
5590
7aea43ff 5591#: builtin/fetch.c:1150
a77c07d9 5592msgid "--unshallow on a complete repository does not make sense"
160fb2b2 5593msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
a77c07d9 5594
7aea43ff 5595#: builtin/fetch.c:1173
c04f5ac3 5596msgid "fetch --all does not take a repository argument"
160fb2b2 5597msgstr "fetch --all 不能带一个仓库参数"
c04f5ac3 5598
7aea43ff 5599#: builtin/fetch.c:1175
c04f5ac3 5600msgid "fetch --all does not make sense with refspecs"
160fb2b2 5601msgstr "fetch --all 带引用规格没有任何意义"
c04f5ac3 5602
7aea43ff 5603#: builtin/fetch.c:1186
c04f5ac3
JX
5604#, c-format
5605msgid "No such remote or remote group: %s"
5606msgstr "没有这样的远程或远程组:%s"
5607
7aea43ff 5608#: builtin/fetch.c:1194
c04f5ac3 5609msgid "Fetching a group and specifying refspecs does not make sense"
160fb2b2 5610msgstr "获取组并指定引用规格没有意义"
c04f5ac3 5611
ef317cd5 5612#: builtin/fmt-merge-msg.c:13
814ff314
JX
5613msgid ""
5614"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
5615msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 5616
7aea43ff 5617#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698
04cb2f28 5618#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
7aea43ff
JX
5619#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590
5620#: parse-options.h:131 parse-options.h:238
ef317cd5 5621msgid "n"
07432cef 5622msgstr "n"
c04f5ac3 5623
7aea43ff 5624#: builtin/fmt-merge-msg.c:669
ef317cd5 5625msgid "populate log with at most <n> entries from shortlog"
07432cef 5626msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 5627
7aea43ff 5628#: builtin/fmt-merge-msg.c:672
ef317cd5 5629msgid "alias for --log (deprecated)"
07432cef 5630msgstr "参数 --log 的别名(已弃用)"
ef317cd5 5631
7aea43ff 5632#: builtin/fmt-merge-msg.c:675
ef317cd5 5633msgid "text"
07432cef 5634msgstr "文本"
ef317cd5 5635
7aea43ff 5636#: builtin/fmt-merge-msg.c:676
ef317cd5 5637msgid "use <text> as start of message"
07432cef 5638msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 5639
7aea43ff 5640#: builtin/fmt-merge-msg.c:677
ef317cd5 5641msgid "file to read from"
07432cef 5642msgstr "从文件中读取"
ef317cd5 5643
7aea43ff 5644#: builtin/for-each-ref.c:687
220c313c
JX
5645msgid "unable to parse format"
5646msgstr "不能解析格式"
5647
7aea43ff 5648#: builtin/for-each-ref.c:1083
814ff314
JX
5649msgid "git for-each-ref [<options>] [<pattern>]"
5650msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 5651
7aea43ff 5652#: builtin/for-each-ref.c:1098
ef317cd5 5653msgid "quote placeholders suitably for shells"
07432cef 5654msgstr "引用占位符适用于 shells"
ef317cd5 5655
7aea43ff 5656#: builtin/for-each-ref.c:1100
ef317cd5 5657msgid "quote placeholders suitably for perl"
07432cef 5658msgstr "引用占位符适用于 perl"
ef317cd5 5659
7aea43ff 5660#: builtin/for-each-ref.c:1102
ef317cd5 5661msgid "quote placeholders suitably for python"
07432cef 5662msgstr "引用占位符适用于 python"
ef317cd5 5663
7aea43ff 5664#: builtin/for-each-ref.c:1104
04cb2f28
JX
5665msgid "quote placeholders suitably for Tcl"
5666msgstr "引用占位符适用于 Tcl"
ef317cd5 5667
7aea43ff 5668#: builtin/for-each-ref.c:1107
ef317cd5 5669msgid "show only <n> matched refs"
07432cef 5670msgstr "只显示 <n> 个匹配的引用"
ef317cd5 5671
7aea43ff 5672#: builtin/for-each-ref.c:1108 builtin/replace.c:438
ef317cd5 5673msgid "format"
07432cef 5674msgstr "格式"
ef317cd5 5675
7aea43ff 5676#: builtin/for-each-ref.c:1108
ef317cd5 5677msgid "format to use for the output"
07432cef 5678msgstr "输出格式"
ef317cd5 5679
7aea43ff 5680#: builtin/for-each-ref.c:1109
ef317cd5 5681msgid "key"
07432cef 5682msgstr "key"
ef317cd5 5683
7aea43ff 5684#: builtin/for-each-ref.c:1110
ef317cd5 5685msgid "field name to sort on"
07432cef 5686msgstr "排序的字段名"
ef317cd5 5687
5bb01d4f 5688#: builtin/fsck.c:147 builtin/prune.c:137
6c94aba5
JX
5689msgid "Checking connectivity"
5690msgstr "检查连接中"
5691
7aea43ff 5692#: builtin/fsck.c:548
6c94aba5
JX
5693msgid "Checking object directories"
5694msgstr "检查对象目录中"
5695
7aea43ff 5696#: builtin/fsck.c:611
814ff314
JX
5697msgid "git fsck [<options>] [<object>...]"
5698msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 5699
7aea43ff 5700#: builtin/fsck.c:617
ef317cd5 5701msgid "show unreachable objects"
07432cef 5702msgstr "显示不可达的对象"
ef317cd5 5703
7aea43ff 5704#: builtin/fsck.c:618
ef317cd5 5705msgid "show dangling objects"
07432cef 5706msgstr "显示摇摆的对象"
ef317cd5 5707
7aea43ff 5708#: builtin/fsck.c:619
ef317cd5 5709msgid "report tags"
55a16ee4 5710msgstr "报告标签"
ef317cd5 5711
7aea43ff 5712#: builtin/fsck.c:620
ef317cd5 5713msgid "report root nodes"
07432cef 5714msgstr "报告根节点"
ef317cd5 5715
7aea43ff 5716#: builtin/fsck.c:621
ef317cd5 5717msgid "make index objects head nodes"
07432cef 5718msgstr "将索引亦作为检查的头节点"
ef317cd5 5719
7aea43ff 5720#: builtin/fsck.c:622
ef317cd5 5721msgid "make reflogs head nodes (default)"
07432cef 5722msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 5723
7aea43ff 5724#: builtin/fsck.c:623
ef317cd5 5725msgid "also consider packs and alternate objects"
07432cef 5726msgstr "也考虑包和备用对象"
ef317cd5 5727
7aea43ff 5728#: builtin/fsck.c:624
ef317cd5 5729msgid "enable more strict checking"
07432cef 5730msgstr "启用更严格的检查"
ef317cd5 5731
7aea43ff 5732#: builtin/fsck.c:626
ef317cd5 5733msgid "write dangling objects in .git/lost-found"
07432cef 5734msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5 5735
5bb01d4f 5736#: builtin/fsck.c:627 builtin/prune.c:107
ef317cd5 5737msgid "show progress"
07432cef 5738msgstr "显示进度"
ef317cd5 5739
7aea43ff 5740#: builtin/fsck.c:677
6c94aba5
JX
5741msgid "Checking objects"
5742msgstr "检查对象中"
5743
cfff71a9 5744#: builtin/gc.c:24
814ff314
JX
5745msgid "git gc [<options>]"
5746msgstr "git gc [<选项>]"
ef317cd5 5747
7aea43ff 5748#: builtin/gc.c:67
c04f5ac3 5749#, c-format
7aea43ff
JX
5750msgid "Invalid %s: '%s'"
5751msgstr "无效 %s:'%s'"
c04f5ac3 5752
7aea43ff 5753#: builtin/gc.c:112
c04f5ac3
JX
5754#, c-format
5755msgid "insanely long object directory %.*s"
5756msgstr "不正常的长对象目录 %.*s"
5757
7aea43ff 5758#: builtin/gc.c:281
ef317cd5 5759msgid "prune unreferenced objects"
07432cef 5760msgstr "清除未引用的对象"
ef317cd5 5761
7aea43ff 5762#: builtin/gc.c:283
ef317cd5 5763msgid "be more thorough (increased runtime)"
07432cef 5764msgstr "更彻底(增加运行时间)"
ef317cd5 5765
7aea43ff 5766#: builtin/gc.c:284
ef317cd5 5767msgid "enable auto-gc mode"
07432cef 5768msgstr "启用自动垃圾回收模式"
ef317cd5 5769
7aea43ff 5770#: builtin/gc.c:285
90314792
JX
5771msgid "force running gc even if there may be another gc running"
5772msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5773
7aea43ff 5774#: builtin/gc.c:327
c04f5ac3 5775#, c-format
6c94aba5 5776msgid "Auto packing the repository in background for optimum performance.\n"
160fb2b2 5777msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6c94aba5 5778
7aea43ff 5779#: builtin/gc.c:329
6c94aba5
JX
5780#, c-format
5781msgid "Auto packing the repository for optimum performance.\n"
160fb2b2 5782msgstr "自动打包仓库以求最佳性能。\n"
6c94aba5 5783
7aea43ff 5784#: builtin/gc.c:330
6c94aba5
JX
5785#, c-format
5786msgid "See \"git help gc\" for manual housekeeping.\n"
5787msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 5788
7aea43ff 5789#: builtin/gc.c:348
90314792
JX
5790#, c-format
5791msgid ""
5792"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5793msgstr ""
5794"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5795
7aea43ff 5796#: builtin/gc.c:376
c04f5ac3
JX
5797msgid ""
5798"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 5799msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 5800
90314792 5801#: builtin/grep.c:23
814ff314
JX
5802msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
5803msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 5804
90314792 5805#: builtin/grep.c:218
c04f5ac3
JX
5806#, c-format
5807msgid "grep: failed to create thread: %s"
90e6ef53 5808msgstr "grep:无法创建线程:%s"
c04f5ac3 5809
6acbf033 5810#: builtin/grep.c:441 builtin/grep.c:476
c04f5ac3
JX
5811#, c-format
5812msgid "unable to read tree (%s)"
90e6ef53 5813msgstr "无法读取树(%s)"
c04f5ac3 5814
6acbf033 5815#: builtin/grep.c:491
c04f5ac3
JX
5816#, c-format
5817msgid "unable to grep from object of type %s"
5818msgstr "无法抓取来自于 %s 类型的对象"
5819
6acbf033 5820#: builtin/grep.c:547
c04f5ac3
JX
5821#, c-format
5822msgid "switch `%c' expects a numerical value"
5823msgstr "开关 `%c' 期望一个数字值"
5824
6acbf033 5825#: builtin/grep.c:564
c04f5ac3
JX
5826#, c-format
5827msgid "cannot open '%s'"
5828msgstr "不能打开 '%s'"
5829
6acbf033 5830#: builtin/grep.c:638
ef317cd5 5831msgid "search in index instead of in the work tree"
07432cef 5832msgstr "在索引区搜索而不是在工作区"
ef317cd5 5833
6acbf033 5834#: builtin/grep.c:640
ef317cd5 5835msgid "find in contents not managed by git"
07432cef 5836msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
5837
5838# 译者:中文字符串拼接,可删除前导空格
6acbf033 5839#: builtin/grep.c:642
ef317cd5 5840msgid "search in both tracked and untracked files"
07432cef 5841msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 5842
6acbf033 5843#: builtin/grep.c:644
814ff314
JX
5844msgid "ignore files specified via '.gitignore'"
5845msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 5846
6acbf033 5847#: builtin/grep.c:647
ef317cd5 5848msgid "show non-matching lines"
07432cef 5849msgstr "显示未匹配的行"
ef317cd5 5850
6acbf033 5851#: builtin/grep.c:649
ef317cd5 5852msgid "case insensitive matching"
07432cef 5853msgstr "不区分大小写匹配"
ef317cd5 5854
6acbf033 5855#: builtin/grep.c:651
ef317cd5 5856msgid "match patterns only at word boundaries"
07432cef 5857msgstr "只在单词边界匹配模式"
ef317cd5 5858
6acbf033 5859#: builtin/grep.c:653
ef317cd5 5860msgid "process binary files as text"
07432cef 5861msgstr "把二进制文件当做文本处理"
ef317cd5 5862
6acbf033 5863#: builtin/grep.c:655
ef317cd5 5864msgid "don't match patterns in binary files"
07432cef 5865msgstr "不在二进制文件中匹配模式"
ef317cd5 5866
6acbf033 5867#: builtin/grep.c:658
90314792
JX
5868msgid "process binary files with textconv filters"
5869msgstr "用 textconv 过滤器处理二进制文件"
5870
6acbf033 5871#: builtin/grep.c:660
ef317cd5 5872msgid "descend at most <depth> levels"
07432cef 5873msgstr "最多以指定的深度向下寻找"
ef317cd5 5874
6acbf033 5875#: builtin/grep.c:664
ef317cd5 5876msgid "use extended POSIX regular expressions"
07432cef 5877msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 5878
6acbf033 5879#: builtin/grep.c:667
ef317cd5 5880msgid "use basic POSIX regular expressions (default)"
07432cef 5881msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 5882
6acbf033 5883#: builtin/grep.c:670
ef317cd5 5884msgid "interpret patterns as fixed strings"
07432cef 5885msgstr "把模式解析为固定的字符串"
ef317cd5 5886
6acbf033 5887#: builtin/grep.c:673
ef317cd5 5888msgid "use Perl-compatible regular expressions"
07432cef 5889msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 5890
6acbf033 5891#: builtin/grep.c:676
ef317cd5 5892msgid "show line numbers"
07432cef 5893msgstr "显示行号"
ef317cd5 5894
6acbf033 5895#: builtin/grep.c:677
ef317cd5 5896msgid "don't show filenames"
07432cef 5897msgstr "不显示文件名"
ef317cd5 5898
6acbf033 5899#: builtin/grep.c:678
ef317cd5 5900msgid "show filenames"
07432cef 5901msgstr "显示文件名"
ef317cd5 5902
6acbf033 5903#: builtin/grep.c:680
ef317cd5 5904msgid "show filenames relative to top directory"
07432cef 5905msgstr "显示相对于顶级目录的文件名"
ef317cd5 5906
6acbf033 5907#: builtin/grep.c:682
ef317cd5 5908msgid "show only filenames instead of matching lines"
07432cef 5909msgstr "只显示文件名而不显示匹配的行"
ef317cd5 5910
6acbf033 5911#: builtin/grep.c:684
ef317cd5 5912msgid "synonym for --files-with-matches"
07432cef 5913msgstr "和 --files-with-matches 同义"
ef317cd5 5914
6acbf033 5915#: builtin/grep.c:687
ef317cd5 5916msgid "show only the names of files without match"
07432cef 5917msgstr "只显示未匹配的文件名"
ef317cd5 5918
6acbf033 5919#: builtin/grep.c:689
ef317cd5 5920msgid "print NUL after filenames"
07432cef 5921msgstr "在文件名后输出 NUL 字符"
ef317cd5 5922
6acbf033 5923#: builtin/grep.c:691
ef317cd5 5924msgid "show the number of matches instead of matching lines"
07432cef 5925msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 5926
6acbf033 5927#: builtin/grep.c:692
ef317cd5 5928msgid "highlight matches"
07432cef 5929msgstr "高亮显示匹配项"
ef317cd5 5930
6acbf033 5931#: builtin/grep.c:694
ef317cd5 5932msgid "print empty line between matches from different files"
07432cef 5933msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 5934
6acbf033 5935#: builtin/grep.c:696
ef317cd5 5936msgid "show filename only once above matches from same file"
07432cef 5937msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 5938
6acbf033 5939#: builtin/grep.c:699
ef317cd5 5940msgid "show <n> context lines before and after matches"
07432cef 5941msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 5942
6acbf033 5943#: builtin/grep.c:702
ef317cd5 5944msgid "show <n> context lines before matches"
07432cef 5945msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 5946
6acbf033 5947#: builtin/grep.c:704
ef317cd5 5948msgid "show <n> context lines after matches"
07432cef 5949msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 5950
6acbf033 5951#: builtin/grep.c:705
ef317cd5 5952msgid "shortcut for -C NUM"
07432cef 5953msgstr "快捷键 -C 数字"
ef317cd5 5954
6acbf033 5955#: builtin/grep.c:708
ef317cd5 5956msgid "show a line with the function name before matches"
07432cef 5957msgstr "在匹配的前面显示一行函数名"
ef317cd5 5958
6acbf033 5959#: builtin/grep.c:710
ef317cd5 5960msgid "show the surrounding function"
07432cef 5961msgstr "显示所在函数的前后内容"
ef317cd5 5962
6acbf033 5963#: builtin/grep.c:713
ef317cd5 5964msgid "read patterns from file"
07432cef 5965msgstr "从文件读取模式"
ef317cd5 5966
6acbf033 5967#: builtin/grep.c:715
ef317cd5 5968msgid "match <pattern>"
07432cef 5969msgstr "匹配 <模式>"
ef317cd5 5970
6acbf033 5971#: builtin/grep.c:717
ef317cd5 5972msgid "combine patterns specified with -e"
07432cef 5973msgstr "组合用 -e 参数设定的模式"
ef317cd5 5974
6acbf033 5975#: builtin/grep.c:729
ef317cd5 5976msgid "indicate hit with exit status without output"
07432cef 5977msgstr "不输出,而用退出码标识命中状态"
ef317cd5 5978
6acbf033 5979#: builtin/grep.c:731
ef317cd5 5980msgid "show only matches from files that match all patterns"
07432cef 5981msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 5982
6acbf033 5983#: builtin/grep.c:733
07432cef
WS
5984msgid "show parse tree for grep expression"
5985msgstr "显示 grep 表达式的解析树"
5986
6acbf033 5987#: builtin/grep.c:737
ef317cd5 5988msgid "pager"
07432cef 5989msgstr "分页"
ef317cd5 5990
6acbf033 5991#: builtin/grep.c:737
ef317cd5 5992msgid "show matching files in the pager"
07432cef 5993msgstr "分页显示匹配的文件"
ef317cd5 5994
6acbf033 5995#: builtin/grep.c:740
ef317cd5 5996msgid "allow calling of grep(1) (ignored by this build)"
07432cef 5997msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 5998
7aea43ff 5999#: builtin/grep.c:741 builtin/show-ref.c:189
ef317cd5 6000msgid "show usage"
07432cef 6001msgstr "显示用法"
ef317cd5 6002
6acbf033 6003#: builtin/grep.c:808
c04f5ac3
JX
6004msgid "no pattern given."
6005msgstr "未提供模式匹配。"
6006
6acbf033 6007#: builtin/grep.c:866
c04f5ac3
JX
6008msgid "--open-files-in-pager only works on the worktree"
6009msgstr "--open-files-in-pager 仅用于工作区"
6010
6acbf033 6011#: builtin/grep.c:892
c04f5ac3 6012msgid "--cached or --untracked cannot be used with --no-index."
649900bc 6013msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 6014
6acbf033 6015#: builtin/grep.c:897
c04f5ac3 6016msgid "--no-index or --untracked cannot be used with revs."
649900bc 6017msgstr "--no-index 或 --untracked 不能和版本同时使用。"
c04f5ac3 6018
6acbf033 6019#: builtin/grep.c:900
c04f5ac3 6020msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 6021msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 6022
6acbf033 6023#: builtin/grep.c:908
c04f5ac3
JX
6024msgid "both --cached and trees are given."
6025msgstr "同时给出了 --cached 和树对象。"
6026
7aea43ff 6027#: builtin/hash-object.c:80
ef317cd5 6028msgid ""
814ff314
JX
6029"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6030"[--] <file>..."
ef317cd5 6031msgstr ""
814ff314
JX
6032"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
6033"[--] <文件>..."
ef317cd5 6034
7aea43ff 6035#: builtin/hash-object.c:81
ef317cd5 6036msgid "git hash-object --stdin-paths < <list-of-paths>"
07432cef 6037msgstr "git hash-object --stdin-paths < <路径列表>"
ef317cd5 6038
7aea43ff 6039#: builtin/hash-object.c:92 builtin/tag.c:612
ef317cd5 6040msgid "type"
07432cef 6041msgstr "类型"
ef317cd5 6042
7aea43ff 6043#: builtin/hash-object.c:92
ef317cd5 6044msgid "object type"
07432cef 6045msgstr "对象类型"
ef317cd5 6046
7aea43ff 6047#: builtin/hash-object.c:93
ef317cd5 6048msgid "write the object into the object database"
07432cef 6049msgstr "将对象写入对象数据库"
ef317cd5 6050
7aea43ff 6051#: builtin/hash-object.c:95
ef317cd5 6052msgid "read the object from stdin"
07432cef 6053msgstr "从标准输入读取对象"
ef317cd5 6054
7aea43ff 6055#: builtin/hash-object.c:97
ef317cd5 6056msgid "store file as is without filters"
07432cef 6057msgstr "原样存储文件不使用过滤器"
ef317cd5 6058
7aea43ff 6059#: builtin/hash-object.c:98
220c313c
JX
6060msgid ""
6061"just hash any random garbage to create corrupt objects for debugging Git"
6062msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
6063
7aea43ff 6064#: builtin/hash-object.c:99
ef317cd5 6065msgid "process file as it were from this path"
07432cef 6066msgstr "处理文件并假设其来自于此路径"
ef317cd5 6067
2e8451e8 6068#: builtin/help.c:41
ef317cd5 6069msgid "print all available commands"
07432cef 6070msgstr "打印所有可用的命令"
ef317cd5 6071
2e8451e8 6072#: builtin/help.c:42
4dcdc3d8
JX
6073msgid "print list of useful guides"
6074msgstr "显示有用的指南列表"
6075
2e8451e8 6076#: builtin/help.c:43
ef317cd5 6077msgid "show man page"
07432cef 6078msgstr "显示 man 手册"
ef317cd5 6079
2e8451e8 6080#: builtin/help.c:44
ef317cd5 6081msgid "show manual in web browser"
07432cef 6082msgstr "在 web 浏览器中显示手册"
ef317cd5 6083
2e8451e8 6084#: builtin/help.c:46
ef317cd5 6085msgid "show info page"
07432cef 6086msgstr "显示 info 手册"
ef317cd5 6087
2e8451e8 6088#: builtin/help.c:52
814ff314
JX
6089msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6090msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
ef317cd5 6091
2e8451e8 6092#: builtin/help.c:64
81809b99 6093#, c-format
8ada9598 6094msgid "unrecognized help format '%s'"
81809b99 6095msgstr "未能识别的帮助格式 '%s'"
8ada9598 6096
220c313c 6097#: builtin/help.c:91
8ada9598 6098msgid "Failed to start emacsclient."
81809b99 6099msgstr "无法启动 emacsclient。"
8ada9598 6100
220c313c 6101#: builtin/help.c:104
8ada9598 6102msgid "Failed to parse emacsclient version."
81809b99 6103msgstr "无法解析 emacsclient 版本。"
8ada9598 6104
220c313c 6105#: builtin/help.c:112
8ada9598
JX
6106#, c-format
6107msgid "emacsclient version '%d' too old (< 22)."
07432cef 6108msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 6109
220c313c 6110#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
81809b99 6111#, c-format
8ada9598 6112msgid "failed to exec '%s': %s"
81809b99 6113msgstr "无法执行 '%s':%s"
8ada9598 6114
220c313c 6115#: builtin/help.c:215
8ada9598
JX
6116#, c-format
6117msgid ""
6118"'%s': path for unsupported man viewer.\n"
6119"Please consider using 'man.<tool>.cmd' instead."
6120msgstr ""
81809b99 6121"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 6122"请使用 'man.<工具>.cmd'。"
8ada9598 6123
220c313c 6124#: builtin/help.c:227
8ada9598
JX
6125#, c-format
6126msgid ""
6127"'%s': cmd for supported man viewer.\n"
6128"Please consider using 'man.<tool>.path' instead."
6129msgstr ""
81809b99 6130"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 6131"请使用 'man.<工具>.path'。"
8ada9598 6132
04cb2f28 6133#: builtin/help.c:354
8ada9598
JX
6134#, c-format
6135msgid "'%s': unknown man viewer."
81809b99 6136msgstr "'%s':未知的 man 查看器。"
8ada9598 6137
04cb2f28 6138#: builtin/help.c:371
8ada9598 6139msgid "no man viewer handled the request"
81809b99 6140msgstr "没有 man 查看器处理此请求"
8ada9598 6141
04cb2f28 6142#: builtin/help.c:379
8ada9598 6143msgid "no info viewer handled the request"
81809b99 6144msgstr "没有 info 查看器处理此请求"
8ada9598 6145
04cb2f28 6146#: builtin/help.c:428
4dcdc3d8
JX
6147msgid "Defining attributes per path"
6148msgstr "定义路径的属性"
6149
04cb2f28 6150#: builtin/help.c:429
220c313c
JX
6151msgid "Everyday Git With 20 Commands Or So"
6152msgstr "每一天 Git 常用的约 20 条命令"
6153
04cb2f28 6154#: builtin/help.c:430
4dcdc3d8
JX
6155msgid "A Git glossary"
6156msgstr "Git 词汇表"
6157
04cb2f28 6158#: builtin/help.c:431
4dcdc3d8
JX
6159msgid "Specifies intentionally untracked files to ignore"
6160msgstr "忽略指定的未跟踪文件"
6161
04cb2f28 6162#: builtin/help.c:432
4dcdc3d8
JX
6163msgid "Defining submodule properties"
6164msgstr "定义子模组属性"
6165
04cb2f28 6166#: builtin/help.c:433
4dcdc3d8
JX
6167msgid "Specifying revisions and ranges for Git"
6168msgstr "指定 Git 的版本和版本范围"
6169
04cb2f28 6170#: builtin/help.c:434
4dcdc3d8
JX
6171msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6172msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6173
04cb2f28 6174#: builtin/help.c:435
4dcdc3d8
JX
6175msgid "An overview of recommended workflows with Git"
6176msgstr "Git 推荐的工作流概览"
6177
04cb2f28 6178#: builtin/help.c:447
4dcdc3d8
JX
6179msgid "The common Git guides are:\n"
6180msgstr "最常用的 Git 向导有:\n"
6181
04cb2f28 6182#: builtin/help.c:468 builtin/help.c:485
8ada9598
JX
6183#, c-format
6184msgid "usage: %s%s"
81809b99 6185msgstr "用法:%s%s"
8ada9598 6186
04cb2f28 6187#: builtin/help.c:501
8ada9598
JX
6188#, c-format
6189msgid "`git %s' is aliased to `%s'"
81809b99 6190msgstr "`git %s' 是 `%s' 的别名"
8ada9598 6191
7aea43ff 6192#: builtin/index-pack.c:151
6acbf033
JX
6193#, c-format
6194msgid "unable to open %s"
6195msgstr "不能打开 %s"
6196
7aea43ff 6197#: builtin/index-pack.c:201
8ada9598
JX
6198#, c-format
6199msgid "object type mismatch at %s"
81809b99 6200msgstr "%s 的对象类型不匹配"
8ada9598 6201
7aea43ff 6202#: builtin/index-pack.c:221
6acbf033
JX
6203#, c-format
6204msgid "did not receive expected object %s"
6205msgstr "未能获取期望的对象 %s"
8ada9598 6206
7aea43ff 6207#: builtin/index-pack.c:224
6acbf033
JX
6208#, c-format
6209msgid "object %s: expected type %s, found %s"
6210msgstr "对象 %s:期待类型 %s,却是 %s"
6211
7aea43ff 6212#: builtin/index-pack.c:266
81809b99 6213#, c-format
8ada9598
JX
6214msgid "cannot fill %d byte"
6215msgid_plural "cannot fill %d bytes"
81809b99 6216msgstr[0] "无法填充 %d 字节"
5ae481e0 6217msgstr[1] "无法填充 %d 字节"
8ada9598 6218
7aea43ff 6219#: builtin/index-pack.c:276
8ada9598 6220msgid "early EOF"
81809b99 6221msgstr "过早的文件结束符(EOF)"
8ada9598 6222
7aea43ff 6223#: builtin/index-pack.c:277
8ada9598 6224msgid "read error on input"
81809b99 6225msgstr "输入上的读错误"
8ada9598 6226
7aea43ff 6227#: builtin/index-pack.c:289
8ada9598 6228msgid "used more bytes than were available"
81809b99 6229msgstr "用掉了超过可用的字节"
8ada9598 6230
7aea43ff 6231#: builtin/index-pack.c:296
8ada9598 6232msgid "pack too large for current definition of off_t"
81809b99 6233msgstr "包太大超过了当前 off_t 的定义"
8ada9598 6234
7aea43ff 6235#: builtin/index-pack.c:312
81809b99 6236#, c-format
8ada9598 6237msgid "unable to create '%s'"
81809b99 6238msgstr "不能创建 '%s'"
8ada9598 6239
7aea43ff 6240#: builtin/index-pack.c:317
81809b99 6241#, c-format
8ada9598 6242msgid "cannot open packfile '%s'"
81809b99 6243msgstr "无法打开包文件 '%s'"
8ada9598 6244
7aea43ff 6245#: builtin/index-pack.c:331
8ada9598 6246msgid "pack signature mismatch"
81809b99 6247msgstr "包签名不匹配"
8ada9598 6248
7aea43ff 6249#: builtin/index-pack.c:333
ef317cd5
JX
6250#, c-format
6251msgid "pack version %<PRIu32> unsupported"
07432cef 6252msgstr "不支持包版本 %<PRIu32>"
ef317cd5 6253
7aea43ff 6254#: builtin/index-pack.c:351
8ada9598
JX
6255#, c-format
6256msgid "pack has bad object at offset %lu: %s"
81809b99 6257msgstr "包中有错误的对象位于 %lu:%s"
8ada9598 6258
7aea43ff 6259#: builtin/index-pack.c:472
8ada9598
JX
6260#, c-format
6261msgid "inflate returned %d"
81809b99 6262msgstr "解压缩返回 %d"
8ada9598 6263
7aea43ff 6264#: builtin/index-pack.c:521
8ada9598 6265msgid "offset value overflow for delta base object"
81809b99 6266msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 6267
7aea43ff 6268#: builtin/index-pack.c:529
8ada9598 6269msgid "delta base offset is out of bound"
81809b99 6270msgstr "delta 基准偏移越界"
8ada9598 6271
7aea43ff 6272#: builtin/index-pack.c:537
81809b99 6273#, c-format
8ada9598 6274msgid "unknown object type %d"
81809b99 6275msgstr "未知对象类型 %d"
8ada9598 6276
7aea43ff 6277#: builtin/index-pack.c:568
8ada9598 6278msgid "cannot pread pack file"
81809b99 6279msgstr "无法读取包文件"
8ada9598 6280
7aea43ff 6281#: builtin/index-pack.c:570
8ada9598
JX
6282#, c-format
6283msgid "premature end of pack file, %lu byte missing"
6284msgid_plural "premature end of pack file, %lu bytes missing"
81809b99 6285msgstr[0] "包文件过早结束,缺少 %lu 字节"
5ae481e0 6286msgstr[1] "包文件过早结束,缺少 %lu 字节"
8ada9598 6287
7aea43ff 6288#: builtin/index-pack.c:596
8ada9598 6289msgid "serious inflate inconsistency"
81809b99 6290msgstr "解压缩严重的不一致"
8ada9598 6291
7aea43ff
JX
6292#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771
6293#: builtin/index-pack.c:805 builtin/index-pack.c:814
8ada9598
JX
6294#, c-format
6295msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 6296msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 6297
7aea43ff 6298#: builtin/index-pack.c:745 builtin/pack-objects.c:162
814ff314 6299#: builtin/pack-objects.c:254
6792b93b
JX
6300#, c-format
6301msgid "unable to read %s"
6302msgstr "不能读 %s"
6303
7aea43ff 6304#: builtin/index-pack.c:811
6792b93b
JX
6305#, c-format
6306msgid "cannot read existing object %s"
6307msgstr "不能读取现存对象 %s"
6308
7aea43ff 6309#: builtin/index-pack.c:825
81809b99 6310#, c-format
8ada9598 6311msgid "invalid blob object %s"
160fb2b2 6312msgstr "无效的数据对象 %s"
8ada9598 6313
7aea43ff 6314#: builtin/index-pack.c:839
81809b99 6315#, c-format
8ada9598 6316msgid "invalid %s"
81809b99 6317msgstr "无效的 %s"
8ada9598 6318
7aea43ff 6319#: builtin/index-pack.c:843
8ada9598 6320msgid "Error in object"
81809b99 6321msgstr "对象中出错"
8ada9598 6322
7aea43ff 6323#: builtin/index-pack.c:845
8ada9598
JX
6324#, c-format
6325msgid "Not all child objects of %s are reachable"
81809b99 6326msgstr "%s 的所有子对象并非都可达"
8ada9598 6327
7aea43ff 6328#: builtin/index-pack.c:917 builtin/index-pack.c:948
8ada9598 6329msgid "failed to apply delta"
81809b99 6330msgstr "无法应用 delta"
8ada9598 6331
7aea43ff 6332#: builtin/index-pack.c:1118
8ada9598 6333msgid "Receiving objects"
81809b99 6334msgstr "接收对象中"
8ada9598 6335
7aea43ff 6336#: builtin/index-pack.c:1118
8ada9598 6337msgid "Indexing objects"
81809b99 6338msgstr "索引对象中"
8ada9598 6339
7aea43ff 6340#: builtin/index-pack.c:1150
8ada9598 6341msgid "pack is corrupted (SHA1 mismatch)"
81809b99 6342msgstr "包冲突(SHA1 不匹配)"
8ada9598 6343
7aea43ff 6344#: builtin/index-pack.c:1155
8ada9598 6345msgid "cannot fstat packfile"
81809b99 6346msgstr "不能枚举包文件状态"
8ada9598 6347
7aea43ff 6348#: builtin/index-pack.c:1158
8ada9598 6349msgid "pack has junk at the end"
81809b99 6350msgstr "包的结尾有垃圾数据"
8ada9598 6351
7aea43ff 6352#: builtin/index-pack.c:1169
6792b93b
JX
6353msgid "confusion beyond insanity in parse_pack_objects()"
6354msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6355
7aea43ff 6356#: builtin/index-pack.c:1194
8ada9598 6357msgid "Resolving deltas"
81809b99 6358msgstr "处理 delta 中"
8ada9598 6359
7aea43ff 6360#: builtin/index-pack.c:1205
07432cef 6361#, c-format
ef317cd5 6362msgid "unable to create thread: %s"
07432cef 6363msgstr "不能创建线程:%s"
ef317cd5 6364
7aea43ff 6365#: builtin/index-pack.c:1247
8ada9598 6366msgid "confusion beyond insanity"
81809b99 6367msgstr "不可理喻"
8ada9598 6368
7aea43ff 6369#: builtin/index-pack.c:1253
ef317cd5
JX
6370#, c-format
6371msgid "completed with %d local objects"
07432cef 6372msgstr "完成 %d 个本地对象"
ef317cd5 6373
7aea43ff 6374#: builtin/index-pack.c:1263
ef317cd5
JX
6375#, c-format
6376msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 6377msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 6378
7aea43ff 6379#: builtin/index-pack.c:1267
8ada9598
JX
6380#, c-format
6381msgid "pack has %d unresolved delta"
6382msgid_plural "pack has %d unresolved deltas"
81809b99 6383msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 6384msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 6385
7aea43ff 6386#: builtin/index-pack.c:1291
81809b99 6387#, c-format
8ada9598 6388msgid "unable to deflate appended object (%d)"
07432cef 6389msgstr "不能压缩附加对象(%d)"
8ada9598 6390
7aea43ff 6391#: builtin/index-pack.c:1367
8ada9598
JX
6392#, c-format
6393msgid "local object %s is corrupt"
81809b99 6394msgstr "本地对象 %s 已损坏"
8ada9598 6395
7aea43ff 6396#: builtin/index-pack.c:1391
8ada9598 6397msgid "error while closing pack file"
81809b99 6398msgstr "关闭包文件时出错"
8ada9598 6399
7aea43ff 6400#: builtin/index-pack.c:1404
81809b99 6401#, c-format
8ada9598 6402msgid "cannot write keep file '%s'"
81809b99 6403msgstr "无法写保留文件 '%s'"
8ada9598 6404
7aea43ff 6405#: builtin/index-pack.c:1412
81809b99 6406#, c-format
8ada9598 6407msgid "cannot close written keep file '%s'"
81809b99 6408msgstr "无法关闭保留文件 '%s'"
8ada9598 6409
7aea43ff 6410#: builtin/index-pack.c:1425
8ada9598 6411msgid "cannot store pack file"
81809b99 6412msgstr "无法存储包文件"
8ada9598 6413
7aea43ff 6414#: builtin/index-pack.c:1436
8ada9598 6415msgid "cannot store index file"
81809b99 6416msgstr "无法存储索引文件"
8ada9598 6417
7aea43ff 6418#: builtin/index-pack.c:1469
07432cef 6419#, c-format
ef317cd5 6420msgid "bad pack.indexversion=%<PRIu32>"
07432cef 6421msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 6422
7aea43ff 6423#: builtin/index-pack.c:1475
ef317cd5
JX
6424#, c-format
6425msgid "invalid number of threads specified (%d)"
07432cef 6426msgstr "指定的线程数无效(%d)"
ef317cd5 6427
7aea43ff 6428#: builtin/index-pack.c:1479 builtin/index-pack.c:1658
ef317cd5
JX
6429#, c-format
6430msgid "no threads support, ignoring %s"
07432cef 6431msgstr "没有线程支持,忽略 %s"
ef317cd5 6432
7aea43ff 6433#: builtin/index-pack.c:1537
81809b99 6434#, c-format
8ada9598 6435msgid "Cannot open existing pack file '%s'"
81809b99 6436msgstr "无法打开现存包文件 '%s'"
8ada9598 6437
7aea43ff 6438#: builtin/index-pack.c:1539
81809b99 6439#, c-format
8ada9598 6440msgid "Cannot open existing pack idx file for '%s'"
81809b99 6441msgstr "无法为 %s 打开包索引文件"
8ada9598 6442
7aea43ff 6443#: builtin/index-pack.c:1586
81809b99 6444#, c-format
8ada9598
JX
6445msgid "non delta: %d object"
6446msgid_plural "non delta: %d objects"
81809b99 6447msgstr[0] "非 delta:%d 个对象"
5ae481e0 6448msgstr[1] "非 delta:%d 个对象"
8ada9598 6449
7aea43ff 6450#: builtin/index-pack.c:1593
8ada9598
JX
6451#, c-format
6452msgid "chain length = %d: %lu object"
6453msgid_plural "chain length = %d: %lu objects"
81809b99 6454msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 6455msgstr[1] "链长 = %d: %lu 对象"
8ada9598 6456
7aea43ff 6457#: builtin/index-pack.c:1622
8ada9598 6458msgid "Cannot come back to cwd"
81809b99 6459msgstr "无法返回当前工作目录"
8ada9598 6460
7aea43ff
JX
6461#: builtin/index-pack.c:1670 builtin/index-pack.c:1673
6462#: builtin/index-pack.c:1685 builtin/index-pack.c:1689
81809b99 6463#, c-format
8ada9598 6464msgid "bad %s"
81809b99 6465msgstr "错误选项 %s"
8ada9598 6466
7aea43ff 6467#: builtin/index-pack.c:1703
8ada9598 6468msgid "--fix-thin cannot be used without --stdin"
649900bc 6469msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 6470
7aea43ff 6471#: builtin/index-pack.c:1707 builtin/index-pack.c:1716
8ada9598
JX
6472#, c-format
6473msgid "packfile name '%s' does not end with '.pack'"
dbd6cced 6474msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
8ada9598 6475
7aea43ff 6476#: builtin/index-pack.c:1724
8ada9598 6477msgid "--verify with no packfile name given"
dbd6cced 6478msgstr "--verify 没有提供包文件名参数"
8ada9598 6479
c04f5ac3
JX
6480#: builtin/init-db.c:35
6481#, c-format
6482msgid "Could not make %s writable by group"
6483msgstr "不能设置 %s 为组可写"
6484
6485#: builtin/init-db.c:62
6486#, c-format
6487msgid "insanely long template name %s"
6488msgstr "太长的模版名 %s"
6489
6490#: builtin/init-db.c:67
6491#, c-format
6492msgid "cannot stat '%s'"
6493msgstr "不能枚举 '%s' 状态"
6494
6495#: builtin/init-db.c:73
6496#, c-format
6497msgid "cannot stat template '%s'"
6498msgstr "不能枚举模版 '%s' 状态"
6499
6500#: builtin/init-db.c:80
6501#, c-format
6502msgid "cannot opendir '%s'"
6503msgstr "不能打开目录 '%s'"
6504
6505#: builtin/init-db.c:97
6506#, c-format
6507msgid "cannot readlink '%s'"
6508msgstr "不能读取链接 '%s'"
6509
6510#: builtin/init-db.c:99
6511#, c-format
6512msgid "insanely long symlink %s"
6513msgstr "太长的符号链接 %s"
6514
6515#: builtin/init-db.c:102
6516#, c-format
6517msgid "cannot symlink '%s' '%s'"
90e6ef53 6518msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3
JX
6519
6520#: builtin/init-db.c:106
6521#, c-format
6522msgid "cannot copy '%s' to '%s'"
6523msgstr "不能拷贝 '%s' 至 '%s'"
6524
6525#: builtin/init-db.c:110
6526#, c-format
6527msgid "ignoring template %s"
6528msgstr "忽略模版 %s"
6529
04cb2f28 6530#: builtin/init-db.c:136
c04f5ac3
JX
6531#, c-format
6532msgid "insanely long template path %s"
6533msgstr "太长的模版路径 %s"
6534
04cb2f28 6535#: builtin/init-db.c:144
c04f5ac3
JX
6536#, c-format
6537msgid "templates not found %s"
6538msgstr "模版未找到 %s"
6539
04cb2f28 6540#: builtin/init-db.c:157
c04f5ac3
JX
6541#, c-format
6542msgid "not copying templates of a wrong format version %d from '%s'"
81809b99 6543msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
c04f5ac3 6544
7aea43ff 6545#: builtin/init-db.c:211
c04f5ac3
JX
6546#, c-format
6547msgid "insane git directory %s"
6548msgstr "不正常的 git 目录 %s"
6549
7aea43ff 6550#: builtin/init-db.c:343 builtin/init-db.c:346
c04f5ac3
JX
6551#, c-format
6552msgid "%s already exists"
6553msgstr "%s 已经存在"
6554
7aea43ff 6555#: builtin/init-db.c:374
c04f5ac3
JX
6556#, c-format
6557msgid "unable to handle file type %d"
6558msgstr "不能处理 %d 类型的文件"
6559
7aea43ff 6560#: builtin/init-db.c:377
c04f5ac3
JX
6561#, c-format
6562msgid "unable to move %s to %s"
6563msgstr "不能移动 %s 至 %s"
6564
6c94aba5
JX
6565#. TRANSLATORS: The first '%s' is either "Reinitialized
6566#. existing" or "Initialized empty", the second " shared" or
6567#. "", and the last '%s%s' is the verbatim directory name.
7aea43ff 6568#: builtin/init-db.c:433
c04f5ac3
JX
6569#, c-format
6570msgid "%s%s Git repository in %s%s\n"
160fb2b2 6571msgstr "%s%s Git 仓库于 %s%s\n"
c04f5ac3 6572
7aea43ff 6573#: builtin/init-db.c:434
c04f5ac3
JX
6574msgid "Reinitialized existing"
6575msgstr "重新初始化现存的"
6576
7aea43ff 6577#: builtin/init-db.c:434
c04f5ac3
JX
6578msgid "Initialized empty"
6579msgstr "初始化空的"
6580
7e238ab7 6581# 译者:中文字符串拼接,可删除前导空格
7aea43ff 6582#: builtin/init-db.c:435
c04f5ac3 6583msgid " shared"
90e6ef53 6584msgstr "共享"
c04f5ac3 6585
7aea43ff 6586#: builtin/init-db.c:482
ef317cd5 6587msgid ""
a77c07d9 6588"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 6589"shared[=<permissions>]] [<directory>]"
ef317cd5 6590msgstr ""
07432cef 6591"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 6592"[<目录>]"
ef317cd5 6593
7aea43ff 6594#: builtin/init-db.c:505
ef317cd5 6595msgid "permissions"
07432cef 6596msgstr "权限"
ef317cd5 6597
7aea43ff 6598#: builtin/init-db.c:506
ef317cd5 6599msgid "specify that the git repository is to be shared amongst several users"
160fb2b2 6600msgstr "指定 git 仓库是多个用户之间共享的"
ef317cd5 6601
7aea43ff 6602#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171
ef317cd5 6603msgid "be quiet"
07432cef 6604msgstr "保持安静"
ef317cd5 6605
7aea43ff 6606#: builtin/init-db.c:540 builtin/init-db.c:545
c04f5ac3
JX
6607#, c-format
6608msgid "cannot mkdir %s"
6609msgstr "不能创建目录 %s"
6610
7aea43ff 6611#: builtin/init-db.c:549
c04f5ac3
JX
6612#, c-format
6613msgid "cannot chdir to %s"
6614msgstr "不能切换目录到 %s"
6615
7aea43ff 6616#: builtin/init-db.c:570
c04f5ac3
JX
6617#, c-format
6618msgid ""
6619"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6620"dir=<directory>)"
1e607449 6621msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 6622
7aea43ff 6623#: builtin/init-db.c:598
c04f5ac3
JX
6624#, c-format
6625msgid "Cannot access work tree '%s'"
6626msgstr "不能访问工作区 '%s'"
6627
220c313c
JX
6628#: builtin/interpret-trailers.c:15
6629msgid ""
6630"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6631"[<file>...]"
6632msgstr ""
6633"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
6634">...]"
6635
6636#: builtin/interpret-trailers.c:25
6637msgid "trim empty trailers"
6638msgstr "删除空签名"
6639
6640#: builtin/interpret-trailers.c:26
6641msgid "trailer"
6642msgstr "签名"
6643
6644#: builtin/interpret-trailers.c:27
6645msgid "trailer(s) to add"
6646msgstr "要添加的签名"
6647
2e8451e8 6648#: builtin/log.c:41
7aea43ff 6649msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 6650msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 6651
2e8451e8 6652#: builtin/log.c:42
814ff314
JX
6653msgid "git show [<options>] <object>..."
6654msgstr "git show [<选项>] <对象>..."
ef317cd5 6655
220c313c
JX
6656#: builtin/log.c:81
6657#, c-format
6658msgid "invalid --decorate option: %s"
6659msgstr "无效的 --decorate 选项:%s"
6660
6acbf033 6661#: builtin/log.c:127
ef317cd5 6662msgid "suppress diff output"
07432cef 6663msgstr "不显示差异输出"
ef317cd5 6664
6acbf033 6665#: builtin/log.c:128
ef317cd5 6666msgid "show source"
07432cef 6667msgstr "显示源"
ef317cd5 6668
6acbf033 6669#: builtin/log.c:129
07432cef
WS
6670msgid "Use mail map file"
6671msgstr "使用邮件映射文件"
6672
6acbf033 6673#: builtin/log.c:130
ef317cd5 6674msgid "decorate options"
07432cef 6675msgstr "修饰选项"
ef317cd5 6676
220c313c
JX
6677#: builtin/log.c:133
6678msgid "Process line range n,m in file, counting from 1"
6679msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
6680
6acbf033 6681#: builtin/log.c:229
c04f5ac3
JX
6682#, c-format
6683msgid "Final output: %d %s\n"
6684msgstr "最终输出:%d %s\n"
6685
220c313c
JX
6686#: builtin/log.c:458
6687#, c-format
6688msgid "git show %s: bad file"
6689msgstr "git show %s: 损坏的文件"
6690
6691#: builtin/log.c:472 builtin/log.c:564
c04f5ac3
JX
6692#, c-format
6693msgid "Could not read object %s"
90e6ef53 6694msgstr "不能读取对象 %s"
c04f5ac3 6695
220c313c 6696#: builtin/log.c:588
c04f5ac3
JX
6697#, c-format
6698msgid "Unknown type: %d"
6699msgstr "未知类型:%d"
6700
220c313c 6701#: builtin/log.c:689
c04f5ac3
JX
6702msgid "format.headers without value"
6703msgstr "format.headers 没有值"
6704
220c313c 6705#: builtin/log.c:773
c04f5ac3
JX
6706msgid "name of output directory is too long"
6707msgstr "输出目录名太长"
6708
220c313c 6709#: builtin/log.c:789
c04f5ac3
JX
6710#, c-format
6711msgid "Cannot open patch file %s"
6712msgstr "无法打开补丁文件 %s"
6713
220c313c 6714#: builtin/log.c:803
c04f5ac3
JX
6715msgid "Need exactly one range."
6716msgstr "只需要一个范围。"
6717
7aea43ff 6718#: builtin/log.c:813
c04f5ac3
JX
6719msgid "Not a range."
6720msgstr "不是一个范围。"
6721
220c313c 6722#: builtin/log.c:919
c04f5ac3
JX
6723msgid "Cover letter needs email format"
6724msgstr "信封需要邮件地址格式"
6725
220c313c 6726#: builtin/log.c:998
c04f5ac3
JX
6727#, c-format
6728msgid "insane in-reply-to: %s"
6729msgstr "不正常的 in-reply-to:%s"
6730
220c313c 6731#: builtin/log.c:1026
814ff314
JX
6732msgid "git format-patch [<options>] [<since> | <revision-range>]"
6733msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 6734
220c313c 6735#: builtin/log.c:1071
c04f5ac3
JX
6736msgid "Two output directories?"
6737msgstr "两个输出目录?"
6738
220c313c 6739#: builtin/log.c:1186
ef317cd5 6740msgid "use [PATCH n/m] even with a single patch"
07432cef 6741msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 6742
220c313c 6743#: builtin/log.c:1189
ef317cd5 6744msgid "use [PATCH] even with multiple patches"
07432cef 6745msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 6746
220c313c 6747#: builtin/log.c:1193
ef317cd5 6748msgid "print patches to standard out"
07432cef 6749msgstr "打印补丁到标准输出"
c04f5ac3 6750
220c313c 6751#: builtin/log.c:1195
ef317cd5 6752msgid "generate a cover letter"
07432cef 6753msgstr "生成一封附信"
c04f5ac3 6754
220c313c 6755#: builtin/log.c:1197
ef317cd5 6756msgid "use simple number sequence for output file names"
07432cef 6757msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 6758
220c313c 6759#: builtin/log.c:1198
ef317cd5 6760msgid "sfx"
07432cef 6761msgstr "后缀"
ef317cd5 6762
220c313c 6763#: builtin/log.c:1199
ef317cd5 6764msgid "use <sfx> instead of '.patch'"
07432cef 6765msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 6766
220c313c 6767#: builtin/log.c:1201
ef317cd5 6768msgid "start numbering patches at <n> instead of 1"
07432cef
WS
6769msgstr "补丁以 <n> 开始编号,而不是1"
6770
220c313c 6771#: builtin/log.c:1203
07432cef
WS
6772msgid "mark the series as Nth re-roll"
6773msgstr "标记补丁系列是第几次重制"
ef317cd5 6774
220c313c 6775#: builtin/log.c:1205
ef317cd5 6776msgid "Use [<prefix>] instead of [PATCH]"
07432cef 6777msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 6778
220c313c 6779#: builtin/log.c:1208
ef317cd5 6780msgid "store resulting files in <dir>"
d9d56b23 6781msgstr "把结果文件存储在 <目录>"
ef317cd5 6782
220c313c 6783#: builtin/log.c:1211
ef317cd5 6784msgid "don't strip/add [PATCH]"
07432cef 6785msgstr "不删除/添加 [PATCH]"
ef317cd5 6786
220c313c 6787#: builtin/log.c:1214
ef317cd5 6788msgid "don't output binary diffs"
07432cef 6789msgstr "不输出二进制差异"
ef317cd5 6790
220c313c 6791#: builtin/log.c:1216
ef317cd5 6792msgid "don't include a patch matching a commit upstream"
07432cef 6793msgstr "不包含已在上游提交中的补丁"
ef317cd5 6794
220c313c 6795#: builtin/log.c:1218
ef317cd5 6796msgid "show patch format instead of default (patch + stat)"
07432cef 6797msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 6798
220c313c 6799#: builtin/log.c:1220
ef317cd5 6800msgid "Messaging"
07432cef 6801msgstr "邮件发送"
ef317cd5 6802
220c313c 6803#: builtin/log.c:1221
ef317cd5 6804msgid "header"
07432cef 6805msgstr "header"
ef317cd5 6806
220c313c 6807#: builtin/log.c:1222
ef317cd5 6808msgid "add email header"
07432cef 6809msgstr "添加邮件头"
ef317cd5 6810
220c313c 6811#: builtin/log.c:1223 builtin/log.c:1225
ef317cd5 6812msgid "email"
07432cef 6813msgstr "邮件地址"
ef317cd5 6814
220c313c 6815#: builtin/log.c:1223
ef317cd5 6816msgid "add To: header"
07432cef 6817msgstr "添加收件人"
ef317cd5 6818
220c313c 6819#: builtin/log.c:1225
ef317cd5 6820msgid "add Cc: header"
07432cef 6821msgstr "添加抄送"
ef317cd5 6822
220c313c 6823#: builtin/log.c:1227
2e8451e8 6824msgid "ident"
d9d56b23 6825msgstr "标识"
2e8451e8 6826
220c313c 6827#: builtin/log.c:1228
2e8451e8 6828msgid "set From address to <ident> (or committer ident if absent)"
4375c10e 6829msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
2e8451e8 6830
220c313c 6831#: builtin/log.c:1230
ef317cd5 6832msgid "message-id"
d9d56b23 6833msgstr "邮件标识"
ef317cd5 6834
220c313c 6835#: builtin/log.c:1231
ef317cd5 6836msgid "make first mail a reply to <message-id>"
d9d56b23 6837msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 6838
220c313c 6839#: builtin/log.c:1232 builtin/log.c:1235
ef317cd5 6840msgid "boundary"
07432cef 6841msgstr "边界"
ef317cd5 6842
220c313c 6843#: builtin/log.c:1233
ef317cd5 6844msgid "attach the patch"
07432cef 6845msgstr "附件方式添加补丁"
ef317cd5 6846
220c313c 6847#: builtin/log.c:1236
ef317cd5 6848msgid "inline the patch"
07432cef 6849msgstr "内联显示补丁"
ef317cd5 6850
220c313c 6851#: builtin/log.c:1240
ef317cd5 6852msgid "enable message threading, styles: shallow, deep"
07432cef 6853msgstr "启用邮件线索,风格:浅,深"
ef317cd5 6854
220c313c 6855#: builtin/log.c:1242
ef317cd5 6856msgid "signature"
07432cef 6857msgstr "签名"
ef317cd5 6858
220c313c 6859#: builtin/log.c:1243
ef317cd5 6860msgid "add a signature"
07432cef 6861msgstr "添加一个签名"
ef317cd5 6862
220c313c 6863#: builtin/log.c:1245
6acbf033
JX
6864msgid "add a signature from a file"
6865msgstr "从文件添加一个签名"
6866
220c313c 6867#: builtin/log.c:1246
ef317cd5 6868msgid "don't print the patch filenames"
07432cef 6869msgstr "不要打印补丁文件名"
ef317cd5 6870
220c313c 6871#: builtin/log.c:1320
2e8451e8
JX
6872#, c-format
6873msgid "invalid ident line: %s"
6874msgstr "包含无效的身份标识:%s"
6875
220c313c 6876#: builtin/log.c:1335
c04f5ac3
JX
6877msgid "-n and -k are mutually exclusive."
6878msgstr "-n 和 -k 互斥。"
6879
220c313c 6880#: builtin/log.c:1337
c04f5ac3
JX
6881msgid "--subject-prefix and -k are mutually exclusive."
6882msgstr "--subject-prefix 和 -k 互斥。"
6883
220c313c 6884#: builtin/log.c:1345
c04f5ac3
JX
6885msgid "--name-only does not make sense"
6886msgstr "--name-only 无意义"
6887
220c313c 6888#: builtin/log.c:1347
c04f5ac3
JX
6889msgid "--name-status does not make sense"
6890msgstr "--name-status 无意义"
6891
220c313c 6892#: builtin/log.c:1349
c04f5ac3
JX
6893msgid "--check does not make sense"
6894msgstr "--check 无意义"
6895
220c313c 6896#: builtin/log.c:1372
c04f5ac3
JX
6897msgid "standard output, or directory, which one?"
6898msgstr "标准输出或目录,哪一个?"
6899
220c313c 6900#: builtin/log.c:1374
c04f5ac3
JX
6901#, c-format
6902msgid "Could not create directory '%s'"
90e6ef53 6903msgstr "不能创建目录 '%s'"
c04f5ac3 6904
220c313c 6905#: builtin/log.c:1472
6acbf033
JX
6906#, c-format
6907msgid "unable to read signature file '%s'"
6908msgstr "无法读取签名文件 '%s'"
6909
220c313c 6910#: builtin/log.c:1535
c04f5ac3
JX
6911msgid "Failed to create output files"
6912msgstr "无法创建输出文件"
6913
220c313c 6914#: builtin/log.c:1583
ef317cd5 6915msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 6916msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 6917
7aea43ff 6918#: builtin/log.c:1637
c04f5ac3
JX
6919#, c-format
6920msgid ""
6921"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 6922msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 6923
7aea43ff 6924#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662
c04f5ac3
JX
6925#, c-format
6926msgid "Unknown commit %s"
6927msgstr "未知提交 %s"
6928
814ff314
JX
6929#: builtin/ls-files.c:358
6930msgid "git ls-files [<options>] [<file>...]"
6931msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 6932
814ff314 6933#: builtin/ls-files.c:415
ef317cd5 6934msgid "identify the file status with tags"
07432cef 6935msgstr "用标签标识文件的状态"
ef317cd5 6936
814ff314 6937#: builtin/ls-files.c:417
ef317cd5 6938msgid "use lowercase letters for 'assume unchanged' files"
07432cef 6939msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 6940
814ff314 6941#: builtin/ls-files.c:419
ef317cd5 6942msgid "show cached files in the output (default)"
07432cef 6943msgstr "显示缓存的文件(默认)"
ef317cd5 6944
814ff314 6945#: builtin/ls-files.c:421
ef317cd5 6946msgid "show deleted files in the output"
07432cef 6947msgstr "显示已删除的文件"
ef317cd5 6948
814ff314 6949#: builtin/ls-files.c:423
ef317cd5 6950msgid "show modified files in the output"
07432cef 6951msgstr "显示已修改的文件"
ef317cd5 6952
814ff314 6953#: builtin/ls-files.c:425
ef317cd5 6954msgid "show other files in the output"
07432cef 6955msgstr "显示其它文件"
ef317cd5 6956
814ff314 6957#: builtin/ls-files.c:427
ef317cd5 6958msgid "show ignored files in the output"
07432cef 6959msgstr "显示忽略的文件"
ef317cd5 6960
814ff314 6961#: builtin/ls-files.c:430
ef317cd5 6962msgid "show staged contents' object name in the output"
07432cef 6963msgstr "显示暂存区内容的对象名称"
ef317cd5 6964
814ff314 6965#: builtin/ls-files.c:432
ef317cd5 6966msgid "show files on the filesystem that need to be removed"
07432cef 6967msgstr "显示文件系统需要删除的文件"
ef317cd5 6968
814ff314 6969#: builtin/ls-files.c:434
220c313c 6970msgid "show 'other' directories' names only"
07432cef 6971msgstr "只显示“其他”目录的名称"
ef317cd5 6972
814ff314 6973#: builtin/ls-files.c:437
ef317cd5 6974msgid "don't show empty directories"
07432cef 6975msgstr "不显示空目录"
ef317cd5 6976
814ff314 6977#: builtin/ls-files.c:440
ef317cd5 6978msgid "show unmerged files in the output"
07432cef 6979msgstr "显示未合并的文件"
ef317cd5 6980
814ff314 6981#: builtin/ls-files.c:442
ef317cd5 6982msgid "show resolve-undo information"
07432cef 6983msgstr "显示 resolve-undo 信息"
ef317cd5 6984
814ff314 6985#: builtin/ls-files.c:444
ef317cd5 6986msgid "skip files matching pattern"
07432cef 6987msgstr "匹配排除文件的模式"
ef317cd5 6988
814ff314 6989#: builtin/ls-files.c:447
ef317cd5 6990msgid "exclude patterns are read from <file>"
07432cef 6991msgstr "从 <文件> 中读取排除模式"
ef317cd5 6992
814ff314 6993#: builtin/ls-files.c:450
ef317cd5 6994msgid "read additional per-directory exclude patterns in <file>"
07432cef 6995msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 6996
814ff314 6997#: builtin/ls-files.c:452
ef317cd5 6998msgid "add the standard git exclusions"
07432cef 6999msgstr "添加标准的 git 排除"
ef317cd5 7000
814ff314 7001#: builtin/ls-files.c:455
ef317cd5 7002msgid "make the output relative to the project top directory"
07432cef 7003msgstr "显示相对于顶级目录的文件名"
ef317cd5 7004
814ff314 7005#: builtin/ls-files.c:458
ef317cd5 7006msgid "if any <file> is not in the index, treat this as an error"
07432cef 7007msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 7008
814ff314 7009#: builtin/ls-files.c:459
ef317cd5 7010msgid "tree-ish"
07432cef 7011msgstr "树或提交"
ef317cd5 7012
814ff314 7013#: builtin/ls-files.c:460
ef317cd5 7014msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 7015msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 7016
814ff314 7017#: builtin/ls-files.c:462
ef317cd5 7018msgid "show debugging data"
07432cef 7019msgstr "显示调试数据"
ef317cd5 7020
90314792 7021#: builtin/ls-tree.c:28
ef317cd5 7022msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 7023msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5 7024
04cb2f28 7025#: builtin/ls-tree.c:127
ef317cd5 7026msgid "only show trees"
07432cef 7027msgstr "只显示树"
ef317cd5 7028
04cb2f28 7029#: builtin/ls-tree.c:129
ef317cd5 7030msgid "recurse into subtrees"
07432cef 7031msgstr "递归到子树"
ef317cd5 7032
04cb2f28 7033#: builtin/ls-tree.c:131
ef317cd5 7034msgid "show trees when recursing"
07432cef 7035msgstr "当递归时显示树"
ef317cd5 7036
04cb2f28 7037#: builtin/ls-tree.c:134
ef317cd5 7038msgid "terminate entries with NUL byte"
4375c10e 7039msgstr "条目以 NUL 字符终止"
ef317cd5 7040
04cb2f28 7041#: builtin/ls-tree.c:135
ef317cd5 7042msgid "include object size"
07432cef 7043msgstr "包括对象大小"
ef317cd5 7044
04cb2f28 7045#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
ef317cd5 7046msgid "list only filenames"
07432cef 7047msgstr "只列出文件名"
ef317cd5 7048
04cb2f28 7049#: builtin/ls-tree.c:142
ef317cd5 7050msgid "use full path names"
07432cef 7051msgstr "使用文件的全路径"
ef317cd5 7052
04cb2f28 7053#: builtin/ls-tree.c:144
ef317cd5 7054msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 7055msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 7056
04cb2f28 7057#: builtin/merge.c:45
814ff314
JX
7058msgid "git merge [<options>] [<commit>...]"
7059msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 7060
04cb2f28 7061#: builtin/merge.c:46
814ff314
JX
7062msgid "git merge [<options>] <msg> HEAD <commit>"
7063msgstr "git merge [<选项>] <说明> HEAD <提交>"
ef317cd5 7064
04cb2f28 7065#: builtin/merge.c:47
ef317cd5 7066msgid "git merge --abort"
07432cef 7067msgstr "git merge --abort"
ef317cd5 7068
04cb2f28 7069#: builtin/merge.c:100
c04f5ac3
JX
7070msgid "switch `m' requires a value"
7071msgstr "开关 `m' 需要一个值"
7072
04cb2f28 7073#: builtin/merge.c:137
c04f5ac3
JX
7074#, c-format
7075msgid "Could not find merge strategy '%s'.\n"
90e6ef53 7076msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 7077
04cb2f28 7078#: builtin/merge.c:138
c04f5ac3
JX
7079#, c-format
7080msgid "Available strategies are:"
7081msgstr "可用的策略有:"
7082
04cb2f28 7083#: builtin/merge.c:143
c04f5ac3
JX
7084#, c-format
7085msgid "Available custom strategies are:"
7086msgstr "可用的自定义策略有:"
7087
04cb2f28 7088#: builtin/merge.c:193
ef317cd5 7089msgid "do not show a diffstat at the end of the merge"
07432cef 7090msgstr "在合并的最后不显示差异统计"
ef317cd5 7091
04cb2f28 7092#: builtin/merge.c:196
ef317cd5 7093msgid "show a diffstat at the end of the merge"
07432cef 7094msgstr "在合并的最后显示差异统计"
ef317cd5 7095
04cb2f28 7096#: builtin/merge.c:197
ef317cd5 7097msgid "(synonym to --stat)"
07432cef 7098msgstr "(和 --stat 同义)"
ef317cd5 7099
04cb2f28 7100#: builtin/merge.c:199
ef317cd5 7101msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 7102msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 7103
04cb2f28 7104#: builtin/merge.c:202
ef317cd5 7105msgid "create a single commit instead of doing a merge"
07432cef 7106msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 7107
04cb2f28 7108#: builtin/merge.c:204
ef317cd5 7109msgid "perform a commit if the merge succeeds (default)"
07432cef 7110msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 7111
04cb2f28 7112#: builtin/merge.c:206
ef317cd5 7113msgid "edit message before committing"
07432cef 7114msgstr "在提交前编辑提交说明"
ef317cd5 7115
04cb2f28 7116#: builtin/merge.c:207
ef317cd5 7117msgid "allow fast-forward (default)"
07432cef 7118msgstr "允许快进(默认)"
ef317cd5 7119
04cb2f28 7120#: builtin/merge.c:209
ef317cd5 7121msgid "abort if fast-forward is not possible"
07432cef 7122msgstr "如果不能快进就放弃合并"
ef317cd5 7123
04cb2f28 7124#: builtin/merge.c:213
1003b3a5
JX
7125msgid "Verify that the named commit has a valid GPG signature"
7126msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7127
04cb2f28 7128#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
ef317cd5 7129msgid "strategy"
07432cef 7130msgstr "策略"
ef317cd5 7131
04cb2f28 7132#: builtin/merge.c:215
ef317cd5 7133msgid "merge strategy to use"
07432cef 7134msgstr "要使用的合并策略"
ef317cd5 7135
04cb2f28 7136#: builtin/merge.c:216
ef317cd5 7137msgid "option=value"
07432cef 7138msgstr "option=value"
ef317cd5 7139
04cb2f28 7140#: builtin/merge.c:217
ef317cd5 7141msgid "option for selected merge strategy"
07432cef 7142msgstr "所选的合并策略的选项"
ef317cd5 7143
04cb2f28 7144#: builtin/merge.c:219
ef317cd5 7145msgid "merge commit message (for a non-fast-forward merge)"
07432cef 7146msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 7147
04cb2f28 7148#: builtin/merge.c:223
ef317cd5 7149msgid "abort the current in-progress merge"
07432cef 7150msgstr "放弃当前正在进行的合并"
ef317cd5 7151
04cb2f28 7152#: builtin/merge.c:251
c04f5ac3
JX
7153msgid "could not run stash."
7154msgstr "不能进行进度保存。"
7155
04cb2f28 7156#: builtin/merge.c:256
c04f5ac3
JX
7157msgid "stash failed"
7158msgstr "进度保存失败"
7159
04cb2f28 7160#: builtin/merge.c:261
c04f5ac3
JX
7161#, c-format
7162msgid "not a valid object: %s"
7163msgstr "不是一个有效对象:%s"
7164
04cb2f28 7165#: builtin/merge.c:280 builtin/merge.c:297
c04f5ac3
JX
7166msgid "read-tree failed"
7167msgstr "读取树失败"
7168
90e6ef53 7169# 译者:注意保持前导空格
04cb2f28 7170#: builtin/merge.c:327
c04f5ac3
JX
7171msgid " (nothing to squash)"
7172msgstr " (无可压缩)"
7173
04cb2f28 7174#: builtin/merge.c:340
c04f5ac3
JX
7175#, c-format
7176msgid "Squash commit -- not updating HEAD\n"
7177msgstr "压缩提交 -- 未更新 HEAD\n"
7178
04cb2f28 7179#: builtin/merge.c:372
c04f5ac3
JX
7180msgid "Writing SQUASH_MSG"
7181msgstr "写入 SQUASH_MSG"
7182
04cb2f28 7183#: builtin/merge.c:374
c04f5ac3
JX
7184msgid "Finishing SQUASH_MSG"
7185msgstr "完成 SQUASH_MSG"
7186
04cb2f28 7187#: builtin/merge.c:397
c04f5ac3
JX
7188#, c-format
7189msgid "No merge message -- not updating HEAD\n"
7190msgstr "无合并信息 -- 未更新 HEAD\n"
7191
04cb2f28 7192#: builtin/merge.c:447
c04f5ac3
JX
7193#, c-format
7194msgid "'%s' does not point to a commit"
7195msgstr "'%s' 没有指向一个提交"
7196
7aea43ff 7197#: builtin/merge.c:537
c04f5ac3
JX
7198#, c-format
7199msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 7200msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 7201
7aea43ff 7202#: builtin/merge.c:632
c04f5ac3
JX
7203msgid "git write-tree failed to write a tree"
7204msgstr "git write-tree 无法写入一树对象"
7205
7aea43ff 7206#: builtin/merge.c:656
c04f5ac3
JX
7207msgid "Not handling anything other than two heads merge."
7208msgstr "不能处理两个头合并之外的任何操作。"
7209
7aea43ff 7210#: builtin/merge.c:670
c04f5ac3
JX
7211#, c-format
7212msgid "Unknown option for merge-recursive: -X%s"
7213msgstr "merge-recursive 的未知选项:-X%s"
7214
7aea43ff 7215#: builtin/merge.c:683
c04f5ac3
JX
7216#, c-format
7217msgid "unable to write %s"
7218msgstr "不能写 %s"
7219
7aea43ff 7220#: builtin/merge.c:772
c04f5ac3
JX
7221#, c-format
7222msgid "Could not read from '%s'"
7223msgstr "不能从 '%s' 读取"
7224
7aea43ff 7225#: builtin/merge.c:781
c04f5ac3
JX
7226#, c-format
7227msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7228msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7229
7aea43ff 7230#: builtin/merge.c:787
a77c07d9 7231#, c-format
c04f5ac3
JX
7232msgid ""
7233"Please enter a commit message to explain why this merge is necessary,\n"
7234"especially if it merges an updated upstream into a topic branch.\n"
7235"\n"
a77c07d9 7236"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
7237"the commit.\n"
7238msgstr ""
7239"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
7240"合并到主题分支。\n"
7241"\n"
a77c07d9 7242"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 7243
7aea43ff 7244#: builtin/merge.c:811
c04f5ac3
JX
7245msgid "Empty commit message."
7246msgstr "空提交信息。"
7247
7aea43ff 7248#: builtin/merge.c:823
c04f5ac3
JX
7249#, c-format
7250msgid "Wonderful.\n"
7251msgstr "太棒了。\n"
7252
7aea43ff 7253#: builtin/merge.c:878
c04f5ac3
JX
7254#, c-format
7255msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7256msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7257
7aea43ff 7258#: builtin/merge.c:894
c04f5ac3
JX
7259#, c-format
7260msgid "'%s' is not a commit"
7261msgstr "'%s' 不是一个提交"
7262
7aea43ff 7263#: builtin/merge.c:935
c04f5ac3 7264msgid "No current branch."
90e6ef53 7265msgstr "没有当前分支。"
c04f5ac3 7266
7aea43ff 7267#: builtin/merge.c:937
c04f5ac3 7268msgid "No remote for the current branch."
160fb2b2 7269msgstr "当前分支没有对应的远程仓库。"
c04f5ac3 7270
7aea43ff 7271#: builtin/merge.c:939
c04f5ac3 7272msgid "No default upstream defined for the current branch."
90e6ef53 7273msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 7274
7aea43ff 7275#: builtin/merge.c:944
170e9899 7276#, c-format
2e8451e8
JX
7277msgid "No remote-tracking branch for %s from %s"
7278msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 7279
7aea43ff
JX
7280#: builtin/merge.c:1081
7281#, c-format
7282msgid "could not close '%s'"
7283msgstr "不能关闭 '%s'"
7284
7285#: builtin/merge.c:1208
c04f5ac3 7286msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 7287msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 7288
7aea43ff 7289#: builtin/merge.c:1224
c04f5ac3
JX
7290msgid ""
7291"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 7292"Please, commit your changes before you merge."
c04f5ac3
JX
7293msgstr ""
7294"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 7295"请在合并前先提交您的修改。"
c04f5ac3 7296
7aea43ff 7297#: builtin/merge.c:1227 git-pull.sh:74
c04f5ac3
JX
7298msgid "You have not concluded your merge (MERGE_HEAD exists)."
7299msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
7300
7aea43ff 7301#: builtin/merge.c:1231
c04f5ac3
JX
7302msgid ""
7303"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 7304"Please, commit your changes before you merge."
c04f5ac3
JX
7305msgstr ""
7306"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 7307"请在合并前先提交您的修改。"
c04f5ac3 7308
7aea43ff 7309#: builtin/merge.c:1234
c04f5ac3
JX
7310msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7311msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7312
7aea43ff 7313#: builtin/merge.c:1243
c04f5ac3 7314msgid "You cannot combine --squash with --no-ff."
649900bc 7315msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 7316
7aea43ff 7317#: builtin/merge.c:1251
c04f5ac3 7318msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 7319msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 7320
7aea43ff 7321#: builtin/merge.c:1268
c04f5ac3
JX
7322msgid "Squash commit into empty head not supported yet"
7323msgstr "尚不支持到空分支的压缩提交"
7324
7aea43ff 7325#: builtin/merge.c:1270
c04f5ac3
JX
7326msgid "Non-fast-forward commit does not make sense into an empty head"
7327msgstr "到空分支的非快进式提交没有意义"
7328
7aea43ff 7329#: builtin/merge.c:1276
2e8451e8
JX
7330#, c-format
7331msgid "%s - not something we can merge"
7332msgstr "%s - 不能被合并"
7333
7aea43ff
JX
7334#: builtin/merge.c:1278
7335msgid "Can merge only exactly one commit into empty head"
7336msgstr "只能将一个提交合并到空分支上"
7337
7338#: builtin/merge.c:1333
1003b3a5
JX
7339#, c-format
7340msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7341msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7342
7aea43ff 7343#: builtin/merge.c:1336
1003b3a5
JX
7344#, c-format
7345msgid "Commit %s has a bad GPG signature allegedly by %s."
7346msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7347
7aea43ff 7348#: builtin/merge.c:1339
1003b3a5
JX
7349#, c-format
7350msgid "Commit %s does not have a GPG signature."
7351msgstr "提交 %s 没有一个 GPG 签名。"
7352
7aea43ff 7353#: builtin/merge.c:1342
1003b3a5
JX
7354#, c-format
7355msgid "Commit %s has a good GPG signature by %s\n"
7356msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7357
7aea43ff 7358#: builtin/merge.c:1423
c04f5ac3
JX
7359#, c-format
7360msgid "Updating %s..%s\n"
7361msgstr "更新 %s..%s\n"
7362
7aea43ff 7363#: builtin/merge.c:1462
c04f5ac3
JX
7364#, c-format
7365msgid "Trying really trivial in-index merge...\n"
90e6ef53 7366msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 7367
7aea43ff 7368#: builtin/merge.c:1469
c04f5ac3
JX
7369#, c-format
7370msgid "Nope.\n"
7371msgstr "无。\n"
7372
7aea43ff 7373#: builtin/merge.c:1501
c04f5ac3 7374msgid "Not possible to fast-forward, aborting."
1aabac65 7375msgstr "无法快进,终止。"
c04f5ac3 7376
7aea43ff 7377#: builtin/merge.c:1524 builtin/merge.c:1603
c04f5ac3
JX
7378#, c-format
7379msgid "Rewinding the tree to pristine...\n"
7380msgstr "将树回滚至原始状态...\n"
7381
7aea43ff 7382#: builtin/merge.c:1528
c04f5ac3
JX
7383#, c-format
7384msgid "Trying merge strategy %s...\n"
7385msgstr "尝试合并策略 %s...\n"
7386
7aea43ff 7387#: builtin/merge.c:1594
c04f5ac3
JX
7388#, c-format
7389msgid "No merge strategy handled the merge.\n"
7390msgstr "没有合并策略处理此合并。\n"
7391
7aea43ff 7392#: builtin/merge.c:1596
c04f5ac3
JX
7393#, c-format
7394msgid "Merge with strategy %s failed.\n"
7395msgstr "使用策略 %s 合并失败。\n"
7396
7aea43ff 7397#: builtin/merge.c:1605
c04f5ac3
JX
7398#, c-format
7399msgid "Using the %s to prepare resolving by hand.\n"
7400msgstr "使用 %s 以准备手工解决。\n"
7401
7aea43ff 7402#: builtin/merge.c:1617
c04f5ac3
JX
7403#, c-format
7404msgid "Automatic merge went well; stopped before committing as requested\n"
7405msgstr "自动合并进展顺利,按要求在提交前停止\n"
7406
cfff71a9 7407#: builtin/merge-base.c:29
814ff314
JX
7408msgid "git merge-base [-a | --all] <commit> <commit>..."
7409msgstr "git merge-base [-a | --all] <提交> <提交>..."
ef317cd5 7410
cfff71a9 7411#: builtin/merge-base.c:30
814ff314
JX
7412msgid "git merge-base [-a | --all] --octopus <commit>..."
7413msgstr "git merge-base [-a | --all] --octopus <提交>..."
ef317cd5 7414
cfff71a9 7415#: builtin/merge-base.c:31
ef317cd5 7416msgid "git merge-base --independent <commit>..."
07432cef 7417msgstr "git merge-base --independent <提交>..."
ef317cd5 7418
cfff71a9 7419#: builtin/merge-base.c:32
ef317cd5 7420msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 7421msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5 7422
cfff71a9
JX
7423#: builtin/merge-base.c:33
7424msgid "git merge-base --fork-point <ref> [<commit>]"
d9d56b23 7425msgstr "git merge-base --fork-point <引用> [<提交>]"
cfff71a9
JX
7426
7427#: builtin/merge-base.c:214
ef317cd5 7428msgid "output all common ancestors"
07432cef 7429msgstr "输出所有共同的祖先"
ef317cd5 7430
cfff71a9 7431#: builtin/merge-base.c:216
ef317cd5 7432msgid "find ancestors for a single n-way merge"
07432cef 7433msgstr "查找一个多路合并的祖先提交"
ef317cd5 7434
cfff71a9 7435#: builtin/merge-base.c:218
ef317cd5 7436msgid "list revs not reachable from others"
07432cef 7437msgstr "显示不能被其他访问到的版本"
ef317cd5 7438
cfff71a9 7439#: builtin/merge-base.c:220
ef317cd5 7440msgid "is the first one ancestor of the other?"
07432cef 7441msgstr "第一个是其他的祖先提交么?"
ef317cd5 7442
cfff71a9
JX
7443#: builtin/merge-base.c:222
7444msgid "find where <commit> forked from reflog of <ref>"
e397e7e3 7445msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
cfff71a9 7446
ef317cd5
JX
7447#: builtin/merge-file.c:8
7448msgid ""
814ff314
JX
7449"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7450"<orig-file> <file2>"
ef317cd5 7451msgstr ""
814ff314
JX
7452"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7453"件> <文件2>"
ef317cd5
JX
7454
7455#: builtin/merge-file.c:33
7456msgid "send results to standard output"
07432cef 7457msgstr "将结果发送到标准输出"
ef317cd5
JX
7458
7459#: builtin/merge-file.c:34
7460msgid "use a diff3 based merge"
07432cef 7461msgstr "使用基于 diff3 的合并"
ef317cd5
JX
7462
7463#: builtin/merge-file.c:35
7464msgid "for conflicts, use our version"
07432cef 7465msgstr "如果冲突,使用我们的版本"
ef317cd5
JX
7466
7467#: builtin/merge-file.c:37
7468msgid "for conflicts, use their version"
07432cef 7469msgstr "如果冲突,使用他们的版本"
ef317cd5
JX
7470
7471#: builtin/merge-file.c:39
7472msgid "for conflicts, use a union version"
07432cef 7473msgstr "如果冲突,使用联合版本"
ef317cd5
JX
7474
7475#: builtin/merge-file.c:42
7476msgid "for conflicts, use this marker size"
07432cef 7477msgstr "如果冲突,使用指定长度的标记"
ef317cd5
JX
7478
7479#: builtin/merge-file.c:43
7480msgid "do not warn about conflicts"
07432cef 7481msgstr "不要警告冲突"
ef317cd5
JX
7482
7483#: builtin/merge-file.c:45
814ff314
JX
7484msgid "set labels for file1/orig-file/file2"
7485msgstr "为 文件1/初始文件/文件2 设置标签"
c04f5ac3 7486
6c94aba5 7487#: builtin/mktree.c:64
ef317cd5 7488msgid "git mktree [-z] [--missing] [--batch]"
07432cef 7489msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 7490
6c94aba5 7491#: builtin/mktree.c:150
ef317cd5 7492msgid "input is NUL terminated"
07432cef 7493msgstr "输入以 NUL 字符终止"
c04f5ac3 7494
6c94aba5 7495#: builtin/mktree.c:151 builtin/write-tree.c:24
ef317cd5 7496msgid "allow missing objects"
07432cef 7497msgstr "允许丢失的对象"
c04f5ac3 7498
6c94aba5 7499#: builtin/mktree.c:152
ef317cd5 7500msgid "allow creation of more than one tree"
07432cef 7501msgstr "允许创建一个以上的树"
c04f5ac3 7502
90314792 7503#: builtin/mv.c:15
814ff314
JX
7504msgid "git mv [<options>] <source>... <destination>"
7505msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 7506
220c313c
JX
7507#: builtin/mv.c:69
7508#, c-format
7509msgid "Directory %s is in index and no submodule?"
7510msgstr "目录 %s 在索引中并且不是子模组?"
7511
cfff71a9 7512#: builtin/mv.c:71
220c313c 7513msgid "Please stage your changes to .gitmodules or stash them to proceed"
160fb2b2 7514msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
220c313c
JX
7515
7516#: builtin/mv.c:89
7517#, c-format
7518msgid "%.*s is in index"
7519msgstr "%.*s 在索引中"
7520
7521#: builtin/mv.c:111
ef317cd5 7522msgid "force move/rename even if target exists"
07432cef 7523msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 7524
220c313c 7525#: builtin/mv.c:112
ef317cd5 7526msgid "skip move/rename errors"
07432cef 7527msgstr "跳过移动/重命名错误"
c04f5ac3 7528
220c313c
JX
7529#: builtin/mv.c:151
7530#, c-format
7531msgid "destination '%s' is not a directory"
7532msgstr "目标 '%s' 不是一个目录"
7533
7534#: builtin/mv.c:162
c04f5ac3
JX
7535#, c-format
7536msgid "Checking rename of '%s' to '%s'\n"
7537msgstr "检查 '%s' 到 '%s' 的重命名\n"
7538
220c313c 7539#: builtin/mv.c:166
c04f5ac3
JX
7540msgid "bad source"
7541msgstr "坏的源"
7542
220c313c 7543#: builtin/mv.c:169
c04f5ac3
JX
7544msgid "can not move directory into itself"
7545msgstr "不能将目录移动到自身"
7546
220c313c 7547#: builtin/mv.c:172
c04f5ac3
JX
7548msgid "cannot move directory over file"
7549msgstr "不能将目录移动到文件"
7550
220c313c 7551#: builtin/mv.c:181
c04f5ac3
JX
7552msgid "source directory is empty"
7553msgstr "源目录为空"
7554
220c313c 7555#: builtin/mv.c:206
c04f5ac3
JX
7556msgid "not under version control"
7557msgstr "不在版本控制之下"
7558
220c313c 7559#: builtin/mv.c:209
c04f5ac3
JX
7560msgid "destination exists"
7561msgstr "目标已存在"
7562
220c313c 7563#: builtin/mv.c:217
c04f5ac3
JX
7564#, c-format
7565msgid "overwriting '%s'"
7566msgstr "覆盖 '%s'"
7567
220c313c 7568#: builtin/mv.c:220
c04f5ac3
JX
7569msgid "Cannot overwrite"
7570msgstr "不能覆盖"
7571
220c313c 7572#: builtin/mv.c:223
c04f5ac3
JX
7573msgid "multiple sources for the same target"
7574msgstr "同一目标具有多个源"
7575
220c313c 7576#: builtin/mv.c:225
cfff71a9
JX
7577msgid "destination directory does not exist"
7578msgstr "目标目录不存在"
7579
220c313c 7580#: builtin/mv.c:232
c04f5ac3
JX
7581#, c-format
7582msgid "%s, source=%s, destination=%s"
7583msgstr "%s,源=%s,目标=%s"
7584
220c313c 7585#: builtin/mv.c:253
c04f5ac3
JX
7586#, c-format
7587msgid "Renaming %s to %s\n"
7588msgstr "重命名 %s 至 %s\n"
7589
7aea43ff 7590#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361
c04f5ac3
JX
7591#, c-format
7592msgid "renaming '%s' failed"
7593msgstr "重命名 '%s' 失败"
7594
6acbf033 7595#: builtin/name-rev.c:255
814ff314
JX
7596msgid "git name-rev [<options>] <commit>..."
7597msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 7598
6acbf033 7599#: builtin/name-rev.c:256
814ff314
JX
7600msgid "git name-rev [<options>] --all"
7601msgstr "git name-rev [<选项>] --all"
ef317cd5 7602
6acbf033 7603#: builtin/name-rev.c:257
814ff314
JX
7604msgid "git name-rev [<options>] --stdin"
7605msgstr "git name-rev [<选项>] --stdin"
ef317cd5 7606
6acbf033 7607#: builtin/name-rev.c:309
ef317cd5 7608msgid "print only names (no SHA-1)"
07432cef 7609msgstr "只打印名称(无 SHA-1)"
ef317cd5 7610
6acbf033 7611#: builtin/name-rev.c:310
ef317cd5 7612msgid "only use tags to name the commits"
55a16ee4 7613msgstr "只使用标签来命名提交"
ef317cd5 7614
6acbf033 7615#: builtin/name-rev.c:312
ef317cd5 7616msgid "only use refs matching <pattern>"
07432cef 7617msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 7618
6acbf033 7619#: builtin/name-rev.c:314
ef317cd5 7620msgid "list all commits reachable from all refs"
07432cef 7621msgstr "列出可以从所有引用访问的提交"
ef317cd5 7622
6acbf033 7623#: builtin/name-rev.c:315
ef317cd5 7624msgid "read from stdin"
07432cef 7625msgstr "从标准输入读取"
ef317cd5 7626
6acbf033 7627#: builtin/name-rev.c:316
90314792
JX
7628msgid "allow to print `undefined` names (default)"
7629msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 7630
6acbf033 7631#: builtin/name-rev.c:322
2e8451e8 7632msgid "dereference tags in the input (internal use)"
55a16ee4 7633msgstr "反向解析输入中的标签(内部使用)"
2e8451e8
JX
7634
7635#: builtin/notes.c:24
814ff314 7636msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 7637msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 7638
2e8451e8 7639#: builtin/notes.c:25
ef317cd5 7640msgid ""
814ff314 7641"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 7642"| (-c | -C) <object>] [<object>]"
ef317cd5 7643msgstr ""
04cb2f28
JX
7644"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
7645"| (-c | -C) <对象>] [<对象>]"
ef317cd5 7646
2e8451e8 7647#: builtin/notes.c:26
814ff314 7648msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 7649msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 7650
2e8451e8 7651#: builtin/notes.c:27
ef317cd5 7652msgid ""
814ff314 7653"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 7654"(-c | -C) <object>] [<object>]"
ef317cd5 7655msgstr ""
04cb2f28
JX
7656"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
7657"(-c | -C) <对象>] [<对象>]"
ef317cd5 7658
2e8451e8 7659#: builtin/notes.c:28
814ff314 7660msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 7661msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 7662
2e8451e8 7663#: builtin/notes.c:29
814ff314 7664msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 7665msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 7666
2e8451e8 7667#: builtin/notes.c:30
ef317cd5 7668msgid ""
814ff314 7669"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 7670msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 7671
2e8451e8 7672#: builtin/notes.c:31
ef317cd5 7673msgid "git notes merge --commit [-v | -q]"
07432cef 7674msgstr "git notes merge --commit [-v | -q]"
ef317cd5 7675
2e8451e8 7676#: builtin/notes.c:32
ef317cd5 7677msgid "git notes merge --abort [-v | -q]"
07432cef 7678msgstr "git notes merge --abort [-v | -q]"
ef317cd5 7679
2e8451e8 7680#: builtin/notes.c:33
814ff314 7681msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 7682msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 7683
2e8451e8 7684#: builtin/notes.c:34
814ff314 7685msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
07432cef 7686msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
ef317cd5 7687
2e8451e8 7688#: builtin/notes.c:35
814ff314 7689msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 7690msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 7691
2e8451e8 7692#: builtin/notes.c:40
ef317cd5 7693msgid "git notes [list [<object>]]"
07432cef 7694msgstr "git notes [list [<对象>]]"
ef317cd5 7695
2e8451e8 7696#: builtin/notes.c:45
ef317cd5 7697msgid "git notes add [<options>] [<object>]"
07432cef 7698msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 7699
2e8451e8 7700#: builtin/notes.c:50
ef317cd5 7701msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 7702msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 7703
2e8451e8 7704#: builtin/notes.c:51
ef317cd5 7705msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 7706msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 7707
2e8451e8 7708#: builtin/notes.c:56
ef317cd5 7709msgid "git notes append [<options>] [<object>]"
07432cef 7710msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 7711
2e8451e8 7712#: builtin/notes.c:61
ef317cd5 7713msgid "git notes edit [<object>]"
07432cef 7714msgstr "git notes edit [<对象>]"
ef317cd5 7715
2e8451e8 7716#: builtin/notes.c:66
ef317cd5 7717msgid "git notes show [<object>]"
07432cef 7718msgstr "git notes show [<对象>]"
ef317cd5 7719
2e8451e8 7720#: builtin/notes.c:71
814ff314 7721msgid "git notes merge [<options>] <notes-ref>"
07432cef 7722msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 7723
2e8451e8 7724#: builtin/notes.c:72
ef317cd5 7725msgid "git notes merge --commit [<options>]"
07432cef 7726msgstr "git notes merge --commit [<选项>]"
ef317cd5 7727
2e8451e8 7728#: builtin/notes.c:73
ef317cd5 7729msgid "git notes merge --abort [<options>]"
07432cef 7730msgstr "git notes merge --abort [<选项>]"
ef317cd5 7731
2e8451e8 7732#: builtin/notes.c:78
ef317cd5 7733msgid "git notes remove [<object>]"
07432cef 7734msgstr "git notes remove [<对象>]"
ef317cd5 7735
2e8451e8 7736#: builtin/notes.c:83
ef317cd5 7737msgid "git notes prune [<options>]"
07432cef 7738msgstr "git notes prune [<选项>]"
ef317cd5 7739
2e8451e8 7740#: builtin/notes.c:88
ef317cd5 7741msgid "git notes get-ref"
07432cef 7742msgstr "git notes get-ref"
ef317cd5 7743
04cb2f28 7744#: builtin/notes.c:146
c04f5ac3
JX
7745#, c-format
7746msgid "unable to start 'show' for object '%s'"
7747msgstr "不能为对象 '%s' 开始 'show'"
7748
04cb2f28 7749#: builtin/notes.c:150
a77c07d9
JX
7750msgid "could not read 'show' output"
7751msgstr "不能读取 'show' 的输出"
c04f5ac3 7752
04cb2f28 7753#: builtin/notes.c:158
c04f5ac3
JX
7754#, c-format
7755msgid "failed to finish 'show' for object '%s'"
7756msgstr "无法为对象 '%s' 完成 'show'"
7757
04cb2f28 7758#: builtin/notes.c:173 builtin/tag.c:477
c04f5ac3
JX
7759#, c-format
7760msgid "could not create file '%s'"
7761msgstr "不能创建文件 '%s'"
7762
04cb2f28 7763#: builtin/notes.c:192
c04f5ac3
JX
7764msgid "Please supply the note contents using either -m or -F option"
7765msgstr "请通过 -m 或 -F 选项为注解提供内容"
7766
04cb2f28 7767#: builtin/notes.c:201
c04f5ac3
JX
7768msgid "unable to write note object"
7769msgstr "不能写注解对象"
7770
04cb2f28 7771#: builtin/notes.c:203
c04f5ac3 7772#, c-format
220c313c
JX
7773msgid "The note contents have been left in %s"
7774msgstr "注解内容被留在 %s 中"
c04f5ac3 7775
04cb2f28 7776#: builtin/notes.c:231 builtin/tag.c:693
c04f5ac3
JX
7777#, c-format
7778msgid "cannot read '%s'"
7779msgstr "不能读取 '%s'"
7780
04cb2f28 7781#: builtin/notes.c:233 builtin/tag.c:696
c04f5ac3
JX
7782#, c-format
7783msgid "could not open or read '%s'"
7784msgstr "不能打开或读取 '%s'"
7785
04cb2f28
JX
7786#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
7787#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
7788#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
7789#: builtin/notes.c:854 builtin/tag.c:709
c04f5ac3
JX
7790#, c-format
7791msgid "Failed to resolve '%s' as a valid ref."
90e6ef53 7792msgstr "无法解析 '%s' 为一个有效引用。"
c04f5ac3 7793
04cb2f28 7794#: builtin/notes.c:255
c04f5ac3
JX
7795#, c-format
7796msgid "Failed to read object '%s'."
7797msgstr "无法读取对象 '%s'。"
7798
04cb2f28 7799#: builtin/notes.c:259
6c94aba5
JX
7800#, c-format
7801msgid "Cannot read note data from non-blob object '%s'."
7802msgstr "不能从非数据对象 '%s' 中读取注解数据"
7803
04cb2f28 7804#: builtin/notes.c:299
c04f5ac3
JX
7805#, c-format
7806msgid "Malformed input line: '%s'."
7807msgstr "非法的输入行:'%s'。"
7808
04cb2f28 7809#: builtin/notes.c:314
c04f5ac3
JX
7810#, c-format
7811msgid "Failed to copy notes from '%s' to '%s'"
90e6ef53 7812msgstr "无法从 '%s' 到 '%s' 拷贝注解"
c04f5ac3 7813
04cb2f28
JX
7814#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
7815#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
7816#: builtin/notes.c:919
c04f5ac3
JX
7817msgid "too many parameters"
7818msgstr "参数太多"
7819
04cb2f28 7820#: builtin/notes.c:371 builtin/notes.c:658
c04f5ac3
JX
7821#, c-format
7822msgid "No note found for object %s."
7823msgstr "未发现对象 %s 的注解。"
7824
04cb2f28 7825#: builtin/notes.c:392 builtin/notes.c:555
ef317cd5 7826msgid "note contents as a string"
07432cef 7827msgstr "注解内容作为一个字符串"
ef317cd5 7828
04cb2f28 7829#: builtin/notes.c:395 builtin/notes.c:558
ef317cd5 7830msgid "note contents in a file"
07432cef 7831msgstr "注解内容到一个文件中"
ef317cd5 7832
04cb2f28
JX
7833#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
7834#: builtin/notes.c:563 builtin/tag.c:628
ef317cd5 7835msgid "object"
07432cef 7836msgstr "对象"
ef317cd5 7837
04cb2f28 7838#: builtin/notes.c:398 builtin/notes.c:561
ef317cd5 7839msgid "reuse and edit specified note object"
07432cef 7840msgstr "重用和编辑指定的注解对象"
ef317cd5 7841
04cb2f28 7842#: builtin/notes.c:401 builtin/notes.c:564
ef317cd5 7843msgid "reuse specified note object"
07432cef 7844msgstr "重用指定的注解对象"
ef317cd5 7845
04cb2f28
JX
7846#: builtin/notes.c:404 builtin/notes.c:567
7847msgid "allow storing empty note"
7848msgstr "允许保存空白注释"
7849
7850#: builtin/notes.c:405 builtin/notes.c:476
ef317cd5 7851msgid "replace existing notes"
07432cef 7852msgstr "替换已存在的注解"
ef317cd5 7853
04cb2f28 7854#: builtin/notes.c:430
c04f5ac3
JX
7855#, c-format
7856msgid ""
7857"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7858"existing notes"
7859msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7860
04cb2f28 7861#: builtin/notes.c:445 builtin/notes.c:524
c04f5ac3
JX
7862#, c-format
7863msgid "Overwriting existing notes for object %s\n"
7864msgstr "覆盖对象 %s 现存注解\n"
7865
04cb2f28
JX
7866#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
7867#, c-format
7868msgid "Removing note for object %s\n"
7869msgstr "删除对象 %s 的注解\n"
7870
7871#: builtin/notes.c:477
ef317cd5 7872msgid "read objects from stdin"
07432cef 7873msgstr "从标准输入读取对象"
ef317cd5 7874
04cb2f28 7875#: builtin/notes.c:479
ef317cd5 7876msgid "load rewriting config for <command> (implies --stdin)"
07432cef 7877msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 7878
04cb2f28 7879#: builtin/notes.c:497
c04f5ac3
JX
7880msgid "too few parameters"
7881msgstr "参数太少"
7882
04cb2f28 7883#: builtin/notes.c:518
c04f5ac3
JX
7884#, c-format
7885msgid ""
7886"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7887"existing notes"
7888msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7889
04cb2f28 7890#: builtin/notes.c:530
c04f5ac3
JX
7891#, c-format
7892msgid "Missing notes on source object %s. Cannot copy."
7893msgstr "源对象 %s 缺少注解。不能拷贝。"
7894
04cb2f28 7895#: builtin/notes.c:582
ef317cd5
JX
7896#, c-format
7897msgid ""
7898"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7899"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7900msgstr ""
7901"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7902"请换用 'git notes add -f -m/-F/-c/-C'。\n"
7903
04cb2f28 7904#: builtin/notes.c:750
ef317cd5 7905msgid "General options"
07432cef 7906msgstr "通用选项"
ef317cd5 7907
04cb2f28 7908#: builtin/notes.c:752
ef317cd5 7909msgid "Merge options"
07432cef 7910msgstr "合并选项"
ef317cd5 7911
04cb2f28 7912#: builtin/notes.c:754
ef317cd5
JX
7913msgid ""
7914"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7915"cat_sort_uniq)"
07432cef 7916msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 7917
04cb2f28 7918#: builtin/notes.c:756
ef317cd5 7919msgid "Committing unmerged notes"
07432cef 7920msgstr "提交未合并的注解"
ef317cd5 7921
04cb2f28 7922#: builtin/notes.c:758
ef317cd5 7923msgid "finalize notes merge by committing unmerged notes"
07432cef 7924msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 7925
04cb2f28 7926#: builtin/notes.c:760
ef317cd5 7927msgid "Aborting notes merge resolution"
07432cef 7928msgstr "中止注解合并的方案"
ef317cd5 7929
04cb2f28 7930#: builtin/notes.c:762
ef317cd5 7931msgid "abort notes merge"
07432cef 7932msgstr "中止注解合并"
ef317cd5 7933
04cb2f28 7934#: builtin/notes.c:857
ef317cd5
JX
7935#, c-format
7936msgid "Object %s has no note\n"
7937msgstr "对象 %s 没有注解\n"
7938
04cb2f28 7939#: builtin/notes.c:869
ef317cd5 7940msgid "attempt to remove non-existent note is not an error"
07432cef 7941msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 7942
04cb2f28 7943#: builtin/notes.c:872
ef317cd5 7944msgid "read object names from the standard input"
07432cef 7945msgstr "从标准输入读取对象名称"
ef317cd5 7946
04cb2f28 7947#: builtin/notes.c:953
6c94aba5 7948msgid "notes-ref"
07432cef 7949msgstr "注解引用"
ef317cd5 7950
04cb2f28 7951#: builtin/notes.c:954
814ff314 7952msgid "use notes from <notes-ref>"
07432cef 7953msgstr "从 <注解引用> 使用注解"
ef317cd5 7954
7aea43ff 7955#: builtin/notes.c:989 builtin/remote.c:1618
ef317cd5
JX
7956#, c-format
7957msgid "Unknown subcommand: %s"
7958msgstr "未知子命令:%s"
7959
220c313c 7960#: builtin/pack-objects.c:28
ef317cd5 7961msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
07432cef 7962msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
ef317cd5 7963
220c313c 7964#: builtin/pack-objects.c:29
ef317cd5 7965msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
07432cef 7966msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
ef317cd5 7967
814ff314 7968#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
ef317cd5
JX
7969#, c-format
7970msgid "deflate error (%d)"
7971msgstr "压缩错误 (%d)"
7972
814ff314 7973#: builtin/pack-objects.c:771
6c94aba5
JX
7974msgid "Writing objects"
7975msgstr "写入对象中"
7976
7aea43ff 7977#: builtin/pack-objects.c:1011
6c94aba5
JX
7978msgid "disabling bitmap writing, as some objects are not being packed"
7979msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7980
7aea43ff 7981#: builtin/pack-objects.c:2171
6c94aba5
JX
7982msgid "Compressing objects"
7983msgstr "压缩对象中"
7984
7aea43ff 7985#: builtin/pack-objects.c:2568
ef317cd5
JX
7986#, c-format
7987msgid "unsupported index version %s"
7988msgstr "不支持的索引版本 %s"
7989
7aea43ff 7990#: builtin/pack-objects.c:2572
ef317cd5
JX
7991#, c-format
7992msgid "bad index version '%s'"
7993msgstr "坏的索引版本 '%s'"
7994
7aea43ff 7995#: builtin/pack-objects.c:2595
ef317cd5
JX
7996#, c-format
7997msgid "option %s does not accept negative form"
7998msgstr "选项 %s 不接受否定格式"
7999
7aea43ff 8000#: builtin/pack-objects.c:2599
ef317cd5
JX
8001#, c-format
8002msgid "unable to parse value '%s' for option %s"
8003msgstr "不能解析选项 %1$s 的值 '%2$s'"
8004
7aea43ff 8005#: builtin/pack-objects.c:2619
ef317cd5 8006msgid "do not show progress meter"
07432cef 8007msgstr "不显示进度表"
ef317cd5 8008
7aea43ff 8009#: builtin/pack-objects.c:2621
ef317cd5 8010msgid "show progress meter"
07432cef 8011msgstr "显示进度表"
ef317cd5 8012
7aea43ff 8013#: builtin/pack-objects.c:2623
ef317cd5 8014msgid "show progress meter during object writing phase"
07432cef 8015msgstr "在对象写入阶段显示进度表"
ef317cd5 8016
7aea43ff 8017#: builtin/pack-objects.c:2626
ef317cd5 8018msgid "similar to --all-progress when progress meter is shown"
07432cef 8019msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 8020
7aea43ff 8021#: builtin/pack-objects.c:2627
ef317cd5 8022msgid "version[,offset]"
07432cef 8023msgstr "版本[,偏移]"
ef317cd5 8024
7aea43ff 8025#: builtin/pack-objects.c:2628
ef317cd5 8026msgid "write the pack index file in the specified idx format version"
07432cef 8027msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 8028
7aea43ff 8029#: builtin/pack-objects.c:2631
ef317cd5 8030msgid "maximum size of each output pack file"
07432cef 8031msgstr "每个输出包的最大尺寸"
ef317cd5 8032
7aea43ff 8033#: builtin/pack-objects.c:2633
ef317cd5 8034msgid "ignore borrowed objects from alternate object store"
160fb2b2 8035msgstr "忽略从备用对象存储里借用对象"
ef317cd5 8036
7aea43ff 8037#: builtin/pack-objects.c:2635
ef317cd5 8038msgid "ignore packed objects"
07432cef 8039msgstr "忽略包对象"
ef317cd5 8040
7aea43ff 8041#: builtin/pack-objects.c:2637
ef317cd5 8042msgid "limit pack window by objects"
07432cef 8043msgstr "限制打包窗口的对象数"
ef317cd5 8044
7aea43ff 8045#: builtin/pack-objects.c:2639
ef317cd5 8046msgid "limit pack window by memory in addition to object limit"
07432cef 8047msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 8048
7aea43ff 8049#: builtin/pack-objects.c:2641
ef317cd5 8050msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 8051msgstr "打包允许的 delta 链的最大长度"
ef317cd5 8052
7aea43ff 8053#: builtin/pack-objects.c:2643
ef317cd5 8054msgid "reuse existing deltas"
07432cef 8055msgstr "重用已存在的 deltas"
ef317cd5 8056
7aea43ff 8057#: builtin/pack-objects.c:2645
ef317cd5 8058msgid "reuse existing objects"
07432cef 8059msgstr "重用已存在的对象"
ef317cd5 8060
7aea43ff 8061#: builtin/pack-objects.c:2647
ef317cd5 8062msgid "use OFS_DELTA objects"
07432cef 8063msgstr "使用 OFS_DELTA 对象"
ef317cd5 8064
7aea43ff 8065#: builtin/pack-objects.c:2649
ef317cd5 8066msgid "use threads when searching for best delta matches"
07432cef 8067msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 8068
7aea43ff 8069#: builtin/pack-objects.c:2651
ef317cd5 8070msgid "do not create an empty pack output"
07432cef 8071msgstr "不创建空的包输出"
ef317cd5 8072
7aea43ff 8073#: builtin/pack-objects.c:2653
ef317cd5 8074msgid "read revision arguments from standard input"
d9d56b23 8075msgstr "从标准输入读取版本号参数"
ef317cd5 8076
7aea43ff 8077#: builtin/pack-objects.c:2655
ef317cd5 8078msgid "limit the objects to those that are not yet packed"
07432cef 8079msgstr "限制那些尚未打包的对象"
ef317cd5 8080
7aea43ff 8081#: builtin/pack-objects.c:2658
ef317cd5 8082msgid "include objects reachable from any reference"
07432cef 8083msgstr "包括可以从任何引用访问到的对象"
ef317cd5 8084
7aea43ff 8085#: builtin/pack-objects.c:2661
ef317cd5 8086msgid "include objects referred by reflog entries"
07432cef 8087msgstr "包括被引用日志引用到的对象"
ef317cd5 8088
7aea43ff 8089#: builtin/pack-objects.c:2664
220c313c
JX
8090msgid "include objects referred to by the index"
8091msgstr "包括被索引引用到的对象"
8092
7aea43ff 8093#: builtin/pack-objects.c:2667
ef317cd5 8094msgid "output pack to stdout"
07432cef 8095msgstr "输出包到标准输出"
ef317cd5 8096
7aea43ff 8097#: builtin/pack-objects.c:2669
ef317cd5 8098msgid "include tag objects that refer to objects to be packed"
53438e8f 8099msgstr "包括那些引用了待打包对象的标签对象"
ef317cd5 8100
7aea43ff 8101#: builtin/pack-objects.c:2671
ef317cd5 8102msgid "keep unreachable objects"
07432cef 8103msgstr "维持不可达的对象"
ef317cd5 8104
7aea43ff 8105#: builtin/pack-objects.c:2672 parse-options.h:139
ef317cd5
JX
8106msgid "time"
8107msgstr "时间"
8108
7aea43ff 8109#: builtin/pack-objects.c:2673
ef317cd5 8110msgid "unpack unreachable objects newer than <time>"
07432cef 8111msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 8112
7aea43ff 8113#: builtin/pack-objects.c:2676
ef317cd5 8114msgid "create thin packs"
07432cef 8115msgstr "创建精简包"
ef317cd5 8116
7aea43ff 8117#: builtin/pack-objects.c:2678
04cb2f28 8118msgid "create packs suitable for shallow fetches"
160fb2b2 8119msgstr "创建适合浅克隆仓库获取的包"
04cb2f28 8120
7aea43ff 8121#: builtin/pack-objects.c:2680
ef317cd5 8122msgid "ignore packs that have companion .keep file"
07432cef 8123msgstr "忽略配有 .keep 文件的包"
ef317cd5 8124
7aea43ff 8125#: builtin/pack-objects.c:2682
ef317cd5 8126msgid "pack compression level"
07432cef 8127msgstr "打包压缩级别"
ef317cd5 8128
7aea43ff 8129#: builtin/pack-objects.c:2684
ef317cd5 8130msgid "do not hide commits by grafts"
cfff71a9 8131msgstr "显示被嫁接隐藏的提交"
ef317cd5 8132
7aea43ff 8133#: builtin/pack-objects.c:2686
6c94aba5
JX
8134msgid "use a bitmap index if available to speed up counting objects"
8135msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8136
7aea43ff 8137#: builtin/pack-objects.c:2688
6c94aba5
JX
8138msgid "write a bitmap index together with the pack index"
8139msgstr "在建立包索引的同时创建 bitmap 索引"
8140
7aea43ff 8141#: builtin/pack-objects.c:2779
6c94aba5
JX
8142msgid "Counting objects"
8143msgstr "对象计数中"
8144
ef317cd5 8145#: builtin/pack-refs.c:6
814ff314
JX
8146msgid "git pack-refs [<options>]"
8147msgstr "git pack-refs [<选项>]"
c04f5ac3 8148
ef317cd5
JX
8149#: builtin/pack-refs.c:14
8150msgid "pack everything"
07432cef 8151msgstr "打包一切"
c04f5ac3 8152
ef317cd5
JX
8153#: builtin/pack-refs.c:15
8154msgid "prune loose refs (default)"
07432cef 8155msgstr "清除松散的引用(默认)"
c04f5ac3 8156
ef317cd5 8157#: builtin/prune-packed.c:7
814ff314
JX
8158msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8159msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 8160
220c313c 8161#: builtin/prune-packed.c:40
6c94aba5
JX
8162msgid "Removing duplicate objects"
8163msgstr "正在删除重复对象"
8164
5bb01d4f 8165#: builtin/prune.c:11
ef317cd5 8166msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
07432cef 8167msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7ac1c0ad 8168
5bb01d4f 8169#: builtin/prune.c:105 builtin/worktree.c:112
ef317cd5 8170msgid "do not remove, show only"
07432cef 8171msgstr "不删除,只显示"
7ac1c0ad 8172
5bb01d4f 8173#: builtin/prune.c:106 builtin/worktree.c:113
ef317cd5 8174msgid "report pruned objects"
07432cef 8175msgstr "报告清除的对象"
7ac1c0ad 8176
5bb01d4f 8177#: builtin/prune.c:109 builtin/worktree.c:115
ef317cd5 8178msgid "expire objects older than <time>"
07432cef 8179msgstr "使早于给定时间的对象过期"
ef317cd5
JX
8180
8181#: builtin/push.c:14
ef317cd5 8182msgid "git push [<options>] [<repository> [<refspec>...]]"
160fb2b2 8183msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
7ac1c0ad 8184
6c94aba5 8185#: builtin/push.c:85
c04f5ac3 8186msgid "tag shorthand without <tag>"
55a16ee4 8187msgstr "标签后面未提供 <标签> 参数"
c04f5ac3 8188
6c94aba5 8189#: builtin/push.c:95
c04f5ac3 8190msgid "--delete only accepts plain target ref names"
90e6ef53 8191msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 8192
6acbf033 8193#: builtin/push.c:139
8ada9598
JX
8194msgid ""
8195"\n"
8196"To choose either option permanently, see push.default in 'git help config'."
8197msgstr ""
81809b99
JX
8198"\n"
8199"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 8200
6acbf033 8201#: builtin/push.c:142
8ada9598
JX
8202#, c-format
8203msgid ""
8204"The upstream branch of your current branch does not match\n"
8205"the name of your current branch. To push to the upstream branch\n"
8206"on the remote, use\n"
8207"\n"
8208" git push %s HEAD:%s\n"
8209"\n"
8210"To push to the branch of the same name on the remote, use\n"
8211"\n"
8212" git push %s %s\n"
8213"%s"
8214msgstr ""
81809b99
JX
8215"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
8216"上游分支,使用\n"
8217"\n"
8218" git push %s HEAD:%s\n"
8219"\n"
8220"为推送至远程同名分支,使用\n"
8221"\n"
8222" git push %s %s\n"
8223"%s"
8ada9598 8224
6acbf033 8225#: builtin/push.c:157
c04f5ac3
JX
8226#, c-format
8227msgid ""
8228"You are not currently on a branch.\n"
8229"To push the history leading to the current (detached HEAD)\n"
8230"state now, use\n"
8231"\n"
8232" git push %s HEAD:<name-of-remote-branch>\n"
8233msgstr ""
8234"您当前不在一个分支上。\n"
90e6ef53 8235"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 8236"\n"
d9d56b23 8237" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 8238
6acbf033 8239#: builtin/push.c:171
c04f5ac3
JX
8240#, c-format
8241msgid ""
8242"The current branch %s has no upstream branch.\n"
8243"To push the current branch and set the remote as upstream, use\n"
8244"\n"
8245" git push --set-upstream %s %s\n"
8246msgstr ""
8247"当前分支 %s 没有对应的上游分支。\n"
8248"为推送当前分支并建立与远程上游的跟踪,使用\n"
8249"\n"
8250" git push --set-upstream %s %s\n"
8251
6acbf033 8252#: builtin/push.c:179
c04f5ac3
JX
8253#, c-format
8254msgid "The current branch %s has multiple upstream branches, refusing to push."
8255msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8256
6acbf033 8257#: builtin/push.c:182
73a60cd2
JX
8258#, c-format
8259msgid ""
8260"You are pushing to remote '%s', which is not the upstream of\n"
8261"your current branch '%s', without telling me what to push\n"
8262"to update which remote branch."
8263msgstr ""
8264"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8265"而没有告诉我要推送什么、更新哪个远程分支。"
8266
c160d03f 8267# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
6acbf033 8268#: builtin/push.c:205
c160d03f 8269msgid ""
6c94aba5 8270"push.default is unset; its implicit value has changed in\n"
c160d03f 8271"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6c94aba5 8272"and maintain the traditional behavior, use:\n"
c160d03f
JX
8273"\n"
8274" git config --global push.default matching\n"
8275"\n"
8276"To squelch this message and adopt the new behavior now, use:\n"
8277"\n"
8278" git config --global push.default simple\n"
8279"\n"
cfff71a9
JX
8280"When push.default is set to 'matching', git will push local branches\n"
8281"to the remote branches that already exist with the same name.\n"
8282"\n"
6c94aba5 8283"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
cfff71a9
JX
8284"behavior, which only pushes the current branch to the corresponding\n"
8285"remote branch that 'git pull' uses to update the current branch.\n"
8286"\n"
c160d03f
JX
8287"See 'git help config' and search for 'push.default' for further "
8288"information.\n"
8289"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8290"'current' instead of 'simple' if you sometimes use older versions of Git)"
8291msgstr ""
6c94aba5 8292"push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
cfff71a9 8293"变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
c160d03f
JX
8294"\n"
8295" git config --global push.default matching\n"
8296"\n"
8297"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8298"\n"
8299" git config --global push.default simple\n"
8300"\n"
cfff71a9
JX
8301"当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8302"本地分支。\n"
8303"\n"
160fb2b2 8304"从 Git 2.0 开始,Git 默认采用更为保守的 'simple' 模式,只推送当前\n"
cfff71a9
JX
8305"分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8306"\n"
c160d03f
JX
8307"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8308"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
90314792 8309"为保持兼容,请用 'current' 代替 'simple')"
c160d03f 8310
6acbf033 8311#: builtin/push.c:272
c04f5ac3
JX
8312msgid ""
8313"You didn't specify any refspecs to push, and push.default is \"nothing\"."
160fb2b2 8314msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
c04f5ac3 8315
6acbf033 8316#: builtin/push.c:279
170e9899
JX
8317msgid ""
8318"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
8319"its remote counterpart. Integrate the remote changes (e.g.\n"
8320"'git pull ...') before pushing again.\n"
170e9899
JX
8321"See the 'Note about fast-forwards' in 'git push --help' for details."
8322msgstr ""
eff6d3a9 8323"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 8324"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 8325"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 8326
6acbf033 8327#: builtin/push.c:285
170e9899
JX
8328msgid ""
8329"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
8330"counterpart. Check out this branch and integrate the remote changes\n"
8331"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
8332"See the 'Note about fast-forwards' in 'git push --help' for details."
8333msgstr ""
eff6d3a9 8334"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 8335"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 8336"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 8337
6acbf033 8338#: builtin/push.c:291
07432cef 8339msgid ""
a77c07d9
JX
8340"Updates were rejected because the remote contains work that you do\n"
8341"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
8342"to the same ref. You may want to first integrate the remote changes\n"
8343"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
8344"See the 'Note about fast-forwards' in 'git push --help' for details."
8345msgstr ""
160fb2b2
JX
8346"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
8347"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
2e8451e8 8348"(如 'git pull ...')。\n"
a77c07d9
JX
8349"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8350
6acbf033 8351#: builtin/push.c:298
a77c07d9 8352msgid "Updates were rejected because the tag already exists in the remote."
55a16ee4 8353msgstr "更新被拒绝,因为该标签在远程已经存在。"
a77c07d9 8354
6acbf033 8355#: builtin/push.c:301
a77c07d9
JX
8356msgid ""
8357"You cannot update a remote ref that points at a non-commit object,\n"
8358"or update a remote ref to make it point at a non-commit object,\n"
8359"without using the '--force' option.\n"
8360msgstr ""
8361"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
8362"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 8363
6acbf033 8364#: builtin/push.c:360
c04f5ac3
JX
8365#, c-format
8366msgid "Pushing to %s\n"
8367msgstr "推送到 %s\n"
8368
6acbf033 8369#: builtin/push.c:364
c04f5ac3
JX
8370#, c-format
8371msgid "failed to push some refs to '%s'"
8372msgstr "无法推送一些引用到 '%s'"
8373
6acbf033 8374#: builtin/push.c:394
c04f5ac3
JX
8375#, c-format
8376msgid "bad repository '%s'"
160fb2b2 8377msgstr "坏的仓库 '%s'"
c04f5ac3 8378
6acbf033 8379#: builtin/push.c:395
c04f5ac3
JX
8380msgid ""
8381"No configured push destination.\n"
8382"Either specify the URL from the command-line or configure a remote "
8383"repository using\n"
8384"\n"
8385" git remote add <name> <url>\n"
8386"\n"
8387"and then push using the remote name\n"
8388"\n"
8389" git push <name>\n"
8390msgstr ""
90e6ef53 8391"没有配置推送目标。\n"
4375c10e 8392"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
c04f5ac3 8393"\n"
d9d56b23 8394" git remote add <名称> <地址>\n"
c04f5ac3 8395"\n"
160fb2b2 8396"然后使用该远程仓库名执行推送\n"
c04f5ac3 8397"\n"
d9d56b23 8398" git push <名称>\n"
c04f5ac3 8399
6acbf033 8400#: builtin/push.c:410
c04f5ac3
JX
8401msgid "--all and --tags are incompatible"
8402msgstr "--all 和 --tags 不兼容"
8403
6acbf033 8404#: builtin/push.c:411
c04f5ac3 8405msgid "--all can't be combined with refspecs"
160fb2b2 8406msgstr "--all 不能和引用规格同时使用"
c04f5ac3 8407
6acbf033 8408#: builtin/push.c:416
c04f5ac3
JX
8409msgid "--mirror and --tags are incompatible"
8410msgstr "--mirror 和 --tags 不兼容"
8411
6acbf033 8412#: builtin/push.c:417
c04f5ac3 8413msgid "--mirror can't be combined with refspecs"
160fb2b2 8414msgstr "--mirror 不能和引用规格同时使用"
c04f5ac3 8415
6acbf033 8416#: builtin/push.c:422
c04f5ac3
JX
8417msgid "--all and --mirror are incompatible"
8418msgstr "--all 和 --mirror 不兼容"
8419
814ff314 8420#: builtin/push.c:502
ef317cd5 8421msgid "repository"
160fb2b2 8422msgstr "仓库"
ef317cd5 8423
814ff314 8424#: builtin/push.c:503
ef317cd5 8425msgid "push all refs"
07432cef 8426msgstr "推送所有引用"
ef317cd5 8427
814ff314 8428#: builtin/push.c:504
ef317cd5 8429msgid "mirror all refs"
07432cef 8430msgstr "镜像所有引用"
ef317cd5 8431
814ff314 8432#: builtin/push.c:506
ef317cd5 8433msgid "delete refs"
07432cef 8434msgstr "删除引用"
ef317cd5 8435
814ff314 8436#: builtin/push.c:507
ef317cd5 8437msgid "push tags (can't be used with --all or --mirror)"
55a16ee4 8438msgstr "推送标签(不能使用 --all or --mirror)"
ef317cd5 8439
814ff314 8440#: builtin/push.c:510
ef317cd5
JX
8441msgid "force updates"
8442msgstr "强制更新"
8443
814ff314 8444#: builtin/push.c:512
90314792
JX
8445msgid "refname>:<expect"
8446msgstr "引用名>:<期望值"
8447
814ff314 8448#: builtin/push.c:513
90314792
JX
8449msgid "require old value of ref to be at this value"
8450msgstr "要求引用旧的取值为设定值"
8451
814ff314 8452#: builtin/push.c:516
ef317cd5 8453msgid "control recursive pushing of submodules"
07432cef 8454msgstr "控制子模组的递归推送"
ef317cd5 8455
814ff314 8456#: builtin/push.c:518
ef317cd5 8457msgid "use thin pack"
07432cef 8458msgstr "使用精简打包"
ef317cd5 8459
814ff314 8460#: builtin/push.c:519 builtin/push.c:520
ef317cd5 8461msgid "receive pack program"
07432cef 8462msgstr "接收包程序"
ef317cd5 8463
814ff314 8464#: builtin/push.c:521
ef317cd5 8465msgid "set upstream for git pull/status"
07432cef 8466msgstr "设置 git pull/status 的上游"
ef317cd5 8467
814ff314 8468#: builtin/push.c:524
ef317cd5 8469msgid "prune locally removed refs"
07432cef 8470msgstr "清除本地删除的引用"
ef317cd5 8471
814ff314 8472#: builtin/push.c:526
a77c07d9
JX
8473msgid "bypass pre-push hook"
8474msgstr "绕过 pre-push 钩子"
8475
814ff314 8476#: builtin/push.c:527
1003b3a5 8477msgid "push missing but relevant tags"
55a16ee4 8478msgstr "推送缺失但有关的标签"
1003b3a5 8479
814ff314 8480#: builtin/push.c:529
220c313c
JX
8481msgid "GPG sign the push"
8482msgstr "用 GPG 为推送签名"
8483
814ff314
JX
8484#: builtin/push.c:530
8485msgid "request atomic transaction on remote side"
8486msgstr "需要远端支持原子事务"
8487
8488#: builtin/push.c:539
c04f5ac3
JX
8489msgid "--delete is incompatible with --all, --mirror and --tags"
8490msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8491
814ff314 8492#: builtin/push.c:541
c04f5ac3
JX
8493msgid "--delete doesn't make sense without any refs"
8494msgstr "--delete 未接任何引用没有意义"
8495
220c313c 8496#: builtin/read-tree.c:37
ef317cd5
JX
8497msgid ""
8498"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8499"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8500"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8501msgstr ""
07432cef
WS
8502"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8503"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8504"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
ef317cd5 8505
220c313c 8506#: builtin/read-tree.c:110
ef317cd5 8507msgid "write resulting index to <file>"
d9d56b23 8508msgstr "将索引结果写入 <文件>"
ef317cd5 8509
220c313c 8510#: builtin/read-tree.c:113
ef317cd5 8511msgid "only empty the index"
07432cef 8512msgstr "只是清空索引"
ef317cd5 8513
220c313c 8514#: builtin/read-tree.c:115
ef317cd5 8515msgid "Merging"
07432cef 8516msgstr "合并"
ef317cd5 8517
220c313c 8518#: builtin/read-tree.c:117
ef317cd5 8519msgid "perform a merge in addition to a read"
07432cef 8520msgstr "读取之余再执行一个合并"
ef317cd5 8521
220c313c 8522#: builtin/read-tree.c:119
ef317cd5 8523msgid "3-way merge if no file level merging required"
160fb2b2 8524msgstr "如果没有文件级合并需要,执行三方合并"
ef317cd5 8525
220c313c 8526#: builtin/read-tree.c:121
ef317cd5 8527msgid "3-way merge in presence of adds and removes"
160fb2b2 8528msgstr "存在添加和删除时,也执行三方合并"
ef317cd5 8529
220c313c 8530#: builtin/read-tree.c:123
ef317cd5 8531msgid "same as -m, but discard unmerged entries"
07432cef 8532msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 8533
220c313c 8534#: builtin/read-tree.c:124
ef317cd5 8535msgid "<subdirectory>/"
07432cef 8536msgstr "<子目录>/"
ef317cd5 8537
220c313c 8538#: builtin/read-tree.c:125
ef317cd5 8539msgid "read the tree into the index under <subdirectory>/"
07432cef 8540msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 8541
220c313c 8542#: builtin/read-tree.c:128
ef317cd5 8543msgid "update working tree with merge result"
07432cef 8544msgstr "用合并的结果更新工作区"
ef317cd5 8545
220c313c 8546#: builtin/read-tree.c:130
ef317cd5 8547msgid "gitignore"
07432cef 8548msgstr "gitignore"
ef317cd5 8549
220c313c 8550#: builtin/read-tree.c:131
ef317cd5 8551msgid "allow explicitly ignored files to be overwritten"
07432cef 8552msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 8553
220c313c 8554#: builtin/read-tree.c:134
ef317cd5 8555msgid "don't check the working tree after merging"
07432cef 8556msgstr "合并后不检查工作区"
ef317cd5 8557
220c313c 8558#: builtin/read-tree.c:135
ef317cd5 8559msgid "don't update the index or the work tree"
07432cef 8560msgstr "不更新索引区和工作区"
ef317cd5 8561
220c313c 8562#: builtin/read-tree.c:137
ef317cd5 8563msgid "skip applying sparse checkout filter"
07432cef 8564msgstr "跳过应用稀疏检出过滤器"
ef317cd5 8565
220c313c 8566#: builtin/read-tree.c:139
ef317cd5 8567msgid "debug unpack-trees"
07432cef 8568msgstr "调试 unpack-trees"
ef317cd5 8569
7aea43ff 8570#: builtin/reflog.c:430
2e8451e8
JX
8571#, c-format
8572msgid "%s' for '%s' is not a valid timestamp"
8573msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8574
7aea43ff 8575#: builtin/reflog.c:547 builtin/reflog.c:552
2e8451e8
JX
8576#, c-format
8577msgid "'%s' is not a valid timestamp"
8578msgstr "'%s' 不是一个有效的时间戳"
8579
cfff71a9 8580#: builtin/remote.c:12
ef317cd5 8581msgid "git remote [-v | --verbose]"
07432cef 8582msgstr "git remote [-v | --verbose]"
ef317cd5 8583
cfff71a9 8584#: builtin/remote.c:13
ef317cd5 8585msgid ""
814ff314 8586"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
8587"mirror=<fetch|push>] <name> <url>"
8588msgstr ""
814ff314 8589"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 8590"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 8591
cfff71a9 8592#: builtin/remote.c:14 builtin/remote.c:33
ef317cd5 8593msgid "git remote rename <old> <new>"
07432cef 8594msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 8595
cfff71a9 8596#: builtin/remote.c:15 builtin/remote.c:38
ef317cd5 8597msgid "git remote remove <name>"
07432cef 8598msgstr "git remote remove <名称>"
ef317cd5 8599
814ff314
JX
8600#: builtin/remote.c:16 builtin/remote.c:43
8601msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8602msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 8603
cfff71a9 8604#: builtin/remote.c:17
ef317cd5 8605msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 8606msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 8607
cfff71a9 8608#: builtin/remote.c:18
ef317cd5 8609msgid "git remote prune [-n | --dry-run] <name>"
07432cef 8610msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 8611
cfff71a9 8612#: builtin/remote.c:19
ef317cd5
JX
8613msgid ""
8614"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 8615msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 8616
cfff71a9 8617#: builtin/remote.c:20
ef317cd5 8618msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 8619msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 8620
cfff71a9 8621#: builtin/remote.c:21 builtin/remote.c:69
ef317cd5 8622msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 8623msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 8624
cfff71a9 8625#: builtin/remote.c:22 builtin/remote.c:70
ef317cd5 8626msgid "git remote set-url --add <name> <newurl>"
07432cef 8627msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 8628
cfff71a9 8629#: builtin/remote.c:23 builtin/remote.c:71
ef317cd5 8630msgid "git remote set-url --delete <name> <url>"
07432cef 8631msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 8632
cfff71a9 8633#: builtin/remote.c:28
ef317cd5 8634msgid "git remote add [<options>] <name> <url>"
07432cef 8635msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 8636
cfff71a9 8637#: builtin/remote.c:48
ef317cd5 8638msgid "git remote set-branches <name> <branch>..."
07432cef 8639msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 8640
cfff71a9 8641#: builtin/remote.c:49
ef317cd5 8642msgid "git remote set-branches --add <name> <branch>..."
07432cef 8643msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 8644
cfff71a9 8645#: builtin/remote.c:54
ef317cd5 8646msgid "git remote show [<options>] <name>"
07432cef 8647msgstr "git remote show [<选项>] <名称>"
ef317cd5 8648
cfff71a9 8649#: builtin/remote.c:59
ef317cd5 8650msgid "git remote prune [<options>] <name>"
07432cef 8651msgstr "git remote prune [<选项>] <名称>"
ef317cd5 8652
cfff71a9 8653#: builtin/remote.c:64
ef317cd5 8654msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 8655msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 8656
cfff71a9 8657#: builtin/remote.c:88
81809b99 8658#, c-format
8ada9598 8659msgid "Updating %s"
81809b99 8660msgstr "更新 %s 中"
8ada9598 8661
cfff71a9 8662#: builtin/remote.c:120
8ada9598
JX
8663msgid ""
8664"--mirror is dangerous and deprecated; please\n"
8665"\t use --mirror=fetch or --mirror=push instead"
8666msgstr ""
81809b99
JX
8667"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8668"\t 或 --mirror=push"
8ada9598 8669
cfff71a9 8670#: builtin/remote.c:137
81809b99 8671#, c-format
8ada9598 8672msgid "unknown mirror argument: %s"
81809b99 8673msgstr "未知的镜像参数:%s"
8ada9598 8674
cfff71a9 8675#: builtin/remote.c:153
ef317cd5 8676msgid "fetch the remote branches"
07432cef 8677msgstr "抓取远程的分支"
ef317cd5 8678
cfff71a9 8679#: builtin/remote.c:155
ef317cd5 8680msgid "import all tags and associated objects when fetching"
55a16ee4 8681msgstr "抓取时导入所有的标签和关联对象"
ef317cd5 8682
cfff71a9 8683#: builtin/remote.c:158
ef317cd5 8684msgid "or do not fetch any tag at all (--no-tags)"
55a16ee4 8685msgstr "或不抓取任何标签(--no-tags)"
ef317cd5 8686
cfff71a9 8687#: builtin/remote.c:160
ef317cd5 8688msgid "branch(es) to track"
07432cef 8689msgstr "跟踪的分支"
ef317cd5 8690
cfff71a9 8691#: builtin/remote.c:161
ef317cd5 8692msgid "master branch"
07432cef 8693msgstr "主线分支"
ef317cd5 8694
cfff71a9 8695#: builtin/remote.c:162
ef317cd5 8696msgid "push|fetch"
07432cef 8697msgstr "push|fetch"
ef317cd5 8698
cfff71a9 8699#: builtin/remote.c:163
ef317cd5 8700msgid "set up remote as a mirror to push to or fetch from"
07432cef 8701msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 8702
cfff71a9 8703#: builtin/remote.c:175
8ada9598 8704msgid "specifying a master branch makes no sense with --mirror"
81809b99 8705msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 8706
cfff71a9 8707#: builtin/remote.c:177
8ada9598 8708msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 8709msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 8710
7aea43ff 8711#: builtin/remote.c:187 builtin/remote.c:640
81809b99 8712#, c-format
8ada9598 8713msgid "remote %s already exists."
81809b99 8714msgstr "远程 %s 已经存在。"
8ada9598 8715
7aea43ff 8716#: builtin/remote.c:191 builtin/remote.c:644
81809b99 8717#, c-format
8ada9598 8718msgid "'%s' is not a valid remote name"
81809b99 8719msgstr "'%s' 不是一个有效的远程名称"
8ada9598 8720
d9d56b23 8721#: builtin/remote.c:235
81809b99 8722#, c-format
8ada9598 8723msgid "Could not setup master '%s'"
81809b99 8724msgstr "无法设置 master '%s'"
8ada9598 8725
d9d56b23 8726#: builtin/remote.c:335
81809b99 8727#, c-format
8ada9598 8728msgid "Could not get fetch map for refspec %s"
160fb2b2 8729msgstr "无法得到引用规格 %s 的获取列表"
8ada9598 8730
d9d56b23 8731#: builtin/remote.c:436 builtin/remote.c:444
8ada9598 8732msgid "(matching)"
81809b99 8733msgstr "(匹配)"
8ada9598 8734
d9d56b23 8735#: builtin/remote.c:448
8ada9598 8736msgid "(delete)"
81809b99 8737msgstr "(删除)"
8ada9598 8738
7aea43ff 8739#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
81809b99 8740#, c-format
8ada9598 8741msgid "Could not append '%s' to '%s'"
81809b99 8742msgstr "不能添加 '%s' 至 '%s'"
8ada9598 8743
7aea43ff 8744#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892
81809b99 8745#, c-format
8ada9598 8746msgid "No such remote: %s"
81809b99 8747msgstr "没有这样的远程:%s"
8ada9598 8748
7aea43ff 8749#: builtin/remote.c:650
81809b99 8750#, c-format
8ada9598 8751msgid "Could not rename config section '%s' to '%s'"
81809b99 8752msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 8753
7aea43ff 8754#: builtin/remote.c:656 builtin/remote.c:844
81809b99 8755#, c-format
8ada9598 8756msgid "Could not remove config section '%s'"
81809b99 8757msgstr "不能移除配置小节 '%s'"
8ada9598 8758
7aea43ff 8759#: builtin/remote.c:671
8ada9598
JX
8760#, c-format
8761msgid ""
d691f479 8762"Not updating non-default fetch refspec\n"
8ada9598
JX
8763"\t%s\n"
8764"\tPlease update the configuration manually if necessary."
8765msgstr ""
160fb2b2 8766"没有更新非默认的获取引用规格\n"
81809b99
JX
8767"\t%s\n"
8768"\t如果必要请手动更新配置。"
8ada9598 8769
7aea43ff 8770#: builtin/remote.c:677
81809b99 8771#, c-format
8ada9598 8772msgid "Could not append '%s'"
81809b99 8773msgstr "不能追加 '%s'"
8ada9598 8774
7aea43ff 8775#: builtin/remote.c:688
81809b99 8776#, c-format
8ada9598 8777msgid "Could not set '%s'"
81809b99 8778msgstr "不能设置 '%s'"
8ada9598 8779
7aea43ff 8780#: builtin/remote.c:710
81809b99 8781#, c-format
8ada9598 8782msgid "deleting '%s' failed"
81809b99 8783msgstr "删除 '%s' 失败"
8ada9598 8784
7aea43ff 8785#: builtin/remote.c:744
81809b99 8786#, c-format
8ada9598 8787msgid "creating '%s' failed"
81809b99 8788msgstr "创建 '%s' 失败"
8ada9598 8789
7aea43ff 8790#: builtin/remote.c:763
81809b99 8791#, c-format
8ada9598 8792msgid "Could not remove branch %s"
81809b99 8793msgstr "无法移除分支 %s"
8ada9598 8794
7aea43ff 8795#: builtin/remote.c:830
8ada9598
JX
8796msgid ""
8797"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8798"to delete it, use:"
8799msgid_plural ""
8800"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8801"to delete them, use:"
5ae481e0
JX
8802msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8803msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 8804
7aea43ff 8805#: builtin/remote.c:945
8ada9598
JX
8806#, c-format
8807msgid " new (next fetch will store in remotes/%s)"
81809b99 8808msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 8809
7aea43ff 8810#: builtin/remote.c:948
8ada9598 8811msgid " tracked"
81809b99 8812msgstr " 已跟踪"
8ada9598 8813
7aea43ff 8814#: builtin/remote.c:950
8ada9598 8815msgid " stale (use 'git remote prune' to remove)"
81809b99 8816msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 8817
7aea43ff 8818#: builtin/remote.c:952
8ada9598 8819msgid " ???"
81809b99 8820msgstr " ???"
8ada9598 8821
7aea43ff 8822#: builtin/remote.c:993
8ada9598
JX
8823#, c-format
8824msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 8825msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 8826
7aea43ff 8827#: builtin/remote.c:1000
81809b99 8828#, c-format
8ada9598 8829msgid "rebases onto remote %s"
81809b99 8830msgstr "变基到远程 %s"
8ada9598 8831
7aea43ff 8832#: builtin/remote.c:1003
81809b99 8833#, c-format
8ada9598 8834msgid " merges with remote %s"
81809b99 8835msgstr " 与远程 %s 合并"
8ada9598 8836
7aea43ff 8837#: builtin/remote.c:1004
8ada9598 8838msgid " and with remote"
81809b99 8839msgstr " 且有远程"
8ada9598 8840
7aea43ff 8841#: builtin/remote.c:1006
81809b99 8842#, c-format
8ada9598 8843msgid "merges with remote %s"
81809b99 8844msgstr "与远程 %s 合并"
8ada9598 8845
7aea43ff 8846#: builtin/remote.c:1007
8ada9598 8847msgid " and with remote"
81809b99 8848msgstr " 且有远程"
8ada9598 8849
7aea43ff 8850#: builtin/remote.c:1053
8ada9598 8851msgid "create"
81809b99 8852msgstr "创建"
8ada9598 8853
7aea43ff 8854#: builtin/remote.c:1056
8ada9598 8855msgid "delete"
81809b99 8856msgstr "删除"
8ada9598 8857
7aea43ff 8858#: builtin/remote.c:1060
8ada9598 8859msgid "up to date"
81809b99 8860msgstr "最新"
8ada9598 8861
7aea43ff 8862#: builtin/remote.c:1063
8ada9598 8863msgid "fast-forwardable"
81809b99 8864msgstr "可快进"
8ada9598 8865
7aea43ff 8866#: builtin/remote.c:1066
8ada9598 8867msgid "local out of date"
81809b99 8868msgstr "本地已过时"
8ada9598 8869
7aea43ff 8870#: builtin/remote.c:1073
8ada9598
JX
8871#, c-format
8872msgid " %-*s forces to %-*s (%s)"
81809b99 8873msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 8874
7aea43ff 8875#: builtin/remote.c:1076
8ada9598
JX
8876#, c-format
8877msgid " %-*s pushes to %-*s (%s)"
81809b99 8878msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 8879
7aea43ff 8880#: builtin/remote.c:1080
8ada9598
JX
8881#, c-format
8882msgid " %-*s forces to %s"
81809b99 8883msgstr " %-*s 强制推送至 %s"
8ada9598 8884
7aea43ff 8885#: builtin/remote.c:1083
8ada9598
JX
8886#, c-format
8887msgid " %-*s pushes to %s"
81809b99 8888msgstr " %-*s 推送至 %s"
8ada9598 8889
7aea43ff 8890#: builtin/remote.c:1151
ef317cd5 8891msgid "do not query remotes"
07432cef 8892msgstr "不查询远程"
ef317cd5 8893
7aea43ff 8894#: builtin/remote.c:1178
81809b99 8895#, c-format
8ada9598 8896msgid "* remote %s"
81809b99 8897msgstr "* 远程 %s"
8ada9598 8898
7aea43ff 8899#: builtin/remote.c:1179
8ada9598
JX
8900#, c-format
8901msgid " Fetch URL: %s"
81809b99 8902msgstr " 获取地址:%s"
8ada9598 8903
7aea43ff 8904#: builtin/remote.c:1180 builtin/remote.c:1331
8ada9598 8905msgid "(no URL)"
81809b99 8906msgstr "(无 URL)"
8ada9598 8907
7aea43ff 8908#: builtin/remote.c:1189 builtin/remote.c:1191
8ada9598
JX
8909#, c-format
8910msgid " Push URL: %s"
81809b99 8911msgstr " 推送地址:%s"
8ada9598 8912
7aea43ff 8913#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197
81809b99 8914#, c-format
8ada9598 8915msgid " HEAD branch: %s"
4375c10e 8916msgstr " HEAD 分支:%s"
8ada9598 8917
7aea43ff 8918#: builtin/remote.c:1199
8ada9598
JX
8919#, c-format
8920msgid ""
8921" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 8922msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 8923
7aea43ff 8924#: builtin/remote.c:1211
81809b99 8925#, c-format
8ada9598
JX
8926msgid " Remote branch:%s"
8927msgid_plural " Remote branches:%s"
81809b99 8928msgstr[0] " 远程分支:%s"
5ae481e0 8929msgstr[1] " 远程分支:%s"
8ada9598 8930
81809b99 8931# 译者:中文字符串拼接,可删除前导空格
7aea43ff 8932#: builtin/remote.c:1214 builtin/remote.c:1241
8ada9598 8933msgid " (status not queried)"
81809b99 8934msgstr "(状态未查询)"
8ada9598 8935
7aea43ff 8936#: builtin/remote.c:1223
8ada9598
JX
8937msgid " Local branch configured for 'git pull':"
8938msgid_plural " Local branches configured for 'git pull':"
81809b99 8939msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 8940msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 8941
7aea43ff 8942#: builtin/remote.c:1231
8ada9598 8943msgid " Local refs will be mirrored by 'git push'"
81809b99 8944msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 8945
7aea43ff 8946#: builtin/remote.c:1238
81809b99 8947#, c-format
8ada9598
JX
8948msgid " Local ref configured for 'git push'%s:"
8949msgid_plural " Local refs configured for 'git push'%s:"
81809b99 8950msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 8951msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 8952
7aea43ff 8953#: builtin/remote.c:1259
ef317cd5 8954msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 8955msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 8956
7aea43ff 8957#: builtin/remote.c:1261
ef317cd5 8958msgid "delete refs/remotes/<name>/HEAD"
07432cef 8959msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 8960
7aea43ff 8961#: builtin/remote.c:1276
8ada9598 8962msgid "Cannot determine remote HEAD"
81809b99 8963msgstr "无法确定远程 HEAD"
8ada9598 8964
7aea43ff 8965#: builtin/remote.c:1278
8ada9598 8966msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 8967msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 8968
7aea43ff 8969#: builtin/remote.c:1288
81809b99 8970#, c-format
8ada9598 8971msgid "Could not delete %s"
81809b99 8972msgstr "无法删除 %s"
8ada9598 8973
7aea43ff 8974#: builtin/remote.c:1296
81809b99 8975#, c-format
8ada9598 8976msgid "Not a valid ref: %s"
81809b99 8977msgstr "不是一个有效引用:%s"
8ada9598 8978
7aea43ff 8979#: builtin/remote.c:1298
81809b99 8980#, c-format
8ada9598 8981msgid "Could not setup %s"
81809b99 8982msgstr "不能设置 %s"
8ada9598
JX
8983
8984# 译者:注意保持前导空格
7aea43ff 8985#: builtin/remote.c:1316
81809b99 8986#, c-format
8ada9598 8987msgid " %s will become dangling!"
07432cef 8988msgstr " %s 将成为摇摆状态!"
8ada9598
JX
8989
8990# 译者:注意保持前导空格
7aea43ff 8991#: builtin/remote.c:1317
81809b99 8992#, c-format
8ada9598 8993msgid " %s has become dangling!"
07432cef 8994msgstr " %s 已成为摇摆状态!"
8ada9598 8995
7aea43ff 8996#: builtin/remote.c:1327
81809b99 8997#, c-format
8ada9598 8998msgid "Pruning %s"
81809b99 8999msgstr "修剪 %s"
8ada9598 9000
7aea43ff 9001#: builtin/remote.c:1328
8ada9598
JX
9002#, c-format
9003msgid "URL: %s"
81809b99 9004msgstr "URL:%s"
8ada9598 9005
7aea43ff 9006#: builtin/remote.c:1351
8ada9598
JX
9007#, c-format
9008msgid " * [would prune] %s"
81809b99 9009msgstr " * [将删除] %s"
8ada9598 9010
7aea43ff 9011#: builtin/remote.c:1354
8ada9598
JX
9012#, c-format
9013msgid " * [pruned] %s"
81809b99 9014msgstr " * [已删除] %s"
8ada9598 9015
7aea43ff 9016#: builtin/remote.c:1399
ef317cd5 9017msgid "prune remotes after fetching"
07432cef 9018msgstr "抓取后清除远程"
ef317cd5 9019
7aea43ff 9020#: builtin/remote.c:1465 builtin/remote.c:1539
81809b99 9021#, c-format
8ada9598 9022msgid "No such remote '%s'"
81809b99 9023msgstr "没有此远程 '%s'"
8ada9598 9024
7aea43ff 9025#: builtin/remote.c:1485
ef317cd5 9026msgid "add branch"
07432cef 9027msgstr "添加分支"
ef317cd5 9028
7aea43ff 9029#: builtin/remote.c:1492
8ada9598 9030msgid "no remote specified"
81809b99 9031msgstr "未指定远程"
8ada9598 9032
7aea43ff 9033#: builtin/remote.c:1514
ef317cd5 9034msgid "manipulate push URLs"
07432cef 9035msgstr "操作推送 URLS"
ef317cd5 9036
7aea43ff 9037#: builtin/remote.c:1516
ef317cd5 9038msgid "add URL"
07432cef 9039msgstr "添加 URL"
ef317cd5 9040
7aea43ff 9041#: builtin/remote.c:1518
ef317cd5 9042msgid "delete URLs"
07432cef 9043msgstr "删除 URLS"
ef317cd5 9044
7aea43ff 9045#: builtin/remote.c:1525
8ada9598 9046msgid "--add --delete doesn't make sense"
81809b99 9047msgstr "--add --delete 无意义"
8ada9598 9048
7aea43ff 9049#: builtin/remote.c:1565
81809b99 9050#, c-format
8ada9598 9051msgid "Invalid old URL pattern: %s"
4375c10e 9052msgstr "无效的旧 URL 匹配模版:%s"
8ada9598 9053
7aea43ff 9054#: builtin/remote.c:1573
81809b99 9055#, c-format
8ada9598 9056msgid "No such URL found: %s"
4375c10e 9057msgstr "未找到此 URL:%s"
8ada9598 9058
7aea43ff 9059#: builtin/remote.c:1575
8ada9598 9060msgid "Will not delete all non-push URLs"
4375c10e 9061msgstr "将不会删除所有非推送 URL 地址"
8ada9598 9062
7aea43ff 9063#: builtin/remote.c:1589
ef317cd5 9064msgid "be verbose; must be placed before a subcommand"
07432cef 9065msgstr "冗长输出;必须置于子命令之前"
ef317cd5 9066
6acbf033 9067#: builtin/repack.c:17
814ff314
JX
9068msgid "git repack [<options>]"
9069msgstr "git repack [<选项>]"
90314792 9070
04cb2f28 9071#: builtin/repack.c:159
90314792
JX
9072msgid "pack everything in a single pack"
9073msgstr "所有内容打包到一个包文件中"
9074
04cb2f28 9075#: builtin/repack.c:161
90314792
JX
9076msgid "same as -a, and turn unreachable objects loose"
9077msgstr "和 -a 相同,并将不可达的对象设为松散对象"
9078
04cb2f28 9079#: builtin/repack.c:164
90314792
JX
9080msgid "remove redundant packs, and run git-prune-packed"
9081msgstr "删除多余的包,运行 git-prune-packed"
9082
04cb2f28 9083#: builtin/repack.c:166
90314792
JX
9084msgid "pass --no-reuse-delta to git-pack-objects"
9085msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9086
04cb2f28 9087#: builtin/repack.c:168
90314792
JX
9088msgid "pass --no-reuse-object to git-pack-objects"
9089msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9090
04cb2f28 9091#: builtin/repack.c:170
90314792
JX
9092msgid "do not run git-update-server-info"
9093msgstr "不运行 git-update-server-info"
9094
04cb2f28 9095#: builtin/repack.c:173
90314792
JX
9096msgid "pass --local to git-pack-objects"
9097msgstr "向 git-pack-objects 传递参数 --local"
9098
04cb2f28 9099#: builtin/repack.c:175
6c94aba5
JX
9100msgid "write bitmap index"
9101msgstr "写 bitmap 索引"
9102
04cb2f28 9103#: builtin/repack.c:176
90314792
JX
9104msgid "approxidate"
9105msgstr "近似日期"
9106
04cb2f28 9107#: builtin/repack.c:177
90314792
JX
9108msgid "with -A, do not loosen objects older than this"
9109msgstr "使用 -A,不要将早于给定时间的对象过期"
9110
04cb2f28 9111#: builtin/repack.c:179
90314792
JX
9112msgid "size of the window used for delta compression"
9113msgstr "用于增量压缩的窗口值"
9114
04cb2f28 9115#: builtin/repack.c:180 builtin/repack.c:184
8376b58d
JX
9116msgid "bytes"
9117msgstr "字节"
9118
04cb2f28 9119#: builtin/repack.c:181
90314792
JX
9120msgid "same as the above, but limit memory size instead of entries count"
9121msgstr "和上面的相似,但限制内存大小而非条目数"
9122
04cb2f28 9123#: builtin/repack.c:183
90314792
JX
9124msgid "limits the maximum delta depth"
9125msgstr "限制最大增量深度"
9126
04cb2f28 9127#: builtin/repack.c:185
90314792 9128msgid "maximum size of each packfile"
dbd6cced 9129msgstr "每个包文件的最大尺寸"
90314792 9130
04cb2f28 9131#: builtin/repack.c:187
6c94aba5
JX
9132msgid "repack objects in packs marked with .keep"
9133msgstr "对标记为 .keep 的包中的对象重新打包"
9134
7aea43ff 9135#: builtin/repack.c:377
90314792
JX
9136#, c-format
9137msgid "removing '%s' failed"
9138msgstr "删除 '%s' 失败"
9139
6acbf033 9140#: builtin/replace.c:19
ef317cd5 9141msgid "git replace [-f] <object> <replacement>"
07432cef 9142msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 9143
6acbf033
JX
9144#: builtin/replace.c:20
9145msgid "git replace [-f] --edit <object>"
9146msgstr "git replace [-f] --edit <对象>"
9147
9148#: builtin/replace.c:21
9149msgid "git replace [-f] --graft <commit> [<parent>...]"
9150msgstr "git replace [-f] --graft <提交> [<父提交>...]"
9151
9152#: builtin/replace.c:22
ef317cd5 9153msgid "git replace -d <object>..."
07432cef 9154msgstr "git replace -d <对象>..."
ef317cd5 9155
6acbf033 9156#: builtin/replace.c:23
cfff71a9
JX
9157msgid "git replace [--format=<format>] [-l [<pattern>]]"
9158msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 9159
220c313c 9160#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
6acbf033
JX
9161#, c-format
9162msgid "Not a valid object name: '%s'"
9163msgstr "不是一个有效的对象名:'%s'"
9164
220c313c 9165#: builtin/replace.c:355
6acbf033
JX
9166#, c-format
9167msgid "bad mergetag in commit '%s'"
55a16ee4 9168msgstr "提交 '%s' 中含有损坏的合并标签"
6acbf033 9169
220c313c 9170#: builtin/replace.c:357
6acbf033
JX
9171#, c-format
9172msgid "malformed mergetag in commit '%s'"
55a16ee4 9173msgstr "提交 '%s' 中含有非法的合并标签"
6acbf033 9174
220c313c 9175#: builtin/replace.c:368
6acbf033
JX
9176#, c-format
9177msgid ""
9178"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9179"instead of --graft"
55a16ee4 9180msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
6acbf033 9181
220c313c 9182#: builtin/replace.c:401
6acbf033
JX
9183#, c-format
9184msgid "the original commit '%s' has a gpg signature."
9185msgstr "原始提交 '%s' 中包含一个 GPG 签名"
9186
220c313c 9187#: builtin/replace.c:402
6acbf033
JX
9188msgid "the signature will be removed in the replacement commit!"
9189msgstr "在替换的提交中签名将被移除!"
9190
220c313c 9191#: builtin/replace.c:408
6acbf033
JX
9192#, c-format
9193msgid "could not write replacement commit for: '%s'"
9194msgstr "不能为 '%s' 写替换提交"
9195
220c313c 9196#: builtin/replace.c:432
ef317cd5 9197msgid "list replace refs"
07432cef 9198msgstr "列出替换的引用"
ef317cd5 9199
220c313c 9200#: builtin/replace.c:433
ef317cd5 9201msgid "delete replace refs"
07432cef 9202msgstr "删除替换的引用"
ef317cd5 9203
220c313c 9204#: builtin/replace.c:434
6acbf033
JX
9205msgid "edit existing object"
9206msgstr "编辑现存的对象"
9207
220c313c 9208#: builtin/replace.c:435
6acbf033
JX
9209msgid "change a commit's parents"
9210msgstr "修改一个提交的父提交"
9211
220c313c 9212#: builtin/replace.c:436
ef317cd5 9213msgid "replace the ref if it exists"
07432cef 9214msgstr "如果存在则替换引用"
ef317cd5 9215
220c313c 9216#: builtin/replace.c:437
6acbf033
JX
9217msgid "do not pretty-print contents for --edit"
9218msgstr "不要为 --edit 操作美观显示内容"
9219
220c313c 9220#: builtin/replace.c:438
cfff71a9
JX
9221msgid "use this format"
9222msgstr "使用此格式"
9223
90314792 9224#: builtin/rerere.c:12
814ff314
JX
9225msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9226msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 9227
90314792 9228#: builtin/rerere.c:57
ef317cd5 9229msgid "register clean resolutions in index"
07432cef 9230msgstr "在索引中注册干净的解决方案"
ef317cd5 9231
220c313c 9232#: builtin/reset.c:26
ef317cd5
JX
9233msgid ""
9234"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 9235msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 9236
220c313c 9237#: builtin/reset.c:27
07432cef
WS
9238msgid "git reset [-q] <tree-ish> [--] <paths>..."
9239msgstr "git reset [-q] <树或提交> [--] <路径>..."
ef317cd5 9240
220c313c 9241#: builtin/reset.c:28
07432cef
WS
9242msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9243msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 9244
220c313c 9245#: builtin/reset.c:34
c04f5ac3
JX
9246msgid "mixed"
9247msgstr "混杂"
9248
220c313c 9249#: builtin/reset.c:34
c04f5ac3
JX
9250msgid "soft"
9251msgstr "软性"
9252
220c313c 9253#: builtin/reset.c:34
c04f5ac3
JX
9254msgid "hard"
9255msgstr "硬性"
9256
220c313c 9257#: builtin/reset.c:34
8ada9598
JX
9258msgid "merge"
9259msgstr "合并"
9260
220c313c 9261#: builtin/reset.c:34
c04f5ac3
JX
9262msgid "keep"
9263msgstr "保持"
9264
220c313c 9265#: builtin/reset.c:74
c04f5ac3
JX
9266msgid "You do not have a valid HEAD."
9267msgstr "您没有一个有效的 HEAD。"
9268
220c313c 9269#: builtin/reset.c:76
c04f5ac3
JX
9270msgid "Failed to find tree of HEAD."
9271msgstr "无法找到 HEAD 指向的树。"
9272
220c313c 9273#: builtin/reset.c:82
c04f5ac3
JX
9274#, c-format
9275msgid "Failed to find tree of %s."
9276msgstr "无法找到 %s 指向的树。"
9277
220c313c 9278#: builtin/reset.c:100
c04f5ac3
JX
9279#, c-format
9280msgid "HEAD is now at %s"
9281msgstr "HEAD 现在位于 %s"
9282
90e6ef53 9283# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9284#: builtin/reset.c:183
c04f5ac3
JX
9285#, c-format
9286msgid "Cannot do a %s reset in the middle of a merge."
9287msgstr "在合并过程中不能做%s重置操作。"
9288
220c313c 9289#: builtin/reset.c:276
ef317cd5 9290msgid "be quiet, only report errors"
07432cef 9291msgstr "安静模式,只报告错误"
ef317cd5 9292
220c313c 9293#: builtin/reset.c:278
ef317cd5 9294msgid "reset HEAD and index"
07432cef 9295msgstr "重置 HEAD 和索引"
ef317cd5 9296
220c313c 9297#: builtin/reset.c:279
ef317cd5 9298msgid "reset only HEAD"
07432cef 9299msgstr "只重置 HEAD"
ef317cd5 9300
220c313c 9301#: builtin/reset.c:281 builtin/reset.c:283
ef317cd5 9302msgid "reset HEAD, index and working tree"
07432cef 9303msgstr "重置 HEAD、索引和工作区"
ef317cd5 9304
220c313c 9305#: builtin/reset.c:285
ef317cd5 9306msgid "reset HEAD but keep local changes"
07432cef 9307msgstr "重置 HEAD 但保存本地变更"
ef317cd5 9308
220c313c 9309#: builtin/reset.c:288
6c94aba5
JX
9310msgid "record only the fact that removed paths will be added later"
9311msgstr "将删除的路径标记为稍后添加"
9312
220c313c 9313#: builtin/reset.c:305
07432cef
WS
9314#, c-format
9315msgid "Failed to resolve '%s' as a valid revision."
9316msgstr "无法将 '%s' 解析为一个有效的版本。"
9317
220c313c 9318#: builtin/reset.c:308 builtin/reset.c:316
c04f5ac3
JX
9319#, c-format
9320msgid "Could not parse object '%s'."
9321msgstr "不能解析对象 '%s'。"
9322
220c313c 9323#: builtin/reset.c:313
07432cef
WS
9324#, c-format
9325msgid "Failed to resolve '%s' as a valid tree."
9326msgstr "无法将 '%s' 解析为一个有效的树对象。"
9327
220c313c 9328#: builtin/reset.c:322
c04f5ac3 9329msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 9330msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 9331
220c313c 9332#: builtin/reset.c:331
c04f5ac3 9333msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 9334msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 9335
90e6ef53 9336# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9337#: builtin/reset.c:333
c04f5ac3
JX
9338#, c-format
9339msgid "Cannot do %s reset with paths."
9340msgstr "不能带路径进行%s重置。"
9341
90e6ef53 9342# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9343#: builtin/reset.c:343
c04f5ac3
JX
9344#, c-format
9345msgid "%s reset is not allowed in a bare repository"
160fb2b2 9346msgstr "不能对纯仓库进行%s重置"
c04f5ac3 9347
220c313c 9348#: builtin/reset.c:347
6c94aba5
JX
9349msgid "-N can only be used with --mixed"
9350msgstr "-N 只能和 --mixed 同时使用"
9351
220c313c 9352#: builtin/reset.c:364
90314792 9353msgid "Unstaged changes after reset:"
160fb2b2 9354msgstr "重置后取消暂存的变更:"
90314792 9355
220c313c 9356#: builtin/reset.c:370
ef317cd5
JX
9357#, c-format
9358msgid "Could not reset index file to revision '%s'."
9359msgstr "不能重置索引文件至版本 '%s'。"
9360
220c313c 9361#: builtin/reset.c:374
07432cef
WS
9362msgid "Could not write new index file."
9363msgstr "不能写入新的索引文件。"
9364
220c313c 9365#: builtin/rev-parse.c:361
814ff314
JX
9366msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
9367msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 9368
220c313c 9369#: builtin/rev-parse.c:366
ef317cd5 9370msgid "keep the `--` passed as an arg"
07432cef 9371msgstr "保持 `--` 作为一个参数传递"
ef317cd5 9372
220c313c 9373#: builtin/rev-parse.c:368
ef317cd5 9374msgid "stop parsing after the first non-option argument"
07432cef 9375msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 9376
220c313c 9377#: builtin/rev-parse.c:371
cfff71a9
JX
9378msgid "output in stuck long form"
9379msgstr "以固定长格式输出"
9380
220c313c 9381#: builtin/rev-parse.c:499
ef317cd5 9382msgid ""
814ff314 9383"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 9384" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 9385" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
9386"\n"
9387"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9388msgstr ""
814ff314 9389"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 9390" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 9391" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
9392"\n"
9393"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5
JX
9394
9395#: builtin/revert.c:22
814ff314
JX
9396msgid "git revert [<options>] <commit-ish>..."
9397msgstr "git revert [<选项>] <提交号>..."
ef317cd5
JX
9398
9399#: builtin/revert.c:23
9400msgid "git revert <subcommand>"
07432cef 9401msgstr "git revert <子命令>"
ef317cd5
JX
9402
9403#: builtin/revert.c:28
814ff314
JX
9404msgid "git cherry-pick [<options>] <commit-ish>..."
9405msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5
JX
9406
9407#: builtin/revert.c:29
ef317cd5 9408msgid "git cherry-pick <subcommand>"
07432cef 9409msgstr "git cherry-pick <子命令>"
ef317cd5 9410
90314792 9411#: builtin/revert.c:71
ef317cd5
JX
9412#, c-format
9413msgid "%s: %s cannot be used with %s"
9414msgstr "%s:%s 不能和 %s 同时使用"
9415
90314792 9416#: builtin/revert.c:80
ef317cd5 9417msgid "end revert or cherry-pick sequence"
07432cef 9418msgstr "终止反转或拣选操作"
ef317cd5 9419
90314792 9420#: builtin/revert.c:81
ef317cd5 9421msgid "resume revert or cherry-pick sequence"
07432cef 9422msgstr "继续反转或拣选操作"
ef317cd5 9423
90314792 9424#: builtin/revert.c:82
ef317cd5 9425msgid "cancel revert or cherry-pick sequence"
07432cef 9426msgstr "取消反转或拣选操作"
ef317cd5 9427
90314792 9428#: builtin/revert.c:83
ef317cd5 9429msgid "don't automatically commit"
07432cef 9430msgstr "不要自动提交"
ef317cd5 9431
90314792 9432#: builtin/revert.c:84
ef317cd5 9433msgid "edit the commit message"
07432cef 9434msgstr "编辑提交说明"
ef317cd5 9435
90314792 9436#: builtin/revert.c:87
ef317cd5 9437msgid "parent number"
07432cef 9438msgstr "父编号"
ef317cd5 9439
90314792 9440#: builtin/revert.c:89
ef317cd5 9441msgid "merge strategy"
07432cef 9442msgstr "合并策略"
ef317cd5 9443
90314792 9444#: builtin/revert.c:90
ef317cd5 9445msgid "option"
07432cef 9446msgstr "选项"
ef317cd5 9447
90314792 9448#: builtin/revert.c:91
ef317cd5 9449msgid "option for merge strategy"
07432cef 9450msgstr "合并策略的选项"
ef317cd5 9451
6c94aba5 9452#: builtin/revert.c:104
ef317cd5 9453msgid "append commit name"
07432cef 9454msgstr "追加提交名称"
ef317cd5 9455
6c94aba5 9456#: builtin/revert.c:105
ef317cd5 9457msgid "allow fast-forward"
07432cef 9458msgstr "允许快进式"
c04f5ac3 9459
6c94aba5 9460#: builtin/revert.c:106
ef317cd5 9461msgid "preserve initially empty commits"
07432cef 9462msgstr "保留初始化的空提交"
ef317cd5 9463
6c94aba5 9464#: builtin/revert.c:107
ef317cd5 9465msgid "allow commits with empty messages"
07432cef 9466msgstr "允许提交说明为空"
c04f5ac3 9467
6c94aba5 9468#: builtin/revert.c:108
ef317cd5 9469msgid "keep redundant, empty commits"
07432cef 9470msgstr "保持多余的、空的提交"
ef317cd5 9471
6c94aba5 9472#: builtin/revert.c:112
c04f5ac3
JX
9473msgid "program error"
9474msgstr "程序错误"
9475
6c94aba5 9476#: builtin/revert.c:197
c04f5ac3
JX
9477msgid "revert failed"
9478msgstr "还原失败"
9479
6c94aba5 9480#: builtin/revert.c:212
c04f5ac3
JX
9481msgid "cherry-pick failed"
9482msgstr "拣选失败"
9483
90314792 9484#: builtin/rm.c:17
814ff314
JX
9485msgid "git rm [<options>] [--] <file>..."
9486msgstr "git rm [<选项>] [--] <文件>..."
07432cef 9487
90314792 9488#: builtin/rm.c:65
2e8451e8
JX
9489msgid ""
9490"the following submodule (or one of its nested submodules)\n"
9491"uses a .git directory:"
9492msgid_plural ""
220c313c 9493"the following submodules (or one of their nested submodules)\n"
2e8451e8 9494"use a .git directory:"
220c313c
JX
9495msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9496msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
2e8451e8 9497
90314792 9498#: builtin/rm.c:71
07432cef 9499msgid ""
2e8451e8 9500"\n"
07432cef
WS
9501"(use 'rm -rf' if you really want to remove it including all of its history)"
9502msgstr ""
2e8451e8 9503"\n"
07432cef 9504"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
ef317cd5 9505
7aea43ff 9506#: builtin/rm.c:230
c04f5ac3 9507msgid ""
2e8451e8
JX
9508"the following file has staged content different from both the\n"
9509"file and the HEAD:"
9510msgid_plural ""
9511"the following files have staged content different from both the\n"
9512"file and the HEAD:"
9513msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9514msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9515
7aea43ff 9516#: builtin/rm.c:235
2e8451e8
JX
9517msgid ""
9518"\n"
c04f5ac3
JX
9519"(use -f to force removal)"
9520msgstr ""
2e8451e8 9521"\n"
c04f5ac3
JX
9522"(使用 -f 强制删除)"
9523
7aea43ff 9524#: builtin/rm.c:239
2e8451e8
JX
9525msgid "the following file has changes staged in the index:"
9526msgid_plural "the following files have changes staged in the index:"
160fb2b2
JX
9527msgstr[0] "下列文件索引中有变更"
9528msgstr[1] "下列文件索引中有变更"
c04f5ac3 9529
7aea43ff 9530#: builtin/rm.c:243 builtin/rm.c:254
c04f5ac3 9531msgid ""
2e8451e8 9532"\n"
c04f5ac3
JX
9533"(use --cached to keep the file, or -f to force removal)"
9534msgstr ""
2e8451e8
JX
9535"\n"
9536"(使用 --cached 保留本地文件,或用 -f 强制删除)"
9537
7aea43ff 9538#: builtin/rm.c:251
2e8451e8
JX
9539msgid "the following file has local modifications:"
9540msgid_plural "the following files have local modifications:"
9541msgstr[0] "如下文件有本地修改:"
9542msgstr[1] "如下文件有本地修改:"
c04f5ac3 9543
7aea43ff 9544#: builtin/rm.c:269
ef317cd5 9545msgid "do not list removed files"
07432cef 9546msgstr "不列出删除的文件"
ef317cd5 9547
7aea43ff 9548#: builtin/rm.c:270
ef317cd5 9549msgid "only remove from the index"
07432cef 9550msgstr "只从索引区删除"
ef317cd5 9551
7aea43ff 9552#: builtin/rm.c:271
ef317cd5 9553msgid "override the up-to-date check"
07432cef 9554msgstr "忽略文件更新状态检查"
ef317cd5 9555
7aea43ff 9556#: builtin/rm.c:272
ef317cd5 9557msgid "allow recursive removal"
07432cef 9558msgstr "允许递归删除"
ef317cd5 9559
7aea43ff 9560#: builtin/rm.c:274
ef317cd5 9561msgid "exit with a zero status even if nothing matched"
07432cef 9562msgstr "即使没有匹配,也以零状态退出"
ef317cd5 9563
7aea43ff 9564#: builtin/rm.c:317
220c313c
JX
9565msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9566msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
9567
7aea43ff 9568#: builtin/rm.c:335
c04f5ac3
JX
9569#, c-format
9570msgid "not removing '%s' recursively without -r"
9571msgstr "未提供 -r 选项不会递归删除 '%s'"
9572
7aea43ff 9573#: builtin/rm.c:374
c04f5ac3
JX
9574#, c-format
9575msgid "git rm: unable to remove %s"
9576msgstr "git rm:不能删除 %s"
9577
ef317cd5 9578#: builtin/shortlog.c:13
814ff314 9579msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
4dcdc3d8 9580msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
ef317cd5 9581
4dcdc3d8 9582#: builtin/shortlog.c:131
c04f5ac3
JX
9583#, c-format
9584msgid "Missing author: %s"
9585msgstr "缺少作者:%s"
9586
90314792 9587#: builtin/shortlog.c:230
ef317cd5 9588msgid "sort output according to the number of commits per author"
07432cef 9589msgstr "根据每个作者的提交数量排序"
ef317cd5 9590
90314792 9591#: builtin/shortlog.c:232
ef317cd5 9592msgid "Suppress commit descriptions, only provides commit count"
07432cef 9593msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 9594
90314792 9595#: builtin/shortlog.c:234
ef317cd5 9596msgid "Show the email address of each author"
07432cef 9597msgstr "显示每个作者的电子邮件地址"
ef317cd5 9598
90314792 9599#: builtin/shortlog.c:235
ef317cd5 9600msgid "w[,i1[,i2]]"
07432cef 9601msgstr "w[,i1[,i2]]"
ef317cd5 9602
90314792 9603#: builtin/shortlog.c:236
ef317cd5 9604msgid "Linewrap output"
07432cef 9605msgstr "折行输出"
ef317cd5
JX
9606
9607#: builtin/show-branch.c:9
9608msgid ""
814ff314 9609"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
9610"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9611"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9612"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 9613msgstr ""
814ff314 9614"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
9615"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
9616"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9617"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 9618
d9d56b23 9619#: builtin/show-branch.c:13
814ff314
JX
9620msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
9621msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
ef317cd5 9622
7aea43ff 9623#: builtin/show-branch.c:659
ef317cd5 9624msgid "show remote-tracking and local branches"
07432cef 9625msgstr "显示远程跟踪的和本地的分支"
ef317cd5 9626
7aea43ff 9627#: builtin/show-branch.c:661
ef317cd5 9628msgid "show remote-tracking branches"
07432cef 9629msgstr "显示远程跟踪的分支"
ef317cd5 9630
7aea43ff 9631#: builtin/show-branch.c:663
ef317cd5 9632msgid "color '*!+-' corresponding to the branch"
07432cef 9633msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 9634
7aea43ff 9635#: builtin/show-branch.c:665
ef317cd5 9636msgid "show <n> more commits after the common ancestor"
07432cef 9637msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 9638
7aea43ff 9639#: builtin/show-branch.c:667
ef317cd5 9640msgid "synonym to more=-1"
07432cef 9641msgstr "和 more=-1 同义"
ef317cd5 9642
7aea43ff 9643#: builtin/show-branch.c:668
ef317cd5 9644msgid "suppress naming strings"
07432cef 9645msgstr "不显示字符串命名"
ef317cd5 9646
7aea43ff 9647#: builtin/show-branch.c:670
ef317cd5 9648msgid "include the current branch"
07432cef 9649msgstr "包括当前分支"
ef317cd5 9650
7aea43ff 9651#: builtin/show-branch.c:672
ef317cd5 9652msgid "name commits with their object names"
07432cef 9653msgstr "以对象名字命名提交"
ef317cd5 9654
7aea43ff 9655#: builtin/show-branch.c:674
ef317cd5 9656msgid "show possible merge bases"
07432cef 9657msgstr "显示可能合并的基线"
ef317cd5 9658
7aea43ff 9659#: builtin/show-branch.c:676
ef317cd5 9660msgid "show refs unreachable from any other ref"
07432cef 9661msgstr "显示没有任何引用的的引用"
ef317cd5 9662
7aea43ff 9663#: builtin/show-branch.c:678
ef317cd5 9664msgid "show commits in topological order"
07432cef 9665msgstr "以拓扑顺序显示提交"
ef317cd5 9666
7aea43ff 9667#: builtin/show-branch.c:681
ef317cd5 9668msgid "show only commits not on the first branch"
07432cef 9669msgstr "只显示不在第一个分支上的提交"
ef317cd5 9670
7aea43ff 9671#: builtin/show-branch.c:683
ef317cd5 9672msgid "show merges reachable from only one tip"
07432cef 9673msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 9674
7aea43ff 9675#: builtin/show-branch.c:685
2e8451e8
JX
9676msgid "topologically sort, maintaining date order where possible"
9677msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 9678
7aea43ff 9679#: builtin/show-branch.c:688
ef317cd5 9680msgid "<n>[,<base>]"
07432cef 9681msgstr "<n>[,<base>]"
ef317cd5 9682
7aea43ff 9683#: builtin/show-branch.c:689
ef317cd5 9684msgid "show <n> most recent ref-log entries starting at base"
07432cef 9685msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
ef317cd5
JX
9686
9687#: builtin/show-ref.c:10
9688msgid ""
814ff314
JX
9689"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9690"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 9691msgstr ""
814ff314
JX
9692"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9693"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5
JX
9694
9695#: builtin/show-ref.c:11
9696msgid "git show-ref --exclude-existing[=pattern] < ref-list"
07432cef 9697msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
ef317cd5 9698
7aea43ff 9699#: builtin/show-ref.c:170
ef317cd5 9700msgid "only show tags (can be combined with heads)"
55a16ee4 9701msgstr "只显示标签(可以和头共用)"
ef317cd5 9702
7aea43ff 9703#: builtin/show-ref.c:171
ef317cd5 9704msgid "only show heads (can be combined with tags)"
55a16ee4 9705msgstr "只显示头(可以和标签共用)"
ef317cd5 9706
7aea43ff 9707#: builtin/show-ref.c:172
ef317cd5 9708msgid "stricter reference checking, requires exact ref path"
07432cef 9709msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 9710
7aea43ff 9711#: builtin/show-ref.c:175 builtin/show-ref.c:177
2e8451e8
JX
9712msgid "show the HEAD reference, even if it would be filtered out"
9713msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 9714
7aea43ff 9715#: builtin/show-ref.c:179
ef317cd5 9716msgid "dereference tags into object IDs"
4375c10e 9717msgstr "转换标签到对象 ID"
ef317cd5 9718
7aea43ff 9719#: builtin/show-ref.c:181
ef317cd5 9720msgid "only show SHA1 hash using <n> digits"
07432cef 9721msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 9722
7aea43ff 9723#: builtin/show-ref.c:185
ef317cd5 9724msgid "do not print results to stdout (useful with --verify)"
07432cef 9725msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 9726
7aea43ff 9727#: builtin/show-ref.c:187
ef317cd5 9728msgid "show refs from stdin that aren't in local repository"
160fb2b2 9729msgstr "显示从标准输入中读入的不在本地仓库中的引用"
ef317cd5
JX
9730
9731#: builtin/symbolic-ref.c:7
814ff314
JX
9732msgid "git symbolic-ref [<options>] <name> [<ref>]"
9733msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef
WS
9734
9735#: builtin/symbolic-ref.c:8
814ff314
JX
9736msgid "git symbolic-ref -d [-q] <name>"
9737msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 9738
07432cef 9739#: builtin/symbolic-ref.c:40
ef317cd5 9740msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
9741msgstr "不显示非符号(分离的)引用的错误信息"
9742
9743#: builtin/symbolic-ref.c:41
9744msgid "delete symbolic ref"
9745msgstr "删除符号引用"
ef317cd5 9746
07432cef 9747#: builtin/symbolic-ref.c:42
ef317cd5 9748msgid "shorten ref output"
07432cef 9749msgstr "简短的引用输出"
ef317cd5 9750
04cb2f28 9751#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
ef317cd5 9752msgid "reason"
07432cef 9753msgstr "原因"
ef317cd5 9754
04cb2f28 9755#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
ef317cd5 9756msgid "reason of the update"
07432cef 9757msgstr "更新的原因"
ef317cd5
JX
9758
9759#: builtin/tag.c:22
9760msgid ""
814ff314
JX
9761"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
9762"[<head>]"
9763msgstr ""
9764"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
ef317cd5
JX
9765
9766#: builtin/tag.c:23
9767msgid "git tag -d <tagname>..."
07432cef 9768msgstr "git tag -d <标签名>..."
ef317cd5
JX
9769
9770#: builtin/tag.c:24
9771msgid ""
814ff314 9772"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
ef317cd5
JX
9773"\t\t[<pattern>...]"
9774msgstr ""
814ff314 9775"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]"
ef317cd5
JX
9776
9777#: builtin/tag.c:26
9778msgid "git tag -v <tagname>..."
07432cef 9779msgstr "git tag -v <标签名>..."
ef317cd5 9780
6acbf033 9781#: builtin/tag.c:69
7ac1c0ad
JX
9782#, c-format
9783msgid "malformed object at '%s'"
9784msgstr "非法的对象于 '%s'"
9785
6acbf033 9786#: builtin/tag.c:301
c04f5ac3
JX
9787#, c-format
9788msgid "tag name too long: %.*s..."
55a16ee4 9789msgstr "标签名称太长:%.*s..."
c04f5ac3 9790
6acbf033 9791#: builtin/tag.c:306
c04f5ac3
JX
9792#, c-format
9793msgid "tag '%s' not found."
55a16ee4 9794msgstr "未发现标签 '%s'。"
c04f5ac3 9795
6acbf033 9796#: builtin/tag.c:321
c04f5ac3
JX
9797#, c-format
9798msgid "Deleted tag '%s' (was %s)\n"
55a16ee4 9799msgstr "已删除标签 '%s'(曾为 %s)\n"
c04f5ac3 9800
6acbf033 9801#: builtin/tag.c:333
c04f5ac3
JX
9802#, c-format
9803msgid "could not verify the tag '%s'"
55a16ee4 9804msgstr "不能校验该标签 '%s'"
c04f5ac3 9805
6acbf033 9806#: builtin/tag.c:343
a77c07d9 9807#, c-format
c04f5ac3
JX
9808msgid ""
9809"\n"
6acbf033
JX
9810"Write a message for tag:\n"
9811" %s\n"
a77c07d9 9812"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
9813msgstr ""
9814"\n"
55a16ee4 9815"输入一个标签说明:\n"
6acbf033 9816" %s\n"
a77c07d9 9817"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 9818
6acbf033 9819#: builtin/tag.c:347
a77c07d9 9820#, c-format
c04f5ac3
JX
9821msgid ""
9822"\n"
6acbf033
JX
9823"Write a message for tag:\n"
9824" %s\n"
a77c07d9 9825"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 9826"want to.\n"
c04f5ac3
JX
9827msgstr ""
9828"\n"
55a16ee4 9829"输入一个标签说明:\n"
6acbf033 9830" %s\n"
a77c07d9 9831"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 9832
6acbf033
JX
9833#: builtin/tag.c:371
9834#, c-format
9835msgid "unsupported sort specification '%s'"
9836msgstr "不支持的排序规格 '%s'"
9837
9838#: builtin/tag.c:373
9839#, c-format
9840msgid "unsupported sort specification '%s' in variable '%s'"
9841msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9842
9843#: builtin/tag.c:428
c04f5ac3 9844msgid "unable to sign the tag"
55a16ee4 9845msgstr "无法签署标签"
c04f5ac3 9846
6acbf033 9847#: builtin/tag.c:430
c04f5ac3 9848msgid "unable to write tag file"
55a16ee4 9849msgstr "无法写标签文件"
c04f5ac3 9850
6acbf033 9851#: builtin/tag.c:455
c04f5ac3 9852msgid "bad object type."
90e6ef53 9853msgstr "坏的对象类型。"
c04f5ac3 9854
6acbf033 9855#: builtin/tag.c:468
c04f5ac3 9856msgid "tag header too big."
55a16ee4 9857msgstr "标签头信息太大。"
c04f5ac3 9858
6acbf033 9859#: builtin/tag.c:504
c04f5ac3 9860msgid "no tag message?"
55a16ee4 9861msgstr "无标签说明?"
c04f5ac3 9862
6acbf033 9863#: builtin/tag.c:510
c04f5ac3
JX
9864#, c-format
9865msgid "The tag message has been left in %s\n"
55a16ee4 9866msgstr "标签说明被保留在 %s\n"
c04f5ac3 9867
6acbf033 9868#: builtin/tag.c:559
7ac1c0ad
JX
9869msgid "switch 'points-at' requires an object"
9870msgstr "开关 'points-at' 需要一个对象"
9871
6acbf033 9872#: builtin/tag.c:561
7ac1c0ad
JX
9873#, c-format
9874msgid "malformed object name '%s'"
9875msgstr "非法的对象名 '%s'"
9876
220c313c 9877#: builtin/tag.c:589
ef317cd5 9878msgid "list tag names"
55a16ee4 9879msgstr "列出标签名称"
ef317cd5 9880
220c313c 9881#: builtin/tag.c:591
ef317cd5 9882msgid "print <n> lines of each tag message"
55a16ee4 9883msgstr "每个标签信息打印 <n> 行"
ef317cd5 9884
220c313c 9885#: builtin/tag.c:593
ef317cd5 9886msgid "delete tags"
55a16ee4 9887msgstr "删除标签"
ef317cd5 9888
220c313c 9889#: builtin/tag.c:594
ef317cd5 9890msgid "verify tags"
55a16ee4 9891msgstr "验证标签"
ef317cd5 9892
220c313c 9893#: builtin/tag.c:596
ef317cd5 9894msgid "Tag creation options"
55a16ee4 9895msgstr "标签创建选项"
ef317cd5 9896
220c313c 9897#: builtin/tag.c:598
ef317cd5 9898msgid "annotated tag, needs a message"
55a16ee4 9899msgstr "附注标签,需要一个说明"
ef317cd5 9900
220c313c 9901#: builtin/tag.c:600
ef317cd5 9902msgid "tag message"
55a16ee4 9903msgstr "标签说明"
ef317cd5 9904
220c313c 9905#: builtin/tag.c:602
ef317cd5 9906msgid "annotated and GPG-signed tag"
55a16ee4 9907msgstr "附注并附加 GPG 签名的标签"
ef317cd5 9908
220c313c 9909#: builtin/tag.c:606
ef317cd5 9910msgid "use another key to sign the tag"
55a16ee4 9911msgstr "使用另外的私钥签名该标签"
ef317cd5 9912
220c313c 9913#: builtin/tag.c:607
ef317cd5 9914msgid "replace the tag if exists"
55a16ee4 9915msgstr "如果存在,替换现有的标签"
ef317cd5 9916
814ff314
JX
9917#: builtin/tag.c:609
9918msgid "Tag listing options"
55a16ee4 9919msgstr "标签列表选项"
814ff314
JX
9920
9921#: builtin/tag.c:610
ef317cd5 9922msgid "show tag list in columns"
55a16ee4 9923msgstr "以列的方式显示标签列表"
ef317cd5 9924
814ff314 9925#: builtin/tag.c:612
6c94aba5 9926msgid "sort tags"
55a16ee4 9927msgstr "排序标签"
6c94aba5 9928
220c313c 9929#: builtin/tag.c:617 builtin/tag.c:623
ef317cd5 9930msgid "print only tags that contain the commit"
55a16ee4 9931msgstr "只打印包含提交的标签"
ef317cd5 9932
220c313c 9933#: builtin/tag.c:629
ef317cd5 9934msgid "print only tags of the object"
55a16ee4 9935msgstr "只打印对象的标签"
ef317cd5 9936
220c313c 9937#: builtin/tag.c:655
8ada9598 9938msgid "--column and -n are incompatible"
81809b99 9939msgstr "--column 和 -n 不兼容"
8ada9598 9940
220c313c 9941#: builtin/tag.c:667
6c94aba5
JX
9942msgid "--sort and -n are incompatible"
9943msgstr "--sort 和 -n 不兼容"
9944
220c313c 9945#: builtin/tag.c:674
c04f5ac3 9946msgid "-n option is only allowed with -l."
649900bc 9947msgstr "-n 选项只允许和 -l 同时使用。"
c04f5ac3 9948
220c313c 9949#: builtin/tag.c:676
c04f5ac3 9950msgid "--contains option is only allowed with -l."
649900bc 9951msgstr "--contains 选项只允许和 -l 同时使用。"
c04f5ac3 9952
220c313c 9953#: builtin/tag.c:678
7ac1c0ad 9954msgid "--points-at option is only allowed with -l."
649900bc 9955msgstr "--points-at 选项只允许和 -l 同时使用。"
7ac1c0ad 9956
220c313c 9957#: builtin/tag.c:686
c04f5ac3
JX
9958msgid "only one -F or -m option is allowed."
9959msgstr "只允许一个 -F 或 -m 选项。"
9960
220c313c 9961#: builtin/tag.c:706
c04f5ac3
JX
9962msgid "too many params"
9963msgstr "太多参数"
9964
220c313c 9965#: builtin/tag.c:712
c04f5ac3
JX
9966#, c-format
9967msgid "'%s' is not a valid tag name."
55a16ee4 9968msgstr "'%s' 不是一个有效的标签名称。"
c04f5ac3 9969
220c313c 9970#: builtin/tag.c:717
c04f5ac3
JX
9971#, c-format
9972msgid "tag '%s' already exists"
55a16ee4 9973msgstr "标签 '%s' 已存在"
c04f5ac3 9974
220c313c 9975#: builtin/tag.c:741
c04f5ac3
JX
9976#, c-format
9977msgid "Updated tag '%s' (was %s)\n"
55a16ee4 9978msgstr "已更新标签 '%s'(曾为 %s)\n"
c04f5ac3 9979
220c313c 9980#: builtin/unpack-objects.c:489
6c94aba5
JX
9981msgid "Unpacking objects"
9982msgstr "展开对象中"
9983
7aea43ff
JX
9984#: builtin/update-index.c:70
9985#, c-format
9986msgid "failed to create directory %s"
9987msgstr "无法创建目录 %s"
9988
9989#: builtin/update-index.c:76
9990#, c-format
9991msgid "failed to stat %s"
9992msgstr "无法枚举 %s 状态"
9993
9994#: builtin/update-index.c:86
9995#, c-format
9996msgid "failed to create file %s"
9997msgstr "无法创建文件 %s"
9998
9999#: builtin/update-index.c:94
10000#, c-format
10001msgid "failed to delete file %s"
10002msgstr "无法删除文件 %s"
10003
10004#: builtin/update-index.c:101 builtin/update-index.c:203
10005#, c-format
10006msgid "failed to delete directory %s"
10007msgstr "无法删除目录 %s"
10008
10009#: builtin/update-index.c:124
10010#, c-format
10011msgid "Testing "
10012msgstr "正在测试 "
10013
10014#: builtin/update-index.c:136
10015msgid "directory stat info does not change after adding a new file"
10016msgstr "添加一个新文件后,目录的状态信息未改变"
10017
10018#: builtin/update-index.c:149
10019msgid "directory stat info does not change after adding a new directory"
10020msgstr "添加一个新目录后,目录的状态信息未改变"
10021
10022#: builtin/update-index.c:162
10023msgid "directory stat info changes after updating a file"
10024msgstr "更新一个文件后,目录的状态信息被修改"
10025
10026#: builtin/update-index.c:173
10027msgid "directory stat info changes after adding a file inside subdirectory"
10028msgstr "在子目录中添加文件后,目录的状态信息被修改"
10029
10030#: builtin/update-index.c:184
10031msgid "directory stat info does not change after deleting a file"
10032msgstr "删除一个文件后,目录的状态信息未改变"
10033
10034#: builtin/update-index.c:197
10035msgid "directory stat info does not change after deleting a directory"
10036msgstr "删除一个目录后,目录的状态信息未改变"
10037
10038#: builtin/update-index.c:204
10039msgid " OK"
10040msgstr " OK"
10041
10042#: builtin/update-index.c:564
814ff314
JX
10043msgid "git update-index [<options>] [--] [<file>...]"
10044msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 10045
7aea43ff 10046#: builtin/update-index.c:918
ef317cd5 10047msgid "continue refresh even when index needs update"
07432cef 10048msgstr "当索引需要更新时继续刷新"
8ada9598 10049
7aea43ff 10050#: builtin/update-index.c:921
ef317cd5 10051msgid "refresh: ignore submodules"
07432cef 10052msgstr "刷新:忽略子模组"
8ada9598 10053
7aea43ff 10054#: builtin/update-index.c:924
ef317cd5 10055msgid "do not ignore new files"
07432cef 10056msgstr "不忽略新的文件"
8ada9598 10057
7aea43ff 10058#: builtin/update-index.c:926
ef317cd5 10059msgid "let files replace directories and vice-versa"
07432cef 10060msgstr "让文件替换目录(反之亦然)"
ef317cd5 10061
7aea43ff 10062#: builtin/update-index.c:928
ef317cd5 10063msgid "notice files missing from worktree"
07432cef 10064msgstr "通知文件从工作区丢失"
ef317cd5 10065
7aea43ff 10066#: builtin/update-index.c:930
ef317cd5 10067msgid "refresh even if index contains unmerged entries"
07432cef 10068msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 10069
7aea43ff 10070#: builtin/update-index.c:933
ef317cd5 10071msgid "refresh stat information"
07432cef 10072msgstr "刷新统计信息"
ef317cd5 10073
7aea43ff 10074#: builtin/update-index.c:937
ef317cd5 10075msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 10076msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 10077
7aea43ff 10078#: builtin/update-index.c:941
6c94aba5 10079msgid "<mode>,<object>,<path>"
d9d56b23 10080msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 10081
7aea43ff 10082#: builtin/update-index.c:942
ef317cd5 10083msgid "add the specified entry to the index"
07432cef 10084msgstr "添加指定的条目到索引区"
ef317cd5 10085
7aea43ff 10086#: builtin/update-index.c:946
ef317cd5 10087msgid "(+/-)x"
07432cef 10088msgstr "(+/-)x"
ef317cd5 10089
7aea43ff 10090#: builtin/update-index.c:947
ef317cd5 10091msgid "override the executable bit of the listed files"
07432cef 10092msgstr "覆盖列表里文件的可执行位"
ef317cd5 10093
7aea43ff 10094#: builtin/update-index.c:951
ef317cd5 10095msgid "mark files as \"not changing\""
07432cef 10096msgstr "把文件标记为 \"没有变更\""
ef317cd5 10097
7aea43ff 10098#: builtin/update-index.c:954
ef317cd5 10099msgid "clear assumed-unchanged bit"
07432cef 10100msgstr "清除 assumed-unchanged 位"
ef317cd5 10101
7aea43ff 10102#: builtin/update-index.c:957
ef317cd5 10103msgid "mark files as \"index-only\""
07432cef 10104msgstr "把文件标记为 \"仅索引\""
ef317cd5 10105
7aea43ff 10106#: builtin/update-index.c:960
ef317cd5 10107msgid "clear skip-worktree bit"
07432cef 10108msgstr "清除 skip-worktree 位"
ef317cd5 10109
7aea43ff 10110#: builtin/update-index.c:963
ef317cd5 10111msgid "add to index only; do not add content to object database"
07432cef 10112msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 10113
7aea43ff 10114#: builtin/update-index.c:965
ef317cd5 10115msgid "remove named paths even if present in worktree"
07432cef 10116msgstr "即使存在工作区里,也删除路径"
ef317cd5 10117
7aea43ff 10118#: builtin/update-index.c:967
ef317cd5 10119msgid "with --stdin: input lines are terminated by null bytes"
07432cef 10120msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 10121
7aea43ff 10122#: builtin/update-index.c:969
ef317cd5 10123msgid "read list of paths to be updated from standard input"
07432cef 10124msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 10125
7aea43ff 10126#: builtin/update-index.c:973
ef317cd5 10127msgid "add entries from standard input to the index"
07432cef 10128msgstr "从标准输入添加条目到索引区"
ef317cd5 10129
7aea43ff 10130#: builtin/update-index.c:977
ef317cd5 10131msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 10132msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 10133
7aea43ff 10134#: builtin/update-index.c:981
ef317cd5 10135msgid "only update entries that differ from HEAD"
07432cef 10136msgstr "只更新与 HEAD 不同的条目"
ef317cd5 10137
7aea43ff 10138#: builtin/update-index.c:985
ef317cd5 10139msgid "ignore files missing from worktree"
07432cef 10140msgstr "忽略工作区丢失的文件"
ef317cd5 10141
7aea43ff 10142#: builtin/update-index.c:988
ef317cd5 10143msgid "report actions to standard output"
07432cef 10144msgstr "在标准输出显示操作"
ef317cd5 10145
7aea43ff 10146#: builtin/update-index.c:990
ef317cd5 10147msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 10148msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 10149
7aea43ff 10150#: builtin/update-index.c:994
ef317cd5 10151msgid "write index in this format"
07432cef 10152msgstr "以这种格式写入索引区"
ef317cd5 10153
7aea43ff 10154#: builtin/update-index.c:996
6acbf033
JX
10155msgid "enable or disable split index"
10156msgstr "启用或禁用索引拆分"
10157
7aea43ff
JX
10158#: builtin/update-index.c:998
10159msgid "enable/disable untracked cache"
10160msgstr "启用/禁用对未跟踪文件的缓存"
10161
10162#: builtin/update-index.c:1000
10163msgid "enable untracked cache without testing the filesystem"
10164msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
10165
90314792 10166#: builtin/update-ref.c:9
814ff314
JX
10167msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10168msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 10169
90314792 10170#: builtin/update-ref.c:10
814ff314
JX
10171msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
10172msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792
JX
10173
10174#: builtin/update-ref.c:11
814ff314
JX
10175msgid "git update-ref [<options>] --stdin [-z]"
10176msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 10177
04cb2f28 10178#: builtin/update-ref.c:359
ef317cd5 10179msgid "delete the reference"
07432cef 10180msgstr "删除引用"
ef317cd5 10181
04cb2f28 10182#: builtin/update-ref.c:361
ef317cd5 10183msgid "update <refname> not the one it points to"
07432cef 10184msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 10185
04cb2f28 10186#: builtin/update-ref.c:362
90314792
JX
10187msgid "stdin has NUL-terminated arguments"
10188msgstr "标准输入有以 NUL 字符终止的参数"
10189
04cb2f28 10190#: builtin/update-ref.c:363
90314792
JX
10191msgid "read updates from stdin"
10192msgstr "从标准输入读取更新"
10193
ef317cd5
JX
10194#: builtin/update-server-info.c:6
10195msgid "git update-server-info [--force]"
07432cef 10196msgstr "git update-server-info [--force]"
ef317cd5
JX
10197
10198#: builtin/update-server-info.c:14
10199msgid "update the info files from scratch"
07432cef 10200msgstr "从头开始更新文件信息"
ef317cd5 10201
6acbf033 10202#: builtin/verify-commit.c:17
814ff314
JX
10203msgid "git verify-commit [-v | --verbose] <commit>..."
10204msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033
JX
10205
10206#: builtin/verify-commit.c:75
10207msgid "print commit contents"
10208msgstr "打印提交内容"
10209
220c313c 10210#: builtin/verify-pack.c:54
814ff314
JX
10211msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10212msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 10213
220c313c 10214#: builtin/verify-pack.c:64
ef317cd5
JX
10215msgid "verbose"
10216msgstr "冗长输出"
10217
220c313c 10218#: builtin/verify-pack.c:66
ef317cd5 10219msgid "show statistics only"
07432cef 10220msgstr "只显示统计"
ef317cd5
JX
10221
10222#: builtin/verify-tag.c:17
814ff314
JX
10223msgid "git verify-tag [-v | --verbose] <tag>..."
10224msgstr "git verify-tag [-v | --verbose] <标签>..."
ef317cd5
JX
10225
10226#: builtin/verify-tag.c:73
10227msgid "print tag contents"
55a16ee4 10228msgstr "打印标签内容"
ef317cd5 10229
5bb01d4f
JX
10230#: builtin/worktree.c:11
10231msgid "git worktree add [<options>] <path> <branch>"
10232msgstr "git worktree add [<选项>] <路径> <分支>"
10233
10234#: builtin/worktree.c:12
10235msgid "git worktree prune [<options>]"
10236msgstr "git worktree prune [<选项>]"
10237
10238#: builtin/worktree.c:27
10239#, c-format
10240msgid "Removing worktrees/%s: not a valid directory"
10241msgstr "删除工作区/%s:不是一个有效的目录"
10242
10243#: builtin/worktree.c:33
10244#, c-format
10245msgid "Removing worktrees/%s: gitdir file does not exist"
10246msgstr "删除 worktrees/%s:gitdir 文件不存在"
10247
10248#: builtin/worktree.c:38
10249#, c-format
10250msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
10251msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
10252
10253#: builtin/worktree.c:49
10254#, c-format
10255msgid "Removing worktrees/%s: invalid gitdir file"
10256msgstr "删除 worktrees/%s:无效的 gitdir 文件"
10257
10258#: builtin/worktree.c:65
10259#, c-format
10260msgid "Removing worktrees/%s: gitdir file points to non-existent location"
10261msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
10262
10263#: builtin/worktree.c:100
10264#, c-format
10265msgid "failed to remove: %s"
10266msgstr "无法删除:%s"
10267
10268#: builtin/worktree.c:186
10269#, c-format
10270msgid "'%s' already exists"
10271msgstr "'%s' 已经存在"
10272
10273#: builtin/worktree.c:207
10274#, c-format
10275msgid "could not create directory of '%s'"
10276msgstr "不能创建目录 '%s'"
10277
10278#: builtin/worktree.c:241
10279msgid "unable to resolve HEAD"
10280msgstr "不能解析 HEAD"
10281
10282#: builtin/worktree.c:249
10283#, c-format
10284msgid "Enter %s (identifier %s)"
10285msgstr "输入 %s (标识符 %s)"
10286
10287#: builtin/worktree.c:281
10288msgid "checkout <branch> even if already checked out in other worktree"
10289msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
10290
10291#: builtin/worktree.c:283
10292msgid "create a new branch"
10293msgstr "创建一个新分支"
10294
10295#: builtin/worktree.c:285
10296msgid "create or reset a branch"
10297msgstr "创建或重置一个分支"
10298
10299#: builtin/worktree.c:286
10300msgid "detach HEAD at named commit"
10301msgstr "HEAD 从指定的提交分离"
10302
10303#: builtin/worktree.c:292
10304msgid "-b and -B are mutually exclusive"
10305msgstr "-b 和 -B 互斥"
10306
ef317cd5
JX
10307#: builtin/write-tree.c:13
10308msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 10309msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5
JX
10310
10311#: builtin/write-tree.c:26
10312msgid "<prefix>/"
07432cef 10313msgstr "<前缀>/"
ef317cd5
JX
10314
10315#: builtin/write-tree.c:27
10316msgid "write tree object for a subdirectory <prefix>"
07432cef 10317msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5
JX
10318
10319#: builtin/write-tree.c:30
10320msgid "only useful for debugging"
07432cef 10321msgstr "只对调试有用"
ef317cd5 10322
220c313c
JX
10323#: credential-cache--daemon.c:267
10324msgid "print debugging messages to stderr"
10325msgstr "调试信息输出到标准错误"
10326
d9d56b23 10327#: git.c:14
4dcdc3d8 10328msgid ""
220c313c 10329"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8
JX
10330"concept guides. See 'git help <command>' or 'git help <concept>'\n"
10331"to read about a specific subcommand or concept."
10332msgstr ""
220c313c
JX
10333"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
10334"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
10335"帮助。"
8ada9598 10336
7aea43ff
JX
10337#: common-cmds.h:10
10338msgid "start a working area (see also: git help tutorial)"
10339msgstr "开始一个工作区(参见:git help tutorial)"
10340
10341#: common-cmds.h:11
10342msgid "work on the current change (see also: git help everyday)"
10343msgstr "在当前变更上工作(参见:git help everyday)"
10344
10345#: common-cmds.h:12
10346msgid "examine the history and state (see also: git help revisions)"
10347msgstr "检查历史和状态(参见:git help revisions)"
10348
10349#: common-cmds.h:13
10350msgid "grow, mark and tweak your common history"
10351msgstr "扩展、标记和调校您的历史记录"
10352
10353#: common-cmds.h:14
10354msgid "collaborate (see also: git help workflows)"
10355msgstr "协同(参见:git help workflows)"
10356
10357#: common-cmds.h:18
8ada9598 10358msgid "Add file contents to the index"
81809b99 10359msgstr "添加文件内容至索引"
8ada9598 10360
7aea43ff 10361#: common-cmds.h:19
8ada9598 10362msgid "Find by binary search the change that introduced a bug"
81809b99 10363msgstr "通过二分查找定位引入 bug 的变更"
8ada9598 10364
7aea43ff 10365#: common-cmds.h:20
8ada9598 10366msgid "List, create, or delete branches"
81809b99 10367msgstr "列出、创建或删除分支"
8ada9598 10368
7aea43ff 10369#: common-cmds.h:21
5bb01d4f
JX
10370msgid "Switch branches or restore working tree files"
10371msgstr "切换分支或恢复工作区文件"
8ada9598 10372
7aea43ff 10373#: common-cmds.h:22
8ada9598 10374msgid "Clone a repository into a new directory"
160fb2b2 10375msgstr "克隆一个仓库到一个新目录"
8ada9598 10376
7aea43ff 10377#: common-cmds.h:23
8ada9598 10378msgid "Record changes to the repository"
160fb2b2 10379msgstr "记录变更到仓库"
8ada9598 10380
7aea43ff 10381#: common-cmds.h:24
8ada9598 10382msgid "Show changes between commits, commit and working tree, etc"
81809b99 10383msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 10384
7aea43ff 10385#: common-cmds.h:25
8ada9598 10386msgid "Download objects and refs from another repository"
160fb2b2 10387msgstr "从另外一个仓库下载对象和引用"
8ada9598 10388
7aea43ff 10389#: common-cmds.h:26
8ada9598 10390msgid "Print lines matching a pattern"
81809b99 10391msgstr "输出和模式匹配的行"
8ada9598 10392
7aea43ff 10393#: common-cmds.h:27
a77c07d9 10394msgid "Create an empty Git repository or reinitialize an existing one"
160fb2b2 10395msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
8ada9598 10396
7aea43ff 10397#: common-cmds.h:28
8ada9598 10398msgid "Show commit logs"
81809b99 10399msgstr "显示提交日志"
8ada9598 10400
7aea43ff 10401#: common-cmds.h:29
8ada9598 10402msgid "Join two or more development histories together"
81809b99 10403msgstr "合并两个或更多开发历史"
8ada9598 10404
7aea43ff 10405#: common-cmds.h:30
8ada9598 10406msgid "Move or rename a file, a directory, or a symlink"
81809b99 10407msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 10408
7aea43ff 10409#: common-cmds.h:31
2e8451e8 10410msgid "Fetch from and integrate with another repository or a local branch"
160fb2b2 10411msgstr "获取并整合另外的仓库或一个本地分支"
8ada9598 10412
7aea43ff 10413#: common-cmds.h:32
8ada9598 10414msgid "Update remote refs along with associated objects"
81809b99 10415msgstr "更新远程引用和相关的对象"
8ada9598 10416
7aea43ff 10417#: common-cmds.h:33
8ada9598 10418msgid "Forward-port local commits to the updated upstream head"
81809b99 10419msgstr "本地提交转移至更新后的上游分支中"
8ada9598 10420
7aea43ff 10421#: common-cmds.h:34
8ada9598 10422msgid "Reset current HEAD to the specified state"
4375c10e 10423msgstr "重置当前 HEAD 到指定状态"
8ada9598 10424
7aea43ff 10425#: common-cmds.h:35
8ada9598 10426msgid "Remove files from the working tree and from the index"
81809b99 10427msgstr "从工作区和索引中删除文件"
8ada9598 10428
7aea43ff 10429#: common-cmds.h:36
8ada9598 10430msgid "Show various types of objects"
81809b99 10431msgstr "显示各种类型的对象"
8ada9598 10432
7aea43ff 10433#: common-cmds.h:37
8ada9598 10434msgid "Show the working tree status"
81809b99 10435msgstr "显示工作区状态"
8ada9598 10436
7aea43ff 10437#: common-cmds.h:38
8ada9598 10438msgid "Create, list, delete or verify a tag object signed with GPG"
4375c10e 10439msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
8ada9598 10440
7aea43ff 10441#: parse-options.h:142
220c313c
JX
10442msgid "expiry-date"
10443msgstr "到期时间"
10444
7aea43ff 10445#: parse-options.h:157
220c313c
JX
10446msgid "no-op (backward compatibility)"
10447msgstr "空操作(向后兼容)"
10448
7aea43ff 10449#: parse-options.h:231
220c313c
JX
10450msgid "be more verbose"
10451msgstr "更加详细"
10452
7aea43ff 10453#: parse-options.h:233
220c313c
JX
10454msgid "be more quiet"
10455msgstr "更加安静"
10456
7aea43ff 10457#: parse-options.h:239
220c313c
JX
10458msgid "use <n> digits to display SHA-1s"
10459msgstr "用 <n> 位数字显示 SHA-1 哈希值"
10460
10461#: rerere.h:27
10462msgid "update the index with reused conflict resolution if possible"
10463msgstr "如果可能,重用冲突解决更新索引"
10464
04cb2f28 10465#: git-am.sh:53
c04f5ac3
JX
10466msgid "You need to set your committer info first"
10467msgstr "您需要先设置你的提交者信息"
10468
7aea43ff 10469#: git-am.sh:100
b694fbb1
JX
10470msgid ""
10471"You seem to have moved HEAD since the last 'am' failure.\n"
10472"Not rewinding to ORIG_HEAD"
6792b93b 10473msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
b694fbb1 10474
7aea43ff 10475#: git-am.sh:110
b694fbb1
JX
10476#, sh-format
10477msgid ""
2e8451e8 10478"When you have resolved this problem, run \"$cmdline --continue\".\n"
649900bc
JX
10479"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
10480"To restore the original branch and stop patching, run \"$cmdline --abort\"."
b694fbb1 10481msgstr ""
2e8451e8 10482"当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
b694fbb1
JX
10483"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
10484"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10485
7aea43ff 10486#: git-am.sh:126
b694fbb1 10487msgid "Cannot fall back to three-way merge."
160fb2b2 10488msgstr "无法求助于三方合并。"
b694fbb1 10489
7aea43ff 10490#: git-am.sh:142
c04f5ac3 10491msgid "Repository lacks necessary blobs to fall back on 3-way merge."
160fb2b2 10492msgstr "仓库缺乏必要的数据对象以进行三方合并。"
649900bc 10493
7aea43ff 10494#: git-am.sh:144
649900bc 10495msgid "Using index info to reconstruct a base tree..."
160fb2b2 10496msgstr "使用索引来重建一个(三方合并的)基础目录树..."
c04f5ac3 10497
7aea43ff 10498#: git-am.sh:159
c04f5ac3
JX
10499msgid ""
10500"Did you hand edit your patch?\n"
10501"It does not apply to blobs recorded in its index."
10502msgstr ""
10503"您是否曾手动编辑过您的补丁?\n"
160fb2b2 10504"无法应用补丁到索引中的数据对象上。"
c04f5ac3 10505
7aea43ff 10506#: git-am.sh:168
c04f5ac3 10507msgid "Falling back to patching base and 3-way merge..."
160fb2b2 10508msgstr "转而在基础版本上打补丁及进行三方合并..."
c04f5ac3 10509
7aea43ff 10510#: git-am.sh:185
649900bc
JX
10511msgid "Failed to merge in the changes."
10512msgstr "无法合并变更。"
10513
7aea43ff 10514#: git-am.sh:280
c04f5ac3
JX
10515msgid "Only one StGIT patch series can be applied at once"
10516msgstr "一次只能有一个 StGIT 补丁队列被应用"
10517
7aea43ff 10518#: git-am.sh:367
c04f5ac3
JX
10519#, sh-format
10520msgid "Patch format $patch_format is not supported."
10521msgstr "不支持 $patch_format 补丁格式。"
10522
7aea43ff 10523#: git-am.sh:369
c04f5ac3
JX
10524msgid "Patch format detection failed."
10525msgstr "补丁格式检测失败。"
10526
7aea43ff 10527#: git-am.sh:407
649900bc
JX
10528msgid ""
10529"The -b/--binary option has been a no-op for long time, and\n"
10530"it will be removed. Please do not use it anymore."
10531msgstr ""
10532"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
10533"请不要再使用它了。"
c04f5ac3 10534
7aea43ff 10535#: git-am.sh:507
c04f5ac3
JX
10536#, sh-format
10537msgid "previous rebase directory $dotest still exists but mbox given."
2e8451e8 10538msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
c04f5ac3 10539
7aea43ff 10540#: git-am.sh:512
c04f5ac3
JX
10541msgid "Please make up your mind. --skip or --abort?"
10542msgstr "请下决心。--skip 或是 --abort ?"
10543
7aea43ff 10544#: git-am.sh:560
2e8451e8
JX
10545#, sh-format
10546msgid ""
10547"Stray $dotest directory found.\n"
10548"Use \"git am --abort\" to remove it."
10549msgstr ""
10550"发现了错误的 $dotest 目录。\n"
10551"使用 \"git am --abort\" 删除它。"
10552
7aea43ff 10553#: git-am.sh:568
c04f5ac3
JX
10554msgid "Resolve operation not in progress, we are not resuming."
10555msgstr "解决操作未进行,我们不会继续。"
10556
7aea43ff 10557#: git-am.sh:635
c04f5ac3
JX
10558#, sh-format
10559msgid "Dirty index: cannot apply patches (dirty: $files)"
160fb2b2 10560msgstr "脏索引:不能应用补丁(脏文件:$files)"
c04f5ac3 10561
7aea43ff 10562#: git-am.sh:747
b694fbb1
JX
10563#, sh-format
10564msgid ""
10565"Patch is empty. Was it split wrong?\n"
10566"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
10567"To restore the original branch and stop patching run \"$cmdline --abort\"."
10568msgstr ""
10569"补丁为空。是不是切分错误?\n"
10570"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
10571"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10572
7aea43ff 10573#: git-am.sh:774
b694fbb1
JX
10574msgid "Patch does not have a valid e-mail address."
10575msgstr "补丁中没有一个有效的邮件地址。"
10576
7aea43ff 10577#: git-am.sh:821
c04f5ac3 10578msgid "cannot be interactive without stdin connected to a terminal."
90e6ef53 10579msgstr "标准输入没有和终端关联,不能进行交互式操作。"
c04f5ac3 10580
7aea43ff 10581#: git-am.sh:825
b694fbb1
JX
10582msgid "Commit Body is:"
10583msgstr "提交内容为:"
10584
90e6ef53 10585# 译者:注意保持句尾空格
c04f5ac3
JX
10586#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
10587#. in your translation. The program will only accept English
10588#. input at this point.
7aea43ff 10589#: git-am.sh:832
c04f5ac3
JX
10590msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10591msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10592
7aea43ff 10593#: git-am.sh:868
c04f5ac3
JX
10594#, sh-format
10595msgid "Applying: $FIRSTLINE"
10596msgstr "正应用:$FIRSTLINE"
10597
7aea43ff 10598#: git-am.sh:889
b694fbb1
JX
10599msgid ""
10600"No changes - did you forget to use 'git add'?\n"
10601"If there is nothing left to stage, chances are that something else\n"
10602"already introduced the same changes; you might want to skip this patch."
10603msgstr ""
10604"没有变更 —— 您是不是忘了执行 'git add'?\n"
10605"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
10606"您也许想要跳过这个补丁。"
10607
7aea43ff 10608#: git-am.sh:897
b694fbb1
JX
10609msgid ""
10610"You still have unmerged paths in your index\n"
10611"did you forget to use 'git add'?"
6792b93b 10612msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
b694fbb1 10613
7aea43ff 10614#: git-am.sh:913
c04f5ac3 10615msgid "No changes -- Patch already applied."
63af42fe 10616msgstr "没有变更 —— 补丁已经应用过。"
c04f5ac3 10617
7aea43ff 10618#: git-am.sh:923
b694fbb1
JX
10619#, sh-format
10620msgid "Patch failed at $msgnum $FIRSTLINE"
10621msgstr "补丁失败于 $msgnum $FIRSTLINE"
10622
7aea43ff 10623#: git-am.sh:926
ef317cd5
JX
10624#, sh-format
10625msgid ""
10626"The copy of the patch that failed is found in:\n"
10627" $dotest/patch"
10628msgstr ""
07432cef
WS
10629"失败的补丁文件副本位于:\n"
10630" $dotest/patch"
ef317cd5 10631
7aea43ff 10632#: git-am.sh:945
c04f5ac3
JX
10633msgid "applying to an empty history"
10634msgstr "正应用到一个空历史上"
10635
b694fbb1
JX
10636#: git-bisect.sh:48
10637msgid "You need to start by \"git bisect start\""
10638msgstr "您需要执行 \"git bisect start\" 来开始"
10639
90e6ef53 10640# 译者:注意保持句尾空格
c04f5ac3
JX
10641#. TRANSLATORS: Make sure to include [Y] and [n] in your
10642#. translation. The program will only accept English input
10643#. at this point.
10644#: git-bisect.sh:54
10645msgid "Do you want me to do it for you [Y/n]? "
10646msgstr "您想让我为您这样做么[Y/n]? "
10647
10648#: git-bisect.sh:95
10649#, sh-format
10650msgid "unrecognised option: '$arg'"
81809b99 10651msgstr "未能识别的选项:'$arg'"
c04f5ac3
JX
10652
10653#: git-bisect.sh:99
10654#, sh-format
10655msgid "'$arg' does not appear to be a valid revision"
10656msgstr "'$arg' 看起来不像是一个有效的版本"
10657
10658#: git-bisect.sh:117
10659msgid "Bad HEAD - I need a HEAD"
10660msgstr "坏的 HEAD - 我需要一个 HEAD"
10661
10662#: git-bisect.sh:130
10663#, sh-format
10664msgid ""
814ff314 10665"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
d9d56b23 10666msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
c04f5ac3
JX
10667
10668#: git-bisect.sh:140
cfff71a9
JX
10669msgid "won't bisect on cg-seek'ed tree"
10670msgstr "不会在做了 cg-seek 的树上做二分查找"
c04f5ac3
JX
10671
10672#: git-bisect.sh:144
10673msgid "Bad HEAD - strange symbolic ref"
90e6ef53 10674msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3
JX
10675
10676#: git-bisect.sh:189
10677#, sh-format
10678msgid "Bad bisect_write argument: $state"
90e6ef53 10679msgstr "坏的 bisect_write 参数:$state"
c04f5ac3
JX
10680
10681#: git-bisect.sh:218
10682#, sh-format
10683msgid "Bad rev input: $arg"
90e6ef53 10684msgstr "输入坏的版本:$arg"
c04f5ac3
JX
10685
10686#: git-bisect.sh:232
10687msgid "Please call 'bisect_state' with at least one argument."
10688msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
10689
10690#: git-bisect.sh:244
10691#, sh-format
10692msgid "Bad rev input: $rev"
10693msgstr "输入坏的版本:$rev"
10694
04cb2f28 10695#: git-bisect.sh:253
c04f5ac3
JX
10696msgid "'git bisect bad' can take only one argument."
10697msgstr "'git bisect bad' 只能带一个参数。"
10698
04cb2f28 10699#: git-bisect.sh:276
b694fbb1
JX
10700msgid "Warning: bisecting only with a bad commit."
10701msgstr "警告:在仅有一个坏提交下进行二分查找。"
10702
90e6ef53 10703# 译者:注意保持句尾空格
c04f5ac3
JX
10704#. TRANSLATORS: Make sure to include [Y] and [n] in your
10705#. translation. The program will only accept English input
10706#. at this point.
04cb2f28 10707#: git-bisect.sh:282
c04f5ac3
JX
10708msgid "Are you sure [Y/n]? "
10709msgstr "您确认么[Y/n]? "
10710
04cb2f28 10711#: git-bisect.sh:292
b694fbb1 10712msgid ""
220c313c 10713"You need to give me at least one good and one bad revision.\n"
b694fbb1
JX
10714"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10715msgstr ""
10716"您需要给我至少一个好版本和一个坏版本。\n"
220c313c 10717"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
b694fbb1 10718
04cb2f28 10719#: git-bisect.sh:295
b694fbb1
JX
10720msgid ""
10721"You need to start by \"git bisect start\".\n"
220c313c 10722"You then need to give me at least one good and one bad revision.\n"
b694fbb1
JX
10723"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10724msgstr ""
10725"您需要执行 \"git bisect start\" 来开始。\n"
10726"然后需要提供我至少一个好版本和一个坏版本。\n"
220c313c 10727"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
b694fbb1 10728
04cb2f28 10729#: git-bisect.sh:366 git-bisect.sh:493
b694fbb1
JX
10730msgid "We are not bisecting."
10731msgstr "我们没有在二分查找。"
10732
04cb2f28 10733#: git-bisect.sh:373
c04f5ac3
JX
10734#, sh-format
10735msgid "'$invalid' is not a valid commit"
10736msgstr "'$invalid' 不是一个有效的提交"
10737
04cb2f28 10738#: git-bisect.sh:382
c04f5ac3
JX
10739#, sh-format
10740msgid ""
10741"Could not check out original HEAD '$branch'.\n"
10742"Try 'git bisect reset <commit>'."
10743msgstr ""
10744"不能检出原始 HEAD '$branch'。\n"
07432cef 10745"尝试 'git bisect reset <提交>'。"
c04f5ac3 10746
04cb2f28 10747#: git-bisect.sh:409
c04f5ac3
JX
10748msgid "No logfile given"
10749msgstr "未提供日志文件"
10750
04cb2f28 10751#: git-bisect.sh:410
c04f5ac3
JX
10752#, sh-format
10753msgid "cannot read $file for replaying"
10754msgstr "不能读取 $file 来重放"
10755
04cb2f28 10756#: git-bisect.sh:427
c04f5ac3
JX
10757msgid "?? what are you talking about?"
10758msgstr "?? 您在说什么?"
10759
04cb2f28 10760#: git-bisect.sh:439
b694fbb1
JX
10761#, sh-format
10762msgid "running $command"
10763msgstr "运行 $command"
10764
04cb2f28 10765#: git-bisect.sh:446
b694fbb1
JX
10766#, sh-format
10767msgid ""
10768"bisect run failed:\n"
10769"exit code $res from '$command' is < 0 or >= 128"
10770msgstr ""
10771"二分查找运行失败:\n"
07432cef 10772"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 10773
04cb2f28 10774#: git-bisect.sh:472
b694fbb1
JX
10775msgid "bisect run cannot continue any more"
10776msgstr "二分查找不能继续运行"
10777
04cb2f28 10778#: git-bisect.sh:478
b694fbb1
JX
10779#, sh-format
10780msgid ""
10781"bisect run failed:\n"
10782"'bisect_state $state' exited with error code $res"
10783msgstr ""
10784"二分查找运行失败:\n"
10785"'bisect_state $state' 退出码为 $res"
10786
04cb2f28 10787#: git-bisect.sh:485
b694fbb1
JX
10788msgid "bisect run success"
10789msgstr "二分查找运行成功"
c04f5ac3 10790
7aea43ff 10791#: git-pull.sh:61
c04f5ac3
JX
10792msgid ""
10793"Pull is not possible because you have unmerged files.\n"
10794"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 10795"as appropriate to mark resolution and make a commit."
c04f5ac3 10796msgstr ""
90e6ef53 10797"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
d9d56b23 10798"然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
c04f5ac3 10799
7aea43ff 10800#: git-pull.sh:65
c04f5ac3 10801msgid "Pull is not possible because you have unmerged files."
90e6ef53 10802msgstr "Pull 不可用,因为您尚有未合并的文件。"
c04f5ac3 10803
7aea43ff 10804#: git-pull.sh:71
220c313c
JX
10805msgid ""
10806"You have not concluded your merge (MERGE_HEAD exists).\n"
10807"Please, commit your changes before you can merge."
10808msgstr ""
10809"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10810"请在合并前先提交您的修改。"
10811
7aea43ff 10812#: git-pull.sh:285
c04f5ac3 10813msgid "updating an unborn branch with changes added to the index"
90e6ef53 10814msgstr "更新尚未诞生的分支,变更添加至索引"
c04f5ac3 10815
7aea43ff 10816#: git-pull.sh:311
b694fbb1
JX
10817#, sh-format
10818msgid ""
10819"Warning: fetch updated the current branch head.\n"
10820"Warning: fast-forwarding your working tree from\n"
10821"Warning: commit $orig_head."
10822msgstr ""
10823"警告:fetch 更新了当前的分支。您的工作区\n"
10824"警告:从原提交 $orig_head 快进。"
10825
7aea43ff 10826#: git-pull.sh:336
c04f5ac3
JX
10827msgid "Cannot merge multiple branches into empty head"
10828msgstr "无法将多个分支合并到空分支"
10829
7aea43ff 10830#: git-pull.sh:340
c04f5ac3
JX
10831msgid "Cannot rebase onto multiple branches"
10832msgstr "无法变基到多个分支"
10833
6c94aba5 10834#: git-rebase.sh:57
649900bc
JX
10835msgid ""
10836"When you have resolved this problem, run \"git rebase --continue\".\n"
10837"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10838"To check out the original branch and stop rebasing, run \"git rebase --abort"
10839"\"."
10840msgstr ""
10841"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10842"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10843"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10844
6acbf033 10845#: git-rebase.sh:165
2e8451e8
JX
10846msgid "Applied autostash."
10847msgstr "成功应用 autostash。"
10848
6acbf033 10849#: git-rebase.sh:168
2e8451e8
JX
10850#, sh-format
10851msgid "Cannot store $stash_sha1"
10852msgstr "无法保存 $stash_sha1"
10853
6acbf033 10854#: git-rebase.sh:169
2e8451e8
JX
10855msgid ""
10856"Applying autostash resulted in conflicts.\n"
10857"Your changes are safe in the stash.\n"
b1894384 10858"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
2e8451e8
JX
10859msgstr ""
10860"应用 autostash 导致冲突。\n"
10861"您的修改安全地保存在 stash 中。\n"
10862"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10863
6acbf033 10864#: git-rebase.sh:208
649900bc 10865msgid "The pre-rebase hook refused to rebase."
98b2761d 10866msgstr "钩子 pre-rebase 拒绝变基操作。"
649900bc 10867
6acbf033 10868#: git-rebase.sh:213
649900bc
JX
10869msgid "It looks like git-am is in progress. Cannot rebase."
10870msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10871
6acbf033 10872#: git-rebase.sh:351
649900bc
JX
10873msgid "The --exec option must be used with the --interactive option"
10874msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10875
6acbf033 10876#: git-rebase.sh:356
649900bc
JX
10877msgid "No rebase in progress?"
10878msgstr "没有正在进行的变基?"
10879
6acbf033 10880#: git-rebase.sh:367
07432cef
WS
10881msgid "The --edit-todo action can only be used during interactive rebase."
10882msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10883
6acbf033 10884#: git-rebase.sh:374
649900bc
JX
10885msgid "Cannot read HEAD"
10886msgstr "不能读取 HEAD"
10887
6acbf033 10888#: git-rebase.sh:377
649900bc
JX
10889msgid ""
10890"You must edit all merge conflicts and then\n"
10891"mark them as resolved using git add"
10892msgstr ""
10893"您必须编辑所有的合并冲突,然后通过 git add\n"
10894"命令将它们标记为已解决"
10895
6acbf033 10896#: git-rebase.sh:395
649900bc
JX
10897#, sh-format
10898msgid "Could not move back to $head_name"
10899msgstr "无法移回 $head_name"
10900
6acbf033 10901#: git-rebase.sh:414
649900bc
JX
10902#, sh-format
10903msgid ""
10904"It seems that there is already a $state_dir_base directory, and\n"
10905"I wonder if you are in the middle of another rebase. If that is the\n"
10906"case, please try\n"
10907"\t$cmd_live_rebase\n"
10908"If that is not the case, please\n"
10909"\t$cmd_clear_stale_rebase\n"
10910"and run me again. I am stopping in case you still have something\n"
10911"valuable there."
10912msgstr ""
98b2761d
JX
10913"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10914"过程中。 如果是这样,请执行\n"
649900bc
JX
10915"\t$cmd_live_rebase\n"
10916"如果不是这样,请执行\n"
10917"\t$cmd_clear_stale_rebase\n"
98b2761d 10918"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
649900bc 10919
6acbf033 10920#: git-rebase.sh:465
649900bc
JX
10921#, sh-format
10922msgid "invalid upstream $upstream_name"
10923msgstr "无效的上游 $upstream_name"
10924
6acbf033 10925#: git-rebase.sh:489
649900bc
JX
10926#, sh-format
10927msgid "$onto_name: there are more than one merge bases"
10928msgstr "$onto_name: 有一个以上的合并基准"
10929
6acbf033 10930#: git-rebase.sh:492 git-rebase.sh:496
649900bc
JX
10931#, sh-format
10932msgid "$onto_name: there is no merge base"
10933msgstr "$onto_name: 没有合并基准"
10934
6acbf033 10935#: git-rebase.sh:501
649900bc
JX
10936#, sh-format
10937msgid "Does not point to a valid commit: $onto_name"
10938msgstr "没有指向一个有效的提交:$onto_name"
10939
6acbf033 10940#: git-rebase.sh:524
649900bc
JX
10941#, sh-format
10942msgid "fatal: no such branch: $branch_name"
10943msgstr "严重错误:无此分支:$branch_name"
10944
6acbf033 10945#: git-rebase.sh:557
2e8451e8
JX
10946msgid "Cannot autostash"
10947msgstr "无法 autostash"
10948
6acbf033 10949#: git-rebase.sh:562
2e8451e8
JX
10950#, sh-format
10951msgid "Created autostash: $stash_abbrev"
10952msgstr "创建了 autostash: $stash_abbrev"
10953
6acbf033 10954#: git-rebase.sh:566
649900bc
JX
10955msgid "Please commit or stash them."
10956msgstr "请提交或为它们保存进度。"
10957
6acbf033 10958#: git-rebase.sh:586
649900bc
JX
10959#, sh-format
10960msgid "Current branch $branch_name is up to date."
10961msgstr "当前分支 $branch_name 是最新的。"
10962
6acbf033 10963#: git-rebase.sh:590
649900bc
JX
10964#, sh-format
10965msgid "Current branch $branch_name is up to date, rebase forced."
10966msgstr "当前分支 $branch_name 是最新的,强制变基。"
10967
6acbf033 10968#: git-rebase.sh:601
649900bc
JX
10969#, sh-format
10970msgid "Changes from $mb to $onto:"
10971msgstr "变更从 $mb 到 $onto:"
10972
6acbf033 10973#: git-rebase.sh:610
649900bc 10974msgid "First, rewinding head to replay your work on top of it..."
160fb2b2 10975msgstr "首先,回退分支以便在上面重放您的工作..."
649900bc 10976
6acbf033 10977#: git-rebase.sh:620
649900bc
JX
10978#, sh-format
10979msgid "Fast-forwarded $branch_name to $onto_name."
10980msgstr "快进 $branch_name 至 $onto_name。"
10981
c04f5ac3
JX
10982#: git-stash.sh:51
10983msgid "git stash clear with parameters is unimplemented"
10984msgstr "git stash clear 不支持参数"
10985
10986#: git-stash.sh:74
10987msgid "You do not have the initial commit yet"
10988msgstr "您尚未建立初始提交"
10989
10990#: git-stash.sh:89
10991msgid "Cannot save the current index state"
90e6ef53 10992msgstr "无法保存当前索引状态"
c04f5ac3 10993
6acbf033 10994#: git-stash.sh:124 git-stash.sh:137
c04f5ac3
JX
10995msgid "Cannot save the current worktree state"
10996msgstr "无法保存当前工作区状态"
10997
6acbf033 10998#: git-stash.sh:141
c04f5ac3 10999msgid "No changes selected"
90e6ef53 11000msgstr "没有选择变更"
c04f5ac3 11001
6acbf033 11002#: git-stash.sh:144
c04f5ac3 11003msgid "Cannot remove temporary index (can't happen)"
90e6ef53 11004msgstr "无法删除临时索引(不应发生)"
c04f5ac3 11005
6acbf033 11006#: git-stash.sh:157
c04f5ac3
JX
11007msgid "Cannot record working tree state"
11008msgstr "不能记录工作区状态"
11009
6acbf033 11010#: git-stash.sh:191
2e8451e8
JX
11011#, sh-format
11012msgid "Cannot update $ref_stash with $w_commit"
11013msgstr "无法用 $w_commit 更新 $ref_stash"
11014
b694fbb1
JX
11015#. TRANSLATORS: $option is an invalid option, like
11016#. `--blah-blah'. The 7 spaces at the beginning of the
11017#. second line correspond to "error: ". So you should line
11018#. up the second line with however many characters the
11019#. translation of "error: " takes in your language. E.g. in
11020#. English this is:
11021#.
11022#. $ git stash save --blah-blah 2>&1 | head -n 2
11023#. error: unknown option for 'stash save': --blah-blah
11024#. To provide a message, use git stash save -- '--blah-blah'
7aea43ff 11025#: git-stash.sh:241
b694fbb1
JX
11026#, sh-format
11027msgid ""
11028"error: unknown option for 'stash save': $option\n"
11029" To provide a message, use git stash save -- '$option'"
11030msgstr ""
11031"错误:'stash save' 的未知选项:$option\n"
11032" 要提供一个描述信息,使用 git stash save -- '$option'"
11033
7aea43ff 11034#: git-stash.sh:262
c04f5ac3
JX
11035msgid "No local changes to save"
11036msgstr "没有要保存的本地修改"
11037
7aea43ff 11038#: git-stash.sh:266
c04f5ac3 11039msgid "Cannot initialize stash"
90e6ef53 11040msgstr "无法初始化 stash"
c04f5ac3 11041
7aea43ff 11042#: git-stash.sh:270
c04f5ac3
JX
11043msgid "Cannot save the current status"
11044msgstr "无法保存当前状态"
11045
7aea43ff 11046#: git-stash.sh:288
c04f5ac3
JX
11047msgid "Cannot remove worktree changes"
11048msgstr "无法删除工作区变更"
11049
7aea43ff
JX
11050#: git-stash.sh:389
11051#, sh-format
11052msgid "unknown option: $opt"
11053msgstr "未知选项: $opt"
11054
11055#: git-stash.sh:399
c04f5ac3 11056msgid "No stash found."
90e6ef53 11057msgstr "未发现 stash。"
c04f5ac3 11058
7aea43ff 11059#: git-stash.sh:406
c04f5ac3
JX
11060#, sh-format
11061msgid "Too many revisions specified: $REV"
90e6ef53 11062msgstr "指定了太多的版本:$REV"
c04f5ac3 11063
7aea43ff 11064#: git-stash.sh:412
c04f5ac3 11065#, sh-format
220c313c
JX
11066msgid "$reference is not a valid reference"
11067msgstr "$reference 不是一个有效的引用"
c04f5ac3 11068
7aea43ff 11069#: git-stash.sh:440
c04f5ac3
JX
11070#, sh-format
11071msgid "'$args' is not a stash-like commit"
90e6ef53 11072msgstr "'$args' 不是 stash 样提交"
c04f5ac3 11073
7aea43ff 11074#: git-stash.sh:451
c04f5ac3
JX
11075#, sh-format
11076msgid "'$args' is not a stash reference"
90e6ef53 11077msgstr "'$args' 不是一个 stash 引用"
c04f5ac3 11078
7aea43ff 11079#: git-stash.sh:459
c04f5ac3 11080msgid "unable to refresh index"
90e6ef53 11081msgstr "无法刷新索引"
c04f5ac3 11082
7aea43ff 11083#: git-stash.sh:463
c04f5ac3
JX
11084msgid "Cannot apply a stash in the middle of a merge"
11085msgstr "无法在合并过程中恢复进度"
11086
7aea43ff 11087#: git-stash.sh:471
c04f5ac3 11088msgid "Conflicts in index. Try without --index."
90e6ef53 11089msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 11090
7aea43ff 11091#: git-stash.sh:473
c04f5ac3 11092msgid "Could not save index tree"
90e6ef53 11093msgstr "不能保存索引树"
c04f5ac3 11094
7aea43ff 11095#: git-stash.sh:507
c04f5ac3 11096msgid "Cannot unstage modified files"
160fb2b2 11097msgstr "无法将修改的文件取消暂存"
c04f5ac3 11098
7aea43ff 11099#: git-stash.sh:522
b694fbb1
JX
11100msgid "Index was not unstashed."
11101msgstr "索引的进度没有被恢复。"
11102
7aea43ff 11103#: git-stash.sh:545
c04f5ac3
JX
11104#, sh-format
11105msgid "Dropped ${REV} ($s)"
11106msgstr "丢弃了 ${REV} ($s)"
11107
7aea43ff 11108#: git-stash.sh:546
c04f5ac3
JX
11109#, sh-format
11110msgid "${REV}: Could not drop stash entry"
90e6ef53 11111msgstr "${REV}:不能丢弃进度条目"
c04f5ac3 11112
7aea43ff 11113#: git-stash.sh:554
c04f5ac3
JX
11114msgid "No branch name specified"
11115msgstr "未指定分支名"
11116
7aea43ff 11117#: git-stash.sh:626
c04f5ac3
JX
11118msgid "(To restore them type \"git stash apply\")"
11119msgstr "(为恢复数据输入 \"git stash apply\")"
11120
2e8451e8 11121#: git-submodule.sh:95
c04f5ac3
JX
11122#, sh-format
11123msgid "cannot strip one component off url '$remoteurl'"
11124msgstr "无法从 url '$remoteurl' 剥离一个组件"
11125
2e8451e8 11126#: git-submodule.sh:237
c04f5ac3 11127#, sh-format
170e9899
JX
11128msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
11129msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
c04f5ac3 11130
6c94aba5 11131#: git-submodule.sh:287
c04f5ac3 11132#, sh-format
170e9899
JX
11133msgid "Clone of '$url' into submodule path '$sm_path' failed"
11134msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
c04f5ac3 11135
6acbf033 11136#: git-submodule.sh:296
dac1de7d
JX
11137#, sh-format
11138msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
07432cef 11139msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
dac1de7d 11140
6acbf033 11141#: git-submodule.sh:406
2e8451e8
JX
11142msgid "Relative path can only be used from the toplevel of the working tree"
11143msgstr "只能在工作区的顶级目录中使用相对路径"
11144
6acbf033 11145#: git-submodule.sh:416
c04f5ac3
JX
11146#, sh-format
11147msgid "repo URL: '$repo' must be absolute or begin with ./|../"
4375c10e 11148msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
c04f5ac3 11149
6acbf033 11150#: git-submodule.sh:433
c04f5ac3 11151#, sh-format
170e9899
JX
11152msgid "'$sm_path' already exists in the index"
11153msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 11154
6acbf033 11155#: git-submodule.sh:437
b694fbb1
JX
11156#, sh-format
11157msgid ""
11158"The following path is ignored by one of your .gitignore files:\n"
11159"$sm_path\n"
11160"Use -f if you really want to add it."
11161msgstr ""
11162"以下路径被您的一个 .gitignore 文件所忽略:\n"
11163"$sm_path\n"
11164"如果您确实想添加它,使用 -f 参数。"
11165
6acbf033 11166#: git-submodule.sh:455
b694fbb1
JX
11167#, sh-format
11168msgid "Adding existing repo at '$sm_path' to the index"
160fb2b2 11169msgstr "添加位于 '$sm_path' 的现存仓库到索引"
b694fbb1 11170
6acbf033 11171#: git-submodule.sh:457
c04f5ac3 11172#, sh-format
170e9899 11173msgid "'$sm_path' already exists and is not a valid git repo"
160fb2b2 11174msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
c04f5ac3 11175
6acbf033 11176#: git-submodule.sh:465
07432cef
WS
11177#, sh-format
11178msgid "A git directory for '$sm_name' is found locally with remote(s):"
160fb2b2 11179msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
07432cef 11180
6acbf033 11181#: git-submodule.sh:467
07432cef
WS
11182#, sh-format
11183msgid ""
11184"If you want to reuse this local git directory instead of cloning again from"
11185msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11186
6acbf033 11187#: git-submodule.sh:469
07432cef
WS
11188#, sh-format
11189msgid ""
11190"use the '--force' option. If the local git directory is not the correct repo"
160fb2b2 11191msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
07432cef 11192
6acbf033 11193#: git-submodule.sh:470
07432cef
WS
11194#, sh-format
11195msgid ""
11196"or you are unsure what this means choose another name with the '--name' "
11197"option."
11198msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11199
6acbf033 11200#: git-submodule.sh:472
07432cef
WS
11201#, sh-format
11202msgid "Reactivating local git directory for submodule '$sm_name'."
11203msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11204
6acbf033 11205#: git-submodule.sh:484
c04f5ac3 11206#, sh-format
170e9899
JX
11207msgid "Unable to checkout submodule '$sm_path'"
11208msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 11209
6acbf033 11210#: git-submodule.sh:489
c04f5ac3 11211#, sh-format
170e9899
JX
11212msgid "Failed to add submodule '$sm_path'"
11213msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 11214
6acbf033 11215#: git-submodule.sh:498
c04f5ac3 11216#, sh-format
170e9899
JX
11217msgid "Failed to register submodule '$sm_path'"
11218msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 11219
6acbf033 11220#: git-submodule.sh:542
c04f5ac3 11221#, sh-format
2e8451e8
JX
11222msgid "Entering '$prefix$displaypath'"
11223msgstr "正在进入 '$prefix$displaypath'"
c04f5ac3 11224
6acbf033 11225#: git-submodule.sh:562
c04f5ac3 11226#, sh-format
2e8451e8
JX
11227msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11228msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
c04f5ac3 11229
6acbf033 11230#: git-submodule.sh:608
c04f5ac3 11231#, sh-format
2e8451e8
JX
11232msgid "No url found for submodule path '$displaypath' in .gitmodules"
11233msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
c04f5ac3 11234
6acbf033 11235#: git-submodule.sh:617
c04f5ac3 11236#, sh-format
2e8451e8
JX
11237msgid "Failed to register url for submodule path '$displaypath'"
11238msgstr "无法为子模组路径 '$displaypath' 注册 url"
c04f5ac3 11239
6acbf033 11240#: git-submodule.sh:619
c04f5ac3 11241#, sh-format
2e8451e8
JX
11242msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11243msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
c04f5ac3 11244
6acbf033 11245#: git-submodule.sh:636
d691f479 11246#, sh-format
2e8451e8
JX
11247msgid "Failed to register update mode for submodule path '$displaypath'"
11248msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
d691f479 11249
6acbf033 11250#: git-submodule.sh:674
1003b3a5
JX
11251#, sh-format
11252msgid "Use '.' if you really want to deinitialize all submodules"
11253msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
11254
6acbf033 11255#: git-submodule.sh:691
1003b3a5 11256#, sh-format
2e8451e8
JX
11257msgid "Submodule work tree '$displaypath' contains a .git directory"
11258msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
1003b3a5 11259
6acbf033 11260#: git-submodule.sh:692
1003b3a5
JX
11261#, sh-format
11262msgid ""
11263"(use 'rm -rf' if you really want to remove it including all of its history)"
11264msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11265
6acbf033 11266#: git-submodule.sh:698
c04f5ac3
JX
11267#, sh-format
11268msgid ""
2e8451e8 11269"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
1003b3a5 11270"discard them"
2e8451e8 11271msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
1003b3a5 11272
6acbf033 11273#: git-submodule.sh:701
1003b3a5 11274#, sh-format
2e8451e8
JX
11275msgid "Cleared directory '$displaypath'"
11276msgstr "已清除目录 '$displaypath'"
1003b3a5 11277
6acbf033 11278#: git-submodule.sh:702
1003b3a5 11279#, sh-format
2e8451e8
JX
11280msgid "Could not remove submodule work tree '$displaypath'"
11281msgstr "无法移除子模组工作区 '$displaypath'"
1003b3a5 11282
6acbf033 11283#: git-submodule.sh:705
1003b3a5 11284#, sh-format
2e8451e8
JX
11285msgid "Could not create empty submodule directory '$displaypath'"
11286msgstr "不能创建空的子模组目录 '$displaypath'"
1003b3a5 11287
6acbf033 11288#: git-submodule.sh:714
1003b3a5 11289#, sh-format
2e8451e8
JX
11290msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11291msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
1003b3a5 11292
6acbf033 11293#: git-submodule.sh:830
1003b3a5
JX
11294#, sh-format
11295msgid ""
2e8451e8 11296"Submodule path '$displaypath' not initialized\n"
c04f5ac3
JX
11297"Maybe you want to use 'update --init'?"
11298msgstr ""
2e8451e8 11299"子模组路径 '$displaypath' 没有初始化\n"
90e6ef53 11300"也许您想用 'update --init'?"
c04f5ac3 11301
6acbf033 11302#: git-submodule.sh:843
c04f5ac3 11303#, sh-format
2e8451e8
JX
11304msgid "Unable to find current revision in submodule path '$displaypath'"
11305msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 11306
6acbf033 11307#: git-submodule.sh:852
c04f5ac3 11308#, sh-format
170e9899
JX
11309msgid "Unable to fetch in submodule path '$sm_path'"
11310msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 11311
6acbf033 11312#: git-submodule.sh:876
2e8451e8
JX
11313#, sh-format
11314msgid "Unable to fetch in submodule path '$displaypath'"
11315msgstr "无法在子模组路径 '$displaypath' 中获取"
11316
6acbf033 11317#: git-submodule.sh:890
6c94aba5
JX
11318#, sh-format
11319msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11320msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
11321
6acbf033 11322#: git-submodule.sh:891
c04f5ac3 11323#, sh-format
6c94aba5
JX
11324msgid "Submodule path '$displaypath': checked out '$sha1'"
11325msgstr "子模组路径 '$displaypath':检出 '$sha1'"
11326
6acbf033 11327#: git-submodule.sh:895
6c94aba5 11328#, sh-format
2e8451e8
JX
11329msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11330msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 11331
6acbf033 11332#: git-submodule.sh:896
c04f5ac3 11333#, sh-format
2e8451e8
JX
11334msgid "Submodule path '$displaypath': rebased into '$sha1'"
11335msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 11336
6acbf033 11337#: git-submodule.sh:901
c04f5ac3 11338#, sh-format
2e8451e8
JX
11339msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11340msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 11341
6acbf033 11342#: git-submodule.sh:902
c04f5ac3 11343#, sh-format
2e8451e8
JX
11344msgid "Submodule path '$displaypath': merged in '$sha1'"
11345msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 11346
6acbf033 11347#: git-submodule.sh:907
c04f5ac3 11348#, sh-format
2e8451e8
JX
11349msgid ""
11350"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
11351msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
c04f5ac3 11352
6acbf033 11353#: git-submodule.sh:908
c04f5ac3 11354#, sh-format
2e8451e8
JX
11355msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11356msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
c04f5ac3 11357
6acbf033 11358#: git-submodule.sh:938
2e8451e8
JX
11359#, sh-format
11360msgid "Failed to recurse into submodule path '$displaypath'"
11361msgstr "无法递归进子模组路径 '$displaypath'"
11362
6acbf033 11363#: git-submodule.sh:1046
649900bc
JX
11364msgid "The --cached option cannot be used with the --files option"
11365msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1 11366
6acbf033 11367#: git-submodule.sh:1098
b694fbb1
JX
11368#, sh-format
11369msgid "unexpected mode $mod_dst"
11370msgstr "意外的模式 $mod_dst"
c04f5ac3 11371
90e6ef53 11372# 译者:注意保持前导空格
6acbf033 11373#: git-submodule.sh:1118
c04f5ac3 11374#, sh-format
2e8451e8
JX
11375msgid " Warn: $display_name doesn't contain commit $sha1_src"
11376msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 11377
90e6ef53 11378# 译者:注意保持前导空格
6acbf033 11379#: git-submodule.sh:1121
c04f5ac3 11380#, sh-format
2e8451e8
JX
11381msgid " Warn: $display_name doesn't contain commit $sha1_dst"
11382msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 11383
90e6ef53 11384# 译者:注意保持前导空格
6acbf033 11385#: git-submodule.sh:1124
c04f5ac3 11386#, sh-format
2e8451e8
JX
11387msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11388msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 11389
6acbf033 11390#: git-submodule.sh:1149
c04f5ac3 11391msgid "blob"
07432cef 11392msgstr "数据对象"
c04f5ac3 11393
6acbf033 11394#: git-submodule.sh:1267
1003b3a5
JX
11395#, sh-format
11396msgid "Failed to recurse into submodule path '$sm_path'"
11397msgstr "无法递归进子模组路径 '$sm_path'"
11398
6acbf033 11399#: git-submodule.sh:1331
c04f5ac3 11400#, sh-format
2e8451e8
JX
11401msgid "Synchronizing submodule url for '$displaypath'"
11402msgstr "为 '$displaypath' 同步子模组 url"