]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
Merge branch 'master' of git://github.com/alexhenrie/git-po
[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"
03ea3327
JX
137"POT-Creation-Date: 2015-09-15 06:45+0800\n"
138"PO-Revision-Date: 2015-09-15 21:49+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
1b7f4a34
JX
160#: advice.c:101 builtin/merge.c:1227
161msgid "You have not concluded your merge (MERGE_HEAD exists)."
162msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
163
164#: advice.c:103
165msgid "Please, commit your changes before you can merge."
166msgstr "请在合并前先提交您的修改。"
167
168#: advice.c:104
169msgid "Exiting because of unfinished merge."
170msgstr "因为存在未完成的合并而退出。"
171
172#: archive.c:12
814ff314
JX
173msgid "git archive [<options>] <tree-ish> [<path>...]"
174msgstr "git archive [<选项>] <树或提交> [<路径>...]"
ef317cd5 175
1b7f4a34 176#: archive.c:13
ef317cd5 177msgid "git archive --list"
07432cef 178msgstr "git archive --list"
ef317cd5 179
1b7f4a34 180#: archive.c:14
ef317cd5 181msgid ""
814ff314 182"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
ef317cd5 183msgstr ""
160fb2b2 184"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
ef317cd5 185
1b7f4a34 186#: archive.c:15
ef317cd5 187msgid "git archive --remote <repo> [--exec <cmd>] --list"
160fb2b2 188msgstr "git archive --remote <仓库> [--exec <命令>] --list"
ef317cd5 189
1b7f4a34 190#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327
90314792
JX
191#, c-format
192msgid "pathspec '%s' did not match any files"
160fb2b2 193msgstr "路径规格 '%s' 未匹配任何文件"
90314792 194
1b7f4a34 195#: archive.c:428
ef317cd5 196msgid "fmt"
07432cef 197msgstr "格式"
ef317cd5 198
1b7f4a34 199#: archive.c:428
ef317cd5 200msgid "archive format"
07432cef 201msgstr "归档格式"
ef317cd5 202
1b7f4a34 203#: archive.c:429 builtin/log.c:1229
ef317cd5 204msgid "prefix"
07432cef 205msgstr "前缀"
ef317cd5 206
1b7f4a34 207#: archive.c:430
ef317cd5 208msgid "prepend prefix to each pathname in the archive"
07432cef 209msgstr "为归档中每个路径名加上前缀"
ef317cd5 210
1b7f4a34
JX
211#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516
212#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987
213#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99
214#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395
215#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153
ef317cd5
JX
216msgid "file"
217msgstr "文件"
218
1b7f4a34 219#: archive.c:432 builtin/archive.c:89
ef317cd5 220msgid "write the archive to this file"
07432cef 221msgstr "归档写入此文件"
ef317cd5 222
1b7f4a34 223#: archive.c:434
ef317cd5 224msgid "read .gitattributes in working directory"
07432cef 225msgstr "读取工作区中的 .gitattributes"
ef317cd5 226
1b7f4a34 227#: archive.c:435
ef317cd5 228msgid "report archived files on stderr"
07432cef 229msgstr "在标准错误上报告归档文件"
ef317cd5 230
1b7f4a34 231#: archive.c:436
ef317cd5 232msgid "store only"
07432cef 233msgstr "只存储"
ef317cd5 234
1b7f4a34 235#: archive.c:437
ef317cd5 236msgid "compress faster"
07432cef 237msgstr "压缩速度更快"
ef317cd5 238
1b7f4a34 239#: archive.c:445
ef317cd5 240msgid "compress better"
07432cef 241msgstr "压缩效果更好"
ef317cd5 242
1b7f4a34 243#: archive.c:448
ef317cd5 244msgid "list supported archive formats"
07432cef 245msgstr "列出支持的归档格式"
ef317cd5 246
1b7f4a34 247#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77
ef317cd5 248msgid "repo"
160fb2b2 249msgstr "仓库"
ef317cd5 250
1b7f4a34 251#: archive.c:451 builtin/archive.c:91
ef317cd5 252msgid "retrieve the archive from remote repository <repo>"
160fb2b2 253msgstr "从远程仓库(<仓库>)提取归档文件"
ef317cd5 254
1b7f4a34 255#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479
ef317cd5 256msgid "command"
07432cef 257msgstr "命令"
ef317cd5 258
1b7f4a34 259#: archive.c:453 builtin/archive.c:93
ef317cd5 260msgid "path to the remote git-upload-archive command"
07432cef
WS
261msgstr "远程 git-upload-archive 命令的路径"
262
7aea43ff 263#: attr.c:265
07432cef 264msgid ""
a7409dfb 265"Negative patterns are ignored in git attributes\n"
07432cef 266"Use '\\!' for literal leading exclamation."
ef317cd5 267msgstr ""
a7409dfb 268"负值模版在 git attributes 中被忽略\n"
07432cef 269"当字符串确实要以感叹号开始时,使用 '\\!'。"
ef317cd5 270
4dcdc3d8
JX
271#: branch.c:60
272#, c-format
273msgid "Not setting branch %s as its own upstream."
274msgstr "未设置分支 %s 作为它自己的上游。"
275
6c94aba5 276#: branch.c:83
4dcdc3d8
JX
277#, c-format
278msgid "Branch %s set up to track remote branch %s from %s by rebasing."
279msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
280
6c94aba5 281#: branch.c:84
4dcdc3d8
JX
282#, c-format
283msgid "Branch %s set up to track remote branch %s from %s."
284msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
285
6c94aba5 286#: branch.c:88
4dcdc3d8
JX
287#, c-format
288msgid "Branch %s set up to track local branch %s by rebasing."
289msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
290
6c94aba5 291#: branch.c:89
4dcdc3d8
JX
292#, c-format
293msgid "Branch %s set up to track local branch %s."
294msgstr "分支 %s 设置为跟踪本地分支 %s。"
295
6c94aba5 296#: branch.c:94
4dcdc3d8
JX
297#, c-format
298msgid "Branch %s set up to track remote ref %s by rebasing."
299msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
300
6c94aba5 301#: branch.c:95
4dcdc3d8
JX
302#, c-format
303msgid "Branch %s set up to track remote ref %s."
304msgstr "分支 %s 设置为跟踪远程引用 %s。"
305
6c94aba5 306#: branch.c:99
4dcdc3d8
JX
307#, c-format
308msgid "Branch %s set up to track local ref %s by rebasing."
309msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
310
6c94aba5 311#: branch.c:100
4dcdc3d8
JX
312#, c-format
313msgid "Branch %s set up to track local ref %s."
314msgstr "分支 %s 设置为跟踪本地引用 %s。"
315
6c94aba5 316#: branch.c:133
4dcdc3d8
JX
317#, c-format
318msgid "Not tracking: ambiguous information for ref %s"
319msgstr "未跟踪:引用 %s 有歧义"
320
220c313c 321#: branch.c:162
4dcdc3d8
JX
322#, c-format
323msgid "'%s' is not a valid branch name."
324msgstr "'%s' 不是一个有效的分支名称。"
325
220c313c 326#: branch.c:167
4dcdc3d8
JX
327#, c-format
328msgid "A branch named '%s' already exists."
329msgstr "一个分支名 '%s' 已经存在。"
330
220c313c 331#: branch.c:175
4dcdc3d8
JX
332msgid "Cannot force update the current branch."
333msgstr "无法强制更新当前分支。"
334
220c313c 335#: branch.c:195
1003b3a5
JX
336#, c-format
337msgid "Cannot setup tracking information; starting point '%s' is not a branch."
338msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
339
220c313c 340#: branch.c:197
1003b3a5
JX
341#, c-format
342msgid "the requested upstream branch '%s' does not exist"
343msgstr "请求的上游分支 '%s' 不存在"
344
220c313c 345#: branch.c:199
1003b3a5
JX
346msgid ""
347"\n"
348"If you are planning on basing your work on an upstream\n"
349"branch that already exists at the remote, you may need to\n"
350"run \"git fetch\" to retrieve it.\n"
351"\n"
352"If you are planning to push out a new local branch that\n"
353"will track its remote counterpart, you may want to use\n"
354"\"git push -u\" to set the upstream config as you push."
355msgstr ""
356"\n"
357"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
358"您可能需要执行 \"git fetch\" 来获取分支。\n"
359"\n"
360"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
361"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
362
220c313c 363#: branch.c:243
4dcdc3d8
JX
364#, c-format
365msgid "Not a valid object name: '%s'."
366msgstr "不是一个有效的对象名:'%s'。"
367
220c313c 368#: branch.c:263
4dcdc3d8
JX
369#, c-format
370msgid "Ambiguous object name: '%s'."
371msgstr "歧义的对象名:'%s'。"
372
220c313c 373#: branch.c:268
4dcdc3d8
JX
374#, c-format
375msgid "Not a valid branch point: '%s'."
376msgstr "无效的分支点:'%s'。"
377
1b7f4a34
JX
378#: branch.c:399
379#, c-format
380msgid "'%s' is already checked out at '%s'"
381msgstr "'%s' 已经检出到 '%s'"
382
220c313c 383#: bundle.c:34
8ada9598
JX
384#, c-format
385msgid "'%s' does not look like a v2 bundle file"
81809b99 386msgstr "'%s' 不像是一个 v2 版本的包文件"
8ada9598 387
220c313c 388#: bundle.c:61
81809b99 389#, c-format
8ada9598 390msgid "unrecognized header: %s%s (%d)"
81809b99 391msgstr "未能识别的包头:%s%s (%d)"
8ada9598 392
1b7f4a34 393#: bundle.c:87 builtin/commit.c:765
8ada9598
JX
394#, c-format
395msgid "could not open '%s'"
396msgstr "不能打开 '%s'"
397
220c313c 398#: bundle.c:139
8ada9598 399msgid "Repository lacks these prerequisite commits:"
160fb2b2 400msgstr "仓库中缺少这些必备的提交:"
8ada9598 401
1b7f4a34
JX
402#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708
403#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334
404#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358
90314792 405#: builtin/shortlog.c:158
8ada9598
JX
406msgid "revision walk setup failed"
407msgstr "版本遍历设置失败"
408
220c313c 409#: bundle.c:185
8ada9598 410#, c-format
1003b3a5
JX
411msgid "The bundle contains this ref:"
412msgid_plural "The bundle contains these %d refs:"
413msgstr[0] "这个包中含有这个引用:"
414msgstr[1] "这个包中含有 %d 个引用:"
8ada9598 415
220c313c 416#: bundle.c:192
6792b93b
JX
417msgid "The bundle records a complete history."
418msgstr "这个包记录一个完整历史。"
419
220c313c 420#: bundle.c:194
8ada9598 421#, c-format
1003b3a5
JX
422msgid "The bundle requires this ref:"
423msgid_plural "The bundle requires these %d refs:"
424msgstr[0] "这个包需要这个引用:"
425msgstr[1] "这个包需要 %d 个引用:"
8ada9598 426
1b7f4a34 427#: bundle.c:253
9aeb4c2b
JX
428msgid "Could not spawn pack-objects"
429msgstr "不能生成 pack-objects 进程"
430
1b7f4a34 431#: bundle.c:264
9aeb4c2b
JX
432msgid "pack-objects died"
433msgstr "pack-objects 终止"
434
1b7f4a34 435#: bundle.c:304
8ada9598 436msgid "rev-list died"
81809b99 437msgstr "rev-list 终止"
8ada9598 438
1b7f4a34 439#: bundle.c:353
8ada9598
JX
440#, c-format
441msgid "ref '%s' is excluded by the rev-list options"
81809b99 442msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 443
1b7f4a34 444#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261
9aeb4c2b
JX
445#, c-format
446msgid "unrecognized argument: %s"
447msgstr "未能识别的参数:%s"
448
1b7f4a34 449#: bundle.c:449
8ada9598 450msgid "Refusing to create empty bundle."
81809b99 451msgstr "不能创建空包。"
8ada9598 452
1b7f4a34 453#: bundle.c:459
81809b99 454#, c-format
8ada9598 455msgid "cannot create '%s'"
81809b99 456msgstr "不能创建 '%s'"
8ada9598 457
1b7f4a34 458#: bundle.c:480
8ada9598 459msgid "index-pack died"
81809b99 460msgstr "index-pack 终止"
8ada9598 461
1e607449 462#: color.c:260
220c313c
JX
463#, c-format
464msgid "invalid color value: %.*s"
465msgstr "无效的颜色值:%.*s"
466
03ea3327
JX
467#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516
468#: builtin/am.c:2128
c04f5ac3
JX
469#, c-format
470msgid "could not parse %s"
471msgstr "不能解析 %s"
472
6acbf033 473#: commit.c:42
c04f5ac3
JX
474#, c-format
475msgid "%s %s is not a commit!"
476msgstr "%s %s 不是一个提交!"
477
478#: compat/obstack.c:406 compat/obstack.c:408
479msgid "memory exhausted"
480msgstr "内存耗尽"
481
814ff314 482#: config.c:474 config.c:476
220c313c
JX
483#, c-format
484msgid "bad config file line %d in %s"
485msgstr "配置文件 %2$s 出错于第 %1$d 行"
486
814ff314 487#: config.c:592
220c313c
JX
488#, c-format
489msgid "bad numeric config value '%s' for '%s' in %s: %s"
490msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
491
814ff314 492#: config.c:594
220c313c
JX
493#, c-format
494msgid "bad numeric config value '%s' for '%s': %s"
495msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
496
814ff314 497#: config.c:679
220c313c
JX
498#, c-format
499msgid "failed to expand user dir in: '%s'"
500msgstr "无法扩展 '%s' 中的用户目录"
501
814ff314 502#: config.c:757 config.c:768
220c313c
JX
503#, c-format
504msgid "bad zlib compression level %d"
505msgstr "错误的 zlib 压缩级别 %d"
506
814ff314 507#: config.c:890
220c313c
JX
508#, c-format
509msgid "invalid mode for object creation: %s"
510msgstr "无效的对象创建模式:%s"
511
814ff314 512#: config.c:1216
220c313c
JX
513msgid "unable to parse command-line config"
514msgstr "无法解析命令行中的配置"
515
814ff314 516#: config.c:1277
220c313c
JX
517msgid "unknown error occured while reading the configuration files"
518msgstr "在读取配置文件时遇到未知错误"
519
814ff314 520#: config.c:1601
220c313c
JX
521#, c-format
522msgid "unable to parse '%s' from command-line config"
523msgstr "无法解析命令行配置中的 '%s'"
524
814ff314 525#: config.c:1603
220c313c
JX
526#, c-format
527msgid "bad config variable '%s' in file '%s' at line %d"
528msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
529
814ff314 530#: config.c:1662
220c313c
JX
531#, c-format
532msgid "%s has multiple values"
533msgstr "%s 有多个取值"
534
535#: connected.c:69
c04f5ac3
JX
536msgid "Could not run 'git rev-list'"
537msgstr "不能执行 'git rev-list'"
538
220c313c 539#: connected.c:89
c04f5ac3
JX
540#, c-format
541msgid "failed write to rev-list: %s"
542msgstr "无法写入 rev-list:%s"
543
220c313c 544#: connected.c:97
c04f5ac3
JX
545#, c-format
546msgid "failed to close rev-list's stdin: %s"
547msgstr "无法关闭 rev-list 的标准输入:%s"
548
8ada9598
JX
549#: date.c:95
550msgid "in the future"
81809b99 551msgstr "在将来"
8ada9598
JX
552
553#: date.c:101
554#, c-format
555msgid "%lu second ago"
556msgid_plural "%lu seconds ago"
6c94aba5
JX
557msgstr[0] "%lu 秒钟前"
558msgstr[1] "%lu 秒钟前"
8ada9598
JX
559
560#: date.c:108
561#, c-format
562msgid "%lu minute ago"
563msgid_plural "%lu minutes ago"
6c94aba5
JX
564msgstr[0] "%lu 分钟前"
565msgstr[1] "%lu 分钟前"
8ada9598
JX
566
567#: date.c:115
568#, c-format
569msgid "%lu hour ago"
570msgid_plural "%lu hours ago"
6c94aba5
JX
571msgstr[0] "%lu 小时前"
572msgstr[1] "%lu 小时前"
8ada9598
JX
573
574#: date.c:122
575#, c-format
576msgid "%lu day ago"
577msgid_plural "%lu days ago"
6c94aba5
JX
578msgstr[0] "%lu 天前"
579msgstr[1] "%lu 天前"
8ada9598
JX
580
581#: date.c:128
582#, c-format
583msgid "%lu week ago"
584msgid_plural "%lu weeks ago"
6c94aba5
JX
585msgstr[0] "%lu 周前"
586msgstr[1] "%lu 周前"
8ada9598
JX
587
588#: date.c:135
589#, c-format
590msgid "%lu month ago"
591msgid_plural "%lu months ago"
6c94aba5
JX
592msgstr[0] "%lu 个月前"
593msgstr[1] "%lu 个月前"
8ada9598
JX
594
595#: date.c:146
596#, c-format
597msgid "%lu year"
598msgid_plural "%lu years"
81809b99 599msgstr[0] "%lu 年"
5ae481e0 600msgstr[1] "%lu 年"
8ada9598 601
6c94aba5 602#. TRANSLATORS: "%s" is "<n> years"
8ada9598
JX
603#: date.c:149
604#, c-format
605msgid "%s, %lu month ago"
606msgid_plural "%s, %lu months ago"
6c94aba5
JX
607msgstr[0] "%s %lu 个月前"
608msgstr[1] "%s %lu 个月前"
8ada9598
JX
609
610#: date.c:154 date.c:159
611#, c-format
612msgid "%lu year ago"
613msgid_plural "%lu years ago"
81809b99 614msgstr[0] "%lu 年前"
5ae481e0 615msgstr[1] "%lu 年前"
8ada9598 616
cfff71a9
JX
617#: diffcore-order.c:24
618#, c-format
619msgid "failed to read orderfile '%s'"
620msgstr "无法读取排序文件 '%s'"
621
814ff314 622#: diffcore-rename.c:536
6c94aba5
JX
623msgid "Performing inexact rename detection"
624msgstr "正在进行非精确的重命名检测"
625
90e6ef53 626# 译者:注意保持前导空格
1b7f4a34 627#: diff.c:116
c04f5ac3 628#, c-format
07432cef
WS
629msgid " Failed to parse dirstat cut-off percentage '%s'\n"
630msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
c04f5ac3 631
90e6ef53 632# 译者:注意保持前导空格
1b7f4a34 633#: diff.c:121
c04f5ac3 634#, c-format
07432cef
WS
635msgid " Unknown dirstat parameter '%s'\n"
636msgstr " 未知的 dirstat 参数 '%s'\n"
c04f5ac3 637
1b7f4a34 638#: diff.c:216
07432cef
WS
639#, c-format
640msgid "Unknown value for 'diff.submodule' config variable: '%s'"
641msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
642
1b7f4a34 643#: diff.c:268
c04f5ac3
JX
644#, c-format
645msgid ""
646"Found errors in 'diff.dirstat' config variable:\n"
647"%s"
648msgstr ""
90e6ef53 649"发现配置变量 'diff.dirstat' 中的错误:\n"
c04f5ac3
JX
650"%s"
651
1b7f4a34 652#: diff.c:2998
6acbf033
JX
653#, c-format
654msgid "external diff died, stopping at %s"
655msgstr "外部 diff 退出,停止在 %s"
656
1b7f4a34 657#: diff.c:3394
6acbf033
JX
658msgid "--follow requires exactly one pathspec"
659msgstr "--follow 参数后只跟一个 pathspec"
660
1b7f4a34 661#: diff.c:3557
c04f5ac3
JX
662#, c-format
663msgid ""
664"Failed to parse --dirstat/-X option parameter:\n"
665"%s"
666msgstr ""
667"无法解析 --dirstat/-X 选项的参数:\n"
668"%s"
669
1b7f4a34 670#: diff.c:3571
07432cef
WS
671#, c-format
672msgid "Failed to parse --submodule option parameter: '%s'"
673msgstr "无法解析 --submodule 选项的参数:'%s'"
674
1b7f4a34 675#: dir.c:1853
7aea43ff
JX
676msgid "failed to get kernel name and information"
677msgstr "无法获得内核名称和信息"
678
1b7f4a34 679#: dir.c:1936
7aea43ff
JX
680msgid "Untracked cache is disabled on this system."
681msgstr "缓存未跟踪文件在本系统被禁用"
682
1b7f4a34 683#: gpg-interface.c:166 gpg-interface.c:237
c04f5ac3
JX
684msgid "could not run gpg."
685msgstr "不能执行 gpg。"
686
1b7f4a34 687#: gpg-interface.c:178
c04f5ac3
JX
688msgid "gpg did not accept the data"
689msgstr "gpg 没有接受数据"
690
1b7f4a34 691#: gpg-interface.c:189
c04f5ac3
JX
692msgid "gpg failed to sign the data"
693msgstr "gpg 无法为数据签名"
694
1b7f4a34 695#: gpg-interface.c:222
a77c07d9
JX
696#, c-format
697msgid "could not create temporary file '%s': %s"
698msgstr "不能创建临时文件 '%s':%s"
699
1b7f4a34 700#: gpg-interface.c:225
a77c07d9
JX
701#, c-format
702msgid "failed writing detached signature to '%s': %s"
703msgstr "无法将分离式签名写入 '%s':%s"
704
220c313c 705#: grep.c:1718
7ac1c0ad
JX
706#, c-format
707msgid "'%s': unable to read %s"
708msgstr "'%s':无法读取 %s"
709
220c313c 710#: grep.c:1735
7ac1c0ad
JX
711#, c-format
712msgid "'%s': %s"
713msgstr "'%s':%s"
714
220c313c 715#: grep.c:1746
7ac1c0ad
JX
716#, c-format
717msgid "'%s': short read %s"
718msgstr "'%s':读取不完整 %s"
719
6acbf033 720#: help.c:207
81809b99 721#, c-format
8ada9598 722msgid "available git commands in '%s'"
81809b99 723msgstr "在 '%s' 下可用的 git 命令"
8ada9598 724
6acbf033 725#: help.c:214
8ada9598 726msgid "git commands available from elsewhere on your $PATH"
81809b99 727msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
8ada9598 728
7aea43ff
JX
729#: help.c:246
730msgid "These are common Git commands used in various situations:"
731msgstr "这些是各种场合常见的 Git 命令:"
a77c07d9 732
7aea43ff 733#: help.c:311
c04f5ac3
JX
734#, c-format
735msgid ""
736"'%s' appears to be a git command, but we were not\n"
737"able to execute it. Maybe git-%s is broken?"
738msgstr ""
739"'%s' 像是一个 git 命令,但却无法运行。\n"
740"可能是 git-%s 受损?"
741
7aea43ff 742#: help.c:368
8ada9598 743msgid "Uh oh. Your system reports no Git commands at all."
81809b99 744msgstr "唉呀,您的系统中未发现 Git 命令。"
8ada9598 745
7aea43ff 746#: help.c:390
8ada9598
JX
747#, c-format
748msgid ""
749"WARNING: You called a Git command named '%s', which does not exist.\n"
750"Continuing under the assumption that you meant '%s'"
751msgstr ""
81809b99
JX
752"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
753"是 '%s'"
8ada9598 754
7aea43ff 755#: help.c:395
8ada9598
JX
756#, c-format
757msgid "in %0.1f seconds automatically..."
81809b99 758msgstr "在 %0.1f 秒钟后自动运行..."
8ada9598 759
7aea43ff 760#: help.c:402
8ada9598
JX
761#, c-format
762msgid "git: '%s' is not a git command. See 'git --help'."
81809b99 763msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
8ada9598 764
7aea43ff 765#: help.c:406 help.c:466
8ada9598
JX
766msgid ""
767"\n"
768"Did you mean this?"
769msgid_plural ""
770"\n"
771"Did you mean one of these?"
772msgstr[0] ""
81809b99
JX
773"\n"
774"您指的是这个么?"
775msgstr[1] ""
776"\n"
195febda 777"您指的是这其中的某一个么?"
8ada9598 778
7aea43ff 779#: help.c:462
2e8451e8
JX
780#, c-format
781msgid "%s: %s - %s"
782msgstr "%s:%s - %s"
783
220c313c 784#: merge.c:41
07432cef
WS
785msgid "failed to read the cache"
786msgstr "无法读取缓存"
787
03ea3327 788#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375
1b7f4a34 789#: builtin/checkout.c:586 builtin/clone.c:715
07432cef
WS
790msgid "unable to write new index file"
791msgstr "无法写新的索引文件"
792
220c313c 793#: merge-recursive.c:189
649900bc
JX
794#, c-format
795msgid "(bad commit)\n"
796msgstr "(坏提交)\n"
797
220c313c 798#: merge-recursive.c:209
649900bc
JX
799#, c-format
800msgid "addinfo_cache failed for path '%s'"
801msgstr "为路径 '%s' addinfo_cache 失败"
802
220c313c 803#: merge-recursive.c:270
649900bc
JX
804msgid "error building trees"
805msgstr "无法创建树"
806
7aea43ff 807#: merge-recursive.c:687
649900bc
JX
808#, c-format
809msgid "failed to create path '%s'%s"
810msgstr "无法创建路径 '%s'%s"
811
7aea43ff 812#: merge-recursive.c:698
649900bc
JX
813#, c-format
814msgid "Removing %s to make room for subdirectory\n"
815msgstr "删除 %s 以便为子目录留出空间\n"
816
7aea43ff 817#: merge-recursive.c:712 merge-recursive.c:733
649900bc
JX
818msgid ": perhaps a D/F conflict?"
819msgstr ":可能是一个目录/文件冲突?"
820
7aea43ff 821#: merge-recursive.c:723
649900bc
JX
822#, c-format
823msgid "refusing to lose untracked file at '%s'"
824msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
825
7aea43ff 826#: merge-recursive.c:763
649900bc
JX
827#, c-format
828msgid "cannot read object %s '%s'"
829msgstr "不能读取对象 %s '%s'"
830
7aea43ff 831#: merge-recursive.c:765
649900bc
JX
832#, c-format
833msgid "blob expected for %s '%s'"
160fb2b2 834msgstr "%s '%s' 应为数据对象"
649900bc 835
1b7f4a34 836#: merge-recursive.c:788 builtin/clone.c:364
649900bc
JX
837#, c-format
838msgid "failed to open '%s'"
839msgstr "无法打开 '%s'"
840
7aea43ff 841#: merge-recursive.c:796
649900bc
JX
842#, c-format
843msgid "failed to symlink '%s'"
844msgstr "无法创建符号链接 '%s'"
845
7aea43ff 846#: merge-recursive.c:799
649900bc
JX
847#, c-format
848msgid "do not know what to do with %06o %s '%s'"
849msgstr "不知道如何处理 %06o %s '%s'"
850
7aea43ff 851#: merge-recursive.c:937
649900bc
JX
852msgid "Failed to execute internal merge"
853msgstr "无法执行内部合并"
854
7aea43ff 855#: merge-recursive.c:941
649900bc
JX
856#, c-format
857msgid "Unable to add %s to database"
858msgstr "不能添加 %s 至对象库"
859
7aea43ff 860#: merge-recursive.c:957
649900bc
JX
861msgid "unsupported object type in the tree"
862msgstr "在树中有不支持的对象类型"
863
7aea43ff 864#: merge-recursive.c:1032 merge-recursive.c:1046
649900bc
JX
865#, c-format
866msgid ""
867"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
868"in tree."
869msgstr ""
870"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
871"的版本被保留。"
872
7aea43ff 873#: merge-recursive.c:1038 merge-recursive.c:1051
649900bc
JX
874#, c-format
875msgid ""
876"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
877"in tree at %s."
878msgstr ""
879"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
880"的版本保留于 %8$s 中。"
881
7aea43ff 882#: merge-recursive.c:1092
649900bc
JX
883msgid "rename"
884msgstr "重命名"
885
7aea43ff 886#: merge-recursive.c:1092
649900bc
JX
887msgid "renamed"
888msgstr "重命名"
889
7aea43ff 890#: merge-recursive.c:1148
649900bc
JX
891#, c-format
892msgid "%s is a directory in %s adding as %s instead"
893msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
894
7aea43ff 895#: merge-recursive.c:1170
649900bc
JX
896#, c-format
897msgid ""
898"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
899"\"->\"%s\" in \"%s\"%s"
900msgstr ""
901"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
902"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
903
7aea43ff 904#: merge-recursive.c:1175
649900bc
JX
905msgid " (left unresolved)"
906msgstr "(留下未解决)"
907
7aea43ff 908#: merge-recursive.c:1229
649900bc
JX
909#, c-format
910msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
911msgstr ""
912"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
913"%5$s"
914
7aea43ff 915#: merge-recursive.c:1259
649900bc
JX
916#, c-format
917msgid "Renaming %s to %s and %s to %s instead"
07432cef 918msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
649900bc 919
7aea43ff 920#: merge-recursive.c:1458
649900bc
JX
921#, c-format
922msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
923msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
924
7aea43ff 925#: merge-recursive.c:1468
649900bc
JX
926#, c-format
927msgid "Adding merged %s"
928msgstr "添加合并后的 %s"
929
7aea43ff 930#: merge-recursive.c:1473 merge-recursive.c:1671
649900bc
JX
931#, c-format
932msgid "Adding as %s instead"
933msgstr "而是以 %s 为名添加"
934
7aea43ff 935#: merge-recursive.c:1524
649900bc
JX
936#, c-format
937msgid "cannot read object %s"
938msgstr "不能读取对象 %s"
939
7aea43ff 940#: merge-recursive.c:1527
649900bc
JX
941#, c-format
942msgid "object %s is not a blob"
160fb2b2 943msgstr "对象 %s 不是一个数据对象"
649900bc 944
7aea43ff 945#: merge-recursive.c:1575
649900bc
JX
946msgid "modify"
947msgstr "修改"
948
7aea43ff 949#: merge-recursive.c:1575
649900bc
JX
950msgid "modified"
951msgstr "修改"
952
7aea43ff 953#: merge-recursive.c:1585
649900bc
JX
954msgid "content"
955msgstr "内容"
956
7aea43ff 957#: merge-recursive.c:1592
649900bc
JX
958msgid "add/add"
959msgstr "添加/添加"
960
7aea43ff 961#: merge-recursive.c:1626
649900bc
JX
962#, c-format
963msgid "Skipped %s (merged same as existing)"
964msgstr "略过 %s(已经做过相同合并)"
965
7aea43ff 966#: merge-recursive.c:1640
649900bc
JX
967#, c-format
968msgid "Auto-merging %s"
969msgstr "自动合并 %s"
970
7aea43ff 971#: merge-recursive.c:1644 git-submodule.sh:1150
649900bc
JX
972msgid "submodule"
973msgstr "子模组"
974
7aea43ff 975#: merge-recursive.c:1645
649900bc
JX
976#, c-format
977msgid "CONFLICT (%s): Merge conflict in %s"
978msgstr "冲突(%s):合并冲突于 %s"
979
7aea43ff 980#: merge-recursive.c:1731
649900bc
JX
981#, c-format
982msgid "Removing %s"
983msgstr "删除 %s"
984
7aea43ff 985#: merge-recursive.c:1756
649900bc
JX
986msgid "file/directory"
987msgstr "文件/目录"
988
7aea43ff 989#: merge-recursive.c:1762
649900bc
JX
990msgid "directory/file"
991msgstr "目录/文件"
992
7aea43ff 993#: merge-recursive.c:1767
649900bc
JX
994#, c-format
995msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
996msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
997
7aea43ff 998#: merge-recursive.c:1777
649900bc
JX
999#, c-format
1000msgid "Adding %s"
1001msgstr "添加 %s"
1002
7aea43ff 1003#: merge-recursive.c:1794
649900bc
JX
1004msgid "Fatal merge failure, shouldn't happen."
1005msgstr "严重的合并错误,不应发生。"
1006
7aea43ff 1007#: merge-recursive.c:1813
649900bc
JX
1008msgid "Already up-to-date!"
1009msgstr "已经是最新的!"
1010
7aea43ff 1011#: merge-recursive.c:1822
649900bc
JX
1012#, c-format
1013msgid "merging of trees %s and %s failed"
1014msgstr "无法合并树 %s 和 %s"
1015
7aea43ff 1016#: merge-recursive.c:1852
649900bc
JX
1017#, c-format
1018msgid "Unprocessed path??? %s"
1019msgstr "未处理的路径??? %s"
1020
7aea43ff 1021#: merge-recursive.c:1900
649900bc
JX
1022msgid "Merging:"
1023msgstr "合并:"
1024
7aea43ff 1025#: merge-recursive.c:1913
649900bc 1026#, c-format
e5e38ce4
JX
1027msgid "found %u common ancestor:"
1028msgid_plural "found %u common ancestors:"
1029msgstr[0] "发现 %u 个共同祖先:"
1030msgstr[1] "发现 %u 个共同祖先:"
649900bc 1031
7aea43ff 1032#: merge-recursive.c:1950
649900bc
JX
1033msgid "merge returned no commit"
1034msgstr "合并未返回提交"
1035
7aea43ff 1036#: merge-recursive.c:2007
649900bc
JX
1037#, c-format
1038msgid "Could not parse object '%s'"
1039msgstr "不能解析对象 '%s'"
1040
7aea43ff 1041#: merge-recursive.c:2018 builtin/merge.c:645
649900bc
JX
1042msgid "Unable to write index."
1043msgstr "不能写入索引。"
1044
6acbf033 1045#: notes-utils.c:41
2e8451e8
JX
1046msgid "Cannot commit uninitialized/unreferenced notes tree"
1047msgstr "不能提交未初始化/未引用的注解树"
1048
1b7f4a34 1049#: notes-utils.c:100
2e8451e8
JX
1050#, c-format
1051msgid "Bad notes.rewriteMode value: '%s'"
1052msgstr "坏的 notes.rewriteMode 值:'%s'"
1053
1b7f4a34 1054#: notes-utils.c:110
2e8451e8
JX
1055#, c-format
1056msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1057msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
1058
1059#. TRANSLATORS: The first %s is the name of the
1060#. environment variable, the second %s is its value
1b7f4a34 1061#: notes-utils.c:137
2e8451e8
JX
1062#, c-format
1063msgid "Bad %s value: '%s'"
1064msgstr "坏的 %s 值:'%s'"
1065
7aea43ff 1066#: object.c:242
1003b3a5
JX
1067#, c-format
1068msgid "unable to parse object: %s"
1069msgstr "不能解析对象:%s"
1070
1b7f4a34 1071#: parse-options.c:563
8ada9598 1072msgid "..."
81809b99 1073msgstr "..."
8ada9598 1074
1b7f4a34 1075#: parse-options.c:581
81809b99 1076#, c-format
8ada9598 1077msgid "usage: %s"
81809b99 1078msgstr "用法:%s"
8ada9598
JX
1079
1080#. TRANSLATORS: the colon here should align with the
1081#. one in "usage: %s" translation
1b7f4a34 1082#: parse-options.c:585
81809b99 1083#, c-format
8ada9598 1084msgid " or: %s"
81809b99 1085msgstr " 或:%s"
8ada9598
JX
1086
1087# 译者:为保证在输出中对齐,注意调整句中空格!
1b7f4a34 1088#: parse-options.c:588
81809b99 1089#, c-format
8ada9598 1090msgid " %s"
81809b99 1091msgstr " %s"
8ada9598 1092
1b7f4a34 1093#: parse-options.c:622
63af42fe
JX
1094msgid "-NUM"
1095msgstr "-数字"
1096
cfff71a9 1097#: pathspec.c:133
90314792 1098msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
160fb2b2 1099msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
90314792 1100
cfff71a9 1101#: pathspec.c:143
90314792
JX
1102msgid ""
1103"global 'literal' pathspec setting is incompatible with all other global "
1104"pathspec settings"
160fb2b2 1105msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
90314792 1106
cfff71a9 1107#: pathspec.c:177
90314792 1108msgid "invalid parameter for pathspec magic 'prefix'"
160fb2b2 1109msgstr "路径规格包含无效的神奇前缀"
90314792 1110
cfff71a9 1111#: pathspec.c:183
90314792
JX
1112#, c-format
1113msgid "Invalid pathspec magic '%.*s' in '%s'"
160fb2b2 1114msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
90314792 1115
cfff71a9 1116#: pathspec.c:187
90314792
JX
1117#, c-format
1118msgid "Missing ')' at the end of pathspec magic in '%s'"
160fb2b2 1119msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
90314792 1120
cfff71a9 1121#: pathspec.c:205
90314792
JX
1122#, c-format
1123msgid "Unimplemented pathspec magic '%c' in '%s'"
160fb2b2 1124msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
90314792 1125
cfff71a9 1126#: pathspec.c:230
a77c07d9 1127#, c-format
90314792
JX
1128msgid "%s: 'literal' and 'glob' are incompatible"
1129msgstr "%s:'literal' 和 'glob' 不兼容"
a77c07d9 1130
cfff71a9 1131#: pathspec.c:241
a77c07d9 1132#, c-format
90314792 1133msgid "%s: '%s' is outside repository"
160fb2b2 1134msgstr "%s:'%s' 在仓库之外"
a77c07d9 1135
cfff71a9 1136#: pathspec.c:291
90314792
JX
1137#, c-format
1138msgid "Pathspec '%s' is in submodule '%.*s'"
160fb2b2 1139msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
90314792 1140
cfff71a9 1141#: pathspec.c:353
90314792
JX
1142#, c-format
1143msgid "%s: pathspec magic not supported by this command: %s"
160fb2b2 1144msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
90314792 1145
6acbf033 1146#: pathspec.c:432
90314792
JX
1147#, c-format
1148msgid "pathspec '%s' is beyond a symbolic link"
160fb2b2 1149msgstr "路径规格 '%s' 位于符号链接中"
90314792 1150
6acbf033 1151#: pathspec.c:441
cfff71a9
JX
1152msgid ""
1153"There is nothing to exclude from by :(exclude) patterns.\n"
1154"Perhaps you forgot to add either ':/' or '.' ?"
1155msgstr ""
1156"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1157"添加 ':/' 或 '.' ?"
1158
1b7f4a34 1159#: pretty.c:969
220c313c
JX
1160msgid "unable to parse --pretty format"
1161msgstr "不能解析 --pretty 格式"
1162
7aea43ff 1163#: progress.c:236
6c94aba5
JX
1164msgid "done"
1165msgstr "完成"
1166
1b7f4a34 1167#: read-cache.c:1296
6c94aba5
JX
1168#, c-format
1169msgid ""
1170"index.version set, but the value is invalid.\n"
1171"Using version %i"
1172msgstr ""
1173"设置了 index.version,但是取值无效。\n"
1174"使用版本 %i"
1175
1b7f4a34 1176#: read-cache.c:1306
6c94aba5
JX
1177#, c-format
1178msgid ""
1179"GIT_INDEX_VERSION set, but the value is invalid.\n"
1180"Using version %i"
1181msgstr ""
1182"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1183"使用版本 %i"
1184
1b7f4a34
JX
1185#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
1186#: builtin/merge.c:983
1187#, c-format
1188msgid "Could not open '%s' for writing"
1189msgstr "无法打开 '%s' 进行写入"
1190
1191#: refs.c:3001
1192#, c-format
1193msgid "could not delete reference %s: %s"
1194msgstr "无法删除引用 %s:%s"
1195
1196#: refs.c:3004
1197#, c-format
1198msgid "could not delete references: %s"
1199msgstr "无法删除引用:%s"
1200
1201#: refs.c:3013
1202#, c-format
1203msgid "could not remove reference %s"
1204msgstr "无法删除引用 %s"
1205
1206#: ref-filter.c:660
1207msgid "unable to parse format"
1208msgstr "不能解析格式"
1209
7aea43ff 1210#: remote.c:792
cfff71a9
JX
1211#, c-format
1212msgid "Cannot fetch both %s and %s to %s"
1213msgstr "不能同时获取 %s 和 %s 至 %s"
1214
7aea43ff 1215#: remote.c:796
cfff71a9
JX
1216#, c-format
1217msgid "%s usually tracks %s, not %s"
1218msgstr "%s 通常跟踪 %s,而非 %s"
1219
7aea43ff 1220#: remote.c:800
cfff71a9
JX
1221#, c-format
1222msgid "%s tracks both %s and %s"
1223msgstr "%s 同时跟踪 %s 和 %s"
1224
7aea43ff 1225#: remote.c:808
cfff71a9
JX
1226msgid "Internal error"
1227msgstr "内部错误"
1228
7aea43ff
JX
1229#: remote.c:1723 remote.c:1766
1230msgid "HEAD does not point to a branch"
1231msgstr "HEAD 没有指向一个分支"
1232
1233#: remote.c:1732
1234#, c-format
1235msgid "no such branch: '%s'"
1236msgstr "没有此分支:'%s'"
1237
1238#: remote.c:1735
1239#, c-format
1240msgid "no upstream configured for branch '%s'"
1241msgstr "尚未给分支 '%s' 设置上游"
1242
1243#: remote.c:1741
1244#, c-format
1245msgid "upstream branch '%s' not stored as a remote-tracking branch"
1246msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1247
1248#: remote.c:1756
1249#, c-format
1250msgid "push destination '%s' on remote '%s' has no local tracking branch"
1251msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1252
1253#: remote.c:1771
1254#, c-format
1255msgid "branch '%s' has no remote for pushing"
1256msgstr "分支 '%s' 没有设置要推送的远程服务器"
1257
1258#: remote.c:1782
1259#, c-format
1260msgid "push refspecs for '%s' do not include '%s'"
160fb2b2 1261msgstr "向 '%s' 推送引用规格未包含 '%s'"
7aea43ff
JX
1262
1263#: remote.c:1795
1264msgid "push has no destination (push.default is 'nothing')"
1265msgstr "推送无目标(push.default 是 'nothing')"
1266
1267#: remote.c:1817
1268msgid "cannot resolve 'simple' push to a single destination"
1269msgstr "无法解析 'simple' 推送至一个单独的目标"
1270
1271#: remote.c:2124
90314792
JX
1272#, c-format
1273msgid "Your branch is based on '%s', but the upstream is gone.\n"
1274msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1275
7aea43ff 1276#: remote.c:2128
90314792
JX
1277msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1278msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1279
7aea43ff 1280#: remote.c:2131
90314792
JX
1281#, c-format
1282msgid "Your branch is up-to-date with '%s'.\n"
1283msgstr "您的分支与上游分支 '%s' 一致。\n"
1284
7aea43ff 1285#: remote.c:2135
c04f5ac3
JX
1286#, c-format
1287msgid "Your branch is ahead of '%s' by %d commit.\n"
1288msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1289msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5ae481e0 1290msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
c04f5ac3 1291
7aea43ff 1292#: remote.c:2141
07432cef
WS
1293msgid " (use \"git push\" to publish your local commits)\n"
1294msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1295
7aea43ff 1296#: remote.c:2144
c04f5ac3
JX
1297#, c-format
1298msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1299msgid_plural ""
1300"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
90e6ef53 1301msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5ae481e0 1302msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 1303
07432cef 1304# 译者:注意保持前导空格
7aea43ff 1305#: remote.c:2152
07432cef
WS
1306msgid " (use \"git pull\" to update your local branch)\n"
1307msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1308
7aea43ff 1309#: remote.c:2155
c04f5ac3
JX
1310#, c-format
1311msgid ""
1312"Your branch and '%s' have diverged,\n"
1313"and have %d and %d different commit each, respectively.\n"
1314msgid_plural ""
1315"Your branch and '%s' have diverged,\n"
1316"and have %d and %d different commits each, respectively.\n"
1317msgstr[0] ""
1318"您的分支和 '%s' 出现了偏离,\n"
195febda 1319"并且分别有 %d 和 %d 处不同的提交。\n"
5ae481e0
JX
1320msgstr[1] ""
1321"您的分支和 '%s' 出现了偏离,\n"
195febda 1322"并且分别有 %d 和 %d 处不同的提交。\n"
c04f5ac3 1323
07432cef 1324# 译者:注意保持前导空格
7aea43ff 1325#: remote.c:2165
07432cef
WS
1326msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1327msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1328
1b7f4a34
JX
1329#: revision.c:2198
1330msgid "your current branch appears to be broken"
1331msgstr "您的当前分支好像被损坏"
1332
1333#: revision.c:2201
1334#, c-format
1335msgid "your current branch '%s' does not have any commits yet"
1336msgstr "您的当前分支 '%s' 尚无任何提交"
1337
1338#: revision.c:2395
814ff314
JX
1339msgid "--first-parent is incompatible with --bisect"
1340msgstr "--first-parent 与 --bisect 不兼容"
1341
1342#: run-command.c:83
2e8451e8
JX
1343msgid "open /dev/null failed"
1344msgstr "不能打开 /dev/null"
1345
814ff314 1346#: run-command.c:85
2e8451e8
JX
1347#, c-format
1348msgid "dup2(%d,%d) failed"
1349msgstr "不能调用 dup2(%d,%d)"
1350
1b7f4a34 1351#: send-pack.c:295
220c313c
JX
1352msgid "failed to sign the push certificate"
1353msgstr "无法为推送证书签名"
1354
1b7f4a34 1355#: send-pack.c:404
220c313c
JX
1356msgid "the receiving end does not support --signed push"
1357msgstr "接收端不支持签名推送"
1358
1b7f4a34
JX
1359#: send-pack.c:406
1360msgid ""
1361"not sending a push certificate since the receiving end does not support --"
1362"signed push"
1363msgstr "未发送推送证书,因为接收端不支持签名推送"
1364
1365#: send-pack.c:418
44f518e6
JX
1366msgid "the receiving end does not support --atomic push"
1367msgstr "接收端不支持原子推送"
814ff314 1368
1b7f4a34 1369#: sequencer.c:183
14c8bced
JX
1370msgid ""
1371"after resolving the conflicts, mark the corrected paths\n"
1372"with 'git add <paths>' or 'git rm <paths>'"
1373msgstr ""
d9d56b23 1374"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
14c8bced
JX
1375"命令标记修正后的文件"
1376
1b7f4a34 1377#: sequencer.c:186
c04f5ac3
JX
1378msgid ""
1379"after resolving the conflicts, mark the corrected paths\n"
1380"with 'git add <paths>' or 'git rm <paths>'\n"
1381"and commit the result with 'git commit'"
1382msgstr ""
d9d56b23 1383"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
c04f5ac3
JX
1384"对修正后的文件做标记,然后用 'git commit' 提交"
1385
1b7f4a34 1386#: sequencer.c:199 sequencer.c:842 sequencer.c:922
c04f5ac3
JX
1387#, c-format
1388msgid "Could not write to %s"
1389msgstr "不能写入 %s"
1390
1b7f4a34 1391#: sequencer.c:202
c04f5ac3
JX
1392#, c-format
1393msgid "Error wrapping up %s"
1394msgstr "错误收尾 %s"
1395
1b7f4a34 1396#: sequencer.c:217
c04f5ac3
JX
1397msgid "Your local changes would be overwritten by cherry-pick."
1398msgstr "您的本地修改将被拣选操作覆盖。"
1399
1b7f4a34 1400#: sequencer.c:219
c04f5ac3
JX
1401msgid "Your local changes would be overwritten by revert."
1402msgstr "您的本地修改将被还原操作覆盖。"
1403
1b7f4a34 1404#: sequencer.c:222
c04f5ac3
JX
1405msgid "Commit your changes or stash them to proceed."
1406msgstr "提交您的修改或保存进度后再继续。"
1407
1408#. TRANSLATORS: %s will be "revert" or "cherry-pick"
1b7f4a34 1409#: sequencer.c:309
c04f5ac3
JX
1410#, c-format
1411msgid "%s: Unable to write new index file"
90e6ef53 1412msgstr "%s:无法写入新索引文件"
c04f5ac3 1413
1b7f4a34 1414#: sequencer.c:327
8ada9598 1415msgid "Could not resolve HEAD commit\n"
81809b99 1416msgstr "不能解析 HEAD 提交\n"
8ada9598 1417
1b7f4a34 1418#: sequencer.c:347
8ada9598 1419msgid "Unable to update cache tree\n"
81809b99 1420msgstr "不能更新缓存\n"
8ada9598 1421
1b7f4a34 1422#: sequencer.c:399
81809b99 1423#, c-format
8ada9598 1424msgid "Could not parse commit %s\n"
81809b99 1425msgstr "不能解析提交 %s\n"
8ada9598 1426
1b7f4a34 1427#: sequencer.c:404
81809b99 1428#, c-format
8ada9598 1429msgid "Could not parse parent commit %s\n"
81809b99 1430msgstr "不能解析父提交 %s\n"
8ada9598 1431
1b7f4a34 1432#: sequencer.c:469
c04f5ac3 1433msgid "Your index file is unmerged."
90e6ef53 1434msgstr "您的索引文件未完成合并。"
c04f5ac3 1435
1b7f4a34 1436#: sequencer.c:488
c04f5ac3
JX
1437#, c-format
1438msgid "Commit %s is a merge but no -m option was given."
1439msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1440
1b7f4a34 1441#: sequencer.c:496
c04f5ac3
JX
1442#, c-format
1443msgid "Commit %s does not have parent %d"
1444msgstr "提交 %s 没有父提交 %d"
1445
1b7f4a34 1446#: sequencer.c:500
c04f5ac3
JX
1447#, c-format
1448msgid "Mainline was specified but commit %s is not a merge."
90e6ef53 1449msgstr "指定了主线但提交 %s 不是一个合并。"
c04f5ac3
JX
1450
1451#. TRANSLATORS: The first %s will be "revert" or
1452#. "cherry-pick", the second %s a SHA1
1b7f4a34 1453#: sequencer.c:513
c04f5ac3
JX
1454#, c-format
1455msgid "%s: cannot parse parent commit %s"
1456msgstr "%s:不能解析父提交 %s"
1457
1b7f4a34 1458#: sequencer.c:517
c04f5ac3
JX
1459#, c-format
1460msgid "Cannot get commit message for %s"
1461msgstr "不能得到 %s 的提交说明"
1462
1b7f4a34 1463#: sequencer.c:603
c04f5ac3
JX
1464#, c-format
1465msgid "could not revert %s... %s"
1466msgstr "不能还原 %s... %s"
1467
1b7f4a34 1468#: sequencer.c:604
c04f5ac3
JX
1469#, c-format
1470msgid "could not apply %s... %s"
1471msgstr "不能应用 %s... %s"
1472
1b7f4a34 1473#: sequencer.c:639
c04f5ac3
JX
1474msgid "empty commit set passed"
1475msgstr "提供了空的提交集"
1476
1b7f4a34 1477#: sequencer.c:647
c04f5ac3
JX
1478#, c-format
1479msgid "git %s: failed to read the index"
90e6ef53 1480msgstr "git %s:无法读取索引"
c04f5ac3 1481
1b7f4a34 1482#: sequencer.c:651
c04f5ac3
JX
1483#, c-format
1484msgid "git %s: failed to refresh the index"
90e6ef53 1485msgstr "git %s:无法刷新索引"
c04f5ac3 1486
1b7f4a34 1487#: sequencer.c:711
c04f5ac3
JX
1488#, c-format
1489msgid "Cannot %s during a %s"
90e6ef53 1490msgstr "无法 %s 在一个 %s 过程中"
c04f5ac3 1491
1b7f4a34 1492#: sequencer.c:733
c04f5ac3
JX
1493#, c-format
1494msgid "Could not parse line %d."
90e6ef53 1495msgstr "不能解析第 %d 行。"
c04f5ac3 1496
1b7f4a34 1497#: sequencer.c:738
c04f5ac3 1498msgid "No commits parsed."
7e238ab7 1499msgstr "没有提交被解析。"
c04f5ac3 1500
1b7f4a34 1501#: sequencer.c:750
c04f5ac3
JX
1502#, c-format
1503msgid "Could not open %s"
1504msgstr "不能打开 %s"
1505
1b7f4a34 1506#: sequencer.c:754
c04f5ac3
JX
1507#, c-format
1508msgid "Could not read %s."
1509msgstr "不能读取 %s。"
1510
1b7f4a34 1511#: sequencer.c:761
c04f5ac3
JX
1512#, c-format
1513msgid "Unusable instruction sheet: %s"
1514msgstr "无用的指令表单:%s"
1515
1b7f4a34 1516#: sequencer.c:791
c04f5ac3
JX
1517#, c-format
1518msgid "Invalid key: %s"
1519msgstr "无效键名:%s"
1520
1b7f4a34 1521#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49
c04f5ac3
JX
1522#, c-format
1523msgid "Invalid value for %s: %s"
81809b99 1524msgstr "%s 的值无效:%s"
c04f5ac3 1525
1b7f4a34 1526#: sequencer.c:804
c04f5ac3
JX
1527#, c-format
1528msgid "Malformed options sheet: %s"
1529msgstr "非法的选项表单:%s"
1530
1b7f4a34 1531#: sequencer.c:823
c04f5ac3
JX
1532msgid "a cherry-pick or revert is already in progress"
1533msgstr "一个拣选或还原操作已在进行"
1534
1b7f4a34 1535#: sequencer.c:824
c04f5ac3
JX
1536msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1537msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1538
1b7f4a34 1539#: sequencer.c:828
c04f5ac3
JX
1540#, c-format
1541msgid "Could not create sequencer directory %s"
90e6ef53 1542msgstr "不能创建序列目录 %s"
c04f5ac3 1543
1b7f4a34 1544#: sequencer.c:844 sequencer.c:926
c04f5ac3
JX
1545#, c-format
1546msgid "Error wrapping up %s."
1547msgstr "错误收尾 %s。"
1548
1b7f4a34 1549#: sequencer.c:863 sequencer.c:996
c04f5ac3 1550msgid "no cherry-pick or revert in progress"
195febda 1551msgstr "拣选或还原操作并未进行"
c04f5ac3 1552
1b7f4a34 1553#: sequencer.c:865
c04f5ac3
JX
1554msgid "cannot resolve HEAD"
1555msgstr "不能解析 HEAD"
1556
1b7f4a34 1557#: sequencer.c:867
c04f5ac3 1558msgid "cannot abort from a branch yet to be born"
90e6ef53 1559msgstr "不能从尚未建立的分支终止"
c04f5ac3 1560
1b7f4a34 1561#: sequencer.c:887 builtin/apply.c:4291
c04f5ac3
JX
1562#, c-format
1563msgid "cannot open %s: %s"
1564msgstr "不能打开 %s:%s"
1565
1b7f4a34 1566#: sequencer.c:890
c04f5ac3
JX
1567#, c-format
1568msgid "cannot read %s: %s"
1569msgstr "不能读取 %s:%s"
1570
1b7f4a34 1571#: sequencer.c:891
c04f5ac3 1572msgid "unexpected end of file"
9aafc933 1573msgstr "意外的文件结束"
c04f5ac3 1574
1b7f4a34 1575#: sequencer.c:897
c04f5ac3
JX
1576#, c-format
1577msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
90e6ef53 1578msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
c04f5ac3 1579
1b7f4a34 1580#: sequencer.c:919
c04f5ac3
JX
1581#, c-format
1582msgid "Could not format %s."
1583msgstr "不能格式化 %s。"
1584
1b7f4a34 1585#: sequencer.c:1064
4dcdc3d8
JX
1586#, c-format
1587msgid "%s: can't cherry-pick a %s"
1588msgstr "%s:不能拣选一个%s"
1589
1b7f4a34 1590#: sequencer.c:1067
4dcdc3d8
JX
1591#, c-format
1592msgid "%s: bad revision"
1593msgstr "%s:错误的版本"
1594
1b7f4a34 1595#: sequencer.c:1101
c04f5ac3
JX
1596msgid "Can't revert as initial commit"
1597msgstr "不能作为初始提交还原"
1598
1b7f4a34 1599#: sequencer.c:1102
c04f5ac3
JX
1600msgid "Can't cherry-pick into empty head"
1601msgstr "不能拣选到空分支"
1602
7aea43ff
JX
1603#: setup.c:243
1604#, c-format
1605msgid "failed to read %s"
1606msgstr "无法读取 %s"
1607
1608#: sha1_name.c:453
2e8451e8
JX
1609msgid ""
1610"Git normally never creates a ref that ends with 40 hex characters\n"
1611"because it will be ignored when you just specify 40-hex. These refs\n"
1612"may be created by mistake. For example,\n"
1613"\n"
1614" git checkout -b $br $(git rev-parse ...)\n"
1615"\n"
1616"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1617"examine these refs and maybe delete them. Turn this message off by\n"
b1894384 1618"running \"git config advice.objectNameWarning false\""
2e8451e8
JX
1619msgstr ""
1620"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1621"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1622"\n"
1623" git checkout -b $br $(git rev-parse ...)\n"
1624"\n"
1625"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
b1894384 1626"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
2e8451e8
JX
1627"命令关闭本消息通知。"
1628
1b7f4a34 1629#: submodule.c:61 submodule.c:95
90314792
JX
1630msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1631msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1632
1b7f4a34 1633#: submodule.c:65 submodule.c:99
90314792
JX
1634#, c-format
1635msgid "Could not find section in .gitmodules where path=%s"
1636msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1637
1b7f4a34 1638#: submodule.c:73
90314792
JX
1639#, c-format
1640msgid "Could not update .gitmodules entry %s"
1641msgstr "不能更新 .gitmodules 条目 %s"
1642
1b7f4a34 1643#: submodule.c:106
90314792
JX
1644#, c-format
1645msgid "Could not remove .gitmodules entry for %s"
1646msgstr "无法移除 %s 的 .gitmodules 条目"
1647
1b7f4a34 1648#: submodule.c:117
90314792
JX
1649msgid "staging updated .gitmodules failed"
1650msgstr "将更新后 .gitmodules 添加暂存区失败"
1651
1b7f4a34 1652#: submodule.c:1045
90314792
JX
1653#, c-format
1654msgid "Could not set core.worktree in %s"
1655msgstr "不能在 %s 中设置 core.worktree"
1656
814ff314
JX
1657#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1658#: trailer.c:561
220c313c
JX
1659#, c-format
1660msgid "unknown value '%s' for key '%s'"
1661msgstr "键 '%2$s' 的未知取值 '%1$s'"
1662
814ff314 1663#: trailer.c:543 trailer.c:548 builtin/remote.c:290
220c313c
JX
1664#, c-format
1665msgid "more than one %s"
1666msgstr "多于一个 %s"
1667
814ff314 1668#: trailer.c:581
220c313c 1669#, c-format
9aeb4c2b
JX
1670msgid "empty trailer token in trailer '%.*s'"
1671msgstr "签名 '%.*s' 的键为空"
220c313c 1672
814ff314 1673#: trailer.c:701
220c313c
JX
1674#, c-format
1675msgid "could not read input file '%s'"
1676msgstr "不能读取输入文件 '%s'"
1677
814ff314 1678#: trailer.c:704
220c313c
JX
1679msgid "could not read from stdin"
1680msgstr "不能自标准输入读取"
1681
1b7f4a34
JX
1682#: transport-helper.c:1025
1683#, c-format
1684msgid "Could not read ref %s"
1685msgstr "不能读取引用 %s"
1686
7aea43ff 1687#: unpack-trees.c:203
6c94aba5
JX
1688msgid "Checking out files"
1689msgstr "正在检出文件"
1690
90314792
JX
1691#: urlmatch.c:120
1692msgid "invalid URL scheme name or missing '://' suffix"
1693msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1694
1695#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1696#, c-format
1697msgid "invalid %XX escape sequence"
1698msgstr "无效的 %XX 转义序列"
1699
1700#: urlmatch.c:172
1701msgid "missing host and scheme is not 'file:'"
4375c10e 1702msgstr "缺失主机名且 URL 方案不是 'file:'"
90314792
JX
1703
1704#: urlmatch.c:189
1705msgid "a 'file:' URL may not have a port number"
1706msgstr "一个 'file:' URL 不应该包含端口号"
1707
1708#: urlmatch.c:199
1709msgid "invalid characters in host name"
1710msgstr "主机名中包含无效的字符"
1711
1712#: urlmatch.c:244 urlmatch.c:255
1713msgid "invalid port number"
1714msgstr "无效的端口号"
1715
1716#: urlmatch.c:322
1717msgid "invalid '..' path segment"
1718msgstr "无效的 '..' 路径片段"
1719
1b7f4a34
JX
1720#: wrapper.c:219 wrapper.c:362
1721#, c-format
1722msgid "could not open '%s' for reading and writing"
1723msgstr "无法打开 '%s' 进行读写"
1724
1725#: wrapper.c:221 wrapper.c:364
1726#, c-format
1727msgid "could not open '%s' for writing"
1728msgstr "无法打开 '%s' 进行写入"
1729
1730#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688
1731#: builtin/merge.c:1076 builtin/pull.c:380
1732#, c-format
1733msgid "could not open '%s' for reading"
1734msgstr "无法打开 '%s' 进行读取"
1735
1736#: wrapper.c:579
07432cef 1737#, c-format
ef317cd5 1738msgid "unable to access '%s': %s"
07432cef
WS
1739msgstr "不能访问 '%s':%s"
1740
1b7f4a34 1741#: wrapper.c:600
07432cef
WS
1742#, c-format
1743msgid "unable to access '%s'"
1744msgstr "不能访问 '%s'"
ef317cd5 1745
1b7f4a34 1746#: wrapper.c:611
d691f479
JX
1747#, c-format
1748msgid "unable to look up current user in the passwd file: %s"
07432cef 1749msgstr "无法在口令文件中查询到当前用户:%s"
d691f479 1750
1b7f4a34 1751#: wrapper.c:612
d691f479
JX
1752msgid "no such user"
1753msgstr "无此用户"
1754
1b7f4a34 1755#: wrapper.c:620
220c313c
JX
1756msgid "unable to get current working directory"
1757msgstr "不能获取当前工作目录"
1758
1b7f4a34 1759#: wrapper.c:631
7aea43ff
JX
1760#, c-format
1761msgid "could not open %s for writing"
1762msgstr "不能写入 %s"
1763
1b7f4a34 1764#: wrapper.c:642 builtin/am.c:424
7aea43ff
JX
1765#, c-format
1766msgid "could not write to %s"
1767msgstr "不能写入 %s"
1768
1b7f4a34 1769#: wrapper.c:648
7aea43ff
JX
1770#, c-format
1771msgid "could not close %s"
1772msgstr "不能关闭 %s"
1773
1b7f4a34 1774#: wt-status.c:149
c04f5ac3
JX
1775msgid "Unmerged paths:"
1776msgstr "未合并的路径:"
1777
90e6ef53 1778# 译者:注意保持前导空格
1b7f4a34 1779#: wt-status.c:176 wt-status.c:203
c04f5ac3
JX
1780#, c-format
1781msgid " (use \"git reset %s <file>...\" to unstage)"
160fb2b2 1782msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
c04f5ac3 1783
90e6ef53 1784# 译者:注意保持前导空格
1b7f4a34 1785#: wt-status.c:178 wt-status.c:205
c04f5ac3 1786msgid " (use \"git rm --cached <file>...\" to unstage)"
160fb2b2 1787msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
c04f5ac3 1788
90e6ef53 1789# 译者:注意保持前导空格
1b7f4a34 1790#: wt-status.c:182
6792b93b 1791msgid " (use \"git add <file>...\" to mark resolution)"
d9d56b23 1792msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
6792b93b
JX
1793
1794# 译者:注意保持前导空格
1b7f4a34 1795#: wt-status.c:184 wt-status.c:188
c04f5ac3 1796msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
d9d56b23 1797msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
c04f5ac3 1798
6792b93b 1799# 译者:注意保持前导空格
1b7f4a34 1800#: wt-status.c:186
6792b93b 1801msgid " (use \"git rm <file>...\" to mark resolution)"
d9d56b23 1802msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
6792b93b 1803
1b7f4a34 1804#: wt-status.c:197 wt-status.c:880
c04f5ac3
JX
1805msgid "Changes to be committed:"
1806msgstr "要提交的变更:"
1807
1b7f4a34 1808#: wt-status.c:215 wt-status.c:889
c04f5ac3 1809msgid "Changes not staged for commit:"
7e238ab7 1810msgstr "尚未暂存以备提交的变更:"
c04f5ac3 1811
90e6ef53 1812# 译者:注意保持前导空格
1b7f4a34 1813#: wt-status.c:219
c04f5ac3 1814msgid " (use \"git add <file>...\" to update what will be committed)"
d9d56b23 1815msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
c04f5ac3 1816
90e6ef53 1817# 译者:注意保持前导空格
1b7f4a34 1818#: wt-status.c:221
c04f5ac3 1819msgid " (use \"git add/rm <file>...\" to update what will be committed)"
d9d56b23 1820msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
c04f5ac3 1821
90e6ef53 1822# 译者:注意保持前导空格
1b7f4a34 1823#: wt-status.c:222
c04f5ac3
JX
1824msgid ""
1825" (use \"git checkout -- <file>...\" to discard changes in working directory)"
d9d56b23 1826msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
c04f5ac3 1827
90e6ef53 1828# 译者:注意保持前导空格
1b7f4a34 1829#: wt-status.c:224
c04f5ac3
JX
1830msgid " (commit or discard the untracked or modified content in submodules)"
1831msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1832
90e6ef53 1833# 译者:注意保持前导空格
1b7f4a34 1834#: wt-status.c:236
c04f5ac3
JX
1835#, c-format
1836msgid " (use \"git %s <file>...\" to include in what will be committed)"
d9d56b23 1837msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
c04f5ac3 1838
1b7f4a34 1839#: wt-status.c:251
c04f5ac3
JX
1840msgid "both deleted:"
1841msgstr "双方删除:"
1842
1b7f4a34 1843#: wt-status.c:253
c04f5ac3
JX
1844msgid "added by us:"
1845msgstr "由我们添加:"
1846
1b7f4a34 1847#: wt-status.c:255
c04f5ac3
JX
1848msgid "deleted by them:"
1849msgstr "由他们删除:"
1850
1b7f4a34 1851#: wt-status.c:257
c04f5ac3
JX
1852msgid "added by them:"
1853msgstr "由他们添加:"
1854
1b7f4a34 1855#: wt-status.c:259
c04f5ac3
JX
1856msgid "deleted by us:"
1857msgstr "由我们删除:"
1858
1b7f4a34 1859#: wt-status.c:261
c04f5ac3
JX
1860msgid "both added:"
1861msgstr "双方添加:"
1862
1b7f4a34 1863#: wt-status.c:263
c04f5ac3
JX
1864msgid "both modified:"
1865msgstr "双方修改:"
1866
1b7f4a34 1867#: wt-status.c:265
6c94aba5
JX
1868#, c-format
1869msgid "bug: unhandled unmerged status %x"
1870msgstr "bug:无法处理的未合并状态 %x"
cfff71a9 1871
1b7f4a34 1872#: wt-status.c:273
6c94aba5
JX
1873msgid "new file:"
1874msgstr "新文件:"
cfff71a9 1875
1b7f4a34 1876#: wt-status.c:275
6c94aba5
JX
1877msgid "copied:"
1878msgstr "拷贝:"
cfff71a9 1879
1b7f4a34 1880#: wt-status.c:277
6c94aba5
JX
1881msgid "deleted:"
1882msgstr "删除:"
cfff71a9 1883
1b7f4a34 1884#: wt-status.c:279
6c94aba5
JX
1885msgid "modified:"
1886msgstr "修改:"
1887
1b7f4a34 1888#: wt-status.c:281
6c94aba5
JX
1889msgid "renamed:"
1890msgstr "重命名:"
1891
1b7f4a34 1892#: wt-status.c:283
6c94aba5
JX
1893msgid "typechange:"
1894msgstr "类型变更:"
1895
1b7f4a34 1896#: wt-status.c:285
6c94aba5
JX
1897msgid "unknown:"
1898msgstr "未知:"
cfff71a9 1899
1b7f4a34 1900#: wt-status.c:287
6c94aba5
JX
1901msgid "unmerged:"
1902msgstr "未合并:"
cfff71a9 1903
90e6ef53 1904# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1b7f4a34 1905#: wt-status.c:369
c04f5ac3 1906msgid "new commits, "
aa9565f7 1907msgstr "新提交, "
c04f5ac3 1908
90e6ef53 1909# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1b7f4a34 1910#: wt-status.c:371
c04f5ac3 1911msgid "modified content, "
aa9565f7 1912msgstr "修改的内容, "
c04f5ac3 1913
90e6ef53 1914# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1b7f4a34 1915#: wt-status.c:373
c04f5ac3 1916msgid "untracked content, "
aa9565f7 1917msgstr "未跟踪的内容, "
c04f5ac3 1918
1b7f4a34 1919#: wt-status.c:390
c04f5ac3
JX
1920#, c-format
1921msgid "bug: unhandled diff status %c"
6c94aba5 1922msgstr "bug:无法处理的差异状态 %c"
c04f5ac3 1923
1b7f4a34 1924#: wt-status.c:754
90314792
JX
1925msgid "Submodules changed but not updated:"
1926msgstr "子模组已修改但尚未更新:"
1927
1b7f4a34 1928#: wt-status.c:756
90314792
JX
1929msgid "Submodule changes to be committed:"
1930msgstr "要提交的子模组变更:"
1931
1b7f4a34 1932#: wt-status.c:837
cfff71a9
JX
1933msgid ""
1934"Do not touch the line above.\n"
1935"Everything below will be removed."
1936msgstr ""
1937"不要改动上面的一行。\n"
1938"下面的所有内容均将被删除。"
1939
1b7f4a34 1940#: wt-status.c:948
6792b93b 1941msgid "You have unmerged paths."
195febda 1942msgstr "您有尚未合并的路径。"
6792b93b
JX
1943
1944# 译者:注意保持前导空格
1b7f4a34 1945#: wt-status.c:951
6792b93b
JX
1946msgid " (fix conflicts and run \"git commit\")"
1947msgstr " (解决冲突并运行 \"git commit\")"
1948
1b7f4a34 1949#: wt-status.c:954
6792b93b
JX
1950msgid "All conflicts fixed but you are still merging."
1951msgstr "所有冲突已解决但您仍处于合并中。"
1952
1953# 译者:注意保持前导空格
1b7f4a34 1954#: wt-status.c:957
6792b93b
JX
1955msgid " (use \"git commit\" to conclude merge)"
1956msgstr " (使用 \"git commit\" 结束合并)"
1957
1b7f4a34 1958#: wt-status.c:967
6792b93b 1959msgid "You are in the middle of an am session."
98b2761d 1960msgstr "您正处于 am 操作过程中。"
6792b93b 1961
1b7f4a34 1962#: wt-status.c:970
6792b93b
JX
1963msgid "The current patch is empty."
1964msgstr "当前的补丁为空。"
1965
1966# 译者:注意保持前导空格
1b7f4a34 1967#: wt-status.c:974
2e8451e8
JX
1968msgid " (fix conflicts and then run \"git am --continue\")"
1969msgstr " (解决冲突,然后运行 \"git am --continue\")"
6792b93b
JX
1970
1971# 译者:注意保持前导空格
1b7f4a34 1972#: wt-status.c:976
6792b93b
JX
1973msgid " (use \"git am --skip\" to skip this patch)"
1974msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1975
1976# 译者:注意保持前导空格
1b7f4a34 1977#: wt-status.c:978
6792b93b
JX
1978msgid " (use \"git am --abort\" to restore the original branch)"
1979msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1980
1b7f4a34
JX
1981#: wt-status.c:1105
1982msgid "No commands done."
1983msgstr "没有命令被执行。"
1984
1985#: wt-status.c:1108
1986#, c-format
1987msgid "Last command done (%d command done):"
1988msgid_plural "Last commands done (%d commands done):"
1989msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
1990msgstr[1] "最后的命令已完成(%d 条命令被执行):"
1991
1992#: wt-status.c:1119
1993#, c-format
1994msgid " (see more in file %s)"
1995msgstr " (更多参见文件 %s)"
1996
1997#: wt-status.c:1124
1998msgid "No commands remaining."
1999msgstr "未剩下任何命令。"
2000
2001#: wt-status.c:1127
2002#, c-format
2003msgid "Next command to do (%d remaining command):"
2004msgid_plural "Next commands to do (%d remaining commands):"
2005msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
2006msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
2007
2008# 译者:注意保持前导空格
2009#: wt-status.c:1135
2010msgid " (use \"git rebase --edit-todo\" to view and edit)"
2011msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
2012
2013#: wt-status.c:1148
63af42fe
JX
2014#, c-format
2015msgid "You are currently rebasing branch '%s' on '%s'."
98b2761d 2016msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
63af42fe 2017
1b7f4a34 2018#: wt-status.c:1153
6792b93b 2019msgid "You are currently rebasing."
98b2761d 2020msgstr "您在执行变基操作。"
6792b93b
JX
2021
2022# 译者:注意保持前导空格
1b7f4a34 2023#: wt-status.c:1167
6792b93b
JX
2024msgid " (fix conflicts and then run \"git rebase --continue\")"
2025msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
2026
2027# 译者:注意保持前导空格
1b7f4a34 2028#: wt-status.c:1169
6792b93b
JX
2029msgid " (use \"git rebase --skip\" to skip this patch)"
2030msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
2031
2032# 译者:注意保持前导空格
1b7f4a34 2033#: wt-status.c:1171
6792b93b
JX
2034msgid " (use \"git rebase --abort\" to check out the original branch)"
2035msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
2036
2037# 译者:注意保持前导空格
1b7f4a34 2038#: wt-status.c:1177
6792b93b
JX
2039msgid " (all conflicts fixed: run \"git rebase --continue\")"
2040msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
2041
1b7f4a34 2042#: wt-status.c:1181
63af42fe
JX
2043#, c-format
2044msgid ""
2045"You are currently splitting a commit while rebasing branch '%s' on '%s'."
98b2761d 2046msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
63af42fe 2047
1b7f4a34 2048#: wt-status.c:1186
6792b93b 2049msgid "You are currently splitting a commit during a rebase."
98b2761d 2050msgstr "您在执行变基操作时拆分提交。"
6792b93b
JX
2051
2052# 译者:注意保持前导空格
1b7f4a34 2053#: wt-status.c:1189
6792b93b
JX
2054msgid " (Once your working directory is clean, run \"git rebase --continue\")"
2055msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
2056
1b7f4a34 2057#: wt-status.c:1193
63af42fe
JX
2058#, c-format
2059msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
98b2761d 2060msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
63af42fe 2061
1b7f4a34 2062#: wt-status.c:1198
6792b93b 2063msgid "You are currently editing a commit during a rebase."
98b2761d 2064msgstr "您在执行变基操作时编辑提交。"
6792b93b
JX
2065
2066# 译者:注意保持前导空格
1b7f4a34 2067#: wt-status.c:1201
6792b93b
JX
2068msgid " (use \"git commit --amend\" to amend the current commit)"
2069msgstr " (使用 \"git commit --amend\" 修补当前提交)"
2070
2071# 译者:注意保持前导空格
1b7f4a34 2072#: wt-status.c:1203
6792b93b
JX
2073msgid ""
2074" (use \"git rebase --continue\" once you are satisfied with your changes)"
195febda 2075msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
6792b93b 2076
1b7f4a34 2077#: wt-status.c:1213
90314792
JX
2078#, c-format
2079msgid "You are currently cherry-picking commit %s."
98b2761d 2080msgstr "您在执行拣选提交 %s 的操作。"
6792b93b 2081
2e8451e8 2082# 译者:注意保持前导空格
1b7f4a34 2083#: wt-status.c:1218
2e8451e8
JX
2084msgid " (fix conflicts and run \"git cherry-pick --continue\")"
2085msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
2086
6792b93b 2087# 译者:注意保持前导空格
1b7f4a34 2088#: wt-status.c:1221
2e8451e8
JX
2089msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
2090msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
6792b93b 2091
2e8451e8 2092# 译者:注意保持前导空格
1b7f4a34 2093#: wt-status.c:1223
2e8451e8
JX
2094msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2095msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
2096
1b7f4a34 2097#: wt-status.c:1232
1003b3a5
JX
2098#, c-format
2099msgid "You are currently reverting commit %s."
98b2761d 2100msgstr "您在执行反转提交 %s 的操作。"
1003b3a5
JX
2101
2102# 译者:注意保持前导空格
1b7f4a34 2103#: wt-status.c:1237
1003b3a5
JX
2104msgid " (fix conflicts and run \"git revert --continue\")"
2105msgstr " (解决冲突并运行 \"git revert --continue\")"
2106
2107# 译者:注意保持前导空格
1b7f4a34 2108#: wt-status.c:1240
1003b3a5
JX
2109msgid " (all conflicts fixed: run \"git revert --continue\")"
2110msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
2111
2112# 译者:注意保持前导空格
1b7f4a34 2113#: wt-status.c:1242
1003b3a5
JX
2114msgid " (use \"git revert --abort\" to cancel the revert operation)"
2115msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
2116
1b7f4a34 2117#: wt-status.c:1253
63af42fe 2118#, c-format
1003b3a5 2119msgid "You are currently bisecting, started from branch '%s'."
98b2761d 2120msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
63af42fe 2121
1b7f4a34 2122#: wt-status.c:1257
6792b93b 2123msgid "You are currently bisecting."
98b2761d 2124msgstr "您在执行二分查找操作。"
6792b93b
JX
2125
2126# 译者:注意保持前导空格
1b7f4a34 2127#: wt-status.c:1260
6792b93b
JX
2128msgid " (use \"git bisect reset\" to get back to the original branch)"
2129msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
2130
1b7f4a34 2131#: wt-status.c:1437
c04f5ac3
JX
2132msgid "On branch "
2133msgstr "位于分支 "
2134
1b7f4a34
JX
2135#: wt-status.c:1445
2136msgid "interactive rebase in progress; onto "
2137msgstr "交互式变基操作正在进行中;至 "
2138
2139#: wt-status.c:1447
2e8451e8 2140msgid "rebase in progress; onto "
98b2761d 2141msgstr "变基操作正在进行中;至 "
2e8451e8 2142
1b7f4a34 2143#: wt-status.c:1452
1003b3a5
JX
2144msgid "HEAD detached at "
2145msgstr "头指针分离于 "
2146
1b7f4a34 2147#: wt-status.c:1454
1003b3a5
JX
2148msgid "HEAD detached from "
2149msgstr "头指针分离自 "
2150
1b7f4a34 2151#: wt-status.c:1457
c04f5ac3
JX
2152msgid "Not currently on any branch."
2153msgstr "当前不在任何分支上。"
2154
1b7f4a34 2155#: wt-status.c:1474
c04f5ac3
JX
2156msgid "Initial commit"
2157msgstr "初始提交"
2158
1b7f4a34 2159#: wt-status.c:1488
ef317cd5 2160msgid "Untracked files"
07432cef 2161msgstr "未跟踪的文件"
c04f5ac3 2162
1b7f4a34 2163#: wt-status.c:1490
ef317cd5 2164msgid "Ignored files"
07432cef 2165msgstr "忽略的文件"
c04f5ac3 2166
1b7f4a34 2167#: wt-status.c:1494
1003b3a5 2168#, c-format
4dcdc3d8
JX
2169msgid ""
2170"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2171"may speed it up, but you have to be careful not to forget to add\n"
2172"new files yourself (see 'git help status')."
2173msgstr ""
2174"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
2175"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1003b3a5 2176
1b7f4a34 2177#: wt-status.c:1500
c04f5ac3
JX
2178#, c-format
2179msgid "Untracked files not listed%s"
2180msgstr "未跟踪的文件没有列出%s"
2181
7e238ab7 2182# 译者:中文字符串拼接,可删除前导空格
1b7f4a34 2183#: wt-status.c:1502
c04f5ac3 2184msgid " (use -u option to show untracked files)"
7e238ab7 2185msgstr "(使用 -u 参数显示未跟踪的文件)"
c04f5ac3 2186
1b7f4a34 2187#: wt-status.c:1508
c04f5ac3
JX
2188msgid "No changes"
2189msgstr "没有修改"
2190
1b7f4a34 2191#: wt-status.c:1513
07432cef 2192#, c-format
ef317cd5 2193msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
07432cef 2194msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
c04f5ac3 2195
1b7f4a34 2196#: wt-status.c:1516
07432cef 2197#, c-format
ef317cd5 2198msgid "no changes added to commit\n"
07432cef 2199msgstr "修改尚未加入提交\n"
c04f5ac3 2200
1b7f4a34 2201#: wt-status.c:1519
07432cef 2202#, c-format
ef317cd5
JX
2203msgid ""
2204"nothing added to commit but untracked files present (use \"git add\" to "
2205"track)\n"
07432cef 2206msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
c04f5ac3 2207
1b7f4a34 2208#: wt-status.c:1522
07432cef 2209#, c-format
ef317cd5 2210msgid "nothing added to commit but untracked files present\n"
07432cef 2211msgstr "提交为空,但是存在尚未跟踪的文件\n"
c04f5ac3 2212
7e238ab7 2213# 译者:中文字符串拼接,可删除前导空格
1b7f4a34 2214#: wt-status.c:1525
07432cef 2215#, c-format
ef317cd5 2216msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
07432cef 2217msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
c04f5ac3 2218
1b7f4a34 2219#: wt-status.c:1528 wt-status.c:1533
07432cef 2220#, c-format
ef317cd5 2221msgid "nothing to commit\n"
07432cef 2222msgstr "无文件要提交\n"
ef317cd5 2223
7e238ab7 2224# 译者:中文字符串拼接,可删除前导空格
1b7f4a34 2225#: wt-status.c:1531
07432cef 2226#, c-format
ef317cd5 2227msgid "nothing to commit (use -u to show untracked files)\n"
07432cef 2228msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
c04f5ac3 2229
7e238ab7 2230# 译者:中文字符串拼接,可删除前导空格
1b7f4a34 2231#: wt-status.c:1535
07432cef 2232#, c-format
ef317cd5 2233msgid "nothing to commit, working directory clean\n"
07432cef 2234msgstr "无文件要提交,干净的工作区\n"
c04f5ac3 2235
1b7f4a34 2236#: wt-status.c:1644
c04f5ac3 2237msgid "HEAD (no branch)"
61bc0753 2238msgstr "HEAD(非分支)"
c04f5ac3 2239
90e6ef53 2240# 译者:注意保持句尾空格
1b7f4a34 2241#: wt-status.c:1650
c04f5ac3
JX
2242msgid "Initial commit on "
2243msgstr "初始提交于 "
2244
1b7f4a34 2245#: wt-status.c:1677
90314792
JX
2246msgid "gone"
2247msgstr "丢失"
2248
90e6ef53 2249# 译者:注意保持句尾空格
1b7f4a34 2250#: wt-status.c:1679 wt-status.c:1687
c04f5ac3
JX
2251msgid "behind "
2252msgstr "落后 "
2253
1b7f4a34 2254#: compat/precompose_utf8.c:55 builtin/clone.c:403
a77c07d9
JX
2255#, c-format
2256msgid "failed to unlink '%s'"
2257msgstr "无法删除 '%s'"
2258
220c313c 2259#: builtin/add.c:22
814ff314 2260msgid "git add [<options>] [--] <pathspec>..."
160fb2b2 2261msgstr "git add [<选项>] [--] <路径规格>..."
ef317cd5 2262
220c313c 2263#: builtin/add.c:65
c04f5ac3
JX
2264#, c-format
2265msgid "unexpected diff status %c"
2266msgstr "意外的差异状态 %c"
2267
44f518e6 2268#: builtin/add.c:70 builtin/commit.c:277
c04f5ac3
JX
2269msgid "updating files failed"
2270msgstr "更新文件失败"
2271
220c313c 2272#: builtin/add.c:80
c04f5ac3
JX
2273#, c-format
2274msgid "remove '%s'\n"
2275msgstr "删除 '%s'\n"
2276
220c313c 2277#: builtin/add.c:134
c04f5ac3 2278msgid "Unstaged changes after refreshing the index:"
90e6ef53 2279msgstr "刷新索引之后尚未被暂存的变更:"
c04f5ac3 2280
1b7f4a34 2281#: builtin/add.c:194 builtin/rev-parse.c:799
c04f5ac3 2282msgid "Could not read the index"
90e6ef53 2283msgstr "不能读取索引"
c04f5ac3 2284
220c313c 2285#: builtin/add.c:205
c04f5ac3
JX
2286#, c-format
2287msgid "Could not open '%s' for writing."
1b7f4a34 2288msgstr "无法打开 '%s' 进行写入。"
c04f5ac3 2289
220c313c 2290#: builtin/add.c:209
c04f5ac3 2291msgid "Could not write patch"
195febda 2292msgstr "不能生成补丁"
c04f5ac3 2293
7aea43ff
JX
2294#: builtin/add.c:212
2295msgid "editing patch failed"
2296msgstr "编辑补丁失败"
2297
2298#: builtin/add.c:215
c04f5ac3
JX
2299#, c-format
2300msgid "Could not stat '%s'"
90e6ef53 2301msgstr "不能查看文件状态 '%s'"
c04f5ac3 2302
7aea43ff 2303#: builtin/add.c:217
c04f5ac3
JX
2304msgid "Empty patch. Aborted."
2305msgstr "空补丁。异常终止。"
2306
7aea43ff 2307#: builtin/add.c:222
8ada9598
JX
2308#, c-format
2309msgid "Could not apply '%s'"
2310msgstr "不能应用 '%s'"
2311
7aea43ff 2312#: builtin/add.c:232
8ada9598 2313msgid "The following paths are ignored by one of your .gitignore files:\n"
195febda 2314msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 2315
1b7f4a34
JX
2316#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110
2317#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
2318#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162
ef317cd5 2319msgid "dry run"
07432cef 2320msgstr "演习"
ef317cd5 2321
7aea43ff 2322#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
1b7f4a34
JX
2323#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636
2324#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114
ef317cd5
JX
2325msgid "be verbose"
2326msgstr "冗长输出"
2327
7aea43ff 2328#: builtin/add.c:252
ef317cd5 2329msgid "interactive picking"
07432cef 2330msgstr "交互式拣选"
ef317cd5 2331
1b7f4a34 2332#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286
ef317cd5 2333msgid "select hunks interactively"
07432cef 2334msgstr "交互式挑选数据块"
ef317cd5 2335
7aea43ff 2336#: builtin/add.c:254
ef317cd5 2337msgid "edit current diff and apply"
07432cef 2338msgstr "编辑当前差异并应用"
ef317cd5 2339
7aea43ff 2340#: builtin/add.c:255
ef317cd5 2341msgid "allow adding otherwise ignored files"
07432cef 2342msgstr "允许添加忽略的文件"
ef317cd5 2343
7aea43ff 2344#: builtin/add.c:256
ef317cd5 2345msgid "update tracked files"
07432cef 2346msgstr "更新已跟踪的文件"
ef317cd5 2347
7aea43ff 2348#: builtin/add.c:257
ef317cd5 2349msgid "record only the fact that the path will be added later"
07432cef 2350msgstr "只记录,该路径稍后再添加"
ef317cd5 2351
7aea43ff 2352#: builtin/add.c:258
ef317cd5 2353msgid "add changes from all tracked and untracked files"
07432cef 2354msgstr "添加所有改变的已跟踪文件和未跟踪文件"
ef317cd5 2355
7aea43ff 2356#: builtin/add.c:261
4dcdc3d8
JX
2357msgid "ignore paths removed in the working tree (same as --no-all)"
2358msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2359
7aea43ff 2360#: builtin/add.c:263
ef317cd5 2361msgid "don't add, only refresh the index"
07432cef 2362msgstr "不添加,只刷新索引"
ef317cd5 2363
7aea43ff 2364#: builtin/add.c:264
ef317cd5 2365msgid "just skip files which cannot be added because of errors"
07432cef 2366msgstr "跳过因出错不能添加的文件"
ef317cd5 2367
7aea43ff 2368#: builtin/add.c:265
ef317cd5 2369msgid "check if - even missing - files are ignored in dry run"
07432cef 2370msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
ef317cd5 2371
7aea43ff 2372#: builtin/add.c:287
8ada9598
JX
2373#, c-format
2374msgid "Use -f if you really want to add them.\n"
2375msgstr "使用 -f 参数如果您确实要添加它们。\n"
2376
7aea43ff 2377#: builtin/add.c:294
8ada9598
JX
2378msgid "adding files failed"
2379msgstr "添加文件失败"
2380
7aea43ff 2381#: builtin/add.c:330
8ada9598
JX
2382msgid "-A and -u are mutually incompatible"
2383msgstr "-A 和 -u 选项互斥"
2384
7aea43ff 2385#: builtin/add.c:337
8ada9598 2386msgid "Option --ignore-missing can only be used together with --dry-run"
649900bc 2387msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 2388
7aea43ff 2389#: builtin/add.c:358
8ada9598
JX
2390#, c-format
2391msgid "Nothing specified, nothing added.\n"
2392msgstr "没有指定文件,也没有文件被添加。\n"
2393
7aea43ff 2394#: builtin/add.c:359
8ada9598
JX
2395#, c-format
2396msgid "Maybe you wanted to say 'git add .'?\n"
2397msgstr "也许您想要执行 'git add .'?\n"
2398
1b7f4a34
JX
2399#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940
2400#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
8ada9598
JX
2401msgid "index file corrupt"
2402msgstr "索引文件损坏"
2403
1b7f4a34 2404#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
8ada9598
JX
2405msgid "Unable to write new index file"
2406msgstr "无法写入新索引文件"
2407
1b7f4a34
JX
2408#: builtin/am.c:41
2409#, c-format
2410msgid "could not stat %s"
2411msgstr "不能获取 %s 的文件状态"
2412
03ea3327 2413#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737
1b7f4a34
JX
2414#: builtin/merge.c:1079
2415#, c-format
2416msgid "could not read '%s'"
2417msgstr "不能读取 '%s'"
2418
2419#: builtin/am.c:444
2420msgid "could not parse author script"
2421msgstr "不能解析作者脚本"
2422
2423#: builtin/am.c:521
2424#, c-format
2425msgid "'%s' was deleted by the applypatch-msg hook"
2426msgstr "'%s' 被 applypatch-msg 钩子删除"
2427
2428#: builtin/am.c:562 builtin/notes.c:300
2429#, c-format
2430msgid "Malformed input line: '%s'."
2431msgstr "非法的输入行:'%s'。"
2432
2433#: builtin/am.c:599 builtin/notes.c:315
2434#, c-format
2435msgid "Failed to copy notes from '%s' to '%s'"
2436msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
2437
2438#: builtin/am.c:625
2439msgid "fseek failed"
2440msgstr "fseek 失败"
2441
2442#: builtin/am.c:786 builtin/am.c:874
2443#, c-format
2444msgid "could not open '%s' for reading: %s"
2445msgstr "无法打开 '%s' 进行读取:%s"
2446
2447#: builtin/am.c:793
2448#, c-format
2449msgid "could not open '%s' for writing: %s"
2450msgstr "无法打开 '%s' 进行写入:%s"
2451
2452#: builtin/am.c:802
2453#, c-format
2454msgid "could not parse patch '%s'"
2455msgstr "无法解析补丁 '%s'"
2456
2457#: builtin/am.c:867
2458msgid "Only one StGIT patch series can be applied at once"
2459msgstr "一次只能有一个 StGIT 补丁队列被应用"
2460
2461#: builtin/am.c:915
2462msgid "invalid timestamp"
2463msgstr "无效的时间戳"
2464
2465#: builtin/am.c:918 builtin/am.c:926
2466msgid "invalid Date line"
2467msgstr "无效的日期行"
2468
2469#: builtin/am.c:923
2470msgid "invalid timezone offset"
2471msgstr "无效的时区偏移值"
2472
2473#: builtin/am.c:1010
2474msgid "Patch format detection failed."
2475msgstr "补丁格式检测失败。"
2476
2477#: builtin/am.c:1015 builtin/clone.c:368
2478#, c-format
2479msgid "failed to create directory '%s'"
2480msgstr "无法创建目录 '%s'"
2481
2482#: builtin/am.c:1019
2483msgid "Failed to split patches."
2484msgstr "无法拆分补丁。"
2485
2486#: builtin/am.c:1151 builtin/commit.c:362
2487msgid "unable to write index file"
2488msgstr "无法写入索引文件"
2489
2490#: builtin/am.c:1202
2491#, c-format
2492msgid "When you have resolved this problem, run \"%s --continue\"."
2493msgstr "当您解决这一问题,执行 \"%s --continue\"。"
2494
2495#: builtin/am.c:1203
2496#, c-format
2497msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2498msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
2499
2500#: builtin/am.c:1204
2501#, c-format
2502msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2503msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
2504
03ea3327 2505#: builtin/am.c:1339
1b7f4a34
JX
2506msgid "Patch is empty. Was it split wrong?"
2507msgstr "补丁为空。是不是切分错误?"
2508
03ea3327 2509#: builtin/am.c:1413 builtin/log.c:1345
1b7f4a34
JX
2510#, c-format
2511msgid "invalid ident line: %s"
2512msgstr "包含无效的身份标识:%s"
2513
03ea3327 2514#: builtin/am.c:1440
1b7f4a34
JX
2515#, c-format
2516msgid "unable to parse commit %s"
2517msgstr "不能解析提交 %s"
2518
03ea3327 2519#: builtin/am.c:1614
1b7f4a34
JX
2520msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2521msgstr "仓库缺乏必要的数据对象以进行三方合并。"
2522
03ea3327 2523#: builtin/am.c:1616
1b7f4a34
JX
2524msgid "Using index info to reconstruct a base tree..."
2525msgstr "使用索引来重建一个(三方合并的)基础目录树..."
2526
03ea3327 2527#: builtin/am.c:1635
1b7f4a34
JX
2528msgid ""
2529"Did you hand edit your patch?\n"
2530"It does not apply to blobs recorded in its index."
2531msgstr ""
2532"您是否曾手动编辑过您的补丁?\n"
2533"无法应用补丁到索引中的数据对象上。"
2534
03ea3327 2535#: builtin/am.c:1641
1b7f4a34
JX
2536msgid "Falling back to patching base and 3-way merge..."
2537msgstr "回落到基础版本上打补丁及进行三方合并..."
2538
03ea3327 2539#: builtin/am.c:1666
1b7f4a34
JX
2540msgid "Failed to merge in the changes."
2541msgstr "无法合并变更。"
2542
03ea3327 2543#: builtin/am.c:1691 builtin/merge.c:632
1b7f4a34
JX
2544msgid "git write-tree failed to write a tree"
2545msgstr "git write-tree 无法写入一树对象"
2546
03ea3327 2547#: builtin/am.c:1698
1b7f4a34
JX
2548msgid "applying to an empty history"
2549msgstr "正应用到一个空历史上"
2550
03ea3327 2551#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829
1b7f4a34
JX
2552#: builtin/merge.c:854
2553msgid "failed to write commit object"
2554msgstr "无法写提交对象"
2555
03ea3327 2556#: builtin/am.c:1743 builtin/am.c:1747
1b7f4a34
JX
2557#, c-format
2558msgid "cannot resume: %s does not exist."
2559msgstr "无法继续:%s 不存在。"
2560
03ea3327 2561#: builtin/am.c:1763
1b7f4a34
JX
2562msgid "cannot be interactive without stdin connected to a terminal."
2563msgstr "标准输入没有和终端关联,不能进行交互式操作。"
2564
03ea3327 2565#: builtin/am.c:1768
1b7f4a34
JX
2566msgid "Commit Body is:"
2567msgstr "提交内容为:"
2568
2569# 译者:注意保持句尾空格
2570#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
2571#. in your translation. The program will only accept English
2572#. input at this point.
2573#.
03ea3327 2574#: builtin/am.c:1778
1b7f4a34
JX
2575msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
2576msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
2577
03ea3327 2578#: builtin/am.c:1828
1b7f4a34
JX
2579#, c-format
2580msgid "Dirty index: cannot apply patches (dirty: %s)"
2581msgstr "脏索引:不能应用补丁(脏文件:%s)"
2582
03ea3327 2583#: builtin/am.c:1863 builtin/am.c:1934
1b7f4a34
JX
2584#, c-format
2585msgid "Applying: %.*s"
2586msgstr "应用:%.*s"
2587
03ea3327 2588#: builtin/am.c:1879
1b7f4a34
JX
2589msgid "No changes -- Patch already applied."
2590msgstr "没有变更 —— 补丁已经应用过。"
2591
03ea3327 2592#: builtin/am.c:1887
1b7f4a34
JX
2593#, c-format
2594msgid "Patch failed at %s %.*s"
2595msgstr "打补丁失败于 %s %.*s"
2596
03ea3327 2597#: builtin/am.c:1893
1b7f4a34
JX
2598#, c-format
2599msgid "The copy of the patch that failed is found in: %s"
2600msgstr "失败的补丁文件副本位于:%s"
2601
03ea3327 2602#: builtin/am.c:1937
1b7f4a34
JX
2603msgid ""
2604"No changes - did you forget to use 'git add'?\n"
2605"If there is nothing left to stage, chances are that something else\n"
2606"already introduced the same changes; you might want to skip this patch."
2607msgstr ""
2608"没有变更 —— 您是不是忘了执行 'git add'?\n"
2609"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
2610"您也许想要跳过这个补丁。"
2611
03ea3327 2612#: builtin/am.c:1944
1b7f4a34
JX
2613msgid ""
2614"You still have unmerged paths in your index.\n"
2615"Did you forget to use 'git add'?"
2616msgstr ""
2617"您的索引中仍有未合并的路径。\n"
2618"您是否忘了执行 'git add'?"
2619
03ea3327 2620#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308
1b7f4a34
JX
2621#: builtin/reset.c:316
2622#, c-format
2623msgid "Could not parse object '%s'."
2624msgstr "不能解析对象 '%s'。"
2625
03ea3327 2626#: builtin/am.c:2104
1b7f4a34
JX
2627msgid "failed to clean index"
2628msgstr "无法清空索引"
2629
03ea3327 2630#: builtin/am.c:2138
1b7f4a34
JX
2631msgid ""
2632"You seem to have moved HEAD since the last 'am' failure.\n"
2633"Not rewinding to ORIG_HEAD"
2634msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
2635
03ea3327 2636#: builtin/am.c:2199
1b7f4a34
JX
2637#, c-format
2638msgid "Invalid value for --patch-format: %s"
2639msgstr "无效的 --patch-format 值:%s"
2640
03ea3327 2641#: builtin/am.c:2221
1b7f4a34
JX
2642msgid "git am [options] [(<mbox>|<Maildir>)...]"
2643msgstr "git am [选项] [(<mbox>|<Maildir>)...]"
2644
03ea3327 2645#: builtin/am.c:2222
1b7f4a34
JX
2646msgid "git am [options] (--continue | --skip | --abort)"
2647msgstr "git am [选项] (--continue | --skip | --abort)"
2648
03ea3327 2649#: builtin/am.c:2228
1b7f4a34
JX
2650msgid "run interactively"
2651msgstr "以交互式方式运行"
2652
03ea3327 2653#: builtin/am.c:2230
1b7f4a34
JX
2654msgid "historical option -- no-op"
2655msgstr "老的参数 —— 无作用"
2656
03ea3327 2657#: builtin/am.c:2232
1b7f4a34
JX
2658msgid "allow fall back on 3way merging if needed"
2659msgstr "如果必要,允许使用三方合并。"
2660
03ea3327 2661#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57
1b7f4a34
JX
2662#: builtin/repack.c:171
2663msgid "be quiet"
2664msgstr "静默模式"
2665
03ea3327 2666#: builtin/am.c:2235
1b7f4a34
JX
2667msgid "add a Signed-off-by line to the commit message"
2668msgstr "在提交说明中添加一个 Signed-off-by 签名"
2669
03ea3327 2670#: builtin/am.c:2238
1b7f4a34
JX
2671msgid "recode into utf8 (default)"
2672msgstr "使用 utf8 字符集(默认)"
2673
03ea3327 2674#: builtin/am.c:2240
1b7f4a34
JX
2675msgid "pass -k flag to git-mailinfo"
2676msgstr "向 git-mailinfo 传递 -k 参数"
2677
03ea3327 2678#: builtin/am.c:2242
1b7f4a34
JX
2679msgid "pass -b flag to git-mailinfo"
2680msgstr "向 git-mailinfo 传递 -b 参数"
2681
03ea3327 2682#: builtin/am.c:2244
1b7f4a34
JX
2683msgid "pass -m flag to git-mailinfo"
2684msgstr "向 git-mailinfo 传递 -m 参数"
2685
03ea3327 2686#: builtin/am.c:2246
1b7f4a34
JX
2687msgid "pass --keep-cr flag to git-mailsplit for mbox format"
2688msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
2689
03ea3327 2690#: builtin/am.c:2249
1b7f4a34
JX
2691msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
2692msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
2693
03ea3327 2694#: builtin/am.c:2252
1b7f4a34
JX
2695msgid "strip everything before a scissors line"
2696msgstr "丢弃裁切线前的所有内容"
2697
03ea3327 2698#: builtin/am.c:2253 builtin/apply.c:4563
1b7f4a34
JX
2699msgid "action"
2700msgstr "动作"
2701
03ea3327
JX
2702#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263
2703#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
2704#: builtin/am.c:2281
1b7f4a34
JX
2705msgid "pass it through git-apply"
2706msgstr "传递给 git-apply"
2707
03ea3327 2708#: builtin/am.c:2262 builtin/apply.c:4587
1b7f4a34
JX
2709msgid "root"
2710msgstr "根目录"
2711
03ea3327 2712#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525
1b7f4a34
JX
2713#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93
2714#: builtin/pull.c:167
2715msgid "path"
2716msgstr "路径"
2717
03ea3327 2718#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
1b7f4a34
JX
2719#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127
2720#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664
2721#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132
2722#: parse-options.h:134 parse-options.h:243
2723msgid "n"
2724msgstr "n"
2725
03ea3327 2726#: builtin/am.c:2274 builtin/apply.c:4531
1b7f4a34
JX
2727msgid "num"
2728msgstr "数字"
2729
03ea3327 2730#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438
1b7f4a34
JX
2731msgid "format"
2732msgstr "格式"
2733
03ea3327 2734#: builtin/am.c:2278
1b7f4a34
JX
2735msgid "format the patch(es) are in"
2736msgstr "补丁的格式"
2737
03ea3327 2738#: builtin/am.c:2284
1b7f4a34
JX
2739msgid "override error message when patch failure occurs"
2740msgstr "打补丁失败时显示的错误信息"
2741
03ea3327 2742#: builtin/am.c:2286
1b7f4a34
JX
2743msgid "continue applying patches after resolving a conflict"
2744msgstr "冲突解决后继续应用补丁"
2745
03ea3327 2746#: builtin/am.c:2289
1b7f4a34
JX
2747msgid "synonyms for --continue"
2748msgstr "和 --continue 同义"
2749
03ea3327 2750#: builtin/am.c:2292
1b7f4a34
JX
2751msgid "skip the current patch"
2752msgstr "跳过当前补丁"
2753
03ea3327 2754#: builtin/am.c:2295
1b7f4a34
JX
2755msgid "restore the original branch and abort the patching operation."
2756msgstr "恢复原始分支并终止打补丁操作。"
2757
03ea3327 2758#: builtin/am.c:2299
1b7f4a34
JX
2759msgid "lie about committer date"
2760msgstr "将作者日期作为提交日期"
2761
03ea3327 2762#: builtin/am.c:2301
1b7f4a34
JX
2763msgid "use current timestamp for author date"
2764msgstr "用当前时间作为作者日期"
2765
03ea3327 2766#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225
1b7f4a34
JX
2767#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606
2768msgid "key-id"
2769msgstr "key-id"
2770
03ea3327 2771#: builtin/am.c:2304
1b7f4a34
JX
2772msgid "GPG-sign commits"
2773msgstr "使用 GPG 签名提交"
2774
03ea3327 2775#: builtin/am.c:2307
1b7f4a34
JX
2776msgid "(internal use for git-rebase)"
2777msgstr "(内部使用,用于 git-rebase)"
2778
03ea3327 2779#: builtin/am.c:2322
1b7f4a34
JX
2780msgid ""
2781"The -b/--binary option has been a no-op for long time, and\n"
2782"it will be removed. Please do not use it anymore."
2783msgstr ""
2784"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
2785"请不要再使用它了。"
2786
03ea3327 2787#: builtin/am.c:2329
1b7f4a34
JX
2788msgid "failed to read the index"
2789msgstr "无法读取索引"
2790
03ea3327 2791#: builtin/am.c:2344
1b7f4a34
JX
2792#, c-format
2793msgid "previous rebase directory %s still exists but mbox given."
2794msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
2795
03ea3327 2796#: builtin/am.c:2368
1b7f4a34
JX
2797#, c-format
2798msgid ""
2799"Stray %s directory found.\n"
2800"Use \"git am --abort\" to remove it."
2801msgstr ""
2802"发现了错误的 %s 目录。\n"
2803"使用 \"git am --abort\" 删除它。"
2804
03ea3327 2805#: builtin/am.c:2374
1b7f4a34
JX
2806msgid "Resolve operation not in progress, we are not resuming."
2807msgstr "解决操作未进行,我们不会继续。"
2808
814ff314
JX
2809#: builtin/apply.c:59
2810msgid "git apply [<options>] [<patch>...]"
2811msgstr "git apply [<选项>] [<补丁>...]"
8ada9598 2812
814ff314 2813#: builtin/apply.c:112
81809b99 2814#, c-format
8ada9598 2815msgid "unrecognized whitespace option '%s'"
81809b99 2816msgstr "未能识别的空白字符选项 '%s'"
8ada9598 2817
814ff314 2818#: builtin/apply.c:127
81809b99 2819#, c-format
8ada9598 2820msgid "unrecognized whitespace ignore option '%s'"
81809b99 2821msgstr "未能识别的空白字符忽略选项 '%s'"
8ada9598 2822
814ff314 2823#: builtin/apply.c:822
8ada9598
JX
2824#, c-format
2825msgid "Cannot prepare timestamp regexp %s"
81809b99 2826msgstr "无法准备时间戳正则表达式 %s"
8ada9598 2827
814ff314 2828#: builtin/apply.c:831
8ada9598
JX
2829#, c-format
2830msgid "regexec returned %d for input: %s"
81809b99 2831msgstr "regexec 返回 %d,输入为:%s"
8ada9598 2832
814ff314 2833#: builtin/apply.c:912
81809b99 2834#, c-format
8ada9598 2835msgid "unable to find filename in patch at line %d"
81809b99 2836msgstr "不能在补丁的第 %d 行找到文件名"
8ada9598 2837
814ff314 2838#: builtin/apply.c:944
8ada9598
JX
2839#, c-format
2840msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
9aafc933 2841msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
8ada9598 2842
814ff314 2843#: builtin/apply.c:948
8ada9598
JX
2844#, c-format
2845msgid "git apply: bad git-diff - inconsistent new filename on line %d"
81809b99 2846msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
8ada9598 2847
814ff314 2848#: builtin/apply.c:949
8ada9598
JX
2849#, c-format
2850msgid "git apply: bad git-diff - inconsistent old filename on line %d"
81809b99 2851msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
8ada9598 2852
814ff314 2853#: builtin/apply.c:956
8ada9598
JX
2854#, c-format
2855msgid "git apply: bad git-diff - expected /dev/null on line %d"
9aafc933 2856msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
8ada9598 2857
814ff314 2858#: builtin/apply.c:1419
8ada9598
JX
2859#, c-format
2860msgid "recount: unexpected line: %.*s"
81809b99 2861msgstr "recount:意外的行:%.*s"
8ada9598 2862
814ff314 2863#: builtin/apply.c:1476
8ada9598
JX
2864#, c-format
2865msgid "patch fragment without header at line %d: %.*s"
81809b99 2866msgstr "第 %d 行的补丁片段没有头信息:%.*s"
8ada9598 2867
814ff314 2868#: builtin/apply.c:1493
8ada9598
JX
2869#, c-format
2870msgid ""
2871"git diff header lacks filename information when removing %d leading pathname "
2872"component (line %d)"
2873msgid_plural ""
2874"git diff header lacks filename information when removing %d leading pathname "
2875"components (line %d)"
5ae481e0
JX
2876msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2877msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
8ada9598 2878
7aea43ff 2879#: builtin/apply.c:1659
8ada9598 2880msgid "new file depends on old contents"
81809b99 2881msgstr "新文件依赖旧内容"
8ada9598 2882
7aea43ff 2883#: builtin/apply.c:1661
8ada9598 2884msgid "deleted file still has contents"
81809b99 2885msgstr "删除的文件仍有内容"
8ada9598 2886
7aea43ff 2887#: builtin/apply.c:1687
8ada9598
JX
2888#, c-format
2889msgid "corrupt patch at line %d"
195febda 2890msgstr "补丁在第 %d 行损坏"
8ada9598 2891
7aea43ff 2892#: builtin/apply.c:1723
8ada9598
JX
2893#, c-format
2894msgid "new file %s depends on old contents"
81809b99 2895msgstr "新文件 %s 依赖旧内容"
8ada9598 2896
7aea43ff 2897#: builtin/apply.c:1725
8ada9598
JX
2898#, c-format
2899msgid "deleted file %s still has contents"
81809b99 2900msgstr "删除的文件 %s 仍有内容"
8ada9598 2901
7aea43ff 2902#: builtin/apply.c:1728
8ada9598
JX
2903#, c-format
2904msgid "** warning: file %s becomes empty but is not deleted"
81809b99 2905msgstr "** 警告:文件 %s 成为空文件但并未删除"
8ada9598 2906
7aea43ff 2907#: builtin/apply.c:1874
8ada9598
JX
2908#, c-format
2909msgid "corrupt binary patch at line %d: %.*s"
81809b99 2910msgstr "二进制补丁在第 %d 行损坏:%.*s"
8ada9598 2911
7aea43ff 2912#: builtin/apply.c:1903
8ada9598
JX
2913#, c-format
2914msgid "unrecognized binary patch at line %d"
81809b99 2915msgstr "未能识别的二进制补丁位于第 %d 行"
8ada9598 2916
7aea43ff 2917#: builtin/apply.c:2054
8ada9598
JX
2918#, c-format
2919msgid "patch with only garbage at line %d"
81809b99 2920msgstr "补丁文件的第 %d 行只有垃圾数据"
8ada9598 2921
7aea43ff 2922#: builtin/apply.c:2144
81809b99 2923#, c-format
8ada9598 2924msgid "unable to read symlink %s"
81809b99 2925msgstr "无法读取符号链接 %s"
8ada9598 2926
7aea43ff 2927#: builtin/apply.c:2148
81809b99 2928#, c-format
8ada9598 2929msgid "unable to open or read %s"
81809b99 2930msgstr "不能打开或读取 %s"
8ada9598 2931
7aea43ff 2932#: builtin/apply.c:2781
81809b99 2933#, c-format
8ada9598 2934msgid "invalid start of line: '%c'"
81809b99 2935msgstr "无效的行首字符:'%c'"
8ada9598 2936
7aea43ff 2937#: builtin/apply.c:2900
8ada9598
JX
2938#, c-format
2939msgid "Hunk #%d succeeded at %d (offset %d line)."
2940msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
07432cef
WS
2941msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2942msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
8ada9598 2943
7aea43ff 2944#: builtin/apply.c:2912
8ada9598
JX
2945#, c-format
2946msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
81809b99 2947msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
8ada9598 2948
7aea43ff 2949#: builtin/apply.c:2918
8ada9598
JX
2950#, c-format
2951msgid ""
2952"while searching for:\n"
2953"%.*s"
2954msgstr ""
81809b99
JX
2955"当查询:\n"
2956"%.*s"
8ada9598 2957
7aea43ff 2958#: builtin/apply.c:2938
8ada9598
JX
2959#, c-format
2960msgid "missing binary patch data for '%s'"
81809b99 2961msgstr "缺失 '%s' 的二进制补丁数据"
8ada9598 2962
7aea43ff 2963#: builtin/apply.c:3039
8ada9598
JX
2964#, c-format
2965msgid "binary patch does not apply to '%s'"
81809b99 2966msgstr "二进制补丁未应用到 '%s'"
8ada9598 2967
7aea43ff 2968#: builtin/apply.c:3045
8ada9598
JX
2969#, c-format
2970msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
9aafc933 2971msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
8ada9598 2972
7aea43ff 2973#: builtin/apply.c:3066
8ada9598
JX
2974#, c-format
2975msgid "patch failed: %s:%ld"
81809b99 2976msgstr "打补丁失败:%s:%ld"
8ada9598 2977
7aea43ff 2978#: builtin/apply.c:3190
8ada9598 2979#, c-format
23ff3338
JX
2980msgid "cannot checkout %s"
2981msgstr "不能检出 %s"
8ada9598 2982
7aea43ff 2983#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
81809b99 2984#, c-format
8ada9598 2985msgid "read of %s failed"
81809b99 2986msgstr "读取 %s 失败"
8ada9598 2987
7aea43ff 2988#: builtin/apply.c:3243
814ff314
JX
2989#, c-format
2990msgid "reading from '%s' beyond a symbolic link"
2991msgstr "读取位于符号链接中的 '%s'"
2992
7aea43ff 2993#: builtin/apply.c:3271 builtin/apply.c:3493
81809b99 2994#, c-format
23ff3338
JX
2995msgid "path %s has been renamed/deleted"
2996msgstr "路径 %s 已经被重命名/删除"
8ada9598 2997
7aea43ff 2998#: builtin/apply.c:3352 builtin/apply.c:3507
8ada9598 2999#, c-format
23ff3338
JX
3000msgid "%s: does not exist in index"
3001msgstr "%s:不存在于索引中"
8ada9598 3002
7aea43ff 3003#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
81809b99 3004#, c-format
8ada9598 3005msgid "%s: %s"
81809b99 3006msgstr "%s:%s"
8ada9598 3007
7aea43ff 3008#: builtin/apply.c:3361 builtin/apply.c:3515
81809b99 3009#, c-format
8ada9598 3010msgid "%s: does not match index"
81809b99 3011msgstr "%s:和索引不匹配"
8ada9598 3012
7aea43ff 3013#: builtin/apply.c:3463
23ff3338
JX
3014msgid "removal patch leaves file contents"
3015msgstr "移除补丁仍留下了文件内容"
3016
7aea43ff 3017#: builtin/apply.c:3532
8ada9598
JX
3018#, c-format
3019msgid "%s: wrong type"
81809b99 3020msgstr "%s:错误类型"
8ada9598 3021
7aea43ff 3022#: builtin/apply.c:3534
8ada9598
JX
3023#, c-format
3024msgid "%s has type %o, expected %o"
9aafc933 3025msgstr "%s 的类型是 %o,应为 %o"
8ada9598 3026
7aea43ff 3027#: builtin/apply.c:3693 builtin/apply.c:3695
814ff314
JX
3028#, c-format
3029msgid "invalid path '%s'"
3030msgstr "无效路径 '%s'"
3031
7aea43ff 3032#: builtin/apply.c:3750
81809b99 3033#, c-format
8ada9598 3034msgid "%s: already exists in index"
81809b99 3035msgstr "%s:已经存在于索引中"
8ada9598 3036
7aea43ff 3037#: builtin/apply.c:3753
23ff3338
JX
3038#, c-format
3039msgid "%s: already exists in working directory"
3040msgstr "%s:已经存在于工作区中"
3041
7aea43ff 3042#: builtin/apply.c:3773
d691f479
JX
3043#, c-format
3044msgid "new mode (%o) of %s does not match old mode (%o)"
3045msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
8ada9598 3046
7aea43ff 3047#: builtin/apply.c:3778
8ada9598 3048#, c-format
d691f479
JX
3049msgid "new mode (%o) of %s does not match old mode (%o) of %s"
3050msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
3051
7aea43ff 3052#: builtin/apply.c:3798
814ff314
JX
3053#, c-format
3054msgid "affected file '%s' is beyond a symbolic link"
3055msgstr "受影响的文件 '%s' 位于符号链接中"
3056
7aea43ff 3057#: builtin/apply.c:3802
d691f479 3058#, c-format
8ada9598 3059msgid "%s: patch does not apply"
81809b99 3060msgstr "%s:补丁未应用"
8ada9598 3061
7aea43ff 3062#: builtin/apply.c:3816
8ada9598
JX
3063#, c-format
3064msgid "Checking patch %s..."
81809b99 3065msgstr "检查补丁 %s..."
8ada9598 3066
1b7f4a34 3067#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135
8ada9598
JX
3068#, c-format
3069msgid "make_cache_entry failed for path '%s'"
3070msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
3071
7aea43ff 3072#: builtin/apply.c:4052
81809b99 3073#, c-format
8ada9598 3074msgid "unable to remove %s from index"
81809b99 3075msgstr "不能从索引中移除 %s"
8ada9598 3076
7aea43ff 3077#: builtin/apply.c:4081
8ada9598 3078#, c-format
2e8451e8
JX
3079msgid "corrupt patch for submodule %s"
3080msgstr "子模组 %s 损坏的补丁"
8ada9598 3081
7aea43ff 3082#: builtin/apply.c:4085
81809b99 3083#, c-format
8ada9598 3084msgid "unable to stat newly created file '%s'"
81809b99 3085msgstr "不能枚举新建文件 '%s' 的状态"
8ada9598 3086
7aea43ff 3087#: builtin/apply.c:4090
8ada9598
JX
3088#, c-format
3089msgid "unable to create backing store for newly created file %s"
81809b99 3090msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 3091
7aea43ff 3092#: builtin/apply.c:4093 builtin/apply.c:4201
81809b99 3093#, c-format
8ada9598 3094msgid "unable to add cache entry for %s"
81809b99 3095msgstr "无法为 %s 添加缓存条目"
8ada9598 3096
7aea43ff 3097#: builtin/apply.c:4126
81809b99 3098#, c-format
8ada9598 3099msgid "closing file '%s'"
81809b99 3100msgstr "关闭文件 '%s'"
8ada9598 3101
7aea43ff 3102#: builtin/apply.c:4175
81809b99 3103#, c-format
8ada9598 3104msgid "unable to write file '%s' mode %o"
81809b99 3105msgstr "不能写文件 '%s' 权限 %o"
8ada9598 3106
7aea43ff 3107#: builtin/apply.c:4262
8ada9598
JX
3108#, c-format
3109msgid "Applied patch %s cleanly."
81809b99 3110msgstr "成功应用补丁 %s。"
8ada9598 3111
7aea43ff 3112#: builtin/apply.c:4270
8ada9598 3113msgid "internal error"
81809b99 3114msgstr "内部错误"
8ada9598 3115
7aea43ff 3116#: builtin/apply.c:4273
8ada9598
JX
3117#, c-format
3118msgid "Applying patch %%s with %d reject..."
3119msgid_plural "Applying patch %%s with %d rejects..."
195febda
T
3120msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3121msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
8ada9598 3122
7aea43ff 3123#: builtin/apply.c:4283
8ada9598
JX
3124#, c-format
3125msgid "truncating .rej filename to %.*s.rej"
81809b99 3126msgstr "截短 .rej 文件名为 %.*s.rej"
8ada9598 3127
7aea43ff 3128#: builtin/apply.c:4304
8ada9598
JX
3129#, c-format
3130msgid "Hunk #%d applied cleanly."
81809b99 3131msgstr "第 #%d 个片段成功应用。"
8ada9598 3132
7aea43ff 3133#: builtin/apply.c:4307
8ada9598
JX
3134#, c-format
3135msgid "Rejected hunk #%d."
81809b99 3136msgstr "拒绝第 #%d 个片段。"
8ada9598 3137
7aea43ff 3138#: builtin/apply.c:4397
8ada9598 3139msgid "unrecognized input"
81809b99 3140msgstr "未能识别的输入"
8ada9598 3141
7aea43ff 3142#: builtin/apply.c:4408
8ada9598 3143msgid "unable to read index file"
81809b99 3144msgstr "无法读取索引文件"
8ada9598 3145
7aea43ff 3146#: builtin/apply.c:4526
8ada9598 3147msgid "don't apply changes matching the given path"
81809b99 3148msgstr "不要应用与给出路径向匹配的变更"
8ada9598 3149
7aea43ff 3150#: builtin/apply.c:4529
8ada9598 3151msgid "apply changes matching the given path"
81809b99 3152msgstr "应用与给出路径向匹配的变更"
8ada9598 3153
7aea43ff 3154#: builtin/apply.c:4532
8ada9598 3155msgid "remove <num> leading slashes from traditional diff paths"
07432cef 3156msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
8ada9598 3157
7aea43ff 3158#: builtin/apply.c:4535
8ada9598 3159msgid "ignore additions made by the patch"
81809b99 3160msgstr "忽略补丁中的添加的文件"
8ada9598 3161
7aea43ff 3162#: builtin/apply.c:4537
8ada9598 3163msgid "instead of applying the patch, output diffstat for the input"
81809b99 3164msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
8ada9598 3165
7aea43ff 3166#: builtin/apply.c:4541
ef317cd5 3167msgid "show number of added and deleted lines in decimal notation"
07432cef 3168msgstr "以十进制数显示添加和删除的行数"
8ada9598 3169
7aea43ff 3170#: builtin/apply.c:4543
8ada9598 3171msgid "instead of applying the patch, output a summary for the input"
81809b99 3172msgstr "不应用补丁,而是显示输入的概要"
8ada9598 3173
7aea43ff 3174#: builtin/apply.c:4545
8ada9598 3175msgid "instead of applying the patch, see if the patch is applicable"
81809b99 3176msgstr "不应用补丁,而是查看补丁是否可应用"
8ada9598 3177
7aea43ff 3178#: builtin/apply.c:4547
8ada9598 3179msgid "make sure the patch is applicable to the current index"
81809b99 3180msgstr "确认补丁可以应用到当前索引"
8ada9598 3181
7aea43ff 3182#: builtin/apply.c:4549
8ada9598 3183msgid "apply a patch without touching the working tree"
81809b99 3184msgstr "应用补丁而不修改工作区"
8ada9598 3185
7aea43ff 3186#: builtin/apply.c:4551
814ff314
JX
3187msgid "accept a patch that touches outside the working area"
3188msgstr "接受修改工作区之外文件的补丁"
3189
7aea43ff 3190#: builtin/apply.c:4553
8ada9598 3191msgid "also apply the patch (use with --stat/--summary/--check)"
195febda 3192msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
8ada9598 3193
7aea43ff 3194#: builtin/apply.c:4555
23ff3338 3195msgid "attempt three-way merge if a patch does not apply"
160fb2b2 3196msgstr "如果一个补丁不能应用则尝试三方合并"
23ff3338 3197
7aea43ff 3198#: builtin/apply.c:4557
8ada9598 3199msgid "build a temporary index based on embedded index information"
81809b99 3200msgstr "创建一个临时索引基于嵌入的索引信息"
8ada9598 3201
7aea43ff 3202#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
8ada9598 3203msgid "paths are separated with NUL character"
81809b99 3204msgstr "路径以 NUL 字符分隔"
8ada9598 3205
7aea43ff 3206#: builtin/apply.c:4562
8ada9598 3207msgid "ensure at least <n> lines of context match"
81809b99 3208msgstr "确保至少匹配 <n> 行上下文"
8ada9598 3209
7aea43ff 3210#: builtin/apply.c:4564
8ada9598 3211msgid "detect new or modified lines that have whitespace errors"
81809b99 3212msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 3213
7aea43ff 3214#: builtin/apply.c:4567 builtin/apply.c:4570
8ada9598 3215msgid "ignore changes in whitespace when finding context"
81809b99 3216msgstr "查找上下文时忽略空白字符的变更"
8ada9598 3217
7aea43ff 3218#: builtin/apply.c:4573
8ada9598 3219msgid "apply the patch in reverse"
81809b99 3220msgstr "反向应用补丁"
8ada9598 3221
7aea43ff 3222#: builtin/apply.c:4575
8ada9598 3223msgid "don't expect at least one line of context"
81809b99 3224msgstr "无需至少一行上下文"
8ada9598 3225
7aea43ff 3226#: builtin/apply.c:4577
8ada9598 3227msgid "leave the rejected hunks in corresponding *.rej files"
81809b99 3228msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 3229
7aea43ff 3230#: builtin/apply.c:4579
8ada9598 3231msgid "allow overlapping hunks"
81809b99 3232msgstr "允许重叠的补丁片段"
8ada9598 3233
7aea43ff 3234#: builtin/apply.c:4582
8ada9598 3235msgid "tolerate incorrectly detected missing new-line at the end of file"
195febda 3236msgstr "允许不正确的文件末尾换行符"
c04f5ac3 3237
7aea43ff 3238#: builtin/apply.c:4585
8ada9598 3239msgid "do not trust the line counts in the hunk headers"
81809b99 3240msgstr "不信任补丁片段的头信息中的行号"
c04f5ac3 3241
7aea43ff 3242#: builtin/apply.c:4588
8ada9598 3243msgid "prepend <root> to all filenames"
81809b99 3244msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 3245
7aea43ff 3246#: builtin/apply.c:4610
23ff3338 3247msgid "--3way outside a repository"
160fb2b2 3248msgstr "--3way 在一个仓库之外"
23ff3338 3249
7aea43ff 3250#: builtin/apply.c:4618
8ada9598 3251msgid "--index outside a repository"
160fb2b2 3252msgstr "--index 在一个仓库之外"
c04f5ac3 3253
7aea43ff 3254#: builtin/apply.c:4621
8ada9598 3255msgid "--cached outside a repository"
160fb2b2 3256msgstr "--cached 在一个仓库之外"
c04f5ac3 3257
7aea43ff 3258#: builtin/apply.c:4640
81809b99 3259#, c-format
8ada9598 3260msgid "can't open patch '%s'"
81809b99 3261msgstr "不能打开补丁 '%s'"
c04f5ac3 3262
7aea43ff 3263#: builtin/apply.c:4654
c04f5ac3 3264#, c-format
8ada9598
JX
3265msgid "squelched %d whitespace error"
3266msgid_plural "squelched %d whitespace errors"
81809b99 3267msgstr[0] "抑制下仍有 %d 个空白字符误用"
5ae481e0 3268msgstr[1] "抑制下仍有 %d 个空白字符误用"
c04f5ac3 3269
7aea43ff 3270#: builtin/apply.c:4660 builtin/apply.c:4670
8ada9598
JX
3271#, c-format
3272msgid "%d line adds whitespace errors."
3273msgid_plural "%d lines add whitespace errors."
81809b99 3274msgstr[0] "%d 行有空白字符误用。"
5ae481e0 3275msgstr[1] "%d 行有空白字符误用。"
c04f5ac3
JX
3276
3277#: builtin/archive.c:17
3278#, c-format
3279msgid "could not create archive file '%s'"
90e6ef53 3280msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
3281
3282#: builtin/archive.c:20
3283msgid "could not redirect output"
195febda 3284msgstr "不能重定向输出"
c04f5ac3
JX
3285
3286#: builtin/archive.c:37
3287msgid "git archive: Remote with no URL"
4375c10e 3288msgstr "git archive:未提供远程 URL"
c04f5ac3
JX
3289
3290#: builtin/archive.c:58
3291msgid "git archive: expected ACK/NAK, got EOF"
4375c10e 3292msgstr "git archive:应为 ACK/NACK,却得到 EOF"
c04f5ac3 3293
1003b3a5 3294#: builtin/archive.c:61
c04f5ac3
JX
3295#, c-format
3296msgid "git archive: NACK %s"
90e6ef53 3297msgstr "git archive:NACK %s"
c04f5ac3 3298
1003b3a5 3299#: builtin/archive.c:63
c04f5ac3
JX
3300#, c-format
3301msgid "remote error: %s"
3302msgstr "远程错误:%s"
3303
1003b3a5 3304#: builtin/archive.c:64
c04f5ac3 3305msgid "git archive: protocol error"
90e6ef53 3306msgstr "git archive:协议错误"
c04f5ac3 3307
1003b3a5 3308#: builtin/archive.c:68
c04f5ac3 3309msgid "git archive: expected a flush"
195febda 3310msgstr "git archive:应为刷新"
c04f5ac3 3311
ef317cd5
JX
3312#: builtin/bisect--helper.c:7
3313msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 3314msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5
JX
3315
3316#: builtin/bisect--helper.c:17
3317msgid "perform 'git bisect next'"
07432cef 3318msgstr "执行 'git bisect next'"
ef317cd5
JX
3319
3320#: builtin/bisect--helper.c:19
3321msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 3322msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 3323
1b7f4a34 3324#: builtin/blame.c:32
7aea43ff
JX
3325msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3326msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 3327
1b7f4a34 3328#: builtin/blame.c:37
814ff314
JX
3329msgid "<rev-opts> are documented in git-rev-list(1)"
3330msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 3331
814ff314 3332#: builtin/blame.c:2500
ef317cd5 3333msgid "Show blame entries as we find them, incrementally"
07432cef 3334msgstr "增量式地显示发现的 blame 条目"
ef317cd5 3335
814ff314 3336#: builtin/blame.c:2501
ef317cd5 3337msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 3338msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 3339
814ff314 3340#: builtin/blame.c:2502
ef317cd5 3341msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 3342msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 3343
814ff314 3344#: builtin/blame.c:2503
ef317cd5 3345msgid "Show work cost statistics"
07432cef 3346msgstr "显示命令消耗统计"
ef317cd5 3347
814ff314 3348#: builtin/blame.c:2504
ef317cd5 3349msgid "Show output score for blame entries"
07432cef 3350msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 3351
814ff314 3352#: builtin/blame.c:2505
ef317cd5 3353msgid "Show original filename (Default: auto)"
07432cef 3354msgstr "显示原始文件名(默认:自动)"
ef317cd5 3355
814ff314 3356#: builtin/blame.c:2506
ef317cd5 3357msgid "Show original linenumber (Default: off)"
07432cef 3358msgstr "显示原始的行号(默认:关闭)"
ef317cd5 3359
814ff314 3360#: builtin/blame.c:2507
ef317cd5 3361msgid "Show in a format designed for machine consumption"
07432cef 3362msgstr "显示为一个适合机器读取的格式"
ef317cd5 3363
814ff314 3364#: builtin/blame.c:2508
ef317cd5 3365msgid "Show porcelain format with per-line commit information"
07432cef 3366msgstr "为每一行显示机器适用的提交信息"
ef317cd5 3367
814ff314 3368#: builtin/blame.c:2509
ef317cd5 3369msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 3370msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 3371
814ff314 3372#: builtin/blame.c:2510
ef317cd5 3373msgid "Show raw timestamp (Default: off)"
07432cef 3374msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 3375
814ff314 3376#: builtin/blame.c:2511
ef317cd5 3377msgid "Show long commit SHA1 (Default: off)"
4375c10e 3378msgstr "显示长的 SHA1 提交号(默认:关闭)"
ef317cd5 3379
814ff314 3380#: builtin/blame.c:2512
ef317cd5 3381msgid "Suppress author name and timestamp (Default: off)"
07432cef 3382msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 3383
814ff314 3384#: builtin/blame.c:2513
ef317cd5 3385msgid "Show author email instead of name (Default: off)"
07432cef 3386msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 3387
814ff314 3388#: builtin/blame.c:2514
ef317cd5 3389msgid "Ignore whitespace differences"
07432cef 3390msgstr "忽略空白差异"
ef317cd5 3391
814ff314 3392#: builtin/blame.c:2515
ef317cd5 3393msgid "Spend extra cycles to find better match"
07432cef 3394msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 3395
814ff314 3396#: builtin/blame.c:2516
ef317cd5 3397msgid "Use revisions from <file> instead of calling git-rev-list"
d9d56b23 3398msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 3399
814ff314 3400#: builtin/blame.c:2517
ef317cd5 3401msgid "Use <file>'s contents as the final image"
d9d56b23 3402msgstr "使用 <文件> 的内容作为最终的图片"
ef317cd5 3403
814ff314 3404#: builtin/blame.c:2518 builtin/blame.c:2519
ef317cd5 3405msgid "score"
07432cef 3406msgstr "得分"
ef317cd5 3407
814ff314 3408#: builtin/blame.c:2518
ef317cd5 3409msgid "Find line copies within and across files"
07432cef 3410msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 3411
814ff314 3412#: builtin/blame.c:2519
ef317cd5 3413msgid "Find line movements within and across files"
07432cef 3414msgstr "找到文件内及跨文件的行移动"
ef317cd5 3415
814ff314 3416#: builtin/blame.c:2520
ef317cd5 3417msgid "n,m"
07432cef 3418msgstr "n,m"
ef317cd5 3419
814ff314 3420#: builtin/blame.c:2520
ef317cd5 3421msgid "Process only line range n,m, counting from 1"
07432cef 3422msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 3423
6c94aba5
JX
3424#. TRANSLATORS: This string is used to tell us the maximum
3425#. display width for a relative timestamp in "git blame"
3426#. output. For C locale, "4 years, 11 months ago", which
3427#. takes 22 places, is the longest among various forms of
3428#. relative timestamps, but your language may need more or
3429#. fewer display columns.
814ff314 3430#: builtin/blame.c:2601
6c94aba5
JX
3431msgid "4 years, 11 months ago"
3432msgstr "4 年 11 个月前"
3433
1003b3a5 3434#: builtin/branch.c:24
814ff314
JX
3435msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
3436msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
ef317cd5 3437
1003b3a5 3438#: builtin/branch.c:25
814ff314
JX
3439msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
3440msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 3441
1003b3a5 3442#: builtin/branch.c:26
814ff314
JX
3443msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3444msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 3445
1003b3a5 3446#: builtin/branch.c:27
814ff314
JX
3447msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3448msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 3449
90e6ef53 3450# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
7aea43ff 3451#: builtin/branch.c:150
c04f5ac3
JX
3452#, c-format
3453msgid ""
3454"deleting branch '%s' that has been merged to\n"
3455" '%s', but not yet merged to HEAD."
3456msgstr ""
70fc47bf 3457"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
3458" '%s',但未合并到 HEAD。"
3459
90e6ef53 3460# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
7aea43ff 3461#: builtin/branch.c:154
c04f5ac3
JX
3462#, c-format
3463msgid ""
3464"not deleting branch '%s' that is not yet merged to\n"
3465" '%s', even though it is merged to HEAD."
3466msgstr ""
70fc47bf
T
3467"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
3468" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 3469
7aea43ff 3470#: builtin/branch.c:168
07432cef
WS
3471#, c-format
3472msgid "Couldn't look up commit object for '%s'"
3473msgstr "无法查询 '%s' 指向的提交对象"
3474
7aea43ff 3475#: builtin/branch.c:172
07432cef
WS
3476#, c-format
3477msgid ""
3478"The branch '%s' is not fully merged.\n"
3479"If you are sure you want to delete it, run 'git branch -D %s'."
3480msgstr ""
3481"分支 '%s' 没有完全合并。\n"
3482"如果您确认要删除它,执行 'git branch -D %s'。"
3483
7aea43ff 3484#: builtin/branch.c:185
07432cef
WS
3485msgid "Update of config-file failed"
3486msgstr "无法更新 config 文件"
3487
7aea43ff 3488#: builtin/branch.c:213
c04f5ac3 3489msgid "cannot use -a with -d"
649900bc 3490msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 3491
7aea43ff 3492#: builtin/branch.c:219
c04f5ac3
JX
3493msgid "Couldn't look up commit object for HEAD"
3494msgstr "无法查询 HEAD 指向的提交对象"
3495
7aea43ff 3496#: builtin/branch.c:227
c04f5ac3
JX
3497#, c-format
3498msgid "Cannot delete the branch '%s' which you are currently on."
3499msgstr "无法删除您当前所在的分支 '%s'。"
3500
7aea43ff 3501#: builtin/branch.c:243
5ae481e0 3502#, c-format
7aea43ff
JX
3503msgid "remote-tracking branch '%s' not found."
3504msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 3505
7aea43ff 3506#: builtin/branch.c:244
81809b99 3507#, c-format
8ada9598 3508msgid "branch '%s' not found."
81809b99 3509msgstr "分支 '%s' 未发现。"
8ada9598 3510
1b7f4a34 3511#: builtin/branch.c:259
81809b99 3512#, c-format
7aea43ff
JX
3513msgid "Error deleting remote-tracking branch '%s'"
3514msgstr "无法删除远程跟踪分支 '%s'"
c04f5ac3 3515
1b7f4a34 3516#: builtin/branch.c:260
81809b99 3517#, c-format
8ada9598 3518msgid "Error deleting branch '%s'"
7aea43ff 3519msgstr "无法删除分支 '%s'"
8ada9598 3520
1b7f4a34 3521#: builtin/branch.c:267
81809b99 3522#, c-format
7aea43ff
JX
3523msgid "Deleted remote-tracking branch %s (was %s).\n"
3524msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 3525
1b7f4a34 3526#: builtin/branch.c:268
81809b99 3527#, c-format
8ada9598 3528msgid "Deleted branch %s (was %s).\n"
81809b99 3529msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 3530
1b7f4a34 3531#: builtin/branch.c:369
c04f5ac3
JX
3532#, c-format
3533msgid "branch '%s' does not point at a commit"
3534msgstr "分支 '%s' 未指向一个提交"
3535
1b7f4a34 3536#: builtin/branch.c:452
81809b99 3537#, c-format
90314792
JX
3538msgid "[%s: gone]"
3539msgstr "[%s: 丢失]"
3540
1b7f4a34 3541#: builtin/branch.c:457
90314792
JX
3542#, c-format
3543msgid "[%s]"
3544msgstr "[%s]"
3545
1b7f4a34 3546#: builtin/branch.c:462
90314792 3547#, c-format
8ada9598 3548msgid "[%s: behind %d]"
81809b99 3549msgstr "[%s:落后 %d]"
c04f5ac3 3550
1b7f4a34 3551#: builtin/branch.c:464
81809b99 3552#, c-format
8ada9598 3553msgid "[behind %d]"
81809b99 3554msgstr "[落后 %d]"
8ada9598 3555
1b7f4a34 3556#: builtin/branch.c:468
81809b99 3557#, c-format
8ada9598 3558msgid "[%s: ahead %d]"
81809b99 3559msgstr "[%s:领先 %d]"
c04f5ac3 3560
1b7f4a34 3561#: builtin/branch.c:470
81809b99 3562#, c-format
8ada9598 3563msgid "[ahead %d]"
81809b99 3564msgstr "[领先 %d]"
8ada9598 3565
1b7f4a34 3566#: builtin/branch.c:473
81809b99 3567#, c-format
8ada9598 3568msgid "[%s: ahead %d, behind %d]"
81809b99 3569msgstr "[%s:领先 %d,落后 %d]"
8ada9598 3570
1b7f4a34 3571#: builtin/branch.c:476
81809b99 3572#, c-format
8ada9598 3573msgid "[ahead %d, behind %d]"
81809b99 3574msgstr "[领先 %d,落后 %d]"
c04f5ac3 3575
1b7f4a34 3576#: builtin/branch.c:489
a77c07d9
JX
3577msgid " **** invalid ref ****"
3578msgstr " **** 无效引用 ****"
3579
1b7f4a34 3580#: builtin/branch.c:580
1003b3a5
JX
3581#, c-format
3582msgid "(no branch, rebasing %s)"
3583msgstr "(非分支,正变基 %s)"
3584
1b7f4a34 3585#: builtin/branch.c:583
1003b3a5
JX
3586#, c-format
3587msgid "(no branch, bisect started on %s)"
3588msgstr "(非分支,二分查找开始于 %s)"
3589
1b7f4a34 3590#: builtin/branch.c:589
1003b3a5 3591#, c-format
814ff314
JX
3592msgid "(HEAD detached at %s)"
3593msgstr "(头指针分离于 %s)"
1003b3a5 3594
1b7f4a34 3595#: builtin/branch.c:592
814ff314
JX
3596#, c-format
3597msgid "(HEAD detached from %s)"
3598msgstr "(头指针分离自 %s)"
3599
1b7f4a34 3600#: builtin/branch.c:596
c04f5ac3
JX
3601msgid "(no branch)"
3602msgstr "(非分支)"
3603
1b7f4a34 3604#: builtin/branch.c:643
a77c07d9
JX
3605#, c-format
3606msgid "object '%s' does not point to a commit"
3607msgstr "对象 '%s' 没有指向一个提交"
3608
1b7f4a34 3609#: builtin/branch.c:691
c04f5ac3 3610msgid "some refs could not be read"
90e6ef53 3611msgstr "一些引用不能读取"
c04f5ac3 3612
1b7f4a34 3613#: builtin/branch.c:704
c04f5ac3 3614msgid "cannot rename the current branch while not on any."
90e6ef53 3615msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 3616
1b7f4a34 3617#: builtin/branch.c:714
c04f5ac3
JX
3618#, c-format
3619msgid "Invalid branch name: '%s'"
3620msgstr "无效的分支名:'%s'"
3621
1b7f4a34 3622#: builtin/branch.c:729
c04f5ac3
JX
3623msgid "Branch rename failed"
3624msgstr "分支重命名失败"
3625
1b7f4a34 3626#: builtin/branch.c:733
c04f5ac3
JX
3627#, c-format
3628msgid "Renamed a misnamed branch '%s' away"
3629msgstr "重命名掉一个错误命名的旧分支 '%s'"
3630
1b7f4a34 3631#: builtin/branch.c:737
c04f5ac3
JX
3632#, c-format
3633msgid "Branch renamed to %s, but HEAD is not updated!"
3634msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3635
1b7f4a34 3636#: builtin/branch.c:744
c04f5ac3
JX
3637msgid "Branch is renamed, but update of config-file failed"
3638msgstr "分支被重命名,但更新 config 文件失败"
3639
1b7f4a34 3640#: builtin/branch.c:759
c04f5ac3
JX
3641#, c-format
3642msgid "malformed object name %s"
3643msgstr "非法的对象名 %s"
3644
1b7f4a34 3645#: builtin/branch.c:781
81809b99 3646#, c-format
8ada9598 3647msgid "could not write branch description template: %s"
81809b99 3648msgstr "不能写分支描述模版:%s"
c04f5ac3 3649
1b7f4a34 3650#: builtin/branch.c:811
ef317cd5 3651msgid "Generic options"
07432cef 3652msgstr "通用选项"
c04f5ac3 3653
1b7f4a34 3654#: builtin/branch.c:813
ef317cd5 3655msgid "show hash and subject, give twice for upstream branch"
07432cef 3656msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 3657
1b7f4a34 3658#: builtin/branch.c:814
ef317cd5 3659msgid "suppress informational messages"
07432cef 3660msgstr "不显示信息"
8ada9598 3661
1b7f4a34 3662#: builtin/branch.c:815
ef317cd5 3663msgid "set up tracking mode (see git-pull(1))"
07432cef 3664msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 3665
1b7f4a34 3666#: builtin/branch.c:817
ef317cd5 3667msgid "change upstream info"
07432cef 3668msgstr "改变上游信息"
c04f5ac3 3669
1b7f4a34 3670#: builtin/branch.c:821
ef317cd5 3671msgid "use colored output"
07432cef 3672msgstr "使用彩色输出"
c04f5ac3 3673
1b7f4a34 3674#: builtin/branch.c:822
ef317cd5 3675msgid "act on remote-tracking branches"
07432cef 3676msgstr "作用于远程跟踪分支"
c04f5ac3 3677
1b7f4a34
JX
3678#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852
3679#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581
3680#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618
3681#: builtin/tag.c:624
ef317cd5 3682msgid "commit"
07432cef 3683msgstr "提交"
c04f5ac3 3684
1b7f4a34 3685#: builtin/branch.c:826 builtin/branch.c:832
ef317cd5 3686msgid "print only branches that contain the commit"
07432cef 3687msgstr "只打印包含该提交的分支"
c04f5ac3 3688
1b7f4a34 3689#: builtin/branch.c:838
ef317cd5 3690msgid "Specific git-branch actions:"
07432cef 3691msgstr "具体的 git-branch 动作:"
c04f5ac3 3692
1b7f4a34 3693#: builtin/branch.c:839
ef317cd5 3694msgid "list both remote-tracking and local branches"
07432cef 3695msgstr "列出远程跟踪及本地分支"
c04f5ac3 3696
1b7f4a34 3697#: builtin/branch.c:841
ef317cd5 3698msgid "delete fully merged branch"
07432cef 3699msgstr "删除完全合并的分支"
c04f5ac3 3700
1b7f4a34 3701#: builtin/branch.c:842
ef317cd5 3702msgid "delete branch (even if not merged)"
07432cef 3703msgstr "删除分支(即使没有合并)"
c04f5ac3 3704
1b7f4a34 3705#: builtin/branch.c:843
ef317cd5 3706msgid "move/rename a branch and its reflog"
07432cef 3707msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 3708
1b7f4a34 3709#: builtin/branch.c:844
ef317cd5 3710msgid "move/rename a branch, even if target exists"
07432cef 3711msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 3712
1b7f4a34 3713#: builtin/branch.c:845
ef317cd5 3714msgid "list branch names"
07432cef 3715msgstr "列出分支名"
c04f5ac3 3716
1b7f4a34 3717#: builtin/branch.c:846
ef317cd5 3718msgid "create the branch's reflog"
07432cef 3719msgstr "创建分支的引用日志"
ef317cd5 3720
1b7f4a34 3721#: builtin/branch.c:848
ef317cd5 3722msgid "edit the description for the branch"
07432cef 3723msgstr "标记分支的描述"
ef317cd5 3724
1b7f4a34 3725#: builtin/branch.c:849
04cb2f28
JX
3726msgid "force creation, move/rename, deletion"
3727msgstr "强制创建、移动/重命名、删除"
ef317cd5 3728
1b7f4a34 3729#: builtin/branch.c:852
ef317cd5 3730msgid "print only not merged branches"
07432cef 3731msgstr "只打印没有合并的分支"
ef317cd5 3732
1b7f4a34 3733#: builtin/branch.c:858
ef317cd5 3734msgid "print only merged branches"
07432cef 3735msgstr "只打印合并的分支"
ef317cd5 3736
1b7f4a34 3737#: builtin/branch.c:862
ef317cd5 3738msgid "list branches in columns"
07432cef 3739msgstr "以列的方式显示分支"
ef317cd5 3740
1b7f4a34 3741#: builtin/branch.c:875
c04f5ac3
JX
3742msgid "Failed to resolve HEAD as a valid ref."
3743msgstr "无法将 HEAD 解析为有效引用。"
3744
1b7f4a34 3745#: builtin/branch.c:879 builtin/clone.c:690
c04f5ac3 3746msgid "HEAD not found below refs/heads!"
90e6ef53 3747msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 3748
1b7f4a34 3749#: builtin/branch.c:901
8ada9598 3750msgid "--column and --verbose are incompatible"
81809b99 3751msgstr "--column 和 --verbose 不兼容"
8ada9598 3752
1b7f4a34 3753#: builtin/branch.c:912 builtin/branch.c:951
a77c07d9
JX
3754msgid "branch name required"
3755msgstr "必须提供分支名"
3756
1b7f4a34 3757#: builtin/branch.c:927
a77c07d9
JX
3758msgid "Cannot give description to detached HEAD"
3759msgstr "不能向分离头指针提供描述"
3760
1b7f4a34 3761#: builtin/branch.c:932
a77c07d9
JX
3762msgid "cannot edit description of more than one branch"
3763msgstr "不能为一个以上的分支编辑描述"
3764
1b7f4a34 3765#: builtin/branch.c:939
a77c07d9
JX
3766#, c-format
3767msgid "No commit on branch '%s' yet."
3768msgstr "分支 '%s' 尚无提交。"
3769
1b7f4a34 3770#: builtin/branch.c:942
a77c07d9
JX
3771#, c-format
3772msgid "No branch named '%s'."
3773msgstr "没有分支 '%s'。"
3774
1b7f4a34 3775#: builtin/branch.c:957
a77c07d9
JX
3776msgid "too many branches for a rename operation"
3777msgstr "为重命名操作提供了太多的分支名"
3778
1b7f4a34 3779#: builtin/branch.c:962
1003b3a5
JX
3780msgid "too many branches to set new upstream"
3781msgstr "为设置新上游提供了太多的分支名"
3782
1b7f4a34 3783#: builtin/branch.c:966
1003b3a5
JX
3784#, c-format
3785msgid ""
3786"could not set upstream of HEAD to %s when it does not point to any branch."
3787msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3788
1b7f4a34 3789#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012
1003b3a5
JX
3790#, c-format
3791msgid "no such branch '%s'"
3792msgstr "没有此分支 '%s'"
3793
1b7f4a34 3794#: builtin/branch.c:973
07432cef 3795#, c-format
ef317cd5 3796msgid "branch '%s' does not exist"
07432cef 3797msgstr "分支 '%s' 不存在"
ef317cd5 3798
1b7f4a34 3799#: builtin/branch.c:985
1003b3a5
JX
3800msgid "too many branches to unset upstream"
3801msgstr "为取消上游设置操作提供了太多的分支名"
3802
1b7f4a34 3803#: builtin/branch.c:989
1003b3a5
JX
3804msgid "could not unset upstream of HEAD when it does not point to any branch."
3805msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3806
1b7f4a34 3807#: builtin/branch.c:995
ef317cd5
JX
3808#, c-format
3809msgid "Branch '%s' has no upstream information"
07432cef 3810msgstr "分支 '%s' 没有上游信息"
ef317cd5 3811
1b7f4a34 3812#: builtin/branch.c:1009
1003b3a5
JX
3813msgid "it does not make sense to create 'HEAD' manually"
3814msgstr "手工创建 'HEAD' 没有意义"
3815
1b7f4a34 3816#: builtin/branch.c:1015
c04f5ac3
JX
3817msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3818msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3819
1b7f4a34 3820#: builtin/branch.c:1018
ef317cd5
JX
3821#, c-format
3822msgid ""
3823"The --set-upstream flag is deprecated and will be removed. Consider using --"
3824"track or --set-upstream-to\n"
3825msgstr ""
07432cef 3826"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
ef317cd5 3827
1b7f4a34 3828#: builtin/branch.c:1035
ef317cd5
JX
3829#, c-format
3830msgid ""
3831"\n"
3832"If you wanted to make '%s' track '%s', do this:\n"
3833"\n"
3834msgstr ""
07432cef
WS
3835"\n"
3836"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3837"\n"
ef317cd5 3838
1b7f4a34 3839#: builtin/branch.c:1036
07432cef 3840#, c-format
ef317cd5 3841msgid " git branch -d %s\n"
07432cef 3842msgstr " git branch -d %s\n"
ef317cd5 3843
1b7f4a34 3844#: builtin/branch.c:1037
ef317cd5
JX
3845#, c-format
3846msgid " git branch --set-upstream-to %s\n"
07432cef 3847msgstr " git branch --set-upstream-to %s\n"
ef317cd5 3848
7aea43ff 3849#: builtin/bundle.c:51
c04f5ac3
JX
3850#, c-format
3851msgid "%s is okay\n"
3852msgstr "%s 可以\n"
3853
7aea43ff 3854#: builtin/bundle.c:64
c04f5ac3 3855msgid "Need a repository to create a bundle."
160fb2b2 3856msgstr "需要一个仓库来创建包。"
c04f5ac3 3857
7aea43ff 3858#: builtin/bundle.c:68
c04f5ac3 3859msgid "Need a repository to unbundle."
160fb2b2 3860msgstr "需要一个仓库来解包。"
c04f5ac3 3861
1b7f4a34 3862#: builtin/cat-file.c:428
7aea43ff
JX
3863msgid ""
3864"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3865"<type>|--textconv) <object>"
3866msgstr ""
3867"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
3868">|--textconv) <对象>"
ef317cd5 3869
1b7f4a34 3870#: builtin/cat-file.c:429
7aea43ff
JX
3871msgid ""
3872"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
3873"objects>"
3874msgstr ""
3875"git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>"
ef317cd5 3876
1b7f4a34 3877#: builtin/cat-file.c:466
ef317cd5 3878msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 3879msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 3880
1b7f4a34 3881#: builtin/cat-file.c:467
ef317cd5 3882msgid "show object type"
07432cef 3883msgstr "显示对象类型"
ef317cd5 3884
1b7f4a34 3885#: builtin/cat-file.c:468
ef317cd5 3886msgid "show object size"
07432cef 3887msgstr "显示对象大小"
ef317cd5 3888
1b7f4a34 3889#: builtin/cat-file.c:470
ef317cd5 3890msgid "exit with zero when there's no error"
07432cef 3891msgstr "当没有错误时退出并返回零"
ef317cd5 3892
1b7f4a34 3893#: builtin/cat-file.c:471
ef317cd5 3894msgid "pretty-print object's content"
07432cef 3895msgstr "美观地打印对象的内容"
ef317cd5 3896
1b7f4a34 3897#: builtin/cat-file.c:473
ef317cd5 3898msgid "for blob objects, run textconv on object's content"
160fb2b2 3899msgstr "对于数据对象,对其内容执行 textconv"
ef317cd5 3900
1b7f4a34 3901#: builtin/cat-file.c:475
7aea43ff
JX
3902msgid "allow -s and -t to work with broken/corrupt objects"
3903msgstr "允许 -s 和 -t 对损坏的对象生效"
3904
1b7f4a34
JX
3905#: builtin/cat-file.c:476
3906msgid "buffer --batch output"
3907msgstr "缓冲 --batch 的输出"
3908
3909#: builtin/cat-file.c:478
ef317cd5 3910msgid "show info and content of objects fed from the standard input"
07432cef 3911msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 3912
1b7f4a34 3913#: builtin/cat-file.c:481
ef317cd5 3914msgid "show info about objects fed from the standard input"
07432cef 3915msgstr "显示从标准输入提供的对象的信息"
ef317cd5 3916
1b7f4a34 3917#: builtin/cat-file.c:484
7aea43ff
JX
3918msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3919msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
3920
1b7f4a34
JX
3921#: builtin/cat-file.c:486
3922msgid "show all objects with --batch or --batch-check"
3923msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
3924
ef317cd5 3925#: builtin/check-attr.c:11
814ff314
JX
3926msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3927msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5
JX
3928
3929#: builtin/check-attr.c:12
814ff314
JX
3930msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
3931msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"
ef317cd5
JX
3932
3933#: builtin/check-attr.c:19
3934msgid "report all attributes set on file"
07432cef 3935msgstr "报告设置在文件上的所有属性"
ef317cd5
JX
3936
3937#: builtin/check-attr.c:20
3938msgid "use .gitattributes only from the index"
07432cef 3939msgstr "只使用索引中的 .gitattributes"
ef317cd5 3940
7aea43ff 3941#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
ef317cd5 3942msgid "read file names from stdin"
07432cef 3943msgstr "从标准输入读出文件名"
ef317cd5 3944
a77c07d9 3945#: builtin/check-attr.c:23 builtin/check-ignore.c:24
90314792
JX
3946msgid "terminate input and output records by a NUL character"
3947msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 3948
1b7f4a34 3949#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267
a77c07d9
JX
3950msgid "suppress progress reporting"
3951msgstr "不显示进度报告"
3952
2e8451e8
JX
3953#: builtin/check-ignore.c:26
3954msgid "show non-matching input paths"
3955msgstr "显示未匹配的输入路径"
3956
90314792
JX
3957#: builtin/check-ignore.c:28
3958msgid "ignore index when checking"
3959msgstr "检查时忽略索引"
3960
3961#: builtin/check-ignore.c:154
a77c07d9 3962msgid "cannot specify pathnames with --stdin"
1b7f4a34 3963msgstr "不能同时指定路径及 --stdin 参数"
a77c07d9 3964
90314792 3965#: builtin/check-ignore.c:157
a77c07d9
JX
3966msgid "-z only makes sense with --stdin"
3967msgstr "-z 需要和 --stdin 参数共用才有意义"
3968
90314792 3969#: builtin/check-ignore.c:159
a77c07d9
JX
3970msgid "no path specified"
3971msgstr "未指定路径"
3972
90314792 3973#: builtin/check-ignore.c:163
a77c07d9
JX
3974msgid "--quiet is only valid with a single pathname"
3975msgstr "参数 --quiet 只在提供一个路径名时有效"
3976
90314792 3977#: builtin/check-ignore.c:165
a77c07d9
JX
3978msgid "cannot have both --quiet and --verbose"
3979msgstr "不能同时提供 --quiet 和 --verbose 参数"
3980
90314792 3981#: builtin/check-ignore.c:168
2e8451e8
JX
3982msgid "--non-matching is only valid with --verbose"
3983msgstr "--non-matching 选项只在使用 --verbose 时有效"
3984
3985#: builtin/check-mailmap.c:8
814ff314
JX
3986msgid "git check-mailmap [<options>] <contact>..."
3987msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8
JX
3988
3989#: builtin/check-mailmap.c:13
3990msgid "also read contacts from stdin"
3991msgstr "还从标准输入读取联系地址"
3992
3993#: builtin/check-mailmap.c:24
3994#, c-format
3995msgid "unable to parse contact: %s"
3996msgstr "不能解析联系地址:%s"
3997
3998#: builtin/check-mailmap.c:47
3999msgid "no contacts specified"
4000msgstr "未指定联系地址"
4001
ef317cd5 4002#: builtin/checkout-index.c:126
814ff314
JX
4003msgid "git checkout-index [<options>] [--] [<file>...]"
4004msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 4005
6acbf033 4006#: builtin/checkout-index.c:188
ef317cd5 4007msgid "check out all files in the index"
07432cef 4008msgstr "检出索引区的所有文件"
ef317cd5 4009
6acbf033 4010#: builtin/checkout-index.c:189
ef317cd5 4011msgid "force overwrite of existing files"
07432cef 4012msgstr "强制覆盖现有的文件"
ef317cd5 4013
6acbf033 4014#: builtin/checkout-index.c:191
ef317cd5 4015msgid "no warning for existing files and files not in index"
07432cef 4016msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 4017
6acbf033 4018#: builtin/checkout-index.c:193
ef317cd5 4019msgid "don't checkout new files"
07432cef 4020msgstr "不检出新文件"
ef317cd5 4021
6acbf033 4022#: builtin/checkout-index.c:195
ef317cd5 4023msgid "update stat information in the index file"
07432cef 4024msgstr "更新索引中文件的状态信息"
ef317cd5 4025
6acbf033 4026#: builtin/checkout-index.c:201
ef317cd5 4027msgid "read list of paths from the standard input"
07432cef 4028msgstr "从标准输入读取路径列表"
ef317cd5 4029
6acbf033 4030#: builtin/checkout-index.c:203
ef317cd5 4031msgid "write the content to temporary files"
07432cef 4032msgstr "将内容写入临时文件"
ef317cd5 4033
6acbf033 4034#: builtin/checkout-index.c:204 builtin/column.c:30
ef317cd5 4035msgid "string"
07432cef 4036msgstr "字符串"
ef317cd5 4037
6acbf033 4038#: builtin/checkout-index.c:205
ef317cd5 4039msgid "when creating files, prepend <string>"
4375c10e 4040msgstr "在创建文件时,在前面加上 <字符串>"
ef317cd5 4041
6acbf033 4042#: builtin/checkout-index.c:208
ef317cd5 4043msgid "copy out the files from named stage"
07432cef 4044msgstr "从指定暂存区中拷出文件"
ef317cd5 4045
1b7f4a34 4046#: builtin/checkout.c:25
814ff314
JX
4047msgid "git checkout [<options>] <branch>"
4048msgstr "git checkout [<选项>] <分支>"
ef317cd5 4049
1b7f4a34 4050#: builtin/checkout.c:26
814ff314
JX
4051msgid "git checkout [<options>] [<branch>] -- <file>..."
4052msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 4053
1b7f4a34 4054#: builtin/checkout.c:133 builtin/checkout.c:166
c04f5ac3
JX
4055#, c-format
4056msgid "path '%s' does not have our version"
4057msgstr "路径 '%s' 没有我们的版本"
4058
1b7f4a34 4059#: builtin/checkout.c:135 builtin/checkout.c:168
c04f5ac3
JX
4060#, c-format
4061msgid "path '%s' does not have their version"
4062msgstr "路径 '%s' 没有他们的版本"
4063
1b7f4a34 4064#: builtin/checkout.c:151
c04f5ac3
JX
4065#, c-format
4066msgid "path '%s' does not have all necessary versions"
4067msgstr "路径 '%s' 没有全部必须的版本"
4068
1b7f4a34 4069#: builtin/checkout.c:195
c04f5ac3
JX
4070#, c-format
4071msgid "path '%s' does not have necessary versions"
4072msgstr "路径 '%s' 没有必须的版本"
4073
1b7f4a34 4074#: builtin/checkout.c:212
c04f5ac3
JX
4075#, c-format
4076msgid "path '%s': cannot merge"
90e6ef53 4077msgstr "path '%s':无法合并"
c04f5ac3 4078
1b7f4a34 4079#: builtin/checkout.c:229
c04f5ac3
JX
4080#, c-format
4081msgid "Unable to add merge result for '%s'"
4082msgstr "无法为 '%s' 添加合并结果"
4083
1b7f4a34
JX
4084#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
4085#: builtin/checkout.c:259
07432cef 4086#, c-format
ef317cd5 4087msgid "'%s' cannot be used with updating paths"
07432cef 4088msgstr "'%s' 不能在更新路径时使用"
ef317cd5 4089
1b7f4a34 4090#: builtin/checkout.c:262 builtin/checkout.c:265
07432cef 4091#, c-format
ef317cd5 4092msgid "'%s' cannot be used with %s"
07432cef 4093msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 4094
1b7f4a34 4095#: builtin/checkout.c:268
ef317cd5
JX
4096#, c-format
4097msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 4098msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 4099
1b7f4a34 4100#: builtin/checkout.c:279 builtin/checkout.c:473
c04f5ac3 4101msgid "corrupt index file"
90e6ef53 4102msgstr "损坏的索引文件"
c04f5ac3 4103
1b7f4a34 4104#: builtin/checkout.c:339 builtin/checkout.c:346
c04f5ac3
JX
4105#, c-format
4106msgid "path '%s' is unmerged"
4107msgstr "路径 '%s' 未合并"
4108
1b7f4a34 4109#: builtin/checkout.c:495
c04f5ac3 4110msgid "you need to resolve your current index first"
90e6ef53 4111msgstr "您需要先解决当前索引的冲突"
c04f5ac3 4112
1b7f4a34 4113#: builtin/checkout.c:622
c04f5ac3 4114#, c-format
1b7f4a34
JX
4115msgid "Can not do reflog for '%s': %s\n"
4116msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
c04f5ac3 4117
1b7f4a34 4118#: builtin/checkout.c:660
c04f5ac3
JX
4119msgid "HEAD is now at"
4120msgstr "HEAD 目前位于"
4121
1b7f4a34 4122#: builtin/checkout.c:667
c04f5ac3
JX
4123#, c-format
4124msgid "Reset branch '%s'\n"
4125msgstr "重置分支 '%s'\n"
4126
1b7f4a34 4127#: builtin/checkout.c:670
c04f5ac3
JX
4128#, c-format
4129msgid "Already on '%s'\n"
4130msgstr "已经位于 '%s'\n"
4131
1b7f4a34 4132#: builtin/checkout.c:674
c04f5ac3
JX
4133#, c-format
4134msgid "Switched to and reset branch '%s'\n"
4135msgstr "切换并重置分支 '%s'\n"
4136
1b7f4a34 4137#: builtin/checkout.c:676 builtin/checkout.c:1065
c04f5ac3
JX
4138#, c-format
4139msgid "Switched to a new branch '%s'\n"
4140msgstr "切换到一个新分支 '%s'\n"
4141
1b7f4a34 4142#: builtin/checkout.c:678
c04f5ac3
JX
4143#, c-format
4144msgid "Switched to branch '%s'\n"
4145msgstr "切换到分支 '%s'\n"
4146
90e6ef53 4147# 译者:注意保持前导空格
1b7f4a34 4148#: builtin/checkout.c:730
c04f5ac3
JX
4149#, c-format
4150msgid " ... and %d more.\n"
90e6ef53 4151msgstr " ... 及其它 %d 个。\n"
c04f5ac3 4152
1b7f4a34 4153#: builtin/checkout.c:736
c04f5ac3
JX
4154#, c-format
4155msgid ""
4156"Warning: you are leaving %d commit behind, not connected to\n"
4157"any of your branches:\n"
4158"\n"
4159"%s\n"
4160msgid_plural ""
4161"Warning: you are leaving %d commits behind, not connected to\n"
4162"any of your branches:\n"
4163"\n"
4164"%s\n"
4165msgstr[0] ""
4166"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4167"\n"
4168"%s\n"
5ae481e0
JX
4169msgstr[1] ""
4170"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4171"\n"
4172"%s\n"
c04f5ac3 4173
1b7f4a34 4174#: builtin/checkout.c:755
c04f5ac3
JX
4175#, c-format
4176msgid ""
7aea43ff
JX
4177"If you want to keep it by creating a new branch, this may be a good time\n"
4178"to do so with:\n"
4179"\n"
4180" git branch <new-branch-name> %s\n"
4181"\n"
4182msgid_plural ""
c04f5ac3
JX
4183"If you want to keep them by creating a new branch, this may be a good time\n"
4184"to do so with:\n"
4185"\n"
814ff314 4186" git branch <new-branch-name> %s\n"
c04f5ac3 4187"\n"
7aea43ff
JX
4188msgstr[0] ""
4189"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
4190"如下操作:\n"
4191"\n"
4192" git branch <新分支名> %s\n"
4193"\n"
4194msgstr[1] ""
4195"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
4196"如下操作:\n"
4197"\n"
814ff314 4198" git branch <新分支名> %s\n"
c04f5ac3
JX
4199"\n"
4200
1b7f4a34 4201#: builtin/checkout.c:791
c04f5ac3
JX
4202msgid "internal error in revision walk"
4203msgstr "在版本遍历时遇到内部错误"
4204
1b7f4a34 4205#: builtin/checkout.c:795
c04f5ac3
JX
4206msgid "Previous HEAD position was"
4207msgstr "之前的 HEAD 位置是"
4208
1b7f4a34 4209#: builtin/checkout.c:822 builtin/checkout.c:1060
c04f5ac3 4210msgid "You are on a branch yet to be born"
90e6ef53 4211msgstr "您位于一个尚未初始化的分支"
c04f5ac3 4212
1b7f4a34 4213#: builtin/checkout.c:967
90314792
JX
4214#, c-format
4215msgid "only one reference expected, %d given."
4216msgstr "只要一个引用,却给出了 %d 个"
4217
1b7f4a34 4218#: builtin/checkout.c:1006 builtin/worktree.c:210
c04f5ac3
JX
4219#, c-format
4220msgid "invalid reference: %s"
4221msgstr "无效引用:%s"
4222
1b7f4a34 4223#: builtin/checkout.c:1035
c04f5ac3
JX
4224#, c-format
4225msgid "reference is not a tree: %s"
4226msgstr "引用不是一个树:%s"
4227
1b7f4a34 4228#: builtin/checkout.c:1074
ef317cd5 4229msgid "paths cannot be used with switching branches"
07432cef 4230msgstr "路径不能和切换分支同时使用"
c04f5ac3 4231
1b7f4a34 4232#: builtin/checkout.c:1077 builtin/checkout.c:1081
07432cef 4233#, c-format
ef317cd5 4234msgid "'%s' cannot be used with switching branches"
07432cef 4235msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 4236
1b7f4a34
JX
4237#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093
4238#: builtin/checkout.c:1096
07432cef 4239#, c-format
ef317cd5 4240msgid "'%s' cannot be used with '%s'"
07432cef 4241msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 4242
1b7f4a34 4243#: builtin/checkout.c:1101
07432cef 4244#, c-format
ef317cd5 4245msgid "Cannot switch branch to a non-commit '%s'"
07432cef 4246msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 4247
1b7f4a34
JX
4248#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83
4249#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317
4250#: builtin/worktree.c:319
ef317cd5 4251msgid "branch"
07432cef 4252msgstr "分支"
c04f5ac3 4253
1b7f4a34 4254#: builtin/checkout.c:1135
ef317cd5 4255msgid "create and checkout a new branch"
07432cef 4256msgstr "创建并检出一个新的分支"
c04f5ac3 4257
1b7f4a34 4258#: builtin/checkout.c:1137
ef317cd5 4259msgid "create/reset and checkout a branch"
07432cef 4260msgstr "创建/重置并检出一个分支"
c04f5ac3 4261
1b7f4a34 4262#: builtin/checkout.c:1138
ef317cd5 4263msgid "create reflog for new branch"
07432cef 4264msgstr "为新的分支创建引用日志"
ef317cd5 4265
1b7f4a34 4266#: builtin/checkout.c:1139
ef317cd5 4267msgid "detach the HEAD at named commit"
07432cef 4268msgstr "成为指向该提交的分离头指针"
ef317cd5 4269
1b7f4a34 4270#: builtin/checkout.c:1140
ef317cd5 4271msgid "set upstream info for new branch"
07432cef 4272msgstr "为新的分支设置上游信息"
ef317cd5 4273
1b7f4a34 4274#: builtin/checkout.c:1142
6c94aba5 4275msgid "new-branch"
07432cef 4276msgstr "新分支"
ef317cd5 4277
1b7f4a34 4278#: builtin/checkout.c:1142
ef317cd5 4279msgid "new unparented branch"
07432cef 4280msgstr "新的没有父提交的分支"
ef317cd5 4281
1b7f4a34 4282#: builtin/checkout.c:1143
ef317cd5 4283msgid "checkout our version for unmerged files"
07432cef 4284msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 4285
1b7f4a34 4286#: builtin/checkout.c:1145
ef317cd5 4287msgid "checkout their version for unmerged files"
07432cef 4288msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 4289
1b7f4a34 4290#: builtin/checkout.c:1147
ef317cd5 4291msgid "force checkout (throw away local modifications)"
07432cef 4292msgstr "强制检出(丢弃本地修改)"
c04f5ac3 4293
1b7f4a34 4294#: builtin/checkout.c:1148
ef317cd5 4295msgid "perform a 3-way merge with the new branch"
160fb2b2 4296msgstr "和新的分支执行三方合并"
ef317cd5 4297
1b7f4a34 4298#: builtin/checkout.c:1149 builtin/merge.c:227
ef317cd5 4299msgid "update ignored files (default)"
07432cef 4300msgstr "更新忽略的文件(默认)"
c04f5ac3 4301
1b7f4a34 4302#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249
ef317cd5 4303msgid "style"
07432cef 4304msgstr "风格"
ef317cd5 4305
1b7f4a34 4306#: builtin/checkout.c:1151
ef317cd5 4307msgid "conflict style (merge or diff3)"
07432cef 4308msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 4309
1b7f4a34 4310#: builtin/checkout.c:1154
4dcdc3d8
JX
4311msgid "do not limit pathspecs to sparse entries only"
4312msgstr "对路径不做稀疏检出的限制"
4313
1b7f4a34 4314#: builtin/checkout.c:1156
814ff314
JX
4315msgid "second guess 'git checkout <no-such-branch>'"
4316msgstr "二次猜测'git checkout <无此分支>'"
ef317cd5 4317
1b7f4a34 4318#: builtin/checkout.c:1158
7aea43ff
JX
4319msgid "do not check if another worktree is holding the given ref"
4320msgstr "不检查指定的引用是否被其他工作区所占用"
4321
1b7f4a34 4322#: builtin/checkout.c:1181
ef317cd5 4323msgid "-b, -B and --orphan are mutually exclusive"
07432cef 4324msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 4325
1b7f4a34 4326#: builtin/checkout.c:1198
ef317cd5
JX
4327msgid "--track needs a branch name"
4328msgstr "--track 需要一个分支名"
4329
1b7f4a34 4330#: builtin/checkout.c:1203
ef317cd5
JX
4331msgid "Missing branch name; try -b"
4332msgstr "缺少分支名;尝试 -b"
4333
1b7f4a34 4334#: builtin/checkout.c:1239
c04f5ac3 4335msgid "invalid path specification"
90e6ef53 4336msgstr "无效的路径规格"
c04f5ac3 4337
1b7f4a34 4338#: builtin/checkout.c:1246
07432cef 4339#, c-format
c04f5ac3 4340msgid ""
ef317cd5 4341"Cannot update paths and switch to branch '%s' at the same time.\n"
c04f5ac3
JX
4342"Did you intend to checkout '%s' which can not be resolved as commit?"
4343msgstr ""
07432cef
WS
4344"不能同时更新路径并切换到分支'%s'。\n"
4345"您是想要检出 '%s' 但其未能解析为提交么?"
c04f5ac3 4346
1b7f4a34 4347#: builtin/checkout.c:1251
07432cef 4348#, c-format
ef317cd5 4349msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 4350msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 4351
1b7f4a34 4352#: builtin/checkout.c:1255
c04f5ac3
JX
4353msgid ""
4354"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4355"checking out of the index."
4356msgstr ""
90e6ef53 4357"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 4358
1b7f4a34 4359#: builtin/clean.c:25
2e8451e8
JX
4360msgid ""
4361"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
4362msgstr ""
4363"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 4364
1b7f4a34 4365#: builtin/clean.c:29
07432cef
WS
4366#, c-format
4367msgid "Removing %s\n"
4368msgstr "正删除 %s\n"
4369
1b7f4a34 4370#: builtin/clean.c:30
07432cef
WS
4371#, c-format
4372msgid "Would remove %s\n"
4373msgstr "将删除 %s\n"
4374
1b7f4a34 4375#: builtin/clean.c:31
07432cef
WS
4376#, c-format
4377msgid "Skipping repository %s\n"
160fb2b2 4378msgstr "忽略仓库 %s\n"
07432cef 4379
1b7f4a34 4380#: builtin/clean.c:32
07432cef
WS
4381#, c-format
4382msgid "Would skip repository %s\n"
160fb2b2 4383msgstr "将忽略仓库 %s\n"
07432cef 4384
1b7f4a34 4385#: builtin/clean.c:33
07432cef
WS
4386#, c-format
4387msgid "failed to remove %s"
4388msgstr "无法删除 %s"
4389
1b7f4a34 4390#: builtin/clean.c:317
2e8451e8
JX
4391msgid ""
4392"Prompt help:\n"
4393"1 - select a numbered item\n"
4394"foo - select item based on unique prefix\n"
4395" - (empty) select nothing"
4396msgstr ""
4397"帮助:\n"
4398"1 - 通过编号选择一个选项\n"
4399"foo - 通过标题选择一个选项\n"
4400" - (空)什么也不选择"
4401
1b7f4a34 4402#: builtin/clean.c:321
2e8451e8
JX
4403msgid ""
4404"Prompt help:\n"
4405"1 - select a single item\n"
4406"3-5 - select a range of items\n"
4407"2-3,6-9 - select multiple ranges\n"
4408"foo - select item based on unique prefix\n"
4409"-... - unselect specified items\n"
4410"* - choose all items\n"
4411" - (empty) finish selecting"
4412msgstr ""
4413"帮助:\n"
4414"1 - 选择一个选项\n"
4415"3-5 - 选择一个范围内的所有选项\n"
4416"2-3,6-9 - 选择多个范围内的所有选项\n"
4417"foo - 通过标题选择一个选项\n"
4418"-... - 反选特定的选项\n"
4419"* - 选择所有选项\n"
4420" - (空)结束选择"
4421
1b7f4a34 4422#: builtin/clean.c:537
2e8451e8
JX
4423#, c-format
4424msgid "Huh (%s)?"
4425msgstr "嗯(%s)?"
4426
1b7f4a34 4427#: builtin/clean.c:679
2e8451e8
JX
4428#, c-format
4429msgid "Input ignore patterns>> "
4430msgstr "输入模版以排除条目>> "
4431
1b7f4a34 4432#: builtin/clean.c:716
2e8451e8
JX
4433#, c-format
4434msgid "WARNING: Cannot find items matched by: %s"
4435msgstr "警告:无法找到和 %s 匹配的条目"
4436
1b7f4a34 4437#: builtin/clean.c:737
2e8451e8
JX
4438msgid "Select items to delete"
4439msgstr "选择要删除的条目"
4440
814ff314 4441#. TRANSLATORS: Make sure to keep [y/N] as is
1b7f4a34 4442#: builtin/clean.c:778
2e8451e8 4443#, c-format
814ff314
JX
4444msgid "Remove %s [y/N]? "
4445msgstr "删除 %s [y/N]?"
2e8451e8 4446
1b7f4a34 4447#: builtin/clean.c:803
2e8451e8
JX
4448msgid "Bye."
4449msgstr "再见。"
4450
1b7f4a34 4451#: builtin/clean.c:811
2e8451e8
JX
4452msgid ""
4453"clean - start cleaning\n"
4454"filter by pattern - exclude items from deletion\n"
4455"select by numbers - select items to be deleted by numbers\n"
4456"ask each - confirm each deletion (like \"rm -i\")\n"
4457"quit - stop cleaning\n"
4458"help - this screen\n"
4459"? - help for prompt selection"
4460msgstr ""
4461"clean - 开始清理\n"
4462"filter by pattern - 通过模版排除要删除的条目\n"
4463"select by numbers - 通过数字选择要删除的条目\n"
4464"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
4465"quit - 停止删除并退出\n"
4466"help - 显示本帮助\n"
4467"? - 显示如何在提示符下选择的帮助"
4468
1b7f4a34 4469#: builtin/clean.c:838
2e8451e8
JX
4470msgid "*** Commands ***"
4471msgstr "*** 命令 ***"
4472
1b7f4a34 4473#: builtin/clean.c:839
2e8451e8
JX
4474msgid "What now"
4475msgstr "请选择"
4476
1b7f4a34 4477#: builtin/clean.c:847
2e8451e8
JX
4478msgid "Would remove the following item:"
4479msgid_plural "Would remove the following items:"
4480msgstr[0] "将删除如下条目:"
4481msgstr[1] "将删除如下条目:"
4482
1b7f4a34 4483#: builtin/clean.c:864
2e8451e8
JX
4484msgid "No more files to clean, exiting."
4485msgstr "没有要清理的文件,退出。"
4486
1b7f4a34 4487#: builtin/clean.c:895
ef317cd5 4488msgid "do not print names of files removed"
07432cef 4489msgstr "不打印删除文件的名称"
ef317cd5 4490
1b7f4a34 4491#: builtin/clean.c:897
ef317cd5 4492msgid "force"
07432cef 4493msgstr "强制"
ef317cd5 4494
1b7f4a34 4495#: builtin/clean.c:898
2e8451e8
JX
4496msgid "interactive cleaning"
4497msgstr "交互式清除"
4498
1b7f4a34 4499#: builtin/clean.c:900
ef317cd5 4500msgid "remove whole directories"
07432cef 4501msgstr "删除整个目录"
ef317cd5 4502
1b7f4a34 4503#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714
7aea43ff 4504#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
ef317cd5 4505msgid "pattern"
07432cef 4506msgstr "模式"
ef317cd5 4507
1b7f4a34 4508#: builtin/clean.c:902
ef317cd5 4509msgid "add <pattern> to ignore rules"
4375c10e 4510msgstr "添加 <模式> 到忽略规则"
ef317cd5 4511
1b7f4a34 4512#: builtin/clean.c:903
ef317cd5 4513msgid "remove ignored files, too"
07432cef 4514msgstr "也删除忽略的文件"
ef317cd5 4515
1b7f4a34 4516#: builtin/clean.c:905
ef317cd5 4517msgid "remove only ignored files"
07432cef 4518msgstr "只删除忽略的文件"
c04f5ac3 4519
1b7f4a34 4520#: builtin/clean.c:923
c04f5ac3 4521msgid "-x and -X cannot be used together"
649900bc 4522msgstr "-x 和 -X 不能同时使用"
c04f5ac3 4523
1b7f4a34 4524#: builtin/clean.c:927
c04f5ac3 4525msgid ""
6c94aba5 4526"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 4527"clean"
c04f5ac3 4528msgstr ""
2e8451e8 4529"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 4530
1b7f4a34 4531#: builtin/clean.c:930
c04f5ac3 4532msgid ""
6c94aba5 4533"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 4534"refusing to clean"
c04f5ac3 4535msgstr ""
2e8451e8 4536"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 4537
220c313c 4538#: builtin/clone.c:37
814ff314 4539msgid "git clone [<options>] [--] <repo> [<dir>]"
160fb2b2 4540msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
ef317cd5 4541
1b7f4a34
JX
4542#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224
4543#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168
ef317cd5 4544msgid "force progress reporting"
07432cef 4545msgstr "强制显示进度报告"
ef317cd5 4546
7aea43ff 4547#: builtin/clone.c:59
ef317cd5 4548msgid "don't create a checkout"
07432cef 4549msgstr "不创建一个检出"
ef317cd5 4550
1b7f4a34 4551#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504
ef317cd5 4552msgid "create a bare repository"
160fb2b2 4553msgstr "创建一个纯仓库"
ef317cd5 4554
7aea43ff 4555#: builtin/clone.c:64
ef317cd5 4556msgid "create a mirror repository (implies bare)"
160fb2b2 4557msgstr "创建一个镜像仓库(也是纯仓库)"
ef317cd5 4558
7aea43ff 4559#: builtin/clone.c:66
ef317cd5 4560msgid "to clone from a local repository"
160fb2b2 4561msgstr "从本地仓库克隆"
ef317cd5 4562
7aea43ff 4563#: builtin/clone.c:68
ef317cd5 4564msgid "don't use local hardlinks, always copy"
07432cef 4565msgstr "不使用本地硬链接,始终复制"
ef317cd5 4566
7aea43ff 4567#: builtin/clone.c:70
ef317cd5 4568msgid "setup as shared repository"
160fb2b2 4569msgstr "设置为共享仓库"
ef317cd5 4570
7aea43ff 4571#: builtin/clone.c:72 builtin/clone.c:74
ef317cd5 4572msgid "initialize submodules in the clone"
07432cef 4573msgstr "在克隆时初始化子模组"
ef317cd5 4574
1b7f4a34 4575#: builtin/clone.c:75 builtin/init-db.c:501
ef317cd5 4576msgid "template-directory"
07432cef 4577msgstr "模板目录"
ef317cd5 4578
1b7f4a34 4579#: builtin/clone.c:76 builtin/init-db.c:502
ef317cd5 4580msgid "directory from which templates will be used"
07432cef 4581msgstr "模板目录将被使用"
ef317cd5 4582
7aea43ff 4583#: builtin/clone.c:78
ef317cd5 4584msgid "reference repository"
160fb2b2 4585msgstr "参考仓库"
ef317cd5 4586
7aea43ff
JX
4587#: builtin/clone.c:80
4588msgid "use --reference only while cloning"
160fb2b2 4589msgstr "仅在克隆时参考 --reference 指向的本地仓库"
7aea43ff
JX
4590
4591#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
ef317cd5 4592msgid "name"
07432cef 4593msgstr "名称"
ef317cd5 4594
7aea43ff 4595#: builtin/clone.c:82
ef317cd5 4596msgid "use <name> instead of 'origin' to track upstream"
4375c10e 4597msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
ef317cd5 4598
7aea43ff 4599#: builtin/clone.c:84
ef317cd5 4600msgid "checkout <branch> instead of the remote's HEAD"
4375c10e 4601msgstr "检出 <分支> 而不是远程 HEAD"
ef317cd5 4602
7aea43ff 4603#: builtin/clone.c:86
ef317cd5 4604msgid "path to git-upload-pack on the remote"
07432cef 4605msgstr "远程 git-upload-pack 路径"
ef317cd5 4606
1b7f4a34
JX
4607#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659
4608#: builtin/pull.c:186
ef317cd5 4609msgid "depth"
07432cef 4610msgstr "深度"
ef317cd5 4611
7aea43ff 4612#: builtin/clone.c:88
ef317cd5 4613msgid "create a shallow clone of that depth"
07432cef 4614msgstr "创建一个指定深度的浅克隆"
ef317cd5 4615
7aea43ff 4616#: builtin/clone.c:90
ef317cd5 4617msgid "clone only one branch, HEAD or --branch"
07432cef 4618msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 4619
1b7f4a34 4620#: builtin/clone.c:91 builtin/init-db.c:510
ef317cd5 4621msgid "gitdir"
07432cef 4622msgstr "git目录"
ef317cd5 4623
1b7f4a34 4624#: builtin/clone.c:92 builtin/init-db.c:511
ef317cd5 4625msgid "separate git dir from working tree"
07432cef 4626msgstr "git目录和工作区分离"
ef317cd5 4627
7aea43ff 4628#: builtin/clone.c:93
ef317cd5 4629msgid "key=value"
07432cef 4630msgstr "key=value"
ef317cd5 4631
7aea43ff 4632#: builtin/clone.c:94
ef317cd5 4633msgid "set config inside the new repository"
160fb2b2 4634msgstr "在新仓库中设置配置信息"
ef317cd5 4635
1b7f4a34 4636#: builtin/clone.c:298
c04f5ac3 4637#, c-format
4dcdc3d8 4638msgid "reference repository '%s' is not a local repository."
160fb2b2 4639msgstr "参考仓库 '%s' 不是一个本地仓库。"
c04f5ac3 4640
1b7f4a34 4641#: builtin/clone.c:302
cfff71a9
JX
4642#, c-format
4643msgid "reference repository '%s' is shallow"
160fb2b2 4644msgstr "参考仓库 '%s' 是一个浅克隆"
cfff71a9 4645
1b7f4a34 4646#: builtin/clone.c:305
cfff71a9
JX
4647#, c-format
4648msgid "reference repository '%s' is grafted"
160fb2b2 4649msgstr "参考仓库 '%s' 已被嫁接"
cfff71a9 4650
1b7f4a34 4651#: builtin/clone.c:370 builtin/diff.c:84
c04f5ac3
JX
4652#, c-format
4653msgid "failed to stat '%s'"
90e6ef53 4654msgstr "无法枚举 '%s' 状态"
c04f5ac3 4655
1b7f4a34 4656#: builtin/clone.c:372
c04f5ac3
JX
4657#, c-format
4658msgid "%s exists and is not a directory"
4659msgstr "%s 存在且不是一个目录"
4660
1b7f4a34 4661#: builtin/clone.c:386
c04f5ac3
JX
4662#, c-format
4663msgid "failed to stat %s\n"
90e6ef53 4664msgstr "无法枚举 %s 状态\n"
c04f5ac3 4665
1b7f4a34 4666#: builtin/clone.c:408
c04f5ac3
JX
4667#, c-format
4668msgid "failed to create link '%s'"
90e6ef53 4669msgstr "无法创建链接 '%s'"
c04f5ac3 4670
1b7f4a34 4671#: builtin/clone.c:412
c04f5ac3
JX
4672#, c-format
4673msgid "failed to copy file to '%s'"
90e6ef53 4674msgstr "无法拷贝文件至 '%s'"
c04f5ac3 4675
1b7f4a34 4676#: builtin/clone.c:435 builtin/clone.c:619
c04f5ac3
JX
4677#, c-format
4678msgid "done.\n"
4679msgstr "完成。\n"
4680
1b7f4a34 4681#: builtin/clone.c:447
1003b3a5
JX
4682msgid ""
4683"Clone succeeded, but checkout failed.\n"
4684"You can inspect what was checked out with 'git status'\n"
4685"and retry the checkout with 'git checkout -f HEAD'\n"
4686msgstr ""
4687"克隆成功,但是检出失败。\n"
4688"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4689"'git checkout -f HEAD' 重试\n"
4690
1b7f4a34 4691#: builtin/clone.c:524
c04f5ac3
JX
4692#, c-format
4693msgid "Could not find remote branch %s to clone."
90e6ef53 4694msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 4695
1b7f4a34 4696#: builtin/clone.c:614
2e8451e8
JX
4697#, c-format
4698msgid "Checking connectivity... "
4699msgstr "检查连接... "
4700
1b7f4a34 4701#: builtin/clone.c:617
1003b3a5
JX
4702msgid "remote did not send all necessary objects"
4703msgstr "远程没有发送所有必须的对象"
4704
1b7f4a34 4705#: builtin/clone.c:681
c04f5ac3
JX
4706msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4707msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4708
1b7f4a34 4709#: builtin/clone.c:712
1003b3a5
JX
4710msgid "unable to checkout working tree"
4711msgstr "不能检出工作区"
4712
1b7f4a34 4713#: builtin/clone.c:799
04cb2f28
JX
4714msgid "cannot repack to clean up"
4715msgstr "无法执行 repack 来清理"
4716
1b7f4a34 4717#: builtin/clone.c:801
04cb2f28
JX
4718msgid "cannot unlink temporary alternates file"
4719msgstr "无法删除临时的 alternates 文件"
4720
1b7f4a34 4721#: builtin/clone.c:831
c04f5ac3
JX
4722msgid "Too many arguments."
4723msgstr "太多参数。"
4724
1b7f4a34 4725#: builtin/clone.c:835
c04f5ac3 4726msgid "You must specify a repository to clone."
160fb2b2 4727msgstr "您必须指定一个仓库来克隆。"
c04f5ac3 4728
1b7f4a34 4729#: builtin/clone.c:846
c04f5ac3
JX
4730#, c-format
4731msgid "--bare and --origin %s options are incompatible."
4732msgstr "--bare 和 --origin %s 选项不兼容。"
4733
1b7f4a34 4734#: builtin/clone.c:849
07432cef
WS
4735msgid "--bare and --separate-git-dir are incompatible."
4736msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4737
1b7f4a34 4738#: builtin/clone.c:862
c04f5ac3
JX
4739#, c-format
4740msgid "repository '%s' does not exist"
160fb2b2 4741msgstr "仓库 '%s' 不存在"
c04f5ac3 4742
1b7f4a34 4743#: builtin/clone.c:868 builtin/fetch.c:1168
cfff71a9
JX
4744#, c-format
4745msgid "depth %s is not a positive number"
4746msgstr "深度 %s 不是一个正数"
4747
1b7f4a34 4748#: builtin/clone.c:878
c04f5ac3
JX
4749#, c-format
4750msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 4751msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 4752
1b7f4a34 4753#: builtin/clone.c:888
c04f5ac3
JX
4754#, c-format
4755msgid "working tree '%s' already exists."
4756msgstr "工作区 '%s' 已经存在。"
4757
1b7f4a34
JX
4758#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218
4759#: builtin/worktree.c:245
5bb01d4f
JX
4760#, c-format
4761msgid "could not create leading directories of '%s'"
4762msgstr "不能为 '%s' 创建先导目录"
4763
1b7f4a34 4764#: builtin/clone.c:906
c04f5ac3 4765#, c-format
814ff314
JX
4766msgid "could not create work tree dir '%s'"
4767msgstr "不能创建工作区目录 '%s'"
c04f5ac3 4768
1b7f4a34 4769#: builtin/clone.c:924
c04f5ac3
JX
4770#, c-format
4771msgid "Cloning into bare repository '%s'...\n"
160fb2b2 4772msgstr "克隆到纯仓库 '%s'...\n"
c04f5ac3 4773
1b7f4a34 4774#: builtin/clone.c:926
c04f5ac3
JX
4775#, c-format
4776msgid "Cloning into '%s'...\n"
4777msgstr "正克隆到 '%s'...\n"
4778
1b7f4a34 4779#: builtin/clone.c:951
04cb2f28
JX
4780msgid "--dissociate given, but there is no --reference"
4781msgstr "提供了参数 --dissociate,但未提供 --reference"
4782
1b7f4a34 4783#: builtin/clone.c:968
6acbf033
JX
4784msgid "--depth is ignored in local clones; use file:// instead."
4785msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4786
1b7f4a34 4787#: builtin/clone.c:971
6acbf033 4788msgid "source repository is shallow, ignoring --local"
160fb2b2 4789msgstr "源仓库是浅克隆,忽略 --local"
6acbf033 4790
1b7f4a34 4791#: builtin/clone.c:976
6acbf033
JX
4792msgid "--local is ignored"
4793msgstr "--local 被忽略"
4794
1b7f4a34 4795#: builtin/clone.c:980
c04f5ac3
JX
4796#, c-format
4797msgid "Don't know how to clone %s"
4798msgstr "不知道如何克隆 %s"
4799
1b7f4a34 4800#: builtin/clone.c:1029 builtin/clone.c:1037
c04f5ac3
JX
4801#, c-format
4802msgid "Remote branch %s not found in upstream %s"
4803msgstr "远程分支 %s 在上游 %s 未发现"
4804
1b7f4a34 4805#: builtin/clone.c:1040
c04f5ac3 4806msgid "You appear to have cloned an empty repository."
160fb2b2 4807msgstr "您似乎克隆了一个空仓库。"
c04f5ac3 4808
ef317cd5 4809#: builtin/column.c:9
814ff314
JX
4810msgid "git column [<options>]"
4811msgstr "git column [<选项>]"
ef317cd5
JX
4812
4813#: builtin/column.c:26
4814msgid "lookup config vars"
07432cef 4815msgstr "查找配置变量"
ef317cd5
JX
4816
4817#: builtin/column.c:27 builtin/column.c:28
ef317cd5 4818msgid "layout to use"
07432cef 4819msgstr "要使用的布局"
ef317cd5
JX
4820
4821#: builtin/column.c:29
4822msgid "Maximum width"
07432cef 4823msgstr "最大宽度"
ef317cd5
JX
4824
4825#: builtin/column.c:30
4826msgid "Padding space on left border"
07432cef 4827msgstr "左边框的填充空间"
ef317cd5
JX
4828
4829#: builtin/column.c:31
4830msgid "Padding space on right border"
07432cef 4831msgstr "右边框的填充空间"
ef317cd5
JX
4832
4833#: builtin/column.c:32
4834msgid "Padding space between columns"
07432cef 4835msgstr "两列之间的填充空间"
ef317cd5 4836
8ada9598
JX
4837#: builtin/column.c:51
4838msgid "--command must be the first argument"
81809b99 4839msgstr "--command 必须是第一个参数"
8ada9598 4840
220c313c 4841#: builtin/commit.c:37
814ff314 4842msgid "git commit [<options>] [--] <pathspec>..."
160fb2b2 4843msgstr "git commit [<选项>] [--] <路径规格>..."
ef317cd5 4844
220c313c 4845#: builtin/commit.c:42
814ff314 4846msgid "git status [<options>] [--] <pathspec>..."
160fb2b2 4847msgstr "git status [<选项>] [--] <路径规格>..."
ef317cd5 4848
220c313c
JX
4849#: builtin/commit.c:47
4850msgid ""
4851"Your name and email address were configured automatically based\n"
4852"on your username and hostname. Please check that they are accurate.\n"
4853"You can suppress this message by setting them explicitly. Run the\n"
4854"following command and follow the instructions in your editor to edit\n"
4855"your configuration file:\n"
4856"\n"
4857" git config --global --edit\n"
4858"\n"
4859"After doing this, you may fix the identity used for this commit with:\n"
4860"\n"
4861" git commit --amend --reset-author\n"
4862msgstr ""
4863"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4864"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4865"中编辑您的配置文件:\n"
4866"\n"
4867" git config --global --edit\n"
4868"\n"
4869"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4870"\n"
4871" git commit --amend --reset-author\n"
4872
4873#: builtin/commit.c:60
c04f5ac3
JX
4874msgid ""
4875"Your name and email address were configured automatically based\n"
4876"on your username and hostname. Please check that they are accurate.\n"
4877"You can suppress this message by setting them explicitly:\n"
4878"\n"
4879" git config --global user.name \"Your Name\"\n"
4880" git config --global user.email you@example.com\n"
4881"\n"
4882"After doing this, you may fix the identity used for this commit with:\n"
4883"\n"
4884" git commit --amend --reset-author\n"
4885msgstr ""
90e6ef53 4886"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
220c313c 4887"与否。您可以对其进行设置以免再出现本提示信息:\n"
c04f5ac3
JX
4888"\n"
4889" git config --global user.name \"Your Name\"\n"
4890" git config --global user.email you@example.com\n"
4891"\n"
90e6ef53 4892"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
4893"\n"
4894" git commit --amend --reset-author\n"
4895
220c313c 4896#: builtin/commit.c:72
c04f5ac3
JX
4897msgid ""
4898"You asked to amend the most recent commit, but doing so would make\n"
4899"it empty. You can repeat your command with --allow-empty, or you can\n"
4900"remove the commit entirely with \"git reset HEAD^\".\n"
4901msgstr ""
1b150dc9
T
4902"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4903"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 4904
220c313c 4905#: builtin/commit.c:77
c04f5ac3
JX
4906msgid ""
4907"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4908"If you wish to commit it anyway, use:\n"
4909"\n"
4910" git commit --allow-empty\n"
4911"\n"
c04f5ac3 4912msgstr ""
a9ce4543
T
4913"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4914"也要提交,使用命令:\n"
c04f5ac3
JX
4915"\n"
4916" git commit --allow-empty\n"
4917"\n"
c04f5ac3 4918
220c313c 4919#: builtin/commit.c:84
b1894384
JX
4920msgid "Otherwise, please use 'git reset'\n"
4921msgstr "否则,请使用命令 'git reset'\n"
4922
220c313c 4923#: builtin/commit.c:87
b1894384
JX
4924msgid ""
4925"If you wish to skip this commit, use:\n"
4926"\n"
4927" git reset\n"
4928"\n"
4929"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4930"the remaining commits.\n"
4931msgstr ""
4932"如果您想跳过这个提交,使用命令:\n"
4933"\n"
4934" git reset\n"
4935"\n"
4936"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4937"操作。\n"
4938
44f518e6 4939#: builtin/commit.c:304
c04f5ac3 4940msgid "failed to unpack HEAD tree object"
90e6ef53 4941msgstr "无法解包 HEAD 树对象"
c04f5ac3 4942
1b7f4a34 4943#: builtin/commit.c:345
c04f5ac3 4944msgid "unable to create temporary index"
90e6ef53 4945msgstr "不能创建临时索引"
c04f5ac3 4946
1b7f4a34 4947#: builtin/commit.c:351
c04f5ac3
JX
4948msgid "interactive add failed"
4949msgstr "交互式添加失败"
4950
1b7f4a34 4951#: builtin/commit.c:364
220c313c
JX
4952msgid "unable to update temporary index"
4953msgstr "无法更新临时索引"
4954
1b7f4a34 4955#: builtin/commit.c:366
220c313c
JX
4956msgid "Failed to update main cache tree"
4957msgstr "不能更新树的主缓存"
4958
1b7f4a34 4959#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462
c04f5ac3 4960msgid "unable to write new_index file"
90e6ef53 4961msgstr "无法写 new_index 文件"
c04f5ac3 4962
1b7f4a34 4963#: builtin/commit.c:444
8ada9598 4964msgid "cannot do a partial commit during a merge."
81809b99 4965msgstr "在合并过程中不能做部分提交。"
c04f5ac3 4966
1b7f4a34 4967#: builtin/commit.c:446
8ada9598 4968msgid "cannot do a partial commit during a cherry-pick."
81809b99 4969msgstr "在拣选过程中不能做部分提交。"
8ada9598 4970
1b7f4a34 4971#: builtin/commit.c:455
c04f5ac3 4972msgid "cannot read the index"
90e6ef53 4973msgstr "无法读取索引"
c04f5ac3 4974
1b7f4a34 4975#: builtin/commit.c:474
c04f5ac3 4976msgid "unable to write temporary index file"
90e6ef53 4977msgstr "无法写临时索引文件"
c04f5ac3 4978
1b7f4a34 4979#: builtin/commit.c:579
220c313c
JX
4980#, c-format
4981msgid "commit '%s' lacks author header"
4982msgstr "提交 '%s' 缺少作者信息"
4983
1b7f4a34 4984#: builtin/commit.c:581
c04f5ac3 4985#, c-format
220c313c
JX
4986msgid "commit '%s' has malformed author line"
4987msgstr "提交 '%s' 有非法的作者信息"
c04f5ac3 4988
1b7f4a34 4989#: builtin/commit.c:600
c04f5ac3
JX
4990msgid "malformed --author parameter"
4991msgstr "非法的 --author 参数"
4992
1b7f4a34 4993#: builtin/commit.c:608
c04f5ac3 4994#, c-format
6acbf033
JX
4995msgid "invalid date format: %s"
4996msgstr "无效的日期格式:%s"
4997
1b7f4a34 4998#: builtin/commit.c:652
6acbf033
JX
4999msgid ""
5000"unable to select a comment character that is not used\n"
5001"in the current commit message"
5002msgstr "无法选择一个未被当前提交说明使用的注释字符"
5003
1b7f4a34 5004#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079
c04f5ac3
JX
5005#, c-format
5006msgid "could not lookup commit %s"
5007msgstr "不能查询提交 %s"
5008
1b7f4a34 5009#: builtin/commit.c:701 builtin/shortlog.c:273
c04f5ac3
JX
5010#, c-format
5011msgid "(reading log message from standard input)\n"
90e6ef53 5012msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 5013
1b7f4a34 5014#: builtin/commit.c:703
c04f5ac3 5015msgid "could not read log from standard input"
90e6ef53 5016msgstr "不能从标准输入中读取日志信息"
c04f5ac3 5017
1b7f4a34 5018#: builtin/commit.c:707
c04f5ac3
JX
5019#, c-format
5020msgid "could not read log file '%s'"
90e6ef53 5021msgstr "不能读取日志文件 '%s'"
c04f5ac3 5022
1b7f4a34 5023#: builtin/commit.c:729
c04f5ac3 5024msgid "could not read MERGE_MSG"
90e6ef53 5025msgstr "不能读取 MERGE_MSG"
c04f5ac3 5026
1b7f4a34 5027#: builtin/commit.c:733
c04f5ac3 5028msgid "could not read SQUASH_MSG"
90e6ef53 5029msgstr "不能读取 SQUASH_MSG"
c04f5ac3 5030
1b7f4a34 5031#: builtin/commit.c:784
c04f5ac3 5032msgid "could not write commit template"
90e6ef53 5033msgstr "不能写提交模版"
c04f5ac3 5034
1b7f4a34 5035#: builtin/commit.c:802
81809b99 5036#, c-format
c04f5ac3
JX
5037msgid ""
5038"\n"
8ada9598 5039"It looks like you may be committing a merge.\n"
c04f5ac3
JX
5040"If this is not correct, please remove the file\n"
5041"\t%s\n"
5042"and try again.\n"
5043msgstr ""
5044"\n"
649900bc 5045"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
5046"\t%s\n"
5047"然后重试。\n"
5048
1b7f4a34 5049#: builtin/commit.c:807
81809b99 5050#, c-format
8ada9598
JX
5051msgid ""
5052"\n"
5053"It looks like you may be committing a cherry-pick.\n"
5054"If this is not correct, please remove the file\n"
5055"\t%s\n"
5056"and try again.\n"
5057msgstr ""
5058"\n"
649900bc 5059"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
5060"\t%s\n"
5061"然后重试。\n"
c04f5ac3 5062
1b7f4a34 5063#: builtin/commit.c:820
a77c07d9 5064#, c-format
c04f5ac3 5065msgid ""
8ada9598 5066"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 5067"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 5068msgstr ""
a77c07d9 5069"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 5070"说明将会终止提交。\n"
c04f5ac3 5071
1b7f4a34 5072#: builtin/commit.c:827
a77c07d9 5073#, c-format
c04f5ac3 5074msgid ""
8ada9598 5075"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 5076"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
5077"An empty message aborts the commit.\n"
5078msgstr ""
a77c07d9
JX
5079"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
5080"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 5081
90e6ef53 5082# 译者:为保证在输出中对齐,注意调整句中空格!
1b7f4a34 5083#: builtin/commit.c:847
6acbf033
JX
5084#, c-format
5085msgid "%sAuthor: %.*s <%.*s>"
5086msgstr "%s作者: %.*s <%.*s>"
5087
5088# 译者:为保证在输出中对齐,注意调整句中空格!
1b7f4a34 5089#: builtin/commit.c:855
c04f5ac3 5090#, c-format
6acbf033
JX
5091msgid "%sDate: %s"
5092msgstr "%s日期: %s"
c04f5ac3 5093
90e6ef53 5094# 译者:为保证在输出中对齐,注意调整句中空格!
1b7f4a34 5095#: builtin/commit.c:862
c04f5ac3 5096#, c-format
6acbf033
JX
5097msgid "%sCommitter: %.*s <%.*s>"
5098msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 5099
1b7f4a34 5100#: builtin/commit.c:880
c04f5ac3 5101msgid "Cannot read index"
90e6ef53 5102msgstr "无法读取索引"
c04f5ac3 5103
1b7f4a34 5104#: builtin/commit.c:937
c04f5ac3
JX
5105msgid "Error building trees"
5106msgstr "无法创建树对象"
5107
1b7f4a34 5108#: builtin/commit.c:952 builtin/tag.c:495
c04f5ac3
JX
5109#, c-format
5110msgid "Please supply the message using either -m or -F option.\n"
07432cef 5111msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 5112
1b7f4a34 5113#: builtin/commit.c:1054
c04f5ac3 5114#, c-format
814ff314
JX
5115msgid "--author '%s' is not 'Name <email>' and matches no existing author"
5116msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 5117
1b7f4a34 5118#: builtin/commit.c:1069 builtin/commit.c:1309
c04f5ac3
JX
5119#, c-format
5120msgid "Invalid untracked files mode '%s'"
90e6ef53 5121msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 5122
1b7f4a34 5123#: builtin/commit.c:1106
2e8451e8
JX
5124msgid "--long and -z are incompatible"
5125msgstr "--long 和 -z 选项不兼容"
5126
1b7f4a34 5127#: builtin/commit.c:1136
c04f5ac3
JX
5128msgid "Using both --reset-author and --author does not make sense"
5129msgstr "同时使用 --reset-author 和 --author 没有意义"
5130
1b7f4a34 5131#: builtin/commit.c:1145
c04f5ac3 5132msgid "You have nothing to amend."
90e6ef53 5133msgstr "您没有可修补的提交。"
c04f5ac3 5134
1b7f4a34 5135#: builtin/commit.c:1148
8ada9598 5136msgid "You are in the middle of a merge -- cannot amend."
81809b99 5137msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 5138
1b7f4a34 5139#: builtin/commit.c:1150
8ada9598 5140msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 5141msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 5142
1b7f4a34 5143#: builtin/commit.c:1153
c04f5ac3 5144msgid "Options --squash and --fixup cannot be used together"
649900bc 5145msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 5146
1b7f4a34 5147#: builtin/commit.c:1163
c04f5ac3
JX
5148msgid "Only one of -c/-C/-F/--fixup can be used."
5149msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
5150
1b7f4a34 5151#: builtin/commit.c:1165
c04f5ac3 5152msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 5153msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 5154
1b7f4a34 5155#: builtin/commit.c:1173
c04f5ac3 5156msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 5157msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 5158
1b7f4a34 5159#: builtin/commit.c:1190
c04f5ac3
JX
5160msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
5161msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
5162
1b7f4a34 5163#: builtin/commit.c:1192
c04f5ac3
JX
5164msgid "No paths with --include/--only does not make sense."
5165msgstr "参数 --include/--only 不跟路径没有意义。"
5166
1b7f4a34 5167#: builtin/commit.c:1194
c04f5ac3 5168msgid "Clever... amending the last one with dirty index."
160fb2b2 5169msgstr "聪明... 用脏索引修补最后一个提交。"
c04f5ac3 5170
1b7f4a34 5171#: builtin/commit.c:1196
6c94aba5
JX
5172msgid "Explicit paths specified without -i or -o; assuming --only paths..."
5173msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
c04f5ac3 5174
1b7f4a34 5175#: builtin/commit.c:1208 builtin/tag.c:730
c04f5ac3
JX
5176#, c-format
5177msgid "Invalid cleanup mode %s"
5178msgstr "无效的清理模式 %s"
5179
1b7f4a34 5180#: builtin/commit.c:1213
c04f5ac3 5181msgid "Paths with -a does not make sense."
649900bc 5182msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 5183
1b7f4a34 5184#: builtin/commit.c:1323 builtin/commit.c:1602
ef317cd5 5185msgid "show status concisely"
07432cef 5186msgstr "以简洁的格式显示状态"
ef317cd5 5187
1b7f4a34 5188#: builtin/commit.c:1325 builtin/commit.c:1604
ef317cd5 5189msgid "show branch information"
07432cef 5190msgstr "显示分支信息"
ef317cd5 5191
1b7f4a34 5192#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546
ef317cd5 5193msgid "machine-readable output"
07432cef
WS
5194msgstr "机器可读的输出"
5195
1b7f4a34 5196#: builtin/commit.c:1330 builtin/commit.c:1608
07432cef
WS
5197msgid "show status in long format (default)"
5198msgstr "以长格式显示状态(默认)"
ef317cd5 5199
1b7f4a34 5200#: builtin/commit.c:1333 builtin/commit.c:1611
ef317cd5 5201msgid "terminate entries with NUL"
4375c10e 5202msgstr "条目以 NUL 字符结尾"
ef317cd5 5203
1b7f4a34
JX
5204#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981
5205#: builtin/fast-export.c:984 builtin/tag.c:604
ef317cd5 5206msgid "mode"
07432cef 5207msgstr "模式"
ef317cd5 5208
1b7f4a34 5209#: builtin/commit.c:1336 builtin/commit.c:1614
ef317cd5 5210msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 5211msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 5212
1b7f4a34 5213#: builtin/commit.c:1339
ef317cd5 5214msgid "show ignored files"
07432cef 5215msgstr "显示忽略的文件"
ef317cd5 5216
1b7f4a34 5217#: builtin/commit.c:1340 parse-options.h:155
ef317cd5
JX
5218msgid "when"
5219msgstr "何时"
5220
1b7f4a34 5221#: builtin/commit.c:1341
ef317cd5
JX
5222msgid ""
5223"ignore changes to submodules, optional when: all, dirty, untracked. "
5224"(Default: all)"
5225msgstr ""
07432cef 5226"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 5227
1b7f4a34 5228#: builtin/commit.c:1343
ef317cd5 5229msgid "list untracked files in columns"
07432cef 5230msgstr "以列的方式显示未跟踪的文件"
ef317cd5 5231
1b7f4a34 5232#: builtin/commit.c:1429
c04f5ac3
JX
5233msgid "couldn't look up newly created commit"
5234msgstr "无法找到新创建的提交"
5235
1b7f4a34 5236#: builtin/commit.c:1431
c04f5ac3 5237msgid "could not parse newly created commit"
90e6ef53 5238msgstr "不能解析新创建的提交"
c04f5ac3 5239
1b7f4a34 5240#: builtin/commit.c:1476
c04f5ac3
JX
5241msgid "detached HEAD"
5242msgstr "分离头指针"
5243
7e238ab7 5244# 译者:中文字符串拼接,可删除前导空格
1b7f4a34 5245#: builtin/commit.c:1479
c04f5ac3 5246msgid " (root-commit)"
7e238ab7 5247msgstr "(根提交)"
c04f5ac3 5248
1b7f4a34 5249#: builtin/commit.c:1572
ef317cd5 5250msgid "suppress summary after successful commit"
07432cef 5251msgstr "提交成功后不显示概述信息"
c04f5ac3 5252
1b7f4a34 5253#: builtin/commit.c:1573
ef317cd5 5254msgid "show diff in commit message template"
07432cef 5255msgstr "在提交说明模板里显示差异"
c04f5ac3 5256
1b7f4a34 5257#: builtin/commit.c:1575
ef317cd5 5258msgid "Commit message options"
07432cef 5259msgstr "提交说明选项"
c04f5ac3 5260
1b7f4a34 5261#: builtin/commit.c:1576 builtin/tag.c:602
ef317cd5 5262msgid "read message from file"
07432cef 5263msgstr "从文件中读取提交说明"
c04f5ac3 5264
1b7f4a34 5265#: builtin/commit.c:1577
ef317cd5 5266msgid "author"
07432cef 5267msgstr "作者"
c04f5ac3 5268
1b7f4a34 5269#: builtin/commit.c:1577
ef317cd5 5270msgid "override author for commit"
07432cef 5271msgstr "提交时覆盖作者"
73a60cd2 5272
1b7f4a34 5273#: builtin/commit.c:1578 builtin/gc.c:268
ef317cd5 5274msgid "date"
07432cef 5275msgstr "日期"
c04f5ac3 5276
1b7f4a34 5277#: builtin/commit.c:1578
ef317cd5 5278msgid "override date for commit"
07432cef 5279msgstr "提交时覆盖日期"
c04f5ac3 5280
1b7f4a34
JX
5281#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392
5282#: builtin/notes.c:555 builtin/tag.c:600
ef317cd5 5283msgid "message"
07432cef 5284msgstr "说明"
c04f5ac3 5285
1b7f4a34 5286#: builtin/commit.c:1579
ef317cd5 5287msgid "commit message"
07432cef 5288msgstr "提交说明"
ef317cd5 5289
1b7f4a34 5290#: builtin/commit.c:1580
ef317cd5 5291msgid "reuse and edit message from specified commit"
07432cef 5292msgstr "重用并编辑指定提交的提交说明"
ef317cd5 5293
1b7f4a34 5294#: builtin/commit.c:1581
ef317cd5 5295msgid "reuse message from specified commit"
07432cef 5296msgstr "重用指定提交的提交说明"
ef317cd5 5297
1b7f4a34 5298#: builtin/commit.c:1582
ef317cd5 5299msgid "use autosquash formatted message to fixup specified commit"
07432cef 5300msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 5301
1b7f4a34 5302#: builtin/commit.c:1583
ef317cd5 5303msgid "use autosquash formatted message to squash specified commit"
07432cef 5304msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 5305
1b7f4a34 5306#: builtin/commit.c:1584
ef317cd5 5307msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 5308msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 5309
1b7f4a34 5310#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86
ef317cd5 5311msgid "add Signed-off-by:"
07432cef 5312msgstr "添加 Signed-off-by: 签名"
ef317cd5 5313
1b7f4a34 5314#: builtin/commit.c:1586
ef317cd5 5315msgid "use specified template file"
07432cef 5316msgstr "使用指定的模板文件"
ef317cd5 5317
1b7f4a34 5318#: builtin/commit.c:1587
ef317cd5 5319msgid "force edit of commit"
07432cef 5320msgstr "强制编辑提交"
ef317cd5 5321
07432cef 5322# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
1b7f4a34 5323#: builtin/commit.c:1588
ef317cd5 5324msgid "default"
07432cef 5325msgstr "default"
ef317cd5 5326
1b7f4a34 5327#: builtin/commit.c:1588 builtin/tag.c:605
ef317cd5 5328msgid "how to strip spaces and #comments from message"
07432cef 5329msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 5330
1b7f4a34 5331#: builtin/commit.c:1589
ef317cd5 5332msgid "include status in commit message template"
07432cef 5333msgstr "在提交说明模板里包含状态信息"
ef317cd5 5334
1b7f4a34
JX
5335#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156
5336#: builtin/revert.c:93
ef317cd5 5337msgid "GPG sign commit"
07432cef 5338msgstr "GPG 提交签名"
ef317cd5 5339
1b7f4a34 5340#: builtin/commit.c:1594
ef317cd5 5341msgid "Commit contents options"
07432cef 5342msgstr "提交内容选项"
ef317cd5 5343
1b7f4a34 5344#: builtin/commit.c:1595
ef317cd5 5345msgid "commit all changed files"
07432cef 5346msgstr "提交所有改动的文件"
ef317cd5 5347
1b7f4a34 5348#: builtin/commit.c:1596
ef317cd5 5349msgid "add specified files to index for commit"
07432cef 5350msgstr "添加指定的文件到索引区等待提交"
ef317cd5 5351
1b7f4a34 5352#: builtin/commit.c:1597
ef317cd5 5353msgid "interactively add files"
07432cef 5354msgstr "交互式添加文件"
ef317cd5 5355
1b7f4a34 5356#: builtin/commit.c:1598
ef317cd5 5357msgid "interactively add changes"
07432cef 5358msgstr "交互式添加变更"
ef317cd5 5359
1b7f4a34 5360#: builtin/commit.c:1599
ef317cd5 5361msgid "commit only specified files"
07432cef 5362msgstr "只提交指定的文件"
ef317cd5 5363
1b7f4a34 5364#: builtin/commit.c:1600
ef317cd5 5365msgid "bypass pre-commit hook"
07432cef 5366msgstr "绕过 pre-commit 钩子"
ef317cd5 5367
1b7f4a34 5368#: builtin/commit.c:1601
ef317cd5 5369msgid "show what would be committed"
07432cef 5370msgstr "显示将要提交的内容"
ef317cd5 5371
1b7f4a34 5372#: builtin/commit.c:1612
ef317cd5 5373msgid "amend previous commit"
07432cef 5374msgstr "修改先前的提交"
ef317cd5 5375
1b7f4a34 5376#: builtin/commit.c:1613
ef317cd5 5377msgid "bypass post-rewrite hook"
07432cef 5378msgstr "绕过 post-rewrite 钩子"
ef317cd5 5379
1b7f4a34 5380#: builtin/commit.c:1618
ef317cd5 5381msgid "ok to record an empty change"
07432cef 5382msgstr "允许一个空提交"
ef317cd5 5383
1b7f4a34 5384#: builtin/commit.c:1620
ef317cd5 5385msgid "ok to record a change with an empty message"
07432cef 5386msgstr "允许空的提交说明"
ef317cd5 5387
1b7f4a34 5388#: builtin/commit.c:1649
c04f5ac3 5389msgid "could not parse HEAD commit"
90e6ef53 5390msgstr "不能解析 HEAD 提交"
c04f5ac3 5391
1b7f4a34 5392#: builtin/commit.c:1695
c04f5ac3
JX
5393#, c-format
5394msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 5395msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 5396
1b7f4a34 5397#: builtin/commit.c:1702
c04f5ac3 5398msgid "could not read MERGE_MODE"
90e6ef53 5399msgstr "不能读取 MERGE_MODE"
c04f5ac3 5400
1b7f4a34 5401#: builtin/commit.c:1721
c04f5ac3
JX
5402#, c-format
5403msgid "could not read commit message: %s"
90e6ef53 5404msgstr "不能读取提交说明:%s"
c04f5ac3 5405
1b7f4a34 5406#: builtin/commit.c:1732
73a60cd2
JX
5407#, c-format
5408msgid "Aborting commit; you did not edit the message.\n"
5409msgstr "终止提交;您未更改来自模版的提交说明。\n"
5410
1b7f4a34 5411#: builtin/commit.c:1737
c04f5ac3
JX
5412#, c-format
5413msgid "Aborting commit due to empty commit message.\n"
5414msgstr "终止提交因为提交说明为空。\n"
5415
1b7f4a34 5416#: builtin/commit.c:1785
c04f5ac3
JX
5417msgid ""
5418"Repository has been updated, but unable to write\n"
220c313c 5419"new_index file. Check that disk is not full and quota is\n"
c04f5ac3
JX
5420"not exceeded, and then \"git reset HEAD\" to recover."
5421msgstr ""
160fb2b2 5422"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
90e6ef53 5423"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 5424
90314792 5425#: builtin/config.c:8
814ff314
JX
5426msgid "git config [<options>]"
5427msgstr "git config [<选项>]"
ef317cd5 5428
1b7f4a34 5429#: builtin/config.c:54
ef317cd5 5430msgid "Config file location"
07432cef 5431msgstr "配置文件位置"
ef317cd5 5432
1b7f4a34 5433#: builtin/config.c:55
ef317cd5 5434msgid "use global config file"
07432cef 5435msgstr "使用全局配置文件"
ef317cd5 5436
1b7f4a34 5437#: builtin/config.c:56
ef317cd5 5438msgid "use system config file"
07432cef 5439msgstr "使用系统级配置文件"
ef317cd5 5440
1b7f4a34 5441#: builtin/config.c:57
ef317cd5 5442msgid "use repository config file"
160fb2b2 5443msgstr "使用仓库级配置文件"
ef317cd5 5444
1b7f4a34 5445#: builtin/config.c:58
ef317cd5 5446msgid "use given config file"
07432cef 5447msgstr "使用指定的配置文件"
ef317cd5 5448
1b7f4a34 5449#: builtin/config.c:59
2e8451e8 5450msgid "blob-id"
4375c10e 5451msgstr "数据对象 ID"
2e8451e8 5452
1b7f4a34 5453#: builtin/config.c:59
2e8451e8
JX
5454msgid "read config from given blob object"
5455msgstr "从给定的数据对象读取配置"
5456
1b7f4a34 5457#: builtin/config.c:60
ef317cd5 5458msgid "Action"
07432cef 5459msgstr "操作"
ef317cd5 5460
1b7f4a34 5461#: builtin/config.c:61
ef317cd5 5462msgid "get value: name [value-regex]"
07432cef 5463msgstr "获取值:name [value-regex]"
ef317cd5 5464
1b7f4a34 5465#: builtin/config.c:62
ef317cd5 5466msgid "get all values: key [value-regex]"
07432cef 5467msgstr "获得所有的值:key [value-regex]"
ef317cd5 5468
1b7f4a34 5469#: builtin/config.c:63
ef317cd5 5470msgid "get values for regexp: name-regex [value-regex]"
07432cef 5471msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 5472
1b7f4a34 5473#: builtin/config.c:64
90314792
JX
5474msgid "get value specific for the URL: section[.var] URL"
5475msgstr "获得 URL 取值:section[.var] URL"
5476
1b7f4a34 5477#: builtin/config.c:65
ef317cd5 5478msgid "replace all matching variables: name value [value_regex]"
07432cef 5479msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 5480
1b7f4a34 5481#: builtin/config.c:66
ef317cd5 5482msgid "add a new variable: name value"
07432cef 5483msgstr "添加一个新的变量:name value"
ef317cd5 5484
1b7f4a34 5485#: builtin/config.c:67
ef317cd5 5486msgid "remove a variable: name [value-regex]"
07432cef 5487msgstr "删除一个变量:name [value-regex]"
ef317cd5 5488
1b7f4a34 5489#: builtin/config.c:68
ef317cd5 5490msgid "remove all matches: name [value-regex]"
07432cef 5491msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 5492
1b7f4a34 5493#: builtin/config.c:69
ef317cd5 5494msgid "rename section: old-name new-name"
07432cef 5495msgstr "重命名小节:old-name new-name"
ef317cd5 5496
1b7f4a34 5497#: builtin/config.c:70
ef317cd5 5498msgid "remove a section: name"
07432cef 5499msgstr "删除一个小节:name"
ef317cd5 5500
1b7f4a34 5501#: builtin/config.c:71
ef317cd5 5502msgid "list all"
07432cef 5503msgstr "列出所有"
ef317cd5 5504
1b7f4a34 5505#: builtin/config.c:72
ef317cd5 5506msgid "open an editor"
07432cef 5507msgstr "打开一个编辑器"
ef317cd5 5508
1b7f4a34 5509#: builtin/config.c:73
04cb2f28
JX
5510msgid "find the color configured: slot [default]"
5511msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 5512
1b7f4a34 5513#: builtin/config.c:74
04cb2f28
JX
5514msgid "find the color setting: slot [stdout-is-tty]"
5515msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 5516
1b7f4a34 5517#: builtin/config.c:75
ef317cd5 5518msgid "Type"
07432cef 5519msgstr "类型"
ef317cd5 5520
1b7f4a34 5521#: builtin/config.c:76
ef317cd5 5522msgid "value is \"true\" or \"false\""
07432cef 5523msgstr "值是 \"true\" 或 \"false\""
ef317cd5 5524
1b7f4a34 5525#: builtin/config.c:77
ef317cd5 5526msgid "value is decimal number"
07432cef 5527msgstr "值是十进制数"
ef317cd5 5528
1b7f4a34 5529#: builtin/config.c:78
ef317cd5 5530msgid "value is --bool or --int"
07432cef 5531msgstr "值是 --bool or --int"
ef317cd5 5532
1b7f4a34 5533#: builtin/config.c:79
ef317cd5 5534msgid "value is a path (file or directory name)"
07432cef 5535msgstr "值是一个路径(文件或目录名)"
ef317cd5 5536
1b7f4a34 5537#: builtin/config.c:80
ef317cd5 5538msgid "Other"
07432cef 5539msgstr "其它"
ef317cd5 5540
1b7f4a34 5541#: builtin/config.c:81
ef317cd5 5542msgid "terminate values with NUL byte"
4375c10e 5543msgstr "终止值是 NUL 字节"
ef317cd5 5544
1b7f4a34
JX
5545#: builtin/config.c:82
5546msgid "show variable names only"
5547msgstr "只显示变量名"
5548
5549#: builtin/config.c:83
ef317cd5 5550msgid "respect include directives on lookup"
07432cef 5551msgstr "查询时参照 include 指令递归查找"
ef317cd5 5552
1b7f4a34 5553#: builtin/config.c:311
220c313c 5554msgid "unable to parse default color value"
160fb2b2 5555msgstr "不能解析默认颜色值"
220c313c 5556
1b7f4a34 5557#: builtin/config.c:449
220c313c
JX
5558#, c-format
5559msgid ""
5560"# This is Git's per-user configuration file.\n"
7aea43ff 5561"[user]\n"
220c313c 5562"# Please adapt and uncomment the following lines:\n"
7aea43ff 5563"#\tname = %s\n"
220c313c
JX
5564"#\temail = %s\n"
5565msgstr ""
5566"# This is Git's per-user configuration file.\n"
7aea43ff 5567"[user]\n"
220c313c 5568"# Please adapt and uncomment the following lines:\n"
7aea43ff 5569"#\tname = %s\n"
220c313c
JX
5570"#\temail = %s\n"
5571
1b7f4a34 5572#: builtin/config.c:583
220c313c
JX
5573#, c-format
5574msgid "cannot create configuration file %s"
5575msgstr "不能创建配置文件 %s"
5576
5577#: builtin/count-objects.c:55
4dcdc3d8
JX
5578msgid "git count-objects [-v] [-H | --human-readable]"
5579msgstr "git count-objects [-v] [-H | --human-readable]"
5580
220c313c 5581#: builtin/count-objects.c:65
4dcdc3d8
JX
5582msgid "print sizes in human readable format"
5583msgstr "以用户可读的格式显示大小"
ef317cd5 5584
220c313c 5585#: builtin/describe.c:17
814ff314
JX
5586msgid "git describe [<options>] [<commit-ish>...]"
5587msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 5588
220c313c 5589#: builtin/describe.c:18
814ff314
JX
5590msgid "git describe [<options>] --dirty"
5591msgstr "git describe [<选项>] --dirty"
ef317cd5 5592
220c313c 5593#: builtin/describe.c:217
c04f5ac3
JX
5594#, c-format
5595msgid "annotated tag %s not available"
55a16ee4 5596msgstr "附注标签 %s 无效"
c04f5ac3 5597
220c313c 5598#: builtin/describe.c:221
c04f5ac3
JX
5599#, c-format
5600msgid "annotated tag %s has no embedded name"
55a16ee4 5601msgstr "附注标签 %s 没有嵌入名称"
c04f5ac3 5602
220c313c 5603#: builtin/describe.c:223
c04f5ac3
JX
5604#, c-format
5605msgid "tag '%s' is really '%s' here"
55a16ee4 5606msgstr "标签 '%s' 的确是在 '%s'"
c04f5ac3 5607
1b7f4a34 5608#: builtin/describe.c:250 builtin/log.c:459
c04f5ac3
JX
5609#, c-format
5610msgid "Not a valid object name %s"
5611msgstr "不是一个有效的对象名 %s"
5612
220c313c 5613#: builtin/describe.c:253
c04f5ac3
JX
5614#, c-format
5615msgid "%s is not a valid '%s' object"
5616msgstr "%s 不是一个有效的 '%s' 对象"
5617
220c313c 5618#: builtin/describe.c:270
c04f5ac3
JX
5619#, c-format
5620msgid "no tag exactly matches '%s'"
55a16ee4 5621msgstr "没有标签准确匹配 '%s'"
c04f5ac3 5622
220c313c 5623#: builtin/describe.c:272
c04f5ac3
JX
5624#, c-format
5625msgid "searching to describe %s\n"
5626msgstr "搜索描述 %s\n"
5627
220c313c 5628#: builtin/describe.c:319
c04f5ac3
JX
5629#, c-format
5630msgid "finished search at %s\n"
5631msgstr "完成搜索 %s\n"
5632
220c313c 5633#: builtin/describe.c:346
c04f5ac3
JX
5634#, c-format
5635msgid ""
5636"No annotated tags can describe '%s'.\n"
5637"However, there were unannotated tags: try --tags."
5638msgstr ""
55a16ee4
RC
5639"没有附注标签能描述 '%s'。\n"
5640"然而,存在未附注标签:尝试 --tags。"
c04f5ac3 5641
220c313c 5642#: builtin/describe.c:350
c04f5ac3
JX
5643#, c-format
5644msgid ""
5645"No tags can describe '%s'.\n"
5646"Try --always, or create some tags."
5647msgstr ""
55a16ee4
RC
5648"没有标签能描述 '%s'。\n"
5649"尝试 --always,或者创建一些标签。"
c04f5ac3 5650
220c313c 5651#: builtin/describe.c:371
c04f5ac3
JX
5652#, c-format
5653msgid "traversed %lu commits\n"
5654msgstr "已遍历 %lu 个提交\n"
5655
220c313c 5656#: builtin/describe.c:374
c04f5ac3
JX
5657#, c-format
5658msgid ""
5659"more than %i tags found; listed %i most recent\n"
5660"gave up search at %s\n"
5661msgstr ""
55a16ee4 5662"发现多于 %i 个标签,列出最近的 %i 个\n"
90e6ef53 5663"在 %s 放弃搜索\n"
c04f5ac3 5664
220c313c 5665#: builtin/describe.c:396
ef317cd5 5666msgid "find the tag that comes after the commit"
55a16ee4 5667msgstr "寻找该提交之后的标签"
ef317cd5 5668
220c313c 5669#: builtin/describe.c:397
ef317cd5 5670msgid "debug search strategy on stderr"
07432cef 5671msgstr "在标准错误上调试搜索策略"
ef317cd5 5672
220c313c 5673#: builtin/describe.c:398
1003b3a5
JX
5674msgid "use any ref"
5675msgstr "使用任意引用"
5676
220c313c 5677#: builtin/describe.c:399
1003b3a5 5678msgid "use any tag, even unannotated"
55a16ee4 5679msgstr "使用任意标签,即使未附带注释"
ef317cd5 5680
220c313c 5681#: builtin/describe.c:400
ef317cd5 5682msgid "always use long format"
07432cef 5683msgstr "始终使用长提交号格式"
ef317cd5 5684
220c313c 5685#: builtin/describe.c:401
2e8451e8
JX
5686msgid "only follow first parent"
5687msgstr "只跟随第一个父提交"
5688
220c313c 5689#: builtin/describe.c:404
ef317cd5 5690msgid "only output exact matches"
07432cef 5691msgstr "只输出精确匹配"
ef317cd5 5692
220c313c 5693#: builtin/describe.c:406
ef317cd5 5694msgid "consider <n> most recent tags (default: 10)"
55a16ee4 5695msgstr "考虑最近 <n> 个标签(默认:10)"
ef317cd5 5696
220c313c 5697#: builtin/describe.c:408
ef317cd5 5698msgid "only consider tags matching <pattern>"
55a16ee4 5699msgstr "只考虑匹配 <模式> 的标签"
ef317cd5 5700
220c313c 5701#: builtin/describe.c:410 builtin/name-rev.c:318
ef317cd5 5702msgid "show abbreviated commit object as fallback"
07432cef 5703msgstr "显示简写的提交号作为后备"
ef317cd5 5704
220c313c 5705#: builtin/describe.c:411
ef317cd5 5706msgid "mark"
07432cef 5707msgstr "标记"
ef317cd5 5708
220c313c 5709#: builtin/describe.c:412
ef317cd5 5710msgid "append <mark> on dirty working tree (default: \"-dirty\")"
160fb2b2 5711msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
ef317cd5 5712
220c313c 5713#: builtin/describe.c:430
c04f5ac3
JX
5714msgid "--long is incompatible with --abbrev=0"
5715msgstr "--long 与 --abbrev=0 不兼容"
5716
220c313c 5717#: builtin/describe.c:456
c04f5ac3 5718msgid "No names found, cannot describe anything."
90e6ef53 5719msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 5720
220c313c 5721#: builtin/describe.c:476
a8a5406a 5722msgid "--dirty is incompatible with commit-ishes"
649900bc 5723msgstr "--dirty 不能与提交同时使用"
c04f5ac3 5724
220c313c 5725#: builtin/diff.c:86
c04f5ac3
JX
5726#, c-format
5727msgid "'%s': not a regular file or symlink"
5728msgstr "'%s':不是一个正规文件或符号链接"
5729
220c313c 5730#: builtin/diff.c:237
c04f5ac3
JX
5731#, c-format
5732msgid "invalid option: %s"
5733msgstr "无效选项:%s"
5734
220c313c 5735#: builtin/diff.c:358
c04f5ac3 5736msgid "Not a git repository"
160fb2b2 5737msgstr "不是一个 git 仓库"
c04f5ac3 5738
220c313c 5739#: builtin/diff.c:401
c04f5ac3
JX
5740#, c-format
5741msgid "invalid object '%s' given."
5742msgstr "提供了无效对象 '%s'。"
5743
220c313c 5744#: builtin/diff.c:410
c04f5ac3
JX
5745#, c-format
5746msgid "more than two blobs given: '%s'"
160fb2b2 5747msgstr "提供了超过两个数据对象:'%s'"
c04f5ac3 5748
220c313c 5749#: builtin/diff.c:417
c04f5ac3
JX
5750#, c-format
5751msgid "unhandled object '%s' given."
6c94aba5 5752msgstr "无法处理的对象 '%s'。"
c04f5ac3 5753
1b7f4a34 5754#: builtin/fast-export.c:25
ef317cd5 5755msgid "git fast-export [rev-list-opts]"
07432cef 5756msgstr "git fast-export [rev-list-opts]"
ef317cd5 5757
1b7f4a34 5758#: builtin/fast-export.c:980
ef317cd5 5759msgid "show progress after <n> objects"
07432cef 5760msgstr "在 <n> 个对象之后显示进度"
ef317cd5 5761
1b7f4a34 5762#: builtin/fast-export.c:982
ef317cd5 5763msgid "select handling of signed tags"
55a16ee4 5764msgstr "选择如何处理签名标签"
ef317cd5 5765
1b7f4a34 5766#: builtin/fast-export.c:985
ef317cd5 5767msgid "select handling of tags that tag filtered objects"
55a16ee4 5768msgstr "选择当标签指向被过滤对象时该标签的处理方式"
ef317cd5 5769
1b7f4a34 5770#: builtin/fast-export.c:988
ef317cd5 5771msgid "Dump marks to this file"
07432cef 5772msgstr "把标记存储到这个文件"
ef317cd5 5773
1b7f4a34 5774#: builtin/fast-export.c:990
ef317cd5 5775msgid "Import marks from this file"
07432cef 5776msgstr "从这个文件导入标记"
ef317cd5 5777
1b7f4a34 5778#: builtin/fast-export.c:992
ef317cd5 5779msgid "Fake a tagger when tags lack one"
55a16ee4 5780msgstr "当标签缺少标记者字段时,假装提供一个"
ef317cd5 5781
1b7f4a34 5782#: builtin/fast-export.c:994
ef317cd5 5783msgid "Output full tree for each commit"
07432cef 5784msgstr "每次提交都输出整个树"
ef317cd5 5785
1b7f4a34 5786#: builtin/fast-export.c:996
ef317cd5 5787msgid "Use the done feature to terminate the stream"
07432cef 5788msgstr "使用 done 功能来终止流"
ef317cd5 5789
1b7f4a34 5790#: builtin/fast-export.c:997
ef317cd5 5791msgid "Skip output of blob data"
07432cef 5792msgstr "跳过数据对象的输出"
ef317cd5 5793
1b7f4a34 5794#: builtin/fast-export.c:998
6acbf033 5795msgid "refspec"
160fb2b2 5796msgstr "引用规格"
6acbf033 5797
1b7f4a34 5798#: builtin/fast-export.c:999
6acbf033 5799msgid "Apply refspec to exported refs"
160fb2b2 5800msgstr "对导出的引用应用引用规格"
6acbf033 5801
1b7f4a34 5802#: builtin/fast-export.c:1000
220c313c
JX
5803msgid "anonymize output"
5804msgstr "匿名输出"
5805
1b7f4a34 5806#: builtin/fetch.c:20
ef317cd5 5807msgid "git fetch [<options>] [<repository> [<refspec>...]]"
160fb2b2 5808msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
ef317cd5 5809
1b7f4a34 5810#: builtin/fetch.c:21
ef317cd5 5811msgid "git fetch [<options>] <group>"
07432cef 5812msgstr "git fetch [<选项>] <组>"
ef317cd5 5813
1b7f4a34 5814#: builtin/fetch.c:22
ef317cd5 5815msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
160fb2b2 5816msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
ef317cd5 5817
1b7f4a34 5818#: builtin/fetch.c:23
ef317cd5 5819msgid "git fetch --all [<options>]"
07432cef 5820msgstr "git fetch --all [<选项>]"
ef317cd5 5821
1b7f4a34 5822#: builtin/fetch.c:90 builtin/pull.c:162
ef317cd5 5823msgid "fetch from all remotes"
07432cef 5824msgstr "从所有的远程抓取"
ef317cd5 5825
1b7f4a34 5826#: builtin/fetch.c:92 builtin/pull.c:165
ef317cd5 5827msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 5828msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 5829
1b7f4a34 5830#: builtin/fetch.c:94 builtin/pull.c:168
ef317cd5 5831msgid "path to upload pack on remote end"
07432cef 5832msgstr "上传包到远程的路径"
ef317cd5 5833
1b7f4a34 5834#: builtin/fetch.c:95 builtin/pull.c:170
ef317cd5 5835msgid "force overwrite of local branch"
07432cef 5836msgstr "强制覆盖本地分支"
ef317cd5 5837
1b7f4a34 5838#: builtin/fetch.c:97
ef317cd5 5839msgid "fetch from multiple remotes"
07432cef 5840msgstr "从多个远程抓取"
ef317cd5 5841
1b7f4a34 5842#: builtin/fetch.c:99 builtin/pull.c:172
ef317cd5 5843msgid "fetch all tags and associated objects"
55a16ee4 5844msgstr "抓取所有的标签和关联对象"
ef317cd5 5845
1b7f4a34 5846#: builtin/fetch.c:101
ef317cd5 5847msgid "do not fetch all tags (--no-tags)"
55a16ee4 5848msgstr "不抓取任何标签(--no-tags)"
ef317cd5 5849
1b7f4a34 5850#: builtin/fetch.c:103 builtin/pull.c:175
ef317cd5 5851msgid "prune remote-tracking branches no longer on remote"
07432cef 5852msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 5853
07432cef 5854# 译者:可选值,不能翻译
1b7f4a34 5855#: builtin/fetch.c:104 builtin/pull.c:178
ef317cd5 5856msgid "on-demand"
07432cef 5857msgstr "on-demand"
ef317cd5 5858
1b7f4a34 5859#: builtin/fetch.c:105 builtin/pull.c:179
ef317cd5 5860msgid "control recursive fetching of submodules"
07432cef 5861msgstr "控制子模组的递归抓取"
ef317cd5 5862
1b7f4a34 5863#: builtin/fetch.c:109 builtin/pull.c:184
ef317cd5 5864msgid "keep downloaded pack"
07432cef 5865msgstr "保持下载包"
ef317cd5 5866
1b7f4a34 5867#: builtin/fetch.c:111
ef317cd5 5868msgid "allow updating of HEAD ref"
07432cef 5869msgstr "允许更新 HEAD 引用"
ef317cd5 5870
1b7f4a34 5871#: builtin/fetch.c:114 builtin/pull.c:187
ef317cd5 5872msgid "deepen history of shallow clone"
07432cef 5873msgstr "深化浅克隆的历史"
ef317cd5 5874
1b7f4a34 5875#: builtin/fetch.c:116 builtin/pull.c:190
a77c07d9 5876msgid "convert to a complete repository"
160fb2b2 5877msgstr "转换为一个完整的仓库"
a77c07d9 5878
1b7f4a34 5879#: builtin/fetch.c:118 builtin/log.c:1233
ef317cd5 5880msgid "dir"
07432cef 5881msgstr "目录"
ef317cd5 5882
1b7f4a34 5883#: builtin/fetch.c:119
ef317cd5 5884msgid "prepend this to submodule path output"
07432cef 5885msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 5886
1b7f4a34 5887#: builtin/fetch.c:122
ef317cd5 5888msgid "default mode for recursion"
07432cef 5889msgstr "递归的默认模式"
ef317cd5 5890
1b7f4a34 5891#: builtin/fetch.c:124 builtin/pull.c:193
cfff71a9
JX
5892msgid "accept refs that update .git/shallow"
5893msgstr "接受更新 .git/shallow 的引用"
5894
1b7f4a34 5895#: builtin/fetch.c:125 builtin/pull.c:195
6acbf033
JX
5896msgid "refmap"
5897msgstr "引用映射"
5898
1b7f4a34 5899#: builtin/fetch.c:126 builtin/pull.c:196
6acbf033
JX
5900msgid "specify fetch refmap"
5901msgstr "指定获取操作的引用映射"
5902
1b7f4a34 5903#: builtin/fetch.c:378
c04f5ac3
JX
5904msgid "Couldn't find remote ref HEAD"
5905msgstr "无法发现远程 HEAD 引用"
5906
1b7f4a34 5907#: builtin/fetch.c:458
c04f5ac3
JX
5908#, c-format
5909msgid "object %s not found"
5910msgstr "对象 %s 未发现"
5911
1b7f4a34 5912#: builtin/fetch.c:463
c04f5ac3
JX
5913msgid "[up to date]"
5914msgstr "[最新]"
5915
1b7f4a34 5916#: builtin/fetch.c:477
c04f5ac3
JX
5917#, c-format
5918msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5919msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5920
1b7f4a34 5921#: builtin/fetch.c:478 builtin/fetch.c:564
c04f5ac3
JX
5922msgid "[rejected]"
5923msgstr "[已拒绝]"
5924
1b7f4a34 5925#: builtin/fetch.c:489
c04f5ac3 5926msgid "[tag update]"
55a16ee4 5927msgstr "[标签更新]"
c04f5ac3 5928
90e6ef53 5929# 译者:注意保持前导空格
1b7f4a34 5930#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544
c04f5ac3
JX
5931msgid " (unable to update local ref)"
5932msgstr " (不能更新本地引用)"
5933
1b7f4a34 5934#: builtin/fetch.c:509
c04f5ac3 5935msgid "[new tag]"
55a16ee4 5936msgstr "[新标签]"
c04f5ac3 5937
1b7f4a34 5938#: builtin/fetch.c:512
c04f5ac3
JX
5939msgid "[new branch]"
5940msgstr "[新分支]"
5941
1b7f4a34 5942#: builtin/fetch.c:515
170e9899
JX
5943msgid "[new ref]"
5944msgstr "[新引用]"
5945
1b7f4a34 5946#: builtin/fetch.c:560
c04f5ac3
JX
5947msgid "unable to update local ref"
5948msgstr "不能更新本地引用"
5949
1b7f4a34 5950#: builtin/fetch.c:560
c04f5ac3
JX
5951msgid "forced update"
5952msgstr "强制更新"
5953
1b7f4a34 5954#: builtin/fetch.c:566
c04f5ac3 5955msgid "(non-fast-forward)"
90e6ef53 5956msgstr "(非快进式)"
c04f5ac3 5957
1b7f4a34 5958#: builtin/fetch.c:600 builtin/fetch.c:842
c04f5ac3
JX
5959#, c-format
5960msgid "cannot open %s: %s\n"
5961msgstr "无法打开 %s:%s\n"
5962
1b7f4a34 5963#: builtin/fetch.c:609
c04f5ac3
JX
5964#, c-format
5965msgid "%s did not send all necessary objects\n"
5966msgstr "%s 未发送所有必须的对象\n"
5967
1b7f4a34 5968#: builtin/fetch.c:627
cfff71a9
JX
5969#, c-format
5970msgid "reject %s because shallow roots are not allowed to be updated"
5971msgstr "拒绝 %s 因为浅克隆不允许被更新"
5972
1b7f4a34 5973#: builtin/fetch.c:715 builtin/fetch.c:807
c04f5ac3
JX
5974#, c-format
5975msgid "From %.*s\n"
5976msgstr "来自 %.*s\n"
5977
1b7f4a34 5978#: builtin/fetch.c:726
c04f5ac3
JX
5979#, c-format
5980msgid ""
5981"some local refs could not be updated; try running\n"
5982" 'git remote prune %s' to remove any old, conflicting branches"
5983msgstr ""
5984"一些本地引用不能被更新;尝试运行\n"
5985" 'git remote prune %s' 来删除旧的、有冲突的分支"
5986
90e6ef53 5987# 译者:注意保持前导空格
1b7f4a34 5988#: builtin/fetch.c:778
81809b99 5989#, c-format
8ada9598 5990msgid " (%s will become dangling)"
07432cef 5991msgstr " (%s 将成为摇摆状态)"
c04f5ac3 5992
90e6ef53 5993# 译者:注意保持前导空格
1b7f4a34 5994#: builtin/fetch.c:779
81809b99 5995#, c-format
8ada9598 5996msgid " (%s has become dangling)"
07432cef 5997msgstr " (%s 已成为摇摆状态)"
c04f5ac3 5998
1b7f4a34 5999#: builtin/fetch.c:811
c04f5ac3
JX
6000msgid "[deleted]"
6001msgstr "[已删除]"
6002
1b7f4a34 6003#: builtin/fetch.c:812 builtin/remote.c:1034
c04f5ac3
JX
6004msgid "(none)"
6005msgstr "(无)"
6006
1b7f4a34 6007#: builtin/fetch.c:832
c04f5ac3
JX
6008#, c-format
6009msgid "Refusing to fetch into current branch %s of non-bare repository"
160fb2b2 6010msgstr "拒绝获取到非纯仓库的当前分支 %s"
c04f5ac3 6011
1b7f4a34 6012#: builtin/fetch.c:851
c04f5ac3
JX
6013#, c-format
6014msgid "Option \"%s\" value \"%s\" is not valid for %s"
6015msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
6016
1b7f4a34 6017#: builtin/fetch.c:854
c04f5ac3
JX
6018#, c-format
6019msgid "Option \"%s\" is ignored for %s\n"
81809b99 6020msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 6021
1b7f4a34 6022#: builtin/fetch.c:910
90314792
JX
6023#, c-format
6024msgid "Don't know how to fetch from %s"
6025msgstr "不知道如何从 %s 获取"
6026
1b7f4a34 6027#: builtin/fetch.c:1071
c04f5ac3
JX
6028#, c-format
6029msgid "Fetching %s\n"
d4a8e00b 6030msgstr "正在获取 %s\n"
c04f5ac3 6031
1b7f4a34 6032#: builtin/fetch.c:1073 builtin/remote.c:90
c04f5ac3
JX
6033#, c-format
6034msgid "Could not fetch %s"
6035msgstr "不能获取 %s"
6036
1b7f4a34 6037#: builtin/fetch.c:1091
c04f5ac3
JX
6038msgid ""
6039"No remote repository specified. Please, specify either a URL or a\n"
6040"remote name from which new revisions should be fetched."
4375c10e 6041msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
c04f5ac3 6042
1b7f4a34 6043#: builtin/fetch.c:1114
c04f5ac3 6044msgid "You need to specify a tag name."
55a16ee4 6045msgstr "您需要指定一个标签名称。"
c04f5ac3 6046
1b7f4a34 6047#: builtin/fetch.c:1156
a77c07d9
JX
6048msgid "--depth and --unshallow cannot be used together"
6049msgstr "--depth 和 --unshallow 不能同时使用"
6050
1b7f4a34 6051#: builtin/fetch.c:1158
a77c07d9 6052msgid "--unshallow on a complete repository does not make sense"
160fb2b2 6053msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
a77c07d9 6054
1b7f4a34 6055#: builtin/fetch.c:1181
c04f5ac3 6056msgid "fetch --all does not take a repository argument"
160fb2b2 6057msgstr "fetch --all 不能带一个仓库参数"
c04f5ac3 6058
1b7f4a34 6059#: builtin/fetch.c:1183
c04f5ac3 6060msgid "fetch --all does not make sense with refspecs"
160fb2b2 6061msgstr "fetch --all 带引用规格没有任何意义"
c04f5ac3 6062
1b7f4a34 6063#: builtin/fetch.c:1194
c04f5ac3
JX
6064#, c-format
6065msgid "No such remote or remote group: %s"
6066msgstr "没有这样的远程或远程组:%s"
6067
1b7f4a34 6068#: builtin/fetch.c:1202
c04f5ac3 6069msgid "Fetching a group and specifying refspecs does not make sense"
160fb2b2 6070msgstr "获取组并指定引用规格没有意义"
c04f5ac3 6071
1b7f4a34 6072#: builtin/fmt-merge-msg.c:14
814ff314
JX
6073msgid ""
6074"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
6075msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 6076
1b7f4a34 6077#: builtin/fmt-merge-msg.c:670
ef317cd5 6078msgid "populate log with at most <n> entries from shortlog"
07432cef 6079msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 6080
1b7f4a34 6081#: builtin/fmt-merge-msg.c:673
ef317cd5 6082msgid "alias for --log (deprecated)"
07432cef 6083msgstr "参数 --log 的别名(已弃用)"
ef317cd5 6084
1b7f4a34 6085#: builtin/fmt-merge-msg.c:676
ef317cd5 6086msgid "text"
07432cef 6087msgstr "文本"
ef317cd5 6088
1b7f4a34 6089#: builtin/fmt-merge-msg.c:677
ef317cd5 6090msgid "use <text> as start of message"
07432cef 6091msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 6092
1b7f4a34 6093#: builtin/fmt-merge-msg.c:678
ef317cd5 6094msgid "file to read from"
07432cef 6095msgstr "从文件中读取"
ef317cd5 6096
1b7f4a34 6097#: builtin/for-each-ref.c:9
814ff314
JX
6098msgid "git for-each-ref [<options>] [<pattern>]"
6099msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 6100
1b7f4a34 6101#: builtin/for-each-ref.c:24
ef317cd5 6102msgid "quote placeholders suitably for shells"
07432cef 6103msgstr "引用占位符适用于 shells"
ef317cd5 6104
1b7f4a34 6105#: builtin/for-each-ref.c:26
ef317cd5 6106msgid "quote placeholders suitably for perl"
07432cef 6107msgstr "引用占位符适用于 perl"
ef317cd5 6108
1b7f4a34 6109#: builtin/for-each-ref.c:28
ef317cd5 6110msgid "quote placeholders suitably for python"
07432cef 6111msgstr "引用占位符适用于 python"
ef317cd5 6112
1b7f4a34 6113#: builtin/for-each-ref.c:30
04cb2f28
JX
6114msgid "quote placeholders suitably for Tcl"
6115msgstr "引用占位符适用于 Tcl"
ef317cd5 6116
1b7f4a34 6117#: builtin/for-each-ref.c:33
ef317cd5 6118msgid "show only <n> matched refs"
07432cef 6119msgstr "只显示 <n> 个匹配的引用"
ef317cd5 6120
1b7f4a34 6121#: builtin/for-each-ref.c:34
ef317cd5 6122msgid "format to use for the output"
07432cef 6123msgstr "输出格式"
ef317cd5 6124
1b7f4a34 6125#: builtin/for-each-ref.c:35
ef317cd5 6126msgid "key"
07432cef 6127msgstr "key"
ef317cd5 6128
1b7f4a34 6129#: builtin/for-each-ref.c:36
ef317cd5 6130msgid "field name to sort on"
07432cef 6131msgstr "排序的字段名"
ef317cd5 6132
1b7f4a34 6133#: builtin/fsck.c:163 builtin/prune.c:137
6c94aba5
JX
6134msgid "Checking connectivity"
6135msgstr "检查连接中"
6136
1b7f4a34 6137#: builtin/fsck.c:568
6c94aba5
JX
6138msgid "Checking object directories"
6139msgstr "检查对象目录中"
6140
1b7f4a34 6141#: builtin/fsck.c:631
814ff314
JX
6142msgid "git fsck [<options>] [<object>...]"
6143msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 6144
1b7f4a34 6145#: builtin/fsck.c:637
ef317cd5 6146msgid "show unreachable objects"
07432cef 6147msgstr "显示不可达的对象"
ef317cd5 6148
1b7f4a34 6149#: builtin/fsck.c:638
ef317cd5 6150msgid "show dangling objects"
07432cef 6151msgstr "显示摇摆的对象"
ef317cd5 6152
1b7f4a34 6153#: builtin/fsck.c:639
ef317cd5 6154msgid "report tags"
55a16ee4 6155msgstr "报告标签"
ef317cd5 6156
1b7f4a34 6157#: builtin/fsck.c:640
ef317cd5 6158msgid "report root nodes"
07432cef 6159msgstr "报告根节点"
ef317cd5 6160
1b7f4a34 6161#: builtin/fsck.c:641
ef317cd5 6162msgid "make index objects head nodes"
07432cef 6163msgstr "将索引亦作为检查的头节点"
ef317cd5 6164
1b7f4a34 6165#: builtin/fsck.c:642
ef317cd5 6166msgid "make reflogs head nodes (default)"
07432cef 6167msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 6168
1b7f4a34 6169#: builtin/fsck.c:643
ef317cd5 6170msgid "also consider packs and alternate objects"
07432cef 6171msgstr "也考虑包和备用对象"
ef317cd5 6172
1b7f4a34
JX
6173#: builtin/fsck.c:644
6174msgid "check only connectivity"
6175msgstr "仅检查连通性"
6176
6177#: builtin/fsck.c:645
ef317cd5 6178msgid "enable more strict checking"
07432cef 6179msgstr "启用更严格的检查"
ef317cd5 6180
1b7f4a34 6181#: builtin/fsck.c:647
ef317cd5 6182msgid "write dangling objects in .git/lost-found"
07432cef 6183msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5 6184
1b7f4a34 6185#: builtin/fsck.c:648 builtin/prune.c:107
ef317cd5 6186msgid "show progress"
07432cef 6187msgstr "显示进度"
ef317cd5 6188
1b7f4a34 6189#: builtin/fsck.c:707
6c94aba5
JX
6190msgid "Checking objects"
6191msgstr "检查对象中"
6192
1b7f4a34 6193#: builtin/gc.c:25
814ff314
JX
6194msgid "git gc [<options>]"
6195msgstr "git gc [<选项>]"
ef317cd5 6196
1b7f4a34 6197#: builtin/gc.c:55
c04f5ac3 6198#, c-format
7aea43ff
JX
6199msgid "Invalid %s: '%s'"
6200msgstr "无效 %s:'%s'"
c04f5ac3 6201
1b7f4a34 6202#: builtin/gc.c:100
c04f5ac3
JX
6203#, c-format
6204msgid "insanely long object directory %.*s"
6205msgstr "不正常的长对象目录 %.*s"
6206
1b7f4a34 6207#: builtin/gc.c:269
ef317cd5 6208msgid "prune unreferenced objects"
07432cef 6209msgstr "清除未引用的对象"
ef317cd5 6210
1b7f4a34 6211#: builtin/gc.c:271
ef317cd5 6212msgid "be more thorough (increased runtime)"
07432cef 6213msgstr "更彻底(增加运行时间)"
ef317cd5 6214
1b7f4a34 6215#: builtin/gc.c:272
ef317cd5 6216msgid "enable auto-gc mode"
07432cef 6217msgstr "启用自动垃圾回收模式"
ef317cd5 6218
1b7f4a34 6219#: builtin/gc.c:273
90314792
JX
6220msgid "force running gc even if there may be another gc running"
6221msgstr "强制执行 gc 即使另外一个 gc 正在执行"
6222
1b7f4a34 6223#: builtin/gc.c:315
c04f5ac3 6224#, c-format
6c94aba5 6225msgid "Auto packing the repository in background for optimum performance.\n"
160fb2b2 6226msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6c94aba5 6227
1b7f4a34 6228#: builtin/gc.c:317
6c94aba5
JX
6229#, c-format
6230msgid "Auto packing the repository for optimum performance.\n"
160fb2b2 6231msgstr "自动打包仓库以求最佳性能。\n"
6c94aba5 6232
1b7f4a34 6233#: builtin/gc.c:318
6c94aba5
JX
6234#, c-format
6235msgid "See \"git help gc\" for manual housekeeping.\n"
6236msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 6237
1b7f4a34 6238#: builtin/gc.c:336
90314792
JX
6239#, c-format
6240msgid ""
6241"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
6242msgstr ""
6243"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
6244
1b7f4a34 6245#: builtin/gc.c:364
c04f5ac3
JX
6246msgid ""
6247"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 6248msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 6249
90314792 6250#: builtin/grep.c:23
814ff314
JX
6251msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
6252msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 6253
90314792 6254#: builtin/grep.c:218
c04f5ac3
JX
6255#, c-format
6256msgid "grep: failed to create thread: %s"
90e6ef53 6257msgstr "grep:无法创建线程:%s"
c04f5ac3 6258
6acbf033 6259#: builtin/grep.c:441 builtin/grep.c:476
c04f5ac3
JX
6260#, c-format
6261msgid "unable to read tree (%s)"
90e6ef53 6262msgstr "无法读取树(%s)"
c04f5ac3 6263
6acbf033 6264#: builtin/grep.c:491
c04f5ac3
JX
6265#, c-format
6266msgid "unable to grep from object of type %s"
6267msgstr "无法抓取来自于 %s 类型的对象"
6268
6acbf033 6269#: builtin/grep.c:547
c04f5ac3
JX
6270#, c-format
6271msgid "switch `%c' expects a numerical value"
6272msgstr "开关 `%c' 期望一个数字值"
6273
6acbf033 6274#: builtin/grep.c:564
c04f5ac3
JX
6275#, c-format
6276msgid "cannot open '%s'"
6277msgstr "不能打开 '%s'"
6278
6acbf033 6279#: builtin/grep.c:638
ef317cd5 6280msgid "search in index instead of in the work tree"
07432cef 6281msgstr "在索引区搜索而不是在工作区"
ef317cd5 6282
6acbf033 6283#: builtin/grep.c:640
ef317cd5 6284msgid "find in contents not managed by git"
07432cef 6285msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
6286
6287# 译者:中文字符串拼接,可删除前导空格
6acbf033 6288#: builtin/grep.c:642
ef317cd5 6289msgid "search in both tracked and untracked files"
07432cef 6290msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 6291
6acbf033 6292#: builtin/grep.c:644
814ff314
JX
6293msgid "ignore files specified via '.gitignore'"
6294msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 6295
6acbf033 6296#: builtin/grep.c:647
ef317cd5 6297msgid "show non-matching lines"
07432cef 6298msgstr "显示未匹配的行"
ef317cd5 6299
6acbf033 6300#: builtin/grep.c:649
ef317cd5 6301msgid "case insensitive matching"
07432cef 6302msgstr "不区分大小写匹配"
ef317cd5 6303
6acbf033 6304#: builtin/grep.c:651
ef317cd5 6305msgid "match patterns only at word boundaries"
07432cef 6306msgstr "只在单词边界匹配模式"
ef317cd5 6307
6acbf033 6308#: builtin/grep.c:653
ef317cd5 6309msgid "process binary files as text"
07432cef 6310msgstr "把二进制文件当做文本处理"
ef317cd5 6311
6acbf033 6312#: builtin/grep.c:655
ef317cd5 6313msgid "don't match patterns in binary files"
07432cef 6314msgstr "不在二进制文件中匹配模式"
ef317cd5 6315
6acbf033 6316#: builtin/grep.c:658
90314792
JX
6317msgid "process binary files with textconv filters"
6318msgstr "用 textconv 过滤器处理二进制文件"
6319
6acbf033 6320#: builtin/grep.c:660
ef317cd5 6321msgid "descend at most <depth> levels"
07432cef 6322msgstr "最多以指定的深度向下寻找"
ef317cd5 6323
6acbf033 6324#: builtin/grep.c:664
ef317cd5 6325msgid "use extended POSIX regular expressions"
07432cef 6326msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 6327
6acbf033 6328#: builtin/grep.c:667
ef317cd5 6329msgid "use basic POSIX regular expressions (default)"
07432cef 6330msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 6331
6acbf033 6332#: builtin/grep.c:670
ef317cd5 6333msgid "interpret patterns as fixed strings"
07432cef 6334msgstr "把模式解析为固定的字符串"
ef317cd5 6335
6acbf033 6336#: builtin/grep.c:673
ef317cd5 6337msgid "use Perl-compatible regular expressions"
07432cef 6338msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 6339
6acbf033 6340#: builtin/grep.c:676
ef317cd5 6341msgid "show line numbers"
07432cef 6342msgstr "显示行号"
ef317cd5 6343
6acbf033 6344#: builtin/grep.c:677
ef317cd5 6345msgid "don't show filenames"
07432cef 6346msgstr "不显示文件名"
ef317cd5 6347
6acbf033 6348#: builtin/grep.c:678
ef317cd5 6349msgid "show filenames"
07432cef 6350msgstr "显示文件名"
ef317cd5 6351
6acbf033 6352#: builtin/grep.c:680
ef317cd5 6353msgid "show filenames relative to top directory"
07432cef 6354msgstr "显示相对于顶级目录的文件名"
ef317cd5 6355
6acbf033 6356#: builtin/grep.c:682
ef317cd5 6357msgid "show only filenames instead of matching lines"
07432cef 6358msgstr "只显示文件名而不显示匹配的行"
ef317cd5 6359
6acbf033 6360#: builtin/grep.c:684
ef317cd5 6361msgid "synonym for --files-with-matches"
07432cef 6362msgstr "和 --files-with-matches 同义"
ef317cd5 6363
6acbf033 6364#: builtin/grep.c:687
ef317cd5 6365msgid "show only the names of files without match"
07432cef 6366msgstr "只显示未匹配的文件名"
ef317cd5 6367
6acbf033 6368#: builtin/grep.c:689
ef317cd5 6369msgid "print NUL after filenames"
07432cef 6370msgstr "在文件名后输出 NUL 字符"
ef317cd5 6371
6acbf033 6372#: builtin/grep.c:691
ef317cd5 6373msgid "show the number of matches instead of matching lines"
07432cef 6374msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 6375
6acbf033 6376#: builtin/grep.c:692
ef317cd5 6377msgid "highlight matches"
07432cef 6378msgstr "高亮显示匹配项"
ef317cd5 6379
6acbf033 6380#: builtin/grep.c:694
ef317cd5 6381msgid "print empty line between matches from different files"
07432cef 6382msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 6383
6acbf033 6384#: builtin/grep.c:696
ef317cd5 6385msgid "show filename only once above matches from same file"
07432cef 6386msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 6387
6acbf033 6388#: builtin/grep.c:699
ef317cd5 6389msgid "show <n> context lines before and after matches"
07432cef 6390msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 6391
6acbf033 6392#: builtin/grep.c:702
ef317cd5 6393msgid "show <n> context lines before matches"
07432cef 6394msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 6395
6acbf033 6396#: builtin/grep.c:704
ef317cd5 6397msgid "show <n> context lines after matches"
07432cef 6398msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 6399
6acbf033 6400#: builtin/grep.c:705
ef317cd5 6401msgid "shortcut for -C NUM"
07432cef 6402msgstr "快捷键 -C 数字"
ef317cd5 6403
6acbf033 6404#: builtin/grep.c:708
ef317cd5 6405msgid "show a line with the function name before matches"
07432cef 6406msgstr "在匹配的前面显示一行函数名"
ef317cd5 6407
6acbf033 6408#: builtin/grep.c:710
ef317cd5 6409msgid "show the surrounding function"
07432cef 6410msgstr "显示所在函数的前后内容"
ef317cd5 6411
6acbf033 6412#: builtin/grep.c:713
ef317cd5 6413msgid "read patterns from file"
07432cef 6414msgstr "从文件读取模式"
ef317cd5 6415
6acbf033 6416#: builtin/grep.c:715
ef317cd5 6417msgid "match <pattern>"
07432cef 6418msgstr "匹配 <模式>"
ef317cd5 6419
6acbf033 6420#: builtin/grep.c:717
ef317cd5 6421msgid "combine patterns specified with -e"
07432cef 6422msgstr "组合用 -e 参数设定的模式"
ef317cd5 6423
6acbf033 6424#: builtin/grep.c:729
ef317cd5 6425msgid "indicate hit with exit status without output"
07432cef 6426msgstr "不输出,而用退出码标识命中状态"
ef317cd5 6427
6acbf033 6428#: builtin/grep.c:731
ef317cd5 6429msgid "show only matches from files that match all patterns"
07432cef 6430msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 6431
6acbf033 6432#: builtin/grep.c:733
07432cef
WS
6433msgid "show parse tree for grep expression"
6434msgstr "显示 grep 表达式的解析树"
6435
6acbf033 6436#: builtin/grep.c:737
ef317cd5 6437msgid "pager"
07432cef 6438msgstr "分页"
ef317cd5 6439
6acbf033 6440#: builtin/grep.c:737
ef317cd5 6441msgid "show matching files in the pager"
07432cef 6442msgstr "分页显示匹配的文件"
ef317cd5 6443
6acbf033 6444#: builtin/grep.c:740
ef317cd5 6445msgid "allow calling of grep(1) (ignored by this build)"
07432cef 6446msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 6447
7aea43ff 6448#: builtin/grep.c:741 builtin/show-ref.c:189
ef317cd5 6449msgid "show usage"
07432cef 6450msgstr "显示用法"
ef317cd5 6451
6acbf033 6452#: builtin/grep.c:808
c04f5ac3
JX
6453msgid "no pattern given."
6454msgstr "未提供模式匹配。"
6455
6acbf033 6456#: builtin/grep.c:866
c04f5ac3
JX
6457msgid "--open-files-in-pager only works on the worktree"
6458msgstr "--open-files-in-pager 仅用于工作区"
6459
6acbf033 6460#: builtin/grep.c:892
c04f5ac3 6461msgid "--cached or --untracked cannot be used with --no-index."
649900bc 6462msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 6463
6acbf033 6464#: builtin/grep.c:897
c04f5ac3 6465msgid "--no-index or --untracked cannot be used with revs."
649900bc 6466msgstr "--no-index 或 --untracked 不能和版本同时使用。"
c04f5ac3 6467
6acbf033 6468#: builtin/grep.c:900
c04f5ac3 6469msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 6470msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 6471
6acbf033 6472#: builtin/grep.c:908
c04f5ac3
JX
6473msgid "both --cached and trees are given."
6474msgstr "同时给出了 --cached 和树对象。"
6475
7aea43ff 6476#: builtin/hash-object.c:80
ef317cd5 6477msgid ""
814ff314
JX
6478"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6479"[--] <file>..."
ef317cd5 6480msgstr ""
814ff314
JX
6481"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
6482"[--] <文件>..."
ef317cd5 6483
7aea43ff 6484#: builtin/hash-object.c:81
ef317cd5 6485msgid "git hash-object --stdin-paths < <list-of-paths>"
07432cef 6486msgstr "git hash-object --stdin-paths < <路径列表>"
ef317cd5 6487
1b7f4a34 6488#: builtin/hash-object.c:92 builtin/tag.c:614
ef317cd5 6489msgid "type"
07432cef 6490msgstr "类型"
ef317cd5 6491
7aea43ff 6492#: builtin/hash-object.c:92
ef317cd5 6493msgid "object type"
07432cef 6494msgstr "对象类型"
ef317cd5 6495
7aea43ff 6496#: builtin/hash-object.c:93
ef317cd5 6497msgid "write the object into the object database"
07432cef 6498msgstr "将对象写入对象数据库"
ef317cd5 6499
7aea43ff 6500#: builtin/hash-object.c:95
ef317cd5 6501msgid "read the object from stdin"
07432cef 6502msgstr "从标准输入读取对象"
ef317cd5 6503
7aea43ff 6504#: builtin/hash-object.c:97
ef317cd5 6505msgid "store file as is without filters"
07432cef 6506msgstr "原样存储文件不使用过滤器"
ef317cd5 6507
7aea43ff 6508#: builtin/hash-object.c:98
220c313c
JX
6509msgid ""
6510"just hash any random garbage to create corrupt objects for debugging Git"
6511msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
6512
7aea43ff 6513#: builtin/hash-object.c:99
ef317cd5 6514msgid "process file as it were from this path"
07432cef 6515msgstr "处理文件并假设其来自于此路径"
ef317cd5 6516
2e8451e8 6517#: builtin/help.c:41
ef317cd5 6518msgid "print all available commands"
07432cef 6519msgstr "打印所有可用的命令"
ef317cd5 6520
2e8451e8 6521#: builtin/help.c:42
4dcdc3d8
JX
6522msgid "print list of useful guides"
6523msgstr "显示有用的指南列表"
6524
2e8451e8 6525#: builtin/help.c:43
ef317cd5 6526msgid "show man page"
07432cef 6527msgstr "显示 man 手册"
ef317cd5 6528
2e8451e8 6529#: builtin/help.c:44
ef317cd5 6530msgid "show manual in web browser"
07432cef 6531msgstr "在 web 浏览器中显示手册"
ef317cd5 6532
2e8451e8 6533#: builtin/help.c:46
ef317cd5 6534msgid "show info page"
07432cef 6535msgstr "显示 info 手册"
ef317cd5 6536
2e8451e8 6537#: builtin/help.c:52
814ff314
JX
6538msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6539msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
ef317cd5 6540
2e8451e8 6541#: builtin/help.c:64
81809b99 6542#, c-format
8ada9598 6543msgid "unrecognized help format '%s'"
81809b99 6544msgstr "未能识别的帮助格式 '%s'"
8ada9598 6545
220c313c 6546#: builtin/help.c:91
8ada9598 6547msgid "Failed to start emacsclient."
81809b99 6548msgstr "无法启动 emacsclient。"
8ada9598 6549
220c313c 6550#: builtin/help.c:104
8ada9598 6551msgid "Failed to parse emacsclient version."
81809b99 6552msgstr "无法解析 emacsclient 版本。"
8ada9598 6553
220c313c 6554#: builtin/help.c:112
8ada9598
JX
6555#, c-format
6556msgid "emacsclient version '%d' too old (< 22)."
07432cef 6557msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 6558
220c313c 6559#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
81809b99 6560#, c-format
8ada9598 6561msgid "failed to exec '%s': %s"
81809b99 6562msgstr "无法执行 '%s':%s"
8ada9598 6563
220c313c 6564#: builtin/help.c:215
8ada9598
JX
6565#, c-format
6566msgid ""
6567"'%s': path for unsupported man viewer.\n"
6568"Please consider using 'man.<tool>.cmd' instead."
6569msgstr ""
81809b99 6570"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 6571"请使用 'man.<工具>.cmd'。"
8ada9598 6572
220c313c 6573#: builtin/help.c:227
8ada9598
JX
6574#, c-format
6575msgid ""
6576"'%s': cmd for supported man viewer.\n"
6577"Please consider using 'man.<tool>.path' instead."
6578msgstr ""
81809b99 6579"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 6580"请使用 'man.<工具>.path'。"
8ada9598 6581
04cb2f28 6582#: builtin/help.c:354
8ada9598
JX
6583#, c-format
6584msgid "'%s': unknown man viewer."
81809b99 6585msgstr "'%s':未知的 man 查看器。"
8ada9598 6586
04cb2f28 6587#: builtin/help.c:371
8ada9598 6588msgid "no man viewer handled the request"
81809b99 6589msgstr "没有 man 查看器处理此请求"
8ada9598 6590
04cb2f28 6591#: builtin/help.c:379
8ada9598 6592msgid "no info viewer handled the request"
81809b99 6593msgstr "没有 info 查看器处理此请求"
8ada9598 6594
04cb2f28 6595#: builtin/help.c:428
4dcdc3d8
JX
6596msgid "Defining attributes per path"
6597msgstr "定义路径的属性"
6598
04cb2f28 6599#: builtin/help.c:429
220c313c
JX
6600msgid "Everyday Git With 20 Commands Or So"
6601msgstr "每一天 Git 常用的约 20 条命令"
6602
04cb2f28 6603#: builtin/help.c:430
4dcdc3d8
JX
6604msgid "A Git glossary"
6605msgstr "Git 词汇表"
6606
04cb2f28 6607#: builtin/help.c:431
4dcdc3d8
JX
6608msgid "Specifies intentionally untracked files to ignore"
6609msgstr "忽略指定的未跟踪文件"
6610
04cb2f28 6611#: builtin/help.c:432
4dcdc3d8
JX
6612msgid "Defining submodule properties"
6613msgstr "定义子模组属性"
6614
04cb2f28 6615#: builtin/help.c:433
4dcdc3d8
JX
6616msgid "Specifying revisions and ranges for Git"
6617msgstr "指定 Git 的版本和版本范围"
6618
04cb2f28 6619#: builtin/help.c:434
4dcdc3d8
JX
6620msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6621msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6622
04cb2f28 6623#: builtin/help.c:435
4dcdc3d8
JX
6624msgid "An overview of recommended workflows with Git"
6625msgstr "Git 推荐的工作流概览"
6626
04cb2f28 6627#: builtin/help.c:447
4dcdc3d8
JX
6628msgid "The common Git guides are:\n"
6629msgstr "最常用的 Git 向导有:\n"
6630
04cb2f28 6631#: builtin/help.c:468 builtin/help.c:485
8ada9598
JX
6632#, c-format
6633msgid "usage: %s%s"
81809b99 6634msgstr "用法:%s%s"
8ada9598 6635
04cb2f28 6636#: builtin/help.c:501
8ada9598
JX
6637#, c-format
6638msgid "`git %s' is aliased to `%s'"
81809b99 6639msgstr "`git %s' 是 `%s' 的别名"
8ada9598 6640
1b7f4a34 6641#: builtin/index-pack.c:152
6acbf033
JX
6642#, c-format
6643msgid "unable to open %s"
6644msgstr "不能打开 %s"
6645
1b7f4a34 6646#: builtin/index-pack.c:202
8ada9598
JX
6647#, c-format
6648msgid "object type mismatch at %s"
81809b99 6649msgstr "%s 的对象类型不匹配"
8ada9598 6650
1b7f4a34 6651#: builtin/index-pack.c:222
6acbf033
JX
6652#, c-format
6653msgid "did not receive expected object %s"
6654msgstr "未能获取期望的对象 %s"
8ada9598 6655
1b7f4a34 6656#: builtin/index-pack.c:225
6acbf033
JX
6657#, c-format
6658msgid "object %s: expected type %s, found %s"
6659msgstr "对象 %s:期待类型 %s,却是 %s"
6660
1b7f4a34 6661#: builtin/index-pack.c:267
81809b99 6662#, c-format
8ada9598
JX
6663msgid "cannot fill %d byte"
6664msgid_plural "cannot fill %d bytes"
81809b99 6665msgstr[0] "无法填充 %d 字节"
5ae481e0 6666msgstr[1] "无法填充 %d 字节"
8ada9598 6667
1b7f4a34 6668#: builtin/index-pack.c:277
8ada9598 6669msgid "early EOF"
81809b99 6670msgstr "过早的文件结束符(EOF)"
8ada9598 6671
1b7f4a34 6672#: builtin/index-pack.c:278
8ada9598 6673msgid "read error on input"
81809b99 6674msgstr "输入上的读错误"
8ada9598 6675
1b7f4a34 6676#: builtin/index-pack.c:290
8ada9598 6677msgid "used more bytes than were available"
81809b99 6678msgstr "用掉了超过可用的字节"
8ada9598 6679
1b7f4a34 6680#: builtin/index-pack.c:297
8ada9598 6681msgid "pack too large for current definition of off_t"
81809b99 6682msgstr "包太大超过了当前 off_t 的定义"
8ada9598 6683
1b7f4a34 6684#: builtin/index-pack.c:313
81809b99 6685#, c-format
8ada9598 6686msgid "unable to create '%s'"
81809b99 6687msgstr "不能创建 '%s'"
8ada9598 6688
1b7f4a34 6689#: builtin/index-pack.c:318
81809b99 6690#, c-format
8ada9598 6691msgid "cannot open packfile '%s'"
81809b99 6692msgstr "无法打开包文件 '%s'"
8ada9598 6693
1b7f4a34 6694#: builtin/index-pack.c:332
8ada9598 6695msgid "pack signature mismatch"
81809b99 6696msgstr "包签名不匹配"
8ada9598 6697
1b7f4a34 6698#: builtin/index-pack.c:334
ef317cd5
JX
6699#, c-format
6700msgid "pack version %<PRIu32> unsupported"
07432cef 6701msgstr "不支持包版本 %<PRIu32>"
ef317cd5 6702
1b7f4a34 6703#: builtin/index-pack.c:352
8ada9598
JX
6704#, c-format
6705msgid "pack has bad object at offset %lu: %s"
81809b99 6706msgstr "包中有错误的对象位于 %lu:%s"
8ada9598 6707
1b7f4a34 6708#: builtin/index-pack.c:473
8ada9598
JX
6709#, c-format
6710msgid "inflate returned %d"
81809b99 6711msgstr "解压缩返回 %d"
8ada9598 6712
1b7f4a34 6713#: builtin/index-pack.c:522
8ada9598 6714msgid "offset value overflow for delta base object"
81809b99 6715msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 6716
1b7f4a34 6717#: builtin/index-pack.c:530
8ada9598 6718msgid "delta base offset is out of bound"
81809b99 6719msgstr "delta 基准偏移越界"
8ada9598 6720
1b7f4a34 6721#: builtin/index-pack.c:538
81809b99 6722#, c-format
8ada9598 6723msgid "unknown object type %d"
81809b99 6724msgstr "未知对象类型 %d"
8ada9598 6725
1b7f4a34 6726#: builtin/index-pack.c:569
8ada9598 6727msgid "cannot pread pack file"
81809b99 6728msgstr "无法读取包文件"
8ada9598 6729
1b7f4a34 6730#: builtin/index-pack.c:571
8ada9598
JX
6731#, c-format
6732msgid "premature end of pack file, %lu byte missing"
6733msgid_plural "premature end of pack file, %lu bytes missing"
81809b99 6734msgstr[0] "包文件过早结束,缺少 %lu 字节"
5ae481e0 6735msgstr[1] "包文件过早结束,缺少 %lu 字节"
8ada9598 6736
1b7f4a34 6737#: builtin/index-pack.c:597
8ada9598 6738msgid "serious inflate inconsistency"
81809b99 6739msgstr "解压缩严重的不一致"
8ada9598 6740
1b7f4a34
JX
6741#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
6742#: builtin/index-pack.c:806 builtin/index-pack.c:815
8ada9598
JX
6743#, c-format
6744msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 6745msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 6746
1b7f4a34 6747#: builtin/index-pack.c:746 builtin/pack-objects.c:162
814ff314 6748#: builtin/pack-objects.c:254
6792b93b
JX
6749#, c-format
6750msgid "unable to read %s"
6751msgstr "不能读 %s"
6752
1b7f4a34 6753#: builtin/index-pack.c:812
6792b93b
JX
6754#, c-format
6755msgid "cannot read existing object %s"
6756msgstr "不能读取现存对象 %s"
6757
1b7f4a34 6758#: builtin/index-pack.c:826
81809b99 6759#, c-format
8ada9598 6760msgid "invalid blob object %s"
160fb2b2 6761msgstr "无效的数据对象 %s"
8ada9598 6762
1b7f4a34 6763#: builtin/index-pack.c:840
81809b99 6764#, c-format
8ada9598 6765msgid "invalid %s"
81809b99 6766msgstr "无效的 %s"
8ada9598 6767
7aea43ff 6768#: builtin/index-pack.c:843
8ada9598 6769msgid "Error in object"
81809b99 6770msgstr "对象中出错"
8ada9598 6771
7aea43ff 6772#: builtin/index-pack.c:845
8ada9598
JX
6773#, c-format
6774msgid "Not all child objects of %s are reachable"
81809b99 6775msgstr "%s 的所有子对象并非都可达"
8ada9598 6776
7aea43ff 6777#: builtin/index-pack.c:917 builtin/index-pack.c:948
8ada9598 6778msgid "failed to apply delta"
81809b99 6779msgstr "无法应用 delta"
8ada9598 6780
7aea43ff 6781#: builtin/index-pack.c:1118
8ada9598 6782msgid "Receiving objects"
81809b99 6783msgstr "接收对象中"
8ada9598 6784
7aea43ff 6785#: builtin/index-pack.c:1118
8ada9598 6786msgid "Indexing objects"
81809b99 6787msgstr "索引对象中"
8ada9598 6788
7aea43ff 6789#: builtin/index-pack.c:1150
8ada9598 6790msgid "pack is corrupted (SHA1 mismatch)"
81809b99 6791msgstr "包冲突(SHA1 不匹配)"
8ada9598 6792
7aea43ff 6793#: builtin/index-pack.c:1155
8ada9598 6794msgid "cannot fstat packfile"
81809b99 6795msgstr "不能枚举包文件状态"
8ada9598 6796
7aea43ff 6797#: builtin/index-pack.c:1158
8ada9598 6798msgid "pack has junk at the end"
81809b99 6799msgstr "包的结尾有垃圾数据"
8ada9598 6800
7aea43ff 6801#: builtin/index-pack.c:1169
6792b93b
JX
6802msgid "confusion beyond insanity in parse_pack_objects()"
6803msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6804
7aea43ff 6805#: builtin/index-pack.c:1194
8ada9598 6806msgid "Resolving deltas"
81809b99 6807msgstr "处理 delta 中"
8ada9598 6808
7aea43ff 6809#: builtin/index-pack.c:1205
07432cef 6810#, c-format
ef317cd5 6811msgid "unable to create thread: %s"
07432cef 6812msgstr "不能创建线程:%s"
ef317cd5 6813
7aea43ff 6814#: builtin/index-pack.c:1247
8ada9598 6815msgid "confusion beyond insanity"
81809b99 6816msgstr "不可理喻"
8ada9598 6817
7aea43ff 6818#: builtin/index-pack.c:1253
ef317cd5
JX
6819#, c-format
6820msgid "completed with %d local objects"
07432cef 6821msgstr "完成 %d 个本地对象"
ef317cd5 6822
7aea43ff 6823#: builtin/index-pack.c:1263
ef317cd5
JX
6824#, c-format
6825msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 6826msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 6827
7aea43ff 6828#: builtin/index-pack.c:1267
8ada9598
JX
6829#, c-format
6830msgid "pack has %d unresolved delta"
6831msgid_plural "pack has %d unresolved deltas"
81809b99 6832msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 6833msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 6834
7aea43ff 6835#: builtin/index-pack.c:1291
81809b99 6836#, c-format
8ada9598 6837msgid "unable to deflate appended object (%d)"
07432cef 6838msgstr "不能压缩附加对象(%d)"
8ada9598 6839
7aea43ff 6840#: builtin/index-pack.c:1367
8ada9598
JX
6841#, c-format
6842msgid "local object %s is corrupt"
81809b99 6843msgstr "本地对象 %s 已损坏"
8ada9598 6844
7aea43ff 6845#: builtin/index-pack.c:1391
8ada9598 6846msgid "error while closing pack file"
81809b99 6847msgstr "关闭包文件时出错"
8ada9598 6848
7aea43ff 6849#: builtin/index-pack.c:1404
81809b99 6850#, c-format
8ada9598 6851msgid "cannot write keep file '%s'"
81809b99 6852msgstr "无法写保留文件 '%s'"
8ada9598 6853
7aea43ff 6854#: builtin/index-pack.c:1412
81809b99 6855#, c-format
8ada9598 6856msgid "cannot close written keep file '%s'"
81809b99 6857msgstr "无法关闭保留文件 '%s'"
8ada9598 6858
7aea43ff 6859#: builtin/index-pack.c:1425
8ada9598 6860msgid "cannot store pack file"
81809b99 6861msgstr "无法存储包文件"
8ada9598 6862
7aea43ff 6863#: builtin/index-pack.c:1436
8ada9598 6864msgid "cannot store index file"
81809b99 6865msgstr "无法存储索引文件"
8ada9598 6866
7aea43ff 6867#: builtin/index-pack.c:1469
07432cef 6868#, c-format
ef317cd5 6869msgid "bad pack.indexversion=%<PRIu32>"
07432cef 6870msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 6871
7aea43ff 6872#: builtin/index-pack.c:1475
ef317cd5
JX
6873#, c-format
6874msgid "invalid number of threads specified (%d)"
07432cef 6875msgstr "指定的线程数无效(%d)"
ef317cd5 6876
1b7f4a34 6877#: builtin/index-pack.c:1479 builtin/index-pack.c:1663
ef317cd5
JX
6878#, c-format
6879msgid "no threads support, ignoring %s"
07432cef 6880msgstr "没有线程支持,忽略 %s"
ef317cd5 6881
7aea43ff 6882#: builtin/index-pack.c:1537
81809b99 6883#, c-format
8ada9598 6884msgid "Cannot open existing pack file '%s'"
81809b99 6885msgstr "无法打开现存包文件 '%s'"
8ada9598 6886
7aea43ff 6887#: builtin/index-pack.c:1539
81809b99 6888#, c-format
8ada9598 6889msgid "Cannot open existing pack idx file for '%s'"
81809b99 6890msgstr "无法为 %s 打开包索引文件"
8ada9598 6891
7aea43ff 6892#: builtin/index-pack.c:1586
81809b99 6893#, c-format
8ada9598
JX
6894msgid "non delta: %d object"
6895msgid_plural "non delta: %d objects"
81809b99 6896msgstr[0] "非 delta:%d 个对象"
5ae481e0 6897msgstr[1] "非 delta:%d 个对象"
8ada9598 6898
7aea43ff 6899#: builtin/index-pack.c:1593
8ada9598
JX
6900#, c-format
6901msgid "chain length = %d: %lu object"
6902msgid_plural "chain length = %d: %lu objects"
81809b99 6903msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 6904msgstr[1] "链长 = %d: %lu 对象"
8ada9598 6905
1b7f4a34 6906#: builtin/index-pack.c:1623
8ada9598 6907msgid "Cannot come back to cwd"
81809b99 6908msgstr "无法返回当前工作目录"
8ada9598 6909
1b7f4a34
JX
6910#: builtin/index-pack.c:1675 builtin/index-pack.c:1678
6911#: builtin/index-pack.c:1690 builtin/index-pack.c:1694
81809b99 6912#, c-format
8ada9598 6913msgid "bad %s"
81809b99 6914msgstr "错误选项 %s"
8ada9598 6915
1b7f4a34 6916#: builtin/index-pack.c:1708
8ada9598 6917msgid "--fix-thin cannot be used without --stdin"
649900bc 6918msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 6919
1b7f4a34 6920#: builtin/index-pack.c:1712 builtin/index-pack.c:1721
8ada9598
JX
6921#, c-format
6922msgid "packfile name '%s' does not end with '.pack'"
dbd6cced 6923msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
8ada9598 6924
1b7f4a34 6925#: builtin/index-pack.c:1729
8ada9598 6926msgid "--verify with no packfile name given"
dbd6cced 6927msgstr "--verify 没有提供包文件名参数"
8ada9598 6928
1b7f4a34 6929#: builtin/init-db.c:36
c04f5ac3
JX
6930#, c-format
6931msgid "Could not make %s writable by group"
6932msgstr "不能设置 %s 为组可写"
6933
1b7f4a34 6934#: builtin/init-db.c:63
c04f5ac3
JX
6935#, c-format
6936msgid "insanely long template name %s"
6937msgstr "太长的模版名 %s"
6938
1b7f4a34 6939#: builtin/init-db.c:68
c04f5ac3
JX
6940#, c-format
6941msgid "cannot stat '%s'"
6942msgstr "不能枚举 '%s' 状态"
6943
1b7f4a34 6944#: builtin/init-db.c:74
c04f5ac3
JX
6945#, c-format
6946msgid "cannot stat template '%s'"
6947msgstr "不能枚举模版 '%s' 状态"
6948
1b7f4a34 6949#: builtin/init-db.c:81
c04f5ac3
JX
6950#, c-format
6951msgid "cannot opendir '%s'"
6952msgstr "不能打开目录 '%s'"
6953
1b7f4a34 6954#: builtin/init-db.c:98
c04f5ac3
JX
6955#, c-format
6956msgid "cannot readlink '%s'"
6957msgstr "不能读取链接 '%s'"
6958
1b7f4a34 6959#: builtin/init-db.c:100
c04f5ac3
JX
6960#, c-format
6961msgid "insanely long symlink %s"
6962msgstr "太长的符号链接 %s"
6963
1b7f4a34 6964#: builtin/init-db.c:103
c04f5ac3
JX
6965#, c-format
6966msgid "cannot symlink '%s' '%s'"
90e6ef53 6967msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3 6968
1b7f4a34 6969#: builtin/init-db.c:107
c04f5ac3
JX
6970#, c-format
6971msgid "cannot copy '%s' to '%s'"
6972msgstr "不能拷贝 '%s' 至 '%s'"
6973
1b7f4a34 6974#: builtin/init-db.c:111
c04f5ac3
JX
6975#, c-format
6976msgid "ignoring template %s"
6977msgstr "忽略模版 %s"
6978
1b7f4a34 6979#: builtin/init-db.c:137
c04f5ac3
JX
6980#, c-format
6981msgid "insanely long template path %s"
6982msgstr "太长的模版路径 %s"
6983
1b7f4a34 6984#: builtin/init-db.c:145
c04f5ac3
JX
6985#, c-format
6986msgid "templates not found %s"
6987msgstr "模版未找到 %s"
6988
1b7f4a34 6989#: builtin/init-db.c:158
c04f5ac3
JX
6990#, c-format
6991msgid "not copying templates of a wrong format version %d from '%s'"
81809b99 6992msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
c04f5ac3 6993
1b7f4a34 6994#: builtin/init-db.c:212
c04f5ac3
JX
6995#, c-format
6996msgid "insane git directory %s"
6997msgstr "不正常的 git 目录 %s"
6998
1b7f4a34 6999#: builtin/init-db.c:344 builtin/init-db.c:347
c04f5ac3
JX
7000#, c-format
7001msgid "%s already exists"
7002msgstr "%s 已经存在"
7003
1b7f4a34 7004#: builtin/init-db.c:375
c04f5ac3
JX
7005#, c-format
7006msgid "unable to handle file type %d"
7007msgstr "不能处理 %d 类型的文件"
7008
1b7f4a34 7009#: builtin/init-db.c:378
c04f5ac3
JX
7010#, c-format
7011msgid "unable to move %s to %s"
7012msgstr "不能移动 %s 至 %s"
7013
6c94aba5
JX
7014#. TRANSLATORS: The first '%s' is either "Reinitialized
7015#. existing" or "Initialized empty", the second " shared" or
7016#. "", and the last '%s%s' is the verbatim directory name.
1b7f4a34 7017#: builtin/init-db.c:434
c04f5ac3
JX
7018#, c-format
7019msgid "%s%s Git repository in %s%s\n"
160fb2b2 7020msgstr "%s%s Git 仓库于 %s%s\n"
c04f5ac3 7021
1b7f4a34 7022#: builtin/init-db.c:435
c04f5ac3
JX
7023msgid "Reinitialized existing"
7024msgstr "重新初始化现存的"
7025
1b7f4a34 7026#: builtin/init-db.c:435
c04f5ac3
JX
7027msgid "Initialized empty"
7028msgstr "初始化空的"
7029
7e238ab7 7030# 译者:中文字符串拼接,可删除前导空格
1b7f4a34 7031#: builtin/init-db.c:436
c04f5ac3 7032msgid " shared"
90e6ef53 7033msgstr "共享"
c04f5ac3 7034
1b7f4a34 7035#: builtin/init-db.c:483
ef317cd5 7036msgid ""
a77c07d9 7037"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 7038"shared[=<permissions>]] [<directory>]"
ef317cd5 7039msgstr ""
07432cef 7040"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 7041"[<目录>]"
ef317cd5 7042
1b7f4a34 7043#: builtin/init-db.c:506
ef317cd5 7044msgid "permissions"
07432cef 7045msgstr "权限"
ef317cd5 7046
1b7f4a34 7047#: builtin/init-db.c:507
ef317cd5 7048msgid "specify that the git repository is to be shared amongst several users"
160fb2b2 7049msgstr "指定 git 仓库是多个用户之间共享的"
ef317cd5 7050
1b7f4a34 7051#: builtin/init-db.c:541 builtin/init-db.c:546
c04f5ac3
JX
7052#, c-format
7053msgid "cannot mkdir %s"
7054msgstr "不能创建目录 %s"
7055
1b7f4a34 7056#: builtin/init-db.c:550
c04f5ac3
JX
7057#, c-format
7058msgid "cannot chdir to %s"
7059msgstr "不能切换目录到 %s"
7060
1b7f4a34 7061#: builtin/init-db.c:571
c04f5ac3
JX
7062#, c-format
7063msgid ""
7064"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
7065"dir=<directory>)"
1e607449 7066msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 7067
1b7f4a34 7068#: builtin/init-db.c:599
c04f5ac3
JX
7069#, c-format
7070msgid "Cannot access work tree '%s'"
7071msgstr "不能访问工作区 '%s'"
7072
220c313c
JX
7073#: builtin/interpret-trailers.c:15
7074msgid ""
7075"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
7076"[<file>...]"
7077msgstr ""
7078"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
7079">...]"
7080
7081#: builtin/interpret-trailers.c:25
7082msgid "trim empty trailers"
7083msgstr "删除空签名"
7084
7085#: builtin/interpret-trailers.c:26
7086msgid "trailer"
7087msgstr "签名"
7088
7089#: builtin/interpret-trailers.c:27
7090msgid "trailer(s) to add"
7091msgstr "要添加的签名"
7092
1b7f4a34 7093#: builtin/log.c:43
7aea43ff 7094msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 7095msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 7096
1b7f4a34 7097#: builtin/log.c:44
814ff314
JX
7098msgid "git show [<options>] <object>..."
7099msgstr "git show [<选项>] <对象>..."
ef317cd5 7100
1b7f4a34 7101#: builtin/log.c:83
220c313c
JX
7102#, c-format
7103msgid "invalid --decorate option: %s"
7104msgstr "无效的 --decorate 选项:%s"
7105
1b7f4a34 7106#: builtin/log.c:131
ef317cd5 7107msgid "suppress diff output"
07432cef 7108msgstr "不显示差异输出"
ef317cd5 7109
1b7f4a34 7110#: builtin/log.c:132
ef317cd5 7111msgid "show source"
07432cef 7112msgstr "显示源"
ef317cd5 7113
1b7f4a34 7114#: builtin/log.c:133
07432cef
WS
7115msgid "Use mail map file"
7116msgstr "使用邮件映射文件"
7117
1b7f4a34 7118#: builtin/log.c:134
ef317cd5 7119msgid "decorate options"
07432cef 7120msgstr "修饰选项"
ef317cd5 7121
1b7f4a34 7122#: builtin/log.c:137
220c313c
JX
7123msgid "Process line range n,m in file, counting from 1"
7124msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
7125
1b7f4a34 7126#: builtin/log.c:233
c04f5ac3
JX
7127#, c-format
7128msgid "Final output: %d %s\n"
7129msgstr "最终输出:%d %s\n"
7130
1b7f4a34 7131#: builtin/log.c:465
220c313c
JX
7132#, c-format
7133msgid "git show %s: bad file"
7134msgstr "git show %s: 损坏的文件"
7135
1b7f4a34 7136#: builtin/log.c:479 builtin/log.c:572
c04f5ac3
JX
7137#, c-format
7138msgid "Could not read object %s"
90e6ef53 7139msgstr "不能读取对象 %s"
c04f5ac3 7140
1b7f4a34 7141#: builtin/log.c:596
c04f5ac3
JX
7142#, c-format
7143msgid "Unknown type: %d"
7144msgstr "未知类型:%d"
7145
1b7f4a34 7146#: builtin/log.c:714
c04f5ac3
JX
7147msgid "format.headers without value"
7148msgstr "format.headers 没有值"
7149
1b7f4a34 7150#: builtin/log.c:798
c04f5ac3
JX
7151msgid "name of output directory is too long"
7152msgstr "输出目录名太长"
7153
1b7f4a34 7154#: builtin/log.c:814
c04f5ac3
JX
7155#, c-format
7156msgid "Cannot open patch file %s"
7157msgstr "无法打开补丁文件 %s"
7158
1b7f4a34 7159#: builtin/log.c:828
c04f5ac3
JX
7160msgid "Need exactly one range."
7161msgstr "只需要一个范围。"
7162
1b7f4a34 7163#: builtin/log.c:838
c04f5ac3
JX
7164msgid "Not a range."
7165msgstr "不是一个范围。"
7166
1b7f4a34 7167#: builtin/log.c:944
c04f5ac3
JX
7168msgid "Cover letter needs email format"
7169msgstr "信封需要邮件地址格式"
7170
1b7f4a34 7171#: builtin/log.c:1023
c04f5ac3
JX
7172#, c-format
7173msgid "insane in-reply-to: %s"
7174msgstr "不正常的 in-reply-to:%s"
7175
1b7f4a34 7176#: builtin/log.c:1051
814ff314
JX
7177msgid "git format-patch [<options>] [<since> | <revision-range>]"
7178msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 7179
1b7f4a34 7180#: builtin/log.c:1096
c04f5ac3
JX
7181msgid "Two output directories?"
7182msgstr "两个输出目录?"
7183
1b7f4a34 7184#: builtin/log.c:1211
ef317cd5 7185msgid "use [PATCH n/m] even with a single patch"
07432cef 7186msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 7187
1b7f4a34 7188#: builtin/log.c:1214
ef317cd5 7189msgid "use [PATCH] even with multiple patches"
07432cef 7190msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 7191
1b7f4a34 7192#: builtin/log.c:1218
ef317cd5 7193msgid "print patches to standard out"
07432cef 7194msgstr "打印补丁到标准输出"
c04f5ac3 7195
1b7f4a34 7196#: builtin/log.c:1220
ef317cd5 7197msgid "generate a cover letter"
07432cef 7198msgstr "生成一封附信"
c04f5ac3 7199
1b7f4a34 7200#: builtin/log.c:1222
ef317cd5 7201msgid "use simple number sequence for output file names"
07432cef 7202msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 7203
1b7f4a34 7204#: builtin/log.c:1223
ef317cd5 7205msgid "sfx"
07432cef 7206msgstr "后缀"
ef317cd5 7207
1b7f4a34 7208#: builtin/log.c:1224
ef317cd5 7209msgid "use <sfx> instead of '.patch'"
07432cef 7210msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 7211
1b7f4a34 7212#: builtin/log.c:1226
ef317cd5 7213msgid "start numbering patches at <n> instead of 1"
07432cef
WS
7214msgstr "补丁以 <n> 开始编号,而不是1"
7215
1b7f4a34 7216#: builtin/log.c:1228
07432cef
WS
7217msgid "mark the series as Nth re-roll"
7218msgstr "标记补丁系列是第几次重制"
ef317cd5 7219
1b7f4a34 7220#: builtin/log.c:1230
ef317cd5 7221msgid "Use [<prefix>] instead of [PATCH]"
07432cef 7222msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 7223
1b7f4a34 7224#: builtin/log.c:1233
ef317cd5 7225msgid "store resulting files in <dir>"
d9d56b23 7226msgstr "把结果文件存储在 <目录>"
ef317cd5 7227
1b7f4a34 7228#: builtin/log.c:1236
ef317cd5 7229msgid "don't strip/add [PATCH]"
07432cef 7230msgstr "不删除/添加 [PATCH]"
ef317cd5 7231
1b7f4a34 7232#: builtin/log.c:1239
ef317cd5 7233msgid "don't output binary diffs"
07432cef 7234msgstr "不输出二进制差异"
ef317cd5 7235
1b7f4a34 7236#: builtin/log.c:1241
ef317cd5 7237msgid "don't include a patch matching a commit upstream"
07432cef 7238msgstr "不包含已在上游提交中的补丁"
ef317cd5 7239
1b7f4a34 7240#: builtin/log.c:1243
ef317cd5 7241msgid "show patch format instead of default (patch + stat)"
07432cef 7242msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 7243
1b7f4a34 7244#: builtin/log.c:1245
ef317cd5 7245msgid "Messaging"
07432cef 7246msgstr "邮件发送"
ef317cd5 7247
1b7f4a34 7248#: builtin/log.c:1246
ef317cd5 7249msgid "header"
07432cef 7250msgstr "header"
ef317cd5 7251
1b7f4a34 7252#: builtin/log.c:1247
ef317cd5 7253msgid "add email header"
07432cef 7254msgstr "添加邮件头"
ef317cd5 7255
1b7f4a34 7256#: builtin/log.c:1248 builtin/log.c:1250
ef317cd5 7257msgid "email"
07432cef 7258msgstr "邮件地址"
ef317cd5 7259
1b7f4a34 7260#: builtin/log.c:1248
ef317cd5 7261msgid "add To: header"
07432cef 7262msgstr "添加收件人"
ef317cd5 7263
1b7f4a34 7264#: builtin/log.c:1250
ef317cd5 7265msgid "add Cc: header"
07432cef 7266msgstr "添加抄送"
ef317cd5 7267
1b7f4a34 7268#: builtin/log.c:1252
2e8451e8 7269msgid "ident"
d9d56b23 7270msgstr "标识"
2e8451e8 7271
1b7f4a34 7272#: builtin/log.c:1253
2e8451e8 7273msgid "set From address to <ident> (or committer ident if absent)"
4375c10e 7274msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
2e8451e8 7275
1b7f4a34 7276#: builtin/log.c:1255
ef317cd5 7277msgid "message-id"
d9d56b23 7278msgstr "邮件标识"
ef317cd5 7279
1b7f4a34 7280#: builtin/log.c:1256
ef317cd5 7281msgid "make first mail a reply to <message-id>"
d9d56b23 7282msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 7283
1b7f4a34 7284#: builtin/log.c:1257 builtin/log.c:1260
ef317cd5 7285msgid "boundary"
07432cef 7286msgstr "边界"
ef317cd5 7287
1b7f4a34 7288#: builtin/log.c:1258
ef317cd5 7289msgid "attach the patch"
07432cef 7290msgstr "附件方式添加补丁"
ef317cd5 7291
1b7f4a34 7292#: builtin/log.c:1261
ef317cd5 7293msgid "inline the patch"
07432cef 7294msgstr "内联显示补丁"
ef317cd5 7295
1b7f4a34 7296#: builtin/log.c:1265
ef317cd5 7297msgid "enable message threading, styles: shallow, deep"
07432cef 7298msgstr "启用邮件线索,风格:浅,深"
ef317cd5 7299
1b7f4a34 7300#: builtin/log.c:1267
ef317cd5 7301msgid "signature"
07432cef 7302msgstr "签名"
ef317cd5 7303
1b7f4a34 7304#: builtin/log.c:1268
ef317cd5 7305msgid "add a signature"
07432cef 7306msgstr "添加一个签名"
ef317cd5 7307
1b7f4a34 7308#: builtin/log.c:1270
6acbf033
JX
7309msgid "add a signature from a file"
7310msgstr "从文件添加一个签名"
7311
1b7f4a34 7312#: builtin/log.c:1271
ef317cd5 7313msgid "don't print the patch filenames"
07432cef 7314msgstr "不要打印补丁文件名"
ef317cd5 7315
1b7f4a34 7316#: builtin/log.c:1360
c04f5ac3
JX
7317msgid "-n and -k are mutually exclusive."
7318msgstr "-n 和 -k 互斥。"
7319
1b7f4a34 7320#: builtin/log.c:1362
c04f5ac3
JX
7321msgid "--subject-prefix and -k are mutually exclusive."
7322msgstr "--subject-prefix 和 -k 互斥。"
7323
1b7f4a34 7324#: builtin/log.c:1370
c04f5ac3
JX
7325msgid "--name-only does not make sense"
7326msgstr "--name-only 无意义"
7327
1b7f4a34 7328#: builtin/log.c:1372
c04f5ac3
JX
7329msgid "--name-status does not make sense"
7330msgstr "--name-status 无意义"
7331
1b7f4a34 7332#: builtin/log.c:1374
c04f5ac3
JX
7333msgid "--check does not make sense"
7334msgstr "--check 无意义"
7335
1b7f4a34 7336#: builtin/log.c:1397
c04f5ac3
JX
7337msgid "standard output, or directory, which one?"
7338msgstr "标准输出或目录,哪一个?"
7339
1b7f4a34 7340#: builtin/log.c:1399
c04f5ac3
JX
7341#, c-format
7342msgid "Could not create directory '%s'"
90e6ef53 7343msgstr "不能创建目录 '%s'"
c04f5ac3 7344
1b7f4a34 7345#: builtin/log.c:1496
6acbf033
JX
7346#, c-format
7347msgid "unable to read signature file '%s'"
7348msgstr "无法读取签名文件 '%s'"
7349
1b7f4a34 7350#: builtin/log.c:1559
c04f5ac3
JX
7351msgid "Failed to create output files"
7352msgstr "无法创建输出文件"
7353
1b7f4a34 7354#: builtin/log.c:1607
ef317cd5 7355msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 7356msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 7357
1b7f4a34 7358#: builtin/log.c:1661
c04f5ac3
JX
7359#, c-format
7360msgid ""
7361"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 7362msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 7363
1b7f4a34 7364#: builtin/log.c:1672 builtin/log.c:1674 builtin/log.c:1686
c04f5ac3
JX
7365#, c-format
7366msgid "Unknown commit %s"
7367msgstr "未知提交 %s"
7368
814ff314
JX
7369#: builtin/ls-files.c:358
7370msgid "git ls-files [<options>] [<file>...]"
7371msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 7372
814ff314 7373#: builtin/ls-files.c:415
ef317cd5 7374msgid "identify the file status with tags"
07432cef 7375msgstr "用标签标识文件的状态"
ef317cd5 7376
814ff314 7377#: builtin/ls-files.c:417
ef317cd5 7378msgid "use lowercase letters for 'assume unchanged' files"
07432cef 7379msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 7380
814ff314 7381#: builtin/ls-files.c:419
ef317cd5 7382msgid "show cached files in the output (default)"
07432cef 7383msgstr "显示缓存的文件(默认)"
ef317cd5 7384
814ff314 7385#: builtin/ls-files.c:421
ef317cd5 7386msgid "show deleted files in the output"
07432cef 7387msgstr "显示已删除的文件"
ef317cd5 7388
814ff314 7389#: builtin/ls-files.c:423
ef317cd5 7390msgid "show modified files in the output"
07432cef 7391msgstr "显示已修改的文件"
ef317cd5 7392
814ff314 7393#: builtin/ls-files.c:425
ef317cd5 7394msgid "show other files in the output"
07432cef 7395msgstr "显示其它文件"
ef317cd5 7396
814ff314 7397#: builtin/ls-files.c:427
ef317cd5 7398msgid "show ignored files in the output"
07432cef 7399msgstr "显示忽略的文件"
ef317cd5 7400
814ff314 7401#: builtin/ls-files.c:430
ef317cd5 7402msgid "show staged contents' object name in the output"
07432cef 7403msgstr "显示暂存区内容的对象名称"
ef317cd5 7404
814ff314 7405#: builtin/ls-files.c:432
ef317cd5 7406msgid "show files on the filesystem that need to be removed"
07432cef 7407msgstr "显示文件系统需要删除的文件"
ef317cd5 7408
814ff314 7409#: builtin/ls-files.c:434
220c313c 7410msgid "show 'other' directories' names only"
07432cef 7411msgstr "只显示“其他”目录的名称"
ef317cd5 7412
814ff314 7413#: builtin/ls-files.c:437
ef317cd5 7414msgid "don't show empty directories"
07432cef 7415msgstr "不显示空目录"
ef317cd5 7416
814ff314 7417#: builtin/ls-files.c:440
ef317cd5 7418msgid "show unmerged files in the output"
07432cef 7419msgstr "显示未合并的文件"
ef317cd5 7420
814ff314 7421#: builtin/ls-files.c:442
ef317cd5 7422msgid "show resolve-undo information"
07432cef 7423msgstr "显示 resolve-undo 信息"
ef317cd5 7424
814ff314 7425#: builtin/ls-files.c:444
ef317cd5 7426msgid "skip files matching pattern"
07432cef 7427msgstr "匹配排除文件的模式"
ef317cd5 7428
814ff314 7429#: builtin/ls-files.c:447
ef317cd5 7430msgid "exclude patterns are read from <file>"
07432cef 7431msgstr "从 <文件> 中读取排除模式"
ef317cd5 7432
814ff314 7433#: builtin/ls-files.c:450
ef317cd5 7434msgid "read additional per-directory exclude patterns in <file>"
07432cef 7435msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 7436
814ff314 7437#: builtin/ls-files.c:452
ef317cd5 7438msgid "add the standard git exclusions"
07432cef 7439msgstr "添加标准的 git 排除"
ef317cd5 7440
814ff314 7441#: builtin/ls-files.c:455
ef317cd5 7442msgid "make the output relative to the project top directory"
07432cef 7443msgstr "显示相对于顶级目录的文件名"
ef317cd5 7444
814ff314 7445#: builtin/ls-files.c:458
ef317cd5 7446msgid "if any <file> is not in the index, treat this as an error"
07432cef 7447msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 7448
814ff314 7449#: builtin/ls-files.c:459
ef317cd5 7450msgid "tree-ish"
07432cef 7451msgstr "树或提交"
ef317cd5 7452
814ff314 7453#: builtin/ls-files.c:460
ef317cd5 7454msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 7455msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 7456
814ff314 7457#: builtin/ls-files.c:462
ef317cd5 7458msgid "show debugging data"
07432cef 7459msgstr "显示调试数据"
ef317cd5 7460
90314792 7461#: builtin/ls-tree.c:28
ef317cd5 7462msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 7463msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5 7464
04cb2f28 7465#: builtin/ls-tree.c:127
ef317cd5 7466msgid "only show trees"
07432cef 7467msgstr "只显示树"
ef317cd5 7468
04cb2f28 7469#: builtin/ls-tree.c:129
ef317cd5 7470msgid "recurse into subtrees"
07432cef 7471msgstr "递归到子树"
ef317cd5 7472
04cb2f28 7473#: builtin/ls-tree.c:131
ef317cd5 7474msgid "show trees when recursing"
07432cef 7475msgstr "当递归时显示树"
ef317cd5 7476
04cb2f28 7477#: builtin/ls-tree.c:134
ef317cd5 7478msgid "terminate entries with NUL byte"
4375c10e 7479msgstr "条目以 NUL 字符终止"
ef317cd5 7480
04cb2f28 7481#: builtin/ls-tree.c:135
ef317cd5 7482msgid "include object size"
07432cef 7483msgstr "包括对象大小"
ef317cd5 7484
04cb2f28 7485#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
ef317cd5 7486msgid "list only filenames"
07432cef 7487msgstr "只列出文件名"
ef317cd5 7488
04cb2f28 7489#: builtin/ls-tree.c:142
ef317cd5 7490msgid "use full path names"
07432cef 7491msgstr "使用文件的全路径"
ef317cd5 7492
04cb2f28 7493#: builtin/ls-tree.c:144
ef317cd5 7494msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 7495msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 7496
04cb2f28 7497#: builtin/merge.c:45
814ff314
JX
7498msgid "git merge [<options>] [<commit>...]"
7499msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 7500
04cb2f28 7501#: builtin/merge.c:46
814ff314
JX
7502msgid "git merge [<options>] <msg> HEAD <commit>"
7503msgstr "git merge [<选项>] <说明> HEAD <提交>"
ef317cd5 7504
04cb2f28 7505#: builtin/merge.c:47
ef317cd5 7506msgid "git merge --abort"
07432cef 7507msgstr "git merge --abort"
ef317cd5 7508
04cb2f28 7509#: builtin/merge.c:100
c04f5ac3
JX
7510msgid "switch `m' requires a value"
7511msgstr "开关 `m' 需要一个值"
7512
04cb2f28 7513#: builtin/merge.c:137
c04f5ac3
JX
7514#, c-format
7515msgid "Could not find merge strategy '%s'.\n"
90e6ef53 7516msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 7517
04cb2f28 7518#: builtin/merge.c:138
c04f5ac3
JX
7519#, c-format
7520msgid "Available strategies are:"
7521msgstr "可用的策略有:"
7522
04cb2f28 7523#: builtin/merge.c:143
c04f5ac3
JX
7524#, c-format
7525msgid "Available custom strategies are:"
7526msgstr "可用的自定义策略有:"
7527
1b7f4a34 7528#: builtin/merge.c:193 builtin/pull.c:119
ef317cd5 7529msgid "do not show a diffstat at the end of the merge"
07432cef 7530msgstr "在合并的最后不显示差异统计"
ef317cd5 7531
1b7f4a34 7532#: builtin/merge.c:196 builtin/pull.c:122
ef317cd5 7533msgid "show a diffstat at the end of the merge"
07432cef 7534msgstr "在合并的最后显示差异统计"
ef317cd5 7535
1b7f4a34 7536#: builtin/merge.c:197 builtin/pull.c:125
ef317cd5 7537msgid "(synonym to --stat)"
07432cef 7538msgstr "(和 --stat 同义)"
ef317cd5 7539
1b7f4a34 7540#: builtin/merge.c:199 builtin/pull.c:128
ef317cd5 7541msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 7542msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 7543
1b7f4a34 7544#: builtin/merge.c:202 builtin/pull.c:131
ef317cd5 7545msgid "create a single commit instead of doing a merge"
07432cef 7546msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 7547
1b7f4a34 7548#: builtin/merge.c:204 builtin/pull.c:134
ef317cd5 7549msgid "perform a commit if the merge succeeds (default)"
07432cef 7550msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 7551
1b7f4a34 7552#: builtin/merge.c:206 builtin/pull.c:137
ef317cd5 7553msgid "edit message before committing"
07432cef 7554msgstr "在提交前编辑提交说明"
ef317cd5 7555
04cb2f28 7556#: builtin/merge.c:207
ef317cd5 7557msgid "allow fast-forward (default)"
07432cef 7558msgstr "允许快进(默认)"
ef317cd5 7559
1b7f4a34 7560#: builtin/merge.c:209 builtin/pull.c:143
ef317cd5 7561msgid "abort if fast-forward is not possible"
07432cef 7562msgstr "如果不能快进就放弃合并"
ef317cd5 7563
04cb2f28 7564#: builtin/merge.c:213
1003b3a5
JX
7565msgid "Verify that the named commit has a valid GPG signature"
7566msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7567
1b7f4a34
JX
7568#: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148
7569#: builtin/revert.c:89
ef317cd5 7570msgid "strategy"
07432cef 7571msgstr "策略"
ef317cd5 7572
1b7f4a34 7573#: builtin/merge.c:215 builtin/pull.c:149
ef317cd5 7574msgid "merge strategy to use"
07432cef 7575msgstr "要使用的合并策略"
ef317cd5 7576
1b7f4a34 7577#: builtin/merge.c:216 builtin/pull.c:152
ef317cd5 7578msgid "option=value"
07432cef 7579msgstr "option=value"
ef317cd5 7580
1b7f4a34 7581#: builtin/merge.c:217 builtin/pull.c:153
ef317cd5 7582msgid "option for selected merge strategy"
07432cef 7583msgstr "所选的合并策略的选项"
ef317cd5 7584
04cb2f28 7585#: builtin/merge.c:219
ef317cd5 7586msgid "merge commit message (for a non-fast-forward merge)"
07432cef 7587msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 7588
04cb2f28 7589#: builtin/merge.c:223
ef317cd5 7590msgid "abort the current in-progress merge"
07432cef 7591msgstr "放弃当前正在进行的合并"
ef317cd5 7592
04cb2f28 7593#: builtin/merge.c:251
c04f5ac3
JX
7594msgid "could not run stash."
7595msgstr "不能进行进度保存。"
7596
04cb2f28 7597#: builtin/merge.c:256
c04f5ac3
JX
7598msgid "stash failed"
7599msgstr "进度保存失败"
7600
04cb2f28 7601#: builtin/merge.c:261
c04f5ac3
JX
7602#, c-format
7603msgid "not a valid object: %s"
7604msgstr "不是一个有效对象:%s"
7605
04cb2f28 7606#: builtin/merge.c:280 builtin/merge.c:297
c04f5ac3
JX
7607msgid "read-tree failed"
7608msgstr "读取树失败"
7609
90e6ef53 7610# 译者:注意保持前导空格
04cb2f28 7611#: builtin/merge.c:327
c04f5ac3
JX
7612msgid " (nothing to squash)"
7613msgstr " (无可压缩)"
7614
04cb2f28 7615#: builtin/merge.c:340
c04f5ac3
JX
7616#, c-format
7617msgid "Squash commit -- not updating HEAD\n"
7618msgstr "压缩提交 -- 未更新 HEAD\n"
7619
1b7f4a34
JX
7620#: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
7621#: builtin/merge.c:988
7622#, c-format
7623msgid "Could not write to '%s'"
7624msgstr "不能写入 '%s'"
7625
04cb2f28 7626#: builtin/merge.c:372
c04f5ac3
JX
7627msgid "Writing SQUASH_MSG"
7628msgstr "写入 SQUASH_MSG"
7629
04cb2f28 7630#: builtin/merge.c:374
c04f5ac3
JX
7631msgid "Finishing SQUASH_MSG"
7632msgstr "完成 SQUASH_MSG"
7633
04cb2f28 7634#: builtin/merge.c:397
c04f5ac3
JX
7635#, c-format
7636msgid "No merge message -- not updating HEAD\n"
7637msgstr "无合并信息 -- 未更新 HEAD\n"
7638
04cb2f28 7639#: builtin/merge.c:447
c04f5ac3
JX
7640#, c-format
7641msgid "'%s' does not point to a commit"
7642msgstr "'%s' 没有指向一个提交"
7643
7aea43ff 7644#: builtin/merge.c:537
c04f5ac3
JX
7645#, c-format
7646msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 7647msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 7648
7aea43ff 7649#: builtin/merge.c:656
c04f5ac3
JX
7650msgid "Not handling anything other than two heads merge."
7651msgstr "不能处理两个头合并之外的任何操作。"
7652
7aea43ff 7653#: builtin/merge.c:670
c04f5ac3
JX
7654#, c-format
7655msgid "Unknown option for merge-recursive: -X%s"
7656msgstr "merge-recursive 的未知选项:-X%s"
7657
7aea43ff 7658#: builtin/merge.c:683
c04f5ac3
JX
7659#, c-format
7660msgid "unable to write %s"
7661msgstr "不能写 %s"
7662
7aea43ff 7663#: builtin/merge.c:772
c04f5ac3
JX
7664#, c-format
7665msgid "Could not read from '%s'"
7666msgstr "不能从 '%s' 读取"
7667
7aea43ff 7668#: builtin/merge.c:781
c04f5ac3
JX
7669#, c-format
7670msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7671msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7672
7aea43ff 7673#: builtin/merge.c:787
a77c07d9 7674#, c-format
c04f5ac3
JX
7675msgid ""
7676"Please enter a commit message to explain why this merge is necessary,\n"
7677"especially if it merges an updated upstream into a topic branch.\n"
7678"\n"
a77c07d9 7679"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
7680"the commit.\n"
7681msgstr ""
7682"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
7683"合并到主题分支。\n"
7684"\n"
a77c07d9 7685"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 7686
7aea43ff 7687#: builtin/merge.c:811
c04f5ac3
JX
7688msgid "Empty commit message."
7689msgstr "空提交信息。"
7690
7aea43ff 7691#: builtin/merge.c:823
c04f5ac3
JX
7692#, c-format
7693msgid "Wonderful.\n"
7694msgstr "太棒了。\n"
7695
7aea43ff 7696#: builtin/merge.c:878
c04f5ac3
JX
7697#, c-format
7698msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7699msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7700
7aea43ff 7701#: builtin/merge.c:894
c04f5ac3
JX
7702#, c-format
7703msgid "'%s' is not a commit"
7704msgstr "'%s' 不是一个提交"
7705
7aea43ff 7706#: builtin/merge.c:935
c04f5ac3 7707msgid "No current branch."
90e6ef53 7708msgstr "没有当前分支。"
c04f5ac3 7709
7aea43ff 7710#: builtin/merge.c:937
c04f5ac3 7711msgid "No remote for the current branch."
160fb2b2 7712msgstr "当前分支没有对应的远程仓库。"
c04f5ac3 7713
7aea43ff 7714#: builtin/merge.c:939
c04f5ac3 7715msgid "No default upstream defined for the current branch."
90e6ef53 7716msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 7717
7aea43ff 7718#: builtin/merge.c:944
170e9899 7719#, c-format
2e8451e8
JX
7720msgid "No remote-tracking branch for %s from %s"
7721msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 7722
7aea43ff
JX
7723#: builtin/merge.c:1081
7724#, c-format
7725msgid "could not close '%s'"
7726msgstr "不能关闭 '%s'"
7727
7728#: builtin/merge.c:1208
c04f5ac3 7729msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 7730msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 7731
7aea43ff 7732#: builtin/merge.c:1224
c04f5ac3
JX
7733msgid ""
7734"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 7735"Please, commit your changes before you merge."
c04f5ac3
JX
7736msgstr ""
7737"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 7738"请在合并前先提交您的修改。"
c04f5ac3 7739
7aea43ff 7740#: builtin/merge.c:1231
c04f5ac3
JX
7741msgid ""
7742"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 7743"Please, commit your changes before you merge."
c04f5ac3
JX
7744msgstr ""
7745"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 7746"请在合并前先提交您的修改。"
c04f5ac3 7747
7aea43ff 7748#: builtin/merge.c:1234
c04f5ac3
JX
7749msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7750msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7751
7aea43ff 7752#: builtin/merge.c:1243
c04f5ac3 7753msgid "You cannot combine --squash with --no-ff."
649900bc 7754msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 7755
7aea43ff 7756#: builtin/merge.c:1251
c04f5ac3 7757msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 7758msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 7759
7aea43ff 7760#: builtin/merge.c:1268
c04f5ac3
JX
7761msgid "Squash commit into empty head not supported yet"
7762msgstr "尚不支持到空分支的压缩提交"
7763
7aea43ff 7764#: builtin/merge.c:1270
c04f5ac3
JX
7765msgid "Non-fast-forward commit does not make sense into an empty head"
7766msgstr "到空分支的非快进式提交没有意义"
7767
7aea43ff 7768#: builtin/merge.c:1276
2e8451e8
JX
7769#, c-format
7770msgid "%s - not something we can merge"
7771msgstr "%s - 不能被合并"
7772
7aea43ff
JX
7773#: builtin/merge.c:1278
7774msgid "Can merge only exactly one commit into empty head"
7775msgstr "只能将一个提交合并到空分支上"
7776
7777#: builtin/merge.c:1333
1003b3a5
JX
7778#, c-format
7779msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7780msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7781
7aea43ff 7782#: builtin/merge.c:1336
1003b3a5
JX
7783#, c-format
7784msgid "Commit %s has a bad GPG signature allegedly by %s."
7785msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7786
7aea43ff 7787#: builtin/merge.c:1339
1003b3a5
JX
7788#, c-format
7789msgid "Commit %s does not have a GPG signature."
7790msgstr "提交 %s 没有一个 GPG 签名。"
7791
7aea43ff 7792#: builtin/merge.c:1342
1003b3a5
JX
7793#, c-format
7794msgid "Commit %s has a good GPG signature by %s\n"
7795msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7796
7aea43ff 7797#: builtin/merge.c:1423
c04f5ac3
JX
7798#, c-format
7799msgid "Updating %s..%s\n"
7800msgstr "更新 %s..%s\n"
7801
7aea43ff 7802#: builtin/merge.c:1462
c04f5ac3
JX
7803#, c-format
7804msgid "Trying really trivial in-index merge...\n"
90e6ef53 7805msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 7806
7aea43ff 7807#: builtin/merge.c:1469
c04f5ac3
JX
7808#, c-format
7809msgid "Nope.\n"
7810msgstr "无。\n"
7811
7aea43ff 7812#: builtin/merge.c:1501
c04f5ac3 7813msgid "Not possible to fast-forward, aborting."
1aabac65 7814msgstr "无法快进,终止。"
c04f5ac3 7815
7aea43ff 7816#: builtin/merge.c:1524 builtin/merge.c:1603
c04f5ac3
JX
7817#, c-format
7818msgid "Rewinding the tree to pristine...\n"
7819msgstr "将树回滚至原始状态...\n"
7820
7aea43ff 7821#: builtin/merge.c:1528
c04f5ac3
JX
7822#, c-format
7823msgid "Trying merge strategy %s...\n"
7824msgstr "尝试合并策略 %s...\n"
7825
7aea43ff 7826#: builtin/merge.c:1594
c04f5ac3
JX
7827#, c-format
7828msgid "No merge strategy handled the merge.\n"
7829msgstr "没有合并策略处理此合并。\n"
7830
7aea43ff 7831#: builtin/merge.c:1596
c04f5ac3
JX
7832#, c-format
7833msgid "Merge with strategy %s failed.\n"
7834msgstr "使用策略 %s 合并失败。\n"
7835
7aea43ff 7836#: builtin/merge.c:1605
c04f5ac3
JX
7837#, c-format
7838msgid "Using the %s to prepare resolving by hand.\n"
7839msgstr "使用 %s 以准备手工解决。\n"
7840
7aea43ff 7841#: builtin/merge.c:1617
c04f5ac3
JX
7842#, c-format
7843msgid "Automatic merge went well; stopped before committing as requested\n"
7844msgstr "自动合并进展顺利,按要求在提交前停止\n"
7845
cfff71a9 7846#: builtin/merge-base.c:29
814ff314
JX
7847msgid "git merge-base [-a | --all] <commit> <commit>..."
7848msgstr "git merge-base [-a | --all] <提交> <提交>..."
ef317cd5 7849
cfff71a9 7850#: builtin/merge-base.c:30
814ff314
JX
7851msgid "git merge-base [-a | --all] --octopus <commit>..."
7852msgstr "git merge-base [-a | --all] --octopus <提交>..."
ef317cd5 7853
cfff71a9 7854#: builtin/merge-base.c:31
ef317cd5 7855msgid "git merge-base --independent <commit>..."
07432cef 7856msgstr "git merge-base --independent <提交>..."
ef317cd5 7857
cfff71a9 7858#: builtin/merge-base.c:32
ef317cd5 7859msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 7860msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5 7861
cfff71a9
JX
7862#: builtin/merge-base.c:33
7863msgid "git merge-base --fork-point <ref> [<commit>]"
d9d56b23 7864msgstr "git merge-base --fork-point <引用> [<提交>]"
cfff71a9
JX
7865
7866#: builtin/merge-base.c:214
ef317cd5 7867msgid "output all common ancestors"
07432cef 7868msgstr "输出所有共同的祖先"
ef317cd5 7869
cfff71a9 7870#: builtin/merge-base.c:216
ef317cd5 7871msgid "find ancestors for a single n-way merge"
07432cef 7872msgstr "查找一个多路合并的祖先提交"
ef317cd5 7873
cfff71a9 7874#: builtin/merge-base.c:218
ef317cd5 7875msgid "list revs not reachable from others"
07432cef 7876msgstr "显示不能被其他访问到的版本"
ef317cd5 7877
cfff71a9 7878#: builtin/merge-base.c:220
ef317cd5 7879msgid "is the first one ancestor of the other?"
07432cef 7880msgstr "第一个是其他的祖先提交么?"
ef317cd5 7881
cfff71a9
JX
7882#: builtin/merge-base.c:222
7883msgid "find where <commit> forked from reflog of <ref>"
e397e7e3 7884msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
cfff71a9 7885
ef317cd5
JX
7886#: builtin/merge-file.c:8
7887msgid ""
814ff314
JX
7888"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7889"<orig-file> <file2>"
ef317cd5 7890msgstr ""
814ff314
JX
7891"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7892"件> <文件2>"
ef317cd5
JX
7893
7894#: builtin/merge-file.c:33
7895msgid "send results to standard output"
07432cef 7896msgstr "将结果发送到标准输出"
ef317cd5
JX
7897
7898#: builtin/merge-file.c:34
7899msgid "use a diff3 based merge"
07432cef 7900msgstr "使用基于 diff3 的合并"
ef317cd5
JX
7901
7902#: builtin/merge-file.c:35
7903msgid "for conflicts, use our version"
07432cef 7904msgstr "如果冲突,使用我们的版本"
ef317cd5
JX
7905
7906#: builtin/merge-file.c:37
7907msgid "for conflicts, use their version"
07432cef 7908msgstr "如果冲突,使用他们的版本"
ef317cd5
JX
7909
7910#: builtin/merge-file.c:39
7911msgid "for conflicts, use a union version"
07432cef 7912msgstr "如果冲突,使用联合版本"
ef317cd5
JX
7913
7914#: builtin/merge-file.c:42
7915msgid "for conflicts, use this marker size"
07432cef 7916msgstr "如果冲突,使用指定长度的标记"
ef317cd5
JX
7917
7918#: builtin/merge-file.c:43
7919msgid "do not warn about conflicts"
07432cef 7920msgstr "不要警告冲突"
ef317cd5
JX
7921
7922#: builtin/merge-file.c:45
814ff314
JX
7923msgid "set labels for file1/orig-file/file2"
7924msgstr "为 文件1/初始文件/文件2 设置标签"
c04f5ac3 7925
6c94aba5 7926#: builtin/mktree.c:64
ef317cd5 7927msgid "git mktree [-z] [--missing] [--batch]"
07432cef 7928msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 7929
6c94aba5 7930#: builtin/mktree.c:150
ef317cd5 7931msgid "input is NUL terminated"
07432cef 7932msgstr "输入以 NUL 字符终止"
c04f5ac3 7933
6c94aba5 7934#: builtin/mktree.c:151 builtin/write-tree.c:24
ef317cd5 7935msgid "allow missing objects"
07432cef 7936msgstr "允许丢失的对象"
c04f5ac3 7937
6c94aba5 7938#: builtin/mktree.c:152
ef317cd5 7939msgid "allow creation of more than one tree"
07432cef 7940msgstr "允许创建一个以上的树"
c04f5ac3 7941
90314792 7942#: builtin/mv.c:15
814ff314
JX
7943msgid "git mv [<options>] <source>... <destination>"
7944msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 7945
220c313c
JX
7946#: builtin/mv.c:69
7947#, c-format
7948msgid "Directory %s is in index and no submodule?"
7949msgstr "目录 %s 在索引中并且不是子模组?"
7950
cfff71a9 7951#: builtin/mv.c:71
220c313c 7952msgid "Please stage your changes to .gitmodules or stash them to proceed"
160fb2b2 7953msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
220c313c
JX
7954
7955#: builtin/mv.c:89
7956#, c-format
7957msgid "%.*s is in index"
7958msgstr "%.*s 在索引中"
7959
7960#: builtin/mv.c:111
ef317cd5 7961msgid "force move/rename even if target exists"
07432cef 7962msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 7963
220c313c 7964#: builtin/mv.c:112
ef317cd5 7965msgid "skip move/rename errors"
07432cef 7966msgstr "跳过移动/重命名错误"
c04f5ac3 7967
220c313c
JX
7968#: builtin/mv.c:151
7969#, c-format
7970msgid "destination '%s' is not a directory"
7971msgstr "目标 '%s' 不是一个目录"
7972
7973#: builtin/mv.c:162
c04f5ac3
JX
7974#, c-format
7975msgid "Checking rename of '%s' to '%s'\n"
7976msgstr "检查 '%s' 到 '%s' 的重命名\n"
7977
220c313c 7978#: builtin/mv.c:166
c04f5ac3
JX
7979msgid "bad source"
7980msgstr "坏的源"
7981
220c313c 7982#: builtin/mv.c:169
c04f5ac3
JX
7983msgid "can not move directory into itself"
7984msgstr "不能将目录移动到自身"
7985
220c313c 7986#: builtin/mv.c:172
c04f5ac3
JX
7987msgid "cannot move directory over file"
7988msgstr "不能将目录移动到文件"
7989
220c313c 7990#: builtin/mv.c:181
c04f5ac3
JX
7991msgid "source directory is empty"
7992msgstr "源目录为空"
7993
220c313c 7994#: builtin/mv.c:206
c04f5ac3
JX
7995msgid "not under version control"
7996msgstr "不在版本控制之下"
7997
220c313c 7998#: builtin/mv.c:209
c04f5ac3
JX
7999msgid "destination exists"
8000msgstr "目标已存在"
8001
220c313c 8002#: builtin/mv.c:217
c04f5ac3
JX
8003#, c-format
8004msgid "overwriting '%s'"
8005msgstr "覆盖 '%s'"
8006
220c313c 8007#: builtin/mv.c:220
c04f5ac3
JX
8008msgid "Cannot overwrite"
8009msgstr "不能覆盖"
8010
220c313c 8011#: builtin/mv.c:223
c04f5ac3
JX
8012msgid "multiple sources for the same target"
8013msgstr "同一目标具有多个源"
8014
220c313c 8015#: builtin/mv.c:225
cfff71a9
JX
8016msgid "destination directory does not exist"
8017msgstr "目标目录不存在"
8018
220c313c 8019#: builtin/mv.c:232
c04f5ac3
JX
8020#, c-format
8021msgid "%s, source=%s, destination=%s"
8022msgstr "%s,源=%s,目标=%s"
8023
220c313c 8024#: builtin/mv.c:253
c04f5ac3
JX
8025#, c-format
8026msgid "Renaming %s to %s\n"
8027msgstr "重命名 %s 至 %s\n"
8028
1b7f4a34 8029#: builtin/mv.c:256 builtin/remote.c:722 builtin/repack.c:362
c04f5ac3
JX
8030#, c-format
8031msgid "renaming '%s' failed"
8032msgstr "重命名 '%s' 失败"
8033
6acbf033 8034#: builtin/name-rev.c:255
814ff314
JX
8035msgid "git name-rev [<options>] <commit>..."
8036msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 8037
6acbf033 8038#: builtin/name-rev.c:256
814ff314
JX
8039msgid "git name-rev [<options>] --all"
8040msgstr "git name-rev [<选项>] --all"
ef317cd5 8041
6acbf033 8042#: builtin/name-rev.c:257
814ff314
JX
8043msgid "git name-rev [<options>] --stdin"
8044msgstr "git name-rev [<选项>] --stdin"
ef317cd5 8045
6acbf033 8046#: builtin/name-rev.c:309
ef317cd5 8047msgid "print only names (no SHA-1)"
07432cef 8048msgstr "只打印名称(无 SHA-1)"
ef317cd5 8049
6acbf033 8050#: builtin/name-rev.c:310
ef317cd5 8051msgid "only use tags to name the commits"
55a16ee4 8052msgstr "只使用标签来命名提交"
ef317cd5 8053
6acbf033 8054#: builtin/name-rev.c:312
ef317cd5 8055msgid "only use refs matching <pattern>"
07432cef 8056msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 8057
6acbf033 8058#: builtin/name-rev.c:314
ef317cd5 8059msgid "list all commits reachable from all refs"
07432cef 8060msgstr "列出可以从所有引用访问的提交"
ef317cd5 8061
6acbf033 8062#: builtin/name-rev.c:315
ef317cd5 8063msgid "read from stdin"
07432cef 8064msgstr "从标准输入读取"
ef317cd5 8065
6acbf033 8066#: builtin/name-rev.c:316
90314792
JX
8067msgid "allow to print `undefined` names (default)"
8068msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 8069
6acbf033 8070#: builtin/name-rev.c:322
2e8451e8 8071msgid "dereference tags in the input (internal use)"
55a16ee4 8072msgstr "反向解析输入中的标签(内部使用)"
2e8451e8 8073
1b7f4a34 8074#: builtin/notes.c:25
814ff314 8075msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 8076msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 8077
1b7f4a34 8078#: builtin/notes.c:26
ef317cd5 8079msgid ""
814ff314 8080"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 8081"| (-c | -C) <object>] [<object>]"
ef317cd5 8082msgstr ""
04cb2f28
JX
8083"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
8084"| (-c | -C) <对象>] [<对象>]"
ef317cd5 8085
1b7f4a34 8086#: builtin/notes.c:27
814ff314 8087msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 8088msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 8089
1b7f4a34 8090#: builtin/notes.c:28
ef317cd5 8091msgid ""
814ff314 8092"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 8093"(-c | -C) <object>] [<object>]"
ef317cd5 8094msgstr ""
04cb2f28
JX
8095"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
8096"(-c | -C) <对象>] [<对象>]"
ef317cd5 8097
1b7f4a34 8098#: builtin/notes.c:29
814ff314 8099msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 8100msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 8101
1b7f4a34 8102#: builtin/notes.c:30
814ff314 8103msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 8104msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 8105
1b7f4a34 8106#: builtin/notes.c:31
ef317cd5 8107msgid ""
814ff314 8108"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 8109msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 8110
1b7f4a34 8111#: builtin/notes.c:32
ef317cd5 8112msgid "git notes merge --commit [-v | -q]"
07432cef 8113msgstr "git notes merge --commit [-v | -q]"
ef317cd5 8114
1b7f4a34 8115#: builtin/notes.c:33
ef317cd5 8116msgid "git notes merge --abort [-v | -q]"
07432cef 8117msgstr "git notes merge --abort [-v | -q]"
ef317cd5 8118
1b7f4a34 8119#: builtin/notes.c:34
814ff314 8120msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 8121msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 8122
1b7f4a34 8123#: builtin/notes.c:35
814ff314 8124msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
07432cef 8125msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
ef317cd5 8126
1b7f4a34 8127#: builtin/notes.c:36
814ff314 8128msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 8129msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 8130
1b7f4a34 8131#: builtin/notes.c:41
ef317cd5 8132msgid "git notes [list [<object>]]"
07432cef 8133msgstr "git notes [list [<对象>]]"
ef317cd5 8134
1b7f4a34 8135#: builtin/notes.c:46
ef317cd5 8136msgid "git notes add [<options>] [<object>]"
07432cef 8137msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 8138
1b7f4a34 8139#: builtin/notes.c:51
ef317cd5 8140msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 8141msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 8142
1b7f4a34 8143#: builtin/notes.c:52
ef317cd5 8144msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 8145msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 8146
1b7f4a34 8147#: builtin/notes.c:57
ef317cd5 8148msgid "git notes append [<options>] [<object>]"
07432cef 8149msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 8150
1b7f4a34 8151#: builtin/notes.c:62
ef317cd5 8152msgid "git notes edit [<object>]"
07432cef 8153msgstr "git notes edit [<对象>]"
ef317cd5 8154
1b7f4a34 8155#: builtin/notes.c:67
ef317cd5 8156msgid "git notes show [<object>]"
07432cef 8157msgstr "git notes show [<对象>]"
ef317cd5 8158
1b7f4a34 8159#: builtin/notes.c:72
814ff314 8160msgid "git notes merge [<options>] <notes-ref>"
07432cef 8161msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 8162
1b7f4a34 8163#: builtin/notes.c:73
ef317cd5 8164msgid "git notes merge --commit [<options>]"
07432cef 8165msgstr "git notes merge --commit [<选项>]"
ef317cd5 8166
1b7f4a34 8167#: builtin/notes.c:74
ef317cd5 8168msgid "git notes merge --abort [<options>]"
07432cef 8169msgstr "git notes merge --abort [<选项>]"
ef317cd5 8170
1b7f4a34 8171#: builtin/notes.c:79
ef317cd5 8172msgid "git notes remove [<object>]"
07432cef 8173msgstr "git notes remove [<对象>]"
ef317cd5 8174
1b7f4a34 8175#: builtin/notes.c:84
ef317cd5 8176msgid "git notes prune [<options>]"
07432cef 8177msgstr "git notes prune [<选项>]"
ef317cd5 8178
1b7f4a34 8179#: builtin/notes.c:89
ef317cd5 8180msgid "git notes get-ref"
07432cef 8181msgstr "git notes get-ref"
ef317cd5 8182
1b7f4a34 8183#: builtin/notes.c:147
c04f5ac3
JX
8184#, c-format
8185msgid "unable to start 'show' for object '%s'"
8186msgstr "不能为对象 '%s' 开始 'show'"
8187
1b7f4a34 8188#: builtin/notes.c:151
a77c07d9
JX
8189msgid "could not read 'show' output"
8190msgstr "不能读取 'show' 的输出"
c04f5ac3 8191
1b7f4a34 8192#: builtin/notes.c:159
c04f5ac3
JX
8193#, c-format
8194msgid "failed to finish 'show' for object '%s'"
8195msgstr "无法为对象 '%s' 完成 'show'"
8196
1b7f4a34 8197#: builtin/notes.c:174 builtin/tag.c:477
c04f5ac3
JX
8198#, c-format
8199msgid "could not create file '%s'"
8200msgstr "不能创建文件 '%s'"
8201
1b7f4a34 8202#: builtin/notes.c:193
c04f5ac3
JX
8203msgid "Please supply the note contents using either -m or -F option"
8204msgstr "请通过 -m 或 -F 选项为注解提供内容"
8205
1b7f4a34 8206#: builtin/notes.c:202
c04f5ac3
JX
8207msgid "unable to write note object"
8208msgstr "不能写注解对象"
8209
1b7f4a34 8210#: builtin/notes.c:204
c04f5ac3 8211#, c-format
220c313c
JX
8212msgid "The note contents have been left in %s"
8213msgstr "注解内容被留在 %s 中"
c04f5ac3 8214
1b7f4a34 8215#: builtin/notes.c:232 builtin/tag.c:695
c04f5ac3
JX
8216#, c-format
8217msgid "cannot read '%s'"
8218msgstr "不能读取 '%s'"
8219
1b7f4a34 8220#: builtin/notes.c:234 builtin/tag.c:698
c04f5ac3
JX
8221#, c-format
8222msgid "could not open or read '%s'"
8223msgstr "不能打开或读取 '%s'"
8224
1b7f4a34
JX
8225#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
8226#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
8227#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
8228#: builtin/notes.c:877 builtin/tag.c:711
c04f5ac3
JX
8229#, c-format
8230msgid "Failed to resolve '%s' as a valid ref."
90e6ef53 8231msgstr "无法解析 '%s' 为一个有效引用。"
c04f5ac3 8232
1b7f4a34 8233#: builtin/notes.c:256
c04f5ac3
JX
8234#, c-format
8235msgid "Failed to read object '%s'."
8236msgstr "无法读取对象 '%s'。"
8237
1b7f4a34 8238#: builtin/notes.c:260
6c94aba5
JX
8239#, c-format
8240msgid "Cannot read note data from non-blob object '%s'."
8241msgstr "不能从非数据对象 '%s' 中读取注解数据"
8242
1b7f4a34
JX
8243#: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490
8244#: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646
8245#: builtin/notes.c:942
c04f5ac3
JX
8246msgid "too many parameters"
8247msgstr "参数太多"
8248
1b7f4a34 8249#: builtin/notes.c:372 builtin/notes.c:659
c04f5ac3
JX
8250#, c-format
8251msgid "No note found for object %s."
8252msgstr "未发现对象 %s 的注解。"
8253
1b7f4a34 8254#: builtin/notes.c:393 builtin/notes.c:556
ef317cd5 8255msgid "note contents as a string"
07432cef 8256msgstr "注解内容作为一个字符串"
ef317cd5 8257
1b7f4a34 8258#: builtin/notes.c:396 builtin/notes.c:559
ef317cd5 8259msgid "note contents in a file"
07432cef 8260msgstr "注解内容到一个文件中"
ef317cd5 8261
1b7f4a34
JX
8262#: builtin/notes.c:398 builtin/notes.c:401 builtin/notes.c:561
8263#: builtin/notes.c:564 builtin/tag.c:630
ef317cd5 8264msgid "object"
07432cef 8265msgstr "对象"
ef317cd5 8266
1b7f4a34 8267#: builtin/notes.c:399 builtin/notes.c:562
ef317cd5 8268msgid "reuse and edit specified note object"
07432cef 8269msgstr "重用和编辑指定的注解对象"
ef317cd5 8270
1b7f4a34 8271#: builtin/notes.c:402 builtin/notes.c:565
ef317cd5 8272msgid "reuse specified note object"
07432cef 8273msgstr "重用指定的注解对象"
ef317cd5 8274
1b7f4a34 8275#: builtin/notes.c:405 builtin/notes.c:568
04cb2f28
JX
8276msgid "allow storing empty note"
8277msgstr "允许保存空白注释"
8278
1b7f4a34 8279#: builtin/notes.c:406 builtin/notes.c:477
ef317cd5 8280msgid "replace existing notes"
07432cef 8281msgstr "替换已存在的注解"
ef317cd5 8282
1b7f4a34 8283#: builtin/notes.c:431
c04f5ac3
JX
8284#, c-format
8285msgid ""
8286"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
8287"existing notes"
8288msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8289
1b7f4a34 8290#: builtin/notes.c:446 builtin/notes.c:525
c04f5ac3
JX
8291#, c-format
8292msgid "Overwriting existing notes for object %s\n"
8293msgstr "覆盖对象 %s 现存注解\n"
8294
1b7f4a34 8295#: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882
04cb2f28
JX
8296#, c-format
8297msgid "Removing note for object %s\n"
8298msgstr "删除对象 %s 的注解\n"
8299
1b7f4a34 8300#: builtin/notes.c:478
ef317cd5 8301msgid "read objects from stdin"
07432cef 8302msgstr "从标准输入读取对象"
ef317cd5 8303
1b7f4a34 8304#: builtin/notes.c:480
ef317cd5 8305msgid "load rewriting config for <command> (implies --stdin)"
07432cef 8306msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 8307
1b7f4a34 8308#: builtin/notes.c:498
c04f5ac3
JX
8309msgid "too few parameters"
8310msgstr "参数太少"
8311
1b7f4a34 8312#: builtin/notes.c:519
c04f5ac3
JX
8313#, c-format
8314msgid ""
8315"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
8316"existing notes"
8317msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8318
1b7f4a34 8319#: builtin/notes.c:531
c04f5ac3
JX
8320#, c-format
8321msgid "Missing notes on source object %s. Cannot copy."
8322msgstr "源对象 %s 缺少注解。不能拷贝。"
8323
1b7f4a34 8324#: builtin/notes.c:583
ef317cd5
JX
8325#, c-format
8326msgid ""
8327"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
8328"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
8329msgstr ""
8330"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
8331"请换用 'git notes add -f -m/-F/-c/-C'。\n"
8332
1b7f4a34 8333#: builtin/notes.c:764
ef317cd5 8334msgid "General options"
07432cef 8335msgstr "通用选项"
ef317cd5 8336
1b7f4a34 8337#: builtin/notes.c:766
ef317cd5 8338msgid "Merge options"
07432cef 8339msgstr "合并选项"
ef317cd5 8340
1b7f4a34 8341#: builtin/notes.c:768
ef317cd5
JX
8342msgid ""
8343"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
8344"cat_sort_uniq)"
07432cef 8345msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 8346
1b7f4a34 8347#: builtin/notes.c:770
ef317cd5 8348msgid "Committing unmerged notes"
07432cef 8349msgstr "提交未合并的注解"
ef317cd5 8350
1b7f4a34 8351#: builtin/notes.c:772
ef317cd5 8352msgid "finalize notes merge by committing unmerged notes"
07432cef 8353msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 8354
1b7f4a34 8355#: builtin/notes.c:774
ef317cd5 8356msgid "Aborting notes merge resolution"
07432cef 8357msgstr "中止注解合并的方案"
ef317cd5 8358
1b7f4a34 8359#: builtin/notes.c:776
ef317cd5 8360msgid "abort notes merge"
07432cef 8361msgstr "中止注解合并"
ef317cd5 8362
1b7f4a34
JX
8363#: builtin/notes.c:853
8364#, c-format
8365msgid "A notes merge into %s is already in-progress at %s"
8366msgstr "一个到 %s 的注解合并已经在 %s 执行中"
8367
8368#: builtin/notes.c:880
ef317cd5
JX
8369#, c-format
8370msgid "Object %s has no note\n"
8371msgstr "对象 %s 没有注解\n"
8372
1b7f4a34 8373#: builtin/notes.c:892
ef317cd5 8374msgid "attempt to remove non-existent note is not an error"
07432cef 8375msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 8376
1b7f4a34 8377#: builtin/notes.c:895
ef317cd5 8378msgid "read object names from the standard input"
07432cef 8379msgstr "从标准输入读取对象名称"
ef317cd5 8380
1b7f4a34 8381#: builtin/notes.c:976
6c94aba5 8382msgid "notes-ref"
07432cef 8383msgstr "注解引用"
ef317cd5 8384
1b7f4a34 8385#: builtin/notes.c:977
814ff314 8386msgid "use notes from <notes-ref>"
07432cef 8387msgstr "从 <注解引用> 使用注解"
ef317cd5 8388
1b7f4a34 8389#: builtin/notes.c:1012 builtin/remote.c:1588
ef317cd5
JX
8390#, c-format
8391msgid "Unknown subcommand: %s"
8392msgstr "未知子命令:%s"
8393
220c313c 8394#: builtin/pack-objects.c:28
1b7f4a34
JX
8395msgid ""
8396"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
8397msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
ef317cd5 8398
220c313c 8399#: builtin/pack-objects.c:29
1b7f4a34
JX
8400msgid ""
8401"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
8402msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
ef317cd5 8403
814ff314 8404#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
ef317cd5
JX
8405#, c-format
8406msgid "deflate error (%d)"
8407msgstr "压缩错误 (%d)"
8408
814ff314 8409#: builtin/pack-objects.c:771
6c94aba5
JX
8410msgid "Writing objects"
8411msgstr "写入对象中"
8412
7aea43ff 8413#: builtin/pack-objects.c:1011
6c94aba5
JX
8414msgid "disabling bitmap writing, as some objects are not being packed"
8415msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
8416
7aea43ff 8417#: builtin/pack-objects.c:2171
6c94aba5
JX
8418msgid "Compressing objects"
8419msgstr "压缩对象中"
8420
7aea43ff 8421#: builtin/pack-objects.c:2568
ef317cd5
JX
8422#, c-format
8423msgid "unsupported index version %s"
8424msgstr "不支持的索引版本 %s"
8425
7aea43ff 8426#: builtin/pack-objects.c:2572
ef317cd5
JX
8427#, c-format
8428msgid "bad index version '%s'"
8429msgstr "坏的索引版本 '%s'"
8430
1b7f4a34 8431#: builtin/pack-objects.c:2602
ef317cd5 8432msgid "do not show progress meter"
07432cef 8433msgstr "不显示进度表"
ef317cd5 8434
1b7f4a34 8435#: builtin/pack-objects.c:2604
ef317cd5 8436msgid "show progress meter"
07432cef 8437msgstr "显示进度表"
ef317cd5 8438
1b7f4a34 8439#: builtin/pack-objects.c:2606
ef317cd5 8440msgid "show progress meter during object writing phase"
07432cef 8441msgstr "在对象写入阶段显示进度表"
ef317cd5 8442
1b7f4a34 8443#: builtin/pack-objects.c:2609
ef317cd5 8444msgid "similar to --all-progress when progress meter is shown"
07432cef 8445msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 8446
1b7f4a34 8447#: builtin/pack-objects.c:2610
ef317cd5 8448msgid "version[,offset]"
07432cef 8449msgstr "版本[,偏移]"
ef317cd5 8450
1b7f4a34 8451#: builtin/pack-objects.c:2611
ef317cd5 8452msgid "write the pack index file in the specified idx format version"
07432cef 8453msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 8454
1b7f4a34 8455#: builtin/pack-objects.c:2614
ef317cd5 8456msgid "maximum size of each output pack file"
07432cef 8457msgstr "每个输出包的最大尺寸"
ef317cd5 8458
1b7f4a34 8459#: builtin/pack-objects.c:2616
ef317cd5 8460msgid "ignore borrowed objects from alternate object store"
160fb2b2 8461msgstr "忽略从备用对象存储里借用对象"
ef317cd5 8462
1b7f4a34 8463#: builtin/pack-objects.c:2618
ef317cd5 8464msgid "ignore packed objects"
07432cef 8465msgstr "忽略包对象"
ef317cd5 8466
1b7f4a34 8467#: builtin/pack-objects.c:2620
ef317cd5 8468msgid "limit pack window by objects"
07432cef 8469msgstr "限制打包窗口的对象数"
ef317cd5 8470
1b7f4a34 8471#: builtin/pack-objects.c:2622
ef317cd5 8472msgid "limit pack window by memory in addition to object limit"
07432cef 8473msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 8474
1b7f4a34 8475#: builtin/pack-objects.c:2624
ef317cd5 8476msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 8477msgstr "打包允许的 delta 链的最大长度"
ef317cd5 8478
1b7f4a34 8479#: builtin/pack-objects.c:2626
ef317cd5 8480msgid "reuse existing deltas"
07432cef 8481msgstr "重用已存在的 deltas"
ef317cd5 8482
1b7f4a34 8483#: builtin/pack-objects.c:2628
ef317cd5 8484msgid "reuse existing objects"
07432cef 8485msgstr "重用已存在的对象"
ef317cd5 8486
1b7f4a34 8487#: builtin/pack-objects.c:2630
ef317cd5 8488msgid "use OFS_DELTA objects"
07432cef 8489msgstr "使用 OFS_DELTA 对象"
ef317cd5 8490
1b7f4a34 8491#: builtin/pack-objects.c:2632
ef317cd5 8492msgid "use threads when searching for best delta matches"
07432cef 8493msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 8494
1b7f4a34 8495#: builtin/pack-objects.c:2634
ef317cd5 8496msgid "do not create an empty pack output"
07432cef 8497msgstr "不创建空的包输出"
ef317cd5 8498
1b7f4a34 8499#: builtin/pack-objects.c:2636
ef317cd5 8500msgid "read revision arguments from standard input"
d9d56b23 8501msgstr "从标准输入读取版本号参数"
ef317cd5 8502
1b7f4a34 8503#: builtin/pack-objects.c:2638
ef317cd5 8504msgid "limit the objects to those that are not yet packed"
07432cef 8505msgstr "限制那些尚未打包的对象"
ef317cd5 8506
1b7f4a34 8507#: builtin/pack-objects.c:2641
ef317cd5 8508msgid "include objects reachable from any reference"
07432cef 8509msgstr "包括可以从任何引用访问到的对象"
ef317cd5 8510
1b7f4a34 8511#: builtin/pack-objects.c:2644
ef317cd5 8512msgid "include objects referred by reflog entries"
07432cef 8513msgstr "包括被引用日志引用到的对象"
ef317cd5 8514
1b7f4a34 8515#: builtin/pack-objects.c:2647
220c313c
JX
8516msgid "include objects referred to by the index"
8517msgstr "包括被索引引用到的对象"
8518
1b7f4a34 8519#: builtin/pack-objects.c:2650
ef317cd5 8520msgid "output pack to stdout"
07432cef 8521msgstr "输出包到标准输出"
ef317cd5 8522
1b7f4a34 8523#: builtin/pack-objects.c:2652
ef317cd5 8524msgid "include tag objects that refer to objects to be packed"
53438e8f 8525msgstr "包括那些引用了待打包对象的标签对象"
ef317cd5 8526
1b7f4a34 8527#: builtin/pack-objects.c:2654
ef317cd5 8528msgid "keep unreachable objects"
07432cef 8529msgstr "维持不可达的对象"
ef317cd5 8530
1b7f4a34 8531#: builtin/pack-objects.c:2655 parse-options.h:142
ef317cd5
JX
8532msgid "time"
8533msgstr "时间"
8534
1b7f4a34 8535#: builtin/pack-objects.c:2656
ef317cd5 8536msgid "unpack unreachable objects newer than <time>"
07432cef 8537msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 8538
1b7f4a34 8539#: builtin/pack-objects.c:2659
ef317cd5 8540msgid "create thin packs"
07432cef 8541msgstr "创建精简包"
ef317cd5 8542
1b7f4a34 8543#: builtin/pack-objects.c:2661
04cb2f28 8544msgid "create packs suitable for shallow fetches"
160fb2b2 8545msgstr "创建适合浅克隆仓库获取的包"
04cb2f28 8546
1b7f4a34 8547#: builtin/pack-objects.c:2663
ef317cd5 8548msgid "ignore packs that have companion .keep file"
07432cef 8549msgstr "忽略配有 .keep 文件的包"
ef317cd5 8550
1b7f4a34 8551#: builtin/pack-objects.c:2665
ef317cd5 8552msgid "pack compression level"
07432cef 8553msgstr "打包压缩级别"
ef317cd5 8554
1b7f4a34 8555#: builtin/pack-objects.c:2667
ef317cd5 8556msgid "do not hide commits by grafts"
cfff71a9 8557msgstr "显示被嫁接隐藏的提交"
ef317cd5 8558
1b7f4a34 8559#: builtin/pack-objects.c:2669
6c94aba5
JX
8560msgid "use a bitmap index if available to speed up counting objects"
8561msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8562
1b7f4a34 8563#: builtin/pack-objects.c:2671
6c94aba5
JX
8564msgid "write a bitmap index together with the pack index"
8565msgstr "在建立包索引的同时创建 bitmap 索引"
8566
1b7f4a34 8567#: builtin/pack-objects.c:2762
6c94aba5
JX
8568msgid "Counting objects"
8569msgstr "对象计数中"
8570
ef317cd5 8571#: builtin/pack-refs.c:6
814ff314
JX
8572msgid "git pack-refs [<options>]"
8573msgstr "git pack-refs [<选项>]"
c04f5ac3 8574
ef317cd5
JX
8575#: builtin/pack-refs.c:14
8576msgid "pack everything"
07432cef 8577msgstr "打包一切"
c04f5ac3 8578
ef317cd5
JX
8579#: builtin/pack-refs.c:15
8580msgid "prune loose refs (default)"
07432cef 8581msgstr "清除松散的引用(默认)"
c04f5ac3 8582
ef317cd5 8583#: builtin/prune-packed.c:7
814ff314
JX
8584msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8585msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 8586
220c313c 8587#: builtin/prune-packed.c:40
6c94aba5
JX
8588msgid "Removing duplicate objects"
8589msgstr "正在删除重复对象"
8590
5bb01d4f 8591#: builtin/prune.c:11
ef317cd5 8592msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
07432cef 8593msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7ac1c0ad 8594
1b7f4a34
JX
8595#: builtin/prune.c:105 builtin/worktree.c:121
8596msgid "do not remove, show only"
8597msgstr "不删除,只显示"
8598
8599#: builtin/prune.c:106 builtin/worktree.c:122
8600msgid "report pruned objects"
8601msgstr "报告清除的对象"
8602
8603#: builtin/prune.c:109 builtin/worktree.c:124
8604msgid "expire objects older than <time>"
8605msgstr "使早于给定时间的对象过期"
8606
8607#: builtin/pull.c:69
8608msgid "git pull [options] [<repository> [<refspec>...]]"
8609msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
8610
8611#: builtin/pull.c:113
8612msgid "Options related to merging"
8613msgstr "和合并相关的选项"
8614
1b7f4a34
JX
8615#: builtin/pull.c:116
8616msgid "incorporate changes by rebasing rather than merging"
8617msgstr "使用变基操作取代合并操作以合入修改"
8618
8619#: builtin/pull.c:140 builtin/revert.c:105
8620msgid "allow fast-forward"
8621msgstr "允许快进式"
8622
8623#: builtin/pull.c:146
8624msgid "verify that the named commit has a valid GPG signature"
8625msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
8626
8627#: builtin/pull.c:160
8628msgid "Options related to fetching"
8629msgstr "和获取相关的参数"
8630
8631#: builtin/pull.c:268
8632#, c-format
8633msgid "Invalid value for pull.ff: %s"
8634msgstr "pull.ff 的取值无效:%s"
8635
8636#: builtin/pull.c:352
8637msgid "Cannot pull with rebase: You have unstaged changes."
8638msgstr "无法通过变基方式拉取:您有未暂存的变更。"
8639
8640#: builtin/pull.c:358
8641msgid "Additionally, your index contains uncommitted changes."
8642msgstr "而且您的索引中包含未提交的变更。"
8643
8644#: builtin/pull.c:360
8645msgid "Cannot pull with rebase: Your index contains uncommitted changes."
8646msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
8647
8648#: builtin/pull.c:436
8649msgid ""
8650"There is no candidate for rebasing against among the refs that you just "
8651"fetched."
8652msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
8653
8654#: builtin/pull.c:438
8655msgid ""
8656"There are no candidates for merging among the refs that you just fetched."
8657msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
8658
8659#: builtin/pull.c:439
8660msgid ""
8661"Generally this means that you provided a wildcard refspec which had no\n"
8662"matches on the remote end."
8663msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
8664
8665#: builtin/pull.c:442
8666#, c-format
8667msgid ""
8668"You asked to pull from the remote '%s', but did not specify\n"
8669"a branch. Because this is not the default configured remote\n"
8670"for your current branch, you must specify a branch on the command line."
8671msgstr ""
8672"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
8673"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
8674
8675#: builtin/pull.c:447
8676msgid "You are not currently on a branch."
8677msgstr "您当前不在一个分支上。"
8678
8679#: builtin/pull.c:449 builtin/pull.c:464
8680msgid "Please specify which branch you want to rebase against."
8681msgstr "请指定您要变基到哪一个分支。"
8682
8683#: builtin/pull.c:451 builtin/pull.c:466
8684msgid "Please specify which branch you want to merge with."
8685msgstr "请指定您要合并哪一个分支。"
8686
8687#: builtin/pull.c:452 builtin/pull.c:467
8688msgid "See git-pull(1) for details."
8689msgstr "详见 git-pull(1)。"
8690
8691#: builtin/pull.c:462
8692msgid "There is no tracking information for the current branch."
8693msgstr "当前分支没有跟踪信息。"
8694
8695#: builtin/pull.c:471
8696#, c-format
8697msgid ""
8698"If you wish to set tracking information for this branch you can do so with:\n"
8699"\n"
8700" git branch --set-upstream-to=%s/<branch> %s\n"
8701msgstr ""
8702"如果您想要为此分支创建跟踪信息,您可以执行:\n"
8703"\n"
8704" git branch --set-upstream-to=%s/<branch> %s\n"
7ac1c0ad 8705
1b7f4a34
JX
8706#: builtin/pull.c:476
8707#, c-format
8708msgid ""
8709"Your configuration specifies to merge with the ref '%s'\n"
8710"from the remote, but no such ref was fetched."
8711msgstr ""
8712"您的配置中指定要合并远程的引用 '%s',\n"
8713"但是没有获取到这个引用。"
7ac1c0ad 8714
1b7f4a34
JX
8715#: builtin/pull.c:830
8716msgid "Updating an unborn branch with changes added to the index."
8717msgstr "更新尚未诞生的分支,变更添加至索引。"
8718
8719#: builtin/pull.c:859
8720#, c-format
8721msgid ""
8722"fetch updated the current branch head.\n"
8723"fast-forwarding your working tree from\n"
8724"commit %s."
8725msgstr ""
8726"fetch 更新了当前的分支。快进您的工作区\n"
8727"至提交 %s。"
ef317cd5 8728
1b7f4a34
JX
8729#: builtin/pull.c:864
8730#, c-format
8731msgid ""
8732"Cannot fast-forward your working tree.\n"
8733"After making sure that you saved anything precious from\n"
8734"$ git diff %s\n"
8735"output, run\n"
8736"$ git reset --hard\n"
8737"to recover."
8738msgstr ""
8739"您当前的工作区无法执行快进操作。\n"
8740"首先执行如下命令:\n"
8741"$ git diff %s\n"
8742"以确认所有有用的数据均已保存。然后执行下面的命令\n"
8743"$ git reset --hard\n"
8744"恢复之前的状态。"
8745
8746#: builtin/pull.c:879
8747msgid "Cannot merge multiple branches into empty head."
8748msgstr "无法将多个分支合并到空分支。"
8749
8750#: builtin/pull.c:883
8751msgid "Cannot rebase onto multiple branches."
8752msgstr "无法变基到多个分支。"
8753
8754#: builtin/push.c:15
ef317cd5 8755msgid "git push [<options>] [<repository> [<refspec>...]]"
160fb2b2 8756msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
7ac1c0ad 8757
1b7f4a34 8758#: builtin/push.c:86
c04f5ac3 8759msgid "tag shorthand without <tag>"
55a16ee4 8760msgstr "标签后面未提供 <标签> 参数"
c04f5ac3 8761
1b7f4a34 8762#: builtin/push.c:96
c04f5ac3 8763msgid "--delete only accepts plain target ref names"
90e6ef53 8764msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 8765
1b7f4a34 8766#: builtin/push.c:140
8ada9598
JX
8767msgid ""
8768"\n"
8769"To choose either option permanently, see push.default in 'git help config'."
8770msgstr ""
81809b99
JX
8771"\n"
8772"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 8773
1b7f4a34 8774#: builtin/push.c:143
8ada9598
JX
8775#, c-format
8776msgid ""
8777"The upstream branch of your current branch does not match\n"
8778"the name of your current branch. To push to the upstream branch\n"
8779"on the remote, use\n"
8780"\n"
8781" git push %s HEAD:%s\n"
8782"\n"
8783"To push to the branch of the same name on the remote, use\n"
8784"\n"
8785" git push %s %s\n"
8786"%s"
8787msgstr ""
81809b99
JX
8788"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
8789"上游分支,使用\n"
8790"\n"
8791" git push %s HEAD:%s\n"
8792"\n"
8793"为推送至远程同名分支,使用\n"
8794"\n"
8795" git push %s %s\n"
8796"%s"
8ada9598 8797
1b7f4a34 8798#: builtin/push.c:158
c04f5ac3
JX
8799#, c-format
8800msgid ""
8801"You are not currently on a branch.\n"
8802"To push the history leading to the current (detached HEAD)\n"
8803"state now, use\n"
8804"\n"
8805" git push %s HEAD:<name-of-remote-branch>\n"
8806msgstr ""
8807"您当前不在一个分支上。\n"
90e6ef53 8808"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 8809"\n"
d9d56b23 8810" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 8811
1b7f4a34 8812#: builtin/push.c:172
c04f5ac3
JX
8813#, c-format
8814msgid ""
8815"The current branch %s has no upstream branch.\n"
8816"To push the current branch and set the remote as upstream, use\n"
8817"\n"
8818" git push --set-upstream %s %s\n"
8819msgstr ""
8820"当前分支 %s 没有对应的上游分支。\n"
8821"为推送当前分支并建立与远程上游的跟踪,使用\n"
8822"\n"
8823" git push --set-upstream %s %s\n"
8824
1b7f4a34 8825#: builtin/push.c:180
c04f5ac3
JX
8826#, c-format
8827msgid "The current branch %s has multiple upstream branches, refusing to push."
8828msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8829
1b7f4a34 8830#: builtin/push.c:183
73a60cd2
JX
8831#, c-format
8832msgid ""
8833"You are pushing to remote '%s', which is not the upstream of\n"
8834"your current branch '%s', without telling me what to push\n"
8835"to update which remote branch."
8836msgstr ""
8837"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8838"而没有告诉我要推送什么、更新哪个远程分支。"
8839
c160d03f 8840# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
1b7f4a34 8841#: builtin/push.c:206
c160d03f 8842msgid ""
6c94aba5 8843"push.default is unset; its implicit value has changed in\n"
c160d03f 8844"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6c94aba5 8845"and maintain the traditional behavior, use:\n"
c160d03f
JX
8846"\n"
8847" git config --global push.default matching\n"
8848"\n"
8849"To squelch this message and adopt the new behavior now, use:\n"
8850"\n"
8851" git config --global push.default simple\n"
8852"\n"
cfff71a9
JX
8853"When push.default is set to 'matching', git will push local branches\n"
8854"to the remote branches that already exist with the same name.\n"
8855"\n"
6c94aba5 8856"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
cfff71a9
JX
8857"behavior, which only pushes the current branch to the corresponding\n"
8858"remote branch that 'git pull' uses to update the current branch.\n"
8859"\n"
c160d03f
JX
8860"See 'git help config' and search for 'push.default' for further "
8861"information.\n"
8862"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8863"'current' instead of 'simple' if you sometimes use older versions of Git)"
8864msgstr ""
6c94aba5 8865"push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
cfff71a9 8866"变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
c160d03f
JX
8867"\n"
8868" git config --global push.default matching\n"
8869"\n"
8870"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8871"\n"
8872" git config --global push.default simple\n"
8873"\n"
cfff71a9
JX
8874"当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8875"本地分支。\n"
8876"\n"
160fb2b2 8877"从 Git 2.0 开始,Git 默认采用更为保守的 'simple' 模式,只推送当前\n"
cfff71a9
JX
8878"分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8879"\n"
c160d03f
JX
8880"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8881"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
90314792 8882"为保持兼容,请用 'current' 代替 'simple')"
c160d03f 8883
1b7f4a34 8884#: builtin/push.c:273
c04f5ac3
JX
8885msgid ""
8886"You didn't specify any refspecs to push, and push.default is \"nothing\"."
160fb2b2 8887msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
c04f5ac3 8888
1b7f4a34 8889#: builtin/push.c:280
170e9899
JX
8890msgid ""
8891"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
8892"its remote counterpart. Integrate the remote changes (e.g.\n"
8893"'git pull ...') before pushing again.\n"
170e9899
JX
8894"See the 'Note about fast-forwards' in 'git push --help' for details."
8895msgstr ""
eff6d3a9 8896"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 8897"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 8898"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 8899
1b7f4a34 8900#: builtin/push.c:286
170e9899
JX
8901msgid ""
8902"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
8903"counterpart. Check out this branch and integrate the remote changes\n"
8904"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
8905"See the 'Note about fast-forwards' in 'git push --help' for details."
8906msgstr ""
eff6d3a9 8907"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 8908"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 8909"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 8910
1b7f4a34 8911#: builtin/push.c:292
07432cef 8912msgid ""
a77c07d9
JX
8913"Updates were rejected because the remote contains work that you do\n"
8914"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
8915"to the same ref. You may want to first integrate the remote changes\n"
8916"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
8917"See the 'Note about fast-forwards' in 'git push --help' for details."
8918msgstr ""
160fb2b2
JX
8919"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
8920"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
2e8451e8 8921"(如 'git pull ...')。\n"
a77c07d9
JX
8922"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8923
1b7f4a34 8924#: builtin/push.c:299
a77c07d9 8925msgid "Updates were rejected because the tag already exists in the remote."
55a16ee4 8926msgstr "更新被拒绝,因为该标签在远程已经存在。"
a77c07d9 8927
1b7f4a34 8928#: builtin/push.c:302
a77c07d9
JX
8929msgid ""
8930"You cannot update a remote ref that points at a non-commit object,\n"
8931"or update a remote ref to make it point at a non-commit object,\n"
8932"without using the '--force' option.\n"
8933msgstr ""
8934"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
8935"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 8936
1b7f4a34 8937#: builtin/push.c:361
c04f5ac3
JX
8938#, c-format
8939msgid "Pushing to %s\n"
8940msgstr "推送到 %s\n"
8941
1b7f4a34 8942#: builtin/push.c:365
c04f5ac3
JX
8943#, c-format
8944msgid "failed to push some refs to '%s'"
8945msgstr "无法推送一些引用到 '%s'"
8946
1b7f4a34 8947#: builtin/push.c:395
c04f5ac3
JX
8948#, c-format
8949msgid "bad repository '%s'"
160fb2b2 8950msgstr "坏的仓库 '%s'"
c04f5ac3 8951
1b7f4a34 8952#: builtin/push.c:396
c04f5ac3
JX
8953msgid ""
8954"No configured push destination.\n"
8955"Either specify the URL from the command-line or configure a remote "
8956"repository using\n"
8957"\n"
8958" git remote add <name> <url>\n"
8959"\n"
8960"and then push using the remote name\n"
8961"\n"
8962" git push <name>\n"
8963msgstr ""
90e6ef53 8964"没有配置推送目标。\n"
4375c10e 8965"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
c04f5ac3 8966"\n"
d9d56b23 8967" git remote add <名称> <地址>\n"
c04f5ac3 8968"\n"
160fb2b2 8969"然后使用该远程仓库名执行推送\n"
c04f5ac3 8970"\n"
d9d56b23 8971" git push <名称>\n"
c04f5ac3 8972
1b7f4a34 8973#: builtin/push.c:411
c04f5ac3
JX
8974msgid "--all and --tags are incompatible"
8975msgstr "--all 和 --tags 不兼容"
8976
1b7f4a34 8977#: builtin/push.c:412
c04f5ac3 8978msgid "--all can't be combined with refspecs"
160fb2b2 8979msgstr "--all 不能和引用规格同时使用"
c04f5ac3 8980
1b7f4a34 8981#: builtin/push.c:417
c04f5ac3
JX
8982msgid "--mirror and --tags are incompatible"
8983msgstr "--mirror 和 --tags 不兼容"
8984
1b7f4a34 8985#: builtin/push.c:418
c04f5ac3 8986msgid "--mirror can't be combined with refspecs"
160fb2b2 8987msgstr "--mirror 不能和引用规格同时使用"
c04f5ac3 8988
1b7f4a34 8989#: builtin/push.c:423
c04f5ac3
JX
8990msgid "--all and --mirror are incompatible"
8991msgstr "--all 和 --mirror 不兼容"
8992
1b7f4a34 8993#: builtin/push.c:539
ef317cd5 8994msgid "repository"
160fb2b2 8995msgstr "仓库"
ef317cd5 8996
1b7f4a34 8997#: builtin/push.c:540 builtin/send-pack.c:161
ef317cd5 8998msgid "push all refs"
07432cef 8999msgstr "推送所有引用"
ef317cd5 9000
1b7f4a34 9001#: builtin/push.c:541 builtin/send-pack.c:163
ef317cd5 9002msgid "mirror all refs"
07432cef 9003msgstr "镜像所有引用"
ef317cd5 9004
1b7f4a34 9005#: builtin/push.c:543
ef317cd5 9006msgid "delete refs"
07432cef 9007msgstr "删除引用"
ef317cd5 9008
1b7f4a34 9009#: builtin/push.c:544
ef317cd5 9010msgid "push tags (can't be used with --all or --mirror)"
55a16ee4 9011msgstr "推送标签(不能使用 --all or --mirror)"
ef317cd5 9012
1b7f4a34 9013#: builtin/push.c:547 builtin/send-pack.c:164
ef317cd5
JX
9014msgid "force updates"
9015msgstr "强制更新"
9016
1b7f4a34 9017#: builtin/push.c:549 builtin/send-pack.c:175
90314792
JX
9018msgid "refname>:<expect"
9019msgstr "引用名>:<期望值"
9020
1b7f4a34 9021#: builtin/push.c:550 builtin/send-pack.c:176
90314792
JX
9022msgid "require old value of ref to be at this value"
9023msgstr "要求引用旧的取值为设定值"
9024
1b7f4a34 9025#: builtin/push.c:553
ef317cd5 9026msgid "control recursive pushing of submodules"
07432cef 9027msgstr "控制子模组的递归推送"
ef317cd5 9028
1b7f4a34 9029#: builtin/push.c:555 builtin/send-pack.c:169
ef317cd5 9030msgid "use thin pack"
07432cef 9031msgstr "使用精简打包"
ef317cd5 9032
1b7f4a34
JX
9033#: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158
9034#: builtin/send-pack.c:159
ef317cd5 9035msgid "receive pack program"
07432cef 9036msgstr "接收包程序"
ef317cd5 9037
1b7f4a34 9038#: builtin/push.c:558
ef317cd5 9039msgid "set upstream for git pull/status"
07432cef 9040msgstr "设置 git pull/status 的上游"
ef317cd5 9041
1b7f4a34 9042#: builtin/push.c:561
ef317cd5 9043msgid "prune locally removed refs"
07432cef 9044msgstr "清除本地删除的引用"
ef317cd5 9045
1b7f4a34 9046#: builtin/push.c:563
a77c07d9
JX
9047msgid "bypass pre-push hook"
9048msgstr "绕过 pre-push 钩子"
9049
1b7f4a34 9050#: builtin/push.c:564
1003b3a5 9051msgid "push missing but relevant tags"
55a16ee4 9052msgstr "推送缺失但有关的标签"
1003b3a5 9053
1b7f4a34 9054#: builtin/push.c:567 builtin/send-pack.c:166
220c313c
JX
9055msgid "GPG sign the push"
9056msgstr "用 GPG 为推送签名"
9057
1b7f4a34 9058#: builtin/push.c:569 builtin/send-pack.c:170
814ff314
JX
9059msgid "request atomic transaction on remote side"
9060msgstr "需要远端支持原子事务"
9061
1b7f4a34 9062#: builtin/push.c:579
c04f5ac3
JX
9063msgid "--delete is incompatible with --all, --mirror and --tags"
9064msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
9065
1b7f4a34 9066#: builtin/push.c:581
c04f5ac3
JX
9067msgid "--delete doesn't make sense without any refs"
9068msgstr "--delete 未接任何引用没有意义"
9069
220c313c 9070#: builtin/read-tree.c:37
ef317cd5 9071msgid ""
1b7f4a34 9072"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
ef317cd5
JX
9073"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9074"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
9075msgstr ""
1b7f4a34 9076"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
07432cef 9077"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
1b7f4a34 9078"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
ef317cd5 9079
220c313c 9080#: builtin/read-tree.c:110
ef317cd5 9081msgid "write resulting index to <file>"
d9d56b23 9082msgstr "将索引结果写入 <文件>"
ef317cd5 9083
220c313c 9084#: builtin/read-tree.c:113
ef317cd5 9085msgid "only empty the index"
07432cef 9086msgstr "只是清空索引"
ef317cd5 9087
220c313c 9088#: builtin/read-tree.c:115
ef317cd5 9089msgid "Merging"
07432cef 9090msgstr "合并"
ef317cd5 9091
220c313c 9092#: builtin/read-tree.c:117
ef317cd5 9093msgid "perform a merge in addition to a read"
07432cef 9094msgstr "读取之余再执行一个合并"
ef317cd5 9095
220c313c 9096#: builtin/read-tree.c:119
ef317cd5 9097msgid "3-way merge if no file level merging required"
160fb2b2 9098msgstr "如果没有文件级合并需要,执行三方合并"
ef317cd5 9099
220c313c 9100#: builtin/read-tree.c:121
ef317cd5 9101msgid "3-way merge in presence of adds and removes"
160fb2b2 9102msgstr "存在添加和删除时,也执行三方合并"
ef317cd5 9103
220c313c 9104#: builtin/read-tree.c:123
ef317cd5 9105msgid "same as -m, but discard unmerged entries"
07432cef 9106msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 9107
220c313c 9108#: builtin/read-tree.c:124
ef317cd5 9109msgid "<subdirectory>/"
07432cef 9110msgstr "<子目录>/"
ef317cd5 9111
220c313c 9112#: builtin/read-tree.c:125
ef317cd5 9113msgid "read the tree into the index under <subdirectory>/"
07432cef 9114msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 9115
220c313c 9116#: builtin/read-tree.c:128
ef317cd5 9117msgid "update working tree with merge result"
07432cef 9118msgstr "用合并的结果更新工作区"
ef317cd5 9119
220c313c 9120#: builtin/read-tree.c:130
ef317cd5 9121msgid "gitignore"
07432cef 9122msgstr "gitignore"
ef317cd5 9123
220c313c 9124#: builtin/read-tree.c:131
ef317cd5 9125msgid "allow explicitly ignored files to be overwritten"
07432cef 9126msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 9127
220c313c 9128#: builtin/read-tree.c:134
ef317cd5 9129msgid "don't check the working tree after merging"
07432cef 9130msgstr "合并后不检查工作区"
ef317cd5 9131
220c313c 9132#: builtin/read-tree.c:135
ef317cd5 9133msgid "don't update the index or the work tree"
07432cef 9134msgstr "不更新索引区和工作区"
ef317cd5 9135
220c313c 9136#: builtin/read-tree.c:137
ef317cd5 9137msgid "skip applying sparse checkout filter"
07432cef 9138msgstr "跳过应用稀疏检出过滤器"
ef317cd5 9139
220c313c 9140#: builtin/read-tree.c:139
ef317cd5 9141msgid "debug unpack-trees"
07432cef 9142msgstr "调试 unpack-trees"
ef317cd5 9143
1b7f4a34 9144#: builtin/reflog.c:432
2e8451e8 9145#, c-format
1b7f4a34 9146msgid "'%s' for '%s' is not a valid timestamp"
2e8451e8
JX
9147msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
9148
1b7f4a34 9149#: builtin/reflog.c:549 builtin/reflog.c:554
2e8451e8
JX
9150#, c-format
9151msgid "'%s' is not a valid timestamp"
9152msgstr "'%s' 不是一个有效的时间戳"
9153
cfff71a9 9154#: builtin/remote.c:12
ef317cd5 9155msgid "git remote [-v | --verbose]"
07432cef 9156msgstr "git remote [-v | --verbose]"
ef317cd5 9157
cfff71a9 9158#: builtin/remote.c:13
ef317cd5 9159msgid ""
814ff314 9160"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
9161"mirror=<fetch|push>] <name> <url>"
9162msgstr ""
814ff314 9163"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 9164"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 9165
cfff71a9 9166#: builtin/remote.c:14 builtin/remote.c:33
ef317cd5 9167msgid "git remote rename <old> <new>"
07432cef 9168msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 9169
cfff71a9 9170#: builtin/remote.c:15 builtin/remote.c:38
ef317cd5 9171msgid "git remote remove <name>"
07432cef 9172msgstr "git remote remove <名称>"
ef317cd5 9173
814ff314
JX
9174#: builtin/remote.c:16 builtin/remote.c:43
9175msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
9176msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 9177
cfff71a9 9178#: builtin/remote.c:17
ef317cd5 9179msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 9180msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 9181
cfff71a9 9182#: builtin/remote.c:18
ef317cd5 9183msgid "git remote prune [-n | --dry-run] <name>"
07432cef 9184msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 9185
cfff71a9 9186#: builtin/remote.c:19
ef317cd5
JX
9187msgid ""
9188"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 9189msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 9190
cfff71a9 9191#: builtin/remote.c:20
ef317cd5 9192msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 9193msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 9194
cfff71a9 9195#: builtin/remote.c:21 builtin/remote.c:69
ef317cd5 9196msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 9197msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 9198
cfff71a9 9199#: builtin/remote.c:22 builtin/remote.c:70
ef317cd5 9200msgid "git remote set-url --add <name> <newurl>"
07432cef 9201msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 9202
cfff71a9 9203#: builtin/remote.c:23 builtin/remote.c:71
ef317cd5 9204msgid "git remote set-url --delete <name> <url>"
07432cef 9205msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 9206
cfff71a9 9207#: builtin/remote.c:28
ef317cd5 9208msgid "git remote add [<options>] <name> <url>"
07432cef 9209msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 9210
cfff71a9 9211#: builtin/remote.c:48
ef317cd5 9212msgid "git remote set-branches <name> <branch>..."
07432cef 9213msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 9214
cfff71a9 9215#: builtin/remote.c:49
ef317cd5 9216msgid "git remote set-branches --add <name> <branch>..."
07432cef 9217msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 9218
cfff71a9 9219#: builtin/remote.c:54
ef317cd5 9220msgid "git remote show [<options>] <name>"
07432cef 9221msgstr "git remote show [<选项>] <名称>"
ef317cd5 9222
cfff71a9 9223#: builtin/remote.c:59
ef317cd5 9224msgid "git remote prune [<options>] <name>"
07432cef 9225msgstr "git remote prune [<选项>] <名称>"
ef317cd5 9226
cfff71a9 9227#: builtin/remote.c:64
ef317cd5 9228msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 9229msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 9230
cfff71a9 9231#: builtin/remote.c:88
81809b99 9232#, c-format
8ada9598 9233msgid "Updating %s"
81809b99 9234msgstr "更新 %s 中"
8ada9598 9235
cfff71a9 9236#: builtin/remote.c:120
8ada9598
JX
9237msgid ""
9238"--mirror is dangerous and deprecated; please\n"
9239"\t use --mirror=fetch or --mirror=push instead"
9240msgstr ""
81809b99
JX
9241"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
9242"\t 或 --mirror=push"
8ada9598 9243
cfff71a9 9244#: builtin/remote.c:137
81809b99 9245#, c-format
8ada9598 9246msgid "unknown mirror argument: %s"
81809b99 9247msgstr "未知的镜像参数:%s"
8ada9598 9248
cfff71a9 9249#: builtin/remote.c:153
ef317cd5 9250msgid "fetch the remote branches"
07432cef 9251msgstr "抓取远程的分支"
ef317cd5 9252
cfff71a9 9253#: builtin/remote.c:155
ef317cd5 9254msgid "import all tags and associated objects when fetching"
55a16ee4 9255msgstr "抓取时导入所有的标签和关联对象"
ef317cd5 9256
cfff71a9 9257#: builtin/remote.c:158
ef317cd5 9258msgid "or do not fetch any tag at all (--no-tags)"
55a16ee4 9259msgstr "或不抓取任何标签(--no-tags)"
ef317cd5 9260
cfff71a9 9261#: builtin/remote.c:160
ef317cd5 9262msgid "branch(es) to track"
07432cef 9263msgstr "跟踪的分支"
ef317cd5 9264
cfff71a9 9265#: builtin/remote.c:161
ef317cd5 9266msgid "master branch"
07432cef 9267msgstr "主线分支"
ef317cd5 9268
cfff71a9 9269#: builtin/remote.c:162
ef317cd5 9270msgid "push|fetch"
07432cef 9271msgstr "push|fetch"
ef317cd5 9272
cfff71a9 9273#: builtin/remote.c:163
ef317cd5 9274msgid "set up remote as a mirror to push to or fetch from"
07432cef 9275msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 9276
cfff71a9 9277#: builtin/remote.c:175
8ada9598 9278msgid "specifying a master branch makes no sense with --mirror"
81809b99 9279msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 9280
cfff71a9 9281#: builtin/remote.c:177
8ada9598 9282msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 9283msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 9284
1b7f4a34 9285#: builtin/remote.c:187 builtin/remote.c:637
81809b99 9286#, c-format
8ada9598 9287msgid "remote %s already exists."
81809b99 9288msgstr "远程 %s 已经存在。"
8ada9598 9289
1b7f4a34 9290#: builtin/remote.c:191 builtin/remote.c:641
81809b99 9291#, c-format
8ada9598 9292msgid "'%s' is not a valid remote name"
81809b99 9293msgstr "'%s' 不是一个有效的远程名称"
8ada9598 9294
d9d56b23 9295#: builtin/remote.c:235
81809b99 9296#, c-format
8ada9598 9297msgid "Could not setup master '%s'"
81809b99 9298msgstr "无法设置 master '%s'"
8ada9598 9299
d9d56b23 9300#: builtin/remote.c:335
81809b99 9301#, c-format
8ada9598 9302msgid "Could not get fetch map for refspec %s"
160fb2b2 9303msgstr "无法得到引用规格 %s 的获取列表"
8ada9598 9304
d9d56b23 9305#: builtin/remote.c:436 builtin/remote.c:444
8ada9598 9306msgid "(matching)"
81809b99 9307msgstr "(匹配)"
8ada9598 9308
d9d56b23 9309#: builtin/remote.c:448
8ada9598 9310msgid "(delete)"
81809b99 9311msgstr "(删除)"
8ada9598 9312
1b7f4a34 9313#: builtin/remote.c:588 builtin/remote.c:594 builtin/remote.c:600
81809b99 9314#, c-format
8ada9598 9315msgid "Could not append '%s' to '%s'"
81809b99 9316msgstr "不能添加 '%s' 至 '%s'"
8ada9598 9317
1b7f4a34 9318#: builtin/remote.c:630 builtin/remote.c:769 builtin/remote.c:869
81809b99 9319#, c-format
8ada9598 9320msgid "No such remote: %s"
81809b99 9321msgstr "没有这样的远程:%s"
8ada9598 9322
1b7f4a34 9323#: builtin/remote.c:647
81809b99 9324#, c-format
8ada9598 9325msgid "Could not rename config section '%s' to '%s'"
81809b99 9326msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 9327
1b7f4a34 9328#: builtin/remote.c:653 builtin/remote.c:821
81809b99 9329#, c-format
8ada9598 9330msgid "Could not remove config section '%s'"
81809b99 9331msgstr "不能移除配置小节 '%s'"
8ada9598 9332
1b7f4a34 9333#: builtin/remote.c:668
8ada9598
JX
9334#, c-format
9335msgid ""
d691f479 9336"Not updating non-default fetch refspec\n"
8ada9598
JX
9337"\t%s\n"
9338"\tPlease update the configuration manually if necessary."
9339msgstr ""
160fb2b2 9340"没有更新非默认的获取引用规格\n"
81809b99
JX
9341"\t%s\n"
9342"\t如果必要请手动更新配置。"
8ada9598 9343
1b7f4a34 9344#: builtin/remote.c:674
81809b99 9345#, c-format
8ada9598 9346msgid "Could not append '%s'"
81809b99 9347msgstr "不能追加 '%s'"
8ada9598 9348
1b7f4a34 9349#: builtin/remote.c:685
81809b99 9350#, c-format
8ada9598 9351msgid "Could not set '%s'"
81809b99 9352msgstr "不能设置 '%s'"
8ada9598 9353
1b7f4a34 9354#: builtin/remote.c:707
81809b99 9355#, c-format
8ada9598 9356msgid "deleting '%s' failed"
81809b99 9357msgstr "删除 '%s' 失败"
8ada9598 9358
1b7f4a34 9359#: builtin/remote.c:741
81809b99 9360#, c-format
8ada9598 9361msgid "creating '%s' failed"
81809b99 9362msgstr "创建 '%s' 失败"
8ada9598 9363
1b7f4a34 9364#: builtin/remote.c:807
8ada9598
JX
9365msgid ""
9366"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
9367"to delete it, use:"
9368msgid_plural ""
9369"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
9370"to delete them, use:"
5ae481e0
JX
9371msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
9372msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 9373
1b7f4a34 9374#: builtin/remote.c:922
8ada9598
JX
9375#, c-format
9376msgid " new (next fetch will store in remotes/%s)"
81809b99 9377msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 9378
1b7f4a34 9379#: builtin/remote.c:925
8ada9598 9380msgid " tracked"
81809b99 9381msgstr " 已跟踪"
8ada9598 9382
1b7f4a34 9383#: builtin/remote.c:927
8ada9598 9384msgid " stale (use 'git remote prune' to remove)"
81809b99 9385msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 9386
1b7f4a34 9387#: builtin/remote.c:929
8ada9598 9388msgid " ???"
81809b99 9389msgstr " ???"
8ada9598 9390
1b7f4a34 9391#: builtin/remote.c:970
8ada9598
JX
9392#, c-format
9393msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 9394msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 9395
1b7f4a34 9396#: builtin/remote.c:977
81809b99 9397#, c-format
8ada9598 9398msgid "rebases onto remote %s"
81809b99 9399msgstr "变基到远程 %s"
8ada9598 9400
1b7f4a34 9401#: builtin/remote.c:980
81809b99 9402#, c-format
8ada9598 9403msgid " merges with remote %s"
81809b99 9404msgstr " 与远程 %s 合并"
8ada9598 9405
1b7f4a34 9406#: builtin/remote.c:981
8ada9598 9407msgid " and with remote"
81809b99 9408msgstr " 且有远程"
8ada9598 9409
1b7f4a34 9410#: builtin/remote.c:983
81809b99 9411#, c-format
8ada9598 9412msgid "merges with remote %s"
81809b99 9413msgstr "与远程 %s 合并"
8ada9598 9414
1b7f4a34 9415#: builtin/remote.c:984
8ada9598 9416msgid " and with remote"
81809b99 9417msgstr " 且有远程"
8ada9598 9418
1b7f4a34 9419#: builtin/remote.c:1030
8ada9598 9420msgid "create"
81809b99 9421msgstr "创建"
8ada9598 9422
1b7f4a34 9423#: builtin/remote.c:1033
8ada9598 9424msgid "delete"
81809b99 9425msgstr "删除"
8ada9598 9426
1b7f4a34 9427#: builtin/remote.c:1037
8ada9598 9428msgid "up to date"
81809b99 9429msgstr "最新"
8ada9598 9430
1b7f4a34 9431#: builtin/remote.c:1040
8ada9598 9432msgid "fast-forwardable"
81809b99 9433msgstr "可快进"
8ada9598 9434
1b7f4a34 9435#: builtin/remote.c:1043
8ada9598 9436msgid "local out of date"
81809b99 9437msgstr "本地已过时"
8ada9598 9438
1b7f4a34 9439#: builtin/remote.c:1050
8ada9598
JX
9440#, c-format
9441msgid " %-*s forces to %-*s (%s)"
81809b99 9442msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 9443
1b7f4a34 9444#: builtin/remote.c:1053
8ada9598
JX
9445#, c-format
9446msgid " %-*s pushes to %-*s (%s)"
81809b99 9447msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 9448
1b7f4a34 9449#: builtin/remote.c:1057
8ada9598
JX
9450#, c-format
9451msgid " %-*s forces to %s"
81809b99 9452msgstr " %-*s 强制推送至 %s"
8ada9598 9453
1b7f4a34 9454#: builtin/remote.c:1060
8ada9598
JX
9455#, c-format
9456msgid " %-*s pushes to %s"
81809b99 9457msgstr " %-*s 推送至 %s"
8ada9598 9458
1b7f4a34 9459#: builtin/remote.c:1128
ef317cd5 9460msgid "do not query remotes"
07432cef 9461msgstr "不查询远程"
ef317cd5 9462
1b7f4a34 9463#: builtin/remote.c:1155
81809b99 9464#, c-format
8ada9598 9465msgid "* remote %s"
81809b99 9466msgstr "* 远程 %s"
8ada9598 9467
1b7f4a34 9468#: builtin/remote.c:1156
8ada9598
JX
9469#, c-format
9470msgid " Fetch URL: %s"
81809b99 9471msgstr " 获取地址:%s"
8ada9598 9472
1b7f4a34 9473#: builtin/remote.c:1157 builtin/remote.c:1308
8ada9598 9474msgid "(no URL)"
81809b99 9475msgstr "(无 URL)"
8ada9598 9476
1b7f4a34 9477#: builtin/remote.c:1166 builtin/remote.c:1168
8ada9598
JX
9478#, c-format
9479msgid " Push URL: %s"
81809b99 9480msgstr " 推送地址:%s"
8ada9598 9481
1b7f4a34 9482#: builtin/remote.c:1170 builtin/remote.c:1172 builtin/remote.c:1174
81809b99 9483#, c-format
8ada9598 9484msgid " HEAD branch: %s"
4375c10e 9485msgstr " HEAD 分支:%s"
8ada9598 9486
1b7f4a34 9487#: builtin/remote.c:1176
8ada9598
JX
9488#, c-format
9489msgid ""
9490" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 9491msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 9492
1b7f4a34 9493#: builtin/remote.c:1188
81809b99 9494#, c-format
8ada9598
JX
9495msgid " Remote branch:%s"
9496msgid_plural " Remote branches:%s"
81809b99 9497msgstr[0] " 远程分支:%s"
5ae481e0 9498msgstr[1] " 远程分支:%s"
8ada9598 9499
81809b99 9500# 译者:中文字符串拼接,可删除前导空格
1b7f4a34 9501#: builtin/remote.c:1191 builtin/remote.c:1218
8ada9598 9502msgid " (status not queried)"
81809b99 9503msgstr "(状态未查询)"
8ada9598 9504
1b7f4a34 9505#: builtin/remote.c:1200
8ada9598
JX
9506msgid " Local branch configured for 'git pull':"
9507msgid_plural " Local branches configured for 'git pull':"
81809b99 9508msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 9509msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 9510
1b7f4a34 9511#: builtin/remote.c:1208
8ada9598 9512msgid " Local refs will be mirrored by 'git push'"
81809b99 9513msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 9514
1b7f4a34 9515#: builtin/remote.c:1215
81809b99 9516#, c-format
8ada9598
JX
9517msgid " Local ref configured for 'git push'%s:"
9518msgid_plural " Local refs configured for 'git push'%s:"
81809b99 9519msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 9520msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 9521
1b7f4a34 9522#: builtin/remote.c:1236
ef317cd5 9523msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 9524msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 9525
1b7f4a34 9526#: builtin/remote.c:1238
ef317cd5 9527msgid "delete refs/remotes/<name>/HEAD"
07432cef 9528msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 9529
1b7f4a34 9530#: builtin/remote.c:1253
8ada9598 9531msgid "Cannot determine remote HEAD"
81809b99 9532msgstr "无法确定远程 HEAD"
8ada9598 9533
1b7f4a34 9534#: builtin/remote.c:1255
8ada9598 9535msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 9536msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 9537
1b7f4a34 9538#: builtin/remote.c:1265
81809b99 9539#, c-format
8ada9598 9540msgid "Could not delete %s"
81809b99 9541msgstr "无法删除 %s"
8ada9598 9542
1b7f4a34 9543#: builtin/remote.c:1273
81809b99 9544#, c-format
8ada9598 9545msgid "Not a valid ref: %s"
81809b99 9546msgstr "不是一个有效引用:%s"
8ada9598 9547
1b7f4a34 9548#: builtin/remote.c:1275
81809b99 9549#, c-format
8ada9598 9550msgid "Could not setup %s"
81809b99 9551msgstr "不能设置 %s"
8ada9598
JX
9552
9553# 译者:注意保持前导空格
1b7f4a34 9554#: builtin/remote.c:1293
81809b99 9555#, c-format
8ada9598 9556msgid " %s will become dangling!"
07432cef 9557msgstr " %s 将成为摇摆状态!"
8ada9598
JX
9558
9559# 译者:注意保持前导空格
1b7f4a34 9560#: builtin/remote.c:1294
81809b99 9561#, c-format
8ada9598 9562msgid " %s has become dangling!"
07432cef 9563msgstr " %s 已成为摇摆状态!"
8ada9598 9564
1b7f4a34 9565#: builtin/remote.c:1304
81809b99 9566#, c-format
8ada9598 9567msgid "Pruning %s"
81809b99 9568msgstr "修剪 %s"
8ada9598 9569
1b7f4a34 9570#: builtin/remote.c:1305
8ada9598
JX
9571#, c-format
9572msgid "URL: %s"
81809b99 9573msgstr "URL:%s"
8ada9598 9574
1b7f4a34 9575#: builtin/remote.c:1321
8ada9598
JX
9576#, c-format
9577msgid " * [would prune] %s"
81809b99 9578msgstr " * [将删除] %s"
8ada9598 9579
1b7f4a34 9580#: builtin/remote.c:1324
8ada9598
JX
9581#, c-format
9582msgid " * [pruned] %s"
81809b99 9583msgstr " * [已删除] %s"
8ada9598 9584
1b7f4a34 9585#: builtin/remote.c:1369
ef317cd5 9586msgid "prune remotes after fetching"
07432cef 9587msgstr "抓取后清除远程"
ef317cd5 9588
1b7f4a34 9589#: builtin/remote.c:1435 builtin/remote.c:1509
81809b99 9590#, c-format
8ada9598 9591msgid "No such remote '%s'"
81809b99 9592msgstr "没有此远程 '%s'"
8ada9598 9593
1b7f4a34 9594#: builtin/remote.c:1455
ef317cd5 9595msgid "add branch"
07432cef 9596msgstr "添加分支"
ef317cd5 9597
1b7f4a34 9598#: builtin/remote.c:1462
8ada9598 9599msgid "no remote specified"
81809b99 9600msgstr "未指定远程"
8ada9598 9601
1b7f4a34 9602#: builtin/remote.c:1484
ef317cd5 9603msgid "manipulate push URLs"
07432cef 9604msgstr "操作推送 URLS"
ef317cd5 9605
1b7f4a34 9606#: builtin/remote.c:1486
ef317cd5 9607msgid "add URL"
07432cef 9608msgstr "添加 URL"
ef317cd5 9609
1b7f4a34 9610#: builtin/remote.c:1488
ef317cd5 9611msgid "delete URLs"
07432cef 9612msgstr "删除 URLS"
ef317cd5 9613
1b7f4a34 9614#: builtin/remote.c:1495
8ada9598 9615msgid "--add --delete doesn't make sense"
81809b99 9616msgstr "--add --delete 无意义"
8ada9598 9617
1b7f4a34 9618#: builtin/remote.c:1535
81809b99 9619#, c-format
8ada9598 9620msgid "Invalid old URL pattern: %s"
4375c10e 9621msgstr "无效的旧 URL 匹配模版:%s"
8ada9598 9622
1b7f4a34 9623#: builtin/remote.c:1543
81809b99 9624#, c-format
8ada9598 9625msgid "No such URL found: %s"
4375c10e 9626msgstr "未找到此 URL:%s"
8ada9598 9627
1b7f4a34 9628#: builtin/remote.c:1545
8ada9598 9629msgid "Will not delete all non-push URLs"
4375c10e 9630msgstr "将不会删除所有非推送 URL 地址"
8ada9598 9631
1b7f4a34 9632#: builtin/remote.c:1559
ef317cd5 9633msgid "be verbose; must be placed before a subcommand"
07432cef 9634msgstr "冗长输出;必须置于子命令之前"
ef317cd5 9635
6acbf033 9636#: builtin/repack.c:17
814ff314
JX
9637msgid "git repack [<options>]"
9638msgstr "git repack [<选项>]"
90314792 9639
04cb2f28 9640#: builtin/repack.c:159
90314792
JX
9641msgid "pack everything in a single pack"
9642msgstr "所有内容打包到一个包文件中"
9643
04cb2f28 9644#: builtin/repack.c:161
90314792
JX
9645msgid "same as -a, and turn unreachable objects loose"
9646msgstr "和 -a 相同,并将不可达的对象设为松散对象"
9647
04cb2f28 9648#: builtin/repack.c:164
90314792
JX
9649msgid "remove redundant packs, and run git-prune-packed"
9650msgstr "删除多余的包,运行 git-prune-packed"
9651
04cb2f28 9652#: builtin/repack.c:166
90314792
JX
9653msgid "pass --no-reuse-delta to git-pack-objects"
9654msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9655
04cb2f28 9656#: builtin/repack.c:168
90314792
JX
9657msgid "pass --no-reuse-object to git-pack-objects"
9658msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9659
04cb2f28 9660#: builtin/repack.c:170
90314792
JX
9661msgid "do not run git-update-server-info"
9662msgstr "不运行 git-update-server-info"
9663
04cb2f28 9664#: builtin/repack.c:173
90314792
JX
9665msgid "pass --local to git-pack-objects"
9666msgstr "向 git-pack-objects 传递参数 --local"
9667
04cb2f28 9668#: builtin/repack.c:175
6c94aba5
JX
9669msgid "write bitmap index"
9670msgstr "写 bitmap 索引"
9671
04cb2f28 9672#: builtin/repack.c:176
90314792
JX
9673msgid "approxidate"
9674msgstr "近似日期"
9675
04cb2f28 9676#: builtin/repack.c:177
90314792
JX
9677msgid "with -A, do not loosen objects older than this"
9678msgstr "使用 -A,不要将早于给定时间的对象过期"
9679
04cb2f28 9680#: builtin/repack.c:179
90314792
JX
9681msgid "size of the window used for delta compression"
9682msgstr "用于增量压缩的窗口值"
9683
04cb2f28 9684#: builtin/repack.c:180 builtin/repack.c:184
8376b58d
JX
9685msgid "bytes"
9686msgstr "字节"
9687
04cb2f28 9688#: builtin/repack.c:181
90314792
JX
9689msgid "same as the above, but limit memory size instead of entries count"
9690msgstr "和上面的相似,但限制内存大小而非条目数"
9691
04cb2f28 9692#: builtin/repack.c:183
90314792
JX
9693msgid "limits the maximum delta depth"
9694msgstr "限制最大增量深度"
9695
04cb2f28 9696#: builtin/repack.c:185
90314792 9697msgid "maximum size of each packfile"
dbd6cced 9698msgstr "每个包文件的最大尺寸"
90314792 9699
04cb2f28 9700#: builtin/repack.c:187
6c94aba5
JX
9701msgid "repack objects in packs marked with .keep"
9702msgstr "对标记为 .keep 的包中的对象重新打包"
9703
1b7f4a34 9704#: builtin/repack.c:378
90314792
JX
9705#, c-format
9706msgid "removing '%s' failed"
9707msgstr "删除 '%s' 失败"
9708
6acbf033 9709#: builtin/replace.c:19
ef317cd5 9710msgid "git replace [-f] <object> <replacement>"
07432cef 9711msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 9712
6acbf033
JX
9713#: builtin/replace.c:20
9714msgid "git replace [-f] --edit <object>"
9715msgstr "git replace [-f] --edit <对象>"
9716
9717#: builtin/replace.c:21
9718msgid "git replace [-f] --graft <commit> [<parent>...]"
9719msgstr "git replace [-f] --graft <提交> [<父提交>...]"
9720
9721#: builtin/replace.c:22
ef317cd5 9722msgid "git replace -d <object>..."
07432cef 9723msgstr "git replace -d <对象>..."
ef317cd5 9724
6acbf033 9725#: builtin/replace.c:23
cfff71a9
JX
9726msgid "git replace [--format=<format>] [-l [<pattern>]]"
9727msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 9728
220c313c 9729#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
6acbf033
JX
9730#, c-format
9731msgid "Not a valid object name: '%s'"
9732msgstr "不是一个有效的对象名:'%s'"
9733
220c313c 9734#: builtin/replace.c:355
6acbf033
JX
9735#, c-format
9736msgid "bad mergetag in commit '%s'"
55a16ee4 9737msgstr "提交 '%s' 中含有损坏的合并标签"
6acbf033 9738
220c313c 9739#: builtin/replace.c:357
6acbf033
JX
9740#, c-format
9741msgid "malformed mergetag in commit '%s'"
55a16ee4 9742msgstr "提交 '%s' 中含有非法的合并标签"
6acbf033 9743
220c313c 9744#: builtin/replace.c:368
6acbf033
JX
9745#, c-format
9746msgid ""
9747"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9748"instead of --graft"
55a16ee4 9749msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
6acbf033 9750
220c313c 9751#: builtin/replace.c:401
6acbf033
JX
9752#, c-format
9753msgid "the original commit '%s' has a gpg signature."
9754msgstr "原始提交 '%s' 中包含一个 GPG 签名"
9755
220c313c 9756#: builtin/replace.c:402
6acbf033
JX
9757msgid "the signature will be removed in the replacement commit!"
9758msgstr "在替换的提交中签名将被移除!"
9759
220c313c 9760#: builtin/replace.c:408
6acbf033
JX
9761#, c-format
9762msgid "could not write replacement commit for: '%s'"
9763msgstr "不能为 '%s' 写替换提交"
9764
220c313c 9765#: builtin/replace.c:432
ef317cd5 9766msgid "list replace refs"
07432cef 9767msgstr "列出替换的引用"
ef317cd5 9768
220c313c 9769#: builtin/replace.c:433
ef317cd5 9770msgid "delete replace refs"
07432cef 9771msgstr "删除替换的引用"
ef317cd5 9772
220c313c 9773#: builtin/replace.c:434
6acbf033
JX
9774msgid "edit existing object"
9775msgstr "编辑现存的对象"
9776
220c313c 9777#: builtin/replace.c:435
6acbf033
JX
9778msgid "change a commit's parents"
9779msgstr "修改一个提交的父提交"
9780
220c313c 9781#: builtin/replace.c:436
ef317cd5 9782msgid "replace the ref if it exists"
07432cef 9783msgstr "如果存在则替换引用"
ef317cd5 9784
220c313c 9785#: builtin/replace.c:437
6acbf033
JX
9786msgid "do not pretty-print contents for --edit"
9787msgstr "不要为 --edit 操作美观显示内容"
9788
220c313c 9789#: builtin/replace.c:438
cfff71a9
JX
9790msgid "use this format"
9791msgstr "使用此格式"
9792
90314792 9793#: builtin/rerere.c:12
814ff314
JX
9794msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9795msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 9796
90314792 9797#: builtin/rerere.c:57
ef317cd5 9798msgid "register clean resolutions in index"
07432cef 9799msgstr "在索引中注册干净的解决方案"
ef317cd5 9800
220c313c 9801#: builtin/reset.c:26
ef317cd5
JX
9802msgid ""
9803"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 9804msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 9805
220c313c 9806#: builtin/reset.c:27
07432cef
WS
9807msgid "git reset [-q] <tree-ish> [--] <paths>..."
9808msgstr "git reset [-q] <树或提交> [--] <路径>..."
ef317cd5 9809
220c313c 9810#: builtin/reset.c:28
07432cef
WS
9811msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9812msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 9813
220c313c 9814#: builtin/reset.c:34
c04f5ac3
JX
9815msgid "mixed"
9816msgstr "混杂"
9817
220c313c 9818#: builtin/reset.c:34
c04f5ac3
JX
9819msgid "soft"
9820msgstr "软性"
9821
220c313c 9822#: builtin/reset.c:34
c04f5ac3
JX
9823msgid "hard"
9824msgstr "硬性"
9825
220c313c 9826#: builtin/reset.c:34
8ada9598
JX
9827msgid "merge"
9828msgstr "合并"
9829
220c313c 9830#: builtin/reset.c:34
c04f5ac3
JX
9831msgid "keep"
9832msgstr "保持"
9833
220c313c 9834#: builtin/reset.c:74
c04f5ac3
JX
9835msgid "You do not have a valid HEAD."
9836msgstr "您没有一个有效的 HEAD。"
9837
220c313c 9838#: builtin/reset.c:76
c04f5ac3
JX
9839msgid "Failed to find tree of HEAD."
9840msgstr "无法找到 HEAD 指向的树。"
9841
220c313c 9842#: builtin/reset.c:82
c04f5ac3
JX
9843#, c-format
9844msgid "Failed to find tree of %s."
9845msgstr "无法找到 %s 指向的树。"
9846
220c313c 9847#: builtin/reset.c:100
c04f5ac3
JX
9848#, c-format
9849msgid "HEAD is now at %s"
9850msgstr "HEAD 现在位于 %s"
9851
90e6ef53 9852# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9853#: builtin/reset.c:183
c04f5ac3
JX
9854#, c-format
9855msgid "Cannot do a %s reset in the middle of a merge."
9856msgstr "在合并过程中不能做%s重置操作。"
9857
220c313c 9858#: builtin/reset.c:276
ef317cd5 9859msgid "be quiet, only report errors"
07432cef 9860msgstr "安静模式,只报告错误"
ef317cd5 9861
220c313c 9862#: builtin/reset.c:278
ef317cd5 9863msgid "reset HEAD and index"
07432cef 9864msgstr "重置 HEAD 和索引"
ef317cd5 9865
220c313c 9866#: builtin/reset.c:279
ef317cd5 9867msgid "reset only HEAD"
07432cef 9868msgstr "只重置 HEAD"
ef317cd5 9869
220c313c 9870#: builtin/reset.c:281 builtin/reset.c:283
ef317cd5 9871msgid "reset HEAD, index and working tree"
07432cef 9872msgstr "重置 HEAD、索引和工作区"
ef317cd5 9873
220c313c 9874#: builtin/reset.c:285
ef317cd5 9875msgid "reset HEAD but keep local changes"
07432cef 9876msgstr "重置 HEAD 但保存本地变更"
ef317cd5 9877
220c313c 9878#: builtin/reset.c:288
6c94aba5
JX
9879msgid "record only the fact that removed paths will be added later"
9880msgstr "将删除的路径标记为稍后添加"
9881
220c313c 9882#: builtin/reset.c:305
07432cef
WS
9883#, c-format
9884msgid "Failed to resolve '%s' as a valid revision."
9885msgstr "无法将 '%s' 解析为一个有效的版本。"
9886
220c313c 9887#: builtin/reset.c:313
07432cef
WS
9888#, c-format
9889msgid "Failed to resolve '%s' as a valid tree."
9890msgstr "无法将 '%s' 解析为一个有效的树对象。"
9891
220c313c 9892#: builtin/reset.c:322
c04f5ac3 9893msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 9894msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 9895
220c313c 9896#: builtin/reset.c:331
c04f5ac3 9897msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 9898msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 9899
90e6ef53 9900# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9901#: builtin/reset.c:333
c04f5ac3
JX
9902#, c-format
9903msgid "Cannot do %s reset with paths."
9904msgstr "不能带路径进行%s重置。"
9905
90e6ef53 9906# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9907#: builtin/reset.c:343
c04f5ac3
JX
9908#, c-format
9909msgid "%s reset is not allowed in a bare repository"
160fb2b2 9910msgstr "不能对纯仓库进行%s重置"
c04f5ac3 9911
220c313c 9912#: builtin/reset.c:347
6c94aba5
JX
9913msgid "-N can only be used with --mixed"
9914msgstr "-N 只能和 --mixed 同时使用"
9915
220c313c 9916#: builtin/reset.c:364
90314792 9917msgid "Unstaged changes after reset:"
160fb2b2 9918msgstr "重置后取消暂存的变更:"
90314792 9919
220c313c 9920#: builtin/reset.c:370
ef317cd5
JX
9921#, c-format
9922msgid "Could not reset index file to revision '%s'."
9923msgstr "不能重置索引文件至版本 '%s'。"
9924
220c313c 9925#: builtin/reset.c:374
07432cef
WS
9926msgid "Could not write new index file."
9927msgstr "不能写入新的索引文件。"
9928
1b7f4a34
JX
9929#: builtin/rev-list.c:354
9930msgid "rev-list does not support display of notes"
9931msgstr "rev-list 不支持显示注解"
9932
220c313c 9933#: builtin/rev-parse.c:361
814ff314
JX
9934msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
9935msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 9936
220c313c 9937#: builtin/rev-parse.c:366
ef317cd5 9938msgid "keep the `--` passed as an arg"
07432cef 9939msgstr "保持 `--` 作为一个参数传递"
ef317cd5 9940
220c313c 9941#: builtin/rev-parse.c:368
ef317cd5 9942msgid "stop parsing after the first non-option argument"
07432cef 9943msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 9944
220c313c 9945#: builtin/rev-parse.c:371
cfff71a9
JX
9946msgid "output in stuck long form"
9947msgstr "以固定长格式输出"
9948
1b7f4a34 9949#: builtin/rev-parse.c:502
ef317cd5 9950msgid ""
814ff314 9951"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 9952" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 9953" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
9954"\n"
9955"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9956msgstr ""
814ff314 9957"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 9958" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 9959" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
9960"\n"
9961"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5
JX
9962
9963#: builtin/revert.c:22
814ff314
JX
9964msgid "git revert [<options>] <commit-ish>..."
9965msgstr "git revert [<选项>] <提交号>..."
ef317cd5
JX
9966
9967#: builtin/revert.c:23
9968msgid "git revert <subcommand>"
07432cef 9969msgstr "git revert <子命令>"
ef317cd5
JX
9970
9971#: builtin/revert.c:28
814ff314
JX
9972msgid "git cherry-pick [<options>] <commit-ish>..."
9973msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5
JX
9974
9975#: builtin/revert.c:29
ef317cd5 9976msgid "git cherry-pick <subcommand>"
07432cef 9977msgstr "git cherry-pick <子命令>"
ef317cd5 9978
90314792 9979#: builtin/revert.c:71
ef317cd5
JX
9980#, c-format
9981msgid "%s: %s cannot be used with %s"
9982msgstr "%s:%s 不能和 %s 同时使用"
9983
90314792 9984#: builtin/revert.c:80
ef317cd5 9985msgid "end revert or cherry-pick sequence"
07432cef 9986msgstr "终止反转或拣选操作"
ef317cd5 9987
90314792 9988#: builtin/revert.c:81
ef317cd5 9989msgid "resume revert or cherry-pick sequence"
07432cef 9990msgstr "继续反转或拣选操作"
ef317cd5 9991
90314792 9992#: builtin/revert.c:82
ef317cd5 9993msgid "cancel revert or cherry-pick sequence"
07432cef 9994msgstr "取消反转或拣选操作"
ef317cd5 9995
90314792 9996#: builtin/revert.c:83
ef317cd5 9997msgid "don't automatically commit"
07432cef 9998msgstr "不要自动提交"
ef317cd5 9999
90314792 10000#: builtin/revert.c:84
ef317cd5 10001msgid "edit the commit message"
07432cef 10002msgstr "编辑提交说明"
ef317cd5 10003
90314792 10004#: builtin/revert.c:87
ef317cd5 10005msgid "parent number"
07432cef 10006msgstr "父编号"
ef317cd5 10007
90314792 10008#: builtin/revert.c:89
ef317cd5 10009msgid "merge strategy"
07432cef 10010msgstr "合并策略"
ef317cd5 10011
90314792 10012#: builtin/revert.c:90
ef317cd5 10013msgid "option"
07432cef 10014msgstr "选项"
ef317cd5 10015
90314792 10016#: builtin/revert.c:91
ef317cd5 10017msgid "option for merge strategy"
07432cef 10018msgstr "合并策略的选项"
ef317cd5 10019
6c94aba5 10020#: builtin/revert.c:104
ef317cd5 10021msgid "append commit name"
07432cef 10022msgstr "追加提交名称"
ef317cd5 10023
6c94aba5 10024#: builtin/revert.c:106
ef317cd5 10025msgid "preserve initially empty commits"
07432cef 10026msgstr "保留初始化的空提交"
ef317cd5 10027
6c94aba5 10028#: builtin/revert.c:107
ef317cd5 10029msgid "allow commits with empty messages"
07432cef 10030msgstr "允许提交说明为空"
c04f5ac3 10031
6c94aba5 10032#: builtin/revert.c:108
ef317cd5 10033msgid "keep redundant, empty commits"
07432cef 10034msgstr "保持多余的、空的提交"
ef317cd5 10035
6c94aba5 10036#: builtin/revert.c:112
c04f5ac3
JX
10037msgid "program error"
10038msgstr "程序错误"
10039
6c94aba5 10040#: builtin/revert.c:197
c04f5ac3
JX
10041msgid "revert failed"
10042msgstr "还原失败"
10043
6c94aba5 10044#: builtin/revert.c:212
c04f5ac3
JX
10045msgid "cherry-pick failed"
10046msgstr "拣选失败"
10047
90314792 10048#: builtin/rm.c:17
814ff314
JX
10049msgid "git rm [<options>] [--] <file>..."
10050msgstr "git rm [<选项>] [--] <文件>..."
07432cef 10051
90314792 10052#: builtin/rm.c:65
2e8451e8
JX
10053msgid ""
10054"the following submodule (or one of its nested submodules)\n"
10055"uses a .git directory:"
10056msgid_plural ""
220c313c 10057"the following submodules (or one of their nested submodules)\n"
2e8451e8 10058"use a .git directory:"
220c313c
JX
10059msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10060msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
2e8451e8 10061
90314792 10062#: builtin/rm.c:71
07432cef 10063msgid ""
2e8451e8 10064"\n"
07432cef
WS
10065"(use 'rm -rf' if you really want to remove it including all of its history)"
10066msgstr ""
2e8451e8 10067"\n"
07432cef 10068"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
ef317cd5 10069
7aea43ff 10070#: builtin/rm.c:230
c04f5ac3 10071msgid ""
2e8451e8
JX
10072"the following file has staged content different from both the\n"
10073"file and the HEAD:"
10074msgid_plural ""
10075"the following files have staged content different from both the\n"
10076"file and the HEAD:"
10077msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10078msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10079
7aea43ff 10080#: builtin/rm.c:235
2e8451e8
JX
10081msgid ""
10082"\n"
c04f5ac3
JX
10083"(use -f to force removal)"
10084msgstr ""
2e8451e8 10085"\n"
c04f5ac3
JX
10086"(使用 -f 强制删除)"
10087
7aea43ff 10088#: builtin/rm.c:239
2e8451e8
JX
10089msgid "the following file has changes staged in the index:"
10090msgid_plural "the following files have changes staged in the index:"
160fb2b2
JX
10091msgstr[0] "下列文件索引中有变更"
10092msgstr[1] "下列文件索引中有变更"
c04f5ac3 10093
7aea43ff 10094#: builtin/rm.c:243 builtin/rm.c:254
c04f5ac3 10095msgid ""
2e8451e8 10096"\n"
c04f5ac3
JX
10097"(use --cached to keep the file, or -f to force removal)"
10098msgstr ""
2e8451e8
JX
10099"\n"
10100"(使用 --cached 保留本地文件,或用 -f 强制删除)"
10101
7aea43ff 10102#: builtin/rm.c:251
2e8451e8
JX
10103msgid "the following file has local modifications:"
10104msgid_plural "the following files have local modifications:"
10105msgstr[0] "如下文件有本地修改:"
10106msgstr[1] "如下文件有本地修改:"
c04f5ac3 10107
7aea43ff 10108#: builtin/rm.c:269
ef317cd5 10109msgid "do not list removed files"
07432cef 10110msgstr "不列出删除的文件"
ef317cd5 10111
7aea43ff 10112#: builtin/rm.c:270
ef317cd5 10113msgid "only remove from the index"
07432cef 10114msgstr "只从索引区删除"
ef317cd5 10115
7aea43ff 10116#: builtin/rm.c:271
ef317cd5 10117msgid "override the up-to-date check"
07432cef 10118msgstr "忽略文件更新状态检查"
ef317cd5 10119
7aea43ff 10120#: builtin/rm.c:272
ef317cd5 10121msgid "allow recursive removal"
07432cef 10122msgstr "允许递归删除"
ef317cd5 10123
7aea43ff 10124#: builtin/rm.c:274
ef317cd5 10125msgid "exit with a zero status even if nothing matched"
07432cef 10126msgstr "即使没有匹配,也以零状态退出"
ef317cd5 10127
7aea43ff 10128#: builtin/rm.c:317
220c313c
JX
10129msgid "Please, stage your changes to .gitmodules or stash them to proceed"
10130msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
10131
7aea43ff 10132#: builtin/rm.c:335
c04f5ac3
JX
10133#, c-format
10134msgid "not removing '%s' recursively without -r"
10135msgstr "未提供 -r 选项不会递归删除 '%s'"
10136
7aea43ff 10137#: builtin/rm.c:374
c04f5ac3
JX
10138#, c-format
10139msgid "git rm: unable to remove %s"
10140msgstr "git rm:不能删除 %s"
10141
1b7f4a34
JX
10142#: builtin/send-pack.c:18
10143msgid ""
10144"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10145"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
10146"[<ref>...]\n"
10147" --all and explicit <ref> specification are mutually exclusive."
10148msgstr ""
10149"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10150"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
10151" --all 和明确的 <引用> 互斥。"
10152
10153#: builtin/send-pack.c:160
10154msgid "remote name"
10155msgstr "远程名称"
10156
10157#: builtin/send-pack.c:171
10158msgid "use stateless RPC protocol"
10159msgstr "使用无状态的 RPC 协议"
10160
10161#: builtin/send-pack.c:172
10162msgid "read refs from stdin"
10163msgstr "从标准输入读取引用"
10164
10165#: builtin/send-pack.c:173
10166msgid "print status from remote helper"
10167msgstr "打印来自远程 helper 的状态"
10168
ef317cd5 10169#: builtin/shortlog.c:13
814ff314 10170msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
4dcdc3d8 10171msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
ef317cd5 10172
4dcdc3d8 10173#: builtin/shortlog.c:131
c04f5ac3
JX
10174#, c-format
10175msgid "Missing author: %s"
10176msgstr "缺少作者:%s"
10177
90314792 10178#: builtin/shortlog.c:230
ef317cd5 10179msgid "sort output according to the number of commits per author"
07432cef 10180msgstr "根据每个作者的提交数量排序"
ef317cd5 10181
90314792 10182#: builtin/shortlog.c:232
ef317cd5 10183msgid "Suppress commit descriptions, only provides commit count"
07432cef 10184msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 10185
90314792 10186#: builtin/shortlog.c:234
ef317cd5 10187msgid "Show the email address of each author"
07432cef 10188msgstr "显示每个作者的电子邮件地址"
ef317cd5 10189
90314792 10190#: builtin/shortlog.c:235
ef317cd5 10191msgid "w[,i1[,i2]]"
07432cef 10192msgstr "w[,i1[,i2]]"
ef317cd5 10193
90314792 10194#: builtin/shortlog.c:236
ef317cd5 10195msgid "Linewrap output"
07432cef 10196msgstr "折行输出"
ef317cd5
JX
10197
10198#: builtin/show-branch.c:9
10199msgid ""
814ff314 10200"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
10201"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
10202"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10203"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 10204msgstr ""
814ff314 10205"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
10206"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
10207"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10208"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 10209
d9d56b23 10210#: builtin/show-branch.c:13
814ff314
JX
10211msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
10212msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
ef317cd5 10213
7aea43ff 10214#: builtin/show-branch.c:659
ef317cd5 10215msgid "show remote-tracking and local branches"
07432cef 10216msgstr "显示远程跟踪的和本地的分支"
ef317cd5 10217
7aea43ff 10218#: builtin/show-branch.c:661
ef317cd5 10219msgid "show remote-tracking branches"
07432cef 10220msgstr "显示远程跟踪的分支"
ef317cd5 10221
7aea43ff 10222#: builtin/show-branch.c:663
ef317cd5 10223msgid "color '*!+-' corresponding to the branch"
07432cef 10224msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 10225
7aea43ff 10226#: builtin/show-branch.c:665
ef317cd5 10227msgid "show <n> more commits after the common ancestor"
07432cef 10228msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 10229
7aea43ff 10230#: builtin/show-branch.c:667
ef317cd5 10231msgid "synonym to more=-1"
07432cef 10232msgstr "和 more=-1 同义"
ef317cd5 10233
7aea43ff 10234#: builtin/show-branch.c:668
ef317cd5 10235msgid "suppress naming strings"
07432cef 10236msgstr "不显示字符串命名"
ef317cd5 10237
7aea43ff 10238#: builtin/show-branch.c:670
ef317cd5 10239msgid "include the current branch"
07432cef 10240msgstr "包括当前分支"
ef317cd5 10241
7aea43ff 10242#: builtin/show-branch.c:672
ef317cd5 10243msgid "name commits with their object names"
07432cef 10244msgstr "以对象名字命名提交"
ef317cd5 10245
7aea43ff 10246#: builtin/show-branch.c:674
ef317cd5 10247msgid "show possible merge bases"
07432cef 10248msgstr "显示可能合并的基线"
ef317cd5 10249
7aea43ff 10250#: builtin/show-branch.c:676
ef317cd5 10251msgid "show refs unreachable from any other ref"
07432cef 10252msgstr "显示没有任何引用的的引用"
ef317cd5 10253
7aea43ff 10254#: builtin/show-branch.c:678
ef317cd5 10255msgid "show commits in topological order"
07432cef 10256msgstr "以拓扑顺序显示提交"
ef317cd5 10257
7aea43ff 10258#: builtin/show-branch.c:681
ef317cd5 10259msgid "show only commits not on the first branch"
07432cef 10260msgstr "只显示不在第一个分支上的提交"
ef317cd5 10261
7aea43ff 10262#: builtin/show-branch.c:683
ef317cd5 10263msgid "show merges reachable from only one tip"
07432cef 10264msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 10265
7aea43ff 10266#: builtin/show-branch.c:685
2e8451e8
JX
10267msgid "topologically sort, maintaining date order where possible"
10268msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 10269
7aea43ff 10270#: builtin/show-branch.c:688
ef317cd5 10271msgid "<n>[,<base>]"
07432cef 10272msgstr "<n>[,<base>]"
ef317cd5 10273
7aea43ff 10274#: builtin/show-branch.c:689
ef317cd5 10275msgid "show <n> most recent ref-log entries starting at base"
07432cef 10276msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
ef317cd5
JX
10277
10278#: builtin/show-ref.c:10
10279msgid ""
814ff314
JX
10280"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10281"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 10282msgstr ""
814ff314
JX
10283"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10284"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5
JX
10285
10286#: builtin/show-ref.c:11
03ea3327
JX
10287msgid "git show-ref --exclude-existing[=<pattern>] < <ref-list>"
10288msgstr "git show-ref --exclude-existing[=<模式>] < <引用列表>"
ef317cd5 10289
7aea43ff 10290#: builtin/show-ref.c:170
ef317cd5 10291msgid "only show tags (can be combined with heads)"
55a16ee4 10292msgstr "只显示标签(可以和头共用)"
ef317cd5 10293
7aea43ff 10294#: builtin/show-ref.c:171
ef317cd5 10295msgid "only show heads (can be combined with tags)"
55a16ee4 10296msgstr "只显示头(可以和标签共用)"
ef317cd5 10297
7aea43ff 10298#: builtin/show-ref.c:172
ef317cd5 10299msgid "stricter reference checking, requires exact ref path"
07432cef 10300msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 10301
7aea43ff 10302#: builtin/show-ref.c:175 builtin/show-ref.c:177
2e8451e8
JX
10303msgid "show the HEAD reference, even if it would be filtered out"
10304msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 10305
7aea43ff 10306#: builtin/show-ref.c:179
ef317cd5 10307msgid "dereference tags into object IDs"
4375c10e 10308msgstr "转换标签到对象 ID"
ef317cd5 10309
7aea43ff 10310#: builtin/show-ref.c:181
ef317cd5 10311msgid "only show SHA1 hash using <n> digits"
07432cef 10312msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 10313
7aea43ff 10314#: builtin/show-ref.c:185
ef317cd5 10315msgid "do not print results to stdout (useful with --verify)"
07432cef 10316msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 10317
7aea43ff 10318#: builtin/show-ref.c:187
ef317cd5 10319msgid "show refs from stdin that aren't in local repository"
160fb2b2 10320msgstr "显示从标准输入中读入的不在本地仓库中的引用"
ef317cd5
JX
10321
10322#: builtin/symbolic-ref.c:7
814ff314
JX
10323msgid "git symbolic-ref [<options>] <name> [<ref>]"
10324msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef
WS
10325
10326#: builtin/symbolic-ref.c:8
814ff314
JX
10327msgid "git symbolic-ref -d [-q] <name>"
10328msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 10329
07432cef 10330#: builtin/symbolic-ref.c:40
ef317cd5 10331msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
10332msgstr "不显示非符号(分离的)引用的错误信息"
10333
10334#: builtin/symbolic-ref.c:41
10335msgid "delete symbolic ref"
10336msgstr "删除符号引用"
ef317cd5 10337
07432cef 10338#: builtin/symbolic-ref.c:42
ef317cd5 10339msgid "shorten ref output"
07432cef 10340msgstr "简短的引用输出"
ef317cd5 10341
1b7f4a34 10342#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
ef317cd5 10343msgid "reason"
07432cef 10344msgstr "原因"
ef317cd5 10345
1b7f4a34 10346#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
ef317cd5 10347msgid "reason of the update"
07432cef 10348msgstr "更新的原因"
ef317cd5
JX
10349
10350#: builtin/tag.c:22
10351msgid ""
814ff314
JX
10352"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
10353"[<head>]"
10354msgstr ""
10355"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
ef317cd5
JX
10356
10357#: builtin/tag.c:23
10358msgid "git tag -d <tagname>..."
07432cef 10359msgstr "git tag -d <标签名>..."
ef317cd5
JX
10360
10361#: builtin/tag.c:24
10362msgid ""
814ff314 10363"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
ef317cd5
JX
10364"\t\t[<pattern>...]"
10365msgstr ""
814ff314 10366"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]"
ef317cd5
JX
10367
10368#: builtin/tag.c:26
10369msgid "git tag -v <tagname>..."
07432cef 10370msgstr "git tag -v <标签名>..."
ef317cd5 10371
6acbf033 10372#: builtin/tag.c:69
7ac1c0ad
JX
10373#, c-format
10374msgid "malformed object at '%s'"
10375msgstr "非法的对象于 '%s'"
10376
6acbf033 10377#: builtin/tag.c:301
c04f5ac3
JX
10378#, c-format
10379msgid "tag name too long: %.*s..."
55a16ee4 10380msgstr "标签名称太长:%.*s..."
c04f5ac3 10381
6acbf033 10382#: builtin/tag.c:306
c04f5ac3
JX
10383#, c-format
10384msgid "tag '%s' not found."
55a16ee4 10385msgstr "未发现标签 '%s'。"
c04f5ac3 10386
6acbf033 10387#: builtin/tag.c:321
c04f5ac3
JX
10388#, c-format
10389msgid "Deleted tag '%s' (was %s)\n"
55a16ee4 10390msgstr "已删除标签 '%s'(曾为 %s)\n"
c04f5ac3 10391
6acbf033 10392#: builtin/tag.c:333
c04f5ac3
JX
10393#, c-format
10394msgid "could not verify the tag '%s'"
55a16ee4 10395msgstr "不能校验该标签 '%s'"
c04f5ac3 10396
6acbf033 10397#: builtin/tag.c:343
a77c07d9 10398#, c-format
c04f5ac3
JX
10399msgid ""
10400"\n"
6acbf033
JX
10401"Write a message for tag:\n"
10402" %s\n"
a77c07d9 10403"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
10404msgstr ""
10405"\n"
55a16ee4 10406"输入一个标签说明:\n"
6acbf033 10407" %s\n"
a77c07d9 10408"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 10409
6acbf033 10410#: builtin/tag.c:347
a77c07d9 10411#, c-format
c04f5ac3
JX
10412msgid ""
10413"\n"
6acbf033
JX
10414"Write a message for tag:\n"
10415" %s\n"
a77c07d9 10416"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 10417"want to.\n"
c04f5ac3
JX
10418msgstr ""
10419"\n"
55a16ee4 10420"输入一个标签说明:\n"
6acbf033 10421" %s\n"
a77c07d9 10422"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 10423
6acbf033
JX
10424#: builtin/tag.c:371
10425#, c-format
10426msgid "unsupported sort specification '%s'"
10427msgstr "不支持的排序规格 '%s'"
10428
10429#: builtin/tag.c:373
10430#, c-format
10431msgid "unsupported sort specification '%s' in variable '%s'"
10432msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
10433
10434#: builtin/tag.c:428
c04f5ac3 10435msgid "unable to sign the tag"
55a16ee4 10436msgstr "无法签署标签"
c04f5ac3 10437
6acbf033 10438#: builtin/tag.c:430
c04f5ac3 10439msgid "unable to write tag file"
55a16ee4 10440msgstr "无法写标签文件"
c04f5ac3 10441
6acbf033 10442#: builtin/tag.c:455
c04f5ac3 10443msgid "bad object type."
90e6ef53 10444msgstr "坏的对象类型。"
c04f5ac3 10445
6acbf033 10446#: builtin/tag.c:468
c04f5ac3 10447msgid "tag header too big."
55a16ee4 10448msgstr "标签头信息太大。"
c04f5ac3 10449
6acbf033 10450#: builtin/tag.c:504
c04f5ac3 10451msgid "no tag message?"
55a16ee4 10452msgstr "无标签说明?"
c04f5ac3 10453
6acbf033 10454#: builtin/tag.c:510
c04f5ac3
JX
10455#, c-format
10456msgid "The tag message has been left in %s\n"
55a16ee4 10457msgstr "标签说明被保留在 %s\n"
c04f5ac3 10458
6acbf033 10459#: builtin/tag.c:559
7ac1c0ad
JX
10460msgid "switch 'points-at' requires an object"
10461msgstr "开关 'points-at' 需要一个对象"
10462
6acbf033 10463#: builtin/tag.c:561
7ac1c0ad
JX
10464#, c-format
10465msgid "malformed object name '%s'"
10466msgstr "非法的对象名 '%s'"
10467
1b7f4a34 10468#: builtin/tag.c:590
ef317cd5 10469msgid "list tag names"
55a16ee4 10470msgstr "列出标签名称"
ef317cd5 10471
1b7f4a34 10472#: builtin/tag.c:592
ef317cd5 10473msgid "print <n> lines of each tag message"
55a16ee4 10474msgstr "每个标签信息打印 <n> 行"
ef317cd5 10475
1b7f4a34 10476#: builtin/tag.c:594
ef317cd5 10477msgid "delete tags"
55a16ee4 10478msgstr "删除标签"
ef317cd5 10479
1b7f4a34 10480#: builtin/tag.c:595
ef317cd5 10481msgid "verify tags"
55a16ee4 10482msgstr "验证标签"
ef317cd5 10483
1b7f4a34 10484#: builtin/tag.c:597
ef317cd5 10485msgid "Tag creation options"
55a16ee4 10486msgstr "标签创建选项"
ef317cd5 10487
1b7f4a34 10488#: builtin/tag.c:599
ef317cd5 10489msgid "annotated tag, needs a message"
55a16ee4 10490msgstr "附注标签,需要一个说明"
ef317cd5 10491
1b7f4a34 10492#: builtin/tag.c:601
ef317cd5 10493msgid "tag message"
55a16ee4 10494msgstr "标签说明"
ef317cd5 10495
1b7f4a34 10496#: builtin/tag.c:603
ef317cd5 10497msgid "annotated and GPG-signed tag"
55a16ee4 10498msgstr "附注并附加 GPG 签名的标签"
ef317cd5 10499
1b7f4a34 10500#: builtin/tag.c:607
ef317cd5 10501msgid "use another key to sign the tag"
55a16ee4 10502msgstr "使用另外的私钥签名该标签"
ef317cd5 10503
1b7f4a34 10504#: builtin/tag.c:608
ef317cd5 10505msgid "replace the tag if exists"
55a16ee4 10506msgstr "如果存在,替换现有的标签"
ef317cd5 10507
1b7f4a34 10508#: builtin/tag.c:609 builtin/update-ref.c:368
03ea3327 10509msgid "create a reflog"
1b7f4a34
JX
10510msgstr "创建引用日志"
10511
10512#: builtin/tag.c:611
814ff314 10513msgid "Tag listing options"
55a16ee4 10514msgstr "标签列表选项"
814ff314 10515
1b7f4a34 10516#: builtin/tag.c:612
ef317cd5 10517msgid "show tag list in columns"
55a16ee4 10518msgstr "以列的方式显示标签列表"
ef317cd5 10519
1b7f4a34 10520#: builtin/tag.c:614
6c94aba5 10521msgid "sort tags"
55a16ee4 10522msgstr "排序标签"
6c94aba5 10523
1b7f4a34 10524#: builtin/tag.c:619 builtin/tag.c:625
ef317cd5 10525msgid "print only tags that contain the commit"
55a16ee4 10526msgstr "只打印包含提交的标签"
ef317cd5 10527
1b7f4a34 10528#: builtin/tag.c:631
ef317cd5 10529msgid "print only tags of the object"
55a16ee4 10530msgstr "只打印对象的标签"
ef317cd5 10531
1b7f4a34 10532#: builtin/tag.c:657
8ada9598 10533msgid "--column and -n are incompatible"
81809b99 10534msgstr "--column 和 -n 不兼容"
8ada9598 10535
1b7f4a34 10536#: builtin/tag.c:669
6c94aba5
JX
10537msgid "--sort and -n are incompatible"
10538msgstr "--sort 和 -n 不兼容"
10539
1b7f4a34 10540#: builtin/tag.c:676
c04f5ac3 10541msgid "-n option is only allowed with -l."
649900bc 10542msgstr "-n 选项只允许和 -l 同时使用。"
c04f5ac3 10543
1b7f4a34 10544#: builtin/tag.c:678
c04f5ac3 10545msgid "--contains option is only allowed with -l."
649900bc 10546msgstr "--contains 选项只允许和 -l 同时使用。"
c04f5ac3 10547
1b7f4a34 10548#: builtin/tag.c:680
7ac1c0ad 10549msgid "--points-at option is only allowed with -l."
649900bc 10550msgstr "--points-at 选项只允许和 -l 同时使用。"
7ac1c0ad 10551
1b7f4a34 10552#: builtin/tag.c:688
c04f5ac3
JX
10553msgid "only one -F or -m option is allowed."
10554msgstr "只允许一个 -F 或 -m 选项。"
10555
1b7f4a34 10556#: builtin/tag.c:708
c04f5ac3
JX
10557msgid "too many params"
10558msgstr "太多参数"
10559
1b7f4a34 10560#: builtin/tag.c:714
c04f5ac3
JX
10561#, c-format
10562msgid "'%s' is not a valid tag name."
55a16ee4 10563msgstr "'%s' 不是一个有效的标签名称。"
c04f5ac3 10564
1b7f4a34 10565#: builtin/tag.c:719
c04f5ac3
JX
10566#, c-format
10567msgid "tag '%s' already exists"
55a16ee4 10568msgstr "标签 '%s' 已存在"
c04f5ac3 10569
1b7f4a34 10570#: builtin/tag.c:744
c04f5ac3
JX
10571#, c-format
10572msgid "Updated tag '%s' (was %s)\n"
55a16ee4 10573msgstr "已更新标签 '%s'(曾为 %s)\n"
c04f5ac3 10574
1b7f4a34 10575#: builtin/unpack-objects.c:490
6c94aba5
JX
10576msgid "Unpacking objects"
10577msgstr "展开对象中"
10578
7aea43ff
JX
10579#: builtin/update-index.c:70
10580#, c-format
10581msgid "failed to create directory %s"
10582msgstr "无法创建目录 %s"
10583
10584#: builtin/update-index.c:76
10585#, c-format
10586msgid "failed to stat %s"
10587msgstr "无法枚举 %s 状态"
10588
10589#: builtin/update-index.c:86
10590#, c-format
10591msgid "failed to create file %s"
10592msgstr "无法创建文件 %s"
10593
10594#: builtin/update-index.c:94
10595#, c-format
10596msgid "failed to delete file %s"
10597msgstr "无法删除文件 %s"
10598
10599#: builtin/update-index.c:101 builtin/update-index.c:203
10600#, c-format
10601msgid "failed to delete directory %s"
10602msgstr "无法删除目录 %s"
10603
10604#: builtin/update-index.c:124
10605#, c-format
10606msgid "Testing "
10607msgstr "正在测试 "
10608
10609#: builtin/update-index.c:136
10610msgid "directory stat info does not change after adding a new file"
10611msgstr "添加一个新文件后,目录的状态信息未改变"
10612
10613#: builtin/update-index.c:149
10614msgid "directory stat info does not change after adding a new directory"
10615msgstr "添加一个新目录后,目录的状态信息未改变"
10616
10617#: builtin/update-index.c:162
10618msgid "directory stat info changes after updating a file"
10619msgstr "更新一个文件后,目录的状态信息被修改"
10620
10621#: builtin/update-index.c:173
10622msgid "directory stat info changes after adding a file inside subdirectory"
10623msgstr "在子目录中添加文件后,目录的状态信息被修改"
10624
10625#: builtin/update-index.c:184
10626msgid "directory stat info does not change after deleting a file"
10627msgstr "删除一个文件后,目录的状态信息未改变"
10628
10629#: builtin/update-index.c:197
10630msgid "directory stat info does not change after deleting a directory"
10631msgstr "删除一个目录后,目录的状态信息未改变"
10632
10633#: builtin/update-index.c:204
10634msgid " OK"
10635msgstr " OK"
10636
10637#: builtin/update-index.c:564
814ff314
JX
10638msgid "git update-index [<options>] [--] [<file>...]"
10639msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 10640
7aea43ff 10641#: builtin/update-index.c:918
ef317cd5 10642msgid "continue refresh even when index needs update"
07432cef 10643msgstr "当索引需要更新时继续刷新"
8ada9598 10644
7aea43ff 10645#: builtin/update-index.c:921
ef317cd5 10646msgid "refresh: ignore submodules"
07432cef 10647msgstr "刷新:忽略子模组"
8ada9598 10648
7aea43ff 10649#: builtin/update-index.c:924
ef317cd5 10650msgid "do not ignore new files"
07432cef 10651msgstr "不忽略新的文件"
8ada9598 10652
7aea43ff 10653#: builtin/update-index.c:926
ef317cd5 10654msgid "let files replace directories and vice-versa"
07432cef 10655msgstr "让文件替换目录(反之亦然)"
ef317cd5 10656
7aea43ff 10657#: builtin/update-index.c:928
ef317cd5 10658msgid "notice files missing from worktree"
07432cef 10659msgstr "通知文件从工作区丢失"
ef317cd5 10660
7aea43ff 10661#: builtin/update-index.c:930
ef317cd5 10662msgid "refresh even if index contains unmerged entries"
07432cef 10663msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 10664
7aea43ff 10665#: builtin/update-index.c:933
ef317cd5 10666msgid "refresh stat information"
07432cef 10667msgstr "刷新统计信息"
ef317cd5 10668
7aea43ff 10669#: builtin/update-index.c:937
ef317cd5 10670msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 10671msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 10672
7aea43ff 10673#: builtin/update-index.c:941
6c94aba5 10674msgid "<mode>,<object>,<path>"
d9d56b23 10675msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 10676
7aea43ff 10677#: builtin/update-index.c:942
ef317cd5 10678msgid "add the specified entry to the index"
07432cef 10679msgstr "添加指定的条目到索引区"
ef317cd5 10680
7aea43ff 10681#: builtin/update-index.c:946
ef317cd5 10682msgid "(+/-)x"
07432cef 10683msgstr "(+/-)x"
ef317cd5 10684
7aea43ff 10685#: builtin/update-index.c:947
ef317cd5 10686msgid "override the executable bit of the listed files"
07432cef 10687msgstr "覆盖列表里文件的可执行位"
ef317cd5 10688
7aea43ff 10689#: builtin/update-index.c:951
ef317cd5 10690msgid "mark files as \"not changing\""
07432cef 10691msgstr "把文件标记为 \"没有变更\""
ef317cd5 10692
7aea43ff 10693#: builtin/update-index.c:954
ef317cd5 10694msgid "clear assumed-unchanged bit"
07432cef 10695msgstr "清除 assumed-unchanged 位"
ef317cd5 10696
7aea43ff 10697#: builtin/update-index.c:957
ef317cd5 10698msgid "mark files as \"index-only\""
07432cef 10699msgstr "把文件标记为 \"仅索引\""
ef317cd5 10700
7aea43ff 10701#: builtin/update-index.c:960
ef317cd5 10702msgid "clear skip-worktree bit"
07432cef 10703msgstr "清除 skip-worktree 位"
ef317cd5 10704
7aea43ff 10705#: builtin/update-index.c:963
ef317cd5 10706msgid "add to index only; do not add content to object database"
07432cef 10707msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 10708
7aea43ff 10709#: builtin/update-index.c:965
ef317cd5 10710msgid "remove named paths even if present in worktree"
07432cef 10711msgstr "即使存在工作区里,也删除路径"
ef317cd5 10712
7aea43ff 10713#: builtin/update-index.c:967
ef317cd5 10714msgid "with --stdin: input lines are terminated by null bytes"
07432cef 10715msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 10716
7aea43ff 10717#: builtin/update-index.c:969
ef317cd5 10718msgid "read list of paths to be updated from standard input"
07432cef 10719msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 10720
7aea43ff 10721#: builtin/update-index.c:973
ef317cd5 10722msgid "add entries from standard input to the index"
07432cef 10723msgstr "从标准输入添加条目到索引区"
ef317cd5 10724
7aea43ff 10725#: builtin/update-index.c:977
ef317cd5 10726msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 10727msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 10728
7aea43ff 10729#: builtin/update-index.c:981
ef317cd5 10730msgid "only update entries that differ from HEAD"
07432cef 10731msgstr "只更新与 HEAD 不同的条目"
ef317cd5 10732
7aea43ff 10733#: builtin/update-index.c:985
ef317cd5 10734msgid "ignore files missing from worktree"
07432cef 10735msgstr "忽略工作区丢失的文件"
ef317cd5 10736
7aea43ff 10737#: builtin/update-index.c:988
ef317cd5 10738msgid "report actions to standard output"
07432cef 10739msgstr "在标准输出显示操作"
ef317cd5 10740
7aea43ff 10741#: builtin/update-index.c:990
ef317cd5 10742msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 10743msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 10744
7aea43ff 10745#: builtin/update-index.c:994
ef317cd5 10746msgid "write index in this format"
07432cef 10747msgstr "以这种格式写入索引区"
ef317cd5 10748
7aea43ff 10749#: builtin/update-index.c:996
6acbf033
JX
10750msgid "enable or disable split index"
10751msgstr "启用或禁用索引拆分"
10752
7aea43ff
JX
10753#: builtin/update-index.c:998
10754msgid "enable/disable untracked cache"
10755msgstr "启用/禁用对未跟踪文件的缓存"
10756
10757#: builtin/update-index.c:1000
10758msgid "enable untracked cache without testing the filesystem"
10759msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
10760
90314792 10761#: builtin/update-ref.c:9
814ff314
JX
10762msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10763msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 10764
90314792 10765#: builtin/update-ref.c:10
814ff314
JX
10766msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
10767msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792
JX
10768
10769#: builtin/update-ref.c:11
814ff314
JX
10770msgid "git update-ref [<options>] --stdin [-z]"
10771msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 10772
1b7f4a34 10773#: builtin/update-ref.c:363
ef317cd5 10774msgid "delete the reference"
07432cef 10775msgstr "删除引用"
ef317cd5 10776
1b7f4a34 10777#: builtin/update-ref.c:365
ef317cd5 10778msgid "update <refname> not the one it points to"
07432cef 10779msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 10780
1b7f4a34 10781#: builtin/update-ref.c:366
90314792
JX
10782msgid "stdin has NUL-terminated arguments"
10783msgstr "标准输入有以 NUL 字符终止的参数"
10784
1b7f4a34 10785#: builtin/update-ref.c:367
90314792
JX
10786msgid "read updates from stdin"
10787msgstr "从标准输入读取更新"
10788
ef317cd5
JX
10789#: builtin/update-server-info.c:6
10790msgid "git update-server-info [--force]"
07432cef 10791msgstr "git update-server-info [--force]"
ef317cd5
JX
10792
10793#: builtin/update-server-info.c:14
10794msgid "update the info files from scratch"
07432cef 10795msgstr "从头开始更新文件信息"
ef317cd5 10796
6acbf033 10797#: builtin/verify-commit.c:17
814ff314
JX
10798msgid "git verify-commit [-v | --verbose] <commit>..."
10799msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033 10800
1b7f4a34 10801#: builtin/verify-commit.c:72
6acbf033
JX
10802msgid "print commit contents"
10803msgstr "打印提交内容"
10804
1b7f4a34
JX
10805#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
10806msgid "print raw gpg status output"
10807msgstr "打印原始 gpg 状态输出"
10808
220c313c 10809#: builtin/verify-pack.c:54
814ff314
JX
10810msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10811msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 10812
220c313c 10813#: builtin/verify-pack.c:64
ef317cd5
JX
10814msgid "verbose"
10815msgstr "冗长输出"
10816
220c313c 10817#: builtin/verify-pack.c:66
ef317cd5 10818msgid "show statistics only"
07432cef 10819msgstr "只显示统计"
ef317cd5
JX
10820
10821#: builtin/verify-tag.c:17
814ff314
JX
10822msgid "git verify-tag [-v | --verbose] <tag>..."
10823msgstr "git verify-tag [-v | --verbose] <标签>..."
ef317cd5 10824
1b7f4a34 10825#: builtin/verify-tag.c:83
ef317cd5 10826msgid "print tag contents"
55a16ee4 10827msgstr "打印标签内容"
ef317cd5 10828
1b7f4a34 10829#: builtin/worktree.c:13
5bb01d4f
JX
10830msgid "git worktree add [<options>] <path> <branch>"
10831msgstr "git worktree add [<选项>] <路径> <分支>"
10832
1b7f4a34 10833#: builtin/worktree.c:14
5bb01d4f
JX
10834msgid "git worktree prune [<options>]"
10835msgstr "git worktree prune [<选项>]"
10836
1b7f4a34 10837#: builtin/worktree.c:36
5bb01d4f
JX
10838#, c-format
10839msgid "Removing worktrees/%s: not a valid directory"
10840msgstr "删除工作区/%s:不是一个有效的目录"
10841
1b7f4a34 10842#: builtin/worktree.c:42
5bb01d4f
JX
10843#, c-format
10844msgid "Removing worktrees/%s: gitdir file does not exist"
10845msgstr "删除 worktrees/%s:gitdir 文件不存在"
10846
1b7f4a34 10847#: builtin/worktree.c:47
5bb01d4f
JX
10848#, c-format
10849msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
10850msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
10851
1b7f4a34 10852#: builtin/worktree.c:58
5bb01d4f
JX
10853#, c-format
10854msgid "Removing worktrees/%s: invalid gitdir file"
10855msgstr "删除 worktrees/%s:无效的 gitdir 文件"
10856
1b7f4a34 10857#: builtin/worktree.c:74
5bb01d4f
JX
10858#, c-format
10859msgid "Removing worktrees/%s: gitdir file points to non-existent location"
10860msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
10861
1b7f4a34 10862#: builtin/worktree.c:109
5bb01d4f
JX
10863#, c-format
10864msgid "failed to remove: %s"
10865msgstr "无法删除:%s"
10866
1b7f4a34 10867#: builtin/worktree.c:198
5bb01d4f
JX
10868#, c-format
10869msgid "'%s' already exists"
10870msgstr "'%s' 已经存在"
10871
1b7f4a34 10872#: builtin/worktree.c:232
5bb01d4f
JX
10873#, c-format
10874msgid "could not create directory of '%s'"
10875msgstr "不能创建目录 '%s'"
10876
1b7f4a34 10877#: builtin/worktree.c:268
5bb01d4f 10878#, c-format
1b7f4a34
JX
10879msgid "Preparing %s (identifier %s)"
10880msgstr "准备 %s (标识符 %s)"
5bb01d4f 10881
1b7f4a34 10882#: builtin/worktree.c:316
5bb01d4f
JX
10883msgid "checkout <branch> even if already checked out in other worktree"
10884msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
10885
1b7f4a34 10886#: builtin/worktree.c:318
5bb01d4f
JX
10887msgid "create a new branch"
10888msgstr "创建一个新分支"
10889
1b7f4a34 10890#: builtin/worktree.c:320
5bb01d4f
JX
10891msgid "create or reset a branch"
10892msgstr "创建或重置一个分支"
10893
1b7f4a34 10894#: builtin/worktree.c:321
5bb01d4f
JX
10895msgid "detach HEAD at named commit"
10896msgstr "HEAD 从指定的提交分离"
10897
1b7f4a34
JX
10898#: builtin/worktree.c:328
10899msgid "-b, -B, and --detach are mutually exclusive"
10900msgstr "-b、-B 和 --detach 是互斥的"
5bb01d4f 10901
ef317cd5
JX
10902#: builtin/write-tree.c:13
10903msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 10904msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5
JX
10905
10906#: builtin/write-tree.c:26
10907msgid "<prefix>/"
07432cef 10908msgstr "<前缀>/"
ef317cd5
JX
10909
10910#: builtin/write-tree.c:27
10911msgid "write tree object for a subdirectory <prefix>"
07432cef 10912msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5
JX
10913
10914#: builtin/write-tree.c:30
10915msgid "only useful for debugging"
07432cef 10916msgstr "只对调试有用"
ef317cd5 10917
1b7f4a34 10918#: credential-cache--daemon.c:255
220c313c
JX
10919msgid "print debugging messages to stderr"
10920msgstr "调试信息输出到标准错误"
10921
d9d56b23 10922#: git.c:14
4dcdc3d8 10923msgid ""
220c313c 10924"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8
JX
10925"concept guides. See 'git help <command>' or 'git help <concept>'\n"
10926"to read about a specific subcommand or concept."
10927msgstr ""
220c313c
JX
10928"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
10929"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
10930"帮助。"
8ada9598 10931
1b7f4a34 10932#: common-cmds.h:9
7aea43ff
JX
10933msgid "start a working area (see also: git help tutorial)"
10934msgstr "开始一个工作区(参见:git help tutorial)"
10935
1b7f4a34 10936#: common-cmds.h:10
7aea43ff
JX
10937msgid "work on the current change (see also: git help everyday)"
10938msgstr "在当前变更上工作(参见:git help everyday)"
10939
1b7f4a34 10940#: common-cmds.h:11
7aea43ff
JX
10941msgid "examine the history and state (see also: git help revisions)"
10942msgstr "检查历史和状态(参见:git help revisions)"
10943
1b7f4a34 10944#: common-cmds.h:12
7aea43ff
JX
10945msgid "grow, mark and tweak your common history"
10946msgstr "扩展、标记和调校您的历史记录"
10947
1b7f4a34 10948#: common-cmds.h:13
7aea43ff
JX
10949msgid "collaborate (see also: git help workflows)"
10950msgstr "协同(参见:git help workflows)"
10951
1b7f4a34 10952#: common-cmds.h:17
8ada9598 10953msgid "Add file contents to the index"
81809b99 10954msgstr "添加文件内容至索引"
8ada9598 10955
1b7f4a34
JX
10956#: common-cmds.h:18
10957msgid "Use binary search to find the commit that introduced a bug"
10958msgstr "通过二分查找定位引入 bug 的提交"
8ada9598 10959
1b7f4a34 10960#: common-cmds.h:19
8ada9598 10961msgid "List, create, or delete branches"
81809b99 10962msgstr "列出、创建或删除分支"
8ada9598 10963
1b7f4a34 10964#: common-cmds.h:20
5bb01d4f
JX
10965msgid "Switch branches or restore working tree files"
10966msgstr "切换分支或恢复工作区文件"
8ada9598 10967
1b7f4a34 10968#: common-cmds.h:21
8ada9598 10969msgid "Clone a repository into a new directory"
160fb2b2 10970msgstr "克隆一个仓库到一个新目录"
8ada9598 10971
1b7f4a34 10972#: common-cmds.h:22
8ada9598 10973msgid "Record changes to the repository"
160fb2b2 10974msgstr "记录变更到仓库"
8ada9598 10975
1b7f4a34 10976#: common-cmds.h:23
8ada9598 10977msgid "Show changes between commits, commit and working tree, etc"
81809b99 10978msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 10979
1b7f4a34 10980#: common-cmds.h:24
8ada9598 10981msgid "Download objects and refs from another repository"
160fb2b2 10982msgstr "从另外一个仓库下载对象和引用"
8ada9598 10983
1b7f4a34 10984#: common-cmds.h:25
8ada9598 10985msgid "Print lines matching a pattern"
81809b99 10986msgstr "输出和模式匹配的行"
8ada9598 10987
1b7f4a34 10988#: common-cmds.h:26
a77c07d9 10989msgid "Create an empty Git repository or reinitialize an existing one"
160fb2b2 10990msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
8ada9598 10991
1b7f4a34 10992#: common-cmds.h:27
8ada9598 10993msgid "Show commit logs"
81809b99 10994msgstr "显示提交日志"
8ada9598 10995
1b7f4a34 10996#: common-cmds.h:28
8ada9598 10997msgid "Join two or more development histories together"
81809b99 10998msgstr "合并两个或更多开发历史"
8ada9598 10999
1b7f4a34 11000#: common-cmds.h:29
8ada9598 11001msgid "Move or rename a file, a directory, or a symlink"
81809b99 11002msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 11003
1b7f4a34 11004#: common-cmds.h:30
2e8451e8 11005msgid "Fetch from and integrate with another repository or a local branch"
160fb2b2 11006msgstr "获取并整合另外的仓库或一个本地分支"
8ada9598 11007
1b7f4a34 11008#: common-cmds.h:31
8ada9598 11009msgid "Update remote refs along with associated objects"
81809b99 11010msgstr "更新远程引用和相关的对象"
8ada9598 11011
1b7f4a34 11012#: common-cmds.h:32
8ada9598 11013msgid "Forward-port local commits to the updated upstream head"
81809b99 11014msgstr "本地提交转移至更新后的上游分支中"
8ada9598 11015
1b7f4a34 11016#: common-cmds.h:33
8ada9598 11017msgid "Reset current HEAD to the specified state"
4375c10e 11018msgstr "重置当前 HEAD 到指定状态"
8ada9598 11019
1b7f4a34 11020#: common-cmds.h:34
8ada9598 11021msgid "Remove files from the working tree and from the index"
81809b99 11022msgstr "从工作区和索引中删除文件"
8ada9598 11023
1b7f4a34 11024#: common-cmds.h:35
8ada9598 11025msgid "Show various types of objects"
81809b99 11026msgstr "显示各种类型的对象"
8ada9598 11027
1b7f4a34 11028#: common-cmds.h:36
8ada9598 11029msgid "Show the working tree status"
81809b99 11030msgstr "显示工作区状态"
8ada9598 11031
1b7f4a34 11032#: common-cmds.h:37
8ada9598 11033msgid "Create, list, delete or verify a tag object signed with GPG"
4375c10e 11034msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
8ada9598 11035
1b7f4a34 11036#: parse-options.h:145
220c313c
JX
11037msgid "expiry-date"
11038msgstr "到期时间"
11039
1b7f4a34 11040#: parse-options.h:160
220c313c
JX
11041msgid "no-op (backward compatibility)"
11042msgstr "空操作(向后兼容)"
11043
1b7f4a34 11044#: parse-options.h:236
220c313c
JX
11045msgid "be more verbose"
11046msgstr "更加详细"
11047
1b7f4a34 11048#: parse-options.h:238
220c313c
JX
11049msgid "be more quiet"
11050msgstr "更加安静"
11051
1b7f4a34 11052#: parse-options.h:244
220c313c
JX
11053msgid "use <n> digits to display SHA-1s"
11054msgstr "用 <n> 位数字显示 SHA-1 哈希值"
11055
1b7f4a34 11056#: rerere.h:28
220c313c
JX
11057msgid "update the index with reused conflict resolution if possible"
11058msgstr "如果可能,重用冲突解决更新索引"
11059
1b7f4a34 11060#: git-bisect.sh:50
b694fbb1
JX
11061msgid "You need to start by \"git bisect start\""
11062msgstr "您需要执行 \"git bisect start\" 来开始"
11063
90e6ef53 11064# 译者:注意保持句尾空格
c04f5ac3
JX
11065#. TRANSLATORS: Make sure to include [Y] and [n] in your
11066#. translation. The program will only accept English input
11067#. at this point.
1b7f4a34 11068#: git-bisect.sh:56
c04f5ac3
JX
11069msgid "Do you want me to do it for you [Y/n]? "
11070msgstr "您想让我为您这样做么[Y/n]? "
11071
1b7f4a34 11072#: git-bisect.sh:99
c04f5ac3
JX
11073#, sh-format
11074msgid "unrecognised option: '$arg'"
81809b99 11075msgstr "未能识别的选项:'$arg'"
c04f5ac3 11076
1b7f4a34 11077#: git-bisect.sh:103
c04f5ac3
JX
11078#, sh-format
11079msgid "'$arg' does not appear to be a valid revision"
11080msgstr "'$arg' 看起来不像是一个有效的版本"
11081
1b7f4a34 11082#: git-bisect.sh:132
c04f5ac3
JX
11083msgid "Bad HEAD - I need a HEAD"
11084msgstr "坏的 HEAD - 我需要一个 HEAD"
11085
1b7f4a34 11086#: git-bisect.sh:145
c04f5ac3
JX
11087#, sh-format
11088msgid ""
814ff314 11089"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
d9d56b23 11090msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
c04f5ac3 11091
1b7f4a34 11092#: git-bisect.sh:155
cfff71a9
JX
11093msgid "won't bisect on cg-seek'ed tree"
11094msgstr "不会在做了 cg-seek 的树上做二分查找"
c04f5ac3 11095
1b7f4a34 11096#: git-bisect.sh:159
c04f5ac3 11097msgid "Bad HEAD - strange symbolic ref"
90e6ef53 11098msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3 11099
1b7f4a34 11100#: git-bisect.sh:211
c04f5ac3
JX
11101#, sh-format
11102msgid "Bad bisect_write argument: $state"
90e6ef53 11103msgstr "坏的 bisect_write 参数:$state"
c04f5ac3 11104
1b7f4a34 11105#: git-bisect.sh:240
c04f5ac3
JX
11106#, sh-format
11107msgid "Bad rev input: $arg"
90e6ef53 11108msgstr "输入坏的版本:$arg"
c04f5ac3 11109
1b7f4a34 11110#: git-bisect.sh:255
c04f5ac3
JX
11111msgid "Please call 'bisect_state' with at least one argument."
11112msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
11113
1b7f4a34 11114#: git-bisect.sh:267
c04f5ac3
JX
11115#, sh-format
11116msgid "Bad rev input: $rev"
11117msgstr "输入坏的版本:$rev"
11118
04cb2f28 11119#: git-bisect.sh:276
1b7f4a34
JX
11120#, sh-format
11121msgid "'git bisect $TERM_BAD' can take only one argument."
11122msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
11123
11124#: git-bisect.sh:299
11125#, sh-format
11126msgid "Warning: bisecting only with a $TERM_BAD commit."
11127msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
b694fbb1 11128
90e6ef53 11129# 译者:注意保持句尾空格
c04f5ac3
JX
11130#. TRANSLATORS: Make sure to include [Y] and [n] in your
11131#. translation. The program will only accept English input
11132#. at this point.
1b7f4a34 11133#: git-bisect.sh:305
c04f5ac3
JX
11134msgid "Are you sure [Y/n]? "
11135msgstr "您确认么[Y/n]? "
11136
1b7f4a34
JX
11137#: git-bisect.sh:317
11138#, sh-format
b694fbb1 11139msgid ""
1b7f4a34
JX
11140"You need to give me at least one $bad_syn and one $good_syn revision.\n"
11141"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
b694fbb1
JX
11142msgstr ""
11143"您需要给我至少一个好版本和一个坏版本。\n"
1b7f4a34 11144"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
b694fbb1 11145
1b7f4a34
JX
11146#: git-bisect.sh:320
11147#, sh-format
b694fbb1
JX
11148msgid ""
11149"You need to start by \"git bisect start\".\n"
1b7f4a34
JX
11150"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
11151"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
b694fbb1
JX
11152msgstr ""
11153"您需要执行 \"git bisect start\" 来开始。\n"
11154"然后需要提供我至少一个好版本和一个坏版本。\n"
1b7f4a34 11155"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
b694fbb1 11156
1b7f4a34 11157#: git-bisect.sh:391 git-bisect.sh:521
b694fbb1
JX
11158msgid "We are not bisecting."
11159msgstr "我们没有在二分查找。"
11160
1b7f4a34 11161#: git-bisect.sh:398
c04f5ac3
JX
11162#, sh-format
11163msgid "'$invalid' is not a valid commit"
11164msgstr "'$invalid' 不是一个有效的提交"
11165
1b7f4a34 11166#: git-bisect.sh:407
c04f5ac3
JX
11167#, sh-format
11168msgid ""
11169"Could not check out original HEAD '$branch'.\n"
11170"Try 'git bisect reset <commit>'."
11171msgstr ""
11172"不能检出原始 HEAD '$branch'。\n"
07432cef 11173"尝试 'git bisect reset <提交>'。"
c04f5ac3 11174
1b7f4a34 11175#: git-bisect.sh:435
c04f5ac3
JX
11176msgid "No logfile given"
11177msgstr "未提供日志文件"
11178
1b7f4a34 11179#: git-bisect.sh:436
c04f5ac3
JX
11180#, sh-format
11181msgid "cannot read $file for replaying"
11182msgstr "不能读取 $file 来重放"
11183
1b7f4a34 11184#: git-bisect.sh:455
c04f5ac3
JX
11185msgid "?? what are you talking about?"
11186msgstr "?? 您在说什么?"
11187
1b7f4a34 11188#: git-bisect.sh:467
b694fbb1
JX
11189#, sh-format
11190msgid "running $command"
11191msgstr "运行 $command"
11192
1b7f4a34 11193#: git-bisect.sh:474
b694fbb1
JX
11194#, sh-format
11195msgid ""
11196"bisect run failed:\n"
11197"exit code $res from '$command' is < 0 or >= 128"
11198msgstr ""
11199"二分查找运行失败:\n"
07432cef 11200"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 11201
1b7f4a34 11202#: git-bisect.sh:500
b694fbb1
JX
11203msgid "bisect run cannot continue any more"
11204msgstr "二分查找不能继续运行"
11205
1b7f4a34 11206#: git-bisect.sh:506
b694fbb1
JX
11207#, sh-format
11208msgid ""
11209"bisect run failed:\n"
11210"'bisect_state $state' exited with error code $res"
11211msgstr ""
11212"二分查找运行失败:\n"
11213"'bisect_state $state' 退出码为 $res"
11214
1b7f4a34 11215#: git-bisect.sh:513
b694fbb1
JX
11216msgid "bisect run success"
11217msgstr "二分查找运行成功"
c04f5ac3 11218
1b7f4a34 11219#: git-bisect.sh:548
b694fbb1 11220#, sh-format
1b7f4a34
JX
11221msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
11222msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
c04f5ac3 11223
6c94aba5 11224#: git-rebase.sh:57
649900bc
JX
11225msgid ""
11226"When you have resolved this problem, run \"git rebase --continue\".\n"
11227"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
11228"To check out the original branch and stop rebasing, run \"git rebase --abort"
11229"\"."
11230msgstr ""
11231"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
11232"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
11233"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
11234
6acbf033 11235#: git-rebase.sh:165
2e8451e8
JX
11236msgid "Applied autostash."
11237msgstr "成功应用 autostash。"
11238
6acbf033 11239#: git-rebase.sh:168
2e8451e8
JX
11240#, sh-format
11241msgid "Cannot store $stash_sha1"
11242msgstr "无法保存 $stash_sha1"
11243
6acbf033 11244#: git-rebase.sh:169
2e8451e8
JX
11245msgid ""
11246"Applying autostash resulted in conflicts.\n"
11247"Your changes are safe in the stash.\n"
b1894384 11248"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
2e8451e8
JX
11249msgstr ""
11250"应用 autostash 导致冲突。\n"
11251"您的修改安全地保存在 stash 中。\n"
11252"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
11253
6acbf033 11254#: git-rebase.sh:208
649900bc 11255msgid "The pre-rebase hook refused to rebase."
98b2761d 11256msgstr "钩子 pre-rebase 拒绝变基操作。"
649900bc 11257
6acbf033 11258#: git-rebase.sh:213
649900bc
JX
11259msgid "It looks like git-am is in progress. Cannot rebase."
11260msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
11261
6acbf033 11262#: git-rebase.sh:351
649900bc
JX
11263msgid "The --exec option must be used with the --interactive option"
11264msgstr "选项 --exec 必须和选项 --interactive 同时使用"
11265
6acbf033 11266#: git-rebase.sh:356
649900bc
JX
11267msgid "No rebase in progress?"
11268msgstr "没有正在进行的变基?"
11269
6acbf033 11270#: git-rebase.sh:367
07432cef
WS
11271msgid "The --edit-todo action can only be used during interactive rebase."
11272msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
11273
6acbf033 11274#: git-rebase.sh:374
649900bc
JX
11275msgid "Cannot read HEAD"
11276msgstr "不能读取 HEAD"
11277
6acbf033 11278#: git-rebase.sh:377
649900bc
JX
11279msgid ""
11280"You must edit all merge conflicts and then\n"
11281"mark them as resolved using git add"
11282msgstr ""
11283"您必须编辑所有的合并冲突,然后通过 git add\n"
11284"命令将它们标记为已解决"
11285
6acbf033 11286#: git-rebase.sh:395
649900bc
JX
11287#, sh-format
11288msgid "Could not move back to $head_name"
11289msgstr "无法移回 $head_name"
11290
6acbf033 11291#: git-rebase.sh:414
649900bc
JX
11292#, sh-format
11293msgid ""
11294"It seems that there is already a $state_dir_base directory, and\n"
11295"I wonder if you are in the middle of another rebase. If that is the\n"
11296"case, please try\n"
11297"\t$cmd_live_rebase\n"
11298"If that is not the case, please\n"
11299"\t$cmd_clear_stale_rebase\n"
11300"and run me again. I am stopping in case you still have something\n"
11301"valuable there."
11302msgstr ""
98b2761d
JX
11303"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
11304"过程中。 如果是这样,请执行\n"
649900bc
JX
11305"\t$cmd_live_rebase\n"
11306"如果不是这样,请执行\n"
11307"\t$cmd_clear_stale_rebase\n"
98b2761d 11308"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
649900bc 11309
6acbf033 11310#: git-rebase.sh:465
649900bc
JX
11311#, sh-format
11312msgid "invalid upstream $upstream_name"
11313msgstr "无效的上游 $upstream_name"
11314
6acbf033 11315#: git-rebase.sh:489
649900bc
JX
11316#, sh-format
11317msgid "$onto_name: there are more than one merge bases"
11318msgstr "$onto_name: 有一个以上的合并基准"
11319
6acbf033 11320#: git-rebase.sh:492 git-rebase.sh:496
649900bc
JX
11321#, sh-format
11322msgid "$onto_name: there is no merge base"
11323msgstr "$onto_name: 没有合并基准"
11324
6acbf033 11325#: git-rebase.sh:501
649900bc
JX
11326#, sh-format
11327msgid "Does not point to a valid commit: $onto_name"
11328msgstr "没有指向一个有效的提交:$onto_name"
11329
6acbf033 11330#: git-rebase.sh:524
649900bc
JX
11331#, sh-format
11332msgid "fatal: no such branch: $branch_name"
11333msgstr "严重错误:无此分支:$branch_name"
11334
6acbf033 11335#: git-rebase.sh:557
2e8451e8
JX
11336msgid "Cannot autostash"
11337msgstr "无法 autostash"
11338
6acbf033 11339#: git-rebase.sh:562
2e8451e8
JX
11340#, sh-format
11341msgid "Created autostash: $stash_abbrev"
11342msgstr "创建了 autostash: $stash_abbrev"
11343
6acbf033 11344#: git-rebase.sh:566
649900bc
JX
11345msgid "Please commit or stash them."
11346msgstr "请提交或为它们保存进度。"
11347
6acbf033 11348#: git-rebase.sh:586
649900bc
JX
11349#, sh-format
11350msgid "Current branch $branch_name is up to date."
11351msgstr "当前分支 $branch_name 是最新的。"
11352
6acbf033 11353#: git-rebase.sh:590
649900bc
JX
11354#, sh-format
11355msgid "Current branch $branch_name is up to date, rebase forced."
11356msgstr "当前分支 $branch_name 是最新的,强制变基。"
11357
6acbf033 11358#: git-rebase.sh:601
649900bc
JX
11359#, sh-format
11360msgid "Changes from $mb to $onto:"
11361msgstr "变更从 $mb 到 $onto:"
11362
6acbf033 11363#: git-rebase.sh:610
649900bc 11364msgid "First, rewinding head to replay your work on top of it..."
160fb2b2 11365msgstr "首先,回退分支以便在上面重放您的工作..."
649900bc 11366
6acbf033 11367#: git-rebase.sh:620
649900bc
JX
11368#, sh-format
11369msgid "Fast-forwarded $branch_name to $onto_name."
11370msgstr "快进 $branch_name 至 $onto_name。"
11371
c04f5ac3
JX
11372#: git-stash.sh:51
11373msgid "git stash clear with parameters is unimplemented"
11374msgstr "git stash clear 不支持参数"
11375
11376#: git-stash.sh:74
11377msgid "You do not have the initial commit yet"
11378msgstr "您尚未建立初始提交"
11379
11380#: git-stash.sh:89
11381msgid "Cannot save the current index state"
90e6ef53 11382msgstr "无法保存当前索引状态"
c04f5ac3 11383
6acbf033 11384#: git-stash.sh:124 git-stash.sh:137
c04f5ac3
JX
11385msgid "Cannot save the current worktree state"
11386msgstr "无法保存当前工作区状态"
11387
6acbf033 11388#: git-stash.sh:141
c04f5ac3 11389msgid "No changes selected"
90e6ef53 11390msgstr "没有选择变更"
c04f5ac3 11391
6acbf033 11392#: git-stash.sh:144
c04f5ac3 11393msgid "Cannot remove temporary index (can't happen)"
90e6ef53 11394msgstr "无法删除临时索引(不应发生)"
c04f5ac3 11395
6acbf033 11396#: git-stash.sh:157
c04f5ac3
JX
11397msgid "Cannot record working tree state"
11398msgstr "不能记录工作区状态"
11399
1b7f4a34 11400#: git-stash.sh:189
2e8451e8
JX
11401#, sh-format
11402msgid "Cannot update $ref_stash with $w_commit"
11403msgstr "无法用 $w_commit 更新 $ref_stash"
11404
b694fbb1
JX
11405#. TRANSLATORS: $option is an invalid option, like
11406#. `--blah-blah'. The 7 spaces at the beginning of the
11407#. second line correspond to "error: ". So you should line
11408#. up the second line with however many characters the
11409#. translation of "error: " takes in your language. E.g. in
11410#. English this is:
11411#.
11412#. $ git stash save --blah-blah 2>&1 | head -n 2
11413#. error: unknown option for 'stash save': --blah-blah
11414#. To provide a message, use git stash save -- '--blah-blah'
1b7f4a34 11415#: git-stash.sh:239
b694fbb1
JX
11416#, sh-format
11417msgid ""
11418"error: unknown option for 'stash save': $option\n"
11419" To provide a message, use git stash save -- '$option'"
11420msgstr ""
11421"错误:'stash save' 的未知选项:$option\n"
11422" 要提供一个描述信息,使用 git stash save -- '$option'"
11423
1b7f4a34 11424#: git-stash.sh:260
c04f5ac3
JX
11425msgid "No local changes to save"
11426msgstr "没有要保存的本地修改"
11427
1b7f4a34 11428#: git-stash.sh:264
c04f5ac3 11429msgid "Cannot initialize stash"
90e6ef53 11430msgstr "无法初始化 stash"
c04f5ac3 11431
1b7f4a34 11432#: git-stash.sh:268
c04f5ac3
JX
11433msgid "Cannot save the current status"
11434msgstr "无法保存当前状态"
11435
1b7f4a34 11436#: git-stash.sh:286
c04f5ac3
JX
11437msgid "Cannot remove worktree changes"
11438msgstr "无法删除工作区变更"
11439
1b7f4a34 11440#: git-stash.sh:387
7aea43ff
JX
11441#, sh-format
11442msgid "unknown option: $opt"
11443msgstr "未知选项: $opt"
11444
1b7f4a34 11445#: git-stash.sh:397
c04f5ac3 11446msgid "No stash found."
90e6ef53 11447msgstr "未发现 stash。"
c04f5ac3 11448
1b7f4a34 11449#: git-stash.sh:404
c04f5ac3
JX
11450#, sh-format
11451msgid "Too many revisions specified: $REV"
90e6ef53 11452msgstr "指定了太多的版本:$REV"
c04f5ac3 11453
1b7f4a34 11454#: git-stash.sh:410
c04f5ac3 11455#, sh-format
220c313c
JX
11456msgid "$reference is not a valid reference"
11457msgstr "$reference 不是一个有效的引用"
c04f5ac3 11458
1b7f4a34 11459#: git-stash.sh:438
c04f5ac3
JX
11460#, sh-format
11461msgid "'$args' is not a stash-like commit"
90e6ef53 11462msgstr "'$args' 不是 stash 样提交"
c04f5ac3 11463
1b7f4a34 11464#: git-stash.sh:449
c04f5ac3
JX
11465#, sh-format
11466msgid "'$args' is not a stash reference"
90e6ef53 11467msgstr "'$args' 不是一个 stash 引用"
c04f5ac3 11468
1b7f4a34 11469#: git-stash.sh:457
c04f5ac3 11470msgid "unable to refresh index"
90e6ef53 11471msgstr "无法刷新索引"
c04f5ac3 11472
1b7f4a34 11473#: git-stash.sh:461
c04f5ac3
JX
11474msgid "Cannot apply a stash in the middle of a merge"
11475msgstr "无法在合并过程中恢复进度"
11476
1b7f4a34 11477#: git-stash.sh:469
c04f5ac3 11478msgid "Conflicts in index. Try without --index."
90e6ef53 11479msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 11480
1b7f4a34 11481#: git-stash.sh:471
c04f5ac3 11482msgid "Could not save index tree"
90e6ef53 11483msgstr "不能保存索引树"
c04f5ac3 11484
1b7f4a34 11485#: git-stash.sh:505
c04f5ac3 11486msgid "Cannot unstage modified files"
160fb2b2 11487msgstr "无法将修改的文件取消暂存"
c04f5ac3 11488
1b7f4a34 11489#: git-stash.sh:520
b694fbb1
JX
11490msgid "Index was not unstashed."
11491msgstr "索引的进度没有被恢复。"
11492
1b7f4a34 11493#: git-stash.sh:543
c04f5ac3
JX
11494#, sh-format
11495msgid "Dropped ${REV} ($s)"
11496msgstr "丢弃了 ${REV} ($s)"
11497
1b7f4a34 11498#: git-stash.sh:544
c04f5ac3
JX
11499#, sh-format
11500msgid "${REV}: Could not drop stash entry"
90e6ef53 11501msgstr "${REV}:不能丢弃进度条目"
c04f5ac3 11502
1b7f4a34 11503#: git-stash.sh:552
c04f5ac3
JX
11504msgid "No branch name specified"
11505msgstr "未指定分支名"
11506
1b7f4a34 11507#: git-stash.sh:624
c04f5ac3
JX
11508msgid "(To restore them type \"git stash apply\")"
11509msgstr "(为恢复数据输入 \"git stash apply\")"
11510
2e8451e8 11511#: git-submodule.sh:95
c04f5ac3
JX
11512#, sh-format
11513msgid "cannot strip one component off url '$remoteurl'"
11514msgstr "无法从 url '$remoteurl' 剥离一个组件"
11515
2e8451e8 11516#: git-submodule.sh:237
c04f5ac3 11517#, sh-format
170e9899
JX
11518msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
11519msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
c04f5ac3 11520
6c94aba5 11521#: git-submodule.sh:287
c04f5ac3 11522#, sh-format
170e9899
JX
11523msgid "Clone of '$url' into submodule path '$sm_path' failed"
11524msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
c04f5ac3 11525
6acbf033 11526#: git-submodule.sh:296
dac1de7d
JX
11527#, sh-format
11528msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
07432cef 11529msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
dac1de7d 11530
6acbf033 11531#: git-submodule.sh:406
2e8451e8
JX
11532msgid "Relative path can only be used from the toplevel of the working tree"
11533msgstr "只能在工作区的顶级目录中使用相对路径"
11534
6acbf033 11535#: git-submodule.sh:416
c04f5ac3
JX
11536#, sh-format
11537msgid "repo URL: '$repo' must be absolute or begin with ./|../"
4375c10e 11538msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
c04f5ac3 11539
6acbf033 11540#: git-submodule.sh:433
c04f5ac3 11541#, sh-format
170e9899
JX
11542msgid "'$sm_path' already exists in the index"
11543msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 11544
6acbf033 11545#: git-submodule.sh:437
b694fbb1
JX
11546#, sh-format
11547msgid ""
11548"The following path is ignored by one of your .gitignore files:\n"
11549"$sm_path\n"
11550"Use -f if you really want to add it."
11551msgstr ""
11552"以下路径被您的一个 .gitignore 文件所忽略:\n"
11553"$sm_path\n"
11554"如果您确实想添加它,使用 -f 参数。"
11555
6acbf033 11556#: git-submodule.sh:455
b694fbb1
JX
11557#, sh-format
11558msgid "Adding existing repo at '$sm_path' to the index"
160fb2b2 11559msgstr "添加位于 '$sm_path' 的现存仓库到索引"
b694fbb1 11560
6acbf033 11561#: git-submodule.sh:457
c04f5ac3 11562#, sh-format
170e9899 11563msgid "'$sm_path' already exists and is not a valid git repo"
160fb2b2 11564msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
c04f5ac3 11565
6acbf033 11566#: git-submodule.sh:465
07432cef
WS
11567#, sh-format
11568msgid "A git directory for '$sm_name' is found locally with remote(s):"
160fb2b2 11569msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
07432cef 11570
6acbf033 11571#: git-submodule.sh:467
07432cef
WS
11572#, sh-format
11573msgid ""
11574"If you want to reuse this local git directory instead of cloning again from"
11575msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11576
6acbf033 11577#: git-submodule.sh:469
07432cef
WS
11578#, sh-format
11579msgid ""
11580"use the '--force' option. If the local git directory is not the correct repo"
160fb2b2 11581msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
07432cef 11582
6acbf033 11583#: git-submodule.sh:470
07432cef
WS
11584#, sh-format
11585msgid ""
11586"or you are unsure what this means choose another name with the '--name' "
11587"option."
11588msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11589
6acbf033 11590#: git-submodule.sh:472
07432cef
WS
11591#, sh-format
11592msgid "Reactivating local git directory for submodule '$sm_name'."
11593msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11594
6acbf033 11595#: git-submodule.sh:484
c04f5ac3 11596#, sh-format
170e9899
JX
11597msgid "Unable to checkout submodule '$sm_path'"
11598msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 11599
6acbf033 11600#: git-submodule.sh:489
c04f5ac3 11601#, sh-format
170e9899
JX
11602msgid "Failed to add submodule '$sm_path'"
11603msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 11604
6acbf033 11605#: git-submodule.sh:498
c04f5ac3 11606#, sh-format
170e9899
JX
11607msgid "Failed to register submodule '$sm_path'"
11608msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 11609
6acbf033 11610#: git-submodule.sh:542
c04f5ac3 11611#, sh-format
2e8451e8
JX
11612msgid "Entering '$prefix$displaypath'"
11613msgstr "正在进入 '$prefix$displaypath'"
c04f5ac3 11614
6acbf033 11615#: git-submodule.sh:562
c04f5ac3 11616#, sh-format
2e8451e8
JX
11617msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11618msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
c04f5ac3 11619
6acbf033 11620#: git-submodule.sh:608
c04f5ac3 11621#, sh-format
2e8451e8
JX
11622msgid "No url found for submodule path '$displaypath' in .gitmodules"
11623msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
c04f5ac3 11624
6acbf033 11625#: git-submodule.sh:617
c04f5ac3 11626#, sh-format
2e8451e8
JX
11627msgid "Failed to register url for submodule path '$displaypath'"
11628msgstr "无法为子模组路径 '$displaypath' 注册 url"
c04f5ac3 11629
6acbf033 11630#: git-submodule.sh:619
c04f5ac3 11631#, sh-format
2e8451e8
JX
11632msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11633msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
c04f5ac3 11634
6acbf033 11635#: git-submodule.sh:636
d691f479 11636#, sh-format
2e8451e8
JX
11637msgid "Failed to register update mode for submodule path '$displaypath'"
11638msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
d691f479 11639
6acbf033 11640#: git-submodule.sh:674
1003b3a5
JX
11641#, sh-format
11642msgid "Use '.' if you really want to deinitialize all submodules"
11643msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
11644
6acbf033 11645#: git-submodule.sh:691
1003b3a5 11646#, sh-format
2e8451e8
JX
11647msgid "Submodule work tree '$displaypath' contains a .git directory"
11648msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
1003b3a5 11649
6acbf033 11650#: git-submodule.sh:692
1003b3a5
JX
11651#, sh-format
11652msgid ""
11653"(use 'rm -rf' if you really want to remove it including all of its history)"
11654msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11655
6acbf033 11656#: git-submodule.sh:698
c04f5ac3
JX
11657#, sh-format
11658msgid ""
2e8451e8 11659"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
1003b3a5 11660"discard them"
2e8451e8 11661msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
1003b3a5 11662
6acbf033 11663#: git-submodule.sh:701
1003b3a5 11664#, sh-format
2e8451e8
JX
11665msgid "Cleared directory '$displaypath'"
11666msgstr "已清除目录 '$displaypath'"
1003b3a5 11667
6acbf033 11668#: git-submodule.sh:702
1003b3a5 11669#, sh-format
2e8451e8
JX
11670msgid "Could not remove submodule work tree '$displaypath'"
11671msgstr "无法移除子模组工作区 '$displaypath'"
1003b3a5 11672
6acbf033 11673#: git-submodule.sh:705
1003b3a5 11674#, sh-format
2e8451e8
JX
11675msgid "Could not create empty submodule directory '$displaypath'"
11676msgstr "不能创建空的子模组目录 '$displaypath'"
1003b3a5 11677
6acbf033 11678#: git-submodule.sh:714
1003b3a5 11679#, sh-format
2e8451e8
JX
11680msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11681msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
1003b3a5 11682
6acbf033 11683#: git-submodule.sh:830
1003b3a5
JX
11684#, sh-format
11685msgid ""
2e8451e8 11686"Submodule path '$displaypath' not initialized\n"
c04f5ac3
JX
11687"Maybe you want to use 'update --init'?"
11688msgstr ""
2e8451e8 11689"子模组路径 '$displaypath' 没有初始化\n"
90e6ef53 11690"也许您想用 'update --init'?"
c04f5ac3 11691
6acbf033 11692#: git-submodule.sh:843
c04f5ac3 11693#, sh-format
2e8451e8
JX
11694msgid "Unable to find current revision in submodule path '$displaypath'"
11695msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 11696
6acbf033 11697#: git-submodule.sh:852
c04f5ac3 11698#, sh-format
170e9899
JX
11699msgid "Unable to fetch in submodule path '$sm_path'"
11700msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 11701
6acbf033 11702#: git-submodule.sh:876
2e8451e8
JX
11703#, sh-format
11704msgid "Unable to fetch in submodule path '$displaypath'"
11705msgstr "无法在子模组路径 '$displaypath' 中获取"
11706
6acbf033 11707#: git-submodule.sh:890
6c94aba5
JX
11708#, sh-format
11709msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11710msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
11711
6acbf033 11712#: git-submodule.sh:891
c04f5ac3 11713#, sh-format
6c94aba5
JX
11714msgid "Submodule path '$displaypath': checked out '$sha1'"
11715msgstr "子模组路径 '$displaypath':检出 '$sha1'"
11716
6acbf033 11717#: git-submodule.sh:895
6c94aba5 11718#, sh-format
2e8451e8
JX
11719msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11720msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 11721
6acbf033 11722#: git-submodule.sh:896
c04f5ac3 11723#, sh-format
2e8451e8
JX
11724msgid "Submodule path '$displaypath': rebased into '$sha1'"
11725msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 11726
6acbf033 11727#: git-submodule.sh:901
c04f5ac3 11728#, sh-format
2e8451e8
JX
11729msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11730msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 11731
6acbf033 11732#: git-submodule.sh:902
c04f5ac3 11733#, sh-format
2e8451e8
JX
11734msgid "Submodule path '$displaypath': merged in '$sha1'"
11735msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 11736
6acbf033 11737#: git-submodule.sh:907
c04f5ac3 11738#, sh-format
2e8451e8 11739msgid ""
1b7f4a34 11740"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
2e8451e8 11741msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
c04f5ac3 11742
6acbf033 11743#: git-submodule.sh:908
c04f5ac3 11744#, sh-format
2e8451e8
JX
11745msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11746msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
c04f5ac3 11747
6acbf033 11748#: git-submodule.sh:938
2e8451e8
JX
11749#, sh-format
11750msgid "Failed to recurse into submodule path '$displaypath'"
11751msgstr "无法递归进子模组路径 '$displaypath'"
11752
6acbf033 11753#: git-submodule.sh:1046
649900bc
JX
11754msgid "The --cached option cannot be used with the --files option"
11755msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1 11756
6acbf033 11757#: git-submodule.sh:1098
b694fbb1
JX
11758#, sh-format
11759msgid "unexpected mode $mod_dst"
11760msgstr "意外的模式 $mod_dst"
c04f5ac3 11761
90e6ef53 11762# 译者:注意保持前导空格
6acbf033 11763#: git-submodule.sh:1118
c04f5ac3 11764#, sh-format
2e8451e8
JX
11765msgid " Warn: $display_name doesn't contain commit $sha1_src"
11766msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 11767
90e6ef53 11768# 译者:注意保持前导空格
6acbf033 11769#: git-submodule.sh:1121
c04f5ac3 11770#, sh-format
2e8451e8
JX
11771msgid " Warn: $display_name doesn't contain commit $sha1_dst"
11772msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 11773
90e6ef53 11774# 译者:注意保持前导空格
6acbf033 11775#: git-submodule.sh:1124
c04f5ac3 11776#, sh-format
2e8451e8
JX
11777msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11778msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 11779
6acbf033 11780#: git-submodule.sh:1149
c04f5ac3 11781msgid "blob"
07432cef 11782msgstr "数据对象"
c04f5ac3 11783
6acbf033 11784#: git-submodule.sh:1267
1003b3a5
JX
11785#, sh-format
11786msgid "Failed to recurse into submodule path '$sm_path'"
11787msgstr "无法递归进子模组路径 '$sm_path'"
11788
6acbf033 11789#: git-submodule.sh:1331
c04f5ac3 11790#, sh-format
2e8451e8
JX
11791msgid "Synchronizing submodule url for '$displaypath'"
11792msgstr "为 '$displaypath' 同步子模组 url"
1b7f4a34 11793
03ea3327
JX
11794#~ msgid "false|true|preserve"
11795#~ msgstr "false|true|preserve"
11796
1b7f4a34
JX
11797#~ msgid "BUG: reopen a lockfile that is still open"
11798#~ msgstr "BUG: 重新打开一个仍打开着的锁文件"
11799
11800#~ msgid "BUG: reopen a lockfile that has been committed"
11801#~ msgstr "BUG: 重新打开一个已提交的锁文件"
11802
11803#~ msgid "option %s does not accept negative form"
11804#~ msgstr "选项 %s 不接受否定格式"
11805
11806#~ msgid "unable to parse value '%s' for option %s"
11807#~ msgstr "不能解析选项 %1$s 的值 '%2$s'"
11808
11809#~ msgid "unable to resolve HEAD"
11810#~ msgstr "不能解析 HEAD"
11811
11812#~ msgid "-b and -B are mutually exclusive"
11813#~ msgstr "-b 和 -B 互斥"
11814
11815#~ msgid "You need to set your committer info first"
11816#~ msgstr "您需要先设置你的提交者信息"
11817
11818#~ msgid ""
11819#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
11820#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
11821#~ "To restore the original branch and stop patching, run \"$cmdline --abort"
11822#~ "\"."
11823#~ msgstr ""
11824#~ "当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
11825#~ "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
11826#~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
11827
11828#~ msgid "Patch format $patch_format is not supported."
11829#~ msgstr "不支持 $patch_format 补丁格式。"
11830
11831#~ msgid "Please make up your mind. --skip or --abort?"
11832#~ msgstr "请下决心。--skip 或是 --abort ?"
11833
11834#~ msgid ""
11835#~ "Patch is empty. Was it split wrong?\n"
11836#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
11837#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
11838#~ msgstr ""
11839#~ "补丁为空。是不是切分错误?\n"
11840#~ "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
11841#~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
11842
11843#~ msgid "Patch does not have a valid e-mail address."
11844#~ msgstr "补丁中没有一个有效的邮件地址。"
11845
11846#~ msgid "Applying: $FIRSTLINE"
11847#~ msgstr "正应用:$FIRSTLINE"
11848
11849#~ msgid "Patch failed at $msgnum $FIRSTLINE"
11850#~ msgstr "补丁失败于 $msgnum $FIRSTLINE"
11851
11852#~ msgid ""
11853#~ "Pull is not possible because you have unmerged files.\n"
11854#~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
11855#~ "as appropriate to mark resolution and make a commit."
11856#~ msgstr ""
11857#~ "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
11858#~ "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
11859
11860#~ msgid "Pull is not possible because you have unmerged files."
11861#~ msgstr "Pull 不可用,因为您尚有未合并的文件。"