]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
l10n: pt_PT: update Portuguese translation
[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 上层封装命令的别称)
94550ed3 90# precious-objects repo | 珍品仓库
160fb2b2
JX
91# prune | 清除
92# pull | 拉,拉取
93# push | 推,推送
94# reachable | 可达
95# rebase | 变基
96# ref | 引用
97# reflog | 引用日志
98# refspec | 引用规格
99# remote | 远程,远程仓库
100# remote-tracking branch | 远程跟踪分支
101# replay | 重放
102# repo | 仓库
103# repository | 仓库
104# resolve | (冲突)解决
105# revert | 还原
106# revision | 版本
107# rewind | 回退
108# SCM | 源代码管理(工具)
ee7589bb 109# SHA-1 | SHA-1(安全哈希算法1)
160fb2b2
JX
110# shallow repository | 浅(克隆)仓库
111# signed tag | 签名标签
755c831b 112# smart HTTP protocol | 智能 HTTP 协议
160fb2b2
JX
113# squash | 压缩
114# stage | n. 暂存区(即索引); v. 暂存
115# stash | n. 进度保存; v. 保存进度
116# submodule | 子模组
117# symref | 符号引用
933c015e 118# tag | n. 标签; v. 打标签
160fb2b2
JX
119# tag object | 标签对象
120# tagger | 打标签者
121# topic branch | 主题分支
122# track | 跟踪
123# tree | 树(工作区或树对象)
124# tree object | 树对象
125# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
126# unmerged index | 未合并索引
127# unpack | 解包
128# unreachable object | 不可达对象
129# unstage | 取消暂存
130# upstream | 上游
131# upstream branch | 上游分支
132# working tree | 工作区
133#
c04f5ac3
JX
134msgid ""
135msgstr ""
136"Project-Id-Version: Git\n"
137"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
5c0c220c
JX
138"POT-Creation-Date: 2016-03-16 00:16+0800\n"
139"PO-Revision-Date: 2016-03-16 00:18+0800\n"
c04f5ac3 140"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
7aea43ff 141"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
c04f5ac3
JX
142"Language: zh_CN\n"
143"MIME-Version: 1.0\n"
144"Content-Type: text/plain; charset=UTF-8\n"
145"Content-Transfer-Encoding: 8bit\n"
5ae481e0 146"Plural-Forms: nplurals=2; plural=(n != 1);\n"
c04f5ac3 147
6c94aba5 148#: advice.c:55
c04f5ac3
JX
149#, c-format
150msgid "hint: %.*s\n"
151msgstr "提示:%.*s\n"
152
6acbf033 153#: advice.c:88
c04f5ac3 154msgid ""
6acbf033 155"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 156"as appropriate to mark resolution and make a commit."
c04f5ac3 157msgstr ""
d9d56b23 158"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
220c313c 159"解决方案并提交。"
c04f5ac3 160
276ceeaa 161#: advice.c:101 builtin/merge.c:1226
1b7f4a34
JX
162msgid "You have not concluded your merge (MERGE_HEAD exists)."
163msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
164
165#: advice.c:103
94550ed3 166msgid "Please, commit your changes before merging."
1b7f4a34
JX
167msgstr "请在合并前先提交您的修改。"
168
169#: advice.c:104
170msgid "Exiting because of unfinished merge."
171msgstr "因为存在未完成的合并而退出。"
172
173#: archive.c:12
814ff314
JX
174msgid "git archive [<options>] <tree-ish> [<path>...]"
175msgstr "git archive [<选项>] <树或提交> [<路径>...]"
ef317cd5 176
1b7f4a34 177#: archive.c:13
ef317cd5 178msgid "git archive --list"
07432cef 179msgstr "git archive --list"
ef317cd5 180
1b7f4a34 181#: archive.c:14
ef317cd5 182msgid ""
814ff314 183"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
ef317cd5 184msgstr ""
160fb2b2 185"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
ef317cd5 186
1b7f4a34 187#: archive.c:15
ef317cd5 188msgid "git archive --remote <repo> [--exec <cmd>] --list"
160fb2b2 189msgstr "git archive --remote <仓库> [--exec <命令>] --list"
ef317cd5 190
94550ed3 191#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
90314792
JX
192#, c-format
193msgid "pathspec '%s' did not match any files"
160fb2b2 194msgstr "路径规格 '%s' 未匹配任何文件"
90314792 195
94550ed3 196#: archive.c:429
ef317cd5 197msgid "fmt"
07432cef 198msgstr "格式"
ef317cd5 199
94550ed3 200#: archive.c:429
ef317cd5 201msgid "archive format"
07432cef 202msgstr "归档格式"
ef317cd5 203
276ceeaa 204#: archive.c:430 builtin/log.c:1232
ef317cd5 205msgid "prefix"
07432cef 206msgstr "前缀"
ef317cd5 207
94550ed3 208#: archive.c:431
ef317cd5 209msgid "prepend prefix to each pathname in the archive"
07432cef 210msgstr "为归档中每个路径名加上前缀"
ef317cd5 211
276ceeaa
JX
212#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547
213#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987
214#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100
215#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
216#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
ef317cd5
JX
217msgid "file"
218msgstr "文件"
219
94550ed3 220#: archive.c:433 builtin/archive.c:89
ef317cd5 221msgid "write the archive to this file"
07432cef 222msgstr "归档写入此文件"
ef317cd5 223
94550ed3 224#: archive.c:435
ef317cd5 225msgid "read .gitattributes in working directory"
07432cef 226msgstr "读取工作区中的 .gitattributes"
ef317cd5 227
94550ed3 228#: archive.c:436
ef317cd5 229msgid "report archived files on stderr"
07432cef 230msgstr "在标准错误上报告归档文件"
ef317cd5 231
94550ed3 232#: archive.c:437
ef317cd5 233msgid "store only"
07432cef 234msgstr "只存储"
ef317cd5 235
94550ed3 236#: archive.c:438
ef317cd5 237msgid "compress faster"
07432cef 238msgstr "压缩速度更快"
ef317cd5 239
94550ed3 240#: archive.c:446
ef317cd5 241msgid "compress better"
07432cef 242msgstr "压缩效果更好"
ef317cd5 243
94550ed3 244#: archive.c:449
ef317cd5 245msgid "list supported archive formats"
07432cef 246msgstr "列出支持的归档格式"
ef317cd5 247
276ceeaa 248#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
ef317cd5 249msgid "repo"
160fb2b2 250msgstr "仓库"
ef317cd5 251
94550ed3 252#: archive.c:452 builtin/archive.c:91
ef317cd5 253msgid "retrieve the archive from remote repository <repo>"
160fb2b2 254msgstr "从远程仓库(<仓库>)提取归档文件"
ef317cd5 255
276ceeaa 256#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482
ef317cd5 257msgid "command"
07432cef 258msgstr "命令"
ef317cd5 259
94550ed3 260#: archive.c:454 builtin/archive.c:93
ef317cd5 261msgid "path to the remote git-upload-archive command"
07432cef
WS
262msgstr "远程 git-upload-archive 命令的路径"
263
276ceeaa 264#: attr.c:263
07432cef 265msgid ""
a7409dfb 266"Negative patterns are ignored in git attributes\n"
07432cef 267"Use '\\!' for literal leading exclamation."
ef317cd5 268msgstr ""
a7409dfb 269"负值模版在 git attributes 中被忽略\n"
07432cef 270"当字符串确实要以感叹号开始时,使用 '\\!'。"
ef317cd5 271
276ceeaa
JX
272#: branch.c:53
273#, c-format
274msgid ""
275"\n"
276"After fixing the error cause you may try to fix up\n"
277"the remote tracking information by invoking\n"
278"\"git branch --set-upstream-to=%s%s%s\"."
279msgstr ""
280"\n"
281"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
282"\"git branch --set-upstream-to=%s%s%s\" 。"
283
284#: branch.c:67
4dcdc3d8
JX
285#, c-format
286msgid "Not setting branch %s as its own upstream."
287msgstr "未设置分支 %s 作为它自己的上游。"
288
276ceeaa 289#: branch.c:93
4dcdc3d8
JX
290#, c-format
291msgid "Branch %s set up to track remote branch %s from %s by rebasing."
292msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
293
276ceeaa 294#: branch.c:94
4dcdc3d8
JX
295#, c-format
296msgid "Branch %s set up to track remote branch %s from %s."
297msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
298
276ceeaa 299#: branch.c:98
4dcdc3d8
JX
300#, c-format
301msgid "Branch %s set up to track local branch %s by rebasing."
302msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
303
276ceeaa 304#: branch.c:99
4dcdc3d8
JX
305#, c-format
306msgid "Branch %s set up to track local branch %s."
307msgstr "分支 %s 设置为跟踪本地分支 %s。"
308
276ceeaa 309#: branch.c:104
4dcdc3d8
JX
310#, c-format
311msgid "Branch %s set up to track remote ref %s by rebasing."
312msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
313
276ceeaa 314#: branch.c:105
4dcdc3d8
JX
315#, c-format
316msgid "Branch %s set up to track remote ref %s."
317msgstr "分支 %s 设置为跟踪远程引用 %s。"
318
276ceeaa 319#: branch.c:109
4dcdc3d8
JX
320#, c-format
321msgid "Branch %s set up to track local ref %s by rebasing."
322msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
323
276ceeaa 324#: branch.c:110
4dcdc3d8
JX
325#, c-format
326msgid "Branch %s set up to track local ref %s."
327msgstr "分支 %s 设置为跟踪本地引用 %s。"
328
276ceeaa
JX
329#: branch.c:119
330msgid "Unable to write upstream branch configuration"
331msgstr "无法写入上游分支配置"
332
333#: branch.c:156
4dcdc3d8
JX
334#, c-format
335msgid "Not tracking: ambiguous information for ref %s"
336msgstr "未跟踪:引用 %s 有歧义"
337
276ceeaa 338#: branch.c:185
4dcdc3d8
JX
339#, c-format
340msgid "'%s' is not a valid branch name."
341msgstr "'%s' 不是一个有效的分支名称。"
342
276ceeaa 343#: branch.c:190
4dcdc3d8
JX
344#, c-format
345msgid "A branch named '%s' already exists."
346msgstr "一个分支名 '%s' 已经存在。"
347
276ceeaa 348#: branch.c:198
4dcdc3d8
JX
349msgid "Cannot force update the current branch."
350msgstr "无法强制更新当前分支。"
351
276ceeaa 352#: branch.c:218
1003b3a5
JX
353#, c-format
354msgid "Cannot setup tracking information; starting point '%s' is not a branch."
355msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
356
276ceeaa 357#: branch.c:220
1003b3a5
JX
358#, c-format
359msgid "the requested upstream branch '%s' does not exist"
360msgstr "请求的上游分支 '%s' 不存在"
361
276ceeaa 362#: branch.c:222
1003b3a5
JX
363msgid ""
364"\n"
365"If you are planning on basing your work on an upstream\n"
366"branch that already exists at the remote, you may need to\n"
367"run \"git fetch\" to retrieve it.\n"
368"\n"
369"If you are planning to push out a new local branch that\n"
370"will track its remote counterpart, you may want to use\n"
371"\"git push -u\" to set the upstream config as you push."
372msgstr ""
373"\n"
374"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
375"您可能需要执行 \"git fetch\" 来获取分支。\n"
376"\n"
377"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
378"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
379
276ceeaa 380#: branch.c:266
4dcdc3d8
JX
381#, c-format
382msgid "Not a valid object name: '%s'."
383msgstr "不是一个有效的对象名:'%s'。"
384
276ceeaa 385#: branch.c:286
4dcdc3d8
JX
386#, c-format
387msgid "Ambiguous object name: '%s'."
388msgstr "歧义的对象名:'%s'。"
389
276ceeaa 390#: branch.c:291
4dcdc3d8
JX
391#, c-format
392msgid "Not a valid branch point: '%s'."
393msgstr "无效的分支点:'%s'。"
394
276ceeaa 395#: branch.c:344
1b7f4a34
JX
396#, c-format
397msgid "'%s' is already checked out at '%s'"
398msgstr "'%s' 已经检出到 '%s'"
399
220c313c 400#: bundle.c:34
8ada9598
JX
401#, c-format
402msgid "'%s' does not look like a v2 bundle file"
81809b99 403msgstr "'%s' 不像是一个 v2 版本的包文件"
8ada9598 404
220c313c 405#: bundle.c:61
81809b99 406#, c-format
8ada9598 407msgid "unrecognized header: %s%s (%d)"
81809b99 408msgstr "未能识别的包头:%s%s (%d)"
8ada9598 409
94550ed3 410#: bundle.c:87 builtin/commit.c:766
8ada9598
JX
411#, c-format
412msgid "could not open '%s'"
413msgstr "不能打开 '%s'"
414
220c313c 415#: bundle.c:139
8ada9598 416msgid "Repository lacks these prerequisite commits:"
160fb2b2 417msgstr "仓库中缺少这些必备的提交:"
8ada9598 418
276ceeaa
JX
419#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
420#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
421#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
422#: builtin/shortlog.c:170
8ada9598
JX
423msgid "revision walk setup failed"
424msgstr "版本遍历设置失败"
425
220c313c 426#: bundle.c:185
8ada9598 427#, c-format
1003b3a5
JX
428msgid "The bundle contains this ref:"
429msgid_plural "The bundle contains these %d refs:"
430msgstr[0] "这个包中含有这个引用:"
431msgstr[1] "这个包中含有 %d 个引用:"
8ada9598 432
220c313c 433#: bundle.c:192
6792b93b
JX
434msgid "The bundle records a complete history."
435msgstr "这个包记录一个完整历史。"
436
220c313c 437#: bundle.c:194
8ada9598 438#, c-format
1003b3a5
JX
439msgid "The bundle requires this ref:"
440msgid_plural "The bundle requires these %d refs:"
441msgstr[0] "这个包需要这个引用:"
442msgstr[1] "这个包需要 %d 个引用:"
8ada9598 443
1b7f4a34 444#: bundle.c:253
9aeb4c2b
JX
445msgid "Could not spawn pack-objects"
446msgstr "不能生成 pack-objects 进程"
447
1b7f4a34 448#: bundle.c:264
9aeb4c2b
JX
449msgid "pack-objects died"
450msgstr "pack-objects 终止"
451
1b7f4a34 452#: bundle.c:304
8ada9598 453msgid "rev-list died"
81809b99 454msgstr "rev-list 终止"
8ada9598 455
1b7f4a34 456#: bundle.c:353
8ada9598
JX
457#, c-format
458msgid "ref '%s' is excluded by the rev-list options"
81809b99 459msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 460
276ceeaa 461#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
9aeb4c2b
JX
462#, c-format
463msgid "unrecognized argument: %s"
464msgstr "未能识别的参数:%s"
465
1b7f4a34 466#: bundle.c:449
8ada9598 467msgid "Refusing to create empty bundle."
81809b99 468msgstr "不能创建空包。"
8ada9598 469
1b7f4a34 470#: bundle.c:459
81809b99 471#, c-format
8ada9598 472msgid "cannot create '%s'"
81809b99 473msgstr "不能创建 '%s'"
8ada9598 474
1b7f4a34 475#: bundle.c:480
8ada9598 476msgid "index-pack died"
81809b99 477msgstr "index-pack 终止"
8ada9598 478
94550ed3 479#: color.c:275
220c313c
JX
480#, c-format
481msgid "invalid color value: %.*s"
482msgstr "无效的颜色值:%.*s"
483
276ceeaa
JX
484#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
485#: builtin/am.c:2135
c04f5ac3
JX
486#, c-format
487msgid "could not parse %s"
488msgstr "不能解析 %s"
489
6acbf033 490#: commit.c:42
c04f5ac3
JX
491#, c-format
492msgid "%s %s is not a commit!"
493msgstr "%s %s 不是一个提交!"
494
495#: compat/obstack.c:406 compat/obstack.c:408
496msgid "memory exhausted"
497msgstr "内存耗尽"
498
276ceeaa 499#: config.c:475 config.c:477
220c313c 500#, c-format
276ceeaa
JX
501msgid "bad config line %d in %s %s"
502msgstr "%2$s %3$s 出错于第 %1$d 行"
220c313c 503
276ceeaa 504#: config.c:593
220c313c 505#, c-format
276ceeaa
JX
506msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
507msgstr "%3$s %4$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %5$s"
220c313c 508
276ceeaa 509#: config.c:595
220c313c
JX
510#, c-format
511msgid "bad numeric config value '%s' for '%s': %s"
512msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
513
276ceeaa 514#: config.c:680
220c313c
JX
515#, c-format
516msgid "failed to expand user dir in: '%s'"
517msgstr "无法扩展 '%s' 中的用户目录"
518
276ceeaa 519#: config.c:758 config.c:769
220c313c
JX
520#, c-format
521msgid "bad zlib compression level %d"
522msgstr "错误的 zlib 压缩级别 %d"
523
276ceeaa 524#: config.c:891
220c313c
JX
525#, c-format
526msgid "invalid mode for object creation: %s"
527msgstr "无效的对象创建模式:%s"
528
276ceeaa 529#: config.c:1220
220c313c
JX
530msgid "unable to parse command-line config"
531msgstr "无法解析命令行中的配置"
532
276ceeaa 533#: config.c:1281
220c313c
JX
534msgid "unknown error occured while reading the configuration files"
535msgstr "在读取配置文件时遇到未知错误"
536
276ceeaa 537#: config.c:1629
220c313c
JX
538#, c-format
539msgid "unable to parse '%s' from command-line config"
540msgstr "无法解析命令行配置中的 '%s'"
541
276ceeaa 542#: config.c:1631
220c313c
JX
543#, c-format
544msgid "bad config variable '%s' in file '%s' at line %d"
545msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
546
276ceeaa 547#: config.c:1690
220c313c
JX
548#, c-format
549msgid "%s has multiple values"
550msgstr "%s 有多个取值"
551
276ceeaa
JX
552#: config.c:2226
553#, c-format
554msgid "Could not set '%s' to '%s'"
555msgstr "不能设置 '%s' 为 '%s'"
556
220c313c 557#: connected.c:69
c04f5ac3
JX
558msgid "Could not run 'git rev-list'"
559msgstr "不能执行 'git rev-list'"
560
220c313c 561#: connected.c:89
c04f5ac3
JX
562#, c-format
563msgid "failed write to rev-list: %s"
564msgstr "无法写入 rev-list:%s"
565
220c313c 566#: connected.c:97
c04f5ac3
JX
567#, c-format
568msgid "failed to close rev-list's stdin: %s"
569msgstr "无法关闭 rev-list 的标准输入:%s"
570
8ada9598
JX
571#: date.c:95
572msgid "in the future"
81809b99 573msgstr "在将来"
8ada9598
JX
574
575#: date.c:101
576#, c-format
577msgid "%lu second ago"
578msgid_plural "%lu seconds ago"
6c94aba5
JX
579msgstr[0] "%lu 秒钟前"
580msgstr[1] "%lu 秒钟前"
8ada9598
JX
581
582#: date.c:108
583#, c-format
584msgid "%lu minute ago"
585msgid_plural "%lu minutes ago"
6c94aba5
JX
586msgstr[0] "%lu 分钟前"
587msgstr[1] "%lu 分钟前"
8ada9598
JX
588
589#: date.c:115
590#, c-format
591msgid "%lu hour ago"
592msgid_plural "%lu hours ago"
6c94aba5
JX
593msgstr[0] "%lu 小时前"
594msgstr[1] "%lu 小时前"
8ada9598
JX
595
596#: date.c:122
597#, c-format
598msgid "%lu day ago"
599msgid_plural "%lu days ago"
6c94aba5
JX
600msgstr[0] "%lu 天前"
601msgstr[1] "%lu 天前"
8ada9598
JX
602
603#: date.c:128
604#, c-format
605msgid "%lu week ago"
606msgid_plural "%lu weeks ago"
6c94aba5
JX
607msgstr[0] "%lu 周前"
608msgstr[1] "%lu 周前"
8ada9598
JX
609
610#: date.c:135
611#, c-format
612msgid "%lu month ago"
613msgid_plural "%lu months ago"
6c94aba5
JX
614msgstr[0] "%lu 个月前"
615msgstr[1] "%lu 个月前"
8ada9598
JX
616
617#: date.c:146
618#, c-format
619msgid "%lu year"
620msgid_plural "%lu years"
81809b99 621msgstr[0] "%lu 年"
5ae481e0 622msgstr[1] "%lu 年"
8ada9598 623
6c94aba5 624#. TRANSLATORS: "%s" is "<n> years"
8ada9598
JX
625#: date.c:149
626#, c-format
627msgid "%s, %lu month ago"
628msgid_plural "%s, %lu months ago"
6c94aba5
JX
629msgstr[0] "%s %lu 个月前"
630msgstr[1] "%s %lu 个月前"
8ada9598
JX
631
632#: date.c:154 date.c:159
633#, c-format
634msgid "%lu year ago"
635msgid_plural "%lu years ago"
81809b99 636msgstr[0] "%lu 年前"
5ae481e0 637msgstr[1] "%lu 年前"
8ada9598 638
cfff71a9
JX
639#: diffcore-order.c:24
640#, c-format
641msgid "failed to read orderfile '%s'"
642msgstr "无法读取排序文件 '%s'"
643
814ff314 644#: diffcore-rename.c:536
6c94aba5
JX
645msgid "Performing inexact rename detection"
646msgstr "正在进行非精确的重命名检测"
647
90e6ef53 648# 译者:注意保持前导空格
94550ed3 649#: diff.c:115
c04f5ac3 650#, c-format
07432cef
WS
651msgid " Failed to parse dirstat cut-off percentage '%s'\n"
652msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
c04f5ac3 653
90e6ef53 654# 译者:注意保持前导空格
94550ed3 655#: diff.c:120
c04f5ac3 656#, c-format
07432cef
WS
657msgid " Unknown dirstat parameter '%s'\n"
658msgstr " 未知的 dirstat 参数 '%s'\n"
c04f5ac3 659
94550ed3 660#: diff.c:215
07432cef
WS
661#, c-format
662msgid "Unknown value for 'diff.submodule' config variable: '%s'"
663msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
664
94550ed3 665#: diff.c:267
c04f5ac3
JX
666#, c-format
667msgid ""
668"Found errors in 'diff.dirstat' config variable:\n"
669"%s"
670msgstr ""
90e6ef53 671"发现配置变量 'diff.dirstat' 中的错误:\n"
c04f5ac3
JX
672"%s"
673
276ceeaa 674#: diff.c:2997
6acbf033
JX
675#, c-format
676msgid "external diff died, stopping at %s"
677msgstr "外部 diff 退出,停止在 %s"
678
276ceeaa 679#: diff.c:3393
6acbf033
JX
680msgid "--follow requires exactly one pathspec"
681msgstr "--follow 参数后只跟一个 pathspec"
682
276ceeaa 683#: diff.c:3556
c04f5ac3
JX
684#, c-format
685msgid ""
686"Failed to parse --dirstat/-X option parameter:\n"
687"%s"
688msgstr ""
689"无法解析 --dirstat/-X 选项的参数:\n"
690"%s"
691
276ceeaa 692#: diff.c:3570
07432cef
WS
693#, c-format
694msgid "Failed to parse --submodule option parameter: '%s'"
695msgstr "无法解析 --submodule 选项的参数:'%s'"
696
276ceeaa 697#: dir.c:2004
7aea43ff
JX
698msgid "failed to get kernel name and information"
699msgstr "无法获得内核名称和信息"
700
276ceeaa
JX
701#: dir.c:2123
702msgid "Untracked cache is disabled on this system or location."
703msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
7aea43ff 704
1b7f4a34 705#: gpg-interface.c:166 gpg-interface.c:237
c04f5ac3
JX
706msgid "could not run gpg."
707msgstr "不能执行 gpg。"
708
1b7f4a34 709#: gpg-interface.c:178
c04f5ac3
JX
710msgid "gpg did not accept the data"
711msgstr "gpg 没有接受数据"
712
1b7f4a34 713#: gpg-interface.c:189
c04f5ac3
JX
714msgid "gpg failed to sign the data"
715msgstr "gpg 无法为数据签名"
716
1b7f4a34 717#: gpg-interface.c:222
a77c07d9
JX
718#, c-format
719msgid "could not create temporary file '%s': %s"
720msgstr "不能创建临时文件 '%s':%s"
721
1b7f4a34 722#: gpg-interface.c:225
a77c07d9
JX
723#, c-format
724msgid "failed writing detached signature to '%s': %s"
725msgstr "无法将分离式签名写入 '%s':%s"
726
220c313c 727#: grep.c:1718
7ac1c0ad
JX
728#, c-format
729msgid "'%s': unable to read %s"
730msgstr "'%s':无法读取 %s"
731
220c313c 732#: grep.c:1735
7ac1c0ad
JX
733#, c-format
734msgid "'%s': %s"
735msgstr "'%s':%s"
736
220c313c 737#: grep.c:1746
7ac1c0ad
JX
738#, c-format
739msgid "'%s': short read %s"
740msgstr "'%s':读取不完整 %s"
741
276ceeaa 742#: help.c:205
81809b99 743#, c-format
8ada9598 744msgid "available git commands in '%s'"
81809b99 745msgstr "在 '%s' 下可用的 git 命令"
8ada9598 746
276ceeaa 747#: help.c:212
8ada9598 748msgid "git commands available from elsewhere on your $PATH"
81809b99 749msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
8ada9598 750
276ceeaa 751#: help.c:244
7aea43ff
JX
752msgid "These are common Git commands used in various situations:"
753msgstr "这些是各种场合常见的 Git 命令:"
a77c07d9 754
276ceeaa 755#: help.c:309
c04f5ac3
JX
756#, c-format
757msgid ""
758"'%s' appears to be a git command, but we were not\n"
759"able to execute it. Maybe git-%s is broken?"
760msgstr ""
761"'%s' 像是一个 git 命令,但却无法运行。\n"
762"可能是 git-%s 受损?"
763
276ceeaa 764#: help.c:366
8ada9598 765msgid "Uh oh. Your system reports no Git commands at all."
81809b99 766msgstr "唉呀,您的系统中未发现 Git 命令。"
8ada9598 767
276ceeaa 768#: help.c:388
8ada9598
JX
769#, c-format
770msgid ""
771"WARNING: You called a Git command named '%s', which does not exist.\n"
772"Continuing under the assumption that you meant '%s'"
773msgstr ""
81809b99
JX
774"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
775"是 '%s'"
8ada9598 776
276ceeaa 777#: help.c:393
8ada9598
JX
778#, c-format
779msgid "in %0.1f seconds automatically..."
81809b99 780msgstr "在 %0.1f 秒钟后自动运行..."
8ada9598 781
276ceeaa 782#: help.c:400
8ada9598
JX
783#, c-format
784msgid "git: '%s' is not a git command. See 'git --help'."
81809b99 785msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
8ada9598 786
276ceeaa 787#: help.c:404 help.c:464
8ada9598
JX
788msgid ""
789"\n"
790"Did you mean this?"
791msgid_plural ""
792"\n"
793"Did you mean one of these?"
794msgstr[0] ""
81809b99
JX
795"\n"
796"您指的是这个么?"
797msgstr[1] ""
798"\n"
195febda 799"您指的是这其中的某一个么?"
8ada9598 800
276ceeaa 801#: help.c:460
2e8451e8
JX
802#, c-format
803msgid "%s: %s - %s"
804msgstr "%s:%s - %s"
805
220c313c 806#: merge.c:41
07432cef
WS
807msgid "failed to read the cache"
808msgstr "无法读取缓存"
809
276ceeaa
JX
810#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
811#: builtin/checkout.c:587 builtin/clone.c:730
07432cef
WS
812msgid "unable to write new index file"
813msgstr "无法写新的索引文件"
814
220c313c 815#: merge-recursive.c:189
649900bc
JX
816#, c-format
817msgid "(bad commit)\n"
818msgstr "(坏提交)\n"
819
220c313c 820#: merge-recursive.c:209
649900bc
JX
821#, c-format
822msgid "addinfo_cache failed for path '%s'"
823msgstr "为路径 '%s' addinfo_cache 失败"
824
220c313c 825#: merge-recursive.c:270
649900bc
JX
826msgid "error building trees"
827msgstr "无法创建树"
828
276ceeaa 829#: merge-recursive.c:689
649900bc
JX
830#, c-format
831msgid "failed to create path '%s'%s"
832msgstr "无法创建路径 '%s'%s"
833
276ceeaa 834#: merge-recursive.c:700
649900bc
JX
835#, c-format
836msgid "Removing %s to make room for subdirectory\n"
837msgstr "删除 %s 以便为子目录留出空间\n"
838
276ceeaa 839#: merge-recursive.c:714 merge-recursive.c:735
649900bc
JX
840msgid ": perhaps a D/F conflict?"
841msgstr ":可能是一个目录/文件冲突?"
842
276ceeaa 843#: merge-recursive.c:725
649900bc
JX
844#, c-format
845msgid "refusing to lose untracked file at '%s'"
846msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
847
276ceeaa 848#: merge-recursive.c:765
649900bc
JX
849#, c-format
850msgid "cannot read object %s '%s'"
851msgstr "不能读取对象 %s '%s'"
852
276ceeaa 853#: merge-recursive.c:767
649900bc
JX
854#, c-format
855msgid "blob expected for %s '%s'"
160fb2b2 856msgstr "%s '%s' 应为数据对象"
649900bc 857
276ceeaa 858#: merge-recursive.c:790 builtin/clone.c:374
649900bc
JX
859#, c-format
860msgid "failed to open '%s'"
861msgstr "无法打开 '%s'"
862
276ceeaa 863#: merge-recursive.c:798
649900bc
JX
864#, c-format
865msgid "failed to symlink '%s'"
866msgstr "无法创建符号链接 '%s'"
867
276ceeaa 868#: merge-recursive.c:801
649900bc
JX
869#, c-format
870msgid "do not know what to do with %06o %s '%s'"
871msgstr "不知道如何处理 %06o %s '%s'"
872
276ceeaa 873#: merge-recursive.c:939
649900bc
JX
874msgid "Failed to execute internal merge"
875msgstr "无法执行内部合并"
876
276ceeaa 877#: merge-recursive.c:943
649900bc
JX
878#, c-format
879msgid "Unable to add %s to database"
880msgstr "不能添加 %s 至对象库"
881
276ceeaa 882#: merge-recursive.c:959
649900bc
JX
883msgid "unsupported object type in the tree"
884msgstr "在树中有不支持的对象类型"
885
276ceeaa 886#: merge-recursive.c:1034 merge-recursive.c:1048
649900bc
JX
887#, c-format
888msgid ""
889"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
890"in tree."
891msgstr ""
892"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
893"的版本被保留。"
894
276ceeaa 895#: merge-recursive.c:1040 merge-recursive.c:1053
649900bc
JX
896#, c-format
897msgid ""
898"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
899"in tree at %s."
900msgstr ""
901"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
902"的版本保留于 %8$s 中。"
903
276ceeaa 904#: merge-recursive.c:1094
649900bc
JX
905msgid "rename"
906msgstr "重命名"
907
276ceeaa 908#: merge-recursive.c:1094
649900bc
JX
909msgid "renamed"
910msgstr "重命名"
911
276ceeaa 912#: merge-recursive.c:1150
649900bc
JX
913#, c-format
914msgid "%s is a directory in %s adding as %s instead"
915msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
916
276ceeaa 917#: merge-recursive.c:1172
649900bc
JX
918#, c-format
919msgid ""
920"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
921"\"->\"%s\" in \"%s\"%s"
922msgstr ""
923"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
924"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
925
276ceeaa 926#: merge-recursive.c:1177
649900bc
JX
927msgid " (left unresolved)"
928msgstr "(留下未解决)"
929
276ceeaa 930#: merge-recursive.c:1231
649900bc
JX
931#, c-format
932msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
933msgstr ""
934"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
935"%5$s"
936
276ceeaa 937#: merge-recursive.c:1261
649900bc
JX
938#, c-format
939msgid "Renaming %s to %s and %s to %s instead"
07432cef 940msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
649900bc 941
276ceeaa 942#: merge-recursive.c:1460
649900bc
JX
943#, c-format
944msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
945msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
946
276ceeaa 947#: merge-recursive.c:1470
649900bc
JX
948#, c-format
949msgid "Adding merged %s"
950msgstr "添加合并后的 %s"
951
276ceeaa 952#: merge-recursive.c:1475 merge-recursive.c:1677
649900bc
JX
953#, c-format
954msgid "Adding as %s instead"
955msgstr "而是以 %s 为名添加"
956
276ceeaa 957#: merge-recursive.c:1526
649900bc
JX
958#, c-format
959msgid "cannot read object %s"
960msgstr "不能读取对象 %s"
961
276ceeaa 962#: merge-recursive.c:1529
649900bc
JX
963#, c-format
964msgid "object %s is not a blob"
160fb2b2 965msgstr "对象 %s 不是一个数据对象"
649900bc 966
276ceeaa 967#: merge-recursive.c:1581
649900bc
JX
968msgid "modify"
969msgstr "修改"
970
276ceeaa 971#: merge-recursive.c:1581
649900bc
JX
972msgid "modified"
973msgstr "修改"
974
276ceeaa 975#: merge-recursive.c:1591
649900bc
JX
976msgid "content"
977msgstr "内容"
978
276ceeaa 979#: merge-recursive.c:1598
649900bc
JX
980msgid "add/add"
981msgstr "添加/添加"
982
276ceeaa 983#: merge-recursive.c:1632
649900bc
JX
984#, c-format
985msgid "Skipped %s (merged same as existing)"
986msgstr "略过 %s(已经做过相同合并)"
987
276ceeaa 988#: merge-recursive.c:1646
649900bc
JX
989#, c-format
990msgid "Auto-merging %s"
991msgstr "自动合并 %s"
992
276ceeaa 993#: merge-recursive.c:1650 git-submodule.sh:1048
649900bc
JX
994msgid "submodule"
995msgstr "子模组"
996
276ceeaa 997#: merge-recursive.c:1651
649900bc
JX
998#, c-format
999msgid "CONFLICT (%s): Merge conflict in %s"
1000msgstr "冲突(%s):合并冲突于 %s"
1001
276ceeaa 1002#: merge-recursive.c:1737
649900bc
JX
1003#, c-format
1004msgid "Removing %s"
1005msgstr "删除 %s"
1006
276ceeaa 1007#: merge-recursive.c:1762
649900bc
JX
1008msgid "file/directory"
1009msgstr "文件/目录"
1010
276ceeaa 1011#: merge-recursive.c:1768
649900bc
JX
1012msgid "directory/file"
1013msgstr "目录/文件"
1014
276ceeaa 1015#: merge-recursive.c:1773
649900bc
JX
1016#, c-format
1017msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
1018msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
1019
276ceeaa 1020#: merge-recursive.c:1783
649900bc
JX
1021#, c-format
1022msgid "Adding %s"
1023msgstr "添加 %s"
1024
276ceeaa 1025#: merge-recursive.c:1800
649900bc
JX
1026msgid "Fatal merge failure, shouldn't happen."
1027msgstr "严重的合并错误,不应发生。"
1028
276ceeaa 1029#: merge-recursive.c:1819
649900bc
JX
1030msgid "Already up-to-date!"
1031msgstr "已经是最新的!"
1032
276ceeaa 1033#: merge-recursive.c:1828
649900bc
JX
1034#, c-format
1035msgid "merging of trees %s and %s failed"
1036msgstr "无法合并树 %s 和 %s"
1037
276ceeaa 1038#: merge-recursive.c:1858
649900bc
JX
1039#, c-format
1040msgid "Unprocessed path??? %s"
1041msgstr "未处理的路径??? %s"
1042
276ceeaa 1043#: merge-recursive.c:1906
649900bc
JX
1044msgid "Merging:"
1045msgstr "合并:"
1046
276ceeaa 1047#: merge-recursive.c:1919
649900bc 1048#, c-format
e5e38ce4
JX
1049msgid "found %u common ancestor:"
1050msgid_plural "found %u common ancestors:"
1051msgstr[0] "发现 %u 个共同祖先:"
1052msgstr[1] "发现 %u 个共同祖先:"
649900bc 1053
276ceeaa 1054#: merge-recursive.c:1956
649900bc
JX
1055msgid "merge returned no commit"
1056msgstr "合并未返回提交"
1057
276ceeaa 1058#: merge-recursive.c:2013
649900bc
JX
1059#, c-format
1060msgid "Could not parse object '%s'"
1061msgstr "不能解析对象 '%s'"
1062
276ceeaa 1063#: merge-recursive.c:2024 builtin/merge.c:646
649900bc
JX
1064msgid "Unable to write index."
1065msgstr "不能写入索引。"
1066
6acbf033 1067#: notes-utils.c:41
2e8451e8
JX
1068msgid "Cannot commit uninitialized/unreferenced notes tree"
1069msgstr "不能提交未初始化/未引用的注解树"
1070
1b7f4a34 1071#: notes-utils.c:100
2e8451e8
JX
1072#, c-format
1073msgid "Bad notes.rewriteMode value: '%s'"
1074msgstr "坏的 notes.rewriteMode 值:'%s'"
1075
1b7f4a34 1076#: notes-utils.c:110
2e8451e8
JX
1077#, c-format
1078msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1079msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
1080
1081#. TRANSLATORS: The first %s is the name of the
1082#. environment variable, the second %s is its value
1b7f4a34 1083#: notes-utils.c:137
2e8451e8
JX
1084#, c-format
1085msgid "Bad %s value: '%s'"
1086msgstr "坏的 %s 值:'%s'"
1087
7aea43ff 1088#: object.c:242
1003b3a5
JX
1089#, c-format
1090msgid "unable to parse object: %s"
1091msgstr "不能解析对象:%s"
1092
94550ed3 1093#: parse-options.c:570
8ada9598 1094msgid "..."
81809b99 1095msgstr "..."
8ada9598 1096
94550ed3 1097#: parse-options.c:588
81809b99 1098#, c-format
8ada9598 1099msgid "usage: %s"
81809b99 1100msgstr "用法:%s"
8ada9598
JX
1101
1102#. TRANSLATORS: the colon here should align with the
1103#. one in "usage: %s" translation
94550ed3 1104#: parse-options.c:592
81809b99 1105#, c-format
8ada9598 1106msgid " or: %s"
81809b99 1107msgstr " 或:%s"
8ada9598
JX
1108
1109# 译者:为保证在输出中对齐,注意调整句中空格!
94550ed3 1110#: parse-options.c:595
81809b99 1111#, c-format
8ada9598 1112msgid " %s"
81809b99 1113msgstr " %s"
8ada9598 1114
94550ed3 1115#: parse-options.c:629
63af42fe
JX
1116msgid "-NUM"
1117msgstr "-数字"
1118
94550ed3
JX
1119#: parse-options-cb.c:108
1120#, c-format
1121msgid "malformed object name '%s'"
1122msgstr "非法的对象名 '%s'"
1123
1124#: path.c:752
1125#, c-format
1126msgid "Could not make %s writable by group"
1127msgstr "不能设置 %s 为组可写"
1128
cfff71a9 1129#: pathspec.c:133
90314792 1130msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
160fb2b2 1131msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
90314792 1132
cfff71a9 1133#: pathspec.c:143
90314792
JX
1134msgid ""
1135"global 'literal' pathspec setting is incompatible with all other global "
1136"pathspec settings"
160fb2b2 1137msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
90314792 1138
cfff71a9 1139#: pathspec.c:177
90314792 1140msgid "invalid parameter for pathspec magic 'prefix'"
160fb2b2 1141msgstr "路径规格包含无效的神奇前缀"
90314792 1142
cfff71a9 1143#: pathspec.c:183
90314792
JX
1144#, c-format
1145msgid "Invalid pathspec magic '%.*s' in '%s'"
160fb2b2 1146msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
90314792 1147
cfff71a9 1148#: pathspec.c:187
90314792
JX
1149#, c-format
1150msgid "Missing ')' at the end of pathspec magic in '%s'"
160fb2b2 1151msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
90314792 1152
cfff71a9 1153#: pathspec.c:205
90314792
JX
1154#, c-format
1155msgid "Unimplemented pathspec magic '%c' in '%s'"
160fb2b2 1156msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
90314792 1157
cfff71a9 1158#: pathspec.c:230
a77c07d9 1159#, c-format
90314792
JX
1160msgid "%s: 'literal' and 'glob' are incompatible"
1161msgstr "%s:'literal' 和 'glob' 不兼容"
a77c07d9 1162
cfff71a9 1163#: pathspec.c:241
a77c07d9 1164#, c-format
90314792 1165msgid "%s: '%s' is outside repository"
160fb2b2 1166msgstr "%s:'%s' 在仓库之外"
a77c07d9 1167
cfff71a9 1168#: pathspec.c:291
90314792
JX
1169#, c-format
1170msgid "Pathspec '%s' is in submodule '%.*s'"
160fb2b2 1171msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
90314792 1172
cfff71a9 1173#: pathspec.c:353
90314792
JX
1174#, c-format
1175msgid "%s: pathspec magic not supported by this command: %s"
160fb2b2 1176msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
90314792 1177
276ceeaa 1178#: pathspec.c:433
90314792
JX
1179#, c-format
1180msgid "pathspec '%s' is beyond a symbolic link"
160fb2b2 1181msgstr "路径规格 '%s' 位于符号链接中"
90314792 1182
276ceeaa 1183#: pathspec.c:442
cfff71a9
JX
1184msgid ""
1185"There is nothing to exclude from by :(exclude) patterns.\n"
1186"Perhaps you forgot to add either ':/' or '.' ?"
1187msgstr ""
1188"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1189"添加 ':/' 或 '.' ?"
1190
1b7f4a34 1191#: pretty.c:969
220c313c
JX
1192msgid "unable to parse --pretty format"
1193msgstr "不能解析 --pretty 格式"
1194
94550ed3 1195#: progress.c:235
6c94aba5
JX
1196msgid "done"
1197msgstr "完成"
1198
94550ed3 1199#: read-cache.c:1281
6c94aba5
JX
1200#, c-format
1201msgid ""
1202"index.version set, but the value is invalid.\n"
1203"Using version %i"
1204msgstr ""
1205"设置了 index.version,但是取值无效。\n"
1206"使用版本 %i"
1207
94550ed3 1208#: read-cache.c:1291
6c94aba5
JX
1209#, c-format
1210msgid ""
1211"GIT_INDEX_VERSION set, but the value is invalid.\n"
1212"Using version %i"
1213msgstr ""
1214"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1215"使用版本 %i"
1216
276ceeaa
JX
1217#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
1218#: builtin/merge.c:984
1b7f4a34
JX
1219#, c-format
1220msgid "Could not open '%s' for writing"
1221msgstr "无法打开 '%s' 进行写入"
1222
276ceeaa 1223#: refs/files-backend.c:2374
1b7f4a34
JX
1224#, c-format
1225msgid "could not delete reference %s: %s"
1226msgstr "无法删除引用 %s:%s"
1227
276ceeaa 1228#: refs/files-backend.c:2377
1b7f4a34
JX
1229#, c-format
1230msgid "could not delete references: %s"
1231msgstr "无法删除引用:%s"
1232
276ceeaa 1233#: refs/files-backend.c:2386
1b7f4a34
JX
1234#, c-format
1235msgid "could not remove reference %s"
1236msgstr "无法删除引用 %s"
1237
276ceeaa 1238#: ref-filter.c:55
94550ed3 1239#, c-format
276ceeaa
JX
1240msgid "expected format: %%(color:<color>)"
1241msgstr "期望的格式:%%(color:<color>)"
1242
1243#: ref-filter.c:57
1244#, c-format
1245msgid "unrecognized color: %%(color:%s)"
1246msgstr "未能识别的颜色:%%(color:%s)"
1247
1248#: ref-filter.c:71
1249#, c-format
1250msgid "unrecognized format: %%(%s)"
1251msgstr "未能识别的格式:%%(%s)"
94550ed3 1252
3495628d
JX
1253#: ref-filter.c:77
1254#, c-format
1255msgid "%%(body) does not take arguments"
1256msgstr "%%(body) 不带参数"
1257
1258#: ref-filter.c:84
1259#, c-format
1260msgid "%%(subject) does not take arguments"
1261msgstr "%%(subject) 不带参数"
1262
276ceeaa 1263#: ref-filter.c:101
94550ed3
JX
1264#, c-format
1265msgid "positive value expected contents:lines=%s"
1266msgstr "要为 contents:lines=%s 提供一个正数"
1267
276ceeaa 1268#: ref-filter.c:103
94550ed3 1269#, c-format
276ceeaa
JX
1270msgid "unrecognized %%(contents) argument: %s"
1271msgstr "未能识别的 %%(contents) 参数:%s"
94550ed3 1272
276ceeaa
JX
1273#: ref-filter.c:113
1274#, c-format
1275msgid "unrecognized %%(objectname) argument: %s"
1276msgstr "未能识别的 %%(objectname) 参数:%s"
1b7f4a34 1277
276ceeaa 1278#: ref-filter.c:135
94550ed3
JX
1279#, c-format
1280msgid "expected format: %%(align:<width>,<position>)"
1281msgstr "期望的格式:%%(align:<width>,<position>)"
1282
276ceeaa
JX
1283#: ref-filter.c:147
1284#, c-format
1285msgid "unrecognized position:%s"
1286msgstr "未能识别的位置:%s"
1287
1288#: ref-filter.c:151
94550ed3 1289#, c-format
276ceeaa
JX
1290msgid "unrecognized width:%s"
1291msgstr "未能识别的宽度:%s"
94550ed3 1292
276ceeaa
JX
1293#: ref-filter.c:157
1294#, c-format
1295msgid "unrecognized %%(align) argument: %s"
1296msgstr "未能识别的 %%(align) 参数:%s"
1297
1298#: ref-filter.c:161
94550ed3
JX
1299#, c-format
1300msgid "positive width expected with the %%(align) atom"
1301msgstr "元素 %%(align) 需要一个正数的宽度"
1302
3495628d
JX
1303#: ref-filter.c:244
1304#, c-format
1305msgid "malformed field name: %.*s"
1306msgstr "非法的字段名:%.*s"
1307
1308#: ref-filter.c:270
1309#, c-format
1310msgid "unknown field name: %.*s"
1311msgstr "未知的字段名:%.*s"
1312
276ceeaa
JX
1313#: ref-filter.c:372
1314#, c-format
1315msgid "format: %%(end) atom used without corresponding atom"
1316msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
1317
3495628d
JX
1318#: ref-filter.c:424
1319#, c-format
1320msgid "malformed format string %s"
1321msgstr "非法的格式化字符串 %s"
1322
1323#: ref-filter.c:878
1324msgid ":strip= requires a positive integer argument"
1325msgstr ":strip= 需要一个正整型参数"
1326
1327#: ref-filter.c:883
1328#, c-format
1329msgid "ref '%s' does not have %ld components to :strip"
26e4cbec 1330msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
3495628d
JX
1331
1332#: ref-filter.c:1046
1333#, c-format
1334msgid "unknown %.*s format %s"
26e4cbec 1335msgstr "未知的 %.*s 格式 %s"
3495628d
JX
1336
1337#: ref-filter.c:1066 ref-filter.c:1097
1338#, c-format
1339msgid "missing object %s for %s"
26e4cbec 1340msgstr "缺失 %2$s 的对象 %1$s"
3495628d
JX
1341
1342#: ref-filter.c:1069 ref-filter.c:1100
1343#, c-format
1344msgid "parse_object_buffer failed on %s for %s"
1345msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
1346
276ceeaa 1347#: ref-filter.c:1311
94550ed3
JX
1348#, c-format
1349msgid "malformed object at '%s'"
1350msgstr "非法的对象于 '%s'"
1351
3495628d
JX
1352#: ref-filter.c:1373
1353#, c-format
1354msgid "ignoring ref with broken name %s"
1355msgstr "忽略带有错误名称 %s 的引用"
1356
1357#: ref-filter.c:1378
1358#, c-format
1359msgid "ignoring broken ref %s"
1360msgstr "忽略损坏的引用 %s"
1361
276ceeaa 1362#: ref-filter.c:1651
94550ed3
JX
1363#, c-format
1364msgid "format: %%(end) atom missing"
1365msgstr "格式:缺少 %%(end) 元素"
1366
276ceeaa 1367#: ref-filter.c:1705
94550ed3
JX
1368#, c-format
1369msgid "malformed object name %s"
1370msgstr "非法的对象名 %s"
1371
276ceeaa 1372#: remote.c:745
cfff71a9
JX
1373#, c-format
1374msgid "Cannot fetch both %s and %s to %s"
1375msgstr "不能同时获取 %s 和 %s 至 %s"
1376
276ceeaa 1377#: remote.c:749
cfff71a9
JX
1378#, c-format
1379msgid "%s usually tracks %s, not %s"
1380msgstr "%s 通常跟踪 %s,而非 %s"
1381
276ceeaa 1382#: remote.c:753
cfff71a9
JX
1383#, c-format
1384msgid "%s tracks both %s and %s"
1385msgstr "%s 同时跟踪 %s 和 %s"
1386
276ceeaa 1387#: remote.c:761
cfff71a9
JX
1388msgid "Internal error"
1389msgstr "内部错误"
1390
276ceeaa 1391#: remote.c:1677 remote.c:1720
7aea43ff
JX
1392msgid "HEAD does not point to a branch"
1393msgstr "HEAD 没有指向一个分支"
1394
276ceeaa 1395#: remote.c:1686
7aea43ff
JX
1396#, c-format
1397msgid "no such branch: '%s'"
1398msgstr "没有此分支:'%s'"
1399
276ceeaa 1400#: remote.c:1689
7aea43ff
JX
1401#, c-format
1402msgid "no upstream configured for branch '%s'"
1403msgstr "尚未给分支 '%s' 设置上游"
1404
276ceeaa 1405#: remote.c:1695
7aea43ff
JX
1406#, c-format
1407msgid "upstream branch '%s' not stored as a remote-tracking branch"
1408msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1409
276ceeaa 1410#: remote.c:1710
7aea43ff
JX
1411#, c-format
1412msgid "push destination '%s' on remote '%s' has no local tracking branch"
1413msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1414
276ceeaa 1415#: remote.c:1725
7aea43ff
JX
1416#, c-format
1417msgid "branch '%s' has no remote for pushing"
1418msgstr "分支 '%s' 没有设置要推送的远程服务器"
1419
276ceeaa 1420#: remote.c:1736
7aea43ff
JX
1421#, c-format
1422msgid "push refspecs for '%s' do not include '%s'"
160fb2b2 1423msgstr "向 '%s' 推送引用规格未包含 '%s'"
7aea43ff 1424
276ceeaa 1425#: remote.c:1749
7aea43ff
JX
1426msgid "push has no destination (push.default is 'nothing')"
1427msgstr "推送无目标(push.default 是 'nothing')"
1428
276ceeaa 1429#: remote.c:1771
7aea43ff
JX
1430msgid "cannot resolve 'simple' push to a single destination"
1431msgstr "无法解析 'simple' 推送至一个单独的目标"
1432
276ceeaa 1433#: remote.c:2073
90314792
JX
1434#, c-format
1435msgid "Your branch is based on '%s', but the upstream is gone.\n"
1436msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1437
276ceeaa 1438#: remote.c:2077
90314792
JX
1439msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1440msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1441
276ceeaa 1442#: remote.c:2080
90314792
JX
1443#, c-format
1444msgid "Your branch is up-to-date with '%s'.\n"
1445msgstr "您的分支与上游分支 '%s' 一致。\n"
1446
276ceeaa 1447#: remote.c:2084
c04f5ac3
JX
1448#, c-format
1449msgid "Your branch is ahead of '%s' by %d commit.\n"
1450msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1451msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5ae481e0 1452msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
c04f5ac3 1453
276ceeaa 1454#: remote.c:2090
07432cef
WS
1455msgid " (use \"git push\" to publish your local commits)\n"
1456msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1457
276ceeaa 1458#: remote.c:2093
c04f5ac3
JX
1459#, c-format
1460msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1461msgid_plural ""
1462"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
90e6ef53 1463msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5ae481e0 1464msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 1465
07432cef 1466# 译者:注意保持前导空格
276ceeaa 1467#: remote.c:2101
07432cef
WS
1468msgid " (use \"git pull\" to update your local branch)\n"
1469msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1470
276ceeaa 1471#: remote.c:2104
c04f5ac3
JX
1472#, c-format
1473msgid ""
1474"Your branch and '%s' have diverged,\n"
1475"and have %d and %d different commit each, respectively.\n"
1476msgid_plural ""
1477"Your branch and '%s' have diverged,\n"
1478"and have %d and %d different commits each, respectively.\n"
1479msgstr[0] ""
1480"您的分支和 '%s' 出现了偏离,\n"
195febda 1481"并且分别有 %d 和 %d 处不同的提交。\n"
5ae481e0
JX
1482msgstr[1] ""
1483"您的分支和 '%s' 出现了偏离,\n"
195febda 1484"并且分别有 %d 和 %d 处不同的提交。\n"
c04f5ac3 1485
07432cef 1486# 译者:注意保持前导空格
276ceeaa 1487#: remote.c:2114
07432cef
WS
1488msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1489msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1490
276ceeaa 1491#: revision.c:2131
1b7f4a34
JX
1492msgid "your current branch appears to be broken"
1493msgstr "您的当前分支好像被损坏"
1494
276ceeaa 1495#: revision.c:2134
1b7f4a34
JX
1496#, c-format
1497msgid "your current branch '%s' does not have any commits yet"
1498msgstr "您的当前分支 '%s' 尚无任何提交"
1499
276ceeaa 1500#: revision.c:2328
814ff314
JX
1501msgid "--first-parent is incompatible with --bisect"
1502msgstr "--first-parent 与 --bisect 不兼容"
1503
276ceeaa 1504#: run-command.c:92
2e8451e8
JX
1505msgid "open /dev/null failed"
1506msgstr "不能打开 /dev/null"
1507
276ceeaa 1508#: run-command.c:94
2e8451e8
JX
1509#, c-format
1510msgid "dup2(%d,%d) failed"
1511msgstr "不能调用 dup2(%d,%d)"
1512
1b7f4a34 1513#: send-pack.c:295
220c313c
JX
1514msgid "failed to sign the push certificate"
1515msgstr "无法为推送证书签名"
1516
1b7f4a34 1517#: send-pack.c:404
220c313c
JX
1518msgid "the receiving end does not support --signed push"
1519msgstr "接收端不支持签名推送"
1520
1b7f4a34
JX
1521#: send-pack.c:406
1522msgid ""
1523"not sending a push certificate since the receiving end does not support --"
1524"signed push"
1525msgstr "未发送推送证书,因为接收端不支持签名推送"
1526
1527#: send-pack.c:418
44f518e6
JX
1528msgid "the receiving end does not support --atomic push"
1529msgstr "接收端不支持原子推送"
814ff314 1530
276ceeaa 1531#: sequencer.c:174
14c8bced
JX
1532msgid ""
1533"after resolving the conflicts, mark the corrected paths\n"
1534"with 'git add <paths>' or 'git rm <paths>'"
1535msgstr ""
d9d56b23 1536"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
14c8bced
JX
1537"命令标记修正后的文件"
1538
276ceeaa 1539#: sequencer.c:177
c04f5ac3
JX
1540msgid ""
1541"after resolving the conflicts, mark the corrected paths\n"
1542"with 'git add <paths>' or 'git rm <paths>'\n"
1543"and commit the result with 'git commit'"
1544msgstr ""
d9d56b23 1545"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
c04f5ac3
JX
1546"对修正后的文件做标记,然后用 'git commit' 提交"
1547
276ceeaa 1548#: sequencer.c:190 sequencer.c:833 sequencer.c:913
c04f5ac3
JX
1549#, c-format
1550msgid "Could not write to %s"
1551msgstr "不能写入 %s"
1552
276ceeaa 1553#: sequencer.c:193
c04f5ac3
JX
1554#, c-format
1555msgid "Error wrapping up %s"
1556msgstr "错误收尾 %s"
1557
276ceeaa 1558#: sequencer.c:208
c04f5ac3
JX
1559msgid "Your local changes would be overwritten by cherry-pick."
1560msgstr "您的本地修改将被拣选操作覆盖。"
1561
276ceeaa 1562#: sequencer.c:210
c04f5ac3
JX
1563msgid "Your local changes would be overwritten by revert."
1564msgstr "您的本地修改将被还原操作覆盖。"
1565
276ceeaa 1566#: sequencer.c:213
c04f5ac3
JX
1567msgid "Commit your changes or stash them to proceed."
1568msgstr "提交您的修改或保存进度后再继续。"
1569
1570#. TRANSLATORS: %s will be "revert" or "cherry-pick"
276ceeaa 1571#: sequencer.c:300
c04f5ac3
JX
1572#, c-format
1573msgid "%s: Unable to write new index file"
90e6ef53 1574msgstr "%s:无法写入新索引文件"
c04f5ac3 1575
276ceeaa 1576#: sequencer.c:318
8ada9598 1577msgid "Could not resolve HEAD commit\n"
81809b99 1578msgstr "不能解析 HEAD 提交\n"
8ada9598 1579
276ceeaa 1580#: sequencer.c:338
8ada9598 1581msgid "Unable to update cache tree\n"
81809b99 1582msgstr "不能更新缓存\n"
8ada9598 1583
276ceeaa 1584#: sequencer.c:390
81809b99 1585#, c-format
8ada9598 1586msgid "Could not parse commit %s\n"
81809b99 1587msgstr "不能解析提交 %s\n"
8ada9598 1588
276ceeaa 1589#: sequencer.c:395
81809b99 1590#, c-format
8ada9598 1591msgid "Could not parse parent commit %s\n"
81809b99 1592msgstr "不能解析父提交 %s\n"
8ada9598 1593
276ceeaa 1594#: sequencer.c:460
c04f5ac3 1595msgid "Your index file is unmerged."
90e6ef53 1596msgstr "您的索引文件未完成合并。"
c04f5ac3 1597
276ceeaa 1598#: sequencer.c:479
c04f5ac3
JX
1599#, c-format
1600msgid "Commit %s is a merge but no -m option was given."
1601msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1602
276ceeaa 1603#: sequencer.c:487
c04f5ac3
JX
1604#, c-format
1605msgid "Commit %s does not have parent %d"
1606msgstr "提交 %s 没有父提交 %d"
1607
276ceeaa 1608#: sequencer.c:491
c04f5ac3
JX
1609#, c-format
1610msgid "Mainline was specified but commit %s is not a merge."
90e6ef53 1611msgstr "指定了主线但提交 %s 不是一个合并。"
c04f5ac3
JX
1612
1613#. TRANSLATORS: The first %s will be "revert" or
1614#. "cherry-pick", the second %s a SHA1
276ceeaa 1615#: sequencer.c:504
c04f5ac3
JX
1616#, c-format
1617msgid "%s: cannot parse parent commit %s"
1618msgstr "%s:不能解析父提交 %s"
1619
276ceeaa 1620#: sequencer.c:508
c04f5ac3
JX
1621#, c-format
1622msgid "Cannot get commit message for %s"
1623msgstr "不能得到 %s 的提交说明"
1624
276ceeaa 1625#: sequencer.c:594
c04f5ac3
JX
1626#, c-format
1627msgid "could not revert %s... %s"
1628msgstr "不能还原 %s... %s"
1629
276ceeaa 1630#: sequencer.c:595
c04f5ac3
JX
1631#, c-format
1632msgid "could not apply %s... %s"
1633msgstr "不能应用 %s... %s"
1634
276ceeaa 1635#: sequencer.c:630
c04f5ac3
JX
1636msgid "empty commit set passed"
1637msgstr "提供了空的提交集"
1638
276ceeaa 1639#: sequencer.c:638
c04f5ac3
JX
1640#, c-format
1641msgid "git %s: failed to read the index"
90e6ef53 1642msgstr "git %s:无法读取索引"
c04f5ac3 1643
276ceeaa 1644#: sequencer.c:642
c04f5ac3
JX
1645#, c-format
1646msgid "git %s: failed to refresh the index"
90e6ef53 1647msgstr "git %s:无法刷新索引"
c04f5ac3 1648
276ceeaa 1649#: sequencer.c:702
c04f5ac3
JX
1650#, c-format
1651msgid "Cannot %s during a %s"
90e6ef53 1652msgstr "无法 %s 在一个 %s 过程中"
c04f5ac3 1653
276ceeaa 1654#: sequencer.c:724
c04f5ac3
JX
1655#, c-format
1656msgid "Could not parse line %d."
90e6ef53 1657msgstr "不能解析第 %d 行。"
c04f5ac3 1658
276ceeaa 1659#: sequencer.c:729
c04f5ac3 1660msgid "No commits parsed."
7e238ab7 1661msgstr "没有提交被解析。"
c04f5ac3 1662
276ceeaa 1663#: sequencer.c:741
c04f5ac3
JX
1664#, c-format
1665msgid "Could not open %s"
1666msgstr "不能打开 %s"
1667
276ceeaa 1668#: sequencer.c:745
c04f5ac3
JX
1669#, c-format
1670msgid "Could not read %s."
1671msgstr "不能读取 %s。"
1672
276ceeaa 1673#: sequencer.c:752
c04f5ac3
JX
1674#, c-format
1675msgid "Unusable instruction sheet: %s"
1676msgstr "无用的指令表单:%s"
1677
276ceeaa 1678#: sequencer.c:782
c04f5ac3
JX
1679#, c-format
1680msgid "Invalid key: %s"
1681msgstr "无效键名:%s"
1682
276ceeaa 1683#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
c04f5ac3
JX
1684#, c-format
1685msgid "Invalid value for %s: %s"
81809b99 1686msgstr "%s 的值无效:%s"
c04f5ac3 1687
276ceeaa 1688#: sequencer.c:795
c04f5ac3
JX
1689#, c-format
1690msgid "Malformed options sheet: %s"
1691msgstr "非法的选项表单:%s"
1692
276ceeaa 1693#: sequencer.c:814
c04f5ac3
JX
1694msgid "a cherry-pick or revert is already in progress"
1695msgstr "一个拣选或还原操作已在进行"
1696
276ceeaa 1697#: sequencer.c:815
c04f5ac3
JX
1698msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1699msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1700
276ceeaa 1701#: sequencer.c:819
c04f5ac3
JX
1702#, c-format
1703msgid "Could not create sequencer directory %s"
90e6ef53 1704msgstr "不能创建序列目录 %s"
c04f5ac3 1705
276ceeaa 1706#: sequencer.c:835 sequencer.c:917
c04f5ac3
JX
1707#, c-format
1708msgid "Error wrapping up %s."
1709msgstr "错误收尾 %s。"
1710
276ceeaa 1711#: sequencer.c:854 sequencer.c:987
c04f5ac3 1712msgid "no cherry-pick or revert in progress"
195febda 1713msgstr "拣选或还原操作并未进行"
c04f5ac3 1714
276ceeaa 1715#: sequencer.c:856
c04f5ac3
JX
1716msgid "cannot resolve HEAD"
1717msgstr "不能解析 HEAD"
1718
276ceeaa 1719#: sequencer.c:858
c04f5ac3 1720msgid "cannot abort from a branch yet to be born"
90e6ef53 1721msgstr "不能从尚未建立的分支终止"
c04f5ac3 1722
276ceeaa 1723#: sequencer.c:878 builtin/apply.c:4287
c04f5ac3
JX
1724#, c-format
1725msgid "cannot open %s: %s"
1726msgstr "不能打开 %s:%s"
1727
276ceeaa 1728#: sequencer.c:881
c04f5ac3
JX
1729#, c-format
1730msgid "cannot read %s: %s"
1731msgstr "不能读取 %s:%s"
1732
276ceeaa 1733#: sequencer.c:882
c04f5ac3 1734msgid "unexpected end of file"
9aafc933 1735msgstr "意外的文件结束"
c04f5ac3 1736
276ceeaa 1737#: sequencer.c:888
c04f5ac3
JX
1738#, c-format
1739msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
90e6ef53 1740msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
c04f5ac3 1741
276ceeaa 1742#: sequencer.c:910
c04f5ac3
JX
1743#, c-format
1744msgid "Could not format %s."
1745msgstr "不能格式化 %s。"
1746
276ceeaa 1747#: sequencer.c:1055
4dcdc3d8
JX
1748#, c-format
1749msgid "%s: can't cherry-pick a %s"
1750msgstr "%s:不能拣选一个%s"
1751
276ceeaa 1752#: sequencer.c:1058
4dcdc3d8
JX
1753#, c-format
1754msgid "%s: bad revision"
1755msgstr "%s:错误的版本"
1756
276ceeaa 1757#: sequencer.c:1092
c04f5ac3
JX
1758msgid "Can't revert as initial commit"
1759msgstr "不能作为初始提交还原"
1760
276ceeaa 1761#: sequencer.c:1093
c04f5ac3
JX
1762msgid "Can't cherry-pick into empty head"
1763msgstr "不能拣选到空分支"
1764
276ceeaa 1765#: setup.c:246
7aea43ff
JX
1766#, c-format
1767msgid "failed to read %s"
1768msgstr "无法读取 %s"
1769
3495628d
JX
1770#: sha1_file.c:1080
1771msgid "offset before end of packfile (broken .idx?)"
1772msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
1773
1774#: sha1_file.c:2459
1775#, c-format
1776msgid "offset before start of pack index for %s (corrupt index?)"
1777msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
1778
1779#: sha1_file.c:2463
1780#, c-format
1781msgid "offset beyond end of pack index for %s (truncated index?)"
26e4cbec 1782msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
3495628d 1783
276ceeaa 1784#: sha1_name.c:462
2e8451e8
JX
1785msgid ""
1786"Git normally never creates a ref that ends with 40 hex characters\n"
1787"because it will be ignored when you just specify 40-hex. These refs\n"
1788"may be created by mistake. For example,\n"
1789"\n"
1790" git checkout -b $br $(git rev-parse ...)\n"
1791"\n"
1792"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1793"examine these refs and maybe delete them. Turn this message off by\n"
b1894384 1794"running \"git config advice.objectNameWarning false\""
2e8451e8
JX
1795msgstr ""
1796"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1797"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1798"\n"
1799" git checkout -b $br $(git rev-parse ...)\n"
1800"\n"
1801"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
b1894384 1802"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
2e8451e8
JX
1803"命令关闭本消息通知。"
1804
276ceeaa 1805#: submodule.c:62 submodule.c:96
90314792
JX
1806msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1807msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1808
276ceeaa 1809#: submodule.c:66 submodule.c:100
90314792
JX
1810#, c-format
1811msgid "Could not find section in .gitmodules where path=%s"
1812msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1813
276ceeaa 1814#: submodule.c:74
90314792
JX
1815#, c-format
1816msgid "Could not update .gitmodules entry %s"
1817msgstr "不能更新 .gitmodules 条目 %s"
1818
276ceeaa 1819#: submodule.c:107
90314792
JX
1820#, c-format
1821msgid "Could not remove .gitmodules entry for %s"
1822msgstr "无法移除 %s 的 .gitmodules 条目"
1823
276ceeaa 1824#: submodule.c:118
90314792
JX
1825msgid "staging updated .gitmodules failed"
1826msgstr "将更新后 .gitmodules 添加暂存区失败"
1827
3495628d
JX
1828#: trailer.c:237
1829#, c-format
1830msgid "running trailer command '%s' failed"
1831msgstr "执行 trailer 命令 '%s' 失败"
1832
276ceeaa
JX
1833#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
1834#: trailer.c:562
220c313c
JX
1835#, c-format
1836msgid "unknown value '%s' for key '%s'"
1837msgstr "键 '%2$s' 的未知取值 '%1$s'"
1838
276ceeaa 1839#: trailer.c:544 trailer.c:549 builtin/remote.c:289
220c313c
JX
1840#, c-format
1841msgid "more than one %s"
1842msgstr "多于一个 %s"
1843
276ceeaa 1844#: trailer.c:582
220c313c 1845#, c-format
9aeb4c2b
JX
1846msgid "empty trailer token in trailer '%.*s'"
1847msgstr "签名 '%.*s' 的键为空"
220c313c 1848
276ceeaa 1849#: trailer.c:702
220c313c
JX
1850#, c-format
1851msgid "could not read input file '%s'"
1852msgstr "不能读取输入文件 '%s'"
1853
276ceeaa 1854#: trailer.c:705
220c313c
JX
1855msgid "could not read from stdin"
1856msgstr "不能自标准输入读取"
1857
276ceeaa
JX
1858#: trailer.c:857 builtin/am.c:42
1859#, c-format
1860msgid "could not stat %s"
1861msgstr "不能获取 %s 的文件状态"
1862
1863#: trailer.c:859
1864#, c-format
1865msgid "file %s is not a regular file"
1866msgstr "文件 %s 不是一个正规文件"
1867
1868#: trailer.c:861
1869#, c-format
1870msgid "file %s is not writable by user"
1871msgstr "文件 %s 用户不可写"
1872
1873#: trailer.c:873
1874msgid "could not open temporary file"
1875msgstr "不能打开临时文件"
1876
1877#: trailer.c:912
1878#, c-format
1879msgid "could not rename temporary file to %s"
1880msgstr "不能重命名临时文件为 %s"
1881
1882#: transport-helper.c:1041
1b7f4a34
JX
1883#, c-format
1884msgid "Could not read ref %s"
1885msgstr "不能读取引用 %s"
1886
7aea43ff 1887#: unpack-trees.c:203
6c94aba5
JX
1888msgid "Checking out files"
1889msgstr "正在检出文件"
1890
90314792
JX
1891#: urlmatch.c:120
1892msgid "invalid URL scheme name or missing '://' suffix"
1893msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1894
1895#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1896#, c-format
1897msgid "invalid %XX escape sequence"
1898msgstr "无效的 %XX 转义序列"
1899
1900#: urlmatch.c:172
1901msgid "missing host and scheme is not 'file:'"
4375c10e 1902msgstr "缺失主机名且 URL 方案不是 'file:'"
90314792
JX
1903
1904#: urlmatch.c:189
1905msgid "a 'file:' URL may not have a port number"
1906msgstr "一个 'file:' URL 不应该包含端口号"
1907
1908#: urlmatch.c:199
1909msgid "invalid characters in host name"
1910msgstr "主机名中包含无效的字符"
1911
1912#: urlmatch.c:244 urlmatch.c:255
1913msgid "invalid port number"
1914msgstr "无效的端口号"
1915
1916#: urlmatch.c:322
1917msgid "invalid '..' path segment"
1918msgstr "无效的 '..' 路径片段"
1919
276ceeaa 1920#: wrapper.c:222 wrapper.c:381
1b7f4a34
JX
1921#, c-format
1922msgid "could not open '%s' for reading and writing"
1923msgstr "无法打开 '%s' 进行读写"
1924
276ceeaa 1925#: wrapper.c:224 wrapper.c:383
1b7f4a34
JX
1926#, c-format
1927msgid "could not open '%s' for writing"
1928msgstr "无法打开 '%s' 进行写入"
1929
276ceeaa
JX
1930#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
1931#: builtin/merge.c:1075 builtin/pull.c:387
1b7f4a34
JX
1932#, c-format
1933msgid "could not open '%s' for reading"
1934msgstr "无法打开 '%s' 进行读取"
1935
276ceeaa 1936#: wrapper.c:611
07432cef 1937#, c-format
ef317cd5 1938msgid "unable to access '%s': %s"
07432cef
WS
1939msgstr "不能访问 '%s':%s"
1940
276ceeaa 1941#: wrapper.c:632
07432cef
WS
1942#, c-format
1943msgid "unable to access '%s'"
1944msgstr "不能访问 '%s'"
ef317cd5 1945
276ceeaa 1946#: wrapper.c:640
220c313c
JX
1947msgid "unable to get current working directory"
1948msgstr "不能获取当前工作目录"
1949
276ceeaa 1950#: wrapper.c:667
7aea43ff
JX
1951#, c-format
1952msgid "could not open %s for writing"
1953msgstr "不能写入 %s"
1954
276ceeaa 1955#: wrapper.c:678 builtin/am.c:410
7aea43ff
JX
1956#, c-format
1957msgid "could not write to %s"
1958msgstr "不能写入 %s"
1959
276ceeaa 1960#: wrapper.c:684
7aea43ff
JX
1961#, c-format
1962msgid "could not close %s"
1963msgstr "不能关闭 %s"
1964
1b7f4a34 1965#: wt-status.c:149
c04f5ac3
JX
1966msgid "Unmerged paths:"
1967msgstr "未合并的路径:"
1968
90e6ef53 1969# 译者:注意保持前导空格
1b7f4a34 1970#: wt-status.c:176 wt-status.c:203
c04f5ac3
JX
1971#, c-format
1972msgid " (use \"git reset %s <file>...\" to unstage)"
160fb2b2 1973msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
c04f5ac3 1974
90e6ef53 1975# 译者:注意保持前导空格
1b7f4a34 1976#: wt-status.c:178 wt-status.c:205
c04f5ac3 1977msgid " (use \"git rm --cached <file>...\" to unstage)"
160fb2b2 1978msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
c04f5ac3 1979
90e6ef53 1980# 译者:注意保持前导空格
1b7f4a34 1981#: wt-status.c:182
6792b93b 1982msgid " (use \"git add <file>...\" to mark resolution)"
d9d56b23 1983msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
6792b93b
JX
1984
1985# 译者:注意保持前导空格
1b7f4a34 1986#: wt-status.c:184 wt-status.c:188
c04f5ac3 1987msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
d9d56b23 1988msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
c04f5ac3 1989
6792b93b 1990# 译者:注意保持前导空格
1b7f4a34 1991#: wt-status.c:186
6792b93b 1992msgid " (use \"git rm <file>...\" to mark resolution)"
d9d56b23 1993msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
6792b93b 1994
1b7f4a34 1995#: wt-status.c:197 wt-status.c:880
c04f5ac3
JX
1996msgid "Changes to be committed:"
1997msgstr "要提交的变更:"
1998
1b7f4a34 1999#: wt-status.c:215 wt-status.c:889
c04f5ac3 2000msgid "Changes not staged for commit:"
7e238ab7 2001msgstr "尚未暂存以备提交的变更:"
c04f5ac3 2002
90e6ef53 2003# 译者:注意保持前导空格
1b7f4a34 2004#: wt-status.c:219
c04f5ac3 2005msgid " (use \"git add <file>...\" to update what will be committed)"
d9d56b23 2006msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
c04f5ac3 2007
90e6ef53 2008# 译者:注意保持前导空格
1b7f4a34 2009#: wt-status.c:221
c04f5ac3 2010msgid " (use \"git add/rm <file>...\" to update what will be committed)"
d9d56b23 2011msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
c04f5ac3 2012
90e6ef53 2013# 译者:注意保持前导空格
1b7f4a34 2014#: wt-status.c:222
c04f5ac3
JX
2015msgid ""
2016" (use \"git checkout -- <file>...\" to discard changes in working directory)"
d9d56b23 2017msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
c04f5ac3 2018
90e6ef53 2019# 译者:注意保持前导空格
1b7f4a34 2020#: wt-status.c:224
c04f5ac3
JX
2021msgid " (commit or discard the untracked or modified content in submodules)"
2022msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
2023
90e6ef53 2024# 译者:注意保持前导空格
1b7f4a34 2025#: wt-status.c:236
c04f5ac3
JX
2026#, c-format
2027msgid " (use \"git %s <file>...\" to include in what will be committed)"
d9d56b23 2028msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
c04f5ac3 2029
1b7f4a34 2030#: wt-status.c:251
c04f5ac3
JX
2031msgid "both deleted:"
2032msgstr "双方删除:"
2033
1b7f4a34 2034#: wt-status.c:253
c04f5ac3
JX
2035msgid "added by us:"
2036msgstr "由我们添加:"
2037
1b7f4a34 2038#: wt-status.c:255
c04f5ac3
JX
2039msgid "deleted by them:"
2040msgstr "由他们删除:"
2041
1b7f4a34 2042#: wt-status.c:257
c04f5ac3
JX
2043msgid "added by them:"
2044msgstr "由他们添加:"
2045
1b7f4a34 2046#: wt-status.c:259
c04f5ac3
JX
2047msgid "deleted by us:"
2048msgstr "由我们删除:"
2049
1b7f4a34 2050#: wt-status.c:261
c04f5ac3
JX
2051msgid "both added:"
2052msgstr "双方添加:"
2053
1b7f4a34 2054#: wt-status.c:263
c04f5ac3
JX
2055msgid "both modified:"
2056msgstr "双方修改:"
2057
1b7f4a34 2058#: wt-status.c:265
6c94aba5
JX
2059#, c-format
2060msgid "bug: unhandled unmerged status %x"
2061msgstr "bug:无法处理的未合并状态 %x"
cfff71a9 2062
1b7f4a34 2063#: wt-status.c:273
6c94aba5
JX
2064msgid "new file:"
2065msgstr "新文件:"
cfff71a9 2066
1b7f4a34 2067#: wt-status.c:275
6c94aba5
JX
2068msgid "copied:"
2069msgstr "拷贝:"
cfff71a9 2070
1b7f4a34 2071#: wt-status.c:277
6c94aba5
JX
2072msgid "deleted:"
2073msgstr "删除:"
cfff71a9 2074
1b7f4a34 2075#: wt-status.c:279
6c94aba5
JX
2076msgid "modified:"
2077msgstr "修改:"
2078
1b7f4a34 2079#: wt-status.c:281
6c94aba5
JX
2080msgid "renamed:"
2081msgstr "重命名:"
2082
1b7f4a34 2083#: wt-status.c:283
6c94aba5
JX
2084msgid "typechange:"
2085msgstr "类型变更:"
2086
1b7f4a34 2087#: wt-status.c:285
6c94aba5
JX
2088msgid "unknown:"
2089msgstr "未知:"
cfff71a9 2090
1b7f4a34 2091#: wt-status.c:287
6c94aba5
JX
2092msgid "unmerged:"
2093msgstr "未合并:"
cfff71a9 2094
90e6ef53 2095# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1b7f4a34 2096#: wt-status.c:369
c04f5ac3 2097msgid "new commits, "
aa9565f7 2098msgstr "新提交, "
c04f5ac3 2099
90e6ef53 2100# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1b7f4a34 2101#: wt-status.c:371
c04f5ac3 2102msgid "modified content, "
aa9565f7 2103msgstr "修改的内容, "
c04f5ac3 2104
90e6ef53 2105# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1b7f4a34 2106#: wt-status.c:373
c04f5ac3 2107msgid "untracked content, "
aa9565f7 2108msgstr "未跟踪的内容, "
c04f5ac3 2109
1b7f4a34 2110#: wt-status.c:390
c04f5ac3
JX
2111#, c-format
2112msgid "bug: unhandled diff status %c"
6c94aba5 2113msgstr "bug:无法处理的差异状态 %c"
c04f5ac3 2114
1b7f4a34 2115#: wt-status.c:754
90314792
JX
2116msgid "Submodules changed but not updated:"
2117msgstr "子模组已修改但尚未更新:"
2118
1b7f4a34 2119#: wt-status.c:756
90314792
JX
2120msgid "Submodule changes to be committed:"
2121msgstr "要提交的子模组变更:"
2122
1b7f4a34 2123#: wt-status.c:837
cfff71a9
JX
2124msgid ""
2125"Do not touch the line above.\n"
2126"Everything below will be removed."
2127msgstr ""
2128"不要改动上面的一行。\n"
2129"下面的所有内容均将被删除。"
2130
1b7f4a34 2131#: wt-status.c:948
6792b93b 2132msgid "You have unmerged paths."
195febda 2133msgstr "您有尚未合并的路径。"
6792b93b
JX
2134
2135# 译者:注意保持前导空格
1b7f4a34 2136#: wt-status.c:951
6792b93b
JX
2137msgid " (fix conflicts and run \"git commit\")"
2138msgstr " (解决冲突并运行 \"git commit\")"
2139
1b7f4a34 2140#: wt-status.c:954
6792b93b
JX
2141msgid "All conflicts fixed but you are still merging."
2142msgstr "所有冲突已解决但您仍处于合并中。"
2143
2144# 译者:注意保持前导空格
1b7f4a34 2145#: wt-status.c:957
6792b93b
JX
2146msgid " (use \"git commit\" to conclude merge)"
2147msgstr " (使用 \"git commit\" 结束合并)"
2148
1b7f4a34 2149#: wt-status.c:967
6792b93b 2150msgid "You are in the middle of an am session."
98b2761d 2151msgstr "您正处于 am 操作过程中。"
6792b93b 2152
1b7f4a34 2153#: wt-status.c:970
6792b93b
JX
2154msgid "The current patch is empty."
2155msgstr "当前的补丁为空。"
2156
2157# 译者:注意保持前导空格
1b7f4a34 2158#: wt-status.c:974
2e8451e8
JX
2159msgid " (fix conflicts and then run \"git am --continue\")"
2160msgstr " (解决冲突,然后运行 \"git am --continue\")"
6792b93b
JX
2161
2162# 译者:注意保持前导空格
1b7f4a34 2163#: wt-status.c:976
6792b93b
JX
2164msgid " (use \"git am --skip\" to skip this patch)"
2165msgstr " (使用 \"git am --skip\" 跳过此补丁)"
2166
2167# 译者:注意保持前导空格
1b7f4a34 2168#: wt-status.c:978
6792b93b
JX
2169msgid " (use \"git am --abort\" to restore the original branch)"
2170msgstr " (使用 \"git am --abort\" 恢复原有分支)"
2171
1b7f4a34
JX
2172#: wt-status.c:1105
2173msgid "No commands done."
2174msgstr "没有命令被执行。"
2175
2176#: wt-status.c:1108
2177#, c-format
2178msgid "Last command done (%d command done):"
2179msgid_plural "Last commands done (%d commands done):"
2180msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
2181msgstr[1] "最后的命令已完成(%d 条命令被执行):"
2182
2183#: wt-status.c:1119
2184#, c-format
2185msgid " (see more in file %s)"
2186msgstr " (更多参见文件 %s)"
2187
2188#: wt-status.c:1124
2189msgid "No commands remaining."
2190msgstr "未剩下任何命令。"
2191
2192#: wt-status.c:1127
2193#, c-format
2194msgid "Next command to do (%d remaining command):"
2195msgid_plural "Next commands to do (%d remaining commands):"
2196msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
2197msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
2198
2199# 译者:注意保持前导空格
2200#: wt-status.c:1135
2201msgid " (use \"git rebase --edit-todo\" to view and edit)"
2202msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
2203
2204#: wt-status.c:1148
63af42fe
JX
2205#, c-format
2206msgid "You are currently rebasing branch '%s' on '%s'."
98b2761d 2207msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
63af42fe 2208
1b7f4a34 2209#: wt-status.c:1153
6792b93b 2210msgid "You are currently rebasing."
98b2761d 2211msgstr "您在执行变基操作。"
6792b93b
JX
2212
2213# 译者:注意保持前导空格
1b7f4a34 2214#: wt-status.c:1167
6792b93b
JX
2215msgid " (fix conflicts and then run \"git rebase --continue\")"
2216msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
2217
2218# 译者:注意保持前导空格
1b7f4a34 2219#: wt-status.c:1169
6792b93b
JX
2220msgid " (use \"git rebase --skip\" to skip this patch)"
2221msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
2222
2223# 译者:注意保持前导空格
1b7f4a34 2224#: wt-status.c:1171
6792b93b
JX
2225msgid " (use \"git rebase --abort\" to check out the original branch)"
2226msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
2227
2228# 译者:注意保持前导空格
1b7f4a34 2229#: wt-status.c:1177
6792b93b
JX
2230msgid " (all conflicts fixed: run \"git rebase --continue\")"
2231msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
2232
1b7f4a34 2233#: wt-status.c:1181
63af42fe
JX
2234#, c-format
2235msgid ""
2236"You are currently splitting a commit while rebasing branch '%s' on '%s'."
98b2761d 2237msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
63af42fe 2238
1b7f4a34 2239#: wt-status.c:1186
6792b93b 2240msgid "You are currently splitting a commit during a rebase."
98b2761d 2241msgstr "您在执行变基操作时拆分提交。"
6792b93b
JX
2242
2243# 译者:注意保持前导空格
1b7f4a34 2244#: wt-status.c:1189
6792b93b
JX
2245msgid " (Once your working directory is clean, run \"git rebase --continue\")"
2246msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
2247
1b7f4a34 2248#: wt-status.c:1193
63af42fe
JX
2249#, c-format
2250msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
98b2761d 2251msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
63af42fe 2252
1b7f4a34 2253#: wt-status.c:1198
6792b93b 2254msgid "You are currently editing a commit during a rebase."
98b2761d 2255msgstr "您在执行变基操作时编辑提交。"
6792b93b
JX
2256
2257# 译者:注意保持前导空格
1b7f4a34 2258#: wt-status.c:1201
6792b93b
JX
2259msgid " (use \"git commit --amend\" to amend the current commit)"
2260msgstr " (使用 \"git commit --amend\" 修补当前提交)"
2261
2262# 译者:注意保持前导空格
1b7f4a34 2263#: wt-status.c:1203
6792b93b
JX
2264msgid ""
2265" (use \"git rebase --continue\" once you are satisfied with your changes)"
195febda 2266msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
6792b93b 2267
1b7f4a34 2268#: wt-status.c:1213
90314792
JX
2269#, c-format
2270msgid "You are currently cherry-picking commit %s."
98b2761d 2271msgstr "您在执行拣选提交 %s 的操作。"
6792b93b 2272
2e8451e8 2273# 译者:注意保持前导空格
1b7f4a34 2274#: wt-status.c:1218
2e8451e8
JX
2275msgid " (fix conflicts and run \"git cherry-pick --continue\")"
2276msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
2277
6792b93b 2278# 译者:注意保持前导空格
1b7f4a34 2279#: wt-status.c:1221
2e8451e8
JX
2280msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
2281msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
6792b93b 2282
2e8451e8 2283# 译者:注意保持前导空格
1b7f4a34 2284#: wt-status.c:1223
2e8451e8
JX
2285msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2286msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
2287
1b7f4a34 2288#: wt-status.c:1232
1003b3a5
JX
2289#, c-format
2290msgid "You are currently reverting commit %s."
98b2761d 2291msgstr "您在执行反转提交 %s 的操作。"
1003b3a5
JX
2292
2293# 译者:注意保持前导空格
1b7f4a34 2294#: wt-status.c:1237
1003b3a5
JX
2295msgid " (fix conflicts and run \"git revert --continue\")"
2296msgstr " (解决冲突并运行 \"git revert --continue\")"
2297
2298# 译者:注意保持前导空格
1b7f4a34 2299#: wt-status.c:1240
1003b3a5
JX
2300msgid " (all conflicts fixed: run \"git revert --continue\")"
2301msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
2302
2303# 译者:注意保持前导空格
1b7f4a34 2304#: wt-status.c:1242
1003b3a5
JX
2305msgid " (use \"git revert --abort\" to cancel the revert operation)"
2306msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
2307
1b7f4a34 2308#: wt-status.c:1253
63af42fe 2309#, c-format
1003b3a5 2310msgid "You are currently bisecting, started from branch '%s'."
98b2761d 2311msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
63af42fe 2312
1b7f4a34 2313#: wt-status.c:1257
6792b93b 2314msgid "You are currently bisecting."
98b2761d 2315msgstr "您在执行二分查找操作。"
6792b93b
JX
2316
2317# 译者:注意保持前导空格
1b7f4a34 2318#: wt-status.c:1260
6792b93b
JX
2319msgid " (use \"git bisect reset\" to get back to the original branch)"
2320msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
2321
94550ed3 2322#: wt-status.c:1438
c04f5ac3
JX
2323msgid "On branch "
2324msgstr "位于分支 "
2325
94550ed3 2326#: wt-status.c:1444
1b7f4a34
JX
2327msgid "interactive rebase in progress; onto "
2328msgstr "交互式变基操作正在进行中;至 "
2329
94550ed3 2330#: wt-status.c:1446
2e8451e8 2331msgid "rebase in progress; onto "
98b2761d 2332msgstr "变基操作正在进行中;至 "
2e8451e8 2333
94550ed3 2334#: wt-status.c:1451
1003b3a5
JX
2335msgid "HEAD detached at "
2336msgstr "头指针分离于 "
2337
94550ed3 2338#: wt-status.c:1453
1003b3a5
JX
2339msgid "HEAD detached from "
2340msgstr "头指针分离自 "
2341
94550ed3 2342#: wt-status.c:1456
c04f5ac3
JX
2343msgid "Not currently on any branch."
2344msgstr "当前不在任何分支上。"
2345
1b7f4a34 2346#: wt-status.c:1474
c04f5ac3
JX
2347msgid "Initial commit"
2348msgstr "初始提交"
2349
1b7f4a34 2350#: wt-status.c:1488
ef317cd5 2351msgid "Untracked files"
07432cef 2352msgstr "未跟踪的文件"
c04f5ac3 2353
1b7f4a34 2354#: wt-status.c:1490
ef317cd5 2355msgid "Ignored files"
07432cef 2356msgstr "忽略的文件"
c04f5ac3 2357
1b7f4a34 2358#: wt-status.c:1494
1003b3a5 2359#, c-format
4dcdc3d8
JX
2360msgid ""
2361"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2362"may speed it up, but you have to be careful not to forget to add\n"
2363"new files yourself (see 'git help status')."
2364msgstr ""
2365"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
2366"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1003b3a5 2367
1b7f4a34 2368#: wt-status.c:1500
c04f5ac3
JX
2369#, c-format
2370msgid "Untracked files not listed%s"
2371msgstr "未跟踪的文件没有列出%s"
2372
7e238ab7 2373# 译者:中文字符串拼接,可删除前导空格
1b7f4a34 2374#: wt-status.c:1502
c04f5ac3 2375msgid " (use -u option to show untracked files)"
7e238ab7 2376msgstr "(使用 -u 参数显示未跟踪的文件)"
c04f5ac3 2377
1b7f4a34 2378#: wt-status.c:1508
c04f5ac3
JX
2379msgid "No changes"
2380msgstr "没有修改"
2381
1b7f4a34 2382#: wt-status.c:1513
07432cef 2383#, c-format
ef317cd5 2384msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
07432cef 2385msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
c04f5ac3 2386
1b7f4a34 2387#: wt-status.c:1516
07432cef 2388#, c-format
ef317cd5 2389msgid "no changes added to commit\n"
07432cef 2390msgstr "修改尚未加入提交\n"
c04f5ac3 2391
1b7f4a34 2392#: wt-status.c:1519
07432cef 2393#, c-format
ef317cd5
JX
2394msgid ""
2395"nothing added to commit but untracked files present (use \"git add\" to "
2396"track)\n"
07432cef 2397msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
c04f5ac3 2398
1b7f4a34 2399#: wt-status.c:1522
07432cef 2400#, c-format
ef317cd5 2401msgid "nothing added to commit but untracked files present\n"
07432cef 2402msgstr "提交为空,但是存在尚未跟踪的文件\n"
c04f5ac3 2403
7e238ab7 2404# 译者:中文字符串拼接,可删除前导空格
1b7f4a34 2405#: wt-status.c:1525
07432cef 2406#, c-format
ef317cd5 2407msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
07432cef 2408msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
c04f5ac3 2409
1b7f4a34 2410#: wt-status.c:1528 wt-status.c:1533
07432cef 2411#, c-format
ef317cd5 2412msgid "nothing to commit\n"
07432cef 2413msgstr "无文件要提交\n"
ef317cd5 2414
7e238ab7 2415# 译者:中文字符串拼接,可删除前导空格
1b7f4a34 2416#: wt-status.c:1531
07432cef 2417#, c-format
ef317cd5 2418msgid "nothing to commit (use -u to show untracked files)\n"
07432cef 2419msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
c04f5ac3 2420
7e238ab7 2421# 译者:中文字符串拼接,可删除前导空格
1b7f4a34 2422#: wt-status.c:1535
07432cef 2423#, c-format
ef317cd5 2424msgid "nothing to commit, working directory clean\n"
07432cef 2425msgstr "无文件要提交,干净的工作区\n"
c04f5ac3 2426
90e6ef53 2427# 译者:注意保持句尾空格
94550ed3 2428#: wt-status.c:1642
c04f5ac3
JX
2429msgid "Initial commit on "
2430msgstr "初始提交于 "
2431
94550ed3
JX
2432#: wt-status.c:1646
2433msgid "HEAD (no branch)"
2434msgstr "HEAD(非分支)"
2435
2436#: wt-status.c:1675
90314792
JX
2437msgid "gone"
2438msgstr "丢失"
2439
90e6ef53 2440# 译者:注意保持句尾空格
94550ed3 2441#: wt-status.c:1677 wt-status.c:1685
c04f5ac3
JX
2442msgid "behind "
2443msgstr "落后 "
2444
5c0c220c
JX
2445#: wt-status.c:1680 wt-status.c:1683
2446msgid "ahead "
2447msgstr "领先 "
2448
276ceeaa 2449#: compat/precompose_utf8.c:57 builtin/clone.c:413
a77c07d9
JX
2450#, c-format
2451msgid "failed to unlink '%s'"
2452msgstr "无法删除 '%s'"
2453
220c313c 2454#: builtin/add.c:22
814ff314 2455msgid "git add [<options>] [--] <pathspec>..."
160fb2b2 2456msgstr "git add [<选项>] [--] <路径规格>..."
ef317cd5 2457
220c313c 2458#: builtin/add.c:65
c04f5ac3
JX
2459#, c-format
2460msgid "unexpected diff status %c"
2461msgstr "意外的差异状态 %c"
2462
94550ed3 2463#: builtin/add.c:70 builtin/commit.c:278
c04f5ac3
JX
2464msgid "updating files failed"
2465msgstr "更新文件失败"
2466
220c313c 2467#: builtin/add.c:80
c04f5ac3
JX
2468#, c-format
2469msgid "remove '%s'\n"
2470msgstr "删除 '%s'\n"
2471
220c313c 2472#: builtin/add.c:134
c04f5ac3 2473msgid "Unstaged changes after refreshing the index:"
90e6ef53 2474msgstr "刷新索引之后尚未被暂存的变更:"
c04f5ac3 2475
276ceeaa 2476#: builtin/add.c:194 builtin/rev-parse.c:797
c04f5ac3 2477msgid "Could not read the index"
90e6ef53 2478msgstr "不能读取索引"
c04f5ac3 2479
220c313c 2480#: builtin/add.c:205
c04f5ac3
JX
2481#, c-format
2482msgid "Could not open '%s' for writing."
1b7f4a34 2483msgstr "无法打开 '%s' 进行写入。"
c04f5ac3 2484
220c313c 2485#: builtin/add.c:209
c04f5ac3 2486msgid "Could not write patch"
195febda 2487msgstr "不能生成补丁"
c04f5ac3 2488
7aea43ff
JX
2489#: builtin/add.c:212
2490msgid "editing patch failed"
2491msgstr "编辑补丁失败"
2492
2493#: builtin/add.c:215
c04f5ac3
JX
2494#, c-format
2495msgid "Could not stat '%s'"
90e6ef53 2496msgstr "不能查看文件状态 '%s'"
c04f5ac3 2497
7aea43ff 2498#: builtin/add.c:217
c04f5ac3
JX
2499msgid "Empty patch. Aborted."
2500msgstr "空补丁。异常终止。"
2501
7aea43ff 2502#: builtin/add.c:222
8ada9598
JX
2503#, c-format
2504msgid "Could not apply '%s'"
2505msgstr "不能应用 '%s'"
2506
7aea43ff 2507#: builtin/add.c:232
8ada9598 2508msgid "The following paths are ignored by one of your .gitignore files:\n"
195febda 2509msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 2510
276ceeaa
JX
2511#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
2512#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
2513#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
ef317cd5 2514msgid "dry run"
07432cef 2515msgstr "演习"
ef317cd5 2516
276ceeaa 2517#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
94550ed3 2518#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
276ceeaa 2519#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
ef317cd5
JX
2520msgid "be verbose"
2521msgstr "冗长输出"
2522
7aea43ff 2523#: builtin/add.c:252
ef317cd5 2524msgid "interactive picking"
07432cef 2525msgstr "交互式拣选"
ef317cd5 2526
276ceeaa 2527#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
ef317cd5 2528msgid "select hunks interactively"
07432cef 2529msgstr "交互式挑选数据块"
ef317cd5 2530
7aea43ff 2531#: builtin/add.c:254
ef317cd5 2532msgid "edit current diff and apply"
07432cef 2533msgstr "编辑当前差异并应用"
ef317cd5 2534
7aea43ff 2535#: builtin/add.c:255
ef317cd5 2536msgid "allow adding otherwise ignored files"
07432cef 2537msgstr "允许添加忽略的文件"
ef317cd5 2538
7aea43ff 2539#: builtin/add.c:256
ef317cd5 2540msgid "update tracked files"
07432cef 2541msgstr "更新已跟踪的文件"
ef317cd5 2542
7aea43ff 2543#: builtin/add.c:257
ef317cd5 2544msgid "record only the fact that the path will be added later"
07432cef 2545msgstr "只记录,该路径稍后再添加"
ef317cd5 2546
7aea43ff 2547#: builtin/add.c:258
ef317cd5 2548msgid "add changes from all tracked and untracked files"
07432cef 2549msgstr "添加所有改变的已跟踪文件和未跟踪文件"
ef317cd5 2550
7aea43ff 2551#: builtin/add.c:261
4dcdc3d8
JX
2552msgid "ignore paths removed in the working tree (same as --no-all)"
2553msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2554
7aea43ff 2555#: builtin/add.c:263
ef317cd5 2556msgid "don't add, only refresh the index"
07432cef 2557msgstr "不添加,只刷新索引"
ef317cd5 2558
7aea43ff 2559#: builtin/add.c:264
ef317cd5 2560msgid "just skip files which cannot be added because of errors"
07432cef 2561msgstr "跳过因出错不能添加的文件"
ef317cd5 2562
7aea43ff 2563#: builtin/add.c:265
ef317cd5 2564msgid "check if - even missing - files are ignored in dry run"
07432cef 2565msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
ef317cd5 2566
7aea43ff 2567#: builtin/add.c:287
8ada9598
JX
2568#, c-format
2569msgid "Use -f if you really want to add them.\n"
2570msgstr "使用 -f 参数如果您确实要添加它们。\n"
2571
7aea43ff 2572#: builtin/add.c:294
8ada9598
JX
2573msgid "adding files failed"
2574msgstr "添加文件失败"
2575
7aea43ff 2576#: builtin/add.c:330
8ada9598
JX
2577msgid "-A and -u are mutually incompatible"
2578msgstr "-A 和 -u 选项互斥"
2579
7aea43ff 2580#: builtin/add.c:337
8ada9598 2581msgid "Option --ignore-missing can only be used together with --dry-run"
649900bc 2582msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 2583
94550ed3 2584#: builtin/add.c:352
8ada9598
JX
2585#, c-format
2586msgid "Nothing specified, nothing added.\n"
2587msgstr "没有指定文件,也没有文件被添加。\n"
2588
94550ed3 2589#: builtin/add.c:353
8ada9598
JX
2590#, c-format
2591msgid "Maybe you wanted to say 'git add .'?\n"
2592msgstr "也许您想要执行 'git add .'?\n"
2593
276ceeaa
JX
2594#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
2595#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
2596#: builtin/submodule--helper.c:35
8ada9598
JX
2597msgid "index file corrupt"
2598msgstr "索引文件损坏"
2599
276ceeaa 2600#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
8ada9598
JX
2601msgid "Unable to write new index file"
2602msgstr "无法写入新索引文件"
2603
276ceeaa 2604#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
1b7f4a34
JX
2605#, c-format
2606msgid "could not read '%s'"
2607msgstr "不能读取 '%s'"
2608
276ceeaa 2609#: builtin/am.c:430
1b7f4a34
JX
2610msgid "could not parse author script"
2611msgstr "不能解析作者脚本"
2612
276ceeaa 2613#: builtin/am.c:507
1b7f4a34
JX
2614#, c-format
2615msgid "'%s' was deleted by the applypatch-msg hook"
2616msgstr "'%s' 被 applypatch-msg 钩子删除"
2617
276ceeaa 2618#: builtin/am.c:548 builtin/notes.c:300
1b7f4a34
JX
2619#, c-format
2620msgid "Malformed input line: '%s'."
2621msgstr "非法的输入行:'%s'。"
2622
276ceeaa 2623#: builtin/am.c:585 builtin/notes.c:315
1b7f4a34
JX
2624#, c-format
2625msgid "Failed to copy notes from '%s' to '%s'"
2626msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
2627
276ceeaa 2628#: builtin/am.c:611
1b7f4a34
JX
2629msgid "fseek failed"
2630msgstr "fseek 失败"
2631
276ceeaa 2632#: builtin/am.c:772 builtin/am.c:860
1b7f4a34
JX
2633#, c-format
2634msgid "could not open '%s' for reading: %s"
2635msgstr "无法打开 '%s' 进行读取:%s"
2636
276ceeaa 2637#: builtin/am.c:779
1b7f4a34
JX
2638#, c-format
2639msgid "could not open '%s' for writing: %s"
2640msgstr "无法打开 '%s' 进行写入:%s"
2641
276ceeaa 2642#: builtin/am.c:788
1b7f4a34
JX
2643#, c-format
2644msgid "could not parse patch '%s'"
2645msgstr "无法解析补丁 '%s'"
2646
276ceeaa 2647#: builtin/am.c:853
1b7f4a34
JX
2648msgid "Only one StGIT patch series can be applied at once"
2649msgstr "一次只能有一个 StGIT 补丁队列被应用"
2650
276ceeaa 2651#: builtin/am.c:901
1b7f4a34
JX
2652msgid "invalid timestamp"
2653msgstr "无效的时间戳"
2654
276ceeaa 2655#: builtin/am.c:904 builtin/am.c:912
1b7f4a34
JX
2656msgid "invalid Date line"
2657msgstr "无效的日期行"
2658
276ceeaa 2659#: builtin/am.c:909
1b7f4a34
JX
2660msgid "invalid timezone offset"
2661msgstr "无效的时区偏移值"
2662
276ceeaa 2663#: builtin/am.c:996
1b7f4a34
JX
2664msgid "Patch format detection failed."
2665msgstr "补丁格式检测失败。"
2666
276ceeaa 2667#: builtin/am.c:1001 builtin/clone.c:378
1b7f4a34
JX
2668#, c-format
2669msgid "failed to create directory '%s'"
2670msgstr "无法创建目录 '%s'"
2671
276ceeaa 2672#: builtin/am.c:1005
1b7f4a34
JX
2673msgid "Failed to split patches."
2674msgstr "无法拆分补丁。"
2675
276ceeaa 2676#: builtin/am.c:1137 builtin/commit.c:363
1b7f4a34
JX
2677msgid "unable to write index file"
2678msgstr "无法写入索引文件"
2679
276ceeaa 2680#: builtin/am.c:1188
1b7f4a34
JX
2681#, c-format
2682msgid "When you have resolved this problem, run \"%s --continue\"."
2683msgstr "当您解决这一问题,执行 \"%s --continue\"。"
2684
276ceeaa 2685#: builtin/am.c:1189
1b7f4a34
JX
2686#, c-format
2687msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2688msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
2689
276ceeaa 2690#: builtin/am.c:1190
1b7f4a34
JX
2691#, c-format
2692msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2693msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
2694
276ceeaa 2695#: builtin/am.c:1328
1b7f4a34
JX
2696msgid "Patch is empty. Was it split wrong?"
2697msgstr "补丁为空。是不是切分错误?"
2698
276ceeaa 2699#: builtin/am.c:1402 builtin/log.c:1350
1b7f4a34
JX
2700#, c-format
2701msgid "invalid ident line: %s"
2702msgstr "包含无效的身份标识:%s"
2703
276ceeaa 2704#: builtin/am.c:1429
1b7f4a34
JX
2705#, c-format
2706msgid "unable to parse commit %s"
2707msgstr "不能解析提交 %s"
2708
276ceeaa 2709#: builtin/am.c:1631
1b7f4a34
JX
2710msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2711msgstr "仓库缺乏必要的数据对象以进行三方合并。"
2712
276ceeaa 2713#: builtin/am.c:1633
1b7f4a34
JX
2714msgid "Using index info to reconstruct a base tree..."
2715msgstr "使用索引来重建一个(三方合并的)基础目录树..."
2716
276ceeaa 2717#: builtin/am.c:1652
1b7f4a34
JX
2718msgid ""
2719"Did you hand edit your patch?\n"
2720"It does not apply to blobs recorded in its index."
2721msgstr ""
2722"您是否曾手动编辑过您的补丁?\n"
2723"无法应用补丁到索引中的数据对象上。"
2724
276ceeaa 2725#: builtin/am.c:1658
1b7f4a34
JX
2726msgid "Falling back to patching base and 3-way merge..."
2727msgstr "回落到基础版本上打补丁及进行三方合并..."
2728
276ceeaa 2729#: builtin/am.c:1673
1b7f4a34
JX
2730msgid "Failed to merge in the changes."
2731msgstr "无法合并变更。"
2732
276ceeaa 2733#: builtin/am.c:1697 builtin/merge.c:633
1b7f4a34
JX
2734msgid "git write-tree failed to write a tree"
2735msgstr "git write-tree 无法写入一树对象"
2736
276ceeaa 2737#: builtin/am.c:1704
1b7f4a34
JX
2738msgid "applying to an empty history"
2739msgstr "正应用到一个空历史上"
2740
276ceeaa
JX
2741#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
2742#: builtin/merge.c:855
1b7f4a34
JX
2743msgid "failed to write commit object"
2744msgstr "无法写提交对象"
2745
276ceeaa 2746#: builtin/am.c:1749 builtin/am.c:1753
1b7f4a34
JX
2747#, c-format
2748msgid "cannot resume: %s does not exist."
2749msgstr "无法继续:%s 不存在。"
2750
276ceeaa 2751#: builtin/am.c:1769
1b7f4a34
JX
2752msgid "cannot be interactive without stdin connected to a terminal."
2753msgstr "标准输入没有和终端关联,不能进行交互式操作。"
2754
276ceeaa 2755#: builtin/am.c:1774
1b7f4a34
JX
2756msgid "Commit Body is:"
2757msgstr "提交内容为:"
2758
2759# 译者:注意保持句尾空格
2760#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
2761#. in your translation. The program will only accept English
2762#. input at this point.
2763#.
276ceeaa 2764#: builtin/am.c:1784
1b7f4a34
JX
2765msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
2766msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
2767
276ceeaa 2768#: builtin/am.c:1834
1b7f4a34
JX
2769#, c-format
2770msgid "Dirty index: cannot apply patches (dirty: %s)"
2771msgstr "脏索引:不能应用补丁(脏文件:%s)"
2772
276ceeaa 2773#: builtin/am.c:1869 builtin/am.c:1941
1b7f4a34
JX
2774#, c-format
2775msgid "Applying: %.*s"
2776msgstr "应用:%.*s"
2777
276ceeaa 2778#: builtin/am.c:1885
1b7f4a34
JX
2779msgid "No changes -- Patch already applied."
2780msgstr "没有变更 —— 补丁已经应用过。"
2781
276ceeaa 2782#: builtin/am.c:1893
1b7f4a34
JX
2783#, c-format
2784msgid "Patch failed at %s %.*s"
2785msgstr "打补丁失败于 %s %.*s"
2786
276ceeaa 2787#: builtin/am.c:1899
1b7f4a34
JX
2788#, c-format
2789msgid "The copy of the patch that failed is found in: %s"
2790msgstr "失败的补丁文件副本位于:%s"
2791
276ceeaa 2792#: builtin/am.c:1944
1b7f4a34
JX
2793msgid ""
2794"No changes - did you forget to use 'git add'?\n"
2795"If there is nothing left to stage, chances are that something else\n"
2796"already introduced the same changes; you might want to skip this patch."
2797msgstr ""
2798"没有变更 —— 您是不是忘了执行 'git add'?\n"
2799"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
2800"您也许想要跳过这个补丁。"
2801
276ceeaa 2802#: builtin/am.c:1951
1b7f4a34
JX
2803msgid ""
2804"You still have unmerged paths in your index.\n"
2805"Did you forget to use 'git add'?"
2806msgstr ""
2807"您的索引中仍有未合并的路径。\n"
2808"您是否忘了执行 'git add'?"
2809
276ceeaa 2810#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
1b7f4a34
JX
2811#: builtin/reset.c:316
2812#, c-format
2813msgid "Could not parse object '%s'."
2814msgstr "不能解析对象 '%s'。"
2815
276ceeaa 2816#: builtin/am.c:2111
1b7f4a34
JX
2817msgid "failed to clean index"
2818msgstr "无法清空索引"
2819
276ceeaa 2820#: builtin/am.c:2145
1b7f4a34
JX
2821msgid ""
2822"You seem to have moved HEAD since the last 'am' failure.\n"
2823"Not rewinding to ORIG_HEAD"
2824msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
2825
276ceeaa 2826#: builtin/am.c:2206
1b7f4a34
JX
2827#, c-format
2828msgid "Invalid value for --patch-format: %s"
2829msgstr "无效的 --patch-format 值:%s"
2830
276ceeaa 2831#: builtin/am.c:2239
94550ed3
JX
2832msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
2833msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
1b7f4a34 2834
276ceeaa 2835#: builtin/am.c:2240
94550ed3
JX
2836msgid "git am [<options>] (--continue | --skip | --abort)"
2837msgstr "git am [<选项>] (--continue | --skip | --abort)"
1b7f4a34 2838
276ceeaa 2839#: builtin/am.c:2246
1b7f4a34
JX
2840msgid "run interactively"
2841msgstr "以交互式方式运行"
2842
276ceeaa 2843#: builtin/am.c:2248
1b7f4a34
JX
2844msgid "historical option -- no-op"
2845msgstr "老的参数 —— 无作用"
2846
276ceeaa 2847#: builtin/am.c:2250
1b7f4a34
JX
2848msgid "allow fall back on 3way merging if needed"
2849msgstr "如果必要,允许使用三方合并。"
2850
276ceeaa 2851#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
1b7f4a34
JX
2852#: builtin/repack.c:171
2853msgid "be quiet"
2854msgstr "静默模式"
2855
276ceeaa 2856#: builtin/am.c:2253
1b7f4a34
JX
2857msgid "add a Signed-off-by line to the commit message"
2858msgstr "在提交说明中添加一个 Signed-off-by 签名"
2859
276ceeaa 2860#: builtin/am.c:2256
1b7f4a34
JX
2861msgid "recode into utf8 (default)"
2862msgstr "使用 utf8 字符集(默认)"
2863
276ceeaa 2864#: builtin/am.c:2258
1b7f4a34
JX
2865msgid "pass -k flag to git-mailinfo"
2866msgstr "向 git-mailinfo 传递 -k 参数"
2867
276ceeaa 2868#: builtin/am.c:2260
1b7f4a34
JX
2869msgid "pass -b flag to git-mailinfo"
2870msgstr "向 git-mailinfo 传递 -b 参数"
2871
276ceeaa 2872#: builtin/am.c:2262
1b7f4a34
JX
2873msgid "pass -m flag to git-mailinfo"
2874msgstr "向 git-mailinfo 传递 -m 参数"
2875
276ceeaa 2876#: builtin/am.c:2264
1b7f4a34
JX
2877msgid "pass --keep-cr flag to git-mailsplit for mbox format"
2878msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
2879
276ceeaa 2880#: builtin/am.c:2267
1b7f4a34
JX
2881msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
2882msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
2883
276ceeaa 2884#: builtin/am.c:2270
1b7f4a34
JX
2885msgid "strip everything before a scissors line"
2886msgstr "丢弃裁切线前的所有内容"
2887
276ceeaa 2888#: builtin/am.c:2271 builtin/apply.c:4544
1b7f4a34
JX
2889msgid "action"
2890msgstr "动作"
2891
276ceeaa
JX
2892#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
2893#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
2894#: builtin/am.c:2299
1b7f4a34
JX
2895msgid "pass it through git-apply"
2896msgstr "传递给 git-apply"
2897
276ceeaa 2898#: builtin/am.c:2280 builtin/apply.c:4568
1b7f4a34
JX
2899msgid "root"
2900msgstr "根目录"
2901
276ceeaa
JX
2902#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
2903#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
2904#: builtin/pull.c:171 builtin/submodule--helper.c:72
2905#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
1b7f4a34
JX
2906msgid "path"
2907msgstr "路径"
2908
276ceeaa
JX
2909#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
2910#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
2911#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
2912#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
2913#: parse-options.h:132 parse-options.h:134 parse-options.h:244
1b7f4a34
JX
2914msgid "n"
2915msgstr "n"
2916
276ceeaa 2917#: builtin/am.c:2292 builtin/apply.c:4512
1b7f4a34
JX
2918msgid "num"
2919msgstr "数字"
2920
276ceeaa 2921#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
94550ed3 2922#: builtin/tag.c:372
1b7f4a34
JX
2923msgid "format"
2924msgstr "格式"
2925
276ceeaa 2926#: builtin/am.c:2296
1b7f4a34
JX
2927msgid "format the patch(es) are in"
2928msgstr "补丁的格式"
2929
276ceeaa 2930#: builtin/am.c:2302
1b7f4a34
JX
2931msgid "override error message when patch failure occurs"
2932msgstr "打补丁失败时显示的错误信息"
2933
276ceeaa 2934#: builtin/am.c:2304
1b7f4a34
JX
2935msgid "continue applying patches after resolving a conflict"
2936msgstr "冲突解决后继续应用补丁"
2937
276ceeaa 2938#: builtin/am.c:2307
1b7f4a34
JX
2939msgid "synonyms for --continue"
2940msgstr "和 --continue 同义"
2941
276ceeaa 2942#: builtin/am.c:2310
1b7f4a34
JX
2943msgid "skip the current patch"
2944msgstr "跳过当前补丁"
2945
276ceeaa 2946#: builtin/am.c:2313
1b7f4a34
JX
2947msgid "restore the original branch and abort the patching operation."
2948msgstr "恢复原始分支并终止打补丁操作。"
2949
276ceeaa 2950#: builtin/am.c:2317
1b7f4a34
JX
2951msgid "lie about committer date"
2952msgstr "将作者日期作为提交日期"
2953
276ceeaa 2954#: builtin/am.c:2319
1b7f4a34
JX
2955msgid "use current timestamp for author date"
2956msgstr "用当前时间作为作者日期"
2957
276ceeaa
JX
2958#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
2959#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
1b7f4a34
JX
2960msgid "key-id"
2961msgstr "key-id"
2962
276ceeaa 2963#: builtin/am.c:2322
1b7f4a34
JX
2964msgid "GPG-sign commits"
2965msgstr "使用 GPG 签名提交"
2966
276ceeaa 2967#: builtin/am.c:2325
1b7f4a34
JX
2968msgid "(internal use for git-rebase)"
2969msgstr "(内部使用,用于 git-rebase)"
2970
276ceeaa 2971#: builtin/am.c:2340
1b7f4a34
JX
2972msgid ""
2973"The -b/--binary option has been a no-op for long time, and\n"
2974"it will be removed. Please do not use it anymore."
2975msgstr ""
2976"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
2977"请不要再使用它了。"
2978
276ceeaa 2979#: builtin/am.c:2347
1b7f4a34
JX
2980msgid "failed to read the index"
2981msgstr "无法读取索引"
2982
276ceeaa 2983#: builtin/am.c:2362
1b7f4a34
JX
2984#, c-format
2985msgid "previous rebase directory %s still exists but mbox given."
2986msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
2987
276ceeaa 2988#: builtin/am.c:2386
1b7f4a34
JX
2989#, c-format
2990msgid ""
2991"Stray %s directory found.\n"
2992"Use \"git am --abort\" to remove it."
2993msgstr ""
2994"发现了错误的 %s 目录。\n"
2995"使用 \"git am --abort\" 删除它。"
2996
276ceeaa 2997#: builtin/am.c:2392
1b7f4a34
JX
2998msgid "Resolve operation not in progress, we are not resuming."
2999msgstr "解决操作未进行,我们不会继续。"
3000
814ff314
JX
3001#: builtin/apply.c:59
3002msgid "git apply [<options>] [<patch>...]"
3003msgstr "git apply [<选项>] [<补丁>...]"
8ada9598 3004
94550ed3 3005#: builtin/apply.c:111
81809b99 3006#, c-format
8ada9598 3007msgid "unrecognized whitespace option '%s'"
81809b99 3008msgstr "未能识别的空白字符选项 '%s'"
8ada9598 3009
94550ed3 3010#: builtin/apply.c:126
81809b99 3011#, c-format
8ada9598 3012msgid "unrecognized whitespace ignore option '%s'"
81809b99 3013msgstr "未能识别的空白字符忽略选项 '%s'"
8ada9598 3014
94550ed3 3015#: builtin/apply.c:818
8ada9598
JX
3016#, c-format
3017msgid "Cannot prepare timestamp regexp %s"
81809b99 3018msgstr "无法准备时间戳正则表达式 %s"
8ada9598 3019
94550ed3 3020#: builtin/apply.c:827
8ada9598
JX
3021#, c-format
3022msgid "regexec returned %d for input: %s"
81809b99 3023msgstr "regexec 返回 %d,输入为:%s"
8ada9598 3024
94550ed3 3025#: builtin/apply.c:908
81809b99 3026#, c-format
8ada9598 3027msgid "unable to find filename in patch at line %d"
81809b99 3028msgstr "不能在补丁的第 %d 行找到文件名"
8ada9598 3029
94550ed3 3030#: builtin/apply.c:940
8ada9598
JX
3031#, c-format
3032msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
9aafc933 3033msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
8ada9598 3034
94550ed3 3035#: builtin/apply.c:944
8ada9598
JX
3036#, c-format
3037msgid "git apply: bad git-diff - inconsistent new filename on line %d"
81809b99 3038msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
8ada9598 3039
94550ed3 3040#: builtin/apply.c:945
8ada9598
JX
3041#, c-format
3042msgid "git apply: bad git-diff - inconsistent old filename on line %d"
81809b99 3043msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
8ada9598 3044
94550ed3 3045#: builtin/apply.c:952
8ada9598
JX
3046#, c-format
3047msgid "git apply: bad git-diff - expected /dev/null on line %d"
9aafc933 3048msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
8ada9598 3049
94550ed3 3050#: builtin/apply.c:1415
8ada9598
JX
3051#, c-format
3052msgid "recount: unexpected line: %.*s"
81809b99 3053msgstr "recount:意外的行:%.*s"
8ada9598 3054
94550ed3 3055#: builtin/apply.c:1472
8ada9598
JX
3056#, c-format
3057msgid "patch fragment without header at line %d: %.*s"
81809b99 3058msgstr "第 %d 行的补丁片段没有头信息:%.*s"
8ada9598 3059
94550ed3 3060#: builtin/apply.c:1489
8ada9598
JX
3061#, c-format
3062msgid ""
3063"git diff header lacks filename information when removing %d leading pathname "
3064"component (line %d)"
3065msgid_plural ""
3066"git diff header lacks filename information when removing %d leading pathname "
3067"components (line %d)"
5ae481e0
JX
3068msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
3069msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
8ada9598 3070
94550ed3 3071#: builtin/apply.c:1655
8ada9598 3072msgid "new file depends on old contents"
81809b99 3073msgstr "新文件依赖旧内容"
8ada9598 3074
94550ed3 3075#: builtin/apply.c:1657
8ada9598 3076msgid "deleted file still has contents"
81809b99 3077msgstr "删除的文件仍有内容"
8ada9598 3078
94550ed3 3079#: builtin/apply.c:1683
8ada9598
JX
3080#, c-format
3081msgid "corrupt patch at line %d"
195febda 3082msgstr "补丁在第 %d 行损坏"
8ada9598 3083
94550ed3 3084#: builtin/apply.c:1719
8ada9598
JX
3085#, c-format
3086msgid "new file %s depends on old contents"
81809b99 3087msgstr "新文件 %s 依赖旧内容"
8ada9598 3088
94550ed3 3089#: builtin/apply.c:1721
8ada9598
JX
3090#, c-format
3091msgid "deleted file %s still has contents"
81809b99 3092msgstr "删除的文件 %s 仍有内容"
8ada9598 3093
94550ed3 3094#: builtin/apply.c:1724
8ada9598
JX
3095#, c-format
3096msgid "** warning: file %s becomes empty but is not deleted"
81809b99 3097msgstr "** 警告:文件 %s 成为空文件但并未删除"
8ada9598 3098
94550ed3 3099#: builtin/apply.c:1870
8ada9598
JX
3100#, c-format
3101msgid "corrupt binary patch at line %d: %.*s"
81809b99 3102msgstr "二进制补丁在第 %d 行损坏:%.*s"
8ada9598 3103
94550ed3 3104#: builtin/apply.c:1899
8ada9598
JX
3105#, c-format
3106msgid "unrecognized binary patch at line %d"
81809b99 3107msgstr "未能识别的二进制补丁位于第 %d 行"
8ada9598 3108
94550ed3 3109#: builtin/apply.c:2050
8ada9598
JX
3110#, c-format
3111msgid "patch with only garbage at line %d"
81809b99 3112msgstr "补丁文件的第 %d 行只有垃圾数据"
8ada9598 3113
94550ed3 3114#: builtin/apply.c:2140
81809b99 3115#, c-format
8ada9598 3116msgid "unable to read symlink %s"
81809b99 3117msgstr "无法读取符号链接 %s"
8ada9598 3118
94550ed3 3119#: builtin/apply.c:2144
81809b99 3120#, c-format
8ada9598 3121msgid "unable to open or read %s"
81809b99 3122msgstr "不能打开或读取 %s"
8ada9598 3123
94550ed3 3124#: builtin/apply.c:2777
81809b99 3125#, c-format
8ada9598 3126msgid "invalid start of line: '%c'"
81809b99 3127msgstr "无效的行首字符:'%c'"
8ada9598 3128
94550ed3 3129#: builtin/apply.c:2896
8ada9598
JX
3130#, c-format
3131msgid "Hunk #%d succeeded at %d (offset %d line)."
3132msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
07432cef
WS
3133msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
3134msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
8ada9598 3135
94550ed3 3136#: builtin/apply.c:2908
8ada9598
JX
3137#, c-format
3138msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
81809b99 3139msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
8ada9598 3140
94550ed3 3141#: builtin/apply.c:2914
8ada9598
JX
3142#, c-format
3143msgid ""
3144"while searching for:\n"
3145"%.*s"
3146msgstr ""
81809b99
JX
3147"当查询:\n"
3148"%.*s"
8ada9598 3149
94550ed3 3150#: builtin/apply.c:2934
8ada9598
JX
3151#, c-format
3152msgid "missing binary patch data for '%s'"
81809b99 3153msgstr "缺失 '%s' 的二进制补丁数据"
8ada9598 3154
94550ed3 3155#: builtin/apply.c:3035
8ada9598
JX
3156#, c-format
3157msgid "binary patch does not apply to '%s'"
81809b99 3158msgstr "二进制补丁未应用到 '%s'"
8ada9598 3159
94550ed3 3160#: builtin/apply.c:3041
8ada9598
JX
3161#, c-format
3162msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
9aafc933 3163msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
8ada9598 3164
94550ed3 3165#: builtin/apply.c:3062
8ada9598
JX
3166#, c-format
3167msgid "patch failed: %s:%ld"
81809b99 3168msgstr "打补丁失败:%s:%ld"
8ada9598 3169
94550ed3 3170#: builtin/apply.c:3186
8ada9598 3171#, c-format
23ff3338
JX
3172msgid "cannot checkout %s"
3173msgstr "不能检出 %s"
8ada9598 3174
94550ed3 3175#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
81809b99 3176#, c-format
8ada9598 3177msgid "read of %s failed"
81809b99 3178msgstr "读取 %s 失败"
8ada9598 3179
94550ed3 3180#: builtin/apply.c:3239
814ff314
JX
3181#, c-format
3182msgid "reading from '%s' beyond a symbolic link"
3183msgstr "读取位于符号链接中的 '%s'"
3184
94550ed3 3185#: builtin/apply.c:3267 builtin/apply.c:3489
81809b99 3186#, c-format
23ff3338
JX
3187msgid "path %s has been renamed/deleted"
3188msgstr "路径 %s 已经被重命名/删除"
8ada9598 3189
94550ed3 3190#: builtin/apply.c:3348 builtin/apply.c:3503
8ada9598 3191#, c-format
23ff3338
JX
3192msgid "%s: does not exist in index"
3193msgstr "%s:不存在于索引中"
8ada9598 3194
94550ed3 3195#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
81809b99 3196#, c-format
8ada9598 3197msgid "%s: %s"
81809b99 3198msgstr "%s:%s"
8ada9598 3199
94550ed3 3200#: builtin/apply.c:3357 builtin/apply.c:3511
81809b99 3201#, c-format
8ada9598 3202msgid "%s: does not match index"
81809b99 3203msgstr "%s:和索引不匹配"
8ada9598 3204
94550ed3 3205#: builtin/apply.c:3459
23ff3338
JX
3206msgid "removal patch leaves file contents"
3207msgstr "移除补丁仍留下了文件内容"
3208
94550ed3 3209#: builtin/apply.c:3528
8ada9598
JX
3210#, c-format
3211msgid "%s: wrong type"
81809b99 3212msgstr "%s:错误类型"
8ada9598 3213
94550ed3 3214#: builtin/apply.c:3530
8ada9598
JX
3215#, c-format
3216msgid "%s has type %o, expected %o"
9aafc933 3217msgstr "%s 的类型是 %o,应为 %o"
8ada9598 3218
94550ed3 3219#: builtin/apply.c:3689 builtin/apply.c:3691
814ff314
JX
3220#, c-format
3221msgid "invalid path '%s'"
3222msgstr "无效路径 '%s'"
3223
94550ed3 3224#: builtin/apply.c:3746
81809b99 3225#, c-format
8ada9598 3226msgid "%s: already exists in index"
81809b99 3227msgstr "%s:已经存在于索引中"
8ada9598 3228
94550ed3 3229#: builtin/apply.c:3749
23ff3338
JX
3230#, c-format
3231msgid "%s: already exists in working directory"
3232msgstr "%s:已经存在于工作区中"
3233
94550ed3 3234#: builtin/apply.c:3769
d691f479
JX
3235#, c-format
3236msgid "new mode (%o) of %s does not match old mode (%o)"
3237msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
8ada9598 3238
94550ed3 3239#: builtin/apply.c:3774
8ada9598 3240#, c-format
d691f479
JX
3241msgid "new mode (%o) of %s does not match old mode (%o) of %s"
3242msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
3243
94550ed3 3244#: builtin/apply.c:3794
814ff314
JX
3245#, c-format
3246msgid "affected file '%s' is beyond a symbolic link"
3247msgstr "受影响的文件 '%s' 位于符号链接中"
3248
94550ed3 3249#: builtin/apply.c:3798
d691f479 3250#, c-format
8ada9598 3251msgid "%s: patch does not apply"
81809b99 3252msgstr "%s:补丁未应用"
8ada9598 3253
94550ed3 3254#: builtin/apply.c:3812
8ada9598
JX
3255#, c-format
3256msgid "Checking patch %s..."
81809b99 3257msgstr "检查补丁 %s..."
8ada9598 3258
94550ed3 3259#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
8ada9598
JX
3260#, c-format
3261msgid "make_cache_entry failed for path '%s'"
3262msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
3263
94550ed3 3264#: builtin/apply.c:4048
81809b99 3265#, c-format
8ada9598 3266msgid "unable to remove %s from index"
81809b99 3267msgstr "不能从索引中移除 %s"
8ada9598 3268
94550ed3 3269#: builtin/apply.c:4077
8ada9598 3270#, c-format
2e8451e8
JX
3271msgid "corrupt patch for submodule %s"
3272msgstr "子模组 %s 损坏的补丁"
8ada9598 3273
94550ed3 3274#: builtin/apply.c:4081
81809b99 3275#, c-format
8ada9598 3276msgid "unable to stat newly created file '%s'"
81809b99 3277msgstr "不能枚举新建文件 '%s' 的状态"
8ada9598 3278
94550ed3 3279#: builtin/apply.c:4086
8ada9598
JX
3280#, c-format
3281msgid "unable to create backing store for newly created file %s"
81809b99 3282msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 3283
94550ed3 3284#: builtin/apply.c:4089 builtin/apply.c:4197
81809b99 3285#, c-format
8ada9598 3286msgid "unable to add cache entry for %s"
81809b99 3287msgstr "无法为 %s 添加缓存条目"
8ada9598 3288
94550ed3 3289#: builtin/apply.c:4122
81809b99 3290#, c-format
8ada9598 3291msgid "closing file '%s'"
81809b99 3292msgstr "关闭文件 '%s'"
8ada9598 3293
94550ed3 3294#: builtin/apply.c:4171
81809b99 3295#, c-format
8ada9598 3296msgid "unable to write file '%s' mode %o"
81809b99 3297msgstr "不能写文件 '%s' 权限 %o"
8ada9598 3298
94550ed3 3299#: builtin/apply.c:4258
8ada9598
JX
3300#, c-format
3301msgid "Applied patch %s cleanly."
81809b99 3302msgstr "成功应用补丁 %s。"
8ada9598 3303
94550ed3 3304#: builtin/apply.c:4266
8ada9598 3305msgid "internal error"
81809b99 3306msgstr "内部错误"
8ada9598 3307
94550ed3 3308#: builtin/apply.c:4269
8ada9598
JX
3309#, c-format
3310msgid "Applying patch %%s with %d reject..."
3311msgid_plural "Applying patch %%s with %d rejects..."
195febda
T
3312msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3313msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
8ada9598 3314
94550ed3 3315#: builtin/apply.c:4279
8ada9598
JX
3316#, c-format
3317msgid "truncating .rej filename to %.*s.rej"
81809b99 3318msgstr "截短 .rej 文件名为 %.*s.rej"
8ada9598 3319
94550ed3 3320#: builtin/apply.c:4300
8ada9598
JX
3321#, c-format
3322msgid "Hunk #%d applied cleanly."
81809b99 3323msgstr "第 #%d 个片段成功应用。"
8ada9598 3324
94550ed3 3325#: builtin/apply.c:4303
8ada9598
JX
3326#, c-format
3327msgid "Rejected hunk #%d."
81809b99 3328msgstr "拒绝第 #%d 个片段。"
8ada9598 3329
94550ed3 3330#: builtin/apply.c:4393
8ada9598 3331msgid "unrecognized input"
81809b99 3332msgstr "未能识别的输入"
8ada9598 3333
94550ed3 3334#: builtin/apply.c:4404
8ada9598 3335msgid "unable to read index file"
81809b99 3336msgstr "无法读取索引文件"
8ada9598 3337
276ceeaa 3338#: builtin/apply.c:4507
8ada9598 3339msgid "don't apply changes matching the given path"
81809b99 3340msgstr "不要应用与给出路径向匹配的变更"
8ada9598 3341
276ceeaa 3342#: builtin/apply.c:4510
8ada9598 3343msgid "apply changes matching the given path"
81809b99 3344msgstr "应用与给出路径向匹配的变更"
8ada9598 3345
276ceeaa 3346#: builtin/apply.c:4513
8ada9598 3347msgid "remove <num> leading slashes from traditional diff paths"
07432cef 3348msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
8ada9598 3349
276ceeaa 3350#: builtin/apply.c:4516
8ada9598 3351msgid "ignore additions made by the patch"
81809b99 3352msgstr "忽略补丁中的添加的文件"
8ada9598 3353
276ceeaa 3354#: builtin/apply.c:4518
8ada9598 3355msgid "instead of applying the patch, output diffstat for the input"
81809b99 3356msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
8ada9598 3357
276ceeaa 3358#: builtin/apply.c:4522
ef317cd5 3359msgid "show number of added and deleted lines in decimal notation"
07432cef 3360msgstr "以十进制数显示添加和删除的行数"
8ada9598 3361
276ceeaa 3362#: builtin/apply.c:4524
8ada9598 3363msgid "instead of applying the patch, output a summary for the input"
81809b99 3364msgstr "不应用补丁,而是显示输入的概要"
8ada9598 3365
276ceeaa 3366#: builtin/apply.c:4526
8ada9598 3367msgid "instead of applying the patch, see if the patch is applicable"
81809b99 3368msgstr "不应用补丁,而是查看补丁是否可应用"
8ada9598 3369
276ceeaa 3370#: builtin/apply.c:4528
8ada9598 3371msgid "make sure the patch is applicable to the current index"
81809b99 3372msgstr "确认补丁可以应用到当前索引"
8ada9598 3373
276ceeaa 3374#: builtin/apply.c:4530
8ada9598 3375msgid "apply a patch without touching the working tree"
81809b99 3376msgstr "应用补丁而不修改工作区"
8ada9598 3377
276ceeaa 3378#: builtin/apply.c:4532
814ff314
JX
3379msgid "accept a patch that touches outside the working area"
3380msgstr "接受修改工作区之外文件的补丁"
3381
276ceeaa 3382#: builtin/apply.c:4534
8ada9598 3383msgid "also apply the patch (use with --stat/--summary/--check)"
195febda 3384msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
8ada9598 3385
276ceeaa 3386#: builtin/apply.c:4536
23ff3338 3387msgid "attempt three-way merge if a patch does not apply"
160fb2b2 3388msgstr "如果一个补丁不能应用则尝试三方合并"
23ff3338 3389
276ceeaa 3390#: builtin/apply.c:4538
8ada9598 3391msgid "build a temporary index based on embedded index information"
81809b99 3392msgstr "创建一个临时索引基于嵌入的索引信息"
8ada9598 3393
276ceeaa 3394#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
8ada9598 3395msgid "paths are separated with NUL character"
81809b99 3396msgstr "路径以 NUL 字符分隔"
8ada9598 3397
276ceeaa 3398#: builtin/apply.c:4543
8ada9598 3399msgid "ensure at least <n> lines of context match"
81809b99 3400msgstr "确保至少匹配 <n> 行上下文"
8ada9598 3401
276ceeaa 3402#: builtin/apply.c:4545
8ada9598 3403msgid "detect new or modified lines that have whitespace errors"
81809b99 3404msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 3405
276ceeaa 3406#: builtin/apply.c:4548 builtin/apply.c:4551
8ada9598 3407msgid "ignore changes in whitespace when finding context"
81809b99 3408msgstr "查找上下文时忽略空白字符的变更"
8ada9598 3409
276ceeaa 3410#: builtin/apply.c:4554
8ada9598 3411msgid "apply the patch in reverse"
81809b99 3412msgstr "反向应用补丁"
8ada9598 3413
276ceeaa 3414#: builtin/apply.c:4556
8ada9598 3415msgid "don't expect at least one line of context"
81809b99 3416msgstr "无需至少一行上下文"
8ada9598 3417
276ceeaa 3418#: builtin/apply.c:4558
8ada9598 3419msgid "leave the rejected hunks in corresponding *.rej files"
81809b99 3420msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 3421
276ceeaa 3422#: builtin/apply.c:4560
8ada9598 3423msgid "allow overlapping hunks"
81809b99 3424msgstr "允许重叠的补丁片段"
8ada9598 3425
276ceeaa 3426#: builtin/apply.c:4563
8ada9598 3427msgid "tolerate incorrectly detected missing new-line at the end of file"
195febda 3428msgstr "允许不正确的文件末尾换行符"
c04f5ac3 3429
276ceeaa 3430#: builtin/apply.c:4566
8ada9598 3431msgid "do not trust the line counts in the hunk headers"
81809b99 3432msgstr "不信任补丁片段的头信息中的行号"
c04f5ac3 3433
276ceeaa 3434#: builtin/apply.c:4569
8ada9598 3435msgid "prepend <root> to all filenames"
81809b99 3436msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 3437
276ceeaa 3438#: builtin/apply.c:4591
23ff3338 3439msgid "--3way outside a repository"
160fb2b2 3440msgstr "--3way 在一个仓库之外"
23ff3338 3441
276ceeaa 3442#: builtin/apply.c:4599
8ada9598 3443msgid "--index outside a repository"
160fb2b2 3444msgstr "--index 在一个仓库之外"
c04f5ac3 3445
276ceeaa 3446#: builtin/apply.c:4602
8ada9598 3447msgid "--cached outside a repository"
160fb2b2 3448msgstr "--cached 在一个仓库之外"
c04f5ac3 3449
276ceeaa 3450#: builtin/apply.c:4621
81809b99 3451#, c-format
8ada9598 3452msgid "can't open patch '%s'"
81809b99 3453msgstr "不能打开补丁 '%s'"
c04f5ac3 3454
276ceeaa 3455#: builtin/apply.c:4635
c04f5ac3 3456#, c-format
8ada9598
JX
3457msgid "squelched %d whitespace error"
3458msgid_plural "squelched %d whitespace errors"
81809b99 3459msgstr[0] "抑制下仍有 %d 个空白字符误用"
5ae481e0 3460msgstr[1] "抑制下仍有 %d 个空白字符误用"
c04f5ac3 3461
276ceeaa 3462#: builtin/apply.c:4641 builtin/apply.c:4651
8ada9598
JX
3463#, c-format
3464msgid "%d line adds whitespace errors."
3465msgid_plural "%d lines add whitespace errors."
81809b99 3466msgstr[0] "%d 行有空白字符误用。"
5ae481e0 3467msgstr[1] "%d 行有空白字符误用。"
c04f5ac3
JX
3468
3469#: builtin/archive.c:17
3470#, c-format
3471msgid "could not create archive file '%s'"
90e6ef53 3472msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
3473
3474#: builtin/archive.c:20
3475msgid "could not redirect output"
195febda 3476msgstr "不能重定向输出"
c04f5ac3
JX
3477
3478#: builtin/archive.c:37
3479msgid "git archive: Remote with no URL"
4375c10e 3480msgstr "git archive:未提供远程 URL"
c04f5ac3
JX
3481
3482#: builtin/archive.c:58
3483msgid "git archive: expected ACK/NAK, got EOF"
4375c10e 3484msgstr "git archive:应为 ACK/NACK,却得到 EOF"
c04f5ac3 3485
1003b3a5 3486#: builtin/archive.c:61
c04f5ac3
JX
3487#, c-format
3488msgid "git archive: NACK %s"
90e6ef53 3489msgstr "git archive:NACK %s"
c04f5ac3 3490
1003b3a5 3491#: builtin/archive.c:63
c04f5ac3
JX
3492#, c-format
3493msgid "remote error: %s"
3494msgstr "远程错误:%s"
3495
1003b3a5 3496#: builtin/archive.c:64
c04f5ac3 3497msgid "git archive: protocol error"
90e6ef53 3498msgstr "git archive:协议错误"
c04f5ac3 3499
1003b3a5 3500#: builtin/archive.c:68
c04f5ac3 3501msgid "git archive: expected a flush"
195febda 3502msgstr "git archive:应为刷新"
c04f5ac3 3503
ef317cd5
JX
3504#: builtin/bisect--helper.c:7
3505msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 3506msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5
JX
3507
3508#: builtin/bisect--helper.c:17
3509msgid "perform 'git bisect next'"
07432cef 3510msgstr "执行 'git bisect next'"
ef317cd5
JX
3511
3512#: builtin/bisect--helper.c:19
3513msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 3514msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 3515
276ceeaa 3516#: builtin/blame.c:33
7aea43ff
JX
3517msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3518msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 3519
276ceeaa 3520#: builtin/blame.c:38
814ff314
JX
3521msgid "<rev-opts> are documented in git-rev-list(1)"
3522msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 3523
276ceeaa
JX
3524#: builtin/blame.c:1782
3525msgid "Blaming lines"
3526msgstr "追踪代码行"
3527
3528#: builtin/blame.c:2530
ef317cd5 3529msgid "Show blame entries as we find them, incrementally"
07432cef 3530msgstr "增量式地显示发现的 blame 条目"
ef317cd5 3531
276ceeaa 3532#: builtin/blame.c:2531
ef317cd5 3533msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 3534msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 3535
276ceeaa 3536#: builtin/blame.c:2532
ef317cd5 3537msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 3538msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 3539
276ceeaa 3540#: builtin/blame.c:2533
ef317cd5 3541msgid "Show work cost statistics"
07432cef 3542msgstr "显示命令消耗统计"
ef317cd5 3543
276ceeaa
JX
3544#: builtin/blame.c:2534
3545msgid "Force progress reporting"
3546msgstr "强制进度显示"
3547
3548#: builtin/blame.c:2535
ef317cd5 3549msgid "Show output score for blame entries"
07432cef 3550msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 3551
276ceeaa 3552#: builtin/blame.c:2536
ef317cd5 3553msgid "Show original filename (Default: auto)"
07432cef 3554msgstr "显示原始文件名(默认:自动)"
ef317cd5 3555
276ceeaa 3556#: builtin/blame.c:2537
ef317cd5 3557msgid "Show original linenumber (Default: off)"
07432cef 3558msgstr "显示原始的行号(默认:关闭)"
ef317cd5 3559
276ceeaa 3560#: builtin/blame.c:2538
ef317cd5 3561msgid "Show in a format designed for machine consumption"
07432cef 3562msgstr "显示为一个适合机器读取的格式"
ef317cd5 3563
276ceeaa 3564#: builtin/blame.c:2539
ef317cd5 3565msgid "Show porcelain format with per-line commit information"
07432cef 3566msgstr "为每一行显示机器适用的提交信息"
ef317cd5 3567
276ceeaa 3568#: builtin/blame.c:2540
ef317cd5 3569msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 3570msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 3571
276ceeaa 3572#: builtin/blame.c:2541
ef317cd5 3573msgid "Show raw timestamp (Default: off)"
07432cef 3574msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 3575
276ceeaa 3576#: builtin/blame.c:2542
ef317cd5 3577msgid "Show long commit SHA1 (Default: off)"
4375c10e 3578msgstr "显示长的 SHA1 提交号(默认:关闭)"
ef317cd5 3579
276ceeaa 3580#: builtin/blame.c:2543
ef317cd5 3581msgid "Suppress author name and timestamp (Default: off)"
07432cef 3582msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 3583
276ceeaa 3584#: builtin/blame.c:2544
ef317cd5 3585msgid "Show author email instead of name (Default: off)"
07432cef 3586msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 3587
276ceeaa 3588#: builtin/blame.c:2545
ef317cd5 3589msgid "Ignore whitespace differences"
07432cef 3590msgstr "忽略空白差异"
ef317cd5 3591
276ceeaa 3592#: builtin/blame.c:2546
ef317cd5 3593msgid "Spend extra cycles to find better match"
07432cef 3594msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 3595
276ceeaa 3596#: builtin/blame.c:2547
ef317cd5 3597msgid "Use revisions from <file> instead of calling git-rev-list"
d9d56b23 3598msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 3599
276ceeaa 3600#: builtin/blame.c:2548
ef317cd5 3601msgid "Use <file>'s contents as the final image"
d9d56b23 3602msgstr "使用 <文件> 的内容作为最终的图片"
ef317cd5 3603
276ceeaa 3604#: builtin/blame.c:2549 builtin/blame.c:2550
ef317cd5 3605msgid "score"
07432cef 3606msgstr "得分"
ef317cd5 3607
276ceeaa 3608#: builtin/blame.c:2549
ef317cd5 3609msgid "Find line copies within and across files"
07432cef 3610msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 3611
276ceeaa 3612#: builtin/blame.c:2550
ef317cd5 3613msgid "Find line movements within and across files"
07432cef 3614msgstr "找到文件内及跨文件的行移动"
ef317cd5 3615
276ceeaa 3616#: builtin/blame.c:2551
ef317cd5 3617msgid "n,m"
07432cef 3618msgstr "n,m"
ef317cd5 3619
276ceeaa 3620#: builtin/blame.c:2551
ef317cd5 3621msgid "Process only line range n,m, counting from 1"
07432cef 3622msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 3623
6c94aba5
JX
3624#. TRANSLATORS: This string is used to tell us the maximum
3625#. display width for a relative timestamp in "git blame"
3626#. output. For C locale, "4 years, 11 months ago", which
3627#. takes 22 places, is the longest among various forms of
3628#. relative timestamps, but your language may need more or
3629#. fewer display columns.
276ceeaa 3630#: builtin/blame.c:2640
6c94aba5
JX
3631msgid "4 years, 11 months ago"
3632msgstr "4 年 11 个月前"
3633
94550ed3 3634#: builtin/branch.c:25
814ff314
JX
3635msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
3636msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
ef317cd5 3637
94550ed3 3638#: builtin/branch.c:26
814ff314
JX
3639msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
3640msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 3641
94550ed3 3642#: builtin/branch.c:27
814ff314
JX
3643msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3644msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 3645
94550ed3 3646#: builtin/branch.c:28
814ff314
JX
3647msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3648msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 3649
94550ed3
JX
3650#: builtin/branch.c:29
3651msgid "git branch [<options>] [-r | -a] [--points-at]"
3652msgstr "git branch [<选项>] [-r | -a] [--points-at]"
3653
90e6ef53 3654# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
94550ed3 3655#: builtin/branch.c:142
c04f5ac3
JX
3656#, c-format
3657msgid ""
3658"deleting branch '%s' that has been merged to\n"
3659" '%s', but not yet merged to HEAD."
3660msgstr ""
70fc47bf 3661"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
3662" '%s',但未合并到 HEAD。"
3663
90e6ef53 3664# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
94550ed3 3665#: builtin/branch.c:146
c04f5ac3
JX
3666#, c-format
3667msgid ""
3668"not deleting branch '%s' that is not yet merged to\n"
3669" '%s', even though it is merged to HEAD."
3670msgstr ""
70fc47bf
T
3671"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
3672" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 3673
94550ed3 3674#: builtin/branch.c:160
07432cef
WS
3675#, c-format
3676msgid "Couldn't look up commit object for '%s'"
3677msgstr "无法查询 '%s' 指向的提交对象"
3678
94550ed3 3679#: builtin/branch.c:164
07432cef
WS
3680#, c-format
3681msgid ""
3682"The branch '%s' is not fully merged.\n"
3683"If you are sure you want to delete it, run 'git branch -D %s'."
3684msgstr ""
3685"分支 '%s' 没有完全合并。\n"
3686"如果您确认要删除它,执行 'git branch -D %s'。"
3687
94550ed3 3688#: builtin/branch.c:177
07432cef
WS
3689msgid "Update of config-file failed"
3690msgstr "无法更新 config 文件"
3691
94550ed3 3692#: builtin/branch.c:205
c04f5ac3 3693msgid "cannot use -a with -d"
649900bc 3694msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 3695
94550ed3 3696#: builtin/branch.c:211
c04f5ac3
JX
3697msgid "Couldn't look up commit object for HEAD"
3698msgstr "无法查询 HEAD 指向的提交对象"
3699
94550ed3 3700#: builtin/branch.c:219
c04f5ac3
JX
3701#, c-format
3702msgid "Cannot delete the branch '%s' which you are currently on."
3703msgstr "无法删除您当前所在的分支 '%s'。"
3704
94550ed3 3705#: builtin/branch.c:235
5ae481e0 3706#, c-format
7aea43ff
JX
3707msgid "remote-tracking branch '%s' not found."
3708msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 3709
94550ed3 3710#: builtin/branch.c:236
81809b99 3711#, c-format
8ada9598 3712msgid "branch '%s' not found."
81809b99 3713msgstr "分支 '%s' 未发现。"
8ada9598 3714
94550ed3 3715#: builtin/branch.c:251
81809b99 3716#, c-format
7aea43ff
JX
3717msgid "Error deleting remote-tracking branch '%s'"
3718msgstr "无法删除远程跟踪分支 '%s'"
c04f5ac3 3719
94550ed3 3720#: builtin/branch.c:252
81809b99 3721#, c-format
8ada9598 3722msgid "Error deleting branch '%s'"
7aea43ff 3723msgstr "无法删除分支 '%s'"
8ada9598 3724
94550ed3 3725#: builtin/branch.c:259
81809b99 3726#, c-format
7aea43ff
JX
3727msgid "Deleted remote-tracking branch %s (was %s).\n"
3728msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 3729
94550ed3 3730#: builtin/branch.c:260
81809b99 3731#, c-format
8ada9598 3732msgid "Deleted branch %s (was %s).\n"
81809b99 3733msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 3734
94550ed3 3735#: builtin/branch.c:303
81809b99 3736#, c-format
90314792
JX
3737msgid "[%s: gone]"
3738msgstr "[%s: 丢失]"
3739
94550ed3 3740#: builtin/branch.c:308
90314792
JX
3741#, c-format
3742msgid "[%s]"
3743msgstr "[%s]"
3744
94550ed3 3745#: builtin/branch.c:313
90314792 3746#, c-format
8ada9598 3747msgid "[%s: behind %d]"
81809b99 3748msgstr "[%s:落后 %d]"
c04f5ac3 3749
94550ed3 3750#: builtin/branch.c:315
81809b99 3751#, c-format
8ada9598 3752msgid "[behind %d]"
81809b99 3753msgstr "[落后 %d]"
8ada9598 3754
94550ed3 3755#: builtin/branch.c:319
81809b99 3756#, c-format
8ada9598 3757msgid "[%s: ahead %d]"
81809b99 3758msgstr "[%s:领先 %d]"
c04f5ac3 3759
94550ed3 3760#: builtin/branch.c:321
81809b99 3761#, c-format
8ada9598 3762msgid "[ahead %d]"
81809b99 3763msgstr "[领先 %d]"
8ada9598 3764
94550ed3 3765#: builtin/branch.c:324
81809b99 3766#, c-format
8ada9598 3767msgid "[%s: ahead %d, behind %d]"
81809b99 3768msgstr "[%s:领先 %d,落后 %d]"
8ada9598 3769
94550ed3 3770#: builtin/branch.c:327
81809b99 3771#, c-format
8ada9598 3772msgid "[ahead %d, behind %d]"
81809b99 3773msgstr "[领先 %d,落后 %d]"
c04f5ac3 3774
94550ed3 3775#: builtin/branch.c:340
a77c07d9
JX
3776msgid " **** invalid ref ****"
3777msgstr " **** 无效引用 ****"
3778
94550ed3 3779#: builtin/branch.c:366
1003b3a5
JX
3780#, c-format
3781msgid "(no branch, rebasing %s)"
3782msgstr "(非分支,正变基 %s)"
3783
94550ed3 3784#: builtin/branch.c:369
1003b3a5
JX
3785#, c-format
3786msgid "(no branch, bisect started on %s)"
3787msgstr "(非分支,二分查找开始于 %s)"
3788
94550ed3 3789#: builtin/branch.c:375
1003b3a5 3790#, c-format
814ff314
JX
3791msgid "(HEAD detached at %s)"
3792msgstr "(头指针分离于 %s)"
1003b3a5 3793
94550ed3 3794#: builtin/branch.c:378
814ff314
JX
3795#, c-format
3796msgid "(HEAD detached from %s)"
3797msgstr "(头指针分离自 %s)"
3798
94550ed3 3799#: builtin/branch.c:382
c04f5ac3
JX
3800msgid "(no branch)"
3801msgstr "(非分支)"
3802
94550ed3 3803#: builtin/branch.c:524
c04f5ac3 3804msgid "cannot rename the current branch while not on any."
90e6ef53 3805msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 3806
94550ed3 3807#: builtin/branch.c:534
c04f5ac3
JX
3808#, c-format
3809msgid "Invalid branch name: '%s'"
3810msgstr "无效的分支名:'%s'"
3811
94550ed3 3812#: builtin/branch.c:549
c04f5ac3
JX
3813msgid "Branch rename failed"
3814msgstr "分支重命名失败"
3815
94550ed3 3816#: builtin/branch.c:553
c04f5ac3
JX
3817#, c-format
3818msgid "Renamed a misnamed branch '%s' away"
3819msgstr "重命名掉一个错误命名的旧分支 '%s'"
3820
94550ed3 3821#: builtin/branch.c:557
c04f5ac3
JX
3822#, c-format
3823msgid "Branch renamed to %s, but HEAD is not updated!"
3824msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3825
94550ed3 3826#: builtin/branch.c:564
c04f5ac3
JX
3827msgid "Branch is renamed, but update of config-file failed"
3828msgstr "分支被重命名,但更新 config 文件失败"
3829
276ceeaa 3830#: builtin/branch.c:586
81809b99 3831#, c-format
8ada9598 3832msgid "could not write branch description template: %s"
81809b99 3833msgstr "不能写分支描述模版:%s"
c04f5ac3 3834
276ceeaa 3835#: builtin/branch.c:615
ef317cd5 3836msgid "Generic options"
07432cef 3837msgstr "通用选项"
c04f5ac3 3838
276ceeaa 3839#: builtin/branch.c:617
ef317cd5 3840msgid "show hash and subject, give twice for upstream branch"
07432cef 3841msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 3842
276ceeaa 3843#: builtin/branch.c:618
ef317cd5 3844msgid "suppress informational messages"
07432cef 3845msgstr "不显示信息"
8ada9598 3846
276ceeaa 3847#: builtin/branch.c:619
ef317cd5 3848msgid "set up tracking mode (see git-pull(1))"
07432cef 3849msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 3850
276ceeaa 3851#: builtin/branch.c:621
ef317cd5 3852msgid "change upstream info"
07432cef 3853msgstr "改变上游信息"
c04f5ac3 3854
276ceeaa 3855#: builtin/branch.c:625
ef317cd5 3856msgid "use colored output"
07432cef 3857msgstr "使用彩色输出"
c04f5ac3 3858
276ceeaa 3859#: builtin/branch.c:626
ef317cd5 3860msgid "act on remote-tracking branches"
07432cef 3861msgstr "作用于远程跟踪分支"
c04f5ac3 3862
276ceeaa 3863#: builtin/branch.c:628 builtin/branch.c:629
ef317cd5 3864msgid "print only branches that contain the commit"
07432cef 3865msgstr "只打印包含该提交的分支"
c04f5ac3 3866
276ceeaa 3867#: builtin/branch.c:632
ef317cd5 3868msgid "Specific git-branch actions:"
07432cef 3869msgstr "具体的 git-branch 动作:"
c04f5ac3 3870
276ceeaa 3871#: builtin/branch.c:633
ef317cd5 3872msgid "list both remote-tracking and local branches"
07432cef 3873msgstr "列出远程跟踪及本地分支"
c04f5ac3 3874
276ceeaa 3875#: builtin/branch.c:635
ef317cd5 3876msgid "delete fully merged branch"
07432cef 3877msgstr "删除完全合并的分支"
c04f5ac3 3878
276ceeaa 3879#: builtin/branch.c:636
ef317cd5 3880msgid "delete branch (even if not merged)"
07432cef 3881msgstr "删除分支(即使没有合并)"
c04f5ac3 3882
276ceeaa 3883#: builtin/branch.c:637
ef317cd5 3884msgid "move/rename a branch and its reflog"
07432cef 3885msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 3886
276ceeaa 3887#: builtin/branch.c:638
ef317cd5 3888msgid "move/rename a branch, even if target exists"
07432cef 3889msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 3890
276ceeaa 3891#: builtin/branch.c:639
ef317cd5 3892msgid "list branch names"
07432cef 3893msgstr "列出分支名"
c04f5ac3 3894
276ceeaa 3895#: builtin/branch.c:640
ef317cd5 3896msgid "create the branch's reflog"
07432cef 3897msgstr "创建分支的引用日志"
ef317cd5 3898
276ceeaa 3899#: builtin/branch.c:642
ef317cd5 3900msgid "edit the description for the branch"
07432cef 3901msgstr "标记分支的描述"
ef317cd5 3902
276ceeaa 3903#: builtin/branch.c:643
04cb2f28
JX
3904msgid "force creation, move/rename, deletion"
3905msgstr "强制创建、移动/重命名、删除"
ef317cd5 3906
276ceeaa 3907#: builtin/branch.c:644
94550ed3
JX
3908msgid "print only branches that are merged"
3909msgstr "只打印已经合并的分支"
ef317cd5 3910
276ceeaa 3911#: builtin/branch.c:645
94550ed3
JX
3912msgid "print only branches that are not merged"
3913msgstr "只打印尚未合并的分支"
ef317cd5 3914
276ceeaa 3915#: builtin/branch.c:646
ef317cd5 3916msgid "list branches in columns"
07432cef 3917msgstr "以列的方式显示分支"
ef317cd5 3918
276ceeaa 3919#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
94550ed3
JX
3920msgid "key"
3921msgstr "key"
3922
276ceeaa 3923#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
94550ed3
JX
3924msgid "field name to sort on"
3925msgstr "排序的字段名"
3926
276ceeaa
JX
3927#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
3928#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
94550ed3
JX
3929#: builtin/tag.c:369
3930msgid "object"
3931msgstr "对象"
3932
276ceeaa 3933#: builtin/branch.c:651
94550ed3
JX
3934msgid "print only branches of the object"
3935msgstr "只打印指向该对象的分支"
3936
276ceeaa 3937#: builtin/branch.c:669
c04f5ac3
JX
3938msgid "Failed to resolve HEAD as a valid ref."
3939msgstr "无法将 HEAD 解析为有效引用。"
3940
276ceeaa 3941#: builtin/branch.c:673 builtin/clone.c:705
c04f5ac3 3942msgid "HEAD not found below refs/heads!"
90e6ef53 3943msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 3944
276ceeaa 3945#: builtin/branch.c:693
8ada9598 3946msgid "--column and --verbose are incompatible"
81809b99 3947msgstr "--column 和 --verbose 不兼容"
8ada9598 3948
276ceeaa 3949#: builtin/branch.c:704 builtin/branch.c:746
a77c07d9
JX
3950msgid "branch name required"
3951msgstr "必须提供分支名"
3952
276ceeaa 3953#: builtin/branch.c:722
a77c07d9
JX
3954msgid "Cannot give description to detached HEAD"
3955msgstr "不能向分离头指针提供描述"
3956
276ceeaa 3957#: builtin/branch.c:727
a77c07d9
JX
3958msgid "cannot edit description of more than one branch"
3959msgstr "不能为一个以上的分支编辑描述"
3960
276ceeaa 3961#: builtin/branch.c:734
a77c07d9
JX
3962#, c-format
3963msgid "No commit on branch '%s' yet."
3964msgstr "分支 '%s' 尚无提交。"
3965
276ceeaa 3966#: builtin/branch.c:737
a77c07d9
JX
3967#, c-format
3968msgid "No branch named '%s'."
3969msgstr "没有分支 '%s'。"
3970
276ceeaa 3971#: builtin/branch.c:752
a77c07d9
JX
3972msgid "too many branches for a rename operation"
3973msgstr "为重命名操作提供了太多的分支名"
3974
276ceeaa 3975#: builtin/branch.c:757
1003b3a5
JX
3976msgid "too many branches to set new upstream"
3977msgstr "为设置新上游提供了太多的分支名"
3978
276ceeaa 3979#: builtin/branch.c:761
1003b3a5
JX
3980#, c-format
3981msgid ""
3982"could not set upstream of HEAD to %s when it does not point to any branch."
3983msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3984
276ceeaa 3985#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
1003b3a5
JX
3986#, c-format
3987msgid "no such branch '%s'"
3988msgstr "没有此分支 '%s'"
3989
276ceeaa 3990#: builtin/branch.c:768
07432cef 3991#, c-format
ef317cd5 3992msgid "branch '%s' does not exist"
07432cef 3993msgstr "分支 '%s' 不存在"
ef317cd5 3994
276ceeaa 3995#: builtin/branch.c:780
1003b3a5
JX
3996msgid "too many branches to unset upstream"
3997msgstr "为取消上游设置操作提供了太多的分支名"
3998
276ceeaa 3999#: builtin/branch.c:784
1003b3a5
JX
4000msgid "could not unset upstream of HEAD when it does not point to any branch."
4001msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
4002
276ceeaa 4003#: builtin/branch.c:790
ef317cd5
JX
4004#, c-format
4005msgid "Branch '%s' has no upstream information"
07432cef 4006msgstr "分支 '%s' 没有上游信息"
ef317cd5 4007
276ceeaa 4008#: builtin/branch.c:804
1003b3a5
JX
4009msgid "it does not make sense to create 'HEAD' manually"
4010msgstr "手工创建 'HEAD' 没有意义"
4011
276ceeaa 4012#: builtin/branch.c:810
c04f5ac3
JX
4013msgid "-a and -r options to 'git branch' do not make sense with a branch name"
4014msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
4015
276ceeaa 4016#: builtin/branch.c:813
ef317cd5
JX
4017#, c-format
4018msgid ""
4019"The --set-upstream flag is deprecated and will be removed. Consider using --"
4020"track or --set-upstream-to\n"
4021msgstr ""
07432cef 4022"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
ef317cd5 4023
276ceeaa 4024#: builtin/branch.c:830
ef317cd5
JX
4025#, c-format
4026msgid ""
4027"\n"
4028"If you wanted to make '%s' track '%s', do this:\n"
4029"\n"
4030msgstr ""
07432cef
WS
4031"\n"
4032"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
4033"\n"
ef317cd5 4034
276ceeaa 4035#: builtin/branch.c:831
07432cef 4036#, c-format
ef317cd5 4037msgid " git branch -d %s\n"
07432cef 4038msgstr " git branch -d %s\n"
ef317cd5 4039
276ceeaa 4040#: builtin/branch.c:832
ef317cd5
JX
4041#, c-format
4042msgid " git branch --set-upstream-to %s\n"
07432cef 4043msgstr " git branch --set-upstream-to %s\n"
ef317cd5 4044
7aea43ff 4045#: builtin/bundle.c:51
c04f5ac3
JX
4046#, c-format
4047msgid "%s is okay\n"
4048msgstr "%s 可以\n"
4049
7aea43ff 4050#: builtin/bundle.c:64
c04f5ac3 4051msgid "Need a repository to create a bundle."
160fb2b2 4052msgstr "需要一个仓库来创建包。"
c04f5ac3 4053
7aea43ff 4054#: builtin/bundle.c:68
c04f5ac3 4055msgid "Need a repository to unbundle."
160fb2b2 4056msgstr "需要一个仓库来解包。"
c04f5ac3 4057
1b7f4a34 4058#: builtin/cat-file.c:428
7aea43ff
JX
4059msgid ""
4060"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
4061"<type>|--textconv) <object>"
4062msgstr ""
4063"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
4064">|--textconv) <对象>"
ef317cd5 4065
1b7f4a34 4066#: builtin/cat-file.c:429
94550ed3
JX
4067msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
4068msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
ef317cd5 4069
1b7f4a34 4070#: builtin/cat-file.c:466
ef317cd5 4071msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 4072msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 4073
1b7f4a34 4074#: builtin/cat-file.c:467
ef317cd5 4075msgid "show object type"
07432cef 4076msgstr "显示对象类型"
ef317cd5 4077
1b7f4a34 4078#: builtin/cat-file.c:468
ef317cd5 4079msgid "show object size"
07432cef 4080msgstr "显示对象大小"
ef317cd5 4081
1b7f4a34 4082#: builtin/cat-file.c:470
ef317cd5 4083msgid "exit with zero when there's no error"
07432cef 4084msgstr "当没有错误时退出并返回零"
ef317cd5 4085
1b7f4a34 4086#: builtin/cat-file.c:471
ef317cd5 4087msgid "pretty-print object's content"
07432cef 4088msgstr "美观地打印对象的内容"
ef317cd5 4089
1b7f4a34 4090#: builtin/cat-file.c:473
ef317cd5 4091msgid "for blob objects, run textconv on object's content"
160fb2b2 4092msgstr "对于数据对象,对其内容执行 textconv"
ef317cd5 4093
1b7f4a34 4094#: builtin/cat-file.c:475
7aea43ff
JX
4095msgid "allow -s and -t to work with broken/corrupt objects"
4096msgstr "允许 -s 和 -t 对损坏的对象生效"
4097
1b7f4a34
JX
4098#: builtin/cat-file.c:476
4099msgid "buffer --batch output"
4100msgstr "缓冲 --batch 的输出"
4101
4102#: builtin/cat-file.c:478
ef317cd5 4103msgid "show info and content of objects fed from the standard input"
07432cef 4104msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 4105
1b7f4a34 4106#: builtin/cat-file.c:481
ef317cd5 4107msgid "show info about objects fed from the standard input"
07432cef 4108msgstr "显示从标准输入提供的对象的信息"
ef317cd5 4109
1b7f4a34 4110#: builtin/cat-file.c:484
7aea43ff
JX
4111msgid "follow in-tree symlinks (used with --batch or --batch-check)"
4112msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
4113
1b7f4a34
JX
4114#: builtin/cat-file.c:486
4115msgid "show all objects with --batch or --batch-check"
4116msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
4117
ef317cd5 4118#: builtin/check-attr.c:11
814ff314
JX
4119msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
4120msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5
JX
4121
4122#: builtin/check-attr.c:12
94550ed3
JX
4123msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
4124msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
ef317cd5
JX
4125
4126#: builtin/check-attr.c:19
4127msgid "report all attributes set on file"
07432cef 4128msgstr "报告设置在文件上的所有属性"
ef317cd5
JX
4129
4130#: builtin/check-attr.c:20
4131msgid "use .gitattributes only from the index"
07432cef 4132msgstr "只使用索引中的 .gitattributes"
ef317cd5 4133
276ceeaa 4134#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
ef317cd5 4135msgid "read file names from stdin"
07432cef 4136msgstr "从标准输入读出文件名"
ef317cd5 4137
a77c07d9 4138#: builtin/check-attr.c:23 builtin/check-ignore.c:24
90314792
JX
4139msgid "terminate input and output records by a NUL character"
4140msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 4141
276ceeaa 4142#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
a77c07d9
JX
4143msgid "suppress progress reporting"
4144msgstr "不显示进度报告"
4145
2e8451e8
JX
4146#: builtin/check-ignore.c:26
4147msgid "show non-matching input paths"
4148msgstr "显示未匹配的输入路径"
4149
90314792
JX
4150#: builtin/check-ignore.c:28
4151msgid "ignore index when checking"
4152msgstr "检查时忽略索引"
4153
4154#: builtin/check-ignore.c:154
a77c07d9 4155msgid "cannot specify pathnames with --stdin"
1b7f4a34 4156msgstr "不能同时指定路径及 --stdin 参数"
a77c07d9 4157
90314792 4158#: builtin/check-ignore.c:157
a77c07d9
JX
4159msgid "-z only makes sense with --stdin"
4160msgstr "-z 需要和 --stdin 参数共用才有意义"
4161
90314792 4162#: builtin/check-ignore.c:159
a77c07d9
JX
4163msgid "no path specified"
4164msgstr "未指定路径"
4165
90314792 4166#: builtin/check-ignore.c:163
a77c07d9
JX
4167msgid "--quiet is only valid with a single pathname"
4168msgstr "参数 --quiet 只在提供一个路径名时有效"
4169
90314792 4170#: builtin/check-ignore.c:165
a77c07d9
JX
4171msgid "cannot have both --quiet and --verbose"
4172msgstr "不能同时提供 --quiet 和 --verbose 参数"
4173
90314792 4174#: builtin/check-ignore.c:168
2e8451e8
JX
4175msgid "--non-matching is only valid with --verbose"
4176msgstr "--non-matching 选项只在使用 --verbose 时有效"
4177
4178#: builtin/check-mailmap.c:8
814ff314
JX
4179msgid "git check-mailmap [<options>] <contact>..."
4180msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8
JX
4181
4182#: builtin/check-mailmap.c:13
4183msgid "also read contacts from stdin"
4184msgstr "还从标准输入读取联系地址"
4185
4186#: builtin/check-mailmap.c:24
4187#, c-format
4188msgid "unable to parse contact: %s"
4189msgstr "不能解析联系地址:%s"
4190
4191#: builtin/check-mailmap.c:47
4192msgid "no contacts specified"
4193msgstr "未指定联系地址"
4194
276ceeaa 4195#: builtin/checkout-index.c:127
814ff314
JX
4196msgid "git checkout-index [<options>] [--] [<file>...]"
4197msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 4198
276ceeaa
JX
4199#: builtin/checkout-index.c:144
4200msgid "stage should be between 1 and 3 or all"
4201msgstr "索引值应该取值 1 到 3 或者 all"
4202
4203#: builtin/checkout-index.c:160
ef317cd5 4204msgid "check out all files in the index"
07432cef 4205msgstr "检出索引区的所有文件"
ef317cd5 4206
276ceeaa 4207#: builtin/checkout-index.c:161
ef317cd5 4208msgid "force overwrite of existing files"
07432cef 4209msgstr "强制覆盖现有的文件"
ef317cd5 4210
276ceeaa 4211#: builtin/checkout-index.c:163
ef317cd5 4212msgid "no warning for existing files and files not in index"
07432cef 4213msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 4214
276ceeaa 4215#: builtin/checkout-index.c:165
ef317cd5 4216msgid "don't checkout new files"
07432cef 4217msgstr "不检出新文件"
ef317cd5 4218
276ceeaa 4219#: builtin/checkout-index.c:167
ef317cd5 4220msgid "update stat information in the index file"
07432cef 4221msgstr "更新索引中文件的状态信息"
ef317cd5 4222
276ceeaa 4223#: builtin/checkout-index.c:171
ef317cd5 4224msgid "read list of paths from the standard input"
07432cef 4225msgstr "从标准输入读取路径列表"
ef317cd5 4226
276ceeaa 4227#: builtin/checkout-index.c:173
ef317cd5 4228msgid "write the content to temporary files"
07432cef 4229msgstr "将内容写入临时文件"
ef317cd5 4230
276ceeaa
JX
4231#: builtin/checkout-index.c:174 builtin/column.c:30
4232#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
94550ed3 4233#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
ef317cd5 4234msgid "string"
07432cef 4235msgstr "字符串"
ef317cd5 4236
276ceeaa 4237#: builtin/checkout-index.c:175
ef317cd5 4238msgid "when creating files, prepend <string>"
4375c10e 4239msgstr "在创建文件时,在前面加上 <字符串>"
ef317cd5 4240
276ceeaa 4241#: builtin/checkout-index.c:177
ef317cd5 4242msgid "copy out the files from named stage"
07432cef 4243msgstr "从指定暂存区中拷出文件"
ef317cd5 4244
1b7f4a34 4245#: builtin/checkout.c:25
814ff314
JX
4246msgid "git checkout [<options>] <branch>"
4247msgstr "git checkout [<选项>] <分支>"
ef317cd5 4248
1b7f4a34 4249#: builtin/checkout.c:26
814ff314
JX
4250msgid "git checkout [<options>] [<branch>] -- <file>..."
4251msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 4252
94550ed3 4253#: builtin/checkout.c:134 builtin/checkout.c:167
c04f5ac3
JX
4254#, c-format
4255msgid "path '%s' does not have our version"
4256msgstr "路径 '%s' 没有我们的版本"
4257
94550ed3 4258#: builtin/checkout.c:136 builtin/checkout.c:169
c04f5ac3
JX
4259#, c-format
4260msgid "path '%s' does not have their version"
4261msgstr "路径 '%s' 没有他们的版本"
4262
94550ed3 4263#: builtin/checkout.c:152
c04f5ac3
JX
4264#, c-format
4265msgid "path '%s' does not have all necessary versions"
4266msgstr "路径 '%s' 没有全部必须的版本"
4267
94550ed3 4268#: builtin/checkout.c:196
c04f5ac3
JX
4269#, c-format
4270msgid "path '%s' does not have necessary versions"
4271msgstr "路径 '%s' 没有必须的版本"
4272
94550ed3 4273#: builtin/checkout.c:213
c04f5ac3
JX
4274#, c-format
4275msgid "path '%s': cannot merge"
90e6ef53 4276msgstr "path '%s':无法合并"
c04f5ac3 4277
94550ed3 4278#: builtin/checkout.c:230
c04f5ac3
JX
4279#, c-format
4280msgid "Unable to add merge result for '%s'"
4281msgstr "无法为 '%s' 添加合并结果"
4282
94550ed3
JX
4283#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
4284#: builtin/checkout.c:260
07432cef 4285#, c-format
ef317cd5 4286msgid "'%s' cannot be used with updating paths"
07432cef 4287msgstr "'%s' 不能在更新路径时使用"
ef317cd5 4288
94550ed3 4289#: builtin/checkout.c:263 builtin/checkout.c:266
07432cef 4290#, c-format
ef317cd5 4291msgid "'%s' cannot be used with %s"
07432cef 4292msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 4293
94550ed3 4294#: builtin/checkout.c:269
ef317cd5
JX
4295#, c-format
4296msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 4297msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 4298
94550ed3 4299#: builtin/checkout.c:280 builtin/checkout.c:474
c04f5ac3 4300msgid "corrupt index file"
90e6ef53 4301msgstr "损坏的索引文件"
c04f5ac3 4302
94550ed3 4303#: builtin/checkout.c:340 builtin/checkout.c:347
c04f5ac3
JX
4304#, c-format
4305msgid "path '%s' is unmerged"
4306msgstr "路径 '%s' 未合并"
4307
94550ed3 4308#: builtin/checkout.c:496
c04f5ac3 4309msgid "you need to resolve your current index first"
90e6ef53 4310msgstr "您需要先解决当前索引的冲突"
c04f5ac3 4311
94550ed3 4312#: builtin/checkout.c:623
c04f5ac3 4313#, c-format
1b7f4a34
JX
4314msgid "Can not do reflog for '%s': %s\n"
4315msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
c04f5ac3 4316
94550ed3 4317#: builtin/checkout.c:661
c04f5ac3
JX
4318msgid "HEAD is now at"
4319msgstr "HEAD 目前位于"
4320
3495628d
JX
4321#: builtin/checkout.c:665 builtin/clone.c:659
4322msgid "unable to update HEAD"
4323msgstr "不能更新 HEAD"
4324
276ceeaa 4325#: builtin/checkout.c:669
c04f5ac3
JX
4326#, c-format
4327msgid "Reset branch '%s'\n"
4328msgstr "重置分支 '%s'\n"
4329
276ceeaa 4330#: builtin/checkout.c:672
c04f5ac3
JX
4331#, c-format
4332msgid "Already on '%s'\n"
4333msgstr "已经位于 '%s'\n"
4334
276ceeaa 4335#: builtin/checkout.c:676
c04f5ac3
JX
4336#, c-format
4337msgid "Switched to and reset branch '%s'\n"
4338msgstr "切换并重置分支 '%s'\n"
4339
276ceeaa 4340#: builtin/checkout.c:678 builtin/checkout.c:1068
c04f5ac3
JX
4341#, c-format
4342msgid "Switched to a new branch '%s'\n"
4343msgstr "切换到一个新分支 '%s'\n"
4344
276ceeaa 4345#: builtin/checkout.c:680
c04f5ac3
JX
4346#, c-format
4347msgid "Switched to branch '%s'\n"
4348msgstr "切换到分支 '%s'\n"
4349
90e6ef53 4350# 译者:注意保持前导空格
276ceeaa 4351#: builtin/checkout.c:732
c04f5ac3
JX
4352#, c-format
4353msgid " ... and %d more.\n"
90e6ef53 4354msgstr " ... 及其它 %d 个。\n"
c04f5ac3 4355
276ceeaa 4356#: builtin/checkout.c:738
c04f5ac3
JX
4357#, c-format
4358msgid ""
4359"Warning: you are leaving %d commit behind, not connected to\n"
4360"any of your branches:\n"
4361"\n"
4362"%s\n"
4363msgid_plural ""
4364"Warning: you are leaving %d commits behind, not connected to\n"
4365"any of your branches:\n"
4366"\n"
4367"%s\n"
4368msgstr[0] ""
4369"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4370"\n"
4371"%s\n"
5ae481e0
JX
4372msgstr[1] ""
4373"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4374"\n"
4375"%s\n"
c04f5ac3 4376
276ceeaa 4377#: builtin/checkout.c:757
c04f5ac3
JX
4378#, c-format
4379msgid ""
7aea43ff
JX
4380"If you want to keep it by creating a new branch, this may be a good time\n"
4381"to do so with:\n"
4382"\n"
4383" git branch <new-branch-name> %s\n"
4384"\n"
4385msgid_plural ""
c04f5ac3
JX
4386"If you want to keep them by creating a new branch, this may be a good time\n"
4387"to do so with:\n"
4388"\n"
814ff314 4389" git branch <new-branch-name> %s\n"
c04f5ac3 4390"\n"
7aea43ff
JX
4391msgstr[0] ""
4392"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
4393"如下操作:\n"
4394"\n"
4395" git branch <新分支名> %s\n"
4396"\n"
4397msgstr[1] ""
4398"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
4399"如下操作:\n"
4400"\n"
814ff314 4401" git branch <新分支名> %s\n"
c04f5ac3
JX
4402"\n"
4403
276ceeaa 4404#: builtin/checkout.c:793
c04f5ac3
JX
4405msgid "internal error in revision walk"
4406msgstr "在版本遍历时遇到内部错误"
4407
276ceeaa 4408#: builtin/checkout.c:797
c04f5ac3
JX
4409msgid "Previous HEAD position was"
4410msgstr "之前的 HEAD 位置是"
4411
276ceeaa 4412#: builtin/checkout.c:824 builtin/checkout.c:1063
c04f5ac3 4413msgid "You are on a branch yet to be born"
90e6ef53 4414msgstr "您位于一个尚未初始化的分支"
c04f5ac3 4415
276ceeaa 4416#: builtin/checkout.c:969
90314792
JX
4417#, c-format
4418msgid "only one reference expected, %d given."
4419msgstr "只要一个引用,却给出了 %d 个"
4420
276ceeaa 4421#: builtin/checkout.c:1009 builtin/worktree.c:211
c04f5ac3
JX
4422#, c-format
4423msgid "invalid reference: %s"
4424msgstr "无效引用:%s"
4425
276ceeaa 4426#: builtin/checkout.c:1038
c04f5ac3
JX
4427#, c-format
4428msgid "reference is not a tree: %s"
4429msgstr "引用不是一个树:%s"
4430
276ceeaa 4431#: builtin/checkout.c:1077
ef317cd5 4432msgid "paths cannot be used with switching branches"
07432cef 4433msgstr "路径不能和切换分支同时使用"
c04f5ac3 4434
276ceeaa 4435#: builtin/checkout.c:1080 builtin/checkout.c:1084
07432cef 4436#, c-format
ef317cd5 4437msgid "'%s' cannot be used with switching branches"
07432cef 4438msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 4439
276ceeaa
JX
4440#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
4441#: builtin/checkout.c:1099
07432cef 4442#, c-format
ef317cd5 4443msgid "'%s' cannot be used with '%s'"
07432cef 4444msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 4445
276ceeaa 4446#: builtin/checkout.c:1104
07432cef 4447#, c-format
ef317cd5 4448msgid "Cannot switch branch to a non-commit '%s'"
07432cef 4449msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 4450
276ceeaa
JX
4451#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
4452#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
4453#: builtin/worktree.c:320
ef317cd5 4454msgid "branch"
07432cef 4455msgstr "分支"
c04f5ac3 4456
276ceeaa 4457#: builtin/checkout.c:1138
ef317cd5 4458msgid "create and checkout a new branch"
07432cef 4459msgstr "创建并检出一个新的分支"
c04f5ac3 4460
276ceeaa 4461#: builtin/checkout.c:1140
ef317cd5 4462msgid "create/reset and checkout a branch"
07432cef 4463msgstr "创建/重置并检出一个分支"
c04f5ac3 4464
276ceeaa 4465#: builtin/checkout.c:1141
ef317cd5 4466msgid "create reflog for new branch"
07432cef 4467msgstr "为新的分支创建引用日志"
ef317cd5 4468
276ceeaa 4469#: builtin/checkout.c:1142
ef317cd5 4470msgid "detach the HEAD at named commit"
07432cef 4471msgstr "成为指向该提交的分离头指针"
ef317cd5 4472
276ceeaa 4473#: builtin/checkout.c:1143
ef317cd5 4474msgid "set upstream info for new branch"
07432cef 4475msgstr "为新的分支设置上游信息"
ef317cd5 4476
276ceeaa 4477#: builtin/checkout.c:1145
6c94aba5 4478msgid "new-branch"
07432cef 4479msgstr "新分支"
ef317cd5 4480
276ceeaa 4481#: builtin/checkout.c:1145
ef317cd5 4482msgid "new unparented branch"
07432cef 4483msgstr "新的没有父提交的分支"
ef317cd5 4484
276ceeaa 4485#: builtin/checkout.c:1146
ef317cd5 4486msgid "checkout our version for unmerged files"
07432cef 4487msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 4488
276ceeaa 4489#: builtin/checkout.c:1148
ef317cd5 4490msgid "checkout their version for unmerged files"
07432cef 4491msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 4492
276ceeaa 4493#: builtin/checkout.c:1150
ef317cd5 4494msgid "force checkout (throw away local modifications)"
07432cef 4495msgstr "强制检出(丢弃本地修改)"
c04f5ac3 4496
276ceeaa 4497#: builtin/checkout.c:1151
ef317cd5 4498msgid "perform a 3-way merge with the new branch"
160fb2b2 4499msgstr "和新的分支执行三方合并"
ef317cd5 4500
276ceeaa 4501#: builtin/checkout.c:1152 builtin/merge.c:227
ef317cd5 4502msgid "update ignored files (default)"
07432cef 4503msgstr "更新忽略的文件(默认)"
c04f5ac3 4504
276ceeaa 4505#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
ef317cd5 4506msgid "style"
07432cef 4507msgstr "风格"
ef317cd5 4508
276ceeaa 4509#: builtin/checkout.c:1154
ef317cd5 4510msgid "conflict style (merge or diff3)"
07432cef 4511msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 4512
276ceeaa 4513#: builtin/checkout.c:1157
4dcdc3d8
JX
4514msgid "do not limit pathspecs to sparse entries only"
4515msgstr "对路径不做稀疏检出的限制"
4516
276ceeaa 4517#: builtin/checkout.c:1159
814ff314
JX
4518msgid "second guess 'git checkout <no-such-branch>'"
4519msgstr "二次猜测'git checkout <无此分支>'"
ef317cd5 4520
276ceeaa 4521#: builtin/checkout.c:1161
7aea43ff
JX
4522msgid "do not check if another worktree is holding the given ref"
4523msgstr "不检查指定的引用是否被其他工作区所占用"
4524
276ceeaa
JX
4525#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
4526#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
94550ed3
JX
4527#: builtin/send-pack.c:168
4528msgid "force progress reporting"
4529msgstr "强制显示进度报告"
4530
276ceeaa 4531#: builtin/checkout.c:1193
ef317cd5 4532msgid "-b, -B and --orphan are mutually exclusive"
07432cef 4533msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 4534
276ceeaa 4535#: builtin/checkout.c:1210
ef317cd5
JX
4536msgid "--track needs a branch name"
4537msgstr "--track 需要一个分支名"
4538
276ceeaa 4539#: builtin/checkout.c:1215
ef317cd5
JX
4540msgid "Missing branch name; try -b"
4541msgstr "缺少分支名;尝试 -b"
4542
276ceeaa 4543#: builtin/checkout.c:1251
c04f5ac3 4544msgid "invalid path specification"
90e6ef53 4545msgstr "无效的路径规格"
c04f5ac3 4546
276ceeaa 4547#: builtin/checkout.c:1258
07432cef 4548#, c-format
c04f5ac3 4549msgid ""
ef317cd5 4550"Cannot update paths and switch to branch '%s' at the same time.\n"
c04f5ac3
JX
4551"Did you intend to checkout '%s' which can not be resolved as commit?"
4552msgstr ""
07432cef
WS
4553"不能同时更新路径并切换到分支'%s'。\n"
4554"您是想要检出 '%s' 但其未能解析为提交么?"
c04f5ac3 4555
276ceeaa 4556#: builtin/checkout.c:1263
07432cef 4557#, c-format
ef317cd5 4558msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 4559msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 4560
276ceeaa 4561#: builtin/checkout.c:1267
c04f5ac3
JX
4562msgid ""
4563"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4564"checking out of the index."
4565msgstr ""
90e6ef53 4566"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 4567
1b7f4a34 4568#: builtin/clean.c:25
2e8451e8
JX
4569msgid ""
4570"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
4571msgstr ""
4572"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 4573
1b7f4a34 4574#: builtin/clean.c:29
07432cef
WS
4575#, c-format
4576msgid "Removing %s\n"
4577msgstr "正删除 %s\n"
4578
1b7f4a34 4579#: builtin/clean.c:30
07432cef
WS
4580#, c-format
4581msgid "Would remove %s\n"
4582msgstr "将删除 %s\n"
4583
1b7f4a34 4584#: builtin/clean.c:31
07432cef
WS
4585#, c-format
4586msgid "Skipping repository %s\n"
160fb2b2 4587msgstr "忽略仓库 %s\n"
07432cef 4588
1b7f4a34 4589#: builtin/clean.c:32
07432cef
WS
4590#, c-format
4591msgid "Would skip repository %s\n"
160fb2b2 4592msgstr "将忽略仓库 %s\n"
07432cef 4593
1b7f4a34 4594#: builtin/clean.c:33
07432cef
WS
4595#, c-format
4596msgid "failed to remove %s"
4597msgstr "无法删除 %s"
4598
276ceeaa 4599#: builtin/clean.c:291
2e8451e8
JX
4600msgid ""
4601"Prompt help:\n"
4602"1 - select a numbered item\n"
4603"foo - select item based on unique prefix\n"
4604" - (empty) select nothing"
4605msgstr ""
4606"帮助:\n"
4607"1 - 通过编号选择一个选项\n"
4608"foo - 通过标题选择一个选项\n"
4609" - (空)什么也不选择"
4610
276ceeaa 4611#: builtin/clean.c:295
2e8451e8
JX
4612msgid ""
4613"Prompt help:\n"
4614"1 - select a single item\n"
4615"3-5 - select a range of items\n"
4616"2-3,6-9 - select multiple ranges\n"
4617"foo - select item based on unique prefix\n"
4618"-... - unselect specified items\n"
4619"* - choose all items\n"
4620" - (empty) finish selecting"
4621msgstr ""
4622"帮助:\n"
4623"1 - 选择一个选项\n"
4624"3-5 - 选择一个范围内的所有选项\n"
4625"2-3,6-9 - 选择多个范围内的所有选项\n"
4626"foo - 通过标题选择一个选项\n"
4627"-... - 反选特定的选项\n"
4628"* - 选择所有选项\n"
4629" - (空)结束选择"
4630
276ceeaa 4631#: builtin/clean.c:511
2e8451e8
JX
4632#, c-format
4633msgid "Huh (%s)?"
4634msgstr "嗯(%s)?"
4635
276ceeaa 4636#: builtin/clean.c:653
2e8451e8
JX
4637#, c-format
4638msgid "Input ignore patterns>> "
4639msgstr "输入模版以排除条目>> "
4640
276ceeaa 4641#: builtin/clean.c:690
2e8451e8
JX
4642#, c-format
4643msgid "WARNING: Cannot find items matched by: %s"
4644msgstr "警告:无法找到和 %s 匹配的条目"
4645
276ceeaa 4646#: builtin/clean.c:711
2e8451e8
JX
4647msgid "Select items to delete"
4648msgstr "选择要删除的条目"
4649
814ff314 4650#. TRANSLATORS: Make sure to keep [y/N] as is
276ceeaa 4651#: builtin/clean.c:752
2e8451e8 4652#, c-format
814ff314
JX
4653msgid "Remove %s [y/N]? "
4654msgstr "删除 %s [y/N]?"
2e8451e8 4655
276ceeaa 4656#: builtin/clean.c:777
2e8451e8
JX
4657msgid "Bye."
4658msgstr "再见。"
4659
276ceeaa 4660#: builtin/clean.c:785
2e8451e8
JX
4661msgid ""
4662"clean - start cleaning\n"
4663"filter by pattern - exclude items from deletion\n"
4664"select by numbers - select items to be deleted by numbers\n"
4665"ask each - confirm each deletion (like \"rm -i\")\n"
4666"quit - stop cleaning\n"
4667"help - this screen\n"
4668"? - help for prompt selection"
4669msgstr ""
4670"clean - 开始清理\n"
4671"filter by pattern - 通过模版排除要删除的条目\n"
4672"select by numbers - 通过数字选择要删除的条目\n"
4673"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
4674"quit - 停止删除并退出\n"
4675"help - 显示本帮助\n"
4676"? - 显示如何在提示符下选择的帮助"
4677
276ceeaa 4678#: builtin/clean.c:812
2e8451e8
JX
4679msgid "*** Commands ***"
4680msgstr "*** 命令 ***"
4681
276ceeaa 4682#: builtin/clean.c:813
2e8451e8
JX
4683msgid "What now"
4684msgstr "请选择"
4685
276ceeaa 4686#: builtin/clean.c:821
2e8451e8
JX
4687msgid "Would remove the following item:"
4688msgid_plural "Would remove the following items:"
4689msgstr[0] "将删除如下条目:"
4690msgstr[1] "将删除如下条目:"
4691
276ceeaa 4692#: builtin/clean.c:838
2e8451e8
JX
4693msgid "No more files to clean, exiting."
4694msgstr "没有要清理的文件,退出。"
4695
276ceeaa 4696#: builtin/clean.c:869
ef317cd5 4697msgid "do not print names of files removed"
07432cef 4698msgstr "不打印删除文件的名称"
ef317cd5 4699
276ceeaa 4700#: builtin/clean.c:871
ef317cd5 4701msgid "force"
07432cef 4702msgstr "强制"
ef317cd5 4703
276ceeaa 4704#: builtin/clean.c:872
2e8451e8
JX
4705msgid "interactive cleaning"
4706msgstr "交互式清除"
4707
276ceeaa 4708#: builtin/clean.c:874
ef317cd5 4709msgid "remove whole directories"
07432cef 4710msgstr "删除整个目录"
ef317cd5 4711
276ceeaa
JX
4712#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
4713#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
ef317cd5 4714msgid "pattern"
07432cef 4715msgstr "模式"
ef317cd5 4716
276ceeaa 4717#: builtin/clean.c:876
ef317cd5 4718msgid "add <pattern> to ignore rules"
4375c10e 4719msgstr "添加 <模式> 到忽略规则"
ef317cd5 4720
276ceeaa 4721#: builtin/clean.c:877
ef317cd5 4722msgid "remove ignored files, too"
07432cef 4723msgstr "也删除忽略的文件"
ef317cd5 4724
276ceeaa 4725#: builtin/clean.c:879
ef317cd5 4726msgid "remove only ignored files"
07432cef 4727msgstr "只删除忽略的文件"
c04f5ac3 4728
276ceeaa 4729#: builtin/clean.c:897
c04f5ac3 4730msgid "-x and -X cannot be used together"
649900bc 4731msgstr "-x 和 -X 不能同时使用"
c04f5ac3 4732
276ceeaa 4733#: builtin/clean.c:901
c04f5ac3 4734msgid ""
6c94aba5 4735"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 4736"clean"
c04f5ac3 4737msgstr ""
2e8451e8 4738"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 4739
276ceeaa 4740#: builtin/clean.c:904
c04f5ac3 4741msgid ""
6c94aba5 4742"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 4743"refusing to clean"
c04f5ac3 4744msgstr ""
2e8451e8 4745"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 4746
220c313c 4747#: builtin/clone.c:37
814ff314 4748msgid "git clone [<options>] [--] <repo> [<dir>]"
160fb2b2 4749msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
ef317cd5 4750
276ceeaa 4751#: builtin/clone.c:60
ef317cd5 4752msgid "don't create a checkout"
07432cef 4753msgstr "不创建一个检出"
ef317cd5 4754
276ceeaa 4755#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
ef317cd5 4756msgid "create a bare repository"
160fb2b2 4757msgstr "创建一个纯仓库"
ef317cd5 4758
276ceeaa 4759#: builtin/clone.c:65
ef317cd5 4760msgid "create a mirror repository (implies bare)"
160fb2b2 4761msgstr "创建一个镜像仓库(也是纯仓库)"
ef317cd5 4762
276ceeaa 4763#: builtin/clone.c:67
ef317cd5 4764msgid "to clone from a local repository"
160fb2b2 4765msgstr "从本地仓库克隆"
ef317cd5 4766
276ceeaa 4767#: builtin/clone.c:69
ef317cd5 4768msgid "don't use local hardlinks, always copy"
07432cef 4769msgstr "不使用本地硬链接,始终复制"
ef317cd5 4770
276ceeaa 4771#: builtin/clone.c:71
ef317cd5 4772msgid "setup as shared repository"
160fb2b2 4773msgstr "设置为共享仓库"
ef317cd5 4774
276ceeaa 4775#: builtin/clone.c:73 builtin/clone.c:75
ef317cd5 4776msgid "initialize submodules in the clone"
07432cef 4777msgstr "在克隆时初始化子模组"
ef317cd5 4778
276ceeaa 4779#: builtin/clone.c:76 builtin/init-db.c:466
ef317cd5 4780msgid "template-directory"
07432cef 4781msgstr "模板目录"
ef317cd5 4782
276ceeaa 4783#: builtin/clone.c:77 builtin/init-db.c:467
ef317cd5 4784msgid "directory from which templates will be used"
07432cef 4785msgstr "模板目录将被使用"
ef317cd5 4786
276ceeaa 4787#: builtin/clone.c:79 builtin/submodule--helper.c:173
ef317cd5 4788msgid "reference repository"
160fb2b2 4789msgstr "参考仓库"
ef317cd5 4790
276ceeaa 4791#: builtin/clone.c:81
7aea43ff 4792msgid "use --reference only while cloning"
160fb2b2 4793msgstr "仅在克隆时参考 --reference 指向的本地仓库"
7aea43ff 4794
276ceeaa 4795#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
ef317cd5 4796msgid "name"
07432cef 4797msgstr "名称"
ef317cd5 4798
276ceeaa 4799#: builtin/clone.c:83
ef317cd5 4800msgid "use <name> instead of 'origin' to track upstream"
4375c10e 4801msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
ef317cd5 4802
276ceeaa 4803#: builtin/clone.c:85
ef317cd5 4804msgid "checkout <branch> instead of the remote's HEAD"
4375c10e 4805msgstr "检出 <分支> 而不是远程 HEAD"
ef317cd5 4806
276ceeaa 4807#: builtin/clone.c:87
ef317cd5 4808msgid "path to git-upload-pack on the remote"
07432cef 4809msgstr "远程 git-upload-pack 路径"
ef317cd5 4810
276ceeaa
JX
4811#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
4812#: builtin/pull.c:193
ef317cd5 4813msgid "depth"
07432cef 4814msgstr "深度"
ef317cd5 4815
276ceeaa 4816#: builtin/clone.c:89
ef317cd5 4817msgid "create a shallow clone of that depth"
07432cef 4818msgstr "创建一个指定深度的浅克隆"
ef317cd5 4819
276ceeaa 4820#: builtin/clone.c:91
ef317cd5 4821msgid "clone only one branch, HEAD or --branch"
07432cef 4822msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 4823
276ceeaa 4824#: builtin/clone.c:92 builtin/init-db.c:475
ef317cd5 4825msgid "gitdir"
07432cef 4826msgstr "git目录"
ef317cd5 4827
276ceeaa 4828#: builtin/clone.c:93 builtin/init-db.c:476
ef317cd5 4829msgid "separate git dir from working tree"
07432cef 4830msgstr "git目录和工作区分离"
ef317cd5 4831
276ceeaa 4832#: builtin/clone.c:94
ef317cd5 4833msgid "key=value"
07432cef 4834msgstr "key=value"
ef317cd5 4835
276ceeaa 4836#: builtin/clone.c:95
ef317cd5 4837msgid "set config inside the new repository"
160fb2b2 4838msgstr "在新仓库中设置配置信息"
ef317cd5 4839
276ceeaa
JX
4840#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
4841msgid "use IPv4 addresses only"
4842msgstr "只使用 IPv4 地址"
4843
4844#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
4845msgid "use IPv6 addresses only"
4846msgstr "只使用 IPv6 地址"
4847
3495628d
JX
4848#: builtin/clone.c:239
4849msgid ""
4850"No directory name could be guessed.\n"
4851"Please specify a directory on the command line"
4852msgstr ""
4853"无法猜到目录名。\n"
26e4cbec 4854"请在命令行指定一个目录"
3495628d 4855
276ceeaa 4856#: builtin/clone.c:305
94550ed3
JX
4857#, c-format
4858msgid "reference repository '%s' as a linked checkout is not supported yet."
4859msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
4860
276ceeaa 4861#: builtin/clone.c:307
c04f5ac3 4862#, c-format
4dcdc3d8 4863msgid "reference repository '%s' is not a local repository."
160fb2b2 4864msgstr "参考仓库 '%s' 不是一个本地仓库。"
c04f5ac3 4865
276ceeaa 4866#: builtin/clone.c:312
cfff71a9
JX
4867#, c-format
4868msgid "reference repository '%s' is shallow"
160fb2b2 4869msgstr "参考仓库 '%s' 是一个浅克隆"
cfff71a9 4870
276ceeaa 4871#: builtin/clone.c:315
cfff71a9
JX
4872#, c-format
4873msgid "reference repository '%s' is grafted"
160fb2b2 4874msgstr "参考仓库 '%s' 已被嫁接"
cfff71a9 4875
276ceeaa 4876#: builtin/clone.c:380 builtin/diff.c:84
c04f5ac3
JX
4877#, c-format
4878msgid "failed to stat '%s'"
90e6ef53 4879msgstr "无法枚举 '%s' 状态"
c04f5ac3 4880
276ceeaa 4881#: builtin/clone.c:382
c04f5ac3
JX
4882#, c-format
4883msgid "%s exists and is not a directory"
4884msgstr "%s 存在且不是一个目录"
4885
276ceeaa 4886#: builtin/clone.c:396
c04f5ac3
JX
4887#, c-format
4888msgid "failed to stat %s\n"
90e6ef53 4889msgstr "无法枚举 %s 状态\n"
c04f5ac3 4890
276ceeaa 4891#: builtin/clone.c:418
c04f5ac3
JX
4892#, c-format
4893msgid "failed to create link '%s'"
90e6ef53 4894msgstr "无法创建链接 '%s'"
c04f5ac3 4895
276ceeaa 4896#: builtin/clone.c:422
c04f5ac3
JX
4897#, c-format
4898msgid "failed to copy file to '%s'"
90e6ef53 4899msgstr "无法拷贝文件至 '%s'"
c04f5ac3 4900
276ceeaa 4901#: builtin/clone.c:447 builtin/clone.c:631
c04f5ac3
JX
4902#, c-format
4903msgid "done.\n"
4904msgstr "完成。\n"
4905
276ceeaa 4906#: builtin/clone.c:459
1003b3a5
JX
4907msgid ""
4908"Clone succeeded, but checkout failed.\n"
4909"You can inspect what was checked out with 'git status'\n"
4910"and retry the checkout with 'git checkout -f HEAD'\n"
4911msgstr ""
4912"克隆成功,但是检出失败。\n"
4913"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4914"'git checkout -f HEAD' 重试\n"
4915
276ceeaa 4916#: builtin/clone.c:536
c04f5ac3
JX
4917#, c-format
4918msgid "Could not find remote branch %s to clone."
90e6ef53 4919msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 4920
276ceeaa 4921#: builtin/clone.c:626
2e8451e8
JX
4922#, c-format
4923msgid "Checking connectivity... "
4924msgstr "检查连接... "
4925
276ceeaa 4926#: builtin/clone.c:629
1003b3a5
JX
4927msgid "remote did not send all necessary objects"
4928msgstr "远程没有发送所有必须的对象"
4929
3495628d
JX
4930#: builtin/clone.c:647
4931#, c-format
4932msgid "unable to update %s"
4933msgstr "不能更新 %s"
4934
276ceeaa 4935#: builtin/clone.c:696
c04f5ac3
JX
4936msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4937msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4938
276ceeaa 4939#: builtin/clone.c:727
1003b3a5
JX
4940msgid "unable to checkout working tree"
4941msgstr "不能检出工作区"
4942
3495628d
JX
4943#: builtin/clone.c:753
4944msgid "unable to write parameters to config file"
4945msgstr "无法将参数写入配置文件"
4946
276ceeaa 4947#: builtin/clone.c:816
04cb2f28
JX
4948msgid "cannot repack to clean up"
4949msgstr "无法执行 repack 来清理"
4950
276ceeaa 4951#: builtin/clone.c:818
04cb2f28
JX
4952msgid "cannot unlink temporary alternates file"
4953msgstr "无法删除临时的 alternates 文件"
4954
276ceeaa 4955#: builtin/clone.c:850
c04f5ac3
JX
4956msgid "Too many arguments."
4957msgstr "太多参数。"
4958
276ceeaa 4959#: builtin/clone.c:854
c04f5ac3 4960msgid "You must specify a repository to clone."
160fb2b2 4961msgstr "您必须指定一个仓库来克隆。"
c04f5ac3 4962
276ceeaa 4963#: builtin/clone.c:865
c04f5ac3
JX
4964#, c-format
4965msgid "--bare and --origin %s options are incompatible."
4966msgstr "--bare 和 --origin %s 选项不兼容。"
4967
276ceeaa 4968#: builtin/clone.c:868
07432cef
WS
4969msgid "--bare and --separate-git-dir are incompatible."
4970msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4971
276ceeaa 4972#: builtin/clone.c:881
c04f5ac3
JX
4973#, c-format
4974msgid "repository '%s' does not exist"
160fb2b2 4975msgstr "仓库 '%s' 不存在"
c04f5ac3 4976
276ceeaa 4977#: builtin/clone.c:887 builtin/fetch.c:1174
cfff71a9
JX
4978#, c-format
4979msgid "depth %s is not a positive number"
4980msgstr "深度 %s 不是一个正数"
4981
276ceeaa 4982#: builtin/clone.c:897
c04f5ac3
JX
4983#, c-format
4984msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 4985msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 4986
276ceeaa 4987#: builtin/clone.c:907
c04f5ac3
JX
4988#, c-format
4989msgid "working tree '%s' already exists."
4990msgstr "工作区 '%s' 已经存在。"
4991
276ceeaa
JX
4992#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
4993#: builtin/worktree.c:219 builtin/worktree.c:246
5bb01d4f
JX
4994#, c-format
4995msgid "could not create leading directories of '%s'"
4996msgstr "不能为 '%s' 创建先导目录"
4997
276ceeaa 4998#: builtin/clone.c:925
c04f5ac3 4999#, c-format
814ff314
JX
5000msgid "could not create work tree dir '%s'"
5001msgstr "不能创建工作区目录 '%s'"
c04f5ac3 5002
276ceeaa 5003#: builtin/clone.c:943
c04f5ac3
JX
5004#, c-format
5005msgid "Cloning into bare repository '%s'...\n"
160fb2b2 5006msgstr "克隆到纯仓库 '%s'...\n"
c04f5ac3 5007
276ceeaa 5008#: builtin/clone.c:945
c04f5ac3
JX
5009#, c-format
5010msgid "Cloning into '%s'...\n"
5011msgstr "正克隆到 '%s'...\n"
5012
276ceeaa 5013#: builtin/clone.c:984
6acbf033
JX
5014msgid "--depth is ignored in local clones; use file:// instead."
5015msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
5016
276ceeaa 5017#: builtin/clone.c:987
6acbf033 5018msgid "source repository is shallow, ignoring --local"
160fb2b2 5019msgstr "源仓库是浅克隆,忽略 --local"
6acbf033 5020
276ceeaa 5021#: builtin/clone.c:992
6acbf033
JX
5022msgid "--local is ignored"
5023msgstr "--local 被忽略"
5024
276ceeaa 5025#: builtin/clone.c:996
c04f5ac3
JX
5026#, c-format
5027msgid "Don't know how to clone %s"
5028msgstr "不知道如何克隆 %s"
5029
276ceeaa 5030#: builtin/clone.c:1045 builtin/clone.c:1053
c04f5ac3
JX
5031#, c-format
5032msgid "Remote branch %s not found in upstream %s"
5033msgstr "远程分支 %s 在上游 %s 未发现"
5034
276ceeaa 5035#: builtin/clone.c:1056
c04f5ac3 5036msgid "You appear to have cloned an empty repository."
160fb2b2 5037msgstr "您似乎克隆了一个空仓库。"
c04f5ac3 5038
ef317cd5 5039#: builtin/column.c:9
814ff314
JX
5040msgid "git column [<options>]"
5041msgstr "git column [<选项>]"
ef317cd5
JX
5042
5043#: builtin/column.c:26
5044msgid "lookup config vars"
07432cef 5045msgstr "查找配置变量"
ef317cd5
JX
5046
5047#: builtin/column.c:27 builtin/column.c:28
ef317cd5 5048msgid "layout to use"
07432cef 5049msgstr "要使用的布局"
ef317cd5
JX
5050
5051#: builtin/column.c:29
5052msgid "Maximum width"
07432cef 5053msgstr "最大宽度"
ef317cd5
JX
5054
5055#: builtin/column.c:30
5056msgid "Padding space on left border"
07432cef 5057msgstr "左边框的填充空间"
ef317cd5
JX
5058
5059#: builtin/column.c:31
5060msgid "Padding space on right border"
07432cef 5061msgstr "右边框的填充空间"
ef317cd5
JX
5062
5063#: builtin/column.c:32
5064msgid "Padding space between columns"
07432cef 5065msgstr "两列之间的填充空间"
ef317cd5 5066
8ada9598
JX
5067#: builtin/column.c:51
5068msgid "--command must be the first argument"
81809b99 5069msgstr "--command 必须是第一个参数"
8ada9598 5070
94550ed3 5071#: builtin/commit.c:38
814ff314 5072msgid "git commit [<options>] [--] <pathspec>..."
160fb2b2 5073msgstr "git commit [<选项>] [--] <路径规格>..."
ef317cd5 5074
94550ed3 5075#: builtin/commit.c:43
814ff314 5076msgid "git status [<options>] [--] <pathspec>..."
160fb2b2 5077msgstr "git status [<选项>] [--] <路径规格>..."
ef317cd5 5078
94550ed3 5079#: builtin/commit.c:48
220c313c
JX
5080msgid ""
5081"Your name and email address were configured automatically based\n"
5082"on your username and hostname. Please check that they are accurate.\n"
5083"You can suppress this message by setting them explicitly. Run the\n"
5084"following command and follow the instructions in your editor to edit\n"
5085"your configuration file:\n"
5086"\n"
5087" git config --global --edit\n"
5088"\n"
5089"After doing this, you may fix the identity used for this commit with:\n"
5090"\n"
5091" git commit --amend --reset-author\n"
5092msgstr ""
5093"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5094"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
5095"中编辑您的配置文件:\n"
5096"\n"
5097" git config --global --edit\n"
5098"\n"
5099"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5100"\n"
5101" git commit --amend --reset-author\n"
5102
94550ed3 5103#: builtin/commit.c:61
c04f5ac3
JX
5104msgid ""
5105"Your name and email address were configured automatically based\n"
5106"on your username and hostname. Please check that they are accurate.\n"
5107"You can suppress this message by setting them explicitly:\n"
5108"\n"
5109" git config --global user.name \"Your Name\"\n"
5110" git config --global user.email you@example.com\n"
5111"\n"
5112"After doing this, you may fix the identity used for this commit with:\n"
5113"\n"
5114" git commit --amend --reset-author\n"
5115msgstr ""
90e6ef53 5116"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
220c313c 5117"与否。您可以对其进行设置以免再出现本提示信息:\n"
c04f5ac3
JX
5118"\n"
5119" git config --global user.name \"Your Name\"\n"
5120" git config --global user.email you@example.com\n"
5121"\n"
90e6ef53 5122"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
5123"\n"
5124" git commit --amend --reset-author\n"
5125
94550ed3 5126#: builtin/commit.c:73
c04f5ac3
JX
5127msgid ""
5128"You asked to amend the most recent commit, but doing so would make\n"
5129"it empty. You can repeat your command with --allow-empty, or you can\n"
5130"remove the commit entirely with \"git reset HEAD^\".\n"
5131msgstr ""
1b150dc9
T
5132"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
5133"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 5134
94550ed3 5135#: builtin/commit.c:78
c04f5ac3
JX
5136msgid ""
5137"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
5138"If you wish to commit it anyway, use:\n"
5139"\n"
5140" git commit --allow-empty\n"
5141"\n"
c04f5ac3 5142msgstr ""
a9ce4543
T
5143"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
5144"也要提交,使用命令:\n"
c04f5ac3
JX
5145"\n"
5146" git commit --allow-empty\n"
5147"\n"
c04f5ac3 5148
94550ed3 5149#: builtin/commit.c:85
b1894384
JX
5150msgid "Otherwise, please use 'git reset'\n"
5151msgstr "否则,请使用命令 'git reset'\n"
5152
94550ed3 5153#: builtin/commit.c:88
b1894384
JX
5154msgid ""
5155"If you wish to skip this commit, use:\n"
5156"\n"
5157" git reset\n"
5158"\n"
5159"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
5160"the remaining commits.\n"
5161msgstr ""
5162"如果您想跳过这个提交,使用命令:\n"
5163"\n"
5164" git reset\n"
5165"\n"
5166"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
5167"操作。\n"
5168
94550ed3 5169#: builtin/commit.c:305
c04f5ac3 5170msgid "failed to unpack HEAD tree object"
90e6ef53 5171msgstr "无法解包 HEAD 树对象"
c04f5ac3 5172
94550ed3 5173#: builtin/commit.c:346
c04f5ac3 5174msgid "unable to create temporary index"
90e6ef53 5175msgstr "不能创建临时索引"
c04f5ac3 5176
94550ed3 5177#: builtin/commit.c:352
c04f5ac3
JX
5178msgid "interactive add failed"
5179msgstr "交互式添加失败"
5180
94550ed3 5181#: builtin/commit.c:365
220c313c
JX
5182msgid "unable to update temporary index"
5183msgstr "无法更新临时索引"
5184
94550ed3 5185#: builtin/commit.c:367
220c313c
JX
5186msgid "Failed to update main cache tree"
5187msgstr "不能更新树的主缓存"
5188
94550ed3 5189#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
c04f5ac3 5190msgid "unable to write new_index file"
90e6ef53 5191msgstr "无法写 new_index 文件"
c04f5ac3 5192
94550ed3 5193#: builtin/commit.c:445
8ada9598 5194msgid "cannot do a partial commit during a merge."
81809b99 5195msgstr "在合并过程中不能做部分提交。"
c04f5ac3 5196
94550ed3 5197#: builtin/commit.c:447
8ada9598 5198msgid "cannot do a partial commit during a cherry-pick."
81809b99 5199msgstr "在拣选过程中不能做部分提交。"
8ada9598 5200
94550ed3 5201#: builtin/commit.c:456
c04f5ac3 5202msgid "cannot read the index"
90e6ef53 5203msgstr "无法读取索引"
c04f5ac3 5204
94550ed3 5205#: builtin/commit.c:475
c04f5ac3 5206msgid "unable to write temporary index file"
90e6ef53 5207msgstr "无法写临时索引文件"
c04f5ac3 5208
94550ed3 5209#: builtin/commit.c:580
220c313c
JX
5210#, c-format
5211msgid "commit '%s' lacks author header"
5212msgstr "提交 '%s' 缺少作者信息"
5213
94550ed3 5214#: builtin/commit.c:582
c04f5ac3 5215#, c-format
220c313c
JX
5216msgid "commit '%s' has malformed author line"
5217msgstr "提交 '%s' 有非法的作者信息"
c04f5ac3 5218
94550ed3 5219#: builtin/commit.c:601
c04f5ac3
JX
5220msgid "malformed --author parameter"
5221msgstr "非法的 --author 参数"
5222
94550ed3 5223#: builtin/commit.c:609
c04f5ac3 5224#, c-format
6acbf033
JX
5225msgid "invalid date format: %s"
5226msgstr "无效的日期格式:%s"
5227
94550ed3 5228#: builtin/commit.c:653
6acbf033
JX
5229msgid ""
5230"unable to select a comment character that is not used\n"
5231"in the current commit message"
5232msgstr "无法选择一个未被当前提交说明使用的注释字符"
5233
94550ed3 5234#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
c04f5ac3
JX
5235#, c-format
5236msgid "could not lookup commit %s"
5237msgstr "不能查询提交 %s"
5238
276ceeaa 5239#: builtin/commit.c:702 builtin/shortlog.c:285
c04f5ac3
JX
5240#, c-format
5241msgid "(reading log message from standard input)\n"
90e6ef53 5242msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 5243
94550ed3 5244#: builtin/commit.c:704
c04f5ac3 5245msgid "could not read log from standard input"
90e6ef53 5246msgstr "不能从标准输入中读取日志信息"
c04f5ac3 5247
94550ed3 5248#: builtin/commit.c:708
c04f5ac3
JX
5249#, c-format
5250msgid "could not read log file '%s'"
90e6ef53 5251msgstr "不能读取日志文件 '%s'"
c04f5ac3 5252
94550ed3 5253#: builtin/commit.c:730
c04f5ac3 5254msgid "could not read MERGE_MSG"
90e6ef53 5255msgstr "不能读取 MERGE_MSG"
c04f5ac3 5256
94550ed3 5257#: builtin/commit.c:734
c04f5ac3 5258msgid "could not read SQUASH_MSG"
90e6ef53 5259msgstr "不能读取 SQUASH_MSG"
c04f5ac3 5260
94550ed3 5261#: builtin/commit.c:785
c04f5ac3 5262msgid "could not write commit template"
90e6ef53 5263msgstr "不能写提交模版"
c04f5ac3 5264
94550ed3 5265#: builtin/commit.c:803
81809b99 5266#, c-format
c04f5ac3
JX
5267msgid ""
5268"\n"
8ada9598 5269"It looks like you may be committing a merge.\n"
c04f5ac3
JX
5270"If this is not correct, please remove the file\n"
5271"\t%s\n"
5272"and try again.\n"
5273msgstr ""
5274"\n"
649900bc 5275"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
5276"\t%s\n"
5277"然后重试。\n"
5278
94550ed3 5279#: builtin/commit.c:808
81809b99 5280#, c-format
8ada9598
JX
5281msgid ""
5282"\n"
5283"It looks like you may be committing a cherry-pick.\n"
5284"If this is not correct, please remove the file\n"
5285"\t%s\n"
5286"and try again.\n"
5287msgstr ""
5288"\n"
649900bc 5289"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
5290"\t%s\n"
5291"然后重试。\n"
c04f5ac3 5292
94550ed3 5293#: builtin/commit.c:821
a77c07d9 5294#, c-format
c04f5ac3 5295msgid ""
8ada9598 5296"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 5297"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 5298msgstr ""
a77c07d9 5299"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 5300"说明将会终止提交。\n"
c04f5ac3 5301
94550ed3 5302#: builtin/commit.c:828
a77c07d9 5303#, c-format
c04f5ac3 5304msgid ""
8ada9598 5305"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 5306"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
5307"An empty message aborts the commit.\n"
5308msgstr ""
a77c07d9
JX
5309"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
5310"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 5311
90e6ef53 5312# 译者:为保证在输出中对齐,注意调整句中空格!
94550ed3 5313#: builtin/commit.c:848
6acbf033
JX
5314#, c-format
5315msgid "%sAuthor: %.*s <%.*s>"
5316msgstr "%s作者: %.*s <%.*s>"
5317
5318# 译者:为保证在输出中对齐,注意调整句中空格!
94550ed3 5319#: builtin/commit.c:856
c04f5ac3 5320#, c-format
6acbf033
JX
5321msgid "%sDate: %s"
5322msgstr "%s日期: %s"
c04f5ac3 5323
90e6ef53 5324# 译者:为保证在输出中对齐,注意调整句中空格!
94550ed3 5325#: builtin/commit.c:863
c04f5ac3 5326#, c-format
6acbf033
JX
5327msgid "%sCommitter: %.*s <%.*s>"
5328msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 5329
94550ed3 5330#: builtin/commit.c:881
c04f5ac3 5331msgid "Cannot read index"
90e6ef53 5332msgstr "无法读取索引"
c04f5ac3 5333
94550ed3 5334#: builtin/commit.c:938
c04f5ac3
JX
5335msgid "Error building trees"
5336msgstr "无法创建树对象"
5337
94550ed3 5338#: builtin/commit.c:953 builtin/tag.c:266
c04f5ac3
JX
5339#, c-format
5340msgid "Please supply the message using either -m or -F option.\n"
07432cef 5341msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 5342
94550ed3 5343#: builtin/commit.c:1055
c04f5ac3 5344#, c-format
814ff314
JX
5345msgid "--author '%s' is not 'Name <email>' and matches no existing author"
5346msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 5347
94550ed3 5348#: builtin/commit.c:1070 builtin/commit.c:1310
c04f5ac3
JX
5349#, c-format
5350msgid "Invalid untracked files mode '%s'"
90e6ef53 5351msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 5352
94550ed3 5353#: builtin/commit.c:1107
2e8451e8
JX
5354msgid "--long and -z are incompatible"
5355msgstr "--long 和 -z 选项不兼容"
5356
94550ed3 5357#: builtin/commit.c:1137
c04f5ac3
JX
5358msgid "Using both --reset-author and --author does not make sense"
5359msgstr "同时使用 --reset-author 和 --author 没有意义"
5360
94550ed3 5361#: builtin/commit.c:1146
c04f5ac3 5362msgid "You have nothing to amend."
90e6ef53 5363msgstr "您没有可修补的提交。"
c04f5ac3 5364
94550ed3 5365#: builtin/commit.c:1149
8ada9598 5366msgid "You are in the middle of a merge -- cannot amend."
81809b99 5367msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 5368
94550ed3 5369#: builtin/commit.c:1151
8ada9598 5370msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 5371msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 5372
94550ed3 5373#: builtin/commit.c:1154
c04f5ac3 5374msgid "Options --squash and --fixup cannot be used together"
649900bc 5375msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 5376
94550ed3 5377#: builtin/commit.c:1164
c04f5ac3
JX
5378msgid "Only one of -c/-C/-F/--fixup can be used."
5379msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
5380
94550ed3 5381#: builtin/commit.c:1166
c04f5ac3 5382msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 5383msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 5384
94550ed3 5385#: builtin/commit.c:1174
c04f5ac3 5386msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 5387msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 5388
94550ed3 5389#: builtin/commit.c:1191
c04f5ac3
JX
5390msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
5391msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
5392
94550ed3 5393#: builtin/commit.c:1193
c04f5ac3
JX
5394msgid "No paths with --include/--only does not make sense."
5395msgstr "参数 --include/--only 不跟路径没有意义。"
5396
94550ed3 5397#: builtin/commit.c:1195
c04f5ac3 5398msgid "Clever... amending the last one with dirty index."
160fb2b2 5399msgstr "聪明... 用脏索引修补最后一个提交。"
c04f5ac3 5400
94550ed3 5401#: builtin/commit.c:1197
6c94aba5
JX
5402msgid "Explicit paths specified without -i or -o; assuming --only paths..."
5403msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
c04f5ac3 5404
94550ed3 5405#: builtin/commit.c:1209 builtin/tag.c:475
c04f5ac3
JX
5406#, c-format
5407msgid "Invalid cleanup mode %s"
5408msgstr "无效的清理模式 %s"
5409
94550ed3 5410#: builtin/commit.c:1214
c04f5ac3 5411msgid "Paths with -a does not make sense."
649900bc 5412msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 5413
94550ed3 5414#: builtin/commit.c:1324 builtin/commit.c:1605
ef317cd5 5415msgid "show status concisely"
07432cef 5416msgstr "以简洁的格式显示状态"
ef317cd5 5417
94550ed3 5418#: builtin/commit.c:1326 builtin/commit.c:1607
ef317cd5 5419msgid "show branch information"
07432cef 5420msgstr "显示分支信息"
ef317cd5 5421
276ceeaa
JX
5422#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
5423#: builtin/worktree.c:430
ef317cd5 5424msgid "machine-readable output"
07432cef
WS
5425msgstr "机器可读的输出"
5426
94550ed3 5427#: builtin/commit.c:1331 builtin/commit.c:1611
07432cef
WS
5428msgid "show status in long format (default)"
5429msgstr "以长格式显示状态(默认)"
ef317cd5 5430
94550ed3 5431#: builtin/commit.c:1334 builtin/commit.c:1614
ef317cd5 5432msgid "terminate entries with NUL"
4375c10e 5433msgstr "条目以 NUL 字符结尾"
ef317cd5 5434
94550ed3
JX
5435#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
5436#: builtin/fast-export.c:984 builtin/tag.c:353
ef317cd5 5437msgid "mode"
07432cef 5438msgstr "模式"
ef317cd5 5439
94550ed3 5440#: builtin/commit.c:1337 builtin/commit.c:1617
ef317cd5 5441msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 5442msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 5443
94550ed3 5444#: builtin/commit.c:1340
ef317cd5 5445msgid "show ignored files"
07432cef 5446msgstr "显示忽略的文件"
ef317cd5 5447
94550ed3 5448#: builtin/commit.c:1341 parse-options.h:155
ef317cd5
JX
5449msgid "when"
5450msgstr "何时"
5451
94550ed3 5452#: builtin/commit.c:1342
ef317cd5
JX
5453msgid ""
5454"ignore changes to submodules, optional when: all, dirty, untracked. "
5455"(Default: all)"
5456msgstr ""
07432cef 5457"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 5458
94550ed3 5459#: builtin/commit.c:1344
ef317cd5 5460msgid "list untracked files in columns"
07432cef 5461msgstr "以列的方式显示未跟踪的文件"
ef317cd5 5462
94550ed3 5463#: builtin/commit.c:1430
c04f5ac3
JX
5464msgid "couldn't look up newly created commit"
5465msgstr "无法找到新创建的提交"
5466
94550ed3 5467#: builtin/commit.c:1432
c04f5ac3 5468msgid "could not parse newly created commit"
90e6ef53 5469msgstr "不能解析新创建的提交"
c04f5ac3 5470
94550ed3 5471#: builtin/commit.c:1477
c04f5ac3
JX
5472msgid "detached HEAD"
5473msgstr "分离头指针"
5474
7e238ab7 5475# 译者:中文字符串拼接,可删除前导空格
94550ed3 5476#: builtin/commit.c:1480
c04f5ac3 5477msgid " (root-commit)"
7e238ab7 5478msgstr "(根提交)"
c04f5ac3 5479
94550ed3 5480#: builtin/commit.c:1575
ef317cd5 5481msgid "suppress summary after successful commit"
07432cef 5482msgstr "提交成功后不显示概述信息"
c04f5ac3 5483
94550ed3 5484#: builtin/commit.c:1576
ef317cd5 5485msgid "show diff in commit message template"
07432cef 5486msgstr "在提交说明模板里显示差异"
c04f5ac3 5487
94550ed3 5488#: builtin/commit.c:1578
ef317cd5 5489msgid "Commit message options"
07432cef 5490msgstr "提交说明选项"
c04f5ac3 5491
94550ed3 5492#: builtin/commit.c:1579 builtin/tag.c:351
ef317cd5 5493msgid "read message from file"
07432cef 5494msgstr "从文件中读取提交说明"
c04f5ac3 5495
94550ed3 5496#: builtin/commit.c:1580
ef317cd5 5497msgid "author"
07432cef 5498msgstr "作者"
c04f5ac3 5499
94550ed3 5500#: builtin/commit.c:1580
ef317cd5 5501msgid "override author for commit"
07432cef 5502msgstr "提交时覆盖作者"
73a60cd2 5503
94550ed3 5504#: builtin/commit.c:1581 builtin/gc.c:326
ef317cd5 5505msgid "date"
07432cef 5506msgstr "日期"
c04f5ac3 5507
94550ed3 5508#: builtin/commit.c:1581
ef317cd5 5509msgid "override date for commit"
07432cef 5510msgstr "提交时覆盖日期"
c04f5ac3 5511
276ceeaa
JX
5512#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
5513#: builtin/notes.c:558 builtin/tag.c:349
ef317cd5 5514msgid "message"
07432cef 5515msgstr "说明"
c04f5ac3 5516
94550ed3 5517#: builtin/commit.c:1582
ef317cd5 5518msgid "commit message"
07432cef 5519msgstr "提交说明"
ef317cd5 5520
94550ed3
JX
5521#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
5522#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
5523msgid "commit"
5524msgstr "提交"
5525
5526#: builtin/commit.c:1583
ef317cd5 5527msgid "reuse and edit message from specified commit"
07432cef 5528msgstr "重用并编辑指定提交的提交说明"
ef317cd5 5529
94550ed3 5530#: builtin/commit.c:1584
ef317cd5 5531msgid "reuse message from specified commit"
07432cef 5532msgstr "重用指定提交的提交说明"
ef317cd5 5533
94550ed3 5534#: builtin/commit.c:1585
ef317cd5 5535msgid "use autosquash formatted message to fixup specified commit"
07432cef 5536msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 5537
94550ed3 5538#: builtin/commit.c:1586
ef317cd5 5539msgid "use autosquash formatted message to squash specified commit"
07432cef 5540msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 5541
94550ed3 5542#: builtin/commit.c:1587
ef317cd5 5543msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 5544msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 5545
276ceeaa 5546#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
ef317cd5 5547msgid "add Signed-off-by:"
07432cef 5548msgstr "添加 Signed-off-by: 签名"
ef317cd5 5549
94550ed3 5550#: builtin/commit.c:1589
ef317cd5 5551msgid "use specified template file"
07432cef 5552msgstr "使用指定的模板文件"
ef317cd5 5553
94550ed3 5554#: builtin/commit.c:1590
ef317cd5 5555msgid "force edit of commit"
07432cef 5556msgstr "强制编辑提交"
ef317cd5 5557
07432cef 5558# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
94550ed3 5559#: builtin/commit.c:1591
ef317cd5 5560msgid "default"
07432cef 5561msgstr "default"
ef317cd5 5562
94550ed3 5563#: builtin/commit.c:1591 builtin/tag.c:354
ef317cd5 5564msgid "how to strip spaces and #comments from message"
07432cef 5565msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 5566
94550ed3 5567#: builtin/commit.c:1592
ef317cd5 5568msgid "include status in commit message template"
07432cef 5569msgstr "在提交说明模板里包含状态信息"
ef317cd5 5570
276ceeaa 5571#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
1b7f4a34 5572#: builtin/revert.c:93
ef317cd5 5573msgid "GPG sign commit"
07432cef 5574msgstr "GPG 提交签名"
ef317cd5 5575
94550ed3 5576#: builtin/commit.c:1597
ef317cd5 5577msgid "Commit contents options"
07432cef 5578msgstr "提交内容选项"
ef317cd5 5579
94550ed3 5580#: builtin/commit.c:1598
ef317cd5 5581msgid "commit all changed files"
07432cef 5582msgstr "提交所有改动的文件"
ef317cd5 5583
94550ed3 5584#: builtin/commit.c:1599
ef317cd5 5585msgid "add specified files to index for commit"
07432cef 5586msgstr "添加指定的文件到索引区等待提交"
ef317cd5 5587
94550ed3 5588#: builtin/commit.c:1600
ef317cd5 5589msgid "interactively add files"
07432cef 5590msgstr "交互式添加文件"
ef317cd5 5591
94550ed3 5592#: builtin/commit.c:1601
ef317cd5 5593msgid "interactively add changes"
07432cef 5594msgstr "交互式添加变更"
ef317cd5 5595
94550ed3 5596#: builtin/commit.c:1602
ef317cd5 5597msgid "commit only specified files"
07432cef 5598msgstr "只提交指定的文件"
ef317cd5 5599
94550ed3 5600#: builtin/commit.c:1603
ef317cd5 5601msgid "bypass pre-commit hook"
07432cef 5602msgstr "绕过 pre-commit 钩子"
ef317cd5 5603
94550ed3 5604#: builtin/commit.c:1604
ef317cd5 5605msgid "show what would be committed"
07432cef 5606msgstr "显示将要提交的内容"
ef317cd5 5607
94550ed3 5608#: builtin/commit.c:1615
ef317cd5 5609msgid "amend previous commit"
07432cef 5610msgstr "修改先前的提交"
ef317cd5 5611
94550ed3 5612#: builtin/commit.c:1616
ef317cd5 5613msgid "bypass post-rewrite hook"
07432cef 5614msgstr "绕过 post-rewrite 钩子"
ef317cd5 5615
94550ed3 5616#: builtin/commit.c:1621
ef317cd5 5617msgid "ok to record an empty change"
07432cef 5618msgstr "允许一个空提交"
ef317cd5 5619
94550ed3 5620#: builtin/commit.c:1623
ef317cd5 5621msgid "ok to record a change with an empty message"
07432cef 5622msgstr "允许空的提交说明"
ef317cd5 5623
94550ed3 5624#: builtin/commit.c:1652
c04f5ac3 5625msgid "could not parse HEAD commit"
90e6ef53 5626msgstr "不能解析 HEAD 提交"
c04f5ac3 5627
94550ed3 5628#: builtin/commit.c:1698
c04f5ac3
JX
5629#, c-format
5630msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 5631msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 5632
94550ed3 5633#: builtin/commit.c:1705
c04f5ac3 5634msgid "could not read MERGE_MODE"
90e6ef53 5635msgstr "不能读取 MERGE_MODE"
c04f5ac3 5636
94550ed3 5637#: builtin/commit.c:1724
c04f5ac3
JX
5638#, c-format
5639msgid "could not read commit message: %s"
90e6ef53 5640msgstr "不能读取提交说明:%s"
c04f5ac3 5641
94550ed3 5642#: builtin/commit.c:1735
73a60cd2
JX
5643#, c-format
5644msgid "Aborting commit; you did not edit the message.\n"
5645msgstr "终止提交;您未更改来自模版的提交说明。\n"
5646
94550ed3 5647#: builtin/commit.c:1740
c04f5ac3
JX
5648#, c-format
5649msgid "Aborting commit due to empty commit message.\n"
5650msgstr "终止提交因为提交说明为空。\n"
5651
94550ed3 5652#: builtin/commit.c:1788
c04f5ac3
JX
5653msgid ""
5654"Repository has been updated, but unable to write\n"
220c313c 5655"new_index file. Check that disk is not full and quota is\n"
c04f5ac3
JX
5656"not exceeded, and then \"git reset HEAD\" to recover."
5657msgstr ""
160fb2b2 5658"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
90e6ef53 5659"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 5660
276ceeaa 5661#: builtin/config.c:9
814ff314
JX
5662msgid "git config [<options>]"
5663msgstr "git config [<选项>]"
ef317cd5 5664
276ceeaa 5665#: builtin/config.c:56
ef317cd5 5666msgid "Config file location"
07432cef 5667msgstr "配置文件位置"
ef317cd5 5668
276ceeaa 5669#: builtin/config.c:57
ef317cd5 5670msgid "use global config file"
07432cef 5671msgstr "使用全局配置文件"
ef317cd5 5672
276ceeaa 5673#: builtin/config.c:58
ef317cd5 5674msgid "use system config file"
07432cef 5675msgstr "使用系统级配置文件"
ef317cd5 5676
276ceeaa 5677#: builtin/config.c:59
ef317cd5 5678msgid "use repository config file"
160fb2b2 5679msgstr "使用仓库级配置文件"
ef317cd5 5680
276ceeaa 5681#: builtin/config.c:60
ef317cd5 5682msgid "use given config file"
07432cef 5683msgstr "使用指定的配置文件"
ef317cd5 5684
276ceeaa 5685#: builtin/config.c:61
2e8451e8 5686msgid "blob-id"
4375c10e 5687msgstr "数据对象 ID"
2e8451e8 5688
276ceeaa 5689#: builtin/config.c:61
2e8451e8
JX
5690msgid "read config from given blob object"
5691msgstr "从给定的数据对象读取配置"
5692
276ceeaa 5693#: builtin/config.c:62
ef317cd5 5694msgid "Action"
07432cef 5695msgstr "操作"
ef317cd5 5696
276ceeaa 5697#: builtin/config.c:63
ef317cd5 5698msgid "get value: name [value-regex]"
07432cef 5699msgstr "获取值:name [value-regex]"
ef317cd5 5700
276ceeaa 5701#: builtin/config.c:64
ef317cd5 5702msgid "get all values: key [value-regex]"
07432cef 5703msgstr "获得所有的值:key [value-regex]"
ef317cd5 5704
276ceeaa 5705#: builtin/config.c:65
ef317cd5 5706msgid "get values for regexp: name-regex [value-regex]"
07432cef 5707msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 5708
276ceeaa 5709#: builtin/config.c:66
90314792
JX
5710msgid "get value specific for the URL: section[.var] URL"
5711msgstr "获得 URL 取值:section[.var] URL"
5712
276ceeaa 5713#: builtin/config.c:67
ef317cd5 5714msgid "replace all matching variables: name value [value_regex]"
07432cef 5715msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 5716
276ceeaa 5717#: builtin/config.c:68
ef317cd5 5718msgid "add a new variable: name value"
07432cef 5719msgstr "添加一个新的变量:name value"
ef317cd5 5720
276ceeaa 5721#: builtin/config.c:69
ef317cd5 5722msgid "remove a variable: name [value-regex]"
07432cef 5723msgstr "删除一个变量:name [value-regex]"
ef317cd5 5724
276ceeaa 5725#: builtin/config.c:70
ef317cd5 5726msgid "remove all matches: name [value-regex]"
07432cef 5727msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 5728
276ceeaa 5729#: builtin/config.c:71
ef317cd5 5730msgid "rename section: old-name new-name"
07432cef 5731msgstr "重命名小节:old-name new-name"
ef317cd5 5732
276ceeaa 5733#: builtin/config.c:72
ef317cd5 5734msgid "remove a section: name"
07432cef 5735msgstr "删除一个小节:name"
ef317cd5 5736
276ceeaa 5737#: builtin/config.c:73
ef317cd5 5738msgid "list all"
07432cef 5739msgstr "列出所有"
ef317cd5 5740
276ceeaa 5741#: builtin/config.c:74
ef317cd5 5742msgid "open an editor"
07432cef 5743msgstr "打开一个编辑器"
ef317cd5 5744
276ceeaa 5745#: builtin/config.c:75
04cb2f28
JX
5746msgid "find the color configured: slot [default]"
5747msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 5748
276ceeaa 5749#: builtin/config.c:76
04cb2f28
JX
5750msgid "find the color setting: slot [stdout-is-tty]"
5751msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 5752
276ceeaa 5753#: builtin/config.c:77
ef317cd5 5754msgid "Type"
07432cef 5755msgstr "类型"
ef317cd5 5756
276ceeaa 5757#: builtin/config.c:78
ef317cd5 5758msgid "value is \"true\" or \"false\""
07432cef 5759msgstr "值是 \"true\" 或 \"false\""
ef317cd5 5760
276ceeaa 5761#: builtin/config.c:79
ef317cd5 5762msgid "value is decimal number"
07432cef 5763msgstr "值是十进制数"
ef317cd5 5764
276ceeaa 5765#: builtin/config.c:80
ef317cd5 5766msgid "value is --bool or --int"
07432cef 5767msgstr "值是 --bool or --int"
ef317cd5 5768
276ceeaa 5769#: builtin/config.c:81
ef317cd5 5770msgid "value is a path (file or directory name)"
07432cef 5771msgstr "值是一个路径(文件或目录名)"
ef317cd5 5772
276ceeaa 5773#: builtin/config.c:82
ef317cd5 5774msgid "Other"
07432cef 5775msgstr "其它"
ef317cd5 5776
276ceeaa 5777#: builtin/config.c:83
ef317cd5 5778msgid "terminate values with NUL byte"
4375c10e 5779msgstr "终止值是 NUL 字节"
ef317cd5 5780
276ceeaa 5781#: builtin/config.c:84
1b7f4a34
JX
5782msgid "show variable names only"
5783msgstr "只显示变量名"
5784
276ceeaa 5785#: builtin/config.c:85
ef317cd5 5786msgid "respect include directives on lookup"
07432cef 5787msgstr "查询时参照 include 指令递归查找"
ef317cd5 5788
276ceeaa
JX
5789#: builtin/config.c:86
5790msgid "show origin of config (file, standard input, blob, command line)"
5791msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
5792
5793#: builtin/config.c:328
220c313c 5794msgid "unable to parse default color value"
160fb2b2 5795msgstr "不能解析默认颜色值"
220c313c 5796
276ceeaa 5797#: builtin/config.c:469
220c313c
JX
5798#, c-format
5799msgid ""
5800"# This is Git's per-user configuration file.\n"
7aea43ff 5801"[user]\n"
220c313c 5802"# Please adapt and uncomment the following lines:\n"
7aea43ff 5803"#\tname = %s\n"
220c313c
JX
5804"#\temail = %s\n"
5805msgstr ""
5806"# This is Git's per-user configuration file.\n"
7aea43ff 5807"[user]\n"
220c313c 5808"# Please adapt and uncomment the following lines:\n"
7aea43ff 5809"#\tname = %s\n"
220c313c
JX
5810"#\temail = %s\n"
5811
276ceeaa 5812#: builtin/config.c:611
220c313c
JX
5813#, c-format
5814msgid "cannot create configuration file %s"
5815msgstr "不能创建配置文件 %s"
5816
94550ed3 5817#: builtin/count-objects.c:77
4dcdc3d8
JX
5818msgid "git count-objects [-v] [-H | --human-readable]"
5819msgstr "git count-objects [-v] [-H | --human-readable]"
5820
94550ed3 5821#: builtin/count-objects.c:87
4dcdc3d8
JX
5822msgid "print sizes in human readable format"
5823msgstr "以用户可读的格式显示大小"
ef317cd5 5824
220c313c 5825#: builtin/describe.c:17
814ff314
JX
5826msgid "git describe [<options>] [<commit-ish>...]"
5827msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 5828
220c313c 5829#: builtin/describe.c:18
814ff314
JX
5830msgid "git describe [<options>] --dirty"
5831msgstr "git describe [<选项>] --dirty"
ef317cd5 5832
220c313c 5833#: builtin/describe.c:217
c04f5ac3
JX
5834#, c-format
5835msgid "annotated tag %s not available"
55a16ee4 5836msgstr "附注标签 %s 无效"
c04f5ac3 5837
220c313c 5838#: builtin/describe.c:221
c04f5ac3
JX
5839#, c-format
5840msgid "annotated tag %s has no embedded name"
55a16ee4 5841msgstr "附注标签 %s 没有嵌入名称"
c04f5ac3 5842
220c313c 5843#: builtin/describe.c:223
c04f5ac3
JX
5844#, c-format
5845msgid "tag '%s' is really '%s' here"
55a16ee4 5846msgstr "标签 '%s' 的确是在 '%s'"
c04f5ac3 5847
1b7f4a34 5848#: builtin/describe.c:250 builtin/log.c:459
c04f5ac3
JX
5849#, c-format
5850msgid "Not a valid object name %s"
5851msgstr "不是一个有效的对象名 %s"
5852
220c313c 5853#: builtin/describe.c:253
c04f5ac3
JX
5854#, c-format
5855msgid "%s is not a valid '%s' object"
5856msgstr "%s 不是一个有效的 '%s' 对象"
5857
220c313c 5858#: builtin/describe.c:270
c04f5ac3
JX
5859#, c-format
5860msgid "no tag exactly matches '%s'"
55a16ee4 5861msgstr "没有标签准确匹配 '%s'"
c04f5ac3 5862
220c313c 5863#: builtin/describe.c:272
c04f5ac3
JX
5864#, c-format
5865msgid "searching to describe %s\n"
5866msgstr "搜索描述 %s\n"
5867
220c313c 5868#: builtin/describe.c:319
c04f5ac3
JX
5869#, c-format
5870msgid "finished search at %s\n"
5871msgstr "完成搜索 %s\n"
5872
220c313c 5873#: builtin/describe.c:346
c04f5ac3
JX
5874#, c-format
5875msgid ""
5876"No annotated tags can describe '%s'.\n"
5877"However, there were unannotated tags: try --tags."
5878msgstr ""
55a16ee4
RC
5879"没有附注标签能描述 '%s'。\n"
5880"然而,存在未附注标签:尝试 --tags。"
c04f5ac3 5881
220c313c 5882#: builtin/describe.c:350
c04f5ac3
JX
5883#, c-format
5884msgid ""
5885"No tags can describe '%s'.\n"
5886"Try --always, or create some tags."
5887msgstr ""
55a16ee4
RC
5888"没有标签能描述 '%s'。\n"
5889"尝试 --always,或者创建一些标签。"
c04f5ac3 5890
220c313c 5891#: builtin/describe.c:371
c04f5ac3
JX
5892#, c-format
5893msgid "traversed %lu commits\n"
5894msgstr "已遍历 %lu 个提交\n"
5895
220c313c 5896#: builtin/describe.c:374
c04f5ac3
JX
5897#, c-format
5898msgid ""
5899"more than %i tags found; listed %i most recent\n"
5900"gave up search at %s\n"
5901msgstr ""
55a16ee4 5902"发现多于 %i 个标签,列出最近的 %i 个\n"
90e6ef53 5903"在 %s 放弃搜索\n"
c04f5ac3 5904
220c313c 5905#: builtin/describe.c:396
ef317cd5 5906msgid "find the tag that comes after the commit"
55a16ee4 5907msgstr "寻找该提交之后的标签"
ef317cd5 5908
220c313c 5909#: builtin/describe.c:397
ef317cd5 5910msgid "debug search strategy on stderr"
07432cef 5911msgstr "在标准错误上调试搜索策略"
ef317cd5 5912
220c313c 5913#: builtin/describe.c:398
1003b3a5
JX
5914msgid "use any ref"
5915msgstr "使用任意引用"
5916
220c313c 5917#: builtin/describe.c:399
1003b3a5 5918msgid "use any tag, even unannotated"
55a16ee4 5919msgstr "使用任意标签,即使未附带注释"
ef317cd5 5920
220c313c 5921#: builtin/describe.c:400
ef317cd5 5922msgid "always use long format"
07432cef 5923msgstr "始终使用长提交号格式"
ef317cd5 5924
220c313c 5925#: builtin/describe.c:401
2e8451e8
JX
5926msgid "only follow first parent"
5927msgstr "只跟随第一个父提交"
5928
220c313c 5929#: builtin/describe.c:404
ef317cd5 5930msgid "only output exact matches"
07432cef 5931msgstr "只输出精确匹配"
ef317cd5 5932
220c313c 5933#: builtin/describe.c:406
ef317cd5 5934msgid "consider <n> most recent tags (default: 10)"
55a16ee4 5935msgstr "考虑最近 <n> 个标签(默认:10)"
ef317cd5 5936
220c313c 5937#: builtin/describe.c:408
ef317cd5 5938msgid "only consider tags matching <pattern>"
55a16ee4 5939msgstr "只考虑匹配 <模式> 的标签"
ef317cd5 5940
94550ed3 5941#: builtin/describe.c:410 builtin/name-rev.c:314
ef317cd5 5942msgid "show abbreviated commit object as fallback"
07432cef 5943msgstr "显示简写的提交号作为后备"
ef317cd5 5944
220c313c 5945#: builtin/describe.c:411
ef317cd5 5946msgid "mark"
07432cef 5947msgstr "标记"
ef317cd5 5948
220c313c 5949#: builtin/describe.c:412
ef317cd5 5950msgid "append <mark> on dirty working tree (default: \"-dirty\")"
160fb2b2 5951msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
ef317cd5 5952
220c313c 5953#: builtin/describe.c:430
c04f5ac3
JX
5954msgid "--long is incompatible with --abbrev=0"
5955msgstr "--long 与 --abbrev=0 不兼容"
5956
220c313c 5957#: builtin/describe.c:456
c04f5ac3 5958msgid "No names found, cannot describe anything."
90e6ef53 5959msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 5960
220c313c 5961#: builtin/describe.c:476
a8a5406a 5962msgid "--dirty is incompatible with commit-ishes"
649900bc 5963msgstr "--dirty 不能与提交同时使用"
c04f5ac3 5964
220c313c 5965#: builtin/diff.c:86
c04f5ac3
JX
5966#, c-format
5967msgid "'%s': not a regular file or symlink"
5968msgstr "'%s':不是一个正规文件或符号链接"
5969
220c313c 5970#: builtin/diff.c:237
c04f5ac3
JX
5971#, c-format
5972msgid "invalid option: %s"
5973msgstr "无效选项:%s"
5974
220c313c 5975#: builtin/diff.c:358
c04f5ac3 5976msgid "Not a git repository"
160fb2b2 5977msgstr "不是一个 git 仓库"
c04f5ac3 5978
220c313c 5979#: builtin/diff.c:401
c04f5ac3
JX
5980#, c-format
5981msgid "invalid object '%s' given."
5982msgstr "提供了无效对象 '%s'。"
5983
220c313c 5984#: builtin/diff.c:410
c04f5ac3
JX
5985#, c-format
5986msgid "more than two blobs given: '%s'"
160fb2b2 5987msgstr "提供了超过两个数据对象:'%s'"
c04f5ac3 5988
220c313c 5989#: builtin/diff.c:417
c04f5ac3
JX
5990#, c-format
5991msgid "unhandled object '%s' given."
6c94aba5 5992msgstr "无法处理的对象 '%s'。"
c04f5ac3 5993
1b7f4a34 5994#: builtin/fast-export.c:25
ef317cd5 5995msgid "git fast-export [rev-list-opts]"
07432cef 5996msgstr "git fast-export [rev-list-opts]"
ef317cd5 5997
1b7f4a34 5998#: builtin/fast-export.c:980
ef317cd5 5999msgid "show progress after <n> objects"
07432cef 6000msgstr "在 <n> 个对象之后显示进度"
ef317cd5 6001
1b7f4a34 6002#: builtin/fast-export.c:982
ef317cd5 6003msgid "select handling of signed tags"
55a16ee4 6004msgstr "选择如何处理签名标签"
ef317cd5 6005
1b7f4a34 6006#: builtin/fast-export.c:985
ef317cd5 6007msgid "select handling of tags that tag filtered objects"
55a16ee4 6008msgstr "选择当标签指向被过滤对象时该标签的处理方式"
ef317cd5 6009
1b7f4a34 6010#: builtin/fast-export.c:988
ef317cd5 6011msgid "Dump marks to this file"
07432cef 6012msgstr "把标记存储到这个文件"
ef317cd5 6013
1b7f4a34 6014#: builtin/fast-export.c:990
ef317cd5 6015msgid "Import marks from this file"
07432cef 6016msgstr "从这个文件导入标记"
ef317cd5 6017
1b7f4a34 6018#: builtin/fast-export.c:992
ef317cd5 6019msgid "Fake a tagger when tags lack one"
55a16ee4 6020msgstr "当标签缺少标记者字段时,假装提供一个"
ef317cd5 6021
1b7f4a34 6022#: builtin/fast-export.c:994
ef317cd5 6023msgid "Output full tree for each commit"
07432cef 6024msgstr "每次提交都输出整个树"
ef317cd5 6025
1b7f4a34 6026#: builtin/fast-export.c:996
ef317cd5 6027msgid "Use the done feature to terminate the stream"
07432cef 6028msgstr "使用 done 功能来终止流"
ef317cd5 6029
1b7f4a34 6030#: builtin/fast-export.c:997
ef317cd5 6031msgid "Skip output of blob data"
07432cef 6032msgstr "跳过数据对象的输出"
ef317cd5 6033
1b7f4a34 6034#: builtin/fast-export.c:998
6acbf033 6035msgid "refspec"
160fb2b2 6036msgstr "引用规格"
6acbf033 6037
1b7f4a34 6038#: builtin/fast-export.c:999
6acbf033 6039msgid "Apply refspec to exported refs"
160fb2b2 6040msgstr "对导出的引用应用引用规格"
6acbf033 6041
1b7f4a34 6042#: builtin/fast-export.c:1000
220c313c
JX
6043msgid "anonymize output"
6044msgstr "匿名输出"
6045
1b7f4a34 6046#: builtin/fetch.c:20
ef317cd5 6047msgid "git fetch [<options>] [<repository> [<refspec>...]]"
160fb2b2 6048msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
ef317cd5 6049
1b7f4a34 6050#: builtin/fetch.c:21
ef317cd5 6051msgid "git fetch [<options>] <group>"
07432cef 6052msgstr "git fetch [<选项>] <组>"
ef317cd5 6053
1b7f4a34 6054#: builtin/fetch.c:22
ef317cd5 6055msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
160fb2b2 6056msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
ef317cd5 6057
1b7f4a34 6058#: builtin/fetch.c:23
ef317cd5 6059msgid "git fetch --all [<options>]"
07432cef 6060msgstr "git fetch --all [<选项>]"
ef317cd5 6061
276ceeaa 6062#: builtin/fetch.c:92 builtin/pull.c:166
ef317cd5 6063msgid "fetch from all remotes"
07432cef 6064msgstr "从所有的远程抓取"
ef317cd5 6065
276ceeaa 6066#: builtin/fetch.c:94 builtin/pull.c:169
ef317cd5 6067msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 6068msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 6069
276ceeaa 6070#: builtin/fetch.c:96 builtin/pull.c:172
ef317cd5 6071msgid "path to upload pack on remote end"
07432cef 6072msgstr "上传包到远程的路径"
ef317cd5 6073
276ceeaa 6074#: builtin/fetch.c:97 builtin/pull.c:174
ef317cd5 6075msgid "force overwrite of local branch"
07432cef 6076msgstr "强制覆盖本地分支"
ef317cd5 6077
276ceeaa 6078#: builtin/fetch.c:99
ef317cd5 6079msgid "fetch from multiple remotes"
07432cef 6080msgstr "从多个远程抓取"
ef317cd5 6081
276ceeaa 6082#: builtin/fetch.c:101 builtin/pull.c:176
ef317cd5 6083msgid "fetch all tags and associated objects"
55a16ee4 6084msgstr "抓取所有的标签和关联对象"
ef317cd5 6085
276ceeaa 6086#: builtin/fetch.c:103
ef317cd5 6087msgid "do not fetch all tags (--no-tags)"
55a16ee4 6088msgstr "不抓取任何标签(--no-tags)"
ef317cd5 6089
276ceeaa
JX
6090#: builtin/fetch.c:105
6091msgid "number of submodules fetched in parallel"
6092msgstr "子模组获取的并发数"
6093
6094#: builtin/fetch.c:107 builtin/pull.c:179
ef317cd5 6095msgid "prune remote-tracking branches no longer on remote"
07432cef 6096msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 6097
07432cef 6098# 译者:可选值,不能翻译
276ceeaa 6099#: builtin/fetch.c:108 builtin/pull.c:182
ef317cd5 6100msgid "on-demand"
07432cef 6101msgstr "on-demand"
ef317cd5 6102
276ceeaa 6103#: builtin/fetch.c:109 builtin/pull.c:183
ef317cd5 6104msgid "control recursive fetching of submodules"
07432cef 6105msgstr "控制子模组的递归抓取"
ef317cd5 6106
276ceeaa 6107#: builtin/fetch.c:113 builtin/pull.c:191
ef317cd5 6108msgid "keep downloaded pack"
07432cef 6109msgstr "保持下载包"
ef317cd5 6110
276ceeaa 6111#: builtin/fetch.c:115
ef317cd5 6112msgid "allow updating of HEAD ref"
07432cef 6113msgstr "允许更新 HEAD 引用"
ef317cd5 6114
276ceeaa 6115#: builtin/fetch.c:118 builtin/pull.c:194
ef317cd5 6116msgid "deepen history of shallow clone"
07432cef 6117msgstr "深化浅克隆的历史"
ef317cd5 6118
276ceeaa 6119#: builtin/fetch.c:120 builtin/pull.c:197
a77c07d9 6120msgid "convert to a complete repository"
160fb2b2 6121msgstr "转换为一个完整的仓库"
a77c07d9 6122
276ceeaa 6123#: builtin/fetch.c:122 builtin/log.c:1236
ef317cd5 6124msgid "dir"
07432cef 6125msgstr "目录"
ef317cd5 6126
276ceeaa 6127#: builtin/fetch.c:123
ef317cd5 6128msgid "prepend this to submodule path output"
07432cef 6129msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 6130
276ceeaa 6131#: builtin/fetch.c:126
ef317cd5 6132msgid "default mode for recursion"
07432cef 6133msgstr "递归的默认模式"
ef317cd5 6134
276ceeaa 6135#: builtin/fetch.c:128 builtin/pull.c:200
cfff71a9
JX
6136msgid "accept refs that update .git/shallow"
6137msgstr "接受更新 .git/shallow 的引用"
6138
276ceeaa 6139#: builtin/fetch.c:129 builtin/pull.c:202
6acbf033
JX
6140msgid "refmap"
6141msgstr "引用映射"
6142
276ceeaa 6143#: builtin/fetch.c:130 builtin/pull.c:203
6acbf033
JX
6144msgid "specify fetch refmap"
6145msgstr "指定获取操作的引用映射"
6146
276ceeaa 6147#: builtin/fetch.c:386
c04f5ac3
JX
6148msgid "Couldn't find remote ref HEAD"
6149msgstr "无法发现远程 HEAD 引用"
6150
276ceeaa 6151#: builtin/fetch.c:466
c04f5ac3
JX
6152#, c-format
6153msgid "object %s not found"
6154msgstr "对象 %s 未发现"
6155
276ceeaa 6156#: builtin/fetch.c:471
c04f5ac3
JX
6157msgid "[up to date]"
6158msgstr "[最新]"
6159
276ceeaa 6160#: builtin/fetch.c:485
c04f5ac3
JX
6161#, c-format
6162msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
6163msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
6164
276ceeaa 6165#: builtin/fetch.c:486 builtin/fetch.c:574
c04f5ac3
JX
6166msgid "[rejected]"
6167msgstr "[已拒绝]"
6168
276ceeaa 6169#: builtin/fetch.c:497
c04f5ac3 6170msgid "[tag update]"
55a16ee4 6171msgstr "[标签更新]"
c04f5ac3 6172
90e6ef53 6173# 译者:注意保持前导空格
276ceeaa 6174#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
c04f5ac3
JX
6175msgid " (unable to update local ref)"
6176msgstr " (不能更新本地引用)"
6177
276ceeaa 6178#: builtin/fetch.c:517
c04f5ac3 6179msgid "[new tag]"
55a16ee4 6180msgstr "[新标签]"
c04f5ac3 6181
276ceeaa 6182#: builtin/fetch.c:520
c04f5ac3
JX
6183msgid "[new branch]"
6184msgstr "[新分支]"
6185
276ceeaa 6186#: builtin/fetch.c:523
170e9899
JX
6187msgid "[new ref]"
6188msgstr "[新引用]"
6189
276ceeaa 6190#: builtin/fetch.c:569
c04f5ac3
JX
6191msgid "unable to update local ref"
6192msgstr "不能更新本地引用"
6193
276ceeaa 6194#: builtin/fetch.c:569
c04f5ac3
JX
6195msgid "forced update"
6196msgstr "强制更新"
6197
276ceeaa 6198#: builtin/fetch.c:576
c04f5ac3 6199msgid "(non-fast-forward)"
90e6ef53 6200msgstr "(非快进式)"
c04f5ac3 6201
276ceeaa 6202#: builtin/fetch.c:610 builtin/fetch.c:851
c04f5ac3
JX
6203#, c-format
6204msgid "cannot open %s: %s\n"
6205msgstr "无法打开 %s:%s\n"
6206
276ceeaa 6207#: builtin/fetch.c:619
c04f5ac3
JX
6208#, c-format
6209msgid "%s did not send all necessary objects\n"
6210msgstr "%s 未发送所有必须的对象\n"
6211
276ceeaa 6212#: builtin/fetch.c:637
cfff71a9
JX
6213#, c-format
6214msgid "reject %s because shallow roots are not allowed to be updated"
6215msgstr "拒绝 %s 因为浅克隆不允许被更新"
6216
276ceeaa 6217#: builtin/fetch.c:724 builtin/fetch.c:816
c04f5ac3
JX
6218#, c-format
6219msgid "From %.*s\n"
6220msgstr "来自 %.*s\n"
6221
276ceeaa 6222#: builtin/fetch.c:735
c04f5ac3
JX
6223#, c-format
6224msgid ""
6225"some local refs could not be updated; try running\n"
6226" 'git remote prune %s' to remove any old, conflicting branches"
6227msgstr ""
6228"一些本地引用不能被更新;尝试运行\n"
6229" 'git remote prune %s' 来删除旧的、有冲突的分支"
6230
90e6ef53 6231# 译者:注意保持前导空格
276ceeaa 6232#: builtin/fetch.c:787
81809b99 6233#, c-format
8ada9598 6234msgid " (%s will become dangling)"
07432cef 6235msgstr " (%s 将成为摇摆状态)"
c04f5ac3 6236
90e6ef53 6237# 译者:注意保持前导空格
276ceeaa 6238#: builtin/fetch.c:788
81809b99 6239#, c-format
8ada9598 6240msgid " (%s has become dangling)"
07432cef 6241msgstr " (%s 已成为摇摆状态)"
c04f5ac3 6242
276ceeaa 6243#: builtin/fetch.c:820
c04f5ac3
JX
6244msgid "[deleted]"
6245msgstr "[已删除]"
6246
276ceeaa 6247#: builtin/fetch.c:821 builtin/remote.c:1025
c04f5ac3
JX
6248msgid "(none)"
6249msgstr "(无)"
6250
276ceeaa 6251#: builtin/fetch.c:841
c04f5ac3
JX
6252#, c-format
6253msgid "Refusing to fetch into current branch %s of non-bare repository"
160fb2b2 6254msgstr "拒绝获取到非纯仓库的当前分支 %s"
c04f5ac3 6255
276ceeaa 6256#: builtin/fetch.c:860
c04f5ac3
JX
6257#, c-format
6258msgid "Option \"%s\" value \"%s\" is not valid for %s"
6259msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
6260
276ceeaa 6261#: builtin/fetch.c:863
c04f5ac3
JX
6262#, c-format
6263msgid "Option \"%s\" is ignored for %s\n"
81809b99 6264msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 6265
276ceeaa 6266#: builtin/fetch.c:920
90314792
JX
6267#, c-format
6268msgid "Don't know how to fetch from %s"
6269msgstr "不知道如何从 %s 获取"
6270
276ceeaa 6271#: builtin/fetch.c:1080
c04f5ac3
JX
6272#, c-format
6273msgid "Fetching %s\n"
d4a8e00b 6274msgstr "正在获取 %s\n"
c04f5ac3 6275
276ceeaa 6276#: builtin/fetch.c:1082 builtin/remote.c:96
c04f5ac3
JX
6277#, c-format
6278msgid "Could not fetch %s"
6279msgstr "不能获取 %s"
6280
276ceeaa 6281#: builtin/fetch.c:1100
c04f5ac3
JX
6282msgid ""
6283"No remote repository specified. Please, specify either a URL or a\n"
6284"remote name from which new revisions should be fetched."
4375c10e 6285msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
c04f5ac3 6286
276ceeaa 6287#: builtin/fetch.c:1123
c04f5ac3 6288msgid "You need to specify a tag name."
55a16ee4 6289msgstr "您需要指定一个标签名称。"
c04f5ac3 6290
276ceeaa 6291#: builtin/fetch.c:1165
a77c07d9
JX
6292msgid "--depth and --unshallow cannot be used together"
6293msgstr "--depth 和 --unshallow 不能同时使用"
6294
276ceeaa 6295#: builtin/fetch.c:1167
a77c07d9 6296msgid "--unshallow on a complete repository does not make sense"
160fb2b2 6297msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
a77c07d9 6298
276ceeaa 6299#: builtin/fetch.c:1187
c04f5ac3 6300msgid "fetch --all does not take a repository argument"
160fb2b2 6301msgstr "fetch --all 不能带一个仓库参数"
c04f5ac3 6302
276ceeaa 6303#: builtin/fetch.c:1189
c04f5ac3 6304msgid "fetch --all does not make sense with refspecs"
160fb2b2 6305msgstr "fetch --all 带引用规格没有任何意义"
c04f5ac3 6306
276ceeaa 6307#: builtin/fetch.c:1200
c04f5ac3
JX
6308#, c-format
6309msgid "No such remote or remote group: %s"
6310msgstr "没有这样的远程或远程组:%s"
6311
276ceeaa 6312#: builtin/fetch.c:1208
c04f5ac3 6313msgid "Fetching a group and specifying refspecs does not make sense"
160fb2b2 6314msgstr "获取组并指定引用规格没有意义"
c04f5ac3 6315
1b7f4a34 6316#: builtin/fmt-merge-msg.c:14
814ff314
JX
6317msgid ""
6318"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
6319msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 6320
94550ed3 6321#: builtin/fmt-merge-msg.c:667
ef317cd5 6322msgid "populate log with at most <n> entries from shortlog"
07432cef 6323msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 6324
94550ed3 6325#: builtin/fmt-merge-msg.c:670
ef317cd5 6326msgid "alias for --log (deprecated)"
07432cef 6327msgstr "参数 --log 的别名(已弃用)"
ef317cd5 6328
94550ed3 6329#: builtin/fmt-merge-msg.c:673
ef317cd5 6330msgid "text"
07432cef 6331msgstr "文本"
ef317cd5 6332
94550ed3 6333#: builtin/fmt-merge-msg.c:674
ef317cd5 6334msgid "use <text> as start of message"
07432cef 6335msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 6336
94550ed3 6337#: builtin/fmt-merge-msg.c:675
ef317cd5 6338msgid "file to read from"
07432cef 6339msgstr "从文件中读取"
ef317cd5 6340
1b7f4a34 6341#: builtin/for-each-ref.c:9
814ff314
JX
6342msgid "git for-each-ref [<options>] [<pattern>]"
6343msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 6344
94550ed3
JX
6345#: builtin/for-each-ref.c:10
6346msgid "git for-each-ref [--points-at <object>]"
6347msgstr "git for-each-ref [--points-at <对象>]"
6348
6349#: builtin/for-each-ref.c:11
6350msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
6351msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
6352
6353#: builtin/for-each-ref.c:12
6354msgid "git for-each-ref [--contains [<object>]]"
6355msgstr "git for-each-ref [--contains [<对象>]]"
6356
6357#: builtin/for-each-ref.c:27
ef317cd5 6358msgid "quote placeholders suitably for shells"
07432cef 6359msgstr "引用占位符适用于 shells"
ef317cd5 6360
94550ed3 6361#: builtin/for-each-ref.c:29
ef317cd5 6362msgid "quote placeholders suitably for perl"
07432cef 6363msgstr "引用占位符适用于 perl"
ef317cd5 6364
94550ed3 6365#: builtin/for-each-ref.c:31
ef317cd5 6366msgid "quote placeholders suitably for python"
07432cef 6367msgstr "引用占位符适用于 python"
ef317cd5 6368
94550ed3 6369#: builtin/for-each-ref.c:33
04cb2f28
JX
6370msgid "quote placeholders suitably for Tcl"
6371msgstr "引用占位符适用于 Tcl"
ef317cd5 6372
94550ed3 6373#: builtin/for-each-ref.c:36
ef317cd5 6374msgid "show only <n> matched refs"
07432cef 6375msgstr "只显示 <n> 个匹配的引用"
ef317cd5 6376
94550ed3 6377#: builtin/for-each-ref.c:37 builtin/tag.c:372
ef317cd5 6378msgid "format to use for the output"
07432cef 6379msgstr "输出格式"
ef317cd5 6380
94550ed3
JX
6381#: builtin/for-each-ref.c:41
6382msgid "print only refs which points at the given object"
6383msgstr "只打印指向给定对象的引用"
ef317cd5 6384
94550ed3
JX
6385#: builtin/for-each-ref.c:43
6386msgid "print only refs that are merged"
6387msgstr "只打印已经合并的引用"
6388
6389#: builtin/for-each-ref.c:44
6390msgid "print only refs that are not merged"
6391msgstr "只打印没有合并的引用"
ef317cd5 6392
94550ed3
JX
6393#: builtin/for-each-ref.c:45
6394msgid "print only refs which contain the commit"
6395msgstr "只打印包含该提交的引用"
6396
6397#: builtin/fsck.c:156 builtin/prune.c:140
6c94aba5
JX
6398msgid "Checking connectivity"
6399msgstr "检查连接中"
6400
94550ed3 6401#: builtin/fsck.c:486
6c94aba5
JX
6402msgid "Checking object directories"
6403msgstr "检查对象目录中"
6404
94550ed3 6405#: builtin/fsck.c:553
814ff314
JX
6406msgid "git fsck [<options>] [<object>...]"
6407msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 6408
94550ed3 6409#: builtin/fsck.c:559
ef317cd5 6410msgid "show unreachable objects"
07432cef 6411msgstr "显示不可达的对象"
ef317cd5 6412
94550ed3 6413#: builtin/fsck.c:560
ef317cd5 6414msgid "show dangling objects"
07432cef 6415msgstr "显示摇摆的对象"
ef317cd5 6416
94550ed3 6417#: builtin/fsck.c:561
ef317cd5 6418msgid "report tags"
55a16ee4 6419msgstr "报告标签"
ef317cd5 6420
94550ed3 6421#: builtin/fsck.c:562
ef317cd5 6422msgid "report root nodes"
07432cef 6423msgstr "报告根节点"
ef317cd5 6424
94550ed3 6425#: builtin/fsck.c:563
ef317cd5 6426msgid "make index objects head nodes"
07432cef 6427msgstr "将索引亦作为检查的头节点"
ef317cd5 6428
94550ed3 6429#: builtin/fsck.c:564
ef317cd5 6430msgid "make reflogs head nodes (default)"
07432cef 6431msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 6432
94550ed3 6433#: builtin/fsck.c:565
ef317cd5 6434msgid "also consider packs and alternate objects"
07432cef 6435msgstr "也考虑包和备用对象"
ef317cd5 6436
94550ed3 6437#: builtin/fsck.c:566
1b7f4a34
JX
6438msgid "check only connectivity"
6439msgstr "仅检查连通性"
6440
94550ed3 6441#: builtin/fsck.c:567
ef317cd5 6442msgid "enable more strict checking"
07432cef 6443msgstr "启用更严格的检查"
ef317cd5 6444
94550ed3 6445#: builtin/fsck.c:569
ef317cd5 6446msgid "write dangling objects in .git/lost-found"
07432cef 6447msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5 6448
94550ed3 6449#: builtin/fsck.c:570 builtin/prune.c:107
ef317cd5 6450msgid "show progress"
07432cef 6451msgstr "显示进度"
ef317cd5 6452
94550ed3 6453#: builtin/fsck.c:631
6c94aba5
JX
6454msgid "Checking objects"
6455msgstr "检查对象中"
6456
1b7f4a34 6457#: builtin/gc.c:25
814ff314
JX
6458msgid "git gc [<options>]"
6459msgstr "git gc [<选项>]"
ef317cd5 6460
94550ed3 6461#: builtin/gc.c:72
c04f5ac3 6462#, c-format
7aea43ff
JX
6463msgid "Invalid %s: '%s'"
6464msgstr "无效 %s:'%s'"
c04f5ac3 6465
94550ed3 6466#: builtin/gc.c:139
c04f5ac3
JX
6467#, c-format
6468msgid "insanely long object directory %.*s"
6469msgstr "不正常的长对象目录 %.*s"
6470
94550ed3
JX
6471#: builtin/gc.c:290
6472#, c-format
6473msgid ""
6474"The last gc run reported the following. Please correct the root cause\n"
6475"and remove %s.\n"
6476"Automatic cleanup will not be performed until the file is removed.\n"
6477"\n"
6478"%s"
6479msgstr ""
6480"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
6481"在该文件被删除之前,自动清理将不会执行。\n"
6482"\n"
6483"%s"
6484
6485#: builtin/gc.c:327
ef317cd5 6486msgid "prune unreferenced objects"
07432cef 6487msgstr "清除未引用的对象"
ef317cd5 6488
94550ed3 6489#: builtin/gc.c:329
ef317cd5 6490msgid "be more thorough (increased runtime)"
07432cef 6491msgstr "更彻底(增加运行时间)"
ef317cd5 6492
94550ed3 6493#: builtin/gc.c:330
ef317cd5 6494msgid "enable auto-gc mode"
07432cef 6495msgstr "启用自动垃圾回收模式"
ef317cd5 6496
94550ed3 6497#: builtin/gc.c:331
90314792
JX
6498msgid "force running gc even if there may be another gc running"
6499msgstr "强制执行 gc 即使另外一个 gc 正在执行"
6500
94550ed3 6501#: builtin/gc.c:373
c04f5ac3 6502#, c-format
6c94aba5 6503msgid "Auto packing the repository in background for optimum performance.\n"
160fb2b2 6504msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6c94aba5 6505
94550ed3 6506#: builtin/gc.c:375
6c94aba5
JX
6507#, c-format
6508msgid "Auto packing the repository for optimum performance.\n"
160fb2b2 6509msgstr "自动打包仓库以求最佳性能。\n"
6c94aba5 6510
94550ed3 6511#: builtin/gc.c:376
6c94aba5
JX
6512#, c-format
6513msgid "See \"git help gc\" for manual housekeeping.\n"
6514msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 6515
94550ed3 6516#: builtin/gc.c:397
90314792
JX
6517#, c-format
6518msgid ""
6519"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
6520msgstr ""
6521"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
6522
94550ed3 6523#: builtin/gc.c:441
c04f5ac3
JX
6524msgid ""
6525"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 6526msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 6527
90314792 6528#: builtin/grep.c:23
814ff314
JX
6529msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
6530msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 6531
276ceeaa 6532#: builtin/grep.c:219
c04f5ac3
JX
6533#, c-format
6534msgid "grep: failed to create thread: %s"
90e6ef53 6535msgstr "grep:无法创建线程:%s"
c04f5ac3 6536
276ceeaa
JX
6537#: builtin/grep.c:277
6538#, c-format
6539msgid "invalid number of threads specified (%d) for %s"
6540msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
6541
6542#: builtin/grep.c:452 builtin/grep.c:487
c04f5ac3
JX
6543#, c-format
6544msgid "unable to read tree (%s)"
90e6ef53 6545msgstr "无法读取树(%s)"
c04f5ac3 6546
276ceeaa 6547#: builtin/grep.c:502
c04f5ac3
JX
6548#, c-format
6549msgid "unable to grep from object of type %s"
6550msgstr "无法抓取来自于 %s 类型的对象"
6551
276ceeaa 6552#: builtin/grep.c:558
c04f5ac3
JX
6553#, c-format
6554msgid "switch `%c' expects a numerical value"
6555msgstr "开关 `%c' 期望一个数字值"
6556
276ceeaa 6557#: builtin/grep.c:575
c04f5ac3
JX
6558#, c-format
6559msgid "cannot open '%s'"
6560msgstr "不能打开 '%s'"
6561
276ceeaa 6562#: builtin/grep.c:644
ef317cd5 6563msgid "search in index instead of in the work tree"
07432cef 6564msgstr "在索引区搜索而不是在工作区"
ef317cd5 6565
276ceeaa 6566#: builtin/grep.c:646
ef317cd5 6567msgid "find in contents not managed by git"
07432cef 6568msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
6569
6570# 译者:中文字符串拼接,可删除前导空格
276ceeaa 6571#: builtin/grep.c:648
ef317cd5 6572msgid "search in both tracked and untracked files"
07432cef 6573msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 6574
276ceeaa 6575#: builtin/grep.c:650
814ff314
JX
6576msgid "ignore files specified via '.gitignore'"
6577msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 6578
276ceeaa 6579#: builtin/grep.c:653
ef317cd5 6580msgid "show non-matching lines"
07432cef 6581msgstr "显示未匹配的行"
ef317cd5 6582
276ceeaa 6583#: builtin/grep.c:655
ef317cd5 6584msgid "case insensitive matching"
07432cef 6585msgstr "不区分大小写匹配"
ef317cd5 6586
276ceeaa 6587#: builtin/grep.c:657
ef317cd5 6588msgid "match patterns only at word boundaries"
07432cef 6589msgstr "只在单词边界匹配模式"
ef317cd5 6590
276ceeaa 6591#: builtin/grep.c:659
ef317cd5 6592msgid "process binary files as text"
07432cef 6593msgstr "把二进制文件当做文本处理"
ef317cd5 6594
276ceeaa 6595#: builtin/grep.c:661
ef317cd5 6596msgid "don't match patterns in binary files"
07432cef 6597msgstr "不在二进制文件中匹配模式"
ef317cd5 6598
276ceeaa 6599#: builtin/grep.c:664
90314792
JX
6600msgid "process binary files with textconv filters"
6601msgstr "用 textconv 过滤器处理二进制文件"
6602
276ceeaa 6603#: builtin/grep.c:666
ef317cd5 6604msgid "descend at most <depth> levels"
07432cef 6605msgstr "最多以指定的深度向下寻找"
ef317cd5 6606
276ceeaa 6607#: builtin/grep.c:670
ef317cd5 6608msgid "use extended POSIX regular expressions"
07432cef 6609msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 6610
276ceeaa 6611#: builtin/grep.c:673
ef317cd5 6612msgid "use basic POSIX regular expressions (default)"
07432cef 6613msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 6614
276ceeaa 6615#: builtin/grep.c:676
ef317cd5 6616msgid "interpret patterns as fixed strings"
07432cef 6617msgstr "把模式解析为固定的字符串"
ef317cd5 6618
276ceeaa 6619#: builtin/grep.c:679
ef317cd5 6620msgid "use Perl-compatible regular expressions"
07432cef 6621msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 6622
276ceeaa 6623#: builtin/grep.c:682
ef317cd5 6624msgid "show line numbers"
07432cef 6625msgstr "显示行号"
ef317cd5 6626
276ceeaa 6627#: builtin/grep.c:683
ef317cd5 6628msgid "don't show filenames"
07432cef 6629msgstr "不显示文件名"
ef317cd5 6630
276ceeaa 6631#: builtin/grep.c:684
ef317cd5 6632msgid "show filenames"
07432cef 6633msgstr "显示文件名"
ef317cd5 6634
276ceeaa 6635#: builtin/grep.c:686
ef317cd5 6636msgid "show filenames relative to top directory"
07432cef 6637msgstr "显示相对于顶级目录的文件名"
ef317cd5 6638
276ceeaa 6639#: builtin/grep.c:688
ef317cd5 6640msgid "show only filenames instead of matching lines"
07432cef 6641msgstr "只显示文件名而不显示匹配的行"
ef317cd5 6642
276ceeaa 6643#: builtin/grep.c:690
ef317cd5 6644msgid "synonym for --files-with-matches"
07432cef 6645msgstr "和 --files-with-matches 同义"
ef317cd5 6646
276ceeaa 6647#: builtin/grep.c:693
ef317cd5 6648msgid "show only the names of files without match"
07432cef 6649msgstr "只显示未匹配的文件名"
ef317cd5 6650
276ceeaa 6651#: builtin/grep.c:695
ef317cd5 6652msgid "print NUL after filenames"
07432cef 6653msgstr "在文件名后输出 NUL 字符"
ef317cd5 6654
276ceeaa 6655#: builtin/grep.c:697
ef317cd5 6656msgid "show the number of matches instead of matching lines"
07432cef 6657msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 6658
276ceeaa 6659#: builtin/grep.c:698
ef317cd5 6660msgid "highlight matches"
07432cef 6661msgstr "高亮显示匹配项"
ef317cd5 6662
276ceeaa 6663#: builtin/grep.c:700
ef317cd5 6664msgid "print empty line between matches from different files"
07432cef 6665msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 6666
276ceeaa 6667#: builtin/grep.c:702
ef317cd5 6668msgid "show filename only once above matches from same file"
07432cef 6669msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 6670
276ceeaa 6671#: builtin/grep.c:705
ef317cd5 6672msgid "show <n> context lines before and after matches"
07432cef 6673msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 6674
276ceeaa 6675#: builtin/grep.c:708
ef317cd5 6676msgid "show <n> context lines before matches"
07432cef 6677msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 6678
276ceeaa 6679#: builtin/grep.c:710
ef317cd5 6680msgid "show <n> context lines after matches"
07432cef 6681msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 6682
276ceeaa
JX
6683#: builtin/grep.c:712
6684msgid "use <n> worker threads"
6685msgstr "使用 <n> 个工作线程"
6686
6687#: builtin/grep.c:713
ef317cd5 6688msgid "shortcut for -C NUM"
07432cef 6689msgstr "快捷键 -C 数字"
ef317cd5 6690
276ceeaa 6691#: builtin/grep.c:716
ef317cd5 6692msgid "show a line with the function name before matches"
07432cef 6693msgstr "在匹配的前面显示一行函数名"
ef317cd5 6694
276ceeaa 6695#: builtin/grep.c:718
ef317cd5 6696msgid "show the surrounding function"
07432cef 6697msgstr "显示所在函数的前后内容"
ef317cd5 6698
276ceeaa 6699#: builtin/grep.c:721
ef317cd5 6700msgid "read patterns from file"
07432cef 6701msgstr "从文件读取模式"
ef317cd5 6702
276ceeaa 6703#: builtin/grep.c:723
ef317cd5 6704msgid "match <pattern>"
07432cef 6705msgstr "匹配 <模式>"
ef317cd5 6706
276ceeaa 6707#: builtin/grep.c:725
ef317cd5 6708msgid "combine patterns specified with -e"
07432cef 6709msgstr "组合用 -e 参数设定的模式"
ef317cd5 6710
276ceeaa 6711#: builtin/grep.c:737
ef317cd5 6712msgid "indicate hit with exit status without output"
07432cef 6713msgstr "不输出,而用退出码标识命中状态"
ef317cd5 6714
276ceeaa 6715#: builtin/grep.c:739
ef317cd5 6716msgid "show only matches from files that match all patterns"
07432cef 6717msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 6718
276ceeaa 6719#: builtin/grep.c:741
07432cef
WS
6720msgid "show parse tree for grep expression"
6721msgstr "显示 grep 表达式的解析树"
6722
276ceeaa 6723#: builtin/grep.c:745
ef317cd5 6724msgid "pager"
07432cef 6725msgstr "分页"
ef317cd5 6726
276ceeaa 6727#: builtin/grep.c:745
ef317cd5 6728msgid "show matching files in the pager"
07432cef 6729msgstr "分页显示匹配的文件"
ef317cd5 6730
276ceeaa 6731#: builtin/grep.c:748
ef317cd5 6732msgid "allow calling of grep(1) (ignored by this build)"
07432cef 6733msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 6734
276ceeaa 6735#: builtin/grep.c:811
c04f5ac3
JX
6736msgid "no pattern given."
6737msgstr "未提供模式匹配。"
6738
276ceeaa
JX
6739#: builtin/grep.c:843 builtin/index-pack.c:1475
6740#, c-format
6741msgid "invalid number of threads specified (%d)"
6742msgstr "指定的线程数无效(%d)"
6743
6744#: builtin/grep.c:873
c04f5ac3
JX
6745msgid "--open-files-in-pager only works on the worktree"
6746msgstr "--open-files-in-pager 仅用于工作区"
6747
276ceeaa 6748#: builtin/grep.c:899
c04f5ac3 6749msgid "--cached or --untracked cannot be used with --no-index."
649900bc 6750msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 6751
276ceeaa 6752#: builtin/grep.c:904
c04f5ac3 6753msgid "--no-index or --untracked cannot be used with revs."
649900bc 6754msgstr "--no-index 或 --untracked 不能和版本同时使用。"
c04f5ac3 6755
276ceeaa 6756#: builtin/grep.c:907
c04f5ac3 6757msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 6758msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 6759
276ceeaa 6760#: builtin/grep.c:915
c04f5ac3
JX
6761msgid "both --cached and trees are given."
6762msgstr "同时给出了 --cached 和树对象。"
6763
276ceeaa 6764#: builtin/hash-object.c:81
ef317cd5 6765msgid ""
814ff314
JX
6766"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6767"[--] <file>..."
ef317cd5 6768msgstr ""
814ff314
JX
6769"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
6770"[--] <文件>..."
ef317cd5 6771
276ceeaa 6772#: builtin/hash-object.c:82
94550ed3
JX
6773msgid "git hash-object --stdin-paths"
6774msgstr "git hash-object --stdin-paths"
ef317cd5 6775
276ceeaa 6776#: builtin/hash-object.c:93
ef317cd5 6777msgid "type"
07432cef 6778msgstr "类型"
ef317cd5 6779
276ceeaa 6780#: builtin/hash-object.c:93
ef317cd5 6781msgid "object type"
07432cef 6782msgstr "对象类型"
ef317cd5 6783
276ceeaa 6784#: builtin/hash-object.c:94
ef317cd5 6785msgid "write the object into the object database"
07432cef 6786msgstr "将对象写入对象数据库"
ef317cd5 6787
276ceeaa 6788#: builtin/hash-object.c:96
ef317cd5 6789msgid "read the object from stdin"
07432cef 6790msgstr "从标准输入读取对象"
ef317cd5 6791
276ceeaa 6792#: builtin/hash-object.c:98
ef317cd5 6793msgid "store file as is without filters"
07432cef 6794msgstr "原样存储文件不使用过滤器"
ef317cd5 6795
276ceeaa 6796#: builtin/hash-object.c:99
220c313c
JX
6797msgid ""
6798"just hash any random garbage to create corrupt objects for debugging Git"
6799msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
6800
276ceeaa 6801#: builtin/hash-object.c:100
ef317cd5 6802msgid "process file as it were from this path"
07432cef 6803msgstr "处理文件并假设其来自于此路径"
ef317cd5 6804
2e8451e8 6805#: builtin/help.c:41
ef317cd5 6806msgid "print all available commands"
07432cef 6807msgstr "打印所有可用的命令"
ef317cd5 6808
2e8451e8 6809#: builtin/help.c:42
4dcdc3d8
JX
6810msgid "print list of useful guides"
6811msgstr "显示有用的指南列表"
6812
2e8451e8 6813#: builtin/help.c:43
ef317cd5 6814msgid "show man page"
07432cef 6815msgstr "显示 man 手册"
ef317cd5 6816
2e8451e8 6817#: builtin/help.c:44
ef317cd5 6818msgid "show manual in web browser"
07432cef 6819msgstr "在 web 浏览器中显示手册"
ef317cd5 6820
2e8451e8 6821#: builtin/help.c:46
ef317cd5 6822msgid "show info page"
07432cef 6823msgstr "显示 info 手册"
ef317cd5 6824
2e8451e8 6825#: builtin/help.c:52
814ff314
JX
6826msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6827msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
ef317cd5 6828
2e8451e8 6829#: builtin/help.c:64
81809b99 6830#, c-format
8ada9598 6831msgid "unrecognized help format '%s'"
81809b99 6832msgstr "未能识别的帮助格式 '%s'"
8ada9598 6833
220c313c 6834#: builtin/help.c:91
8ada9598 6835msgid "Failed to start emacsclient."
81809b99 6836msgstr "无法启动 emacsclient。"
8ada9598 6837
220c313c 6838#: builtin/help.c:104
8ada9598 6839msgid "Failed to parse emacsclient version."
81809b99 6840msgstr "无法解析 emacsclient 版本。"
8ada9598 6841
220c313c 6842#: builtin/help.c:112
8ada9598
JX
6843#, c-format
6844msgid "emacsclient version '%d' too old (< 22)."
07432cef 6845msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 6846
94550ed3 6847#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
81809b99 6848#, c-format
8ada9598 6849msgid "failed to exec '%s': %s"
81809b99 6850msgstr "无法执行 '%s':%s"
8ada9598 6851
276ceeaa 6852#: builtin/help.c:205
8ada9598
JX
6853#, c-format
6854msgid ""
6855"'%s': path for unsupported man viewer.\n"
6856"Please consider using 'man.<tool>.cmd' instead."
6857msgstr ""
81809b99 6858"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 6859"请使用 'man.<工具>.cmd'。"
8ada9598 6860
276ceeaa 6861#: builtin/help.c:217
8ada9598
JX
6862#, c-format
6863msgid ""
6864"'%s': cmd for supported man viewer.\n"
6865"Please consider using 'man.<tool>.path' instead."
6866msgstr ""
81809b99 6867"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 6868"请使用 'man.<工具>.path'。"
8ada9598 6869
276ceeaa 6870#: builtin/help.c:334
8ada9598
JX
6871#, c-format
6872msgid "'%s': unknown man viewer."
81809b99 6873msgstr "'%s':未知的 man 查看器。"
8ada9598 6874
276ceeaa 6875#: builtin/help.c:351
8ada9598 6876msgid "no man viewer handled the request"
81809b99 6877msgstr "没有 man 查看器处理此请求"
8ada9598 6878
276ceeaa 6879#: builtin/help.c:359
8ada9598 6880msgid "no info viewer handled the request"
81809b99 6881msgstr "没有 info 查看器处理此请求"
8ada9598 6882
276ceeaa 6883#: builtin/help.c:408
4dcdc3d8
JX
6884msgid "Defining attributes per path"
6885msgstr "定义路径的属性"
6886
276ceeaa 6887#: builtin/help.c:409
220c313c
JX
6888msgid "Everyday Git With 20 Commands Or So"
6889msgstr "每一天 Git 常用的约 20 条命令"
6890
276ceeaa 6891#: builtin/help.c:410
4dcdc3d8
JX
6892msgid "A Git glossary"
6893msgstr "Git 词汇表"
6894
276ceeaa 6895#: builtin/help.c:411
4dcdc3d8
JX
6896msgid "Specifies intentionally untracked files to ignore"
6897msgstr "忽略指定的未跟踪文件"
6898
276ceeaa 6899#: builtin/help.c:412
4dcdc3d8
JX
6900msgid "Defining submodule properties"
6901msgstr "定义子模组属性"
6902
276ceeaa 6903#: builtin/help.c:413
4dcdc3d8
JX
6904msgid "Specifying revisions and ranges for Git"
6905msgstr "指定 Git 的版本和版本范围"
6906
276ceeaa 6907#: builtin/help.c:414
4dcdc3d8
JX
6908msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6909msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6910
276ceeaa 6911#: builtin/help.c:415
4dcdc3d8
JX
6912msgid "An overview of recommended workflows with Git"
6913msgstr "Git 推荐的工作流概览"
6914
276ceeaa 6915#: builtin/help.c:427
4dcdc3d8
JX
6916msgid "The common Git guides are:\n"
6917msgstr "最常用的 Git 向导有:\n"
6918
276ceeaa 6919#: builtin/help.c:448 builtin/help.c:465
8ada9598
JX
6920#, c-format
6921msgid "usage: %s%s"
81809b99 6922msgstr "用法:%s%s"
8ada9598 6923
276ceeaa 6924#: builtin/help.c:481
8ada9598
JX
6925#, c-format
6926msgid "`git %s' is aliased to `%s'"
81809b99 6927msgstr "`git %s' 是 `%s' 的别名"
8ada9598 6928
1b7f4a34 6929#: builtin/index-pack.c:152
6acbf033
JX
6930#, c-format
6931msgid "unable to open %s"
6932msgstr "不能打开 %s"
6933
1b7f4a34 6934#: builtin/index-pack.c:202
8ada9598
JX
6935#, c-format
6936msgid "object type mismatch at %s"
81809b99 6937msgstr "%s 的对象类型不匹配"
8ada9598 6938
1b7f4a34 6939#: builtin/index-pack.c:222
6acbf033
JX
6940#, c-format
6941msgid "did not receive expected object %s"
6942msgstr "未能获取期望的对象 %s"
8ada9598 6943
1b7f4a34 6944#: builtin/index-pack.c:225
6acbf033
JX
6945#, c-format
6946msgid "object %s: expected type %s, found %s"
6947msgstr "对象 %s:期待类型 %s,却是 %s"
6948
1b7f4a34 6949#: builtin/index-pack.c:267
81809b99 6950#, c-format
8ada9598
JX
6951msgid "cannot fill %d byte"
6952msgid_plural "cannot fill %d bytes"
81809b99 6953msgstr[0] "无法填充 %d 字节"
5ae481e0 6954msgstr[1] "无法填充 %d 字节"
8ada9598 6955
1b7f4a34 6956#: builtin/index-pack.c:277
8ada9598 6957msgid "early EOF"
81809b99 6958msgstr "过早的文件结束符(EOF)"
8ada9598 6959
1b7f4a34 6960#: builtin/index-pack.c:278
8ada9598 6961msgid "read error on input"
81809b99 6962msgstr "输入上的读错误"
8ada9598 6963
1b7f4a34 6964#: builtin/index-pack.c:290
8ada9598 6965msgid "used more bytes than were available"
81809b99 6966msgstr "用掉了超过可用的字节"
8ada9598 6967
1b7f4a34 6968#: builtin/index-pack.c:297
8ada9598 6969msgid "pack too large for current definition of off_t"
81809b99 6970msgstr "包太大超过了当前 off_t 的定义"
8ada9598 6971
1b7f4a34 6972#: builtin/index-pack.c:313
81809b99 6973#, c-format
8ada9598 6974msgid "unable to create '%s'"
81809b99 6975msgstr "不能创建 '%s'"
8ada9598 6976
1b7f4a34 6977#: builtin/index-pack.c:318
81809b99 6978#, c-format
8ada9598 6979msgid "cannot open packfile '%s'"
81809b99 6980msgstr "无法打开包文件 '%s'"
8ada9598 6981
1b7f4a34 6982#: builtin/index-pack.c:332
8ada9598 6983msgid "pack signature mismatch"
81809b99 6984msgstr "包签名不匹配"
8ada9598 6985
1b7f4a34 6986#: builtin/index-pack.c:334
ef317cd5
JX
6987#, c-format
6988msgid "pack version %<PRIu32> unsupported"
07432cef 6989msgstr "不支持包版本 %<PRIu32>"
ef317cd5 6990
1b7f4a34 6991#: builtin/index-pack.c:352
8ada9598
JX
6992#, c-format
6993msgid "pack has bad object at offset %lu: %s"
81809b99 6994msgstr "包中有错误的对象位于 %lu:%s"
8ada9598 6995
1b7f4a34 6996#: builtin/index-pack.c:473
8ada9598
JX
6997#, c-format
6998msgid "inflate returned %d"
81809b99 6999msgstr "解压缩返回 %d"
8ada9598 7000
1b7f4a34 7001#: builtin/index-pack.c:522
8ada9598 7002msgid "offset value overflow for delta base object"
81809b99 7003msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 7004
1b7f4a34 7005#: builtin/index-pack.c:530
8ada9598 7006msgid "delta base offset is out of bound"
81809b99 7007msgstr "delta 基准偏移越界"
8ada9598 7008
1b7f4a34 7009#: builtin/index-pack.c:538
81809b99 7010#, c-format
8ada9598 7011msgid "unknown object type %d"
81809b99 7012msgstr "未知对象类型 %d"
8ada9598 7013
1b7f4a34 7014#: builtin/index-pack.c:569
8ada9598 7015msgid "cannot pread pack file"
81809b99 7016msgstr "无法读取包文件"
8ada9598 7017
1b7f4a34 7018#: builtin/index-pack.c:571
8ada9598
JX
7019#, c-format
7020msgid "premature end of pack file, %lu byte missing"
7021msgid_plural "premature end of pack file, %lu bytes missing"
81809b99 7022msgstr[0] "包文件过早结束,缺少 %lu 字节"
5ae481e0 7023msgstr[1] "包文件过早结束,缺少 %lu 字节"
8ada9598 7024
1b7f4a34 7025#: builtin/index-pack.c:597
8ada9598 7026msgid "serious inflate inconsistency"
81809b99 7027msgstr "解压缩严重的不一致"
8ada9598 7028
1b7f4a34
JX
7029#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
7030#: builtin/index-pack.c:806 builtin/index-pack.c:815
8ada9598
JX
7031#, c-format
7032msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 7033msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 7034
1b7f4a34 7035#: builtin/index-pack.c:746 builtin/pack-objects.c:162
814ff314 7036#: builtin/pack-objects.c:254
6792b93b
JX
7037#, c-format
7038msgid "unable to read %s"
7039msgstr "不能读 %s"
7040
1b7f4a34 7041#: builtin/index-pack.c:812
6792b93b
JX
7042#, c-format
7043msgid "cannot read existing object %s"
7044msgstr "不能读取现存对象 %s"
7045
1b7f4a34 7046#: builtin/index-pack.c:826
81809b99 7047#, c-format
8ada9598 7048msgid "invalid blob object %s"
160fb2b2 7049msgstr "无效的数据对象 %s"
8ada9598 7050
1b7f4a34 7051#: builtin/index-pack.c:840
81809b99 7052#, c-format
8ada9598 7053msgid "invalid %s"
81809b99 7054msgstr "无效的 %s"
8ada9598 7055
7aea43ff 7056#: builtin/index-pack.c:843
8ada9598 7057msgid "Error in object"
81809b99 7058msgstr "对象中出错"
8ada9598 7059
7aea43ff 7060#: builtin/index-pack.c:845
8ada9598
JX
7061#, c-format
7062msgid "Not all child objects of %s are reachable"
81809b99 7063msgstr "%s 的所有子对象并非都可达"
8ada9598 7064
7aea43ff 7065#: builtin/index-pack.c:917 builtin/index-pack.c:948
8ada9598 7066msgid "failed to apply delta"
81809b99 7067msgstr "无法应用 delta"
8ada9598 7068
7aea43ff 7069#: builtin/index-pack.c:1118
8ada9598 7070msgid "Receiving objects"
81809b99 7071msgstr "接收对象中"
8ada9598 7072
7aea43ff 7073#: builtin/index-pack.c:1118
8ada9598 7074msgid "Indexing objects"
81809b99 7075msgstr "索引对象中"
8ada9598 7076
7aea43ff 7077#: builtin/index-pack.c:1150
8ada9598 7078msgid "pack is corrupted (SHA1 mismatch)"
81809b99 7079msgstr "包冲突(SHA1 不匹配)"
8ada9598 7080
7aea43ff 7081#: builtin/index-pack.c:1155
8ada9598 7082msgid "cannot fstat packfile"
81809b99 7083msgstr "不能枚举包文件状态"
8ada9598 7084
7aea43ff 7085#: builtin/index-pack.c:1158
8ada9598 7086msgid "pack has junk at the end"
81809b99 7087msgstr "包的结尾有垃圾数据"
8ada9598 7088
7aea43ff 7089#: builtin/index-pack.c:1169
6792b93b
JX
7090msgid "confusion beyond insanity in parse_pack_objects()"
7091msgstr "parse_pack_objects() 中遇到不可理喻的问题"
7092
7aea43ff 7093#: builtin/index-pack.c:1194
8ada9598 7094msgid "Resolving deltas"
81809b99 7095msgstr "处理 delta 中"
8ada9598 7096
7aea43ff 7097#: builtin/index-pack.c:1205
07432cef 7098#, c-format
ef317cd5 7099msgid "unable to create thread: %s"
07432cef 7100msgstr "不能创建线程:%s"
ef317cd5 7101
7aea43ff 7102#: builtin/index-pack.c:1247
8ada9598 7103msgid "confusion beyond insanity"
81809b99 7104msgstr "不可理喻"
8ada9598 7105
7aea43ff 7106#: builtin/index-pack.c:1253
ef317cd5
JX
7107#, c-format
7108msgid "completed with %d local objects"
07432cef 7109msgstr "完成 %d 个本地对象"
ef317cd5 7110
7aea43ff 7111#: builtin/index-pack.c:1263
ef317cd5
JX
7112#, c-format
7113msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 7114msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 7115
7aea43ff 7116#: builtin/index-pack.c:1267
8ada9598
JX
7117#, c-format
7118msgid "pack has %d unresolved delta"
7119msgid_plural "pack has %d unresolved deltas"
81809b99 7120msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 7121msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 7122
7aea43ff 7123#: builtin/index-pack.c:1291
81809b99 7124#, c-format
8ada9598 7125msgid "unable to deflate appended object (%d)"
07432cef 7126msgstr "不能压缩附加对象(%d)"
8ada9598 7127
7aea43ff 7128#: builtin/index-pack.c:1367
8ada9598
JX
7129#, c-format
7130msgid "local object %s is corrupt"
81809b99 7131msgstr "本地对象 %s 已损坏"
8ada9598 7132
7aea43ff 7133#: builtin/index-pack.c:1391
8ada9598 7134msgid "error while closing pack file"
81809b99 7135msgstr "关闭包文件时出错"
8ada9598 7136
7aea43ff 7137#: builtin/index-pack.c:1404
81809b99 7138#, c-format
8ada9598 7139msgid "cannot write keep file '%s'"
81809b99 7140msgstr "无法写保留文件 '%s'"
8ada9598 7141
7aea43ff 7142#: builtin/index-pack.c:1412
81809b99 7143#, c-format
8ada9598 7144msgid "cannot close written keep file '%s'"
81809b99 7145msgstr "无法关闭保留文件 '%s'"
8ada9598 7146
7aea43ff 7147#: builtin/index-pack.c:1425
8ada9598 7148msgid "cannot store pack file"
81809b99 7149msgstr "无法存储包文件"
8ada9598 7150
7aea43ff 7151#: builtin/index-pack.c:1436
8ada9598 7152msgid "cannot store index file"
81809b99 7153msgstr "无法存储索引文件"
8ada9598 7154
7aea43ff 7155#: builtin/index-pack.c:1469
07432cef 7156#, c-format
ef317cd5 7157msgid "bad pack.indexversion=%<PRIu32>"
07432cef 7158msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 7159
3495628d 7160#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
ef317cd5
JX
7161#, c-format
7162msgid "no threads support, ignoring %s"
07432cef 7163msgstr "没有线程支持,忽略 %s"
ef317cd5 7164
3495628d 7165#: builtin/index-pack.c:1538
81809b99 7166#, c-format
8ada9598 7167msgid "Cannot open existing pack file '%s'"
81809b99 7168msgstr "无法打开现存包文件 '%s'"
8ada9598 7169
3495628d 7170#: builtin/index-pack.c:1540
81809b99 7171#, c-format
8ada9598 7172msgid "Cannot open existing pack idx file for '%s'"
81809b99 7173msgstr "无法为 %s 打开包索引文件"
8ada9598 7174
3495628d 7175#: builtin/index-pack.c:1587
81809b99 7176#, c-format
8ada9598
JX
7177msgid "non delta: %d object"
7178msgid_plural "non delta: %d objects"
81809b99 7179msgstr[0] "非 delta:%d 个对象"
5ae481e0 7180msgstr[1] "非 delta:%d 个对象"
8ada9598 7181
3495628d 7182#: builtin/index-pack.c:1594
8ada9598
JX
7183#, c-format
7184msgid "chain length = %d: %lu object"
7185msgid_plural "chain length = %d: %lu objects"
81809b99 7186msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 7187msgstr[1] "链长 = %d: %lu 对象"
8ada9598 7188
3495628d 7189#: builtin/index-pack.c:1624
8ada9598 7190msgid "Cannot come back to cwd"
81809b99 7191msgstr "无法返回当前工作目录"
8ada9598 7192
3495628d
JX
7193#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
7194#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
81809b99 7195#, c-format
8ada9598 7196msgid "bad %s"
81809b99 7197msgstr "错误选项 %s"
8ada9598 7198
3495628d 7199#: builtin/index-pack.c:1709
8ada9598 7200msgid "--fix-thin cannot be used without --stdin"
649900bc 7201msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 7202
3495628d 7203#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
8ada9598
JX
7204#, c-format
7205msgid "packfile name '%s' does not end with '.pack'"
dbd6cced 7206msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
8ada9598 7207
3495628d 7208#: builtin/index-pack.c:1730
8ada9598 7209msgid "--verify with no packfile name given"
dbd6cced 7210msgstr "--verify 没有提供包文件名参数"
8ada9598 7211
94550ed3 7212#: builtin/init-db.c:55
c04f5ac3
JX
7213#, c-format
7214msgid "cannot stat '%s'"
7215msgstr "不能枚举 '%s' 状态"
7216
94550ed3 7217#: builtin/init-db.c:61
c04f5ac3
JX
7218#, c-format
7219msgid "cannot stat template '%s'"
7220msgstr "不能枚举模版 '%s' 状态"
7221
94550ed3 7222#: builtin/init-db.c:66
c04f5ac3
JX
7223#, c-format
7224msgid "cannot opendir '%s'"
7225msgstr "不能打开目录 '%s'"
7226
94550ed3 7227#: builtin/init-db.c:77
c04f5ac3
JX
7228#, c-format
7229msgid "cannot readlink '%s'"
7230msgstr "不能读取链接 '%s'"
7231
94550ed3 7232#: builtin/init-db.c:79
c04f5ac3
JX
7233#, c-format
7234msgid "cannot symlink '%s' '%s'"
90e6ef53 7235msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3 7236
94550ed3 7237#: builtin/init-db.c:85
c04f5ac3
JX
7238#, c-format
7239msgid "cannot copy '%s' to '%s'"
7240msgstr "不能拷贝 '%s' 至 '%s'"
7241
94550ed3 7242#: builtin/init-db.c:89
c04f5ac3
JX
7243#, c-format
7244msgid "ignoring template %s"
7245msgstr "忽略模版 %s"
7246
94550ed3 7247#: builtin/init-db.c:118
c04f5ac3
JX
7248#, c-format
7249msgid "templates not found %s"
7250msgstr "模版未找到 %s"
7251
94550ed3 7252#: builtin/init-db.c:131
c04f5ac3
JX
7253#, c-format
7254msgid "not copying templates of a wrong format version %d from '%s'"
81809b99 7255msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
c04f5ac3 7256
94550ed3 7257#: builtin/init-db.c:309 builtin/init-db.c:312
c04f5ac3
JX
7258#, c-format
7259msgid "%s already exists"
7260msgstr "%s 已经存在"
7261
94550ed3 7262#: builtin/init-db.c:340
c04f5ac3
JX
7263#, c-format
7264msgid "unable to handle file type %d"
7265msgstr "不能处理 %d 类型的文件"
7266
94550ed3 7267#: builtin/init-db.c:343
c04f5ac3
JX
7268#, c-format
7269msgid "unable to move %s to %s"
7270msgstr "不能移动 %s 至 %s"
7271
6c94aba5
JX
7272#. TRANSLATORS: The first '%s' is either "Reinitialized
7273#. existing" or "Initialized empty", the second " shared" or
7274#. "", and the last '%s%s' is the verbatim directory name.
94550ed3 7275#: builtin/init-db.c:399
c04f5ac3
JX
7276#, c-format
7277msgid "%s%s Git repository in %s%s\n"
160fb2b2 7278msgstr "%s%s Git 仓库于 %s%s\n"
c04f5ac3 7279
94550ed3 7280#: builtin/init-db.c:400
c04f5ac3
JX
7281msgid "Reinitialized existing"
7282msgstr "重新初始化现存的"
7283
94550ed3 7284#: builtin/init-db.c:400
c04f5ac3
JX
7285msgid "Initialized empty"
7286msgstr "初始化空的"
7287
7e238ab7 7288# 译者:中文字符串拼接,可删除前导空格
94550ed3 7289#: builtin/init-db.c:401
c04f5ac3 7290msgid " shared"
90e6ef53 7291msgstr "共享"
c04f5ac3 7292
94550ed3 7293#: builtin/init-db.c:448
ef317cd5 7294msgid ""
a77c07d9 7295"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 7296"shared[=<permissions>]] [<directory>]"
ef317cd5 7297msgstr ""
07432cef 7298"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 7299"[<目录>]"
ef317cd5 7300
94550ed3 7301#: builtin/init-db.c:471
ef317cd5 7302msgid "permissions"
07432cef 7303msgstr "权限"
ef317cd5 7304
94550ed3 7305#: builtin/init-db.c:472
ef317cd5 7306msgid "specify that the git repository is to be shared amongst several users"
160fb2b2 7307msgstr "指定 git 仓库是多个用户之间共享的"
ef317cd5 7308
94550ed3 7309#: builtin/init-db.c:506 builtin/init-db.c:511
c04f5ac3
JX
7310#, c-format
7311msgid "cannot mkdir %s"
7312msgstr "不能创建目录 %s"
7313
94550ed3 7314#: builtin/init-db.c:515
c04f5ac3
JX
7315#, c-format
7316msgid "cannot chdir to %s"
7317msgstr "不能切换目录到 %s"
7318
94550ed3 7319#: builtin/init-db.c:536
c04f5ac3
JX
7320#, c-format
7321msgid ""
7322"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
7323"dir=<directory>)"
1e607449 7324msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 7325
94550ed3 7326#: builtin/init-db.c:564
c04f5ac3
JX
7327#, c-format
7328msgid "Cannot access work tree '%s'"
7329msgstr "不能访问工作区 '%s'"
7330
220c313c
JX
7331#: builtin/interpret-trailers.c:15
7332msgid ""
276ceeaa
JX
7333"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
7334"<token>[(=|:)<value>])...] [<file>...]"
3495628d
JX
7335msgstr ""
7336"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
7337">])...] [<文件>...]"
276ceeaa
JX
7338
7339#: builtin/interpret-trailers.c:26
7340msgid "edit files in place"
7341msgstr "在原位编辑文件"
220c313c 7342
276ceeaa 7343#: builtin/interpret-trailers.c:27
220c313c
JX
7344msgid "trim empty trailers"
7345msgstr "删除空签名"
7346
276ceeaa 7347#: builtin/interpret-trailers.c:28
220c313c
JX
7348msgid "trailer"
7349msgstr "签名"
7350
276ceeaa 7351#: builtin/interpret-trailers.c:29
220c313c
JX
7352msgid "trailer(s) to add"
7353msgstr "要添加的签名"
7354
276ceeaa
JX
7355#: builtin/interpret-trailers.c:42
7356msgid "no input file given for in-place editing"
7357msgstr "没有给出要原位编辑的文件"
7358
1b7f4a34 7359#: builtin/log.c:43
7aea43ff 7360msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 7361msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 7362
1b7f4a34 7363#: builtin/log.c:44
814ff314
JX
7364msgid "git show [<options>] <object>..."
7365msgstr "git show [<选项>] <对象>..."
ef317cd5 7366
1b7f4a34 7367#: builtin/log.c:83
220c313c
JX
7368#, c-format
7369msgid "invalid --decorate option: %s"
7370msgstr "无效的 --decorate 选项:%s"
7371
1b7f4a34 7372#: builtin/log.c:131
ef317cd5 7373msgid "suppress diff output"
07432cef 7374msgstr "不显示差异输出"
ef317cd5 7375
1b7f4a34 7376#: builtin/log.c:132
ef317cd5 7377msgid "show source"
07432cef 7378msgstr "显示源"
ef317cd5 7379
1b7f4a34 7380#: builtin/log.c:133
07432cef
WS
7381msgid "Use mail map file"
7382msgstr "使用邮件映射文件"
7383
1b7f4a34 7384#: builtin/log.c:134
ef317cd5 7385msgid "decorate options"
07432cef 7386msgstr "修饰选项"
ef317cd5 7387
1b7f4a34 7388#: builtin/log.c:137
220c313c
JX
7389msgid "Process line range n,m in file, counting from 1"
7390msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
7391
1b7f4a34 7392#: builtin/log.c:233
c04f5ac3
JX
7393#, c-format
7394msgid "Final output: %d %s\n"
7395msgstr "最终输出:%d %s\n"
7396
1b7f4a34 7397#: builtin/log.c:465
220c313c
JX
7398#, c-format
7399msgid "git show %s: bad file"
7400msgstr "git show %s: 损坏的文件"
7401
1b7f4a34 7402#: builtin/log.c:479 builtin/log.c:572
c04f5ac3
JX
7403#, c-format
7404msgid "Could not read object %s"
90e6ef53 7405msgstr "不能读取对象 %s"
c04f5ac3 7406
1b7f4a34 7407#: builtin/log.c:596
c04f5ac3
JX
7408#, c-format
7409msgid "Unknown type: %d"
7410msgstr "未知类型:%d"
7411
276ceeaa 7412#: builtin/log.c:715
c04f5ac3
JX
7413msgid "format.headers without value"
7414msgstr "format.headers 没有值"
7415
276ceeaa 7416#: builtin/log.c:801
c04f5ac3
JX
7417msgid "name of output directory is too long"
7418msgstr "输出目录名太长"
7419
276ceeaa 7420#: builtin/log.c:816
c04f5ac3
JX
7421#, c-format
7422msgid "Cannot open patch file %s"
7423msgstr "无法打开补丁文件 %s"
7424
276ceeaa 7425#: builtin/log.c:830
c04f5ac3
JX
7426msgid "Need exactly one range."
7427msgstr "只需要一个范围。"
7428
276ceeaa 7429#: builtin/log.c:840
c04f5ac3
JX
7430msgid "Not a range."
7431msgstr "不是一个范围。"
7432
276ceeaa 7433#: builtin/log.c:946
c04f5ac3
JX
7434msgid "Cover letter needs email format"
7435msgstr "信封需要邮件地址格式"
7436
276ceeaa 7437#: builtin/log.c:1025
c04f5ac3
JX
7438#, c-format
7439msgid "insane in-reply-to: %s"
7440msgstr "不正常的 in-reply-to:%s"
7441
276ceeaa 7442#: builtin/log.c:1053
814ff314
JX
7443msgid "git format-patch [<options>] [<since> | <revision-range>]"
7444msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 7445
276ceeaa 7446#: builtin/log.c:1098
c04f5ac3
JX
7447msgid "Two output directories?"
7448msgstr "两个输出目录?"
7449
276ceeaa 7450#: builtin/log.c:1214
ef317cd5 7451msgid "use [PATCH n/m] even with a single patch"
07432cef 7452msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 7453
276ceeaa 7454#: builtin/log.c:1217
ef317cd5 7455msgid "use [PATCH] even with multiple patches"
07432cef 7456msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 7457
276ceeaa 7458#: builtin/log.c:1221
ef317cd5 7459msgid "print patches to standard out"
07432cef 7460msgstr "打印补丁到标准输出"
c04f5ac3 7461
276ceeaa 7462#: builtin/log.c:1223
ef317cd5 7463msgid "generate a cover letter"
07432cef 7464msgstr "生成一封附信"
c04f5ac3 7465
276ceeaa 7466#: builtin/log.c:1225
ef317cd5 7467msgid "use simple number sequence for output file names"
07432cef 7468msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 7469
276ceeaa 7470#: builtin/log.c:1226
ef317cd5 7471msgid "sfx"
07432cef 7472msgstr "后缀"
ef317cd5 7473
276ceeaa 7474#: builtin/log.c:1227
ef317cd5 7475msgid "use <sfx> instead of '.patch'"
07432cef 7476msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 7477
276ceeaa 7478#: builtin/log.c:1229
ef317cd5 7479msgid "start numbering patches at <n> instead of 1"
07432cef
WS
7480msgstr "补丁以 <n> 开始编号,而不是1"
7481
276ceeaa 7482#: builtin/log.c:1231
07432cef
WS
7483msgid "mark the series as Nth re-roll"
7484msgstr "标记补丁系列是第几次重制"
ef317cd5 7485
276ceeaa 7486#: builtin/log.c:1233
ef317cd5 7487msgid "Use [<prefix>] instead of [PATCH]"
07432cef 7488msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 7489
276ceeaa 7490#: builtin/log.c:1236
ef317cd5 7491msgid "store resulting files in <dir>"
d9d56b23 7492msgstr "把结果文件存储在 <目录>"
ef317cd5 7493
276ceeaa 7494#: builtin/log.c:1239
ef317cd5 7495msgid "don't strip/add [PATCH]"
07432cef 7496msgstr "不删除/添加 [PATCH]"
ef317cd5 7497
276ceeaa 7498#: builtin/log.c:1242
ef317cd5 7499msgid "don't output binary diffs"
07432cef 7500msgstr "不输出二进制差异"
ef317cd5 7501
276ceeaa 7502#: builtin/log.c:1244
89f80d72
JX
7503msgid "output all-zero hash in From header"
7504msgstr "在 From 头信息中输出全为零的哈希值"
7505
276ceeaa 7506#: builtin/log.c:1246
ef317cd5 7507msgid "don't include a patch matching a commit upstream"
07432cef 7508msgstr "不包含已在上游提交中的补丁"
ef317cd5 7509
276ceeaa 7510#: builtin/log.c:1248
ef317cd5 7511msgid "show patch format instead of default (patch + stat)"
07432cef 7512msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 7513
276ceeaa 7514#: builtin/log.c:1250
ef317cd5 7515msgid "Messaging"
07432cef 7516msgstr "邮件发送"
ef317cd5 7517
276ceeaa 7518#: builtin/log.c:1251
ef317cd5 7519msgid "header"
07432cef 7520msgstr "header"
ef317cd5 7521
276ceeaa 7522#: builtin/log.c:1252
ef317cd5 7523msgid "add email header"
07432cef 7524msgstr "添加邮件头"
ef317cd5 7525
276ceeaa 7526#: builtin/log.c:1253 builtin/log.c:1255
ef317cd5 7527msgid "email"
07432cef 7528msgstr "邮件地址"
ef317cd5 7529
276ceeaa 7530#: builtin/log.c:1253
ef317cd5 7531msgid "add To: header"
07432cef 7532msgstr "添加收件人"
ef317cd5 7533
276ceeaa 7534#: builtin/log.c:1255
ef317cd5 7535msgid "add Cc: header"
07432cef 7536msgstr "添加抄送"
ef317cd5 7537
276ceeaa 7538#: builtin/log.c:1257
2e8451e8 7539msgid "ident"
d9d56b23 7540msgstr "标识"
2e8451e8 7541
276ceeaa 7542#: builtin/log.c:1258
2e8451e8 7543msgid "set From address to <ident> (or committer ident if absent)"
4375c10e 7544msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
2e8451e8 7545
276ceeaa 7546#: builtin/log.c:1260
ef317cd5 7547msgid "message-id"
d9d56b23 7548msgstr "邮件标识"
ef317cd5 7549
276ceeaa 7550#: builtin/log.c:1261
ef317cd5 7551msgid "make first mail a reply to <message-id>"
d9d56b23 7552msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 7553
276ceeaa 7554#: builtin/log.c:1262 builtin/log.c:1265
ef317cd5 7555msgid "boundary"
07432cef 7556msgstr "边界"
ef317cd5 7557
276ceeaa 7558#: builtin/log.c:1263
ef317cd5 7559msgid "attach the patch"
07432cef 7560msgstr "附件方式添加补丁"
ef317cd5 7561
276ceeaa 7562#: builtin/log.c:1266
ef317cd5 7563msgid "inline the patch"
07432cef 7564msgstr "内联显示补丁"
ef317cd5 7565
276ceeaa 7566#: builtin/log.c:1270
ef317cd5 7567msgid "enable message threading, styles: shallow, deep"
07432cef 7568msgstr "启用邮件线索,风格:浅,深"
ef317cd5 7569
276ceeaa 7570#: builtin/log.c:1272
ef317cd5 7571msgid "signature"
07432cef 7572msgstr "签名"
ef317cd5 7573
276ceeaa 7574#: builtin/log.c:1273
ef317cd5 7575msgid "add a signature"
07432cef 7576msgstr "添加一个签名"
ef317cd5 7577
276ceeaa 7578#: builtin/log.c:1275
6acbf033
JX
7579msgid "add a signature from a file"
7580msgstr "从文件添加一个签名"
7581
276ceeaa 7582#: builtin/log.c:1276
ef317cd5 7583msgid "don't print the patch filenames"
07432cef 7584msgstr "不要打印补丁文件名"
ef317cd5 7585
276ceeaa 7586#: builtin/log.c:1365
c04f5ac3
JX
7587msgid "-n and -k are mutually exclusive."
7588msgstr "-n 和 -k 互斥。"
7589
276ceeaa 7590#: builtin/log.c:1367
c04f5ac3
JX
7591msgid "--subject-prefix and -k are mutually exclusive."
7592msgstr "--subject-prefix 和 -k 互斥。"
7593
276ceeaa 7594#: builtin/log.c:1375
c04f5ac3
JX
7595msgid "--name-only does not make sense"
7596msgstr "--name-only 无意义"
7597
276ceeaa 7598#: builtin/log.c:1377
c04f5ac3
JX
7599msgid "--name-status does not make sense"
7600msgstr "--name-status 无意义"
7601
276ceeaa 7602#: builtin/log.c:1379
c04f5ac3
JX
7603msgid "--check does not make sense"
7604msgstr "--check 无意义"
7605
276ceeaa 7606#: builtin/log.c:1407
c04f5ac3
JX
7607msgid "standard output, or directory, which one?"
7608msgstr "标准输出或目录,哪一个?"
7609
276ceeaa 7610#: builtin/log.c:1409
c04f5ac3
JX
7611#, c-format
7612msgid "Could not create directory '%s'"
90e6ef53 7613msgstr "不能创建目录 '%s'"
c04f5ac3 7614
276ceeaa 7615#: builtin/log.c:1506
6acbf033
JX
7616#, c-format
7617msgid "unable to read signature file '%s'"
7618msgstr "无法读取签名文件 '%s'"
7619
276ceeaa 7620#: builtin/log.c:1569
c04f5ac3
JX
7621msgid "Failed to create output files"
7622msgstr "无法创建输出文件"
7623
276ceeaa 7624#: builtin/log.c:1617
ef317cd5 7625msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 7626msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 7627
276ceeaa 7628#: builtin/log.c:1671
c04f5ac3
JX
7629#, c-format
7630msgid ""
7631"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 7632msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 7633
276ceeaa 7634#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
c04f5ac3
JX
7635#, c-format
7636msgid "Unknown commit %s"
7637msgstr "未知提交 %s"
7638
276ceeaa 7639#: builtin/ls-files.c:378
814ff314
JX
7640msgid "git ls-files [<options>] [<file>...]"
7641msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 7642
276ceeaa 7643#: builtin/ls-files.c:427
ef317cd5 7644msgid "identify the file status with tags"
07432cef 7645msgstr "用标签标识文件的状态"
ef317cd5 7646
276ceeaa 7647#: builtin/ls-files.c:429
ef317cd5 7648msgid "use lowercase letters for 'assume unchanged' files"
07432cef 7649msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 7650
276ceeaa 7651#: builtin/ls-files.c:431
ef317cd5 7652msgid "show cached files in the output (default)"
07432cef 7653msgstr "显示缓存的文件(默认)"
ef317cd5 7654
276ceeaa 7655#: builtin/ls-files.c:433
ef317cd5 7656msgid "show deleted files in the output"
07432cef 7657msgstr "显示已删除的文件"
ef317cd5 7658
276ceeaa 7659#: builtin/ls-files.c:435
ef317cd5 7660msgid "show modified files in the output"
07432cef 7661msgstr "显示已修改的文件"
ef317cd5 7662
276ceeaa 7663#: builtin/ls-files.c:437
ef317cd5 7664msgid "show other files in the output"
07432cef 7665msgstr "显示其它文件"
ef317cd5 7666
276ceeaa 7667#: builtin/ls-files.c:439
ef317cd5 7668msgid "show ignored files in the output"
07432cef 7669msgstr "显示忽略的文件"
ef317cd5 7670
276ceeaa 7671#: builtin/ls-files.c:442
ef317cd5 7672msgid "show staged contents' object name in the output"
07432cef 7673msgstr "显示暂存区内容的对象名称"
ef317cd5 7674
276ceeaa 7675#: builtin/ls-files.c:444
ef317cd5 7676msgid "show files on the filesystem that need to be removed"
07432cef 7677msgstr "显示文件系统需要删除的文件"
ef317cd5 7678
276ceeaa 7679#: builtin/ls-files.c:446
220c313c 7680msgid "show 'other' directories' names only"
07432cef 7681msgstr "只显示“其他”目录的名称"
ef317cd5 7682
276ceeaa
JX
7683#: builtin/ls-files.c:448
7684msgid "show line endings of files"
7685msgstr "显示文件换行符格式"
7686
7687#: builtin/ls-files.c:450
ef317cd5 7688msgid "don't show empty directories"
07432cef 7689msgstr "不显示空目录"
ef317cd5 7690
276ceeaa 7691#: builtin/ls-files.c:453
ef317cd5 7692msgid "show unmerged files in the output"
07432cef 7693msgstr "显示未合并的文件"
ef317cd5 7694
276ceeaa 7695#: builtin/ls-files.c:455
ef317cd5 7696msgid "show resolve-undo information"
07432cef 7697msgstr "显示 resolve-undo 信息"
ef317cd5 7698
276ceeaa 7699#: builtin/ls-files.c:457
ef317cd5 7700msgid "skip files matching pattern"
07432cef 7701msgstr "匹配排除文件的模式"
ef317cd5 7702
276ceeaa 7703#: builtin/ls-files.c:460
ef317cd5 7704msgid "exclude patterns are read from <file>"
07432cef 7705msgstr "从 <文件> 中读取排除模式"
ef317cd5 7706
276ceeaa 7707#: builtin/ls-files.c:463
ef317cd5 7708msgid "read additional per-directory exclude patterns in <file>"
07432cef 7709msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 7710
276ceeaa 7711#: builtin/ls-files.c:465
ef317cd5 7712msgid "add the standard git exclusions"
07432cef 7713msgstr "添加标准的 git 排除"
ef317cd5 7714
276ceeaa 7715#: builtin/ls-files.c:468
ef317cd5 7716msgid "make the output relative to the project top directory"
07432cef 7717msgstr "显示相对于顶级目录的文件名"
ef317cd5 7718
276ceeaa 7719#: builtin/ls-files.c:471
ef317cd5 7720msgid "if any <file> is not in the index, treat this as an error"
07432cef 7721msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 7722
276ceeaa 7723#: builtin/ls-files.c:472
ef317cd5 7724msgid "tree-ish"
07432cef 7725msgstr "树或提交"
ef317cd5 7726
276ceeaa 7727#: builtin/ls-files.c:473
ef317cd5 7728msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 7729msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 7730
276ceeaa 7731#: builtin/ls-files.c:475
ef317cd5 7732msgid "show debugging data"
07432cef 7733msgstr "显示调试数据"
ef317cd5 7734
276ceeaa
JX
7735#: builtin/ls-remote.c:7
7736msgid ""
7737"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
7738" [-q | --quiet] [--exit-code] [--get-url]\n"
7739" [--symref] [<repository> [<refs>...]]"
7740msgstr ""
7741"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
7742" [-q | --quiet] [--exit-code] [--get-url]\n"
7743" [--symref] [<仓库> [<引用>...]]"
7744
7745#: builtin/ls-remote.c:50
7746msgid "do not print remote URL"
7747msgstr "不打印远程 URL"
7748
7749#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
7750msgid "exec"
7751msgstr "exec"
7752
7753#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
7754msgid "path of git-upload-pack on the remote host"
7755msgstr "远程主机上的 git-upload-pack 路径"
7756
7757#: builtin/ls-remote.c:56
7758msgid "limit to tags"
7759msgstr "仅限于标签"
7760
7761#: builtin/ls-remote.c:57
7762msgid "limit to heads"
7763msgstr "仅限于分支"
7764
7765#: builtin/ls-remote.c:58
7766msgid "do not show peeled tags"
7767msgstr "不显示已解析的标签"
7768
7769#: builtin/ls-remote.c:60
7770msgid "take url.<base>.insteadOf into account"
7771msgstr "参考 url.<base>.insteadOf 设置"
7772
7773#: builtin/ls-remote.c:62
7774msgid "exit with exit code 2 if no matching refs are found"
7775msgstr "若未找到匹配的引用则以退出码2退出"
7776
7777#: builtin/ls-remote.c:64
7778msgid "show underlying ref in addition to the object pointed by it"
7779msgstr "除了显示指向的对象外,显示指向的引用名"
7780
90314792 7781#: builtin/ls-tree.c:28
ef317cd5 7782msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 7783msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5 7784
94550ed3 7785#: builtin/ls-tree.c:128
ef317cd5 7786msgid "only show trees"
07432cef 7787msgstr "只显示树"
ef317cd5 7788
94550ed3 7789#: builtin/ls-tree.c:130
ef317cd5 7790msgid "recurse into subtrees"
07432cef 7791msgstr "递归到子树"
ef317cd5 7792
94550ed3 7793#: builtin/ls-tree.c:132
ef317cd5 7794msgid "show trees when recursing"
07432cef 7795msgstr "当递归时显示树"
ef317cd5 7796
94550ed3 7797#: builtin/ls-tree.c:135
ef317cd5 7798msgid "terminate entries with NUL byte"
4375c10e 7799msgstr "条目以 NUL 字符终止"
ef317cd5 7800
94550ed3 7801#: builtin/ls-tree.c:136
ef317cd5 7802msgid "include object size"
07432cef 7803msgstr "包括对象大小"
ef317cd5 7804
94550ed3 7805#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
ef317cd5 7806msgid "list only filenames"
07432cef 7807msgstr "只列出文件名"
ef317cd5 7808
94550ed3 7809#: builtin/ls-tree.c:143
ef317cd5 7810msgid "use full path names"
07432cef 7811msgstr "使用文件的全路径"
ef317cd5 7812
94550ed3 7813#: builtin/ls-tree.c:145
ef317cd5 7814msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 7815msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 7816
04cb2f28 7817#: builtin/merge.c:45
814ff314
JX
7818msgid "git merge [<options>] [<commit>...]"
7819msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 7820
04cb2f28 7821#: builtin/merge.c:46
814ff314
JX
7822msgid "git merge [<options>] <msg> HEAD <commit>"
7823msgstr "git merge [<选项>] <说明> HEAD <提交>"
ef317cd5 7824
04cb2f28 7825#: builtin/merge.c:47
ef317cd5 7826msgid "git merge --abort"
07432cef 7827msgstr "git merge --abort"
ef317cd5 7828
04cb2f28 7829#: builtin/merge.c:100
c04f5ac3
JX
7830msgid "switch `m' requires a value"
7831msgstr "开关 `m' 需要一个值"
7832
04cb2f28 7833#: builtin/merge.c:137
c04f5ac3
JX
7834#, c-format
7835msgid "Could not find merge strategy '%s'.\n"
90e6ef53 7836msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 7837
04cb2f28 7838#: builtin/merge.c:138
c04f5ac3
JX
7839#, c-format
7840msgid "Available strategies are:"
7841msgstr "可用的策略有:"
7842
04cb2f28 7843#: builtin/merge.c:143
c04f5ac3
JX
7844#, c-format
7845msgid "Available custom strategies are:"
7846msgstr "可用的自定义策略有:"
7847
276ceeaa 7848#: builtin/merge.c:193 builtin/pull.c:123
ef317cd5 7849msgid "do not show a diffstat at the end of the merge"
07432cef 7850msgstr "在合并的最后不显示差异统计"
ef317cd5 7851
276ceeaa 7852#: builtin/merge.c:196 builtin/pull.c:126
ef317cd5 7853msgid "show a diffstat at the end of the merge"
07432cef 7854msgstr "在合并的最后显示差异统计"
ef317cd5 7855
276ceeaa 7856#: builtin/merge.c:197 builtin/pull.c:129
ef317cd5 7857msgid "(synonym to --stat)"
07432cef 7858msgstr "(和 --stat 同义)"
ef317cd5 7859
276ceeaa 7860#: builtin/merge.c:199 builtin/pull.c:132
ef317cd5 7861msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 7862msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 7863
276ceeaa 7864#: builtin/merge.c:202 builtin/pull.c:135
ef317cd5 7865msgid "create a single commit instead of doing a merge"
07432cef 7866msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 7867
276ceeaa 7868#: builtin/merge.c:204 builtin/pull.c:138
ef317cd5 7869msgid "perform a commit if the merge succeeds (default)"
07432cef 7870msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 7871
276ceeaa 7872#: builtin/merge.c:206 builtin/pull.c:141
ef317cd5 7873msgid "edit message before committing"
07432cef 7874msgstr "在提交前编辑提交说明"
ef317cd5 7875
04cb2f28 7876#: builtin/merge.c:207
ef317cd5 7877msgid "allow fast-forward (default)"
07432cef 7878msgstr "允许快进(默认)"
ef317cd5 7879
276ceeaa 7880#: builtin/merge.c:209 builtin/pull.c:147
ef317cd5 7881msgid "abort if fast-forward is not possible"
07432cef 7882msgstr "如果不能快进就放弃合并"
ef317cd5 7883
04cb2f28 7884#: builtin/merge.c:213
1003b3a5
JX
7885msgid "Verify that the named commit has a valid GPG signature"
7886msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7887
276ceeaa 7888#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
1b7f4a34 7889#: builtin/revert.c:89
ef317cd5 7890msgid "strategy"
07432cef 7891msgstr "策略"
ef317cd5 7892
276ceeaa 7893#: builtin/merge.c:215 builtin/pull.c:153
ef317cd5 7894msgid "merge strategy to use"
07432cef 7895msgstr "要使用的合并策略"
ef317cd5 7896
276ceeaa 7897#: builtin/merge.c:216 builtin/pull.c:156
ef317cd5 7898msgid "option=value"
07432cef 7899msgstr "option=value"
ef317cd5 7900
276ceeaa 7901#: builtin/merge.c:217 builtin/pull.c:157
ef317cd5 7902msgid "option for selected merge strategy"
07432cef 7903msgstr "所选的合并策略的选项"
ef317cd5 7904
04cb2f28 7905#: builtin/merge.c:219
ef317cd5 7906msgid "merge commit message (for a non-fast-forward merge)"
07432cef 7907msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 7908
04cb2f28 7909#: builtin/merge.c:223
ef317cd5 7910msgid "abort the current in-progress merge"
07432cef 7911msgstr "放弃当前正在进行的合并"
ef317cd5 7912
04cb2f28 7913#: builtin/merge.c:251
c04f5ac3
JX
7914msgid "could not run stash."
7915msgstr "不能进行进度保存。"
7916
04cb2f28 7917#: builtin/merge.c:256
c04f5ac3
JX
7918msgid "stash failed"
7919msgstr "进度保存失败"
7920
04cb2f28 7921#: builtin/merge.c:261
c04f5ac3
JX
7922#, c-format
7923msgid "not a valid object: %s"
7924msgstr "不是一个有效对象:%s"
7925
04cb2f28 7926#: builtin/merge.c:280 builtin/merge.c:297
c04f5ac3
JX
7927msgid "read-tree failed"
7928msgstr "读取树失败"
7929
90e6ef53 7930# 译者:注意保持前导空格
04cb2f28 7931#: builtin/merge.c:327
c04f5ac3
JX
7932msgid " (nothing to squash)"
7933msgstr " (无可压缩)"
7934
04cb2f28 7935#: builtin/merge.c:340
c04f5ac3
JX
7936#, c-format
7937msgid "Squash commit -- not updating HEAD\n"
7938msgstr "压缩提交 -- 未更新 HEAD\n"
7939
276ceeaa
JX
7940#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
7941#: builtin/merge.c:989
1b7f4a34
JX
7942#, c-format
7943msgid "Could not write to '%s'"
7944msgstr "不能写入 '%s'"
7945
04cb2f28 7946#: builtin/merge.c:372
c04f5ac3
JX
7947msgid "Writing SQUASH_MSG"
7948msgstr "写入 SQUASH_MSG"
7949
04cb2f28 7950#: builtin/merge.c:374
c04f5ac3
JX
7951msgid "Finishing SQUASH_MSG"
7952msgstr "完成 SQUASH_MSG"
7953
04cb2f28 7954#: builtin/merge.c:397
c04f5ac3
JX
7955#, c-format
7956msgid "No merge message -- not updating HEAD\n"
7957msgstr "无合并信息 -- 未更新 HEAD\n"
7958
276ceeaa 7959#: builtin/merge.c:448
c04f5ac3
JX
7960#, c-format
7961msgid "'%s' does not point to a commit"
7962msgstr "'%s' 没有指向一个提交"
7963
276ceeaa 7964#: builtin/merge.c:538
c04f5ac3
JX
7965#, c-format
7966msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 7967msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 7968
276ceeaa 7969#: builtin/merge.c:657
c04f5ac3
JX
7970msgid "Not handling anything other than two heads merge."
7971msgstr "不能处理两个头合并之外的任何操作。"
7972
276ceeaa 7973#: builtin/merge.c:671
c04f5ac3
JX
7974#, c-format
7975msgid "Unknown option for merge-recursive: -X%s"
7976msgstr "merge-recursive 的未知选项:-X%s"
7977
276ceeaa 7978#: builtin/merge.c:684
c04f5ac3
JX
7979#, c-format
7980msgid "unable to write %s"
7981msgstr "不能写 %s"
7982
276ceeaa 7983#: builtin/merge.c:773
c04f5ac3
JX
7984#, c-format
7985msgid "Could not read from '%s'"
7986msgstr "不能从 '%s' 读取"
7987
276ceeaa 7988#: builtin/merge.c:782
c04f5ac3
JX
7989#, c-format
7990msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7991msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7992
276ceeaa 7993#: builtin/merge.c:788
a77c07d9 7994#, c-format
c04f5ac3
JX
7995msgid ""
7996"Please enter a commit message to explain why this merge is necessary,\n"
7997"especially if it merges an updated upstream into a topic branch.\n"
7998"\n"
a77c07d9 7999"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
8000"the commit.\n"
8001msgstr ""
8002"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
8003"合并到主题分支。\n"
8004"\n"
a77c07d9 8005"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 8006
276ceeaa 8007#: builtin/merge.c:812
c04f5ac3
JX
8008msgid "Empty commit message."
8009msgstr "空提交信息。"
8010
276ceeaa 8011#: builtin/merge.c:824
c04f5ac3
JX
8012#, c-format
8013msgid "Wonderful.\n"
8014msgstr "太棒了。\n"
8015
276ceeaa 8016#: builtin/merge.c:879
c04f5ac3
JX
8017#, c-format
8018msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
8019msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
8020
276ceeaa 8021#: builtin/merge.c:895
c04f5ac3
JX
8022#, c-format
8023msgid "'%s' is not a commit"
8024msgstr "'%s' 不是一个提交"
8025
276ceeaa 8026#: builtin/merge.c:936
c04f5ac3 8027msgid "No current branch."
90e6ef53 8028msgstr "没有当前分支。"
c04f5ac3 8029
276ceeaa 8030#: builtin/merge.c:938
c04f5ac3 8031msgid "No remote for the current branch."
160fb2b2 8032msgstr "当前分支没有对应的远程仓库。"
c04f5ac3 8033
276ceeaa 8034#: builtin/merge.c:940
c04f5ac3 8035msgid "No default upstream defined for the current branch."
90e6ef53 8036msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 8037
276ceeaa 8038#: builtin/merge.c:945
170e9899 8039#, c-format
2e8451e8
JX
8040msgid "No remote-tracking branch for %s from %s"
8041msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 8042
276ceeaa 8043#: builtin/merge.c:1080
7aea43ff
JX
8044#, c-format
8045msgid "could not close '%s'"
8046msgstr "不能关闭 '%s'"
8047
276ceeaa 8048#: builtin/merge.c:1207
c04f5ac3 8049msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 8050msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 8051
276ceeaa 8052#: builtin/merge.c:1223
c04f5ac3
JX
8053msgid ""
8054"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 8055"Please, commit your changes before you merge."
c04f5ac3
JX
8056msgstr ""
8057"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 8058"请在合并前先提交您的修改。"
c04f5ac3 8059
276ceeaa 8060#: builtin/merge.c:1230
c04f5ac3
JX
8061msgid ""
8062"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 8063"Please, commit your changes before you merge."
c04f5ac3
JX
8064msgstr ""
8065"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 8066"请在合并前先提交您的修改。"
c04f5ac3 8067
276ceeaa 8068#: builtin/merge.c:1233
c04f5ac3
JX
8069msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
8070msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
8071
276ceeaa 8072#: builtin/merge.c:1242
c04f5ac3 8073msgid "You cannot combine --squash with --no-ff."
649900bc 8074msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 8075
276ceeaa 8076#: builtin/merge.c:1250
c04f5ac3 8077msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 8078msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 8079
276ceeaa 8080#: builtin/merge.c:1267
c04f5ac3
JX
8081msgid "Squash commit into empty head not supported yet"
8082msgstr "尚不支持到空分支的压缩提交"
8083
276ceeaa 8084#: builtin/merge.c:1269
c04f5ac3
JX
8085msgid "Non-fast-forward commit does not make sense into an empty head"
8086msgstr "到空分支的非快进式提交没有意义"
8087
276ceeaa 8088#: builtin/merge.c:1275
2e8451e8
JX
8089#, c-format
8090msgid "%s - not something we can merge"
8091msgstr "%s - 不能被合并"
8092
276ceeaa 8093#: builtin/merge.c:1277
7aea43ff
JX
8094msgid "Can merge only exactly one commit into empty head"
8095msgstr "只能将一个提交合并到空分支上"
8096
276ceeaa 8097#: builtin/merge.c:1332
1003b3a5
JX
8098#, c-format
8099msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
8100msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
8101
276ceeaa 8102#: builtin/merge.c:1335
1003b3a5
JX
8103#, c-format
8104msgid "Commit %s has a bad GPG signature allegedly by %s."
8105msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
8106
276ceeaa 8107#: builtin/merge.c:1338
1003b3a5
JX
8108#, c-format
8109msgid "Commit %s does not have a GPG signature."
8110msgstr "提交 %s 没有一个 GPG 签名。"
8111
276ceeaa 8112#: builtin/merge.c:1341
1003b3a5
JX
8113#, c-format
8114msgid "Commit %s has a good GPG signature by %s\n"
8115msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
8116
276ceeaa 8117#: builtin/merge.c:1424
c04f5ac3
JX
8118#, c-format
8119msgid "Updating %s..%s\n"
8120msgstr "更新 %s..%s\n"
8121
276ceeaa 8122#: builtin/merge.c:1461
c04f5ac3
JX
8123#, c-format
8124msgid "Trying really trivial in-index merge...\n"
90e6ef53 8125msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 8126
276ceeaa 8127#: builtin/merge.c:1468
c04f5ac3
JX
8128#, c-format
8129msgid "Nope.\n"
8130msgstr "无。\n"
8131
276ceeaa 8132#: builtin/merge.c:1500
c04f5ac3 8133msgid "Not possible to fast-forward, aborting."
1aabac65 8134msgstr "无法快进,终止。"
c04f5ac3 8135
276ceeaa 8136#: builtin/merge.c:1523 builtin/merge.c:1602
c04f5ac3
JX
8137#, c-format
8138msgid "Rewinding the tree to pristine...\n"
8139msgstr "将树回滚至原始状态...\n"
8140
276ceeaa 8141#: builtin/merge.c:1527
c04f5ac3
JX
8142#, c-format
8143msgid "Trying merge strategy %s...\n"
8144msgstr "尝试合并策略 %s...\n"
8145
276ceeaa 8146#: builtin/merge.c:1593
c04f5ac3
JX
8147#, c-format
8148msgid "No merge strategy handled the merge.\n"
8149msgstr "没有合并策略处理此合并。\n"
8150
276ceeaa 8151#: builtin/merge.c:1595
c04f5ac3
JX
8152#, c-format
8153msgid "Merge with strategy %s failed.\n"
8154msgstr "使用策略 %s 合并失败。\n"
8155
276ceeaa 8156#: builtin/merge.c:1604
c04f5ac3
JX
8157#, c-format
8158msgid "Using the %s to prepare resolving by hand.\n"
8159msgstr "使用 %s 以准备手工解决。\n"
8160
276ceeaa 8161#: builtin/merge.c:1616
c04f5ac3
JX
8162#, c-format
8163msgid "Automatic merge went well; stopped before committing as requested\n"
8164msgstr "自动合并进展顺利,按要求在提交前停止\n"
8165
cfff71a9 8166#: builtin/merge-base.c:29
814ff314
JX
8167msgid "git merge-base [-a | --all] <commit> <commit>..."
8168msgstr "git merge-base [-a | --all] <提交> <提交>..."
ef317cd5 8169
cfff71a9 8170#: builtin/merge-base.c:30
814ff314
JX
8171msgid "git merge-base [-a | --all] --octopus <commit>..."
8172msgstr "git merge-base [-a | --all] --octopus <提交>..."
ef317cd5 8173
cfff71a9 8174#: builtin/merge-base.c:31
ef317cd5 8175msgid "git merge-base --independent <commit>..."
07432cef 8176msgstr "git merge-base --independent <提交>..."
ef317cd5 8177
cfff71a9 8178#: builtin/merge-base.c:32
ef317cd5 8179msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 8180msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5 8181
cfff71a9
JX
8182#: builtin/merge-base.c:33
8183msgid "git merge-base --fork-point <ref> [<commit>]"
d9d56b23 8184msgstr "git merge-base --fork-point <引用> [<提交>]"
cfff71a9
JX
8185
8186#: builtin/merge-base.c:214
ef317cd5 8187msgid "output all common ancestors"
07432cef 8188msgstr "输出所有共同的祖先"
ef317cd5 8189
cfff71a9 8190#: builtin/merge-base.c:216
ef317cd5 8191msgid "find ancestors for a single n-way merge"
07432cef 8192msgstr "查找一个多路合并的祖先提交"
ef317cd5 8193
cfff71a9 8194#: builtin/merge-base.c:218
ef317cd5 8195msgid "list revs not reachable from others"
07432cef 8196msgstr "显示不能被其他访问到的版本"
ef317cd5 8197
cfff71a9 8198#: builtin/merge-base.c:220
ef317cd5 8199msgid "is the first one ancestor of the other?"
07432cef 8200msgstr "第一个是其他的祖先提交么?"
ef317cd5 8201
cfff71a9
JX
8202#: builtin/merge-base.c:222
8203msgid "find where <commit> forked from reflog of <ref>"
e397e7e3 8204msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
cfff71a9 8205
ef317cd5
JX
8206#: builtin/merge-file.c:8
8207msgid ""
814ff314
JX
8208"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
8209"<orig-file> <file2>"
ef317cd5 8210msgstr ""
814ff314
JX
8211"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
8212"件> <文件2>"
ef317cd5
JX
8213
8214#: builtin/merge-file.c:33
8215msgid "send results to standard output"
07432cef 8216msgstr "将结果发送到标准输出"
ef317cd5
JX
8217
8218#: builtin/merge-file.c:34
8219msgid "use a diff3 based merge"
07432cef 8220msgstr "使用基于 diff3 的合并"
ef317cd5
JX
8221
8222#: builtin/merge-file.c:35
8223msgid "for conflicts, use our version"
07432cef 8224msgstr "如果冲突,使用我们的版本"
ef317cd5
JX
8225
8226#: builtin/merge-file.c:37
8227msgid "for conflicts, use their version"
07432cef 8228msgstr "如果冲突,使用他们的版本"
ef317cd5
JX
8229
8230#: builtin/merge-file.c:39
8231msgid "for conflicts, use a union version"
07432cef 8232msgstr "如果冲突,使用联合版本"
ef317cd5
JX
8233
8234#: builtin/merge-file.c:42
8235msgid "for conflicts, use this marker size"
07432cef 8236msgstr "如果冲突,使用指定长度的标记"
ef317cd5
JX
8237
8238#: builtin/merge-file.c:43
8239msgid "do not warn about conflicts"
07432cef 8240msgstr "不要警告冲突"
ef317cd5
JX
8241
8242#: builtin/merge-file.c:45
814ff314
JX
8243msgid "set labels for file1/orig-file/file2"
8244msgstr "为 文件1/初始文件/文件2 设置标签"
c04f5ac3 8245
276ceeaa 8246#: builtin/mktree.c:65
ef317cd5 8247msgid "git mktree [-z] [--missing] [--batch]"
07432cef 8248msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 8249
276ceeaa 8250#: builtin/mktree.c:152
ef317cd5 8251msgid "input is NUL terminated"
07432cef 8252msgstr "输入以 NUL 字符终止"
c04f5ac3 8253
276ceeaa 8254#: builtin/mktree.c:153 builtin/write-tree.c:24
ef317cd5 8255msgid "allow missing objects"
07432cef 8256msgstr "允许丢失的对象"
c04f5ac3 8257
276ceeaa 8258#: builtin/mktree.c:154
ef317cd5 8259msgid "allow creation of more than one tree"
07432cef 8260msgstr "允许创建一个以上的树"
c04f5ac3 8261
90314792 8262#: builtin/mv.c:15
814ff314
JX
8263msgid "git mv [<options>] <source>... <destination>"
8264msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 8265
276ceeaa 8266#: builtin/mv.c:70
220c313c
JX
8267#, c-format
8268msgid "Directory %s is in index and no submodule?"
8269msgstr "目录 %s 在索引中并且不是子模组?"
8270
276ceeaa 8271#: builtin/mv.c:72
220c313c 8272msgid "Please stage your changes to .gitmodules or stash them to proceed"
160fb2b2 8273msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
220c313c 8274
276ceeaa 8275#: builtin/mv.c:90
220c313c
JX
8276#, c-format
8277msgid "%.*s is in index"
8278msgstr "%.*s 在索引中"
8279
276ceeaa 8280#: builtin/mv.c:112
ef317cd5 8281msgid "force move/rename even if target exists"
07432cef 8282msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 8283
276ceeaa 8284#: builtin/mv.c:113
ef317cd5 8285msgid "skip move/rename errors"
07432cef 8286msgstr "跳过移动/重命名错误"
c04f5ac3 8287
276ceeaa 8288#: builtin/mv.c:152
220c313c
JX
8289#, c-format
8290msgid "destination '%s' is not a directory"
8291msgstr "目标 '%s' 不是一个目录"
8292
276ceeaa 8293#: builtin/mv.c:163
c04f5ac3
JX
8294#, c-format
8295msgid "Checking rename of '%s' to '%s'\n"
8296msgstr "检查 '%s' 到 '%s' 的重命名\n"
8297
276ceeaa 8298#: builtin/mv.c:167
c04f5ac3
JX
8299msgid "bad source"
8300msgstr "坏的源"
8301
276ceeaa 8302#: builtin/mv.c:170
c04f5ac3
JX
8303msgid "can not move directory into itself"
8304msgstr "不能将目录移动到自身"
8305
276ceeaa 8306#: builtin/mv.c:173
c04f5ac3
JX
8307msgid "cannot move directory over file"
8308msgstr "不能将目录移动到文件"
8309
276ceeaa 8310#: builtin/mv.c:182
c04f5ac3
JX
8311msgid "source directory is empty"
8312msgstr "源目录为空"
8313
276ceeaa 8314#: builtin/mv.c:207
c04f5ac3
JX
8315msgid "not under version control"
8316msgstr "不在版本控制之下"
8317
276ceeaa 8318#: builtin/mv.c:210
c04f5ac3
JX
8319msgid "destination exists"
8320msgstr "目标已存在"
8321
276ceeaa 8322#: builtin/mv.c:218
c04f5ac3
JX
8323#, c-format
8324msgid "overwriting '%s'"
8325msgstr "覆盖 '%s'"
8326
276ceeaa 8327#: builtin/mv.c:221
c04f5ac3
JX
8328msgid "Cannot overwrite"
8329msgstr "不能覆盖"
8330
276ceeaa 8331#: builtin/mv.c:224
c04f5ac3
JX
8332msgid "multiple sources for the same target"
8333msgstr "同一目标具有多个源"
8334
276ceeaa 8335#: builtin/mv.c:226
cfff71a9
JX
8336msgid "destination directory does not exist"
8337msgstr "目标目录不存在"
8338
276ceeaa 8339#: builtin/mv.c:233
c04f5ac3
JX
8340#, c-format
8341msgid "%s, source=%s, destination=%s"
8342msgstr "%s,源=%s,目标=%s"
8343
276ceeaa 8344#: builtin/mv.c:254
c04f5ac3
JX
8345#, c-format
8346msgid "Renaming %s to %s\n"
8347msgstr "重命名 %s 至 %s\n"
8348
276ceeaa 8349#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
c04f5ac3
JX
8350#, c-format
8351msgid "renaming '%s' failed"
8352msgstr "重命名 '%s' 失败"
8353
94550ed3 8354#: builtin/name-rev.c:251
814ff314
JX
8355msgid "git name-rev [<options>] <commit>..."
8356msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 8357
94550ed3 8358#: builtin/name-rev.c:252
814ff314
JX
8359msgid "git name-rev [<options>] --all"
8360msgstr "git name-rev [<选项>] --all"
ef317cd5 8361
94550ed3 8362#: builtin/name-rev.c:253
814ff314
JX
8363msgid "git name-rev [<options>] --stdin"
8364msgstr "git name-rev [<选项>] --stdin"
ef317cd5 8365
94550ed3 8366#: builtin/name-rev.c:305
ef317cd5 8367msgid "print only names (no SHA-1)"
07432cef 8368msgstr "只打印名称(无 SHA-1)"
ef317cd5 8369
94550ed3 8370#: builtin/name-rev.c:306
ef317cd5 8371msgid "only use tags to name the commits"
55a16ee4 8372msgstr "只使用标签来命名提交"
ef317cd5 8373
94550ed3 8374#: builtin/name-rev.c:308
ef317cd5 8375msgid "only use refs matching <pattern>"
07432cef 8376msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 8377
94550ed3 8378#: builtin/name-rev.c:310
ef317cd5 8379msgid "list all commits reachable from all refs"
07432cef 8380msgstr "列出可以从所有引用访问的提交"
ef317cd5 8381
94550ed3 8382#: builtin/name-rev.c:311
ef317cd5 8383msgid "read from stdin"
07432cef 8384msgstr "从标准输入读取"
ef317cd5 8385
94550ed3 8386#: builtin/name-rev.c:312
90314792
JX
8387msgid "allow to print `undefined` names (default)"
8388msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 8389
94550ed3 8390#: builtin/name-rev.c:318
2e8451e8 8391msgid "dereference tags in the input (internal use)"
55a16ee4 8392msgstr "反向解析输入中的标签(内部使用)"
2e8451e8 8393
1b7f4a34 8394#: builtin/notes.c:25
814ff314 8395msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 8396msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 8397
1b7f4a34 8398#: builtin/notes.c:26
ef317cd5 8399msgid ""
814ff314 8400"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 8401"| (-c | -C) <object>] [<object>]"
ef317cd5 8402msgstr ""
04cb2f28
JX
8403"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
8404"| (-c | -C) <对象>] [<对象>]"
ef317cd5 8405
1b7f4a34 8406#: builtin/notes.c:27
814ff314 8407msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 8408msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 8409
1b7f4a34 8410#: builtin/notes.c:28
ef317cd5 8411msgid ""
814ff314 8412"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 8413"(-c | -C) <object>] [<object>]"
ef317cd5 8414msgstr ""
04cb2f28
JX
8415"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
8416"(-c | -C) <对象>] [<对象>]"
ef317cd5 8417
1b7f4a34 8418#: builtin/notes.c:29
814ff314 8419msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 8420msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 8421
1b7f4a34 8422#: builtin/notes.c:30
814ff314 8423msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 8424msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 8425
1b7f4a34 8426#: builtin/notes.c:31
ef317cd5 8427msgid ""
814ff314 8428"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 8429msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 8430
1b7f4a34 8431#: builtin/notes.c:32
ef317cd5 8432msgid "git notes merge --commit [-v | -q]"
07432cef 8433msgstr "git notes merge --commit [-v | -q]"
ef317cd5 8434
1b7f4a34 8435#: builtin/notes.c:33
ef317cd5 8436msgid "git notes merge --abort [-v | -q]"
07432cef 8437msgstr "git notes merge --abort [-v | -q]"
ef317cd5 8438
1b7f4a34 8439#: builtin/notes.c:34
814ff314 8440msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 8441msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 8442
1b7f4a34 8443#: builtin/notes.c:35
814ff314 8444msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
07432cef 8445msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
ef317cd5 8446
1b7f4a34 8447#: builtin/notes.c:36
814ff314 8448msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 8449msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 8450
1b7f4a34 8451#: builtin/notes.c:41
ef317cd5 8452msgid "git notes [list [<object>]]"
07432cef 8453msgstr "git notes [list [<对象>]]"
ef317cd5 8454
1b7f4a34 8455#: builtin/notes.c:46
ef317cd5 8456msgid "git notes add [<options>] [<object>]"
07432cef 8457msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 8458
1b7f4a34 8459#: builtin/notes.c:51
ef317cd5 8460msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 8461msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 8462
1b7f4a34 8463#: builtin/notes.c:52
ef317cd5 8464msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 8465msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 8466
1b7f4a34 8467#: builtin/notes.c:57
ef317cd5 8468msgid "git notes append [<options>] [<object>]"
07432cef 8469msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 8470
1b7f4a34 8471#: builtin/notes.c:62
ef317cd5 8472msgid "git notes edit [<object>]"
07432cef 8473msgstr "git notes edit [<对象>]"
ef317cd5 8474
1b7f4a34 8475#: builtin/notes.c:67
ef317cd5 8476msgid "git notes show [<object>]"
07432cef 8477msgstr "git notes show [<对象>]"
ef317cd5 8478
1b7f4a34 8479#: builtin/notes.c:72
814ff314 8480msgid "git notes merge [<options>] <notes-ref>"
07432cef 8481msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 8482
1b7f4a34 8483#: builtin/notes.c:73
ef317cd5 8484msgid "git notes merge --commit [<options>]"
07432cef 8485msgstr "git notes merge --commit [<选项>]"
ef317cd5 8486
1b7f4a34 8487#: builtin/notes.c:74
ef317cd5 8488msgid "git notes merge --abort [<options>]"
07432cef 8489msgstr "git notes merge --abort [<选项>]"
ef317cd5 8490
1b7f4a34 8491#: builtin/notes.c:79
ef317cd5 8492msgid "git notes remove [<object>]"
07432cef 8493msgstr "git notes remove [<对象>]"
ef317cd5 8494
1b7f4a34 8495#: builtin/notes.c:84
ef317cd5 8496msgid "git notes prune [<options>]"
07432cef 8497msgstr "git notes prune [<选项>]"
ef317cd5 8498
1b7f4a34 8499#: builtin/notes.c:89
ef317cd5 8500msgid "git notes get-ref"
07432cef 8501msgstr "git notes get-ref"
ef317cd5 8502
1b7f4a34 8503#: builtin/notes.c:147
c04f5ac3
JX
8504#, c-format
8505msgid "unable to start 'show' for object '%s'"
8506msgstr "不能为对象 '%s' 开始 'show'"
8507
1b7f4a34 8508#: builtin/notes.c:151
a77c07d9
JX
8509msgid "could not read 'show' output"
8510msgstr "不能读取 'show' 的输出"
c04f5ac3 8511
1b7f4a34 8512#: builtin/notes.c:159
c04f5ac3
JX
8513#, c-format
8514msgid "failed to finish 'show' for object '%s'"
8515msgstr "无法为对象 '%s' 完成 'show'"
8516
94550ed3 8517#: builtin/notes.c:174 builtin/tag.c:248
c04f5ac3
JX
8518#, c-format
8519msgid "could not create file '%s'"
8520msgstr "不能创建文件 '%s'"
8521
1b7f4a34 8522#: builtin/notes.c:193
c04f5ac3
JX
8523msgid "Please supply the note contents using either -m or -F option"
8524msgstr "请通过 -m 或 -F 选项为注解提供内容"
8525
1b7f4a34 8526#: builtin/notes.c:202
c04f5ac3
JX
8527msgid "unable to write note object"
8528msgstr "不能写注解对象"
8529
1b7f4a34 8530#: builtin/notes.c:204
c04f5ac3 8531#, c-format
220c313c
JX
8532msgid "The note contents have been left in %s"
8533msgstr "注解内容被留在 %s 中"
c04f5ac3 8534
94550ed3 8535#: builtin/notes.c:232 builtin/tag.c:440
c04f5ac3
JX
8536#, c-format
8537msgid "cannot read '%s'"
8538msgstr "不能读取 '%s'"
8539
94550ed3 8540#: builtin/notes.c:234 builtin/tag.c:443
c04f5ac3
JX
8541#, c-format
8542msgid "could not open or read '%s'"
8543msgstr "不能打开或读取 '%s'"
8544
1b7f4a34 8545#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
276ceeaa
JX
8546#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
8547#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
8548#: builtin/notes.c:880 builtin/tag.c:456
c04f5ac3
JX
8549#, c-format
8550msgid "Failed to resolve '%s' as a valid ref."
90e6ef53 8551msgstr "无法解析 '%s' 为一个有效引用。"
c04f5ac3 8552
1b7f4a34 8553#: builtin/notes.c:256
c04f5ac3
JX
8554#, c-format
8555msgid "Failed to read object '%s'."
8556msgstr "无法读取对象 '%s'。"
8557
1b7f4a34 8558#: builtin/notes.c:260
6c94aba5
JX
8559#, c-format
8560msgid "Cannot read note data from non-blob object '%s'."
8561msgstr "不能从非数据对象 '%s' 中读取注解数据"
8562
276ceeaa
JX
8563#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
8564#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
8565#: builtin/notes.c:945
c04f5ac3
JX
8566msgid "too many parameters"
8567msgstr "参数太多"
8568
276ceeaa 8569#: builtin/notes.c:375 builtin/notes.c:662
c04f5ac3
JX
8570#, c-format
8571msgid "No note found for object %s."
8572msgstr "未发现对象 %s 的注解。"
8573
276ceeaa 8574#: builtin/notes.c:396 builtin/notes.c:559
ef317cd5 8575msgid "note contents as a string"
07432cef 8576msgstr "注解内容作为一个字符串"
ef317cd5 8577
276ceeaa 8578#: builtin/notes.c:399 builtin/notes.c:562
ef317cd5 8579msgid "note contents in a file"
07432cef 8580msgstr "注解内容到一个文件中"
ef317cd5 8581
276ceeaa 8582#: builtin/notes.c:402 builtin/notes.c:565
ef317cd5 8583msgid "reuse and edit specified note object"
07432cef 8584msgstr "重用和编辑指定的注解对象"
ef317cd5 8585
276ceeaa 8586#: builtin/notes.c:405 builtin/notes.c:568
ef317cd5 8587msgid "reuse specified note object"
07432cef 8588msgstr "重用指定的注解对象"
ef317cd5 8589
276ceeaa 8590#: builtin/notes.c:408 builtin/notes.c:571
04cb2f28
JX
8591msgid "allow storing empty note"
8592msgstr "允许保存空白注释"
8593
276ceeaa 8594#: builtin/notes.c:409 builtin/notes.c:480
ef317cd5 8595msgid "replace existing notes"
07432cef 8596msgstr "替换已存在的注解"
ef317cd5 8597
276ceeaa 8598#: builtin/notes.c:434
c04f5ac3
JX
8599#, c-format
8600msgid ""
8601"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
8602"existing notes"
8603msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8604
276ceeaa 8605#: builtin/notes.c:449 builtin/notes.c:528
c04f5ac3
JX
8606#, c-format
8607msgid "Overwriting existing notes for object %s\n"
8608msgstr "覆盖对象 %s 现存注解\n"
8609
276ceeaa 8610#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
04cb2f28
JX
8611#, c-format
8612msgid "Removing note for object %s\n"
8613msgstr "删除对象 %s 的注解\n"
8614
276ceeaa 8615#: builtin/notes.c:481
ef317cd5 8616msgid "read objects from stdin"
07432cef 8617msgstr "从标准输入读取对象"
ef317cd5 8618
276ceeaa 8619#: builtin/notes.c:483
ef317cd5 8620msgid "load rewriting config for <command> (implies --stdin)"
07432cef 8621msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 8622
276ceeaa 8623#: builtin/notes.c:501
c04f5ac3
JX
8624msgid "too few parameters"
8625msgstr "参数太少"
8626
276ceeaa 8627#: builtin/notes.c:522
c04f5ac3
JX
8628#, c-format
8629msgid ""
8630"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
8631"existing notes"
8632msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8633
276ceeaa 8634#: builtin/notes.c:534
c04f5ac3
JX
8635#, c-format
8636msgid "Missing notes on source object %s. Cannot copy."
8637msgstr "源对象 %s 缺少注解。不能拷贝。"
8638
276ceeaa 8639#: builtin/notes.c:586
ef317cd5
JX
8640#, c-format
8641msgid ""
8642"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
8643"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
8644msgstr ""
8645"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
8646"请换用 'git notes add -f -m/-F/-c/-C'。\n"
8647
276ceeaa 8648#: builtin/notes.c:767
ef317cd5 8649msgid "General options"
07432cef 8650msgstr "通用选项"
ef317cd5 8651
276ceeaa 8652#: builtin/notes.c:769
ef317cd5 8653msgid "Merge options"
07432cef 8654msgstr "合并选项"
ef317cd5 8655
276ceeaa 8656#: builtin/notes.c:771
ef317cd5
JX
8657msgid ""
8658"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
8659"cat_sort_uniq)"
07432cef 8660msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 8661
276ceeaa 8662#: builtin/notes.c:773
ef317cd5 8663msgid "Committing unmerged notes"
07432cef 8664msgstr "提交未合并的注解"
ef317cd5 8665
276ceeaa 8666#: builtin/notes.c:775
ef317cd5 8667msgid "finalize notes merge by committing unmerged notes"
07432cef 8668msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 8669
276ceeaa 8670#: builtin/notes.c:777
ef317cd5 8671msgid "Aborting notes merge resolution"
07432cef 8672msgstr "中止注解合并的方案"
ef317cd5 8673
276ceeaa 8674#: builtin/notes.c:779
ef317cd5 8675msgid "abort notes merge"
07432cef 8676msgstr "中止注解合并"
ef317cd5 8677
276ceeaa 8678#: builtin/notes.c:856
1b7f4a34
JX
8679#, c-format
8680msgid "A notes merge into %s is already in-progress at %s"
8681msgstr "一个到 %s 的注解合并已经在 %s 执行中"
8682
276ceeaa 8683#: builtin/notes.c:883
ef317cd5
JX
8684#, c-format
8685msgid "Object %s has no note\n"
8686msgstr "对象 %s 没有注解\n"
8687
276ceeaa 8688#: builtin/notes.c:895
ef317cd5 8689msgid "attempt to remove non-existent note is not an error"
07432cef 8690msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 8691
276ceeaa 8692#: builtin/notes.c:898
ef317cd5 8693msgid "read object names from the standard input"
07432cef 8694msgstr "从标准输入读取对象名称"
ef317cd5 8695
276ceeaa 8696#: builtin/notes.c:979
6c94aba5 8697msgid "notes-ref"
07432cef 8698msgstr "注解引用"
ef317cd5 8699
276ceeaa 8700#: builtin/notes.c:980
814ff314 8701msgid "use notes from <notes-ref>"
07432cef 8702msgstr "从 <注解引用> 使用注解"
ef317cd5 8703
276ceeaa 8704#: builtin/notes.c:1015 builtin/remote.c:1626
ef317cd5
JX
8705#, c-format
8706msgid "Unknown subcommand: %s"
8707msgstr "未知子命令:%s"
8708
220c313c 8709#: builtin/pack-objects.c:28
1b7f4a34
JX
8710msgid ""
8711"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
8712msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
ef317cd5 8713
220c313c 8714#: builtin/pack-objects.c:29
1b7f4a34
JX
8715msgid ""
8716"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
8717msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
ef317cd5 8718
814ff314 8719#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
ef317cd5
JX
8720#, c-format
8721msgid "deflate error (%d)"
8722msgstr "压缩错误 (%d)"
8723
276ceeaa 8724#: builtin/pack-objects.c:772
6c94aba5
JX
8725msgid "Writing objects"
8726msgstr "写入对象中"
8727
276ceeaa 8728#: builtin/pack-objects.c:1012
6c94aba5
JX
8729msgid "disabling bitmap writing, as some objects are not being packed"
8730msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
8731
276ceeaa 8732#: builtin/pack-objects.c:2172
6c94aba5
JX
8733msgid "Compressing objects"
8734msgstr "压缩对象中"
8735
276ceeaa 8736#: builtin/pack-objects.c:2558
ef317cd5
JX
8737#, c-format
8738msgid "unsupported index version %s"
8739msgstr "不支持的索引版本 %s"
8740
276ceeaa 8741#: builtin/pack-objects.c:2562
ef317cd5
JX
8742#, c-format
8743msgid "bad index version '%s'"
8744msgstr "坏的索引版本 '%s'"
8745
276ceeaa 8746#: builtin/pack-objects.c:2592
ef317cd5 8747msgid "do not show progress meter"
07432cef 8748msgstr "不显示进度表"
ef317cd5 8749
276ceeaa 8750#: builtin/pack-objects.c:2594
ef317cd5 8751msgid "show progress meter"
07432cef 8752msgstr "显示进度表"
ef317cd5 8753
276ceeaa 8754#: builtin/pack-objects.c:2596
ef317cd5 8755msgid "show progress meter during object writing phase"
07432cef 8756msgstr "在对象写入阶段显示进度表"
ef317cd5 8757
276ceeaa 8758#: builtin/pack-objects.c:2599
ef317cd5 8759msgid "similar to --all-progress when progress meter is shown"
07432cef 8760msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 8761
276ceeaa 8762#: builtin/pack-objects.c:2600
ef317cd5 8763msgid "version[,offset]"
07432cef 8764msgstr "版本[,偏移]"
ef317cd5 8765
276ceeaa 8766#: builtin/pack-objects.c:2601
ef317cd5 8767msgid "write the pack index file in the specified idx format version"
07432cef 8768msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 8769
276ceeaa 8770#: builtin/pack-objects.c:2604
ef317cd5 8771msgid "maximum size of each output pack file"
07432cef 8772msgstr "每个输出包的最大尺寸"
ef317cd5 8773
276ceeaa 8774#: builtin/pack-objects.c:2606
ef317cd5 8775msgid "ignore borrowed objects from alternate object store"
160fb2b2 8776msgstr "忽略从备用对象存储里借用对象"
ef317cd5 8777
276ceeaa 8778#: builtin/pack-objects.c:2608
ef317cd5 8779msgid "ignore packed objects"
07432cef 8780msgstr "忽略包对象"
ef317cd5 8781
276ceeaa 8782#: builtin/pack-objects.c:2610
ef317cd5 8783msgid "limit pack window by objects"
07432cef 8784msgstr "限制打包窗口的对象数"
ef317cd5 8785
276ceeaa 8786#: builtin/pack-objects.c:2612
ef317cd5 8787msgid "limit pack window by memory in addition to object limit"
07432cef 8788msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 8789
276ceeaa 8790#: builtin/pack-objects.c:2614
ef317cd5 8791msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 8792msgstr "打包允许的 delta 链的最大长度"
ef317cd5 8793
276ceeaa 8794#: builtin/pack-objects.c:2616
ef317cd5 8795msgid "reuse existing deltas"
07432cef 8796msgstr "重用已存在的 deltas"
ef317cd5 8797
276ceeaa 8798#: builtin/pack-objects.c:2618
ef317cd5 8799msgid "reuse existing objects"
07432cef 8800msgstr "重用已存在的对象"
ef317cd5 8801
276ceeaa 8802#: builtin/pack-objects.c:2620
ef317cd5 8803msgid "use OFS_DELTA objects"
07432cef 8804msgstr "使用 OFS_DELTA 对象"
ef317cd5 8805
276ceeaa 8806#: builtin/pack-objects.c:2622
ef317cd5 8807msgid "use threads when searching for best delta matches"
07432cef 8808msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 8809
276ceeaa 8810#: builtin/pack-objects.c:2624
ef317cd5 8811msgid "do not create an empty pack output"
07432cef 8812msgstr "不创建空的包输出"
ef317cd5 8813
276ceeaa 8814#: builtin/pack-objects.c:2626
ef317cd5 8815msgid "read revision arguments from standard input"
d9d56b23 8816msgstr "从标准输入读取版本号参数"
ef317cd5 8817
276ceeaa 8818#: builtin/pack-objects.c:2628
ef317cd5 8819msgid "limit the objects to those that are not yet packed"
07432cef 8820msgstr "限制那些尚未打包的对象"
ef317cd5 8821
276ceeaa 8822#: builtin/pack-objects.c:2631
ef317cd5 8823msgid "include objects reachable from any reference"
07432cef 8824msgstr "包括可以从任何引用访问到的对象"
ef317cd5 8825
276ceeaa 8826#: builtin/pack-objects.c:2634
ef317cd5 8827msgid "include objects referred by reflog entries"
07432cef 8828msgstr "包括被引用日志引用到的对象"
ef317cd5 8829
276ceeaa 8830#: builtin/pack-objects.c:2637
220c313c
JX
8831msgid "include objects referred to by the index"
8832msgstr "包括被索引引用到的对象"
8833
276ceeaa 8834#: builtin/pack-objects.c:2640
ef317cd5 8835msgid "output pack to stdout"
07432cef 8836msgstr "输出包到标准输出"
ef317cd5 8837
276ceeaa 8838#: builtin/pack-objects.c:2642
ef317cd5 8839msgid "include tag objects that refer to objects to be packed"
53438e8f 8840msgstr "包括那些引用了待打包对象的标签对象"
ef317cd5 8841
276ceeaa 8842#: builtin/pack-objects.c:2644
ef317cd5 8843msgid "keep unreachable objects"
07432cef 8844msgstr "维持不可达的对象"
ef317cd5 8845
276ceeaa 8846#: builtin/pack-objects.c:2645 parse-options.h:142
ef317cd5
JX
8847msgid "time"
8848msgstr "时间"
8849
276ceeaa 8850#: builtin/pack-objects.c:2646
ef317cd5 8851msgid "unpack unreachable objects newer than <time>"
07432cef 8852msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 8853
276ceeaa 8854#: builtin/pack-objects.c:2649
ef317cd5 8855msgid "create thin packs"
07432cef 8856msgstr "创建精简包"
ef317cd5 8857
276ceeaa 8858#: builtin/pack-objects.c:2651
04cb2f28 8859msgid "create packs suitable for shallow fetches"
160fb2b2 8860msgstr "创建适合浅克隆仓库获取的包"
04cb2f28 8861
276ceeaa 8862#: builtin/pack-objects.c:2653
ef317cd5 8863msgid "ignore packs that have companion .keep file"
07432cef 8864msgstr "忽略配有 .keep 文件的包"
ef317cd5 8865
276ceeaa 8866#: builtin/pack-objects.c:2655
ef317cd5 8867msgid "pack compression level"
07432cef 8868msgstr "打包压缩级别"
ef317cd5 8869
276ceeaa 8870#: builtin/pack-objects.c:2657
ef317cd5 8871msgid "do not hide commits by grafts"
cfff71a9 8872msgstr "显示被嫁接隐藏的提交"
ef317cd5 8873
276ceeaa 8874#: builtin/pack-objects.c:2659
6c94aba5
JX
8875msgid "use a bitmap index if available to speed up counting objects"
8876msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8877
276ceeaa 8878#: builtin/pack-objects.c:2661
6c94aba5
JX
8879msgid "write a bitmap index together with the pack index"
8880msgstr "在建立包索引的同时创建 bitmap 索引"
8881
276ceeaa 8882#: builtin/pack-objects.c:2752
6c94aba5
JX
8883msgid "Counting objects"
8884msgstr "对象计数中"
8885
ef317cd5 8886#: builtin/pack-refs.c:6
814ff314
JX
8887msgid "git pack-refs [<options>]"
8888msgstr "git pack-refs [<选项>]"
c04f5ac3 8889
ef317cd5
JX
8890#: builtin/pack-refs.c:14
8891msgid "pack everything"
07432cef 8892msgstr "打包一切"
c04f5ac3 8893
ef317cd5
JX
8894#: builtin/pack-refs.c:15
8895msgid "prune loose refs (default)"
07432cef 8896msgstr "清除松散的引用(默认)"
c04f5ac3 8897
ef317cd5 8898#: builtin/prune-packed.c:7
814ff314
JX
8899msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8900msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 8901
220c313c 8902#: builtin/prune-packed.c:40
6c94aba5
JX
8903msgid "Removing duplicate objects"
8904msgstr "正在删除重复对象"
8905
5bb01d4f 8906#: builtin/prune.c:11
ef317cd5 8907msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
07432cef 8908msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7ac1c0ad 8909
94550ed3 8910#: builtin/prune.c:105 builtin/worktree.c:124
1b7f4a34
JX
8911msgid "do not remove, show only"
8912msgstr "不删除,只显示"
8913
94550ed3 8914#: builtin/prune.c:106 builtin/worktree.c:125
1b7f4a34
JX
8915msgid "report pruned objects"
8916msgstr "报告清除的对象"
8917
94550ed3 8918#: builtin/prune.c:109 builtin/worktree.c:127
1b7f4a34
JX
8919msgid "expire objects older than <time>"
8920msgstr "使早于给定时间的对象过期"
8921
94550ed3
JX
8922#: builtin/prune.c:123
8923msgid "cannot prune in a precious-objects repo"
8924msgstr "不能在珍品仓库中执行清理操作"
8925
276ceeaa 8926#: builtin/pull.c:72
94550ed3 8927msgid "git pull [<options>] [<repository> [<refspec>...]]"
1b7f4a34
JX
8928msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
8929
276ceeaa 8930#: builtin/pull.c:117
1b7f4a34
JX
8931msgid "Options related to merging"
8932msgstr "和合并相关的选项"
8933
276ceeaa 8934#: builtin/pull.c:120
1b7f4a34
JX
8935msgid "incorporate changes by rebasing rather than merging"
8936msgstr "使用变基操作取代合并操作以合入修改"
8937
276ceeaa 8938#: builtin/pull.c:144 builtin/revert.c:105
1b7f4a34
JX
8939msgid "allow fast-forward"
8940msgstr "允许快进式"
8941
276ceeaa 8942#: builtin/pull.c:150
1b7f4a34
JX
8943msgid "verify that the named commit has a valid GPG signature"
8944msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
8945
276ceeaa 8946#: builtin/pull.c:164
1b7f4a34
JX
8947msgid "Options related to fetching"
8948msgstr "和获取相关的参数"
8949
276ceeaa
JX
8950#: builtin/pull.c:186
8951msgid "number of submodules pulled in parallel"
8952msgstr "并发拉取的子模组的数量"
8953
8954#: builtin/pull.c:275
1b7f4a34
JX
8955#, c-format
8956msgid "Invalid value for pull.ff: %s"
8957msgstr "pull.ff 的取值无效:%s"
8958
276ceeaa 8959#: builtin/pull.c:359
1b7f4a34
JX
8960msgid "Cannot pull with rebase: You have unstaged changes."
8961msgstr "无法通过变基方式拉取:您有未暂存的变更。"
8962
276ceeaa 8963#: builtin/pull.c:365
1b7f4a34
JX
8964msgid "Additionally, your index contains uncommitted changes."
8965msgstr "而且您的索引中包含未提交的变更。"
8966
276ceeaa 8967#: builtin/pull.c:367
1b7f4a34
JX
8968msgid "Cannot pull with rebase: Your index contains uncommitted changes."
8969msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
8970
276ceeaa 8971#: builtin/pull.c:443
1b7f4a34
JX
8972msgid ""
8973"There is no candidate for rebasing against among the refs that you just "
8974"fetched."
8975msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
8976
276ceeaa 8977#: builtin/pull.c:445
1b7f4a34
JX
8978msgid ""
8979"There are no candidates for merging among the refs that you just fetched."
8980msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
8981
276ceeaa 8982#: builtin/pull.c:446
1b7f4a34
JX
8983msgid ""
8984"Generally this means that you provided a wildcard refspec which had no\n"
8985"matches on the remote end."
8986msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
8987
276ceeaa 8988#: builtin/pull.c:449
1b7f4a34
JX
8989#, c-format
8990msgid ""
8991"You asked to pull from the remote '%s', but did not specify\n"
8992"a branch. Because this is not the default configured remote\n"
8993"for your current branch, you must specify a branch on the command line."
8994msgstr ""
8995"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
8996"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
8997
276ceeaa 8998#: builtin/pull.c:454
1b7f4a34
JX
8999msgid "You are not currently on a branch."
9000msgstr "您当前不在一个分支上。"
9001
276ceeaa 9002#: builtin/pull.c:456 builtin/pull.c:471
1b7f4a34
JX
9003msgid "Please specify which branch you want to rebase against."
9004msgstr "请指定您要变基到哪一个分支。"
9005
276ceeaa 9006#: builtin/pull.c:458 builtin/pull.c:473
1b7f4a34
JX
9007msgid "Please specify which branch you want to merge with."
9008msgstr "请指定您要合并哪一个分支。"
9009
276ceeaa 9010#: builtin/pull.c:459 builtin/pull.c:474
1b7f4a34
JX
9011msgid "See git-pull(1) for details."
9012msgstr "详见 git-pull(1)。"
9013
276ceeaa 9014#: builtin/pull.c:469
1b7f4a34
JX
9015msgid "There is no tracking information for the current branch."
9016msgstr "当前分支没有跟踪信息。"
9017
276ceeaa 9018#: builtin/pull.c:478
1b7f4a34
JX
9019#, c-format
9020msgid ""
9021"If you wish to set tracking information for this branch you can do so with:\n"
9022"\n"
9023" git branch --set-upstream-to=%s/<branch> %s\n"
9024msgstr ""
9025"如果您想要为此分支创建跟踪信息,您可以执行:\n"
9026"\n"
9027" git branch --set-upstream-to=%s/<branch> %s\n"
7ac1c0ad 9028
276ceeaa 9029#: builtin/pull.c:483
1b7f4a34
JX
9030#, c-format
9031msgid ""
9032"Your configuration specifies to merge with the ref '%s'\n"
9033"from the remote, but no such ref was fetched."
9034msgstr ""
9035"您的配置中指定要合并远程的引用 '%s',\n"
9036"但是没有获取到这个引用。"
7ac1c0ad 9037
276ceeaa 9038#: builtin/pull.c:841
1b7f4a34
JX
9039msgid "Updating an unborn branch with changes added to the index."
9040msgstr "更新尚未诞生的分支,变更添加至索引。"
9041
276ceeaa 9042#: builtin/pull.c:870
1b7f4a34
JX
9043#, c-format
9044msgid ""
9045"fetch updated the current branch head.\n"
9046"fast-forwarding your working tree from\n"
9047"commit %s."
9048msgstr ""
9049"fetch 更新了当前的分支。快进您的工作区\n"
9050"至提交 %s。"
ef317cd5 9051
276ceeaa 9052#: builtin/pull.c:875
1b7f4a34
JX
9053#, c-format
9054msgid ""
9055"Cannot fast-forward your working tree.\n"
9056"After making sure that you saved anything precious from\n"
9057"$ git diff %s\n"
9058"output, run\n"
9059"$ git reset --hard\n"
9060"to recover."
9061msgstr ""
9062"您当前的工作区无法执行快进操作。\n"
9063"首先执行如下命令:\n"
9064"$ git diff %s\n"
9065"以确认所有有用的数据均已保存。然后执行下面的命令\n"
9066"$ git reset --hard\n"
9067"恢复之前的状态。"
9068
276ceeaa 9069#: builtin/pull.c:890
1b7f4a34
JX
9070msgid "Cannot merge multiple branches into empty head."
9071msgstr "无法将多个分支合并到空分支。"
9072
276ceeaa 9073#: builtin/pull.c:894
1b7f4a34
JX
9074msgid "Cannot rebase onto multiple branches."
9075msgstr "无法变基到多个分支。"
9076
89f80d72 9077#: builtin/push.c:16
ef317cd5 9078msgid "git push [<options>] [<repository> [<refspec>...]]"
160fb2b2 9079msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
7ac1c0ad 9080
276ceeaa 9081#: builtin/push.c:89
c04f5ac3 9082msgid "tag shorthand without <tag>"
55a16ee4 9083msgstr "标签后面未提供 <标签> 参数"
c04f5ac3 9084
276ceeaa 9085#: builtin/push.c:99
c04f5ac3 9086msgid "--delete only accepts plain target ref names"
90e6ef53 9087msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 9088
276ceeaa 9089#: builtin/push.c:143
8ada9598
JX
9090msgid ""
9091"\n"
9092"To choose either option permanently, see push.default in 'git help config'."
9093msgstr ""
81809b99
JX
9094"\n"
9095"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 9096
276ceeaa 9097#: builtin/push.c:146
8ada9598
JX
9098#, c-format
9099msgid ""
9100"The upstream branch of your current branch does not match\n"
9101"the name of your current branch. To push to the upstream branch\n"
9102"on the remote, use\n"
9103"\n"
9104" git push %s HEAD:%s\n"
9105"\n"
9106"To push to the branch of the same name on the remote, use\n"
9107"\n"
9108" git push %s %s\n"
9109"%s"
9110msgstr ""
81809b99
JX
9111"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
9112"上游分支,使用\n"
9113"\n"
9114" git push %s HEAD:%s\n"
9115"\n"
9116"为推送至远程同名分支,使用\n"
9117"\n"
9118" git push %s %s\n"
9119"%s"
8ada9598 9120
276ceeaa 9121#: builtin/push.c:161
c04f5ac3
JX
9122#, c-format
9123msgid ""
9124"You are not currently on a branch.\n"
9125"To push the history leading to the current (detached HEAD)\n"
9126"state now, use\n"
9127"\n"
9128" git push %s HEAD:<name-of-remote-branch>\n"
9129msgstr ""
9130"您当前不在一个分支上。\n"
90e6ef53 9131"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 9132"\n"
d9d56b23 9133" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 9134
276ceeaa 9135#: builtin/push.c:175
c04f5ac3
JX
9136#, c-format
9137msgid ""
9138"The current branch %s has no upstream branch.\n"
9139"To push the current branch and set the remote as upstream, use\n"
9140"\n"
9141" git push --set-upstream %s %s\n"
9142msgstr ""
9143"当前分支 %s 没有对应的上游分支。\n"
9144"为推送当前分支并建立与远程上游的跟踪,使用\n"
9145"\n"
9146" git push --set-upstream %s %s\n"
9147
276ceeaa 9148#: builtin/push.c:183
c04f5ac3
JX
9149#, c-format
9150msgid "The current branch %s has multiple upstream branches, refusing to push."
9151msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
9152
276ceeaa 9153#: builtin/push.c:186
73a60cd2
JX
9154#, c-format
9155msgid ""
9156"You are pushing to remote '%s', which is not the upstream of\n"
9157"your current branch '%s', without telling me what to push\n"
9158"to update which remote branch."
9159msgstr ""
9160"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
9161"而没有告诉我要推送什么、更新哪个远程分支。"
9162
276ceeaa 9163#: builtin/push.c:242
c04f5ac3
JX
9164msgid ""
9165"You didn't specify any refspecs to push, and push.default is \"nothing\"."
160fb2b2 9166msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
c04f5ac3 9167
276ceeaa 9168#: builtin/push.c:249
170e9899
JX
9169msgid ""
9170"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
9171"its remote counterpart. Integrate the remote changes (e.g.\n"
9172"'git pull ...') before pushing again.\n"
170e9899
JX
9173"See the 'Note about fast-forwards' in 'git push --help' for details."
9174msgstr ""
eff6d3a9 9175"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 9176"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 9177"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 9178
276ceeaa 9179#: builtin/push.c:255
170e9899
JX
9180msgid ""
9181"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
9182"counterpart. Check out this branch and integrate the remote changes\n"
9183"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
9184"See the 'Note about fast-forwards' in 'git push --help' for details."
9185msgstr ""
eff6d3a9 9186"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 9187"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 9188"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 9189
276ceeaa 9190#: builtin/push.c:261
07432cef 9191msgid ""
a77c07d9
JX
9192"Updates were rejected because the remote contains work that you do\n"
9193"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
9194"to the same ref. You may want to first integrate the remote changes\n"
9195"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
9196"See the 'Note about fast-forwards' in 'git push --help' for details."
9197msgstr ""
160fb2b2
JX
9198"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
9199"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
2e8451e8 9200"(如 'git pull ...')。\n"
a77c07d9
JX
9201"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
9202
276ceeaa 9203#: builtin/push.c:268
a77c07d9 9204msgid "Updates were rejected because the tag already exists in the remote."
55a16ee4 9205msgstr "更新被拒绝,因为该标签在远程已经存在。"
a77c07d9 9206
276ceeaa 9207#: builtin/push.c:271
a77c07d9
JX
9208msgid ""
9209"You cannot update a remote ref that points at a non-commit object,\n"
9210"or update a remote ref to make it point at a non-commit object,\n"
9211"without using the '--force' option.\n"
9212msgstr ""
9213"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
9214"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 9215
276ceeaa 9216#: builtin/push.c:331
c04f5ac3
JX
9217#, c-format
9218msgid "Pushing to %s\n"
9219msgstr "推送到 %s\n"
9220
276ceeaa 9221#: builtin/push.c:335
c04f5ac3
JX
9222#, c-format
9223msgid "failed to push some refs to '%s'"
9224msgstr "无法推送一些引用到 '%s'"
9225
276ceeaa 9226#: builtin/push.c:365
c04f5ac3
JX
9227#, c-format
9228msgid "bad repository '%s'"
160fb2b2 9229msgstr "坏的仓库 '%s'"
c04f5ac3 9230
276ceeaa 9231#: builtin/push.c:366
c04f5ac3
JX
9232msgid ""
9233"No configured push destination.\n"
9234"Either specify the URL from the command-line or configure a remote "
9235"repository using\n"
9236"\n"
9237" git remote add <name> <url>\n"
9238"\n"
9239"and then push using the remote name\n"
9240"\n"
9241" git push <name>\n"
9242msgstr ""
90e6ef53 9243"没有配置推送目标。\n"
4375c10e 9244"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
c04f5ac3 9245"\n"
d9d56b23 9246" git remote add <名称> <地址>\n"
c04f5ac3 9247"\n"
160fb2b2 9248"然后使用该远程仓库名执行推送\n"
c04f5ac3 9249"\n"
d9d56b23 9250" git push <名称>\n"
c04f5ac3 9251
276ceeaa 9252#: builtin/push.c:381
c04f5ac3
JX
9253msgid "--all and --tags are incompatible"
9254msgstr "--all 和 --tags 不兼容"
9255
276ceeaa 9256#: builtin/push.c:382
c04f5ac3 9257msgid "--all can't be combined with refspecs"
160fb2b2 9258msgstr "--all 不能和引用规格同时使用"
c04f5ac3 9259
276ceeaa 9260#: builtin/push.c:387
c04f5ac3
JX
9261msgid "--mirror and --tags are incompatible"
9262msgstr "--mirror 和 --tags 不兼容"
9263
276ceeaa 9264#: builtin/push.c:388
c04f5ac3 9265msgid "--mirror can't be combined with refspecs"
160fb2b2 9266msgstr "--mirror 不能和引用规格同时使用"
c04f5ac3 9267
276ceeaa 9268#: builtin/push.c:393
c04f5ac3
JX
9269msgid "--all and --mirror are incompatible"
9270msgstr "--all 和 --mirror 不兼容"
9271
276ceeaa 9272#: builtin/push.c:505
ef317cd5 9273msgid "repository"
160fb2b2 9274msgstr "仓库"
ef317cd5 9275
276ceeaa 9276#: builtin/push.c:506 builtin/send-pack.c:161
ef317cd5 9277msgid "push all refs"
07432cef 9278msgstr "推送所有引用"
ef317cd5 9279
276ceeaa 9280#: builtin/push.c:507 builtin/send-pack.c:163
ef317cd5 9281msgid "mirror all refs"
07432cef 9282msgstr "镜像所有引用"
ef317cd5 9283
276ceeaa 9284#: builtin/push.c:509
ef317cd5 9285msgid "delete refs"
07432cef 9286msgstr "删除引用"
ef317cd5 9287
276ceeaa 9288#: builtin/push.c:510
ef317cd5 9289msgid "push tags (can't be used with --all or --mirror)"
55a16ee4 9290msgstr "推送标签(不能使用 --all or --mirror)"
ef317cd5 9291
276ceeaa 9292#: builtin/push.c:513 builtin/send-pack.c:164
ef317cd5
JX
9293msgid "force updates"
9294msgstr "强制更新"
9295
276ceeaa 9296#: builtin/push.c:515 builtin/send-pack.c:175
90314792
JX
9297msgid "refname>:<expect"
9298msgstr "引用名>:<期望值"
9299
276ceeaa 9300#: builtin/push.c:516 builtin/send-pack.c:176
90314792
JX
9301msgid "require old value of ref to be at this value"
9302msgstr "要求引用旧的取值为设定值"
9303
276ceeaa 9304#: builtin/push.c:519
ef317cd5 9305msgid "control recursive pushing of submodules"
07432cef 9306msgstr "控制子模组的递归推送"
ef317cd5 9307
276ceeaa 9308#: builtin/push.c:521 builtin/send-pack.c:169
ef317cd5 9309msgid "use thin pack"
07432cef 9310msgstr "使用精简打包"
ef317cd5 9311
276ceeaa 9312#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
1b7f4a34 9313#: builtin/send-pack.c:159
ef317cd5 9314msgid "receive pack program"
07432cef 9315msgstr "接收包程序"
ef317cd5 9316
276ceeaa 9317#: builtin/push.c:524
ef317cd5 9318msgid "set upstream for git pull/status"
07432cef 9319msgstr "设置 git pull/status 的上游"
ef317cd5 9320
276ceeaa 9321#: builtin/push.c:527
ef317cd5 9322msgid "prune locally removed refs"
07432cef 9323msgstr "清除本地删除的引用"
ef317cd5 9324
276ceeaa 9325#: builtin/push.c:529
a77c07d9
JX
9326msgid "bypass pre-push hook"
9327msgstr "绕过 pre-push 钩子"
9328
276ceeaa 9329#: builtin/push.c:530
1003b3a5 9330msgid "push missing but relevant tags"
55a16ee4 9331msgstr "推送缺失但有关的标签"
1003b3a5 9332
276ceeaa 9333#: builtin/push.c:533 builtin/send-pack.c:166
220c313c
JX
9334msgid "GPG sign the push"
9335msgstr "用 GPG 为推送签名"
9336
276ceeaa 9337#: builtin/push.c:535 builtin/send-pack.c:170
814ff314
JX
9338msgid "request atomic transaction on remote side"
9339msgstr "需要远端支持原子事务"
9340
276ceeaa 9341#: builtin/push.c:549
c04f5ac3
JX
9342msgid "--delete is incompatible with --all, --mirror and --tags"
9343msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
9344
276ceeaa 9345#: builtin/push.c:551
c04f5ac3
JX
9346msgid "--delete doesn't make sense without any refs"
9347msgstr "--delete 未接任何引用没有意义"
9348
220c313c 9349#: builtin/read-tree.c:37
ef317cd5 9350msgid ""
1b7f4a34 9351"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
ef317cd5
JX
9352"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9353"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
9354msgstr ""
1b7f4a34 9355"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
07432cef 9356"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
1b7f4a34 9357"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
ef317cd5 9358
220c313c 9359#: builtin/read-tree.c:110
ef317cd5 9360msgid "write resulting index to <file>"
d9d56b23 9361msgstr "将索引结果写入 <文件>"
ef317cd5 9362
220c313c 9363#: builtin/read-tree.c:113
ef317cd5 9364msgid "only empty the index"
07432cef 9365msgstr "只是清空索引"
ef317cd5 9366
220c313c 9367#: builtin/read-tree.c:115
ef317cd5 9368msgid "Merging"
07432cef 9369msgstr "合并"
ef317cd5 9370
220c313c 9371#: builtin/read-tree.c:117
ef317cd5 9372msgid "perform a merge in addition to a read"
07432cef 9373msgstr "读取之余再执行一个合并"
ef317cd5 9374
220c313c 9375#: builtin/read-tree.c:119
ef317cd5 9376msgid "3-way merge if no file level merging required"
160fb2b2 9377msgstr "如果没有文件级合并需要,执行三方合并"
ef317cd5 9378
220c313c 9379#: builtin/read-tree.c:121
ef317cd5 9380msgid "3-way merge in presence of adds and removes"
160fb2b2 9381msgstr "存在添加和删除时,也执行三方合并"
ef317cd5 9382
220c313c 9383#: builtin/read-tree.c:123
ef317cd5 9384msgid "same as -m, but discard unmerged entries"
07432cef 9385msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 9386
220c313c 9387#: builtin/read-tree.c:124
ef317cd5 9388msgid "<subdirectory>/"
07432cef 9389msgstr "<子目录>/"
ef317cd5 9390
220c313c 9391#: builtin/read-tree.c:125
ef317cd5 9392msgid "read the tree into the index under <subdirectory>/"
07432cef 9393msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 9394
220c313c 9395#: builtin/read-tree.c:128
ef317cd5 9396msgid "update working tree with merge result"
07432cef 9397msgstr "用合并的结果更新工作区"
ef317cd5 9398
220c313c 9399#: builtin/read-tree.c:130
ef317cd5 9400msgid "gitignore"
07432cef 9401msgstr "gitignore"
ef317cd5 9402
220c313c 9403#: builtin/read-tree.c:131
ef317cd5 9404msgid "allow explicitly ignored files to be overwritten"
07432cef 9405msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 9406
220c313c 9407#: builtin/read-tree.c:134
ef317cd5 9408msgid "don't check the working tree after merging"
07432cef 9409msgstr "合并后不检查工作区"
ef317cd5 9410
220c313c 9411#: builtin/read-tree.c:135
ef317cd5 9412msgid "don't update the index or the work tree"
07432cef 9413msgstr "不更新索引区和工作区"
ef317cd5 9414
220c313c 9415#: builtin/read-tree.c:137
ef317cd5 9416msgid "skip applying sparse checkout filter"
07432cef 9417msgstr "跳过应用稀疏检出过滤器"
ef317cd5 9418
220c313c 9419#: builtin/read-tree.c:139
ef317cd5 9420msgid "debug unpack-trees"
07432cef 9421msgstr "调试 unpack-trees"
ef317cd5 9422
276ceeaa 9423#: builtin/reflog.c:423
2e8451e8 9424#, c-format
1b7f4a34 9425msgid "'%s' for '%s' is not a valid timestamp"
2e8451e8
JX
9426msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
9427
276ceeaa 9428#: builtin/reflog.c:540 builtin/reflog.c:545
2e8451e8
JX
9429#, c-format
9430msgid "'%s' is not a valid timestamp"
9431msgstr "'%s' 不是一个有效的时间戳"
9432
cfff71a9 9433#: builtin/remote.c:12
ef317cd5 9434msgid "git remote [-v | --verbose]"
07432cef 9435msgstr "git remote [-v | --verbose]"
ef317cd5 9436
cfff71a9 9437#: builtin/remote.c:13
ef317cd5 9438msgid ""
814ff314 9439"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
9440"mirror=<fetch|push>] <name> <url>"
9441msgstr ""
814ff314 9442"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 9443"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 9444
94550ed3 9445#: builtin/remote.c:14 builtin/remote.c:34
ef317cd5 9446msgid "git remote rename <old> <new>"
07432cef 9447msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 9448
94550ed3 9449#: builtin/remote.c:15 builtin/remote.c:39
ef317cd5 9450msgid "git remote remove <name>"
07432cef 9451msgstr "git remote remove <名称>"
ef317cd5 9452
94550ed3 9453#: builtin/remote.c:16 builtin/remote.c:44
814ff314
JX
9454msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
9455msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 9456
cfff71a9 9457#: builtin/remote.c:17
ef317cd5 9458msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 9459msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 9460
cfff71a9 9461#: builtin/remote.c:18
ef317cd5 9462msgid "git remote prune [-n | --dry-run] <name>"
07432cef 9463msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 9464
cfff71a9 9465#: builtin/remote.c:19
ef317cd5
JX
9466msgid ""
9467"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 9468msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 9469
cfff71a9 9470#: builtin/remote.c:20
ef317cd5 9471msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 9472msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 9473
94550ed3
JX
9474#: builtin/remote.c:21 builtin/remote.c:70
9475msgid "git remote get-url [--push] [--all] <name>"
9476msgstr "git remote get-url [--push] [--all] <名称>"
9477
9478#: builtin/remote.c:22 builtin/remote.c:75
ef317cd5 9479msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 9480msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 9481
94550ed3 9482#: builtin/remote.c:23 builtin/remote.c:76
ef317cd5 9483msgid "git remote set-url --add <name> <newurl>"
07432cef 9484msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 9485
94550ed3 9486#: builtin/remote.c:24 builtin/remote.c:77
ef317cd5 9487msgid "git remote set-url --delete <name> <url>"
07432cef 9488msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 9489
94550ed3 9490#: builtin/remote.c:29
ef317cd5 9491msgid "git remote add [<options>] <name> <url>"
07432cef 9492msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 9493
94550ed3 9494#: builtin/remote.c:49
ef317cd5 9495msgid "git remote set-branches <name> <branch>..."
07432cef 9496msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 9497
94550ed3 9498#: builtin/remote.c:50
ef317cd5 9499msgid "git remote set-branches --add <name> <branch>..."
07432cef 9500msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 9501
94550ed3 9502#: builtin/remote.c:55
ef317cd5 9503msgid "git remote show [<options>] <name>"
07432cef 9504msgstr "git remote show [<选项>] <名称>"
ef317cd5 9505
94550ed3 9506#: builtin/remote.c:60
ef317cd5 9507msgid "git remote prune [<options>] <name>"
07432cef 9508msgstr "git remote prune [<选项>] <名称>"
ef317cd5 9509
94550ed3 9510#: builtin/remote.c:65
ef317cd5 9511msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 9512msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 9513
94550ed3 9514#: builtin/remote.c:94
81809b99 9515#, c-format
8ada9598 9516msgid "Updating %s"
81809b99 9517msgstr "更新 %s 中"
8ada9598 9518
94550ed3 9519#: builtin/remote.c:126
8ada9598
JX
9520msgid ""
9521"--mirror is dangerous and deprecated; please\n"
9522"\t use --mirror=fetch or --mirror=push instead"
9523msgstr ""
81809b99
JX
9524"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
9525"\t 或 --mirror=push"
8ada9598 9526
94550ed3 9527#: builtin/remote.c:143
81809b99 9528#, c-format
8ada9598 9529msgid "unknown mirror argument: %s"
81809b99 9530msgstr "未知的镜像参数:%s"
8ada9598 9531
94550ed3 9532#: builtin/remote.c:159
ef317cd5 9533msgid "fetch the remote branches"
07432cef 9534msgstr "抓取远程的分支"
ef317cd5 9535
94550ed3 9536#: builtin/remote.c:161
ef317cd5 9537msgid "import all tags and associated objects when fetching"
55a16ee4 9538msgstr "抓取时导入所有的标签和关联对象"
ef317cd5 9539
94550ed3 9540#: builtin/remote.c:164
ef317cd5 9541msgid "or do not fetch any tag at all (--no-tags)"
55a16ee4 9542msgstr "或不抓取任何标签(--no-tags)"
ef317cd5 9543
94550ed3 9544#: builtin/remote.c:166
ef317cd5 9545msgid "branch(es) to track"
07432cef 9546msgstr "跟踪的分支"
ef317cd5 9547
94550ed3 9548#: builtin/remote.c:167
ef317cd5 9549msgid "master branch"
07432cef 9550msgstr "主线分支"
ef317cd5 9551
94550ed3 9552#: builtin/remote.c:168
ef317cd5 9553msgid "push|fetch"
07432cef 9554msgstr "push|fetch"
ef317cd5 9555
94550ed3 9556#: builtin/remote.c:169
ef317cd5 9557msgid "set up remote as a mirror to push to or fetch from"
07432cef 9558msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 9559
94550ed3 9560#: builtin/remote.c:181
8ada9598 9561msgid "specifying a master branch makes no sense with --mirror"
81809b99 9562msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 9563
94550ed3 9564#: builtin/remote.c:183
8ada9598 9565msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 9566msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 9567
276ceeaa 9568#: builtin/remote.c:190 builtin/remote.c:633
81809b99 9569#, c-format
8ada9598 9570msgid "remote %s already exists."
81809b99 9571msgstr "远程 %s 已经存在。"
8ada9598 9572
276ceeaa 9573#: builtin/remote.c:194 builtin/remote.c:637
81809b99 9574#, c-format
8ada9598 9575msgid "'%s' is not a valid remote name"
81809b99 9576msgstr "'%s' 不是一个有效的远程名称"
8ada9598 9577
276ceeaa 9578#: builtin/remote.c:234
81809b99 9579#, c-format
8ada9598 9580msgid "Could not setup master '%s'"
81809b99 9581msgstr "无法设置 master '%s'"
8ada9598 9582
276ceeaa 9583#: builtin/remote.c:336
81809b99 9584#, c-format
8ada9598 9585msgid "Could not get fetch map for refspec %s"
160fb2b2 9586msgstr "无法得到引用规格 %s 的获取列表"
8ada9598 9587
276ceeaa 9588#: builtin/remote.c:437 builtin/remote.c:445
8ada9598 9589msgid "(matching)"
81809b99 9590msgstr "(匹配)"
8ada9598 9591
276ceeaa 9592#: builtin/remote.c:449
8ada9598 9593msgid "(delete)"
81809b99 9594msgstr "(删除)"
8ada9598 9595
276ceeaa 9596#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
81809b99 9597#, c-format
8ada9598 9598msgid "No such remote: %s"
81809b99 9599msgstr "没有这样的远程:%s"
8ada9598 9600
276ceeaa 9601#: builtin/remote.c:643
81809b99 9602#, c-format
8ada9598 9603msgid "Could not rename config section '%s' to '%s'"
81809b99 9604msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 9605
276ceeaa 9606#: builtin/remote.c:663
8ada9598
JX
9607#, c-format
9608msgid ""
d691f479 9609"Not updating non-default fetch refspec\n"
8ada9598
JX
9610"\t%s\n"
9611"\tPlease update the configuration manually if necessary."
9612msgstr ""
160fb2b2 9613"没有更新非默认的获取引用规格\n"
81809b99
JX
9614"\t%s\n"
9615"\t如果必要请手动更新配置。"
8ada9598 9616
276ceeaa 9617#: builtin/remote.c:699
81809b99 9618#, c-format
8ada9598 9619msgid "deleting '%s' failed"
81809b99 9620msgstr "删除 '%s' 失败"
8ada9598 9621
276ceeaa 9622#: builtin/remote.c:733
81809b99 9623#, c-format
8ada9598 9624msgid "creating '%s' failed"
81809b99 9625msgstr "创建 '%s' 失败"
8ada9598 9626
276ceeaa 9627#: builtin/remote.c:796
8ada9598
JX
9628msgid ""
9629"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
9630"to delete it, use:"
9631msgid_plural ""
9632"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
9633"to delete them, use:"
5ae481e0
JX
9634msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
9635msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 9636
276ceeaa
JX
9637#: builtin/remote.c:810
9638#, c-format
9639msgid "Could not remove config section '%s'"
9640msgstr "不能移除配置小节 '%s'"
9641
9642#: builtin/remote.c:911
8ada9598
JX
9643#, c-format
9644msgid " new (next fetch will store in remotes/%s)"
81809b99 9645msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 9646
276ceeaa 9647#: builtin/remote.c:914
8ada9598 9648msgid " tracked"
81809b99 9649msgstr " 已跟踪"
8ada9598 9650
276ceeaa 9651#: builtin/remote.c:916
8ada9598 9652msgid " stale (use 'git remote prune' to remove)"
81809b99 9653msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 9654
276ceeaa 9655#: builtin/remote.c:918
8ada9598 9656msgid " ???"
81809b99 9657msgstr " ???"
8ada9598 9658
276ceeaa 9659#: builtin/remote.c:959
8ada9598
JX
9660#, c-format
9661msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 9662msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 9663
276ceeaa 9664#: builtin/remote.c:967
81809b99 9665#, c-format
276ceeaa
JX
9666msgid "rebases interactively onto remote %s"
9667msgstr "交互式变基到远程 %s"
8ada9598 9668
276ceeaa 9669#: builtin/remote.c:971
81809b99 9670#, c-format
8ada9598 9671msgid " merges with remote %s"
81809b99 9672msgstr " 与远程 %s 合并"
8ada9598 9673
276ceeaa 9674#: builtin/remote.c:972
8ada9598 9675msgid " and with remote"
81809b99 9676msgstr " 且有远程"
8ada9598 9677
276ceeaa 9678#: builtin/remote.c:974
81809b99 9679#, c-format
8ada9598 9680msgid "merges with remote %s"
81809b99 9681msgstr "与远程 %s 合并"
8ada9598 9682
276ceeaa 9683#: builtin/remote.c:975
8ada9598 9684msgid " and with remote"
81809b99 9685msgstr " 且有远程"
8ada9598 9686
276ceeaa 9687#: builtin/remote.c:1021
8ada9598 9688msgid "create"
81809b99 9689msgstr "创建"
8ada9598 9690
276ceeaa 9691#: builtin/remote.c:1024
8ada9598 9692msgid "delete"
81809b99 9693msgstr "删除"
8ada9598 9694
276ceeaa 9695#: builtin/remote.c:1028
8ada9598 9696msgid "up to date"
81809b99 9697msgstr "最新"
8ada9598 9698
276ceeaa 9699#: builtin/remote.c:1031
8ada9598 9700msgid "fast-forwardable"
81809b99 9701msgstr "可快进"
8ada9598 9702
276ceeaa 9703#: builtin/remote.c:1034
8ada9598 9704msgid "local out of date"
81809b99 9705msgstr "本地已过时"
8ada9598 9706
276ceeaa 9707#: builtin/remote.c:1041
8ada9598
JX
9708#, c-format
9709msgid " %-*s forces to %-*s (%s)"
81809b99 9710msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 9711
276ceeaa 9712#: builtin/remote.c:1044
8ada9598
JX
9713#, c-format
9714msgid " %-*s pushes to %-*s (%s)"
81809b99 9715msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 9716
276ceeaa 9717#: builtin/remote.c:1048
8ada9598
JX
9718#, c-format
9719msgid " %-*s forces to %s"
81809b99 9720msgstr " %-*s 强制推送至 %s"
8ada9598 9721
276ceeaa 9722#: builtin/remote.c:1051
8ada9598
JX
9723#, c-format
9724msgid " %-*s pushes to %s"
81809b99 9725msgstr " %-*s 推送至 %s"
8ada9598 9726
276ceeaa 9727#: builtin/remote.c:1119
ef317cd5 9728msgid "do not query remotes"
07432cef 9729msgstr "不查询远程"
ef317cd5 9730
276ceeaa 9731#: builtin/remote.c:1146
81809b99 9732#, c-format
8ada9598 9733msgid "* remote %s"
81809b99 9734msgstr "* 远程 %s"
8ada9598 9735
276ceeaa 9736#: builtin/remote.c:1147
8ada9598
JX
9737#, c-format
9738msgid " Fetch URL: %s"
81809b99 9739msgstr " 获取地址:%s"
8ada9598 9740
276ceeaa 9741#: builtin/remote.c:1148 builtin/remote.c:1299
8ada9598 9742msgid "(no URL)"
81809b99 9743msgstr "(无 URL)"
8ada9598 9744
276ceeaa 9745#: builtin/remote.c:1157 builtin/remote.c:1159
8ada9598
JX
9746#, c-format
9747msgid " Push URL: %s"
81809b99 9748msgstr " 推送地址:%s"
8ada9598 9749
276ceeaa 9750#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
81809b99 9751#, c-format
8ada9598 9752msgid " HEAD branch: %s"
4375c10e 9753msgstr " HEAD 分支:%s"
8ada9598 9754
276ceeaa 9755#: builtin/remote.c:1167
8ada9598
JX
9756#, c-format
9757msgid ""
9758" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 9759msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 9760
276ceeaa 9761#: builtin/remote.c:1179
81809b99 9762#, c-format
8ada9598
JX
9763msgid " Remote branch:%s"
9764msgid_plural " Remote branches:%s"
81809b99 9765msgstr[0] " 远程分支:%s"
5ae481e0 9766msgstr[1] " 远程分支:%s"
8ada9598 9767
81809b99 9768# 译者:中文字符串拼接,可删除前导空格
276ceeaa 9769#: builtin/remote.c:1182 builtin/remote.c:1209
8ada9598 9770msgid " (status not queried)"
81809b99 9771msgstr "(状态未查询)"
8ada9598 9772
276ceeaa 9773#: builtin/remote.c:1191
8ada9598
JX
9774msgid " Local branch configured for 'git pull':"
9775msgid_plural " Local branches configured for 'git pull':"
81809b99 9776msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 9777msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 9778
276ceeaa 9779#: builtin/remote.c:1199
8ada9598 9780msgid " Local refs will be mirrored by 'git push'"
81809b99 9781msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 9782
276ceeaa 9783#: builtin/remote.c:1206
81809b99 9784#, c-format
8ada9598
JX
9785msgid " Local ref configured for 'git push'%s:"
9786msgid_plural " Local refs configured for 'git push'%s:"
81809b99 9787msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 9788msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 9789
276ceeaa 9790#: builtin/remote.c:1227
ef317cd5 9791msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 9792msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 9793
276ceeaa 9794#: builtin/remote.c:1229
ef317cd5 9795msgid "delete refs/remotes/<name>/HEAD"
07432cef 9796msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 9797
276ceeaa 9798#: builtin/remote.c:1244
8ada9598 9799msgid "Cannot determine remote HEAD"
81809b99 9800msgstr "无法确定远程 HEAD"
8ada9598 9801
276ceeaa 9802#: builtin/remote.c:1246
8ada9598 9803msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 9804msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 9805
276ceeaa 9806#: builtin/remote.c:1256
81809b99 9807#, c-format
8ada9598 9808msgid "Could not delete %s"
81809b99 9809msgstr "无法删除 %s"
8ada9598 9810
276ceeaa 9811#: builtin/remote.c:1264
81809b99 9812#, c-format
8ada9598 9813msgid "Not a valid ref: %s"
81809b99 9814msgstr "不是一个有效引用:%s"
8ada9598 9815
276ceeaa 9816#: builtin/remote.c:1266
81809b99 9817#, c-format
8ada9598 9818msgid "Could not setup %s"
81809b99 9819msgstr "不能设置 %s"
8ada9598
JX
9820
9821# 译者:注意保持前导空格
276ceeaa 9822#: builtin/remote.c:1284
81809b99 9823#, c-format
8ada9598 9824msgid " %s will become dangling!"
07432cef 9825msgstr " %s 将成为摇摆状态!"
8ada9598
JX
9826
9827# 译者:注意保持前导空格
276ceeaa 9828#: builtin/remote.c:1285
81809b99 9829#, c-format
8ada9598 9830msgid " %s has become dangling!"
07432cef 9831msgstr " %s 已成为摇摆状态!"
8ada9598 9832
276ceeaa 9833#: builtin/remote.c:1295
81809b99 9834#, c-format
8ada9598 9835msgid "Pruning %s"
81809b99 9836msgstr "修剪 %s"
8ada9598 9837
276ceeaa 9838#: builtin/remote.c:1296
8ada9598
JX
9839#, c-format
9840msgid "URL: %s"
81809b99 9841msgstr "URL:%s"
8ada9598 9842
276ceeaa 9843#: builtin/remote.c:1312
8ada9598
JX
9844#, c-format
9845msgid " * [would prune] %s"
81809b99 9846msgstr " * [将删除] %s"
8ada9598 9847
276ceeaa 9848#: builtin/remote.c:1315
8ada9598
JX
9849#, c-format
9850msgid " * [pruned] %s"
81809b99 9851msgstr " * [已删除] %s"
8ada9598 9852
276ceeaa 9853#: builtin/remote.c:1360
ef317cd5 9854msgid "prune remotes after fetching"
07432cef 9855msgstr "抓取后清除远程"
ef317cd5 9856
276ceeaa 9857#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
81809b99 9858#, c-format
8ada9598 9859msgid "No such remote '%s'"
81809b99 9860msgstr "没有此远程 '%s'"
8ada9598 9861
276ceeaa 9862#: builtin/remote.c:1439
ef317cd5 9863msgid "add branch"
07432cef 9864msgstr "添加分支"
ef317cd5 9865
276ceeaa 9866#: builtin/remote.c:1446
8ada9598 9867msgid "no remote specified"
81809b99 9868msgstr "未指定远程"
8ada9598 9869
276ceeaa 9870#: builtin/remote.c:1463
94550ed3
JX
9871msgid "query push URLs rather than fetch URLs"
9872msgstr "查询推送 URL 地址,而非获取 URL 地址"
9873
276ceeaa 9874#: builtin/remote.c:1465
94550ed3
JX
9875msgid "return all URLs"
9876msgstr "返回所有 URL 地址"
9877
276ceeaa 9878#: builtin/remote.c:1493
94550ed3
JX
9879#, c-format
9880msgid "no URLs configured for remote '%s'"
9881msgstr "没有给远程仓库 '%s' 设定 URL"
9882
276ceeaa 9883#: builtin/remote.c:1519
ef317cd5 9884msgid "manipulate push URLs"
07432cef 9885msgstr "操作推送 URLS"
ef317cd5 9886
276ceeaa 9887#: builtin/remote.c:1521
ef317cd5 9888msgid "add URL"
07432cef 9889msgstr "添加 URL"
ef317cd5 9890
276ceeaa 9891#: builtin/remote.c:1523
ef317cd5 9892msgid "delete URLs"
07432cef 9893msgstr "删除 URLS"
ef317cd5 9894
276ceeaa 9895#: builtin/remote.c:1530
8ada9598 9896msgid "--add --delete doesn't make sense"
81809b99 9897msgstr "--add --delete 无意义"
8ada9598 9898
276ceeaa 9899#: builtin/remote.c:1571
81809b99 9900#, c-format
8ada9598 9901msgid "Invalid old URL pattern: %s"
4375c10e 9902msgstr "无效的旧 URL 匹配模版:%s"
8ada9598 9903
276ceeaa 9904#: builtin/remote.c:1579
81809b99 9905#, c-format
8ada9598 9906msgid "No such URL found: %s"
4375c10e 9907msgstr "未找到此 URL:%s"
8ada9598 9908
276ceeaa 9909#: builtin/remote.c:1581
8ada9598 9910msgid "Will not delete all non-push URLs"
4375c10e 9911msgstr "将不会删除所有非推送 URL 地址"
8ada9598 9912
276ceeaa 9913#: builtin/remote.c:1595
ef317cd5 9914msgid "be verbose; must be placed before a subcommand"
07432cef 9915msgstr "冗长输出;必须置于子命令之前"
ef317cd5 9916
6acbf033 9917#: builtin/repack.c:17
814ff314
JX
9918msgid "git repack [<options>]"
9919msgstr "git repack [<选项>]"
90314792 9920
04cb2f28 9921#: builtin/repack.c:159
90314792
JX
9922msgid "pack everything in a single pack"
9923msgstr "所有内容打包到一个包文件中"
9924
04cb2f28 9925#: builtin/repack.c:161
90314792
JX
9926msgid "same as -a, and turn unreachable objects loose"
9927msgstr "和 -a 相同,并将不可达的对象设为松散对象"
9928
04cb2f28 9929#: builtin/repack.c:164
90314792
JX
9930msgid "remove redundant packs, and run git-prune-packed"
9931msgstr "删除多余的包,运行 git-prune-packed"
9932
04cb2f28 9933#: builtin/repack.c:166
90314792
JX
9934msgid "pass --no-reuse-delta to git-pack-objects"
9935msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9936
04cb2f28 9937#: builtin/repack.c:168
90314792
JX
9938msgid "pass --no-reuse-object to git-pack-objects"
9939msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9940
04cb2f28 9941#: builtin/repack.c:170
90314792
JX
9942msgid "do not run git-update-server-info"
9943msgstr "不运行 git-update-server-info"
9944
04cb2f28 9945#: builtin/repack.c:173
90314792
JX
9946msgid "pass --local to git-pack-objects"
9947msgstr "向 git-pack-objects 传递参数 --local"
9948
04cb2f28 9949#: builtin/repack.c:175
6c94aba5
JX
9950msgid "write bitmap index"
9951msgstr "写 bitmap 索引"
9952
04cb2f28 9953#: builtin/repack.c:176
90314792
JX
9954msgid "approxidate"
9955msgstr "近似日期"
9956
04cb2f28 9957#: builtin/repack.c:177
90314792
JX
9958msgid "with -A, do not loosen objects older than this"
9959msgstr "使用 -A,不要将早于给定时间的对象过期"
9960
04cb2f28 9961#: builtin/repack.c:179
90314792
JX
9962msgid "size of the window used for delta compression"
9963msgstr "用于增量压缩的窗口值"
9964
04cb2f28 9965#: builtin/repack.c:180 builtin/repack.c:184
8376b58d
JX
9966msgid "bytes"
9967msgstr "字节"
9968
04cb2f28 9969#: builtin/repack.c:181
90314792
JX
9970msgid "same as the above, but limit memory size instead of entries count"
9971msgstr "和上面的相似,但限制内存大小而非条目数"
9972
04cb2f28 9973#: builtin/repack.c:183
90314792
JX
9974msgid "limits the maximum delta depth"
9975msgstr "限制最大增量深度"
9976
04cb2f28 9977#: builtin/repack.c:185
90314792 9978msgid "maximum size of each packfile"
dbd6cced 9979msgstr "每个包文件的最大尺寸"
90314792 9980
04cb2f28 9981#: builtin/repack.c:187
6c94aba5
JX
9982msgid "repack objects in packs marked with .keep"
9983msgstr "对标记为 .keep 的包中的对象重新打包"
9984
94550ed3
JX
9985#: builtin/repack.c:197
9986msgid "cannot delete packs in a precious-objects repo"
9987msgstr "不能删除珍品仓库中的打包文件"
9988
9989#: builtin/repack.c:381
90314792
JX
9990#, c-format
9991msgid "removing '%s' failed"
9992msgstr "删除 '%s' 失败"
9993
6acbf033 9994#: builtin/replace.c:19
ef317cd5 9995msgid "git replace [-f] <object> <replacement>"
07432cef 9996msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 9997
6acbf033
JX
9998#: builtin/replace.c:20
9999msgid "git replace [-f] --edit <object>"
10000msgstr "git replace [-f] --edit <对象>"
10001
10002#: builtin/replace.c:21
10003msgid "git replace [-f] --graft <commit> [<parent>...]"
10004msgstr "git replace [-f] --graft <提交> [<父提交>...]"
10005
10006#: builtin/replace.c:22
ef317cd5 10007msgid "git replace -d <object>..."
07432cef 10008msgstr "git replace -d <对象>..."
ef317cd5 10009
6acbf033 10010#: builtin/replace.c:23
cfff71a9
JX
10011msgid "git replace [--format=<format>] [-l [<pattern>]]"
10012msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 10013
220c313c 10014#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
6acbf033
JX
10015#, c-format
10016msgid "Not a valid object name: '%s'"
10017msgstr "不是一个有效的对象名:'%s'"
10018
220c313c 10019#: builtin/replace.c:355
6acbf033
JX
10020#, c-format
10021msgid "bad mergetag in commit '%s'"
55a16ee4 10022msgstr "提交 '%s' 中含有损坏的合并标签"
6acbf033 10023
220c313c 10024#: builtin/replace.c:357
6acbf033
JX
10025#, c-format
10026msgid "malformed mergetag in commit '%s'"
55a16ee4 10027msgstr "提交 '%s' 中含有非法的合并标签"
6acbf033 10028
220c313c 10029#: builtin/replace.c:368
6acbf033
JX
10030#, c-format
10031msgid ""
10032"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
10033"instead of --graft"
55a16ee4 10034msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
6acbf033 10035
220c313c 10036#: builtin/replace.c:401
6acbf033
JX
10037#, c-format
10038msgid "the original commit '%s' has a gpg signature."
10039msgstr "原始提交 '%s' 中包含一个 GPG 签名"
10040
220c313c 10041#: builtin/replace.c:402
6acbf033
JX
10042msgid "the signature will be removed in the replacement commit!"
10043msgstr "在替换的提交中签名将被移除!"
10044
220c313c 10045#: builtin/replace.c:408
6acbf033
JX
10046#, c-format
10047msgid "could not write replacement commit for: '%s'"
10048msgstr "不能为 '%s' 写替换提交"
10049
220c313c 10050#: builtin/replace.c:432
ef317cd5 10051msgid "list replace refs"
07432cef 10052msgstr "列出替换的引用"
ef317cd5 10053
220c313c 10054#: builtin/replace.c:433
ef317cd5 10055msgid "delete replace refs"
07432cef 10056msgstr "删除替换的引用"
ef317cd5 10057
220c313c 10058#: builtin/replace.c:434
6acbf033
JX
10059msgid "edit existing object"
10060msgstr "编辑现存的对象"
10061
220c313c 10062#: builtin/replace.c:435
6acbf033
JX
10063msgid "change a commit's parents"
10064msgstr "修改一个提交的父提交"
10065
220c313c 10066#: builtin/replace.c:436
ef317cd5 10067msgid "replace the ref if it exists"
07432cef 10068msgstr "如果存在则替换引用"
ef317cd5 10069
220c313c 10070#: builtin/replace.c:437
6acbf033
JX
10071msgid "do not pretty-print contents for --edit"
10072msgstr "不要为 --edit 操作美观显示内容"
10073
220c313c 10074#: builtin/replace.c:438
cfff71a9
JX
10075msgid "use this format"
10076msgstr "使用此格式"
10077
90314792 10078#: builtin/rerere.c:12
814ff314
JX
10079msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
10080msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 10081
94550ed3 10082#: builtin/rerere.c:58
ef317cd5 10083msgid "register clean resolutions in index"
07432cef 10084msgstr "在索引中注册干净的解决方案"
ef317cd5 10085
220c313c 10086#: builtin/reset.c:26
ef317cd5
JX
10087msgid ""
10088"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 10089msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 10090
220c313c 10091#: builtin/reset.c:27
07432cef
WS
10092msgid "git reset [-q] <tree-ish> [--] <paths>..."
10093msgstr "git reset [-q] <树或提交> [--] <路径>..."
ef317cd5 10094
220c313c 10095#: builtin/reset.c:28
07432cef
WS
10096msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
10097msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 10098
220c313c 10099#: builtin/reset.c:34
c04f5ac3
JX
10100msgid "mixed"
10101msgstr "混杂"
10102
220c313c 10103#: builtin/reset.c:34
c04f5ac3
JX
10104msgid "soft"
10105msgstr "软性"
10106
220c313c 10107#: builtin/reset.c:34
c04f5ac3
JX
10108msgid "hard"
10109msgstr "硬性"
10110
220c313c 10111#: builtin/reset.c:34
8ada9598
JX
10112msgid "merge"
10113msgstr "合并"
10114
220c313c 10115#: builtin/reset.c:34
c04f5ac3
JX
10116msgid "keep"
10117msgstr "保持"
10118
220c313c 10119#: builtin/reset.c:74
c04f5ac3
JX
10120msgid "You do not have a valid HEAD."
10121msgstr "您没有一个有效的 HEAD。"
10122
220c313c 10123#: builtin/reset.c:76
c04f5ac3
JX
10124msgid "Failed to find tree of HEAD."
10125msgstr "无法找到 HEAD 指向的树。"
10126
220c313c 10127#: builtin/reset.c:82
c04f5ac3
JX
10128#, c-format
10129msgid "Failed to find tree of %s."
10130msgstr "无法找到 %s 指向的树。"
10131
220c313c 10132#: builtin/reset.c:100
c04f5ac3
JX
10133#, c-format
10134msgid "HEAD is now at %s"
10135msgstr "HEAD 现在位于 %s"
10136
90e6ef53 10137# 译者:汉字之间无空格,故删除%s前后空格
220c313c 10138#: builtin/reset.c:183
c04f5ac3
JX
10139#, c-format
10140msgid "Cannot do a %s reset in the middle of a merge."
10141msgstr "在合并过程中不能做%s重置操作。"
10142
220c313c 10143#: builtin/reset.c:276
ef317cd5 10144msgid "be quiet, only report errors"
07432cef 10145msgstr "安静模式,只报告错误"
ef317cd5 10146
220c313c 10147#: builtin/reset.c:278
ef317cd5 10148msgid "reset HEAD and index"
07432cef 10149msgstr "重置 HEAD 和索引"
ef317cd5 10150
220c313c 10151#: builtin/reset.c:279
ef317cd5 10152msgid "reset only HEAD"
07432cef 10153msgstr "只重置 HEAD"
ef317cd5 10154
220c313c 10155#: builtin/reset.c:281 builtin/reset.c:283
ef317cd5 10156msgid "reset HEAD, index and working tree"
07432cef 10157msgstr "重置 HEAD、索引和工作区"
ef317cd5 10158
220c313c 10159#: builtin/reset.c:285
ef317cd5 10160msgid "reset HEAD but keep local changes"
07432cef 10161msgstr "重置 HEAD 但保存本地变更"
ef317cd5 10162
220c313c 10163#: builtin/reset.c:288
6c94aba5
JX
10164msgid "record only the fact that removed paths will be added later"
10165msgstr "将删除的路径标记为稍后添加"
10166
220c313c 10167#: builtin/reset.c:305
07432cef
WS
10168#, c-format
10169msgid "Failed to resolve '%s' as a valid revision."
10170msgstr "无法将 '%s' 解析为一个有效的版本。"
10171
220c313c 10172#: builtin/reset.c:313
07432cef
WS
10173#, c-format
10174msgid "Failed to resolve '%s' as a valid tree."
10175msgstr "无法将 '%s' 解析为一个有效的树对象。"
10176
220c313c 10177#: builtin/reset.c:322
c04f5ac3 10178msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 10179msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 10180
220c313c 10181#: builtin/reset.c:331
c04f5ac3 10182msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 10183msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 10184
90e6ef53 10185# 译者:汉字之间无空格,故删除%s前后空格
220c313c 10186#: builtin/reset.c:333
c04f5ac3
JX
10187#, c-format
10188msgid "Cannot do %s reset with paths."
10189msgstr "不能带路径进行%s重置。"
10190
90e6ef53 10191# 译者:汉字之间无空格,故删除%s前后空格
220c313c 10192#: builtin/reset.c:343
c04f5ac3
JX
10193#, c-format
10194msgid "%s reset is not allowed in a bare repository"
160fb2b2 10195msgstr "不能对纯仓库进行%s重置"
c04f5ac3 10196
220c313c 10197#: builtin/reset.c:347
6c94aba5
JX
10198msgid "-N can only be used with --mixed"
10199msgstr "-N 只能和 --mixed 同时使用"
10200
220c313c 10201#: builtin/reset.c:364
90314792 10202msgid "Unstaged changes after reset:"
160fb2b2 10203msgstr "重置后取消暂存的变更:"
90314792 10204
220c313c 10205#: builtin/reset.c:370
ef317cd5
JX
10206#, c-format
10207msgid "Could not reset index file to revision '%s'."
10208msgstr "不能重置索引文件至版本 '%s'。"
10209
220c313c 10210#: builtin/reset.c:374
07432cef
WS
10211msgid "Could not write new index file."
10212msgstr "不能写入新的索引文件。"
10213
276ceeaa 10214#: builtin/rev-list.c:350
1b7f4a34
JX
10215msgid "rev-list does not support display of notes"
10216msgstr "rev-list 不支持显示注解"
10217
94550ed3 10218#: builtin/rev-parse.c:358
814ff314
JX
10219msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
10220msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 10221
94550ed3 10222#: builtin/rev-parse.c:363
ef317cd5 10223msgid "keep the `--` passed as an arg"
07432cef 10224msgstr "保持 `--` 作为一个参数传递"
ef317cd5 10225
94550ed3 10226#: builtin/rev-parse.c:365
ef317cd5 10227msgid "stop parsing after the first non-option argument"
07432cef 10228msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 10229
94550ed3 10230#: builtin/rev-parse.c:368
cfff71a9
JX
10231msgid "output in stuck long form"
10232msgstr "以固定长格式输出"
10233
94550ed3 10234#: builtin/rev-parse.c:499
ef317cd5 10235msgid ""
814ff314 10236"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 10237" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 10238" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
10239"\n"
10240"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
10241msgstr ""
814ff314 10242"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 10243" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 10244" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
10245"\n"
10246"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5
JX
10247
10248#: builtin/revert.c:22
814ff314
JX
10249msgid "git revert [<options>] <commit-ish>..."
10250msgstr "git revert [<选项>] <提交号>..."
ef317cd5
JX
10251
10252#: builtin/revert.c:23
10253msgid "git revert <subcommand>"
07432cef 10254msgstr "git revert <子命令>"
ef317cd5
JX
10255
10256#: builtin/revert.c:28
814ff314
JX
10257msgid "git cherry-pick [<options>] <commit-ish>..."
10258msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5
JX
10259
10260#: builtin/revert.c:29
ef317cd5 10261msgid "git cherry-pick <subcommand>"
07432cef 10262msgstr "git cherry-pick <子命令>"
ef317cd5 10263
90314792 10264#: builtin/revert.c:71
ef317cd5
JX
10265#, c-format
10266msgid "%s: %s cannot be used with %s"
10267msgstr "%s:%s 不能和 %s 同时使用"
10268
90314792 10269#: builtin/revert.c:80
ef317cd5 10270msgid "end revert or cherry-pick sequence"
07432cef 10271msgstr "终止反转或拣选操作"
ef317cd5 10272
90314792 10273#: builtin/revert.c:81
ef317cd5 10274msgid "resume revert or cherry-pick sequence"
07432cef 10275msgstr "继续反转或拣选操作"
ef317cd5 10276
90314792 10277#: builtin/revert.c:82
ef317cd5 10278msgid "cancel revert or cherry-pick sequence"
07432cef 10279msgstr "取消反转或拣选操作"
ef317cd5 10280
90314792 10281#: builtin/revert.c:83
ef317cd5 10282msgid "don't automatically commit"
07432cef 10283msgstr "不要自动提交"
ef317cd5 10284
90314792 10285#: builtin/revert.c:84
ef317cd5 10286msgid "edit the commit message"
07432cef 10287msgstr "编辑提交说明"
ef317cd5 10288
90314792 10289#: builtin/revert.c:87
ef317cd5 10290msgid "parent number"
07432cef 10291msgstr "父编号"
ef317cd5 10292
90314792 10293#: builtin/revert.c:89
ef317cd5 10294msgid "merge strategy"
07432cef 10295msgstr "合并策略"
ef317cd5 10296
90314792 10297#: builtin/revert.c:90
ef317cd5 10298msgid "option"
07432cef 10299msgstr "选项"
ef317cd5 10300
90314792 10301#: builtin/revert.c:91
ef317cd5 10302msgid "option for merge strategy"
07432cef 10303msgstr "合并策略的选项"
ef317cd5 10304
6c94aba5 10305#: builtin/revert.c:104
ef317cd5 10306msgid "append commit name"
07432cef 10307msgstr "追加提交名称"
ef317cd5 10308
6c94aba5 10309#: builtin/revert.c:106
ef317cd5 10310msgid "preserve initially empty commits"
07432cef 10311msgstr "保留初始化的空提交"
ef317cd5 10312
6c94aba5 10313#: builtin/revert.c:107
ef317cd5 10314msgid "allow commits with empty messages"
07432cef 10315msgstr "允许提交说明为空"
c04f5ac3 10316
6c94aba5 10317#: builtin/revert.c:108
ef317cd5 10318msgid "keep redundant, empty commits"
07432cef 10319msgstr "保持多余的、空的提交"
ef317cd5 10320
6c94aba5 10321#: builtin/revert.c:112
c04f5ac3
JX
10322msgid "program error"
10323msgstr "程序错误"
10324
6c94aba5 10325#: builtin/revert.c:197
c04f5ac3
JX
10326msgid "revert failed"
10327msgstr "还原失败"
10328
6c94aba5 10329#: builtin/revert.c:212
c04f5ac3
JX
10330msgid "cherry-pick failed"
10331msgstr "拣选失败"
10332
90314792 10333#: builtin/rm.c:17
814ff314
JX
10334msgid "git rm [<options>] [--] <file>..."
10335msgstr "git rm [<选项>] [--] <文件>..."
07432cef 10336
90314792 10337#: builtin/rm.c:65
2e8451e8
JX
10338msgid ""
10339"the following submodule (or one of its nested submodules)\n"
10340"uses a .git directory:"
10341msgid_plural ""
220c313c 10342"the following submodules (or one of their nested submodules)\n"
2e8451e8 10343"use a .git directory:"
220c313c
JX
10344msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10345msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
2e8451e8 10346
90314792 10347#: builtin/rm.c:71
07432cef 10348msgid ""
2e8451e8 10349"\n"
07432cef
WS
10350"(use 'rm -rf' if you really want to remove it including all of its history)"
10351msgstr ""
2e8451e8 10352"\n"
07432cef 10353"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
ef317cd5 10354
7aea43ff 10355#: builtin/rm.c:230
c04f5ac3 10356msgid ""
2e8451e8
JX
10357"the following file has staged content different from both the\n"
10358"file and the HEAD:"
10359msgid_plural ""
10360"the following files have staged content different from both the\n"
10361"file and the HEAD:"
10362msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10363msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10364
7aea43ff 10365#: builtin/rm.c:235
2e8451e8
JX
10366msgid ""
10367"\n"
c04f5ac3
JX
10368"(use -f to force removal)"
10369msgstr ""
2e8451e8 10370"\n"
c04f5ac3
JX
10371"(使用 -f 强制删除)"
10372
7aea43ff 10373#: builtin/rm.c:239
2e8451e8
JX
10374msgid "the following file has changes staged in the index:"
10375msgid_plural "the following files have changes staged in the index:"
160fb2b2
JX
10376msgstr[0] "下列文件索引中有变更"
10377msgstr[1] "下列文件索引中有变更"
c04f5ac3 10378
7aea43ff 10379#: builtin/rm.c:243 builtin/rm.c:254
c04f5ac3 10380msgid ""
2e8451e8 10381"\n"
c04f5ac3
JX
10382"(use --cached to keep the file, or -f to force removal)"
10383msgstr ""
2e8451e8
JX
10384"\n"
10385"(使用 --cached 保留本地文件,或用 -f 强制删除)"
10386
7aea43ff 10387#: builtin/rm.c:251
2e8451e8
JX
10388msgid "the following file has local modifications:"
10389msgid_plural "the following files have local modifications:"
10390msgstr[0] "如下文件有本地修改:"
10391msgstr[1] "如下文件有本地修改:"
c04f5ac3 10392
7aea43ff 10393#: builtin/rm.c:269
ef317cd5 10394msgid "do not list removed files"
07432cef 10395msgstr "不列出删除的文件"
ef317cd5 10396
7aea43ff 10397#: builtin/rm.c:270
ef317cd5 10398msgid "only remove from the index"
07432cef 10399msgstr "只从索引区删除"
ef317cd5 10400
7aea43ff 10401#: builtin/rm.c:271
ef317cd5 10402msgid "override the up-to-date check"
07432cef 10403msgstr "忽略文件更新状态检查"
ef317cd5 10404
7aea43ff 10405#: builtin/rm.c:272
ef317cd5 10406msgid "allow recursive removal"
07432cef 10407msgstr "允许递归删除"
ef317cd5 10408
7aea43ff 10409#: builtin/rm.c:274
ef317cd5 10410msgid "exit with a zero status even if nothing matched"
07432cef 10411msgstr "即使没有匹配,也以零状态退出"
ef317cd5 10412
7aea43ff 10413#: builtin/rm.c:317
220c313c
JX
10414msgid "Please, stage your changes to .gitmodules or stash them to proceed"
10415msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
10416
7aea43ff 10417#: builtin/rm.c:335
c04f5ac3
JX
10418#, c-format
10419msgid "not removing '%s' recursively without -r"
10420msgstr "未提供 -r 选项不会递归删除 '%s'"
10421
7aea43ff 10422#: builtin/rm.c:374
c04f5ac3
JX
10423#, c-format
10424msgid "git rm: unable to remove %s"
10425msgstr "git rm:不能删除 %s"
10426
1b7f4a34
JX
10427#: builtin/send-pack.c:18
10428msgid ""
10429"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10430"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
10431"[<ref>...]\n"
10432" --all and explicit <ref> specification are mutually exclusive."
10433msgstr ""
10434"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10435"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
10436" --all 和明确的 <引用> 互斥。"
10437
10438#: builtin/send-pack.c:160
10439msgid "remote name"
10440msgstr "远程名称"
10441
10442#: builtin/send-pack.c:171
10443msgid "use stateless RPC protocol"
10444msgstr "使用无状态的 RPC 协议"
10445
10446#: builtin/send-pack.c:172
10447msgid "read refs from stdin"
10448msgstr "从标准输入读取引用"
10449
10450#: builtin/send-pack.c:173
10451msgid "print status from remote helper"
10452msgstr "打印来自远程 helper 的状态"
10453
ef317cd5 10454#: builtin/shortlog.c:13
814ff314 10455msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
4dcdc3d8 10456msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
ef317cd5 10457
276ceeaa 10458#: builtin/shortlog.c:242
ef317cd5 10459msgid "sort output according to the number of commits per author"
07432cef 10460msgstr "根据每个作者的提交数量排序"
ef317cd5 10461
276ceeaa 10462#: builtin/shortlog.c:244
ef317cd5 10463msgid "Suppress commit descriptions, only provides commit count"
07432cef 10464msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 10465
276ceeaa 10466#: builtin/shortlog.c:246
ef317cd5 10467msgid "Show the email address of each author"
07432cef 10468msgstr "显示每个作者的电子邮件地址"
ef317cd5 10469
276ceeaa 10470#: builtin/shortlog.c:247
ef317cd5 10471msgid "w[,i1[,i2]]"
07432cef 10472msgstr "w[,i1[,i2]]"
ef317cd5 10473
276ceeaa 10474#: builtin/shortlog.c:248
ef317cd5 10475msgid "Linewrap output"
07432cef 10476msgstr "折行输出"
ef317cd5 10477
94550ed3 10478#: builtin/show-branch.c:10
ef317cd5 10479msgid ""
814ff314 10480"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
10481"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
10482"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10483"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 10484msgstr ""
814ff314 10485"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
10486"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
10487"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10488"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 10489
94550ed3 10490#: builtin/show-branch.c:14
814ff314
JX
10491msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
10492msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
ef317cd5 10493
94550ed3 10494#: builtin/show-branch.c:640
ef317cd5 10495msgid "show remote-tracking and local branches"
07432cef 10496msgstr "显示远程跟踪的和本地的分支"
ef317cd5 10497
94550ed3 10498#: builtin/show-branch.c:642
ef317cd5 10499msgid "show remote-tracking branches"
07432cef 10500msgstr "显示远程跟踪的分支"
ef317cd5 10501
94550ed3 10502#: builtin/show-branch.c:644
ef317cd5 10503msgid "color '*!+-' corresponding to the branch"
07432cef 10504msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 10505
94550ed3 10506#: builtin/show-branch.c:646
ef317cd5 10507msgid "show <n> more commits after the common ancestor"
07432cef 10508msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 10509
94550ed3 10510#: builtin/show-branch.c:648
ef317cd5 10511msgid "synonym to more=-1"
07432cef 10512msgstr "和 more=-1 同义"
ef317cd5 10513
94550ed3 10514#: builtin/show-branch.c:649
ef317cd5 10515msgid "suppress naming strings"
07432cef 10516msgstr "不显示字符串命名"
ef317cd5 10517
94550ed3 10518#: builtin/show-branch.c:651
ef317cd5 10519msgid "include the current branch"
07432cef 10520msgstr "包括当前分支"
ef317cd5 10521
94550ed3 10522#: builtin/show-branch.c:653
ef317cd5 10523msgid "name commits with their object names"
07432cef 10524msgstr "以对象名字命名提交"
ef317cd5 10525
94550ed3 10526#: builtin/show-branch.c:655
ef317cd5 10527msgid "show possible merge bases"
07432cef 10528msgstr "显示可能合并的基线"
ef317cd5 10529
94550ed3 10530#: builtin/show-branch.c:657
ef317cd5 10531msgid "show refs unreachable from any other ref"
07432cef 10532msgstr "显示没有任何引用的的引用"
ef317cd5 10533
94550ed3 10534#: builtin/show-branch.c:659
ef317cd5 10535msgid "show commits in topological order"
07432cef 10536msgstr "以拓扑顺序显示提交"
ef317cd5 10537
94550ed3 10538#: builtin/show-branch.c:662
ef317cd5 10539msgid "show only commits not on the first branch"
07432cef 10540msgstr "只显示不在第一个分支上的提交"
ef317cd5 10541
94550ed3 10542#: builtin/show-branch.c:664
ef317cd5 10543msgid "show merges reachable from only one tip"
07432cef 10544msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 10545
94550ed3 10546#: builtin/show-branch.c:666
2e8451e8
JX
10547msgid "topologically sort, maintaining date order where possible"
10548msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 10549
94550ed3 10550#: builtin/show-branch.c:669
ef317cd5 10551msgid "<n>[,<base>]"
07432cef 10552msgstr "<n>[,<base>]"
ef317cd5 10553
94550ed3 10554#: builtin/show-branch.c:670
ef317cd5 10555msgid "show <n> most recent ref-log entries starting at base"
07432cef 10556msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
ef317cd5
JX
10557
10558#: builtin/show-ref.c:10
10559msgid ""
814ff314
JX
10560"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10561"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 10562msgstr ""
814ff314
JX
10563"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10564"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5
JX
10565
10566#: builtin/show-ref.c:11
94550ed3
JX
10567msgid "git show-ref --exclude-existing[=<pattern>]"
10568msgstr "git show-ref --exclude-existing[=<模式>]"
ef317cd5 10569
94550ed3 10570#: builtin/show-ref.c:165
ef317cd5 10571msgid "only show tags (can be combined with heads)"
55a16ee4 10572msgstr "只显示标签(可以和头共用)"
ef317cd5 10573
94550ed3 10574#: builtin/show-ref.c:166
ef317cd5 10575msgid "only show heads (can be combined with tags)"
55a16ee4 10576msgstr "只显示头(可以和标签共用)"
ef317cd5 10577
94550ed3 10578#: builtin/show-ref.c:167
ef317cd5 10579msgid "stricter reference checking, requires exact ref path"
07432cef 10580msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 10581
94550ed3 10582#: builtin/show-ref.c:170 builtin/show-ref.c:172
2e8451e8
JX
10583msgid "show the HEAD reference, even if it would be filtered out"
10584msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 10585
94550ed3 10586#: builtin/show-ref.c:174
ef317cd5 10587msgid "dereference tags into object IDs"
4375c10e 10588msgstr "转换标签到对象 ID"
ef317cd5 10589
94550ed3 10590#: builtin/show-ref.c:176
ef317cd5 10591msgid "only show SHA1 hash using <n> digits"
07432cef 10592msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 10593
94550ed3 10594#: builtin/show-ref.c:180
ef317cd5 10595msgid "do not print results to stdout (useful with --verify)"
07432cef 10596msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 10597
94550ed3 10598#: builtin/show-ref.c:182
ef317cd5 10599msgid "show refs from stdin that aren't in local repository"
160fb2b2 10600msgstr "显示从标准输入中读入的不在本地仓库中的引用"
ef317cd5 10601
94550ed3
JX
10602#: builtin/stripspace.c:17
10603msgid "git stripspace [-s | --strip-comments]"
10604msgstr "git stripspace [-s | --strip-comments]"
10605
10606#: builtin/stripspace.c:18
10607msgid "git stripspace [-c | --comment-lines]"
10608msgstr "git stripspace [-c | --comment-lines]"
10609
10610#: builtin/stripspace.c:35
10611msgid "skip and remove all lines starting with comment character"
10612msgstr "跳过和移除所有的注释行"
10613
10614#: builtin/stripspace.c:38
276ceeaa 10615msgid "prepend comment character and space to each line"
94550ed3
JX
10616msgstr "为每一行的行首添加注释符和空格"
10617
276ceeaa 10618#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
94550ed3
JX
10619msgid "alternative anchor for relative paths"
10620msgstr "相对路径的替代锚记(anchor)"
10621
276ceeaa 10622#: builtin/submodule--helper.c:78
94550ed3
JX
10623msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
10624msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
10625
276ceeaa 10626#: builtin/submodule--helper.c:108
94550ed3
JX
10627msgid "git submodule--helper name <path>"
10628msgstr "git submodule--helper name <路径>"
10629
276ceeaa 10630#: builtin/submodule--helper.c:114
94550ed3
JX
10631#, c-format
10632msgid "no submodule mapping found in .gitmodules for path '%s'"
10633msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
10634
276ceeaa 10635#: builtin/submodule--helper.c:164
94550ed3
JX
10636msgid "where the new submodule will be cloned to"
10637msgstr "新的子模组将要克隆的路径"
10638
276ceeaa 10639#: builtin/submodule--helper.c:167
94550ed3
JX
10640msgid "name of the new submodule"
10641msgstr "新子模组的名称"
10642
276ceeaa 10643#: builtin/submodule--helper.c:170
94550ed3
JX
10644msgid "url where to clone the submodule from"
10645msgstr "克隆子模组的 url 地址"
10646
276ceeaa 10647#: builtin/submodule--helper.c:176
94550ed3
JX
10648msgid "depth for shallow clones"
10649msgstr "浅克隆的深度"
10650
276ceeaa 10651#: builtin/submodule--helper.c:182
94550ed3
JX
10652msgid ""
10653"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
10654"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
10655msgstr ""
10656"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
10657"[--name <名字>] [--url <地址>][--depth <深度>] [--] [<路径>...]"
10658
276ceeaa
JX
10659#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
10660#: builtin/submodule--helper.c:210
94550ed3
JX
10661#, c-format
10662msgid "could not create directory '%s'"
10663msgstr "不能创建目录 '%s'"
10664
276ceeaa 10665#: builtin/submodule--helper.c:198
94550ed3
JX
10666#, c-format
10667msgid "clone of '%s' into submodule path '%s' failed"
10668msgstr "无法克隆 '%s' 到子模组路径 '%s'"
10669
276ceeaa 10670#: builtin/submodule--helper.c:221
94550ed3
JX
10671#, c-format
10672msgid "cannot open file '%s'"
10673msgstr "无法打开文件 '%s'"
10674
276ceeaa 10675#: builtin/submodule--helper.c:226
94550ed3
JX
10676#, c-format
10677msgid "could not close file %s"
10678msgstr "无法关闭文件 %s"
10679
276ceeaa 10680#: builtin/submodule--helper.c:241
94550ed3
JX
10681#, c-format
10682msgid "could not get submodule directory for '%s'"
10683msgstr "无法得到 '%s' 的子模组目录"
10684
276ceeaa 10685#: builtin/submodule--helper.c:267
94550ed3
JX
10686msgid "fatal: submodule--helper subcommand must be called with a subcommand"
10687msgstr "严重错误:submodule-helper 子命令必须由另外的子命令调用"
10688
276ceeaa 10689#: builtin/submodule--helper.c:274
94550ed3
JX
10690#, c-format
10691msgid "fatal: '%s' is not a valid submodule--helper subcommand"
10692msgstr "严重错误:'%s' 不是一个有效的 submodule--helper 子命令"
10693
ef317cd5 10694#: builtin/symbolic-ref.c:7
814ff314
JX
10695msgid "git symbolic-ref [<options>] <name> [<ref>]"
10696msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef
WS
10697
10698#: builtin/symbolic-ref.c:8
814ff314
JX
10699msgid "git symbolic-ref -d [-q] <name>"
10700msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 10701
07432cef 10702#: builtin/symbolic-ref.c:40
ef317cd5 10703msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
10704msgstr "不显示非符号(分离的)引用的错误信息"
10705
10706#: builtin/symbolic-ref.c:41
10707msgid "delete symbolic ref"
10708msgstr "删除符号引用"
ef317cd5 10709
07432cef 10710#: builtin/symbolic-ref.c:42
ef317cd5 10711msgid "shorten ref output"
07432cef 10712msgstr "简短的引用输出"
ef317cd5 10713
1b7f4a34 10714#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
ef317cd5 10715msgid "reason"
07432cef 10716msgstr "原因"
ef317cd5 10717
1b7f4a34 10718#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
ef317cd5 10719msgid "reason of the update"
07432cef 10720msgstr "更新的原因"
ef317cd5 10721
94550ed3 10722#: builtin/tag.c:23
ef317cd5 10723msgid ""
814ff314
JX
10724"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
10725"[<head>]"
10726msgstr ""
10727"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
ef317cd5 10728
94550ed3 10729#: builtin/tag.c:24
ef317cd5 10730msgid "git tag -d <tagname>..."
07432cef 10731msgstr "git tag -d <标签名>..."
ef317cd5 10732
94550ed3 10733#: builtin/tag.c:25
ef317cd5 10734msgid ""
814ff314 10735"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
94550ed3 10736"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
ef317cd5 10737msgstr ""
94550ed3
JX
10738"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
10739"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
ef317cd5 10740
94550ed3 10741#: builtin/tag.c:27
ef317cd5 10742msgid "git tag -v <tagname>..."
07432cef 10743msgstr "git tag -v <标签名>..."
ef317cd5 10744
94550ed3 10745#: builtin/tag.c:80
c04f5ac3
JX
10746#, c-format
10747msgid "tag name too long: %.*s..."
55a16ee4 10748msgstr "标签名称太长:%.*s..."
c04f5ac3 10749
94550ed3 10750#: builtin/tag.c:85
c04f5ac3
JX
10751#, c-format
10752msgid "tag '%s' not found."
55a16ee4 10753msgstr "未发现标签 '%s'。"
c04f5ac3 10754
94550ed3 10755#: builtin/tag.c:100
c04f5ac3
JX
10756#, c-format
10757msgid "Deleted tag '%s' (was %s)\n"
55a16ee4 10758msgstr "已删除标签 '%s'(曾为 %s)\n"
c04f5ac3 10759
94550ed3 10760#: builtin/tag.c:112
c04f5ac3
JX
10761#, c-format
10762msgid "could not verify the tag '%s'"
55a16ee4 10763msgstr "不能校验该标签 '%s'"
c04f5ac3 10764
94550ed3 10765#: builtin/tag.c:122
a77c07d9 10766#, c-format
c04f5ac3
JX
10767msgid ""
10768"\n"
6acbf033
JX
10769"Write a message for tag:\n"
10770" %s\n"
a77c07d9 10771"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
10772msgstr ""
10773"\n"
55a16ee4 10774"输入一个标签说明:\n"
6acbf033 10775" %s\n"
a77c07d9 10776"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 10777
94550ed3 10778#: builtin/tag.c:126
a77c07d9 10779#, c-format
c04f5ac3
JX
10780msgid ""
10781"\n"
6acbf033
JX
10782"Write a message for tag:\n"
10783" %s\n"
a77c07d9 10784"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 10785"want to.\n"
c04f5ac3
JX
10786msgstr ""
10787"\n"
55a16ee4 10788"输入一个标签说明:\n"
6acbf033 10789" %s\n"
a77c07d9 10790"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 10791
94550ed3 10792#: builtin/tag.c:199
c04f5ac3 10793msgid "unable to sign the tag"
55a16ee4 10794msgstr "无法签署标签"
c04f5ac3 10795
94550ed3 10796#: builtin/tag.c:201
c04f5ac3 10797msgid "unable to write tag file"
55a16ee4 10798msgstr "无法写标签文件"
c04f5ac3 10799
94550ed3 10800#: builtin/tag.c:226
c04f5ac3 10801msgid "bad object type."
90e6ef53 10802msgstr "坏的对象类型。"
c04f5ac3 10803
94550ed3 10804#: builtin/tag.c:239
c04f5ac3 10805msgid "tag header too big."
55a16ee4 10806msgstr "标签头信息太大。"
c04f5ac3 10807
94550ed3 10808#: builtin/tag.c:275
c04f5ac3 10809msgid "no tag message?"
55a16ee4 10810msgstr "无标签说明?"
c04f5ac3 10811
94550ed3 10812#: builtin/tag.c:281
c04f5ac3
JX
10813#, c-format
10814msgid "The tag message has been left in %s\n"
55a16ee4 10815msgstr "标签说明被保留在 %s\n"
c04f5ac3 10816
94550ed3 10817#: builtin/tag.c:339
ef317cd5 10818msgid "list tag names"
55a16ee4 10819msgstr "列出标签名称"
ef317cd5 10820
94550ed3 10821#: builtin/tag.c:341
ef317cd5 10822msgid "print <n> lines of each tag message"
55a16ee4 10823msgstr "每个标签信息打印 <n> 行"
ef317cd5 10824
94550ed3 10825#: builtin/tag.c:343
ef317cd5 10826msgid "delete tags"
55a16ee4 10827msgstr "删除标签"
ef317cd5 10828
94550ed3 10829#: builtin/tag.c:344
ef317cd5 10830msgid "verify tags"
55a16ee4 10831msgstr "验证标签"
ef317cd5 10832
94550ed3 10833#: builtin/tag.c:346
ef317cd5 10834msgid "Tag creation options"
55a16ee4 10835msgstr "标签创建选项"
ef317cd5 10836
94550ed3 10837#: builtin/tag.c:348
ef317cd5 10838msgid "annotated tag, needs a message"
55a16ee4 10839msgstr "附注标签,需要一个说明"
ef317cd5 10840
94550ed3 10841#: builtin/tag.c:350
ef317cd5 10842msgid "tag message"
55a16ee4 10843msgstr "标签说明"
ef317cd5 10844
94550ed3 10845#: builtin/tag.c:352
ef317cd5 10846msgid "annotated and GPG-signed tag"
55a16ee4 10847msgstr "附注并附加 GPG 签名的标签"
ef317cd5 10848
94550ed3 10849#: builtin/tag.c:356
ef317cd5 10850msgid "use another key to sign the tag"
55a16ee4 10851msgstr "使用另外的私钥签名该标签"
ef317cd5 10852
94550ed3 10853#: builtin/tag.c:357
ef317cd5 10854msgid "replace the tag if exists"
55a16ee4 10855msgstr "如果存在,替换现有的标签"
ef317cd5 10856
94550ed3 10857#: builtin/tag.c:358 builtin/update-ref.c:368
03ea3327 10858msgid "create a reflog"
1b7f4a34
JX
10859msgstr "创建引用日志"
10860
94550ed3 10861#: builtin/tag.c:360
814ff314 10862msgid "Tag listing options"
55a16ee4 10863msgstr "标签列表选项"
814ff314 10864
94550ed3 10865#: builtin/tag.c:361
ef317cd5 10866msgid "show tag list in columns"
55a16ee4 10867msgstr "以列的方式显示标签列表"
ef317cd5 10868
94550ed3 10869#: builtin/tag.c:362 builtin/tag.c:363
ef317cd5 10870msgid "print only tags that contain the commit"
55a16ee4 10871msgstr "只打印包含提交的标签"
ef317cd5 10872
94550ed3
JX
10873#: builtin/tag.c:364
10874msgid "print only tags that are merged"
10875msgstr "只打印已经合并的标签"
10876
10877#: builtin/tag.c:365
10878msgid "print only tags that are not merged"
10879msgstr "只打印尚未合并的标签"
10880
10881#: builtin/tag.c:370
ef317cd5 10882msgid "print only tags of the object"
55a16ee4 10883msgstr "只打印对象的标签"
ef317cd5 10884
94550ed3 10885#: builtin/tag.c:399
8ada9598 10886msgid "--column and -n are incompatible"
81809b99 10887msgstr "--column 和 -n 不兼容"
8ada9598 10888
94550ed3 10889#: builtin/tag.c:419
c04f5ac3 10890msgid "-n option is only allowed with -l."
649900bc 10891msgstr "-n 选项只允许和 -l 同时使用。"
c04f5ac3 10892
94550ed3 10893#: builtin/tag.c:421
c04f5ac3 10894msgid "--contains option is only allowed with -l."
649900bc 10895msgstr "--contains 选项只允许和 -l 同时使用。"
c04f5ac3 10896
94550ed3 10897#: builtin/tag.c:423
7ac1c0ad 10898msgid "--points-at option is only allowed with -l."
649900bc 10899msgstr "--points-at 选项只允许和 -l 同时使用。"
7ac1c0ad 10900
94550ed3
JX
10901#: builtin/tag.c:425
10902msgid "--merged and --no-merged option are only allowed with -l"
10903msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
10904
10905#: builtin/tag.c:433
c04f5ac3
JX
10906msgid "only one -F or -m option is allowed."
10907msgstr "只允许一个 -F 或 -m 选项。"
10908
94550ed3 10909#: builtin/tag.c:453
c04f5ac3
JX
10910msgid "too many params"
10911msgstr "太多参数"
10912
94550ed3 10913#: builtin/tag.c:459
c04f5ac3
JX
10914#, c-format
10915msgid "'%s' is not a valid tag name."
55a16ee4 10916msgstr "'%s' 不是一个有效的标签名称。"
c04f5ac3 10917
94550ed3 10918#: builtin/tag.c:464
c04f5ac3
JX
10919#, c-format
10920msgid "tag '%s' already exists"
55a16ee4 10921msgstr "标签 '%s' 已存在"
c04f5ac3 10922
94550ed3 10923#: builtin/tag.c:489
c04f5ac3
JX
10924#, c-format
10925msgid "Updated tag '%s' (was %s)\n"
55a16ee4 10926msgstr "已更新标签 '%s'(曾为 %s)\n"
c04f5ac3 10927
1b7f4a34 10928#: builtin/unpack-objects.c:490
6c94aba5
JX
10929msgid "Unpacking objects"
10930msgstr "展开对象中"
10931
276ceeaa 10932#: builtin/update-index.c:79
7aea43ff
JX
10933#, c-format
10934msgid "failed to create directory %s"
10935msgstr "无法创建目录 %s"
10936
276ceeaa 10937#: builtin/update-index.c:85
7aea43ff
JX
10938#, c-format
10939msgid "failed to stat %s"
10940msgstr "无法枚举 %s 状态"
10941
276ceeaa 10942#: builtin/update-index.c:95
7aea43ff
JX
10943#, c-format
10944msgid "failed to create file %s"
10945msgstr "无法创建文件 %s"
10946
276ceeaa 10947#: builtin/update-index.c:103
7aea43ff
JX
10948#, c-format
10949msgid "failed to delete file %s"
10950msgstr "无法删除文件 %s"
10951
276ceeaa 10952#: builtin/update-index.c:110 builtin/update-index.c:212
7aea43ff
JX
10953#, c-format
10954msgid "failed to delete directory %s"
10955msgstr "无法删除目录 %s"
10956
276ceeaa 10957#: builtin/update-index.c:133
7aea43ff 10958#, c-format
276ceeaa
JX
10959msgid "Testing mtime in '%s' "
10960msgstr "在 '%s' 中测试 mtime "
7aea43ff 10961
276ceeaa 10962#: builtin/update-index.c:145
7aea43ff
JX
10963msgid "directory stat info does not change after adding a new file"
10964msgstr "添加一个新文件后,目录的状态信息未改变"
10965
276ceeaa 10966#: builtin/update-index.c:158
7aea43ff
JX
10967msgid "directory stat info does not change after adding a new directory"
10968msgstr "添加一个新目录后,目录的状态信息未改变"
10969
276ceeaa 10970#: builtin/update-index.c:171
7aea43ff
JX
10971msgid "directory stat info changes after updating a file"
10972msgstr "更新一个文件后,目录的状态信息被修改"
10973
276ceeaa 10974#: builtin/update-index.c:182
7aea43ff
JX
10975msgid "directory stat info changes after adding a file inside subdirectory"
10976msgstr "在子目录中添加文件后,目录的状态信息被修改"
10977
276ceeaa 10978#: builtin/update-index.c:193
7aea43ff
JX
10979msgid "directory stat info does not change after deleting a file"
10980msgstr "删除一个文件后,目录的状态信息未改变"
10981
276ceeaa 10982#: builtin/update-index.c:206
7aea43ff
JX
10983msgid "directory stat info does not change after deleting a directory"
10984msgstr "删除一个目录后,目录的状态信息未改变"
10985
276ceeaa 10986#: builtin/update-index.c:213
7aea43ff
JX
10987msgid " OK"
10988msgstr " OK"
10989
276ceeaa 10990#: builtin/update-index.c:575
814ff314
JX
10991msgid "git update-index [<options>] [--] [<file>...]"
10992msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 10993
276ceeaa 10994#: builtin/update-index.c:930
ef317cd5 10995msgid "continue refresh even when index needs update"
07432cef 10996msgstr "当索引需要更新时继续刷新"
8ada9598 10997
276ceeaa 10998#: builtin/update-index.c:933
ef317cd5 10999msgid "refresh: ignore submodules"
07432cef 11000msgstr "刷新:忽略子模组"
8ada9598 11001
276ceeaa 11002#: builtin/update-index.c:936
ef317cd5 11003msgid "do not ignore new files"
07432cef 11004msgstr "不忽略新的文件"
8ada9598 11005
276ceeaa 11006#: builtin/update-index.c:938
ef317cd5 11007msgid "let files replace directories and vice-versa"
07432cef 11008msgstr "让文件替换目录(反之亦然)"
ef317cd5 11009
276ceeaa 11010#: builtin/update-index.c:940
ef317cd5 11011msgid "notice files missing from worktree"
07432cef 11012msgstr "通知文件从工作区丢失"
ef317cd5 11013
276ceeaa 11014#: builtin/update-index.c:942
ef317cd5 11015msgid "refresh even if index contains unmerged entries"
07432cef 11016msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 11017
276ceeaa 11018#: builtin/update-index.c:945
ef317cd5 11019msgid "refresh stat information"
07432cef 11020msgstr "刷新统计信息"
ef317cd5 11021
276ceeaa 11022#: builtin/update-index.c:949
ef317cd5 11023msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 11024msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 11025
276ceeaa 11026#: builtin/update-index.c:953
6c94aba5 11027msgid "<mode>,<object>,<path>"
d9d56b23 11028msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 11029
276ceeaa 11030#: builtin/update-index.c:954
ef317cd5 11031msgid "add the specified entry to the index"
07432cef 11032msgstr "添加指定的条目到索引区"
ef317cd5 11033
276ceeaa 11034#: builtin/update-index.c:958
ef317cd5 11035msgid "(+/-)x"
07432cef 11036msgstr "(+/-)x"
ef317cd5 11037
276ceeaa 11038#: builtin/update-index.c:959
ef317cd5 11039msgid "override the executable bit of the listed files"
07432cef 11040msgstr "覆盖列表里文件的可执行位"
ef317cd5 11041
276ceeaa 11042#: builtin/update-index.c:963
ef317cd5 11043msgid "mark files as \"not changing\""
07432cef 11044msgstr "把文件标记为 \"没有变更\""
ef317cd5 11045
276ceeaa 11046#: builtin/update-index.c:966
ef317cd5 11047msgid "clear assumed-unchanged bit"
07432cef 11048msgstr "清除 assumed-unchanged 位"
ef317cd5 11049
276ceeaa 11050#: builtin/update-index.c:969
ef317cd5 11051msgid "mark files as \"index-only\""
07432cef 11052msgstr "把文件标记为 \"仅索引\""
ef317cd5 11053
276ceeaa 11054#: builtin/update-index.c:972
ef317cd5 11055msgid "clear skip-worktree bit"
07432cef 11056msgstr "清除 skip-worktree 位"
ef317cd5 11057
276ceeaa 11058#: builtin/update-index.c:975
ef317cd5 11059msgid "add to index only; do not add content to object database"
07432cef 11060msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 11061
276ceeaa 11062#: builtin/update-index.c:977
ef317cd5 11063msgid "remove named paths even if present in worktree"
07432cef 11064msgstr "即使存在工作区里,也删除路径"
ef317cd5 11065
276ceeaa 11066#: builtin/update-index.c:979
ef317cd5 11067msgid "with --stdin: input lines are terminated by null bytes"
07432cef 11068msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 11069
276ceeaa 11070#: builtin/update-index.c:981
ef317cd5 11071msgid "read list of paths to be updated from standard input"
07432cef 11072msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 11073
276ceeaa 11074#: builtin/update-index.c:985
ef317cd5 11075msgid "add entries from standard input to the index"
07432cef 11076msgstr "从标准输入添加条目到索引区"
ef317cd5 11077
276ceeaa 11078#: builtin/update-index.c:989
ef317cd5 11079msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 11080msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 11081
276ceeaa 11082#: builtin/update-index.c:993
ef317cd5 11083msgid "only update entries that differ from HEAD"
07432cef 11084msgstr "只更新与 HEAD 不同的条目"
ef317cd5 11085
276ceeaa 11086#: builtin/update-index.c:997
ef317cd5 11087msgid "ignore files missing from worktree"
07432cef 11088msgstr "忽略工作区丢失的文件"
ef317cd5 11089
276ceeaa 11090#: builtin/update-index.c:1000
ef317cd5 11091msgid "report actions to standard output"
07432cef 11092msgstr "在标准输出显示操作"
ef317cd5 11093
276ceeaa 11094#: builtin/update-index.c:1002
ef317cd5 11095msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 11096msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 11097
276ceeaa 11098#: builtin/update-index.c:1006
ef317cd5 11099msgid "write index in this format"
07432cef 11100msgstr "以这种格式写入索引区"
ef317cd5 11101
276ceeaa 11102#: builtin/update-index.c:1008
6acbf033
JX
11103msgid "enable or disable split index"
11104msgstr "启用或禁用索引拆分"
11105
276ceeaa 11106#: builtin/update-index.c:1010
7aea43ff
JX
11107msgid "enable/disable untracked cache"
11108msgstr "启用/禁用对未跟踪文件的缓存"
11109
276ceeaa
JX
11110#: builtin/update-index.c:1012
11111msgid "test if the filesystem supports untracked cache"
11112msgstr "测试文件系统是否支持未跟踪文件缓存"
11113
11114#: builtin/update-index.c:1014
7aea43ff
JX
11115msgid "enable untracked cache without testing the filesystem"
11116msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
11117
276ceeaa
JX
11118#: builtin/update-index.c:1134
11119msgid "Untracked cache disabled"
11120msgstr "缓存未跟踪文件被禁用"
11121
11122#: builtin/update-index.c:1146
11123#, c-format
11124msgid "Untracked cache enabled for '%s'"
11125msgstr "缓存未跟踪文件在 '%s' 启用"
11126
90314792 11127#: builtin/update-ref.c:9
814ff314
JX
11128msgid "git update-ref [<options>] -d <refname> [<old-val>]"
11129msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 11130
90314792 11131#: builtin/update-ref.c:10
814ff314
JX
11132msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
11133msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792
JX
11134
11135#: builtin/update-ref.c:11
814ff314
JX
11136msgid "git update-ref [<options>] --stdin [-z]"
11137msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 11138
1b7f4a34 11139#: builtin/update-ref.c:363
ef317cd5 11140msgid "delete the reference"
07432cef 11141msgstr "删除引用"
ef317cd5 11142
1b7f4a34 11143#: builtin/update-ref.c:365
ef317cd5 11144msgid "update <refname> not the one it points to"
07432cef 11145msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 11146
1b7f4a34 11147#: builtin/update-ref.c:366
90314792
JX
11148msgid "stdin has NUL-terminated arguments"
11149msgstr "标准输入有以 NUL 字符终止的参数"
11150
1b7f4a34 11151#: builtin/update-ref.c:367
90314792
JX
11152msgid "read updates from stdin"
11153msgstr "从标准输入读取更新"
11154
ef317cd5
JX
11155#: builtin/update-server-info.c:6
11156msgid "git update-server-info [--force]"
07432cef 11157msgstr "git update-server-info [--force]"
ef317cd5
JX
11158
11159#: builtin/update-server-info.c:14
11160msgid "update the info files from scratch"
07432cef 11161msgstr "从头开始更新文件信息"
ef317cd5 11162
6acbf033 11163#: builtin/verify-commit.c:17
814ff314
JX
11164msgid "git verify-commit [-v | --verbose] <commit>..."
11165msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033 11166
1b7f4a34 11167#: builtin/verify-commit.c:72
6acbf033
JX
11168msgid "print commit contents"
11169msgstr "打印提交内容"
11170
1b7f4a34
JX
11171#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
11172msgid "print raw gpg status output"
11173msgstr "打印原始 gpg 状态输出"
11174
220c313c 11175#: builtin/verify-pack.c:54
814ff314
JX
11176msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
11177msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 11178
220c313c 11179#: builtin/verify-pack.c:64
ef317cd5
JX
11180msgid "verbose"
11181msgstr "冗长输出"
11182
220c313c 11183#: builtin/verify-pack.c:66
ef317cd5 11184msgid "show statistics only"
07432cef 11185msgstr "只显示统计"
ef317cd5
JX
11186
11187#: builtin/verify-tag.c:17
814ff314
JX
11188msgid "git verify-tag [-v | --verbose] <tag>..."
11189msgstr "git verify-tag [-v | --verbose] <标签>..."
ef317cd5 11190
1b7f4a34 11191#: builtin/verify-tag.c:83
ef317cd5 11192msgid "print tag contents"
55a16ee4 11193msgstr "打印标签内容"
ef317cd5 11194
94550ed3
JX
11195#: builtin/worktree.c:15
11196msgid "git worktree add [<options>] <path> [<branch>]"
11197msgstr "git worktree add [<选项>] <路径> [<分支>]"
5bb01d4f 11198
94550ed3 11199#: builtin/worktree.c:16
5bb01d4f
JX
11200msgid "git worktree prune [<options>]"
11201msgstr "git worktree prune [<选项>]"
11202
94550ed3
JX
11203#: builtin/worktree.c:17
11204msgid "git worktree list [<options>]"
11205msgstr "git worktree list [<选项>]"
11206
11207#: builtin/worktree.c:39
5bb01d4f
JX
11208#, c-format
11209msgid "Removing worktrees/%s: not a valid directory"
11210msgstr "删除工作区/%s:不是一个有效的目录"
11211
94550ed3 11212#: builtin/worktree.c:45
5bb01d4f
JX
11213#, c-format
11214msgid "Removing worktrees/%s: gitdir file does not exist"
11215msgstr "删除 worktrees/%s:gitdir 文件不存在"
11216
94550ed3 11217#: builtin/worktree.c:50
5bb01d4f
JX
11218#, c-format
11219msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
11220msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
11221
94550ed3 11222#: builtin/worktree.c:61
5bb01d4f
JX
11223#, c-format
11224msgid "Removing worktrees/%s: invalid gitdir file"
11225msgstr "删除 worktrees/%s:无效的 gitdir 文件"
11226
94550ed3 11227#: builtin/worktree.c:77
5bb01d4f
JX
11228#, c-format
11229msgid "Removing worktrees/%s: gitdir file points to non-existent location"
11230msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
11231
94550ed3 11232#: builtin/worktree.c:112
5bb01d4f
JX
11233#, c-format
11234msgid "failed to remove: %s"
11235msgstr "无法删除:%s"
11236
94550ed3 11237#: builtin/worktree.c:201
5bb01d4f
JX
11238#, c-format
11239msgid "'%s' already exists"
11240msgstr "'%s' 已经存在"
11241
276ceeaa 11242#: builtin/worktree.c:233
5bb01d4f
JX
11243#, c-format
11244msgid "could not create directory of '%s'"
11245msgstr "不能创建目录 '%s'"
11246
276ceeaa 11247#: builtin/worktree.c:269
5bb01d4f 11248#, c-format
1b7f4a34
JX
11249msgid "Preparing %s (identifier %s)"
11250msgstr "准备 %s (标识符 %s)"
5bb01d4f 11251
276ceeaa 11252#: builtin/worktree.c:317
5bb01d4f
JX
11253msgid "checkout <branch> even if already checked out in other worktree"
11254msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
11255
276ceeaa 11256#: builtin/worktree.c:319
5bb01d4f
JX
11257msgid "create a new branch"
11258msgstr "创建一个新分支"
11259
276ceeaa 11260#: builtin/worktree.c:321
5bb01d4f
JX
11261msgid "create or reset a branch"
11262msgstr "创建或重置一个分支"
11263
276ceeaa 11264#: builtin/worktree.c:322
5bb01d4f
JX
11265msgid "detach HEAD at named commit"
11266msgstr "HEAD 从指定的提交分离"
11267
276ceeaa 11268#: builtin/worktree.c:329
1b7f4a34
JX
11269msgid "-b, -B, and --detach are mutually exclusive"
11270msgstr "-b、-B 和 --detach 是互斥的"
5bb01d4f 11271
ef317cd5
JX
11272#: builtin/write-tree.c:13
11273msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 11274msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5
JX
11275
11276#: builtin/write-tree.c:26
11277msgid "<prefix>/"
07432cef 11278msgstr "<前缀>/"
ef317cd5
JX
11279
11280#: builtin/write-tree.c:27
11281msgid "write tree object for a subdirectory <prefix>"
07432cef 11282msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5
JX
11283
11284#: builtin/write-tree.c:30
11285msgid "only useful for debugging"
07432cef 11286msgstr "只对调试有用"
ef317cd5 11287
276ceeaa 11288#: credential-cache--daemon.c:262
220c313c
JX
11289msgid "print debugging messages to stderr"
11290msgstr "调试信息输出到标准错误"
11291
d9d56b23 11292#: git.c:14
4dcdc3d8 11293msgid ""
220c313c 11294"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8
JX
11295"concept guides. See 'git help <command>' or 'git help <concept>'\n"
11296"to read about a specific subcommand or concept."
11297msgstr ""
220c313c
JX
11298"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
11299"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
11300"帮助。"
8ada9598 11301
3495628d 11302#: http.c:321
276ceeaa
JX
11303msgid "Public key pinning not supported with cURL < 7.44.0"
11304msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
11305
1b7f4a34 11306#: common-cmds.h:9
7aea43ff
JX
11307msgid "start a working area (see also: git help tutorial)"
11308msgstr "开始一个工作区(参见:git help tutorial)"
11309
1b7f4a34 11310#: common-cmds.h:10
7aea43ff
JX
11311msgid "work on the current change (see also: git help everyday)"
11312msgstr "在当前变更上工作(参见:git help everyday)"
11313
1b7f4a34 11314#: common-cmds.h:11
7aea43ff
JX
11315msgid "examine the history and state (see also: git help revisions)"
11316msgstr "检查历史和状态(参见:git help revisions)"
11317
1b7f4a34 11318#: common-cmds.h:12
7aea43ff
JX
11319msgid "grow, mark and tweak your common history"
11320msgstr "扩展、标记和调校您的历史记录"
11321
1b7f4a34 11322#: common-cmds.h:13
7aea43ff
JX
11323msgid "collaborate (see also: git help workflows)"
11324msgstr "协同(参见:git help workflows)"
11325
1b7f4a34 11326#: common-cmds.h:17
8ada9598 11327msgid "Add file contents to the index"
81809b99 11328msgstr "添加文件内容至索引"
8ada9598 11329
1b7f4a34
JX
11330#: common-cmds.h:18
11331msgid "Use binary search to find the commit that introduced a bug"
11332msgstr "通过二分查找定位引入 bug 的提交"
8ada9598 11333
1b7f4a34 11334#: common-cmds.h:19
8ada9598 11335msgid "List, create, or delete branches"
81809b99 11336msgstr "列出、创建或删除分支"
8ada9598 11337
1b7f4a34 11338#: common-cmds.h:20
5bb01d4f
JX
11339msgid "Switch branches or restore working tree files"
11340msgstr "切换分支或恢复工作区文件"
8ada9598 11341
1b7f4a34 11342#: common-cmds.h:21
8ada9598 11343msgid "Clone a repository into a new directory"
160fb2b2 11344msgstr "克隆一个仓库到一个新目录"
8ada9598 11345
1b7f4a34 11346#: common-cmds.h:22
8ada9598 11347msgid "Record changes to the repository"
160fb2b2 11348msgstr "记录变更到仓库"
8ada9598 11349
1b7f4a34 11350#: common-cmds.h:23
8ada9598 11351msgid "Show changes between commits, commit and working tree, etc"
81809b99 11352msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 11353
1b7f4a34 11354#: common-cmds.h:24
8ada9598 11355msgid "Download objects and refs from another repository"
160fb2b2 11356msgstr "从另外一个仓库下载对象和引用"
8ada9598 11357
1b7f4a34 11358#: common-cmds.h:25
8ada9598 11359msgid "Print lines matching a pattern"
81809b99 11360msgstr "输出和模式匹配的行"
8ada9598 11361
1b7f4a34 11362#: common-cmds.h:26
a77c07d9 11363msgid "Create an empty Git repository or reinitialize an existing one"
160fb2b2 11364msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
8ada9598 11365
1b7f4a34 11366#: common-cmds.h:27
8ada9598 11367msgid "Show commit logs"
81809b99 11368msgstr "显示提交日志"
8ada9598 11369
1b7f4a34 11370#: common-cmds.h:28
8ada9598 11371msgid "Join two or more development histories together"
81809b99 11372msgstr "合并两个或更多开发历史"
8ada9598 11373
1b7f4a34 11374#: common-cmds.h:29
8ada9598 11375msgid "Move or rename a file, a directory, or a symlink"
81809b99 11376msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 11377
1b7f4a34 11378#: common-cmds.h:30
2e8451e8 11379msgid "Fetch from and integrate with another repository or a local branch"
160fb2b2 11380msgstr "获取并整合另外的仓库或一个本地分支"
8ada9598 11381
1b7f4a34 11382#: common-cmds.h:31
8ada9598 11383msgid "Update remote refs along with associated objects"
81809b99 11384msgstr "更新远程引用和相关的对象"
8ada9598 11385
1b7f4a34 11386#: common-cmds.h:32
3495628d
JX
11387msgid "Reapply commits on top of another base tip"
11388msgstr "在另一个分支上重新应用提交"
8ada9598 11389
1b7f4a34 11390#: common-cmds.h:33
8ada9598 11391msgid "Reset current HEAD to the specified state"
4375c10e 11392msgstr "重置当前 HEAD 到指定状态"
8ada9598 11393
1b7f4a34 11394#: common-cmds.h:34
8ada9598 11395msgid "Remove files from the working tree and from the index"
81809b99 11396msgstr "从工作区和索引中删除文件"
8ada9598 11397
1b7f4a34 11398#: common-cmds.h:35
8ada9598 11399msgid "Show various types of objects"
81809b99 11400msgstr "显示各种类型的对象"
8ada9598 11401
1b7f4a34 11402#: common-cmds.h:36
8ada9598 11403msgid "Show the working tree status"
81809b99 11404msgstr "显示工作区状态"
8ada9598 11405
1b7f4a34 11406#: common-cmds.h:37
8ada9598 11407msgid "Create, list, delete or verify a tag object signed with GPG"
4375c10e 11408msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
8ada9598 11409
1b7f4a34 11410#: parse-options.h:145
220c313c
JX
11411msgid "expiry-date"
11412msgstr "到期时间"
11413
1b7f4a34 11414#: parse-options.h:160
220c313c
JX
11415msgid "no-op (backward compatibility)"
11416msgstr "空操作(向后兼容)"
11417
94550ed3 11418#: parse-options.h:237
220c313c
JX
11419msgid "be more verbose"
11420msgstr "更加详细"
11421
94550ed3 11422#: parse-options.h:239
220c313c
JX
11423msgid "be more quiet"
11424msgstr "更加安静"
11425
94550ed3 11426#: parse-options.h:245
220c313c
JX
11427msgid "use <n> digits to display SHA-1s"
11428msgstr "用 <n> 位数字显示 SHA-1 哈希值"
11429
94550ed3 11430#: rerere.h:38
220c313c
JX
11431msgid "update the index with reused conflict resolution if possible"
11432msgstr "如果可能,重用冲突解决更新索引"
11433
94550ed3 11434#: git-bisect.sh:55
b694fbb1
JX
11435msgid "You need to start by \"git bisect start\""
11436msgstr "您需要执行 \"git bisect start\" 来开始"
11437
90e6ef53 11438# 译者:注意保持句尾空格
c04f5ac3
JX
11439#. TRANSLATORS: Make sure to include [Y] and [n] in your
11440#. translation. The program will only accept English input
11441#. at this point.
94550ed3 11442#: git-bisect.sh:61
c04f5ac3
JX
11443msgid "Do you want me to do it for you [Y/n]? "
11444msgstr "您想让我为您这样做么[Y/n]? "
11445
94550ed3 11446#: git-bisect.sh:122
c04f5ac3
JX
11447#, sh-format
11448msgid "unrecognised option: '$arg'"
81809b99 11449msgstr "未能识别的选项:'$arg'"
c04f5ac3 11450
94550ed3 11451#: git-bisect.sh:126
c04f5ac3
JX
11452#, sh-format
11453msgid "'$arg' does not appear to be a valid revision"
11454msgstr "'$arg' 看起来不像是一个有效的版本"
11455
94550ed3 11456#: git-bisect.sh:155
c04f5ac3
JX
11457msgid "Bad HEAD - I need a HEAD"
11458msgstr "坏的 HEAD - 我需要一个 HEAD"
11459
94550ed3 11460#: git-bisect.sh:168
c04f5ac3
JX
11461#, sh-format
11462msgid ""
814ff314 11463"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
d9d56b23 11464msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
c04f5ac3 11465
94550ed3 11466#: git-bisect.sh:178
cfff71a9
JX
11467msgid "won't bisect on cg-seek'ed tree"
11468msgstr "不会在做了 cg-seek 的树上做二分查找"
c04f5ac3 11469
94550ed3 11470#: git-bisect.sh:182
c04f5ac3 11471msgid "Bad HEAD - strange symbolic ref"
90e6ef53 11472msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3 11473
94550ed3 11474#: git-bisect.sh:234
c04f5ac3
JX
11475#, sh-format
11476msgid "Bad bisect_write argument: $state"
90e6ef53 11477msgstr "坏的 bisect_write 参数:$state"
c04f5ac3 11478
94550ed3 11479#: git-bisect.sh:263
c04f5ac3
JX
11480#, sh-format
11481msgid "Bad rev input: $arg"
90e6ef53 11482msgstr "输入坏的版本:$arg"
c04f5ac3 11483
94550ed3 11484#: git-bisect.sh:278
c04f5ac3
JX
11485msgid "Please call 'bisect_state' with at least one argument."
11486msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
11487
94550ed3 11488#: git-bisect.sh:290
c04f5ac3
JX
11489#, sh-format
11490msgid "Bad rev input: $rev"
11491msgstr "输入坏的版本:$rev"
11492
94550ed3 11493#: git-bisect.sh:299
1b7f4a34
JX
11494#, sh-format
11495msgid "'git bisect $TERM_BAD' can take only one argument."
11496msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
11497
94550ed3 11498#: git-bisect.sh:322
1b7f4a34
JX
11499#, sh-format
11500msgid "Warning: bisecting only with a $TERM_BAD commit."
11501msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
b694fbb1 11502
90e6ef53 11503# 译者:注意保持句尾空格
c04f5ac3
JX
11504#. TRANSLATORS: Make sure to include [Y] and [n] in your
11505#. translation. The program will only accept English input
11506#. at this point.
94550ed3 11507#: git-bisect.sh:328
c04f5ac3
JX
11508msgid "Are you sure [Y/n]? "
11509msgstr "您确认么[Y/n]? "
11510
94550ed3 11511#: git-bisect.sh:340
1b7f4a34 11512#, sh-format
b694fbb1 11513msgid ""
1b7f4a34
JX
11514"You need to give me at least one $bad_syn and one $good_syn revision.\n"
11515"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
b694fbb1
JX
11516msgstr ""
11517"您需要给我至少一个好版本和一个坏版本。\n"
1b7f4a34 11518"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
b694fbb1 11519
94550ed3 11520#: git-bisect.sh:343
1b7f4a34 11521#, sh-format
b694fbb1
JX
11522msgid ""
11523"You need to start by \"git bisect start\".\n"
1b7f4a34
JX
11524"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
11525"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
b694fbb1
JX
11526msgstr ""
11527"您需要执行 \"git bisect start\" 来开始。\n"
11528"然后需要提供我至少一个好版本和一个坏版本。\n"
1b7f4a34 11529"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
b694fbb1 11530
94550ed3 11531#: git-bisect.sh:414 git-bisect.sh:546
b694fbb1
JX
11532msgid "We are not bisecting."
11533msgstr "我们没有在二分查找。"
11534
94550ed3 11535#: git-bisect.sh:421
c04f5ac3
JX
11536#, sh-format
11537msgid "'$invalid' is not a valid commit"
11538msgstr "'$invalid' 不是一个有效的提交"
11539
94550ed3 11540#: git-bisect.sh:430
c04f5ac3
JX
11541#, sh-format
11542msgid ""
11543"Could not check out original HEAD '$branch'.\n"
11544"Try 'git bisect reset <commit>'."
11545msgstr ""
11546"不能检出原始 HEAD '$branch'。\n"
07432cef 11547"尝试 'git bisect reset <提交>'。"
c04f5ac3 11548
94550ed3 11549#: git-bisect.sh:458
c04f5ac3
JX
11550msgid "No logfile given"
11551msgstr "未提供日志文件"
11552
94550ed3 11553#: git-bisect.sh:459
c04f5ac3
JX
11554#, sh-format
11555msgid "cannot read $file for replaying"
11556msgstr "不能读取 $file 来重放"
11557
94550ed3 11558#: git-bisect.sh:480
c04f5ac3
JX
11559msgid "?? what are you talking about?"
11560msgstr "?? 您在说什么?"
11561
94550ed3 11562#: git-bisect.sh:492
b694fbb1
JX
11563#, sh-format
11564msgid "running $command"
11565msgstr "运行 $command"
11566
94550ed3 11567#: git-bisect.sh:499
b694fbb1
JX
11568#, sh-format
11569msgid ""
11570"bisect run failed:\n"
11571"exit code $res from '$command' is < 0 or >= 128"
11572msgstr ""
11573"二分查找运行失败:\n"
07432cef 11574"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 11575
94550ed3 11576#: git-bisect.sh:525
b694fbb1
JX
11577msgid "bisect run cannot continue any more"
11578msgstr "二分查找不能继续运行"
11579
94550ed3 11580#: git-bisect.sh:531
b694fbb1
JX
11581#, sh-format
11582msgid ""
11583"bisect run failed:\n"
11584"'bisect_state $state' exited with error code $res"
11585msgstr ""
11586"二分查找运行失败:\n"
11587"'bisect_state $state' 退出码为 $res"
11588
94550ed3 11589#: git-bisect.sh:538
b694fbb1
JX
11590msgid "bisect run success"
11591msgstr "二分查找运行成功"
c04f5ac3 11592
94550ed3
JX
11593#: git-bisect.sh:565
11594msgid "please use two different terms"
11595msgstr "请使用两个不同的术语"
11596
11597#: git-bisect.sh:575
11598#, sh-format
11599msgid "'$term' is not a valid term"
11600msgstr "'$term' 不是一个有效的名称"
11601
11602#: git-bisect.sh:578
11603#, sh-format
11604msgid "can't use the builtin command '$term' as a term"
11605msgstr "不能使用内置命令 '$term' 作为术语"
11606
11607#: git-bisect.sh:587 git-bisect.sh:593
11608#, sh-format
11609msgid "can't change the meaning of term '$term'"
11610msgstr "不能修改术语 '$term' 的含义"
11611
11612#: git-bisect.sh:606
b694fbb1 11613#, sh-format
1b7f4a34
JX
11614msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
11615msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
c04f5ac3 11616
94550ed3
JX
11617#: git-bisect.sh:636
11618msgid "no terms defined"
11619msgstr "未定义术语"
11620
11621#: git-bisect.sh:653
11622#, sh-format
11623msgid ""
11624"invalid argument $arg for 'git bisect terms'.\n"
11625"Supported options are: --term-good|--term-old and --term-bad|--term-new."
11626msgstr ""
11627"参数 $arg 对命令 'git bisect terms' 无效。\n"
11628"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
11629
6c94aba5 11630#: git-rebase.sh:57
649900bc
JX
11631msgid ""
11632"When you have resolved this problem, run \"git rebase --continue\".\n"
11633"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
11634"To check out the original branch and stop rebasing, run \"git rebase --abort"
11635"\"."
11636msgstr ""
11637"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
11638"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
11639"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
11640
6acbf033 11641#: git-rebase.sh:165
2e8451e8
JX
11642msgid "Applied autostash."
11643msgstr "成功应用 autostash。"
11644
6acbf033 11645#: git-rebase.sh:168
2e8451e8
JX
11646#, sh-format
11647msgid "Cannot store $stash_sha1"
11648msgstr "无法保存 $stash_sha1"
11649
6acbf033 11650#: git-rebase.sh:169
2e8451e8
JX
11651msgid ""
11652"Applying autostash resulted in conflicts.\n"
11653"Your changes are safe in the stash.\n"
b1894384 11654"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
2e8451e8
JX
11655msgstr ""
11656"应用 autostash 导致冲突。\n"
11657"您的修改安全地保存在 stash 中。\n"
11658"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
11659
6acbf033 11660#: git-rebase.sh:208
649900bc 11661msgid "The pre-rebase hook refused to rebase."
98b2761d 11662msgstr "钩子 pre-rebase 拒绝变基操作。"
649900bc 11663
6acbf033 11664#: git-rebase.sh:213
649900bc
JX
11665msgid "It looks like git-am is in progress. Cannot rebase."
11666msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
11667
94550ed3 11668#: git-rebase.sh:354
649900bc
JX
11669msgid "The --exec option must be used with the --interactive option"
11670msgstr "选项 --exec 必须和选项 --interactive 同时使用"
11671
94550ed3 11672#: git-rebase.sh:359
649900bc
JX
11673msgid "No rebase in progress?"
11674msgstr "没有正在进行的变基?"
11675
94550ed3 11676#: git-rebase.sh:370
07432cef
WS
11677msgid "The --edit-todo action can only be used during interactive rebase."
11678msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
11679
94550ed3 11680#: git-rebase.sh:377
649900bc
JX
11681msgid "Cannot read HEAD"
11682msgstr "不能读取 HEAD"
11683
94550ed3 11684#: git-rebase.sh:380
649900bc
JX
11685msgid ""
11686"You must edit all merge conflicts and then\n"
11687"mark them as resolved using git add"
11688msgstr ""
11689"您必须编辑所有的合并冲突,然后通过 git add\n"
11690"命令将它们标记为已解决"
11691
94550ed3 11692#: git-rebase.sh:398
649900bc
JX
11693#, sh-format
11694msgid "Could not move back to $head_name"
11695msgstr "无法移回 $head_name"
11696
94550ed3 11697#: git-rebase.sh:417
649900bc
JX
11698#, sh-format
11699msgid ""
11700"It seems that there is already a $state_dir_base directory, and\n"
11701"I wonder if you are in the middle of another rebase. If that is the\n"
11702"case, please try\n"
11703"\t$cmd_live_rebase\n"
11704"If that is not the case, please\n"
11705"\t$cmd_clear_stale_rebase\n"
11706"and run me again. I am stopping in case you still have something\n"
11707"valuable there."
11708msgstr ""
98b2761d
JX
11709"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
11710"过程中。 如果是这样,请执行\n"
649900bc
JX
11711"\t$cmd_live_rebase\n"
11712"如果不是这样,请执行\n"
11713"\t$cmd_clear_stale_rebase\n"
98b2761d 11714"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
649900bc 11715
94550ed3 11716#: git-rebase.sh:468
649900bc
JX
11717#, sh-format
11718msgid "invalid upstream $upstream_name"
11719msgstr "无效的上游 $upstream_name"
11720
94550ed3 11721#: git-rebase.sh:492
649900bc
JX
11722#, sh-format
11723msgid "$onto_name: there are more than one merge bases"
11724msgstr "$onto_name: 有一个以上的合并基准"
11725
94550ed3 11726#: git-rebase.sh:495 git-rebase.sh:499
649900bc
JX
11727#, sh-format
11728msgid "$onto_name: there is no merge base"
11729msgstr "$onto_name: 没有合并基准"
11730
94550ed3 11731#: git-rebase.sh:504
649900bc
JX
11732#, sh-format
11733msgid "Does not point to a valid commit: $onto_name"
11734msgstr "没有指向一个有效的提交:$onto_name"
11735
94550ed3 11736#: git-rebase.sh:527
649900bc
JX
11737#, sh-format
11738msgid "fatal: no such branch: $branch_name"
11739msgstr "严重错误:无此分支:$branch_name"
11740
94550ed3 11741#: git-rebase.sh:560
2e8451e8
JX
11742msgid "Cannot autostash"
11743msgstr "无法 autostash"
11744
94550ed3 11745#: git-rebase.sh:565
2e8451e8
JX
11746#, sh-format
11747msgid "Created autostash: $stash_abbrev"
11748msgstr "创建了 autostash: $stash_abbrev"
11749
94550ed3 11750#: git-rebase.sh:569
649900bc
JX
11751msgid "Please commit or stash them."
11752msgstr "请提交或为它们保存进度。"
11753
94550ed3 11754#: git-rebase.sh:589
649900bc
JX
11755#, sh-format
11756msgid "Current branch $branch_name is up to date."
11757msgstr "当前分支 $branch_name 是最新的。"
11758
94550ed3 11759#: git-rebase.sh:593
649900bc
JX
11760#, sh-format
11761msgid "Current branch $branch_name is up to date, rebase forced."
11762msgstr "当前分支 $branch_name 是最新的,强制变基。"
11763
94550ed3 11764#: git-rebase.sh:604
649900bc
JX
11765#, sh-format
11766msgid "Changes from $mb to $onto:"
11767msgstr "变更从 $mb 到 $onto:"
11768
94550ed3 11769#: git-rebase.sh:613
649900bc 11770msgid "First, rewinding head to replay your work on top of it..."
160fb2b2 11771msgstr "首先,回退分支以便在上面重放您的工作..."
649900bc 11772
94550ed3 11773#: git-rebase.sh:623
649900bc
JX
11774#, sh-format
11775msgid "Fast-forwarded $branch_name to $onto_name."
11776msgstr "快进 $branch_name 至 $onto_name。"
11777
c04f5ac3
JX
11778#: git-stash.sh:51
11779msgid "git stash clear with parameters is unimplemented"
11780msgstr "git stash clear 不支持参数"
11781
11782#: git-stash.sh:74
11783msgid "You do not have the initial commit yet"
11784msgstr "您尚未建立初始提交"
11785
11786#: git-stash.sh:89
11787msgid "Cannot save the current index state"
90e6ef53 11788msgstr "无法保存当前索引状态"
c04f5ac3 11789
6acbf033 11790#: git-stash.sh:124 git-stash.sh:137
c04f5ac3
JX
11791msgid "Cannot save the current worktree state"
11792msgstr "无法保存当前工作区状态"
11793
6acbf033 11794#: git-stash.sh:141
c04f5ac3 11795msgid "No changes selected"
90e6ef53 11796msgstr "没有选择变更"
c04f5ac3 11797
6acbf033 11798#: git-stash.sh:144
c04f5ac3 11799msgid "Cannot remove temporary index (can't happen)"
90e6ef53 11800msgstr "无法删除临时索引(不应发生)"
c04f5ac3 11801
6acbf033 11802#: git-stash.sh:157
c04f5ac3
JX
11803msgid "Cannot record working tree state"
11804msgstr "不能记录工作区状态"
11805
1b7f4a34 11806#: git-stash.sh:189
2e8451e8
JX
11807#, sh-format
11808msgid "Cannot update $ref_stash with $w_commit"
11809msgstr "无法用 $w_commit 更新 $ref_stash"
11810
b694fbb1
JX
11811#. TRANSLATORS: $option is an invalid option, like
11812#. `--blah-blah'. The 7 spaces at the beginning of the
11813#. second line correspond to "error: ". So you should line
11814#. up the second line with however many characters the
11815#. translation of "error: " takes in your language. E.g. in
11816#. English this is:
11817#.
11818#. $ git stash save --blah-blah 2>&1 | head -n 2
11819#. error: unknown option for 'stash save': --blah-blah
11820#. To provide a message, use git stash save -- '--blah-blah'
1b7f4a34 11821#: git-stash.sh:239
b694fbb1
JX
11822#, sh-format
11823msgid ""
11824"error: unknown option for 'stash save': $option\n"
11825" To provide a message, use git stash save -- '$option'"
11826msgstr ""
11827"错误:'stash save' 的未知选项:$option\n"
11828" 要提供一个描述信息,使用 git stash save -- '$option'"
11829
1b7f4a34 11830#: git-stash.sh:260
c04f5ac3
JX
11831msgid "No local changes to save"
11832msgstr "没有要保存的本地修改"
11833
1b7f4a34 11834#: git-stash.sh:264
c04f5ac3 11835msgid "Cannot initialize stash"
90e6ef53 11836msgstr "无法初始化 stash"
c04f5ac3 11837
1b7f4a34 11838#: git-stash.sh:268
c04f5ac3
JX
11839msgid "Cannot save the current status"
11840msgstr "无法保存当前状态"
11841
1b7f4a34 11842#: git-stash.sh:286
c04f5ac3
JX
11843msgid "Cannot remove worktree changes"
11844msgstr "无法删除工作区变更"
11845
94550ed3 11846#: git-stash.sh:405
7aea43ff
JX
11847#, sh-format
11848msgid "unknown option: $opt"
11849msgstr "未知选项: $opt"
11850
94550ed3 11851#: git-stash.sh:415
c04f5ac3 11852msgid "No stash found."
90e6ef53 11853msgstr "未发现 stash。"
c04f5ac3 11854
94550ed3 11855#: git-stash.sh:422
c04f5ac3
JX
11856#, sh-format
11857msgid "Too many revisions specified: $REV"
90e6ef53 11858msgstr "指定了太多的版本:$REV"
c04f5ac3 11859
94550ed3 11860#: git-stash.sh:428
c04f5ac3 11861#, sh-format
220c313c
JX
11862msgid "$reference is not a valid reference"
11863msgstr "$reference 不是一个有效的引用"
c04f5ac3 11864
94550ed3 11865#: git-stash.sh:456
c04f5ac3
JX
11866#, sh-format
11867msgid "'$args' is not a stash-like commit"
90e6ef53 11868msgstr "'$args' 不是 stash 样提交"
c04f5ac3 11869
94550ed3 11870#: git-stash.sh:467
c04f5ac3
JX
11871#, sh-format
11872msgid "'$args' is not a stash reference"
90e6ef53 11873msgstr "'$args' 不是一个 stash 引用"
c04f5ac3 11874
94550ed3 11875#: git-stash.sh:475
c04f5ac3 11876msgid "unable to refresh index"
90e6ef53 11877msgstr "无法刷新索引"
c04f5ac3 11878
94550ed3 11879#: git-stash.sh:479
c04f5ac3
JX
11880msgid "Cannot apply a stash in the middle of a merge"
11881msgstr "无法在合并过程中恢复进度"
11882
94550ed3 11883#: git-stash.sh:487
c04f5ac3 11884msgid "Conflicts in index. Try without --index."
90e6ef53 11885msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 11886
94550ed3 11887#: git-stash.sh:489
c04f5ac3 11888msgid "Could not save index tree"
90e6ef53 11889msgstr "不能保存索引树"
c04f5ac3 11890
94550ed3 11891#: git-stash.sh:523
c04f5ac3 11892msgid "Cannot unstage modified files"
160fb2b2 11893msgstr "无法将修改的文件取消暂存"
c04f5ac3 11894
94550ed3 11895#: git-stash.sh:538
b694fbb1
JX
11896msgid "Index was not unstashed."
11897msgstr "索引的进度没有被恢复。"
11898
94550ed3 11899#: git-stash.sh:561
c04f5ac3
JX
11900#, sh-format
11901msgid "Dropped ${REV} ($s)"
11902msgstr "丢弃了 ${REV} ($s)"
11903
94550ed3 11904#: git-stash.sh:562
c04f5ac3
JX
11905#, sh-format
11906msgid "${REV}: Could not drop stash entry"
90e6ef53 11907msgstr "${REV}:不能丢弃进度条目"
c04f5ac3 11908
94550ed3 11909#: git-stash.sh:570
c04f5ac3
JX
11910msgid "No branch name specified"
11911msgstr "未指定分支名"
11912
94550ed3 11913#: git-stash.sh:642
c04f5ac3
JX
11914msgid "(To restore them type \"git stash apply\")"
11915msgstr "(为恢复数据输入 \"git stash apply\")"
11916
94550ed3 11917#: git-submodule.sh:104
c04f5ac3
JX
11918#, sh-format
11919msgid "cannot strip one component off url '$remoteurl'"
11920msgstr "无法从 url '$remoteurl' 剥离一个组件"
11921
94550ed3 11922#: git-submodule.sh:281
2e8451e8
JX
11923msgid "Relative path can only be used from the toplevel of the working tree"
11924msgstr "只能在工作区的顶级目录中使用相对路径"
11925
94550ed3 11926#: git-submodule.sh:291
c04f5ac3
JX
11927#, sh-format
11928msgid "repo URL: '$repo' must be absolute or begin with ./|../"
4375c10e 11929msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
c04f5ac3 11930
94550ed3 11931#: git-submodule.sh:308
c04f5ac3 11932#, sh-format
170e9899
JX
11933msgid "'$sm_path' already exists in the index"
11934msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 11935
94550ed3 11936#: git-submodule.sh:312
b694fbb1
JX
11937#, sh-format
11938msgid ""
11939"The following path is ignored by one of your .gitignore files:\n"
11940"$sm_path\n"
11941"Use -f if you really want to add it."
11942msgstr ""
11943"以下路径被您的一个 .gitignore 文件所忽略:\n"
11944"$sm_path\n"
11945"如果您确实想添加它,使用 -f 参数。"
11946
94550ed3 11947#: git-submodule.sh:330
b694fbb1
JX
11948#, sh-format
11949msgid "Adding existing repo at '$sm_path' to the index"
160fb2b2 11950msgstr "添加位于 '$sm_path' 的现存仓库到索引"
b694fbb1 11951
94550ed3 11952#: git-submodule.sh:332
c04f5ac3 11953#, sh-format
170e9899 11954msgid "'$sm_path' already exists and is not a valid git repo"
160fb2b2 11955msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
c04f5ac3 11956
94550ed3 11957#: git-submodule.sh:340
07432cef
WS
11958#, sh-format
11959msgid "A git directory for '$sm_name' is found locally with remote(s):"
160fb2b2 11960msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
07432cef 11961
94550ed3 11962#: git-submodule.sh:342
07432cef
WS
11963#, sh-format
11964msgid ""
11965"If you want to reuse this local git directory instead of cloning again from"
11966msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11967
94550ed3 11968#: git-submodule.sh:344
07432cef
WS
11969#, sh-format
11970msgid ""
11971"use the '--force' option. If the local git directory is not the correct repo"
160fb2b2 11972msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
07432cef 11973
94550ed3 11974#: git-submodule.sh:345
07432cef
WS
11975#, sh-format
11976msgid ""
11977"or you are unsure what this means choose another name with the '--name' "
11978"option."
11979msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11980
94550ed3 11981#: git-submodule.sh:347
07432cef
WS
11982#, sh-format
11983msgid "Reactivating local git directory for submodule '$sm_name'."
11984msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11985
94550ed3 11986#: git-submodule.sh:359
c04f5ac3 11987#, sh-format
170e9899
JX
11988msgid "Unable to checkout submodule '$sm_path'"
11989msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 11990
94550ed3 11991#: git-submodule.sh:364
c04f5ac3 11992#, sh-format
170e9899
JX
11993msgid "Failed to add submodule '$sm_path'"
11994msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 11995
94550ed3 11996#: git-submodule.sh:373
c04f5ac3 11997#, sh-format
170e9899
JX
11998msgid "Failed to register submodule '$sm_path'"
11999msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 12000
94550ed3 12001#: git-submodule.sh:417
c04f5ac3 12002#, sh-format
2e8451e8
JX
12003msgid "Entering '$prefix$displaypath'"
12004msgstr "正在进入 '$prefix$displaypath'"
c04f5ac3 12005
94550ed3 12006#: git-submodule.sh:437
c04f5ac3 12007#, sh-format
2e8451e8
JX
12008msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
12009msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
c04f5ac3 12010
94550ed3 12011#: git-submodule.sh:483
c04f5ac3 12012#, sh-format
2e8451e8
JX
12013msgid "No url found for submodule path '$displaypath' in .gitmodules"
12014msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
c04f5ac3 12015
94550ed3 12016#: git-submodule.sh:492
c04f5ac3 12017#, sh-format
2e8451e8
JX
12018msgid "Failed to register url for submodule path '$displaypath'"
12019msgstr "无法为子模组路径 '$displaypath' 注册 url"
c04f5ac3 12020
94550ed3 12021#: git-submodule.sh:494
c04f5ac3 12022#, sh-format
2e8451e8
JX
12023msgid "Submodule '$name' ($url) registered for path '$displaypath'"
12024msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
c04f5ac3 12025
94550ed3 12026#: git-submodule.sh:511
d691f479 12027#, sh-format
2e8451e8
JX
12028msgid "Failed to register update mode for submodule path '$displaypath'"
12029msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
d691f479 12030
94550ed3 12031#: git-submodule.sh:549
1003b3a5
JX
12032#, sh-format
12033msgid "Use '.' if you really want to deinitialize all submodules"
12034msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
12035
94550ed3 12036#: git-submodule.sh:566
1003b3a5 12037#, sh-format
2e8451e8
JX
12038msgid "Submodule work tree '$displaypath' contains a .git directory"
12039msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
1003b3a5 12040
94550ed3 12041#: git-submodule.sh:567
1003b3a5
JX
12042#, sh-format
12043msgid ""
12044"(use 'rm -rf' if you really want to remove it including all of its history)"
12045msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
12046
94550ed3 12047#: git-submodule.sh:573
c04f5ac3
JX
12048#, sh-format
12049msgid ""
2e8451e8 12050"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
1003b3a5 12051"discard them"
2e8451e8 12052msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
1003b3a5 12053
94550ed3 12054#: git-submodule.sh:576
1003b3a5 12055#, sh-format
2e8451e8
JX
12056msgid "Cleared directory '$displaypath'"
12057msgstr "已清除目录 '$displaypath'"
1003b3a5 12058
94550ed3 12059#: git-submodule.sh:577
1003b3a5 12060#, sh-format
2e8451e8
JX
12061msgid "Could not remove submodule work tree '$displaypath'"
12062msgstr "无法移除子模组工作区 '$displaypath'"
1003b3a5 12063
94550ed3 12064#: git-submodule.sh:580
1003b3a5 12065#, sh-format
2e8451e8
JX
12066msgid "Could not create empty submodule directory '$displaypath'"
12067msgstr "不能创建空的子模组目录 '$displaypath'"
1003b3a5 12068
94550ed3 12069#: git-submodule.sh:589
1003b3a5 12070#, sh-format
2e8451e8
JX
12071msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
12072msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
1003b3a5 12073
276ceeaa 12074#: git-submodule.sh:723
1003b3a5
JX
12075#, sh-format
12076msgid ""
2e8451e8 12077"Submodule path '$displaypath' not initialized\n"
c04f5ac3
JX
12078"Maybe you want to use 'update --init'?"
12079msgstr ""
2e8451e8 12080"子模组路径 '$displaypath' 没有初始化\n"
90e6ef53 12081"也许您想用 'update --init'?"
c04f5ac3 12082
276ceeaa 12083#: git-submodule.sh:736
c04f5ac3 12084#, sh-format
2e8451e8
JX
12085msgid "Unable to find current revision in submodule path '$displaypath'"
12086msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 12087
276ceeaa 12088#: git-submodule.sh:745
c04f5ac3 12089#, sh-format
170e9899
JX
12090msgid "Unable to fetch in submodule path '$sm_path'"
12091msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 12092
276ceeaa 12093#: git-submodule.sh:768
2e8451e8
JX
12094#, sh-format
12095msgid "Unable to fetch in submodule path '$displaypath'"
12096msgstr "无法在子模组路径 '$displaypath' 中获取"
12097
276ceeaa 12098#: git-submodule.sh:788
6c94aba5
JX
12099#, sh-format
12100msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
12101msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
12102
276ceeaa 12103#: git-submodule.sh:789
c04f5ac3 12104#, sh-format
6c94aba5
JX
12105msgid "Submodule path '$displaypath': checked out '$sha1'"
12106msgstr "子模组路径 '$displaypath':检出 '$sha1'"
12107
276ceeaa 12108#: git-submodule.sh:793
6c94aba5 12109#, sh-format
2e8451e8
JX
12110msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
12111msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 12112
276ceeaa 12113#: git-submodule.sh:794
c04f5ac3 12114#, sh-format
2e8451e8
JX
12115msgid "Submodule path '$displaypath': rebased into '$sha1'"
12116msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 12117
276ceeaa 12118#: git-submodule.sh:799
c04f5ac3 12119#, sh-format
2e8451e8
JX
12120msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
12121msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 12122
276ceeaa 12123#: git-submodule.sh:800
c04f5ac3 12124#, sh-format
2e8451e8
JX
12125msgid "Submodule path '$displaypath': merged in '$sha1'"
12126msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 12127
276ceeaa 12128#: git-submodule.sh:805
c04f5ac3 12129#, sh-format
2e8451e8 12130msgid ""
1b7f4a34 12131"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
2e8451e8 12132msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
c04f5ac3 12133
276ceeaa 12134#: git-submodule.sh:806
c04f5ac3 12135#, sh-format
2e8451e8
JX
12136msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
12137msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
c04f5ac3 12138
276ceeaa 12139#: git-submodule.sh:836
2e8451e8
JX
12140#, sh-format
12141msgid "Failed to recurse into submodule path '$displaypath'"
12142msgstr "无法递归进子模组路径 '$displaypath'"
12143
276ceeaa 12144#: git-submodule.sh:944
649900bc
JX
12145msgid "The --cached option cannot be used with the --files option"
12146msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1 12147
276ceeaa 12148#: git-submodule.sh:996
b694fbb1
JX
12149#, sh-format
12150msgid "unexpected mode $mod_dst"
12151msgstr "意外的模式 $mod_dst"
c04f5ac3 12152
90e6ef53 12153# 译者:注意保持前导空格
276ceeaa 12154#: git-submodule.sh:1016
c04f5ac3 12155#, sh-format
2e8451e8
JX
12156msgid " Warn: $display_name doesn't contain commit $sha1_src"
12157msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 12158
90e6ef53 12159# 译者:注意保持前导空格
276ceeaa 12160#: git-submodule.sh:1019
c04f5ac3 12161#, sh-format
2e8451e8
JX
12162msgid " Warn: $display_name doesn't contain commit $sha1_dst"
12163msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 12164
90e6ef53 12165# 译者:注意保持前导空格
276ceeaa 12166#: git-submodule.sh:1022
c04f5ac3 12167#, sh-format
2e8451e8
JX
12168msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
12169msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 12170
276ceeaa 12171#: git-submodule.sh:1047
c04f5ac3 12172msgid "blob"
07432cef 12173msgstr "数据对象"
c04f5ac3 12174
276ceeaa 12175#: git-submodule.sh:1165
1003b3a5
JX
12176#, sh-format
12177msgid "Failed to recurse into submodule path '$sm_path'"
12178msgstr "无法递归进子模组路径 '$sm_path'"
12179
276ceeaa 12180#: git-submodule.sh:1229
c04f5ac3 12181#, sh-format
2e8451e8
JX
12182msgid "Synchronizing submodule url for '$displaypath'"
12183msgstr "为 '$displaypath' 同步子模组 url"
1b7f4a34 12184
3495628d
JX
12185#~ msgid "Forward-port local commits to the updated upstream head"
12186#~ msgstr "本地提交转移至更新后的上游分支中"
12187
276ceeaa
JX
12188#~ msgid "unable to parse format"
12189#~ msgstr "不能解析格式"
12190
12191#~ msgid "improper format entered align:%s"
12192#~ msgstr "输入了不正确的格式 align:%s"
12193
12194#~ msgid "Could not set core.worktree in %s"
12195#~ msgstr "不能在 %s 中设置 core.worktree"
12196
12197# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
12198#~ msgid ""
12199#~ "push.default is unset; its implicit value has changed in\n"
12200#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
12201#~ "and maintain the traditional behavior, use:\n"
12202#~ "\n"
12203#~ " git config --global push.default matching\n"
12204#~ "\n"
12205#~ "To squelch this message and adopt the new behavior now, use:\n"
12206#~ "\n"
12207#~ " git config --global push.default simple\n"
12208#~ "\n"
12209#~ "When push.default is set to 'matching', git will push local branches\n"
12210#~ "to the remote branches that already exist with the same name.\n"
12211#~ "\n"
12212#~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
12213#~ "behavior, which only pushes the current branch to the corresponding\n"
12214#~ "remote branch that 'git pull' uses to update the current branch.\n"
12215#~ "\n"
12216#~ "See 'git help config' and search for 'push.default' for further "
12217#~ "information.\n"
12218#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
12219#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
12220#~ msgstr ""
12221#~ "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
12222#~ "变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
12223#~ "\n"
12224#~ " git config --global push.default matching\n"
12225#~ "\n"
12226#~ "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
12227#~ "\n"
12228#~ " git config --global push.default simple\n"
12229#~ "\n"
12230#~ "当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
12231#~ "本地分支。\n"
12232#~ "\n"
12233#~ "从 Git 2.0 开始,Git 默认采用更为保守的 'simple' 模式,只推送当前\n"
12234#~ "分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
12235#~ "\n"
12236#~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
12237#~ "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
12238#~ "为保持兼容,请用 'current' 代替 'simple')"
12239
12240#~ msgid "Could not append '%s'"
12241#~ msgstr "不能追加 '%s'"
12242
12243#~ msgid "Could not set '%s'"
12244#~ msgstr "不能设置 '%s'"
12245
12246# 译者:可选值,不能翻译
12247#~ msgid "check|on-demand|no"
12248#~ msgstr "check|on-demand|no"
12249
12250#~ msgid "Missing author: %s"
12251#~ msgstr "缺少作者:%s"
12252
12253#~ msgid "Testing "
12254#~ msgstr "正在测试 "
12255
89f80d72
JX
12256#~ msgid "unable to look up current user in the passwd file: %s"
12257#~ msgstr "无法在口令文件中查询到当前用户:%s"
12258
12259#~ msgid "no such user"
12260#~ msgstr "无此用户"
12261
94550ed3
JX
12262#~ msgid "show usage"
12263#~ msgstr "显示用法"
12264
12265#~ msgid "branch '%s' does not point at a commit"
12266#~ msgstr "分支 '%s' 未指向一个提交"
12267
12268#~ msgid "object '%s' does not point to a commit"
12269#~ msgstr "对象 '%s' 没有指向一个提交"
12270
12271#~ msgid "print only merged branches"
12272#~ msgstr "只打印合并的分支"
12273
12274#~ msgid "--dissociate given, but there is no --reference"
12275#~ msgstr "提供了参数 --dissociate,但未提供 --reference"
12276
12277#~ msgid "insanely long template name %s"
12278#~ msgstr "太长的模版名 %s"
12279
12280#~ msgid "insanely long symlink %s"
12281#~ msgstr "太长的符号链接 %s"
12282
12283#~ msgid "insanely long template path %s"
12284#~ msgstr "太长的模版路径 %s"
12285
12286#~ msgid "insane git directory %s"
12287#~ msgstr "不正常的 git 目录 %s"
12288
12289#~ msgid "unsupported sort specification '%s'"
12290#~ msgstr "不支持的排序规格 '%s'"
12291
12292#~ msgid "unsupported sort specification '%s' in variable '%s'"
12293#~ msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
12294
12295#~ msgid "switch 'points-at' requires an object"
12296#~ msgstr "开关 'points-at' 需要一个对象"
12297
12298#~ msgid "sort tags"
12299#~ msgstr "排序标签"
12300
12301#~ msgid "--sort and -n are incompatible"
12302#~ msgstr "--sort 和 -n 不兼容"
12303
12304#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
12305#~ msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
12306
03ea3327
JX
12307#~ msgid "false|true|preserve"
12308#~ msgstr "false|true|preserve"
12309
1b7f4a34
JX
12310#~ msgid "BUG: reopen a lockfile that is still open"
12311#~ msgstr "BUG: 重新打开一个仍打开着的锁文件"
12312
12313#~ msgid "BUG: reopen a lockfile that has been committed"
12314#~ msgstr "BUG: 重新打开一个已提交的锁文件"
12315
12316#~ msgid "option %s does not accept negative form"
12317#~ msgstr "选项 %s 不接受否定格式"
12318
12319#~ msgid "unable to parse value '%s' for option %s"
12320#~ msgstr "不能解析选项 %1$s 的值 '%2$s'"
12321
1b7f4a34
JX
12322#~ msgid "-b and -B are mutually exclusive"
12323#~ msgstr "-b 和 -B 互斥"
12324
12325#~ msgid "You need to set your committer info first"
12326#~ msgstr "您需要先设置你的提交者信息"
12327
12328#~ msgid ""
12329#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
12330#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
12331#~ "To restore the original branch and stop patching, run \"$cmdline --abort"
12332#~ "\"."
12333#~ msgstr ""
12334#~ "当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
12335#~ "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
12336#~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
12337
12338#~ msgid "Patch format $patch_format is not supported."
12339#~ msgstr "不支持 $patch_format 补丁格式。"
12340
12341#~ msgid "Please make up your mind. --skip or --abort?"
12342#~ msgstr "请下决心。--skip 或是 --abort ?"
12343
12344#~ msgid ""
12345#~ "Patch is empty. Was it split wrong?\n"
12346#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
12347#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
12348#~ msgstr ""
12349#~ "补丁为空。是不是切分错误?\n"
12350#~ "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
12351#~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
12352
12353#~ msgid "Patch does not have a valid e-mail address."
12354#~ msgstr "补丁中没有一个有效的邮件地址。"
12355
12356#~ msgid "Applying: $FIRSTLINE"
12357#~ msgstr "正应用:$FIRSTLINE"
12358
12359#~ msgid "Patch failed at $msgnum $FIRSTLINE"
12360#~ msgstr "补丁失败于 $msgnum $FIRSTLINE"
12361
12362#~ msgid ""
12363#~ "Pull is not possible because you have unmerged files.\n"
12364#~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
12365#~ "as appropriate to mark resolution and make a commit."
12366#~ msgstr ""
12367#~ "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
12368#~ "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
12369
12370#~ msgid "Pull is not possible because you have unmerged files."
12371#~ msgstr "Pull 不可用,因为您尚有未合并的文件。"