]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
Merge branch 'master' of git://github.com/nafmo/git-l10n-sv
[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"
94550ed3
JX
138"POT-Creation-Date: 2015-12-11 23:36+0800\n"
139"PO-Revision-Date: 2015-12-14 22:12+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
94550ed3 161#: advice.c:101 builtin/merge.c:1225
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
94550ed3 204#: archive.c:430 builtin/log.c:1228
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
94550ed3
JX
212#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535
213#: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987
214#: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99
1b7f4a34
JX
215#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395
216#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153
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
94550ed3 248#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
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
94550ed3 256#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
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
7aea43ff 264#: attr.c:265
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
94550ed3 272#: branch.c:61
4dcdc3d8
JX
273#, c-format
274msgid "Not setting branch %s as its own upstream."
275msgstr "未设置分支 %s 作为它自己的上游。"
276
94550ed3 277#: branch.c:84
4dcdc3d8
JX
278#, c-format
279msgid "Branch %s set up to track remote branch %s from %s by rebasing."
280msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
281
94550ed3 282#: branch.c:85
4dcdc3d8
JX
283#, c-format
284msgid "Branch %s set up to track remote branch %s from %s."
285msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
286
94550ed3 287#: branch.c:89
4dcdc3d8
JX
288#, c-format
289msgid "Branch %s set up to track local branch %s by rebasing."
290msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
291
94550ed3 292#: branch.c:90
4dcdc3d8
JX
293#, c-format
294msgid "Branch %s set up to track local branch %s."
295msgstr "分支 %s 设置为跟踪本地分支 %s。"
296
94550ed3 297#: branch.c:95
4dcdc3d8
JX
298#, c-format
299msgid "Branch %s set up to track remote ref %s by rebasing."
300msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
301
94550ed3 302#: branch.c:96
4dcdc3d8
JX
303#, c-format
304msgid "Branch %s set up to track remote ref %s."
305msgstr "分支 %s 设置为跟踪远程引用 %s。"
306
94550ed3 307#: branch.c:100
4dcdc3d8
JX
308#, c-format
309msgid "Branch %s set up to track local ref %s by rebasing."
310msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
311
94550ed3 312#: branch.c:101
4dcdc3d8
JX
313#, c-format
314msgid "Branch %s set up to track local ref %s."
315msgstr "分支 %s 设置为跟踪本地引用 %s。"
316
94550ed3 317#: branch.c:134
4dcdc3d8
JX
318#, c-format
319msgid "Not tracking: ambiguous information for ref %s"
320msgstr "未跟踪:引用 %s 有歧义"
321
94550ed3 322#: branch.c:163
4dcdc3d8
JX
323#, c-format
324msgid "'%s' is not a valid branch name."
325msgstr "'%s' 不是一个有效的分支名称。"
326
94550ed3 327#: branch.c:168
4dcdc3d8
JX
328#, c-format
329msgid "A branch named '%s' already exists."
330msgstr "一个分支名 '%s' 已经存在。"
331
94550ed3 332#: branch.c:176
4dcdc3d8
JX
333msgid "Cannot force update the current branch."
334msgstr "无法强制更新当前分支。"
335
94550ed3 336#: branch.c:196
1003b3a5
JX
337#, c-format
338msgid "Cannot setup tracking information; starting point '%s' is not a branch."
339msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
340
94550ed3 341#: branch.c:198
1003b3a5
JX
342#, c-format
343msgid "the requested upstream branch '%s' does not exist"
344msgstr "请求的上游分支 '%s' 不存在"
345
94550ed3 346#: branch.c:200
1003b3a5
JX
347msgid ""
348"\n"
349"If you are planning on basing your work on an upstream\n"
350"branch that already exists at the remote, you may need to\n"
351"run \"git fetch\" to retrieve it.\n"
352"\n"
353"If you are planning to push out a new local branch that\n"
354"will track its remote counterpart, you may want to use\n"
355"\"git push -u\" to set the upstream config as you push."
356msgstr ""
357"\n"
358"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
359"您可能需要执行 \"git fetch\" 来获取分支。\n"
360"\n"
361"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
362"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
363
94550ed3 364#: branch.c:244
4dcdc3d8
JX
365#, c-format
366msgid "Not a valid object name: '%s'."
367msgstr "不是一个有效的对象名:'%s'。"
368
94550ed3 369#: branch.c:264
4dcdc3d8
JX
370#, c-format
371msgid "Ambiguous object name: '%s'."
372msgstr "歧义的对象名:'%s'。"
373
94550ed3 374#: branch.c:269
4dcdc3d8
JX
375#, c-format
376msgid "Not a valid branch point: '%s'."
377msgstr "无效的分支点:'%s'。"
378
94550ed3 379#: branch.c:322
1b7f4a34
JX
380#, c-format
381msgid "'%s' is already checked out at '%s'"
382msgstr "'%s' 已经检出到 '%s'"
383
220c313c 384#: bundle.c:34
8ada9598
JX
385#, c-format
386msgid "'%s' does not look like a v2 bundle file"
81809b99 387msgstr "'%s' 不像是一个 v2 版本的包文件"
8ada9598 388
220c313c 389#: bundle.c:61
81809b99 390#, c-format
8ada9598 391msgid "unrecognized header: %s%s (%d)"
81809b99 392msgstr "未能识别的包头:%s%s (%d)"
8ada9598 393
94550ed3 394#: bundle.c:87 builtin/commit.c:766
8ada9598
JX
395#, c-format
396msgid "could not open '%s'"
397msgstr "不能打开 '%s'"
398
220c313c 399#: bundle.c:139
8ada9598 400msgid "Repository lacks these prerequisite commits:"
160fb2b2 401msgstr "仓库中缺少这些必备的提交:"
8ada9598 402
94550ed3
JX
403#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
404#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
405#: builtin/log.c:849 builtin/log.c:1456 builtin/log.c:1689 builtin/merge.c:358
90314792 406#: builtin/shortlog.c:158
8ada9598
JX
407msgid "revision walk setup failed"
408msgstr "版本遍历设置失败"
409
220c313c 410#: bundle.c:185
8ada9598 411#, c-format
1003b3a5
JX
412msgid "The bundle contains this ref:"
413msgid_plural "The bundle contains these %d refs:"
414msgstr[0] "这个包中含有这个引用:"
415msgstr[1] "这个包中含有 %d 个引用:"
8ada9598 416
220c313c 417#: bundle.c:192
6792b93b
JX
418msgid "The bundle records a complete history."
419msgstr "这个包记录一个完整历史。"
420
220c313c 421#: bundle.c:194
8ada9598 422#, c-format
1003b3a5
JX
423msgid "The bundle requires this ref:"
424msgid_plural "The bundle requires these %d refs:"
425msgstr[0] "这个包需要这个引用:"
426msgstr[1] "这个包需要 %d 个引用:"
8ada9598 427
1b7f4a34 428#: bundle.c:253
9aeb4c2b
JX
429msgid "Could not spawn pack-objects"
430msgstr "不能生成 pack-objects 进程"
431
1b7f4a34 432#: bundle.c:264
9aeb4c2b
JX
433msgid "pack-objects died"
434msgstr "pack-objects 终止"
435
1b7f4a34 436#: bundle.c:304
8ada9598 437msgid "rev-list died"
81809b99 438msgstr "rev-list 终止"
8ada9598 439
1b7f4a34 440#: bundle.c:353
8ada9598
JX
441#, c-format
442msgid "ref '%s' is excluded by the rev-list options"
81809b99 443msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 444
94550ed3 445#: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261
9aeb4c2b
JX
446#, c-format
447msgid "unrecognized argument: %s"
448msgstr "未能识别的参数:%s"
449
1b7f4a34 450#: bundle.c:449
8ada9598 451msgid "Refusing to create empty bundle."
81809b99 452msgstr "不能创建空包。"
8ada9598 453
1b7f4a34 454#: bundle.c:459
81809b99 455#, c-format
8ada9598 456msgid "cannot create '%s'"
81809b99 457msgstr "不能创建 '%s'"
8ada9598 458
1b7f4a34 459#: bundle.c:480
8ada9598 460msgid "index-pack died"
81809b99 461msgstr "index-pack 终止"
8ada9598 462
94550ed3 463#: color.c:275
220c313c
JX
464#, c-format
465msgid "invalid color value: %.*s"
466msgstr "无效的颜色值:%.*s"
467
94550ed3
JX
468#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
469#: builtin/am.c:2149
c04f5ac3
JX
470#, c-format
471msgid "could not parse %s"
472msgstr "不能解析 %s"
473
6acbf033 474#: commit.c:42
c04f5ac3
JX
475#, c-format
476msgid "%s %s is not a commit!"
477msgstr "%s %s 不是一个提交!"
478
479#: compat/obstack.c:406 compat/obstack.c:408
480msgid "memory exhausted"
481msgstr "内存耗尽"
482
814ff314 483#: config.c:474 config.c:476
220c313c
JX
484#, c-format
485msgid "bad config file line %d in %s"
486msgstr "配置文件 %2$s 出错于第 %1$d 行"
487
814ff314 488#: config.c:592
220c313c
JX
489#, c-format
490msgid "bad numeric config value '%s' for '%s' in %s: %s"
491msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
492
814ff314 493#: config.c:594
220c313c
JX
494#, c-format
495msgid "bad numeric config value '%s' for '%s': %s"
496msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
497
814ff314 498#: config.c:679
220c313c
JX
499#, c-format
500msgid "failed to expand user dir in: '%s'"
501msgstr "无法扩展 '%s' 中的用户目录"
502
814ff314 503#: config.c:757 config.c:768
220c313c
JX
504#, c-format
505msgid "bad zlib compression level %d"
506msgstr "错误的 zlib 压缩级别 %d"
507
814ff314 508#: config.c:890
220c313c
JX
509#, c-format
510msgid "invalid mode for object creation: %s"
511msgstr "无效的对象创建模式:%s"
512
814ff314 513#: config.c:1216
220c313c
JX
514msgid "unable to parse command-line config"
515msgstr "无法解析命令行中的配置"
516
814ff314 517#: config.c:1277
220c313c
JX
518msgid "unknown error occured while reading the configuration files"
519msgstr "在读取配置文件时遇到未知错误"
520
814ff314 521#: config.c:1601
220c313c
JX
522#, c-format
523msgid "unable to parse '%s' from command-line config"
524msgstr "无法解析命令行配置中的 '%s'"
525
814ff314 526#: config.c:1603
220c313c
JX
527#, c-format
528msgid "bad config variable '%s' in file '%s' at line %d"
529msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
530
814ff314 531#: config.c:1662
220c313c
JX
532#, c-format
533msgid "%s has multiple values"
534msgstr "%s 有多个取值"
535
536#: connected.c:69
c04f5ac3
JX
537msgid "Could not run 'git rev-list'"
538msgstr "不能执行 'git rev-list'"
539
220c313c 540#: connected.c:89
c04f5ac3
JX
541#, c-format
542msgid "failed write to rev-list: %s"
543msgstr "无法写入 rev-list:%s"
544
220c313c 545#: connected.c:97
c04f5ac3
JX
546#, c-format
547msgid "failed to close rev-list's stdin: %s"
548msgstr "无法关闭 rev-list 的标准输入:%s"
549
8ada9598
JX
550#: date.c:95
551msgid "in the future"
81809b99 552msgstr "在将来"
8ada9598
JX
553
554#: date.c:101
555#, c-format
556msgid "%lu second ago"
557msgid_plural "%lu seconds ago"
6c94aba5
JX
558msgstr[0] "%lu 秒钟前"
559msgstr[1] "%lu 秒钟前"
8ada9598
JX
560
561#: date.c:108
562#, c-format
563msgid "%lu minute ago"
564msgid_plural "%lu minutes ago"
6c94aba5
JX
565msgstr[0] "%lu 分钟前"
566msgstr[1] "%lu 分钟前"
8ada9598
JX
567
568#: date.c:115
569#, c-format
570msgid "%lu hour ago"
571msgid_plural "%lu hours ago"
6c94aba5
JX
572msgstr[0] "%lu 小时前"
573msgstr[1] "%lu 小时前"
8ada9598
JX
574
575#: date.c:122
576#, c-format
577msgid "%lu day ago"
578msgid_plural "%lu days ago"
6c94aba5
JX
579msgstr[0] "%lu 天前"
580msgstr[1] "%lu 天前"
8ada9598
JX
581
582#: date.c:128
583#, c-format
584msgid "%lu week ago"
585msgid_plural "%lu weeks ago"
6c94aba5
JX
586msgstr[0] "%lu 周前"
587msgstr[1] "%lu 周前"
8ada9598
JX
588
589#: date.c:135
590#, c-format
591msgid "%lu month ago"
592msgid_plural "%lu months ago"
6c94aba5
JX
593msgstr[0] "%lu 个月前"
594msgstr[1] "%lu 个月前"
8ada9598
JX
595
596#: date.c:146
597#, c-format
598msgid "%lu year"
599msgid_plural "%lu years"
81809b99 600msgstr[0] "%lu 年"
5ae481e0 601msgstr[1] "%lu 年"
8ada9598 602
6c94aba5 603#. TRANSLATORS: "%s" is "<n> years"
8ada9598
JX
604#: date.c:149
605#, c-format
606msgid "%s, %lu month ago"
607msgid_plural "%s, %lu months ago"
6c94aba5
JX
608msgstr[0] "%s %lu 个月前"
609msgstr[1] "%s %lu 个月前"
8ada9598
JX
610
611#: date.c:154 date.c:159
612#, c-format
613msgid "%lu year ago"
614msgid_plural "%lu years ago"
81809b99 615msgstr[0] "%lu 年前"
5ae481e0 616msgstr[1] "%lu 年前"
8ada9598 617
cfff71a9
JX
618#: diffcore-order.c:24
619#, c-format
620msgid "failed to read orderfile '%s'"
621msgstr "无法读取排序文件 '%s'"
622
814ff314 623#: diffcore-rename.c:536
6c94aba5
JX
624msgid "Performing inexact rename detection"
625msgstr "正在进行非精确的重命名检测"
626
90e6ef53 627# 译者:注意保持前导空格
94550ed3 628#: diff.c:115
c04f5ac3 629#, c-format
07432cef
WS
630msgid " Failed to parse dirstat cut-off percentage '%s'\n"
631msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
c04f5ac3 632
90e6ef53 633# 译者:注意保持前导空格
94550ed3 634#: diff.c:120
c04f5ac3 635#, c-format
07432cef
WS
636msgid " Unknown dirstat parameter '%s'\n"
637msgstr " 未知的 dirstat 参数 '%s'\n"
c04f5ac3 638
94550ed3 639#: diff.c:215
07432cef
WS
640#, c-format
641msgid "Unknown value for 'diff.submodule' config variable: '%s'"
642msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
643
94550ed3 644#: diff.c:267
c04f5ac3
JX
645#, c-format
646msgid ""
647"Found errors in 'diff.dirstat' config variable:\n"
648"%s"
649msgstr ""
90e6ef53 650"发现配置变量 'diff.dirstat' 中的错误:\n"
c04f5ac3
JX
651"%s"
652
94550ed3 653#: diff.c:3000
6acbf033
JX
654#, c-format
655msgid "external diff died, stopping at %s"
656msgstr "外部 diff 退出,停止在 %s"
657
94550ed3 658#: diff.c:3396
6acbf033
JX
659msgid "--follow requires exactly one pathspec"
660msgstr "--follow 参数后只跟一个 pathspec"
661
94550ed3 662#: diff.c:3559
c04f5ac3
JX
663#, c-format
664msgid ""
665"Failed to parse --dirstat/-X option parameter:\n"
666"%s"
667msgstr ""
668"无法解析 --dirstat/-X 选项的参数:\n"
669"%s"
670
94550ed3 671#: diff.c:3573
07432cef
WS
672#, c-format
673msgid "Failed to parse --submodule option parameter: '%s'"
674msgstr "无法解析 --submodule 选项的参数:'%s'"
675
94550ed3 676#: dir.c:1915
7aea43ff
JX
677msgid "failed to get kernel name and information"
678msgstr "无法获得内核名称和信息"
679
94550ed3 680#: dir.c:1998
7aea43ff
JX
681msgid "Untracked cache is disabled on this system."
682msgstr "缓存未跟踪文件在本系统被禁用"
683
1b7f4a34 684#: gpg-interface.c:166 gpg-interface.c:237
c04f5ac3
JX
685msgid "could not run gpg."
686msgstr "不能执行 gpg。"
687
1b7f4a34 688#: gpg-interface.c:178
c04f5ac3
JX
689msgid "gpg did not accept the data"
690msgstr "gpg 没有接受数据"
691
1b7f4a34 692#: gpg-interface.c:189
c04f5ac3
JX
693msgid "gpg failed to sign the data"
694msgstr "gpg 无法为数据签名"
695
1b7f4a34 696#: gpg-interface.c:222
a77c07d9
JX
697#, c-format
698msgid "could not create temporary file '%s': %s"
699msgstr "不能创建临时文件 '%s':%s"
700
1b7f4a34 701#: gpg-interface.c:225
a77c07d9
JX
702#, c-format
703msgid "failed writing detached signature to '%s': %s"
704msgstr "无法将分离式签名写入 '%s':%s"
705
220c313c 706#: grep.c:1718
7ac1c0ad
JX
707#, c-format
708msgid "'%s': unable to read %s"
709msgstr "'%s':无法读取 %s"
710
220c313c 711#: grep.c:1735
7ac1c0ad
JX
712#, c-format
713msgid "'%s': %s"
714msgstr "'%s':%s"
715
220c313c 716#: grep.c:1746
7ac1c0ad
JX
717#, c-format
718msgid "'%s': short read %s"
719msgstr "'%s':读取不完整 %s"
720
6acbf033 721#: help.c:207
81809b99 722#, c-format
8ada9598 723msgid "available git commands in '%s'"
81809b99 724msgstr "在 '%s' 下可用的 git 命令"
8ada9598 725
6acbf033 726#: help.c:214
8ada9598 727msgid "git commands available from elsewhere on your $PATH"
81809b99 728msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
8ada9598 729
7aea43ff
JX
730#: help.c:246
731msgid "These are common Git commands used in various situations:"
732msgstr "这些是各种场合常见的 Git 命令:"
a77c07d9 733
7aea43ff 734#: help.c:311
c04f5ac3
JX
735#, c-format
736msgid ""
737"'%s' appears to be a git command, but we were not\n"
738"able to execute it. Maybe git-%s is broken?"
739msgstr ""
740"'%s' 像是一个 git 命令,但却无法运行。\n"
741"可能是 git-%s 受损?"
742
7aea43ff 743#: help.c:368
8ada9598 744msgid "Uh oh. Your system reports no Git commands at all."
81809b99 745msgstr "唉呀,您的系统中未发现 Git 命令。"
8ada9598 746
7aea43ff 747#: help.c:390
8ada9598
JX
748#, c-format
749msgid ""
750"WARNING: You called a Git command named '%s', which does not exist.\n"
751"Continuing under the assumption that you meant '%s'"
752msgstr ""
81809b99
JX
753"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
754"是 '%s'"
8ada9598 755
7aea43ff 756#: help.c:395
8ada9598
JX
757#, c-format
758msgid "in %0.1f seconds automatically..."
81809b99 759msgstr "在 %0.1f 秒钟后自动运行..."
8ada9598 760
7aea43ff 761#: help.c:402
8ada9598
JX
762#, c-format
763msgid "git: '%s' is not a git command. See 'git --help'."
81809b99 764msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
8ada9598 765
7aea43ff 766#: help.c:406 help.c:466
8ada9598
JX
767msgid ""
768"\n"
769"Did you mean this?"
770msgid_plural ""
771"\n"
772"Did you mean one of these?"
773msgstr[0] ""
81809b99
JX
774"\n"
775"您指的是这个么?"
776msgstr[1] ""
777"\n"
195febda 778"您指的是这其中的某一个么?"
8ada9598 779
7aea43ff 780#: help.c:462
2e8451e8
JX
781#, c-format
782msgid "%s: %s - %s"
783msgstr "%s:%s - %s"
784
220c313c 785#: merge.c:41
07432cef
WS
786msgid "failed to read the cache"
787msgstr "无法读取缓存"
788
94550ed3
JX
789#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
790#: builtin/checkout.c:587 builtin/clone.c:722
07432cef
WS
791msgid "unable to write new index file"
792msgstr "无法写新的索引文件"
793
220c313c 794#: merge-recursive.c:189
649900bc
JX
795#, c-format
796msgid "(bad commit)\n"
797msgstr "(坏提交)\n"
798
220c313c 799#: merge-recursive.c:209
649900bc
JX
800#, c-format
801msgid "addinfo_cache failed for path '%s'"
802msgstr "为路径 '%s' addinfo_cache 失败"
803
220c313c 804#: merge-recursive.c:270
649900bc
JX
805msgid "error building trees"
806msgstr "无法创建树"
807
94550ed3 808#: merge-recursive.c:686
649900bc
JX
809#, c-format
810msgid "failed to create path '%s'%s"
811msgstr "无法创建路径 '%s'%s"
812
94550ed3 813#: merge-recursive.c:697
649900bc
JX
814#, c-format
815msgid "Removing %s to make room for subdirectory\n"
816msgstr "删除 %s 以便为子目录留出空间\n"
817
94550ed3 818#: merge-recursive.c:711 merge-recursive.c:732
649900bc
JX
819msgid ": perhaps a D/F conflict?"
820msgstr ":可能是一个目录/文件冲突?"
821
94550ed3 822#: merge-recursive.c:722
649900bc
JX
823#, c-format
824msgid "refusing to lose untracked file at '%s'"
825msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
826
94550ed3 827#: merge-recursive.c:762
649900bc
JX
828#, c-format
829msgid "cannot read object %s '%s'"
830msgstr "不能读取对象 %s '%s'"
831
94550ed3 832#: merge-recursive.c:764
649900bc
JX
833#, c-format
834msgid "blob expected for %s '%s'"
160fb2b2 835msgstr "%s '%s' 应为数据对象"
649900bc 836
94550ed3 837#: merge-recursive.c:787 builtin/clone.c:369
649900bc
JX
838#, c-format
839msgid "failed to open '%s'"
840msgstr "无法打开 '%s'"
841
94550ed3 842#: merge-recursive.c:795
649900bc
JX
843#, c-format
844msgid "failed to symlink '%s'"
845msgstr "无法创建符号链接 '%s'"
846
94550ed3 847#: merge-recursive.c:798
649900bc
JX
848#, c-format
849msgid "do not know what to do with %06o %s '%s'"
850msgstr "不知道如何处理 %06o %s '%s'"
851
94550ed3 852#: merge-recursive.c:936
649900bc
JX
853msgid "Failed to execute internal merge"
854msgstr "无法执行内部合并"
855
94550ed3 856#: merge-recursive.c:940
649900bc
JX
857#, c-format
858msgid "Unable to add %s to database"
859msgstr "不能添加 %s 至对象库"
860
94550ed3 861#: merge-recursive.c:956
649900bc
JX
862msgid "unsupported object type in the tree"
863msgstr "在树中有不支持的对象类型"
864
94550ed3 865#: merge-recursive.c:1031 merge-recursive.c:1045
649900bc
JX
866#, c-format
867msgid ""
868"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
869"in tree."
870msgstr ""
871"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
872"的版本被保留。"
873
94550ed3 874#: merge-recursive.c:1037 merge-recursive.c:1050
649900bc
JX
875#, c-format
876msgid ""
877"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
878"in tree at %s."
879msgstr ""
880"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
881"的版本保留于 %8$s 中。"
882
94550ed3 883#: merge-recursive.c:1091
649900bc
JX
884msgid "rename"
885msgstr "重命名"
886
94550ed3 887#: merge-recursive.c:1091
649900bc
JX
888msgid "renamed"
889msgstr "重命名"
890
94550ed3 891#: merge-recursive.c:1147
649900bc
JX
892#, c-format
893msgid "%s is a directory in %s adding as %s instead"
894msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
895
94550ed3 896#: merge-recursive.c:1169
649900bc
JX
897#, c-format
898msgid ""
899"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
900"\"->\"%s\" in \"%s\"%s"
901msgstr ""
902"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
903"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
904
94550ed3 905#: merge-recursive.c:1174
649900bc
JX
906msgid " (left unresolved)"
907msgstr "(留下未解决)"
908
94550ed3 909#: merge-recursive.c:1228
649900bc
JX
910#, c-format
911msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
912msgstr ""
913"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
914"%5$s"
915
94550ed3 916#: merge-recursive.c:1258
649900bc
JX
917#, c-format
918msgid "Renaming %s to %s and %s to %s instead"
07432cef 919msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
649900bc 920
94550ed3 921#: merge-recursive.c:1457
649900bc
JX
922#, c-format
923msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
924msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
925
94550ed3 926#: merge-recursive.c:1467
649900bc
JX
927#, c-format
928msgid "Adding merged %s"
929msgstr "添加合并后的 %s"
930
94550ed3 931#: merge-recursive.c:1472 merge-recursive.c:1674
649900bc
JX
932#, c-format
933msgid "Adding as %s instead"
934msgstr "而是以 %s 为名添加"
935
94550ed3 936#: merge-recursive.c:1523
649900bc
JX
937#, c-format
938msgid "cannot read object %s"
939msgstr "不能读取对象 %s"
940
94550ed3 941#: merge-recursive.c:1526
649900bc
JX
942#, c-format
943msgid "object %s is not a blob"
160fb2b2 944msgstr "对象 %s 不是一个数据对象"
649900bc 945
94550ed3 946#: merge-recursive.c:1578
649900bc
JX
947msgid "modify"
948msgstr "修改"
949
94550ed3 950#: merge-recursive.c:1578
649900bc
JX
951msgid "modified"
952msgstr "修改"
953
94550ed3 954#: merge-recursive.c:1588
649900bc
JX
955msgid "content"
956msgstr "内容"
957
94550ed3 958#: merge-recursive.c:1595
649900bc
JX
959msgid "add/add"
960msgstr "添加/添加"
961
94550ed3 962#: merge-recursive.c:1629
649900bc
JX
963#, c-format
964msgid "Skipped %s (merged same as existing)"
965msgstr "略过 %s(已经做过相同合并)"
966
94550ed3 967#: merge-recursive.c:1643
649900bc
JX
968#, c-format
969msgid "Auto-merging %s"
970msgstr "自动合并 %s"
971
94550ed3 972#: merge-recursive.c:1647 git-submodule.sh:1025
649900bc
JX
973msgid "submodule"
974msgstr "子模组"
975
94550ed3 976#: merge-recursive.c:1648
649900bc
JX
977#, c-format
978msgid "CONFLICT (%s): Merge conflict in %s"
979msgstr "冲突(%s):合并冲突于 %s"
980
94550ed3 981#: merge-recursive.c:1734
649900bc
JX
982#, c-format
983msgid "Removing %s"
984msgstr "删除 %s"
985
94550ed3 986#: merge-recursive.c:1759
649900bc
JX
987msgid "file/directory"
988msgstr "文件/目录"
989
94550ed3 990#: merge-recursive.c:1765
649900bc
JX
991msgid "directory/file"
992msgstr "目录/文件"
993
94550ed3 994#: merge-recursive.c:1770
649900bc
JX
995#, c-format
996msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
997msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
998
94550ed3 999#: merge-recursive.c:1780
649900bc
JX
1000#, c-format
1001msgid "Adding %s"
1002msgstr "添加 %s"
1003
94550ed3 1004#: merge-recursive.c:1797
649900bc
JX
1005msgid "Fatal merge failure, shouldn't happen."
1006msgstr "严重的合并错误,不应发生。"
1007
94550ed3 1008#: merge-recursive.c:1816
649900bc
JX
1009msgid "Already up-to-date!"
1010msgstr "已经是最新的!"
1011
94550ed3 1012#: merge-recursive.c:1825
649900bc
JX
1013#, c-format
1014msgid "merging of trees %s and %s failed"
1015msgstr "无法合并树 %s 和 %s"
1016
94550ed3 1017#: merge-recursive.c:1855
649900bc
JX
1018#, c-format
1019msgid "Unprocessed path??? %s"
1020msgstr "未处理的路径??? %s"
1021
94550ed3 1022#: merge-recursive.c:1903
649900bc
JX
1023msgid "Merging:"
1024msgstr "合并:"
1025
94550ed3 1026#: merge-recursive.c:1916
649900bc 1027#, c-format
e5e38ce4
JX
1028msgid "found %u common ancestor:"
1029msgid_plural "found %u common ancestors:"
1030msgstr[0] "发现 %u 个共同祖先:"
1031msgstr[1] "发现 %u 个共同祖先:"
649900bc 1032
94550ed3 1033#: merge-recursive.c:1953
649900bc
JX
1034msgid "merge returned no commit"
1035msgstr "合并未返回提交"
1036
94550ed3 1037#: merge-recursive.c:2010
649900bc
JX
1038#, c-format
1039msgid "Could not parse object '%s'"
1040msgstr "不能解析对象 '%s'"
1041
94550ed3 1042#: merge-recursive.c:2021 builtin/merge.c:645
649900bc
JX
1043msgid "Unable to write index."
1044msgstr "不能写入索引。"
1045
6acbf033 1046#: notes-utils.c:41
2e8451e8
JX
1047msgid "Cannot commit uninitialized/unreferenced notes tree"
1048msgstr "不能提交未初始化/未引用的注解树"
1049
1b7f4a34 1050#: notes-utils.c:100
2e8451e8
JX
1051#, c-format
1052msgid "Bad notes.rewriteMode value: '%s'"
1053msgstr "坏的 notes.rewriteMode 值:'%s'"
1054
1b7f4a34 1055#: notes-utils.c:110
2e8451e8
JX
1056#, c-format
1057msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1058msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
1059
1060#. TRANSLATORS: The first %s is the name of the
1061#. environment variable, the second %s is its value
1b7f4a34 1062#: notes-utils.c:137
2e8451e8
JX
1063#, c-format
1064msgid "Bad %s value: '%s'"
1065msgstr "坏的 %s 值:'%s'"
1066
7aea43ff 1067#: object.c:242
1003b3a5
JX
1068#, c-format
1069msgid "unable to parse object: %s"
1070msgstr "不能解析对象:%s"
1071
94550ed3 1072#: parse-options.c:570
8ada9598 1073msgid "..."
81809b99 1074msgstr "..."
8ada9598 1075
94550ed3 1076#: parse-options.c:588
81809b99 1077#, c-format
8ada9598 1078msgid "usage: %s"
81809b99 1079msgstr "用法:%s"
8ada9598
JX
1080
1081#. TRANSLATORS: the colon here should align with the
1082#. one in "usage: %s" translation
94550ed3 1083#: parse-options.c:592
81809b99 1084#, c-format
8ada9598 1085msgid " or: %s"
81809b99 1086msgstr " 或:%s"
8ada9598
JX
1087
1088# 译者:为保证在输出中对齐,注意调整句中空格!
94550ed3 1089#: parse-options.c:595
81809b99 1090#, c-format
8ada9598 1091msgid " %s"
81809b99 1092msgstr " %s"
8ada9598 1093
94550ed3 1094#: parse-options.c:629
63af42fe
JX
1095msgid "-NUM"
1096msgstr "-数字"
1097
94550ed3
JX
1098#: parse-options-cb.c:108
1099#, c-format
1100msgid "malformed object name '%s'"
1101msgstr "非法的对象名 '%s'"
1102
1103#: path.c:752
1104#, c-format
1105msgid "Could not make %s writable by group"
1106msgstr "不能设置 %s 为组可写"
1107
cfff71a9 1108#: pathspec.c:133
90314792 1109msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
160fb2b2 1110msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
90314792 1111
cfff71a9 1112#: pathspec.c:143
90314792
JX
1113msgid ""
1114"global 'literal' pathspec setting is incompatible with all other global "
1115"pathspec settings"
160fb2b2 1116msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
90314792 1117
cfff71a9 1118#: pathspec.c:177
90314792 1119msgid "invalid parameter for pathspec magic 'prefix'"
160fb2b2 1120msgstr "路径规格包含无效的神奇前缀"
90314792 1121
cfff71a9 1122#: pathspec.c:183
90314792
JX
1123#, c-format
1124msgid "Invalid pathspec magic '%.*s' in '%s'"
160fb2b2 1125msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
90314792 1126
cfff71a9 1127#: pathspec.c:187
90314792
JX
1128#, c-format
1129msgid "Missing ')' at the end of pathspec magic in '%s'"
160fb2b2 1130msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
90314792 1131
cfff71a9 1132#: pathspec.c:205
90314792
JX
1133#, c-format
1134msgid "Unimplemented pathspec magic '%c' in '%s'"
160fb2b2 1135msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
90314792 1136
cfff71a9 1137#: pathspec.c:230
a77c07d9 1138#, c-format
90314792
JX
1139msgid "%s: 'literal' and 'glob' are incompatible"
1140msgstr "%s:'literal' 和 'glob' 不兼容"
a77c07d9 1141
cfff71a9 1142#: pathspec.c:241
a77c07d9 1143#, c-format
90314792 1144msgid "%s: '%s' is outside repository"
160fb2b2 1145msgstr "%s:'%s' 在仓库之外"
a77c07d9 1146
cfff71a9 1147#: pathspec.c:291
90314792
JX
1148#, c-format
1149msgid "Pathspec '%s' is in submodule '%.*s'"
160fb2b2 1150msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
90314792 1151
cfff71a9 1152#: pathspec.c:353
90314792
JX
1153#, c-format
1154msgid "%s: pathspec magic not supported by this command: %s"
160fb2b2 1155msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
90314792 1156
6acbf033 1157#: pathspec.c:432
90314792
JX
1158#, c-format
1159msgid "pathspec '%s' is beyond a symbolic link"
160fb2b2 1160msgstr "路径规格 '%s' 位于符号链接中"
90314792 1161
6acbf033 1162#: pathspec.c:441
cfff71a9
JX
1163msgid ""
1164"There is nothing to exclude from by :(exclude) patterns.\n"
1165"Perhaps you forgot to add either ':/' or '.' ?"
1166msgstr ""
1167"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1168"添加 ':/' 或 '.' ?"
1169
1b7f4a34 1170#: pretty.c:969
220c313c
JX
1171msgid "unable to parse --pretty format"
1172msgstr "不能解析 --pretty 格式"
1173
94550ed3 1174#: progress.c:235
6c94aba5
JX
1175msgid "done"
1176msgstr "完成"
1177
94550ed3 1178#: read-cache.c:1281
6c94aba5
JX
1179#, c-format
1180msgid ""
1181"index.version set, but the value is invalid.\n"
1182"Using version %i"
1183msgstr ""
1184"设置了 index.version,但是取值无效。\n"
1185"使用版本 %i"
1186
94550ed3 1187#: read-cache.c:1291
6c94aba5
JX
1188#, c-format
1189msgid ""
1190"GIT_INDEX_VERSION set, but the value is invalid.\n"
1191"Using version %i"
1192msgstr ""
1193"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1194"使用版本 %i"
1195
94550ed3 1196#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
1b7f4a34
JX
1197#: builtin/merge.c:983
1198#, c-format
1199msgid "Could not open '%s' for writing"
1200msgstr "无法打开 '%s' 进行写入"
1201
94550ed3 1202#: refs/files-backend.c:2359
1b7f4a34
JX
1203#, c-format
1204msgid "could not delete reference %s: %s"
1205msgstr "无法删除引用 %s:%s"
1206
94550ed3 1207#: refs/files-backend.c:2362
1b7f4a34
JX
1208#, c-format
1209msgid "could not delete references: %s"
1210msgstr "无法删除引用:%s"
1211
94550ed3 1212#: refs/files-backend.c:2371
1b7f4a34
JX
1213#, c-format
1214msgid "could not remove reference %s"
1215msgstr "无法删除引用 %s"
1216
94550ed3
JX
1217#: ref-filter.c:245
1218#, c-format
1219msgid "format: %%(end) atom used without corresponding atom"
1220msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
1221
1222#: ref-filter.c:704
1223#, c-format
1224msgid "positive value expected contents:lines=%s"
1225msgstr "要为 contents:lines=%s 提供一个正数"
1226
1227#: ref-filter.c:833
1228#, c-format
1229msgid "expected format: %%(color:<color>)"
1230msgstr "期望的格式:%%(color:<color>)"
1231
1232#: ref-filter.c:835
1b7f4a34
JX
1233msgid "unable to parse format"
1234msgstr "不能解析格式"
1235
94550ed3
JX
1236#: ref-filter.c:870
1237#, c-format
1238msgid "expected format: %%(align:<width>,<position>)"
1239msgstr "期望的格式:%%(align:<width>,<position>)"
1240
1241#: ref-filter.c:893
1242#, c-format
1243msgid "improper format entered align:%s"
1244msgstr "输入了不正确的格式 align:%s"
1245
1246#: ref-filter.c:898
1247#, c-format
1248msgid "positive width expected with the %%(align) atom"
1249msgstr "元素 %%(align) 需要一个正数的宽度"
1250
1251#: ref-filter.c:1219
1252#, c-format
1253msgid "malformed object at '%s'"
1254msgstr "非法的对象于 '%s'"
1255
1256#: ref-filter.c:1561
1257#, c-format
1258msgid "format: %%(end) atom missing"
1259msgstr "格式:缺少 %%(end) 元素"
1260
1261#: ref-filter.c:1615
1262#, c-format
1263msgid "malformed object name %s"
1264msgstr "非法的对象名 %s"
1265
1266#: remote.c:756
cfff71a9
JX
1267#, c-format
1268msgid "Cannot fetch both %s and %s to %s"
1269msgstr "不能同时获取 %s 和 %s 至 %s"
1270
94550ed3 1271#: remote.c:760
cfff71a9
JX
1272#, c-format
1273msgid "%s usually tracks %s, not %s"
1274msgstr "%s 通常跟踪 %s,而非 %s"
1275
94550ed3 1276#: remote.c:764
cfff71a9
JX
1277#, c-format
1278msgid "%s tracks both %s and %s"
1279msgstr "%s 同时跟踪 %s 和 %s"
1280
94550ed3 1281#: remote.c:772
cfff71a9
JX
1282msgid "Internal error"
1283msgstr "内部错误"
1284
94550ed3 1285#: remote.c:1687 remote.c:1730
7aea43ff
JX
1286msgid "HEAD does not point to a branch"
1287msgstr "HEAD 没有指向一个分支"
1288
94550ed3 1289#: remote.c:1696
7aea43ff
JX
1290#, c-format
1291msgid "no such branch: '%s'"
1292msgstr "没有此分支:'%s'"
1293
94550ed3 1294#: remote.c:1699
7aea43ff
JX
1295#, c-format
1296msgid "no upstream configured for branch '%s'"
1297msgstr "尚未给分支 '%s' 设置上游"
1298
94550ed3 1299#: remote.c:1705
7aea43ff
JX
1300#, c-format
1301msgid "upstream branch '%s' not stored as a remote-tracking branch"
1302msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1303
94550ed3 1304#: remote.c:1720
7aea43ff
JX
1305#, c-format
1306msgid "push destination '%s' on remote '%s' has no local tracking branch"
1307msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1308
94550ed3 1309#: remote.c:1735
7aea43ff
JX
1310#, c-format
1311msgid "branch '%s' has no remote for pushing"
1312msgstr "分支 '%s' 没有设置要推送的远程服务器"
1313
94550ed3 1314#: remote.c:1746
7aea43ff
JX
1315#, c-format
1316msgid "push refspecs for '%s' do not include '%s'"
160fb2b2 1317msgstr "向 '%s' 推送引用规格未包含 '%s'"
7aea43ff 1318
94550ed3 1319#: remote.c:1759
7aea43ff
JX
1320msgid "push has no destination (push.default is 'nothing')"
1321msgstr "推送无目标(push.default 是 'nothing')"
1322
94550ed3 1323#: remote.c:1781
7aea43ff
JX
1324msgid "cannot resolve 'simple' push to a single destination"
1325msgstr "无法解析 'simple' 推送至一个单独的目标"
1326
94550ed3 1327#: remote.c:2083
90314792
JX
1328#, c-format
1329msgid "Your branch is based on '%s', but the upstream is gone.\n"
1330msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1331
94550ed3 1332#: remote.c:2087
90314792
JX
1333msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1334msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1335
94550ed3 1336#: remote.c:2090
90314792
JX
1337#, c-format
1338msgid "Your branch is up-to-date with '%s'.\n"
1339msgstr "您的分支与上游分支 '%s' 一致。\n"
1340
94550ed3 1341#: remote.c:2094
c04f5ac3
JX
1342#, c-format
1343msgid "Your branch is ahead of '%s' by %d commit.\n"
1344msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1345msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5ae481e0 1346msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
c04f5ac3 1347
94550ed3 1348#: remote.c:2100
07432cef
WS
1349msgid " (use \"git push\" to publish your local commits)\n"
1350msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1351
94550ed3 1352#: remote.c:2103
c04f5ac3
JX
1353#, c-format
1354msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1355msgid_plural ""
1356"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
90e6ef53 1357msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5ae481e0 1358msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 1359
07432cef 1360# 译者:注意保持前导空格
94550ed3 1361#: remote.c:2111
07432cef
WS
1362msgid " (use \"git pull\" to update your local branch)\n"
1363msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1364
94550ed3 1365#: remote.c:2114
c04f5ac3
JX
1366#, c-format
1367msgid ""
1368"Your branch and '%s' have diverged,\n"
1369"and have %d and %d different commit each, respectively.\n"
1370msgid_plural ""
1371"Your branch and '%s' have diverged,\n"
1372"and have %d and %d different commits each, respectively.\n"
1373msgstr[0] ""
1374"您的分支和 '%s' 出现了偏离,\n"
195febda 1375"并且分别有 %d 和 %d 处不同的提交。\n"
5ae481e0
JX
1376msgstr[1] ""
1377"您的分支和 '%s' 出现了偏离,\n"
195febda 1378"并且分别有 %d 和 %d 处不同的提交。\n"
c04f5ac3 1379
07432cef 1380# 译者:注意保持前导空格
94550ed3 1381#: remote.c:2124
07432cef
WS
1382msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1383msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1384
94550ed3 1385#: revision.c:2191
1b7f4a34
JX
1386msgid "your current branch appears to be broken"
1387msgstr "您的当前分支好像被损坏"
1388
94550ed3 1389#: revision.c:2194
1b7f4a34
JX
1390#, c-format
1391msgid "your current branch '%s' does not have any commits yet"
1392msgstr "您的当前分支 '%s' 尚无任何提交"
1393
94550ed3 1394#: revision.c:2388
814ff314
JX
1395msgid "--first-parent is incompatible with --bisect"
1396msgstr "--first-parent 与 --bisect 不兼容"
1397
94550ed3 1398#: run-command.c:90
2e8451e8
JX
1399msgid "open /dev/null failed"
1400msgstr "不能打开 /dev/null"
1401
94550ed3 1402#: run-command.c:92
2e8451e8
JX
1403#, c-format
1404msgid "dup2(%d,%d) failed"
1405msgstr "不能调用 dup2(%d,%d)"
1406
1b7f4a34 1407#: send-pack.c:295
220c313c
JX
1408msgid "failed to sign the push certificate"
1409msgstr "无法为推送证书签名"
1410
1b7f4a34 1411#: send-pack.c:404
220c313c
JX
1412msgid "the receiving end does not support --signed push"
1413msgstr "接收端不支持签名推送"
1414
1b7f4a34
JX
1415#: send-pack.c:406
1416msgid ""
1417"not sending a push certificate since the receiving end does not support --"
1418"signed push"
1419msgstr "未发送推送证书,因为接收端不支持签名推送"
1420
1421#: send-pack.c:418
44f518e6
JX
1422msgid "the receiving end does not support --atomic push"
1423msgstr "接收端不支持原子推送"
814ff314 1424
1b7f4a34 1425#: sequencer.c:183
14c8bced
JX
1426msgid ""
1427"after resolving the conflicts, mark the corrected paths\n"
1428"with 'git add <paths>' or 'git rm <paths>'"
1429msgstr ""
d9d56b23 1430"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
14c8bced
JX
1431"命令标记修正后的文件"
1432
1b7f4a34 1433#: sequencer.c:186
c04f5ac3
JX
1434msgid ""
1435"after resolving the conflicts, mark the corrected paths\n"
1436"with 'git add <paths>' or 'git rm <paths>'\n"
1437"and commit the result with 'git commit'"
1438msgstr ""
d9d56b23 1439"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
c04f5ac3
JX
1440"对修正后的文件做标记,然后用 'git commit' 提交"
1441
1b7f4a34 1442#: sequencer.c:199 sequencer.c:842 sequencer.c:922
c04f5ac3
JX
1443#, c-format
1444msgid "Could not write to %s"
1445msgstr "不能写入 %s"
1446
1b7f4a34 1447#: sequencer.c:202
c04f5ac3
JX
1448#, c-format
1449msgid "Error wrapping up %s"
1450msgstr "错误收尾 %s"
1451
1b7f4a34 1452#: sequencer.c:217
c04f5ac3
JX
1453msgid "Your local changes would be overwritten by cherry-pick."
1454msgstr "您的本地修改将被拣选操作覆盖。"
1455
1b7f4a34 1456#: sequencer.c:219
c04f5ac3
JX
1457msgid "Your local changes would be overwritten by revert."
1458msgstr "您的本地修改将被还原操作覆盖。"
1459
1b7f4a34 1460#: sequencer.c:222
c04f5ac3
JX
1461msgid "Commit your changes or stash them to proceed."
1462msgstr "提交您的修改或保存进度后再继续。"
1463
1464#. TRANSLATORS: %s will be "revert" or "cherry-pick"
1b7f4a34 1465#: sequencer.c:309
c04f5ac3
JX
1466#, c-format
1467msgid "%s: Unable to write new index file"
90e6ef53 1468msgstr "%s:无法写入新索引文件"
c04f5ac3 1469
1b7f4a34 1470#: sequencer.c:327
8ada9598 1471msgid "Could not resolve HEAD commit\n"
81809b99 1472msgstr "不能解析 HEAD 提交\n"
8ada9598 1473
1b7f4a34 1474#: sequencer.c:347
8ada9598 1475msgid "Unable to update cache tree\n"
81809b99 1476msgstr "不能更新缓存\n"
8ada9598 1477
1b7f4a34 1478#: sequencer.c:399
81809b99 1479#, c-format
8ada9598 1480msgid "Could not parse commit %s\n"
81809b99 1481msgstr "不能解析提交 %s\n"
8ada9598 1482
1b7f4a34 1483#: sequencer.c:404
81809b99 1484#, c-format
8ada9598 1485msgid "Could not parse parent commit %s\n"
81809b99 1486msgstr "不能解析父提交 %s\n"
8ada9598 1487
1b7f4a34 1488#: sequencer.c:469
c04f5ac3 1489msgid "Your index file is unmerged."
90e6ef53 1490msgstr "您的索引文件未完成合并。"
c04f5ac3 1491
1b7f4a34 1492#: sequencer.c:488
c04f5ac3
JX
1493#, c-format
1494msgid "Commit %s is a merge but no -m option was given."
1495msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1496
1b7f4a34 1497#: sequencer.c:496
c04f5ac3
JX
1498#, c-format
1499msgid "Commit %s does not have parent %d"
1500msgstr "提交 %s 没有父提交 %d"
1501
1b7f4a34 1502#: sequencer.c:500
c04f5ac3
JX
1503#, c-format
1504msgid "Mainline was specified but commit %s is not a merge."
90e6ef53 1505msgstr "指定了主线但提交 %s 不是一个合并。"
c04f5ac3
JX
1506
1507#. TRANSLATORS: The first %s will be "revert" or
1508#. "cherry-pick", the second %s a SHA1
1b7f4a34 1509#: sequencer.c:513
c04f5ac3
JX
1510#, c-format
1511msgid "%s: cannot parse parent commit %s"
1512msgstr "%s:不能解析父提交 %s"
1513
1b7f4a34 1514#: sequencer.c:517
c04f5ac3
JX
1515#, c-format
1516msgid "Cannot get commit message for %s"
1517msgstr "不能得到 %s 的提交说明"
1518
1b7f4a34 1519#: sequencer.c:603
c04f5ac3
JX
1520#, c-format
1521msgid "could not revert %s... %s"
1522msgstr "不能还原 %s... %s"
1523
1b7f4a34 1524#: sequencer.c:604
c04f5ac3
JX
1525#, c-format
1526msgid "could not apply %s... %s"
1527msgstr "不能应用 %s... %s"
1528
1b7f4a34 1529#: sequencer.c:639
c04f5ac3
JX
1530msgid "empty commit set passed"
1531msgstr "提供了空的提交集"
1532
1b7f4a34 1533#: sequencer.c:647
c04f5ac3
JX
1534#, c-format
1535msgid "git %s: failed to read the index"
90e6ef53 1536msgstr "git %s:无法读取索引"
c04f5ac3 1537
1b7f4a34 1538#: sequencer.c:651
c04f5ac3
JX
1539#, c-format
1540msgid "git %s: failed to refresh the index"
90e6ef53 1541msgstr "git %s:无法刷新索引"
c04f5ac3 1542
1b7f4a34 1543#: sequencer.c:711
c04f5ac3
JX
1544#, c-format
1545msgid "Cannot %s during a %s"
90e6ef53 1546msgstr "无法 %s 在一个 %s 过程中"
c04f5ac3 1547
1b7f4a34 1548#: sequencer.c:733
c04f5ac3
JX
1549#, c-format
1550msgid "Could not parse line %d."
90e6ef53 1551msgstr "不能解析第 %d 行。"
c04f5ac3 1552
1b7f4a34 1553#: sequencer.c:738
c04f5ac3 1554msgid "No commits parsed."
7e238ab7 1555msgstr "没有提交被解析。"
c04f5ac3 1556
1b7f4a34 1557#: sequencer.c:750
c04f5ac3
JX
1558#, c-format
1559msgid "Could not open %s"
1560msgstr "不能打开 %s"
1561
1b7f4a34 1562#: sequencer.c:754
c04f5ac3
JX
1563#, c-format
1564msgid "Could not read %s."
1565msgstr "不能读取 %s。"
1566
1b7f4a34 1567#: sequencer.c:761
c04f5ac3
JX
1568#, c-format
1569msgid "Unusable instruction sheet: %s"
1570msgstr "无用的指令表单:%s"
1571
1b7f4a34 1572#: sequencer.c:791
c04f5ac3
JX
1573#, c-format
1574msgid "Invalid key: %s"
1575msgstr "无效键名:%s"
1576
1b7f4a34 1577#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49
c04f5ac3
JX
1578#, c-format
1579msgid "Invalid value for %s: %s"
81809b99 1580msgstr "%s 的值无效:%s"
c04f5ac3 1581
1b7f4a34 1582#: sequencer.c:804
c04f5ac3
JX
1583#, c-format
1584msgid "Malformed options sheet: %s"
1585msgstr "非法的选项表单:%s"
1586
1b7f4a34 1587#: sequencer.c:823
c04f5ac3
JX
1588msgid "a cherry-pick or revert is already in progress"
1589msgstr "一个拣选或还原操作已在进行"
1590
1b7f4a34 1591#: sequencer.c:824
c04f5ac3
JX
1592msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1593msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1594
1b7f4a34 1595#: sequencer.c:828
c04f5ac3
JX
1596#, c-format
1597msgid "Could not create sequencer directory %s"
90e6ef53 1598msgstr "不能创建序列目录 %s"
c04f5ac3 1599
1b7f4a34 1600#: sequencer.c:844 sequencer.c:926
c04f5ac3
JX
1601#, c-format
1602msgid "Error wrapping up %s."
1603msgstr "错误收尾 %s。"
1604
1b7f4a34 1605#: sequencer.c:863 sequencer.c:996
c04f5ac3 1606msgid "no cherry-pick or revert in progress"
195febda 1607msgstr "拣选或还原操作并未进行"
c04f5ac3 1608
1b7f4a34 1609#: sequencer.c:865
c04f5ac3
JX
1610msgid "cannot resolve HEAD"
1611msgstr "不能解析 HEAD"
1612
1b7f4a34 1613#: sequencer.c:867
c04f5ac3 1614msgid "cannot abort from a branch yet to be born"
90e6ef53 1615msgstr "不能从尚未建立的分支终止"
c04f5ac3 1616
94550ed3 1617#: sequencer.c:887 builtin/apply.c:4287
c04f5ac3
JX
1618#, c-format
1619msgid "cannot open %s: %s"
1620msgstr "不能打开 %s:%s"
1621
1b7f4a34 1622#: sequencer.c:890
c04f5ac3
JX
1623#, c-format
1624msgid "cannot read %s: %s"
1625msgstr "不能读取 %s:%s"
1626
1b7f4a34 1627#: sequencer.c:891
c04f5ac3 1628msgid "unexpected end of file"
9aafc933 1629msgstr "意外的文件结束"
c04f5ac3 1630
1b7f4a34 1631#: sequencer.c:897
c04f5ac3
JX
1632#, c-format
1633msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
90e6ef53 1634msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
c04f5ac3 1635
1b7f4a34 1636#: sequencer.c:919
c04f5ac3
JX
1637#, c-format
1638msgid "Could not format %s."
1639msgstr "不能格式化 %s。"
1640
1b7f4a34 1641#: sequencer.c:1064
4dcdc3d8
JX
1642#, c-format
1643msgid "%s: can't cherry-pick a %s"
1644msgstr "%s:不能拣选一个%s"
1645
1b7f4a34 1646#: sequencer.c:1067
4dcdc3d8
JX
1647#, c-format
1648msgid "%s: bad revision"
1649msgstr "%s:错误的版本"
1650
1b7f4a34 1651#: sequencer.c:1101
c04f5ac3
JX
1652msgid "Can't revert as initial commit"
1653msgstr "不能作为初始提交还原"
1654
1b7f4a34 1655#: sequencer.c:1102
c04f5ac3
JX
1656msgid "Can't cherry-pick into empty head"
1657msgstr "不能拣选到空分支"
1658
94550ed3 1659#: setup.c:248
7aea43ff
JX
1660#, c-format
1661msgid "failed to read %s"
1662msgstr "无法读取 %s"
1663
94550ed3 1664#: sha1_name.c:463
2e8451e8
JX
1665msgid ""
1666"Git normally never creates a ref that ends with 40 hex characters\n"
1667"because it will be ignored when you just specify 40-hex. These refs\n"
1668"may be created by mistake. For example,\n"
1669"\n"
1670" git checkout -b $br $(git rev-parse ...)\n"
1671"\n"
1672"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1673"examine these refs and maybe delete them. Turn this message off by\n"
b1894384 1674"running \"git config advice.objectNameWarning false\""
2e8451e8
JX
1675msgstr ""
1676"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1677"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1678"\n"
1679" git checkout -b $br $(git rev-parse ...)\n"
1680"\n"
1681"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
b1894384 1682"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
2e8451e8
JX
1683"命令关闭本消息通知。"
1684
1b7f4a34 1685#: submodule.c:61 submodule.c:95
90314792
JX
1686msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1687msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1688
1b7f4a34 1689#: submodule.c:65 submodule.c:99
90314792
JX
1690#, c-format
1691msgid "Could not find section in .gitmodules where path=%s"
1692msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1693
1b7f4a34 1694#: submodule.c:73
90314792
JX
1695#, c-format
1696msgid "Could not update .gitmodules entry %s"
1697msgstr "不能更新 .gitmodules 条目 %s"
1698
1b7f4a34 1699#: submodule.c:106
90314792
JX
1700#, c-format
1701msgid "Could not remove .gitmodules entry for %s"
1702msgstr "无法移除 %s 的 .gitmodules 条目"
1703
1b7f4a34 1704#: submodule.c:117
90314792
JX
1705msgid "staging updated .gitmodules failed"
1706msgstr "将更新后 .gitmodules 添加暂存区失败"
1707
94550ed3 1708#: submodule.c:1040
90314792
JX
1709#, c-format
1710msgid "Could not set core.worktree in %s"
1711msgstr "不能在 %s 中设置 core.worktree"
1712
814ff314
JX
1713#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1714#: trailer.c:561
220c313c
JX
1715#, c-format
1716msgid "unknown value '%s' for key '%s'"
1717msgstr "键 '%2$s' 的未知取值 '%1$s'"
1718
94550ed3 1719#: trailer.c:543 trailer.c:548 builtin/remote.c:296
220c313c
JX
1720#, c-format
1721msgid "more than one %s"
1722msgstr "多于一个 %s"
1723
814ff314 1724#: trailer.c:581
220c313c 1725#, c-format
9aeb4c2b
JX
1726msgid "empty trailer token in trailer '%.*s'"
1727msgstr "签名 '%.*s' 的键为空"
220c313c 1728
814ff314 1729#: trailer.c:701
220c313c
JX
1730#, c-format
1731msgid "could not read input file '%s'"
1732msgstr "不能读取输入文件 '%s'"
1733
814ff314 1734#: trailer.c:704
220c313c
JX
1735msgid "could not read from stdin"
1736msgstr "不能自标准输入读取"
1737
1b7f4a34
JX
1738#: transport-helper.c:1025
1739#, c-format
1740msgid "Could not read ref %s"
1741msgstr "不能读取引用 %s"
1742
7aea43ff 1743#: unpack-trees.c:203
6c94aba5
JX
1744msgid "Checking out files"
1745msgstr "正在检出文件"
1746
90314792
JX
1747#: urlmatch.c:120
1748msgid "invalid URL scheme name or missing '://' suffix"
1749msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1750
1751#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1752#, c-format
1753msgid "invalid %XX escape sequence"
1754msgstr "无效的 %XX 转义序列"
1755
1756#: urlmatch.c:172
1757msgid "missing host and scheme is not 'file:'"
4375c10e 1758msgstr "缺失主机名且 URL 方案不是 'file:'"
90314792
JX
1759
1760#: urlmatch.c:189
1761msgid "a 'file:' URL may not have a port number"
1762msgstr "一个 'file:' URL 不应该包含端口号"
1763
1764#: urlmatch.c:199
1765msgid "invalid characters in host name"
1766msgstr "主机名中包含无效的字符"
1767
1768#: urlmatch.c:244 urlmatch.c:255
1769msgid "invalid port number"
1770msgstr "无效的端口号"
1771
1772#: urlmatch.c:322
1773msgid "invalid '..' path segment"
1774msgstr "无效的 '..' 路径片段"
1775
1b7f4a34
JX
1776#: wrapper.c:219 wrapper.c:362
1777#, c-format
1778msgid "could not open '%s' for reading and writing"
1779msgstr "无法打开 '%s' 进行读写"
1780
1781#: wrapper.c:221 wrapper.c:364
1782#, c-format
1783msgid "could not open '%s' for writing"
1784msgstr "无法打开 '%s' 进行写入"
1785
94550ed3
JX
1786#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
1787#: builtin/merge.c:1074 builtin/pull.c:380
1b7f4a34
JX
1788#, c-format
1789msgid "could not open '%s' for reading"
1790msgstr "无法打开 '%s' 进行读取"
1791
1792#: wrapper.c:579
07432cef 1793#, c-format
ef317cd5 1794msgid "unable to access '%s': %s"
07432cef
WS
1795msgstr "不能访问 '%s':%s"
1796
1b7f4a34 1797#: wrapper.c:600
07432cef
WS
1798#, c-format
1799msgid "unable to access '%s'"
1800msgstr "不能访问 '%s'"
ef317cd5 1801
1b7f4a34 1802#: wrapper.c:611
d691f479
JX
1803#, c-format
1804msgid "unable to look up current user in the passwd file: %s"
07432cef 1805msgstr "无法在口令文件中查询到当前用户:%s"
d691f479 1806
1b7f4a34 1807#: wrapper.c:612
d691f479
JX
1808msgid "no such user"
1809msgstr "无此用户"
1810
1b7f4a34 1811#: wrapper.c:620
220c313c
JX
1812msgid "unable to get current working directory"
1813msgstr "不能获取当前工作目录"
1814
94550ed3 1815#: wrapper.c:647
7aea43ff
JX
1816#, c-format
1817msgid "could not open %s for writing"
1818msgstr "不能写入 %s"
1819
94550ed3 1820#: wrapper.c:658 builtin/am.c:425
7aea43ff
JX
1821#, c-format
1822msgid "could not write to %s"
1823msgstr "不能写入 %s"
1824
94550ed3 1825#: wrapper.c:664
7aea43ff
JX
1826#, c-format
1827msgid "could not close %s"
1828msgstr "不能关闭 %s"
1829
1b7f4a34 1830#: wt-status.c:149
c04f5ac3
JX
1831msgid "Unmerged paths:"
1832msgstr "未合并的路径:"
1833
90e6ef53 1834# 译者:注意保持前导空格
1b7f4a34 1835#: wt-status.c:176 wt-status.c:203
c04f5ac3
JX
1836#, c-format
1837msgid " (use \"git reset %s <file>...\" to unstage)"
160fb2b2 1838msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
c04f5ac3 1839
90e6ef53 1840# 译者:注意保持前导空格
1b7f4a34 1841#: wt-status.c:178 wt-status.c:205
c04f5ac3 1842msgid " (use \"git rm --cached <file>...\" to unstage)"
160fb2b2 1843msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
c04f5ac3 1844
90e6ef53 1845# 译者:注意保持前导空格
1b7f4a34 1846#: wt-status.c:182
6792b93b 1847msgid " (use \"git add <file>...\" to mark resolution)"
d9d56b23 1848msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
6792b93b
JX
1849
1850# 译者:注意保持前导空格
1b7f4a34 1851#: wt-status.c:184 wt-status.c:188
c04f5ac3 1852msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
d9d56b23 1853msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
c04f5ac3 1854
6792b93b 1855# 译者:注意保持前导空格
1b7f4a34 1856#: wt-status.c:186
6792b93b 1857msgid " (use \"git rm <file>...\" to mark resolution)"
d9d56b23 1858msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
6792b93b 1859
1b7f4a34 1860#: wt-status.c:197 wt-status.c:880
c04f5ac3
JX
1861msgid "Changes to be committed:"
1862msgstr "要提交的变更:"
1863
1b7f4a34 1864#: wt-status.c:215 wt-status.c:889
c04f5ac3 1865msgid "Changes not staged for commit:"
7e238ab7 1866msgstr "尚未暂存以备提交的变更:"
c04f5ac3 1867
90e6ef53 1868# 译者:注意保持前导空格
1b7f4a34 1869#: wt-status.c:219
c04f5ac3 1870msgid " (use \"git add <file>...\" to update what will be committed)"
d9d56b23 1871msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
c04f5ac3 1872
90e6ef53 1873# 译者:注意保持前导空格
1b7f4a34 1874#: wt-status.c:221
c04f5ac3 1875msgid " (use \"git add/rm <file>...\" to update what will be committed)"
d9d56b23 1876msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
c04f5ac3 1877
90e6ef53 1878# 译者:注意保持前导空格
1b7f4a34 1879#: wt-status.c:222
c04f5ac3
JX
1880msgid ""
1881" (use \"git checkout -- <file>...\" to discard changes in working directory)"
d9d56b23 1882msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
c04f5ac3 1883
90e6ef53 1884# 译者:注意保持前导空格
1b7f4a34 1885#: wt-status.c:224
c04f5ac3
JX
1886msgid " (commit or discard the untracked or modified content in submodules)"
1887msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1888
90e6ef53 1889# 译者:注意保持前导空格
1b7f4a34 1890#: wt-status.c:236
c04f5ac3
JX
1891#, c-format
1892msgid " (use \"git %s <file>...\" to include in what will be committed)"
d9d56b23 1893msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
c04f5ac3 1894
1b7f4a34 1895#: wt-status.c:251
c04f5ac3
JX
1896msgid "both deleted:"
1897msgstr "双方删除:"
1898
1b7f4a34 1899#: wt-status.c:253
c04f5ac3
JX
1900msgid "added by us:"
1901msgstr "由我们添加:"
1902
1b7f4a34 1903#: wt-status.c:255
c04f5ac3
JX
1904msgid "deleted by them:"
1905msgstr "由他们删除:"
1906
1b7f4a34 1907#: wt-status.c:257
c04f5ac3
JX
1908msgid "added by them:"
1909msgstr "由他们添加:"
1910
1b7f4a34 1911#: wt-status.c:259
c04f5ac3
JX
1912msgid "deleted by us:"
1913msgstr "由我们删除:"
1914
1b7f4a34 1915#: wt-status.c:261
c04f5ac3
JX
1916msgid "both added:"
1917msgstr "双方添加:"
1918
1b7f4a34 1919#: wt-status.c:263
c04f5ac3
JX
1920msgid "both modified:"
1921msgstr "双方修改:"
1922
1b7f4a34 1923#: wt-status.c:265
6c94aba5
JX
1924#, c-format
1925msgid "bug: unhandled unmerged status %x"
1926msgstr "bug:无法处理的未合并状态 %x"
cfff71a9 1927
1b7f4a34 1928#: wt-status.c:273
6c94aba5
JX
1929msgid "new file:"
1930msgstr "新文件:"
cfff71a9 1931
1b7f4a34 1932#: wt-status.c:275
6c94aba5
JX
1933msgid "copied:"
1934msgstr "拷贝:"
cfff71a9 1935
1b7f4a34 1936#: wt-status.c:277
6c94aba5
JX
1937msgid "deleted:"
1938msgstr "删除:"
cfff71a9 1939
1b7f4a34 1940#: wt-status.c:279
6c94aba5
JX
1941msgid "modified:"
1942msgstr "修改:"
1943
1b7f4a34 1944#: wt-status.c:281
6c94aba5
JX
1945msgid "renamed:"
1946msgstr "重命名:"
1947
1b7f4a34 1948#: wt-status.c:283
6c94aba5
JX
1949msgid "typechange:"
1950msgstr "类型变更:"
1951
1b7f4a34 1952#: wt-status.c:285
6c94aba5
JX
1953msgid "unknown:"
1954msgstr "未知:"
cfff71a9 1955
1b7f4a34 1956#: wt-status.c:287
6c94aba5
JX
1957msgid "unmerged:"
1958msgstr "未合并:"
cfff71a9 1959
90e6ef53 1960# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1b7f4a34 1961#: wt-status.c:369
c04f5ac3 1962msgid "new commits, "
aa9565f7 1963msgstr "新提交, "
c04f5ac3 1964
90e6ef53 1965# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1b7f4a34 1966#: wt-status.c:371
c04f5ac3 1967msgid "modified content, "
aa9565f7 1968msgstr "修改的内容, "
c04f5ac3 1969
90e6ef53 1970# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1b7f4a34 1971#: wt-status.c:373
c04f5ac3 1972msgid "untracked content, "
aa9565f7 1973msgstr "未跟踪的内容, "
c04f5ac3 1974
1b7f4a34 1975#: wt-status.c:390
c04f5ac3
JX
1976#, c-format
1977msgid "bug: unhandled diff status %c"
6c94aba5 1978msgstr "bug:无法处理的差异状态 %c"
c04f5ac3 1979
1b7f4a34 1980#: wt-status.c:754
90314792
JX
1981msgid "Submodules changed but not updated:"
1982msgstr "子模组已修改但尚未更新:"
1983
1b7f4a34 1984#: wt-status.c:756
90314792
JX
1985msgid "Submodule changes to be committed:"
1986msgstr "要提交的子模组变更:"
1987
1b7f4a34 1988#: wt-status.c:837
cfff71a9
JX
1989msgid ""
1990"Do not touch the line above.\n"
1991"Everything below will be removed."
1992msgstr ""
1993"不要改动上面的一行。\n"
1994"下面的所有内容均将被删除。"
1995
1b7f4a34 1996#: wt-status.c:948
6792b93b 1997msgid "You have unmerged paths."
195febda 1998msgstr "您有尚未合并的路径。"
6792b93b
JX
1999
2000# 译者:注意保持前导空格
1b7f4a34 2001#: wt-status.c:951
6792b93b
JX
2002msgid " (fix conflicts and run \"git commit\")"
2003msgstr " (解决冲突并运行 \"git commit\")"
2004
1b7f4a34 2005#: wt-status.c:954
6792b93b
JX
2006msgid "All conflicts fixed but you are still merging."
2007msgstr "所有冲突已解决但您仍处于合并中。"
2008
2009# 译者:注意保持前导空格
1b7f4a34 2010#: wt-status.c:957
6792b93b
JX
2011msgid " (use \"git commit\" to conclude merge)"
2012msgstr " (使用 \"git commit\" 结束合并)"
2013
1b7f4a34 2014#: wt-status.c:967
6792b93b 2015msgid "You are in the middle of an am session."
98b2761d 2016msgstr "您正处于 am 操作过程中。"
6792b93b 2017
1b7f4a34 2018#: wt-status.c:970
6792b93b
JX
2019msgid "The current patch is empty."
2020msgstr "当前的补丁为空。"
2021
2022# 译者:注意保持前导空格
1b7f4a34 2023#: wt-status.c:974
2e8451e8
JX
2024msgid " (fix conflicts and then run \"git am --continue\")"
2025msgstr " (解决冲突,然后运行 \"git am --continue\")"
6792b93b
JX
2026
2027# 译者:注意保持前导空格
1b7f4a34 2028#: wt-status.c:976
6792b93b
JX
2029msgid " (use \"git am --skip\" to skip this patch)"
2030msgstr " (使用 \"git am --skip\" 跳过此补丁)"
2031
2032# 译者:注意保持前导空格
1b7f4a34 2033#: wt-status.c:978
6792b93b
JX
2034msgid " (use \"git am --abort\" to restore the original branch)"
2035msgstr " (使用 \"git am --abort\" 恢复原有分支)"
2036
1b7f4a34
JX
2037#: wt-status.c:1105
2038msgid "No commands done."
2039msgstr "没有命令被执行。"
2040
2041#: wt-status.c:1108
2042#, c-format
2043msgid "Last command done (%d command done):"
2044msgid_plural "Last commands done (%d commands done):"
2045msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
2046msgstr[1] "最后的命令已完成(%d 条命令被执行):"
2047
2048#: wt-status.c:1119
2049#, c-format
2050msgid " (see more in file %s)"
2051msgstr " (更多参见文件 %s)"
2052
2053#: wt-status.c:1124
2054msgid "No commands remaining."
2055msgstr "未剩下任何命令。"
2056
2057#: wt-status.c:1127
2058#, c-format
2059msgid "Next command to do (%d remaining command):"
2060msgid_plural "Next commands to do (%d remaining commands):"
2061msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
2062msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
2063
2064# 译者:注意保持前导空格
2065#: wt-status.c:1135
2066msgid " (use \"git rebase --edit-todo\" to view and edit)"
2067msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
2068
2069#: wt-status.c:1148
63af42fe
JX
2070#, c-format
2071msgid "You are currently rebasing branch '%s' on '%s'."
98b2761d 2072msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
63af42fe 2073
1b7f4a34 2074#: wt-status.c:1153
6792b93b 2075msgid "You are currently rebasing."
98b2761d 2076msgstr "您在执行变基操作。"
6792b93b
JX
2077
2078# 译者:注意保持前导空格
1b7f4a34 2079#: wt-status.c:1167
6792b93b
JX
2080msgid " (fix conflicts and then run \"git rebase --continue\")"
2081msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
2082
2083# 译者:注意保持前导空格
1b7f4a34 2084#: wt-status.c:1169
6792b93b
JX
2085msgid " (use \"git rebase --skip\" to skip this patch)"
2086msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
2087
2088# 译者:注意保持前导空格
1b7f4a34 2089#: wt-status.c:1171
6792b93b
JX
2090msgid " (use \"git rebase --abort\" to check out the original branch)"
2091msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
2092
2093# 译者:注意保持前导空格
1b7f4a34 2094#: wt-status.c:1177
6792b93b
JX
2095msgid " (all conflicts fixed: run \"git rebase --continue\")"
2096msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
2097
1b7f4a34 2098#: wt-status.c:1181
63af42fe
JX
2099#, c-format
2100msgid ""
2101"You are currently splitting a commit while rebasing branch '%s' on '%s'."
98b2761d 2102msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
63af42fe 2103
1b7f4a34 2104#: wt-status.c:1186
6792b93b 2105msgid "You are currently splitting a commit during a rebase."
98b2761d 2106msgstr "您在执行变基操作时拆分提交。"
6792b93b
JX
2107
2108# 译者:注意保持前导空格
1b7f4a34 2109#: wt-status.c:1189
6792b93b
JX
2110msgid " (Once your working directory is clean, run \"git rebase --continue\")"
2111msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
2112
1b7f4a34 2113#: wt-status.c:1193
63af42fe
JX
2114#, c-format
2115msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
98b2761d 2116msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
63af42fe 2117
1b7f4a34 2118#: wt-status.c:1198
6792b93b 2119msgid "You are currently editing a commit during a rebase."
98b2761d 2120msgstr "您在执行变基操作时编辑提交。"
6792b93b
JX
2121
2122# 译者:注意保持前导空格
1b7f4a34 2123#: wt-status.c:1201
6792b93b
JX
2124msgid " (use \"git commit --amend\" to amend the current commit)"
2125msgstr " (使用 \"git commit --amend\" 修补当前提交)"
2126
2127# 译者:注意保持前导空格
1b7f4a34 2128#: wt-status.c:1203
6792b93b
JX
2129msgid ""
2130" (use \"git rebase --continue\" once you are satisfied with your changes)"
195febda 2131msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
6792b93b 2132
1b7f4a34 2133#: wt-status.c:1213
90314792
JX
2134#, c-format
2135msgid "You are currently cherry-picking commit %s."
98b2761d 2136msgstr "您在执行拣选提交 %s 的操作。"
6792b93b 2137
2e8451e8 2138# 译者:注意保持前导空格
1b7f4a34 2139#: wt-status.c:1218
2e8451e8
JX
2140msgid " (fix conflicts and run \"git cherry-pick --continue\")"
2141msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
2142
6792b93b 2143# 译者:注意保持前导空格
1b7f4a34 2144#: wt-status.c:1221
2e8451e8
JX
2145msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
2146msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
6792b93b 2147
2e8451e8 2148# 译者:注意保持前导空格
1b7f4a34 2149#: wt-status.c:1223
2e8451e8
JX
2150msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2151msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
2152
1b7f4a34 2153#: wt-status.c:1232
1003b3a5
JX
2154#, c-format
2155msgid "You are currently reverting commit %s."
98b2761d 2156msgstr "您在执行反转提交 %s 的操作。"
1003b3a5
JX
2157
2158# 译者:注意保持前导空格
1b7f4a34 2159#: wt-status.c:1237
1003b3a5
JX
2160msgid " (fix conflicts and run \"git revert --continue\")"
2161msgstr " (解决冲突并运行 \"git revert --continue\")"
2162
2163# 译者:注意保持前导空格
1b7f4a34 2164#: wt-status.c:1240
1003b3a5
JX
2165msgid " (all conflicts fixed: run \"git revert --continue\")"
2166msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
2167
2168# 译者:注意保持前导空格
1b7f4a34 2169#: wt-status.c:1242
1003b3a5
JX
2170msgid " (use \"git revert --abort\" to cancel the revert operation)"
2171msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
2172
1b7f4a34 2173#: wt-status.c:1253
63af42fe 2174#, c-format
1003b3a5 2175msgid "You are currently bisecting, started from branch '%s'."
98b2761d 2176msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
63af42fe 2177
1b7f4a34 2178#: wt-status.c:1257
6792b93b 2179msgid "You are currently bisecting."
98b2761d 2180msgstr "您在执行二分查找操作。"
6792b93b
JX
2181
2182# 译者:注意保持前导空格
1b7f4a34 2183#: wt-status.c:1260
6792b93b
JX
2184msgid " (use \"git bisect reset\" to get back to the original branch)"
2185msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
2186
94550ed3 2187#: wt-status.c:1438
c04f5ac3
JX
2188msgid "On branch "
2189msgstr "位于分支 "
2190
94550ed3 2191#: wt-status.c:1444
1b7f4a34
JX
2192msgid "interactive rebase in progress; onto "
2193msgstr "交互式变基操作正在进行中;至 "
2194
94550ed3 2195#: wt-status.c:1446
2e8451e8 2196msgid "rebase in progress; onto "
98b2761d 2197msgstr "变基操作正在进行中;至 "
2e8451e8 2198
94550ed3 2199#: wt-status.c:1451
1003b3a5
JX
2200msgid "HEAD detached at "
2201msgstr "头指针分离于 "
2202
94550ed3 2203#: wt-status.c:1453
1003b3a5
JX
2204msgid "HEAD detached from "
2205msgstr "头指针分离自 "
2206
94550ed3 2207#: wt-status.c:1456
c04f5ac3
JX
2208msgid "Not currently on any branch."
2209msgstr "当前不在任何分支上。"
2210
1b7f4a34 2211#: wt-status.c:1474
c04f5ac3
JX
2212msgid "Initial commit"
2213msgstr "初始提交"
2214
1b7f4a34 2215#: wt-status.c:1488
ef317cd5 2216msgid "Untracked files"
07432cef 2217msgstr "未跟踪的文件"
c04f5ac3 2218
1b7f4a34 2219#: wt-status.c:1490
ef317cd5 2220msgid "Ignored files"
07432cef 2221msgstr "忽略的文件"
c04f5ac3 2222
1b7f4a34 2223#: wt-status.c:1494
1003b3a5 2224#, c-format
4dcdc3d8
JX
2225msgid ""
2226"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2227"may speed it up, but you have to be careful not to forget to add\n"
2228"new files yourself (see 'git help status')."
2229msgstr ""
2230"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
2231"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1003b3a5 2232
1b7f4a34 2233#: wt-status.c:1500
c04f5ac3
JX
2234#, c-format
2235msgid "Untracked files not listed%s"
2236msgstr "未跟踪的文件没有列出%s"
2237
7e238ab7 2238# 译者:中文字符串拼接,可删除前导空格
1b7f4a34 2239#: wt-status.c:1502
c04f5ac3 2240msgid " (use -u option to show untracked files)"
7e238ab7 2241msgstr "(使用 -u 参数显示未跟踪的文件)"
c04f5ac3 2242
1b7f4a34 2243#: wt-status.c:1508
c04f5ac3
JX
2244msgid "No changes"
2245msgstr "没有修改"
2246
1b7f4a34 2247#: wt-status.c:1513
07432cef 2248#, c-format
ef317cd5 2249msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
07432cef 2250msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
c04f5ac3 2251
1b7f4a34 2252#: wt-status.c:1516
07432cef 2253#, c-format
ef317cd5 2254msgid "no changes added to commit\n"
07432cef 2255msgstr "修改尚未加入提交\n"
c04f5ac3 2256
1b7f4a34 2257#: wt-status.c:1519
07432cef 2258#, c-format
ef317cd5
JX
2259msgid ""
2260"nothing added to commit but untracked files present (use \"git add\" to "
2261"track)\n"
07432cef 2262msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
c04f5ac3 2263
1b7f4a34 2264#: wt-status.c:1522
07432cef 2265#, c-format
ef317cd5 2266msgid "nothing added to commit but untracked files present\n"
07432cef 2267msgstr "提交为空,但是存在尚未跟踪的文件\n"
c04f5ac3 2268
7e238ab7 2269# 译者:中文字符串拼接,可删除前导空格
1b7f4a34 2270#: wt-status.c:1525
07432cef 2271#, c-format
ef317cd5 2272msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
07432cef 2273msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
c04f5ac3 2274
1b7f4a34 2275#: wt-status.c:1528 wt-status.c:1533
07432cef 2276#, c-format
ef317cd5 2277msgid "nothing to commit\n"
07432cef 2278msgstr "无文件要提交\n"
ef317cd5 2279
7e238ab7 2280# 译者:中文字符串拼接,可删除前导空格
1b7f4a34 2281#: wt-status.c:1531
07432cef 2282#, c-format
ef317cd5 2283msgid "nothing to commit (use -u to show untracked files)\n"
07432cef 2284msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
c04f5ac3 2285
7e238ab7 2286# 译者:中文字符串拼接,可删除前导空格
1b7f4a34 2287#: wt-status.c:1535
07432cef 2288#, c-format
ef317cd5 2289msgid "nothing to commit, working directory clean\n"
07432cef 2290msgstr "无文件要提交,干净的工作区\n"
c04f5ac3 2291
90e6ef53 2292# 译者:注意保持句尾空格
94550ed3 2293#: wt-status.c:1642
c04f5ac3
JX
2294msgid "Initial commit on "
2295msgstr "初始提交于 "
2296
94550ed3
JX
2297#: wt-status.c:1646
2298msgid "HEAD (no branch)"
2299msgstr "HEAD(非分支)"
2300
2301#: wt-status.c:1675
90314792
JX
2302msgid "gone"
2303msgstr "丢失"
2304
90e6ef53 2305# 译者:注意保持句尾空格
94550ed3 2306#: wt-status.c:1677 wt-status.c:1685
c04f5ac3
JX
2307msgid "behind "
2308msgstr "落后 "
2309
94550ed3 2310#: compat/precompose_utf8.c:56 builtin/clone.c:408
a77c07d9
JX
2311#, c-format
2312msgid "failed to unlink '%s'"
2313msgstr "无法删除 '%s'"
2314
220c313c 2315#: builtin/add.c:22
814ff314 2316msgid "git add [<options>] [--] <pathspec>..."
160fb2b2 2317msgstr "git add [<选项>] [--] <路径规格>..."
ef317cd5 2318
220c313c 2319#: builtin/add.c:65
c04f5ac3
JX
2320#, c-format
2321msgid "unexpected diff status %c"
2322msgstr "意外的差异状态 %c"
2323
94550ed3 2324#: builtin/add.c:70 builtin/commit.c:278
c04f5ac3
JX
2325msgid "updating files failed"
2326msgstr "更新文件失败"
2327
220c313c 2328#: builtin/add.c:80
c04f5ac3
JX
2329#, c-format
2330msgid "remove '%s'\n"
2331msgstr "删除 '%s'\n"
2332
220c313c 2333#: builtin/add.c:134
c04f5ac3 2334msgid "Unstaged changes after refreshing the index:"
90e6ef53 2335msgstr "刷新索引之后尚未被暂存的变更:"
c04f5ac3 2336
94550ed3 2337#: builtin/add.c:194 builtin/rev-parse.c:796
c04f5ac3 2338msgid "Could not read the index"
90e6ef53 2339msgstr "不能读取索引"
c04f5ac3 2340
220c313c 2341#: builtin/add.c:205
c04f5ac3
JX
2342#, c-format
2343msgid "Could not open '%s' for writing."
1b7f4a34 2344msgstr "无法打开 '%s' 进行写入。"
c04f5ac3 2345
220c313c 2346#: builtin/add.c:209
c04f5ac3 2347msgid "Could not write patch"
195febda 2348msgstr "不能生成补丁"
c04f5ac3 2349
7aea43ff
JX
2350#: builtin/add.c:212
2351msgid "editing patch failed"
2352msgstr "编辑补丁失败"
2353
2354#: builtin/add.c:215
c04f5ac3
JX
2355#, c-format
2356msgid "Could not stat '%s'"
90e6ef53 2357msgstr "不能查看文件状态 '%s'"
c04f5ac3 2358
7aea43ff 2359#: builtin/add.c:217
c04f5ac3
JX
2360msgid "Empty patch. Aborted."
2361msgstr "空补丁。异常终止。"
2362
7aea43ff 2363#: builtin/add.c:222
8ada9598
JX
2364#, c-format
2365msgid "Could not apply '%s'"
2366msgstr "不能应用 '%s'"
2367
7aea43ff 2368#: builtin/add.c:232
8ada9598 2369msgid "The following paths are ignored by one of your .gitignore files:\n"
195febda 2370msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 2371
94550ed3 2372#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
1b7f4a34 2373#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
94550ed3 2374#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
ef317cd5 2375msgid "dry run"
07432cef 2376msgstr "演习"
ef317cd5 2377
94550ed3
JX
2378#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
2379#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
2380#: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114
ef317cd5
JX
2381msgid "be verbose"
2382msgstr "冗长输出"
2383
7aea43ff 2384#: builtin/add.c:252
ef317cd5 2385msgid "interactive picking"
07432cef 2386msgstr "交互式拣选"
ef317cd5 2387
94550ed3 2388#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
ef317cd5 2389msgid "select hunks interactively"
07432cef 2390msgstr "交互式挑选数据块"
ef317cd5 2391
7aea43ff 2392#: builtin/add.c:254
ef317cd5 2393msgid "edit current diff and apply"
07432cef 2394msgstr "编辑当前差异并应用"
ef317cd5 2395
7aea43ff 2396#: builtin/add.c:255
ef317cd5 2397msgid "allow adding otherwise ignored files"
07432cef 2398msgstr "允许添加忽略的文件"
ef317cd5 2399
7aea43ff 2400#: builtin/add.c:256
ef317cd5 2401msgid "update tracked files"
07432cef 2402msgstr "更新已跟踪的文件"
ef317cd5 2403
7aea43ff 2404#: builtin/add.c:257
ef317cd5 2405msgid "record only the fact that the path will be added later"
07432cef 2406msgstr "只记录,该路径稍后再添加"
ef317cd5 2407
7aea43ff 2408#: builtin/add.c:258
ef317cd5 2409msgid "add changes from all tracked and untracked files"
07432cef 2410msgstr "添加所有改变的已跟踪文件和未跟踪文件"
ef317cd5 2411
7aea43ff 2412#: builtin/add.c:261
4dcdc3d8
JX
2413msgid "ignore paths removed in the working tree (same as --no-all)"
2414msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2415
7aea43ff 2416#: builtin/add.c:263
ef317cd5 2417msgid "don't add, only refresh the index"
07432cef 2418msgstr "不添加,只刷新索引"
ef317cd5 2419
7aea43ff 2420#: builtin/add.c:264
ef317cd5 2421msgid "just skip files which cannot be added because of errors"
07432cef 2422msgstr "跳过因出错不能添加的文件"
ef317cd5 2423
7aea43ff 2424#: builtin/add.c:265
ef317cd5 2425msgid "check if - even missing - files are ignored in dry run"
07432cef 2426msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
ef317cd5 2427
7aea43ff 2428#: builtin/add.c:287
8ada9598
JX
2429#, c-format
2430msgid "Use -f if you really want to add them.\n"
2431msgstr "使用 -f 参数如果您确实要添加它们。\n"
2432
7aea43ff 2433#: builtin/add.c:294
8ada9598
JX
2434msgid "adding files failed"
2435msgstr "添加文件失败"
2436
7aea43ff 2437#: builtin/add.c:330
8ada9598
JX
2438msgid "-A and -u are mutually incompatible"
2439msgstr "-A 和 -u 选项互斥"
2440
7aea43ff 2441#: builtin/add.c:337
8ada9598 2442msgid "Option --ignore-missing can only be used together with --dry-run"
649900bc 2443msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 2444
94550ed3 2445#: builtin/add.c:352
8ada9598
JX
2446#, c-format
2447msgid "Nothing specified, nothing added.\n"
2448msgstr "没有指定文件,也没有文件被添加。\n"
2449
94550ed3 2450#: builtin/add.c:353
8ada9598
JX
2451#, c-format
2452msgid "Maybe you wanted to say 'git add .'?\n"
2453msgstr "也许您想要执行 'git add .'?\n"
2454
94550ed3
JX
2455#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
2456#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
2457#: builtin/submodule--helper.c:40
8ada9598
JX
2458msgid "index file corrupt"
2459msgstr "索引文件损坏"
2460
94550ed3 2461#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
8ada9598
JX
2462msgid "Unable to write new index file"
2463msgstr "无法写入新索引文件"
2464
94550ed3 2465#: builtin/am.c:42
1b7f4a34
JX
2466#, c-format
2467msgid "could not stat %s"
2468msgstr "不能获取 %s 的文件状态"
2469
94550ed3 2470#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
1b7f4a34
JX
2471#, c-format
2472msgid "could not read '%s'"
2473msgstr "不能读取 '%s'"
2474
94550ed3 2475#: builtin/am.c:445
1b7f4a34
JX
2476msgid "could not parse author script"
2477msgstr "不能解析作者脚本"
2478
94550ed3 2479#: builtin/am.c:522
1b7f4a34
JX
2480#, c-format
2481msgid "'%s' was deleted by the applypatch-msg hook"
2482msgstr "'%s' 被 applypatch-msg 钩子删除"
2483
94550ed3 2484#: builtin/am.c:563 builtin/notes.c:300
1b7f4a34
JX
2485#, c-format
2486msgid "Malformed input line: '%s'."
2487msgstr "非法的输入行:'%s'。"
2488
94550ed3 2489#: builtin/am.c:600 builtin/notes.c:315
1b7f4a34
JX
2490#, c-format
2491msgid "Failed to copy notes from '%s' to '%s'"
2492msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
2493
94550ed3 2494#: builtin/am.c:626
1b7f4a34
JX
2495msgid "fseek failed"
2496msgstr "fseek 失败"
2497
94550ed3 2498#: builtin/am.c:787 builtin/am.c:875
1b7f4a34
JX
2499#, c-format
2500msgid "could not open '%s' for reading: %s"
2501msgstr "无法打开 '%s' 进行读取:%s"
2502
94550ed3 2503#: builtin/am.c:794
1b7f4a34
JX
2504#, c-format
2505msgid "could not open '%s' for writing: %s"
2506msgstr "无法打开 '%s' 进行写入:%s"
2507
94550ed3 2508#: builtin/am.c:803
1b7f4a34
JX
2509#, c-format
2510msgid "could not parse patch '%s'"
2511msgstr "无法解析补丁 '%s'"
2512
94550ed3 2513#: builtin/am.c:868
1b7f4a34
JX
2514msgid "Only one StGIT patch series can be applied at once"
2515msgstr "一次只能有一个 StGIT 补丁队列被应用"
2516
94550ed3 2517#: builtin/am.c:916
1b7f4a34
JX
2518msgid "invalid timestamp"
2519msgstr "无效的时间戳"
2520
94550ed3 2521#: builtin/am.c:919 builtin/am.c:927
1b7f4a34
JX
2522msgid "invalid Date line"
2523msgstr "无效的日期行"
2524
94550ed3 2525#: builtin/am.c:924
1b7f4a34
JX
2526msgid "invalid timezone offset"
2527msgstr "无效的时区偏移值"
2528
94550ed3 2529#: builtin/am.c:1011
1b7f4a34
JX
2530msgid "Patch format detection failed."
2531msgstr "补丁格式检测失败。"
2532
94550ed3 2533#: builtin/am.c:1016 builtin/clone.c:373
1b7f4a34
JX
2534#, c-format
2535msgid "failed to create directory '%s'"
2536msgstr "无法创建目录 '%s'"
2537
94550ed3 2538#: builtin/am.c:1020
1b7f4a34
JX
2539msgid "Failed to split patches."
2540msgstr "无法拆分补丁。"
2541
94550ed3 2542#: builtin/am.c:1152 builtin/commit.c:363
1b7f4a34
JX
2543msgid "unable to write index file"
2544msgstr "无法写入索引文件"
2545
94550ed3 2546#: builtin/am.c:1203
1b7f4a34
JX
2547#, c-format
2548msgid "When you have resolved this problem, run \"%s --continue\"."
2549msgstr "当您解决这一问题,执行 \"%s --continue\"。"
2550
94550ed3 2551#: builtin/am.c:1204
1b7f4a34
JX
2552#, c-format
2553msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2554msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
2555
94550ed3 2556#: builtin/am.c:1205
1b7f4a34
JX
2557#, c-format
2558msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2559msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
2560
94550ed3 2561#: builtin/am.c:1343
1b7f4a34
JX
2562msgid "Patch is empty. Was it split wrong?"
2563msgstr "补丁为空。是不是切分错误?"
2564
94550ed3 2565#: builtin/am.c:1417 builtin/log.c:1344
1b7f4a34
JX
2566#, c-format
2567msgid "invalid ident line: %s"
2568msgstr "包含无效的身份标识:%s"
2569
94550ed3 2570#: builtin/am.c:1444
1b7f4a34
JX
2571#, c-format
2572msgid "unable to parse commit %s"
2573msgstr "不能解析提交 %s"
2574
94550ed3 2575#: builtin/am.c:1646
1b7f4a34
JX
2576msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2577msgstr "仓库缺乏必要的数据对象以进行三方合并。"
2578
94550ed3 2579#: builtin/am.c:1648
1b7f4a34
JX
2580msgid "Using index info to reconstruct a base tree..."
2581msgstr "使用索引来重建一个(三方合并的)基础目录树..."
2582
94550ed3 2583#: builtin/am.c:1667
1b7f4a34
JX
2584msgid ""
2585"Did you hand edit your patch?\n"
2586"It does not apply to blobs recorded in its index."
2587msgstr ""
2588"您是否曾手动编辑过您的补丁?\n"
2589"无法应用补丁到索引中的数据对象上。"
2590
94550ed3 2591#: builtin/am.c:1673
1b7f4a34
JX
2592msgid "Falling back to patching base and 3-way merge..."
2593msgstr "回落到基础版本上打补丁及进行三方合并..."
2594
94550ed3 2595#: builtin/am.c:1688
1b7f4a34
JX
2596msgid "Failed to merge in the changes."
2597msgstr "无法合并变更。"
2598
94550ed3 2599#: builtin/am.c:1712 builtin/merge.c:632
1b7f4a34
JX
2600msgid "git write-tree failed to write a tree"
2601msgstr "git write-tree 无法写入一树对象"
2602
94550ed3 2603#: builtin/am.c:1719
1b7f4a34
JX
2604msgid "applying to an empty history"
2605msgstr "正应用到一个空历史上"
2606
94550ed3 2607#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
1b7f4a34
JX
2608#: builtin/merge.c:854
2609msgid "failed to write commit object"
2610msgstr "无法写提交对象"
2611
94550ed3 2612#: builtin/am.c:1764 builtin/am.c:1768
1b7f4a34
JX
2613#, c-format
2614msgid "cannot resume: %s does not exist."
2615msgstr "无法继续:%s 不存在。"
2616
94550ed3 2617#: builtin/am.c:1784
1b7f4a34
JX
2618msgid "cannot be interactive without stdin connected to a terminal."
2619msgstr "标准输入没有和终端关联,不能进行交互式操作。"
2620
94550ed3 2621#: builtin/am.c:1789
1b7f4a34
JX
2622msgid "Commit Body is:"
2623msgstr "提交内容为:"
2624
2625# 译者:注意保持句尾空格
2626#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
2627#. in your translation. The program will only accept English
2628#. input at this point.
2629#.
94550ed3 2630#: builtin/am.c:1799
1b7f4a34
JX
2631msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
2632msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
2633
94550ed3 2634#: builtin/am.c:1849
1b7f4a34
JX
2635#, c-format
2636msgid "Dirty index: cannot apply patches (dirty: %s)"
2637msgstr "脏索引:不能应用补丁(脏文件:%s)"
2638
94550ed3 2639#: builtin/am.c:1884 builtin/am.c:1955
1b7f4a34
JX
2640#, c-format
2641msgid "Applying: %.*s"
2642msgstr "应用:%.*s"
2643
94550ed3 2644#: builtin/am.c:1900
1b7f4a34
JX
2645msgid "No changes -- Patch already applied."
2646msgstr "没有变更 —— 补丁已经应用过。"
2647
94550ed3 2648#: builtin/am.c:1908
1b7f4a34
JX
2649#, c-format
2650msgid "Patch failed at %s %.*s"
2651msgstr "打补丁失败于 %s %.*s"
2652
94550ed3 2653#: builtin/am.c:1914
1b7f4a34
JX
2654#, c-format
2655msgid "The copy of the patch that failed is found in: %s"
2656msgstr "失败的补丁文件副本位于:%s"
2657
94550ed3 2658#: builtin/am.c:1958
1b7f4a34
JX
2659msgid ""
2660"No changes - did you forget to use 'git add'?\n"
2661"If there is nothing left to stage, chances are that something else\n"
2662"already introduced the same changes; you might want to skip this patch."
2663msgstr ""
2664"没有变更 —— 您是不是忘了执行 'git add'?\n"
2665"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
2666"您也许想要跳过这个补丁。"
2667
94550ed3 2668#: builtin/am.c:1965
1b7f4a34
JX
2669msgid ""
2670"You still have unmerged paths in your index.\n"
2671"Did you forget to use 'git add'?"
2672msgstr ""
2673"您的索引中仍有未合并的路径。\n"
2674"您是否忘了执行 'git add'?"
2675
94550ed3 2676#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
1b7f4a34
JX
2677#: builtin/reset.c:316
2678#, c-format
2679msgid "Could not parse object '%s'."
2680msgstr "不能解析对象 '%s'。"
2681
94550ed3 2682#: builtin/am.c:2125
1b7f4a34
JX
2683msgid "failed to clean index"
2684msgstr "无法清空索引"
2685
94550ed3 2686#: builtin/am.c:2159
1b7f4a34
JX
2687msgid ""
2688"You seem to have moved HEAD since the last 'am' failure.\n"
2689"Not rewinding to ORIG_HEAD"
2690msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
2691
94550ed3 2692#: builtin/am.c:2220
1b7f4a34
JX
2693#, c-format
2694msgid "Invalid value for --patch-format: %s"
2695msgstr "无效的 --patch-format 值:%s"
2696
94550ed3
JX
2697#: builtin/am.c:2253
2698msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
2699msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
1b7f4a34 2700
94550ed3
JX
2701#: builtin/am.c:2254
2702msgid "git am [<options>] (--continue | --skip | --abort)"
2703msgstr "git am [<选项>] (--continue | --skip | --abort)"
1b7f4a34 2704
94550ed3 2705#: builtin/am.c:2260
1b7f4a34
JX
2706msgid "run interactively"
2707msgstr "以交互式方式运行"
2708
94550ed3 2709#: builtin/am.c:2262
1b7f4a34
JX
2710msgid "historical option -- no-op"
2711msgstr "老的参数 —— 无作用"
2712
94550ed3 2713#: builtin/am.c:2264
1b7f4a34
JX
2714msgid "allow fall back on 3way merging if needed"
2715msgstr "如果必要,允许使用三方合并。"
2716
94550ed3 2717#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
1b7f4a34
JX
2718#: builtin/repack.c:171
2719msgid "be quiet"
2720msgstr "静默模式"
2721
94550ed3 2722#: builtin/am.c:2267
1b7f4a34
JX
2723msgid "add a Signed-off-by line to the commit message"
2724msgstr "在提交说明中添加一个 Signed-off-by 签名"
2725
94550ed3 2726#: builtin/am.c:2270
1b7f4a34
JX
2727msgid "recode into utf8 (default)"
2728msgstr "使用 utf8 字符集(默认)"
2729
94550ed3 2730#: builtin/am.c:2272
1b7f4a34
JX
2731msgid "pass -k flag to git-mailinfo"
2732msgstr "向 git-mailinfo 传递 -k 参数"
2733
94550ed3 2734#: builtin/am.c:2274
1b7f4a34
JX
2735msgid "pass -b flag to git-mailinfo"
2736msgstr "向 git-mailinfo 传递 -b 参数"
2737
94550ed3 2738#: builtin/am.c:2276
1b7f4a34
JX
2739msgid "pass -m flag to git-mailinfo"
2740msgstr "向 git-mailinfo 传递 -m 参数"
2741
94550ed3 2742#: builtin/am.c:2278
1b7f4a34
JX
2743msgid "pass --keep-cr flag to git-mailsplit for mbox format"
2744msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
2745
94550ed3 2746#: builtin/am.c:2281
1b7f4a34
JX
2747msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
2748msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
2749
94550ed3 2750#: builtin/am.c:2284
1b7f4a34
JX
2751msgid "strip everything before a scissors line"
2752msgstr "丢弃裁切线前的所有内容"
2753
94550ed3 2754#: builtin/am.c:2285 builtin/apply.c:4554
1b7f4a34
JX
2755msgid "action"
2756msgstr "动作"
2757
94550ed3
JX
2758#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
2759#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
2760#: builtin/am.c:2313
1b7f4a34
JX
2761msgid "pass it through git-apply"
2762msgstr "传递给 git-apply"
2763
94550ed3 2764#: builtin/am.c:2294 builtin/apply.c:4578
1b7f4a34
JX
2765msgid "root"
2766msgstr "根目录"
2767
94550ed3
JX
2768#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
2769#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
2770#: builtin/pull.c:167 builtin/submodule--helper.c:78
2771#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
1b7f4a34
JX
2772msgid "path"
2773msgstr "路径"
2774
94550ed3
JX
2775#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
2776#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
2777#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
2778#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
2779#: parse-options.h:134 parse-options.h:244
1b7f4a34
JX
2780msgid "n"
2781msgstr "n"
2782
94550ed3 2783#: builtin/am.c:2306 builtin/apply.c:4522
1b7f4a34
JX
2784msgid "num"
2785msgstr "数字"
2786
94550ed3
JX
2787#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
2788#: builtin/tag.c:372
1b7f4a34
JX
2789msgid "format"
2790msgstr "格式"
2791
94550ed3 2792#: builtin/am.c:2310
1b7f4a34
JX
2793msgid "format the patch(es) are in"
2794msgstr "补丁的格式"
2795
94550ed3 2796#: builtin/am.c:2316
1b7f4a34
JX
2797msgid "override error message when patch failure occurs"
2798msgstr "打补丁失败时显示的错误信息"
2799
94550ed3 2800#: builtin/am.c:2318
1b7f4a34
JX
2801msgid "continue applying patches after resolving a conflict"
2802msgstr "冲突解决后继续应用补丁"
2803
94550ed3 2804#: builtin/am.c:2321
1b7f4a34
JX
2805msgid "synonyms for --continue"
2806msgstr "和 --continue 同义"
2807
94550ed3 2808#: builtin/am.c:2324
1b7f4a34
JX
2809msgid "skip the current patch"
2810msgstr "跳过当前补丁"
2811
94550ed3 2812#: builtin/am.c:2327
1b7f4a34
JX
2813msgid "restore the original branch and abort the patching operation."
2814msgstr "恢复原始分支并终止打补丁操作。"
2815
94550ed3 2816#: builtin/am.c:2331
1b7f4a34
JX
2817msgid "lie about committer date"
2818msgstr "将作者日期作为提交日期"
2819
94550ed3 2820#: builtin/am.c:2333
1b7f4a34
JX
2821msgid "use current timestamp for author date"
2822msgstr "用当前时间作为作者日期"
2823
94550ed3
JX
2824#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
2825#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
1b7f4a34
JX
2826msgid "key-id"
2827msgstr "key-id"
2828
94550ed3 2829#: builtin/am.c:2336
1b7f4a34
JX
2830msgid "GPG-sign commits"
2831msgstr "使用 GPG 签名提交"
2832
94550ed3 2833#: builtin/am.c:2339
1b7f4a34
JX
2834msgid "(internal use for git-rebase)"
2835msgstr "(内部使用,用于 git-rebase)"
2836
94550ed3 2837#: builtin/am.c:2354
1b7f4a34
JX
2838msgid ""
2839"The -b/--binary option has been a no-op for long time, and\n"
2840"it will be removed. Please do not use it anymore."
2841msgstr ""
2842"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
2843"请不要再使用它了。"
2844
94550ed3 2845#: builtin/am.c:2361
1b7f4a34
JX
2846msgid "failed to read the index"
2847msgstr "无法读取索引"
2848
94550ed3 2849#: builtin/am.c:2376
1b7f4a34
JX
2850#, c-format
2851msgid "previous rebase directory %s still exists but mbox given."
2852msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
2853
94550ed3 2854#: builtin/am.c:2400
1b7f4a34
JX
2855#, c-format
2856msgid ""
2857"Stray %s directory found.\n"
2858"Use \"git am --abort\" to remove it."
2859msgstr ""
2860"发现了错误的 %s 目录。\n"
2861"使用 \"git am --abort\" 删除它。"
2862
94550ed3 2863#: builtin/am.c:2406
1b7f4a34
JX
2864msgid "Resolve operation not in progress, we are not resuming."
2865msgstr "解决操作未进行,我们不会继续。"
2866
814ff314
JX
2867#: builtin/apply.c:59
2868msgid "git apply [<options>] [<patch>...]"
2869msgstr "git apply [<选项>] [<补丁>...]"
8ada9598 2870
94550ed3 2871#: builtin/apply.c:111
81809b99 2872#, c-format
8ada9598 2873msgid "unrecognized whitespace option '%s'"
81809b99 2874msgstr "未能识别的空白字符选项 '%s'"
8ada9598 2875
94550ed3 2876#: builtin/apply.c:126
81809b99 2877#, c-format
8ada9598 2878msgid "unrecognized whitespace ignore option '%s'"
81809b99 2879msgstr "未能识别的空白字符忽略选项 '%s'"
8ada9598 2880
94550ed3 2881#: builtin/apply.c:818
8ada9598
JX
2882#, c-format
2883msgid "Cannot prepare timestamp regexp %s"
81809b99 2884msgstr "无法准备时间戳正则表达式 %s"
8ada9598 2885
94550ed3 2886#: builtin/apply.c:827
8ada9598
JX
2887#, c-format
2888msgid "regexec returned %d for input: %s"
81809b99 2889msgstr "regexec 返回 %d,输入为:%s"
8ada9598 2890
94550ed3 2891#: builtin/apply.c:908
81809b99 2892#, c-format
8ada9598 2893msgid "unable to find filename in patch at line %d"
81809b99 2894msgstr "不能在补丁的第 %d 行找到文件名"
8ada9598 2895
94550ed3 2896#: builtin/apply.c:940
8ada9598
JX
2897#, c-format
2898msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
9aafc933 2899msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
8ada9598 2900
94550ed3 2901#: builtin/apply.c:944
8ada9598
JX
2902#, c-format
2903msgid "git apply: bad git-diff - inconsistent new filename on line %d"
81809b99 2904msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
8ada9598 2905
94550ed3 2906#: builtin/apply.c:945
8ada9598
JX
2907#, c-format
2908msgid "git apply: bad git-diff - inconsistent old filename on line %d"
81809b99 2909msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
8ada9598 2910
94550ed3 2911#: builtin/apply.c:952
8ada9598
JX
2912#, c-format
2913msgid "git apply: bad git-diff - expected /dev/null on line %d"
9aafc933 2914msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
8ada9598 2915
94550ed3 2916#: builtin/apply.c:1415
8ada9598
JX
2917#, c-format
2918msgid "recount: unexpected line: %.*s"
81809b99 2919msgstr "recount:意外的行:%.*s"
8ada9598 2920
94550ed3 2921#: builtin/apply.c:1472
8ada9598
JX
2922#, c-format
2923msgid "patch fragment without header at line %d: %.*s"
81809b99 2924msgstr "第 %d 行的补丁片段没有头信息:%.*s"
8ada9598 2925
94550ed3 2926#: builtin/apply.c:1489
8ada9598
JX
2927#, c-format
2928msgid ""
2929"git diff header lacks filename information when removing %d leading pathname "
2930"component (line %d)"
2931msgid_plural ""
2932"git diff header lacks filename information when removing %d leading pathname "
2933"components (line %d)"
5ae481e0
JX
2934msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2935msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
8ada9598 2936
94550ed3 2937#: builtin/apply.c:1655
8ada9598 2938msgid "new file depends on old contents"
81809b99 2939msgstr "新文件依赖旧内容"
8ada9598 2940
94550ed3 2941#: builtin/apply.c:1657
8ada9598 2942msgid "deleted file still has contents"
81809b99 2943msgstr "删除的文件仍有内容"
8ada9598 2944
94550ed3 2945#: builtin/apply.c:1683
8ada9598
JX
2946#, c-format
2947msgid "corrupt patch at line %d"
195febda 2948msgstr "补丁在第 %d 行损坏"
8ada9598 2949
94550ed3 2950#: builtin/apply.c:1719
8ada9598
JX
2951#, c-format
2952msgid "new file %s depends on old contents"
81809b99 2953msgstr "新文件 %s 依赖旧内容"
8ada9598 2954
94550ed3 2955#: builtin/apply.c:1721
8ada9598
JX
2956#, c-format
2957msgid "deleted file %s still has contents"
81809b99 2958msgstr "删除的文件 %s 仍有内容"
8ada9598 2959
94550ed3 2960#: builtin/apply.c:1724
8ada9598
JX
2961#, c-format
2962msgid "** warning: file %s becomes empty but is not deleted"
81809b99 2963msgstr "** 警告:文件 %s 成为空文件但并未删除"
8ada9598 2964
94550ed3 2965#: builtin/apply.c:1870
8ada9598
JX
2966#, c-format
2967msgid "corrupt binary patch at line %d: %.*s"
81809b99 2968msgstr "二进制补丁在第 %d 行损坏:%.*s"
8ada9598 2969
94550ed3 2970#: builtin/apply.c:1899
8ada9598
JX
2971#, c-format
2972msgid "unrecognized binary patch at line %d"
81809b99 2973msgstr "未能识别的二进制补丁位于第 %d 行"
8ada9598 2974
94550ed3 2975#: builtin/apply.c:2050
8ada9598
JX
2976#, c-format
2977msgid "patch with only garbage at line %d"
81809b99 2978msgstr "补丁文件的第 %d 行只有垃圾数据"
8ada9598 2979
94550ed3 2980#: builtin/apply.c:2140
81809b99 2981#, c-format
8ada9598 2982msgid "unable to read symlink %s"
81809b99 2983msgstr "无法读取符号链接 %s"
8ada9598 2984
94550ed3 2985#: builtin/apply.c:2144
81809b99 2986#, c-format
8ada9598 2987msgid "unable to open or read %s"
81809b99 2988msgstr "不能打开或读取 %s"
8ada9598 2989
94550ed3 2990#: builtin/apply.c:2777
81809b99 2991#, c-format
8ada9598 2992msgid "invalid start of line: '%c'"
81809b99 2993msgstr "无效的行首字符:'%c'"
8ada9598 2994
94550ed3 2995#: builtin/apply.c:2896
8ada9598
JX
2996#, c-format
2997msgid "Hunk #%d succeeded at %d (offset %d line)."
2998msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
07432cef
WS
2999msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
3000msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
8ada9598 3001
94550ed3 3002#: builtin/apply.c:2908
8ada9598
JX
3003#, c-format
3004msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
81809b99 3005msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
8ada9598 3006
94550ed3 3007#: builtin/apply.c:2914
8ada9598
JX
3008#, c-format
3009msgid ""
3010"while searching for:\n"
3011"%.*s"
3012msgstr ""
81809b99
JX
3013"当查询:\n"
3014"%.*s"
8ada9598 3015
94550ed3 3016#: builtin/apply.c:2934
8ada9598
JX
3017#, c-format
3018msgid "missing binary patch data for '%s'"
81809b99 3019msgstr "缺失 '%s' 的二进制补丁数据"
8ada9598 3020
94550ed3 3021#: builtin/apply.c:3035
8ada9598
JX
3022#, c-format
3023msgid "binary patch does not apply to '%s'"
81809b99 3024msgstr "二进制补丁未应用到 '%s'"
8ada9598 3025
94550ed3 3026#: builtin/apply.c:3041
8ada9598
JX
3027#, c-format
3028msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
9aafc933 3029msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
8ada9598 3030
94550ed3 3031#: builtin/apply.c:3062
8ada9598
JX
3032#, c-format
3033msgid "patch failed: %s:%ld"
81809b99 3034msgstr "打补丁失败:%s:%ld"
8ada9598 3035
94550ed3 3036#: builtin/apply.c:3186
8ada9598 3037#, c-format
23ff3338
JX
3038msgid "cannot checkout %s"
3039msgstr "不能检出 %s"
8ada9598 3040
94550ed3 3041#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
81809b99 3042#, c-format
8ada9598 3043msgid "read of %s failed"
81809b99 3044msgstr "读取 %s 失败"
8ada9598 3045
94550ed3 3046#: builtin/apply.c:3239
814ff314
JX
3047#, c-format
3048msgid "reading from '%s' beyond a symbolic link"
3049msgstr "读取位于符号链接中的 '%s'"
3050
94550ed3 3051#: builtin/apply.c:3267 builtin/apply.c:3489
81809b99 3052#, c-format
23ff3338
JX
3053msgid "path %s has been renamed/deleted"
3054msgstr "路径 %s 已经被重命名/删除"
8ada9598 3055
94550ed3 3056#: builtin/apply.c:3348 builtin/apply.c:3503
8ada9598 3057#, c-format
23ff3338
JX
3058msgid "%s: does not exist in index"
3059msgstr "%s:不存在于索引中"
8ada9598 3060
94550ed3 3061#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
81809b99 3062#, c-format
8ada9598 3063msgid "%s: %s"
81809b99 3064msgstr "%s:%s"
8ada9598 3065
94550ed3 3066#: builtin/apply.c:3357 builtin/apply.c:3511
81809b99 3067#, c-format
8ada9598 3068msgid "%s: does not match index"
81809b99 3069msgstr "%s:和索引不匹配"
8ada9598 3070
94550ed3 3071#: builtin/apply.c:3459
23ff3338
JX
3072msgid "removal patch leaves file contents"
3073msgstr "移除补丁仍留下了文件内容"
3074
94550ed3 3075#: builtin/apply.c:3528
8ada9598
JX
3076#, c-format
3077msgid "%s: wrong type"
81809b99 3078msgstr "%s:错误类型"
8ada9598 3079
94550ed3 3080#: builtin/apply.c:3530
8ada9598
JX
3081#, c-format
3082msgid "%s has type %o, expected %o"
9aafc933 3083msgstr "%s 的类型是 %o,应为 %o"
8ada9598 3084
94550ed3 3085#: builtin/apply.c:3689 builtin/apply.c:3691
814ff314
JX
3086#, c-format
3087msgid "invalid path '%s'"
3088msgstr "无效路径 '%s'"
3089
94550ed3 3090#: builtin/apply.c:3746
81809b99 3091#, c-format
8ada9598 3092msgid "%s: already exists in index"
81809b99 3093msgstr "%s:已经存在于索引中"
8ada9598 3094
94550ed3 3095#: builtin/apply.c:3749
23ff3338
JX
3096#, c-format
3097msgid "%s: already exists in working directory"
3098msgstr "%s:已经存在于工作区中"
3099
94550ed3 3100#: builtin/apply.c:3769
d691f479
JX
3101#, c-format
3102msgid "new mode (%o) of %s does not match old mode (%o)"
3103msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
8ada9598 3104
94550ed3 3105#: builtin/apply.c:3774
8ada9598 3106#, c-format
d691f479
JX
3107msgid "new mode (%o) of %s does not match old mode (%o) of %s"
3108msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
3109
94550ed3 3110#: builtin/apply.c:3794
814ff314
JX
3111#, c-format
3112msgid "affected file '%s' is beyond a symbolic link"
3113msgstr "受影响的文件 '%s' 位于符号链接中"
3114
94550ed3 3115#: builtin/apply.c:3798
d691f479 3116#, c-format
8ada9598 3117msgid "%s: patch does not apply"
81809b99 3118msgstr "%s:补丁未应用"
8ada9598 3119
94550ed3 3120#: builtin/apply.c:3812
8ada9598
JX
3121#, c-format
3122msgid "Checking patch %s..."
81809b99 3123msgstr "检查补丁 %s..."
8ada9598 3124
94550ed3 3125#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
8ada9598
JX
3126#, c-format
3127msgid "make_cache_entry failed for path '%s'"
3128msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
3129
94550ed3 3130#: builtin/apply.c:4048
81809b99 3131#, c-format
8ada9598 3132msgid "unable to remove %s from index"
81809b99 3133msgstr "不能从索引中移除 %s"
8ada9598 3134
94550ed3 3135#: builtin/apply.c:4077
8ada9598 3136#, c-format
2e8451e8
JX
3137msgid "corrupt patch for submodule %s"
3138msgstr "子模组 %s 损坏的补丁"
8ada9598 3139
94550ed3 3140#: builtin/apply.c:4081
81809b99 3141#, c-format
8ada9598 3142msgid "unable to stat newly created file '%s'"
81809b99 3143msgstr "不能枚举新建文件 '%s' 的状态"
8ada9598 3144
94550ed3 3145#: builtin/apply.c:4086
8ada9598
JX
3146#, c-format
3147msgid "unable to create backing store for newly created file %s"
81809b99 3148msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 3149
94550ed3 3150#: builtin/apply.c:4089 builtin/apply.c:4197
81809b99 3151#, c-format
8ada9598 3152msgid "unable to add cache entry for %s"
81809b99 3153msgstr "无法为 %s 添加缓存条目"
8ada9598 3154
94550ed3 3155#: builtin/apply.c:4122
81809b99 3156#, c-format
8ada9598 3157msgid "closing file '%s'"
81809b99 3158msgstr "关闭文件 '%s'"
8ada9598 3159
94550ed3 3160#: builtin/apply.c:4171
81809b99 3161#, c-format
8ada9598 3162msgid "unable to write file '%s' mode %o"
81809b99 3163msgstr "不能写文件 '%s' 权限 %o"
8ada9598 3164
94550ed3 3165#: builtin/apply.c:4258
8ada9598
JX
3166#, c-format
3167msgid "Applied patch %s cleanly."
81809b99 3168msgstr "成功应用补丁 %s。"
8ada9598 3169
94550ed3 3170#: builtin/apply.c:4266
8ada9598 3171msgid "internal error"
81809b99 3172msgstr "内部错误"
8ada9598 3173
94550ed3 3174#: builtin/apply.c:4269
8ada9598
JX
3175#, c-format
3176msgid "Applying patch %%s with %d reject..."
3177msgid_plural "Applying patch %%s with %d rejects..."
195febda
T
3178msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3179msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
8ada9598 3180
94550ed3 3181#: builtin/apply.c:4279
8ada9598
JX
3182#, c-format
3183msgid "truncating .rej filename to %.*s.rej"
81809b99 3184msgstr "截短 .rej 文件名为 %.*s.rej"
8ada9598 3185
94550ed3 3186#: builtin/apply.c:4300
8ada9598
JX
3187#, c-format
3188msgid "Hunk #%d applied cleanly."
81809b99 3189msgstr "第 #%d 个片段成功应用。"
8ada9598 3190
94550ed3 3191#: builtin/apply.c:4303
8ada9598
JX
3192#, c-format
3193msgid "Rejected hunk #%d."
81809b99 3194msgstr "拒绝第 #%d 个片段。"
8ada9598 3195
94550ed3 3196#: builtin/apply.c:4393
8ada9598 3197msgid "unrecognized input"
81809b99 3198msgstr "未能识别的输入"
8ada9598 3199
94550ed3 3200#: builtin/apply.c:4404
8ada9598 3201msgid "unable to read index file"
81809b99 3202msgstr "无法读取索引文件"
8ada9598 3203
94550ed3 3204#: builtin/apply.c:4517
8ada9598 3205msgid "don't apply changes matching the given path"
81809b99 3206msgstr "不要应用与给出路径向匹配的变更"
8ada9598 3207
94550ed3 3208#: builtin/apply.c:4520
8ada9598 3209msgid "apply changes matching the given path"
81809b99 3210msgstr "应用与给出路径向匹配的变更"
8ada9598 3211
94550ed3 3212#: builtin/apply.c:4523
8ada9598 3213msgid "remove <num> leading slashes from traditional diff paths"
07432cef 3214msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
8ada9598 3215
94550ed3 3216#: builtin/apply.c:4526
8ada9598 3217msgid "ignore additions made by the patch"
81809b99 3218msgstr "忽略补丁中的添加的文件"
8ada9598 3219
94550ed3 3220#: builtin/apply.c:4528
8ada9598 3221msgid "instead of applying the patch, output diffstat for the input"
81809b99 3222msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
8ada9598 3223
94550ed3 3224#: builtin/apply.c:4532
ef317cd5 3225msgid "show number of added and deleted lines in decimal notation"
07432cef 3226msgstr "以十进制数显示添加和删除的行数"
8ada9598 3227
94550ed3 3228#: builtin/apply.c:4534
8ada9598 3229msgid "instead of applying the patch, output a summary for the input"
81809b99 3230msgstr "不应用补丁,而是显示输入的概要"
8ada9598 3231
94550ed3 3232#: builtin/apply.c:4536
8ada9598 3233msgid "instead of applying the patch, see if the patch is applicable"
81809b99 3234msgstr "不应用补丁,而是查看补丁是否可应用"
8ada9598 3235
94550ed3 3236#: builtin/apply.c:4538
8ada9598 3237msgid "make sure the patch is applicable to the current index"
81809b99 3238msgstr "确认补丁可以应用到当前索引"
8ada9598 3239
94550ed3 3240#: builtin/apply.c:4540
8ada9598 3241msgid "apply a patch without touching the working tree"
81809b99 3242msgstr "应用补丁而不修改工作区"
8ada9598 3243
94550ed3 3244#: builtin/apply.c:4542
814ff314
JX
3245msgid "accept a patch that touches outside the working area"
3246msgstr "接受修改工作区之外文件的补丁"
3247
94550ed3 3248#: builtin/apply.c:4544
8ada9598 3249msgid "also apply the patch (use with --stat/--summary/--check)"
195febda 3250msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
8ada9598 3251
94550ed3 3252#: builtin/apply.c:4546
23ff3338 3253msgid "attempt three-way merge if a patch does not apply"
160fb2b2 3254msgstr "如果一个补丁不能应用则尝试三方合并"
23ff3338 3255
94550ed3 3256#: builtin/apply.c:4548
8ada9598 3257msgid "build a temporary index based on embedded index information"
81809b99 3258msgstr "创建一个临时索引基于嵌入的索引信息"
8ada9598 3259
94550ed3 3260#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
8ada9598 3261msgid "paths are separated with NUL character"
81809b99 3262msgstr "路径以 NUL 字符分隔"
8ada9598 3263
94550ed3 3264#: builtin/apply.c:4553
8ada9598 3265msgid "ensure at least <n> lines of context match"
81809b99 3266msgstr "确保至少匹配 <n> 行上下文"
8ada9598 3267
94550ed3 3268#: builtin/apply.c:4555
8ada9598 3269msgid "detect new or modified lines that have whitespace errors"
81809b99 3270msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 3271
94550ed3 3272#: builtin/apply.c:4558 builtin/apply.c:4561
8ada9598 3273msgid "ignore changes in whitespace when finding context"
81809b99 3274msgstr "查找上下文时忽略空白字符的变更"
8ada9598 3275
94550ed3 3276#: builtin/apply.c:4564
8ada9598 3277msgid "apply the patch in reverse"
81809b99 3278msgstr "反向应用补丁"
8ada9598 3279
94550ed3 3280#: builtin/apply.c:4566
8ada9598 3281msgid "don't expect at least one line of context"
81809b99 3282msgstr "无需至少一行上下文"
8ada9598 3283
94550ed3 3284#: builtin/apply.c:4568
8ada9598 3285msgid "leave the rejected hunks in corresponding *.rej files"
81809b99 3286msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 3287
94550ed3 3288#: builtin/apply.c:4570
8ada9598 3289msgid "allow overlapping hunks"
81809b99 3290msgstr "允许重叠的补丁片段"
8ada9598 3291
94550ed3 3292#: builtin/apply.c:4573
8ada9598 3293msgid "tolerate incorrectly detected missing new-line at the end of file"
195febda 3294msgstr "允许不正确的文件末尾换行符"
c04f5ac3 3295
94550ed3 3296#: builtin/apply.c:4576
8ada9598 3297msgid "do not trust the line counts in the hunk headers"
81809b99 3298msgstr "不信任补丁片段的头信息中的行号"
c04f5ac3 3299
94550ed3 3300#: builtin/apply.c:4579
8ada9598 3301msgid "prepend <root> to all filenames"
81809b99 3302msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 3303
94550ed3 3304#: builtin/apply.c:4601
23ff3338 3305msgid "--3way outside a repository"
160fb2b2 3306msgstr "--3way 在一个仓库之外"
23ff3338 3307
94550ed3 3308#: builtin/apply.c:4609
8ada9598 3309msgid "--index outside a repository"
160fb2b2 3310msgstr "--index 在一个仓库之外"
c04f5ac3 3311
94550ed3 3312#: builtin/apply.c:4612
8ada9598 3313msgid "--cached outside a repository"
160fb2b2 3314msgstr "--cached 在一个仓库之外"
c04f5ac3 3315
94550ed3 3316#: builtin/apply.c:4631
81809b99 3317#, c-format
8ada9598 3318msgid "can't open patch '%s'"
81809b99 3319msgstr "不能打开补丁 '%s'"
c04f5ac3 3320
94550ed3 3321#: builtin/apply.c:4645
c04f5ac3 3322#, c-format
8ada9598
JX
3323msgid "squelched %d whitespace error"
3324msgid_plural "squelched %d whitespace errors"
81809b99 3325msgstr[0] "抑制下仍有 %d 个空白字符误用"
5ae481e0 3326msgstr[1] "抑制下仍有 %d 个空白字符误用"
c04f5ac3 3327
94550ed3 3328#: builtin/apply.c:4651 builtin/apply.c:4661
8ada9598
JX
3329#, c-format
3330msgid "%d line adds whitespace errors."
3331msgid_plural "%d lines add whitespace errors."
81809b99 3332msgstr[0] "%d 行有空白字符误用。"
5ae481e0 3333msgstr[1] "%d 行有空白字符误用。"
c04f5ac3
JX
3334
3335#: builtin/archive.c:17
3336#, c-format
3337msgid "could not create archive file '%s'"
90e6ef53 3338msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
3339
3340#: builtin/archive.c:20
3341msgid "could not redirect output"
195febda 3342msgstr "不能重定向输出"
c04f5ac3
JX
3343
3344#: builtin/archive.c:37
3345msgid "git archive: Remote with no URL"
4375c10e 3346msgstr "git archive:未提供远程 URL"
c04f5ac3
JX
3347
3348#: builtin/archive.c:58
3349msgid "git archive: expected ACK/NAK, got EOF"
4375c10e 3350msgstr "git archive:应为 ACK/NACK,却得到 EOF"
c04f5ac3 3351
1003b3a5 3352#: builtin/archive.c:61
c04f5ac3
JX
3353#, c-format
3354msgid "git archive: NACK %s"
90e6ef53 3355msgstr "git archive:NACK %s"
c04f5ac3 3356
1003b3a5 3357#: builtin/archive.c:63
c04f5ac3
JX
3358#, c-format
3359msgid "remote error: %s"
3360msgstr "远程错误:%s"
3361
1003b3a5 3362#: builtin/archive.c:64
c04f5ac3 3363msgid "git archive: protocol error"
90e6ef53 3364msgstr "git archive:协议错误"
c04f5ac3 3365
1003b3a5 3366#: builtin/archive.c:68
c04f5ac3 3367msgid "git archive: expected a flush"
195febda 3368msgstr "git archive:应为刷新"
c04f5ac3 3369
ef317cd5
JX
3370#: builtin/bisect--helper.c:7
3371msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 3372msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5
JX
3373
3374#: builtin/bisect--helper.c:17
3375msgid "perform 'git bisect next'"
07432cef 3376msgstr "执行 'git bisect next'"
ef317cd5
JX
3377
3378#: builtin/bisect--helper.c:19
3379msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 3380msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 3381
1b7f4a34 3382#: builtin/blame.c:32
7aea43ff
JX
3383msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3384msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 3385
1b7f4a34 3386#: builtin/blame.c:37
814ff314
JX
3387msgid "<rev-opts> are documented in git-rev-list(1)"
3388msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 3389
94550ed3 3390#: builtin/blame.c:2519
ef317cd5 3391msgid "Show blame entries as we find them, incrementally"
07432cef 3392msgstr "增量式地显示发现的 blame 条目"
ef317cd5 3393
94550ed3 3394#: builtin/blame.c:2520
ef317cd5 3395msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 3396msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 3397
94550ed3 3398#: builtin/blame.c:2521
ef317cd5 3399msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 3400msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 3401
94550ed3 3402#: builtin/blame.c:2522
ef317cd5 3403msgid "Show work cost statistics"
07432cef 3404msgstr "显示命令消耗统计"
ef317cd5 3405
94550ed3 3406#: builtin/blame.c:2523
ef317cd5 3407msgid "Show output score for blame entries"
07432cef 3408msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 3409
94550ed3 3410#: builtin/blame.c:2524
ef317cd5 3411msgid "Show original filename (Default: auto)"
07432cef 3412msgstr "显示原始文件名(默认:自动)"
ef317cd5 3413
94550ed3 3414#: builtin/blame.c:2525
ef317cd5 3415msgid "Show original linenumber (Default: off)"
07432cef 3416msgstr "显示原始的行号(默认:关闭)"
ef317cd5 3417
94550ed3 3418#: builtin/blame.c:2526
ef317cd5 3419msgid "Show in a format designed for machine consumption"
07432cef 3420msgstr "显示为一个适合机器读取的格式"
ef317cd5 3421
94550ed3 3422#: builtin/blame.c:2527
ef317cd5 3423msgid "Show porcelain format with per-line commit information"
07432cef 3424msgstr "为每一行显示机器适用的提交信息"
ef317cd5 3425
94550ed3 3426#: builtin/blame.c:2528
ef317cd5 3427msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 3428msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 3429
94550ed3 3430#: builtin/blame.c:2529
ef317cd5 3431msgid "Show raw timestamp (Default: off)"
07432cef 3432msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 3433
94550ed3 3434#: builtin/blame.c:2530
ef317cd5 3435msgid "Show long commit SHA1 (Default: off)"
4375c10e 3436msgstr "显示长的 SHA1 提交号(默认:关闭)"
ef317cd5 3437
94550ed3 3438#: builtin/blame.c:2531
ef317cd5 3439msgid "Suppress author name and timestamp (Default: off)"
07432cef 3440msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 3441
94550ed3 3442#: builtin/blame.c:2532
ef317cd5 3443msgid "Show author email instead of name (Default: off)"
07432cef 3444msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 3445
94550ed3 3446#: builtin/blame.c:2533
ef317cd5 3447msgid "Ignore whitespace differences"
07432cef 3448msgstr "忽略空白差异"
ef317cd5 3449
94550ed3 3450#: builtin/blame.c:2534
ef317cd5 3451msgid "Spend extra cycles to find better match"
07432cef 3452msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 3453
94550ed3 3454#: builtin/blame.c:2535
ef317cd5 3455msgid "Use revisions from <file> instead of calling git-rev-list"
d9d56b23 3456msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 3457
94550ed3 3458#: builtin/blame.c:2536
ef317cd5 3459msgid "Use <file>'s contents as the final image"
d9d56b23 3460msgstr "使用 <文件> 的内容作为最终的图片"
ef317cd5 3461
94550ed3 3462#: builtin/blame.c:2537 builtin/blame.c:2538
ef317cd5 3463msgid "score"
07432cef 3464msgstr "得分"
ef317cd5 3465
94550ed3 3466#: builtin/blame.c:2537
ef317cd5 3467msgid "Find line copies within and across files"
07432cef 3468msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 3469
94550ed3 3470#: builtin/blame.c:2538
ef317cd5 3471msgid "Find line movements within and across files"
07432cef 3472msgstr "找到文件内及跨文件的行移动"
ef317cd5 3473
94550ed3 3474#: builtin/blame.c:2539
ef317cd5 3475msgid "n,m"
07432cef 3476msgstr "n,m"
ef317cd5 3477
94550ed3 3478#: builtin/blame.c:2539
ef317cd5 3479msgid "Process only line range n,m, counting from 1"
07432cef 3480msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 3481
6c94aba5
JX
3482#. TRANSLATORS: This string is used to tell us the maximum
3483#. display width for a relative timestamp in "git blame"
3484#. output. For C locale, "4 years, 11 months ago", which
3485#. takes 22 places, is the longest among various forms of
3486#. relative timestamps, but your language may need more or
3487#. fewer display columns.
94550ed3 3488#: builtin/blame.c:2620
6c94aba5
JX
3489msgid "4 years, 11 months ago"
3490msgstr "4 年 11 个月前"
3491
94550ed3 3492#: builtin/branch.c:25
814ff314
JX
3493msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
3494msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
ef317cd5 3495
94550ed3 3496#: builtin/branch.c:26
814ff314
JX
3497msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
3498msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 3499
94550ed3 3500#: builtin/branch.c:27
814ff314
JX
3501msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3502msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 3503
94550ed3 3504#: builtin/branch.c:28
814ff314
JX
3505msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3506msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 3507
94550ed3
JX
3508#: builtin/branch.c:29
3509msgid "git branch [<options>] [-r | -a] [--points-at]"
3510msgstr "git branch [<选项>] [-r | -a] [--points-at]"
3511
90e6ef53 3512# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
94550ed3 3513#: builtin/branch.c:142
c04f5ac3
JX
3514#, c-format
3515msgid ""
3516"deleting branch '%s' that has been merged to\n"
3517" '%s', but not yet merged to HEAD."
3518msgstr ""
70fc47bf 3519"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
3520" '%s',但未合并到 HEAD。"
3521
90e6ef53 3522# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
94550ed3 3523#: builtin/branch.c:146
c04f5ac3
JX
3524#, c-format
3525msgid ""
3526"not deleting branch '%s' that is not yet merged to\n"
3527" '%s', even though it is merged to HEAD."
3528msgstr ""
70fc47bf
T
3529"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
3530" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 3531
94550ed3 3532#: builtin/branch.c:160
07432cef
WS
3533#, c-format
3534msgid "Couldn't look up commit object for '%s'"
3535msgstr "无法查询 '%s' 指向的提交对象"
3536
94550ed3 3537#: builtin/branch.c:164
07432cef
WS
3538#, c-format
3539msgid ""
3540"The branch '%s' is not fully merged.\n"
3541"If you are sure you want to delete it, run 'git branch -D %s'."
3542msgstr ""
3543"分支 '%s' 没有完全合并。\n"
3544"如果您确认要删除它,执行 'git branch -D %s'。"
3545
94550ed3 3546#: builtin/branch.c:177
07432cef
WS
3547msgid "Update of config-file failed"
3548msgstr "无法更新 config 文件"
3549
94550ed3 3550#: builtin/branch.c:205
c04f5ac3 3551msgid "cannot use -a with -d"
649900bc 3552msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 3553
94550ed3 3554#: builtin/branch.c:211
c04f5ac3
JX
3555msgid "Couldn't look up commit object for HEAD"
3556msgstr "无法查询 HEAD 指向的提交对象"
3557
94550ed3 3558#: builtin/branch.c:219
c04f5ac3
JX
3559#, c-format
3560msgid "Cannot delete the branch '%s' which you are currently on."
3561msgstr "无法删除您当前所在的分支 '%s'。"
3562
94550ed3 3563#: builtin/branch.c:235
5ae481e0 3564#, c-format
7aea43ff
JX
3565msgid "remote-tracking branch '%s' not found."
3566msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 3567
94550ed3 3568#: builtin/branch.c:236
81809b99 3569#, c-format
8ada9598 3570msgid "branch '%s' not found."
81809b99 3571msgstr "分支 '%s' 未发现。"
8ada9598 3572
94550ed3 3573#: builtin/branch.c:251
81809b99 3574#, c-format
7aea43ff
JX
3575msgid "Error deleting remote-tracking branch '%s'"
3576msgstr "无法删除远程跟踪分支 '%s'"
c04f5ac3 3577
94550ed3 3578#: builtin/branch.c:252
81809b99 3579#, c-format
8ada9598 3580msgid "Error deleting branch '%s'"
7aea43ff 3581msgstr "无法删除分支 '%s'"
8ada9598 3582
94550ed3 3583#: builtin/branch.c:259
81809b99 3584#, c-format
7aea43ff
JX
3585msgid "Deleted remote-tracking branch %s (was %s).\n"
3586msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 3587
94550ed3 3588#: builtin/branch.c:260
81809b99 3589#, c-format
8ada9598 3590msgid "Deleted branch %s (was %s).\n"
81809b99 3591msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 3592
94550ed3 3593#: builtin/branch.c:303
81809b99 3594#, c-format
90314792
JX
3595msgid "[%s: gone]"
3596msgstr "[%s: 丢失]"
3597
94550ed3 3598#: builtin/branch.c:308
90314792
JX
3599#, c-format
3600msgid "[%s]"
3601msgstr "[%s]"
3602
94550ed3 3603#: builtin/branch.c:313
90314792 3604#, c-format
8ada9598 3605msgid "[%s: behind %d]"
81809b99 3606msgstr "[%s:落后 %d]"
c04f5ac3 3607
94550ed3 3608#: builtin/branch.c:315
81809b99 3609#, c-format
8ada9598 3610msgid "[behind %d]"
81809b99 3611msgstr "[落后 %d]"
8ada9598 3612
94550ed3 3613#: builtin/branch.c:319
81809b99 3614#, c-format
8ada9598 3615msgid "[%s: ahead %d]"
81809b99 3616msgstr "[%s:领先 %d]"
c04f5ac3 3617
94550ed3 3618#: builtin/branch.c:321
81809b99 3619#, c-format
8ada9598 3620msgid "[ahead %d]"
81809b99 3621msgstr "[领先 %d]"
8ada9598 3622
94550ed3 3623#: builtin/branch.c:324
81809b99 3624#, c-format
8ada9598 3625msgid "[%s: ahead %d, behind %d]"
81809b99 3626msgstr "[%s:领先 %d,落后 %d]"
8ada9598 3627
94550ed3 3628#: builtin/branch.c:327
81809b99 3629#, c-format
8ada9598 3630msgid "[ahead %d, behind %d]"
81809b99 3631msgstr "[领先 %d,落后 %d]"
c04f5ac3 3632
94550ed3 3633#: builtin/branch.c:340
a77c07d9
JX
3634msgid " **** invalid ref ****"
3635msgstr " **** 无效引用 ****"
3636
94550ed3 3637#: builtin/branch.c:366
1003b3a5
JX
3638#, c-format
3639msgid "(no branch, rebasing %s)"
3640msgstr "(非分支,正变基 %s)"
3641
94550ed3 3642#: builtin/branch.c:369
1003b3a5
JX
3643#, c-format
3644msgid "(no branch, bisect started on %s)"
3645msgstr "(非分支,二分查找开始于 %s)"
3646
94550ed3 3647#: builtin/branch.c:375
1003b3a5 3648#, c-format
814ff314
JX
3649msgid "(HEAD detached at %s)"
3650msgstr "(头指针分离于 %s)"
1003b3a5 3651
94550ed3 3652#: builtin/branch.c:378
814ff314
JX
3653#, c-format
3654msgid "(HEAD detached from %s)"
3655msgstr "(头指针分离自 %s)"
3656
94550ed3 3657#: builtin/branch.c:382
c04f5ac3
JX
3658msgid "(no branch)"
3659msgstr "(非分支)"
3660
94550ed3 3661#: builtin/branch.c:524
c04f5ac3 3662msgid "cannot rename the current branch while not on any."
90e6ef53 3663msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 3664
94550ed3 3665#: builtin/branch.c:534
c04f5ac3
JX
3666#, c-format
3667msgid "Invalid branch name: '%s'"
3668msgstr "无效的分支名:'%s'"
3669
94550ed3 3670#: builtin/branch.c:549
c04f5ac3
JX
3671msgid "Branch rename failed"
3672msgstr "分支重命名失败"
3673
94550ed3 3674#: builtin/branch.c:553
c04f5ac3
JX
3675#, c-format
3676msgid "Renamed a misnamed branch '%s' away"
3677msgstr "重命名掉一个错误命名的旧分支 '%s'"
3678
94550ed3 3679#: builtin/branch.c:557
c04f5ac3
JX
3680#, c-format
3681msgid "Branch renamed to %s, but HEAD is not updated!"
3682msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3683
94550ed3 3684#: builtin/branch.c:564
c04f5ac3
JX
3685msgid "Branch is renamed, but update of config-file failed"
3686msgstr "分支被重命名,但更新 config 文件失败"
3687
94550ed3 3688#: builtin/branch.c:587
81809b99 3689#, c-format
8ada9598 3690msgid "could not write branch description template: %s"
81809b99 3691msgstr "不能写分支描述模版:%s"
c04f5ac3 3692
94550ed3 3693#: builtin/branch.c:616
ef317cd5 3694msgid "Generic options"
07432cef 3695msgstr "通用选项"
c04f5ac3 3696
94550ed3 3697#: builtin/branch.c:618
ef317cd5 3698msgid "show hash and subject, give twice for upstream branch"
07432cef 3699msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 3700
94550ed3 3701#: builtin/branch.c:619
ef317cd5 3702msgid "suppress informational messages"
07432cef 3703msgstr "不显示信息"
8ada9598 3704
94550ed3 3705#: builtin/branch.c:620
ef317cd5 3706msgid "set up tracking mode (see git-pull(1))"
07432cef 3707msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 3708
94550ed3 3709#: builtin/branch.c:622
ef317cd5 3710msgid "change upstream info"
07432cef 3711msgstr "改变上游信息"
c04f5ac3 3712
94550ed3 3713#: builtin/branch.c:626
ef317cd5 3714msgid "use colored output"
07432cef 3715msgstr "使用彩色输出"
c04f5ac3 3716
94550ed3 3717#: builtin/branch.c:627
ef317cd5 3718msgid "act on remote-tracking branches"
07432cef 3719msgstr "作用于远程跟踪分支"
c04f5ac3 3720
94550ed3 3721#: builtin/branch.c:629 builtin/branch.c:630
ef317cd5 3722msgid "print only branches that contain the commit"
07432cef 3723msgstr "只打印包含该提交的分支"
c04f5ac3 3724
94550ed3 3725#: builtin/branch.c:633
ef317cd5 3726msgid "Specific git-branch actions:"
07432cef 3727msgstr "具体的 git-branch 动作:"
c04f5ac3 3728
94550ed3 3729#: builtin/branch.c:634
ef317cd5 3730msgid "list both remote-tracking and local branches"
07432cef 3731msgstr "列出远程跟踪及本地分支"
c04f5ac3 3732
94550ed3 3733#: builtin/branch.c:636
ef317cd5 3734msgid "delete fully merged branch"
07432cef 3735msgstr "删除完全合并的分支"
c04f5ac3 3736
94550ed3 3737#: builtin/branch.c:637
ef317cd5 3738msgid "delete branch (even if not merged)"
07432cef 3739msgstr "删除分支(即使没有合并)"
c04f5ac3 3740
94550ed3 3741#: builtin/branch.c:638
ef317cd5 3742msgid "move/rename a branch and its reflog"
07432cef 3743msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 3744
94550ed3 3745#: builtin/branch.c:639
ef317cd5 3746msgid "move/rename a branch, even if target exists"
07432cef 3747msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 3748
94550ed3 3749#: builtin/branch.c:640
ef317cd5 3750msgid "list branch names"
07432cef 3751msgstr "列出分支名"
c04f5ac3 3752
94550ed3 3753#: builtin/branch.c:641
ef317cd5 3754msgid "create the branch's reflog"
07432cef 3755msgstr "创建分支的引用日志"
ef317cd5 3756
94550ed3 3757#: builtin/branch.c:643
ef317cd5 3758msgid "edit the description for the branch"
07432cef 3759msgstr "标记分支的描述"
ef317cd5 3760
94550ed3 3761#: builtin/branch.c:644
04cb2f28
JX
3762msgid "force creation, move/rename, deletion"
3763msgstr "强制创建、移动/重命名、删除"
ef317cd5 3764
94550ed3
JX
3765#: builtin/branch.c:645
3766msgid "print only branches that are merged"
3767msgstr "只打印已经合并的分支"
ef317cd5 3768
94550ed3
JX
3769#: builtin/branch.c:646
3770msgid "print only branches that are not merged"
3771msgstr "只打印尚未合并的分支"
ef317cd5 3772
94550ed3 3773#: builtin/branch.c:647
ef317cd5 3774msgid "list branches in columns"
07432cef 3775msgstr "以列的方式显示分支"
ef317cd5 3776
94550ed3
JX
3777#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
3778msgid "key"
3779msgstr "key"
3780
3781#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
3782msgid "field name to sort on"
3783msgstr "排序的字段名"
3784
3785#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
3786#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
3787#: builtin/tag.c:369
3788msgid "object"
3789msgstr "对象"
3790
3791#: builtin/branch.c:652
3792msgid "print only branches of the object"
3793msgstr "只打印指向该对象的分支"
3794
3795#: builtin/branch.c:670
c04f5ac3
JX
3796msgid "Failed to resolve HEAD as a valid ref."
3797msgstr "无法将 HEAD 解析为有效引用。"
3798
94550ed3 3799#: builtin/branch.c:674 builtin/clone.c:697
c04f5ac3 3800msgid "HEAD not found below refs/heads!"
90e6ef53 3801msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 3802
94550ed3 3803#: builtin/branch.c:694
8ada9598 3804msgid "--column and --verbose are incompatible"
81809b99 3805msgstr "--column 和 --verbose 不兼容"
8ada9598 3806
94550ed3 3807#: builtin/branch.c:705 builtin/branch.c:747
a77c07d9
JX
3808msgid "branch name required"
3809msgstr "必须提供分支名"
3810
94550ed3 3811#: builtin/branch.c:723
a77c07d9
JX
3812msgid "Cannot give description to detached HEAD"
3813msgstr "不能向分离头指针提供描述"
3814
94550ed3 3815#: builtin/branch.c:728
a77c07d9
JX
3816msgid "cannot edit description of more than one branch"
3817msgstr "不能为一个以上的分支编辑描述"
3818
94550ed3 3819#: builtin/branch.c:735
a77c07d9
JX
3820#, c-format
3821msgid "No commit on branch '%s' yet."
3822msgstr "分支 '%s' 尚无提交。"
3823
94550ed3 3824#: builtin/branch.c:738
a77c07d9
JX
3825#, c-format
3826msgid "No branch named '%s'."
3827msgstr "没有分支 '%s'。"
3828
94550ed3 3829#: builtin/branch.c:753
a77c07d9
JX
3830msgid "too many branches for a rename operation"
3831msgstr "为重命名操作提供了太多的分支名"
3832
94550ed3 3833#: builtin/branch.c:758
1003b3a5
JX
3834msgid "too many branches to set new upstream"
3835msgstr "为设置新上游提供了太多的分支名"
3836
94550ed3 3837#: builtin/branch.c:762
1003b3a5
JX
3838#, c-format
3839msgid ""
3840"could not set upstream of HEAD to %s when it does not point to any branch."
3841msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3842
94550ed3 3843#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
1003b3a5
JX
3844#, c-format
3845msgid "no such branch '%s'"
3846msgstr "没有此分支 '%s'"
3847
94550ed3 3848#: builtin/branch.c:769
07432cef 3849#, c-format
ef317cd5 3850msgid "branch '%s' does not exist"
07432cef 3851msgstr "分支 '%s' 不存在"
ef317cd5 3852
94550ed3 3853#: builtin/branch.c:781
1003b3a5
JX
3854msgid "too many branches to unset upstream"
3855msgstr "为取消上游设置操作提供了太多的分支名"
3856
94550ed3 3857#: builtin/branch.c:785
1003b3a5
JX
3858msgid "could not unset upstream of HEAD when it does not point to any branch."
3859msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3860
94550ed3 3861#: builtin/branch.c:791
ef317cd5
JX
3862#, c-format
3863msgid "Branch '%s' has no upstream information"
07432cef 3864msgstr "分支 '%s' 没有上游信息"
ef317cd5 3865
94550ed3 3866#: builtin/branch.c:805
1003b3a5
JX
3867msgid "it does not make sense to create 'HEAD' manually"
3868msgstr "手工创建 'HEAD' 没有意义"
3869
94550ed3 3870#: builtin/branch.c:811
c04f5ac3
JX
3871msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3872msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3873
94550ed3 3874#: builtin/branch.c:814
ef317cd5
JX
3875#, c-format
3876msgid ""
3877"The --set-upstream flag is deprecated and will be removed. Consider using --"
3878"track or --set-upstream-to\n"
3879msgstr ""
07432cef 3880"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
ef317cd5 3881
94550ed3 3882#: builtin/branch.c:831
ef317cd5
JX
3883#, c-format
3884msgid ""
3885"\n"
3886"If you wanted to make '%s' track '%s', do this:\n"
3887"\n"
3888msgstr ""
07432cef
WS
3889"\n"
3890"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3891"\n"
ef317cd5 3892
94550ed3 3893#: builtin/branch.c:832
07432cef 3894#, c-format
ef317cd5 3895msgid " git branch -d %s\n"
07432cef 3896msgstr " git branch -d %s\n"
ef317cd5 3897
94550ed3 3898#: builtin/branch.c:833
ef317cd5
JX
3899#, c-format
3900msgid " git branch --set-upstream-to %s\n"
07432cef 3901msgstr " git branch --set-upstream-to %s\n"
ef317cd5 3902
7aea43ff 3903#: builtin/bundle.c:51
c04f5ac3
JX
3904#, c-format
3905msgid "%s is okay\n"
3906msgstr "%s 可以\n"
3907
7aea43ff 3908#: builtin/bundle.c:64
c04f5ac3 3909msgid "Need a repository to create a bundle."
160fb2b2 3910msgstr "需要一个仓库来创建包。"
c04f5ac3 3911
7aea43ff 3912#: builtin/bundle.c:68
c04f5ac3 3913msgid "Need a repository to unbundle."
160fb2b2 3914msgstr "需要一个仓库来解包。"
c04f5ac3 3915
1b7f4a34 3916#: builtin/cat-file.c:428
7aea43ff
JX
3917msgid ""
3918"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3919"<type>|--textconv) <object>"
3920msgstr ""
3921"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
3922">|--textconv) <对象>"
ef317cd5 3923
1b7f4a34 3924#: builtin/cat-file.c:429
94550ed3
JX
3925msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
3926msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
ef317cd5 3927
1b7f4a34 3928#: builtin/cat-file.c:466
ef317cd5 3929msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 3930msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 3931
1b7f4a34 3932#: builtin/cat-file.c:467
ef317cd5 3933msgid "show object type"
07432cef 3934msgstr "显示对象类型"
ef317cd5 3935
1b7f4a34 3936#: builtin/cat-file.c:468
ef317cd5 3937msgid "show object size"
07432cef 3938msgstr "显示对象大小"
ef317cd5 3939
1b7f4a34 3940#: builtin/cat-file.c:470
ef317cd5 3941msgid "exit with zero when there's no error"
07432cef 3942msgstr "当没有错误时退出并返回零"
ef317cd5 3943
1b7f4a34 3944#: builtin/cat-file.c:471
ef317cd5 3945msgid "pretty-print object's content"
07432cef 3946msgstr "美观地打印对象的内容"
ef317cd5 3947
1b7f4a34 3948#: builtin/cat-file.c:473
ef317cd5 3949msgid "for blob objects, run textconv on object's content"
160fb2b2 3950msgstr "对于数据对象,对其内容执行 textconv"
ef317cd5 3951
1b7f4a34 3952#: builtin/cat-file.c:475
7aea43ff
JX
3953msgid "allow -s and -t to work with broken/corrupt objects"
3954msgstr "允许 -s 和 -t 对损坏的对象生效"
3955
1b7f4a34
JX
3956#: builtin/cat-file.c:476
3957msgid "buffer --batch output"
3958msgstr "缓冲 --batch 的输出"
3959
3960#: builtin/cat-file.c:478
ef317cd5 3961msgid "show info and content of objects fed from the standard input"
07432cef 3962msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 3963
1b7f4a34 3964#: builtin/cat-file.c:481
ef317cd5 3965msgid "show info about objects fed from the standard input"
07432cef 3966msgstr "显示从标准输入提供的对象的信息"
ef317cd5 3967
1b7f4a34 3968#: builtin/cat-file.c:484
7aea43ff
JX
3969msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3970msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
3971
1b7f4a34
JX
3972#: builtin/cat-file.c:486
3973msgid "show all objects with --batch or --batch-check"
3974msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
3975
ef317cd5 3976#: builtin/check-attr.c:11
814ff314
JX
3977msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3978msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5
JX
3979
3980#: builtin/check-attr.c:12
94550ed3
JX
3981msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
3982msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
ef317cd5
JX
3983
3984#: builtin/check-attr.c:19
3985msgid "report all attributes set on file"
07432cef 3986msgstr "报告设置在文件上的所有属性"
ef317cd5
JX
3987
3988#: builtin/check-attr.c:20
3989msgid "use .gitattributes only from the index"
07432cef 3990msgstr "只使用索引中的 .gitattributes"
ef317cd5 3991
7aea43ff 3992#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
ef317cd5 3993msgid "read file names from stdin"
07432cef 3994msgstr "从标准输入读出文件名"
ef317cd5 3995
a77c07d9 3996#: builtin/check-attr.c:23 builtin/check-ignore.c:24
90314792
JX
3997msgid "terminate input and output records by a NUL character"
3998msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 3999
94550ed3 4000#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
a77c07d9
JX
4001msgid "suppress progress reporting"
4002msgstr "不显示进度报告"
4003
2e8451e8
JX
4004#: builtin/check-ignore.c:26
4005msgid "show non-matching input paths"
4006msgstr "显示未匹配的输入路径"
4007
90314792
JX
4008#: builtin/check-ignore.c:28
4009msgid "ignore index when checking"
4010msgstr "检查时忽略索引"
4011
4012#: builtin/check-ignore.c:154
a77c07d9 4013msgid "cannot specify pathnames with --stdin"
1b7f4a34 4014msgstr "不能同时指定路径及 --stdin 参数"
a77c07d9 4015
90314792 4016#: builtin/check-ignore.c:157
a77c07d9
JX
4017msgid "-z only makes sense with --stdin"
4018msgstr "-z 需要和 --stdin 参数共用才有意义"
4019
90314792 4020#: builtin/check-ignore.c:159
a77c07d9
JX
4021msgid "no path specified"
4022msgstr "未指定路径"
4023
90314792 4024#: builtin/check-ignore.c:163
a77c07d9
JX
4025msgid "--quiet is only valid with a single pathname"
4026msgstr "参数 --quiet 只在提供一个路径名时有效"
4027
90314792 4028#: builtin/check-ignore.c:165
a77c07d9
JX
4029msgid "cannot have both --quiet and --verbose"
4030msgstr "不能同时提供 --quiet 和 --verbose 参数"
4031
90314792 4032#: builtin/check-ignore.c:168
2e8451e8
JX
4033msgid "--non-matching is only valid with --verbose"
4034msgstr "--non-matching 选项只在使用 --verbose 时有效"
4035
4036#: builtin/check-mailmap.c:8
814ff314
JX
4037msgid "git check-mailmap [<options>] <contact>..."
4038msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8
JX
4039
4040#: builtin/check-mailmap.c:13
4041msgid "also read contacts from stdin"
4042msgstr "还从标准输入读取联系地址"
4043
4044#: builtin/check-mailmap.c:24
4045#, c-format
4046msgid "unable to parse contact: %s"
4047msgstr "不能解析联系地址:%s"
4048
4049#: builtin/check-mailmap.c:47
4050msgid "no contacts specified"
4051msgstr "未指定联系地址"
4052
ef317cd5 4053#: builtin/checkout-index.c:126
814ff314
JX
4054msgid "git checkout-index [<options>] [--] [<file>...]"
4055msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 4056
6acbf033 4057#: builtin/checkout-index.c:188
ef317cd5 4058msgid "check out all files in the index"
07432cef 4059msgstr "检出索引区的所有文件"
ef317cd5 4060
6acbf033 4061#: builtin/checkout-index.c:189
ef317cd5 4062msgid "force overwrite of existing files"
07432cef 4063msgstr "强制覆盖现有的文件"
ef317cd5 4064
6acbf033 4065#: builtin/checkout-index.c:191
ef317cd5 4066msgid "no warning for existing files and files not in index"
07432cef 4067msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 4068
6acbf033 4069#: builtin/checkout-index.c:193
ef317cd5 4070msgid "don't checkout new files"
07432cef 4071msgstr "不检出新文件"
ef317cd5 4072
6acbf033 4073#: builtin/checkout-index.c:195
ef317cd5 4074msgid "update stat information in the index file"
07432cef 4075msgstr "更新索引中文件的状态信息"
ef317cd5 4076
6acbf033 4077#: builtin/checkout-index.c:201
ef317cd5 4078msgid "read list of paths from the standard input"
07432cef 4079msgstr "从标准输入读取路径列表"
ef317cd5 4080
6acbf033 4081#: builtin/checkout-index.c:203
ef317cd5 4082msgid "write the content to temporary files"
07432cef 4083msgstr "将内容写入临时文件"
ef317cd5 4084
6acbf033 4085#: builtin/checkout-index.c:204 builtin/column.c:30
94550ed3
JX
4086#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
4087#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
ef317cd5 4088msgid "string"
07432cef 4089msgstr "字符串"
ef317cd5 4090
6acbf033 4091#: builtin/checkout-index.c:205
ef317cd5 4092msgid "when creating files, prepend <string>"
4375c10e 4093msgstr "在创建文件时,在前面加上 <字符串>"
ef317cd5 4094
6acbf033 4095#: builtin/checkout-index.c:208
ef317cd5 4096msgid "copy out the files from named stage"
07432cef 4097msgstr "从指定暂存区中拷出文件"
ef317cd5 4098
1b7f4a34 4099#: builtin/checkout.c:25
814ff314
JX
4100msgid "git checkout [<options>] <branch>"
4101msgstr "git checkout [<选项>] <分支>"
ef317cd5 4102
1b7f4a34 4103#: builtin/checkout.c:26
814ff314
JX
4104msgid "git checkout [<options>] [<branch>] -- <file>..."
4105msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 4106
94550ed3 4107#: builtin/checkout.c:134 builtin/checkout.c:167
c04f5ac3
JX
4108#, c-format
4109msgid "path '%s' does not have our version"
4110msgstr "路径 '%s' 没有我们的版本"
4111
94550ed3 4112#: builtin/checkout.c:136 builtin/checkout.c:169
c04f5ac3
JX
4113#, c-format
4114msgid "path '%s' does not have their version"
4115msgstr "路径 '%s' 没有他们的版本"
4116
94550ed3 4117#: builtin/checkout.c:152
c04f5ac3
JX
4118#, c-format
4119msgid "path '%s' does not have all necessary versions"
4120msgstr "路径 '%s' 没有全部必须的版本"
4121
94550ed3 4122#: builtin/checkout.c:196
c04f5ac3
JX
4123#, c-format
4124msgid "path '%s' does not have necessary versions"
4125msgstr "路径 '%s' 没有必须的版本"
4126
94550ed3 4127#: builtin/checkout.c:213
c04f5ac3
JX
4128#, c-format
4129msgid "path '%s': cannot merge"
90e6ef53 4130msgstr "path '%s':无法合并"
c04f5ac3 4131
94550ed3 4132#: builtin/checkout.c:230
c04f5ac3
JX
4133#, c-format
4134msgid "Unable to add merge result for '%s'"
4135msgstr "无法为 '%s' 添加合并结果"
4136
94550ed3
JX
4137#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
4138#: builtin/checkout.c:260
07432cef 4139#, c-format
ef317cd5 4140msgid "'%s' cannot be used with updating paths"
07432cef 4141msgstr "'%s' 不能在更新路径时使用"
ef317cd5 4142
94550ed3 4143#: builtin/checkout.c:263 builtin/checkout.c:266
07432cef 4144#, c-format
ef317cd5 4145msgid "'%s' cannot be used with %s"
07432cef 4146msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 4147
94550ed3 4148#: builtin/checkout.c:269
ef317cd5
JX
4149#, c-format
4150msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 4151msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 4152
94550ed3 4153#: builtin/checkout.c:280 builtin/checkout.c:474
c04f5ac3 4154msgid "corrupt index file"
90e6ef53 4155msgstr "损坏的索引文件"
c04f5ac3 4156
94550ed3 4157#: builtin/checkout.c:340 builtin/checkout.c:347
c04f5ac3
JX
4158#, c-format
4159msgid "path '%s' is unmerged"
4160msgstr "路径 '%s' 未合并"
4161
94550ed3 4162#: builtin/checkout.c:496
c04f5ac3 4163msgid "you need to resolve your current index first"
90e6ef53 4164msgstr "您需要先解决当前索引的冲突"
c04f5ac3 4165
94550ed3 4166#: builtin/checkout.c:623
c04f5ac3 4167#, c-format
1b7f4a34
JX
4168msgid "Can not do reflog for '%s': %s\n"
4169msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
c04f5ac3 4170
94550ed3 4171#: builtin/checkout.c:661
c04f5ac3
JX
4172msgid "HEAD is now at"
4173msgstr "HEAD 目前位于"
4174
94550ed3 4175#: builtin/checkout.c:668
c04f5ac3
JX
4176#, c-format
4177msgid "Reset branch '%s'\n"
4178msgstr "重置分支 '%s'\n"
4179
94550ed3 4180#: builtin/checkout.c:671
c04f5ac3
JX
4181#, c-format
4182msgid "Already on '%s'\n"
4183msgstr "已经位于 '%s'\n"
4184
94550ed3 4185#: builtin/checkout.c:675
c04f5ac3
JX
4186#, c-format
4187msgid "Switched to and reset branch '%s'\n"
4188msgstr "切换并重置分支 '%s'\n"
4189
94550ed3 4190#: builtin/checkout.c:677 builtin/checkout.c:1066
c04f5ac3
JX
4191#, c-format
4192msgid "Switched to a new branch '%s'\n"
4193msgstr "切换到一个新分支 '%s'\n"
4194
94550ed3 4195#: builtin/checkout.c:679
c04f5ac3
JX
4196#, c-format
4197msgid "Switched to branch '%s'\n"
4198msgstr "切换到分支 '%s'\n"
4199
90e6ef53 4200# 译者:注意保持前导空格
94550ed3 4201#: builtin/checkout.c:731
c04f5ac3
JX
4202#, c-format
4203msgid " ... and %d more.\n"
90e6ef53 4204msgstr " ... 及其它 %d 个。\n"
c04f5ac3 4205
94550ed3 4206#: builtin/checkout.c:737
c04f5ac3
JX
4207#, c-format
4208msgid ""
4209"Warning: you are leaving %d commit behind, not connected to\n"
4210"any of your branches:\n"
4211"\n"
4212"%s\n"
4213msgid_plural ""
4214"Warning: you are leaving %d commits behind, not connected to\n"
4215"any of your branches:\n"
4216"\n"
4217"%s\n"
4218msgstr[0] ""
4219"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4220"\n"
4221"%s\n"
5ae481e0
JX
4222msgstr[1] ""
4223"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4224"\n"
4225"%s\n"
c04f5ac3 4226
94550ed3 4227#: builtin/checkout.c:756
c04f5ac3
JX
4228#, c-format
4229msgid ""
7aea43ff
JX
4230"If you want to keep it by creating a new branch, this may be a good time\n"
4231"to do so with:\n"
4232"\n"
4233" git branch <new-branch-name> %s\n"
4234"\n"
4235msgid_plural ""
c04f5ac3
JX
4236"If you want to keep them by creating a new branch, this may be a good time\n"
4237"to do so with:\n"
4238"\n"
814ff314 4239" git branch <new-branch-name> %s\n"
c04f5ac3 4240"\n"
7aea43ff
JX
4241msgstr[0] ""
4242"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
4243"如下操作:\n"
4244"\n"
4245" git branch <新分支名> %s\n"
4246"\n"
4247msgstr[1] ""
4248"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
4249"如下操作:\n"
4250"\n"
814ff314 4251" git branch <新分支名> %s\n"
c04f5ac3
JX
4252"\n"
4253
94550ed3 4254#: builtin/checkout.c:792
c04f5ac3
JX
4255msgid "internal error in revision walk"
4256msgstr "在版本遍历时遇到内部错误"
4257
94550ed3 4258#: builtin/checkout.c:796
c04f5ac3
JX
4259msgid "Previous HEAD position was"
4260msgstr "之前的 HEAD 位置是"
4261
94550ed3 4262#: builtin/checkout.c:823 builtin/checkout.c:1061
c04f5ac3 4263msgid "You are on a branch yet to be born"
90e6ef53 4264msgstr "您位于一个尚未初始化的分支"
c04f5ac3 4265
94550ed3 4266#: builtin/checkout.c:968
90314792
JX
4267#, c-format
4268msgid "only one reference expected, %d given."
4269msgstr "只要一个引用,却给出了 %d 个"
4270
94550ed3 4271#: builtin/checkout.c:1007 builtin/worktree.c:213
c04f5ac3
JX
4272#, c-format
4273msgid "invalid reference: %s"
4274msgstr "无效引用:%s"
4275
94550ed3 4276#: builtin/checkout.c:1036
c04f5ac3
JX
4277#, c-format
4278msgid "reference is not a tree: %s"
4279msgstr "引用不是一个树:%s"
4280
94550ed3 4281#: builtin/checkout.c:1075
ef317cd5 4282msgid "paths cannot be used with switching branches"
07432cef 4283msgstr "路径不能和切换分支同时使用"
c04f5ac3 4284
94550ed3 4285#: builtin/checkout.c:1078 builtin/checkout.c:1082
07432cef 4286#, c-format
ef317cd5 4287msgid "'%s' cannot be used with switching branches"
07432cef 4288msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 4289
94550ed3
JX
4290#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
4291#: builtin/checkout.c:1097
07432cef 4292#, c-format
ef317cd5 4293msgid "'%s' cannot be used with '%s'"
07432cef 4294msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 4295
94550ed3 4296#: builtin/checkout.c:1102
07432cef 4297#, c-format
ef317cd5 4298msgid "Cannot switch branch to a non-commit '%s'"
07432cef 4299msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 4300
94550ed3
JX
4301#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
4302#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
4303#: builtin/worktree.c:322
ef317cd5 4304msgid "branch"
07432cef 4305msgstr "分支"
c04f5ac3 4306
94550ed3 4307#: builtin/checkout.c:1136
ef317cd5 4308msgid "create and checkout a new branch"
07432cef 4309msgstr "创建并检出一个新的分支"
c04f5ac3 4310
94550ed3 4311#: builtin/checkout.c:1138
ef317cd5 4312msgid "create/reset and checkout a branch"
07432cef 4313msgstr "创建/重置并检出一个分支"
c04f5ac3 4314
94550ed3 4315#: builtin/checkout.c:1139
ef317cd5 4316msgid "create reflog for new branch"
07432cef 4317msgstr "为新的分支创建引用日志"
ef317cd5 4318
94550ed3 4319#: builtin/checkout.c:1140
ef317cd5 4320msgid "detach the HEAD at named commit"
07432cef 4321msgstr "成为指向该提交的分离头指针"
ef317cd5 4322
94550ed3 4323#: builtin/checkout.c:1141
ef317cd5 4324msgid "set upstream info for new branch"
07432cef 4325msgstr "为新的分支设置上游信息"
ef317cd5 4326
94550ed3 4327#: builtin/checkout.c:1143
6c94aba5 4328msgid "new-branch"
07432cef 4329msgstr "新分支"
ef317cd5 4330
94550ed3 4331#: builtin/checkout.c:1143
ef317cd5 4332msgid "new unparented branch"
07432cef 4333msgstr "新的没有父提交的分支"
ef317cd5 4334
94550ed3 4335#: builtin/checkout.c:1144
ef317cd5 4336msgid "checkout our version for unmerged files"
07432cef 4337msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 4338
94550ed3 4339#: builtin/checkout.c:1146
ef317cd5 4340msgid "checkout their version for unmerged files"
07432cef 4341msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 4342
94550ed3 4343#: builtin/checkout.c:1148
ef317cd5 4344msgid "force checkout (throw away local modifications)"
07432cef 4345msgstr "强制检出(丢弃本地修改)"
c04f5ac3 4346
94550ed3 4347#: builtin/checkout.c:1149
ef317cd5 4348msgid "perform a 3-way merge with the new branch"
160fb2b2 4349msgstr "和新的分支执行三方合并"
ef317cd5 4350
94550ed3 4351#: builtin/checkout.c:1150 builtin/merge.c:227
ef317cd5 4352msgid "update ignored files (default)"
07432cef 4353msgstr "更新忽略的文件(默认)"
c04f5ac3 4354
94550ed3 4355#: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250
ef317cd5 4356msgid "style"
07432cef 4357msgstr "风格"
ef317cd5 4358
94550ed3 4359#: builtin/checkout.c:1152
ef317cd5 4360msgid "conflict style (merge or diff3)"
07432cef 4361msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 4362
94550ed3 4363#: builtin/checkout.c:1155
4dcdc3d8
JX
4364msgid "do not limit pathspecs to sparse entries only"
4365msgstr "对路径不做稀疏检出的限制"
4366
94550ed3 4367#: builtin/checkout.c:1157
814ff314
JX
4368msgid "second guess 'git checkout <no-such-branch>'"
4369msgstr "二次猜测'git checkout <无此分支>'"
ef317cd5 4370
94550ed3 4371#: builtin/checkout.c:1159
7aea43ff
JX
4372msgid "do not check if another worktree is holding the given ref"
4373msgstr "不检查指定的引用是否被其他工作区所占用"
4374
94550ed3
JX
4375#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
4376#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560
4377#: builtin/send-pack.c:168
4378msgid "force progress reporting"
4379msgstr "强制显示进度报告"
4380
4381#: builtin/checkout.c:1191
ef317cd5 4382msgid "-b, -B and --orphan are mutually exclusive"
07432cef 4383msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 4384
94550ed3 4385#: builtin/checkout.c:1208
ef317cd5
JX
4386msgid "--track needs a branch name"
4387msgstr "--track 需要一个分支名"
4388
94550ed3 4389#: builtin/checkout.c:1213
ef317cd5
JX
4390msgid "Missing branch name; try -b"
4391msgstr "缺少分支名;尝试 -b"
4392
94550ed3 4393#: builtin/checkout.c:1249
c04f5ac3 4394msgid "invalid path specification"
90e6ef53 4395msgstr "无效的路径规格"
c04f5ac3 4396
94550ed3 4397#: builtin/checkout.c:1256
07432cef 4398#, c-format
c04f5ac3 4399msgid ""
ef317cd5 4400"Cannot update paths and switch to branch '%s' at the same time.\n"
c04f5ac3
JX
4401"Did you intend to checkout '%s' which can not be resolved as commit?"
4402msgstr ""
07432cef
WS
4403"不能同时更新路径并切换到分支'%s'。\n"
4404"您是想要检出 '%s' 但其未能解析为提交么?"
c04f5ac3 4405
94550ed3 4406#: builtin/checkout.c:1261
07432cef 4407#, c-format
ef317cd5 4408msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 4409msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 4410
94550ed3 4411#: builtin/checkout.c:1265
c04f5ac3
JX
4412msgid ""
4413"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4414"checking out of the index."
4415msgstr ""
90e6ef53 4416"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 4417
1b7f4a34 4418#: builtin/clean.c:25
2e8451e8
JX
4419msgid ""
4420"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
4421msgstr ""
4422"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 4423
1b7f4a34 4424#: builtin/clean.c:29
07432cef
WS
4425#, c-format
4426msgid "Removing %s\n"
4427msgstr "正删除 %s\n"
4428
1b7f4a34 4429#: builtin/clean.c:30
07432cef
WS
4430#, c-format
4431msgid "Would remove %s\n"
4432msgstr "将删除 %s\n"
4433
1b7f4a34 4434#: builtin/clean.c:31
07432cef
WS
4435#, c-format
4436msgid "Skipping repository %s\n"
160fb2b2 4437msgstr "忽略仓库 %s\n"
07432cef 4438
1b7f4a34 4439#: builtin/clean.c:32
07432cef
WS
4440#, c-format
4441msgid "Would skip repository %s\n"
160fb2b2 4442msgstr "将忽略仓库 %s\n"
07432cef 4443
1b7f4a34 4444#: builtin/clean.c:33
07432cef
WS
4445#, c-format
4446msgid "failed to remove %s"
4447msgstr "无法删除 %s"
4448
94550ed3 4449#: builtin/clean.c:315
2e8451e8
JX
4450msgid ""
4451"Prompt help:\n"
4452"1 - select a numbered item\n"
4453"foo - select item based on unique prefix\n"
4454" - (empty) select nothing"
4455msgstr ""
4456"帮助:\n"
4457"1 - 通过编号选择一个选项\n"
4458"foo - 通过标题选择一个选项\n"
4459" - (空)什么也不选择"
4460
94550ed3 4461#: builtin/clean.c:319
2e8451e8
JX
4462msgid ""
4463"Prompt help:\n"
4464"1 - select a single item\n"
4465"3-5 - select a range of items\n"
4466"2-3,6-9 - select multiple ranges\n"
4467"foo - select item based on unique prefix\n"
4468"-... - unselect specified items\n"
4469"* - choose all items\n"
4470" - (empty) finish selecting"
4471msgstr ""
4472"帮助:\n"
4473"1 - 选择一个选项\n"
4474"3-5 - 选择一个范围内的所有选项\n"
4475"2-3,6-9 - 选择多个范围内的所有选项\n"
4476"foo - 通过标题选择一个选项\n"
4477"-... - 反选特定的选项\n"
4478"* - 选择所有选项\n"
4479" - (空)结束选择"
4480
94550ed3 4481#: builtin/clean.c:535
2e8451e8
JX
4482#, c-format
4483msgid "Huh (%s)?"
4484msgstr "嗯(%s)?"
4485
94550ed3 4486#: builtin/clean.c:677
2e8451e8
JX
4487#, c-format
4488msgid "Input ignore patterns>> "
4489msgstr "输入模版以排除条目>> "
4490
94550ed3 4491#: builtin/clean.c:714
2e8451e8
JX
4492#, c-format
4493msgid "WARNING: Cannot find items matched by: %s"
4494msgstr "警告:无法找到和 %s 匹配的条目"
4495
94550ed3 4496#: builtin/clean.c:735
2e8451e8
JX
4497msgid "Select items to delete"
4498msgstr "选择要删除的条目"
4499
814ff314 4500#. TRANSLATORS: Make sure to keep [y/N] as is
94550ed3 4501#: builtin/clean.c:776
2e8451e8 4502#, c-format
814ff314
JX
4503msgid "Remove %s [y/N]? "
4504msgstr "删除 %s [y/N]?"
2e8451e8 4505
94550ed3 4506#: builtin/clean.c:801
2e8451e8
JX
4507msgid "Bye."
4508msgstr "再见。"
4509
94550ed3 4510#: builtin/clean.c:809
2e8451e8
JX
4511msgid ""
4512"clean - start cleaning\n"
4513"filter by pattern - exclude items from deletion\n"
4514"select by numbers - select items to be deleted by numbers\n"
4515"ask each - confirm each deletion (like \"rm -i\")\n"
4516"quit - stop cleaning\n"
4517"help - this screen\n"
4518"? - help for prompt selection"
4519msgstr ""
4520"clean - 开始清理\n"
4521"filter by pattern - 通过模版排除要删除的条目\n"
4522"select by numbers - 通过数字选择要删除的条目\n"
4523"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
4524"quit - 停止删除并退出\n"
4525"help - 显示本帮助\n"
4526"? - 显示如何在提示符下选择的帮助"
4527
94550ed3 4528#: builtin/clean.c:836
2e8451e8
JX
4529msgid "*** Commands ***"
4530msgstr "*** 命令 ***"
4531
94550ed3 4532#: builtin/clean.c:837
2e8451e8
JX
4533msgid "What now"
4534msgstr "请选择"
4535
94550ed3 4536#: builtin/clean.c:845
2e8451e8
JX
4537msgid "Would remove the following item:"
4538msgid_plural "Would remove the following items:"
4539msgstr[0] "将删除如下条目:"
4540msgstr[1] "将删除如下条目:"
4541
94550ed3 4542#: builtin/clean.c:862
2e8451e8
JX
4543msgid "No more files to clean, exiting."
4544msgstr "没有要清理的文件,退出。"
4545
94550ed3 4546#: builtin/clean.c:893
ef317cd5 4547msgid "do not print names of files removed"
07432cef 4548msgstr "不打印删除文件的名称"
ef317cd5 4549
94550ed3 4550#: builtin/clean.c:895
ef317cd5 4551msgid "force"
07432cef 4552msgstr "强制"
ef317cd5 4553
94550ed3 4554#: builtin/clean.c:896
2e8451e8
JX
4555msgid "interactive cleaning"
4556msgstr "交互式清除"
4557
94550ed3 4558#: builtin/clean.c:898
ef317cd5 4559msgid "remove whole directories"
07432cef 4560msgstr "删除整个目录"
ef317cd5 4561
94550ed3
JX
4562#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
4563#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
ef317cd5 4564msgid "pattern"
07432cef 4565msgstr "模式"
ef317cd5 4566
94550ed3 4567#: builtin/clean.c:900
ef317cd5 4568msgid "add <pattern> to ignore rules"
4375c10e 4569msgstr "添加 <模式> 到忽略规则"
ef317cd5 4570
94550ed3 4571#: builtin/clean.c:901
ef317cd5 4572msgid "remove ignored files, too"
07432cef 4573msgstr "也删除忽略的文件"
ef317cd5 4574
94550ed3 4575#: builtin/clean.c:903
ef317cd5 4576msgid "remove only ignored files"
07432cef 4577msgstr "只删除忽略的文件"
c04f5ac3 4578
94550ed3 4579#: builtin/clean.c:921
c04f5ac3 4580msgid "-x and -X cannot be used together"
649900bc 4581msgstr "-x 和 -X 不能同时使用"
c04f5ac3 4582
94550ed3 4583#: builtin/clean.c:925
c04f5ac3 4584msgid ""
6c94aba5 4585"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 4586"clean"
c04f5ac3 4587msgstr ""
2e8451e8 4588"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 4589
94550ed3 4590#: builtin/clean.c:928
c04f5ac3 4591msgid ""
6c94aba5 4592"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 4593"refusing to clean"
c04f5ac3 4594msgstr ""
2e8451e8 4595"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 4596
220c313c 4597#: builtin/clone.c:37
814ff314 4598msgid "git clone [<options>] [--] <repo> [<dir>]"
160fb2b2 4599msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
ef317cd5 4600
7aea43ff 4601#: builtin/clone.c:59
ef317cd5 4602msgid "don't create a checkout"
07432cef 4603msgstr "不创建一个检出"
ef317cd5 4604
94550ed3 4605#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
ef317cd5 4606msgid "create a bare repository"
160fb2b2 4607msgstr "创建一个纯仓库"
ef317cd5 4608
7aea43ff 4609#: builtin/clone.c:64
ef317cd5 4610msgid "create a mirror repository (implies bare)"
160fb2b2 4611msgstr "创建一个镜像仓库(也是纯仓库)"
ef317cd5 4612
7aea43ff 4613#: builtin/clone.c:66
ef317cd5 4614msgid "to clone from a local repository"
160fb2b2 4615msgstr "从本地仓库克隆"
ef317cd5 4616
7aea43ff 4617#: builtin/clone.c:68
ef317cd5 4618msgid "don't use local hardlinks, always copy"
07432cef 4619msgstr "不使用本地硬链接,始终复制"
ef317cd5 4620
7aea43ff 4621#: builtin/clone.c:70
ef317cd5 4622msgid "setup as shared repository"
160fb2b2 4623msgstr "设置为共享仓库"
ef317cd5 4624
7aea43ff 4625#: builtin/clone.c:72 builtin/clone.c:74
ef317cd5 4626msgid "initialize submodules in the clone"
07432cef 4627msgstr "在克隆时初始化子模组"
ef317cd5 4628
94550ed3 4629#: builtin/clone.c:75 builtin/init-db.c:466
ef317cd5 4630msgid "template-directory"
07432cef 4631msgstr "模板目录"
ef317cd5 4632
94550ed3 4633#: builtin/clone.c:76 builtin/init-db.c:467
ef317cd5 4634msgid "directory from which templates will be used"
07432cef 4635msgstr "模板目录将被使用"
ef317cd5 4636
94550ed3 4637#: builtin/clone.c:78 builtin/submodule--helper.c:179
ef317cd5 4638msgid "reference repository"
160fb2b2 4639msgstr "参考仓库"
ef317cd5 4640
7aea43ff
JX
4641#: builtin/clone.c:80
4642msgid "use --reference only while cloning"
160fb2b2 4643msgstr "仅在克隆时参考 --reference 指向的本地仓库"
7aea43ff
JX
4644
4645#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
ef317cd5 4646msgid "name"
07432cef 4647msgstr "名称"
ef317cd5 4648
7aea43ff 4649#: builtin/clone.c:82
ef317cd5 4650msgid "use <name> instead of 'origin' to track upstream"
4375c10e 4651msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
ef317cd5 4652
7aea43ff 4653#: builtin/clone.c:84
ef317cd5 4654msgid "checkout <branch> instead of the remote's HEAD"
4375c10e 4655msgstr "检出 <分支> 而不是远程 HEAD"
ef317cd5 4656
7aea43ff 4657#: builtin/clone.c:86
ef317cd5 4658msgid "path to git-upload-pack on the remote"
07432cef 4659msgstr "远程 git-upload-pack 路径"
ef317cd5 4660
94550ed3 4661#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654
1b7f4a34 4662#: builtin/pull.c:186
ef317cd5 4663msgid "depth"
07432cef 4664msgstr "深度"
ef317cd5 4665
7aea43ff 4666#: builtin/clone.c:88
ef317cd5 4667msgid "create a shallow clone of that depth"
07432cef 4668msgstr "创建一个指定深度的浅克隆"
ef317cd5 4669
7aea43ff 4670#: builtin/clone.c:90
ef317cd5 4671msgid "clone only one branch, HEAD or --branch"
07432cef 4672msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 4673
94550ed3 4674#: builtin/clone.c:91 builtin/init-db.c:475
ef317cd5 4675msgid "gitdir"
07432cef 4676msgstr "git目录"
ef317cd5 4677
94550ed3 4678#: builtin/clone.c:92 builtin/init-db.c:476
ef317cd5 4679msgid "separate git dir from working tree"
07432cef 4680msgstr "git目录和工作区分离"
ef317cd5 4681
7aea43ff 4682#: builtin/clone.c:93
ef317cd5 4683msgid "key=value"
07432cef 4684msgstr "key=value"
ef317cd5 4685
7aea43ff 4686#: builtin/clone.c:94
ef317cd5 4687msgid "set config inside the new repository"
160fb2b2 4688msgstr "在新仓库中设置配置信息"
ef317cd5 4689
94550ed3
JX
4690#: builtin/clone.c:300
4691#, c-format
4692msgid "reference repository '%s' as a linked checkout is not supported yet."
4693msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
4694
4695#: builtin/clone.c:302
c04f5ac3 4696#, c-format
4dcdc3d8 4697msgid "reference repository '%s' is not a local repository."
160fb2b2 4698msgstr "参考仓库 '%s' 不是一个本地仓库。"
c04f5ac3 4699
94550ed3 4700#: builtin/clone.c:307
cfff71a9
JX
4701#, c-format
4702msgid "reference repository '%s' is shallow"
160fb2b2 4703msgstr "参考仓库 '%s' 是一个浅克隆"
cfff71a9 4704
94550ed3 4705#: builtin/clone.c:310
cfff71a9
JX
4706#, c-format
4707msgid "reference repository '%s' is grafted"
160fb2b2 4708msgstr "参考仓库 '%s' 已被嫁接"
cfff71a9 4709
94550ed3 4710#: builtin/clone.c:375 builtin/diff.c:84
c04f5ac3
JX
4711#, c-format
4712msgid "failed to stat '%s'"
90e6ef53 4713msgstr "无法枚举 '%s' 状态"
c04f5ac3 4714
94550ed3 4715#: builtin/clone.c:377
c04f5ac3
JX
4716#, c-format
4717msgid "%s exists and is not a directory"
4718msgstr "%s 存在且不是一个目录"
4719
94550ed3 4720#: builtin/clone.c:391
c04f5ac3
JX
4721#, c-format
4722msgid "failed to stat %s\n"
90e6ef53 4723msgstr "无法枚举 %s 状态\n"
c04f5ac3 4724
94550ed3 4725#: builtin/clone.c:413
c04f5ac3
JX
4726#, c-format
4727msgid "failed to create link '%s'"
90e6ef53 4728msgstr "无法创建链接 '%s'"
c04f5ac3 4729
94550ed3 4730#: builtin/clone.c:417
c04f5ac3
JX
4731#, c-format
4732msgid "failed to copy file to '%s'"
90e6ef53 4733msgstr "无法拷贝文件至 '%s'"
c04f5ac3 4734
94550ed3 4735#: builtin/clone.c:442 builtin/clone.c:626
c04f5ac3
JX
4736#, c-format
4737msgid "done.\n"
4738msgstr "完成。\n"
4739
94550ed3 4740#: builtin/clone.c:454
1003b3a5
JX
4741msgid ""
4742"Clone succeeded, but checkout failed.\n"
4743"You can inspect what was checked out with 'git status'\n"
4744"and retry the checkout with 'git checkout -f HEAD'\n"
4745msgstr ""
4746"克隆成功,但是检出失败。\n"
4747"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4748"'git checkout -f HEAD' 重试\n"
4749
94550ed3 4750#: builtin/clone.c:531
c04f5ac3
JX
4751#, c-format
4752msgid "Could not find remote branch %s to clone."
90e6ef53 4753msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 4754
94550ed3 4755#: builtin/clone.c:621
2e8451e8
JX
4756#, c-format
4757msgid "Checking connectivity... "
4758msgstr "检查连接... "
4759
94550ed3 4760#: builtin/clone.c:624
1003b3a5
JX
4761msgid "remote did not send all necessary objects"
4762msgstr "远程没有发送所有必须的对象"
4763
94550ed3 4764#: builtin/clone.c:688
c04f5ac3
JX
4765msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4766msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4767
94550ed3 4768#: builtin/clone.c:719
1003b3a5
JX
4769msgid "unable to checkout working tree"
4770msgstr "不能检出工作区"
4771
94550ed3 4772#: builtin/clone.c:808
04cb2f28
JX
4773msgid "cannot repack to clean up"
4774msgstr "无法执行 repack 来清理"
4775
94550ed3 4776#: builtin/clone.c:810
04cb2f28
JX
4777msgid "cannot unlink temporary alternates file"
4778msgstr "无法删除临时的 alternates 文件"
4779
94550ed3 4780#: builtin/clone.c:842
c04f5ac3
JX
4781msgid "Too many arguments."
4782msgstr "太多参数。"
4783
94550ed3 4784#: builtin/clone.c:846
c04f5ac3 4785msgid "You must specify a repository to clone."
160fb2b2 4786msgstr "您必须指定一个仓库来克隆。"
c04f5ac3 4787
94550ed3 4788#: builtin/clone.c:857
c04f5ac3
JX
4789#, c-format
4790msgid "--bare and --origin %s options are incompatible."
4791msgstr "--bare 和 --origin %s 选项不兼容。"
4792
94550ed3 4793#: builtin/clone.c:860
07432cef
WS
4794msgid "--bare and --separate-git-dir are incompatible."
4795msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4796
94550ed3 4797#: builtin/clone.c:873
c04f5ac3
JX
4798#, c-format
4799msgid "repository '%s' does not exist"
160fb2b2 4800msgstr "仓库 '%s' 不存在"
c04f5ac3 4801
94550ed3 4802#: builtin/clone.c:879 builtin/fetch.c:1166
cfff71a9
JX
4803#, c-format
4804msgid "depth %s is not a positive number"
4805msgstr "深度 %s 不是一个正数"
4806
94550ed3 4807#: builtin/clone.c:889
c04f5ac3
JX
4808#, c-format
4809msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 4810msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 4811
94550ed3 4812#: builtin/clone.c:899
c04f5ac3
JX
4813#, c-format
4814msgid "working tree '%s' already exists."
4815msgstr "工作区 '%s' 已经存在。"
4816
94550ed3
JX
4817#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
4818#: builtin/worktree.c:221 builtin/worktree.c:248
5bb01d4f
JX
4819#, c-format
4820msgid "could not create leading directories of '%s'"
4821msgstr "不能为 '%s' 创建先导目录"
4822
94550ed3 4823#: builtin/clone.c:917
c04f5ac3 4824#, c-format
814ff314
JX
4825msgid "could not create work tree dir '%s'"
4826msgstr "不能创建工作区目录 '%s'"
c04f5ac3 4827
94550ed3 4828#: builtin/clone.c:935
c04f5ac3
JX
4829#, c-format
4830msgid "Cloning into bare repository '%s'...\n"
160fb2b2 4831msgstr "克隆到纯仓库 '%s'...\n"
c04f5ac3 4832
94550ed3 4833#: builtin/clone.c:937
c04f5ac3
JX
4834#, c-format
4835msgid "Cloning into '%s'...\n"
4836msgstr "正克隆到 '%s'...\n"
4837
94550ed3 4838#: builtin/clone.c:975
6acbf033
JX
4839msgid "--depth is ignored in local clones; use file:// instead."
4840msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4841
94550ed3 4842#: builtin/clone.c:978
6acbf033 4843msgid "source repository is shallow, ignoring --local"
160fb2b2 4844msgstr "源仓库是浅克隆,忽略 --local"
6acbf033 4845
94550ed3 4846#: builtin/clone.c:983
6acbf033
JX
4847msgid "--local is ignored"
4848msgstr "--local 被忽略"
4849
94550ed3 4850#: builtin/clone.c:987
c04f5ac3
JX
4851#, c-format
4852msgid "Don't know how to clone %s"
4853msgstr "不知道如何克隆 %s"
4854
94550ed3 4855#: builtin/clone.c:1036 builtin/clone.c:1044
c04f5ac3
JX
4856#, c-format
4857msgid "Remote branch %s not found in upstream %s"
4858msgstr "远程分支 %s 在上游 %s 未发现"
4859
94550ed3 4860#: builtin/clone.c:1047
c04f5ac3 4861msgid "You appear to have cloned an empty repository."
160fb2b2 4862msgstr "您似乎克隆了一个空仓库。"
c04f5ac3 4863
ef317cd5 4864#: builtin/column.c:9
814ff314
JX
4865msgid "git column [<options>]"
4866msgstr "git column [<选项>]"
ef317cd5
JX
4867
4868#: builtin/column.c:26
4869msgid "lookup config vars"
07432cef 4870msgstr "查找配置变量"
ef317cd5
JX
4871
4872#: builtin/column.c:27 builtin/column.c:28
ef317cd5 4873msgid "layout to use"
07432cef 4874msgstr "要使用的布局"
ef317cd5
JX
4875
4876#: builtin/column.c:29
4877msgid "Maximum width"
07432cef 4878msgstr "最大宽度"
ef317cd5
JX
4879
4880#: builtin/column.c:30
4881msgid "Padding space on left border"
07432cef 4882msgstr "左边框的填充空间"
ef317cd5
JX
4883
4884#: builtin/column.c:31
4885msgid "Padding space on right border"
07432cef 4886msgstr "右边框的填充空间"
ef317cd5
JX
4887
4888#: builtin/column.c:32
4889msgid "Padding space between columns"
07432cef 4890msgstr "两列之间的填充空间"
ef317cd5 4891
8ada9598
JX
4892#: builtin/column.c:51
4893msgid "--command must be the first argument"
81809b99 4894msgstr "--command 必须是第一个参数"
8ada9598 4895
94550ed3 4896#: builtin/commit.c:38
814ff314 4897msgid "git commit [<options>] [--] <pathspec>..."
160fb2b2 4898msgstr "git commit [<选项>] [--] <路径规格>..."
ef317cd5 4899
94550ed3 4900#: builtin/commit.c:43
814ff314 4901msgid "git status [<options>] [--] <pathspec>..."
160fb2b2 4902msgstr "git status [<选项>] [--] <路径规格>..."
ef317cd5 4903
94550ed3 4904#: builtin/commit.c:48
220c313c
JX
4905msgid ""
4906"Your name and email address were configured automatically based\n"
4907"on your username and hostname. Please check that they are accurate.\n"
4908"You can suppress this message by setting them explicitly. Run the\n"
4909"following command and follow the instructions in your editor to edit\n"
4910"your configuration file:\n"
4911"\n"
4912" git config --global --edit\n"
4913"\n"
4914"After doing this, you may fix the identity used for this commit with:\n"
4915"\n"
4916" git commit --amend --reset-author\n"
4917msgstr ""
4918"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4919"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4920"中编辑您的配置文件:\n"
4921"\n"
4922" git config --global --edit\n"
4923"\n"
4924"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4925"\n"
4926" git commit --amend --reset-author\n"
4927
94550ed3 4928#: builtin/commit.c:61
c04f5ac3
JX
4929msgid ""
4930"Your name and email address were configured automatically based\n"
4931"on your username and hostname. Please check that they are accurate.\n"
4932"You can suppress this message by setting them explicitly:\n"
4933"\n"
4934" git config --global user.name \"Your Name\"\n"
4935" git config --global user.email you@example.com\n"
4936"\n"
4937"After doing this, you may fix the identity used for this commit with:\n"
4938"\n"
4939" git commit --amend --reset-author\n"
4940msgstr ""
90e6ef53 4941"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
220c313c 4942"与否。您可以对其进行设置以免再出现本提示信息:\n"
c04f5ac3
JX
4943"\n"
4944" git config --global user.name \"Your Name\"\n"
4945" git config --global user.email you@example.com\n"
4946"\n"
90e6ef53 4947"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
4948"\n"
4949" git commit --amend --reset-author\n"
4950
94550ed3 4951#: builtin/commit.c:73
c04f5ac3
JX
4952msgid ""
4953"You asked to amend the most recent commit, but doing so would make\n"
4954"it empty. You can repeat your command with --allow-empty, or you can\n"
4955"remove the commit entirely with \"git reset HEAD^\".\n"
4956msgstr ""
1b150dc9
T
4957"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4958"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 4959
94550ed3 4960#: builtin/commit.c:78
c04f5ac3
JX
4961msgid ""
4962"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4963"If you wish to commit it anyway, use:\n"
4964"\n"
4965" git commit --allow-empty\n"
4966"\n"
c04f5ac3 4967msgstr ""
a9ce4543
T
4968"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4969"也要提交,使用命令:\n"
c04f5ac3
JX
4970"\n"
4971" git commit --allow-empty\n"
4972"\n"
c04f5ac3 4973
94550ed3 4974#: builtin/commit.c:85
b1894384
JX
4975msgid "Otherwise, please use 'git reset'\n"
4976msgstr "否则,请使用命令 'git reset'\n"
4977
94550ed3 4978#: builtin/commit.c:88
b1894384
JX
4979msgid ""
4980"If you wish to skip this commit, use:\n"
4981"\n"
4982" git reset\n"
4983"\n"
4984"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4985"the remaining commits.\n"
4986msgstr ""
4987"如果您想跳过这个提交,使用命令:\n"
4988"\n"
4989" git reset\n"
4990"\n"
4991"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4992"操作。\n"
4993
94550ed3 4994#: builtin/commit.c:305
c04f5ac3 4995msgid "failed to unpack HEAD tree object"
90e6ef53 4996msgstr "无法解包 HEAD 树对象"
c04f5ac3 4997
94550ed3 4998#: builtin/commit.c:346
c04f5ac3 4999msgid "unable to create temporary index"
90e6ef53 5000msgstr "不能创建临时索引"
c04f5ac3 5001
94550ed3 5002#: builtin/commit.c:352
c04f5ac3
JX
5003msgid "interactive add failed"
5004msgstr "交互式添加失败"
5005
94550ed3 5006#: builtin/commit.c:365
220c313c
JX
5007msgid "unable to update temporary index"
5008msgstr "无法更新临时索引"
5009
94550ed3 5010#: builtin/commit.c:367
220c313c
JX
5011msgid "Failed to update main cache tree"
5012msgstr "不能更新树的主缓存"
5013
94550ed3 5014#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
c04f5ac3 5015msgid "unable to write new_index file"
90e6ef53 5016msgstr "无法写 new_index 文件"
c04f5ac3 5017
94550ed3 5018#: builtin/commit.c:445
8ada9598 5019msgid "cannot do a partial commit during a merge."
81809b99 5020msgstr "在合并过程中不能做部分提交。"
c04f5ac3 5021
94550ed3 5022#: builtin/commit.c:447
8ada9598 5023msgid "cannot do a partial commit during a cherry-pick."
81809b99 5024msgstr "在拣选过程中不能做部分提交。"
8ada9598 5025
94550ed3 5026#: builtin/commit.c:456
c04f5ac3 5027msgid "cannot read the index"
90e6ef53 5028msgstr "无法读取索引"
c04f5ac3 5029
94550ed3 5030#: builtin/commit.c:475
c04f5ac3 5031msgid "unable to write temporary index file"
90e6ef53 5032msgstr "无法写临时索引文件"
c04f5ac3 5033
94550ed3 5034#: builtin/commit.c:580
220c313c
JX
5035#, c-format
5036msgid "commit '%s' lacks author header"
5037msgstr "提交 '%s' 缺少作者信息"
5038
94550ed3 5039#: builtin/commit.c:582
c04f5ac3 5040#, c-format
220c313c
JX
5041msgid "commit '%s' has malformed author line"
5042msgstr "提交 '%s' 有非法的作者信息"
c04f5ac3 5043
94550ed3 5044#: builtin/commit.c:601
c04f5ac3
JX
5045msgid "malformed --author parameter"
5046msgstr "非法的 --author 参数"
5047
94550ed3 5048#: builtin/commit.c:609
c04f5ac3 5049#, c-format
6acbf033
JX
5050msgid "invalid date format: %s"
5051msgstr "无效的日期格式:%s"
5052
94550ed3 5053#: builtin/commit.c:653
6acbf033
JX
5054msgid ""
5055"unable to select a comment character that is not used\n"
5056"in the current commit message"
5057msgstr "无法选择一个未被当前提交说明使用的注释字符"
5058
94550ed3 5059#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
c04f5ac3
JX
5060#, c-format
5061msgid "could not lookup commit %s"
5062msgstr "不能查询提交 %s"
5063
94550ed3 5064#: builtin/commit.c:702 builtin/shortlog.c:273
c04f5ac3
JX
5065#, c-format
5066msgid "(reading log message from standard input)\n"
90e6ef53 5067msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 5068
94550ed3 5069#: builtin/commit.c:704
c04f5ac3 5070msgid "could not read log from standard input"
90e6ef53 5071msgstr "不能从标准输入中读取日志信息"
c04f5ac3 5072
94550ed3 5073#: builtin/commit.c:708
c04f5ac3
JX
5074#, c-format
5075msgid "could not read log file '%s'"
90e6ef53 5076msgstr "不能读取日志文件 '%s'"
c04f5ac3 5077
94550ed3 5078#: builtin/commit.c:730
c04f5ac3 5079msgid "could not read MERGE_MSG"
90e6ef53 5080msgstr "不能读取 MERGE_MSG"
c04f5ac3 5081
94550ed3 5082#: builtin/commit.c:734
c04f5ac3 5083msgid "could not read SQUASH_MSG"
90e6ef53 5084msgstr "不能读取 SQUASH_MSG"
c04f5ac3 5085
94550ed3 5086#: builtin/commit.c:785
c04f5ac3 5087msgid "could not write commit template"
90e6ef53 5088msgstr "不能写提交模版"
c04f5ac3 5089
94550ed3 5090#: builtin/commit.c:803
81809b99 5091#, c-format
c04f5ac3
JX
5092msgid ""
5093"\n"
8ada9598 5094"It looks like you may be committing a merge.\n"
c04f5ac3
JX
5095"If this is not correct, please remove the file\n"
5096"\t%s\n"
5097"and try again.\n"
5098msgstr ""
5099"\n"
649900bc 5100"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
5101"\t%s\n"
5102"然后重试。\n"
5103
94550ed3 5104#: builtin/commit.c:808
81809b99 5105#, c-format
8ada9598
JX
5106msgid ""
5107"\n"
5108"It looks like you may be committing a cherry-pick.\n"
5109"If this is not correct, please remove the file\n"
5110"\t%s\n"
5111"and try again.\n"
5112msgstr ""
5113"\n"
649900bc 5114"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
5115"\t%s\n"
5116"然后重试。\n"
c04f5ac3 5117
94550ed3 5118#: builtin/commit.c:821
a77c07d9 5119#, c-format
c04f5ac3 5120msgid ""
8ada9598 5121"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 5122"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 5123msgstr ""
a77c07d9 5124"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 5125"说明将会终止提交。\n"
c04f5ac3 5126
94550ed3 5127#: builtin/commit.c:828
a77c07d9 5128#, c-format
c04f5ac3 5129msgid ""
8ada9598 5130"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 5131"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
5132"An empty message aborts the commit.\n"
5133msgstr ""
a77c07d9
JX
5134"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
5135"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 5136
90e6ef53 5137# 译者:为保证在输出中对齐,注意调整句中空格!
94550ed3 5138#: builtin/commit.c:848
6acbf033
JX
5139#, c-format
5140msgid "%sAuthor: %.*s <%.*s>"
5141msgstr "%s作者: %.*s <%.*s>"
5142
5143# 译者:为保证在输出中对齐,注意调整句中空格!
94550ed3 5144#: builtin/commit.c:856
c04f5ac3 5145#, c-format
6acbf033
JX
5146msgid "%sDate: %s"
5147msgstr "%s日期: %s"
c04f5ac3 5148
90e6ef53 5149# 译者:为保证在输出中对齐,注意调整句中空格!
94550ed3 5150#: builtin/commit.c:863
c04f5ac3 5151#, c-format
6acbf033
JX
5152msgid "%sCommitter: %.*s <%.*s>"
5153msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 5154
94550ed3 5155#: builtin/commit.c:881
c04f5ac3 5156msgid "Cannot read index"
90e6ef53 5157msgstr "无法读取索引"
c04f5ac3 5158
94550ed3 5159#: builtin/commit.c:938
c04f5ac3
JX
5160msgid "Error building trees"
5161msgstr "无法创建树对象"
5162
94550ed3 5163#: builtin/commit.c:953 builtin/tag.c:266
c04f5ac3
JX
5164#, c-format
5165msgid "Please supply the message using either -m or -F option.\n"
07432cef 5166msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 5167
94550ed3 5168#: builtin/commit.c:1055
c04f5ac3 5169#, c-format
814ff314
JX
5170msgid "--author '%s' is not 'Name <email>' and matches no existing author"
5171msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 5172
94550ed3 5173#: builtin/commit.c:1070 builtin/commit.c:1310
c04f5ac3
JX
5174#, c-format
5175msgid "Invalid untracked files mode '%s'"
90e6ef53 5176msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 5177
94550ed3 5178#: builtin/commit.c:1107
2e8451e8
JX
5179msgid "--long and -z are incompatible"
5180msgstr "--long 和 -z 选项不兼容"
5181
94550ed3 5182#: builtin/commit.c:1137
c04f5ac3
JX
5183msgid "Using both --reset-author and --author does not make sense"
5184msgstr "同时使用 --reset-author 和 --author 没有意义"
5185
94550ed3 5186#: builtin/commit.c:1146
c04f5ac3 5187msgid "You have nothing to amend."
90e6ef53 5188msgstr "您没有可修补的提交。"
c04f5ac3 5189
94550ed3 5190#: builtin/commit.c:1149
8ada9598 5191msgid "You are in the middle of a merge -- cannot amend."
81809b99 5192msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 5193
94550ed3 5194#: builtin/commit.c:1151
8ada9598 5195msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 5196msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 5197
94550ed3 5198#: builtin/commit.c:1154
c04f5ac3 5199msgid "Options --squash and --fixup cannot be used together"
649900bc 5200msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 5201
94550ed3 5202#: builtin/commit.c:1164
c04f5ac3
JX
5203msgid "Only one of -c/-C/-F/--fixup can be used."
5204msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
5205
94550ed3 5206#: builtin/commit.c:1166
c04f5ac3 5207msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 5208msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 5209
94550ed3 5210#: builtin/commit.c:1174
c04f5ac3 5211msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 5212msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 5213
94550ed3 5214#: builtin/commit.c:1191
c04f5ac3
JX
5215msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
5216msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
5217
94550ed3 5218#: builtin/commit.c:1193
c04f5ac3
JX
5219msgid "No paths with --include/--only does not make sense."
5220msgstr "参数 --include/--only 不跟路径没有意义。"
5221
94550ed3 5222#: builtin/commit.c:1195
c04f5ac3 5223msgid "Clever... amending the last one with dirty index."
160fb2b2 5224msgstr "聪明... 用脏索引修补最后一个提交。"
c04f5ac3 5225
94550ed3 5226#: builtin/commit.c:1197
6c94aba5
JX
5227msgid "Explicit paths specified without -i or -o; assuming --only paths..."
5228msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
c04f5ac3 5229
94550ed3 5230#: builtin/commit.c:1209 builtin/tag.c:475
c04f5ac3
JX
5231#, c-format
5232msgid "Invalid cleanup mode %s"
5233msgstr "无效的清理模式 %s"
5234
94550ed3 5235#: builtin/commit.c:1214
c04f5ac3 5236msgid "Paths with -a does not make sense."
649900bc 5237msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 5238
94550ed3 5239#: builtin/commit.c:1324 builtin/commit.c:1605
ef317cd5 5240msgid "show status concisely"
07432cef 5241msgstr "以简洁的格式显示状态"
ef317cd5 5242
94550ed3 5243#: builtin/commit.c:1326 builtin/commit.c:1607
ef317cd5 5244msgid "show branch information"
07432cef 5245msgstr "显示分支信息"
ef317cd5 5246
94550ed3
JX
5247#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546
5248#: builtin/worktree.c:423
ef317cd5 5249msgid "machine-readable output"
07432cef
WS
5250msgstr "机器可读的输出"
5251
94550ed3 5252#: builtin/commit.c:1331 builtin/commit.c:1611
07432cef
WS
5253msgid "show status in long format (default)"
5254msgstr "以长格式显示状态(默认)"
ef317cd5 5255
94550ed3 5256#: builtin/commit.c:1334 builtin/commit.c:1614
ef317cd5 5257msgid "terminate entries with NUL"
4375c10e 5258msgstr "条目以 NUL 字符结尾"
ef317cd5 5259
94550ed3
JX
5260#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
5261#: builtin/fast-export.c:984 builtin/tag.c:353
ef317cd5 5262msgid "mode"
07432cef 5263msgstr "模式"
ef317cd5 5264
94550ed3 5265#: builtin/commit.c:1337 builtin/commit.c:1617
ef317cd5 5266msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 5267msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 5268
94550ed3 5269#: builtin/commit.c:1340
ef317cd5 5270msgid "show ignored files"
07432cef 5271msgstr "显示忽略的文件"
ef317cd5 5272
94550ed3 5273#: builtin/commit.c:1341 parse-options.h:155
ef317cd5
JX
5274msgid "when"
5275msgstr "何时"
5276
94550ed3 5277#: builtin/commit.c:1342
ef317cd5
JX
5278msgid ""
5279"ignore changes to submodules, optional when: all, dirty, untracked. "
5280"(Default: all)"
5281msgstr ""
07432cef 5282"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 5283
94550ed3 5284#: builtin/commit.c:1344
ef317cd5 5285msgid "list untracked files in columns"
07432cef 5286msgstr "以列的方式显示未跟踪的文件"
ef317cd5 5287
94550ed3 5288#: builtin/commit.c:1430
c04f5ac3
JX
5289msgid "couldn't look up newly created commit"
5290msgstr "无法找到新创建的提交"
5291
94550ed3 5292#: builtin/commit.c:1432
c04f5ac3 5293msgid "could not parse newly created commit"
90e6ef53 5294msgstr "不能解析新创建的提交"
c04f5ac3 5295
94550ed3 5296#: builtin/commit.c:1477
c04f5ac3
JX
5297msgid "detached HEAD"
5298msgstr "分离头指针"
5299
7e238ab7 5300# 译者:中文字符串拼接,可删除前导空格
94550ed3 5301#: builtin/commit.c:1480
c04f5ac3 5302msgid " (root-commit)"
7e238ab7 5303msgstr "(根提交)"
c04f5ac3 5304
94550ed3 5305#: builtin/commit.c:1575
ef317cd5 5306msgid "suppress summary after successful commit"
07432cef 5307msgstr "提交成功后不显示概述信息"
c04f5ac3 5308
94550ed3 5309#: builtin/commit.c:1576
ef317cd5 5310msgid "show diff in commit message template"
07432cef 5311msgstr "在提交说明模板里显示差异"
c04f5ac3 5312
94550ed3 5313#: builtin/commit.c:1578
ef317cd5 5314msgid "Commit message options"
07432cef 5315msgstr "提交说明选项"
c04f5ac3 5316
94550ed3 5317#: builtin/commit.c:1579 builtin/tag.c:351
ef317cd5 5318msgid "read message from file"
07432cef 5319msgstr "从文件中读取提交说明"
c04f5ac3 5320
94550ed3 5321#: builtin/commit.c:1580
ef317cd5 5322msgid "author"
07432cef 5323msgstr "作者"
c04f5ac3 5324
94550ed3 5325#: builtin/commit.c:1580
ef317cd5 5326msgid "override author for commit"
07432cef 5327msgstr "提交时覆盖作者"
73a60cd2 5328
94550ed3 5329#: builtin/commit.c:1581 builtin/gc.c:326
ef317cd5 5330msgid "date"
07432cef 5331msgstr "日期"
c04f5ac3 5332
94550ed3 5333#: builtin/commit.c:1581
ef317cd5 5334msgid "override date for commit"
07432cef 5335msgstr "提交时覆盖日期"
c04f5ac3 5336
94550ed3
JX
5337#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
5338#: builtin/notes.c:555 builtin/tag.c:349
ef317cd5 5339msgid "message"
07432cef 5340msgstr "说明"
c04f5ac3 5341
94550ed3 5342#: builtin/commit.c:1582
ef317cd5 5343msgid "commit message"
07432cef 5344msgstr "提交说明"
ef317cd5 5345
94550ed3
JX
5346#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
5347#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
5348msgid "commit"
5349msgstr "提交"
5350
5351#: builtin/commit.c:1583
ef317cd5 5352msgid "reuse and edit message from specified commit"
07432cef 5353msgstr "重用并编辑指定提交的提交说明"
ef317cd5 5354
94550ed3 5355#: builtin/commit.c:1584
ef317cd5 5356msgid "reuse message from specified commit"
07432cef 5357msgstr "重用指定提交的提交说明"
ef317cd5 5358
94550ed3 5359#: builtin/commit.c:1585
ef317cd5 5360msgid "use autosquash formatted message to fixup specified commit"
07432cef 5361msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 5362
94550ed3 5363#: builtin/commit.c:1586
ef317cd5 5364msgid "use autosquash formatted message to squash specified commit"
07432cef 5365msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 5366
94550ed3 5367#: builtin/commit.c:1587
ef317cd5 5368msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 5369msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 5370
94550ed3 5371#: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86
ef317cd5 5372msgid "add Signed-off-by:"
07432cef 5373msgstr "添加 Signed-off-by: 签名"
ef317cd5 5374
94550ed3 5375#: builtin/commit.c:1589
ef317cd5 5376msgid "use specified template file"
07432cef 5377msgstr "使用指定的模板文件"
ef317cd5 5378
94550ed3 5379#: builtin/commit.c:1590
ef317cd5 5380msgid "force edit of commit"
07432cef 5381msgstr "强制编辑提交"
ef317cd5 5382
07432cef 5383# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
94550ed3 5384#: builtin/commit.c:1591
ef317cd5 5385msgid "default"
07432cef 5386msgstr "default"
ef317cd5 5387
94550ed3 5388#: builtin/commit.c:1591 builtin/tag.c:354
ef317cd5 5389msgid "how to strip spaces and #comments from message"
07432cef 5390msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 5391
94550ed3 5392#: builtin/commit.c:1592
ef317cd5 5393msgid "include status in commit message template"
07432cef 5394msgstr "在提交说明模板里包含状态信息"
ef317cd5 5395
94550ed3 5396#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
1b7f4a34 5397#: builtin/revert.c:93
ef317cd5 5398msgid "GPG sign commit"
07432cef 5399msgstr "GPG 提交签名"
ef317cd5 5400
94550ed3 5401#: builtin/commit.c:1597
ef317cd5 5402msgid "Commit contents options"
07432cef 5403msgstr "提交内容选项"
ef317cd5 5404
94550ed3 5405#: builtin/commit.c:1598
ef317cd5 5406msgid "commit all changed files"
07432cef 5407msgstr "提交所有改动的文件"
ef317cd5 5408
94550ed3 5409#: builtin/commit.c:1599
ef317cd5 5410msgid "add specified files to index for commit"
07432cef 5411msgstr "添加指定的文件到索引区等待提交"
ef317cd5 5412
94550ed3 5413#: builtin/commit.c:1600
ef317cd5 5414msgid "interactively add files"
07432cef 5415msgstr "交互式添加文件"
ef317cd5 5416
94550ed3 5417#: builtin/commit.c:1601
ef317cd5 5418msgid "interactively add changes"
07432cef 5419msgstr "交互式添加变更"
ef317cd5 5420
94550ed3 5421#: builtin/commit.c:1602
ef317cd5 5422msgid "commit only specified files"
07432cef 5423msgstr "只提交指定的文件"
ef317cd5 5424
94550ed3 5425#: builtin/commit.c:1603
ef317cd5 5426msgid "bypass pre-commit hook"
07432cef 5427msgstr "绕过 pre-commit 钩子"
ef317cd5 5428
94550ed3 5429#: builtin/commit.c:1604
ef317cd5 5430msgid "show what would be committed"
07432cef 5431msgstr "显示将要提交的内容"
ef317cd5 5432
94550ed3 5433#: builtin/commit.c:1615
ef317cd5 5434msgid "amend previous commit"
07432cef 5435msgstr "修改先前的提交"
ef317cd5 5436
94550ed3 5437#: builtin/commit.c:1616
ef317cd5 5438msgid "bypass post-rewrite hook"
07432cef 5439msgstr "绕过 post-rewrite 钩子"
ef317cd5 5440
94550ed3 5441#: builtin/commit.c:1621
ef317cd5 5442msgid "ok to record an empty change"
07432cef 5443msgstr "允许一个空提交"
ef317cd5 5444
94550ed3 5445#: builtin/commit.c:1623
ef317cd5 5446msgid "ok to record a change with an empty message"
07432cef 5447msgstr "允许空的提交说明"
ef317cd5 5448
94550ed3 5449#: builtin/commit.c:1652
c04f5ac3 5450msgid "could not parse HEAD commit"
90e6ef53 5451msgstr "不能解析 HEAD 提交"
c04f5ac3 5452
94550ed3 5453#: builtin/commit.c:1698
c04f5ac3
JX
5454#, c-format
5455msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 5456msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 5457
94550ed3 5458#: builtin/commit.c:1705
c04f5ac3 5459msgid "could not read MERGE_MODE"
90e6ef53 5460msgstr "不能读取 MERGE_MODE"
c04f5ac3 5461
94550ed3 5462#: builtin/commit.c:1724
c04f5ac3
JX
5463#, c-format
5464msgid "could not read commit message: %s"
90e6ef53 5465msgstr "不能读取提交说明:%s"
c04f5ac3 5466
94550ed3 5467#: builtin/commit.c:1735
73a60cd2
JX
5468#, c-format
5469msgid "Aborting commit; you did not edit the message.\n"
5470msgstr "终止提交;您未更改来自模版的提交说明。\n"
5471
94550ed3 5472#: builtin/commit.c:1740
c04f5ac3
JX
5473#, c-format
5474msgid "Aborting commit due to empty commit message.\n"
5475msgstr "终止提交因为提交说明为空。\n"
5476
94550ed3 5477#: builtin/commit.c:1788
c04f5ac3
JX
5478msgid ""
5479"Repository has been updated, but unable to write\n"
220c313c 5480"new_index file. Check that disk is not full and quota is\n"
c04f5ac3
JX
5481"not exceeded, and then \"git reset HEAD\" to recover."
5482msgstr ""
160fb2b2 5483"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
90e6ef53 5484"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 5485
90314792 5486#: builtin/config.c:8
814ff314
JX
5487msgid "git config [<options>]"
5488msgstr "git config [<选项>]"
ef317cd5 5489
1b7f4a34 5490#: builtin/config.c:54
ef317cd5 5491msgid "Config file location"
07432cef 5492msgstr "配置文件位置"
ef317cd5 5493
1b7f4a34 5494#: builtin/config.c:55
ef317cd5 5495msgid "use global config file"
07432cef 5496msgstr "使用全局配置文件"
ef317cd5 5497
1b7f4a34 5498#: builtin/config.c:56
ef317cd5 5499msgid "use system config file"
07432cef 5500msgstr "使用系统级配置文件"
ef317cd5 5501
1b7f4a34 5502#: builtin/config.c:57
ef317cd5 5503msgid "use repository config file"
160fb2b2 5504msgstr "使用仓库级配置文件"
ef317cd5 5505
1b7f4a34 5506#: builtin/config.c:58
ef317cd5 5507msgid "use given config file"
07432cef 5508msgstr "使用指定的配置文件"
ef317cd5 5509
1b7f4a34 5510#: builtin/config.c:59
2e8451e8 5511msgid "blob-id"
4375c10e 5512msgstr "数据对象 ID"
2e8451e8 5513
1b7f4a34 5514#: builtin/config.c:59
2e8451e8
JX
5515msgid "read config from given blob object"
5516msgstr "从给定的数据对象读取配置"
5517
1b7f4a34 5518#: builtin/config.c:60
ef317cd5 5519msgid "Action"
07432cef 5520msgstr "操作"
ef317cd5 5521
1b7f4a34 5522#: builtin/config.c:61
ef317cd5 5523msgid "get value: name [value-regex]"
07432cef 5524msgstr "获取值:name [value-regex]"
ef317cd5 5525
1b7f4a34 5526#: builtin/config.c:62
ef317cd5 5527msgid "get all values: key [value-regex]"
07432cef 5528msgstr "获得所有的值:key [value-regex]"
ef317cd5 5529
1b7f4a34 5530#: builtin/config.c:63
ef317cd5 5531msgid "get values for regexp: name-regex [value-regex]"
07432cef 5532msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 5533
1b7f4a34 5534#: builtin/config.c:64
90314792
JX
5535msgid "get value specific for the URL: section[.var] URL"
5536msgstr "获得 URL 取值:section[.var] URL"
5537
1b7f4a34 5538#: builtin/config.c:65
ef317cd5 5539msgid "replace all matching variables: name value [value_regex]"
07432cef 5540msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 5541
1b7f4a34 5542#: builtin/config.c:66
ef317cd5 5543msgid "add a new variable: name value"
07432cef 5544msgstr "添加一个新的变量:name value"
ef317cd5 5545
1b7f4a34 5546#: builtin/config.c:67
ef317cd5 5547msgid "remove a variable: name [value-regex]"
07432cef 5548msgstr "删除一个变量:name [value-regex]"
ef317cd5 5549
1b7f4a34 5550#: builtin/config.c:68
ef317cd5 5551msgid "remove all matches: name [value-regex]"
07432cef 5552msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 5553
1b7f4a34 5554#: builtin/config.c:69
ef317cd5 5555msgid "rename section: old-name new-name"
07432cef 5556msgstr "重命名小节:old-name new-name"
ef317cd5 5557
1b7f4a34 5558#: builtin/config.c:70
ef317cd5 5559msgid "remove a section: name"
07432cef 5560msgstr "删除一个小节:name"
ef317cd5 5561
1b7f4a34 5562#: builtin/config.c:71
ef317cd5 5563msgid "list all"
07432cef 5564msgstr "列出所有"
ef317cd5 5565
1b7f4a34 5566#: builtin/config.c:72
ef317cd5 5567msgid "open an editor"
07432cef 5568msgstr "打开一个编辑器"
ef317cd5 5569
1b7f4a34 5570#: builtin/config.c:73
04cb2f28
JX
5571msgid "find the color configured: slot [default]"
5572msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 5573
1b7f4a34 5574#: builtin/config.c:74
04cb2f28
JX
5575msgid "find the color setting: slot [stdout-is-tty]"
5576msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 5577
1b7f4a34 5578#: builtin/config.c:75
ef317cd5 5579msgid "Type"
07432cef 5580msgstr "类型"
ef317cd5 5581
1b7f4a34 5582#: builtin/config.c:76
ef317cd5 5583msgid "value is \"true\" or \"false\""
07432cef 5584msgstr "值是 \"true\" 或 \"false\""
ef317cd5 5585
1b7f4a34 5586#: builtin/config.c:77
ef317cd5 5587msgid "value is decimal number"
07432cef 5588msgstr "值是十进制数"
ef317cd5 5589
1b7f4a34 5590#: builtin/config.c:78
ef317cd5 5591msgid "value is --bool or --int"
07432cef 5592msgstr "值是 --bool or --int"
ef317cd5 5593
1b7f4a34 5594#: builtin/config.c:79
ef317cd5 5595msgid "value is a path (file or directory name)"
07432cef 5596msgstr "值是一个路径(文件或目录名)"
ef317cd5 5597
1b7f4a34 5598#: builtin/config.c:80
ef317cd5 5599msgid "Other"
07432cef 5600msgstr "其它"
ef317cd5 5601
1b7f4a34 5602#: builtin/config.c:81
ef317cd5 5603msgid "terminate values with NUL byte"
4375c10e 5604msgstr "终止值是 NUL 字节"
ef317cd5 5605
1b7f4a34
JX
5606#: builtin/config.c:82
5607msgid "show variable names only"
5608msgstr "只显示变量名"
5609
5610#: builtin/config.c:83
ef317cd5 5611msgid "respect include directives on lookup"
07432cef 5612msgstr "查询时参照 include 指令递归查找"
ef317cd5 5613
94550ed3 5614#: builtin/config.c:303
220c313c 5615msgid "unable to parse default color value"
160fb2b2 5616msgstr "不能解析默认颜色值"
220c313c 5617
94550ed3 5618#: builtin/config.c:441
220c313c
JX
5619#, c-format
5620msgid ""
5621"# This is Git's per-user configuration file.\n"
7aea43ff 5622"[user]\n"
220c313c 5623"# Please adapt and uncomment the following lines:\n"
7aea43ff 5624"#\tname = %s\n"
220c313c
JX
5625"#\temail = %s\n"
5626msgstr ""
5627"# This is Git's per-user configuration file.\n"
7aea43ff 5628"[user]\n"
220c313c 5629"# Please adapt and uncomment the following lines:\n"
7aea43ff 5630"#\tname = %s\n"
220c313c
JX
5631"#\temail = %s\n"
5632
94550ed3 5633#: builtin/config.c:575
220c313c
JX
5634#, c-format
5635msgid "cannot create configuration file %s"
5636msgstr "不能创建配置文件 %s"
5637
94550ed3 5638#: builtin/count-objects.c:77
4dcdc3d8
JX
5639msgid "git count-objects [-v] [-H | --human-readable]"
5640msgstr "git count-objects [-v] [-H | --human-readable]"
5641
94550ed3 5642#: builtin/count-objects.c:87
4dcdc3d8
JX
5643msgid "print sizes in human readable format"
5644msgstr "以用户可读的格式显示大小"
ef317cd5 5645
220c313c 5646#: builtin/describe.c:17
814ff314
JX
5647msgid "git describe [<options>] [<commit-ish>...]"
5648msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 5649
220c313c 5650#: builtin/describe.c:18
814ff314
JX
5651msgid "git describe [<options>] --dirty"
5652msgstr "git describe [<选项>] --dirty"
ef317cd5 5653
220c313c 5654#: builtin/describe.c:217
c04f5ac3
JX
5655#, c-format
5656msgid "annotated tag %s not available"
55a16ee4 5657msgstr "附注标签 %s 无效"
c04f5ac3 5658
220c313c 5659#: builtin/describe.c:221
c04f5ac3
JX
5660#, c-format
5661msgid "annotated tag %s has no embedded name"
55a16ee4 5662msgstr "附注标签 %s 没有嵌入名称"
c04f5ac3 5663
220c313c 5664#: builtin/describe.c:223
c04f5ac3
JX
5665#, c-format
5666msgid "tag '%s' is really '%s' here"
55a16ee4 5667msgstr "标签 '%s' 的确是在 '%s'"
c04f5ac3 5668
1b7f4a34 5669#: builtin/describe.c:250 builtin/log.c:459
c04f5ac3
JX
5670#, c-format
5671msgid "Not a valid object name %s"
5672msgstr "不是一个有效的对象名 %s"
5673
220c313c 5674#: builtin/describe.c:253
c04f5ac3
JX
5675#, c-format
5676msgid "%s is not a valid '%s' object"
5677msgstr "%s 不是一个有效的 '%s' 对象"
5678
220c313c 5679#: builtin/describe.c:270
c04f5ac3
JX
5680#, c-format
5681msgid "no tag exactly matches '%s'"
55a16ee4 5682msgstr "没有标签准确匹配 '%s'"
c04f5ac3 5683
220c313c 5684#: builtin/describe.c:272
c04f5ac3
JX
5685#, c-format
5686msgid "searching to describe %s\n"
5687msgstr "搜索描述 %s\n"
5688
220c313c 5689#: builtin/describe.c:319
c04f5ac3
JX
5690#, c-format
5691msgid "finished search at %s\n"
5692msgstr "完成搜索 %s\n"
5693
220c313c 5694#: builtin/describe.c:346
c04f5ac3
JX
5695#, c-format
5696msgid ""
5697"No annotated tags can describe '%s'.\n"
5698"However, there were unannotated tags: try --tags."
5699msgstr ""
55a16ee4
RC
5700"没有附注标签能描述 '%s'。\n"
5701"然而,存在未附注标签:尝试 --tags。"
c04f5ac3 5702
220c313c 5703#: builtin/describe.c:350
c04f5ac3
JX
5704#, c-format
5705msgid ""
5706"No tags can describe '%s'.\n"
5707"Try --always, or create some tags."
5708msgstr ""
55a16ee4
RC
5709"没有标签能描述 '%s'。\n"
5710"尝试 --always,或者创建一些标签。"
c04f5ac3 5711
220c313c 5712#: builtin/describe.c:371
c04f5ac3
JX
5713#, c-format
5714msgid "traversed %lu commits\n"
5715msgstr "已遍历 %lu 个提交\n"
5716
220c313c 5717#: builtin/describe.c:374
c04f5ac3
JX
5718#, c-format
5719msgid ""
5720"more than %i tags found; listed %i most recent\n"
5721"gave up search at %s\n"
5722msgstr ""
55a16ee4 5723"发现多于 %i 个标签,列出最近的 %i 个\n"
90e6ef53 5724"在 %s 放弃搜索\n"
c04f5ac3 5725
220c313c 5726#: builtin/describe.c:396
ef317cd5 5727msgid "find the tag that comes after the commit"
55a16ee4 5728msgstr "寻找该提交之后的标签"
ef317cd5 5729
220c313c 5730#: builtin/describe.c:397
ef317cd5 5731msgid "debug search strategy on stderr"
07432cef 5732msgstr "在标准错误上调试搜索策略"
ef317cd5 5733
220c313c 5734#: builtin/describe.c:398
1003b3a5
JX
5735msgid "use any ref"
5736msgstr "使用任意引用"
5737
220c313c 5738#: builtin/describe.c:399
1003b3a5 5739msgid "use any tag, even unannotated"
55a16ee4 5740msgstr "使用任意标签,即使未附带注释"
ef317cd5 5741
220c313c 5742#: builtin/describe.c:400
ef317cd5 5743msgid "always use long format"
07432cef 5744msgstr "始终使用长提交号格式"
ef317cd5 5745
220c313c 5746#: builtin/describe.c:401
2e8451e8
JX
5747msgid "only follow first parent"
5748msgstr "只跟随第一个父提交"
5749
220c313c 5750#: builtin/describe.c:404
ef317cd5 5751msgid "only output exact matches"
07432cef 5752msgstr "只输出精确匹配"
ef317cd5 5753
220c313c 5754#: builtin/describe.c:406
ef317cd5 5755msgid "consider <n> most recent tags (default: 10)"
55a16ee4 5756msgstr "考虑最近 <n> 个标签(默认:10)"
ef317cd5 5757
220c313c 5758#: builtin/describe.c:408
ef317cd5 5759msgid "only consider tags matching <pattern>"
55a16ee4 5760msgstr "只考虑匹配 <模式> 的标签"
ef317cd5 5761
94550ed3 5762#: builtin/describe.c:410 builtin/name-rev.c:314
ef317cd5 5763msgid "show abbreviated commit object as fallback"
07432cef 5764msgstr "显示简写的提交号作为后备"
ef317cd5 5765
220c313c 5766#: builtin/describe.c:411
ef317cd5 5767msgid "mark"
07432cef 5768msgstr "标记"
ef317cd5 5769
220c313c 5770#: builtin/describe.c:412
ef317cd5 5771msgid "append <mark> on dirty working tree (default: \"-dirty\")"
160fb2b2 5772msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
ef317cd5 5773
220c313c 5774#: builtin/describe.c:430
c04f5ac3
JX
5775msgid "--long is incompatible with --abbrev=0"
5776msgstr "--long 与 --abbrev=0 不兼容"
5777
220c313c 5778#: builtin/describe.c:456
c04f5ac3 5779msgid "No names found, cannot describe anything."
90e6ef53 5780msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 5781
220c313c 5782#: builtin/describe.c:476
a8a5406a 5783msgid "--dirty is incompatible with commit-ishes"
649900bc 5784msgstr "--dirty 不能与提交同时使用"
c04f5ac3 5785
220c313c 5786#: builtin/diff.c:86
c04f5ac3
JX
5787#, c-format
5788msgid "'%s': not a regular file or symlink"
5789msgstr "'%s':不是一个正规文件或符号链接"
5790
220c313c 5791#: builtin/diff.c:237
c04f5ac3
JX
5792#, c-format
5793msgid "invalid option: %s"
5794msgstr "无效选项:%s"
5795
220c313c 5796#: builtin/diff.c:358
c04f5ac3 5797msgid "Not a git repository"
160fb2b2 5798msgstr "不是一个 git 仓库"
c04f5ac3 5799
220c313c 5800#: builtin/diff.c:401
c04f5ac3
JX
5801#, c-format
5802msgid "invalid object '%s' given."
5803msgstr "提供了无效对象 '%s'。"
5804
220c313c 5805#: builtin/diff.c:410
c04f5ac3
JX
5806#, c-format
5807msgid "more than two blobs given: '%s'"
160fb2b2 5808msgstr "提供了超过两个数据对象:'%s'"
c04f5ac3 5809
220c313c 5810#: builtin/diff.c:417
c04f5ac3
JX
5811#, c-format
5812msgid "unhandled object '%s' given."
6c94aba5 5813msgstr "无法处理的对象 '%s'。"
c04f5ac3 5814
1b7f4a34 5815#: builtin/fast-export.c:25
ef317cd5 5816msgid "git fast-export [rev-list-opts]"
07432cef 5817msgstr "git fast-export [rev-list-opts]"
ef317cd5 5818
1b7f4a34 5819#: builtin/fast-export.c:980
ef317cd5 5820msgid "show progress after <n> objects"
07432cef 5821msgstr "在 <n> 个对象之后显示进度"
ef317cd5 5822
1b7f4a34 5823#: builtin/fast-export.c:982
ef317cd5 5824msgid "select handling of signed tags"
55a16ee4 5825msgstr "选择如何处理签名标签"
ef317cd5 5826
1b7f4a34 5827#: builtin/fast-export.c:985
ef317cd5 5828msgid "select handling of tags that tag filtered objects"
55a16ee4 5829msgstr "选择当标签指向被过滤对象时该标签的处理方式"
ef317cd5 5830
1b7f4a34 5831#: builtin/fast-export.c:988
ef317cd5 5832msgid "Dump marks to this file"
07432cef 5833msgstr "把标记存储到这个文件"
ef317cd5 5834
1b7f4a34 5835#: builtin/fast-export.c:990
ef317cd5 5836msgid "Import marks from this file"
07432cef 5837msgstr "从这个文件导入标记"
ef317cd5 5838
1b7f4a34 5839#: builtin/fast-export.c:992
ef317cd5 5840msgid "Fake a tagger when tags lack one"
55a16ee4 5841msgstr "当标签缺少标记者字段时,假装提供一个"
ef317cd5 5842
1b7f4a34 5843#: builtin/fast-export.c:994
ef317cd5 5844msgid "Output full tree for each commit"
07432cef 5845msgstr "每次提交都输出整个树"
ef317cd5 5846
1b7f4a34 5847#: builtin/fast-export.c:996
ef317cd5 5848msgid "Use the done feature to terminate the stream"
07432cef 5849msgstr "使用 done 功能来终止流"
ef317cd5 5850
1b7f4a34 5851#: builtin/fast-export.c:997
ef317cd5 5852msgid "Skip output of blob data"
07432cef 5853msgstr "跳过数据对象的输出"
ef317cd5 5854
1b7f4a34 5855#: builtin/fast-export.c:998
6acbf033 5856msgid "refspec"
160fb2b2 5857msgstr "引用规格"
6acbf033 5858
1b7f4a34 5859#: builtin/fast-export.c:999
6acbf033 5860msgid "Apply refspec to exported refs"
160fb2b2 5861msgstr "对导出的引用应用引用规格"
6acbf033 5862
1b7f4a34 5863#: builtin/fast-export.c:1000
220c313c
JX
5864msgid "anonymize output"
5865msgstr "匿名输出"
5866
1b7f4a34 5867#: builtin/fetch.c:20
ef317cd5 5868msgid "git fetch [<options>] [<repository> [<refspec>...]]"
160fb2b2 5869msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
ef317cd5 5870
1b7f4a34 5871#: builtin/fetch.c:21
ef317cd5 5872msgid "git fetch [<options>] <group>"
07432cef 5873msgstr "git fetch [<选项>] <组>"
ef317cd5 5874
1b7f4a34 5875#: builtin/fetch.c:22
ef317cd5 5876msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
160fb2b2 5877msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
ef317cd5 5878
1b7f4a34 5879#: builtin/fetch.c:23
ef317cd5 5880msgid "git fetch --all [<options>]"
07432cef 5881msgstr "git fetch --all [<选项>]"
ef317cd5 5882
1b7f4a34 5883#: builtin/fetch.c:90 builtin/pull.c:162
ef317cd5 5884msgid "fetch from all remotes"
07432cef 5885msgstr "从所有的远程抓取"
ef317cd5 5886
1b7f4a34 5887#: builtin/fetch.c:92 builtin/pull.c:165
ef317cd5 5888msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 5889msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 5890
1b7f4a34 5891#: builtin/fetch.c:94 builtin/pull.c:168
ef317cd5 5892msgid "path to upload pack on remote end"
07432cef 5893msgstr "上传包到远程的路径"
ef317cd5 5894
1b7f4a34 5895#: builtin/fetch.c:95 builtin/pull.c:170
ef317cd5 5896msgid "force overwrite of local branch"
07432cef 5897msgstr "强制覆盖本地分支"
ef317cd5 5898
1b7f4a34 5899#: builtin/fetch.c:97
ef317cd5 5900msgid "fetch from multiple remotes"
07432cef 5901msgstr "从多个远程抓取"
ef317cd5 5902
1b7f4a34 5903#: builtin/fetch.c:99 builtin/pull.c:172
ef317cd5 5904msgid "fetch all tags and associated objects"
55a16ee4 5905msgstr "抓取所有的标签和关联对象"
ef317cd5 5906
1b7f4a34 5907#: builtin/fetch.c:101
ef317cd5 5908msgid "do not fetch all tags (--no-tags)"
55a16ee4 5909msgstr "不抓取任何标签(--no-tags)"
ef317cd5 5910
1b7f4a34 5911#: builtin/fetch.c:103 builtin/pull.c:175
ef317cd5 5912msgid "prune remote-tracking branches no longer on remote"
07432cef 5913msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 5914
07432cef 5915# 译者:可选值,不能翻译
1b7f4a34 5916#: builtin/fetch.c:104 builtin/pull.c:178
ef317cd5 5917msgid "on-demand"
07432cef 5918msgstr "on-demand"
ef317cd5 5919
1b7f4a34 5920#: builtin/fetch.c:105 builtin/pull.c:179
ef317cd5 5921msgid "control recursive fetching of submodules"
07432cef 5922msgstr "控制子模组的递归抓取"
ef317cd5 5923
1b7f4a34 5924#: builtin/fetch.c:109 builtin/pull.c:184
ef317cd5 5925msgid "keep downloaded pack"
07432cef 5926msgstr "保持下载包"
ef317cd5 5927
1b7f4a34 5928#: builtin/fetch.c:111
ef317cd5 5929msgid "allow updating of HEAD ref"
07432cef 5930msgstr "允许更新 HEAD 引用"
ef317cd5 5931
1b7f4a34 5932#: builtin/fetch.c:114 builtin/pull.c:187
ef317cd5 5933msgid "deepen history of shallow clone"
07432cef 5934msgstr "深化浅克隆的历史"
ef317cd5 5935
1b7f4a34 5936#: builtin/fetch.c:116 builtin/pull.c:190
a77c07d9 5937msgid "convert to a complete repository"
160fb2b2 5938msgstr "转换为一个完整的仓库"
a77c07d9 5939
94550ed3 5940#: builtin/fetch.c:118 builtin/log.c:1232
ef317cd5 5941msgid "dir"
07432cef 5942msgstr "目录"
ef317cd5 5943
1b7f4a34 5944#: builtin/fetch.c:119
ef317cd5 5945msgid "prepend this to submodule path output"
07432cef 5946msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 5947
1b7f4a34 5948#: builtin/fetch.c:122
ef317cd5 5949msgid "default mode for recursion"
07432cef 5950msgstr "递归的默认模式"
ef317cd5 5951
1b7f4a34 5952#: builtin/fetch.c:124 builtin/pull.c:193
cfff71a9
JX
5953msgid "accept refs that update .git/shallow"
5954msgstr "接受更新 .git/shallow 的引用"
5955
1b7f4a34 5956#: builtin/fetch.c:125 builtin/pull.c:195
6acbf033
JX
5957msgid "refmap"
5958msgstr "引用映射"
5959
1b7f4a34 5960#: builtin/fetch.c:126 builtin/pull.c:196
6acbf033
JX
5961msgid "specify fetch refmap"
5962msgstr "指定获取操作的引用映射"
5963
1b7f4a34 5964#: builtin/fetch.c:378
c04f5ac3
JX
5965msgid "Couldn't find remote ref HEAD"
5966msgstr "无法发现远程 HEAD 引用"
5967
1b7f4a34 5968#: builtin/fetch.c:458
c04f5ac3
JX
5969#, c-format
5970msgid "object %s not found"
5971msgstr "对象 %s 未发现"
5972
1b7f4a34 5973#: builtin/fetch.c:463
c04f5ac3
JX
5974msgid "[up to date]"
5975msgstr "[最新]"
5976
1b7f4a34 5977#: builtin/fetch.c:477
c04f5ac3
JX
5978#, c-format
5979msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5980msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5981
94550ed3 5982#: builtin/fetch.c:478 builtin/fetch.c:566
c04f5ac3
JX
5983msgid "[rejected]"
5984msgstr "[已拒绝]"
5985
1b7f4a34 5986#: builtin/fetch.c:489
c04f5ac3 5987msgid "[tag update]"
55a16ee4 5988msgstr "[标签更新]"
c04f5ac3 5989
90e6ef53 5990# 译者:注意保持前导空格
1b7f4a34 5991#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544
c04f5ac3
JX
5992msgid " (unable to update local ref)"
5993msgstr " (不能更新本地引用)"
5994
1b7f4a34 5995#: builtin/fetch.c:509
c04f5ac3 5996msgid "[new tag]"
55a16ee4 5997msgstr "[新标签]"
c04f5ac3 5998
1b7f4a34 5999#: builtin/fetch.c:512
c04f5ac3
JX
6000msgid "[new branch]"
6001msgstr "[新分支]"
6002
1b7f4a34 6003#: builtin/fetch.c:515
170e9899
JX
6004msgid "[new ref]"
6005msgstr "[新引用]"
6006
94550ed3 6007#: builtin/fetch.c:561
c04f5ac3
JX
6008msgid "unable to update local ref"
6009msgstr "不能更新本地引用"
6010
94550ed3 6011#: builtin/fetch.c:561
c04f5ac3
JX
6012msgid "forced update"
6013msgstr "强制更新"
6014
94550ed3 6015#: builtin/fetch.c:568
c04f5ac3 6016msgid "(non-fast-forward)"
90e6ef53 6017msgstr "(非快进式)"
c04f5ac3 6018
94550ed3 6019#: builtin/fetch.c:602 builtin/fetch.c:843
c04f5ac3
JX
6020#, c-format
6021msgid "cannot open %s: %s\n"
6022msgstr "无法打开 %s:%s\n"
6023
94550ed3 6024#: builtin/fetch.c:611
c04f5ac3
JX
6025#, c-format
6026msgid "%s did not send all necessary objects\n"
6027msgstr "%s 未发送所有必须的对象\n"
6028
94550ed3 6029#: builtin/fetch.c:629
cfff71a9
JX
6030#, c-format
6031msgid "reject %s because shallow roots are not allowed to be updated"
6032msgstr "拒绝 %s 因为浅克隆不允许被更新"
6033
94550ed3 6034#: builtin/fetch.c:716 builtin/fetch.c:808
c04f5ac3
JX
6035#, c-format
6036msgid "From %.*s\n"
6037msgstr "来自 %.*s\n"
6038
94550ed3 6039#: builtin/fetch.c:727
c04f5ac3
JX
6040#, c-format
6041msgid ""
6042"some local refs could not be updated; try running\n"
6043" 'git remote prune %s' to remove any old, conflicting branches"
6044msgstr ""
6045"一些本地引用不能被更新;尝试运行\n"
6046" 'git remote prune %s' 来删除旧的、有冲突的分支"
6047
90e6ef53 6048# 译者:注意保持前导空格
94550ed3 6049#: builtin/fetch.c:779
81809b99 6050#, c-format
8ada9598 6051msgid " (%s will become dangling)"
07432cef 6052msgstr " (%s 将成为摇摆状态)"
c04f5ac3 6053
90e6ef53 6054# 译者:注意保持前导空格
94550ed3 6055#: builtin/fetch.c:780
81809b99 6056#, c-format
8ada9598 6057msgid " (%s has become dangling)"
07432cef 6058msgstr " (%s 已成为摇摆状态)"
c04f5ac3 6059
94550ed3 6060#: builtin/fetch.c:812
c04f5ac3
JX
6061msgid "[deleted]"
6062msgstr "[已删除]"
6063
94550ed3 6064#: builtin/fetch.c:813 builtin/remote.c:1040
c04f5ac3
JX
6065msgid "(none)"
6066msgstr "(无)"
6067
94550ed3 6068#: builtin/fetch.c:833
c04f5ac3
JX
6069#, c-format
6070msgid "Refusing to fetch into current branch %s of non-bare repository"
160fb2b2 6071msgstr "拒绝获取到非纯仓库的当前分支 %s"
c04f5ac3 6072
94550ed3 6073#: builtin/fetch.c:852
c04f5ac3
JX
6074#, c-format
6075msgid "Option \"%s\" value \"%s\" is not valid for %s"
6076msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
6077
94550ed3 6078#: builtin/fetch.c:855
c04f5ac3
JX
6079#, c-format
6080msgid "Option \"%s\" is ignored for %s\n"
81809b99 6081msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 6082
94550ed3 6083#: builtin/fetch.c:911
90314792
JX
6084#, c-format
6085msgid "Don't know how to fetch from %s"
6086msgstr "不知道如何从 %s 获取"
6087
94550ed3 6088#: builtin/fetch.c:1072
c04f5ac3
JX
6089#, c-format
6090msgid "Fetching %s\n"
d4a8e00b 6091msgstr "正在获取 %s\n"
c04f5ac3 6092
94550ed3 6093#: builtin/fetch.c:1074 builtin/remote.c:96
c04f5ac3
JX
6094#, c-format
6095msgid "Could not fetch %s"
6096msgstr "不能获取 %s"
6097
94550ed3 6098#: builtin/fetch.c:1092
c04f5ac3
JX
6099msgid ""
6100"No remote repository specified. Please, specify either a URL or a\n"
6101"remote name from which new revisions should be fetched."
4375c10e 6102msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
c04f5ac3 6103
94550ed3 6104#: builtin/fetch.c:1115
c04f5ac3 6105msgid "You need to specify a tag name."
55a16ee4 6106msgstr "您需要指定一个标签名称。"
c04f5ac3 6107
94550ed3 6108#: builtin/fetch.c:1157
a77c07d9
JX
6109msgid "--depth and --unshallow cannot be used together"
6110msgstr "--depth 和 --unshallow 不能同时使用"
6111
94550ed3 6112#: builtin/fetch.c:1159
a77c07d9 6113msgid "--unshallow on a complete repository does not make sense"
160fb2b2 6114msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
a77c07d9 6115
94550ed3 6116#: builtin/fetch.c:1179
c04f5ac3 6117msgid "fetch --all does not take a repository argument"
160fb2b2 6118msgstr "fetch --all 不能带一个仓库参数"
c04f5ac3 6119
94550ed3 6120#: builtin/fetch.c:1181
c04f5ac3 6121msgid "fetch --all does not make sense with refspecs"
160fb2b2 6122msgstr "fetch --all 带引用规格没有任何意义"
c04f5ac3 6123
94550ed3 6124#: builtin/fetch.c:1192
c04f5ac3
JX
6125#, c-format
6126msgid "No such remote or remote group: %s"
6127msgstr "没有这样的远程或远程组:%s"
6128
94550ed3 6129#: builtin/fetch.c:1200
c04f5ac3 6130msgid "Fetching a group and specifying refspecs does not make sense"
160fb2b2 6131msgstr "获取组并指定引用规格没有意义"
c04f5ac3 6132
1b7f4a34 6133#: builtin/fmt-merge-msg.c:14
814ff314
JX
6134msgid ""
6135"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
6136msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 6137
94550ed3 6138#: builtin/fmt-merge-msg.c:667
ef317cd5 6139msgid "populate log with at most <n> entries from shortlog"
07432cef 6140msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 6141
94550ed3 6142#: builtin/fmt-merge-msg.c:670
ef317cd5 6143msgid "alias for --log (deprecated)"
07432cef 6144msgstr "参数 --log 的别名(已弃用)"
ef317cd5 6145
94550ed3 6146#: builtin/fmt-merge-msg.c:673
ef317cd5 6147msgid "text"
07432cef 6148msgstr "文本"
ef317cd5 6149
94550ed3 6150#: builtin/fmt-merge-msg.c:674
ef317cd5 6151msgid "use <text> as start of message"
07432cef 6152msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 6153
94550ed3 6154#: builtin/fmt-merge-msg.c:675
ef317cd5 6155msgid "file to read from"
07432cef 6156msgstr "从文件中读取"
ef317cd5 6157
1b7f4a34 6158#: builtin/for-each-ref.c:9
814ff314
JX
6159msgid "git for-each-ref [<options>] [<pattern>]"
6160msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 6161
94550ed3
JX
6162#: builtin/for-each-ref.c:10
6163msgid "git for-each-ref [--points-at <object>]"
6164msgstr "git for-each-ref [--points-at <对象>]"
6165
6166#: builtin/for-each-ref.c:11
6167msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
6168msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
6169
6170#: builtin/for-each-ref.c:12
6171msgid "git for-each-ref [--contains [<object>]]"
6172msgstr "git for-each-ref [--contains [<对象>]]"
6173
6174#: builtin/for-each-ref.c:27
ef317cd5 6175msgid "quote placeholders suitably for shells"
07432cef 6176msgstr "引用占位符适用于 shells"
ef317cd5 6177
94550ed3 6178#: builtin/for-each-ref.c:29
ef317cd5 6179msgid "quote placeholders suitably for perl"
07432cef 6180msgstr "引用占位符适用于 perl"
ef317cd5 6181
94550ed3 6182#: builtin/for-each-ref.c:31
ef317cd5 6183msgid "quote placeholders suitably for python"
07432cef 6184msgstr "引用占位符适用于 python"
ef317cd5 6185
94550ed3 6186#: builtin/for-each-ref.c:33
04cb2f28
JX
6187msgid "quote placeholders suitably for Tcl"
6188msgstr "引用占位符适用于 Tcl"
ef317cd5 6189
94550ed3 6190#: builtin/for-each-ref.c:36
ef317cd5 6191msgid "show only <n> matched refs"
07432cef 6192msgstr "只显示 <n> 个匹配的引用"
ef317cd5 6193
94550ed3 6194#: builtin/for-each-ref.c:37 builtin/tag.c:372
ef317cd5 6195msgid "format to use for the output"
07432cef 6196msgstr "输出格式"
ef317cd5 6197
94550ed3
JX
6198#: builtin/for-each-ref.c:41
6199msgid "print only refs which points at the given object"
6200msgstr "只打印指向给定对象的引用"
ef317cd5 6201
94550ed3
JX
6202#: builtin/for-each-ref.c:43
6203msgid "print only refs that are merged"
6204msgstr "只打印已经合并的引用"
6205
6206#: builtin/for-each-ref.c:44
6207msgid "print only refs that are not merged"
6208msgstr "只打印没有合并的引用"
ef317cd5 6209
94550ed3
JX
6210#: builtin/for-each-ref.c:45
6211msgid "print only refs which contain the commit"
6212msgstr "只打印包含该提交的引用"
6213
6214#: builtin/fsck.c:156 builtin/prune.c:140
6c94aba5
JX
6215msgid "Checking connectivity"
6216msgstr "检查连接中"
6217
94550ed3 6218#: builtin/fsck.c:486
6c94aba5
JX
6219msgid "Checking object directories"
6220msgstr "检查对象目录中"
6221
94550ed3 6222#: builtin/fsck.c:553
814ff314
JX
6223msgid "git fsck [<options>] [<object>...]"
6224msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 6225
94550ed3 6226#: builtin/fsck.c:559
ef317cd5 6227msgid "show unreachable objects"
07432cef 6228msgstr "显示不可达的对象"
ef317cd5 6229
94550ed3 6230#: builtin/fsck.c:560
ef317cd5 6231msgid "show dangling objects"
07432cef 6232msgstr "显示摇摆的对象"
ef317cd5 6233
94550ed3 6234#: builtin/fsck.c:561
ef317cd5 6235msgid "report tags"
55a16ee4 6236msgstr "报告标签"
ef317cd5 6237
94550ed3 6238#: builtin/fsck.c:562
ef317cd5 6239msgid "report root nodes"
07432cef 6240msgstr "报告根节点"
ef317cd5 6241
94550ed3 6242#: builtin/fsck.c:563
ef317cd5 6243msgid "make index objects head nodes"
07432cef 6244msgstr "将索引亦作为检查的头节点"
ef317cd5 6245
94550ed3 6246#: builtin/fsck.c:564
ef317cd5 6247msgid "make reflogs head nodes (default)"
07432cef 6248msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 6249
94550ed3 6250#: builtin/fsck.c:565
ef317cd5 6251msgid "also consider packs and alternate objects"
07432cef 6252msgstr "也考虑包和备用对象"
ef317cd5 6253
94550ed3 6254#: builtin/fsck.c:566
1b7f4a34
JX
6255msgid "check only connectivity"
6256msgstr "仅检查连通性"
6257
94550ed3 6258#: builtin/fsck.c:567
ef317cd5 6259msgid "enable more strict checking"
07432cef 6260msgstr "启用更严格的检查"
ef317cd5 6261
94550ed3 6262#: builtin/fsck.c:569
ef317cd5 6263msgid "write dangling objects in .git/lost-found"
07432cef 6264msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5 6265
94550ed3 6266#: builtin/fsck.c:570 builtin/prune.c:107
ef317cd5 6267msgid "show progress"
07432cef 6268msgstr "显示进度"
ef317cd5 6269
94550ed3 6270#: builtin/fsck.c:631
6c94aba5
JX
6271msgid "Checking objects"
6272msgstr "检查对象中"
6273
1b7f4a34 6274#: builtin/gc.c:25
814ff314
JX
6275msgid "git gc [<options>]"
6276msgstr "git gc [<选项>]"
ef317cd5 6277
94550ed3 6278#: builtin/gc.c:72
c04f5ac3 6279#, c-format
7aea43ff
JX
6280msgid "Invalid %s: '%s'"
6281msgstr "无效 %s:'%s'"
c04f5ac3 6282
94550ed3 6283#: builtin/gc.c:139
c04f5ac3
JX
6284#, c-format
6285msgid "insanely long object directory %.*s"
6286msgstr "不正常的长对象目录 %.*s"
6287
94550ed3
JX
6288#: builtin/gc.c:290
6289#, c-format
6290msgid ""
6291"The last gc run reported the following. Please correct the root cause\n"
6292"and remove %s.\n"
6293"Automatic cleanup will not be performed until the file is removed.\n"
6294"\n"
6295"%s"
6296msgstr ""
6297"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
6298"在该文件被删除之前,自动清理将不会执行。\n"
6299"\n"
6300"%s"
6301
6302#: builtin/gc.c:327
ef317cd5 6303msgid "prune unreferenced objects"
07432cef 6304msgstr "清除未引用的对象"
ef317cd5 6305
94550ed3 6306#: builtin/gc.c:329
ef317cd5 6307msgid "be more thorough (increased runtime)"
07432cef 6308msgstr "更彻底(增加运行时间)"
ef317cd5 6309
94550ed3 6310#: builtin/gc.c:330
ef317cd5 6311msgid "enable auto-gc mode"
07432cef 6312msgstr "启用自动垃圾回收模式"
ef317cd5 6313
94550ed3 6314#: builtin/gc.c:331
90314792
JX
6315msgid "force running gc even if there may be another gc running"
6316msgstr "强制执行 gc 即使另外一个 gc 正在执行"
6317
94550ed3 6318#: builtin/gc.c:373
c04f5ac3 6319#, c-format
6c94aba5 6320msgid "Auto packing the repository in background for optimum performance.\n"
160fb2b2 6321msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6c94aba5 6322
94550ed3 6323#: builtin/gc.c:375
6c94aba5
JX
6324#, c-format
6325msgid "Auto packing the repository for optimum performance.\n"
160fb2b2 6326msgstr "自动打包仓库以求最佳性能。\n"
6c94aba5 6327
94550ed3 6328#: builtin/gc.c:376
6c94aba5
JX
6329#, c-format
6330msgid "See \"git help gc\" for manual housekeeping.\n"
6331msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 6332
94550ed3 6333#: builtin/gc.c:397
90314792
JX
6334#, c-format
6335msgid ""
6336"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
6337msgstr ""
6338"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
6339
94550ed3 6340#: builtin/gc.c:441
c04f5ac3
JX
6341msgid ""
6342"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 6343msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 6344
90314792 6345#: builtin/grep.c:23
814ff314
JX
6346msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
6347msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 6348
90314792 6349#: builtin/grep.c:218
c04f5ac3
JX
6350#, c-format
6351msgid "grep: failed to create thread: %s"
90e6ef53 6352msgstr "grep:无法创建线程:%s"
c04f5ac3 6353
6acbf033 6354#: builtin/grep.c:441 builtin/grep.c:476
c04f5ac3
JX
6355#, c-format
6356msgid "unable to read tree (%s)"
90e6ef53 6357msgstr "无法读取树(%s)"
c04f5ac3 6358
6acbf033 6359#: builtin/grep.c:491
c04f5ac3
JX
6360#, c-format
6361msgid "unable to grep from object of type %s"
6362msgstr "无法抓取来自于 %s 类型的对象"
6363
6acbf033 6364#: builtin/grep.c:547
c04f5ac3
JX
6365#, c-format
6366msgid "switch `%c' expects a numerical value"
6367msgstr "开关 `%c' 期望一个数字值"
6368
6acbf033 6369#: builtin/grep.c:564
c04f5ac3
JX
6370#, c-format
6371msgid "cannot open '%s'"
6372msgstr "不能打开 '%s'"
6373
94550ed3 6374#: builtin/grep.c:633
ef317cd5 6375msgid "search in index instead of in the work tree"
07432cef 6376msgstr "在索引区搜索而不是在工作区"
ef317cd5 6377
94550ed3 6378#: builtin/grep.c:635
ef317cd5 6379msgid "find in contents not managed by git"
07432cef 6380msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
6381
6382# 译者:中文字符串拼接,可删除前导空格
94550ed3 6383#: builtin/grep.c:637
ef317cd5 6384msgid "search in both tracked and untracked files"
07432cef 6385msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 6386
94550ed3 6387#: builtin/grep.c:639
814ff314
JX
6388msgid "ignore files specified via '.gitignore'"
6389msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 6390
94550ed3 6391#: builtin/grep.c:642
ef317cd5 6392msgid "show non-matching lines"
07432cef 6393msgstr "显示未匹配的行"
ef317cd5 6394
94550ed3 6395#: builtin/grep.c:644
ef317cd5 6396msgid "case insensitive matching"
07432cef 6397msgstr "不区分大小写匹配"
ef317cd5 6398
94550ed3 6399#: builtin/grep.c:646
ef317cd5 6400msgid "match patterns only at word boundaries"
07432cef 6401msgstr "只在单词边界匹配模式"
ef317cd5 6402
94550ed3 6403#: builtin/grep.c:648
ef317cd5 6404msgid "process binary files as text"
07432cef 6405msgstr "把二进制文件当做文本处理"
ef317cd5 6406
94550ed3 6407#: builtin/grep.c:650
ef317cd5 6408msgid "don't match patterns in binary files"
07432cef 6409msgstr "不在二进制文件中匹配模式"
ef317cd5 6410
94550ed3 6411#: builtin/grep.c:653
90314792
JX
6412msgid "process binary files with textconv filters"
6413msgstr "用 textconv 过滤器处理二进制文件"
6414
94550ed3 6415#: builtin/grep.c:655
ef317cd5 6416msgid "descend at most <depth> levels"
07432cef 6417msgstr "最多以指定的深度向下寻找"
ef317cd5 6418
94550ed3 6419#: builtin/grep.c:659
ef317cd5 6420msgid "use extended POSIX regular expressions"
07432cef 6421msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 6422
94550ed3 6423#: builtin/grep.c:662
ef317cd5 6424msgid "use basic POSIX regular expressions (default)"
07432cef 6425msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 6426
94550ed3 6427#: builtin/grep.c:665
ef317cd5 6428msgid "interpret patterns as fixed strings"
07432cef 6429msgstr "把模式解析为固定的字符串"
ef317cd5 6430
94550ed3 6431#: builtin/grep.c:668
ef317cd5 6432msgid "use Perl-compatible regular expressions"
07432cef 6433msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 6434
94550ed3 6435#: builtin/grep.c:671
ef317cd5 6436msgid "show line numbers"
07432cef 6437msgstr "显示行号"
ef317cd5 6438
94550ed3 6439#: builtin/grep.c:672
ef317cd5 6440msgid "don't show filenames"
07432cef 6441msgstr "不显示文件名"
ef317cd5 6442
94550ed3 6443#: builtin/grep.c:673
ef317cd5 6444msgid "show filenames"
07432cef 6445msgstr "显示文件名"
ef317cd5 6446
94550ed3 6447#: builtin/grep.c:675
ef317cd5 6448msgid "show filenames relative to top directory"
07432cef 6449msgstr "显示相对于顶级目录的文件名"
ef317cd5 6450
94550ed3 6451#: builtin/grep.c:677
ef317cd5 6452msgid "show only filenames instead of matching lines"
07432cef 6453msgstr "只显示文件名而不显示匹配的行"
ef317cd5 6454
94550ed3 6455#: builtin/grep.c:679
ef317cd5 6456msgid "synonym for --files-with-matches"
07432cef 6457msgstr "和 --files-with-matches 同义"
ef317cd5 6458
94550ed3 6459#: builtin/grep.c:682
ef317cd5 6460msgid "show only the names of files without match"
07432cef 6461msgstr "只显示未匹配的文件名"
ef317cd5 6462
94550ed3 6463#: builtin/grep.c:684
ef317cd5 6464msgid "print NUL after filenames"
07432cef 6465msgstr "在文件名后输出 NUL 字符"
ef317cd5 6466
94550ed3 6467#: builtin/grep.c:686
ef317cd5 6468msgid "show the number of matches instead of matching lines"
07432cef 6469msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 6470
94550ed3 6471#: builtin/grep.c:687
ef317cd5 6472msgid "highlight matches"
07432cef 6473msgstr "高亮显示匹配项"
ef317cd5 6474
94550ed3 6475#: builtin/grep.c:689
ef317cd5 6476msgid "print empty line between matches from different files"
07432cef 6477msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 6478
94550ed3 6479#: builtin/grep.c:691
ef317cd5 6480msgid "show filename only once above matches from same file"
07432cef 6481msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 6482
94550ed3 6483#: builtin/grep.c:694
ef317cd5 6484msgid "show <n> context lines before and after matches"
07432cef 6485msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 6486
94550ed3 6487#: builtin/grep.c:697
ef317cd5 6488msgid "show <n> context lines before matches"
07432cef 6489msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 6490
94550ed3 6491#: builtin/grep.c:699
ef317cd5 6492msgid "show <n> context lines after matches"
07432cef 6493msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 6494
94550ed3 6495#: builtin/grep.c:700
ef317cd5 6496msgid "shortcut for -C NUM"
07432cef 6497msgstr "快捷键 -C 数字"
ef317cd5 6498
94550ed3 6499#: builtin/grep.c:703
ef317cd5 6500msgid "show a line with the function name before matches"
07432cef 6501msgstr "在匹配的前面显示一行函数名"
ef317cd5 6502
94550ed3 6503#: builtin/grep.c:705
ef317cd5 6504msgid "show the surrounding function"
07432cef 6505msgstr "显示所在函数的前后内容"
ef317cd5 6506
94550ed3 6507#: builtin/grep.c:708
ef317cd5 6508msgid "read patterns from file"
07432cef 6509msgstr "从文件读取模式"
ef317cd5 6510
94550ed3 6511#: builtin/grep.c:710
ef317cd5 6512msgid "match <pattern>"
07432cef 6513msgstr "匹配 <模式>"
ef317cd5 6514
94550ed3 6515#: builtin/grep.c:712
ef317cd5 6516msgid "combine patterns specified with -e"
07432cef 6517msgstr "组合用 -e 参数设定的模式"
ef317cd5 6518
94550ed3 6519#: builtin/grep.c:724
ef317cd5 6520msgid "indicate hit with exit status without output"
07432cef 6521msgstr "不输出,而用退出码标识命中状态"
ef317cd5 6522
94550ed3 6523#: builtin/grep.c:726
ef317cd5 6524msgid "show only matches from files that match all patterns"
07432cef 6525msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 6526
94550ed3 6527#: builtin/grep.c:728
07432cef
WS
6528msgid "show parse tree for grep expression"
6529msgstr "显示 grep 表达式的解析树"
6530
94550ed3 6531#: builtin/grep.c:732
ef317cd5 6532msgid "pager"
07432cef 6533msgstr "分页"
ef317cd5 6534
94550ed3 6535#: builtin/grep.c:732
ef317cd5 6536msgid "show matching files in the pager"
07432cef 6537msgstr "分页显示匹配的文件"
ef317cd5 6538
94550ed3 6539#: builtin/grep.c:735
ef317cd5 6540msgid "allow calling of grep(1) (ignored by this build)"
07432cef 6541msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 6542
94550ed3 6543#: builtin/grep.c:793
c04f5ac3
JX
6544msgid "no pattern given."
6545msgstr "未提供模式匹配。"
6546
94550ed3 6547#: builtin/grep.c:851
c04f5ac3
JX
6548msgid "--open-files-in-pager only works on the worktree"
6549msgstr "--open-files-in-pager 仅用于工作区"
6550
94550ed3 6551#: builtin/grep.c:877
c04f5ac3 6552msgid "--cached or --untracked cannot be used with --no-index."
649900bc 6553msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 6554
94550ed3 6555#: builtin/grep.c:882
c04f5ac3 6556msgid "--no-index or --untracked cannot be used with revs."
649900bc 6557msgstr "--no-index 或 --untracked 不能和版本同时使用。"
c04f5ac3 6558
94550ed3 6559#: builtin/grep.c:885
c04f5ac3 6560msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 6561msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 6562
94550ed3 6563#: builtin/grep.c:893
c04f5ac3
JX
6564msgid "both --cached and trees are given."
6565msgstr "同时给出了 --cached 和树对象。"
6566
7aea43ff 6567#: builtin/hash-object.c:80
ef317cd5 6568msgid ""
814ff314
JX
6569"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6570"[--] <file>..."
ef317cd5 6571msgstr ""
814ff314
JX
6572"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
6573"[--] <文件>..."
ef317cd5 6574
7aea43ff 6575#: builtin/hash-object.c:81
94550ed3
JX
6576msgid "git hash-object --stdin-paths"
6577msgstr "git hash-object --stdin-paths"
ef317cd5 6578
94550ed3 6579#: builtin/hash-object.c:92
ef317cd5 6580msgid "type"
07432cef 6581msgstr "类型"
ef317cd5 6582
7aea43ff 6583#: builtin/hash-object.c:92
ef317cd5 6584msgid "object type"
07432cef 6585msgstr "对象类型"
ef317cd5 6586
7aea43ff 6587#: builtin/hash-object.c:93
ef317cd5 6588msgid "write the object into the object database"
07432cef 6589msgstr "将对象写入对象数据库"
ef317cd5 6590
7aea43ff 6591#: builtin/hash-object.c:95
ef317cd5 6592msgid "read the object from stdin"
07432cef 6593msgstr "从标准输入读取对象"
ef317cd5 6594
7aea43ff 6595#: builtin/hash-object.c:97
ef317cd5 6596msgid "store file as is without filters"
07432cef 6597msgstr "原样存储文件不使用过滤器"
ef317cd5 6598
7aea43ff 6599#: builtin/hash-object.c:98
220c313c
JX
6600msgid ""
6601"just hash any random garbage to create corrupt objects for debugging Git"
6602msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
6603
7aea43ff 6604#: builtin/hash-object.c:99
ef317cd5 6605msgid "process file as it were from this path"
07432cef 6606msgstr "处理文件并假设其来自于此路径"
ef317cd5 6607
2e8451e8 6608#: builtin/help.c:41
ef317cd5 6609msgid "print all available commands"
07432cef 6610msgstr "打印所有可用的命令"
ef317cd5 6611
2e8451e8 6612#: builtin/help.c:42
4dcdc3d8
JX
6613msgid "print list of useful guides"
6614msgstr "显示有用的指南列表"
6615
2e8451e8 6616#: builtin/help.c:43
ef317cd5 6617msgid "show man page"
07432cef 6618msgstr "显示 man 手册"
ef317cd5 6619
2e8451e8 6620#: builtin/help.c:44
ef317cd5 6621msgid "show manual in web browser"
07432cef 6622msgstr "在 web 浏览器中显示手册"
ef317cd5 6623
2e8451e8 6624#: builtin/help.c:46
ef317cd5 6625msgid "show info page"
07432cef 6626msgstr "显示 info 手册"
ef317cd5 6627
2e8451e8 6628#: builtin/help.c:52
814ff314
JX
6629msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6630msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
ef317cd5 6631
2e8451e8 6632#: builtin/help.c:64
81809b99 6633#, c-format
8ada9598 6634msgid "unrecognized help format '%s'"
81809b99 6635msgstr "未能识别的帮助格式 '%s'"
8ada9598 6636
220c313c 6637#: builtin/help.c:91
8ada9598 6638msgid "Failed to start emacsclient."
81809b99 6639msgstr "无法启动 emacsclient。"
8ada9598 6640
220c313c 6641#: builtin/help.c:104
8ada9598 6642msgid "Failed to parse emacsclient version."
81809b99 6643msgstr "无法解析 emacsclient 版本。"
8ada9598 6644
220c313c 6645#: builtin/help.c:112
8ada9598
JX
6646#, c-format
6647msgid "emacsclient version '%d' too old (< 22)."
07432cef 6648msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 6649
94550ed3 6650#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
81809b99 6651#, c-format
8ada9598 6652msgid "failed to exec '%s': %s"
81809b99 6653msgstr "无法执行 '%s':%s"
8ada9598 6654
94550ed3 6655#: builtin/help.c:208
8ada9598
JX
6656#, c-format
6657msgid ""
6658"'%s': path for unsupported man viewer.\n"
6659"Please consider using 'man.<tool>.cmd' instead."
6660msgstr ""
81809b99 6661"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 6662"请使用 'man.<工具>.cmd'。"
8ada9598 6663
94550ed3 6664#: builtin/help.c:220
8ada9598
JX
6665#, c-format
6666msgid ""
6667"'%s': cmd for supported man viewer.\n"
6668"Please consider using 'man.<tool>.path' instead."
6669msgstr ""
81809b99 6670"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 6671"请使用 'man.<工具>.path'。"
8ada9598 6672
94550ed3 6673#: builtin/help.c:337
8ada9598
JX
6674#, c-format
6675msgid "'%s': unknown man viewer."
81809b99 6676msgstr "'%s':未知的 man 查看器。"
8ada9598 6677
94550ed3 6678#: builtin/help.c:354
8ada9598 6679msgid "no man viewer handled the request"
81809b99 6680msgstr "没有 man 查看器处理此请求"
8ada9598 6681
94550ed3 6682#: builtin/help.c:362
8ada9598 6683msgid "no info viewer handled the request"
81809b99 6684msgstr "没有 info 查看器处理此请求"
8ada9598 6685
94550ed3 6686#: builtin/help.c:411
4dcdc3d8
JX
6687msgid "Defining attributes per path"
6688msgstr "定义路径的属性"
6689
94550ed3 6690#: builtin/help.c:412
220c313c
JX
6691msgid "Everyday Git With 20 Commands Or So"
6692msgstr "每一天 Git 常用的约 20 条命令"
6693
94550ed3 6694#: builtin/help.c:413
4dcdc3d8
JX
6695msgid "A Git glossary"
6696msgstr "Git 词汇表"
6697
94550ed3 6698#: builtin/help.c:414
4dcdc3d8
JX
6699msgid "Specifies intentionally untracked files to ignore"
6700msgstr "忽略指定的未跟踪文件"
6701
94550ed3 6702#: builtin/help.c:415
4dcdc3d8
JX
6703msgid "Defining submodule properties"
6704msgstr "定义子模组属性"
6705
94550ed3 6706#: builtin/help.c:416
4dcdc3d8
JX
6707msgid "Specifying revisions and ranges for Git"
6708msgstr "指定 Git 的版本和版本范围"
6709
94550ed3 6710#: builtin/help.c:417
4dcdc3d8
JX
6711msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6712msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6713
94550ed3 6714#: builtin/help.c:418
4dcdc3d8
JX
6715msgid "An overview of recommended workflows with Git"
6716msgstr "Git 推荐的工作流概览"
6717
94550ed3 6718#: builtin/help.c:430
4dcdc3d8
JX
6719msgid "The common Git guides are:\n"
6720msgstr "最常用的 Git 向导有:\n"
6721
94550ed3 6722#: builtin/help.c:451 builtin/help.c:468
8ada9598
JX
6723#, c-format
6724msgid "usage: %s%s"
81809b99 6725msgstr "用法:%s%s"
8ada9598 6726
94550ed3 6727#: builtin/help.c:484
8ada9598
JX
6728#, c-format
6729msgid "`git %s' is aliased to `%s'"
81809b99 6730msgstr "`git %s' 是 `%s' 的别名"
8ada9598 6731
1b7f4a34 6732#: builtin/index-pack.c:152
6acbf033
JX
6733#, c-format
6734msgid "unable to open %s"
6735msgstr "不能打开 %s"
6736
1b7f4a34 6737#: builtin/index-pack.c:202
8ada9598
JX
6738#, c-format
6739msgid "object type mismatch at %s"
81809b99 6740msgstr "%s 的对象类型不匹配"
8ada9598 6741
1b7f4a34 6742#: builtin/index-pack.c:222
6acbf033
JX
6743#, c-format
6744msgid "did not receive expected object %s"
6745msgstr "未能获取期望的对象 %s"
8ada9598 6746
1b7f4a34 6747#: builtin/index-pack.c:225
6acbf033
JX
6748#, c-format
6749msgid "object %s: expected type %s, found %s"
6750msgstr "对象 %s:期待类型 %s,却是 %s"
6751
1b7f4a34 6752#: builtin/index-pack.c:267
81809b99 6753#, c-format
8ada9598
JX
6754msgid "cannot fill %d byte"
6755msgid_plural "cannot fill %d bytes"
81809b99 6756msgstr[0] "无法填充 %d 字节"
5ae481e0 6757msgstr[1] "无法填充 %d 字节"
8ada9598 6758
1b7f4a34 6759#: builtin/index-pack.c:277
8ada9598 6760msgid "early EOF"
81809b99 6761msgstr "过早的文件结束符(EOF)"
8ada9598 6762
1b7f4a34 6763#: builtin/index-pack.c:278
8ada9598 6764msgid "read error on input"
81809b99 6765msgstr "输入上的读错误"
8ada9598 6766
1b7f4a34 6767#: builtin/index-pack.c:290
8ada9598 6768msgid "used more bytes than were available"
81809b99 6769msgstr "用掉了超过可用的字节"
8ada9598 6770
1b7f4a34 6771#: builtin/index-pack.c:297
8ada9598 6772msgid "pack too large for current definition of off_t"
81809b99 6773msgstr "包太大超过了当前 off_t 的定义"
8ada9598 6774
1b7f4a34 6775#: builtin/index-pack.c:313
81809b99 6776#, c-format
8ada9598 6777msgid "unable to create '%s'"
81809b99 6778msgstr "不能创建 '%s'"
8ada9598 6779
1b7f4a34 6780#: builtin/index-pack.c:318
81809b99 6781#, c-format
8ada9598 6782msgid "cannot open packfile '%s'"
81809b99 6783msgstr "无法打开包文件 '%s'"
8ada9598 6784
1b7f4a34 6785#: builtin/index-pack.c:332
8ada9598 6786msgid "pack signature mismatch"
81809b99 6787msgstr "包签名不匹配"
8ada9598 6788
1b7f4a34 6789#: builtin/index-pack.c:334
ef317cd5
JX
6790#, c-format
6791msgid "pack version %<PRIu32> unsupported"
07432cef 6792msgstr "不支持包版本 %<PRIu32>"
ef317cd5 6793
1b7f4a34 6794#: builtin/index-pack.c:352
8ada9598
JX
6795#, c-format
6796msgid "pack has bad object at offset %lu: %s"
81809b99 6797msgstr "包中有错误的对象位于 %lu:%s"
8ada9598 6798
1b7f4a34 6799#: builtin/index-pack.c:473
8ada9598
JX
6800#, c-format
6801msgid "inflate returned %d"
81809b99 6802msgstr "解压缩返回 %d"
8ada9598 6803
1b7f4a34 6804#: builtin/index-pack.c:522
8ada9598 6805msgid "offset value overflow for delta base object"
81809b99 6806msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 6807
1b7f4a34 6808#: builtin/index-pack.c:530
8ada9598 6809msgid "delta base offset is out of bound"
81809b99 6810msgstr "delta 基准偏移越界"
8ada9598 6811
1b7f4a34 6812#: builtin/index-pack.c:538
81809b99 6813#, c-format
8ada9598 6814msgid "unknown object type %d"
81809b99 6815msgstr "未知对象类型 %d"
8ada9598 6816
1b7f4a34 6817#: builtin/index-pack.c:569
8ada9598 6818msgid "cannot pread pack file"
81809b99 6819msgstr "无法读取包文件"
8ada9598 6820
1b7f4a34 6821#: builtin/index-pack.c:571
8ada9598
JX
6822#, c-format
6823msgid "premature end of pack file, %lu byte missing"
6824msgid_plural "premature end of pack file, %lu bytes missing"
81809b99 6825msgstr[0] "包文件过早结束,缺少 %lu 字节"
5ae481e0 6826msgstr[1] "包文件过早结束,缺少 %lu 字节"
8ada9598 6827
1b7f4a34 6828#: builtin/index-pack.c:597
8ada9598 6829msgid "serious inflate inconsistency"
81809b99 6830msgstr "解压缩严重的不一致"
8ada9598 6831
1b7f4a34
JX
6832#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
6833#: builtin/index-pack.c:806 builtin/index-pack.c:815
8ada9598
JX
6834#, c-format
6835msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 6836msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 6837
1b7f4a34 6838#: builtin/index-pack.c:746 builtin/pack-objects.c:162
814ff314 6839#: builtin/pack-objects.c:254
6792b93b
JX
6840#, c-format
6841msgid "unable to read %s"
6842msgstr "不能读 %s"
6843
1b7f4a34 6844#: builtin/index-pack.c:812
6792b93b
JX
6845#, c-format
6846msgid "cannot read existing object %s"
6847msgstr "不能读取现存对象 %s"
6848
1b7f4a34 6849#: builtin/index-pack.c:826
81809b99 6850#, c-format
8ada9598 6851msgid "invalid blob object %s"
160fb2b2 6852msgstr "无效的数据对象 %s"
8ada9598 6853
1b7f4a34 6854#: builtin/index-pack.c:840
81809b99 6855#, c-format
8ada9598 6856msgid "invalid %s"
81809b99 6857msgstr "无效的 %s"
8ada9598 6858
7aea43ff 6859#: builtin/index-pack.c:843
8ada9598 6860msgid "Error in object"
81809b99 6861msgstr "对象中出错"
8ada9598 6862
7aea43ff 6863#: builtin/index-pack.c:845
8ada9598
JX
6864#, c-format
6865msgid "Not all child objects of %s are reachable"
81809b99 6866msgstr "%s 的所有子对象并非都可达"
8ada9598 6867
7aea43ff 6868#: builtin/index-pack.c:917 builtin/index-pack.c:948
8ada9598 6869msgid "failed to apply delta"
81809b99 6870msgstr "无法应用 delta"
8ada9598 6871
7aea43ff 6872#: builtin/index-pack.c:1118
8ada9598 6873msgid "Receiving objects"
81809b99 6874msgstr "接收对象中"
8ada9598 6875
7aea43ff 6876#: builtin/index-pack.c:1118
8ada9598 6877msgid "Indexing objects"
81809b99 6878msgstr "索引对象中"
8ada9598 6879
7aea43ff 6880#: builtin/index-pack.c:1150
8ada9598 6881msgid "pack is corrupted (SHA1 mismatch)"
81809b99 6882msgstr "包冲突(SHA1 不匹配)"
8ada9598 6883
7aea43ff 6884#: builtin/index-pack.c:1155
8ada9598 6885msgid "cannot fstat packfile"
81809b99 6886msgstr "不能枚举包文件状态"
8ada9598 6887
7aea43ff 6888#: builtin/index-pack.c:1158
8ada9598 6889msgid "pack has junk at the end"
81809b99 6890msgstr "包的结尾有垃圾数据"
8ada9598 6891
7aea43ff 6892#: builtin/index-pack.c:1169
6792b93b
JX
6893msgid "confusion beyond insanity in parse_pack_objects()"
6894msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6895
7aea43ff 6896#: builtin/index-pack.c:1194
8ada9598 6897msgid "Resolving deltas"
81809b99 6898msgstr "处理 delta 中"
8ada9598 6899
7aea43ff 6900#: builtin/index-pack.c:1205
07432cef 6901#, c-format
ef317cd5 6902msgid "unable to create thread: %s"
07432cef 6903msgstr "不能创建线程:%s"
ef317cd5 6904
7aea43ff 6905#: builtin/index-pack.c:1247
8ada9598 6906msgid "confusion beyond insanity"
81809b99 6907msgstr "不可理喻"
8ada9598 6908
7aea43ff 6909#: builtin/index-pack.c:1253
ef317cd5
JX
6910#, c-format
6911msgid "completed with %d local objects"
07432cef 6912msgstr "完成 %d 个本地对象"
ef317cd5 6913
7aea43ff 6914#: builtin/index-pack.c:1263
ef317cd5
JX
6915#, c-format
6916msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 6917msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 6918
7aea43ff 6919#: builtin/index-pack.c:1267
8ada9598
JX
6920#, c-format
6921msgid "pack has %d unresolved delta"
6922msgid_plural "pack has %d unresolved deltas"
81809b99 6923msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 6924msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 6925
7aea43ff 6926#: builtin/index-pack.c:1291
81809b99 6927#, c-format
8ada9598 6928msgid "unable to deflate appended object (%d)"
07432cef 6929msgstr "不能压缩附加对象(%d)"
8ada9598 6930
7aea43ff 6931#: builtin/index-pack.c:1367
8ada9598
JX
6932#, c-format
6933msgid "local object %s is corrupt"
81809b99 6934msgstr "本地对象 %s 已损坏"
8ada9598 6935
7aea43ff 6936#: builtin/index-pack.c:1391
8ada9598 6937msgid "error while closing pack file"
81809b99 6938msgstr "关闭包文件时出错"
8ada9598 6939
7aea43ff 6940#: builtin/index-pack.c:1404
81809b99 6941#, c-format
8ada9598 6942msgid "cannot write keep file '%s'"
81809b99 6943msgstr "无法写保留文件 '%s'"
8ada9598 6944
7aea43ff 6945#: builtin/index-pack.c:1412
81809b99 6946#, c-format
8ada9598 6947msgid "cannot close written keep file '%s'"
81809b99 6948msgstr "无法关闭保留文件 '%s'"
8ada9598 6949
7aea43ff 6950#: builtin/index-pack.c:1425
8ada9598 6951msgid "cannot store pack file"
81809b99 6952msgstr "无法存储包文件"
8ada9598 6953
7aea43ff 6954#: builtin/index-pack.c:1436
8ada9598 6955msgid "cannot store index file"
81809b99 6956msgstr "无法存储索引文件"
8ada9598 6957
7aea43ff 6958#: builtin/index-pack.c:1469
07432cef 6959#, c-format
ef317cd5 6960msgid "bad pack.indexversion=%<PRIu32>"
07432cef 6961msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 6962
7aea43ff 6963#: builtin/index-pack.c:1475
ef317cd5
JX
6964#, c-format
6965msgid "invalid number of threads specified (%d)"
07432cef 6966msgstr "指定的线程数无效(%d)"
ef317cd5 6967
1b7f4a34 6968#: builtin/index-pack.c:1479 builtin/index-pack.c:1663
ef317cd5
JX
6969#, c-format
6970msgid "no threads support, ignoring %s"
07432cef 6971msgstr "没有线程支持,忽略 %s"
ef317cd5 6972
7aea43ff 6973#: builtin/index-pack.c:1537
81809b99 6974#, c-format
8ada9598 6975msgid "Cannot open existing pack file '%s'"
81809b99 6976msgstr "无法打开现存包文件 '%s'"
8ada9598 6977
7aea43ff 6978#: builtin/index-pack.c:1539
81809b99 6979#, c-format
8ada9598 6980msgid "Cannot open existing pack idx file for '%s'"
81809b99 6981msgstr "无法为 %s 打开包索引文件"
8ada9598 6982
7aea43ff 6983#: builtin/index-pack.c:1586
81809b99 6984#, c-format
8ada9598
JX
6985msgid "non delta: %d object"
6986msgid_plural "non delta: %d objects"
81809b99 6987msgstr[0] "非 delta:%d 个对象"
5ae481e0 6988msgstr[1] "非 delta:%d 个对象"
8ada9598 6989
7aea43ff 6990#: builtin/index-pack.c:1593
8ada9598
JX
6991#, c-format
6992msgid "chain length = %d: %lu object"
6993msgid_plural "chain length = %d: %lu objects"
81809b99 6994msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 6995msgstr[1] "链长 = %d: %lu 对象"
8ada9598 6996
1b7f4a34 6997#: builtin/index-pack.c:1623
8ada9598 6998msgid "Cannot come back to cwd"
81809b99 6999msgstr "无法返回当前工作目录"
8ada9598 7000
1b7f4a34
JX
7001#: builtin/index-pack.c:1675 builtin/index-pack.c:1678
7002#: builtin/index-pack.c:1690 builtin/index-pack.c:1694
81809b99 7003#, c-format
8ada9598 7004msgid "bad %s"
81809b99 7005msgstr "错误选项 %s"
8ada9598 7006
1b7f4a34 7007#: builtin/index-pack.c:1708
8ada9598 7008msgid "--fix-thin cannot be used without --stdin"
649900bc 7009msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 7010
1b7f4a34 7011#: builtin/index-pack.c:1712 builtin/index-pack.c:1721
8ada9598
JX
7012#, c-format
7013msgid "packfile name '%s' does not end with '.pack'"
dbd6cced 7014msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
8ada9598 7015
1b7f4a34 7016#: builtin/index-pack.c:1729
8ada9598 7017msgid "--verify with no packfile name given"
dbd6cced 7018msgstr "--verify 没有提供包文件名参数"
8ada9598 7019
94550ed3 7020#: builtin/init-db.c:55
c04f5ac3
JX
7021#, c-format
7022msgid "cannot stat '%s'"
7023msgstr "不能枚举 '%s' 状态"
7024
94550ed3 7025#: builtin/init-db.c:61
c04f5ac3
JX
7026#, c-format
7027msgid "cannot stat template '%s'"
7028msgstr "不能枚举模版 '%s' 状态"
7029
94550ed3 7030#: builtin/init-db.c:66
c04f5ac3
JX
7031#, c-format
7032msgid "cannot opendir '%s'"
7033msgstr "不能打开目录 '%s'"
7034
94550ed3 7035#: builtin/init-db.c:77
c04f5ac3
JX
7036#, c-format
7037msgid "cannot readlink '%s'"
7038msgstr "不能读取链接 '%s'"
7039
94550ed3 7040#: builtin/init-db.c:79
c04f5ac3
JX
7041#, c-format
7042msgid "cannot symlink '%s' '%s'"
90e6ef53 7043msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3 7044
94550ed3 7045#: builtin/init-db.c:85
c04f5ac3
JX
7046#, c-format
7047msgid "cannot copy '%s' to '%s'"
7048msgstr "不能拷贝 '%s' 至 '%s'"
7049
94550ed3 7050#: builtin/init-db.c:89
c04f5ac3
JX
7051#, c-format
7052msgid "ignoring template %s"
7053msgstr "忽略模版 %s"
7054
94550ed3 7055#: builtin/init-db.c:118
c04f5ac3
JX
7056#, c-format
7057msgid "templates not found %s"
7058msgstr "模版未找到 %s"
7059
94550ed3 7060#: builtin/init-db.c:131
c04f5ac3
JX
7061#, c-format
7062msgid "not copying templates of a wrong format version %d from '%s'"
81809b99 7063msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
c04f5ac3 7064
94550ed3 7065#: builtin/init-db.c:309 builtin/init-db.c:312
c04f5ac3
JX
7066#, c-format
7067msgid "%s already exists"
7068msgstr "%s 已经存在"
7069
94550ed3 7070#: builtin/init-db.c:340
c04f5ac3
JX
7071#, c-format
7072msgid "unable to handle file type %d"
7073msgstr "不能处理 %d 类型的文件"
7074
94550ed3 7075#: builtin/init-db.c:343
c04f5ac3
JX
7076#, c-format
7077msgid "unable to move %s to %s"
7078msgstr "不能移动 %s 至 %s"
7079
6c94aba5
JX
7080#. TRANSLATORS: The first '%s' is either "Reinitialized
7081#. existing" or "Initialized empty", the second " shared" or
7082#. "", and the last '%s%s' is the verbatim directory name.
94550ed3 7083#: builtin/init-db.c:399
c04f5ac3
JX
7084#, c-format
7085msgid "%s%s Git repository in %s%s\n"
160fb2b2 7086msgstr "%s%s Git 仓库于 %s%s\n"
c04f5ac3 7087
94550ed3 7088#: builtin/init-db.c:400
c04f5ac3
JX
7089msgid "Reinitialized existing"
7090msgstr "重新初始化现存的"
7091
94550ed3 7092#: builtin/init-db.c:400
c04f5ac3
JX
7093msgid "Initialized empty"
7094msgstr "初始化空的"
7095
7e238ab7 7096# 译者:中文字符串拼接,可删除前导空格
94550ed3 7097#: builtin/init-db.c:401
c04f5ac3 7098msgid " shared"
90e6ef53 7099msgstr "共享"
c04f5ac3 7100
94550ed3 7101#: builtin/init-db.c:448
ef317cd5 7102msgid ""
a77c07d9 7103"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 7104"shared[=<permissions>]] [<directory>]"
ef317cd5 7105msgstr ""
07432cef 7106"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 7107"[<目录>]"
ef317cd5 7108
94550ed3 7109#: builtin/init-db.c:471
ef317cd5 7110msgid "permissions"
07432cef 7111msgstr "权限"
ef317cd5 7112
94550ed3 7113#: builtin/init-db.c:472
ef317cd5 7114msgid "specify that the git repository is to be shared amongst several users"
160fb2b2 7115msgstr "指定 git 仓库是多个用户之间共享的"
ef317cd5 7116
94550ed3 7117#: builtin/init-db.c:506 builtin/init-db.c:511
c04f5ac3
JX
7118#, c-format
7119msgid "cannot mkdir %s"
7120msgstr "不能创建目录 %s"
7121
94550ed3 7122#: builtin/init-db.c:515
c04f5ac3
JX
7123#, c-format
7124msgid "cannot chdir to %s"
7125msgstr "不能切换目录到 %s"
7126
94550ed3 7127#: builtin/init-db.c:536
c04f5ac3
JX
7128#, c-format
7129msgid ""
7130"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
7131"dir=<directory>)"
1e607449 7132msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 7133
94550ed3 7134#: builtin/init-db.c:564
c04f5ac3
JX
7135#, c-format
7136msgid "Cannot access work tree '%s'"
7137msgstr "不能访问工作区 '%s'"
7138
220c313c
JX
7139#: builtin/interpret-trailers.c:15
7140msgid ""
7141"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
7142"[<file>...]"
7143msgstr ""
7144"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
7145">...]"
7146
7147#: builtin/interpret-trailers.c:25
7148msgid "trim empty trailers"
7149msgstr "删除空签名"
7150
7151#: builtin/interpret-trailers.c:26
7152msgid "trailer"
7153msgstr "签名"
7154
7155#: builtin/interpret-trailers.c:27
7156msgid "trailer(s) to add"
7157msgstr "要添加的签名"
7158
1b7f4a34 7159#: builtin/log.c:43
7aea43ff 7160msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 7161msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 7162
1b7f4a34 7163#: builtin/log.c:44
814ff314
JX
7164msgid "git show [<options>] <object>..."
7165msgstr "git show [<选项>] <对象>..."
ef317cd5 7166
1b7f4a34 7167#: builtin/log.c:83
220c313c
JX
7168#, c-format
7169msgid "invalid --decorate option: %s"
7170msgstr "无效的 --decorate 选项:%s"
7171
1b7f4a34 7172#: builtin/log.c:131
ef317cd5 7173msgid "suppress diff output"
07432cef 7174msgstr "不显示差异输出"
ef317cd5 7175
1b7f4a34 7176#: builtin/log.c:132
ef317cd5 7177msgid "show source"
07432cef 7178msgstr "显示源"
ef317cd5 7179
1b7f4a34 7180#: builtin/log.c:133
07432cef
WS
7181msgid "Use mail map file"
7182msgstr "使用邮件映射文件"
7183
1b7f4a34 7184#: builtin/log.c:134
ef317cd5 7185msgid "decorate options"
07432cef 7186msgstr "修饰选项"
ef317cd5 7187
1b7f4a34 7188#: builtin/log.c:137
220c313c
JX
7189msgid "Process line range n,m in file, counting from 1"
7190msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
7191
1b7f4a34 7192#: builtin/log.c:233
c04f5ac3
JX
7193#, c-format
7194msgid "Final output: %d %s\n"
7195msgstr "最终输出:%d %s\n"
7196
1b7f4a34 7197#: builtin/log.c:465
220c313c
JX
7198#, c-format
7199msgid "git show %s: bad file"
7200msgstr "git show %s: 损坏的文件"
7201
1b7f4a34 7202#: builtin/log.c:479 builtin/log.c:572
c04f5ac3
JX
7203#, c-format
7204msgid "Could not read object %s"
90e6ef53 7205msgstr "不能读取对象 %s"
c04f5ac3 7206
1b7f4a34 7207#: builtin/log.c:596
c04f5ac3
JX
7208#, c-format
7209msgid "Unknown type: %d"
7210msgstr "未知类型:%d"
7211
1b7f4a34 7212#: builtin/log.c:714
c04f5ac3
JX
7213msgid "format.headers without value"
7214msgstr "format.headers 没有值"
7215
1b7f4a34 7216#: builtin/log.c:798
c04f5ac3
JX
7217msgid "name of output directory is too long"
7218msgstr "输出目录名太长"
7219
94550ed3 7220#: builtin/log.c:813
c04f5ac3
JX
7221#, c-format
7222msgid "Cannot open patch file %s"
7223msgstr "无法打开补丁文件 %s"
7224
94550ed3 7225#: builtin/log.c:827
c04f5ac3
JX
7226msgid "Need exactly one range."
7227msgstr "只需要一个范围。"
7228
94550ed3 7229#: builtin/log.c:837
c04f5ac3
JX
7230msgid "Not a range."
7231msgstr "不是一个范围。"
7232
94550ed3 7233#: builtin/log.c:943
c04f5ac3
JX
7234msgid "Cover letter needs email format"
7235msgstr "信封需要邮件地址格式"
7236
94550ed3 7237#: builtin/log.c:1022
c04f5ac3
JX
7238#, c-format
7239msgid "insane in-reply-to: %s"
7240msgstr "不正常的 in-reply-to:%s"
7241
94550ed3 7242#: builtin/log.c:1050
814ff314
JX
7243msgid "git format-patch [<options>] [<since> | <revision-range>]"
7244msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 7245
94550ed3 7246#: builtin/log.c:1095
c04f5ac3
JX
7247msgid "Two output directories?"
7248msgstr "两个输出目录?"
7249
94550ed3 7250#: builtin/log.c:1210
ef317cd5 7251msgid "use [PATCH n/m] even with a single patch"
07432cef 7252msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 7253
94550ed3 7254#: builtin/log.c:1213
ef317cd5 7255msgid "use [PATCH] even with multiple patches"
07432cef 7256msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 7257
94550ed3 7258#: builtin/log.c:1217
ef317cd5 7259msgid "print patches to standard out"
07432cef 7260msgstr "打印补丁到标准输出"
c04f5ac3 7261
94550ed3 7262#: builtin/log.c:1219
ef317cd5 7263msgid "generate a cover letter"
07432cef 7264msgstr "生成一封附信"
c04f5ac3 7265
94550ed3 7266#: builtin/log.c:1221
ef317cd5 7267msgid "use simple number sequence for output file names"
07432cef 7268msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 7269
94550ed3 7270#: builtin/log.c:1222
ef317cd5 7271msgid "sfx"
07432cef 7272msgstr "后缀"
ef317cd5 7273
94550ed3 7274#: builtin/log.c:1223
ef317cd5 7275msgid "use <sfx> instead of '.patch'"
07432cef 7276msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 7277
94550ed3 7278#: builtin/log.c:1225
ef317cd5 7279msgid "start numbering patches at <n> instead of 1"
07432cef
WS
7280msgstr "补丁以 <n> 开始编号,而不是1"
7281
94550ed3 7282#: builtin/log.c:1227
07432cef
WS
7283msgid "mark the series as Nth re-roll"
7284msgstr "标记补丁系列是第几次重制"
ef317cd5 7285
94550ed3 7286#: builtin/log.c:1229
ef317cd5 7287msgid "Use [<prefix>] instead of [PATCH]"
07432cef 7288msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 7289
94550ed3 7290#: builtin/log.c:1232
ef317cd5 7291msgid "store resulting files in <dir>"
d9d56b23 7292msgstr "把结果文件存储在 <目录>"
ef317cd5 7293
94550ed3 7294#: builtin/log.c:1235
ef317cd5 7295msgid "don't strip/add [PATCH]"
07432cef 7296msgstr "不删除/添加 [PATCH]"
ef317cd5 7297
94550ed3 7298#: builtin/log.c:1238
ef317cd5 7299msgid "don't output binary diffs"
07432cef 7300msgstr "不输出二进制差异"
ef317cd5 7301
94550ed3 7302#: builtin/log.c:1240
ef317cd5 7303msgid "don't include a patch matching a commit upstream"
07432cef 7304msgstr "不包含已在上游提交中的补丁"
ef317cd5 7305
94550ed3 7306#: builtin/log.c:1242
ef317cd5 7307msgid "show patch format instead of default (patch + stat)"
07432cef 7308msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 7309
94550ed3 7310#: builtin/log.c:1244
ef317cd5 7311msgid "Messaging"
07432cef 7312msgstr "邮件发送"
ef317cd5 7313
94550ed3 7314#: builtin/log.c:1245
ef317cd5 7315msgid "header"
07432cef 7316msgstr "header"
ef317cd5 7317
94550ed3 7318#: builtin/log.c:1246
ef317cd5 7319msgid "add email header"
07432cef 7320msgstr "添加邮件头"
ef317cd5 7321
94550ed3 7322#: builtin/log.c:1247 builtin/log.c:1249
ef317cd5 7323msgid "email"
07432cef 7324msgstr "邮件地址"
ef317cd5 7325
94550ed3 7326#: builtin/log.c:1247
ef317cd5 7327msgid "add To: header"
07432cef 7328msgstr "添加收件人"
ef317cd5 7329
94550ed3 7330#: builtin/log.c:1249
ef317cd5 7331msgid "add Cc: header"
07432cef 7332msgstr "添加抄送"
ef317cd5 7333
94550ed3 7334#: builtin/log.c:1251
2e8451e8 7335msgid "ident"
d9d56b23 7336msgstr "标识"
2e8451e8 7337
94550ed3 7338#: builtin/log.c:1252
2e8451e8 7339msgid "set From address to <ident> (or committer ident if absent)"
4375c10e 7340msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
2e8451e8 7341
94550ed3 7342#: builtin/log.c:1254
ef317cd5 7343msgid "message-id"
d9d56b23 7344msgstr "邮件标识"
ef317cd5 7345
94550ed3 7346#: builtin/log.c:1255
ef317cd5 7347msgid "make first mail a reply to <message-id>"
d9d56b23 7348msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 7349
94550ed3 7350#: builtin/log.c:1256 builtin/log.c:1259
ef317cd5 7351msgid "boundary"
07432cef 7352msgstr "边界"
ef317cd5 7353
94550ed3 7354#: builtin/log.c:1257
ef317cd5 7355msgid "attach the patch"
07432cef 7356msgstr "附件方式添加补丁"
ef317cd5 7357
94550ed3 7358#: builtin/log.c:1260
ef317cd5 7359msgid "inline the patch"
07432cef 7360msgstr "内联显示补丁"
ef317cd5 7361
94550ed3 7362#: builtin/log.c:1264
ef317cd5 7363msgid "enable message threading, styles: shallow, deep"
07432cef 7364msgstr "启用邮件线索,风格:浅,深"
ef317cd5 7365
94550ed3 7366#: builtin/log.c:1266
ef317cd5 7367msgid "signature"
07432cef 7368msgstr "签名"
ef317cd5 7369
94550ed3 7370#: builtin/log.c:1267
ef317cd5 7371msgid "add a signature"
07432cef 7372msgstr "添加一个签名"
ef317cd5 7373
94550ed3 7374#: builtin/log.c:1269
6acbf033
JX
7375msgid "add a signature from a file"
7376msgstr "从文件添加一个签名"
7377
94550ed3 7378#: builtin/log.c:1270
ef317cd5 7379msgid "don't print the patch filenames"
07432cef 7380msgstr "不要打印补丁文件名"
ef317cd5 7381
94550ed3 7382#: builtin/log.c:1359
c04f5ac3
JX
7383msgid "-n and -k are mutually exclusive."
7384msgstr "-n 和 -k 互斥。"
7385
94550ed3 7386#: builtin/log.c:1361
c04f5ac3
JX
7387msgid "--subject-prefix and -k are mutually exclusive."
7388msgstr "--subject-prefix 和 -k 互斥。"
7389
94550ed3 7390#: builtin/log.c:1369
c04f5ac3
JX
7391msgid "--name-only does not make sense"
7392msgstr "--name-only 无意义"
7393
94550ed3 7394#: builtin/log.c:1371
c04f5ac3
JX
7395msgid "--name-status does not make sense"
7396msgstr "--name-status 无意义"
7397
94550ed3 7398#: builtin/log.c:1373
c04f5ac3
JX
7399msgid "--check does not make sense"
7400msgstr "--check 无意义"
7401
94550ed3 7402#: builtin/log.c:1396
c04f5ac3
JX
7403msgid "standard output, or directory, which one?"
7404msgstr "标准输出或目录,哪一个?"
7405
94550ed3 7406#: builtin/log.c:1398
c04f5ac3
JX
7407#, c-format
7408msgid "Could not create directory '%s'"
90e6ef53 7409msgstr "不能创建目录 '%s'"
c04f5ac3 7410
94550ed3 7411#: builtin/log.c:1495
6acbf033
JX
7412#, c-format
7413msgid "unable to read signature file '%s'"
7414msgstr "无法读取签名文件 '%s'"
7415
94550ed3 7416#: builtin/log.c:1558
c04f5ac3
JX
7417msgid "Failed to create output files"
7418msgstr "无法创建输出文件"
7419
94550ed3 7420#: builtin/log.c:1606
ef317cd5 7421msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 7422msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 7423
94550ed3 7424#: builtin/log.c:1660
c04f5ac3
JX
7425#, c-format
7426msgid ""
7427"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 7428msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 7429
94550ed3 7430#: builtin/log.c:1671 builtin/log.c:1673 builtin/log.c:1685
c04f5ac3
JX
7431#, c-format
7432msgid "Unknown commit %s"
7433msgstr "未知提交 %s"
7434
814ff314
JX
7435#: builtin/ls-files.c:358
7436msgid "git ls-files [<options>] [<file>...]"
7437msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 7438
814ff314 7439#: builtin/ls-files.c:415
ef317cd5 7440msgid "identify the file status with tags"
07432cef 7441msgstr "用标签标识文件的状态"
ef317cd5 7442
814ff314 7443#: builtin/ls-files.c:417
ef317cd5 7444msgid "use lowercase letters for 'assume unchanged' files"
07432cef 7445msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 7446
814ff314 7447#: builtin/ls-files.c:419
ef317cd5 7448msgid "show cached files in the output (default)"
07432cef 7449msgstr "显示缓存的文件(默认)"
ef317cd5 7450
814ff314 7451#: builtin/ls-files.c:421
ef317cd5 7452msgid "show deleted files in the output"
07432cef 7453msgstr "显示已删除的文件"
ef317cd5 7454
814ff314 7455#: builtin/ls-files.c:423
ef317cd5 7456msgid "show modified files in the output"
07432cef 7457msgstr "显示已修改的文件"
ef317cd5 7458
814ff314 7459#: builtin/ls-files.c:425
ef317cd5 7460msgid "show other files in the output"
07432cef 7461msgstr "显示其它文件"
ef317cd5 7462
814ff314 7463#: builtin/ls-files.c:427
ef317cd5 7464msgid "show ignored files in the output"
07432cef 7465msgstr "显示忽略的文件"
ef317cd5 7466
814ff314 7467#: builtin/ls-files.c:430
ef317cd5 7468msgid "show staged contents' object name in the output"
07432cef 7469msgstr "显示暂存区内容的对象名称"
ef317cd5 7470
814ff314 7471#: builtin/ls-files.c:432
ef317cd5 7472msgid "show files on the filesystem that need to be removed"
07432cef 7473msgstr "显示文件系统需要删除的文件"
ef317cd5 7474
814ff314 7475#: builtin/ls-files.c:434
220c313c 7476msgid "show 'other' directories' names only"
07432cef 7477msgstr "只显示“其他”目录的名称"
ef317cd5 7478
814ff314 7479#: builtin/ls-files.c:437
ef317cd5 7480msgid "don't show empty directories"
07432cef 7481msgstr "不显示空目录"
ef317cd5 7482
814ff314 7483#: builtin/ls-files.c:440
ef317cd5 7484msgid "show unmerged files in the output"
07432cef 7485msgstr "显示未合并的文件"
ef317cd5 7486
814ff314 7487#: builtin/ls-files.c:442
ef317cd5 7488msgid "show resolve-undo information"
07432cef 7489msgstr "显示 resolve-undo 信息"
ef317cd5 7490
814ff314 7491#: builtin/ls-files.c:444
ef317cd5 7492msgid "skip files matching pattern"
07432cef 7493msgstr "匹配排除文件的模式"
ef317cd5 7494
814ff314 7495#: builtin/ls-files.c:447
ef317cd5 7496msgid "exclude patterns are read from <file>"
07432cef 7497msgstr "从 <文件> 中读取排除模式"
ef317cd5 7498
814ff314 7499#: builtin/ls-files.c:450
ef317cd5 7500msgid "read additional per-directory exclude patterns in <file>"
07432cef 7501msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 7502
814ff314 7503#: builtin/ls-files.c:452
ef317cd5 7504msgid "add the standard git exclusions"
07432cef 7505msgstr "添加标准的 git 排除"
ef317cd5 7506
814ff314 7507#: builtin/ls-files.c:455
ef317cd5 7508msgid "make the output relative to the project top directory"
07432cef 7509msgstr "显示相对于顶级目录的文件名"
ef317cd5 7510
814ff314 7511#: builtin/ls-files.c:458
ef317cd5 7512msgid "if any <file> is not in the index, treat this as an error"
07432cef 7513msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 7514
814ff314 7515#: builtin/ls-files.c:459
ef317cd5 7516msgid "tree-ish"
07432cef 7517msgstr "树或提交"
ef317cd5 7518
814ff314 7519#: builtin/ls-files.c:460
ef317cd5 7520msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 7521msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 7522
814ff314 7523#: builtin/ls-files.c:462
ef317cd5 7524msgid "show debugging data"
07432cef 7525msgstr "显示调试数据"
ef317cd5 7526
90314792 7527#: builtin/ls-tree.c:28
ef317cd5 7528msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 7529msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5 7530
94550ed3 7531#: builtin/ls-tree.c:128
ef317cd5 7532msgid "only show trees"
07432cef 7533msgstr "只显示树"
ef317cd5 7534
94550ed3 7535#: builtin/ls-tree.c:130
ef317cd5 7536msgid "recurse into subtrees"
07432cef 7537msgstr "递归到子树"
ef317cd5 7538
94550ed3 7539#: builtin/ls-tree.c:132
ef317cd5 7540msgid "show trees when recursing"
07432cef 7541msgstr "当递归时显示树"
ef317cd5 7542
94550ed3 7543#: builtin/ls-tree.c:135
ef317cd5 7544msgid "terminate entries with NUL byte"
4375c10e 7545msgstr "条目以 NUL 字符终止"
ef317cd5 7546
94550ed3 7547#: builtin/ls-tree.c:136
ef317cd5 7548msgid "include object size"
07432cef 7549msgstr "包括对象大小"
ef317cd5 7550
94550ed3 7551#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
ef317cd5 7552msgid "list only filenames"
07432cef 7553msgstr "只列出文件名"
ef317cd5 7554
94550ed3 7555#: builtin/ls-tree.c:143
ef317cd5 7556msgid "use full path names"
07432cef 7557msgstr "使用文件的全路径"
ef317cd5 7558
94550ed3 7559#: builtin/ls-tree.c:145
ef317cd5 7560msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 7561msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 7562
04cb2f28 7563#: builtin/merge.c:45
814ff314
JX
7564msgid "git merge [<options>] [<commit>...]"
7565msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 7566
04cb2f28 7567#: builtin/merge.c:46
814ff314
JX
7568msgid "git merge [<options>] <msg> HEAD <commit>"
7569msgstr "git merge [<选项>] <说明> HEAD <提交>"
ef317cd5 7570
04cb2f28 7571#: builtin/merge.c:47
ef317cd5 7572msgid "git merge --abort"
07432cef 7573msgstr "git merge --abort"
ef317cd5 7574
04cb2f28 7575#: builtin/merge.c:100
c04f5ac3
JX
7576msgid "switch `m' requires a value"
7577msgstr "开关 `m' 需要一个值"
7578
04cb2f28 7579#: builtin/merge.c:137
c04f5ac3
JX
7580#, c-format
7581msgid "Could not find merge strategy '%s'.\n"
90e6ef53 7582msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 7583
04cb2f28 7584#: builtin/merge.c:138
c04f5ac3
JX
7585#, c-format
7586msgid "Available strategies are:"
7587msgstr "可用的策略有:"
7588
04cb2f28 7589#: builtin/merge.c:143
c04f5ac3
JX
7590#, c-format
7591msgid "Available custom strategies are:"
7592msgstr "可用的自定义策略有:"
7593
1b7f4a34 7594#: builtin/merge.c:193 builtin/pull.c:119
ef317cd5 7595msgid "do not show a diffstat at the end of the merge"
07432cef 7596msgstr "在合并的最后不显示差异统计"
ef317cd5 7597
1b7f4a34 7598#: builtin/merge.c:196 builtin/pull.c:122
ef317cd5 7599msgid "show a diffstat at the end of the merge"
07432cef 7600msgstr "在合并的最后显示差异统计"
ef317cd5 7601
1b7f4a34 7602#: builtin/merge.c:197 builtin/pull.c:125
ef317cd5 7603msgid "(synonym to --stat)"
07432cef 7604msgstr "(和 --stat 同义)"
ef317cd5 7605
1b7f4a34 7606#: builtin/merge.c:199 builtin/pull.c:128
ef317cd5 7607msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 7608msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 7609
1b7f4a34 7610#: builtin/merge.c:202 builtin/pull.c:131
ef317cd5 7611msgid "create a single commit instead of doing a merge"
07432cef 7612msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 7613
1b7f4a34 7614#: builtin/merge.c:204 builtin/pull.c:134
ef317cd5 7615msgid "perform a commit if the merge succeeds (default)"
07432cef 7616msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 7617
1b7f4a34 7618#: builtin/merge.c:206 builtin/pull.c:137
ef317cd5 7619msgid "edit message before committing"
07432cef 7620msgstr "在提交前编辑提交说明"
ef317cd5 7621
04cb2f28 7622#: builtin/merge.c:207
ef317cd5 7623msgid "allow fast-forward (default)"
07432cef 7624msgstr "允许快进(默认)"
ef317cd5 7625
1b7f4a34 7626#: builtin/merge.c:209 builtin/pull.c:143
ef317cd5 7627msgid "abort if fast-forward is not possible"
07432cef 7628msgstr "如果不能快进就放弃合并"
ef317cd5 7629
04cb2f28 7630#: builtin/merge.c:213
1003b3a5
JX
7631msgid "Verify that the named commit has a valid GPG signature"
7632msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7633
1b7f4a34
JX
7634#: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148
7635#: builtin/revert.c:89
ef317cd5 7636msgid "strategy"
07432cef 7637msgstr "策略"
ef317cd5 7638
1b7f4a34 7639#: builtin/merge.c:215 builtin/pull.c:149
ef317cd5 7640msgid "merge strategy to use"
07432cef 7641msgstr "要使用的合并策略"
ef317cd5 7642
1b7f4a34 7643#: builtin/merge.c:216 builtin/pull.c:152
ef317cd5 7644msgid "option=value"
07432cef 7645msgstr "option=value"
ef317cd5 7646
1b7f4a34 7647#: builtin/merge.c:217 builtin/pull.c:153
ef317cd5 7648msgid "option for selected merge strategy"
07432cef 7649msgstr "所选的合并策略的选项"
ef317cd5 7650
04cb2f28 7651#: builtin/merge.c:219
ef317cd5 7652msgid "merge commit message (for a non-fast-forward merge)"
07432cef 7653msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 7654
04cb2f28 7655#: builtin/merge.c:223
ef317cd5 7656msgid "abort the current in-progress merge"
07432cef 7657msgstr "放弃当前正在进行的合并"
ef317cd5 7658
04cb2f28 7659#: builtin/merge.c:251
c04f5ac3
JX
7660msgid "could not run stash."
7661msgstr "不能进行进度保存。"
7662
04cb2f28 7663#: builtin/merge.c:256
c04f5ac3
JX
7664msgid "stash failed"
7665msgstr "进度保存失败"
7666
04cb2f28 7667#: builtin/merge.c:261
c04f5ac3
JX
7668#, c-format
7669msgid "not a valid object: %s"
7670msgstr "不是一个有效对象:%s"
7671
04cb2f28 7672#: builtin/merge.c:280 builtin/merge.c:297
c04f5ac3
JX
7673msgid "read-tree failed"
7674msgstr "读取树失败"
7675
90e6ef53 7676# 译者:注意保持前导空格
04cb2f28 7677#: builtin/merge.c:327
c04f5ac3
JX
7678msgid " (nothing to squash)"
7679msgstr " (无可压缩)"
7680
04cb2f28 7681#: builtin/merge.c:340
c04f5ac3
JX
7682#, c-format
7683msgid "Squash commit -- not updating HEAD\n"
7684msgstr "压缩提交 -- 未更新 HEAD\n"
7685
1b7f4a34
JX
7686#: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
7687#: builtin/merge.c:988
7688#, c-format
7689msgid "Could not write to '%s'"
7690msgstr "不能写入 '%s'"
7691
04cb2f28 7692#: builtin/merge.c:372
c04f5ac3
JX
7693msgid "Writing SQUASH_MSG"
7694msgstr "写入 SQUASH_MSG"
7695
04cb2f28 7696#: builtin/merge.c:374
c04f5ac3
JX
7697msgid "Finishing SQUASH_MSG"
7698msgstr "完成 SQUASH_MSG"
7699
04cb2f28 7700#: builtin/merge.c:397
c04f5ac3
JX
7701#, c-format
7702msgid "No merge message -- not updating HEAD\n"
7703msgstr "无合并信息 -- 未更新 HEAD\n"
7704
04cb2f28 7705#: builtin/merge.c:447
c04f5ac3
JX
7706#, c-format
7707msgid "'%s' does not point to a commit"
7708msgstr "'%s' 没有指向一个提交"
7709
7aea43ff 7710#: builtin/merge.c:537
c04f5ac3
JX
7711#, c-format
7712msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 7713msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 7714
7aea43ff 7715#: builtin/merge.c:656
c04f5ac3
JX
7716msgid "Not handling anything other than two heads merge."
7717msgstr "不能处理两个头合并之外的任何操作。"
7718
7aea43ff 7719#: builtin/merge.c:670
c04f5ac3
JX
7720#, c-format
7721msgid "Unknown option for merge-recursive: -X%s"
7722msgstr "merge-recursive 的未知选项:-X%s"
7723
7aea43ff 7724#: builtin/merge.c:683
c04f5ac3
JX
7725#, c-format
7726msgid "unable to write %s"
7727msgstr "不能写 %s"
7728
7aea43ff 7729#: builtin/merge.c:772
c04f5ac3
JX
7730#, c-format
7731msgid "Could not read from '%s'"
7732msgstr "不能从 '%s' 读取"
7733
7aea43ff 7734#: builtin/merge.c:781
c04f5ac3
JX
7735#, c-format
7736msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7737msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7738
7aea43ff 7739#: builtin/merge.c:787
a77c07d9 7740#, c-format
c04f5ac3
JX
7741msgid ""
7742"Please enter a commit message to explain why this merge is necessary,\n"
7743"especially if it merges an updated upstream into a topic branch.\n"
7744"\n"
a77c07d9 7745"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
7746"the commit.\n"
7747msgstr ""
7748"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
7749"合并到主题分支。\n"
7750"\n"
a77c07d9 7751"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 7752
7aea43ff 7753#: builtin/merge.c:811
c04f5ac3
JX
7754msgid "Empty commit message."
7755msgstr "空提交信息。"
7756
7aea43ff 7757#: builtin/merge.c:823
c04f5ac3
JX
7758#, c-format
7759msgid "Wonderful.\n"
7760msgstr "太棒了。\n"
7761
7aea43ff 7762#: builtin/merge.c:878
c04f5ac3
JX
7763#, c-format
7764msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7765msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7766
7aea43ff 7767#: builtin/merge.c:894
c04f5ac3
JX
7768#, c-format
7769msgid "'%s' is not a commit"
7770msgstr "'%s' 不是一个提交"
7771
7aea43ff 7772#: builtin/merge.c:935
c04f5ac3 7773msgid "No current branch."
90e6ef53 7774msgstr "没有当前分支。"
c04f5ac3 7775
7aea43ff 7776#: builtin/merge.c:937
c04f5ac3 7777msgid "No remote for the current branch."
160fb2b2 7778msgstr "当前分支没有对应的远程仓库。"
c04f5ac3 7779
7aea43ff 7780#: builtin/merge.c:939
c04f5ac3 7781msgid "No default upstream defined for the current branch."
90e6ef53 7782msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 7783
7aea43ff 7784#: builtin/merge.c:944
170e9899 7785#, c-format
2e8451e8
JX
7786msgid "No remote-tracking branch for %s from %s"
7787msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 7788
94550ed3 7789#: builtin/merge.c:1079
7aea43ff
JX
7790#, c-format
7791msgid "could not close '%s'"
7792msgstr "不能关闭 '%s'"
7793
94550ed3 7794#: builtin/merge.c:1206
c04f5ac3 7795msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 7796msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 7797
94550ed3 7798#: builtin/merge.c:1222
c04f5ac3
JX
7799msgid ""
7800"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 7801"Please, commit your changes before you merge."
c04f5ac3
JX
7802msgstr ""
7803"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 7804"请在合并前先提交您的修改。"
c04f5ac3 7805
94550ed3 7806#: builtin/merge.c:1229
c04f5ac3
JX
7807msgid ""
7808"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 7809"Please, commit your changes before you merge."
c04f5ac3
JX
7810msgstr ""
7811"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 7812"请在合并前先提交您的修改。"
c04f5ac3 7813
94550ed3 7814#: builtin/merge.c:1232
c04f5ac3
JX
7815msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7816msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7817
94550ed3 7818#: builtin/merge.c:1241
c04f5ac3 7819msgid "You cannot combine --squash with --no-ff."
649900bc 7820msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 7821
94550ed3 7822#: builtin/merge.c:1249
c04f5ac3 7823msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 7824msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 7825
94550ed3 7826#: builtin/merge.c:1266
c04f5ac3
JX
7827msgid "Squash commit into empty head not supported yet"
7828msgstr "尚不支持到空分支的压缩提交"
7829
94550ed3 7830#: builtin/merge.c:1268
c04f5ac3
JX
7831msgid "Non-fast-forward commit does not make sense into an empty head"
7832msgstr "到空分支的非快进式提交没有意义"
7833
94550ed3 7834#: builtin/merge.c:1274
2e8451e8
JX
7835#, c-format
7836msgid "%s - not something we can merge"
7837msgstr "%s - 不能被合并"
7838
94550ed3 7839#: builtin/merge.c:1276
7aea43ff
JX
7840msgid "Can merge only exactly one commit into empty head"
7841msgstr "只能将一个提交合并到空分支上"
7842
94550ed3 7843#: builtin/merge.c:1331
1003b3a5
JX
7844#, c-format
7845msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7846msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7847
94550ed3 7848#: builtin/merge.c:1334
1003b3a5
JX
7849#, c-format
7850msgid "Commit %s has a bad GPG signature allegedly by %s."
7851msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7852
94550ed3 7853#: builtin/merge.c:1337
1003b3a5
JX
7854#, c-format
7855msgid "Commit %s does not have a GPG signature."
7856msgstr "提交 %s 没有一个 GPG 签名。"
7857
94550ed3 7858#: builtin/merge.c:1340
1003b3a5
JX
7859#, c-format
7860msgid "Commit %s has a good GPG signature by %s\n"
7861msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7862
7aea43ff 7863#: builtin/merge.c:1423
c04f5ac3
JX
7864#, c-format
7865msgid "Updating %s..%s\n"
7866msgstr "更新 %s..%s\n"
7867
94550ed3 7868#: builtin/merge.c:1460
c04f5ac3
JX
7869#, c-format
7870msgid "Trying really trivial in-index merge...\n"
90e6ef53 7871msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 7872
94550ed3 7873#: builtin/merge.c:1467
c04f5ac3
JX
7874#, c-format
7875msgid "Nope.\n"
7876msgstr "无。\n"
7877
94550ed3 7878#: builtin/merge.c:1499
c04f5ac3 7879msgid "Not possible to fast-forward, aborting."
1aabac65 7880msgstr "无法快进,终止。"
c04f5ac3 7881
94550ed3 7882#: builtin/merge.c:1522 builtin/merge.c:1601
c04f5ac3
JX
7883#, c-format
7884msgid "Rewinding the tree to pristine...\n"
7885msgstr "将树回滚至原始状态...\n"
7886
94550ed3 7887#: builtin/merge.c:1526
c04f5ac3
JX
7888#, c-format
7889msgid "Trying merge strategy %s...\n"
7890msgstr "尝试合并策略 %s...\n"
7891
94550ed3 7892#: builtin/merge.c:1592
c04f5ac3
JX
7893#, c-format
7894msgid "No merge strategy handled the merge.\n"
7895msgstr "没有合并策略处理此合并。\n"
7896
94550ed3 7897#: builtin/merge.c:1594
c04f5ac3
JX
7898#, c-format
7899msgid "Merge with strategy %s failed.\n"
7900msgstr "使用策略 %s 合并失败。\n"
7901
94550ed3 7902#: builtin/merge.c:1603
c04f5ac3
JX
7903#, c-format
7904msgid "Using the %s to prepare resolving by hand.\n"
7905msgstr "使用 %s 以准备手工解决。\n"
7906
94550ed3 7907#: builtin/merge.c:1615
c04f5ac3
JX
7908#, c-format
7909msgid "Automatic merge went well; stopped before committing as requested\n"
7910msgstr "自动合并进展顺利,按要求在提交前停止\n"
7911
cfff71a9 7912#: builtin/merge-base.c:29
814ff314
JX
7913msgid "git merge-base [-a | --all] <commit> <commit>..."
7914msgstr "git merge-base [-a | --all] <提交> <提交>..."
ef317cd5 7915
cfff71a9 7916#: builtin/merge-base.c:30
814ff314
JX
7917msgid "git merge-base [-a | --all] --octopus <commit>..."
7918msgstr "git merge-base [-a | --all] --octopus <提交>..."
ef317cd5 7919
cfff71a9 7920#: builtin/merge-base.c:31
ef317cd5 7921msgid "git merge-base --independent <commit>..."
07432cef 7922msgstr "git merge-base --independent <提交>..."
ef317cd5 7923
cfff71a9 7924#: builtin/merge-base.c:32
ef317cd5 7925msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 7926msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5 7927
cfff71a9
JX
7928#: builtin/merge-base.c:33
7929msgid "git merge-base --fork-point <ref> [<commit>]"
d9d56b23 7930msgstr "git merge-base --fork-point <引用> [<提交>]"
cfff71a9
JX
7931
7932#: builtin/merge-base.c:214
ef317cd5 7933msgid "output all common ancestors"
07432cef 7934msgstr "输出所有共同的祖先"
ef317cd5 7935
cfff71a9 7936#: builtin/merge-base.c:216
ef317cd5 7937msgid "find ancestors for a single n-way merge"
07432cef 7938msgstr "查找一个多路合并的祖先提交"
ef317cd5 7939
cfff71a9 7940#: builtin/merge-base.c:218
ef317cd5 7941msgid "list revs not reachable from others"
07432cef 7942msgstr "显示不能被其他访问到的版本"
ef317cd5 7943
cfff71a9 7944#: builtin/merge-base.c:220
ef317cd5 7945msgid "is the first one ancestor of the other?"
07432cef 7946msgstr "第一个是其他的祖先提交么?"
ef317cd5 7947
cfff71a9
JX
7948#: builtin/merge-base.c:222
7949msgid "find where <commit> forked from reflog of <ref>"
e397e7e3 7950msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
cfff71a9 7951
ef317cd5
JX
7952#: builtin/merge-file.c:8
7953msgid ""
814ff314
JX
7954"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7955"<orig-file> <file2>"
ef317cd5 7956msgstr ""
814ff314
JX
7957"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7958"件> <文件2>"
ef317cd5
JX
7959
7960#: builtin/merge-file.c:33
7961msgid "send results to standard output"
07432cef 7962msgstr "将结果发送到标准输出"
ef317cd5
JX
7963
7964#: builtin/merge-file.c:34
7965msgid "use a diff3 based merge"
07432cef 7966msgstr "使用基于 diff3 的合并"
ef317cd5
JX
7967
7968#: builtin/merge-file.c:35
7969msgid "for conflicts, use our version"
07432cef 7970msgstr "如果冲突,使用我们的版本"
ef317cd5
JX
7971
7972#: builtin/merge-file.c:37
7973msgid "for conflicts, use their version"
07432cef 7974msgstr "如果冲突,使用他们的版本"
ef317cd5
JX
7975
7976#: builtin/merge-file.c:39
7977msgid "for conflicts, use a union version"
07432cef 7978msgstr "如果冲突,使用联合版本"
ef317cd5
JX
7979
7980#: builtin/merge-file.c:42
7981msgid "for conflicts, use this marker size"
07432cef 7982msgstr "如果冲突,使用指定长度的标记"
ef317cd5
JX
7983
7984#: builtin/merge-file.c:43
7985msgid "do not warn about conflicts"
07432cef 7986msgstr "不要警告冲突"
ef317cd5
JX
7987
7988#: builtin/merge-file.c:45
814ff314
JX
7989msgid "set labels for file1/orig-file/file2"
7990msgstr "为 文件1/初始文件/文件2 设置标签"
c04f5ac3 7991
6c94aba5 7992#: builtin/mktree.c:64
ef317cd5 7993msgid "git mktree [-z] [--missing] [--batch]"
07432cef 7994msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 7995
6c94aba5 7996#: builtin/mktree.c:150
ef317cd5 7997msgid "input is NUL terminated"
07432cef 7998msgstr "输入以 NUL 字符终止"
c04f5ac3 7999
6c94aba5 8000#: builtin/mktree.c:151 builtin/write-tree.c:24
ef317cd5 8001msgid "allow missing objects"
07432cef 8002msgstr "允许丢失的对象"
c04f5ac3 8003
6c94aba5 8004#: builtin/mktree.c:152
ef317cd5 8005msgid "allow creation of more than one tree"
07432cef 8006msgstr "允许创建一个以上的树"
c04f5ac3 8007
90314792 8008#: builtin/mv.c:15
814ff314
JX
8009msgid "git mv [<options>] <source>... <destination>"
8010msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 8011
220c313c
JX
8012#: builtin/mv.c:69
8013#, c-format
8014msgid "Directory %s is in index and no submodule?"
8015msgstr "目录 %s 在索引中并且不是子模组?"
8016
cfff71a9 8017#: builtin/mv.c:71
220c313c 8018msgid "Please stage your changes to .gitmodules or stash them to proceed"
160fb2b2 8019msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
220c313c
JX
8020
8021#: builtin/mv.c:89
8022#, c-format
8023msgid "%.*s is in index"
8024msgstr "%.*s 在索引中"
8025
8026#: builtin/mv.c:111
ef317cd5 8027msgid "force move/rename even if target exists"
07432cef 8028msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 8029
220c313c 8030#: builtin/mv.c:112
ef317cd5 8031msgid "skip move/rename errors"
07432cef 8032msgstr "跳过移动/重命名错误"
c04f5ac3 8033
220c313c
JX
8034#: builtin/mv.c:151
8035#, c-format
8036msgid "destination '%s' is not a directory"
8037msgstr "目标 '%s' 不是一个目录"
8038
8039#: builtin/mv.c:162
c04f5ac3
JX
8040#, c-format
8041msgid "Checking rename of '%s' to '%s'\n"
8042msgstr "检查 '%s' 到 '%s' 的重命名\n"
8043
220c313c 8044#: builtin/mv.c:166
c04f5ac3
JX
8045msgid "bad source"
8046msgstr "坏的源"
8047
220c313c 8048#: builtin/mv.c:169
c04f5ac3
JX
8049msgid "can not move directory into itself"
8050msgstr "不能将目录移动到自身"
8051
220c313c 8052#: builtin/mv.c:172
c04f5ac3
JX
8053msgid "cannot move directory over file"
8054msgstr "不能将目录移动到文件"
8055
220c313c 8056#: builtin/mv.c:181
c04f5ac3
JX
8057msgid "source directory is empty"
8058msgstr "源目录为空"
8059
220c313c 8060#: builtin/mv.c:206
c04f5ac3
JX
8061msgid "not under version control"
8062msgstr "不在版本控制之下"
8063
220c313c 8064#: builtin/mv.c:209
c04f5ac3
JX
8065msgid "destination exists"
8066msgstr "目标已存在"
8067
220c313c 8068#: builtin/mv.c:217
c04f5ac3
JX
8069#, c-format
8070msgid "overwriting '%s'"
8071msgstr "覆盖 '%s'"
8072
220c313c 8073#: builtin/mv.c:220
c04f5ac3
JX
8074msgid "Cannot overwrite"
8075msgstr "不能覆盖"
8076
220c313c 8077#: builtin/mv.c:223
c04f5ac3
JX
8078msgid "multiple sources for the same target"
8079msgstr "同一目标具有多个源"
8080
220c313c 8081#: builtin/mv.c:225
cfff71a9
JX
8082msgid "destination directory does not exist"
8083msgstr "目标目录不存在"
8084
220c313c 8085#: builtin/mv.c:232
c04f5ac3
JX
8086#, c-format
8087msgid "%s, source=%s, destination=%s"
8088msgstr "%s,源=%s,目标=%s"
8089
220c313c 8090#: builtin/mv.c:253
c04f5ac3
JX
8091#, c-format
8092msgid "Renaming %s to %s\n"
8093msgstr "重命名 %s 至 %s\n"
8094
94550ed3 8095#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
c04f5ac3
JX
8096#, c-format
8097msgid "renaming '%s' failed"
8098msgstr "重命名 '%s' 失败"
8099
94550ed3 8100#: builtin/name-rev.c:251
814ff314
JX
8101msgid "git name-rev [<options>] <commit>..."
8102msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 8103
94550ed3 8104#: builtin/name-rev.c:252
814ff314
JX
8105msgid "git name-rev [<options>] --all"
8106msgstr "git name-rev [<选项>] --all"
ef317cd5 8107
94550ed3 8108#: builtin/name-rev.c:253
814ff314
JX
8109msgid "git name-rev [<options>] --stdin"
8110msgstr "git name-rev [<选项>] --stdin"
ef317cd5 8111
94550ed3 8112#: builtin/name-rev.c:305
ef317cd5 8113msgid "print only names (no SHA-1)"
07432cef 8114msgstr "只打印名称(无 SHA-1)"
ef317cd5 8115
94550ed3 8116#: builtin/name-rev.c:306
ef317cd5 8117msgid "only use tags to name the commits"
55a16ee4 8118msgstr "只使用标签来命名提交"
ef317cd5 8119
94550ed3 8120#: builtin/name-rev.c:308
ef317cd5 8121msgid "only use refs matching <pattern>"
07432cef 8122msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 8123
94550ed3 8124#: builtin/name-rev.c:310
ef317cd5 8125msgid "list all commits reachable from all refs"
07432cef 8126msgstr "列出可以从所有引用访问的提交"
ef317cd5 8127
94550ed3 8128#: builtin/name-rev.c:311
ef317cd5 8129msgid "read from stdin"
07432cef 8130msgstr "从标准输入读取"
ef317cd5 8131
94550ed3 8132#: builtin/name-rev.c:312
90314792
JX
8133msgid "allow to print `undefined` names (default)"
8134msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 8135
94550ed3 8136#: builtin/name-rev.c:318
2e8451e8 8137msgid "dereference tags in the input (internal use)"
55a16ee4 8138msgstr "反向解析输入中的标签(内部使用)"
2e8451e8 8139
1b7f4a34 8140#: builtin/notes.c:25
814ff314 8141msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 8142msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 8143
1b7f4a34 8144#: builtin/notes.c:26
ef317cd5 8145msgid ""
814ff314 8146"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 8147"| (-c | -C) <object>] [<object>]"
ef317cd5 8148msgstr ""
04cb2f28
JX
8149"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
8150"| (-c | -C) <对象>] [<对象>]"
ef317cd5 8151
1b7f4a34 8152#: builtin/notes.c:27
814ff314 8153msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 8154msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 8155
1b7f4a34 8156#: builtin/notes.c:28
ef317cd5 8157msgid ""
814ff314 8158"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 8159"(-c | -C) <object>] [<object>]"
ef317cd5 8160msgstr ""
04cb2f28
JX
8161"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
8162"(-c | -C) <对象>] [<对象>]"
ef317cd5 8163
1b7f4a34 8164#: builtin/notes.c:29
814ff314 8165msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 8166msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 8167
1b7f4a34 8168#: builtin/notes.c:30
814ff314 8169msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 8170msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 8171
1b7f4a34 8172#: builtin/notes.c:31
ef317cd5 8173msgid ""
814ff314 8174"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 8175msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 8176
1b7f4a34 8177#: builtin/notes.c:32
ef317cd5 8178msgid "git notes merge --commit [-v | -q]"
07432cef 8179msgstr "git notes merge --commit [-v | -q]"
ef317cd5 8180
1b7f4a34 8181#: builtin/notes.c:33
ef317cd5 8182msgid "git notes merge --abort [-v | -q]"
07432cef 8183msgstr "git notes merge --abort [-v | -q]"
ef317cd5 8184
1b7f4a34 8185#: builtin/notes.c:34
814ff314 8186msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 8187msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 8188
1b7f4a34 8189#: builtin/notes.c:35
814ff314 8190msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
07432cef 8191msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
ef317cd5 8192
1b7f4a34 8193#: builtin/notes.c:36
814ff314 8194msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 8195msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 8196
1b7f4a34 8197#: builtin/notes.c:41
ef317cd5 8198msgid "git notes [list [<object>]]"
07432cef 8199msgstr "git notes [list [<对象>]]"
ef317cd5 8200
1b7f4a34 8201#: builtin/notes.c:46
ef317cd5 8202msgid "git notes add [<options>] [<object>]"
07432cef 8203msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 8204
1b7f4a34 8205#: builtin/notes.c:51
ef317cd5 8206msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 8207msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 8208
1b7f4a34 8209#: builtin/notes.c:52
ef317cd5 8210msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 8211msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 8212
1b7f4a34 8213#: builtin/notes.c:57
ef317cd5 8214msgid "git notes append [<options>] [<object>]"
07432cef 8215msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 8216
1b7f4a34 8217#: builtin/notes.c:62
ef317cd5 8218msgid "git notes edit [<object>]"
07432cef 8219msgstr "git notes edit [<对象>]"
ef317cd5 8220
1b7f4a34 8221#: builtin/notes.c:67
ef317cd5 8222msgid "git notes show [<object>]"
07432cef 8223msgstr "git notes show [<对象>]"
ef317cd5 8224
1b7f4a34 8225#: builtin/notes.c:72
814ff314 8226msgid "git notes merge [<options>] <notes-ref>"
07432cef 8227msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 8228
1b7f4a34 8229#: builtin/notes.c:73
ef317cd5 8230msgid "git notes merge --commit [<options>]"
07432cef 8231msgstr "git notes merge --commit [<选项>]"
ef317cd5 8232
1b7f4a34 8233#: builtin/notes.c:74
ef317cd5 8234msgid "git notes merge --abort [<options>]"
07432cef 8235msgstr "git notes merge --abort [<选项>]"
ef317cd5 8236
1b7f4a34 8237#: builtin/notes.c:79
ef317cd5 8238msgid "git notes remove [<object>]"
07432cef 8239msgstr "git notes remove [<对象>]"
ef317cd5 8240
1b7f4a34 8241#: builtin/notes.c:84
ef317cd5 8242msgid "git notes prune [<options>]"
07432cef 8243msgstr "git notes prune [<选项>]"
ef317cd5 8244
1b7f4a34 8245#: builtin/notes.c:89
ef317cd5 8246msgid "git notes get-ref"
07432cef 8247msgstr "git notes get-ref"
ef317cd5 8248
1b7f4a34 8249#: builtin/notes.c:147
c04f5ac3
JX
8250#, c-format
8251msgid "unable to start 'show' for object '%s'"
8252msgstr "不能为对象 '%s' 开始 'show'"
8253
1b7f4a34 8254#: builtin/notes.c:151
a77c07d9
JX
8255msgid "could not read 'show' output"
8256msgstr "不能读取 'show' 的输出"
c04f5ac3 8257
1b7f4a34 8258#: builtin/notes.c:159
c04f5ac3
JX
8259#, c-format
8260msgid "failed to finish 'show' for object '%s'"
8261msgstr "无法为对象 '%s' 完成 'show'"
8262
94550ed3 8263#: builtin/notes.c:174 builtin/tag.c:248
c04f5ac3
JX
8264#, c-format
8265msgid "could not create file '%s'"
8266msgstr "不能创建文件 '%s'"
8267
1b7f4a34 8268#: builtin/notes.c:193
c04f5ac3
JX
8269msgid "Please supply the note contents using either -m or -F option"
8270msgstr "请通过 -m 或 -F 选项为注解提供内容"
8271
1b7f4a34 8272#: builtin/notes.c:202
c04f5ac3
JX
8273msgid "unable to write note object"
8274msgstr "不能写注解对象"
8275
1b7f4a34 8276#: builtin/notes.c:204
c04f5ac3 8277#, c-format
220c313c
JX
8278msgid "The note contents have been left in %s"
8279msgstr "注解内容被留在 %s 中"
c04f5ac3 8280
94550ed3 8281#: builtin/notes.c:232 builtin/tag.c:440
c04f5ac3
JX
8282#, c-format
8283msgid "cannot read '%s'"
8284msgstr "不能读取 '%s'"
8285
94550ed3 8286#: builtin/notes.c:234 builtin/tag.c:443
c04f5ac3
JX
8287#, c-format
8288msgid "could not open or read '%s'"
8289msgstr "不能打开或读取 '%s'"
8290
1b7f4a34
JX
8291#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
8292#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
8293#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
94550ed3 8294#: builtin/notes.c:877 builtin/tag.c:456
c04f5ac3
JX
8295#, c-format
8296msgid "Failed to resolve '%s' as a valid ref."
90e6ef53 8297msgstr "无法解析 '%s' 为一个有效引用。"
c04f5ac3 8298
1b7f4a34 8299#: builtin/notes.c:256
c04f5ac3
JX
8300#, c-format
8301msgid "Failed to read object '%s'."
8302msgstr "无法读取对象 '%s'。"
8303
1b7f4a34 8304#: builtin/notes.c:260
6c94aba5
JX
8305#, c-format
8306msgid "Cannot read note data from non-blob object '%s'."
8307msgstr "不能从非数据对象 '%s' 中读取注解数据"
8308
1b7f4a34
JX
8309#: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490
8310#: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646
8311#: builtin/notes.c:942
c04f5ac3
JX
8312msgid "too many parameters"
8313msgstr "参数太多"
8314
1b7f4a34 8315#: builtin/notes.c:372 builtin/notes.c:659
c04f5ac3
JX
8316#, c-format
8317msgid "No note found for object %s."
8318msgstr "未发现对象 %s 的注解。"
8319
1b7f4a34 8320#: builtin/notes.c:393 builtin/notes.c:556
ef317cd5 8321msgid "note contents as a string"
07432cef 8322msgstr "注解内容作为一个字符串"
ef317cd5 8323
1b7f4a34 8324#: builtin/notes.c:396 builtin/notes.c:559
ef317cd5 8325msgid "note contents in a file"
07432cef 8326msgstr "注解内容到一个文件中"
ef317cd5 8327
1b7f4a34 8328#: builtin/notes.c:399 builtin/notes.c:562
ef317cd5 8329msgid "reuse and edit specified note object"
07432cef 8330msgstr "重用和编辑指定的注解对象"
ef317cd5 8331
1b7f4a34 8332#: builtin/notes.c:402 builtin/notes.c:565
ef317cd5 8333msgid "reuse specified note object"
07432cef 8334msgstr "重用指定的注解对象"
ef317cd5 8335
1b7f4a34 8336#: builtin/notes.c:405 builtin/notes.c:568
04cb2f28
JX
8337msgid "allow storing empty note"
8338msgstr "允许保存空白注释"
8339
1b7f4a34 8340#: builtin/notes.c:406 builtin/notes.c:477
ef317cd5 8341msgid "replace existing notes"
07432cef 8342msgstr "替换已存在的注解"
ef317cd5 8343
1b7f4a34 8344#: builtin/notes.c:431
c04f5ac3
JX
8345#, c-format
8346msgid ""
8347"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
8348"existing notes"
8349msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8350
1b7f4a34 8351#: builtin/notes.c:446 builtin/notes.c:525
c04f5ac3
JX
8352#, c-format
8353msgid "Overwriting existing notes for object %s\n"
8354msgstr "覆盖对象 %s 现存注解\n"
8355
1b7f4a34 8356#: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882
04cb2f28
JX
8357#, c-format
8358msgid "Removing note for object %s\n"
8359msgstr "删除对象 %s 的注解\n"
8360
1b7f4a34 8361#: builtin/notes.c:478
ef317cd5 8362msgid "read objects from stdin"
07432cef 8363msgstr "从标准输入读取对象"
ef317cd5 8364
1b7f4a34 8365#: builtin/notes.c:480
ef317cd5 8366msgid "load rewriting config for <command> (implies --stdin)"
07432cef 8367msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 8368
1b7f4a34 8369#: builtin/notes.c:498
c04f5ac3
JX
8370msgid "too few parameters"
8371msgstr "参数太少"
8372
1b7f4a34 8373#: builtin/notes.c:519
c04f5ac3
JX
8374#, c-format
8375msgid ""
8376"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
8377"existing notes"
8378msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8379
1b7f4a34 8380#: builtin/notes.c:531
c04f5ac3
JX
8381#, c-format
8382msgid "Missing notes on source object %s. Cannot copy."
8383msgstr "源对象 %s 缺少注解。不能拷贝。"
8384
1b7f4a34 8385#: builtin/notes.c:583
ef317cd5
JX
8386#, c-format
8387msgid ""
8388"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
8389"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
8390msgstr ""
8391"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
8392"请换用 'git notes add -f -m/-F/-c/-C'。\n"
8393
1b7f4a34 8394#: builtin/notes.c:764
ef317cd5 8395msgid "General options"
07432cef 8396msgstr "通用选项"
ef317cd5 8397
1b7f4a34 8398#: builtin/notes.c:766
ef317cd5 8399msgid "Merge options"
07432cef 8400msgstr "合并选项"
ef317cd5 8401
1b7f4a34 8402#: builtin/notes.c:768
ef317cd5
JX
8403msgid ""
8404"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
8405"cat_sort_uniq)"
07432cef 8406msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 8407
1b7f4a34 8408#: builtin/notes.c:770
ef317cd5 8409msgid "Committing unmerged notes"
07432cef 8410msgstr "提交未合并的注解"
ef317cd5 8411
1b7f4a34 8412#: builtin/notes.c:772
ef317cd5 8413msgid "finalize notes merge by committing unmerged notes"
07432cef 8414msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 8415
1b7f4a34 8416#: builtin/notes.c:774
ef317cd5 8417msgid "Aborting notes merge resolution"
07432cef 8418msgstr "中止注解合并的方案"
ef317cd5 8419
1b7f4a34 8420#: builtin/notes.c:776
ef317cd5 8421msgid "abort notes merge"
07432cef 8422msgstr "中止注解合并"
ef317cd5 8423
1b7f4a34
JX
8424#: builtin/notes.c:853
8425#, c-format
8426msgid "A notes merge into %s is already in-progress at %s"
8427msgstr "一个到 %s 的注解合并已经在 %s 执行中"
8428
8429#: builtin/notes.c:880
ef317cd5
JX
8430#, c-format
8431msgid "Object %s has no note\n"
8432msgstr "对象 %s 没有注解\n"
8433
1b7f4a34 8434#: builtin/notes.c:892
ef317cd5 8435msgid "attempt to remove non-existent note is not an error"
07432cef 8436msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 8437
1b7f4a34 8438#: builtin/notes.c:895
ef317cd5 8439msgid "read object names from the standard input"
07432cef 8440msgstr "从标准输入读取对象名称"
ef317cd5 8441
1b7f4a34 8442#: builtin/notes.c:976
6c94aba5 8443msgid "notes-ref"
07432cef 8444msgstr "注解引用"
ef317cd5 8445
1b7f4a34 8446#: builtin/notes.c:977
814ff314 8447msgid "use notes from <notes-ref>"
07432cef 8448msgstr "从 <注解引用> 使用注解"
ef317cd5 8449
94550ed3 8450#: builtin/notes.c:1012 builtin/remote.c:1647
ef317cd5
JX
8451#, c-format
8452msgid "Unknown subcommand: %s"
8453msgstr "未知子命令:%s"
8454
220c313c 8455#: builtin/pack-objects.c:28
1b7f4a34
JX
8456msgid ""
8457"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
8458msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
ef317cd5 8459
220c313c 8460#: builtin/pack-objects.c:29
1b7f4a34
JX
8461msgid ""
8462"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
8463msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
ef317cd5 8464
814ff314 8465#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
ef317cd5
JX
8466#, c-format
8467msgid "deflate error (%d)"
8468msgstr "压缩错误 (%d)"
8469
814ff314 8470#: builtin/pack-objects.c:771
6c94aba5
JX
8471msgid "Writing objects"
8472msgstr "写入对象中"
8473
7aea43ff 8474#: builtin/pack-objects.c:1011
6c94aba5
JX
8475msgid "disabling bitmap writing, as some objects are not being packed"
8476msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
8477
7aea43ff 8478#: builtin/pack-objects.c:2171
6c94aba5
JX
8479msgid "Compressing objects"
8480msgstr "压缩对象中"
8481
7aea43ff 8482#: builtin/pack-objects.c:2568
ef317cd5
JX
8483#, c-format
8484msgid "unsupported index version %s"
8485msgstr "不支持的索引版本 %s"
8486
7aea43ff 8487#: builtin/pack-objects.c:2572
ef317cd5
JX
8488#, c-format
8489msgid "bad index version '%s'"
8490msgstr "坏的索引版本 '%s'"
8491
1b7f4a34 8492#: builtin/pack-objects.c:2602
ef317cd5 8493msgid "do not show progress meter"
07432cef 8494msgstr "不显示进度表"
ef317cd5 8495
1b7f4a34 8496#: builtin/pack-objects.c:2604
ef317cd5 8497msgid "show progress meter"
07432cef 8498msgstr "显示进度表"
ef317cd5 8499
1b7f4a34 8500#: builtin/pack-objects.c:2606
ef317cd5 8501msgid "show progress meter during object writing phase"
07432cef 8502msgstr "在对象写入阶段显示进度表"
ef317cd5 8503
1b7f4a34 8504#: builtin/pack-objects.c:2609
ef317cd5 8505msgid "similar to --all-progress when progress meter is shown"
07432cef 8506msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 8507
1b7f4a34 8508#: builtin/pack-objects.c:2610
ef317cd5 8509msgid "version[,offset]"
07432cef 8510msgstr "版本[,偏移]"
ef317cd5 8511
1b7f4a34 8512#: builtin/pack-objects.c:2611
ef317cd5 8513msgid "write the pack index file in the specified idx format version"
07432cef 8514msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 8515
1b7f4a34 8516#: builtin/pack-objects.c:2614
ef317cd5 8517msgid "maximum size of each output pack file"
07432cef 8518msgstr "每个输出包的最大尺寸"
ef317cd5 8519
1b7f4a34 8520#: builtin/pack-objects.c:2616
ef317cd5 8521msgid "ignore borrowed objects from alternate object store"
160fb2b2 8522msgstr "忽略从备用对象存储里借用对象"
ef317cd5 8523
1b7f4a34 8524#: builtin/pack-objects.c:2618
ef317cd5 8525msgid "ignore packed objects"
07432cef 8526msgstr "忽略包对象"
ef317cd5 8527
1b7f4a34 8528#: builtin/pack-objects.c:2620
ef317cd5 8529msgid "limit pack window by objects"
07432cef 8530msgstr "限制打包窗口的对象数"
ef317cd5 8531
1b7f4a34 8532#: builtin/pack-objects.c:2622
ef317cd5 8533msgid "limit pack window by memory in addition to object limit"
07432cef 8534msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 8535
1b7f4a34 8536#: builtin/pack-objects.c:2624
ef317cd5 8537msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 8538msgstr "打包允许的 delta 链的最大长度"
ef317cd5 8539
1b7f4a34 8540#: builtin/pack-objects.c:2626
ef317cd5 8541msgid "reuse existing deltas"
07432cef 8542msgstr "重用已存在的 deltas"
ef317cd5 8543
1b7f4a34 8544#: builtin/pack-objects.c:2628
ef317cd5 8545msgid "reuse existing objects"
07432cef 8546msgstr "重用已存在的对象"
ef317cd5 8547
1b7f4a34 8548#: builtin/pack-objects.c:2630
ef317cd5 8549msgid "use OFS_DELTA objects"
07432cef 8550msgstr "使用 OFS_DELTA 对象"
ef317cd5 8551
1b7f4a34 8552#: builtin/pack-objects.c:2632
ef317cd5 8553msgid "use threads when searching for best delta matches"
07432cef 8554msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 8555
1b7f4a34 8556#: builtin/pack-objects.c:2634
ef317cd5 8557msgid "do not create an empty pack output"
07432cef 8558msgstr "不创建空的包输出"
ef317cd5 8559
1b7f4a34 8560#: builtin/pack-objects.c:2636
ef317cd5 8561msgid "read revision arguments from standard input"
d9d56b23 8562msgstr "从标准输入读取版本号参数"
ef317cd5 8563
1b7f4a34 8564#: builtin/pack-objects.c:2638
ef317cd5 8565msgid "limit the objects to those that are not yet packed"
07432cef 8566msgstr "限制那些尚未打包的对象"
ef317cd5 8567
1b7f4a34 8568#: builtin/pack-objects.c:2641
ef317cd5 8569msgid "include objects reachable from any reference"
07432cef 8570msgstr "包括可以从任何引用访问到的对象"
ef317cd5 8571
1b7f4a34 8572#: builtin/pack-objects.c:2644
ef317cd5 8573msgid "include objects referred by reflog entries"
07432cef 8574msgstr "包括被引用日志引用到的对象"
ef317cd5 8575
1b7f4a34 8576#: builtin/pack-objects.c:2647
220c313c
JX
8577msgid "include objects referred to by the index"
8578msgstr "包括被索引引用到的对象"
8579
1b7f4a34 8580#: builtin/pack-objects.c:2650
ef317cd5 8581msgid "output pack to stdout"
07432cef 8582msgstr "输出包到标准输出"
ef317cd5 8583
1b7f4a34 8584#: builtin/pack-objects.c:2652
ef317cd5 8585msgid "include tag objects that refer to objects to be packed"
53438e8f 8586msgstr "包括那些引用了待打包对象的标签对象"
ef317cd5 8587
1b7f4a34 8588#: builtin/pack-objects.c:2654
ef317cd5 8589msgid "keep unreachable objects"
07432cef 8590msgstr "维持不可达的对象"
ef317cd5 8591
1b7f4a34 8592#: builtin/pack-objects.c:2655 parse-options.h:142
ef317cd5
JX
8593msgid "time"
8594msgstr "时间"
8595
1b7f4a34 8596#: builtin/pack-objects.c:2656
ef317cd5 8597msgid "unpack unreachable objects newer than <time>"
07432cef 8598msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 8599
1b7f4a34 8600#: builtin/pack-objects.c:2659
ef317cd5 8601msgid "create thin packs"
07432cef 8602msgstr "创建精简包"
ef317cd5 8603
1b7f4a34 8604#: builtin/pack-objects.c:2661
04cb2f28 8605msgid "create packs suitable for shallow fetches"
160fb2b2 8606msgstr "创建适合浅克隆仓库获取的包"
04cb2f28 8607
1b7f4a34 8608#: builtin/pack-objects.c:2663
ef317cd5 8609msgid "ignore packs that have companion .keep file"
07432cef 8610msgstr "忽略配有 .keep 文件的包"
ef317cd5 8611
1b7f4a34 8612#: builtin/pack-objects.c:2665
ef317cd5 8613msgid "pack compression level"
07432cef 8614msgstr "打包压缩级别"
ef317cd5 8615
1b7f4a34 8616#: builtin/pack-objects.c:2667
ef317cd5 8617msgid "do not hide commits by grafts"
cfff71a9 8618msgstr "显示被嫁接隐藏的提交"
ef317cd5 8619
1b7f4a34 8620#: builtin/pack-objects.c:2669
6c94aba5
JX
8621msgid "use a bitmap index if available to speed up counting objects"
8622msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8623
1b7f4a34 8624#: builtin/pack-objects.c:2671
6c94aba5
JX
8625msgid "write a bitmap index together with the pack index"
8626msgstr "在建立包索引的同时创建 bitmap 索引"
8627
1b7f4a34 8628#: builtin/pack-objects.c:2762
6c94aba5
JX
8629msgid "Counting objects"
8630msgstr "对象计数中"
8631
ef317cd5 8632#: builtin/pack-refs.c:6
814ff314
JX
8633msgid "git pack-refs [<options>]"
8634msgstr "git pack-refs [<选项>]"
c04f5ac3 8635
ef317cd5
JX
8636#: builtin/pack-refs.c:14
8637msgid "pack everything"
07432cef 8638msgstr "打包一切"
c04f5ac3 8639
ef317cd5
JX
8640#: builtin/pack-refs.c:15
8641msgid "prune loose refs (default)"
07432cef 8642msgstr "清除松散的引用(默认)"
c04f5ac3 8643
ef317cd5 8644#: builtin/prune-packed.c:7
814ff314
JX
8645msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8646msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 8647
220c313c 8648#: builtin/prune-packed.c:40
6c94aba5
JX
8649msgid "Removing duplicate objects"
8650msgstr "正在删除重复对象"
8651
5bb01d4f 8652#: builtin/prune.c:11
ef317cd5 8653msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
07432cef 8654msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7ac1c0ad 8655
94550ed3 8656#: builtin/prune.c:105 builtin/worktree.c:124
1b7f4a34
JX
8657msgid "do not remove, show only"
8658msgstr "不删除,只显示"
8659
94550ed3 8660#: builtin/prune.c:106 builtin/worktree.c:125
1b7f4a34
JX
8661msgid "report pruned objects"
8662msgstr "报告清除的对象"
8663
94550ed3 8664#: builtin/prune.c:109 builtin/worktree.c:127
1b7f4a34
JX
8665msgid "expire objects older than <time>"
8666msgstr "使早于给定时间的对象过期"
8667
94550ed3
JX
8668#: builtin/prune.c:123
8669msgid "cannot prune in a precious-objects repo"
8670msgstr "不能在珍品仓库中执行清理操作"
8671
1b7f4a34 8672#: builtin/pull.c:69
94550ed3 8673msgid "git pull [<options>] [<repository> [<refspec>...]]"
1b7f4a34
JX
8674msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
8675
8676#: builtin/pull.c:113
8677msgid "Options related to merging"
8678msgstr "和合并相关的选项"
8679
1b7f4a34
JX
8680#: builtin/pull.c:116
8681msgid "incorporate changes by rebasing rather than merging"
8682msgstr "使用变基操作取代合并操作以合入修改"
8683
8684#: builtin/pull.c:140 builtin/revert.c:105
8685msgid "allow fast-forward"
8686msgstr "允许快进式"
8687
8688#: builtin/pull.c:146
8689msgid "verify that the named commit has a valid GPG signature"
8690msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
8691
8692#: builtin/pull.c:160
8693msgid "Options related to fetching"
8694msgstr "和获取相关的参数"
8695
8696#: builtin/pull.c:268
8697#, c-format
8698msgid "Invalid value for pull.ff: %s"
8699msgstr "pull.ff 的取值无效:%s"
8700
8701#: builtin/pull.c:352
8702msgid "Cannot pull with rebase: You have unstaged changes."
8703msgstr "无法通过变基方式拉取:您有未暂存的变更。"
8704
8705#: builtin/pull.c:358
8706msgid "Additionally, your index contains uncommitted changes."
8707msgstr "而且您的索引中包含未提交的变更。"
8708
8709#: builtin/pull.c:360
8710msgid "Cannot pull with rebase: Your index contains uncommitted changes."
8711msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
8712
8713#: builtin/pull.c:436
8714msgid ""
8715"There is no candidate for rebasing against among the refs that you just "
8716"fetched."
8717msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
8718
8719#: builtin/pull.c:438
8720msgid ""
8721"There are no candidates for merging among the refs that you just fetched."
8722msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
8723
8724#: builtin/pull.c:439
8725msgid ""
8726"Generally this means that you provided a wildcard refspec which had no\n"
8727"matches on the remote end."
8728msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
8729
8730#: builtin/pull.c:442
8731#, c-format
8732msgid ""
8733"You asked to pull from the remote '%s', but did not specify\n"
8734"a branch. Because this is not the default configured remote\n"
8735"for your current branch, you must specify a branch on the command line."
8736msgstr ""
8737"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
8738"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
8739
8740#: builtin/pull.c:447
8741msgid "You are not currently on a branch."
8742msgstr "您当前不在一个分支上。"
8743
8744#: builtin/pull.c:449 builtin/pull.c:464
8745msgid "Please specify which branch you want to rebase against."
8746msgstr "请指定您要变基到哪一个分支。"
8747
8748#: builtin/pull.c:451 builtin/pull.c:466
8749msgid "Please specify which branch you want to merge with."
8750msgstr "请指定您要合并哪一个分支。"
8751
8752#: builtin/pull.c:452 builtin/pull.c:467
8753msgid "See git-pull(1) for details."
8754msgstr "详见 git-pull(1)。"
8755
8756#: builtin/pull.c:462
8757msgid "There is no tracking information for the current branch."
8758msgstr "当前分支没有跟踪信息。"
8759
8760#: builtin/pull.c:471
8761#, c-format
8762msgid ""
8763"If you wish to set tracking information for this branch you can do so with:\n"
8764"\n"
8765" git branch --set-upstream-to=%s/<branch> %s\n"
8766msgstr ""
8767"如果您想要为此分支创建跟踪信息,您可以执行:\n"
8768"\n"
8769" git branch --set-upstream-to=%s/<branch> %s\n"
7ac1c0ad 8770
1b7f4a34
JX
8771#: builtin/pull.c:476
8772#, c-format
8773msgid ""
8774"Your configuration specifies to merge with the ref '%s'\n"
8775"from the remote, but no such ref was fetched."
8776msgstr ""
8777"您的配置中指定要合并远程的引用 '%s',\n"
8778"但是没有获取到这个引用。"
7ac1c0ad 8779
1b7f4a34
JX
8780#: builtin/pull.c:830
8781msgid "Updating an unborn branch with changes added to the index."
8782msgstr "更新尚未诞生的分支,变更添加至索引。"
8783
8784#: builtin/pull.c:859
8785#, c-format
8786msgid ""
8787"fetch updated the current branch head.\n"
8788"fast-forwarding your working tree from\n"
8789"commit %s."
8790msgstr ""
8791"fetch 更新了当前的分支。快进您的工作区\n"
8792"至提交 %s。"
ef317cd5 8793
1b7f4a34
JX
8794#: builtin/pull.c:864
8795#, c-format
8796msgid ""
8797"Cannot fast-forward your working tree.\n"
8798"After making sure that you saved anything precious from\n"
8799"$ git diff %s\n"
8800"output, run\n"
8801"$ git reset --hard\n"
8802"to recover."
8803msgstr ""
8804"您当前的工作区无法执行快进操作。\n"
8805"首先执行如下命令:\n"
8806"$ git diff %s\n"
8807"以确认所有有用的数据均已保存。然后执行下面的命令\n"
8808"$ git reset --hard\n"
8809"恢复之前的状态。"
8810
8811#: builtin/pull.c:879
8812msgid "Cannot merge multiple branches into empty head."
8813msgstr "无法将多个分支合并到空分支。"
8814
8815#: builtin/pull.c:883
8816msgid "Cannot rebase onto multiple branches."
8817msgstr "无法变基到多个分支。"
8818
8819#: builtin/push.c:15
ef317cd5 8820msgid "git push [<options>] [<repository> [<refspec>...]]"
160fb2b2 8821msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
7ac1c0ad 8822
1b7f4a34 8823#: builtin/push.c:86
c04f5ac3 8824msgid "tag shorthand without <tag>"
55a16ee4 8825msgstr "标签后面未提供 <标签> 参数"
c04f5ac3 8826
1b7f4a34 8827#: builtin/push.c:96
c04f5ac3 8828msgid "--delete only accepts plain target ref names"
90e6ef53 8829msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 8830
1b7f4a34 8831#: builtin/push.c:140
8ada9598
JX
8832msgid ""
8833"\n"
8834"To choose either option permanently, see push.default in 'git help config'."
8835msgstr ""
81809b99
JX
8836"\n"
8837"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 8838
1b7f4a34 8839#: builtin/push.c:143
8ada9598
JX
8840#, c-format
8841msgid ""
8842"The upstream branch of your current branch does not match\n"
8843"the name of your current branch. To push to the upstream branch\n"
8844"on the remote, use\n"
8845"\n"
8846" git push %s HEAD:%s\n"
8847"\n"
8848"To push to the branch of the same name on the remote, use\n"
8849"\n"
8850" git push %s %s\n"
8851"%s"
8852msgstr ""
81809b99
JX
8853"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
8854"上游分支,使用\n"
8855"\n"
8856" git push %s HEAD:%s\n"
8857"\n"
8858"为推送至远程同名分支,使用\n"
8859"\n"
8860" git push %s %s\n"
8861"%s"
8ada9598 8862
1b7f4a34 8863#: builtin/push.c:158
c04f5ac3
JX
8864#, c-format
8865msgid ""
8866"You are not currently on a branch.\n"
8867"To push the history leading to the current (detached HEAD)\n"
8868"state now, use\n"
8869"\n"
8870" git push %s HEAD:<name-of-remote-branch>\n"
8871msgstr ""
8872"您当前不在一个分支上。\n"
90e6ef53 8873"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 8874"\n"
d9d56b23 8875" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 8876
1b7f4a34 8877#: builtin/push.c:172
c04f5ac3
JX
8878#, c-format
8879msgid ""
8880"The current branch %s has no upstream branch.\n"
8881"To push the current branch and set the remote as upstream, use\n"
8882"\n"
8883" git push --set-upstream %s %s\n"
8884msgstr ""
8885"当前分支 %s 没有对应的上游分支。\n"
8886"为推送当前分支并建立与远程上游的跟踪,使用\n"
8887"\n"
8888" git push --set-upstream %s %s\n"
8889
1b7f4a34 8890#: builtin/push.c:180
c04f5ac3
JX
8891#, c-format
8892msgid "The current branch %s has multiple upstream branches, refusing to push."
8893msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8894
1b7f4a34 8895#: builtin/push.c:183
73a60cd2
JX
8896#, c-format
8897msgid ""
8898"You are pushing to remote '%s', which is not the upstream of\n"
8899"your current branch '%s', without telling me what to push\n"
8900"to update which remote branch."
8901msgstr ""
8902"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8903"而没有告诉我要推送什么、更新哪个远程分支。"
8904
c160d03f 8905# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
1b7f4a34 8906#: builtin/push.c:206
c160d03f 8907msgid ""
6c94aba5 8908"push.default is unset; its implicit value has changed in\n"
c160d03f 8909"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6c94aba5 8910"and maintain the traditional behavior, use:\n"
c160d03f
JX
8911"\n"
8912" git config --global push.default matching\n"
8913"\n"
8914"To squelch this message and adopt the new behavior now, use:\n"
8915"\n"
8916" git config --global push.default simple\n"
8917"\n"
cfff71a9
JX
8918"When push.default is set to 'matching', git will push local branches\n"
8919"to the remote branches that already exist with the same name.\n"
8920"\n"
6c94aba5 8921"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
cfff71a9
JX
8922"behavior, which only pushes the current branch to the corresponding\n"
8923"remote branch that 'git pull' uses to update the current branch.\n"
8924"\n"
c160d03f
JX
8925"See 'git help config' and search for 'push.default' for further "
8926"information.\n"
8927"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8928"'current' instead of 'simple' if you sometimes use older versions of Git)"
8929msgstr ""
6c94aba5 8930"push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
cfff71a9 8931"变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
c160d03f
JX
8932"\n"
8933" git config --global push.default matching\n"
8934"\n"
8935"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8936"\n"
8937" git config --global push.default simple\n"
8938"\n"
cfff71a9
JX
8939"当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8940"本地分支。\n"
8941"\n"
160fb2b2 8942"从 Git 2.0 开始,Git 默认采用更为保守的 'simple' 模式,只推送当前\n"
cfff71a9
JX
8943"分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8944"\n"
c160d03f
JX
8945"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8946"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
90314792 8947"为保持兼容,请用 'current' 代替 'simple')"
c160d03f 8948
1b7f4a34 8949#: builtin/push.c:273
c04f5ac3
JX
8950msgid ""
8951"You didn't specify any refspecs to push, and push.default is \"nothing\"."
160fb2b2 8952msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
c04f5ac3 8953
1b7f4a34 8954#: builtin/push.c:280
170e9899
JX
8955msgid ""
8956"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
8957"its remote counterpart. Integrate the remote changes (e.g.\n"
8958"'git pull ...') before pushing again.\n"
170e9899
JX
8959"See the 'Note about fast-forwards' in 'git push --help' for details."
8960msgstr ""
eff6d3a9 8961"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 8962"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 8963"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 8964
1b7f4a34 8965#: builtin/push.c:286
170e9899
JX
8966msgid ""
8967"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
8968"counterpart. Check out this branch and integrate the remote changes\n"
8969"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
8970"See the 'Note about fast-forwards' in 'git push --help' for details."
8971msgstr ""
eff6d3a9 8972"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 8973"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 8974"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 8975
1b7f4a34 8976#: builtin/push.c:292
07432cef 8977msgid ""
a77c07d9
JX
8978"Updates were rejected because the remote contains work that you do\n"
8979"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
8980"to the same ref. You may want to first integrate the remote changes\n"
8981"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
8982"See the 'Note about fast-forwards' in 'git push --help' for details."
8983msgstr ""
160fb2b2
JX
8984"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
8985"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
2e8451e8 8986"(如 'git pull ...')。\n"
a77c07d9
JX
8987"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8988
1b7f4a34 8989#: builtin/push.c:299
a77c07d9 8990msgid "Updates were rejected because the tag already exists in the remote."
55a16ee4 8991msgstr "更新被拒绝,因为该标签在远程已经存在。"
a77c07d9 8992
1b7f4a34 8993#: builtin/push.c:302
a77c07d9
JX
8994msgid ""
8995"You cannot update a remote ref that points at a non-commit object,\n"
8996"or update a remote ref to make it point at a non-commit object,\n"
8997"without using the '--force' option.\n"
8998msgstr ""
8999"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
9000"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 9001
1b7f4a34 9002#: builtin/push.c:361
c04f5ac3
JX
9003#, c-format
9004msgid "Pushing to %s\n"
9005msgstr "推送到 %s\n"
9006
1b7f4a34 9007#: builtin/push.c:365
c04f5ac3
JX
9008#, c-format
9009msgid "failed to push some refs to '%s'"
9010msgstr "无法推送一些引用到 '%s'"
9011
1b7f4a34 9012#: builtin/push.c:395
c04f5ac3
JX
9013#, c-format
9014msgid "bad repository '%s'"
160fb2b2 9015msgstr "坏的仓库 '%s'"
c04f5ac3 9016
1b7f4a34 9017#: builtin/push.c:396
c04f5ac3
JX
9018msgid ""
9019"No configured push destination.\n"
9020"Either specify the URL from the command-line or configure a remote "
9021"repository using\n"
9022"\n"
9023" git remote add <name> <url>\n"
9024"\n"
9025"and then push using the remote name\n"
9026"\n"
9027" git push <name>\n"
9028msgstr ""
90e6ef53 9029"没有配置推送目标。\n"
4375c10e 9030"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
c04f5ac3 9031"\n"
d9d56b23 9032" git remote add <名称> <地址>\n"
c04f5ac3 9033"\n"
160fb2b2 9034"然后使用该远程仓库名执行推送\n"
c04f5ac3 9035"\n"
d9d56b23 9036" git push <名称>\n"
c04f5ac3 9037
1b7f4a34 9038#: builtin/push.c:411
c04f5ac3
JX
9039msgid "--all and --tags are incompatible"
9040msgstr "--all 和 --tags 不兼容"
9041
1b7f4a34 9042#: builtin/push.c:412
c04f5ac3 9043msgid "--all can't be combined with refspecs"
160fb2b2 9044msgstr "--all 不能和引用规格同时使用"
c04f5ac3 9045
1b7f4a34 9046#: builtin/push.c:417
c04f5ac3
JX
9047msgid "--mirror and --tags are incompatible"
9048msgstr "--mirror 和 --tags 不兼容"
9049
1b7f4a34 9050#: builtin/push.c:418
c04f5ac3 9051msgid "--mirror can't be combined with refspecs"
160fb2b2 9052msgstr "--mirror 不能和引用规格同时使用"
c04f5ac3 9053
1b7f4a34 9054#: builtin/push.c:423
c04f5ac3
JX
9055msgid "--all and --mirror are incompatible"
9056msgstr "--all 和 --mirror 不兼容"
9057
1b7f4a34 9058#: builtin/push.c:539
ef317cd5 9059msgid "repository"
160fb2b2 9060msgstr "仓库"
ef317cd5 9061
1b7f4a34 9062#: builtin/push.c:540 builtin/send-pack.c:161
ef317cd5 9063msgid "push all refs"
07432cef 9064msgstr "推送所有引用"
ef317cd5 9065
1b7f4a34 9066#: builtin/push.c:541 builtin/send-pack.c:163
ef317cd5 9067msgid "mirror all refs"
07432cef 9068msgstr "镜像所有引用"
ef317cd5 9069
1b7f4a34 9070#: builtin/push.c:543
ef317cd5 9071msgid "delete refs"
07432cef 9072msgstr "删除引用"
ef317cd5 9073
1b7f4a34 9074#: builtin/push.c:544
ef317cd5 9075msgid "push tags (can't be used with --all or --mirror)"
55a16ee4 9076msgstr "推送标签(不能使用 --all or --mirror)"
ef317cd5 9077
1b7f4a34 9078#: builtin/push.c:547 builtin/send-pack.c:164
ef317cd5
JX
9079msgid "force updates"
9080msgstr "强制更新"
9081
1b7f4a34 9082#: builtin/push.c:549 builtin/send-pack.c:175
90314792
JX
9083msgid "refname>:<expect"
9084msgstr "引用名>:<期望值"
9085
1b7f4a34 9086#: builtin/push.c:550 builtin/send-pack.c:176
90314792
JX
9087msgid "require old value of ref to be at this value"
9088msgstr "要求引用旧的取值为设定值"
9089
1b7f4a34 9090#: builtin/push.c:553
ef317cd5 9091msgid "control recursive pushing of submodules"
07432cef 9092msgstr "控制子模组的递归推送"
ef317cd5 9093
1b7f4a34 9094#: builtin/push.c:555 builtin/send-pack.c:169
ef317cd5 9095msgid "use thin pack"
07432cef 9096msgstr "使用精简打包"
ef317cd5 9097
1b7f4a34
JX
9098#: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158
9099#: builtin/send-pack.c:159
ef317cd5 9100msgid "receive pack program"
07432cef 9101msgstr "接收包程序"
ef317cd5 9102
1b7f4a34 9103#: builtin/push.c:558
ef317cd5 9104msgid "set upstream for git pull/status"
07432cef 9105msgstr "设置 git pull/status 的上游"
ef317cd5 9106
1b7f4a34 9107#: builtin/push.c:561
ef317cd5 9108msgid "prune locally removed refs"
07432cef 9109msgstr "清除本地删除的引用"
ef317cd5 9110
1b7f4a34 9111#: builtin/push.c:563
a77c07d9
JX
9112msgid "bypass pre-push hook"
9113msgstr "绕过 pre-push 钩子"
9114
1b7f4a34 9115#: builtin/push.c:564
1003b3a5 9116msgid "push missing but relevant tags"
55a16ee4 9117msgstr "推送缺失但有关的标签"
1003b3a5 9118
1b7f4a34 9119#: builtin/push.c:567 builtin/send-pack.c:166
220c313c
JX
9120msgid "GPG sign the push"
9121msgstr "用 GPG 为推送签名"
9122
1b7f4a34 9123#: builtin/push.c:569 builtin/send-pack.c:170
814ff314
JX
9124msgid "request atomic transaction on remote side"
9125msgstr "需要远端支持原子事务"
9126
1b7f4a34 9127#: builtin/push.c:579
c04f5ac3
JX
9128msgid "--delete is incompatible with --all, --mirror and --tags"
9129msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
9130
1b7f4a34 9131#: builtin/push.c:581
c04f5ac3
JX
9132msgid "--delete doesn't make sense without any refs"
9133msgstr "--delete 未接任何引用没有意义"
9134
220c313c 9135#: builtin/read-tree.c:37
ef317cd5 9136msgid ""
1b7f4a34 9137"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
ef317cd5
JX
9138"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9139"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
9140msgstr ""
1b7f4a34 9141"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
07432cef 9142"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
1b7f4a34 9143"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
ef317cd5 9144
220c313c 9145#: builtin/read-tree.c:110
ef317cd5 9146msgid "write resulting index to <file>"
d9d56b23 9147msgstr "将索引结果写入 <文件>"
ef317cd5 9148
220c313c 9149#: builtin/read-tree.c:113
ef317cd5 9150msgid "only empty the index"
07432cef 9151msgstr "只是清空索引"
ef317cd5 9152
220c313c 9153#: builtin/read-tree.c:115
ef317cd5 9154msgid "Merging"
07432cef 9155msgstr "合并"
ef317cd5 9156
220c313c 9157#: builtin/read-tree.c:117
ef317cd5 9158msgid "perform a merge in addition to a read"
07432cef 9159msgstr "读取之余再执行一个合并"
ef317cd5 9160
220c313c 9161#: builtin/read-tree.c:119
ef317cd5 9162msgid "3-way merge if no file level merging required"
160fb2b2 9163msgstr "如果没有文件级合并需要,执行三方合并"
ef317cd5 9164
220c313c 9165#: builtin/read-tree.c:121
ef317cd5 9166msgid "3-way merge in presence of adds and removes"
160fb2b2 9167msgstr "存在添加和删除时,也执行三方合并"
ef317cd5 9168
220c313c 9169#: builtin/read-tree.c:123
ef317cd5 9170msgid "same as -m, but discard unmerged entries"
07432cef 9171msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 9172
220c313c 9173#: builtin/read-tree.c:124
ef317cd5 9174msgid "<subdirectory>/"
07432cef 9175msgstr "<子目录>/"
ef317cd5 9176
220c313c 9177#: builtin/read-tree.c:125
ef317cd5 9178msgid "read the tree into the index under <subdirectory>/"
07432cef 9179msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 9180
220c313c 9181#: builtin/read-tree.c:128
ef317cd5 9182msgid "update working tree with merge result"
07432cef 9183msgstr "用合并的结果更新工作区"
ef317cd5 9184
220c313c 9185#: builtin/read-tree.c:130
ef317cd5 9186msgid "gitignore"
07432cef 9187msgstr "gitignore"
ef317cd5 9188
220c313c 9189#: builtin/read-tree.c:131
ef317cd5 9190msgid "allow explicitly ignored files to be overwritten"
07432cef 9191msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 9192
220c313c 9193#: builtin/read-tree.c:134
ef317cd5 9194msgid "don't check the working tree after merging"
07432cef 9195msgstr "合并后不检查工作区"
ef317cd5 9196
220c313c 9197#: builtin/read-tree.c:135
ef317cd5 9198msgid "don't update the index or the work tree"
07432cef 9199msgstr "不更新索引区和工作区"
ef317cd5 9200
220c313c 9201#: builtin/read-tree.c:137
ef317cd5 9202msgid "skip applying sparse checkout filter"
07432cef 9203msgstr "跳过应用稀疏检出过滤器"
ef317cd5 9204
220c313c 9205#: builtin/read-tree.c:139
ef317cd5 9206msgid "debug unpack-trees"
07432cef 9207msgstr "调试 unpack-trees"
ef317cd5 9208
94550ed3 9209#: builtin/reflog.c:428
2e8451e8 9210#, c-format
1b7f4a34 9211msgid "'%s' for '%s' is not a valid timestamp"
2e8451e8
JX
9212msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
9213
94550ed3 9214#: builtin/reflog.c:545 builtin/reflog.c:550
2e8451e8
JX
9215#, c-format
9216msgid "'%s' is not a valid timestamp"
9217msgstr "'%s' 不是一个有效的时间戳"
9218
cfff71a9 9219#: builtin/remote.c:12
ef317cd5 9220msgid "git remote [-v | --verbose]"
07432cef 9221msgstr "git remote [-v | --verbose]"
ef317cd5 9222
cfff71a9 9223#: builtin/remote.c:13
ef317cd5 9224msgid ""
814ff314 9225"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
9226"mirror=<fetch|push>] <name> <url>"
9227msgstr ""
814ff314 9228"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 9229"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 9230
94550ed3 9231#: builtin/remote.c:14 builtin/remote.c:34
ef317cd5 9232msgid "git remote rename <old> <new>"
07432cef 9233msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 9234
94550ed3 9235#: builtin/remote.c:15 builtin/remote.c:39
ef317cd5 9236msgid "git remote remove <name>"
07432cef 9237msgstr "git remote remove <名称>"
ef317cd5 9238
94550ed3 9239#: builtin/remote.c:16 builtin/remote.c:44
814ff314
JX
9240msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
9241msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 9242
cfff71a9 9243#: builtin/remote.c:17
ef317cd5 9244msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 9245msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 9246
cfff71a9 9247#: builtin/remote.c:18
ef317cd5 9248msgid "git remote prune [-n | --dry-run] <name>"
07432cef 9249msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 9250
cfff71a9 9251#: builtin/remote.c:19
ef317cd5
JX
9252msgid ""
9253"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 9254msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 9255
cfff71a9 9256#: builtin/remote.c:20
ef317cd5 9257msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 9258msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 9259
94550ed3
JX
9260#: builtin/remote.c:21 builtin/remote.c:70
9261msgid "git remote get-url [--push] [--all] <name>"
9262msgstr "git remote get-url [--push] [--all] <名称>"
9263
9264#: builtin/remote.c:22 builtin/remote.c:75
ef317cd5 9265msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 9266msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 9267
94550ed3 9268#: builtin/remote.c:23 builtin/remote.c:76
ef317cd5 9269msgid "git remote set-url --add <name> <newurl>"
07432cef 9270msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 9271
94550ed3 9272#: builtin/remote.c:24 builtin/remote.c:77
ef317cd5 9273msgid "git remote set-url --delete <name> <url>"
07432cef 9274msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 9275
94550ed3 9276#: builtin/remote.c:29
ef317cd5 9277msgid "git remote add [<options>] <name> <url>"
07432cef 9278msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 9279
94550ed3 9280#: builtin/remote.c:49
ef317cd5 9281msgid "git remote set-branches <name> <branch>..."
07432cef 9282msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 9283
94550ed3 9284#: builtin/remote.c:50
ef317cd5 9285msgid "git remote set-branches --add <name> <branch>..."
07432cef 9286msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 9287
94550ed3 9288#: builtin/remote.c:55
ef317cd5 9289msgid "git remote show [<options>] <name>"
07432cef 9290msgstr "git remote show [<选项>] <名称>"
ef317cd5 9291
94550ed3 9292#: builtin/remote.c:60
ef317cd5 9293msgid "git remote prune [<options>] <name>"
07432cef 9294msgstr "git remote prune [<选项>] <名称>"
ef317cd5 9295
94550ed3 9296#: builtin/remote.c:65
ef317cd5 9297msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 9298msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 9299
94550ed3 9300#: builtin/remote.c:94
81809b99 9301#, c-format
8ada9598 9302msgid "Updating %s"
81809b99 9303msgstr "更新 %s 中"
8ada9598 9304
94550ed3 9305#: builtin/remote.c:126
8ada9598
JX
9306msgid ""
9307"--mirror is dangerous and deprecated; please\n"
9308"\t use --mirror=fetch or --mirror=push instead"
9309msgstr ""
81809b99
JX
9310"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
9311"\t 或 --mirror=push"
8ada9598 9312
94550ed3 9313#: builtin/remote.c:143
81809b99 9314#, c-format
8ada9598 9315msgid "unknown mirror argument: %s"
81809b99 9316msgstr "未知的镜像参数:%s"
8ada9598 9317
94550ed3 9318#: builtin/remote.c:159
ef317cd5 9319msgid "fetch the remote branches"
07432cef 9320msgstr "抓取远程的分支"
ef317cd5 9321
94550ed3 9322#: builtin/remote.c:161
ef317cd5 9323msgid "import all tags and associated objects when fetching"
55a16ee4 9324msgstr "抓取时导入所有的标签和关联对象"
ef317cd5 9325
94550ed3 9326#: builtin/remote.c:164
ef317cd5 9327msgid "or do not fetch any tag at all (--no-tags)"
55a16ee4 9328msgstr "或不抓取任何标签(--no-tags)"
ef317cd5 9329
94550ed3 9330#: builtin/remote.c:166
ef317cd5 9331msgid "branch(es) to track"
07432cef 9332msgstr "跟踪的分支"
ef317cd5 9333
94550ed3 9334#: builtin/remote.c:167
ef317cd5 9335msgid "master branch"
07432cef 9336msgstr "主线分支"
ef317cd5 9337
94550ed3 9338#: builtin/remote.c:168
ef317cd5 9339msgid "push|fetch"
07432cef 9340msgstr "push|fetch"
ef317cd5 9341
94550ed3 9342#: builtin/remote.c:169
ef317cd5 9343msgid "set up remote as a mirror to push to or fetch from"
07432cef 9344msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 9345
94550ed3 9346#: builtin/remote.c:181
8ada9598 9347msgid "specifying a master branch makes no sense with --mirror"
81809b99 9348msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 9349
94550ed3 9350#: builtin/remote.c:183
8ada9598 9351msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 9352msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 9353
94550ed3 9354#: builtin/remote.c:193 builtin/remote.c:643
81809b99 9355#, c-format
8ada9598 9356msgid "remote %s already exists."
81809b99 9357msgstr "远程 %s 已经存在。"
8ada9598 9358
94550ed3 9359#: builtin/remote.c:197 builtin/remote.c:647
81809b99 9360#, c-format
8ada9598 9361msgid "'%s' is not a valid remote name"
81809b99 9362msgstr "'%s' 不是一个有效的远程名称"
8ada9598 9363
94550ed3 9364#: builtin/remote.c:241
81809b99 9365#, c-format
8ada9598 9366msgid "Could not setup master '%s'"
81809b99 9367msgstr "无法设置 master '%s'"
8ada9598 9368
94550ed3 9369#: builtin/remote.c:341
81809b99 9370#, c-format
8ada9598 9371msgid "Could not get fetch map for refspec %s"
160fb2b2 9372msgstr "无法得到引用规格 %s 的获取列表"
8ada9598 9373
94550ed3 9374#: builtin/remote.c:442 builtin/remote.c:450
8ada9598 9375msgid "(matching)"
81809b99 9376msgstr "(匹配)"
8ada9598 9377
94550ed3 9378#: builtin/remote.c:454
8ada9598 9379msgid "(delete)"
81809b99 9380msgstr "(删除)"
8ada9598 9381
94550ed3 9382#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
81809b99 9383#, c-format
8ada9598 9384msgid "Could not append '%s' to '%s'"
81809b99 9385msgstr "不能添加 '%s' 至 '%s'"
8ada9598 9386
94550ed3 9387#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
81809b99 9388#, c-format
8ada9598 9389msgid "No such remote: %s"
81809b99 9390msgstr "没有这样的远程:%s"
8ada9598 9391
94550ed3 9392#: builtin/remote.c:653
81809b99 9393#, c-format
8ada9598 9394msgid "Could not rename config section '%s' to '%s'"
81809b99 9395msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 9396
94550ed3 9397#: builtin/remote.c:659 builtin/remote.c:827
81809b99 9398#, c-format
8ada9598 9399msgid "Could not remove config section '%s'"
81809b99 9400msgstr "不能移除配置小节 '%s'"
8ada9598 9401
94550ed3 9402#: builtin/remote.c:674
8ada9598
JX
9403#, c-format
9404msgid ""
d691f479 9405"Not updating non-default fetch refspec\n"
8ada9598
JX
9406"\t%s\n"
9407"\tPlease update the configuration manually if necessary."
9408msgstr ""
160fb2b2 9409"没有更新非默认的获取引用规格\n"
81809b99
JX
9410"\t%s\n"
9411"\t如果必要请手动更新配置。"
8ada9598 9412
94550ed3 9413#: builtin/remote.c:680
81809b99 9414#, c-format
8ada9598 9415msgid "Could not append '%s'"
81809b99 9416msgstr "不能追加 '%s'"
8ada9598 9417
94550ed3 9418#: builtin/remote.c:691
81809b99 9419#, c-format
8ada9598 9420msgid "Could not set '%s'"
81809b99 9421msgstr "不能设置 '%s'"
8ada9598 9422
94550ed3 9423#: builtin/remote.c:713
81809b99 9424#, c-format
8ada9598 9425msgid "deleting '%s' failed"
81809b99 9426msgstr "删除 '%s' 失败"
8ada9598 9427
94550ed3 9428#: builtin/remote.c:747
81809b99 9429#, c-format
8ada9598 9430msgid "creating '%s' failed"
81809b99 9431msgstr "创建 '%s' 失败"
8ada9598 9432
94550ed3 9433#: builtin/remote.c:813
8ada9598
JX
9434msgid ""
9435"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
9436"to delete it, use:"
9437msgid_plural ""
9438"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
9439"to delete them, use:"
5ae481e0
JX
9440msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
9441msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 9442
94550ed3 9443#: builtin/remote.c:928
8ada9598
JX
9444#, c-format
9445msgid " new (next fetch will store in remotes/%s)"
81809b99 9446msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 9447
94550ed3 9448#: builtin/remote.c:931
8ada9598 9449msgid " tracked"
81809b99 9450msgstr " 已跟踪"
8ada9598 9451
94550ed3 9452#: builtin/remote.c:933
8ada9598 9453msgid " stale (use 'git remote prune' to remove)"
81809b99 9454msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 9455
94550ed3 9456#: builtin/remote.c:935
8ada9598 9457msgid " ???"
81809b99 9458msgstr " ???"
8ada9598 9459
94550ed3 9460#: builtin/remote.c:976
8ada9598
JX
9461#, c-format
9462msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 9463msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 9464
94550ed3 9465#: builtin/remote.c:983
81809b99 9466#, c-format
8ada9598 9467msgid "rebases onto remote %s"
81809b99 9468msgstr "变基到远程 %s"
8ada9598 9469
94550ed3 9470#: builtin/remote.c:986
81809b99 9471#, c-format
8ada9598 9472msgid " merges with remote %s"
81809b99 9473msgstr " 与远程 %s 合并"
8ada9598 9474
94550ed3 9475#: builtin/remote.c:987
8ada9598 9476msgid " and with remote"
81809b99 9477msgstr " 且有远程"
8ada9598 9478
94550ed3 9479#: builtin/remote.c:989
81809b99 9480#, c-format
8ada9598 9481msgid "merges with remote %s"
81809b99 9482msgstr "与远程 %s 合并"
8ada9598 9483
94550ed3 9484#: builtin/remote.c:990
8ada9598 9485msgid " and with remote"
81809b99 9486msgstr " 且有远程"
8ada9598 9487
94550ed3 9488#: builtin/remote.c:1036
8ada9598 9489msgid "create"
81809b99 9490msgstr "创建"
8ada9598 9491
94550ed3 9492#: builtin/remote.c:1039
8ada9598 9493msgid "delete"
81809b99 9494msgstr "删除"
8ada9598 9495
94550ed3 9496#: builtin/remote.c:1043
8ada9598 9497msgid "up to date"
81809b99 9498msgstr "最新"
8ada9598 9499
94550ed3 9500#: builtin/remote.c:1046
8ada9598 9501msgid "fast-forwardable"
81809b99 9502msgstr "可快进"
8ada9598 9503
94550ed3 9504#: builtin/remote.c:1049
8ada9598 9505msgid "local out of date"
81809b99 9506msgstr "本地已过时"
8ada9598 9507
94550ed3 9508#: builtin/remote.c:1056
8ada9598
JX
9509#, c-format
9510msgid " %-*s forces to %-*s (%s)"
81809b99 9511msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 9512
94550ed3 9513#: builtin/remote.c:1059
8ada9598
JX
9514#, c-format
9515msgid " %-*s pushes to %-*s (%s)"
81809b99 9516msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 9517
94550ed3 9518#: builtin/remote.c:1063
8ada9598
JX
9519#, c-format
9520msgid " %-*s forces to %s"
81809b99 9521msgstr " %-*s 强制推送至 %s"
8ada9598 9522
94550ed3 9523#: builtin/remote.c:1066
8ada9598
JX
9524#, c-format
9525msgid " %-*s pushes to %s"
81809b99 9526msgstr " %-*s 推送至 %s"
8ada9598 9527
94550ed3 9528#: builtin/remote.c:1134
ef317cd5 9529msgid "do not query remotes"
07432cef 9530msgstr "不查询远程"
ef317cd5 9531
94550ed3 9532#: builtin/remote.c:1161
81809b99 9533#, c-format
8ada9598 9534msgid "* remote %s"
81809b99 9535msgstr "* 远程 %s"
8ada9598 9536
94550ed3 9537#: builtin/remote.c:1162
8ada9598
JX
9538#, c-format
9539msgid " Fetch URL: %s"
81809b99 9540msgstr " 获取地址:%s"
8ada9598 9541
94550ed3 9542#: builtin/remote.c:1163 builtin/remote.c:1314
8ada9598 9543msgid "(no URL)"
81809b99 9544msgstr "(无 URL)"
8ada9598 9545
94550ed3 9546#: builtin/remote.c:1172 builtin/remote.c:1174
8ada9598
JX
9547#, c-format
9548msgid " Push URL: %s"
81809b99 9549msgstr " 推送地址:%s"
8ada9598 9550
94550ed3 9551#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
81809b99 9552#, c-format
8ada9598 9553msgid " HEAD branch: %s"
4375c10e 9554msgstr " HEAD 分支:%s"
8ada9598 9555
94550ed3 9556#: builtin/remote.c:1182
8ada9598
JX
9557#, c-format
9558msgid ""
9559" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 9560msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 9561
94550ed3 9562#: builtin/remote.c:1194
81809b99 9563#, c-format
8ada9598
JX
9564msgid " Remote branch:%s"
9565msgid_plural " Remote branches:%s"
81809b99 9566msgstr[0] " 远程分支:%s"
5ae481e0 9567msgstr[1] " 远程分支:%s"
8ada9598 9568
81809b99 9569# 译者:中文字符串拼接,可删除前导空格
94550ed3 9570#: builtin/remote.c:1197 builtin/remote.c:1224
8ada9598 9571msgid " (status not queried)"
81809b99 9572msgstr "(状态未查询)"
8ada9598 9573
94550ed3 9574#: builtin/remote.c:1206
8ada9598
JX
9575msgid " Local branch configured for 'git pull':"
9576msgid_plural " Local branches configured for 'git pull':"
81809b99 9577msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 9578msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 9579
94550ed3 9580#: builtin/remote.c:1214
8ada9598 9581msgid " Local refs will be mirrored by 'git push'"
81809b99 9582msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 9583
94550ed3 9584#: builtin/remote.c:1221
81809b99 9585#, c-format
8ada9598
JX
9586msgid " Local ref configured for 'git push'%s:"
9587msgid_plural " Local refs configured for 'git push'%s:"
81809b99 9588msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 9589msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 9590
94550ed3 9591#: builtin/remote.c:1242
ef317cd5 9592msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 9593msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 9594
94550ed3 9595#: builtin/remote.c:1244
ef317cd5 9596msgid "delete refs/remotes/<name>/HEAD"
07432cef 9597msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 9598
94550ed3 9599#: builtin/remote.c:1259
8ada9598 9600msgid "Cannot determine remote HEAD"
81809b99 9601msgstr "无法确定远程 HEAD"
8ada9598 9602
94550ed3 9603#: builtin/remote.c:1261
8ada9598 9604msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 9605msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 9606
94550ed3 9607#: builtin/remote.c:1271
81809b99 9608#, c-format
8ada9598 9609msgid "Could not delete %s"
81809b99 9610msgstr "无法删除 %s"
8ada9598 9611
94550ed3 9612#: builtin/remote.c:1279
81809b99 9613#, c-format
8ada9598 9614msgid "Not a valid ref: %s"
81809b99 9615msgstr "不是一个有效引用:%s"
8ada9598 9616
94550ed3 9617#: builtin/remote.c:1281
81809b99 9618#, c-format
8ada9598 9619msgid "Could not setup %s"
81809b99 9620msgstr "不能设置 %s"
8ada9598
JX
9621
9622# 译者:注意保持前导空格
94550ed3 9623#: builtin/remote.c:1299
81809b99 9624#, c-format
8ada9598 9625msgid " %s will become dangling!"
07432cef 9626msgstr " %s 将成为摇摆状态!"
8ada9598
JX
9627
9628# 译者:注意保持前导空格
94550ed3 9629#: builtin/remote.c:1300
81809b99 9630#, c-format
8ada9598 9631msgid " %s has become dangling!"
07432cef 9632msgstr " %s 已成为摇摆状态!"
8ada9598 9633
94550ed3 9634#: builtin/remote.c:1310
81809b99 9635#, c-format
8ada9598 9636msgid "Pruning %s"
81809b99 9637msgstr "修剪 %s"
8ada9598 9638
94550ed3 9639#: builtin/remote.c:1311
8ada9598
JX
9640#, c-format
9641msgid "URL: %s"
81809b99 9642msgstr "URL:%s"
8ada9598 9643
94550ed3 9644#: builtin/remote.c:1327
8ada9598
JX
9645#, c-format
9646msgid " * [would prune] %s"
81809b99 9647msgstr " * [将删除] %s"
8ada9598 9648
94550ed3 9649#: builtin/remote.c:1330
8ada9598
JX
9650#, c-format
9651msgid " * [pruned] %s"
81809b99 9652msgstr " * [已删除] %s"
8ada9598 9653
94550ed3 9654#: builtin/remote.c:1375
ef317cd5 9655msgid "prune remotes after fetching"
07432cef 9656msgstr "抓取后清除远程"
ef317cd5 9657
94550ed3 9658#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
81809b99 9659#, c-format
8ada9598 9660msgid "No such remote '%s'"
81809b99 9661msgstr "没有此远程 '%s'"
8ada9598 9662
94550ed3 9663#: builtin/remote.c:1461
ef317cd5 9664msgid "add branch"
07432cef 9665msgstr "添加分支"
ef317cd5 9666
94550ed3 9667#: builtin/remote.c:1468
8ada9598 9668msgid "no remote specified"
81809b99 9669msgstr "未指定远程"
8ada9598 9670
94550ed3
JX
9671#: builtin/remote.c:1485
9672msgid "query push URLs rather than fetch URLs"
9673msgstr "查询推送 URL 地址,而非获取 URL 地址"
9674
9675#: builtin/remote.c:1487
9676msgid "return all URLs"
9677msgstr "返回所有 URL 地址"
9678
9679#: builtin/remote.c:1515
9680#, c-format
9681msgid "no URLs configured for remote '%s'"
9682msgstr "没有给远程仓库 '%s' 设定 URL"
9683
9684#: builtin/remote.c:1541
ef317cd5 9685msgid "manipulate push URLs"
07432cef 9686msgstr "操作推送 URLS"
ef317cd5 9687
94550ed3 9688#: builtin/remote.c:1543
ef317cd5 9689msgid "add URL"
07432cef 9690msgstr "添加 URL"
ef317cd5 9691
94550ed3 9692#: builtin/remote.c:1545
ef317cd5 9693msgid "delete URLs"
07432cef 9694msgstr "删除 URLS"
ef317cd5 9695
94550ed3 9696#: builtin/remote.c:1552
8ada9598 9697msgid "--add --delete doesn't make sense"
81809b99 9698msgstr "--add --delete 无意义"
8ada9598 9699
94550ed3 9700#: builtin/remote.c:1592
81809b99 9701#, c-format
8ada9598 9702msgid "Invalid old URL pattern: %s"
4375c10e 9703msgstr "无效的旧 URL 匹配模版:%s"
8ada9598 9704
94550ed3 9705#: builtin/remote.c:1600
81809b99 9706#, c-format
8ada9598 9707msgid "No such URL found: %s"
4375c10e 9708msgstr "未找到此 URL:%s"
8ada9598 9709
94550ed3 9710#: builtin/remote.c:1602
8ada9598 9711msgid "Will not delete all non-push URLs"
4375c10e 9712msgstr "将不会删除所有非推送 URL 地址"
8ada9598 9713
94550ed3 9714#: builtin/remote.c:1616
ef317cd5 9715msgid "be verbose; must be placed before a subcommand"
07432cef 9716msgstr "冗长输出;必须置于子命令之前"
ef317cd5 9717
6acbf033 9718#: builtin/repack.c:17
814ff314
JX
9719msgid "git repack [<options>]"
9720msgstr "git repack [<选项>]"
90314792 9721
04cb2f28 9722#: builtin/repack.c:159
90314792
JX
9723msgid "pack everything in a single pack"
9724msgstr "所有内容打包到一个包文件中"
9725
04cb2f28 9726#: builtin/repack.c:161
90314792
JX
9727msgid "same as -a, and turn unreachable objects loose"
9728msgstr "和 -a 相同,并将不可达的对象设为松散对象"
9729
04cb2f28 9730#: builtin/repack.c:164
90314792
JX
9731msgid "remove redundant packs, and run git-prune-packed"
9732msgstr "删除多余的包,运行 git-prune-packed"
9733
04cb2f28 9734#: builtin/repack.c:166
90314792
JX
9735msgid "pass --no-reuse-delta to git-pack-objects"
9736msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9737
04cb2f28 9738#: builtin/repack.c:168
90314792
JX
9739msgid "pass --no-reuse-object to git-pack-objects"
9740msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9741
04cb2f28 9742#: builtin/repack.c:170
90314792
JX
9743msgid "do not run git-update-server-info"
9744msgstr "不运行 git-update-server-info"
9745
04cb2f28 9746#: builtin/repack.c:173
90314792
JX
9747msgid "pass --local to git-pack-objects"
9748msgstr "向 git-pack-objects 传递参数 --local"
9749
04cb2f28 9750#: builtin/repack.c:175
6c94aba5
JX
9751msgid "write bitmap index"
9752msgstr "写 bitmap 索引"
9753
04cb2f28 9754#: builtin/repack.c:176
90314792
JX
9755msgid "approxidate"
9756msgstr "近似日期"
9757
04cb2f28 9758#: builtin/repack.c:177
90314792
JX
9759msgid "with -A, do not loosen objects older than this"
9760msgstr "使用 -A,不要将早于给定时间的对象过期"
9761
04cb2f28 9762#: builtin/repack.c:179
90314792
JX
9763msgid "size of the window used for delta compression"
9764msgstr "用于增量压缩的窗口值"
9765
04cb2f28 9766#: builtin/repack.c:180 builtin/repack.c:184
8376b58d
JX
9767msgid "bytes"
9768msgstr "字节"
9769
04cb2f28 9770#: builtin/repack.c:181
90314792
JX
9771msgid "same as the above, but limit memory size instead of entries count"
9772msgstr "和上面的相似,但限制内存大小而非条目数"
9773
04cb2f28 9774#: builtin/repack.c:183
90314792
JX
9775msgid "limits the maximum delta depth"
9776msgstr "限制最大增量深度"
9777
04cb2f28 9778#: builtin/repack.c:185
90314792 9779msgid "maximum size of each packfile"
dbd6cced 9780msgstr "每个包文件的最大尺寸"
90314792 9781
04cb2f28 9782#: builtin/repack.c:187
6c94aba5
JX
9783msgid "repack objects in packs marked with .keep"
9784msgstr "对标记为 .keep 的包中的对象重新打包"
9785
94550ed3
JX
9786#: builtin/repack.c:197
9787msgid "cannot delete packs in a precious-objects repo"
9788msgstr "不能删除珍品仓库中的打包文件"
9789
9790#: builtin/repack.c:381
90314792
JX
9791#, c-format
9792msgid "removing '%s' failed"
9793msgstr "删除 '%s' 失败"
9794
6acbf033 9795#: builtin/replace.c:19
ef317cd5 9796msgid "git replace [-f] <object> <replacement>"
07432cef 9797msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 9798
6acbf033
JX
9799#: builtin/replace.c:20
9800msgid "git replace [-f] --edit <object>"
9801msgstr "git replace [-f] --edit <对象>"
9802
9803#: builtin/replace.c:21
9804msgid "git replace [-f] --graft <commit> [<parent>...]"
9805msgstr "git replace [-f] --graft <提交> [<父提交>...]"
9806
9807#: builtin/replace.c:22
ef317cd5 9808msgid "git replace -d <object>..."
07432cef 9809msgstr "git replace -d <对象>..."
ef317cd5 9810
6acbf033 9811#: builtin/replace.c:23
cfff71a9
JX
9812msgid "git replace [--format=<format>] [-l [<pattern>]]"
9813msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 9814
220c313c 9815#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
6acbf033
JX
9816#, c-format
9817msgid "Not a valid object name: '%s'"
9818msgstr "不是一个有效的对象名:'%s'"
9819
220c313c 9820#: builtin/replace.c:355
6acbf033
JX
9821#, c-format
9822msgid "bad mergetag in commit '%s'"
55a16ee4 9823msgstr "提交 '%s' 中含有损坏的合并标签"
6acbf033 9824
220c313c 9825#: builtin/replace.c:357
6acbf033
JX
9826#, c-format
9827msgid "malformed mergetag in commit '%s'"
55a16ee4 9828msgstr "提交 '%s' 中含有非法的合并标签"
6acbf033 9829
220c313c 9830#: builtin/replace.c:368
6acbf033
JX
9831#, c-format
9832msgid ""
9833"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9834"instead of --graft"
55a16ee4 9835msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
6acbf033 9836
220c313c 9837#: builtin/replace.c:401
6acbf033
JX
9838#, c-format
9839msgid "the original commit '%s' has a gpg signature."
9840msgstr "原始提交 '%s' 中包含一个 GPG 签名"
9841
220c313c 9842#: builtin/replace.c:402
6acbf033
JX
9843msgid "the signature will be removed in the replacement commit!"
9844msgstr "在替换的提交中签名将被移除!"
9845
220c313c 9846#: builtin/replace.c:408
6acbf033
JX
9847#, c-format
9848msgid "could not write replacement commit for: '%s'"
9849msgstr "不能为 '%s' 写替换提交"
9850
220c313c 9851#: builtin/replace.c:432
ef317cd5 9852msgid "list replace refs"
07432cef 9853msgstr "列出替换的引用"
ef317cd5 9854
220c313c 9855#: builtin/replace.c:433
ef317cd5 9856msgid "delete replace refs"
07432cef 9857msgstr "删除替换的引用"
ef317cd5 9858
220c313c 9859#: builtin/replace.c:434
6acbf033
JX
9860msgid "edit existing object"
9861msgstr "编辑现存的对象"
9862
220c313c 9863#: builtin/replace.c:435
6acbf033
JX
9864msgid "change a commit's parents"
9865msgstr "修改一个提交的父提交"
9866
220c313c 9867#: builtin/replace.c:436
ef317cd5 9868msgid "replace the ref if it exists"
07432cef 9869msgstr "如果存在则替换引用"
ef317cd5 9870
220c313c 9871#: builtin/replace.c:437
6acbf033
JX
9872msgid "do not pretty-print contents for --edit"
9873msgstr "不要为 --edit 操作美观显示内容"
9874
220c313c 9875#: builtin/replace.c:438
cfff71a9
JX
9876msgid "use this format"
9877msgstr "使用此格式"
9878
90314792 9879#: builtin/rerere.c:12
814ff314
JX
9880msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9881msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 9882
94550ed3 9883#: builtin/rerere.c:58
ef317cd5 9884msgid "register clean resolutions in index"
07432cef 9885msgstr "在索引中注册干净的解决方案"
ef317cd5 9886
220c313c 9887#: builtin/reset.c:26
ef317cd5
JX
9888msgid ""
9889"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 9890msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 9891
220c313c 9892#: builtin/reset.c:27
07432cef
WS
9893msgid "git reset [-q] <tree-ish> [--] <paths>..."
9894msgstr "git reset [-q] <树或提交> [--] <路径>..."
ef317cd5 9895
220c313c 9896#: builtin/reset.c:28
07432cef
WS
9897msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9898msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 9899
220c313c 9900#: builtin/reset.c:34
c04f5ac3
JX
9901msgid "mixed"
9902msgstr "混杂"
9903
220c313c 9904#: builtin/reset.c:34
c04f5ac3
JX
9905msgid "soft"
9906msgstr "软性"
9907
220c313c 9908#: builtin/reset.c:34
c04f5ac3
JX
9909msgid "hard"
9910msgstr "硬性"
9911
220c313c 9912#: builtin/reset.c:34
8ada9598
JX
9913msgid "merge"
9914msgstr "合并"
9915
220c313c 9916#: builtin/reset.c:34
c04f5ac3
JX
9917msgid "keep"
9918msgstr "保持"
9919
220c313c 9920#: builtin/reset.c:74
c04f5ac3
JX
9921msgid "You do not have a valid HEAD."
9922msgstr "您没有一个有效的 HEAD。"
9923
220c313c 9924#: builtin/reset.c:76
c04f5ac3
JX
9925msgid "Failed to find tree of HEAD."
9926msgstr "无法找到 HEAD 指向的树。"
9927
220c313c 9928#: builtin/reset.c:82
c04f5ac3
JX
9929#, c-format
9930msgid "Failed to find tree of %s."
9931msgstr "无法找到 %s 指向的树。"
9932
220c313c 9933#: builtin/reset.c:100
c04f5ac3
JX
9934#, c-format
9935msgid "HEAD is now at %s"
9936msgstr "HEAD 现在位于 %s"
9937
90e6ef53 9938# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9939#: builtin/reset.c:183
c04f5ac3
JX
9940#, c-format
9941msgid "Cannot do a %s reset in the middle of a merge."
9942msgstr "在合并过程中不能做%s重置操作。"
9943
220c313c 9944#: builtin/reset.c:276
ef317cd5 9945msgid "be quiet, only report errors"
07432cef 9946msgstr "安静模式,只报告错误"
ef317cd5 9947
220c313c 9948#: builtin/reset.c:278
ef317cd5 9949msgid "reset HEAD and index"
07432cef 9950msgstr "重置 HEAD 和索引"
ef317cd5 9951
220c313c 9952#: builtin/reset.c:279
ef317cd5 9953msgid "reset only HEAD"
07432cef 9954msgstr "只重置 HEAD"
ef317cd5 9955
220c313c 9956#: builtin/reset.c:281 builtin/reset.c:283
ef317cd5 9957msgid "reset HEAD, index and working tree"
07432cef 9958msgstr "重置 HEAD、索引和工作区"
ef317cd5 9959
220c313c 9960#: builtin/reset.c:285
ef317cd5 9961msgid "reset HEAD but keep local changes"
07432cef 9962msgstr "重置 HEAD 但保存本地变更"
ef317cd5 9963
220c313c 9964#: builtin/reset.c:288
6c94aba5
JX
9965msgid "record only the fact that removed paths will be added later"
9966msgstr "将删除的路径标记为稍后添加"
9967
220c313c 9968#: builtin/reset.c:305
07432cef
WS
9969#, c-format
9970msgid "Failed to resolve '%s' as a valid revision."
9971msgstr "无法将 '%s' 解析为一个有效的版本。"
9972
220c313c 9973#: builtin/reset.c:313
07432cef
WS
9974#, c-format
9975msgid "Failed to resolve '%s' as a valid tree."
9976msgstr "无法将 '%s' 解析为一个有效的树对象。"
9977
220c313c 9978#: builtin/reset.c:322
c04f5ac3 9979msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 9980msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 9981
220c313c 9982#: builtin/reset.c:331
c04f5ac3 9983msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 9984msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 9985
90e6ef53 9986# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9987#: builtin/reset.c:333
c04f5ac3
JX
9988#, c-format
9989msgid "Cannot do %s reset with paths."
9990msgstr "不能带路径进行%s重置。"
9991
90e6ef53 9992# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9993#: builtin/reset.c:343
c04f5ac3
JX
9994#, c-format
9995msgid "%s reset is not allowed in a bare repository"
160fb2b2 9996msgstr "不能对纯仓库进行%s重置"
c04f5ac3 9997
220c313c 9998#: builtin/reset.c:347
6c94aba5
JX
9999msgid "-N can only be used with --mixed"
10000msgstr "-N 只能和 --mixed 同时使用"
10001
220c313c 10002#: builtin/reset.c:364
90314792 10003msgid "Unstaged changes after reset:"
160fb2b2 10004msgstr "重置后取消暂存的变更:"
90314792 10005
220c313c 10006#: builtin/reset.c:370
ef317cd5
JX
10007#, c-format
10008msgid "Could not reset index file to revision '%s'."
10009msgstr "不能重置索引文件至版本 '%s'。"
10010
220c313c 10011#: builtin/reset.c:374
07432cef
WS
10012msgid "Could not write new index file."
10013msgstr "不能写入新的索引文件。"
10014
1b7f4a34
JX
10015#: builtin/rev-list.c:354
10016msgid "rev-list does not support display of notes"
10017msgstr "rev-list 不支持显示注解"
10018
94550ed3 10019#: builtin/rev-parse.c:358
814ff314
JX
10020msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
10021msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 10022
94550ed3 10023#: builtin/rev-parse.c:363
ef317cd5 10024msgid "keep the `--` passed as an arg"
07432cef 10025msgstr "保持 `--` 作为一个参数传递"
ef317cd5 10026
94550ed3 10027#: builtin/rev-parse.c:365
ef317cd5 10028msgid "stop parsing after the first non-option argument"
07432cef 10029msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 10030
94550ed3 10031#: builtin/rev-parse.c:368
cfff71a9
JX
10032msgid "output in stuck long form"
10033msgstr "以固定长格式输出"
10034
94550ed3 10035#: builtin/rev-parse.c:499
ef317cd5 10036msgid ""
814ff314 10037"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 10038" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 10039" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
10040"\n"
10041"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
10042msgstr ""
814ff314 10043"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 10044" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 10045" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
10046"\n"
10047"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5
JX
10048
10049#: builtin/revert.c:22
814ff314
JX
10050msgid "git revert [<options>] <commit-ish>..."
10051msgstr "git revert [<选项>] <提交号>..."
ef317cd5
JX
10052
10053#: builtin/revert.c:23
10054msgid "git revert <subcommand>"
07432cef 10055msgstr "git revert <子命令>"
ef317cd5
JX
10056
10057#: builtin/revert.c:28
814ff314
JX
10058msgid "git cherry-pick [<options>] <commit-ish>..."
10059msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5
JX
10060
10061#: builtin/revert.c:29
ef317cd5 10062msgid "git cherry-pick <subcommand>"
07432cef 10063msgstr "git cherry-pick <子命令>"
ef317cd5 10064
90314792 10065#: builtin/revert.c:71
ef317cd5
JX
10066#, c-format
10067msgid "%s: %s cannot be used with %s"
10068msgstr "%s:%s 不能和 %s 同时使用"
10069
90314792 10070#: builtin/revert.c:80
ef317cd5 10071msgid "end revert or cherry-pick sequence"
07432cef 10072msgstr "终止反转或拣选操作"
ef317cd5 10073
90314792 10074#: builtin/revert.c:81
ef317cd5 10075msgid "resume revert or cherry-pick sequence"
07432cef 10076msgstr "继续反转或拣选操作"
ef317cd5 10077
90314792 10078#: builtin/revert.c:82
ef317cd5 10079msgid "cancel revert or cherry-pick sequence"
07432cef 10080msgstr "取消反转或拣选操作"
ef317cd5 10081
90314792 10082#: builtin/revert.c:83
ef317cd5 10083msgid "don't automatically commit"
07432cef 10084msgstr "不要自动提交"
ef317cd5 10085
90314792 10086#: builtin/revert.c:84
ef317cd5 10087msgid "edit the commit message"
07432cef 10088msgstr "编辑提交说明"
ef317cd5 10089
90314792 10090#: builtin/revert.c:87
ef317cd5 10091msgid "parent number"
07432cef 10092msgstr "父编号"
ef317cd5 10093
90314792 10094#: builtin/revert.c:89
ef317cd5 10095msgid "merge strategy"
07432cef 10096msgstr "合并策略"
ef317cd5 10097
90314792 10098#: builtin/revert.c:90
ef317cd5 10099msgid "option"
07432cef 10100msgstr "选项"
ef317cd5 10101
90314792 10102#: builtin/revert.c:91
ef317cd5 10103msgid "option for merge strategy"
07432cef 10104msgstr "合并策略的选项"
ef317cd5 10105
6c94aba5 10106#: builtin/revert.c:104
ef317cd5 10107msgid "append commit name"
07432cef 10108msgstr "追加提交名称"
ef317cd5 10109
6c94aba5 10110#: builtin/revert.c:106
ef317cd5 10111msgid "preserve initially empty commits"
07432cef 10112msgstr "保留初始化的空提交"
ef317cd5 10113
6c94aba5 10114#: builtin/revert.c:107
ef317cd5 10115msgid "allow commits with empty messages"
07432cef 10116msgstr "允许提交说明为空"
c04f5ac3 10117
6c94aba5 10118#: builtin/revert.c:108
ef317cd5 10119msgid "keep redundant, empty commits"
07432cef 10120msgstr "保持多余的、空的提交"
ef317cd5 10121
6c94aba5 10122#: builtin/revert.c:112
c04f5ac3
JX
10123msgid "program error"
10124msgstr "程序错误"
10125
6c94aba5 10126#: builtin/revert.c:197
c04f5ac3
JX
10127msgid "revert failed"
10128msgstr "还原失败"
10129
6c94aba5 10130#: builtin/revert.c:212
c04f5ac3
JX
10131msgid "cherry-pick failed"
10132msgstr "拣选失败"
10133
90314792 10134#: builtin/rm.c:17
814ff314
JX
10135msgid "git rm [<options>] [--] <file>..."
10136msgstr "git rm [<选项>] [--] <文件>..."
07432cef 10137
90314792 10138#: builtin/rm.c:65
2e8451e8
JX
10139msgid ""
10140"the following submodule (or one of its nested submodules)\n"
10141"uses a .git directory:"
10142msgid_plural ""
220c313c 10143"the following submodules (or one of their nested submodules)\n"
2e8451e8 10144"use a .git directory:"
220c313c
JX
10145msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10146msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
2e8451e8 10147
90314792 10148#: builtin/rm.c:71
07432cef 10149msgid ""
2e8451e8 10150"\n"
07432cef
WS
10151"(use 'rm -rf' if you really want to remove it including all of its history)"
10152msgstr ""
2e8451e8 10153"\n"
07432cef 10154"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
ef317cd5 10155
7aea43ff 10156#: builtin/rm.c:230
c04f5ac3 10157msgid ""
2e8451e8
JX
10158"the following file has staged content different from both the\n"
10159"file and the HEAD:"
10160msgid_plural ""
10161"the following files have staged content different from both the\n"
10162"file and the HEAD:"
10163msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10164msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10165
7aea43ff 10166#: builtin/rm.c:235
2e8451e8
JX
10167msgid ""
10168"\n"
c04f5ac3
JX
10169"(use -f to force removal)"
10170msgstr ""
2e8451e8 10171"\n"
c04f5ac3
JX
10172"(使用 -f 强制删除)"
10173
7aea43ff 10174#: builtin/rm.c:239
2e8451e8
JX
10175msgid "the following file has changes staged in the index:"
10176msgid_plural "the following files have changes staged in the index:"
160fb2b2
JX
10177msgstr[0] "下列文件索引中有变更"
10178msgstr[1] "下列文件索引中有变更"
c04f5ac3 10179
7aea43ff 10180#: builtin/rm.c:243 builtin/rm.c:254
c04f5ac3 10181msgid ""
2e8451e8 10182"\n"
c04f5ac3
JX
10183"(use --cached to keep the file, or -f to force removal)"
10184msgstr ""
2e8451e8
JX
10185"\n"
10186"(使用 --cached 保留本地文件,或用 -f 强制删除)"
10187
7aea43ff 10188#: builtin/rm.c:251
2e8451e8
JX
10189msgid "the following file has local modifications:"
10190msgid_plural "the following files have local modifications:"
10191msgstr[0] "如下文件有本地修改:"
10192msgstr[1] "如下文件有本地修改:"
c04f5ac3 10193
7aea43ff 10194#: builtin/rm.c:269
ef317cd5 10195msgid "do not list removed files"
07432cef 10196msgstr "不列出删除的文件"
ef317cd5 10197
7aea43ff 10198#: builtin/rm.c:270
ef317cd5 10199msgid "only remove from the index"
07432cef 10200msgstr "只从索引区删除"
ef317cd5 10201
7aea43ff 10202#: builtin/rm.c:271
ef317cd5 10203msgid "override the up-to-date check"
07432cef 10204msgstr "忽略文件更新状态检查"
ef317cd5 10205
7aea43ff 10206#: builtin/rm.c:272
ef317cd5 10207msgid "allow recursive removal"
07432cef 10208msgstr "允许递归删除"
ef317cd5 10209
7aea43ff 10210#: builtin/rm.c:274
ef317cd5 10211msgid "exit with a zero status even if nothing matched"
07432cef 10212msgstr "即使没有匹配,也以零状态退出"
ef317cd5 10213
7aea43ff 10214#: builtin/rm.c:317
220c313c
JX
10215msgid "Please, stage your changes to .gitmodules or stash them to proceed"
10216msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
10217
7aea43ff 10218#: builtin/rm.c:335
c04f5ac3
JX
10219#, c-format
10220msgid "not removing '%s' recursively without -r"
10221msgstr "未提供 -r 选项不会递归删除 '%s'"
10222
7aea43ff 10223#: builtin/rm.c:374
c04f5ac3
JX
10224#, c-format
10225msgid "git rm: unable to remove %s"
10226msgstr "git rm:不能删除 %s"
10227
1b7f4a34
JX
10228#: builtin/send-pack.c:18
10229msgid ""
10230"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10231"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
10232"[<ref>...]\n"
10233" --all and explicit <ref> specification are mutually exclusive."
10234msgstr ""
10235"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10236"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
10237" --all 和明确的 <引用> 互斥。"
10238
10239#: builtin/send-pack.c:160
10240msgid "remote name"
10241msgstr "远程名称"
10242
10243#: builtin/send-pack.c:171
10244msgid "use stateless RPC protocol"
10245msgstr "使用无状态的 RPC 协议"
10246
10247#: builtin/send-pack.c:172
10248msgid "read refs from stdin"
10249msgstr "从标准输入读取引用"
10250
10251#: builtin/send-pack.c:173
10252msgid "print status from remote helper"
10253msgstr "打印来自远程 helper 的状态"
10254
ef317cd5 10255#: builtin/shortlog.c:13
814ff314 10256msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
4dcdc3d8 10257msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
ef317cd5 10258
4dcdc3d8 10259#: builtin/shortlog.c:131
c04f5ac3
JX
10260#, c-format
10261msgid "Missing author: %s"
10262msgstr "缺少作者:%s"
10263
90314792 10264#: builtin/shortlog.c:230
ef317cd5 10265msgid "sort output according to the number of commits per author"
07432cef 10266msgstr "根据每个作者的提交数量排序"
ef317cd5 10267
90314792 10268#: builtin/shortlog.c:232
ef317cd5 10269msgid "Suppress commit descriptions, only provides commit count"
07432cef 10270msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 10271
90314792 10272#: builtin/shortlog.c:234
ef317cd5 10273msgid "Show the email address of each author"
07432cef 10274msgstr "显示每个作者的电子邮件地址"
ef317cd5 10275
90314792 10276#: builtin/shortlog.c:235
ef317cd5 10277msgid "w[,i1[,i2]]"
07432cef 10278msgstr "w[,i1[,i2]]"
ef317cd5 10279
90314792 10280#: builtin/shortlog.c:236
ef317cd5 10281msgid "Linewrap output"
07432cef 10282msgstr "折行输出"
ef317cd5 10283
94550ed3 10284#: builtin/show-branch.c:10
ef317cd5 10285msgid ""
814ff314 10286"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
10287"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
10288"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10289"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 10290msgstr ""
814ff314 10291"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
10292"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
10293"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10294"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 10295
94550ed3 10296#: builtin/show-branch.c:14
814ff314
JX
10297msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
10298msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
ef317cd5 10299
94550ed3 10300#: builtin/show-branch.c:640
ef317cd5 10301msgid "show remote-tracking and local branches"
07432cef 10302msgstr "显示远程跟踪的和本地的分支"
ef317cd5 10303
94550ed3 10304#: builtin/show-branch.c:642
ef317cd5 10305msgid "show remote-tracking branches"
07432cef 10306msgstr "显示远程跟踪的分支"
ef317cd5 10307
94550ed3 10308#: builtin/show-branch.c:644
ef317cd5 10309msgid "color '*!+-' corresponding to the branch"
07432cef 10310msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 10311
94550ed3 10312#: builtin/show-branch.c:646
ef317cd5 10313msgid "show <n> more commits after the common ancestor"
07432cef 10314msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 10315
94550ed3 10316#: builtin/show-branch.c:648
ef317cd5 10317msgid "synonym to more=-1"
07432cef 10318msgstr "和 more=-1 同义"
ef317cd5 10319
94550ed3 10320#: builtin/show-branch.c:649
ef317cd5 10321msgid "suppress naming strings"
07432cef 10322msgstr "不显示字符串命名"
ef317cd5 10323
94550ed3 10324#: builtin/show-branch.c:651
ef317cd5 10325msgid "include the current branch"
07432cef 10326msgstr "包括当前分支"
ef317cd5 10327
94550ed3 10328#: builtin/show-branch.c:653
ef317cd5 10329msgid "name commits with their object names"
07432cef 10330msgstr "以对象名字命名提交"
ef317cd5 10331
94550ed3 10332#: builtin/show-branch.c:655
ef317cd5 10333msgid "show possible merge bases"
07432cef 10334msgstr "显示可能合并的基线"
ef317cd5 10335
94550ed3 10336#: builtin/show-branch.c:657
ef317cd5 10337msgid "show refs unreachable from any other ref"
07432cef 10338msgstr "显示没有任何引用的的引用"
ef317cd5 10339
94550ed3 10340#: builtin/show-branch.c:659
ef317cd5 10341msgid "show commits in topological order"
07432cef 10342msgstr "以拓扑顺序显示提交"
ef317cd5 10343
94550ed3 10344#: builtin/show-branch.c:662
ef317cd5 10345msgid "show only commits not on the first branch"
07432cef 10346msgstr "只显示不在第一个分支上的提交"
ef317cd5 10347
94550ed3 10348#: builtin/show-branch.c:664
ef317cd5 10349msgid "show merges reachable from only one tip"
07432cef 10350msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 10351
94550ed3 10352#: builtin/show-branch.c:666
2e8451e8
JX
10353msgid "topologically sort, maintaining date order where possible"
10354msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 10355
94550ed3 10356#: builtin/show-branch.c:669
ef317cd5 10357msgid "<n>[,<base>]"
07432cef 10358msgstr "<n>[,<base>]"
ef317cd5 10359
94550ed3 10360#: builtin/show-branch.c:670
ef317cd5 10361msgid "show <n> most recent ref-log entries starting at base"
07432cef 10362msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
ef317cd5
JX
10363
10364#: builtin/show-ref.c:10
10365msgid ""
814ff314
JX
10366"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10367"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 10368msgstr ""
814ff314
JX
10369"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10370"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5
JX
10371
10372#: builtin/show-ref.c:11
94550ed3
JX
10373msgid "git show-ref --exclude-existing[=<pattern>]"
10374msgstr "git show-ref --exclude-existing[=<模式>]"
ef317cd5 10375
94550ed3 10376#: builtin/show-ref.c:165
ef317cd5 10377msgid "only show tags (can be combined with heads)"
55a16ee4 10378msgstr "只显示标签(可以和头共用)"
ef317cd5 10379
94550ed3 10380#: builtin/show-ref.c:166
ef317cd5 10381msgid "only show heads (can be combined with tags)"
55a16ee4 10382msgstr "只显示头(可以和标签共用)"
ef317cd5 10383
94550ed3 10384#: builtin/show-ref.c:167
ef317cd5 10385msgid "stricter reference checking, requires exact ref path"
07432cef 10386msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 10387
94550ed3 10388#: builtin/show-ref.c:170 builtin/show-ref.c:172
2e8451e8
JX
10389msgid "show the HEAD reference, even if it would be filtered out"
10390msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 10391
94550ed3 10392#: builtin/show-ref.c:174
ef317cd5 10393msgid "dereference tags into object IDs"
4375c10e 10394msgstr "转换标签到对象 ID"
ef317cd5 10395
94550ed3 10396#: builtin/show-ref.c:176
ef317cd5 10397msgid "only show SHA1 hash using <n> digits"
07432cef 10398msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 10399
94550ed3 10400#: builtin/show-ref.c:180
ef317cd5 10401msgid "do not print results to stdout (useful with --verify)"
07432cef 10402msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 10403
94550ed3 10404#: builtin/show-ref.c:182
ef317cd5 10405msgid "show refs from stdin that aren't in local repository"
160fb2b2 10406msgstr "显示从标准输入中读入的不在本地仓库中的引用"
ef317cd5 10407
94550ed3
JX
10408#: builtin/stripspace.c:17
10409msgid "git stripspace [-s | --strip-comments]"
10410msgstr "git stripspace [-s | --strip-comments]"
10411
10412#: builtin/stripspace.c:18
10413msgid "git stripspace [-c | --comment-lines]"
10414msgstr "git stripspace [-c | --comment-lines]"
10415
10416#: builtin/stripspace.c:35
10417msgid "skip and remove all lines starting with comment character"
10418msgstr "跳过和移除所有的注释行"
10419
10420#: builtin/stripspace.c:38
10421msgid "prepend comment character and blank to each line"
10422msgstr "为每一行的行首添加注释符和空格"
10423
10424#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
10425msgid "alternative anchor for relative paths"
10426msgstr "相对路径的替代锚记(anchor)"
10427
10428#: builtin/submodule--helper.c:84
10429msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
10430msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
10431
10432#: builtin/submodule--helper.c:114
10433msgid "git submodule--helper name <path>"
10434msgstr "git submodule--helper name <路径>"
10435
10436#: builtin/submodule--helper.c:120
10437#, c-format
10438msgid "no submodule mapping found in .gitmodules for path '%s'"
10439msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
10440
10441#: builtin/submodule--helper.c:170
10442msgid "where the new submodule will be cloned to"
10443msgstr "新的子模组将要克隆的路径"
10444
10445#: builtin/submodule--helper.c:173
10446msgid "name of the new submodule"
10447msgstr "新子模组的名称"
10448
10449#: builtin/submodule--helper.c:176
10450msgid "url where to clone the submodule from"
10451msgstr "克隆子模组的 url 地址"
10452
10453#: builtin/submodule--helper.c:182
10454msgid "depth for shallow clones"
10455msgstr "浅克隆的深度"
10456
10457#: builtin/submodule--helper.c:188
10458msgid ""
10459"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
10460"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
10461msgstr ""
10462"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
10463"[--name <名字>] [--url <地址>][--depth <深度>] [--] [<路径>...]"
10464
10465#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
10466#: builtin/submodule--helper.c:216
10467#, c-format
10468msgid "could not create directory '%s'"
10469msgstr "不能创建目录 '%s'"
10470
10471#: builtin/submodule--helper.c:204
10472#, c-format
10473msgid "clone of '%s' into submodule path '%s' failed"
10474msgstr "无法克隆 '%s' 到子模组路径 '%s'"
10475
10476#: builtin/submodule--helper.c:227
10477#, c-format
10478msgid "cannot open file '%s'"
10479msgstr "无法打开文件 '%s'"
10480
10481#: builtin/submodule--helper.c:232
10482#, c-format
10483msgid "could not close file %s"
10484msgstr "无法关闭文件 %s"
10485
10486#: builtin/submodule--helper.c:247
10487#, c-format
10488msgid "could not get submodule directory for '%s'"
10489msgstr "无法得到 '%s' 的子模组目录"
10490
10491#: builtin/submodule--helper.c:273
10492msgid "fatal: submodule--helper subcommand must be called with a subcommand"
10493msgstr "严重错误:submodule-helper 子命令必须由另外的子命令调用"
10494
10495#: builtin/submodule--helper.c:280
10496#, c-format
10497msgid "fatal: '%s' is not a valid submodule--helper subcommand"
10498msgstr "严重错误:'%s' 不是一个有效的 submodule--helper 子命令"
10499
ef317cd5 10500#: builtin/symbolic-ref.c:7
814ff314
JX
10501msgid "git symbolic-ref [<options>] <name> [<ref>]"
10502msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef
WS
10503
10504#: builtin/symbolic-ref.c:8
814ff314
JX
10505msgid "git symbolic-ref -d [-q] <name>"
10506msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 10507
07432cef 10508#: builtin/symbolic-ref.c:40
ef317cd5 10509msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
10510msgstr "不显示非符号(分离的)引用的错误信息"
10511
10512#: builtin/symbolic-ref.c:41
10513msgid "delete symbolic ref"
10514msgstr "删除符号引用"
ef317cd5 10515
07432cef 10516#: builtin/symbolic-ref.c:42
ef317cd5 10517msgid "shorten ref output"
07432cef 10518msgstr "简短的引用输出"
ef317cd5 10519
1b7f4a34 10520#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
ef317cd5 10521msgid "reason"
07432cef 10522msgstr "原因"
ef317cd5 10523
1b7f4a34 10524#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
ef317cd5 10525msgid "reason of the update"
07432cef 10526msgstr "更新的原因"
ef317cd5 10527
94550ed3 10528#: builtin/tag.c:23
ef317cd5 10529msgid ""
814ff314
JX
10530"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
10531"[<head>]"
10532msgstr ""
10533"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
ef317cd5 10534
94550ed3 10535#: builtin/tag.c:24
ef317cd5 10536msgid "git tag -d <tagname>..."
07432cef 10537msgstr "git tag -d <标签名>..."
ef317cd5 10538
94550ed3 10539#: builtin/tag.c:25
ef317cd5 10540msgid ""
814ff314 10541"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
94550ed3 10542"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
ef317cd5 10543msgstr ""
94550ed3
JX
10544"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
10545"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
ef317cd5 10546
94550ed3 10547#: builtin/tag.c:27
ef317cd5 10548msgid "git tag -v <tagname>..."
07432cef 10549msgstr "git tag -v <标签名>..."
ef317cd5 10550
94550ed3 10551#: builtin/tag.c:80
c04f5ac3
JX
10552#, c-format
10553msgid "tag name too long: %.*s..."
55a16ee4 10554msgstr "标签名称太长:%.*s..."
c04f5ac3 10555
94550ed3 10556#: builtin/tag.c:85
c04f5ac3
JX
10557#, c-format
10558msgid "tag '%s' not found."
55a16ee4 10559msgstr "未发现标签 '%s'。"
c04f5ac3 10560
94550ed3 10561#: builtin/tag.c:100
c04f5ac3
JX
10562#, c-format
10563msgid "Deleted tag '%s' (was %s)\n"
55a16ee4 10564msgstr "已删除标签 '%s'(曾为 %s)\n"
c04f5ac3 10565
94550ed3 10566#: builtin/tag.c:112
c04f5ac3
JX
10567#, c-format
10568msgid "could not verify the tag '%s'"
55a16ee4 10569msgstr "不能校验该标签 '%s'"
c04f5ac3 10570
94550ed3 10571#: builtin/tag.c:122
a77c07d9 10572#, c-format
c04f5ac3
JX
10573msgid ""
10574"\n"
6acbf033
JX
10575"Write a message for tag:\n"
10576" %s\n"
a77c07d9 10577"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
10578msgstr ""
10579"\n"
55a16ee4 10580"输入一个标签说明:\n"
6acbf033 10581" %s\n"
a77c07d9 10582"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 10583
94550ed3 10584#: builtin/tag.c:126
a77c07d9 10585#, c-format
c04f5ac3
JX
10586msgid ""
10587"\n"
6acbf033
JX
10588"Write a message for tag:\n"
10589" %s\n"
a77c07d9 10590"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 10591"want to.\n"
c04f5ac3
JX
10592msgstr ""
10593"\n"
55a16ee4 10594"输入一个标签说明:\n"
6acbf033 10595" %s\n"
a77c07d9 10596"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 10597
94550ed3 10598#: builtin/tag.c:199
c04f5ac3 10599msgid "unable to sign the tag"
55a16ee4 10600msgstr "无法签署标签"
c04f5ac3 10601
94550ed3 10602#: builtin/tag.c:201
c04f5ac3 10603msgid "unable to write tag file"
55a16ee4 10604msgstr "无法写标签文件"
c04f5ac3 10605
94550ed3 10606#: builtin/tag.c:226
c04f5ac3 10607msgid "bad object type."
90e6ef53 10608msgstr "坏的对象类型。"
c04f5ac3 10609
94550ed3 10610#: builtin/tag.c:239
c04f5ac3 10611msgid "tag header too big."
55a16ee4 10612msgstr "标签头信息太大。"
c04f5ac3 10613
94550ed3 10614#: builtin/tag.c:275
c04f5ac3 10615msgid "no tag message?"
55a16ee4 10616msgstr "无标签说明?"
c04f5ac3 10617
94550ed3 10618#: builtin/tag.c:281
c04f5ac3
JX
10619#, c-format
10620msgid "The tag message has been left in %s\n"
55a16ee4 10621msgstr "标签说明被保留在 %s\n"
c04f5ac3 10622
94550ed3 10623#: builtin/tag.c:339
ef317cd5 10624msgid "list tag names"
55a16ee4 10625msgstr "列出标签名称"
ef317cd5 10626
94550ed3 10627#: builtin/tag.c:341
ef317cd5 10628msgid "print <n> lines of each tag message"
55a16ee4 10629msgstr "每个标签信息打印 <n> 行"
ef317cd5 10630
94550ed3 10631#: builtin/tag.c:343
ef317cd5 10632msgid "delete tags"
55a16ee4 10633msgstr "删除标签"
ef317cd5 10634
94550ed3 10635#: builtin/tag.c:344
ef317cd5 10636msgid "verify tags"
55a16ee4 10637msgstr "验证标签"
ef317cd5 10638
94550ed3 10639#: builtin/tag.c:346
ef317cd5 10640msgid "Tag creation options"
55a16ee4 10641msgstr "标签创建选项"
ef317cd5 10642
94550ed3 10643#: builtin/tag.c:348
ef317cd5 10644msgid "annotated tag, needs a message"
55a16ee4 10645msgstr "附注标签,需要一个说明"
ef317cd5 10646
94550ed3 10647#: builtin/tag.c:350
ef317cd5 10648msgid "tag message"
55a16ee4 10649msgstr "标签说明"
ef317cd5 10650
94550ed3 10651#: builtin/tag.c:352
ef317cd5 10652msgid "annotated and GPG-signed tag"
55a16ee4 10653msgstr "附注并附加 GPG 签名的标签"
ef317cd5 10654
94550ed3 10655#: builtin/tag.c:356
ef317cd5 10656msgid "use another key to sign the tag"
55a16ee4 10657msgstr "使用另外的私钥签名该标签"
ef317cd5 10658
94550ed3 10659#: builtin/tag.c:357
ef317cd5 10660msgid "replace the tag if exists"
55a16ee4 10661msgstr "如果存在,替换现有的标签"
ef317cd5 10662
94550ed3 10663#: builtin/tag.c:358 builtin/update-ref.c:368
03ea3327 10664msgid "create a reflog"
1b7f4a34
JX
10665msgstr "创建引用日志"
10666
94550ed3 10667#: builtin/tag.c:360
814ff314 10668msgid "Tag listing options"
55a16ee4 10669msgstr "标签列表选项"
814ff314 10670
94550ed3 10671#: builtin/tag.c:361
ef317cd5 10672msgid "show tag list in columns"
55a16ee4 10673msgstr "以列的方式显示标签列表"
ef317cd5 10674
94550ed3 10675#: builtin/tag.c:362 builtin/tag.c:363
ef317cd5 10676msgid "print only tags that contain the commit"
55a16ee4 10677msgstr "只打印包含提交的标签"
ef317cd5 10678
94550ed3
JX
10679#: builtin/tag.c:364
10680msgid "print only tags that are merged"
10681msgstr "只打印已经合并的标签"
10682
10683#: builtin/tag.c:365
10684msgid "print only tags that are not merged"
10685msgstr "只打印尚未合并的标签"
10686
10687#: builtin/tag.c:370
ef317cd5 10688msgid "print only tags of the object"
55a16ee4 10689msgstr "只打印对象的标签"
ef317cd5 10690
94550ed3 10691#: builtin/tag.c:399
8ada9598 10692msgid "--column and -n are incompatible"
81809b99 10693msgstr "--column 和 -n 不兼容"
8ada9598 10694
94550ed3 10695#: builtin/tag.c:419
c04f5ac3 10696msgid "-n option is only allowed with -l."
649900bc 10697msgstr "-n 选项只允许和 -l 同时使用。"
c04f5ac3 10698
94550ed3 10699#: builtin/tag.c:421
c04f5ac3 10700msgid "--contains option is only allowed with -l."
649900bc 10701msgstr "--contains 选项只允许和 -l 同时使用。"
c04f5ac3 10702
94550ed3 10703#: builtin/tag.c:423
7ac1c0ad 10704msgid "--points-at option is only allowed with -l."
649900bc 10705msgstr "--points-at 选项只允许和 -l 同时使用。"
7ac1c0ad 10706
94550ed3
JX
10707#: builtin/tag.c:425
10708msgid "--merged and --no-merged option are only allowed with -l"
10709msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
10710
10711#: builtin/tag.c:433
c04f5ac3
JX
10712msgid "only one -F or -m option is allowed."
10713msgstr "只允许一个 -F 或 -m 选项。"
10714
94550ed3 10715#: builtin/tag.c:453
c04f5ac3
JX
10716msgid "too many params"
10717msgstr "太多参数"
10718
94550ed3 10719#: builtin/tag.c:459
c04f5ac3
JX
10720#, c-format
10721msgid "'%s' is not a valid tag name."
55a16ee4 10722msgstr "'%s' 不是一个有效的标签名称。"
c04f5ac3 10723
94550ed3 10724#: builtin/tag.c:464
c04f5ac3
JX
10725#, c-format
10726msgid "tag '%s' already exists"
55a16ee4 10727msgstr "标签 '%s' 已存在"
c04f5ac3 10728
94550ed3 10729#: builtin/tag.c:489
c04f5ac3
JX
10730#, c-format
10731msgid "Updated tag '%s' (was %s)\n"
55a16ee4 10732msgstr "已更新标签 '%s'(曾为 %s)\n"
c04f5ac3 10733
1b7f4a34 10734#: builtin/unpack-objects.c:490
6c94aba5
JX
10735msgid "Unpacking objects"
10736msgstr "展开对象中"
10737
7aea43ff
JX
10738#: builtin/update-index.c:70
10739#, c-format
10740msgid "failed to create directory %s"
10741msgstr "无法创建目录 %s"
10742
10743#: builtin/update-index.c:76
10744#, c-format
10745msgid "failed to stat %s"
10746msgstr "无法枚举 %s 状态"
10747
10748#: builtin/update-index.c:86
10749#, c-format
10750msgid "failed to create file %s"
10751msgstr "无法创建文件 %s"
10752
10753#: builtin/update-index.c:94
10754#, c-format
10755msgid "failed to delete file %s"
10756msgstr "无法删除文件 %s"
10757
10758#: builtin/update-index.c:101 builtin/update-index.c:203
10759#, c-format
10760msgid "failed to delete directory %s"
10761msgstr "无法删除目录 %s"
10762
10763#: builtin/update-index.c:124
10764#, c-format
10765msgid "Testing "
10766msgstr "正在测试 "
10767
10768#: builtin/update-index.c:136
10769msgid "directory stat info does not change after adding a new file"
10770msgstr "添加一个新文件后,目录的状态信息未改变"
10771
10772#: builtin/update-index.c:149
10773msgid "directory stat info does not change after adding a new directory"
10774msgstr "添加一个新目录后,目录的状态信息未改变"
10775
10776#: builtin/update-index.c:162
10777msgid "directory stat info changes after updating a file"
10778msgstr "更新一个文件后,目录的状态信息被修改"
10779
10780#: builtin/update-index.c:173
10781msgid "directory stat info changes after adding a file inside subdirectory"
10782msgstr "在子目录中添加文件后,目录的状态信息被修改"
10783
10784#: builtin/update-index.c:184
10785msgid "directory stat info does not change after deleting a file"
10786msgstr "删除一个文件后,目录的状态信息未改变"
10787
10788#: builtin/update-index.c:197
10789msgid "directory stat info does not change after deleting a directory"
10790msgstr "删除一个目录后,目录的状态信息未改变"
10791
10792#: builtin/update-index.c:204
10793msgid " OK"
10794msgstr " OK"
10795
10796#: builtin/update-index.c:564
814ff314
JX
10797msgid "git update-index [<options>] [--] [<file>...]"
10798msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 10799
7aea43ff 10800#: builtin/update-index.c:918
ef317cd5 10801msgid "continue refresh even when index needs update"
07432cef 10802msgstr "当索引需要更新时继续刷新"
8ada9598 10803
7aea43ff 10804#: builtin/update-index.c:921
ef317cd5 10805msgid "refresh: ignore submodules"
07432cef 10806msgstr "刷新:忽略子模组"
8ada9598 10807
7aea43ff 10808#: builtin/update-index.c:924
ef317cd5 10809msgid "do not ignore new files"
07432cef 10810msgstr "不忽略新的文件"
8ada9598 10811
7aea43ff 10812#: builtin/update-index.c:926
ef317cd5 10813msgid "let files replace directories and vice-versa"
07432cef 10814msgstr "让文件替换目录(反之亦然)"
ef317cd5 10815
7aea43ff 10816#: builtin/update-index.c:928
ef317cd5 10817msgid "notice files missing from worktree"
07432cef 10818msgstr "通知文件从工作区丢失"
ef317cd5 10819
7aea43ff 10820#: builtin/update-index.c:930
ef317cd5 10821msgid "refresh even if index contains unmerged entries"
07432cef 10822msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 10823
7aea43ff 10824#: builtin/update-index.c:933
ef317cd5 10825msgid "refresh stat information"
07432cef 10826msgstr "刷新统计信息"
ef317cd5 10827
7aea43ff 10828#: builtin/update-index.c:937
ef317cd5 10829msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 10830msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 10831
7aea43ff 10832#: builtin/update-index.c:941
6c94aba5 10833msgid "<mode>,<object>,<path>"
d9d56b23 10834msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 10835
7aea43ff 10836#: builtin/update-index.c:942
ef317cd5 10837msgid "add the specified entry to the index"
07432cef 10838msgstr "添加指定的条目到索引区"
ef317cd5 10839
7aea43ff 10840#: builtin/update-index.c:946
ef317cd5 10841msgid "(+/-)x"
07432cef 10842msgstr "(+/-)x"
ef317cd5 10843
7aea43ff 10844#: builtin/update-index.c:947
ef317cd5 10845msgid "override the executable bit of the listed files"
07432cef 10846msgstr "覆盖列表里文件的可执行位"
ef317cd5 10847
7aea43ff 10848#: builtin/update-index.c:951
ef317cd5 10849msgid "mark files as \"not changing\""
07432cef 10850msgstr "把文件标记为 \"没有变更\""
ef317cd5 10851
7aea43ff 10852#: builtin/update-index.c:954
ef317cd5 10853msgid "clear assumed-unchanged bit"
07432cef 10854msgstr "清除 assumed-unchanged 位"
ef317cd5 10855
7aea43ff 10856#: builtin/update-index.c:957
ef317cd5 10857msgid "mark files as \"index-only\""
07432cef 10858msgstr "把文件标记为 \"仅索引\""
ef317cd5 10859
7aea43ff 10860#: builtin/update-index.c:960
ef317cd5 10861msgid "clear skip-worktree bit"
07432cef 10862msgstr "清除 skip-worktree 位"
ef317cd5 10863
7aea43ff 10864#: builtin/update-index.c:963
ef317cd5 10865msgid "add to index only; do not add content to object database"
07432cef 10866msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 10867
7aea43ff 10868#: builtin/update-index.c:965
ef317cd5 10869msgid "remove named paths even if present in worktree"
07432cef 10870msgstr "即使存在工作区里,也删除路径"
ef317cd5 10871
7aea43ff 10872#: builtin/update-index.c:967
ef317cd5 10873msgid "with --stdin: input lines are terminated by null bytes"
07432cef 10874msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 10875
7aea43ff 10876#: builtin/update-index.c:969
ef317cd5 10877msgid "read list of paths to be updated from standard input"
07432cef 10878msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 10879
7aea43ff 10880#: builtin/update-index.c:973
ef317cd5 10881msgid "add entries from standard input to the index"
07432cef 10882msgstr "从标准输入添加条目到索引区"
ef317cd5 10883
7aea43ff 10884#: builtin/update-index.c:977
ef317cd5 10885msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 10886msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 10887
7aea43ff 10888#: builtin/update-index.c:981
ef317cd5 10889msgid "only update entries that differ from HEAD"
07432cef 10890msgstr "只更新与 HEAD 不同的条目"
ef317cd5 10891
7aea43ff 10892#: builtin/update-index.c:985
ef317cd5 10893msgid "ignore files missing from worktree"
07432cef 10894msgstr "忽略工作区丢失的文件"
ef317cd5 10895
7aea43ff 10896#: builtin/update-index.c:988
ef317cd5 10897msgid "report actions to standard output"
07432cef 10898msgstr "在标准输出显示操作"
ef317cd5 10899
7aea43ff 10900#: builtin/update-index.c:990
ef317cd5 10901msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 10902msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 10903
7aea43ff 10904#: builtin/update-index.c:994
ef317cd5 10905msgid "write index in this format"
07432cef 10906msgstr "以这种格式写入索引区"
ef317cd5 10907
7aea43ff 10908#: builtin/update-index.c:996
6acbf033
JX
10909msgid "enable or disable split index"
10910msgstr "启用或禁用索引拆分"
10911
7aea43ff
JX
10912#: builtin/update-index.c:998
10913msgid "enable/disable untracked cache"
10914msgstr "启用/禁用对未跟踪文件的缓存"
10915
10916#: builtin/update-index.c:1000
10917msgid "enable untracked cache without testing the filesystem"
10918msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
10919
90314792 10920#: builtin/update-ref.c:9
814ff314
JX
10921msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10922msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 10923
90314792 10924#: builtin/update-ref.c:10
814ff314
JX
10925msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
10926msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792
JX
10927
10928#: builtin/update-ref.c:11
814ff314
JX
10929msgid "git update-ref [<options>] --stdin [-z]"
10930msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 10931
1b7f4a34 10932#: builtin/update-ref.c:363
ef317cd5 10933msgid "delete the reference"
07432cef 10934msgstr "删除引用"
ef317cd5 10935
1b7f4a34 10936#: builtin/update-ref.c:365
ef317cd5 10937msgid "update <refname> not the one it points to"
07432cef 10938msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 10939
1b7f4a34 10940#: builtin/update-ref.c:366
90314792
JX
10941msgid "stdin has NUL-terminated arguments"
10942msgstr "标准输入有以 NUL 字符终止的参数"
10943
1b7f4a34 10944#: builtin/update-ref.c:367
90314792
JX
10945msgid "read updates from stdin"
10946msgstr "从标准输入读取更新"
10947
ef317cd5
JX
10948#: builtin/update-server-info.c:6
10949msgid "git update-server-info [--force]"
07432cef 10950msgstr "git update-server-info [--force]"
ef317cd5
JX
10951
10952#: builtin/update-server-info.c:14
10953msgid "update the info files from scratch"
07432cef 10954msgstr "从头开始更新文件信息"
ef317cd5 10955
6acbf033 10956#: builtin/verify-commit.c:17
814ff314
JX
10957msgid "git verify-commit [-v | --verbose] <commit>..."
10958msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033 10959
1b7f4a34 10960#: builtin/verify-commit.c:72
6acbf033
JX
10961msgid "print commit contents"
10962msgstr "打印提交内容"
10963
1b7f4a34
JX
10964#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
10965msgid "print raw gpg status output"
10966msgstr "打印原始 gpg 状态输出"
10967
220c313c 10968#: builtin/verify-pack.c:54
814ff314
JX
10969msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10970msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 10971
220c313c 10972#: builtin/verify-pack.c:64
ef317cd5
JX
10973msgid "verbose"
10974msgstr "冗长输出"
10975
220c313c 10976#: builtin/verify-pack.c:66
ef317cd5 10977msgid "show statistics only"
07432cef 10978msgstr "只显示统计"
ef317cd5
JX
10979
10980#: builtin/verify-tag.c:17
814ff314
JX
10981msgid "git verify-tag [-v | --verbose] <tag>..."
10982msgstr "git verify-tag [-v | --verbose] <标签>..."
ef317cd5 10983
1b7f4a34 10984#: builtin/verify-tag.c:83
ef317cd5 10985msgid "print tag contents"
55a16ee4 10986msgstr "打印标签内容"
ef317cd5 10987
94550ed3
JX
10988#: builtin/worktree.c:15
10989msgid "git worktree add [<options>] <path> [<branch>]"
10990msgstr "git worktree add [<选项>] <路径> [<分支>]"
5bb01d4f 10991
94550ed3 10992#: builtin/worktree.c:16
5bb01d4f
JX
10993msgid "git worktree prune [<options>]"
10994msgstr "git worktree prune [<选项>]"
10995
94550ed3
JX
10996#: builtin/worktree.c:17
10997msgid "git worktree list [<options>]"
10998msgstr "git worktree list [<选项>]"
10999
11000#: builtin/worktree.c:39
5bb01d4f
JX
11001#, c-format
11002msgid "Removing worktrees/%s: not a valid directory"
11003msgstr "删除工作区/%s:不是一个有效的目录"
11004
94550ed3 11005#: builtin/worktree.c:45
5bb01d4f
JX
11006#, c-format
11007msgid "Removing worktrees/%s: gitdir file does not exist"
11008msgstr "删除 worktrees/%s:gitdir 文件不存在"
11009
94550ed3 11010#: builtin/worktree.c:50
5bb01d4f
JX
11011#, c-format
11012msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
11013msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
11014
94550ed3 11015#: builtin/worktree.c:61
5bb01d4f
JX
11016#, c-format
11017msgid "Removing worktrees/%s: invalid gitdir file"
11018msgstr "删除 worktrees/%s:无效的 gitdir 文件"
11019
94550ed3 11020#: builtin/worktree.c:77
5bb01d4f
JX
11021#, c-format
11022msgid "Removing worktrees/%s: gitdir file points to non-existent location"
11023msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
11024
94550ed3 11025#: builtin/worktree.c:112
5bb01d4f
JX
11026#, c-format
11027msgid "failed to remove: %s"
11028msgstr "无法删除:%s"
11029
94550ed3 11030#: builtin/worktree.c:201
5bb01d4f
JX
11031#, c-format
11032msgid "'%s' already exists"
11033msgstr "'%s' 已经存在"
11034
94550ed3 11035#: builtin/worktree.c:235
5bb01d4f
JX
11036#, c-format
11037msgid "could not create directory of '%s'"
11038msgstr "不能创建目录 '%s'"
11039
94550ed3 11040#: builtin/worktree.c:271
5bb01d4f 11041#, c-format
1b7f4a34
JX
11042msgid "Preparing %s (identifier %s)"
11043msgstr "准备 %s (标识符 %s)"
5bb01d4f 11044
94550ed3 11045#: builtin/worktree.c:319
5bb01d4f
JX
11046msgid "checkout <branch> even if already checked out in other worktree"
11047msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
11048
94550ed3 11049#: builtin/worktree.c:321
5bb01d4f
JX
11050msgid "create a new branch"
11051msgstr "创建一个新分支"
11052
94550ed3 11053#: builtin/worktree.c:323
5bb01d4f
JX
11054msgid "create or reset a branch"
11055msgstr "创建或重置一个分支"
11056
94550ed3 11057#: builtin/worktree.c:324
5bb01d4f
JX
11058msgid "detach HEAD at named commit"
11059msgstr "HEAD 从指定的提交分离"
11060
94550ed3 11061#: builtin/worktree.c:331
1b7f4a34
JX
11062msgid "-b, -B, and --detach are mutually exclusive"
11063msgstr "-b、-B 和 --detach 是互斥的"
5bb01d4f 11064
ef317cd5
JX
11065#: builtin/write-tree.c:13
11066msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 11067msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5
JX
11068
11069#: builtin/write-tree.c:26
11070msgid "<prefix>/"
07432cef 11071msgstr "<前缀>/"
ef317cd5
JX
11072
11073#: builtin/write-tree.c:27
11074msgid "write tree object for a subdirectory <prefix>"
07432cef 11075msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5
JX
11076
11077#: builtin/write-tree.c:30
11078msgid "only useful for debugging"
07432cef 11079msgstr "只对调试有用"
ef317cd5 11080
1b7f4a34 11081#: credential-cache--daemon.c:255
220c313c
JX
11082msgid "print debugging messages to stderr"
11083msgstr "调试信息输出到标准错误"
11084
d9d56b23 11085#: git.c:14
4dcdc3d8 11086msgid ""
220c313c 11087"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8
JX
11088"concept guides. See 'git help <command>' or 'git help <concept>'\n"
11089"to read about a specific subcommand or concept."
11090msgstr ""
220c313c
JX
11091"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
11092"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
11093"帮助。"
8ada9598 11094
1b7f4a34 11095#: common-cmds.h:9
7aea43ff
JX
11096msgid "start a working area (see also: git help tutorial)"
11097msgstr "开始一个工作区(参见:git help tutorial)"
11098
1b7f4a34 11099#: common-cmds.h:10
7aea43ff
JX
11100msgid "work on the current change (see also: git help everyday)"
11101msgstr "在当前变更上工作(参见:git help everyday)"
11102
1b7f4a34 11103#: common-cmds.h:11
7aea43ff
JX
11104msgid "examine the history and state (see also: git help revisions)"
11105msgstr "检查历史和状态(参见:git help revisions)"
11106
1b7f4a34 11107#: common-cmds.h:12
7aea43ff
JX
11108msgid "grow, mark and tweak your common history"
11109msgstr "扩展、标记和调校您的历史记录"
11110
1b7f4a34 11111#: common-cmds.h:13
7aea43ff
JX
11112msgid "collaborate (see also: git help workflows)"
11113msgstr "协同(参见:git help workflows)"
11114
1b7f4a34 11115#: common-cmds.h:17
8ada9598 11116msgid "Add file contents to the index"
81809b99 11117msgstr "添加文件内容至索引"
8ada9598 11118
1b7f4a34
JX
11119#: common-cmds.h:18
11120msgid "Use binary search to find the commit that introduced a bug"
11121msgstr "通过二分查找定位引入 bug 的提交"
8ada9598 11122
1b7f4a34 11123#: common-cmds.h:19
8ada9598 11124msgid "List, create, or delete branches"
81809b99 11125msgstr "列出、创建或删除分支"
8ada9598 11126
1b7f4a34 11127#: common-cmds.h:20
5bb01d4f
JX
11128msgid "Switch branches or restore working tree files"
11129msgstr "切换分支或恢复工作区文件"
8ada9598 11130
1b7f4a34 11131#: common-cmds.h:21
8ada9598 11132msgid "Clone a repository into a new directory"
160fb2b2 11133msgstr "克隆一个仓库到一个新目录"
8ada9598 11134
1b7f4a34 11135#: common-cmds.h:22
8ada9598 11136msgid "Record changes to the repository"
160fb2b2 11137msgstr "记录变更到仓库"
8ada9598 11138
1b7f4a34 11139#: common-cmds.h:23
8ada9598 11140msgid "Show changes between commits, commit and working tree, etc"
81809b99 11141msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 11142
1b7f4a34 11143#: common-cmds.h:24
8ada9598 11144msgid "Download objects and refs from another repository"
160fb2b2 11145msgstr "从另外一个仓库下载对象和引用"
8ada9598 11146
1b7f4a34 11147#: common-cmds.h:25
8ada9598 11148msgid "Print lines matching a pattern"
81809b99 11149msgstr "输出和模式匹配的行"
8ada9598 11150
1b7f4a34 11151#: common-cmds.h:26
a77c07d9 11152msgid "Create an empty Git repository or reinitialize an existing one"
160fb2b2 11153msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
8ada9598 11154
1b7f4a34 11155#: common-cmds.h:27
8ada9598 11156msgid "Show commit logs"
81809b99 11157msgstr "显示提交日志"
8ada9598 11158
1b7f4a34 11159#: common-cmds.h:28
8ada9598 11160msgid "Join two or more development histories together"
81809b99 11161msgstr "合并两个或更多开发历史"
8ada9598 11162
1b7f4a34 11163#: common-cmds.h:29
8ada9598 11164msgid "Move or rename a file, a directory, or a symlink"
81809b99 11165msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 11166
1b7f4a34 11167#: common-cmds.h:30
2e8451e8 11168msgid "Fetch from and integrate with another repository or a local branch"
160fb2b2 11169msgstr "获取并整合另外的仓库或一个本地分支"
8ada9598 11170
1b7f4a34 11171#: common-cmds.h:31
8ada9598 11172msgid "Update remote refs along with associated objects"
81809b99 11173msgstr "更新远程引用和相关的对象"
8ada9598 11174
1b7f4a34 11175#: common-cmds.h:32
8ada9598 11176msgid "Forward-port local commits to the updated upstream head"
81809b99 11177msgstr "本地提交转移至更新后的上游分支中"
8ada9598 11178
1b7f4a34 11179#: common-cmds.h:33
8ada9598 11180msgid "Reset current HEAD to the specified state"
4375c10e 11181msgstr "重置当前 HEAD 到指定状态"
8ada9598 11182
1b7f4a34 11183#: common-cmds.h:34
8ada9598 11184msgid "Remove files from the working tree and from the index"
81809b99 11185msgstr "从工作区和索引中删除文件"
8ada9598 11186
1b7f4a34 11187#: common-cmds.h:35
8ada9598 11188msgid "Show various types of objects"
81809b99 11189msgstr "显示各种类型的对象"
8ada9598 11190
1b7f4a34 11191#: common-cmds.h:36
8ada9598 11192msgid "Show the working tree status"
81809b99 11193msgstr "显示工作区状态"
8ada9598 11194
1b7f4a34 11195#: common-cmds.h:37
8ada9598 11196msgid "Create, list, delete or verify a tag object signed with GPG"
4375c10e 11197msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
8ada9598 11198
1b7f4a34 11199#: parse-options.h:145
220c313c
JX
11200msgid "expiry-date"
11201msgstr "到期时间"
11202
1b7f4a34 11203#: parse-options.h:160
220c313c
JX
11204msgid "no-op (backward compatibility)"
11205msgstr "空操作(向后兼容)"
11206
94550ed3 11207#: parse-options.h:237
220c313c
JX
11208msgid "be more verbose"
11209msgstr "更加详细"
11210
94550ed3 11211#: parse-options.h:239
220c313c
JX
11212msgid "be more quiet"
11213msgstr "更加安静"
11214
94550ed3 11215#: parse-options.h:245
220c313c
JX
11216msgid "use <n> digits to display SHA-1s"
11217msgstr "用 <n> 位数字显示 SHA-1 哈希值"
11218
94550ed3 11219#: rerere.h:38
220c313c
JX
11220msgid "update the index with reused conflict resolution if possible"
11221msgstr "如果可能,重用冲突解决更新索引"
11222
94550ed3 11223#: git-bisect.sh:55
b694fbb1
JX
11224msgid "You need to start by \"git bisect start\""
11225msgstr "您需要执行 \"git bisect start\" 来开始"
11226
90e6ef53 11227# 译者:注意保持句尾空格
c04f5ac3
JX
11228#. TRANSLATORS: Make sure to include [Y] and [n] in your
11229#. translation. The program will only accept English input
11230#. at this point.
94550ed3 11231#: git-bisect.sh:61
c04f5ac3
JX
11232msgid "Do you want me to do it for you [Y/n]? "
11233msgstr "您想让我为您这样做么[Y/n]? "
11234
94550ed3 11235#: git-bisect.sh:122
c04f5ac3
JX
11236#, sh-format
11237msgid "unrecognised option: '$arg'"
81809b99 11238msgstr "未能识别的选项:'$arg'"
c04f5ac3 11239
94550ed3 11240#: git-bisect.sh:126
c04f5ac3
JX
11241#, sh-format
11242msgid "'$arg' does not appear to be a valid revision"
11243msgstr "'$arg' 看起来不像是一个有效的版本"
11244
94550ed3 11245#: git-bisect.sh:155
c04f5ac3
JX
11246msgid "Bad HEAD - I need a HEAD"
11247msgstr "坏的 HEAD - 我需要一个 HEAD"
11248
94550ed3 11249#: git-bisect.sh:168
c04f5ac3
JX
11250#, sh-format
11251msgid ""
814ff314 11252"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
d9d56b23 11253msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
c04f5ac3 11254
94550ed3 11255#: git-bisect.sh:178
cfff71a9
JX
11256msgid "won't bisect on cg-seek'ed tree"
11257msgstr "不会在做了 cg-seek 的树上做二分查找"
c04f5ac3 11258
94550ed3 11259#: git-bisect.sh:182
c04f5ac3 11260msgid "Bad HEAD - strange symbolic ref"
90e6ef53 11261msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3 11262
94550ed3 11263#: git-bisect.sh:234
c04f5ac3
JX
11264#, sh-format
11265msgid "Bad bisect_write argument: $state"
90e6ef53 11266msgstr "坏的 bisect_write 参数:$state"
c04f5ac3 11267
94550ed3 11268#: git-bisect.sh:263
c04f5ac3
JX
11269#, sh-format
11270msgid "Bad rev input: $arg"
90e6ef53 11271msgstr "输入坏的版本:$arg"
c04f5ac3 11272
94550ed3 11273#: git-bisect.sh:278
c04f5ac3
JX
11274msgid "Please call 'bisect_state' with at least one argument."
11275msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
11276
94550ed3 11277#: git-bisect.sh:290
c04f5ac3
JX
11278#, sh-format
11279msgid "Bad rev input: $rev"
11280msgstr "输入坏的版本:$rev"
11281
94550ed3 11282#: git-bisect.sh:299
1b7f4a34
JX
11283#, sh-format
11284msgid "'git bisect $TERM_BAD' can take only one argument."
11285msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
11286
94550ed3 11287#: git-bisect.sh:322
1b7f4a34
JX
11288#, sh-format
11289msgid "Warning: bisecting only with a $TERM_BAD commit."
11290msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
b694fbb1 11291
90e6ef53 11292# 译者:注意保持句尾空格
c04f5ac3
JX
11293#. TRANSLATORS: Make sure to include [Y] and [n] in your
11294#. translation. The program will only accept English input
11295#. at this point.
94550ed3 11296#: git-bisect.sh:328
c04f5ac3
JX
11297msgid "Are you sure [Y/n]? "
11298msgstr "您确认么[Y/n]? "
11299
94550ed3 11300#: git-bisect.sh:340
1b7f4a34 11301#, sh-format
b694fbb1 11302msgid ""
1b7f4a34
JX
11303"You need to give me at least one $bad_syn and one $good_syn revision.\n"
11304"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
b694fbb1
JX
11305msgstr ""
11306"您需要给我至少一个好版本和一个坏版本。\n"
1b7f4a34 11307"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
b694fbb1 11308
94550ed3 11309#: git-bisect.sh:343
1b7f4a34 11310#, sh-format
b694fbb1
JX
11311msgid ""
11312"You need to start by \"git bisect start\".\n"
1b7f4a34
JX
11313"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
11314"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
b694fbb1
JX
11315msgstr ""
11316"您需要执行 \"git bisect start\" 来开始。\n"
11317"然后需要提供我至少一个好版本和一个坏版本。\n"
1b7f4a34 11318"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
b694fbb1 11319
94550ed3 11320#: git-bisect.sh:414 git-bisect.sh:546
b694fbb1
JX
11321msgid "We are not bisecting."
11322msgstr "我们没有在二分查找。"
11323
94550ed3 11324#: git-bisect.sh:421
c04f5ac3
JX
11325#, sh-format
11326msgid "'$invalid' is not a valid commit"
11327msgstr "'$invalid' 不是一个有效的提交"
11328
94550ed3 11329#: git-bisect.sh:430
c04f5ac3
JX
11330#, sh-format
11331msgid ""
11332"Could not check out original HEAD '$branch'.\n"
11333"Try 'git bisect reset <commit>'."
11334msgstr ""
11335"不能检出原始 HEAD '$branch'。\n"
07432cef 11336"尝试 'git bisect reset <提交>'。"
c04f5ac3 11337
94550ed3 11338#: git-bisect.sh:458
c04f5ac3
JX
11339msgid "No logfile given"
11340msgstr "未提供日志文件"
11341
94550ed3 11342#: git-bisect.sh:459
c04f5ac3
JX
11343#, sh-format
11344msgid "cannot read $file for replaying"
11345msgstr "不能读取 $file 来重放"
11346
94550ed3 11347#: git-bisect.sh:480
c04f5ac3
JX
11348msgid "?? what are you talking about?"
11349msgstr "?? 您在说什么?"
11350
94550ed3 11351#: git-bisect.sh:492
b694fbb1
JX
11352#, sh-format
11353msgid "running $command"
11354msgstr "运行 $command"
11355
94550ed3 11356#: git-bisect.sh:499
b694fbb1
JX
11357#, sh-format
11358msgid ""
11359"bisect run failed:\n"
11360"exit code $res from '$command' is < 0 or >= 128"
11361msgstr ""
11362"二分查找运行失败:\n"
07432cef 11363"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 11364
94550ed3 11365#: git-bisect.sh:525
b694fbb1
JX
11366msgid "bisect run cannot continue any more"
11367msgstr "二分查找不能继续运行"
11368
94550ed3 11369#: git-bisect.sh:531
b694fbb1
JX
11370#, sh-format
11371msgid ""
11372"bisect run failed:\n"
11373"'bisect_state $state' exited with error code $res"
11374msgstr ""
11375"二分查找运行失败:\n"
11376"'bisect_state $state' 退出码为 $res"
11377
94550ed3 11378#: git-bisect.sh:538
b694fbb1
JX
11379msgid "bisect run success"
11380msgstr "二分查找运行成功"
c04f5ac3 11381
94550ed3
JX
11382#: git-bisect.sh:565
11383msgid "please use two different terms"
11384msgstr "请使用两个不同的术语"
11385
11386#: git-bisect.sh:575
11387#, sh-format
11388msgid "'$term' is not a valid term"
11389msgstr "'$term' 不是一个有效的名称"
11390
11391#: git-bisect.sh:578
11392#, sh-format
11393msgid "can't use the builtin command '$term' as a term"
11394msgstr "不能使用内置命令 '$term' 作为术语"
11395
11396#: git-bisect.sh:587 git-bisect.sh:593
11397#, sh-format
11398msgid "can't change the meaning of term '$term'"
11399msgstr "不能修改术语 '$term' 的含义"
11400
11401#: git-bisect.sh:606
b694fbb1 11402#, sh-format
1b7f4a34
JX
11403msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
11404msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
c04f5ac3 11405
94550ed3
JX
11406#: git-bisect.sh:636
11407msgid "no terms defined"
11408msgstr "未定义术语"
11409
11410#: git-bisect.sh:653
11411#, sh-format
11412msgid ""
11413"invalid argument $arg for 'git bisect terms'.\n"
11414"Supported options are: --term-good|--term-old and --term-bad|--term-new."
11415msgstr ""
11416"参数 $arg 对命令 'git bisect terms' 无效。\n"
11417"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
11418
6c94aba5 11419#: git-rebase.sh:57
649900bc
JX
11420msgid ""
11421"When you have resolved this problem, run \"git rebase --continue\".\n"
11422"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
11423"To check out the original branch and stop rebasing, run \"git rebase --abort"
11424"\"."
11425msgstr ""
11426"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
11427"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
11428"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
11429
6acbf033 11430#: git-rebase.sh:165
2e8451e8
JX
11431msgid "Applied autostash."
11432msgstr "成功应用 autostash。"
11433
6acbf033 11434#: git-rebase.sh:168
2e8451e8
JX
11435#, sh-format
11436msgid "Cannot store $stash_sha1"
11437msgstr "无法保存 $stash_sha1"
11438
6acbf033 11439#: git-rebase.sh:169
2e8451e8
JX
11440msgid ""
11441"Applying autostash resulted in conflicts.\n"
11442"Your changes are safe in the stash.\n"
b1894384 11443"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
2e8451e8
JX
11444msgstr ""
11445"应用 autostash 导致冲突。\n"
11446"您的修改安全地保存在 stash 中。\n"
11447"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
11448
6acbf033 11449#: git-rebase.sh:208
649900bc 11450msgid "The pre-rebase hook refused to rebase."
98b2761d 11451msgstr "钩子 pre-rebase 拒绝变基操作。"
649900bc 11452
6acbf033 11453#: git-rebase.sh:213
649900bc
JX
11454msgid "It looks like git-am is in progress. Cannot rebase."
11455msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
11456
94550ed3 11457#: git-rebase.sh:354
649900bc
JX
11458msgid "The --exec option must be used with the --interactive option"
11459msgstr "选项 --exec 必须和选项 --interactive 同时使用"
11460
94550ed3 11461#: git-rebase.sh:359
649900bc
JX
11462msgid "No rebase in progress?"
11463msgstr "没有正在进行的变基?"
11464
94550ed3 11465#: git-rebase.sh:370
07432cef
WS
11466msgid "The --edit-todo action can only be used during interactive rebase."
11467msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
11468
94550ed3 11469#: git-rebase.sh:377
649900bc
JX
11470msgid "Cannot read HEAD"
11471msgstr "不能读取 HEAD"
11472
94550ed3 11473#: git-rebase.sh:380
649900bc
JX
11474msgid ""
11475"You must edit all merge conflicts and then\n"
11476"mark them as resolved using git add"
11477msgstr ""
11478"您必须编辑所有的合并冲突,然后通过 git add\n"
11479"命令将它们标记为已解决"
11480
94550ed3 11481#: git-rebase.sh:398
649900bc
JX
11482#, sh-format
11483msgid "Could not move back to $head_name"
11484msgstr "无法移回 $head_name"
11485
94550ed3 11486#: git-rebase.sh:417
649900bc
JX
11487#, sh-format
11488msgid ""
11489"It seems that there is already a $state_dir_base directory, and\n"
11490"I wonder if you are in the middle of another rebase. If that is the\n"
11491"case, please try\n"
11492"\t$cmd_live_rebase\n"
11493"If that is not the case, please\n"
11494"\t$cmd_clear_stale_rebase\n"
11495"and run me again. I am stopping in case you still have something\n"
11496"valuable there."
11497msgstr ""
98b2761d
JX
11498"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
11499"过程中。 如果是这样,请执行\n"
649900bc
JX
11500"\t$cmd_live_rebase\n"
11501"如果不是这样,请执行\n"
11502"\t$cmd_clear_stale_rebase\n"
98b2761d 11503"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
649900bc 11504
94550ed3 11505#: git-rebase.sh:468
649900bc
JX
11506#, sh-format
11507msgid "invalid upstream $upstream_name"
11508msgstr "无效的上游 $upstream_name"
11509
94550ed3 11510#: git-rebase.sh:492
649900bc
JX
11511#, sh-format
11512msgid "$onto_name: there are more than one merge bases"
11513msgstr "$onto_name: 有一个以上的合并基准"
11514
94550ed3 11515#: git-rebase.sh:495 git-rebase.sh:499
649900bc
JX
11516#, sh-format
11517msgid "$onto_name: there is no merge base"
11518msgstr "$onto_name: 没有合并基准"
11519
94550ed3 11520#: git-rebase.sh:504
649900bc
JX
11521#, sh-format
11522msgid "Does not point to a valid commit: $onto_name"
11523msgstr "没有指向一个有效的提交:$onto_name"
11524
94550ed3 11525#: git-rebase.sh:527
649900bc
JX
11526#, sh-format
11527msgid "fatal: no such branch: $branch_name"
11528msgstr "严重错误:无此分支:$branch_name"
11529
94550ed3 11530#: git-rebase.sh:560
2e8451e8
JX
11531msgid "Cannot autostash"
11532msgstr "无法 autostash"
11533
94550ed3 11534#: git-rebase.sh:565
2e8451e8
JX
11535#, sh-format
11536msgid "Created autostash: $stash_abbrev"
11537msgstr "创建了 autostash: $stash_abbrev"
11538
94550ed3 11539#: git-rebase.sh:569
649900bc
JX
11540msgid "Please commit or stash them."
11541msgstr "请提交或为它们保存进度。"
11542
94550ed3 11543#: git-rebase.sh:589
649900bc
JX
11544#, sh-format
11545msgid "Current branch $branch_name is up to date."
11546msgstr "当前分支 $branch_name 是最新的。"
11547
94550ed3 11548#: git-rebase.sh:593
649900bc
JX
11549#, sh-format
11550msgid "Current branch $branch_name is up to date, rebase forced."
11551msgstr "当前分支 $branch_name 是最新的,强制变基。"
11552
94550ed3 11553#: git-rebase.sh:604
649900bc
JX
11554#, sh-format
11555msgid "Changes from $mb to $onto:"
11556msgstr "变更从 $mb 到 $onto:"
11557
94550ed3 11558#: git-rebase.sh:613
649900bc 11559msgid "First, rewinding head to replay your work on top of it..."
160fb2b2 11560msgstr "首先,回退分支以便在上面重放您的工作..."
649900bc 11561
94550ed3 11562#: git-rebase.sh:623
649900bc
JX
11563#, sh-format
11564msgid "Fast-forwarded $branch_name to $onto_name."
11565msgstr "快进 $branch_name 至 $onto_name。"
11566
c04f5ac3
JX
11567#: git-stash.sh:51
11568msgid "git stash clear with parameters is unimplemented"
11569msgstr "git stash clear 不支持参数"
11570
11571#: git-stash.sh:74
11572msgid "You do not have the initial commit yet"
11573msgstr "您尚未建立初始提交"
11574
11575#: git-stash.sh:89
11576msgid "Cannot save the current index state"
90e6ef53 11577msgstr "无法保存当前索引状态"
c04f5ac3 11578
6acbf033 11579#: git-stash.sh:124 git-stash.sh:137
c04f5ac3
JX
11580msgid "Cannot save the current worktree state"
11581msgstr "无法保存当前工作区状态"
11582
6acbf033 11583#: git-stash.sh:141
c04f5ac3 11584msgid "No changes selected"
90e6ef53 11585msgstr "没有选择变更"
c04f5ac3 11586
6acbf033 11587#: git-stash.sh:144
c04f5ac3 11588msgid "Cannot remove temporary index (can't happen)"
90e6ef53 11589msgstr "无法删除临时索引(不应发生)"
c04f5ac3 11590
6acbf033 11591#: git-stash.sh:157
c04f5ac3
JX
11592msgid "Cannot record working tree state"
11593msgstr "不能记录工作区状态"
11594
1b7f4a34 11595#: git-stash.sh:189
2e8451e8
JX
11596#, sh-format
11597msgid "Cannot update $ref_stash with $w_commit"
11598msgstr "无法用 $w_commit 更新 $ref_stash"
11599
b694fbb1
JX
11600#. TRANSLATORS: $option is an invalid option, like
11601#. `--blah-blah'. The 7 spaces at the beginning of the
11602#. second line correspond to "error: ". So you should line
11603#. up the second line with however many characters the
11604#. translation of "error: " takes in your language. E.g. in
11605#. English this is:
11606#.
11607#. $ git stash save --blah-blah 2>&1 | head -n 2
11608#. error: unknown option for 'stash save': --blah-blah
11609#. To provide a message, use git stash save -- '--blah-blah'
1b7f4a34 11610#: git-stash.sh:239
b694fbb1
JX
11611#, sh-format
11612msgid ""
11613"error: unknown option for 'stash save': $option\n"
11614" To provide a message, use git stash save -- '$option'"
11615msgstr ""
11616"错误:'stash save' 的未知选项:$option\n"
11617" 要提供一个描述信息,使用 git stash save -- '$option'"
11618
1b7f4a34 11619#: git-stash.sh:260
c04f5ac3
JX
11620msgid "No local changes to save"
11621msgstr "没有要保存的本地修改"
11622
1b7f4a34 11623#: git-stash.sh:264
c04f5ac3 11624msgid "Cannot initialize stash"
90e6ef53 11625msgstr "无法初始化 stash"
c04f5ac3 11626
1b7f4a34 11627#: git-stash.sh:268
c04f5ac3
JX
11628msgid "Cannot save the current status"
11629msgstr "无法保存当前状态"
11630
1b7f4a34 11631#: git-stash.sh:286
c04f5ac3
JX
11632msgid "Cannot remove worktree changes"
11633msgstr "无法删除工作区变更"
11634
94550ed3 11635#: git-stash.sh:405
7aea43ff
JX
11636#, sh-format
11637msgid "unknown option: $opt"
11638msgstr "未知选项: $opt"
11639
94550ed3 11640#: git-stash.sh:415
c04f5ac3 11641msgid "No stash found."
90e6ef53 11642msgstr "未发现 stash。"
c04f5ac3 11643
94550ed3 11644#: git-stash.sh:422
c04f5ac3
JX
11645#, sh-format
11646msgid "Too many revisions specified: $REV"
90e6ef53 11647msgstr "指定了太多的版本:$REV"
c04f5ac3 11648
94550ed3 11649#: git-stash.sh:428
c04f5ac3 11650#, sh-format
220c313c
JX
11651msgid "$reference is not a valid reference"
11652msgstr "$reference 不是一个有效的引用"
c04f5ac3 11653
94550ed3 11654#: git-stash.sh:456
c04f5ac3
JX
11655#, sh-format
11656msgid "'$args' is not a stash-like commit"
90e6ef53 11657msgstr "'$args' 不是 stash 样提交"
c04f5ac3 11658
94550ed3 11659#: git-stash.sh:467
c04f5ac3
JX
11660#, sh-format
11661msgid "'$args' is not a stash reference"
90e6ef53 11662msgstr "'$args' 不是一个 stash 引用"
c04f5ac3 11663
94550ed3 11664#: git-stash.sh:475
c04f5ac3 11665msgid "unable to refresh index"
90e6ef53 11666msgstr "无法刷新索引"
c04f5ac3 11667
94550ed3 11668#: git-stash.sh:479
c04f5ac3
JX
11669msgid "Cannot apply a stash in the middle of a merge"
11670msgstr "无法在合并过程中恢复进度"
11671
94550ed3 11672#: git-stash.sh:487
c04f5ac3 11673msgid "Conflicts in index. Try without --index."
90e6ef53 11674msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 11675
94550ed3 11676#: git-stash.sh:489
c04f5ac3 11677msgid "Could not save index tree"
90e6ef53 11678msgstr "不能保存索引树"
c04f5ac3 11679
94550ed3 11680#: git-stash.sh:523
c04f5ac3 11681msgid "Cannot unstage modified files"
160fb2b2 11682msgstr "无法将修改的文件取消暂存"
c04f5ac3 11683
94550ed3 11684#: git-stash.sh:538
b694fbb1
JX
11685msgid "Index was not unstashed."
11686msgstr "索引的进度没有被恢复。"
11687
94550ed3 11688#: git-stash.sh:561
c04f5ac3
JX
11689#, sh-format
11690msgid "Dropped ${REV} ($s)"
11691msgstr "丢弃了 ${REV} ($s)"
11692
94550ed3 11693#: git-stash.sh:562
c04f5ac3
JX
11694#, sh-format
11695msgid "${REV}: Could not drop stash entry"
90e6ef53 11696msgstr "${REV}:不能丢弃进度条目"
c04f5ac3 11697
94550ed3 11698#: git-stash.sh:570
c04f5ac3
JX
11699msgid "No branch name specified"
11700msgstr "未指定分支名"
11701
94550ed3 11702#: git-stash.sh:642
c04f5ac3
JX
11703msgid "(To restore them type \"git stash apply\")"
11704msgstr "(为恢复数据输入 \"git stash apply\")"
11705
94550ed3 11706#: git-submodule.sh:104
c04f5ac3
JX
11707#, sh-format
11708msgid "cannot strip one component off url '$remoteurl'"
11709msgstr "无法从 url '$remoteurl' 剥离一个组件"
11710
94550ed3 11711#: git-submodule.sh:281
2e8451e8
JX
11712msgid "Relative path can only be used from the toplevel of the working tree"
11713msgstr "只能在工作区的顶级目录中使用相对路径"
11714
94550ed3 11715#: git-submodule.sh:291
c04f5ac3
JX
11716#, sh-format
11717msgid "repo URL: '$repo' must be absolute or begin with ./|../"
4375c10e 11718msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
c04f5ac3 11719
94550ed3 11720#: git-submodule.sh:308
c04f5ac3 11721#, sh-format
170e9899
JX
11722msgid "'$sm_path' already exists in the index"
11723msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 11724
94550ed3 11725#: git-submodule.sh:312
b694fbb1
JX
11726#, sh-format
11727msgid ""
11728"The following path is ignored by one of your .gitignore files:\n"
11729"$sm_path\n"
11730"Use -f if you really want to add it."
11731msgstr ""
11732"以下路径被您的一个 .gitignore 文件所忽略:\n"
11733"$sm_path\n"
11734"如果您确实想添加它,使用 -f 参数。"
11735
94550ed3 11736#: git-submodule.sh:330
b694fbb1
JX
11737#, sh-format
11738msgid "Adding existing repo at '$sm_path' to the index"
160fb2b2 11739msgstr "添加位于 '$sm_path' 的现存仓库到索引"
b694fbb1 11740
94550ed3 11741#: git-submodule.sh:332
c04f5ac3 11742#, sh-format
170e9899 11743msgid "'$sm_path' already exists and is not a valid git repo"
160fb2b2 11744msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
c04f5ac3 11745
94550ed3 11746#: git-submodule.sh:340
07432cef
WS
11747#, sh-format
11748msgid "A git directory for '$sm_name' is found locally with remote(s):"
160fb2b2 11749msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
07432cef 11750
94550ed3 11751#: git-submodule.sh:342
07432cef
WS
11752#, sh-format
11753msgid ""
11754"If you want to reuse this local git directory instead of cloning again from"
11755msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11756
94550ed3 11757#: git-submodule.sh:344
07432cef
WS
11758#, sh-format
11759msgid ""
11760"use the '--force' option. If the local git directory is not the correct repo"
160fb2b2 11761msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
07432cef 11762
94550ed3 11763#: git-submodule.sh:345
07432cef
WS
11764#, sh-format
11765msgid ""
11766"or you are unsure what this means choose another name with the '--name' "
11767"option."
11768msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11769
94550ed3 11770#: git-submodule.sh:347
07432cef
WS
11771#, sh-format
11772msgid "Reactivating local git directory for submodule '$sm_name'."
11773msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11774
94550ed3 11775#: git-submodule.sh:359
c04f5ac3 11776#, sh-format
170e9899
JX
11777msgid "Unable to checkout submodule '$sm_path'"
11778msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 11779
94550ed3 11780#: git-submodule.sh:364
c04f5ac3 11781#, sh-format
170e9899
JX
11782msgid "Failed to add submodule '$sm_path'"
11783msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 11784
94550ed3 11785#: git-submodule.sh:373
c04f5ac3 11786#, sh-format
170e9899
JX
11787msgid "Failed to register submodule '$sm_path'"
11788msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 11789
94550ed3 11790#: git-submodule.sh:417
c04f5ac3 11791#, sh-format
2e8451e8
JX
11792msgid "Entering '$prefix$displaypath'"
11793msgstr "正在进入 '$prefix$displaypath'"
c04f5ac3 11794
94550ed3 11795#: git-submodule.sh:437
c04f5ac3 11796#, sh-format
2e8451e8
JX
11797msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11798msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
c04f5ac3 11799
94550ed3 11800#: git-submodule.sh:483
c04f5ac3 11801#, sh-format
2e8451e8
JX
11802msgid "No url found for submodule path '$displaypath' in .gitmodules"
11803msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
c04f5ac3 11804
94550ed3 11805#: git-submodule.sh:492
c04f5ac3 11806#, sh-format
2e8451e8
JX
11807msgid "Failed to register url for submodule path '$displaypath'"
11808msgstr "无法为子模组路径 '$displaypath' 注册 url"
c04f5ac3 11809
94550ed3 11810#: git-submodule.sh:494
c04f5ac3 11811#, sh-format
2e8451e8
JX
11812msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11813msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
c04f5ac3 11814
94550ed3 11815#: git-submodule.sh:511
d691f479 11816#, sh-format
2e8451e8
JX
11817msgid "Failed to register update mode for submodule path '$displaypath'"
11818msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
d691f479 11819
94550ed3 11820#: git-submodule.sh:549
1003b3a5
JX
11821#, sh-format
11822msgid "Use '.' if you really want to deinitialize all submodules"
11823msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
11824
94550ed3 11825#: git-submodule.sh:566
1003b3a5 11826#, sh-format
2e8451e8
JX
11827msgid "Submodule work tree '$displaypath' contains a .git directory"
11828msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
1003b3a5 11829
94550ed3 11830#: git-submodule.sh:567
1003b3a5
JX
11831#, sh-format
11832msgid ""
11833"(use 'rm -rf' if you really want to remove it including all of its history)"
11834msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11835
94550ed3 11836#: git-submodule.sh:573
c04f5ac3
JX
11837#, sh-format
11838msgid ""
2e8451e8 11839"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
1003b3a5 11840"discard them"
2e8451e8 11841msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
1003b3a5 11842
94550ed3 11843#: git-submodule.sh:576
1003b3a5 11844#, sh-format
2e8451e8
JX
11845msgid "Cleared directory '$displaypath'"
11846msgstr "已清除目录 '$displaypath'"
1003b3a5 11847
94550ed3 11848#: git-submodule.sh:577
1003b3a5 11849#, sh-format
2e8451e8
JX
11850msgid "Could not remove submodule work tree '$displaypath'"
11851msgstr "无法移除子模组工作区 '$displaypath'"
1003b3a5 11852
94550ed3 11853#: git-submodule.sh:580
1003b3a5 11854#, sh-format
2e8451e8
JX
11855msgid "Could not create empty submodule directory '$displaypath'"
11856msgstr "不能创建空的子模组目录 '$displaypath'"
1003b3a5 11857
94550ed3 11858#: git-submodule.sh:589
1003b3a5 11859#, sh-format
2e8451e8
JX
11860msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11861msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
1003b3a5 11862
94550ed3 11863#: git-submodule.sh:705
1003b3a5
JX
11864#, sh-format
11865msgid ""
2e8451e8 11866"Submodule path '$displaypath' not initialized\n"
c04f5ac3
JX
11867"Maybe you want to use 'update --init'?"
11868msgstr ""
2e8451e8 11869"子模组路径 '$displaypath' 没有初始化\n"
90e6ef53 11870"也许您想用 'update --init'?"
c04f5ac3 11871
94550ed3 11872#: git-submodule.sh:718
c04f5ac3 11873#, sh-format
2e8451e8
JX
11874msgid "Unable to find current revision in submodule path '$displaypath'"
11875msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 11876
94550ed3 11877#: git-submodule.sh:727
c04f5ac3 11878#, sh-format
170e9899
JX
11879msgid "Unable to fetch in submodule path '$sm_path'"
11880msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 11881
94550ed3 11882#: git-submodule.sh:751
2e8451e8
JX
11883#, sh-format
11884msgid "Unable to fetch in submodule path '$displaypath'"
11885msgstr "无法在子模组路径 '$displaypath' 中获取"
11886
94550ed3 11887#: git-submodule.sh:765
6c94aba5
JX
11888#, sh-format
11889msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11890msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
11891
94550ed3 11892#: git-submodule.sh:766
c04f5ac3 11893#, sh-format
6c94aba5
JX
11894msgid "Submodule path '$displaypath': checked out '$sha1'"
11895msgstr "子模组路径 '$displaypath':检出 '$sha1'"
11896
94550ed3 11897#: git-submodule.sh:770
6c94aba5 11898#, sh-format
2e8451e8
JX
11899msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11900msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 11901
94550ed3 11902#: git-submodule.sh:771
c04f5ac3 11903#, sh-format
2e8451e8
JX
11904msgid "Submodule path '$displaypath': rebased into '$sha1'"
11905msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 11906
94550ed3 11907#: git-submodule.sh:776
c04f5ac3 11908#, sh-format
2e8451e8
JX
11909msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11910msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 11911
94550ed3 11912#: git-submodule.sh:777
c04f5ac3 11913#, sh-format
2e8451e8
JX
11914msgid "Submodule path '$displaypath': merged in '$sha1'"
11915msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 11916
94550ed3 11917#: git-submodule.sh:782
c04f5ac3 11918#, sh-format
2e8451e8 11919msgid ""
1b7f4a34 11920"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
2e8451e8 11921msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
c04f5ac3 11922
94550ed3 11923#: git-submodule.sh:783
c04f5ac3 11924#, sh-format
2e8451e8
JX
11925msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11926msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
c04f5ac3 11927
94550ed3 11928#: git-submodule.sh:813
2e8451e8
JX
11929#, sh-format
11930msgid "Failed to recurse into submodule path '$displaypath'"
11931msgstr "无法递归进子模组路径 '$displaypath'"
11932
94550ed3 11933#: git-submodule.sh:921
649900bc
JX
11934msgid "The --cached option cannot be used with the --files option"
11935msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1 11936
94550ed3 11937#: git-submodule.sh:973
b694fbb1
JX
11938#, sh-format
11939msgid "unexpected mode $mod_dst"
11940msgstr "意外的模式 $mod_dst"
c04f5ac3 11941
90e6ef53 11942# 译者:注意保持前导空格
94550ed3 11943#: git-submodule.sh:993
c04f5ac3 11944#, sh-format
2e8451e8
JX
11945msgid " Warn: $display_name doesn't contain commit $sha1_src"
11946msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 11947
90e6ef53 11948# 译者:注意保持前导空格
94550ed3 11949#: git-submodule.sh:996
c04f5ac3 11950#, sh-format
2e8451e8
JX
11951msgid " Warn: $display_name doesn't contain commit $sha1_dst"
11952msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 11953
90e6ef53 11954# 译者:注意保持前导空格
94550ed3 11955#: git-submodule.sh:999
c04f5ac3 11956#, sh-format
2e8451e8
JX
11957msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11958msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 11959
94550ed3 11960#: git-submodule.sh:1024
c04f5ac3 11961msgid "blob"
07432cef 11962msgstr "数据对象"
c04f5ac3 11963
94550ed3 11964#: git-submodule.sh:1142
1003b3a5
JX
11965#, sh-format
11966msgid "Failed to recurse into submodule path '$sm_path'"
11967msgstr "无法递归进子模组路径 '$sm_path'"
11968
94550ed3 11969#: git-submodule.sh:1206
c04f5ac3 11970#, sh-format
2e8451e8
JX
11971msgid "Synchronizing submodule url for '$displaypath'"
11972msgstr "为 '$displaypath' 同步子模组 url"
1b7f4a34 11973
94550ed3
JX
11974#~ msgid "show usage"
11975#~ msgstr "显示用法"
11976
11977#~ msgid "branch '%s' does not point at a commit"
11978#~ msgstr "分支 '%s' 未指向一个提交"
11979
11980#~ msgid "object '%s' does not point to a commit"
11981#~ msgstr "对象 '%s' 没有指向一个提交"
11982
11983#~ msgid "print only merged branches"
11984#~ msgstr "只打印合并的分支"
11985
11986#~ msgid "--dissociate given, but there is no --reference"
11987#~ msgstr "提供了参数 --dissociate,但未提供 --reference"
11988
11989#~ msgid "insanely long template name %s"
11990#~ msgstr "太长的模版名 %s"
11991
11992#~ msgid "insanely long symlink %s"
11993#~ msgstr "太长的符号链接 %s"
11994
11995#~ msgid "insanely long template path %s"
11996#~ msgstr "太长的模版路径 %s"
11997
11998#~ msgid "insane git directory %s"
11999#~ msgstr "不正常的 git 目录 %s"
12000
12001#~ msgid "unsupported sort specification '%s'"
12002#~ msgstr "不支持的排序规格 '%s'"
12003
12004#~ msgid "unsupported sort specification '%s' in variable '%s'"
12005#~ msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
12006
12007#~ msgid "switch 'points-at' requires an object"
12008#~ msgstr "开关 'points-at' 需要一个对象"
12009
12010#~ msgid "sort tags"
12011#~ msgstr "排序标签"
12012
12013#~ msgid "--sort and -n are incompatible"
12014#~ msgstr "--sort 和 -n 不兼容"
12015
12016#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
12017#~ msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
12018
03ea3327
JX
12019#~ msgid "false|true|preserve"
12020#~ msgstr "false|true|preserve"
12021
1b7f4a34
JX
12022#~ msgid "BUG: reopen a lockfile that is still open"
12023#~ msgstr "BUG: 重新打开一个仍打开着的锁文件"
12024
12025#~ msgid "BUG: reopen a lockfile that has been committed"
12026#~ msgstr "BUG: 重新打开一个已提交的锁文件"
12027
12028#~ msgid "option %s does not accept negative form"
12029#~ msgstr "选项 %s 不接受否定格式"
12030
12031#~ msgid "unable to parse value '%s' for option %s"
12032#~ msgstr "不能解析选项 %1$s 的值 '%2$s'"
12033
12034#~ msgid "unable to resolve HEAD"
12035#~ msgstr "不能解析 HEAD"
12036
12037#~ msgid "-b and -B are mutually exclusive"
12038#~ msgstr "-b 和 -B 互斥"
12039
12040#~ msgid "You need to set your committer info first"
12041#~ msgstr "您需要先设置你的提交者信息"
12042
12043#~ msgid ""
12044#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
12045#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
12046#~ "To restore the original branch and stop patching, run \"$cmdline --abort"
12047#~ "\"."
12048#~ msgstr ""
12049#~ "当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
12050#~ "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
12051#~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
12052
12053#~ msgid "Patch format $patch_format is not supported."
12054#~ msgstr "不支持 $patch_format 补丁格式。"
12055
12056#~ msgid "Please make up your mind. --skip or --abort?"
12057#~ msgstr "请下决心。--skip 或是 --abort ?"
12058
12059#~ msgid ""
12060#~ "Patch is empty. Was it split wrong?\n"
12061#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
12062#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
12063#~ msgstr ""
12064#~ "补丁为空。是不是切分错误?\n"
12065#~ "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
12066#~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
12067
12068#~ msgid "Patch does not have a valid e-mail address."
12069#~ msgstr "补丁中没有一个有效的邮件地址。"
12070
12071#~ msgid "Applying: $FIRSTLINE"
12072#~ msgstr "正应用:$FIRSTLINE"
12073
12074#~ msgid "Patch failed at $msgnum $FIRSTLINE"
12075#~ msgstr "补丁失败于 $msgnum $FIRSTLINE"
12076
12077#~ msgid ""
12078#~ "Pull is not possible because you have unmerged files.\n"
12079#~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
12080#~ "as appropriate to mark resolution and make a commit."
12081#~ msgstr ""
12082#~ "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
12083#~ "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
12084
12085#~ msgid "Pull is not possible because you have unmerged files."
12086#~ msgstr "Pull 不可用,因为您尚有未合并的文件。"