]>
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" | |
5b04ee3b | 138 | "POT-Creation-Date: 2016-05-24 23:42+0800\n" |
aef18cc6 | 139 | "PO-Revision-Date: 2016-06-06 23:05+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 | |
5b04ee3b | 161 | #: advice.c:101 builtin/merge.c:1238 |
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 | |
5b04ee3b | 204 | #: archive.c:430 builtin/log.c:1395 |
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 | |
5b04ee3b JX |
212 | #: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 |
213 | #: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987 | |
214 | #: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100 | |
276ceeaa JX |
215 | #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398 |
216 | #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153 | |
ef317cd5 JX |
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 | |
5b04ee3b JX |
248 | #: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 |
249 | #: builtin/submodule--helper.c:776 | |
ef317cd5 | 250 | msgid "repo" |
160fb2b2 | 251 | msgstr "仓库" |
ef317cd5 | 252 | |
94550ed3 | 253 | #: archive.c:452 builtin/archive.c:91 |
ef317cd5 | 254 | msgid "retrieve the archive from remote repository <repo>" |
160fb2b2 | 255 | msgstr "从远程仓库(<仓库>)提取归档文件" |
ef317cd5 | 256 | |
276ceeaa | 257 | #: archive.c:453 builtin/archive.c:92 builtin/notes.c:482 |
ef317cd5 | 258 | msgid "command" |
07432cef | 259 | msgstr "命令" |
ef317cd5 | 260 | |
94550ed3 | 261 | #: archive.c:454 builtin/archive.c:93 |
ef317cd5 | 262 | msgid "path to the remote git-upload-archive command" |
07432cef WS |
263 | msgstr "远程 git-upload-archive 命令的路径" |
264 | ||
276ceeaa | 265 | #: attr.c:263 |
07432cef | 266 | msgid "" |
a7409dfb | 267 | "Negative patterns are ignored in git attributes\n" |
07432cef | 268 | "Use '\\!' for literal leading exclamation." |
ef317cd5 | 269 | msgstr "" |
a7409dfb | 270 | "负值模版在 git attributes 中被忽略\n" |
07432cef | 271 | "当字符串确实要以感叹号开始时,使用 '\\!'。" |
ef317cd5 | 272 | |
276ceeaa JX |
273 | #: branch.c:53 |
274 | #, c-format | |
275 | msgid "" | |
276 | "\n" | |
277 | "After fixing the error cause you may try to fix up\n" | |
278 | "the remote tracking information by invoking\n" | |
279 | "\"git branch --set-upstream-to=%s%s%s\"." | |
280 | msgstr "" | |
281 | "\n" | |
282 | "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n" | |
283 | "\"git branch --set-upstream-to=%s%s%s\" 。" | |
284 | ||
285 | #: branch.c:67 | |
4dcdc3d8 JX |
286 | #, c-format |
287 | msgid "Not setting branch %s as its own upstream." | |
288 | msgstr "未设置分支 %s 作为它自己的上游。" | |
289 | ||
276ceeaa | 290 | #: branch.c:93 |
4dcdc3d8 JX |
291 | #, c-format |
292 | msgid "Branch %s set up to track remote branch %s from %s by rebasing." | |
293 | msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。" | |
294 | ||
276ceeaa | 295 | #: branch.c:94 |
4dcdc3d8 JX |
296 | #, c-format |
297 | msgid "Branch %s set up to track remote branch %s from %s." | |
298 | msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。" | |
299 | ||
276ceeaa | 300 | #: branch.c:98 |
4dcdc3d8 JX |
301 | #, c-format |
302 | msgid "Branch %s set up to track local branch %s by rebasing." | |
303 | msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。" | |
304 | ||
276ceeaa | 305 | #: branch.c:99 |
4dcdc3d8 JX |
306 | #, c-format |
307 | msgid "Branch %s set up to track local branch %s." | |
308 | msgstr "分支 %s 设置为跟踪本地分支 %s。" | |
309 | ||
276ceeaa | 310 | #: branch.c:104 |
4dcdc3d8 JX |
311 | #, c-format |
312 | msgid "Branch %s set up to track remote ref %s by rebasing." | |
313 | msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。" | |
314 | ||
276ceeaa | 315 | #: branch.c:105 |
4dcdc3d8 JX |
316 | #, c-format |
317 | msgid "Branch %s set up to track remote ref %s." | |
318 | msgstr "分支 %s 设置为跟踪远程引用 %s。" | |
319 | ||
276ceeaa | 320 | #: branch.c:109 |
4dcdc3d8 JX |
321 | #, c-format |
322 | msgid "Branch %s set up to track local ref %s by rebasing." | |
323 | msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。" | |
324 | ||
276ceeaa | 325 | #: branch.c:110 |
4dcdc3d8 JX |
326 | #, c-format |
327 | msgid "Branch %s set up to track local ref %s." | |
328 | msgstr "分支 %s 设置为跟踪本地引用 %s。" | |
329 | ||
276ceeaa JX |
330 | #: branch.c:119 |
331 | msgid "Unable to write upstream branch configuration" | |
332 | msgstr "无法写入上游分支配置" | |
333 | ||
334 | #: branch.c:156 | |
4dcdc3d8 JX |
335 | #, c-format |
336 | msgid "Not tracking: ambiguous information for ref %s" | |
337 | msgstr "未跟踪:引用 %s 有歧义" | |
338 | ||
276ceeaa | 339 | #: branch.c:185 |
4dcdc3d8 JX |
340 | #, c-format |
341 | msgid "'%s' is not a valid branch name." | |
342 | msgstr "'%s' 不是一个有效的分支名称。" | |
343 | ||
276ceeaa | 344 | #: branch.c:190 |
4dcdc3d8 JX |
345 | #, c-format |
346 | msgid "A branch named '%s' already exists." | |
347 | msgstr "一个分支名 '%s' 已经存在。" | |
348 | ||
276ceeaa | 349 | #: branch.c:198 |
4dcdc3d8 JX |
350 | msgid "Cannot force update the current branch." |
351 | msgstr "无法强制更新当前分支。" | |
352 | ||
276ceeaa | 353 | #: branch.c:218 |
1003b3a5 JX |
354 | #, c-format |
355 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." | |
356 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" | |
357 | ||
276ceeaa | 358 | #: branch.c:220 |
1003b3a5 JX |
359 | #, c-format |
360 | msgid "the requested upstream branch '%s' does not exist" | |
361 | msgstr "请求的上游分支 '%s' 不存在" | |
362 | ||
276ceeaa | 363 | #: branch.c:222 |
1003b3a5 JX |
364 | msgid "" |
365 | "\n" | |
366 | "If you are planning on basing your work on an upstream\n" | |
367 | "branch that already exists at the remote, you may need to\n" | |
368 | "run \"git fetch\" to retrieve it.\n" | |
369 | "\n" | |
370 | "If you are planning to push out a new local branch that\n" | |
371 | "will track its remote counterpart, you may want to use\n" | |
372 | "\"git push -u\" to set the upstream config as you push." | |
373 | msgstr "" | |
374 | "\n" | |
375 | "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" | |
376 | "您可能需要执行 \"git fetch\" 来获取分支。\n" | |
377 | "\n" | |
378 | "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" | |
379 | "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" | |
380 | ||
276ceeaa | 381 | #: branch.c:266 |
4dcdc3d8 JX |
382 | #, c-format |
383 | msgid "Not a valid object name: '%s'." | |
384 | msgstr "不是一个有效的对象名:'%s'。" | |
385 | ||
276ceeaa | 386 | #: branch.c:286 |
4dcdc3d8 JX |
387 | #, c-format |
388 | msgid "Ambiguous object name: '%s'." | |
389 | msgstr "歧义的对象名:'%s'。" | |
390 | ||
276ceeaa | 391 | #: branch.c:291 |
4dcdc3d8 JX |
392 | #, c-format |
393 | msgid "Not a valid branch point: '%s'." | |
394 | msgstr "无效的分支点:'%s'。" | |
395 | ||
5b04ee3b | 396 | #: branch.c:345 |
1b7f4a34 JX |
397 | #, c-format |
398 | msgid "'%s' is already checked out at '%s'" | |
399 | msgstr "'%s' 已经检出到 '%s'" | |
400 | ||
5b04ee3b JX |
401 | #: branch.c:364 |
402 | #, c-format | |
403 | msgid "HEAD of working tree %s is not updated" | |
404 | msgstr "工作区 %s 的 HEAD 指向没有被更新" | |
405 | ||
220c313c | 406 | #: bundle.c:34 |
8ada9598 JX |
407 | #, c-format |
408 | msgid "'%s' does not look like a v2 bundle file" | |
81809b99 | 409 | msgstr "'%s' 不像是一个 v2 版本的包文件" |
8ada9598 | 410 | |
220c313c | 411 | #: bundle.c:61 |
81809b99 | 412 | #, c-format |
8ada9598 | 413 | msgid "unrecognized header: %s%s (%d)" |
81809b99 | 414 | msgstr "未能识别的包头:%s%s (%d)" |
8ada9598 | 415 | |
5b04ee3b | 416 | #: bundle.c:87 builtin/commit.c:777 |
8ada9598 JX |
417 | #, c-format |
418 | msgid "could not open '%s'" | |
419 | msgstr "不能打开 '%s'" | |
420 | ||
220c313c | 421 | #: bundle.c:139 |
8ada9598 | 422 | msgid "Repository lacks these prerequisite commits:" |
160fb2b2 | 423 | msgstr "仓库中缺少这些必备的提交:" |
8ada9598 | 424 | |
5b04ee3b JX |
425 | #: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 |
426 | #: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 | |
427 | #: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 | |
428 | #: builtin/merge.c:361 builtin/shortlog.c:170 | |
8ada9598 JX |
429 | msgid "revision walk setup failed" |
430 | msgstr "版本遍历设置失败" | |
431 | ||
220c313c | 432 | #: bundle.c:185 |
8ada9598 | 433 | #, c-format |
1003b3a5 JX |
434 | msgid "The bundle contains this ref:" |
435 | msgid_plural "The bundle contains these %d refs:" | |
436 | msgstr[0] "这个包中含有这个引用:" | |
437 | msgstr[1] "这个包中含有 %d 个引用:" | |
8ada9598 | 438 | |
220c313c | 439 | #: bundle.c:192 |
6792b93b JX |
440 | msgid "The bundle records a complete history." |
441 | msgstr "这个包记录一个完整历史。" | |
442 | ||
220c313c | 443 | #: bundle.c:194 |
8ada9598 | 444 | #, c-format |
1003b3a5 JX |
445 | msgid "The bundle requires this ref:" |
446 | msgid_plural "The bundle requires these %d refs:" | |
447 | msgstr[0] "这个包需要这个引用:" | |
448 | msgstr[1] "这个包需要 %d 个引用:" | |
8ada9598 | 449 | |
1b7f4a34 | 450 | #: bundle.c:253 |
9aeb4c2b JX |
451 | msgid "Could not spawn pack-objects" |
452 | msgstr "不能生成 pack-objects 进程" | |
453 | ||
1b7f4a34 | 454 | #: bundle.c:264 |
9aeb4c2b JX |
455 | msgid "pack-objects died" |
456 | msgstr "pack-objects 终止" | |
457 | ||
1b7f4a34 | 458 | #: bundle.c:304 |
8ada9598 | 459 | msgid "rev-list died" |
81809b99 | 460 | msgstr "rev-list 终止" |
8ada9598 | 461 | |
1b7f4a34 | 462 | #: bundle.c:353 |
8ada9598 JX |
463 | #, c-format |
464 | msgid "ref '%s' is excluded by the rev-list options" | |
81809b99 | 465 | msgstr "引用 '%s' 被 rev-list 选项排除" |
8ada9598 | 466 | |
5b04ee3b | 467 | #: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 |
9aeb4c2b JX |
468 | #, c-format |
469 | msgid "unrecognized argument: %s" | |
470 | msgstr "未能识别的参数:%s" | |
471 | ||
5b04ee3b | 472 | #: bundle.c:451 |
8ada9598 | 473 | msgid "Refusing to create empty bundle." |
81809b99 | 474 | msgstr "不能创建空包。" |
8ada9598 | 475 | |
5b04ee3b | 476 | #: bundle.c:463 |
81809b99 | 477 | #, c-format |
8ada9598 | 478 | msgid "cannot create '%s'" |
81809b99 | 479 | msgstr "不能创建 '%s'" |
8ada9598 | 480 | |
5b04ee3b | 481 | #: bundle.c:491 |
8ada9598 | 482 | msgid "index-pack died" |
81809b99 | 483 | msgstr "index-pack 终止" |
8ada9598 | 484 | |
94550ed3 | 485 | #: color.c:275 |
220c313c JX |
486 | #, c-format |
487 | msgid "invalid color value: %.*s" | |
488 | msgstr "无效的颜色值:%.*s" | |
489 | ||
5b04ee3b JX |
490 | #: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 |
491 | #: builtin/am.c:2134 | |
c04f5ac3 JX |
492 | #, c-format |
493 | msgid "could not parse %s" | |
494 | msgstr "不能解析 %s" | |
495 | ||
6acbf033 | 496 | #: commit.c:42 |
c04f5ac3 JX |
497 | #, c-format |
498 | msgid "%s %s is not a commit!" | |
499 | msgstr "%s %s 不是一个提交!" | |
500 | ||
501 | #: compat/obstack.c:406 compat/obstack.c:408 | |
502 | msgid "memory exhausted" | |
503 | msgstr "内存耗尽" | |
504 | ||
276ceeaa | 505 | #: config.c:475 config.c:477 |
220c313c | 506 | #, c-format |
276ceeaa JX |
507 | msgid "bad config line %d in %s %s" |
508 | msgstr "%2$s %3$s 出错于第 %1$d 行" | |
220c313c | 509 | |
276ceeaa | 510 | #: config.c:593 |
220c313c | 511 | #, c-format |
276ceeaa JX |
512 | msgid "bad numeric config value '%s' for '%s' in %s %s: %s" |
513 | msgstr "%3$s %4$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %5$s" | |
220c313c | 514 | |
276ceeaa | 515 | #: config.c:595 |
220c313c JX |
516 | #, c-format |
517 | msgid "bad numeric config value '%s' for '%s': %s" | |
518 | msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s" | |
519 | ||
276ceeaa | 520 | #: config.c:680 |
220c313c JX |
521 | #, c-format |
522 | msgid "failed to expand user dir in: '%s'" | |
523 | msgstr "无法扩展 '%s' 中的用户目录" | |
524 | ||
5b04ee3b | 525 | #: config.c:761 config.c:772 |
220c313c JX |
526 | #, c-format |
527 | msgid "bad zlib compression level %d" | |
528 | msgstr "错误的 zlib 压缩级别 %d" | |
529 | ||
5b04ee3b | 530 | #: config.c:890 |
220c313c JX |
531 | #, c-format |
532 | msgid "invalid mode for object creation: %s" | |
533 | msgstr "无效的对象创建模式:%s" | |
534 | ||
5b04ee3b | 535 | #: config.c:1228 |
220c313c JX |
536 | msgid "unable to parse command-line config" |
537 | msgstr "无法解析命令行中的配置" | |
538 | ||
5b04ee3b | 539 | #: config.c:1284 |
220c313c JX |
540 | msgid "unknown error occured while reading the configuration files" |
541 | msgstr "在读取配置文件时遇到未知错误" | |
542 | ||
276ceeaa | 543 | #: config.c:1629 |
220c313c JX |
544 | #, c-format |
545 | msgid "unable to parse '%s' from command-line config" | |
546 | msgstr "无法解析命令行配置中的 '%s'" | |
547 | ||
276ceeaa | 548 | #: config.c:1631 |
220c313c JX |
549 | #, c-format |
550 | msgid "bad config variable '%s' in file '%s' at line %d" | |
551 | msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" | |
552 | ||
276ceeaa | 553 | #: config.c:1690 |
220c313c JX |
554 | #, c-format |
555 | msgid "%s has multiple values" | |
556 | msgstr "%s 有多个取值" | |
557 | ||
5b04ee3b | 558 | #: config.c:2224 |
276ceeaa | 559 | #, c-format |
5b04ee3b | 560 | msgid "could not set '%s' to '%s'" |
276ceeaa JX |
561 | msgstr "不能设置 '%s' 为 '%s'" |
562 | ||
5b04ee3b JX |
563 | #: config.c:2226 |
564 | #, c-format | |
565 | msgid "could not unset '%s'" | |
566 | msgstr "不能取消设置 '%s'" | |
567 | ||
220c313c | 568 | #: connected.c:69 |
c04f5ac3 JX |
569 | msgid "Could not run 'git rev-list'" |
570 | msgstr "不能执行 'git rev-list'" | |
571 | ||
220c313c | 572 | #: connected.c:89 |
5b04ee3b JX |
573 | msgid "failed write to rev-list" |
574 | msgstr "无法写入 rev-list" | |
c04f5ac3 | 575 | |
5b04ee3b JX |
576 | #: connected.c:96 |
577 | msgid "failed to close rev-list's stdin" | |
578 | msgstr "无法关闭 rev-list 的标准输入" | |
c04f5ac3 | 579 | |
8ada9598 JX |
580 | #: date.c:95 |
581 | msgid "in the future" | |
81809b99 | 582 | msgstr "在将来" |
8ada9598 JX |
583 | |
584 | #: date.c:101 | |
585 | #, c-format | |
586 | msgid "%lu second ago" | |
587 | msgid_plural "%lu seconds ago" | |
6c94aba5 JX |
588 | msgstr[0] "%lu 秒钟前" |
589 | msgstr[1] "%lu 秒钟前" | |
8ada9598 JX |
590 | |
591 | #: date.c:108 | |
592 | #, c-format | |
593 | msgid "%lu minute ago" | |
594 | msgid_plural "%lu minutes ago" | |
6c94aba5 JX |
595 | msgstr[0] "%lu 分钟前" |
596 | msgstr[1] "%lu 分钟前" | |
8ada9598 JX |
597 | |
598 | #: date.c:115 | |
599 | #, c-format | |
600 | msgid "%lu hour ago" | |
601 | msgid_plural "%lu hours ago" | |
6c94aba5 JX |
602 | msgstr[0] "%lu 小时前" |
603 | msgstr[1] "%lu 小时前" | |
8ada9598 JX |
604 | |
605 | #: date.c:122 | |
606 | #, c-format | |
607 | msgid "%lu day ago" | |
608 | msgid_plural "%lu days ago" | |
6c94aba5 JX |
609 | msgstr[0] "%lu 天前" |
610 | msgstr[1] "%lu 天前" | |
8ada9598 JX |
611 | |
612 | #: date.c:128 | |
613 | #, c-format | |
614 | msgid "%lu week ago" | |
615 | msgid_plural "%lu weeks ago" | |
6c94aba5 JX |
616 | msgstr[0] "%lu 周前" |
617 | msgstr[1] "%lu 周前" | |
8ada9598 JX |
618 | |
619 | #: date.c:135 | |
620 | #, c-format | |
621 | msgid "%lu month ago" | |
622 | msgid_plural "%lu months ago" | |
6c94aba5 JX |
623 | msgstr[0] "%lu 个月前" |
624 | msgstr[1] "%lu 个月前" | |
8ada9598 JX |
625 | |
626 | #: date.c:146 | |
627 | #, c-format | |
628 | msgid "%lu year" | |
629 | msgid_plural "%lu years" | |
81809b99 | 630 | msgstr[0] "%lu 年" |
5ae481e0 | 631 | msgstr[1] "%lu 年" |
8ada9598 | 632 | |
6c94aba5 | 633 | #. TRANSLATORS: "%s" is "<n> years" |
8ada9598 JX |
634 | #: date.c:149 |
635 | #, c-format | |
636 | msgid "%s, %lu month ago" | |
637 | msgid_plural "%s, %lu months ago" | |
6c94aba5 JX |
638 | msgstr[0] "%s %lu 个月前" |
639 | msgstr[1] "%s %lu 个月前" | |
8ada9598 JX |
640 | |
641 | #: date.c:154 date.c:159 | |
642 | #, c-format | |
643 | msgid "%lu year ago" | |
644 | msgid_plural "%lu years ago" | |
81809b99 | 645 | msgstr[0] "%lu 年前" |
5ae481e0 | 646 | msgstr[1] "%lu 年前" |
8ada9598 | 647 | |
cfff71a9 JX |
648 | #: diffcore-order.c:24 |
649 | #, c-format | |
650 | msgid "failed to read orderfile '%s'" | |
651 | msgstr "无法读取排序文件 '%s'" | |
652 | ||
5b04ee3b | 653 | #: diffcore-rename.c:538 |
6c94aba5 JX |
654 | msgid "Performing inexact rename detection" |
655 | msgstr "正在进行非精确的重命名检测" | |
656 | ||
90e6ef53 | 657 | # 译者:注意保持前导空格 |
5b04ee3b | 658 | #: diff.c:116 |
c04f5ac3 | 659 | #, c-format |
07432cef WS |
660 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" |
661 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" | |
c04f5ac3 | 662 | |
90e6ef53 | 663 | # 译者:注意保持前导空格 |
5b04ee3b | 664 | #: diff.c:121 |
c04f5ac3 | 665 | #, c-format |
07432cef WS |
666 | msgid " Unknown dirstat parameter '%s'\n" |
667 | msgstr " 未知的 dirstat 参数 '%s'\n" | |
c04f5ac3 | 668 | |
5b04ee3b | 669 | #: diff.c:225 |
07432cef WS |
670 | #, c-format |
671 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" | |
672 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" | |
673 | ||
5b04ee3b | 674 | #: diff.c:277 |
c04f5ac3 JX |
675 | #, c-format |
676 | msgid "" | |
677 | "Found errors in 'diff.dirstat' config variable:\n" | |
678 | "%s" | |
679 | msgstr "" | |
90e6ef53 | 680 | "发现配置变量 'diff.dirstat' 中的错误:\n" |
c04f5ac3 JX |
681 | "%s" |
682 | ||
5b04ee3b | 683 | #: diff.c:3007 |
6acbf033 JX |
684 | #, c-format |
685 | msgid "external diff died, stopping at %s" | |
686 | msgstr "外部 diff 退出,停止在 %s" | |
687 | ||
5b04ee3b | 688 | #: diff.c:3405 |
6acbf033 JX |
689 | msgid "--follow requires exactly one pathspec" |
690 | msgstr "--follow 参数后只跟一个 pathspec" | |
691 | ||
5b04ee3b | 692 | #: diff.c:3568 |
c04f5ac3 JX |
693 | #, c-format |
694 | msgid "" | |
695 | "Failed to parse --dirstat/-X option parameter:\n" | |
696 | "%s" | |
697 | msgstr "" | |
698 | "无法解析 --dirstat/-X 选项的参数:\n" | |
699 | "%s" | |
700 | ||
5b04ee3b | 701 | #: diff.c:3582 |
07432cef WS |
702 | #, c-format |
703 | msgid "Failed to parse --submodule option parameter: '%s'" | |
704 | msgstr "无法解析 --submodule 选项的参数:'%s'" | |
705 | ||
5b04ee3b | 706 | #: dir.c:1823 |
7aea43ff JX |
707 | msgid "failed to get kernel name and information" |
708 | msgstr "无法获得内核名称和信息" | |
709 | ||
5b04ee3b | 710 | #: dir.c:1942 |
276ceeaa JX |
711 | msgid "Untracked cache is disabled on this system or location." |
712 | msgstr "缓存未跟踪文件在本系统或位置中被禁用。" | |
7aea43ff | 713 | |
5b04ee3b | 714 | #: gpg-interface.c:166 gpg-interface.c:235 |
c04f5ac3 JX |
715 | msgid "could not run gpg." |
716 | msgstr "不能执行 gpg。" | |
717 | ||
1b7f4a34 | 718 | #: gpg-interface.c:178 |
c04f5ac3 JX |
719 | msgid "gpg did not accept the data" |
720 | msgstr "gpg 没有接受数据" | |
721 | ||
1b7f4a34 | 722 | #: gpg-interface.c:189 |
c04f5ac3 JX |
723 | msgid "gpg failed to sign the data" |
724 | msgstr "gpg 无法为数据签名" | |
725 | ||
1b7f4a34 | 726 | #: gpg-interface.c:222 |
a77c07d9 | 727 | #, c-format |
5b04ee3b JX |
728 | msgid "could not create temporary file '%s'" |
729 | msgstr "不能创建临时文件 '%s'" | |
a77c07d9 | 730 | |
5b04ee3b | 731 | #: gpg-interface.c:224 |
a77c07d9 | 732 | #, c-format |
5b04ee3b JX |
733 | msgid "failed writing detached signature to '%s'" |
734 | msgstr "无法将分离式签名写入 '%s'" | |
a77c07d9 | 735 | |
220c313c | 736 | #: grep.c:1718 |
7ac1c0ad JX |
737 | #, c-format |
738 | msgid "'%s': unable to read %s" | |
739 | msgstr "'%s':无法读取 %s" | |
740 | ||
5b04ee3b | 741 | #: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 |
7ac1c0ad | 742 | #, c-format |
5b04ee3b JX |
743 | msgid "failed to stat '%s'" |
744 | msgstr "无法枚举 '%s' 状态" | |
7ac1c0ad | 745 | |
220c313c | 746 | #: grep.c:1746 |
7ac1c0ad | 747 | #, c-format |
5b04ee3b JX |
748 | msgid "'%s': short read" |
749 | msgstr "'%s':读取不完整" | |
7ac1c0ad | 750 | |
276ceeaa | 751 | #: help.c:205 |
81809b99 | 752 | #, c-format |
8ada9598 | 753 | msgid "available git commands in '%s'" |
81809b99 | 754 | msgstr "在 '%s' 下可用的 git 命令" |
8ada9598 | 755 | |
276ceeaa | 756 | #: help.c:212 |
8ada9598 | 757 | msgid "git commands available from elsewhere on your $PATH" |
81809b99 | 758 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" |
8ada9598 | 759 | |
276ceeaa | 760 | #: help.c:244 |
7aea43ff JX |
761 | msgid "These are common Git commands used in various situations:" |
762 | msgstr "这些是各种场合常见的 Git 命令:" | |
a77c07d9 | 763 | |
276ceeaa | 764 | #: help.c:309 |
c04f5ac3 JX |
765 | #, c-format |
766 | msgid "" | |
767 | "'%s' appears to be a git command, but we were not\n" | |
768 | "able to execute it. Maybe git-%s is broken?" | |
769 | msgstr "" | |
770 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
771 | "可能是 git-%s 受损?" | |
772 | ||
276ceeaa | 773 | #: help.c:366 |
8ada9598 | 774 | msgid "Uh oh. Your system reports no Git commands at all." |
81809b99 | 775 | msgstr "唉呀,您的系统中未发现 Git 命令。" |
8ada9598 | 776 | |
276ceeaa | 777 | #: help.c:388 |
8ada9598 JX |
778 | #, c-format |
779 | msgid "" | |
780 | "WARNING: You called a Git command named '%s', which does not exist.\n" | |
781 | "Continuing under the assumption that you meant '%s'" | |
782 | msgstr "" | |
81809b99 JX |
783 | "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" |
784 | "是 '%s'" | |
8ada9598 | 785 | |
276ceeaa | 786 | #: help.c:393 |
8ada9598 JX |
787 | #, c-format |
788 | msgid "in %0.1f seconds automatically..." | |
81809b99 | 789 | msgstr "在 %0.1f 秒钟后自动运行..." |
8ada9598 | 790 | |
276ceeaa | 791 | #: help.c:400 |
8ada9598 JX |
792 | #, c-format |
793 | msgid "git: '%s' is not a git command. See 'git --help'." | |
81809b99 | 794 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" |
8ada9598 | 795 | |
276ceeaa | 796 | #: help.c:404 help.c:464 |
8ada9598 JX |
797 | msgid "" |
798 | "\n" | |
799 | "Did you mean this?" | |
800 | msgid_plural "" | |
801 | "\n" | |
802 | "Did you mean one of these?" | |
803 | msgstr[0] "" | |
81809b99 JX |
804 | "\n" |
805 | "您指的是这个么?" | |
806 | msgstr[1] "" | |
807 | "\n" | |
195febda | 808 | "您指的是这其中的某一个么?" |
8ada9598 | 809 | |
276ceeaa | 810 | #: help.c:460 |
2e8451e8 JX |
811 | #, c-format |
812 | msgid "%s: %s - %s" | |
813 | msgstr "%s:%s - %s" | |
814 | ||
5b04ee3b JX |
815 | #: lockfile.c:152 |
816 | #, c-format | |
817 | msgid "" | |
818 | "Unable to create '%s.lock': %s.\n" | |
819 | "\n" | |
820 | "Another git process seems to be running in this repository, e.g.\n" | |
821 | "an editor opened by 'git commit'. Please make sure all processes\n" | |
822 | "are terminated then try again. If it still fails, a git process\n" | |
823 | "may have crashed in this repository earlier:\n" | |
824 | "remove the file manually to continue." | |
825 | msgstr "" | |
826 | "无法创建 '%s.lock':%s。\n" | |
827 | "\n" | |
828 | "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n" | |
829 | "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n" | |
830 | "可能之前有一个 git 进程在这个仓库中异常退出:\n" | |
831 | "手动删除这个文件再继续。" | |
832 | ||
833 | #: lockfile.c:160 | |
834 | #, c-format | |
835 | msgid "Unable to create '%s.lock': %s" | |
836 | msgstr "不能创建 '%s.lock':%s" | |
837 | ||
220c313c | 838 | #: merge.c:41 |
07432cef WS |
839 | msgid "failed to read the cache" |
840 | msgstr "无法读取缓存" | |
841 | ||
5b04ee3b JX |
842 | #: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 |
843 | #: builtin/checkout.c:586 builtin/clone.c:732 | |
07432cef WS |
844 | msgid "unable to write new index file" |
845 | msgstr "无法写新的索引文件" | |
846 | ||
220c313c | 847 | #: merge-recursive.c:189 |
649900bc JX |
848 | #, c-format |
849 | msgid "(bad commit)\n" | |
850 | msgstr "(坏提交)\n" | |
851 | ||
220c313c | 852 | #: merge-recursive.c:209 |
649900bc JX |
853 | #, c-format |
854 | msgid "addinfo_cache failed for path '%s'" | |
855 | msgstr "为路径 '%s' addinfo_cache 失败" | |
856 | ||
220c313c | 857 | #: merge-recursive.c:270 |
649900bc JX |
858 | msgid "error building trees" |
859 | msgstr "无法创建树" | |
860 | ||
276ceeaa | 861 | #: merge-recursive.c:689 |
649900bc JX |
862 | #, c-format |
863 | msgid "failed to create path '%s'%s" | |
864 | msgstr "无法创建路径 '%s'%s" | |
865 | ||
276ceeaa | 866 | #: merge-recursive.c:700 |
649900bc JX |
867 | #, c-format |
868 | msgid "Removing %s to make room for subdirectory\n" | |
869 | msgstr "删除 %s 以便为子目录留出空间\n" | |
870 | ||
276ceeaa | 871 | #: merge-recursive.c:714 merge-recursive.c:735 |
649900bc JX |
872 | msgid ": perhaps a D/F conflict?" |
873 | msgstr ":可能是一个目录/文件冲突?" | |
874 | ||
276ceeaa | 875 | #: merge-recursive.c:725 |
649900bc JX |
876 | #, c-format |
877 | msgid "refusing to lose untracked file at '%s'" | |
878 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
879 | ||
276ceeaa | 880 | #: merge-recursive.c:765 |
649900bc JX |
881 | #, c-format |
882 | msgid "cannot read object %s '%s'" | |
883 | msgstr "不能读取对象 %s '%s'" | |
884 | ||
276ceeaa | 885 | #: merge-recursive.c:767 |
649900bc JX |
886 | #, c-format |
887 | msgid "blob expected for %s '%s'" | |
160fb2b2 | 888 | msgstr "%s '%s' 应为数据对象" |
649900bc | 889 | |
5b04ee3b | 890 | #: merge-recursive.c:790 builtin/clone.c:376 |
649900bc JX |
891 | #, c-format |
892 | msgid "failed to open '%s'" | |
893 | msgstr "无法打开 '%s'" | |
894 | ||
276ceeaa | 895 | #: merge-recursive.c:798 |
649900bc JX |
896 | #, c-format |
897 | msgid "failed to symlink '%s'" | |
898 | msgstr "无法创建符号链接 '%s'" | |
899 | ||
276ceeaa | 900 | #: merge-recursive.c:801 |
649900bc JX |
901 | #, c-format |
902 | msgid "do not know what to do with %06o %s '%s'" | |
903 | msgstr "不知道如何处理 %06o %s '%s'" | |
904 | ||
276ceeaa | 905 | #: merge-recursive.c:939 |
649900bc JX |
906 | msgid "Failed to execute internal merge" |
907 | msgstr "无法执行内部合并" | |
908 | ||
276ceeaa | 909 | #: merge-recursive.c:943 |
649900bc JX |
910 | #, c-format |
911 | msgid "Unable to add %s to database" | |
912 | msgstr "不能添加 %s 至对象库" | |
913 | ||
276ceeaa | 914 | #: merge-recursive.c:959 |
649900bc JX |
915 | msgid "unsupported object type in the tree" |
916 | msgstr "在树中有不支持的对象类型" | |
917 | ||
276ceeaa | 918 | #: merge-recursive.c:1034 merge-recursive.c:1048 |
649900bc JX |
919 | #, c-format |
920 | msgid "" | |
921 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
922 | "in tree." | |
923 | msgstr "" | |
924 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" | |
925 | "的版本被保留。" | |
926 | ||
276ceeaa | 927 | #: merge-recursive.c:1040 merge-recursive.c:1053 |
649900bc JX |
928 | #, c-format |
929 | msgid "" | |
930 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
931 | "in tree at %s." | |
932 | msgstr "" | |
933 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" | |
934 | "的版本保留于 %8$s 中。" | |
935 | ||
276ceeaa | 936 | #: merge-recursive.c:1094 |
649900bc JX |
937 | msgid "rename" |
938 | msgstr "重命名" | |
939 | ||
276ceeaa | 940 | #: merge-recursive.c:1094 |
649900bc JX |
941 | msgid "renamed" |
942 | msgstr "重命名" | |
943 | ||
276ceeaa | 944 | #: merge-recursive.c:1150 |
649900bc JX |
945 | #, c-format |
946 | msgid "%s is a directory in %s adding as %s instead" | |
947 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
948 | ||
276ceeaa | 949 | #: merge-recursive.c:1172 |
649900bc JX |
950 | #, c-format |
951 | msgid "" | |
952 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" | |
953 | "\"->\"%s\" in \"%s\"%s" | |
954 | msgstr "" | |
955 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " | |
956 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" | |
957 | ||
276ceeaa | 958 | #: merge-recursive.c:1177 |
649900bc JX |
959 | msgid " (left unresolved)" |
960 | msgstr "(留下未解决)" | |
961 | ||
276ceeaa | 962 | #: merge-recursive.c:1231 |
649900bc JX |
963 | #, c-format |
964 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" | |
965 | msgstr "" | |
966 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" | |
967 | "%5$s" | |
968 | ||
276ceeaa | 969 | #: merge-recursive.c:1261 |
649900bc JX |
970 | #, c-format |
971 | msgid "Renaming %s to %s and %s to %s instead" | |
07432cef | 972 | msgstr "而是重命名 %s 至 %s,以及 %s 至 %s" |
649900bc | 973 | |
276ceeaa | 974 | #: merge-recursive.c:1460 |
649900bc JX |
975 | #, c-format |
976 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" | |
977 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
978 | ||
276ceeaa | 979 | #: merge-recursive.c:1470 |
649900bc JX |
980 | #, c-format |
981 | msgid "Adding merged %s" | |
982 | msgstr "添加合并后的 %s" | |
983 | ||
276ceeaa | 984 | #: merge-recursive.c:1475 merge-recursive.c:1677 |
649900bc JX |
985 | #, c-format |
986 | msgid "Adding as %s instead" | |
987 | msgstr "而是以 %s 为名添加" | |
988 | ||
276ceeaa | 989 | #: merge-recursive.c:1526 |
649900bc JX |
990 | #, c-format |
991 | msgid "cannot read object %s" | |
992 | msgstr "不能读取对象 %s" | |
993 | ||
276ceeaa | 994 | #: merge-recursive.c:1529 |
649900bc JX |
995 | #, c-format |
996 | msgid "object %s is not a blob" | |
160fb2b2 | 997 | msgstr "对象 %s 不是一个数据对象" |
649900bc | 998 | |
276ceeaa | 999 | #: merge-recursive.c:1581 |
649900bc JX |
1000 | msgid "modify" |
1001 | msgstr "修改" | |
1002 | ||
276ceeaa | 1003 | #: merge-recursive.c:1581 |
649900bc JX |
1004 | msgid "modified" |
1005 | msgstr "修改" | |
1006 | ||
276ceeaa | 1007 | #: merge-recursive.c:1591 |
649900bc JX |
1008 | msgid "content" |
1009 | msgstr "内容" | |
1010 | ||
276ceeaa | 1011 | #: merge-recursive.c:1598 |
649900bc JX |
1012 | msgid "add/add" |
1013 | msgstr "添加/添加" | |
1014 | ||
276ceeaa | 1015 | #: merge-recursive.c:1632 |
649900bc JX |
1016 | #, c-format |
1017 | msgid "Skipped %s (merged same as existing)" | |
1018 | msgstr "略过 %s(已经做过相同合并)" | |
1019 | ||
276ceeaa | 1020 | #: merge-recursive.c:1646 |
649900bc JX |
1021 | #, c-format |
1022 | msgid "Auto-merging %s" | |
1023 | msgstr "自动合并 %s" | |
1024 | ||
5b04ee3b | 1025 | #: merge-recursive.c:1650 git-submodule.sh:941 |
649900bc JX |
1026 | msgid "submodule" |
1027 | msgstr "子模组" | |
1028 | ||
276ceeaa | 1029 | #: merge-recursive.c:1651 |
649900bc JX |
1030 | #, c-format |
1031 | msgid "CONFLICT (%s): Merge conflict in %s" | |
1032 | msgstr "冲突(%s):合并冲突于 %s" | |
1033 | ||
276ceeaa | 1034 | #: merge-recursive.c:1737 |
649900bc JX |
1035 | #, c-format |
1036 | msgid "Removing %s" | |
1037 | msgstr "删除 %s" | |
1038 | ||
276ceeaa | 1039 | #: merge-recursive.c:1762 |
649900bc JX |
1040 | msgid "file/directory" |
1041 | msgstr "文件/目录" | |
1042 | ||
276ceeaa | 1043 | #: merge-recursive.c:1768 |
649900bc JX |
1044 | msgid "directory/file" |
1045 | msgstr "目录/文件" | |
1046 | ||
276ceeaa | 1047 | #: merge-recursive.c:1773 |
649900bc JX |
1048 | #, c-format |
1049 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" | |
1050 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
1051 | ||
5b04ee3b | 1052 | #: merge-recursive.c:1781 |
649900bc JX |
1053 | #, c-format |
1054 | msgid "Adding %s" | |
1055 | msgstr "添加 %s" | |
1056 | ||
5b04ee3b | 1057 | #: merge-recursive.c:1798 |
649900bc JX |
1058 | msgid "Fatal merge failure, shouldn't happen." |
1059 | msgstr "严重的合并错误,不应发生。" | |
1060 | ||
5b04ee3b | 1061 | #: merge-recursive.c:1817 |
649900bc JX |
1062 | msgid "Already up-to-date!" |
1063 | msgstr "已经是最新的!" | |
1064 | ||
5b04ee3b | 1065 | #: merge-recursive.c:1826 |
649900bc JX |
1066 | #, c-format |
1067 | msgid "merging of trees %s and %s failed" | |
1068 | msgstr "无法合并树 %s 和 %s" | |
1069 | ||
5b04ee3b | 1070 | #: merge-recursive.c:1856 |
649900bc JX |
1071 | #, c-format |
1072 | msgid "Unprocessed path??? %s" | |
1073 | msgstr "未处理的路径??? %s" | |
1074 | ||
5b04ee3b | 1075 | #: merge-recursive.c:1904 |
649900bc JX |
1076 | msgid "Merging:" |
1077 | msgstr "合并:" | |
1078 | ||
5b04ee3b | 1079 | #: merge-recursive.c:1917 |
649900bc | 1080 | #, c-format |
e5e38ce4 JX |
1081 | msgid "found %u common ancestor:" |
1082 | msgid_plural "found %u common ancestors:" | |
1083 | msgstr[0] "发现 %u 个共同祖先:" | |
1084 | msgstr[1] "发现 %u 个共同祖先:" | |
649900bc | 1085 | |
5b04ee3b | 1086 | #: merge-recursive.c:1954 |
649900bc JX |
1087 | msgid "merge returned no commit" |
1088 | msgstr "合并未返回提交" | |
1089 | ||
5b04ee3b | 1090 | #: merge-recursive.c:2011 |
649900bc JX |
1091 | #, c-format |
1092 | msgid "Could not parse object '%s'" | |
1093 | msgstr "不能解析对象 '%s'" | |
1094 | ||
5b04ee3b | 1095 | #: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 |
649900bc JX |
1096 | msgid "Unable to write index." |
1097 | msgstr "不能写入索引。" | |
1098 | ||
6acbf033 | 1099 | #: notes-utils.c:41 |
2e8451e8 JX |
1100 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
1101 | msgstr "不能提交未初始化/未引用的注解树" | |
1102 | ||
1b7f4a34 | 1103 | #: notes-utils.c:100 |
2e8451e8 JX |
1104 | #, c-format |
1105 | msgid "Bad notes.rewriteMode value: '%s'" | |
1106 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
1107 | ||
1b7f4a34 | 1108 | #: notes-utils.c:110 |
2e8451e8 JX |
1109 | #, c-format |
1110 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" | |
1111 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
1112 | ||
1113 | #. TRANSLATORS: The first %s is the name of the | |
1114 | #. environment variable, the second %s is its value | |
1b7f4a34 | 1115 | #: notes-utils.c:137 |
2e8451e8 JX |
1116 | #, c-format |
1117 | msgid "Bad %s value: '%s'" | |
1118 | msgstr "坏的 %s 值:'%s'" | |
1119 | ||
7aea43ff | 1120 | #: object.c:242 |
1003b3a5 JX |
1121 | #, c-format |
1122 | msgid "unable to parse object: %s" | |
1123 | msgstr "不能解析对象:%s" | |
1124 | ||
5b04ee3b | 1125 | #: parse-options.c:572 |
8ada9598 | 1126 | msgid "..." |
81809b99 | 1127 | msgstr "..." |
8ada9598 | 1128 | |
5b04ee3b | 1129 | #: parse-options.c:590 |
81809b99 | 1130 | #, c-format |
8ada9598 | 1131 | msgid "usage: %s" |
81809b99 | 1132 | msgstr "用法:%s" |
8ada9598 JX |
1133 | |
1134 | #. TRANSLATORS: the colon here should align with the | |
1135 | #. one in "usage: %s" translation | |
5b04ee3b | 1136 | #: parse-options.c:594 |
81809b99 | 1137 | #, c-format |
8ada9598 | 1138 | msgid " or: %s" |
81809b99 | 1139 | msgstr " 或:%s" |
8ada9598 JX |
1140 | |
1141 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
5b04ee3b | 1142 | #: parse-options.c:597 |
81809b99 | 1143 | #, c-format |
8ada9598 | 1144 | msgid " %s" |
81809b99 | 1145 | msgstr " %s" |
8ada9598 | 1146 | |
5b04ee3b | 1147 | #: parse-options.c:631 |
63af42fe JX |
1148 | msgid "-NUM" |
1149 | msgstr "-数字" | |
1150 | ||
94550ed3 JX |
1151 | #: parse-options-cb.c:108 |
1152 | #, c-format | |
1153 | msgid "malformed object name '%s'" | |
1154 | msgstr "非法的对象名 '%s'" | |
1155 | ||
5b04ee3b | 1156 | #: path.c:796 |
94550ed3 JX |
1157 | #, c-format |
1158 | msgid "Could not make %s writable by group" | |
1159 | msgstr "不能设置 %s 为组可写" | |
1160 | ||
cfff71a9 | 1161 | #: pathspec.c:133 |
90314792 | 1162 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
160fb2b2 | 1163 | msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" |
90314792 | 1164 | |
cfff71a9 | 1165 | #: pathspec.c:143 |
90314792 JX |
1166 | msgid "" |
1167 | "global 'literal' pathspec setting is incompatible with all other global " | |
1168 | "pathspec settings" | |
160fb2b2 | 1169 | msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" |
90314792 | 1170 | |
cfff71a9 | 1171 | #: pathspec.c:177 |
90314792 | 1172 | msgid "invalid parameter for pathspec magic 'prefix'" |
160fb2b2 | 1173 | msgstr "路径规格包含无效的神奇前缀" |
90314792 | 1174 | |
cfff71a9 | 1175 | #: pathspec.c:183 |
90314792 JX |
1176 | #, c-format |
1177 | msgid "Invalid pathspec magic '%.*s' in '%s'" | |
160fb2b2 | 1178 | msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" |
90314792 | 1179 | |
cfff71a9 | 1180 | #: pathspec.c:187 |
90314792 JX |
1181 | #, c-format |
1182 | msgid "Missing ')' at the end of pathspec magic in '%s'" | |
160fb2b2 | 1183 | msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" |
90314792 | 1184 | |
cfff71a9 | 1185 | #: pathspec.c:205 |
90314792 JX |
1186 | #, c-format |
1187 | msgid "Unimplemented pathspec magic '%c' in '%s'" | |
160fb2b2 | 1188 | msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" |
90314792 | 1189 | |
cfff71a9 | 1190 | #: pathspec.c:230 |
a77c07d9 | 1191 | #, c-format |
90314792 JX |
1192 | msgid "%s: 'literal' and 'glob' are incompatible" |
1193 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
a77c07d9 | 1194 | |
cfff71a9 | 1195 | #: pathspec.c:241 |
a77c07d9 | 1196 | #, c-format |
90314792 | 1197 | msgid "%s: '%s' is outside repository" |
160fb2b2 | 1198 | msgstr "%s:'%s' 在仓库之外" |
a77c07d9 | 1199 | |
cfff71a9 | 1200 | #: pathspec.c:291 |
90314792 JX |
1201 | #, c-format |
1202 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
160fb2b2 | 1203 | msgstr "路径规格 '%s' 在子模组 '%.*s' 中" |
90314792 | 1204 | |
cfff71a9 | 1205 | #: pathspec.c:353 |
90314792 JX |
1206 | #, c-format |
1207 | msgid "%s: pathspec magic not supported by this command: %s" | |
160fb2b2 | 1208 | msgstr "%s:路径规格神奇前缀不被此命令支持:%s" |
90314792 | 1209 | |
276ceeaa | 1210 | #: pathspec.c:433 |
90314792 JX |
1211 | #, c-format |
1212 | msgid "pathspec '%s' is beyond a symbolic link" | |
160fb2b2 | 1213 | msgstr "路径规格 '%s' 位于符号链接中" |
90314792 | 1214 | |
276ceeaa | 1215 | #: pathspec.c:442 |
cfff71a9 JX |
1216 | msgid "" |
1217 | "There is nothing to exclude from by :(exclude) patterns.\n" | |
1218 | "Perhaps you forgot to add either ':/' or '.' ?" | |
1219 | msgstr "" | |
1220 | "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" | |
1221 | "添加 ':/' 或 '.' ?" | |
1222 | ||
5b04ee3b | 1223 | #: pretty.c:971 |
220c313c JX |
1224 | msgid "unable to parse --pretty format" |
1225 | msgstr "不能解析 --pretty 格式" | |
1226 | ||
94550ed3 | 1227 | #: progress.c:235 |
6c94aba5 JX |
1228 | msgid "done" |
1229 | msgstr "完成" | |
1230 | ||
94550ed3 | 1231 | #: read-cache.c:1281 |
6c94aba5 JX |
1232 | #, c-format |
1233 | msgid "" | |
1234 | "index.version set, but the value is invalid.\n" | |
1235 | "Using version %i" | |
1236 | msgstr "" | |
1237 | "设置了 index.version,但是取值无效。\n" | |
1238 | "使用版本 %i" | |
1239 | ||
94550ed3 | 1240 | #: read-cache.c:1291 |
6c94aba5 JX |
1241 | #, c-format |
1242 | msgid "" | |
1243 | "GIT_INDEX_VERSION set, but the value is invalid.\n" | |
1244 | "Using version %i" | |
1245 | msgstr "" | |
1246 | "设置了 GIT_INDEX_VERSION,但是取值无效。\n" | |
1247 | "使用版本 %i" | |
1248 | ||
5b04ee3b JX |
1249 | #: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 |
1250 | #: builtin/merge.c:995 | |
1b7f4a34 JX |
1251 | #, c-format |
1252 | msgid "Could not open '%s' for writing" | |
1253 | msgstr "无法打开 '%s' 进行写入" | |
1254 | ||
5b04ee3b | 1255 | #: refs/files-backend.c:2243 |
1b7f4a34 JX |
1256 | #, c-format |
1257 | msgid "could not delete reference %s: %s" | |
1258 | msgstr "无法删除引用 %s:%s" | |
1259 | ||
5b04ee3b | 1260 | #: refs/files-backend.c:2246 |
1b7f4a34 JX |
1261 | #, c-format |
1262 | msgid "could not delete references: %s" | |
1263 | msgstr "无法删除引用:%s" | |
1264 | ||
5b04ee3b | 1265 | #: refs/files-backend.c:2255 |
1b7f4a34 JX |
1266 | #, c-format |
1267 | msgid "could not remove reference %s" | |
1268 | msgstr "无法删除引用 %s" | |
1269 | ||
276ceeaa | 1270 | #: ref-filter.c:55 |
94550ed3 | 1271 | #, c-format |
276ceeaa JX |
1272 | msgid "expected format: %%(color:<color>)" |
1273 | msgstr "期望的格式:%%(color:<color>)" | |
1274 | ||
1275 | #: ref-filter.c:57 | |
1276 | #, c-format | |
1277 | msgid "unrecognized color: %%(color:%s)" | |
1278 | msgstr "未能识别的颜色:%%(color:%s)" | |
1279 | ||
1280 | #: ref-filter.c:71 | |
1281 | #, c-format | |
1282 | msgid "unrecognized format: %%(%s)" | |
1283 | msgstr "未能识别的格式:%%(%s)" | |
94550ed3 | 1284 | |
3495628d JX |
1285 | #: ref-filter.c:77 |
1286 | #, c-format | |
1287 | msgid "%%(body) does not take arguments" | |
1288 | msgstr "%%(body) 不带参数" | |
1289 | ||
1290 | #: ref-filter.c:84 | |
1291 | #, c-format | |
1292 | msgid "%%(subject) does not take arguments" | |
1293 | msgstr "%%(subject) 不带参数" | |
1294 | ||
276ceeaa | 1295 | #: ref-filter.c:101 |
94550ed3 JX |
1296 | #, c-format |
1297 | msgid "positive value expected contents:lines=%s" | |
1298 | msgstr "要为 contents:lines=%s 提供一个正数" | |
1299 | ||
276ceeaa | 1300 | #: ref-filter.c:103 |
94550ed3 | 1301 | #, c-format |
276ceeaa JX |
1302 | msgid "unrecognized %%(contents) argument: %s" |
1303 | msgstr "未能识别的 %%(contents) 参数:%s" | |
94550ed3 | 1304 | |
276ceeaa JX |
1305 | #: ref-filter.c:113 |
1306 | #, c-format | |
1307 | msgid "unrecognized %%(objectname) argument: %s" | |
1308 | msgstr "未能识别的 %%(objectname) 参数:%s" | |
1b7f4a34 | 1309 | |
276ceeaa | 1310 | #: ref-filter.c:135 |
94550ed3 JX |
1311 | #, c-format |
1312 | msgid "expected format: %%(align:<width>,<position>)" | |
1313 | msgstr "期望的格式:%%(align:<width>,<position>)" | |
1314 | ||
276ceeaa JX |
1315 | #: ref-filter.c:147 |
1316 | #, c-format | |
1317 | msgid "unrecognized position:%s" | |
1318 | msgstr "未能识别的位置:%s" | |
1319 | ||
1320 | #: ref-filter.c:151 | |
94550ed3 | 1321 | #, c-format |
276ceeaa JX |
1322 | msgid "unrecognized width:%s" |
1323 | msgstr "未能识别的宽度:%s" | |
94550ed3 | 1324 | |
276ceeaa JX |
1325 | #: ref-filter.c:157 |
1326 | #, c-format | |
1327 | msgid "unrecognized %%(align) argument: %s" | |
1328 | msgstr "未能识别的 %%(align) 参数:%s" | |
1329 | ||
1330 | #: ref-filter.c:161 | |
94550ed3 JX |
1331 | #, c-format |
1332 | msgid "positive width expected with the %%(align) atom" | |
1333 | msgstr "元素 %%(align) 需要一个正数的宽度" | |
1334 | ||
3495628d JX |
1335 | #: ref-filter.c:244 |
1336 | #, c-format | |
1337 | msgid "malformed field name: %.*s" | |
1338 | msgstr "非法的字段名:%.*s" | |
1339 | ||
1340 | #: ref-filter.c:270 | |
1341 | #, c-format | |
1342 | msgid "unknown field name: %.*s" | |
1343 | msgstr "未知的字段名:%.*s" | |
1344 | ||
276ceeaa JX |
1345 | #: ref-filter.c:372 |
1346 | #, c-format | |
1347 | msgid "format: %%(end) atom used without corresponding atom" | |
1348 | msgstr "格式:使用了 %%(end) 元素却没有它的对应元素" | |
1349 | ||
3495628d JX |
1350 | #: ref-filter.c:424 |
1351 | #, c-format | |
1352 | msgid "malformed format string %s" | |
1353 | msgstr "非法的格式化字符串 %s" | |
1354 | ||
1355 | #: ref-filter.c:878 | |
1356 | msgid ":strip= requires a positive integer argument" | |
1357 | msgstr ":strip= 需要一个正整型参数" | |
1358 | ||
1359 | #: ref-filter.c:883 | |
1360 | #, c-format | |
1361 | msgid "ref '%s' does not have %ld components to :strip" | |
26e4cbec | 1362 | msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件" |
3495628d JX |
1363 | |
1364 | #: ref-filter.c:1046 | |
1365 | #, c-format | |
1366 | msgid "unknown %.*s format %s" | |
26e4cbec | 1367 | msgstr "未知的 %.*s 格式 %s" |
3495628d JX |
1368 | |
1369 | #: ref-filter.c:1066 ref-filter.c:1097 | |
1370 | #, c-format | |
1371 | msgid "missing object %s for %s" | |
26e4cbec | 1372 | msgstr "缺失 %2$s 的对象 %1$s" |
3495628d JX |
1373 | |
1374 | #: ref-filter.c:1069 ref-filter.c:1100 | |
1375 | #, c-format | |
1376 | msgid "parse_object_buffer failed on %s for %s" | |
1377 | msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" | |
1378 | ||
276ceeaa | 1379 | #: ref-filter.c:1311 |
94550ed3 JX |
1380 | #, c-format |
1381 | msgid "malformed object at '%s'" | |
1382 | msgstr "非法的对象于 '%s'" | |
1383 | ||
3495628d JX |
1384 | #: ref-filter.c:1373 |
1385 | #, c-format | |
1386 | msgid "ignoring ref with broken name %s" | |
1387 | msgstr "忽略带有错误名称 %s 的引用" | |
1388 | ||
1389 | #: ref-filter.c:1378 | |
1390 | #, c-format | |
1391 | msgid "ignoring broken ref %s" | |
1392 | msgstr "忽略损坏的引用 %s" | |
1393 | ||
276ceeaa | 1394 | #: ref-filter.c:1651 |
94550ed3 JX |
1395 | #, c-format |
1396 | msgid "format: %%(end) atom missing" | |
1397 | msgstr "格式:缺少 %%(end) 元素" | |
1398 | ||
276ceeaa | 1399 | #: ref-filter.c:1705 |
94550ed3 JX |
1400 | #, c-format |
1401 | msgid "malformed object name %s" | |
1402 | msgstr "非法的对象名 %s" | |
1403 | ||
5b04ee3b | 1404 | #: remote.c:746 |
cfff71a9 JX |
1405 | #, c-format |
1406 | msgid "Cannot fetch both %s and %s to %s" | |
1407 | msgstr "不能同时获取 %s 和 %s 至 %s" | |
1408 | ||
5b04ee3b | 1409 | #: remote.c:750 |
cfff71a9 JX |
1410 | #, c-format |
1411 | msgid "%s usually tracks %s, not %s" | |
1412 | msgstr "%s 通常跟踪 %s,而非 %s" | |
1413 | ||
5b04ee3b | 1414 | #: remote.c:754 |
cfff71a9 JX |
1415 | #, c-format |
1416 | msgid "%s tracks both %s and %s" | |
1417 | msgstr "%s 同时跟踪 %s 和 %s" | |
1418 | ||
5b04ee3b | 1419 | #: remote.c:762 |
cfff71a9 JX |
1420 | msgid "Internal error" |
1421 | msgstr "内部错误" | |
1422 | ||
5b04ee3b | 1423 | #: remote.c:1678 remote.c:1721 |
7aea43ff JX |
1424 | msgid "HEAD does not point to a branch" |
1425 | msgstr "HEAD 没有指向一个分支" | |
1426 | ||
5b04ee3b | 1427 | #: remote.c:1687 |
7aea43ff JX |
1428 | #, c-format |
1429 | msgid "no such branch: '%s'" | |
1430 | msgstr "没有此分支:'%s'" | |
1431 | ||
5b04ee3b | 1432 | #: remote.c:1690 |
7aea43ff JX |
1433 | #, c-format |
1434 | msgid "no upstream configured for branch '%s'" | |
1435 | msgstr "尚未给分支 '%s' 设置上游" | |
1436 | ||
5b04ee3b | 1437 | #: remote.c:1696 |
7aea43ff JX |
1438 | #, c-format |
1439 | msgid "upstream branch '%s' not stored as a remote-tracking branch" | |
1440 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
1441 | ||
5b04ee3b | 1442 | #: remote.c:1711 |
7aea43ff JX |
1443 | #, c-format |
1444 | msgid "push destination '%s' on remote '%s' has no local tracking branch" | |
1445 | msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" | |
1446 | ||
5b04ee3b | 1447 | #: remote.c:1726 |
7aea43ff JX |
1448 | #, c-format |
1449 | msgid "branch '%s' has no remote for pushing" | |
1450 | msgstr "分支 '%s' 没有设置要推送的远程服务器" | |
1451 | ||
5b04ee3b | 1452 | #: remote.c:1737 |
7aea43ff JX |
1453 | #, c-format |
1454 | msgid "push refspecs for '%s' do not include '%s'" | |
160fb2b2 | 1455 | msgstr "向 '%s' 推送引用规格未包含 '%s'" |
7aea43ff | 1456 | |
5b04ee3b | 1457 | #: remote.c:1750 |
7aea43ff JX |
1458 | msgid "push has no destination (push.default is 'nothing')" |
1459 | msgstr "推送无目标(push.default 是 'nothing')" | |
1460 | ||
5b04ee3b | 1461 | #: remote.c:1772 |
7aea43ff JX |
1462 | msgid "cannot resolve 'simple' push to a single destination" |
1463 | msgstr "无法解析 'simple' 推送至一个单独的目标" | |
1464 | ||
5b04ee3b | 1465 | #: remote.c:2074 |
90314792 JX |
1466 | #, c-format |
1467 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
1468 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
1469 | ||
5b04ee3b | 1470 | #: remote.c:2078 |
90314792 JX |
1471 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
1472 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
1473 | ||
5b04ee3b | 1474 | #: remote.c:2081 |
90314792 JX |
1475 | #, c-format |
1476 | msgid "Your branch is up-to-date with '%s'.\n" | |
1477 | msgstr "您的分支与上游分支 '%s' 一致。\n" | |
1478 | ||
5b04ee3b | 1479 | #: remote.c:2085 |
c04f5ac3 JX |
1480 | #, c-format |
1481 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
1482 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
1483 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
5ae481e0 | 1484 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" |
c04f5ac3 | 1485 | |
5b04ee3b | 1486 | #: remote.c:2091 |
07432cef WS |
1487 | msgid " (use \"git push\" to publish your local commits)\n" |
1488 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
1489 | ||
5b04ee3b | 1490 | #: remote.c:2094 |
c04f5ac3 JX |
1491 | #, c-format |
1492 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
1493 | msgid_plural "" | |
1494 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
90e6ef53 | 1495 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
5ae481e0 | 1496 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
c04f5ac3 | 1497 | |
07432cef | 1498 | # 译者:注意保持前导空格 |
5b04ee3b | 1499 | #: remote.c:2102 |
07432cef WS |
1500 | msgid " (use \"git pull\" to update your local branch)\n" |
1501 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
1502 | ||
5b04ee3b | 1503 | #: remote.c:2105 |
c04f5ac3 JX |
1504 | #, c-format |
1505 | msgid "" | |
1506 | "Your branch and '%s' have diverged,\n" | |
1507 | "and have %d and %d different commit each, respectively.\n" | |
1508 | msgid_plural "" | |
1509 | "Your branch and '%s' have diverged,\n" | |
1510 | "and have %d and %d different commits each, respectively.\n" | |
1511 | msgstr[0] "" | |
1512 | "您的分支和 '%s' 出现了偏离,\n" | |
195febda | 1513 | "并且分别有 %d 和 %d 处不同的提交。\n" |
5ae481e0 JX |
1514 | msgstr[1] "" |
1515 | "您的分支和 '%s' 出现了偏离,\n" | |
195febda | 1516 | "并且分别有 %d 和 %d 处不同的提交。\n" |
c04f5ac3 | 1517 | |
07432cef | 1518 | # 译者:注意保持前导空格 |
5b04ee3b | 1519 | #: remote.c:2115 |
07432cef WS |
1520 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
1521 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
1522 | ||
5b04ee3b | 1523 | #: revision.c:2142 |
1b7f4a34 JX |
1524 | msgid "your current branch appears to be broken" |
1525 | msgstr "您的当前分支好像被损坏" | |
1526 | ||
5b04ee3b | 1527 | #: revision.c:2145 |
1b7f4a34 JX |
1528 | #, c-format |
1529 | msgid "your current branch '%s' does not have any commits yet" | |
1530 | msgstr "您的当前分支 '%s' 尚无任何提交" | |
1531 | ||
5b04ee3b | 1532 | #: revision.c:2339 |
814ff314 JX |
1533 | msgid "--first-parent is incompatible with --bisect" |
1534 | msgstr "--first-parent 与 --bisect 不兼容" | |
1535 | ||
276ceeaa | 1536 | #: run-command.c:92 |
2e8451e8 JX |
1537 | msgid "open /dev/null failed" |
1538 | msgstr "不能打开 /dev/null" | |
1539 | ||
276ceeaa | 1540 | #: run-command.c:94 |
2e8451e8 JX |
1541 | #, c-format |
1542 | msgid "dup2(%d,%d) failed" | |
1543 | msgstr "不能调用 dup2(%d,%d)" | |
1544 | ||
1b7f4a34 | 1545 | #: send-pack.c:295 |
220c313c JX |
1546 | msgid "failed to sign the push certificate" |
1547 | msgstr "无法为推送证书签名" | |
1548 | ||
1b7f4a34 | 1549 | #: send-pack.c:404 |
220c313c JX |
1550 | msgid "the receiving end does not support --signed push" |
1551 | msgstr "接收端不支持签名推送" | |
1552 | ||
1b7f4a34 JX |
1553 | #: send-pack.c:406 |
1554 | msgid "" | |
1555 | "not sending a push certificate since the receiving end does not support --" | |
1556 | "signed push" | |
1557 | msgstr "未发送推送证书,因为接收端不支持签名推送" | |
1558 | ||
1559 | #: send-pack.c:418 | |
44f518e6 JX |
1560 | msgid "the receiving end does not support --atomic push" |
1561 | msgstr "接收端不支持原子推送" | |
814ff314 | 1562 | |
276ceeaa | 1563 | #: sequencer.c:174 |
14c8bced JX |
1564 | msgid "" |
1565 | "after resolving the conflicts, mark the corrected paths\n" | |
1566 | "with 'git add <paths>' or 'git rm <paths>'" | |
1567 | msgstr "" | |
d9d56b23 | 1568 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" |
14c8bced JX |
1569 | "命令标记修正后的文件" |
1570 | ||
276ceeaa | 1571 | #: sequencer.c:177 |
c04f5ac3 JX |
1572 | msgid "" |
1573 | "after resolving the conflicts, mark the corrected paths\n" | |
1574 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
1575 | "and commit the result with 'git commit'" | |
1576 | msgstr "" | |
d9d56b23 | 1577 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" |
c04f5ac3 JX |
1578 | "对修正后的文件做标记,然后用 'git commit' 提交" |
1579 | ||
5b04ee3b | 1580 | #: sequencer.c:190 sequencer.c:833 sequencer.c:912 |
c04f5ac3 JX |
1581 | #, c-format |
1582 | msgid "Could not write to %s" | |
1583 | msgstr "不能写入 %s" | |
1584 | ||
276ceeaa | 1585 | #: sequencer.c:193 |
c04f5ac3 JX |
1586 | #, c-format |
1587 | msgid "Error wrapping up %s" | |
1588 | msgstr "错误收尾 %s" | |
1589 | ||
276ceeaa | 1590 | #: sequencer.c:208 |
c04f5ac3 JX |
1591 | msgid "Your local changes would be overwritten by cherry-pick." |
1592 | msgstr "您的本地修改将被拣选操作覆盖。" | |
1593 | ||
276ceeaa | 1594 | #: sequencer.c:210 |
c04f5ac3 JX |
1595 | msgid "Your local changes would be overwritten by revert." |
1596 | msgstr "您的本地修改将被还原操作覆盖。" | |
1597 | ||
276ceeaa | 1598 | #: sequencer.c:213 |
c04f5ac3 JX |
1599 | msgid "Commit your changes or stash them to proceed." |
1600 | msgstr "提交您的修改或保存进度后再继续。" | |
1601 | ||
1602 | #. TRANSLATORS: %s will be "revert" or "cherry-pick" | |
276ceeaa | 1603 | #: sequencer.c:300 |
c04f5ac3 JX |
1604 | #, c-format |
1605 | msgid "%s: Unable to write new index file" | |
90e6ef53 | 1606 | msgstr "%s:无法写入新索引文件" |
c04f5ac3 | 1607 | |
276ceeaa | 1608 | #: sequencer.c:318 |
8ada9598 | 1609 | msgid "Could not resolve HEAD commit\n" |
81809b99 | 1610 | msgstr "不能解析 HEAD 提交\n" |
8ada9598 | 1611 | |
276ceeaa | 1612 | #: sequencer.c:338 |
8ada9598 | 1613 | msgid "Unable to update cache tree\n" |
81809b99 | 1614 | msgstr "不能更新缓存\n" |
8ada9598 | 1615 | |
276ceeaa | 1616 | #: sequencer.c:390 |
81809b99 | 1617 | #, c-format |
8ada9598 | 1618 | msgid "Could not parse commit %s\n" |
81809b99 | 1619 | msgstr "不能解析提交 %s\n" |
8ada9598 | 1620 | |
276ceeaa | 1621 | #: sequencer.c:395 |
81809b99 | 1622 | #, c-format |
8ada9598 | 1623 | msgid "Could not parse parent commit %s\n" |
81809b99 | 1624 | msgstr "不能解析父提交 %s\n" |
8ada9598 | 1625 | |
276ceeaa | 1626 | #: sequencer.c:460 |
c04f5ac3 | 1627 | msgid "Your index file is unmerged." |
90e6ef53 | 1628 | msgstr "您的索引文件未完成合并。" |
c04f5ac3 | 1629 | |
276ceeaa | 1630 | #: sequencer.c:479 |
c04f5ac3 JX |
1631 | #, c-format |
1632 | msgid "Commit %s is a merge but no -m option was given." | |
1633 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
1634 | ||
276ceeaa | 1635 | #: sequencer.c:487 |
c04f5ac3 JX |
1636 | #, c-format |
1637 | msgid "Commit %s does not have parent %d" | |
1638 | msgstr "提交 %s 没有父提交 %d" | |
1639 | ||
276ceeaa | 1640 | #: sequencer.c:491 |
c04f5ac3 JX |
1641 | #, c-format |
1642 | msgid "Mainline was specified but commit %s is not a merge." | |
90e6ef53 | 1643 | msgstr "指定了主线但提交 %s 不是一个合并。" |
c04f5ac3 JX |
1644 | |
1645 | #. TRANSLATORS: The first %s will be "revert" or | |
1646 | #. "cherry-pick", the second %s a SHA1 | |
276ceeaa | 1647 | #: sequencer.c:504 |
c04f5ac3 JX |
1648 | #, c-format |
1649 | msgid "%s: cannot parse parent commit %s" | |
1650 | msgstr "%s:不能解析父提交 %s" | |
1651 | ||
276ceeaa | 1652 | #: sequencer.c:508 |
c04f5ac3 JX |
1653 | #, c-format |
1654 | msgid "Cannot get commit message for %s" | |
1655 | msgstr "不能得到 %s 的提交说明" | |
1656 | ||
276ceeaa | 1657 | #: sequencer.c:594 |
c04f5ac3 JX |
1658 | #, c-format |
1659 | msgid "could not revert %s... %s" | |
1660 | msgstr "不能还原 %s... %s" | |
1661 | ||
276ceeaa | 1662 | #: sequencer.c:595 |
c04f5ac3 JX |
1663 | #, c-format |
1664 | msgid "could not apply %s... %s" | |
1665 | msgstr "不能应用 %s... %s" | |
1666 | ||
276ceeaa | 1667 | #: sequencer.c:630 |
c04f5ac3 JX |
1668 | msgid "empty commit set passed" |
1669 | msgstr "提供了空的提交集" | |
1670 | ||
276ceeaa | 1671 | #: sequencer.c:638 |
c04f5ac3 JX |
1672 | #, c-format |
1673 | msgid "git %s: failed to read the index" | |
90e6ef53 | 1674 | msgstr "git %s:无法读取索引" |
c04f5ac3 | 1675 | |
276ceeaa | 1676 | #: sequencer.c:642 |
c04f5ac3 JX |
1677 | #, c-format |
1678 | msgid "git %s: failed to refresh the index" | |
90e6ef53 | 1679 | msgstr "git %s:无法刷新索引" |
c04f5ac3 | 1680 | |
276ceeaa | 1681 | #: sequencer.c:702 |
c04f5ac3 JX |
1682 | #, c-format |
1683 | msgid "Cannot %s during a %s" | |
90e6ef53 | 1684 | msgstr "无法 %s 在一个 %s 过程中" |
c04f5ac3 | 1685 | |
276ceeaa | 1686 | #: sequencer.c:724 |
c04f5ac3 JX |
1687 | #, c-format |
1688 | msgid "Could not parse line %d." | |
90e6ef53 | 1689 | msgstr "不能解析第 %d 行。" |
c04f5ac3 | 1690 | |
276ceeaa | 1691 | #: sequencer.c:729 |
c04f5ac3 | 1692 | msgid "No commits parsed." |
7e238ab7 | 1693 | msgstr "没有提交被解析。" |
c04f5ac3 | 1694 | |
276ceeaa | 1695 | #: sequencer.c:741 |
c04f5ac3 JX |
1696 | #, c-format |
1697 | msgid "Could not open %s" | |
1698 | msgstr "不能打开 %s" | |
1699 | ||
276ceeaa | 1700 | #: sequencer.c:745 |
c04f5ac3 JX |
1701 | #, c-format |
1702 | msgid "Could not read %s." | |
1703 | msgstr "不能读取 %s。" | |
1704 | ||
276ceeaa | 1705 | #: sequencer.c:752 |
c04f5ac3 JX |
1706 | #, c-format |
1707 | msgid "Unusable instruction sheet: %s" | |
1708 | msgstr "无用的指令表单:%s" | |
1709 | ||
276ceeaa | 1710 | #: sequencer.c:782 |
c04f5ac3 JX |
1711 | #, c-format |
1712 | msgid "Invalid key: %s" | |
1713 | msgstr "无效键名:%s" | |
1714 | ||
276ceeaa | 1715 | #: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52 |
c04f5ac3 JX |
1716 | #, c-format |
1717 | msgid "Invalid value for %s: %s" | |
81809b99 | 1718 | msgstr "%s 的值无效:%s" |
c04f5ac3 | 1719 | |
276ceeaa | 1720 | #: sequencer.c:795 |
c04f5ac3 JX |
1721 | #, c-format |
1722 | msgid "Malformed options sheet: %s" | |
1723 | msgstr "非法的选项表单:%s" | |
1724 | ||
276ceeaa | 1725 | #: sequencer.c:814 |
c04f5ac3 JX |
1726 | msgid "a cherry-pick or revert is already in progress" |
1727 | msgstr "一个拣选或还原操作已在进行" | |
1728 | ||
276ceeaa | 1729 | #: sequencer.c:815 |
c04f5ac3 JX |
1730 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
1731 | msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" | |
1732 | ||
276ceeaa | 1733 | #: sequencer.c:819 |
c04f5ac3 JX |
1734 | #, c-format |
1735 | msgid "Could not create sequencer directory %s" | |
90e6ef53 | 1736 | msgstr "不能创建序列目录 %s" |
c04f5ac3 | 1737 | |
5b04ee3b | 1738 | #: sequencer.c:835 sequencer.c:916 |
c04f5ac3 JX |
1739 | #, c-format |
1740 | msgid "Error wrapping up %s." | |
1741 | msgstr "错误收尾 %s。" | |
1742 | ||
5b04ee3b | 1743 | #: sequencer.c:854 sequencer.c:986 |
c04f5ac3 | 1744 | msgid "no cherry-pick or revert in progress" |
195febda | 1745 | msgstr "拣选或还原操作并未进行" |
c04f5ac3 | 1746 | |
276ceeaa | 1747 | #: sequencer.c:856 |
c04f5ac3 JX |
1748 | msgid "cannot resolve HEAD" |
1749 | msgstr "不能解析 HEAD" | |
1750 | ||
276ceeaa | 1751 | #: sequencer.c:858 |
c04f5ac3 | 1752 | msgid "cannot abort from a branch yet to be born" |
90e6ef53 | 1753 | msgstr "不能从尚未建立的分支终止" |
c04f5ac3 | 1754 | |
5b04ee3b | 1755 | #: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 |
c04f5ac3 | 1756 | #, c-format |
5b04ee3b JX |
1757 | msgid "cannot open %s" |
1758 | msgstr "不能打开 %s" | |
c04f5ac3 | 1759 | |
5b04ee3b | 1760 | #: sequencer.c:880 |
c04f5ac3 JX |
1761 | #, c-format |
1762 | msgid "cannot read %s: %s" | |
1763 | msgstr "不能读取 %s:%s" | |
1764 | ||
5b04ee3b | 1765 | #: sequencer.c:881 |
c04f5ac3 | 1766 | msgid "unexpected end of file" |
9aafc933 | 1767 | msgstr "意外的文件结束" |
c04f5ac3 | 1768 | |
5b04ee3b | 1769 | #: sequencer.c:887 |
c04f5ac3 JX |
1770 | #, c-format |
1771 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
90e6ef53 | 1772 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" |
c04f5ac3 | 1773 | |
5b04ee3b | 1774 | #: sequencer.c:909 |
c04f5ac3 JX |
1775 | #, c-format |
1776 | msgid "Could not format %s." | |
1777 | msgstr "不能格式化 %s。" | |
1778 | ||
5b04ee3b | 1779 | #: sequencer.c:1054 |
4dcdc3d8 JX |
1780 | #, c-format |
1781 | msgid "%s: can't cherry-pick a %s" | |
1782 | msgstr "%s:不能拣选一个%s" | |
1783 | ||
5b04ee3b | 1784 | #: sequencer.c:1057 |
4dcdc3d8 JX |
1785 | #, c-format |
1786 | msgid "%s: bad revision" | |
1787 | msgstr "%s:错误的版本" | |
1788 | ||
5b04ee3b | 1789 | #: sequencer.c:1091 |
c04f5ac3 JX |
1790 | msgid "Can't revert as initial commit" |
1791 | msgstr "不能作为初始提交还原" | |
1792 | ||
5b04ee3b | 1793 | #: sequencer.c:1092 |
c04f5ac3 JX |
1794 | msgid "Can't cherry-pick into empty head" |
1795 | msgstr "不能拣选到空分支" | |
1796 | ||
5b04ee3b | 1797 | #: setup.c:248 |
7aea43ff JX |
1798 | #, c-format |
1799 | msgid "failed to read %s" | |
1800 | msgstr "无法读取 %s" | |
1801 | ||
5b04ee3b JX |
1802 | #: setup.c:468 |
1803 | #, c-format | |
1804 | msgid "Expected git repo version <= %d, found %d" | |
1805 | msgstr "期望 git 仓库版本 <= %d,却得到 %d" | |
1806 | ||
1807 | #: setup.c:476 | |
1808 | msgid "unknown repository extensions found:" | |
1809 | msgstr "发现未知的仓库扩展:" | |
1810 | ||
3495628d JX |
1811 | #: sha1_file.c:1080 |
1812 | msgid "offset before end of packfile (broken .idx?)" | |
1813 | msgstr "偏移量在包文件结束之前(损坏的 .idx?)" | |
1814 | ||
5b04ee3b | 1815 | #: sha1_file.c:2458 |
3495628d JX |
1816 | #, c-format |
1817 | msgid "offset before start of pack index for %s (corrupt index?)" | |
1818 | msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)" | |
1819 | ||
5b04ee3b | 1820 | #: sha1_file.c:2462 |
3495628d JX |
1821 | #, c-format |
1822 | msgid "offset beyond end of pack index for %s (truncated index?)" | |
26e4cbec | 1823 | msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)" |
3495628d | 1824 | |
276ceeaa | 1825 | #: sha1_name.c:462 |
2e8451e8 JX |
1826 | msgid "" |
1827 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
1828 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
1829 | "may be created by mistake. For example,\n" | |
1830 | "\n" | |
1831 | " git checkout -b $br $(git rev-parse ...)\n" | |
1832 | "\n" | |
1833 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
1834 | "examine these refs and maybe delete them. Turn this message off by\n" | |
b1894384 | 1835 | "running \"git config advice.objectNameWarning false\"" |
2e8451e8 JX |
1836 | msgstr "" |
1837 | "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n" | |
1838 | "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n" | |
1839 | "\n" | |
1840 | " git checkout -b $br $(git rev-parse ...)\n" | |
1841 | "\n" | |
1842 | "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n" | |
b1894384 | 1843 | "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" |
2e8451e8 JX |
1844 | "命令关闭本消息通知。" |
1845 | ||
5b04ee3b | 1846 | #: submodule.c:64 submodule.c:98 |
90314792 JX |
1847 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
1848 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
1849 | ||
5b04ee3b | 1850 | #: submodule.c:68 submodule.c:102 |
90314792 JX |
1851 | #, c-format |
1852 | msgid "Could not find section in .gitmodules where path=%s" | |
1853 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
1854 | ||
5b04ee3b | 1855 | #: submodule.c:76 |
90314792 JX |
1856 | #, c-format |
1857 | msgid "Could not update .gitmodules entry %s" | |
1858 | msgstr "不能更新 .gitmodules 条目 %s" | |
1859 | ||
5b04ee3b | 1860 | #: submodule.c:109 |
90314792 JX |
1861 | #, c-format |
1862 | msgid "Could not remove .gitmodules entry for %s" | |
1863 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
1864 | ||
5b04ee3b | 1865 | #: submodule.c:120 |
90314792 JX |
1866 | msgid "staging updated .gitmodules failed" |
1867 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
1868 | ||
5b04ee3b JX |
1869 | #: submodule.c:177 |
1870 | msgid "negative values not allowed for submodule.fetchJobs" | |
1871 | msgstr "submodule.fetchJobs 不允许为负值" | |
1872 | ||
1873 | #: submodule-config.c:355 | |
1874 | #, c-format | |
1875 | msgid "invalid value for %s" | |
1876 | msgstr "%s 的值无效" | |
1877 | ||
3495628d JX |
1878 | #: trailer.c:237 |
1879 | #, c-format | |
1880 | msgid "running trailer command '%s' failed" | |
1881 | msgstr "执行 trailer 命令 '%s' 失败" | |
1882 | ||
276ceeaa JX |
1883 | #: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558 |
1884 | #: trailer.c:562 | |
220c313c JX |
1885 | #, c-format |
1886 | msgid "unknown value '%s' for key '%s'" | |
1887 | msgstr "键 '%2$s' 的未知取值 '%1$s'" | |
1888 | ||
276ceeaa | 1889 | #: trailer.c:544 trailer.c:549 builtin/remote.c:289 |
220c313c JX |
1890 | #, c-format |
1891 | msgid "more than one %s" | |
1892 | msgstr "多于一个 %s" | |
1893 | ||
276ceeaa | 1894 | #: trailer.c:582 |
220c313c | 1895 | #, c-format |
9aeb4c2b JX |
1896 | msgid "empty trailer token in trailer '%.*s'" |
1897 | msgstr "签名 '%.*s' 的键为空" | |
220c313c | 1898 | |
276ceeaa | 1899 | #: trailer.c:702 |
220c313c JX |
1900 | #, c-format |
1901 | msgid "could not read input file '%s'" | |
1902 | msgstr "不能读取输入文件 '%s'" | |
1903 | ||
276ceeaa | 1904 | #: trailer.c:705 |
220c313c JX |
1905 | msgid "could not read from stdin" |
1906 | msgstr "不能自标准输入读取" | |
1907 | ||
276ceeaa JX |
1908 | #: trailer.c:857 builtin/am.c:42 |
1909 | #, c-format | |
1910 | msgid "could not stat %s" | |
1911 | msgstr "不能获取 %s 的文件状态" | |
1912 | ||
1913 | #: trailer.c:859 | |
1914 | #, c-format | |
1915 | msgid "file %s is not a regular file" | |
1916 | msgstr "文件 %s 不是一个正规文件" | |
1917 | ||
1918 | #: trailer.c:861 | |
1919 | #, c-format | |
1920 | msgid "file %s is not writable by user" | |
1921 | msgstr "文件 %s 用户不可写" | |
1922 | ||
1923 | #: trailer.c:873 | |
1924 | msgid "could not open temporary file" | |
1925 | msgstr "不能打开临时文件" | |
1926 | ||
1927 | #: trailer.c:912 | |
1928 | #, c-format | |
1929 | msgid "could not rename temporary file to %s" | |
1930 | msgstr "不能重命名临时文件为 %s" | |
1931 | ||
1932 | #: transport-helper.c:1041 | |
1b7f4a34 JX |
1933 | #, c-format |
1934 | msgid "Could not read ref %s" | |
1935 | msgstr "不能读取引用 %s" | |
1936 | ||
5b04ee3b JX |
1937 | #: unpack-trees.c:64 |
1938 | #, c-format | |
1939 | msgid "" | |
1940 | "Your local changes to the following files would be overwritten by checkout:\n" | |
1941 | "%%sPlease commit your changes or stash them before you can switch branches." | |
1942 | msgstr "" | |
1943 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
aef18cc6 | 1944 | "%%s请在切换分支前提交您的修改或者保存进度。" |
5b04ee3b JX |
1945 | |
1946 | #: unpack-trees.c:66 | |
1947 | #, c-format | |
1948 | msgid "" | |
1949 | "Your local changes to the following files would be overwritten by checkout:\n" | |
1950 | "%%s" | |
1951 | msgstr "" | |
1952 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
1953 | "%%s" | |
1954 | ||
1955 | #: unpack-trees.c:69 | |
1956 | #, c-format | |
1957 | msgid "" | |
1958 | "Your local changes to the following files would be overwritten by merge:\n" | |
1959 | "%%sPlease commit your changes or stash them before you can merge." | |
1960 | msgstr "" | |
1961 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
aef18cc6 | 1962 | "%%s请在合并前提交您的修改或者保存进度。" |
5b04ee3b JX |
1963 | |
1964 | #: unpack-trees.c:71 | |
1965 | #, c-format | |
1966 | msgid "" | |
1967 | "Your local changes to the following files would be overwritten by merge:\n" | |
1968 | "%%s" | |
1969 | msgstr "" | |
1970 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
1971 | "%%s" | |
1972 | ||
1973 | #: unpack-trees.c:74 | |
1974 | #, c-format | |
1975 | msgid "" | |
1976 | "Your local changes to the following files would be overwritten by %s:\n" | |
1977 | "%%sPlease commit your changes or stash them before you can %s." | |
1978 | msgstr "" | |
1979 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
aef18cc6 | 1980 | "%%s请在 %s 之前提交您的修改或者保存进度。" |
5b04ee3b JX |
1981 | |
1982 | #: unpack-trees.c:76 | |
1983 | #, c-format | |
1984 | msgid "" | |
1985 | "Your local changes to the following files would be overwritten by %s:\n" | |
1986 | "%%s" | |
1987 | msgstr "" | |
1988 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
1989 | "%%s" | |
1990 | ||
1991 | #: unpack-trees.c:81 | |
1992 | #, c-format | |
1993 | msgid "" | |
1994 | "Updating the following directories would lose untracked files in it:\n" | |
1995 | "%s" | |
1996 | msgstr "" | |
1997 | "更新如下目录将会丢失其中未跟踪的文件:\n" | |
1998 | "%s" | |
1999 | ||
2000 | #: unpack-trees.c:85 | |
2001 | #, c-format | |
2002 | msgid "" | |
2003 | "The following untracked working tree files would be removed by checkout:\n" | |
2004 | "%%sPlease move or remove them before you can switch branches." | |
2005 | msgstr "" | |
aef18cc6 RC |
2006 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" |
2007 | "%%s请在切换分支之前移动或删除。" | |
5b04ee3b JX |
2008 | |
2009 | #: unpack-trees.c:87 | |
2010 | #, c-format | |
2011 | msgid "" | |
2012 | "The following untracked working tree files would be removed by checkout:\n" | |
2013 | "%%s" | |
2014 | msgstr "" | |
2015 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
2016 | "%%s" | |
2017 | ||
2018 | #: unpack-trees.c:90 | |
2019 | #, c-format | |
2020 | msgid "" | |
2021 | "The following untracked working tree files would be removed by merge:\n" | |
2022 | "%%sPlease move or remove them before you can merge." | |
2023 | msgstr "" | |
2024 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
2025 | "%%s请在合并前移动或删除。" | |
2026 | ||
2027 | #: unpack-trees.c:92 | |
2028 | #, c-format | |
2029 | msgid "" | |
2030 | "The following untracked working tree files would be removed by merge:\n" | |
2031 | "%%s" | |
2032 | msgstr "" | |
2033 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
2034 | "%%s" | |
2035 | ||
2036 | #: unpack-trees.c:95 | |
2037 | #, c-format | |
2038 | msgid "" | |
2039 | "The following untracked working tree files would be removed by %s:\n" | |
2040 | "%%sPlease move or remove them before you can %s." | |
2041 | msgstr "" | |
2042 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
2043 | "%%s请在 %s 前移动或删除。" | |
2044 | ||
2045 | #: unpack-trees.c:97 | |
2046 | #, c-format | |
2047 | msgid "" | |
2048 | "The following untracked working tree files would be removed by %s:\n" | |
2049 | "%%s" | |
2050 | msgstr "" | |
2051 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
2052 | "%%s" | |
2053 | ||
2054 | #: unpack-trees.c:102 | |
2055 | #, c-format | |
2056 | msgid "" | |
2057 | "The following untracked working tree files would be overwritten by " | |
2058 | "checkout:\n" | |
2059 | "%%sPlease move or remove them before you can switch branches." | |
2060 | msgstr "" | |
2061 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" | |
2062 | "%%s请在切换分支前移动或删除。" | |
2063 | ||
2064 | #: unpack-trees.c:104 | |
2065 | #, c-format | |
2066 | msgid "" | |
2067 | "The following untracked working tree files would be overwritten by " | |
2068 | "checkout:\n" | |
2069 | "%%s" | |
2070 | msgstr "" | |
2071 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" | |
2072 | "%%s" | |
2073 | ||
2074 | #: unpack-trees.c:107 | |
2075 | #, c-format | |
2076 | msgid "" | |
2077 | "The following untracked working tree files would be overwritten by merge:\n" | |
2078 | "%%sPlease move or remove them before you can merge." | |
2079 | msgstr "" | |
2080 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
2081 | "%%s请在合并前移动或删除。" | |
2082 | ||
2083 | #: unpack-trees.c:109 | |
2084 | #, c-format | |
2085 | msgid "" | |
2086 | "The following untracked working tree files would be overwritten by merge:\n" | |
2087 | "%%s" | |
2088 | msgstr "" | |
2089 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
2090 | "%%s" | |
2091 | ||
2092 | #: unpack-trees.c:112 | |
2093 | #, c-format | |
2094 | msgid "" | |
2095 | "The following untracked working tree files would be overwritten by %s:\n" | |
2096 | "%%sPlease move or remove them before you can %s." | |
2097 | msgstr "" | |
2098 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
2099 | "%%s请在 %s 前移动或删除。" | |
2100 | ||
2101 | #: unpack-trees.c:114 | |
2102 | #, c-format | |
2103 | msgid "" | |
2104 | "The following untracked working tree files would be overwritten by %s:\n" | |
2105 | "%%s" | |
2106 | msgstr "" | |
2107 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
2108 | "%%s" | |
2109 | ||
2110 | #: unpack-trees.c:121 | |
2111 | #, c-format | |
2112 | msgid "Entry '%s' overlaps with '%s'. Cannot bind." | |
2113 | msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" | |
2114 | ||
2115 | #: unpack-trees.c:124 | |
2116 | #, c-format | |
2117 | msgid "" | |
2118 | "Cannot update sparse checkout: the following entries are not up-to-date:\n" | |
2119 | "%s" | |
2120 | msgstr "" | |
aef18cc6 | 2121 | "无法更新稀疏检出:如下条目不是最新:\n" |
5b04ee3b JX |
2122 | "%s" |
2123 | ||
2124 | #: unpack-trees.c:126 | |
2125 | #, c-format | |
2126 | msgid "" | |
2127 | "The following Working tree files would be overwritten by sparse checkout " | |
2128 | "update:\n" | |
2129 | "%s" | |
2130 | msgstr "" | |
2131 | "工作区中下列文件将会因为稀疏检出而被覆盖:\n" | |
2132 | "%s" | |
2133 | ||
2134 | #: unpack-trees.c:128 | |
2135 | #, c-format | |
2136 | msgid "" | |
2137 | "The following Working tree files would be removed by sparse checkout " | |
2138 | "update:\n" | |
2139 | "%s" | |
2140 | msgstr "" | |
2141 | "工作区中下列文件将会因为稀疏检出而被删除:\n" | |
2142 | "%s" | |
2143 | ||
2144 | #: unpack-trees.c:205 | |
2145 | #, c-format | |
2146 | msgid "Aborting\n" | |
2147 | msgstr "终止中\n" | |
2148 | ||
2149 | #: unpack-trees.c:237 | |
6c94aba5 JX |
2150 | msgid "Checking out files" |
2151 | msgstr "正在检出文件" | |
2152 | ||
90314792 JX |
2153 | #: urlmatch.c:120 |
2154 | msgid "invalid URL scheme name or missing '://' suffix" | |
2155 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
2156 | ||
2157 | #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 | |
2158 | #, c-format | |
2159 | msgid "invalid %XX escape sequence" | |
2160 | msgstr "无效的 %XX 转义序列" | |
2161 | ||
2162 | #: urlmatch.c:172 | |
2163 | msgid "missing host and scheme is not 'file:'" | |
4375c10e | 2164 | msgstr "缺失主机名且 URL 方案不是 'file:'" |
90314792 JX |
2165 | |
2166 | #: urlmatch.c:189 | |
2167 | msgid "a 'file:' URL may not have a port number" | |
2168 | msgstr "一个 'file:' URL 不应该包含端口号" | |
2169 | ||
2170 | #: urlmatch.c:199 | |
2171 | msgid "invalid characters in host name" | |
2172 | msgstr "主机名中包含无效的字符" | |
2173 | ||
2174 | #: urlmatch.c:244 urlmatch.c:255 | |
2175 | msgid "invalid port number" | |
2176 | msgstr "无效的端口号" | |
2177 | ||
2178 | #: urlmatch.c:322 | |
2179 | msgid "invalid '..' path segment" | |
2180 | msgstr "无效的 '..' 路径片段" | |
2181 | ||
276ceeaa | 2182 | #: wrapper.c:222 wrapper.c:381 |
1b7f4a34 JX |
2183 | #, c-format |
2184 | msgid "could not open '%s' for reading and writing" | |
2185 | msgstr "无法打开 '%s' 进行读写" | |
2186 | ||
5b04ee3b | 2187 | #: wrapper.c:224 wrapper.c:383 builtin/am.c:779 |
1b7f4a34 JX |
2188 | #, c-format |
2189 | msgid "could not open '%s' for writing" | |
2190 | msgstr "无法打开 '%s' 进行写入" | |
2191 | ||
5b04ee3b JX |
2192 | #: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 |
2193 | #: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 | |
2194 | #: builtin/pull.c:407 | |
1b7f4a34 JX |
2195 | #, c-format |
2196 | msgid "could not open '%s' for reading" | |
2197 | msgstr "无法打开 '%s' 进行读取" | |
2198 | ||
5b04ee3b | 2199 | #: wrapper.c:594 wrapper.c:615 |
07432cef WS |
2200 | #, c-format |
2201 | msgid "unable to access '%s'" | |
2202 | msgstr "不能访问 '%s'" | |
ef317cd5 | 2203 | |
5b04ee3b | 2204 | #: wrapper.c:623 |
220c313c JX |
2205 | msgid "unable to get current working directory" |
2206 | msgstr "不能获取当前工作目录" | |
2207 | ||
5b04ee3b | 2208 | #: wrapper.c:650 |
7aea43ff JX |
2209 | #, c-format |
2210 | msgid "could not open %s for writing" | |
2211 | msgstr "不能写入 %s" | |
2212 | ||
5b04ee3b | 2213 | #: wrapper.c:661 builtin/am.c:410 |
7aea43ff JX |
2214 | #, c-format |
2215 | msgid "could not write to %s" | |
2216 | msgstr "不能写入 %s" | |
2217 | ||
5b04ee3b | 2218 | #: wrapper.c:667 |
7aea43ff JX |
2219 | #, c-format |
2220 | msgid "could not close %s" | |
2221 | msgstr "不能关闭 %s" | |
2222 | ||
5b04ee3b | 2223 | #: wt-status.c:150 |
c04f5ac3 JX |
2224 | msgid "Unmerged paths:" |
2225 | msgstr "未合并的路径:" | |
2226 | ||
90e6ef53 | 2227 | # 译者:注意保持前导空格 |
5b04ee3b | 2228 | #: wt-status.c:177 wt-status.c:204 |
c04f5ac3 JX |
2229 | #, c-format |
2230 | msgid " (use \"git reset %s <file>...\" to unstage)" | |
160fb2b2 | 2231 | msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)" |
c04f5ac3 | 2232 | |
90e6ef53 | 2233 | # 译者:注意保持前导空格 |
5b04ee3b | 2234 | #: wt-status.c:179 wt-status.c:206 |
c04f5ac3 | 2235 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
160fb2b2 | 2236 | msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)" |
c04f5ac3 | 2237 | |
90e6ef53 | 2238 | # 译者:注意保持前导空格 |
5b04ee3b | 2239 | #: wt-status.c:183 |
6792b93b | 2240 | msgid " (use \"git add <file>...\" to mark resolution)" |
d9d56b23 | 2241 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" |
6792b93b JX |
2242 | |
2243 | # 译者:注意保持前导空格 | |
5b04ee3b | 2244 | #: wt-status.c:185 wt-status.c:189 |
c04f5ac3 | 2245 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
d9d56b23 | 2246 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" |
c04f5ac3 | 2247 | |
6792b93b | 2248 | # 译者:注意保持前导空格 |
5b04ee3b | 2249 | #: wt-status.c:187 |
6792b93b | 2250 | msgid " (use \"git rm <file>...\" to mark resolution)" |
d9d56b23 | 2251 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" |
6792b93b | 2252 | |
5b04ee3b | 2253 | #: wt-status.c:198 wt-status.c:881 |
c04f5ac3 JX |
2254 | msgid "Changes to be committed:" |
2255 | msgstr "要提交的变更:" | |
2256 | ||
5b04ee3b | 2257 | #: wt-status.c:216 wt-status.c:890 |
c04f5ac3 | 2258 | msgid "Changes not staged for commit:" |
7e238ab7 | 2259 | msgstr "尚未暂存以备提交的变更:" |
c04f5ac3 | 2260 | |
90e6ef53 | 2261 | # 译者:注意保持前导空格 |
5b04ee3b | 2262 | #: wt-status.c:220 |
c04f5ac3 | 2263 | msgid " (use \"git add <file>...\" to update what will be committed)" |
d9d56b23 | 2264 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" |
c04f5ac3 | 2265 | |
90e6ef53 | 2266 | # 译者:注意保持前导空格 |
5b04ee3b | 2267 | #: wt-status.c:222 |
c04f5ac3 | 2268 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
d9d56b23 | 2269 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" |
c04f5ac3 | 2270 | |
90e6ef53 | 2271 | # 译者:注意保持前导空格 |
5b04ee3b | 2272 | #: wt-status.c:223 |
c04f5ac3 JX |
2273 | msgid "" |
2274 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" | |
d9d56b23 | 2275 | msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)" |
c04f5ac3 | 2276 | |
90e6ef53 | 2277 | # 译者:注意保持前导空格 |
5b04ee3b | 2278 | #: wt-status.c:225 |
c04f5ac3 JX |
2279 | msgid " (commit or discard the untracked or modified content in submodules)" |
2280 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
2281 | ||
90e6ef53 | 2282 | # 译者:注意保持前导空格 |
5b04ee3b | 2283 | #: wt-status.c:237 |
c04f5ac3 JX |
2284 | #, c-format |
2285 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
d9d56b23 | 2286 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" |
c04f5ac3 | 2287 | |
5b04ee3b | 2288 | #: wt-status.c:252 |
c04f5ac3 JX |
2289 | msgid "both deleted:" |
2290 | msgstr "双方删除:" | |
2291 | ||
5b04ee3b | 2292 | #: wt-status.c:254 |
c04f5ac3 JX |
2293 | msgid "added by us:" |
2294 | msgstr "由我们添加:" | |
2295 | ||
5b04ee3b | 2296 | #: wt-status.c:256 |
c04f5ac3 JX |
2297 | msgid "deleted by them:" |
2298 | msgstr "由他们删除:" | |
2299 | ||
5b04ee3b | 2300 | #: wt-status.c:258 |
c04f5ac3 JX |
2301 | msgid "added by them:" |
2302 | msgstr "由他们添加:" | |
2303 | ||
5b04ee3b | 2304 | #: wt-status.c:260 |
c04f5ac3 JX |
2305 | msgid "deleted by us:" |
2306 | msgstr "由我们删除:" | |
2307 | ||
5b04ee3b | 2308 | #: wt-status.c:262 |
c04f5ac3 JX |
2309 | msgid "both added:" |
2310 | msgstr "双方添加:" | |
2311 | ||
5b04ee3b | 2312 | #: wt-status.c:264 |
c04f5ac3 JX |
2313 | msgid "both modified:" |
2314 | msgstr "双方修改:" | |
2315 | ||
5b04ee3b | 2316 | #: wt-status.c:266 |
6c94aba5 JX |
2317 | #, c-format |
2318 | msgid "bug: unhandled unmerged status %x" | |
2319 | msgstr "bug:无法处理的未合并状态 %x" | |
cfff71a9 | 2320 | |
5b04ee3b | 2321 | #: wt-status.c:274 |
6c94aba5 JX |
2322 | msgid "new file:" |
2323 | msgstr "新文件:" | |
cfff71a9 | 2324 | |
5b04ee3b | 2325 | #: wt-status.c:276 |
6c94aba5 JX |
2326 | msgid "copied:" |
2327 | msgstr "拷贝:" | |
cfff71a9 | 2328 | |
5b04ee3b | 2329 | #: wt-status.c:278 |
6c94aba5 JX |
2330 | msgid "deleted:" |
2331 | msgstr "删除:" | |
cfff71a9 | 2332 | |
5b04ee3b | 2333 | #: wt-status.c:280 |
6c94aba5 JX |
2334 | msgid "modified:" |
2335 | msgstr "修改:" | |
2336 | ||
5b04ee3b | 2337 | #: wt-status.c:282 |
6c94aba5 JX |
2338 | msgid "renamed:" |
2339 | msgstr "重命名:" | |
2340 | ||
5b04ee3b | 2341 | #: wt-status.c:284 |
6c94aba5 JX |
2342 | msgid "typechange:" |
2343 | msgstr "类型变更:" | |
2344 | ||
5b04ee3b | 2345 | #: wt-status.c:286 |
6c94aba5 JX |
2346 | msgid "unknown:" |
2347 | msgstr "未知:" | |
cfff71a9 | 2348 | |
5b04ee3b | 2349 | #: wt-status.c:288 |
6c94aba5 JX |
2350 | msgid "unmerged:" |
2351 | msgstr "未合并:" | |
cfff71a9 | 2352 | |
90e6ef53 | 2353 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
5b04ee3b | 2354 | #: wt-status.c:370 |
c04f5ac3 | 2355 | msgid "new commits, " |
aa9565f7 | 2356 | msgstr "新提交, " |
c04f5ac3 | 2357 | |
90e6ef53 | 2358 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
5b04ee3b | 2359 | #: wt-status.c:372 |
c04f5ac3 | 2360 | msgid "modified content, " |
aa9565f7 | 2361 | msgstr "修改的内容, " |
c04f5ac3 | 2362 | |
90e6ef53 | 2363 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
5b04ee3b | 2364 | #: wt-status.c:374 |
c04f5ac3 | 2365 | msgid "untracked content, " |
aa9565f7 | 2366 | msgstr "未跟踪的内容, " |
c04f5ac3 | 2367 | |
5b04ee3b | 2368 | #: wt-status.c:391 |
c04f5ac3 JX |
2369 | #, c-format |
2370 | msgid "bug: unhandled diff status %c" | |
6c94aba5 | 2371 | msgstr "bug:无法处理的差异状态 %c" |
c04f5ac3 | 2372 | |
5b04ee3b | 2373 | #: wt-status.c:755 |
90314792 JX |
2374 | msgid "Submodules changed but not updated:" |
2375 | msgstr "子模组已修改但尚未更新:" | |
2376 | ||
5b04ee3b | 2377 | #: wt-status.c:757 |
90314792 JX |
2378 | msgid "Submodule changes to be committed:" |
2379 | msgstr "要提交的子模组变更:" | |
2380 | ||
5b04ee3b | 2381 | #: wt-status.c:838 |
cfff71a9 JX |
2382 | msgid "" |
2383 | "Do not touch the line above.\n" | |
2384 | "Everything below will be removed." | |
2385 | msgstr "" | |
2386 | "不要改动上面的一行。\n" | |
2387 | "下面的所有内容均将被删除。" | |
2388 | ||
5b04ee3b | 2389 | #: wt-status.c:949 |
6792b93b | 2390 | msgid "You have unmerged paths." |
195febda | 2391 | msgstr "您有尚未合并的路径。" |
6792b93b JX |
2392 | |
2393 | # 译者:注意保持前导空格 | |
5b04ee3b | 2394 | #: wt-status.c:952 |
6792b93b JX |
2395 | msgid " (fix conflicts and run \"git commit\")" |
2396 | msgstr " (解决冲突并运行 \"git commit\")" | |
2397 | ||
5b04ee3b | 2398 | #: wt-status.c:956 |
6792b93b JX |
2399 | msgid "All conflicts fixed but you are still merging." |
2400 | msgstr "所有冲突已解决但您仍处于合并中。" | |
2401 | ||
2402 | # 译者:注意保持前导空格 | |
5b04ee3b | 2403 | #: wt-status.c:959 |
6792b93b JX |
2404 | msgid " (use \"git commit\" to conclude merge)" |
2405 | msgstr " (使用 \"git commit\" 结束合并)" | |
2406 | ||
5b04ee3b | 2407 | #: wt-status.c:969 |
6792b93b | 2408 | msgid "You are in the middle of an am session." |
98b2761d | 2409 | msgstr "您正处于 am 操作过程中。" |
6792b93b | 2410 | |
5b04ee3b | 2411 | #: wt-status.c:972 |
6792b93b JX |
2412 | msgid "The current patch is empty." |
2413 | msgstr "当前的补丁为空。" | |
2414 | ||
2415 | # 译者:注意保持前导空格 | |
5b04ee3b | 2416 | #: wt-status.c:976 |
2e8451e8 JX |
2417 | msgid " (fix conflicts and then run \"git am --continue\")" |
2418 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
6792b93b JX |
2419 | |
2420 | # 译者:注意保持前导空格 | |
5b04ee3b | 2421 | #: wt-status.c:978 |
6792b93b JX |
2422 | msgid " (use \"git am --skip\" to skip this patch)" |
2423 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
2424 | ||
2425 | # 译者:注意保持前导空格 | |
5b04ee3b | 2426 | #: wt-status.c:980 |
6792b93b JX |
2427 | msgid " (use \"git am --abort\" to restore the original branch)" |
2428 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
2429 | ||
1b7f4a34 JX |
2430 | #: wt-status.c:1105 |
2431 | msgid "No commands done." | |
2432 | msgstr "没有命令被执行。" | |
2433 | ||
2434 | #: wt-status.c:1108 | |
2435 | #, c-format | |
2436 | msgid "Last command done (%d command done):" | |
2437 | msgid_plural "Last commands done (%d commands done):" | |
2438 | msgstr[0] "最后一条命令已完成(%d 条命令被执行):" | |
2439 | msgstr[1] "最后的命令已完成(%d 条命令被执行):" | |
2440 | ||
2441 | #: wt-status.c:1119 | |
2442 | #, c-format | |
2443 | msgid " (see more in file %s)" | |
2444 | msgstr " (更多参见文件 %s)" | |
2445 | ||
2446 | #: wt-status.c:1124 | |
2447 | msgid "No commands remaining." | |
2448 | msgstr "未剩下任何命令。" | |
2449 | ||
2450 | #: wt-status.c:1127 | |
2451 | #, c-format | |
2452 | msgid "Next command to do (%d remaining command):" | |
2453 | msgid_plural "Next commands to do (%d remaining commands):" | |
2454 | msgstr[0] "接下来要执行的命令(剩余 %d 条命令):" | |
2455 | msgstr[1] "接下来要执行的命令(剩余 %d 条命令):" | |
2456 | ||
2457 | # 译者:注意保持前导空格 | |
2458 | #: wt-status.c:1135 | |
2459 | msgid " (use \"git rebase --edit-todo\" to view and edit)" | |
2460 | msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)" | |
2461 | ||
2462 | #: wt-status.c:1148 | |
63af42fe JX |
2463 | #, c-format |
2464 | msgid "You are currently rebasing branch '%s' on '%s'." | |
98b2761d | 2465 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" |
63af42fe | 2466 | |
1b7f4a34 | 2467 | #: wt-status.c:1153 |
6792b93b | 2468 | msgid "You are currently rebasing." |
98b2761d | 2469 | msgstr "您在执行变基操作。" |
6792b93b JX |
2470 | |
2471 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2472 | #: wt-status.c:1167 |
6792b93b JX |
2473 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
2474 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
2475 | ||
2476 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2477 | #: wt-status.c:1169 |
6792b93b JX |
2478 | msgid " (use \"git rebase --skip\" to skip this patch)" |
2479 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
2480 | ||
2481 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2482 | #: wt-status.c:1171 |
6792b93b JX |
2483 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
2484 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
2485 | ||
2486 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2487 | #: wt-status.c:1177 |
6792b93b JX |
2488 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
2489 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
2490 | ||
1b7f4a34 | 2491 | #: wt-status.c:1181 |
63af42fe JX |
2492 | #, c-format |
2493 | msgid "" | |
2494 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." | |
98b2761d | 2495 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" |
63af42fe | 2496 | |
1b7f4a34 | 2497 | #: wt-status.c:1186 |
6792b93b | 2498 | msgid "You are currently splitting a commit during a rebase." |
98b2761d | 2499 | msgstr "您在执行变基操作时拆分提交。" |
6792b93b JX |
2500 | |
2501 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2502 | #: wt-status.c:1189 |
6792b93b JX |
2503 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
2504 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
2505 | ||
1b7f4a34 | 2506 | #: wt-status.c:1193 |
63af42fe JX |
2507 | #, c-format |
2508 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
98b2761d | 2509 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" |
63af42fe | 2510 | |
1b7f4a34 | 2511 | #: wt-status.c:1198 |
6792b93b | 2512 | msgid "You are currently editing a commit during a rebase." |
98b2761d | 2513 | msgstr "您在执行变基操作时编辑提交。" |
6792b93b JX |
2514 | |
2515 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2516 | #: wt-status.c:1201 |
6792b93b JX |
2517 | msgid " (use \"git commit --amend\" to amend the current commit)" |
2518 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
2519 | ||
2520 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2521 | #: wt-status.c:1203 |
6792b93b JX |
2522 | msgid "" |
2523 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
195febda | 2524 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" |
6792b93b | 2525 | |
1b7f4a34 | 2526 | #: wt-status.c:1213 |
90314792 JX |
2527 | #, c-format |
2528 | msgid "You are currently cherry-picking commit %s." | |
98b2761d | 2529 | msgstr "您在执行拣选提交 %s 的操作。" |
6792b93b | 2530 | |
2e8451e8 | 2531 | # 译者:注意保持前导空格 |
1b7f4a34 | 2532 | #: wt-status.c:1218 |
2e8451e8 JX |
2533 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
2534 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
2535 | ||
6792b93b | 2536 | # 译者:注意保持前导空格 |
1b7f4a34 | 2537 | #: wt-status.c:1221 |
2e8451e8 JX |
2538 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
2539 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
6792b93b | 2540 | |
2e8451e8 | 2541 | # 译者:注意保持前导空格 |
1b7f4a34 | 2542 | #: wt-status.c:1223 |
2e8451e8 JX |
2543 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
2544 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
2545 | ||
1b7f4a34 | 2546 | #: wt-status.c:1232 |
1003b3a5 JX |
2547 | #, c-format |
2548 | msgid "You are currently reverting commit %s." | |
98b2761d | 2549 | msgstr "您在执行反转提交 %s 的操作。" |
1003b3a5 JX |
2550 | |
2551 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2552 | #: wt-status.c:1237 |
1003b3a5 JX |
2553 | msgid " (fix conflicts and run \"git revert --continue\")" |
2554 | msgstr " (解决冲突并运行 \"git revert --continue\")" | |
2555 | ||
2556 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2557 | #: wt-status.c:1240 |
1003b3a5 JX |
2558 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
2559 | msgstr " (所有冲突已解决:运行 \"git revert --continue\")" | |
2560 | ||
2561 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2562 | #: wt-status.c:1242 |
1003b3a5 JX |
2563 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
2564 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
2565 | ||
1b7f4a34 | 2566 | #: wt-status.c:1253 |
63af42fe | 2567 | #, c-format |
1003b3a5 | 2568 | msgid "You are currently bisecting, started from branch '%s'." |
98b2761d | 2569 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" |
63af42fe | 2570 | |
1b7f4a34 | 2571 | #: wt-status.c:1257 |
6792b93b | 2572 | msgid "You are currently bisecting." |
98b2761d | 2573 | msgstr "您在执行二分查找操作。" |
6792b93b JX |
2574 | |
2575 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2576 | #: wt-status.c:1260 |
6792b93b JX |
2577 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
2578 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
2579 | ||
5b04ee3b | 2580 | #: wt-status.c:1460 |
c04f5ac3 JX |
2581 | msgid "On branch " |
2582 | msgstr "位于分支 " | |
2583 | ||
5b04ee3b | 2584 | #: wt-status.c:1466 |
1b7f4a34 JX |
2585 | msgid "interactive rebase in progress; onto " |
2586 | msgstr "交互式变基操作正在进行中;至 " | |
2587 | ||
5b04ee3b | 2588 | #: wt-status.c:1468 |
2e8451e8 | 2589 | msgid "rebase in progress; onto " |
98b2761d | 2590 | msgstr "变基操作正在进行中;至 " |
2e8451e8 | 2591 | |
5b04ee3b | 2592 | #: wt-status.c:1473 |
1003b3a5 JX |
2593 | msgid "HEAD detached at " |
2594 | msgstr "头指针分离于 " | |
2595 | ||
5b04ee3b | 2596 | #: wt-status.c:1475 |
1003b3a5 JX |
2597 | msgid "HEAD detached from " |
2598 | msgstr "头指针分离自 " | |
2599 | ||
5b04ee3b | 2600 | #: wt-status.c:1478 |
c04f5ac3 JX |
2601 | msgid "Not currently on any branch." |
2602 | msgstr "当前不在任何分支上。" | |
2603 | ||
5b04ee3b | 2604 | #: wt-status.c:1496 |
c04f5ac3 JX |
2605 | msgid "Initial commit" |
2606 | msgstr "初始提交" | |
2607 | ||
5b04ee3b | 2608 | #: wt-status.c:1510 |
ef317cd5 | 2609 | msgid "Untracked files" |
07432cef | 2610 | msgstr "未跟踪的文件" |
c04f5ac3 | 2611 | |
5b04ee3b | 2612 | #: wt-status.c:1512 |
ef317cd5 | 2613 | msgid "Ignored files" |
07432cef | 2614 | msgstr "忽略的文件" |
c04f5ac3 | 2615 | |
5b04ee3b | 2616 | #: wt-status.c:1516 |
1003b3a5 | 2617 | #, c-format |
4dcdc3d8 JX |
2618 | msgid "" |
2619 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
2620 | "may speed it up, but you have to be careful not to forget to add\n" | |
2621 | "new files yourself (see 'git help status')." | |
2622 | msgstr "" | |
2623 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
2624 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1003b3a5 | 2625 | |
5b04ee3b | 2626 | #: wt-status.c:1522 |
c04f5ac3 JX |
2627 | #, c-format |
2628 | msgid "Untracked files not listed%s" | |
2629 | msgstr "未跟踪的文件没有列出%s" | |
2630 | ||
7e238ab7 | 2631 | # 译者:中文字符串拼接,可删除前导空格 |
5b04ee3b | 2632 | #: wt-status.c:1524 |
c04f5ac3 | 2633 | msgid " (use -u option to show untracked files)" |
7e238ab7 | 2634 | msgstr "(使用 -u 参数显示未跟踪的文件)" |
c04f5ac3 | 2635 | |
5b04ee3b | 2636 | #: wt-status.c:1530 |
c04f5ac3 JX |
2637 | msgid "No changes" |
2638 | msgstr "没有修改" | |
2639 | ||
5b04ee3b | 2640 | #: wt-status.c:1535 |
07432cef | 2641 | #, c-format |
ef317cd5 | 2642 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" |
07432cef | 2643 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" |
c04f5ac3 | 2644 | |
5b04ee3b | 2645 | #: wt-status.c:1538 |
07432cef | 2646 | #, c-format |
ef317cd5 | 2647 | msgid "no changes added to commit\n" |
07432cef | 2648 | msgstr "修改尚未加入提交\n" |
c04f5ac3 | 2649 | |
5b04ee3b | 2650 | #: wt-status.c:1541 |
07432cef | 2651 | #, c-format |
ef317cd5 JX |
2652 | msgid "" |
2653 | "nothing added to commit but untracked files present (use \"git add\" to " | |
2654 | "track)\n" | |
07432cef | 2655 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" |
c04f5ac3 | 2656 | |
5b04ee3b | 2657 | #: wt-status.c:1544 |
07432cef | 2658 | #, c-format |
ef317cd5 | 2659 | msgid "nothing added to commit but untracked files present\n" |
07432cef | 2660 | msgstr "提交为空,但是存在尚未跟踪的文件\n" |
c04f5ac3 | 2661 | |
7e238ab7 | 2662 | # 译者:中文字符串拼接,可删除前导空格 |
5b04ee3b | 2663 | #: wt-status.c:1547 |
07432cef | 2664 | #, c-format |
ef317cd5 | 2665 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" |
07432cef | 2666 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" |
c04f5ac3 | 2667 | |
5b04ee3b | 2668 | #: wt-status.c:1550 wt-status.c:1555 |
07432cef | 2669 | #, c-format |
ef317cd5 | 2670 | msgid "nothing to commit\n" |
07432cef | 2671 | msgstr "无文件要提交\n" |
ef317cd5 | 2672 | |
7e238ab7 | 2673 | # 译者:中文字符串拼接,可删除前导空格 |
5b04ee3b | 2674 | #: wt-status.c:1553 |
07432cef | 2675 | #, c-format |
ef317cd5 | 2676 | msgid "nothing to commit (use -u to show untracked files)\n" |
07432cef | 2677 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" |
c04f5ac3 | 2678 | |
7e238ab7 | 2679 | # 译者:中文字符串拼接,可删除前导空格 |
5b04ee3b | 2680 | #: wt-status.c:1557 |
07432cef | 2681 | #, c-format |
ef317cd5 | 2682 | msgid "nothing to commit, working directory clean\n" |
07432cef | 2683 | msgstr "无文件要提交,干净的工作区\n" |
c04f5ac3 | 2684 | |
90e6ef53 | 2685 | # 译者:注意保持句尾空格 |
5b04ee3b | 2686 | #: wt-status.c:1664 |
c04f5ac3 JX |
2687 | msgid "Initial commit on " |
2688 | msgstr "初始提交于 " | |
2689 | ||
5b04ee3b | 2690 | #: wt-status.c:1668 |
94550ed3 JX |
2691 | msgid "HEAD (no branch)" |
2692 | msgstr "HEAD(非分支)" | |
2693 | ||
5b04ee3b | 2694 | #: wt-status.c:1697 |
90314792 JX |
2695 | msgid "gone" |
2696 | msgstr "丢失" | |
2697 | ||
90e6ef53 | 2698 | # 译者:注意保持句尾空格 |
5b04ee3b | 2699 | #: wt-status.c:1699 wt-status.c:1707 |
c04f5ac3 JX |
2700 | msgid "behind " |
2701 | msgstr "落后 " | |
2702 | ||
5b04ee3b | 2703 | #: wt-status.c:1702 wt-status.c:1705 |
5c0c220c JX |
2704 | msgid "ahead " |
2705 | msgstr "领先 " | |
2706 | ||
5b04ee3b | 2707 | #: compat/precompose_utf8.c:57 builtin/clone.c:415 |
a77c07d9 JX |
2708 | #, c-format |
2709 | msgid "failed to unlink '%s'" | |
2710 | msgstr "无法删除 '%s'" | |
2711 | ||
220c313c | 2712 | #: builtin/add.c:22 |
814ff314 | 2713 | msgid "git add [<options>] [--] <pathspec>..." |
160fb2b2 | 2714 | msgstr "git add [<选项>] [--] <路径规格>..." |
ef317cd5 | 2715 | |
220c313c | 2716 | #: builtin/add.c:65 |
c04f5ac3 JX |
2717 | #, c-format |
2718 | msgid "unexpected diff status %c" | |
2719 | msgstr "意外的差异状态 %c" | |
2720 | ||
5b04ee3b | 2721 | #: builtin/add.c:70 builtin/commit.c:280 |
c04f5ac3 JX |
2722 | msgid "updating files failed" |
2723 | msgstr "更新文件失败" | |
2724 | ||
220c313c | 2725 | #: builtin/add.c:80 |
c04f5ac3 JX |
2726 | #, c-format |
2727 | msgid "remove '%s'\n" | |
2728 | msgstr "删除 '%s'\n" | |
2729 | ||
220c313c | 2730 | #: builtin/add.c:134 |
c04f5ac3 | 2731 | msgid "Unstaged changes after refreshing the index:" |
90e6ef53 | 2732 | msgstr "刷新索引之后尚未被暂存的变更:" |
c04f5ac3 | 2733 | |
5b04ee3b | 2734 | #: builtin/add.c:194 builtin/rev-parse.c:811 |
c04f5ac3 | 2735 | msgid "Could not read the index" |
90e6ef53 | 2736 | msgstr "不能读取索引" |
c04f5ac3 | 2737 | |
220c313c | 2738 | #: builtin/add.c:205 |
c04f5ac3 JX |
2739 | #, c-format |
2740 | msgid "Could not open '%s' for writing." | |
1b7f4a34 | 2741 | msgstr "无法打开 '%s' 进行写入。" |
c04f5ac3 | 2742 | |
220c313c | 2743 | #: builtin/add.c:209 |
c04f5ac3 | 2744 | msgid "Could not write patch" |
195febda | 2745 | msgstr "不能生成补丁" |
c04f5ac3 | 2746 | |
7aea43ff JX |
2747 | #: builtin/add.c:212 |
2748 | msgid "editing patch failed" | |
2749 | msgstr "编辑补丁失败" | |
2750 | ||
2751 | #: builtin/add.c:215 | |
c04f5ac3 JX |
2752 | #, c-format |
2753 | msgid "Could not stat '%s'" | |
90e6ef53 | 2754 | msgstr "不能查看文件状态 '%s'" |
c04f5ac3 | 2755 | |
7aea43ff | 2756 | #: builtin/add.c:217 |
c04f5ac3 JX |
2757 | msgid "Empty patch. Aborted." |
2758 | msgstr "空补丁。异常终止。" | |
2759 | ||
7aea43ff | 2760 | #: builtin/add.c:222 |
8ada9598 JX |
2761 | #, c-format |
2762 | msgid "Could not apply '%s'" | |
2763 | msgstr "不能应用 '%s'" | |
2764 | ||
7aea43ff | 2765 | #: builtin/add.c:232 |
8ada9598 | 2766 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
195febda | 2767 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" |
8ada9598 | 2768 | |
276ceeaa | 2769 | #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 |
5b04ee3b JX |
2770 | #: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 |
2771 | #: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 | |
ef317cd5 | 2772 | msgid "dry run" |
07432cef | 2773 | msgstr "演习" |
ef317cd5 | 2774 | |
5b04ee3b JX |
2775 | #: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 |
2776 | #: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 | |
2777 | #: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 | |
ef317cd5 JX |
2778 | msgid "be verbose" |
2779 | msgstr "冗长输出" | |
2780 | ||
7aea43ff | 2781 | #: builtin/add.c:252 |
ef317cd5 | 2782 | msgid "interactive picking" |
07432cef | 2783 | msgstr "交互式拣选" |
ef317cd5 | 2784 | |
5b04ee3b | 2785 | #: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 |
ef317cd5 | 2786 | msgid "select hunks interactively" |
07432cef | 2787 | msgstr "交互式挑选数据块" |
ef317cd5 | 2788 | |
7aea43ff | 2789 | #: builtin/add.c:254 |
ef317cd5 | 2790 | msgid "edit current diff and apply" |
07432cef | 2791 | msgstr "编辑当前差异并应用" |
ef317cd5 | 2792 | |
7aea43ff | 2793 | #: builtin/add.c:255 |
ef317cd5 | 2794 | msgid "allow adding otherwise ignored files" |
07432cef | 2795 | msgstr "允许添加忽略的文件" |
ef317cd5 | 2796 | |
7aea43ff | 2797 | #: builtin/add.c:256 |
ef317cd5 | 2798 | msgid "update tracked files" |
07432cef | 2799 | msgstr "更新已跟踪的文件" |
ef317cd5 | 2800 | |
7aea43ff | 2801 | #: builtin/add.c:257 |
ef317cd5 | 2802 | msgid "record only the fact that the path will be added later" |
07432cef | 2803 | msgstr "只记录,该路径稍后再添加" |
ef317cd5 | 2804 | |
7aea43ff | 2805 | #: builtin/add.c:258 |
ef317cd5 | 2806 | msgid "add changes from all tracked and untracked files" |
07432cef | 2807 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" |
ef317cd5 | 2808 | |
7aea43ff | 2809 | #: builtin/add.c:261 |
4dcdc3d8 JX |
2810 | msgid "ignore paths removed in the working tree (same as --no-all)" |
2811 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
2812 | ||
7aea43ff | 2813 | #: builtin/add.c:263 |
ef317cd5 | 2814 | msgid "don't add, only refresh the index" |
07432cef | 2815 | msgstr "不添加,只刷新索引" |
ef317cd5 | 2816 | |
7aea43ff | 2817 | #: builtin/add.c:264 |
ef317cd5 | 2818 | msgid "just skip files which cannot be added because of errors" |
07432cef | 2819 | msgstr "跳过因出错不能添加的文件" |
ef317cd5 | 2820 | |
7aea43ff | 2821 | #: builtin/add.c:265 |
ef317cd5 | 2822 | msgid "check if - even missing - files are ignored in dry run" |
07432cef | 2823 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" |
ef317cd5 | 2824 | |
7aea43ff | 2825 | #: builtin/add.c:287 |
8ada9598 JX |
2826 | #, c-format |
2827 | msgid "Use -f if you really want to add them.\n" | |
2828 | msgstr "使用 -f 参数如果您确实要添加它们。\n" | |
2829 | ||
7aea43ff | 2830 | #: builtin/add.c:294 |
8ada9598 JX |
2831 | msgid "adding files failed" |
2832 | msgstr "添加文件失败" | |
2833 | ||
7aea43ff | 2834 | #: builtin/add.c:330 |
8ada9598 JX |
2835 | msgid "-A and -u are mutually incompatible" |
2836 | msgstr "-A 和 -u 选项互斥" | |
2837 | ||
7aea43ff | 2838 | #: builtin/add.c:337 |
8ada9598 | 2839 | msgid "Option --ignore-missing can only be used together with --dry-run" |
649900bc | 2840 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" |
8ada9598 | 2841 | |
94550ed3 | 2842 | #: builtin/add.c:352 |
8ada9598 JX |
2843 | #, c-format |
2844 | msgid "Nothing specified, nothing added.\n" | |
2845 | msgstr "没有指定文件,也没有文件被添加。\n" | |
2846 | ||
94550ed3 | 2847 | #: builtin/add.c:353 |
8ada9598 JX |
2848 | #, c-format |
2849 | msgid "Maybe you wanted to say 'git add .'?\n" | |
2850 | msgstr "也许您想要执行 'git add .'?\n" | |
2851 | ||
276ceeaa | 2852 | #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 |
5b04ee3b JX |
2853 | #: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 |
2854 | #: builtin/submodule--helper.c:240 | |
8ada9598 JX |
2855 | msgid "index file corrupt" |
2856 | msgstr "索引文件损坏" | |
2857 | ||
5b04ee3b | 2858 | #: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 |
8ada9598 JX |
2859 | msgid "Unable to write new index file" |
2860 | msgstr "无法写入新索引文件" | |
2861 | ||
5b04ee3b | 2862 | #: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 |
1b7f4a34 JX |
2863 | #, c-format |
2864 | msgid "could not read '%s'" | |
2865 | msgstr "不能读取 '%s'" | |
2866 | ||
276ceeaa | 2867 | #: builtin/am.c:430 |
1b7f4a34 JX |
2868 | msgid "could not parse author script" |
2869 | msgstr "不能解析作者脚本" | |
2870 | ||
276ceeaa | 2871 | #: builtin/am.c:507 |
1b7f4a34 JX |
2872 | #, c-format |
2873 | msgid "'%s' was deleted by the applypatch-msg hook" | |
2874 | msgstr "'%s' 被 applypatch-msg 钩子删除" | |
2875 | ||
276ceeaa | 2876 | #: builtin/am.c:548 builtin/notes.c:300 |
1b7f4a34 JX |
2877 | #, c-format |
2878 | msgid "Malformed input line: '%s'." | |
2879 | msgstr "非法的输入行:'%s'。" | |
2880 | ||
276ceeaa | 2881 | #: builtin/am.c:585 builtin/notes.c:315 |
1b7f4a34 JX |
2882 | #, c-format |
2883 | msgid "Failed to copy notes from '%s' to '%s'" | |
2884 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
2885 | ||
276ceeaa | 2886 | #: builtin/am.c:611 |
1b7f4a34 JX |
2887 | msgid "fseek failed" |
2888 | msgstr "fseek 失败" | |
2889 | ||
276ceeaa | 2890 | #: builtin/am.c:788 |
1b7f4a34 JX |
2891 | #, c-format |
2892 | msgid "could not parse patch '%s'" | |
2893 | msgstr "无法解析补丁 '%s'" | |
2894 | ||
276ceeaa | 2895 | #: builtin/am.c:853 |
1b7f4a34 JX |
2896 | msgid "Only one StGIT patch series can be applied at once" |
2897 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
2898 | ||
5b04ee3b | 2899 | #: builtin/am.c:900 |
1b7f4a34 JX |
2900 | msgid "invalid timestamp" |
2901 | msgstr "无效的时间戳" | |
2902 | ||
5b04ee3b | 2903 | #: builtin/am.c:903 builtin/am.c:911 |
1b7f4a34 JX |
2904 | msgid "invalid Date line" |
2905 | msgstr "无效的日期行" | |
2906 | ||
5b04ee3b | 2907 | #: builtin/am.c:908 |
1b7f4a34 JX |
2908 | msgid "invalid timezone offset" |
2909 | msgstr "无效的时区偏移值" | |
2910 | ||
5b04ee3b | 2911 | #: builtin/am.c:995 |
1b7f4a34 JX |
2912 | msgid "Patch format detection failed." |
2913 | msgstr "补丁格式检测失败。" | |
2914 | ||
5b04ee3b | 2915 | #: builtin/am.c:1000 builtin/clone.c:380 |
1b7f4a34 JX |
2916 | #, c-format |
2917 | msgid "failed to create directory '%s'" | |
2918 | msgstr "无法创建目录 '%s'" | |
2919 | ||
5b04ee3b | 2920 | #: builtin/am.c:1004 |
1b7f4a34 JX |
2921 | msgid "Failed to split patches." |
2922 | msgstr "无法拆分补丁。" | |
2923 | ||
5b04ee3b | 2924 | #: builtin/am.c:1136 builtin/commit.c:365 |
1b7f4a34 JX |
2925 | msgid "unable to write index file" |
2926 | msgstr "无法写入索引文件" | |
2927 | ||
5b04ee3b | 2928 | #: builtin/am.c:1187 |
1b7f4a34 JX |
2929 | #, c-format |
2930 | msgid "When you have resolved this problem, run \"%s --continue\"." | |
2931 | msgstr "当您解决这一问题,执行 \"%s --continue\"。" | |
2932 | ||
5b04ee3b | 2933 | #: builtin/am.c:1188 |
1b7f4a34 JX |
2934 | #, c-format |
2935 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." | |
2936 | msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。" | |
2937 | ||
5b04ee3b | 2938 | #: builtin/am.c:1189 |
1b7f4a34 JX |
2939 | #, c-format |
2940 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." | |
2941 | msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。" | |
2942 | ||
5b04ee3b | 2943 | #: builtin/am.c:1327 |
1b7f4a34 JX |
2944 | msgid "Patch is empty. Was it split wrong?" |
2945 | msgstr "补丁为空。是不是切分错误?" | |
2946 | ||
5b04ee3b | 2947 | #: builtin/am.c:1401 builtin/log.c:1516 |
1b7f4a34 JX |
2948 | #, c-format |
2949 | msgid "invalid ident line: %s" | |
2950 | msgstr "包含无效的身份标识:%s" | |
2951 | ||
5b04ee3b | 2952 | #: builtin/am.c:1428 |
1b7f4a34 JX |
2953 | #, c-format |
2954 | msgid "unable to parse commit %s" | |
2955 | msgstr "不能解析提交 %s" | |
2956 | ||
5b04ee3b | 2957 | #: builtin/am.c:1630 |
1b7f4a34 JX |
2958 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
2959 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
2960 | ||
5b04ee3b | 2961 | #: builtin/am.c:1632 |
1b7f4a34 JX |
2962 | msgid "Using index info to reconstruct a base tree..." |
2963 | msgstr "使用索引来重建一个(三方合并的)基础目录树..." | |
2964 | ||
5b04ee3b | 2965 | #: builtin/am.c:1651 |
1b7f4a34 JX |
2966 | msgid "" |
2967 | "Did you hand edit your patch?\n" | |
2968 | "It does not apply to blobs recorded in its index." | |
2969 | msgstr "" | |
2970 | "您是否曾手动编辑过您的补丁?\n" | |
2971 | "无法应用补丁到索引中的数据对象上。" | |
2972 | ||
5b04ee3b | 2973 | #: builtin/am.c:1657 |
1b7f4a34 JX |
2974 | msgid "Falling back to patching base and 3-way merge..." |
2975 | msgstr "回落到基础版本上打补丁及进行三方合并..." | |
2976 | ||
5b04ee3b | 2977 | #: builtin/am.c:1672 |
1b7f4a34 JX |
2978 | msgid "Failed to merge in the changes." |
2979 | msgstr "无法合并变更。" | |
2980 | ||
5b04ee3b | 2981 | #: builtin/am.c:1696 builtin/merge.c:636 |
1b7f4a34 JX |
2982 | msgid "git write-tree failed to write a tree" |
2983 | msgstr "git write-tree 无法写入一树对象" | |
2984 | ||
5b04ee3b | 2985 | #: builtin/am.c:1703 |
1b7f4a34 JX |
2986 | msgid "applying to an empty history" |
2987 | msgstr "正应用到一个空历史上" | |
2988 | ||
5b04ee3b JX |
2989 | #: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 |
2990 | #: builtin/merge.c:866 | |
1b7f4a34 JX |
2991 | msgid "failed to write commit object" |
2992 | msgstr "无法写提交对象" | |
2993 | ||
5b04ee3b | 2994 | #: builtin/am.c:1748 builtin/am.c:1752 |
1b7f4a34 JX |
2995 | #, c-format |
2996 | msgid "cannot resume: %s does not exist." | |
2997 | msgstr "无法继续:%s 不存在。" | |
2998 | ||
5b04ee3b | 2999 | #: builtin/am.c:1768 |
1b7f4a34 JX |
3000 | msgid "cannot be interactive without stdin connected to a terminal." |
3001 | msgstr "标准输入没有和终端关联,不能进行交互式操作。" | |
3002 | ||
5b04ee3b | 3003 | #: builtin/am.c:1773 |
1b7f4a34 JX |
3004 | msgid "Commit Body is:" |
3005 | msgstr "提交内容为:" | |
3006 | ||
3007 | # 译者:注意保持句尾空格 | |
3008 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] | |
3009 | #. in your translation. The program will only accept English | |
3010 | #. input at this point. | |
3011 | #. | |
5b04ee3b | 3012 | #: builtin/am.c:1783 |
1b7f4a34 JX |
3013 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " |
3014 | msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:" | |
3015 | ||
5b04ee3b | 3016 | #: builtin/am.c:1833 |
1b7f4a34 JX |
3017 | #, c-format |
3018 | msgid "Dirty index: cannot apply patches (dirty: %s)" | |
3019 | msgstr "脏索引:不能应用补丁(脏文件:%s)" | |
3020 | ||
5b04ee3b | 3021 | #: builtin/am.c:1868 builtin/am.c:1940 |
1b7f4a34 JX |
3022 | #, c-format |
3023 | msgid "Applying: %.*s" | |
3024 | msgstr "应用:%.*s" | |
3025 | ||
5b04ee3b | 3026 | #: builtin/am.c:1884 |
1b7f4a34 JX |
3027 | msgid "No changes -- Patch already applied." |
3028 | msgstr "没有变更 —— 补丁已经应用过。" | |
3029 | ||
5b04ee3b | 3030 | #: builtin/am.c:1892 |
1b7f4a34 JX |
3031 | #, c-format |
3032 | msgid "Patch failed at %s %.*s" | |
3033 | msgstr "打补丁失败于 %s %.*s" | |
3034 | ||
5b04ee3b | 3035 | #: builtin/am.c:1898 |
1b7f4a34 JX |
3036 | #, c-format |
3037 | msgid "The copy of the patch that failed is found in: %s" | |
3038 | msgstr "失败的补丁文件副本位于:%s" | |
3039 | ||
5b04ee3b | 3040 | #: builtin/am.c:1943 |
1b7f4a34 JX |
3041 | msgid "" |
3042 | "No changes - did you forget to use 'git add'?\n" | |
3043 | "If there is nothing left to stage, chances are that something else\n" | |
3044 | "already introduced the same changes; you might want to skip this patch." | |
3045 | msgstr "" | |
3046 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
3047 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
3048 | "您也许想要跳过这个补丁。" | |
3049 | ||
5b04ee3b | 3050 | #: builtin/am.c:1950 |
1b7f4a34 JX |
3051 | msgid "" |
3052 | "You still have unmerged paths in your index.\n" | |
3053 | "Did you forget to use 'git add'?" | |
3054 | msgstr "" | |
3055 | "您的索引中仍有未合并的路径。\n" | |
3056 | "您是否忘了执行 'git add'?" | |
3057 | ||
5b04ee3b | 3058 | #: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 |
1b7f4a34 JX |
3059 | #: builtin/reset.c:316 |
3060 | #, c-format | |
3061 | msgid "Could not parse object '%s'." | |
3062 | msgstr "不能解析对象 '%s'。" | |
3063 | ||
5b04ee3b | 3064 | #: builtin/am.c:2110 |
1b7f4a34 JX |
3065 | msgid "failed to clean index" |
3066 | msgstr "无法清空索引" | |
3067 | ||
5b04ee3b | 3068 | #: builtin/am.c:2144 |
1b7f4a34 JX |
3069 | msgid "" |
3070 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
3071 | "Not rewinding to ORIG_HEAD" | |
3072 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" | |
3073 | ||
5b04ee3b | 3074 | #: builtin/am.c:2205 |
1b7f4a34 JX |
3075 | #, c-format |
3076 | msgid "Invalid value for --patch-format: %s" | |
3077 | msgstr "无效的 --patch-format 值:%s" | |
3078 | ||
5b04ee3b | 3079 | #: builtin/am.c:2238 |
94550ed3 JX |
3080 | msgid "git am [<options>] [(<mbox>|<Maildir>)...]" |
3081 | msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]" | |
1b7f4a34 | 3082 | |
5b04ee3b | 3083 | #: builtin/am.c:2239 |
94550ed3 JX |
3084 | msgid "git am [<options>] (--continue | --skip | --abort)" |
3085 | msgstr "git am [<选项>] (--continue | --skip | --abort)" | |
1b7f4a34 | 3086 | |
5b04ee3b | 3087 | #: builtin/am.c:2245 |
1b7f4a34 JX |
3088 | msgid "run interactively" |
3089 | msgstr "以交互式方式运行" | |
3090 | ||
5b04ee3b | 3091 | #: builtin/am.c:2247 |
1b7f4a34 JX |
3092 | msgid "historical option -- no-op" |
3093 | msgstr "老的参数 —— 无作用" | |
3094 | ||
5b04ee3b | 3095 | #: builtin/am.c:2249 |
1b7f4a34 JX |
3096 | msgid "allow fall back on 3way merging if needed" |
3097 | msgstr "如果必要,允许使用三方合并。" | |
3098 | ||
5b04ee3b | 3099 | #: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 |
1b7f4a34 JX |
3100 | #: builtin/repack.c:171 |
3101 | msgid "be quiet" | |
3102 | msgstr "静默模式" | |
3103 | ||
5b04ee3b | 3104 | #: builtin/am.c:2252 |
1b7f4a34 JX |
3105 | msgid "add a Signed-off-by line to the commit message" |
3106 | msgstr "在提交说明中添加一个 Signed-off-by 签名" | |
3107 | ||
5b04ee3b | 3108 | #: builtin/am.c:2255 |
1b7f4a34 JX |
3109 | msgid "recode into utf8 (default)" |
3110 | msgstr "使用 utf8 字符集(默认)" | |
3111 | ||
5b04ee3b | 3112 | #: builtin/am.c:2257 |
1b7f4a34 JX |
3113 | msgid "pass -k flag to git-mailinfo" |
3114 | msgstr "向 git-mailinfo 传递 -k 参数" | |
3115 | ||
5b04ee3b | 3116 | #: builtin/am.c:2259 |
1b7f4a34 JX |
3117 | msgid "pass -b flag to git-mailinfo" |
3118 | msgstr "向 git-mailinfo 传递 -b 参数" | |
3119 | ||
5b04ee3b | 3120 | #: builtin/am.c:2261 |
1b7f4a34 JX |
3121 | msgid "pass -m flag to git-mailinfo" |
3122 | msgstr "向 git-mailinfo 传递 -m 参数" | |
3123 | ||
5b04ee3b | 3124 | #: builtin/am.c:2263 |
1b7f4a34 JX |
3125 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" |
3126 | msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数" | |
3127 | ||
5b04ee3b | 3128 | #: builtin/am.c:2266 |
1b7f4a34 JX |
3129 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" |
3130 | msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置" | |
3131 | ||
5b04ee3b | 3132 | #: builtin/am.c:2269 |
1b7f4a34 JX |
3133 | msgid "strip everything before a scissors line" |
3134 | msgstr "丢弃裁切线前的所有内容" | |
3135 | ||
5b04ee3b | 3136 | #: builtin/am.c:2270 builtin/apply.c:4546 |
1b7f4a34 JX |
3137 | msgid "action" |
3138 | msgstr "动作" | |
3139 | ||
5b04ee3b JX |
3140 | #: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 |
3141 | #: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 | |
3142 | #: builtin/am.c:2298 | |
1b7f4a34 JX |
3143 | msgid "pass it through git-apply" |
3144 | msgstr "传递给 git-apply" | |
3145 | ||
5b04ee3b | 3146 | #: builtin/am.c:2279 builtin/apply.c:4570 |
1b7f4a34 JX |
3147 | msgid "root" |
3148 | msgstr "根目录" | |
3149 | ||
5b04ee3b JX |
3150 | #: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 |
3151 | #: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 | |
3152 | #: builtin/pull.c:179 builtin/submodule--helper.c:277 | |
3153 | #: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485 | |
3154 | #: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 | |
3155 | #: builtin/submodule--helper.c:770 | |
1b7f4a34 JX |
3156 | msgid "path" |
3157 | msgstr "路径" | |
3158 | ||
5b04ee3b JX |
3159 | #: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 |
3160 | #: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 | |
3161 | #: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182 | |
276ceeaa JX |
3162 | #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340 |
3163 | #: parse-options.h:132 parse-options.h:134 parse-options.h:244 | |
1b7f4a34 JX |
3164 | msgid "n" |
3165 | msgstr "n" | |
3166 | ||
5b04ee3b | 3167 | #: builtin/am.c:2291 builtin/apply.c:4514 |
1b7f4a34 JX |
3168 | msgid "num" |
3169 | msgstr "数字" | |
3170 | ||
5b04ee3b | 3171 | #: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 |
94550ed3 | 3172 | #: builtin/tag.c:372 |
1b7f4a34 JX |
3173 | msgid "format" |
3174 | msgstr "格式" | |
3175 | ||
5b04ee3b | 3176 | #: builtin/am.c:2295 |
1b7f4a34 JX |
3177 | msgid "format the patch(es) are in" |
3178 | msgstr "补丁的格式" | |
3179 | ||
5b04ee3b | 3180 | #: builtin/am.c:2301 |
1b7f4a34 JX |
3181 | msgid "override error message when patch failure occurs" |
3182 | msgstr "打补丁失败时显示的错误信息" | |
3183 | ||
5b04ee3b | 3184 | #: builtin/am.c:2303 |
1b7f4a34 JX |
3185 | msgid "continue applying patches after resolving a conflict" |
3186 | msgstr "冲突解决后继续应用补丁" | |
3187 | ||
5b04ee3b | 3188 | #: builtin/am.c:2306 |
1b7f4a34 JX |
3189 | msgid "synonyms for --continue" |
3190 | msgstr "和 --continue 同义" | |
3191 | ||
5b04ee3b | 3192 | #: builtin/am.c:2309 |
1b7f4a34 JX |
3193 | msgid "skip the current patch" |
3194 | msgstr "跳过当前补丁" | |
3195 | ||
5b04ee3b | 3196 | #: builtin/am.c:2312 |
1b7f4a34 JX |
3197 | msgid "restore the original branch and abort the patching operation." |
3198 | msgstr "恢复原始分支并终止打补丁操作。" | |
3199 | ||
5b04ee3b | 3200 | #: builtin/am.c:2316 |
1b7f4a34 JX |
3201 | msgid "lie about committer date" |
3202 | msgstr "将作者日期作为提交日期" | |
3203 | ||
5b04ee3b | 3204 | #: builtin/am.c:2318 |
1b7f4a34 JX |
3205 | msgid "use current timestamp for author date" |
3206 | msgstr "用当前时间作为作者日期" | |
3207 | ||
5b04ee3b JX |
3208 | #: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 |
3209 | #: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 | |
1b7f4a34 JX |
3210 | msgid "key-id" |
3211 | msgstr "key-id" | |
3212 | ||
5b04ee3b | 3213 | #: builtin/am.c:2321 |
1b7f4a34 JX |
3214 | msgid "GPG-sign commits" |
3215 | msgstr "使用 GPG 签名提交" | |
3216 | ||
5b04ee3b | 3217 | #: builtin/am.c:2324 |
1b7f4a34 JX |
3218 | msgid "(internal use for git-rebase)" |
3219 | msgstr "(内部使用,用于 git-rebase)" | |
3220 | ||
5b04ee3b | 3221 | #: builtin/am.c:2339 |
1b7f4a34 JX |
3222 | msgid "" |
3223 | "The -b/--binary option has been a no-op for long time, and\n" | |
3224 | "it will be removed. Please do not use it anymore." | |
3225 | msgstr "" | |
3226 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n" | |
3227 | "请不要再使用它了。" | |
3228 | ||
5b04ee3b | 3229 | #: builtin/am.c:2346 |
1b7f4a34 JX |
3230 | msgid "failed to read the index" |
3231 | msgstr "无法读取索引" | |
3232 | ||
5b04ee3b | 3233 | #: builtin/am.c:2361 |
1b7f4a34 JX |
3234 | #, c-format |
3235 | msgid "previous rebase directory %s still exists but mbox given." | |
3236 | msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。" | |
3237 | ||
5b04ee3b | 3238 | #: builtin/am.c:2385 |
1b7f4a34 JX |
3239 | #, c-format |
3240 | msgid "" | |
3241 | "Stray %s directory found.\n" | |
3242 | "Use \"git am --abort\" to remove it." | |
3243 | msgstr "" | |
3244 | "发现了错误的 %s 目录。\n" | |
3245 | "使用 \"git am --abort\" 删除它。" | |
3246 | ||
5b04ee3b | 3247 | #: builtin/am.c:2391 |
1b7f4a34 JX |
3248 | msgid "Resolve operation not in progress, we are not resuming." |
3249 | msgstr "解决操作未进行,我们不会继续。" | |
3250 | ||
814ff314 JX |
3251 | #: builtin/apply.c:59 |
3252 | msgid "git apply [<options>] [<patch>...]" | |
3253 | msgstr "git apply [<选项>] [<补丁>...]" | |
8ada9598 | 3254 | |
94550ed3 | 3255 | #: builtin/apply.c:111 |
81809b99 | 3256 | #, c-format |
8ada9598 | 3257 | msgid "unrecognized whitespace option '%s'" |
81809b99 | 3258 | msgstr "未能识别的空白字符选项 '%s'" |
8ada9598 | 3259 | |
94550ed3 | 3260 | #: builtin/apply.c:126 |
81809b99 | 3261 | #, c-format |
8ada9598 | 3262 | msgid "unrecognized whitespace ignore option '%s'" |
81809b99 | 3263 | msgstr "未能识别的空白字符忽略选项 '%s'" |
8ada9598 | 3264 | |
94550ed3 | 3265 | #: builtin/apply.c:818 |
8ada9598 JX |
3266 | #, c-format |
3267 | msgid "Cannot prepare timestamp regexp %s" | |
81809b99 | 3268 | msgstr "无法准备时间戳正则表达式 %s" |
8ada9598 | 3269 | |
94550ed3 | 3270 | #: builtin/apply.c:827 |
8ada9598 JX |
3271 | #, c-format |
3272 | msgid "regexec returned %d for input: %s" | |
81809b99 | 3273 | msgstr "regexec 返回 %d,输入为:%s" |
8ada9598 | 3274 | |
94550ed3 | 3275 | #: builtin/apply.c:908 |
81809b99 | 3276 | #, c-format |
8ada9598 | 3277 | msgid "unable to find filename in patch at line %d" |
81809b99 | 3278 | msgstr "不能在补丁的第 %d 行找到文件名" |
8ada9598 | 3279 | |
5b04ee3b | 3280 | #: builtin/apply.c:937 |
8ada9598 JX |
3281 | #, c-format |
3282 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" | |
9aafc933 | 3283 | msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" |
8ada9598 | 3284 | |
5b04ee3b | 3285 | #: builtin/apply.c:942 |
8ada9598 JX |
3286 | #, c-format |
3287 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" | |
81809b99 | 3288 | msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" |
8ada9598 | 3289 | |
5b04ee3b | 3290 | #: builtin/apply.c:943 |
8ada9598 JX |
3291 | #, c-format |
3292 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" | |
81809b99 | 3293 | msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" |
8ada9598 | 3294 | |
5b04ee3b | 3295 | #: builtin/apply.c:949 |
8ada9598 JX |
3296 | #, c-format |
3297 | msgid "git apply: bad git-diff - expected /dev/null on line %d" | |
9aafc933 | 3298 | msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" |
8ada9598 | 3299 | |
5b04ee3b | 3300 | #: builtin/apply.c:1406 |
8ada9598 JX |
3301 | #, c-format |
3302 | msgid "recount: unexpected line: %.*s" | |
81809b99 | 3303 | msgstr "recount:意外的行:%.*s" |
8ada9598 | 3304 | |
5b04ee3b | 3305 | #: builtin/apply.c:1463 |
8ada9598 JX |
3306 | #, c-format |
3307 | msgid "patch fragment without header at line %d: %.*s" | |
81809b99 | 3308 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" |
8ada9598 | 3309 | |
5b04ee3b | 3310 | #: builtin/apply.c:1480 |
8ada9598 JX |
3311 | #, c-format |
3312 | msgid "" | |
3313 | "git diff header lacks filename information when removing %d leading pathname " | |
3314 | "component (line %d)" | |
3315 | msgid_plural "" | |
3316 | "git diff header lacks filename information when removing %d leading pathname " | |
3317 | "components (line %d)" | |
5ae481e0 JX |
3318 | msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" |
3319 | msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
8ada9598 | 3320 | |
5b04ee3b | 3321 | #: builtin/apply.c:1646 |
8ada9598 | 3322 | msgid "new file depends on old contents" |
81809b99 | 3323 | msgstr "新文件依赖旧内容" |
8ada9598 | 3324 | |
5b04ee3b | 3325 | #: builtin/apply.c:1648 |
8ada9598 | 3326 | msgid "deleted file still has contents" |
81809b99 | 3327 | msgstr "删除的文件仍有内容" |
8ada9598 | 3328 | |
5b04ee3b | 3329 | #: builtin/apply.c:1674 |
8ada9598 JX |
3330 | #, c-format |
3331 | msgid "corrupt patch at line %d" | |
195febda | 3332 | msgstr "补丁在第 %d 行损坏" |
8ada9598 | 3333 | |
5b04ee3b | 3334 | #: builtin/apply.c:1710 |
8ada9598 JX |
3335 | #, c-format |
3336 | msgid "new file %s depends on old contents" | |
81809b99 | 3337 | msgstr "新文件 %s 依赖旧内容" |
8ada9598 | 3338 | |
5b04ee3b | 3339 | #: builtin/apply.c:1712 |
8ada9598 JX |
3340 | #, c-format |
3341 | msgid "deleted file %s still has contents" | |
81809b99 | 3342 | msgstr "删除的文件 %s 仍有内容" |
8ada9598 | 3343 | |
5b04ee3b | 3344 | #: builtin/apply.c:1715 |
8ada9598 JX |
3345 | #, c-format |
3346 | msgid "** warning: file %s becomes empty but is not deleted" | |
81809b99 | 3347 | msgstr "** 警告:文件 %s 成为空文件但并未删除" |
8ada9598 | 3348 | |
5b04ee3b | 3349 | #: builtin/apply.c:1861 |
8ada9598 JX |
3350 | #, c-format |
3351 | msgid "corrupt binary patch at line %d: %.*s" | |
81809b99 | 3352 | msgstr "二进制补丁在第 %d 行损坏:%.*s" |
8ada9598 | 3353 | |
5b04ee3b | 3354 | #: builtin/apply.c:1895 |
8ada9598 JX |
3355 | #, c-format |
3356 | msgid "unrecognized binary patch at line %d" | |
81809b99 | 3357 | msgstr "未能识别的二进制补丁位于第 %d 行" |
8ada9598 | 3358 | |
5b04ee3b | 3359 | #: builtin/apply.c:2048 |
8ada9598 JX |
3360 | #, c-format |
3361 | msgid "patch with only garbage at line %d" | |
81809b99 | 3362 | msgstr "补丁文件的第 %d 行只有垃圾数据" |
8ada9598 | 3363 | |
5b04ee3b | 3364 | #: builtin/apply.c:2138 |
81809b99 | 3365 | #, c-format |
8ada9598 | 3366 | msgid "unable to read symlink %s" |
81809b99 | 3367 | msgstr "无法读取符号链接 %s" |
8ada9598 | 3368 | |
5b04ee3b | 3369 | #: builtin/apply.c:2142 |
81809b99 | 3370 | #, c-format |
8ada9598 | 3371 | msgid "unable to open or read %s" |
81809b99 | 3372 | msgstr "不能打开或读取 %s" |
8ada9598 | 3373 | |
5b04ee3b | 3374 | #: builtin/apply.c:2775 |
81809b99 | 3375 | #, c-format |
8ada9598 | 3376 | msgid "invalid start of line: '%c'" |
81809b99 | 3377 | msgstr "无效的行首字符:'%c'" |
8ada9598 | 3378 | |
5b04ee3b | 3379 | #: builtin/apply.c:2894 |
8ada9598 JX |
3380 | #, c-format |
3381 | msgid "Hunk #%d succeeded at %d (offset %d line)." | |
3382 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." | |
07432cef WS |
3383 | msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" |
3384 | msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
8ada9598 | 3385 | |
5b04ee3b | 3386 | #: builtin/apply.c:2906 |
8ada9598 JX |
3387 | #, c-format |
3388 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" | |
81809b99 | 3389 | msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" |
8ada9598 | 3390 | |
5b04ee3b | 3391 | #: builtin/apply.c:2912 |
8ada9598 JX |
3392 | #, c-format |
3393 | msgid "" | |
3394 | "while searching for:\n" | |
3395 | "%.*s" | |
3396 | msgstr "" | |
81809b99 JX |
3397 | "当查询:\n" |
3398 | "%.*s" | |
8ada9598 | 3399 | |
5b04ee3b | 3400 | #: builtin/apply.c:2932 |
8ada9598 JX |
3401 | #, c-format |
3402 | msgid "missing binary patch data for '%s'" | |
81809b99 | 3403 | msgstr "缺失 '%s' 的二进制补丁数据" |
8ada9598 | 3404 | |
5b04ee3b | 3405 | #: builtin/apply.c:3033 |
8ada9598 JX |
3406 | #, c-format |
3407 | msgid "binary patch does not apply to '%s'" | |
81809b99 | 3408 | msgstr "二进制补丁未应用到 '%s'" |
8ada9598 | 3409 | |
5b04ee3b | 3410 | #: builtin/apply.c:3039 |
8ada9598 JX |
3411 | #, c-format |
3412 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" | |
9aafc933 | 3413 | msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" |
8ada9598 | 3414 | |
5b04ee3b | 3415 | #: builtin/apply.c:3060 |
8ada9598 JX |
3416 | #, c-format |
3417 | msgid "patch failed: %s:%ld" | |
81809b99 | 3418 | msgstr "打补丁失败:%s:%ld" |
8ada9598 | 3419 | |
5b04ee3b | 3420 | #: builtin/apply.c:3184 |
8ada9598 | 3421 | #, c-format |
23ff3338 JX |
3422 | msgid "cannot checkout %s" |
3423 | msgstr "不能检出 %s" | |
8ada9598 | 3424 | |
5b04ee3b | 3425 | #: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 |
81809b99 | 3426 | #, c-format |
8ada9598 | 3427 | msgid "read of %s failed" |
81809b99 | 3428 | msgstr "读取 %s 失败" |
8ada9598 | 3429 | |
5b04ee3b | 3430 | #: builtin/apply.c:3237 |
814ff314 JX |
3431 | #, c-format |
3432 | msgid "reading from '%s' beyond a symbolic link" | |
3433 | msgstr "读取位于符号链接中的 '%s'" | |
3434 | ||
5b04ee3b | 3435 | #: builtin/apply.c:3265 builtin/apply.c:3487 |
81809b99 | 3436 | #, c-format |
23ff3338 JX |
3437 | msgid "path %s has been renamed/deleted" |
3438 | msgstr "路径 %s 已经被重命名/删除" | |
8ada9598 | 3439 | |
5b04ee3b | 3440 | #: builtin/apply.c:3346 builtin/apply.c:3501 |
8ada9598 | 3441 | #, c-format |
23ff3338 JX |
3442 | msgid "%s: does not exist in index" |
3443 | msgstr "%s:不存在于索引中" | |
8ada9598 | 3444 | |
5b04ee3b | 3445 | #: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 |
81809b99 | 3446 | #, c-format |
8ada9598 | 3447 | msgid "%s: %s" |
81809b99 | 3448 | msgstr "%s:%s" |
8ada9598 | 3449 | |
5b04ee3b | 3450 | #: builtin/apply.c:3355 builtin/apply.c:3509 |
81809b99 | 3451 | #, c-format |
8ada9598 | 3452 | msgid "%s: does not match index" |
81809b99 | 3453 | msgstr "%s:和索引不匹配" |
8ada9598 | 3454 | |
5b04ee3b | 3455 | #: builtin/apply.c:3457 |
23ff3338 JX |
3456 | msgid "removal patch leaves file contents" |
3457 | msgstr "移除补丁仍留下了文件内容" | |
3458 | ||
5b04ee3b | 3459 | #: builtin/apply.c:3526 |
8ada9598 JX |
3460 | #, c-format |
3461 | msgid "%s: wrong type" | |
81809b99 | 3462 | msgstr "%s:错误类型" |
8ada9598 | 3463 | |
5b04ee3b | 3464 | #: builtin/apply.c:3528 |
8ada9598 JX |
3465 | #, c-format |
3466 | msgid "%s has type %o, expected %o" | |
9aafc933 | 3467 | msgstr "%s 的类型是 %o,应为 %o" |
8ada9598 | 3468 | |
5b04ee3b | 3469 | #: builtin/apply.c:3687 builtin/apply.c:3689 |
814ff314 JX |
3470 | #, c-format |
3471 | msgid "invalid path '%s'" | |
3472 | msgstr "无效路径 '%s'" | |
3473 | ||
5b04ee3b | 3474 | #: builtin/apply.c:3744 |
81809b99 | 3475 | #, c-format |
8ada9598 | 3476 | msgid "%s: already exists in index" |
81809b99 | 3477 | msgstr "%s:已经存在于索引中" |
8ada9598 | 3478 | |
5b04ee3b | 3479 | #: builtin/apply.c:3747 |
23ff3338 JX |
3480 | #, c-format |
3481 | msgid "%s: already exists in working directory" | |
3482 | msgstr "%s:已经存在于工作区中" | |
3483 | ||
5b04ee3b | 3484 | #: builtin/apply.c:3767 |
d691f479 JX |
3485 | #, c-format |
3486 | msgid "new mode (%o) of %s does not match old mode (%o)" | |
3487 | msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" | |
8ada9598 | 3488 | |
5b04ee3b | 3489 | #: builtin/apply.c:3772 |
8ada9598 | 3490 | #, c-format |
d691f479 JX |
3491 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
3492 | msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" | |
3493 | ||
5b04ee3b | 3494 | #: builtin/apply.c:3792 |
814ff314 JX |
3495 | #, c-format |
3496 | msgid "affected file '%s' is beyond a symbolic link" | |
3497 | msgstr "受影响的文件 '%s' 位于符号链接中" | |
3498 | ||
5b04ee3b | 3499 | #: builtin/apply.c:3796 |
d691f479 | 3500 | #, c-format |
8ada9598 | 3501 | msgid "%s: patch does not apply" |
81809b99 | 3502 | msgstr "%s:补丁未应用" |
8ada9598 | 3503 | |
5b04ee3b | 3504 | #: builtin/apply.c:3810 |
8ada9598 JX |
3505 | #, c-format |
3506 | msgid "Checking patch %s..." | |
81809b99 | 3507 | msgstr "检查补丁 %s..." |
8ada9598 | 3508 | |
5b04ee3b | 3509 | #: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 |
8ada9598 JX |
3510 | #, c-format |
3511 | msgid "make_cache_entry failed for path '%s'" | |
3512 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" | |
3513 | ||
5b04ee3b | 3514 | #: builtin/apply.c:4046 |
81809b99 | 3515 | #, c-format |
8ada9598 | 3516 | msgid "unable to remove %s from index" |
81809b99 | 3517 | msgstr "不能从索引中移除 %s" |
8ada9598 | 3518 | |
5b04ee3b | 3519 | #: builtin/apply.c:4075 |
8ada9598 | 3520 | #, c-format |
2e8451e8 JX |
3521 | msgid "corrupt patch for submodule %s" |
3522 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 3523 | |
5b04ee3b | 3524 | #: builtin/apply.c:4079 |
81809b99 | 3525 | #, c-format |
8ada9598 | 3526 | msgid "unable to stat newly created file '%s'" |
81809b99 | 3527 | msgstr "不能枚举新建文件 '%s' 的状态" |
8ada9598 | 3528 | |
5b04ee3b | 3529 | #: builtin/apply.c:4084 |
8ada9598 JX |
3530 | #, c-format |
3531 | msgid "unable to create backing store for newly created file %s" | |
81809b99 | 3532 | msgstr "不能为新建文件 %s 创建后端存储" |
8ada9598 | 3533 | |
5b04ee3b | 3534 | #: builtin/apply.c:4087 builtin/apply.c:4195 |
81809b99 | 3535 | #, c-format |
8ada9598 | 3536 | msgid "unable to add cache entry for %s" |
81809b99 | 3537 | msgstr "无法为 %s 添加缓存条目" |
8ada9598 | 3538 | |
5b04ee3b | 3539 | #: builtin/apply.c:4120 |
81809b99 | 3540 | #, c-format |
8ada9598 | 3541 | msgid "closing file '%s'" |
81809b99 | 3542 | msgstr "关闭文件 '%s'" |
8ada9598 | 3543 | |
5b04ee3b | 3544 | #: builtin/apply.c:4169 |
81809b99 | 3545 | #, c-format |
8ada9598 | 3546 | msgid "unable to write file '%s' mode %o" |
81809b99 | 3547 | msgstr "不能写文件 '%s' 权限 %o" |
8ada9598 | 3548 | |
5b04ee3b | 3549 | #: builtin/apply.c:4256 |
8ada9598 JX |
3550 | #, c-format |
3551 | msgid "Applied patch %s cleanly." | |
81809b99 | 3552 | msgstr "成功应用补丁 %s。" |
8ada9598 | 3553 | |
5b04ee3b | 3554 | #: builtin/apply.c:4264 |
8ada9598 | 3555 | msgid "internal error" |
81809b99 | 3556 | msgstr "内部错误" |
8ada9598 | 3557 | |
5b04ee3b | 3558 | #: builtin/apply.c:4267 |
8ada9598 JX |
3559 | #, c-format |
3560 | msgid "Applying patch %%s with %d reject..." | |
3561 | msgid_plural "Applying patch %%s with %d rejects..." | |
195febda T |
3562 | msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." |
3563 | msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
8ada9598 | 3564 | |
5b04ee3b | 3565 | #: builtin/apply.c:4277 |
8ada9598 JX |
3566 | #, c-format |
3567 | msgid "truncating .rej filename to %.*s.rej" | |
81809b99 | 3568 | msgstr "截短 .rej 文件名为 %.*s.rej" |
8ada9598 | 3569 | |
5b04ee3b JX |
3570 | #: builtin/apply.c:4285 |
3571 | #, c-format | |
3572 | msgid "cannot open %s: %s" | |
3573 | msgstr "不能打开 %s:%s" | |
3574 | ||
3575 | #: builtin/apply.c:4298 | |
8ada9598 JX |
3576 | #, c-format |
3577 | msgid "Hunk #%d applied cleanly." | |
81809b99 | 3578 | msgstr "第 #%d 个片段成功应用。" |
8ada9598 | 3579 | |
5b04ee3b | 3580 | #: builtin/apply.c:4301 |
8ada9598 JX |
3581 | #, c-format |
3582 | msgid "Rejected hunk #%d." | |
81809b99 | 3583 | msgstr "拒绝第 #%d 个片段。" |
8ada9598 | 3584 | |
5b04ee3b JX |
3585 | #: builtin/apply.c:4387 |
3586 | #, c-format | |
3587 | msgid "Skipped patch '%s'." | |
3588 | msgstr "略过补丁 '%s'。" | |
3589 | ||
3590 | #: builtin/apply.c:4395 | |
8ada9598 | 3591 | msgid "unrecognized input" |
81809b99 | 3592 | msgstr "未能识别的输入" |
8ada9598 | 3593 | |
5b04ee3b | 3594 | #: builtin/apply.c:4406 |
8ada9598 | 3595 | msgid "unable to read index file" |
81809b99 | 3596 | msgstr "无法读取索引文件" |
8ada9598 | 3597 | |
5b04ee3b | 3598 | #: builtin/apply.c:4509 |
8ada9598 | 3599 | msgid "don't apply changes matching the given path" |
81809b99 | 3600 | msgstr "不要应用与给出路径向匹配的变更" |
8ada9598 | 3601 | |
5b04ee3b | 3602 | #: builtin/apply.c:4512 |
8ada9598 | 3603 | msgid "apply changes matching the given path" |
81809b99 | 3604 | msgstr "应用与给出路径向匹配的变更" |
8ada9598 | 3605 | |
5b04ee3b | 3606 | #: builtin/apply.c:4515 |
8ada9598 | 3607 | msgid "remove <num> leading slashes from traditional diff paths" |
07432cef | 3608 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" |
8ada9598 | 3609 | |
5b04ee3b | 3610 | #: builtin/apply.c:4518 |
8ada9598 | 3611 | msgid "ignore additions made by the patch" |
81809b99 | 3612 | msgstr "忽略补丁中的添加的文件" |
8ada9598 | 3613 | |
5b04ee3b | 3614 | #: builtin/apply.c:4520 |
8ada9598 | 3615 | msgid "instead of applying the patch, output diffstat for the input" |
81809b99 | 3616 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" |
8ada9598 | 3617 | |
5b04ee3b | 3618 | #: builtin/apply.c:4524 |
ef317cd5 | 3619 | msgid "show number of added and deleted lines in decimal notation" |
07432cef | 3620 | msgstr "以十进制数显示添加和删除的行数" |
8ada9598 | 3621 | |
5b04ee3b | 3622 | #: builtin/apply.c:4526 |
8ada9598 | 3623 | msgid "instead of applying the patch, output a summary for the input" |
81809b99 | 3624 | msgstr "不应用补丁,而是显示输入的概要" |
8ada9598 | 3625 | |
5b04ee3b | 3626 | #: builtin/apply.c:4528 |
8ada9598 | 3627 | msgid "instead of applying the patch, see if the patch is applicable" |
81809b99 | 3628 | msgstr "不应用补丁,而是查看补丁是否可应用" |
8ada9598 | 3629 | |
5b04ee3b | 3630 | #: builtin/apply.c:4530 |
8ada9598 | 3631 | msgid "make sure the patch is applicable to the current index" |
81809b99 | 3632 | msgstr "确认补丁可以应用到当前索引" |
8ada9598 | 3633 | |
5b04ee3b | 3634 | #: builtin/apply.c:4532 |
8ada9598 | 3635 | msgid "apply a patch without touching the working tree" |
81809b99 | 3636 | msgstr "应用补丁而不修改工作区" |
8ada9598 | 3637 | |
5b04ee3b | 3638 | #: builtin/apply.c:4534 |
814ff314 JX |
3639 | msgid "accept a patch that touches outside the working area" |
3640 | msgstr "接受修改工作区之外文件的补丁" | |
3641 | ||
5b04ee3b | 3642 | #: builtin/apply.c:4536 |
8ada9598 | 3643 | msgid "also apply the patch (use with --stat/--summary/--check)" |
195febda | 3644 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" |
8ada9598 | 3645 | |
5b04ee3b | 3646 | #: builtin/apply.c:4538 |
23ff3338 | 3647 | msgid "attempt three-way merge if a patch does not apply" |
160fb2b2 | 3648 | msgstr "如果一个补丁不能应用则尝试三方合并" |
23ff3338 | 3649 | |
5b04ee3b | 3650 | #: builtin/apply.c:4540 |
8ada9598 | 3651 | msgid "build a temporary index based on embedded index information" |
81809b99 | 3652 | msgstr "创建一个临时索引基于嵌入的索引信息" |
8ada9598 | 3653 | |
5b04ee3b | 3654 | #: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 |
8ada9598 | 3655 | msgid "paths are separated with NUL character" |
81809b99 | 3656 | msgstr "路径以 NUL 字符分隔" |
8ada9598 | 3657 | |
5b04ee3b | 3658 | #: builtin/apply.c:4545 |
8ada9598 | 3659 | msgid "ensure at least <n> lines of context match" |
81809b99 | 3660 | msgstr "确保至少匹配 <n> 行上下文" |
8ada9598 | 3661 | |
5b04ee3b | 3662 | #: builtin/apply.c:4547 |
8ada9598 | 3663 | msgid "detect new or modified lines that have whitespace errors" |
81809b99 | 3664 | msgstr "检查新增和修改的行中间的空白字符滥用" |
8ada9598 | 3665 | |
5b04ee3b | 3666 | #: builtin/apply.c:4550 builtin/apply.c:4553 |
8ada9598 | 3667 | msgid "ignore changes in whitespace when finding context" |
81809b99 | 3668 | msgstr "查找上下文时忽略空白字符的变更" |
8ada9598 | 3669 | |
5b04ee3b | 3670 | #: builtin/apply.c:4556 |
8ada9598 | 3671 | msgid "apply the patch in reverse" |
81809b99 | 3672 | msgstr "反向应用补丁" |
8ada9598 | 3673 | |
5b04ee3b | 3674 | #: builtin/apply.c:4558 |
8ada9598 | 3675 | msgid "don't expect at least one line of context" |
81809b99 | 3676 | msgstr "无需至少一行上下文" |
8ada9598 | 3677 | |
5b04ee3b | 3678 | #: builtin/apply.c:4560 |
8ada9598 | 3679 | msgid "leave the rejected hunks in corresponding *.rej files" |
81809b99 | 3680 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" |
8ada9598 | 3681 | |
5b04ee3b | 3682 | #: builtin/apply.c:4562 |
8ada9598 | 3683 | msgid "allow overlapping hunks" |
81809b99 | 3684 | msgstr "允许重叠的补丁片段" |
8ada9598 | 3685 | |
5b04ee3b | 3686 | #: builtin/apply.c:4565 |
8ada9598 | 3687 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
195febda | 3688 | msgstr "允许不正确的文件末尾换行符" |
c04f5ac3 | 3689 | |
5b04ee3b | 3690 | #: builtin/apply.c:4568 |
8ada9598 | 3691 | msgid "do not trust the line counts in the hunk headers" |
81809b99 | 3692 | msgstr "不信任补丁片段的头信息中的行号" |
c04f5ac3 | 3693 | |
5b04ee3b | 3694 | #: builtin/apply.c:4571 |
8ada9598 | 3695 | msgid "prepend <root> to all filenames" |
81809b99 | 3696 | msgstr "为所有文件名前添加 <根目录>" |
c04f5ac3 | 3697 | |
5b04ee3b | 3698 | #: builtin/apply.c:4593 |
23ff3338 | 3699 | msgid "--3way outside a repository" |
160fb2b2 | 3700 | msgstr "--3way 在一个仓库之外" |
23ff3338 | 3701 | |
5b04ee3b | 3702 | #: builtin/apply.c:4601 |
8ada9598 | 3703 | msgid "--index outside a repository" |
160fb2b2 | 3704 | msgstr "--index 在一个仓库之外" |
c04f5ac3 | 3705 | |
5b04ee3b | 3706 | #: builtin/apply.c:4604 |
8ada9598 | 3707 | msgid "--cached outside a repository" |
160fb2b2 | 3708 | msgstr "--cached 在一个仓库之外" |
c04f5ac3 | 3709 | |
5b04ee3b | 3710 | #: builtin/apply.c:4623 |
81809b99 | 3711 | #, c-format |
8ada9598 | 3712 | msgid "can't open patch '%s'" |
81809b99 | 3713 | msgstr "不能打开补丁 '%s'" |
c04f5ac3 | 3714 | |
5b04ee3b | 3715 | #: builtin/apply.c:4637 |
c04f5ac3 | 3716 | #, c-format |
8ada9598 JX |
3717 | msgid "squelched %d whitespace error" |
3718 | msgid_plural "squelched %d whitespace errors" | |
81809b99 | 3719 | msgstr[0] "抑制下仍有 %d 个空白字符误用" |
5ae481e0 | 3720 | msgstr[1] "抑制下仍有 %d 个空白字符误用" |
c04f5ac3 | 3721 | |
5b04ee3b | 3722 | #: builtin/apply.c:4643 builtin/apply.c:4653 |
8ada9598 JX |
3723 | #, c-format |
3724 | msgid "%d line adds whitespace errors." | |
3725 | msgid_plural "%d lines add whitespace errors." | |
81809b99 | 3726 | msgstr[0] "%d 行有空白字符误用。" |
5ae481e0 | 3727 | msgstr[1] "%d 行有空白字符误用。" |
c04f5ac3 JX |
3728 | |
3729 | #: builtin/archive.c:17 | |
3730 | #, c-format | |
3731 | msgid "could not create archive file '%s'" | |
90e6ef53 | 3732 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
3733 | |
3734 | #: builtin/archive.c:20 | |
3735 | msgid "could not redirect output" | |
195febda | 3736 | msgstr "不能重定向输出" |
c04f5ac3 JX |
3737 | |
3738 | #: builtin/archive.c:37 | |
3739 | msgid "git archive: Remote with no URL" | |
4375c10e | 3740 | msgstr "git archive:未提供远程 URL" |
c04f5ac3 JX |
3741 | |
3742 | #: builtin/archive.c:58 | |
3743 | msgid "git archive: expected ACK/NAK, got EOF" | |
4375c10e | 3744 | msgstr "git archive:应为 ACK/NACK,却得到 EOF" |
c04f5ac3 | 3745 | |
1003b3a5 | 3746 | #: builtin/archive.c:61 |
c04f5ac3 JX |
3747 | #, c-format |
3748 | msgid "git archive: NACK %s" | |
90e6ef53 | 3749 | msgstr "git archive:NACK %s" |
c04f5ac3 | 3750 | |
1003b3a5 | 3751 | #: builtin/archive.c:63 |
c04f5ac3 JX |
3752 | #, c-format |
3753 | msgid "remote error: %s" | |
3754 | msgstr "远程错误:%s" | |
3755 | ||
1003b3a5 | 3756 | #: builtin/archive.c:64 |
c04f5ac3 | 3757 | msgid "git archive: protocol error" |
90e6ef53 | 3758 | msgstr "git archive:协议错误" |
c04f5ac3 | 3759 | |
1003b3a5 | 3760 | #: builtin/archive.c:68 |
c04f5ac3 | 3761 | msgid "git archive: expected a flush" |
195febda | 3762 | msgstr "git archive:应为刷新" |
c04f5ac3 | 3763 | |
ef317cd5 JX |
3764 | #: builtin/bisect--helper.c:7 |
3765 | msgid "git bisect--helper --next-all [--no-checkout]" | |
07432cef | 3766 | msgstr "git bisect--helper --next-all [--no-checkout]" |
ef317cd5 JX |
3767 | |
3768 | #: builtin/bisect--helper.c:17 | |
3769 | msgid "perform 'git bisect next'" | |
07432cef | 3770 | msgstr "执行 'git bisect next'" |
ef317cd5 JX |
3771 | |
3772 | #: builtin/bisect--helper.c:19 | |
3773 | msgid "update BISECT_HEAD instead of checking out the current commit" | |
07432cef | 3774 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
ef317cd5 | 3775 | |
276ceeaa | 3776 | #: builtin/blame.c:33 |
7aea43ff JX |
3777 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" |
3778 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" | |
ef317cd5 | 3779 | |
276ceeaa | 3780 | #: builtin/blame.c:38 |
814ff314 JX |
3781 | msgid "<rev-opts> are documented in git-rev-list(1)" |
3782 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" | |
ef317cd5 | 3783 | |
276ceeaa JX |
3784 | #: builtin/blame.c:1782 |
3785 | msgid "Blaming lines" | |
3786 | msgstr "追踪代码行" | |
3787 | ||
5b04ee3b | 3788 | #: builtin/blame.c:2531 |
ef317cd5 | 3789 | msgid "Show blame entries as we find them, incrementally" |
07432cef | 3790 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 3791 | |
5b04ee3b | 3792 | #: builtin/blame.c:2532 |
ef317cd5 | 3793 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
07432cef | 3794 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
ef317cd5 | 3795 | |
5b04ee3b | 3796 | #: builtin/blame.c:2533 |
ef317cd5 | 3797 | msgid "Do not treat root commits as boundaries (Default: off)" |
07432cef | 3798 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 3799 | |
5b04ee3b | 3800 | #: builtin/blame.c:2534 |
ef317cd5 | 3801 | msgid "Show work cost statistics" |
07432cef | 3802 | msgstr "显示命令消耗统计" |
ef317cd5 | 3803 | |
5b04ee3b | 3804 | #: builtin/blame.c:2535 |
276ceeaa JX |
3805 | msgid "Force progress reporting" |
3806 | msgstr "强制进度显示" | |
3807 | ||
5b04ee3b | 3808 | #: builtin/blame.c:2536 |
ef317cd5 | 3809 | msgid "Show output score for blame entries" |
07432cef | 3810 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
ef317cd5 | 3811 | |
5b04ee3b | 3812 | #: builtin/blame.c:2537 |
ef317cd5 | 3813 | msgid "Show original filename (Default: auto)" |
07432cef | 3814 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 3815 | |
5b04ee3b | 3816 | #: builtin/blame.c:2538 |
ef317cd5 | 3817 | msgid "Show original linenumber (Default: off)" |
07432cef | 3818 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 3819 | |
5b04ee3b | 3820 | #: builtin/blame.c:2539 |
ef317cd5 | 3821 | msgid "Show in a format designed for machine consumption" |
07432cef | 3822 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 3823 | |
5b04ee3b | 3824 | #: builtin/blame.c:2540 |
ef317cd5 | 3825 | msgid "Show porcelain format with per-line commit information" |
07432cef | 3826 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 3827 | |
5b04ee3b | 3828 | #: builtin/blame.c:2541 |
ef317cd5 | 3829 | msgid "Use the same output mode as git-annotate (Default: off)" |
07432cef | 3830 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 3831 | |
5b04ee3b | 3832 | #: builtin/blame.c:2542 |
ef317cd5 | 3833 | msgid "Show raw timestamp (Default: off)" |
07432cef | 3834 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 3835 | |
5b04ee3b | 3836 | #: builtin/blame.c:2543 |
ef317cd5 | 3837 | msgid "Show long commit SHA1 (Default: off)" |
4375c10e | 3838 | msgstr "显示长的 SHA1 提交号(默认:关闭)" |
ef317cd5 | 3839 | |
5b04ee3b | 3840 | #: builtin/blame.c:2544 |
ef317cd5 | 3841 | msgid "Suppress author name and timestamp (Default: off)" |
07432cef | 3842 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 3843 | |
5b04ee3b | 3844 | #: builtin/blame.c:2545 |
ef317cd5 | 3845 | msgid "Show author email instead of name (Default: off)" |
07432cef | 3846 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 3847 | |
5b04ee3b | 3848 | #: builtin/blame.c:2546 |
ef317cd5 | 3849 | msgid "Ignore whitespace differences" |
07432cef | 3850 | msgstr "忽略空白差异" |
ef317cd5 | 3851 | |
5b04ee3b | 3852 | #: builtin/blame.c:2547 |
ef317cd5 | 3853 | msgid "Spend extra cycles to find better match" |
07432cef | 3854 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 3855 | |
5b04ee3b | 3856 | #: builtin/blame.c:2548 |
ef317cd5 | 3857 | msgid "Use revisions from <file> instead of calling git-rev-list" |
d9d56b23 | 3858 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 3859 | |
5b04ee3b | 3860 | #: builtin/blame.c:2549 |
ef317cd5 | 3861 | msgid "Use <file>'s contents as the final image" |
d9d56b23 | 3862 | msgstr "使用 <文件> 的内容作为最终的图片" |
ef317cd5 | 3863 | |
5b04ee3b | 3864 | #: builtin/blame.c:2550 builtin/blame.c:2551 |
ef317cd5 | 3865 | msgid "score" |
07432cef | 3866 | msgstr "得分" |
ef317cd5 | 3867 | |
5b04ee3b | 3868 | #: builtin/blame.c:2550 |
ef317cd5 | 3869 | msgid "Find line copies within and across files" |
07432cef | 3870 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 3871 | |
5b04ee3b | 3872 | #: builtin/blame.c:2551 |
ef317cd5 | 3873 | msgid "Find line movements within and across files" |
07432cef | 3874 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 3875 | |
5b04ee3b | 3876 | #: builtin/blame.c:2552 |
ef317cd5 | 3877 | msgid "n,m" |
07432cef | 3878 | msgstr "n,m" |
ef317cd5 | 3879 | |
5b04ee3b | 3880 | #: builtin/blame.c:2552 |
ef317cd5 | 3881 | msgid "Process only line range n,m, counting from 1" |
07432cef | 3882 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
ef317cd5 | 3883 | |
6c94aba5 JX |
3884 | #. TRANSLATORS: This string is used to tell us the maximum |
3885 | #. display width for a relative timestamp in "git blame" | |
3886 | #. output. For C locale, "4 years, 11 months ago", which | |
3887 | #. takes 22 places, is the longest among various forms of | |
3888 | #. relative timestamps, but your language may need more or | |
3889 | #. fewer display columns. | |
5b04ee3b | 3890 | #: builtin/blame.c:2641 |
6c94aba5 JX |
3891 | msgid "4 years, 11 months ago" |
3892 | msgstr "4 年 11 个月前" | |
3893 | ||
5b04ee3b | 3894 | #: builtin/branch.c:26 |
814ff314 JX |
3895 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
3896 | msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" | |
ef317cd5 | 3897 | |
5b04ee3b | 3898 | #: builtin/branch.c:27 |
814ff314 JX |
3899 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
3900 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" | |
ef317cd5 | 3901 | |
5b04ee3b | 3902 | #: builtin/branch.c:28 |
814ff314 JX |
3903 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
3904 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." | |
ef317cd5 | 3905 | |
5b04ee3b | 3906 | #: builtin/branch.c:29 |
814ff314 JX |
3907 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
3908 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" | |
ef317cd5 | 3909 | |
5b04ee3b | 3910 | #: builtin/branch.c:30 |
94550ed3 JX |
3911 | msgid "git branch [<options>] [-r | -a] [--points-at]" |
3912 | msgstr "git branch [<选项>] [-r | -a] [--points-at]" | |
3913 | ||
90e6ef53 | 3914 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
5b04ee3b | 3915 | #: builtin/branch.c:143 |
c04f5ac3 JX |
3916 | #, c-format |
3917 | msgid "" | |
3918 | "deleting branch '%s' that has been merged to\n" | |
3919 | " '%s', but not yet merged to HEAD." | |
3920 | msgstr "" | |
70fc47bf | 3921 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
3922 | " '%s',但未合并到 HEAD。" |
3923 | ||
90e6ef53 | 3924 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
5b04ee3b | 3925 | #: builtin/branch.c:147 |
c04f5ac3 JX |
3926 | #, c-format |
3927 | msgid "" | |
3928 | "not deleting branch '%s' that is not yet merged to\n" | |
3929 | " '%s', even though it is merged to HEAD." | |
3930 | msgstr "" | |
70fc47bf T |
3931 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
3932 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 3933 | |
5b04ee3b | 3934 | #: builtin/branch.c:161 |
07432cef WS |
3935 | #, c-format |
3936 | msgid "Couldn't look up commit object for '%s'" | |
3937 | msgstr "无法查询 '%s' 指向的提交对象" | |
3938 | ||
5b04ee3b | 3939 | #: builtin/branch.c:165 |
07432cef WS |
3940 | #, c-format |
3941 | msgid "" | |
3942 | "The branch '%s' is not fully merged.\n" | |
3943 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
3944 | msgstr "" | |
3945 | "分支 '%s' 没有完全合并。\n" | |
3946 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
3947 | ||
5b04ee3b | 3948 | #: builtin/branch.c:178 |
07432cef WS |
3949 | msgid "Update of config-file failed" |
3950 | msgstr "无法更新 config 文件" | |
3951 | ||
5b04ee3b | 3952 | #: builtin/branch.c:206 |
c04f5ac3 | 3953 | msgid "cannot use -a with -d" |
649900bc | 3954 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 3955 | |
5b04ee3b | 3956 | #: builtin/branch.c:212 |
c04f5ac3 JX |
3957 | msgid "Couldn't look up commit object for HEAD" |
3958 | msgstr "无法查询 HEAD 指向的提交对象" | |
3959 | ||
5b04ee3b | 3960 | #: builtin/branch.c:226 |
c04f5ac3 | 3961 | #, c-format |
5b04ee3b JX |
3962 | msgid "Cannot delete branch '%s' checked out at '%s'" |
3963 | msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" | |
c04f5ac3 | 3964 | |
5b04ee3b | 3965 | #: builtin/branch.c:241 |
5ae481e0 | 3966 | #, c-format |
7aea43ff JX |
3967 | msgid "remote-tracking branch '%s' not found." |
3968 | msgstr "未能找到远程跟踪分支 '%s'。" | |
c04f5ac3 | 3969 | |
5b04ee3b | 3970 | #: builtin/branch.c:242 |
81809b99 | 3971 | #, c-format |
8ada9598 | 3972 | msgid "branch '%s' not found." |
81809b99 | 3973 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 3974 | |
5b04ee3b | 3975 | #: builtin/branch.c:257 |
81809b99 | 3976 | #, c-format |
7aea43ff JX |
3977 | msgid "Error deleting remote-tracking branch '%s'" |
3978 | msgstr "无法删除远程跟踪分支 '%s'" | |
c04f5ac3 | 3979 | |
5b04ee3b | 3980 | #: builtin/branch.c:258 |
81809b99 | 3981 | #, c-format |
8ada9598 | 3982 | msgid "Error deleting branch '%s'" |
7aea43ff | 3983 | msgstr "无法删除分支 '%s'" |
8ada9598 | 3984 | |
5b04ee3b | 3985 | #: builtin/branch.c:265 |
81809b99 | 3986 | #, c-format |
7aea43ff JX |
3987 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
3988 | msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" | |
c04f5ac3 | 3989 | |
5b04ee3b | 3990 | #: builtin/branch.c:266 |
81809b99 | 3991 | #, c-format |
8ada9598 | 3992 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 3993 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 3994 | |
5b04ee3b | 3995 | #: builtin/branch.c:309 |
81809b99 | 3996 | #, c-format |
90314792 JX |
3997 | msgid "[%s: gone]" |
3998 | msgstr "[%s: 丢失]" | |
3999 | ||
5b04ee3b | 4000 | #: builtin/branch.c:314 |
90314792 JX |
4001 | #, c-format |
4002 | msgid "[%s]" | |
4003 | msgstr "[%s]" | |
4004 | ||
5b04ee3b | 4005 | #: builtin/branch.c:319 |
90314792 | 4006 | #, c-format |
8ada9598 | 4007 | msgid "[%s: behind %d]" |
81809b99 | 4008 | msgstr "[%s:落后 %d]" |
c04f5ac3 | 4009 | |
5b04ee3b | 4010 | #: builtin/branch.c:321 |
81809b99 | 4011 | #, c-format |
8ada9598 | 4012 | msgid "[behind %d]" |
81809b99 | 4013 | msgstr "[落后 %d]" |
8ada9598 | 4014 | |
5b04ee3b | 4015 | #: builtin/branch.c:325 |
81809b99 | 4016 | #, c-format |
8ada9598 | 4017 | msgid "[%s: ahead %d]" |
81809b99 | 4018 | msgstr "[%s:领先 %d]" |
c04f5ac3 | 4019 | |
5b04ee3b | 4020 | #: builtin/branch.c:327 |
81809b99 | 4021 | #, c-format |
8ada9598 | 4022 | msgid "[ahead %d]" |
81809b99 | 4023 | msgstr "[领先 %d]" |
8ada9598 | 4024 | |
5b04ee3b | 4025 | #: builtin/branch.c:330 |
81809b99 | 4026 | #, c-format |
8ada9598 | 4027 | msgid "[%s: ahead %d, behind %d]" |
81809b99 | 4028 | msgstr "[%s:领先 %d,落后 %d]" |
8ada9598 | 4029 | |
5b04ee3b | 4030 | #: builtin/branch.c:333 |
81809b99 | 4031 | #, c-format |
8ada9598 | 4032 | msgid "[ahead %d, behind %d]" |
81809b99 | 4033 | msgstr "[领先 %d,落后 %d]" |
c04f5ac3 | 4034 | |
5b04ee3b | 4035 | #: builtin/branch.c:346 |
a77c07d9 JX |
4036 | msgid " **** invalid ref ****" |
4037 | msgstr " **** 无效引用 ****" | |
4038 | ||
5b04ee3b | 4039 | #: builtin/branch.c:372 |
1003b3a5 JX |
4040 | #, c-format |
4041 | msgid "(no branch, rebasing %s)" | |
4042 | msgstr "(非分支,正变基 %s)" | |
4043 | ||
5b04ee3b | 4044 | #: builtin/branch.c:375 |
1003b3a5 JX |
4045 | #, c-format |
4046 | msgid "(no branch, bisect started on %s)" | |
4047 | msgstr "(非分支,二分查找开始于 %s)" | |
4048 | ||
5b04ee3b JX |
4049 | #. TRANSLATORS: make sure this matches |
4050 | #. "HEAD detached at " in wt-status.c | |
4051 | #: builtin/branch.c:381 | |
1003b3a5 | 4052 | #, c-format |
814ff314 JX |
4053 | msgid "(HEAD detached at %s)" |
4054 | msgstr "(头指针分离于 %s)" | |
1003b3a5 | 4055 | |
5b04ee3b JX |
4056 | #. TRANSLATORS: make sure this matches |
4057 | #. "HEAD detached from " in wt-status.c | |
4058 | #: builtin/branch.c:386 | |
814ff314 JX |
4059 | #, c-format |
4060 | msgid "(HEAD detached from %s)" | |
4061 | msgstr "(头指针分离自 %s)" | |
4062 | ||
5b04ee3b | 4063 | #: builtin/branch.c:390 |
c04f5ac3 JX |
4064 | msgid "(no branch)" |
4065 | msgstr "(非分支)" | |
4066 | ||
5b04ee3b JX |
4067 | #: builtin/branch.c:541 |
4068 | #, c-format | |
4069 | msgid "Branch %s is being rebased at %s" | |
4070 | msgstr "分支 %s 正被变基到 %s" | |
4071 | ||
4072 | #: builtin/branch.c:545 | |
4073 | #, c-format | |
4074 | msgid "Branch %s is being bisected at %s" | |
4075 | msgstr "分支 %s 正被二分查找于 %s" | |
4076 | ||
4077 | #: builtin/branch.c:560 | |
c04f5ac3 | 4078 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 4079 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 4080 | |
5b04ee3b | 4081 | #: builtin/branch.c:570 |
c04f5ac3 JX |
4082 | #, c-format |
4083 | msgid "Invalid branch name: '%s'" | |
4084 | msgstr "无效的分支名:'%s'" | |
4085 | ||
5b04ee3b | 4086 | #: builtin/branch.c:587 |
c04f5ac3 JX |
4087 | msgid "Branch rename failed" |
4088 | msgstr "分支重命名失败" | |
4089 | ||
5b04ee3b | 4090 | #: builtin/branch.c:591 |
c04f5ac3 JX |
4091 | #, c-format |
4092 | msgid "Renamed a misnamed branch '%s' away" | |
4093 | msgstr "重命名掉一个错误命名的旧分支 '%s'" | |
4094 | ||
5b04ee3b | 4095 | #: builtin/branch.c:594 |
c04f5ac3 JX |
4096 | #, c-format |
4097 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
4098 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
4099 | ||
5b04ee3b | 4100 | #: builtin/branch.c:601 |
c04f5ac3 JX |
4101 | msgid "Branch is renamed, but update of config-file failed" |
4102 | msgstr "分支被重命名,但更新 config 文件失败" | |
4103 | ||
5b04ee3b JX |
4104 | #: builtin/branch.c:623 |
4105 | msgid "could not write branch description template" | |
4106 | msgstr "不能写分支描述模版" | |
c04f5ac3 | 4107 | |
5b04ee3b | 4108 | #: builtin/branch.c:651 |
ef317cd5 | 4109 | msgid "Generic options" |
07432cef | 4110 | msgstr "通用选项" |
c04f5ac3 | 4111 | |
5b04ee3b | 4112 | #: builtin/branch.c:653 |
ef317cd5 | 4113 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 4114 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 4115 | |
5b04ee3b | 4116 | #: builtin/branch.c:654 |
ef317cd5 | 4117 | msgid "suppress informational messages" |
07432cef | 4118 | msgstr "不显示信息" |
8ada9598 | 4119 | |
5b04ee3b | 4120 | #: builtin/branch.c:655 |
ef317cd5 | 4121 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 4122 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 4123 | |
5b04ee3b | 4124 | #: builtin/branch.c:657 |
ef317cd5 | 4125 | msgid "change upstream info" |
07432cef | 4126 | msgstr "改变上游信息" |
c04f5ac3 | 4127 | |
5b04ee3b JX |
4128 | #: builtin/branch.c:659 |
4129 | msgid "upstream" | |
4130 | msgstr "上游" | |
4131 | ||
4132 | #: builtin/branch.c:659 | |
4133 | msgid "change the upstream info" | |
4134 | msgstr "改变上游信息" | |
4135 | ||
4136 | #: builtin/branch.c:661 | |
ef317cd5 | 4137 | msgid "use colored output" |
07432cef | 4138 | msgstr "使用彩色输出" |
c04f5ac3 | 4139 | |
5b04ee3b | 4140 | #: builtin/branch.c:662 |
ef317cd5 | 4141 | msgid "act on remote-tracking branches" |
07432cef | 4142 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 4143 | |
5b04ee3b | 4144 | #: builtin/branch.c:664 builtin/branch.c:665 |
ef317cd5 | 4145 | msgid "print only branches that contain the commit" |
07432cef | 4146 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 4147 | |
5b04ee3b | 4148 | #: builtin/branch.c:668 |
ef317cd5 | 4149 | msgid "Specific git-branch actions:" |
07432cef | 4150 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 4151 | |
5b04ee3b | 4152 | #: builtin/branch.c:669 |
ef317cd5 | 4153 | msgid "list both remote-tracking and local branches" |
07432cef | 4154 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 4155 | |
5b04ee3b | 4156 | #: builtin/branch.c:671 |
ef317cd5 | 4157 | msgid "delete fully merged branch" |
07432cef | 4158 | msgstr "删除完全合并的分支" |
c04f5ac3 | 4159 | |
5b04ee3b | 4160 | #: builtin/branch.c:672 |
ef317cd5 | 4161 | msgid "delete branch (even if not merged)" |
07432cef | 4162 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 4163 | |
5b04ee3b | 4164 | #: builtin/branch.c:673 |
ef317cd5 | 4165 | msgid "move/rename a branch and its reflog" |
07432cef | 4166 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 4167 | |
5b04ee3b | 4168 | #: builtin/branch.c:674 |
ef317cd5 | 4169 | msgid "move/rename a branch, even if target exists" |
07432cef | 4170 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 4171 | |
5b04ee3b | 4172 | #: builtin/branch.c:675 |
ef317cd5 | 4173 | msgid "list branch names" |
07432cef | 4174 | msgstr "列出分支名" |
c04f5ac3 | 4175 | |
5b04ee3b | 4176 | #: builtin/branch.c:676 |
ef317cd5 | 4177 | msgid "create the branch's reflog" |
07432cef | 4178 | msgstr "创建分支的引用日志" |
ef317cd5 | 4179 | |
5b04ee3b | 4180 | #: builtin/branch.c:678 |
ef317cd5 | 4181 | msgid "edit the description for the branch" |
07432cef | 4182 | msgstr "标记分支的描述" |
ef317cd5 | 4183 | |
5b04ee3b | 4184 | #: builtin/branch.c:679 |
04cb2f28 JX |
4185 | msgid "force creation, move/rename, deletion" |
4186 | msgstr "强制创建、移动/重命名、删除" | |
ef317cd5 | 4187 | |
5b04ee3b | 4188 | #: builtin/branch.c:680 |
94550ed3 JX |
4189 | msgid "print only branches that are merged" |
4190 | msgstr "只打印已经合并的分支" | |
ef317cd5 | 4191 | |
5b04ee3b | 4192 | #: builtin/branch.c:681 |
94550ed3 JX |
4193 | msgid "print only branches that are not merged" |
4194 | msgstr "只打印尚未合并的分支" | |
ef317cd5 | 4195 | |
5b04ee3b | 4196 | #: builtin/branch.c:682 |
ef317cd5 | 4197 | msgid "list branches in columns" |
07432cef | 4198 | msgstr "以列的方式显示分支" |
ef317cd5 | 4199 | |
5b04ee3b | 4200 | #: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 |
94550ed3 JX |
4201 | msgid "key" |
4202 | msgstr "key" | |
4203 | ||
5b04ee3b | 4204 | #: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 |
94550ed3 JX |
4205 | msgid "field name to sort on" |
4206 | msgstr "排序的字段名" | |
4207 | ||
5b04ee3b | 4208 | #: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 |
276ceeaa | 4209 | #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 |
94550ed3 JX |
4210 | #: builtin/tag.c:369 |
4211 | msgid "object" | |
4212 | msgstr "对象" | |
4213 | ||
5b04ee3b | 4214 | #: builtin/branch.c:687 |
94550ed3 JX |
4215 | msgid "print only branches of the object" |
4216 | msgstr "只打印指向该对象的分支" | |
4217 | ||
5b04ee3b | 4218 | #: builtin/branch.c:705 |
c04f5ac3 JX |
4219 | msgid "Failed to resolve HEAD as a valid ref." |
4220 | msgstr "无法将 HEAD 解析为有效引用。" | |
4221 | ||
5b04ee3b | 4222 | #: builtin/branch.c:709 builtin/clone.c:707 |
c04f5ac3 | 4223 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 4224 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 4225 | |
5b04ee3b | 4226 | #: builtin/branch.c:729 |
8ada9598 | 4227 | msgid "--column and --verbose are incompatible" |
81809b99 | 4228 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 4229 | |
5b04ee3b | 4230 | #: builtin/branch.c:740 builtin/branch.c:782 |
a77c07d9 JX |
4231 | msgid "branch name required" |
4232 | msgstr "必须提供分支名" | |
4233 | ||
5b04ee3b | 4234 | #: builtin/branch.c:758 |
a77c07d9 JX |
4235 | msgid "Cannot give description to detached HEAD" |
4236 | msgstr "不能向分离头指针提供描述" | |
4237 | ||
5b04ee3b | 4238 | #: builtin/branch.c:763 |
a77c07d9 JX |
4239 | msgid "cannot edit description of more than one branch" |
4240 | msgstr "不能为一个以上的分支编辑描述" | |
4241 | ||
5b04ee3b | 4242 | #: builtin/branch.c:770 |
a77c07d9 JX |
4243 | #, c-format |
4244 | msgid "No commit on branch '%s' yet." | |
4245 | msgstr "分支 '%s' 尚无提交。" | |
4246 | ||
5b04ee3b | 4247 | #: builtin/branch.c:773 |
a77c07d9 JX |
4248 | #, c-format |
4249 | msgid "No branch named '%s'." | |
4250 | msgstr "没有分支 '%s'。" | |
4251 | ||
5b04ee3b | 4252 | #: builtin/branch.c:788 |
a77c07d9 JX |
4253 | msgid "too many branches for a rename operation" |
4254 | msgstr "为重命名操作提供了太多的分支名" | |
4255 | ||
5b04ee3b | 4256 | #: builtin/branch.c:793 |
1003b3a5 JX |
4257 | msgid "too many branches to set new upstream" |
4258 | msgstr "为设置新上游提供了太多的分支名" | |
4259 | ||
5b04ee3b | 4260 | #: builtin/branch.c:797 |
1003b3a5 JX |
4261 | #, c-format |
4262 | msgid "" | |
4263 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
4264 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
4265 | ||
5b04ee3b | 4266 | #: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 |
1003b3a5 JX |
4267 | #, c-format |
4268 | msgid "no such branch '%s'" | |
4269 | msgstr "没有此分支 '%s'" | |
4270 | ||
5b04ee3b | 4271 | #: builtin/branch.c:804 |
07432cef | 4272 | #, c-format |
ef317cd5 | 4273 | msgid "branch '%s' does not exist" |
07432cef | 4274 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 4275 | |
5b04ee3b | 4276 | #: builtin/branch.c:816 |
1003b3a5 JX |
4277 | msgid "too many branches to unset upstream" |
4278 | msgstr "为取消上游设置操作提供了太多的分支名" | |
4279 | ||
5b04ee3b | 4280 | #: builtin/branch.c:820 |
1003b3a5 JX |
4281 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
4282 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
4283 | ||
5b04ee3b | 4284 | #: builtin/branch.c:826 |
ef317cd5 JX |
4285 | #, c-format |
4286 | msgid "Branch '%s' has no upstream information" | |
07432cef | 4287 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 4288 | |
5b04ee3b | 4289 | #: builtin/branch.c:840 |
1003b3a5 JX |
4290 | msgid "it does not make sense to create 'HEAD' manually" |
4291 | msgstr "手工创建 'HEAD' 没有意义" | |
4292 | ||
5b04ee3b | 4293 | #: builtin/branch.c:846 |
c04f5ac3 JX |
4294 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
4295 | msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" | |
4296 | ||
5b04ee3b | 4297 | #: builtin/branch.c:849 |
ef317cd5 JX |
4298 | #, c-format |
4299 | msgid "" | |
4300 | "The --set-upstream flag is deprecated and will be removed. Consider using --" | |
4301 | "track or --set-upstream-to\n" | |
4302 | msgstr "" | |
07432cef | 4303 | "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" |
ef317cd5 | 4304 | |
5b04ee3b | 4305 | #: builtin/branch.c:866 |
ef317cd5 JX |
4306 | #, c-format |
4307 | msgid "" | |
4308 | "\n" | |
4309 | "If you wanted to make '%s' track '%s', do this:\n" | |
4310 | "\n" | |
4311 | msgstr "" | |
07432cef WS |
4312 | "\n" |
4313 | "如果你想用 '%s' 跟踪 '%s', 这么做:\n" | |
4314 | "\n" | |
ef317cd5 | 4315 | |
7aea43ff | 4316 | #: builtin/bundle.c:51 |
c04f5ac3 JX |
4317 | #, c-format |
4318 | msgid "%s is okay\n" | |
4319 | msgstr "%s 可以\n" | |
4320 | ||
7aea43ff | 4321 | #: builtin/bundle.c:64 |
c04f5ac3 | 4322 | msgid "Need a repository to create a bundle." |
160fb2b2 | 4323 | msgstr "需要一个仓库来创建包。" |
c04f5ac3 | 4324 | |
7aea43ff | 4325 | #: builtin/bundle.c:68 |
c04f5ac3 | 4326 | msgid "Need a repository to unbundle." |
160fb2b2 | 4327 | msgstr "需要一个仓库来解包。" |
c04f5ac3 | 4328 | |
1b7f4a34 | 4329 | #: builtin/cat-file.c:428 |
7aea43ff JX |
4330 | msgid "" |
4331 | "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" | |
4332 | "<type>|--textconv) <object>" | |
4333 | msgstr "" | |
4334 | "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型" | |
4335 | ">|--textconv) <对象>" | |
ef317cd5 | 4336 | |
1b7f4a34 | 4337 | #: builtin/cat-file.c:429 |
94550ed3 JX |
4338 | msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" |
4339 | msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]" | |
ef317cd5 | 4340 | |
1b7f4a34 | 4341 | #: builtin/cat-file.c:466 |
ef317cd5 | 4342 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 4343 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 4344 | |
1b7f4a34 | 4345 | #: builtin/cat-file.c:467 |
ef317cd5 | 4346 | msgid "show object type" |
07432cef | 4347 | msgstr "显示对象类型" |
ef317cd5 | 4348 | |
1b7f4a34 | 4349 | #: builtin/cat-file.c:468 |
ef317cd5 | 4350 | msgid "show object size" |
07432cef | 4351 | msgstr "显示对象大小" |
ef317cd5 | 4352 | |
1b7f4a34 | 4353 | #: builtin/cat-file.c:470 |
ef317cd5 | 4354 | msgid "exit with zero when there's no error" |
07432cef | 4355 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 4356 | |
1b7f4a34 | 4357 | #: builtin/cat-file.c:471 |
ef317cd5 | 4358 | msgid "pretty-print object's content" |
07432cef | 4359 | msgstr "美观地打印对象的内容" |
ef317cd5 | 4360 | |
1b7f4a34 | 4361 | #: builtin/cat-file.c:473 |
ef317cd5 | 4362 | msgid "for blob objects, run textconv on object's content" |
160fb2b2 | 4363 | msgstr "对于数据对象,对其内容执行 textconv" |
ef317cd5 | 4364 | |
1b7f4a34 | 4365 | #: builtin/cat-file.c:475 |
7aea43ff JX |
4366 | msgid "allow -s and -t to work with broken/corrupt objects" |
4367 | msgstr "允许 -s 和 -t 对损坏的对象生效" | |
4368 | ||
1b7f4a34 JX |
4369 | #: builtin/cat-file.c:476 |
4370 | msgid "buffer --batch output" | |
4371 | msgstr "缓冲 --batch 的输出" | |
4372 | ||
4373 | #: builtin/cat-file.c:478 | |
ef317cd5 | 4374 | msgid "show info and content of objects fed from the standard input" |
07432cef | 4375 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 4376 | |
1b7f4a34 | 4377 | #: builtin/cat-file.c:481 |
ef317cd5 | 4378 | msgid "show info about objects fed from the standard input" |
07432cef | 4379 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 | 4380 | |
1b7f4a34 | 4381 | #: builtin/cat-file.c:484 |
7aea43ff JX |
4382 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
4383 | msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)" | |
4384 | ||
1b7f4a34 JX |
4385 | #: builtin/cat-file.c:486 |
4386 | msgid "show all objects with --batch or --batch-check" | |
4387 | msgstr "使用 --batch 或 --batch-check 参数显示所有对象" | |
4388 | ||
ef317cd5 | 4389 | #: builtin/check-attr.c:11 |
814ff314 JX |
4390 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
4391 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." | |
ef317cd5 JX |
4392 | |
4393 | #: builtin/check-attr.c:12 | |
94550ed3 JX |
4394 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" |
4395 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" | |
ef317cd5 JX |
4396 | |
4397 | #: builtin/check-attr.c:19 | |
4398 | msgid "report all attributes set on file" | |
07432cef | 4399 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 JX |
4400 | |
4401 | #: builtin/check-attr.c:20 | |
4402 | msgid "use .gitattributes only from the index" | |
07432cef | 4403 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 4404 | |
276ceeaa | 4405 | #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97 |
ef317cd5 | 4406 | msgid "read file names from stdin" |
07432cef | 4407 | msgstr "从标准输入读出文件名" |
ef317cd5 | 4408 | |
a77c07d9 | 4409 | #: builtin/check-attr.c:23 builtin/check-ignore.c:24 |
90314792 JX |
4410 | msgid "terminate input and output records by a NUL character" |
4411 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 4412 | |
5b04ee3b | 4413 | #: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 |
a77c07d9 JX |
4414 | msgid "suppress progress reporting" |
4415 | msgstr "不显示进度报告" | |
4416 | ||
2e8451e8 JX |
4417 | #: builtin/check-ignore.c:26 |
4418 | msgid "show non-matching input paths" | |
4419 | msgstr "显示未匹配的输入路径" | |
4420 | ||
90314792 JX |
4421 | #: builtin/check-ignore.c:28 |
4422 | msgid "ignore index when checking" | |
4423 | msgstr "检查时忽略索引" | |
4424 | ||
4425 | #: builtin/check-ignore.c:154 | |
a77c07d9 | 4426 | msgid "cannot specify pathnames with --stdin" |
1b7f4a34 | 4427 | msgstr "不能同时指定路径及 --stdin 参数" |
a77c07d9 | 4428 | |
90314792 | 4429 | #: builtin/check-ignore.c:157 |
a77c07d9 JX |
4430 | msgid "-z only makes sense with --stdin" |
4431 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
4432 | ||
90314792 | 4433 | #: builtin/check-ignore.c:159 |
a77c07d9 JX |
4434 | msgid "no path specified" |
4435 | msgstr "未指定路径" | |
4436 | ||
90314792 | 4437 | #: builtin/check-ignore.c:163 |
a77c07d9 JX |
4438 | msgid "--quiet is only valid with a single pathname" |
4439 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
4440 | ||
90314792 | 4441 | #: builtin/check-ignore.c:165 |
a77c07d9 JX |
4442 | msgid "cannot have both --quiet and --verbose" |
4443 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
4444 | ||
90314792 | 4445 | #: builtin/check-ignore.c:168 |
2e8451e8 JX |
4446 | msgid "--non-matching is only valid with --verbose" |
4447 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
4448 | ||
4449 | #: builtin/check-mailmap.c:8 | |
814ff314 JX |
4450 | msgid "git check-mailmap [<options>] <contact>..." |
4451 | msgstr "git check-mailmap [<选项>] <联系地址>..." | |
2e8451e8 JX |
4452 | |
4453 | #: builtin/check-mailmap.c:13 | |
4454 | msgid "also read contacts from stdin" | |
4455 | msgstr "还从标准输入读取联系地址" | |
4456 | ||
4457 | #: builtin/check-mailmap.c:24 | |
4458 | #, c-format | |
4459 | msgid "unable to parse contact: %s" | |
4460 | msgstr "不能解析联系地址:%s" | |
4461 | ||
4462 | #: builtin/check-mailmap.c:47 | |
4463 | msgid "no contacts specified" | |
4464 | msgstr "未指定联系地址" | |
4465 | ||
276ceeaa | 4466 | #: builtin/checkout-index.c:127 |
814ff314 JX |
4467 | msgid "git checkout-index [<options>] [--] [<file>...]" |
4468 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" | |
ef317cd5 | 4469 | |
276ceeaa JX |
4470 | #: builtin/checkout-index.c:144 |
4471 | msgid "stage should be between 1 and 3 or all" | |
4472 | msgstr "索引值应该取值 1 到 3 或者 all" | |
4473 | ||
4474 | #: builtin/checkout-index.c:160 | |
ef317cd5 | 4475 | msgid "check out all files in the index" |
07432cef | 4476 | msgstr "检出索引区的所有文件" |
ef317cd5 | 4477 | |
276ceeaa | 4478 | #: builtin/checkout-index.c:161 |
ef317cd5 | 4479 | msgid "force overwrite of existing files" |
07432cef | 4480 | msgstr "强制覆盖现有的文件" |
ef317cd5 | 4481 | |
276ceeaa | 4482 | #: builtin/checkout-index.c:163 |
ef317cd5 | 4483 | msgid "no warning for existing files and files not in index" |
07432cef | 4484 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 | 4485 | |
276ceeaa | 4486 | #: builtin/checkout-index.c:165 |
ef317cd5 | 4487 | msgid "don't checkout new files" |
07432cef | 4488 | msgstr "不检出新文件" |
ef317cd5 | 4489 | |
276ceeaa | 4490 | #: builtin/checkout-index.c:167 |
ef317cd5 | 4491 | msgid "update stat information in the index file" |
07432cef | 4492 | msgstr "更新索引中文件的状态信息" |
ef317cd5 | 4493 | |
276ceeaa | 4494 | #: builtin/checkout-index.c:171 |
ef317cd5 | 4495 | msgid "read list of paths from the standard input" |
07432cef | 4496 | msgstr "从标准输入读取路径列表" |
ef317cd5 | 4497 | |
276ceeaa | 4498 | #: builtin/checkout-index.c:173 |
ef317cd5 | 4499 | msgid "write the content to temporary files" |
07432cef | 4500 | msgstr "将内容写入临时文件" |
ef317cd5 | 4501 | |
276ceeaa | 4502 | #: builtin/checkout-index.c:174 builtin/column.c:30 |
5b04ee3b JX |
4503 | #: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 |
4504 | #: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 | |
4505 | #: builtin/submodule--helper.c:774 | |
ef317cd5 | 4506 | msgid "string" |
07432cef | 4507 | msgstr "字符串" |
ef317cd5 | 4508 | |
276ceeaa | 4509 | #: builtin/checkout-index.c:175 |
ef317cd5 | 4510 | msgid "when creating files, prepend <string>" |
4375c10e | 4511 | msgstr "在创建文件时,在前面加上 <字符串>" |
ef317cd5 | 4512 | |
276ceeaa | 4513 | #: builtin/checkout-index.c:177 |
ef317cd5 | 4514 | msgid "copy out the files from named stage" |
07432cef | 4515 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 | 4516 | |
1b7f4a34 | 4517 | #: builtin/checkout.c:25 |
814ff314 JX |
4518 | msgid "git checkout [<options>] <branch>" |
4519 | msgstr "git checkout [<选项>] <分支>" | |
ef317cd5 | 4520 | |
1b7f4a34 | 4521 | #: builtin/checkout.c:26 |
814ff314 JX |
4522 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
4523 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." | |
ef317cd5 | 4524 | |
94550ed3 | 4525 | #: builtin/checkout.c:134 builtin/checkout.c:167 |
c04f5ac3 JX |
4526 | #, c-format |
4527 | msgid "path '%s' does not have our version" | |
4528 | msgstr "路径 '%s' 没有我们的版本" | |
4529 | ||
94550ed3 | 4530 | #: builtin/checkout.c:136 builtin/checkout.c:169 |
c04f5ac3 JX |
4531 | #, c-format |
4532 | msgid "path '%s' does not have their version" | |
4533 | msgstr "路径 '%s' 没有他们的版本" | |
4534 | ||
94550ed3 | 4535 | #: builtin/checkout.c:152 |
c04f5ac3 JX |
4536 | #, c-format |
4537 | msgid "path '%s' does not have all necessary versions" | |
4538 | msgstr "路径 '%s' 没有全部必须的版本" | |
4539 | ||
94550ed3 | 4540 | #: builtin/checkout.c:196 |
c04f5ac3 JX |
4541 | #, c-format |
4542 | msgid "path '%s' does not have necessary versions" | |
4543 | msgstr "路径 '%s' 没有必须的版本" | |
4544 | ||
94550ed3 | 4545 | #: builtin/checkout.c:213 |
c04f5ac3 JX |
4546 | #, c-format |
4547 | msgid "path '%s': cannot merge" | |
90e6ef53 | 4548 | msgstr "path '%s':无法合并" |
c04f5ac3 | 4549 | |
94550ed3 | 4550 | #: builtin/checkout.c:230 |
c04f5ac3 JX |
4551 | #, c-format |
4552 | msgid "Unable to add merge result for '%s'" | |
4553 | msgstr "无法为 '%s' 添加合并结果" | |
4554 | ||
5b04ee3b JX |
4555 | #: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 |
4556 | #: builtin/checkout.c:259 | |
07432cef | 4557 | #, c-format |
ef317cd5 | 4558 | msgid "'%s' cannot be used with updating paths" |
07432cef | 4559 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 4560 | |
5b04ee3b | 4561 | #: builtin/checkout.c:262 builtin/checkout.c:265 |
07432cef | 4562 | #, c-format |
ef317cd5 | 4563 | msgid "'%s' cannot be used with %s" |
07432cef | 4564 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 4565 | |
5b04ee3b | 4566 | #: builtin/checkout.c:268 |
ef317cd5 JX |
4567 | #, c-format |
4568 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 4569 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 4570 | |
5b04ee3b | 4571 | #: builtin/checkout.c:279 builtin/checkout.c:473 |
c04f5ac3 | 4572 | msgid "corrupt index file" |
90e6ef53 | 4573 | msgstr "损坏的索引文件" |
c04f5ac3 | 4574 | |
5b04ee3b | 4575 | #: builtin/checkout.c:339 builtin/checkout.c:346 |
c04f5ac3 JX |
4576 | #, c-format |
4577 | msgid "path '%s' is unmerged" | |
4578 | msgstr "路径 '%s' 未合并" | |
4579 | ||
5b04ee3b | 4580 | #: builtin/checkout.c:495 |
c04f5ac3 | 4581 | msgid "you need to resolve your current index first" |
90e6ef53 | 4582 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 4583 | |
5b04ee3b | 4584 | #: builtin/checkout.c:622 |
c04f5ac3 | 4585 | #, c-format |
1b7f4a34 JX |
4586 | msgid "Can not do reflog for '%s': %s\n" |
4587 | msgstr "不能对 '%s' 执行 reflog 操作:%s\n" | |
c04f5ac3 | 4588 | |
5b04ee3b | 4589 | #: builtin/checkout.c:660 |
c04f5ac3 JX |
4590 | msgid "HEAD is now at" |
4591 | msgstr "HEAD 目前位于" | |
4592 | ||
5b04ee3b | 4593 | #: builtin/checkout.c:664 builtin/clone.c:661 |
3495628d JX |
4594 | msgid "unable to update HEAD" |
4595 | msgstr "不能更新 HEAD" | |
4596 | ||
5b04ee3b | 4597 | #: builtin/checkout.c:668 |
c04f5ac3 JX |
4598 | #, c-format |
4599 | msgid "Reset branch '%s'\n" | |
4600 | msgstr "重置分支 '%s'\n" | |
4601 | ||
5b04ee3b | 4602 | #: builtin/checkout.c:671 |
c04f5ac3 JX |
4603 | #, c-format |
4604 | msgid "Already on '%s'\n" | |
4605 | msgstr "已经位于 '%s'\n" | |
4606 | ||
5b04ee3b | 4607 | #: builtin/checkout.c:675 |
c04f5ac3 JX |
4608 | #, c-format |
4609 | msgid "Switched to and reset branch '%s'\n" | |
4610 | msgstr "切换并重置分支 '%s'\n" | |
4611 | ||
5b04ee3b | 4612 | #: builtin/checkout.c:677 builtin/checkout.c:1067 |
c04f5ac3 JX |
4613 | #, c-format |
4614 | msgid "Switched to a new branch '%s'\n" | |
4615 | msgstr "切换到一个新分支 '%s'\n" | |
4616 | ||
5b04ee3b | 4617 | #: builtin/checkout.c:679 |
c04f5ac3 JX |
4618 | #, c-format |
4619 | msgid "Switched to branch '%s'\n" | |
4620 | msgstr "切换到分支 '%s'\n" | |
4621 | ||
90e6ef53 | 4622 | # 译者:注意保持前导空格 |
5b04ee3b | 4623 | #: builtin/checkout.c:731 |
c04f5ac3 JX |
4624 | #, c-format |
4625 | msgid " ... and %d more.\n" | |
90e6ef53 | 4626 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 | 4627 | |
5b04ee3b | 4628 | #: builtin/checkout.c:737 |
c04f5ac3 JX |
4629 | #, c-format |
4630 | msgid "" | |
4631 | "Warning: you are leaving %d commit behind, not connected to\n" | |
4632 | "any of your branches:\n" | |
4633 | "\n" | |
4634 | "%s\n" | |
4635 | msgid_plural "" | |
4636 | "Warning: you are leaving %d commits behind, not connected to\n" | |
4637 | "any of your branches:\n" | |
4638 | "\n" | |
4639 | "%s\n" | |
4640 | msgstr[0] "" | |
4641 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
4642 | "\n" | |
4643 | "%s\n" | |
5ae481e0 JX |
4644 | msgstr[1] "" |
4645 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
4646 | "\n" | |
4647 | "%s\n" | |
c04f5ac3 | 4648 | |
5b04ee3b | 4649 | #: builtin/checkout.c:756 |
c04f5ac3 JX |
4650 | #, c-format |
4651 | msgid "" | |
7aea43ff JX |
4652 | "If you want to keep it by creating a new branch, this may be a good time\n" |
4653 | "to do so with:\n" | |
4654 | "\n" | |
4655 | " git branch <new-branch-name> %s\n" | |
4656 | "\n" | |
4657 | msgid_plural "" | |
c04f5ac3 JX |
4658 | "If you want to keep them by creating a new branch, this may be a good time\n" |
4659 | "to do so with:\n" | |
4660 | "\n" | |
814ff314 | 4661 | " git branch <new-branch-name> %s\n" |
c04f5ac3 | 4662 | "\n" |
7aea43ff JX |
4663 | msgstr[0] "" |
4664 | "如果您想要通过创建新分支保存它,这可能是一个好时候。\n" | |
4665 | "如下操作:\n" | |
4666 | "\n" | |
4667 | " git branch <新分支名> %s\n" | |
4668 | "\n" | |
4669 | msgstr[1] "" | |
4670 | "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n" | |
c04f5ac3 JX |
4671 | "如下操作:\n" |
4672 | "\n" | |
814ff314 | 4673 | " git branch <新分支名> %s\n" |
c04f5ac3 JX |
4674 | "\n" |
4675 | ||
5b04ee3b | 4676 | #: builtin/checkout.c:792 |
c04f5ac3 JX |
4677 | msgid "internal error in revision walk" |
4678 | msgstr "在版本遍历时遇到内部错误" | |
4679 | ||
5b04ee3b | 4680 | #: builtin/checkout.c:796 |
c04f5ac3 JX |
4681 | msgid "Previous HEAD position was" |
4682 | msgstr "之前的 HEAD 位置是" | |
4683 | ||
5b04ee3b | 4684 | #: builtin/checkout.c:823 builtin/checkout.c:1062 |
c04f5ac3 | 4685 | msgid "You are on a branch yet to be born" |
90e6ef53 | 4686 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 4687 | |
5b04ee3b | 4688 | #: builtin/checkout.c:968 |
90314792 JX |
4689 | #, c-format |
4690 | msgid "only one reference expected, %d given." | |
4691 | msgstr "只要一个引用,却给出了 %d 个" | |
4692 | ||
5b04ee3b | 4693 | #: builtin/checkout.c:1008 builtin/worktree.c:212 |
c04f5ac3 JX |
4694 | #, c-format |
4695 | msgid "invalid reference: %s" | |
4696 | msgstr "无效引用:%s" | |
4697 | ||
5b04ee3b | 4698 | #: builtin/checkout.c:1037 |
c04f5ac3 JX |
4699 | #, c-format |
4700 | msgid "reference is not a tree: %s" | |
4701 | msgstr "引用不是一个树:%s" | |
4702 | ||
5b04ee3b | 4703 | #: builtin/checkout.c:1076 |
ef317cd5 | 4704 | msgid "paths cannot be used with switching branches" |
07432cef | 4705 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 4706 | |
5b04ee3b | 4707 | #: builtin/checkout.c:1079 builtin/checkout.c:1083 |
07432cef | 4708 | #, c-format |
ef317cd5 | 4709 | msgid "'%s' cannot be used with switching branches" |
07432cef | 4710 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 4711 | |
5b04ee3b JX |
4712 | #: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 |
4713 | #: builtin/checkout.c:1098 | |
07432cef | 4714 | #, c-format |
ef317cd5 | 4715 | msgid "'%s' cannot be used with '%s'" |
07432cef | 4716 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 4717 | |
5b04ee3b | 4718 | #: builtin/checkout.c:1103 |
07432cef | 4719 | #, c-format |
ef317cd5 | 4720 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 4721 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 4722 | |
5b04ee3b JX |
4723 | #: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88 |
4724 | #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 | |
4725 | #: builtin/worktree.c:325 | |
ef317cd5 | 4726 | msgid "branch" |
07432cef | 4727 | msgstr "分支" |
c04f5ac3 | 4728 | |
5b04ee3b | 4729 | #: builtin/checkout.c:1137 |
ef317cd5 | 4730 | msgid "create and checkout a new branch" |
07432cef | 4731 | msgstr "创建并检出一个新的分支" |
c04f5ac3 | 4732 | |
5b04ee3b | 4733 | #: builtin/checkout.c:1139 |
ef317cd5 | 4734 | msgid "create/reset and checkout a branch" |
07432cef | 4735 | msgstr "创建/重置并检出一个分支" |
c04f5ac3 | 4736 | |
5b04ee3b | 4737 | #: builtin/checkout.c:1140 |
ef317cd5 | 4738 | msgid "create reflog for new branch" |
07432cef | 4739 | msgstr "为新的分支创建引用日志" |
ef317cd5 | 4740 | |
5b04ee3b | 4741 | #: builtin/checkout.c:1141 |
ef317cd5 | 4742 | msgid "detach the HEAD at named commit" |
07432cef | 4743 | msgstr "成为指向该提交的分离头指针" |
ef317cd5 | 4744 | |
5b04ee3b | 4745 | #: builtin/checkout.c:1142 |
ef317cd5 | 4746 | msgid "set upstream info for new branch" |
07432cef | 4747 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 4748 | |
5b04ee3b | 4749 | #: builtin/checkout.c:1144 |
6c94aba5 | 4750 | msgid "new-branch" |
07432cef | 4751 | msgstr "新分支" |
ef317cd5 | 4752 | |
5b04ee3b | 4753 | #: builtin/checkout.c:1144 |
ef317cd5 | 4754 | msgid "new unparented branch" |
07432cef | 4755 | msgstr "新的没有父提交的分支" |
ef317cd5 | 4756 | |
5b04ee3b | 4757 | #: builtin/checkout.c:1145 |
ef317cd5 | 4758 | msgid "checkout our version for unmerged files" |
07432cef | 4759 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 4760 | |
5b04ee3b | 4761 | #: builtin/checkout.c:1147 |
ef317cd5 | 4762 | msgid "checkout their version for unmerged files" |
07432cef | 4763 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 4764 | |
5b04ee3b | 4765 | #: builtin/checkout.c:1149 |
ef317cd5 | 4766 | msgid "force checkout (throw away local modifications)" |
07432cef | 4767 | msgstr "强制检出(丢弃本地修改)" |
c04f5ac3 | 4768 | |
5b04ee3b | 4769 | #: builtin/checkout.c:1150 |
ef317cd5 | 4770 | msgid "perform a 3-way merge with the new branch" |
160fb2b2 | 4771 | msgstr "和新的分支执行三方合并" |
ef317cd5 | 4772 | |
5b04ee3b | 4773 | #: builtin/checkout.c:1151 builtin/merge.c:230 |
ef317cd5 | 4774 | msgid "update ignored files (default)" |
07432cef | 4775 | msgstr "更新忽略的文件(默认)" |
c04f5ac3 | 4776 | |
5b04ee3b | 4777 | #: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 |
ef317cd5 | 4778 | msgid "style" |
07432cef | 4779 | msgstr "风格" |
ef317cd5 | 4780 | |
5b04ee3b | 4781 | #: builtin/checkout.c:1153 |
ef317cd5 | 4782 | msgid "conflict style (merge or diff3)" |
07432cef | 4783 | msgstr "冲突输出风格(merge 或 diff3)" |
ef317cd5 | 4784 | |
5b04ee3b | 4785 | #: builtin/checkout.c:1156 |
4dcdc3d8 JX |
4786 | msgid "do not limit pathspecs to sparse entries only" |
4787 | msgstr "对路径不做稀疏检出的限制" | |
4788 | ||
5b04ee3b | 4789 | #: builtin/checkout.c:1158 |
814ff314 JX |
4790 | msgid "second guess 'git checkout <no-such-branch>'" |
4791 | msgstr "二次猜测'git checkout <无此分支>'" | |
ef317cd5 | 4792 | |
5b04ee3b | 4793 | #: builtin/checkout.c:1160 |
7aea43ff JX |
4794 | msgid "do not check if another worktree is holding the given ref" |
4795 | msgstr "不检查指定的引用是否被其他工作区所占用" | |
4796 | ||
5b04ee3b JX |
4797 | #: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116 |
4798 | #: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 | |
94550ed3 JX |
4799 | #: builtin/send-pack.c:168 |
4800 | msgid "force progress reporting" | |
4801 | msgstr "强制显示进度报告" | |
4802 | ||
5b04ee3b | 4803 | #: builtin/checkout.c:1192 |
ef317cd5 | 4804 | msgid "-b, -B and --orphan are mutually exclusive" |
07432cef | 4805 | msgstr "-b、-B 和 --orphan 是互斥的" |
ef317cd5 | 4806 | |
5b04ee3b | 4807 | #: builtin/checkout.c:1209 |
ef317cd5 JX |
4808 | msgid "--track needs a branch name" |
4809 | msgstr "--track 需要一个分支名" | |
4810 | ||
5b04ee3b | 4811 | #: builtin/checkout.c:1214 |
ef317cd5 JX |
4812 | msgid "Missing branch name; try -b" |
4813 | msgstr "缺少分支名;尝试 -b" | |
4814 | ||
5b04ee3b | 4815 | #: builtin/checkout.c:1250 |
c04f5ac3 | 4816 | msgid "invalid path specification" |
90e6ef53 | 4817 | msgstr "无效的路径规格" |
c04f5ac3 | 4818 | |
5b04ee3b | 4819 | #: builtin/checkout.c:1257 |
07432cef | 4820 | #, c-format |
c04f5ac3 | 4821 | msgid "" |
ef317cd5 | 4822 | "Cannot update paths and switch to branch '%s' at the same time.\n" |
c04f5ac3 JX |
4823 | "Did you intend to checkout '%s' which can not be resolved as commit?" |
4824 | msgstr "" | |
07432cef WS |
4825 | "不能同时更新路径并切换到分支'%s'。\n" |
4826 | "您是想要检出 '%s' 但其未能解析为提交么?" | |
c04f5ac3 | 4827 | |
5b04ee3b | 4828 | #: builtin/checkout.c:1262 |
07432cef | 4829 | #, c-format |
ef317cd5 | 4830 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 4831 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 4832 | |
5b04ee3b | 4833 | #: builtin/checkout.c:1266 |
c04f5ac3 JX |
4834 | msgid "" |
4835 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
4836 | "checking out of the index." | |
4837 | msgstr "" | |
90e6ef53 | 4838 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 4839 | |
1b7f4a34 | 4840 | #: builtin/clean.c:25 |
2e8451e8 JX |
4841 | msgid "" |
4842 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
4843 | msgstr "" | |
4844 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 4845 | |
1b7f4a34 | 4846 | #: builtin/clean.c:29 |
07432cef WS |
4847 | #, c-format |
4848 | msgid "Removing %s\n" | |
4849 | msgstr "正删除 %s\n" | |
4850 | ||
1b7f4a34 | 4851 | #: builtin/clean.c:30 |
07432cef WS |
4852 | #, c-format |
4853 | msgid "Would remove %s\n" | |
4854 | msgstr "将删除 %s\n" | |
4855 | ||
1b7f4a34 | 4856 | #: builtin/clean.c:31 |
07432cef WS |
4857 | #, c-format |
4858 | msgid "Skipping repository %s\n" | |
160fb2b2 | 4859 | msgstr "忽略仓库 %s\n" |
07432cef | 4860 | |
1b7f4a34 | 4861 | #: builtin/clean.c:32 |
07432cef WS |
4862 | #, c-format |
4863 | msgid "Would skip repository %s\n" | |
160fb2b2 | 4864 | msgstr "将忽略仓库 %s\n" |
07432cef | 4865 | |
1b7f4a34 | 4866 | #: builtin/clean.c:33 |
07432cef WS |
4867 | #, c-format |
4868 | msgid "failed to remove %s" | |
4869 | msgstr "无法删除 %s" | |
4870 | ||
276ceeaa | 4871 | #: builtin/clean.c:291 |
2e8451e8 JX |
4872 | msgid "" |
4873 | "Prompt help:\n" | |
4874 | "1 - select a numbered item\n" | |
4875 | "foo - select item based on unique prefix\n" | |
4876 | " - (empty) select nothing" | |
4877 | msgstr "" | |
4878 | "帮助:\n" | |
4879 | "1 - 通过编号选择一个选项\n" | |
4880 | "foo - 通过标题选择一个选项\n" | |
4881 | " - (空)什么也不选择" | |
4882 | ||
276ceeaa | 4883 | #: builtin/clean.c:295 |
2e8451e8 JX |
4884 | msgid "" |
4885 | "Prompt help:\n" | |
4886 | "1 - select a single item\n" | |
4887 | "3-5 - select a range of items\n" | |
4888 | "2-3,6-9 - select multiple ranges\n" | |
4889 | "foo - select item based on unique prefix\n" | |
4890 | "-... - unselect specified items\n" | |
4891 | "* - choose all items\n" | |
4892 | " - (empty) finish selecting" | |
4893 | msgstr "" | |
4894 | "帮助:\n" | |
4895 | "1 - 选择一个选项\n" | |
4896 | "3-5 - 选择一个范围内的所有选项\n" | |
4897 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
4898 | "foo - 通过标题选择一个选项\n" | |
4899 | "-... - 反选特定的选项\n" | |
4900 | "* - 选择所有选项\n" | |
4901 | " - (空)结束选择" | |
4902 | ||
276ceeaa | 4903 | #: builtin/clean.c:511 |
2e8451e8 JX |
4904 | #, c-format |
4905 | msgid "Huh (%s)?" | |
4906 | msgstr "嗯(%s)?" | |
4907 | ||
276ceeaa | 4908 | #: builtin/clean.c:653 |
2e8451e8 JX |
4909 | #, c-format |
4910 | msgid "Input ignore patterns>> " | |
4911 | msgstr "输入模版以排除条目>> " | |
4912 | ||
276ceeaa | 4913 | #: builtin/clean.c:690 |
2e8451e8 JX |
4914 | #, c-format |
4915 | msgid "WARNING: Cannot find items matched by: %s" | |
4916 | msgstr "警告:无法找到和 %s 匹配的条目" | |
4917 | ||
276ceeaa | 4918 | #: builtin/clean.c:711 |
2e8451e8 JX |
4919 | msgid "Select items to delete" |
4920 | msgstr "选择要删除的条目" | |
4921 | ||
814ff314 | 4922 | #. TRANSLATORS: Make sure to keep [y/N] as is |
276ceeaa | 4923 | #: builtin/clean.c:752 |
2e8451e8 | 4924 | #, c-format |
814ff314 JX |
4925 | msgid "Remove %s [y/N]? " |
4926 | msgstr "删除 %s [y/N]?" | |
2e8451e8 | 4927 | |
276ceeaa | 4928 | #: builtin/clean.c:777 |
2e8451e8 JX |
4929 | msgid "Bye." |
4930 | msgstr "再见。" | |
4931 | ||
276ceeaa | 4932 | #: builtin/clean.c:785 |
2e8451e8 JX |
4933 | msgid "" |
4934 | "clean - start cleaning\n" | |
4935 | "filter by pattern - exclude items from deletion\n" | |
4936 | "select by numbers - select items to be deleted by numbers\n" | |
4937 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
4938 | "quit - stop cleaning\n" | |
4939 | "help - this screen\n" | |
4940 | "? - help for prompt selection" | |
4941 | msgstr "" | |
4942 | "clean - 开始清理\n" | |
4943 | "filter by pattern - 通过模版排除要删除的条目\n" | |
4944 | "select by numbers - 通过数字选择要删除的条目\n" | |
4945 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
4946 | "quit - 停止删除并退出\n" | |
4947 | "help - 显示本帮助\n" | |
4948 | "? - 显示如何在提示符下选择的帮助" | |
4949 | ||
276ceeaa | 4950 | #: builtin/clean.c:812 |
2e8451e8 JX |
4951 | msgid "*** Commands ***" |
4952 | msgstr "*** 命令 ***" | |
4953 | ||
276ceeaa | 4954 | #: builtin/clean.c:813 |
2e8451e8 JX |
4955 | msgid "What now" |
4956 | msgstr "请选择" | |
4957 | ||
276ceeaa | 4958 | #: builtin/clean.c:821 |
2e8451e8 JX |
4959 | msgid "Would remove the following item:" |
4960 | msgid_plural "Would remove the following items:" | |
4961 | msgstr[0] "将删除如下条目:" | |
4962 | msgstr[1] "将删除如下条目:" | |
4963 | ||
276ceeaa | 4964 | #: builtin/clean.c:838 |
2e8451e8 JX |
4965 | msgid "No more files to clean, exiting." |
4966 | msgstr "没有要清理的文件,退出。" | |
4967 | ||
276ceeaa | 4968 | #: builtin/clean.c:869 |
ef317cd5 | 4969 | msgid "do not print names of files removed" |
07432cef | 4970 | msgstr "不打印删除文件的名称" |
ef317cd5 | 4971 | |
276ceeaa | 4972 | #: builtin/clean.c:871 |
ef317cd5 | 4973 | msgid "force" |
07432cef | 4974 | msgstr "强制" |
ef317cd5 | 4975 | |
276ceeaa | 4976 | #: builtin/clean.c:872 |
2e8451e8 JX |
4977 | msgid "interactive cleaning" |
4978 | msgstr "交互式清除" | |
4979 | ||
276ceeaa | 4980 | #: builtin/clean.c:874 |
ef317cd5 | 4981 | msgid "remove whole directories" |
07432cef | 4982 | msgstr "删除整个目录" |
ef317cd5 | 4983 | |
5b04ee3b JX |
4984 | #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 |
4985 | #: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 | |
ef317cd5 | 4986 | msgid "pattern" |
07432cef | 4987 | msgstr "模式" |
ef317cd5 | 4988 | |
276ceeaa | 4989 | #: builtin/clean.c:876 |
ef317cd5 | 4990 | msgid "add <pattern> to ignore rules" |
4375c10e | 4991 | msgstr "添加 <模式> 到忽略规则" |
ef317cd5 | 4992 | |
276ceeaa | 4993 | #: builtin/clean.c:877 |
ef317cd5 | 4994 | msgid "remove ignored files, too" |
07432cef | 4995 | msgstr "也删除忽略的文件" |
ef317cd5 | 4996 | |
276ceeaa | 4997 | #: builtin/clean.c:879 |
ef317cd5 | 4998 | msgid "remove only ignored files" |
07432cef | 4999 | msgstr "只删除忽略的文件" |
c04f5ac3 | 5000 | |
276ceeaa | 5001 | #: builtin/clean.c:897 |
c04f5ac3 | 5002 | msgid "-x and -X cannot be used together" |
649900bc | 5003 | msgstr "-x 和 -X 不能同时使用" |
c04f5ac3 | 5004 | |
276ceeaa | 5005 | #: builtin/clean.c:901 |
c04f5ac3 | 5006 | msgid "" |
6c94aba5 | 5007 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
2e8451e8 | 5008 | "clean" |
c04f5ac3 | 5009 | msgstr "" |
2e8451e8 | 5010 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 5011 | |
276ceeaa | 5012 | #: builtin/clean.c:904 |
c04f5ac3 | 5013 | msgid "" |
6c94aba5 | 5014 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
2e8451e8 | 5015 | "refusing to clean" |
c04f5ac3 | 5016 | msgstr "" |
2e8451e8 | 5017 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 5018 | |
220c313c | 5019 | #: builtin/clone.c:37 |
814ff314 | 5020 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
160fb2b2 | 5021 | msgstr "git clone [<选项>] [--] <仓库> [<路径>]" |
ef317cd5 | 5022 | |
5b04ee3b | 5023 | #: builtin/clone.c:62 |
ef317cd5 | 5024 | msgid "don't create a checkout" |
07432cef | 5025 | msgstr "不创建一个检出" |
ef317cd5 | 5026 | |
5b04ee3b | 5027 | #: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 |
ef317cd5 | 5028 | msgid "create a bare repository" |
160fb2b2 | 5029 | msgstr "创建一个纯仓库" |
ef317cd5 | 5030 | |
5b04ee3b | 5031 | #: builtin/clone.c:67 |
ef317cd5 | 5032 | msgid "create a mirror repository (implies bare)" |
160fb2b2 | 5033 | msgstr "创建一个镜像仓库(也是纯仓库)" |
ef317cd5 | 5034 | |
5b04ee3b | 5035 | #: builtin/clone.c:69 |
ef317cd5 | 5036 | msgid "to clone from a local repository" |
160fb2b2 | 5037 | msgstr "从本地仓库克隆" |
ef317cd5 | 5038 | |
5b04ee3b | 5039 | #: builtin/clone.c:71 |
ef317cd5 | 5040 | msgid "don't use local hardlinks, always copy" |
07432cef | 5041 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 5042 | |
5b04ee3b | 5043 | #: builtin/clone.c:73 |
ef317cd5 | 5044 | msgid "setup as shared repository" |
160fb2b2 | 5045 | msgstr "设置为共享仓库" |
ef317cd5 | 5046 | |
5b04ee3b | 5047 | #: builtin/clone.c:75 builtin/clone.c:77 |
ef317cd5 | 5048 | msgid "initialize submodules in the clone" |
07432cef | 5049 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 5050 | |
5b04ee3b JX |
5051 | #: builtin/clone.c:79 |
5052 | msgid "number of submodules cloned in parallel" | |
5053 | msgstr "并发克隆的子模组的数量" | |
5054 | ||
5055 | #: builtin/clone.c:80 builtin/init-db.c:470 | |
ef317cd5 | 5056 | msgid "template-directory" |
07432cef | 5057 | msgstr "模板目录" |
ef317cd5 | 5058 | |
5b04ee3b | 5059 | #: builtin/clone.c:81 builtin/init-db.c:471 |
ef317cd5 | 5060 | msgid "directory from which templates will be used" |
07432cef | 5061 | msgstr "模板目录将被使用" |
ef317cd5 | 5062 | |
5b04ee3b JX |
5063 | #: builtin/clone.c:83 builtin/submodule--helper.c:498 |
5064 | #: builtin/submodule--helper.c:777 | |
ef317cd5 | 5065 | msgid "reference repository" |
160fb2b2 | 5066 | msgstr "参考仓库" |
ef317cd5 | 5067 | |
5b04ee3b | 5068 | #: builtin/clone.c:85 |
7aea43ff | 5069 | msgid "use --reference only while cloning" |
160fb2b2 | 5070 | msgstr "仅在克隆时参考 --reference 指向的本地仓库" |
7aea43ff | 5071 | |
5b04ee3b | 5072 | #: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 |
ef317cd5 | 5073 | msgid "name" |
07432cef | 5074 | msgstr "名称" |
ef317cd5 | 5075 | |
5b04ee3b | 5076 | #: builtin/clone.c:87 |
ef317cd5 | 5077 | msgid "use <name> instead of 'origin' to track upstream" |
4375c10e | 5078 | msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" |
ef317cd5 | 5079 | |
5b04ee3b | 5080 | #: builtin/clone.c:89 |
ef317cd5 | 5081 | msgid "checkout <branch> instead of the remote's HEAD" |
4375c10e | 5082 | msgstr "检出 <分支> 而不是远程 HEAD" |
ef317cd5 | 5083 | |
5b04ee3b | 5084 | #: builtin/clone.c:91 |
ef317cd5 | 5085 | msgid "path to git-upload-pack on the remote" |
07432cef | 5086 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 5087 | |
5b04ee3b JX |
5088 | #: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 |
5089 | #: builtin/pull.c:201 | |
ef317cd5 | 5090 | msgid "depth" |
07432cef | 5091 | msgstr "深度" |
ef317cd5 | 5092 | |
5b04ee3b | 5093 | #: builtin/clone.c:93 |
ef317cd5 | 5094 | msgid "create a shallow clone of that depth" |
07432cef | 5095 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 5096 | |
5b04ee3b | 5097 | #: builtin/clone.c:95 |
ef317cd5 | 5098 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 5099 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 5100 | |
5b04ee3b JX |
5101 | #: builtin/clone.c:97 |
5102 | msgid "any cloned submodules will be shallow" | |
5103 | msgstr "子模组将以浅下载模式克隆" | |
5104 | ||
5105 | #: builtin/clone.c:98 builtin/init-db.c:479 | |
ef317cd5 | 5106 | msgid "gitdir" |
07432cef | 5107 | msgstr "git目录" |
ef317cd5 | 5108 | |
5b04ee3b | 5109 | #: builtin/clone.c:99 builtin/init-db.c:480 |
ef317cd5 | 5110 | msgid "separate git dir from working tree" |
07432cef | 5111 | msgstr "git目录和工作区分离" |
ef317cd5 | 5112 | |
5b04ee3b | 5113 | #: builtin/clone.c:100 |
ef317cd5 | 5114 | msgid "key=value" |
07432cef | 5115 | msgstr "key=value" |
ef317cd5 | 5116 | |
5b04ee3b | 5117 | #: builtin/clone.c:101 |
ef317cd5 | 5118 | msgid "set config inside the new repository" |
160fb2b2 | 5119 | msgstr "在新仓库中设置配置信息" |
ef317cd5 | 5120 | |
5b04ee3b | 5121 | #: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 |
276ceeaa JX |
5122 | msgid "use IPv4 addresses only" |
5123 | msgstr "只使用 IPv4 地址" | |
5124 | ||
5b04ee3b | 5125 | #: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 |
276ceeaa JX |
5126 | msgid "use IPv6 addresses only" |
5127 | msgstr "只使用 IPv6 地址" | |
5128 | ||
5b04ee3b | 5129 | #: builtin/clone.c:241 |
3495628d JX |
5130 | msgid "" |
5131 | "No directory name could be guessed.\n" | |
5132 | "Please specify a directory on the command line" | |
5133 | msgstr "" | |
5134 | "无法猜到目录名。\n" | |
26e4cbec | 5135 | "请在命令行指定一个目录" |
3495628d | 5136 | |
5b04ee3b | 5137 | #: builtin/clone.c:307 |
94550ed3 JX |
5138 | #, c-format |
5139 | msgid "reference repository '%s' as a linked checkout is not supported yet." | |
5140 | msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" | |
5141 | ||
5b04ee3b | 5142 | #: builtin/clone.c:309 |
c04f5ac3 | 5143 | #, c-format |
4dcdc3d8 | 5144 | msgid "reference repository '%s' is not a local repository." |
160fb2b2 | 5145 | msgstr "参考仓库 '%s' 不是一个本地仓库。" |
c04f5ac3 | 5146 | |
5b04ee3b | 5147 | #: builtin/clone.c:314 |
cfff71a9 JX |
5148 | #, c-format |
5149 | msgid "reference repository '%s' is shallow" | |
160fb2b2 | 5150 | msgstr "参考仓库 '%s' 是一个浅克隆" |
cfff71a9 | 5151 | |
5b04ee3b | 5152 | #: builtin/clone.c:317 |
cfff71a9 JX |
5153 | #, c-format |
5154 | msgid "reference repository '%s' is grafted" | |
160fb2b2 | 5155 | msgstr "参考仓库 '%s' 已被嫁接" |
cfff71a9 | 5156 | |
5b04ee3b | 5157 | #: builtin/clone.c:384 |
c04f5ac3 JX |
5158 | #, c-format |
5159 | msgid "%s exists and is not a directory" | |
5160 | msgstr "%s 存在且不是一个目录" | |
5161 | ||
5b04ee3b | 5162 | #: builtin/clone.c:398 |
c04f5ac3 JX |
5163 | #, c-format |
5164 | msgid "failed to stat %s\n" | |
90e6ef53 | 5165 | msgstr "无法枚举 %s 状态\n" |
c04f5ac3 | 5166 | |
5b04ee3b | 5167 | #: builtin/clone.c:420 |
c04f5ac3 JX |
5168 | #, c-format |
5169 | msgid "failed to create link '%s'" | |
90e6ef53 | 5170 | msgstr "无法创建链接 '%s'" |
c04f5ac3 | 5171 | |
5b04ee3b | 5172 | #: builtin/clone.c:424 |
c04f5ac3 JX |
5173 | #, c-format |
5174 | msgid "failed to copy file to '%s'" | |
90e6ef53 | 5175 | msgstr "无法拷贝文件至 '%s'" |
c04f5ac3 | 5176 | |
5b04ee3b | 5177 | #: builtin/clone.c:449 builtin/clone.c:633 |
c04f5ac3 JX |
5178 | #, c-format |
5179 | msgid "done.\n" | |
5180 | msgstr "完成。\n" | |
5181 | ||
5b04ee3b | 5182 | #: builtin/clone.c:461 |
1003b3a5 JX |
5183 | msgid "" |
5184 | "Clone succeeded, but checkout failed.\n" | |
5185 | "You can inspect what was checked out with 'git status'\n" | |
5186 | "and retry the checkout with 'git checkout -f HEAD'\n" | |
5187 | msgstr "" | |
5188 | "克隆成功,但是检出失败。\n" | |
5189 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
5190 | "'git checkout -f HEAD' 重试\n" | |
5191 | ||
5b04ee3b | 5192 | #: builtin/clone.c:538 |
c04f5ac3 JX |
5193 | #, c-format |
5194 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 5195 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 5196 | |
5b04ee3b | 5197 | #: builtin/clone.c:628 |
2e8451e8 JX |
5198 | #, c-format |
5199 | msgid "Checking connectivity... " | |
5200 | msgstr "检查连接... " | |
5201 | ||
5b04ee3b | 5202 | #: builtin/clone.c:631 |
1003b3a5 JX |
5203 | msgid "remote did not send all necessary objects" |
5204 | msgstr "远程没有发送所有必须的对象" | |
5205 | ||
5b04ee3b | 5206 | #: builtin/clone.c:649 |
3495628d JX |
5207 | #, c-format |
5208 | msgid "unable to update %s" | |
5209 | msgstr "不能更新 %s" | |
5210 | ||
5b04ee3b | 5211 | #: builtin/clone.c:698 |
c04f5ac3 JX |
5212 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
5213 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
5214 | ||
5b04ee3b | 5215 | #: builtin/clone.c:729 |
1003b3a5 JX |
5216 | msgid "unable to checkout working tree" |
5217 | msgstr "不能检出工作区" | |
5218 | ||
5b04ee3b | 5219 | #: builtin/clone.c:767 |
3495628d JX |
5220 | msgid "unable to write parameters to config file" |
5221 | msgstr "无法将参数写入配置文件" | |
5222 | ||
5b04ee3b | 5223 | #: builtin/clone.c:830 |
04cb2f28 JX |
5224 | msgid "cannot repack to clean up" |
5225 | msgstr "无法执行 repack 来清理" | |
5226 | ||
5b04ee3b | 5227 | #: builtin/clone.c:832 |
04cb2f28 JX |
5228 | msgid "cannot unlink temporary alternates file" |
5229 | msgstr "无法删除临时的 alternates 文件" | |
5230 | ||
5b04ee3b | 5231 | #: builtin/clone.c:864 builtin/receive-pack.c:1731 |
c04f5ac3 JX |
5232 | msgid "Too many arguments." |
5233 | msgstr "太多参数。" | |
5234 | ||
5b04ee3b | 5235 | #: builtin/clone.c:868 |
c04f5ac3 | 5236 | msgid "You must specify a repository to clone." |
160fb2b2 | 5237 | msgstr "您必须指定一个仓库来克隆。" |
c04f5ac3 | 5238 | |
5b04ee3b | 5239 | #: builtin/clone.c:879 |
c04f5ac3 JX |
5240 | #, c-format |
5241 | msgid "--bare and --origin %s options are incompatible." | |
5242 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
5243 | ||
5b04ee3b | 5244 | #: builtin/clone.c:882 |
07432cef WS |
5245 | msgid "--bare and --separate-git-dir are incompatible." |
5246 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
5247 | ||
5b04ee3b | 5248 | #: builtin/clone.c:895 |
c04f5ac3 JX |
5249 | #, c-format |
5250 | msgid "repository '%s' does not exist" | |
160fb2b2 | 5251 | msgstr "仓库 '%s' 不存在" |
c04f5ac3 | 5252 | |
5b04ee3b | 5253 | #: builtin/clone.c:901 builtin/fetch.c:1174 |
cfff71a9 JX |
5254 | #, c-format |
5255 | msgid "depth %s is not a positive number" | |
5256 | msgstr "深度 %s 不是一个正数" | |
5257 | ||
5b04ee3b | 5258 | #: builtin/clone.c:911 |
c04f5ac3 JX |
5259 | #, c-format |
5260 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 5261 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 5262 | |
5b04ee3b | 5263 | #: builtin/clone.c:921 |
c04f5ac3 JX |
5264 | #, c-format |
5265 | msgid "working tree '%s' already exists." | |
5266 | msgstr "工作区 '%s' 已经存在。" | |
5267 | ||
5b04ee3b JX |
5268 | #: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 |
5269 | #: builtin/worktree.c:220 builtin/worktree.c:247 | |
5bb01d4f JX |
5270 | #, c-format |
5271 | msgid "could not create leading directories of '%s'" | |
5272 | msgstr "不能为 '%s' 创建先导目录" | |
5273 | ||
5b04ee3b | 5274 | #: builtin/clone.c:939 |
c04f5ac3 | 5275 | #, c-format |
814ff314 JX |
5276 | msgid "could not create work tree dir '%s'" |
5277 | msgstr "不能创建工作区目录 '%s'" | |
c04f5ac3 | 5278 | |
5b04ee3b | 5279 | #: builtin/clone.c:957 |
c04f5ac3 JX |
5280 | #, c-format |
5281 | msgid "Cloning into bare repository '%s'...\n" | |
160fb2b2 | 5282 | msgstr "克隆到纯仓库 '%s'...\n" |
c04f5ac3 | 5283 | |
5b04ee3b | 5284 | #: builtin/clone.c:959 |
c04f5ac3 JX |
5285 | #, c-format |
5286 | msgid "Cloning into '%s'...\n" | |
5287 | msgstr "正克隆到 '%s'...\n" | |
5288 | ||
5b04ee3b | 5289 | #: builtin/clone.c:998 |
6acbf033 JX |
5290 | msgid "--depth is ignored in local clones; use file:// instead." |
5291 | msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。" | |
5292 | ||
5b04ee3b | 5293 | #: builtin/clone.c:1001 |
6acbf033 | 5294 | msgid "source repository is shallow, ignoring --local" |
160fb2b2 | 5295 | msgstr "源仓库是浅克隆,忽略 --local" |
6acbf033 | 5296 | |
5b04ee3b | 5297 | #: builtin/clone.c:1006 |
6acbf033 JX |
5298 | msgid "--local is ignored" |
5299 | msgstr "--local 被忽略" | |
5300 | ||
5b04ee3b | 5301 | #: builtin/clone.c:1010 |
c04f5ac3 JX |
5302 | #, c-format |
5303 | msgid "Don't know how to clone %s" | |
5304 | msgstr "不知道如何克隆 %s" | |
5305 | ||
5b04ee3b | 5306 | #: builtin/clone.c:1059 builtin/clone.c:1067 |
c04f5ac3 JX |
5307 | #, c-format |
5308 | msgid "Remote branch %s not found in upstream %s" | |
5309 | msgstr "远程分支 %s 在上游 %s 未发现" | |
5310 | ||
5b04ee3b | 5311 | #: builtin/clone.c:1070 |
c04f5ac3 | 5312 | msgid "You appear to have cloned an empty repository." |
160fb2b2 | 5313 | msgstr "您似乎克隆了一个空仓库。" |
c04f5ac3 | 5314 | |
ef317cd5 | 5315 | #: builtin/column.c:9 |
814ff314 JX |
5316 | msgid "git column [<options>]" |
5317 | msgstr "git column [<选项>]" | |
ef317cd5 JX |
5318 | |
5319 | #: builtin/column.c:26 | |
5320 | msgid "lookup config vars" | |
07432cef | 5321 | msgstr "查找配置变量" |
ef317cd5 JX |
5322 | |
5323 | #: builtin/column.c:27 builtin/column.c:28 | |
ef317cd5 | 5324 | msgid "layout to use" |
07432cef | 5325 | msgstr "要使用的布局" |
ef317cd5 JX |
5326 | |
5327 | #: builtin/column.c:29 | |
5328 | msgid "Maximum width" | |
07432cef | 5329 | msgstr "最大宽度" |
ef317cd5 JX |
5330 | |
5331 | #: builtin/column.c:30 | |
5332 | msgid "Padding space on left border" | |
07432cef | 5333 | msgstr "左边框的填充空间" |
ef317cd5 JX |
5334 | |
5335 | #: builtin/column.c:31 | |
5336 | msgid "Padding space on right border" | |
07432cef | 5337 | msgstr "右边框的填充空间" |
ef317cd5 JX |
5338 | |
5339 | #: builtin/column.c:32 | |
5340 | msgid "Padding space between columns" | |
07432cef | 5341 | msgstr "两列之间的填充空间" |
ef317cd5 | 5342 | |
8ada9598 JX |
5343 | #: builtin/column.c:51 |
5344 | msgid "--command must be the first argument" | |
81809b99 | 5345 | msgstr "--command 必须是第一个参数" |
8ada9598 | 5346 | |
94550ed3 | 5347 | #: builtin/commit.c:38 |
814ff314 | 5348 | msgid "git commit [<options>] [--] <pathspec>..." |
160fb2b2 | 5349 | msgstr "git commit [<选项>] [--] <路径规格>..." |
ef317cd5 | 5350 | |
94550ed3 | 5351 | #: builtin/commit.c:43 |
814ff314 | 5352 | msgid "git status [<options>] [--] <pathspec>..." |
160fb2b2 | 5353 | msgstr "git status [<选项>] [--] <路径规格>..." |
ef317cd5 | 5354 | |
94550ed3 | 5355 | #: builtin/commit.c:48 |
220c313c JX |
5356 | msgid "" |
5357 | "Your name and email address were configured automatically based\n" | |
5358 | "on your username and hostname. Please check that they are accurate.\n" | |
5359 | "You can suppress this message by setting them explicitly. Run the\n" | |
5360 | "following command and follow the instructions in your editor to edit\n" | |
5361 | "your configuration file:\n" | |
5362 | "\n" | |
5363 | " git config --global --edit\n" | |
5364 | "\n" | |
5365 | "After doing this, you may fix the identity used for this commit with:\n" | |
5366 | "\n" | |
5367 | " git commit --amend --reset-author\n" | |
5368 | msgstr "" | |
5369 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
5370 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" | |
5371 | "中编辑您的配置文件:\n" | |
5372 | "\n" | |
5373 | " git config --global --edit\n" | |
5374 | "\n" | |
5375 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
5376 | "\n" | |
5377 | " git commit --amend --reset-author\n" | |
5378 | ||
94550ed3 | 5379 | #: builtin/commit.c:61 |
c04f5ac3 JX |
5380 | msgid "" |
5381 | "Your name and email address were configured automatically based\n" | |
5382 | "on your username and hostname. Please check that they are accurate.\n" | |
5383 | "You can suppress this message by setting them explicitly:\n" | |
5384 | "\n" | |
5385 | " git config --global user.name \"Your Name\"\n" | |
5386 | " git config --global user.email you@example.com\n" | |
5387 | "\n" | |
5388 | "After doing this, you may fix the identity used for this commit with:\n" | |
5389 | "\n" | |
5390 | " git commit --amend --reset-author\n" | |
5391 | msgstr "" | |
90e6ef53 | 5392 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" |
220c313c | 5393 | "与否。您可以对其进行设置以免再出现本提示信息:\n" |
c04f5ac3 JX |
5394 | "\n" |
5395 | " git config --global user.name \"Your Name\"\n" | |
5396 | " git config --global user.email you@example.com\n" | |
5397 | "\n" | |
90e6ef53 | 5398 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" |
c04f5ac3 JX |
5399 | "\n" |
5400 | " git commit --amend --reset-author\n" | |
5401 | ||
94550ed3 | 5402 | #: builtin/commit.c:73 |
c04f5ac3 JX |
5403 | msgid "" |
5404 | "You asked to amend the most recent commit, but doing so would make\n" | |
5405 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
5406 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
5407 | msgstr "" | |
1b150dc9 T |
5408 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
5409 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 5410 | |
94550ed3 | 5411 | #: builtin/commit.c:78 |
c04f5ac3 JX |
5412 | msgid "" |
5413 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
5414 | "If you wish to commit it anyway, use:\n" | |
5415 | "\n" | |
5416 | " git commit --allow-empty\n" | |
5417 | "\n" | |
c04f5ac3 | 5418 | msgstr "" |
a9ce4543 T |
5419 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
5420 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
5421 | "\n" |
5422 | " git commit --allow-empty\n" | |
5423 | "\n" | |
c04f5ac3 | 5424 | |
94550ed3 | 5425 | #: builtin/commit.c:85 |
b1894384 JX |
5426 | msgid "Otherwise, please use 'git reset'\n" |
5427 | msgstr "否则,请使用命令 'git reset'\n" | |
5428 | ||
94550ed3 | 5429 | #: builtin/commit.c:88 |
b1894384 JX |
5430 | msgid "" |
5431 | "If you wish to skip this commit, use:\n" | |
5432 | "\n" | |
5433 | " git reset\n" | |
5434 | "\n" | |
5435 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" | |
5436 | "the remaining commits.\n" | |
5437 | msgstr "" | |
5438 | "如果您想跳过这个提交,使用命令:\n" | |
5439 | "\n" | |
5440 | " git reset\n" | |
5441 | "\n" | |
5442 | "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" | |
5443 | "操作。\n" | |
5444 | ||
5b04ee3b | 5445 | #: builtin/commit.c:307 |
c04f5ac3 | 5446 | msgid "failed to unpack HEAD tree object" |
90e6ef53 | 5447 | msgstr "无法解包 HEAD 树对象" |
c04f5ac3 | 5448 | |
5b04ee3b | 5449 | #: builtin/commit.c:348 |
c04f5ac3 | 5450 | msgid "unable to create temporary index" |
90e6ef53 | 5451 | msgstr "不能创建临时索引" |
c04f5ac3 | 5452 | |
5b04ee3b | 5453 | #: builtin/commit.c:354 |
c04f5ac3 JX |
5454 | msgid "interactive add failed" |
5455 | msgstr "交互式添加失败" | |
5456 | ||
5b04ee3b | 5457 | #: builtin/commit.c:367 |
220c313c JX |
5458 | msgid "unable to update temporary index" |
5459 | msgstr "无法更新临时索引" | |
5460 | ||
5b04ee3b | 5461 | #: builtin/commit.c:369 |
220c313c JX |
5462 | msgid "Failed to update main cache tree" |
5463 | msgstr "不能更新树的主缓存" | |
5464 | ||
5b04ee3b | 5465 | #: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 |
c04f5ac3 | 5466 | msgid "unable to write new_index file" |
90e6ef53 | 5467 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 5468 | |
5b04ee3b | 5469 | #: builtin/commit.c:447 |
8ada9598 | 5470 | msgid "cannot do a partial commit during a merge." |
81809b99 | 5471 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 5472 | |
5b04ee3b | 5473 | #: builtin/commit.c:449 |
8ada9598 | 5474 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 5475 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 5476 | |
5b04ee3b | 5477 | #: builtin/commit.c:458 |
c04f5ac3 | 5478 | msgid "cannot read the index" |
90e6ef53 | 5479 | msgstr "无法读取索引" |
c04f5ac3 | 5480 | |
5b04ee3b | 5481 | #: builtin/commit.c:477 |
c04f5ac3 | 5482 | msgid "unable to write temporary index file" |
90e6ef53 | 5483 | msgstr "无法写临时索引文件" |
c04f5ac3 | 5484 | |
5b04ee3b | 5485 | #: builtin/commit.c:582 |
220c313c JX |
5486 | #, c-format |
5487 | msgid "commit '%s' lacks author header" | |
5488 | msgstr "提交 '%s' 缺少作者信息" | |
5489 | ||
5b04ee3b | 5490 | #: builtin/commit.c:584 |
c04f5ac3 | 5491 | #, c-format |
220c313c JX |
5492 | msgid "commit '%s' has malformed author line" |
5493 | msgstr "提交 '%s' 有非法的作者信息" | |
c04f5ac3 | 5494 | |
5b04ee3b | 5495 | #: builtin/commit.c:603 |
c04f5ac3 JX |
5496 | msgid "malformed --author parameter" |
5497 | msgstr "非法的 --author 参数" | |
5498 | ||
5b04ee3b | 5499 | #: builtin/commit.c:611 |
c04f5ac3 | 5500 | #, c-format |
6acbf033 JX |
5501 | msgid "invalid date format: %s" |
5502 | msgstr "无效的日期格式:%s" | |
5503 | ||
5b04ee3b | 5504 | #: builtin/commit.c:655 |
6acbf033 JX |
5505 | msgid "" |
5506 | "unable to select a comment character that is not used\n" | |
5507 | "in the current commit message" | |
5508 | msgstr "无法选择一个未被当前提交说明使用的注释字符" | |
5509 | ||
5b04ee3b | 5510 | #: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 |
c04f5ac3 JX |
5511 | #, c-format |
5512 | msgid "could not lookup commit %s" | |
5513 | msgstr "不能查询提交 %s" | |
5514 | ||
5b04ee3b | 5515 | #: builtin/commit.c:704 builtin/shortlog.c:285 |
c04f5ac3 JX |
5516 | #, c-format |
5517 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 5518 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 5519 | |
5b04ee3b | 5520 | #: builtin/commit.c:706 |
c04f5ac3 | 5521 | msgid "could not read log from standard input" |
90e6ef53 | 5522 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 5523 | |
5b04ee3b | 5524 | #: builtin/commit.c:710 |
c04f5ac3 JX |
5525 | #, c-format |
5526 | msgid "could not read log file '%s'" | |
90e6ef53 | 5527 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 5528 | |
5b04ee3b | 5529 | #: builtin/commit.c:737 builtin/commit.c:745 |
c04f5ac3 | 5530 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 5531 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 5532 | |
5b04ee3b JX |
5533 | #: builtin/commit.c:742 |
5534 | msgid "could not read MERGE_MSG" | |
5535 | msgstr "不能读取 MERGE_MSG" | |
5536 | ||
5537 | #: builtin/commit.c:796 | |
c04f5ac3 | 5538 | msgid "could not write commit template" |
90e6ef53 | 5539 | msgstr "不能写提交模版" |
c04f5ac3 | 5540 | |
5b04ee3b | 5541 | #: builtin/commit.c:814 |
81809b99 | 5542 | #, c-format |
c04f5ac3 JX |
5543 | msgid "" |
5544 | "\n" | |
8ada9598 | 5545 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
5546 | "If this is not correct, please remove the file\n" |
5547 | "\t%s\n" | |
5548 | "and try again.\n" | |
5549 | msgstr "" | |
5550 | "\n" | |
649900bc | 5551 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
5552 | "\t%s\n" |
5553 | "然后重试。\n" | |
5554 | ||
5b04ee3b | 5555 | #: builtin/commit.c:819 |
81809b99 | 5556 | #, c-format |
8ada9598 JX |
5557 | msgid "" |
5558 | "\n" | |
5559 | "It looks like you may be committing a cherry-pick.\n" | |
5560 | "If this is not correct, please remove the file\n" | |
5561 | "\t%s\n" | |
5562 | "and try again.\n" | |
5563 | msgstr "" | |
5564 | "\n" | |
649900bc | 5565 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
5566 | "\t%s\n" |
5567 | "然后重试。\n" | |
c04f5ac3 | 5568 | |
5b04ee3b | 5569 | #: builtin/commit.c:832 |
a77c07d9 | 5570 | #, c-format |
c04f5ac3 | 5571 | msgid "" |
8ada9598 | 5572 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 5573 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
c04f5ac3 | 5574 | msgstr "" |
a77c07d9 | 5575 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
81809b99 | 5576 | "说明将会终止提交。\n" |
c04f5ac3 | 5577 | |
5b04ee3b | 5578 | #: builtin/commit.c:839 |
a77c07d9 | 5579 | #, c-format |
c04f5ac3 | 5580 | msgid "" |
8ada9598 | 5581 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 5582 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
c04f5ac3 JX |
5583 | "An empty message aborts the commit.\n" |
5584 | msgstr "" | |
a77c07d9 JX |
5585 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
5586 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 5587 | |
90e6ef53 | 5588 | # 译者:为保证在输出中对齐,注意调整句中空格! |
5b04ee3b | 5589 | #: builtin/commit.c:859 |
6acbf033 JX |
5590 | #, c-format |
5591 | msgid "%sAuthor: %.*s <%.*s>" | |
5592 | msgstr "%s作者: %.*s <%.*s>" | |
5593 | ||
5594 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
5b04ee3b | 5595 | #: builtin/commit.c:867 |
c04f5ac3 | 5596 | #, c-format |
6acbf033 JX |
5597 | msgid "%sDate: %s" |
5598 | msgstr "%s日期: %s" | |
c04f5ac3 | 5599 | |
90e6ef53 | 5600 | # 译者:为保证在输出中对齐,注意调整句中空格! |
5b04ee3b | 5601 | #: builtin/commit.c:874 |
c04f5ac3 | 5602 | #, c-format |
6acbf033 JX |
5603 | msgid "%sCommitter: %.*s <%.*s>" |
5604 | msgstr "%s提交者:%.*s <%.*s>" | |
c04f5ac3 | 5605 | |
5b04ee3b | 5606 | #: builtin/commit.c:892 |
c04f5ac3 | 5607 | msgid "Cannot read index" |
90e6ef53 | 5608 | msgstr "无法读取索引" |
c04f5ac3 | 5609 | |
5b04ee3b | 5610 | #: builtin/commit.c:949 |
c04f5ac3 JX |
5611 | msgid "Error building trees" |
5612 | msgstr "无法创建树对象" | |
5613 | ||
5b04ee3b | 5614 | #: builtin/commit.c:964 builtin/tag.c:266 |
c04f5ac3 JX |
5615 | #, c-format |
5616 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 5617 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 5618 | |
5b04ee3b | 5619 | #: builtin/commit.c:1066 |
c04f5ac3 | 5620 | #, c-format |
814ff314 JX |
5621 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
5622 | msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配" | |
c04f5ac3 | 5623 | |
5b04ee3b | 5624 | #: builtin/commit.c:1081 builtin/commit.c:1321 |
c04f5ac3 JX |
5625 | #, c-format |
5626 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 5627 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 5628 | |
5b04ee3b | 5629 | #: builtin/commit.c:1118 |
2e8451e8 JX |
5630 | msgid "--long and -z are incompatible" |
5631 | msgstr "--long 和 -z 选项不兼容" | |
5632 | ||
5b04ee3b | 5633 | #: builtin/commit.c:1148 |
c04f5ac3 JX |
5634 | msgid "Using both --reset-author and --author does not make sense" |
5635 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
5636 | ||
5b04ee3b | 5637 | #: builtin/commit.c:1157 |
c04f5ac3 | 5638 | msgid "You have nothing to amend." |
90e6ef53 | 5639 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 5640 | |
5b04ee3b | 5641 | #: builtin/commit.c:1160 |
8ada9598 | 5642 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 5643 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 5644 | |
5b04ee3b | 5645 | #: builtin/commit.c:1162 |
8ada9598 | 5646 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 5647 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 5648 | |
5b04ee3b | 5649 | #: builtin/commit.c:1165 |
c04f5ac3 | 5650 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 5651 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 5652 | |
5b04ee3b | 5653 | #: builtin/commit.c:1175 |
c04f5ac3 JX |
5654 | msgid "Only one of -c/-C/-F/--fixup can be used." |
5655 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
5656 | ||
5b04ee3b | 5657 | #: builtin/commit.c:1177 |
c04f5ac3 | 5658 | msgid "Option -m cannot be combined with -c/-C/-F/--fixup." |
649900bc | 5659 | msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" |
c04f5ac3 | 5660 | |
5b04ee3b | 5661 | #: builtin/commit.c:1185 |
c04f5ac3 | 5662 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 5663 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 5664 | |
5b04ee3b | 5665 | #: builtin/commit.c:1202 |
c04f5ac3 JX |
5666 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
5667 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
5668 | ||
5b04ee3b | 5669 | #: builtin/commit.c:1204 |
c04f5ac3 JX |
5670 | msgid "No paths with --include/--only does not make sense." |
5671 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
5672 | ||
5b04ee3b | 5673 | #: builtin/commit.c:1206 |
c04f5ac3 | 5674 | msgid "Clever... amending the last one with dirty index." |
160fb2b2 | 5675 | msgstr "聪明... 用脏索引修补最后一个提交。" |
c04f5ac3 | 5676 | |
5b04ee3b | 5677 | #: builtin/commit.c:1208 |
6c94aba5 JX |
5678 | msgid "Explicit paths specified without -i or -o; assuming --only paths..." |
5679 | msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..." | |
c04f5ac3 | 5680 | |
5b04ee3b | 5681 | #: builtin/commit.c:1220 builtin/tag.c:474 |
c04f5ac3 JX |
5682 | #, c-format |
5683 | msgid "Invalid cleanup mode %s" | |
5684 | msgstr "无效的清理模式 %s" | |
5685 | ||
5b04ee3b | 5686 | #: builtin/commit.c:1225 |
c04f5ac3 | 5687 | msgid "Paths with -a does not make sense." |
649900bc | 5688 | msgstr "路径和 -a 选项同时使用没有意义。" |
c04f5ac3 | 5689 | |
5b04ee3b | 5690 | #: builtin/commit.c:1335 builtin/commit.c:1621 |
ef317cd5 | 5691 | msgid "show status concisely" |
07432cef | 5692 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 5693 | |
5b04ee3b | 5694 | #: builtin/commit.c:1337 builtin/commit.c:1623 |
ef317cd5 | 5695 | msgid "show branch information" |
07432cef | 5696 | msgstr "显示分支信息" |
ef317cd5 | 5697 | |
5b04ee3b JX |
5698 | #: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 |
5699 | #: builtin/worktree.c:437 | |
ef317cd5 | 5700 | msgid "machine-readable output" |
07432cef WS |
5701 | msgstr "机器可读的输出" |
5702 | ||
5b04ee3b | 5703 | #: builtin/commit.c:1342 builtin/commit.c:1627 |
07432cef WS |
5704 | msgid "show status in long format (default)" |
5705 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 5706 | |
5b04ee3b | 5707 | #: builtin/commit.c:1345 builtin/commit.c:1630 |
ef317cd5 | 5708 | msgid "terminate entries with NUL" |
4375c10e | 5709 | msgstr "条目以 NUL 字符结尾" |
ef317cd5 | 5710 | |
5b04ee3b | 5711 | #: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 |
94550ed3 | 5712 | #: builtin/fast-export.c:984 builtin/tag.c:353 |
ef317cd5 | 5713 | msgid "mode" |
07432cef | 5714 | msgstr "模式" |
ef317cd5 | 5715 | |
5b04ee3b | 5716 | #: builtin/commit.c:1348 builtin/commit.c:1633 |
ef317cd5 | 5717 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 5718 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 5719 | |
5b04ee3b | 5720 | #: builtin/commit.c:1351 |
ef317cd5 | 5721 | msgid "show ignored files" |
07432cef | 5722 | msgstr "显示忽略的文件" |
ef317cd5 | 5723 | |
5b04ee3b | 5724 | #: builtin/commit.c:1352 parse-options.h:155 |
ef317cd5 JX |
5725 | msgid "when" |
5726 | msgstr "何时" | |
5727 | ||
5b04ee3b | 5728 | #: builtin/commit.c:1353 |
ef317cd5 JX |
5729 | msgid "" |
5730 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
5731 | "(Default: all)" | |
5732 | msgstr "" | |
07432cef | 5733 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 5734 | |
5b04ee3b | 5735 | #: builtin/commit.c:1355 |
ef317cd5 | 5736 | msgid "list untracked files in columns" |
07432cef | 5737 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 5738 | |
5b04ee3b | 5739 | #: builtin/commit.c:1441 |
c04f5ac3 JX |
5740 | msgid "couldn't look up newly created commit" |
5741 | msgstr "无法找到新创建的提交" | |
5742 | ||
5b04ee3b | 5743 | #: builtin/commit.c:1443 |
c04f5ac3 | 5744 | msgid "could not parse newly created commit" |
90e6ef53 | 5745 | msgstr "不能解析新创建的提交" |
c04f5ac3 | 5746 | |
5b04ee3b | 5747 | #: builtin/commit.c:1488 |
c04f5ac3 JX |
5748 | msgid "detached HEAD" |
5749 | msgstr "分离头指针" | |
5750 | ||
7e238ab7 | 5751 | # 译者:中文字符串拼接,可删除前导空格 |
5b04ee3b | 5752 | #: builtin/commit.c:1491 |
c04f5ac3 | 5753 | msgid " (root-commit)" |
7e238ab7 | 5754 | msgstr "(根提交)" |
c04f5ac3 | 5755 | |
5b04ee3b | 5756 | #: builtin/commit.c:1591 |
ef317cd5 | 5757 | msgid "suppress summary after successful commit" |
07432cef | 5758 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 5759 | |
5b04ee3b | 5760 | #: builtin/commit.c:1592 |
ef317cd5 | 5761 | msgid "show diff in commit message template" |
07432cef | 5762 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 5763 | |
5b04ee3b | 5764 | #: builtin/commit.c:1594 |
ef317cd5 | 5765 | msgid "Commit message options" |
07432cef | 5766 | msgstr "提交说明选项" |
c04f5ac3 | 5767 | |
5b04ee3b | 5768 | #: builtin/commit.c:1595 builtin/tag.c:351 |
ef317cd5 | 5769 | msgid "read message from file" |
07432cef | 5770 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 5771 | |
5b04ee3b | 5772 | #: builtin/commit.c:1596 |
ef317cd5 | 5773 | msgid "author" |
07432cef | 5774 | msgstr "作者" |
c04f5ac3 | 5775 | |
5b04ee3b | 5776 | #: builtin/commit.c:1596 |
ef317cd5 | 5777 | msgid "override author for commit" |
07432cef | 5778 | msgstr "提交时覆盖作者" |
73a60cd2 | 5779 | |
5b04ee3b | 5780 | #: builtin/commit.c:1597 builtin/gc.c:326 |
ef317cd5 | 5781 | msgid "date" |
07432cef | 5782 | msgstr "日期" |
c04f5ac3 | 5783 | |
5b04ee3b | 5784 | #: builtin/commit.c:1597 |
ef317cd5 | 5785 | msgid "override date for commit" |
07432cef | 5786 | msgstr "提交时覆盖日期" |
c04f5ac3 | 5787 | |
5b04ee3b | 5788 | #: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 |
276ceeaa | 5789 | #: builtin/notes.c:558 builtin/tag.c:349 |
ef317cd5 | 5790 | msgid "message" |
07432cef | 5791 | msgstr "说明" |
c04f5ac3 | 5792 | |
5b04ee3b | 5793 | #: builtin/commit.c:1598 |
ef317cd5 | 5794 | msgid "commit message" |
07432cef | 5795 | msgstr "提交说明" |
ef317cd5 | 5796 | |
5b04ee3b JX |
5797 | #: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 |
5798 | #: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 | |
94550ed3 JX |
5799 | msgid "commit" |
5800 | msgstr "提交" | |
5801 | ||
5b04ee3b | 5802 | #: builtin/commit.c:1599 |
ef317cd5 | 5803 | msgid "reuse and edit message from specified commit" |
07432cef | 5804 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 5805 | |
5b04ee3b | 5806 | #: builtin/commit.c:1600 |
ef317cd5 | 5807 | msgid "reuse message from specified commit" |
07432cef | 5808 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 5809 | |
5b04ee3b | 5810 | #: builtin/commit.c:1601 |
ef317cd5 | 5811 | msgid "use autosquash formatted message to fixup specified commit" |
07432cef | 5812 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
ef317cd5 | 5813 | |
5b04ee3b | 5814 | #: builtin/commit.c:1602 |
ef317cd5 | 5815 | msgid "use autosquash formatted message to squash specified commit" |
07432cef | 5816 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
ef317cd5 | 5817 | |
5b04ee3b | 5818 | #: builtin/commit.c:1603 |
ef317cd5 | 5819 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 5820 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 5821 | |
5b04ee3b | 5822 | #: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 |
ef317cd5 | 5823 | msgid "add Signed-off-by:" |
07432cef | 5824 | msgstr "添加 Signed-off-by: 签名" |
ef317cd5 | 5825 | |
5b04ee3b | 5826 | #: builtin/commit.c:1605 |
ef317cd5 | 5827 | msgid "use specified template file" |
07432cef | 5828 | msgstr "使用指定的模板文件" |
ef317cd5 | 5829 | |
5b04ee3b | 5830 | #: builtin/commit.c:1606 |
ef317cd5 | 5831 | msgid "force edit of commit" |
07432cef | 5832 | msgstr "强制编辑提交" |
ef317cd5 | 5833 | |
07432cef | 5834 | # 译者:可选值,不能翻译(或是原文中笔误,应为 mode) |
5b04ee3b | 5835 | #: builtin/commit.c:1607 |
ef317cd5 | 5836 | msgid "default" |
07432cef | 5837 | msgstr "default" |
ef317cd5 | 5838 | |
5b04ee3b | 5839 | #: builtin/commit.c:1607 builtin/tag.c:354 |
ef317cd5 | 5840 | msgid "how to strip spaces and #comments from message" |
07432cef | 5841 | msgstr "设置如何删除提交说明里的空格和#注释" |
ef317cd5 | 5842 | |
5b04ee3b | 5843 | #: builtin/commit.c:1608 |
ef317cd5 | 5844 | msgid "include status in commit message template" |
07432cef | 5845 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 5846 | |
5b04ee3b | 5847 | #: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 |
1b7f4a34 | 5848 | #: builtin/revert.c:93 |
ef317cd5 | 5849 | msgid "GPG sign commit" |
07432cef | 5850 | msgstr "GPG 提交签名" |
ef317cd5 | 5851 | |
5b04ee3b | 5852 | #: builtin/commit.c:1613 |
ef317cd5 | 5853 | msgid "Commit contents options" |
07432cef | 5854 | msgstr "提交内容选项" |
ef317cd5 | 5855 | |
5b04ee3b | 5856 | #: builtin/commit.c:1614 |
ef317cd5 | 5857 | msgid "commit all changed files" |
07432cef | 5858 | msgstr "提交所有改动的文件" |
ef317cd5 | 5859 | |
5b04ee3b | 5860 | #: builtin/commit.c:1615 |
ef317cd5 | 5861 | msgid "add specified files to index for commit" |
07432cef | 5862 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 5863 | |
5b04ee3b | 5864 | #: builtin/commit.c:1616 |
ef317cd5 | 5865 | msgid "interactively add files" |
07432cef | 5866 | msgstr "交互式添加文件" |
ef317cd5 | 5867 | |
5b04ee3b | 5868 | #: builtin/commit.c:1617 |
ef317cd5 | 5869 | msgid "interactively add changes" |
07432cef | 5870 | msgstr "交互式添加变更" |
ef317cd5 | 5871 | |
5b04ee3b | 5872 | #: builtin/commit.c:1618 |
ef317cd5 | 5873 | msgid "commit only specified files" |
07432cef | 5874 | msgstr "只提交指定的文件" |
ef317cd5 | 5875 | |
5b04ee3b | 5876 | #: builtin/commit.c:1619 |
ef317cd5 | 5877 | msgid "bypass pre-commit hook" |
07432cef | 5878 | msgstr "绕过 pre-commit 钩子" |
ef317cd5 | 5879 | |
5b04ee3b | 5880 | #: builtin/commit.c:1620 |
ef317cd5 | 5881 | msgid "show what would be committed" |
07432cef | 5882 | msgstr "显示将要提交的内容" |
ef317cd5 | 5883 | |
5b04ee3b | 5884 | #: builtin/commit.c:1631 |
ef317cd5 | 5885 | msgid "amend previous commit" |
07432cef | 5886 | msgstr "修改先前的提交" |
ef317cd5 | 5887 | |
5b04ee3b | 5888 | #: builtin/commit.c:1632 |
ef317cd5 | 5889 | msgid "bypass post-rewrite hook" |
07432cef | 5890 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 5891 | |
5b04ee3b | 5892 | #: builtin/commit.c:1637 |
ef317cd5 | 5893 | msgid "ok to record an empty change" |
07432cef | 5894 | msgstr "允许一个空提交" |
ef317cd5 | 5895 | |
5b04ee3b | 5896 | #: builtin/commit.c:1639 |
ef317cd5 | 5897 | msgid "ok to record a change with an empty message" |
07432cef | 5898 | msgstr "允许空的提交说明" |
ef317cd5 | 5899 | |
5b04ee3b | 5900 | #: builtin/commit.c:1668 |
c04f5ac3 | 5901 | msgid "could not parse HEAD commit" |
90e6ef53 | 5902 | msgstr "不能解析 HEAD 提交" |
c04f5ac3 | 5903 | |
5b04ee3b | 5904 | #: builtin/commit.c:1718 |
c04f5ac3 JX |
5905 | #, c-format |
5906 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 5907 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 5908 | |
5b04ee3b | 5909 | #: builtin/commit.c:1725 |
c04f5ac3 | 5910 | msgid "could not read MERGE_MODE" |
90e6ef53 | 5911 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 5912 | |
5b04ee3b | 5913 | #: builtin/commit.c:1744 |
c04f5ac3 JX |
5914 | #, c-format |
5915 | msgid "could not read commit message: %s" | |
90e6ef53 | 5916 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 5917 | |
5b04ee3b | 5918 | #: builtin/commit.c:1755 |
73a60cd2 JX |
5919 | #, c-format |
5920 | msgid "Aborting commit; you did not edit the message.\n" | |
5921 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
5922 | ||
5b04ee3b | 5923 | #: builtin/commit.c:1760 |
c04f5ac3 JX |
5924 | #, c-format |
5925 | msgid "Aborting commit due to empty commit message.\n" | |
5926 | msgstr "终止提交因为提交说明为空。\n" | |
5927 | ||
5b04ee3b | 5928 | #: builtin/commit.c:1808 |
c04f5ac3 JX |
5929 | msgid "" |
5930 | "Repository has been updated, but unable to write\n" | |
220c313c | 5931 | "new_index file. Check that disk is not full and quota is\n" |
c04f5ac3 JX |
5932 | "not exceeded, and then \"git reset HEAD\" to recover." |
5933 | msgstr "" | |
160fb2b2 | 5934 | "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" |
90e6ef53 | 5935 | "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" |
c04f5ac3 | 5936 | |
276ceeaa | 5937 | #: builtin/config.c:9 |
814ff314 JX |
5938 | msgid "git config [<options>]" |
5939 | msgstr "git config [<选项>]" | |
ef317cd5 | 5940 | |
276ceeaa | 5941 | #: builtin/config.c:56 |
ef317cd5 | 5942 | msgid "Config file location" |
07432cef | 5943 | msgstr "配置文件位置" |
ef317cd5 | 5944 | |
276ceeaa | 5945 | #: builtin/config.c:57 |
ef317cd5 | 5946 | msgid "use global config file" |
07432cef | 5947 | msgstr "使用全局配置文件" |
ef317cd5 | 5948 | |
276ceeaa | 5949 | #: builtin/config.c:58 |
ef317cd5 | 5950 | msgid "use system config file" |
07432cef | 5951 | msgstr "使用系统级配置文件" |
ef317cd5 | 5952 | |
276ceeaa | 5953 | #: builtin/config.c:59 |
ef317cd5 | 5954 | msgid "use repository config file" |
160fb2b2 | 5955 | msgstr "使用仓库级配置文件" |
ef317cd5 | 5956 | |
276ceeaa | 5957 | #: builtin/config.c:60 |
ef317cd5 | 5958 | msgid "use given config file" |
07432cef | 5959 | msgstr "使用指定的配置文件" |
ef317cd5 | 5960 | |
276ceeaa | 5961 | #: builtin/config.c:61 |
2e8451e8 | 5962 | msgid "blob-id" |
4375c10e | 5963 | msgstr "数据对象 ID" |
2e8451e8 | 5964 | |
276ceeaa | 5965 | #: builtin/config.c:61 |
2e8451e8 JX |
5966 | msgid "read config from given blob object" |
5967 | msgstr "从给定的数据对象读取配置" | |
5968 | ||
276ceeaa | 5969 | #: builtin/config.c:62 |
ef317cd5 | 5970 | msgid "Action" |
07432cef | 5971 | msgstr "操作" |
ef317cd5 | 5972 | |
276ceeaa | 5973 | #: builtin/config.c:63 |
ef317cd5 | 5974 | msgid "get value: name [value-regex]" |
07432cef | 5975 | msgstr "获取值:name [value-regex]" |
ef317cd5 | 5976 | |
276ceeaa | 5977 | #: builtin/config.c:64 |
ef317cd5 | 5978 | msgid "get all values: key [value-regex]" |
07432cef | 5979 | msgstr "获得所有的值:key [value-regex]" |
ef317cd5 | 5980 | |
276ceeaa | 5981 | #: builtin/config.c:65 |
ef317cd5 | 5982 | msgid "get values for regexp: name-regex [value-regex]" |
07432cef | 5983 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
ef317cd5 | 5984 | |
276ceeaa | 5985 | #: builtin/config.c:66 |
90314792 JX |
5986 | msgid "get value specific for the URL: section[.var] URL" |
5987 | msgstr "获得 URL 取值:section[.var] URL" | |
5988 | ||
276ceeaa | 5989 | #: builtin/config.c:67 |
ef317cd5 | 5990 | msgid "replace all matching variables: name value [value_regex]" |
07432cef | 5991 | msgstr "替换所有匹配的变量:name value [value_regex]" |
ef317cd5 | 5992 | |
276ceeaa | 5993 | #: builtin/config.c:68 |
ef317cd5 | 5994 | msgid "add a new variable: name value" |
07432cef | 5995 | msgstr "添加一个新的变量:name value" |
ef317cd5 | 5996 | |
276ceeaa | 5997 | #: builtin/config.c:69 |
ef317cd5 | 5998 | msgid "remove a variable: name [value-regex]" |
07432cef | 5999 | msgstr "删除一个变量:name [value-regex]" |
ef317cd5 | 6000 | |
276ceeaa | 6001 | #: builtin/config.c:70 |
ef317cd5 | 6002 | msgid "remove all matches: name [value-regex]" |
07432cef | 6003 | msgstr "删除所有匹配项:name [value-regex]" |
ef317cd5 | 6004 | |
276ceeaa | 6005 | #: builtin/config.c:71 |
ef317cd5 | 6006 | msgid "rename section: old-name new-name" |
07432cef | 6007 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 6008 | |
276ceeaa | 6009 | #: builtin/config.c:72 |
ef317cd5 | 6010 | msgid "remove a section: name" |
07432cef | 6011 | msgstr "删除一个小节:name" |
ef317cd5 | 6012 | |
276ceeaa | 6013 | #: builtin/config.c:73 |
ef317cd5 | 6014 | msgid "list all" |
07432cef | 6015 | msgstr "列出所有" |
ef317cd5 | 6016 | |
276ceeaa | 6017 | #: builtin/config.c:74 |
ef317cd5 | 6018 | msgid "open an editor" |
07432cef | 6019 | msgstr "打开一个编辑器" |
ef317cd5 | 6020 | |
276ceeaa | 6021 | #: builtin/config.c:75 |
04cb2f28 JX |
6022 | msgid "find the color configured: slot [default]" |
6023 | msgstr "获得配置的颜色:配置 [默认]" | |
ef317cd5 | 6024 | |
276ceeaa | 6025 | #: builtin/config.c:76 |
04cb2f28 JX |
6026 | msgid "find the color setting: slot [stdout-is-tty]" |
6027 | msgstr "获得颜色设置:配置 [stdout-is-tty]" | |
ef317cd5 | 6028 | |
276ceeaa | 6029 | #: builtin/config.c:77 |
ef317cd5 | 6030 | msgid "Type" |
07432cef | 6031 | msgstr "类型" |
ef317cd5 | 6032 | |
276ceeaa | 6033 | #: builtin/config.c:78 |
ef317cd5 | 6034 | msgid "value is \"true\" or \"false\"" |
07432cef | 6035 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 6036 | |
276ceeaa | 6037 | #: builtin/config.c:79 |
ef317cd5 | 6038 | msgid "value is decimal number" |
07432cef | 6039 | msgstr "值是十进制数" |
ef317cd5 | 6040 | |
276ceeaa | 6041 | #: builtin/config.c:80 |
ef317cd5 | 6042 | msgid "value is --bool or --int" |
07432cef | 6043 | msgstr "值是 --bool or --int" |
ef317cd5 | 6044 | |
276ceeaa | 6045 | #: builtin/config.c:81 |
ef317cd5 | 6046 | msgid "value is a path (file or directory name)" |
07432cef | 6047 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 6048 | |
276ceeaa | 6049 | #: builtin/config.c:82 |
ef317cd5 | 6050 | msgid "Other" |
07432cef | 6051 | msgstr "其它" |
ef317cd5 | 6052 | |
276ceeaa | 6053 | #: builtin/config.c:83 |
ef317cd5 | 6054 | msgid "terminate values with NUL byte" |
4375c10e | 6055 | msgstr "终止值是 NUL 字节" |
ef317cd5 | 6056 | |
276ceeaa | 6057 | #: builtin/config.c:84 |
1b7f4a34 JX |
6058 | msgid "show variable names only" |
6059 | msgstr "只显示变量名" | |
6060 | ||
276ceeaa | 6061 | #: builtin/config.c:85 |
ef317cd5 | 6062 | msgid "respect include directives on lookup" |
07432cef | 6063 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 6064 | |
276ceeaa JX |
6065 | #: builtin/config.c:86 |
6066 | msgid "show origin of config (file, standard input, blob, command line)" | |
6067 | msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)" | |
6068 | ||
6069 | #: builtin/config.c:328 | |
220c313c | 6070 | msgid "unable to parse default color value" |
160fb2b2 | 6071 | msgstr "不能解析默认颜色值" |
220c313c | 6072 | |
5b04ee3b | 6073 | #: builtin/config.c:472 |
220c313c JX |
6074 | #, c-format |
6075 | msgid "" | |
6076 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 6077 | "[user]\n" |
220c313c | 6078 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 6079 | "#\tname = %s\n" |
220c313c JX |
6080 | "#\temail = %s\n" |
6081 | msgstr "" | |
6082 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 6083 | "[user]\n" |
220c313c | 6084 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 6085 | "#\tname = %s\n" |
220c313c JX |
6086 | "#\temail = %s\n" |
6087 | ||
5b04ee3b | 6088 | #: builtin/config.c:614 |
220c313c JX |
6089 | #, c-format |
6090 | msgid "cannot create configuration file %s" | |
6091 | msgstr "不能创建配置文件 %s" | |
6092 | ||
94550ed3 | 6093 | #: builtin/count-objects.c:77 |
4dcdc3d8 JX |
6094 | msgid "git count-objects [-v] [-H | --human-readable]" |
6095 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
6096 | ||
94550ed3 | 6097 | #: builtin/count-objects.c:87 |
4dcdc3d8 JX |
6098 | msgid "print sizes in human readable format" |
6099 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 6100 | |
220c313c | 6101 | #: builtin/describe.c:17 |
814ff314 JX |
6102 | msgid "git describe [<options>] [<commit-ish>...]" |
6103 | msgstr "git describe [<选项>] [<提交号>...]" | |
ef317cd5 | 6104 | |
220c313c | 6105 | #: builtin/describe.c:18 |
814ff314 JX |
6106 | msgid "git describe [<options>] --dirty" |
6107 | msgstr "git describe [<选项>] --dirty" | |
ef317cd5 | 6108 | |
220c313c | 6109 | #: builtin/describe.c:217 |
c04f5ac3 JX |
6110 | #, c-format |
6111 | msgid "annotated tag %s not available" | |
55a16ee4 | 6112 | msgstr "附注标签 %s 无效" |
c04f5ac3 | 6113 | |
220c313c | 6114 | #: builtin/describe.c:221 |
c04f5ac3 JX |
6115 | #, c-format |
6116 | msgid "annotated tag %s has no embedded name" | |
55a16ee4 | 6117 | msgstr "附注标签 %s 没有嵌入名称" |
c04f5ac3 | 6118 | |
220c313c | 6119 | #: builtin/describe.c:223 |
c04f5ac3 JX |
6120 | #, c-format |
6121 | msgid "tag '%s' is really '%s' here" | |
55a16ee4 | 6122 | msgstr "标签 '%s' 的确是在 '%s'" |
c04f5ac3 | 6123 | |
5b04ee3b | 6124 | #: builtin/describe.c:250 builtin/log.c:465 |
c04f5ac3 JX |
6125 | #, c-format |
6126 | msgid "Not a valid object name %s" | |
6127 | msgstr "不是一个有效的对象名 %s" | |
6128 | ||
220c313c | 6129 | #: builtin/describe.c:253 |
c04f5ac3 JX |
6130 | #, c-format |
6131 | msgid "%s is not a valid '%s' object" | |
6132 | msgstr "%s 不是一个有效的 '%s' 对象" | |
6133 | ||
220c313c | 6134 | #: builtin/describe.c:270 |
c04f5ac3 JX |
6135 | #, c-format |
6136 | msgid "no tag exactly matches '%s'" | |
55a16ee4 | 6137 | msgstr "没有标签准确匹配 '%s'" |
c04f5ac3 | 6138 | |
220c313c | 6139 | #: builtin/describe.c:272 |
c04f5ac3 JX |
6140 | #, c-format |
6141 | msgid "searching to describe %s\n" | |
6142 | msgstr "搜索描述 %s\n" | |
6143 | ||
220c313c | 6144 | #: builtin/describe.c:319 |
c04f5ac3 JX |
6145 | #, c-format |
6146 | msgid "finished search at %s\n" | |
6147 | msgstr "完成搜索 %s\n" | |
6148 | ||
220c313c | 6149 | #: builtin/describe.c:346 |
c04f5ac3 JX |
6150 | #, c-format |
6151 | msgid "" | |
6152 | "No annotated tags can describe '%s'.\n" | |
6153 | "However, there were unannotated tags: try --tags." | |
6154 | msgstr "" | |
55a16ee4 RC |
6155 | "没有附注标签能描述 '%s'。\n" |
6156 | "然而,存在未附注标签:尝试 --tags。" | |
c04f5ac3 | 6157 | |
220c313c | 6158 | #: builtin/describe.c:350 |
c04f5ac3 JX |
6159 | #, c-format |
6160 | msgid "" | |
6161 | "No tags can describe '%s'.\n" | |
6162 | "Try --always, or create some tags." | |
6163 | msgstr "" | |
55a16ee4 RC |
6164 | "没有标签能描述 '%s'。\n" |
6165 | "尝试 --always,或者创建一些标签。" | |
c04f5ac3 | 6166 | |
220c313c | 6167 | #: builtin/describe.c:371 |
c04f5ac3 JX |
6168 | #, c-format |
6169 | msgid "traversed %lu commits\n" | |
6170 | msgstr "已遍历 %lu 个提交\n" | |
6171 | ||
220c313c | 6172 | #: builtin/describe.c:374 |
c04f5ac3 JX |
6173 | #, c-format |
6174 | msgid "" | |
6175 | "more than %i tags found; listed %i most recent\n" | |
6176 | "gave up search at %s\n" | |
6177 | msgstr "" | |
55a16ee4 | 6178 | "发现多于 %i 个标签,列出最近的 %i 个\n" |
90e6ef53 | 6179 | "在 %s 放弃搜索\n" |
c04f5ac3 | 6180 | |
220c313c | 6181 | #: builtin/describe.c:396 |
ef317cd5 | 6182 | msgid "find the tag that comes after the commit" |
55a16ee4 | 6183 | msgstr "寻找该提交之后的标签" |
ef317cd5 | 6184 | |
220c313c | 6185 | #: builtin/describe.c:397 |
ef317cd5 | 6186 | msgid "debug search strategy on stderr" |
07432cef | 6187 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 6188 | |
220c313c | 6189 | #: builtin/describe.c:398 |
1003b3a5 JX |
6190 | msgid "use any ref" |
6191 | msgstr "使用任意引用" | |
6192 | ||
220c313c | 6193 | #: builtin/describe.c:399 |
1003b3a5 | 6194 | msgid "use any tag, even unannotated" |
55a16ee4 | 6195 | msgstr "使用任意标签,即使未附带注释" |
ef317cd5 | 6196 | |
220c313c | 6197 | #: builtin/describe.c:400 |
ef317cd5 | 6198 | msgid "always use long format" |
07432cef | 6199 | msgstr "始终使用长提交号格式" |
ef317cd5 | 6200 | |
220c313c | 6201 | #: builtin/describe.c:401 |
2e8451e8 JX |
6202 | msgid "only follow first parent" |
6203 | msgstr "只跟随第一个父提交" | |
6204 | ||
220c313c | 6205 | #: builtin/describe.c:404 |
ef317cd5 | 6206 | msgid "only output exact matches" |
07432cef | 6207 | msgstr "只输出精确匹配" |
ef317cd5 | 6208 | |
220c313c | 6209 | #: builtin/describe.c:406 |
ef317cd5 | 6210 | msgid "consider <n> most recent tags (default: 10)" |
55a16ee4 | 6211 | msgstr "考虑最近 <n> 个标签(默认:10)" |
ef317cd5 | 6212 | |
220c313c | 6213 | #: builtin/describe.c:408 |
ef317cd5 | 6214 | msgid "only consider tags matching <pattern>" |
55a16ee4 | 6215 | msgstr "只考虑匹配 <模式> 的标签" |
ef317cd5 | 6216 | |
5b04ee3b | 6217 | #: builtin/describe.c:410 builtin/name-rev.c:321 |
ef317cd5 | 6218 | msgid "show abbreviated commit object as fallback" |
07432cef | 6219 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 6220 | |
220c313c | 6221 | #: builtin/describe.c:411 |
ef317cd5 | 6222 | msgid "mark" |
07432cef | 6223 | msgstr "标记" |
ef317cd5 | 6224 | |
220c313c | 6225 | #: builtin/describe.c:412 |
ef317cd5 | 6226 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
160fb2b2 | 6227 | msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 6228 | |
220c313c | 6229 | #: builtin/describe.c:430 |
c04f5ac3 JX |
6230 | msgid "--long is incompatible with --abbrev=0" |
6231 | msgstr "--long 与 --abbrev=0 不兼容" | |
6232 | ||
220c313c | 6233 | #: builtin/describe.c:456 |
c04f5ac3 | 6234 | msgid "No names found, cannot describe anything." |
90e6ef53 | 6235 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 6236 | |
220c313c | 6237 | #: builtin/describe.c:476 |
a8a5406a | 6238 | msgid "--dirty is incompatible with commit-ishes" |
649900bc | 6239 | msgstr "--dirty 不能与提交同时使用" |
c04f5ac3 | 6240 | |
220c313c | 6241 | #: builtin/diff.c:86 |
c04f5ac3 JX |
6242 | #, c-format |
6243 | msgid "'%s': not a regular file or symlink" | |
6244 | msgstr "'%s':不是一个正规文件或符号链接" | |
6245 | ||
220c313c | 6246 | #: builtin/diff.c:237 |
c04f5ac3 JX |
6247 | #, c-format |
6248 | msgid "invalid option: %s" | |
6249 | msgstr "无效选项:%s" | |
6250 | ||
5b04ee3b | 6251 | #: builtin/diff.c:360 |
c04f5ac3 | 6252 | msgid "Not a git repository" |
160fb2b2 | 6253 | msgstr "不是一个 git 仓库" |
c04f5ac3 | 6254 | |
5b04ee3b | 6255 | #: builtin/diff.c:403 |
c04f5ac3 JX |
6256 | #, c-format |
6257 | msgid "invalid object '%s' given." | |
6258 | msgstr "提供了无效对象 '%s'。" | |
6259 | ||
5b04ee3b | 6260 | #: builtin/diff.c:412 |
c04f5ac3 JX |
6261 | #, c-format |
6262 | msgid "more than two blobs given: '%s'" | |
160fb2b2 | 6263 | msgstr "提供了超过两个数据对象:'%s'" |
c04f5ac3 | 6264 | |
5b04ee3b | 6265 | #: builtin/diff.c:419 |
c04f5ac3 JX |
6266 | #, c-format |
6267 | msgid "unhandled object '%s' given." | |
6c94aba5 | 6268 | msgstr "无法处理的对象 '%s'。" |
c04f5ac3 | 6269 | |
1b7f4a34 | 6270 | #: builtin/fast-export.c:25 |
ef317cd5 | 6271 | msgid "git fast-export [rev-list-opts]" |
07432cef | 6272 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 6273 | |
1b7f4a34 | 6274 | #: builtin/fast-export.c:980 |
ef317cd5 | 6275 | msgid "show progress after <n> objects" |
07432cef | 6276 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 6277 | |
1b7f4a34 | 6278 | #: builtin/fast-export.c:982 |
ef317cd5 | 6279 | msgid "select handling of signed tags" |
55a16ee4 | 6280 | msgstr "选择如何处理签名标签" |
ef317cd5 | 6281 | |
1b7f4a34 | 6282 | #: builtin/fast-export.c:985 |
ef317cd5 | 6283 | msgid "select handling of tags that tag filtered objects" |
55a16ee4 | 6284 | msgstr "选择当标签指向被过滤对象时该标签的处理方式" |
ef317cd5 | 6285 | |
1b7f4a34 | 6286 | #: builtin/fast-export.c:988 |
ef317cd5 | 6287 | msgid "Dump marks to this file" |
07432cef | 6288 | msgstr "把标记存储到这个文件" |
ef317cd5 | 6289 | |
1b7f4a34 | 6290 | #: builtin/fast-export.c:990 |
ef317cd5 | 6291 | msgid "Import marks from this file" |
07432cef | 6292 | msgstr "从这个文件导入标记" |
ef317cd5 | 6293 | |
1b7f4a34 | 6294 | #: builtin/fast-export.c:992 |
ef317cd5 | 6295 | msgid "Fake a tagger when tags lack one" |
55a16ee4 | 6296 | msgstr "当标签缺少标记者字段时,假装提供一个" |
ef317cd5 | 6297 | |
1b7f4a34 | 6298 | #: builtin/fast-export.c:994 |
ef317cd5 | 6299 | msgid "Output full tree for each commit" |
07432cef | 6300 | msgstr "每次提交都输出整个树" |
ef317cd5 | 6301 | |
1b7f4a34 | 6302 | #: builtin/fast-export.c:996 |
ef317cd5 | 6303 | msgid "Use the done feature to terminate the stream" |
07432cef | 6304 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 6305 | |
1b7f4a34 | 6306 | #: builtin/fast-export.c:997 |
ef317cd5 | 6307 | msgid "Skip output of blob data" |
07432cef | 6308 | msgstr "跳过数据对象的输出" |
ef317cd5 | 6309 | |
1b7f4a34 | 6310 | #: builtin/fast-export.c:998 |
6acbf033 | 6311 | msgid "refspec" |
160fb2b2 | 6312 | msgstr "引用规格" |
6acbf033 | 6313 | |
1b7f4a34 | 6314 | #: builtin/fast-export.c:999 |
6acbf033 | 6315 | msgid "Apply refspec to exported refs" |
160fb2b2 | 6316 | msgstr "对导出的引用应用引用规格" |
6acbf033 | 6317 | |
1b7f4a34 | 6318 | #: builtin/fast-export.c:1000 |
220c313c JX |
6319 | msgid "anonymize output" |
6320 | msgstr "匿名输出" | |
6321 | ||
1b7f4a34 | 6322 | #: builtin/fetch.c:20 |
ef317cd5 | 6323 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 6324 | msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" |
ef317cd5 | 6325 | |
1b7f4a34 | 6326 | #: builtin/fetch.c:21 |
ef317cd5 | 6327 | msgid "git fetch [<options>] <group>" |
07432cef | 6328 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 | 6329 | |
1b7f4a34 | 6330 | #: builtin/fetch.c:22 |
ef317cd5 | 6331 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
160fb2b2 | 6332 | msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" |
ef317cd5 | 6333 | |
1b7f4a34 | 6334 | #: builtin/fetch.c:23 |
ef317cd5 | 6335 | msgid "git fetch --all [<options>]" |
07432cef | 6336 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 6337 | |
5b04ee3b | 6338 | #: builtin/fetch.c:92 builtin/pull.c:174 |
ef317cd5 | 6339 | msgid "fetch from all remotes" |
07432cef | 6340 | msgstr "从所有的远程抓取" |
ef317cd5 | 6341 | |
5b04ee3b | 6342 | #: builtin/fetch.c:94 builtin/pull.c:177 |
ef317cd5 | 6343 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 6344 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 6345 | |
5b04ee3b | 6346 | #: builtin/fetch.c:96 builtin/pull.c:180 |
ef317cd5 | 6347 | msgid "path to upload pack on remote end" |
07432cef | 6348 | msgstr "上传包到远程的路径" |
ef317cd5 | 6349 | |
5b04ee3b | 6350 | #: builtin/fetch.c:97 builtin/pull.c:182 |
ef317cd5 | 6351 | msgid "force overwrite of local branch" |
07432cef | 6352 | msgstr "强制覆盖本地分支" |
ef317cd5 | 6353 | |
276ceeaa | 6354 | #: builtin/fetch.c:99 |
ef317cd5 | 6355 | msgid "fetch from multiple remotes" |
07432cef | 6356 | msgstr "从多个远程抓取" |
ef317cd5 | 6357 | |
5b04ee3b | 6358 | #: builtin/fetch.c:101 builtin/pull.c:184 |
ef317cd5 | 6359 | msgid "fetch all tags and associated objects" |
55a16ee4 | 6360 | msgstr "抓取所有的标签和关联对象" |
ef317cd5 | 6361 | |
276ceeaa | 6362 | #: builtin/fetch.c:103 |
ef317cd5 | 6363 | msgid "do not fetch all tags (--no-tags)" |
55a16ee4 | 6364 | msgstr "不抓取任何标签(--no-tags)" |
ef317cd5 | 6365 | |
276ceeaa JX |
6366 | #: builtin/fetch.c:105 |
6367 | msgid "number of submodules fetched in parallel" | |
6368 | msgstr "子模组获取的并发数" | |
6369 | ||
5b04ee3b | 6370 | #: builtin/fetch.c:107 builtin/pull.c:187 |
ef317cd5 | 6371 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 6372 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 6373 | |
07432cef | 6374 | # 译者:可选值,不能翻译 |
5b04ee3b | 6375 | #: builtin/fetch.c:108 builtin/pull.c:190 |
ef317cd5 | 6376 | msgid "on-demand" |
07432cef | 6377 | msgstr "on-demand" |
ef317cd5 | 6378 | |
5b04ee3b | 6379 | #: builtin/fetch.c:109 builtin/pull.c:191 |
ef317cd5 | 6380 | msgid "control recursive fetching of submodules" |
07432cef | 6381 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 6382 | |
5b04ee3b | 6383 | #: builtin/fetch.c:113 builtin/pull.c:199 |
ef317cd5 | 6384 | msgid "keep downloaded pack" |
07432cef | 6385 | msgstr "保持下载包" |
ef317cd5 | 6386 | |
276ceeaa | 6387 | #: builtin/fetch.c:115 |
ef317cd5 | 6388 | msgid "allow updating of HEAD ref" |
07432cef | 6389 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 6390 | |
5b04ee3b | 6391 | #: builtin/fetch.c:118 builtin/pull.c:202 |
ef317cd5 | 6392 | msgid "deepen history of shallow clone" |
07432cef | 6393 | msgstr "深化浅克隆的历史" |
ef317cd5 | 6394 | |
5b04ee3b | 6395 | #: builtin/fetch.c:120 builtin/pull.c:205 |
a77c07d9 | 6396 | msgid "convert to a complete repository" |
160fb2b2 | 6397 | msgstr "转换为一个完整的仓库" |
a77c07d9 | 6398 | |
5b04ee3b | 6399 | #: builtin/fetch.c:122 builtin/log.c:1399 |
ef317cd5 | 6400 | msgid "dir" |
07432cef | 6401 | msgstr "目录" |
ef317cd5 | 6402 | |
276ceeaa | 6403 | #: builtin/fetch.c:123 |
ef317cd5 | 6404 | msgid "prepend this to submodule path output" |
07432cef | 6405 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 6406 | |
276ceeaa | 6407 | #: builtin/fetch.c:126 |
ef317cd5 | 6408 | msgid "default mode for recursion" |
07432cef | 6409 | msgstr "递归的默认模式" |
ef317cd5 | 6410 | |
5b04ee3b | 6411 | #: builtin/fetch.c:128 builtin/pull.c:208 |
cfff71a9 JX |
6412 | msgid "accept refs that update .git/shallow" |
6413 | msgstr "接受更新 .git/shallow 的引用" | |
6414 | ||
5b04ee3b | 6415 | #: builtin/fetch.c:129 builtin/pull.c:210 |
6acbf033 JX |
6416 | msgid "refmap" |
6417 | msgstr "引用映射" | |
6418 | ||
5b04ee3b | 6419 | #: builtin/fetch.c:130 builtin/pull.c:211 |
6acbf033 JX |
6420 | msgid "specify fetch refmap" |
6421 | msgstr "指定获取操作的引用映射" | |
6422 | ||
276ceeaa | 6423 | #: builtin/fetch.c:386 |
c04f5ac3 JX |
6424 | msgid "Couldn't find remote ref HEAD" |
6425 | msgstr "无法发现远程 HEAD 引用" | |
6426 | ||
276ceeaa | 6427 | #: builtin/fetch.c:466 |
c04f5ac3 JX |
6428 | #, c-format |
6429 | msgid "object %s not found" | |
6430 | msgstr "对象 %s 未发现" | |
6431 | ||
276ceeaa | 6432 | #: builtin/fetch.c:471 |
c04f5ac3 JX |
6433 | msgid "[up to date]" |
6434 | msgstr "[最新]" | |
6435 | ||
276ceeaa | 6436 | #: builtin/fetch.c:485 |
c04f5ac3 JX |
6437 | #, c-format |
6438 | msgid "! %-*s %-*s -> %s (can't fetch in current branch)" | |
6439 | msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)" | |
6440 | ||
276ceeaa | 6441 | #: builtin/fetch.c:486 builtin/fetch.c:574 |
c04f5ac3 JX |
6442 | msgid "[rejected]" |
6443 | msgstr "[已拒绝]" | |
6444 | ||
276ceeaa | 6445 | #: builtin/fetch.c:497 |
c04f5ac3 | 6446 | msgid "[tag update]" |
55a16ee4 | 6447 | msgstr "[标签更新]" |
c04f5ac3 | 6448 | |
90e6ef53 | 6449 | # 译者:注意保持前导空格 |
276ceeaa | 6450 | #: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552 |
c04f5ac3 JX |
6451 | msgid " (unable to update local ref)" |
6452 | msgstr " (不能更新本地引用)" | |
6453 | ||
276ceeaa | 6454 | #: builtin/fetch.c:517 |
c04f5ac3 | 6455 | msgid "[new tag]" |
55a16ee4 | 6456 | msgstr "[新标签]" |
c04f5ac3 | 6457 | |
276ceeaa | 6458 | #: builtin/fetch.c:520 |
c04f5ac3 JX |
6459 | msgid "[new branch]" |
6460 | msgstr "[新分支]" | |
6461 | ||
276ceeaa | 6462 | #: builtin/fetch.c:523 |
170e9899 JX |
6463 | msgid "[new ref]" |
6464 | msgstr "[新引用]" | |
6465 | ||
276ceeaa | 6466 | #: builtin/fetch.c:569 |
c04f5ac3 JX |
6467 | msgid "unable to update local ref" |
6468 | msgstr "不能更新本地引用" | |
6469 | ||
276ceeaa | 6470 | #: builtin/fetch.c:569 |
c04f5ac3 JX |
6471 | msgid "forced update" |
6472 | msgstr "强制更新" | |
6473 | ||
276ceeaa | 6474 | #: builtin/fetch.c:576 |
c04f5ac3 | 6475 | msgid "(non-fast-forward)" |
90e6ef53 | 6476 | msgstr "(非快进式)" |
c04f5ac3 | 6477 | |
276ceeaa | 6478 | #: builtin/fetch.c:619 |
c04f5ac3 JX |
6479 | #, c-format |
6480 | msgid "%s did not send all necessary objects\n" | |
6481 | msgstr "%s 未发送所有必须的对象\n" | |
6482 | ||
276ceeaa | 6483 | #: builtin/fetch.c:637 |
cfff71a9 JX |
6484 | #, c-format |
6485 | msgid "reject %s because shallow roots are not allowed to be updated" | |
6486 | msgstr "拒绝 %s 因为浅克隆不允许被更新" | |
6487 | ||
276ceeaa | 6488 | #: builtin/fetch.c:724 builtin/fetch.c:816 |
c04f5ac3 JX |
6489 | #, c-format |
6490 | msgid "From %.*s\n" | |
6491 | msgstr "来自 %.*s\n" | |
6492 | ||
276ceeaa | 6493 | #: builtin/fetch.c:735 |
c04f5ac3 JX |
6494 | #, c-format |
6495 | msgid "" | |
6496 | "some local refs could not be updated; try running\n" | |
6497 | " 'git remote prune %s' to remove any old, conflicting branches" | |
6498 | msgstr "" | |
6499 | "一些本地引用不能被更新;尝试运行\n" | |
6500 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
6501 | ||
90e6ef53 | 6502 | # 译者:注意保持前导空格 |
276ceeaa | 6503 | #: builtin/fetch.c:787 |
81809b99 | 6504 | #, c-format |
8ada9598 | 6505 | msgid " (%s will become dangling)" |
07432cef | 6506 | msgstr " (%s 将成为摇摆状态)" |
c04f5ac3 | 6507 | |
90e6ef53 | 6508 | # 译者:注意保持前导空格 |
276ceeaa | 6509 | #: builtin/fetch.c:788 |
81809b99 | 6510 | #, c-format |
8ada9598 | 6511 | msgid " (%s has become dangling)" |
07432cef | 6512 | msgstr " (%s 已成为摇摆状态)" |
c04f5ac3 | 6513 | |
276ceeaa | 6514 | #: builtin/fetch.c:820 |
c04f5ac3 JX |
6515 | msgid "[deleted]" |
6516 | msgstr "[已删除]" | |
6517 | ||
276ceeaa | 6518 | #: builtin/fetch.c:821 builtin/remote.c:1025 |
c04f5ac3 JX |
6519 | msgid "(none)" |
6520 | msgstr "(无)" | |
6521 | ||
276ceeaa | 6522 | #: builtin/fetch.c:841 |
c04f5ac3 JX |
6523 | #, c-format |
6524 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
160fb2b2 | 6525 | msgstr "拒绝获取到非纯仓库的当前分支 %s" |
c04f5ac3 | 6526 | |
276ceeaa | 6527 | #: builtin/fetch.c:860 |
c04f5ac3 JX |
6528 | #, c-format |
6529 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
6530 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
6531 | ||
276ceeaa | 6532 | #: builtin/fetch.c:863 |
c04f5ac3 JX |
6533 | #, c-format |
6534 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 6535 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 6536 | |
276ceeaa | 6537 | #: builtin/fetch.c:920 |
90314792 JX |
6538 | #, c-format |
6539 | msgid "Don't know how to fetch from %s" | |
6540 | msgstr "不知道如何从 %s 获取" | |
6541 | ||
276ceeaa | 6542 | #: builtin/fetch.c:1080 |
c04f5ac3 JX |
6543 | #, c-format |
6544 | msgid "Fetching %s\n" | |
d4a8e00b | 6545 | msgstr "正在获取 %s\n" |
c04f5ac3 | 6546 | |
276ceeaa | 6547 | #: builtin/fetch.c:1082 builtin/remote.c:96 |
c04f5ac3 JX |
6548 | #, c-format |
6549 | msgid "Could not fetch %s" | |
6550 | msgstr "不能获取 %s" | |
6551 | ||
276ceeaa | 6552 | #: builtin/fetch.c:1100 |
c04f5ac3 JX |
6553 | msgid "" |
6554 | "No remote repository specified. Please, specify either a URL or a\n" | |
6555 | "remote name from which new revisions should be fetched." | |
4375c10e | 6556 | msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。" |
c04f5ac3 | 6557 | |
276ceeaa | 6558 | #: builtin/fetch.c:1123 |
c04f5ac3 | 6559 | msgid "You need to specify a tag name." |
55a16ee4 | 6560 | msgstr "您需要指定一个标签名称。" |
c04f5ac3 | 6561 | |
276ceeaa | 6562 | #: builtin/fetch.c:1165 |
a77c07d9 JX |
6563 | msgid "--depth and --unshallow cannot be used together" |
6564 | msgstr "--depth 和 --unshallow 不能同时使用" | |
6565 | ||
276ceeaa | 6566 | #: builtin/fetch.c:1167 |
a77c07d9 | 6567 | msgid "--unshallow on a complete repository does not make sense" |
160fb2b2 | 6568 | msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" |
a77c07d9 | 6569 | |
276ceeaa | 6570 | #: builtin/fetch.c:1187 |
c04f5ac3 | 6571 | msgid "fetch --all does not take a repository argument" |
160fb2b2 | 6572 | msgstr "fetch --all 不能带一个仓库参数" |
c04f5ac3 | 6573 | |
276ceeaa | 6574 | #: builtin/fetch.c:1189 |
c04f5ac3 | 6575 | msgid "fetch --all does not make sense with refspecs" |
160fb2b2 | 6576 | msgstr "fetch --all 带引用规格没有任何意义" |
c04f5ac3 | 6577 | |
276ceeaa | 6578 | #: builtin/fetch.c:1200 |
c04f5ac3 JX |
6579 | #, c-format |
6580 | msgid "No such remote or remote group: %s" | |
6581 | msgstr "没有这样的远程或远程组:%s" | |
6582 | ||
276ceeaa | 6583 | #: builtin/fetch.c:1208 |
c04f5ac3 | 6584 | msgid "Fetching a group and specifying refspecs does not make sense" |
160fb2b2 | 6585 | msgstr "获取组并指定引用规格没有意义" |
c04f5ac3 | 6586 | |
1b7f4a34 | 6587 | #: builtin/fmt-merge-msg.c:14 |
814ff314 JX |
6588 | msgid "" |
6589 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
6590 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" | |
c04f5ac3 | 6591 | |
94550ed3 | 6592 | #: builtin/fmt-merge-msg.c:667 |
ef317cd5 | 6593 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 6594 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 6595 | |
94550ed3 | 6596 | #: builtin/fmt-merge-msg.c:670 |
ef317cd5 | 6597 | msgid "alias for --log (deprecated)" |
07432cef | 6598 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 6599 | |
94550ed3 | 6600 | #: builtin/fmt-merge-msg.c:673 |
ef317cd5 | 6601 | msgid "text" |
07432cef | 6602 | msgstr "文本" |
ef317cd5 | 6603 | |
94550ed3 | 6604 | #: builtin/fmt-merge-msg.c:674 |
ef317cd5 | 6605 | msgid "use <text> as start of message" |
07432cef | 6606 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 6607 | |
94550ed3 | 6608 | #: builtin/fmt-merge-msg.c:675 |
ef317cd5 | 6609 | msgid "file to read from" |
07432cef | 6610 | msgstr "从文件中读取" |
ef317cd5 | 6611 | |
1b7f4a34 | 6612 | #: builtin/for-each-ref.c:9 |
814ff314 JX |
6613 | msgid "git for-each-ref [<options>] [<pattern>]" |
6614 | msgstr "git for-each-ref [<选项>] [<模式>]" | |
ef317cd5 | 6615 | |
94550ed3 JX |
6616 | #: builtin/for-each-ref.c:10 |
6617 | msgid "git for-each-ref [--points-at <object>]" | |
6618 | msgstr "git for-each-ref [--points-at <对象>]" | |
6619 | ||
6620 | #: builtin/for-each-ref.c:11 | |
6621 | msgid "git for-each-ref [(--merged | --no-merged) [<object>]]" | |
6622 | msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]" | |
6623 | ||
6624 | #: builtin/for-each-ref.c:12 | |
6625 | msgid "git for-each-ref [--contains [<object>]]" | |
6626 | msgstr "git for-each-ref [--contains [<对象>]]" | |
6627 | ||
6628 | #: builtin/for-each-ref.c:27 | |
ef317cd5 | 6629 | msgid "quote placeholders suitably for shells" |
07432cef | 6630 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 6631 | |
94550ed3 | 6632 | #: builtin/for-each-ref.c:29 |
ef317cd5 | 6633 | msgid "quote placeholders suitably for perl" |
07432cef | 6634 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 6635 | |
94550ed3 | 6636 | #: builtin/for-each-ref.c:31 |
ef317cd5 | 6637 | msgid "quote placeholders suitably for python" |
07432cef | 6638 | msgstr "引用占位符适用于 python" |
ef317cd5 | 6639 | |
94550ed3 | 6640 | #: builtin/for-each-ref.c:33 |
04cb2f28 JX |
6641 | msgid "quote placeholders suitably for Tcl" |
6642 | msgstr "引用占位符适用于 Tcl" | |
ef317cd5 | 6643 | |
94550ed3 | 6644 | #: builtin/for-each-ref.c:36 |
ef317cd5 | 6645 | msgid "show only <n> matched refs" |
07432cef | 6646 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 6647 | |
94550ed3 | 6648 | #: builtin/for-each-ref.c:37 builtin/tag.c:372 |
ef317cd5 | 6649 | msgid "format to use for the output" |
07432cef | 6650 | msgstr "输出格式" |
ef317cd5 | 6651 | |
94550ed3 JX |
6652 | #: builtin/for-each-ref.c:41 |
6653 | msgid "print only refs which points at the given object" | |
6654 | msgstr "只打印指向给定对象的引用" | |
ef317cd5 | 6655 | |
94550ed3 JX |
6656 | #: builtin/for-each-ref.c:43 |
6657 | msgid "print only refs that are merged" | |
6658 | msgstr "只打印已经合并的引用" | |
6659 | ||
6660 | #: builtin/for-each-ref.c:44 | |
6661 | msgid "print only refs that are not merged" | |
6662 | msgstr "只打印没有合并的引用" | |
ef317cd5 | 6663 | |
94550ed3 JX |
6664 | #: builtin/for-each-ref.c:45 |
6665 | msgid "print only refs which contain the commit" | |
6666 | msgstr "只打印包含该提交的引用" | |
6667 | ||
6668 | #: builtin/fsck.c:156 builtin/prune.c:140 | |
6c94aba5 JX |
6669 | msgid "Checking connectivity" |
6670 | msgstr "检查连接中" | |
6671 | ||
94550ed3 | 6672 | #: builtin/fsck.c:486 |
6c94aba5 JX |
6673 | msgid "Checking object directories" |
6674 | msgstr "检查对象目录中" | |
6675 | ||
5b04ee3b | 6676 | #: builtin/fsck.c:552 |
814ff314 JX |
6677 | msgid "git fsck [<options>] [<object>...]" |
6678 | msgstr "git fsck [<选项>] [<对象>...]" | |
ef317cd5 | 6679 | |
5b04ee3b | 6680 | #: builtin/fsck.c:558 |
ef317cd5 | 6681 | msgid "show unreachable objects" |
07432cef | 6682 | msgstr "显示不可达的对象" |
ef317cd5 | 6683 | |
5b04ee3b | 6684 | #: builtin/fsck.c:559 |
ef317cd5 | 6685 | msgid "show dangling objects" |
07432cef | 6686 | msgstr "显示摇摆的对象" |
ef317cd5 | 6687 | |
5b04ee3b | 6688 | #: builtin/fsck.c:560 |
ef317cd5 | 6689 | msgid "report tags" |
55a16ee4 | 6690 | msgstr "报告标签" |
ef317cd5 | 6691 | |
5b04ee3b | 6692 | #: builtin/fsck.c:561 |
ef317cd5 | 6693 | msgid "report root nodes" |
07432cef | 6694 | msgstr "报告根节点" |
ef317cd5 | 6695 | |
5b04ee3b | 6696 | #: builtin/fsck.c:562 |
ef317cd5 | 6697 | msgid "make index objects head nodes" |
07432cef | 6698 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 6699 | |
5b04ee3b | 6700 | #: builtin/fsck.c:563 |
ef317cd5 | 6701 | msgid "make reflogs head nodes (default)" |
07432cef | 6702 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 6703 | |
5b04ee3b | 6704 | #: builtin/fsck.c:564 |
ef317cd5 | 6705 | msgid "also consider packs and alternate objects" |
07432cef | 6706 | msgstr "也考虑包和备用对象" |
ef317cd5 | 6707 | |
5b04ee3b | 6708 | #: builtin/fsck.c:565 |
1b7f4a34 JX |
6709 | msgid "check only connectivity" |
6710 | msgstr "仅检查连通性" | |
6711 | ||
5b04ee3b | 6712 | #: builtin/fsck.c:566 |
ef317cd5 | 6713 | msgid "enable more strict checking" |
07432cef | 6714 | msgstr "启用更严格的检查" |
ef317cd5 | 6715 | |
5b04ee3b | 6716 | #: builtin/fsck.c:568 |
ef317cd5 | 6717 | msgid "write dangling objects in .git/lost-found" |
07432cef | 6718 | msgstr "将摇摆对象写入 .git/lost-found 中" |
ef317cd5 | 6719 | |
5b04ee3b | 6720 | #: builtin/fsck.c:569 builtin/prune.c:107 |
ef317cd5 | 6721 | msgid "show progress" |
07432cef | 6722 | msgstr "显示进度" |
ef317cd5 | 6723 | |
5b04ee3b | 6724 | #: builtin/fsck.c:630 |
6c94aba5 JX |
6725 | msgid "Checking objects" |
6726 | msgstr "检查对象中" | |
6727 | ||
1b7f4a34 | 6728 | #: builtin/gc.c:25 |
814ff314 JX |
6729 | msgid "git gc [<options>]" |
6730 | msgstr "git gc [<选项>]" | |
ef317cd5 | 6731 | |
94550ed3 | 6732 | #: builtin/gc.c:72 |
c04f5ac3 | 6733 | #, c-format |
7aea43ff JX |
6734 | msgid "Invalid %s: '%s'" |
6735 | msgstr "无效 %s:'%s'" | |
c04f5ac3 | 6736 | |
94550ed3 | 6737 | #: builtin/gc.c:139 |
c04f5ac3 JX |
6738 | #, c-format |
6739 | msgid "insanely long object directory %.*s" | |
6740 | msgstr "不正常的长对象目录 %.*s" | |
6741 | ||
94550ed3 JX |
6742 | #: builtin/gc.c:290 |
6743 | #, c-format | |
6744 | msgid "" | |
6745 | "The last gc run reported the following. Please correct the root cause\n" | |
6746 | "and remove %s.\n" | |
6747 | "Automatic cleanup will not be performed until the file is removed.\n" | |
6748 | "\n" | |
6749 | "%s" | |
6750 | msgstr "" | |
6751 | "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" | |
6752 | "在该文件被删除之前,自动清理将不会执行。\n" | |
6753 | "\n" | |
6754 | "%s" | |
6755 | ||
6756 | #: builtin/gc.c:327 | |
ef317cd5 | 6757 | msgid "prune unreferenced objects" |
07432cef | 6758 | msgstr "清除未引用的对象" |
ef317cd5 | 6759 | |
94550ed3 | 6760 | #: builtin/gc.c:329 |
ef317cd5 | 6761 | msgid "be more thorough (increased runtime)" |
07432cef | 6762 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 6763 | |
94550ed3 | 6764 | #: builtin/gc.c:330 |
ef317cd5 | 6765 | msgid "enable auto-gc mode" |
07432cef | 6766 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 6767 | |
94550ed3 | 6768 | #: builtin/gc.c:331 |
90314792 JX |
6769 | msgid "force running gc even if there may be another gc running" |
6770 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
6771 | ||
94550ed3 | 6772 | #: builtin/gc.c:373 |
c04f5ac3 | 6773 | #, c-format |
6c94aba5 | 6774 | msgid "Auto packing the repository in background for optimum performance.\n" |
160fb2b2 | 6775 | msgstr "自动在后台执行仓库打包以求最佳性能。\n" |
6c94aba5 | 6776 | |
94550ed3 | 6777 | #: builtin/gc.c:375 |
6c94aba5 JX |
6778 | #, c-format |
6779 | msgid "Auto packing the repository for optimum performance.\n" | |
160fb2b2 | 6780 | msgstr "自动打包仓库以求最佳性能。\n" |
6c94aba5 | 6781 | |
94550ed3 | 6782 | #: builtin/gc.c:376 |
6c94aba5 JX |
6783 | #, c-format |
6784 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
6785 | msgstr "手工维护参见 \"git help gc\"。\n" | |
c04f5ac3 | 6786 | |
94550ed3 | 6787 | #: builtin/gc.c:397 |
90314792 JX |
6788 | #, c-format |
6789 | msgid "" | |
6790 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
6791 | msgstr "" | |
6792 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)" | |
6793 | ||
94550ed3 | 6794 | #: builtin/gc.c:441 |
c04f5ac3 JX |
6795 | msgid "" |
6796 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 6797 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 6798 | |
90314792 | 6799 | #: builtin/grep.c:23 |
814ff314 JX |
6800 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
6801 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" | |
ef317cd5 | 6802 | |
276ceeaa | 6803 | #: builtin/grep.c:219 |
c04f5ac3 JX |
6804 | #, c-format |
6805 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 6806 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 6807 | |
276ceeaa JX |
6808 | #: builtin/grep.c:277 |
6809 | #, c-format | |
6810 | msgid "invalid number of threads specified (%d) for %s" | |
6811 | msgstr "为 %2$s 设定的线程数 (%1$d) 无效" | |
6812 | ||
6813 | #: builtin/grep.c:452 builtin/grep.c:487 | |
c04f5ac3 JX |
6814 | #, c-format |
6815 | msgid "unable to read tree (%s)" | |
90e6ef53 | 6816 | msgstr "无法读取树(%s)" |
c04f5ac3 | 6817 | |
276ceeaa | 6818 | #: builtin/grep.c:502 |
c04f5ac3 JX |
6819 | #, c-format |
6820 | msgid "unable to grep from object of type %s" | |
6821 | msgstr "无法抓取来自于 %s 类型的对象" | |
6822 | ||
5b04ee3b | 6823 | #: builtin/grep.c:560 |
c04f5ac3 JX |
6824 | #, c-format |
6825 | msgid "switch `%c' expects a numerical value" | |
6826 | msgstr "开关 `%c' 期望一个数字值" | |
6827 | ||
5b04ee3b | 6828 | #: builtin/grep.c:577 |
c04f5ac3 JX |
6829 | #, c-format |
6830 | msgid "cannot open '%s'" | |
6831 | msgstr "不能打开 '%s'" | |
6832 | ||
5b04ee3b | 6833 | #: builtin/grep.c:646 |
ef317cd5 | 6834 | msgid "search in index instead of in the work tree" |
07432cef | 6835 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 6836 | |
5b04ee3b | 6837 | #: builtin/grep.c:648 |
ef317cd5 | 6838 | msgid "find in contents not managed by git" |
07432cef | 6839 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 JX |
6840 | |
6841 | # 译者:中文字符串拼接,可删除前导空格 | |
5b04ee3b | 6842 | #: builtin/grep.c:650 |
ef317cd5 | 6843 | msgid "search in both tracked and untracked files" |
07432cef | 6844 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 6845 | |
5b04ee3b | 6846 | #: builtin/grep.c:652 |
814ff314 JX |
6847 | msgid "ignore files specified via '.gitignore'" |
6848 | msgstr "忽略 '.gitignore' 包含的文件" | |
ef317cd5 | 6849 | |
5b04ee3b | 6850 | #: builtin/grep.c:655 |
ef317cd5 | 6851 | msgid "show non-matching lines" |
07432cef | 6852 | msgstr "显示未匹配的行" |
ef317cd5 | 6853 | |
5b04ee3b | 6854 | #: builtin/grep.c:657 |
ef317cd5 | 6855 | msgid "case insensitive matching" |
07432cef | 6856 | msgstr "不区分大小写匹配" |
ef317cd5 | 6857 | |
5b04ee3b | 6858 | #: builtin/grep.c:659 |
ef317cd5 | 6859 | msgid "match patterns only at word boundaries" |
07432cef | 6860 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 6861 | |
5b04ee3b | 6862 | #: builtin/grep.c:661 |
ef317cd5 | 6863 | msgid "process binary files as text" |
07432cef | 6864 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 6865 | |
5b04ee3b | 6866 | #: builtin/grep.c:663 |
ef317cd5 | 6867 | msgid "don't match patterns in binary files" |
07432cef | 6868 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 6869 | |
5b04ee3b | 6870 | #: builtin/grep.c:666 |
90314792 JX |
6871 | msgid "process binary files with textconv filters" |
6872 | msgstr "用 textconv 过滤器处理二进制文件" | |
6873 | ||
5b04ee3b | 6874 | #: builtin/grep.c:668 |
ef317cd5 | 6875 | msgid "descend at most <depth> levels" |
07432cef | 6876 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 6877 | |
5b04ee3b | 6878 | #: builtin/grep.c:672 |
ef317cd5 | 6879 | msgid "use extended POSIX regular expressions" |
07432cef | 6880 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 6881 | |
5b04ee3b | 6882 | #: builtin/grep.c:675 |
ef317cd5 | 6883 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 6884 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 6885 | |
5b04ee3b | 6886 | #: builtin/grep.c:678 |
ef317cd5 | 6887 | msgid "interpret patterns as fixed strings" |
07432cef | 6888 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 6889 | |
5b04ee3b | 6890 | #: builtin/grep.c:681 |
ef317cd5 | 6891 | msgid "use Perl-compatible regular expressions" |
07432cef | 6892 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 6893 | |
5b04ee3b | 6894 | #: builtin/grep.c:684 |
ef317cd5 | 6895 | msgid "show line numbers" |
07432cef | 6896 | msgstr "显示行号" |
ef317cd5 | 6897 | |
5b04ee3b | 6898 | #: builtin/grep.c:685 |
ef317cd5 | 6899 | msgid "don't show filenames" |
07432cef | 6900 | msgstr "不显示文件名" |
ef317cd5 | 6901 | |
5b04ee3b | 6902 | #: builtin/grep.c:686 |
ef317cd5 | 6903 | msgid "show filenames" |
07432cef | 6904 | msgstr "显示文件名" |
ef317cd5 | 6905 | |
5b04ee3b | 6906 | #: builtin/grep.c:688 |
ef317cd5 | 6907 | msgid "show filenames relative to top directory" |
07432cef | 6908 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 6909 | |
5b04ee3b | 6910 | #: builtin/grep.c:690 |
ef317cd5 | 6911 | msgid "show only filenames instead of matching lines" |
07432cef | 6912 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 6913 | |
5b04ee3b | 6914 | #: builtin/grep.c:692 |
ef317cd5 | 6915 | msgid "synonym for --files-with-matches" |
07432cef | 6916 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 6917 | |
5b04ee3b | 6918 | #: builtin/grep.c:695 |
ef317cd5 | 6919 | msgid "show only the names of files without match" |
07432cef | 6920 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 6921 | |
5b04ee3b | 6922 | #: builtin/grep.c:697 |
ef317cd5 | 6923 | msgid "print NUL after filenames" |
07432cef | 6924 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 6925 | |
5b04ee3b | 6926 | #: builtin/grep.c:699 |
ef317cd5 | 6927 | msgid "show the number of matches instead of matching lines" |
07432cef | 6928 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 6929 | |
5b04ee3b | 6930 | #: builtin/grep.c:700 |
ef317cd5 | 6931 | msgid "highlight matches" |
07432cef | 6932 | msgstr "高亮显示匹配项" |
ef317cd5 | 6933 | |
5b04ee3b | 6934 | #: builtin/grep.c:702 |
ef317cd5 | 6935 | msgid "print empty line between matches from different files" |
07432cef | 6936 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 6937 | |
5b04ee3b | 6938 | #: builtin/grep.c:704 |
ef317cd5 | 6939 | msgid "show filename only once above matches from same file" |
07432cef | 6940 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 6941 | |
5b04ee3b | 6942 | #: builtin/grep.c:707 |
ef317cd5 | 6943 | msgid "show <n> context lines before and after matches" |
07432cef | 6944 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 6945 | |
5b04ee3b | 6946 | #: builtin/grep.c:710 |
ef317cd5 | 6947 | msgid "show <n> context lines before matches" |
07432cef | 6948 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 6949 | |
5b04ee3b | 6950 | #: builtin/grep.c:712 |
ef317cd5 | 6951 | msgid "show <n> context lines after matches" |
07432cef | 6952 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 6953 | |
5b04ee3b | 6954 | #: builtin/grep.c:714 |
276ceeaa JX |
6955 | msgid "use <n> worker threads" |
6956 | msgstr "使用 <n> 个工作线程" | |
6957 | ||
5b04ee3b | 6958 | #: builtin/grep.c:715 |
ef317cd5 | 6959 | msgid "shortcut for -C NUM" |
07432cef | 6960 | msgstr "快捷键 -C 数字" |
ef317cd5 | 6961 | |
5b04ee3b | 6962 | #: builtin/grep.c:718 |
ef317cd5 | 6963 | msgid "show a line with the function name before matches" |
07432cef | 6964 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 6965 | |
5b04ee3b | 6966 | #: builtin/grep.c:720 |
ef317cd5 | 6967 | msgid "show the surrounding function" |
07432cef | 6968 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 6969 | |
5b04ee3b | 6970 | #: builtin/grep.c:723 |
ef317cd5 | 6971 | msgid "read patterns from file" |
07432cef | 6972 | msgstr "从文件读取模式" |
ef317cd5 | 6973 | |
5b04ee3b | 6974 | #: builtin/grep.c:725 |
ef317cd5 | 6975 | msgid "match <pattern>" |
07432cef | 6976 | msgstr "匹配 <模式>" |
ef317cd5 | 6977 | |
5b04ee3b | 6978 | #: builtin/grep.c:727 |
ef317cd5 | 6979 | msgid "combine patterns specified with -e" |
07432cef | 6980 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 6981 | |
5b04ee3b | 6982 | #: builtin/grep.c:739 |
ef317cd5 | 6983 | msgid "indicate hit with exit status without output" |
07432cef | 6984 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 6985 | |
5b04ee3b | 6986 | #: builtin/grep.c:741 |
ef317cd5 | 6987 | msgid "show only matches from files that match all patterns" |
07432cef | 6988 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 6989 | |
5b04ee3b | 6990 | #: builtin/grep.c:743 |
07432cef WS |
6991 | msgid "show parse tree for grep expression" |
6992 | msgstr "显示 grep 表达式的解析树" | |
6993 | ||
5b04ee3b | 6994 | #: builtin/grep.c:747 |
ef317cd5 | 6995 | msgid "pager" |
07432cef | 6996 | msgstr "分页" |
ef317cd5 | 6997 | |
5b04ee3b | 6998 | #: builtin/grep.c:747 |
ef317cd5 | 6999 | msgid "show matching files in the pager" |
07432cef | 7000 | msgstr "分页显示匹配的文件" |
ef317cd5 | 7001 | |
5b04ee3b | 7002 | #: builtin/grep.c:750 |
ef317cd5 | 7003 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 7004 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 7005 | |
5b04ee3b | 7006 | #: builtin/grep.c:813 |
c04f5ac3 JX |
7007 | msgid "no pattern given." |
7008 | msgstr "未提供模式匹配。" | |
7009 | ||
5b04ee3b | 7010 | #: builtin/grep.c:845 builtin/index-pack.c:1477 |
276ceeaa JX |
7011 | #, c-format |
7012 | msgid "invalid number of threads specified (%d)" | |
7013 | msgstr "指定的线程数无效(%d)" | |
7014 | ||
5b04ee3b | 7015 | #: builtin/grep.c:875 |
c04f5ac3 JX |
7016 | msgid "--open-files-in-pager only works on the worktree" |
7017 | msgstr "--open-files-in-pager 仅用于工作区" | |
7018 | ||
5b04ee3b | 7019 | #: builtin/grep.c:901 |
c04f5ac3 | 7020 | msgid "--cached or --untracked cannot be used with --no-index." |
649900bc | 7021 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" |
c04f5ac3 | 7022 | |
5b04ee3b | 7023 | #: builtin/grep.c:906 |
c04f5ac3 | 7024 | msgid "--no-index or --untracked cannot be used with revs." |
649900bc | 7025 | msgstr "--no-index 或 --untracked 不能和版本同时使用。" |
c04f5ac3 | 7026 | |
5b04ee3b | 7027 | #: builtin/grep.c:909 |
c04f5ac3 | 7028 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
90e6ef53 | 7029 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" |
c04f5ac3 | 7030 | |
5b04ee3b | 7031 | #: builtin/grep.c:917 |
c04f5ac3 JX |
7032 | msgid "both --cached and trees are given." |
7033 | msgstr "同时给出了 --cached 和树对象。" | |
7034 | ||
276ceeaa | 7035 | #: builtin/hash-object.c:81 |
ef317cd5 | 7036 | msgid "" |
814ff314 JX |
7037 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
7038 | "[--] <file>..." | |
ef317cd5 | 7039 | msgstr "" |
814ff314 JX |
7040 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
7041 | "[--] <文件>..." | |
ef317cd5 | 7042 | |
276ceeaa | 7043 | #: builtin/hash-object.c:82 |
94550ed3 JX |
7044 | msgid "git hash-object --stdin-paths" |
7045 | msgstr "git hash-object --stdin-paths" | |
ef317cd5 | 7046 | |
276ceeaa | 7047 | #: builtin/hash-object.c:93 |
ef317cd5 | 7048 | msgid "type" |
07432cef | 7049 | msgstr "类型" |
ef317cd5 | 7050 | |
276ceeaa | 7051 | #: builtin/hash-object.c:93 |
ef317cd5 | 7052 | msgid "object type" |
07432cef | 7053 | msgstr "对象类型" |
ef317cd5 | 7054 | |
276ceeaa | 7055 | #: builtin/hash-object.c:94 |
ef317cd5 | 7056 | msgid "write the object into the object database" |
07432cef | 7057 | msgstr "将对象写入对象数据库" |
ef317cd5 | 7058 | |
276ceeaa | 7059 | #: builtin/hash-object.c:96 |
ef317cd5 | 7060 | msgid "read the object from stdin" |
07432cef | 7061 | msgstr "从标准输入读取对象" |
ef317cd5 | 7062 | |
276ceeaa | 7063 | #: builtin/hash-object.c:98 |
ef317cd5 | 7064 | msgid "store file as is without filters" |
07432cef | 7065 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 | 7066 | |
276ceeaa | 7067 | #: builtin/hash-object.c:99 |
220c313c JX |
7068 | msgid "" |
7069 | "just hash any random garbage to create corrupt objects for debugging Git" | |
7070 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
7071 | ||
276ceeaa | 7072 | #: builtin/hash-object.c:100 |
ef317cd5 | 7073 | msgid "process file as it were from this path" |
07432cef | 7074 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 7075 | |
2e8451e8 | 7076 | #: builtin/help.c:41 |
ef317cd5 | 7077 | msgid "print all available commands" |
07432cef | 7078 | msgstr "打印所有可用的命令" |
ef317cd5 | 7079 | |
2e8451e8 | 7080 | #: builtin/help.c:42 |
4dcdc3d8 JX |
7081 | msgid "print list of useful guides" |
7082 | msgstr "显示有用的指南列表" | |
7083 | ||
2e8451e8 | 7084 | #: builtin/help.c:43 |
ef317cd5 | 7085 | msgid "show man page" |
07432cef | 7086 | msgstr "显示 man 手册" |
ef317cd5 | 7087 | |
2e8451e8 | 7088 | #: builtin/help.c:44 |
ef317cd5 | 7089 | msgid "show manual in web browser" |
07432cef | 7090 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 7091 | |
2e8451e8 | 7092 | #: builtin/help.c:46 |
ef317cd5 | 7093 | msgid "show info page" |
07432cef | 7094 | msgstr "显示 info 手册" |
ef317cd5 | 7095 | |
2e8451e8 | 7096 | #: builtin/help.c:52 |
814ff314 JX |
7097 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
7098 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" | |
ef317cd5 | 7099 | |
2e8451e8 | 7100 | #: builtin/help.c:64 |
81809b99 | 7101 | #, c-format |
8ada9598 | 7102 | msgid "unrecognized help format '%s'" |
81809b99 | 7103 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 7104 | |
220c313c | 7105 | #: builtin/help.c:91 |
8ada9598 | 7106 | msgid "Failed to start emacsclient." |
81809b99 | 7107 | msgstr "无法启动 emacsclient。" |
8ada9598 | 7108 | |
220c313c | 7109 | #: builtin/help.c:104 |
8ada9598 | 7110 | msgid "Failed to parse emacsclient version." |
81809b99 | 7111 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 7112 | |
220c313c | 7113 | #: builtin/help.c:112 |
8ada9598 JX |
7114 | #, c-format |
7115 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 7116 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 7117 | |
94550ed3 | 7118 | #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 |
81809b99 | 7119 | #, c-format |
5b04ee3b JX |
7120 | msgid "failed to exec '%s'" |
7121 | msgstr "无法执行 '%s'" | |
8ada9598 | 7122 | |
276ceeaa | 7123 | #: builtin/help.c:205 |
8ada9598 JX |
7124 | #, c-format |
7125 | msgid "" | |
7126 | "'%s': path for unsupported man viewer.\n" | |
7127 | "Please consider using 'man.<tool>.cmd' instead." | |
7128 | msgstr "" | |
81809b99 | 7129 | "'%s':不支持的 man 手册查看器的路径。\n" |
d9d56b23 | 7130 | "请使用 'man.<工具>.cmd'。" |
8ada9598 | 7131 | |
276ceeaa | 7132 | #: builtin/help.c:217 |
8ada9598 JX |
7133 | #, c-format |
7134 | msgid "" | |
7135 | "'%s': cmd for supported man viewer.\n" | |
7136 | "Please consider using 'man.<tool>.path' instead." | |
7137 | msgstr "" | |
81809b99 | 7138 | "'%s': 支持的 man 手册查看器命令。\n" |
d9d56b23 | 7139 | "请使用 'man.<工具>.path'。" |
8ada9598 | 7140 | |
276ceeaa | 7141 | #: builtin/help.c:334 |
8ada9598 JX |
7142 | #, c-format |
7143 | msgid "'%s': unknown man viewer." | |
81809b99 | 7144 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 7145 | |
276ceeaa | 7146 | #: builtin/help.c:351 |
8ada9598 | 7147 | msgid "no man viewer handled the request" |
81809b99 | 7148 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 7149 | |
276ceeaa | 7150 | #: builtin/help.c:359 |
8ada9598 | 7151 | msgid "no info viewer handled the request" |
81809b99 | 7152 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 7153 | |
276ceeaa | 7154 | #: builtin/help.c:408 |
4dcdc3d8 JX |
7155 | msgid "Defining attributes per path" |
7156 | msgstr "定义路径的属性" | |
7157 | ||
276ceeaa | 7158 | #: builtin/help.c:409 |
220c313c JX |
7159 | msgid "Everyday Git With 20 Commands Or So" |
7160 | msgstr "每一天 Git 常用的约 20 条命令" | |
7161 | ||
276ceeaa | 7162 | #: builtin/help.c:410 |
4dcdc3d8 JX |
7163 | msgid "A Git glossary" |
7164 | msgstr "Git 词汇表" | |
7165 | ||
276ceeaa | 7166 | #: builtin/help.c:411 |
4dcdc3d8 JX |
7167 | msgid "Specifies intentionally untracked files to ignore" |
7168 | msgstr "忽略指定的未跟踪文件" | |
7169 | ||
276ceeaa | 7170 | #: builtin/help.c:412 |
4dcdc3d8 JX |
7171 | msgid "Defining submodule properties" |
7172 | msgstr "定义子模组属性" | |
7173 | ||
276ceeaa | 7174 | #: builtin/help.c:413 |
4dcdc3d8 JX |
7175 | msgid "Specifying revisions and ranges for Git" |
7176 | msgstr "指定 Git 的版本和版本范围" | |
7177 | ||
276ceeaa | 7178 | #: builtin/help.c:414 |
4dcdc3d8 JX |
7179 | msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" |
7180 | msgstr "一个 Git 教程(针对 1.5.1 或更新版本)" | |
7181 | ||
276ceeaa | 7182 | #: builtin/help.c:415 |
4dcdc3d8 JX |
7183 | msgid "An overview of recommended workflows with Git" |
7184 | msgstr "Git 推荐的工作流概览" | |
7185 | ||
276ceeaa | 7186 | #: builtin/help.c:427 |
4dcdc3d8 JX |
7187 | msgid "The common Git guides are:\n" |
7188 | msgstr "最常用的 Git 向导有:\n" | |
7189 | ||
276ceeaa | 7190 | #: builtin/help.c:448 builtin/help.c:465 |
8ada9598 JX |
7191 | #, c-format |
7192 | msgid "usage: %s%s" | |
81809b99 | 7193 | msgstr "用法:%s%s" |
8ada9598 | 7194 | |
276ceeaa | 7195 | #: builtin/help.c:481 |
8ada9598 JX |
7196 | #, c-format |
7197 | msgid "`git %s' is aliased to `%s'" | |
81809b99 | 7198 | msgstr "`git %s' 是 `%s' 的别名" |
8ada9598 | 7199 | |
1b7f4a34 | 7200 | #: builtin/index-pack.c:152 |
6acbf033 JX |
7201 | #, c-format |
7202 | msgid "unable to open %s" | |
7203 | msgstr "不能打开 %s" | |
7204 | ||
1b7f4a34 | 7205 | #: builtin/index-pack.c:202 |
8ada9598 JX |
7206 | #, c-format |
7207 | msgid "object type mismatch at %s" | |
81809b99 | 7208 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 7209 | |
1b7f4a34 | 7210 | #: builtin/index-pack.c:222 |
6acbf033 JX |
7211 | #, c-format |
7212 | msgid "did not receive expected object %s" | |
7213 | msgstr "未能获取期望的对象 %s" | |
8ada9598 | 7214 | |
1b7f4a34 | 7215 | #: builtin/index-pack.c:225 |
6acbf033 JX |
7216 | #, c-format |
7217 | msgid "object %s: expected type %s, found %s" | |
7218 | msgstr "对象 %s:期待类型 %s,却是 %s" | |
7219 | ||
1b7f4a34 | 7220 | #: builtin/index-pack.c:267 |
81809b99 | 7221 | #, c-format |
8ada9598 JX |
7222 | msgid "cannot fill %d byte" |
7223 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 7224 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 7225 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 7226 | |
1b7f4a34 | 7227 | #: builtin/index-pack.c:277 |
8ada9598 | 7228 | msgid "early EOF" |
81809b99 | 7229 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 7230 | |
1b7f4a34 | 7231 | #: builtin/index-pack.c:278 |
8ada9598 | 7232 | msgid "read error on input" |
81809b99 | 7233 | msgstr "输入上的读错误" |
8ada9598 | 7234 | |
1b7f4a34 | 7235 | #: builtin/index-pack.c:290 |
8ada9598 | 7236 | msgid "used more bytes than were available" |
81809b99 | 7237 | msgstr "用掉了超过可用的字节" |
8ada9598 | 7238 | |
1b7f4a34 | 7239 | #: builtin/index-pack.c:297 |
8ada9598 | 7240 | msgid "pack too large for current definition of off_t" |
81809b99 | 7241 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 7242 | |
1b7f4a34 | 7243 | #: builtin/index-pack.c:313 |
81809b99 | 7244 | #, c-format |
8ada9598 | 7245 | msgid "unable to create '%s'" |
81809b99 | 7246 | msgstr "不能创建 '%s'" |
8ada9598 | 7247 | |
1b7f4a34 | 7248 | #: builtin/index-pack.c:318 |
81809b99 | 7249 | #, c-format |
8ada9598 | 7250 | msgid "cannot open packfile '%s'" |
81809b99 | 7251 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 7252 | |
1b7f4a34 | 7253 | #: builtin/index-pack.c:332 |
8ada9598 | 7254 | msgid "pack signature mismatch" |
81809b99 | 7255 | msgstr "包签名不匹配" |
8ada9598 | 7256 | |
1b7f4a34 | 7257 | #: builtin/index-pack.c:334 |
ef317cd5 JX |
7258 | #, c-format |
7259 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 7260 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 7261 | |
1b7f4a34 | 7262 | #: builtin/index-pack.c:352 |
8ada9598 JX |
7263 | #, c-format |
7264 | msgid "pack has bad object at offset %lu: %s" | |
81809b99 | 7265 | msgstr "包中有错误的对象位于 %lu:%s" |
8ada9598 | 7266 | |
1b7f4a34 | 7267 | #: builtin/index-pack.c:473 |
8ada9598 JX |
7268 | #, c-format |
7269 | msgid "inflate returned %d" | |
81809b99 | 7270 | msgstr "解压缩返回 %d" |
8ada9598 | 7271 | |
1b7f4a34 | 7272 | #: builtin/index-pack.c:522 |
8ada9598 | 7273 | msgid "offset value overflow for delta base object" |
81809b99 | 7274 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 7275 | |
1b7f4a34 | 7276 | #: builtin/index-pack.c:530 |
8ada9598 | 7277 | msgid "delta base offset is out of bound" |
81809b99 | 7278 | msgstr "delta 基准偏移越界" |
8ada9598 | 7279 | |
1b7f4a34 | 7280 | #: builtin/index-pack.c:538 |
81809b99 | 7281 | #, c-format |
8ada9598 | 7282 | msgid "unknown object type %d" |
81809b99 | 7283 | msgstr "未知对象类型 %d" |
8ada9598 | 7284 | |
1b7f4a34 | 7285 | #: builtin/index-pack.c:569 |
8ada9598 | 7286 | msgid "cannot pread pack file" |
81809b99 | 7287 | msgstr "无法读取包文件" |
8ada9598 | 7288 | |
1b7f4a34 | 7289 | #: builtin/index-pack.c:571 |
8ada9598 JX |
7290 | #, c-format |
7291 | msgid "premature end of pack file, %lu byte missing" | |
7292 | msgid_plural "premature end of pack file, %lu bytes missing" | |
81809b99 | 7293 | msgstr[0] "包文件过早结束,缺少 %lu 字节" |
5ae481e0 | 7294 | msgstr[1] "包文件过早结束,缺少 %lu 字节" |
8ada9598 | 7295 | |
1b7f4a34 | 7296 | #: builtin/index-pack.c:597 |
8ada9598 | 7297 | msgid "serious inflate inconsistency" |
81809b99 | 7298 | msgstr "解压缩严重的不一致" |
8ada9598 | 7299 | |
1b7f4a34 JX |
7300 | #: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772 |
7301 | #: builtin/index-pack.c:806 builtin/index-pack.c:815 | |
8ada9598 JX |
7302 | #, c-format |
7303 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 7304 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 7305 | |
1b7f4a34 | 7306 | #: builtin/index-pack.c:746 builtin/pack-objects.c:162 |
814ff314 | 7307 | #: builtin/pack-objects.c:254 |
6792b93b JX |
7308 | #, c-format |
7309 | msgid "unable to read %s" | |
7310 | msgstr "不能读 %s" | |
7311 | ||
1b7f4a34 | 7312 | #: builtin/index-pack.c:812 |
6792b93b JX |
7313 | #, c-format |
7314 | msgid "cannot read existing object %s" | |
7315 | msgstr "不能读取现存对象 %s" | |
7316 | ||
1b7f4a34 | 7317 | #: builtin/index-pack.c:826 |
81809b99 | 7318 | #, c-format |
8ada9598 | 7319 | msgid "invalid blob object %s" |
160fb2b2 | 7320 | msgstr "无效的数据对象 %s" |
8ada9598 | 7321 | |
1b7f4a34 | 7322 | #: builtin/index-pack.c:840 |
81809b99 | 7323 | #, c-format |
8ada9598 | 7324 | msgid "invalid %s" |
81809b99 | 7325 | msgstr "无效的 %s" |
8ada9598 | 7326 | |
7aea43ff | 7327 | #: builtin/index-pack.c:843 |
8ada9598 | 7328 | msgid "Error in object" |
81809b99 | 7329 | msgstr "对象中出错" |
8ada9598 | 7330 | |
7aea43ff | 7331 | #: builtin/index-pack.c:845 |
8ada9598 JX |
7332 | #, c-format |
7333 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 7334 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 7335 | |
7aea43ff | 7336 | #: builtin/index-pack.c:917 builtin/index-pack.c:948 |
8ada9598 | 7337 | msgid "failed to apply delta" |
81809b99 | 7338 | msgstr "无法应用 delta" |
8ada9598 | 7339 | |
7aea43ff | 7340 | #: builtin/index-pack.c:1118 |
8ada9598 | 7341 | msgid "Receiving objects" |
81809b99 | 7342 | msgstr "接收对象中" |
8ada9598 | 7343 | |
7aea43ff | 7344 | #: builtin/index-pack.c:1118 |
8ada9598 | 7345 | msgid "Indexing objects" |
81809b99 | 7346 | msgstr "索引对象中" |
8ada9598 | 7347 | |
7aea43ff | 7348 | #: builtin/index-pack.c:1150 |
8ada9598 | 7349 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 7350 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 7351 | |
7aea43ff | 7352 | #: builtin/index-pack.c:1155 |
8ada9598 | 7353 | msgid "cannot fstat packfile" |
81809b99 | 7354 | msgstr "不能枚举包文件状态" |
8ada9598 | 7355 | |
7aea43ff | 7356 | #: builtin/index-pack.c:1158 |
8ada9598 | 7357 | msgid "pack has junk at the end" |
81809b99 | 7358 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 7359 | |
7aea43ff | 7360 | #: builtin/index-pack.c:1169 |
6792b93b JX |
7361 | msgid "confusion beyond insanity in parse_pack_objects()" |
7362 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
7363 | ||
7aea43ff | 7364 | #: builtin/index-pack.c:1194 |
8ada9598 | 7365 | msgid "Resolving deltas" |
81809b99 | 7366 | msgstr "处理 delta 中" |
8ada9598 | 7367 | |
7aea43ff | 7368 | #: builtin/index-pack.c:1205 |
07432cef | 7369 | #, c-format |
ef317cd5 | 7370 | msgid "unable to create thread: %s" |
07432cef | 7371 | msgstr "不能创建线程:%s" |
ef317cd5 | 7372 | |
7aea43ff | 7373 | #: builtin/index-pack.c:1247 |
8ada9598 | 7374 | msgid "confusion beyond insanity" |
81809b99 | 7375 | msgstr "不可理喻" |
8ada9598 | 7376 | |
7aea43ff | 7377 | #: builtin/index-pack.c:1253 |
ef317cd5 | 7378 | #, c-format |
5b04ee3b JX |
7379 | msgid "completed with %d local object" |
7380 | msgid_plural "completed with %d local objects" | |
7381 | msgstr[0] "完成 %d 个本地对象" | |
7382 | msgstr[1] "完成 %d 个本地对象" | |
ef317cd5 | 7383 | |
5b04ee3b | 7384 | #: builtin/index-pack.c:1265 |
ef317cd5 JX |
7385 | #, c-format |
7386 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 7387 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 7388 | |
5b04ee3b | 7389 | #: builtin/index-pack.c:1269 |
8ada9598 JX |
7390 | #, c-format |
7391 | msgid "pack has %d unresolved delta" | |
7392 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 7393 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 7394 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 7395 | |
5b04ee3b | 7396 | #: builtin/index-pack.c:1293 |
81809b99 | 7397 | #, c-format |
8ada9598 | 7398 | msgid "unable to deflate appended object (%d)" |
07432cef | 7399 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 7400 | |
5b04ee3b | 7401 | #: builtin/index-pack.c:1369 |
8ada9598 JX |
7402 | #, c-format |
7403 | msgid "local object %s is corrupt" | |
81809b99 | 7404 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 7405 | |
5b04ee3b | 7406 | #: builtin/index-pack.c:1393 |
8ada9598 | 7407 | msgid "error while closing pack file" |
81809b99 | 7408 | msgstr "关闭包文件时出错" |
8ada9598 | 7409 | |
5b04ee3b | 7410 | #: builtin/index-pack.c:1406 |
81809b99 | 7411 | #, c-format |
8ada9598 | 7412 | msgid "cannot write keep file '%s'" |
81809b99 | 7413 | msgstr "无法写保留文件 '%s'" |
8ada9598 | 7414 | |
5b04ee3b | 7415 | #: builtin/index-pack.c:1414 |
81809b99 | 7416 | #, c-format |
8ada9598 | 7417 | msgid "cannot close written keep file '%s'" |
81809b99 | 7418 | msgstr "无法关闭保留文件 '%s'" |
8ada9598 | 7419 | |
5b04ee3b | 7420 | #: builtin/index-pack.c:1427 |
8ada9598 | 7421 | msgid "cannot store pack file" |
81809b99 | 7422 | msgstr "无法存储包文件" |
8ada9598 | 7423 | |
5b04ee3b | 7424 | #: builtin/index-pack.c:1438 |
8ada9598 | 7425 | msgid "cannot store index file" |
81809b99 | 7426 | msgstr "无法存储索引文件" |
8ada9598 | 7427 | |
5b04ee3b | 7428 | #: builtin/index-pack.c:1471 |
07432cef | 7429 | #, c-format |
ef317cd5 | 7430 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 7431 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 7432 | |
5b04ee3b | 7433 | #: builtin/index-pack.c:1481 builtin/index-pack.c:1678 |
ef317cd5 JX |
7434 | #, c-format |
7435 | msgid "no threads support, ignoring %s" | |
07432cef | 7436 | msgstr "没有线程支持,忽略 %s" |
ef317cd5 | 7437 | |
5b04ee3b | 7438 | #: builtin/index-pack.c:1540 |
81809b99 | 7439 | #, c-format |
8ada9598 | 7440 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 7441 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 7442 | |
5b04ee3b | 7443 | #: builtin/index-pack.c:1542 |
81809b99 | 7444 | #, c-format |
8ada9598 | 7445 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 7446 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 7447 | |
5b04ee3b | 7448 | #: builtin/index-pack.c:1589 |
81809b99 | 7449 | #, c-format |
8ada9598 JX |
7450 | msgid "non delta: %d object" |
7451 | msgid_plural "non delta: %d objects" | |
81809b99 | 7452 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 7453 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 7454 | |
5b04ee3b | 7455 | #: builtin/index-pack.c:1596 |
8ada9598 JX |
7456 | #, c-format |
7457 | msgid "chain length = %d: %lu object" | |
7458 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 7459 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 7460 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 7461 | |
5b04ee3b JX |
7462 | #: builtin/index-pack.c:1609 |
7463 | #, c-format | |
7464 | msgid "packfile name '%s' does not end with '.pack'" | |
7465 | msgstr "包文件名 '%s' 没有以 '.pack' 结尾" | |
7466 | ||
7467 | #: builtin/index-pack.c:1638 | |
8ada9598 | 7468 | msgid "Cannot come back to cwd" |
81809b99 | 7469 | msgstr "无法返回当前工作目录" |
8ada9598 | 7470 | |
5b04ee3b JX |
7471 | #: builtin/index-pack.c:1690 builtin/index-pack.c:1693 |
7472 | #: builtin/index-pack.c:1705 builtin/index-pack.c:1709 | |
81809b99 | 7473 | #, c-format |
8ada9598 | 7474 | msgid "bad %s" |
81809b99 | 7475 | msgstr "错误选项 %s" |
8ada9598 | 7476 | |
5b04ee3b | 7477 | #: builtin/index-pack.c:1723 |
8ada9598 | 7478 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 7479 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 7480 | |
5b04ee3b | 7481 | #: builtin/index-pack.c:1731 |
8ada9598 | 7482 | msgid "--verify with no packfile name given" |
dbd6cced | 7483 | msgstr "--verify 没有提供包文件名参数" |
8ada9598 | 7484 | |
94550ed3 | 7485 | #: builtin/init-db.c:55 |
c04f5ac3 JX |
7486 | #, c-format |
7487 | msgid "cannot stat '%s'" | |
7488 | msgstr "不能枚举 '%s' 状态" | |
7489 | ||
94550ed3 | 7490 | #: builtin/init-db.c:61 |
c04f5ac3 JX |
7491 | #, c-format |
7492 | msgid "cannot stat template '%s'" | |
7493 | msgstr "不能枚举模版 '%s' 状态" | |
7494 | ||
94550ed3 | 7495 | #: builtin/init-db.c:66 |
c04f5ac3 JX |
7496 | #, c-format |
7497 | msgid "cannot opendir '%s'" | |
7498 | msgstr "不能打开目录 '%s'" | |
7499 | ||
94550ed3 | 7500 | #: builtin/init-db.c:77 |
c04f5ac3 JX |
7501 | #, c-format |
7502 | msgid "cannot readlink '%s'" | |
7503 | msgstr "不能读取链接 '%s'" | |
7504 | ||
94550ed3 | 7505 | #: builtin/init-db.c:79 |
c04f5ac3 JX |
7506 | #, c-format |
7507 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 7508 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 | 7509 | |
94550ed3 | 7510 | #: builtin/init-db.c:85 |
c04f5ac3 JX |
7511 | #, c-format |
7512 | msgid "cannot copy '%s' to '%s'" | |
7513 | msgstr "不能拷贝 '%s' 至 '%s'" | |
7514 | ||
94550ed3 | 7515 | #: builtin/init-db.c:89 |
c04f5ac3 JX |
7516 | #, c-format |
7517 | msgid "ignoring template %s" | |
7518 | msgstr "忽略模版 %s" | |
7519 | ||
5b04ee3b | 7520 | #: builtin/init-db.c:120 |
c04f5ac3 JX |
7521 | #, c-format |
7522 | msgid "templates not found %s" | |
7523 | msgstr "模版未找到 %s" | |
7524 | ||
5b04ee3b | 7525 | #: builtin/init-db.c:135 |
c04f5ac3 | 7526 | #, c-format |
5b04ee3b JX |
7527 | msgid "not copying templates from '%s': %s" |
7528 | msgstr "没有从 '%s' 复制模版:%s" | |
c04f5ac3 | 7529 | |
5b04ee3b | 7530 | #: builtin/init-db.c:312 builtin/init-db.c:315 |
c04f5ac3 JX |
7531 | #, c-format |
7532 | msgid "%s already exists" | |
7533 | msgstr "%s 已经存在" | |
7534 | ||
5b04ee3b | 7535 | #: builtin/init-db.c:344 |
c04f5ac3 JX |
7536 | #, c-format |
7537 | msgid "unable to handle file type %d" | |
7538 | msgstr "不能处理 %d 类型的文件" | |
7539 | ||
5b04ee3b | 7540 | #: builtin/init-db.c:347 |
c04f5ac3 JX |
7541 | #, c-format |
7542 | msgid "unable to move %s to %s" | |
7543 | msgstr "不能移动 %s 至 %s" | |
7544 | ||
6c94aba5 JX |
7545 | #. TRANSLATORS: The first '%s' is either "Reinitialized |
7546 | #. existing" or "Initialized empty", the second " shared" or | |
7547 | #. "", and the last '%s%s' is the verbatim directory name. | |
5b04ee3b | 7548 | #: builtin/init-db.c:403 |
c04f5ac3 JX |
7549 | #, c-format |
7550 | msgid "%s%s Git repository in %s%s\n" | |
160fb2b2 | 7551 | msgstr "%s%s Git 仓库于 %s%s\n" |
c04f5ac3 | 7552 | |
5b04ee3b | 7553 | #: builtin/init-db.c:404 |
c04f5ac3 JX |
7554 | msgid "Reinitialized existing" |
7555 | msgstr "重新初始化现存的" | |
7556 | ||
5b04ee3b | 7557 | #: builtin/init-db.c:404 |
c04f5ac3 JX |
7558 | msgid "Initialized empty" |
7559 | msgstr "初始化空的" | |
7560 | ||
7e238ab7 | 7561 | # 译者:中文字符串拼接,可删除前导空格 |
5b04ee3b | 7562 | #: builtin/init-db.c:405 |
c04f5ac3 | 7563 | msgid " shared" |
90e6ef53 | 7564 | msgstr "共享" |
c04f5ac3 | 7565 | |
5b04ee3b | 7566 | #: builtin/init-db.c:452 |
ef317cd5 | 7567 | msgid "" |
a77c07d9 | 7568 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
814ff314 | 7569 | "shared[=<permissions>]] [<directory>]" |
ef317cd5 | 7570 | msgstr "" |
07432cef | 7571 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
814ff314 | 7572 | "[<目录>]" |
ef317cd5 | 7573 | |
5b04ee3b | 7574 | #: builtin/init-db.c:475 |
ef317cd5 | 7575 | msgid "permissions" |
07432cef | 7576 | msgstr "权限" |
ef317cd5 | 7577 | |
5b04ee3b | 7578 | #: builtin/init-db.c:476 |
ef317cd5 | 7579 | msgid "specify that the git repository is to be shared amongst several users" |
160fb2b2 | 7580 | msgstr "指定 git 仓库是多个用户之间共享的" |
ef317cd5 | 7581 | |
5b04ee3b | 7582 | #: builtin/init-db.c:510 builtin/init-db.c:515 |
c04f5ac3 JX |
7583 | #, c-format |
7584 | msgid "cannot mkdir %s" | |
7585 | msgstr "不能创建目录 %s" | |
7586 | ||
5b04ee3b | 7587 | #: builtin/init-db.c:519 |
c04f5ac3 JX |
7588 | #, c-format |
7589 | msgid "cannot chdir to %s" | |
7590 | msgstr "不能切换目录到 %s" | |
7591 | ||
5b04ee3b | 7592 | #: builtin/init-db.c:540 |
c04f5ac3 JX |
7593 | #, c-format |
7594 | msgid "" | |
7595 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
7596 | "dir=<directory>)" | |
1e607449 | 7597 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
c04f5ac3 | 7598 | |
5b04ee3b | 7599 | #: builtin/init-db.c:568 |
c04f5ac3 JX |
7600 | #, c-format |
7601 | msgid "Cannot access work tree '%s'" | |
7602 | msgstr "不能访问工作区 '%s'" | |
7603 | ||
220c313c JX |
7604 | #: builtin/interpret-trailers.c:15 |
7605 | msgid "" | |
276ceeaa JX |
7606 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " |
7607 | "<token>[(=|:)<value>])...] [<file>...]" | |
3495628d JX |
7608 | msgstr "" |
7609 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" | |
7610 | ">])...] [<文件>...]" | |
276ceeaa JX |
7611 | |
7612 | #: builtin/interpret-trailers.c:26 | |
7613 | msgid "edit files in place" | |
7614 | msgstr "在原位编辑文件" | |
220c313c | 7615 | |
276ceeaa | 7616 | #: builtin/interpret-trailers.c:27 |
220c313c JX |
7617 | msgid "trim empty trailers" |
7618 | msgstr "删除空签名" | |
7619 | ||
276ceeaa | 7620 | #: builtin/interpret-trailers.c:28 |
220c313c JX |
7621 | msgid "trailer" |
7622 | msgstr "签名" | |
7623 | ||
276ceeaa | 7624 | #: builtin/interpret-trailers.c:29 |
220c313c JX |
7625 | msgid "trailer(s) to add" |
7626 | msgstr "要添加的签名" | |
7627 | ||
276ceeaa JX |
7628 | #: builtin/interpret-trailers.c:42 |
7629 | msgid "no input file given for in-place editing" | |
7630 | msgstr "没有给出要原位编辑的文件" | |
7631 | ||
1b7f4a34 | 7632 | #: builtin/log.c:43 |
7aea43ff | 7633 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
d9d56b23 | 7634 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" |
ef317cd5 | 7635 | |
1b7f4a34 | 7636 | #: builtin/log.c:44 |
814ff314 JX |
7637 | msgid "git show [<options>] <object>..." |
7638 | msgstr "git show [<选项>] <对象>..." | |
ef317cd5 | 7639 | |
1b7f4a34 | 7640 | #: builtin/log.c:83 |
220c313c JX |
7641 | #, c-format |
7642 | msgid "invalid --decorate option: %s" | |
7643 | msgstr "无效的 --decorate 选项:%s" | |
7644 | ||
5b04ee3b | 7645 | #: builtin/log.c:137 |
ef317cd5 | 7646 | msgid "suppress diff output" |
07432cef | 7647 | msgstr "不显示差异输出" |
ef317cd5 | 7648 | |
5b04ee3b | 7649 | #: builtin/log.c:138 |
ef317cd5 | 7650 | msgid "show source" |
07432cef | 7651 | msgstr "显示源" |
ef317cd5 | 7652 | |
5b04ee3b | 7653 | #: builtin/log.c:139 |
07432cef WS |
7654 | msgid "Use mail map file" |
7655 | msgstr "使用邮件映射文件" | |
7656 | ||
5b04ee3b | 7657 | #: builtin/log.c:140 |
ef317cd5 | 7658 | msgid "decorate options" |
07432cef | 7659 | msgstr "修饰选项" |
ef317cd5 | 7660 | |
5b04ee3b | 7661 | #: builtin/log.c:143 |
220c313c JX |
7662 | msgid "Process line range n,m in file, counting from 1" |
7663 | msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" | |
7664 | ||
5b04ee3b | 7665 | #: builtin/log.c:239 |
c04f5ac3 JX |
7666 | #, c-format |
7667 | msgid "Final output: %d %s\n" | |
7668 | msgstr "最终输出:%d %s\n" | |
7669 | ||
5b04ee3b | 7670 | #: builtin/log.c:471 |
220c313c JX |
7671 | #, c-format |
7672 | msgid "git show %s: bad file" | |
7673 | msgstr "git show %s: 损坏的文件" | |
7674 | ||
5b04ee3b | 7675 | #: builtin/log.c:485 builtin/log.c:578 |
c04f5ac3 JX |
7676 | #, c-format |
7677 | msgid "Could not read object %s" | |
90e6ef53 | 7678 | msgstr "不能读取对象 %s" |
c04f5ac3 | 7679 | |
5b04ee3b | 7680 | #: builtin/log.c:602 |
c04f5ac3 JX |
7681 | #, c-format |
7682 | msgid "Unknown type: %d" | |
7683 | msgstr "未知类型:%d" | |
7684 | ||
5b04ee3b | 7685 | #: builtin/log.c:722 |
c04f5ac3 JX |
7686 | msgid "format.headers without value" |
7687 | msgstr "format.headers 没有值" | |
7688 | ||
5b04ee3b | 7689 | #: builtin/log.c:812 |
c04f5ac3 JX |
7690 | msgid "name of output directory is too long" |
7691 | msgstr "输出目录名太长" | |
7692 | ||
5b04ee3b | 7693 | #: builtin/log.c:827 |
c04f5ac3 JX |
7694 | #, c-format |
7695 | msgid "Cannot open patch file %s" | |
7696 | msgstr "无法打开补丁文件 %s" | |
7697 | ||
5b04ee3b | 7698 | #: builtin/log.c:841 |
c04f5ac3 JX |
7699 | msgid "Need exactly one range." |
7700 | msgstr "只需要一个范围。" | |
7701 | ||
5b04ee3b | 7702 | #: builtin/log.c:851 |
c04f5ac3 JX |
7703 | msgid "Not a range." |
7704 | msgstr "不是一个范围。" | |
7705 | ||
5b04ee3b | 7706 | #: builtin/log.c:957 |
c04f5ac3 JX |
7707 | msgid "Cover letter needs email format" |
7708 | msgstr "信封需要邮件地址格式" | |
7709 | ||
5b04ee3b | 7710 | #: builtin/log.c:1036 |
c04f5ac3 JX |
7711 | #, c-format |
7712 | msgid "insane in-reply-to: %s" | |
7713 | msgstr "不正常的 in-reply-to:%s" | |
7714 | ||
5b04ee3b | 7715 | #: builtin/log.c:1064 |
814ff314 JX |
7716 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
7717 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" | |
ef317cd5 | 7718 | |
5b04ee3b | 7719 | #: builtin/log.c:1109 |
c04f5ac3 JX |
7720 | msgid "Two output directories?" |
7721 | msgstr "两个输出目录?" | |
7722 | ||
5b04ee3b JX |
7723 | #: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 |
7724 | #, c-format | |
7725 | msgid "Unknown commit %s" | |
7726 | msgstr "未知提交 %s" | |
7727 | ||
7728 | #: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 | |
7729 | #: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 | |
7730 | #: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 | |
7731 | #: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 | |
7732 | #, c-format | |
7733 | msgid "Failed to resolve '%s' as a valid ref." | |
7734 | msgstr "无法解析 '%s' 为一个有效引用。" | |
7735 | ||
7736 | #: builtin/log.c:1231 | |
7737 | msgid "Could not find exact merge base." | |
7738 | msgstr "不能找到准确的合并基线。" | |
7739 | ||
7740 | #: builtin/log.c:1235 | |
7741 | msgid "" | |
7742 | "Failed to get upstream, if you want to record base commit automatically,\n" | |
7743 | "please use git branch --set-upstream-to to track a remote branch.\n" | |
7744 | "Or you could specify base commit by --base=<base-commit-id> manually." | |
7745 | msgstr "" | |
7746 | "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n" | |
aef18cc6 | 7747 | "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" |
5b04ee3b JX |
7748 | "参数 --base=<base-commit-id> 手动指定一个基线提交。" |
7749 | ||
7750 | #: builtin/log.c:1255 | |
7751 | msgid "Failed to find exact merge base" | |
7752 | msgstr "无法找到准确的合并基线" | |
7753 | ||
7754 | #: builtin/log.c:1266 | |
7755 | msgid "base commit should be the ancestor of revision list" | |
7756 | msgstr "基线提交应该是版本列表的祖先" | |
7757 | ||
7758 | #: builtin/log.c:1270 | |
7759 | msgid "base commit shouldn't be in revision list" | |
7760 | msgstr "基线提交不应该出现在版本列表中" | |
7761 | ||
7762 | #: builtin/log.c:1319 | |
7763 | msgid "cannot get patch id" | |
aef18cc6 | 7764 | msgstr "无法得到补丁 id" |
5b04ee3b JX |
7765 | |
7766 | #: builtin/log.c:1377 | |
ef317cd5 | 7767 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 7768 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 7769 | |
5b04ee3b | 7770 | #: builtin/log.c:1380 |
ef317cd5 | 7771 | msgid "use [PATCH] even with multiple patches" |
07432cef | 7772 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 7773 | |
5b04ee3b | 7774 | #: builtin/log.c:1384 |
ef317cd5 | 7775 | msgid "print patches to standard out" |
07432cef | 7776 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 7777 | |
5b04ee3b | 7778 | #: builtin/log.c:1386 |
ef317cd5 | 7779 | msgid "generate a cover letter" |
07432cef | 7780 | msgstr "生成一封附信" |
c04f5ac3 | 7781 | |
5b04ee3b | 7782 | #: builtin/log.c:1388 |
ef317cd5 | 7783 | msgid "use simple number sequence for output file names" |
07432cef | 7784 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 7785 | |
5b04ee3b | 7786 | #: builtin/log.c:1389 |
ef317cd5 | 7787 | msgid "sfx" |
07432cef | 7788 | msgstr "后缀" |
ef317cd5 | 7789 | |
5b04ee3b | 7790 | #: builtin/log.c:1390 |
ef317cd5 | 7791 | msgid "use <sfx> instead of '.patch'" |
07432cef | 7792 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 7793 | |
5b04ee3b | 7794 | #: builtin/log.c:1392 |
ef317cd5 | 7795 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
7796 | msgstr "补丁以 <n> 开始编号,而不是1" |
7797 | ||
5b04ee3b | 7798 | #: builtin/log.c:1394 |
07432cef WS |
7799 | msgid "mark the series as Nth re-roll" |
7800 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 7801 | |
5b04ee3b | 7802 | #: builtin/log.c:1396 |
ef317cd5 | 7803 | msgid "Use [<prefix>] instead of [PATCH]" |
07432cef | 7804 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 7805 | |
5b04ee3b | 7806 | #: builtin/log.c:1399 |
ef317cd5 | 7807 | msgid "store resulting files in <dir>" |
d9d56b23 | 7808 | msgstr "把结果文件存储在 <目录>" |
ef317cd5 | 7809 | |
5b04ee3b | 7810 | #: builtin/log.c:1402 |
ef317cd5 | 7811 | msgid "don't strip/add [PATCH]" |
07432cef | 7812 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 7813 | |
5b04ee3b | 7814 | #: builtin/log.c:1405 |
ef317cd5 | 7815 | msgid "don't output binary diffs" |
07432cef | 7816 | msgstr "不输出二进制差异" |
ef317cd5 | 7817 | |
5b04ee3b | 7818 | #: builtin/log.c:1407 |
89f80d72 JX |
7819 | msgid "output all-zero hash in From header" |
7820 | msgstr "在 From 头信息中输出全为零的哈希值" | |
7821 | ||
5b04ee3b | 7822 | #: builtin/log.c:1409 |
ef317cd5 | 7823 | msgid "don't include a patch matching a commit upstream" |
07432cef | 7824 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 7825 | |
5b04ee3b | 7826 | #: builtin/log.c:1411 |
ef317cd5 | 7827 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 7828 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 7829 | |
5b04ee3b | 7830 | #: builtin/log.c:1413 |
ef317cd5 | 7831 | msgid "Messaging" |
07432cef | 7832 | msgstr "邮件发送" |
ef317cd5 | 7833 | |
5b04ee3b | 7834 | #: builtin/log.c:1414 |
ef317cd5 | 7835 | msgid "header" |
07432cef | 7836 | msgstr "header" |
ef317cd5 | 7837 | |
5b04ee3b | 7838 | #: builtin/log.c:1415 |
ef317cd5 | 7839 | msgid "add email header" |
07432cef | 7840 | msgstr "添加邮件头" |
ef317cd5 | 7841 | |
5b04ee3b | 7842 | #: builtin/log.c:1416 builtin/log.c:1418 |
ef317cd5 | 7843 | msgid "email" |
07432cef | 7844 | msgstr "邮件地址" |
ef317cd5 | 7845 | |
5b04ee3b | 7846 | #: builtin/log.c:1416 |
ef317cd5 | 7847 | msgid "add To: header" |
07432cef | 7848 | msgstr "添加收件人" |
ef317cd5 | 7849 | |
5b04ee3b | 7850 | #: builtin/log.c:1418 |
ef317cd5 | 7851 | msgid "add Cc: header" |
07432cef | 7852 | msgstr "添加抄送" |
ef317cd5 | 7853 | |
5b04ee3b | 7854 | #: builtin/log.c:1420 |
2e8451e8 | 7855 | msgid "ident" |
d9d56b23 | 7856 | msgstr "标识" |
2e8451e8 | 7857 | |
5b04ee3b | 7858 | #: builtin/log.c:1421 |
2e8451e8 | 7859 | msgid "set From address to <ident> (or committer ident if absent)" |
4375c10e | 7860 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)" |
2e8451e8 | 7861 | |
5b04ee3b | 7862 | #: builtin/log.c:1423 |
ef317cd5 | 7863 | msgid "message-id" |
d9d56b23 | 7864 | msgstr "邮件标识" |
ef317cd5 | 7865 | |
5b04ee3b | 7866 | #: builtin/log.c:1424 |
ef317cd5 | 7867 | msgid "make first mail a reply to <message-id>" |
d9d56b23 | 7868 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
ef317cd5 | 7869 | |
5b04ee3b | 7870 | #: builtin/log.c:1425 builtin/log.c:1428 |
ef317cd5 | 7871 | msgid "boundary" |
07432cef | 7872 | msgstr "边界" |
ef317cd5 | 7873 | |
5b04ee3b | 7874 | #: builtin/log.c:1426 |
ef317cd5 | 7875 | msgid "attach the patch" |
07432cef | 7876 | msgstr "附件方式添加补丁" |
ef317cd5 | 7877 | |
5b04ee3b | 7878 | #: builtin/log.c:1429 |
ef317cd5 | 7879 | msgid "inline the patch" |
07432cef | 7880 | msgstr "内联显示补丁" |
ef317cd5 | 7881 | |
5b04ee3b | 7882 | #: builtin/log.c:1433 |
ef317cd5 | 7883 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 7884 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 7885 | |
5b04ee3b | 7886 | #: builtin/log.c:1435 |
ef317cd5 | 7887 | msgid "signature" |
07432cef | 7888 | msgstr "签名" |
ef317cd5 | 7889 | |
5b04ee3b | 7890 | #: builtin/log.c:1436 |
ef317cd5 | 7891 | msgid "add a signature" |
07432cef | 7892 | msgstr "添加一个签名" |
ef317cd5 | 7893 | |
5b04ee3b JX |
7894 | #: builtin/log.c:1437 |
7895 | msgid "base-commit" | |
7896 | msgstr "基线提交" | |
7897 | ||
7898 | #: builtin/log.c:1438 | |
7899 | msgid "add prerequisite tree info to the patch series" | |
7900 | msgstr "为补丁列表添加前置树信息" | |
7901 | ||
7902 | #: builtin/log.c:1440 | |
6acbf033 JX |
7903 | msgid "add a signature from a file" |
7904 | msgstr "从文件添加一个签名" | |
7905 | ||
5b04ee3b | 7906 | #: builtin/log.c:1441 |
ef317cd5 | 7907 | msgid "don't print the patch filenames" |
07432cef | 7908 | msgstr "不要打印补丁文件名" |
ef317cd5 | 7909 | |
5b04ee3b | 7910 | #: builtin/log.c:1531 |
c04f5ac3 JX |
7911 | msgid "-n and -k are mutually exclusive." |
7912 | msgstr "-n 和 -k 互斥。" | |
7913 | ||
5b04ee3b | 7914 | #: builtin/log.c:1533 |
c04f5ac3 JX |
7915 | msgid "--subject-prefix and -k are mutually exclusive." |
7916 | msgstr "--subject-prefix 和 -k 互斥。" | |
7917 | ||
5b04ee3b | 7918 | #: builtin/log.c:1541 |
c04f5ac3 JX |
7919 | msgid "--name-only does not make sense" |
7920 | msgstr "--name-only 无意义" | |
7921 | ||
5b04ee3b | 7922 | #: builtin/log.c:1543 |
c04f5ac3 JX |
7923 | msgid "--name-status does not make sense" |
7924 | msgstr "--name-status 无意义" | |
7925 | ||
5b04ee3b | 7926 | #: builtin/log.c:1545 |
c04f5ac3 JX |
7927 | msgid "--check does not make sense" |
7928 | msgstr "--check 无意义" | |
7929 | ||
5b04ee3b | 7930 | #: builtin/log.c:1573 |
c04f5ac3 JX |
7931 | msgid "standard output, or directory, which one?" |
7932 | msgstr "标准输出或目录,哪一个?" | |
7933 | ||
5b04ee3b | 7934 | #: builtin/log.c:1575 |
c04f5ac3 JX |
7935 | #, c-format |
7936 | msgid "Could not create directory '%s'" | |
90e6ef53 | 7937 | msgstr "不能创建目录 '%s'" |
c04f5ac3 | 7938 | |
5b04ee3b | 7939 | #: builtin/log.c:1672 |
6acbf033 JX |
7940 | #, c-format |
7941 | msgid "unable to read signature file '%s'" | |
7942 | msgstr "无法读取签名文件 '%s'" | |
7943 | ||
5b04ee3b | 7944 | #: builtin/log.c:1743 |
c04f5ac3 JX |
7945 | msgid "Failed to create output files" |
7946 | msgstr "无法创建输出文件" | |
7947 | ||
5b04ee3b | 7948 | #: builtin/log.c:1792 |
ef317cd5 | 7949 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 7950 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 7951 | |
5b04ee3b | 7952 | #: builtin/log.c:1846 |
c04f5ac3 JX |
7953 | #, c-format |
7954 | msgid "" | |
7955 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
d9d56b23 | 7956 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
c04f5ac3 | 7957 | |
276ceeaa | 7958 | #: builtin/ls-files.c:378 |
814ff314 JX |
7959 | msgid "git ls-files [<options>] [<file>...]" |
7960 | msgstr "git ls-files [<选项>] [<文件>...]" | |
ef317cd5 | 7961 | |
276ceeaa | 7962 | #: builtin/ls-files.c:427 |
ef317cd5 | 7963 | msgid "identify the file status with tags" |
07432cef | 7964 | msgstr "用标签标识文件的状态" |
ef317cd5 | 7965 | |
276ceeaa | 7966 | #: builtin/ls-files.c:429 |
ef317cd5 | 7967 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 7968 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 7969 | |
276ceeaa | 7970 | #: builtin/ls-files.c:431 |
ef317cd5 | 7971 | msgid "show cached files in the output (default)" |
07432cef | 7972 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 7973 | |
276ceeaa | 7974 | #: builtin/ls-files.c:433 |
ef317cd5 | 7975 | msgid "show deleted files in the output" |
07432cef | 7976 | msgstr "显示已删除的文件" |
ef317cd5 | 7977 | |
276ceeaa | 7978 | #: builtin/ls-files.c:435 |
ef317cd5 | 7979 | msgid "show modified files in the output" |
07432cef | 7980 | msgstr "显示已修改的文件" |
ef317cd5 | 7981 | |
276ceeaa | 7982 | #: builtin/ls-files.c:437 |
ef317cd5 | 7983 | msgid "show other files in the output" |
07432cef | 7984 | msgstr "显示其它文件" |
ef317cd5 | 7985 | |
276ceeaa | 7986 | #: builtin/ls-files.c:439 |
ef317cd5 | 7987 | msgid "show ignored files in the output" |
07432cef | 7988 | msgstr "显示忽略的文件" |
ef317cd5 | 7989 | |
276ceeaa | 7990 | #: builtin/ls-files.c:442 |
ef317cd5 | 7991 | msgid "show staged contents' object name in the output" |
07432cef | 7992 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 7993 | |
276ceeaa | 7994 | #: builtin/ls-files.c:444 |
ef317cd5 | 7995 | msgid "show files on the filesystem that need to be removed" |
07432cef | 7996 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 7997 | |
276ceeaa | 7998 | #: builtin/ls-files.c:446 |
220c313c | 7999 | msgid "show 'other' directories' names only" |
07432cef | 8000 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 8001 | |
276ceeaa JX |
8002 | #: builtin/ls-files.c:448 |
8003 | msgid "show line endings of files" | |
8004 | msgstr "显示文件换行符格式" | |
8005 | ||
8006 | #: builtin/ls-files.c:450 | |
ef317cd5 | 8007 | msgid "don't show empty directories" |
07432cef | 8008 | msgstr "不显示空目录" |
ef317cd5 | 8009 | |
276ceeaa | 8010 | #: builtin/ls-files.c:453 |
ef317cd5 | 8011 | msgid "show unmerged files in the output" |
07432cef | 8012 | msgstr "显示未合并的文件" |
ef317cd5 | 8013 | |
276ceeaa | 8014 | #: builtin/ls-files.c:455 |
ef317cd5 | 8015 | msgid "show resolve-undo information" |
07432cef | 8016 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 8017 | |
276ceeaa | 8018 | #: builtin/ls-files.c:457 |
ef317cd5 | 8019 | msgid "skip files matching pattern" |
07432cef | 8020 | msgstr "匹配排除文件的模式" |
ef317cd5 | 8021 | |
276ceeaa | 8022 | #: builtin/ls-files.c:460 |
ef317cd5 | 8023 | msgid "exclude patterns are read from <file>" |
07432cef | 8024 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 8025 | |
276ceeaa | 8026 | #: builtin/ls-files.c:463 |
ef317cd5 | 8027 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 8028 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 8029 | |
276ceeaa | 8030 | #: builtin/ls-files.c:465 |
ef317cd5 | 8031 | msgid "add the standard git exclusions" |
07432cef | 8032 | msgstr "添加标准的 git 排除" |
ef317cd5 | 8033 | |
276ceeaa | 8034 | #: builtin/ls-files.c:468 |
ef317cd5 | 8035 | msgid "make the output relative to the project top directory" |
07432cef | 8036 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 8037 | |
276ceeaa | 8038 | #: builtin/ls-files.c:471 |
ef317cd5 | 8039 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 8040 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 8041 | |
276ceeaa | 8042 | #: builtin/ls-files.c:472 |
ef317cd5 | 8043 | msgid "tree-ish" |
07432cef | 8044 | msgstr "树或提交" |
ef317cd5 | 8045 | |
276ceeaa | 8046 | #: builtin/ls-files.c:473 |
ef317cd5 | 8047 | msgid "pretend that paths removed since <tree-ish> are still present" |
07432cef | 8048 | msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" |
ef317cd5 | 8049 | |
276ceeaa | 8050 | #: builtin/ls-files.c:475 |
ef317cd5 | 8051 | msgid "show debugging data" |
07432cef | 8052 | msgstr "显示调试数据" |
ef317cd5 | 8053 | |
276ceeaa JX |
8054 | #: builtin/ls-remote.c:7 |
8055 | msgid "" | |
8056 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
8057 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
8058 | " [--symref] [<repository> [<refs>...]]" | |
8059 | msgstr "" | |
8060 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
8061 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
8062 | " [--symref] [<仓库> [<引用>...]]" | |
8063 | ||
8064 | #: builtin/ls-remote.c:50 | |
8065 | msgid "do not print remote URL" | |
8066 | msgstr "不打印远程 URL" | |
8067 | ||
8068 | #: builtin/ls-remote.c:51 builtin/ls-remote.c:53 | |
8069 | msgid "exec" | |
8070 | msgstr "exec" | |
8071 | ||
8072 | #: builtin/ls-remote.c:52 builtin/ls-remote.c:54 | |
8073 | msgid "path of git-upload-pack on the remote host" | |
8074 | msgstr "远程主机上的 git-upload-pack 路径" | |
8075 | ||
8076 | #: builtin/ls-remote.c:56 | |
8077 | msgid "limit to tags" | |
8078 | msgstr "仅限于标签" | |
8079 | ||
8080 | #: builtin/ls-remote.c:57 | |
8081 | msgid "limit to heads" | |
8082 | msgstr "仅限于分支" | |
8083 | ||
8084 | #: builtin/ls-remote.c:58 | |
8085 | msgid "do not show peeled tags" | |
8086 | msgstr "不显示已解析的标签" | |
8087 | ||
8088 | #: builtin/ls-remote.c:60 | |
8089 | msgid "take url.<base>.insteadOf into account" | |
8090 | msgstr "参考 url.<base>.insteadOf 设置" | |
8091 | ||
8092 | #: builtin/ls-remote.c:62 | |
8093 | msgid "exit with exit code 2 if no matching refs are found" | |
8094 | msgstr "若未找到匹配的引用则以退出码2退出" | |
8095 | ||
8096 | #: builtin/ls-remote.c:64 | |
8097 | msgid "show underlying ref in addition to the object pointed by it" | |
8098 | msgstr "除了显示指向的对象外,显示指向的引用名" | |
8099 | ||
90314792 | 8100 | #: builtin/ls-tree.c:28 |
ef317cd5 | 8101 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
07432cef | 8102 | msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 8103 | |
94550ed3 | 8104 | #: builtin/ls-tree.c:128 |
ef317cd5 | 8105 | msgid "only show trees" |
07432cef | 8106 | msgstr "只显示树" |
ef317cd5 | 8107 | |
94550ed3 | 8108 | #: builtin/ls-tree.c:130 |
ef317cd5 | 8109 | msgid "recurse into subtrees" |
07432cef | 8110 | msgstr "递归到子树" |
ef317cd5 | 8111 | |
94550ed3 | 8112 | #: builtin/ls-tree.c:132 |
ef317cd5 | 8113 | msgid "show trees when recursing" |
07432cef | 8114 | msgstr "当递归时显示树" |
ef317cd5 | 8115 | |
94550ed3 | 8116 | #: builtin/ls-tree.c:135 |
ef317cd5 | 8117 | msgid "terminate entries with NUL byte" |
4375c10e | 8118 | msgstr "条目以 NUL 字符终止" |
ef317cd5 | 8119 | |
94550ed3 | 8120 | #: builtin/ls-tree.c:136 |
ef317cd5 | 8121 | msgid "include object size" |
07432cef | 8122 | msgstr "包括对象大小" |
ef317cd5 | 8123 | |
94550ed3 | 8124 | #: builtin/ls-tree.c:138 builtin/ls-tree.c:140 |
ef317cd5 | 8125 | msgid "list only filenames" |
07432cef | 8126 | msgstr "只列出文件名" |
ef317cd5 | 8127 | |
94550ed3 | 8128 | #: builtin/ls-tree.c:143 |
ef317cd5 | 8129 | msgid "use full path names" |
07432cef | 8130 | msgstr "使用文件的全路径" |
ef317cd5 | 8131 | |
94550ed3 | 8132 | #: builtin/ls-tree.c:145 |
ef317cd5 | 8133 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 8134 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 | 8135 | |
04cb2f28 | 8136 | #: builtin/merge.c:45 |
814ff314 JX |
8137 | msgid "git merge [<options>] [<commit>...]" |
8138 | msgstr "git merge [<选项>] [<提交>...]" | |
ef317cd5 | 8139 | |
04cb2f28 | 8140 | #: builtin/merge.c:46 |
814ff314 JX |
8141 | msgid "git merge [<options>] <msg> HEAD <commit>" |
8142 | msgstr "git merge [<选项>] <说明> HEAD <提交>" | |
ef317cd5 | 8143 | |
04cb2f28 | 8144 | #: builtin/merge.c:47 |
ef317cd5 | 8145 | msgid "git merge --abort" |
07432cef | 8146 | msgstr "git merge --abort" |
ef317cd5 | 8147 | |
5b04ee3b | 8148 | #: builtin/merge.c:101 |
c04f5ac3 JX |
8149 | msgid "switch `m' requires a value" |
8150 | msgstr "开关 `m' 需要一个值" | |
8151 | ||
5b04ee3b | 8152 | #: builtin/merge.c:138 |
c04f5ac3 JX |
8153 | #, c-format |
8154 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 8155 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 8156 | |
5b04ee3b | 8157 | #: builtin/merge.c:139 |
c04f5ac3 JX |
8158 | #, c-format |
8159 | msgid "Available strategies are:" | |
8160 | msgstr "可用的策略有:" | |
8161 | ||
5b04ee3b | 8162 | #: builtin/merge.c:144 |
c04f5ac3 JX |
8163 | #, c-format |
8164 | msgid "Available custom strategies are:" | |
8165 | msgstr "可用的自定义策略有:" | |
8166 | ||
5b04ee3b | 8167 | #: builtin/merge.c:194 builtin/pull.c:126 |
ef317cd5 | 8168 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 8169 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 8170 | |
5b04ee3b | 8171 | #: builtin/merge.c:197 builtin/pull.c:129 |
ef317cd5 | 8172 | msgid "show a diffstat at the end of the merge" |
07432cef | 8173 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 8174 | |
5b04ee3b | 8175 | #: builtin/merge.c:198 builtin/pull.c:132 |
ef317cd5 | 8176 | msgid "(synonym to --stat)" |
07432cef | 8177 | msgstr "(和 --stat 同义)" |
ef317cd5 | 8178 | |
5b04ee3b | 8179 | #: builtin/merge.c:200 builtin/pull.c:135 |
ef317cd5 | 8180 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 8181 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 8182 | |
5b04ee3b | 8183 | #: builtin/merge.c:203 builtin/pull.c:138 |
ef317cd5 | 8184 | msgid "create a single commit instead of doing a merge" |
07432cef | 8185 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 8186 | |
5b04ee3b | 8187 | #: builtin/merge.c:205 builtin/pull.c:141 |
ef317cd5 | 8188 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 8189 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 8190 | |
5b04ee3b | 8191 | #: builtin/merge.c:207 builtin/pull.c:144 |
ef317cd5 | 8192 | msgid "edit message before committing" |
07432cef | 8193 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 8194 | |
5b04ee3b | 8195 | #: builtin/merge.c:208 |
ef317cd5 | 8196 | msgid "allow fast-forward (default)" |
07432cef | 8197 | msgstr "允许快进(默认)" |
ef317cd5 | 8198 | |
5b04ee3b | 8199 | #: builtin/merge.c:210 builtin/pull.c:150 |
ef317cd5 | 8200 | msgid "abort if fast-forward is not possible" |
07432cef | 8201 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 8202 | |
5b04ee3b | 8203 | #: builtin/merge.c:214 |
1003b3a5 JX |
8204 | msgid "Verify that the named commit has a valid GPG signature" |
8205 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" | |
8206 | ||
5b04ee3b | 8207 | #: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 |
1b7f4a34 | 8208 | #: builtin/revert.c:89 |
ef317cd5 | 8209 | msgid "strategy" |
07432cef | 8210 | msgstr "策略" |
ef317cd5 | 8211 | |
5b04ee3b | 8212 | #: builtin/merge.c:216 builtin/pull.c:158 |
ef317cd5 | 8213 | msgid "merge strategy to use" |
07432cef | 8214 | msgstr "要使用的合并策略" |
ef317cd5 | 8215 | |
5b04ee3b | 8216 | #: builtin/merge.c:217 builtin/pull.c:161 |
ef317cd5 | 8217 | msgid "option=value" |
07432cef | 8218 | msgstr "option=value" |
ef317cd5 | 8219 | |
5b04ee3b | 8220 | #: builtin/merge.c:218 builtin/pull.c:162 |
ef317cd5 | 8221 | msgid "option for selected merge strategy" |
07432cef | 8222 | msgstr "所选的合并策略的选项" |
ef317cd5 | 8223 | |
5b04ee3b | 8224 | #: builtin/merge.c:220 |
ef317cd5 | 8225 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 8226 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 8227 | |
5b04ee3b | 8228 | #: builtin/merge.c:224 |
ef317cd5 | 8229 | msgid "abort the current in-progress merge" |
07432cef | 8230 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 8231 | |
5b04ee3b JX |
8232 | #: builtin/merge.c:226 builtin/pull.c:169 |
8233 | msgid "allow merging unrelated histories" | |
8234 | msgstr "允许合并不相关的历史" | |
8235 | ||
8236 | #: builtin/merge.c:254 | |
c04f5ac3 JX |
8237 | msgid "could not run stash." |
8238 | msgstr "不能进行进度保存。" | |
8239 | ||
5b04ee3b | 8240 | #: builtin/merge.c:259 |
c04f5ac3 JX |
8241 | msgid "stash failed" |
8242 | msgstr "进度保存失败" | |
8243 | ||
5b04ee3b | 8244 | #: builtin/merge.c:264 |
c04f5ac3 JX |
8245 | #, c-format |
8246 | msgid "not a valid object: %s" | |
8247 | msgstr "不是一个有效对象:%s" | |
8248 | ||
5b04ee3b | 8249 | #: builtin/merge.c:283 builtin/merge.c:300 |
c04f5ac3 JX |
8250 | msgid "read-tree failed" |
8251 | msgstr "读取树失败" | |
8252 | ||
90e6ef53 | 8253 | # 译者:注意保持前导空格 |
5b04ee3b | 8254 | #: builtin/merge.c:330 |
c04f5ac3 JX |
8255 | msgid " (nothing to squash)" |
8256 | msgstr " (无可压缩)" | |
8257 | ||
5b04ee3b | 8258 | #: builtin/merge.c:343 |
c04f5ac3 JX |
8259 | #, c-format |
8260 | msgid "Squash commit -- not updating HEAD\n" | |
8261 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
8262 | ||
5b04ee3b JX |
8263 | #: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 |
8264 | #: builtin/merge.c:1000 | |
1b7f4a34 JX |
8265 | #, c-format |
8266 | msgid "Could not write to '%s'" | |
8267 | msgstr "不能写入 '%s'" | |
8268 | ||
5b04ee3b | 8269 | #: builtin/merge.c:375 |
c04f5ac3 JX |
8270 | msgid "Writing SQUASH_MSG" |
8271 | msgstr "写入 SQUASH_MSG" | |
8272 | ||
5b04ee3b | 8273 | #: builtin/merge.c:377 |
c04f5ac3 JX |
8274 | msgid "Finishing SQUASH_MSG" |
8275 | msgstr "完成 SQUASH_MSG" | |
8276 | ||
5b04ee3b | 8277 | #: builtin/merge.c:400 |
c04f5ac3 JX |
8278 | #, c-format |
8279 | msgid "No merge message -- not updating HEAD\n" | |
8280 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
8281 | ||
5b04ee3b | 8282 | #: builtin/merge.c:451 |
c04f5ac3 JX |
8283 | #, c-format |
8284 | msgid "'%s' does not point to a commit" | |
8285 | msgstr "'%s' 没有指向一个提交" | |
8286 | ||
5b04ee3b | 8287 | #: builtin/merge.c:541 |
c04f5ac3 JX |
8288 | #, c-format |
8289 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 8290 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 8291 | |
5b04ee3b | 8292 | #: builtin/merge.c:660 |
c04f5ac3 JX |
8293 | msgid "Not handling anything other than two heads merge." |
8294 | msgstr "不能处理两个头合并之外的任何操作。" | |
8295 | ||
5b04ee3b | 8296 | #: builtin/merge.c:674 |
c04f5ac3 JX |
8297 | #, c-format |
8298 | msgid "Unknown option for merge-recursive: -X%s" | |
8299 | msgstr "merge-recursive 的未知选项:-X%s" | |
8300 | ||
5b04ee3b | 8301 | #: builtin/merge.c:687 |
c04f5ac3 JX |
8302 | #, c-format |
8303 | msgid "unable to write %s" | |
8304 | msgstr "不能写 %s" | |
8305 | ||
5b04ee3b | 8306 | #: builtin/merge.c:776 |
c04f5ac3 JX |
8307 | #, c-format |
8308 | msgid "Could not read from '%s'" | |
8309 | msgstr "不能从 '%s' 读取" | |
8310 | ||
5b04ee3b | 8311 | #: builtin/merge.c:785 |
c04f5ac3 JX |
8312 | #, c-format |
8313 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
8314 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
8315 | ||
5b04ee3b | 8316 | #: builtin/merge.c:791 |
a77c07d9 | 8317 | #, c-format |
c04f5ac3 JX |
8318 | msgid "" |
8319 | "Please enter a commit message to explain why this merge is necessary,\n" | |
8320 | "especially if it merges an updated upstream into a topic branch.\n" | |
8321 | "\n" | |
a77c07d9 | 8322 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" |
c04f5ac3 JX |
8323 | "the commit.\n" |
8324 | msgstr "" | |
8325 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
8326 | "合并到主题分支。\n" | |
8327 | "\n" | |
a77c07d9 | 8328 | "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n" |
c04f5ac3 | 8329 | |
5b04ee3b | 8330 | #: builtin/merge.c:815 |
c04f5ac3 JX |
8331 | msgid "Empty commit message." |
8332 | msgstr "空提交信息。" | |
8333 | ||
5b04ee3b | 8334 | #: builtin/merge.c:835 |
c04f5ac3 JX |
8335 | #, c-format |
8336 | msgid "Wonderful.\n" | |
8337 | msgstr "太棒了。\n" | |
8338 | ||
5b04ee3b | 8339 | #: builtin/merge.c:890 |
c04f5ac3 JX |
8340 | #, c-format |
8341 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
8342 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
8343 | ||
5b04ee3b | 8344 | #: builtin/merge.c:906 |
c04f5ac3 JX |
8345 | #, c-format |
8346 | msgid "'%s' is not a commit" | |
8347 | msgstr "'%s' 不是一个提交" | |
8348 | ||
5b04ee3b | 8349 | #: builtin/merge.c:947 |
c04f5ac3 | 8350 | msgid "No current branch." |
90e6ef53 | 8351 | msgstr "没有当前分支。" |
c04f5ac3 | 8352 | |
5b04ee3b | 8353 | #: builtin/merge.c:949 |
c04f5ac3 | 8354 | msgid "No remote for the current branch." |
160fb2b2 | 8355 | msgstr "当前分支没有对应的远程仓库。" |
c04f5ac3 | 8356 | |
5b04ee3b | 8357 | #: builtin/merge.c:951 |
c04f5ac3 | 8358 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 8359 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 8360 | |
5b04ee3b | 8361 | #: builtin/merge.c:956 |
170e9899 | 8362 | #, c-format |
2e8451e8 JX |
8363 | msgid "No remote-tracking branch for %s from %s" |
8364 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 8365 | |
5b04ee3b | 8366 | #: builtin/merge.c:1091 |
7aea43ff JX |
8367 | #, c-format |
8368 | msgid "could not close '%s'" | |
8369 | msgstr "不能关闭 '%s'" | |
8370 | ||
5b04ee3b | 8371 | #: builtin/merge.c:1219 |
c04f5ac3 | 8372 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 8373 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 8374 | |
5b04ee3b | 8375 | #: builtin/merge.c:1235 |
c04f5ac3 JX |
8376 | msgid "" |
8377 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
220c313c | 8378 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
8379 | msgstr "" |
8380 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 8381 | "请在合并前先提交您的修改。" |
c04f5ac3 | 8382 | |
5b04ee3b | 8383 | #: builtin/merge.c:1242 |
c04f5ac3 JX |
8384 | msgid "" |
8385 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
220c313c | 8386 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
8387 | msgstr "" |
8388 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 8389 | "请在合并前先提交您的修改。" |
c04f5ac3 | 8390 | |
5b04ee3b | 8391 | #: builtin/merge.c:1245 |
c04f5ac3 JX |
8392 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
8393 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
8394 | ||
5b04ee3b | 8395 | #: builtin/merge.c:1254 |
c04f5ac3 | 8396 | msgid "You cannot combine --squash with --no-ff." |
649900bc | 8397 | msgstr "您不能将 --squash 与 --no-ff 同时使用。" |
c04f5ac3 | 8398 | |
5b04ee3b | 8399 | #: builtin/merge.c:1262 |
c04f5ac3 | 8400 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 8401 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 8402 | |
5b04ee3b | 8403 | #: builtin/merge.c:1279 |
c04f5ac3 JX |
8404 | msgid "Squash commit into empty head not supported yet" |
8405 | msgstr "尚不支持到空分支的压缩提交" | |
8406 | ||
5b04ee3b | 8407 | #: builtin/merge.c:1281 |
c04f5ac3 JX |
8408 | msgid "Non-fast-forward commit does not make sense into an empty head" |
8409 | msgstr "到空分支的非快进式提交没有意义" | |
8410 | ||
5b04ee3b | 8411 | #: builtin/merge.c:1286 |
2e8451e8 JX |
8412 | #, c-format |
8413 | msgid "%s - not something we can merge" | |
8414 | msgstr "%s - 不能被合并" | |
8415 | ||
5b04ee3b | 8416 | #: builtin/merge.c:1288 |
7aea43ff JX |
8417 | msgid "Can merge only exactly one commit into empty head" |
8418 | msgstr "只能将一个提交合并到空分支上" | |
8419 | ||
5b04ee3b | 8420 | #: builtin/merge.c:1344 |
1003b3a5 JX |
8421 | #, c-format |
8422 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
8423 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
8424 | ||
5b04ee3b | 8425 | #: builtin/merge.c:1347 |
1003b3a5 JX |
8426 | #, c-format |
8427 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
8428 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
8429 | ||
5b04ee3b | 8430 | #: builtin/merge.c:1350 |
1003b3a5 JX |
8431 | #, c-format |
8432 | msgid "Commit %s does not have a GPG signature." | |
8433 | msgstr "提交 %s 没有一个 GPG 签名。" | |
8434 | ||
5b04ee3b | 8435 | #: builtin/merge.c:1353 |
1003b3a5 JX |
8436 | #, c-format |
8437 | msgid "Commit %s has a good GPG signature by %s\n" | |
8438 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
8439 | ||
5b04ee3b JX |
8440 | #: builtin/merge.c:1415 |
8441 | msgid "refusing to merge unrelated histories" | |
8442 | msgstr "拒绝合并无关的历史" | |
8443 | ||
8444 | #: builtin/merge.c:1439 | |
c04f5ac3 JX |
8445 | #, c-format |
8446 | msgid "Updating %s..%s\n" | |
8447 | msgstr "更新 %s..%s\n" | |
8448 | ||
5b04ee3b | 8449 | #: builtin/merge.c:1476 |
c04f5ac3 JX |
8450 | #, c-format |
8451 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 8452 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 8453 | |
5b04ee3b | 8454 | #: builtin/merge.c:1483 |
c04f5ac3 JX |
8455 | #, c-format |
8456 | msgid "Nope.\n" | |
8457 | msgstr "无。\n" | |
8458 | ||
5b04ee3b | 8459 | #: builtin/merge.c:1515 |
c04f5ac3 | 8460 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 8461 | msgstr "无法快进,终止。" |
c04f5ac3 | 8462 | |
5b04ee3b | 8463 | #: builtin/merge.c:1538 builtin/merge.c:1617 |
c04f5ac3 JX |
8464 | #, c-format |
8465 | msgid "Rewinding the tree to pristine...\n" | |
8466 | msgstr "将树回滚至原始状态...\n" | |
8467 | ||
5b04ee3b | 8468 | #: builtin/merge.c:1542 |
c04f5ac3 JX |
8469 | #, c-format |
8470 | msgid "Trying merge strategy %s...\n" | |
8471 | msgstr "尝试合并策略 %s...\n" | |
8472 | ||
5b04ee3b | 8473 | #: builtin/merge.c:1608 |
c04f5ac3 JX |
8474 | #, c-format |
8475 | msgid "No merge strategy handled the merge.\n" | |
8476 | msgstr "没有合并策略处理此合并。\n" | |
8477 | ||
5b04ee3b | 8478 | #: builtin/merge.c:1610 |
c04f5ac3 JX |
8479 | #, c-format |
8480 | msgid "Merge with strategy %s failed.\n" | |
8481 | msgstr "使用策略 %s 合并失败。\n" | |
8482 | ||
5b04ee3b | 8483 | #: builtin/merge.c:1619 |
c04f5ac3 JX |
8484 | #, c-format |
8485 | msgid "Using the %s to prepare resolving by hand.\n" | |
8486 | msgstr "使用 %s 以准备手工解决。\n" | |
8487 | ||
5b04ee3b | 8488 | #: builtin/merge.c:1631 |
c04f5ac3 JX |
8489 | #, c-format |
8490 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
8491 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
8492 | ||
cfff71a9 | 8493 | #: builtin/merge-base.c:29 |
814ff314 JX |
8494 | msgid "git merge-base [-a | --all] <commit> <commit>..." |
8495 | msgstr "git merge-base [-a | --all] <提交> <提交>..." | |
ef317cd5 | 8496 | |
cfff71a9 | 8497 | #: builtin/merge-base.c:30 |
814ff314 JX |
8498 | msgid "git merge-base [-a | --all] --octopus <commit>..." |
8499 | msgstr "git merge-base [-a | --all] --octopus <提交>..." | |
ef317cd5 | 8500 | |
cfff71a9 | 8501 | #: builtin/merge-base.c:31 |
ef317cd5 | 8502 | msgid "git merge-base --independent <commit>..." |
07432cef | 8503 | msgstr "git merge-base --independent <提交>..." |
ef317cd5 | 8504 | |
cfff71a9 | 8505 | #: builtin/merge-base.c:32 |
ef317cd5 | 8506 | msgid "git merge-base --is-ancestor <commit> <commit>" |
07432cef | 8507 | msgstr "git merge-base --is-ancestor <提交> <提交>" |
ef317cd5 | 8508 | |
cfff71a9 JX |
8509 | #: builtin/merge-base.c:33 |
8510 | msgid "git merge-base --fork-point <ref> [<commit>]" | |
d9d56b23 | 8511 | msgstr "git merge-base --fork-point <引用> [<提交>]" |
cfff71a9 JX |
8512 | |
8513 | #: builtin/merge-base.c:214 | |
ef317cd5 | 8514 | msgid "output all common ancestors" |
07432cef | 8515 | msgstr "输出所有共同的祖先" |
ef317cd5 | 8516 | |
cfff71a9 | 8517 | #: builtin/merge-base.c:216 |
ef317cd5 | 8518 | msgid "find ancestors for a single n-way merge" |
07432cef | 8519 | msgstr "查找一个多路合并的祖先提交" |
ef317cd5 | 8520 | |
cfff71a9 | 8521 | #: builtin/merge-base.c:218 |
ef317cd5 | 8522 | msgid "list revs not reachable from others" |
07432cef | 8523 | msgstr "显示不能被其他访问到的版本" |
ef317cd5 | 8524 | |
cfff71a9 | 8525 | #: builtin/merge-base.c:220 |
ef317cd5 | 8526 | msgid "is the first one ancestor of the other?" |
07432cef | 8527 | msgstr "第一个是其他的祖先提交么?" |
ef317cd5 | 8528 | |
cfff71a9 JX |
8529 | #: builtin/merge-base.c:222 |
8530 | msgid "find where <commit> forked from reflog of <ref>" | |
e397e7e3 | 8531 | msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" |
cfff71a9 | 8532 | |
ef317cd5 JX |
8533 | #: builtin/merge-file.c:8 |
8534 | msgid "" | |
814ff314 JX |
8535 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " |
8536 | "<orig-file> <file2>" | |
ef317cd5 | 8537 | msgstr "" |
814ff314 JX |
8538 | "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" |
8539 | "件> <文件2>" | |
ef317cd5 JX |
8540 | |
8541 | #: builtin/merge-file.c:33 | |
8542 | msgid "send results to standard output" | |
07432cef | 8543 | msgstr "将结果发送到标准输出" |
ef317cd5 JX |
8544 | |
8545 | #: builtin/merge-file.c:34 | |
8546 | msgid "use a diff3 based merge" | |
07432cef | 8547 | msgstr "使用基于 diff3 的合并" |
ef317cd5 JX |
8548 | |
8549 | #: builtin/merge-file.c:35 | |
8550 | msgid "for conflicts, use our version" | |
07432cef | 8551 | msgstr "如果冲突,使用我们的版本" |
ef317cd5 JX |
8552 | |
8553 | #: builtin/merge-file.c:37 | |
8554 | msgid "for conflicts, use their version" | |
07432cef | 8555 | msgstr "如果冲突,使用他们的版本" |
ef317cd5 JX |
8556 | |
8557 | #: builtin/merge-file.c:39 | |
8558 | msgid "for conflicts, use a union version" | |
07432cef | 8559 | msgstr "如果冲突,使用联合版本" |
ef317cd5 JX |
8560 | |
8561 | #: builtin/merge-file.c:42 | |
8562 | msgid "for conflicts, use this marker size" | |
07432cef | 8563 | msgstr "如果冲突,使用指定长度的标记" |
ef317cd5 JX |
8564 | |
8565 | #: builtin/merge-file.c:43 | |
8566 | msgid "do not warn about conflicts" | |
07432cef | 8567 | msgstr "不要警告冲突" |
ef317cd5 JX |
8568 | |
8569 | #: builtin/merge-file.c:45 | |
814ff314 JX |
8570 | msgid "set labels for file1/orig-file/file2" |
8571 | msgstr "为 文件1/初始文件/文件2 设置标签" | |
c04f5ac3 | 8572 | |
276ceeaa | 8573 | #: builtin/mktree.c:65 |
ef317cd5 | 8574 | msgid "git mktree [-z] [--missing] [--batch]" |
07432cef | 8575 | msgstr "git mktree [-z] [--missing] [--batch]" |
c04f5ac3 | 8576 | |
276ceeaa | 8577 | #: builtin/mktree.c:152 |
ef317cd5 | 8578 | msgid "input is NUL terminated" |
07432cef | 8579 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 8580 | |
276ceeaa | 8581 | #: builtin/mktree.c:153 builtin/write-tree.c:24 |
ef317cd5 | 8582 | msgid "allow missing objects" |
07432cef | 8583 | msgstr "允许丢失的对象" |
c04f5ac3 | 8584 | |
276ceeaa | 8585 | #: builtin/mktree.c:154 |
ef317cd5 | 8586 | msgid "allow creation of more than one tree" |
07432cef | 8587 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 8588 | |
90314792 | 8589 | #: builtin/mv.c:15 |
814ff314 JX |
8590 | msgid "git mv [<options>] <source>... <destination>" |
8591 | msgstr "git mv [<选项>] <源>... <目标>" | |
c04f5ac3 | 8592 | |
276ceeaa | 8593 | #: builtin/mv.c:70 |
220c313c JX |
8594 | #, c-format |
8595 | msgid "Directory %s is in index and no submodule?" | |
8596 | msgstr "目录 %s 在索引中并且不是子模组?" | |
8597 | ||
5b04ee3b | 8598 | #: builtin/mv.c:72 builtin/rm.c:317 |
220c313c | 8599 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
160fb2b2 | 8600 | msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续" |
220c313c | 8601 | |
276ceeaa | 8602 | #: builtin/mv.c:90 |
220c313c JX |
8603 | #, c-format |
8604 | msgid "%.*s is in index" | |
8605 | msgstr "%.*s 在索引中" | |
8606 | ||
276ceeaa | 8607 | #: builtin/mv.c:112 |
ef317cd5 | 8608 | msgid "force move/rename even if target exists" |
07432cef | 8609 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 8610 | |
276ceeaa | 8611 | #: builtin/mv.c:113 |
ef317cd5 | 8612 | msgid "skip move/rename errors" |
07432cef | 8613 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 8614 | |
276ceeaa | 8615 | #: builtin/mv.c:152 |
220c313c JX |
8616 | #, c-format |
8617 | msgid "destination '%s' is not a directory" | |
8618 | msgstr "目标 '%s' 不是一个目录" | |
8619 | ||
276ceeaa | 8620 | #: builtin/mv.c:163 |
c04f5ac3 JX |
8621 | #, c-format |
8622 | msgid "Checking rename of '%s' to '%s'\n" | |
8623 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
8624 | ||
276ceeaa | 8625 | #: builtin/mv.c:167 |
c04f5ac3 JX |
8626 | msgid "bad source" |
8627 | msgstr "坏的源" | |
8628 | ||
276ceeaa | 8629 | #: builtin/mv.c:170 |
c04f5ac3 JX |
8630 | msgid "can not move directory into itself" |
8631 | msgstr "不能将目录移动到自身" | |
8632 | ||
276ceeaa | 8633 | #: builtin/mv.c:173 |
c04f5ac3 JX |
8634 | msgid "cannot move directory over file" |
8635 | msgstr "不能将目录移动到文件" | |
8636 | ||
276ceeaa | 8637 | #: builtin/mv.c:182 |
c04f5ac3 JX |
8638 | msgid "source directory is empty" |
8639 | msgstr "源目录为空" | |
8640 | ||
276ceeaa | 8641 | #: builtin/mv.c:207 |
c04f5ac3 JX |
8642 | msgid "not under version control" |
8643 | msgstr "不在版本控制之下" | |
8644 | ||
276ceeaa | 8645 | #: builtin/mv.c:210 |
c04f5ac3 JX |
8646 | msgid "destination exists" |
8647 | msgstr "目标已存在" | |
8648 | ||
276ceeaa | 8649 | #: builtin/mv.c:218 |
c04f5ac3 JX |
8650 | #, c-format |
8651 | msgid "overwriting '%s'" | |
8652 | msgstr "覆盖 '%s'" | |
8653 | ||
276ceeaa | 8654 | #: builtin/mv.c:221 |
c04f5ac3 JX |
8655 | msgid "Cannot overwrite" |
8656 | msgstr "不能覆盖" | |
8657 | ||
276ceeaa | 8658 | #: builtin/mv.c:224 |
c04f5ac3 JX |
8659 | msgid "multiple sources for the same target" |
8660 | msgstr "同一目标具有多个源" | |
8661 | ||
276ceeaa | 8662 | #: builtin/mv.c:226 |
cfff71a9 JX |
8663 | msgid "destination directory does not exist" |
8664 | msgstr "目标目录不存在" | |
8665 | ||
276ceeaa | 8666 | #: builtin/mv.c:233 |
c04f5ac3 JX |
8667 | #, c-format |
8668 | msgid "%s, source=%s, destination=%s" | |
8669 | msgstr "%s,源=%s,目标=%s" | |
8670 | ||
276ceeaa | 8671 | #: builtin/mv.c:254 |
c04f5ac3 JX |
8672 | #, c-format |
8673 | msgid "Renaming %s to %s\n" | |
8674 | msgstr "重命名 %s 至 %s\n" | |
8675 | ||
5b04ee3b | 8676 | #: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 |
c04f5ac3 JX |
8677 | #, c-format |
8678 | msgid "renaming '%s' failed" | |
8679 | msgstr "重命名 '%s' 失败" | |
8680 | ||
5b04ee3b | 8681 | #: builtin/name-rev.c:258 |
814ff314 JX |
8682 | msgid "git name-rev [<options>] <commit>..." |
8683 | msgstr "git name-rev [<选项>] <提交>..." | |
ef317cd5 | 8684 | |
5b04ee3b | 8685 | #: builtin/name-rev.c:259 |
814ff314 JX |
8686 | msgid "git name-rev [<options>] --all" |
8687 | msgstr "git name-rev [<选项>] --all" | |
ef317cd5 | 8688 | |
5b04ee3b | 8689 | #: builtin/name-rev.c:260 |
814ff314 JX |
8690 | msgid "git name-rev [<options>] --stdin" |
8691 | msgstr "git name-rev [<选项>] --stdin" | |
ef317cd5 | 8692 | |
5b04ee3b | 8693 | #: builtin/name-rev.c:312 |
ef317cd5 | 8694 | msgid "print only names (no SHA-1)" |
07432cef | 8695 | msgstr "只打印名称(无 SHA-1)" |
ef317cd5 | 8696 | |
5b04ee3b | 8697 | #: builtin/name-rev.c:313 |
ef317cd5 | 8698 | msgid "only use tags to name the commits" |
55a16ee4 | 8699 | msgstr "只使用标签来命名提交" |
ef317cd5 | 8700 | |
5b04ee3b | 8701 | #: builtin/name-rev.c:315 |
ef317cd5 | 8702 | msgid "only use refs matching <pattern>" |
07432cef | 8703 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 8704 | |
5b04ee3b | 8705 | #: builtin/name-rev.c:317 |
ef317cd5 | 8706 | msgid "list all commits reachable from all refs" |
07432cef | 8707 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 8708 | |
5b04ee3b | 8709 | #: builtin/name-rev.c:318 |
ef317cd5 | 8710 | msgid "read from stdin" |
07432cef | 8711 | msgstr "从标准输入读取" |
ef317cd5 | 8712 | |
5b04ee3b | 8713 | #: builtin/name-rev.c:319 |
90314792 JX |
8714 | msgid "allow to print `undefined` names (default)" |
8715 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 8716 | |
5b04ee3b | 8717 | #: builtin/name-rev.c:325 |
2e8451e8 | 8718 | msgid "dereference tags in the input (internal use)" |
55a16ee4 | 8719 | msgstr "反向解析输入中的标签(内部使用)" |
2e8451e8 | 8720 | |
1b7f4a34 | 8721 | #: builtin/notes.c:25 |
814ff314 | 8722 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
07432cef | 8723 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 8724 | |
1b7f4a34 | 8725 | #: builtin/notes.c:26 |
ef317cd5 | 8726 | msgid "" |
814ff314 | 8727 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
04cb2f28 | 8728 | "| (-c | -C) <object>] [<object>]" |
ef317cd5 | 8729 | msgstr "" |
04cb2f28 JX |
8730 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
8731 | "| (-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 8732 | |
1b7f4a34 | 8733 | #: builtin/notes.c:27 |
814ff314 | 8734 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
07432cef | 8735 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 8736 | |
1b7f4a34 | 8737 | #: builtin/notes.c:28 |
ef317cd5 | 8738 | msgid "" |
814ff314 | 8739 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
04cb2f28 | 8740 | "(-c | -C) <object>] [<object>]" |
ef317cd5 | 8741 | msgstr "" |
04cb2f28 JX |
8742 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
8743 | "(-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 8744 | |
1b7f4a34 | 8745 | #: builtin/notes.c:29 |
814ff314 | 8746 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
04cb2f28 | 8747 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
ef317cd5 | 8748 | |
1b7f4a34 | 8749 | #: builtin/notes.c:30 |
814ff314 | 8750 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
07432cef | 8751 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 8752 | |
1b7f4a34 | 8753 | #: builtin/notes.c:31 |
ef317cd5 | 8754 | msgid "" |
814ff314 | 8755 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
07432cef | 8756 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 8757 | |
1b7f4a34 | 8758 | #: builtin/notes.c:32 |
ef317cd5 | 8759 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 8760 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 8761 | |
1b7f4a34 | 8762 | #: builtin/notes.c:33 |
ef317cd5 | 8763 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 8764 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 8765 | |
1b7f4a34 | 8766 | #: builtin/notes.c:34 |
814ff314 | 8767 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
07432cef | 8768 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 8769 | |
1b7f4a34 | 8770 | #: builtin/notes.c:35 |
814ff314 | 8771 | msgid "git notes [--ref <notes-ref>] prune [-n | -v]" |
07432cef | 8772 | msgstr "git notes [--ref <注解引用>] prune [-n | -v]" |
ef317cd5 | 8773 | |
1b7f4a34 | 8774 | #: builtin/notes.c:36 |
814ff314 | 8775 | msgid "git notes [--ref <notes-ref>] get-ref" |
07432cef | 8776 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 8777 | |
1b7f4a34 | 8778 | #: builtin/notes.c:41 |
ef317cd5 | 8779 | msgid "git notes [list [<object>]]" |
07432cef | 8780 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 8781 | |
1b7f4a34 | 8782 | #: builtin/notes.c:46 |
ef317cd5 | 8783 | msgid "git notes add [<options>] [<object>]" |
07432cef | 8784 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 8785 | |
1b7f4a34 | 8786 | #: builtin/notes.c:51 |
ef317cd5 | 8787 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 8788 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 8789 | |
1b7f4a34 | 8790 | #: builtin/notes.c:52 |
ef317cd5 | 8791 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 8792 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 8793 | |
1b7f4a34 | 8794 | #: builtin/notes.c:57 |
ef317cd5 | 8795 | msgid "git notes append [<options>] [<object>]" |
07432cef | 8796 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 8797 | |
1b7f4a34 | 8798 | #: builtin/notes.c:62 |
ef317cd5 | 8799 | msgid "git notes edit [<object>]" |
07432cef | 8800 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 8801 | |
1b7f4a34 | 8802 | #: builtin/notes.c:67 |
ef317cd5 | 8803 | msgid "git notes show [<object>]" |
07432cef | 8804 | msgstr "git notes show [<对象>]" |
ef317cd5 | 8805 | |
1b7f4a34 | 8806 | #: builtin/notes.c:72 |
814ff314 | 8807 | msgid "git notes merge [<options>] <notes-ref>" |
07432cef | 8808 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 8809 | |
1b7f4a34 | 8810 | #: builtin/notes.c:73 |
ef317cd5 | 8811 | msgid "git notes merge --commit [<options>]" |
07432cef | 8812 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 8813 | |
1b7f4a34 | 8814 | #: builtin/notes.c:74 |
ef317cd5 | 8815 | msgid "git notes merge --abort [<options>]" |
07432cef | 8816 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 8817 | |
1b7f4a34 | 8818 | #: builtin/notes.c:79 |
ef317cd5 | 8819 | msgid "git notes remove [<object>]" |
07432cef | 8820 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 8821 | |
1b7f4a34 | 8822 | #: builtin/notes.c:84 |
ef317cd5 | 8823 | msgid "git notes prune [<options>]" |
07432cef | 8824 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 8825 | |
1b7f4a34 | 8826 | #: builtin/notes.c:89 |
ef317cd5 | 8827 | msgid "git notes get-ref" |
07432cef | 8828 | msgstr "git notes get-ref" |
ef317cd5 | 8829 | |
1b7f4a34 | 8830 | #: builtin/notes.c:147 |
c04f5ac3 JX |
8831 | #, c-format |
8832 | msgid "unable to start 'show' for object '%s'" | |
8833 | msgstr "不能为对象 '%s' 开始 'show'" | |
8834 | ||
1b7f4a34 | 8835 | #: builtin/notes.c:151 |
a77c07d9 JX |
8836 | msgid "could not read 'show' output" |
8837 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 8838 | |
1b7f4a34 | 8839 | #: builtin/notes.c:159 |
c04f5ac3 JX |
8840 | #, c-format |
8841 | msgid "failed to finish 'show' for object '%s'" | |
8842 | msgstr "无法为对象 '%s' 完成 'show'" | |
8843 | ||
94550ed3 | 8844 | #: builtin/notes.c:174 builtin/tag.c:248 |
c04f5ac3 JX |
8845 | #, c-format |
8846 | msgid "could not create file '%s'" | |
8847 | msgstr "不能创建文件 '%s'" | |
8848 | ||
1b7f4a34 | 8849 | #: builtin/notes.c:193 |
c04f5ac3 JX |
8850 | msgid "Please supply the note contents using either -m or -F option" |
8851 | msgstr "请通过 -m 或 -F 选项为注解提供内容" | |
8852 | ||
1b7f4a34 | 8853 | #: builtin/notes.c:202 |
c04f5ac3 JX |
8854 | msgid "unable to write note object" |
8855 | msgstr "不能写注解对象" | |
8856 | ||
1b7f4a34 | 8857 | #: builtin/notes.c:204 |
c04f5ac3 | 8858 | #, c-format |
220c313c JX |
8859 | msgid "The note contents have been left in %s" |
8860 | msgstr "注解内容被留在 %s 中" | |
c04f5ac3 | 8861 | |
5b04ee3b | 8862 | #: builtin/notes.c:232 builtin/tag.c:439 |
c04f5ac3 JX |
8863 | #, c-format |
8864 | msgid "cannot read '%s'" | |
8865 | msgstr "不能读取 '%s'" | |
8866 | ||
5b04ee3b | 8867 | #: builtin/notes.c:234 builtin/tag.c:442 |
c04f5ac3 JX |
8868 | #, c-format |
8869 | msgid "could not open or read '%s'" | |
8870 | msgstr "不能打开或读取 '%s'" | |
8871 | ||
1b7f4a34 | 8872 | #: builtin/notes.c:256 |
c04f5ac3 JX |
8873 | #, c-format |
8874 | msgid "Failed to read object '%s'." | |
8875 | msgstr "无法读取对象 '%s'。" | |
8876 | ||
1b7f4a34 | 8877 | #: builtin/notes.c:260 |
6c94aba5 JX |
8878 | #, c-format |
8879 | msgid "Cannot read note data from non-blob object '%s'." | |
8880 | msgstr "不能从非数据对象 '%s' 中读取注解数据" | |
8881 | ||
276ceeaa JX |
8882 | #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 |
8883 | #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 | |
5b04ee3b | 8884 | #: builtin/notes.c:946 |
c04f5ac3 JX |
8885 | msgid "too many parameters" |
8886 | msgstr "参数太多" | |
8887 | ||
276ceeaa | 8888 | #: builtin/notes.c:375 builtin/notes.c:662 |
c04f5ac3 JX |
8889 | #, c-format |
8890 | msgid "No note found for object %s." | |
8891 | msgstr "未发现对象 %s 的注解。" | |
8892 | ||
276ceeaa | 8893 | #: builtin/notes.c:396 builtin/notes.c:559 |
ef317cd5 | 8894 | msgid "note contents as a string" |
07432cef | 8895 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 8896 | |
276ceeaa | 8897 | #: builtin/notes.c:399 builtin/notes.c:562 |
ef317cd5 | 8898 | msgid "note contents in a file" |
07432cef | 8899 | msgstr "注解内容到一个文件中" |
ef317cd5 | 8900 | |
276ceeaa | 8901 | #: builtin/notes.c:402 builtin/notes.c:565 |
ef317cd5 | 8902 | msgid "reuse and edit specified note object" |
07432cef | 8903 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 8904 | |
276ceeaa | 8905 | #: builtin/notes.c:405 builtin/notes.c:568 |
ef317cd5 | 8906 | msgid "reuse specified note object" |
07432cef | 8907 | msgstr "重用指定的注解对象" |
ef317cd5 | 8908 | |
276ceeaa | 8909 | #: builtin/notes.c:408 builtin/notes.c:571 |
04cb2f28 JX |
8910 | msgid "allow storing empty note" |
8911 | msgstr "允许保存空白注释" | |
8912 | ||
276ceeaa | 8913 | #: builtin/notes.c:409 builtin/notes.c:480 |
ef317cd5 | 8914 | msgid "replace existing notes" |
07432cef | 8915 | msgstr "替换已存在的注解" |
ef317cd5 | 8916 | |
276ceeaa | 8917 | #: builtin/notes.c:434 |
c04f5ac3 JX |
8918 | #, c-format |
8919 | msgid "" | |
8920 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
8921 | "existing notes" | |
8922 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
8923 | ||
276ceeaa | 8924 | #: builtin/notes.c:449 builtin/notes.c:528 |
c04f5ac3 JX |
8925 | #, c-format |
8926 | msgid "Overwriting existing notes for object %s\n" | |
8927 | msgstr "覆盖对象 %s 现存注解\n" | |
8928 | ||
5b04ee3b | 8929 | #: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 |
04cb2f28 JX |
8930 | #, c-format |
8931 | msgid "Removing note for object %s\n" | |
8932 | msgstr "删除对象 %s 的注解\n" | |
8933 | ||
276ceeaa | 8934 | #: builtin/notes.c:481 |
ef317cd5 | 8935 | msgid "read objects from stdin" |
07432cef | 8936 | msgstr "从标准输入读取对象" |
ef317cd5 | 8937 | |
276ceeaa | 8938 | #: builtin/notes.c:483 |
ef317cd5 | 8939 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 8940 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 8941 | |
276ceeaa | 8942 | #: builtin/notes.c:501 |
c04f5ac3 JX |
8943 | msgid "too few parameters" |
8944 | msgstr "参数太少" | |
8945 | ||
276ceeaa | 8946 | #: builtin/notes.c:522 |
c04f5ac3 JX |
8947 | #, c-format |
8948 | msgid "" | |
8949 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
8950 | "existing notes" | |
8951 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
8952 | ||
276ceeaa | 8953 | #: builtin/notes.c:534 |
c04f5ac3 JX |
8954 | #, c-format |
8955 | msgid "Missing notes on source object %s. Cannot copy." | |
8956 | msgstr "源对象 %s 缺少注解。不能拷贝。" | |
8957 | ||
276ceeaa | 8958 | #: builtin/notes.c:586 |
ef317cd5 JX |
8959 | #, c-format |
8960 | msgid "" | |
8961 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
8962 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
8963 | msgstr "" | |
8964 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
8965 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
8966 | ||
5b04ee3b | 8967 | #: builtin/notes.c:768 |
ef317cd5 | 8968 | msgid "General options" |
07432cef | 8969 | msgstr "通用选项" |
ef317cd5 | 8970 | |
5b04ee3b | 8971 | #: builtin/notes.c:770 |
ef317cd5 | 8972 | msgid "Merge options" |
07432cef | 8973 | msgstr "合并选项" |
ef317cd5 | 8974 | |
5b04ee3b | 8975 | #: builtin/notes.c:772 |
ef317cd5 JX |
8976 | msgid "" |
8977 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
8978 | "cat_sort_uniq)" | |
07432cef | 8979 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 8980 | |
5b04ee3b | 8981 | #: builtin/notes.c:774 |
ef317cd5 | 8982 | msgid "Committing unmerged notes" |
07432cef | 8983 | msgstr "提交未合并的注解" |
ef317cd5 | 8984 | |
5b04ee3b | 8985 | #: builtin/notes.c:776 |
ef317cd5 | 8986 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 8987 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 8988 | |
5b04ee3b | 8989 | #: builtin/notes.c:778 |
ef317cd5 | 8990 | msgid "Aborting notes merge resolution" |
07432cef | 8991 | msgstr "中止注解合并的方案" |
ef317cd5 | 8992 | |
5b04ee3b | 8993 | #: builtin/notes.c:780 |
ef317cd5 | 8994 | msgid "abort notes merge" |
07432cef | 8995 | msgstr "中止注解合并" |
ef317cd5 | 8996 | |
5b04ee3b | 8997 | #: builtin/notes.c:857 |
1b7f4a34 JX |
8998 | #, c-format |
8999 | msgid "A notes merge into %s is already in-progress at %s" | |
9000 | msgstr "一个到 %s 的注解合并已经在 %s 执行中" | |
9001 | ||
5b04ee3b | 9002 | #: builtin/notes.c:884 |
ef317cd5 JX |
9003 | #, c-format |
9004 | msgid "Object %s has no note\n" | |
9005 | msgstr "对象 %s 没有注解\n" | |
9006 | ||
5b04ee3b | 9007 | #: builtin/notes.c:896 |
ef317cd5 | 9008 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 9009 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 9010 | |
5b04ee3b | 9011 | #: builtin/notes.c:899 |
ef317cd5 | 9012 | msgid "read object names from the standard input" |
07432cef | 9013 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 9014 | |
5b04ee3b | 9015 | #: builtin/notes.c:980 |
6c94aba5 | 9016 | msgid "notes-ref" |
07432cef | 9017 | msgstr "注解引用" |
ef317cd5 | 9018 | |
5b04ee3b | 9019 | #: builtin/notes.c:981 |
814ff314 | 9020 | msgid "use notes from <notes-ref>" |
07432cef | 9021 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 9022 | |
5b04ee3b | 9023 | #: builtin/notes.c:1016 builtin/remote.c:1628 |
ef317cd5 JX |
9024 | #, c-format |
9025 | msgid "Unknown subcommand: %s" | |
9026 | msgstr "未知子命令:%s" | |
9027 | ||
220c313c | 9028 | #: builtin/pack-objects.c:28 |
1b7f4a34 JX |
9029 | msgid "" |
9030 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" | |
9031 | msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 9032 | |
220c313c | 9033 | #: builtin/pack-objects.c:29 |
1b7f4a34 JX |
9034 | msgid "" |
9035 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" | |
9036 | msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 9037 | |
814ff314 | 9038 | #: builtin/pack-objects.c:175 builtin/pack-objects.c:178 |
ef317cd5 JX |
9039 | #, c-format |
9040 | msgid "deflate error (%d)" | |
9041 | msgstr "压缩错误 (%d)" | |
9042 | ||
5b04ee3b JX |
9043 | #: builtin/pack-objects.c:763 |
9044 | msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" | |
9045 | msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个" | |
9046 | ||
9047 | #: builtin/pack-objects.c:776 | |
6c94aba5 JX |
9048 | msgid "Writing objects" |
9049 | msgstr "写入对象中" | |
9050 | ||
5b04ee3b | 9051 | #: builtin/pack-objects.c:1017 |
6c94aba5 JX |
9052 | msgid "disabling bitmap writing, as some objects are not being packed" |
9053 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" | |
9054 | ||
5b04ee3b | 9055 | #: builtin/pack-objects.c:2177 |
6c94aba5 JX |
9056 | msgid "Compressing objects" |
9057 | msgstr "压缩对象中" | |
9058 | ||
5b04ee3b | 9059 | #: builtin/pack-objects.c:2563 |
ef317cd5 JX |
9060 | #, c-format |
9061 | msgid "unsupported index version %s" | |
9062 | msgstr "不支持的索引版本 %s" | |
9063 | ||
5b04ee3b | 9064 | #: builtin/pack-objects.c:2567 |
ef317cd5 JX |
9065 | #, c-format |
9066 | msgid "bad index version '%s'" | |
9067 | msgstr "坏的索引版本 '%s'" | |
9068 | ||
5b04ee3b | 9069 | #: builtin/pack-objects.c:2597 |
ef317cd5 | 9070 | msgid "do not show progress meter" |
07432cef | 9071 | msgstr "不显示进度表" |
ef317cd5 | 9072 | |
5b04ee3b | 9073 | #: builtin/pack-objects.c:2599 |
ef317cd5 | 9074 | msgid "show progress meter" |
07432cef | 9075 | msgstr "显示进度表" |
ef317cd5 | 9076 | |
5b04ee3b | 9077 | #: builtin/pack-objects.c:2601 |
ef317cd5 | 9078 | msgid "show progress meter during object writing phase" |
07432cef | 9079 | msgstr "在对象写入阶段显示进度表" |
ef317cd5 | 9080 | |
5b04ee3b | 9081 | #: builtin/pack-objects.c:2604 |
ef317cd5 | 9082 | msgid "similar to --all-progress when progress meter is shown" |
07432cef | 9083 | msgstr "当进度表显示时类似于 --all-progress" |
ef317cd5 | 9084 | |
5b04ee3b | 9085 | #: builtin/pack-objects.c:2605 |
ef317cd5 | 9086 | msgid "version[,offset]" |
07432cef | 9087 | msgstr "版本[,偏移]" |
ef317cd5 | 9088 | |
5b04ee3b | 9089 | #: builtin/pack-objects.c:2606 |
ef317cd5 | 9090 | msgid "write the pack index file in the specified idx format version" |
07432cef | 9091 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 9092 | |
5b04ee3b | 9093 | #: builtin/pack-objects.c:2609 |
ef317cd5 | 9094 | msgid "maximum size of each output pack file" |
07432cef | 9095 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 9096 | |
5b04ee3b | 9097 | #: builtin/pack-objects.c:2611 |
ef317cd5 | 9098 | msgid "ignore borrowed objects from alternate object store" |
160fb2b2 | 9099 | msgstr "忽略从备用对象存储里借用对象" |
ef317cd5 | 9100 | |
5b04ee3b | 9101 | #: builtin/pack-objects.c:2613 |
ef317cd5 | 9102 | msgid "ignore packed objects" |
07432cef | 9103 | msgstr "忽略包对象" |
ef317cd5 | 9104 | |
5b04ee3b | 9105 | #: builtin/pack-objects.c:2615 |
ef317cd5 | 9106 | msgid "limit pack window by objects" |
07432cef | 9107 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 9108 | |
5b04ee3b | 9109 | #: builtin/pack-objects.c:2617 |
ef317cd5 | 9110 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 9111 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 9112 | |
5b04ee3b | 9113 | #: builtin/pack-objects.c:2619 |
ef317cd5 | 9114 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 9115 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 9116 | |
5b04ee3b | 9117 | #: builtin/pack-objects.c:2621 |
ef317cd5 | 9118 | msgid "reuse existing deltas" |
07432cef | 9119 | msgstr "重用已存在的 deltas" |
ef317cd5 | 9120 | |
5b04ee3b | 9121 | #: builtin/pack-objects.c:2623 |
ef317cd5 | 9122 | msgid "reuse existing objects" |
07432cef | 9123 | msgstr "重用已存在的对象" |
ef317cd5 | 9124 | |
5b04ee3b | 9125 | #: builtin/pack-objects.c:2625 |
ef317cd5 | 9126 | msgid "use OFS_DELTA objects" |
07432cef | 9127 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 9128 | |
5b04ee3b | 9129 | #: builtin/pack-objects.c:2627 |
ef317cd5 | 9130 | msgid "use threads when searching for best delta matches" |
07432cef | 9131 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 9132 | |
5b04ee3b | 9133 | #: builtin/pack-objects.c:2629 |
ef317cd5 | 9134 | msgid "do not create an empty pack output" |
07432cef | 9135 | msgstr "不创建空的包输出" |
ef317cd5 | 9136 | |
5b04ee3b | 9137 | #: builtin/pack-objects.c:2631 |
ef317cd5 | 9138 | msgid "read revision arguments from standard input" |
d9d56b23 | 9139 | msgstr "从标准输入读取版本号参数" |
ef317cd5 | 9140 | |
5b04ee3b | 9141 | #: builtin/pack-objects.c:2633 |
ef317cd5 | 9142 | msgid "limit the objects to those that are not yet packed" |
07432cef | 9143 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 9144 | |
5b04ee3b | 9145 | #: builtin/pack-objects.c:2636 |
ef317cd5 | 9146 | msgid "include objects reachable from any reference" |
07432cef | 9147 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 9148 | |
5b04ee3b | 9149 | #: builtin/pack-objects.c:2639 |
ef317cd5 | 9150 | msgid "include objects referred by reflog entries" |
07432cef | 9151 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 9152 | |
5b04ee3b | 9153 | #: builtin/pack-objects.c:2642 |
220c313c JX |
9154 | msgid "include objects referred to by the index" |
9155 | msgstr "包括被索引引用到的对象" | |
9156 | ||
5b04ee3b | 9157 | #: builtin/pack-objects.c:2645 |
ef317cd5 | 9158 | msgid "output pack to stdout" |
07432cef | 9159 | msgstr "输出包到标准输出" |
ef317cd5 | 9160 | |
5b04ee3b | 9161 | #: builtin/pack-objects.c:2647 |
ef317cd5 | 9162 | msgid "include tag objects that refer to objects to be packed" |
53438e8f | 9163 | msgstr "包括那些引用了待打包对象的标签对象" |
ef317cd5 | 9164 | |
5b04ee3b | 9165 | #: builtin/pack-objects.c:2649 |
ef317cd5 | 9166 | msgid "keep unreachable objects" |
07432cef | 9167 | msgstr "维持不可达的对象" |
ef317cd5 | 9168 | |
5b04ee3b | 9169 | #: builtin/pack-objects.c:2650 parse-options.h:142 |
ef317cd5 JX |
9170 | msgid "time" |
9171 | msgstr "时间" | |
9172 | ||
5b04ee3b | 9173 | #: builtin/pack-objects.c:2651 |
ef317cd5 | 9174 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 9175 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 9176 | |
5b04ee3b | 9177 | #: builtin/pack-objects.c:2654 |
ef317cd5 | 9178 | msgid "create thin packs" |
07432cef | 9179 | msgstr "创建精简包" |
ef317cd5 | 9180 | |
5b04ee3b | 9181 | #: builtin/pack-objects.c:2656 |
04cb2f28 | 9182 | msgid "create packs suitable for shallow fetches" |
160fb2b2 | 9183 | msgstr "创建适合浅克隆仓库获取的包" |
04cb2f28 | 9184 | |
5b04ee3b | 9185 | #: builtin/pack-objects.c:2658 |
ef317cd5 | 9186 | msgid "ignore packs that have companion .keep file" |
07432cef | 9187 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 9188 | |
5b04ee3b | 9189 | #: builtin/pack-objects.c:2660 |
ef317cd5 | 9190 | msgid "pack compression level" |
07432cef | 9191 | msgstr "打包压缩级别" |
ef317cd5 | 9192 | |
5b04ee3b | 9193 | #: builtin/pack-objects.c:2662 |
ef317cd5 | 9194 | msgid "do not hide commits by grafts" |
cfff71a9 | 9195 | msgstr "显示被嫁接隐藏的提交" |
ef317cd5 | 9196 | |
5b04ee3b | 9197 | #: builtin/pack-objects.c:2664 |
6c94aba5 JX |
9198 | msgid "use a bitmap index if available to speed up counting objects" |
9199 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" | |
9200 | ||
5b04ee3b | 9201 | #: builtin/pack-objects.c:2666 |
6c94aba5 JX |
9202 | msgid "write a bitmap index together with the pack index" |
9203 | msgstr "在建立包索引的同时创建 bitmap 索引" | |
9204 | ||
5b04ee3b | 9205 | #: builtin/pack-objects.c:2757 |
6c94aba5 JX |
9206 | msgid "Counting objects" |
9207 | msgstr "对象计数中" | |
9208 | ||
ef317cd5 | 9209 | #: builtin/pack-refs.c:6 |
814ff314 JX |
9210 | msgid "git pack-refs [<options>]" |
9211 | msgstr "git pack-refs [<选项>]" | |
c04f5ac3 | 9212 | |
ef317cd5 JX |
9213 | #: builtin/pack-refs.c:14 |
9214 | msgid "pack everything" | |
07432cef | 9215 | msgstr "打包一切" |
c04f5ac3 | 9216 | |
ef317cd5 JX |
9217 | #: builtin/pack-refs.c:15 |
9218 | msgid "prune loose refs (default)" | |
07432cef | 9219 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 9220 | |
ef317cd5 | 9221 | #: builtin/prune-packed.c:7 |
814ff314 JX |
9222 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
9223 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
6792b93b | 9224 | |
220c313c | 9225 | #: builtin/prune-packed.c:40 |
6c94aba5 JX |
9226 | msgid "Removing duplicate objects" |
9227 | msgstr "正在删除重复对象" | |
9228 | ||
5bb01d4f | 9229 | #: builtin/prune.c:11 |
ef317cd5 | 9230 | msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" |
07432cef | 9231 | msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" |
7ac1c0ad | 9232 | |
5b04ee3b | 9233 | #: builtin/prune.c:105 builtin/worktree.c:125 |
1b7f4a34 JX |
9234 | msgid "do not remove, show only" |
9235 | msgstr "不删除,只显示" | |
9236 | ||
5b04ee3b | 9237 | #: builtin/prune.c:106 builtin/worktree.c:126 |
1b7f4a34 JX |
9238 | msgid "report pruned objects" |
9239 | msgstr "报告清除的对象" | |
9240 | ||
5b04ee3b | 9241 | #: builtin/prune.c:109 builtin/worktree.c:128 |
1b7f4a34 JX |
9242 | msgid "expire objects older than <time>" |
9243 | msgstr "使早于给定时间的对象过期" | |
9244 | ||
94550ed3 JX |
9245 | #: builtin/prune.c:123 |
9246 | msgid "cannot prune in a precious-objects repo" | |
9247 | msgstr "不能在珍品仓库中执行清理操作" | |
9248 | ||
276ceeaa | 9249 | #: builtin/pull.c:72 |
94550ed3 | 9250 | msgid "git pull [<options>] [<repository> [<refspec>...]]" |
1b7f4a34 JX |
9251 | msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" |
9252 | ||
5b04ee3b | 9253 | #: builtin/pull.c:120 |
1b7f4a34 JX |
9254 | msgid "Options related to merging" |
9255 | msgstr "和合并相关的选项" | |
9256 | ||
5b04ee3b | 9257 | #: builtin/pull.c:123 |
1b7f4a34 JX |
9258 | msgid "incorporate changes by rebasing rather than merging" |
9259 | msgstr "使用变基操作取代合并操作以合入修改" | |
9260 | ||
5b04ee3b | 9261 | #: builtin/pull.c:147 builtin/revert.c:105 |
1b7f4a34 JX |
9262 | msgid "allow fast-forward" |
9263 | msgstr "允许快进式" | |
9264 | ||
5b04ee3b | 9265 | #: builtin/pull.c:153 |
1b7f4a34 JX |
9266 | msgid "verify that the named commit has a valid GPG signature" |
9267 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" | |
9268 | ||
5b04ee3b JX |
9269 | #: builtin/pull.c:156 |
9270 | msgid "automatically stash/stash pop before and after rebase" | |
9271 | msgstr "自动在变基操作前后执行 stash/stash pop" | |
9272 | ||
9273 | #: builtin/pull.c:172 | |
1b7f4a34 JX |
9274 | msgid "Options related to fetching" |
9275 | msgstr "和获取相关的参数" | |
9276 | ||
5b04ee3b | 9277 | #: builtin/pull.c:194 |
276ceeaa JX |
9278 | msgid "number of submodules pulled in parallel" |
9279 | msgstr "并发拉取的子模组的数量" | |
9280 | ||
5b04ee3b | 9281 | #: builtin/pull.c:283 |
1b7f4a34 JX |
9282 | #, c-format |
9283 | msgid "Invalid value for pull.ff: %s" | |
9284 | msgstr "pull.ff 的取值无效:%s" | |
9285 | ||
5b04ee3b | 9286 | #: builtin/pull.c:379 |
1b7f4a34 JX |
9287 | msgid "Cannot pull with rebase: You have unstaged changes." |
9288 | msgstr "无法通过变基方式拉取:您有未暂存的变更。" | |
9289 | ||
5b04ee3b | 9290 | #: builtin/pull.c:385 |
1b7f4a34 JX |
9291 | msgid "Additionally, your index contains uncommitted changes." |
9292 | msgstr "而且您的索引中包含未提交的变更。" | |
9293 | ||
5b04ee3b | 9294 | #: builtin/pull.c:387 |
1b7f4a34 JX |
9295 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." |
9296 | msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。" | |
9297 | ||
5b04ee3b | 9298 | #: builtin/pull.c:463 |
1b7f4a34 JX |
9299 | msgid "" |
9300 | "There is no candidate for rebasing against among the refs that you just " | |
9301 | "fetched." | |
9302 | msgstr "在您刚刚获取到的引用中没有变基操作的候选。" | |
9303 | ||
5b04ee3b | 9304 | #: builtin/pull.c:465 |
1b7f4a34 JX |
9305 | msgid "" |
9306 | "There are no candidates for merging among the refs that you just fetched." | |
9307 | msgstr "在您刚刚获取到的引用中没有合并操作的候选。" | |
9308 | ||
5b04ee3b | 9309 | #: builtin/pull.c:466 |
1b7f4a34 JX |
9310 | msgid "" |
9311 | "Generally this means that you provided a wildcard refspec which had no\n" | |
9312 | "matches on the remote end." | |
9313 | msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" | |
9314 | ||
5b04ee3b | 9315 | #: builtin/pull.c:469 |
1b7f4a34 JX |
9316 | #, c-format |
9317 | msgid "" | |
9318 | "You asked to pull from the remote '%s', but did not specify\n" | |
9319 | "a branch. Because this is not the default configured remote\n" | |
9320 | "for your current branch, you must specify a branch on the command line." | |
9321 | msgstr "" | |
9322 | "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n" | |
9323 | "分支默认的远程仓库,您必须在命令行中指定一个分支名。" | |
9324 | ||
5b04ee3b | 9325 | #: builtin/pull.c:474 git-parse-remote.sh:73 |
1b7f4a34 JX |
9326 | msgid "You are not currently on a branch." |
9327 | msgstr "您当前不在一个分支上。" | |
9328 | ||
5b04ee3b | 9329 | #: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 |
1b7f4a34 JX |
9330 | msgid "Please specify which branch you want to rebase against." |
9331 | msgstr "请指定您要变基到哪一个分支。" | |
9332 | ||
5b04ee3b | 9333 | #: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 |
1b7f4a34 JX |
9334 | msgid "Please specify which branch you want to merge with." |
9335 | msgstr "请指定您要合并哪一个分支。" | |
9336 | ||
5b04ee3b | 9337 | #: builtin/pull.c:479 builtin/pull.c:494 |
1b7f4a34 JX |
9338 | msgid "See git-pull(1) for details." |
9339 | msgstr "详见 git-pull(1)。" | |
9340 | ||
5b04ee3b JX |
9341 | #: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 |
9342 | #: git-parse-remote.sh:64 | |
9343 | msgid "<remote>" | |
9344 | msgstr "<远程>" | |
9345 | ||
9346 | #: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 | |
9347 | #: git-parse-remote.sh:65 | |
9348 | msgid "<branch>" | |
9349 | msgstr "<分支>" | |
9350 | ||
9351 | #: builtin/pull.c:489 git-parse-remote.sh:75 | |
1b7f4a34 JX |
9352 | msgid "There is no tracking information for the current branch." |
9353 | msgstr "当前分支没有跟踪信息。" | |
9354 | ||
5b04ee3b | 9355 | #: builtin/pull.c:498 git-parse-remote.sh:95 |
1b7f4a34 | 9356 | msgid "" |
5b04ee3b JX |
9357 | "If you wish to set tracking information for this branch you can do so with:" |
9358 | msgstr "如果您想要为此分支创建跟踪信息,您可以执行:" | |
7ac1c0ad | 9359 | |
5b04ee3b | 9360 | #: builtin/pull.c:503 |
1b7f4a34 JX |
9361 | #, c-format |
9362 | msgid "" | |
9363 | "Your configuration specifies to merge with the ref '%s'\n" | |
9364 | "from the remote, but no such ref was fetched." | |
9365 | msgstr "" | |
9366 | "您的配置中指定要合并远程的引用 '%s',\n" | |
9367 | "但是没有获取到这个引用。" | |
7ac1c0ad | 9368 | |
5b04ee3b JX |
9369 | #: builtin/pull.c:864 |
9370 | msgid "--[no-]autostash option is only valid with --rebase." | |
9371 | msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" | |
9372 | ||
9373 | #: builtin/pull.c:872 | |
1b7f4a34 JX |
9374 | msgid "Updating an unborn branch with changes added to the index." |
9375 | msgstr "更新尚未诞生的分支,变更添加至索引。" | |
9376 | ||
5b04ee3b | 9377 | #: builtin/pull.c:900 |
1b7f4a34 JX |
9378 | #, c-format |
9379 | msgid "" | |
9380 | "fetch updated the current branch head.\n" | |
9381 | "fast-forwarding your working tree from\n" | |
9382 | "commit %s." | |
9383 | msgstr "" | |
9384 | "fetch 更新了当前的分支。快进您的工作区\n" | |
9385 | "至提交 %s。" | |
ef317cd5 | 9386 | |
5b04ee3b | 9387 | #: builtin/pull.c:905 |
1b7f4a34 JX |
9388 | #, c-format |
9389 | msgid "" | |
9390 | "Cannot fast-forward your working tree.\n" | |
9391 | "After making sure that you saved anything precious from\n" | |
9392 | "$ git diff %s\n" | |
9393 | "output, run\n" | |
9394 | "$ git reset --hard\n" | |
9395 | "to recover." | |
9396 | msgstr "" | |
9397 | "您当前的工作区无法执行快进操作。\n" | |
9398 | "首先执行如下命令:\n" | |
9399 | "$ git diff %s\n" | |
9400 | "以确认所有有用的数据均已保存。然后执行下面的命令\n" | |
9401 | "$ git reset --hard\n" | |
9402 | "恢复之前的状态。" | |
9403 | ||
5b04ee3b | 9404 | #: builtin/pull.c:920 |
1b7f4a34 JX |
9405 | msgid "Cannot merge multiple branches into empty head." |
9406 | msgstr "无法将多个分支合并到空分支。" | |
9407 | ||
5b04ee3b | 9408 | #: builtin/pull.c:924 |
1b7f4a34 JX |
9409 | msgid "Cannot rebase onto multiple branches." |
9410 | msgstr "无法变基到多个分支。" | |
9411 | ||
89f80d72 | 9412 | #: builtin/push.c:16 |
ef317cd5 | 9413 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 9414 | msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" |
7ac1c0ad | 9415 | |
276ceeaa | 9416 | #: builtin/push.c:89 |
c04f5ac3 | 9417 | msgid "tag shorthand without <tag>" |
55a16ee4 | 9418 | msgstr "标签后面未提供 <标签> 参数" |
c04f5ac3 | 9419 | |
276ceeaa | 9420 | #: builtin/push.c:99 |
c04f5ac3 | 9421 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 9422 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 9423 | |
276ceeaa | 9424 | #: builtin/push.c:143 |
8ada9598 JX |
9425 | msgid "" |
9426 | "\n" | |
9427 | "To choose either option permanently, see push.default in 'git help config'." | |
9428 | msgstr "" | |
81809b99 JX |
9429 | "\n" |
9430 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 9431 | |
276ceeaa | 9432 | #: builtin/push.c:146 |
8ada9598 JX |
9433 | #, c-format |
9434 | msgid "" | |
9435 | "The upstream branch of your current branch does not match\n" | |
9436 | "the name of your current branch. To push to the upstream branch\n" | |
9437 | "on the remote, use\n" | |
9438 | "\n" | |
9439 | " git push %s HEAD:%s\n" | |
9440 | "\n" | |
9441 | "To push to the branch of the same name on the remote, use\n" | |
9442 | "\n" | |
9443 | " git push %s %s\n" | |
9444 | "%s" | |
9445 | msgstr "" | |
81809b99 JX |
9446 | "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n" |
9447 | "上游分支,使用\n" | |
9448 | "\n" | |
9449 | " git push %s HEAD:%s\n" | |
9450 | "\n" | |
9451 | "为推送至远程同名分支,使用\n" | |
9452 | "\n" | |
9453 | " git push %s %s\n" | |
9454 | "%s" | |
8ada9598 | 9455 | |
276ceeaa | 9456 | #: builtin/push.c:161 |
c04f5ac3 JX |
9457 | #, c-format |
9458 | msgid "" | |
9459 | "You are not currently on a branch.\n" | |
9460 | "To push the history leading to the current (detached HEAD)\n" | |
9461 | "state now, use\n" | |
9462 | "\n" | |
9463 | " git push %s HEAD:<name-of-remote-branch>\n" | |
9464 | msgstr "" | |
9465 | "您当前不在一个分支上。\n" | |
90e6ef53 | 9466 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 | 9467 | "\n" |
d9d56b23 | 9468 | " git push %s HEAD:<远程分支名字>\n" |
c04f5ac3 | 9469 | |
276ceeaa | 9470 | #: builtin/push.c:175 |
c04f5ac3 JX |
9471 | #, c-format |
9472 | msgid "" | |
9473 | "The current branch %s has no upstream branch.\n" | |
9474 | "To push the current branch and set the remote as upstream, use\n" | |
9475 | "\n" | |
9476 | " git push --set-upstream %s %s\n" | |
9477 | msgstr "" | |
9478 | "当前分支 %s 没有对应的上游分支。\n" | |
9479 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
9480 | "\n" | |
9481 | " git push --set-upstream %s %s\n" | |
9482 | ||
276ceeaa | 9483 | #: builtin/push.c:183 |
c04f5ac3 JX |
9484 | #, c-format |
9485 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
9486 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
9487 | ||
276ceeaa | 9488 | #: builtin/push.c:186 |
73a60cd2 JX |
9489 | #, c-format |
9490 | msgid "" | |
9491 | "You are pushing to remote '%s', which is not the upstream of\n" | |
9492 | "your current branch '%s', without telling me what to push\n" | |
9493 | "to update which remote branch." | |
9494 | msgstr "" | |
9495 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
9496 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
9497 | ||
276ceeaa | 9498 | #: builtin/push.c:242 |
c04f5ac3 JX |
9499 | msgid "" |
9500 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
160fb2b2 | 9501 | msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 9502 | |
276ceeaa | 9503 | #: builtin/push.c:249 |
170e9899 JX |
9504 | msgid "" |
9505 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
9506 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
9507 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
9508 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
9509 | msgstr "" | |
eff6d3a9 | 9510 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 9511 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 9512 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 9513 | |
276ceeaa | 9514 | #: builtin/push.c:255 |
170e9899 JX |
9515 | msgid "" |
9516 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
9517 | "counterpart. Check out this branch and integrate the remote changes\n" |
9518 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
9519 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
9520 | msgstr "" | |
eff6d3a9 | 9521 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 9522 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 9523 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 9524 | |
276ceeaa | 9525 | #: builtin/push.c:261 |
07432cef | 9526 | msgid "" |
a77c07d9 JX |
9527 | "Updates were rejected because the remote contains work that you do\n" |
9528 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
9529 | "to the same ref. You may want to first integrate the remote changes\n" |
9530 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
9531 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
9532 | msgstr "" | |
160fb2b2 JX |
9533 | "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" |
9534 | "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" | |
2e8451e8 | 9535 | "(如 'git pull ...')。\n" |
a77c07d9 JX |
9536 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
9537 | ||
276ceeaa | 9538 | #: builtin/push.c:268 |
a77c07d9 | 9539 | msgid "Updates were rejected because the tag already exists in the remote." |
55a16ee4 | 9540 | msgstr "更新被拒绝,因为该标签在远程已经存在。" |
a77c07d9 | 9541 | |
276ceeaa | 9542 | #: builtin/push.c:271 |
a77c07d9 JX |
9543 | msgid "" |
9544 | "You cannot update a remote ref that points at a non-commit object,\n" | |
9545 | "or update a remote ref to make it point at a non-commit object,\n" | |
9546 | "without using the '--force' option.\n" | |
9547 | msgstr "" | |
9548 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
9549 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 9550 | |
276ceeaa | 9551 | #: builtin/push.c:331 |
c04f5ac3 JX |
9552 | #, c-format |
9553 | msgid "Pushing to %s\n" | |
9554 | msgstr "推送到 %s\n" | |
9555 | ||
276ceeaa | 9556 | #: builtin/push.c:335 |
c04f5ac3 JX |
9557 | #, c-format |
9558 | msgid "failed to push some refs to '%s'" | |
9559 | msgstr "无法推送一些引用到 '%s'" | |
9560 | ||
276ceeaa | 9561 | #: builtin/push.c:365 |
c04f5ac3 JX |
9562 | #, c-format |
9563 | msgid "bad repository '%s'" | |
160fb2b2 | 9564 | msgstr "坏的仓库 '%s'" |
c04f5ac3 | 9565 | |
276ceeaa | 9566 | #: builtin/push.c:366 |
c04f5ac3 JX |
9567 | msgid "" |
9568 | "No configured push destination.\n" | |
9569 | "Either specify the URL from the command-line or configure a remote " | |
9570 | "repository using\n" | |
9571 | "\n" | |
9572 | " git remote add <name> <url>\n" | |
9573 | "\n" | |
9574 | "and then push using the remote name\n" | |
9575 | "\n" | |
9576 | " git push <name>\n" | |
9577 | msgstr "" | |
90e6ef53 | 9578 | "没有配置推送目标。\n" |
4375c10e | 9579 | "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n" |
c04f5ac3 | 9580 | "\n" |
d9d56b23 | 9581 | " git remote add <名称> <地址>\n" |
c04f5ac3 | 9582 | "\n" |
160fb2b2 | 9583 | "然后使用该远程仓库名执行推送\n" |
c04f5ac3 | 9584 | "\n" |
d9d56b23 | 9585 | " git push <名称>\n" |
c04f5ac3 | 9586 | |
276ceeaa | 9587 | #: builtin/push.c:381 |
c04f5ac3 JX |
9588 | msgid "--all and --tags are incompatible" |
9589 | msgstr "--all 和 --tags 不兼容" | |
9590 | ||
276ceeaa | 9591 | #: builtin/push.c:382 |
c04f5ac3 | 9592 | msgid "--all can't be combined with refspecs" |
160fb2b2 | 9593 | msgstr "--all 不能和引用规格同时使用" |
c04f5ac3 | 9594 | |
276ceeaa | 9595 | #: builtin/push.c:387 |
c04f5ac3 JX |
9596 | msgid "--mirror and --tags are incompatible" |
9597 | msgstr "--mirror 和 --tags 不兼容" | |
9598 | ||
276ceeaa | 9599 | #: builtin/push.c:388 |
c04f5ac3 | 9600 | msgid "--mirror can't be combined with refspecs" |
160fb2b2 | 9601 | msgstr "--mirror 不能和引用规格同时使用" |
c04f5ac3 | 9602 | |
276ceeaa | 9603 | #: builtin/push.c:393 |
c04f5ac3 JX |
9604 | msgid "--all and --mirror are incompatible" |
9605 | msgstr "--all 和 --mirror 不兼容" | |
9606 | ||
276ceeaa | 9607 | #: builtin/push.c:505 |
ef317cd5 | 9608 | msgid "repository" |
160fb2b2 | 9609 | msgstr "仓库" |
ef317cd5 | 9610 | |
276ceeaa | 9611 | #: builtin/push.c:506 builtin/send-pack.c:161 |
ef317cd5 | 9612 | msgid "push all refs" |
07432cef | 9613 | msgstr "推送所有引用" |
ef317cd5 | 9614 | |
276ceeaa | 9615 | #: builtin/push.c:507 builtin/send-pack.c:163 |
ef317cd5 | 9616 | msgid "mirror all refs" |
07432cef | 9617 | msgstr "镜像所有引用" |
ef317cd5 | 9618 | |
276ceeaa | 9619 | #: builtin/push.c:509 |
ef317cd5 | 9620 | msgid "delete refs" |
07432cef | 9621 | msgstr "删除引用" |
ef317cd5 | 9622 | |
276ceeaa | 9623 | #: builtin/push.c:510 |
ef317cd5 | 9624 | msgid "push tags (can't be used with --all or --mirror)" |
55a16ee4 | 9625 | msgstr "推送标签(不能使用 --all or --mirror)" |
ef317cd5 | 9626 | |
276ceeaa | 9627 | #: builtin/push.c:513 builtin/send-pack.c:164 |
ef317cd5 JX |
9628 | msgid "force updates" |
9629 | msgstr "强制更新" | |
9630 | ||
276ceeaa | 9631 | #: builtin/push.c:515 builtin/send-pack.c:175 |
90314792 JX |
9632 | msgid "refname>:<expect" |
9633 | msgstr "引用名>:<期望值" | |
9634 | ||
276ceeaa | 9635 | #: builtin/push.c:516 builtin/send-pack.c:176 |
90314792 JX |
9636 | msgid "require old value of ref to be at this value" |
9637 | msgstr "要求引用旧的取值为设定值" | |
9638 | ||
276ceeaa | 9639 | #: builtin/push.c:519 |
ef317cd5 | 9640 | msgid "control recursive pushing of submodules" |
07432cef | 9641 | msgstr "控制子模组的递归推送" |
ef317cd5 | 9642 | |
276ceeaa | 9643 | #: builtin/push.c:521 builtin/send-pack.c:169 |
ef317cd5 | 9644 | msgid "use thin pack" |
07432cef | 9645 | msgstr "使用精简打包" |
ef317cd5 | 9646 | |
276ceeaa | 9647 | #: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158 |
1b7f4a34 | 9648 | #: builtin/send-pack.c:159 |
ef317cd5 | 9649 | msgid "receive pack program" |
07432cef | 9650 | msgstr "接收包程序" |
ef317cd5 | 9651 | |
276ceeaa | 9652 | #: builtin/push.c:524 |
ef317cd5 | 9653 | msgid "set upstream for git pull/status" |
07432cef | 9654 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 9655 | |
276ceeaa | 9656 | #: builtin/push.c:527 |
ef317cd5 | 9657 | msgid "prune locally removed refs" |
07432cef | 9658 | msgstr "清除本地删除的引用" |
ef317cd5 | 9659 | |
276ceeaa | 9660 | #: builtin/push.c:529 |
a77c07d9 JX |
9661 | msgid "bypass pre-push hook" |
9662 | msgstr "绕过 pre-push 钩子" | |
9663 | ||
276ceeaa | 9664 | #: builtin/push.c:530 |
1003b3a5 | 9665 | msgid "push missing but relevant tags" |
55a16ee4 | 9666 | msgstr "推送缺失但有关的标签" |
1003b3a5 | 9667 | |
276ceeaa | 9668 | #: builtin/push.c:533 builtin/send-pack.c:166 |
220c313c JX |
9669 | msgid "GPG sign the push" |
9670 | msgstr "用 GPG 为推送签名" | |
9671 | ||
276ceeaa | 9672 | #: builtin/push.c:535 builtin/send-pack.c:170 |
814ff314 JX |
9673 | msgid "request atomic transaction on remote side" |
9674 | msgstr "需要远端支持原子事务" | |
9675 | ||
276ceeaa | 9676 | #: builtin/push.c:549 |
c04f5ac3 JX |
9677 | msgid "--delete is incompatible with --all, --mirror and --tags" |
9678 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
9679 | ||
276ceeaa | 9680 | #: builtin/push.c:551 |
c04f5ac3 JX |
9681 | msgid "--delete doesn't make sense without any refs" |
9682 | msgstr "--delete 未接任何引用没有意义" | |
9683 | ||
220c313c | 9684 | #: builtin/read-tree.c:37 |
ef317cd5 | 9685 | msgid "" |
1b7f4a34 | 9686 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " |
ef317cd5 JX |
9687 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
9688 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
9689 | msgstr "" | |
1b7f4a34 | 9690 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" |
07432cef | 9691 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
1b7f4a34 | 9692 | "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" |
ef317cd5 | 9693 | |
220c313c | 9694 | #: builtin/read-tree.c:110 |
ef317cd5 | 9695 | msgid "write resulting index to <file>" |
d9d56b23 | 9696 | msgstr "将索引结果写入 <文件>" |
ef317cd5 | 9697 | |
220c313c | 9698 | #: builtin/read-tree.c:113 |
ef317cd5 | 9699 | msgid "only empty the index" |
07432cef | 9700 | msgstr "只是清空索引" |
ef317cd5 | 9701 | |
220c313c | 9702 | #: builtin/read-tree.c:115 |
ef317cd5 | 9703 | msgid "Merging" |
07432cef | 9704 | msgstr "合并" |
ef317cd5 | 9705 | |
220c313c | 9706 | #: builtin/read-tree.c:117 |
ef317cd5 | 9707 | msgid "perform a merge in addition to a read" |
07432cef | 9708 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 9709 | |
220c313c | 9710 | #: builtin/read-tree.c:119 |
ef317cd5 | 9711 | msgid "3-way merge if no file level merging required" |
160fb2b2 | 9712 | msgstr "如果没有文件级合并需要,执行三方合并" |
ef317cd5 | 9713 | |
220c313c | 9714 | #: builtin/read-tree.c:121 |
ef317cd5 | 9715 | msgid "3-way merge in presence of adds and removes" |
160fb2b2 | 9716 | msgstr "存在添加和删除时,也执行三方合并" |
ef317cd5 | 9717 | |
220c313c | 9718 | #: builtin/read-tree.c:123 |
ef317cd5 | 9719 | msgid "same as -m, but discard unmerged entries" |
07432cef | 9720 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 9721 | |
220c313c | 9722 | #: builtin/read-tree.c:124 |
ef317cd5 | 9723 | msgid "<subdirectory>/" |
07432cef | 9724 | msgstr "<子目录>/" |
ef317cd5 | 9725 | |
220c313c | 9726 | #: builtin/read-tree.c:125 |
ef317cd5 | 9727 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 9728 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 9729 | |
220c313c | 9730 | #: builtin/read-tree.c:128 |
ef317cd5 | 9731 | msgid "update working tree with merge result" |
07432cef | 9732 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 9733 | |
220c313c | 9734 | #: builtin/read-tree.c:130 |
ef317cd5 | 9735 | msgid "gitignore" |
07432cef | 9736 | msgstr "gitignore" |
ef317cd5 | 9737 | |
220c313c | 9738 | #: builtin/read-tree.c:131 |
ef317cd5 | 9739 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 9740 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 9741 | |
220c313c | 9742 | #: builtin/read-tree.c:134 |
ef317cd5 | 9743 | msgid "don't check the working tree after merging" |
07432cef | 9744 | msgstr "合并后不检查工作区" |
ef317cd5 | 9745 | |
220c313c | 9746 | #: builtin/read-tree.c:135 |
ef317cd5 | 9747 | msgid "don't update the index or the work tree" |
07432cef | 9748 | msgstr "不更新索引区和工作区" |
ef317cd5 | 9749 | |
220c313c | 9750 | #: builtin/read-tree.c:137 |
ef317cd5 | 9751 | msgid "skip applying sparse checkout filter" |
07432cef | 9752 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 9753 | |
220c313c | 9754 | #: builtin/read-tree.c:139 |
ef317cd5 | 9755 | msgid "debug unpack-trees" |
07432cef | 9756 | msgstr "调试 unpack-trees" |
ef317cd5 | 9757 | |
5b04ee3b JX |
9758 | #: builtin/receive-pack.c:25 |
9759 | msgid "git receive-pack <git-dir>" | |
9760 | msgstr "git receive-pack <git-dir>" | |
9761 | ||
9762 | #: builtin/receive-pack.c:1719 | |
9763 | msgid "quiet" | |
9764 | msgstr "静默模式" | |
9765 | ||
9766 | #: builtin/receive-pack.c:1733 | |
9767 | msgid "You must specify a directory." | |
9768 | msgstr "您必须指定一个目录。" | |
9769 | ||
276ceeaa | 9770 | #: builtin/reflog.c:423 |
2e8451e8 | 9771 | #, c-format |
1b7f4a34 | 9772 | msgid "'%s' for '%s' is not a valid timestamp" |
2e8451e8 JX |
9773 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" |
9774 | ||
276ceeaa | 9775 | #: builtin/reflog.c:540 builtin/reflog.c:545 |
2e8451e8 JX |
9776 | #, c-format |
9777 | msgid "'%s' is not a valid timestamp" | |
9778 | msgstr "'%s' 不是一个有效的时间戳" | |
9779 | ||
cfff71a9 | 9780 | #: builtin/remote.c:12 |
ef317cd5 | 9781 | msgid "git remote [-v | --verbose]" |
07432cef | 9782 | msgstr "git remote [-v | --verbose]" |
ef317cd5 | 9783 | |
cfff71a9 | 9784 | #: builtin/remote.c:13 |
ef317cd5 | 9785 | msgid "" |
814ff314 | 9786 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
ef317cd5 JX |
9787 | "mirror=<fetch|push>] <name> <url>" |
9788 | msgstr "" | |
814ff314 | 9789 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" |
d9d56b23 | 9790 | "mirror=<fetch|push>] <名称> <地址>" |
ef317cd5 | 9791 | |
94550ed3 | 9792 | #: builtin/remote.c:14 builtin/remote.c:34 |
ef317cd5 | 9793 | msgid "git remote rename <old> <new>" |
07432cef | 9794 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 | 9795 | |
94550ed3 | 9796 | #: builtin/remote.c:15 builtin/remote.c:39 |
ef317cd5 | 9797 | msgid "git remote remove <name>" |
07432cef | 9798 | msgstr "git remote remove <名称>" |
ef317cd5 | 9799 | |
94550ed3 | 9800 | #: builtin/remote.c:16 builtin/remote.c:44 |
814ff314 JX |
9801 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" |
9802 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
ef317cd5 | 9803 | |
cfff71a9 | 9804 | #: builtin/remote.c:17 |
ef317cd5 | 9805 | msgid "git remote [-v | --verbose] show [-n] <name>" |
07432cef | 9806 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 | 9807 | |
cfff71a9 | 9808 | #: builtin/remote.c:18 |
ef317cd5 | 9809 | msgid "git remote prune [-n | --dry-run] <name>" |
07432cef | 9810 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 | 9811 | |
cfff71a9 | 9812 | #: builtin/remote.c:19 |
ef317cd5 JX |
9813 | msgid "" |
9814 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 9815 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 | 9816 | |
cfff71a9 | 9817 | #: builtin/remote.c:20 |
ef317cd5 | 9818 | msgid "git remote set-branches [--add] <name> <branch>..." |
07432cef | 9819 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 | 9820 | |
94550ed3 JX |
9821 | #: builtin/remote.c:21 builtin/remote.c:70 |
9822 | msgid "git remote get-url [--push] [--all] <name>" | |
9823 | msgstr "git remote get-url [--push] [--all] <名称>" | |
9824 | ||
9825 | #: builtin/remote.c:22 builtin/remote.c:75 | |
ef317cd5 | 9826 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
07432cef | 9827 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 | 9828 | |
94550ed3 | 9829 | #: builtin/remote.c:23 builtin/remote.c:76 |
ef317cd5 | 9830 | msgid "git remote set-url --add <name> <newurl>" |
07432cef | 9831 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 | 9832 | |
94550ed3 | 9833 | #: builtin/remote.c:24 builtin/remote.c:77 |
ef317cd5 | 9834 | msgid "git remote set-url --delete <name> <url>" |
07432cef | 9835 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 | 9836 | |
94550ed3 | 9837 | #: builtin/remote.c:29 |
ef317cd5 | 9838 | msgid "git remote add [<options>] <name> <url>" |
07432cef | 9839 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 9840 | |
94550ed3 | 9841 | #: builtin/remote.c:49 |
ef317cd5 | 9842 | msgid "git remote set-branches <name> <branch>..." |
07432cef | 9843 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 | 9844 | |
94550ed3 | 9845 | #: builtin/remote.c:50 |
ef317cd5 | 9846 | msgid "git remote set-branches --add <name> <branch>..." |
07432cef | 9847 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 | 9848 | |
94550ed3 | 9849 | #: builtin/remote.c:55 |
ef317cd5 | 9850 | msgid "git remote show [<options>] <name>" |
07432cef | 9851 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 | 9852 | |
94550ed3 | 9853 | #: builtin/remote.c:60 |
ef317cd5 | 9854 | msgid "git remote prune [<options>] <name>" |
07432cef | 9855 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 | 9856 | |
94550ed3 | 9857 | #: builtin/remote.c:65 |
ef317cd5 | 9858 | msgid "git remote update [<options>] [<group> | <remote>]..." |
07432cef | 9859 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 9860 | |
94550ed3 | 9861 | #: builtin/remote.c:94 |
81809b99 | 9862 | #, c-format |
8ada9598 | 9863 | msgid "Updating %s" |
81809b99 | 9864 | msgstr "更新 %s 中" |
8ada9598 | 9865 | |
94550ed3 | 9866 | #: builtin/remote.c:126 |
8ada9598 JX |
9867 | msgid "" |
9868 | "--mirror is dangerous and deprecated; please\n" | |
9869 | "\t use --mirror=fetch or --mirror=push instead" | |
9870 | msgstr "" | |
81809b99 JX |
9871 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
9872 | "\t 或 --mirror=push" | |
8ada9598 | 9873 | |
94550ed3 | 9874 | #: builtin/remote.c:143 |
81809b99 | 9875 | #, c-format |
8ada9598 | 9876 | msgid "unknown mirror argument: %s" |
81809b99 | 9877 | msgstr "未知的镜像参数:%s" |
8ada9598 | 9878 | |
94550ed3 | 9879 | #: builtin/remote.c:159 |
ef317cd5 | 9880 | msgid "fetch the remote branches" |
07432cef | 9881 | msgstr "抓取远程的分支" |
ef317cd5 | 9882 | |
94550ed3 | 9883 | #: builtin/remote.c:161 |
ef317cd5 | 9884 | msgid "import all tags and associated objects when fetching" |
55a16ee4 | 9885 | msgstr "抓取时导入所有的标签和关联对象" |
ef317cd5 | 9886 | |
94550ed3 | 9887 | #: builtin/remote.c:164 |
ef317cd5 | 9888 | msgid "or do not fetch any tag at all (--no-tags)" |
55a16ee4 | 9889 | msgstr "或不抓取任何标签(--no-tags)" |
ef317cd5 | 9890 | |
94550ed3 | 9891 | #: builtin/remote.c:166 |
ef317cd5 | 9892 | msgid "branch(es) to track" |
07432cef | 9893 | msgstr "跟踪的分支" |
ef317cd5 | 9894 | |
94550ed3 | 9895 | #: builtin/remote.c:167 |
ef317cd5 | 9896 | msgid "master branch" |
07432cef | 9897 | msgstr "主线分支" |
ef317cd5 | 9898 | |
94550ed3 | 9899 | #: builtin/remote.c:168 |
ef317cd5 | 9900 | msgid "push|fetch" |
07432cef | 9901 | msgstr "push|fetch" |
ef317cd5 | 9902 | |
94550ed3 | 9903 | #: builtin/remote.c:169 |
ef317cd5 | 9904 | msgid "set up remote as a mirror to push to or fetch from" |
07432cef | 9905 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 9906 | |
94550ed3 | 9907 | #: builtin/remote.c:181 |
8ada9598 | 9908 | msgid "specifying a master branch makes no sense with --mirror" |
81809b99 | 9909 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 | 9910 | |
94550ed3 | 9911 | #: builtin/remote.c:183 |
8ada9598 | 9912 | msgid "specifying branches to track makes sense only with fetch mirrors" |
649900bc | 9913 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 | 9914 | |
276ceeaa | 9915 | #: builtin/remote.c:190 builtin/remote.c:633 |
81809b99 | 9916 | #, c-format |
8ada9598 | 9917 | msgid "remote %s already exists." |
81809b99 | 9918 | msgstr "远程 %s 已经存在。" |
8ada9598 | 9919 | |
276ceeaa | 9920 | #: builtin/remote.c:194 builtin/remote.c:637 |
81809b99 | 9921 | #, c-format |
8ada9598 | 9922 | msgid "'%s' is not a valid remote name" |
81809b99 | 9923 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 | 9924 | |
276ceeaa | 9925 | #: builtin/remote.c:234 |
81809b99 | 9926 | #, c-format |
8ada9598 | 9927 | msgid "Could not setup master '%s'" |
81809b99 | 9928 | msgstr "无法设置 master '%s'" |
8ada9598 | 9929 | |
276ceeaa | 9930 | #: builtin/remote.c:336 |
81809b99 | 9931 | #, c-format |
8ada9598 | 9932 | msgid "Could not get fetch map for refspec %s" |
160fb2b2 | 9933 | msgstr "无法得到引用规格 %s 的获取列表" |
8ada9598 | 9934 | |
276ceeaa | 9935 | #: builtin/remote.c:437 builtin/remote.c:445 |
8ada9598 | 9936 | msgid "(matching)" |
81809b99 | 9937 | msgstr "(匹配)" |
8ada9598 | 9938 | |
276ceeaa | 9939 | #: builtin/remote.c:449 |
8ada9598 | 9940 | msgid "(delete)" |
81809b99 | 9941 | msgstr "(删除)" |
8ada9598 | 9942 | |
276ceeaa | 9943 | #: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858 |
81809b99 | 9944 | #, c-format |
8ada9598 | 9945 | msgid "No such remote: %s" |
81809b99 | 9946 | msgstr "没有这样的远程:%s" |
8ada9598 | 9947 | |
276ceeaa | 9948 | #: builtin/remote.c:643 |
81809b99 | 9949 | #, c-format |
8ada9598 | 9950 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 9951 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 | 9952 | |
276ceeaa | 9953 | #: builtin/remote.c:663 |
8ada9598 JX |
9954 | #, c-format |
9955 | msgid "" | |
d691f479 | 9956 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
9957 | "\t%s\n" |
9958 | "\tPlease update the configuration manually if necessary." | |
9959 | msgstr "" | |
160fb2b2 | 9960 | "没有更新非默认的获取引用规格\n" |
81809b99 JX |
9961 | "\t%s\n" |
9962 | "\t如果必要请手动更新配置。" | |
8ada9598 | 9963 | |
276ceeaa | 9964 | #: builtin/remote.c:699 |
81809b99 | 9965 | #, c-format |
8ada9598 | 9966 | msgid "deleting '%s' failed" |
81809b99 | 9967 | msgstr "删除 '%s' 失败" |
8ada9598 | 9968 | |
276ceeaa | 9969 | #: builtin/remote.c:733 |
81809b99 | 9970 | #, c-format |
8ada9598 | 9971 | msgid "creating '%s' failed" |
81809b99 | 9972 | msgstr "创建 '%s' 失败" |
8ada9598 | 9973 | |
276ceeaa | 9974 | #: builtin/remote.c:796 |
8ada9598 JX |
9975 | msgid "" |
9976 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
9977 | "to delete it, use:" | |
9978 | msgid_plural "" | |
9979 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
9980 | "to delete them, use:" | |
5ae481e0 JX |
9981 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
9982 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 | 9983 | |
276ceeaa JX |
9984 | #: builtin/remote.c:810 |
9985 | #, c-format | |
9986 | msgid "Could not remove config section '%s'" | |
9987 | msgstr "不能移除配置小节 '%s'" | |
9988 | ||
9989 | #: builtin/remote.c:911 | |
8ada9598 JX |
9990 | #, c-format |
9991 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 9992 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 | 9993 | |
276ceeaa | 9994 | #: builtin/remote.c:914 |
8ada9598 | 9995 | msgid " tracked" |
81809b99 | 9996 | msgstr " 已跟踪" |
8ada9598 | 9997 | |
276ceeaa | 9998 | #: builtin/remote.c:916 |
8ada9598 | 9999 | msgid " stale (use 'git remote prune' to remove)" |
81809b99 | 10000 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 | 10001 | |
276ceeaa | 10002 | #: builtin/remote.c:918 |
8ada9598 | 10003 | msgid " ???" |
81809b99 | 10004 | msgstr " ???" |
8ada9598 | 10005 | |
276ceeaa | 10006 | #: builtin/remote.c:959 |
8ada9598 JX |
10007 | #, c-format |
10008 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 10009 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 | 10010 | |
276ceeaa | 10011 | #: builtin/remote.c:967 |
81809b99 | 10012 | #, c-format |
276ceeaa JX |
10013 | msgid "rebases interactively onto remote %s" |
10014 | msgstr "交互式变基到远程 %s" | |
8ada9598 | 10015 | |
276ceeaa | 10016 | #: builtin/remote.c:971 |
81809b99 | 10017 | #, c-format |
8ada9598 | 10018 | msgid " merges with remote %s" |
81809b99 | 10019 | msgstr " 与远程 %s 合并" |
8ada9598 | 10020 | |
276ceeaa | 10021 | #: builtin/remote.c:972 |
8ada9598 | 10022 | msgid " and with remote" |
81809b99 | 10023 | msgstr " 且有远程" |
8ada9598 | 10024 | |
276ceeaa | 10025 | #: builtin/remote.c:974 |
81809b99 | 10026 | #, c-format |
8ada9598 | 10027 | msgid "merges with remote %s" |
81809b99 | 10028 | msgstr "与远程 %s 合并" |
8ada9598 | 10029 | |
276ceeaa | 10030 | #: builtin/remote.c:975 |
8ada9598 | 10031 | msgid " and with remote" |
81809b99 | 10032 | msgstr " 且有远程" |
8ada9598 | 10033 | |
276ceeaa | 10034 | #: builtin/remote.c:1021 |
8ada9598 | 10035 | msgid "create" |
81809b99 | 10036 | msgstr "创建" |
8ada9598 | 10037 | |
276ceeaa | 10038 | #: builtin/remote.c:1024 |
8ada9598 | 10039 | msgid "delete" |
81809b99 | 10040 | msgstr "删除" |
8ada9598 | 10041 | |
276ceeaa | 10042 | #: builtin/remote.c:1028 |
8ada9598 | 10043 | msgid "up to date" |
81809b99 | 10044 | msgstr "最新" |
8ada9598 | 10045 | |
276ceeaa | 10046 | #: builtin/remote.c:1031 |
8ada9598 | 10047 | msgid "fast-forwardable" |
81809b99 | 10048 | msgstr "可快进" |
8ada9598 | 10049 | |
276ceeaa | 10050 | #: builtin/remote.c:1034 |
8ada9598 | 10051 | msgid "local out of date" |
81809b99 | 10052 | msgstr "本地已过时" |
8ada9598 | 10053 | |
276ceeaa | 10054 | #: builtin/remote.c:1041 |
8ada9598 JX |
10055 | #, c-format |
10056 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 10057 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 | 10058 | |
276ceeaa | 10059 | #: builtin/remote.c:1044 |
8ada9598 JX |
10060 | #, c-format |
10061 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 10062 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 | 10063 | |
276ceeaa | 10064 | #: builtin/remote.c:1048 |
8ada9598 JX |
10065 | #, c-format |
10066 | msgid " %-*s forces to %s" | |
81809b99 | 10067 | msgstr " %-*s 强制推送至 %s" |
8ada9598 | 10068 | |
276ceeaa | 10069 | #: builtin/remote.c:1051 |
8ada9598 JX |
10070 | #, c-format |
10071 | msgid " %-*s pushes to %s" | |
81809b99 | 10072 | msgstr " %-*s 推送至 %s" |
8ada9598 | 10073 | |
276ceeaa | 10074 | #: builtin/remote.c:1119 |
ef317cd5 | 10075 | msgid "do not query remotes" |
07432cef | 10076 | msgstr "不查询远程" |
ef317cd5 | 10077 | |
276ceeaa | 10078 | #: builtin/remote.c:1146 |
81809b99 | 10079 | #, c-format |
8ada9598 | 10080 | msgid "* remote %s" |
81809b99 | 10081 | msgstr "* 远程 %s" |
8ada9598 | 10082 | |
276ceeaa | 10083 | #: builtin/remote.c:1147 |
8ada9598 JX |
10084 | #, c-format |
10085 | msgid " Fetch URL: %s" | |
81809b99 | 10086 | msgstr " 获取地址:%s" |
8ada9598 | 10087 | |
5b04ee3b | 10088 | #: builtin/remote.c:1148 builtin/remote.c:1301 |
8ada9598 | 10089 | msgid "(no URL)" |
81809b99 | 10090 | msgstr "(无 URL)" |
8ada9598 | 10091 | |
5b04ee3b JX |
10092 | #. TRANSLATORS: the colon ':' should align with |
10093 | #. the one in " Fetch URL: %s" translation | |
10094 | #: builtin/remote.c:1159 builtin/remote.c:1161 | |
8ada9598 JX |
10095 | #, c-format |
10096 | msgid " Push URL: %s" | |
81809b99 | 10097 | msgstr " 推送地址:%s" |
8ada9598 | 10098 | |
5b04ee3b | 10099 | #: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 |
81809b99 | 10100 | #, c-format |
8ada9598 | 10101 | msgid " HEAD branch: %s" |
4375c10e | 10102 | msgstr " HEAD 分支:%s" |
8ada9598 | 10103 | |
5b04ee3b | 10104 | #: builtin/remote.c:1169 |
8ada9598 JX |
10105 | #, c-format |
10106 | msgid "" | |
10107 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 10108 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 | 10109 | |
5b04ee3b | 10110 | #: builtin/remote.c:1181 |
81809b99 | 10111 | #, c-format |
8ada9598 JX |
10112 | msgid " Remote branch:%s" |
10113 | msgid_plural " Remote branches:%s" | |
81809b99 | 10114 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 10115 | msgstr[1] " 远程分支:%s" |
8ada9598 | 10116 | |
81809b99 | 10117 | # 译者:中文字符串拼接,可删除前导空格 |
5b04ee3b | 10118 | #: builtin/remote.c:1184 builtin/remote.c:1211 |
8ada9598 | 10119 | msgid " (status not queried)" |
81809b99 | 10120 | msgstr "(状态未查询)" |
8ada9598 | 10121 | |
5b04ee3b | 10122 | #: builtin/remote.c:1193 |
8ada9598 JX |
10123 | msgid " Local branch configured for 'git pull':" |
10124 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 10125 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 10126 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 | 10127 | |
5b04ee3b | 10128 | #: builtin/remote.c:1201 |
8ada9598 | 10129 | msgid " Local refs will be mirrored by 'git push'" |
81809b99 | 10130 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 | 10131 | |
5b04ee3b | 10132 | #: builtin/remote.c:1208 |
81809b99 | 10133 | #, c-format |
8ada9598 JX |
10134 | msgid " Local ref configured for 'git push'%s:" |
10135 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 10136 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 10137 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 10138 | |
5b04ee3b | 10139 | #: builtin/remote.c:1229 |
ef317cd5 | 10140 | msgid "set refs/remotes/<name>/HEAD according to remote" |
07432cef | 10141 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 | 10142 | |
5b04ee3b | 10143 | #: builtin/remote.c:1231 |
ef317cd5 | 10144 | msgid "delete refs/remotes/<name>/HEAD" |
07432cef | 10145 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 10146 | |
5b04ee3b | 10147 | #: builtin/remote.c:1246 |
8ada9598 | 10148 | msgid "Cannot determine remote HEAD" |
81809b99 | 10149 | msgstr "无法确定远程 HEAD" |
8ada9598 | 10150 | |
5b04ee3b | 10151 | #: builtin/remote.c:1248 |
8ada9598 | 10152 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
81809b99 | 10153 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 | 10154 | |
5b04ee3b | 10155 | #: builtin/remote.c:1258 |
81809b99 | 10156 | #, c-format |
8ada9598 | 10157 | msgid "Could not delete %s" |
81809b99 | 10158 | msgstr "无法删除 %s" |
8ada9598 | 10159 | |
5b04ee3b | 10160 | #: builtin/remote.c:1266 |
81809b99 | 10161 | #, c-format |
8ada9598 | 10162 | msgid "Not a valid ref: %s" |
81809b99 | 10163 | msgstr "不是一个有效引用:%s" |
8ada9598 | 10164 | |
5b04ee3b | 10165 | #: builtin/remote.c:1268 |
81809b99 | 10166 | #, c-format |
8ada9598 | 10167 | msgid "Could not setup %s" |
81809b99 | 10168 | msgstr "不能设置 %s" |
8ada9598 JX |
10169 | |
10170 | # 译者:注意保持前导空格 | |
5b04ee3b | 10171 | #: builtin/remote.c:1286 |
81809b99 | 10172 | #, c-format |
8ada9598 | 10173 | msgid " %s will become dangling!" |
07432cef | 10174 | msgstr " %s 将成为摇摆状态!" |
8ada9598 JX |
10175 | |
10176 | # 译者:注意保持前导空格 | |
5b04ee3b | 10177 | #: builtin/remote.c:1287 |
81809b99 | 10178 | #, c-format |
8ada9598 | 10179 | msgid " %s has become dangling!" |
07432cef | 10180 | msgstr " %s 已成为摇摆状态!" |
8ada9598 | 10181 | |
5b04ee3b | 10182 | #: builtin/remote.c:1297 |
81809b99 | 10183 | #, c-format |
8ada9598 | 10184 | msgid "Pruning %s" |
81809b99 | 10185 | msgstr "修剪 %s" |
8ada9598 | 10186 | |
5b04ee3b | 10187 | #: builtin/remote.c:1298 |
8ada9598 JX |
10188 | #, c-format |
10189 | msgid "URL: %s" | |
81809b99 | 10190 | msgstr "URL:%s" |
8ada9598 | 10191 | |
5b04ee3b | 10192 | #: builtin/remote.c:1314 |
8ada9598 JX |
10193 | #, c-format |
10194 | msgid " * [would prune] %s" | |
81809b99 | 10195 | msgstr " * [将删除] %s" |
8ada9598 | 10196 | |
5b04ee3b | 10197 | #: builtin/remote.c:1317 |
8ada9598 JX |
10198 | #, c-format |
10199 | msgid " * [pruned] %s" | |
81809b99 | 10200 | msgstr " * [已删除] %s" |
8ada9598 | 10201 | |
5b04ee3b | 10202 | #: builtin/remote.c:1362 |
ef317cd5 | 10203 | msgid "prune remotes after fetching" |
07432cef | 10204 | msgstr "抓取后清除远程" |
ef317cd5 | 10205 | |
5b04ee3b | 10206 | #: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 |
81809b99 | 10207 | #, c-format |
8ada9598 | 10208 | msgid "No such remote '%s'" |
81809b99 | 10209 | msgstr "没有此远程 '%s'" |
8ada9598 | 10210 | |
5b04ee3b | 10211 | #: builtin/remote.c:1441 |
ef317cd5 | 10212 | msgid "add branch" |
07432cef | 10213 | msgstr "添加分支" |
ef317cd5 | 10214 | |
5b04ee3b | 10215 | #: builtin/remote.c:1448 |
8ada9598 | 10216 | msgid "no remote specified" |
81809b99 | 10217 | msgstr "未指定远程" |
8ada9598 | 10218 | |
5b04ee3b | 10219 | #: builtin/remote.c:1465 |
94550ed3 JX |
10220 | msgid "query push URLs rather than fetch URLs" |
10221 | msgstr "查询推送 URL 地址,而非获取 URL 地址" | |
10222 | ||
5b04ee3b | 10223 | #: builtin/remote.c:1467 |
94550ed3 JX |
10224 | msgid "return all URLs" |
10225 | msgstr "返回所有 URL 地址" | |
10226 | ||
5b04ee3b | 10227 | #: builtin/remote.c:1495 |
94550ed3 JX |
10228 | #, c-format |
10229 | msgid "no URLs configured for remote '%s'" | |
10230 | msgstr "没有给远程仓库 '%s' 设定 URL" | |
10231 | ||
5b04ee3b | 10232 | #: builtin/remote.c:1521 |
ef317cd5 | 10233 | msgid "manipulate push URLs" |
07432cef | 10234 | msgstr "操作推送 URLS" |
ef317cd5 | 10235 | |
5b04ee3b | 10236 | #: builtin/remote.c:1523 |
ef317cd5 | 10237 | msgid "add URL" |
07432cef | 10238 | msgstr "添加 URL" |
ef317cd5 | 10239 | |
5b04ee3b | 10240 | #: builtin/remote.c:1525 |
ef317cd5 | 10241 | msgid "delete URLs" |
07432cef | 10242 | msgstr "删除 URLS" |
ef317cd5 | 10243 | |
5b04ee3b | 10244 | #: builtin/remote.c:1532 |
8ada9598 | 10245 | msgid "--add --delete doesn't make sense" |
81809b99 | 10246 | msgstr "--add --delete 无意义" |
8ada9598 | 10247 | |
5b04ee3b | 10248 | #: builtin/remote.c:1573 |
81809b99 | 10249 | #, c-format |
8ada9598 | 10250 | msgid "Invalid old URL pattern: %s" |
4375c10e | 10251 | msgstr "无效的旧 URL 匹配模版:%s" |
8ada9598 | 10252 | |
5b04ee3b | 10253 | #: builtin/remote.c:1581 |
81809b99 | 10254 | #, c-format |
8ada9598 | 10255 | msgid "No such URL found: %s" |
4375c10e | 10256 | msgstr "未找到此 URL:%s" |
8ada9598 | 10257 | |
5b04ee3b | 10258 | #: builtin/remote.c:1583 |
8ada9598 | 10259 | msgid "Will not delete all non-push URLs" |
4375c10e | 10260 | msgstr "将不会删除所有非推送 URL 地址" |
8ada9598 | 10261 | |
5b04ee3b | 10262 | #: builtin/remote.c:1597 |
ef317cd5 | 10263 | msgid "be verbose; must be placed before a subcommand" |
07432cef | 10264 | msgstr "冗长输出;必须置于子命令之前" |
ef317cd5 | 10265 | |
6acbf033 | 10266 | #: builtin/repack.c:17 |
814ff314 JX |
10267 | msgid "git repack [<options>]" |
10268 | msgstr "git repack [<选项>]" | |
90314792 | 10269 | |
04cb2f28 | 10270 | #: builtin/repack.c:159 |
90314792 JX |
10271 | msgid "pack everything in a single pack" |
10272 | msgstr "所有内容打包到一个包文件中" | |
10273 | ||
04cb2f28 | 10274 | #: builtin/repack.c:161 |
90314792 JX |
10275 | msgid "same as -a, and turn unreachable objects loose" |
10276 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
10277 | ||
04cb2f28 | 10278 | #: builtin/repack.c:164 |
90314792 JX |
10279 | msgid "remove redundant packs, and run git-prune-packed" |
10280 | msgstr "删除多余的包,运行 git-prune-packed" | |
10281 | ||
04cb2f28 | 10282 | #: builtin/repack.c:166 |
90314792 JX |
10283 | msgid "pass --no-reuse-delta to git-pack-objects" |
10284 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
10285 | ||
04cb2f28 | 10286 | #: builtin/repack.c:168 |
90314792 JX |
10287 | msgid "pass --no-reuse-object to git-pack-objects" |
10288 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
10289 | ||
04cb2f28 | 10290 | #: builtin/repack.c:170 |
90314792 JX |
10291 | msgid "do not run git-update-server-info" |
10292 | msgstr "不运行 git-update-server-info" | |
10293 | ||
04cb2f28 | 10294 | #: builtin/repack.c:173 |
90314792 JX |
10295 | msgid "pass --local to git-pack-objects" |
10296 | msgstr "向 git-pack-objects 传递参数 --local" | |
10297 | ||
04cb2f28 | 10298 | #: builtin/repack.c:175 |
6c94aba5 JX |
10299 | msgid "write bitmap index" |
10300 | msgstr "写 bitmap 索引" | |
10301 | ||
04cb2f28 | 10302 | #: builtin/repack.c:176 |
90314792 JX |
10303 | msgid "approxidate" |
10304 | msgstr "近似日期" | |
10305 | ||
04cb2f28 | 10306 | #: builtin/repack.c:177 |
90314792 JX |
10307 | msgid "with -A, do not loosen objects older than this" |
10308 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
10309 | ||
04cb2f28 | 10310 | #: builtin/repack.c:179 |
90314792 JX |
10311 | msgid "size of the window used for delta compression" |
10312 | msgstr "用于增量压缩的窗口值" | |
10313 | ||
04cb2f28 | 10314 | #: builtin/repack.c:180 builtin/repack.c:184 |
8376b58d JX |
10315 | msgid "bytes" |
10316 | msgstr "字节" | |
10317 | ||
04cb2f28 | 10318 | #: builtin/repack.c:181 |
90314792 JX |
10319 | msgid "same as the above, but limit memory size instead of entries count" |
10320 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
10321 | ||
04cb2f28 | 10322 | #: builtin/repack.c:183 |
90314792 JX |
10323 | msgid "limits the maximum delta depth" |
10324 | msgstr "限制最大增量深度" | |
10325 | ||
04cb2f28 | 10326 | #: builtin/repack.c:185 |
90314792 | 10327 | msgid "maximum size of each packfile" |
dbd6cced | 10328 | msgstr "每个包文件的最大尺寸" |
90314792 | 10329 | |
04cb2f28 | 10330 | #: builtin/repack.c:187 |
6c94aba5 JX |
10331 | msgid "repack objects in packs marked with .keep" |
10332 | msgstr "对标记为 .keep 的包中的对象重新打包" | |
10333 | ||
94550ed3 JX |
10334 | #: builtin/repack.c:197 |
10335 | msgid "cannot delete packs in a precious-objects repo" | |
10336 | msgstr "不能删除珍品仓库中的打包文件" | |
10337 | ||
10338 | #: builtin/repack.c:381 | |
90314792 JX |
10339 | #, c-format |
10340 | msgid "removing '%s' failed" | |
10341 | msgstr "删除 '%s' 失败" | |
10342 | ||
6acbf033 | 10343 | #: builtin/replace.c:19 |
ef317cd5 | 10344 | msgid "git replace [-f] <object> <replacement>" |
07432cef | 10345 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 | 10346 | |
6acbf033 JX |
10347 | #: builtin/replace.c:20 |
10348 | msgid "git replace [-f] --edit <object>" | |
10349 | msgstr "git replace [-f] --edit <对象>" | |
10350 | ||
10351 | #: builtin/replace.c:21 | |
10352 | msgid "git replace [-f] --graft <commit> [<parent>...]" | |
10353 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" | |
10354 | ||
10355 | #: builtin/replace.c:22 | |
ef317cd5 | 10356 | msgid "git replace -d <object>..." |
07432cef | 10357 | msgstr "git replace -d <对象>..." |
ef317cd5 | 10358 | |
6acbf033 | 10359 | #: builtin/replace.c:23 |
cfff71a9 JX |
10360 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
10361 | msgstr "git replace [--format=<格式>] [-l [<模式>]]" | |
ef317cd5 | 10362 | |
220c313c | 10363 | #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 |
6acbf033 JX |
10364 | #, c-format |
10365 | msgid "Not a valid object name: '%s'" | |
10366 | msgstr "不是一个有效的对象名:'%s'" | |
10367 | ||
220c313c | 10368 | #: builtin/replace.c:355 |
6acbf033 JX |
10369 | #, c-format |
10370 | msgid "bad mergetag in commit '%s'" | |
55a16ee4 | 10371 | msgstr "提交 '%s' 中含有损坏的合并标签" |
6acbf033 | 10372 | |
220c313c | 10373 | #: builtin/replace.c:357 |
6acbf033 JX |
10374 | #, c-format |
10375 | msgid "malformed mergetag in commit '%s'" | |
55a16ee4 | 10376 | msgstr "提交 '%s' 中含有非法的合并标签" |
6acbf033 | 10377 | |
220c313c | 10378 | #: builtin/replace.c:368 |
6acbf033 JX |
10379 | #, c-format |
10380 | msgid "" | |
10381 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
10382 | "instead of --graft" | |
55a16ee4 | 10383 | msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft" |
6acbf033 | 10384 | |
220c313c | 10385 | #: builtin/replace.c:401 |
6acbf033 JX |
10386 | #, c-format |
10387 | msgid "the original commit '%s' has a gpg signature." | |
10388 | msgstr "原始提交 '%s' 中包含一个 GPG 签名" | |
10389 | ||
220c313c | 10390 | #: builtin/replace.c:402 |
6acbf033 JX |
10391 | msgid "the signature will be removed in the replacement commit!" |
10392 | msgstr "在替换的提交中签名将被移除!" | |
10393 | ||
220c313c | 10394 | #: builtin/replace.c:408 |
6acbf033 JX |
10395 | #, c-format |
10396 | msgid "could not write replacement commit for: '%s'" | |
10397 | msgstr "不能为 '%s' 写替换提交" | |
10398 | ||
220c313c | 10399 | #: builtin/replace.c:432 |
ef317cd5 | 10400 | msgid "list replace refs" |
07432cef | 10401 | msgstr "列出替换的引用" |
ef317cd5 | 10402 | |
220c313c | 10403 | #: builtin/replace.c:433 |
ef317cd5 | 10404 | msgid "delete replace refs" |
07432cef | 10405 | msgstr "删除替换的引用" |
ef317cd5 | 10406 | |
220c313c | 10407 | #: builtin/replace.c:434 |
6acbf033 JX |
10408 | msgid "edit existing object" |
10409 | msgstr "编辑现存的对象" | |
10410 | ||
220c313c | 10411 | #: builtin/replace.c:435 |
6acbf033 JX |
10412 | msgid "change a commit's parents" |
10413 | msgstr "修改一个提交的父提交" | |
10414 | ||
220c313c | 10415 | #: builtin/replace.c:436 |
ef317cd5 | 10416 | msgid "replace the ref if it exists" |
07432cef | 10417 | msgstr "如果存在则替换引用" |
ef317cd5 | 10418 | |
220c313c | 10419 | #: builtin/replace.c:437 |
6acbf033 JX |
10420 | msgid "do not pretty-print contents for --edit" |
10421 | msgstr "不要为 --edit 操作美观显示内容" | |
10422 | ||
220c313c | 10423 | #: builtin/replace.c:438 |
cfff71a9 JX |
10424 | msgid "use this format" |
10425 | msgstr "使用此格式" | |
10426 | ||
90314792 | 10427 | #: builtin/rerere.c:12 |
814ff314 JX |
10428 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
10429 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" | |
ef317cd5 | 10430 | |
94550ed3 | 10431 | #: builtin/rerere.c:58 |
ef317cd5 | 10432 | msgid "register clean resolutions in index" |
07432cef | 10433 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 | 10434 | |
220c313c | 10435 | #: builtin/reset.c:26 |
ef317cd5 JX |
10436 | msgid "" |
10437 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 10438 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 | 10439 | |
220c313c | 10440 | #: builtin/reset.c:27 |
07432cef WS |
10441 | msgid "git reset [-q] <tree-ish> [--] <paths>..." |
10442 | msgstr "git reset [-q] <树或提交> [--] <路径>..." | |
ef317cd5 | 10443 | |
220c313c | 10444 | #: builtin/reset.c:28 |
07432cef WS |
10445 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
10446 | msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" | |
ef317cd5 | 10447 | |
220c313c | 10448 | #: builtin/reset.c:34 |
c04f5ac3 JX |
10449 | msgid "mixed" |
10450 | msgstr "混杂" | |
10451 | ||
220c313c | 10452 | #: builtin/reset.c:34 |
c04f5ac3 JX |
10453 | msgid "soft" |
10454 | msgstr "软性" | |
10455 | ||
220c313c | 10456 | #: builtin/reset.c:34 |
c04f5ac3 JX |
10457 | msgid "hard" |
10458 | msgstr "硬性" | |
10459 | ||
220c313c | 10460 | #: builtin/reset.c:34 |
8ada9598 JX |
10461 | msgid "merge" |
10462 | msgstr "合并" | |
10463 | ||
220c313c | 10464 | #: builtin/reset.c:34 |
c04f5ac3 JX |
10465 | msgid "keep" |
10466 | msgstr "保持" | |
10467 | ||
220c313c | 10468 | #: builtin/reset.c:74 |
c04f5ac3 JX |
10469 | msgid "You do not have a valid HEAD." |
10470 | msgstr "您没有一个有效的 HEAD。" | |
10471 | ||
220c313c | 10472 | #: builtin/reset.c:76 |
c04f5ac3 JX |
10473 | msgid "Failed to find tree of HEAD." |
10474 | msgstr "无法找到 HEAD 指向的树。" | |
10475 | ||
220c313c | 10476 | #: builtin/reset.c:82 |
c04f5ac3 JX |
10477 | #, c-format |
10478 | msgid "Failed to find tree of %s." | |
10479 | msgstr "无法找到 %s 指向的树。" | |
10480 | ||
220c313c | 10481 | #: builtin/reset.c:100 |
c04f5ac3 JX |
10482 | #, c-format |
10483 | msgid "HEAD is now at %s" | |
10484 | msgstr "HEAD 现在位于 %s" | |
10485 | ||
90e6ef53 | 10486 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 10487 | #: builtin/reset.c:183 |
c04f5ac3 JX |
10488 | #, c-format |
10489 | msgid "Cannot do a %s reset in the middle of a merge." | |
10490 | msgstr "在合并过程中不能做%s重置操作。" | |
10491 | ||
220c313c | 10492 | #: builtin/reset.c:276 |
ef317cd5 | 10493 | msgid "be quiet, only report errors" |
07432cef | 10494 | msgstr "安静模式,只报告错误" |
ef317cd5 | 10495 | |
220c313c | 10496 | #: builtin/reset.c:278 |
ef317cd5 | 10497 | msgid "reset HEAD and index" |
07432cef | 10498 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 10499 | |
220c313c | 10500 | #: builtin/reset.c:279 |
ef317cd5 | 10501 | msgid "reset only HEAD" |
07432cef | 10502 | msgstr "只重置 HEAD" |
ef317cd5 | 10503 | |
220c313c | 10504 | #: builtin/reset.c:281 builtin/reset.c:283 |
ef317cd5 | 10505 | msgid "reset HEAD, index and working tree" |
07432cef | 10506 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 10507 | |
220c313c | 10508 | #: builtin/reset.c:285 |
ef317cd5 | 10509 | msgid "reset HEAD but keep local changes" |
07432cef | 10510 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 10511 | |
220c313c | 10512 | #: builtin/reset.c:288 |
6c94aba5 JX |
10513 | msgid "record only the fact that removed paths will be added later" |
10514 | msgstr "将删除的路径标记为稍后添加" | |
10515 | ||
220c313c | 10516 | #: builtin/reset.c:305 |
07432cef WS |
10517 | #, c-format |
10518 | msgid "Failed to resolve '%s' as a valid revision." | |
10519 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
10520 | ||
220c313c | 10521 | #: builtin/reset.c:313 |
07432cef WS |
10522 | #, c-format |
10523 | msgid "Failed to resolve '%s' as a valid tree." | |
10524 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
10525 | ||
220c313c | 10526 | #: builtin/reset.c:322 |
c04f5ac3 | 10527 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 10528 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 10529 | |
220c313c | 10530 | #: builtin/reset.c:331 |
c04f5ac3 | 10531 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
d9d56b23 | 10532 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
c04f5ac3 | 10533 | |
90e6ef53 | 10534 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 10535 | #: builtin/reset.c:333 |
c04f5ac3 JX |
10536 | #, c-format |
10537 | msgid "Cannot do %s reset with paths." | |
10538 | msgstr "不能带路径进行%s重置。" | |
10539 | ||
90e6ef53 | 10540 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 10541 | #: builtin/reset.c:343 |
c04f5ac3 JX |
10542 | #, c-format |
10543 | msgid "%s reset is not allowed in a bare repository" | |
160fb2b2 | 10544 | msgstr "不能对纯仓库进行%s重置" |
c04f5ac3 | 10545 | |
220c313c | 10546 | #: builtin/reset.c:347 |
6c94aba5 JX |
10547 | msgid "-N can only be used with --mixed" |
10548 | msgstr "-N 只能和 --mixed 同时使用" | |
10549 | ||
220c313c | 10550 | #: builtin/reset.c:364 |
90314792 | 10551 | msgid "Unstaged changes after reset:" |
160fb2b2 | 10552 | msgstr "重置后取消暂存的变更:" |
90314792 | 10553 | |
220c313c | 10554 | #: builtin/reset.c:370 |
ef317cd5 JX |
10555 | #, c-format |
10556 | msgid "Could not reset index file to revision '%s'." | |
10557 | msgstr "不能重置索引文件至版本 '%s'。" | |
10558 | ||
220c313c | 10559 | #: builtin/reset.c:374 |
07432cef WS |
10560 | msgid "Could not write new index file." |
10561 | msgstr "不能写入新的索引文件。" | |
10562 | ||
276ceeaa | 10563 | #: builtin/rev-list.c:350 |
1b7f4a34 JX |
10564 | msgid "rev-list does not support display of notes" |
10565 | msgstr "rev-list 不支持显示注解" | |
10566 | ||
94550ed3 | 10567 | #: builtin/rev-parse.c:358 |
814ff314 JX |
10568 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
10569 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" | |
ef317cd5 | 10570 | |
94550ed3 | 10571 | #: builtin/rev-parse.c:363 |
ef317cd5 | 10572 | msgid "keep the `--` passed as an arg" |
07432cef | 10573 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 10574 | |
94550ed3 | 10575 | #: builtin/rev-parse.c:365 |
ef317cd5 | 10576 | msgid "stop parsing after the first non-option argument" |
07432cef | 10577 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 10578 | |
94550ed3 | 10579 | #: builtin/rev-parse.c:368 |
cfff71a9 JX |
10580 | msgid "output in stuck long form" |
10581 | msgstr "以固定长格式输出" | |
10582 | ||
94550ed3 | 10583 | #: builtin/rev-parse.c:499 |
ef317cd5 | 10584 | msgid "" |
814ff314 | 10585 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
ef317cd5 | 10586 | " or: git rev-parse --sq-quote [<arg>...]\n" |
814ff314 | 10587 | " or: git rev-parse [<options>] [<arg>...]\n" |
ef317cd5 JX |
10588 | "\n" |
10589 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
10590 | msgstr "" | |
814ff314 | 10591 | "git rev-parse --parseopt [<选项>] -- [<参数>...]\n" |
90314792 | 10592 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
814ff314 | 10593 | " 或者:git rev-parse [<选项>] [<参数>...]\n" |
07432cef WS |
10594 | "\n" |
10595 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" | |
ef317cd5 JX |
10596 | |
10597 | #: builtin/revert.c:22 | |
814ff314 JX |
10598 | msgid "git revert [<options>] <commit-ish>..." |
10599 | msgstr "git revert [<选项>] <提交号>..." | |
ef317cd5 JX |
10600 | |
10601 | #: builtin/revert.c:23 | |
10602 | msgid "git revert <subcommand>" | |
07432cef | 10603 | msgstr "git revert <子命令>" |
ef317cd5 JX |
10604 | |
10605 | #: builtin/revert.c:28 | |
814ff314 JX |
10606 | msgid "git cherry-pick [<options>] <commit-ish>..." |
10607 | msgstr "git cherry-pick [<选项>] <提交号>..." | |
ef317cd5 JX |
10608 | |
10609 | #: builtin/revert.c:29 | |
ef317cd5 | 10610 | msgid "git cherry-pick <subcommand>" |
07432cef | 10611 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 10612 | |
90314792 | 10613 | #: builtin/revert.c:71 |
ef317cd5 JX |
10614 | #, c-format |
10615 | msgid "%s: %s cannot be used with %s" | |
10616 | msgstr "%s:%s 不能和 %s 同时使用" | |
10617 | ||
90314792 | 10618 | #: builtin/revert.c:80 |
ef317cd5 | 10619 | msgid "end revert or cherry-pick sequence" |
07432cef | 10620 | msgstr "终止反转或拣选操作" |
ef317cd5 | 10621 | |
90314792 | 10622 | #: builtin/revert.c:81 |
ef317cd5 | 10623 | msgid "resume revert or cherry-pick sequence" |
07432cef | 10624 | msgstr "继续反转或拣选操作" |
ef317cd5 | 10625 | |
90314792 | 10626 | #: builtin/revert.c:82 |
ef317cd5 | 10627 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 10628 | msgstr "取消反转或拣选操作" |
ef317cd5 | 10629 | |
90314792 | 10630 | #: builtin/revert.c:83 |
ef317cd5 | 10631 | msgid "don't automatically commit" |
07432cef | 10632 | msgstr "不要自动提交" |
ef317cd5 | 10633 | |
90314792 | 10634 | #: builtin/revert.c:84 |
ef317cd5 | 10635 | msgid "edit the commit message" |
07432cef | 10636 | msgstr "编辑提交说明" |
ef317cd5 | 10637 | |
90314792 | 10638 | #: builtin/revert.c:87 |
ef317cd5 | 10639 | msgid "parent number" |
07432cef | 10640 | msgstr "父编号" |
ef317cd5 | 10641 | |
90314792 | 10642 | #: builtin/revert.c:89 |
ef317cd5 | 10643 | msgid "merge strategy" |
07432cef | 10644 | msgstr "合并策略" |
ef317cd5 | 10645 | |
90314792 | 10646 | #: builtin/revert.c:90 |
ef317cd5 | 10647 | msgid "option" |
07432cef | 10648 | msgstr "选项" |
ef317cd5 | 10649 | |
90314792 | 10650 | #: builtin/revert.c:91 |
ef317cd5 | 10651 | msgid "option for merge strategy" |
07432cef | 10652 | msgstr "合并策略的选项" |
ef317cd5 | 10653 | |
6c94aba5 | 10654 | #: builtin/revert.c:104 |
ef317cd5 | 10655 | msgid "append commit name" |
07432cef | 10656 | msgstr "追加提交名称" |
ef317cd5 | 10657 | |
6c94aba5 | 10658 | #: builtin/revert.c:106 |
ef317cd5 | 10659 | msgid "preserve initially empty commits" |
07432cef | 10660 | msgstr "保留初始化的空提交" |
ef317cd5 | 10661 | |
6c94aba5 | 10662 | #: builtin/revert.c:107 |
ef317cd5 | 10663 | msgid "allow commits with empty messages" |
07432cef | 10664 | msgstr "允许提交说明为空" |
c04f5ac3 | 10665 | |
6c94aba5 | 10666 | #: builtin/revert.c:108 |
ef317cd5 | 10667 | msgid "keep redundant, empty commits" |
07432cef | 10668 | msgstr "保持多余的、空的提交" |
ef317cd5 | 10669 | |
6c94aba5 | 10670 | #: builtin/revert.c:112 |
c04f5ac3 JX |
10671 | msgid "program error" |
10672 | msgstr "程序错误" | |
10673 | ||
6c94aba5 | 10674 | #: builtin/revert.c:197 |
c04f5ac3 JX |
10675 | msgid "revert failed" |
10676 | msgstr "还原失败" | |
10677 | ||
6c94aba5 | 10678 | #: builtin/revert.c:212 |
c04f5ac3 JX |
10679 | msgid "cherry-pick failed" |
10680 | msgstr "拣选失败" | |
10681 | ||
90314792 | 10682 | #: builtin/rm.c:17 |
814ff314 JX |
10683 | msgid "git rm [<options>] [--] <file>..." |
10684 | msgstr "git rm [<选项>] [--] <文件>..." | |
07432cef | 10685 | |
90314792 | 10686 | #: builtin/rm.c:65 |
2e8451e8 JX |
10687 | msgid "" |
10688 | "the following submodule (or one of its nested submodules)\n" | |
10689 | "uses a .git directory:" | |
10690 | msgid_plural "" | |
220c313c | 10691 | "the following submodules (or one of their nested submodules)\n" |
2e8451e8 | 10692 | "use a .git directory:" |
220c313c JX |
10693 | msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" |
10694 | msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" | |
2e8451e8 | 10695 | |
90314792 | 10696 | #: builtin/rm.c:71 |
07432cef | 10697 | msgid "" |
2e8451e8 | 10698 | "\n" |
07432cef WS |
10699 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
10700 | msgstr "" | |
2e8451e8 | 10701 | "\n" |
07432cef | 10702 | "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" |
ef317cd5 | 10703 | |
7aea43ff | 10704 | #: builtin/rm.c:230 |
c04f5ac3 | 10705 | msgid "" |
2e8451e8 JX |
10706 | "the following file has staged content different from both the\n" |
10707 | "file and the HEAD:" | |
10708 | msgid_plural "" | |
10709 | "the following files have staged content different from both the\n" | |
10710 | "file and the HEAD:" | |
10711 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
10712 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
10713 | ||
7aea43ff | 10714 | #: builtin/rm.c:235 |
2e8451e8 JX |
10715 | msgid "" |
10716 | "\n" | |
c04f5ac3 JX |
10717 | "(use -f to force removal)" |
10718 | msgstr "" | |
2e8451e8 | 10719 | "\n" |
c04f5ac3 JX |
10720 | "(使用 -f 强制删除)" |
10721 | ||
7aea43ff | 10722 | #: builtin/rm.c:239 |
2e8451e8 JX |
10723 | msgid "the following file has changes staged in the index:" |
10724 | msgid_plural "the following files have changes staged in the index:" | |
160fb2b2 JX |
10725 | msgstr[0] "下列文件索引中有变更" |
10726 | msgstr[1] "下列文件索引中有变更" | |
c04f5ac3 | 10727 | |
7aea43ff | 10728 | #: builtin/rm.c:243 builtin/rm.c:254 |
c04f5ac3 | 10729 | msgid "" |
2e8451e8 | 10730 | "\n" |
c04f5ac3 JX |
10731 | "(use --cached to keep the file, or -f to force removal)" |
10732 | msgstr "" | |
2e8451e8 JX |
10733 | "\n" |
10734 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
10735 | ||
7aea43ff | 10736 | #: builtin/rm.c:251 |
2e8451e8 JX |
10737 | msgid "the following file has local modifications:" |
10738 | msgid_plural "the following files have local modifications:" | |
10739 | msgstr[0] "如下文件有本地修改:" | |
10740 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 10741 | |
7aea43ff | 10742 | #: builtin/rm.c:269 |
ef317cd5 | 10743 | msgid "do not list removed files" |
07432cef | 10744 | msgstr "不列出删除的文件" |
ef317cd5 | 10745 | |
7aea43ff | 10746 | #: builtin/rm.c:270 |
ef317cd5 | 10747 | msgid "only remove from the index" |
07432cef | 10748 | msgstr "只从索引区删除" |
ef317cd5 | 10749 | |
7aea43ff | 10750 | #: builtin/rm.c:271 |
ef317cd5 | 10751 | msgid "override the up-to-date check" |
07432cef | 10752 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 10753 | |
7aea43ff | 10754 | #: builtin/rm.c:272 |
ef317cd5 | 10755 | msgid "allow recursive removal" |
07432cef | 10756 | msgstr "允许递归删除" |
ef317cd5 | 10757 | |
7aea43ff | 10758 | #: builtin/rm.c:274 |
ef317cd5 | 10759 | msgid "exit with a zero status even if nothing matched" |
07432cef | 10760 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 10761 | |
7aea43ff | 10762 | #: builtin/rm.c:335 |
c04f5ac3 JX |
10763 | #, c-format |
10764 | msgid "not removing '%s' recursively without -r" | |
10765 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
10766 | ||
7aea43ff | 10767 | #: builtin/rm.c:374 |
c04f5ac3 JX |
10768 | #, c-format |
10769 | msgid "git rm: unable to remove %s" | |
10770 | msgstr "git rm:不能删除 %s" | |
10771 | ||
1b7f4a34 JX |
10772 | #: builtin/send-pack.c:18 |
10773 | msgid "" | |
10774 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
10775 | "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " | |
10776 | "[<ref>...]\n" | |
10777 | " --all and explicit <ref> specification are mutually exclusive." | |
10778 | msgstr "" | |
10779 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
10780 | "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" | |
10781 | " --all 和明确的 <引用> 互斥。" | |
10782 | ||
10783 | #: builtin/send-pack.c:160 | |
10784 | msgid "remote name" | |
10785 | msgstr "远程名称" | |
10786 | ||
10787 | #: builtin/send-pack.c:171 | |
10788 | msgid "use stateless RPC protocol" | |
10789 | msgstr "使用无状态的 RPC 协议" | |
10790 | ||
10791 | #: builtin/send-pack.c:172 | |
10792 | msgid "read refs from stdin" | |
10793 | msgstr "从标准输入读取引用" | |
10794 | ||
10795 | #: builtin/send-pack.c:173 | |
10796 | msgid "print status from remote helper" | |
10797 | msgstr "打印来自远程 helper 的状态" | |
10798 | ||
ef317cd5 | 10799 | #: builtin/shortlog.c:13 |
814ff314 | 10800 | msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" |
4dcdc3d8 | 10801 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" |
ef317cd5 | 10802 | |
276ceeaa | 10803 | #: builtin/shortlog.c:242 |
ef317cd5 | 10804 | msgid "sort output according to the number of commits per author" |
07432cef | 10805 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 10806 | |
276ceeaa | 10807 | #: builtin/shortlog.c:244 |
ef317cd5 | 10808 | msgid "Suppress commit descriptions, only provides commit count" |
07432cef | 10809 | msgstr "隐藏提交说明,只提供提交数量" |
ef317cd5 | 10810 | |
276ceeaa | 10811 | #: builtin/shortlog.c:246 |
ef317cd5 | 10812 | msgid "Show the email address of each author" |
07432cef | 10813 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 10814 | |
276ceeaa | 10815 | #: builtin/shortlog.c:247 |
ef317cd5 | 10816 | msgid "w[,i1[,i2]]" |
07432cef | 10817 | msgstr "w[,i1[,i2]]" |
ef317cd5 | 10818 | |
276ceeaa | 10819 | #: builtin/shortlog.c:248 |
ef317cd5 | 10820 | msgid "Linewrap output" |
07432cef | 10821 | msgstr "折行输出" |
ef317cd5 | 10822 | |
94550ed3 | 10823 | #: builtin/show-branch.c:10 |
ef317cd5 | 10824 | msgid "" |
814ff314 | 10825 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
10826 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
10827 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
10828 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
ef317cd5 | 10829 | msgstr "" |
814ff314 | 10830 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
10831 | "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" |
10832 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
10833 | "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" | |
ef317cd5 | 10834 | |
94550ed3 | 10835 | #: builtin/show-branch.c:14 |
814ff314 JX |
10836 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
10837 | msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" | |
ef317cd5 | 10838 | |
94550ed3 | 10839 | #: builtin/show-branch.c:640 |
ef317cd5 | 10840 | msgid "show remote-tracking and local branches" |
07432cef | 10841 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 10842 | |
94550ed3 | 10843 | #: builtin/show-branch.c:642 |
ef317cd5 | 10844 | msgid "show remote-tracking branches" |
07432cef | 10845 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 10846 | |
94550ed3 | 10847 | #: builtin/show-branch.c:644 |
ef317cd5 | 10848 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 10849 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 10850 | |
94550ed3 | 10851 | #: builtin/show-branch.c:646 |
ef317cd5 | 10852 | msgid "show <n> more commits after the common ancestor" |
07432cef | 10853 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 10854 | |
94550ed3 | 10855 | #: builtin/show-branch.c:648 |
ef317cd5 | 10856 | msgid "synonym to more=-1" |
07432cef | 10857 | msgstr "和 more=-1 同义" |
ef317cd5 | 10858 | |
94550ed3 | 10859 | #: builtin/show-branch.c:649 |
ef317cd5 | 10860 | msgid "suppress naming strings" |
07432cef | 10861 | msgstr "不显示字符串命名" |
ef317cd5 | 10862 | |
94550ed3 | 10863 | #: builtin/show-branch.c:651 |
ef317cd5 | 10864 | msgid "include the current branch" |
07432cef | 10865 | msgstr "包括当前分支" |
ef317cd5 | 10866 | |
94550ed3 | 10867 | #: builtin/show-branch.c:653 |
ef317cd5 | 10868 | msgid "name commits with their object names" |
07432cef | 10869 | msgstr "以对象名字命名提交" |
ef317cd5 | 10870 | |
94550ed3 | 10871 | #: builtin/show-branch.c:655 |
ef317cd5 | 10872 | msgid "show possible merge bases" |
07432cef | 10873 | msgstr "显示可能合并的基线" |
ef317cd5 | 10874 | |
94550ed3 | 10875 | #: builtin/show-branch.c:657 |
ef317cd5 | 10876 | msgid "show refs unreachable from any other ref" |
07432cef | 10877 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 10878 | |
94550ed3 | 10879 | #: builtin/show-branch.c:659 |
ef317cd5 | 10880 | msgid "show commits in topological order" |
07432cef | 10881 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 10882 | |
94550ed3 | 10883 | #: builtin/show-branch.c:662 |
ef317cd5 | 10884 | msgid "show only commits not on the first branch" |
07432cef | 10885 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 10886 | |
94550ed3 | 10887 | #: builtin/show-branch.c:664 |
ef317cd5 | 10888 | msgid "show merges reachable from only one tip" |
07432cef | 10889 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 10890 | |
94550ed3 | 10891 | #: builtin/show-branch.c:666 |
2e8451e8 JX |
10892 | msgid "topologically sort, maintaining date order where possible" |
10893 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 10894 | |
94550ed3 | 10895 | #: builtin/show-branch.c:669 |
ef317cd5 | 10896 | msgid "<n>[,<base>]" |
07432cef | 10897 | msgstr "<n>[,<base>]" |
ef317cd5 | 10898 | |
94550ed3 | 10899 | #: builtin/show-branch.c:670 |
ef317cd5 | 10900 | msgid "show <n> most recent ref-log entries starting at base" |
07432cef | 10901 | msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" |
ef317cd5 JX |
10902 | |
10903 | #: builtin/show-ref.c:10 | |
10904 | msgid "" | |
814ff314 JX |
10905 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
10906 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
ef317cd5 | 10907 | msgstr "" |
814ff314 JX |
10908 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
10909 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" | |
ef317cd5 JX |
10910 | |
10911 | #: builtin/show-ref.c:11 | |
94550ed3 JX |
10912 | msgid "git show-ref --exclude-existing[=<pattern>]" |
10913 | msgstr "git show-ref --exclude-existing[=<模式>]" | |
ef317cd5 | 10914 | |
94550ed3 | 10915 | #: builtin/show-ref.c:165 |
ef317cd5 | 10916 | msgid "only show tags (can be combined with heads)" |
55a16ee4 | 10917 | msgstr "只显示标签(可以和头共用)" |
ef317cd5 | 10918 | |
94550ed3 | 10919 | #: builtin/show-ref.c:166 |
ef317cd5 | 10920 | msgid "only show heads (can be combined with tags)" |
55a16ee4 | 10921 | msgstr "只显示头(可以和标签共用)" |
ef317cd5 | 10922 | |
94550ed3 | 10923 | #: builtin/show-ref.c:167 |
ef317cd5 | 10924 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 10925 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 10926 | |
94550ed3 | 10927 | #: builtin/show-ref.c:170 builtin/show-ref.c:172 |
2e8451e8 JX |
10928 | msgid "show the HEAD reference, even if it would be filtered out" |
10929 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 10930 | |
94550ed3 | 10931 | #: builtin/show-ref.c:174 |
ef317cd5 | 10932 | msgid "dereference tags into object IDs" |
4375c10e | 10933 | msgstr "转换标签到对象 ID" |
ef317cd5 | 10934 | |
94550ed3 | 10935 | #: builtin/show-ref.c:176 |
ef317cd5 | 10936 | msgid "only show SHA1 hash using <n> digits" |
07432cef | 10937 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" |
ef317cd5 | 10938 | |
94550ed3 | 10939 | #: builtin/show-ref.c:180 |
ef317cd5 | 10940 | msgid "do not print results to stdout (useful with --verify)" |
07432cef | 10941 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" |
ef317cd5 | 10942 | |
94550ed3 | 10943 | #: builtin/show-ref.c:182 |
ef317cd5 | 10944 | msgid "show refs from stdin that aren't in local repository" |
160fb2b2 | 10945 | msgstr "显示从标准输入中读入的不在本地仓库中的引用" |
ef317cd5 | 10946 | |
94550ed3 JX |
10947 | #: builtin/stripspace.c:17 |
10948 | msgid "git stripspace [-s | --strip-comments]" | |
10949 | msgstr "git stripspace [-s | --strip-comments]" | |
10950 | ||
10951 | #: builtin/stripspace.c:18 | |
10952 | msgid "git stripspace [-c | --comment-lines]" | |
10953 | msgstr "git stripspace [-c | --comment-lines]" | |
10954 | ||
10955 | #: builtin/stripspace.c:35 | |
10956 | msgid "skip and remove all lines starting with comment character" | |
10957 | msgstr "跳过和移除所有的注释行" | |
10958 | ||
10959 | #: builtin/stripspace.c:38 | |
276ceeaa | 10960 | msgid "prepend comment character and space to each line" |
94550ed3 JX |
10961 | msgstr "为每一行的行首添加注释符和空格" |
10962 | ||
5b04ee3b JX |
10963 | #: builtin/submodule--helper.c:24 |
10964 | #, c-format | |
10965 | msgid "No such ref: %s" | |
10966 | msgstr "没有这样的引用:%s" | |
10967 | ||
10968 | #: builtin/submodule--helper.c:31 | |
10969 | #, c-format | |
10970 | msgid "Expecting a full ref name, got %s" | |
10971 | msgstr "期望一个完整的引用名称,却得到 %s" | |
10972 | ||
10973 | #: builtin/submodule--helper.c:71 | |
10974 | #, c-format | |
10975 | msgid "cannot strip one component off url '%s'" | |
10976 | msgstr "无法从 url '%s' 剥离一个组件" | |
10977 | ||
10978 | #: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 | |
10979 | #: builtin/submodule--helper.c:486 | |
94550ed3 JX |
10980 | msgid "alternative anchor for relative paths" |
10981 | msgstr "相对路径的替代锚记(anchor)" | |
10982 | ||
5b04ee3b | 10983 | #: builtin/submodule--helper.c:283 |
94550ed3 JX |
10984 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" |
10985 | msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" | |
10986 | ||
5b04ee3b JX |
10987 | #: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 |
10988 | #, c-format | |
10989 | msgid "No url found for submodule path '%s' in .gitmodules" | |
10990 | msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" | |
10991 | ||
10992 | #: builtin/submodule--helper.c:366 | |
10993 | #, c-format | |
10994 | msgid "Failed to register url for submodule path '%s'" | |
10995 | msgstr "无法为子模组 '%s' 注册 url" | |
10996 | ||
10997 | #: builtin/submodule--helper.c:370 | |
10998 | #, c-format | |
10999 | msgid "Submodule '%s' (%s) registered for path '%s'\n" | |
aef18cc6 | 11000 | msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n" |
5b04ee3b JX |
11001 | |
11002 | # | |
11003 | #: builtin/submodule--helper.c:380 | |
aef18cc6 | 11004 | #, c-format |
5b04ee3b | 11005 | msgid "warning: command update mode suggested for submodule '%s'\n" |
aef18cc6 | 11006 | msgstr "警告:建议子模组 '%s' 使用命令更新模式\n" |
5b04ee3b JX |
11007 | |
11008 | #: builtin/submodule--helper.c:387 | |
11009 | #, c-format | |
11010 | msgid "Failed to register update mode for submodule path '%s'" | |
11011 | msgstr "无法为子模组 '%s' 注册更新模式" | |
11012 | ||
11013 | #: builtin/submodule--helper.c:406 | |
11014 | msgid "Suppress output for initializing a submodule" | |
11015 | msgstr "初始化子模组时抑制输出" | |
11016 | ||
11017 | #: builtin/submodule--helper.c:411 | |
11018 | msgid "git submodule--helper init [<path>]" | |
11019 | msgstr "git submodule--helper init [<路径>]" | |
11020 | ||
11021 | #: builtin/submodule--helper.c:432 | |
94550ed3 JX |
11022 | msgid "git submodule--helper name <path>" |
11023 | msgstr "git submodule--helper name <路径>" | |
11024 | ||
5b04ee3b | 11025 | #: builtin/submodule--helper.c:438 |
94550ed3 JX |
11026 | #, c-format |
11027 | msgid "no submodule mapping found in .gitmodules for path '%s'" | |
11028 | msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" | |
11029 | ||
5b04ee3b | 11030 | #: builtin/submodule--helper.c:489 |
94550ed3 JX |
11031 | msgid "where the new submodule will be cloned to" |
11032 | msgstr "新的子模组将要克隆的路径" | |
11033 | ||
5b04ee3b | 11034 | #: builtin/submodule--helper.c:492 |
94550ed3 JX |
11035 | msgid "name of the new submodule" |
11036 | msgstr "新子模组的名称" | |
11037 | ||
5b04ee3b | 11038 | #: builtin/submodule--helper.c:495 |
94550ed3 JX |
11039 | msgid "url where to clone the submodule from" |
11040 | msgstr "克隆子模组的 url 地址" | |
11041 | ||
5b04ee3b | 11042 | #: builtin/submodule--helper.c:501 |
94550ed3 JX |
11043 | msgid "depth for shallow clones" |
11044 | msgstr "浅克隆的深度" | |
11045 | ||
5b04ee3b | 11046 | #: builtin/submodule--helper.c:507 |
94550ed3 JX |
11047 | msgid "" |
11048 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " | |
5b04ee3b JX |
11049 | "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" |
11050 | msgstr "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] [--name <名字>] [--depth <深度>] --url <url> --path <路径>" | |
94550ed3 | 11051 | |
5b04ee3b | 11052 | #: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 |
94550ed3 JX |
11053 | #, c-format |
11054 | msgid "could not create directory '%s'" | |
11055 | msgstr "不能创建目录 '%s'" | |
11056 | ||
5b04ee3b | 11057 | #: builtin/submodule--helper.c:534 |
94550ed3 JX |
11058 | #, c-format |
11059 | msgid "clone of '%s' into submodule path '%s' failed" | |
11060 | msgstr "无法克隆 '%s' 到子模组路径 '%s'" | |
11061 | ||
5b04ee3b | 11062 | #: builtin/submodule--helper.c:550 |
94550ed3 JX |
11063 | #, c-format |
11064 | msgid "cannot open file '%s'" | |
11065 | msgstr "无法打开文件 '%s'" | |
11066 | ||
5b04ee3b | 11067 | #: builtin/submodule--helper.c:555 |
94550ed3 JX |
11068 | #, c-format |
11069 | msgid "could not close file %s" | |
11070 | msgstr "无法关闭文件 %s" | |
11071 | ||
5b04ee3b | 11072 | #: builtin/submodule--helper.c:562 |
94550ed3 JX |
11073 | #, c-format |
11074 | msgid "could not get submodule directory for '%s'" | |
11075 | msgstr "无法得到 '%s' 的子模组目录" | |
11076 | ||
5b04ee3b JX |
11077 | #: builtin/submodule--helper.c:609 |
11078 | #, c-format | |
11079 | msgid "Submodule path '%s' not initialized" | |
11080 | msgstr "子模组 '%s' 尚未初始化" | |
11081 | ||
11082 | #: builtin/submodule--helper.c:613 | |
11083 | msgid "Maybe you want to use 'update --init'?" | |
11084 | msgstr "也许您想要执行 'update --init'?" | |
11085 | ||
11086 | #: builtin/submodule--helper.c:639 | |
11087 | #, c-format | |
11088 | msgid "Skipping unmerged submodule %s" | |
11089 | msgstr "略过未合并的子模组 %s" | |
11090 | ||
11091 | #: builtin/submodule--helper.c:660 | |
11092 | #, c-format | |
11093 | msgid "Skipping submodule '%s'" | |
11094 | msgstr "略过子模组 '%s'" | |
11095 | ||
11096 | #: builtin/submodule--helper.c:768 | |
11097 | msgid "path into the working tree" | |
11098 | msgstr "到工作区的路径" | |
11099 | ||
11100 | #: builtin/submodule--helper.c:771 | |
11101 | msgid "path into the working tree, across nested submodule boundaries" | |
11102 | msgstr "工作区中的路径,递归嵌套子模组" | |
11103 | ||
11104 | #: builtin/submodule--helper.c:775 | |
11105 | msgid "rebase, merge, checkout or none" | |
11106 | msgstr "rebase、merge、checkout 或 none" | |
11107 | ||
11108 | #: builtin/submodule--helper.c:779 | |
11109 | msgid "Create a shallow clone truncated to the specified number of revisions" | |
11110 | msgstr "创建一个指定深度的浅克隆" | |
11111 | ||
11112 | #: builtin/submodule--helper.c:782 | |
11113 | msgid "parallel jobs" | |
11114 | msgstr "并发任务" | |
11115 | ||
11116 | #: builtin/submodule--helper.c:783 | |
11117 | msgid "don't print cloning progress" | |
11118 | msgstr "不要输出克隆进度" | |
94550ed3 | 11119 | |
5b04ee3b JX |
11120 | #: builtin/submodule--helper.c:788 |
11121 | msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" | |
11122 | msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" | |
11123 | ||
11124 | #: builtin/submodule--helper.c:798 | |
11125 | msgid "bad value for update parameter" | |
11126 | msgstr "update 参数取值错误" | |
11127 | ||
11128 | #: builtin/submodule--helper.c:855 | |
11129 | msgid "submodule--helper subcommand must be called with a subcommand" | |
11130 | msgstr "submodule-helper 子命令必须由另外的子命令调用" | |
11131 | ||
11132 | #: builtin/submodule--helper.c:862 | |
94550ed3 | 11133 | #, c-format |
5b04ee3b JX |
11134 | msgid "'%s' is not a valid submodule--helper subcommand" |
11135 | msgstr "'%s' 不是一个有效的 submodule--helper 子命令" | |
94550ed3 | 11136 | |
ef317cd5 | 11137 | #: builtin/symbolic-ref.c:7 |
814ff314 JX |
11138 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
11139 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" | |
07432cef WS |
11140 | |
11141 | #: builtin/symbolic-ref.c:8 | |
814ff314 JX |
11142 | msgid "git symbolic-ref -d [-q] <name>" |
11143 | msgstr "git symbolic-ref -d [-q] <名称>" | |
ef317cd5 | 11144 | |
07432cef | 11145 | #: builtin/symbolic-ref.c:40 |
ef317cd5 | 11146 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
11147 | msgstr "不显示非符号(分离的)引用的错误信息" |
11148 | ||
11149 | #: builtin/symbolic-ref.c:41 | |
11150 | msgid "delete symbolic ref" | |
11151 | msgstr "删除符号引用" | |
ef317cd5 | 11152 | |
07432cef | 11153 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 11154 | msgid "shorten ref output" |
07432cef | 11155 | msgstr "简短的引用输出" |
ef317cd5 | 11156 | |
1b7f4a34 | 11157 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 11158 | msgid "reason" |
07432cef | 11159 | msgstr "原因" |
ef317cd5 | 11160 | |
1b7f4a34 | 11161 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 11162 | msgid "reason of the update" |
07432cef | 11163 | msgstr "更新的原因" |
ef317cd5 | 11164 | |
94550ed3 | 11165 | #: builtin/tag.c:23 |
ef317cd5 | 11166 | msgid "" |
814ff314 JX |
11167 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " |
11168 | "[<head>]" | |
11169 | msgstr "" | |
11170 | "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" | |
ef317cd5 | 11171 | |
94550ed3 | 11172 | #: builtin/tag.c:24 |
ef317cd5 | 11173 | msgid "git tag -d <tagname>..." |
07432cef | 11174 | msgstr "git tag -d <标签名>..." |
ef317cd5 | 11175 | |
94550ed3 | 11176 | #: builtin/tag.c:25 |
ef317cd5 | 11177 | msgid "" |
814ff314 | 11178 | "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" |
94550ed3 | 11179 | "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" |
ef317cd5 | 11180 | msgstr "" |
94550ed3 JX |
11181 | "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n" |
11182 | "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" | |
ef317cd5 | 11183 | |
94550ed3 | 11184 | #: builtin/tag.c:27 |
ef317cd5 | 11185 | msgid "git tag -v <tagname>..." |
07432cef | 11186 | msgstr "git tag -v <标签名>..." |
ef317cd5 | 11187 | |
5b04ee3b | 11188 | #: builtin/tag.c:81 |
c04f5ac3 JX |
11189 | #, c-format |
11190 | msgid "tag name too long: %.*s..." | |
55a16ee4 | 11191 | msgstr "标签名称太长:%.*s..." |
c04f5ac3 | 11192 | |
5b04ee3b | 11193 | #: builtin/tag.c:86 |
c04f5ac3 JX |
11194 | #, c-format |
11195 | msgid "tag '%s' not found." | |
55a16ee4 | 11196 | msgstr "未发现标签 '%s'。" |
c04f5ac3 | 11197 | |
5b04ee3b | 11198 | #: builtin/tag.c:101 |
c04f5ac3 JX |
11199 | #, c-format |
11200 | msgid "Deleted tag '%s' (was %s)\n" | |
55a16ee4 | 11201 | msgstr "已删除标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 11202 | |
5b04ee3b | 11203 | #: builtin/tag.c:117 |
a77c07d9 | 11204 | #, c-format |
c04f5ac3 JX |
11205 | msgid "" |
11206 | "\n" | |
6acbf033 JX |
11207 | "Write a message for tag:\n" |
11208 | " %s\n" | |
a77c07d9 | 11209 | "Lines starting with '%c' will be ignored.\n" |
c04f5ac3 JX |
11210 | msgstr "" |
11211 | "\n" | |
55a16ee4 | 11212 | "输入一个标签说明:\n" |
6acbf033 | 11213 | " %s\n" |
a77c07d9 | 11214 | "以 '%c' 开头的行将被忽略。\n" |
c04f5ac3 | 11215 | |
5b04ee3b | 11216 | #: builtin/tag.c:121 |
a77c07d9 | 11217 | #, c-format |
c04f5ac3 JX |
11218 | msgid "" |
11219 | "\n" | |
6acbf033 JX |
11220 | "Write a message for tag:\n" |
11221 | " %s\n" | |
a77c07d9 | 11222 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
c04f5ac3 | 11223 | "want to.\n" |
c04f5ac3 JX |
11224 | msgstr "" |
11225 | "\n" | |
55a16ee4 | 11226 | "输入一个标签说明:\n" |
6acbf033 | 11227 | " %s\n" |
a77c07d9 | 11228 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
c04f5ac3 | 11229 | |
94550ed3 | 11230 | #: builtin/tag.c:199 |
c04f5ac3 | 11231 | msgid "unable to sign the tag" |
55a16ee4 | 11232 | msgstr "无法签署标签" |
c04f5ac3 | 11233 | |
94550ed3 | 11234 | #: builtin/tag.c:201 |
c04f5ac3 | 11235 | msgid "unable to write tag file" |
55a16ee4 | 11236 | msgstr "无法写标签文件" |
c04f5ac3 | 11237 | |
94550ed3 | 11238 | #: builtin/tag.c:226 |
c04f5ac3 | 11239 | msgid "bad object type." |
90e6ef53 | 11240 | msgstr "坏的对象类型。" |
c04f5ac3 | 11241 | |
94550ed3 | 11242 | #: builtin/tag.c:239 |
c04f5ac3 | 11243 | msgid "tag header too big." |
55a16ee4 | 11244 | msgstr "标签头信息太大。" |
c04f5ac3 | 11245 | |
94550ed3 | 11246 | #: builtin/tag.c:275 |
c04f5ac3 | 11247 | msgid "no tag message?" |
55a16ee4 | 11248 | msgstr "无标签说明?" |
c04f5ac3 | 11249 | |
94550ed3 | 11250 | #: builtin/tag.c:281 |
c04f5ac3 JX |
11251 | #, c-format |
11252 | msgid "The tag message has been left in %s\n" | |
55a16ee4 | 11253 | msgstr "标签说明被保留在 %s\n" |
c04f5ac3 | 11254 | |
94550ed3 | 11255 | #: builtin/tag.c:339 |
ef317cd5 | 11256 | msgid "list tag names" |
55a16ee4 | 11257 | msgstr "列出标签名称" |
ef317cd5 | 11258 | |
94550ed3 | 11259 | #: builtin/tag.c:341 |
ef317cd5 | 11260 | msgid "print <n> lines of each tag message" |
55a16ee4 | 11261 | msgstr "每个标签信息打印 <n> 行" |
ef317cd5 | 11262 | |
94550ed3 | 11263 | #: builtin/tag.c:343 |
ef317cd5 | 11264 | msgid "delete tags" |
55a16ee4 | 11265 | msgstr "删除标签" |
ef317cd5 | 11266 | |
94550ed3 | 11267 | #: builtin/tag.c:344 |
ef317cd5 | 11268 | msgid "verify tags" |
55a16ee4 | 11269 | msgstr "验证标签" |
ef317cd5 | 11270 | |
94550ed3 | 11271 | #: builtin/tag.c:346 |
ef317cd5 | 11272 | msgid "Tag creation options" |
55a16ee4 | 11273 | msgstr "标签创建选项" |
ef317cd5 | 11274 | |
94550ed3 | 11275 | #: builtin/tag.c:348 |
ef317cd5 | 11276 | msgid "annotated tag, needs a message" |
55a16ee4 | 11277 | msgstr "附注标签,需要一个说明" |
ef317cd5 | 11278 | |
94550ed3 | 11279 | #: builtin/tag.c:350 |
ef317cd5 | 11280 | msgid "tag message" |
55a16ee4 | 11281 | msgstr "标签说明" |
ef317cd5 | 11282 | |
94550ed3 | 11283 | #: builtin/tag.c:352 |
ef317cd5 | 11284 | msgid "annotated and GPG-signed tag" |
55a16ee4 | 11285 | msgstr "附注并附加 GPG 签名的标签" |
ef317cd5 | 11286 | |
94550ed3 | 11287 | #: builtin/tag.c:356 |
ef317cd5 | 11288 | msgid "use another key to sign the tag" |
55a16ee4 | 11289 | msgstr "使用另外的私钥签名该标签" |
ef317cd5 | 11290 | |
94550ed3 | 11291 | #: builtin/tag.c:357 |
ef317cd5 | 11292 | msgid "replace the tag if exists" |
55a16ee4 | 11293 | msgstr "如果存在,替换现有的标签" |
ef317cd5 | 11294 | |
94550ed3 | 11295 | #: builtin/tag.c:358 builtin/update-ref.c:368 |
03ea3327 | 11296 | msgid "create a reflog" |
1b7f4a34 JX |
11297 | msgstr "创建引用日志" |
11298 | ||
94550ed3 | 11299 | #: builtin/tag.c:360 |
814ff314 | 11300 | msgid "Tag listing options" |
55a16ee4 | 11301 | msgstr "标签列表选项" |
814ff314 | 11302 | |
94550ed3 | 11303 | #: builtin/tag.c:361 |
ef317cd5 | 11304 | msgid "show tag list in columns" |
55a16ee4 | 11305 | msgstr "以列的方式显示标签列表" |
ef317cd5 | 11306 | |
94550ed3 | 11307 | #: builtin/tag.c:362 builtin/tag.c:363 |
ef317cd5 | 11308 | msgid "print only tags that contain the commit" |
55a16ee4 | 11309 | msgstr "只打印包含提交的标签" |
ef317cd5 | 11310 | |
94550ed3 JX |
11311 | #: builtin/tag.c:364 |
11312 | msgid "print only tags that are merged" | |
11313 | msgstr "只打印已经合并的标签" | |
11314 | ||
11315 | #: builtin/tag.c:365 | |
11316 | msgid "print only tags that are not merged" | |
11317 | msgstr "只打印尚未合并的标签" | |
11318 | ||
11319 | #: builtin/tag.c:370 | |
ef317cd5 | 11320 | msgid "print only tags of the object" |
55a16ee4 | 11321 | msgstr "只打印对象的标签" |
ef317cd5 | 11322 | |
94550ed3 | 11323 | #: builtin/tag.c:399 |
8ada9598 | 11324 | msgid "--column and -n are incompatible" |
81809b99 | 11325 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 11326 | |
94550ed3 | 11327 | #: builtin/tag.c:419 |
c04f5ac3 | 11328 | msgid "-n option is only allowed with -l." |
649900bc | 11329 | msgstr "-n 选项只允许和 -l 同时使用。" |
c04f5ac3 | 11330 | |
94550ed3 | 11331 | #: builtin/tag.c:421 |
c04f5ac3 | 11332 | msgid "--contains option is only allowed with -l." |
649900bc | 11333 | msgstr "--contains 选项只允许和 -l 同时使用。" |
c04f5ac3 | 11334 | |
94550ed3 | 11335 | #: builtin/tag.c:423 |
7ac1c0ad | 11336 | msgid "--points-at option is only allowed with -l." |
649900bc | 11337 | msgstr "--points-at 选项只允许和 -l 同时使用。" |
7ac1c0ad | 11338 | |
94550ed3 JX |
11339 | #: builtin/tag.c:425 |
11340 | msgid "--merged and --no-merged option are only allowed with -l" | |
11341 | msgstr "选项 --merged 和 --no-merged 只能和 -l 共用" | |
11342 | ||
11343 | #: builtin/tag.c:433 | |
c04f5ac3 JX |
11344 | msgid "only one -F or -m option is allowed." |
11345 | msgstr "只允许一个 -F 或 -m 选项。" | |
11346 | ||
5b04ee3b | 11347 | #: builtin/tag.c:452 |
c04f5ac3 JX |
11348 | msgid "too many params" |
11349 | msgstr "太多参数" | |
11350 | ||
5b04ee3b | 11351 | #: builtin/tag.c:458 |
c04f5ac3 JX |
11352 | #, c-format |
11353 | msgid "'%s' is not a valid tag name." | |
55a16ee4 | 11354 | msgstr "'%s' 不是一个有效的标签名称。" |
c04f5ac3 | 11355 | |
5b04ee3b | 11356 | #: builtin/tag.c:463 |
c04f5ac3 JX |
11357 | #, c-format |
11358 | msgid "tag '%s' already exists" | |
55a16ee4 | 11359 | msgstr "标签 '%s' 已存在" |
c04f5ac3 | 11360 | |
5b04ee3b | 11361 | #: builtin/tag.c:491 |
c04f5ac3 JX |
11362 | #, c-format |
11363 | msgid "Updated tag '%s' (was %s)\n" | |
55a16ee4 | 11364 | msgstr "已更新标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 11365 | |
1b7f4a34 | 11366 | #: builtin/unpack-objects.c:490 |
6c94aba5 JX |
11367 | msgid "Unpacking objects" |
11368 | msgstr "展开对象中" | |
11369 | ||
276ceeaa | 11370 | #: builtin/update-index.c:79 |
7aea43ff JX |
11371 | #, c-format |
11372 | msgid "failed to create directory %s" | |
11373 | msgstr "无法创建目录 %s" | |
11374 | ||
276ceeaa | 11375 | #: builtin/update-index.c:85 |
7aea43ff JX |
11376 | #, c-format |
11377 | msgid "failed to stat %s" | |
11378 | msgstr "无法枚举 %s 状态" | |
11379 | ||
276ceeaa | 11380 | #: builtin/update-index.c:95 |
7aea43ff JX |
11381 | #, c-format |
11382 | msgid "failed to create file %s" | |
11383 | msgstr "无法创建文件 %s" | |
11384 | ||
276ceeaa | 11385 | #: builtin/update-index.c:103 |
7aea43ff JX |
11386 | #, c-format |
11387 | msgid "failed to delete file %s" | |
11388 | msgstr "无法删除文件 %s" | |
11389 | ||
276ceeaa | 11390 | #: builtin/update-index.c:110 builtin/update-index.c:212 |
7aea43ff JX |
11391 | #, c-format |
11392 | msgid "failed to delete directory %s" | |
11393 | msgstr "无法删除目录 %s" | |
11394 | ||
276ceeaa | 11395 | #: builtin/update-index.c:133 |
7aea43ff | 11396 | #, c-format |
276ceeaa JX |
11397 | msgid "Testing mtime in '%s' " |
11398 | msgstr "在 '%s' 中测试 mtime " | |
7aea43ff | 11399 | |
276ceeaa | 11400 | #: builtin/update-index.c:145 |
7aea43ff JX |
11401 | msgid "directory stat info does not change after adding a new file" |
11402 | msgstr "添加一个新文件后,目录的状态信息未改变" | |
11403 | ||
276ceeaa | 11404 | #: builtin/update-index.c:158 |
7aea43ff JX |
11405 | msgid "directory stat info does not change after adding a new directory" |
11406 | msgstr "添加一个新目录后,目录的状态信息未改变" | |
11407 | ||
276ceeaa | 11408 | #: builtin/update-index.c:171 |
7aea43ff JX |
11409 | msgid "directory stat info changes after updating a file" |
11410 | msgstr "更新一个文件后,目录的状态信息被修改" | |
11411 | ||
276ceeaa | 11412 | #: builtin/update-index.c:182 |
7aea43ff JX |
11413 | msgid "directory stat info changes after adding a file inside subdirectory" |
11414 | msgstr "在子目录中添加文件后,目录的状态信息被修改" | |
11415 | ||
276ceeaa | 11416 | #: builtin/update-index.c:193 |
7aea43ff JX |
11417 | msgid "directory stat info does not change after deleting a file" |
11418 | msgstr "删除一个文件后,目录的状态信息未改变" | |
11419 | ||
276ceeaa | 11420 | #: builtin/update-index.c:206 |
7aea43ff JX |
11421 | msgid "directory stat info does not change after deleting a directory" |
11422 | msgstr "删除一个目录后,目录的状态信息未改变" | |
11423 | ||
276ceeaa | 11424 | #: builtin/update-index.c:213 |
7aea43ff JX |
11425 | msgid " OK" |
11426 | msgstr " OK" | |
11427 | ||
276ceeaa | 11428 | #: builtin/update-index.c:575 |
814ff314 JX |
11429 | msgid "git update-index [<options>] [--] [<file>...]" |
11430 | msgstr "git update-index [<选项>] [--] [<文件>...]" | |
8ada9598 | 11431 | |
276ceeaa | 11432 | #: builtin/update-index.c:930 |
ef317cd5 | 11433 | msgid "continue refresh even when index needs update" |
07432cef | 11434 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 11435 | |
276ceeaa | 11436 | #: builtin/update-index.c:933 |
ef317cd5 | 11437 | msgid "refresh: ignore submodules" |
07432cef | 11438 | msgstr "刷新:忽略子模组" |
8ada9598 | 11439 | |
276ceeaa | 11440 | #: builtin/update-index.c:936 |
ef317cd5 | 11441 | msgid "do not ignore new files" |
07432cef | 11442 | msgstr "不忽略新的文件" |
8ada9598 | 11443 | |
276ceeaa | 11444 | #: builtin/update-index.c:938 |
ef317cd5 | 11445 | msgid "let files replace directories and vice-versa" |
07432cef | 11446 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 11447 | |
276ceeaa | 11448 | #: builtin/update-index.c:940 |
ef317cd5 | 11449 | msgid "notice files missing from worktree" |
07432cef | 11450 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 11451 | |
276ceeaa | 11452 | #: builtin/update-index.c:942 |
ef317cd5 | 11453 | msgid "refresh even if index contains unmerged entries" |
07432cef | 11454 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 11455 | |
276ceeaa | 11456 | #: builtin/update-index.c:945 |
ef317cd5 | 11457 | msgid "refresh stat information" |
07432cef | 11458 | msgstr "刷新统计信息" |
ef317cd5 | 11459 | |
276ceeaa | 11460 | #: builtin/update-index.c:949 |
ef317cd5 | 11461 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 11462 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 11463 | |
276ceeaa | 11464 | #: builtin/update-index.c:953 |
6c94aba5 | 11465 | msgid "<mode>,<object>,<path>" |
d9d56b23 | 11466 | msgstr "<存取模式>,<对象>,<路径>" |
ef317cd5 | 11467 | |
276ceeaa | 11468 | #: builtin/update-index.c:954 |
ef317cd5 | 11469 | msgid "add the specified entry to the index" |
07432cef | 11470 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 11471 | |
276ceeaa | 11472 | #: builtin/update-index.c:958 |
ef317cd5 | 11473 | msgid "(+/-)x" |
07432cef | 11474 | msgstr "(+/-)x" |
ef317cd5 | 11475 | |
276ceeaa | 11476 | #: builtin/update-index.c:959 |
ef317cd5 | 11477 | msgid "override the executable bit of the listed files" |
07432cef | 11478 | msgstr "覆盖列表里文件的可执行位" |
ef317cd5 | 11479 | |
276ceeaa | 11480 | #: builtin/update-index.c:963 |
ef317cd5 | 11481 | msgid "mark files as \"not changing\"" |
07432cef | 11482 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 11483 | |
276ceeaa | 11484 | #: builtin/update-index.c:966 |
ef317cd5 | 11485 | msgid "clear assumed-unchanged bit" |
07432cef | 11486 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 11487 | |
276ceeaa | 11488 | #: builtin/update-index.c:969 |
ef317cd5 | 11489 | msgid "mark files as \"index-only\"" |
07432cef | 11490 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 11491 | |
276ceeaa | 11492 | #: builtin/update-index.c:972 |
ef317cd5 | 11493 | msgid "clear skip-worktree bit" |
07432cef | 11494 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 11495 | |
276ceeaa | 11496 | #: builtin/update-index.c:975 |
ef317cd5 | 11497 | msgid "add to index only; do not add content to object database" |
07432cef | 11498 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 11499 | |
276ceeaa | 11500 | #: builtin/update-index.c:977 |
ef317cd5 | 11501 | msgid "remove named paths even if present in worktree" |
07432cef | 11502 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 11503 | |
276ceeaa | 11504 | #: builtin/update-index.c:979 |
ef317cd5 | 11505 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 11506 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 11507 | |
276ceeaa | 11508 | #: builtin/update-index.c:981 |
ef317cd5 | 11509 | msgid "read list of paths to be updated from standard input" |
07432cef | 11510 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 11511 | |
276ceeaa | 11512 | #: builtin/update-index.c:985 |
ef317cd5 | 11513 | msgid "add entries from standard input to the index" |
07432cef | 11514 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 11515 | |
276ceeaa | 11516 | #: builtin/update-index.c:989 |
ef317cd5 | 11517 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 11518 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 11519 | |
276ceeaa | 11520 | #: builtin/update-index.c:993 |
ef317cd5 | 11521 | msgid "only update entries that differ from HEAD" |
07432cef | 11522 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 11523 | |
276ceeaa | 11524 | #: builtin/update-index.c:997 |
ef317cd5 | 11525 | msgid "ignore files missing from worktree" |
07432cef | 11526 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 11527 | |
276ceeaa | 11528 | #: builtin/update-index.c:1000 |
ef317cd5 | 11529 | msgid "report actions to standard output" |
07432cef | 11530 | msgstr "在标准输出显示操作" |
ef317cd5 | 11531 | |
276ceeaa | 11532 | #: builtin/update-index.c:1002 |
ef317cd5 | 11533 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 11534 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 11535 | |
276ceeaa | 11536 | #: builtin/update-index.c:1006 |
ef317cd5 | 11537 | msgid "write index in this format" |
07432cef | 11538 | msgstr "以这种格式写入索引区" |
ef317cd5 | 11539 | |
276ceeaa | 11540 | #: builtin/update-index.c:1008 |
6acbf033 JX |
11541 | msgid "enable or disable split index" |
11542 | msgstr "启用或禁用索引拆分" | |
11543 | ||
276ceeaa | 11544 | #: builtin/update-index.c:1010 |
7aea43ff JX |
11545 | msgid "enable/disable untracked cache" |
11546 | msgstr "启用/禁用对未跟踪文件的缓存" | |
11547 | ||
276ceeaa JX |
11548 | #: builtin/update-index.c:1012 |
11549 | msgid "test if the filesystem supports untracked cache" | |
11550 | msgstr "测试文件系统是否支持未跟踪文件缓存" | |
11551 | ||
11552 | #: builtin/update-index.c:1014 | |
7aea43ff JX |
11553 | msgid "enable untracked cache without testing the filesystem" |
11554 | msgstr "无需检测文件系统,启用对未跟踪文件的缓存" | |
11555 | ||
276ceeaa JX |
11556 | #: builtin/update-index.c:1134 |
11557 | msgid "Untracked cache disabled" | |
11558 | msgstr "缓存未跟踪文件被禁用" | |
11559 | ||
11560 | #: builtin/update-index.c:1146 | |
11561 | #, c-format | |
11562 | msgid "Untracked cache enabled for '%s'" | |
11563 | msgstr "缓存未跟踪文件在 '%s' 启用" | |
11564 | ||
90314792 | 11565 | #: builtin/update-ref.c:9 |
814ff314 JX |
11566 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
11567 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" | |
ef317cd5 | 11568 | |
90314792 | 11569 | #: builtin/update-ref.c:10 |
814ff314 JX |
11570 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
11571 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" | |
90314792 JX |
11572 | |
11573 | #: builtin/update-ref.c:11 | |
814ff314 JX |
11574 | msgid "git update-ref [<options>] --stdin [-z]" |
11575 | msgstr "git update-ref [<选项>] --stdin [-z]" | |
ef317cd5 | 11576 | |
1b7f4a34 | 11577 | #: builtin/update-ref.c:363 |
ef317cd5 | 11578 | msgid "delete the reference" |
07432cef | 11579 | msgstr "删除引用" |
ef317cd5 | 11580 | |
1b7f4a34 | 11581 | #: builtin/update-ref.c:365 |
ef317cd5 | 11582 | msgid "update <refname> not the one it points to" |
07432cef | 11583 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 11584 | |
1b7f4a34 | 11585 | #: builtin/update-ref.c:366 |
90314792 JX |
11586 | msgid "stdin has NUL-terminated arguments" |
11587 | msgstr "标准输入有以 NUL 字符终止的参数" | |
11588 | ||
1b7f4a34 | 11589 | #: builtin/update-ref.c:367 |
90314792 JX |
11590 | msgid "read updates from stdin" |
11591 | msgstr "从标准输入读取更新" | |
11592 | ||
ef317cd5 JX |
11593 | #: builtin/update-server-info.c:6 |
11594 | msgid "git update-server-info [--force]" | |
07432cef | 11595 | msgstr "git update-server-info [--force]" |
ef317cd5 JX |
11596 | |
11597 | #: builtin/update-server-info.c:14 | |
11598 | msgid "update the info files from scratch" | |
07432cef | 11599 | msgstr "从头开始更新文件信息" |
ef317cd5 | 11600 | |
6acbf033 | 11601 | #: builtin/verify-commit.c:17 |
814ff314 JX |
11602 | msgid "git verify-commit [-v | --verbose] <commit>..." |
11603 | msgstr "git verify-commit [-v | --verbose] <提交>..." | |
6acbf033 | 11604 | |
1b7f4a34 | 11605 | #: builtin/verify-commit.c:72 |
6acbf033 JX |
11606 | msgid "print commit contents" |
11607 | msgstr "打印提交内容" | |
11608 | ||
5b04ee3b | 11609 | #: builtin/verify-commit.c:73 builtin/verify-tag.c:35 |
1b7f4a34 JX |
11610 | msgid "print raw gpg status output" |
11611 | msgstr "打印原始 gpg 状态输出" | |
11612 | ||
220c313c | 11613 | #: builtin/verify-pack.c:54 |
814ff314 JX |
11614 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
11615 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." | |
ef317cd5 | 11616 | |
220c313c | 11617 | #: builtin/verify-pack.c:64 |
ef317cd5 JX |
11618 | msgid "verbose" |
11619 | msgstr "冗长输出" | |
11620 | ||
220c313c | 11621 | #: builtin/verify-pack.c:66 |
ef317cd5 | 11622 | msgid "show statistics only" |
07432cef | 11623 | msgstr "只显示统计" |
ef317cd5 JX |
11624 | |
11625 | #: builtin/verify-tag.c:17 | |
814ff314 JX |
11626 | msgid "git verify-tag [-v | --verbose] <tag>..." |
11627 | msgstr "git verify-tag [-v | --verbose] <标签>..." | |
ef317cd5 | 11628 | |
5b04ee3b | 11629 | #: builtin/verify-tag.c:34 |
ef317cd5 | 11630 | msgid "print tag contents" |
55a16ee4 | 11631 | msgstr "打印标签内容" |
ef317cd5 | 11632 | |
94550ed3 JX |
11633 | #: builtin/worktree.c:15 |
11634 | msgid "git worktree add [<options>] <path> [<branch>]" | |
11635 | msgstr "git worktree add [<选项>] <路径> [<分支>]" | |
5bb01d4f | 11636 | |
94550ed3 | 11637 | #: builtin/worktree.c:16 |
5bb01d4f JX |
11638 | msgid "git worktree prune [<options>]" |
11639 | msgstr "git worktree prune [<选项>]" | |
11640 | ||
94550ed3 JX |
11641 | #: builtin/worktree.c:17 |
11642 | msgid "git worktree list [<options>]" | |
11643 | msgstr "git worktree list [<选项>]" | |
11644 | ||
5b04ee3b | 11645 | #: builtin/worktree.c:40 |
5bb01d4f JX |
11646 | #, c-format |
11647 | msgid "Removing worktrees/%s: not a valid directory" | |
11648 | msgstr "删除工作区/%s:不是一个有效的目录" | |
11649 | ||
5b04ee3b | 11650 | #: builtin/worktree.c:46 |
5bb01d4f JX |
11651 | #, c-format |
11652 | msgid "Removing worktrees/%s: gitdir file does not exist" | |
11653 | msgstr "删除 worktrees/%s:gitdir 文件不存在" | |
11654 | ||
5b04ee3b | 11655 | #: builtin/worktree.c:51 |
5bb01d4f JX |
11656 | #, c-format |
11657 | msgid "Removing worktrees/%s: unable to read gitdir file (%s)" | |
11658 | msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)" | |
11659 | ||
5b04ee3b | 11660 | #: builtin/worktree.c:62 |
5bb01d4f JX |
11661 | #, c-format |
11662 | msgid "Removing worktrees/%s: invalid gitdir file" | |
11663 | msgstr "删除 worktrees/%s:无效的 gitdir 文件" | |
11664 | ||
5b04ee3b | 11665 | #: builtin/worktree.c:78 |
5bb01d4f JX |
11666 | #, c-format |
11667 | msgid "Removing worktrees/%s: gitdir file points to non-existent location" | |
11668 | msgstr "删除 worktrees/%s:gitdir 文件的指向不存在" | |
11669 | ||
5b04ee3b | 11670 | #: builtin/worktree.c:113 |
5bb01d4f | 11671 | #, c-format |
5b04ee3b JX |
11672 | msgid "failed to remove '%s'" |
11673 | msgstr "无法删除 '%s'" | |
5bb01d4f | 11674 | |
5b04ee3b | 11675 | #: builtin/worktree.c:202 |
5bb01d4f JX |
11676 | #, c-format |
11677 | msgid "'%s' already exists" | |
11678 | msgstr "'%s' 已经存在" | |
11679 | ||
5b04ee3b | 11680 | #: builtin/worktree.c:234 |
5bb01d4f JX |
11681 | #, c-format |
11682 | msgid "could not create directory of '%s'" | |
11683 | msgstr "不能创建目录 '%s'" | |
11684 | ||
5b04ee3b | 11685 | #: builtin/worktree.c:270 |
5bb01d4f | 11686 | #, c-format |
1b7f4a34 JX |
11687 | msgid "Preparing %s (identifier %s)" |
11688 | msgstr "准备 %s (标识符 %s)" | |
5bb01d4f | 11689 | |
5b04ee3b | 11690 | #: builtin/worktree.c:322 |
5bb01d4f JX |
11691 | msgid "checkout <branch> even if already checked out in other worktree" |
11692 | msgstr "检出分支 <branch> 即使已经被检出到其它工作区" | |
11693 | ||
5b04ee3b | 11694 | #: builtin/worktree.c:324 |
5bb01d4f JX |
11695 | msgid "create a new branch" |
11696 | msgstr "创建一个新分支" | |
11697 | ||
5b04ee3b | 11698 | #: builtin/worktree.c:326 |
5bb01d4f JX |
11699 | msgid "create or reset a branch" |
11700 | msgstr "创建或重置一个分支" | |
11701 | ||
5b04ee3b | 11702 | #: builtin/worktree.c:327 |
5bb01d4f JX |
11703 | msgid "detach HEAD at named commit" |
11704 | msgstr "HEAD 从指定的提交分离" | |
11705 | ||
5b04ee3b JX |
11706 | #: builtin/worktree.c:328 |
11707 | msgid "populate the new working tree" | |
11708 | msgstr "生成新的工作区" | |
11709 | ||
11710 | #: builtin/worktree.c:336 | |
1b7f4a34 JX |
11711 | msgid "-b, -B, and --detach are mutually exclusive" |
11712 | msgstr "-b、-B 和 --detach 是互斥的" | |
5bb01d4f | 11713 | |
ef317cd5 JX |
11714 | #: builtin/write-tree.c:13 |
11715 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" | |
07432cef | 11716 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 JX |
11717 | |
11718 | #: builtin/write-tree.c:26 | |
11719 | msgid "<prefix>/" | |
07432cef | 11720 | msgstr "<前缀>/" |
ef317cd5 JX |
11721 | |
11722 | #: builtin/write-tree.c:27 | |
11723 | msgid "write tree object for a subdirectory <prefix>" | |
07432cef | 11724 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 JX |
11725 | |
11726 | #: builtin/write-tree.c:30 | |
11727 | msgid "only useful for debugging" | |
07432cef | 11728 | msgstr "只对调试有用" |
ef317cd5 | 11729 | |
5b04ee3b | 11730 | #: credential-cache--daemon.c:271 |
220c313c JX |
11731 | msgid "print debugging messages to stderr" |
11732 | msgstr "调试信息输出到标准错误" | |
11733 | ||
d9d56b23 | 11734 | #: git.c:14 |
4dcdc3d8 | 11735 | msgid "" |
220c313c | 11736 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
4dcdc3d8 JX |
11737 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
11738 | "to read about a specific subcommand or concept." | |
11739 | msgstr "" | |
220c313c JX |
11740 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" |
11741 | "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" | |
11742 | "帮助。" | |
8ada9598 | 11743 | |
5b04ee3b | 11744 | #: http.c:322 |
276ceeaa JX |
11745 | msgid "Public key pinning not supported with cURL < 7.44.0" |
11746 | msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0" | |
11747 | ||
1b7f4a34 | 11748 | #: common-cmds.h:9 |
7aea43ff JX |
11749 | msgid "start a working area (see also: git help tutorial)" |
11750 | msgstr "开始一个工作区(参见:git help tutorial)" | |
11751 | ||
1b7f4a34 | 11752 | #: common-cmds.h:10 |
7aea43ff JX |
11753 | msgid "work on the current change (see also: git help everyday)" |
11754 | msgstr "在当前变更上工作(参见:git help everyday)" | |
11755 | ||
1b7f4a34 | 11756 | #: common-cmds.h:11 |
7aea43ff JX |
11757 | msgid "examine the history and state (see also: git help revisions)" |
11758 | msgstr "检查历史和状态(参见:git help revisions)" | |
11759 | ||
1b7f4a34 | 11760 | #: common-cmds.h:12 |
7aea43ff JX |
11761 | msgid "grow, mark and tweak your common history" |
11762 | msgstr "扩展、标记和调校您的历史记录" | |
11763 | ||
1b7f4a34 | 11764 | #: common-cmds.h:13 |
7aea43ff JX |
11765 | msgid "collaborate (see also: git help workflows)" |
11766 | msgstr "协同(参见:git help workflows)" | |
11767 | ||
1b7f4a34 | 11768 | #: common-cmds.h:17 |
8ada9598 | 11769 | msgid "Add file contents to the index" |
81809b99 | 11770 | msgstr "添加文件内容至索引" |
8ada9598 | 11771 | |
1b7f4a34 JX |
11772 | #: common-cmds.h:18 |
11773 | msgid "Use binary search to find the commit that introduced a bug" | |
11774 | msgstr "通过二分查找定位引入 bug 的提交" | |
8ada9598 | 11775 | |
1b7f4a34 | 11776 | #: common-cmds.h:19 |
8ada9598 | 11777 | msgid "List, create, or delete branches" |
81809b99 | 11778 | msgstr "列出、创建或删除分支" |
8ada9598 | 11779 | |
1b7f4a34 | 11780 | #: common-cmds.h:20 |
5bb01d4f JX |
11781 | msgid "Switch branches or restore working tree files" |
11782 | msgstr "切换分支或恢复工作区文件" | |
8ada9598 | 11783 | |
1b7f4a34 | 11784 | #: common-cmds.h:21 |
8ada9598 | 11785 | msgid "Clone a repository into a new directory" |
160fb2b2 | 11786 | msgstr "克隆一个仓库到一个新目录" |
8ada9598 | 11787 | |
1b7f4a34 | 11788 | #: common-cmds.h:22 |
8ada9598 | 11789 | msgid "Record changes to the repository" |
160fb2b2 | 11790 | msgstr "记录变更到仓库" |
8ada9598 | 11791 | |
1b7f4a34 | 11792 | #: common-cmds.h:23 |
8ada9598 | 11793 | msgid "Show changes between commits, commit and working tree, etc" |
81809b99 | 11794 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 | 11795 | |
1b7f4a34 | 11796 | #: common-cmds.h:24 |
8ada9598 | 11797 | msgid "Download objects and refs from another repository" |
160fb2b2 | 11798 | msgstr "从另外一个仓库下载对象和引用" |
8ada9598 | 11799 | |
1b7f4a34 | 11800 | #: common-cmds.h:25 |
8ada9598 | 11801 | msgid "Print lines matching a pattern" |
81809b99 | 11802 | msgstr "输出和模式匹配的行" |
8ada9598 | 11803 | |
1b7f4a34 | 11804 | #: common-cmds.h:26 |
a77c07d9 | 11805 | msgid "Create an empty Git repository or reinitialize an existing one" |
160fb2b2 | 11806 | msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" |
8ada9598 | 11807 | |
1b7f4a34 | 11808 | #: common-cmds.h:27 |
8ada9598 | 11809 | msgid "Show commit logs" |
81809b99 | 11810 | msgstr "显示提交日志" |
8ada9598 | 11811 | |
1b7f4a34 | 11812 | #: common-cmds.h:28 |
8ada9598 | 11813 | msgid "Join two or more development histories together" |
81809b99 | 11814 | msgstr "合并两个或更多开发历史" |
8ada9598 | 11815 | |
1b7f4a34 | 11816 | #: common-cmds.h:29 |
8ada9598 | 11817 | msgid "Move or rename a file, a directory, or a symlink" |
81809b99 | 11818 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 | 11819 | |
1b7f4a34 | 11820 | #: common-cmds.h:30 |
2e8451e8 | 11821 | msgid "Fetch from and integrate with another repository or a local branch" |
160fb2b2 | 11822 | msgstr "获取并整合另外的仓库或一个本地分支" |
8ada9598 | 11823 | |
1b7f4a34 | 11824 | #: common-cmds.h:31 |
8ada9598 | 11825 | msgid "Update remote refs along with associated objects" |
81809b99 | 11826 | msgstr "更新远程引用和相关的对象" |
8ada9598 | 11827 | |
1b7f4a34 | 11828 | #: common-cmds.h:32 |
3495628d JX |
11829 | msgid "Reapply commits on top of another base tip" |
11830 | msgstr "在另一个分支上重新应用提交" | |
8ada9598 | 11831 | |
1b7f4a34 | 11832 | #: common-cmds.h:33 |
8ada9598 | 11833 | msgid "Reset current HEAD to the specified state" |
4375c10e | 11834 | msgstr "重置当前 HEAD 到指定状态" |
8ada9598 | 11835 | |
1b7f4a34 | 11836 | #: common-cmds.h:34 |
8ada9598 | 11837 | msgid "Remove files from the working tree and from the index" |
81809b99 | 11838 | msgstr "从工作区和索引中删除文件" |
8ada9598 | 11839 | |
1b7f4a34 | 11840 | #: common-cmds.h:35 |
8ada9598 | 11841 | msgid "Show various types of objects" |
81809b99 | 11842 | msgstr "显示各种类型的对象" |
8ada9598 | 11843 | |
1b7f4a34 | 11844 | #: common-cmds.h:36 |
8ada9598 | 11845 | msgid "Show the working tree status" |
81809b99 | 11846 | msgstr "显示工作区状态" |
8ada9598 | 11847 | |
1b7f4a34 | 11848 | #: common-cmds.h:37 |
8ada9598 | 11849 | msgid "Create, list, delete or verify a tag object signed with GPG" |
4375c10e | 11850 | msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" |
8ada9598 | 11851 | |
1b7f4a34 | 11852 | #: parse-options.h:145 |
220c313c JX |
11853 | msgid "expiry-date" |
11854 | msgstr "到期时间" | |
11855 | ||
1b7f4a34 | 11856 | #: parse-options.h:160 |
220c313c JX |
11857 | msgid "no-op (backward compatibility)" |
11858 | msgstr "空操作(向后兼容)" | |
11859 | ||
94550ed3 | 11860 | #: parse-options.h:237 |
220c313c JX |
11861 | msgid "be more verbose" |
11862 | msgstr "更加详细" | |
11863 | ||
94550ed3 | 11864 | #: parse-options.h:239 |
220c313c JX |
11865 | msgid "be more quiet" |
11866 | msgstr "更加安静" | |
11867 | ||
94550ed3 | 11868 | #: parse-options.h:245 |
220c313c JX |
11869 | msgid "use <n> digits to display SHA-1s" |
11870 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
11871 | ||
5b04ee3b | 11872 | #: rerere.h:40 |
220c313c JX |
11873 | msgid "update the index with reused conflict resolution if possible" |
11874 | msgstr "如果可能,重用冲突解决更新索引" | |
11875 | ||
94550ed3 | 11876 | #: git-bisect.sh:55 |
b694fbb1 JX |
11877 | msgid "You need to start by \"git bisect start\"" |
11878 | msgstr "您需要执行 \"git bisect start\" 来开始" | |
11879 | ||
90e6ef53 | 11880 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
11881 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
11882 | #. translation. The program will only accept English input | |
11883 | #. at this point. | |
94550ed3 | 11884 | #: git-bisect.sh:61 |
c04f5ac3 JX |
11885 | msgid "Do you want me to do it for you [Y/n]? " |
11886 | msgstr "您想让我为您这样做么[Y/n]? " | |
11887 | ||
94550ed3 | 11888 | #: git-bisect.sh:122 |
c04f5ac3 JX |
11889 | #, sh-format |
11890 | msgid "unrecognised option: '$arg'" | |
81809b99 | 11891 | msgstr "未能识别的选项:'$arg'" |
c04f5ac3 | 11892 | |
94550ed3 | 11893 | #: git-bisect.sh:126 |
c04f5ac3 JX |
11894 | #, sh-format |
11895 | msgid "'$arg' does not appear to be a valid revision" | |
11896 | msgstr "'$arg' 看起来不像是一个有效的版本" | |
11897 | ||
94550ed3 | 11898 | #: git-bisect.sh:155 |
c04f5ac3 JX |
11899 | msgid "Bad HEAD - I need a HEAD" |
11900 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
11901 | ||
94550ed3 | 11902 | #: git-bisect.sh:168 |
c04f5ac3 JX |
11903 | #, sh-format |
11904 | msgid "" | |
814ff314 | 11905 | "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." |
d9d56b23 | 11906 | msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。" |
c04f5ac3 | 11907 | |
94550ed3 | 11908 | #: git-bisect.sh:178 |
cfff71a9 JX |
11909 | msgid "won't bisect on cg-seek'ed tree" |
11910 | msgstr "不会在做了 cg-seek 的树上做二分查找" | |
c04f5ac3 | 11911 | |
94550ed3 | 11912 | #: git-bisect.sh:182 |
c04f5ac3 | 11913 | msgid "Bad HEAD - strange symbolic ref" |
90e6ef53 | 11914 | msgstr "坏的 HEAD - 奇怪的符号引用" |
c04f5ac3 | 11915 | |
94550ed3 | 11916 | #: git-bisect.sh:234 |
c04f5ac3 JX |
11917 | #, sh-format |
11918 | msgid "Bad bisect_write argument: $state" | |
90e6ef53 | 11919 | msgstr "坏的 bisect_write 参数:$state" |
c04f5ac3 | 11920 | |
94550ed3 | 11921 | #: git-bisect.sh:263 |
c04f5ac3 JX |
11922 | #, sh-format |
11923 | msgid "Bad rev input: $arg" | |
90e6ef53 | 11924 | msgstr "输入坏的版本:$arg" |
c04f5ac3 | 11925 | |
94550ed3 | 11926 | #: git-bisect.sh:278 |
c04f5ac3 JX |
11927 | msgid "Please call 'bisect_state' with at least one argument." |
11928 | msgstr "请在调用 'bisect_state' 时跟至少一个参数。" | |
11929 | ||
94550ed3 | 11930 | #: git-bisect.sh:290 |
c04f5ac3 JX |
11931 | #, sh-format |
11932 | msgid "Bad rev input: $rev" | |
11933 | msgstr "输入坏的版本:$rev" | |
11934 | ||
94550ed3 | 11935 | #: git-bisect.sh:299 |
1b7f4a34 JX |
11936 | #, sh-format |
11937 | msgid "'git bisect $TERM_BAD' can take only one argument." | |
11938 | msgstr "'git bisect $TERM_BAD' 只能带一个参数。" | |
11939 | ||
94550ed3 | 11940 | #: git-bisect.sh:322 |
1b7f4a34 JX |
11941 | #, sh-format |
11942 | msgid "Warning: bisecting only with a $TERM_BAD commit." | |
11943 | msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。" | |
b694fbb1 | 11944 | |
90e6ef53 | 11945 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
11946 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
11947 | #. translation. The program will only accept English input | |
11948 | #. at this point. | |
94550ed3 | 11949 | #: git-bisect.sh:328 |
c04f5ac3 JX |
11950 | msgid "Are you sure [Y/n]? " |
11951 | msgstr "您确认么[Y/n]? " | |
11952 | ||
94550ed3 | 11953 | #: git-bisect.sh:340 |
1b7f4a34 | 11954 | #, sh-format |
b694fbb1 | 11955 | msgid "" |
1b7f4a34 JX |
11956 | "You need to give me at least one $bad_syn and one $good_syn revision.\n" |
11957 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
11958 | msgstr "" |
11959 | "您需要给我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 11960 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 11961 | |
94550ed3 | 11962 | #: git-bisect.sh:343 |
1b7f4a34 | 11963 | #, sh-format |
b694fbb1 JX |
11964 | msgid "" |
11965 | "You need to start by \"git bisect start\".\n" | |
1b7f4a34 JX |
11966 | "You then need to give me at least one $good_syn and one $bad_syn revision.\n" |
11967 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
11968 | msgstr "" |
11969 | "您需要执行 \"git bisect start\" 来开始。\n" | |
11970 | "然后需要提供我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 11971 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 11972 | |
94550ed3 | 11973 | #: git-bisect.sh:414 git-bisect.sh:546 |
b694fbb1 JX |
11974 | msgid "We are not bisecting." |
11975 | msgstr "我们没有在二分查找。" | |
11976 | ||
94550ed3 | 11977 | #: git-bisect.sh:421 |
c04f5ac3 JX |
11978 | #, sh-format |
11979 | msgid "'$invalid' is not a valid commit" | |
11980 | msgstr "'$invalid' 不是一个有效的提交" | |
11981 | ||
94550ed3 | 11982 | #: git-bisect.sh:430 |
c04f5ac3 JX |
11983 | #, sh-format |
11984 | msgid "" | |
11985 | "Could not check out original HEAD '$branch'.\n" | |
11986 | "Try 'git bisect reset <commit>'." | |
11987 | msgstr "" | |
11988 | "不能检出原始 HEAD '$branch'。\n" | |
07432cef | 11989 | "尝试 'git bisect reset <提交>'。" |
c04f5ac3 | 11990 | |
94550ed3 | 11991 | #: git-bisect.sh:458 |
c04f5ac3 JX |
11992 | msgid "No logfile given" |
11993 | msgstr "未提供日志文件" | |
11994 | ||
94550ed3 | 11995 | #: git-bisect.sh:459 |
c04f5ac3 JX |
11996 | #, sh-format |
11997 | msgid "cannot read $file for replaying" | |
11998 | msgstr "不能读取 $file 来重放" | |
11999 | ||
94550ed3 | 12000 | #: git-bisect.sh:480 |
c04f5ac3 JX |
12001 | msgid "?? what are you talking about?" |
12002 | msgstr "?? 您在说什么?" | |
12003 | ||
94550ed3 | 12004 | #: git-bisect.sh:492 |
b694fbb1 JX |
12005 | #, sh-format |
12006 | msgid "running $command" | |
12007 | msgstr "运行 $command" | |
12008 | ||
94550ed3 | 12009 | #: git-bisect.sh:499 |
b694fbb1 JX |
12010 | #, sh-format |
12011 | msgid "" | |
12012 | "bisect run failed:\n" | |
12013 | "exit code $res from '$command' is < 0 or >= 128" | |
12014 | msgstr "" | |
12015 | "二分查找运行失败:\n" | |
07432cef | 12016 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 12017 | |
94550ed3 | 12018 | #: git-bisect.sh:525 |
b694fbb1 JX |
12019 | msgid "bisect run cannot continue any more" |
12020 | msgstr "二分查找不能继续运行" | |
12021 | ||
94550ed3 | 12022 | #: git-bisect.sh:531 |
b694fbb1 JX |
12023 | #, sh-format |
12024 | msgid "" | |
12025 | "bisect run failed:\n" | |
12026 | "'bisect_state $state' exited with error code $res" | |
12027 | msgstr "" | |
12028 | "二分查找运行失败:\n" | |
12029 | "'bisect_state $state' 退出码为 $res" | |
12030 | ||
94550ed3 | 12031 | #: git-bisect.sh:538 |
b694fbb1 JX |
12032 | msgid "bisect run success" |
12033 | msgstr "二分查找运行成功" | |
c04f5ac3 | 12034 | |
94550ed3 JX |
12035 | #: git-bisect.sh:565 |
12036 | msgid "please use two different terms" | |
12037 | msgstr "请使用两个不同的术语" | |
12038 | ||
12039 | #: git-bisect.sh:575 | |
12040 | #, sh-format | |
12041 | msgid "'$term' is not a valid term" | |
12042 | msgstr "'$term' 不是一个有效的名称" | |
12043 | ||
12044 | #: git-bisect.sh:578 | |
12045 | #, sh-format | |
12046 | msgid "can't use the builtin command '$term' as a term" | |
12047 | msgstr "不能使用内置命令 '$term' 作为术语" | |
12048 | ||
12049 | #: git-bisect.sh:587 git-bisect.sh:593 | |
12050 | #, sh-format | |
12051 | msgid "can't change the meaning of term '$term'" | |
12052 | msgstr "不能修改术语 '$term' 的含义" | |
12053 | ||
12054 | #: git-bisect.sh:606 | |
b694fbb1 | 12055 | #, sh-format |
1b7f4a34 JX |
12056 | msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." |
12057 | msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。" | |
c04f5ac3 | 12058 | |
94550ed3 JX |
12059 | #: git-bisect.sh:636 |
12060 | msgid "no terms defined" | |
12061 | msgstr "未定义术语" | |
12062 | ||
12063 | #: git-bisect.sh:653 | |
12064 | #, sh-format | |
12065 | msgid "" | |
12066 | "invalid argument $arg for 'git bisect terms'.\n" | |
12067 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." | |
12068 | msgstr "" | |
12069 | "参数 $arg 对命令 'git bisect terms' 无效。\n" | |
12070 | "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。" | |
12071 | ||
6c94aba5 | 12072 | #: git-rebase.sh:57 |
649900bc JX |
12073 | msgid "" |
12074 | "When you have resolved this problem, run \"git rebase --continue\".\n" | |
12075 | "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" | |
12076 | "To check out the original branch and stop rebasing, run \"git rebase --abort" | |
12077 | "\"." | |
12078 | msgstr "" | |
12079 | "当您解决了此问题后,执行 \"git rebase --continue\"。\n" | |
12080 | "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n" | |
12081 | "要恢复原分支并停止变基,执行 \"git rebase --abort\"。" | |
12082 | ||
5b04ee3b | 12083 | #: git-rebase.sh:168 |
2e8451e8 JX |
12084 | msgid "Applied autostash." |
12085 | msgstr "成功应用 autostash。" | |
12086 | ||
5b04ee3b | 12087 | #: git-rebase.sh:171 |
2e8451e8 JX |
12088 | #, sh-format |
12089 | msgid "Cannot store $stash_sha1" | |
12090 | msgstr "无法保存 $stash_sha1" | |
12091 | ||
5b04ee3b | 12092 | #: git-rebase.sh:172 |
2e8451e8 JX |
12093 | msgid "" |
12094 | "Applying autostash resulted in conflicts.\n" | |
12095 | "Your changes are safe in the stash.\n" | |
b1894384 | 12096 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" |
2e8451e8 JX |
12097 | msgstr "" |
12098 | "应用 autostash 导致冲突。\n" | |
12099 | "您的修改安全地保存在 stash 中。\n" | |
12100 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" | |
12101 | ||
5b04ee3b | 12102 | #: git-rebase.sh:211 |
649900bc | 12103 | msgid "The pre-rebase hook refused to rebase." |
98b2761d | 12104 | msgstr "钩子 pre-rebase 拒绝变基操作。" |
649900bc | 12105 | |
5b04ee3b | 12106 | #: git-rebase.sh:216 |
649900bc JX |
12107 | msgid "It looks like git-am is in progress. Cannot rebase." |
12108 | msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" | |
12109 | ||
5b04ee3b | 12110 | #: git-rebase.sh:357 |
649900bc JX |
12111 | msgid "No rebase in progress?" |
12112 | msgstr "没有正在进行的变基?" | |
12113 | ||
5b04ee3b | 12114 | #: git-rebase.sh:368 |
07432cef WS |
12115 | msgid "The --edit-todo action can only be used during interactive rebase." |
12116 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
12117 | ||
5b04ee3b | 12118 | #: git-rebase.sh:375 |
649900bc JX |
12119 | msgid "Cannot read HEAD" |
12120 | msgstr "不能读取 HEAD" | |
12121 | ||
5b04ee3b | 12122 | #: git-rebase.sh:378 |
649900bc JX |
12123 | msgid "" |
12124 | "You must edit all merge conflicts and then\n" | |
12125 | "mark them as resolved using git add" | |
12126 | msgstr "" | |
12127 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
12128 | "命令将它们标记为已解决" | |
12129 | ||
5b04ee3b | 12130 | #: git-rebase.sh:396 |
649900bc JX |
12131 | #, sh-format |
12132 | msgid "Could not move back to $head_name" | |
12133 | msgstr "无法移回 $head_name" | |
12134 | ||
5b04ee3b | 12135 | #: git-rebase.sh:415 |
649900bc JX |
12136 | #, sh-format |
12137 | msgid "" | |
12138 | "It seems that there is already a $state_dir_base directory, and\n" | |
12139 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
12140 | "case, please try\n" | |
12141 | "\t$cmd_live_rebase\n" | |
12142 | "If that is not the case, please\n" | |
12143 | "\t$cmd_clear_stale_rebase\n" | |
12144 | "and run me again. I am stopping in case you still have something\n" | |
12145 | "valuable there." | |
12146 | msgstr "" | |
98b2761d JX |
12147 | "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n" |
12148 | "过程中。 如果是这样,请执行\n" | |
649900bc JX |
12149 | "\t$cmd_live_rebase\n" |
12150 | "如果不是这样,请执行\n" | |
12151 | "\t$cmd_clear_stale_rebase\n" | |
98b2761d | 12152 | "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。" |
649900bc | 12153 | |
5b04ee3b | 12154 | #: git-rebase.sh:466 |
649900bc JX |
12155 | #, sh-format |
12156 | msgid "invalid upstream $upstream_name" | |
12157 | msgstr "无效的上游 $upstream_name" | |
12158 | ||
5b04ee3b | 12159 | #: git-rebase.sh:490 |
649900bc JX |
12160 | #, sh-format |
12161 | msgid "$onto_name: there are more than one merge bases" | |
12162 | msgstr "$onto_name: 有一个以上的合并基准" | |
12163 | ||
5b04ee3b | 12164 | #: git-rebase.sh:493 git-rebase.sh:497 |
649900bc JX |
12165 | #, sh-format |
12166 | msgid "$onto_name: there is no merge base" | |
12167 | msgstr "$onto_name: 没有合并基准" | |
12168 | ||
5b04ee3b | 12169 | #: git-rebase.sh:502 |
649900bc JX |
12170 | #, sh-format |
12171 | msgid "Does not point to a valid commit: $onto_name" | |
12172 | msgstr "没有指向一个有效的提交:$onto_name" | |
12173 | ||
5b04ee3b | 12174 | #: git-rebase.sh:525 |
649900bc JX |
12175 | #, sh-format |
12176 | msgid "fatal: no such branch: $branch_name" | |
12177 | msgstr "严重错误:无此分支:$branch_name" | |
12178 | ||
5b04ee3b | 12179 | #: git-rebase.sh:558 |
2e8451e8 JX |
12180 | msgid "Cannot autostash" |
12181 | msgstr "无法 autostash" | |
12182 | ||
5b04ee3b | 12183 | #: git-rebase.sh:563 |
2e8451e8 JX |
12184 | #, sh-format |
12185 | msgid "Created autostash: $stash_abbrev" | |
12186 | msgstr "创建了 autostash: $stash_abbrev" | |
12187 | ||
5b04ee3b | 12188 | #: git-rebase.sh:567 |
649900bc JX |
12189 | msgid "Please commit or stash them." |
12190 | msgstr "请提交或为它们保存进度。" | |
12191 | ||
5b04ee3b | 12192 | #: git-rebase.sh:587 |
649900bc JX |
12193 | #, sh-format |
12194 | msgid "Current branch $branch_name is up to date." | |
12195 | msgstr "当前分支 $branch_name 是最新的。" | |
12196 | ||
5b04ee3b | 12197 | #: git-rebase.sh:591 |
649900bc JX |
12198 | #, sh-format |
12199 | msgid "Current branch $branch_name is up to date, rebase forced." | |
12200 | msgstr "当前分支 $branch_name 是最新的,强制变基。" | |
12201 | ||
5b04ee3b | 12202 | #: git-rebase.sh:602 |
649900bc JX |
12203 | #, sh-format |
12204 | msgid "Changes from $mb to $onto:" | |
12205 | msgstr "变更从 $mb 到 $onto:" | |
12206 | ||
5b04ee3b | 12207 | #: git-rebase.sh:611 |
649900bc | 12208 | msgid "First, rewinding head to replay your work on top of it..." |
160fb2b2 | 12209 | msgstr "首先,回退分支以便在上面重放您的工作..." |
649900bc | 12210 | |
5b04ee3b | 12211 | #: git-rebase.sh:621 |
649900bc JX |
12212 | #, sh-format |
12213 | msgid "Fast-forwarded $branch_name to $onto_name." | |
12214 | msgstr "快进 $branch_name 至 $onto_name。" | |
12215 | ||
c04f5ac3 JX |
12216 | #: git-stash.sh:51 |
12217 | msgid "git stash clear with parameters is unimplemented" | |
12218 | msgstr "git stash clear 不支持参数" | |
12219 | ||
12220 | #: git-stash.sh:74 | |
12221 | msgid "You do not have the initial commit yet" | |
12222 | msgstr "您尚未建立初始提交" | |
12223 | ||
12224 | #: git-stash.sh:89 | |
12225 | msgid "Cannot save the current index state" | |
90e6ef53 | 12226 | msgstr "无法保存当前索引状态" |
c04f5ac3 | 12227 | |
6acbf033 | 12228 | #: git-stash.sh:124 git-stash.sh:137 |
c04f5ac3 JX |
12229 | msgid "Cannot save the current worktree state" |
12230 | msgstr "无法保存当前工作区状态" | |
12231 | ||
6acbf033 | 12232 | #: git-stash.sh:141 |
c04f5ac3 | 12233 | msgid "No changes selected" |
90e6ef53 | 12234 | msgstr "没有选择变更" |
c04f5ac3 | 12235 | |
6acbf033 | 12236 | #: git-stash.sh:144 |
c04f5ac3 | 12237 | msgid "Cannot remove temporary index (can't happen)" |
90e6ef53 | 12238 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 | 12239 | |
6acbf033 | 12240 | #: git-stash.sh:157 |
c04f5ac3 JX |
12241 | msgid "Cannot record working tree state" |
12242 | msgstr "不能记录工作区状态" | |
12243 | ||
1b7f4a34 | 12244 | #: git-stash.sh:189 |
2e8451e8 JX |
12245 | #, sh-format |
12246 | msgid "Cannot update $ref_stash with $w_commit" | |
12247 | msgstr "无法用 $w_commit 更新 $ref_stash" | |
12248 | ||
b694fbb1 JX |
12249 | #. TRANSLATORS: $option is an invalid option, like |
12250 | #. `--blah-blah'. The 7 spaces at the beginning of the | |
12251 | #. second line correspond to "error: ". So you should line | |
12252 | #. up the second line with however many characters the | |
12253 | #. translation of "error: " takes in your language. E.g. in | |
12254 | #. English this is: | |
12255 | #. | |
12256 | #. $ git stash save --blah-blah 2>&1 | head -n 2 | |
12257 | #. error: unknown option for 'stash save': --blah-blah | |
12258 | #. To provide a message, use git stash save -- '--blah-blah' | |
1b7f4a34 | 12259 | #: git-stash.sh:239 |
b694fbb1 JX |
12260 | #, sh-format |
12261 | msgid "" | |
12262 | "error: unknown option for 'stash save': $option\n" | |
12263 | " To provide a message, use git stash save -- '$option'" | |
12264 | msgstr "" | |
12265 | "错误:'stash save' 的未知选项:$option\n" | |
12266 | " 要提供一个描述信息,使用 git stash save -- '$option'" | |
12267 | ||
1b7f4a34 | 12268 | #: git-stash.sh:260 |
c04f5ac3 JX |
12269 | msgid "No local changes to save" |
12270 | msgstr "没有要保存的本地修改" | |
12271 | ||
1b7f4a34 | 12272 | #: git-stash.sh:264 |
c04f5ac3 | 12273 | msgid "Cannot initialize stash" |
90e6ef53 | 12274 | msgstr "无法初始化 stash" |
c04f5ac3 | 12275 | |
1b7f4a34 | 12276 | #: git-stash.sh:268 |
c04f5ac3 JX |
12277 | msgid "Cannot save the current status" |
12278 | msgstr "无法保存当前状态" | |
12279 | ||
1b7f4a34 | 12280 | #: git-stash.sh:286 |
c04f5ac3 JX |
12281 | msgid "Cannot remove worktree changes" |
12282 | msgstr "无法删除工作区变更" | |
12283 | ||
94550ed3 | 12284 | #: git-stash.sh:405 |
7aea43ff JX |
12285 | #, sh-format |
12286 | msgid "unknown option: $opt" | |
12287 | msgstr "未知选项: $opt" | |
12288 | ||
94550ed3 | 12289 | #: git-stash.sh:415 |
c04f5ac3 | 12290 | msgid "No stash found." |
90e6ef53 | 12291 | msgstr "未发现 stash。" |
c04f5ac3 | 12292 | |
94550ed3 | 12293 | #: git-stash.sh:422 |
c04f5ac3 JX |
12294 | #, sh-format |
12295 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 12296 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 | 12297 | |
94550ed3 | 12298 | #: git-stash.sh:428 |
c04f5ac3 | 12299 | #, sh-format |
220c313c JX |
12300 | msgid "$reference is not a valid reference" |
12301 | msgstr "$reference 不是一个有效的引用" | |
c04f5ac3 | 12302 | |
94550ed3 | 12303 | #: git-stash.sh:456 |
c04f5ac3 JX |
12304 | #, sh-format |
12305 | msgid "'$args' is not a stash-like commit" | |
90e6ef53 | 12306 | msgstr "'$args' 不是 stash 样提交" |
c04f5ac3 | 12307 | |
94550ed3 | 12308 | #: git-stash.sh:467 |
c04f5ac3 JX |
12309 | #, sh-format |
12310 | msgid "'$args' is not a stash reference" | |
90e6ef53 | 12311 | msgstr "'$args' 不是一个 stash 引用" |
c04f5ac3 | 12312 | |
94550ed3 | 12313 | #: git-stash.sh:475 |
c04f5ac3 | 12314 | msgid "unable to refresh index" |
90e6ef53 | 12315 | msgstr "无法刷新索引" |
c04f5ac3 | 12316 | |
94550ed3 | 12317 | #: git-stash.sh:479 |
c04f5ac3 JX |
12318 | msgid "Cannot apply a stash in the middle of a merge" |
12319 | msgstr "无法在合并过程中恢复进度" | |
12320 | ||
94550ed3 | 12321 | #: git-stash.sh:487 |
c04f5ac3 | 12322 | msgid "Conflicts in index. Try without --index." |
90e6ef53 | 12323 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 | 12324 | |
94550ed3 | 12325 | #: git-stash.sh:489 |
c04f5ac3 | 12326 | msgid "Could not save index tree" |
90e6ef53 | 12327 | msgstr "不能保存索引树" |
c04f5ac3 | 12328 | |
94550ed3 | 12329 | #: git-stash.sh:523 |
c04f5ac3 | 12330 | msgid "Cannot unstage modified files" |
160fb2b2 | 12331 | msgstr "无法将修改的文件取消暂存" |
c04f5ac3 | 12332 | |
94550ed3 | 12333 | #: git-stash.sh:538 |
b694fbb1 JX |
12334 | msgid "Index was not unstashed." |
12335 | msgstr "索引的进度没有被恢复。" | |
12336 | ||
94550ed3 | 12337 | #: git-stash.sh:561 |
c04f5ac3 JX |
12338 | #, sh-format |
12339 | msgid "Dropped ${REV} ($s)" | |
12340 | msgstr "丢弃了 ${REV} ($s)" | |
12341 | ||
94550ed3 | 12342 | #: git-stash.sh:562 |
c04f5ac3 JX |
12343 | #, sh-format |
12344 | msgid "${REV}: Could not drop stash entry" | |
90e6ef53 | 12345 | msgstr "${REV}:不能丢弃进度条目" |
c04f5ac3 | 12346 | |
94550ed3 | 12347 | #: git-stash.sh:570 |
c04f5ac3 JX |
12348 | msgid "No branch name specified" |
12349 | msgstr "未指定分支名" | |
12350 | ||
94550ed3 | 12351 | #: git-stash.sh:642 |
c04f5ac3 JX |
12352 | msgid "(To restore them type \"git stash apply\")" |
12353 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
12354 | ||
5b04ee3b | 12355 | #: git-submodule.sh:219 |
2e8451e8 JX |
12356 | msgid "Relative path can only be used from the toplevel of the working tree" |
12357 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
12358 | ||
5b04ee3b | 12359 | #: git-submodule.sh:229 |
c04f5ac3 JX |
12360 | #, sh-format |
12361 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
4375c10e | 12362 | msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始" |
c04f5ac3 | 12363 | |
5b04ee3b | 12364 | #: git-submodule.sh:246 |
c04f5ac3 | 12365 | #, sh-format |
170e9899 JX |
12366 | msgid "'$sm_path' already exists in the index" |
12367 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 12368 | |
5b04ee3b | 12369 | #: git-submodule.sh:250 |
b694fbb1 JX |
12370 | #, sh-format |
12371 | msgid "" | |
12372 | "The following path is ignored by one of your .gitignore files:\n" | |
12373 | "$sm_path\n" | |
12374 | "Use -f if you really want to add it." | |
12375 | msgstr "" | |
12376 | "以下路径被您的一个 .gitignore 文件所忽略:\n" | |
12377 | "$sm_path\n" | |
12378 | "如果您确实想添加它,使用 -f 参数。" | |
12379 | ||
5b04ee3b | 12380 | #: git-submodule.sh:268 |
b694fbb1 JX |
12381 | #, sh-format |
12382 | msgid "Adding existing repo at '$sm_path' to the index" | |
160fb2b2 | 12383 | msgstr "添加位于 '$sm_path' 的现存仓库到索引" |
b694fbb1 | 12384 | |
5b04ee3b | 12385 | #: git-submodule.sh:270 |
c04f5ac3 | 12386 | #, sh-format |
170e9899 | 12387 | msgid "'$sm_path' already exists and is not a valid git repo" |
160fb2b2 | 12388 | msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" |
c04f5ac3 | 12389 | |
5b04ee3b | 12390 | #: git-submodule.sh:278 |
07432cef WS |
12391 | #, sh-format |
12392 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
160fb2b2 | 12393 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" |
07432cef | 12394 | |
5b04ee3b | 12395 | #: git-submodule.sh:280 |
07432cef WS |
12396 | #, sh-format |
12397 | msgid "" | |
12398 | "If you want to reuse this local git directory instead of cloning again from" | |
12399 | msgstr "如果您想重用此本地 git 目录而不是重新克隆自" | |
12400 | ||
5b04ee3b | 12401 | #: git-submodule.sh:282 |
07432cef WS |
12402 | #, sh-format |
12403 | msgid "" | |
12404 | "use the '--force' option. If the local git directory is not the correct repo" | |
160fb2b2 | 12405 | msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库" |
07432cef | 12406 | |
5b04ee3b | 12407 | #: git-submodule.sh:283 |
07432cef WS |
12408 | #, sh-format |
12409 | msgid "" | |
12410 | "or you are unsure what this means choose another name with the '--name' " | |
12411 | "option." | |
12412 | msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。" | |
12413 | ||
5b04ee3b | 12414 | #: git-submodule.sh:285 |
07432cef WS |
12415 | #, sh-format |
12416 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
12417 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" | |
12418 | ||
5b04ee3b | 12419 | #: git-submodule.sh:297 |
c04f5ac3 | 12420 | #, sh-format |
170e9899 JX |
12421 | msgid "Unable to checkout submodule '$sm_path'" |
12422 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 12423 | |
5b04ee3b | 12424 | #: git-submodule.sh:302 |
c04f5ac3 | 12425 | #, sh-format |
170e9899 JX |
12426 | msgid "Failed to add submodule '$sm_path'" |
12427 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 12428 | |
5b04ee3b | 12429 | #: git-submodule.sh:311 |
c04f5ac3 | 12430 | #, sh-format |
170e9899 JX |
12431 | msgid "Failed to register submodule '$sm_path'" |
12432 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 12433 | |
5b04ee3b | 12434 | #: git-submodule.sh:355 |
c04f5ac3 | 12435 | #, sh-format |
5b04ee3b JX |
12436 | msgid "Entering '$displaypath'" |
12437 | msgstr "正在进入 '$displaypath'" | |
c04f5ac3 | 12438 | |
5b04ee3b | 12439 | #: git-submodule.sh:375 |
c04f5ac3 | 12440 | #, sh-format |
5b04ee3b | 12441 | msgid "Stopping at '$displaypath'; script returned non-zero status." |
aef18cc6 | 12442 | msgstr "停止于 '$displaypath';脚本返回非零值。" |
c04f5ac3 | 12443 | |
5b04ee3b | 12444 | #: git-submodule.sh:448 |
c04f5ac3 | 12445 | #, sh-format |
5b04ee3b JX |
12446 | msgid "pathspec and --all are incompatible" |
12447 | msgstr "pathspec 和 --all 不兼容" | |
c04f5ac3 | 12448 | |
5b04ee3b | 12449 | #: git-submodule.sh:453 |
c04f5ac3 | 12450 | #, sh-format |
5b04ee3b | 12451 | msgid "Use '--all' if you really want to deinitialize all submodules" |
aef18cc6 | 12452 | msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'" |
1003b3a5 | 12453 | |
5b04ee3b | 12454 | #: git-submodule.sh:470 |
1003b3a5 | 12455 | #, sh-format |
2e8451e8 JX |
12456 | msgid "Submodule work tree '$displaypath' contains a .git directory" |
12457 | msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录" | |
1003b3a5 | 12458 | |
5b04ee3b | 12459 | #: git-submodule.sh:471 |
1003b3a5 JX |
12460 | #, sh-format |
12461 | msgid "" | |
12462 | "(use 'rm -rf' if you really want to remove it including all of its history)" | |
12463 | msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" | |
12464 | ||
5b04ee3b | 12465 | #: git-submodule.sh:477 |
c04f5ac3 JX |
12466 | #, sh-format |
12467 | msgid "" | |
2e8451e8 | 12468 | "Submodule work tree '$displaypath' contains local modifications; use '-f' to " |
1003b3a5 | 12469 | "discard them" |
2e8451e8 | 12470 | msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们" |
1003b3a5 | 12471 | |
5b04ee3b | 12472 | #: git-submodule.sh:480 |
1003b3a5 | 12473 | #, sh-format |
2e8451e8 JX |
12474 | msgid "Cleared directory '$displaypath'" |
12475 | msgstr "已清除目录 '$displaypath'" | |
1003b3a5 | 12476 | |
5b04ee3b | 12477 | #: git-submodule.sh:481 |
1003b3a5 | 12478 | #, sh-format |
2e8451e8 JX |
12479 | msgid "Could not remove submodule work tree '$displaypath'" |
12480 | msgstr "无法移除子模组工作区 '$displaypath'" | |
1003b3a5 | 12481 | |
5b04ee3b | 12482 | #: git-submodule.sh:484 |
1003b3a5 | 12483 | #, sh-format |
2e8451e8 JX |
12484 | msgid "Could not create empty submodule directory '$displaypath'" |
12485 | msgstr "不能创建空的子模组目录 '$displaypath'" | |
1003b3a5 | 12486 | |
5b04ee3b | 12487 | #: git-submodule.sh:493 |
1003b3a5 | 12488 | #, sh-format |
2e8451e8 JX |
12489 | msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" |
12490 | msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
1003b3a5 | 12491 | |
5b04ee3b | 12492 | #: git-submodule.sh:635 |
c04f5ac3 | 12493 | #, sh-format |
2e8451e8 JX |
12494 | msgid "Unable to find current revision in submodule path '$displaypath'" |
12495 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 12496 | |
5b04ee3b | 12497 | #: git-submodule.sh:644 |
c04f5ac3 | 12498 | #, sh-format |
170e9899 JX |
12499 | msgid "Unable to fetch in submodule path '$sm_path'" |
12500 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 12501 | |
5b04ee3b | 12502 | #: git-submodule.sh:667 |
2e8451e8 JX |
12503 | #, sh-format |
12504 | msgid "Unable to fetch in submodule path '$displaypath'" | |
12505 | msgstr "无法在子模组路径 '$displaypath' 中获取" | |
12506 | ||
5b04ee3b | 12507 | #: git-submodule.sh:680 |
6c94aba5 JX |
12508 | #, sh-format |
12509 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
12510 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
12511 | ||
5b04ee3b | 12512 | #: git-submodule.sh:681 |
c04f5ac3 | 12513 | #, sh-format |
6c94aba5 JX |
12514 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
12515 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
12516 | ||
5b04ee3b | 12517 | #: git-submodule.sh:685 |
6c94aba5 | 12518 | #, sh-format |
2e8451e8 JX |
12519 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
12520 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 12521 | |
5b04ee3b | 12522 | #: git-submodule.sh:686 |
c04f5ac3 | 12523 | #, sh-format |
2e8451e8 JX |
12524 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
12525 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 12526 | |
5b04ee3b | 12527 | #: git-submodule.sh:691 |
c04f5ac3 | 12528 | #, sh-format |
2e8451e8 JX |
12529 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
12530 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 12531 | |
5b04ee3b | 12532 | #: git-submodule.sh:692 |
c04f5ac3 | 12533 | #, sh-format |
2e8451e8 JX |
12534 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
12535 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 12536 | |
5b04ee3b | 12537 | #: git-submodule.sh:697 |
c04f5ac3 | 12538 | #, sh-format |
5b04ee3b JX |
12539 | msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" |
12540 | msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" | |
c04f5ac3 | 12541 | |
5b04ee3b | 12542 | #: git-submodule.sh:698 |
c04f5ac3 | 12543 | #, sh-format |
5b04ee3b | 12544 | msgid "Submodule path '$displaypath': '$command $sha1'" |
aef18cc6 | 12545 | msgstr "子模组 '$displaypath':'$command $sha1'" |
c04f5ac3 | 12546 | |
5b04ee3b | 12547 | #: git-submodule.sh:729 |
2e8451e8 JX |
12548 | #, sh-format |
12549 | msgid "Failed to recurse into submodule path '$displaypath'" | |
12550 | msgstr "无法递归进子模组路径 '$displaypath'" | |
12551 | ||
5b04ee3b | 12552 | #: git-submodule.sh:837 |
649900bc JX |
12553 | msgid "The --cached option cannot be used with the --files option" |
12554 | msgstr "选项 --cached 不能和选项 --files 同时使用" | |
b694fbb1 | 12555 | |
5b04ee3b | 12556 | #: git-submodule.sh:889 |
b694fbb1 JX |
12557 | #, sh-format |
12558 | msgid "unexpected mode $mod_dst" | |
12559 | msgstr "意外的模式 $mod_dst" | |
c04f5ac3 | 12560 | |
90e6ef53 | 12561 | # 译者:注意保持前导空格 |
5b04ee3b | 12562 | #: git-submodule.sh:909 |
c04f5ac3 | 12563 | #, sh-format |
2e8451e8 JX |
12564 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
12565 | msgstr " 警告:$display_name 未包含提交 $sha1_src" | |
c04f5ac3 | 12566 | |
90e6ef53 | 12567 | # 译者:注意保持前导空格 |
5b04ee3b | 12568 | #: git-submodule.sh:912 |
c04f5ac3 | 12569 | #, sh-format |
2e8451e8 JX |
12570 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
12571 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" | |
c04f5ac3 | 12572 | |
90e6ef53 | 12573 | # 译者:注意保持前导空格 |
5b04ee3b | 12574 | #: git-submodule.sh:915 |
c04f5ac3 | 12575 | #, sh-format |
2e8451e8 JX |
12576 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
12577 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" | |
c04f5ac3 | 12578 | |
5b04ee3b | 12579 | #: git-submodule.sh:940 |
c04f5ac3 | 12580 | msgid "blob" |
07432cef | 12581 | msgstr "数据对象" |
c04f5ac3 | 12582 | |
5b04ee3b | 12583 | #: git-submodule.sh:1059 |
1003b3a5 JX |
12584 | #, sh-format |
12585 | msgid "Failed to recurse into submodule path '$sm_path'" | |
12586 | msgstr "无法递归进子模组路径 '$sm_path'" | |
12587 | ||
5b04ee3b | 12588 | #: git-submodule.sh:1123 |
c04f5ac3 | 12589 | #, sh-format |
2e8451e8 JX |
12590 | msgid "Synchronizing submodule url for '$displaypath'" |
12591 | msgstr "为 '$displaypath' 同步子模组 url" | |
1b7f4a34 | 12592 | |
5b04ee3b JX |
12593 | #: git-parse-remote.sh:89 |
12594 | #, sh-format | |
12595 | msgid "See git-${cmd}(1) for details." | |
12596 | msgstr "详见 git-${cmd}(1)。" |