]>
Commit | Line | Data |
---|---|---|
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 |
134 | msgid "" |
135 | msgstr "" | |
136 | "Project-Id-Version: Git\n" | |
137 | "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" | |
89f80d72 JX |
138 | "POT-Creation-Date: 2015-12-22 22:50+0800\n" |
139 | "PO-Revision-Date: 2015-12-22 23:06+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 |
150 | msgid "hint: %.*s\n" | |
151 | msgstr "提示:%.*s\n" | |
152 | ||
6acbf033 | 153 | #: advice.c:88 |
c04f5ac3 | 154 | msgid "" |
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 | 157 | msgstr "" |
d9d56b23 | 158 | "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n" |
220c313c | 159 | "解决方案并提交。" |
c04f5ac3 | 160 | |
94550ed3 | 161 | #: advice.c:101 builtin/merge.c:1225 |
1b7f4a34 JX |
162 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
163 | msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" | |
164 | ||
165 | #: advice.c:103 | |
94550ed3 | 166 | msgid "Please, commit your changes before merging." |
1b7f4a34 JX |
167 | msgstr "请在合并前先提交您的修改。" |
168 | ||
169 | #: advice.c:104 | |
170 | msgid "Exiting because of unfinished merge." | |
171 | msgstr "因为存在未完成的合并而退出。" | |
172 | ||
173 | #: archive.c:12 | |
814ff314 JX |
174 | msgid "git archive [<options>] <tree-ish> [<path>...]" |
175 | msgstr "git archive [<选项>] <树或提交> [<路径>...]" | |
ef317cd5 | 176 | |
1b7f4a34 | 177 | #: archive.c:13 |
ef317cd5 | 178 | msgid "git archive --list" |
07432cef | 179 | msgstr "git archive --list" |
ef317cd5 | 180 | |
1b7f4a34 | 181 | #: archive.c:14 |
ef317cd5 | 182 | msgid "" |
814ff314 | 183 | "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" |
ef317cd5 | 184 | msgstr "" |
160fb2b2 | 185 | "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 186 | |
1b7f4a34 | 187 | #: archive.c:15 |
ef317cd5 | 188 | msgid "git archive --remote <repo> [--exec <cmd>] --list" |
160fb2b2 | 189 | msgstr "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 |
193 | msgid "pathspec '%s' did not match any files" | |
160fb2b2 | 194 | msgstr "路径规格 '%s' 未匹配任何文件" |
90314792 | 195 | |
94550ed3 | 196 | #: archive.c:429 |
ef317cd5 | 197 | msgid "fmt" |
07432cef | 198 | msgstr "格式" |
ef317cd5 | 199 | |
94550ed3 | 200 | #: archive.c:429 |
ef317cd5 | 201 | msgid "archive format" |
07432cef | 202 | msgstr "归档格式" |
ef317cd5 | 203 | |
89f80d72 | 204 | #: archive.c:430 builtin/log.c:1229 |
ef317cd5 | 205 | msgid "prefix" |
07432cef | 206 | msgstr "前缀" |
ef317cd5 | 207 | |
94550ed3 | 208 | #: archive.c:431 |
ef317cd5 | 209 | msgid "prepend prefix to each pathname in the archive" |
07432cef | 210 | msgstr "为归档中每个路径名加上前缀" |
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 |
217 | msgid "file" |
218 | msgstr "文件" | |
219 | ||
94550ed3 | 220 | #: archive.c:433 builtin/archive.c:89 |
ef317cd5 | 221 | msgid "write the archive to this file" |
07432cef | 222 | msgstr "归档写入此文件" |
ef317cd5 | 223 | |
94550ed3 | 224 | #: archive.c:435 |
ef317cd5 | 225 | msgid "read .gitattributes in working directory" |
07432cef | 226 | msgstr "读取工作区中的 .gitattributes" |
ef317cd5 | 227 | |
94550ed3 | 228 | #: archive.c:436 |
ef317cd5 | 229 | msgid "report archived files on stderr" |
07432cef | 230 | msgstr "在标准错误上报告归档文件" |
ef317cd5 | 231 | |
94550ed3 | 232 | #: archive.c:437 |
ef317cd5 | 233 | msgid "store only" |
07432cef | 234 | msgstr "只存储" |
ef317cd5 | 235 | |
94550ed3 | 236 | #: archive.c:438 |
ef317cd5 | 237 | msgid "compress faster" |
07432cef | 238 | msgstr "压缩速度更快" |
ef317cd5 | 239 | |
94550ed3 | 240 | #: archive.c:446 |
ef317cd5 | 241 | msgid "compress better" |
07432cef | 242 | msgstr "压缩效果更好" |
ef317cd5 | 243 | |
94550ed3 | 244 | #: archive.c:449 |
ef317cd5 | 245 | msgid "list supported archive formats" |
07432cef | 246 | msgstr "列出支持的归档格式" |
ef317cd5 | 247 | |
94550ed3 | 248 | #: archive.c:451 builtin/archive.c:90 builtin/clone.c:77 |
ef317cd5 | 249 | msgid "repo" |
160fb2b2 | 250 | msgstr "仓库" |
ef317cd5 | 251 | |
94550ed3 | 252 | #: archive.c:452 builtin/archive.c:91 |
ef317cd5 | 253 | msgid "retrieve the archive from remote repository <repo>" |
160fb2b2 | 254 | msgstr "从远程仓库(<仓库>)提取归档文件" |
ef317cd5 | 255 | |
94550ed3 | 256 | #: archive.c:453 builtin/archive.c:92 builtin/notes.c:479 |
ef317cd5 | 257 | msgid "command" |
07432cef | 258 | msgstr "命令" |
ef317cd5 | 259 | |
94550ed3 | 260 | #: archive.c:454 builtin/archive.c:93 |
ef317cd5 | 261 | msgid "path to the remote git-upload-archive command" |
07432cef WS |
262 | msgstr "远程 git-upload-archive 命令的路径" |
263 | ||
7aea43ff | 264 | #: attr.c:265 |
07432cef | 265 | msgid "" |
a7409dfb | 266 | "Negative patterns are ignored in git attributes\n" |
07432cef | 267 | "Use '\\!' for literal leading exclamation." |
ef317cd5 | 268 | msgstr "" |
a7409dfb | 269 | "负值模版在 git attributes 中被忽略\n" |
07432cef | 270 | "当字符串确实要以感叹号开始时,使用 '\\!'。" |
ef317cd5 | 271 | |
94550ed3 | 272 | #: branch.c:61 |
4dcdc3d8 JX |
273 | #, c-format |
274 | msgid "Not setting branch %s as its own upstream." | |
275 | msgstr "未设置分支 %s 作为它自己的上游。" | |
276 | ||
94550ed3 | 277 | #: branch.c:84 |
4dcdc3d8 JX |
278 | #, c-format |
279 | msgid "Branch %s set up to track remote branch %s from %s by rebasing." | |
280 | msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。" | |
281 | ||
94550ed3 | 282 | #: branch.c:85 |
4dcdc3d8 JX |
283 | #, c-format |
284 | msgid "Branch %s set up to track remote branch %s from %s." | |
285 | msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。" | |
286 | ||
94550ed3 | 287 | #: branch.c:89 |
4dcdc3d8 JX |
288 | #, c-format |
289 | msgid "Branch %s set up to track local branch %s by rebasing." | |
290 | msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。" | |
291 | ||
94550ed3 | 292 | #: branch.c:90 |
4dcdc3d8 JX |
293 | #, c-format |
294 | msgid "Branch %s set up to track local branch %s." | |
295 | msgstr "分支 %s 设置为跟踪本地分支 %s。" | |
296 | ||
94550ed3 | 297 | #: branch.c:95 |
4dcdc3d8 JX |
298 | #, c-format |
299 | msgid "Branch %s set up to track remote ref %s by rebasing." | |
300 | msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。" | |
301 | ||
94550ed3 | 302 | #: branch.c:96 |
4dcdc3d8 JX |
303 | #, c-format |
304 | msgid "Branch %s set up to track remote ref %s." | |
305 | msgstr "分支 %s 设置为跟踪远程引用 %s。" | |
306 | ||
94550ed3 | 307 | #: branch.c:100 |
4dcdc3d8 JX |
308 | #, c-format |
309 | msgid "Branch %s set up to track local ref %s by rebasing." | |
310 | msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。" | |
311 | ||
94550ed3 | 312 | #: branch.c:101 |
4dcdc3d8 JX |
313 | #, c-format |
314 | msgid "Branch %s set up to track local ref %s." | |
315 | msgstr "分支 %s 设置为跟踪本地引用 %s。" | |
316 | ||
94550ed3 | 317 | #: branch.c:134 |
4dcdc3d8 JX |
318 | #, c-format |
319 | msgid "Not tracking: ambiguous information for ref %s" | |
320 | msgstr "未跟踪:引用 %s 有歧义" | |
321 | ||
94550ed3 | 322 | #: branch.c:163 |
4dcdc3d8 JX |
323 | #, c-format |
324 | msgid "'%s' is not a valid branch name." | |
325 | msgstr "'%s' 不是一个有效的分支名称。" | |
326 | ||
94550ed3 | 327 | #: branch.c:168 |
4dcdc3d8 JX |
328 | #, c-format |
329 | msgid "A branch named '%s' already exists." | |
330 | msgstr "一个分支名 '%s' 已经存在。" | |
331 | ||
94550ed3 | 332 | #: branch.c:176 |
4dcdc3d8 JX |
333 | msgid "Cannot force update the current branch." |
334 | msgstr "无法强制更新当前分支。" | |
335 | ||
94550ed3 | 336 | #: branch.c:196 |
1003b3a5 JX |
337 | #, c-format |
338 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." | |
339 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" | |
340 | ||
94550ed3 | 341 | #: branch.c:198 |
1003b3a5 JX |
342 | #, c-format |
343 | msgid "the requested upstream branch '%s' does not exist" | |
344 | msgstr "请求的上游分支 '%s' 不存在" | |
345 | ||
94550ed3 | 346 | #: branch.c:200 |
1003b3a5 JX |
347 | msgid "" |
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." | |
356 | msgstr "" | |
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 |
366 | msgid "Not a valid object name: '%s'." | |
367 | msgstr "不是一个有效的对象名:'%s'。" | |
368 | ||
94550ed3 | 369 | #: branch.c:264 |
4dcdc3d8 JX |
370 | #, c-format |
371 | msgid "Ambiguous object name: '%s'." | |
372 | msgstr "歧义的对象名:'%s'。" | |
373 | ||
94550ed3 | 374 | #: branch.c:269 |
4dcdc3d8 JX |
375 | #, c-format |
376 | msgid "Not a valid branch point: '%s'." | |
377 | msgstr "无效的分支点:'%s'。" | |
378 | ||
94550ed3 | 379 | #: branch.c:322 |
1b7f4a34 JX |
380 | #, c-format |
381 | msgid "'%s' is already checked out at '%s'" | |
382 | msgstr "'%s' 已经检出到 '%s'" | |
383 | ||
220c313c | 384 | #: bundle.c:34 |
8ada9598 JX |
385 | #, c-format |
386 | msgid "'%s' does not look like a v2 bundle file" | |
81809b99 | 387 | msgstr "'%s' 不像是一个 v2 版本的包文件" |
8ada9598 | 388 | |
220c313c | 389 | #: bundle.c:61 |
81809b99 | 390 | #, c-format |
8ada9598 | 391 | msgid "unrecognized header: %s%s (%d)" |
81809b99 | 392 | msgstr "未能识别的包头:%s%s (%d)" |
8ada9598 | 393 | |
94550ed3 | 394 | #: bundle.c:87 builtin/commit.c:766 |
8ada9598 JX |
395 | #, c-format |
396 | msgid "could not open '%s'" | |
397 | msgstr "不能打开 '%s'" | |
398 | ||
220c313c | 399 | #: bundle.c:139 |
8ada9598 | 400 | msgid "Repository lacks these prerequisite commits:" |
160fb2b2 | 401 | msgstr "仓库中缺少这些必备的提交:" |
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 | |
89f80d72 | 405 | #: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358 |
90314792 | 406 | #: builtin/shortlog.c:158 |
8ada9598 JX |
407 | msgid "revision walk setup failed" |
408 | msgstr "版本遍历设置失败" | |
409 | ||
220c313c | 410 | #: bundle.c:185 |
8ada9598 | 411 | #, c-format |
1003b3a5 JX |
412 | msgid "The bundle contains this ref:" |
413 | msgid_plural "The bundle contains these %d refs:" | |
414 | msgstr[0] "这个包中含有这个引用:" | |
415 | msgstr[1] "这个包中含有 %d 个引用:" | |
8ada9598 | 416 | |
220c313c | 417 | #: bundle.c:192 |
6792b93b JX |
418 | msgid "The bundle records a complete history." |
419 | msgstr "这个包记录一个完整历史。" | |
420 | ||
220c313c | 421 | #: bundle.c:194 |
8ada9598 | 422 | #, c-format |
1003b3a5 JX |
423 | msgid "The bundle requires this ref:" |
424 | msgid_plural "The bundle requires these %d refs:" | |
425 | msgstr[0] "这个包需要这个引用:" | |
426 | msgstr[1] "这个包需要 %d 个引用:" | |
8ada9598 | 427 | |
1b7f4a34 | 428 | #: bundle.c:253 |
9aeb4c2b JX |
429 | msgid "Could not spawn pack-objects" |
430 | msgstr "不能生成 pack-objects 进程" | |
431 | ||
1b7f4a34 | 432 | #: bundle.c:264 |
9aeb4c2b JX |
433 | msgid "pack-objects died" |
434 | msgstr "pack-objects 终止" | |
435 | ||
1b7f4a34 | 436 | #: bundle.c:304 |
8ada9598 | 437 | msgid "rev-list died" |
81809b99 | 438 | msgstr "rev-list 终止" |
8ada9598 | 439 | |
1b7f4a34 | 440 | #: bundle.c:353 |
8ada9598 JX |
441 | #, c-format |
442 | msgid "ref '%s' is excluded by the rev-list options" | |
81809b99 | 443 | msgstr "引用 '%s' 被 rev-list 选项排除" |
8ada9598 | 444 | |
89f80d72 | 445 | #: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261 |
9aeb4c2b JX |
446 | #, c-format |
447 | msgid "unrecognized argument: %s" | |
448 | msgstr "未能识别的参数:%s" | |
449 | ||
1b7f4a34 | 450 | #: bundle.c:449 |
8ada9598 | 451 | msgid "Refusing to create empty bundle." |
81809b99 | 452 | msgstr "不能创建空包。" |
8ada9598 | 453 | |
1b7f4a34 | 454 | #: bundle.c:459 |
81809b99 | 455 | #, c-format |
8ada9598 | 456 | msgid "cannot create '%s'" |
81809b99 | 457 | msgstr "不能创建 '%s'" |
8ada9598 | 458 | |
1b7f4a34 | 459 | #: bundle.c:480 |
8ada9598 | 460 | msgid "index-pack died" |
81809b99 | 461 | msgstr "index-pack 终止" |
8ada9598 | 462 | |
94550ed3 | 463 | #: color.c:275 |
220c313c JX |
464 | #, c-format |
465 | msgid "invalid color value: %.*s" | |
466 | msgstr "无效的颜色值:%.*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 |
471 | msgid "could not parse %s" | |
472 | msgstr "不能解析 %s" | |
473 | ||
6acbf033 | 474 | #: commit.c:42 |
c04f5ac3 JX |
475 | #, c-format |
476 | msgid "%s %s is not a commit!" | |
477 | msgstr "%s %s 不是一个提交!" | |
478 | ||
479 | #: compat/obstack.c:406 compat/obstack.c:408 | |
480 | msgid "memory exhausted" | |
481 | msgstr "内存耗尽" | |
482 | ||
814ff314 | 483 | #: config.c:474 config.c:476 |
220c313c JX |
484 | #, c-format |
485 | msgid "bad config file line %d in %s" | |
486 | msgstr "配置文件 %2$s 出错于第 %1$d 行" | |
487 | ||
814ff314 | 488 | #: config.c:592 |
220c313c JX |
489 | #, c-format |
490 | msgid "bad numeric config value '%s' for '%s' in %s: %s" | |
491 | msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s" | |
492 | ||
814ff314 | 493 | #: config.c:594 |
220c313c JX |
494 | #, c-format |
495 | msgid "bad numeric config value '%s' for '%s': %s" | |
496 | msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s" | |
497 | ||
814ff314 | 498 | #: config.c:679 |
220c313c JX |
499 | #, c-format |
500 | msgid "failed to expand user dir in: '%s'" | |
501 | msgstr "无法扩展 '%s' 中的用户目录" | |
502 | ||
814ff314 | 503 | #: config.c:757 config.c:768 |
220c313c JX |
504 | #, c-format |
505 | msgid "bad zlib compression level %d" | |
506 | msgstr "错误的 zlib 压缩级别 %d" | |
507 | ||
814ff314 | 508 | #: config.c:890 |
220c313c JX |
509 | #, c-format |
510 | msgid "invalid mode for object creation: %s" | |
511 | msgstr "无效的对象创建模式:%s" | |
512 | ||
814ff314 | 513 | #: config.c:1216 |
220c313c JX |
514 | msgid "unable to parse command-line config" |
515 | msgstr "无法解析命令行中的配置" | |
516 | ||
814ff314 | 517 | #: config.c:1277 |
220c313c JX |
518 | msgid "unknown error occured while reading the configuration files" |
519 | msgstr "在读取配置文件时遇到未知错误" | |
520 | ||
814ff314 | 521 | #: config.c:1601 |
220c313c JX |
522 | #, c-format |
523 | msgid "unable to parse '%s' from command-line config" | |
524 | msgstr "无法解析命令行配置中的 '%s'" | |
525 | ||
814ff314 | 526 | #: config.c:1603 |
220c313c JX |
527 | #, c-format |
528 | msgid "bad config variable '%s' in file '%s' at line %d" | |
529 | msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" | |
530 | ||
814ff314 | 531 | #: config.c:1662 |
220c313c JX |
532 | #, c-format |
533 | msgid "%s has multiple values" | |
534 | msgstr "%s 有多个取值" | |
535 | ||
536 | #: connected.c:69 | |
c04f5ac3 JX |
537 | msgid "Could not run 'git rev-list'" |
538 | msgstr "不能执行 'git rev-list'" | |
539 | ||
220c313c | 540 | #: connected.c:89 |
c04f5ac3 JX |
541 | #, c-format |
542 | msgid "failed write to rev-list: %s" | |
543 | msgstr "无法写入 rev-list:%s" | |
544 | ||
220c313c | 545 | #: connected.c:97 |
c04f5ac3 JX |
546 | #, c-format |
547 | msgid "failed to close rev-list's stdin: %s" | |
548 | msgstr "无法关闭 rev-list 的标准输入:%s" | |
549 | ||
8ada9598 JX |
550 | #: date.c:95 |
551 | msgid "in the future" | |
81809b99 | 552 | msgstr "在将来" |
8ada9598 JX |
553 | |
554 | #: date.c:101 | |
555 | #, c-format | |
556 | msgid "%lu second ago" | |
557 | msgid_plural "%lu seconds ago" | |
6c94aba5 JX |
558 | msgstr[0] "%lu 秒钟前" |
559 | msgstr[1] "%lu 秒钟前" | |
8ada9598 JX |
560 | |
561 | #: date.c:108 | |
562 | #, c-format | |
563 | msgid "%lu minute ago" | |
564 | msgid_plural "%lu minutes ago" | |
6c94aba5 JX |
565 | msgstr[0] "%lu 分钟前" |
566 | msgstr[1] "%lu 分钟前" | |
8ada9598 JX |
567 | |
568 | #: date.c:115 | |
569 | #, c-format | |
570 | msgid "%lu hour ago" | |
571 | msgid_plural "%lu hours ago" | |
6c94aba5 JX |
572 | msgstr[0] "%lu 小时前" |
573 | msgstr[1] "%lu 小时前" | |
8ada9598 JX |
574 | |
575 | #: date.c:122 | |
576 | #, c-format | |
577 | msgid "%lu day ago" | |
578 | msgid_plural "%lu days ago" | |
6c94aba5 JX |
579 | msgstr[0] "%lu 天前" |
580 | msgstr[1] "%lu 天前" | |
8ada9598 JX |
581 | |
582 | #: date.c:128 | |
583 | #, c-format | |
584 | msgid "%lu week ago" | |
585 | msgid_plural "%lu weeks ago" | |
6c94aba5 JX |
586 | msgstr[0] "%lu 周前" |
587 | msgstr[1] "%lu 周前" | |
8ada9598 JX |
588 | |
589 | #: date.c:135 | |
590 | #, c-format | |
591 | msgid "%lu month ago" | |
592 | msgid_plural "%lu months ago" | |
6c94aba5 JX |
593 | msgstr[0] "%lu 个月前" |
594 | msgstr[1] "%lu 个月前" | |
8ada9598 JX |
595 | |
596 | #: date.c:146 | |
597 | #, c-format | |
598 | msgid "%lu year" | |
599 | msgid_plural "%lu years" | |
81809b99 | 600 | msgstr[0] "%lu 年" |
5ae481e0 | 601 | msgstr[1] "%lu 年" |
8ada9598 | 602 | |
6c94aba5 | 603 | #. TRANSLATORS: "%s" is "<n> years" |
8ada9598 JX |
604 | #: date.c:149 |
605 | #, c-format | |
606 | msgid "%s, %lu month ago" | |
607 | msgid_plural "%s, %lu months ago" | |
6c94aba5 JX |
608 | msgstr[0] "%s %lu 个月前" |
609 | msgstr[1] "%s %lu 个月前" | |
8ada9598 JX |
610 | |
611 | #: date.c:154 date.c:159 | |
612 | #, c-format | |
613 | msgid "%lu year ago" | |
614 | msgid_plural "%lu years ago" | |
81809b99 | 615 | msgstr[0] "%lu 年前" |
5ae481e0 | 616 | msgstr[1] "%lu 年前" |
8ada9598 | 617 | |
cfff71a9 JX |
618 | #: diffcore-order.c:24 |
619 | #, c-format | |
620 | msgid "failed to read orderfile '%s'" | |
621 | msgstr "无法读取排序文件 '%s'" | |
622 | ||
814ff314 | 623 | #: diffcore-rename.c:536 |
6c94aba5 JX |
624 | msgid "Performing inexact rename detection" |
625 | msgstr "正在进行非精确的重命名检测" | |
626 | ||
90e6ef53 | 627 | # 译者:注意保持前导空格 |
94550ed3 | 628 | #: diff.c:115 |
c04f5ac3 | 629 | #, c-format |
07432cef WS |
630 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" |
631 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" | |
c04f5ac3 | 632 | |
90e6ef53 | 633 | # 译者:注意保持前导空格 |
94550ed3 | 634 | #: diff.c:120 |
c04f5ac3 | 635 | #, c-format |
07432cef WS |
636 | msgid " Unknown dirstat parameter '%s'\n" |
637 | msgstr " 未知的 dirstat 参数 '%s'\n" | |
c04f5ac3 | 638 | |
94550ed3 | 639 | #: diff.c:215 |
07432cef WS |
640 | #, c-format |
641 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" | |
642 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" | |
643 | ||
94550ed3 | 644 | #: diff.c:267 |
c04f5ac3 JX |
645 | #, c-format |
646 | msgid "" | |
647 | "Found errors in 'diff.dirstat' config variable:\n" | |
648 | "%s" | |
649 | msgstr "" | |
90e6ef53 | 650 | "发现配置变量 'diff.dirstat' 中的错误:\n" |
c04f5ac3 JX |
651 | "%s" |
652 | ||
94550ed3 | 653 | #: diff.c:3000 |
6acbf033 JX |
654 | #, c-format |
655 | msgid "external diff died, stopping at %s" | |
656 | msgstr "外部 diff 退出,停止在 %s" | |
657 | ||
94550ed3 | 658 | #: diff.c:3396 |
6acbf033 JX |
659 | msgid "--follow requires exactly one pathspec" |
660 | msgstr "--follow 参数后只跟一个 pathspec" | |
661 | ||
94550ed3 | 662 | #: diff.c:3559 |
c04f5ac3 JX |
663 | #, c-format |
664 | msgid "" | |
665 | "Failed to parse --dirstat/-X option parameter:\n" | |
666 | "%s" | |
667 | msgstr "" | |
668 | "无法解析 --dirstat/-X 选项的参数:\n" | |
669 | "%s" | |
670 | ||
94550ed3 | 671 | #: diff.c:3573 |
07432cef WS |
672 | #, c-format |
673 | msgid "Failed to parse --submodule option parameter: '%s'" | |
674 | msgstr "无法解析 --submodule 选项的参数:'%s'" | |
675 | ||
94550ed3 | 676 | #: dir.c:1915 |
7aea43ff JX |
677 | msgid "failed to get kernel name and information" |
678 | msgstr "无法获得内核名称和信息" | |
679 | ||
94550ed3 | 680 | #: dir.c:1998 |
7aea43ff JX |
681 | msgid "Untracked cache is disabled on this system." |
682 | msgstr "缓存未跟踪文件在本系统被禁用" | |
683 | ||
1b7f4a34 | 684 | #: gpg-interface.c:166 gpg-interface.c:237 |
c04f5ac3 JX |
685 | msgid "could not run gpg." |
686 | msgstr "不能执行 gpg。" | |
687 | ||
1b7f4a34 | 688 | #: gpg-interface.c:178 |
c04f5ac3 JX |
689 | msgid "gpg did not accept the data" |
690 | msgstr "gpg 没有接受数据" | |
691 | ||
1b7f4a34 | 692 | #: gpg-interface.c:189 |
c04f5ac3 JX |
693 | msgid "gpg failed to sign the data" |
694 | msgstr "gpg 无法为数据签名" | |
695 | ||
1b7f4a34 | 696 | #: gpg-interface.c:222 |
a77c07d9 JX |
697 | #, c-format |
698 | msgid "could not create temporary file '%s': %s" | |
699 | msgstr "不能创建临时文件 '%s':%s" | |
700 | ||
1b7f4a34 | 701 | #: gpg-interface.c:225 |
a77c07d9 JX |
702 | #, c-format |
703 | msgid "failed writing detached signature to '%s': %s" | |
704 | msgstr "无法将分离式签名写入 '%s':%s" | |
705 | ||
220c313c | 706 | #: grep.c:1718 |
7ac1c0ad JX |
707 | #, c-format |
708 | msgid "'%s': unable to read %s" | |
709 | msgstr "'%s':无法读取 %s" | |
710 | ||
220c313c | 711 | #: grep.c:1735 |
7ac1c0ad JX |
712 | #, c-format |
713 | msgid "'%s': %s" | |
714 | msgstr "'%s':%s" | |
715 | ||
220c313c | 716 | #: grep.c:1746 |
7ac1c0ad JX |
717 | #, c-format |
718 | msgid "'%s': short read %s" | |
719 | msgstr "'%s':读取不完整 %s" | |
720 | ||
6acbf033 | 721 | #: help.c:207 |
81809b99 | 722 | #, c-format |
8ada9598 | 723 | msgid "available git commands in '%s'" |
81809b99 | 724 | msgstr "在 '%s' 下可用的 git 命令" |
8ada9598 | 725 | |
6acbf033 | 726 | #: help.c:214 |
8ada9598 | 727 | msgid "git commands available from elsewhere on your $PATH" |
81809b99 | 728 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" |
8ada9598 | 729 | |
7aea43ff JX |
730 | #: help.c:246 |
731 | msgid "These are common Git commands used in various situations:" | |
732 | msgstr "这些是各种场合常见的 Git 命令:" | |
a77c07d9 | 733 | |
7aea43ff | 734 | #: help.c:311 |
c04f5ac3 JX |
735 | #, c-format |
736 | msgid "" | |
737 | "'%s' appears to be a git command, but we were not\n" | |
738 | "able to execute it. Maybe git-%s is broken?" | |
739 | msgstr "" | |
740 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
741 | "可能是 git-%s 受损?" | |
742 | ||
7aea43ff | 743 | #: help.c:368 |
8ada9598 | 744 | msgid "Uh oh. Your system reports no Git commands at all." |
81809b99 | 745 | msgstr "唉呀,您的系统中未发现 Git 命令。" |
8ada9598 | 746 | |
7aea43ff | 747 | #: help.c:390 |
8ada9598 JX |
748 | #, c-format |
749 | msgid "" | |
750 | "WARNING: You called a Git command named '%s', which does not exist.\n" | |
751 | "Continuing under the assumption that you meant '%s'" | |
752 | msgstr "" | |
81809b99 JX |
753 | "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" |
754 | "是 '%s'" | |
8ada9598 | 755 | |
7aea43ff | 756 | #: help.c:395 |
8ada9598 JX |
757 | #, c-format |
758 | msgid "in %0.1f seconds automatically..." | |
81809b99 | 759 | msgstr "在 %0.1f 秒钟后自动运行..." |
8ada9598 | 760 | |
7aea43ff | 761 | #: help.c:402 |
8ada9598 JX |
762 | #, c-format |
763 | msgid "git: '%s' is not a git command. See 'git --help'." | |
81809b99 | 764 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" |
8ada9598 | 765 | |
7aea43ff | 766 | #: help.c:406 help.c:466 |
8ada9598 JX |
767 | msgid "" |
768 | "\n" | |
769 | "Did you mean this?" | |
770 | msgid_plural "" | |
771 | "\n" | |
772 | "Did you mean one of these?" | |
773 | msgstr[0] "" | |
81809b99 JX |
774 | "\n" |
775 | "您指的是这个么?" | |
776 | msgstr[1] "" | |
777 | "\n" | |
195febda | 778 | "您指的是这其中的某一个么?" |
8ada9598 | 779 | |
7aea43ff | 780 | #: help.c:462 |
2e8451e8 JX |
781 | #, c-format |
782 | msgid "%s: %s - %s" | |
783 | msgstr "%s:%s - %s" | |
784 | ||
220c313c | 785 | #: merge.c:41 |
07432cef WS |
786 | msgid "failed to read the cache" |
787 | msgstr "无法读取缓存" | |
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 |
791 | msgid "unable to write new index file" |
792 | msgstr "无法写新的索引文件" | |
793 | ||
220c313c | 794 | #: merge-recursive.c:189 |
649900bc JX |
795 | #, c-format |
796 | msgid "(bad commit)\n" | |
797 | msgstr "(坏提交)\n" | |
798 | ||
220c313c | 799 | #: merge-recursive.c:209 |
649900bc JX |
800 | #, c-format |
801 | msgid "addinfo_cache failed for path '%s'" | |
802 | msgstr "为路径 '%s' addinfo_cache 失败" | |
803 | ||
220c313c | 804 | #: merge-recursive.c:270 |
649900bc JX |
805 | msgid "error building trees" |
806 | msgstr "无法创建树" | |
807 | ||
94550ed3 | 808 | #: merge-recursive.c:686 |
649900bc JX |
809 | #, c-format |
810 | msgid "failed to create path '%s'%s" | |
811 | msgstr "无法创建路径 '%s'%s" | |
812 | ||
94550ed3 | 813 | #: merge-recursive.c:697 |
649900bc JX |
814 | #, c-format |
815 | msgid "Removing %s to make room for subdirectory\n" | |
816 | msgstr "删除 %s 以便为子目录留出空间\n" | |
817 | ||
94550ed3 | 818 | #: merge-recursive.c:711 merge-recursive.c:732 |
649900bc JX |
819 | msgid ": perhaps a D/F conflict?" |
820 | msgstr ":可能是一个目录/文件冲突?" | |
821 | ||
94550ed3 | 822 | #: merge-recursive.c:722 |
649900bc JX |
823 | #, c-format |
824 | msgid "refusing to lose untracked file at '%s'" | |
825 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
826 | ||
94550ed3 | 827 | #: merge-recursive.c:762 |
649900bc JX |
828 | #, c-format |
829 | msgid "cannot read object %s '%s'" | |
830 | msgstr "不能读取对象 %s '%s'" | |
831 | ||
94550ed3 | 832 | #: merge-recursive.c:764 |
649900bc JX |
833 | #, c-format |
834 | msgid "blob expected for %s '%s'" | |
160fb2b2 | 835 | msgstr "%s '%s' 应为数据对象" |
649900bc | 836 | |
94550ed3 | 837 | #: merge-recursive.c:787 builtin/clone.c:369 |
649900bc JX |
838 | #, c-format |
839 | msgid "failed to open '%s'" | |
840 | msgstr "无法打开 '%s'" | |
841 | ||
94550ed3 | 842 | #: merge-recursive.c:795 |
649900bc JX |
843 | #, c-format |
844 | msgid "failed to symlink '%s'" | |
845 | msgstr "无法创建符号链接 '%s'" | |
846 | ||
94550ed3 | 847 | #: merge-recursive.c:798 |
649900bc JX |
848 | #, c-format |
849 | msgid "do not know what to do with %06o %s '%s'" | |
850 | msgstr "不知道如何处理 %06o %s '%s'" | |
851 | ||
94550ed3 | 852 | #: merge-recursive.c:936 |
649900bc JX |
853 | msgid "Failed to execute internal merge" |
854 | msgstr "无法执行内部合并" | |
855 | ||
94550ed3 | 856 | #: merge-recursive.c:940 |
649900bc JX |
857 | #, c-format |
858 | msgid "Unable to add %s to database" | |
859 | msgstr "不能添加 %s 至对象库" | |
860 | ||
94550ed3 | 861 | #: merge-recursive.c:956 |
649900bc JX |
862 | msgid "unsupported object type in the tree" |
863 | msgstr "在树中有不支持的对象类型" | |
864 | ||
94550ed3 | 865 | #: merge-recursive.c:1031 merge-recursive.c:1045 |
649900bc JX |
866 | #, c-format |
867 | msgid "" | |
868 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
869 | "in tree." | |
870 | msgstr "" | |
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 |
876 | msgid "" | |
877 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
878 | "in tree at %s." | |
879 | msgstr "" | |
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 |
884 | msgid "rename" |
885 | msgstr "重命名" | |
886 | ||
94550ed3 | 887 | #: merge-recursive.c:1091 |
649900bc JX |
888 | msgid "renamed" |
889 | msgstr "重命名" | |
890 | ||
94550ed3 | 891 | #: merge-recursive.c:1147 |
649900bc JX |
892 | #, c-format |
893 | msgid "%s is a directory in %s adding as %s instead" | |
894 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
895 | ||
94550ed3 | 896 | #: merge-recursive.c:1169 |
649900bc JX |
897 | #, c-format |
898 | msgid "" | |
899 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" | |
900 | "\"->\"%s\" in \"%s\"%s" | |
901 | msgstr "" | |
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 |
906 | msgid " (left unresolved)" |
907 | msgstr "(留下未解决)" | |
908 | ||
94550ed3 | 909 | #: merge-recursive.c:1228 |
649900bc JX |
910 | #, c-format |
911 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" | |
912 | msgstr "" | |
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 |
918 | msgid "Renaming %s to %s and %s to %s instead" | |
07432cef | 919 | msgstr "而是重命名 %s 至 %s,以及 %s 至 %s" |
649900bc | 920 | |
94550ed3 | 921 | #: merge-recursive.c:1457 |
649900bc JX |
922 | #, c-format |
923 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" | |
924 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
925 | ||
94550ed3 | 926 | #: merge-recursive.c:1467 |
649900bc JX |
927 | #, c-format |
928 | msgid "Adding merged %s" | |
929 | msgstr "添加合并后的 %s" | |
930 | ||
94550ed3 | 931 | #: merge-recursive.c:1472 merge-recursive.c:1674 |
649900bc JX |
932 | #, c-format |
933 | msgid "Adding as %s instead" | |
934 | msgstr "而是以 %s 为名添加" | |
935 | ||
94550ed3 | 936 | #: merge-recursive.c:1523 |
649900bc JX |
937 | #, c-format |
938 | msgid "cannot read object %s" | |
939 | msgstr "不能读取对象 %s" | |
940 | ||
94550ed3 | 941 | #: merge-recursive.c:1526 |
649900bc JX |
942 | #, c-format |
943 | msgid "object %s is not a blob" | |
160fb2b2 | 944 | msgstr "对象 %s 不是一个数据对象" |
649900bc | 945 | |
94550ed3 | 946 | #: merge-recursive.c:1578 |
649900bc JX |
947 | msgid "modify" |
948 | msgstr "修改" | |
949 | ||
94550ed3 | 950 | #: merge-recursive.c:1578 |
649900bc JX |
951 | msgid "modified" |
952 | msgstr "修改" | |
953 | ||
94550ed3 | 954 | #: merge-recursive.c:1588 |
649900bc JX |
955 | msgid "content" |
956 | msgstr "内容" | |
957 | ||
94550ed3 | 958 | #: merge-recursive.c:1595 |
649900bc JX |
959 | msgid "add/add" |
960 | msgstr "添加/添加" | |
961 | ||
94550ed3 | 962 | #: merge-recursive.c:1629 |
649900bc JX |
963 | #, c-format |
964 | msgid "Skipped %s (merged same as existing)" | |
965 | msgstr "略过 %s(已经做过相同合并)" | |
966 | ||
94550ed3 | 967 | #: merge-recursive.c:1643 |
649900bc JX |
968 | #, c-format |
969 | msgid "Auto-merging %s" | |
970 | msgstr "自动合并 %s" | |
971 | ||
94550ed3 | 972 | #: merge-recursive.c:1647 git-submodule.sh:1025 |
649900bc JX |
973 | msgid "submodule" |
974 | msgstr "子模组" | |
975 | ||
94550ed3 | 976 | #: merge-recursive.c:1648 |
649900bc JX |
977 | #, c-format |
978 | msgid "CONFLICT (%s): Merge conflict in %s" | |
979 | msgstr "冲突(%s):合并冲突于 %s" | |
980 | ||
94550ed3 | 981 | #: merge-recursive.c:1734 |
649900bc JX |
982 | #, c-format |
983 | msgid "Removing %s" | |
984 | msgstr "删除 %s" | |
985 | ||
94550ed3 | 986 | #: merge-recursive.c:1759 |
649900bc JX |
987 | msgid "file/directory" |
988 | msgstr "文件/目录" | |
989 | ||
94550ed3 | 990 | #: merge-recursive.c:1765 |
649900bc JX |
991 | msgid "directory/file" |
992 | msgstr "目录/文件" | |
993 | ||
94550ed3 | 994 | #: merge-recursive.c:1770 |
649900bc JX |
995 | #, c-format |
996 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" | |
997 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
998 | ||
94550ed3 | 999 | #: merge-recursive.c:1780 |
649900bc JX |
1000 | #, c-format |
1001 | msgid "Adding %s" | |
1002 | msgstr "添加 %s" | |
1003 | ||
94550ed3 | 1004 | #: merge-recursive.c:1797 |
649900bc JX |
1005 | msgid "Fatal merge failure, shouldn't happen." |
1006 | msgstr "严重的合并错误,不应发生。" | |
1007 | ||
94550ed3 | 1008 | #: merge-recursive.c:1816 |
649900bc JX |
1009 | msgid "Already up-to-date!" |
1010 | msgstr "已经是最新的!" | |
1011 | ||
94550ed3 | 1012 | #: merge-recursive.c:1825 |
649900bc JX |
1013 | #, c-format |
1014 | msgid "merging of trees %s and %s failed" | |
1015 | msgstr "无法合并树 %s 和 %s" | |
1016 | ||
94550ed3 | 1017 | #: merge-recursive.c:1855 |
649900bc JX |
1018 | #, c-format |
1019 | msgid "Unprocessed path??? %s" | |
1020 | msgstr "未处理的路径??? %s" | |
1021 | ||
94550ed3 | 1022 | #: merge-recursive.c:1903 |
649900bc JX |
1023 | msgid "Merging:" |
1024 | msgstr "合并:" | |
1025 | ||
94550ed3 | 1026 | #: merge-recursive.c:1916 |
649900bc | 1027 | #, c-format |
e5e38ce4 JX |
1028 | msgid "found %u common ancestor:" |
1029 | msgid_plural "found %u common ancestors:" | |
1030 | msgstr[0] "发现 %u 个共同祖先:" | |
1031 | msgstr[1] "发现 %u 个共同祖先:" | |
649900bc | 1032 | |
94550ed3 | 1033 | #: merge-recursive.c:1953 |
649900bc JX |
1034 | msgid "merge returned no commit" |
1035 | msgstr "合并未返回提交" | |
1036 | ||
94550ed3 | 1037 | #: merge-recursive.c:2010 |
649900bc JX |
1038 | #, c-format |
1039 | msgid "Could not parse object '%s'" | |
1040 | msgstr "不能解析对象 '%s'" | |
1041 | ||
94550ed3 | 1042 | #: merge-recursive.c:2021 builtin/merge.c:645 |
649900bc JX |
1043 | msgid "Unable to write index." |
1044 | msgstr "不能写入索引。" | |
1045 | ||
6acbf033 | 1046 | #: notes-utils.c:41 |
2e8451e8 JX |
1047 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
1048 | msgstr "不能提交未初始化/未引用的注解树" | |
1049 | ||
1b7f4a34 | 1050 | #: notes-utils.c:100 |
2e8451e8 JX |
1051 | #, c-format |
1052 | msgid "Bad notes.rewriteMode value: '%s'" | |
1053 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
1054 | ||
1b7f4a34 | 1055 | #: notes-utils.c:110 |
2e8451e8 JX |
1056 | #, c-format |
1057 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" | |
1058 | msgstr "拒绝向 %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 |
1064 | msgid "Bad %s value: '%s'" | |
1065 | msgstr "坏的 %s 值:'%s'" | |
1066 | ||
7aea43ff | 1067 | #: object.c:242 |
1003b3a5 JX |
1068 | #, c-format |
1069 | msgid "unable to parse object: %s" | |
1070 | msgstr "不能解析对象:%s" | |
1071 | ||
94550ed3 | 1072 | #: parse-options.c:570 |
8ada9598 | 1073 | msgid "..." |
81809b99 | 1074 | msgstr "..." |
8ada9598 | 1075 | |
94550ed3 | 1076 | #: parse-options.c:588 |
81809b99 | 1077 | #, c-format |
8ada9598 | 1078 | msgid "usage: %s" |
81809b99 | 1079 | msgstr "用法:%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 | 1085 | msgid " or: %s" |
81809b99 | 1086 | msgstr " 或:%s" |
8ada9598 JX |
1087 | |
1088 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
94550ed3 | 1089 | #: parse-options.c:595 |
81809b99 | 1090 | #, c-format |
8ada9598 | 1091 | msgid " %s" |
81809b99 | 1092 | msgstr " %s" |
8ada9598 | 1093 | |
94550ed3 | 1094 | #: parse-options.c:629 |
63af42fe JX |
1095 | msgid "-NUM" |
1096 | msgstr "-数字" | |
1097 | ||
94550ed3 JX |
1098 | #: parse-options-cb.c:108 |
1099 | #, c-format | |
1100 | msgid "malformed object name '%s'" | |
1101 | msgstr "非法的对象名 '%s'" | |
1102 | ||
1103 | #: path.c:752 | |
1104 | #, c-format | |
1105 | msgid "Could not make %s writable by group" | |
1106 | msgstr "不能设置 %s 为组可写" | |
1107 | ||
cfff71a9 | 1108 | #: pathspec.c:133 |
90314792 | 1109 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
160fb2b2 | 1110 | msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" |
90314792 | 1111 | |
cfff71a9 | 1112 | #: pathspec.c:143 |
90314792 JX |
1113 | msgid "" |
1114 | "global 'literal' pathspec setting is incompatible with all other global " | |
1115 | "pathspec settings" | |
160fb2b2 | 1116 | msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" |
90314792 | 1117 | |
cfff71a9 | 1118 | #: pathspec.c:177 |
90314792 | 1119 | msgid "invalid parameter for pathspec magic 'prefix'" |
160fb2b2 | 1120 | msgstr "路径规格包含无效的神奇前缀" |
90314792 | 1121 | |
cfff71a9 | 1122 | #: pathspec.c:183 |
90314792 JX |
1123 | #, c-format |
1124 | msgid "Invalid pathspec magic '%.*s' in '%s'" | |
160fb2b2 | 1125 | msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" |
90314792 | 1126 | |
cfff71a9 | 1127 | #: pathspec.c:187 |
90314792 JX |
1128 | #, c-format |
1129 | msgid "Missing ')' at the end of pathspec magic in '%s'" | |
160fb2b2 | 1130 | msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" |
90314792 | 1131 | |
cfff71a9 | 1132 | #: pathspec.c:205 |
90314792 JX |
1133 | #, c-format |
1134 | msgid "Unimplemented pathspec magic '%c' in '%s'" | |
160fb2b2 | 1135 | msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" |
90314792 | 1136 | |
cfff71a9 | 1137 | #: pathspec.c:230 |
a77c07d9 | 1138 | #, c-format |
90314792 JX |
1139 | msgid "%s: 'literal' and 'glob' are incompatible" |
1140 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
a77c07d9 | 1141 | |
cfff71a9 | 1142 | #: pathspec.c:241 |
a77c07d9 | 1143 | #, c-format |
90314792 | 1144 | msgid "%s: '%s' is outside repository" |
160fb2b2 | 1145 | msgstr "%s:'%s' 在仓库之外" |
a77c07d9 | 1146 | |
cfff71a9 | 1147 | #: pathspec.c:291 |
90314792 JX |
1148 | #, c-format |
1149 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
160fb2b2 | 1150 | msgstr "路径规格 '%s' 在子模组 '%.*s' 中" |
90314792 | 1151 | |
cfff71a9 | 1152 | #: pathspec.c:353 |
90314792 JX |
1153 | #, c-format |
1154 | msgid "%s: pathspec magic not supported by this command: %s" | |
160fb2b2 | 1155 | msgstr "%s:路径规格神奇前缀不被此命令支持:%s" |
90314792 | 1156 | |
6acbf033 | 1157 | #: pathspec.c:432 |
90314792 JX |
1158 | #, c-format |
1159 | msgid "pathspec '%s' is beyond a symbolic link" | |
160fb2b2 | 1160 | msgstr "路径规格 '%s' 位于符号链接中" |
90314792 | 1161 | |
6acbf033 | 1162 | #: pathspec.c:441 |
cfff71a9 JX |
1163 | msgid "" |
1164 | "There is nothing to exclude from by :(exclude) patterns.\n" | |
1165 | "Perhaps you forgot to add either ':/' or '.' ?" | |
1166 | msgstr "" | |
1167 | "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" | |
1168 | "添加 ':/' 或 '.' ?" | |
1169 | ||
1b7f4a34 | 1170 | #: pretty.c:969 |
220c313c JX |
1171 | msgid "unable to parse --pretty format" |
1172 | msgstr "不能解析 --pretty 格式" | |
1173 | ||
94550ed3 | 1174 | #: progress.c:235 |
6c94aba5 JX |
1175 | msgid "done" |
1176 | msgstr "完成" | |
1177 | ||
94550ed3 | 1178 | #: read-cache.c:1281 |
6c94aba5 JX |
1179 | #, c-format |
1180 | msgid "" | |
1181 | "index.version set, but the value is invalid.\n" | |
1182 | "Using version %i" | |
1183 | msgstr "" | |
1184 | "设置了 index.version,但是取值无效。\n" | |
1185 | "使用版本 %i" | |
1186 | ||
94550ed3 | 1187 | #: read-cache.c:1291 |
6c94aba5 JX |
1188 | #, c-format |
1189 | msgid "" | |
1190 | "GIT_INDEX_VERSION set, but the value is invalid.\n" | |
1191 | "Using version %i" | |
1192 | msgstr "" | |
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 | |
1199 | msgid "Could not open '%s' for writing" | |
1200 | msgstr "无法打开 '%s' 进行写入" | |
1201 | ||
94550ed3 | 1202 | #: refs/files-backend.c:2359 |
1b7f4a34 JX |
1203 | #, c-format |
1204 | msgid "could not delete reference %s: %s" | |
1205 | msgstr "无法删除引用 %s:%s" | |
1206 | ||
94550ed3 | 1207 | #: refs/files-backend.c:2362 |
1b7f4a34 JX |
1208 | #, c-format |
1209 | msgid "could not delete references: %s" | |
1210 | msgstr "无法删除引用:%s" | |
1211 | ||
94550ed3 | 1212 | #: refs/files-backend.c:2371 |
1b7f4a34 JX |
1213 | #, c-format |
1214 | msgid "could not remove reference %s" | |
1215 | msgstr "无法删除引用 %s" | |
1216 | ||
94550ed3 JX |
1217 | #: ref-filter.c:245 |
1218 | #, c-format | |
1219 | msgid "format: %%(end) atom used without corresponding atom" | |
1220 | msgstr "格式:使用了 %%(end) 元素却没有它的对应元素" | |
1221 | ||
1222 | #: ref-filter.c:704 | |
1223 | #, c-format | |
1224 | msgid "positive value expected contents:lines=%s" | |
1225 | msgstr "要为 contents:lines=%s 提供一个正数" | |
1226 | ||
1227 | #: ref-filter.c:833 | |
1228 | #, c-format | |
1229 | msgid "expected format: %%(color:<color>)" | |
1230 | msgstr "期望的格式:%%(color:<color>)" | |
1231 | ||
1232 | #: ref-filter.c:835 | |
1b7f4a34 JX |
1233 | msgid "unable to parse format" |
1234 | msgstr "不能解析格式" | |
1235 | ||
94550ed3 JX |
1236 | #: ref-filter.c:870 |
1237 | #, c-format | |
1238 | msgid "expected format: %%(align:<width>,<position>)" | |
1239 | msgstr "期望的格式:%%(align:<width>,<position>)" | |
1240 | ||
1241 | #: ref-filter.c:893 | |
1242 | #, c-format | |
1243 | msgid "improper format entered align:%s" | |
1244 | msgstr "输入了不正确的格式 align:%s" | |
1245 | ||
1246 | #: ref-filter.c:898 | |
1247 | #, c-format | |
1248 | msgid "positive width expected with the %%(align) atom" | |
1249 | msgstr "元素 %%(align) 需要一个正数的宽度" | |
1250 | ||
1251 | #: ref-filter.c:1219 | |
1252 | #, c-format | |
1253 | msgid "malformed object at '%s'" | |
1254 | msgstr "非法的对象于 '%s'" | |
1255 | ||
1256 | #: ref-filter.c:1561 | |
1257 | #, c-format | |
1258 | msgid "format: %%(end) atom missing" | |
1259 | msgstr "格式:缺少 %%(end) 元素" | |
1260 | ||
1261 | #: ref-filter.c:1615 | |
1262 | #, c-format | |
1263 | msgid "malformed object name %s" | |
1264 | msgstr "非法的对象名 %s" | |
1265 | ||
1266 | #: remote.c:756 | |
cfff71a9 JX |
1267 | #, c-format |
1268 | msgid "Cannot fetch both %s and %s to %s" | |
1269 | msgstr "不能同时获取 %s 和 %s 至 %s" | |
1270 | ||
94550ed3 | 1271 | #: remote.c:760 |
cfff71a9 JX |
1272 | #, c-format |
1273 | msgid "%s usually tracks %s, not %s" | |
1274 | msgstr "%s 通常跟踪 %s,而非 %s" | |
1275 | ||
94550ed3 | 1276 | #: remote.c:764 |
cfff71a9 JX |
1277 | #, c-format |
1278 | msgid "%s tracks both %s and %s" | |
1279 | msgstr "%s 同时跟踪 %s 和 %s" | |
1280 | ||
94550ed3 | 1281 | #: remote.c:772 |
cfff71a9 JX |
1282 | msgid "Internal error" |
1283 | msgstr "内部错误" | |
1284 | ||
94550ed3 | 1285 | #: remote.c:1687 remote.c:1730 |
7aea43ff JX |
1286 | msgid "HEAD does not point to a branch" |
1287 | msgstr "HEAD 没有指向一个分支" | |
1288 | ||
94550ed3 | 1289 | #: remote.c:1696 |
7aea43ff JX |
1290 | #, c-format |
1291 | msgid "no such branch: '%s'" | |
1292 | msgstr "没有此分支:'%s'" | |
1293 | ||
94550ed3 | 1294 | #: remote.c:1699 |
7aea43ff JX |
1295 | #, c-format |
1296 | msgid "no upstream configured for branch '%s'" | |
1297 | msgstr "尚未给分支 '%s' 设置上游" | |
1298 | ||
94550ed3 | 1299 | #: remote.c:1705 |
7aea43ff JX |
1300 | #, c-format |
1301 | msgid "upstream branch '%s' not stored as a remote-tracking branch" | |
1302 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
1303 | ||
94550ed3 | 1304 | #: remote.c:1720 |
7aea43ff JX |
1305 | #, c-format |
1306 | msgid "push destination '%s' on remote '%s' has no local tracking branch" | |
1307 | msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" | |
1308 | ||
94550ed3 | 1309 | #: remote.c:1735 |
7aea43ff JX |
1310 | #, c-format |
1311 | msgid "branch '%s' has no remote for pushing" | |
1312 | msgstr "分支 '%s' 没有设置要推送的远程服务器" | |
1313 | ||
94550ed3 | 1314 | #: remote.c:1746 |
7aea43ff JX |
1315 | #, c-format |
1316 | msgid "push refspecs for '%s' do not include '%s'" | |
160fb2b2 | 1317 | msgstr "向 '%s' 推送引用规格未包含 '%s'" |
7aea43ff | 1318 | |
94550ed3 | 1319 | #: remote.c:1759 |
7aea43ff JX |
1320 | msgid "push has no destination (push.default is 'nothing')" |
1321 | msgstr "推送无目标(push.default 是 'nothing')" | |
1322 | ||
94550ed3 | 1323 | #: remote.c:1781 |
7aea43ff JX |
1324 | msgid "cannot resolve 'simple' push to a single destination" |
1325 | msgstr "无法解析 'simple' 推送至一个单独的目标" | |
1326 | ||
94550ed3 | 1327 | #: remote.c:2083 |
90314792 JX |
1328 | #, c-format |
1329 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
1330 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
1331 | ||
94550ed3 | 1332 | #: remote.c:2087 |
90314792 JX |
1333 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
1334 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
1335 | ||
94550ed3 | 1336 | #: remote.c:2090 |
90314792 JX |
1337 | #, c-format |
1338 | msgid "Your branch is up-to-date with '%s'.\n" | |
1339 | msgstr "您的分支与上游分支 '%s' 一致。\n" | |
1340 | ||
94550ed3 | 1341 | #: remote.c:2094 |
c04f5ac3 JX |
1342 | #, c-format |
1343 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
1344 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
1345 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
5ae481e0 | 1346 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" |
c04f5ac3 | 1347 | |
94550ed3 | 1348 | #: remote.c:2100 |
07432cef WS |
1349 | msgid " (use \"git push\" to publish your local commits)\n" |
1350 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
1351 | ||
94550ed3 | 1352 | #: remote.c:2103 |
c04f5ac3 JX |
1353 | #, c-format |
1354 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
1355 | msgid_plural "" | |
1356 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
90e6ef53 | 1357 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
5ae481e0 | 1358 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
c04f5ac3 | 1359 | |
07432cef | 1360 | # 译者:注意保持前导空格 |
94550ed3 | 1361 | #: remote.c:2111 |
07432cef WS |
1362 | msgid " (use \"git pull\" to update your local branch)\n" |
1363 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
1364 | ||
94550ed3 | 1365 | #: remote.c:2114 |
c04f5ac3 JX |
1366 | #, c-format |
1367 | msgid "" | |
1368 | "Your branch and '%s' have diverged,\n" | |
1369 | "and have %d and %d different commit each, respectively.\n" | |
1370 | msgid_plural "" | |
1371 | "Your branch and '%s' have diverged,\n" | |
1372 | "and have %d and %d different commits each, respectively.\n" | |
1373 | msgstr[0] "" | |
1374 | "您的分支和 '%s' 出现了偏离,\n" | |
195febda | 1375 | "并且分别有 %d 和 %d 处不同的提交。\n" |
5ae481e0 JX |
1376 | msgstr[1] "" |
1377 | "您的分支和 '%s' 出现了偏离,\n" | |
195febda | 1378 | "并且分别有 %d 和 %d 处不同的提交。\n" |
c04f5ac3 | 1379 | |
07432cef | 1380 | # 译者:注意保持前导空格 |
94550ed3 | 1381 | #: remote.c:2124 |
07432cef WS |
1382 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
1383 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
1384 | ||
89f80d72 | 1385 | #: revision.c:2193 |
1b7f4a34 JX |
1386 | msgid "your current branch appears to be broken" |
1387 | msgstr "您的当前分支好像被损坏" | |
1388 | ||
89f80d72 | 1389 | #: revision.c:2196 |
1b7f4a34 JX |
1390 | #, c-format |
1391 | msgid "your current branch '%s' does not have any commits yet" | |
1392 | msgstr "您的当前分支 '%s' 尚无任何提交" | |
1393 | ||
89f80d72 | 1394 | #: revision.c:2390 |
814ff314 JX |
1395 | msgid "--first-parent is incompatible with --bisect" |
1396 | msgstr "--first-parent 与 --bisect 不兼容" | |
1397 | ||
94550ed3 | 1398 | #: run-command.c:90 |
2e8451e8 JX |
1399 | msgid "open /dev/null failed" |
1400 | msgstr "不能打开 /dev/null" | |
1401 | ||
94550ed3 | 1402 | #: run-command.c:92 |
2e8451e8 JX |
1403 | #, c-format |
1404 | msgid "dup2(%d,%d) failed" | |
1405 | msgstr "不能调用 dup2(%d,%d)" | |
1406 | ||
1b7f4a34 | 1407 | #: send-pack.c:295 |
220c313c JX |
1408 | msgid "failed to sign the push certificate" |
1409 | msgstr "无法为推送证书签名" | |
1410 | ||
1b7f4a34 | 1411 | #: send-pack.c:404 |
220c313c JX |
1412 | msgid "the receiving end does not support --signed push" |
1413 | msgstr "接收端不支持签名推送" | |
1414 | ||
1b7f4a34 JX |
1415 | #: send-pack.c:406 |
1416 | msgid "" | |
1417 | "not sending a push certificate since the receiving end does not support --" | |
1418 | "signed push" | |
1419 | msgstr "未发送推送证书,因为接收端不支持签名推送" | |
1420 | ||
1421 | #: send-pack.c:418 | |
44f518e6 JX |
1422 | msgid "the receiving end does not support --atomic push" |
1423 | msgstr "接收端不支持原子推送" | |
814ff314 | 1424 | |
1b7f4a34 | 1425 | #: sequencer.c:183 |
14c8bced JX |
1426 | msgid "" |
1427 | "after resolving the conflicts, mark the corrected paths\n" | |
1428 | "with 'git add <paths>' or 'git rm <paths>'" | |
1429 | msgstr "" | |
d9d56b23 | 1430 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" |
14c8bced JX |
1431 | "命令标记修正后的文件" |
1432 | ||
1b7f4a34 | 1433 | #: sequencer.c:186 |
c04f5ac3 JX |
1434 | msgid "" |
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'" | |
1438 | msgstr "" | |
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 |
1444 | msgid "Could not write to %s" | |
1445 | msgstr "不能写入 %s" | |
1446 | ||
1b7f4a34 | 1447 | #: sequencer.c:202 |
c04f5ac3 JX |
1448 | #, c-format |
1449 | msgid "Error wrapping up %s" | |
1450 | msgstr "错误收尾 %s" | |
1451 | ||
1b7f4a34 | 1452 | #: sequencer.c:217 |
c04f5ac3 JX |
1453 | msgid "Your local changes would be overwritten by cherry-pick." |
1454 | msgstr "您的本地修改将被拣选操作覆盖。" | |
1455 | ||
1b7f4a34 | 1456 | #: sequencer.c:219 |
c04f5ac3 JX |
1457 | msgid "Your local changes would be overwritten by revert." |
1458 | msgstr "您的本地修改将被还原操作覆盖。" | |
1459 | ||
1b7f4a34 | 1460 | #: sequencer.c:222 |
c04f5ac3 JX |
1461 | msgid "Commit your changes or stash them to proceed." |
1462 | msgstr "提交您的修改或保存进度后再继续。" | |
1463 | ||
1464 | #. TRANSLATORS: %s will be "revert" or "cherry-pick" | |
1b7f4a34 | 1465 | #: sequencer.c:309 |
c04f5ac3 JX |
1466 | #, c-format |
1467 | msgid "%s: Unable to write new index file" | |
90e6ef53 | 1468 | msgstr "%s:无法写入新索引文件" |
c04f5ac3 | 1469 | |
1b7f4a34 | 1470 | #: sequencer.c:327 |
8ada9598 | 1471 | msgid "Could not resolve HEAD commit\n" |
81809b99 | 1472 | msgstr "不能解析 HEAD 提交\n" |
8ada9598 | 1473 | |
1b7f4a34 | 1474 | #: sequencer.c:347 |
8ada9598 | 1475 | msgid "Unable to update cache tree\n" |
81809b99 | 1476 | msgstr "不能更新缓存\n" |
8ada9598 | 1477 | |
1b7f4a34 | 1478 | #: sequencer.c:399 |
81809b99 | 1479 | #, c-format |
8ada9598 | 1480 | msgid "Could not parse commit %s\n" |
81809b99 | 1481 | msgstr "不能解析提交 %s\n" |
8ada9598 | 1482 | |
1b7f4a34 | 1483 | #: sequencer.c:404 |
81809b99 | 1484 | #, c-format |
8ada9598 | 1485 | msgid "Could not parse parent commit %s\n" |
81809b99 | 1486 | msgstr "不能解析父提交 %s\n" |
8ada9598 | 1487 | |
1b7f4a34 | 1488 | #: sequencer.c:469 |
c04f5ac3 | 1489 | msgid "Your index file is unmerged." |
90e6ef53 | 1490 | msgstr "您的索引文件未完成合并。" |
c04f5ac3 | 1491 | |
1b7f4a34 | 1492 | #: sequencer.c:488 |
c04f5ac3 JX |
1493 | #, c-format |
1494 | msgid "Commit %s is a merge but no -m option was given." | |
1495 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
1496 | ||
1b7f4a34 | 1497 | #: sequencer.c:496 |
c04f5ac3 JX |
1498 | #, c-format |
1499 | msgid "Commit %s does not have parent %d" | |
1500 | msgstr "提交 %s 没有父提交 %d" | |
1501 | ||
1b7f4a34 | 1502 | #: sequencer.c:500 |
c04f5ac3 JX |
1503 | #, c-format |
1504 | msgid "Mainline was specified but commit %s is not a merge." | |
90e6ef53 | 1505 | msgstr "指定了主线但提交 %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 |
1511 | msgid "%s: cannot parse parent commit %s" | |
1512 | msgstr "%s:不能解析父提交 %s" | |
1513 | ||
1b7f4a34 | 1514 | #: sequencer.c:517 |
c04f5ac3 JX |
1515 | #, c-format |
1516 | msgid "Cannot get commit message for %s" | |
1517 | msgstr "不能得到 %s 的提交说明" | |
1518 | ||
1b7f4a34 | 1519 | #: sequencer.c:603 |
c04f5ac3 JX |
1520 | #, c-format |
1521 | msgid "could not revert %s... %s" | |
1522 | msgstr "不能还原 %s... %s" | |
1523 | ||
1b7f4a34 | 1524 | #: sequencer.c:604 |
c04f5ac3 JX |
1525 | #, c-format |
1526 | msgid "could not apply %s... %s" | |
1527 | msgstr "不能应用 %s... %s" | |
1528 | ||
1b7f4a34 | 1529 | #: sequencer.c:639 |
c04f5ac3 JX |
1530 | msgid "empty commit set passed" |
1531 | msgstr "提供了空的提交集" | |
1532 | ||
1b7f4a34 | 1533 | #: sequencer.c:647 |
c04f5ac3 JX |
1534 | #, c-format |
1535 | msgid "git %s: failed to read the index" | |
90e6ef53 | 1536 | msgstr "git %s:无法读取索引" |
c04f5ac3 | 1537 | |
1b7f4a34 | 1538 | #: sequencer.c:651 |
c04f5ac3 JX |
1539 | #, c-format |
1540 | msgid "git %s: failed to refresh the index" | |
90e6ef53 | 1541 | msgstr "git %s:无法刷新索引" |
c04f5ac3 | 1542 | |
1b7f4a34 | 1543 | #: sequencer.c:711 |
c04f5ac3 JX |
1544 | #, c-format |
1545 | msgid "Cannot %s during a %s" | |
90e6ef53 | 1546 | msgstr "无法 %s 在一个 %s 过程中" |
c04f5ac3 | 1547 | |
1b7f4a34 | 1548 | #: sequencer.c:733 |
c04f5ac3 JX |
1549 | #, c-format |
1550 | msgid "Could not parse line %d." | |
90e6ef53 | 1551 | msgstr "不能解析第 %d 行。" |
c04f5ac3 | 1552 | |
1b7f4a34 | 1553 | #: sequencer.c:738 |
c04f5ac3 | 1554 | msgid "No commits parsed." |
7e238ab7 | 1555 | msgstr "没有提交被解析。" |
c04f5ac3 | 1556 | |
1b7f4a34 | 1557 | #: sequencer.c:750 |
c04f5ac3 JX |
1558 | #, c-format |
1559 | msgid "Could not open %s" | |
1560 | msgstr "不能打开 %s" | |
1561 | ||
1b7f4a34 | 1562 | #: sequencer.c:754 |
c04f5ac3 JX |
1563 | #, c-format |
1564 | msgid "Could not read %s." | |
1565 | msgstr "不能读取 %s。" | |
1566 | ||
1b7f4a34 | 1567 | #: sequencer.c:761 |
c04f5ac3 JX |
1568 | #, c-format |
1569 | msgid "Unusable instruction sheet: %s" | |
1570 | msgstr "无用的指令表单:%s" | |
1571 | ||
1b7f4a34 | 1572 | #: sequencer.c:791 |
c04f5ac3 JX |
1573 | #, c-format |
1574 | msgid "Invalid key: %s" | |
1575 | msgstr "无效键名:%s" | |
1576 | ||
1b7f4a34 | 1577 | #: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49 |
c04f5ac3 JX |
1578 | #, c-format |
1579 | msgid "Invalid value for %s: %s" | |
81809b99 | 1580 | msgstr "%s 的值无效:%s" |
c04f5ac3 | 1581 | |
1b7f4a34 | 1582 | #: sequencer.c:804 |
c04f5ac3 JX |
1583 | #, c-format |
1584 | msgid "Malformed options sheet: %s" | |
1585 | msgstr "非法的选项表单:%s" | |
1586 | ||
1b7f4a34 | 1587 | #: sequencer.c:823 |
c04f5ac3 JX |
1588 | msgid "a cherry-pick or revert is already in progress" |
1589 | msgstr "一个拣选或还原操作已在进行" | |
1590 | ||
1b7f4a34 | 1591 | #: sequencer.c:824 |
c04f5ac3 JX |
1592 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
1593 | msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" | |
1594 | ||
1b7f4a34 | 1595 | #: sequencer.c:828 |
c04f5ac3 JX |
1596 | #, c-format |
1597 | msgid "Could not create sequencer directory %s" | |
90e6ef53 | 1598 | msgstr "不能创建序列目录 %s" |
c04f5ac3 | 1599 | |
1b7f4a34 | 1600 | #: sequencer.c:844 sequencer.c:926 |
c04f5ac3 JX |
1601 | #, c-format |
1602 | msgid "Error wrapping up %s." | |
1603 | msgstr "错误收尾 %s。" | |
1604 | ||
1b7f4a34 | 1605 | #: sequencer.c:863 sequencer.c:996 |
c04f5ac3 | 1606 | msgid "no cherry-pick or revert in progress" |
195febda | 1607 | msgstr "拣选或还原操作并未进行" |
c04f5ac3 | 1608 | |
1b7f4a34 | 1609 | #: sequencer.c:865 |
c04f5ac3 JX |
1610 | msgid "cannot resolve HEAD" |
1611 | msgstr "不能解析 HEAD" | |
1612 | ||
1b7f4a34 | 1613 | #: sequencer.c:867 |
c04f5ac3 | 1614 | msgid "cannot abort from a branch yet to be born" |
90e6ef53 | 1615 | msgstr "不能从尚未建立的分支终止" |
c04f5ac3 | 1616 | |
94550ed3 | 1617 | #: sequencer.c:887 builtin/apply.c:4287 |
c04f5ac3 JX |
1618 | #, c-format |
1619 | msgid "cannot open %s: %s" | |
1620 | msgstr "不能打开 %s:%s" | |
1621 | ||
1b7f4a34 | 1622 | #: sequencer.c:890 |
c04f5ac3 JX |
1623 | #, c-format |
1624 | msgid "cannot read %s: %s" | |
1625 | msgstr "不能读取 %s:%s" | |
1626 | ||
1b7f4a34 | 1627 | #: sequencer.c:891 |
c04f5ac3 | 1628 | msgid "unexpected end of file" |
9aafc933 | 1629 | msgstr "意外的文件结束" |
c04f5ac3 | 1630 | |
1b7f4a34 | 1631 | #: sequencer.c:897 |
c04f5ac3 JX |
1632 | #, c-format |
1633 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
90e6ef53 | 1634 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" |
c04f5ac3 | 1635 | |
1b7f4a34 | 1636 | #: sequencer.c:919 |
c04f5ac3 JX |
1637 | #, c-format |
1638 | msgid "Could not format %s." | |
1639 | msgstr "不能格式化 %s。" | |
1640 | ||
1b7f4a34 | 1641 | #: sequencer.c:1064 |
4dcdc3d8 JX |
1642 | #, c-format |
1643 | msgid "%s: can't cherry-pick a %s" | |
1644 | msgstr "%s:不能拣选一个%s" | |
1645 | ||
1b7f4a34 | 1646 | #: sequencer.c:1067 |
4dcdc3d8 JX |
1647 | #, c-format |
1648 | msgid "%s: bad revision" | |
1649 | msgstr "%s:错误的版本" | |
1650 | ||
1b7f4a34 | 1651 | #: sequencer.c:1101 |
c04f5ac3 JX |
1652 | msgid "Can't revert as initial commit" |
1653 | msgstr "不能作为初始提交还原" | |
1654 | ||
1b7f4a34 | 1655 | #: sequencer.c:1102 |
c04f5ac3 JX |
1656 | msgid "Can't cherry-pick into empty head" |
1657 | msgstr "不能拣选到空分支" | |
1658 | ||
94550ed3 | 1659 | #: setup.c:248 |
7aea43ff JX |
1660 | #, c-format |
1661 | msgid "failed to read %s" | |
1662 | msgstr "无法读取 %s" | |
1663 | ||
94550ed3 | 1664 | #: sha1_name.c:463 |
2e8451e8 JX |
1665 | msgid "" |
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 |
1675 | msgstr "" |
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 |
1686 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
1687 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
1688 | ||
1b7f4a34 | 1689 | #: submodule.c:65 submodule.c:99 |
90314792 JX |
1690 | #, c-format |
1691 | msgid "Could not find section in .gitmodules where path=%s" | |
1692 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
1693 | ||
1b7f4a34 | 1694 | #: submodule.c:73 |
90314792 JX |
1695 | #, c-format |
1696 | msgid "Could not update .gitmodules entry %s" | |
1697 | msgstr "不能更新 .gitmodules 条目 %s" | |
1698 | ||
1b7f4a34 | 1699 | #: submodule.c:106 |
90314792 JX |
1700 | #, c-format |
1701 | msgid "Could not remove .gitmodules entry for %s" | |
1702 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
1703 | ||
1b7f4a34 | 1704 | #: submodule.c:117 |
90314792 JX |
1705 | msgid "staging updated .gitmodules failed" |
1706 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
1707 | ||
94550ed3 | 1708 | #: submodule.c:1040 |
90314792 JX |
1709 | #, c-format |
1710 | msgid "Could not set core.worktree in %s" | |
1711 | msgstr "不能在 %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 |
1716 | msgid "unknown value '%s' for key '%s'" | |
1717 | msgstr "键 '%2$s' 的未知取值 '%1$s'" | |
1718 | ||
94550ed3 | 1719 | #: trailer.c:543 trailer.c:548 builtin/remote.c:296 |
220c313c JX |
1720 | #, c-format |
1721 | msgid "more than one %s" | |
1722 | msgstr "多于一个 %s" | |
1723 | ||
814ff314 | 1724 | #: trailer.c:581 |
220c313c | 1725 | #, c-format |
9aeb4c2b JX |
1726 | msgid "empty trailer token in trailer '%.*s'" |
1727 | msgstr "签名 '%.*s' 的键为空" | |
220c313c | 1728 | |
814ff314 | 1729 | #: trailer.c:701 |
220c313c JX |
1730 | #, c-format |
1731 | msgid "could not read input file '%s'" | |
1732 | msgstr "不能读取输入文件 '%s'" | |
1733 | ||
814ff314 | 1734 | #: trailer.c:704 |
220c313c JX |
1735 | msgid "could not read from stdin" |
1736 | msgstr "不能自标准输入读取" | |
1737 | ||
1b7f4a34 JX |
1738 | #: transport-helper.c:1025 |
1739 | #, c-format | |
1740 | msgid "Could not read ref %s" | |
1741 | msgstr "不能读取引用 %s" | |
1742 | ||
7aea43ff | 1743 | #: unpack-trees.c:203 |
6c94aba5 JX |
1744 | msgid "Checking out files" |
1745 | msgstr "正在检出文件" | |
1746 | ||
90314792 JX |
1747 | #: urlmatch.c:120 |
1748 | msgid "invalid URL scheme name or missing '://' suffix" | |
1749 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
1750 | ||
1751 | #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 | |
1752 | #, c-format | |
1753 | msgid "invalid %XX escape sequence" | |
1754 | msgstr "无效的 %XX 转义序列" | |
1755 | ||
1756 | #: urlmatch.c:172 | |
1757 | msgid "missing host and scheme is not 'file:'" | |
4375c10e | 1758 | msgstr "缺失主机名且 URL 方案不是 'file:'" |
90314792 JX |
1759 | |
1760 | #: urlmatch.c:189 | |
1761 | msgid "a 'file:' URL may not have a port number" | |
1762 | msgstr "一个 'file:' URL 不应该包含端口号" | |
1763 | ||
1764 | #: urlmatch.c:199 | |
1765 | msgid "invalid characters in host name" | |
1766 | msgstr "主机名中包含无效的字符" | |
1767 | ||
1768 | #: urlmatch.c:244 urlmatch.c:255 | |
1769 | msgid "invalid port number" | |
1770 | msgstr "无效的端口号" | |
1771 | ||
1772 | #: urlmatch.c:322 | |
1773 | msgid "invalid '..' path segment" | |
1774 | msgstr "无效的 '..' 路径片段" | |
1775 | ||
1b7f4a34 JX |
1776 | #: wrapper.c:219 wrapper.c:362 |
1777 | #, c-format | |
1778 | msgid "could not open '%s' for reading and writing" | |
1779 | msgstr "无法打开 '%s' 进行读写" | |
1780 | ||
1781 | #: wrapper.c:221 wrapper.c:364 | |
1782 | #, c-format | |
1783 | msgid "could not open '%s' for writing" | |
1784 | msgstr "无法打开 '%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 |
1789 | msgid "could not open '%s' for reading" | |
1790 | msgstr "无法打开 '%s' 进行读取" | |
1791 | ||
1792 | #: wrapper.c:579 | |
07432cef | 1793 | #, c-format |
ef317cd5 | 1794 | msgid "unable to access '%s': %s" |
07432cef WS |
1795 | msgstr "不能访问 '%s':%s" |
1796 | ||
1b7f4a34 | 1797 | #: wrapper.c:600 |
07432cef WS |
1798 | #, c-format |
1799 | msgid "unable to access '%s'" | |
1800 | msgstr "不能访问 '%s'" | |
ef317cd5 | 1801 | |
89f80d72 | 1802 | #: wrapper.c:608 |
220c313c JX |
1803 | msgid "unable to get current working directory" |
1804 | msgstr "不能获取当前工作目录" | |
1805 | ||
89f80d72 | 1806 | #: wrapper.c:635 |
7aea43ff JX |
1807 | #, c-format |
1808 | msgid "could not open %s for writing" | |
1809 | msgstr "不能写入 %s" | |
1810 | ||
89f80d72 | 1811 | #: wrapper.c:646 builtin/am.c:425 |
7aea43ff JX |
1812 | #, c-format |
1813 | msgid "could not write to %s" | |
1814 | msgstr "不能写入 %s" | |
1815 | ||
89f80d72 | 1816 | #: wrapper.c:652 |
7aea43ff JX |
1817 | #, c-format |
1818 | msgid "could not close %s" | |
1819 | msgstr "不能关闭 %s" | |
1820 | ||
1b7f4a34 | 1821 | #: wt-status.c:149 |
c04f5ac3 JX |
1822 | msgid "Unmerged paths:" |
1823 | msgstr "未合并的路径:" | |
1824 | ||
90e6ef53 | 1825 | # 译者:注意保持前导空格 |
1b7f4a34 | 1826 | #: wt-status.c:176 wt-status.c:203 |
c04f5ac3 JX |
1827 | #, c-format |
1828 | msgid " (use \"git reset %s <file>...\" to unstage)" | |
160fb2b2 | 1829 | msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)" |
c04f5ac3 | 1830 | |
90e6ef53 | 1831 | # 译者:注意保持前导空格 |
1b7f4a34 | 1832 | #: wt-status.c:178 wt-status.c:205 |
c04f5ac3 | 1833 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
160fb2b2 | 1834 | msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)" |
c04f5ac3 | 1835 | |
90e6ef53 | 1836 | # 译者:注意保持前导空格 |
1b7f4a34 | 1837 | #: wt-status.c:182 |
6792b93b | 1838 | msgid " (use \"git add <file>...\" to mark resolution)" |
d9d56b23 | 1839 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" |
6792b93b JX |
1840 | |
1841 | # 译者:注意保持前导空格 | |
1b7f4a34 | 1842 | #: wt-status.c:184 wt-status.c:188 |
c04f5ac3 | 1843 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
d9d56b23 | 1844 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" |
c04f5ac3 | 1845 | |
6792b93b | 1846 | # 译者:注意保持前导空格 |
1b7f4a34 | 1847 | #: wt-status.c:186 |
6792b93b | 1848 | msgid " (use \"git rm <file>...\" to mark resolution)" |
d9d56b23 | 1849 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" |
6792b93b | 1850 | |
1b7f4a34 | 1851 | #: wt-status.c:197 wt-status.c:880 |
c04f5ac3 JX |
1852 | msgid "Changes to be committed:" |
1853 | msgstr "要提交的变更:" | |
1854 | ||
1b7f4a34 | 1855 | #: wt-status.c:215 wt-status.c:889 |
c04f5ac3 | 1856 | msgid "Changes not staged for commit:" |
7e238ab7 | 1857 | msgstr "尚未暂存以备提交的变更:" |
c04f5ac3 | 1858 | |
90e6ef53 | 1859 | # 译者:注意保持前导空格 |
1b7f4a34 | 1860 | #: wt-status.c:219 |
c04f5ac3 | 1861 | msgid " (use \"git add <file>...\" to update what will be committed)" |
d9d56b23 | 1862 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" |
c04f5ac3 | 1863 | |
90e6ef53 | 1864 | # 译者:注意保持前导空格 |
1b7f4a34 | 1865 | #: wt-status.c:221 |
c04f5ac3 | 1866 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
d9d56b23 | 1867 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" |
c04f5ac3 | 1868 | |
90e6ef53 | 1869 | # 译者:注意保持前导空格 |
1b7f4a34 | 1870 | #: wt-status.c:222 |
c04f5ac3 JX |
1871 | msgid "" |
1872 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" | |
d9d56b23 | 1873 | msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)" |
c04f5ac3 | 1874 | |
90e6ef53 | 1875 | # 译者:注意保持前导空格 |
1b7f4a34 | 1876 | #: wt-status.c:224 |
c04f5ac3 JX |
1877 | msgid " (commit or discard the untracked or modified content in submodules)" |
1878 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
1879 | ||
90e6ef53 | 1880 | # 译者:注意保持前导空格 |
1b7f4a34 | 1881 | #: wt-status.c:236 |
c04f5ac3 JX |
1882 | #, c-format |
1883 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
d9d56b23 | 1884 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" |
c04f5ac3 | 1885 | |
1b7f4a34 | 1886 | #: wt-status.c:251 |
c04f5ac3 JX |
1887 | msgid "both deleted:" |
1888 | msgstr "双方删除:" | |
1889 | ||
1b7f4a34 | 1890 | #: wt-status.c:253 |
c04f5ac3 JX |
1891 | msgid "added by us:" |
1892 | msgstr "由我们添加:" | |
1893 | ||
1b7f4a34 | 1894 | #: wt-status.c:255 |
c04f5ac3 JX |
1895 | msgid "deleted by them:" |
1896 | msgstr "由他们删除:" | |
1897 | ||
1b7f4a34 | 1898 | #: wt-status.c:257 |
c04f5ac3 JX |
1899 | msgid "added by them:" |
1900 | msgstr "由他们添加:" | |
1901 | ||
1b7f4a34 | 1902 | #: wt-status.c:259 |
c04f5ac3 JX |
1903 | msgid "deleted by us:" |
1904 | msgstr "由我们删除:" | |
1905 | ||
1b7f4a34 | 1906 | #: wt-status.c:261 |
c04f5ac3 JX |
1907 | msgid "both added:" |
1908 | msgstr "双方添加:" | |
1909 | ||
1b7f4a34 | 1910 | #: wt-status.c:263 |
c04f5ac3 JX |
1911 | msgid "both modified:" |
1912 | msgstr "双方修改:" | |
1913 | ||
1b7f4a34 | 1914 | #: wt-status.c:265 |
6c94aba5 JX |
1915 | #, c-format |
1916 | msgid "bug: unhandled unmerged status %x" | |
1917 | msgstr "bug:无法处理的未合并状态 %x" | |
cfff71a9 | 1918 | |
1b7f4a34 | 1919 | #: wt-status.c:273 |
6c94aba5 JX |
1920 | msgid "new file:" |
1921 | msgstr "新文件:" | |
cfff71a9 | 1922 | |
1b7f4a34 | 1923 | #: wt-status.c:275 |
6c94aba5 JX |
1924 | msgid "copied:" |
1925 | msgstr "拷贝:" | |
cfff71a9 | 1926 | |
1b7f4a34 | 1927 | #: wt-status.c:277 |
6c94aba5 JX |
1928 | msgid "deleted:" |
1929 | msgstr "删除:" | |
cfff71a9 | 1930 | |
1b7f4a34 | 1931 | #: wt-status.c:279 |
6c94aba5 JX |
1932 | msgid "modified:" |
1933 | msgstr "修改:" | |
1934 | ||
1b7f4a34 | 1935 | #: wt-status.c:281 |
6c94aba5 JX |
1936 | msgid "renamed:" |
1937 | msgstr "重命名:" | |
1938 | ||
1b7f4a34 | 1939 | #: wt-status.c:283 |
6c94aba5 JX |
1940 | msgid "typechange:" |
1941 | msgstr "类型变更:" | |
1942 | ||
1b7f4a34 | 1943 | #: wt-status.c:285 |
6c94aba5 JX |
1944 | msgid "unknown:" |
1945 | msgstr "未知:" | |
cfff71a9 | 1946 | |
1b7f4a34 | 1947 | #: wt-status.c:287 |
6c94aba5 JX |
1948 | msgid "unmerged:" |
1949 | msgstr "未合并:" | |
cfff71a9 | 1950 | |
90e6ef53 | 1951 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
1b7f4a34 | 1952 | #: wt-status.c:369 |
c04f5ac3 | 1953 | msgid "new commits, " |
aa9565f7 | 1954 | msgstr "新提交, " |
c04f5ac3 | 1955 | |
90e6ef53 | 1956 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
1b7f4a34 | 1957 | #: wt-status.c:371 |
c04f5ac3 | 1958 | msgid "modified content, " |
aa9565f7 | 1959 | msgstr "修改的内容, " |
c04f5ac3 | 1960 | |
90e6ef53 | 1961 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
1b7f4a34 | 1962 | #: wt-status.c:373 |
c04f5ac3 | 1963 | msgid "untracked content, " |
aa9565f7 | 1964 | msgstr "未跟踪的内容, " |
c04f5ac3 | 1965 | |
1b7f4a34 | 1966 | #: wt-status.c:390 |
c04f5ac3 JX |
1967 | #, c-format |
1968 | msgid "bug: unhandled diff status %c" | |
6c94aba5 | 1969 | msgstr "bug:无法处理的差异状态 %c" |
c04f5ac3 | 1970 | |
1b7f4a34 | 1971 | #: wt-status.c:754 |
90314792 JX |
1972 | msgid "Submodules changed but not updated:" |
1973 | msgstr "子模组已修改但尚未更新:" | |
1974 | ||
1b7f4a34 | 1975 | #: wt-status.c:756 |
90314792 JX |
1976 | msgid "Submodule changes to be committed:" |
1977 | msgstr "要提交的子模组变更:" | |
1978 | ||
1b7f4a34 | 1979 | #: wt-status.c:837 |
cfff71a9 JX |
1980 | msgid "" |
1981 | "Do not touch the line above.\n" | |
1982 | "Everything below will be removed." | |
1983 | msgstr "" | |
1984 | "不要改动上面的一行。\n" | |
1985 | "下面的所有内容均将被删除。" | |
1986 | ||
1b7f4a34 | 1987 | #: wt-status.c:948 |
6792b93b | 1988 | msgid "You have unmerged paths." |
195febda | 1989 | msgstr "您有尚未合并的路径。" |
6792b93b JX |
1990 | |
1991 | # 译者:注意保持前导空格 | |
1b7f4a34 | 1992 | #: wt-status.c:951 |
6792b93b JX |
1993 | msgid " (fix conflicts and run \"git commit\")" |
1994 | msgstr " (解决冲突并运行 \"git commit\")" | |
1995 | ||
1b7f4a34 | 1996 | #: wt-status.c:954 |
6792b93b JX |
1997 | msgid "All conflicts fixed but you are still merging." |
1998 | msgstr "所有冲突已解决但您仍处于合并中。" | |
1999 | ||
2000 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2001 | #: wt-status.c:957 |
6792b93b JX |
2002 | msgid " (use \"git commit\" to conclude merge)" |
2003 | msgstr " (使用 \"git commit\" 结束合并)" | |
2004 | ||
1b7f4a34 | 2005 | #: wt-status.c:967 |
6792b93b | 2006 | msgid "You are in the middle of an am session." |
98b2761d | 2007 | msgstr "您正处于 am 操作过程中。" |
6792b93b | 2008 | |
1b7f4a34 | 2009 | #: wt-status.c:970 |
6792b93b JX |
2010 | msgid "The current patch is empty." |
2011 | msgstr "当前的补丁为空。" | |
2012 | ||
2013 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2014 | #: wt-status.c:974 |
2e8451e8 JX |
2015 | msgid " (fix conflicts and then run \"git am --continue\")" |
2016 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
6792b93b JX |
2017 | |
2018 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2019 | #: wt-status.c:976 |
6792b93b JX |
2020 | msgid " (use \"git am --skip\" to skip this patch)" |
2021 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
2022 | ||
2023 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2024 | #: wt-status.c:978 |
6792b93b JX |
2025 | msgid " (use \"git am --abort\" to restore the original branch)" |
2026 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
2027 | ||
1b7f4a34 JX |
2028 | #: wt-status.c:1105 |
2029 | msgid "No commands done." | |
2030 | msgstr "没有命令被执行。" | |
2031 | ||
2032 | #: wt-status.c:1108 | |
2033 | #, c-format | |
2034 | msgid "Last command done (%d command done):" | |
2035 | msgid_plural "Last commands done (%d commands done):" | |
2036 | msgstr[0] "最后一条命令已完成(%d 条命令被执行):" | |
2037 | msgstr[1] "最后的命令已完成(%d 条命令被执行):" | |
2038 | ||
2039 | #: wt-status.c:1119 | |
2040 | #, c-format | |
2041 | msgid " (see more in file %s)" | |
2042 | msgstr " (更多参见文件 %s)" | |
2043 | ||
2044 | #: wt-status.c:1124 | |
2045 | msgid "No commands remaining." | |
2046 | msgstr "未剩下任何命令。" | |
2047 | ||
2048 | #: wt-status.c:1127 | |
2049 | #, c-format | |
2050 | msgid "Next command to do (%d remaining command):" | |
2051 | msgid_plural "Next commands to do (%d remaining commands):" | |
2052 | msgstr[0] "接下来要执行的命令(剩余 %d 条命令):" | |
2053 | msgstr[1] "接下来要执行的命令(剩余 %d 条命令):" | |
2054 | ||
2055 | # 译者:注意保持前导空格 | |
2056 | #: wt-status.c:1135 | |
2057 | msgid " (use \"git rebase --edit-todo\" to view and edit)" | |
2058 | msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)" | |
2059 | ||
2060 | #: wt-status.c:1148 | |
63af42fe JX |
2061 | #, c-format |
2062 | msgid "You are currently rebasing branch '%s' on '%s'." | |
98b2761d | 2063 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" |
63af42fe | 2064 | |
1b7f4a34 | 2065 | #: wt-status.c:1153 |
6792b93b | 2066 | msgid "You are currently rebasing." |
98b2761d | 2067 | msgstr "您在执行变基操作。" |
6792b93b JX |
2068 | |
2069 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2070 | #: wt-status.c:1167 |
6792b93b JX |
2071 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
2072 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
2073 | ||
2074 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2075 | #: wt-status.c:1169 |
6792b93b JX |
2076 | msgid " (use \"git rebase --skip\" to skip this patch)" |
2077 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
2078 | ||
2079 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2080 | #: wt-status.c:1171 |
6792b93b JX |
2081 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
2082 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
2083 | ||
2084 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2085 | #: wt-status.c:1177 |
6792b93b JX |
2086 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
2087 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
2088 | ||
1b7f4a34 | 2089 | #: wt-status.c:1181 |
63af42fe JX |
2090 | #, c-format |
2091 | msgid "" | |
2092 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." | |
98b2761d | 2093 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" |
63af42fe | 2094 | |
1b7f4a34 | 2095 | #: wt-status.c:1186 |
6792b93b | 2096 | msgid "You are currently splitting a commit during a rebase." |
98b2761d | 2097 | msgstr "您在执行变基操作时拆分提交。" |
6792b93b JX |
2098 | |
2099 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2100 | #: wt-status.c:1189 |
6792b93b JX |
2101 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
2102 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
2103 | ||
1b7f4a34 | 2104 | #: wt-status.c:1193 |
63af42fe JX |
2105 | #, c-format |
2106 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
98b2761d | 2107 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" |
63af42fe | 2108 | |
1b7f4a34 | 2109 | #: wt-status.c:1198 |
6792b93b | 2110 | msgid "You are currently editing a commit during a rebase." |
98b2761d | 2111 | msgstr "您在执行变基操作时编辑提交。" |
6792b93b JX |
2112 | |
2113 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2114 | #: wt-status.c:1201 |
6792b93b JX |
2115 | msgid " (use \"git commit --amend\" to amend the current commit)" |
2116 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
2117 | ||
2118 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2119 | #: wt-status.c:1203 |
6792b93b JX |
2120 | msgid "" |
2121 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
195febda | 2122 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" |
6792b93b | 2123 | |
1b7f4a34 | 2124 | #: wt-status.c:1213 |
90314792 JX |
2125 | #, c-format |
2126 | msgid "You are currently cherry-picking commit %s." | |
98b2761d | 2127 | msgstr "您在执行拣选提交 %s 的操作。" |
6792b93b | 2128 | |
2e8451e8 | 2129 | # 译者:注意保持前导空格 |
1b7f4a34 | 2130 | #: wt-status.c:1218 |
2e8451e8 JX |
2131 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
2132 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
2133 | ||
6792b93b | 2134 | # 译者:注意保持前导空格 |
1b7f4a34 | 2135 | #: wt-status.c:1221 |
2e8451e8 JX |
2136 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
2137 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
6792b93b | 2138 | |
2e8451e8 | 2139 | # 译者:注意保持前导空格 |
1b7f4a34 | 2140 | #: wt-status.c:1223 |
2e8451e8 JX |
2141 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
2142 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
2143 | ||
1b7f4a34 | 2144 | #: wt-status.c:1232 |
1003b3a5 JX |
2145 | #, c-format |
2146 | msgid "You are currently reverting commit %s." | |
98b2761d | 2147 | msgstr "您在执行反转提交 %s 的操作。" |
1003b3a5 JX |
2148 | |
2149 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2150 | #: wt-status.c:1237 |
1003b3a5 JX |
2151 | msgid " (fix conflicts and run \"git revert --continue\")" |
2152 | msgstr " (解决冲突并运行 \"git revert --continue\")" | |
2153 | ||
2154 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2155 | #: wt-status.c:1240 |
1003b3a5 JX |
2156 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
2157 | msgstr " (所有冲突已解决:运行 \"git revert --continue\")" | |
2158 | ||
2159 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2160 | #: wt-status.c:1242 |
1003b3a5 JX |
2161 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
2162 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
2163 | ||
1b7f4a34 | 2164 | #: wt-status.c:1253 |
63af42fe | 2165 | #, c-format |
1003b3a5 | 2166 | msgid "You are currently bisecting, started from branch '%s'." |
98b2761d | 2167 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" |
63af42fe | 2168 | |
1b7f4a34 | 2169 | #: wt-status.c:1257 |
6792b93b | 2170 | msgid "You are currently bisecting." |
98b2761d | 2171 | msgstr "您在执行二分查找操作。" |
6792b93b JX |
2172 | |
2173 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2174 | #: wt-status.c:1260 |
6792b93b JX |
2175 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
2176 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
2177 | ||
94550ed3 | 2178 | #: wt-status.c:1438 |
c04f5ac3 JX |
2179 | msgid "On branch " |
2180 | msgstr "位于分支 " | |
2181 | ||
94550ed3 | 2182 | #: wt-status.c:1444 |
1b7f4a34 JX |
2183 | msgid "interactive rebase in progress; onto " |
2184 | msgstr "交互式变基操作正在进行中;至 " | |
2185 | ||
94550ed3 | 2186 | #: wt-status.c:1446 |
2e8451e8 | 2187 | msgid "rebase in progress; onto " |
98b2761d | 2188 | msgstr "变基操作正在进行中;至 " |
2e8451e8 | 2189 | |
94550ed3 | 2190 | #: wt-status.c:1451 |
1003b3a5 JX |
2191 | msgid "HEAD detached at " |
2192 | msgstr "头指针分离于 " | |
2193 | ||
94550ed3 | 2194 | #: wt-status.c:1453 |
1003b3a5 JX |
2195 | msgid "HEAD detached from " |
2196 | msgstr "头指针分离自 " | |
2197 | ||
94550ed3 | 2198 | #: wt-status.c:1456 |
c04f5ac3 JX |
2199 | msgid "Not currently on any branch." |
2200 | msgstr "当前不在任何分支上。" | |
2201 | ||
1b7f4a34 | 2202 | #: wt-status.c:1474 |
c04f5ac3 JX |
2203 | msgid "Initial commit" |
2204 | msgstr "初始提交" | |
2205 | ||
1b7f4a34 | 2206 | #: wt-status.c:1488 |
ef317cd5 | 2207 | msgid "Untracked files" |
07432cef | 2208 | msgstr "未跟踪的文件" |
c04f5ac3 | 2209 | |
1b7f4a34 | 2210 | #: wt-status.c:1490 |
ef317cd5 | 2211 | msgid "Ignored files" |
07432cef | 2212 | msgstr "忽略的文件" |
c04f5ac3 | 2213 | |
1b7f4a34 | 2214 | #: wt-status.c:1494 |
1003b3a5 | 2215 | #, c-format |
4dcdc3d8 JX |
2216 | msgid "" |
2217 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
2218 | "may speed it up, but you have to be careful not to forget to add\n" | |
2219 | "new files yourself (see 'git help status')." | |
2220 | msgstr "" | |
2221 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
2222 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1003b3a5 | 2223 | |
1b7f4a34 | 2224 | #: wt-status.c:1500 |
c04f5ac3 JX |
2225 | #, c-format |
2226 | msgid "Untracked files not listed%s" | |
2227 | msgstr "未跟踪的文件没有列出%s" | |
2228 | ||
7e238ab7 | 2229 | # 译者:中文字符串拼接,可删除前导空格 |
1b7f4a34 | 2230 | #: wt-status.c:1502 |
c04f5ac3 | 2231 | msgid " (use -u option to show untracked files)" |
7e238ab7 | 2232 | msgstr "(使用 -u 参数显示未跟踪的文件)" |
c04f5ac3 | 2233 | |
1b7f4a34 | 2234 | #: wt-status.c:1508 |
c04f5ac3 JX |
2235 | msgid "No changes" |
2236 | msgstr "没有修改" | |
2237 | ||
1b7f4a34 | 2238 | #: wt-status.c:1513 |
07432cef | 2239 | #, c-format |
ef317cd5 | 2240 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" |
07432cef | 2241 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" |
c04f5ac3 | 2242 | |
1b7f4a34 | 2243 | #: wt-status.c:1516 |
07432cef | 2244 | #, c-format |
ef317cd5 | 2245 | msgid "no changes added to commit\n" |
07432cef | 2246 | msgstr "修改尚未加入提交\n" |
c04f5ac3 | 2247 | |
1b7f4a34 | 2248 | #: wt-status.c:1519 |
07432cef | 2249 | #, c-format |
ef317cd5 JX |
2250 | msgid "" |
2251 | "nothing added to commit but untracked files present (use \"git add\" to " | |
2252 | "track)\n" | |
07432cef | 2253 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" |
c04f5ac3 | 2254 | |
1b7f4a34 | 2255 | #: wt-status.c:1522 |
07432cef | 2256 | #, c-format |
ef317cd5 | 2257 | msgid "nothing added to commit but untracked files present\n" |
07432cef | 2258 | msgstr "提交为空,但是存在尚未跟踪的文件\n" |
c04f5ac3 | 2259 | |
7e238ab7 | 2260 | # 译者:中文字符串拼接,可删除前导空格 |
1b7f4a34 | 2261 | #: wt-status.c:1525 |
07432cef | 2262 | #, c-format |
ef317cd5 | 2263 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" |
07432cef | 2264 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" |
c04f5ac3 | 2265 | |
1b7f4a34 | 2266 | #: wt-status.c:1528 wt-status.c:1533 |
07432cef | 2267 | #, c-format |
ef317cd5 | 2268 | msgid "nothing to commit\n" |
07432cef | 2269 | msgstr "无文件要提交\n" |
ef317cd5 | 2270 | |
7e238ab7 | 2271 | # 译者:中文字符串拼接,可删除前导空格 |
1b7f4a34 | 2272 | #: wt-status.c:1531 |
07432cef | 2273 | #, c-format |
ef317cd5 | 2274 | msgid "nothing to commit (use -u to show untracked files)\n" |
07432cef | 2275 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" |
c04f5ac3 | 2276 | |
7e238ab7 | 2277 | # 译者:中文字符串拼接,可删除前导空格 |
1b7f4a34 | 2278 | #: wt-status.c:1535 |
07432cef | 2279 | #, c-format |
ef317cd5 | 2280 | msgid "nothing to commit, working directory clean\n" |
07432cef | 2281 | msgstr "无文件要提交,干净的工作区\n" |
c04f5ac3 | 2282 | |
90e6ef53 | 2283 | # 译者:注意保持句尾空格 |
94550ed3 | 2284 | #: wt-status.c:1642 |
c04f5ac3 JX |
2285 | msgid "Initial commit on " |
2286 | msgstr "初始提交于 " | |
2287 | ||
94550ed3 JX |
2288 | #: wt-status.c:1646 |
2289 | msgid "HEAD (no branch)" | |
2290 | msgstr "HEAD(非分支)" | |
2291 | ||
2292 | #: wt-status.c:1675 | |
90314792 JX |
2293 | msgid "gone" |
2294 | msgstr "丢失" | |
2295 | ||
90e6ef53 | 2296 | # 译者:注意保持句尾空格 |
94550ed3 | 2297 | #: wt-status.c:1677 wt-status.c:1685 |
c04f5ac3 JX |
2298 | msgid "behind " |
2299 | msgstr "落后 " | |
2300 | ||
94550ed3 | 2301 | #: compat/precompose_utf8.c:56 builtin/clone.c:408 |
a77c07d9 JX |
2302 | #, c-format |
2303 | msgid "failed to unlink '%s'" | |
2304 | msgstr "无法删除 '%s'" | |
2305 | ||
220c313c | 2306 | #: builtin/add.c:22 |
814ff314 | 2307 | msgid "git add [<options>] [--] <pathspec>..." |
160fb2b2 | 2308 | msgstr "git add [<选项>] [--] <路径规格>..." |
ef317cd5 | 2309 | |
220c313c | 2310 | #: builtin/add.c:65 |
c04f5ac3 JX |
2311 | #, c-format |
2312 | msgid "unexpected diff status %c" | |
2313 | msgstr "意外的差异状态 %c" | |
2314 | ||
94550ed3 | 2315 | #: builtin/add.c:70 builtin/commit.c:278 |
c04f5ac3 JX |
2316 | msgid "updating files failed" |
2317 | msgstr "更新文件失败" | |
2318 | ||
220c313c | 2319 | #: builtin/add.c:80 |
c04f5ac3 JX |
2320 | #, c-format |
2321 | msgid "remove '%s'\n" | |
2322 | msgstr "删除 '%s'\n" | |
2323 | ||
220c313c | 2324 | #: builtin/add.c:134 |
c04f5ac3 | 2325 | msgid "Unstaged changes after refreshing the index:" |
90e6ef53 | 2326 | msgstr "刷新索引之后尚未被暂存的变更:" |
c04f5ac3 | 2327 | |
94550ed3 | 2328 | #: builtin/add.c:194 builtin/rev-parse.c:796 |
c04f5ac3 | 2329 | msgid "Could not read the index" |
90e6ef53 | 2330 | msgstr "不能读取索引" |
c04f5ac3 | 2331 | |
220c313c | 2332 | #: builtin/add.c:205 |
c04f5ac3 JX |
2333 | #, c-format |
2334 | msgid "Could not open '%s' for writing." | |
1b7f4a34 | 2335 | msgstr "无法打开 '%s' 进行写入。" |
c04f5ac3 | 2336 | |
220c313c | 2337 | #: builtin/add.c:209 |
c04f5ac3 | 2338 | msgid "Could not write patch" |
195febda | 2339 | msgstr "不能生成补丁" |
c04f5ac3 | 2340 | |
7aea43ff JX |
2341 | #: builtin/add.c:212 |
2342 | msgid "editing patch failed" | |
2343 | msgstr "编辑补丁失败" | |
2344 | ||
2345 | #: builtin/add.c:215 | |
c04f5ac3 JX |
2346 | #, c-format |
2347 | msgid "Could not stat '%s'" | |
90e6ef53 | 2348 | msgstr "不能查看文件状态 '%s'" |
c04f5ac3 | 2349 | |
7aea43ff | 2350 | #: builtin/add.c:217 |
c04f5ac3 JX |
2351 | msgid "Empty patch. Aborted." |
2352 | msgstr "空补丁。异常终止。" | |
2353 | ||
7aea43ff | 2354 | #: builtin/add.c:222 |
8ada9598 JX |
2355 | #, c-format |
2356 | msgid "Could not apply '%s'" | |
2357 | msgstr "不能应用 '%s'" | |
2358 | ||
7aea43ff | 2359 | #: builtin/add.c:232 |
8ada9598 | 2360 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
195febda | 2361 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" |
8ada9598 | 2362 | |
94550ed3 | 2363 | #: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110 |
89f80d72 | 2364 | #: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543 |
94550ed3 | 2365 | #: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162 |
ef317cd5 | 2366 | msgid "dry run" |
07432cef | 2367 | msgstr "演习" |
ef317cd5 | 2368 | |
94550ed3 JX |
2369 | #: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19 |
2370 | #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 | |
89f80d72 | 2371 | #: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114 |
ef317cd5 JX |
2372 | msgid "be verbose" |
2373 | msgstr "冗长输出" | |
2374 | ||
7aea43ff | 2375 | #: builtin/add.c:252 |
ef317cd5 | 2376 | msgid "interactive picking" |
07432cef | 2377 | msgstr "交互式拣选" |
ef317cd5 | 2378 | |
94550ed3 | 2379 | #: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286 |
ef317cd5 | 2380 | msgid "select hunks interactively" |
07432cef | 2381 | msgstr "交互式挑选数据块" |
ef317cd5 | 2382 | |
7aea43ff | 2383 | #: builtin/add.c:254 |
ef317cd5 | 2384 | msgid "edit current diff and apply" |
07432cef | 2385 | msgstr "编辑当前差异并应用" |
ef317cd5 | 2386 | |
7aea43ff | 2387 | #: builtin/add.c:255 |
ef317cd5 | 2388 | msgid "allow adding otherwise ignored files" |
07432cef | 2389 | msgstr "允许添加忽略的文件" |
ef317cd5 | 2390 | |
7aea43ff | 2391 | #: builtin/add.c:256 |
ef317cd5 | 2392 | msgid "update tracked files" |
07432cef | 2393 | msgstr "更新已跟踪的文件" |
ef317cd5 | 2394 | |
7aea43ff | 2395 | #: builtin/add.c:257 |
ef317cd5 | 2396 | msgid "record only the fact that the path will be added later" |
07432cef | 2397 | msgstr "只记录,该路径稍后再添加" |
ef317cd5 | 2398 | |
7aea43ff | 2399 | #: builtin/add.c:258 |
ef317cd5 | 2400 | msgid "add changes from all tracked and untracked files" |
07432cef | 2401 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" |
ef317cd5 | 2402 | |
7aea43ff | 2403 | #: builtin/add.c:261 |
4dcdc3d8 JX |
2404 | msgid "ignore paths removed in the working tree (same as --no-all)" |
2405 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
2406 | ||
7aea43ff | 2407 | #: builtin/add.c:263 |
ef317cd5 | 2408 | msgid "don't add, only refresh the index" |
07432cef | 2409 | msgstr "不添加,只刷新索引" |
ef317cd5 | 2410 | |
7aea43ff | 2411 | #: builtin/add.c:264 |
ef317cd5 | 2412 | msgid "just skip files which cannot be added because of errors" |
07432cef | 2413 | msgstr "跳过因出错不能添加的文件" |
ef317cd5 | 2414 | |
7aea43ff | 2415 | #: builtin/add.c:265 |
ef317cd5 | 2416 | msgid "check if - even missing - files are ignored in dry run" |
07432cef | 2417 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" |
ef317cd5 | 2418 | |
7aea43ff | 2419 | #: builtin/add.c:287 |
8ada9598 JX |
2420 | #, c-format |
2421 | msgid "Use -f if you really want to add them.\n" | |
2422 | msgstr "使用 -f 参数如果您确实要添加它们。\n" | |
2423 | ||
7aea43ff | 2424 | #: builtin/add.c:294 |
8ada9598 JX |
2425 | msgid "adding files failed" |
2426 | msgstr "添加文件失败" | |
2427 | ||
7aea43ff | 2428 | #: builtin/add.c:330 |
8ada9598 JX |
2429 | msgid "-A and -u are mutually incompatible" |
2430 | msgstr "-A 和 -u 选项互斥" | |
2431 | ||
7aea43ff | 2432 | #: builtin/add.c:337 |
8ada9598 | 2433 | msgid "Option --ignore-missing can only be used together with --dry-run" |
649900bc | 2434 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" |
8ada9598 | 2435 | |
94550ed3 | 2436 | #: builtin/add.c:352 |
8ada9598 JX |
2437 | #, c-format |
2438 | msgid "Nothing specified, nothing added.\n" | |
2439 | msgstr "没有指定文件,也没有文件被添加。\n" | |
2440 | ||
94550ed3 | 2441 | #: builtin/add.c:353 |
8ada9598 JX |
2442 | #, c-format |
2443 | msgid "Maybe you wanted to say 'git add .'?\n" | |
2444 | msgstr "也许您想要执行 'git add .'?\n" | |
2445 | ||
94550ed3 JX |
2446 | #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938 |
2447 | #: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 | |
2448 | #: builtin/submodule--helper.c:40 | |
8ada9598 JX |
2449 | msgid "index file corrupt" |
2450 | msgstr "索引文件损坏" | |
2451 | ||
94550ed3 | 2452 | #: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430 |
8ada9598 JX |
2453 | msgid "Unable to write new index file" |
2454 | msgstr "无法写入新索引文件" | |
2455 | ||
94550ed3 | 2456 | #: builtin/am.c:42 |
1b7f4a34 JX |
2457 | #, c-format |
2458 | msgid "could not stat %s" | |
2459 | msgstr "不能获取 %s 的文件状态" | |
2460 | ||
94550ed3 | 2461 | #: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077 |
1b7f4a34 JX |
2462 | #, c-format |
2463 | msgid "could not read '%s'" | |
2464 | msgstr "不能读取 '%s'" | |
2465 | ||
94550ed3 | 2466 | #: builtin/am.c:445 |
1b7f4a34 JX |
2467 | msgid "could not parse author script" |
2468 | msgstr "不能解析作者脚本" | |
2469 | ||
94550ed3 | 2470 | #: builtin/am.c:522 |
1b7f4a34 JX |
2471 | #, c-format |
2472 | msgid "'%s' was deleted by the applypatch-msg hook" | |
2473 | msgstr "'%s' 被 applypatch-msg 钩子删除" | |
2474 | ||
94550ed3 | 2475 | #: builtin/am.c:563 builtin/notes.c:300 |
1b7f4a34 JX |
2476 | #, c-format |
2477 | msgid "Malformed input line: '%s'." | |
2478 | msgstr "非法的输入行:'%s'。" | |
2479 | ||
94550ed3 | 2480 | #: builtin/am.c:600 builtin/notes.c:315 |
1b7f4a34 JX |
2481 | #, c-format |
2482 | msgid "Failed to copy notes from '%s' to '%s'" | |
2483 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
2484 | ||
94550ed3 | 2485 | #: builtin/am.c:626 |
1b7f4a34 JX |
2486 | msgid "fseek failed" |
2487 | msgstr "fseek 失败" | |
2488 | ||
94550ed3 | 2489 | #: builtin/am.c:787 builtin/am.c:875 |
1b7f4a34 JX |
2490 | #, c-format |
2491 | msgid "could not open '%s' for reading: %s" | |
2492 | msgstr "无法打开 '%s' 进行读取:%s" | |
2493 | ||
94550ed3 | 2494 | #: builtin/am.c:794 |
1b7f4a34 JX |
2495 | #, c-format |
2496 | msgid "could not open '%s' for writing: %s" | |
2497 | msgstr "无法打开 '%s' 进行写入:%s" | |
2498 | ||
94550ed3 | 2499 | #: builtin/am.c:803 |
1b7f4a34 JX |
2500 | #, c-format |
2501 | msgid "could not parse patch '%s'" | |
2502 | msgstr "无法解析补丁 '%s'" | |
2503 | ||
94550ed3 | 2504 | #: builtin/am.c:868 |
1b7f4a34 JX |
2505 | msgid "Only one StGIT patch series can be applied at once" |
2506 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
2507 | ||
94550ed3 | 2508 | #: builtin/am.c:916 |
1b7f4a34 JX |
2509 | msgid "invalid timestamp" |
2510 | msgstr "无效的时间戳" | |
2511 | ||
94550ed3 | 2512 | #: builtin/am.c:919 builtin/am.c:927 |
1b7f4a34 JX |
2513 | msgid "invalid Date line" |
2514 | msgstr "无效的日期行" | |
2515 | ||
94550ed3 | 2516 | #: builtin/am.c:924 |
1b7f4a34 JX |
2517 | msgid "invalid timezone offset" |
2518 | msgstr "无效的时区偏移值" | |
2519 | ||
94550ed3 | 2520 | #: builtin/am.c:1011 |
1b7f4a34 JX |
2521 | msgid "Patch format detection failed." |
2522 | msgstr "补丁格式检测失败。" | |
2523 | ||
94550ed3 | 2524 | #: builtin/am.c:1016 builtin/clone.c:373 |
1b7f4a34 JX |
2525 | #, c-format |
2526 | msgid "failed to create directory '%s'" | |
2527 | msgstr "无法创建目录 '%s'" | |
2528 | ||
94550ed3 | 2529 | #: builtin/am.c:1020 |
1b7f4a34 JX |
2530 | msgid "Failed to split patches." |
2531 | msgstr "无法拆分补丁。" | |
2532 | ||
94550ed3 | 2533 | #: builtin/am.c:1152 builtin/commit.c:363 |
1b7f4a34 JX |
2534 | msgid "unable to write index file" |
2535 | msgstr "无法写入索引文件" | |
2536 | ||
94550ed3 | 2537 | #: builtin/am.c:1203 |
1b7f4a34 JX |
2538 | #, c-format |
2539 | msgid "When you have resolved this problem, run \"%s --continue\"." | |
2540 | msgstr "当您解决这一问题,执行 \"%s --continue\"。" | |
2541 | ||
94550ed3 | 2542 | #: builtin/am.c:1204 |
1b7f4a34 JX |
2543 | #, c-format |
2544 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." | |
2545 | msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。" | |
2546 | ||
94550ed3 | 2547 | #: builtin/am.c:1205 |
1b7f4a34 JX |
2548 | #, c-format |
2549 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." | |
2550 | msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。" | |
2551 | ||
94550ed3 | 2552 | #: builtin/am.c:1343 |
1b7f4a34 JX |
2553 | msgid "Patch is empty. Was it split wrong?" |
2554 | msgstr "补丁为空。是不是切分错误?" | |
2555 | ||
89f80d72 | 2556 | #: builtin/am.c:1417 builtin/log.c:1347 |
1b7f4a34 JX |
2557 | #, c-format |
2558 | msgid "invalid ident line: %s" | |
2559 | msgstr "包含无效的身份标识:%s" | |
2560 | ||
94550ed3 | 2561 | #: builtin/am.c:1444 |
1b7f4a34 JX |
2562 | #, c-format |
2563 | msgid "unable to parse commit %s" | |
2564 | msgstr "不能解析提交 %s" | |
2565 | ||
94550ed3 | 2566 | #: builtin/am.c:1646 |
1b7f4a34 JX |
2567 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
2568 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
2569 | ||
94550ed3 | 2570 | #: builtin/am.c:1648 |
1b7f4a34 JX |
2571 | msgid "Using index info to reconstruct a base tree..." |
2572 | msgstr "使用索引来重建一个(三方合并的)基础目录树..." | |
2573 | ||
94550ed3 | 2574 | #: builtin/am.c:1667 |
1b7f4a34 JX |
2575 | msgid "" |
2576 | "Did you hand edit your patch?\n" | |
2577 | "It does not apply to blobs recorded in its index." | |
2578 | msgstr "" | |
2579 | "您是否曾手动编辑过您的补丁?\n" | |
2580 | "无法应用补丁到索引中的数据对象上。" | |
2581 | ||
94550ed3 | 2582 | #: builtin/am.c:1673 |
1b7f4a34 JX |
2583 | msgid "Falling back to patching base and 3-way merge..." |
2584 | msgstr "回落到基础版本上打补丁及进行三方合并..." | |
2585 | ||
94550ed3 | 2586 | #: builtin/am.c:1688 |
1b7f4a34 JX |
2587 | msgid "Failed to merge in the changes." |
2588 | msgstr "无法合并变更。" | |
2589 | ||
94550ed3 | 2590 | #: builtin/am.c:1712 builtin/merge.c:632 |
1b7f4a34 JX |
2591 | msgid "git write-tree failed to write a tree" |
2592 | msgstr "git write-tree 无法写入一树对象" | |
2593 | ||
94550ed3 | 2594 | #: builtin/am.c:1719 |
1b7f4a34 JX |
2595 | msgid "applying to an empty history" |
2596 | msgstr "正应用到一个空历史上" | |
2597 | ||
94550ed3 | 2598 | #: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829 |
1b7f4a34 JX |
2599 | #: builtin/merge.c:854 |
2600 | msgid "failed to write commit object" | |
2601 | msgstr "无法写提交对象" | |
2602 | ||
94550ed3 | 2603 | #: builtin/am.c:1764 builtin/am.c:1768 |
1b7f4a34 JX |
2604 | #, c-format |
2605 | msgid "cannot resume: %s does not exist." | |
2606 | msgstr "无法继续:%s 不存在。" | |
2607 | ||
94550ed3 | 2608 | #: builtin/am.c:1784 |
1b7f4a34 JX |
2609 | msgid "cannot be interactive without stdin connected to a terminal." |
2610 | msgstr "标准输入没有和终端关联,不能进行交互式操作。" | |
2611 | ||
94550ed3 | 2612 | #: builtin/am.c:1789 |
1b7f4a34 JX |
2613 | msgid "Commit Body is:" |
2614 | msgstr "提交内容为:" | |
2615 | ||
2616 | # 译者:注意保持句尾空格 | |
2617 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] | |
2618 | #. in your translation. The program will only accept English | |
2619 | #. input at this point. | |
2620 | #. | |
94550ed3 | 2621 | #: builtin/am.c:1799 |
1b7f4a34 JX |
2622 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " |
2623 | msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:" | |
2624 | ||
94550ed3 | 2625 | #: builtin/am.c:1849 |
1b7f4a34 JX |
2626 | #, c-format |
2627 | msgid "Dirty index: cannot apply patches (dirty: %s)" | |
2628 | msgstr "脏索引:不能应用补丁(脏文件:%s)" | |
2629 | ||
94550ed3 | 2630 | #: builtin/am.c:1884 builtin/am.c:1955 |
1b7f4a34 JX |
2631 | #, c-format |
2632 | msgid "Applying: %.*s" | |
2633 | msgstr "应用:%.*s" | |
2634 | ||
94550ed3 | 2635 | #: builtin/am.c:1900 |
1b7f4a34 JX |
2636 | msgid "No changes -- Patch already applied." |
2637 | msgstr "没有变更 —— 补丁已经应用过。" | |
2638 | ||
94550ed3 | 2639 | #: builtin/am.c:1908 |
1b7f4a34 JX |
2640 | #, c-format |
2641 | msgid "Patch failed at %s %.*s" | |
2642 | msgstr "打补丁失败于 %s %.*s" | |
2643 | ||
94550ed3 | 2644 | #: builtin/am.c:1914 |
1b7f4a34 JX |
2645 | #, c-format |
2646 | msgid "The copy of the patch that failed is found in: %s" | |
2647 | msgstr "失败的补丁文件副本位于:%s" | |
2648 | ||
94550ed3 | 2649 | #: builtin/am.c:1958 |
1b7f4a34 JX |
2650 | msgid "" |
2651 | "No changes - did you forget to use 'git add'?\n" | |
2652 | "If there is nothing left to stage, chances are that something else\n" | |
2653 | "already introduced the same changes; you might want to skip this patch." | |
2654 | msgstr "" | |
2655 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
2656 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
2657 | "您也许想要跳过这个补丁。" | |
2658 | ||
94550ed3 | 2659 | #: builtin/am.c:1965 |
1b7f4a34 JX |
2660 | msgid "" |
2661 | "You still have unmerged paths in your index.\n" | |
2662 | "Did you forget to use 'git add'?" | |
2663 | msgstr "" | |
2664 | "您的索引中仍有未合并的路径。\n" | |
2665 | "您是否忘了执行 'git add'?" | |
2666 | ||
94550ed3 | 2667 | #: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308 |
1b7f4a34 JX |
2668 | #: builtin/reset.c:316 |
2669 | #, c-format | |
2670 | msgid "Could not parse object '%s'." | |
2671 | msgstr "不能解析对象 '%s'。" | |
2672 | ||
94550ed3 | 2673 | #: builtin/am.c:2125 |
1b7f4a34 JX |
2674 | msgid "failed to clean index" |
2675 | msgstr "无法清空索引" | |
2676 | ||
94550ed3 | 2677 | #: builtin/am.c:2159 |
1b7f4a34 JX |
2678 | msgid "" |
2679 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
2680 | "Not rewinding to ORIG_HEAD" | |
2681 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" | |
2682 | ||
94550ed3 | 2683 | #: builtin/am.c:2220 |
1b7f4a34 JX |
2684 | #, c-format |
2685 | msgid "Invalid value for --patch-format: %s" | |
2686 | msgstr "无效的 --patch-format 值:%s" | |
2687 | ||
94550ed3 JX |
2688 | #: builtin/am.c:2253 |
2689 | msgid "git am [<options>] [(<mbox>|<Maildir>)...]" | |
2690 | msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]" | |
1b7f4a34 | 2691 | |
94550ed3 JX |
2692 | #: builtin/am.c:2254 |
2693 | msgid "git am [<options>] (--continue | --skip | --abort)" | |
2694 | msgstr "git am [<选项>] (--continue | --skip | --abort)" | |
1b7f4a34 | 2695 | |
94550ed3 | 2696 | #: builtin/am.c:2260 |
1b7f4a34 JX |
2697 | msgid "run interactively" |
2698 | msgstr "以交互式方式运行" | |
2699 | ||
94550ed3 | 2700 | #: builtin/am.c:2262 |
1b7f4a34 JX |
2701 | msgid "historical option -- no-op" |
2702 | msgstr "老的参数 —— 无作用" | |
2703 | ||
94550ed3 | 2704 | #: builtin/am.c:2264 |
1b7f4a34 JX |
2705 | msgid "allow fall back on 3way merging if needed" |
2706 | msgstr "如果必要,允许使用三方合并。" | |
2707 | ||
94550ed3 | 2708 | #: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57 |
1b7f4a34 JX |
2709 | #: builtin/repack.c:171 |
2710 | msgid "be quiet" | |
2711 | msgstr "静默模式" | |
2712 | ||
94550ed3 | 2713 | #: builtin/am.c:2267 |
1b7f4a34 JX |
2714 | msgid "add a Signed-off-by line to the commit message" |
2715 | msgstr "在提交说明中添加一个 Signed-off-by 签名" | |
2716 | ||
94550ed3 | 2717 | #: builtin/am.c:2270 |
1b7f4a34 JX |
2718 | msgid "recode into utf8 (default)" |
2719 | msgstr "使用 utf8 字符集(默认)" | |
2720 | ||
94550ed3 | 2721 | #: builtin/am.c:2272 |
1b7f4a34 JX |
2722 | msgid "pass -k flag to git-mailinfo" |
2723 | msgstr "向 git-mailinfo 传递 -k 参数" | |
2724 | ||
94550ed3 | 2725 | #: builtin/am.c:2274 |
1b7f4a34 JX |
2726 | msgid "pass -b flag to git-mailinfo" |
2727 | msgstr "向 git-mailinfo 传递 -b 参数" | |
2728 | ||
94550ed3 | 2729 | #: builtin/am.c:2276 |
1b7f4a34 JX |
2730 | msgid "pass -m flag to git-mailinfo" |
2731 | msgstr "向 git-mailinfo 传递 -m 参数" | |
2732 | ||
94550ed3 | 2733 | #: builtin/am.c:2278 |
1b7f4a34 JX |
2734 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" |
2735 | msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数" | |
2736 | ||
94550ed3 | 2737 | #: builtin/am.c:2281 |
1b7f4a34 JX |
2738 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" |
2739 | msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置" | |
2740 | ||
94550ed3 | 2741 | #: builtin/am.c:2284 |
1b7f4a34 JX |
2742 | msgid "strip everything before a scissors line" |
2743 | msgstr "丢弃裁切线前的所有内容" | |
2744 | ||
94550ed3 | 2745 | #: builtin/am.c:2285 builtin/apply.c:4554 |
1b7f4a34 JX |
2746 | msgid "action" |
2747 | msgstr "动作" | |
2748 | ||
94550ed3 JX |
2749 | #: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295 |
2750 | #: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307 | |
2751 | #: builtin/am.c:2313 | |
1b7f4a34 JX |
2752 | msgid "pass it through git-apply" |
2753 | msgstr "传递给 git-apply" | |
2754 | ||
94550ed3 | 2755 | #: builtin/am.c:2294 builtin/apply.c:4578 |
1b7f4a34 JX |
2756 | msgid "root" |
2757 | msgstr "根目录" | |
2758 | ||
94550ed3 JX |
2759 | #: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516 |
2760 | #: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93 | |
2761 | #: builtin/pull.c:167 builtin/submodule--helper.c:78 | |
2762 | #: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 | |
1b7f4a34 JX |
2763 | msgid "path" |
2764 | msgstr "路径" | |
2765 | ||
94550ed3 JX |
2766 | #: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 |
2767 | #: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127 | |
2768 | #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645 | |
2769 | #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 | |
2770 | #: parse-options.h:134 parse-options.h:244 | |
1b7f4a34 JX |
2771 | msgid "n" |
2772 | msgstr "n" | |
2773 | ||
94550ed3 | 2774 | #: builtin/am.c:2306 builtin/apply.c:4522 |
1b7f4a34 JX |
2775 | msgid "num" |
2776 | msgstr "数字" | |
2777 | ||
94550ed3 JX |
2778 | #: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438 |
2779 | #: builtin/tag.c:372 | |
1b7f4a34 JX |
2780 | msgid "format" |
2781 | msgstr "格式" | |
2782 | ||
94550ed3 | 2783 | #: builtin/am.c:2310 |
1b7f4a34 JX |
2784 | msgid "format the patch(es) are in" |
2785 | msgstr "补丁的格式" | |
2786 | ||
94550ed3 | 2787 | #: builtin/am.c:2316 |
1b7f4a34 JX |
2788 | msgid "override error message when patch failure occurs" |
2789 | msgstr "打补丁失败时显示的错误信息" | |
2790 | ||
94550ed3 | 2791 | #: builtin/am.c:2318 |
1b7f4a34 JX |
2792 | msgid "continue applying patches after resolving a conflict" |
2793 | msgstr "冲突解决后继续应用补丁" | |
2794 | ||
94550ed3 | 2795 | #: builtin/am.c:2321 |
1b7f4a34 JX |
2796 | msgid "synonyms for --continue" |
2797 | msgstr "和 --continue 同义" | |
2798 | ||
94550ed3 | 2799 | #: builtin/am.c:2324 |
1b7f4a34 JX |
2800 | msgid "skip the current patch" |
2801 | msgstr "跳过当前补丁" | |
2802 | ||
94550ed3 | 2803 | #: builtin/am.c:2327 |
1b7f4a34 JX |
2804 | msgid "restore the original branch and abort the patching operation." |
2805 | msgstr "恢复原始分支并终止打补丁操作。" | |
2806 | ||
94550ed3 | 2807 | #: builtin/am.c:2331 |
1b7f4a34 JX |
2808 | msgid "lie about committer date" |
2809 | msgstr "将作者日期作为提交日期" | |
2810 | ||
94550ed3 | 2811 | #: builtin/am.c:2333 |
1b7f4a34 JX |
2812 | msgid "use current timestamp for author date" |
2813 | msgstr "用当前时间作为作者日期" | |
2814 | ||
94550ed3 JX |
2815 | #: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225 |
2816 | #: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355 | |
1b7f4a34 JX |
2817 | msgid "key-id" |
2818 | msgstr "key-id" | |
2819 | ||
94550ed3 | 2820 | #: builtin/am.c:2336 |
1b7f4a34 JX |
2821 | msgid "GPG-sign commits" |
2822 | msgstr "使用 GPG 签名提交" | |
2823 | ||
94550ed3 | 2824 | #: builtin/am.c:2339 |
1b7f4a34 JX |
2825 | msgid "(internal use for git-rebase)" |
2826 | msgstr "(内部使用,用于 git-rebase)" | |
2827 | ||
94550ed3 | 2828 | #: builtin/am.c:2354 |
1b7f4a34 JX |
2829 | msgid "" |
2830 | "The -b/--binary option has been a no-op for long time, and\n" | |
2831 | "it will be removed. Please do not use it anymore." | |
2832 | msgstr "" | |
2833 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n" | |
2834 | "请不要再使用它了。" | |
2835 | ||
94550ed3 | 2836 | #: builtin/am.c:2361 |
1b7f4a34 JX |
2837 | msgid "failed to read the index" |
2838 | msgstr "无法读取索引" | |
2839 | ||
94550ed3 | 2840 | #: builtin/am.c:2376 |
1b7f4a34 JX |
2841 | #, c-format |
2842 | msgid "previous rebase directory %s still exists but mbox given." | |
2843 | msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。" | |
2844 | ||
94550ed3 | 2845 | #: builtin/am.c:2400 |
1b7f4a34 JX |
2846 | #, c-format |
2847 | msgid "" | |
2848 | "Stray %s directory found.\n" | |
2849 | "Use \"git am --abort\" to remove it." | |
2850 | msgstr "" | |
2851 | "发现了错误的 %s 目录。\n" | |
2852 | "使用 \"git am --abort\" 删除它。" | |
2853 | ||
94550ed3 | 2854 | #: builtin/am.c:2406 |
1b7f4a34 JX |
2855 | msgid "Resolve operation not in progress, we are not resuming." |
2856 | msgstr "解决操作未进行,我们不会继续。" | |
2857 | ||
814ff314 JX |
2858 | #: builtin/apply.c:59 |
2859 | msgid "git apply [<options>] [<patch>...]" | |
2860 | msgstr "git apply [<选项>] [<补丁>...]" | |
8ada9598 | 2861 | |
94550ed3 | 2862 | #: builtin/apply.c:111 |
81809b99 | 2863 | #, c-format |
8ada9598 | 2864 | msgid "unrecognized whitespace option '%s'" |
81809b99 | 2865 | msgstr "未能识别的空白字符选项 '%s'" |
8ada9598 | 2866 | |
94550ed3 | 2867 | #: builtin/apply.c:126 |
81809b99 | 2868 | #, c-format |
8ada9598 | 2869 | msgid "unrecognized whitespace ignore option '%s'" |
81809b99 | 2870 | msgstr "未能识别的空白字符忽略选项 '%s'" |
8ada9598 | 2871 | |
94550ed3 | 2872 | #: builtin/apply.c:818 |
8ada9598 JX |
2873 | #, c-format |
2874 | msgid "Cannot prepare timestamp regexp %s" | |
81809b99 | 2875 | msgstr "无法准备时间戳正则表达式 %s" |
8ada9598 | 2876 | |
94550ed3 | 2877 | #: builtin/apply.c:827 |
8ada9598 JX |
2878 | #, c-format |
2879 | msgid "regexec returned %d for input: %s" | |
81809b99 | 2880 | msgstr "regexec 返回 %d,输入为:%s" |
8ada9598 | 2881 | |
94550ed3 | 2882 | #: builtin/apply.c:908 |
81809b99 | 2883 | #, c-format |
8ada9598 | 2884 | msgid "unable to find filename in patch at line %d" |
81809b99 | 2885 | msgstr "不能在补丁的第 %d 行找到文件名" |
8ada9598 | 2886 | |
94550ed3 | 2887 | #: builtin/apply.c:940 |
8ada9598 JX |
2888 | #, c-format |
2889 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" | |
9aafc933 | 2890 | msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" |
8ada9598 | 2891 | |
94550ed3 | 2892 | #: builtin/apply.c:944 |
8ada9598 JX |
2893 | #, c-format |
2894 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" | |
81809b99 | 2895 | msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" |
8ada9598 | 2896 | |
94550ed3 | 2897 | #: builtin/apply.c:945 |
8ada9598 JX |
2898 | #, c-format |
2899 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" | |
81809b99 | 2900 | msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" |
8ada9598 | 2901 | |
94550ed3 | 2902 | #: builtin/apply.c:952 |
8ada9598 JX |
2903 | #, c-format |
2904 | msgid "git apply: bad git-diff - expected /dev/null on line %d" | |
9aafc933 | 2905 | msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" |
8ada9598 | 2906 | |
94550ed3 | 2907 | #: builtin/apply.c:1415 |
8ada9598 JX |
2908 | #, c-format |
2909 | msgid "recount: unexpected line: %.*s" | |
81809b99 | 2910 | msgstr "recount:意外的行:%.*s" |
8ada9598 | 2911 | |
94550ed3 | 2912 | #: builtin/apply.c:1472 |
8ada9598 JX |
2913 | #, c-format |
2914 | msgid "patch fragment without header at line %d: %.*s" | |
81809b99 | 2915 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" |
8ada9598 | 2916 | |
94550ed3 | 2917 | #: builtin/apply.c:1489 |
8ada9598 JX |
2918 | #, c-format |
2919 | msgid "" | |
2920 | "git diff header lacks filename information when removing %d leading pathname " | |
2921 | "component (line %d)" | |
2922 | msgid_plural "" | |
2923 | "git diff header lacks filename information when removing %d leading pathname " | |
2924 | "components (line %d)" | |
5ae481e0 JX |
2925 | msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" |
2926 | msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
8ada9598 | 2927 | |
94550ed3 | 2928 | #: builtin/apply.c:1655 |
8ada9598 | 2929 | msgid "new file depends on old contents" |
81809b99 | 2930 | msgstr "新文件依赖旧内容" |
8ada9598 | 2931 | |
94550ed3 | 2932 | #: builtin/apply.c:1657 |
8ada9598 | 2933 | msgid "deleted file still has contents" |
81809b99 | 2934 | msgstr "删除的文件仍有内容" |
8ada9598 | 2935 | |
94550ed3 | 2936 | #: builtin/apply.c:1683 |
8ada9598 JX |
2937 | #, c-format |
2938 | msgid "corrupt patch at line %d" | |
195febda | 2939 | msgstr "补丁在第 %d 行损坏" |
8ada9598 | 2940 | |
94550ed3 | 2941 | #: builtin/apply.c:1719 |
8ada9598 JX |
2942 | #, c-format |
2943 | msgid "new file %s depends on old contents" | |
81809b99 | 2944 | msgstr "新文件 %s 依赖旧内容" |
8ada9598 | 2945 | |
94550ed3 | 2946 | #: builtin/apply.c:1721 |
8ada9598 JX |
2947 | #, c-format |
2948 | msgid "deleted file %s still has contents" | |
81809b99 | 2949 | msgstr "删除的文件 %s 仍有内容" |
8ada9598 | 2950 | |
94550ed3 | 2951 | #: builtin/apply.c:1724 |
8ada9598 JX |
2952 | #, c-format |
2953 | msgid "** warning: file %s becomes empty but is not deleted" | |
81809b99 | 2954 | msgstr "** 警告:文件 %s 成为空文件但并未删除" |
8ada9598 | 2955 | |
94550ed3 | 2956 | #: builtin/apply.c:1870 |
8ada9598 JX |
2957 | #, c-format |
2958 | msgid "corrupt binary patch at line %d: %.*s" | |
81809b99 | 2959 | msgstr "二进制补丁在第 %d 行损坏:%.*s" |
8ada9598 | 2960 | |
94550ed3 | 2961 | #: builtin/apply.c:1899 |
8ada9598 JX |
2962 | #, c-format |
2963 | msgid "unrecognized binary patch at line %d" | |
81809b99 | 2964 | msgstr "未能识别的二进制补丁位于第 %d 行" |
8ada9598 | 2965 | |
94550ed3 | 2966 | #: builtin/apply.c:2050 |
8ada9598 JX |
2967 | #, c-format |
2968 | msgid "patch with only garbage at line %d" | |
81809b99 | 2969 | msgstr "补丁文件的第 %d 行只有垃圾数据" |
8ada9598 | 2970 | |
94550ed3 | 2971 | #: builtin/apply.c:2140 |
81809b99 | 2972 | #, c-format |
8ada9598 | 2973 | msgid "unable to read symlink %s" |
81809b99 | 2974 | msgstr "无法读取符号链接 %s" |
8ada9598 | 2975 | |
94550ed3 | 2976 | #: builtin/apply.c:2144 |
81809b99 | 2977 | #, c-format |
8ada9598 | 2978 | msgid "unable to open or read %s" |
81809b99 | 2979 | msgstr "不能打开或读取 %s" |
8ada9598 | 2980 | |
94550ed3 | 2981 | #: builtin/apply.c:2777 |
81809b99 | 2982 | #, c-format |
8ada9598 | 2983 | msgid "invalid start of line: '%c'" |
81809b99 | 2984 | msgstr "无效的行首字符:'%c'" |
8ada9598 | 2985 | |
94550ed3 | 2986 | #: builtin/apply.c:2896 |
8ada9598 JX |
2987 | #, c-format |
2988 | msgid "Hunk #%d succeeded at %d (offset %d line)." | |
2989 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." | |
07432cef WS |
2990 | msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" |
2991 | msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
8ada9598 | 2992 | |
94550ed3 | 2993 | #: builtin/apply.c:2908 |
8ada9598 JX |
2994 | #, c-format |
2995 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" | |
81809b99 | 2996 | msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" |
8ada9598 | 2997 | |
94550ed3 | 2998 | #: builtin/apply.c:2914 |
8ada9598 JX |
2999 | #, c-format |
3000 | msgid "" | |
3001 | "while searching for:\n" | |
3002 | "%.*s" | |
3003 | msgstr "" | |
81809b99 JX |
3004 | "当查询:\n" |
3005 | "%.*s" | |
8ada9598 | 3006 | |
94550ed3 | 3007 | #: builtin/apply.c:2934 |
8ada9598 JX |
3008 | #, c-format |
3009 | msgid "missing binary patch data for '%s'" | |
81809b99 | 3010 | msgstr "缺失 '%s' 的二进制补丁数据" |
8ada9598 | 3011 | |
94550ed3 | 3012 | #: builtin/apply.c:3035 |
8ada9598 JX |
3013 | #, c-format |
3014 | msgid "binary patch does not apply to '%s'" | |
81809b99 | 3015 | msgstr "二进制补丁未应用到 '%s'" |
8ada9598 | 3016 | |
94550ed3 | 3017 | #: builtin/apply.c:3041 |
8ada9598 JX |
3018 | #, c-format |
3019 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" | |
9aafc933 | 3020 | msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" |
8ada9598 | 3021 | |
94550ed3 | 3022 | #: builtin/apply.c:3062 |
8ada9598 JX |
3023 | #, c-format |
3024 | msgid "patch failed: %s:%ld" | |
81809b99 | 3025 | msgstr "打补丁失败:%s:%ld" |
8ada9598 | 3026 | |
94550ed3 | 3027 | #: builtin/apply.c:3186 |
8ada9598 | 3028 | #, c-format |
23ff3338 JX |
3029 | msgid "cannot checkout %s" |
3030 | msgstr "不能检出 %s" | |
8ada9598 | 3031 | |
94550ed3 | 3032 | #: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 |
81809b99 | 3033 | #, c-format |
8ada9598 | 3034 | msgid "read of %s failed" |
81809b99 | 3035 | msgstr "读取 %s 失败" |
8ada9598 | 3036 | |
94550ed3 | 3037 | #: builtin/apply.c:3239 |
814ff314 JX |
3038 | #, c-format |
3039 | msgid "reading from '%s' beyond a symbolic link" | |
3040 | msgstr "读取位于符号链接中的 '%s'" | |
3041 | ||
94550ed3 | 3042 | #: builtin/apply.c:3267 builtin/apply.c:3489 |
81809b99 | 3043 | #, c-format |
23ff3338 JX |
3044 | msgid "path %s has been renamed/deleted" |
3045 | msgstr "路径 %s 已经被重命名/删除" | |
8ada9598 | 3046 | |
94550ed3 | 3047 | #: builtin/apply.c:3348 builtin/apply.c:3503 |
8ada9598 | 3048 | #, c-format |
23ff3338 JX |
3049 | msgid "%s: does not exist in index" |
3050 | msgstr "%s:不存在于索引中" | |
8ada9598 | 3051 | |
94550ed3 | 3052 | #: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 |
81809b99 | 3053 | #, c-format |
8ada9598 | 3054 | msgid "%s: %s" |
81809b99 | 3055 | msgstr "%s:%s" |
8ada9598 | 3056 | |
94550ed3 | 3057 | #: builtin/apply.c:3357 builtin/apply.c:3511 |
81809b99 | 3058 | #, c-format |
8ada9598 | 3059 | msgid "%s: does not match index" |
81809b99 | 3060 | msgstr "%s:和索引不匹配" |
8ada9598 | 3061 | |
94550ed3 | 3062 | #: builtin/apply.c:3459 |
23ff3338 JX |
3063 | msgid "removal patch leaves file contents" |
3064 | msgstr "移除补丁仍留下了文件内容" | |
3065 | ||
94550ed3 | 3066 | #: builtin/apply.c:3528 |
8ada9598 JX |
3067 | #, c-format |
3068 | msgid "%s: wrong type" | |
81809b99 | 3069 | msgstr "%s:错误类型" |
8ada9598 | 3070 | |
94550ed3 | 3071 | #: builtin/apply.c:3530 |
8ada9598 JX |
3072 | #, c-format |
3073 | msgid "%s has type %o, expected %o" | |
9aafc933 | 3074 | msgstr "%s 的类型是 %o,应为 %o" |
8ada9598 | 3075 | |
94550ed3 | 3076 | #: builtin/apply.c:3689 builtin/apply.c:3691 |
814ff314 JX |
3077 | #, c-format |
3078 | msgid "invalid path '%s'" | |
3079 | msgstr "无效路径 '%s'" | |
3080 | ||
94550ed3 | 3081 | #: builtin/apply.c:3746 |
81809b99 | 3082 | #, c-format |
8ada9598 | 3083 | msgid "%s: already exists in index" |
81809b99 | 3084 | msgstr "%s:已经存在于索引中" |
8ada9598 | 3085 | |
94550ed3 | 3086 | #: builtin/apply.c:3749 |
23ff3338 JX |
3087 | #, c-format |
3088 | msgid "%s: already exists in working directory" | |
3089 | msgstr "%s:已经存在于工作区中" | |
3090 | ||
94550ed3 | 3091 | #: builtin/apply.c:3769 |
d691f479 JX |
3092 | #, c-format |
3093 | msgid "new mode (%o) of %s does not match old mode (%o)" | |
3094 | msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" | |
8ada9598 | 3095 | |
94550ed3 | 3096 | #: builtin/apply.c:3774 |
8ada9598 | 3097 | #, c-format |
d691f479 JX |
3098 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
3099 | msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" | |
3100 | ||
94550ed3 | 3101 | #: builtin/apply.c:3794 |
814ff314 JX |
3102 | #, c-format |
3103 | msgid "affected file '%s' is beyond a symbolic link" | |
3104 | msgstr "受影响的文件 '%s' 位于符号链接中" | |
3105 | ||
94550ed3 | 3106 | #: builtin/apply.c:3798 |
d691f479 | 3107 | #, c-format |
8ada9598 | 3108 | msgid "%s: patch does not apply" |
81809b99 | 3109 | msgstr "%s:补丁未应用" |
8ada9598 | 3110 | |
94550ed3 | 3111 | #: builtin/apply.c:3812 |
8ada9598 JX |
3112 | #, c-format |
3113 | msgid "Checking patch %s..." | |
81809b99 | 3114 | msgstr "检查补丁 %s..." |
8ada9598 | 3115 | |
94550ed3 | 3116 | #: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 |
8ada9598 JX |
3117 | #, c-format |
3118 | msgid "make_cache_entry failed for path '%s'" | |
3119 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" | |
3120 | ||
94550ed3 | 3121 | #: builtin/apply.c:4048 |
81809b99 | 3122 | #, c-format |
8ada9598 | 3123 | msgid "unable to remove %s from index" |
81809b99 | 3124 | msgstr "不能从索引中移除 %s" |
8ada9598 | 3125 | |
94550ed3 | 3126 | #: builtin/apply.c:4077 |
8ada9598 | 3127 | #, c-format |
2e8451e8 JX |
3128 | msgid "corrupt patch for submodule %s" |
3129 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 3130 | |
94550ed3 | 3131 | #: builtin/apply.c:4081 |
81809b99 | 3132 | #, c-format |
8ada9598 | 3133 | msgid "unable to stat newly created file '%s'" |
81809b99 | 3134 | msgstr "不能枚举新建文件 '%s' 的状态" |
8ada9598 | 3135 | |
94550ed3 | 3136 | #: builtin/apply.c:4086 |
8ada9598 JX |
3137 | #, c-format |
3138 | msgid "unable to create backing store for newly created file %s" | |
81809b99 | 3139 | msgstr "不能为新建文件 %s 创建后端存储" |
8ada9598 | 3140 | |
94550ed3 | 3141 | #: builtin/apply.c:4089 builtin/apply.c:4197 |
81809b99 | 3142 | #, c-format |
8ada9598 | 3143 | msgid "unable to add cache entry for %s" |
81809b99 | 3144 | msgstr "无法为 %s 添加缓存条目" |
8ada9598 | 3145 | |
94550ed3 | 3146 | #: builtin/apply.c:4122 |
81809b99 | 3147 | #, c-format |
8ada9598 | 3148 | msgid "closing file '%s'" |
81809b99 | 3149 | msgstr "关闭文件 '%s'" |
8ada9598 | 3150 | |
94550ed3 | 3151 | #: builtin/apply.c:4171 |
81809b99 | 3152 | #, c-format |
8ada9598 | 3153 | msgid "unable to write file '%s' mode %o" |
81809b99 | 3154 | msgstr "不能写文件 '%s' 权限 %o" |
8ada9598 | 3155 | |
94550ed3 | 3156 | #: builtin/apply.c:4258 |
8ada9598 JX |
3157 | #, c-format |
3158 | msgid "Applied patch %s cleanly." | |
81809b99 | 3159 | msgstr "成功应用补丁 %s。" |
8ada9598 | 3160 | |
94550ed3 | 3161 | #: builtin/apply.c:4266 |
8ada9598 | 3162 | msgid "internal error" |
81809b99 | 3163 | msgstr "内部错误" |
8ada9598 | 3164 | |
94550ed3 | 3165 | #: builtin/apply.c:4269 |
8ada9598 JX |
3166 | #, c-format |
3167 | msgid "Applying patch %%s with %d reject..." | |
3168 | msgid_plural "Applying patch %%s with %d rejects..." | |
195febda T |
3169 | msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." |
3170 | msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
8ada9598 | 3171 | |
94550ed3 | 3172 | #: builtin/apply.c:4279 |
8ada9598 JX |
3173 | #, c-format |
3174 | msgid "truncating .rej filename to %.*s.rej" | |
81809b99 | 3175 | msgstr "截短 .rej 文件名为 %.*s.rej" |
8ada9598 | 3176 | |
94550ed3 | 3177 | #: builtin/apply.c:4300 |
8ada9598 JX |
3178 | #, c-format |
3179 | msgid "Hunk #%d applied cleanly." | |
81809b99 | 3180 | msgstr "第 #%d 个片段成功应用。" |
8ada9598 | 3181 | |
94550ed3 | 3182 | #: builtin/apply.c:4303 |
8ada9598 JX |
3183 | #, c-format |
3184 | msgid "Rejected hunk #%d." | |
81809b99 | 3185 | msgstr "拒绝第 #%d 个片段。" |
8ada9598 | 3186 | |
94550ed3 | 3187 | #: builtin/apply.c:4393 |
8ada9598 | 3188 | msgid "unrecognized input" |
81809b99 | 3189 | msgstr "未能识别的输入" |
8ada9598 | 3190 | |
94550ed3 | 3191 | #: builtin/apply.c:4404 |
8ada9598 | 3192 | msgid "unable to read index file" |
81809b99 | 3193 | msgstr "无法读取索引文件" |
8ada9598 | 3194 | |
94550ed3 | 3195 | #: builtin/apply.c:4517 |
8ada9598 | 3196 | msgid "don't apply changes matching the given path" |
81809b99 | 3197 | msgstr "不要应用与给出路径向匹配的变更" |
8ada9598 | 3198 | |
94550ed3 | 3199 | #: builtin/apply.c:4520 |
8ada9598 | 3200 | msgid "apply changes matching the given path" |
81809b99 | 3201 | msgstr "应用与给出路径向匹配的变更" |
8ada9598 | 3202 | |
94550ed3 | 3203 | #: builtin/apply.c:4523 |
8ada9598 | 3204 | msgid "remove <num> leading slashes from traditional diff paths" |
07432cef | 3205 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" |
8ada9598 | 3206 | |
94550ed3 | 3207 | #: builtin/apply.c:4526 |
8ada9598 | 3208 | msgid "ignore additions made by the patch" |
81809b99 | 3209 | msgstr "忽略补丁中的添加的文件" |
8ada9598 | 3210 | |
94550ed3 | 3211 | #: builtin/apply.c:4528 |
8ada9598 | 3212 | msgid "instead of applying the patch, output diffstat for the input" |
81809b99 | 3213 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" |
8ada9598 | 3214 | |
94550ed3 | 3215 | #: builtin/apply.c:4532 |
ef317cd5 | 3216 | msgid "show number of added and deleted lines in decimal notation" |
07432cef | 3217 | msgstr "以十进制数显示添加和删除的行数" |
8ada9598 | 3218 | |
94550ed3 | 3219 | #: builtin/apply.c:4534 |
8ada9598 | 3220 | msgid "instead of applying the patch, output a summary for the input" |
81809b99 | 3221 | msgstr "不应用补丁,而是显示输入的概要" |
8ada9598 | 3222 | |
94550ed3 | 3223 | #: builtin/apply.c:4536 |
8ada9598 | 3224 | msgid "instead of applying the patch, see if the patch is applicable" |
81809b99 | 3225 | msgstr "不应用补丁,而是查看补丁是否可应用" |
8ada9598 | 3226 | |
94550ed3 | 3227 | #: builtin/apply.c:4538 |
8ada9598 | 3228 | msgid "make sure the patch is applicable to the current index" |
81809b99 | 3229 | msgstr "确认补丁可以应用到当前索引" |
8ada9598 | 3230 | |
94550ed3 | 3231 | #: builtin/apply.c:4540 |
8ada9598 | 3232 | msgid "apply a patch without touching the working tree" |
81809b99 | 3233 | msgstr "应用补丁而不修改工作区" |
8ada9598 | 3234 | |
94550ed3 | 3235 | #: builtin/apply.c:4542 |
814ff314 JX |
3236 | msgid "accept a patch that touches outside the working area" |
3237 | msgstr "接受修改工作区之外文件的补丁" | |
3238 | ||
94550ed3 | 3239 | #: builtin/apply.c:4544 |
8ada9598 | 3240 | msgid "also apply the patch (use with --stat/--summary/--check)" |
195febda | 3241 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" |
8ada9598 | 3242 | |
94550ed3 | 3243 | #: builtin/apply.c:4546 |
23ff3338 | 3244 | msgid "attempt three-way merge if a patch does not apply" |
160fb2b2 | 3245 | msgstr "如果一个补丁不能应用则尝试三方合并" |
23ff3338 | 3246 | |
94550ed3 | 3247 | #: builtin/apply.c:4548 |
8ada9598 | 3248 | msgid "build a temporary index based on embedded index information" |
81809b99 | 3249 | msgstr "创建一个临时索引基于嵌入的索引信息" |
8ada9598 | 3250 | |
94550ed3 | 3251 | #: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412 |
8ada9598 | 3252 | msgid "paths are separated with NUL character" |
81809b99 | 3253 | msgstr "路径以 NUL 字符分隔" |
8ada9598 | 3254 | |
94550ed3 | 3255 | #: builtin/apply.c:4553 |
8ada9598 | 3256 | msgid "ensure at least <n> lines of context match" |
81809b99 | 3257 | msgstr "确保至少匹配 <n> 行上下文" |
8ada9598 | 3258 | |
94550ed3 | 3259 | #: builtin/apply.c:4555 |
8ada9598 | 3260 | msgid "detect new or modified lines that have whitespace errors" |
81809b99 | 3261 | msgstr "检查新增和修改的行中间的空白字符滥用" |
8ada9598 | 3262 | |
94550ed3 | 3263 | #: builtin/apply.c:4558 builtin/apply.c:4561 |
8ada9598 | 3264 | msgid "ignore changes in whitespace when finding context" |
81809b99 | 3265 | msgstr "查找上下文时忽略空白字符的变更" |
8ada9598 | 3266 | |
94550ed3 | 3267 | #: builtin/apply.c:4564 |
8ada9598 | 3268 | msgid "apply the patch in reverse" |
81809b99 | 3269 | msgstr "反向应用补丁" |
8ada9598 | 3270 | |
94550ed3 | 3271 | #: builtin/apply.c:4566 |
8ada9598 | 3272 | msgid "don't expect at least one line of context" |
81809b99 | 3273 | msgstr "无需至少一行上下文" |
8ada9598 | 3274 | |
94550ed3 | 3275 | #: builtin/apply.c:4568 |
8ada9598 | 3276 | msgid "leave the rejected hunks in corresponding *.rej files" |
81809b99 | 3277 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" |
8ada9598 | 3278 | |
94550ed3 | 3279 | #: builtin/apply.c:4570 |
8ada9598 | 3280 | msgid "allow overlapping hunks" |
81809b99 | 3281 | msgstr "允许重叠的补丁片段" |
8ada9598 | 3282 | |
94550ed3 | 3283 | #: builtin/apply.c:4573 |
8ada9598 | 3284 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
195febda | 3285 | msgstr "允许不正确的文件末尾换行符" |
c04f5ac3 | 3286 | |
94550ed3 | 3287 | #: builtin/apply.c:4576 |
8ada9598 | 3288 | msgid "do not trust the line counts in the hunk headers" |
81809b99 | 3289 | msgstr "不信任补丁片段的头信息中的行号" |
c04f5ac3 | 3290 | |
94550ed3 | 3291 | #: builtin/apply.c:4579 |
8ada9598 | 3292 | msgid "prepend <root> to all filenames" |
81809b99 | 3293 | msgstr "为所有文件名前添加 <根目录>" |
c04f5ac3 | 3294 | |
94550ed3 | 3295 | #: builtin/apply.c:4601 |
23ff3338 | 3296 | msgid "--3way outside a repository" |
160fb2b2 | 3297 | msgstr "--3way 在一个仓库之外" |
23ff3338 | 3298 | |
94550ed3 | 3299 | #: builtin/apply.c:4609 |
8ada9598 | 3300 | msgid "--index outside a repository" |
160fb2b2 | 3301 | msgstr "--index 在一个仓库之外" |
c04f5ac3 | 3302 | |
94550ed3 | 3303 | #: builtin/apply.c:4612 |
8ada9598 | 3304 | msgid "--cached outside a repository" |
160fb2b2 | 3305 | msgstr "--cached 在一个仓库之外" |
c04f5ac3 | 3306 | |
94550ed3 | 3307 | #: builtin/apply.c:4631 |
81809b99 | 3308 | #, c-format |
8ada9598 | 3309 | msgid "can't open patch '%s'" |
81809b99 | 3310 | msgstr "不能打开补丁 '%s'" |
c04f5ac3 | 3311 | |
94550ed3 | 3312 | #: builtin/apply.c:4645 |
c04f5ac3 | 3313 | #, c-format |
8ada9598 JX |
3314 | msgid "squelched %d whitespace error" |
3315 | msgid_plural "squelched %d whitespace errors" | |
81809b99 | 3316 | msgstr[0] "抑制下仍有 %d 个空白字符误用" |
5ae481e0 | 3317 | msgstr[1] "抑制下仍有 %d 个空白字符误用" |
c04f5ac3 | 3318 | |
94550ed3 | 3319 | #: builtin/apply.c:4651 builtin/apply.c:4661 |
8ada9598 JX |
3320 | #, c-format |
3321 | msgid "%d line adds whitespace errors." | |
3322 | msgid_plural "%d lines add whitespace errors." | |
81809b99 | 3323 | msgstr[0] "%d 行有空白字符误用。" |
5ae481e0 | 3324 | msgstr[1] "%d 行有空白字符误用。" |
c04f5ac3 JX |
3325 | |
3326 | #: builtin/archive.c:17 | |
3327 | #, c-format | |
3328 | msgid "could not create archive file '%s'" | |
90e6ef53 | 3329 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
3330 | |
3331 | #: builtin/archive.c:20 | |
3332 | msgid "could not redirect output" | |
195febda | 3333 | msgstr "不能重定向输出" |
c04f5ac3 JX |
3334 | |
3335 | #: builtin/archive.c:37 | |
3336 | msgid "git archive: Remote with no URL" | |
4375c10e | 3337 | msgstr "git archive:未提供远程 URL" |
c04f5ac3 JX |
3338 | |
3339 | #: builtin/archive.c:58 | |
3340 | msgid "git archive: expected ACK/NAK, got EOF" | |
4375c10e | 3341 | msgstr "git archive:应为 ACK/NACK,却得到 EOF" |
c04f5ac3 | 3342 | |
1003b3a5 | 3343 | #: builtin/archive.c:61 |
c04f5ac3 JX |
3344 | #, c-format |
3345 | msgid "git archive: NACK %s" | |
90e6ef53 | 3346 | msgstr "git archive:NACK %s" |
c04f5ac3 | 3347 | |
1003b3a5 | 3348 | #: builtin/archive.c:63 |
c04f5ac3 JX |
3349 | #, c-format |
3350 | msgid "remote error: %s" | |
3351 | msgstr "远程错误:%s" | |
3352 | ||
1003b3a5 | 3353 | #: builtin/archive.c:64 |
c04f5ac3 | 3354 | msgid "git archive: protocol error" |
90e6ef53 | 3355 | msgstr "git archive:协议错误" |
c04f5ac3 | 3356 | |
1003b3a5 | 3357 | #: builtin/archive.c:68 |
c04f5ac3 | 3358 | msgid "git archive: expected a flush" |
195febda | 3359 | msgstr "git archive:应为刷新" |
c04f5ac3 | 3360 | |
ef317cd5 JX |
3361 | #: builtin/bisect--helper.c:7 |
3362 | msgid "git bisect--helper --next-all [--no-checkout]" | |
07432cef | 3363 | msgstr "git bisect--helper --next-all [--no-checkout]" |
ef317cd5 JX |
3364 | |
3365 | #: builtin/bisect--helper.c:17 | |
3366 | msgid "perform 'git bisect next'" | |
07432cef | 3367 | msgstr "执行 'git bisect next'" |
ef317cd5 JX |
3368 | |
3369 | #: builtin/bisect--helper.c:19 | |
3370 | msgid "update BISECT_HEAD instead of checking out the current commit" | |
07432cef | 3371 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
ef317cd5 | 3372 | |
1b7f4a34 | 3373 | #: builtin/blame.c:32 |
7aea43ff JX |
3374 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" |
3375 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" | |
ef317cd5 | 3376 | |
1b7f4a34 | 3377 | #: builtin/blame.c:37 |
814ff314 JX |
3378 | msgid "<rev-opts> are documented in git-rev-list(1)" |
3379 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" | |
ef317cd5 | 3380 | |
94550ed3 | 3381 | #: builtin/blame.c:2519 |
ef317cd5 | 3382 | msgid "Show blame entries as we find them, incrementally" |
07432cef | 3383 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 3384 | |
94550ed3 | 3385 | #: builtin/blame.c:2520 |
ef317cd5 | 3386 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
07432cef | 3387 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
ef317cd5 | 3388 | |
94550ed3 | 3389 | #: builtin/blame.c:2521 |
ef317cd5 | 3390 | msgid "Do not treat root commits as boundaries (Default: off)" |
07432cef | 3391 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 3392 | |
94550ed3 | 3393 | #: builtin/blame.c:2522 |
ef317cd5 | 3394 | msgid "Show work cost statistics" |
07432cef | 3395 | msgstr "显示命令消耗统计" |
ef317cd5 | 3396 | |
94550ed3 | 3397 | #: builtin/blame.c:2523 |
ef317cd5 | 3398 | msgid "Show output score for blame entries" |
07432cef | 3399 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
ef317cd5 | 3400 | |
94550ed3 | 3401 | #: builtin/blame.c:2524 |
ef317cd5 | 3402 | msgid "Show original filename (Default: auto)" |
07432cef | 3403 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 3404 | |
94550ed3 | 3405 | #: builtin/blame.c:2525 |
ef317cd5 | 3406 | msgid "Show original linenumber (Default: off)" |
07432cef | 3407 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 3408 | |
94550ed3 | 3409 | #: builtin/blame.c:2526 |
ef317cd5 | 3410 | msgid "Show in a format designed for machine consumption" |
07432cef | 3411 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 3412 | |
94550ed3 | 3413 | #: builtin/blame.c:2527 |
ef317cd5 | 3414 | msgid "Show porcelain format with per-line commit information" |
07432cef | 3415 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 3416 | |
94550ed3 | 3417 | #: builtin/blame.c:2528 |
ef317cd5 | 3418 | msgid "Use the same output mode as git-annotate (Default: off)" |
07432cef | 3419 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 3420 | |
94550ed3 | 3421 | #: builtin/blame.c:2529 |
ef317cd5 | 3422 | msgid "Show raw timestamp (Default: off)" |
07432cef | 3423 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 3424 | |
94550ed3 | 3425 | #: builtin/blame.c:2530 |
ef317cd5 | 3426 | msgid "Show long commit SHA1 (Default: off)" |
4375c10e | 3427 | msgstr "显示长的 SHA1 提交号(默认:关闭)" |
ef317cd5 | 3428 | |
94550ed3 | 3429 | #: builtin/blame.c:2531 |
ef317cd5 | 3430 | msgid "Suppress author name and timestamp (Default: off)" |
07432cef | 3431 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 3432 | |
94550ed3 | 3433 | #: builtin/blame.c:2532 |
ef317cd5 | 3434 | msgid "Show author email instead of name (Default: off)" |
07432cef | 3435 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 3436 | |
94550ed3 | 3437 | #: builtin/blame.c:2533 |
ef317cd5 | 3438 | msgid "Ignore whitespace differences" |
07432cef | 3439 | msgstr "忽略空白差异" |
ef317cd5 | 3440 | |
94550ed3 | 3441 | #: builtin/blame.c:2534 |
ef317cd5 | 3442 | msgid "Spend extra cycles to find better match" |
07432cef | 3443 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 3444 | |
94550ed3 | 3445 | #: builtin/blame.c:2535 |
ef317cd5 | 3446 | msgid "Use revisions from <file> instead of calling git-rev-list" |
d9d56b23 | 3447 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 3448 | |
94550ed3 | 3449 | #: builtin/blame.c:2536 |
ef317cd5 | 3450 | msgid "Use <file>'s contents as the final image" |
d9d56b23 | 3451 | msgstr "使用 <文件> 的内容作为最终的图片" |
ef317cd5 | 3452 | |
94550ed3 | 3453 | #: builtin/blame.c:2537 builtin/blame.c:2538 |
ef317cd5 | 3454 | msgid "score" |
07432cef | 3455 | msgstr "得分" |
ef317cd5 | 3456 | |
94550ed3 | 3457 | #: builtin/blame.c:2537 |
ef317cd5 | 3458 | msgid "Find line copies within and across files" |
07432cef | 3459 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 3460 | |
94550ed3 | 3461 | #: builtin/blame.c:2538 |
ef317cd5 | 3462 | msgid "Find line movements within and across files" |
07432cef | 3463 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 3464 | |
94550ed3 | 3465 | #: builtin/blame.c:2539 |
ef317cd5 | 3466 | msgid "n,m" |
07432cef | 3467 | msgstr "n,m" |
ef317cd5 | 3468 | |
94550ed3 | 3469 | #: builtin/blame.c:2539 |
ef317cd5 | 3470 | msgid "Process only line range n,m, counting from 1" |
07432cef | 3471 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
ef317cd5 | 3472 | |
6c94aba5 JX |
3473 | #. TRANSLATORS: This string is used to tell us the maximum |
3474 | #. display width for a relative timestamp in "git blame" | |
3475 | #. output. For C locale, "4 years, 11 months ago", which | |
3476 | #. takes 22 places, is the longest among various forms of | |
3477 | #. relative timestamps, but your language may need more or | |
3478 | #. fewer display columns. | |
94550ed3 | 3479 | #: builtin/blame.c:2620 |
6c94aba5 JX |
3480 | msgid "4 years, 11 months ago" |
3481 | msgstr "4 年 11 个月前" | |
3482 | ||
94550ed3 | 3483 | #: builtin/branch.c:25 |
814ff314 JX |
3484 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
3485 | msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" | |
ef317cd5 | 3486 | |
94550ed3 | 3487 | #: builtin/branch.c:26 |
814ff314 JX |
3488 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
3489 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" | |
ef317cd5 | 3490 | |
94550ed3 | 3491 | #: builtin/branch.c:27 |
814ff314 JX |
3492 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
3493 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." | |
ef317cd5 | 3494 | |
94550ed3 | 3495 | #: builtin/branch.c:28 |
814ff314 JX |
3496 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
3497 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" | |
ef317cd5 | 3498 | |
94550ed3 JX |
3499 | #: builtin/branch.c:29 |
3500 | msgid "git branch [<options>] [-r | -a] [--points-at]" | |
3501 | msgstr "git branch [<选项>] [-r | -a] [--points-at]" | |
3502 | ||
90e6ef53 | 3503 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
94550ed3 | 3504 | #: builtin/branch.c:142 |
c04f5ac3 JX |
3505 | #, c-format |
3506 | msgid "" | |
3507 | "deleting branch '%s' that has been merged to\n" | |
3508 | " '%s', but not yet merged to HEAD." | |
3509 | msgstr "" | |
70fc47bf | 3510 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
3511 | " '%s',但未合并到 HEAD。" |
3512 | ||
90e6ef53 | 3513 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
94550ed3 | 3514 | #: builtin/branch.c:146 |
c04f5ac3 JX |
3515 | #, c-format |
3516 | msgid "" | |
3517 | "not deleting branch '%s' that is not yet merged to\n" | |
3518 | " '%s', even though it is merged to HEAD." | |
3519 | msgstr "" | |
70fc47bf T |
3520 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
3521 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 3522 | |
94550ed3 | 3523 | #: builtin/branch.c:160 |
07432cef WS |
3524 | #, c-format |
3525 | msgid "Couldn't look up commit object for '%s'" | |
3526 | msgstr "无法查询 '%s' 指向的提交对象" | |
3527 | ||
94550ed3 | 3528 | #: builtin/branch.c:164 |
07432cef WS |
3529 | #, c-format |
3530 | msgid "" | |
3531 | "The branch '%s' is not fully merged.\n" | |
3532 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
3533 | msgstr "" | |
3534 | "分支 '%s' 没有完全合并。\n" | |
3535 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
3536 | ||
94550ed3 | 3537 | #: builtin/branch.c:177 |
07432cef WS |
3538 | msgid "Update of config-file failed" |
3539 | msgstr "无法更新 config 文件" | |
3540 | ||
94550ed3 | 3541 | #: builtin/branch.c:205 |
c04f5ac3 | 3542 | msgid "cannot use -a with -d" |
649900bc | 3543 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 3544 | |
94550ed3 | 3545 | #: builtin/branch.c:211 |
c04f5ac3 JX |
3546 | msgid "Couldn't look up commit object for HEAD" |
3547 | msgstr "无法查询 HEAD 指向的提交对象" | |
3548 | ||
94550ed3 | 3549 | #: builtin/branch.c:219 |
c04f5ac3 JX |
3550 | #, c-format |
3551 | msgid "Cannot delete the branch '%s' which you are currently on." | |
3552 | msgstr "无法删除您当前所在的分支 '%s'。" | |
3553 | ||
94550ed3 | 3554 | #: builtin/branch.c:235 |
5ae481e0 | 3555 | #, c-format |
7aea43ff JX |
3556 | msgid "remote-tracking branch '%s' not found." |
3557 | msgstr "未能找到远程跟踪分支 '%s'。" | |
c04f5ac3 | 3558 | |
94550ed3 | 3559 | #: builtin/branch.c:236 |
81809b99 | 3560 | #, c-format |
8ada9598 | 3561 | msgid "branch '%s' not found." |
81809b99 | 3562 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 3563 | |
94550ed3 | 3564 | #: builtin/branch.c:251 |
81809b99 | 3565 | #, c-format |
7aea43ff JX |
3566 | msgid "Error deleting remote-tracking branch '%s'" |
3567 | msgstr "无法删除远程跟踪分支 '%s'" | |
c04f5ac3 | 3568 | |
94550ed3 | 3569 | #: builtin/branch.c:252 |
81809b99 | 3570 | #, c-format |
8ada9598 | 3571 | msgid "Error deleting branch '%s'" |
7aea43ff | 3572 | msgstr "无法删除分支 '%s'" |
8ada9598 | 3573 | |
94550ed3 | 3574 | #: builtin/branch.c:259 |
81809b99 | 3575 | #, c-format |
7aea43ff JX |
3576 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
3577 | msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" | |
c04f5ac3 | 3578 | |
94550ed3 | 3579 | #: builtin/branch.c:260 |
81809b99 | 3580 | #, c-format |
8ada9598 | 3581 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 3582 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 3583 | |
94550ed3 | 3584 | #: builtin/branch.c:303 |
81809b99 | 3585 | #, c-format |
90314792 JX |
3586 | msgid "[%s: gone]" |
3587 | msgstr "[%s: 丢失]" | |
3588 | ||
94550ed3 | 3589 | #: builtin/branch.c:308 |
90314792 JX |
3590 | #, c-format |
3591 | msgid "[%s]" | |
3592 | msgstr "[%s]" | |
3593 | ||
94550ed3 | 3594 | #: builtin/branch.c:313 |
90314792 | 3595 | #, c-format |
8ada9598 | 3596 | msgid "[%s: behind %d]" |
81809b99 | 3597 | msgstr "[%s:落后 %d]" |
c04f5ac3 | 3598 | |
94550ed3 | 3599 | #: builtin/branch.c:315 |
81809b99 | 3600 | #, c-format |
8ada9598 | 3601 | msgid "[behind %d]" |
81809b99 | 3602 | msgstr "[落后 %d]" |
8ada9598 | 3603 | |
94550ed3 | 3604 | #: builtin/branch.c:319 |
81809b99 | 3605 | #, c-format |
8ada9598 | 3606 | msgid "[%s: ahead %d]" |
81809b99 | 3607 | msgstr "[%s:领先 %d]" |
c04f5ac3 | 3608 | |
94550ed3 | 3609 | #: builtin/branch.c:321 |
81809b99 | 3610 | #, c-format |
8ada9598 | 3611 | msgid "[ahead %d]" |
81809b99 | 3612 | msgstr "[领先 %d]" |
8ada9598 | 3613 | |
94550ed3 | 3614 | #: builtin/branch.c:324 |
81809b99 | 3615 | #, c-format |
8ada9598 | 3616 | msgid "[%s: ahead %d, behind %d]" |
81809b99 | 3617 | msgstr "[%s:领先 %d,落后 %d]" |
8ada9598 | 3618 | |
94550ed3 | 3619 | #: builtin/branch.c:327 |
81809b99 | 3620 | #, c-format |
8ada9598 | 3621 | msgid "[ahead %d, behind %d]" |
81809b99 | 3622 | msgstr "[领先 %d,落后 %d]" |
c04f5ac3 | 3623 | |
94550ed3 | 3624 | #: builtin/branch.c:340 |
a77c07d9 JX |
3625 | msgid " **** invalid ref ****" |
3626 | msgstr " **** 无效引用 ****" | |
3627 | ||
94550ed3 | 3628 | #: builtin/branch.c:366 |
1003b3a5 JX |
3629 | #, c-format |
3630 | msgid "(no branch, rebasing %s)" | |
3631 | msgstr "(非分支,正变基 %s)" | |
3632 | ||
94550ed3 | 3633 | #: builtin/branch.c:369 |
1003b3a5 JX |
3634 | #, c-format |
3635 | msgid "(no branch, bisect started on %s)" | |
3636 | msgstr "(非分支,二分查找开始于 %s)" | |
3637 | ||
94550ed3 | 3638 | #: builtin/branch.c:375 |
1003b3a5 | 3639 | #, c-format |
814ff314 JX |
3640 | msgid "(HEAD detached at %s)" |
3641 | msgstr "(头指针分离于 %s)" | |
1003b3a5 | 3642 | |
94550ed3 | 3643 | #: builtin/branch.c:378 |
814ff314 JX |
3644 | #, c-format |
3645 | msgid "(HEAD detached from %s)" | |
3646 | msgstr "(头指针分离自 %s)" | |
3647 | ||
94550ed3 | 3648 | #: builtin/branch.c:382 |
c04f5ac3 JX |
3649 | msgid "(no branch)" |
3650 | msgstr "(非分支)" | |
3651 | ||
94550ed3 | 3652 | #: builtin/branch.c:524 |
c04f5ac3 | 3653 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 3654 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 3655 | |
94550ed3 | 3656 | #: builtin/branch.c:534 |
c04f5ac3 JX |
3657 | #, c-format |
3658 | msgid "Invalid branch name: '%s'" | |
3659 | msgstr "无效的分支名:'%s'" | |
3660 | ||
94550ed3 | 3661 | #: builtin/branch.c:549 |
c04f5ac3 JX |
3662 | msgid "Branch rename failed" |
3663 | msgstr "分支重命名失败" | |
3664 | ||
94550ed3 | 3665 | #: builtin/branch.c:553 |
c04f5ac3 JX |
3666 | #, c-format |
3667 | msgid "Renamed a misnamed branch '%s' away" | |
3668 | msgstr "重命名掉一个错误命名的旧分支 '%s'" | |
3669 | ||
94550ed3 | 3670 | #: builtin/branch.c:557 |
c04f5ac3 JX |
3671 | #, c-format |
3672 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
3673 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
3674 | ||
94550ed3 | 3675 | #: builtin/branch.c:564 |
c04f5ac3 JX |
3676 | msgid "Branch is renamed, but update of config-file failed" |
3677 | msgstr "分支被重命名,但更新 config 文件失败" | |
3678 | ||
94550ed3 | 3679 | #: builtin/branch.c:587 |
81809b99 | 3680 | #, c-format |
8ada9598 | 3681 | msgid "could not write branch description template: %s" |
81809b99 | 3682 | msgstr "不能写分支描述模版:%s" |
c04f5ac3 | 3683 | |
94550ed3 | 3684 | #: builtin/branch.c:616 |
ef317cd5 | 3685 | msgid "Generic options" |
07432cef | 3686 | msgstr "通用选项" |
c04f5ac3 | 3687 | |
94550ed3 | 3688 | #: builtin/branch.c:618 |
ef317cd5 | 3689 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 3690 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 3691 | |
94550ed3 | 3692 | #: builtin/branch.c:619 |
ef317cd5 | 3693 | msgid "suppress informational messages" |
07432cef | 3694 | msgstr "不显示信息" |
8ada9598 | 3695 | |
94550ed3 | 3696 | #: builtin/branch.c:620 |
ef317cd5 | 3697 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 3698 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 3699 | |
94550ed3 | 3700 | #: builtin/branch.c:622 |
ef317cd5 | 3701 | msgid "change upstream info" |
07432cef | 3702 | msgstr "改变上游信息" |
c04f5ac3 | 3703 | |
94550ed3 | 3704 | #: builtin/branch.c:626 |
ef317cd5 | 3705 | msgid "use colored output" |
07432cef | 3706 | msgstr "使用彩色输出" |
c04f5ac3 | 3707 | |
94550ed3 | 3708 | #: builtin/branch.c:627 |
ef317cd5 | 3709 | msgid "act on remote-tracking branches" |
07432cef | 3710 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 3711 | |
94550ed3 | 3712 | #: builtin/branch.c:629 builtin/branch.c:630 |
ef317cd5 | 3713 | msgid "print only branches that contain the commit" |
07432cef | 3714 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 3715 | |
94550ed3 | 3716 | #: builtin/branch.c:633 |
ef317cd5 | 3717 | msgid "Specific git-branch actions:" |
07432cef | 3718 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 3719 | |
94550ed3 | 3720 | #: builtin/branch.c:634 |
ef317cd5 | 3721 | msgid "list both remote-tracking and local branches" |
07432cef | 3722 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 3723 | |
94550ed3 | 3724 | #: builtin/branch.c:636 |
ef317cd5 | 3725 | msgid "delete fully merged branch" |
07432cef | 3726 | msgstr "删除完全合并的分支" |
c04f5ac3 | 3727 | |
94550ed3 | 3728 | #: builtin/branch.c:637 |
ef317cd5 | 3729 | msgid "delete branch (even if not merged)" |
07432cef | 3730 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 3731 | |
94550ed3 | 3732 | #: builtin/branch.c:638 |
ef317cd5 | 3733 | msgid "move/rename a branch and its reflog" |
07432cef | 3734 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 3735 | |
94550ed3 | 3736 | #: builtin/branch.c:639 |
ef317cd5 | 3737 | msgid "move/rename a branch, even if target exists" |
07432cef | 3738 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 3739 | |
94550ed3 | 3740 | #: builtin/branch.c:640 |
ef317cd5 | 3741 | msgid "list branch names" |
07432cef | 3742 | msgstr "列出分支名" |
c04f5ac3 | 3743 | |
94550ed3 | 3744 | #: builtin/branch.c:641 |
ef317cd5 | 3745 | msgid "create the branch's reflog" |
07432cef | 3746 | msgstr "创建分支的引用日志" |
ef317cd5 | 3747 | |
94550ed3 | 3748 | #: builtin/branch.c:643 |
ef317cd5 | 3749 | msgid "edit the description for the branch" |
07432cef | 3750 | msgstr "标记分支的描述" |
ef317cd5 | 3751 | |
94550ed3 | 3752 | #: builtin/branch.c:644 |
04cb2f28 JX |
3753 | msgid "force creation, move/rename, deletion" |
3754 | msgstr "强制创建、移动/重命名、删除" | |
ef317cd5 | 3755 | |
94550ed3 JX |
3756 | #: builtin/branch.c:645 |
3757 | msgid "print only branches that are merged" | |
3758 | msgstr "只打印已经合并的分支" | |
ef317cd5 | 3759 | |
94550ed3 JX |
3760 | #: builtin/branch.c:646 |
3761 | msgid "print only branches that are not merged" | |
3762 | msgstr "只打印尚未合并的分支" | |
ef317cd5 | 3763 | |
94550ed3 | 3764 | #: builtin/branch.c:647 |
ef317cd5 | 3765 | msgid "list branches in columns" |
07432cef | 3766 | msgstr "以列的方式显示分支" |
ef317cd5 | 3767 | |
94550ed3 JX |
3768 | #: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366 |
3769 | msgid "key" | |
3770 | msgstr "key" | |
3771 | ||
3772 | #: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367 | |
3773 | msgid "field name to sort on" | |
3774 | msgstr "排序的字段名" | |
3775 | ||
3776 | #: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398 | |
3777 | #: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564 | |
3778 | #: builtin/tag.c:369 | |
3779 | msgid "object" | |
3780 | msgstr "对象" | |
3781 | ||
3782 | #: builtin/branch.c:652 | |
3783 | msgid "print only branches of the object" | |
3784 | msgstr "只打印指向该对象的分支" | |
3785 | ||
3786 | #: builtin/branch.c:670 | |
c04f5ac3 JX |
3787 | msgid "Failed to resolve HEAD as a valid ref." |
3788 | msgstr "无法将 HEAD 解析为有效引用。" | |
3789 | ||
94550ed3 | 3790 | #: builtin/branch.c:674 builtin/clone.c:697 |
c04f5ac3 | 3791 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 3792 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 3793 | |
94550ed3 | 3794 | #: builtin/branch.c:694 |
8ada9598 | 3795 | msgid "--column and --verbose are incompatible" |
81809b99 | 3796 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 3797 | |
94550ed3 | 3798 | #: builtin/branch.c:705 builtin/branch.c:747 |
a77c07d9 JX |
3799 | msgid "branch name required" |
3800 | msgstr "必须提供分支名" | |
3801 | ||
94550ed3 | 3802 | #: builtin/branch.c:723 |
a77c07d9 JX |
3803 | msgid "Cannot give description to detached HEAD" |
3804 | msgstr "不能向分离头指针提供描述" | |
3805 | ||
94550ed3 | 3806 | #: builtin/branch.c:728 |
a77c07d9 JX |
3807 | msgid "cannot edit description of more than one branch" |
3808 | msgstr "不能为一个以上的分支编辑描述" | |
3809 | ||
94550ed3 | 3810 | #: builtin/branch.c:735 |
a77c07d9 JX |
3811 | #, c-format |
3812 | msgid "No commit on branch '%s' yet." | |
3813 | msgstr "分支 '%s' 尚无提交。" | |
3814 | ||
94550ed3 | 3815 | #: builtin/branch.c:738 |
a77c07d9 JX |
3816 | #, c-format |
3817 | msgid "No branch named '%s'." | |
3818 | msgstr "没有分支 '%s'。" | |
3819 | ||
94550ed3 | 3820 | #: builtin/branch.c:753 |
a77c07d9 JX |
3821 | msgid "too many branches for a rename operation" |
3822 | msgstr "为重命名操作提供了太多的分支名" | |
3823 | ||
94550ed3 | 3824 | #: builtin/branch.c:758 |
1003b3a5 JX |
3825 | msgid "too many branches to set new upstream" |
3826 | msgstr "为设置新上游提供了太多的分支名" | |
3827 | ||
94550ed3 | 3828 | #: builtin/branch.c:762 |
1003b3a5 JX |
3829 | #, c-format |
3830 | msgid "" | |
3831 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
3832 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
3833 | ||
94550ed3 | 3834 | #: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808 |
1003b3a5 JX |
3835 | #, c-format |
3836 | msgid "no such branch '%s'" | |
3837 | msgstr "没有此分支 '%s'" | |
3838 | ||
94550ed3 | 3839 | #: builtin/branch.c:769 |
07432cef | 3840 | #, c-format |
ef317cd5 | 3841 | msgid "branch '%s' does not exist" |
07432cef | 3842 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 3843 | |
94550ed3 | 3844 | #: builtin/branch.c:781 |
1003b3a5 JX |
3845 | msgid "too many branches to unset upstream" |
3846 | msgstr "为取消上游设置操作提供了太多的分支名" | |
3847 | ||
94550ed3 | 3848 | #: builtin/branch.c:785 |
1003b3a5 JX |
3849 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
3850 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
3851 | ||
94550ed3 | 3852 | #: builtin/branch.c:791 |
ef317cd5 JX |
3853 | #, c-format |
3854 | msgid "Branch '%s' has no upstream information" | |
07432cef | 3855 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 3856 | |
94550ed3 | 3857 | #: builtin/branch.c:805 |
1003b3a5 JX |
3858 | msgid "it does not make sense to create 'HEAD' manually" |
3859 | msgstr "手工创建 'HEAD' 没有意义" | |
3860 | ||
94550ed3 | 3861 | #: builtin/branch.c:811 |
c04f5ac3 JX |
3862 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
3863 | msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" | |
3864 | ||
94550ed3 | 3865 | #: builtin/branch.c:814 |
ef317cd5 JX |
3866 | #, c-format |
3867 | msgid "" | |
3868 | "The --set-upstream flag is deprecated and will be removed. Consider using --" | |
3869 | "track or --set-upstream-to\n" | |
3870 | msgstr "" | |
07432cef | 3871 | "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" |
ef317cd5 | 3872 | |
94550ed3 | 3873 | #: builtin/branch.c:831 |
ef317cd5 JX |
3874 | #, c-format |
3875 | msgid "" | |
3876 | "\n" | |
3877 | "If you wanted to make '%s' track '%s', do this:\n" | |
3878 | "\n" | |
3879 | msgstr "" | |
07432cef WS |
3880 | "\n" |
3881 | "如果你想用 '%s' 跟踪 '%s', 这么做:\n" | |
3882 | "\n" | |
ef317cd5 | 3883 | |
94550ed3 | 3884 | #: builtin/branch.c:832 |
07432cef | 3885 | #, c-format |
ef317cd5 | 3886 | msgid " git branch -d %s\n" |
07432cef | 3887 | msgstr " git branch -d %s\n" |
ef317cd5 | 3888 | |
94550ed3 | 3889 | #: builtin/branch.c:833 |
ef317cd5 JX |
3890 | #, c-format |
3891 | msgid " git branch --set-upstream-to %s\n" | |
07432cef | 3892 | msgstr " git branch --set-upstream-to %s\n" |
ef317cd5 | 3893 | |
7aea43ff | 3894 | #: builtin/bundle.c:51 |
c04f5ac3 JX |
3895 | #, c-format |
3896 | msgid "%s is okay\n" | |
3897 | msgstr "%s 可以\n" | |
3898 | ||
7aea43ff | 3899 | #: builtin/bundle.c:64 |
c04f5ac3 | 3900 | msgid "Need a repository to create a bundle." |
160fb2b2 | 3901 | msgstr "需要一个仓库来创建包。" |
c04f5ac3 | 3902 | |
7aea43ff | 3903 | #: builtin/bundle.c:68 |
c04f5ac3 | 3904 | msgid "Need a repository to unbundle." |
160fb2b2 | 3905 | msgstr "需要一个仓库来解包。" |
c04f5ac3 | 3906 | |
1b7f4a34 | 3907 | #: builtin/cat-file.c:428 |
7aea43ff JX |
3908 | msgid "" |
3909 | "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" | |
3910 | "<type>|--textconv) <object>" | |
3911 | msgstr "" | |
3912 | "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型" | |
3913 | ">|--textconv) <对象>" | |
ef317cd5 | 3914 | |
1b7f4a34 | 3915 | #: builtin/cat-file.c:429 |
94550ed3 JX |
3916 | msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" |
3917 | msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]" | |
ef317cd5 | 3918 | |
1b7f4a34 | 3919 | #: builtin/cat-file.c:466 |
ef317cd5 | 3920 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 3921 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 3922 | |
1b7f4a34 | 3923 | #: builtin/cat-file.c:467 |
ef317cd5 | 3924 | msgid "show object type" |
07432cef | 3925 | msgstr "显示对象类型" |
ef317cd5 | 3926 | |
1b7f4a34 | 3927 | #: builtin/cat-file.c:468 |
ef317cd5 | 3928 | msgid "show object size" |
07432cef | 3929 | msgstr "显示对象大小" |
ef317cd5 | 3930 | |
1b7f4a34 | 3931 | #: builtin/cat-file.c:470 |
ef317cd5 | 3932 | msgid "exit with zero when there's no error" |
07432cef | 3933 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 3934 | |
1b7f4a34 | 3935 | #: builtin/cat-file.c:471 |
ef317cd5 | 3936 | msgid "pretty-print object's content" |
07432cef | 3937 | msgstr "美观地打印对象的内容" |
ef317cd5 | 3938 | |
1b7f4a34 | 3939 | #: builtin/cat-file.c:473 |
ef317cd5 | 3940 | msgid "for blob objects, run textconv on object's content" |
160fb2b2 | 3941 | msgstr "对于数据对象,对其内容执行 textconv" |
ef317cd5 | 3942 | |
1b7f4a34 | 3943 | #: builtin/cat-file.c:475 |
7aea43ff JX |
3944 | msgid "allow -s and -t to work with broken/corrupt objects" |
3945 | msgstr "允许 -s 和 -t 对损坏的对象生效" | |
3946 | ||
1b7f4a34 JX |
3947 | #: builtin/cat-file.c:476 |
3948 | msgid "buffer --batch output" | |
3949 | msgstr "缓冲 --batch 的输出" | |
3950 | ||
3951 | #: builtin/cat-file.c:478 | |
ef317cd5 | 3952 | msgid "show info and content of objects fed from the standard input" |
07432cef | 3953 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 3954 | |
1b7f4a34 | 3955 | #: builtin/cat-file.c:481 |
ef317cd5 | 3956 | msgid "show info about objects fed from the standard input" |
07432cef | 3957 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 | 3958 | |
1b7f4a34 | 3959 | #: builtin/cat-file.c:484 |
7aea43ff JX |
3960 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
3961 | msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)" | |
3962 | ||
1b7f4a34 JX |
3963 | #: builtin/cat-file.c:486 |
3964 | msgid "show all objects with --batch or --batch-check" | |
3965 | msgstr "使用 --batch 或 --batch-check 参数显示所有对象" | |
3966 | ||
ef317cd5 | 3967 | #: builtin/check-attr.c:11 |
814ff314 JX |
3968 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
3969 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." | |
ef317cd5 JX |
3970 | |
3971 | #: builtin/check-attr.c:12 | |
94550ed3 JX |
3972 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" |
3973 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" | |
ef317cd5 JX |
3974 | |
3975 | #: builtin/check-attr.c:19 | |
3976 | msgid "report all attributes set on file" | |
07432cef | 3977 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 JX |
3978 | |
3979 | #: builtin/check-attr.c:20 | |
3980 | msgid "use .gitattributes only from the index" | |
07432cef | 3981 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 3982 | |
7aea43ff | 3983 | #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96 |
ef317cd5 | 3984 | msgid "read file names from stdin" |
07432cef | 3985 | msgstr "从标准输入读出文件名" |
ef317cd5 | 3986 | |
a77c07d9 | 3987 | #: builtin/check-attr.c:23 builtin/check-ignore.c:24 |
90314792 JX |
3988 | msgid "terminate input and output records by a NUL character" |
3989 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 3990 | |
94550ed3 | 3991 | #: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325 |
a77c07d9 JX |
3992 | msgid "suppress progress reporting" |
3993 | msgstr "不显示进度报告" | |
3994 | ||
2e8451e8 JX |
3995 | #: builtin/check-ignore.c:26 |
3996 | msgid "show non-matching input paths" | |
3997 | msgstr "显示未匹配的输入路径" | |
3998 | ||
90314792 JX |
3999 | #: builtin/check-ignore.c:28 |
4000 | msgid "ignore index when checking" | |
4001 | msgstr "检查时忽略索引" | |
4002 | ||
4003 | #: builtin/check-ignore.c:154 | |
a77c07d9 | 4004 | msgid "cannot specify pathnames with --stdin" |
1b7f4a34 | 4005 | msgstr "不能同时指定路径及 --stdin 参数" |
a77c07d9 | 4006 | |
90314792 | 4007 | #: builtin/check-ignore.c:157 |
a77c07d9 JX |
4008 | msgid "-z only makes sense with --stdin" |
4009 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
4010 | ||
90314792 | 4011 | #: builtin/check-ignore.c:159 |
a77c07d9 JX |
4012 | msgid "no path specified" |
4013 | msgstr "未指定路径" | |
4014 | ||
90314792 | 4015 | #: builtin/check-ignore.c:163 |
a77c07d9 JX |
4016 | msgid "--quiet is only valid with a single pathname" |
4017 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
4018 | ||
90314792 | 4019 | #: builtin/check-ignore.c:165 |
a77c07d9 JX |
4020 | msgid "cannot have both --quiet and --verbose" |
4021 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
4022 | ||
90314792 | 4023 | #: builtin/check-ignore.c:168 |
2e8451e8 JX |
4024 | msgid "--non-matching is only valid with --verbose" |
4025 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
4026 | ||
4027 | #: builtin/check-mailmap.c:8 | |
814ff314 JX |
4028 | msgid "git check-mailmap [<options>] <contact>..." |
4029 | msgstr "git check-mailmap [<选项>] <联系地址>..." | |
2e8451e8 JX |
4030 | |
4031 | #: builtin/check-mailmap.c:13 | |
4032 | msgid "also read contacts from stdin" | |
4033 | msgstr "还从标准输入读取联系地址" | |
4034 | ||
4035 | #: builtin/check-mailmap.c:24 | |
4036 | #, c-format | |
4037 | msgid "unable to parse contact: %s" | |
4038 | msgstr "不能解析联系地址:%s" | |
4039 | ||
4040 | #: builtin/check-mailmap.c:47 | |
4041 | msgid "no contacts specified" | |
4042 | msgstr "未指定联系地址" | |
4043 | ||
ef317cd5 | 4044 | #: builtin/checkout-index.c:126 |
814ff314 JX |
4045 | msgid "git checkout-index [<options>] [--] [<file>...]" |
4046 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" | |
ef317cd5 | 4047 | |
6acbf033 | 4048 | #: builtin/checkout-index.c:188 |
ef317cd5 | 4049 | msgid "check out all files in the index" |
07432cef | 4050 | msgstr "检出索引区的所有文件" |
ef317cd5 | 4051 | |
6acbf033 | 4052 | #: builtin/checkout-index.c:189 |
ef317cd5 | 4053 | msgid "force overwrite of existing files" |
07432cef | 4054 | msgstr "强制覆盖现有的文件" |
ef317cd5 | 4055 | |
6acbf033 | 4056 | #: builtin/checkout-index.c:191 |
ef317cd5 | 4057 | msgid "no warning for existing files and files not in index" |
07432cef | 4058 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 | 4059 | |
6acbf033 | 4060 | #: builtin/checkout-index.c:193 |
ef317cd5 | 4061 | msgid "don't checkout new files" |
07432cef | 4062 | msgstr "不检出新文件" |
ef317cd5 | 4063 | |
6acbf033 | 4064 | #: builtin/checkout-index.c:195 |
ef317cd5 | 4065 | msgid "update stat information in the index file" |
07432cef | 4066 | msgstr "更新索引中文件的状态信息" |
ef317cd5 | 4067 | |
6acbf033 | 4068 | #: builtin/checkout-index.c:201 |
ef317cd5 | 4069 | msgid "read list of paths from the standard input" |
07432cef | 4070 | msgstr "从标准输入读取路径列表" |
ef317cd5 | 4071 | |
6acbf033 | 4072 | #: builtin/checkout-index.c:203 |
ef317cd5 | 4073 | msgid "write the content to temporary files" |
07432cef | 4074 | msgstr "将内容写入临时文件" |
ef317cd5 | 4075 | |
6acbf033 | 4076 | #: builtin/checkout-index.c:204 builtin/column.c:30 |
94550ed3 JX |
4077 | #: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 |
4078 | #: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181 | |
ef317cd5 | 4079 | msgid "string" |
07432cef | 4080 | msgstr "字符串" |
ef317cd5 | 4081 | |
6acbf033 | 4082 | #: builtin/checkout-index.c:205 |
ef317cd5 | 4083 | msgid "when creating files, prepend <string>" |
4375c10e | 4084 | msgstr "在创建文件时,在前面加上 <字符串>" |
ef317cd5 | 4085 | |
6acbf033 | 4086 | #: builtin/checkout-index.c:208 |
ef317cd5 | 4087 | msgid "copy out the files from named stage" |
07432cef | 4088 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 | 4089 | |
1b7f4a34 | 4090 | #: builtin/checkout.c:25 |
814ff314 JX |
4091 | msgid "git checkout [<options>] <branch>" |
4092 | msgstr "git checkout [<选项>] <分支>" | |
ef317cd5 | 4093 | |
1b7f4a34 | 4094 | #: builtin/checkout.c:26 |
814ff314 JX |
4095 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
4096 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." | |
ef317cd5 | 4097 | |
94550ed3 | 4098 | #: builtin/checkout.c:134 builtin/checkout.c:167 |
c04f5ac3 JX |
4099 | #, c-format |
4100 | msgid "path '%s' does not have our version" | |
4101 | msgstr "路径 '%s' 没有我们的版本" | |
4102 | ||
94550ed3 | 4103 | #: builtin/checkout.c:136 builtin/checkout.c:169 |
c04f5ac3 JX |
4104 | #, c-format |
4105 | msgid "path '%s' does not have their version" | |
4106 | msgstr "路径 '%s' 没有他们的版本" | |
4107 | ||
94550ed3 | 4108 | #: builtin/checkout.c:152 |
c04f5ac3 JX |
4109 | #, c-format |
4110 | msgid "path '%s' does not have all necessary versions" | |
4111 | msgstr "路径 '%s' 没有全部必须的版本" | |
4112 | ||
94550ed3 | 4113 | #: builtin/checkout.c:196 |
c04f5ac3 JX |
4114 | #, c-format |
4115 | msgid "path '%s' does not have necessary versions" | |
4116 | msgstr "路径 '%s' 没有必须的版本" | |
4117 | ||
94550ed3 | 4118 | #: builtin/checkout.c:213 |
c04f5ac3 JX |
4119 | #, c-format |
4120 | msgid "path '%s': cannot merge" | |
90e6ef53 | 4121 | msgstr "path '%s':无法合并" |
c04f5ac3 | 4122 | |
94550ed3 | 4123 | #: builtin/checkout.c:230 |
c04f5ac3 JX |
4124 | #, c-format |
4125 | msgid "Unable to add merge result for '%s'" | |
4126 | msgstr "无法为 '%s' 添加合并结果" | |
4127 | ||
94550ed3 JX |
4128 | #: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 |
4129 | #: builtin/checkout.c:260 | |
07432cef | 4130 | #, c-format |
ef317cd5 | 4131 | msgid "'%s' cannot be used with updating paths" |
07432cef | 4132 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 4133 | |
94550ed3 | 4134 | #: builtin/checkout.c:263 builtin/checkout.c:266 |
07432cef | 4135 | #, c-format |
ef317cd5 | 4136 | msgid "'%s' cannot be used with %s" |
07432cef | 4137 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 4138 | |
94550ed3 | 4139 | #: builtin/checkout.c:269 |
ef317cd5 JX |
4140 | #, c-format |
4141 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 4142 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 4143 | |
94550ed3 | 4144 | #: builtin/checkout.c:280 builtin/checkout.c:474 |
c04f5ac3 | 4145 | msgid "corrupt index file" |
90e6ef53 | 4146 | msgstr "损坏的索引文件" |
c04f5ac3 | 4147 | |
94550ed3 | 4148 | #: builtin/checkout.c:340 builtin/checkout.c:347 |
c04f5ac3 JX |
4149 | #, c-format |
4150 | msgid "path '%s' is unmerged" | |
4151 | msgstr "路径 '%s' 未合并" | |
4152 | ||
94550ed3 | 4153 | #: builtin/checkout.c:496 |
c04f5ac3 | 4154 | msgid "you need to resolve your current index first" |
90e6ef53 | 4155 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 4156 | |
94550ed3 | 4157 | #: builtin/checkout.c:623 |
c04f5ac3 | 4158 | #, c-format |
1b7f4a34 JX |
4159 | msgid "Can not do reflog for '%s': %s\n" |
4160 | msgstr "不能对 '%s' 执行 reflog 操作:%s\n" | |
c04f5ac3 | 4161 | |
94550ed3 | 4162 | #: builtin/checkout.c:661 |
c04f5ac3 JX |
4163 | msgid "HEAD is now at" |
4164 | msgstr "HEAD 目前位于" | |
4165 | ||
94550ed3 | 4166 | #: builtin/checkout.c:668 |
c04f5ac3 JX |
4167 | #, c-format |
4168 | msgid "Reset branch '%s'\n" | |
4169 | msgstr "重置分支 '%s'\n" | |
4170 | ||
94550ed3 | 4171 | #: builtin/checkout.c:671 |
c04f5ac3 JX |
4172 | #, c-format |
4173 | msgid "Already on '%s'\n" | |
4174 | msgstr "已经位于 '%s'\n" | |
4175 | ||
94550ed3 | 4176 | #: builtin/checkout.c:675 |
c04f5ac3 JX |
4177 | #, c-format |
4178 | msgid "Switched to and reset branch '%s'\n" | |
4179 | msgstr "切换并重置分支 '%s'\n" | |
4180 | ||
94550ed3 | 4181 | #: builtin/checkout.c:677 builtin/checkout.c:1066 |
c04f5ac3 JX |
4182 | #, c-format |
4183 | msgid "Switched to a new branch '%s'\n" | |
4184 | msgstr "切换到一个新分支 '%s'\n" | |
4185 | ||
94550ed3 | 4186 | #: builtin/checkout.c:679 |
c04f5ac3 JX |
4187 | #, c-format |
4188 | msgid "Switched to branch '%s'\n" | |
4189 | msgstr "切换到分支 '%s'\n" | |
4190 | ||
90e6ef53 | 4191 | # 译者:注意保持前导空格 |
94550ed3 | 4192 | #: builtin/checkout.c:731 |
c04f5ac3 JX |
4193 | #, c-format |
4194 | msgid " ... and %d more.\n" | |
90e6ef53 | 4195 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 | 4196 | |
94550ed3 | 4197 | #: builtin/checkout.c:737 |
c04f5ac3 JX |
4198 | #, c-format |
4199 | msgid "" | |
4200 | "Warning: you are leaving %d commit behind, not connected to\n" | |
4201 | "any of your branches:\n" | |
4202 | "\n" | |
4203 | "%s\n" | |
4204 | msgid_plural "" | |
4205 | "Warning: you are leaving %d commits behind, not connected to\n" | |
4206 | "any of your branches:\n" | |
4207 | "\n" | |
4208 | "%s\n" | |
4209 | msgstr[0] "" | |
4210 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
4211 | "\n" | |
4212 | "%s\n" | |
5ae481e0 JX |
4213 | msgstr[1] "" |
4214 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
4215 | "\n" | |
4216 | "%s\n" | |
c04f5ac3 | 4217 | |
94550ed3 | 4218 | #: builtin/checkout.c:756 |
c04f5ac3 JX |
4219 | #, c-format |
4220 | msgid "" | |
7aea43ff JX |
4221 | "If you want to keep it by creating a new branch, this may be a good time\n" |
4222 | "to do so with:\n" | |
4223 | "\n" | |
4224 | " git branch <new-branch-name> %s\n" | |
4225 | "\n" | |
4226 | msgid_plural "" | |
c04f5ac3 JX |
4227 | "If you want to keep them by creating a new branch, this may be a good time\n" |
4228 | "to do so with:\n" | |
4229 | "\n" | |
814ff314 | 4230 | " git branch <new-branch-name> %s\n" |
c04f5ac3 | 4231 | "\n" |
7aea43ff JX |
4232 | msgstr[0] "" |
4233 | "如果您想要通过创建新分支保存它,这可能是一个好时候。\n" | |
4234 | "如下操作:\n" | |
4235 | "\n" | |
4236 | " git branch <新分支名> %s\n" | |
4237 | "\n" | |
4238 | msgstr[1] "" | |
4239 | "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n" | |
c04f5ac3 JX |
4240 | "如下操作:\n" |
4241 | "\n" | |
814ff314 | 4242 | " git branch <新分支名> %s\n" |
c04f5ac3 JX |
4243 | "\n" |
4244 | ||
94550ed3 | 4245 | #: builtin/checkout.c:792 |
c04f5ac3 JX |
4246 | msgid "internal error in revision walk" |
4247 | msgstr "在版本遍历时遇到内部错误" | |
4248 | ||
94550ed3 | 4249 | #: builtin/checkout.c:796 |
c04f5ac3 JX |
4250 | msgid "Previous HEAD position was" |
4251 | msgstr "之前的 HEAD 位置是" | |
4252 | ||
94550ed3 | 4253 | #: builtin/checkout.c:823 builtin/checkout.c:1061 |
c04f5ac3 | 4254 | msgid "You are on a branch yet to be born" |
90e6ef53 | 4255 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 4256 | |
94550ed3 | 4257 | #: builtin/checkout.c:968 |
90314792 JX |
4258 | #, c-format |
4259 | msgid "only one reference expected, %d given." | |
4260 | msgstr "只要一个引用,却给出了 %d 个" | |
4261 | ||
94550ed3 | 4262 | #: builtin/checkout.c:1007 builtin/worktree.c:213 |
c04f5ac3 JX |
4263 | #, c-format |
4264 | msgid "invalid reference: %s" | |
4265 | msgstr "无效引用:%s" | |
4266 | ||
94550ed3 | 4267 | #: builtin/checkout.c:1036 |
c04f5ac3 JX |
4268 | #, c-format |
4269 | msgid "reference is not a tree: %s" | |
4270 | msgstr "引用不是一个树:%s" | |
4271 | ||
94550ed3 | 4272 | #: builtin/checkout.c:1075 |
ef317cd5 | 4273 | msgid "paths cannot be used with switching branches" |
07432cef | 4274 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 4275 | |
94550ed3 | 4276 | #: builtin/checkout.c:1078 builtin/checkout.c:1082 |
07432cef | 4277 | #, c-format |
ef317cd5 | 4278 | msgid "'%s' cannot be used with switching branches" |
07432cef | 4279 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 4280 | |
94550ed3 JX |
4281 | #: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094 |
4282 | #: builtin/checkout.c:1097 | |
07432cef | 4283 | #, c-format |
ef317cd5 | 4284 | msgid "'%s' cannot be used with '%s'" |
07432cef | 4285 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 4286 | |
94550ed3 | 4287 | #: builtin/checkout.c:1102 |
07432cef | 4288 | #, c-format |
ef317cd5 | 4289 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 4290 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 4291 | |
94550ed3 JX |
4292 | #: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83 |
4293 | #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320 | |
4294 | #: builtin/worktree.c:322 | |
ef317cd5 | 4295 | msgid "branch" |
07432cef | 4296 | msgstr "分支" |
c04f5ac3 | 4297 | |
94550ed3 | 4298 | #: builtin/checkout.c:1136 |
ef317cd5 | 4299 | msgid "create and checkout a new branch" |
07432cef | 4300 | msgstr "创建并检出一个新的分支" |
c04f5ac3 | 4301 | |
94550ed3 | 4302 | #: builtin/checkout.c:1138 |
ef317cd5 | 4303 | msgid "create/reset and checkout a branch" |
07432cef | 4304 | msgstr "创建/重置并检出一个分支" |
c04f5ac3 | 4305 | |
94550ed3 | 4306 | #: builtin/checkout.c:1139 |
ef317cd5 | 4307 | msgid "create reflog for new branch" |
07432cef | 4308 | msgstr "为新的分支创建引用日志" |
ef317cd5 | 4309 | |
94550ed3 | 4310 | #: builtin/checkout.c:1140 |
ef317cd5 | 4311 | msgid "detach the HEAD at named commit" |
07432cef | 4312 | msgstr "成为指向该提交的分离头指针" |
ef317cd5 | 4313 | |
94550ed3 | 4314 | #: builtin/checkout.c:1141 |
ef317cd5 | 4315 | msgid "set upstream info for new branch" |
07432cef | 4316 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 4317 | |
94550ed3 | 4318 | #: builtin/checkout.c:1143 |
6c94aba5 | 4319 | msgid "new-branch" |
07432cef | 4320 | msgstr "新分支" |
ef317cd5 | 4321 | |
94550ed3 | 4322 | #: builtin/checkout.c:1143 |
ef317cd5 | 4323 | msgid "new unparented branch" |
07432cef | 4324 | msgstr "新的没有父提交的分支" |
ef317cd5 | 4325 | |
94550ed3 | 4326 | #: builtin/checkout.c:1144 |
ef317cd5 | 4327 | msgid "checkout our version for unmerged files" |
07432cef | 4328 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 4329 | |
94550ed3 | 4330 | #: builtin/checkout.c:1146 |
ef317cd5 | 4331 | msgid "checkout their version for unmerged files" |
07432cef | 4332 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 4333 | |
94550ed3 | 4334 | #: builtin/checkout.c:1148 |
ef317cd5 | 4335 | msgid "force checkout (throw away local modifications)" |
07432cef | 4336 | msgstr "强制检出(丢弃本地修改)" |
c04f5ac3 | 4337 | |
94550ed3 | 4338 | #: builtin/checkout.c:1149 |
ef317cd5 | 4339 | msgid "perform a 3-way merge with the new branch" |
160fb2b2 | 4340 | msgstr "和新的分支执行三方合并" |
ef317cd5 | 4341 | |
94550ed3 | 4342 | #: builtin/checkout.c:1150 builtin/merge.c:227 |
ef317cd5 | 4343 | msgid "update ignored files (default)" |
07432cef | 4344 | msgstr "更新忽略的文件(默认)" |
c04f5ac3 | 4345 | |
89f80d72 | 4346 | #: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250 |
ef317cd5 | 4347 | msgid "style" |
07432cef | 4348 | msgstr "风格" |
ef317cd5 | 4349 | |
94550ed3 | 4350 | #: builtin/checkout.c:1152 |
ef317cd5 | 4351 | msgid "conflict style (merge or diff3)" |
07432cef | 4352 | msgstr "冲突输出风格(merge 或 diff3)" |
ef317cd5 | 4353 | |
94550ed3 | 4354 | #: builtin/checkout.c:1155 |
4dcdc3d8 JX |
4355 | msgid "do not limit pathspecs to sparse entries only" |
4356 | msgstr "对路径不做稀疏检出的限制" | |
4357 | ||
94550ed3 | 4358 | #: builtin/checkout.c:1157 |
814ff314 JX |
4359 | msgid "second guess 'git checkout <no-such-branch>'" |
4360 | msgstr "二次猜测'git checkout <无此分支>'" | |
ef317cd5 | 4361 | |
94550ed3 | 4362 | #: builtin/checkout.c:1159 |
7aea43ff JX |
4363 | msgid "do not check if another worktree is holding the given ref" |
4364 | msgstr "不检查指定的引用是否被其他工作区所占用" | |
4365 | ||
94550ed3 | 4366 | #: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112 |
89f80d72 | 4367 | #: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558 |
94550ed3 JX |
4368 | #: builtin/send-pack.c:168 |
4369 | msgid "force progress reporting" | |
4370 | msgstr "强制显示进度报告" | |
4371 | ||
4372 | #: builtin/checkout.c:1191 | |
ef317cd5 | 4373 | msgid "-b, -B and --orphan are mutually exclusive" |
07432cef | 4374 | msgstr "-b、-B 和 --orphan 是互斥的" |
ef317cd5 | 4375 | |
94550ed3 | 4376 | #: builtin/checkout.c:1208 |
ef317cd5 JX |
4377 | msgid "--track needs a branch name" |
4378 | msgstr "--track 需要一个分支名" | |
4379 | ||
94550ed3 | 4380 | #: builtin/checkout.c:1213 |
ef317cd5 JX |
4381 | msgid "Missing branch name; try -b" |
4382 | msgstr "缺少分支名;尝试 -b" | |
4383 | ||
94550ed3 | 4384 | #: builtin/checkout.c:1249 |
c04f5ac3 | 4385 | msgid "invalid path specification" |
90e6ef53 | 4386 | msgstr "无效的路径规格" |
c04f5ac3 | 4387 | |
94550ed3 | 4388 | #: builtin/checkout.c:1256 |
07432cef | 4389 | #, c-format |
c04f5ac3 | 4390 | msgid "" |
ef317cd5 | 4391 | "Cannot update paths and switch to branch '%s' at the same time.\n" |
c04f5ac3 JX |
4392 | "Did you intend to checkout '%s' which can not be resolved as commit?" |
4393 | msgstr "" | |
07432cef WS |
4394 | "不能同时更新路径并切换到分支'%s'。\n" |
4395 | "您是想要检出 '%s' 但其未能解析为提交么?" | |
c04f5ac3 | 4396 | |
94550ed3 | 4397 | #: builtin/checkout.c:1261 |
07432cef | 4398 | #, c-format |
ef317cd5 | 4399 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 4400 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 4401 | |
94550ed3 | 4402 | #: builtin/checkout.c:1265 |
c04f5ac3 JX |
4403 | msgid "" |
4404 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
4405 | "checking out of the index." | |
4406 | msgstr "" | |
90e6ef53 | 4407 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 4408 | |
1b7f4a34 | 4409 | #: builtin/clean.c:25 |
2e8451e8 JX |
4410 | msgid "" |
4411 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
4412 | msgstr "" | |
4413 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 4414 | |
1b7f4a34 | 4415 | #: builtin/clean.c:29 |
07432cef WS |
4416 | #, c-format |
4417 | msgid "Removing %s\n" | |
4418 | msgstr "正删除 %s\n" | |
4419 | ||
1b7f4a34 | 4420 | #: builtin/clean.c:30 |
07432cef WS |
4421 | #, c-format |
4422 | msgid "Would remove %s\n" | |
4423 | msgstr "将删除 %s\n" | |
4424 | ||
1b7f4a34 | 4425 | #: builtin/clean.c:31 |
07432cef WS |
4426 | #, c-format |
4427 | msgid "Skipping repository %s\n" | |
160fb2b2 | 4428 | msgstr "忽略仓库 %s\n" |
07432cef | 4429 | |
1b7f4a34 | 4430 | #: builtin/clean.c:32 |
07432cef WS |
4431 | #, c-format |
4432 | msgid "Would skip repository %s\n" | |
160fb2b2 | 4433 | msgstr "将忽略仓库 %s\n" |
07432cef | 4434 | |
1b7f4a34 | 4435 | #: builtin/clean.c:33 |
07432cef WS |
4436 | #, c-format |
4437 | msgid "failed to remove %s" | |
4438 | msgstr "无法删除 %s" | |
4439 | ||
94550ed3 | 4440 | #: builtin/clean.c:315 |
2e8451e8 JX |
4441 | msgid "" |
4442 | "Prompt help:\n" | |
4443 | "1 - select a numbered item\n" | |
4444 | "foo - select item based on unique prefix\n" | |
4445 | " - (empty) select nothing" | |
4446 | msgstr "" | |
4447 | "帮助:\n" | |
4448 | "1 - 通过编号选择一个选项\n" | |
4449 | "foo - 通过标题选择一个选项\n" | |
4450 | " - (空)什么也不选择" | |
4451 | ||
94550ed3 | 4452 | #: builtin/clean.c:319 |
2e8451e8 JX |
4453 | msgid "" |
4454 | "Prompt help:\n" | |
4455 | "1 - select a single item\n" | |
4456 | "3-5 - select a range of items\n" | |
4457 | "2-3,6-9 - select multiple ranges\n" | |
4458 | "foo - select item based on unique prefix\n" | |
4459 | "-... - unselect specified items\n" | |
4460 | "* - choose all items\n" | |
4461 | " - (empty) finish selecting" | |
4462 | msgstr "" | |
4463 | "帮助:\n" | |
4464 | "1 - 选择一个选项\n" | |
4465 | "3-5 - 选择一个范围内的所有选项\n" | |
4466 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
4467 | "foo - 通过标题选择一个选项\n" | |
4468 | "-... - 反选特定的选项\n" | |
4469 | "* - 选择所有选项\n" | |
4470 | " - (空)结束选择" | |
4471 | ||
94550ed3 | 4472 | #: builtin/clean.c:535 |
2e8451e8 JX |
4473 | #, c-format |
4474 | msgid "Huh (%s)?" | |
4475 | msgstr "嗯(%s)?" | |
4476 | ||
94550ed3 | 4477 | #: builtin/clean.c:677 |
2e8451e8 JX |
4478 | #, c-format |
4479 | msgid "Input ignore patterns>> " | |
4480 | msgstr "输入模版以排除条目>> " | |
4481 | ||
94550ed3 | 4482 | #: builtin/clean.c:714 |
2e8451e8 JX |
4483 | #, c-format |
4484 | msgid "WARNING: Cannot find items matched by: %s" | |
4485 | msgstr "警告:无法找到和 %s 匹配的条目" | |
4486 | ||
94550ed3 | 4487 | #: builtin/clean.c:735 |
2e8451e8 JX |
4488 | msgid "Select items to delete" |
4489 | msgstr "选择要删除的条目" | |
4490 | ||
814ff314 | 4491 | #. TRANSLATORS: Make sure to keep [y/N] as is |
94550ed3 | 4492 | #: builtin/clean.c:776 |
2e8451e8 | 4493 | #, c-format |
814ff314 JX |
4494 | msgid "Remove %s [y/N]? " |
4495 | msgstr "删除 %s [y/N]?" | |
2e8451e8 | 4496 | |
94550ed3 | 4497 | #: builtin/clean.c:801 |
2e8451e8 JX |
4498 | msgid "Bye." |
4499 | msgstr "再见。" | |
4500 | ||
94550ed3 | 4501 | #: builtin/clean.c:809 |
2e8451e8 JX |
4502 | msgid "" |
4503 | "clean - start cleaning\n" | |
4504 | "filter by pattern - exclude items from deletion\n" | |
4505 | "select by numbers - select items to be deleted by numbers\n" | |
4506 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
4507 | "quit - stop cleaning\n" | |
4508 | "help - this screen\n" | |
4509 | "? - help for prompt selection" | |
4510 | msgstr "" | |
4511 | "clean - 开始清理\n" | |
4512 | "filter by pattern - 通过模版排除要删除的条目\n" | |
4513 | "select by numbers - 通过数字选择要删除的条目\n" | |
4514 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
4515 | "quit - 停止删除并退出\n" | |
4516 | "help - 显示本帮助\n" | |
4517 | "? - 显示如何在提示符下选择的帮助" | |
4518 | ||
94550ed3 | 4519 | #: builtin/clean.c:836 |
2e8451e8 JX |
4520 | msgid "*** Commands ***" |
4521 | msgstr "*** 命令 ***" | |
4522 | ||
94550ed3 | 4523 | #: builtin/clean.c:837 |
2e8451e8 JX |
4524 | msgid "What now" |
4525 | msgstr "请选择" | |
4526 | ||
94550ed3 | 4527 | #: builtin/clean.c:845 |
2e8451e8 JX |
4528 | msgid "Would remove the following item:" |
4529 | msgid_plural "Would remove the following items:" | |
4530 | msgstr[0] "将删除如下条目:" | |
4531 | msgstr[1] "将删除如下条目:" | |
4532 | ||
94550ed3 | 4533 | #: builtin/clean.c:862 |
2e8451e8 JX |
4534 | msgid "No more files to clean, exiting." |
4535 | msgstr "没有要清理的文件,退出。" | |
4536 | ||
94550ed3 | 4537 | #: builtin/clean.c:893 |
ef317cd5 | 4538 | msgid "do not print names of files removed" |
07432cef | 4539 | msgstr "不打印删除文件的名称" |
ef317cd5 | 4540 | |
94550ed3 | 4541 | #: builtin/clean.c:895 |
ef317cd5 | 4542 | msgid "force" |
07432cef | 4543 | msgstr "强制" |
ef317cd5 | 4544 | |
94550ed3 | 4545 | #: builtin/clean.c:896 |
2e8451e8 JX |
4546 | msgid "interactive cleaning" |
4547 | msgstr "交互式清除" | |
4548 | ||
94550ed3 | 4549 | #: builtin/clean.c:898 |
ef317cd5 | 4550 | msgid "remove whole directories" |
07432cef | 4551 | msgstr "删除整个目录" |
ef317cd5 | 4552 | |
94550ed3 JX |
4553 | #: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709 |
4554 | #: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182 | |
ef317cd5 | 4555 | msgid "pattern" |
07432cef | 4556 | msgstr "模式" |
ef317cd5 | 4557 | |
94550ed3 | 4558 | #: builtin/clean.c:900 |
ef317cd5 | 4559 | msgid "add <pattern> to ignore rules" |
4375c10e | 4560 | msgstr "添加 <模式> 到忽略规则" |
ef317cd5 | 4561 | |
94550ed3 | 4562 | #: builtin/clean.c:901 |
ef317cd5 | 4563 | msgid "remove ignored files, too" |
07432cef | 4564 | msgstr "也删除忽略的文件" |
ef317cd5 | 4565 | |
94550ed3 | 4566 | #: builtin/clean.c:903 |
ef317cd5 | 4567 | msgid "remove only ignored files" |
07432cef | 4568 | msgstr "只删除忽略的文件" |
c04f5ac3 | 4569 | |
94550ed3 | 4570 | #: builtin/clean.c:921 |
c04f5ac3 | 4571 | msgid "-x and -X cannot be used together" |
649900bc | 4572 | msgstr "-x 和 -X 不能同时使用" |
c04f5ac3 | 4573 | |
94550ed3 | 4574 | #: builtin/clean.c:925 |
c04f5ac3 | 4575 | msgid "" |
6c94aba5 | 4576 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
2e8451e8 | 4577 | "clean" |
c04f5ac3 | 4578 | msgstr "" |
2e8451e8 | 4579 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 4580 | |
94550ed3 | 4581 | #: builtin/clean.c:928 |
c04f5ac3 | 4582 | msgid "" |
6c94aba5 | 4583 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
2e8451e8 | 4584 | "refusing to clean" |
c04f5ac3 | 4585 | msgstr "" |
2e8451e8 | 4586 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 4587 | |
220c313c | 4588 | #: builtin/clone.c:37 |
814ff314 | 4589 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
160fb2b2 | 4590 | msgstr "git clone [<选项>] [--] <仓库> [<路径>]" |
ef317cd5 | 4591 | |
7aea43ff | 4592 | #: builtin/clone.c:59 |
ef317cd5 | 4593 | msgid "don't create a checkout" |
07432cef | 4594 | msgstr "不创建一个检出" |
ef317cd5 | 4595 | |
94550ed3 | 4596 | #: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469 |
ef317cd5 | 4597 | msgid "create a bare repository" |
160fb2b2 | 4598 | msgstr "创建一个纯仓库" |
ef317cd5 | 4599 | |
7aea43ff | 4600 | #: builtin/clone.c:64 |
ef317cd5 | 4601 | msgid "create a mirror repository (implies bare)" |
160fb2b2 | 4602 | msgstr "创建一个镜像仓库(也是纯仓库)" |
ef317cd5 | 4603 | |
7aea43ff | 4604 | #: builtin/clone.c:66 |
ef317cd5 | 4605 | msgid "to clone from a local repository" |
160fb2b2 | 4606 | msgstr "从本地仓库克隆" |
ef317cd5 | 4607 | |
7aea43ff | 4608 | #: builtin/clone.c:68 |
ef317cd5 | 4609 | msgid "don't use local hardlinks, always copy" |
07432cef | 4610 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 4611 | |
7aea43ff | 4612 | #: builtin/clone.c:70 |
ef317cd5 | 4613 | msgid "setup as shared repository" |
160fb2b2 | 4614 | msgstr "设置为共享仓库" |
ef317cd5 | 4615 | |
7aea43ff | 4616 | #: builtin/clone.c:72 builtin/clone.c:74 |
ef317cd5 | 4617 | msgid "initialize submodules in the clone" |
07432cef | 4618 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 4619 | |
94550ed3 | 4620 | #: builtin/clone.c:75 builtin/init-db.c:466 |
ef317cd5 | 4621 | msgid "template-directory" |
07432cef | 4622 | msgstr "模板目录" |
ef317cd5 | 4623 | |
94550ed3 | 4624 | #: builtin/clone.c:76 builtin/init-db.c:467 |
ef317cd5 | 4625 | msgid "directory from which templates will be used" |
07432cef | 4626 | msgstr "模板目录将被使用" |
ef317cd5 | 4627 | |
94550ed3 | 4628 | #: builtin/clone.c:78 builtin/submodule--helper.c:179 |
ef317cd5 | 4629 | msgid "reference repository" |
160fb2b2 | 4630 | msgstr "参考仓库" |
ef317cd5 | 4631 | |
7aea43ff JX |
4632 | #: builtin/clone.c:80 |
4633 | msgid "use --reference only while cloning" | |
160fb2b2 | 4634 | msgstr "仅在克隆时参考 --reference 指向的本地仓库" |
7aea43ff JX |
4635 | |
4636 | #: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44 | |
ef317cd5 | 4637 | msgid "name" |
07432cef | 4638 | msgstr "名称" |
ef317cd5 | 4639 | |
7aea43ff | 4640 | #: builtin/clone.c:82 |
ef317cd5 | 4641 | msgid "use <name> instead of 'origin' to track upstream" |
4375c10e | 4642 | msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" |
ef317cd5 | 4643 | |
7aea43ff | 4644 | #: builtin/clone.c:84 |
ef317cd5 | 4645 | msgid "checkout <branch> instead of the remote's HEAD" |
4375c10e | 4646 | msgstr "检出 <分支> 而不是远程 HEAD" |
ef317cd5 | 4647 | |
7aea43ff | 4648 | #: builtin/clone.c:86 |
ef317cd5 | 4649 | msgid "path to git-upload-pack on the remote" |
07432cef | 4650 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 4651 | |
94550ed3 | 4652 | #: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654 |
1b7f4a34 | 4653 | #: builtin/pull.c:186 |
ef317cd5 | 4654 | msgid "depth" |
07432cef | 4655 | msgstr "深度" |
ef317cd5 | 4656 | |
7aea43ff | 4657 | #: builtin/clone.c:88 |
ef317cd5 | 4658 | msgid "create a shallow clone of that depth" |
07432cef | 4659 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 4660 | |
7aea43ff | 4661 | #: builtin/clone.c:90 |
ef317cd5 | 4662 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 4663 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 4664 | |
94550ed3 | 4665 | #: builtin/clone.c:91 builtin/init-db.c:475 |
ef317cd5 | 4666 | msgid "gitdir" |
07432cef | 4667 | msgstr "git目录" |
ef317cd5 | 4668 | |
94550ed3 | 4669 | #: builtin/clone.c:92 builtin/init-db.c:476 |
ef317cd5 | 4670 | msgid "separate git dir from working tree" |
07432cef | 4671 | msgstr "git目录和工作区分离" |
ef317cd5 | 4672 | |
7aea43ff | 4673 | #: builtin/clone.c:93 |
ef317cd5 | 4674 | msgid "key=value" |
07432cef | 4675 | msgstr "key=value" |
ef317cd5 | 4676 | |
7aea43ff | 4677 | #: builtin/clone.c:94 |
ef317cd5 | 4678 | msgid "set config inside the new repository" |
160fb2b2 | 4679 | msgstr "在新仓库中设置配置信息" |
ef317cd5 | 4680 | |
94550ed3 JX |
4681 | #: builtin/clone.c:300 |
4682 | #, c-format | |
4683 | msgid "reference repository '%s' as a linked checkout is not supported yet." | |
4684 | msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" | |
4685 | ||
4686 | #: builtin/clone.c:302 | |
c04f5ac3 | 4687 | #, c-format |
4dcdc3d8 | 4688 | msgid "reference repository '%s' is not a local repository." |
160fb2b2 | 4689 | msgstr "参考仓库 '%s' 不是一个本地仓库。" |
c04f5ac3 | 4690 | |
94550ed3 | 4691 | #: builtin/clone.c:307 |
cfff71a9 JX |
4692 | #, c-format |
4693 | msgid "reference repository '%s' is shallow" | |
160fb2b2 | 4694 | msgstr "参考仓库 '%s' 是一个浅克隆" |
cfff71a9 | 4695 | |
94550ed3 | 4696 | #: builtin/clone.c:310 |
cfff71a9 JX |
4697 | #, c-format |
4698 | msgid "reference repository '%s' is grafted" | |
160fb2b2 | 4699 | msgstr "参考仓库 '%s' 已被嫁接" |
cfff71a9 | 4700 | |
94550ed3 | 4701 | #: builtin/clone.c:375 builtin/diff.c:84 |
c04f5ac3 JX |
4702 | #, c-format |
4703 | msgid "failed to stat '%s'" | |
90e6ef53 | 4704 | msgstr "无法枚举 '%s' 状态" |
c04f5ac3 | 4705 | |
94550ed3 | 4706 | #: builtin/clone.c:377 |
c04f5ac3 JX |
4707 | #, c-format |
4708 | msgid "%s exists and is not a directory" | |
4709 | msgstr "%s 存在且不是一个目录" | |
4710 | ||
94550ed3 | 4711 | #: builtin/clone.c:391 |
c04f5ac3 JX |
4712 | #, c-format |
4713 | msgid "failed to stat %s\n" | |
90e6ef53 | 4714 | msgstr "无法枚举 %s 状态\n" |
c04f5ac3 | 4715 | |
94550ed3 | 4716 | #: builtin/clone.c:413 |
c04f5ac3 JX |
4717 | #, c-format |
4718 | msgid "failed to create link '%s'" | |
90e6ef53 | 4719 | msgstr "无法创建链接 '%s'" |
c04f5ac3 | 4720 | |
94550ed3 | 4721 | #: builtin/clone.c:417 |
c04f5ac3 JX |
4722 | #, c-format |
4723 | msgid "failed to copy file to '%s'" | |
90e6ef53 | 4724 | msgstr "无法拷贝文件至 '%s'" |
c04f5ac3 | 4725 | |
94550ed3 | 4726 | #: builtin/clone.c:442 builtin/clone.c:626 |
c04f5ac3 JX |
4727 | #, c-format |
4728 | msgid "done.\n" | |
4729 | msgstr "完成。\n" | |
4730 | ||
94550ed3 | 4731 | #: builtin/clone.c:454 |
1003b3a5 JX |
4732 | msgid "" |
4733 | "Clone succeeded, but checkout failed.\n" | |
4734 | "You can inspect what was checked out with 'git status'\n" | |
4735 | "and retry the checkout with 'git checkout -f HEAD'\n" | |
4736 | msgstr "" | |
4737 | "克隆成功,但是检出失败。\n" | |
4738 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
4739 | "'git checkout -f HEAD' 重试\n" | |
4740 | ||
94550ed3 | 4741 | #: builtin/clone.c:531 |
c04f5ac3 JX |
4742 | #, c-format |
4743 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 4744 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 4745 | |
94550ed3 | 4746 | #: builtin/clone.c:621 |
2e8451e8 JX |
4747 | #, c-format |
4748 | msgid "Checking connectivity... " | |
4749 | msgstr "检查连接... " | |
4750 | ||
94550ed3 | 4751 | #: builtin/clone.c:624 |
1003b3a5 JX |
4752 | msgid "remote did not send all necessary objects" |
4753 | msgstr "远程没有发送所有必须的对象" | |
4754 | ||
94550ed3 | 4755 | #: builtin/clone.c:688 |
c04f5ac3 JX |
4756 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
4757 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
4758 | ||
94550ed3 | 4759 | #: builtin/clone.c:719 |
1003b3a5 JX |
4760 | msgid "unable to checkout working tree" |
4761 | msgstr "不能检出工作区" | |
4762 | ||
94550ed3 | 4763 | #: builtin/clone.c:808 |
04cb2f28 JX |
4764 | msgid "cannot repack to clean up" |
4765 | msgstr "无法执行 repack 来清理" | |
4766 | ||
94550ed3 | 4767 | #: builtin/clone.c:810 |
04cb2f28 JX |
4768 | msgid "cannot unlink temporary alternates file" |
4769 | msgstr "无法删除临时的 alternates 文件" | |
4770 | ||
94550ed3 | 4771 | #: builtin/clone.c:842 |
c04f5ac3 JX |
4772 | msgid "Too many arguments." |
4773 | msgstr "太多参数。" | |
4774 | ||
94550ed3 | 4775 | #: builtin/clone.c:846 |
c04f5ac3 | 4776 | msgid "You must specify a repository to clone." |
160fb2b2 | 4777 | msgstr "您必须指定一个仓库来克隆。" |
c04f5ac3 | 4778 | |
94550ed3 | 4779 | #: builtin/clone.c:857 |
c04f5ac3 JX |
4780 | #, c-format |
4781 | msgid "--bare and --origin %s options are incompatible." | |
4782 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
4783 | ||
94550ed3 | 4784 | #: builtin/clone.c:860 |
07432cef WS |
4785 | msgid "--bare and --separate-git-dir are incompatible." |
4786 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
4787 | ||
94550ed3 | 4788 | #: builtin/clone.c:873 |
c04f5ac3 JX |
4789 | #, c-format |
4790 | msgid "repository '%s' does not exist" | |
160fb2b2 | 4791 | msgstr "仓库 '%s' 不存在" |
c04f5ac3 | 4792 | |
94550ed3 | 4793 | #: builtin/clone.c:879 builtin/fetch.c:1166 |
cfff71a9 JX |
4794 | #, c-format |
4795 | msgid "depth %s is not a positive number" | |
4796 | msgstr "深度 %s 不是一个正数" | |
4797 | ||
94550ed3 | 4798 | #: builtin/clone.c:889 |
c04f5ac3 JX |
4799 | #, c-format |
4800 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 4801 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 4802 | |
94550ed3 | 4803 | #: builtin/clone.c:899 |
c04f5ac3 JX |
4804 | #, c-format |
4805 | msgid "working tree '%s' already exists." | |
4806 | msgstr "工作区 '%s' 已经存在。" | |
4807 | ||
94550ed3 JX |
4808 | #: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224 |
4809 | #: builtin/worktree.c:221 builtin/worktree.c:248 | |
5bb01d4f JX |
4810 | #, c-format |
4811 | msgid "could not create leading directories of '%s'" | |
4812 | msgstr "不能为 '%s' 创建先导目录" | |
4813 | ||
94550ed3 | 4814 | #: builtin/clone.c:917 |
c04f5ac3 | 4815 | #, c-format |
814ff314 JX |
4816 | msgid "could not create work tree dir '%s'" |
4817 | msgstr "不能创建工作区目录 '%s'" | |
c04f5ac3 | 4818 | |
94550ed3 | 4819 | #: builtin/clone.c:935 |
c04f5ac3 JX |
4820 | #, c-format |
4821 | msgid "Cloning into bare repository '%s'...\n" | |
160fb2b2 | 4822 | msgstr "克隆到纯仓库 '%s'...\n" |
c04f5ac3 | 4823 | |
94550ed3 | 4824 | #: builtin/clone.c:937 |
c04f5ac3 JX |
4825 | #, c-format |
4826 | msgid "Cloning into '%s'...\n" | |
4827 | msgstr "正克隆到 '%s'...\n" | |
4828 | ||
94550ed3 | 4829 | #: builtin/clone.c:975 |
6acbf033 JX |
4830 | msgid "--depth is ignored in local clones; use file:// instead." |
4831 | msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。" | |
4832 | ||
94550ed3 | 4833 | #: builtin/clone.c:978 |
6acbf033 | 4834 | msgid "source repository is shallow, ignoring --local" |
160fb2b2 | 4835 | msgstr "源仓库是浅克隆,忽略 --local" |
6acbf033 | 4836 | |
94550ed3 | 4837 | #: builtin/clone.c:983 |
6acbf033 JX |
4838 | msgid "--local is ignored" |
4839 | msgstr "--local 被忽略" | |
4840 | ||
94550ed3 | 4841 | #: builtin/clone.c:987 |
c04f5ac3 JX |
4842 | #, c-format |
4843 | msgid "Don't know how to clone %s" | |
4844 | msgstr "不知道如何克隆 %s" | |
4845 | ||
94550ed3 | 4846 | #: builtin/clone.c:1036 builtin/clone.c:1044 |
c04f5ac3 JX |
4847 | #, c-format |
4848 | msgid "Remote branch %s not found in upstream %s" | |
4849 | msgstr "远程分支 %s 在上游 %s 未发现" | |
4850 | ||
94550ed3 | 4851 | #: builtin/clone.c:1047 |
c04f5ac3 | 4852 | msgid "You appear to have cloned an empty repository." |
160fb2b2 | 4853 | msgstr "您似乎克隆了一个空仓库。" |
c04f5ac3 | 4854 | |
ef317cd5 | 4855 | #: builtin/column.c:9 |
814ff314 JX |
4856 | msgid "git column [<options>]" |
4857 | msgstr "git column [<选项>]" | |
ef317cd5 JX |
4858 | |
4859 | #: builtin/column.c:26 | |
4860 | msgid "lookup config vars" | |
07432cef | 4861 | msgstr "查找配置变量" |
ef317cd5 JX |
4862 | |
4863 | #: builtin/column.c:27 builtin/column.c:28 | |
ef317cd5 | 4864 | msgid "layout to use" |
07432cef | 4865 | msgstr "要使用的布局" |
ef317cd5 JX |
4866 | |
4867 | #: builtin/column.c:29 | |
4868 | msgid "Maximum width" | |
07432cef | 4869 | msgstr "最大宽度" |
ef317cd5 JX |
4870 | |
4871 | #: builtin/column.c:30 | |
4872 | msgid "Padding space on left border" | |
07432cef | 4873 | msgstr "左边框的填充空间" |
ef317cd5 JX |
4874 | |
4875 | #: builtin/column.c:31 | |
4876 | msgid "Padding space on right border" | |
07432cef | 4877 | msgstr "右边框的填充空间" |
ef317cd5 JX |
4878 | |
4879 | #: builtin/column.c:32 | |
4880 | msgid "Padding space between columns" | |
07432cef | 4881 | msgstr "两列之间的填充空间" |
ef317cd5 | 4882 | |
8ada9598 JX |
4883 | #: builtin/column.c:51 |
4884 | msgid "--command must be the first argument" | |
81809b99 | 4885 | msgstr "--command 必须是第一个参数" |
8ada9598 | 4886 | |
94550ed3 | 4887 | #: builtin/commit.c:38 |
814ff314 | 4888 | msgid "git commit [<options>] [--] <pathspec>..." |
160fb2b2 | 4889 | msgstr "git commit [<选项>] [--] <路径规格>..." |
ef317cd5 | 4890 | |
94550ed3 | 4891 | #: builtin/commit.c:43 |
814ff314 | 4892 | msgid "git status [<options>] [--] <pathspec>..." |
160fb2b2 | 4893 | msgstr "git status [<选项>] [--] <路径规格>..." |
ef317cd5 | 4894 | |
94550ed3 | 4895 | #: builtin/commit.c:48 |
220c313c JX |
4896 | msgid "" |
4897 | "Your name and email address were configured automatically based\n" | |
4898 | "on your username and hostname. Please check that they are accurate.\n" | |
4899 | "You can suppress this message by setting them explicitly. Run the\n" | |
4900 | "following command and follow the instructions in your editor to edit\n" | |
4901 | "your configuration file:\n" | |
4902 | "\n" | |
4903 | " git config --global --edit\n" | |
4904 | "\n" | |
4905 | "After doing this, you may fix the identity used for this commit with:\n" | |
4906 | "\n" | |
4907 | " git commit --amend --reset-author\n" | |
4908 | msgstr "" | |
4909 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
4910 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" | |
4911 | "中编辑您的配置文件:\n" | |
4912 | "\n" | |
4913 | " git config --global --edit\n" | |
4914 | "\n" | |
4915 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
4916 | "\n" | |
4917 | " git commit --amend --reset-author\n" | |
4918 | ||
94550ed3 | 4919 | #: builtin/commit.c:61 |
c04f5ac3 JX |
4920 | msgid "" |
4921 | "Your name and email address were configured automatically based\n" | |
4922 | "on your username and hostname. Please check that they are accurate.\n" | |
4923 | "You can suppress this message by setting them explicitly:\n" | |
4924 | "\n" | |
4925 | " git config --global user.name \"Your Name\"\n" | |
4926 | " git config --global user.email you@example.com\n" | |
4927 | "\n" | |
4928 | "After doing this, you may fix the identity used for this commit with:\n" | |
4929 | "\n" | |
4930 | " git commit --amend --reset-author\n" | |
4931 | msgstr "" | |
90e6ef53 | 4932 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" |
220c313c | 4933 | "与否。您可以对其进行设置以免再出现本提示信息:\n" |
c04f5ac3 JX |
4934 | "\n" |
4935 | " git config --global user.name \"Your Name\"\n" | |
4936 | " git config --global user.email you@example.com\n" | |
4937 | "\n" | |
90e6ef53 | 4938 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" |
c04f5ac3 JX |
4939 | "\n" |
4940 | " git commit --amend --reset-author\n" | |
4941 | ||
94550ed3 | 4942 | #: builtin/commit.c:73 |
c04f5ac3 JX |
4943 | msgid "" |
4944 | "You asked to amend the most recent commit, but doing so would make\n" | |
4945 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
4946 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
4947 | msgstr "" | |
1b150dc9 T |
4948 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
4949 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 4950 | |
94550ed3 | 4951 | #: builtin/commit.c:78 |
c04f5ac3 JX |
4952 | msgid "" |
4953 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
4954 | "If you wish to commit it anyway, use:\n" | |
4955 | "\n" | |
4956 | " git commit --allow-empty\n" | |
4957 | "\n" | |
c04f5ac3 | 4958 | msgstr "" |
a9ce4543 T |
4959 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
4960 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
4961 | "\n" |
4962 | " git commit --allow-empty\n" | |
4963 | "\n" | |
c04f5ac3 | 4964 | |
94550ed3 | 4965 | #: builtin/commit.c:85 |
b1894384 JX |
4966 | msgid "Otherwise, please use 'git reset'\n" |
4967 | msgstr "否则,请使用命令 'git reset'\n" | |
4968 | ||
94550ed3 | 4969 | #: builtin/commit.c:88 |
b1894384 JX |
4970 | msgid "" |
4971 | "If you wish to skip this commit, use:\n" | |
4972 | "\n" | |
4973 | " git reset\n" | |
4974 | "\n" | |
4975 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" | |
4976 | "the remaining commits.\n" | |
4977 | msgstr "" | |
4978 | "如果您想跳过这个提交,使用命令:\n" | |
4979 | "\n" | |
4980 | " git reset\n" | |
4981 | "\n" | |
4982 | "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" | |
4983 | "操作。\n" | |
4984 | ||
94550ed3 | 4985 | #: builtin/commit.c:305 |
c04f5ac3 | 4986 | msgid "failed to unpack HEAD tree object" |
90e6ef53 | 4987 | msgstr "无法解包 HEAD 树对象" |
c04f5ac3 | 4988 | |
94550ed3 | 4989 | #: builtin/commit.c:346 |
c04f5ac3 | 4990 | msgid "unable to create temporary index" |
90e6ef53 | 4991 | msgstr "不能创建临时索引" |
c04f5ac3 | 4992 | |
94550ed3 | 4993 | #: builtin/commit.c:352 |
c04f5ac3 JX |
4994 | msgid "interactive add failed" |
4995 | msgstr "交互式添加失败" | |
4996 | ||
94550ed3 | 4997 | #: builtin/commit.c:365 |
220c313c JX |
4998 | msgid "unable to update temporary index" |
4999 | msgstr "无法更新临时索引" | |
5000 | ||
94550ed3 | 5001 | #: builtin/commit.c:367 |
220c313c JX |
5002 | msgid "Failed to update main cache tree" |
5003 | msgstr "不能更新树的主缓存" | |
5004 | ||
94550ed3 | 5005 | #: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 |
c04f5ac3 | 5006 | msgid "unable to write new_index file" |
90e6ef53 | 5007 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 5008 | |
94550ed3 | 5009 | #: builtin/commit.c:445 |
8ada9598 | 5010 | msgid "cannot do a partial commit during a merge." |
81809b99 | 5011 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 5012 | |
94550ed3 | 5013 | #: builtin/commit.c:447 |
8ada9598 | 5014 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 5015 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 5016 | |
94550ed3 | 5017 | #: builtin/commit.c:456 |
c04f5ac3 | 5018 | msgid "cannot read the index" |
90e6ef53 | 5019 | msgstr "无法读取索引" |
c04f5ac3 | 5020 | |
94550ed3 | 5021 | #: builtin/commit.c:475 |
c04f5ac3 | 5022 | msgid "unable to write temporary index file" |
90e6ef53 | 5023 | msgstr "无法写临时索引文件" |
c04f5ac3 | 5024 | |
94550ed3 | 5025 | #: builtin/commit.c:580 |
220c313c JX |
5026 | #, c-format |
5027 | msgid "commit '%s' lacks author header" | |
5028 | msgstr "提交 '%s' 缺少作者信息" | |
5029 | ||
94550ed3 | 5030 | #: builtin/commit.c:582 |
c04f5ac3 | 5031 | #, c-format |
220c313c JX |
5032 | msgid "commit '%s' has malformed author line" |
5033 | msgstr "提交 '%s' 有非法的作者信息" | |
c04f5ac3 | 5034 | |
94550ed3 | 5035 | #: builtin/commit.c:601 |
c04f5ac3 JX |
5036 | msgid "malformed --author parameter" |
5037 | msgstr "非法的 --author 参数" | |
5038 | ||
94550ed3 | 5039 | #: builtin/commit.c:609 |
c04f5ac3 | 5040 | #, c-format |
6acbf033 JX |
5041 | msgid "invalid date format: %s" |
5042 | msgstr "无效的日期格式:%s" | |
5043 | ||
94550ed3 | 5044 | #: builtin/commit.c:653 |
6acbf033 JX |
5045 | msgid "" |
5046 | "unable to select a comment character that is not used\n" | |
5047 | "in the current commit message" | |
5048 | msgstr "无法选择一个未被当前提交说明使用的注释字符" | |
5049 | ||
94550ed3 | 5050 | #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 |
c04f5ac3 JX |
5051 | #, c-format |
5052 | msgid "could not lookup commit %s" | |
5053 | msgstr "不能查询提交 %s" | |
5054 | ||
94550ed3 | 5055 | #: builtin/commit.c:702 builtin/shortlog.c:273 |
c04f5ac3 JX |
5056 | #, c-format |
5057 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 5058 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 5059 | |
94550ed3 | 5060 | #: builtin/commit.c:704 |
c04f5ac3 | 5061 | msgid "could not read log from standard input" |
90e6ef53 | 5062 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 5063 | |
94550ed3 | 5064 | #: builtin/commit.c:708 |
c04f5ac3 JX |
5065 | #, c-format |
5066 | msgid "could not read log file '%s'" | |
90e6ef53 | 5067 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 5068 | |
94550ed3 | 5069 | #: builtin/commit.c:730 |
c04f5ac3 | 5070 | msgid "could not read MERGE_MSG" |
90e6ef53 | 5071 | msgstr "不能读取 MERGE_MSG" |
c04f5ac3 | 5072 | |
94550ed3 | 5073 | #: builtin/commit.c:734 |
c04f5ac3 | 5074 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 5075 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 5076 | |
94550ed3 | 5077 | #: builtin/commit.c:785 |
c04f5ac3 | 5078 | msgid "could not write commit template" |
90e6ef53 | 5079 | msgstr "不能写提交模版" |
c04f5ac3 | 5080 | |
94550ed3 | 5081 | #: builtin/commit.c:803 |
81809b99 | 5082 | #, c-format |
c04f5ac3 JX |
5083 | msgid "" |
5084 | "\n" | |
8ada9598 | 5085 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
5086 | "If this is not correct, please remove the file\n" |
5087 | "\t%s\n" | |
5088 | "and try again.\n" | |
5089 | msgstr "" | |
5090 | "\n" | |
649900bc | 5091 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
5092 | "\t%s\n" |
5093 | "然后重试。\n" | |
5094 | ||
94550ed3 | 5095 | #: builtin/commit.c:808 |
81809b99 | 5096 | #, c-format |
8ada9598 JX |
5097 | msgid "" |
5098 | "\n" | |
5099 | "It looks like you may be committing a cherry-pick.\n" | |
5100 | "If this is not correct, please remove the file\n" | |
5101 | "\t%s\n" | |
5102 | "and try again.\n" | |
5103 | msgstr "" | |
5104 | "\n" | |
649900bc | 5105 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
5106 | "\t%s\n" |
5107 | "然后重试。\n" | |
c04f5ac3 | 5108 | |
94550ed3 | 5109 | #: builtin/commit.c:821 |
a77c07d9 | 5110 | #, c-format |
c04f5ac3 | 5111 | msgid "" |
8ada9598 | 5112 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 5113 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
c04f5ac3 | 5114 | msgstr "" |
a77c07d9 | 5115 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
81809b99 | 5116 | "说明将会终止提交。\n" |
c04f5ac3 | 5117 | |
94550ed3 | 5118 | #: builtin/commit.c:828 |
a77c07d9 | 5119 | #, c-format |
c04f5ac3 | 5120 | msgid "" |
8ada9598 | 5121 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 5122 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
c04f5ac3 JX |
5123 | "An empty message aborts the commit.\n" |
5124 | msgstr "" | |
a77c07d9 JX |
5125 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
5126 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 5127 | |
90e6ef53 | 5128 | # 译者:为保证在输出中对齐,注意调整句中空格! |
94550ed3 | 5129 | #: builtin/commit.c:848 |
6acbf033 JX |
5130 | #, c-format |
5131 | msgid "%sAuthor: %.*s <%.*s>" | |
5132 | msgstr "%s作者: %.*s <%.*s>" | |
5133 | ||
5134 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
94550ed3 | 5135 | #: builtin/commit.c:856 |
c04f5ac3 | 5136 | #, c-format |
6acbf033 JX |
5137 | msgid "%sDate: %s" |
5138 | msgstr "%s日期: %s" | |
c04f5ac3 | 5139 | |
90e6ef53 | 5140 | # 译者:为保证在输出中对齐,注意调整句中空格! |
94550ed3 | 5141 | #: builtin/commit.c:863 |
c04f5ac3 | 5142 | #, c-format |
6acbf033 JX |
5143 | msgid "%sCommitter: %.*s <%.*s>" |
5144 | msgstr "%s提交者:%.*s <%.*s>" | |
c04f5ac3 | 5145 | |
94550ed3 | 5146 | #: builtin/commit.c:881 |
c04f5ac3 | 5147 | msgid "Cannot read index" |
90e6ef53 | 5148 | msgstr "无法读取索引" |
c04f5ac3 | 5149 | |
94550ed3 | 5150 | #: builtin/commit.c:938 |
c04f5ac3 JX |
5151 | msgid "Error building trees" |
5152 | msgstr "无法创建树对象" | |
5153 | ||
94550ed3 | 5154 | #: builtin/commit.c:953 builtin/tag.c:266 |
c04f5ac3 JX |
5155 | #, c-format |
5156 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 5157 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 5158 | |
94550ed3 | 5159 | #: builtin/commit.c:1055 |
c04f5ac3 | 5160 | #, c-format |
814ff314 JX |
5161 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
5162 | msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配" | |
c04f5ac3 | 5163 | |
94550ed3 | 5164 | #: builtin/commit.c:1070 builtin/commit.c:1310 |
c04f5ac3 JX |
5165 | #, c-format |
5166 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 5167 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 5168 | |
94550ed3 | 5169 | #: builtin/commit.c:1107 |
2e8451e8 JX |
5170 | msgid "--long and -z are incompatible" |
5171 | msgstr "--long 和 -z 选项不兼容" | |
5172 | ||
94550ed3 | 5173 | #: builtin/commit.c:1137 |
c04f5ac3 JX |
5174 | msgid "Using both --reset-author and --author does not make sense" |
5175 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
5176 | ||
94550ed3 | 5177 | #: builtin/commit.c:1146 |
c04f5ac3 | 5178 | msgid "You have nothing to amend." |
90e6ef53 | 5179 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 5180 | |
94550ed3 | 5181 | #: builtin/commit.c:1149 |
8ada9598 | 5182 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 5183 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 5184 | |
94550ed3 | 5185 | #: builtin/commit.c:1151 |
8ada9598 | 5186 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 5187 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 5188 | |
94550ed3 | 5189 | #: builtin/commit.c:1154 |
c04f5ac3 | 5190 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 5191 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 5192 | |
94550ed3 | 5193 | #: builtin/commit.c:1164 |
c04f5ac3 JX |
5194 | msgid "Only one of -c/-C/-F/--fixup can be used." |
5195 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
5196 | ||
94550ed3 | 5197 | #: builtin/commit.c:1166 |
c04f5ac3 | 5198 | msgid "Option -m cannot be combined with -c/-C/-F/--fixup." |
649900bc | 5199 | msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" |
c04f5ac3 | 5200 | |
94550ed3 | 5201 | #: builtin/commit.c:1174 |
c04f5ac3 | 5202 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 5203 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 5204 | |
94550ed3 | 5205 | #: builtin/commit.c:1191 |
c04f5ac3 JX |
5206 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
5207 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
5208 | ||
94550ed3 | 5209 | #: builtin/commit.c:1193 |
c04f5ac3 JX |
5210 | msgid "No paths with --include/--only does not make sense." |
5211 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
5212 | ||
94550ed3 | 5213 | #: builtin/commit.c:1195 |
c04f5ac3 | 5214 | msgid "Clever... amending the last one with dirty index." |
160fb2b2 | 5215 | msgstr "聪明... 用脏索引修补最后一个提交。" |
c04f5ac3 | 5216 | |
94550ed3 | 5217 | #: builtin/commit.c:1197 |
6c94aba5 JX |
5218 | msgid "Explicit paths specified without -i or -o; assuming --only paths..." |
5219 | msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..." | |
c04f5ac3 | 5220 | |
94550ed3 | 5221 | #: builtin/commit.c:1209 builtin/tag.c:475 |
c04f5ac3 JX |
5222 | #, c-format |
5223 | msgid "Invalid cleanup mode %s" | |
5224 | msgstr "无效的清理模式 %s" | |
5225 | ||
94550ed3 | 5226 | #: builtin/commit.c:1214 |
c04f5ac3 | 5227 | msgid "Paths with -a does not make sense." |
649900bc | 5228 | msgstr "路径和 -a 选项同时使用没有意义。" |
c04f5ac3 | 5229 | |
94550ed3 | 5230 | #: builtin/commit.c:1324 builtin/commit.c:1605 |
ef317cd5 | 5231 | msgid "show status concisely" |
07432cef | 5232 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 5233 | |
94550ed3 | 5234 | #: builtin/commit.c:1326 builtin/commit.c:1607 |
ef317cd5 | 5235 | msgid "show branch information" |
07432cef | 5236 | msgstr "显示分支信息" |
ef317cd5 | 5237 | |
89f80d72 | 5238 | #: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544 |
94550ed3 | 5239 | #: builtin/worktree.c:423 |
ef317cd5 | 5240 | msgid "machine-readable output" |
07432cef WS |
5241 | msgstr "机器可读的输出" |
5242 | ||
94550ed3 | 5243 | #: builtin/commit.c:1331 builtin/commit.c:1611 |
07432cef WS |
5244 | msgid "show status in long format (default)" |
5245 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 5246 | |
94550ed3 | 5247 | #: builtin/commit.c:1334 builtin/commit.c:1614 |
ef317cd5 | 5248 | msgid "terminate entries with NUL" |
4375c10e | 5249 | msgstr "条目以 NUL 字符结尾" |
ef317cd5 | 5250 | |
94550ed3 JX |
5251 | #: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 |
5252 | #: builtin/fast-export.c:984 builtin/tag.c:353 | |
ef317cd5 | 5253 | msgid "mode" |
07432cef | 5254 | msgstr "模式" |
ef317cd5 | 5255 | |
94550ed3 | 5256 | #: builtin/commit.c:1337 builtin/commit.c:1617 |
ef317cd5 | 5257 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 5258 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 5259 | |
94550ed3 | 5260 | #: builtin/commit.c:1340 |
ef317cd5 | 5261 | msgid "show ignored files" |
07432cef | 5262 | msgstr "显示忽略的文件" |
ef317cd5 | 5263 | |
94550ed3 | 5264 | #: builtin/commit.c:1341 parse-options.h:155 |
ef317cd5 JX |
5265 | msgid "when" |
5266 | msgstr "何时" | |
5267 | ||
94550ed3 | 5268 | #: builtin/commit.c:1342 |
ef317cd5 JX |
5269 | msgid "" |
5270 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
5271 | "(Default: all)" | |
5272 | msgstr "" | |
07432cef | 5273 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 5274 | |
94550ed3 | 5275 | #: builtin/commit.c:1344 |
ef317cd5 | 5276 | msgid "list untracked files in columns" |
07432cef | 5277 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 5278 | |
94550ed3 | 5279 | #: builtin/commit.c:1430 |
c04f5ac3 JX |
5280 | msgid "couldn't look up newly created commit" |
5281 | msgstr "无法找到新创建的提交" | |
5282 | ||
94550ed3 | 5283 | #: builtin/commit.c:1432 |
c04f5ac3 | 5284 | msgid "could not parse newly created commit" |
90e6ef53 | 5285 | msgstr "不能解析新创建的提交" |
c04f5ac3 | 5286 | |
94550ed3 | 5287 | #: builtin/commit.c:1477 |
c04f5ac3 JX |
5288 | msgid "detached HEAD" |
5289 | msgstr "分离头指针" | |
5290 | ||
7e238ab7 | 5291 | # 译者:中文字符串拼接,可删除前导空格 |
94550ed3 | 5292 | #: builtin/commit.c:1480 |
c04f5ac3 | 5293 | msgid " (root-commit)" |
7e238ab7 | 5294 | msgstr "(根提交)" |
c04f5ac3 | 5295 | |
94550ed3 | 5296 | #: builtin/commit.c:1575 |
ef317cd5 | 5297 | msgid "suppress summary after successful commit" |
07432cef | 5298 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 5299 | |
94550ed3 | 5300 | #: builtin/commit.c:1576 |
ef317cd5 | 5301 | msgid "show diff in commit message template" |
07432cef | 5302 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 5303 | |
94550ed3 | 5304 | #: builtin/commit.c:1578 |
ef317cd5 | 5305 | msgid "Commit message options" |
07432cef | 5306 | msgstr "提交说明选项" |
c04f5ac3 | 5307 | |
94550ed3 | 5308 | #: builtin/commit.c:1579 builtin/tag.c:351 |
ef317cd5 | 5309 | msgid "read message from file" |
07432cef | 5310 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 5311 | |
94550ed3 | 5312 | #: builtin/commit.c:1580 |
ef317cd5 | 5313 | msgid "author" |
07432cef | 5314 | msgstr "作者" |
c04f5ac3 | 5315 | |
94550ed3 | 5316 | #: builtin/commit.c:1580 |
ef317cd5 | 5317 | msgid "override author for commit" |
07432cef | 5318 | msgstr "提交时覆盖作者" |
73a60cd2 | 5319 | |
94550ed3 | 5320 | #: builtin/commit.c:1581 builtin/gc.c:326 |
ef317cd5 | 5321 | msgid "date" |
07432cef | 5322 | msgstr "日期" |
c04f5ac3 | 5323 | |
94550ed3 | 5324 | #: builtin/commit.c:1581 |
ef317cd5 | 5325 | msgid "override date for commit" |
07432cef | 5326 | msgstr "提交时覆盖日期" |
c04f5ac3 | 5327 | |
94550ed3 JX |
5328 | #: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392 |
5329 | #: builtin/notes.c:555 builtin/tag.c:349 | |
ef317cd5 | 5330 | msgid "message" |
07432cef | 5331 | msgstr "说明" |
c04f5ac3 | 5332 | |
94550ed3 | 5333 | #: builtin/commit.c:1582 |
ef317cd5 | 5334 | msgid "commit message" |
07432cef | 5335 | msgstr "提交说明" |
ef317cd5 | 5336 | |
94550ed3 JX |
5337 | #: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 |
5338 | #: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 | |
5339 | msgid "commit" | |
5340 | msgstr "提交" | |
5341 | ||
5342 | #: builtin/commit.c:1583 | |
ef317cd5 | 5343 | msgid "reuse and edit message from specified commit" |
07432cef | 5344 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 5345 | |
94550ed3 | 5346 | #: builtin/commit.c:1584 |
ef317cd5 | 5347 | msgid "reuse message from specified commit" |
07432cef | 5348 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 5349 | |
94550ed3 | 5350 | #: builtin/commit.c:1585 |
ef317cd5 | 5351 | msgid "use autosquash formatted message to fixup specified commit" |
07432cef | 5352 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
ef317cd5 | 5353 | |
94550ed3 | 5354 | #: builtin/commit.c:1586 |
ef317cd5 | 5355 | msgid "use autosquash formatted message to squash specified commit" |
07432cef | 5356 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
ef317cd5 | 5357 | |
94550ed3 | 5358 | #: builtin/commit.c:1587 |
ef317cd5 | 5359 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 5360 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 5361 | |
89f80d72 | 5362 | #: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86 |
ef317cd5 | 5363 | msgid "add Signed-off-by:" |
07432cef | 5364 | msgstr "添加 Signed-off-by: 签名" |
ef317cd5 | 5365 | |
94550ed3 | 5366 | #: builtin/commit.c:1589 |
ef317cd5 | 5367 | msgid "use specified template file" |
07432cef | 5368 | msgstr "使用指定的模板文件" |
ef317cd5 | 5369 | |
94550ed3 | 5370 | #: builtin/commit.c:1590 |
ef317cd5 | 5371 | msgid "force edit of commit" |
07432cef | 5372 | msgstr "强制编辑提交" |
ef317cd5 | 5373 | |
07432cef | 5374 | # 译者:可选值,不能翻译(或是原文中笔误,应为 mode) |
94550ed3 | 5375 | #: builtin/commit.c:1591 |
ef317cd5 | 5376 | msgid "default" |
07432cef | 5377 | msgstr "default" |
ef317cd5 | 5378 | |
94550ed3 | 5379 | #: builtin/commit.c:1591 builtin/tag.c:354 |
ef317cd5 | 5380 | msgid "how to strip spaces and #comments from message" |
07432cef | 5381 | msgstr "设置如何删除提交说明里的空格和#注释" |
ef317cd5 | 5382 | |
94550ed3 | 5383 | #: builtin/commit.c:1592 |
ef317cd5 | 5384 | msgid "include status in commit message template" |
07432cef | 5385 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 5386 | |
94550ed3 | 5387 | #: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156 |
1b7f4a34 | 5388 | #: builtin/revert.c:93 |
ef317cd5 | 5389 | msgid "GPG sign commit" |
07432cef | 5390 | msgstr "GPG 提交签名" |
ef317cd5 | 5391 | |
94550ed3 | 5392 | #: builtin/commit.c:1597 |
ef317cd5 | 5393 | msgid "Commit contents options" |
07432cef | 5394 | msgstr "提交内容选项" |
ef317cd5 | 5395 | |
94550ed3 | 5396 | #: builtin/commit.c:1598 |
ef317cd5 | 5397 | msgid "commit all changed files" |
07432cef | 5398 | msgstr "提交所有改动的文件" |
ef317cd5 | 5399 | |
94550ed3 | 5400 | #: builtin/commit.c:1599 |
ef317cd5 | 5401 | msgid "add specified files to index for commit" |
07432cef | 5402 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 5403 | |
94550ed3 | 5404 | #: builtin/commit.c:1600 |
ef317cd5 | 5405 | msgid "interactively add files" |
07432cef | 5406 | msgstr "交互式添加文件" |
ef317cd5 | 5407 | |
94550ed3 | 5408 | #: builtin/commit.c:1601 |
ef317cd5 | 5409 | msgid "interactively add changes" |
07432cef | 5410 | msgstr "交互式添加变更" |
ef317cd5 | 5411 | |
94550ed3 | 5412 | #: builtin/commit.c:1602 |
ef317cd5 | 5413 | msgid "commit only specified files" |
07432cef | 5414 | msgstr "只提交指定的文件" |
ef317cd5 | 5415 | |
94550ed3 | 5416 | #: builtin/commit.c:1603 |
ef317cd5 | 5417 | msgid "bypass pre-commit hook" |
07432cef | 5418 | msgstr "绕过 pre-commit 钩子" |
ef317cd5 | 5419 | |
94550ed3 | 5420 | #: builtin/commit.c:1604 |
ef317cd5 | 5421 | msgid "show what would be committed" |
07432cef | 5422 | msgstr "显示将要提交的内容" |
ef317cd5 | 5423 | |
94550ed3 | 5424 | #: builtin/commit.c:1615 |
ef317cd5 | 5425 | msgid "amend previous commit" |
07432cef | 5426 | msgstr "修改先前的提交" |
ef317cd5 | 5427 | |
94550ed3 | 5428 | #: builtin/commit.c:1616 |
ef317cd5 | 5429 | msgid "bypass post-rewrite hook" |
07432cef | 5430 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 5431 | |
94550ed3 | 5432 | #: builtin/commit.c:1621 |
ef317cd5 | 5433 | msgid "ok to record an empty change" |
07432cef | 5434 | msgstr "允许一个空提交" |
ef317cd5 | 5435 | |
94550ed3 | 5436 | #: builtin/commit.c:1623 |
ef317cd5 | 5437 | msgid "ok to record a change with an empty message" |
07432cef | 5438 | msgstr "允许空的提交说明" |
ef317cd5 | 5439 | |
94550ed3 | 5440 | #: builtin/commit.c:1652 |
c04f5ac3 | 5441 | msgid "could not parse HEAD commit" |
90e6ef53 | 5442 | msgstr "不能解析 HEAD 提交" |
c04f5ac3 | 5443 | |
94550ed3 | 5444 | #: builtin/commit.c:1698 |
c04f5ac3 JX |
5445 | #, c-format |
5446 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 5447 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 5448 | |
94550ed3 | 5449 | #: builtin/commit.c:1705 |
c04f5ac3 | 5450 | msgid "could not read MERGE_MODE" |
90e6ef53 | 5451 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 5452 | |
94550ed3 | 5453 | #: builtin/commit.c:1724 |
c04f5ac3 JX |
5454 | #, c-format |
5455 | msgid "could not read commit message: %s" | |
90e6ef53 | 5456 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 5457 | |
94550ed3 | 5458 | #: builtin/commit.c:1735 |
73a60cd2 JX |
5459 | #, c-format |
5460 | msgid "Aborting commit; you did not edit the message.\n" | |
5461 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
5462 | ||
94550ed3 | 5463 | #: builtin/commit.c:1740 |
c04f5ac3 JX |
5464 | #, c-format |
5465 | msgid "Aborting commit due to empty commit message.\n" | |
5466 | msgstr "终止提交因为提交说明为空。\n" | |
5467 | ||
94550ed3 | 5468 | #: builtin/commit.c:1788 |
c04f5ac3 JX |
5469 | msgid "" |
5470 | "Repository has been updated, but unable to write\n" | |
220c313c | 5471 | "new_index file. Check that disk is not full and quota is\n" |
c04f5ac3 JX |
5472 | "not exceeded, and then \"git reset HEAD\" to recover." |
5473 | msgstr "" | |
160fb2b2 | 5474 | "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" |
90e6ef53 | 5475 | "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" |
c04f5ac3 | 5476 | |
90314792 | 5477 | #: builtin/config.c:8 |
814ff314 JX |
5478 | msgid "git config [<options>]" |
5479 | msgstr "git config [<选项>]" | |
ef317cd5 | 5480 | |
1b7f4a34 | 5481 | #: builtin/config.c:54 |
ef317cd5 | 5482 | msgid "Config file location" |
07432cef | 5483 | msgstr "配置文件位置" |
ef317cd5 | 5484 | |
1b7f4a34 | 5485 | #: builtin/config.c:55 |
ef317cd5 | 5486 | msgid "use global config file" |
07432cef | 5487 | msgstr "使用全局配置文件" |
ef317cd5 | 5488 | |
1b7f4a34 | 5489 | #: builtin/config.c:56 |
ef317cd5 | 5490 | msgid "use system config file" |
07432cef | 5491 | msgstr "使用系统级配置文件" |
ef317cd5 | 5492 | |
1b7f4a34 | 5493 | #: builtin/config.c:57 |
ef317cd5 | 5494 | msgid "use repository config file" |
160fb2b2 | 5495 | msgstr "使用仓库级配置文件" |
ef317cd5 | 5496 | |
1b7f4a34 | 5497 | #: builtin/config.c:58 |
ef317cd5 | 5498 | msgid "use given config file" |
07432cef | 5499 | msgstr "使用指定的配置文件" |
ef317cd5 | 5500 | |
1b7f4a34 | 5501 | #: builtin/config.c:59 |
2e8451e8 | 5502 | msgid "blob-id" |
4375c10e | 5503 | msgstr "数据对象 ID" |
2e8451e8 | 5504 | |
1b7f4a34 | 5505 | #: builtin/config.c:59 |
2e8451e8 JX |
5506 | msgid "read config from given blob object" |
5507 | msgstr "从给定的数据对象读取配置" | |
5508 | ||
1b7f4a34 | 5509 | #: builtin/config.c:60 |
ef317cd5 | 5510 | msgid "Action" |
07432cef | 5511 | msgstr "操作" |
ef317cd5 | 5512 | |
1b7f4a34 | 5513 | #: builtin/config.c:61 |
ef317cd5 | 5514 | msgid "get value: name [value-regex]" |
07432cef | 5515 | msgstr "获取值:name [value-regex]" |
ef317cd5 | 5516 | |
1b7f4a34 | 5517 | #: builtin/config.c:62 |
ef317cd5 | 5518 | msgid "get all values: key [value-regex]" |
07432cef | 5519 | msgstr "获得所有的值:key [value-regex]" |
ef317cd5 | 5520 | |
1b7f4a34 | 5521 | #: builtin/config.c:63 |
ef317cd5 | 5522 | msgid "get values for regexp: name-regex [value-regex]" |
07432cef | 5523 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
ef317cd5 | 5524 | |
1b7f4a34 | 5525 | #: builtin/config.c:64 |
90314792 JX |
5526 | msgid "get value specific for the URL: section[.var] URL" |
5527 | msgstr "获得 URL 取值:section[.var] URL" | |
5528 | ||
1b7f4a34 | 5529 | #: builtin/config.c:65 |
ef317cd5 | 5530 | msgid "replace all matching variables: name value [value_regex]" |
07432cef | 5531 | msgstr "替换所有匹配的变量:name value [value_regex]" |
ef317cd5 | 5532 | |
1b7f4a34 | 5533 | #: builtin/config.c:66 |
ef317cd5 | 5534 | msgid "add a new variable: name value" |
07432cef | 5535 | msgstr "添加一个新的变量:name value" |
ef317cd5 | 5536 | |
1b7f4a34 | 5537 | #: builtin/config.c:67 |
ef317cd5 | 5538 | msgid "remove a variable: name [value-regex]" |
07432cef | 5539 | msgstr "删除一个变量:name [value-regex]" |
ef317cd5 | 5540 | |
1b7f4a34 | 5541 | #: builtin/config.c:68 |
ef317cd5 | 5542 | msgid "remove all matches: name [value-regex]" |
07432cef | 5543 | msgstr "删除所有匹配项:name [value-regex]" |
ef317cd5 | 5544 | |
1b7f4a34 | 5545 | #: builtin/config.c:69 |
ef317cd5 | 5546 | msgid "rename section: old-name new-name" |
07432cef | 5547 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 5548 | |
1b7f4a34 | 5549 | #: builtin/config.c:70 |
ef317cd5 | 5550 | msgid "remove a section: name" |
07432cef | 5551 | msgstr "删除一个小节:name" |
ef317cd5 | 5552 | |
1b7f4a34 | 5553 | #: builtin/config.c:71 |
ef317cd5 | 5554 | msgid "list all" |
07432cef | 5555 | msgstr "列出所有" |
ef317cd5 | 5556 | |
1b7f4a34 | 5557 | #: builtin/config.c:72 |
ef317cd5 | 5558 | msgid "open an editor" |
07432cef | 5559 | msgstr "打开一个编辑器" |
ef317cd5 | 5560 | |
1b7f4a34 | 5561 | #: builtin/config.c:73 |
04cb2f28 JX |
5562 | msgid "find the color configured: slot [default]" |
5563 | msgstr "获得配置的颜色:配置 [默认]" | |
ef317cd5 | 5564 | |
1b7f4a34 | 5565 | #: builtin/config.c:74 |
04cb2f28 JX |
5566 | msgid "find the color setting: slot [stdout-is-tty]" |
5567 | msgstr "获得颜色设置:配置 [stdout-is-tty]" | |
ef317cd5 | 5568 | |
1b7f4a34 | 5569 | #: builtin/config.c:75 |
ef317cd5 | 5570 | msgid "Type" |
07432cef | 5571 | msgstr "类型" |
ef317cd5 | 5572 | |
1b7f4a34 | 5573 | #: builtin/config.c:76 |
ef317cd5 | 5574 | msgid "value is \"true\" or \"false\"" |
07432cef | 5575 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 5576 | |
1b7f4a34 | 5577 | #: builtin/config.c:77 |
ef317cd5 | 5578 | msgid "value is decimal number" |
07432cef | 5579 | msgstr "值是十进制数" |
ef317cd5 | 5580 | |
1b7f4a34 | 5581 | #: builtin/config.c:78 |
ef317cd5 | 5582 | msgid "value is --bool or --int" |
07432cef | 5583 | msgstr "值是 --bool or --int" |
ef317cd5 | 5584 | |
1b7f4a34 | 5585 | #: builtin/config.c:79 |
ef317cd5 | 5586 | msgid "value is a path (file or directory name)" |
07432cef | 5587 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 5588 | |
1b7f4a34 | 5589 | #: builtin/config.c:80 |
ef317cd5 | 5590 | msgid "Other" |
07432cef | 5591 | msgstr "其它" |
ef317cd5 | 5592 | |
1b7f4a34 | 5593 | #: builtin/config.c:81 |
ef317cd5 | 5594 | msgid "terminate values with NUL byte" |
4375c10e | 5595 | msgstr "终止值是 NUL 字节" |
ef317cd5 | 5596 | |
1b7f4a34 JX |
5597 | #: builtin/config.c:82 |
5598 | msgid "show variable names only" | |
5599 | msgstr "只显示变量名" | |
5600 | ||
5601 | #: builtin/config.c:83 | |
ef317cd5 | 5602 | msgid "respect include directives on lookup" |
07432cef | 5603 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 5604 | |
94550ed3 | 5605 | #: builtin/config.c:303 |
220c313c | 5606 | msgid "unable to parse default color value" |
160fb2b2 | 5607 | msgstr "不能解析默认颜色值" |
220c313c | 5608 | |
94550ed3 | 5609 | #: builtin/config.c:441 |
220c313c JX |
5610 | #, c-format |
5611 | msgid "" | |
5612 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 5613 | "[user]\n" |
220c313c | 5614 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 5615 | "#\tname = %s\n" |
220c313c JX |
5616 | "#\temail = %s\n" |
5617 | msgstr "" | |
5618 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 5619 | "[user]\n" |
220c313c | 5620 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 5621 | "#\tname = %s\n" |
220c313c JX |
5622 | "#\temail = %s\n" |
5623 | ||
94550ed3 | 5624 | #: builtin/config.c:575 |
220c313c JX |
5625 | #, c-format |
5626 | msgid "cannot create configuration file %s" | |
5627 | msgstr "不能创建配置文件 %s" | |
5628 | ||
94550ed3 | 5629 | #: builtin/count-objects.c:77 |
4dcdc3d8 JX |
5630 | msgid "git count-objects [-v] [-H | --human-readable]" |
5631 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
5632 | ||
94550ed3 | 5633 | #: builtin/count-objects.c:87 |
4dcdc3d8 JX |
5634 | msgid "print sizes in human readable format" |
5635 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 5636 | |
220c313c | 5637 | #: builtin/describe.c:17 |
814ff314 JX |
5638 | msgid "git describe [<options>] [<commit-ish>...]" |
5639 | msgstr "git describe [<选项>] [<提交号>...]" | |
ef317cd5 | 5640 | |
220c313c | 5641 | #: builtin/describe.c:18 |
814ff314 JX |
5642 | msgid "git describe [<options>] --dirty" |
5643 | msgstr "git describe [<选项>] --dirty" | |
ef317cd5 | 5644 | |
220c313c | 5645 | #: builtin/describe.c:217 |
c04f5ac3 JX |
5646 | #, c-format |
5647 | msgid "annotated tag %s not available" | |
55a16ee4 | 5648 | msgstr "附注标签 %s 无效" |
c04f5ac3 | 5649 | |
220c313c | 5650 | #: builtin/describe.c:221 |
c04f5ac3 JX |
5651 | #, c-format |
5652 | msgid "annotated tag %s has no embedded name" | |
55a16ee4 | 5653 | msgstr "附注标签 %s 没有嵌入名称" |
c04f5ac3 | 5654 | |
220c313c | 5655 | #: builtin/describe.c:223 |
c04f5ac3 JX |
5656 | #, c-format |
5657 | msgid "tag '%s' is really '%s' here" | |
55a16ee4 | 5658 | msgstr "标签 '%s' 的确是在 '%s'" |
c04f5ac3 | 5659 | |
1b7f4a34 | 5660 | #: builtin/describe.c:250 builtin/log.c:459 |
c04f5ac3 JX |
5661 | #, c-format |
5662 | msgid "Not a valid object name %s" | |
5663 | msgstr "不是一个有效的对象名 %s" | |
5664 | ||
220c313c | 5665 | #: builtin/describe.c:253 |
c04f5ac3 JX |
5666 | #, c-format |
5667 | msgid "%s is not a valid '%s' object" | |
5668 | msgstr "%s 不是一个有效的 '%s' 对象" | |
5669 | ||
220c313c | 5670 | #: builtin/describe.c:270 |
c04f5ac3 JX |
5671 | #, c-format |
5672 | msgid "no tag exactly matches '%s'" | |
55a16ee4 | 5673 | msgstr "没有标签准确匹配 '%s'" |
c04f5ac3 | 5674 | |
220c313c | 5675 | #: builtin/describe.c:272 |
c04f5ac3 JX |
5676 | #, c-format |
5677 | msgid "searching to describe %s\n" | |
5678 | msgstr "搜索描述 %s\n" | |
5679 | ||
220c313c | 5680 | #: builtin/describe.c:319 |
c04f5ac3 JX |
5681 | #, c-format |
5682 | msgid "finished search at %s\n" | |
5683 | msgstr "完成搜索 %s\n" | |
5684 | ||
220c313c | 5685 | #: builtin/describe.c:346 |
c04f5ac3 JX |
5686 | #, c-format |
5687 | msgid "" | |
5688 | "No annotated tags can describe '%s'.\n" | |
5689 | "However, there were unannotated tags: try --tags." | |
5690 | msgstr "" | |
55a16ee4 RC |
5691 | "没有附注标签能描述 '%s'。\n" |
5692 | "然而,存在未附注标签:尝试 --tags。" | |
c04f5ac3 | 5693 | |
220c313c | 5694 | #: builtin/describe.c:350 |
c04f5ac3 JX |
5695 | #, c-format |
5696 | msgid "" | |
5697 | "No tags can describe '%s'.\n" | |
5698 | "Try --always, or create some tags." | |
5699 | msgstr "" | |
55a16ee4 RC |
5700 | "没有标签能描述 '%s'。\n" |
5701 | "尝试 --always,或者创建一些标签。" | |
c04f5ac3 | 5702 | |
220c313c | 5703 | #: builtin/describe.c:371 |
c04f5ac3 JX |
5704 | #, c-format |
5705 | msgid "traversed %lu commits\n" | |
5706 | msgstr "已遍历 %lu 个提交\n" | |
5707 | ||
220c313c | 5708 | #: builtin/describe.c:374 |
c04f5ac3 JX |
5709 | #, c-format |
5710 | msgid "" | |
5711 | "more than %i tags found; listed %i most recent\n" | |
5712 | "gave up search at %s\n" | |
5713 | msgstr "" | |
55a16ee4 | 5714 | "发现多于 %i 个标签,列出最近的 %i 个\n" |
90e6ef53 | 5715 | "在 %s 放弃搜索\n" |
c04f5ac3 | 5716 | |
220c313c | 5717 | #: builtin/describe.c:396 |
ef317cd5 | 5718 | msgid "find the tag that comes after the commit" |
55a16ee4 | 5719 | msgstr "寻找该提交之后的标签" |
ef317cd5 | 5720 | |
220c313c | 5721 | #: builtin/describe.c:397 |
ef317cd5 | 5722 | msgid "debug search strategy on stderr" |
07432cef | 5723 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 5724 | |
220c313c | 5725 | #: builtin/describe.c:398 |
1003b3a5 JX |
5726 | msgid "use any ref" |
5727 | msgstr "使用任意引用" | |
5728 | ||
220c313c | 5729 | #: builtin/describe.c:399 |
1003b3a5 | 5730 | msgid "use any tag, even unannotated" |
55a16ee4 | 5731 | msgstr "使用任意标签,即使未附带注释" |
ef317cd5 | 5732 | |
220c313c | 5733 | #: builtin/describe.c:400 |
ef317cd5 | 5734 | msgid "always use long format" |
07432cef | 5735 | msgstr "始终使用长提交号格式" |
ef317cd5 | 5736 | |
220c313c | 5737 | #: builtin/describe.c:401 |
2e8451e8 JX |
5738 | msgid "only follow first parent" |
5739 | msgstr "只跟随第一个父提交" | |
5740 | ||
220c313c | 5741 | #: builtin/describe.c:404 |
ef317cd5 | 5742 | msgid "only output exact matches" |
07432cef | 5743 | msgstr "只输出精确匹配" |
ef317cd5 | 5744 | |
220c313c | 5745 | #: builtin/describe.c:406 |
ef317cd5 | 5746 | msgid "consider <n> most recent tags (default: 10)" |
55a16ee4 | 5747 | msgstr "考虑最近 <n> 个标签(默认:10)" |
ef317cd5 | 5748 | |
220c313c | 5749 | #: builtin/describe.c:408 |
ef317cd5 | 5750 | msgid "only consider tags matching <pattern>" |
55a16ee4 | 5751 | msgstr "只考虑匹配 <模式> 的标签" |
ef317cd5 | 5752 | |
94550ed3 | 5753 | #: builtin/describe.c:410 builtin/name-rev.c:314 |
ef317cd5 | 5754 | msgid "show abbreviated commit object as fallback" |
07432cef | 5755 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 5756 | |
220c313c | 5757 | #: builtin/describe.c:411 |
ef317cd5 | 5758 | msgid "mark" |
07432cef | 5759 | msgstr "标记" |
ef317cd5 | 5760 | |
220c313c | 5761 | #: builtin/describe.c:412 |
ef317cd5 | 5762 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
160fb2b2 | 5763 | msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 5764 | |
220c313c | 5765 | #: builtin/describe.c:430 |
c04f5ac3 JX |
5766 | msgid "--long is incompatible with --abbrev=0" |
5767 | msgstr "--long 与 --abbrev=0 不兼容" | |
5768 | ||
220c313c | 5769 | #: builtin/describe.c:456 |
c04f5ac3 | 5770 | msgid "No names found, cannot describe anything." |
90e6ef53 | 5771 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 5772 | |
220c313c | 5773 | #: builtin/describe.c:476 |
a8a5406a | 5774 | msgid "--dirty is incompatible with commit-ishes" |
649900bc | 5775 | msgstr "--dirty 不能与提交同时使用" |
c04f5ac3 | 5776 | |
220c313c | 5777 | #: builtin/diff.c:86 |
c04f5ac3 JX |
5778 | #, c-format |
5779 | msgid "'%s': not a regular file or symlink" | |
5780 | msgstr "'%s':不是一个正规文件或符号链接" | |
5781 | ||
220c313c | 5782 | #: builtin/diff.c:237 |
c04f5ac3 JX |
5783 | #, c-format |
5784 | msgid "invalid option: %s" | |
5785 | msgstr "无效选项:%s" | |
5786 | ||
220c313c | 5787 | #: builtin/diff.c:358 |
c04f5ac3 | 5788 | msgid "Not a git repository" |
160fb2b2 | 5789 | msgstr "不是一个 git 仓库" |
c04f5ac3 | 5790 | |
220c313c | 5791 | #: builtin/diff.c:401 |
c04f5ac3 JX |
5792 | #, c-format |
5793 | msgid "invalid object '%s' given." | |
5794 | msgstr "提供了无效对象 '%s'。" | |
5795 | ||
220c313c | 5796 | #: builtin/diff.c:410 |
c04f5ac3 JX |
5797 | #, c-format |
5798 | msgid "more than two blobs given: '%s'" | |
160fb2b2 | 5799 | msgstr "提供了超过两个数据对象:'%s'" |
c04f5ac3 | 5800 | |
220c313c | 5801 | #: builtin/diff.c:417 |
c04f5ac3 JX |
5802 | #, c-format |
5803 | msgid "unhandled object '%s' given." | |
6c94aba5 | 5804 | msgstr "无法处理的对象 '%s'。" |
c04f5ac3 | 5805 | |
1b7f4a34 | 5806 | #: builtin/fast-export.c:25 |
ef317cd5 | 5807 | msgid "git fast-export [rev-list-opts]" |
07432cef | 5808 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 5809 | |
1b7f4a34 | 5810 | #: builtin/fast-export.c:980 |
ef317cd5 | 5811 | msgid "show progress after <n> objects" |
07432cef | 5812 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 5813 | |
1b7f4a34 | 5814 | #: builtin/fast-export.c:982 |
ef317cd5 | 5815 | msgid "select handling of signed tags" |
55a16ee4 | 5816 | msgstr "选择如何处理签名标签" |
ef317cd5 | 5817 | |
1b7f4a34 | 5818 | #: builtin/fast-export.c:985 |
ef317cd5 | 5819 | msgid "select handling of tags that tag filtered objects" |
55a16ee4 | 5820 | msgstr "选择当标签指向被过滤对象时该标签的处理方式" |
ef317cd5 | 5821 | |
1b7f4a34 | 5822 | #: builtin/fast-export.c:988 |
ef317cd5 | 5823 | msgid "Dump marks to this file" |
07432cef | 5824 | msgstr "把标记存储到这个文件" |
ef317cd5 | 5825 | |
1b7f4a34 | 5826 | #: builtin/fast-export.c:990 |
ef317cd5 | 5827 | msgid "Import marks from this file" |
07432cef | 5828 | msgstr "从这个文件导入标记" |
ef317cd5 | 5829 | |
1b7f4a34 | 5830 | #: builtin/fast-export.c:992 |
ef317cd5 | 5831 | msgid "Fake a tagger when tags lack one" |
55a16ee4 | 5832 | msgstr "当标签缺少标记者字段时,假装提供一个" |
ef317cd5 | 5833 | |
1b7f4a34 | 5834 | #: builtin/fast-export.c:994 |
ef317cd5 | 5835 | msgid "Output full tree for each commit" |
07432cef | 5836 | msgstr "每次提交都输出整个树" |
ef317cd5 | 5837 | |
1b7f4a34 | 5838 | #: builtin/fast-export.c:996 |
ef317cd5 | 5839 | msgid "Use the done feature to terminate the stream" |
07432cef | 5840 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 5841 | |
1b7f4a34 | 5842 | #: builtin/fast-export.c:997 |
ef317cd5 | 5843 | msgid "Skip output of blob data" |
07432cef | 5844 | msgstr "跳过数据对象的输出" |
ef317cd5 | 5845 | |
1b7f4a34 | 5846 | #: builtin/fast-export.c:998 |
6acbf033 | 5847 | msgid "refspec" |
160fb2b2 | 5848 | msgstr "引用规格" |
6acbf033 | 5849 | |
1b7f4a34 | 5850 | #: builtin/fast-export.c:999 |
6acbf033 | 5851 | msgid "Apply refspec to exported refs" |
160fb2b2 | 5852 | msgstr "对导出的引用应用引用规格" |
6acbf033 | 5853 | |
1b7f4a34 | 5854 | #: builtin/fast-export.c:1000 |
220c313c JX |
5855 | msgid "anonymize output" |
5856 | msgstr "匿名输出" | |
5857 | ||
1b7f4a34 | 5858 | #: builtin/fetch.c:20 |
ef317cd5 | 5859 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 5860 | msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" |
ef317cd5 | 5861 | |
1b7f4a34 | 5862 | #: builtin/fetch.c:21 |
ef317cd5 | 5863 | msgid "git fetch [<options>] <group>" |
07432cef | 5864 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 | 5865 | |
1b7f4a34 | 5866 | #: builtin/fetch.c:22 |
ef317cd5 | 5867 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
160fb2b2 | 5868 | msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" |
ef317cd5 | 5869 | |
1b7f4a34 | 5870 | #: builtin/fetch.c:23 |
ef317cd5 | 5871 | msgid "git fetch --all [<options>]" |
07432cef | 5872 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 5873 | |
1b7f4a34 | 5874 | #: builtin/fetch.c:90 builtin/pull.c:162 |
ef317cd5 | 5875 | msgid "fetch from all remotes" |
07432cef | 5876 | msgstr "从所有的远程抓取" |
ef317cd5 | 5877 | |
1b7f4a34 | 5878 | #: builtin/fetch.c:92 builtin/pull.c:165 |
ef317cd5 | 5879 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 5880 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 5881 | |
1b7f4a34 | 5882 | #: builtin/fetch.c:94 builtin/pull.c:168 |
ef317cd5 | 5883 | msgid "path to upload pack on remote end" |
07432cef | 5884 | msgstr "上传包到远程的路径" |
ef317cd5 | 5885 | |
1b7f4a34 | 5886 | #: builtin/fetch.c:95 builtin/pull.c:170 |
ef317cd5 | 5887 | msgid "force overwrite of local branch" |
07432cef | 5888 | msgstr "强制覆盖本地分支" |
ef317cd5 | 5889 | |
1b7f4a34 | 5890 | #: builtin/fetch.c:97 |
ef317cd5 | 5891 | msgid "fetch from multiple remotes" |
07432cef | 5892 | msgstr "从多个远程抓取" |
ef317cd5 | 5893 | |
1b7f4a34 | 5894 | #: builtin/fetch.c:99 builtin/pull.c:172 |
ef317cd5 | 5895 | msgid "fetch all tags and associated objects" |
55a16ee4 | 5896 | msgstr "抓取所有的标签和关联对象" |
ef317cd5 | 5897 | |
1b7f4a34 | 5898 | #: builtin/fetch.c:101 |
ef317cd5 | 5899 | msgid "do not fetch all tags (--no-tags)" |
55a16ee4 | 5900 | msgstr "不抓取任何标签(--no-tags)" |
ef317cd5 | 5901 | |
1b7f4a34 | 5902 | #: builtin/fetch.c:103 builtin/pull.c:175 |
ef317cd5 | 5903 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 5904 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 5905 | |
07432cef | 5906 | # 译者:可选值,不能翻译 |
1b7f4a34 | 5907 | #: builtin/fetch.c:104 builtin/pull.c:178 |
ef317cd5 | 5908 | msgid "on-demand" |
07432cef | 5909 | msgstr "on-demand" |
ef317cd5 | 5910 | |
1b7f4a34 | 5911 | #: builtin/fetch.c:105 builtin/pull.c:179 |
ef317cd5 | 5912 | msgid "control recursive fetching of submodules" |
07432cef | 5913 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 5914 | |
1b7f4a34 | 5915 | #: builtin/fetch.c:109 builtin/pull.c:184 |
ef317cd5 | 5916 | msgid "keep downloaded pack" |
07432cef | 5917 | msgstr "保持下载包" |
ef317cd5 | 5918 | |
1b7f4a34 | 5919 | #: builtin/fetch.c:111 |
ef317cd5 | 5920 | msgid "allow updating of HEAD ref" |
07432cef | 5921 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 5922 | |
1b7f4a34 | 5923 | #: builtin/fetch.c:114 builtin/pull.c:187 |
ef317cd5 | 5924 | msgid "deepen history of shallow clone" |
07432cef | 5925 | msgstr "深化浅克隆的历史" |
ef317cd5 | 5926 | |
1b7f4a34 | 5927 | #: builtin/fetch.c:116 builtin/pull.c:190 |
a77c07d9 | 5928 | msgid "convert to a complete repository" |
160fb2b2 | 5929 | msgstr "转换为一个完整的仓库" |
a77c07d9 | 5930 | |
89f80d72 | 5931 | #: builtin/fetch.c:118 builtin/log.c:1233 |
ef317cd5 | 5932 | msgid "dir" |
07432cef | 5933 | msgstr "目录" |
ef317cd5 | 5934 | |
1b7f4a34 | 5935 | #: builtin/fetch.c:119 |
ef317cd5 | 5936 | msgid "prepend this to submodule path output" |
07432cef | 5937 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 5938 | |
1b7f4a34 | 5939 | #: builtin/fetch.c:122 |
ef317cd5 | 5940 | msgid "default mode for recursion" |
07432cef | 5941 | msgstr "递归的默认模式" |
ef317cd5 | 5942 | |
1b7f4a34 | 5943 | #: builtin/fetch.c:124 builtin/pull.c:193 |
cfff71a9 JX |
5944 | msgid "accept refs that update .git/shallow" |
5945 | msgstr "接受更新 .git/shallow 的引用" | |
5946 | ||
1b7f4a34 | 5947 | #: builtin/fetch.c:125 builtin/pull.c:195 |
6acbf033 JX |
5948 | msgid "refmap" |
5949 | msgstr "引用映射" | |
5950 | ||
1b7f4a34 | 5951 | #: builtin/fetch.c:126 builtin/pull.c:196 |
6acbf033 JX |
5952 | msgid "specify fetch refmap" |
5953 | msgstr "指定获取操作的引用映射" | |
5954 | ||
1b7f4a34 | 5955 | #: builtin/fetch.c:378 |
c04f5ac3 JX |
5956 | msgid "Couldn't find remote ref HEAD" |
5957 | msgstr "无法发现远程 HEAD 引用" | |
5958 | ||
1b7f4a34 | 5959 | #: builtin/fetch.c:458 |
c04f5ac3 JX |
5960 | #, c-format |
5961 | msgid "object %s not found" | |
5962 | msgstr "对象 %s 未发现" | |
5963 | ||
1b7f4a34 | 5964 | #: builtin/fetch.c:463 |
c04f5ac3 JX |
5965 | msgid "[up to date]" |
5966 | msgstr "[最新]" | |
5967 | ||
1b7f4a34 | 5968 | #: builtin/fetch.c:477 |
c04f5ac3 JX |
5969 | #, c-format |
5970 | msgid "! %-*s %-*s -> %s (can't fetch in current branch)" | |
5971 | msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)" | |
5972 | ||
94550ed3 | 5973 | #: builtin/fetch.c:478 builtin/fetch.c:566 |
c04f5ac3 JX |
5974 | msgid "[rejected]" |
5975 | msgstr "[已拒绝]" | |
5976 | ||
1b7f4a34 | 5977 | #: builtin/fetch.c:489 |
c04f5ac3 | 5978 | msgid "[tag update]" |
55a16ee4 | 5979 | msgstr "[标签更新]" |
c04f5ac3 | 5980 | |
90e6ef53 | 5981 | # 译者:注意保持前导空格 |
1b7f4a34 | 5982 | #: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544 |
c04f5ac3 JX |
5983 | msgid " (unable to update local ref)" |
5984 | msgstr " (不能更新本地引用)" | |
5985 | ||
1b7f4a34 | 5986 | #: builtin/fetch.c:509 |
c04f5ac3 | 5987 | msgid "[new tag]" |
55a16ee4 | 5988 | msgstr "[新标签]" |
c04f5ac3 | 5989 | |
1b7f4a34 | 5990 | #: builtin/fetch.c:512 |
c04f5ac3 JX |
5991 | msgid "[new branch]" |
5992 | msgstr "[新分支]" | |
5993 | ||
1b7f4a34 | 5994 | #: builtin/fetch.c:515 |
170e9899 JX |
5995 | msgid "[new ref]" |
5996 | msgstr "[新引用]" | |
5997 | ||
94550ed3 | 5998 | #: builtin/fetch.c:561 |
c04f5ac3 JX |
5999 | msgid "unable to update local ref" |
6000 | msgstr "不能更新本地引用" | |
6001 | ||
94550ed3 | 6002 | #: builtin/fetch.c:561 |
c04f5ac3 JX |
6003 | msgid "forced update" |
6004 | msgstr "强制更新" | |
6005 | ||
94550ed3 | 6006 | #: builtin/fetch.c:568 |
c04f5ac3 | 6007 | msgid "(non-fast-forward)" |
90e6ef53 | 6008 | msgstr "(非快进式)" |
c04f5ac3 | 6009 | |
94550ed3 | 6010 | #: builtin/fetch.c:602 builtin/fetch.c:843 |
c04f5ac3 JX |
6011 | #, c-format |
6012 | msgid "cannot open %s: %s\n" | |
6013 | msgstr "无法打开 %s:%s\n" | |
6014 | ||
94550ed3 | 6015 | #: builtin/fetch.c:611 |
c04f5ac3 JX |
6016 | #, c-format |
6017 | msgid "%s did not send all necessary objects\n" | |
6018 | msgstr "%s 未发送所有必须的对象\n" | |
6019 | ||
94550ed3 | 6020 | #: builtin/fetch.c:629 |
cfff71a9 JX |
6021 | #, c-format |
6022 | msgid "reject %s because shallow roots are not allowed to be updated" | |
6023 | msgstr "拒绝 %s 因为浅克隆不允许被更新" | |
6024 | ||
94550ed3 | 6025 | #: builtin/fetch.c:716 builtin/fetch.c:808 |
c04f5ac3 JX |
6026 | #, c-format |
6027 | msgid "From %.*s\n" | |
6028 | msgstr "来自 %.*s\n" | |
6029 | ||
94550ed3 | 6030 | #: builtin/fetch.c:727 |
c04f5ac3 JX |
6031 | #, c-format |
6032 | msgid "" | |
6033 | "some local refs could not be updated; try running\n" | |
6034 | " 'git remote prune %s' to remove any old, conflicting branches" | |
6035 | msgstr "" | |
6036 | "一些本地引用不能被更新;尝试运行\n" | |
6037 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
6038 | ||
90e6ef53 | 6039 | # 译者:注意保持前导空格 |
94550ed3 | 6040 | #: builtin/fetch.c:779 |
81809b99 | 6041 | #, c-format |
8ada9598 | 6042 | msgid " (%s will become dangling)" |
07432cef | 6043 | msgstr " (%s 将成为摇摆状态)" |
c04f5ac3 | 6044 | |
90e6ef53 | 6045 | # 译者:注意保持前导空格 |
94550ed3 | 6046 | #: builtin/fetch.c:780 |
81809b99 | 6047 | #, c-format |
8ada9598 | 6048 | msgid " (%s has become dangling)" |
07432cef | 6049 | msgstr " (%s 已成为摇摆状态)" |
c04f5ac3 | 6050 | |
94550ed3 | 6051 | #: builtin/fetch.c:812 |
c04f5ac3 JX |
6052 | msgid "[deleted]" |
6053 | msgstr "[已删除]" | |
6054 | ||
94550ed3 | 6055 | #: builtin/fetch.c:813 builtin/remote.c:1040 |
c04f5ac3 JX |
6056 | msgid "(none)" |
6057 | msgstr "(无)" | |
6058 | ||
94550ed3 | 6059 | #: builtin/fetch.c:833 |
c04f5ac3 JX |
6060 | #, c-format |
6061 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
160fb2b2 | 6062 | msgstr "拒绝获取到非纯仓库的当前分支 %s" |
c04f5ac3 | 6063 | |
94550ed3 | 6064 | #: builtin/fetch.c:852 |
c04f5ac3 JX |
6065 | #, c-format |
6066 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
6067 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
6068 | ||
94550ed3 | 6069 | #: builtin/fetch.c:855 |
c04f5ac3 JX |
6070 | #, c-format |
6071 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 6072 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 6073 | |
94550ed3 | 6074 | #: builtin/fetch.c:911 |
90314792 JX |
6075 | #, c-format |
6076 | msgid "Don't know how to fetch from %s" | |
6077 | msgstr "不知道如何从 %s 获取" | |
6078 | ||
94550ed3 | 6079 | #: builtin/fetch.c:1072 |
c04f5ac3 JX |
6080 | #, c-format |
6081 | msgid "Fetching %s\n" | |
d4a8e00b | 6082 | msgstr "正在获取 %s\n" |
c04f5ac3 | 6083 | |
94550ed3 | 6084 | #: builtin/fetch.c:1074 builtin/remote.c:96 |
c04f5ac3 JX |
6085 | #, c-format |
6086 | msgid "Could not fetch %s" | |
6087 | msgstr "不能获取 %s" | |
6088 | ||
94550ed3 | 6089 | #: builtin/fetch.c:1092 |
c04f5ac3 JX |
6090 | msgid "" |
6091 | "No remote repository specified. Please, specify either a URL or a\n" | |
6092 | "remote name from which new revisions should be fetched." | |
4375c10e | 6093 | msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。" |
c04f5ac3 | 6094 | |
94550ed3 | 6095 | #: builtin/fetch.c:1115 |
c04f5ac3 | 6096 | msgid "You need to specify a tag name." |
55a16ee4 | 6097 | msgstr "您需要指定一个标签名称。" |
c04f5ac3 | 6098 | |
94550ed3 | 6099 | #: builtin/fetch.c:1157 |
a77c07d9 JX |
6100 | msgid "--depth and --unshallow cannot be used together" |
6101 | msgstr "--depth 和 --unshallow 不能同时使用" | |
6102 | ||
94550ed3 | 6103 | #: builtin/fetch.c:1159 |
a77c07d9 | 6104 | msgid "--unshallow on a complete repository does not make sense" |
160fb2b2 | 6105 | msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" |
a77c07d9 | 6106 | |
94550ed3 | 6107 | #: builtin/fetch.c:1179 |
c04f5ac3 | 6108 | msgid "fetch --all does not take a repository argument" |
160fb2b2 | 6109 | msgstr "fetch --all 不能带一个仓库参数" |
c04f5ac3 | 6110 | |
94550ed3 | 6111 | #: builtin/fetch.c:1181 |
c04f5ac3 | 6112 | msgid "fetch --all does not make sense with refspecs" |
160fb2b2 | 6113 | msgstr "fetch --all 带引用规格没有任何意义" |
c04f5ac3 | 6114 | |
94550ed3 | 6115 | #: builtin/fetch.c:1192 |
c04f5ac3 JX |
6116 | #, c-format |
6117 | msgid "No such remote or remote group: %s" | |
6118 | msgstr "没有这样的远程或远程组:%s" | |
6119 | ||
94550ed3 | 6120 | #: builtin/fetch.c:1200 |
c04f5ac3 | 6121 | msgid "Fetching a group and specifying refspecs does not make sense" |
160fb2b2 | 6122 | msgstr "获取组并指定引用规格没有意义" |
c04f5ac3 | 6123 | |
1b7f4a34 | 6124 | #: builtin/fmt-merge-msg.c:14 |
814ff314 JX |
6125 | msgid "" |
6126 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
6127 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" | |
c04f5ac3 | 6128 | |
94550ed3 | 6129 | #: builtin/fmt-merge-msg.c:667 |
ef317cd5 | 6130 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 6131 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 6132 | |
94550ed3 | 6133 | #: builtin/fmt-merge-msg.c:670 |
ef317cd5 | 6134 | msgid "alias for --log (deprecated)" |
07432cef | 6135 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 6136 | |
94550ed3 | 6137 | #: builtin/fmt-merge-msg.c:673 |
ef317cd5 | 6138 | msgid "text" |
07432cef | 6139 | msgstr "文本" |
ef317cd5 | 6140 | |
94550ed3 | 6141 | #: builtin/fmt-merge-msg.c:674 |
ef317cd5 | 6142 | msgid "use <text> as start of message" |
07432cef | 6143 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 6144 | |
94550ed3 | 6145 | #: builtin/fmt-merge-msg.c:675 |
ef317cd5 | 6146 | msgid "file to read from" |
07432cef | 6147 | msgstr "从文件中读取" |
ef317cd5 | 6148 | |
1b7f4a34 | 6149 | #: builtin/for-each-ref.c:9 |
814ff314 JX |
6150 | msgid "git for-each-ref [<options>] [<pattern>]" |
6151 | msgstr "git for-each-ref [<选项>] [<模式>]" | |
ef317cd5 | 6152 | |
94550ed3 JX |
6153 | #: builtin/for-each-ref.c:10 |
6154 | msgid "git for-each-ref [--points-at <object>]" | |
6155 | msgstr "git for-each-ref [--points-at <对象>]" | |
6156 | ||
6157 | #: builtin/for-each-ref.c:11 | |
6158 | msgid "git for-each-ref [(--merged | --no-merged) [<object>]]" | |
6159 | msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]" | |
6160 | ||
6161 | #: builtin/for-each-ref.c:12 | |
6162 | msgid "git for-each-ref [--contains [<object>]]" | |
6163 | msgstr "git for-each-ref [--contains [<对象>]]" | |
6164 | ||
6165 | #: builtin/for-each-ref.c:27 | |
ef317cd5 | 6166 | msgid "quote placeholders suitably for shells" |
07432cef | 6167 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 6168 | |
94550ed3 | 6169 | #: builtin/for-each-ref.c:29 |
ef317cd5 | 6170 | msgid "quote placeholders suitably for perl" |
07432cef | 6171 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 6172 | |
94550ed3 | 6173 | #: builtin/for-each-ref.c:31 |
ef317cd5 | 6174 | msgid "quote placeholders suitably for python" |
07432cef | 6175 | msgstr "引用占位符适用于 python" |
ef317cd5 | 6176 | |
94550ed3 | 6177 | #: builtin/for-each-ref.c:33 |
04cb2f28 JX |
6178 | msgid "quote placeholders suitably for Tcl" |
6179 | msgstr "引用占位符适用于 Tcl" | |
ef317cd5 | 6180 | |
94550ed3 | 6181 | #: builtin/for-each-ref.c:36 |
ef317cd5 | 6182 | msgid "show only <n> matched refs" |
07432cef | 6183 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 6184 | |
94550ed3 | 6185 | #: builtin/for-each-ref.c:37 builtin/tag.c:372 |
ef317cd5 | 6186 | msgid "format to use for the output" |
07432cef | 6187 | msgstr "输出格式" |
ef317cd5 | 6188 | |
94550ed3 JX |
6189 | #: builtin/for-each-ref.c:41 |
6190 | msgid "print only refs which points at the given object" | |
6191 | msgstr "只打印指向给定对象的引用" | |
ef317cd5 | 6192 | |
94550ed3 JX |
6193 | #: builtin/for-each-ref.c:43 |
6194 | msgid "print only refs that are merged" | |
6195 | msgstr "只打印已经合并的引用" | |
6196 | ||
6197 | #: builtin/for-each-ref.c:44 | |
6198 | msgid "print only refs that are not merged" | |
6199 | msgstr "只打印没有合并的引用" | |
ef317cd5 | 6200 | |
94550ed3 JX |
6201 | #: builtin/for-each-ref.c:45 |
6202 | msgid "print only refs which contain the commit" | |
6203 | msgstr "只打印包含该提交的引用" | |
6204 | ||
6205 | #: builtin/fsck.c:156 builtin/prune.c:140 | |
6c94aba5 JX |
6206 | msgid "Checking connectivity" |
6207 | msgstr "检查连接中" | |
6208 | ||
94550ed3 | 6209 | #: builtin/fsck.c:486 |
6c94aba5 JX |
6210 | msgid "Checking object directories" |
6211 | msgstr "检查对象目录中" | |
6212 | ||
94550ed3 | 6213 | #: builtin/fsck.c:553 |
814ff314 JX |
6214 | msgid "git fsck [<options>] [<object>...]" |
6215 | msgstr "git fsck [<选项>] [<对象>...]" | |
ef317cd5 | 6216 | |
94550ed3 | 6217 | #: builtin/fsck.c:559 |
ef317cd5 | 6218 | msgid "show unreachable objects" |
07432cef | 6219 | msgstr "显示不可达的对象" |
ef317cd5 | 6220 | |
94550ed3 | 6221 | #: builtin/fsck.c:560 |
ef317cd5 | 6222 | msgid "show dangling objects" |
07432cef | 6223 | msgstr "显示摇摆的对象" |
ef317cd5 | 6224 | |
94550ed3 | 6225 | #: builtin/fsck.c:561 |
ef317cd5 | 6226 | msgid "report tags" |
55a16ee4 | 6227 | msgstr "报告标签" |
ef317cd5 | 6228 | |
94550ed3 | 6229 | #: builtin/fsck.c:562 |
ef317cd5 | 6230 | msgid "report root nodes" |
07432cef | 6231 | msgstr "报告根节点" |
ef317cd5 | 6232 | |
94550ed3 | 6233 | #: builtin/fsck.c:563 |
ef317cd5 | 6234 | msgid "make index objects head nodes" |
07432cef | 6235 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 6236 | |
94550ed3 | 6237 | #: builtin/fsck.c:564 |
ef317cd5 | 6238 | msgid "make reflogs head nodes (default)" |
07432cef | 6239 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 6240 | |
94550ed3 | 6241 | #: builtin/fsck.c:565 |
ef317cd5 | 6242 | msgid "also consider packs and alternate objects" |
07432cef | 6243 | msgstr "也考虑包和备用对象" |
ef317cd5 | 6244 | |
94550ed3 | 6245 | #: builtin/fsck.c:566 |
1b7f4a34 JX |
6246 | msgid "check only connectivity" |
6247 | msgstr "仅检查连通性" | |
6248 | ||
94550ed3 | 6249 | #: builtin/fsck.c:567 |
ef317cd5 | 6250 | msgid "enable more strict checking" |
07432cef | 6251 | msgstr "启用更严格的检查" |
ef317cd5 | 6252 | |
94550ed3 | 6253 | #: builtin/fsck.c:569 |
ef317cd5 | 6254 | msgid "write dangling objects in .git/lost-found" |
07432cef | 6255 | msgstr "将摇摆对象写入 .git/lost-found 中" |
ef317cd5 | 6256 | |
94550ed3 | 6257 | #: builtin/fsck.c:570 builtin/prune.c:107 |
ef317cd5 | 6258 | msgid "show progress" |
07432cef | 6259 | msgstr "显示进度" |
ef317cd5 | 6260 | |
94550ed3 | 6261 | #: builtin/fsck.c:631 |
6c94aba5 JX |
6262 | msgid "Checking objects" |
6263 | msgstr "检查对象中" | |
6264 | ||
1b7f4a34 | 6265 | #: builtin/gc.c:25 |
814ff314 JX |
6266 | msgid "git gc [<options>]" |
6267 | msgstr "git gc [<选项>]" | |
ef317cd5 | 6268 | |
94550ed3 | 6269 | #: builtin/gc.c:72 |
c04f5ac3 | 6270 | #, c-format |
7aea43ff JX |
6271 | msgid "Invalid %s: '%s'" |
6272 | msgstr "无效 %s:'%s'" | |
c04f5ac3 | 6273 | |
94550ed3 | 6274 | #: builtin/gc.c:139 |
c04f5ac3 JX |
6275 | #, c-format |
6276 | msgid "insanely long object directory %.*s" | |
6277 | msgstr "不正常的长对象目录 %.*s" | |
6278 | ||
94550ed3 JX |
6279 | #: builtin/gc.c:290 |
6280 | #, c-format | |
6281 | msgid "" | |
6282 | "The last gc run reported the following. Please correct the root cause\n" | |
6283 | "and remove %s.\n" | |
6284 | "Automatic cleanup will not be performed until the file is removed.\n" | |
6285 | "\n" | |
6286 | "%s" | |
6287 | msgstr "" | |
6288 | "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" | |
6289 | "在该文件被删除之前,自动清理将不会执行。\n" | |
6290 | "\n" | |
6291 | "%s" | |
6292 | ||
6293 | #: builtin/gc.c:327 | |
ef317cd5 | 6294 | msgid "prune unreferenced objects" |
07432cef | 6295 | msgstr "清除未引用的对象" |
ef317cd5 | 6296 | |
94550ed3 | 6297 | #: builtin/gc.c:329 |
ef317cd5 | 6298 | msgid "be more thorough (increased runtime)" |
07432cef | 6299 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 6300 | |
94550ed3 | 6301 | #: builtin/gc.c:330 |
ef317cd5 | 6302 | msgid "enable auto-gc mode" |
07432cef | 6303 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 6304 | |
94550ed3 | 6305 | #: builtin/gc.c:331 |
90314792 JX |
6306 | msgid "force running gc even if there may be another gc running" |
6307 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
6308 | ||
94550ed3 | 6309 | #: builtin/gc.c:373 |
c04f5ac3 | 6310 | #, c-format |
6c94aba5 | 6311 | msgid "Auto packing the repository in background for optimum performance.\n" |
160fb2b2 | 6312 | msgstr "自动在后台执行仓库打包以求最佳性能。\n" |
6c94aba5 | 6313 | |
94550ed3 | 6314 | #: builtin/gc.c:375 |
6c94aba5 JX |
6315 | #, c-format |
6316 | msgid "Auto packing the repository for optimum performance.\n" | |
160fb2b2 | 6317 | msgstr "自动打包仓库以求最佳性能。\n" |
6c94aba5 | 6318 | |
94550ed3 | 6319 | #: builtin/gc.c:376 |
6c94aba5 JX |
6320 | #, c-format |
6321 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
6322 | msgstr "手工维护参见 \"git help gc\"。\n" | |
c04f5ac3 | 6323 | |
94550ed3 | 6324 | #: builtin/gc.c:397 |
90314792 JX |
6325 | #, c-format |
6326 | msgid "" | |
6327 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
6328 | msgstr "" | |
6329 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)" | |
6330 | ||
94550ed3 | 6331 | #: builtin/gc.c:441 |
c04f5ac3 JX |
6332 | msgid "" |
6333 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 6334 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 6335 | |
90314792 | 6336 | #: builtin/grep.c:23 |
814ff314 JX |
6337 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
6338 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" | |
ef317cd5 | 6339 | |
90314792 | 6340 | #: builtin/grep.c:218 |
c04f5ac3 JX |
6341 | #, c-format |
6342 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 6343 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 6344 | |
6acbf033 | 6345 | #: builtin/grep.c:441 builtin/grep.c:476 |
c04f5ac3 JX |
6346 | #, c-format |
6347 | msgid "unable to read tree (%s)" | |
90e6ef53 | 6348 | msgstr "无法读取树(%s)" |
c04f5ac3 | 6349 | |
6acbf033 | 6350 | #: builtin/grep.c:491 |
c04f5ac3 JX |
6351 | #, c-format |
6352 | msgid "unable to grep from object of type %s" | |
6353 | msgstr "无法抓取来自于 %s 类型的对象" | |
6354 | ||
6acbf033 | 6355 | #: builtin/grep.c:547 |
c04f5ac3 JX |
6356 | #, c-format |
6357 | msgid "switch `%c' expects a numerical value" | |
6358 | msgstr "开关 `%c' 期望一个数字值" | |
6359 | ||
6acbf033 | 6360 | #: builtin/grep.c:564 |
c04f5ac3 JX |
6361 | #, c-format |
6362 | msgid "cannot open '%s'" | |
6363 | msgstr "不能打开 '%s'" | |
6364 | ||
94550ed3 | 6365 | #: builtin/grep.c:633 |
ef317cd5 | 6366 | msgid "search in index instead of in the work tree" |
07432cef | 6367 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 6368 | |
94550ed3 | 6369 | #: builtin/grep.c:635 |
ef317cd5 | 6370 | msgid "find in contents not managed by git" |
07432cef | 6371 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 JX |
6372 | |
6373 | # 译者:中文字符串拼接,可删除前导空格 | |
94550ed3 | 6374 | #: builtin/grep.c:637 |
ef317cd5 | 6375 | msgid "search in both tracked and untracked files" |
07432cef | 6376 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 6377 | |
94550ed3 | 6378 | #: builtin/grep.c:639 |
814ff314 JX |
6379 | msgid "ignore files specified via '.gitignore'" |
6380 | msgstr "忽略 '.gitignore' 包含的文件" | |
ef317cd5 | 6381 | |
94550ed3 | 6382 | #: builtin/grep.c:642 |
ef317cd5 | 6383 | msgid "show non-matching lines" |
07432cef | 6384 | msgstr "显示未匹配的行" |
ef317cd5 | 6385 | |
94550ed3 | 6386 | #: builtin/grep.c:644 |
ef317cd5 | 6387 | msgid "case insensitive matching" |
07432cef | 6388 | msgstr "不区分大小写匹配" |
ef317cd5 | 6389 | |
94550ed3 | 6390 | #: builtin/grep.c:646 |
ef317cd5 | 6391 | msgid "match patterns only at word boundaries" |
07432cef | 6392 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 6393 | |
94550ed3 | 6394 | #: builtin/grep.c:648 |
ef317cd5 | 6395 | msgid "process binary files as text" |
07432cef | 6396 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 6397 | |
94550ed3 | 6398 | #: builtin/grep.c:650 |
ef317cd5 | 6399 | msgid "don't match patterns in binary files" |
07432cef | 6400 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 6401 | |
94550ed3 | 6402 | #: builtin/grep.c:653 |
90314792 JX |
6403 | msgid "process binary files with textconv filters" |
6404 | msgstr "用 textconv 过滤器处理二进制文件" | |
6405 | ||
94550ed3 | 6406 | #: builtin/grep.c:655 |
ef317cd5 | 6407 | msgid "descend at most <depth> levels" |
07432cef | 6408 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 6409 | |
94550ed3 | 6410 | #: builtin/grep.c:659 |
ef317cd5 | 6411 | msgid "use extended POSIX regular expressions" |
07432cef | 6412 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 6413 | |
94550ed3 | 6414 | #: builtin/grep.c:662 |
ef317cd5 | 6415 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 6416 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 6417 | |
94550ed3 | 6418 | #: builtin/grep.c:665 |
ef317cd5 | 6419 | msgid "interpret patterns as fixed strings" |
07432cef | 6420 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 6421 | |
94550ed3 | 6422 | #: builtin/grep.c:668 |
ef317cd5 | 6423 | msgid "use Perl-compatible regular expressions" |
07432cef | 6424 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 6425 | |
94550ed3 | 6426 | #: builtin/grep.c:671 |
ef317cd5 | 6427 | msgid "show line numbers" |
07432cef | 6428 | msgstr "显示行号" |
ef317cd5 | 6429 | |
94550ed3 | 6430 | #: builtin/grep.c:672 |
ef317cd5 | 6431 | msgid "don't show filenames" |
07432cef | 6432 | msgstr "不显示文件名" |
ef317cd5 | 6433 | |
94550ed3 | 6434 | #: builtin/grep.c:673 |
ef317cd5 | 6435 | msgid "show filenames" |
07432cef | 6436 | msgstr "显示文件名" |
ef317cd5 | 6437 | |
94550ed3 | 6438 | #: builtin/grep.c:675 |
ef317cd5 | 6439 | msgid "show filenames relative to top directory" |
07432cef | 6440 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 6441 | |
94550ed3 | 6442 | #: builtin/grep.c:677 |
ef317cd5 | 6443 | msgid "show only filenames instead of matching lines" |
07432cef | 6444 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 6445 | |
94550ed3 | 6446 | #: builtin/grep.c:679 |
ef317cd5 | 6447 | msgid "synonym for --files-with-matches" |
07432cef | 6448 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 6449 | |
94550ed3 | 6450 | #: builtin/grep.c:682 |
ef317cd5 | 6451 | msgid "show only the names of files without match" |
07432cef | 6452 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 6453 | |
94550ed3 | 6454 | #: builtin/grep.c:684 |
ef317cd5 | 6455 | msgid "print NUL after filenames" |
07432cef | 6456 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 6457 | |
94550ed3 | 6458 | #: builtin/grep.c:686 |
ef317cd5 | 6459 | msgid "show the number of matches instead of matching lines" |
07432cef | 6460 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 6461 | |
94550ed3 | 6462 | #: builtin/grep.c:687 |
ef317cd5 | 6463 | msgid "highlight matches" |
07432cef | 6464 | msgstr "高亮显示匹配项" |
ef317cd5 | 6465 | |
94550ed3 | 6466 | #: builtin/grep.c:689 |
ef317cd5 | 6467 | msgid "print empty line between matches from different files" |
07432cef | 6468 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 6469 | |
94550ed3 | 6470 | #: builtin/grep.c:691 |
ef317cd5 | 6471 | msgid "show filename only once above matches from same file" |
07432cef | 6472 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 6473 | |
94550ed3 | 6474 | #: builtin/grep.c:694 |
ef317cd5 | 6475 | msgid "show <n> context lines before and after matches" |
07432cef | 6476 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 6477 | |
94550ed3 | 6478 | #: builtin/grep.c:697 |
ef317cd5 | 6479 | msgid "show <n> context lines before matches" |
07432cef | 6480 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 6481 | |
94550ed3 | 6482 | #: builtin/grep.c:699 |
ef317cd5 | 6483 | msgid "show <n> context lines after matches" |
07432cef | 6484 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 6485 | |
94550ed3 | 6486 | #: builtin/grep.c:700 |
ef317cd5 | 6487 | msgid "shortcut for -C NUM" |
07432cef | 6488 | msgstr "快捷键 -C 数字" |
ef317cd5 | 6489 | |
94550ed3 | 6490 | #: builtin/grep.c:703 |
ef317cd5 | 6491 | msgid "show a line with the function name before matches" |
07432cef | 6492 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 6493 | |
94550ed3 | 6494 | #: builtin/grep.c:705 |
ef317cd5 | 6495 | msgid "show the surrounding function" |
07432cef | 6496 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 6497 | |
94550ed3 | 6498 | #: builtin/grep.c:708 |
ef317cd5 | 6499 | msgid "read patterns from file" |
07432cef | 6500 | msgstr "从文件读取模式" |
ef317cd5 | 6501 | |
94550ed3 | 6502 | #: builtin/grep.c:710 |
ef317cd5 | 6503 | msgid "match <pattern>" |
07432cef | 6504 | msgstr "匹配 <模式>" |
ef317cd5 | 6505 | |
94550ed3 | 6506 | #: builtin/grep.c:712 |
ef317cd5 | 6507 | msgid "combine patterns specified with -e" |
07432cef | 6508 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 6509 | |
94550ed3 | 6510 | #: builtin/grep.c:724 |
ef317cd5 | 6511 | msgid "indicate hit with exit status without output" |
07432cef | 6512 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 6513 | |
94550ed3 | 6514 | #: builtin/grep.c:726 |
ef317cd5 | 6515 | msgid "show only matches from files that match all patterns" |
07432cef | 6516 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 6517 | |
94550ed3 | 6518 | #: builtin/grep.c:728 |
07432cef WS |
6519 | msgid "show parse tree for grep expression" |
6520 | msgstr "显示 grep 表达式的解析树" | |
6521 | ||
94550ed3 | 6522 | #: builtin/grep.c:732 |
ef317cd5 | 6523 | msgid "pager" |
07432cef | 6524 | msgstr "分页" |
ef317cd5 | 6525 | |
94550ed3 | 6526 | #: builtin/grep.c:732 |
ef317cd5 | 6527 | msgid "show matching files in the pager" |
07432cef | 6528 | msgstr "分页显示匹配的文件" |
ef317cd5 | 6529 | |
94550ed3 | 6530 | #: builtin/grep.c:735 |
ef317cd5 | 6531 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 6532 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 6533 | |
94550ed3 | 6534 | #: builtin/grep.c:793 |
c04f5ac3 JX |
6535 | msgid "no pattern given." |
6536 | msgstr "未提供模式匹配。" | |
6537 | ||
94550ed3 | 6538 | #: builtin/grep.c:851 |
c04f5ac3 JX |
6539 | msgid "--open-files-in-pager only works on the worktree" |
6540 | msgstr "--open-files-in-pager 仅用于工作区" | |
6541 | ||
94550ed3 | 6542 | #: builtin/grep.c:877 |
c04f5ac3 | 6543 | msgid "--cached or --untracked cannot be used with --no-index." |
649900bc | 6544 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" |
c04f5ac3 | 6545 | |
94550ed3 | 6546 | #: builtin/grep.c:882 |
c04f5ac3 | 6547 | msgid "--no-index or --untracked cannot be used with revs." |
649900bc | 6548 | msgstr "--no-index 或 --untracked 不能和版本同时使用。" |
c04f5ac3 | 6549 | |
94550ed3 | 6550 | #: builtin/grep.c:885 |
c04f5ac3 | 6551 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
90e6ef53 | 6552 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" |
c04f5ac3 | 6553 | |
94550ed3 | 6554 | #: builtin/grep.c:893 |
c04f5ac3 JX |
6555 | msgid "both --cached and trees are given." |
6556 | msgstr "同时给出了 --cached 和树对象。" | |
6557 | ||
7aea43ff | 6558 | #: builtin/hash-object.c:80 |
ef317cd5 | 6559 | msgid "" |
814ff314 JX |
6560 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
6561 | "[--] <file>..." | |
ef317cd5 | 6562 | msgstr "" |
814ff314 JX |
6563 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
6564 | "[--] <文件>..." | |
ef317cd5 | 6565 | |
7aea43ff | 6566 | #: builtin/hash-object.c:81 |
94550ed3 JX |
6567 | msgid "git hash-object --stdin-paths" |
6568 | msgstr "git hash-object --stdin-paths" | |
ef317cd5 | 6569 | |
94550ed3 | 6570 | #: builtin/hash-object.c:92 |
ef317cd5 | 6571 | msgid "type" |
07432cef | 6572 | msgstr "类型" |
ef317cd5 | 6573 | |
7aea43ff | 6574 | #: builtin/hash-object.c:92 |
ef317cd5 | 6575 | msgid "object type" |
07432cef | 6576 | msgstr "对象类型" |
ef317cd5 | 6577 | |
7aea43ff | 6578 | #: builtin/hash-object.c:93 |
ef317cd5 | 6579 | msgid "write the object into the object database" |
07432cef | 6580 | msgstr "将对象写入对象数据库" |
ef317cd5 | 6581 | |
7aea43ff | 6582 | #: builtin/hash-object.c:95 |
ef317cd5 | 6583 | msgid "read the object from stdin" |
07432cef | 6584 | msgstr "从标准输入读取对象" |
ef317cd5 | 6585 | |
7aea43ff | 6586 | #: builtin/hash-object.c:97 |
ef317cd5 | 6587 | msgid "store file as is without filters" |
07432cef | 6588 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 | 6589 | |
7aea43ff | 6590 | #: builtin/hash-object.c:98 |
220c313c JX |
6591 | msgid "" |
6592 | "just hash any random garbage to create corrupt objects for debugging Git" | |
6593 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
6594 | ||
7aea43ff | 6595 | #: builtin/hash-object.c:99 |
ef317cd5 | 6596 | msgid "process file as it were from this path" |
07432cef | 6597 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 6598 | |
2e8451e8 | 6599 | #: builtin/help.c:41 |
ef317cd5 | 6600 | msgid "print all available commands" |
07432cef | 6601 | msgstr "打印所有可用的命令" |
ef317cd5 | 6602 | |
2e8451e8 | 6603 | #: builtin/help.c:42 |
4dcdc3d8 JX |
6604 | msgid "print list of useful guides" |
6605 | msgstr "显示有用的指南列表" | |
6606 | ||
2e8451e8 | 6607 | #: builtin/help.c:43 |
ef317cd5 | 6608 | msgid "show man page" |
07432cef | 6609 | msgstr "显示 man 手册" |
ef317cd5 | 6610 | |
2e8451e8 | 6611 | #: builtin/help.c:44 |
ef317cd5 | 6612 | msgid "show manual in web browser" |
07432cef | 6613 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 6614 | |
2e8451e8 | 6615 | #: builtin/help.c:46 |
ef317cd5 | 6616 | msgid "show info page" |
07432cef | 6617 | msgstr "显示 info 手册" |
ef317cd5 | 6618 | |
2e8451e8 | 6619 | #: builtin/help.c:52 |
814ff314 JX |
6620 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
6621 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" | |
ef317cd5 | 6622 | |
2e8451e8 | 6623 | #: builtin/help.c:64 |
81809b99 | 6624 | #, c-format |
8ada9598 | 6625 | msgid "unrecognized help format '%s'" |
81809b99 | 6626 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 6627 | |
220c313c | 6628 | #: builtin/help.c:91 |
8ada9598 | 6629 | msgid "Failed to start emacsclient." |
81809b99 | 6630 | msgstr "无法启动 emacsclient。" |
8ada9598 | 6631 | |
220c313c | 6632 | #: builtin/help.c:104 |
8ada9598 | 6633 | msgid "Failed to parse emacsclient version." |
81809b99 | 6634 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 6635 | |
220c313c | 6636 | #: builtin/help.c:112 |
8ada9598 JX |
6637 | #, c-format |
6638 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 6639 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 6640 | |
94550ed3 | 6641 | #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 |
81809b99 | 6642 | #, c-format |
8ada9598 | 6643 | msgid "failed to exec '%s': %s" |
81809b99 | 6644 | msgstr "无法执行 '%s':%s" |
8ada9598 | 6645 | |
94550ed3 | 6646 | #: builtin/help.c:208 |
8ada9598 JX |
6647 | #, c-format |
6648 | msgid "" | |
6649 | "'%s': path for unsupported man viewer.\n" | |
6650 | "Please consider using 'man.<tool>.cmd' instead." | |
6651 | msgstr "" | |
81809b99 | 6652 | "'%s':不支持的 man 手册查看器的路径。\n" |
d9d56b23 | 6653 | "请使用 'man.<工具>.cmd'。" |
8ada9598 | 6654 | |
94550ed3 | 6655 | #: builtin/help.c:220 |
8ada9598 JX |
6656 | #, c-format |
6657 | msgid "" | |
6658 | "'%s': cmd for supported man viewer.\n" | |
6659 | "Please consider using 'man.<tool>.path' instead." | |
6660 | msgstr "" | |
81809b99 | 6661 | "'%s': 支持的 man 手册查看器命令。\n" |
d9d56b23 | 6662 | "请使用 'man.<工具>.path'。" |
8ada9598 | 6663 | |
94550ed3 | 6664 | #: builtin/help.c:337 |
8ada9598 JX |
6665 | #, c-format |
6666 | msgid "'%s': unknown man viewer." | |
81809b99 | 6667 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 6668 | |
94550ed3 | 6669 | #: builtin/help.c:354 |
8ada9598 | 6670 | msgid "no man viewer handled the request" |
81809b99 | 6671 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 6672 | |
94550ed3 | 6673 | #: builtin/help.c:362 |
8ada9598 | 6674 | msgid "no info viewer handled the request" |
81809b99 | 6675 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 6676 | |
94550ed3 | 6677 | #: builtin/help.c:411 |
4dcdc3d8 JX |
6678 | msgid "Defining attributes per path" |
6679 | msgstr "定义路径的属性" | |
6680 | ||
94550ed3 | 6681 | #: builtin/help.c:412 |
220c313c JX |
6682 | msgid "Everyday Git With 20 Commands Or So" |
6683 | msgstr "每一天 Git 常用的约 20 条命令" | |
6684 | ||
94550ed3 | 6685 | #: builtin/help.c:413 |
4dcdc3d8 JX |
6686 | msgid "A Git glossary" |
6687 | msgstr "Git 词汇表" | |
6688 | ||
94550ed3 | 6689 | #: builtin/help.c:414 |
4dcdc3d8 JX |
6690 | msgid "Specifies intentionally untracked files to ignore" |
6691 | msgstr "忽略指定的未跟踪文件" | |
6692 | ||
94550ed3 | 6693 | #: builtin/help.c:415 |
4dcdc3d8 JX |
6694 | msgid "Defining submodule properties" |
6695 | msgstr "定义子模组属性" | |
6696 | ||
94550ed3 | 6697 | #: builtin/help.c:416 |
4dcdc3d8 JX |
6698 | msgid "Specifying revisions and ranges for Git" |
6699 | msgstr "指定 Git 的版本和版本范围" | |
6700 | ||
94550ed3 | 6701 | #: builtin/help.c:417 |
4dcdc3d8 JX |
6702 | msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" |
6703 | msgstr "一个 Git 教程(针对 1.5.1 或更新版本)" | |
6704 | ||
94550ed3 | 6705 | #: builtin/help.c:418 |
4dcdc3d8 JX |
6706 | msgid "An overview of recommended workflows with Git" |
6707 | msgstr "Git 推荐的工作流概览" | |
6708 | ||
94550ed3 | 6709 | #: builtin/help.c:430 |
4dcdc3d8 JX |
6710 | msgid "The common Git guides are:\n" |
6711 | msgstr "最常用的 Git 向导有:\n" | |
6712 | ||
94550ed3 | 6713 | #: builtin/help.c:451 builtin/help.c:468 |
8ada9598 JX |
6714 | #, c-format |
6715 | msgid "usage: %s%s" | |
81809b99 | 6716 | msgstr "用法:%s%s" |
8ada9598 | 6717 | |
94550ed3 | 6718 | #: builtin/help.c:484 |
8ada9598 JX |
6719 | #, c-format |
6720 | msgid "`git %s' is aliased to `%s'" | |
81809b99 | 6721 | msgstr "`git %s' 是 `%s' 的别名" |
8ada9598 | 6722 | |
1b7f4a34 | 6723 | #: builtin/index-pack.c:152 |
6acbf033 JX |
6724 | #, c-format |
6725 | msgid "unable to open %s" | |
6726 | msgstr "不能打开 %s" | |
6727 | ||
1b7f4a34 | 6728 | #: builtin/index-pack.c:202 |
8ada9598 JX |
6729 | #, c-format |
6730 | msgid "object type mismatch at %s" | |
81809b99 | 6731 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 6732 | |
1b7f4a34 | 6733 | #: builtin/index-pack.c:222 |
6acbf033 JX |
6734 | #, c-format |
6735 | msgid "did not receive expected object %s" | |
6736 | msgstr "未能获取期望的对象 %s" | |
8ada9598 | 6737 | |
1b7f4a34 | 6738 | #: builtin/index-pack.c:225 |
6acbf033 JX |
6739 | #, c-format |
6740 | msgid "object %s: expected type %s, found %s" | |
6741 | msgstr "对象 %s:期待类型 %s,却是 %s" | |
6742 | ||
1b7f4a34 | 6743 | #: builtin/index-pack.c:267 |
81809b99 | 6744 | #, c-format |
8ada9598 JX |
6745 | msgid "cannot fill %d byte" |
6746 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 6747 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 6748 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 6749 | |
1b7f4a34 | 6750 | #: builtin/index-pack.c:277 |
8ada9598 | 6751 | msgid "early EOF" |
81809b99 | 6752 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 6753 | |
1b7f4a34 | 6754 | #: builtin/index-pack.c:278 |
8ada9598 | 6755 | msgid "read error on input" |
81809b99 | 6756 | msgstr "输入上的读错误" |
8ada9598 | 6757 | |
1b7f4a34 | 6758 | #: builtin/index-pack.c:290 |
8ada9598 | 6759 | msgid "used more bytes than were available" |
81809b99 | 6760 | msgstr "用掉了超过可用的字节" |
8ada9598 | 6761 | |
1b7f4a34 | 6762 | #: builtin/index-pack.c:297 |
8ada9598 | 6763 | msgid "pack too large for current definition of off_t" |
81809b99 | 6764 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 6765 | |
1b7f4a34 | 6766 | #: builtin/index-pack.c:313 |
81809b99 | 6767 | #, c-format |
8ada9598 | 6768 | msgid "unable to create '%s'" |
81809b99 | 6769 | msgstr "不能创建 '%s'" |
8ada9598 | 6770 | |
1b7f4a34 | 6771 | #: builtin/index-pack.c:318 |
81809b99 | 6772 | #, c-format |
8ada9598 | 6773 | msgid "cannot open packfile '%s'" |
81809b99 | 6774 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 6775 | |
1b7f4a34 | 6776 | #: builtin/index-pack.c:332 |
8ada9598 | 6777 | msgid "pack signature mismatch" |
81809b99 | 6778 | msgstr "包签名不匹配" |
8ada9598 | 6779 | |
1b7f4a34 | 6780 | #: builtin/index-pack.c:334 |
ef317cd5 JX |
6781 | #, c-format |
6782 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 6783 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 6784 | |
1b7f4a34 | 6785 | #: builtin/index-pack.c:352 |
8ada9598 JX |
6786 | #, c-format |
6787 | msgid "pack has bad object at offset %lu: %s" | |
81809b99 | 6788 | msgstr "包中有错误的对象位于 %lu:%s" |
8ada9598 | 6789 | |
1b7f4a34 | 6790 | #: builtin/index-pack.c:473 |
8ada9598 JX |
6791 | #, c-format |
6792 | msgid "inflate returned %d" | |
81809b99 | 6793 | msgstr "解压缩返回 %d" |
8ada9598 | 6794 | |
1b7f4a34 | 6795 | #: builtin/index-pack.c:522 |
8ada9598 | 6796 | msgid "offset value overflow for delta base object" |
81809b99 | 6797 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 6798 | |
1b7f4a34 | 6799 | #: builtin/index-pack.c:530 |
8ada9598 | 6800 | msgid "delta base offset is out of bound" |
81809b99 | 6801 | msgstr "delta 基准偏移越界" |
8ada9598 | 6802 | |
1b7f4a34 | 6803 | #: builtin/index-pack.c:538 |
81809b99 | 6804 | #, c-format |
8ada9598 | 6805 | msgid "unknown object type %d" |
81809b99 | 6806 | msgstr "未知对象类型 %d" |
8ada9598 | 6807 | |
1b7f4a34 | 6808 | #: builtin/index-pack.c:569 |
8ada9598 | 6809 | msgid "cannot pread pack file" |
81809b99 | 6810 | msgstr "无法读取包文件" |
8ada9598 | 6811 | |
1b7f4a34 | 6812 | #: builtin/index-pack.c:571 |
8ada9598 JX |
6813 | #, c-format |
6814 | msgid "premature end of pack file, %lu byte missing" | |
6815 | msgid_plural "premature end of pack file, %lu bytes missing" | |
81809b99 | 6816 | msgstr[0] "包文件过早结束,缺少 %lu 字节" |
5ae481e0 | 6817 | msgstr[1] "包文件过早结束,缺少 %lu 字节" |
8ada9598 | 6818 | |
1b7f4a34 | 6819 | #: builtin/index-pack.c:597 |
8ada9598 | 6820 | msgid "serious inflate inconsistency" |
81809b99 | 6821 | msgstr "解压缩严重的不一致" |
8ada9598 | 6822 | |
1b7f4a34 JX |
6823 | #: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772 |
6824 | #: builtin/index-pack.c:806 builtin/index-pack.c:815 | |
8ada9598 JX |
6825 | #, c-format |
6826 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 6827 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 6828 | |
1b7f4a34 | 6829 | #: builtin/index-pack.c:746 builtin/pack-objects.c:162 |
814ff314 | 6830 | #: builtin/pack-objects.c:254 |
6792b93b JX |
6831 | #, c-format |
6832 | msgid "unable to read %s" | |
6833 | msgstr "不能读 %s" | |
6834 | ||
1b7f4a34 | 6835 | #: builtin/index-pack.c:812 |
6792b93b JX |
6836 | #, c-format |
6837 | msgid "cannot read existing object %s" | |
6838 | msgstr "不能读取现存对象 %s" | |
6839 | ||
1b7f4a34 | 6840 | #: builtin/index-pack.c:826 |
81809b99 | 6841 | #, c-format |
8ada9598 | 6842 | msgid "invalid blob object %s" |
160fb2b2 | 6843 | msgstr "无效的数据对象 %s" |
8ada9598 | 6844 | |
1b7f4a34 | 6845 | #: builtin/index-pack.c:840 |
81809b99 | 6846 | #, c-format |
8ada9598 | 6847 | msgid "invalid %s" |
81809b99 | 6848 | msgstr "无效的 %s" |
8ada9598 | 6849 | |
7aea43ff | 6850 | #: builtin/index-pack.c:843 |
8ada9598 | 6851 | msgid "Error in object" |
81809b99 | 6852 | msgstr "对象中出错" |
8ada9598 | 6853 | |
7aea43ff | 6854 | #: builtin/index-pack.c:845 |
8ada9598 JX |
6855 | #, c-format |
6856 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 6857 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 6858 | |
7aea43ff | 6859 | #: builtin/index-pack.c:917 builtin/index-pack.c:948 |
8ada9598 | 6860 | msgid "failed to apply delta" |
81809b99 | 6861 | msgstr "无法应用 delta" |
8ada9598 | 6862 | |
7aea43ff | 6863 | #: builtin/index-pack.c:1118 |
8ada9598 | 6864 | msgid "Receiving objects" |
81809b99 | 6865 | msgstr "接收对象中" |
8ada9598 | 6866 | |
7aea43ff | 6867 | #: builtin/index-pack.c:1118 |
8ada9598 | 6868 | msgid "Indexing objects" |
81809b99 | 6869 | msgstr "索引对象中" |
8ada9598 | 6870 | |
7aea43ff | 6871 | #: builtin/index-pack.c:1150 |
8ada9598 | 6872 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 6873 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 6874 | |
7aea43ff | 6875 | #: builtin/index-pack.c:1155 |
8ada9598 | 6876 | msgid "cannot fstat packfile" |
81809b99 | 6877 | msgstr "不能枚举包文件状态" |
8ada9598 | 6878 | |
7aea43ff | 6879 | #: builtin/index-pack.c:1158 |
8ada9598 | 6880 | msgid "pack has junk at the end" |
81809b99 | 6881 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 6882 | |
7aea43ff | 6883 | #: builtin/index-pack.c:1169 |
6792b93b JX |
6884 | msgid "confusion beyond insanity in parse_pack_objects()" |
6885 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
6886 | ||
7aea43ff | 6887 | #: builtin/index-pack.c:1194 |
8ada9598 | 6888 | msgid "Resolving deltas" |
81809b99 | 6889 | msgstr "处理 delta 中" |
8ada9598 | 6890 | |
7aea43ff | 6891 | #: builtin/index-pack.c:1205 |
07432cef | 6892 | #, c-format |
ef317cd5 | 6893 | msgid "unable to create thread: %s" |
07432cef | 6894 | msgstr "不能创建线程:%s" |
ef317cd5 | 6895 | |
7aea43ff | 6896 | #: builtin/index-pack.c:1247 |
8ada9598 | 6897 | msgid "confusion beyond insanity" |
81809b99 | 6898 | msgstr "不可理喻" |
8ada9598 | 6899 | |
7aea43ff | 6900 | #: builtin/index-pack.c:1253 |
ef317cd5 JX |
6901 | #, c-format |
6902 | msgid "completed with %d local objects" | |
07432cef | 6903 | msgstr "完成 %d 个本地对象" |
ef317cd5 | 6904 | |
7aea43ff | 6905 | #: builtin/index-pack.c:1263 |
ef317cd5 JX |
6906 | #, c-format |
6907 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 6908 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 6909 | |
7aea43ff | 6910 | #: builtin/index-pack.c:1267 |
8ada9598 JX |
6911 | #, c-format |
6912 | msgid "pack has %d unresolved delta" | |
6913 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 6914 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 6915 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 6916 | |
7aea43ff | 6917 | #: builtin/index-pack.c:1291 |
81809b99 | 6918 | #, c-format |
8ada9598 | 6919 | msgid "unable to deflate appended object (%d)" |
07432cef | 6920 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 6921 | |
7aea43ff | 6922 | #: builtin/index-pack.c:1367 |
8ada9598 JX |
6923 | #, c-format |
6924 | msgid "local object %s is corrupt" | |
81809b99 | 6925 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 6926 | |
7aea43ff | 6927 | #: builtin/index-pack.c:1391 |
8ada9598 | 6928 | msgid "error while closing pack file" |
81809b99 | 6929 | msgstr "关闭包文件时出错" |
8ada9598 | 6930 | |
7aea43ff | 6931 | #: builtin/index-pack.c:1404 |
81809b99 | 6932 | #, c-format |
8ada9598 | 6933 | msgid "cannot write keep file '%s'" |
81809b99 | 6934 | msgstr "无法写保留文件 '%s'" |
8ada9598 | 6935 | |
7aea43ff | 6936 | #: builtin/index-pack.c:1412 |
81809b99 | 6937 | #, c-format |
8ada9598 | 6938 | msgid "cannot close written keep file '%s'" |
81809b99 | 6939 | msgstr "无法关闭保留文件 '%s'" |
8ada9598 | 6940 | |
7aea43ff | 6941 | #: builtin/index-pack.c:1425 |
8ada9598 | 6942 | msgid "cannot store pack file" |
81809b99 | 6943 | msgstr "无法存储包文件" |
8ada9598 | 6944 | |
7aea43ff | 6945 | #: builtin/index-pack.c:1436 |
8ada9598 | 6946 | msgid "cannot store index file" |
81809b99 | 6947 | msgstr "无法存储索引文件" |
8ada9598 | 6948 | |
7aea43ff | 6949 | #: builtin/index-pack.c:1469 |
07432cef | 6950 | #, c-format |
ef317cd5 | 6951 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 6952 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 6953 | |
7aea43ff | 6954 | #: builtin/index-pack.c:1475 |
ef317cd5 JX |
6955 | #, c-format |
6956 | msgid "invalid number of threads specified (%d)" | |
07432cef | 6957 | msgstr "指定的线程数无效(%d)" |
ef317cd5 | 6958 | |
1b7f4a34 | 6959 | #: builtin/index-pack.c:1479 builtin/index-pack.c:1663 |
ef317cd5 JX |
6960 | #, c-format |
6961 | msgid "no threads support, ignoring %s" | |
07432cef | 6962 | msgstr "没有线程支持,忽略 %s" |
ef317cd5 | 6963 | |
7aea43ff | 6964 | #: builtin/index-pack.c:1537 |
81809b99 | 6965 | #, c-format |
8ada9598 | 6966 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 6967 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 6968 | |
7aea43ff | 6969 | #: builtin/index-pack.c:1539 |
81809b99 | 6970 | #, c-format |
8ada9598 | 6971 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 6972 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 6973 | |
7aea43ff | 6974 | #: builtin/index-pack.c:1586 |
81809b99 | 6975 | #, c-format |
8ada9598 JX |
6976 | msgid "non delta: %d object" |
6977 | msgid_plural "non delta: %d objects" | |
81809b99 | 6978 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 6979 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 6980 | |
7aea43ff | 6981 | #: builtin/index-pack.c:1593 |
8ada9598 JX |
6982 | #, c-format |
6983 | msgid "chain length = %d: %lu object" | |
6984 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 6985 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 6986 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 6987 | |
1b7f4a34 | 6988 | #: builtin/index-pack.c:1623 |
8ada9598 | 6989 | msgid "Cannot come back to cwd" |
81809b99 | 6990 | msgstr "无法返回当前工作目录" |
8ada9598 | 6991 | |
1b7f4a34 JX |
6992 | #: builtin/index-pack.c:1675 builtin/index-pack.c:1678 |
6993 | #: builtin/index-pack.c:1690 builtin/index-pack.c:1694 | |
81809b99 | 6994 | #, c-format |
8ada9598 | 6995 | msgid "bad %s" |
81809b99 | 6996 | msgstr "错误选项 %s" |
8ada9598 | 6997 | |
1b7f4a34 | 6998 | #: builtin/index-pack.c:1708 |
8ada9598 | 6999 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 7000 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 7001 | |
1b7f4a34 | 7002 | #: builtin/index-pack.c:1712 builtin/index-pack.c:1721 |
8ada9598 JX |
7003 | #, c-format |
7004 | msgid "packfile name '%s' does not end with '.pack'" | |
dbd6cced | 7005 | msgstr "包文件名 '%s' 没有以 '.pack' 结尾" |
8ada9598 | 7006 | |
1b7f4a34 | 7007 | #: builtin/index-pack.c:1729 |
8ada9598 | 7008 | msgid "--verify with no packfile name given" |
dbd6cced | 7009 | msgstr "--verify 没有提供包文件名参数" |
8ada9598 | 7010 | |
94550ed3 | 7011 | #: builtin/init-db.c:55 |
c04f5ac3 JX |
7012 | #, c-format |
7013 | msgid "cannot stat '%s'" | |
7014 | msgstr "不能枚举 '%s' 状态" | |
7015 | ||
94550ed3 | 7016 | #: builtin/init-db.c:61 |
c04f5ac3 JX |
7017 | #, c-format |
7018 | msgid "cannot stat template '%s'" | |
7019 | msgstr "不能枚举模版 '%s' 状态" | |
7020 | ||
94550ed3 | 7021 | #: builtin/init-db.c:66 |
c04f5ac3 JX |
7022 | #, c-format |
7023 | msgid "cannot opendir '%s'" | |
7024 | msgstr "不能打开目录 '%s'" | |
7025 | ||
94550ed3 | 7026 | #: builtin/init-db.c:77 |
c04f5ac3 JX |
7027 | #, c-format |
7028 | msgid "cannot readlink '%s'" | |
7029 | msgstr "不能读取链接 '%s'" | |
7030 | ||
94550ed3 | 7031 | #: builtin/init-db.c:79 |
c04f5ac3 JX |
7032 | #, c-format |
7033 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 7034 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 | 7035 | |
94550ed3 | 7036 | #: builtin/init-db.c:85 |
c04f5ac3 JX |
7037 | #, c-format |
7038 | msgid "cannot copy '%s' to '%s'" | |
7039 | msgstr "不能拷贝 '%s' 至 '%s'" | |
7040 | ||
94550ed3 | 7041 | #: builtin/init-db.c:89 |
c04f5ac3 JX |
7042 | #, c-format |
7043 | msgid "ignoring template %s" | |
7044 | msgstr "忽略模版 %s" | |
7045 | ||
94550ed3 | 7046 | #: builtin/init-db.c:118 |
c04f5ac3 JX |
7047 | #, c-format |
7048 | msgid "templates not found %s" | |
7049 | msgstr "模版未找到 %s" | |
7050 | ||
94550ed3 | 7051 | #: builtin/init-db.c:131 |
c04f5ac3 JX |
7052 | #, c-format |
7053 | msgid "not copying templates of a wrong format version %d from '%s'" | |
81809b99 | 7054 | msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版" |
c04f5ac3 | 7055 | |
94550ed3 | 7056 | #: builtin/init-db.c:309 builtin/init-db.c:312 |
c04f5ac3 JX |
7057 | #, c-format |
7058 | msgid "%s already exists" | |
7059 | msgstr "%s 已经存在" | |
7060 | ||
94550ed3 | 7061 | #: builtin/init-db.c:340 |
c04f5ac3 JX |
7062 | #, c-format |
7063 | msgid "unable to handle file type %d" | |
7064 | msgstr "不能处理 %d 类型的文件" | |
7065 | ||
94550ed3 | 7066 | #: builtin/init-db.c:343 |
c04f5ac3 JX |
7067 | #, c-format |
7068 | msgid "unable to move %s to %s" | |
7069 | msgstr "不能移动 %s 至 %s" | |
7070 | ||
6c94aba5 JX |
7071 | #. TRANSLATORS: The first '%s' is either "Reinitialized |
7072 | #. existing" or "Initialized empty", the second " shared" or | |
7073 | #. "", and the last '%s%s' is the verbatim directory name. | |
94550ed3 | 7074 | #: builtin/init-db.c:399 |
c04f5ac3 JX |
7075 | #, c-format |
7076 | msgid "%s%s Git repository in %s%s\n" | |
160fb2b2 | 7077 | msgstr "%s%s Git 仓库于 %s%s\n" |
c04f5ac3 | 7078 | |
94550ed3 | 7079 | #: builtin/init-db.c:400 |
c04f5ac3 JX |
7080 | msgid "Reinitialized existing" |
7081 | msgstr "重新初始化现存的" | |
7082 | ||
94550ed3 | 7083 | #: builtin/init-db.c:400 |
c04f5ac3 JX |
7084 | msgid "Initialized empty" |
7085 | msgstr "初始化空的" | |
7086 | ||
7e238ab7 | 7087 | # 译者:中文字符串拼接,可删除前导空格 |
94550ed3 | 7088 | #: builtin/init-db.c:401 |
c04f5ac3 | 7089 | msgid " shared" |
90e6ef53 | 7090 | msgstr "共享" |
c04f5ac3 | 7091 | |
94550ed3 | 7092 | #: builtin/init-db.c:448 |
ef317cd5 | 7093 | msgid "" |
a77c07d9 | 7094 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
814ff314 | 7095 | "shared[=<permissions>]] [<directory>]" |
ef317cd5 | 7096 | msgstr "" |
07432cef | 7097 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
814ff314 | 7098 | "[<目录>]" |
ef317cd5 | 7099 | |
94550ed3 | 7100 | #: builtin/init-db.c:471 |
ef317cd5 | 7101 | msgid "permissions" |
07432cef | 7102 | msgstr "权限" |
ef317cd5 | 7103 | |
94550ed3 | 7104 | #: builtin/init-db.c:472 |
ef317cd5 | 7105 | msgid "specify that the git repository is to be shared amongst several users" |
160fb2b2 | 7106 | msgstr "指定 git 仓库是多个用户之间共享的" |
ef317cd5 | 7107 | |
94550ed3 | 7108 | #: builtin/init-db.c:506 builtin/init-db.c:511 |
c04f5ac3 JX |
7109 | #, c-format |
7110 | msgid "cannot mkdir %s" | |
7111 | msgstr "不能创建目录 %s" | |
7112 | ||
94550ed3 | 7113 | #: builtin/init-db.c:515 |
c04f5ac3 JX |
7114 | #, c-format |
7115 | msgid "cannot chdir to %s" | |
7116 | msgstr "不能切换目录到 %s" | |
7117 | ||
94550ed3 | 7118 | #: builtin/init-db.c:536 |
c04f5ac3 JX |
7119 | #, c-format |
7120 | msgid "" | |
7121 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
7122 | "dir=<directory>)" | |
1e607449 | 7123 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
c04f5ac3 | 7124 | |
94550ed3 | 7125 | #: builtin/init-db.c:564 |
c04f5ac3 JX |
7126 | #, c-format |
7127 | msgid "Cannot access work tree '%s'" | |
7128 | msgstr "不能访问工作区 '%s'" | |
7129 | ||
220c313c JX |
7130 | #: builtin/interpret-trailers.c:15 |
7131 | msgid "" | |
7132 | "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " | |
7133 | "[<file>...]" | |
7134 | msgstr "" | |
7135 | "git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件" | |
7136 | ">...]" | |
7137 | ||
7138 | #: builtin/interpret-trailers.c:25 | |
7139 | msgid "trim empty trailers" | |
7140 | msgstr "删除空签名" | |
7141 | ||
7142 | #: builtin/interpret-trailers.c:26 | |
7143 | msgid "trailer" | |
7144 | msgstr "签名" | |
7145 | ||
7146 | #: builtin/interpret-trailers.c:27 | |
7147 | msgid "trailer(s) to add" | |
7148 | msgstr "要添加的签名" | |
7149 | ||
1b7f4a34 | 7150 | #: builtin/log.c:43 |
7aea43ff | 7151 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
d9d56b23 | 7152 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" |
ef317cd5 | 7153 | |
1b7f4a34 | 7154 | #: builtin/log.c:44 |
814ff314 JX |
7155 | msgid "git show [<options>] <object>..." |
7156 | msgstr "git show [<选项>] <对象>..." | |
ef317cd5 | 7157 | |
1b7f4a34 | 7158 | #: builtin/log.c:83 |
220c313c JX |
7159 | #, c-format |
7160 | msgid "invalid --decorate option: %s" | |
7161 | msgstr "无效的 --decorate 选项:%s" | |
7162 | ||
1b7f4a34 | 7163 | #: builtin/log.c:131 |
ef317cd5 | 7164 | msgid "suppress diff output" |
07432cef | 7165 | msgstr "不显示差异输出" |
ef317cd5 | 7166 | |
1b7f4a34 | 7167 | #: builtin/log.c:132 |
ef317cd5 | 7168 | msgid "show source" |
07432cef | 7169 | msgstr "显示源" |
ef317cd5 | 7170 | |
1b7f4a34 | 7171 | #: builtin/log.c:133 |
07432cef WS |
7172 | msgid "Use mail map file" |
7173 | msgstr "使用邮件映射文件" | |
7174 | ||
1b7f4a34 | 7175 | #: builtin/log.c:134 |
ef317cd5 | 7176 | msgid "decorate options" |
07432cef | 7177 | msgstr "修饰选项" |
ef317cd5 | 7178 | |
1b7f4a34 | 7179 | #: builtin/log.c:137 |
220c313c JX |
7180 | msgid "Process line range n,m in file, counting from 1" |
7181 | msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" | |
7182 | ||
1b7f4a34 | 7183 | #: builtin/log.c:233 |
c04f5ac3 JX |
7184 | #, c-format |
7185 | msgid "Final output: %d %s\n" | |
7186 | msgstr "最终输出:%d %s\n" | |
7187 | ||
1b7f4a34 | 7188 | #: builtin/log.c:465 |
220c313c JX |
7189 | #, c-format |
7190 | msgid "git show %s: bad file" | |
7191 | msgstr "git show %s: 损坏的文件" | |
7192 | ||
1b7f4a34 | 7193 | #: builtin/log.c:479 builtin/log.c:572 |
c04f5ac3 JX |
7194 | #, c-format |
7195 | msgid "Could not read object %s" | |
90e6ef53 | 7196 | msgstr "不能读取对象 %s" |
c04f5ac3 | 7197 | |
1b7f4a34 | 7198 | #: builtin/log.c:596 |
c04f5ac3 JX |
7199 | #, c-format |
7200 | msgid "Unknown type: %d" | |
7201 | msgstr "未知类型:%d" | |
7202 | ||
1b7f4a34 | 7203 | #: builtin/log.c:714 |
c04f5ac3 JX |
7204 | msgid "format.headers without value" |
7205 | msgstr "format.headers 没有值" | |
7206 | ||
1b7f4a34 | 7207 | #: builtin/log.c:798 |
c04f5ac3 JX |
7208 | msgid "name of output directory is too long" |
7209 | msgstr "输出目录名太长" | |
7210 | ||
94550ed3 | 7211 | #: builtin/log.c:813 |
c04f5ac3 JX |
7212 | #, c-format |
7213 | msgid "Cannot open patch file %s" | |
7214 | msgstr "无法打开补丁文件 %s" | |
7215 | ||
94550ed3 | 7216 | #: builtin/log.c:827 |
c04f5ac3 JX |
7217 | msgid "Need exactly one range." |
7218 | msgstr "只需要一个范围。" | |
7219 | ||
94550ed3 | 7220 | #: builtin/log.c:837 |
c04f5ac3 JX |
7221 | msgid "Not a range." |
7222 | msgstr "不是一个范围。" | |
7223 | ||
94550ed3 | 7224 | #: builtin/log.c:943 |
c04f5ac3 JX |
7225 | msgid "Cover letter needs email format" |
7226 | msgstr "信封需要邮件地址格式" | |
7227 | ||
94550ed3 | 7228 | #: builtin/log.c:1022 |
c04f5ac3 JX |
7229 | #, c-format |
7230 | msgid "insane in-reply-to: %s" | |
7231 | msgstr "不正常的 in-reply-to:%s" | |
7232 | ||
94550ed3 | 7233 | #: builtin/log.c:1050 |
814ff314 JX |
7234 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
7235 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" | |
ef317cd5 | 7236 | |
94550ed3 | 7237 | #: builtin/log.c:1095 |
c04f5ac3 JX |
7238 | msgid "Two output directories?" |
7239 | msgstr "两个输出目录?" | |
7240 | ||
89f80d72 | 7241 | #: builtin/log.c:1211 |
ef317cd5 | 7242 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 7243 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 7244 | |
89f80d72 | 7245 | #: builtin/log.c:1214 |
ef317cd5 | 7246 | msgid "use [PATCH] even with multiple patches" |
07432cef | 7247 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 7248 | |
89f80d72 | 7249 | #: builtin/log.c:1218 |
ef317cd5 | 7250 | msgid "print patches to standard out" |
07432cef | 7251 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 7252 | |
89f80d72 | 7253 | #: builtin/log.c:1220 |
ef317cd5 | 7254 | msgid "generate a cover letter" |
07432cef | 7255 | msgstr "生成一封附信" |
c04f5ac3 | 7256 | |
89f80d72 | 7257 | #: builtin/log.c:1222 |
ef317cd5 | 7258 | msgid "use simple number sequence for output file names" |
07432cef | 7259 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 7260 | |
89f80d72 | 7261 | #: builtin/log.c:1223 |
ef317cd5 | 7262 | msgid "sfx" |
07432cef | 7263 | msgstr "后缀" |
ef317cd5 | 7264 | |
89f80d72 | 7265 | #: builtin/log.c:1224 |
ef317cd5 | 7266 | msgid "use <sfx> instead of '.patch'" |
07432cef | 7267 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 7268 | |
89f80d72 | 7269 | #: builtin/log.c:1226 |
ef317cd5 | 7270 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
7271 | msgstr "补丁以 <n> 开始编号,而不是1" |
7272 | ||
89f80d72 | 7273 | #: builtin/log.c:1228 |
07432cef WS |
7274 | msgid "mark the series as Nth re-roll" |
7275 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 7276 | |
89f80d72 | 7277 | #: builtin/log.c:1230 |
ef317cd5 | 7278 | msgid "Use [<prefix>] instead of [PATCH]" |
07432cef | 7279 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 7280 | |
89f80d72 | 7281 | #: builtin/log.c:1233 |
ef317cd5 | 7282 | msgid "store resulting files in <dir>" |
d9d56b23 | 7283 | msgstr "把结果文件存储在 <目录>" |
ef317cd5 | 7284 | |
89f80d72 | 7285 | #: builtin/log.c:1236 |
ef317cd5 | 7286 | msgid "don't strip/add [PATCH]" |
07432cef | 7287 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 7288 | |
89f80d72 | 7289 | #: builtin/log.c:1239 |
ef317cd5 | 7290 | msgid "don't output binary diffs" |
07432cef | 7291 | msgstr "不输出二进制差异" |
ef317cd5 | 7292 | |
89f80d72 JX |
7293 | #: builtin/log.c:1241 |
7294 | msgid "output all-zero hash in From header" | |
7295 | msgstr "在 From 头信息中输出全为零的哈希值" | |
7296 | ||
7297 | #: builtin/log.c:1243 | |
ef317cd5 | 7298 | msgid "don't include a patch matching a commit upstream" |
07432cef | 7299 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 7300 | |
89f80d72 | 7301 | #: builtin/log.c:1245 |
ef317cd5 | 7302 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 7303 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 7304 | |
89f80d72 | 7305 | #: builtin/log.c:1247 |
ef317cd5 | 7306 | msgid "Messaging" |
07432cef | 7307 | msgstr "邮件发送" |
ef317cd5 | 7308 | |
89f80d72 | 7309 | #: builtin/log.c:1248 |
ef317cd5 | 7310 | msgid "header" |
07432cef | 7311 | msgstr "header" |
ef317cd5 | 7312 | |
89f80d72 | 7313 | #: builtin/log.c:1249 |
ef317cd5 | 7314 | msgid "add email header" |
07432cef | 7315 | msgstr "添加邮件头" |
ef317cd5 | 7316 | |
89f80d72 | 7317 | #: builtin/log.c:1250 builtin/log.c:1252 |
ef317cd5 | 7318 | msgid "email" |
07432cef | 7319 | msgstr "邮件地址" |
ef317cd5 | 7320 | |
89f80d72 | 7321 | #: builtin/log.c:1250 |
ef317cd5 | 7322 | msgid "add To: header" |
07432cef | 7323 | msgstr "添加收件人" |
ef317cd5 | 7324 | |
89f80d72 | 7325 | #: builtin/log.c:1252 |
ef317cd5 | 7326 | msgid "add Cc: header" |
07432cef | 7327 | msgstr "添加抄送" |
ef317cd5 | 7328 | |
89f80d72 | 7329 | #: builtin/log.c:1254 |
2e8451e8 | 7330 | msgid "ident" |
d9d56b23 | 7331 | msgstr "标识" |
2e8451e8 | 7332 | |
89f80d72 | 7333 | #: builtin/log.c:1255 |
2e8451e8 | 7334 | msgid "set From address to <ident> (or committer ident if absent)" |
4375c10e | 7335 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)" |
2e8451e8 | 7336 | |
89f80d72 | 7337 | #: builtin/log.c:1257 |
ef317cd5 | 7338 | msgid "message-id" |
d9d56b23 | 7339 | msgstr "邮件标识" |
ef317cd5 | 7340 | |
89f80d72 | 7341 | #: builtin/log.c:1258 |
ef317cd5 | 7342 | msgid "make first mail a reply to <message-id>" |
d9d56b23 | 7343 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
ef317cd5 | 7344 | |
89f80d72 | 7345 | #: builtin/log.c:1259 builtin/log.c:1262 |
ef317cd5 | 7346 | msgid "boundary" |
07432cef | 7347 | msgstr "边界" |
ef317cd5 | 7348 | |
89f80d72 | 7349 | #: builtin/log.c:1260 |
ef317cd5 | 7350 | msgid "attach the patch" |
07432cef | 7351 | msgstr "附件方式添加补丁" |
ef317cd5 | 7352 | |
89f80d72 | 7353 | #: builtin/log.c:1263 |
ef317cd5 | 7354 | msgid "inline the patch" |
07432cef | 7355 | msgstr "内联显示补丁" |
ef317cd5 | 7356 | |
89f80d72 | 7357 | #: builtin/log.c:1267 |
ef317cd5 | 7358 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 7359 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 7360 | |
89f80d72 | 7361 | #: builtin/log.c:1269 |
ef317cd5 | 7362 | msgid "signature" |
07432cef | 7363 | msgstr "签名" |
ef317cd5 | 7364 | |
89f80d72 | 7365 | #: builtin/log.c:1270 |
ef317cd5 | 7366 | msgid "add a signature" |
07432cef | 7367 | msgstr "添加一个签名" |
ef317cd5 | 7368 | |
89f80d72 | 7369 | #: builtin/log.c:1272 |
6acbf033 JX |
7370 | msgid "add a signature from a file" |
7371 | msgstr "从文件添加一个签名" | |
7372 | ||
89f80d72 | 7373 | #: builtin/log.c:1273 |
ef317cd5 | 7374 | msgid "don't print the patch filenames" |
07432cef | 7375 | msgstr "不要打印补丁文件名" |
ef317cd5 | 7376 | |
89f80d72 | 7377 | #: builtin/log.c:1362 |
c04f5ac3 JX |
7378 | msgid "-n and -k are mutually exclusive." |
7379 | msgstr "-n 和 -k 互斥。" | |
7380 | ||
89f80d72 | 7381 | #: builtin/log.c:1364 |
c04f5ac3 JX |
7382 | msgid "--subject-prefix and -k are mutually exclusive." |
7383 | msgstr "--subject-prefix 和 -k 互斥。" | |
7384 | ||
89f80d72 | 7385 | #: builtin/log.c:1372 |
c04f5ac3 JX |
7386 | msgid "--name-only does not make sense" |
7387 | msgstr "--name-only 无意义" | |
7388 | ||
89f80d72 | 7389 | #: builtin/log.c:1374 |
c04f5ac3 JX |
7390 | msgid "--name-status does not make sense" |
7391 | msgstr "--name-status 无意义" | |
7392 | ||
89f80d72 | 7393 | #: builtin/log.c:1376 |
c04f5ac3 JX |
7394 | msgid "--check does not make sense" |
7395 | msgstr "--check 无意义" | |
7396 | ||
89f80d72 | 7397 | #: builtin/log.c:1401 |
c04f5ac3 JX |
7398 | msgid "standard output, or directory, which one?" |
7399 | msgstr "标准输出或目录,哪一个?" | |
7400 | ||
89f80d72 | 7401 | #: builtin/log.c:1403 |
c04f5ac3 JX |
7402 | #, c-format |
7403 | msgid "Could not create directory '%s'" | |
90e6ef53 | 7404 | msgstr "不能创建目录 '%s'" |
c04f5ac3 | 7405 | |
89f80d72 | 7406 | #: builtin/log.c:1500 |
6acbf033 JX |
7407 | #, c-format |
7408 | msgid "unable to read signature file '%s'" | |
7409 | msgstr "无法读取签名文件 '%s'" | |
7410 | ||
89f80d72 | 7411 | #: builtin/log.c:1563 |
c04f5ac3 JX |
7412 | msgid "Failed to create output files" |
7413 | msgstr "无法创建输出文件" | |
7414 | ||
89f80d72 | 7415 | #: builtin/log.c:1611 |
ef317cd5 | 7416 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 7417 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 7418 | |
89f80d72 | 7419 | #: builtin/log.c:1665 |
c04f5ac3 JX |
7420 | #, c-format |
7421 | msgid "" | |
7422 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
d9d56b23 | 7423 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
c04f5ac3 | 7424 | |
89f80d72 | 7425 | #: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690 |
c04f5ac3 JX |
7426 | #, c-format |
7427 | msgid "Unknown commit %s" | |
7428 | msgstr "未知提交 %s" | |
7429 | ||
814ff314 JX |
7430 | #: builtin/ls-files.c:358 |
7431 | msgid "git ls-files [<options>] [<file>...]" | |
7432 | msgstr "git ls-files [<选项>] [<文件>...]" | |
ef317cd5 | 7433 | |
814ff314 | 7434 | #: builtin/ls-files.c:415 |
ef317cd5 | 7435 | msgid "identify the file status with tags" |
07432cef | 7436 | msgstr "用标签标识文件的状态" |
ef317cd5 | 7437 | |
814ff314 | 7438 | #: builtin/ls-files.c:417 |
ef317cd5 | 7439 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 7440 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 7441 | |
814ff314 | 7442 | #: builtin/ls-files.c:419 |
ef317cd5 | 7443 | msgid "show cached files in the output (default)" |
07432cef | 7444 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 7445 | |
814ff314 | 7446 | #: builtin/ls-files.c:421 |
ef317cd5 | 7447 | msgid "show deleted files in the output" |
07432cef | 7448 | msgstr "显示已删除的文件" |
ef317cd5 | 7449 | |
814ff314 | 7450 | #: builtin/ls-files.c:423 |
ef317cd5 | 7451 | msgid "show modified files in the output" |
07432cef | 7452 | msgstr "显示已修改的文件" |
ef317cd5 | 7453 | |
814ff314 | 7454 | #: builtin/ls-files.c:425 |
ef317cd5 | 7455 | msgid "show other files in the output" |
07432cef | 7456 | msgstr "显示其它文件" |
ef317cd5 | 7457 | |
814ff314 | 7458 | #: builtin/ls-files.c:427 |
ef317cd5 | 7459 | msgid "show ignored files in the output" |
07432cef | 7460 | msgstr "显示忽略的文件" |
ef317cd5 | 7461 | |
814ff314 | 7462 | #: builtin/ls-files.c:430 |
ef317cd5 | 7463 | msgid "show staged contents' object name in the output" |
07432cef | 7464 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 7465 | |
814ff314 | 7466 | #: builtin/ls-files.c:432 |
ef317cd5 | 7467 | msgid "show files on the filesystem that need to be removed" |
07432cef | 7468 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 7469 | |
814ff314 | 7470 | #: builtin/ls-files.c:434 |
220c313c | 7471 | msgid "show 'other' directories' names only" |
07432cef | 7472 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 7473 | |
814ff314 | 7474 | #: builtin/ls-files.c:437 |
ef317cd5 | 7475 | msgid "don't show empty directories" |
07432cef | 7476 | msgstr "不显示空目录" |
ef317cd5 | 7477 | |
814ff314 | 7478 | #: builtin/ls-files.c:440 |
ef317cd5 | 7479 | msgid "show unmerged files in the output" |
07432cef | 7480 | msgstr "显示未合并的文件" |
ef317cd5 | 7481 | |
814ff314 | 7482 | #: builtin/ls-files.c:442 |
ef317cd5 | 7483 | msgid "show resolve-undo information" |
07432cef | 7484 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 7485 | |
814ff314 | 7486 | #: builtin/ls-files.c:444 |
ef317cd5 | 7487 | msgid "skip files matching pattern" |
07432cef | 7488 | msgstr "匹配排除文件的模式" |
ef317cd5 | 7489 | |
814ff314 | 7490 | #: builtin/ls-files.c:447 |
ef317cd5 | 7491 | msgid "exclude patterns are read from <file>" |
07432cef | 7492 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 7493 | |
814ff314 | 7494 | #: builtin/ls-files.c:450 |
ef317cd5 | 7495 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 7496 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 7497 | |
814ff314 | 7498 | #: builtin/ls-files.c:452 |
ef317cd5 | 7499 | msgid "add the standard git exclusions" |
07432cef | 7500 | msgstr "添加标准的 git 排除" |
ef317cd5 | 7501 | |
814ff314 | 7502 | #: builtin/ls-files.c:455 |
ef317cd5 | 7503 | msgid "make the output relative to the project top directory" |
07432cef | 7504 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 7505 | |
814ff314 | 7506 | #: builtin/ls-files.c:458 |
ef317cd5 | 7507 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 7508 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 7509 | |
814ff314 | 7510 | #: builtin/ls-files.c:459 |
ef317cd5 | 7511 | msgid "tree-ish" |
07432cef | 7512 | msgstr "树或提交" |
ef317cd5 | 7513 | |
814ff314 | 7514 | #: builtin/ls-files.c:460 |
ef317cd5 | 7515 | msgid "pretend that paths removed since <tree-ish> are still present" |
07432cef | 7516 | msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" |
ef317cd5 | 7517 | |
814ff314 | 7518 | #: builtin/ls-files.c:462 |
ef317cd5 | 7519 | msgid "show debugging data" |
07432cef | 7520 | msgstr "显示调试数据" |
ef317cd5 | 7521 | |
90314792 | 7522 | #: builtin/ls-tree.c:28 |
ef317cd5 | 7523 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
07432cef | 7524 | msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 7525 | |
94550ed3 | 7526 | #: builtin/ls-tree.c:128 |
ef317cd5 | 7527 | msgid "only show trees" |
07432cef | 7528 | msgstr "只显示树" |
ef317cd5 | 7529 | |
94550ed3 | 7530 | #: builtin/ls-tree.c:130 |
ef317cd5 | 7531 | msgid "recurse into subtrees" |
07432cef | 7532 | msgstr "递归到子树" |
ef317cd5 | 7533 | |
94550ed3 | 7534 | #: builtin/ls-tree.c:132 |
ef317cd5 | 7535 | msgid "show trees when recursing" |
07432cef | 7536 | msgstr "当递归时显示树" |
ef317cd5 | 7537 | |
94550ed3 | 7538 | #: builtin/ls-tree.c:135 |
ef317cd5 | 7539 | msgid "terminate entries with NUL byte" |
4375c10e | 7540 | msgstr "条目以 NUL 字符终止" |
ef317cd5 | 7541 | |
94550ed3 | 7542 | #: builtin/ls-tree.c:136 |
ef317cd5 | 7543 | msgid "include object size" |
07432cef | 7544 | msgstr "包括对象大小" |
ef317cd5 | 7545 | |
94550ed3 | 7546 | #: builtin/ls-tree.c:138 builtin/ls-tree.c:140 |
ef317cd5 | 7547 | msgid "list only filenames" |
07432cef | 7548 | msgstr "只列出文件名" |
ef317cd5 | 7549 | |
94550ed3 | 7550 | #: builtin/ls-tree.c:143 |
ef317cd5 | 7551 | msgid "use full path names" |
07432cef | 7552 | msgstr "使用文件的全路径" |
ef317cd5 | 7553 | |
94550ed3 | 7554 | #: builtin/ls-tree.c:145 |
ef317cd5 | 7555 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 7556 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 | 7557 | |
04cb2f28 | 7558 | #: builtin/merge.c:45 |
814ff314 JX |
7559 | msgid "git merge [<options>] [<commit>...]" |
7560 | msgstr "git merge [<选项>] [<提交>...]" | |
ef317cd5 | 7561 | |
04cb2f28 | 7562 | #: builtin/merge.c:46 |
814ff314 JX |
7563 | msgid "git merge [<options>] <msg> HEAD <commit>" |
7564 | msgstr "git merge [<选项>] <说明> HEAD <提交>" | |
ef317cd5 | 7565 | |
04cb2f28 | 7566 | #: builtin/merge.c:47 |
ef317cd5 | 7567 | msgid "git merge --abort" |
07432cef | 7568 | msgstr "git merge --abort" |
ef317cd5 | 7569 | |
04cb2f28 | 7570 | #: builtin/merge.c:100 |
c04f5ac3 JX |
7571 | msgid "switch `m' requires a value" |
7572 | msgstr "开关 `m' 需要一个值" | |
7573 | ||
04cb2f28 | 7574 | #: builtin/merge.c:137 |
c04f5ac3 JX |
7575 | #, c-format |
7576 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 7577 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 7578 | |
04cb2f28 | 7579 | #: builtin/merge.c:138 |
c04f5ac3 JX |
7580 | #, c-format |
7581 | msgid "Available strategies are:" | |
7582 | msgstr "可用的策略有:" | |
7583 | ||
04cb2f28 | 7584 | #: builtin/merge.c:143 |
c04f5ac3 JX |
7585 | #, c-format |
7586 | msgid "Available custom strategies are:" | |
7587 | msgstr "可用的自定义策略有:" | |
7588 | ||
1b7f4a34 | 7589 | #: builtin/merge.c:193 builtin/pull.c:119 |
ef317cd5 | 7590 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 7591 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 7592 | |
1b7f4a34 | 7593 | #: builtin/merge.c:196 builtin/pull.c:122 |
ef317cd5 | 7594 | msgid "show a diffstat at the end of the merge" |
07432cef | 7595 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 7596 | |
1b7f4a34 | 7597 | #: builtin/merge.c:197 builtin/pull.c:125 |
ef317cd5 | 7598 | msgid "(synonym to --stat)" |
07432cef | 7599 | msgstr "(和 --stat 同义)" |
ef317cd5 | 7600 | |
1b7f4a34 | 7601 | #: builtin/merge.c:199 builtin/pull.c:128 |
ef317cd5 | 7602 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 7603 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 7604 | |
1b7f4a34 | 7605 | #: builtin/merge.c:202 builtin/pull.c:131 |
ef317cd5 | 7606 | msgid "create a single commit instead of doing a merge" |
07432cef | 7607 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 7608 | |
1b7f4a34 | 7609 | #: builtin/merge.c:204 builtin/pull.c:134 |
ef317cd5 | 7610 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 7611 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 7612 | |
1b7f4a34 | 7613 | #: builtin/merge.c:206 builtin/pull.c:137 |
ef317cd5 | 7614 | msgid "edit message before committing" |
07432cef | 7615 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 7616 | |
04cb2f28 | 7617 | #: builtin/merge.c:207 |
ef317cd5 | 7618 | msgid "allow fast-forward (default)" |
07432cef | 7619 | msgstr "允许快进(默认)" |
ef317cd5 | 7620 | |
1b7f4a34 | 7621 | #: builtin/merge.c:209 builtin/pull.c:143 |
ef317cd5 | 7622 | msgid "abort if fast-forward is not possible" |
07432cef | 7623 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 7624 | |
04cb2f28 | 7625 | #: builtin/merge.c:213 |
1003b3a5 JX |
7626 | msgid "Verify that the named commit has a valid GPG signature" |
7627 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" | |
7628 | ||
1b7f4a34 JX |
7629 | #: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148 |
7630 | #: builtin/revert.c:89 | |
ef317cd5 | 7631 | msgid "strategy" |
07432cef | 7632 | msgstr "策略" |
ef317cd5 | 7633 | |
1b7f4a34 | 7634 | #: builtin/merge.c:215 builtin/pull.c:149 |
ef317cd5 | 7635 | msgid "merge strategy to use" |
07432cef | 7636 | msgstr "要使用的合并策略" |
ef317cd5 | 7637 | |
1b7f4a34 | 7638 | #: builtin/merge.c:216 builtin/pull.c:152 |
ef317cd5 | 7639 | msgid "option=value" |
07432cef | 7640 | msgstr "option=value" |
ef317cd5 | 7641 | |
1b7f4a34 | 7642 | #: builtin/merge.c:217 builtin/pull.c:153 |
ef317cd5 | 7643 | msgid "option for selected merge strategy" |
07432cef | 7644 | msgstr "所选的合并策略的选项" |
ef317cd5 | 7645 | |
04cb2f28 | 7646 | #: builtin/merge.c:219 |
ef317cd5 | 7647 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 7648 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 7649 | |
04cb2f28 | 7650 | #: builtin/merge.c:223 |
ef317cd5 | 7651 | msgid "abort the current in-progress merge" |
07432cef | 7652 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 7653 | |
04cb2f28 | 7654 | #: builtin/merge.c:251 |
c04f5ac3 JX |
7655 | msgid "could not run stash." |
7656 | msgstr "不能进行进度保存。" | |
7657 | ||
04cb2f28 | 7658 | #: builtin/merge.c:256 |
c04f5ac3 JX |
7659 | msgid "stash failed" |
7660 | msgstr "进度保存失败" | |
7661 | ||
04cb2f28 | 7662 | #: builtin/merge.c:261 |
c04f5ac3 JX |
7663 | #, c-format |
7664 | msgid "not a valid object: %s" | |
7665 | msgstr "不是一个有效对象:%s" | |
7666 | ||
04cb2f28 | 7667 | #: builtin/merge.c:280 builtin/merge.c:297 |
c04f5ac3 JX |
7668 | msgid "read-tree failed" |
7669 | msgstr "读取树失败" | |
7670 | ||
90e6ef53 | 7671 | # 译者:注意保持前导空格 |
04cb2f28 | 7672 | #: builtin/merge.c:327 |
c04f5ac3 JX |
7673 | msgid " (nothing to squash)" |
7674 | msgstr " (无可压缩)" | |
7675 | ||
04cb2f28 | 7676 | #: builtin/merge.c:340 |
c04f5ac3 JX |
7677 | #, c-format |
7678 | msgid "Squash commit -- not updating HEAD\n" | |
7679 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
7680 | ||
1b7f4a34 JX |
7681 | #: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 |
7682 | #: builtin/merge.c:988 | |
7683 | #, c-format | |
7684 | msgid "Could not write to '%s'" | |
7685 | msgstr "不能写入 '%s'" | |
7686 | ||
04cb2f28 | 7687 | #: builtin/merge.c:372 |
c04f5ac3 JX |
7688 | msgid "Writing SQUASH_MSG" |
7689 | msgstr "写入 SQUASH_MSG" | |
7690 | ||
04cb2f28 | 7691 | #: builtin/merge.c:374 |
c04f5ac3 JX |
7692 | msgid "Finishing SQUASH_MSG" |
7693 | msgstr "完成 SQUASH_MSG" | |
7694 | ||
04cb2f28 | 7695 | #: builtin/merge.c:397 |
c04f5ac3 JX |
7696 | #, c-format |
7697 | msgid "No merge message -- not updating HEAD\n" | |
7698 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
7699 | ||
04cb2f28 | 7700 | #: builtin/merge.c:447 |
c04f5ac3 JX |
7701 | #, c-format |
7702 | msgid "'%s' does not point to a commit" | |
7703 | msgstr "'%s' 没有指向一个提交" | |
7704 | ||
7aea43ff | 7705 | #: builtin/merge.c:537 |
c04f5ac3 JX |
7706 | #, c-format |
7707 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 7708 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 7709 | |
7aea43ff | 7710 | #: builtin/merge.c:656 |
c04f5ac3 JX |
7711 | msgid "Not handling anything other than two heads merge." |
7712 | msgstr "不能处理两个头合并之外的任何操作。" | |
7713 | ||
7aea43ff | 7714 | #: builtin/merge.c:670 |
c04f5ac3 JX |
7715 | #, c-format |
7716 | msgid "Unknown option for merge-recursive: -X%s" | |
7717 | msgstr "merge-recursive 的未知选项:-X%s" | |
7718 | ||
7aea43ff | 7719 | #: builtin/merge.c:683 |
c04f5ac3 JX |
7720 | #, c-format |
7721 | msgid "unable to write %s" | |
7722 | msgstr "不能写 %s" | |
7723 | ||
7aea43ff | 7724 | #: builtin/merge.c:772 |
c04f5ac3 JX |
7725 | #, c-format |
7726 | msgid "Could not read from '%s'" | |
7727 | msgstr "不能从 '%s' 读取" | |
7728 | ||
7aea43ff | 7729 | #: builtin/merge.c:781 |
c04f5ac3 JX |
7730 | #, c-format |
7731 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
7732 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
7733 | ||
7aea43ff | 7734 | #: builtin/merge.c:787 |
a77c07d9 | 7735 | #, c-format |
c04f5ac3 JX |
7736 | msgid "" |
7737 | "Please enter a commit message to explain why this merge is necessary,\n" | |
7738 | "especially if it merges an updated upstream into a topic branch.\n" | |
7739 | "\n" | |
a77c07d9 | 7740 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" |
c04f5ac3 JX |
7741 | "the commit.\n" |
7742 | msgstr "" | |
7743 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
7744 | "合并到主题分支。\n" | |
7745 | "\n" | |
a77c07d9 | 7746 | "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n" |
c04f5ac3 | 7747 | |
7aea43ff | 7748 | #: builtin/merge.c:811 |
c04f5ac3 JX |
7749 | msgid "Empty commit message." |
7750 | msgstr "空提交信息。" | |
7751 | ||
7aea43ff | 7752 | #: builtin/merge.c:823 |
c04f5ac3 JX |
7753 | #, c-format |
7754 | msgid "Wonderful.\n" | |
7755 | msgstr "太棒了。\n" | |
7756 | ||
7aea43ff | 7757 | #: builtin/merge.c:878 |
c04f5ac3 JX |
7758 | #, c-format |
7759 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
7760 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
7761 | ||
7aea43ff | 7762 | #: builtin/merge.c:894 |
c04f5ac3 JX |
7763 | #, c-format |
7764 | msgid "'%s' is not a commit" | |
7765 | msgstr "'%s' 不是一个提交" | |
7766 | ||
7aea43ff | 7767 | #: builtin/merge.c:935 |
c04f5ac3 | 7768 | msgid "No current branch." |
90e6ef53 | 7769 | msgstr "没有当前分支。" |
c04f5ac3 | 7770 | |
7aea43ff | 7771 | #: builtin/merge.c:937 |
c04f5ac3 | 7772 | msgid "No remote for the current branch." |
160fb2b2 | 7773 | msgstr "当前分支没有对应的远程仓库。" |
c04f5ac3 | 7774 | |
7aea43ff | 7775 | #: builtin/merge.c:939 |
c04f5ac3 | 7776 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 7777 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 7778 | |
7aea43ff | 7779 | #: builtin/merge.c:944 |
170e9899 | 7780 | #, c-format |
2e8451e8 JX |
7781 | msgid "No remote-tracking branch for %s from %s" |
7782 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 7783 | |
94550ed3 | 7784 | #: builtin/merge.c:1079 |
7aea43ff JX |
7785 | #, c-format |
7786 | msgid "could not close '%s'" | |
7787 | msgstr "不能关闭 '%s'" | |
7788 | ||
94550ed3 | 7789 | #: builtin/merge.c:1206 |
c04f5ac3 | 7790 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 7791 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 7792 | |
94550ed3 | 7793 | #: builtin/merge.c:1222 |
c04f5ac3 JX |
7794 | msgid "" |
7795 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
220c313c | 7796 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
7797 | msgstr "" |
7798 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 7799 | "请在合并前先提交您的修改。" |
c04f5ac3 | 7800 | |
94550ed3 | 7801 | #: builtin/merge.c:1229 |
c04f5ac3 JX |
7802 | msgid "" |
7803 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
220c313c | 7804 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
7805 | msgstr "" |
7806 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 7807 | "请在合并前先提交您的修改。" |
c04f5ac3 | 7808 | |
94550ed3 | 7809 | #: builtin/merge.c:1232 |
c04f5ac3 JX |
7810 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
7811 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
7812 | ||
94550ed3 | 7813 | #: builtin/merge.c:1241 |
c04f5ac3 | 7814 | msgid "You cannot combine --squash with --no-ff." |
649900bc | 7815 | msgstr "您不能将 --squash 与 --no-ff 同时使用。" |
c04f5ac3 | 7816 | |
94550ed3 | 7817 | #: builtin/merge.c:1249 |
c04f5ac3 | 7818 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 7819 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 7820 | |
94550ed3 | 7821 | #: builtin/merge.c:1266 |
c04f5ac3 JX |
7822 | msgid "Squash commit into empty head not supported yet" |
7823 | msgstr "尚不支持到空分支的压缩提交" | |
7824 | ||
94550ed3 | 7825 | #: builtin/merge.c:1268 |
c04f5ac3 JX |
7826 | msgid "Non-fast-forward commit does not make sense into an empty head" |
7827 | msgstr "到空分支的非快进式提交没有意义" | |
7828 | ||
94550ed3 | 7829 | #: builtin/merge.c:1274 |
2e8451e8 JX |
7830 | #, c-format |
7831 | msgid "%s - not something we can merge" | |
7832 | msgstr "%s - 不能被合并" | |
7833 | ||
94550ed3 | 7834 | #: builtin/merge.c:1276 |
7aea43ff JX |
7835 | msgid "Can merge only exactly one commit into empty head" |
7836 | msgstr "只能将一个提交合并到空分支上" | |
7837 | ||
94550ed3 | 7838 | #: builtin/merge.c:1331 |
1003b3a5 JX |
7839 | #, c-format |
7840 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
7841 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
7842 | ||
94550ed3 | 7843 | #: builtin/merge.c:1334 |
1003b3a5 JX |
7844 | #, c-format |
7845 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
7846 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
7847 | ||
94550ed3 | 7848 | #: builtin/merge.c:1337 |
1003b3a5 JX |
7849 | #, c-format |
7850 | msgid "Commit %s does not have a GPG signature." | |
7851 | msgstr "提交 %s 没有一个 GPG 签名。" | |
7852 | ||
94550ed3 | 7853 | #: builtin/merge.c:1340 |
1003b3a5 JX |
7854 | #, c-format |
7855 | msgid "Commit %s has a good GPG signature by %s\n" | |
7856 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
7857 | ||
7aea43ff | 7858 | #: builtin/merge.c:1423 |
c04f5ac3 JX |
7859 | #, c-format |
7860 | msgid "Updating %s..%s\n" | |
7861 | msgstr "更新 %s..%s\n" | |
7862 | ||
94550ed3 | 7863 | #: builtin/merge.c:1460 |
c04f5ac3 JX |
7864 | #, c-format |
7865 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 7866 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 7867 | |
94550ed3 | 7868 | #: builtin/merge.c:1467 |
c04f5ac3 JX |
7869 | #, c-format |
7870 | msgid "Nope.\n" | |
7871 | msgstr "无。\n" | |
7872 | ||
94550ed3 | 7873 | #: builtin/merge.c:1499 |
c04f5ac3 | 7874 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 7875 | msgstr "无法快进,终止。" |
c04f5ac3 | 7876 | |
94550ed3 | 7877 | #: builtin/merge.c:1522 builtin/merge.c:1601 |
c04f5ac3 JX |
7878 | #, c-format |
7879 | msgid "Rewinding the tree to pristine...\n" | |
7880 | msgstr "将树回滚至原始状态...\n" | |
7881 | ||
94550ed3 | 7882 | #: builtin/merge.c:1526 |
c04f5ac3 JX |
7883 | #, c-format |
7884 | msgid "Trying merge strategy %s...\n" | |
7885 | msgstr "尝试合并策略 %s...\n" | |
7886 | ||
94550ed3 | 7887 | #: builtin/merge.c:1592 |
c04f5ac3 JX |
7888 | #, c-format |
7889 | msgid "No merge strategy handled the merge.\n" | |
7890 | msgstr "没有合并策略处理此合并。\n" | |
7891 | ||
94550ed3 | 7892 | #: builtin/merge.c:1594 |
c04f5ac3 JX |
7893 | #, c-format |
7894 | msgid "Merge with strategy %s failed.\n" | |
7895 | msgstr "使用策略 %s 合并失败。\n" | |
7896 | ||
94550ed3 | 7897 | #: builtin/merge.c:1603 |
c04f5ac3 JX |
7898 | #, c-format |
7899 | msgid "Using the %s to prepare resolving by hand.\n" | |
7900 | msgstr "使用 %s 以准备手工解决。\n" | |
7901 | ||
94550ed3 | 7902 | #: builtin/merge.c:1615 |
c04f5ac3 JX |
7903 | #, c-format |
7904 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
7905 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
7906 | ||
cfff71a9 | 7907 | #: builtin/merge-base.c:29 |
814ff314 JX |
7908 | msgid "git merge-base [-a | --all] <commit> <commit>..." |
7909 | msgstr "git merge-base [-a | --all] <提交> <提交>..." | |
ef317cd5 | 7910 | |
cfff71a9 | 7911 | #: builtin/merge-base.c:30 |
814ff314 JX |
7912 | msgid "git merge-base [-a | --all] --octopus <commit>..." |
7913 | msgstr "git merge-base [-a | --all] --octopus <提交>..." | |
ef317cd5 | 7914 | |
cfff71a9 | 7915 | #: builtin/merge-base.c:31 |
ef317cd5 | 7916 | msgid "git merge-base --independent <commit>..." |
07432cef | 7917 | msgstr "git merge-base --independent <提交>..." |
ef317cd5 | 7918 | |
cfff71a9 | 7919 | #: builtin/merge-base.c:32 |
ef317cd5 | 7920 | msgid "git merge-base --is-ancestor <commit> <commit>" |
07432cef | 7921 | msgstr "git merge-base --is-ancestor <提交> <提交>" |
ef317cd5 | 7922 | |
cfff71a9 JX |
7923 | #: builtin/merge-base.c:33 |
7924 | msgid "git merge-base --fork-point <ref> [<commit>]" | |
d9d56b23 | 7925 | msgstr "git merge-base --fork-point <引用> [<提交>]" |
cfff71a9 JX |
7926 | |
7927 | #: builtin/merge-base.c:214 | |
ef317cd5 | 7928 | msgid "output all common ancestors" |
07432cef | 7929 | msgstr "输出所有共同的祖先" |
ef317cd5 | 7930 | |
cfff71a9 | 7931 | #: builtin/merge-base.c:216 |
ef317cd5 | 7932 | msgid "find ancestors for a single n-way merge" |
07432cef | 7933 | msgstr "查找一个多路合并的祖先提交" |
ef317cd5 | 7934 | |
cfff71a9 | 7935 | #: builtin/merge-base.c:218 |
ef317cd5 | 7936 | msgid "list revs not reachable from others" |
07432cef | 7937 | msgstr "显示不能被其他访问到的版本" |
ef317cd5 | 7938 | |
cfff71a9 | 7939 | #: builtin/merge-base.c:220 |
ef317cd5 | 7940 | msgid "is the first one ancestor of the other?" |
07432cef | 7941 | msgstr "第一个是其他的祖先提交么?" |
ef317cd5 | 7942 | |
cfff71a9 JX |
7943 | #: builtin/merge-base.c:222 |
7944 | msgid "find where <commit> forked from reflog of <ref>" | |
e397e7e3 | 7945 | msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" |
cfff71a9 | 7946 | |
ef317cd5 JX |
7947 | #: builtin/merge-file.c:8 |
7948 | msgid "" | |
814ff314 JX |
7949 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " |
7950 | "<orig-file> <file2>" | |
ef317cd5 | 7951 | msgstr "" |
814ff314 JX |
7952 | "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" |
7953 | "件> <文件2>" | |
ef317cd5 JX |
7954 | |
7955 | #: builtin/merge-file.c:33 | |
7956 | msgid "send results to standard output" | |
07432cef | 7957 | msgstr "将结果发送到标准输出" |
ef317cd5 JX |
7958 | |
7959 | #: builtin/merge-file.c:34 | |
7960 | msgid "use a diff3 based merge" | |
07432cef | 7961 | msgstr "使用基于 diff3 的合并" |
ef317cd5 JX |
7962 | |
7963 | #: builtin/merge-file.c:35 | |
7964 | msgid "for conflicts, use our version" | |
07432cef | 7965 | msgstr "如果冲突,使用我们的版本" |
ef317cd5 JX |
7966 | |
7967 | #: builtin/merge-file.c:37 | |
7968 | msgid "for conflicts, use their version" | |
07432cef | 7969 | msgstr "如果冲突,使用他们的版本" |
ef317cd5 JX |
7970 | |
7971 | #: builtin/merge-file.c:39 | |
7972 | msgid "for conflicts, use a union version" | |
07432cef | 7973 | msgstr "如果冲突,使用联合版本" |
ef317cd5 JX |
7974 | |
7975 | #: builtin/merge-file.c:42 | |
7976 | msgid "for conflicts, use this marker size" | |
07432cef | 7977 | msgstr "如果冲突,使用指定长度的标记" |
ef317cd5 JX |
7978 | |
7979 | #: builtin/merge-file.c:43 | |
7980 | msgid "do not warn about conflicts" | |
07432cef | 7981 | msgstr "不要警告冲突" |
ef317cd5 JX |
7982 | |
7983 | #: builtin/merge-file.c:45 | |
814ff314 JX |
7984 | msgid "set labels for file1/orig-file/file2" |
7985 | msgstr "为 文件1/初始文件/文件2 设置标签" | |
c04f5ac3 | 7986 | |
6c94aba5 | 7987 | #: builtin/mktree.c:64 |
ef317cd5 | 7988 | msgid "git mktree [-z] [--missing] [--batch]" |
07432cef | 7989 | msgstr "git mktree [-z] [--missing] [--batch]" |
c04f5ac3 | 7990 | |
6c94aba5 | 7991 | #: builtin/mktree.c:150 |
ef317cd5 | 7992 | msgid "input is NUL terminated" |
07432cef | 7993 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 7994 | |
6c94aba5 | 7995 | #: builtin/mktree.c:151 builtin/write-tree.c:24 |
ef317cd5 | 7996 | msgid "allow missing objects" |
07432cef | 7997 | msgstr "允许丢失的对象" |
c04f5ac3 | 7998 | |
6c94aba5 | 7999 | #: builtin/mktree.c:152 |
ef317cd5 | 8000 | msgid "allow creation of more than one tree" |
07432cef | 8001 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 8002 | |
90314792 | 8003 | #: builtin/mv.c:15 |
814ff314 JX |
8004 | msgid "git mv [<options>] <source>... <destination>" |
8005 | msgstr "git mv [<选项>] <源>... <目标>" | |
c04f5ac3 | 8006 | |
220c313c JX |
8007 | #: builtin/mv.c:69 |
8008 | #, c-format | |
8009 | msgid "Directory %s is in index and no submodule?" | |
8010 | msgstr "目录 %s 在索引中并且不是子模组?" | |
8011 | ||
cfff71a9 | 8012 | #: builtin/mv.c:71 |
220c313c | 8013 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
160fb2b2 | 8014 | msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续" |
220c313c JX |
8015 | |
8016 | #: builtin/mv.c:89 | |
8017 | #, c-format | |
8018 | msgid "%.*s is in index" | |
8019 | msgstr "%.*s 在索引中" | |
8020 | ||
8021 | #: builtin/mv.c:111 | |
ef317cd5 | 8022 | msgid "force move/rename even if target exists" |
07432cef | 8023 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 8024 | |
220c313c | 8025 | #: builtin/mv.c:112 |
ef317cd5 | 8026 | msgid "skip move/rename errors" |
07432cef | 8027 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 8028 | |
220c313c JX |
8029 | #: builtin/mv.c:151 |
8030 | #, c-format | |
8031 | msgid "destination '%s' is not a directory" | |
8032 | msgstr "目标 '%s' 不是一个目录" | |
8033 | ||
8034 | #: builtin/mv.c:162 | |
c04f5ac3 JX |
8035 | #, c-format |
8036 | msgid "Checking rename of '%s' to '%s'\n" | |
8037 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
8038 | ||
220c313c | 8039 | #: builtin/mv.c:166 |
c04f5ac3 JX |
8040 | msgid "bad source" |
8041 | msgstr "坏的源" | |
8042 | ||
220c313c | 8043 | #: builtin/mv.c:169 |
c04f5ac3 JX |
8044 | msgid "can not move directory into itself" |
8045 | msgstr "不能将目录移动到自身" | |
8046 | ||
220c313c | 8047 | #: builtin/mv.c:172 |
c04f5ac3 JX |
8048 | msgid "cannot move directory over file" |
8049 | msgstr "不能将目录移动到文件" | |
8050 | ||
220c313c | 8051 | #: builtin/mv.c:181 |
c04f5ac3 JX |
8052 | msgid "source directory is empty" |
8053 | msgstr "源目录为空" | |
8054 | ||
220c313c | 8055 | #: builtin/mv.c:206 |
c04f5ac3 JX |
8056 | msgid "not under version control" |
8057 | msgstr "不在版本控制之下" | |
8058 | ||
220c313c | 8059 | #: builtin/mv.c:209 |
c04f5ac3 JX |
8060 | msgid "destination exists" |
8061 | msgstr "目标已存在" | |
8062 | ||
220c313c | 8063 | #: builtin/mv.c:217 |
c04f5ac3 JX |
8064 | #, c-format |
8065 | msgid "overwriting '%s'" | |
8066 | msgstr "覆盖 '%s'" | |
8067 | ||
220c313c | 8068 | #: builtin/mv.c:220 |
c04f5ac3 JX |
8069 | msgid "Cannot overwrite" |
8070 | msgstr "不能覆盖" | |
8071 | ||
220c313c | 8072 | #: builtin/mv.c:223 |
c04f5ac3 JX |
8073 | msgid "multiple sources for the same target" |
8074 | msgstr "同一目标具有多个源" | |
8075 | ||
220c313c | 8076 | #: builtin/mv.c:225 |
cfff71a9 JX |
8077 | msgid "destination directory does not exist" |
8078 | msgstr "目标目录不存在" | |
8079 | ||
220c313c | 8080 | #: builtin/mv.c:232 |
c04f5ac3 JX |
8081 | #, c-format |
8082 | msgid "%s, source=%s, destination=%s" | |
8083 | msgstr "%s,源=%s,目标=%s" | |
8084 | ||
220c313c | 8085 | #: builtin/mv.c:253 |
c04f5ac3 JX |
8086 | #, c-format |
8087 | msgid "Renaming %s to %s\n" | |
8088 | msgstr "重命名 %s 至 %s\n" | |
8089 | ||
94550ed3 | 8090 | #: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365 |
c04f5ac3 JX |
8091 | #, c-format |
8092 | msgid "renaming '%s' failed" | |
8093 | msgstr "重命名 '%s' 失败" | |
8094 | ||
94550ed3 | 8095 | #: builtin/name-rev.c:251 |
814ff314 JX |
8096 | msgid "git name-rev [<options>] <commit>..." |
8097 | msgstr "git name-rev [<选项>] <提交>..." | |
ef317cd5 | 8098 | |
94550ed3 | 8099 | #: builtin/name-rev.c:252 |
814ff314 JX |
8100 | msgid "git name-rev [<options>] --all" |
8101 | msgstr "git name-rev [<选项>] --all" | |
ef317cd5 | 8102 | |
94550ed3 | 8103 | #: builtin/name-rev.c:253 |
814ff314 JX |
8104 | msgid "git name-rev [<options>] --stdin" |
8105 | msgstr "git name-rev [<选项>] --stdin" | |
ef317cd5 | 8106 | |
94550ed3 | 8107 | #: builtin/name-rev.c:305 |
ef317cd5 | 8108 | msgid "print only names (no SHA-1)" |
07432cef | 8109 | msgstr "只打印名称(无 SHA-1)" |
ef317cd5 | 8110 | |
94550ed3 | 8111 | #: builtin/name-rev.c:306 |
ef317cd5 | 8112 | msgid "only use tags to name the commits" |
55a16ee4 | 8113 | msgstr "只使用标签来命名提交" |
ef317cd5 | 8114 | |
94550ed3 | 8115 | #: builtin/name-rev.c:308 |
ef317cd5 | 8116 | msgid "only use refs matching <pattern>" |
07432cef | 8117 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 8118 | |
94550ed3 | 8119 | #: builtin/name-rev.c:310 |
ef317cd5 | 8120 | msgid "list all commits reachable from all refs" |
07432cef | 8121 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 8122 | |
94550ed3 | 8123 | #: builtin/name-rev.c:311 |
ef317cd5 | 8124 | msgid "read from stdin" |
07432cef | 8125 | msgstr "从标准输入读取" |
ef317cd5 | 8126 | |
94550ed3 | 8127 | #: builtin/name-rev.c:312 |
90314792 JX |
8128 | msgid "allow to print `undefined` names (default)" |
8129 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 8130 | |
94550ed3 | 8131 | #: builtin/name-rev.c:318 |
2e8451e8 | 8132 | msgid "dereference tags in the input (internal use)" |
55a16ee4 | 8133 | msgstr "反向解析输入中的标签(内部使用)" |
2e8451e8 | 8134 | |
1b7f4a34 | 8135 | #: builtin/notes.c:25 |
814ff314 | 8136 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
07432cef | 8137 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 8138 | |
1b7f4a34 | 8139 | #: builtin/notes.c:26 |
ef317cd5 | 8140 | msgid "" |
814ff314 | 8141 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
04cb2f28 | 8142 | "| (-c | -C) <object>] [<object>]" |
ef317cd5 | 8143 | msgstr "" |
04cb2f28 JX |
8144 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
8145 | "| (-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 8146 | |
1b7f4a34 | 8147 | #: builtin/notes.c:27 |
814ff314 | 8148 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
07432cef | 8149 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 8150 | |
1b7f4a34 | 8151 | #: builtin/notes.c:28 |
ef317cd5 | 8152 | msgid "" |
814ff314 | 8153 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
04cb2f28 | 8154 | "(-c | -C) <object>] [<object>]" |
ef317cd5 | 8155 | msgstr "" |
04cb2f28 JX |
8156 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
8157 | "(-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 8158 | |
1b7f4a34 | 8159 | #: builtin/notes.c:29 |
814ff314 | 8160 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
04cb2f28 | 8161 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
ef317cd5 | 8162 | |
1b7f4a34 | 8163 | #: builtin/notes.c:30 |
814ff314 | 8164 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
07432cef | 8165 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 8166 | |
1b7f4a34 | 8167 | #: builtin/notes.c:31 |
ef317cd5 | 8168 | msgid "" |
814ff314 | 8169 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
07432cef | 8170 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 8171 | |
1b7f4a34 | 8172 | #: builtin/notes.c:32 |
ef317cd5 | 8173 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 8174 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 8175 | |
1b7f4a34 | 8176 | #: builtin/notes.c:33 |
ef317cd5 | 8177 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 8178 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 8179 | |
1b7f4a34 | 8180 | #: builtin/notes.c:34 |
814ff314 | 8181 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
07432cef | 8182 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 8183 | |
1b7f4a34 | 8184 | #: builtin/notes.c:35 |
814ff314 | 8185 | msgid "git notes [--ref <notes-ref>] prune [-n | -v]" |
07432cef | 8186 | msgstr "git notes [--ref <注解引用>] prune [-n | -v]" |
ef317cd5 | 8187 | |
1b7f4a34 | 8188 | #: builtin/notes.c:36 |
814ff314 | 8189 | msgid "git notes [--ref <notes-ref>] get-ref" |
07432cef | 8190 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 8191 | |
1b7f4a34 | 8192 | #: builtin/notes.c:41 |
ef317cd5 | 8193 | msgid "git notes [list [<object>]]" |
07432cef | 8194 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 8195 | |
1b7f4a34 | 8196 | #: builtin/notes.c:46 |
ef317cd5 | 8197 | msgid "git notes add [<options>] [<object>]" |
07432cef | 8198 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 8199 | |
1b7f4a34 | 8200 | #: builtin/notes.c:51 |
ef317cd5 | 8201 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 8202 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 8203 | |
1b7f4a34 | 8204 | #: builtin/notes.c:52 |
ef317cd5 | 8205 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 8206 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 8207 | |
1b7f4a34 | 8208 | #: builtin/notes.c:57 |
ef317cd5 | 8209 | msgid "git notes append [<options>] [<object>]" |
07432cef | 8210 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 8211 | |
1b7f4a34 | 8212 | #: builtin/notes.c:62 |
ef317cd5 | 8213 | msgid "git notes edit [<object>]" |
07432cef | 8214 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 8215 | |
1b7f4a34 | 8216 | #: builtin/notes.c:67 |
ef317cd5 | 8217 | msgid "git notes show [<object>]" |
07432cef | 8218 | msgstr "git notes show [<对象>]" |
ef317cd5 | 8219 | |
1b7f4a34 | 8220 | #: builtin/notes.c:72 |
814ff314 | 8221 | msgid "git notes merge [<options>] <notes-ref>" |
07432cef | 8222 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 8223 | |
1b7f4a34 | 8224 | #: builtin/notes.c:73 |
ef317cd5 | 8225 | msgid "git notes merge --commit [<options>]" |
07432cef | 8226 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 8227 | |
1b7f4a34 | 8228 | #: builtin/notes.c:74 |
ef317cd5 | 8229 | msgid "git notes merge --abort [<options>]" |
07432cef | 8230 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 8231 | |
1b7f4a34 | 8232 | #: builtin/notes.c:79 |
ef317cd5 | 8233 | msgid "git notes remove [<object>]" |
07432cef | 8234 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 8235 | |
1b7f4a34 | 8236 | #: builtin/notes.c:84 |
ef317cd5 | 8237 | msgid "git notes prune [<options>]" |
07432cef | 8238 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 8239 | |
1b7f4a34 | 8240 | #: builtin/notes.c:89 |
ef317cd5 | 8241 | msgid "git notes get-ref" |
07432cef | 8242 | msgstr "git notes get-ref" |
ef317cd5 | 8243 | |
1b7f4a34 | 8244 | #: builtin/notes.c:147 |
c04f5ac3 JX |
8245 | #, c-format |
8246 | msgid "unable to start 'show' for object '%s'" | |
8247 | msgstr "不能为对象 '%s' 开始 'show'" | |
8248 | ||
1b7f4a34 | 8249 | #: builtin/notes.c:151 |
a77c07d9 JX |
8250 | msgid "could not read 'show' output" |
8251 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 8252 | |
1b7f4a34 | 8253 | #: builtin/notes.c:159 |
c04f5ac3 JX |
8254 | #, c-format |
8255 | msgid "failed to finish 'show' for object '%s'" | |
8256 | msgstr "无法为对象 '%s' 完成 'show'" | |
8257 | ||
94550ed3 | 8258 | #: builtin/notes.c:174 builtin/tag.c:248 |
c04f5ac3 JX |
8259 | #, c-format |
8260 | msgid "could not create file '%s'" | |
8261 | msgstr "不能创建文件 '%s'" | |
8262 | ||
1b7f4a34 | 8263 | #: builtin/notes.c:193 |
c04f5ac3 JX |
8264 | msgid "Please supply the note contents using either -m or -F option" |
8265 | msgstr "请通过 -m 或 -F 选项为注解提供内容" | |
8266 | ||
1b7f4a34 | 8267 | #: builtin/notes.c:202 |
c04f5ac3 JX |
8268 | msgid "unable to write note object" |
8269 | msgstr "不能写注解对象" | |
8270 | ||
1b7f4a34 | 8271 | #: builtin/notes.c:204 |
c04f5ac3 | 8272 | #, c-format |
220c313c JX |
8273 | msgid "The note contents have been left in %s" |
8274 | msgstr "注解内容被留在 %s 中" | |
c04f5ac3 | 8275 | |
94550ed3 | 8276 | #: builtin/notes.c:232 builtin/tag.c:440 |
c04f5ac3 JX |
8277 | #, c-format |
8278 | msgid "cannot read '%s'" | |
8279 | msgstr "不能读取 '%s'" | |
8280 | ||
94550ed3 | 8281 | #: builtin/notes.c:234 builtin/tag.c:443 |
c04f5ac3 JX |
8282 | #, c-format |
8283 | msgid "could not open or read '%s'" | |
8284 | msgstr "不能打开或读取 '%s'" | |
8285 | ||
1b7f4a34 JX |
8286 | #: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 |
8287 | #: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507 | |
8288 | #: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653 | |
94550ed3 | 8289 | #: builtin/notes.c:877 builtin/tag.c:456 |
c04f5ac3 JX |
8290 | #, c-format |
8291 | msgid "Failed to resolve '%s' as a valid ref." | |
90e6ef53 | 8292 | msgstr "无法解析 '%s' 为一个有效引用。" |
c04f5ac3 | 8293 | |
1b7f4a34 | 8294 | #: builtin/notes.c:256 |
c04f5ac3 JX |
8295 | #, c-format |
8296 | msgid "Failed to read object '%s'." | |
8297 | msgstr "无法读取对象 '%s'。" | |
8298 | ||
1b7f4a34 | 8299 | #: builtin/notes.c:260 |
6c94aba5 JX |
8300 | #, c-format |
8301 | msgid "Cannot read note data from non-blob object '%s'." | |
8302 | msgstr "不能从非数据对象 '%s' 中读取注解数据" | |
8303 | ||
1b7f4a34 JX |
8304 | #: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490 |
8305 | #: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646 | |
8306 | #: builtin/notes.c:942 | |
c04f5ac3 JX |
8307 | msgid "too many parameters" |
8308 | msgstr "参数太多" | |
8309 | ||
1b7f4a34 | 8310 | #: builtin/notes.c:372 builtin/notes.c:659 |
c04f5ac3 JX |
8311 | #, c-format |
8312 | msgid "No note found for object %s." | |
8313 | msgstr "未发现对象 %s 的注解。" | |
8314 | ||
1b7f4a34 | 8315 | #: builtin/notes.c:393 builtin/notes.c:556 |
ef317cd5 | 8316 | msgid "note contents as a string" |
07432cef | 8317 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 8318 | |
1b7f4a34 | 8319 | #: builtin/notes.c:396 builtin/notes.c:559 |
ef317cd5 | 8320 | msgid "note contents in a file" |
07432cef | 8321 | msgstr "注解内容到一个文件中" |
ef317cd5 | 8322 | |
1b7f4a34 | 8323 | #: builtin/notes.c:399 builtin/notes.c:562 |
ef317cd5 | 8324 | msgid "reuse and edit specified note object" |
07432cef | 8325 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 8326 | |
1b7f4a34 | 8327 | #: builtin/notes.c:402 builtin/notes.c:565 |
ef317cd5 | 8328 | msgid "reuse specified note object" |
07432cef | 8329 | msgstr "重用指定的注解对象" |
ef317cd5 | 8330 | |
1b7f4a34 | 8331 | #: builtin/notes.c:405 builtin/notes.c:568 |
04cb2f28 JX |
8332 | msgid "allow storing empty note" |
8333 | msgstr "允许保存空白注释" | |
8334 | ||
1b7f4a34 | 8335 | #: builtin/notes.c:406 builtin/notes.c:477 |
ef317cd5 | 8336 | msgid "replace existing notes" |
07432cef | 8337 | msgstr "替换已存在的注解" |
ef317cd5 | 8338 | |
1b7f4a34 | 8339 | #: builtin/notes.c:431 |
c04f5ac3 JX |
8340 | #, c-format |
8341 | msgid "" | |
8342 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
8343 | "existing notes" | |
8344 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
8345 | ||
1b7f4a34 | 8346 | #: builtin/notes.c:446 builtin/notes.c:525 |
c04f5ac3 JX |
8347 | #, c-format |
8348 | msgid "Overwriting existing notes for object %s\n" | |
8349 | msgstr "覆盖对象 %s 现存注解\n" | |
8350 | ||
1b7f4a34 | 8351 | #: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882 |
04cb2f28 JX |
8352 | #, c-format |
8353 | msgid "Removing note for object %s\n" | |
8354 | msgstr "删除对象 %s 的注解\n" | |
8355 | ||
1b7f4a34 | 8356 | #: builtin/notes.c:478 |
ef317cd5 | 8357 | msgid "read objects from stdin" |
07432cef | 8358 | msgstr "从标准输入读取对象" |
ef317cd5 | 8359 | |
1b7f4a34 | 8360 | #: builtin/notes.c:480 |
ef317cd5 | 8361 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 8362 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 8363 | |
1b7f4a34 | 8364 | #: builtin/notes.c:498 |
c04f5ac3 JX |
8365 | msgid "too few parameters" |
8366 | msgstr "参数太少" | |
8367 | ||
1b7f4a34 | 8368 | #: builtin/notes.c:519 |
c04f5ac3 JX |
8369 | #, c-format |
8370 | msgid "" | |
8371 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
8372 | "existing notes" | |
8373 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
8374 | ||
1b7f4a34 | 8375 | #: builtin/notes.c:531 |
c04f5ac3 JX |
8376 | #, c-format |
8377 | msgid "Missing notes on source object %s. Cannot copy." | |
8378 | msgstr "源对象 %s 缺少注解。不能拷贝。" | |
8379 | ||
1b7f4a34 | 8380 | #: builtin/notes.c:583 |
ef317cd5 JX |
8381 | #, c-format |
8382 | msgid "" | |
8383 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
8384 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
8385 | msgstr "" | |
8386 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
8387 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
8388 | ||
1b7f4a34 | 8389 | #: builtin/notes.c:764 |
ef317cd5 | 8390 | msgid "General options" |
07432cef | 8391 | msgstr "通用选项" |
ef317cd5 | 8392 | |
1b7f4a34 | 8393 | #: builtin/notes.c:766 |
ef317cd5 | 8394 | msgid "Merge options" |
07432cef | 8395 | msgstr "合并选项" |
ef317cd5 | 8396 | |
1b7f4a34 | 8397 | #: builtin/notes.c:768 |
ef317cd5 JX |
8398 | msgid "" |
8399 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
8400 | "cat_sort_uniq)" | |
07432cef | 8401 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 8402 | |
1b7f4a34 | 8403 | #: builtin/notes.c:770 |
ef317cd5 | 8404 | msgid "Committing unmerged notes" |
07432cef | 8405 | msgstr "提交未合并的注解" |
ef317cd5 | 8406 | |
1b7f4a34 | 8407 | #: builtin/notes.c:772 |
ef317cd5 | 8408 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 8409 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 8410 | |
1b7f4a34 | 8411 | #: builtin/notes.c:774 |
ef317cd5 | 8412 | msgid "Aborting notes merge resolution" |
07432cef | 8413 | msgstr "中止注解合并的方案" |
ef317cd5 | 8414 | |
1b7f4a34 | 8415 | #: builtin/notes.c:776 |
ef317cd5 | 8416 | msgid "abort notes merge" |
07432cef | 8417 | msgstr "中止注解合并" |
ef317cd5 | 8418 | |
1b7f4a34 JX |
8419 | #: builtin/notes.c:853 |
8420 | #, c-format | |
8421 | msgid "A notes merge into %s is already in-progress at %s" | |
8422 | msgstr "一个到 %s 的注解合并已经在 %s 执行中" | |
8423 | ||
8424 | #: builtin/notes.c:880 | |
ef317cd5 JX |
8425 | #, c-format |
8426 | msgid "Object %s has no note\n" | |
8427 | msgstr "对象 %s 没有注解\n" | |
8428 | ||
1b7f4a34 | 8429 | #: builtin/notes.c:892 |
ef317cd5 | 8430 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 8431 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 8432 | |
1b7f4a34 | 8433 | #: builtin/notes.c:895 |
ef317cd5 | 8434 | msgid "read object names from the standard input" |
07432cef | 8435 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 8436 | |
1b7f4a34 | 8437 | #: builtin/notes.c:976 |
6c94aba5 | 8438 | msgid "notes-ref" |
07432cef | 8439 | msgstr "注解引用" |
ef317cd5 | 8440 | |
1b7f4a34 | 8441 | #: builtin/notes.c:977 |
814ff314 | 8442 | msgid "use notes from <notes-ref>" |
07432cef | 8443 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 8444 | |
94550ed3 | 8445 | #: builtin/notes.c:1012 builtin/remote.c:1647 |
ef317cd5 JX |
8446 | #, c-format |
8447 | msgid "Unknown subcommand: %s" | |
8448 | msgstr "未知子命令:%s" | |
8449 | ||
220c313c | 8450 | #: builtin/pack-objects.c:28 |
1b7f4a34 JX |
8451 | msgid "" |
8452 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" | |
8453 | msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 8454 | |
220c313c | 8455 | #: builtin/pack-objects.c:29 |
1b7f4a34 JX |
8456 | msgid "" |
8457 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" | |
8458 | msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 8459 | |
814ff314 | 8460 | #: builtin/pack-objects.c:175 builtin/pack-objects.c:178 |
ef317cd5 JX |
8461 | #, c-format |
8462 | msgid "deflate error (%d)" | |
8463 | msgstr "压缩错误 (%d)" | |
8464 | ||
814ff314 | 8465 | #: builtin/pack-objects.c:771 |
6c94aba5 JX |
8466 | msgid "Writing objects" |
8467 | msgstr "写入对象中" | |
8468 | ||
7aea43ff | 8469 | #: builtin/pack-objects.c:1011 |
6c94aba5 JX |
8470 | msgid "disabling bitmap writing, as some objects are not being packed" |
8471 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" | |
8472 | ||
7aea43ff | 8473 | #: builtin/pack-objects.c:2171 |
6c94aba5 JX |
8474 | msgid "Compressing objects" |
8475 | msgstr "压缩对象中" | |
8476 | ||
7aea43ff | 8477 | #: builtin/pack-objects.c:2568 |
ef317cd5 JX |
8478 | #, c-format |
8479 | msgid "unsupported index version %s" | |
8480 | msgstr "不支持的索引版本 %s" | |
8481 | ||
7aea43ff | 8482 | #: builtin/pack-objects.c:2572 |
ef317cd5 JX |
8483 | #, c-format |
8484 | msgid "bad index version '%s'" | |
8485 | msgstr "坏的索引版本 '%s'" | |
8486 | ||
1b7f4a34 | 8487 | #: builtin/pack-objects.c:2602 |
ef317cd5 | 8488 | msgid "do not show progress meter" |
07432cef | 8489 | msgstr "不显示进度表" |
ef317cd5 | 8490 | |
1b7f4a34 | 8491 | #: builtin/pack-objects.c:2604 |
ef317cd5 | 8492 | msgid "show progress meter" |
07432cef | 8493 | msgstr "显示进度表" |
ef317cd5 | 8494 | |
1b7f4a34 | 8495 | #: builtin/pack-objects.c:2606 |
ef317cd5 | 8496 | msgid "show progress meter during object writing phase" |
07432cef | 8497 | msgstr "在对象写入阶段显示进度表" |
ef317cd5 | 8498 | |
1b7f4a34 | 8499 | #: builtin/pack-objects.c:2609 |
ef317cd5 | 8500 | msgid "similar to --all-progress when progress meter is shown" |
07432cef | 8501 | msgstr "当进度表显示时类似于 --all-progress" |
ef317cd5 | 8502 | |
1b7f4a34 | 8503 | #: builtin/pack-objects.c:2610 |
ef317cd5 | 8504 | msgid "version[,offset]" |
07432cef | 8505 | msgstr "版本[,偏移]" |
ef317cd5 | 8506 | |
1b7f4a34 | 8507 | #: builtin/pack-objects.c:2611 |
ef317cd5 | 8508 | msgid "write the pack index file in the specified idx format version" |
07432cef | 8509 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 8510 | |
1b7f4a34 | 8511 | #: builtin/pack-objects.c:2614 |
ef317cd5 | 8512 | msgid "maximum size of each output pack file" |
07432cef | 8513 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 8514 | |
1b7f4a34 | 8515 | #: builtin/pack-objects.c:2616 |
ef317cd5 | 8516 | msgid "ignore borrowed objects from alternate object store" |
160fb2b2 | 8517 | msgstr "忽略从备用对象存储里借用对象" |
ef317cd5 | 8518 | |
1b7f4a34 | 8519 | #: builtin/pack-objects.c:2618 |
ef317cd5 | 8520 | msgid "ignore packed objects" |
07432cef | 8521 | msgstr "忽略包对象" |
ef317cd5 | 8522 | |
1b7f4a34 | 8523 | #: builtin/pack-objects.c:2620 |
ef317cd5 | 8524 | msgid "limit pack window by objects" |
07432cef | 8525 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 8526 | |
1b7f4a34 | 8527 | #: builtin/pack-objects.c:2622 |
ef317cd5 | 8528 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 8529 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 8530 | |
1b7f4a34 | 8531 | #: builtin/pack-objects.c:2624 |
ef317cd5 | 8532 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 8533 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 8534 | |
1b7f4a34 | 8535 | #: builtin/pack-objects.c:2626 |
ef317cd5 | 8536 | msgid "reuse existing deltas" |
07432cef | 8537 | msgstr "重用已存在的 deltas" |
ef317cd5 | 8538 | |
1b7f4a34 | 8539 | #: builtin/pack-objects.c:2628 |
ef317cd5 | 8540 | msgid "reuse existing objects" |
07432cef | 8541 | msgstr "重用已存在的对象" |
ef317cd5 | 8542 | |
1b7f4a34 | 8543 | #: builtin/pack-objects.c:2630 |
ef317cd5 | 8544 | msgid "use OFS_DELTA objects" |
07432cef | 8545 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 8546 | |
1b7f4a34 | 8547 | #: builtin/pack-objects.c:2632 |
ef317cd5 | 8548 | msgid "use threads when searching for best delta matches" |
07432cef | 8549 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 8550 | |
1b7f4a34 | 8551 | #: builtin/pack-objects.c:2634 |
ef317cd5 | 8552 | msgid "do not create an empty pack output" |
07432cef | 8553 | msgstr "不创建空的包输出" |
ef317cd5 | 8554 | |
1b7f4a34 | 8555 | #: builtin/pack-objects.c:2636 |
ef317cd5 | 8556 | msgid "read revision arguments from standard input" |
d9d56b23 | 8557 | msgstr "从标准输入读取版本号参数" |
ef317cd5 | 8558 | |
1b7f4a34 | 8559 | #: builtin/pack-objects.c:2638 |
ef317cd5 | 8560 | msgid "limit the objects to those that are not yet packed" |
07432cef | 8561 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 8562 | |
1b7f4a34 | 8563 | #: builtin/pack-objects.c:2641 |
ef317cd5 | 8564 | msgid "include objects reachable from any reference" |
07432cef | 8565 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 8566 | |
1b7f4a34 | 8567 | #: builtin/pack-objects.c:2644 |
ef317cd5 | 8568 | msgid "include objects referred by reflog entries" |
07432cef | 8569 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 8570 | |
1b7f4a34 | 8571 | #: builtin/pack-objects.c:2647 |
220c313c JX |
8572 | msgid "include objects referred to by the index" |
8573 | msgstr "包括被索引引用到的对象" | |
8574 | ||
1b7f4a34 | 8575 | #: builtin/pack-objects.c:2650 |
ef317cd5 | 8576 | msgid "output pack to stdout" |
07432cef | 8577 | msgstr "输出包到标准输出" |
ef317cd5 | 8578 | |
1b7f4a34 | 8579 | #: builtin/pack-objects.c:2652 |
ef317cd5 | 8580 | msgid "include tag objects that refer to objects to be packed" |
53438e8f | 8581 | msgstr "包括那些引用了待打包对象的标签对象" |
ef317cd5 | 8582 | |
1b7f4a34 | 8583 | #: builtin/pack-objects.c:2654 |
ef317cd5 | 8584 | msgid "keep unreachable objects" |
07432cef | 8585 | msgstr "维持不可达的对象" |
ef317cd5 | 8586 | |
1b7f4a34 | 8587 | #: builtin/pack-objects.c:2655 parse-options.h:142 |
ef317cd5 JX |
8588 | msgid "time" |
8589 | msgstr "时间" | |
8590 | ||
1b7f4a34 | 8591 | #: builtin/pack-objects.c:2656 |
ef317cd5 | 8592 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 8593 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 8594 | |
1b7f4a34 | 8595 | #: builtin/pack-objects.c:2659 |
ef317cd5 | 8596 | msgid "create thin packs" |
07432cef | 8597 | msgstr "创建精简包" |
ef317cd5 | 8598 | |
1b7f4a34 | 8599 | #: builtin/pack-objects.c:2661 |
04cb2f28 | 8600 | msgid "create packs suitable for shallow fetches" |
160fb2b2 | 8601 | msgstr "创建适合浅克隆仓库获取的包" |
04cb2f28 | 8602 | |
1b7f4a34 | 8603 | #: builtin/pack-objects.c:2663 |
ef317cd5 | 8604 | msgid "ignore packs that have companion .keep file" |
07432cef | 8605 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 8606 | |
1b7f4a34 | 8607 | #: builtin/pack-objects.c:2665 |
ef317cd5 | 8608 | msgid "pack compression level" |
07432cef | 8609 | msgstr "打包压缩级别" |
ef317cd5 | 8610 | |
1b7f4a34 | 8611 | #: builtin/pack-objects.c:2667 |
ef317cd5 | 8612 | msgid "do not hide commits by grafts" |
cfff71a9 | 8613 | msgstr "显示被嫁接隐藏的提交" |
ef317cd5 | 8614 | |
1b7f4a34 | 8615 | #: builtin/pack-objects.c:2669 |
6c94aba5 JX |
8616 | msgid "use a bitmap index if available to speed up counting objects" |
8617 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" | |
8618 | ||
1b7f4a34 | 8619 | #: builtin/pack-objects.c:2671 |
6c94aba5 JX |
8620 | msgid "write a bitmap index together with the pack index" |
8621 | msgstr "在建立包索引的同时创建 bitmap 索引" | |
8622 | ||
1b7f4a34 | 8623 | #: builtin/pack-objects.c:2762 |
6c94aba5 JX |
8624 | msgid "Counting objects" |
8625 | msgstr "对象计数中" | |
8626 | ||
ef317cd5 | 8627 | #: builtin/pack-refs.c:6 |
814ff314 JX |
8628 | msgid "git pack-refs [<options>]" |
8629 | msgstr "git pack-refs [<选项>]" | |
c04f5ac3 | 8630 | |
ef317cd5 JX |
8631 | #: builtin/pack-refs.c:14 |
8632 | msgid "pack everything" | |
07432cef | 8633 | msgstr "打包一切" |
c04f5ac3 | 8634 | |
ef317cd5 JX |
8635 | #: builtin/pack-refs.c:15 |
8636 | msgid "prune loose refs (default)" | |
07432cef | 8637 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 8638 | |
ef317cd5 | 8639 | #: builtin/prune-packed.c:7 |
814ff314 JX |
8640 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
8641 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
6792b93b | 8642 | |
220c313c | 8643 | #: builtin/prune-packed.c:40 |
6c94aba5 JX |
8644 | msgid "Removing duplicate objects" |
8645 | msgstr "正在删除重复对象" | |
8646 | ||
5bb01d4f | 8647 | #: builtin/prune.c:11 |
ef317cd5 | 8648 | msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" |
07432cef | 8649 | msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" |
7ac1c0ad | 8650 | |
94550ed3 | 8651 | #: builtin/prune.c:105 builtin/worktree.c:124 |
1b7f4a34 JX |
8652 | msgid "do not remove, show only" |
8653 | msgstr "不删除,只显示" | |
8654 | ||
94550ed3 | 8655 | #: builtin/prune.c:106 builtin/worktree.c:125 |
1b7f4a34 JX |
8656 | msgid "report pruned objects" |
8657 | msgstr "报告清除的对象" | |
8658 | ||
94550ed3 | 8659 | #: builtin/prune.c:109 builtin/worktree.c:127 |
1b7f4a34 JX |
8660 | msgid "expire objects older than <time>" |
8661 | msgstr "使早于给定时间的对象过期" | |
8662 | ||
94550ed3 JX |
8663 | #: builtin/prune.c:123 |
8664 | msgid "cannot prune in a precious-objects repo" | |
8665 | msgstr "不能在珍品仓库中执行清理操作" | |
8666 | ||
1b7f4a34 | 8667 | #: builtin/pull.c:69 |
94550ed3 | 8668 | msgid "git pull [<options>] [<repository> [<refspec>...]]" |
1b7f4a34 JX |
8669 | msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" |
8670 | ||
8671 | #: builtin/pull.c:113 | |
8672 | msgid "Options related to merging" | |
8673 | msgstr "和合并相关的选项" | |
8674 | ||
1b7f4a34 JX |
8675 | #: builtin/pull.c:116 |
8676 | msgid "incorporate changes by rebasing rather than merging" | |
8677 | msgstr "使用变基操作取代合并操作以合入修改" | |
8678 | ||
8679 | #: builtin/pull.c:140 builtin/revert.c:105 | |
8680 | msgid "allow fast-forward" | |
8681 | msgstr "允许快进式" | |
8682 | ||
8683 | #: builtin/pull.c:146 | |
8684 | msgid "verify that the named commit has a valid GPG signature" | |
8685 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" | |
8686 | ||
8687 | #: builtin/pull.c:160 | |
8688 | msgid "Options related to fetching" | |
8689 | msgstr "和获取相关的参数" | |
8690 | ||
8691 | #: builtin/pull.c:268 | |
8692 | #, c-format | |
8693 | msgid "Invalid value for pull.ff: %s" | |
8694 | msgstr "pull.ff 的取值无效:%s" | |
8695 | ||
8696 | #: builtin/pull.c:352 | |
8697 | msgid "Cannot pull with rebase: You have unstaged changes." | |
8698 | msgstr "无法通过变基方式拉取:您有未暂存的变更。" | |
8699 | ||
8700 | #: builtin/pull.c:358 | |
8701 | msgid "Additionally, your index contains uncommitted changes." | |
8702 | msgstr "而且您的索引中包含未提交的变更。" | |
8703 | ||
8704 | #: builtin/pull.c:360 | |
8705 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." | |
8706 | msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。" | |
8707 | ||
8708 | #: builtin/pull.c:436 | |
8709 | msgid "" | |
8710 | "There is no candidate for rebasing against among the refs that you just " | |
8711 | "fetched." | |
8712 | msgstr "在您刚刚获取到的引用中没有变基操作的候选。" | |
8713 | ||
8714 | #: builtin/pull.c:438 | |
8715 | msgid "" | |
8716 | "There are no candidates for merging among the refs that you just fetched." | |
8717 | msgstr "在您刚刚获取到的引用中没有合并操作的候选。" | |
8718 | ||
8719 | #: builtin/pull.c:439 | |
8720 | msgid "" | |
8721 | "Generally this means that you provided a wildcard refspec which had no\n" | |
8722 | "matches on the remote end." | |
8723 | msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" | |
8724 | ||
8725 | #: builtin/pull.c:442 | |
8726 | #, c-format | |
8727 | msgid "" | |
8728 | "You asked to pull from the remote '%s', but did not specify\n" | |
8729 | "a branch. Because this is not the default configured remote\n" | |
8730 | "for your current branch, you must specify a branch on the command line." | |
8731 | msgstr "" | |
8732 | "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n" | |
8733 | "分支默认的远程仓库,您必须在命令行中指定一个分支名。" | |
8734 | ||
8735 | #: builtin/pull.c:447 | |
8736 | msgid "You are not currently on a branch." | |
8737 | msgstr "您当前不在一个分支上。" | |
8738 | ||
8739 | #: builtin/pull.c:449 builtin/pull.c:464 | |
8740 | msgid "Please specify which branch you want to rebase against." | |
8741 | msgstr "请指定您要变基到哪一个分支。" | |
8742 | ||
8743 | #: builtin/pull.c:451 builtin/pull.c:466 | |
8744 | msgid "Please specify which branch you want to merge with." | |
8745 | msgstr "请指定您要合并哪一个分支。" | |
8746 | ||
8747 | #: builtin/pull.c:452 builtin/pull.c:467 | |
8748 | msgid "See git-pull(1) for details." | |
8749 | msgstr "详见 git-pull(1)。" | |
8750 | ||
8751 | #: builtin/pull.c:462 | |
8752 | msgid "There is no tracking information for the current branch." | |
8753 | msgstr "当前分支没有跟踪信息。" | |
8754 | ||
8755 | #: builtin/pull.c:471 | |
8756 | #, c-format | |
8757 | msgid "" | |
8758 | "If you wish to set tracking information for this branch you can do so with:\n" | |
8759 | "\n" | |
8760 | " git branch --set-upstream-to=%s/<branch> %s\n" | |
8761 | msgstr "" | |
8762 | "如果您想要为此分支创建跟踪信息,您可以执行:\n" | |
8763 | "\n" | |
8764 | " git branch --set-upstream-to=%s/<branch> %s\n" | |
7ac1c0ad | 8765 | |
1b7f4a34 JX |
8766 | #: builtin/pull.c:476 |
8767 | #, c-format | |
8768 | msgid "" | |
8769 | "Your configuration specifies to merge with the ref '%s'\n" | |
8770 | "from the remote, but no such ref was fetched." | |
8771 | msgstr "" | |
8772 | "您的配置中指定要合并远程的引用 '%s',\n" | |
8773 | "但是没有获取到这个引用。" | |
7ac1c0ad | 8774 | |
1b7f4a34 JX |
8775 | #: builtin/pull.c:830 |
8776 | msgid "Updating an unborn branch with changes added to the index." | |
8777 | msgstr "更新尚未诞生的分支,变更添加至索引。" | |
8778 | ||
8779 | #: builtin/pull.c:859 | |
8780 | #, c-format | |
8781 | msgid "" | |
8782 | "fetch updated the current branch head.\n" | |
8783 | "fast-forwarding your working tree from\n" | |
8784 | "commit %s." | |
8785 | msgstr "" | |
8786 | "fetch 更新了当前的分支。快进您的工作区\n" | |
8787 | "至提交 %s。" | |
ef317cd5 | 8788 | |
1b7f4a34 JX |
8789 | #: builtin/pull.c:864 |
8790 | #, c-format | |
8791 | msgid "" | |
8792 | "Cannot fast-forward your working tree.\n" | |
8793 | "After making sure that you saved anything precious from\n" | |
8794 | "$ git diff %s\n" | |
8795 | "output, run\n" | |
8796 | "$ git reset --hard\n" | |
8797 | "to recover." | |
8798 | msgstr "" | |
8799 | "您当前的工作区无法执行快进操作。\n" | |
8800 | "首先执行如下命令:\n" | |
8801 | "$ git diff %s\n" | |
8802 | "以确认所有有用的数据均已保存。然后执行下面的命令\n" | |
8803 | "$ git reset --hard\n" | |
8804 | "恢复之前的状态。" | |
8805 | ||
8806 | #: builtin/pull.c:879 | |
8807 | msgid "Cannot merge multiple branches into empty head." | |
8808 | msgstr "无法将多个分支合并到空分支。" | |
8809 | ||
8810 | #: builtin/pull.c:883 | |
8811 | msgid "Cannot rebase onto multiple branches." | |
8812 | msgstr "无法变基到多个分支。" | |
8813 | ||
89f80d72 | 8814 | #: builtin/push.c:16 |
ef317cd5 | 8815 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 8816 | msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" |
7ac1c0ad | 8817 | |
89f80d72 | 8818 | #: builtin/push.c:88 |
c04f5ac3 | 8819 | msgid "tag shorthand without <tag>" |
55a16ee4 | 8820 | msgstr "标签后面未提供 <标签> 参数" |
c04f5ac3 | 8821 | |
89f80d72 | 8822 | #: builtin/push.c:98 |
c04f5ac3 | 8823 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 8824 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 8825 | |
89f80d72 | 8826 | #: builtin/push.c:142 |
8ada9598 JX |
8827 | msgid "" |
8828 | "\n" | |
8829 | "To choose either option permanently, see push.default in 'git help config'." | |
8830 | msgstr "" | |
81809b99 JX |
8831 | "\n" |
8832 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 8833 | |
89f80d72 | 8834 | #: builtin/push.c:145 |
8ada9598 JX |
8835 | #, c-format |
8836 | msgid "" | |
8837 | "The upstream branch of your current branch does not match\n" | |
8838 | "the name of your current branch. To push to the upstream branch\n" | |
8839 | "on the remote, use\n" | |
8840 | "\n" | |
8841 | " git push %s HEAD:%s\n" | |
8842 | "\n" | |
8843 | "To push to the branch of the same name on the remote, use\n" | |
8844 | "\n" | |
8845 | " git push %s %s\n" | |
8846 | "%s" | |
8847 | msgstr "" | |
81809b99 JX |
8848 | "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n" |
8849 | "上游分支,使用\n" | |
8850 | "\n" | |
8851 | " git push %s HEAD:%s\n" | |
8852 | "\n" | |
8853 | "为推送至远程同名分支,使用\n" | |
8854 | "\n" | |
8855 | " git push %s %s\n" | |
8856 | "%s" | |
8ada9598 | 8857 | |
89f80d72 | 8858 | #: builtin/push.c:160 |
c04f5ac3 JX |
8859 | #, c-format |
8860 | msgid "" | |
8861 | "You are not currently on a branch.\n" | |
8862 | "To push the history leading to the current (detached HEAD)\n" | |
8863 | "state now, use\n" | |
8864 | "\n" | |
8865 | " git push %s HEAD:<name-of-remote-branch>\n" | |
8866 | msgstr "" | |
8867 | "您当前不在一个分支上。\n" | |
90e6ef53 | 8868 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 | 8869 | "\n" |
d9d56b23 | 8870 | " git push %s HEAD:<远程分支名字>\n" |
c04f5ac3 | 8871 | |
89f80d72 | 8872 | #: builtin/push.c:174 |
c04f5ac3 JX |
8873 | #, c-format |
8874 | msgid "" | |
8875 | "The current branch %s has no upstream branch.\n" | |
8876 | "To push the current branch and set the remote as upstream, use\n" | |
8877 | "\n" | |
8878 | " git push --set-upstream %s %s\n" | |
8879 | msgstr "" | |
8880 | "当前分支 %s 没有对应的上游分支。\n" | |
8881 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
8882 | "\n" | |
8883 | " git push --set-upstream %s %s\n" | |
8884 | ||
89f80d72 | 8885 | #: builtin/push.c:182 |
c04f5ac3 JX |
8886 | #, c-format |
8887 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
8888 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
8889 | ||
89f80d72 | 8890 | #: builtin/push.c:185 |
73a60cd2 JX |
8891 | #, c-format |
8892 | msgid "" | |
8893 | "You are pushing to remote '%s', which is not the upstream of\n" | |
8894 | "your current branch '%s', without telling me what to push\n" | |
8895 | "to update which remote branch." | |
8896 | msgstr "" | |
8897 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
8898 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
8899 | ||
c160d03f | 8900 | # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短 |
89f80d72 | 8901 | #: builtin/push.c:208 |
c160d03f | 8902 | msgid "" |
6c94aba5 | 8903 | "push.default is unset; its implicit value has changed in\n" |
c160d03f | 8904 | "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" |
6c94aba5 | 8905 | "and maintain the traditional behavior, use:\n" |
c160d03f JX |
8906 | "\n" |
8907 | " git config --global push.default matching\n" | |
8908 | "\n" | |
8909 | "To squelch this message and adopt the new behavior now, use:\n" | |
8910 | "\n" | |
8911 | " git config --global push.default simple\n" | |
8912 | "\n" | |
cfff71a9 JX |
8913 | "When push.default is set to 'matching', git will push local branches\n" |
8914 | "to the remote branches that already exist with the same name.\n" | |
8915 | "\n" | |
6c94aba5 | 8916 | "Since Git 2.0, Git defaults to the more conservative 'simple'\n" |
cfff71a9 JX |
8917 | "behavior, which only pushes the current branch to the corresponding\n" |
8918 | "remote branch that 'git pull' uses to update the current branch.\n" | |
8919 | "\n" | |
c160d03f JX |
8920 | "See 'git help config' and search for 'push.default' for further " |
8921 | "information.\n" | |
8922 | "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" | |
8923 | "'current' instead of 'simple' if you sometimes use older versions of Git)" | |
8924 | msgstr "" | |
6c94aba5 | 8925 | "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n" |
cfff71a9 | 8926 | "变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n" |
c160d03f JX |
8927 | "\n" |
8928 | " git config --global push.default matching\n" | |
8929 | "\n" | |
8930 | "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n" | |
8931 | "\n" | |
8932 | " git config --global push.default simple\n" | |
8933 | "\n" | |
cfff71a9 JX |
8934 | "当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n" |
8935 | "本地分支。\n" | |
8936 | "\n" | |
160fb2b2 | 8937 | "从 Git 2.0 开始,Git 默认采用更为保守的 'simple' 模式,只推送当前\n" |
cfff71a9 JX |
8938 | "分支到远程关联的同名分支,即 'git push' 推送当前分支。\n" |
8939 | "\n" | |
c160d03f JX |
8940 | "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n" |
8941 | "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n" | |
90314792 | 8942 | "为保持兼容,请用 'current' 代替 'simple')" |
c160d03f | 8943 | |
89f80d72 | 8944 | #: builtin/push.c:275 |
c04f5ac3 JX |
8945 | msgid "" |
8946 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
160fb2b2 | 8947 | msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 8948 | |
89f80d72 | 8949 | #: builtin/push.c:282 |
170e9899 JX |
8950 | msgid "" |
8951 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
8952 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
8953 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
8954 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
8955 | msgstr "" | |
eff6d3a9 | 8956 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 8957 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 8958 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 8959 | |
89f80d72 | 8960 | #: builtin/push.c:288 |
170e9899 JX |
8961 | msgid "" |
8962 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
8963 | "counterpart. Check out this branch and integrate the remote changes\n" |
8964 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
8965 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
8966 | msgstr "" | |
eff6d3a9 | 8967 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 8968 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 8969 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 8970 | |
89f80d72 | 8971 | #: builtin/push.c:294 |
07432cef | 8972 | msgid "" |
a77c07d9 JX |
8973 | "Updates were rejected because the remote contains work that you do\n" |
8974 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
8975 | "to the same ref. You may want to first integrate the remote changes\n" |
8976 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
8977 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
8978 | msgstr "" | |
160fb2b2 JX |
8979 | "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" |
8980 | "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" | |
2e8451e8 | 8981 | "(如 'git pull ...')。\n" |
a77c07d9 JX |
8982 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
8983 | ||
89f80d72 | 8984 | #: builtin/push.c:301 |
a77c07d9 | 8985 | msgid "Updates were rejected because the tag already exists in the remote." |
55a16ee4 | 8986 | msgstr "更新被拒绝,因为该标签在远程已经存在。" |
a77c07d9 | 8987 | |
89f80d72 | 8988 | #: builtin/push.c:304 |
a77c07d9 JX |
8989 | msgid "" |
8990 | "You cannot update a remote ref that points at a non-commit object,\n" | |
8991 | "or update a remote ref to make it point at a non-commit object,\n" | |
8992 | "without using the '--force' option.\n" | |
8993 | msgstr "" | |
8994 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
8995 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 8996 | |
89f80d72 | 8997 | #: builtin/push.c:363 |
c04f5ac3 JX |
8998 | #, c-format |
8999 | msgid "Pushing to %s\n" | |
9000 | msgstr "推送到 %s\n" | |
9001 | ||
89f80d72 | 9002 | #: builtin/push.c:367 |
c04f5ac3 JX |
9003 | #, c-format |
9004 | msgid "failed to push some refs to '%s'" | |
9005 | msgstr "无法推送一些引用到 '%s'" | |
9006 | ||
89f80d72 | 9007 | #: builtin/push.c:397 |
c04f5ac3 JX |
9008 | #, c-format |
9009 | msgid "bad repository '%s'" | |
160fb2b2 | 9010 | msgstr "坏的仓库 '%s'" |
c04f5ac3 | 9011 | |
89f80d72 | 9012 | #: builtin/push.c:398 |
c04f5ac3 JX |
9013 | msgid "" |
9014 | "No configured push destination.\n" | |
9015 | "Either specify the URL from the command-line or configure a remote " | |
9016 | "repository using\n" | |
9017 | "\n" | |
9018 | " git remote add <name> <url>\n" | |
9019 | "\n" | |
9020 | "and then push using the remote name\n" | |
9021 | "\n" | |
9022 | " git push <name>\n" | |
9023 | msgstr "" | |
90e6ef53 | 9024 | "没有配置推送目标。\n" |
4375c10e | 9025 | "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n" |
c04f5ac3 | 9026 | "\n" |
d9d56b23 | 9027 | " git remote add <名称> <地址>\n" |
c04f5ac3 | 9028 | "\n" |
160fb2b2 | 9029 | "然后使用该远程仓库名执行推送\n" |
c04f5ac3 | 9030 | "\n" |
d9d56b23 | 9031 | " git push <名称>\n" |
c04f5ac3 | 9032 | |
89f80d72 | 9033 | #: builtin/push.c:413 |
c04f5ac3 JX |
9034 | msgid "--all and --tags are incompatible" |
9035 | msgstr "--all 和 --tags 不兼容" | |
9036 | ||
89f80d72 | 9037 | #: builtin/push.c:414 |
c04f5ac3 | 9038 | msgid "--all can't be combined with refspecs" |
160fb2b2 | 9039 | msgstr "--all 不能和引用规格同时使用" |
c04f5ac3 | 9040 | |
89f80d72 | 9041 | #: builtin/push.c:419 |
c04f5ac3 JX |
9042 | msgid "--mirror and --tags are incompatible" |
9043 | msgstr "--mirror 和 --tags 不兼容" | |
9044 | ||
89f80d72 | 9045 | #: builtin/push.c:420 |
c04f5ac3 | 9046 | msgid "--mirror can't be combined with refspecs" |
160fb2b2 | 9047 | msgstr "--mirror 不能和引用规格同时使用" |
c04f5ac3 | 9048 | |
89f80d72 | 9049 | #: builtin/push.c:425 |
c04f5ac3 JX |
9050 | msgid "--all and --mirror are incompatible" |
9051 | msgstr "--all 和 --mirror 不兼容" | |
9052 | ||
89f80d72 | 9053 | #: builtin/push.c:537 |
ef317cd5 | 9054 | msgid "repository" |
160fb2b2 | 9055 | msgstr "仓库" |
ef317cd5 | 9056 | |
89f80d72 | 9057 | #: builtin/push.c:538 builtin/send-pack.c:161 |
ef317cd5 | 9058 | msgid "push all refs" |
07432cef | 9059 | msgstr "推送所有引用" |
ef317cd5 | 9060 | |
89f80d72 | 9061 | #: builtin/push.c:539 builtin/send-pack.c:163 |
ef317cd5 | 9062 | msgid "mirror all refs" |
07432cef | 9063 | msgstr "镜像所有引用" |
ef317cd5 | 9064 | |
89f80d72 | 9065 | #: builtin/push.c:541 |
ef317cd5 | 9066 | msgid "delete refs" |
07432cef | 9067 | msgstr "删除引用" |
ef317cd5 | 9068 | |
89f80d72 | 9069 | #: builtin/push.c:542 |
ef317cd5 | 9070 | msgid "push tags (can't be used with --all or --mirror)" |
55a16ee4 | 9071 | msgstr "推送标签(不能使用 --all or --mirror)" |
ef317cd5 | 9072 | |
89f80d72 | 9073 | #: builtin/push.c:545 builtin/send-pack.c:164 |
ef317cd5 JX |
9074 | msgid "force updates" |
9075 | msgstr "强制更新" | |
9076 | ||
89f80d72 | 9077 | #: builtin/push.c:547 builtin/send-pack.c:175 |
90314792 JX |
9078 | msgid "refname>:<expect" |
9079 | msgstr "引用名>:<期望值" | |
9080 | ||
89f80d72 | 9081 | #: builtin/push.c:548 builtin/send-pack.c:176 |
90314792 JX |
9082 | msgid "require old value of ref to be at this value" |
9083 | msgstr "要求引用旧的取值为设定值" | |
9084 | ||
89f80d72 JX |
9085 | # 译者:可选值,不能翻译 |
9086 | #: builtin/push.c:550 | |
9087 | msgid "check|on-demand|no" | |
9088 | msgstr "check|on-demand|no" | |
9089 | ||
9090 | #: builtin/push.c:551 | |
ef317cd5 | 9091 | msgid "control recursive pushing of submodules" |
07432cef | 9092 | msgstr "控制子模组的递归推送" |
ef317cd5 | 9093 | |
89f80d72 | 9094 | #: builtin/push.c:553 builtin/send-pack.c:169 |
ef317cd5 | 9095 | msgid "use thin pack" |
07432cef | 9096 | msgstr "使用精简打包" |
ef317cd5 | 9097 | |
89f80d72 | 9098 | #: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158 |
1b7f4a34 | 9099 | #: builtin/send-pack.c:159 |
ef317cd5 | 9100 | msgid "receive pack program" |
07432cef | 9101 | msgstr "接收包程序" |
ef317cd5 | 9102 | |
89f80d72 | 9103 | #: builtin/push.c:556 |
ef317cd5 | 9104 | msgid "set upstream for git pull/status" |
07432cef | 9105 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 9106 | |
89f80d72 | 9107 | #: builtin/push.c:559 |
ef317cd5 | 9108 | msgid "prune locally removed refs" |
07432cef | 9109 | msgstr "清除本地删除的引用" |
ef317cd5 | 9110 | |
89f80d72 | 9111 | #: builtin/push.c:561 |
a77c07d9 JX |
9112 | msgid "bypass pre-push hook" |
9113 | msgstr "绕过 pre-push 钩子" | |
9114 | ||
89f80d72 | 9115 | #: builtin/push.c:562 |
1003b3a5 | 9116 | msgid "push missing but relevant tags" |
55a16ee4 | 9117 | msgstr "推送缺失但有关的标签" |
1003b3a5 | 9118 | |
89f80d72 | 9119 | #: builtin/push.c:565 builtin/send-pack.c:166 |
220c313c JX |
9120 | msgid "GPG sign the push" |
9121 | msgstr "用 GPG 为推送签名" | |
9122 | ||
89f80d72 | 9123 | #: builtin/push.c:567 builtin/send-pack.c:170 |
814ff314 JX |
9124 | msgid "request atomic transaction on remote side" |
9125 | msgstr "需要远端支持原子事务" | |
9126 | ||
89f80d72 | 9127 | #: builtin/push.c:577 |
c04f5ac3 JX |
9128 | msgid "--delete is incompatible with --all, --mirror and --tags" |
9129 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
9130 | ||
89f80d72 | 9131 | #: builtin/push.c:579 |
c04f5ac3 JX |
9132 | msgid "--delete doesn't make sense without any refs" |
9133 | msgstr "--delete 未接任何引用没有意义" | |
9134 | ||
220c313c | 9135 | #: builtin/read-tree.c:37 |
ef317cd5 | 9136 | msgid "" |
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>]])" | |
9140 | msgstr "" | |
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 | 9146 | msgid "write resulting index to <file>" |
d9d56b23 | 9147 | msgstr "将索引结果写入 <文件>" |
ef317cd5 | 9148 | |
220c313c | 9149 | #: builtin/read-tree.c:113 |
ef317cd5 | 9150 | msgid "only empty the index" |
07432cef | 9151 | msgstr "只是清空索引" |
ef317cd5 | 9152 | |
220c313c | 9153 | #: builtin/read-tree.c:115 |
ef317cd5 | 9154 | msgid "Merging" |
07432cef | 9155 | msgstr "合并" |
ef317cd5 | 9156 | |
220c313c | 9157 | #: builtin/read-tree.c:117 |
ef317cd5 | 9158 | msgid "perform a merge in addition to a read" |
07432cef | 9159 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 9160 | |
220c313c | 9161 | #: builtin/read-tree.c:119 |
ef317cd5 | 9162 | msgid "3-way merge if no file level merging required" |
160fb2b2 | 9163 | msgstr "如果没有文件级合并需要,执行三方合并" |
ef317cd5 | 9164 | |
220c313c | 9165 | #: builtin/read-tree.c:121 |
ef317cd5 | 9166 | msgid "3-way merge in presence of adds and removes" |
160fb2b2 | 9167 | msgstr "存在添加和删除时,也执行三方合并" |
ef317cd5 | 9168 | |
220c313c | 9169 | #: builtin/read-tree.c:123 |
ef317cd5 | 9170 | msgid "same as -m, but discard unmerged entries" |
07432cef | 9171 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 9172 | |
220c313c | 9173 | #: builtin/read-tree.c:124 |
ef317cd5 | 9174 | msgid "<subdirectory>/" |
07432cef | 9175 | msgstr "<子目录>/" |
ef317cd5 | 9176 | |
220c313c | 9177 | #: builtin/read-tree.c:125 |
ef317cd5 | 9178 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 9179 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 9180 | |
220c313c | 9181 | #: builtin/read-tree.c:128 |
ef317cd5 | 9182 | msgid "update working tree with merge result" |
07432cef | 9183 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 9184 | |
220c313c | 9185 | #: builtin/read-tree.c:130 |
ef317cd5 | 9186 | msgid "gitignore" |
07432cef | 9187 | msgstr "gitignore" |
ef317cd5 | 9188 | |
220c313c | 9189 | #: builtin/read-tree.c:131 |
ef317cd5 | 9190 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 9191 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 9192 | |
220c313c | 9193 | #: builtin/read-tree.c:134 |
ef317cd5 | 9194 | msgid "don't check the working tree after merging" |
07432cef | 9195 | msgstr "合并后不检查工作区" |
ef317cd5 | 9196 | |
220c313c | 9197 | #: builtin/read-tree.c:135 |
ef317cd5 | 9198 | msgid "don't update the index or the work tree" |
07432cef | 9199 | msgstr "不更新索引区和工作区" |
ef317cd5 | 9200 | |
220c313c | 9201 | #: builtin/read-tree.c:137 |
ef317cd5 | 9202 | msgid "skip applying sparse checkout filter" |
07432cef | 9203 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 9204 | |
220c313c | 9205 | #: builtin/read-tree.c:139 |
ef317cd5 | 9206 | msgid "debug unpack-trees" |
07432cef | 9207 | msgstr "调试 unpack-trees" |
ef317cd5 | 9208 | |
94550ed3 | 9209 | #: builtin/reflog.c:428 |
2e8451e8 | 9210 | #, c-format |
1b7f4a34 | 9211 | msgid "'%s' for '%s' is not a valid timestamp" |
2e8451e8 JX |
9212 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" |
9213 | ||
94550ed3 | 9214 | #: builtin/reflog.c:545 builtin/reflog.c:550 |
2e8451e8 JX |
9215 | #, c-format |
9216 | msgid "'%s' is not a valid timestamp" | |
9217 | msgstr "'%s' 不是一个有效的时间戳" | |
9218 | ||
cfff71a9 | 9219 | #: builtin/remote.c:12 |
ef317cd5 | 9220 | msgid "git remote [-v | --verbose]" |
07432cef | 9221 | msgstr "git remote [-v | --verbose]" |
ef317cd5 | 9222 | |
cfff71a9 | 9223 | #: builtin/remote.c:13 |
ef317cd5 | 9224 | msgid "" |
814ff314 | 9225 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
ef317cd5 JX |
9226 | "mirror=<fetch|push>] <name> <url>" |
9227 | msgstr "" | |
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 | 9232 | msgid "git remote rename <old> <new>" |
07432cef | 9233 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 | 9234 | |
94550ed3 | 9235 | #: builtin/remote.c:15 builtin/remote.c:39 |
ef317cd5 | 9236 | msgid "git remote remove <name>" |
07432cef | 9237 | msgstr "git remote remove <名称>" |
ef317cd5 | 9238 | |
94550ed3 | 9239 | #: builtin/remote.c:16 builtin/remote.c:44 |
814ff314 JX |
9240 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" |
9241 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
ef317cd5 | 9242 | |
cfff71a9 | 9243 | #: builtin/remote.c:17 |
ef317cd5 | 9244 | msgid "git remote [-v | --verbose] show [-n] <name>" |
07432cef | 9245 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 | 9246 | |
cfff71a9 | 9247 | #: builtin/remote.c:18 |
ef317cd5 | 9248 | msgid "git remote prune [-n | --dry-run] <name>" |
07432cef | 9249 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 | 9250 | |
cfff71a9 | 9251 | #: builtin/remote.c:19 |
ef317cd5 JX |
9252 | msgid "" |
9253 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 9254 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 | 9255 | |
cfff71a9 | 9256 | #: builtin/remote.c:20 |
ef317cd5 | 9257 | msgid "git remote set-branches [--add] <name> <branch>..." |
07432cef | 9258 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 | 9259 | |
94550ed3 JX |
9260 | #: builtin/remote.c:21 builtin/remote.c:70 |
9261 | msgid "git remote get-url [--push] [--all] <name>" | |
9262 | msgstr "git remote get-url [--push] [--all] <名称>" | |
9263 | ||
9264 | #: builtin/remote.c:22 builtin/remote.c:75 | |
ef317cd5 | 9265 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
07432cef | 9266 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 | 9267 | |
94550ed3 | 9268 | #: builtin/remote.c:23 builtin/remote.c:76 |
ef317cd5 | 9269 | msgid "git remote set-url --add <name> <newurl>" |
07432cef | 9270 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 | 9271 | |
94550ed3 | 9272 | #: builtin/remote.c:24 builtin/remote.c:77 |
ef317cd5 | 9273 | msgid "git remote set-url --delete <name> <url>" |
07432cef | 9274 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 | 9275 | |
94550ed3 | 9276 | #: builtin/remote.c:29 |
ef317cd5 | 9277 | msgid "git remote add [<options>] <name> <url>" |
07432cef | 9278 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 9279 | |
94550ed3 | 9280 | #: builtin/remote.c:49 |
ef317cd5 | 9281 | msgid "git remote set-branches <name> <branch>..." |
07432cef | 9282 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 | 9283 | |
94550ed3 | 9284 | #: builtin/remote.c:50 |
ef317cd5 | 9285 | msgid "git remote set-branches --add <name> <branch>..." |
07432cef | 9286 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 | 9287 | |
94550ed3 | 9288 | #: builtin/remote.c:55 |
ef317cd5 | 9289 | msgid "git remote show [<options>] <name>" |
07432cef | 9290 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 | 9291 | |
94550ed3 | 9292 | #: builtin/remote.c:60 |
ef317cd5 | 9293 | msgid "git remote prune [<options>] <name>" |
07432cef | 9294 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 | 9295 | |
94550ed3 | 9296 | #: builtin/remote.c:65 |
ef317cd5 | 9297 | msgid "git remote update [<options>] [<group> | <remote>]..." |
07432cef | 9298 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 9299 | |
94550ed3 | 9300 | #: builtin/remote.c:94 |
81809b99 | 9301 | #, c-format |
8ada9598 | 9302 | msgid "Updating %s" |
81809b99 | 9303 | msgstr "更新 %s 中" |
8ada9598 | 9304 | |
94550ed3 | 9305 | #: builtin/remote.c:126 |
8ada9598 JX |
9306 | msgid "" |
9307 | "--mirror is dangerous and deprecated; please\n" | |
9308 | "\t use --mirror=fetch or --mirror=push instead" | |
9309 | msgstr "" | |
81809b99 JX |
9310 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
9311 | "\t 或 --mirror=push" | |
8ada9598 | 9312 | |
94550ed3 | 9313 | #: builtin/remote.c:143 |
81809b99 | 9314 | #, c-format |
8ada9598 | 9315 | msgid "unknown mirror argument: %s" |
81809b99 | 9316 | msgstr "未知的镜像参数:%s" |
8ada9598 | 9317 | |
94550ed3 | 9318 | #: builtin/remote.c:159 |
ef317cd5 | 9319 | msgid "fetch the remote branches" |
07432cef | 9320 | msgstr "抓取远程的分支" |
ef317cd5 | 9321 | |
94550ed3 | 9322 | #: builtin/remote.c:161 |
ef317cd5 | 9323 | msgid "import all tags and associated objects when fetching" |
55a16ee4 | 9324 | msgstr "抓取时导入所有的标签和关联对象" |
ef317cd5 | 9325 | |
94550ed3 | 9326 | #: builtin/remote.c:164 |
ef317cd5 | 9327 | msgid "or do not fetch any tag at all (--no-tags)" |
55a16ee4 | 9328 | msgstr "或不抓取任何标签(--no-tags)" |
ef317cd5 | 9329 | |
94550ed3 | 9330 | #: builtin/remote.c:166 |
ef317cd5 | 9331 | msgid "branch(es) to track" |
07432cef | 9332 | msgstr "跟踪的分支" |
ef317cd5 | 9333 | |
94550ed3 | 9334 | #: builtin/remote.c:167 |
ef317cd5 | 9335 | msgid "master branch" |
07432cef | 9336 | msgstr "主线分支" |
ef317cd5 | 9337 | |
94550ed3 | 9338 | #: builtin/remote.c:168 |
ef317cd5 | 9339 | msgid "push|fetch" |
07432cef | 9340 | msgstr "push|fetch" |
ef317cd5 | 9341 | |
94550ed3 | 9342 | #: builtin/remote.c:169 |
ef317cd5 | 9343 | msgid "set up remote as a mirror to push to or fetch from" |
07432cef | 9344 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 9345 | |
94550ed3 | 9346 | #: builtin/remote.c:181 |
8ada9598 | 9347 | msgid "specifying a master branch makes no sense with --mirror" |
81809b99 | 9348 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 | 9349 | |
94550ed3 | 9350 | #: builtin/remote.c:183 |
8ada9598 | 9351 | msgid "specifying branches to track makes sense only with fetch mirrors" |
649900bc | 9352 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 | 9353 | |
94550ed3 | 9354 | #: builtin/remote.c:193 builtin/remote.c:643 |
81809b99 | 9355 | #, c-format |
8ada9598 | 9356 | msgid "remote %s already exists." |
81809b99 | 9357 | msgstr "远程 %s 已经存在。" |
8ada9598 | 9358 | |
94550ed3 | 9359 | #: builtin/remote.c:197 builtin/remote.c:647 |
81809b99 | 9360 | #, c-format |
8ada9598 | 9361 | msgid "'%s' is not a valid remote name" |
81809b99 | 9362 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 | 9363 | |
94550ed3 | 9364 | #: builtin/remote.c:241 |
81809b99 | 9365 | #, c-format |
8ada9598 | 9366 | msgid "Could not setup master '%s'" |
81809b99 | 9367 | msgstr "无法设置 master '%s'" |
8ada9598 | 9368 | |
94550ed3 | 9369 | #: builtin/remote.c:341 |
81809b99 | 9370 | #, c-format |
8ada9598 | 9371 | msgid "Could not get fetch map for refspec %s" |
160fb2b2 | 9372 | msgstr "无法得到引用规格 %s 的获取列表" |
8ada9598 | 9373 | |
94550ed3 | 9374 | #: builtin/remote.c:442 builtin/remote.c:450 |
8ada9598 | 9375 | msgid "(matching)" |
81809b99 | 9376 | msgstr "(匹配)" |
8ada9598 | 9377 | |
94550ed3 | 9378 | #: builtin/remote.c:454 |
8ada9598 | 9379 | msgid "(delete)" |
81809b99 | 9380 | msgstr "(删除)" |
8ada9598 | 9381 | |
94550ed3 | 9382 | #: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606 |
81809b99 | 9383 | #, c-format |
8ada9598 | 9384 | msgid "Could not append '%s' to '%s'" |
81809b99 | 9385 | msgstr "不能添加 '%s' 至 '%s'" |
8ada9598 | 9386 | |
94550ed3 | 9387 | #: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875 |
81809b99 | 9388 | #, c-format |
8ada9598 | 9389 | msgid "No such remote: %s" |
81809b99 | 9390 | msgstr "没有这样的远程:%s" |
8ada9598 | 9391 | |
94550ed3 | 9392 | #: builtin/remote.c:653 |
81809b99 | 9393 | #, c-format |
8ada9598 | 9394 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 9395 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 | 9396 | |
94550ed3 | 9397 | #: builtin/remote.c:659 builtin/remote.c:827 |
81809b99 | 9398 | #, c-format |
8ada9598 | 9399 | msgid "Could not remove config section '%s'" |
81809b99 | 9400 | msgstr "不能移除配置小节 '%s'" |
8ada9598 | 9401 | |
94550ed3 | 9402 | #: builtin/remote.c:674 |
8ada9598 JX |
9403 | #, c-format |
9404 | msgid "" | |
d691f479 | 9405 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
9406 | "\t%s\n" |
9407 | "\tPlease update the configuration manually if necessary." | |
9408 | msgstr "" | |
160fb2b2 | 9409 | "没有更新非默认的获取引用规格\n" |
81809b99 JX |
9410 | "\t%s\n" |
9411 | "\t如果必要请手动更新配置。" | |
8ada9598 | 9412 | |
94550ed3 | 9413 | #: builtin/remote.c:680 |
81809b99 | 9414 | #, c-format |
8ada9598 | 9415 | msgid "Could not append '%s'" |
81809b99 | 9416 | msgstr "不能追加 '%s'" |
8ada9598 | 9417 | |
94550ed3 | 9418 | #: builtin/remote.c:691 |
81809b99 | 9419 | #, c-format |
8ada9598 | 9420 | msgid "Could not set '%s'" |
81809b99 | 9421 | msgstr "不能设置 '%s'" |
8ada9598 | 9422 | |
94550ed3 | 9423 | #: builtin/remote.c:713 |
81809b99 | 9424 | #, c-format |
8ada9598 | 9425 | msgid "deleting '%s' failed" |
81809b99 | 9426 | msgstr "删除 '%s' 失败" |
8ada9598 | 9427 | |
94550ed3 | 9428 | #: builtin/remote.c:747 |
81809b99 | 9429 | #, c-format |
8ada9598 | 9430 | msgid "creating '%s' failed" |
81809b99 | 9431 | msgstr "创建 '%s' 失败" |
8ada9598 | 9432 | |
94550ed3 | 9433 | #: builtin/remote.c:813 |
8ada9598 JX |
9434 | msgid "" |
9435 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
9436 | "to delete it, use:" | |
9437 | msgid_plural "" | |
9438 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
9439 | "to delete them, use:" | |
5ae481e0 JX |
9440 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
9441 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 | 9442 | |
94550ed3 | 9443 | #: builtin/remote.c:928 |
8ada9598 JX |
9444 | #, c-format |
9445 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 9446 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 | 9447 | |
94550ed3 | 9448 | #: builtin/remote.c:931 |
8ada9598 | 9449 | msgid " tracked" |
81809b99 | 9450 | msgstr " 已跟踪" |
8ada9598 | 9451 | |
94550ed3 | 9452 | #: builtin/remote.c:933 |
8ada9598 | 9453 | msgid " stale (use 'git remote prune' to remove)" |
81809b99 | 9454 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 | 9455 | |
94550ed3 | 9456 | #: builtin/remote.c:935 |
8ada9598 | 9457 | msgid " ???" |
81809b99 | 9458 | msgstr " ???" |
8ada9598 | 9459 | |
94550ed3 | 9460 | #: builtin/remote.c:976 |
8ada9598 JX |
9461 | #, c-format |
9462 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 9463 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 | 9464 | |
94550ed3 | 9465 | #: builtin/remote.c:983 |
81809b99 | 9466 | #, c-format |
8ada9598 | 9467 | msgid "rebases onto remote %s" |
81809b99 | 9468 | msgstr "变基到远程 %s" |
8ada9598 | 9469 | |
94550ed3 | 9470 | #: builtin/remote.c:986 |
81809b99 | 9471 | #, c-format |
8ada9598 | 9472 | msgid " merges with remote %s" |
81809b99 | 9473 | msgstr " 与远程 %s 合并" |
8ada9598 | 9474 | |
94550ed3 | 9475 | #: builtin/remote.c:987 |
8ada9598 | 9476 | msgid " and with remote" |
81809b99 | 9477 | msgstr " 且有远程" |
8ada9598 | 9478 | |
94550ed3 | 9479 | #: builtin/remote.c:989 |
81809b99 | 9480 | #, c-format |
8ada9598 | 9481 | msgid "merges with remote %s" |
81809b99 | 9482 | msgstr "与远程 %s 合并" |
8ada9598 | 9483 | |
94550ed3 | 9484 | #: builtin/remote.c:990 |
8ada9598 | 9485 | msgid " and with remote" |
81809b99 | 9486 | msgstr " 且有远程" |
8ada9598 | 9487 | |
94550ed3 | 9488 | #: builtin/remote.c:1036 |
8ada9598 | 9489 | msgid "create" |
81809b99 | 9490 | msgstr "创建" |
8ada9598 | 9491 | |
94550ed3 | 9492 | #: builtin/remote.c:1039 |
8ada9598 | 9493 | msgid "delete" |
81809b99 | 9494 | msgstr "删除" |
8ada9598 | 9495 | |
94550ed3 | 9496 | #: builtin/remote.c:1043 |
8ada9598 | 9497 | msgid "up to date" |
81809b99 | 9498 | msgstr "最新" |
8ada9598 | 9499 | |
94550ed3 | 9500 | #: builtin/remote.c:1046 |
8ada9598 | 9501 | msgid "fast-forwardable" |
81809b99 | 9502 | msgstr "可快进" |
8ada9598 | 9503 | |
94550ed3 | 9504 | #: builtin/remote.c:1049 |
8ada9598 | 9505 | msgid "local out of date" |
81809b99 | 9506 | msgstr "本地已过时" |
8ada9598 | 9507 | |
94550ed3 | 9508 | #: builtin/remote.c:1056 |
8ada9598 JX |
9509 | #, c-format |
9510 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 9511 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 | 9512 | |
94550ed3 | 9513 | #: builtin/remote.c:1059 |
8ada9598 JX |
9514 | #, c-format |
9515 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 9516 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 | 9517 | |
94550ed3 | 9518 | #: builtin/remote.c:1063 |
8ada9598 JX |
9519 | #, c-format |
9520 | msgid " %-*s forces to %s" | |
81809b99 | 9521 | msgstr " %-*s 强制推送至 %s" |
8ada9598 | 9522 | |
94550ed3 | 9523 | #: builtin/remote.c:1066 |
8ada9598 JX |
9524 | #, c-format |
9525 | msgid " %-*s pushes to %s" | |
81809b99 | 9526 | msgstr " %-*s 推送至 %s" |
8ada9598 | 9527 | |
94550ed3 | 9528 | #: builtin/remote.c:1134 |
ef317cd5 | 9529 | msgid "do not query remotes" |
07432cef | 9530 | msgstr "不查询远程" |
ef317cd5 | 9531 | |
94550ed3 | 9532 | #: builtin/remote.c:1161 |
81809b99 | 9533 | #, c-format |
8ada9598 | 9534 | msgid "* remote %s" |
81809b99 | 9535 | msgstr "* 远程 %s" |
8ada9598 | 9536 | |
94550ed3 | 9537 | #: builtin/remote.c:1162 |
8ada9598 JX |
9538 | #, c-format |
9539 | msgid " Fetch URL: %s" | |
81809b99 | 9540 | msgstr " 获取地址:%s" |
8ada9598 | 9541 | |
94550ed3 | 9542 | #: builtin/remote.c:1163 builtin/remote.c:1314 |
8ada9598 | 9543 | msgid "(no URL)" |
81809b99 | 9544 | msgstr "(无 URL)" |
8ada9598 | 9545 | |
94550ed3 | 9546 | #: builtin/remote.c:1172 builtin/remote.c:1174 |
8ada9598 JX |
9547 | #, c-format |
9548 | msgid " Push URL: %s" | |
81809b99 | 9549 | msgstr " 推送地址:%s" |
8ada9598 | 9550 | |
94550ed3 | 9551 | #: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 |
81809b99 | 9552 | #, c-format |
8ada9598 | 9553 | msgid " HEAD branch: %s" |
4375c10e | 9554 | msgstr " HEAD 分支:%s" |
8ada9598 | 9555 | |
94550ed3 | 9556 | #: builtin/remote.c:1182 |
8ada9598 JX |
9557 | #, c-format |
9558 | msgid "" | |
9559 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 9560 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 | 9561 | |
94550ed3 | 9562 | #: builtin/remote.c:1194 |
81809b99 | 9563 | #, c-format |
8ada9598 JX |
9564 | msgid " Remote branch:%s" |
9565 | msgid_plural " Remote branches:%s" | |
81809b99 | 9566 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 9567 | msgstr[1] " 远程分支:%s" |
8ada9598 | 9568 | |
81809b99 | 9569 | # 译者:中文字符串拼接,可删除前导空格 |
94550ed3 | 9570 | #: builtin/remote.c:1197 builtin/remote.c:1224 |
8ada9598 | 9571 | msgid " (status not queried)" |
81809b99 | 9572 | msgstr "(状态未查询)" |
8ada9598 | 9573 | |
94550ed3 | 9574 | #: builtin/remote.c:1206 |
8ada9598 JX |
9575 | msgid " Local branch configured for 'git pull':" |
9576 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 9577 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 9578 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 | 9579 | |
94550ed3 | 9580 | #: builtin/remote.c:1214 |
8ada9598 | 9581 | msgid " Local refs will be mirrored by 'git push'" |
81809b99 | 9582 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 | 9583 | |
94550ed3 | 9584 | #: builtin/remote.c:1221 |
81809b99 | 9585 | #, c-format |
8ada9598 JX |
9586 | msgid " Local ref configured for 'git push'%s:" |
9587 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 9588 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 9589 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 9590 | |
94550ed3 | 9591 | #: builtin/remote.c:1242 |
ef317cd5 | 9592 | msgid "set refs/remotes/<name>/HEAD according to remote" |
07432cef | 9593 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 | 9594 | |
94550ed3 | 9595 | #: builtin/remote.c:1244 |
ef317cd5 | 9596 | msgid "delete refs/remotes/<name>/HEAD" |
07432cef | 9597 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 9598 | |
94550ed3 | 9599 | #: builtin/remote.c:1259 |
8ada9598 | 9600 | msgid "Cannot determine remote HEAD" |
81809b99 | 9601 | msgstr "无法确定远程 HEAD" |
8ada9598 | 9602 | |
94550ed3 | 9603 | #: builtin/remote.c:1261 |
8ada9598 | 9604 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
81809b99 | 9605 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 | 9606 | |
94550ed3 | 9607 | #: builtin/remote.c:1271 |
81809b99 | 9608 | #, c-format |
8ada9598 | 9609 | msgid "Could not delete %s" |
81809b99 | 9610 | msgstr "无法删除 %s" |
8ada9598 | 9611 | |
94550ed3 | 9612 | #: builtin/remote.c:1279 |
81809b99 | 9613 | #, c-format |
8ada9598 | 9614 | msgid "Not a valid ref: %s" |
81809b99 | 9615 | msgstr "不是一个有效引用:%s" |
8ada9598 | 9616 | |
94550ed3 | 9617 | #: builtin/remote.c:1281 |
81809b99 | 9618 | #, c-format |
8ada9598 | 9619 | msgid "Could not setup %s" |
81809b99 | 9620 | msgstr "不能设置 %s" |
8ada9598 JX |
9621 | |
9622 | # 译者:注意保持前导空格 | |
94550ed3 | 9623 | #: builtin/remote.c:1299 |
81809b99 | 9624 | #, c-format |
8ada9598 | 9625 | msgid " %s will become dangling!" |
07432cef | 9626 | msgstr " %s 将成为摇摆状态!" |
8ada9598 JX |
9627 | |
9628 | # 译者:注意保持前导空格 | |
94550ed3 | 9629 | #: builtin/remote.c:1300 |
81809b99 | 9630 | #, c-format |
8ada9598 | 9631 | msgid " %s has become dangling!" |
07432cef | 9632 | msgstr " %s 已成为摇摆状态!" |
8ada9598 | 9633 | |
94550ed3 | 9634 | #: builtin/remote.c:1310 |
81809b99 | 9635 | #, c-format |
8ada9598 | 9636 | msgid "Pruning %s" |
81809b99 | 9637 | msgstr "修剪 %s" |
8ada9598 | 9638 | |
94550ed3 | 9639 | #: builtin/remote.c:1311 |
8ada9598 JX |
9640 | #, c-format |
9641 | msgid "URL: %s" | |
81809b99 | 9642 | msgstr "URL:%s" |
8ada9598 | 9643 | |
94550ed3 | 9644 | #: builtin/remote.c:1327 |
8ada9598 JX |
9645 | #, c-format |
9646 | msgid " * [would prune] %s" | |
81809b99 | 9647 | msgstr " * [将删除] %s" |
8ada9598 | 9648 | |
94550ed3 | 9649 | #: builtin/remote.c:1330 |
8ada9598 JX |
9650 | #, c-format |
9651 | msgid " * [pruned] %s" | |
81809b99 | 9652 | msgstr " * [已删除] %s" |
8ada9598 | 9653 | |
94550ed3 | 9654 | #: builtin/remote.c:1375 |
ef317cd5 | 9655 | msgid "prune remotes after fetching" |
07432cef | 9656 | msgstr "抓取后清除远程" |
ef317cd5 | 9657 | |
94550ed3 | 9658 | #: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566 |
81809b99 | 9659 | #, c-format |
8ada9598 | 9660 | msgid "No such remote '%s'" |
81809b99 | 9661 | msgstr "没有此远程 '%s'" |
8ada9598 | 9662 | |
94550ed3 | 9663 | #: builtin/remote.c:1461 |
ef317cd5 | 9664 | msgid "add branch" |
07432cef | 9665 | msgstr "添加分支" |
ef317cd5 | 9666 | |
94550ed3 | 9667 | #: builtin/remote.c:1468 |
8ada9598 | 9668 | msgid "no remote specified" |
81809b99 | 9669 | msgstr "未指定远程" |
8ada9598 | 9670 | |
94550ed3 JX |
9671 | #: builtin/remote.c:1485 |
9672 | msgid "query push URLs rather than fetch URLs" | |
9673 | msgstr "查询推送 URL 地址,而非获取 URL 地址" | |
9674 | ||
9675 | #: builtin/remote.c:1487 | |
9676 | msgid "return all URLs" | |
9677 | msgstr "返回所有 URL 地址" | |
9678 | ||
9679 | #: builtin/remote.c:1515 | |
9680 | #, c-format | |
9681 | msgid "no URLs configured for remote '%s'" | |
9682 | msgstr "没有给远程仓库 '%s' 设定 URL" | |
9683 | ||
9684 | #: builtin/remote.c:1541 | |
ef317cd5 | 9685 | msgid "manipulate push URLs" |
07432cef | 9686 | msgstr "操作推送 URLS" |
ef317cd5 | 9687 | |
94550ed3 | 9688 | #: builtin/remote.c:1543 |
ef317cd5 | 9689 | msgid "add URL" |
07432cef | 9690 | msgstr "添加 URL" |
ef317cd5 | 9691 | |
94550ed3 | 9692 | #: builtin/remote.c:1545 |
ef317cd5 | 9693 | msgid "delete URLs" |
07432cef | 9694 | msgstr "删除 URLS" |
ef317cd5 | 9695 | |
94550ed3 | 9696 | #: builtin/remote.c:1552 |
8ada9598 | 9697 | msgid "--add --delete doesn't make sense" |
81809b99 | 9698 | msgstr "--add --delete 无意义" |
8ada9598 | 9699 | |
94550ed3 | 9700 | #: builtin/remote.c:1592 |
81809b99 | 9701 | #, c-format |
8ada9598 | 9702 | msgid "Invalid old URL pattern: %s" |
4375c10e | 9703 | msgstr "无效的旧 URL 匹配模版:%s" |
8ada9598 | 9704 | |
94550ed3 | 9705 | #: builtin/remote.c:1600 |
81809b99 | 9706 | #, c-format |
8ada9598 | 9707 | msgid "No such URL found: %s" |
4375c10e | 9708 | msgstr "未找到此 URL:%s" |
8ada9598 | 9709 | |
94550ed3 | 9710 | #: builtin/remote.c:1602 |
8ada9598 | 9711 | msgid "Will not delete all non-push URLs" |
4375c10e | 9712 | msgstr "将不会删除所有非推送 URL 地址" |
8ada9598 | 9713 | |
94550ed3 | 9714 | #: builtin/remote.c:1616 |
ef317cd5 | 9715 | msgid "be verbose; must be placed before a subcommand" |
07432cef | 9716 | msgstr "冗长输出;必须置于子命令之前" |
ef317cd5 | 9717 | |
6acbf033 | 9718 | #: builtin/repack.c:17 |
814ff314 JX |
9719 | msgid "git repack [<options>]" |
9720 | msgstr "git repack [<选项>]" | |
90314792 | 9721 | |
04cb2f28 | 9722 | #: builtin/repack.c:159 |
90314792 JX |
9723 | msgid "pack everything in a single pack" |
9724 | msgstr "所有内容打包到一个包文件中" | |
9725 | ||
04cb2f28 | 9726 | #: builtin/repack.c:161 |
90314792 JX |
9727 | msgid "same as -a, and turn unreachable objects loose" |
9728 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
9729 | ||
04cb2f28 | 9730 | #: builtin/repack.c:164 |
90314792 JX |
9731 | msgid "remove redundant packs, and run git-prune-packed" |
9732 | msgstr "删除多余的包,运行 git-prune-packed" | |
9733 | ||
04cb2f28 | 9734 | #: builtin/repack.c:166 |
90314792 JX |
9735 | msgid "pass --no-reuse-delta to git-pack-objects" |
9736 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
9737 | ||
04cb2f28 | 9738 | #: builtin/repack.c:168 |
90314792 JX |
9739 | msgid "pass --no-reuse-object to git-pack-objects" |
9740 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
9741 | ||
04cb2f28 | 9742 | #: builtin/repack.c:170 |
90314792 JX |
9743 | msgid "do not run git-update-server-info" |
9744 | msgstr "不运行 git-update-server-info" | |
9745 | ||
04cb2f28 | 9746 | #: builtin/repack.c:173 |
90314792 JX |
9747 | msgid "pass --local to git-pack-objects" |
9748 | msgstr "向 git-pack-objects 传递参数 --local" | |
9749 | ||
04cb2f28 | 9750 | #: builtin/repack.c:175 |
6c94aba5 JX |
9751 | msgid "write bitmap index" |
9752 | msgstr "写 bitmap 索引" | |
9753 | ||
04cb2f28 | 9754 | #: builtin/repack.c:176 |
90314792 JX |
9755 | msgid "approxidate" |
9756 | msgstr "近似日期" | |
9757 | ||
04cb2f28 | 9758 | #: builtin/repack.c:177 |
90314792 JX |
9759 | msgid "with -A, do not loosen objects older than this" |
9760 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
9761 | ||
04cb2f28 | 9762 | #: builtin/repack.c:179 |
90314792 JX |
9763 | msgid "size of the window used for delta compression" |
9764 | msgstr "用于增量压缩的窗口值" | |
9765 | ||
04cb2f28 | 9766 | #: builtin/repack.c:180 builtin/repack.c:184 |
8376b58d JX |
9767 | msgid "bytes" |
9768 | msgstr "字节" | |
9769 | ||
04cb2f28 | 9770 | #: builtin/repack.c:181 |
90314792 JX |
9771 | msgid "same as the above, but limit memory size instead of entries count" |
9772 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
9773 | ||
04cb2f28 | 9774 | #: builtin/repack.c:183 |
90314792 JX |
9775 | msgid "limits the maximum delta depth" |
9776 | msgstr "限制最大增量深度" | |
9777 | ||
04cb2f28 | 9778 | #: builtin/repack.c:185 |
90314792 | 9779 | msgid "maximum size of each packfile" |
dbd6cced | 9780 | msgstr "每个包文件的最大尺寸" |
90314792 | 9781 | |
04cb2f28 | 9782 | #: builtin/repack.c:187 |
6c94aba5 JX |
9783 | msgid "repack objects in packs marked with .keep" |
9784 | msgstr "对标记为 .keep 的包中的对象重新打包" | |
9785 | ||
94550ed3 JX |
9786 | #: builtin/repack.c:197 |
9787 | msgid "cannot delete packs in a precious-objects repo" | |
9788 | msgstr "不能删除珍品仓库中的打包文件" | |
9789 | ||
9790 | #: builtin/repack.c:381 | |
90314792 JX |
9791 | #, c-format |
9792 | msgid "removing '%s' failed" | |
9793 | msgstr "删除 '%s' 失败" | |
9794 | ||
6acbf033 | 9795 | #: builtin/replace.c:19 |
ef317cd5 | 9796 | msgid "git replace [-f] <object> <replacement>" |
07432cef | 9797 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 | 9798 | |
6acbf033 JX |
9799 | #: builtin/replace.c:20 |
9800 | msgid "git replace [-f] --edit <object>" | |
9801 | msgstr "git replace [-f] --edit <对象>" | |
9802 | ||
9803 | #: builtin/replace.c:21 | |
9804 | msgid "git replace [-f] --graft <commit> [<parent>...]" | |
9805 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" | |
9806 | ||
9807 | #: builtin/replace.c:22 | |
ef317cd5 | 9808 | msgid "git replace -d <object>..." |
07432cef | 9809 | msgstr "git replace -d <对象>..." |
ef317cd5 | 9810 | |
6acbf033 | 9811 | #: builtin/replace.c:23 |
cfff71a9 JX |
9812 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
9813 | msgstr "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 |
9817 | msgid "Not a valid object name: '%s'" | |
9818 | msgstr "不是一个有效的对象名:'%s'" | |
9819 | ||
220c313c | 9820 | #: builtin/replace.c:355 |
6acbf033 JX |
9821 | #, c-format |
9822 | msgid "bad mergetag in commit '%s'" | |
55a16ee4 | 9823 | msgstr "提交 '%s' 中含有损坏的合并标签" |
6acbf033 | 9824 | |
220c313c | 9825 | #: builtin/replace.c:357 |
6acbf033 JX |
9826 | #, c-format |
9827 | msgid "malformed mergetag in commit '%s'" | |
55a16ee4 | 9828 | msgstr "提交 '%s' 中含有非法的合并标签" |
6acbf033 | 9829 | |
220c313c | 9830 | #: builtin/replace.c:368 |
6acbf033 JX |
9831 | #, c-format |
9832 | msgid "" | |
9833 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
9834 | "instead of --graft" | |
55a16ee4 | 9835 | msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft" |
6acbf033 | 9836 | |
220c313c | 9837 | #: builtin/replace.c:401 |
6acbf033 JX |
9838 | #, c-format |
9839 | msgid "the original commit '%s' has a gpg signature." | |
9840 | msgstr "原始提交 '%s' 中包含一个 GPG 签名" | |
9841 | ||
220c313c | 9842 | #: builtin/replace.c:402 |
6acbf033 JX |
9843 | msgid "the signature will be removed in the replacement commit!" |
9844 | msgstr "在替换的提交中签名将被移除!" | |
9845 | ||
220c313c | 9846 | #: builtin/replace.c:408 |
6acbf033 JX |
9847 | #, c-format |
9848 | msgid "could not write replacement commit for: '%s'" | |
9849 | msgstr "不能为 '%s' 写替换提交" | |
9850 | ||
220c313c | 9851 | #: builtin/replace.c:432 |
ef317cd5 | 9852 | msgid "list replace refs" |
07432cef | 9853 | msgstr "列出替换的引用" |
ef317cd5 | 9854 | |
220c313c | 9855 | #: builtin/replace.c:433 |
ef317cd5 | 9856 | msgid "delete replace refs" |
07432cef | 9857 | msgstr "删除替换的引用" |
ef317cd5 | 9858 | |
220c313c | 9859 | #: builtin/replace.c:434 |
6acbf033 JX |
9860 | msgid "edit existing object" |
9861 | msgstr "编辑现存的对象" | |
9862 | ||
220c313c | 9863 | #: builtin/replace.c:435 |
6acbf033 JX |
9864 | msgid "change a commit's parents" |
9865 | msgstr "修改一个提交的父提交" | |
9866 | ||
220c313c | 9867 | #: builtin/replace.c:436 |
ef317cd5 | 9868 | msgid "replace the ref if it exists" |
07432cef | 9869 | msgstr "如果存在则替换引用" |
ef317cd5 | 9870 | |
220c313c | 9871 | #: builtin/replace.c:437 |
6acbf033 JX |
9872 | msgid "do not pretty-print contents for --edit" |
9873 | msgstr "不要为 --edit 操作美观显示内容" | |
9874 | ||
220c313c | 9875 | #: builtin/replace.c:438 |
cfff71a9 JX |
9876 | msgid "use this format" |
9877 | msgstr "使用此格式" | |
9878 | ||
90314792 | 9879 | #: builtin/rerere.c:12 |
814ff314 JX |
9880 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
9881 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" | |
ef317cd5 | 9882 | |
94550ed3 | 9883 | #: builtin/rerere.c:58 |
ef317cd5 | 9884 | msgid "register clean resolutions in index" |
07432cef | 9885 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 | 9886 | |
220c313c | 9887 | #: builtin/reset.c:26 |
ef317cd5 JX |
9888 | msgid "" |
9889 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 9890 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 | 9891 | |
220c313c | 9892 | #: builtin/reset.c:27 |
07432cef WS |
9893 | msgid "git reset [-q] <tree-ish> [--] <paths>..." |
9894 | msgstr "git reset [-q] <树或提交> [--] <路径>..." | |
ef317cd5 | 9895 | |
220c313c | 9896 | #: builtin/reset.c:28 |
07432cef WS |
9897 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
9898 | msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" | |
ef317cd5 | 9899 | |
220c313c | 9900 | #: builtin/reset.c:34 |
c04f5ac3 JX |
9901 | msgid "mixed" |
9902 | msgstr "混杂" | |
9903 | ||
220c313c | 9904 | #: builtin/reset.c:34 |
c04f5ac3 JX |
9905 | msgid "soft" |
9906 | msgstr "软性" | |
9907 | ||
220c313c | 9908 | #: builtin/reset.c:34 |
c04f5ac3 JX |
9909 | msgid "hard" |
9910 | msgstr "硬性" | |
9911 | ||
220c313c | 9912 | #: builtin/reset.c:34 |
8ada9598 JX |
9913 | msgid "merge" |
9914 | msgstr "合并" | |
9915 | ||
220c313c | 9916 | #: builtin/reset.c:34 |
c04f5ac3 JX |
9917 | msgid "keep" |
9918 | msgstr "保持" | |
9919 | ||
220c313c | 9920 | #: builtin/reset.c:74 |
c04f5ac3 JX |
9921 | msgid "You do not have a valid HEAD." |
9922 | msgstr "您没有一个有效的 HEAD。" | |
9923 | ||
220c313c | 9924 | #: builtin/reset.c:76 |
c04f5ac3 JX |
9925 | msgid "Failed to find tree of HEAD." |
9926 | msgstr "无法找到 HEAD 指向的树。" | |
9927 | ||
220c313c | 9928 | #: builtin/reset.c:82 |
c04f5ac3 JX |
9929 | #, c-format |
9930 | msgid "Failed to find tree of %s." | |
9931 | msgstr "无法找到 %s 指向的树。" | |
9932 | ||
220c313c | 9933 | #: builtin/reset.c:100 |
c04f5ac3 JX |
9934 | #, c-format |
9935 | msgid "HEAD is now at %s" | |
9936 | msgstr "HEAD 现在位于 %s" | |
9937 | ||
90e6ef53 | 9938 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 9939 | #: builtin/reset.c:183 |
c04f5ac3 JX |
9940 | #, c-format |
9941 | msgid "Cannot do a %s reset in the middle of a merge." | |
9942 | msgstr "在合并过程中不能做%s重置操作。" | |
9943 | ||
220c313c | 9944 | #: builtin/reset.c:276 |
ef317cd5 | 9945 | msgid "be quiet, only report errors" |
07432cef | 9946 | msgstr "安静模式,只报告错误" |
ef317cd5 | 9947 | |
220c313c | 9948 | #: builtin/reset.c:278 |
ef317cd5 | 9949 | msgid "reset HEAD and index" |
07432cef | 9950 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 9951 | |
220c313c | 9952 | #: builtin/reset.c:279 |
ef317cd5 | 9953 | msgid "reset only HEAD" |
07432cef | 9954 | msgstr "只重置 HEAD" |
ef317cd5 | 9955 | |
220c313c | 9956 | #: builtin/reset.c:281 builtin/reset.c:283 |
ef317cd5 | 9957 | msgid "reset HEAD, index and working tree" |
07432cef | 9958 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 9959 | |
220c313c | 9960 | #: builtin/reset.c:285 |
ef317cd5 | 9961 | msgid "reset HEAD but keep local changes" |
07432cef | 9962 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 9963 | |
220c313c | 9964 | #: builtin/reset.c:288 |
6c94aba5 JX |
9965 | msgid "record only the fact that removed paths will be added later" |
9966 | msgstr "将删除的路径标记为稍后添加" | |
9967 | ||
220c313c | 9968 | #: builtin/reset.c:305 |
07432cef WS |
9969 | #, c-format |
9970 | msgid "Failed to resolve '%s' as a valid revision." | |
9971 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
9972 | ||
220c313c | 9973 | #: builtin/reset.c:313 |
07432cef WS |
9974 | #, c-format |
9975 | msgid "Failed to resolve '%s' as a valid tree." | |
9976 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
9977 | ||
220c313c | 9978 | #: builtin/reset.c:322 |
c04f5ac3 | 9979 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 9980 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 9981 | |
220c313c | 9982 | #: builtin/reset.c:331 |
c04f5ac3 | 9983 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
d9d56b23 | 9984 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
c04f5ac3 | 9985 | |
90e6ef53 | 9986 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 9987 | #: builtin/reset.c:333 |
c04f5ac3 JX |
9988 | #, c-format |
9989 | msgid "Cannot do %s reset with paths." | |
9990 | msgstr "不能带路径进行%s重置。" | |
9991 | ||
90e6ef53 | 9992 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 9993 | #: builtin/reset.c:343 |
c04f5ac3 JX |
9994 | #, c-format |
9995 | msgid "%s reset is not allowed in a bare repository" | |
160fb2b2 | 9996 | msgstr "不能对纯仓库进行%s重置" |
c04f5ac3 | 9997 | |
220c313c | 9998 | #: builtin/reset.c:347 |
6c94aba5 JX |
9999 | msgid "-N can only be used with --mixed" |
10000 | msgstr "-N 只能和 --mixed 同时使用" | |
10001 | ||
220c313c | 10002 | #: builtin/reset.c:364 |
90314792 | 10003 | msgid "Unstaged changes after reset:" |
160fb2b2 | 10004 | msgstr "重置后取消暂存的变更:" |
90314792 | 10005 | |
220c313c | 10006 | #: builtin/reset.c:370 |
ef317cd5 JX |
10007 | #, c-format |
10008 | msgid "Could not reset index file to revision '%s'." | |
10009 | msgstr "不能重置索引文件至版本 '%s'。" | |
10010 | ||
220c313c | 10011 | #: builtin/reset.c:374 |
07432cef WS |
10012 | msgid "Could not write new index file." |
10013 | msgstr "不能写入新的索引文件。" | |
10014 | ||
1b7f4a34 JX |
10015 | #: builtin/rev-list.c:354 |
10016 | msgid "rev-list does not support display of notes" | |
10017 | msgstr "rev-list 不支持显示注解" | |
10018 | ||
94550ed3 | 10019 | #: builtin/rev-parse.c:358 |
814ff314 JX |
10020 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
10021 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" | |
ef317cd5 | 10022 | |
94550ed3 | 10023 | #: builtin/rev-parse.c:363 |
ef317cd5 | 10024 | msgid "keep the `--` passed as an arg" |
07432cef | 10025 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 10026 | |
94550ed3 | 10027 | #: builtin/rev-parse.c:365 |
ef317cd5 | 10028 | msgid "stop parsing after the first non-option argument" |
07432cef | 10029 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 10030 | |
94550ed3 | 10031 | #: builtin/rev-parse.c:368 |
cfff71a9 JX |
10032 | msgid "output in stuck long form" |
10033 | msgstr "以固定长格式输出" | |
10034 | ||
94550ed3 | 10035 | #: builtin/rev-parse.c:499 |
ef317cd5 | 10036 | msgid "" |
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." | |
10042 | msgstr "" | |
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 |
10050 | msgid "git revert [<options>] <commit-ish>..." |
10051 | msgstr "git revert [<选项>] <提交号>..." | |
ef317cd5 JX |
10052 | |
10053 | #: builtin/revert.c:23 | |
10054 | msgid "git revert <subcommand>" | |
07432cef | 10055 | msgstr "git revert <子命令>" |
ef317cd5 JX |
10056 | |
10057 | #: builtin/revert.c:28 | |
814ff314 JX |
10058 | msgid "git cherry-pick [<options>] <commit-ish>..." |
10059 | msgstr "git cherry-pick [<选项>] <提交号>..." | |
ef317cd5 JX |
10060 | |
10061 | #: builtin/revert.c:29 | |
ef317cd5 | 10062 | msgid "git cherry-pick <subcommand>" |
07432cef | 10063 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 10064 | |
90314792 | 10065 | #: builtin/revert.c:71 |
ef317cd5 JX |
10066 | #, c-format |
10067 | msgid "%s: %s cannot be used with %s" | |
10068 | msgstr "%s:%s 不能和 %s 同时使用" | |
10069 | ||
90314792 | 10070 | #: builtin/revert.c:80 |
ef317cd5 | 10071 | msgid "end revert or cherry-pick sequence" |
07432cef | 10072 | msgstr "终止反转或拣选操作" |
ef317cd5 | 10073 | |
90314792 | 10074 | #: builtin/revert.c:81 |
ef317cd5 | 10075 | msgid "resume revert or cherry-pick sequence" |
07432cef | 10076 | msgstr "继续反转或拣选操作" |
ef317cd5 | 10077 | |
90314792 | 10078 | #: builtin/revert.c:82 |
ef317cd5 | 10079 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 10080 | msgstr "取消反转或拣选操作" |
ef317cd5 | 10081 | |
90314792 | 10082 | #: builtin/revert.c:83 |
ef317cd5 | 10083 | msgid "don't automatically commit" |
07432cef | 10084 | msgstr "不要自动提交" |
ef317cd5 | 10085 | |
90314792 | 10086 | #: builtin/revert.c:84 |
ef317cd5 | 10087 | msgid "edit the commit message" |
07432cef | 10088 | msgstr "编辑提交说明" |
ef317cd5 | 10089 | |
90314792 | 10090 | #: builtin/revert.c:87 |
ef317cd5 | 10091 | msgid "parent number" |
07432cef | 10092 | msgstr "父编号" |
ef317cd5 | 10093 | |
90314792 | 10094 | #: builtin/revert.c:89 |
ef317cd5 | 10095 | msgid "merge strategy" |
07432cef | 10096 | msgstr "合并策略" |
ef317cd5 | 10097 | |
90314792 | 10098 | #: builtin/revert.c:90 |
ef317cd5 | 10099 | msgid "option" |
07432cef | 10100 | msgstr "选项" |
ef317cd5 | 10101 | |
90314792 | 10102 | #: builtin/revert.c:91 |
ef317cd5 | 10103 | msgid "option for merge strategy" |
07432cef | 10104 | msgstr "合并策略的选项" |
ef317cd5 | 10105 | |
6c94aba5 | 10106 | #: builtin/revert.c:104 |
ef317cd5 | 10107 | msgid "append commit name" |
07432cef | 10108 | msgstr "追加提交名称" |
ef317cd5 | 10109 | |
6c94aba5 | 10110 | #: builtin/revert.c:106 |
ef317cd5 | 10111 | msgid "preserve initially empty commits" |
07432cef | 10112 | msgstr "保留初始化的空提交" |
ef317cd5 | 10113 | |
6c94aba5 | 10114 | #: builtin/revert.c:107 |
ef317cd5 | 10115 | msgid "allow commits with empty messages" |
07432cef | 10116 | msgstr "允许提交说明为空" |
c04f5ac3 | 10117 | |
6c94aba5 | 10118 | #: builtin/revert.c:108 |
ef317cd5 | 10119 | msgid "keep redundant, empty commits" |
07432cef | 10120 | msgstr "保持多余的、空的提交" |
ef317cd5 | 10121 | |
6c94aba5 | 10122 | #: builtin/revert.c:112 |
c04f5ac3 JX |
10123 | msgid "program error" |
10124 | msgstr "程序错误" | |
10125 | ||
6c94aba5 | 10126 | #: builtin/revert.c:197 |
c04f5ac3 JX |
10127 | msgid "revert failed" |
10128 | msgstr "还原失败" | |
10129 | ||
6c94aba5 | 10130 | #: builtin/revert.c:212 |
c04f5ac3 JX |
10131 | msgid "cherry-pick failed" |
10132 | msgstr "拣选失败" | |
10133 | ||
90314792 | 10134 | #: builtin/rm.c:17 |
814ff314 JX |
10135 | msgid "git rm [<options>] [--] <file>..." |
10136 | msgstr "git rm [<选项>] [--] <文件>..." | |
07432cef | 10137 | |
90314792 | 10138 | #: builtin/rm.c:65 |
2e8451e8 JX |
10139 | msgid "" |
10140 | "the following submodule (or one of its nested submodules)\n" | |
10141 | "uses a .git directory:" | |
10142 | msgid_plural "" | |
220c313c | 10143 | "the following submodules (or one of their nested submodules)\n" |
2e8451e8 | 10144 | "use a .git directory:" |
220c313c JX |
10145 | msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" |
10146 | msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" | |
2e8451e8 | 10147 | |
90314792 | 10148 | #: builtin/rm.c:71 |
07432cef | 10149 | msgid "" |
2e8451e8 | 10150 | "\n" |
07432cef WS |
10151 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
10152 | msgstr "" | |
2e8451e8 | 10153 | "\n" |
07432cef | 10154 | "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" |
ef317cd5 | 10155 | |
7aea43ff | 10156 | #: builtin/rm.c:230 |
c04f5ac3 | 10157 | msgid "" |
2e8451e8 JX |
10158 | "the following file has staged content different from both the\n" |
10159 | "file and the HEAD:" | |
10160 | msgid_plural "" | |
10161 | "the following files have staged content different from both the\n" | |
10162 | "file and the HEAD:" | |
10163 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
10164 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
10165 | ||
7aea43ff | 10166 | #: builtin/rm.c:235 |
2e8451e8 JX |
10167 | msgid "" |
10168 | "\n" | |
c04f5ac3 JX |
10169 | "(use -f to force removal)" |
10170 | msgstr "" | |
2e8451e8 | 10171 | "\n" |
c04f5ac3 JX |
10172 | "(使用 -f 强制删除)" |
10173 | ||
7aea43ff | 10174 | #: builtin/rm.c:239 |
2e8451e8 JX |
10175 | msgid "the following file has changes staged in the index:" |
10176 | msgid_plural "the following files have changes staged in the index:" | |
160fb2b2 JX |
10177 | msgstr[0] "下列文件索引中有变更" |
10178 | msgstr[1] "下列文件索引中有变更" | |
c04f5ac3 | 10179 | |
7aea43ff | 10180 | #: builtin/rm.c:243 builtin/rm.c:254 |
c04f5ac3 | 10181 | msgid "" |
2e8451e8 | 10182 | "\n" |
c04f5ac3 JX |
10183 | "(use --cached to keep the file, or -f to force removal)" |
10184 | msgstr "" | |
2e8451e8 JX |
10185 | "\n" |
10186 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
10187 | ||
7aea43ff | 10188 | #: builtin/rm.c:251 |
2e8451e8 JX |
10189 | msgid "the following file has local modifications:" |
10190 | msgid_plural "the following files have local modifications:" | |
10191 | msgstr[0] "如下文件有本地修改:" | |
10192 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 10193 | |
7aea43ff | 10194 | #: builtin/rm.c:269 |
ef317cd5 | 10195 | msgid "do not list removed files" |
07432cef | 10196 | msgstr "不列出删除的文件" |
ef317cd5 | 10197 | |
7aea43ff | 10198 | #: builtin/rm.c:270 |
ef317cd5 | 10199 | msgid "only remove from the index" |
07432cef | 10200 | msgstr "只从索引区删除" |
ef317cd5 | 10201 | |
7aea43ff | 10202 | #: builtin/rm.c:271 |
ef317cd5 | 10203 | msgid "override the up-to-date check" |
07432cef | 10204 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 10205 | |
7aea43ff | 10206 | #: builtin/rm.c:272 |
ef317cd5 | 10207 | msgid "allow recursive removal" |
07432cef | 10208 | msgstr "允许递归删除" |
ef317cd5 | 10209 | |
7aea43ff | 10210 | #: builtin/rm.c:274 |
ef317cd5 | 10211 | msgid "exit with a zero status even if nothing matched" |
07432cef | 10212 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 10213 | |
7aea43ff | 10214 | #: builtin/rm.c:317 |
220c313c JX |
10215 | msgid "Please, stage your changes to .gitmodules or stash them to proceed" |
10216 | msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" | |
10217 | ||
7aea43ff | 10218 | #: builtin/rm.c:335 |
c04f5ac3 JX |
10219 | #, c-format |
10220 | msgid "not removing '%s' recursively without -r" | |
10221 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
10222 | ||
7aea43ff | 10223 | #: builtin/rm.c:374 |
c04f5ac3 JX |
10224 | #, c-format |
10225 | msgid "git rm: unable to remove %s" | |
10226 | msgstr "git rm:不能删除 %s" | |
10227 | ||
1b7f4a34 JX |
10228 | #: builtin/send-pack.c:18 |
10229 | msgid "" | |
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." | |
10234 | msgstr "" | |
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 | |
10240 | msgid "remote name" | |
10241 | msgstr "远程名称" | |
10242 | ||
10243 | #: builtin/send-pack.c:171 | |
10244 | msgid "use stateless RPC protocol" | |
10245 | msgstr "使用无状态的 RPC 协议" | |
10246 | ||
10247 | #: builtin/send-pack.c:172 | |
10248 | msgid "read refs from stdin" | |
10249 | msgstr "从标准输入读取引用" | |
10250 | ||
10251 | #: builtin/send-pack.c:173 | |
10252 | msgid "print status from remote helper" | |
10253 | msgstr "打印来自远程 helper 的状态" | |
10254 | ||
ef317cd5 | 10255 | #: builtin/shortlog.c:13 |
814ff314 | 10256 | msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" |
4dcdc3d8 | 10257 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" |
ef317cd5 | 10258 | |
4dcdc3d8 | 10259 | #: builtin/shortlog.c:131 |
c04f5ac3 JX |
10260 | #, c-format |
10261 | msgid "Missing author: %s" | |
10262 | msgstr "缺少作者:%s" | |
10263 | ||
90314792 | 10264 | #: builtin/shortlog.c:230 |
ef317cd5 | 10265 | msgid "sort output according to the number of commits per author" |
07432cef | 10266 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 10267 | |
90314792 | 10268 | #: builtin/shortlog.c:232 |
ef317cd5 | 10269 | msgid "Suppress commit descriptions, only provides commit count" |
07432cef | 10270 | msgstr "隐藏提交说明,只提供提交数量" |
ef317cd5 | 10271 | |
90314792 | 10272 | #: builtin/shortlog.c:234 |
ef317cd5 | 10273 | msgid "Show the email address of each author" |
07432cef | 10274 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 10275 | |
90314792 | 10276 | #: builtin/shortlog.c:235 |
ef317cd5 | 10277 | msgid "w[,i1[,i2]]" |
07432cef | 10278 | msgstr "w[,i1[,i2]]" |
ef317cd5 | 10279 | |
90314792 | 10280 | #: builtin/shortlog.c:236 |
ef317cd5 | 10281 | msgid "Linewrap output" |
07432cef | 10282 | msgstr "折行输出" |
ef317cd5 | 10283 | |
94550ed3 | 10284 | #: builtin/show-branch.c:10 |
ef317cd5 | 10285 | msgid "" |
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 | 10290 | msgstr "" |
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 |
10297 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
10298 | msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" | |
ef317cd5 | 10299 | |
94550ed3 | 10300 | #: builtin/show-branch.c:640 |
ef317cd5 | 10301 | msgid "show remote-tracking and local branches" |
07432cef | 10302 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 10303 | |
94550ed3 | 10304 | #: builtin/show-branch.c:642 |
ef317cd5 | 10305 | msgid "show remote-tracking branches" |
07432cef | 10306 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 10307 | |
94550ed3 | 10308 | #: builtin/show-branch.c:644 |
ef317cd5 | 10309 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 10310 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 10311 | |
94550ed3 | 10312 | #: builtin/show-branch.c:646 |
ef317cd5 | 10313 | msgid "show <n> more commits after the common ancestor" |
07432cef | 10314 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 10315 | |
94550ed3 | 10316 | #: builtin/show-branch.c:648 |
ef317cd5 | 10317 | msgid "synonym to more=-1" |
07432cef | 10318 | msgstr "和 more=-1 同义" |
ef317cd5 | 10319 | |
94550ed3 | 10320 | #: builtin/show-branch.c:649 |
ef317cd5 | 10321 | msgid "suppress naming strings" |
07432cef | 10322 | msgstr "不显示字符串命名" |
ef317cd5 | 10323 | |
94550ed3 | 10324 | #: builtin/show-branch.c:651 |
ef317cd5 | 10325 | msgid "include the current branch" |
07432cef | 10326 | msgstr "包括当前分支" |
ef317cd5 | 10327 | |
94550ed3 | 10328 | #: builtin/show-branch.c:653 |
ef317cd5 | 10329 | msgid "name commits with their object names" |
07432cef | 10330 | msgstr "以对象名字命名提交" |
ef317cd5 | 10331 | |
94550ed3 | 10332 | #: builtin/show-branch.c:655 |
ef317cd5 | 10333 | msgid "show possible merge bases" |
07432cef | 10334 | msgstr "显示可能合并的基线" |
ef317cd5 | 10335 | |
94550ed3 | 10336 | #: builtin/show-branch.c:657 |
ef317cd5 | 10337 | msgid "show refs unreachable from any other ref" |
07432cef | 10338 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 10339 | |
94550ed3 | 10340 | #: builtin/show-branch.c:659 |
ef317cd5 | 10341 | msgid "show commits in topological order" |
07432cef | 10342 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 10343 | |
94550ed3 | 10344 | #: builtin/show-branch.c:662 |
ef317cd5 | 10345 | msgid "show only commits not on the first branch" |
07432cef | 10346 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 10347 | |
94550ed3 | 10348 | #: builtin/show-branch.c:664 |
ef317cd5 | 10349 | msgid "show merges reachable from only one tip" |
07432cef | 10350 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 10351 | |
94550ed3 | 10352 | #: builtin/show-branch.c:666 |
2e8451e8 JX |
10353 | msgid "topologically sort, maintaining date order where possible" |
10354 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 10355 | |
94550ed3 | 10356 | #: builtin/show-branch.c:669 |
ef317cd5 | 10357 | msgid "<n>[,<base>]" |
07432cef | 10358 | msgstr "<n>[,<base>]" |
ef317cd5 | 10359 | |
94550ed3 | 10360 | #: builtin/show-branch.c:670 |
ef317cd5 | 10361 | msgid "show <n> most recent ref-log entries starting at base" |
07432cef | 10362 | msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" |
ef317cd5 JX |
10363 | |
10364 | #: builtin/show-ref.c:10 | |
10365 | msgid "" | |
814ff314 JX |
10366 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
10367 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
ef317cd5 | 10368 | msgstr "" |
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 |
10373 | msgid "git show-ref --exclude-existing[=<pattern>]" |
10374 | msgstr "git show-ref --exclude-existing[=<模式>]" | |
ef317cd5 | 10375 | |
94550ed3 | 10376 | #: builtin/show-ref.c:165 |
ef317cd5 | 10377 | msgid "only show tags (can be combined with heads)" |
55a16ee4 | 10378 | msgstr "只显示标签(可以和头共用)" |
ef317cd5 | 10379 | |
94550ed3 | 10380 | #: builtin/show-ref.c:166 |
ef317cd5 | 10381 | msgid "only show heads (can be combined with tags)" |
55a16ee4 | 10382 | msgstr "只显示头(可以和标签共用)" |
ef317cd5 | 10383 | |
94550ed3 | 10384 | #: builtin/show-ref.c:167 |
ef317cd5 | 10385 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 10386 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 10387 | |
94550ed3 | 10388 | #: builtin/show-ref.c:170 builtin/show-ref.c:172 |
2e8451e8 JX |
10389 | msgid "show the HEAD reference, even if it would be filtered out" |
10390 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 10391 | |
94550ed3 | 10392 | #: builtin/show-ref.c:174 |
ef317cd5 | 10393 | msgid "dereference tags into object IDs" |
4375c10e | 10394 | msgstr "转换标签到对象 ID" |
ef317cd5 | 10395 | |
94550ed3 | 10396 | #: builtin/show-ref.c:176 |
ef317cd5 | 10397 | msgid "only show SHA1 hash using <n> digits" |
07432cef | 10398 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" |
ef317cd5 | 10399 | |
94550ed3 | 10400 | #: builtin/show-ref.c:180 |
ef317cd5 | 10401 | msgid "do not print results to stdout (useful with --verify)" |
07432cef | 10402 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" |
ef317cd5 | 10403 | |
94550ed3 | 10404 | #: builtin/show-ref.c:182 |
ef317cd5 | 10405 | msgid "show refs from stdin that aren't in local repository" |
160fb2b2 | 10406 | msgstr "显示从标准输入中读入的不在本地仓库中的引用" |
ef317cd5 | 10407 | |
94550ed3 JX |
10408 | #: builtin/stripspace.c:17 |
10409 | msgid "git stripspace [-s | --strip-comments]" | |
10410 | msgstr "git stripspace [-s | --strip-comments]" | |
10411 | ||
10412 | #: builtin/stripspace.c:18 | |
10413 | msgid "git stripspace [-c | --comment-lines]" | |
10414 | msgstr "git stripspace [-c | --comment-lines]" | |
10415 | ||
10416 | #: builtin/stripspace.c:35 | |
10417 | msgid "skip and remove all lines starting with comment character" | |
10418 | msgstr "跳过和移除所有的注释行" | |
10419 | ||
10420 | #: builtin/stripspace.c:38 | |
10421 | msgid "prepend comment character and blank to each line" | |
10422 | msgstr "为每一行的行首添加注释符和空格" | |
10423 | ||
10424 | #: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167 | |
10425 | msgid "alternative anchor for relative paths" | |
10426 | msgstr "相对路径的替代锚记(anchor)" | |
10427 | ||
10428 | #: builtin/submodule--helper.c:84 | |
10429 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" | |
10430 | msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" | |
10431 | ||
10432 | #: builtin/submodule--helper.c:114 | |
10433 | msgid "git submodule--helper name <path>" | |
10434 | msgstr "git submodule--helper name <路径>" | |
10435 | ||
10436 | #: builtin/submodule--helper.c:120 | |
10437 | #, c-format | |
10438 | msgid "no submodule mapping found in .gitmodules for path '%s'" | |
10439 | msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" | |
10440 | ||
10441 | #: builtin/submodule--helper.c:170 | |
10442 | msgid "where the new submodule will be cloned to" | |
10443 | msgstr "新的子模组将要克隆的路径" | |
10444 | ||
10445 | #: builtin/submodule--helper.c:173 | |
10446 | msgid "name of the new submodule" | |
10447 | msgstr "新子模组的名称" | |
10448 | ||
10449 | #: builtin/submodule--helper.c:176 | |
10450 | msgid "url where to clone the submodule from" | |
10451 | msgstr "克隆子模组的 url 地址" | |
10452 | ||
10453 | #: builtin/submodule--helper.c:182 | |
10454 | msgid "depth for shallow clones" | |
10455 | msgstr "浅克隆的深度" | |
10456 | ||
10457 | #: builtin/submodule--helper.c:188 | |
10458 | msgid "" | |
10459 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " | |
10460 | "<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" | |
10461 | msgstr "" | |
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 | |
10468 | msgid "could not create directory '%s'" | |
10469 | msgstr "不能创建目录 '%s'" | |
10470 | ||
10471 | #: builtin/submodule--helper.c:204 | |
10472 | #, c-format | |
10473 | msgid "clone of '%s' into submodule path '%s' failed" | |
10474 | msgstr "无法克隆 '%s' 到子模组路径 '%s'" | |
10475 | ||
10476 | #: builtin/submodule--helper.c:227 | |
10477 | #, c-format | |
10478 | msgid "cannot open file '%s'" | |
10479 | msgstr "无法打开文件 '%s'" | |
10480 | ||
10481 | #: builtin/submodule--helper.c:232 | |
10482 | #, c-format | |
10483 | msgid "could not close file %s" | |
10484 | msgstr "无法关闭文件 %s" | |
10485 | ||
10486 | #: builtin/submodule--helper.c:247 | |
10487 | #, c-format | |
10488 | msgid "could not get submodule directory for '%s'" | |
10489 | msgstr "无法得到 '%s' 的子模组目录" | |
10490 | ||
10491 | #: builtin/submodule--helper.c:273 | |
10492 | msgid "fatal: submodule--helper subcommand must be called with a subcommand" | |
10493 | msgstr "严重错误:submodule-helper 子命令必须由另外的子命令调用" | |
10494 | ||
10495 | #: builtin/submodule--helper.c:280 | |
10496 | #, c-format | |
10497 | msgid "fatal: '%s' is not a valid submodule--helper subcommand" | |
10498 | msgstr "严重错误:'%s' 不是一个有效的 submodule--helper 子命令" | |
10499 | ||
ef317cd5 | 10500 | #: builtin/symbolic-ref.c:7 |
814ff314 JX |
10501 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
10502 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" | |
07432cef WS |
10503 | |
10504 | #: builtin/symbolic-ref.c:8 | |
814ff314 JX |
10505 | msgid "git symbolic-ref -d [-q] <name>" |
10506 | msgstr "git symbolic-ref -d [-q] <名称>" | |
ef317cd5 | 10507 | |
07432cef | 10508 | #: builtin/symbolic-ref.c:40 |
ef317cd5 | 10509 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
10510 | msgstr "不显示非符号(分离的)引用的错误信息" |
10511 | ||
10512 | #: builtin/symbolic-ref.c:41 | |
10513 | msgid "delete symbolic ref" | |
10514 | msgstr "删除符号引用" | |
ef317cd5 | 10515 | |
07432cef | 10516 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 10517 | msgid "shorten ref output" |
07432cef | 10518 | msgstr "简短的引用输出" |
ef317cd5 | 10519 | |
1b7f4a34 | 10520 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 10521 | msgid "reason" |
07432cef | 10522 | msgstr "原因" |
ef317cd5 | 10523 | |
1b7f4a34 | 10524 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 10525 | msgid "reason of the update" |
07432cef | 10526 | msgstr "更新的原因" |
ef317cd5 | 10527 | |
94550ed3 | 10528 | #: builtin/tag.c:23 |
ef317cd5 | 10529 | msgid "" |
814ff314 JX |
10530 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " |
10531 | "[<head>]" | |
10532 | msgstr "" | |
10533 | "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" | |
ef317cd5 | 10534 | |
94550ed3 | 10535 | #: builtin/tag.c:24 |
ef317cd5 | 10536 | msgid "git tag -d <tagname>..." |
07432cef | 10537 | msgstr "git tag -d <标签名>..." |
ef317cd5 | 10538 | |
94550ed3 | 10539 | #: builtin/tag.c:25 |
ef317cd5 | 10540 | msgid "" |
814ff314 | 10541 | "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" |
94550ed3 | 10542 | "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" |
ef317cd5 | 10543 | msgstr "" |
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 | 10548 | msgid "git tag -v <tagname>..." |
07432cef | 10549 | msgstr "git tag -v <标签名>..." |
ef317cd5 | 10550 | |
94550ed3 | 10551 | #: builtin/tag.c:80 |
c04f5ac3 JX |
10552 | #, c-format |
10553 | msgid "tag name too long: %.*s..." | |
55a16ee4 | 10554 | msgstr "标签名称太长:%.*s..." |
c04f5ac3 | 10555 | |
94550ed3 | 10556 | #: builtin/tag.c:85 |
c04f5ac3 JX |
10557 | #, c-format |
10558 | msgid "tag '%s' not found." | |
55a16ee4 | 10559 | msgstr "未发现标签 '%s'。" |
c04f5ac3 | 10560 | |
94550ed3 | 10561 | #: builtin/tag.c:100 |
c04f5ac3 JX |
10562 | #, c-format |
10563 | msgid "Deleted tag '%s' (was %s)\n" | |
55a16ee4 | 10564 | msgstr "已删除标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 10565 | |
94550ed3 | 10566 | #: builtin/tag.c:112 |
c04f5ac3 JX |
10567 | #, c-format |
10568 | msgid "could not verify the tag '%s'" | |
55a16ee4 | 10569 | msgstr "不能校验该标签 '%s'" |
c04f5ac3 | 10570 | |
94550ed3 | 10571 | #: builtin/tag.c:122 |
a77c07d9 | 10572 | #, c-format |
c04f5ac3 JX |
10573 | msgid "" |
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 |
10578 | msgstr "" |
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 |
10586 | msgid "" |
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 |
10592 | msgstr "" |
10593 | "\n" | |
55a16ee4 | 10594 | "输入一个标签说明:\n" |
6acbf033 | 10595 | " %s\n" |
a77c07d9 | 10596 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
c04f5ac3 | 10597 | |
94550ed3 | 10598 | #: builtin/tag.c:199 |
c04f5ac3 | 10599 | msgid "unable to sign the tag" |
55a16ee4 | 10600 | msgstr "无法签署标签" |
c04f5ac3 | 10601 | |
94550ed3 | 10602 | #: builtin/tag.c:201 |
c04f5ac3 | 10603 | msgid "unable to write tag file" |
55a16ee4 | 10604 | msgstr "无法写标签文件" |
c04f5ac3 | 10605 | |
94550ed3 | 10606 | #: builtin/tag.c:226 |
c04f5ac3 | 10607 | msgid "bad object type." |
90e6ef53 | 10608 | msgstr "坏的对象类型。" |
c04f5ac3 | 10609 | |
94550ed3 | 10610 | #: builtin/tag.c:239 |
c04f5ac3 | 10611 | msgid "tag header too big." |
55a16ee4 | 10612 | msgstr "标签头信息太大。" |
c04f5ac3 | 10613 | |
94550ed3 | 10614 | #: builtin/tag.c:275 |
c04f5ac3 | 10615 | msgid "no tag message?" |
55a16ee4 | 10616 | msgstr "无标签说明?" |
c04f5ac3 | 10617 | |
94550ed3 | 10618 | #: builtin/tag.c:281 |
c04f5ac3 JX |
10619 | #, c-format |
10620 | msgid "The tag message has been left in %s\n" | |
55a16ee4 | 10621 | msgstr "标签说明被保留在 %s\n" |
c04f5ac3 | 10622 | |
94550ed3 | 10623 | #: builtin/tag.c:339 |
ef317cd5 | 10624 | msgid "list tag names" |
55a16ee4 | 10625 | msgstr "列出标签名称" |
ef317cd5 | 10626 | |
94550ed3 | 10627 | #: builtin/tag.c:341 |
ef317cd5 | 10628 | msgid "print <n> lines of each tag message" |
55a16ee4 | 10629 | msgstr "每个标签信息打印 <n> 行" |
ef317cd5 | 10630 | |
94550ed3 | 10631 | #: builtin/tag.c:343 |
ef317cd5 | 10632 | msgid "delete tags" |
55a16ee4 | 10633 | msgstr "删除标签" |
ef317cd5 | 10634 | |
94550ed3 | 10635 | #: builtin/tag.c:344 |
ef317cd5 | 10636 | msgid "verify tags" |
55a16ee4 | 10637 | msgstr "验证标签" |
ef317cd5 | 10638 | |
94550ed3 | 10639 | #: builtin/tag.c:346 |
ef317cd5 | 10640 | msgid "Tag creation options" |
55a16ee4 | 10641 | msgstr "标签创建选项" |
ef317cd5 | 10642 | |
94550ed3 | 10643 | #: builtin/tag.c:348 |
ef317cd5 | 10644 | msgid "annotated tag, needs a message" |
55a16ee4 | 10645 | msgstr "附注标签,需要一个说明" |
ef317cd5 | 10646 | |
94550ed3 | 10647 | #: builtin/tag.c:350 |
ef317cd5 | 10648 | msgid "tag message" |
55a16ee4 | 10649 | msgstr "标签说明" |
ef317cd5 | 10650 | |
94550ed3 | 10651 | #: builtin/tag.c:352 |
ef317cd5 | 10652 | msgid "annotated and GPG-signed tag" |
55a16ee4 | 10653 | msgstr "附注并附加 GPG 签名的标签" |
ef317cd5 | 10654 | |
94550ed3 | 10655 | #: builtin/tag.c:356 |
ef317cd5 | 10656 | msgid "use another key to sign the tag" |
55a16ee4 | 10657 | msgstr "使用另外的私钥签名该标签" |
ef317cd5 | 10658 | |
94550ed3 | 10659 | #: builtin/tag.c:357 |
ef317cd5 | 10660 | msgid "replace the tag if exists" |
55a16ee4 | 10661 | msgstr "如果存在,替换现有的标签" |
ef317cd5 | 10662 | |
94550ed3 | 10663 | #: builtin/tag.c:358 builtin/update-ref.c:368 |
03ea3327 | 10664 | msgid "create a reflog" |
1b7f4a34 JX |
10665 | msgstr "创建引用日志" |
10666 | ||
94550ed3 | 10667 | #: builtin/tag.c:360 |
814ff314 | 10668 | msgid "Tag listing options" |
55a16ee4 | 10669 | msgstr "标签列表选项" |
814ff314 | 10670 | |
94550ed3 | 10671 | #: builtin/tag.c:361 |
ef317cd5 | 10672 | msgid "show tag list in columns" |
55a16ee4 | 10673 | msgstr "以列的方式显示标签列表" |
ef317cd5 | 10674 | |
94550ed3 | 10675 | #: builtin/tag.c:362 builtin/tag.c:363 |
ef317cd5 | 10676 | msgid "print only tags that contain the commit" |
55a16ee4 | 10677 | msgstr "只打印包含提交的标签" |
ef317cd5 | 10678 | |
94550ed3 JX |
10679 | #: builtin/tag.c:364 |
10680 | msgid "print only tags that are merged" | |
10681 | msgstr "只打印已经合并的标签" | |
10682 | ||
10683 | #: builtin/tag.c:365 | |
10684 | msgid "print only tags that are not merged" | |
10685 | msgstr "只打印尚未合并的标签" | |
10686 | ||
10687 | #: builtin/tag.c:370 | |
ef317cd5 | 10688 | msgid "print only tags of the object" |
55a16ee4 | 10689 | msgstr "只打印对象的标签" |
ef317cd5 | 10690 | |
94550ed3 | 10691 | #: builtin/tag.c:399 |
8ada9598 | 10692 | msgid "--column and -n are incompatible" |
81809b99 | 10693 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 10694 | |
94550ed3 | 10695 | #: builtin/tag.c:419 |
c04f5ac3 | 10696 | msgid "-n option is only allowed with -l." |
649900bc | 10697 | msgstr "-n 选项只允许和 -l 同时使用。" |
c04f5ac3 | 10698 | |
94550ed3 | 10699 | #: builtin/tag.c:421 |
c04f5ac3 | 10700 | msgid "--contains option is only allowed with -l." |
649900bc | 10701 | msgstr "--contains 选项只允许和 -l 同时使用。" |
c04f5ac3 | 10702 | |
94550ed3 | 10703 | #: builtin/tag.c:423 |
7ac1c0ad | 10704 | msgid "--points-at option is only allowed with -l." |
649900bc | 10705 | msgstr "--points-at 选项只允许和 -l 同时使用。" |
7ac1c0ad | 10706 | |
94550ed3 JX |
10707 | #: builtin/tag.c:425 |
10708 | msgid "--merged and --no-merged option are only allowed with -l" | |
10709 | msgstr "选项 --merged 和 --no-merged 只能和 -l 共用" | |
10710 | ||
10711 | #: builtin/tag.c:433 | |
c04f5ac3 JX |
10712 | msgid "only one -F or -m option is allowed." |
10713 | msgstr "只允许一个 -F 或 -m 选项。" | |
10714 | ||
94550ed3 | 10715 | #: builtin/tag.c:453 |
c04f5ac3 JX |
10716 | msgid "too many params" |
10717 | msgstr "太多参数" | |
10718 | ||
94550ed3 | 10719 | #: builtin/tag.c:459 |
c04f5ac3 JX |
10720 | #, c-format |
10721 | msgid "'%s' is not a valid tag name." | |
55a16ee4 | 10722 | msgstr "'%s' 不是一个有效的标签名称。" |
c04f5ac3 | 10723 | |
94550ed3 | 10724 | #: builtin/tag.c:464 |
c04f5ac3 JX |
10725 | #, c-format |
10726 | msgid "tag '%s' already exists" | |
55a16ee4 | 10727 | msgstr "标签 '%s' 已存在" |
c04f5ac3 | 10728 | |
94550ed3 | 10729 | #: builtin/tag.c:489 |
c04f5ac3 JX |
10730 | #, c-format |
10731 | msgid "Updated tag '%s' (was %s)\n" | |
55a16ee4 | 10732 | msgstr "已更新标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 10733 | |
1b7f4a34 | 10734 | #: builtin/unpack-objects.c:490 |
6c94aba5 JX |
10735 | msgid "Unpacking objects" |
10736 | msgstr "展开对象中" | |
10737 | ||
7aea43ff JX |
10738 | #: builtin/update-index.c:70 |
10739 | #, c-format | |
10740 | msgid "failed to create directory %s" | |
10741 | msgstr "无法创建目录 %s" | |
10742 | ||
10743 | #: builtin/update-index.c:76 | |
10744 | #, c-format | |
10745 | msgid "failed to stat %s" | |
10746 | msgstr "无法枚举 %s 状态" | |
10747 | ||
10748 | #: builtin/update-index.c:86 | |
10749 | #, c-format | |
10750 | msgid "failed to create file %s" | |
10751 | msgstr "无法创建文件 %s" | |
10752 | ||
10753 | #: builtin/update-index.c:94 | |
10754 | #, c-format | |
10755 | msgid "failed to delete file %s" | |
10756 | msgstr "无法删除文件 %s" | |
10757 | ||
10758 | #: builtin/update-index.c:101 builtin/update-index.c:203 | |
10759 | #, c-format | |
10760 | msgid "failed to delete directory %s" | |
10761 | msgstr "无法删除目录 %s" | |
10762 | ||
10763 | #: builtin/update-index.c:124 | |
10764 | #, c-format | |
10765 | msgid "Testing " | |
10766 | msgstr "正在测试 " | |
10767 | ||
10768 | #: builtin/update-index.c:136 | |
10769 | msgid "directory stat info does not change after adding a new file" | |
10770 | msgstr "添加一个新文件后,目录的状态信息未改变" | |
10771 | ||
10772 | #: builtin/update-index.c:149 | |
10773 | msgid "directory stat info does not change after adding a new directory" | |
10774 | msgstr "添加一个新目录后,目录的状态信息未改变" | |
10775 | ||
10776 | #: builtin/update-index.c:162 | |
10777 | msgid "directory stat info changes after updating a file" | |
10778 | msgstr "更新一个文件后,目录的状态信息被修改" | |
10779 | ||
10780 | #: builtin/update-index.c:173 | |
10781 | msgid "directory stat info changes after adding a file inside subdirectory" | |
10782 | msgstr "在子目录中添加文件后,目录的状态信息被修改" | |
10783 | ||
10784 | #: builtin/update-index.c:184 | |
10785 | msgid "directory stat info does not change after deleting a file" | |
10786 | msgstr "删除一个文件后,目录的状态信息未改变" | |
10787 | ||
10788 | #: builtin/update-index.c:197 | |
10789 | msgid "directory stat info does not change after deleting a directory" | |
10790 | msgstr "删除一个目录后,目录的状态信息未改变" | |
10791 | ||
10792 | #: builtin/update-index.c:204 | |
10793 | msgid " OK" | |
10794 | msgstr " OK" | |
10795 | ||
10796 | #: builtin/update-index.c:564 | |
814ff314 JX |
10797 | msgid "git update-index [<options>] [--] [<file>...]" |
10798 | msgstr "git update-index [<选项>] [--] [<文件>...]" | |
8ada9598 | 10799 | |
7aea43ff | 10800 | #: builtin/update-index.c:918 |
ef317cd5 | 10801 | msgid "continue refresh even when index needs update" |
07432cef | 10802 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 10803 | |
7aea43ff | 10804 | #: builtin/update-index.c:921 |
ef317cd5 | 10805 | msgid "refresh: ignore submodules" |
07432cef | 10806 | msgstr "刷新:忽略子模组" |
8ada9598 | 10807 | |
7aea43ff | 10808 | #: builtin/update-index.c:924 |
ef317cd5 | 10809 | msgid "do not ignore new files" |
07432cef | 10810 | msgstr "不忽略新的文件" |
8ada9598 | 10811 | |
7aea43ff | 10812 | #: builtin/update-index.c:926 |
ef317cd5 | 10813 | msgid "let files replace directories and vice-versa" |
07432cef | 10814 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 10815 | |
7aea43ff | 10816 | #: builtin/update-index.c:928 |
ef317cd5 | 10817 | msgid "notice files missing from worktree" |
07432cef | 10818 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 10819 | |
7aea43ff | 10820 | #: builtin/update-index.c:930 |
ef317cd5 | 10821 | msgid "refresh even if index contains unmerged entries" |
07432cef | 10822 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 10823 | |
7aea43ff | 10824 | #: builtin/update-index.c:933 |
ef317cd5 | 10825 | msgid "refresh stat information" |
07432cef | 10826 | msgstr "刷新统计信息" |
ef317cd5 | 10827 | |
7aea43ff | 10828 | #: builtin/update-index.c:937 |
ef317cd5 | 10829 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 10830 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 10831 | |
7aea43ff | 10832 | #: builtin/update-index.c:941 |
6c94aba5 | 10833 | msgid "<mode>,<object>,<path>" |
d9d56b23 | 10834 | msgstr "<存取模式>,<对象>,<路径>" |
ef317cd5 | 10835 | |
7aea43ff | 10836 | #: builtin/update-index.c:942 |
ef317cd5 | 10837 | msgid "add the specified entry to the index" |
07432cef | 10838 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 10839 | |
7aea43ff | 10840 | #: builtin/update-index.c:946 |
ef317cd5 | 10841 | msgid "(+/-)x" |
07432cef | 10842 | msgstr "(+/-)x" |
ef317cd5 | 10843 | |
7aea43ff | 10844 | #: builtin/update-index.c:947 |
ef317cd5 | 10845 | msgid "override the executable bit of the listed files" |
07432cef | 10846 | msgstr "覆盖列表里文件的可执行位" |
ef317cd5 | 10847 | |
7aea43ff | 10848 | #: builtin/update-index.c:951 |
ef317cd5 | 10849 | msgid "mark files as \"not changing\"" |
07432cef | 10850 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 10851 | |
7aea43ff | 10852 | #: builtin/update-index.c:954 |
ef317cd5 | 10853 | msgid "clear assumed-unchanged bit" |
07432cef | 10854 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 10855 | |
7aea43ff | 10856 | #: builtin/update-index.c:957 |
ef317cd5 | 10857 | msgid "mark files as \"index-only\"" |
07432cef | 10858 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 10859 | |
7aea43ff | 10860 | #: builtin/update-index.c:960 |
ef317cd5 | 10861 | msgid "clear skip-worktree bit" |
07432cef | 10862 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 10863 | |
7aea43ff | 10864 | #: builtin/update-index.c:963 |
ef317cd5 | 10865 | msgid "add to index only; do not add content to object database" |
07432cef | 10866 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 10867 | |
7aea43ff | 10868 | #: builtin/update-index.c:965 |
ef317cd5 | 10869 | msgid "remove named paths even if present in worktree" |
07432cef | 10870 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 10871 | |
7aea43ff | 10872 | #: builtin/update-index.c:967 |
ef317cd5 | 10873 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 10874 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 10875 | |
7aea43ff | 10876 | #: builtin/update-index.c:969 |
ef317cd5 | 10877 | msgid "read list of paths to be updated from standard input" |
07432cef | 10878 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 10879 | |
7aea43ff | 10880 | #: builtin/update-index.c:973 |
ef317cd5 | 10881 | msgid "add entries from standard input to the index" |
07432cef | 10882 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 10883 | |
7aea43ff | 10884 | #: builtin/update-index.c:977 |
ef317cd5 | 10885 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 10886 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 10887 | |
7aea43ff | 10888 | #: builtin/update-index.c:981 |
ef317cd5 | 10889 | msgid "only update entries that differ from HEAD" |
07432cef | 10890 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 10891 | |
7aea43ff | 10892 | #: builtin/update-index.c:985 |
ef317cd5 | 10893 | msgid "ignore files missing from worktree" |
07432cef | 10894 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 10895 | |
7aea43ff | 10896 | #: builtin/update-index.c:988 |
ef317cd5 | 10897 | msgid "report actions to standard output" |
07432cef | 10898 | msgstr "在标准输出显示操作" |
ef317cd5 | 10899 | |
7aea43ff | 10900 | #: builtin/update-index.c:990 |
ef317cd5 | 10901 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 10902 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 10903 | |
7aea43ff | 10904 | #: builtin/update-index.c:994 |
ef317cd5 | 10905 | msgid "write index in this format" |
07432cef | 10906 | msgstr "以这种格式写入索引区" |
ef317cd5 | 10907 | |
7aea43ff | 10908 | #: builtin/update-index.c:996 |
6acbf033 JX |
10909 | msgid "enable or disable split index" |
10910 | msgstr "启用或禁用索引拆分" | |
10911 | ||
7aea43ff JX |
10912 | #: builtin/update-index.c:998 |
10913 | msgid "enable/disable untracked cache" | |
10914 | msgstr "启用/禁用对未跟踪文件的缓存" | |
10915 | ||
10916 | #: builtin/update-index.c:1000 | |
10917 | msgid "enable untracked cache without testing the filesystem" | |
10918 | msgstr "无需检测文件系统,启用对未跟踪文件的缓存" | |
10919 | ||
90314792 | 10920 | #: builtin/update-ref.c:9 |
814ff314 JX |
10921 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
10922 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" | |
ef317cd5 | 10923 | |
90314792 | 10924 | #: builtin/update-ref.c:10 |
814ff314 JX |
10925 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
10926 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" | |
90314792 JX |
10927 | |
10928 | #: builtin/update-ref.c:11 | |
814ff314 JX |
10929 | msgid "git update-ref [<options>] --stdin [-z]" |
10930 | msgstr "git update-ref [<选项>] --stdin [-z]" | |
ef317cd5 | 10931 | |
1b7f4a34 | 10932 | #: builtin/update-ref.c:363 |
ef317cd5 | 10933 | msgid "delete the reference" |
07432cef | 10934 | msgstr "删除引用" |
ef317cd5 | 10935 | |
1b7f4a34 | 10936 | #: builtin/update-ref.c:365 |
ef317cd5 | 10937 | msgid "update <refname> not the one it points to" |
07432cef | 10938 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 10939 | |
1b7f4a34 | 10940 | #: builtin/update-ref.c:366 |
90314792 JX |
10941 | msgid "stdin has NUL-terminated arguments" |
10942 | msgstr "标准输入有以 NUL 字符终止的参数" | |
10943 | ||
1b7f4a34 | 10944 | #: builtin/update-ref.c:367 |
90314792 JX |
10945 | msgid "read updates from stdin" |
10946 | msgstr "从标准输入读取更新" | |
10947 | ||
ef317cd5 JX |
10948 | #: builtin/update-server-info.c:6 |
10949 | msgid "git update-server-info [--force]" | |
07432cef | 10950 | msgstr "git update-server-info [--force]" |
ef317cd5 JX |
10951 | |
10952 | #: builtin/update-server-info.c:14 | |
10953 | msgid "update the info files from scratch" | |
07432cef | 10954 | msgstr "从头开始更新文件信息" |
ef317cd5 | 10955 | |
6acbf033 | 10956 | #: builtin/verify-commit.c:17 |
814ff314 JX |
10957 | msgid "git verify-commit [-v | --verbose] <commit>..." |
10958 | msgstr "git verify-commit [-v | --verbose] <提交>..." | |
6acbf033 | 10959 | |
1b7f4a34 | 10960 | #: builtin/verify-commit.c:72 |
6acbf033 JX |
10961 | msgid "print commit contents" |
10962 | msgstr "打印提交内容" | |
10963 | ||
1b7f4a34 JX |
10964 | #: builtin/verify-commit.c:73 builtin/verify-tag.c:84 |
10965 | msgid "print raw gpg status output" | |
10966 | msgstr "打印原始 gpg 状态输出" | |
10967 | ||
220c313c | 10968 | #: builtin/verify-pack.c:54 |
814ff314 JX |
10969 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
10970 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." | |
ef317cd5 | 10971 | |
220c313c | 10972 | #: builtin/verify-pack.c:64 |
ef317cd5 JX |
10973 | msgid "verbose" |
10974 | msgstr "冗长输出" | |
10975 | ||
220c313c | 10976 | #: builtin/verify-pack.c:66 |
ef317cd5 | 10977 | msgid "show statistics only" |
07432cef | 10978 | msgstr "只显示统计" |
ef317cd5 JX |
10979 | |
10980 | #: builtin/verify-tag.c:17 | |
814ff314 JX |
10981 | msgid "git verify-tag [-v | --verbose] <tag>..." |
10982 | msgstr "git verify-tag [-v | --verbose] <标签>..." | |
ef317cd5 | 10983 | |
1b7f4a34 | 10984 | #: builtin/verify-tag.c:83 |
ef317cd5 | 10985 | msgid "print tag contents" |
55a16ee4 | 10986 | msgstr "打印标签内容" |
ef317cd5 | 10987 | |
94550ed3 JX |
10988 | #: builtin/worktree.c:15 |
10989 | msgid "git worktree add [<options>] <path> [<branch>]" | |
10990 | msgstr "git worktree add [<选项>] <路径> [<分支>]" | |
5bb01d4f | 10991 | |
94550ed3 | 10992 | #: builtin/worktree.c:16 |
5bb01d4f JX |
10993 | msgid "git worktree prune [<options>]" |
10994 | msgstr "git worktree prune [<选项>]" | |
10995 | ||
94550ed3 JX |
10996 | #: builtin/worktree.c:17 |
10997 | msgid "git worktree list [<options>]" | |
10998 | msgstr "git worktree list [<选项>]" | |
10999 | ||
11000 | #: builtin/worktree.c:39 | |
5bb01d4f JX |
11001 | #, c-format |
11002 | msgid "Removing worktrees/%s: not a valid directory" | |
11003 | msgstr "删除工作区/%s:不是一个有效的目录" | |
11004 | ||
94550ed3 | 11005 | #: builtin/worktree.c:45 |
5bb01d4f JX |
11006 | #, c-format |
11007 | msgid "Removing worktrees/%s: gitdir file does not exist" | |
11008 | msgstr "删除 worktrees/%s:gitdir 文件不存在" | |
11009 | ||
94550ed3 | 11010 | #: builtin/worktree.c:50 |
5bb01d4f JX |
11011 | #, c-format |
11012 | msgid "Removing worktrees/%s: unable to read gitdir file (%s)" | |
11013 | msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)" | |
11014 | ||
94550ed3 | 11015 | #: builtin/worktree.c:61 |
5bb01d4f JX |
11016 | #, c-format |
11017 | msgid "Removing worktrees/%s: invalid gitdir file" | |
11018 | msgstr "删除 worktrees/%s:无效的 gitdir 文件" | |
11019 | ||
94550ed3 | 11020 | #: builtin/worktree.c:77 |
5bb01d4f JX |
11021 | #, c-format |
11022 | msgid "Removing worktrees/%s: gitdir file points to non-existent location" | |
11023 | msgstr "删除 worktrees/%s:gitdir 文件的指向不存在" | |
11024 | ||
94550ed3 | 11025 | #: builtin/worktree.c:112 |
5bb01d4f JX |
11026 | #, c-format |
11027 | msgid "failed to remove: %s" | |
11028 | msgstr "无法删除:%s" | |
11029 | ||
94550ed3 | 11030 | #: builtin/worktree.c:201 |
5bb01d4f JX |
11031 | #, c-format |
11032 | msgid "'%s' already exists" | |
11033 | msgstr "'%s' 已经存在" | |
11034 | ||
94550ed3 | 11035 | #: builtin/worktree.c:235 |
5bb01d4f JX |
11036 | #, c-format |
11037 | msgid "could not create directory of '%s'" | |
11038 | msgstr "不能创建目录 '%s'" | |
11039 | ||
94550ed3 | 11040 | #: builtin/worktree.c:271 |
5bb01d4f | 11041 | #, c-format |
1b7f4a34 JX |
11042 | msgid "Preparing %s (identifier %s)" |
11043 | msgstr "准备 %s (标识符 %s)" | |
5bb01d4f | 11044 | |
94550ed3 | 11045 | #: builtin/worktree.c:319 |
5bb01d4f JX |
11046 | msgid "checkout <branch> even if already checked out in other worktree" |
11047 | msgstr "检出分支 <branch> 即使已经被检出到其它工作区" | |
11048 | ||
94550ed3 | 11049 | #: builtin/worktree.c:321 |
5bb01d4f JX |
11050 | msgid "create a new branch" |
11051 | msgstr "创建一个新分支" | |
11052 | ||
94550ed3 | 11053 | #: builtin/worktree.c:323 |
5bb01d4f JX |
11054 | msgid "create or reset a branch" |
11055 | msgstr "创建或重置一个分支" | |
11056 | ||
94550ed3 | 11057 | #: builtin/worktree.c:324 |
5bb01d4f JX |
11058 | msgid "detach HEAD at named commit" |
11059 | msgstr "HEAD 从指定的提交分离" | |
11060 | ||
94550ed3 | 11061 | #: builtin/worktree.c:331 |
1b7f4a34 JX |
11062 | msgid "-b, -B, and --detach are mutually exclusive" |
11063 | msgstr "-b、-B 和 --detach 是互斥的" | |
5bb01d4f | 11064 | |
ef317cd5 JX |
11065 | #: builtin/write-tree.c:13 |
11066 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" | |
07432cef | 11067 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 JX |
11068 | |
11069 | #: builtin/write-tree.c:26 | |
11070 | msgid "<prefix>/" | |
07432cef | 11071 | msgstr "<前缀>/" |
ef317cd5 JX |
11072 | |
11073 | #: builtin/write-tree.c:27 | |
11074 | msgid "write tree object for a subdirectory <prefix>" | |
07432cef | 11075 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 JX |
11076 | |
11077 | #: builtin/write-tree.c:30 | |
11078 | msgid "only useful for debugging" | |
07432cef | 11079 | msgstr "只对调试有用" |
ef317cd5 | 11080 | |
1b7f4a34 | 11081 | #: credential-cache--daemon.c:255 |
220c313c JX |
11082 | msgid "print debugging messages to stderr" |
11083 | msgstr "调试信息输出到标准错误" | |
11084 | ||
d9d56b23 | 11085 | #: git.c:14 |
4dcdc3d8 | 11086 | msgid "" |
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." | |
11090 | msgstr "" | |
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 |
11096 | msgid "start a working area (see also: git help tutorial)" |
11097 | msgstr "开始一个工作区(参见:git help tutorial)" | |
11098 | ||
1b7f4a34 | 11099 | #: common-cmds.h:10 |
7aea43ff JX |
11100 | msgid "work on the current change (see also: git help everyday)" |
11101 | msgstr "在当前变更上工作(参见:git help everyday)" | |
11102 | ||
1b7f4a34 | 11103 | #: common-cmds.h:11 |
7aea43ff JX |
11104 | msgid "examine the history and state (see also: git help revisions)" |
11105 | msgstr "检查历史和状态(参见:git help revisions)" | |
11106 | ||
1b7f4a34 | 11107 | #: common-cmds.h:12 |
7aea43ff JX |
11108 | msgid "grow, mark and tweak your common history" |
11109 | msgstr "扩展、标记和调校您的历史记录" | |
11110 | ||
1b7f4a34 | 11111 | #: common-cmds.h:13 |
7aea43ff JX |
11112 | msgid "collaborate (see also: git help workflows)" |
11113 | msgstr "协同(参见:git help workflows)" | |
11114 | ||
1b7f4a34 | 11115 | #: common-cmds.h:17 |
8ada9598 | 11116 | msgid "Add file contents to the index" |
81809b99 | 11117 | msgstr "添加文件内容至索引" |
8ada9598 | 11118 | |
1b7f4a34 JX |
11119 | #: common-cmds.h:18 |
11120 | msgid "Use binary search to find the commit that introduced a bug" | |
11121 | msgstr "通过二分查找定位引入 bug 的提交" | |
8ada9598 | 11122 | |
1b7f4a34 | 11123 | #: common-cmds.h:19 |
8ada9598 | 11124 | msgid "List, create, or delete branches" |
81809b99 | 11125 | msgstr "列出、创建或删除分支" |
8ada9598 | 11126 | |
1b7f4a34 | 11127 | #: common-cmds.h:20 |
5bb01d4f JX |
11128 | msgid "Switch branches or restore working tree files" |
11129 | msgstr "切换分支或恢复工作区文件" | |
8ada9598 | 11130 | |
1b7f4a34 | 11131 | #: common-cmds.h:21 |
8ada9598 | 11132 | msgid "Clone a repository into a new directory" |
160fb2b2 | 11133 | msgstr "克隆一个仓库到一个新目录" |
8ada9598 | 11134 | |
1b7f4a34 | 11135 | #: common-cmds.h:22 |
8ada9598 | 11136 | msgid "Record changes to the repository" |
160fb2b2 | 11137 | msgstr "记录变更到仓库" |
8ada9598 | 11138 | |
1b7f4a34 | 11139 | #: common-cmds.h:23 |
8ada9598 | 11140 | msgid "Show changes between commits, commit and working tree, etc" |
81809b99 | 11141 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 | 11142 | |
1b7f4a34 | 11143 | #: common-cmds.h:24 |
8ada9598 | 11144 | msgid "Download objects and refs from another repository" |
160fb2b2 | 11145 | msgstr "从另外一个仓库下载对象和引用" |
8ada9598 | 11146 | |
1b7f4a34 | 11147 | #: common-cmds.h:25 |
8ada9598 | 11148 | msgid "Print lines matching a pattern" |
81809b99 | 11149 | msgstr "输出和模式匹配的行" |
8ada9598 | 11150 | |
1b7f4a34 | 11151 | #: common-cmds.h:26 |
a77c07d9 | 11152 | msgid "Create an empty Git repository or reinitialize an existing one" |
160fb2b2 | 11153 | msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" |
8ada9598 | 11154 | |
1b7f4a34 | 11155 | #: common-cmds.h:27 |
8ada9598 | 11156 | msgid "Show commit logs" |
81809b99 | 11157 | msgstr "显示提交日志" |
8ada9598 | 11158 | |
1b7f4a34 | 11159 | #: common-cmds.h:28 |
8ada9598 | 11160 | msgid "Join two or more development histories together" |
81809b99 | 11161 | msgstr "合并两个或更多开发历史" |
8ada9598 | 11162 | |
1b7f4a34 | 11163 | #: common-cmds.h:29 |
8ada9598 | 11164 | msgid "Move or rename a file, a directory, or a symlink" |
81809b99 | 11165 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 | 11166 | |
1b7f4a34 | 11167 | #: common-cmds.h:30 |
2e8451e8 | 11168 | msgid "Fetch from and integrate with another repository or a local branch" |
160fb2b2 | 11169 | msgstr "获取并整合另外的仓库或一个本地分支" |
8ada9598 | 11170 | |
1b7f4a34 | 11171 | #: common-cmds.h:31 |
8ada9598 | 11172 | msgid "Update remote refs along with associated objects" |
81809b99 | 11173 | msgstr "更新远程引用和相关的对象" |
8ada9598 | 11174 | |
1b7f4a34 | 11175 | #: common-cmds.h:32 |
8ada9598 | 11176 | msgid "Forward-port local commits to the updated upstream head" |
81809b99 | 11177 | msgstr "本地提交转移至更新后的上游分支中" |
8ada9598 | 11178 | |
1b7f4a34 | 11179 | #: common-cmds.h:33 |
8ada9598 | 11180 | msgid "Reset current HEAD to the specified state" |
4375c10e | 11181 | msgstr "重置当前 HEAD 到指定状态" |
8ada9598 | 11182 | |
1b7f4a34 | 11183 | #: common-cmds.h:34 |
8ada9598 | 11184 | msgid "Remove files from the working tree and from the index" |
81809b99 | 11185 | msgstr "从工作区和索引中删除文件" |
8ada9598 | 11186 | |
1b7f4a34 | 11187 | #: common-cmds.h:35 |
8ada9598 | 11188 | msgid "Show various types of objects" |
81809b99 | 11189 | msgstr "显示各种类型的对象" |
8ada9598 | 11190 | |
1b7f4a34 | 11191 | #: common-cmds.h:36 |
8ada9598 | 11192 | msgid "Show the working tree status" |
81809b99 | 11193 | msgstr "显示工作区状态" |
8ada9598 | 11194 | |
1b7f4a34 | 11195 | #: common-cmds.h:37 |
8ada9598 | 11196 | msgid "Create, list, delete or verify a tag object signed with GPG" |
4375c10e | 11197 | msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" |
8ada9598 | 11198 | |
1b7f4a34 | 11199 | #: parse-options.h:145 |
220c313c JX |
11200 | msgid "expiry-date" |
11201 | msgstr "到期时间" | |
11202 | ||
1b7f4a34 | 11203 | #: parse-options.h:160 |
220c313c JX |
11204 | msgid "no-op (backward compatibility)" |
11205 | msgstr "空操作(向后兼容)" | |
11206 | ||
94550ed3 | 11207 | #: parse-options.h:237 |
220c313c JX |
11208 | msgid "be more verbose" |
11209 | msgstr "更加详细" | |
11210 | ||
94550ed3 | 11211 | #: parse-options.h:239 |
220c313c JX |
11212 | msgid "be more quiet" |
11213 | msgstr "更加安静" | |
11214 | ||
94550ed3 | 11215 | #: parse-options.h:245 |
220c313c JX |
11216 | msgid "use <n> digits to display SHA-1s" |
11217 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
11218 | ||
94550ed3 | 11219 | #: rerere.h:38 |
220c313c JX |
11220 | msgid "update the index with reused conflict resolution if possible" |
11221 | msgstr "如果可能,重用冲突解决更新索引" | |
11222 | ||
94550ed3 | 11223 | #: git-bisect.sh:55 |
b694fbb1 JX |
11224 | msgid "You need to start by \"git bisect start\"" |
11225 | msgstr "您需要执行 \"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 |
11232 | msgid "Do you want me to do it for you [Y/n]? " |
11233 | msgstr "您想让我为您这样做么[Y/n]? " | |
11234 | ||
94550ed3 | 11235 | #: git-bisect.sh:122 |
c04f5ac3 JX |
11236 | #, sh-format |
11237 | msgid "unrecognised option: '$arg'" | |
81809b99 | 11238 | msgstr "未能识别的选项:'$arg'" |
c04f5ac3 | 11239 | |
94550ed3 | 11240 | #: git-bisect.sh:126 |
c04f5ac3 JX |
11241 | #, sh-format |
11242 | msgid "'$arg' does not appear to be a valid revision" | |
11243 | msgstr "'$arg' 看起来不像是一个有效的版本" | |
11244 | ||
94550ed3 | 11245 | #: git-bisect.sh:155 |
c04f5ac3 JX |
11246 | msgid "Bad HEAD - I need a HEAD" |
11247 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
11248 | ||
94550ed3 | 11249 | #: git-bisect.sh:168 |
c04f5ac3 JX |
11250 | #, sh-format |
11251 | msgid "" | |
814ff314 | 11252 | "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." |
d9d56b23 | 11253 | msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。" |
c04f5ac3 | 11254 | |
94550ed3 | 11255 | #: git-bisect.sh:178 |
cfff71a9 JX |
11256 | msgid "won't bisect on cg-seek'ed tree" |
11257 | msgstr "不会在做了 cg-seek 的树上做二分查找" | |
c04f5ac3 | 11258 | |
94550ed3 | 11259 | #: git-bisect.sh:182 |
c04f5ac3 | 11260 | msgid "Bad HEAD - strange symbolic ref" |
90e6ef53 | 11261 | msgstr "坏的 HEAD - 奇怪的符号引用" |
c04f5ac3 | 11262 | |
94550ed3 | 11263 | #: git-bisect.sh:234 |
c04f5ac3 JX |
11264 | #, sh-format |
11265 | msgid "Bad bisect_write argument: $state" | |
90e6ef53 | 11266 | msgstr "坏的 bisect_write 参数:$state" |
c04f5ac3 | 11267 | |
94550ed3 | 11268 | #: git-bisect.sh:263 |
c04f5ac3 JX |
11269 | #, sh-format |
11270 | msgid "Bad rev input: $arg" | |
90e6ef53 | 11271 | msgstr "输入坏的版本:$arg" |
c04f5ac3 | 11272 | |
94550ed3 | 11273 | #: git-bisect.sh:278 |
c04f5ac3 JX |
11274 | msgid "Please call 'bisect_state' with at least one argument." |
11275 | msgstr "请在调用 'bisect_state' 时跟至少一个参数。" | |
11276 | ||
94550ed3 | 11277 | #: git-bisect.sh:290 |
c04f5ac3 JX |
11278 | #, sh-format |
11279 | msgid "Bad rev input: $rev" | |
11280 | msgstr "输入坏的版本:$rev" | |
11281 | ||
94550ed3 | 11282 | #: git-bisect.sh:299 |
1b7f4a34 JX |
11283 | #, sh-format |
11284 | msgid "'git bisect $TERM_BAD' can take only one argument." | |
11285 | msgstr "'git bisect $TERM_BAD' 只能带一个参数。" | |
11286 | ||
94550ed3 | 11287 | #: git-bisect.sh:322 |
1b7f4a34 JX |
11288 | #, sh-format |
11289 | msgid "Warning: bisecting only with a $TERM_BAD commit." | |
11290 | msgstr "警告:在仅有一个坏($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 |
11297 | msgid "Are you sure [Y/n]? " |
11298 | msgstr "您确认么[Y/n]? " | |
11299 | ||
94550ed3 | 11300 | #: git-bisect.sh:340 |
1b7f4a34 | 11301 | #, sh-format |
b694fbb1 | 11302 | msgid "" |
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 |
11305 | msgstr "" |
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 |
11311 | msgid "" |
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 |
11315 | msgstr "" |
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 |
11321 | msgid "We are not bisecting." |
11322 | msgstr "我们没有在二分查找。" | |
11323 | ||
94550ed3 | 11324 | #: git-bisect.sh:421 |
c04f5ac3 JX |
11325 | #, sh-format |
11326 | msgid "'$invalid' is not a valid commit" | |
11327 | msgstr "'$invalid' 不是一个有效的提交" | |
11328 | ||
94550ed3 | 11329 | #: git-bisect.sh:430 |
c04f5ac3 JX |
11330 | #, sh-format |
11331 | msgid "" | |
11332 | "Could not check out original HEAD '$branch'.\n" | |
11333 | "Try 'git bisect reset <commit>'." | |
11334 | msgstr "" | |
11335 | "不能检出原始 HEAD '$branch'。\n" | |
07432cef | 11336 | "尝试 'git bisect reset <提交>'。" |
c04f5ac3 | 11337 | |
94550ed3 | 11338 | #: git-bisect.sh:458 |
c04f5ac3 JX |
11339 | msgid "No logfile given" |
11340 | msgstr "未提供日志文件" | |
11341 | ||
94550ed3 | 11342 | #: git-bisect.sh:459 |
c04f5ac3 JX |
11343 | #, sh-format |
11344 | msgid "cannot read $file for replaying" | |
11345 | msgstr "不能读取 $file 来重放" | |
11346 | ||
94550ed3 | 11347 | #: git-bisect.sh:480 |
c04f5ac3 JX |
11348 | msgid "?? what are you talking about?" |
11349 | msgstr "?? 您在说什么?" | |
11350 | ||
94550ed3 | 11351 | #: git-bisect.sh:492 |
b694fbb1 JX |
11352 | #, sh-format |
11353 | msgid "running $command" | |
11354 | msgstr "运行 $command" | |
11355 | ||
94550ed3 | 11356 | #: git-bisect.sh:499 |
b694fbb1 JX |
11357 | #, sh-format |
11358 | msgid "" | |
11359 | "bisect run failed:\n" | |
11360 | "exit code $res from '$command' is < 0 or >= 128" | |
11361 | msgstr "" | |
11362 | "二分查找运行失败:\n" | |
07432cef | 11363 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 11364 | |
94550ed3 | 11365 | #: git-bisect.sh:525 |
b694fbb1 JX |
11366 | msgid "bisect run cannot continue any more" |
11367 | msgstr "二分查找不能继续运行" | |
11368 | ||
94550ed3 | 11369 | #: git-bisect.sh:531 |
b694fbb1 JX |
11370 | #, sh-format |
11371 | msgid "" | |
11372 | "bisect run failed:\n" | |
11373 | "'bisect_state $state' exited with error code $res" | |
11374 | msgstr "" | |
11375 | "二分查找运行失败:\n" | |
11376 | "'bisect_state $state' 退出码为 $res" | |
11377 | ||
94550ed3 | 11378 | #: git-bisect.sh:538 |
b694fbb1 JX |
11379 | msgid "bisect run success" |
11380 | msgstr "二分查找运行成功" | |
c04f5ac3 | 11381 | |
94550ed3 JX |
11382 | #: git-bisect.sh:565 |
11383 | msgid "please use two different terms" | |
11384 | msgstr "请使用两个不同的术语" | |
11385 | ||
11386 | #: git-bisect.sh:575 | |
11387 | #, sh-format | |
11388 | msgid "'$term' is not a valid term" | |
11389 | msgstr "'$term' 不是一个有效的名称" | |
11390 | ||
11391 | #: git-bisect.sh:578 | |
11392 | #, sh-format | |
11393 | msgid "can't use the builtin command '$term' as a term" | |
11394 | msgstr "不能使用内置命令 '$term' 作为术语" | |
11395 | ||
11396 | #: git-bisect.sh:587 git-bisect.sh:593 | |
11397 | #, sh-format | |
11398 | msgid "can't change the meaning of term '$term'" | |
11399 | msgstr "不能修改术语 '$term' 的含义" | |
11400 | ||
11401 | #: git-bisect.sh:606 | |
b694fbb1 | 11402 | #, sh-format |
1b7f4a34 JX |
11403 | msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." |
11404 | msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。" | |
c04f5ac3 | 11405 | |
94550ed3 JX |
11406 | #: git-bisect.sh:636 |
11407 | msgid "no terms defined" | |
11408 | msgstr "未定义术语" | |
11409 | ||
11410 | #: git-bisect.sh:653 | |
11411 | #, sh-format | |
11412 | msgid "" | |
11413 | "invalid argument $arg for 'git bisect terms'.\n" | |
11414 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." | |
11415 | msgstr "" | |
11416 | "参数 $arg 对命令 'git bisect terms' 无效。\n" | |
11417 | "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。" | |
11418 | ||
6c94aba5 | 11419 | #: git-rebase.sh:57 |
649900bc JX |
11420 | msgid "" |
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 | "\"." | |
11425 | msgstr "" | |
11426 | "当您解决了此问题后,执行 \"git rebase --continue\"。\n" | |
11427 | "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n" | |
11428 | "要恢复原分支并停止变基,执行 \"git rebase --abort\"。" | |
11429 | ||
6acbf033 | 11430 | #: git-rebase.sh:165 |
2e8451e8 JX |
11431 | msgid "Applied autostash." |
11432 | msgstr "成功应用 autostash。" | |
11433 | ||
6acbf033 | 11434 | #: git-rebase.sh:168 |
2e8451e8 JX |
11435 | #, sh-format |
11436 | msgid "Cannot store $stash_sha1" | |
11437 | msgstr "无法保存 $stash_sha1" | |
11438 | ||
6acbf033 | 11439 | #: git-rebase.sh:169 |
2e8451e8 JX |
11440 | msgid "" |
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 |
11444 | msgstr "" |
11445 | "应用 autostash 导致冲突。\n" | |
11446 | "您的修改安全地保存在 stash 中。\n" | |
11447 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" | |
11448 | ||
6acbf033 | 11449 | #: git-rebase.sh:208 |
649900bc | 11450 | msgid "The pre-rebase hook refused to rebase." |
98b2761d | 11451 | msgstr "钩子 pre-rebase 拒绝变基操作。" |
649900bc | 11452 | |
6acbf033 | 11453 | #: git-rebase.sh:213 |
649900bc JX |
11454 | msgid "It looks like git-am is in progress. Cannot rebase." |
11455 | msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" | |
11456 | ||
94550ed3 | 11457 | #: git-rebase.sh:354 |
649900bc JX |
11458 | msgid "The --exec option must be used with the --interactive option" |
11459 | msgstr "选项 --exec 必须和选项 --interactive 同时使用" | |
11460 | ||
94550ed3 | 11461 | #: git-rebase.sh:359 |
649900bc JX |
11462 | msgid "No rebase in progress?" |
11463 | msgstr "没有正在进行的变基?" | |
11464 | ||
94550ed3 | 11465 | #: git-rebase.sh:370 |
07432cef WS |
11466 | msgid "The --edit-todo action can only be used during interactive rebase." |
11467 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
11468 | ||
94550ed3 | 11469 | #: git-rebase.sh:377 |
649900bc JX |
11470 | msgid "Cannot read HEAD" |
11471 | msgstr "不能读取 HEAD" | |
11472 | ||
94550ed3 | 11473 | #: git-rebase.sh:380 |
649900bc JX |
11474 | msgid "" |
11475 | "You must edit all merge conflicts and then\n" | |
11476 | "mark them as resolved using git add" | |
11477 | msgstr "" | |
11478 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
11479 | "命令将它们标记为已解决" | |
11480 | ||
94550ed3 | 11481 | #: git-rebase.sh:398 |
649900bc JX |
11482 | #, sh-format |
11483 | msgid "Could not move back to $head_name" | |
11484 | msgstr "无法移回 $head_name" | |
11485 | ||
94550ed3 | 11486 | #: git-rebase.sh:417 |
649900bc JX |
11487 | #, sh-format |
11488 | msgid "" | |
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." | |
11497 | msgstr "" | |
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 |
11507 | msgid "invalid upstream $upstream_name" | |
11508 | msgstr "无效的上游 $upstream_name" | |
11509 | ||
94550ed3 | 11510 | #: git-rebase.sh:492 |
649900bc JX |
11511 | #, sh-format |
11512 | msgid "$onto_name: there are more than one merge bases" | |
11513 | msgstr "$onto_name: 有一个以上的合并基准" | |
11514 | ||
94550ed3 | 11515 | #: git-rebase.sh:495 git-rebase.sh:499 |
649900bc JX |
11516 | #, sh-format |
11517 | msgid "$onto_name: there is no merge base" | |
11518 | msgstr "$onto_name: 没有合并基准" | |
11519 | ||
94550ed3 | 11520 | #: git-rebase.sh:504 |
649900bc JX |
11521 | #, sh-format |
11522 | msgid "Does not point to a valid commit: $onto_name" | |
11523 | msgstr "没有指向一个有效的提交:$onto_name" | |
11524 | ||
94550ed3 | 11525 | #: git-rebase.sh:527 |
649900bc JX |
11526 | #, sh-format |
11527 | msgid "fatal: no such branch: $branch_name" | |
11528 | msgstr "严重错误:无此分支:$branch_name" | |
11529 | ||
94550ed3 | 11530 | #: git-rebase.sh:560 |
2e8451e8 JX |
11531 | msgid "Cannot autostash" |
11532 | msgstr "无法 autostash" | |
11533 | ||
94550ed3 | 11534 | #: git-rebase.sh:565 |
2e8451e8 JX |
11535 | #, sh-format |
11536 | msgid "Created autostash: $stash_abbrev" | |
11537 | msgstr "创建了 autostash: $stash_abbrev" | |
11538 | ||
94550ed3 | 11539 | #: git-rebase.sh:569 |
649900bc JX |
11540 | msgid "Please commit or stash them." |
11541 | msgstr "请提交或为它们保存进度。" | |
11542 | ||
94550ed3 | 11543 | #: git-rebase.sh:589 |
649900bc JX |
11544 | #, sh-format |
11545 | msgid "Current branch $branch_name is up to date." | |
11546 | msgstr "当前分支 $branch_name 是最新的。" | |
11547 | ||
94550ed3 | 11548 | #: git-rebase.sh:593 |
649900bc JX |
11549 | #, sh-format |
11550 | msgid "Current branch $branch_name is up to date, rebase forced." | |
11551 | msgstr "当前分支 $branch_name 是最新的,强制变基。" | |
11552 | ||
94550ed3 | 11553 | #: git-rebase.sh:604 |
649900bc JX |
11554 | #, sh-format |
11555 | msgid "Changes from $mb to $onto:" | |
11556 | msgstr "变更从 $mb 到 $onto:" | |
11557 | ||
94550ed3 | 11558 | #: git-rebase.sh:613 |
649900bc | 11559 | msgid "First, rewinding head to replay your work on top of it..." |
160fb2b2 | 11560 | msgstr "首先,回退分支以便在上面重放您的工作..." |
649900bc | 11561 | |
94550ed3 | 11562 | #: git-rebase.sh:623 |
649900bc JX |
11563 | #, sh-format |
11564 | msgid "Fast-forwarded $branch_name to $onto_name." | |
11565 | msgstr "快进 $branch_name 至 $onto_name。" | |
11566 | ||
c04f5ac3 JX |
11567 | #: git-stash.sh:51 |
11568 | msgid "git stash clear with parameters is unimplemented" | |
11569 | msgstr "git stash clear 不支持参数" | |
11570 | ||
11571 | #: git-stash.sh:74 | |
11572 | msgid "You do not have the initial commit yet" | |
11573 | msgstr "您尚未建立初始提交" | |
11574 | ||
11575 | #: git-stash.sh:89 | |
11576 | msgid "Cannot save the current index state" | |
90e6ef53 | 11577 | msgstr "无法保存当前索引状态" |
c04f5ac3 | 11578 | |
6acbf033 | 11579 | #: git-stash.sh:124 git-stash.sh:137 |
c04f5ac3 JX |
11580 | msgid "Cannot save the current worktree state" |
11581 | msgstr "无法保存当前工作区状态" | |
11582 | ||
6acbf033 | 11583 | #: git-stash.sh:141 |
c04f5ac3 | 11584 | msgid "No changes selected" |
90e6ef53 | 11585 | msgstr "没有选择变更" |
c04f5ac3 | 11586 | |
6acbf033 | 11587 | #: git-stash.sh:144 |
c04f5ac3 | 11588 | msgid "Cannot remove temporary index (can't happen)" |
90e6ef53 | 11589 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 | 11590 | |
6acbf033 | 11591 | #: git-stash.sh:157 |
c04f5ac3 JX |
11592 | msgid "Cannot record working tree state" |
11593 | msgstr "不能记录工作区状态" | |
11594 | ||
1b7f4a34 | 11595 | #: git-stash.sh:189 |
2e8451e8 JX |
11596 | #, sh-format |
11597 | msgid "Cannot update $ref_stash with $w_commit" | |
11598 | msgstr "无法用 $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 |
11612 | msgid "" | |
11613 | "error: unknown option for 'stash save': $option\n" | |
11614 | " To provide a message, use git stash save -- '$option'" | |
11615 | msgstr "" | |
11616 | "错误:'stash save' 的未知选项:$option\n" | |
11617 | " 要提供一个描述信息,使用 git stash save -- '$option'" | |
11618 | ||
1b7f4a34 | 11619 | #: git-stash.sh:260 |
c04f5ac3 JX |
11620 | msgid "No local changes to save" |
11621 | msgstr "没有要保存的本地修改" | |
11622 | ||
1b7f4a34 | 11623 | #: git-stash.sh:264 |
c04f5ac3 | 11624 | msgid "Cannot initialize stash" |
90e6ef53 | 11625 | msgstr "无法初始化 stash" |
c04f5ac3 | 11626 | |
1b7f4a34 | 11627 | #: git-stash.sh:268 |
c04f5ac3 JX |
11628 | msgid "Cannot save the current status" |
11629 | msgstr "无法保存当前状态" | |
11630 | ||
1b7f4a34 | 11631 | #: git-stash.sh:286 |
c04f5ac3 JX |
11632 | msgid "Cannot remove worktree changes" |
11633 | msgstr "无法删除工作区变更" | |
11634 | ||
94550ed3 | 11635 | #: git-stash.sh:405 |
7aea43ff JX |
11636 | #, sh-format |
11637 | msgid "unknown option: $opt" | |
11638 | msgstr "未知选项: $opt" | |
11639 | ||
94550ed3 | 11640 | #: git-stash.sh:415 |
c04f5ac3 | 11641 | msgid "No stash found." |
90e6ef53 | 11642 | msgstr "未发现 stash。" |
c04f5ac3 | 11643 | |
94550ed3 | 11644 | #: git-stash.sh:422 |
c04f5ac3 JX |
11645 | #, sh-format |
11646 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 11647 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 | 11648 | |
94550ed3 | 11649 | #: git-stash.sh:428 |
c04f5ac3 | 11650 | #, sh-format |
220c313c JX |
11651 | msgid "$reference is not a valid reference" |
11652 | msgstr "$reference 不是一个有效的引用" | |
c04f5ac3 | 11653 | |
94550ed3 | 11654 | #: git-stash.sh:456 |
c04f5ac3 JX |
11655 | #, sh-format |
11656 | msgid "'$args' is not a stash-like commit" | |
90e6ef53 | 11657 | msgstr "'$args' 不是 stash 样提交" |
c04f5ac3 | 11658 | |
94550ed3 | 11659 | #: git-stash.sh:467 |
c04f5ac3 JX |
11660 | #, sh-format |
11661 | msgid "'$args' is not a stash reference" | |
90e6ef53 | 11662 | msgstr "'$args' 不是一个 stash 引用" |
c04f5ac3 | 11663 | |
94550ed3 | 11664 | #: git-stash.sh:475 |
c04f5ac3 | 11665 | msgid "unable to refresh index" |
90e6ef53 | 11666 | msgstr "无法刷新索引" |
c04f5ac3 | 11667 | |
94550ed3 | 11668 | #: git-stash.sh:479 |
c04f5ac3 JX |
11669 | msgid "Cannot apply a stash in the middle of a merge" |
11670 | msgstr "无法在合并过程中恢复进度" | |
11671 | ||
94550ed3 | 11672 | #: git-stash.sh:487 |
c04f5ac3 | 11673 | msgid "Conflicts in index. Try without --index." |
90e6ef53 | 11674 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 | 11675 | |
94550ed3 | 11676 | #: git-stash.sh:489 |
c04f5ac3 | 11677 | msgid "Could not save index tree" |
90e6ef53 | 11678 | msgstr "不能保存索引树" |
c04f5ac3 | 11679 | |
94550ed3 | 11680 | #: git-stash.sh:523 |
c04f5ac3 | 11681 | msgid "Cannot unstage modified files" |
160fb2b2 | 11682 | msgstr "无法将修改的文件取消暂存" |
c04f5ac3 | 11683 | |
94550ed3 | 11684 | #: git-stash.sh:538 |
b694fbb1 JX |
11685 | msgid "Index was not unstashed." |
11686 | msgstr "索引的进度没有被恢复。" | |
11687 | ||
94550ed3 | 11688 | #: git-stash.sh:561 |
c04f5ac3 JX |
11689 | #, sh-format |
11690 | msgid "Dropped ${REV} ($s)" | |
11691 | msgstr "丢弃了 ${REV} ($s)" | |
11692 | ||
94550ed3 | 11693 | #: git-stash.sh:562 |
c04f5ac3 JX |
11694 | #, sh-format |
11695 | msgid "${REV}: Could not drop stash entry" | |
90e6ef53 | 11696 | msgstr "${REV}:不能丢弃进度条目" |
c04f5ac3 | 11697 | |
94550ed3 | 11698 | #: git-stash.sh:570 |
c04f5ac3 JX |
11699 | msgid "No branch name specified" |
11700 | msgstr "未指定分支名" | |
11701 | ||
94550ed3 | 11702 | #: git-stash.sh:642 |
c04f5ac3 JX |
11703 | msgid "(To restore them type \"git stash apply\")" |
11704 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
11705 | ||
94550ed3 | 11706 | #: git-submodule.sh:104 |
c04f5ac3 JX |
11707 | #, sh-format |
11708 | msgid "cannot strip one component off url '$remoteurl'" | |
11709 | msgstr "无法从 url '$remoteurl' 剥离一个组件" | |
11710 | ||
94550ed3 | 11711 | #: git-submodule.sh:281 |
2e8451e8 JX |
11712 | msgid "Relative path can only be used from the toplevel of the working tree" |
11713 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
11714 | ||
94550ed3 | 11715 | #: git-submodule.sh:291 |
c04f5ac3 JX |
11716 | #, sh-format |
11717 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
4375c10e | 11718 | msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始" |
c04f5ac3 | 11719 | |
94550ed3 | 11720 | #: git-submodule.sh:308 |
c04f5ac3 | 11721 | #, sh-format |
170e9899 JX |
11722 | msgid "'$sm_path' already exists in the index" |
11723 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 11724 | |
94550ed3 | 11725 | #: git-submodule.sh:312 |
b694fbb1 JX |
11726 | #, sh-format |
11727 | msgid "" | |
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." | |
11731 | msgstr "" | |
11732 | "以下路径被您的一个 .gitignore 文件所忽略:\n" | |
11733 | "$sm_path\n" | |
11734 | "如果您确实想添加它,使用 -f 参数。" | |
11735 | ||
94550ed3 | 11736 | #: git-submodule.sh:330 |
b694fbb1 JX |
11737 | #, sh-format |
11738 | msgid "Adding existing repo at '$sm_path' to the index" | |
160fb2b2 | 11739 | msgstr "添加位于 '$sm_path' 的现存仓库到索引" |
b694fbb1 | 11740 | |
94550ed3 | 11741 | #: git-submodule.sh:332 |
c04f5ac3 | 11742 | #, sh-format |
170e9899 | 11743 | msgid "'$sm_path' already exists and is not a valid git repo" |
160fb2b2 | 11744 | msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" |
c04f5ac3 | 11745 | |
94550ed3 | 11746 | #: git-submodule.sh:340 |
07432cef WS |
11747 | #, sh-format |
11748 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
160fb2b2 | 11749 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" |
07432cef | 11750 | |
94550ed3 | 11751 | #: git-submodule.sh:342 |
07432cef WS |
11752 | #, sh-format |
11753 | msgid "" | |
11754 | "If you want to reuse this local git directory instead of cloning again from" | |
11755 | msgstr "如果您想重用此本地 git 目录而不是重新克隆自" | |
11756 | ||
94550ed3 | 11757 | #: git-submodule.sh:344 |
07432cef WS |
11758 | #, sh-format |
11759 | msgid "" | |
11760 | "use the '--force' option. If the local git directory is not the correct repo" | |
160fb2b2 | 11761 | msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库" |
07432cef | 11762 | |
94550ed3 | 11763 | #: git-submodule.sh:345 |
07432cef WS |
11764 | #, sh-format |
11765 | msgid "" | |
11766 | "or you are unsure what this means choose another name with the '--name' " | |
11767 | "option." | |
11768 | msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。" | |
11769 | ||
94550ed3 | 11770 | #: git-submodule.sh:347 |
07432cef WS |
11771 | #, sh-format |
11772 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
11773 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" | |
11774 | ||
94550ed3 | 11775 | #: git-submodule.sh:359 |
c04f5ac3 | 11776 | #, sh-format |
170e9899 JX |
11777 | msgid "Unable to checkout submodule '$sm_path'" |
11778 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 11779 | |
94550ed3 | 11780 | #: git-submodule.sh:364 |
c04f5ac3 | 11781 | #, sh-format |
170e9899 JX |
11782 | msgid "Failed to add submodule '$sm_path'" |
11783 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 11784 | |
94550ed3 | 11785 | #: git-submodule.sh:373 |
c04f5ac3 | 11786 | #, sh-format |
170e9899 JX |
11787 | msgid "Failed to register submodule '$sm_path'" |
11788 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 11789 | |
94550ed3 | 11790 | #: git-submodule.sh:417 |
c04f5ac3 | 11791 | #, sh-format |
2e8451e8 JX |
11792 | msgid "Entering '$prefix$displaypath'" |
11793 | msgstr "正在进入 '$prefix$displaypath'" | |
c04f5ac3 | 11794 | |
94550ed3 | 11795 | #: git-submodule.sh:437 |
c04f5ac3 | 11796 | #, sh-format |
2e8451e8 JX |
11797 | msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." |
11798 | msgstr "停止于 '$prefix$displaypath',脚本返回非零值。" | |
c04f5ac3 | 11799 | |
94550ed3 | 11800 | #: git-submodule.sh:483 |
c04f5ac3 | 11801 | #, sh-format |
2e8451e8 JX |
11802 | msgid "No url found for submodule path '$displaypath' in .gitmodules" |
11803 | msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url" | |
c04f5ac3 | 11804 | |
94550ed3 | 11805 | #: git-submodule.sh:492 |
c04f5ac3 | 11806 | #, sh-format |
2e8451e8 JX |
11807 | msgid "Failed to register url for submodule path '$displaypath'" |
11808 | msgstr "无法为子模组路径 '$displaypath' 注册 url" | |
c04f5ac3 | 11809 | |
94550ed3 | 11810 | #: git-submodule.sh:494 |
c04f5ac3 | 11811 | #, sh-format |
2e8451e8 JX |
11812 | msgid "Submodule '$name' ($url) registered for path '$displaypath'" |
11813 | msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
c04f5ac3 | 11814 | |
94550ed3 | 11815 | #: git-submodule.sh:511 |
d691f479 | 11816 | #, sh-format |
2e8451e8 JX |
11817 | msgid "Failed to register update mode for submodule path '$displaypath'" |
11818 | msgstr "无法为子模组路径 '$displaypath' 注册更新模式" | |
d691f479 | 11819 | |
94550ed3 | 11820 | #: git-submodule.sh:549 |
1003b3a5 JX |
11821 | #, sh-format |
11822 | msgid "Use '.' if you really want to deinitialize all submodules" | |
11823 | msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化" | |
11824 | ||
94550ed3 | 11825 | #: git-submodule.sh:566 |
1003b3a5 | 11826 | #, sh-format |
2e8451e8 JX |
11827 | msgid "Submodule work tree '$displaypath' contains a .git directory" |
11828 | msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录" | |
1003b3a5 | 11829 | |
94550ed3 | 11830 | #: git-submodule.sh:567 |
1003b3a5 JX |
11831 | #, sh-format |
11832 | msgid "" | |
11833 | "(use 'rm -rf' if you really want to remove it including all of its history)" | |
11834 | msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" | |
11835 | ||
94550ed3 | 11836 | #: git-submodule.sh:573 |
c04f5ac3 JX |
11837 | #, sh-format |
11838 | msgid "" | |
2e8451e8 | 11839 | "Submodule work tree '$displaypath' contains local modifications; use '-f' to " |
1003b3a5 | 11840 | "discard them" |
2e8451e8 | 11841 | msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们" |
1003b3a5 | 11842 | |
94550ed3 | 11843 | #: git-submodule.sh:576 |
1003b3a5 | 11844 | #, sh-format |
2e8451e8 JX |
11845 | msgid "Cleared directory '$displaypath'" |
11846 | msgstr "已清除目录 '$displaypath'" | |
1003b3a5 | 11847 | |
94550ed3 | 11848 | #: git-submodule.sh:577 |
1003b3a5 | 11849 | #, sh-format |
2e8451e8 JX |
11850 | msgid "Could not remove submodule work tree '$displaypath'" |
11851 | msgstr "无法移除子模组工作区 '$displaypath'" | |
1003b3a5 | 11852 | |
94550ed3 | 11853 | #: git-submodule.sh:580 |
1003b3a5 | 11854 | #, sh-format |
2e8451e8 JX |
11855 | msgid "Could not create empty submodule directory '$displaypath'" |
11856 | msgstr "不能创建空的子模组目录 '$displaypath'" | |
1003b3a5 | 11857 | |
94550ed3 | 11858 | #: git-submodule.sh:589 |
1003b3a5 | 11859 | #, sh-format |
2e8451e8 JX |
11860 | msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" |
11861 | msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
1003b3a5 | 11862 | |
94550ed3 | 11863 | #: git-submodule.sh:705 |
1003b3a5 JX |
11864 | #, sh-format |
11865 | msgid "" | |
2e8451e8 | 11866 | "Submodule path '$displaypath' not initialized\n" |
c04f5ac3 JX |
11867 | "Maybe you want to use 'update --init'?" |
11868 | msgstr "" | |
2e8451e8 | 11869 | "子模组路径 '$displaypath' 没有初始化\n" |
90e6ef53 | 11870 | "也许您想用 'update --init'?" |
c04f5ac3 | 11871 | |
94550ed3 | 11872 | #: git-submodule.sh:718 |
c04f5ac3 | 11873 | #, sh-format |
2e8451e8 JX |
11874 | msgid "Unable to find current revision in submodule path '$displaypath'" |
11875 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 11876 | |
94550ed3 | 11877 | #: git-submodule.sh:727 |
c04f5ac3 | 11878 | #, sh-format |
170e9899 JX |
11879 | msgid "Unable to fetch in submodule path '$sm_path'" |
11880 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 11881 | |
94550ed3 | 11882 | #: git-submodule.sh:751 |
2e8451e8 JX |
11883 | #, sh-format |
11884 | msgid "Unable to fetch in submodule path '$displaypath'" | |
11885 | msgstr "无法在子模组路径 '$displaypath' 中获取" | |
11886 | ||
94550ed3 | 11887 | #: git-submodule.sh:765 |
6c94aba5 JX |
11888 | #, sh-format |
11889 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
11890 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
11891 | ||
94550ed3 | 11892 | #: git-submodule.sh:766 |
c04f5ac3 | 11893 | #, sh-format |
6c94aba5 JX |
11894 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
11895 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
11896 | ||
94550ed3 | 11897 | #: git-submodule.sh:770 |
6c94aba5 | 11898 | #, sh-format |
2e8451e8 JX |
11899 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
11900 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 11901 | |
94550ed3 | 11902 | #: git-submodule.sh:771 |
c04f5ac3 | 11903 | #, sh-format |
2e8451e8 JX |
11904 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
11905 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 11906 | |
94550ed3 | 11907 | #: git-submodule.sh:776 |
c04f5ac3 | 11908 | #, sh-format |
2e8451e8 JX |
11909 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
11910 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 11911 | |
94550ed3 | 11912 | #: git-submodule.sh:777 |
c04f5ac3 | 11913 | #, sh-format |
2e8451e8 JX |
11914 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
11915 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 11916 | |
94550ed3 | 11917 | #: git-submodule.sh:782 |
c04f5ac3 | 11918 | #, sh-format |
2e8451e8 | 11919 | msgid "" |
1b7f4a34 | 11920 | "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" |
2e8451e8 | 11921 | msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败" |
c04f5ac3 | 11922 | |
94550ed3 | 11923 | #: git-submodule.sh:783 |
c04f5ac3 | 11924 | #, sh-format |
2e8451e8 JX |
11925 | msgid "Submodule path '$prefix$sm_path': '$command $sha1'" |
11926 | msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'" | |
c04f5ac3 | 11927 | |
94550ed3 | 11928 | #: git-submodule.sh:813 |
2e8451e8 JX |
11929 | #, sh-format |
11930 | msgid "Failed to recurse into submodule path '$displaypath'" | |
11931 | msgstr "无法递归进子模组路径 '$displaypath'" | |
11932 | ||
94550ed3 | 11933 | #: git-submodule.sh:921 |
649900bc JX |
11934 | msgid "The --cached option cannot be used with the --files option" |
11935 | msgstr "选项 --cached 不能和选项 --files 同时使用" | |
b694fbb1 | 11936 | |
94550ed3 | 11937 | #: git-submodule.sh:973 |
b694fbb1 JX |
11938 | #, sh-format |
11939 | msgid "unexpected mode $mod_dst" | |
11940 | msgstr "意外的模式 $mod_dst" | |
c04f5ac3 | 11941 | |
90e6ef53 | 11942 | # 译者:注意保持前导空格 |
94550ed3 | 11943 | #: git-submodule.sh:993 |
c04f5ac3 | 11944 | #, sh-format |
2e8451e8 JX |
11945 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
11946 | msgstr " 警告:$display_name 未包含提交 $sha1_src" | |
c04f5ac3 | 11947 | |
90e6ef53 | 11948 | # 译者:注意保持前导空格 |
94550ed3 | 11949 | #: git-submodule.sh:996 |
c04f5ac3 | 11950 | #, sh-format |
2e8451e8 JX |
11951 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
11952 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" | |
c04f5ac3 | 11953 | |
90e6ef53 | 11954 | # 译者:注意保持前导空格 |
94550ed3 | 11955 | #: git-submodule.sh:999 |
c04f5ac3 | 11956 | #, sh-format |
2e8451e8 JX |
11957 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
11958 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" | |
c04f5ac3 | 11959 | |
94550ed3 | 11960 | #: git-submodule.sh:1024 |
c04f5ac3 | 11961 | msgid "blob" |
07432cef | 11962 | msgstr "数据对象" |
c04f5ac3 | 11963 | |
94550ed3 | 11964 | #: git-submodule.sh:1142 |
1003b3a5 JX |
11965 | #, sh-format |
11966 | msgid "Failed to recurse into submodule path '$sm_path'" | |
11967 | msgstr "无法递归进子模组路径 '$sm_path'" | |
11968 | ||
94550ed3 | 11969 | #: git-submodule.sh:1206 |
c04f5ac3 | 11970 | #, sh-format |
2e8451e8 JX |
11971 | msgid "Synchronizing submodule url for '$displaypath'" |
11972 | msgstr "为 '$displaypath' 同步子模组 url" | |
1b7f4a34 | 11973 | |
89f80d72 JX |
11974 | #~ msgid "unable to look up current user in the passwd file: %s" |
11975 | #~ msgstr "无法在口令文件中查询到当前用户:%s" | |
11976 | ||
11977 | #~ msgid "no such user" | |
11978 | #~ msgstr "无此用户" | |
11979 | ||
94550ed3 JX |
11980 | #~ msgid "show usage" |
11981 | #~ msgstr "显示用法" | |
11982 | ||
11983 | #~ msgid "branch '%s' does not point at a commit" | |
11984 | #~ msgstr "分支 '%s' 未指向一个提交" | |
11985 | ||
11986 | #~ msgid "object '%s' does not point to a commit" | |
11987 | #~ msgstr "对象 '%s' 没有指向一个提交" | |
11988 | ||
11989 | #~ msgid "print only merged branches" | |
11990 | #~ msgstr "只打印合并的分支" | |
11991 | ||
11992 | #~ msgid "--dissociate given, but there is no --reference" | |
11993 | #~ msgstr "提供了参数 --dissociate,但未提供 --reference" | |
11994 | ||
11995 | #~ msgid "insanely long template name %s" | |
11996 | #~ msgstr "太长的模版名 %s" | |
11997 | ||
11998 | #~ msgid "insanely long symlink %s" | |
11999 | #~ msgstr "太长的符号链接 %s" | |
12000 | ||
12001 | #~ msgid "insanely long template path %s" | |
12002 | #~ msgstr "太长的模版路径 %s" | |
12003 | ||
12004 | #~ msgid "insane git directory %s" | |
12005 | #~ msgstr "不正常的 git 目录 %s" | |
12006 | ||
12007 | #~ msgid "unsupported sort specification '%s'" | |
12008 | #~ msgstr "不支持的排序规格 '%s'" | |
12009 | ||
12010 | #~ msgid "unsupported sort specification '%s' in variable '%s'" | |
12011 | #~ msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'" | |
12012 | ||
12013 | #~ msgid "switch 'points-at' requires an object" | |
12014 | #~ msgstr "开关 'points-at' 需要一个对象" | |
12015 | ||
12016 | #~ msgid "sort tags" | |
12017 | #~ msgstr "排序标签" | |
12018 | ||
12019 | #~ msgid "--sort and -n are incompatible" | |
12020 | #~ msgstr "--sort 和 -n 不兼容" | |
12021 | ||
12022 | #~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" | |
12023 | #~ msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反" | |
12024 | ||
03ea3327 JX |
12025 | #~ msgid "false|true|preserve" |
12026 | #~ msgstr "false|true|preserve" | |
12027 | ||
1b7f4a34 JX |
12028 | #~ msgid "BUG: reopen a lockfile that is still open" |
12029 | #~ msgstr "BUG: 重新打开一个仍打开着的锁文件" | |
12030 | ||
12031 | #~ msgid "BUG: reopen a lockfile that has been committed" | |
12032 | #~ msgstr "BUG: 重新打开一个已提交的锁文件" | |
12033 | ||
12034 | #~ msgid "option %s does not accept negative form" | |
12035 | #~ msgstr "选项 %s 不接受否定格式" | |
12036 | ||
12037 | #~ msgid "unable to parse value '%s' for option %s" | |
12038 | #~ msgstr "不能解析选项 %1$s 的值 '%2$s'" | |
12039 | ||
12040 | #~ msgid "unable to resolve HEAD" | |
12041 | #~ msgstr "不能解析 HEAD" | |
12042 | ||
12043 | #~ msgid "-b and -B are mutually exclusive" | |
12044 | #~ msgstr "-b 和 -B 互斥" | |
12045 | ||
12046 | #~ msgid "You need to set your committer info first" | |
12047 | #~ msgstr "您需要先设置你的提交者信息" | |
12048 | ||
12049 | #~ msgid "" | |
12050 | #~ "When you have resolved this problem, run \"$cmdline --continue\".\n" | |
12051 | #~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" | |
12052 | #~ "To restore the original branch and stop patching, run \"$cmdline --abort" | |
12053 | #~ "\"." | |
12054 | #~ msgstr "" | |
12055 | #~ "当您解决了此问题后,执行 \"$cmdline --continue\"。\n" | |
12056 | #~ "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n" | |
12057 | #~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。" | |
12058 | ||
12059 | #~ msgid "Patch format $patch_format is not supported." | |
12060 | #~ msgstr "不支持 $patch_format 补丁格式。" | |
12061 | ||
12062 | #~ msgid "Please make up your mind. --skip or --abort?" | |
12063 | #~ msgstr "请下决心。--skip 或是 --abort ?" | |
12064 | ||
12065 | #~ msgid "" | |
12066 | #~ "Patch is empty. Was it split wrong?\n" | |
12067 | #~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" | |
12068 | #~ "To restore the original branch and stop patching run \"$cmdline --abort\"." | |
12069 | #~ msgstr "" | |
12070 | #~ "补丁为空。是不是切分错误?\n" | |
12071 | #~ "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n" | |
12072 | #~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。" | |
12073 | ||
12074 | #~ msgid "Patch does not have a valid e-mail address." | |
12075 | #~ msgstr "补丁中没有一个有效的邮件地址。" | |
12076 | ||
12077 | #~ msgid "Applying: $FIRSTLINE" | |
12078 | #~ msgstr "正应用:$FIRSTLINE" | |
12079 | ||
12080 | #~ msgid "Patch failed at $msgnum $FIRSTLINE" | |
12081 | #~ msgstr "补丁失败于 $msgnum $FIRSTLINE" | |
12082 | ||
12083 | #~ msgid "" | |
12084 | #~ "Pull is not possible because you have unmerged files.\n" | |
12085 | #~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" | |
12086 | #~ "as appropriate to mark resolution and make a commit." | |
12087 | #~ msgstr "" | |
12088 | #~ "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n" | |
12089 | #~ "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。" | |
12090 | ||
12091 | #~ msgid "Pull is not possible because you have unmerged files." | |
12092 | #~ msgstr "Pull 不可用,因为您尚有未合并的文件。" |