]>
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" | |
276ceeaa JX |
138 | "POT-Creation-Date: 2016-02-28 20:31+0800\n" |
139 | "PO-Revision-Date: 2016-03-06 22:12+0800\n" | |
c04f5ac3 | 140 | "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" |
7aea43ff | 141 | "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" |
c04f5ac3 JX |
142 | "Language: zh_CN\n" |
143 | "MIME-Version: 1.0\n" | |
144 | "Content-Type: text/plain; charset=UTF-8\n" | |
145 | "Content-Transfer-Encoding: 8bit\n" | |
5ae481e0 | 146 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
c04f5ac3 | 147 | |
6c94aba5 | 148 | #: advice.c:55 |
c04f5ac3 JX |
149 | #, c-format |
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 | |
276ceeaa | 161 | #: advice.c:101 builtin/merge.c:1226 |
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 | |
276ceeaa | 204 | #: archive.c:430 builtin/log.c:1232 |
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 | |
276ceeaa JX |
212 | #: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 |
213 | #: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987 | |
214 | #: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100 | |
215 | #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398 | |
216 | #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153 | |
ef317cd5 JX |
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 | |
276ceeaa | 248 | #: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 |
ef317cd5 | 249 | msgid "repo" |
160fb2b2 | 250 | msgstr "仓库" |
ef317cd5 | 251 | |
94550ed3 | 252 | #: archive.c:452 builtin/archive.c:91 |
ef317cd5 | 253 | msgid "retrieve the archive from remote repository <repo>" |
160fb2b2 | 254 | msgstr "从远程仓库(<仓库>)提取归档文件" |
ef317cd5 | 255 | |
276ceeaa | 256 | #: archive.c:453 builtin/archive.c:92 builtin/notes.c:482 |
ef317cd5 | 257 | msgid "command" |
07432cef | 258 | msgstr "命令" |
ef317cd5 | 259 | |
94550ed3 | 260 | #: archive.c:454 builtin/archive.c:93 |
ef317cd5 | 261 | msgid "path to the remote git-upload-archive command" |
07432cef WS |
262 | msgstr "远程 git-upload-archive 命令的路径" |
263 | ||
276ceeaa | 264 | #: attr.c:263 |
07432cef | 265 | msgid "" |
a7409dfb | 266 | "Negative patterns are ignored in git attributes\n" |
07432cef | 267 | "Use '\\!' for literal leading exclamation." |
ef317cd5 | 268 | msgstr "" |
a7409dfb | 269 | "负值模版在 git attributes 中被忽略\n" |
07432cef | 270 | "当字符串确实要以感叹号开始时,使用 '\\!'。" |
ef317cd5 | 271 | |
276ceeaa JX |
272 | #: branch.c:53 |
273 | #, c-format | |
274 | msgid "" | |
275 | "\n" | |
276 | "After fixing the error cause you may try to fix up\n" | |
277 | "the remote tracking information by invoking\n" | |
278 | "\"git branch --set-upstream-to=%s%s%s\"." | |
279 | msgstr "" | |
280 | "\n" | |
281 | "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n" | |
282 | "\"git branch --set-upstream-to=%s%s%s\" 。" | |
283 | ||
284 | #: branch.c:67 | |
4dcdc3d8 JX |
285 | #, c-format |
286 | msgid "Not setting branch %s as its own upstream." | |
287 | msgstr "未设置分支 %s 作为它自己的上游。" | |
288 | ||
276ceeaa | 289 | #: branch.c:93 |
4dcdc3d8 JX |
290 | #, c-format |
291 | msgid "Branch %s set up to track remote branch %s from %s by rebasing." | |
292 | msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。" | |
293 | ||
276ceeaa | 294 | #: branch.c:94 |
4dcdc3d8 JX |
295 | #, c-format |
296 | msgid "Branch %s set up to track remote branch %s from %s." | |
297 | msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。" | |
298 | ||
276ceeaa | 299 | #: branch.c:98 |
4dcdc3d8 JX |
300 | #, c-format |
301 | msgid "Branch %s set up to track local branch %s by rebasing." | |
302 | msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。" | |
303 | ||
276ceeaa | 304 | #: branch.c:99 |
4dcdc3d8 JX |
305 | #, c-format |
306 | msgid "Branch %s set up to track local branch %s." | |
307 | msgstr "分支 %s 设置为跟踪本地分支 %s。" | |
308 | ||
276ceeaa | 309 | #: branch.c:104 |
4dcdc3d8 JX |
310 | #, c-format |
311 | msgid "Branch %s set up to track remote ref %s by rebasing." | |
312 | msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。" | |
313 | ||
276ceeaa | 314 | #: branch.c:105 |
4dcdc3d8 JX |
315 | #, c-format |
316 | msgid "Branch %s set up to track remote ref %s." | |
317 | msgstr "分支 %s 设置为跟踪远程引用 %s。" | |
318 | ||
276ceeaa | 319 | #: branch.c:109 |
4dcdc3d8 JX |
320 | #, c-format |
321 | msgid "Branch %s set up to track local ref %s by rebasing." | |
322 | msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。" | |
323 | ||
276ceeaa | 324 | #: branch.c:110 |
4dcdc3d8 JX |
325 | #, c-format |
326 | msgid "Branch %s set up to track local ref %s." | |
327 | msgstr "分支 %s 设置为跟踪本地引用 %s。" | |
328 | ||
276ceeaa JX |
329 | #: branch.c:119 |
330 | msgid "Unable to write upstream branch configuration" | |
331 | msgstr "无法写入上游分支配置" | |
332 | ||
333 | #: branch.c:156 | |
4dcdc3d8 JX |
334 | #, c-format |
335 | msgid "Not tracking: ambiguous information for ref %s" | |
336 | msgstr "未跟踪:引用 %s 有歧义" | |
337 | ||
276ceeaa | 338 | #: branch.c:185 |
4dcdc3d8 JX |
339 | #, c-format |
340 | msgid "'%s' is not a valid branch name." | |
341 | msgstr "'%s' 不是一个有效的分支名称。" | |
342 | ||
276ceeaa | 343 | #: branch.c:190 |
4dcdc3d8 JX |
344 | #, c-format |
345 | msgid "A branch named '%s' already exists." | |
346 | msgstr "一个分支名 '%s' 已经存在。" | |
347 | ||
276ceeaa | 348 | #: branch.c:198 |
4dcdc3d8 JX |
349 | msgid "Cannot force update the current branch." |
350 | msgstr "无法强制更新当前分支。" | |
351 | ||
276ceeaa | 352 | #: branch.c:218 |
1003b3a5 JX |
353 | #, c-format |
354 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." | |
355 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" | |
356 | ||
276ceeaa | 357 | #: branch.c:220 |
1003b3a5 JX |
358 | #, c-format |
359 | msgid "the requested upstream branch '%s' does not exist" | |
360 | msgstr "请求的上游分支 '%s' 不存在" | |
361 | ||
276ceeaa | 362 | #: branch.c:222 |
1003b3a5 JX |
363 | msgid "" |
364 | "\n" | |
365 | "If you are planning on basing your work on an upstream\n" | |
366 | "branch that already exists at the remote, you may need to\n" | |
367 | "run \"git fetch\" to retrieve it.\n" | |
368 | "\n" | |
369 | "If you are planning to push out a new local branch that\n" | |
370 | "will track its remote counterpart, you may want to use\n" | |
371 | "\"git push -u\" to set the upstream config as you push." | |
372 | msgstr "" | |
373 | "\n" | |
374 | "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" | |
375 | "您可能需要执行 \"git fetch\" 来获取分支。\n" | |
376 | "\n" | |
377 | "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" | |
378 | "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" | |
379 | ||
276ceeaa | 380 | #: branch.c:266 |
4dcdc3d8 JX |
381 | #, c-format |
382 | msgid "Not a valid object name: '%s'." | |
383 | msgstr "不是一个有效的对象名:'%s'。" | |
384 | ||
276ceeaa | 385 | #: branch.c:286 |
4dcdc3d8 JX |
386 | #, c-format |
387 | msgid "Ambiguous object name: '%s'." | |
388 | msgstr "歧义的对象名:'%s'。" | |
389 | ||
276ceeaa | 390 | #: branch.c:291 |
4dcdc3d8 JX |
391 | #, c-format |
392 | msgid "Not a valid branch point: '%s'." | |
393 | msgstr "无效的分支点:'%s'。" | |
394 | ||
276ceeaa | 395 | #: branch.c:344 |
1b7f4a34 JX |
396 | #, c-format |
397 | msgid "'%s' is already checked out at '%s'" | |
398 | msgstr "'%s' 已经检出到 '%s'" | |
399 | ||
220c313c | 400 | #: bundle.c:34 |
8ada9598 JX |
401 | #, c-format |
402 | msgid "'%s' does not look like a v2 bundle file" | |
81809b99 | 403 | msgstr "'%s' 不像是一个 v2 版本的包文件" |
8ada9598 | 404 | |
220c313c | 405 | #: bundle.c:61 |
81809b99 | 406 | #, c-format |
8ada9598 | 407 | msgid "unrecognized header: %s%s (%d)" |
81809b99 | 408 | msgstr "未能识别的包头:%s%s (%d)" |
8ada9598 | 409 | |
94550ed3 | 410 | #: bundle.c:87 builtin/commit.c:766 |
8ada9598 JX |
411 | #, c-format |
412 | msgid "could not open '%s'" | |
413 | msgstr "不能打开 '%s'" | |
414 | ||
220c313c | 415 | #: bundle.c:139 |
8ada9598 | 416 | msgid "Repository lacks these prerequisite commits:" |
160fb2b2 | 417 | msgstr "仓库中缺少这些必备的提交:" |
8ada9598 | 418 | |
276ceeaa JX |
419 | #: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 |
420 | #: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 | |
421 | #: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 | |
422 | #: builtin/shortlog.c:170 | |
8ada9598 JX |
423 | msgid "revision walk setup failed" |
424 | msgstr "版本遍历设置失败" | |
425 | ||
220c313c | 426 | #: bundle.c:185 |
8ada9598 | 427 | #, c-format |
1003b3a5 JX |
428 | msgid "The bundle contains this ref:" |
429 | msgid_plural "The bundle contains these %d refs:" | |
430 | msgstr[0] "这个包中含有这个引用:" | |
431 | msgstr[1] "这个包中含有 %d 个引用:" | |
8ada9598 | 432 | |
220c313c | 433 | #: bundle.c:192 |
6792b93b JX |
434 | msgid "The bundle records a complete history." |
435 | msgstr "这个包记录一个完整历史。" | |
436 | ||
220c313c | 437 | #: bundle.c:194 |
8ada9598 | 438 | #, c-format |
1003b3a5 JX |
439 | msgid "The bundle requires this ref:" |
440 | msgid_plural "The bundle requires these %d refs:" | |
441 | msgstr[0] "这个包需要这个引用:" | |
442 | msgstr[1] "这个包需要 %d 个引用:" | |
8ada9598 | 443 | |
1b7f4a34 | 444 | #: bundle.c:253 |
9aeb4c2b JX |
445 | msgid "Could not spawn pack-objects" |
446 | msgstr "不能生成 pack-objects 进程" | |
447 | ||
1b7f4a34 | 448 | #: bundle.c:264 |
9aeb4c2b JX |
449 | msgid "pack-objects died" |
450 | msgstr "pack-objects 终止" | |
451 | ||
1b7f4a34 | 452 | #: bundle.c:304 |
8ada9598 | 453 | msgid "rev-list died" |
81809b99 | 454 | msgstr "rev-list 终止" |
8ada9598 | 455 | |
1b7f4a34 | 456 | #: bundle.c:353 |
8ada9598 JX |
457 | #, c-format |
458 | msgid "ref '%s' is excluded by the rev-list options" | |
81809b99 | 459 | msgstr "引用 '%s' 被 rev-list 选项排除" |
8ada9598 | 460 | |
276ceeaa | 461 | #: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 |
9aeb4c2b JX |
462 | #, c-format |
463 | msgid "unrecognized argument: %s" | |
464 | msgstr "未能识别的参数:%s" | |
465 | ||
1b7f4a34 | 466 | #: bundle.c:449 |
8ada9598 | 467 | msgid "Refusing to create empty bundle." |
81809b99 | 468 | msgstr "不能创建空包。" |
8ada9598 | 469 | |
1b7f4a34 | 470 | #: bundle.c:459 |
81809b99 | 471 | #, c-format |
8ada9598 | 472 | msgid "cannot create '%s'" |
81809b99 | 473 | msgstr "不能创建 '%s'" |
8ada9598 | 474 | |
1b7f4a34 | 475 | #: bundle.c:480 |
8ada9598 | 476 | msgid "index-pack died" |
81809b99 | 477 | msgstr "index-pack 终止" |
8ada9598 | 478 | |
94550ed3 | 479 | #: color.c:275 |
220c313c JX |
480 | #, c-format |
481 | msgid "invalid color value: %.*s" | |
482 | msgstr "无效的颜色值:%.*s" | |
483 | ||
276ceeaa JX |
484 | #: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 |
485 | #: builtin/am.c:2135 | |
c04f5ac3 JX |
486 | #, c-format |
487 | msgid "could not parse %s" | |
488 | msgstr "不能解析 %s" | |
489 | ||
6acbf033 | 490 | #: commit.c:42 |
c04f5ac3 JX |
491 | #, c-format |
492 | msgid "%s %s is not a commit!" | |
493 | msgstr "%s %s 不是一个提交!" | |
494 | ||
495 | #: compat/obstack.c:406 compat/obstack.c:408 | |
496 | msgid "memory exhausted" | |
497 | msgstr "内存耗尽" | |
498 | ||
276ceeaa | 499 | #: config.c:475 config.c:477 |
220c313c | 500 | #, c-format |
276ceeaa JX |
501 | msgid "bad config line %d in %s %s" |
502 | msgstr "%2$s %3$s 出错于第 %1$d 行" | |
220c313c | 503 | |
276ceeaa | 504 | #: config.c:593 |
220c313c | 505 | #, c-format |
276ceeaa JX |
506 | msgid "bad numeric config value '%s' for '%s' in %s %s: %s" |
507 | msgstr "%3$s %4$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %5$s" | |
220c313c | 508 | |
276ceeaa | 509 | #: config.c:595 |
220c313c JX |
510 | #, c-format |
511 | msgid "bad numeric config value '%s' for '%s': %s" | |
512 | msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s" | |
513 | ||
276ceeaa | 514 | #: config.c:680 |
220c313c JX |
515 | #, c-format |
516 | msgid "failed to expand user dir in: '%s'" | |
517 | msgstr "无法扩展 '%s' 中的用户目录" | |
518 | ||
276ceeaa | 519 | #: config.c:758 config.c:769 |
220c313c JX |
520 | #, c-format |
521 | msgid "bad zlib compression level %d" | |
522 | msgstr "错误的 zlib 压缩级别 %d" | |
523 | ||
276ceeaa | 524 | #: config.c:891 |
220c313c JX |
525 | #, c-format |
526 | msgid "invalid mode for object creation: %s" | |
527 | msgstr "无效的对象创建模式:%s" | |
528 | ||
276ceeaa | 529 | #: config.c:1220 |
220c313c JX |
530 | msgid "unable to parse command-line config" |
531 | msgstr "无法解析命令行中的配置" | |
532 | ||
276ceeaa | 533 | #: config.c:1281 |
220c313c JX |
534 | msgid "unknown error occured while reading the configuration files" |
535 | msgstr "在读取配置文件时遇到未知错误" | |
536 | ||
276ceeaa | 537 | #: config.c:1629 |
220c313c JX |
538 | #, c-format |
539 | msgid "unable to parse '%s' from command-line config" | |
540 | msgstr "无法解析命令行配置中的 '%s'" | |
541 | ||
276ceeaa | 542 | #: config.c:1631 |
220c313c JX |
543 | #, c-format |
544 | msgid "bad config variable '%s' in file '%s' at line %d" | |
545 | msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" | |
546 | ||
276ceeaa | 547 | #: config.c:1690 |
220c313c JX |
548 | #, c-format |
549 | msgid "%s has multiple values" | |
550 | msgstr "%s 有多个取值" | |
551 | ||
276ceeaa JX |
552 | #: config.c:2226 |
553 | #, c-format | |
554 | msgid "Could not set '%s' to '%s'" | |
555 | msgstr "不能设置 '%s' 为 '%s'" | |
556 | ||
220c313c | 557 | #: connected.c:69 |
c04f5ac3 JX |
558 | msgid "Could not run 'git rev-list'" |
559 | msgstr "不能执行 'git rev-list'" | |
560 | ||
220c313c | 561 | #: connected.c:89 |
c04f5ac3 JX |
562 | #, c-format |
563 | msgid "failed write to rev-list: %s" | |
564 | msgstr "无法写入 rev-list:%s" | |
565 | ||
220c313c | 566 | #: connected.c:97 |
c04f5ac3 JX |
567 | #, c-format |
568 | msgid "failed to close rev-list's stdin: %s" | |
569 | msgstr "无法关闭 rev-list 的标准输入:%s" | |
570 | ||
8ada9598 JX |
571 | #: date.c:95 |
572 | msgid "in the future" | |
81809b99 | 573 | msgstr "在将来" |
8ada9598 JX |
574 | |
575 | #: date.c:101 | |
576 | #, c-format | |
577 | msgid "%lu second ago" | |
578 | msgid_plural "%lu seconds ago" | |
6c94aba5 JX |
579 | msgstr[0] "%lu 秒钟前" |
580 | msgstr[1] "%lu 秒钟前" | |
8ada9598 JX |
581 | |
582 | #: date.c:108 | |
583 | #, c-format | |
584 | msgid "%lu minute ago" | |
585 | msgid_plural "%lu minutes ago" | |
6c94aba5 JX |
586 | msgstr[0] "%lu 分钟前" |
587 | msgstr[1] "%lu 分钟前" | |
8ada9598 JX |
588 | |
589 | #: date.c:115 | |
590 | #, c-format | |
591 | msgid "%lu hour ago" | |
592 | msgid_plural "%lu hours ago" | |
6c94aba5 JX |
593 | msgstr[0] "%lu 小时前" |
594 | msgstr[1] "%lu 小时前" | |
8ada9598 JX |
595 | |
596 | #: date.c:122 | |
597 | #, c-format | |
598 | msgid "%lu day ago" | |
599 | msgid_plural "%lu days ago" | |
6c94aba5 JX |
600 | msgstr[0] "%lu 天前" |
601 | msgstr[1] "%lu 天前" | |
8ada9598 JX |
602 | |
603 | #: date.c:128 | |
604 | #, c-format | |
605 | msgid "%lu week ago" | |
606 | msgid_plural "%lu weeks ago" | |
6c94aba5 JX |
607 | msgstr[0] "%lu 周前" |
608 | msgstr[1] "%lu 周前" | |
8ada9598 JX |
609 | |
610 | #: date.c:135 | |
611 | #, c-format | |
612 | msgid "%lu month ago" | |
613 | msgid_plural "%lu months ago" | |
6c94aba5 JX |
614 | msgstr[0] "%lu 个月前" |
615 | msgstr[1] "%lu 个月前" | |
8ada9598 JX |
616 | |
617 | #: date.c:146 | |
618 | #, c-format | |
619 | msgid "%lu year" | |
620 | msgid_plural "%lu years" | |
81809b99 | 621 | msgstr[0] "%lu 年" |
5ae481e0 | 622 | msgstr[1] "%lu 年" |
8ada9598 | 623 | |
6c94aba5 | 624 | #. TRANSLATORS: "%s" is "<n> years" |
8ada9598 JX |
625 | #: date.c:149 |
626 | #, c-format | |
627 | msgid "%s, %lu month ago" | |
628 | msgid_plural "%s, %lu months ago" | |
6c94aba5 JX |
629 | msgstr[0] "%s %lu 个月前" |
630 | msgstr[1] "%s %lu 个月前" | |
8ada9598 JX |
631 | |
632 | #: date.c:154 date.c:159 | |
633 | #, c-format | |
634 | msgid "%lu year ago" | |
635 | msgid_plural "%lu years ago" | |
81809b99 | 636 | msgstr[0] "%lu 年前" |
5ae481e0 | 637 | msgstr[1] "%lu 年前" |
8ada9598 | 638 | |
cfff71a9 JX |
639 | #: diffcore-order.c:24 |
640 | #, c-format | |
641 | msgid "failed to read orderfile '%s'" | |
642 | msgstr "无法读取排序文件 '%s'" | |
643 | ||
814ff314 | 644 | #: diffcore-rename.c:536 |
6c94aba5 JX |
645 | msgid "Performing inexact rename detection" |
646 | msgstr "正在进行非精确的重命名检测" | |
647 | ||
90e6ef53 | 648 | # 译者:注意保持前导空格 |
94550ed3 | 649 | #: diff.c:115 |
c04f5ac3 | 650 | #, c-format |
07432cef WS |
651 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" |
652 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" | |
c04f5ac3 | 653 | |
90e6ef53 | 654 | # 译者:注意保持前导空格 |
94550ed3 | 655 | #: diff.c:120 |
c04f5ac3 | 656 | #, c-format |
07432cef WS |
657 | msgid " Unknown dirstat parameter '%s'\n" |
658 | msgstr " 未知的 dirstat 参数 '%s'\n" | |
c04f5ac3 | 659 | |
94550ed3 | 660 | #: diff.c:215 |
07432cef WS |
661 | #, c-format |
662 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" | |
663 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" | |
664 | ||
94550ed3 | 665 | #: diff.c:267 |
c04f5ac3 JX |
666 | #, c-format |
667 | msgid "" | |
668 | "Found errors in 'diff.dirstat' config variable:\n" | |
669 | "%s" | |
670 | msgstr "" | |
90e6ef53 | 671 | "发现配置变量 'diff.dirstat' 中的错误:\n" |
c04f5ac3 JX |
672 | "%s" |
673 | ||
276ceeaa | 674 | #: diff.c:2997 |
6acbf033 JX |
675 | #, c-format |
676 | msgid "external diff died, stopping at %s" | |
677 | msgstr "外部 diff 退出,停止在 %s" | |
678 | ||
276ceeaa | 679 | #: diff.c:3393 |
6acbf033 JX |
680 | msgid "--follow requires exactly one pathspec" |
681 | msgstr "--follow 参数后只跟一个 pathspec" | |
682 | ||
276ceeaa | 683 | #: diff.c:3556 |
c04f5ac3 JX |
684 | #, c-format |
685 | msgid "" | |
686 | "Failed to parse --dirstat/-X option parameter:\n" | |
687 | "%s" | |
688 | msgstr "" | |
689 | "无法解析 --dirstat/-X 选项的参数:\n" | |
690 | "%s" | |
691 | ||
276ceeaa | 692 | #: diff.c:3570 |
07432cef WS |
693 | #, c-format |
694 | msgid "Failed to parse --submodule option parameter: '%s'" | |
695 | msgstr "无法解析 --submodule 选项的参数:'%s'" | |
696 | ||
276ceeaa | 697 | #: dir.c:2004 |
7aea43ff JX |
698 | msgid "failed to get kernel name and information" |
699 | msgstr "无法获得内核名称和信息" | |
700 | ||
276ceeaa JX |
701 | #: dir.c:2123 |
702 | msgid "Untracked cache is disabled on this system or location." | |
703 | msgstr "缓存未跟踪文件在本系统或位置中被禁用。" | |
7aea43ff | 704 | |
1b7f4a34 | 705 | #: gpg-interface.c:166 gpg-interface.c:237 |
c04f5ac3 JX |
706 | msgid "could not run gpg." |
707 | msgstr "不能执行 gpg。" | |
708 | ||
1b7f4a34 | 709 | #: gpg-interface.c:178 |
c04f5ac3 JX |
710 | msgid "gpg did not accept the data" |
711 | msgstr "gpg 没有接受数据" | |
712 | ||
1b7f4a34 | 713 | #: gpg-interface.c:189 |
c04f5ac3 JX |
714 | msgid "gpg failed to sign the data" |
715 | msgstr "gpg 无法为数据签名" | |
716 | ||
1b7f4a34 | 717 | #: gpg-interface.c:222 |
a77c07d9 JX |
718 | #, c-format |
719 | msgid "could not create temporary file '%s': %s" | |
720 | msgstr "不能创建临时文件 '%s':%s" | |
721 | ||
1b7f4a34 | 722 | #: gpg-interface.c:225 |
a77c07d9 JX |
723 | #, c-format |
724 | msgid "failed writing detached signature to '%s': %s" | |
725 | msgstr "无法将分离式签名写入 '%s':%s" | |
726 | ||
220c313c | 727 | #: grep.c:1718 |
7ac1c0ad JX |
728 | #, c-format |
729 | msgid "'%s': unable to read %s" | |
730 | msgstr "'%s':无法读取 %s" | |
731 | ||
220c313c | 732 | #: grep.c:1735 |
7ac1c0ad JX |
733 | #, c-format |
734 | msgid "'%s': %s" | |
735 | msgstr "'%s':%s" | |
736 | ||
220c313c | 737 | #: grep.c:1746 |
7ac1c0ad JX |
738 | #, c-format |
739 | msgid "'%s': short read %s" | |
740 | msgstr "'%s':读取不完整 %s" | |
741 | ||
276ceeaa | 742 | #: help.c:205 |
81809b99 | 743 | #, c-format |
8ada9598 | 744 | msgid "available git commands in '%s'" |
81809b99 | 745 | msgstr "在 '%s' 下可用的 git 命令" |
8ada9598 | 746 | |
276ceeaa | 747 | #: help.c:212 |
8ada9598 | 748 | msgid "git commands available from elsewhere on your $PATH" |
81809b99 | 749 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" |
8ada9598 | 750 | |
276ceeaa | 751 | #: help.c:244 |
7aea43ff JX |
752 | msgid "These are common Git commands used in various situations:" |
753 | msgstr "这些是各种场合常见的 Git 命令:" | |
a77c07d9 | 754 | |
276ceeaa | 755 | #: help.c:309 |
c04f5ac3 JX |
756 | #, c-format |
757 | msgid "" | |
758 | "'%s' appears to be a git command, but we were not\n" | |
759 | "able to execute it. Maybe git-%s is broken?" | |
760 | msgstr "" | |
761 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
762 | "可能是 git-%s 受损?" | |
763 | ||
276ceeaa | 764 | #: help.c:366 |
8ada9598 | 765 | msgid "Uh oh. Your system reports no Git commands at all." |
81809b99 | 766 | msgstr "唉呀,您的系统中未发现 Git 命令。" |
8ada9598 | 767 | |
276ceeaa | 768 | #: help.c:388 |
8ada9598 JX |
769 | #, c-format |
770 | msgid "" | |
771 | "WARNING: You called a Git command named '%s', which does not exist.\n" | |
772 | "Continuing under the assumption that you meant '%s'" | |
773 | msgstr "" | |
81809b99 JX |
774 | "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" |
775 | "是 '%s'" | |
8ada9598 | 776 | |
276ceeaa | 777 | #: help.c:393 |
8ada9598 JX |
778 | #, c-format |
779 | msgid "in %0.1f seconds automatically..." | |
81809b99 | 780 | msgstr "在 %0.1f 秒钟后自动运行..." |
8ada9598 | 781 | |
276ceeaa | 782 | #: help.c:400 |
8ada9598 JX |
783 | #, c-format |
784 | msgid "git: '%s' is not a git command. See 'git --help'." | |
81809b99 | 785 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" |
8ada9598 | 786 | |
276ceeaa | 787 | #: help.c:404 help.c:464 |
8ada9598 JX |
788 | msgid "" |
789 | "\n" | |
790 | "Did you mean this?" | |
791 | msgid_plural "" | |
792 | "\n" | |
793 | "Did you mean one of these?" | |
794 | msgstr[0] "" | |
81809b99 JX |
795 | "\n" |
796 | "您指的是这个么?" | |
797 | msgstr[1] "" | |
798 | "\n" | |
195febda | 799 | "您指的是这其中的某一个么?" |
8ada9598 | 800 | |
276ceeaa | 801 | #: help.c:460 |
2e8451e8 JX |
802 | #, c-format |
803 | msgid "%s: %s - %s" | |
804 | msgstr "%s:%s - %s" | |
805 | ||
220c313c | 806 | #: merge.c:41 |
07432cef WS |
807 | msgid "failed to read the cache" |
808 | msgstr "无法读取缓存" | |
809 | ||
276ceeaa JX |
810 | #: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 |
811 | #: builtin/checkout.c:587 builtin/clone.c:730 | |
07432cef WS |
812 | msgid "unable to write new index file" |
813 | msgstr "无法写新的索引文件" | |
814 | ||
220c313c | 815 | #: merge-recursive.c:189 |
649900bc JX |
816 | #, c-format |
817 | msgid "(bad commit)\n" | |
818 | msgstr "(坏提交)\n" | |
819 | ||
220c313c | 820 | #: merge-recursive.c:209 |
649900bc JX |
821 | #, c-format |
822 | msgid "addinfo_cache failed for path '%s'" | |
823 | msgstr "为路径 '%s' addinfo_cache 失败" | |
824 | ||
220c313c | 825 | #: merge-recursive.c:270 |
649900bc JX |
826 | msgid "error building trees" |
827 | msgstr "无法创建树" | |
828 | ||
276ceeaa | 829 | #: merge-recursive.c:689 |
649900bc JX |
830 | #, c-format |
831 | msgid "failed to create path '%s'%s" | |
832 | msgstr "无法创建路径 '%s'%s" | |
833 | ||
276ceeaa | 834 | #: merge-recursive.c:700 |
649900bc JX |
835 | #, c-format |
836 | msgid "Removing %s to make room for subdirectory\n" | |
837 | msgstr "删除 %s 以便为子目录留出空间\n" | |
838 | ||
276ceeaa | 839 | #: merge-recursive.c:714 merge-recursive.c:735 |
649900bc JX |
840 | msgid ": perhaps a D/F conflict?" |
841 | msgstr ":可能是一个目录/文件冲突?" | |
842 | ||
276ceeaa | 843 | #: merge-recursive.c:725 |
649900bc JX |
844 | #, c-format |
845 | msgid "refusing to lose untracked file at '%s'" | |
846 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
847 | ||
276ceeaa | 848 | #: merge-recursive.c:765 |
649900bc JX |
849 | #, c-format |
850 | msgid "cannot read object %s '%s'" | |
851 | msgstr "不能读取对象 %s '%s'" | |
852 | ||
276ceeaa | 853 | #: merge-recursive.c:767 |
649900bc JX |
854 | #, c-format |
855 | msgid "blob expected for %s '%s'" | |
160fb2b2 | 856 | msgstr "%s '%s' 应为数据对象" |
649900bc | 857 | |
276ceeaa | 858 | #: merge-recursive.c:790 builtin/clone.c:374 |
649900bc JX |
859 | #, c-format |
860 | msgid "failed to open '%s'" | |
861 | msgstr "无法打开 '%s'" | |
862 | ||
276ceeaa | 863 | #: merge-recursive.c:798 |
649900bc JX |
864 | #, c-format |
865 | msgid "failed to symlink '%s'" | |
866 | msgstr "无法创建符号链接 '%s'" | |
867 | ||
276ceeaa | 868 | #: merge-recursive.c:801 |
649900bc JX |
869 | #, c-format |
870 | msgid "do not know what to do with %06o %s '%s'" | |
871 | msgstr "不知道如何处理 %06o %s '%s'" | |
872 | ||
276ceeaa | 873 | #: merge-recursive.c:939 |
649900bc JX |
874 | msgid "Failed to execute internal merge" |
875 | msgstr "无法执行内部合并" | |
876 | ||
276ceeaa | 877 | #: merge-recursive.c:943 |
649900bc JX |
878 | #, c-format |
879 | msgid "Unable to add %s to database" | |
880 | msgstr "不能添加 %s 至对象库" | |
881 | ||
276ceeaa | 882 | #: merge-recursive.c:959 |
649900bc JX |
883 | msgid "unsupported object type in the tree" |
884 | msgstr "在树中有不支持的对象类型" | |
885 | ||
276ceeaa | 886 | #: merge-recursive.c:1034 merge-recursive.c:1048 |
649900bc JX |
887 | #, c-format |
888 | msgid "" | |
889 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
890 | "in tree." | |
891 | msgstr "" | |
892 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" | |
893 | "的版本被保留。" | |
894 | ||
276ceeaa | 895 | #: merge-recursive.c:1040 merge-recursive.c:1053 |
649900bc JX |
896 | #, c-format |
897 | msgid "" | |
898 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
899 | "in tree at %s." | |
900 | msgstr "" | |
901 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" | |
902 | "的版本保留于 %8$s 中。" | |
903 | ||
276ceeaa | 904 | #: merge-recursive.c:1094 |
649900bc JX |
905 | msgid "rename" |
906 | msgstr "重命名" | |
907 | ||
276ceeaa | 908 | #: merge-recursive.c:1094 |
649900bc JX |
909 | msgid "renamed" |
910 | msgstr "重命名" | |
911 | ||
276ceeaa | 912 | #: merge-recursive.c:1150 |
649900bc JX |
913 | #, c-format |
914 | msgid "%s is a directory in %s adding as %s instead" | |
915 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
916 | ||
276ceeaa | 917 | #: merge-recursive.c:1172 |
649900bc JX |
918 | #, c-format |
919 | msgid "" | |
920 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" | |
921 | "\"->\"%s\" in \"%s\"%s" | |
922 | msgstr "" | |
923 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " | |
924 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" | |
925 | ||
276ceeaa | 926 | #: merge-recursive.c:1177 |
649900bc JX |
927 | msgid " (left unresolved)" |
928 | msgstr "(留下未解决)" | |
929 | ||
276ceeaa | 930 | #: merge-recursive.c:1231 |
649900bc JX |
931 | #, c-format |
932 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" | |
933 | msgstr "" | |
934 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" | |
935 | "%5$s" | |
936 | ||
276ceeaa | 937 | #: merge-recursive.c:1261 |
649900bc JX |
938 | #, c-format |
939 | msgid "Renaming %s to %s and %s to %s instead" | |
07432cef | 940 | msgstr "而是重命名 %s 至 %s,以及 %s 至 %s" |
649900bc | 941 | |
276ceeaa | 942 | #: merge-recursive.c:1460 |
649900bc JX |
943 | #, c-format |
944 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" | |
945 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
946 | ||
276ceeaa | 947 | #: merge-recursive.c:1470 |
649900bc JX |
948 | #, c-format |
949 | msgid "Adding merged %s" | |
950 | msgstr "添加合并后的 %s" | |
951 | ||
276ceeaa | 952 | #: merge-recursive.c:1475 merge-recursive.c:1677 |
649900bc JX |
953 | #, c-format |
954 | msgid "Adding as %s instead" | |
955 | msgstr "而是以 %s 为名添加" | |
956 | ||
276ceeaa | 957 | #: merge-recursive.c:1526 |
649900bc JX |
958 | #, c-format |
959 | msgid "cannot read object %s" | |
960 | msgstr "不能读取对象 %s" | |
961 | ||
276ceeaa | 962 | #: merge-recursive.c:1529 |
649900bc JX |
963 | #, c-format |
964 | msgid "object %s is not a blob" | |
160fb2b2 | 965 | msgstr "对象 %s 不是一个数据对象" |
649900bc | 966 | |
276ceeaa | 967 | #: merge-recursive.c:1581 |
649900bc JX |
968 | msgid "modify" |
969 | msgstr "修改" | |
970 | ||
276ceeaa | 971 | #: merge-recursive.c:1581 |
649900bc JX |
972 | msgid "modified" |
973 | msgstr "修改" | |
974 | ||
276ceeaa | 975 | #: merge-recursive.c:1591 |
649900bc JX |
976 | msgid "content" |
977 | msgstr "内容" | |
978 | ||
276ceeaa | 979 | #: merge-recursive.c:1598 |
649900bc JX |
980 | msgid "add/add" |
981 | msgstr "添加/添加" | |
982 | ||
276ceeaa | 983 | #: merge-recursive.c:1632 |
649900bc JX |
984 | #, c-format |
985 | msgid "Skipped %s (merged same as existing)" | |
986 | msgstr "略过 %s(已经做过相同合并)" | |
987 | ||
276ceeaa | 988 | #: merge-recursive.c:1646 |
649900bc JX |
989 | #, c-format |
990 | msgid "Auto-merging %s" | |
991 | msgstr "自动合并 %s" | |
992 | ||
276ceeaa | 993 | #: merge-recursive.c:1650 git-submodule.sh:1048 |
649900bc JX |
994 | msgid "submodule" |
995 | msgstr "子模组" | |
996 | ||
276ceeaa | 997 | #: merge-recursive.c:1651 |
649900bc JX |
998 | #, c-format |
999 | msgid "CONFLICT (%s): Merge conflict in %s" | |
1000 | msgstr "冲突(%s):合并冲突于 %s" | |
1001 | ||
276ceeaa | 1002 | #: merge-recursive.c:1737 |
649900bc JX |
1003 | #, c-format |
1004 | msgid "Removing %s" | |
1005 | msgstr "删除 %s" | |
1006 | ||
276ceeaa | 1007 | #: merge-recursive.c:1762 |
649900bc JX |
1008 | msgid "file/directory" |
1009 | msgstr "文件/目录" | |
1010 | ||
276ceeaa | 1011 | #: merge-recursive.c:1768 |
649900bc JX |
1012 | msgid "directory/file" |
1013 | msgstr "目录/文件" | |
1014 | ||
276ceeaa | 1015 | #: merge-recursive.c:1773 |
649900bc JX |
1016 | #, c-format |
1017 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" | |
1018 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
1019 | ||
276ceeaa | 1020 | #: merge-recursive.c:1783 |
649900bc JX |
1021 | #, c-format |
1022 | msgid "Adding %s" | |
1023 | msgstr "添加 %s" | |
1024 | ||
276ceeaa | 1025 | #: merge-recursive.c:1800 |
649900bc JX |
1026 | msgid "Fatal merge failure, shouldn't happen." |
1027 | msgstr "严重的合并错误,不应发生。" | |
1028 | ||
276ceeaa | 1029 | #: merge-recursive.c:1819 |
649900bc JX |
1030 | msgid "Already up-to-date!" |
1031 | msgstr "已经是最新的!" | |
1032 | ||
276ceeaa | 1033 | #: merge-recursive.c:1828 |
649900bc JX |
1034 | #, c-format |
1035 | msgid "merging of trees %s and %s failed" | |
1036 | msgstr "无法合并树 %s 和 %s" | |
1037 | ||
276ceeaa | 1038 | #: merge-recursive.c:1858 |
649900bc JX |
1039 | #, c-format |
1040 | msgid "Unprocessed path??? %s" | |
1041 | msgstr "未处理的路径??? %s" | |
1042 | ||
276ceeaa | 1043 | #: merge-recursive.c:1906 |
649900bc JX |
1044 | msgid "Merging:" |
1045 | msgstr "合并:" | |
1046 | ||
276ceeaa | 1047 | #: merge-recursive.c:1919 |
649900bc | 1048 | #, c-format |
e5e38ce4 JX |
1049 | msgid "found %u common ancestor:" |
1050 | msgid_plural "found %u common ancestors:" | |
1051 | msgstr[0] "发现 %u 个共同祖先:" | |
1052 | msgstr[1] "发现 %u 个共同祖先:" | |
649900bc | 1053 | |
276ceeaa | 1054 | #: merge-recursive.c:1956 |
649900bc JX |
1055 | msgid "merge returned no commit" |
1056 | msgstr "合并未返回提交" | |
1057 | ||
276ceeaa | 1058 | #: merge-recursive.c:2013 |
649900bc JX |
1059 | #, c-format |
1060 | msgid "Could not parse object '%s'" | |
1061 | msgstr "不能解析对象 '%s'" | |
1062 | ||
276ceeaa | 1063 | #: merge-recursive.c:2024 builtin/merge.c:646 |
649900bc JX |
1064 | msgid "Unable to write index." |
1065 | msgstr "不能写入索引。" | |
1066 | ||
6acbf033 | 1067 | #: notes-utils.c:41 |
2e8451e8 JX |
1068 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
1069 | msgstr "不能提交未初始化/未引用的注解树" | |
1070 | ||
1b7f4a34 | 1071 | #: notes-utils.c:100 |
2e8451e8 JX |
1072 | #, c-format |
1073 | msgid "Bad notes.rewriteMode value: '%s'" | |
1074 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
1075 | ||
1b7f4a34 | 1076 | #: notes-utils.c:110 |
2e8451e8 JX |
1077 | #, c-format |
1078 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" | |
1079 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
1080 | ||
1081 | #. TRANSLATORS: The first %s is the name of the | |
1082 | #. environment variable, the second %s is its value | |
1b7f4a34 | 1083 | #: notes-utils.c:137 |
2e8451e8 JX |
1084 | #, c-format |
1085 | msgid "Bad %s value: '%s'" | |
1086 | msgstr "坏的 %s 值:'%s'" | |
1087 | ||
7aea43ff | 1088 | #: object.c:242 |
1003b3a5 JX |
1089 | #, c-format |
1090 | msgid "unable to parse object: %s" | |
1091 | msgstr "不能解析对象:%s" | |
1092 | ||
94550ed3 | 1093 | #: parse-options.c:570 |
8ada9598 | 1094 | msgid "..." |
81809b99 | 1095 | msgstr "..." |
8ada9598 | 1096 | |
94550ed3 | 1097 | #: parse-options.c:588 |
81809b99 | 1098 | #, c-format |
8ada9598 | 1099 | msgid "usage: %s" |
81809b99 | 1100 | msgstr "用法:%s" |
8ada9598 JX |
1101 | |
1102 | #. TRANSLATORS: the colon here should align with the | |
1103 | #. one in "usage: %s" translation | |
94550ed3 | 1104 | #: parse-options.c:592 |
81809b99 | 1105 | #, c-format |
8ada9598 | 1106 | msgid " or: %s" |
81809b99 | 1107 | msgstr " 或:%s" |
8ada9598 JX |
1108 | |
1109 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
94550ed3 | 1110 | #: parse-options.c:595 |
81809b99 | 1111 | #, c-format |
8ada9598 | 1112 | msgid " %s" |
81809b99 | 1113 | msgstr " %s" |
8ada9598 | 1114 | |
94550ed3 | 1115 | #: parse-options.c:629 |
63af42fe JX |
1116 | msgid "-NUM" |
1117 | msgstr "-数字" | |
1118 | ||
94550ed3 JX |
1119 | #: parse-options-cb.c:108 |
1120 | #, c-format | |
1121 | msgid "malformed object name '%s'" | |
1122 | msgstr "非法的对象名 '%s'" | |
1123 | ||
1124 | #: path.c:752 | |
1125 | #, c-format | |
1126 | msgid "Could not make %s writable by group" | |
1127 | msgstr "不能设置 %s 为组可写" | |
1128 | ||
cfff71a9 | 1129 | #: pathspec.c:133 |
90314792 | 1130 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
160fb2b2 | 1131 | msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" |
90314792 | 1132 | |
cfff71a9 | 1133 | #: pathspec.c:143 |
90314792 JX |
1134 | msgid "" |
1135 | "global 'literal' pathspec setting is incompatible with all other global " | |
1136 | "pathspec settings" | |
160fb2b2 | 1137 | msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" |
90314792 | 1138 | |
cfff71a9 | 1139 | #: pathspec.c:177 |
90314792 | 1140 | msgid "invalid parameter for pathspec magic 'prefix'" |
160fb2b2 | 1141 | msgstr "路径规格包含无效的神奇前缀" |
90314792 | 1142 | |
cfff71a9 | 1143 | #: pathspec.c:183 |
90314792 JX |
1144 | #, c-format |
1145 | msgid "Invalid pathspec magic '%.*s' in '%s'" | |
160fb2b2 | 1146 | msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" |
90314792 | 1147 | |
cfff71a9 | 1148 | #: pathspec.c:187 |
90314792 JX |
1149 | #, c-format |
1150 | msgid "Missing ')' at the end of pathspec magic in '%s'" | |
160fb2b2 | 1151 | msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" |
90314792 | 1152 | |
cfff71a9 | 1153 | #: pathspec.c:205 |
90314792 JX |
1154 | #, c-format |
1155 | msgid "Unimplemented pathspec magic '%c' in '%s'" | |
160fb2b2 | 1156 | msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" |
90314792 | 1157 | |
cfff71a9 | 1158 | #: pathspec.c:230 |
a77c07d9 | 1159 | #, c-format |
90314792 JX |
1160 | msgid "%s: 'literal' and 'glob' are incompatible" |
1161 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
a77c07d9 | 1162 | |
cfff71a9 | 1163 | #: pathspec.c:241 |
a77c07d9 | 1164 | #, c-format |
90314792 | 1165 | msgid "%s: '%s' is outside repository" |
160fb2b2 | 1166 | msgstr "%s:'%s' 在仓库之外" |
a77c07d9 | 1167 | |
cfff71a9 | 1168 | #: pathspec.c:291 |
90314792 JX |
1169 | #, c-format |
1170 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
160fb2b2 | 1171 | msgstr "路径规格 '%s' 在子模组 '%.*s' 中" |
90314792 | 1172 | |
cfff71a9 | 1173 | #: pathspec.c:353 |
90314792 JX |
1174 | #, c-format |
1175 | msgid "%s: pathspec magic not supported by this command: %s" | |
160fb2b2 | 1176 | msgstr "%s:路径规格神奇前缀不被此命令支持:%s" |
90314792 | 1177 | |
276ceeaa | 1178 | #: pathspec.c:433 |
90314792 JX |
1179 | #, c-format |
1180 | msgid "pathspec '%s' is beyond a symbolic link" | |
160fb2b2 | 1181 | msgstr "路径规格 '%s' 位于符号链接中" |
90314792 | 1182 | |
276ceeaa | 1183 | #: pathspec.c:442 |
cfff71a9 JX |
1184 | msgid "" |
1185 | "There is nothing to exclude from by :(exclude) patterns.\n" | |
1186 | "Perhaps you forgot to add either ':/' or '.' ?" | |
1187 | msgstr "" | |
1188 | "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" | |
1189 | "添加 ':/' 或 '.' ?" | |
1190 | ||
1b7f4a34 | 1191 | #: pretty.c:969 |
220c313c JX |
1192 | msgid "unable to parse --pretty format" |
1193 | msgstr "不能解析 --pretty 格式" | |
1194 | ||
94550ed3 | 1195 | #: progress.c:235 |
6c94aba5 JX |
1196 | msgid "done" |
1197 | msgstr "完成" | |
1198 | ||
94550ed3 | 1199 | #: read-cache.c:1281 |
6c94aba5 JX |
1200 | #, c-format |
1201 | msgid "" | |
1202 | "index.version set, but the value is invalid.\n" | |
1203 | "Using version %i" | |
1204 | msgstr "" | |
1205 | "设置了 index.version,但是取值无效。\n" | |
1206 | "使用版本 %i" | |
1207 | ||
94550ed3 | 1208 | #: read-cache.c:1291 |
6c94aba5 JX |
1209 | #, c-format |
1210 | msgid "" | |
1211 | "GIT_INDEX_VERSION set, but the value is invalid.\n" | |
1212 | "Using version %i" | |
1213 | msgstr "" | |
1214 | "设置了 GIT_INDEX_VERSION,但是取值无效。\n" | |
1215 | "使用版本 %i" | |
1216 | ||
276ceeaa JX |
1217 | #: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 |
1218 | #: builtin/merge.c:984 | |
1b7f4a34 JX |
1219 | #, c-format |
1220 | msgid "Could not open '%s' for writing" | |
1221 | msgstr "无法打开 '%s' 进行写入" | |
1222 | ||
276ceeaa | 1223 | #: refs/files-backend.c:2374 |
1b7f4a34 JX |
1224 | #, c-format |
1225 | msgid "could not delete reference %s: %s" | |
1226 | msgstr "无法删除引用 %s:%s" | |
1227 | ||
276ceeaa | 1228 | #: refs/files-backend.c:2377 |
1b7f4a34 JX |
1229 | #, c-format |
1230 | msgid "could not delete references: %s" | |
1231 | msgstr "无法删除引用:%s" | |
1232 | ||
276ceeaa | 1233 | #: refs/files-backend.c:2386 |
1b7f4a34 JX |
1234 | #, c-format |
1235 | msgid "could not remove reference %s" | |
1236 | msgstr "无法删除引用 %s" | |
1237 | ||
276ceeaa | 1238 | #: ref-filter.c:55 |
94550ed3 | 1239 | #, c-format |
276ceeaa JX |
1240 | msgid "expected format: %%(color:<color>)" |
1241 | msgstr "期望的格式:%%(color:<color>)" | |
1242 | ||
1243 | #: ref-filter.c:57 | |
1244 | #, c-format | |
1245 | msgid "unrecognized color: %%(color:%s)" | |
1246 | msgstr "未能识别的颜色:%%(color:%s)" | |
1247 | ||
1248 | #: ref-filter.c:71 | |
1249 | #, c-format | |
1250 | msgid "unrecognized format: %%(%s)" | |
1251 | msgstr "未能识别的格式:%%(%s)" | |
94550ed3 | 1252 | |
276ceeaa | 1253 | #: ref-filter.c:101 |
94550ed3 JX |
1254 | #, c-format |
1255 | msgid "positive value expected contents:lines=%s" | |
1256 | msgstr "要为 contents:lines=%s 提供一个正数" | |
1257 | ||
276ceeaa | 1258 | #: ref-filter.c:103 |
94550ed3 | 1259 | #, c-format |
276ceeaa JX |
1260 | msgid "unrecognized %%(contents) argument: %s" |
1261 | msgstr "未能识别的 %%(contents) 参数:%s" | |
94550ed3 | 1262 | |
276ceeaa JX |
1263 | #: ref-filter.c:113 |
1264 | #, c-format | |
1265 | msgid "unrecognized %%(objectname) argument: %s" | |
1266 | msgstr "未能识别的 %%(objectname) 参数:%s" | |
1b7f4a34 | 1267 | |
276ceeaa | 1268 | #: ref-filter.c:135 |
94550ed3 JX |
1269 | #, c-format |
1270 | msgid "expected format: %%(align:<width>,<position>)" | |
1271 | msgstr "期望的格式:%%(align:<width>,<position>)" | |
1272 | ||
276ceeaa JX |
1273 | #: ref-filter.c:147 |
1274 | #, c-format | |
1275 | msgid "unrecognized position:%s" | |
1276 | msgstr "未能识别的位置:%s" | |
1277 | ||
1278 | #: ref-filter.c:151 | |
94550ed3 | 1279 | #, c-format |
276ceeaa JX |
1280 | msgid "unrecognized width:%s" |
1281 | msgstr "未能识别的宽度:%s" | |
94550ed3 | 1282 | |
276ceeaa JX |
1283 | #: ref-filter.c:157 |
1284 | #, c-format | |
1285 | msgid "unrecognized %%(align) argument: %s" | |
1286 | msgstr "未能识别的 %%(align) 参数:%s" | |
1287 | ||
1288 | #: ref-filter.c:161 | |
94550ed3 JX |
1289 | #, c-format |
1290 | msgid "positive width expected with the %%(align) atom" | |
1291 | msgstr "元素 %%(align) 需要一个正数的宽度" | |
1292 | ||
276ceeaa JX |
1293 | #: ref-filter.c:372 |
1294 | #, c-format | |
1295 | msgid "format: %%(end) atom used without corresponding atom" | |
1296 | msgstr "格式:使用了 %%(end) 元素却没有它的对应元素" | |
1297 | ||
1298 | #: ref-filter.c:1311 | |
94550ed3 JX |
1299 | #, c-format |
1300 | msgid "malformed object at '%s'" | |
1301 | msgstr "非法的对象于 '%s'" | |
1302 | ||
276ceeaa | 1303 | #: ref-filter.c:1651 |
94550ed3 JX |
1304 | #, c-format |
1305 | msgid "format: %%(end) atom missing" | |
1306 | msgstr "格式:缺少 %%(end) 元素" | |
1307 | ||
276ceeaa | 1308 | #: ref-filter.c:1705 |
94550ed3 JX |
1309 | #, c-format |
1310 | msgid "malformed object name %s" | |
1311 | msgstr "非法的对象名 %s" | |
1312 | ||
276ceeaa | 1313 | #: remote.c:745 |
cfff71a9 JX |
1314 | #, c-format |
1315 | msgid "Cannot fetch both %s and %s to %s" | |
1316 | msgstr "不能同时获取 %s 和 %s 至 %s" | |
1317 | ||
276ceeaa | 1318 | #: remote.c:749 |
cfff71a9 JX |
1319 | #, c-format |
1320 | msgid "%s usually tracks %s, not %s" | |
1321 | msgstr "%s 通常跟踪 %s,而非 %s" | |
1322 | ||
276ceeaa | 1323 | #: remote.c:753 |
cfff71a9 JX |
1324 | #, c-format |
1325 | msgid "%s tracks both %s and %s" | |
1326 | msgstr "%s 同时跟踪 %s 和 %s" | |
1327 | ||
276ceeaa | 1328 | #: remote.c:761 |
cfff71a9 JX |
1329 | msgid "Internal error" |
1330 | msgstr "内部错误" | |
1331 | ||
276ceeaa | 1332 | #: remote.c:1677 remote.c:1720 |
7aea43ff JX |
1333 | msgid "HEAD does not point to a branch" |
1334 | msgstr "HEAD 没有指向一个分支" | |
1335 | ||
276ceeaa | 1336 | #: remote.c:1686 |
7aea43ff JX |
1337 | #, c-format |
1338 | msgid "no such branch: '%s'" | |
1339 | msgstr "没有此分支:'%s'" | |
1340 | ||
276ceeaa | 1341 | #: remote.c:1689 |
7aea43ff JX |
1342 | #, c-format |
1343 | msgid "no upstream configured for branch '%s'" | |
1344 | msgstr "尚未给分支 '%s' 设置上游" | |
1345 | ||
276ceeaa | 1346 | #: remote.c:1695 |
7aea43ff JX |
1347 | #, c-format |
1348 | msgid "upstream branch '%s' not stored as a remote-tracking branch" | |
1349 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
1350 | ||
276ceeaa | 1351 | #: remote.c:1710 |
7aea43ff JX |
1352 | #, c-format |
1353 | msgid "push destination '%s' on remote '%s' has no local tracking branch" | |
1354 | msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" | |
1355 | ||
276ceeaa | 1356 | #: remote.c:1725 |
7aea43ff JX |
1357 | #, c-format |
1358 | msgid "branch '%s' has no remote for pushing" | |
1359 | msgstr "分支 '%s' 没有设置要推送的远程服务器" | |
1360 | ||
276ceeaa | 1361 | #: remote.c:1736 |
7aea43ff JX |
1362 | #, c-format |
1363 | msgid "push refspecs for '%s' do not include '%s'" | |
160fb2b2 | 1364 | msgstr "向 '%s' 推送引用规格未包含 '%s'" |
7aea43ff | 1365 | |
276ceeaa | 1366 | #: remote.c:1749 |
7aea43ff JX |
1367 | msgid "push has no destination (push.default is 'nothing')" |
1368 | msgstr "推送无目标(push.default 是 'nothing')" | |
1369 | ||
276ceeaa | 1370 | #: remote.c:1771 |
7aea43ff JX |
1371 | msgid "cannot resolve 'simple' push to a single destination" |
1372 | msgstr "无法解析 'simple' 推送至一个单独的目标" | |
1373 | ||
276ceeaa | 1374 | #: remote.c:2073 |
90314792 JX |
1375 | #, c-format |
1376 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
1377 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
1378 | ||
276ceeaa | 1379 | #: remote.c:2077 |
90314792 JX |
1380 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
1381 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
1382 | ||
276ceeaa | 1383 | #: remote.c:2080 |
90314792 JX |
1384 | #, c-format |
1385 | msgid "Your branch is up-to-date with '%s'.\n" | |
1386 | msgstr "您的分支与上游分支 '%s' 一致。\n" | |
1387 | ||
276ceeaa | 1388 | #: remote.c:2084 |
c04f5ac3 JX |
1389 | #, c-format |
1390 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
1391 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
1392 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
5ae481e0 | 1393 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" |
c04f5ac3 | 1394 | |
276ceeaa | 1395 | #: remote.c:2090 |
07432cef WS |
1396 | msgid " (use \"git push\" to publish your local commits)\n" |
1397 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
1398 | ||
276ceeaa | 1399 | #: remote.c:2093 |
c04f5ac3 JX |
1400 | #, c-format |
1401 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
1402 | msgid_plural "" | |
1403 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
90e6ef53 | 1404 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
5ae481e0 | 1405 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
c04f5ac3 | 1406 | |
07432cef | 1407 | # 译者:注意保持前导空格 |
276ceeaa | 1408 | #: remote.c:2101 |
07432cef WS |
1409 | msgid " (use \"git pull\" to update your local branch)\n" |
1410 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
1411 | ||
276ceeaa | 1412 | #: remote.c:2104 |
c04f5ac3 JX |
1413 | #, c-format |
1414 | msgid "" | |
1415 | "Your branch and '%s' have diverged,\n" | |
1416 | "and have %d and %d different commit each, respectively.\n" | |
1417 | msgid_plural "" | |
1418 | "Your branch and '%s' have diverged,\n" | |
1419 | "and have %d and %d different commits each, respectively.\n" | |
1420 | msgstr[0] "" | |
1421 | "您的分支和 '%s' 出现了偏离,\n" | |
195febda | 1422 | "并且分别有 %d 和 %d 处不同的提交。\n" |
5ae481e0 JX |
1423 | msgstr[1] "" |
1424 | "您的分支和 '%s' 出现了偏离,\n" | |
195febda | 1425 | "并且分别有 %d 和 %d 处不同的提交。\n" |
c04f5ac3 | 1426 | |
07432cef | 1427 | # 译者:注意保持前导空格 |
276ceeaa | 1428 | #: remote.c:2114 |
07432cef WS |
1429 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
1430 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
1431 | ||
276ceeaa | 1432 | #: revision.c:2131 |
1b7f4a34 JX |
1433 | msgid "your current branch appears to be broken" |
1434 | msgstr "您的当前分支好像被损坏" | |
1435 | ||
276ceeaa | 1436 | #: revision.c:2134 |
1b7f4a34 JX |
1437 | #, c-format |
1438 | msgid "your current branch '%s' does not have any commits yet" | |
1439 | msgstr "您的当前分支 '%s' 尚无任何提交" | |
1440 | ||
276ceeaa | 1441 | #: revision.c:2328 |
814ff314 JX |
1442 | msgid "--first-parent is incompatible with --bisect" |
1443 | msgstr "--first-parent 与 --bisect 不兼容" | |
1444 | ||
276ceeaa | 1445 | #: run-command.c:92 |
2e8451e8 JX |
1446 | msgid "open /dev/null failed" |
1447 | msgstr "不能打开 /dev/null" | |
1448 | ||
276ceeaa | 1449 | #: run-command.c:94 |
2e8451e8 JX |
1450 | #, c-format |
1451 | msgid "dup2(%d,%d) failed" | |
1452 | msgstr "不能调用 dup2(%d,%d)" | |
1453 | ||
1b7f4a34 | 1454 | #: send-pack.c:295 |
220c313c JX |
1455 | msgid "failed to sign the push certificate" |
1456 | msgstr "无法为推送证书签名" | |
1457 | ||
1b7f4a34 | 1458 | #: send-pack.c:404 |
220c313c JX |
1459 | msgid "the receiving end does not support --signed push" |
1460 | msgstr "接收端不支持签名推送" | |
1461 | ||
1b7f4a34 JX |
1462 | #: send-pack.c:406 |
1463 | msgid "" | |
1464 | "not sending a push certificate since the receiving end does not support --" | |
1465 | "signed push" | |
1466 | msgstr "未发送推送证书,因为接收端不支持签名推送" | |
1467 | ||
1468 | #: send-pack.c:418 | |
44f518e6 JX |
1469 | msgid "the receiving end does not support --atomic push" |
1470 | msgstr "接收端不支持原子推送" | |
814ff314 | 1471 | |
276ceeaa | 1472 | #: sequencer.c:174 |
14c8bced JX |
1473 | msgid "" |
1474 | "after resolving the conflicts, mark the corrected paths\n" | |
1475 | "with 'git add <paths>' or 'git rm <paths>'" | |
1476 | msgstr "" | |
d9d56b23 | 1477 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" |
14c8bced JX |
1478 | "命令标记修正后的文件" |
1479 | ||
276ceeaa | 1480 | #: sequencer.c:177 |
c04f5ac3 JX |
1481 | msgid "" |
1482 | "after resolving the conflicts, mark the corrected paths\n" | |
1483 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
1484 | "and commit the result with 'git commit'" | |
1485 | msgstr "" | |
d9d56b23 | 1486 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" |
c04f5ac3 JX |
1487 | "对修正后的文件做标记,然后用 'git commit' 提交" |
1488 | ||
276ceeaa | 1489 | #: sequencer.c:190 sequencer.c:833 sequencer.c:913 |
c04f5ac3 JX |
1490 | #, c-format |
1491 | msgid "Could not write to %s" | |
1492 | msgstr "不能写入 %s" | |
1493 | ||
276ceeaa | 1494 | #: sequencer.c:193 |
c04f5ac3 JX |
1495 | #, c-format |
1496 | msgid "Error wrapping up %s" | |
1497 | msgstr "错误收尾 %s" | |
1498 | ||
276ceeaa | 1499 | #: sequencer.c:208 |
c04f5ac3 JX |
1500 | msgid "Your local changes would be overwritten by cherry-pick." |
1501 | msgstr "您的本地修改将被拣选操作覆盖。" | |
1502 | ||
276ceeaa | 1503 | #: sequencer.c:210 |
c04f5ac3 JX |
1504 | msgid "Your local changes would be overwritten by revert." |
1505 | msgstr "您的本地修改将被还原操作覆盖。" | |
1506 | ||
276ceeaa | 1507 | #: sequencer.c:213 |
c04f5ac3 JX |
1508 | msgid "Commit your changes or stash them to proceed." |
1509 | msgstr "提交您的修改或保存进度后再继续。" | |
1510 | ||
1511 | #. TRANSLATORS: %s will be "revert" or "cherry-pick" | |
276ceeaa | 1512 | #: sequencer.c:300 |
c04f5ac3 JX |
1513 | #, c-format |
1514 | msgid "%s: Unable to write new index file" | |
90e6ef53 | 1515 | msgstr "%s:无法写入新索引文件" |
c04f5ac3 | 1516 | |
276ceeaa | 1517 | #: sequencer.c:318 |
8ada9598 | 1518 | msgid "Could not resolve HEAD commit\n" |
81809b99 | 1519 | msgstr "不能解析 HEAD 提交\n" |
8ada9598 | 1520 | |
276ceeaa | 1521 | #: sequencer.c:338 |
8ada9598 | 1522 | msgid "Unable to update cache tree\n" |
81809b99 | 1523 | msgstr "不能更新缓存\n" |
8ada9598 | 1524 | |
276ceeaa | 1525 | #: sequencer.c:390 |
81809b99 | 1526 | #, c-format |
8ada9598 | 1527 | msgid "Could not parse commit %s\n" |
81809b99 | 1528 | msgstr "不能解析提交 %s\n" |
8ada9598 | 1529 | |
276ceeaa | 1530 | #: sequencer.c:395 |
81809b99 | 1531 | #, c-format |
8ada9598 | 1532 | msgid "Could not parse parent commit %s\n" |
81809b99 | 1533 | msgstr "不能解析父提交 %s\n" |
8ada9598 | 1534 | |
276ceeaa | 1535 | #: sequencer.c:460 |
c04f5ac3 | 1536 | msgid "Your index file is unmerged." |
90e6ef53 | 1537 | msgstr "您的索引文件未完成合并。" |
c04f5ac3 | 1538 | |
276ceeaa | 1539 | #: sequencer.c:479 |
c04f5ac3 JX |
1540 | #, c-format |
1541 | msgid "Commit %s is a merge but no -m option was given." | |
1542 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
1543 | ||
276ceeaa | 1544 | #: sequencer.c:487 |
c04f5ac3 JX |
1545 | #, c-format |
1546 | msgid "Commit %s does not have parent %d" | |
1547 | msgstr "提交 %s 没有父提交 %d" | |
1548 | ||
276ceeaa | 1549 | #: sequencer.c:491 |
c04f5ac3 JX |
1550 | #, c-format |
1551 | msgid "Mainline was specified but commit %s is not a merge." | |
90e6ef53 | 1552 | msgstr "指定了主线但提交 %s 不是一个合并。" |
c04f5ac3 JX |
1553 | |
1554 | #. TRANSLATORS: The first %s will be "revert" or | |
1555 | #. "cherry-pick", the second %s a SHA1 | |
276ceeaa | 1556 | #: sequencer.c:504 |
c04f5ac3 JX |
1557 | #, c-format |
1558 | msgid "%s: cannot parse parent commit %s" | |
1559 | msgstr "%s:不能解析父提交 %s" | |
1560 | ||
276ceeaa | 1561 | #: sequencer.c:508 |
c04f5ac3 JX |
1562 | #, c-format |
1563 | msgid "Cannot get commit message for %s" | |
1564 | msgstr "不能得到 %s 的提交说明" | |
1565 | ||
276ceeaa | 1566 | #: sequencer.c:594 |
c04f5ac3 JX |
1567 | #, c-format |
1568 | msgid "could not revert %s... %s" | |
1569 | msgstr "不能还原 %s... %s" | |
1570 | ||
276ceeaa | 1571 | #: sequencer.c:595 |
c04f5ac3 JX |
1572 | #, c-format |
1573 | msgid "could not apply %s... %s" | |
1574 | msgstr "不能应用 %s... %s" | |
1575 | ||
276ceeaa | 1576 | #: sequencer.c:630 |
c04f5ac3 JX |
1577 | msgid "empty commit set passed" |
1578 | msgstr "提供了空的提交集" | |
1579 | ||
276ceeaa | 1580 | #: sequencer.c:638 |
c04f5ac3 JX |
1581 | #, c-format |
1582 | msgid "git %s: failed to read the index" | |
90e6ef53 | 1583 | msgstr "git %s:无法读取索引" |
c04f5ac3 | 1584 | |
276ceeaa | 1585 | #: sequencer.c:642 |
c04f5ac3 JX |
1586 | #, c-format |
1587 | msgid "git %s: failed to refresh the index" | |
90e6ef53 | 1588 | msgstr "git %s:无法刷新索引" |
c04f5ac3 | 1589 | |
276ceeaa | 1590 | #: sequencer.c:702 |
c04f5ac3 JX |
1591 | #, c-format |
1592 | msgid "Cannot %s during a %s" | |
90e6ef53 | 1593 | msgstr "无法 %s 在一个 %s 过程中" |
c04f5ac3 | 1594 | |
276ceeaa | 1595 | #: sequencer.c:724 |
c04f5ac3 JX |
1596 | #, c-format |
1597 | msgid "Could not parse line %d." | |
90e6ef53 | 1598 | msgstr "不能解析第 %d 行。" |
c04f5ac3 | 1599 | |
276ceeaa | 1600 | #: sequencer.c:729 |
c04f5ac3 | 1601 | msgid "No commits parsed." |
7e238ab7 | 1602 | msgstr "没有提交被解析。" |
c04f5ac3 | 1603 | |
276ceeaa | 1604 | #: sequencer.c:741 |
c04f5ac3 JX |
1605 | #, c-format |
1606 | msgid "Could not open %s" | |
1607 | msgstr "不能打开 %s" | |
1608 | ||
276ceeaa | 1609 | #: sequencer.c:745 |
c04f5ac3 JX |
1610 | #, c-format |
1611 | msgid "Could not read %s." | |
1612 | msgstr "不能读取 %s。" | |
1613 | ||
276ceeaa | 1614 | #: sequencer.c:752 |
c04f5ac3 JX |
1615 | #, c-format |
1616 | msgid "Unusable instruction sheet: %s" | |
1617 | msgstr "无用的指令表单:%s" | |
1618 | ||
276ceeaa | 1619 | #: sequencer.c:782 |
c04f5ac3 JX |
1620 | #, c-format |
1621 | msgid "Invalid key: %s" | |
1622 | msgstr "无效键名:%s" | |
1623 | ||
276ceeaa | 1624 | #: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52 |
c04f5ac3 JX |
1625 | #, c-format |
1626 | msgid "Invalid value for %s: %s" | |
81809b99 | 1627 | msgstr "%s 的值无效:%s" |
c04f5ac3 | 1628 | |
276ceeaa | 1629 | #: sequencer.c:795 |
c04f5ac3 JX |
1630 | #, c-format |
1631 | msgid "Malformed options sheet: %s" | |
1632 | msgstr "非法的选项表单:%s" | |
1633 | ||
276ceeaa | 1634 | #: sequencer.c:814 |
c04f5ac3 JX |
1635 | msgid "a cherry-pick or revert is already in progress" |
1636 | msgstr "一个拣选或还原操作已在进行" | |
1637 | ||
276ceeaa | 1638 | #: sequencer.c:815 |
c04f5ac3 JX |
1639 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
1640 | msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" | |
1641 | ||
276ceeaa | 1642 | #: sequencer.c:819 |
c04f5ac3 JX |
1643 | #, c-format |
1644 | msgid "Could not create sequencer directory %s" | |
90e6ef53 | 1645 | msgstr "不能创建序列目录 %s" |
c04f5ac3 | 1646 | |
276ceeaa | 1647 | #: sequencer.c:835 sequencer.c:917 |
c04f5ac3 JX |
1648 | #, c-format |
1649 | msgid "Error wrapping up %s." | |
1650 | msgstr "错误收尾 %s。" | |
1651 | ||
276ceeaa | 1652 | #: sequencer.c:854 sequencer.c:987 |
c04f5ac3 | 1653 | msgid "no cherry-pick or revert in progress" |
195febda | 1654 | msgstr "拣选或还原操作并未进行" |
c04f5ac3 | 1655 | |
276ceeaa | 1656 | #: sequencer.c:856 |
c04f5ac3 JX |
1657 | msgid "cannot resolve HEAD" |
1658 | msgstr "不能解析 HEAD" | |
1659 | ||
276ceeaa | 1660 | #: sequencer.c:858 |
c04f5ac3 | 1661 | msgid "cannot abort from a branch yet to be born" |
90e6ef53 | 1662 | msgstr "不能从尚未建立的分支终止" |
c04f5ac3 | 1663 | |
276ceeaa | 1664 | #: sequencer.c:878 builtin/apply.c:4287 |
c04f5ac3 JX |
1665 | #, c-format |
1666 | msgid "cannot open %s: %s" | |
1667 | msgstr "不能打开 %s:%s" | |
1668 | ||
276ceeaa | 1669 | #: sequencer.c:881 |
c04f5ac3 JX |
1670 | #, c-format |
1671 | msgid "cannot read %s: %s" | |
1672 | msgstr "不能读取 %s:%s" | |
1673 | ||
276ceeaa | 1674 | #: sequencer.c:882 |
c04f5ac3 | 1675 | msgid "unexpected end of file" |
9aafc933 | 1676 | msgstr "意外的文件结束" |
c04f5ac3 | 1677 | |
276ceeaa | 1678 | #: sequencer.c:888 |
c04f5ac3 JX |
1679 | #, c-format |
1680 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
90e6ef53 | 1681 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" |
c04f5ac3 | 1682 | |
276ceeaa | 1683 | #: sequencer.c:910 |
c04f5ac3 JX |
1684 | #, c-format |
1685 | msgid "Could not format %s." | |
1686 | msgstr "不能格式化 %s。" | |
1687 | ||
276ceeaa | 1688 | #: sequencer.c:1055 |
4dcdc3d8 JX |
1689 | #, c-format |
1690 | msgid "%s: can't cherry-pick a %s" | |
1691 | msgstr "%s:不能拣选一个%s" | |
1692 | ||
276ceeaa | 1693 | #: sequencer.c:1058 |
4dcdc3d8 JX |
1694 | #, c-format |
1695 | msgid "%s: bad revision" | |
1696 | msgstr "%s:错误的版本" | |
1697 | ||
276ceeaa | 1698 | #: sequencer.c:1092 |
c04f5ac3 JX |
1699 | msgid "Can't revert as initial commit" |
1700 | msgstr "不能作为初始提交还原" | |
1701 | ||
276ceeaa | 1702 | #: sequencer.c:1093 |
c04f5ac3 JX |
1703 | msgid "Can't cherry-pick into empty head" |
1704 | msgstr "不能拣选到空分支" | |
1705 | ||
276ceeaa | 1706 | #: setup.c:246 |
7aea43ff JX |
1707 | #, c-format |
1708 | msgid "failed to read %s" | |
1709 | msgstr "无法读取 %s" | |
1710 | ||
276ceeaa | 1711 | #: sha1_name.c:462 |
2e8451e8 JX |
1712 | msgid "" |
1713 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
1714 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
1715 | "may be created by mistake. For example,\n" | |
1716 | "\n" | |
1717 | " git checkout -b $br $(git rev-parse ...)\n" | |
1718 | "\n" | |
1719 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
1720 | "examine these refs and maybe delete them. Turn this message off by\n" | |
b1894384 | 1721 | "running \"git config advice.objectNameWarning false\"" |
2e8451e8 JX |
1722 | msgstr "" |
1723 | "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n" | |
1724 | "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n" | |
1725 | "\n" | |
1726 | " git checkout -b $br $(git rev-parse ...)\n" | |
1727 | "\n" | |
1728 | "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n" | |
b1894384 | 1729 | "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" |
2e8451e8 JX |
1730 | "命令关闭本消息通知。" |
1731 | ||
276ceeaa | 1732 | #: submodule.c:62 submodule.c:96 |
90314792 JX |
1733 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
1734 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
1735 | ||
276ceeaa | 1736 | #: submodule.c:66 submodule.c:100 |
90314792 JX |
1737 | #, c-format |
1738 | msgid "Could not find section in .gitmodules where path=%s" | |
1739 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
1740 | ||
276ceeaa | 1741 | #: submodule.c:74 |
90314792 JX |
1742 | #, c-format |
1743 | msgid "Could not update .gitmodules entry %s" | |
1744 | msgstr "不能更新 .gitmodules 条目 %s" | |
1745 | ||
276ceeaa | 1746 | #: submodule.c:107 |
90314792 JX |
1747 | #, c-format |
1748 | msgid "Could not remove .gitmodules entry for %s" | |
1749 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
1750 | ||
276ceeaa | 1751 | #: submodule.c:118 |
90314792 JX |
1752 | msgid "staging updated .gitmodules failed" |
1753 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
1754 | ||
276ceeaa JX |
1755 | #: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558 |
1756 | #: trailer.c:562 | |
220c313c JX |
1757 | #, c-format |
1758 | msgid "unknown value '%s' for key '%s'" | |
1759 | msgstr "键 '%2$s' 的未知取值 '%1$s'" | |
1760 | ||
276ceeaa | 1761 | #: trailer.c:544 trailer.c:549 builtin/remote.c:289 |
220c313c JX |
1762 | #, c-format |
1763 | msgid "more than one %s" | |
1764 | msgstr "多于一个 %s" | |
1765 | ||
276ceeaa | 1766 | #: trailer.c:582 |
220c313c | 1767 | #, c-format |
9aeb4c2b JX |
1768 | msgid "empty trailer token in trailer '%.*s'" |
1769 | msgstr "签名 '%.*s' 的键为空" | |
220c313c | 1770 | |
276ceeaa | 1771 | #: trailer.c:702 |
220c313c JX |
1772 | #, c-format |
1773 | msgid "could not read input file '%s'" | |
1774 | msgstr "不能读取输入文件 '%s'" | |
1775 | ||
276ceeaa | 1776 | #: trailer.c:705 |
220c313c JX |
1777 | msgid "could not read from stdin" |
1778 | msgstr "不能自标准输入读取" | |
1779 | ||
276ceeaa JX |
1780 | #: trailer.c:857 builtin/am.c:42 |
1781 | #, c-format | |
1782 | msgid "could not stat %s" | |
1783 | msgstr "不能获取 %s 的文件状态" | |
1784 | ||
1785 | #: trailer.c:859 | |
1786 | #, c-format | |
1787 | msgid "file %s is not a regular file" | |
1788 | msgstr "文件 %s 不是一个正规文件" | |
1789 | ||
1790 | #: trailer.c:861 | |
1791 | #, c-format | |
1792 | msgid "file %s is not writable by user" | |
1793 | msgstr "文件 %s 用户不可写" | |
1794 | ||
1795 | #: trailer.c:873 | |
1796 | msgid "could not open temporary file" | |
1797 | msgstr "不能打开临时文件" | |
1798 | ||
1799 | #: trailer.c:912 | |
1800 | #, c-format | |
1801 | msgid "could not rename temporary file to %s" | |
1802 | msgstr "不能重命名临时文件为 %s" | |
1803 | ||
1804 | #: transport-helper.c:1041 | |
1b7f4a34 JX |
1805 | #, c-format |
1806 | msgid "Could not read ref %s" | |
1807 | msgstr "不能读取引用 %s" | |
1808 | ||
7aea43ff | 1809 | #: unpack-trees.c:203 |
6c94aba5 JX |
1810 | msgid "Checking out files" |
1811 | msgstr "正在检出文件" | |
1812 | ||
90314792 JX |
1813 | #: urlmatch.c:120 |
1814 | msgid "invalid URL scheme name or missing '://' suffix" | |
1815 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
1816 | ||
1817 | #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 | |
1818 | #, c-format | |
1819 | msgid "invalid %XX escape sequence" | |
1820 | msgstr "无效的 %XX 转义序列" | |
1821 | ||
1822 | #: urlmatch.c:172 | |
1823 | msgid "missing host and scheme is not 'file:'" | |
4375c10e | 1824 | msgstr "缺失主机名且 URL 方案不是 'file:'" |
90314792 JX |
1825 | |
1826 | #: urlmatch.c:189 | |
1827 | msgid "a 'file:' URL may not have a port number" | |
1828 | msgstr "一个 'file:' URL 不应该包含端口号" | |
1829 | ||
1830 | #: urlmatch.c:199 | |
1831 | msgid "invalid characters in host name" | |
1832 | msgstr "主机名中包含无效的字符" | |
1833 | ||
1834 | #: urlmatch.c:244 urlmatch.c:255 | |
1835 | msgid "invalid port number" | |
1836 | msgstr "无效的端口号" | |
1837 | ||
1838 | #: urlmatch.c:322 | |
1839 | msgid "invalid '..' path segment" | |
1840 | msgstr "无效的 '..' 路径片段" | |
1841 | ||
276ceeaa | 1842 | #: wrapper.c:222 wrapper.c:381 |
1b7f4a34 JX |
1843 | #, c-format |
1844 | msgid "could not open '%s' for reading and writing" | |
1845 | msgstr "无法打开 '%s' 进行读写" | |
1846 | ||
276ceeaa | 1847 | #: wrapper.c:224 wrapper.c:383 |
1b7f4a34 JX |
1848 | #, c-format |
1849 | msgid "could not open '%s' for writing" | |
1850 | msgstr "无法打开 '%s' 进行写入" | |
1851 | ||
276ceeaa JX |
1852 | #: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 |
1853 | #: builtin/merge.c:1075 builtin/pull.c:387 | |
1b7f4a34 JX |
1854 | #, c-format |
1855 | msgid "could not open '%s' for reading" | |
1856 | msgstr "无法打开 '%s' 进行读取" | |
1857 | ||
276ceeaa | 1858 | #: wrapper.c:611 |
07432cef | 1859 | #, c-format |
ef317cd5 | 1860 | msgid "unable to access '%s': %s" |
07432cef WS |
1861 | msgstr "不能访问 '%s':%s" |
1862 | ||
276ceeaa | 1863 | #: wrapper.c:632 |
07432cef WS |
1864 | #, c-format |
1865 | msgid "unable to access '%s'" | |
1866 | msgstr "不能访问 '%s'" | |
ef317cd5 | 1867 | |
276ceeaa | 1868 | #: wrapper.c:640 |
220c313c JX |
1869 | msgid "unable to get current working directory" |
1870 | msgstr "不能获取当前工作目录" | |
1871 | ||
276ceeaa | 1872 | #: wrapper.c:667 |
7aea43ff JX |
1873 | #, c-format |
1874 | msgid "could not open %s for writing" | |
1875 | msgstr "不能写入 %s" | |
1876 | ||
276ceeaa | 1877 | #: wrapper.c:678 builtin/am.c:410 |
7aea43ff JX |
1878 | #, c-format |
1879 | msgid "could not write to %s" | |
1880 | msgstr "不能写入 %s" | |
1881 | ||
276ceeaa | 1882 | #: wrapper.c:684 |
7aea43ff JX |
1883 | #, c-format |
1884 | msgid "could not close %s" | |
1885 | msgstr "不能关闭 %s" | |
1886 | ||
1b7f4a34 | 1887 | #: wt-status.c:149 |
c04f5ac3 JX |
1888 | msgid "Unmerged paths:" |
1889 | msgstr "未合并的路径:" | |
1890 | ||
90e6ef53 | 1891 | # 译者:注意保持前导空格 |
1b7f4a34 | 1892 | #: wt-status.c:176 wt-status.c:203 |
c04f5ac3 JX |
1893 | #, c-format |
1894 | msgid " (use \"git reset %s <file>...\" to unstage)" | |
160fb2b2 | 1895 | msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)" |
c04f5ac3 | 1896 | |
90e6ef53 | 1897 | # 译者:注意保持前导空格 |
1b7f4a34 | 1898 | #: wt-status.c:178 wt-status.c:205 |
c04f5ac3 | 1899 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
160fb2b2 | 1900 | msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)" |
c04f5ac3 | 1901 | |
90e6ef53 | 1902 | # 译者:注意保持前导空格 |
1b7f4a34 | 1903 | #: wt-status.c:182 |
6792b93b | 1904 | msgid " (use \"git add <file>...\" to mark resolution)" |
d9d56b23 | 1905 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" |
6792b93b JX |
1906 | |
1907 | # 译者:注意保持前导空格 | |
1b7f4a34 | 1908 | #: wt-status.c:184 wt-status.c:188 |
c04f5ac3 | 1909 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
d9d56b23 | 1910 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" |
c04f5ac3 | 1911 | |
6792b93b | 1912 | # 译者:注意保持前导空格 |
1b7f4a34 | 1913 | #: wt-status.c:186 |
6792b93b | 1914 | msgid " (use \"git rm <file>...\" to mark resolution)" |
d9d56b23 | 1915 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" |
6792b93b | 1916 | |
1b7f4a34 | 1917 | #: wt-status.c:197 wt-status.c:880 |
c04f5ac3 JX |
1918 | msgid "Changes to be committed:" |
1919 | msgstr "要提交的变更:" | |
1920 | ||
1b7f4a34 | 1921 | #: wt-status.c:215 wt-status.c:889 |
c04f5ac3 | 1922 | msgid "Changes not staged for commit:" |
7e238ab7 | 1923 | msgstr "尚未暂存以备提交的变更:" |
c04f5ac3 | 1924 | |
90e6ef53 | 1925 | # 译者:注意保持前导空格 |
1b7f4a34 | 1926 | #: wt-status.c:219 |
c04f5ac3 | 1927 | msgid " (use \"git add <file>...\" to update what will be committed)" |
d9d56b23 | 1928 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" |
c04f5ac3 | 1929 | |
90e6ef53 | 1930 | # 译者:注意保持前导空格 |
1b7f4a34 | 1931 | #: wt-status.c:221 |
c04f5ac3 | 1932 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
d9d56b23 | 1933 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" |
c04f5ac3 | 1934 | |
90e6ef53 | 1935 | # 译者:注意保持前导空格 |
1b7f4a34 | 1936 | #: wt-status.c:222 |
c04f5ac3 JX |
1937 | msgid "" |
1938 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" | |
d9d56b23 | 1939 | msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)" |
c04f5ac3 | 1940 | |
90e6ef53 | 1941 | # 译者:注意保持前导空格 |
1b7f4a34 | 1942 | #: wt-status.c:224 |
c04f5ac3 JX |
1943 | msgid " (commit or discard the untracked or modified content in submodules)" |
1944 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
1945 | ||
90e6ef53 | 1946 | # 译者:注意保持前导空格 |
1b7f4a34 | 1947 | #: wt-status.c:236 |
c04f5ac3 JX |
1948 | #, c-format |
1949 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
d9d56b23 | 1950 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" |
c04f5ac3 | 1951 | |
1b7f4a34 | 1952 | #: wt-status.c:251 |
c04f5ac3 JX |
1953 | msgid "both deleted:" |
1954 | msgstr "双方删除:" | |
1955 | ||
1b7f4a34 | 1956 | #: wt-status.c:253 |
c04f5ac3 JX |
1957 | msgid "added by us:" |
1958 | msgstr "由我们添加:" | |
1959 | ||
1b7f4a34 | 1960 | #: wt-status.c:255 |
c04f5ac3 JX |
1961 | msgid "deleted by them:" |
1962 | msgstr "由他们删除:" | |
1963 | ||
1b7f4a34 | 1964 | #: wt-status.c:257 |
c04f5ac3 JX |
1965 | msgid "added by them:" |
1966 | msgstr "由他们添加:" | |
1967 | ||
1b7f4a34 | 1968 | #: wt-status.c:259 |
c04f5ac3 JX |
1969 | msgid "deleted by us:" |
1970 | msgstr "由我们删除:" | |
1971 | ||
1b7f4a34 | 1972 | #: wt-status.c:261 |
c04f5ac3 JX |
1973 | msgid "both added:" |
1974 | msgstr "双方添加:" | |
1975 | ||
1b7f4a34 | 1976 | #: wt-status.c:263 |
c04f5ac3 JX |
1977 | msgid "both modified:" |
1978 | msgstr "双方修改:" | |
1979 | ||
1b7f4a34 | 1980 | #: wt-status.c:265 |
6c94aba5 JX |
1981 | #, c-format |
1982 | msgid "bug: unhandled unmerged status %x" | |
1983 | msgstr "bug:无法处理的未合并状态 %x" | |
cfff71a9 | 1984 | |
1b7f4a34 | 1985 | #: wt-status.c:273 |
6c94aba5 JX |
1986 | msgid "new file:" |
1987 | msgstr "新文件:" | |
cfff71a9 | 1988 | |
1b7f4a34 | 1989 | #: wt-status.c:275 |
6c94aba5 JX |
1990 | msgid "copied:" |
1991 | msgstr "拷贝:" | |
cfff71a9 | 1992 | |
1b7f4a34 | 1993 | #: wt-status.c:277 |
6c94aba5 JX |
1994 | msgid "deleted:" |
1995 | msgstr "删除:" | |
cfff71a9 | 1996 | |
1b7f4a34 | 1997 | #: wt-status.c:279 |
6c94aba5 JX |
1998 | msgid "modified:" |
1999 | msgstr "修改:" | |
2000 | ||
1b7f4a34 | 2001 | #: wt-status.c:281 |
6c94aba5 JX |
2002 | msgid "renamed:" |
2003 | msgstr "重命名:" | |
2004 | ||
1b7f4a34 | 2005 | #: wt-status.c:283 |
6c94aba5 JX |
2006 | msgid "typechange:" |
2007 | msgstr "类型变更:" | |
2008 | ||
1b7f4a34 | 2009 | #: wt-status.c:285 |
6c94aba5 JX |
2010 | msgid "unknown:" |
2011 | msgstr "未知:" | |
cfff71a9 | 2012 | |
1b7f4a34 | 2013 | #: wt-status.c:287 |
6c94aba5 JX |
2014 | msgid "unmerged:" |
2015 | msgstr "未合并:" | |
cfff71a9 | 2016 | |
90e6ef53 | 2017 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
1b7f4a34 | 2018 | #: wt-status.c:369 |
c04f5ac3 | 2019 | msgid "new commits, " |
aa9565f7 | 2020 | msgstr "新提交, " |
c04f5ac3 | 2021 | |
90e6ef53 | 2022 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
1b7f4a34 | 2023 | #: wt-status.c:371 |
c04f5ac3 | 2024 | msgid "modified content, " |
aa9565f7 | 2025 | msgstr "修改的内容, " |
c04f5ac3 | 2026 | |
90e6ef53 | 2027 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
1b7f4a34 | 2028 | #: wt-status.c:373 |
c04f5ac3 | 2029 | msgid "untracked content, " |
aa9565f7 | 2030 | msgstr "未跟踪的内容, " |
c04f5ac3 | 2031 | |
1b7f4a34 | 2032 | #: wt-status.c:390 |
c04f5ac3 JX |
2033 | #, c-format |
2034 | msgid "bug: unhandled diff status %c" | |
6c94aba5 | 2035 | msgstr "bug:无法处理的差异状态 %c" |
c04f5ac3 | 2036 | |
1b7f4a34 | 2037 | #: wt-status.c:754 |
90314792 JX |
2038 | msgid "Submodules changed but not updated:" |
2039 | msgstr "子模组已修改但尚未更新:" | |
2040 | ||
1b7f4a34 | 2041 | #: wt-status.c:756 |
90314792 JX |
2042 | msgid "Submodule changes to be committed:" |
2043 | msgstr "要提交的子模组变更:" | |
2044 | ||
1b7f4a34 | 2045 | #: wt-status.c:837 |
cfff71a9 JX |
2046 | msgid "" |
2047 | "Do not touch the line above.\n" | |
2048 | "Everything below will be removed." | |
2049 | msgstr "" | |
2050 | "不要改动上面的一行。\n" | |
2051 | "下面的所有内容均将被删除。" | |
2052 | ||
1b7f4a34 | 2053 | #: wt-status.c:948 |
6792b93b | 2054 | msgid "You have unmerged paths." |
195febda | 2055 | msgstr "您有尚未合并的路径。" |
6792b93b JX |
2056 | |
2057 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2058 | #: wt-status.c:951 |
6792b93b JX |
2059 | msgid " (fix conflicts and run \"git commit\")" |
2060 | msgstr " (解决冲突并运行 \"git commit\")" | |
2061 | ||
1b7f4a34 | 2062 | #: wt-status.c:954 |
6792b93b JX |
2063 | msgid "All conflicts fixed but you are still merging." |
2064 | msgstr "所有冲突已解决但您仍处于合并中。" | |
2065 | ||
2066 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2067 | #: wt-status.c:957 |
6792b93b JX |
2068 | msgid " (use \"git commit\" to conclude merge)" |
2069 | msgstr " (使用 \"git commit\" 结束合并)" | |
2070 | ||
1b7f4a34 | 2071 | #: wt-status.c:967 |
6792b93b | 2072 | msgid "You are in the middle of an am session." |
98b2761d | 2073 | msgstr "您正处于 am 操作过程中。" |
6792b93b | 2074 | |
1b7f4a34 | 2075 | #: wt-status.c:970 |
6792b93b JX |
2076 | msgid "The current patch is empty." |
2077 | msgstr "当前的补丁为空。" | |
2078 | ||
2079 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2080 | #: wt-status.c:974 |
2e8451e8 JX |
2081 | msgid " (fix conflicts and then run \"git am --continue\")" |
2082 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
6792b93b JX |
2083 | |
2084 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2085 | #: wt-status.c:976 |
6792b93b JX |
2086 | msgid " (use \"git am --skip\" to skip this patch)" |
2087 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
2088 | ||
2089 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2090 | #: wt-status.c:978 |
6792b93b JX |
2091 | msgid " (use \"git am --abort\" to restore the original branch)" |
2092 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
2093 | ||
1b7f4a34 JX |
2094 | #: wt-status.c:1105 |
2095 | msgid "No commands done." | |
2096 | msgstr "没有命令被执行。" | |
2097 | ||
2098 | #: wt-status.c:1108 | |
2099 | #, c-format | |
2100 | msgid "Last command done (%d command done):" | |
2101 | msgid_plural "Last commands done (%d commands done):" | |
2102 | msgstr[0] "最后一条命令已完成(%d 条命令被执行):" | |
2103 | msgstr[1] "最后的命令已完成(%d 条命令被执行):" | |
2104 | ||
2105 | #: wt-status.c:1119 | |
2106 | #, c-format | |
2107 | msgid " (see more in file %s)" | |
2108 | msgstr " (更多参见文件 %s)" | |
2109 | ||
2110 | #: wt-status.c:1124 | |
2111 | msgid "No commands remaining." | |
2112 | msgstr "未剩下任何命令。" | |
2113 | ||
2114 | #: wt-status.c:1127 | |
2115 | #, c-format | |
2116 | msgid "Next command to do (%d remaining command):" | |
2117 | msgid_plural "Next commands to do (%d remaining commands):" | |
2118 | msgstr[0] "接下来要执行的命令(剩余 %d 条命令):" | |
2119 | msgstr[1] "接下来要执行的命令(剩余 %d 条命令):" | |
2120 | ||
2121 | # 译者:注意保持前导空格 | |
2122 | #: wt-status.c:1135 | |
2123 | msgid " (use \"git rebase --edit-todo\" to view and edit)" | |
2124 | msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)" | |
2125 | ||
2126 | #: wt-status.c:1148 | |
63af42fe JX |
2127 | #, c-format |
2128 | msgid "You are currently rebasing branch '%s' on '%s'." | |
98b2761d | 2129 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" |
63af42fe | 2130 | |
1b7f4a34 | 2131 | #: wt-status.c:1153 |
6792b93b | 2132 | msgid "You are currently rebasing." |
98b2761d | 2133 | msgstr "您在执行变基操作。" |
6792b93b JX |
2134 | |
2135 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2136 | #: wt-status.c:1167 |
6792b93b JX |
2137 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
2138 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
2139 | ||
2140 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2141 | #: wt-status.c:1169 |
6792b93b JX |
2142 | msgid " (use \"git rebase --skip\" to skip this patch)" |
2143 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
2144 | ||
2145 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2146 | #: wt-status.c:1171 |
6792b93b JX |
2147 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
2148 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
2149 | ||
2150 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2151 | #: wt-status.c:1177 |
6792b93b JX |
2152 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
2153 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
2154 | ||
1b7f4a34 | 2155 | #: wt-status.c:1181 |
63af42fe JX |
2156 | #, c-format |
2157 | msgid "" | |
2158 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." | |
98b2761d | 2159 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" |
63af42fe | 2160 | |
1b7f4a34 | 2161 | #: wt-status.c:1186 |
6792b93b | 2162 | msgid "You are currently splitting a commit during a rebase." |
98b2761d | 2163 | msgstr "您在执行变基操作时拆分提交。" |
6792b93b JX |
2164 | |
2165 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2166 | #: wt-status.c:1189 |
6792b93b JX |
2167 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
2168 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
2169 | ||
1b7f4a34 | 2170 | #: wt-status.c:1193 |
63af42fe JX |
2171 | #, c-format |
2172 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
98b2761d | 2173 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" |
63af42fe | 2174 | |
1b7f4a34 | 2175 | #: wt-status.c:1198 |
6792b93b | 2176 | msgid "You are currently editing a commit during a rebase." |
98b2761d | 2177 | msgstr "您在执行变基操作时编辑提交。" |
6792b93b JX |
2178 | |
2179 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2180 | #: wt-status.c:1201 |
6792b93b JX |
2181 | msgid " (use \"git commit --amend\" to amend the current commit)" |
2182 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
2183 | ||
2184 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2185 | #: wt-status.c:1203 |
6792b93b JX |
2186 | msgid "" |
2187 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
195febda | 2188 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" |
6792b93b | 2189 | |
1b7f4a34 | 2190 | #: wt-status.c:1213 |
90314792 JX |
2191 | #, c-format |
2192 | msgid "You are currently cherry-picking commit %s." | |
98b2761d | 2193 | msgstr "您在执行拣选提交 %s 的操作。" |
6792b93b | 2194 | |
2e8451e8 | 2195 | # 译者:注意保持前导空格 |
1b7f4a34 | 2196 | #: wt-status.c:1218 |
2e8451e8 JX |
2197 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
2198 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
2199 | ||
6792b93b | 2200 | # 译者:注意保持前导空格 |
1b7f4a34 | 2201 | #: wt-status.c:1221 |
2e8451e8 JX |
2202 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
2203 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
6792b93b | 2204 | |
2e8451e8 | 2205 | # 译者:注意保持前导空格 |
1b7f4a34 | 2206 | #: wt-status.c:1223 |
2e8451e8 JX |
2207 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
2208 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
2209 | ||
1b7f4a34 | 2210 | #: wt-status.c:1232 |
1003b3a5 JX |
2211 | #, c-format |
2212 | msgid "You are currently reverting commit %s." | |
98b2761d | 2213 | msgstr "您在执行反转提交 %s 的操作。" |
1003b3a5 JX |
2214 | |
2215 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2216 | #: wt-status.c:1237 |
1003b3a5 JX |
2217 | msgid " (fix conflicts and run \"git revert --continue\")" |
2218 | msgstr " (解决冲突并运行 \"git revert --continue\")" | |
2219 | ||
2220 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2221 | #: wt-status.c:1240 |
1003b3a5 JX |
2222 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
2223 | msgstr " (所有冲突已解决:运行 \"git revert --continue\")" | |
2224 | ||
2225 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2226 | #: wt-status.c:1242 |
1003b3a5 JX |
2227 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
2228 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
2229 | ||
1b7f4a34 | 2230 | #: wt-status.c:1253 |
63af42fe | 2231 | #, c-format |
1003b3a5 | 2232 | msgid "You are currently bisecting, started from branch '%s'." |
98b2761d | 2233 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" |
63af42fe | 2234 | |
1b7f4a34 | 2235 | #: wt-status.c:1257 |
6792b93b | 2236 | msgid "You are currently bisecting." |
98b2761d | 2237 | msgstr "您在执行二分查找操作。" |
6792b93b JX |
2238 | |
2239 | # 译者:注意保持前导空格 | |
1b7f4a34 | 2240 | #: wt-status.c:1260 |
6792b93b JX |
2241 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
2242 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
2243 | ||
94550ed3 | 2244 | #: wt-status.c:1438 |
c04f5ac3 JX |
2245 | msgid "On branch " |
2246 | msgstr "位于分支 " | |
2247 | ||
94550ed3 | 2248 | #: wt-status.c:1444 |
1b7f4a34 JX |
2249 | msgid "interactive rebase in progress; onto " |
2250 | msgstr "交互式变基操作正在进行中;至 " | |
2251 | ||
94550ed3 | 2252 | #: wt-status.c:1446 |
2e8451e8 | 2253 | msgid "rebase in progress; onto " |
98b2761d | 2254 | msgstr "变基操作正在进行中;至 " |
2e8451e8 | 2255 | |
94550ed3 | 2256 | #: wt-status.c:1451 |
1003b3a5 JX |
2257 | msgid "HEAD detached at " |
2258 | msgstr "头指针分离于 " | |
2259 | ||
94550ed3 | 2260 | #: wt-status.c:1453 |
1003b3a5 JX |
2261 | msgid "HEAD detached from " |
2262 | msgstr "头指针分离自 " | |
2263 | ||
94550ed3 | 2264 | #: wt-status.c:1456 |
c04f5ac3 JX |
2265 | msgid "Not currently on any branch." |
2266 | msgstr "当前不在任何分支上。" | |
2267 | ||
1b7f4a34 | 2268 | #: wt-status.c:1474 |
c04f5ac3 JX |
2269 | msgid "Initial commit" |
2270 | msgstr "初始提交" | |
2271 | ||
1b7f4a34 | 2272 | #: wt-status.c:1488 |
ef317cd5 | 2273 | msgid "Untracked files" |
07432cef | 2274 | msgstr "未跟踪的文件" |
c04f5ac3 | 2275 | |
1b7f4a34 | 2276 | #: wt-status.c:1490 |
ef317cd5 | 2277 | msgid "Ignored files" |
07432cef | 2278 | msgstr "忽略的文件" |
c04f5ac3 | 2279 | |
1b7f4a34 | 2280 | #: wt-status.c:1494 |
1003b3a5 | 2281 | #, c-format |
4dcdc3d8 JX |
2282 | msgid "" |
2283 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
2284 | "may speed it up, but you have to be careful not to forget to add\n" | |
2285 | "new files yourself (see 'git help status')." | |
2286 | msgstr "" | |
2287 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
2288 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1003b3a5 | 2289 | |
1b7f4a34 | 2290 | #: wt-status.c:1500 |
c04f5ac3 JX |
2291 | #, c-format |
2292 | msgid "Untracked files not listed%s" | |
2293 | msgstr "未跟踪的文件没有列出%s" | |
2294 | ||
7e238ab7 | 2295 | # 译者:中文字符串拼接,可删除前导空格 |
1b7f4a34 | 2296 | #: wt-status.c:1502 |
c04f5ac3 | 2297 | msgid " (use -u option to show untracked files)" |
7e238ab7 | 2298 | msgstr "(使用 -u 参数显示未跟踪的文件)" |
c04f5ac3 | 2299 | |
1b7f4a34 | 2300 | #: wt-status.c:1508 |
c04f5ac3 JX |
2301 | msgid "No changes" |
2302 | msgstr "没有修改" | |
2303 | ||
1b7f4a34 | 2304 | #: wt-status.c:1513 |
07432cef | 2305 | #, c-format |
ef317cd5 | 2306 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" |
07432cef | 2307 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" |
c04f5ac3 | 2308 | |
1b7f4a34 | 2309 | #: wt-status.c:1516 |
07432cef | 2310 | #, c-format |
ef317cd5 | 2311 | msgid "no changes added to commit\n" |
07432cef | 2312 | msgstr "修改尚未加入提交\n" |
c04f5ac3 | 2313 | |
1b7f4a34 | 2314 | #: wt-status.c:1519 |
07432cef | 2315 | #, c-format |
ef317cd5 JX |
2316 | msgid "" |
2317 | "nothing added to commit but untracked files present (use \"git add\" to " | |
2318 | "track)\n" | |
07432cef | 2319 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" |
c04f5ac3 | 2320 | |
1b7f4a34 | 2321 | #: wt-status.c:1522 |
07432cef | 2322 | #, c-format |
ef317cd5 | 2323 | msgid "nothing added to commit but untracked files present\n" |
07432cef | 2324 | msgstr "提交为空,但是存在尚未跟踪的文件\n" |
c04f5ac3 | 2325 | |
7e238ab7 | 2326 | # 译者:中文字符串拼接,可删除前导空格 |
1b7f4a34 | 2327 | #: wt-status.c:1525 |
07432cef | 2328 | #, c-format |
ef317cd5 | 2329 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" |
07432cef | 2330 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" |
c04f5ac3 | 2331 | |
1b7f4a34 | 2332 | #: wt-status.c:1528 wt-status.c:1533 |
07432cef | 2333 | #, c-format |
ef317cd5 | 2334 | msgid "nothing to commit\n" |
07432cef | 2335 | msgstr "无文件要提交\n" |
ef317cd5 | 2336 | |
7e238ab7 | 2337 | # 译者:中文字符串拼接,可删除前导空格 |
1b7f4a34 | 2338 | #: wt-status.c:1531 |
07432cef | 2339 | #, c-format |
ef317cd5 | 2340 | msgid "nothing to commit (use -u to show untracked files)\n" |
07432cef | 2341 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" |
c04f5ac3 | 2342 | |
7e238ab7 | 2343 | # 译者:中文字符串拼接,可删除前导空格 |
1b7f4a34 | 2344 | #: wt-status.c:1535 |
07432cef | 2345 | #, c-format |
ef317cd5 | 2346 | msgid "nothing to commit, working directory clean\n" |
07432cef | 2347 | msgstr "无文件要提交,干净的工作区\n" |
c04f5ac3 | 2348 | |
90e6ef53 | 2349 | # 译者:注意保持句尾空格 |
94550ed3 | 2350 | #: wt-status.c:1642 |
c04f5ac3 JX |
2351 | msgid "Initial commit on " |
2352 | msgstr "初始提交于 " | |
2353 | ||
94550ed3 JX |
2354 | #: wt-status.c:1646 |
2355 | msgid "HEAD (no branch)" | |
2356 | msgstr "HEAD(非分支)" | |
2357 | ||
2358 | #: wt-status.c:1675 | |
90314792 JX |
2359 | msgid "gone" |
2360 | msgstr "丢失" | |
2361 | ||
90e6ef53 | 2362 | # 译者:注意保持句尾空格 |
94550ed3 | 2363 | #: wt-status.c:1677 wt-status.c:1685 |
c04f5ac3 JX |
2364 | msgid "behind " |
2365 | msgstr "落后 " | |
2366 | ||
276ceeaa | 2367 | #: compat/precompose_utf8.c:57 builtin/clone.c:413 |
a77c07d9 JX |
2368 | #, c-format |
2369 | msgid "failed to unlink '%s'" | |
2370 | msgstr "无法删除 '%s'" | |
2371 | ||
220c313c | 2372 | #: builtin/add.c:22 |
814ff314 | 2373 | msgid "git add [<options>] [--] <pathspec>..." |
160fb2b2 | 2374 | msgstr "git add [<选项>] [--] <路径规格>..." |
ef317cd5 | 2375 | |
220c313c | 2376 | #: builtin/add.c:65 |
c04f5ac3 JX |
2377 | #, c-format |
2378 | msgid "unexpected diff status %c" | |
2379 | msgstr "意外的差异状态 %c" | |
2380 | ||
94550ed3 | 2381 | #: builtin/add.c:70 builtin/commit.c:278 |
c04f5ac3 JX |
2382 | msgid "updating files failed" |
2383 | msgstr "更新文件失败" | |
2384 | ||
220c313c | 2385 | #: builtin/add.c:80 |
c04f5ac3 JX |
2386 | #, c-format |
2387 | msgid "remove '%s'\n" | |
2388 | msgstr "删除 '%s'\n" | |
2389 | ||
220c313c | 2390 | #: builtin/add.c:134 |
c04f5ac3 | 2391 | msgid "Unstaged changes after refreshing the index:" |
90e6ef53 | 2392 | msgstr "刷新索引之后尚未被暂存的变更:" |
c04f5ac3 | 2393 | |
276ceeaa | 2394 | #: builtin/add.c:194 builtin/rev-parse.c:797 |
c04f5ac3 | 2395 | msgid "Could not read the index" |
90e6ef53 | 2396 | msgstr "不能读取索引" |
c04f5ac3 | 2397 | |
220c313c | 2398 | #: builtin/add.c:205 |
c04f5ac3 JX |
2399 | #, c-format |
2400 | msgid "Could not open '%s' for writing." | |
1b7f4a34 | 2401 | msgstr "无法打开 '%s' 进行写入。" |
c04f5ac3 | 2402 | |
220c313c | 2403 | #: builtin/add.c:209 |
c04f5ac3 | 2404 | msgid "Could not write patch" |
195febda | 2405 | msgstr "不能生成补丁" |
c04f5ac3 | 2406 | |
7aea43ff JX |
2407 | #: builtin/add.c:212 |
2408 | msgid "editing patch failed" | |
2409 | msgstr "编辑补丁失败" | |
2410 | ||
2411 | #: builtin/add.c:215 | |
c04f5ac3 JX |
2412 | #, c-format |
2413 | msgid "Could not stat '%s'" | |
90e6ef53 | 2414 | msgstr "不能查看文件状态 '%s'" |
c04f5ac3 | 2415 | |
7aea43ff | 2416 | #: builtin/add.c:217 |
c04f5ac3 JX |
2417 | msgid "Empty patch. Aborted." |
2418 | msgstr "空补丁。异常终止。" | |
2419 | ||
7aea43ff | 2420 | #: builtin/add.c:222 |
8ada9598 JX |
2421 | #, c-format |
2422 | msgid "Could not apply '%s'" | |
2423 | msgstr "不能应用 '%s'" | |
2424 | ||
7aea43ff | 2425 | #: builtin/add.c:232 |
8ada9598 | 2426 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
195febda | 2427 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" |
8ada9598 | 2428 | |
276ceeaa JX |
2429 | #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 |
2430 | #: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511 | |
2431 | #: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 | |
ef317cd5 | 2432 | msgid "dry run" |
07432cef | 2433 | msgstr "演习" |
ef317cd5 | 2434 | |
276ceeaa | 2435 | #: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 |
94550ed3 | 2436 | #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 |
276ceeaa | 2437 | #: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 |
ef317cd5 JX |
2438 | msgid "be verbose" |
2439 | msgstr "冗长输出" | |
2440 | ||
7aea43ff | 2441 | #: builtin/add.c:252 |
ef317cd5 | 2442 | msgid "interactive picking" |
07432cef | 2443 | msgstr "交互式拣选" |
ef317cd5 | 2444 | |
276ceeaa | 2445 | #: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 |
ef317cd5 | 2446 | msgid "select hunks interactively" |
07432cef | 2447 | msgstr "交互式挑选数据块" |
ef317cd5 | 2448 | |
7aea43ff | 2449 | #: builtin/add.c:254 |
ef317cd5 | 2450 | msgid "edit current diff and apply" |
07432cef | 2451 | msgstr "编辑当前差异并应用" |
ef317cd5 | 2452 | |
7aea43ff | 2453 | #: builtin/add.c:255 |
ef317cd5 | 2454 | msgid "allow adding otherwise ignored files" |
07432cef | 2455 | msgstr "允许添加忽略的文件" |
ef317cd5 | 2456 | |
7aea43ff | 2457 | #: builtin/add.c:256 |
ef317cd5 | 2458 | msgid "update tracked files" |
07432cef | 2459 | msgstr "更新已跟踪的文件" |
ef317cd5 | 2460 | |
7aea43ff | 2461 | #: builtin/add.c:257 |
ef317cd5 | 2462 | msgid "record only the fact that the path will be added later" |
07432cef | 2463 | msgstr "只记录,该路径稍后再添加" |
ef317cd5 | 2464 | |
7aea43ff | 2465 | #: builtin/add.c:258 |
ef317cd5 | 2466 | msgid "add changes from all tracked and untracked files" |
07432cef | 2467 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" |
ef317cd5 | 2468 | |
7aea43ff | 2469 | #: builtin/add.c:261 |
4dcdc3d8 JX |
2470 | msgid "ignore paths removed in the working tree (same as --no-all)" |
2471 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
2472 | ||
7aea43ff | 2473 | #: builtin/add.c:263 |
ef317cd5 | 2474 | msgid "don't add, only refresh the index" |
07432cef | 2475 | msgstr "不添加,只刷新索引" |
ef317cd5 | 2476 | |
7aea43ff | 2477 | #: builtin/add.c:264 |
ef317cd5 | 2478 | msgid "just skip files which cannot be added because of errors" |
07432cef | 2479 | msgstr "跳过因出错不能添加的文件" |
ef317cd5 | 2480 | |
7aea43ff | 2481 | #: builtin/add.c:265 |
ef317cd5 | 2482 | msgid "check if - even missing - files are ignored in dry run" |
07432cef | 2483 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" |
ef317cd5 | 2484 | |
7aea43ff | 2485 | #: builtin/add.c:287 |
8ada9598 JX |
2486 | #, c-format |
2487 | msgid "Use -f if you really want to add them.\n" | |
2488 | msgstr "使用 -f 参数如果您确实要添加它们。\n" | |
2489 | ||
7aea43ff | 2490 | #: builtin/add.c:294 |
8ada9598 JX |
2491 | msgid "adding files failed" |
2492 | msgstr "添加文件失败" | |
2493 | ||
7aea43ff | 2494 | #: builtin/add.c:330 |
8ada9598 JX |
2495 | msgid "-A and -u are mutually incompatible" |
2496 | msgstr "-A 和 -u 选项互斥" | |
2497 | ||
7aea43ff | 2498 | #: builtin/add.c:337 |
8ada9598 | 2499 | msgid "Option --ignore-missing can only be used together with --dry-run" |
649900bc | 2500 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" |
8ada9598 | 2501 | |
94550ed3 | 2502 | #: builtin/add.c:352 |
8ada9598 JX |
2503 | #, c-format |
2504 | msgid "Nothing specified, nothing added.\n" | |
2505 | msgstr "没有指定文件,也没有文件被添加。\n" | |
2506 | ||
94550ed3 | 2507 | #: builtin/add.c:353 |
8ada9598 JX |
2508 | #, c-format |
2509 | msgid "Maybe you wanted to say 'git add .'?\n" | |
2510 | msgstr "也许您想要执行 'git add .'?\n" | |
2511 | ||
276ceeaa JX |
2512 | #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 |
2513 | #: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 | |
2514 | #: builtin/submodule--helper.c:35 | |
8ada9598 JX |
2515 | msgid "index file corrupt" |
2516 | msgstr "索引文件损坏" | |
2517 | ||
276ceeaa | 2518 | #: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 |
8ada9598 JX |
2519 | msgid "Unable to write new index file" |
2520 | msgstr "无法写入新索引文件" | |
2521 | ||
276ceeaa | 2522 | #: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 |
1b7f4a34 JX |
2523 | #, c-format |
2524 | msgid "could not read '%s'" | |
2525 | msgstr "不能读取 '%s'" | |
2526 | ||
276ceeaa | 2527 | #: builtin/am.c:430 |
1b7f4a34 JX |
2528 | msgid "could not parse author script" |
2529 | msgstr "不能解析作者脚本" | |
2530 | ||
276ceeaa | 2531 | #: builtin/am.c:507 |
1b7f4a34 JX |
2532 | #, c-format |
2533 | msgid "'%s' was deleted by the applypatch-msg hook" | |
2534 | msgstr "'%s' 被 applypatch-msg 钩子删除" | |
2535 | ||
276ceeaa | 2536 | #: builtin/am.c:548 builtin/notes.c:300 |
1b7f4a34 JX |
2537 | #, c-format |
2538 | msgid "Malformed input line: '%s'." | |
2539 | msgstr "非法的输入行:'%s'。" | |
2540 | ||
276ceeaa | 2541 | #: builtin/am.c:585 builtin/notes.c:315 |
1b7f4a34 JX |
2542 | #, c-format |
2543 | msgid "Failed to copy notes from '%s' to '%s'" | |
2544 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
2545 | ||
276ceeaa | 2546 | #: builtin/am.c:611 |
1b7f4a34 JX |
2547 | msgid "fseek failed" |
2548 | msgstr "fseek 失败" | |
2549 | ||
276ceeaa | 2550 | #: builtin/am.c:772 builtin/am.c:860 |
1b7f4a34 JX |
2551 | #, c-format |
2552 | msgid "could not open '%s' for reading: %s" | |
2553 | msgstr "无法打开 '%s' 进行读取:%s" | |
2554 | ||
276ceeaa | 2555 | #: builtin/am.c:779 |
1b7f4a34 JX |
2556 | #, c-format |
2557 | msgid "could not open '%s' for writing: %s" | |
2558 | msgstr "无法打开 '%s' 进行写入:%s" | |
2559 | ||
276ceeaa | 2560 | #: builtin/am.c:788 |
1b7f4a34 JX |
2561 | #, c-format |
2562 | msgid "could not parse patch '%s'" | |
2563 | msgstr "无法解析补丁 '%s'" | |
2564 | ||
276ceeaa | 2565 | #: builtin/am.c:853 |
1b7f4a34 JX |
2566 | msgid "Only one StGIT patch series can be applied at once" |
2567 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
2568 | ||
276ceeaa | 2569 | #: builtin/am.c:901 |
1b7f4a34 JX |
2570 | msgid "invalid timestamp" |
2571 | msgstr "无效的时间戳" | |
2572 | ||
276ceeaa | 2573 | #: builtin/am.c:904 builtin/am.c:912 |
1b7f4a34 JX |
2574 | msgid "invalid Date line" |
2575 | msgstr "无效的日期行" | |
2576 | ||
276ceeaa | 2577 | #: builtin/am.c:909 |
1b7f4a34 JX |
2578 | msgid "invalid timezone offset" |
2579 | msgstr "无效的时区偏移值" | |
2580 | ||
276ceeaa | 2581 | #: builtin/am.c:996 |
1b7f4a34 JX |
2582 | msgid "Patch format detection failed." |
2583 | msgstr "补丁格式检测失败。" | |
2584 | ||
276ceeaa | 2585 | #: builtin/am.c:1001 builtin/clone.c:378 |
1b7f4a34 JX |
2586 | #, c-format |
2587 | msgid "failed to create directory '%s'" | |
2588 | msgstr "无法创建目录 '%s'" | |
2589 | ||
276ceeaa | 2590 | #: builtin/am.c:1005 |
1b7f4a34 JX |
2591 | msgid "Failed to split patches." |
2592 | msgstr "无法拆分补丁。" | |
2593 | ||
276ceeaa | 2594 | #: builtin/am.c:1137 builtin/commit.c:363 |
1b7f4a34 JX |
2595 | msgid "unable to write index file" |
2596 | msgstr "无法写入索引文件" | |
2597 | ||
276ceeaa | 2598 | #: builtin/am.c:1188 |
1b7f4a34 JX |
2599 | #, c-format |
2600 | msgid "When you have resolved this problem, run \"%s --continue\"." | |
2601 | msgstr "当您解决这一问题,执行 \"%s --continue\"。" | |
2602 | ||
276ceeaa | 2603 | #: builtin/am.c:1189 |
1b7f4a34 JX |
2604 | #, c-format |
2605 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." | |
2606 | msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。" | |
2607 | ||
276ceeaa | 2608 | #: builtin/am.c:1190 |
1b7f4a34 JX |
2609 | #, c-format |
2610 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." | |
2611 | msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。" | |
2612 | ||
276ceeaa | 2613 | #: builtin/am.c:1328 |
1b7f4a34 JX |
2614 | msgid "Patch is empty. Was it split wrong?" |
2615 | msgstr "补丁为空。是不是切分错误?" | |
2616 | ||
276ceeaa | 2617 | #: builtin/am.c:1402 builtin/log.c:1350 |
1b7f4a34 JX |
2618 | #, c-format |
2619 | msgid "invalid ident line: %s" | |
2620 | msgstr "包含无效的身份标识:%s" | |
2621 | ||
276ceeaa | 2622 | #: builtin/am.c:1429 |
1b7f4a34 JX |
2623 | #, c-format |
2624 | msgid "unable to parse commit %s" | |
2625 | msgstr "不能解析提交 %s" | |
2626 | ||
276ceeaa | 2627 | #: builtin/am.c:1631 |
1b7f4a34 JX |
2628 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
2629 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
2630 | ||
276ceeaa | 2631 | #: builtin/am.c:1633 |
1b7f4a34 JX |
2632 | msgid "Using index info to reconstruct a base tree..." |
2633 | msgstr "使用索引来重建一个(三方合并的)基础目录树..." | |
2634 | ||
276ceeaa | 2635 | #: builtin/am.c:1652 |
1b7f4a34 JX |
2636 | msgid "" |
2637 | "Did you hand edit your patch?\n" | |
2638 | "It does not apply to blobs recorded in its index." | |
2639 | msgstr "" | |
2640 | "您是否曾手动编辑过您的补丁?\n" | |
2641 | "无法应用补丁到索引中的数据对象上。" | |
2642 | ||
276ceeaa | 2643 | #: builtin/am.c:1658 |
1b7f4a34 JX |
2644 | msgid "Falling back to patching base and 3-way merge..." |
2645 | msgstr "回落到基础版本上打补丁及进行三方合并..." | |
2646 | ||
276ceeaa | 2647 | #: builtin/am.c:1673 |
1b7f4a34 JX |
2648 | msgid "Failed to merge in the changes." |
2649 | msgstr "无法合并变更。" | |
2650 | ||
276ceeaa | 2651 | #: builtin/am.c:1697 builtin/merge.c:633 |
1b7f4a34 JX |
2652 | msgid "git write-tree failed to write a tree" |
2653 | msgstr "git write-tree 无法写入一树对象" | |
2654 | ||
276ceeaa | 2655 | #: builtin/am.c:1704 |
1b7f4a34 JX |
2656 | msgid "applying to an empty history" |
2657 | msgstr "正应用到一个空历史上" | |
2658 | ||
276ceeaa JX |
2659 | #: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 |
2660 | #: builtin/merge.c:855 | |
1b7f4a34 JX |
2661 | msgid "failed to write commit object" |
2662 | msgstr "无法写提交对象" | |
2663 | ||
276ceeaa | 2664 | #: builtin/am.c:1749 builtin/am.c:1753 |
1b7f4a34 JX |
2665 | #, c-format |
2666 | msgid "cannot resume: %s does not exist." | |
2667 | msgstr "无法继续:%s 不存在。" | |
2668 | ||
276ceeaa | 2669 | #: builtin/am.c:1769 |
1b7f4a34 JX |
2670 | msgid "cannot be interactive without stdin connected to a terminal." |
2671 | msgstr "标准输入没有和终端关联,不能进行交互式操作。" | |
2672 | ||
276ceeaa | 2673 | #: builtin/am.c:1774 |
1b7f4a34 JX |
2674 | msgid "Commit Body is:" |
2675 | msgstr "提交内容为:" | |
2676 | ||
2677 | # 译者:注意保持句尾空格 | |
2678 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] | |
2679 | #. in your translation. The program will only accept English | |
2680 | #. input at this point. | |
2681 | #. | |
276ceeaa | 2682 | #: builtin/am.c:1784 |
1b7f4a34 JX |
2683 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " |
2684 | msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:" | |
2685 | ||
276ceeaa | 2686 | #: builtin/am.c:1834 |
1b7f4a34 JX |
2687 | #, c-format |
2688 | msgid "Dirty index: cannot apply patches (dirty: %s)" | |
2689 | msgstr "脏索引:不能应用补丁(脏文件:%s)" | |
2690 | ||
276ceeaa | 2691 | #: builtin/am.c:1869 builtin/am.c:1941 |
1b7f4a34 JX |
2692 | #, c-format |
2693 | msgid "Applying: %.*s" | |
2694 | msgstr "应用:%.*s" | |
2695 | ||
276ceeaa | 2696 | #: builtin/am.c:1885 |
1b7f4a34 JX |
2697 | msgid "No changes -- Patch already applied." |
2698 | msgstr "没有变更 —— 补丁已经应用过。" | |
2699 | ||
276ceeaa | 2700 | #: builtin/am.c:1893 |
1b7f4a34 JX |
2701 | #, c-format |
2702 | msgid "Patch failed at %s %.*s" | |
2703 | msgstr "打补丁失败于 %s %.*s" | |
2704 | ||
276ceeaa | 2705 | #: builtin/am.c:1899 |
1b7f4a34 JX |
2706 | #, c-format |
2707 | msgid "The copy of the patch that failed is found in: %s" | |
2708 | msgstr "失败的补丁文件副本位于:%s" | |
2709 | ||
276ceeaa | 2710 | #: builtin/am.c:1944 |
1b7f4a34 JX |
2711 | msgid "" |
2712 | "No changes - did you forget to use 'git add'?\n" | |
2713 | "If there is nothing left to stage, chances are that something else\n" | |
2714 | "already introduced the same changes; you might want to skip this patch." | |
2715 | msgstr "" | |
2716 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
2717 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
2718 | "您也许想要跳过这个补丁。" | |
2719 | ||
276ceeaa | 2720 | #: builtin/am.c:1951 |
1b7f4a34 JX |
2721 | msgid "" |
2722 | "You still have unmerged paths in your index.\n" | |
2723 | "Did you forget to use 'git add'?" | |
2724 | msgstr "" | |
2725 | "您的索引中仍有未合并的路径。\n" | |
2726 | "您是否忘了执行 'git add'?" | |
2727 | ||
276ceeaa | 2728 | #: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 |
1b7f4a34 JX |
2729 | #: builtin/reset.c:316 |
2730 | #, c-format | |
2731 | msgid "Could not parse object '%s'." | |
2732 | msgstr "不能解析对象 '%s'。" | |
2733 | ||
276ceeaa | 2734 | #: builtin/am.c:2111 |
1b7f4a34 JX |
2735 | msgid "failed to clean index" |
2736 | msgstr "无法清空索引" | |
2737 | ||
276ceeaa | 2738 | #: builtin/am.c:2145 |
1b7f4a34 JX |
2739 | msgid "" |
2740 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
2741 | "Not rewinding to ORIG_HEAD" | |
2742 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" | |
2743 | ||
276ceeaa | 2744 | #: builtin/am.c:2206 |
1b7f4a34 JX |
2745 | #, c-format |
2746 | msgid "Invalid value for --patch-format: %s" | |
2747 | msgstr "无效的 --patch-format 值:%s" | |
2748 | ||
276ceeaa | 2749 | #: builtin/am.c:2239 |
94550ed3 JX |
2750 | msgid "git am [<options>] [(<mbox>|<Maildir>)...]" |
2751 | msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]" | |
1b7f4a34 | 2752 | |
276ceeaa | 2753 | #: builtin/am.c:2240 |
94550ed3 JX |
2754 | msgid "git am [<options>] (--continue | --skip | --abort)" |
2755 | msgstr "git am [<选项>] (--continue | --skip | --abort)" | |
1b7f4a34 | 2756 | |
276ceeaa | 2757 | #: builtin/am.c:2246 |
1b7f4a34 JX |
2758 | msgid "run interactively" |
2759 | msgstr "以交互式方式运行" | |
2760 | ||
276ceeaa | 2761 | #: builtin/am.c:2248 |
1b7f4a34 JX |
2762 | msgid "historical option -- no-op" |
2763 | msgstr "老的参数 —— 无作用" | |
2764 | ||
276ceeaa | 2765 | #: builtin/am.c:2250 |
1b7f4a34 JX |
2766 | msgid "allow fall back on 3way merging if needed" |
2767 | msgstr "如果必要,允许使用三方合并。" | |
2768 | ||
276ceeaa | 2769 | #: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 |
1b7f4a34 JX |
2770 | #: builtin/repack.c:171 |
2771 | msgid "be quiet" | |
2772 | msgstr "静默模式" | |
2773 | ||
276ceeaa | 2774 | #: builtin/am.c:2253 |
1b7f4a34 JX |
2775 | msgid "add a Signed-off-by line to the commit message" |
2776 | msgstr "在提交说明中添加一个 Signed-off-by 签名" | |
2777 | ||
276ceeaa | 2778 | #: builtin/am.c:2256 |
1b7f4a34 JX |
2779 | msgid "recode into utf8 (default)" |
2780 | msgstr "使用 utf8 字符集(默认)" | |
2781 | ||
276ceeaa | 2782 | #: builtin/am.c:2258 |
1b7f4a34 JX |
2783 | msgid "pass -k flag to git-mailinfo" |
2784 | msgstr "向 git-mailinfo 传递 -k 参数" | |
2785 | ||
276ceeaa | 2786 | #: builtin/am.c:2260 |
1b7f4a34 JX |
2787 | msgid "pass -b flag to git-mailinfo" |
2788 | msgstr "向 git-mailinfo 传递 -b 参数" | |
2789 | ||
276ceeaa | 2790 | #: builtin/am.c:2262 |
1b7f4a34 JX |
2791 | msgid "pass -m flag to git-mailinfo" |
2792 | msgstr "向 git-mailinfo 传递 -m 参数" | |
2793 | ||
276ceeaa | 2794 | #: builtin/am.c:2264 |
1b7f4a34 JX |
2795 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" |
2796 | msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数" | |
2797 | ||
276ceeaa | 2798 | #: builtin/am.c:2267 |
1b7f4a34 JX |
2799 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" |
2800 | msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置" | |
2801 | ||
276ceeaa | 2802 | #: builtin/am.c:2270 |
1b7f4a34 JX |
2803 | msgid "strip everything before a scissors line" |
2804 | msgstr "丢弃裁切线前的所有内容" | |
2805 | ||
276ceeaa | 2806 | #: builtin/am.c:2271 builtin/apply.c:4544 |
1b7f4a34 JX |
2807 | msgid "action" |
2808 | msgstr "动作" | |
2809 | ||
276ceeaa JX |
2810 | #: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281 |
2811 | #: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293 | |
2812 | #: builtin/am.c:2299 | |
1b7f4a34 JX |
2813 | msgid "pass it through git-apply" |
2814 | msgstr "传递给 git-apply" | |
2815 | ||
276ceeaa | 2816 | #: builtin/am.c:2280 builtin/apply.c:4568 |
1b7f4a34 JX |
2817 | msgid "root" |
2818 | msgstr "根目录" | |
2819 | ||
276ceeaa JX |
2820 | #: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 |
2821 | #: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 | |
2822 | #: builtin/pull.c:171 builtin/submodule--helper.c:72 | |
2823 | #: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 | |
1b7f4a34 JX |
2824 | msgid "path" |
2825 | msgstr "路径" | |
2826 | ||
276ceeaa JX |
2827 | #: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 |
2828 | #: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 | |
2829 | #: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182 | |
2830 | #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340 | |
2831 | #: parse-options.h:132 parse-options.h:134 parse-options.h:244 | |
1b7f4a34 JX |
2832 | msgid "n" |
2833 | msgstr "n" | |
2834 | ||
276ceeaa | 2835 | #: builtin/am.c:2292 builtin/apply.c:4512 |
1b7f4a34 JX |
2836 | msgid "num" |
2837 | msgstr "数字" | |
2838 | ||
276ceeaa | 2839 | #: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 |
94550ed3 | 2840 | #: builtin/tag.c:372 |
1b7f4a34 JX |
2841 | msgid "format" |
2842 | msgstr "格式" | |
2843 | ||
276ceeaa | 2844 | #: builtin/am.c:2296 |
1b7f4a34 JX |
2845 | msgid "format the patch(es) are in" |
2846 | msgstr "补丁的格式" | |
2847 | ||
276ceeaa | 2848 | #: builtin/am.c:2302 |
1b7f4a34 JX |
2849 | msgid "override error message when patch failure occurs" |
2850 | msgstr "打补丁失败时显示的错误信息" | |
2851 | ||
276ceeaa | 2852 | #: builtin/am.c:2304 |
1b7f4a34 JX |
2853 | msgid "continue applying patches after resolving a conflict" |
2854 | msgstr "冲突解决后继续应用补丁" | |
2855 | ||
276ceeaa | 2856 | #: builtin/am.c:2307 |
1b7f4a34 JX |
2857 | msgid "synonyms for --continue" |
2858 | msgstr "和 --continue 同义" | |
2859 | ||
276ceeaa | 2860 | #: builtin/am.c:2310 |
1b7f4a34 JX |
2861 | msgid "skip the current patch" |
2862 | msgstr "跳过当前补丁" | |
2863 | ||
276ceeaa | 2864 | #: builtin/am.c:2313 |
1b7f4a34 JX |
2865 | msgid "restore the original branch and abort the patching operation." |
2866 | msgstr "恢复原始分支并终止打补丁操作。" | |
2867 | ||
276ceeaa | 2868 | #: builtin/am.c:2317 |
1b7f4a34 JX |
2869 | msgid "lie about committer date" |
2870 | msgstr "将作者日期作为提交日期" | |
2871 | ||
276ceeaa | 2872 | #: builtin/am.c:2319 |
1b7f4a34 JX |
2873 | msgid "use current timestamp for author date" |
2874 | msgstr "用当前时间作为作者日期" | |
2875 | ||
276ceeaa JX |
2876 | #: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 |
2877 | #: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 | |
1b7f4a34 JX |
2878 | msgid "key-id" |
2879 | msgstr "key-id" | |
2880 | ||
276ceeaa | 2881 | #: builtin/am.c:2322 |
1b7f4a34 JX |
2882 | msgid "GPG-sign commits" |
2883 | msgstr "使用 GPG 签名提交" | |
2884 | ||
276ceeaa | 2885 | #: builtin/am.c:2325 |
1b7f4a34 JX |
2886 | msgid "(internal use for git-rebase)" |
2887 | msgstr "(内部使用,用于 git-rebase)" | |
2888 | ||
276ceeaa | 2889 | #: builtin/am.c:2340 |
1b7f4a34 JX |
2890 | msgid "" |
2891 | "The -b/--binary option has been a no-op for long time, and\n" | |
2892 | "it will be removed. Please do not use it anymore." | |
2893 | msgstr "" | |
2894 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n" | |
2895 | "请不要再使用它了。" | |
2896 | ||
276ceeaa | 2897 | #: builtin/am.c:2347 |
1b7f4a34 JX |
2898 | msgid "failed to read the index" |
2899 | msgstr "无法读取索引" | |
2900 | ||
276ceeaa | 2901 | #: builtin/am.c:2362 |
1b7f4a34 JX |
2902 | #, c-format |
2903 | msgid "previous rebase directory %s still exists but mbox given." | |
2904 | msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。" | |
2905 | ||
276ceeaa | 2906 | #: builtin/am.c:2386 |
1b7f4a34 JX |
2907 | #, c-format |
2908 | msgid "" | |
2909 | "Stray %s directory found.\n" | |
2910 | "Use \"git am --abort\" to remove it." | |
2911 | msgstr "" | |
2912 | "发现了错误的 %s 目录。\n" | |
2913 | "使用 \"git am --abort\" 删除它。" | |
2914 | ||
276ceeaa | 2915 | #: builtin/am.c:2392 |
1b7f4a34 JX |
2916 | msgid "Resolve operation not in progress, we are not resuming." |
2917 | msgstr "解决操作未进行,我们不会继续。" | |
2918 | ||
814ff314 JX |
2919 | #: builtin/apply.c:59 |
2920 | msgid "git apply [<options>] [<patch>...]" | |
2921 | msgstr "git apply [<选项>] [<补丁>...]" | |
8ada9598 | 2922 | |
94550ed3 | 2923 | #: builtin/apply.c:111 |
81809b99 | 2924 | #, c-format |
8ada9598 | 2925 | msgid "unrecognized whitespace option '%s'" |
81809b99 | 2926 | msgstr "未能识别的空白字符选项 '%s'" |
8ada9598 | 2927 | |
94550ed3 | 2928 | #: builtin/apply.c:126 |
81809b99 | 2929 | #, c-format |
8ada9598 | 2930 | msgid "unrecognized whitespace ignore option '%s'" |
81809b99 | 2931 | msgstr "未能识别的空白字符忽略选项 '%s'" |
8ada9598 | 2932 | |
94550ed3 | 2933 | #: builtin/apply.c:818 |
8ada9598 JX |
2934 | #, c-format |
2935 | msgid "Cannot prepare timestamp regexp %s" | |
81809b99 | 2936 | msgstr "无法准备时间戳正则表达式 %s" |
8ada9598 | 2937 | |
94550ed3 | 2938 | #: builtin/apply.c:827 |
8ada9598 JX |
2939 | #, c-format |
2940 | msgid "regexec returned %d for input: %s" | |
81809b99 | 2941 | msgstr "regexec 返回 %d,输入为:%s" |
8ada9598 | 2942 | |
94550ed3 | 2943 | #: builtin/apply.c:908 |
81809b99 | 2944 | #, c-format |
8ada9598 | 2945 | msgid "unable to find filename in patch at line %d" |
81809b99 | 2946 | msgstr "不能在补丁的第 %d 行找到文件名" |
8ada9598 | 2947 | |
94550ed3 | 2948 | #: builtin/apply.c:940 |
8ada9598 JX |
2949 | #, c-format |
2950 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" | |
9aafc933 | 2951 | msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" |
8ada9598 | 2952 | |
94550ed3 | 2953 | #: builtin/apply.c:944 |
8ada9598 JX |
2954 | #, c-format |
2955 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" | |
81809b99 | 2956 | msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" |
8ada9598 | 2957 | |
94550ed3 | 2958 | #: builtin/apply.c:945 |
8ada9598 JX |
2959 | #, c-format |
2960 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" | |
81809b99 | 2961 | msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" |
8ada9598 | 2962 | |
94550ed3 | 2963 | #: builtin/apply.c:952 |
8ada9598 JX |
2964 | #, c-format |
2965 | msgid "git apply: bad git-diff - expected /dev/null on line %d" | |
9aafc933 | 2966 | msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" |
8ada9598 | 2967 | |
94550ed3 | 2968 | #: builtin/apply.c:1415 |
8ada9598 JX |
2969 | #, c-format |
2970 | msgid "recount: unexpected line: %.*s" | |
81809b99 | 2971 | msgstr "recount:意外的行:%.*s" |
8ada9598 | 2972 | |
94550ed3 | 2973 | #: builtin/apply.c:1472 |
8ada9598 JX |
2974 | #, c-format |
2975 | msgid "patch fragment without header at line %d: %.*s" | |
81809b99 | 2976 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" |
8ada9598 | 2977 | |
94550ed3 | 2978 | #: builtin/apply.c:1489 |
8ada9598 JX |
2979 | #, c-format |
2980 | msgid "" | |
2981 | "git diff header lacks filename information when removing %d leading pathname " | |
2982 | "component (line %d)" | |
2983 | msgid_plural "" | |
2984 | "git diff header lacks filename information when removing %d leading pathname " | |
2985 | "components (line %d)" | |
5ae481e0 JX |
2986 | msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" |
2987 | msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
8ada9598 | 2988 | |
94550ed3 | 2989 | #: builtin/apply.c:1655 |
8ada9598 | 2990 | msgid "new file depends on old contents" |
81809b99 | 2991 | msgstr "新文件依赖旧内容" |
8ada9598 | 2992 | |
94550ed3 | 2993 | #: builtin/apply.c:1657 |
8ada9598 | 2994 | msgid "deleted file still has contents" |
81809b99 | 2995 | msgstr "删除的文件仍有内容" |
8ada9598 | 2996 | |
94550ed3 | 2997 | #: builtin/apply.c:1683 |
8ada9598 JX |
2998 | #, c-format |
2999 | msgid "corrupt patch at line %d" | |
195febda | 3000 | msgstr "补丁在第 %d 行损坏" |
8ada9598 | 3001 | |
94550ed3 | 3002 | #: builtin/apply.c:1719 |
8ada9598 JX |
3003 | #, c-format |
3004 | msgid "new file %s depends on old contents" | |
81809b99 | 3005 | msgstr "新文件 %s 依赖旧内容" |
8ada9598 | 3006 | |
94550ed3 | 3007 | #: builtin/apply.c:1721 |
8ada9598 JX |
3008 | #, c-format |
3009 | msgid "deleted file %s still has contents" | |
81809b99 | 3010 | msgstr "删除的文件 %s 仍有内容" |
8ada9598 | 3011 | |
94550ed3 | 3012 | #: builtin/apply.c:1724 |
8ada9598 JX |
3013 | #, c-format |
3014 | msgid "** warning: file %s becomes empty but is not deleted" | |
81809b99 | 3015 | msgstr "** 警告:文件 %s 成为空文件但并未删除" |
8ada9598 | 3016 | |
94550ed3 | 3017 | #: builtin/apply.c:1870 |
8ada9598 JX |
3018 | #, c-format |
3019 | msgid "corrupt binary patch at line %d: %.*s" | |
81809b99 | 3020 | msgstr "二进制补丁在第 %d 行损坏:%.*s" |
8ada9598 | 3021 | |
94550ed3 | 3022 | #: builtin/apply.c:1899 |
8ada9598 JX |
3023 | #, c-format |
3024 | msgid "unrecognized binary patch at line %d" | |
81809b99 | 3025 | msgstr "未能识别的二进制补丁位于第 %d 行" |
8ada9598 | 3026 | |
94550ed3 | 3027 | #: builtin/apply.c:2050 |
8ada9598 JX |
3028 | #, c-format |
3029 | msgid "patch with only garbage at line %d" | |
81809b99 | 3030 | msgstr "补丁文件的第 %d 行只有垃圾数据" |
8ada9598 | 3031 | |
94550ed3 | 3032 | #: builtin/apply.c:2140 |
81809b99 | 3033 | #, c-format |
8ada9598 | 3034 | msgid "unable to read symlink %s" |
81809b99 | 3035 | msgstr "无法读取符号链接 %s" |
8ada9598 | 3036 | |
94550ed3 | 3037 | #: builtin/apply.c:2144 |
81809b99 | 3038 | #, c-format |
8ada9598 | 3039 | msgid "unable to open or read %s" |
81809b99 | 3040 | msgstr "不能打开或读取 %s" |
8ada9598 | 3041 | |
94550ed3 | 3042 | #: builtin/apply.c:2777 |
81809b99 | 3043 | #, c-format |
8ada9598 | 3044 | msgid "invalid start of line: '%c'" |
81809b99 | 3045 | msgstr "无效的行首字符:'%c'" |
8ada9598 | 3046 | |
94550ed3 | 3047 | #: builtin/apply.c:2896 |
8ada9598 JX |
3048 | #, c-format |
3049 | msgid "Hunk #%d succeeded at %d (offset %d line)." | |
3050 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." | |
07432cef WS |
3051 | msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" |
3052 | msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
8ada9598 | 3053 | |
94550ed3 | 3054 | #: builtin/apply.c:2908 |
8ada9598 JX |
3055 | #, c-format |
3056 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" | |
81809b99 | 3057 | msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" |
8ada9598 | 3058 | |
94550ed3 | 3059 | #: builtin/apply.c:2914 |
8ada9598 JX |
3060 | #, c-format |
3061 | msgid "" | |
3062 | "while searching for:\n" | |
3063 | "%.*s" | |
3064 | msgstr "" | |
81809b99 JX |
3065 | "当查询:\n" |
3066 | "%.*s" | |
8ada9598 | 3067 | |
94550ed3 | 3068 | #: builtin/apply.c:2934 |
8ada9598 JX |
3069 | #, c-format |
3070 | msgid "missing binary patch data for '%s'" | |
81809b99 | 3071 | msgstr "缺失 '%s' 的二进制补丁数据" |
8ada9598 | 3072 | |
94550ed3 | 3073 | #: builtin/apply.c:3035 |
8ada9598 JX |
3074 | #, c-format |
3075 | msgid "binary patch does not apply to '%s'" | |
81809b99 | 3076 | msgstr "二进制补丁未应用到 '%s'" |
8ada9598 | 3077 | |
94550ed3 | 3078 | #: builtin/apply.c:3041 |
8ada9598 JX |
3079 | #, c-format |
3080 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" | |
9aafc933 | 3081 | msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" |
8ada9598 | 3082 | |
94550ed3 | 3083 | #: builtin/apply.c:3062 |
8ada9598 JX |
3084 | #, c-format |
3085 | msgid "patch failed: %s:%ld" | |
81809b99 | 3086 | msgstr "打补丁失败:%s:%ld" |
8ada9598 | 3087 | |
94550ed3 | 3088 | #: builtin/apply.c:3186 |
8ada9598 | 3089 | #, c-format |
23ff3338 JX |
3090 | msgid "cannot checkout %s" |
3091 | msgstr "不能检出 %s" | |
8ada9598 | 3092 | |
94550ed3 | 3093 | #: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 |
81809b99 | 3094 | #, c-format |
8ada9598 | 3095 | msgid "read of %s failed" |
81809b99 | 3096 | msgstr "读取 %s 失败" |
8ada9598 | 3097 | |
94550ed3 | 3098 | #: builtin/apply.c:3239 |
814ff314 JX |
3099 | #, c-format |
3100 | msgid "reading from '%s' beyond a symbolic link" | |
3101 | msgstr "读取位于符号链接中的 '%s'" | |
3102 | ||
94550ed3 | 3103 | #: builtin/apply.c:3267 builtin/apply.c:3489 |
81809b99 | 3104 | #, c-format |
23ff3338 JX |
3105 | msgid "path %s has been renamed/deleted" |
3106 | msgstr "路径 %s 已经被重命名/删除" | |
8ada9598 | 3107 | |
94550ed3 | 3108 | #: builtin/apply.c:3348 builtin/apply.c:3503 |
8ada9598 | 3109 | #, c-format |
23ff3338 JX |
3110 | msgid "%s: does not exist in index" |
3111 | msgstr "%s:不存在于索引中" | |
8ada9598 | 3112 | |
94550ed3 | 3113 | #: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 |
81809b99 | 3114 | #, c-format |
8ada9598 | 3115 | msgid "%s: %s" |
81809b99 | 3116 | msgstr "%s:%s" |
8ada9598 | 3117 | |
94550ed3 | 3118 | #: builtin/apply.c:3357 builtin/apply.c:3511 |
81809b99 | 3119 | #, c-format |
8ada9598 | 3120 | msgid "%s: does not match index" |
81809b99 | 3121 | msgstr "%s:和索引不匹配" |
8ada9598 | 3122 | |
94550ed3 | 3123 | #: builtin/apply.c:3459 |
23ff3338 JX |
3124 | msgid "removal patch leaves file contents" |
3125 | msgstr "移除补丁仍留下了文件内容" | |
3126 | ||
94550ed3 | 3127 | #: builtin/apply.c:3528 |
8ada9598 JX |
3128 | #, c-format |
3129 | msgid "%s: wrong type" | |
81809b99 | 3130 | msgstr "%s:错误类型" |
8ada9598 | 3131 | |
94550ed3 | 3132 | #: builtin/apply.c:3530 |
8ada9598 JX |
3133 | #, c-format |
3134 | msgid "%s has type %o, expected %o" | |
9aafc933 | 3135 | msgstr "%s 的类型是 %o,应为 %o" |
8ada9598 | 3136 | |
94550ed3 | 3137 | #: builtin/apply.c:3689 builtin/apply.c:3691 |
814ff314 JX |
3138 | #, c-format |
3139 | msgid "invalid path '%s'" | |
3140 | msgstr "无效路径 '%s'" | |
3141 | ||
94550ed3 | 3142 | #: builtin/apply.c:3746 |
81809b99 | 3143 | #, c-format |
8ada9598 | 3144 | msgid "%s: already exists in index" |
81809b99 | 3145 | msgstr "%s:已经存在于索引中" |
8ada9598 | 3146 | |
94550ed3 | 3147 | #: builtin/apply.c:3749 |
23ff3338 JX |
3148 | #, c-format |
3149 | msgid "%s: already exists in working directory" | |
3150 | msgstr "%s:已经存在于工作区中" | |
3151 | ||
94550ed3 | 3152 | #: builtin/apply.c:3769 |
d691f479 JX |
3153 | #, c-format |
3154 | msgid "new mode (%o) of %s does not match old mode (%o)" | |
3155 | msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" | |
8ada9598 | 3156 | |
94550ed3 | 3157 | #: builtin/apply.c:3774 |
8ada9598 | 3158 | #, c-format |
d691f479 JX |
3159 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
3160 | msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" | |
3161 | ||
94550ed3 | 3162 | #: builtin/apply.c:3794 |
814ff314 JX |
3163 | #, c-format |
3164 | msgid "affected file '%s' is beyond a symbolic link" | |
3165 | msgstr "受影响的文件 '%s' 位于符号链接中" | |
3166 | ||
94550ed3 | 3167 | #: builtin/apply.c:3798 |
d691f479 | 3168 | #, c-format |
8ada9598 | 3169 | msgid "%s: patch does not apply" |
81809b99 | 3170 | msgstr "%s:补丁未应用" |
8ada9598 | 3171 | |
94550ed3 | 3172 | #: builtin/apply.c:3812 |
8ada9598 JX |
3173 | #, c-format |
3174 | msgid "Checking patch %s..." | |
81809b99 | 3175 | msgstr "检查补丁 %s..." |
8ada9598 | 3176 | |
94550ed3 | 3177 | #: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 |
8ada9598 JX |
3178 | #, c-format |
3179 | msgid "make_cache_entry failed for path '%s'" | |
3180 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" | |
3181 | ||
94550ed3 | 3182 | #: builtin/apply.c:4048 |
81809b99 | 3183 | #, c-format |
8ada9598 | 3184 | msgid "unable to remove %s from index" |
81809b99 | 3185 | msgstr "不能从索引中移除 %s" |
8ada9598 | 3186 | |
94550ed3 | 3187 | #: builtin/apply.c:4077 |
8ada9598 | 3188 | #, c-format |
2e8451e8 JX |
3189 | msgid "corrupt patch for submodule %s" |
3190 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 3191 | |
94550ed3 | 3192 | #: builtin/apply.c:4081 |
81809b99 | 3193 | #, c-format |
8ada9598 | 3194 | msgid "unable to stat newly created file '%s'" |
81809b99 | 3195 | msgstr "不能枚举新建文件 '%s' 的状态" |
8ada9598 | 3196 | |
94550ed3 | 3197 | #: builtin/apply.c:4086 |
8ada9598 JX |
3198 | #, c-format |
3199 | msgid "unable to create backing store for newly created file %s" | |
81809b99 | 3200 | msgstr "不能为新建文件 %s 创建后端存储" |
8ada9598 | 3201 | |
94550ed3 | 3202 | #: builtin/apply.c:4089 builtin/apply.c:4197 |
81809b99 | 3203 | #, c-format |
8ada9598 | 3204 | msgid "unable to add cache entry for %s" |
81809b99 | 3205 | msgstr "无法为 %s 添加缓存条目" |
8ada9598 | 3206 | |
94550ed3 | 3207 | #: builtin/apply.c:4122 |
81809b99 | 3208 | #, c-format |
8ada9598 | 3209 | msgid "closing file '%s'" |
81809b99 | 3210 | msgstr "关闭文件 '%s'" |
8ada9598 | 3211 | |
94550ed3 | 3212 | #: builtin/apply.c:4171 |
81809b99 | 3213 | #, c-format |
8ada9598 | 3214 | msgid "unable to write file '%s' mode %o" |
81809b99 | 3215 | msgstr "不能写文件 '%s' 权限 %o" |
8ada9598 | 3216 | |
94550ed3 | 3217 | #: builtin/apply.c:4258 |
8ada9598 JX |
3218 | #, c-format |
3219 | msgid "Applied patch %s cleanly." | |
81809b99 | 3220 | msgstr "成功应用补丁 %s。" |
8ada9598 | 3221 | |
94550ed3 | 3222 | #: builtin/apply.c:4266 |
8ada9598 | 3223 | msgid "internal error" |
81809b99 | 3224 | msgstr "内部错误" |
8ada9598 | 3225 | |
94550ed3 | 3226 | #: builtin/apply.c:4269 |
8ada9598 JX |
3227 | #, c-format |
3228 | msgid "Applying patch %%s with %d reject..." | |
3229 | msgid_plural "Applying patch %%s with %d rejects..." | |
195febda T |
3230 | msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." |
3231 | msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
8ada9598 | 3232 | |
94550ed3 | 3233 | #: builtin/apply.c:4279 |
8ada9598 JX |
3234 | #, c-format |
3235 | msgid "truncating .rej filename to %.*s.rej" | |
81809b99 | 3236 | msgstr "截短 .rej 文件名为 %.*s.rej" |
8ada9598 | 3237 | |
94550ed3 | 3238 | #: builtin/apply.c:4300 |
8ada9598 JX |
3239 | #, c-format |
3240 | msgid "Hunk #%d applied cleanly." | |
81809b99 | 3241 | msgstr "第 #%d 个片段成功应用。" |
8ada9598 | 3242 | |
94550ed3 | 3243 | #: builtin/apply.c:4303 |
8ada9598 JX |
3244 | #, c-format |
3245 | msgid "Rejected hunk #%d." | |
81809b99 | 3246 | msgstr "拒绝第 #%d 个片段。" |
8ada9598 | 3247 | |
94550ed3 | 3248 | #: builtin/apply.c:4393 |
8ada9598 | 3249 | msgid "unrecognized input" |
81809b99 | 3250 | msgstr "未能识别的输入" |
8ada9598 | 3251 | |
94550ed3 | 3252 | #: builtin/apply.c:4404 |
8ada9598 | 3253 | msgid "unable to read index file" |
81809b99 | 3254 | msgstr "无法读取索引文件" |
8ada9598 | 3255 | |
276ceeaa | 3256 | #: builtin/apply.c:4507 |
8ada9598 | 3257 | msgid "don't apply changes matching the given path" |
81809b99 | 3258 | msgstr "不要应用与给出路径向匹配的变更" |
8ada9598 | 3259 | |
276ceeaa | 3260 | #: builtin/apply.c:4510 |
8ada9598 | 3261 | msgid "apply changes matching the given path" |
81809b99 | 3262 | msgstr "应用与给出路径向匹配的变更" |
8ada9598 | 3263 | |
276ceeaa | 3264 | #: builtin/apply.c:4513 |
8ada9598 | 3265 | msgid "remove <num> leading slashes from traditional diff paths" |
07432cef | 3266 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" |
8ada9598 | 3267 | |
276ceeaa | 3268 | #: builtin/apply.c:4516 |
8ada9598 | 3269 | msgid "ignore additions made by the patch" |
81809b99 | 3270 | msgstr "忽略补丁中的添加的文件" |
8ada9598 | 3271 | |
276ceeaa | 3272 | #: builtin/apply.c:4518 |
8ada9598 | 3273 | msgid "instead of applying the patch, output diffstat for the input" |
81809b99 | 3274 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" |
8ada9598 | 3275 | |
276ceeaa | 3276 | #: builtin/apply.c:4522 |
ef317cd5 | 3277 | msgid "show number of added and deleted lines in decimal notation" |
07432cef | 3278 | msgstr "以十进制数显示添加和删除的行数" |
8ada9598 | 3279 | |
276ceeaa | 3280 | #: builtin/apply.c:4524 |
8ada9598 | 3281 | msgid "instead of applying the patch, output a summary for the input" |
81809b99 | 3282 | msgstr "不应用补丁,而是显示输入的概要" |
8ada9598 | 3283 | |
276ceeaa | 3284 | #: builtin/apply.c:4526 |
8ada9598 | 3285 | msgid "instead of applying the patch, see if the patch is applicable" |
81809b99 | 3286 | msgstr "不应用补丁,而是查看补丁是否可应用" |
8ada9598 | 3287 | |
276ceeaa | 3288 | #: builtin/apply.c:4528 |
8ada9598 | 3289 | msgid "make sure the patch is applicable to the current index" |
81809b99 | 3290 | msgstr "确认补丁可以应用到当前索引" |
8ada9598 | 3291 | |
276ceeaa | 3292 | #: builtin/apply.c:4530 |
8ada9598 | 3293 | msgid "apply a patch without touching the working tree" |
81809b99 | 3294 | msgstr "应用补丁而不修改工作区" |
8ada9598 | 3295 | |
276ceeaa | 3296 | #: builtin/apply.c:4532 |
814ff314 JX |
3297 | msgid "accept a patch that touches outside the working area" |
3298 | msgstr "接受修改工作区之外文件的补丁" | |
3299 | ||
276ceeaa | 3300 | #: builtin/apply.c:4534 |
8ada9598 | 3301 | msgid "also apply the patch (use with --stat/--summary/--check)" |
195febda | 3302 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" |
8ada9598 | 3303 | |
276ceeaa | 3304 | #: builtin/apply.c:4536 |
23ff3338 | 3305 | msgid "attempt three-way merge if a patch does not apply" |
160fb2b2 | 3306 | msgstr "如果一个补丁不能应用则尝试三方合并" |
23ff3338 | 3307 | |
276ceeaa | 3308 | #: builtin/apply.c:4538 |
8ada9598 | 3309 | msgid "build a temporary index based on embedded index information" |
81809b99 | 3310 | msgstr "创建一个临时索引基于嵌入的索引信息" |
8ada9598 | 3311 | |
276ceeaa | 3312 | #: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 |
8ada9598 | 3313 | msgid "paths are separated with NUL character" |
81809b99 | 3314 | msgstr "路径以 NUL 字符分隔" |
8ada9598 | 3315 | |
276ceeaa | 3316 | #: builtin/apply.c:4543 |
8ada9598 | 3317 | msgid "ensure at least <n> lines of context match" |
81809b99 | 3318 | msgstr "确保至少匹配 <n> 行上下文" |
8ada9598 | 3319 | |
276ceeaa | 3320 | #: builtin/apply.c:4545 |
8ada9598 | 3321 | msgid "detect new or modified lines that have whitespace errors" |
81809b99 | 3322 | msgstr "检查新增和修改的行中间的空白字符滥用" |
8ada9598 | 3323 | |
276ceeaa | 3324 | #: builtin/apply.c:4548 builtin/apply.c:4551 |
8ada9598 | 3325 | msgid "ignore changes in whitespace when finding context" |
81809b99 | 3326 | msgstr "查找上下文时忽略空白字符的变更" |
8ada9598 | 3327 | |
276ceeaa | 3328 | #: builtin/apply.c:4554 |
8ada9598 | 3329 | msgid "apply the patch in reverse" |
81809b99 | 3330 | msgstr "反向应用补丁" |
8ada9598 | 3331 | |
276ceeaa | 3332 | #: builtin/apply.c:4556 |
8ada9598 | 3333 | msgid "don't expect at least one line of context" |
81809b99 | 3334 | msgstr "无需至少一行上下文" |
8ada9598 | 3335 | |
276ceeaa | 3336 | #: builtin/apply.c:4558 |
8ada9598 | 3337 | msgid "leave the rejected hunks in corresponding *.rej files" |
81809b99 | 3338 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" |
8ada9598 | 3339 | |
276ceeaa | 3340 | #: builtin/apply.c:4560 |
8ada9598 | 3341 | msgid "allow overlapping hunks" |
81809b99 | 3342 | msgstr "允许重叠的补丁片段" |
8ada9598 | 3343 | |
276ceeaa | 3344 | #: builtin/apply.c:4563 |
8ada9598 | 3345 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
195febda | 3346 | msgstr "允许不正确的文件末尾换行符" |
c04f5ac3 | 3347 | |
276ceeaa | 3348 | #: builtin/apply.c:4566 |
8ada9598 | 3349 | msgid "do not trust the line counts in the hunk headers" |
81809b99 | 3350 | msgstr "不信任补丁片段的头信息中的行号" |
c04f5ac3 | 3351 | |
276ceeaa | 3352 | #: builtin/apply.c:4569 |
8ada9598 | 3353 | msgid "prepend <root> to all filenames" |
81809b99 | 3354 | msgstr "为所有文件名前添加 <根目录>" |
c04f5ac3 | 3355 | |
276ceeaa | 3356 | #: builtin/apply.c:4591 |
23ff3338 | 3357 | msgid "--3way outside a repository" |
160fb2b2 | 3358 | msgstr "--3way 在一个仓库之外" |
23ff3338 | 3359 | |
276ceeaa | 3360 | #: builtin/apply.c:4599 |
8ada9598 | 3361 | msgid "--index outside a repository" |
160fb2b2 | 3362 | msgstr "--index 在一个仓库之外" |
c04f5ac3 | 3363 | |
276ceeaa | 3364 | #: builtin/apply.c:4602 |
8ada9598 | 3365 | msgid "--cached outside a repository" |
160fb2b2 | 3366 | msgstr "--cached 在一个仓库之外" |
c04f5ac3 | 3367 | |
276ceeaa | 3368 | #: builtin/apply.c:4621 |
81809b99 | 3369 | #, c-format |
8ada9598 | 3370 | msgid "can't open patch '%s'" |
81809b99 | 3371 | msgstr "不能打开补丁 '%s'" |
c04f5ac3 | 3372 | |
276ceeaa | 3373 | #: builtin/apply.c:4635 |
c04f5ac3 | 3374 | #, c-format |
8ada9598 JX |
3375 | msgid "squelched %d whitespace error" |
3376 | msgid_plural "squelched %d whitespace errors" | |
81809b99 | 3377 | msgstr[0] "抑制下仍有 %d 个空白字符误用" |
5ae481e0 | 3378 | msgstr[1] "抑制下仍有 %d 个空白字符误用" |
c04f5ac3 | 3379 | |
276ceeaa | 3380 | #: builtin/apply.c:4641 builtin/apply.c:4651 |
8ada9598 JX |
3381 | #, c-format |
3382 | msgid "%d line adds whitespace errors." | |
3383 | msgid_plural "%d lines add whitespace errors." | |
81809b99 | 3384 | msgstr[0] "%d 行有空白字符误用。" |
5ae481e0 | 3385 | msgstr[1] "%d 行有空白字符误用。" |
c04f5ac3 JX |
3386 | |
3387 | #: builtin/archive.c:17 | |
3388 | #, c-format | |
3389 | msgid "could not create archive file '%s'" | |
90e6ef53 | 3390 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
3391 | |
3392 | #: builtin/archive.c:20 | |
3393 | msgid "could not redirect output" | |
195febda | 3394 | msgstr "不能重定向输出" |
c04f5ac3 JX |
3395 | |
3396 | #: builtin/archive.c:37 | |
3397 | msgid "git archive: Remote with no URL" | |
4375c10e | 3398 | msgstr "git archive:未提供远程 URL" |
c04f5ac3 JX |
3399 | |
3400 | #: builtin/archive.c:58 | |
3401 | msgid "git archive: expected ACK/NAK, got EOF" | |
4375c10e | 3402 | msgstr "git archive:应为 ACK/NACK,却得到 EOF" |
c04f5ac3 | 3403 | |
1003b3a5 | 3404 | #: builtin/archive.c:61 |
c04f5ac3 JX |
3405 | #, c-format |
3406 | msgid "git archive: NACK %s" | |
90e6ef53 | 3407 | msgstr "git archive:NACK %s" |
c04f5ac3 | 3408 | |
1003b3a5 | 3409 | #: builtin/archive.c:63 |
c04f5ac3 JX |
3410 | #, c-format |
3411 | msgid "remote error: %s" | |
3412 | msgstr "远程错误:%s" | |
3413 | ||
1003b3a5 | 3414 | #: builtin/archive.c:64 |
c04f5ac3 | 3415 | msgid "git archive: protocol error" |
90e6ef53 | 3416 | msgstr "git archive:协议错误" |
c04f5ac3 | 3417 | |
1003b3a5 | 3418 | #: builtin/archive.c:68 |
c04f5ac3 | 3419 | msgid "git archive: expected a flush" |
195febda | 3420 | msgstr "git archive:应为刷新" |
c04f5ac3 | 3421 | |
ef317cd5 JX |
3422 | #: builtin/bisect--helper.c:7 |
3423 | msgid "git bisect--helper --next-all [--no-checkout]" | |
07432cef | 3424 | msgstr "git bisect--helper --next-all [--no-checkout]" |
ef317cd5 JX |
3425 | |
3426 | #: builtin/bisect--helper.c:17 | |
3427 | msgid "perform 'git bisect next'" | |
07432cef | 3428 | msgstr "执行 'git bisect next'" |
ef317cd5 JX |
3429 | |
3430 | #: builtin/bisect--helper.c:19 | |
3431 | msgid "update BISECT_HEAD instead of checking out the current commit" | |
07432cef | 3432 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
ef317cd5 | 3433 | |
276ceeaa | 3434 | #: builtin/blame.c:33 |
7aea43ff JX |
3435 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" |
3436 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" | |
ef317cd5 | 3437 | |
276ceeaa | 3438 | #: builtin/blame.c:38 |
814ff314 JX |
3439 | msgid "<rev-opts> are documented in git-rev-list(1)" |
3440 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" | |
ef317cd5 | 3441 | |
276ceeaa JX |
3442 | #: builtin/blame.c:1782 |
3443 | msgid "Blaming lines" | |
3444 | msgstr "追踪代码行" | |
3445 | ||
3446 | #: builtin/blame.c:2530 | |
ef317cd5 | 3447 | msgid "Show blame entries as we find them, incrementally" |
07432cef | 3448 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 3449 | |
276ceeaa | 3450 | #: builtin/blame.c:2531 |
ef317cd5 | 3451 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
07432cef | 3452 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
ef317cd5 | 3453 | |
276ceeaa | 3454 | #: builtin/blame.c:2532 |
ef317cd5 | 3455 | msgid "Do not treat root commits as boundaries (Default: off)" |
07432cef | 3456 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 3457 | |
276ceeaa | 3458 | #: builtin/blame.c:2533 |
ef317cd5 | 3459 | msgid "Show work cost statistics" |
07432cef | 3460 | msgstr "显示命令消耗统计" |
ef317cd5 | 3461 | |
276ceeaa JX |
3462 | #: builtin/blame.c:2534 |
3463 | msgid "Force progress reporting" | |
3464 | msgstr "强制进度显示" | |
3465 | ||
3466 | #: builtin/blame.c:2535 | |
ef317cd5 | 3467 | msgid "Show output score for blame entries" |
07432cef | 3468 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
ef317cd5 | 3469 | |
276ceeaa | 3470 | #: builtin/blame.c:2536 |
ef317cd5 | 3471 | msgid "Show original filename (Default: auto)" |
07432cef | 3472 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 3473 | |
276ceeaa | 3474 | #: builtin/blame.c:2537 |
ef317cd5 | 3475 | msgid "Show original linenumber (Default: off)" |
07432cef | 3476 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 3477 | |
276ceeaa | 3478 | #: builtin/blame.c:2538 |
ef317cd5 | 3479 | msgid "Show in a format designed for machine consumption" |
07432cef | 3480 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 3481 | |
276ceeaa | 3482 | #: builtin/blame.c:2539 |
ef317cd5 | 3483 | msgid "Show porcelain format with per-line commit information" |
07432cef | 3484 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 3485 | |
276ceeaa | 3486 | #: builtin/blame.c:2540 |
ef317cd5 | 3487 | msgid "Use the same output mode as git-annotate (Default: off)" |
07432cef | 3488 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 3489 | |
276ceeaa | 3490 | #: builtin/blame.c:2541 |
ef317cd5 | 3491 | msgid "Show raw timestamp (Default: off)" |
07432cef | 3492 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 3493 | |
276ceeaa | 3494 | #: builtin/blame.c:2542 |
ef317cd5 | 3495 | msgid "Show long commit SHA1 (Default: off)" |
4375c10e | 3496 | msgstr "显示长的 SHA1 提交号(默认:关闭)" |
ef317cd5 | 3497 | |
276ceeaa | 3498 | #: builtin/blame.c:2543 |
ef317cd5 | 3499 | msgid "Suppress author name and timestamp (Default: off)" |
07432cef | 3500 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 3501 | |
276ceeaa | 3502 | #: builtin/blame.c:2544 |
ef317cd5 | 3503 | msgid "Show author email instead of name (Default: off)" |
07432cef | 3504 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 3505 | |
276ceeaa | 3506 | #: builtin/blame.c:2545 |
ef317cd5 | 3507 | msgid "Ignore whitespace differences" |
07432cef | 3508 | msgstr "忽略空白差异" |
ef317cd5 | 3509 | |
276ceeaa | 3510 | #: builtin/blame.c:2546 |
ef317cd5 | 3511 | msgid "Spend extra cycles to find better match" |
07432cef | 3512 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 3513 | |
276ceeaa | 3514 | #: builtin/blame.c:2547 |
ef317cd5 | 3515 | msgid "Use revisions from <file> instead of calling git-rev-list" |
d9d56b23 | 3516 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 3517 | |
276ceeaa | 3518 | #: builtin/blame.c:2548 |
ef317cd5 | 3519 | msgid "Use <file>'s contents as the final image" |
d9d56b23 | 3520 | msgstr "使用 <文件> 的内容作为最终的图片" |
ef317cd5 | 3521 | |
276ceeaa | 3522 | #: builtin/blame.c:2549 builtin/blame.c:2550 |
ef317cd5 | 3523 | msgid "score" |
07432cef | 3524 | msgstr "得分" |
ef317cd5 | 3525 | |
276ceeaa | 3526 | #: builtin/blame.c:2549 |
ef317cd5 | 3527 | msgid "Find line copies within and across files" |
07432cef | 3528 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 3529 | |
276ceeaa | 3530 | #: builtin/blame.c:2550 |
ef317cd5 | 3531 | msgid "Find line movements within and across files" |
07432cef | 3532 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 3533 | |
276ceeaa | 3534 | #: builtin/blame.c:2551 |
ef317cd5 | 3535 | msgid "n,m" |
07432cef | 3536 | msgstr "n,m" |
ef317cd5 | 3537 | |
276ceeaa | 3538 | #: builtin/blame.c:2551 |
ef317cd5 | 3539 | msgid "Process only line range n,m, counting from 1" |
07432cef | 3540 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
ef317cd5 | 3541 | |
6c94aba5 JX |
3542 | #. TRANSLATORS: This string is used to tell us the maximum |
3543 | #. display width for a relative timestamp in "git blame" | |
3544 | #. output. For C locale, "4 years, 11 months ago", which | |
3545 | #. takes 22 places, is the longest among various forms of | |
3546 | #. relative timestamps, but your language may need more or | |
3547 | #. fewer display columns. | |
276ceeaa | 3548 | #: builtin/blame.c:2640 |
6c94aba5 JX |
3549 | msgid "4 years, 11 months ago" |
3550 | msgstr "4 年 11 个月前" | |
3551 | ||
94550ed3 | 3552 | #: builtin/branch.c:25 |
814ff314 JX |
3553 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
3554 | msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" | |
ef317cd5 | 3555 | |
94550ed3 | 3556 | #: builtin/branch.c:26 |
814ff314 JX |
3557 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
3558 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" | |
ef317cd5 | 3559 | |
94550ed3 | 3560 | #: builtin/branch.c:27 |
814ff314 JX |
3561 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
3562 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." | |
ef317cd5 | 3563 | |
94550ed3 | 3564 | #: builtin/branch.c:28 |
814ff314 JX |
3565 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
3566 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" | |
ef317cd5 | 3567 | |
94550ed3 JX |
3568 | #: builtin/branch.c:29 |
3569 | msgid "git branch [<options>] [-r | -a] [--points-at]" | |
3570 | msgstr "git branch [<选项>] [-r | -a] [--points-at]" | |
3571 | ||
90e6ef53 | 3572 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
94550ed3 | 3573 | #: builtin/branch.c:142 |
c04f5ac3 JX |
3574 | #, c-format |
3575 | msgid "" | |
3576 | "deleting branch '%s' that has been merged to\n" | |
3577 | " '%s', but not yet merged to HEAD." | |
3578 | msgstr "" | |
70fc47bf | 3579 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
3580 | " '%s',但未合并到 HEAD。" |
3581 | ||
90e6ef53 | 3582 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
94550ed3 | 3583 | #: builtin/branch.c:146 |
c04f5ac3 JX |
3584 | #, c-format |
3585 | msgid "" | |
3586 | "not deleting branch '%s' that is not yet merged to\n" | |
3587 | " '%s', even though it is merged to HEAD." | |
3588 | msgstr "" | |
70fc47bf T |
3589 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
3590 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 3591 | |
94550ed3 | 3592 | #: builtin/branch.c:160 |
07432cef WS |
3593 | #, c-format |
3594 | msgid "Couldn't look up commit object for '%s'" | |
3595 | msgstr "无法查询 '%s' 指向的提交对象" | |
3596 | ||
94550ed3 | 3597 | #: builtin/branch.c:164 |
07432cef WS |
3598 | #, c-format |
3599 | msgid "" | |
3600 | "The branch '%s' is not fully merged.\n" | |
3601 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
3602 | msgstr "" | |
3603 | "分支 '%s' 没有完全合并。\n" | |
3604 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
3605 | ||
94550ed3 | 3606 | #: builtin/branch.c:177 |
07432cef WS |
3607 | msgid "Update of config-file failed" |
3608 | msgstr "无法更新 config 文件" | |
3609 | ||
94550ed3 | 3610 | #: builtin/branch.c:205 |
c04f5ac3 | 3611 | msgid "cannot use -a with -d" |
649900bc | 3612 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 3613 | |
94550ed3 | 3614 | #: builtin/branch.c:211 |
c04f5ac3 JX |
3615 | msgid "Couldn't look up commit object for HEAD" |
3616 | msgstr "无法查询 HEAD 指向的提交对象" | |
3617 | ||
94550ed3 | 3618 | #: builtin/branch.c:219 |
c04f5ac3 JX |
3619 | #, c-format |
3620 | msgid "Cannot delete the branch '%s' which you are currently on." | |
3621 | msgstr "无法删除您当前所在的分支 '%s'。" | |
3622 | ||
94550ed3 | 3623 | #: builtin/branch.c:235 |
5ae481e0 | 3624 | #, c-format |
7aea43ff JX |
3625 | msgid "remote-tracking branch '%s' not found." |
3626 | msgstr "未能找到远程跟踪分支 '%s'。" | |
c04f5ac3 | 3627 | |
94550ed3 | 3628 | #: builtin/branch.c:236 |
81809b99 | 3629 | #, c-format |
8ada9598 | 3630 | msgid "branch '%s' not found." |
81809b99 | 3631 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 3632 | |
94550ed3 | 3633 | #: builtin/branch.c:251 |
81809b99 | 3634 | #, c-format |
7aea43ff JX |
3635 | msgid "Error deleting remote-tracking branch '%s'" |
3636 | msgstr "无法删除远程跟踪分支 '%s'" | |
c04f5ac3 | 3637 | |
94550ed3 | 3638 | #: builtin/branch.c:252 |
81809b99 | 3639 | #, c-format |
8ada9598 | 3640 | msgid "Error deleting branch '%s'" |
7aea43ff | 3641 | msgstr "无法删除分支 '%s'" |
8ada9598 | 3642 | |
94550ed3 | 3643 | #: builtin/branch.c:259 |
81809b99 | 3644 | #, c-format |
7aea43ff JX |
3645 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
3646 | msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" | |
c04f5ac3 | 3647 | |
94550ed3 | 3648 | #: builtin/branch.c:260 |
81809b99 | 3649 | #, c-format |
8ada9598 | 3650 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 3651 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 3652 | |
94550ed3 | 3653 | #: builtin/branch.c:303 |
81809b99 | 3654 | #, c-format |
90314792 JX |
3655 | msgid "[%s: gone]" |
3656 | msgstr "[%s: 丢失]" | |
3657 | ||
94550ed3 | 3658 | #: builtin/branch.c:308 |
90314792 JX |
3659 | #, c-format |
3660 | msgid "[%s]" | |
3661 | msgstr "[%s]" | |
3662 | ||
94550ed3 | 3663 | #: builtin/branch.c:313 |
90314792 | 3664 | #, c-format |
8ada9598 | 3665 | msgid "[%s: behind %d]" |
81809b99 | 3666 | msgstr "[%s:落后 %d]" |
c04f5ac3 | 3667 | |
94550ed3 | 3668 | #: builtin/branch.c:315 |
81809b99 | 3669 | #, c-format |
8ada9598 | 3670 | msgid "[behind %d]" |
81809b99 | 3671 | msgstr "[落后 %d]" |
8ada9598 | 3672 | |
94550ed3 | 3673 | #: builtin/branch.c:319 |
81809b99 | 3674 | #, c-format |
8ada9598 | 3675 | msgid "[%s: ahead %d]" |
81809b99 | 3676 | msgstr "[%s:领先 %d]" |
c04f5ac3 | 3677 | |
94550ed3 | 3678 | #: builtin/branch.c:321 |
81809b99 | 3679 | #, c-format |
8ada9598 | 3680 | msgid "[ahead %d]" |
81809b99 | 3681 | msgstr "[领先 %d]" |
8ada9598 | 3682 | |
94550ed3 | 3683 | #: builtin/branch.c:324 |
81809b99 | 3684 | #, c-format |
8ada9598 | 3685 | msgid "[%s: ahead %d, behind %d]" |
81809b99 | 3686 | msgstr "[%s:领先 %d,落后 %d]" |
8ada9598 | 3687 | |
94550ed3 | 3688 | #: builtin/branch.c:327 |
81809b99 | 3689 | #, c-format |
8ada9598 | 3690 | msgid "[ahead %d, behind %d]" |
81809b99 | 3691 | msgstr "[领先 %d,落后 %d]" |
c04f5ac3 | 3692 | |
94550ed3 | 3693 | #: builtin/branch.c:340 |
a77c07d9 JX |
3694 | msgid " **** invalid ref ****" |
3695 | msgstr " **** 无效引用 ****" | |
3696 | ||
94550ed3 | 3697 | #: builtin/branch.c:366 |
1003b3a5 JX |
3698 | #, c-format |
3699 | msgid "(no branch, rebasing %s)" | |
3700 | msgstr "(非分支,正变基 %s)" | |
3701 | ||
94550ed3 | 3702 | #: builtin/branch.c:369 |
1003b3a5 JX |
3703 | #, c-format |
3704 | msgid "(no branch, bisect started on %s)" | |
3705 | msgstr "(非分支,二分查找开始于 %s)" | |
3706 | ||
94550ed3 | 3707 | #: builtin/branch.c:375 |
1003b3a5 | 3708 | #, c-format |
814ff314 JX |
3709 | msgid "(HEAD detached at %s)" |
3710 | msgstr "(头指针分离于 %s)" | |
1003b3a5 | 3711 | |
94550ed3 | 3712 | #: builtin/branch.c:378 |
814ff314 JX |
3713 | #, c-format |
3714 | msgid "(HEAD detached from %s)" | |
3715 | msgstr "(头指针分离自 %s)" | |
3716 | ||
94550ed3 | 3717 | #: builtin/branch.c:382 |
c04f5ac3 JX |
3718 | msgid "(no branch)" |
3719 | msgstr "(非分支)" | |
3720 | ||
94550ed3 | 3721 | #: builtin/branch.c:524 |
c04f5ac3 | 3722 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 3723 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 3724 | |
94550ed3 | 3725 | #: builtin/branch.c:534 |
c04f5ac3 JX |
3726 | #, c-format |
3727 | msgid "Invalid branch name: '%s'" | |
3728 | msgstr "无效的分支名:'%s'" | |
3729 | ||
94550ed3 | 3730 | #: builtin/branch.c:549 |
c04f5ac3 JX |
3731 | msgid "Branch rename failed" |
3732 | msgstr "分支重命名失败" | |
3733 | ||
94550ed3 | 3734 | #: builtin/branch.c:553 |
c04f5ac3 JX |
3735 | #, c-format |
3736 | msgid "Renamed a misnamed branch '%s' away" | |
3737 | msgstr "重命名掉一个错误命名的旧分支 '%s'" | |
3738 | ||
94550ed3 | 3739 | #: builtin/branch.c:557 |
c04f5ac3 JX |
3740 | #, c-format |
3741 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
3742 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
3743 | ||
94550ed3 | 3744 | #: builtin/branch.c:564 |
c04f5ac3 JX |
3745 | msgid "Branch is renamed, but update of config-file failed" |
3746 | msgstr "分支被重命名,但更新 config 文件失败" | |
3747 | ||
276ceeaa | 3748 | #: builtin/branch.c:586 |
81809b99 | 3749 | #, c-format |
8ada9598 | 3750 | msgid "could not write branch description template: %s" |
81809b99 | 3751 | msgstr "不能写分支描述模版:%s" |
c04f5ac3 | 3752 | |
276ceeaa | 3753 | #: builtin/branch.c:615 |
ef317cd5 | 3754 | msgid "Generic options" |
07432cef | 3755 | msgstr "通用选项" |
c04f5ac3 | 3756 | |
276ceeaa | 3757 | #: builtin/branch.c:617 |
ef317cd5 | 3758 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 3759 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 3760 | |
276ceeaa | 3761 | #: builtin/branch.c:618 |
ef317cd5 | 3762 | msgid "suppress informational messages" |
07432cef | 3763 | msgstr "不显示信息" |
8ada9598 | 3764 | |
276ceeaa | 3765 | #: builtin/branch.c:619 |
ef317cd5 | 3766 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 3767 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 3768 | |
276ceeaa | 3769 | #: builtin/branch.c:621 |
ef317cd5 | 3770 | msgid "change upstream info" |
07432cef | 3771 | msgstr "改变上游信息" |
c04f5ac3 | 3772 | |
276ceeaa | 3773 | #: builtin/branch.c:625 |
ef317cd5 | 3774 | msgid "use colored output" |
07432cef | 3775 | msgstr "使用彩色输出" |
c04f5ac3 | 3776 | |
276ceeaa | 3777 | #: builtin/branch.c:626 |
ef317cd5 | 3778 | msgid "act on remote-tracking branches" |
07432cef | 3779 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 3780 | |
276ceeaa | 3781 | #: builtin/branch.c:628 builtin/branch.c:629 |
ef317cd5 | 3782 | msgid "print only branches that contain the commit" |
07432cef | 3783 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 3784 | |
276ceeaa | 3785 | #: builtin/branch.c:632 |
ef317cd5 | 3786 | msgid "Specific git-branch actions:" |
07432cef | 3787 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 3788 | |
276ceeaa | 3789 | #: builtin/branch.c:633 |
ef317cd5 | 3790 | msgid "list both remote-tracking and local branches" |
07432cef | 3791 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 3792 | |
276ceeaa | 3793 | #: builtin/branch.c:635 |
ef317cd5 | 3794 | msgid "delete fully merged branch" |
07432cef | 3795 | msgstr "删除完全合并的分支" |
c04f5ac3 | 3796 | |
276ceeaa | 3797 | #: builtin/branch.c:636 |
ef317cd5 | 3798 | msgid "delete branch (even if not merged)" |
07432cef | 3799 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 3800 | |
276ceeaa | 3801 | #: builtin/branch.c:637 |
ef317cd5 | 3802 | msgid "move/rename a branch and its reflog" |
07432cef | 3803 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 3804 | |
276ceeaa | 3805 | #: builtin/branch.c:638 |
ef317cd5 | 3806 | msgid "move/rename a branch, even if target exists" |
07432cef | 3807 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 3808 | |
276ceeaa | 3809 | #: builtin/branch.c:639 |
ef317cd5 | 3810 | msgid "list branch names" |
07432cef | 3811 | msgstr "列出分支名" |
c04f5ac3 | 3812 | |
276ceeaa | 3813 | #: builtin/branch.c:640 |
ef317cd5 | 3814 | msgid "create the branch's reflog" |
07432cef | 3815 | msgstr "创建分支的引用日志" |
ef317cd5 | 3816 | |
276ceeaa | 3817 | #: builtin/branch.c:642 |
ef317cd5 | 3818 | msgid "edit the description for the branch" |
07432cef | 3819 | msgstr "标记分支的描述" |
ef317cd5 | 3820 | |
276ceeaa | 3821 | #: builtin/branch.c:643 |
04cb2f28 JX |
3822 | msgid "force creation, move/rename, deletion" |
3823 | msgstr "强制创建、移动/重命名、删除" | |
ef317cd5 | 3824 | |
276ceeaa | 3825 | #: builtin/branch.c:644 |
94550ed3 JX |
3826 | msgid "print only branches that are merged" |
3827 | msgstr "只打印已经合并的分支" | |
ef317cd5 | 3828 | |
276ceeaa | 3829 | #: builtin/branch.c:645 |
94550ed3 JX |
3830 | msgid "print only branches that are not merged" |
3831 | msgstr "只打印尚未合并的分支" | |
ef317cd5 | 3832 | |
276ceeaa | 3833 | #: builtin/branch.c:646 |
ef317cd5 | 3834 | msgid "list branches in columns" |
07432cef | 3835 | msgstr "以列的方式显示分支" |
ef317cd5 | 3836 | |
276ceeaa | 3837 | #: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 |
94550ed3 JX |
3838 | msgid "key" |
3839 | msgstr "key" | |
3840 | ||
276ceeaa | 3841 | #: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 |
94550ed3 JX |
3842 | msgid "field name to sort on" |
3843 | msgstr "排序的字段名" | |
3844 | ||
276ceeaa JX |
3845 | #: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 |
3846 | #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 | |
94550ed3 JX |
3847 | #: builtin/tag.c:369 |
3848 | msgid "object" | |
3849 | msgstr "对象" | |
3850 | ||
276ceeaa | 3851 | #: builtin/branch.c:651 |
94550ed3 JX |
3852 | msgid "print only branches of the object" |
3853 | msgstr "只打印指向该对象的分支" | |
3854 | ||
276ceeaa | 3855 | #: builtin/branch.c:669 |
c04f5ac3 JX |
3856 | msgid "Failed to resolve HEAD as a valid ref." |
3857 | msgstr "无法将 HEAD 解析为有效引用。" | |
3858 | ||
276ceeaa | 3859 | #: builtin/branch.c:673 builtin/clone.c:705 |
c04f5ac3 | 3860 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 3861 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 3862 | |
276ceeaa | 3863 | #: builtin/branch.c:693 |
8ada9598 | 3864 | msgid "--column and --verbose are incompatible" |
81809b99 | 3865 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 3866 | |
276ceeaa | 3867 | #: builtin/branch.c:704 builtin/branch.c:746 |
a77c07d9 JX |
3868 | msgid "branch name required" |
3869 | msgstr "必须提供分支名" | |
3870 | ||
276ceeaa | 3871 | #: builtin/branch.c:722 |
a77c07d9 JX |
3872 | msgid "Cannot give description to detached HEAD" |
3873 | msgstr "不能向分离头指针提供描述" | |
3874 | ||
276ceeaa | 3875 | #: builtin/branch.c:727 |
a77c07d9 JX |
3876 | msgid "cannot edit description of more than one branch" |
3877 | msgstr "不能为一个以上的分支编辑描述" | |
3878 | ||
276ceeaa | 3879 | #: builtin/branch.c:734 |
a77c07d9 JX |
3880 | #, c-format |
3881 | msgid "No commit on branch '%s' yet." | |
3882 | msgstr "分支 '%s' 尚无提交。" | |
3883 | ||
276ceeaa | 3884 | #: builtin/branch.c:737 |
a77c07d9 JX |
3885 | #, c-format |
3886 | msgid "No branch named '%s'." | |
3887 | msgstr "没有分支 '%s'。" | |
3888 | ||
276ceeaa | 3889 | #: builtin/branch.c:752 |
a77c07d9 JX |
3890 | msgid "too many branches for a rename operation" |
3891 | msgstr "为重命名操作提供了太多的分支名" | |
3892 | ||
276ceeaa | 3893 | #: builtin/branch.c:757 |
1003b3a5 JX |
3894 | msgid "too many branches to set new upstream" |
3895 | msgstr "为设置新上游提供了太多的分支名" | |
3896 | ||
276ceeaa | 3897 | #: builtin/branch.c:761 |
1003b3a5 JX |
3898 | #, c-format |
3899 | msgid "" | |
3900 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
3901 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
3902 | ||
276ceeaa | 3903 | #: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807 |
1003b3a5 JX |
3904 | #, c-format |
3905 | msgid "no such branch '%s'" | |
3906 | msgstr "没有此分支 '%s'" | |
3907 | ||
276ceeaa | 3908 | #: builtin/branch.c:768 |
07432cef | 3909 | #, c-format |
ef317cd5 | 3910 | msgid "branch '%s' does not exist" |
07432cef | 3911 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 3912 | |
276ceeaa | 3913 | #: builtin/branch.c:780 |
1003b3a5 JX |
3914 | msgid "too many branches to unset upstream" |
3915 | msgstr "为取消上游设置操作提供了太多的分支名" | |
3916 | ||
276ceeaa | 3917 | #: builtin/branch.c:784 |
1003b3a5 JX |
3918 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
3919 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
3920 | ||
276ceeaa | 3921 | #: builtin/branch.c:790 |
ef317cd5 JX |
3922 | #, c-format |
3923 | msgid "Branch '%s' has no upstream information" | |
07432cef | 3924 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 3925 | |
276ceeaa | 3926 | #: builtin/branch.c:804 |
1003b3a5 JX |
3927 | msgid "it does not make sense to create 'HEAD' manually" |
3928 | msgstr "手工创建 'HEAD' 没有意义" | |
3929 | ||
276ceeaa | 3930 | #: builtin/branch.c:810 |
c04f5ac3 JX |
3931 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
3932 | msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" | |
3933 | ||
276ceeaa | 3934 | #: builtin/branch.c:813 |
ef317cd5 JX |
3935 | #, c-format |
3936 | msgid "" | |
3937 | "The --set-upstream flag is deprecated and will be removed. Consider using --" | |
3938 | "track or --set-upstream-to\n" | |
3939 | msgstr "" | |
07432cef | 3940 | "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" |
ef317cd5 | 3941 | |
276ceeaa | 3942 | #: builtin/branch.c:830 |
ef317cd5 JX |
3943 | #, c-format |
3944 | msgid "" | |
3945 | "\n" | |
3946 | "If you wanted to make '%s' track '%s', do this:\n" | |
3947 | "\n" | |
3948 | msgstr "" | |
07432cef WS |
3949 | "\n" |
3950 | "如果你想用 '%s' 跟踪 '%s', 这么做:\n" | |
3951 | "\n" | |
ef317cd5 | 3952 | |
276ceeaa | 3953 | #: builtin/branch.c:831 |
07432cef | 3954 | #, c-format |
ef317cd5 | 3955 | msgid " git branch -d %s\n" |
07432cef | 3956 | msgstr " git branch -d %s\n" |
ef317cd5 | 3957 | |
276ceeaa | 3958 | #: builtin/branch.c:832 |
ef317cd5 JX |
3959 | #, c-format |
3960 | msgid " git branch --set-upstream-to %s\n" | |
07432cef | 3961 | msgstr " git branch --set-upstream-to %s\n" |
ef317cd5 | 3962 | |
7aea43ff | 3963 | #: builtin/bundle.c:51 |
c04f5ac3 JX |
3964 | #, c-format |
3965 | msgid "%s is okay\n" | |
3966 | msgstr "%s 可以\n" | |
3967 | ||
7aea43ff | 3968 | #: builtin/bundle.c:64 |
c04f5ac3 | 3969 | msgid "Need a repository to create a bundle." |
160fb2b2 | 3970 | msgstr "需要一个仓库来创建包。" |
c04f5ac3 | 3971 | |
7aea43ff | 3972 | #: builtin/bundle.c:68 |
c04f5ac3 | 3973 | msgid "Need a repository to unbundle." |
160fb2b2 | 3974 | msgstr "需要一个仓库来解包。" |
c04f5ac3 | 3975 | |
1b7f4a34 | 3976 | #: builtin/cat-file.c:428 |
7aea43ff JX |
3977 | msgid "" |
3978 | "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" | |
3979 | "<type>|--textconv) <object>" | |
3980 | msgstr "" | |
3981 | "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型" | |
3982 | ">|--textconv) <对象>" | |
ef317cd5 | 3983 | |
1b7f4a34 | 3984 | #: builtin/cat-file.c:429 |
94550ed3 JX |
3985 | msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" |
3986 | msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]" | |
ef317cd5 | 3987 | |
1b7f4a34 | 3988 | #: builtin/cat-file.c:466 |
ef317cd5 | 3989 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 3990 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 3991 | |
1b7f4a34 | 3992 | #: builtin/cat-file.c:467 |
ef317cd5 | 3993 | msgid "show object type" |
07432cef | 3994 | msgstr "显示对象类型" |
ef317cd5 | 3995 | |
1b7f4a34 | 3996 | #: builtin/cat-file.c:468 |
ef317cd5 | 3997 | msgid "show object size" |
07432cef | 3998 | msgstr "显示对象大小" |
ef317cd5 | 3999 | |
1b7f4a34 | 4000 | #: builtin/cat-file.c:470 |
ef317cd5 | 4001 | msgid "exit with zero when there's no error" |
07432cef | 4002 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 4003 | |
1b7f4a34 | 4004 | #: builtin/cat-file.c:471 |
ef317cd5 | 4005 | msgid "pretty-print object's content" |
07432cef | 4006 | msgstr "美观地打印对象的内容" |
ef317cd5 | 4007 | |
1b7f4a34 | 4008 | #: builtin/cat-file.c:473 |
ef317cd5 | 4009 | msgid "for blob objects, run textconv on object's content" |
160fb2b2 | 4010 | msgstr "对于数据对象,对其内容执行 textconv" |
ef317cd5 | 4011 | |
1b7f4a34 | 4012 | #: builtin/cat-file.c:475 |
7aea43ff JX |
4013 | msgid "allow -s and -t to work with broken/corrupt objects" |
4014 | msgstr "允许 -s 和 -t 对损坏的对象生效" | |
4015 | ||
1b7f4a34 JX |
4016 | #: builtin/cat-file.c:476 |
4017 | msgid "buffer --batch output" | |
4018 | msgstr "缓冲 --batch 的输出" | |
4019 | ||
4020 | #: builtin/cat-file.c:478 | |
ef317cd5 | 4021 | msgid "show info and content of objects fed from the standard input" |
07432cef | 4022 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 4023 | |
1b7f4a34 | 4024 | #: builtin/cat-file.c:481 |
ef317cd5 | 4025 | msgid "show info about objects fed from the standard input" |
07432cef | 4026 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 | 4027 | |
1b7f4a34 | 4028 | #: builtin/cat-file.c:484 |
7aea43ff JX |
4029 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
4030 | msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)" | |
4031 | ||
1b7f4a34 JX |
4032 | #: builtin/cat-file.c:486 |
4033 | msgid "show all objects with --batch or --batch-check" | |
4034 | msgstr "使用 --batch 或 --batch-check 参数显示所有对象" | |
4035 | ||
ef317cd5 | 4036 | #: builtin/check-attr.c:11 |
814ff314 JX |
4037 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
4038 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." | |
ef317cd5 JX |
4039 | |
4040 | #: builtin/check-attr.c:12 | |
94550ed3 JX |
4041 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" |
4042 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" | |
ef317cd5 JX |
4043 | |
4044 | #: builtin/check-attr.c:19 | |
4045 | msgid "report all attributes set on file" | |
07432cef | 4046 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 JX |
4047 | |
4048 | #: builtin/check-attr.c:20 | |
4049 | msgid "use .gitattributes only from the index" | |
07432cef | 4050 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 4051 | |
276ceeaa | 4052 | #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97 |
ef317cd5 | 4053 | msgid "read file names from stdin" |
07432cef | 4054 | msgstr "从标准输入读出文件名" |
ef317cd5 | 4055 | |
a77c07d9 | 4056 | #: builtin/check-attr.c:23 builtin/check-ignore.c:24 |
90314792 JX |
4057 | msgid "terminate input and output records by a NUL character" |
4058 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 4059 | |
276ceeaa | 4060 | #: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 |
a77c07d9 JX |
4061 | msgid "suppress progress reporting" |
4062 | msgstr "不显示进度报告" | |
4063 | ||
2e8451e8 JX |
4064 | #: builtin/check-ignore.c:26 |
4065 | msgid "show non-matching input paths" | |
4066 | msgstr "显示未匹配的输入路径" | |
4067 | ||
90314792 JX |
4068 | #: builtin/check-ignore.c:28 |
4069 | msgid "ignore index when checking" | |
4070 | msgstr "检查时忽略索引" | |
4071 | ||
4072 | #: builtin/check-ignore.c:154 | |
a77c07d9 | 4073 | msgid "cannot specify pathnames with --stdin" |
1b7f4a34 | 4074 | msgstr "不能同时指定路径及 --stdin 参数" |
a77c07d9 | 4075 | |
90314792 | 4076 | #: builtin/check-ignore.c:157 |
a77c07d9 JX |
4077 | msgid "-z only makes sense with --stdin" |
4078 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
4079 | ||
90314792 | 4080 | #: builtin/check-ignore.c:159 |
a77c07d9 JX |
4081 | msgid "no path specified" |
4082 | msgstr "未指定路径" | |
4083 | ||
90314792 | 4084 | #: builtin/check-ignore.c:163 |
a77c07d9 JX |
4085 | msgid "--quiet is only valid with a single pathname" |
4086 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
4087 | ||
90314792 | 4088 | #: builtin/check-ignore.c:165 |
a77c07d9 JX |
4089 | msgid "cannot have both --quiet and --verbose" |
4090 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
4091 | ||
90314792 | 4092 | #: builtin/check-ignore.c:168 |
2e8451e8 JX |
4093 | msgid "--non-matching is only valid with --verbose" |
4094 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
4095 | ||
4096 | #: builtin/check-mailmap.c:8 | |
814ff314 JX |
4097 | msgid "git check-mailmap [<options>] <contact>..." |
4098 | msgstr "git check-mailmap [<选项>] <联系地址>..." | |
2e8451e8 JX |
4099 | |
4100 | #: builtin/check-mailmap.c:13 | |
4101 | msgid "also read contacts from stdin" | |
4102 | msgstr "还从标准输入读取联系地址" | |
4103 | ||
4104 | #: builtin/check-mailmap.c:24 | |
4105 | #, c-format | |
4106 | msgid "unable to parse contact: %s" | |
4107 | msgstr "不能解析联系地址:%s" | |
4108 | ||
4109 | #: builtin/check-mailmap.c:47 | |
4110 | msgid "no contacts specified" | |
4111 | msgstr "未指定联系地址" | |
4112 | ||
276ceeaa | 4113 | #: builtin/checkout-index.c:127 |
814ff314 JX |
4114 | msgid "git checkout-index [<options>] [--] [<file>...]" |
4115 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" | |
ef317cd5 | 4116 | |
276ceeaa JX |
4117 | #: builtin/checkout-index.c:144 |
4118 | msgid "stage should be between 1 and 3 or all" | |
4119 | msgstr "索引值应该取值 1 到 3 或者 all" | |
4120 | ||
4121 | #: builtin/checkout-index.c:160 | |
ef317cd5 | 4122 | msgid "check out all files in the index" |
07432cef | 4123 | msgstr "检出索引区的所有文件" |
ef317cd5 | 4124 | |
276ceeaa | 4125 | #: builtin/checkout-index.c:161 |
ef317cd5 | 4126 | msgid "force overwrite of existing files" |
07432cef | 4127 | msgstr "强制覆盖现有的文件" |
ef317cd5 | 4128 | |
276ceeaa | 4129 | #: builtin/checkout-index.c:163 |
ef317cd5 | 4130 | msgid "no warning for existing files and files not in index" |
07432cef | 4131 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 | 4132 | |
276ceeaa | 4133 | #: builtin/checkout-index.c:165 |
ef317cd5 | 4134 | msgid "don't checkout new files" |
07432cef | 4135 | msgstr "不检出新文件" |
ef317cd5 | 4136 | |
276ceeaa | 4137 | #: builtin/checkout-index.c:167 |
ef317cd5 | 4138 | msgid "update stat information in the index file" |
07432cef | 4139 | msgstr "更新索引中文件的状态信息" |
ef317cd5 | 4140 | |
276ceeaa | 4141 | #: builtin/checkout-index.c:171 |
ef317cd5 | 4142 | msgid "read list of paths from the standard input" |
07432cef | 4143 | msgstr "从标准输入读取路径列表" |
ef317cd5 | 4144 | |
276ceeaa | 4145 | #: builtin/checkout-index.c:173 |
ef317cd5 | 4146 | msgid "write the content to temporary files" |
07432cef | 4147 | msgstr "将内容写入临时文件" |
ef317cd5 | 4148 | |
276ceeaa JX |
4149 | #: builtin/checkout-index.c:174 builtin/column.c:30 |
4150 | #: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 | |
94550ed3 | 4151 | #: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 |
ef317cd5 | 4152 | msgid "string" |
07432cef | 4153 | msgstr "字符串" |
ef317cd5 | 4154 | |
276ceeaa | 4155 | #: builtin/checkout-index.c:175 |
ef317cd5 | 4156 | msgid "when creating files, prepend <string>" |
4375c10e | 4157 | msgstr "在创建文件时,在前面加上 <字符串>" |
ef317cd5 | 4158 | |
276ceeaa | 4159 | #: builtin/checkout-index.c:177 |
ef317cd5 | 4160 | msgid "copy out the files from named stage" |
07432cef | 4161 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 | 4162 | |
1b7f4a34 | 4163 | #: builtin/checkout.c:25 |
814ff314 JX |
4164 | msgid "git checkout [<options>] <branch>" |
4165 | msgstr "git checkout [<选项>] <分支>" | |
ef317cd5 | 4166 | |
1b7f4a34 | 4167 | #: builtin/checkout.c:26 |
814ff314 JX |
4168 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
4169 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." | |
ef317cd5 | 4170 | |
94550ed3 | 4171 | #: builtin/checkout.c:134 builtin/checkout.c:167 |
c04f5ac3 JX |
4172 | #, c-format |
4173 | msgid "path '%s' does not have our version" | |
4174 | msgstr "路径 '%s' 没有我们的版本" | |
4175 | ||
94550ed3 | 4176 | #: builtin/checkout.c:136 builtin/checkout.c:169 |
c04f5ac3 JX |
4177 | #, c-format |
4178 | msgid "path '%s' does not have their version" | |
4179 | msgstr "路径 '%s' 没有他们的版本" | |
4180 | ||
94550ed3 | 4181 | #: builtin/checkout.c:152 |
c04f5ac3 JX |
4182 | #, c-format |
4183 | msgid "path '%s' does not have all necessary versions" | |
4184 | msgstr "路径 '%s' 没有全部必须的版本" | |
4185 | ||
94550ed3 | 4186 | #: builtin/checkout.c:196 |
c04f5ac3 JX |
4187 | #, c-format |
4188 | msgid "path '%s' does not have necessary versions" | |
4189 | msgstr "路径 '%s' 没有必须的版本" | |
4190 | ||
94550ed3 | 4191 | #: builtin/checkout.c:213 |
c04f5ac3 JX |
4192 | #, c-format |
4193 | msgid "path '%s': cannot merge" | |
90e6ef53 | 4194 | msgstr "path '%s':无法合并" |
c04f5ac3 | 4195 | |
94550ed3 | 4196 | #: builtin/checkout.c:230 |
c04f5ac3 JX |
4197 | #, c-format |
4198 | msgid "Unable to add merge result for '%s'" | |
4199 | msgstr "无法为 '%s' 添加合并结果" | |
4200 | ||
94550ed3 JX |
4201 | #: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 |
4202 | #: builtin/checkout.c:260 | |
07432cef | 4203 | #, c-format |
ef317cd5 | 4204 | msgid "'%s' cannot be used with updating paths" |
07432cef | 4205 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 4206 | |
94550ed3 | 4207 | #: builtin/checkout.c:263 builtin/checkout.c:266 |
07432cef | 4208 | #, c-format |
ef317cd5 | 4209 | msgid "'%s' cannot be used with %s" |
07432cef | 4210 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 4211 | |
94550ed3 | 4212 | #: builtin/checkout.c:269 |
ef317cd5 JX |
4213 | #, c-format |
4214 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 4215 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 4216 | |
94550ed3 | 4217 | #: builtin/checkout.c:280 builtin/checkout.c:474 |
c04f5ac3 | 4218 | msgid "corrupt index file" |
90e6ef53 | 4219 | msgstr "损坏的索引文件" |
c04f5ac3 | 4220 | |
94550ed3 | 4221 | #: builtin/checkout.c:340 builtin/checkout.c:347 |
c04f5ac3 JX |
4222 | #, c-format |
4223 | msgid "path '%s' is unmerged" | |
4224 | msgstr "路径 '%s' 未合并" | |
4225 | ||
94550ed3 | 4226 | #: builtin/checkout.c:496 |
c04f5ac3 | 4227 | msgid "you need to resolve your current index first" |
90e6ef53 | 4228 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 4229 | |
94550ed3 | 4230 | #: builtin/checkout.c:623 |
c04f5ac3 | 4231 | #, c-format |
1b7f4a34 JX |
4232 | msgid "Can not do reflog for '%s': %s\n" |
4233 | msgstr "不能对 '%s' 执行 reflog 操作:%s\n" | |
c04f5ac3 | 4234 | |
94550ed3 | 4235 | #: builtin/checkout.c:661 |
c04f5ac3 JX |
4236 | msgid "HEAD is now at" |
4237 | msgstr "HEAD 目前位于" | |
4238 | ||
276ceeaa | 4239 | #: builtin/checkout.c:669 |
c04f5ac3 JX |
4240 | #, c-format |
4241 | msgid "Reset branch '%s'\n" | |
4242 | msgstr "重置分支 '%s'\n" | |
4243 | ||
276ceeaa | 4244 | #: builtin/checkout.c:672 |
c04f5ac3 JX |
4245 | #, c-format |
4246 | msgid "Already on '%s'\n" | |
4247 | msgstr "已经位于 '%s'\n" | |
4248 | ||
276ceeaa | 4249 | #: builtin/checkout.c:676 |
c04f5ac3 JX |
4250 | #, c-format |
4251 | msgid "Switched to and reset branch '%s'\n" | |
4252 | msgstr "切换并重置分支 '%s'\n" | |
4253 | ||
276ceeaa | 4254 | #: builtin/checkout.c:678 builtin/checkout.c:1068 |
c04f5ac3 JX |
4255 | #, c-format |
4256 | msgid "Switched to a new branch '%s'\n" | |
4257 | msgstr "切换到一个新分支 '%s'\n" | |
4258 | ||
276ceeaa | 4259 | #: builtin/checkout.c:680 |
c04f5ac3 JX |
4260 | #, c-format |
4261 | msgid "Switched to branch '%s'\n" | |
4262 | msgstr "切换到分支 '%s'\n" | |
4263 | ||
90e6ef53 | 4264 | # 译者:注意保持前导空格 |
276ceeaa | 4265 | #: builtin/checkout.c:732 |
c04f5ac3 JX |
4266 | #, c-format |
4267 | msgid " ... and %d more.\n" | |
90e6ef53 | 4268 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 | 4269 | |
276ceeaa | 4270 | #: builtin/checkout.c:738 |
c04f5ac3 JX |
4271 | #, c-format |
4272 | msgid "" | |
4273 | "Warning: you are leaving %d commit behind, not connected to\n" | |
4274 | "any of your branches:\n" | |
4275 | "\n" | |
4276 | "%s\n" | |
4277 | msgid_plural "" | |
4278 | "Warning: you are leaving %d commits behind, not connected to\n" | |
4279 | "any of your branches:\n" | |
4280 | "\n" | |
4281 | "%s\n" | |
4282 | msgstr[0] "" | |
4283 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
4284 | "\n" | |
4285 | "%s\n" | |
5ae481e0 JX |
4286 | msgstr[1] "" |
4287 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
4288 | "\n" | |
4289 | "%s\n" | |
c04f5ac3 | 4290 | |
276ceeaa | 4291 | #: builtin/checkout.c:757 |
c04f5ac3 JX |
4292 | #, c-format |
4293 | msgid "" | |
7aea43ff JX |
4294 | "If you want to keep it by creating a new branch, this may be a good time\n" |
4295 | "to do so with:\n" | |
4296 | "\n" | |
4297 | " git branch <new-branch-name> %s\n" | |
4298 | "\n" | |
4299 | msgid_plural "" | |
c04f5ac3 JX |
4300 | "If you want to keep them by creating a new branch, this may be a good time\n" |
4301 | "to do so with:\n" | |
4302 | "\n" | |
814ff314 | 4303 | " git branch <new-branch-name> %s\n" |
c04f5ac3 | 4304 | "\n" |
7aea43ff JX |
4305 | msgstr[0] "" |
4306 | "如果您想要通过创建新分支保存它,这可能是一个好时候。\n" | |
4307 | "如下操作:\n" | |
4308 | "\n" | |
4309 | " git branch <新分支名> %s\n" | |
4310 | "\n" | |
4311 | msgstr[1] "" | |
4312 | "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n" | |
c04f5ac3 JX |
4313 | "如下操作:\n" |
4314 | "\n" | |
814ff314 | 4315 | " git branch <新分支名> %s\n" |
c04f5ac3 JX |
4316 | "\n" |
4317 | ||
276ceeaa | 4318 | #: builtin/checkout.c:793 |
c04f5ac3 JX |
4319 | msgid "internal error in revision walk" |
4320 | msgstr "在版本遍历时遇到内部错误" | |
4321 | ||
276ceeaa | 4322 | #: builtin/checkout.c:797 |
c04f5ac3 JX |
4323 | msgid "Previous HEAD position was" |
4324 | msgstr "之前的 HEAD 位置是" | |
4325 | ||
276ceeaa | 4326 | #: builtin/checkout.c:824 builtin/checkout.c:1063 |
c04f5ac3 | 4327 | msgid "You are on a branch yet to be born" |
90e6ef53 | 4328 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 4329 | |
276ceeaa | 4330 | #: builtin/checkout.c:969 |
90314792 JX |
4331 | #, c-format |
4332 | msgid "only one reference expected, %d given." | |
4333 | msgstr "只要一个引用,却给出了 %d 个" | |
4334 | ||
276ceeaa | 4335 | #: builtin/checkout.c:1009 builtin/worktree.c:211 |
c04f5ac3 JX |
4336 | #, c-format |
4337 | msgid "invalid reference: %s" | |
4338 | msgstr "无效引用:%s" | |
4339 | ||
276ceeaa | 4340 | #: builtin/checkout.c:1038 |
c04f5ac3 JX |
4341 | #, c-format |
4342 | msgid "reference is not a tree: %s" | |
4343 | msgstr "引用不是一个树:%s" | |
4344 | ||
276ceeaa | 4345 | #: builtin/checkout.c:1077 |
ef317cd5 | 4346 | msgid "paths cannot be used with switching branches" |
07432cef | 4347 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 4348 | |
276ceeaa | 4349 | #: builtin/checkout.c:1080 builtin/checkout.c:1084 |
07432cef | 4350 | #, c-format |
ef317cd5 | 4351 | msgid "'%s' cannot be used with switching branches" |
07432cef | 4352 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 4353 | |
276ceeaa JX |
4354 | #: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 |
4355 | #: builtin/checkout.c:1099 | |
07432cef | 4356 | #, c-format |
ef317cd5 | 4357 | msgid "'%s' cannot be used with '%s'" |
07432cef | 4358 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 4359 | |
276ceeaa | 4360 | #: builtin/checkout.c:1104 |
07432cef | 4361 | #, c-format |
ef317cd5 | 4362 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 4363 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 4364 | |
276ceeaa JX |
4365 | #: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 |
4366 | #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 | |
4367 | #: builtin/worktree.c:320 | |
ef317cd5 | 4368 | msgid "branch" |
07432cef | 4369 | msgstr "分支" |
c04f5ac3 | 4370 | |
276ceeaa | 4371 | #: builtin/checkout.c:1138 |
ef317cd5 | 4372 | msgid "create and checkout a new branch" |
07432cef | 4373 | msgstr "创建并检出一个新的分支" |
c04f5ac3 | 4374 | |
276ceeaa | 4375 | #: builtin/checkout.c:1140 |
ef317cd5 | 4376 | msgid "create/reset and checkout a branch" |
07432cef | 4377 | msgstr "创建/重置并检出一个分支" |
c04f5ac3 | 4378 | |
276ceeaa | 4379 | #: builtin/checkout.c:1141 |
ef317cd5 | 4380 | msgid "create reflog for new branch" |
07432cef | 4381 | msgstr "为新的分支创建引用日志" |
ef317cd5 | 4382 | |
276ceeaa | 4383 | #: builtin/checkout.c:1142 |
ef317cd5 | 4384 | msgid "detach the HEAD at named commit" |
07432cef | 4385 | msgstr "成为指向该提交的分离头指针" |
ef317cd5 | 4386 | |
276ceeaa | 4387 | #: builtin/checkout.c:1143 |
ef317cd5 | 4388 | msgid "set upstream info for new branch" |
07432cef | 4389 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 4390 | |
276ceeaa | 4391 | #: builtin/checkout.c:1145 |
6c94aba5 | 4392 | msgid "new-branch" |
07432cef | 4393 | msgstr "新分支" |
ef317cd5 | 4394 | |
276ceeaa | 4395 | #: builtin/checkout.c:1145 |
ef317cd5 | 4396 | msgid "new unparented branch" |
07432cef | 4397 | msgstr "新的没有父提交的分支" |
ef317cd5 | 4398 | |
276ceeaa | 4399 | #: builtin/checkout.c:1146 |
ef317cd5 | 4400 | msgid "checkout our version for unmerged files" |
07432cef | 4401 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 4402 | |
276ceeaa | 4403 | #: builtin/checkout.c:1148 |
ef317cd5 | 4404 | msgid "checkout their version for unmerged files" |
07432cef | 4405 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 4406 | |
276ceeaa | 4407 | #: builtin/checkout.c:1150 |
ef317cd5 | 4408 | msgid "force checkout (throw away local modifications)" |
07432cef | 4409 | msgstr "强制检出(丢弃本地修改)" |
c04f5ac3 | 4410 | |
276ceeaa | 4411 | #: builtin/checkout.c:1151 |
ef317cd5 | 4412 | msgid "perform a 3-way merge with the new branch" |
160fb2b2 | 4413 | msgstr "和新的分支执行三方合并" |
ef317cd5 | 4414 | |
276ceeaa | 4415 | #: builtin/checkout.c:1152 builtin/merge.c:227 |
ef317cd5 | 4416 | msgid "update ignored files (default)" |
07432cef | 4417 | msgstr "更新忽略的文件(默认)" |
c04f5ac3 | 4418 | |
276ceeaa | 4419 | #: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 |
ef317cd5 | 4420 | msgid "style" |
07432cef | 4421 | msgstr "风格" |
ef317cd5 | 4422 | |
276ceeaa | 4423 | #: builtin/checkout.c:1154 |
ef317cd5 | 4424 | msgid "conflict style (merge or diff3)" |
07432cef | 4425 | msgstr "冲突输出风格(merge 或 diff3)" |
ef317cd5 | 4426 | |
276ceeaa | 4427 | #: builtin/checkout.c:1157 |
4dcdc3d8 JX |
4428 | msgid "do not limit pathspecs to sparse entries only" |
4429 | msgstr "对路径不做稀疏检出的限制" | |
4430 | ||
276ceeaa | 4431 | #: builtin/checkout.c:1159 |
814ff314 JX |
4432 | msgid "second guess 'git checkout <no-such-branch>'" |
4433 | msgstr "二次猜测'git checkout <无此分支>'" | |
ef317cd5 | 4434 | |
276ceeaa | 4435 | #: builtin/checkout.c:1161 |
7aea43ff JX |
4436 | msgid "do not check if another worktree is holding the given ref" |
4437 | msgstr "不检查指定的引用是否被其他工作区所占用" | |
4438 | ||
276ceeaa JX |
4439 | #: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 |
4440 | #: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 | |
94550ed3 JX |
4441 | #: builtin/send-pack.c:168 |
4442 | msgid "force progress reporting" | |
4443 | msgstr "强制显示进度报告" | |
4444 | ||
276ceeaa | 4445 | #: builtin/checkout.c:1193 |
ef317cd5 | 4446 | msgid "-b, -B and --orphan are mutually exclusive" |
07432cef | 4447 | msgstr "-b、-B 和 --orphan 是互斥的" |
ef317cd5 | 4448 | |
276ceeaa | 4449 | #: builtin/checkout.c:1210 |
ef317cd5 JX |
4450 | msgid "--track needs a branch name" |
4451 | msgstr "--track 需要一个分支名" | |
4452 | ||
276ceeaa | 4453 | #: builtin/checkout.c:1215 |
ef317cd5 JX |
4454 | msgid "Missing branch name; try -b" |
4455 | msgstr "缺少分支名;尝试 -b" | |
4456 | ||
276ceeaa | 4457 | #: builtin/checkout.c:1251 |
c04f5ac3 | 4458 | msgid "invalid path specification" |
90e6ef53 | 4459 | msgstr "无效的路径规格" |
c04f5ac3 | 4460 | |
276ceeaa | 4461 | #: builtin/checkout.c:1258 |
07432cef | 4462 | #, c-format |
c04f5ac3 | 4463 | msgid "" |
ef317cd5 | 4464 | "Cannot update paths and switch to branch '%s' at the same time.\n" |
c04f5ac3 JX |
4465 | "Did you intend to checkout '%s' which can not be resolved as commit?" |
4466 | msgstr "" | |
07432cef WS |
4467 | "不能同时更新路径并切换到分支'%s'。\n" |
4468 | "您是想要检出 '%s' 但其未能解析为提交么?" | |
c04f5ac3 | 4469 | |
276ceeaa | 4470 | #: builtin/checkout.c:1263 |
07432cef | 4471 | #, c-format |
ef317cd5 | 4472 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 4473 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 4474 | |
276ceeaa | 4475 | #: builtin/checkout.c:1267 |
c04f5ac3 JX |
4476 | msgid "" |
4477 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
4478 | "checking out of the index." | |
4479 | msgstr "" | |
90e6ef53 | 4480 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 4481 | |
1b7f4a34 | 4482 | #: builtin/clean.c:25 |
2e8451e8 JX |
4483 | msgid "" |
4484 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
4485 | msgstr "" | |
4486 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 4487 | |
1b7f4a34 | 4488 | #: builtin/clean.c:29 |
07432cef WS |
4489 | #, c-format |
4490 | msgid "Removing %s\n" | |
4491 | msgstr "正删除 %s\n" | |
4492 | ||
1b7f4a34 | 4493 | #: builtin/clean.c:30 |
07432cef WS |
4494 | #, c-format |
4495 | msgid "Would remove %s\n" | |
4496 | msgstr "将删除 %s\n" | |
4497 | ||
1b7f4a34 | 4498 | #: builtin/clean.c:31 |
07432cef WS |
4499 | #, c-format |
4500 | msgid "Skipping repository %s\n" | |
160fb2b2 | 4501 | msgstr "忽略仓库 %s\n" |
07432cef | 4502 | |
1b7f4a34 | 4503 | #: builtin/clean.c:32 |
07432cef WS |
4504 | #, c-format |
4505 | msgid "Would skip repository %s\n" | |
160fb2b2 | 4506 | msgstr "将忽略仓库 %s\n" |
07432cef | 4507 | |
1b7f4a34 | 4508 | #: builtin/clean.c:33 |
07432cef WS |
4509 | #, c-format |
4510 | msgid "failed to remove %s" | |
4511 | msgstr "无法删除 %s" | |
4512 | ||
276ceeaa | 4513 | #: builtin/clean.c:291 |
2e8451e8 JX |
4514 | msgid "" |
4515 | "Prompt help:\n" | |
4516 | "1 - select a numbered item\n" | |
4517 | "foo - select item based on unique prefix\n" | |
4518 | " - (empty) select nothing" | |
4519 | msgstr "" | |
4520 | "帮助:\n" | |
4521 | "1 - 通过编号选择一个选项\n" | |
4522 | "foo - 通过标题选择一个选项\n" | |
4523 | " - (空)什么也不选择" | |
4524 | ||
276ceeaa | 4525 | #: builtin/clean.c:295 |
2e8451e8 JX |
4526 | msgid "" |
4527 | "Prompt help:\n" | |
4528 | "1 - select a single item\n" | |
4529 | "3-5 - select a range of items\n" | |
4530 | "2-3,6-9 - select multiple ranges\n" | |
4531 | "foo - select item based on unique prefix\n" | |
4532 | "-... - unselect specified items\n" | |
4533 | "* - choose all items\n" | |
4534 | " - (empty) finish selecting" | |
4535 | msgstr "" | |
4536 | "帮助:\n" | |
4537 | "1 - 选择一个选项\n" | |
4538 | "3-5 - 选择一个范围内的所有选项\n" | |
4539 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
4540 | "foo - 通过标题选择一个选项\n" | |
4541 | "-... - 反选特定的选项\n" | |
4542 | "* - 选择所有选项\n" | |
4543 | " - (空)结束选择" | |
4544 | ||
276ceeaa | 4545 | #: builtin/clean.c:511 |
2e8451e8 JX |
4546 | #, c-format |
4547 | msgid "Huh (%s)?" | |
4548 | msgstr "嗯(%s)?" | |
4549 | ||
276ceeaa | 4550 | #: builtin/clean.c:653 |
2e8451e8 JX |
4551 | #, c-format |
4552 | msgid "Input ignore patterns>> " | |
4553 | msgstr "输入模版以排除条目>> " | |
4554 | ||
276ceeaa | 4555 | #: builtin/clean.c:690 |
2e8451e8 JX |
4556 | #, c-format |
4557 | msgid "WARNING: Cannot find items matched by: %s" | |
4558 | msgstr "警告:无法找到和 %s 匹配的条目" | |
4559 | ||
276ceeaa | 4560 | #: builtin/clean.c:711 |
2e8451e8 JX |
4561 | msgid "Select items to delete" |
4562 | msgstr "选择要删除的条目" | |
4563 | ||
814ff314 | 4564 | #. TRANSLATORS: Make sure to keep [y/N] as is |
276ceeaa | 4565 | #: builtin/clean.c:752 |
2e8451e8 | 4566 | #, c-format |
814ff314 JX |
4567 | msgid "Remove %s [y/N]? " |
4568 | msgstr "删除 %s [y/N]?" | |
2e8451e8 | 4569 | |
276ceeaa | 4570 | #: builtin/clean.c:777 |
2e8451e8 JX |
4571 | msgid "Bye." |
4572 | msgstr "再见。" | |
4573 | ||
276ceeaa | 4574 | #: builtin/clean.c:785 |
2e8451e8 JX |
4575 | msgid "" |
4576 | "clean - start cleaning\n" | |
4577 | "filter by pattern - exclude items from deletion\n" | |
4578 | "select by numbers - select items to be deleted by numbers\n" | |
4579 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
4580 | "quit - stop cleaning\n" | |
4581 | "help - this screen\n" | |
4582 | "? - help for prompt selection" | |
4583 | msgstr "" | |
4584 | "clean - 开始清理\n" | |
4585 | "filter by pattern - 通过模版排除要删除的条目\n" | |
4586 | "select by numbers - 通过数字选择要删除的条目\n" | |
4587 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
4588 | "quit - 停止删除并退出\n" | |
4589 | "help - 显示本帮助\n" | |
4590 | "? - 显示如何在提示符下选择的帮助" | |
4591 | ||
276ceeaa | 4592 | #: builtin/clean.c:812 |
2e8451e8 JX |
4593 | msgid "*** Commands ***" |
4594 | msgstr "*** 命令 ***" | |
4595 | ||
276ceeaa | 4596 | #: builtin/clean.c:813 |
2e8451e8 JX |
4597 | msgid "What now" |
4598 | msgstr "请选择" | |
4599 | ||
276ceeaa | 4600 | #: builtin/clean.c:821 |
2e8451e8 JX |
4601 | msgid "Would remove the following item:" |
4602 | msgid_plural "Would remove the following items:" | |
4603 | msgstr[0] "将删除如下条目:" | |
4604 | msgstr[1] "将删除如下条目:" | |
4605 | ||
276ceeaa | 4606 | #: builtin/clean.c:838 |
2e8451e8 JX |
4607 | msgid "No more files to clean, exiting." |
4608 | msgstr "没有要清理的文件,退出。" | |
4609 | ||
276ceeaa | 4610 | #: builtin/clean.c:869 |
ef317cd5 | 4611 | msgid "do not print names of files removed" |
07432cef | 4612 | msgstr "不打印删除文件的名称" |
ef317cd5 | 4613 | |
276ceeaa | 4614 | #: builtin/clean.c:871 |
ef317cd5 | 4615 | msgid "force" |
07432cef | 4616 | msgstr "强制" |
ef317cd5 | 4617 | |
276ceeaa | 4618 | #: builtin/clean.c:872 |
2e8451e8 JX |
4619 | msgid "interactive cleaning" |
4620 | msgstr "交互式清除" | |
4621 | ||
276ceeaa | 4622 | #: builtin/clean.c:874 |
ef317cd5 | 4623 | msgid "remove whole directories" |
07432cef | 4624 | msgstr "删除整个目录" |
ef317cd5 | 4625 | |
276ceeaa JX |
4626 | #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 |
4627 | #: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 | |
ef317cd5 | 4628 | msgid "pattern" |
07432cef | 4629 | msgstr "模式" |
ef317cd5 | 4630 | |
276ceeaa | 4631 | #: builtin/clean.c:876 |
ef317cd5 | 4632 | msgid "add <pattern> to ignore rules" |
4375c10e | 4633 | msgstr "添加 <模式> 到忽略规则" |
ef317cd5 | 4634 | |
276ceeaa | 4635 | #: builtin/clean.c:877 |
ef317cd5 | 4636 | msgid "remove ignored files, too" |
07432cef | 4637 | msgstr "也删除忽略的文件" |
ef317cd5 | 4638 | |
276ceeaa | 4639 | #: builtin/clean.c:879 |
ef317cd5 | 4640 | msgid "remove only ignored files" |
07432cef | 4641 | msgstr "只删除忽略的文件" |
c04f5ac3 | 4642 | |
276ceeaa | 4643 | #: builtin/clean.c:897 |
c04f5ac3 | 4644 | msgid "-x and -X cannot be used together" |
649900bc | 4645 | msgstr "-x 和 -X 不能同时使用" |
c04f5ac3 | 4646 | |
276ceeaa | 4647 | #: builtin/clean.c:901 |
c04f5ac3 | 4648 | msgid "" |
6c94aba5 | 4649 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
2e8451e8 | 4650 | "clean" |
c04f5ac3 | 4651 | msgstr "" |
2e8451e8 | 4652 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 4653 | |
276ceeaa | 4654 | #: builtin/clean.c:904 |
c04f5ac3 | 4655 | msgid "" |
6c94aba5 | 4656 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
2e8451e8 | 4657 | "refusing to clean" |
c04f5ac3 | 4658 | msgstr "" |
2e8451e8 | 4659 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 4660 | |
220c313c | 4661 | #: builtin/clone.c:37 |
814ff314 | 4662 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
160fb2b2 | 4663 | msgstr "git clone [<选项>] [--] <仓库> [<路径>]" |
ef317cd5 | 4664 | |
276ceeaa | 4665 | #: builtin/clone.c:60 |
ef317cd5 | 4666 | msgid "don't create a checkout" |
07432cef | 4667 | msgstr "不创建一个检出" |
ef317cd5 | 4668 | |
276ceeaa | 4669 | #: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 |
ef317cd5 | 4670 | msgid "create a bare repository" |
160fb2b2 | 4671 | msgstr "创建一个纯仓库" |
ef317cd5 | 4672 | |
276ceeaa | 4673 | #: builtin/clone.c:65 |
ef317cd5 | 4674 | msgid "create a mirror repository (implies bare)" |
160fb2b2 | 4675 | msgstr "创建一个镜像仓库(也是纯仓库)" |
ef317cd5 | 4676 | |
276ceeaa | 4677 | #: builtin/clone.c:67 |
ef317cd5 | 4678 | msgid "to clone from a local repository" |
160fb2b2 | 4679 | msgstr "从本地仓库克隆" |
ef317cd5 | 4680 | |
276ceeaa | 4681 | #: builtin/clone.c:69 |
ef317cd5 | 4682 | msgid "don't use local hardlinks, always copy" |
07432cef | 4683 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 4684 | |
276ceeaa | 4685 | #: builtin/clone.c:71 |
ef317cd5 | 4686 | msgid "setup as shared repository" |
160fb2b2 | 4687 | msgstr "设置为共享仓库" |
ef317cd5 | 4688 | |
276ceeaa | 4689 | #: builtin/clone.c:73 builtin/clone.c:75 |
ef317cd5 | 4690 | msgid "initialize submodules in the clone" |
07432cef | 4691 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 4692 | |
276ceeaa | 4693 | #: builtin/clone.c:76 builtin/init-db.c:466 |
ef317cd5 | 4694 | msgid "template-directory" |
07432cef | 4695 | msgstr "模板目录" |
ef317cd5 | 4696 | |
276ceeaa | 4697 | #: builtin/clone.c:77 builtin/init-db.c:467 |
ef317cd5 | 4698 | msgid "directory from which templates will be used" |
07432cef | 4699 | msgstr "模板目录将被使用" |
ef317cd5 | 4700 | |
276ceeaa | 4701 | #: builtin/clone.c:79 builtin/submodule--helper.c:173 |
ef317cd5 | 4702 | msgid "reference repository" |
160fb2b2 | 4703 | msgstr "参考仓库" |
ef317cd5 | 4704 | |
276ceeaa | 4705 | #: builtin/clone.c:81 |
7aea43ff | 4706 | msgid "use --reference only while cloning" |
160fb2b2 | 4707 | msgstr "仅在克隆时参考 --reference 指向的本地仓库" |
7aea43ff | 4708 | |
276ceeaa | 4709 | #: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 |
ef317cd5 | 4710 | msgid "name" |
07432cef | 4711 | msgstr "名称" |
ef317cd5 | 4712 | |
276ceeaa | 4713 | #: builtin/clone.c:83 |
ef317cd5 | 4714 | msgid "use <name> instead of 'origin' to track upstream" |
4375c10e | 4715 | msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" |
ef317cd5 | 4716 | |
276ceeaa | 4717 | #: builtin/clone.c:85 |
ef317cd5 | 4718 | msgid "checkout <branch> instead of the remote's HEAD" |
4375c10e | 4719 | msgstr "检出 <分支> 而不是远程 HEAD" |
ef317cd5 | 4720 | |
276ceeaa | 4721 | #: builtin/clone.c:87 |
ef317cd5 | 4722 | msgid "path to git-upload-pack on the remote" |
07432cef | 4723 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 4724 | |
276ceeaa JX |
4725 | #: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 |
4726 | #: builtin/pull.c:193 | |
ef317cd5 | 4727 | msgid "depth" |
07432cef | 4728 | msgstr "深度" |
ef317cd5 | 4729 | |
276ceeaa | 4730 | #: builtin/clone.c:89 |
ef317cd5 | 4731 | msgid "create a shallow clone of that depth" |
07432cef | 4732 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 4733 | |
276ceeaa | 4734 | #: builtin/clone.c:91 |
ef317cd5 | 4735 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 4736 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 4737 | |
276ceeaa | 4738 | #: builtin/clone.c:92 builtin/init-db.c:475 |
ef317cd5 | 4739 | msgid "gitdir" |
07432cef | 4740 | msgstr "git目录" |
ef317cd5 | 4741 | |
276ceeaa | 4742 | #: builtin/clone.c:93 builtin/init-db.c:476 |
ef317cd5 | 4743 | msgid "separate git dir from working tree" |
07432cef | 4744 | msgstr "git目录和工作区分离" |
ef317cd5 | 4745 | |
276ceeaa | 4746 | #: builtin/clone.c:94 |
ef317cd5 | 4747 | msgid "key=value" |
07432cef | 4748 | msgstr "key=value" |
ef317cd5 | 4749 | |
276ceeaa | 4750 | #: builtin/clone.c:95 |
ef317cd5 | 4751 | msgid "set config inside the new repository" |
160fb2b2 | 4752 | msgstr "在新仓库中设置配置信息" |
ef317cd5 | 4753 | |
276ceeaa JX |
4754 | #: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 |
4755 | msgid "use IPv4 addresses only" | |
4756 | msgstr "只使用 IPv4 地址" | |
4757 | ||
4758 | #: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 | |
4759 | msgid "use IPv6 addresses only" | |
4760 | msgstr "只使用 IPv6 地址" | |
4761 | ||
4762 | #: builtin/clone.c:305 | |
94550ed3 JX |
4763 | #, c-format |
4764 | msgid "reference repository '%s' as a linked checkout is not supported yet." | |
4765 | msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" | |
4766 | ||
276ceeaa | 4767 | #: builtin/clone.c:307 |
c04f5ac3 | 4768 | #, c-format |
4dcdc3d8 | 4769 | msgid "reference repository '%s' is not a local repository." |
160fb2b2 | 4770 | msgstr "参考仓库 '%s' 不是一个本地仓库。" |
c04f5ac3 | 4771 | |
276ceeaa | 4772 | #: builtin/clone.c:312 |
cfff71a9 JX |
4773 | #, c-format |
4774 | msgid "reference repository '%s' is shallow" | |
160fb2b2 | 4775 | msgstr "参考仓库 '%s' 是一个浅克隆" |
cfff71a9 | 4776 | |
276ceeaa | 4777 | #: builtin/clone.c:315 |
cfff71a9 JX |
4778 | #, c-format |
4779 | msgid "reference repository '%s' is grafted" | |
160fb2b2 | 4780 | msgstr "参考仓库 '%s' 已被嫁接" |
cfff71a9 | 4781 | |
276ceeaa | 4782 | #: builtin/clone.c:380 builtin/diff.c:84 |
c04f5ac3 JX |
4783 | #, c-format |
4784 | msgid "failed to stat '%s'" | |
90e6ef53 | 4785 | msgstr "无法枚举 '%s' 状态" |
c04f5ac3 | 4786 | |
276ceeaa | 4787 | #: builtin/clone.c:382 |
c04f5ac3 JX |
4788 | #, c-format |
4789 | msgid "%s exists and is not a directory" | |
4790 | msgstr "%s 存在且不是一个目录" | |
4791 | ||
276ceeaa | 4792 | #: builtin/clone.c:396 |
c04f5ac3 JX |
4793 | #, c-format |
4794 | msgid "failed to stat %s\n" | |
90e6ef53 | 4795 | msgstr "无法枚举 %s 状态\n" |
c04f5ac3 | 4796 | |
276ceeaa | 4797 | #: builtin/clone.c:418 |
c04f5ac3 JX |
4798 | #, c-format |
4799 | msgid "failed to create link '%s'" | |
90e6ef53 | 4800 | msgstr "无法创建链接 '%s'" |
c04f5ac3 | 4801 | |
276ceeaa | 4802 | #: builtin/clone.c:422 |
c04f5ac3 JX |
4803 | #, c-format |
4804 | msgid "failed to copy file to '%s'" | |
90e6ef53 | 4805 | msgstr "无法拷贝文件至 '%s'" |
c04f5ac3 | 4806 | |
276ceeaa | 4807 | #: builtin/clone.c:447 builtin/clone.c:631 |
c04f5ac3 JX |
4808 | #, c-format |
4809 | msgid "done.\n" | |
4810 | msgstr "完成。\n" | |
4811 | ||
276ceeaa | 4812 | #: builtin/clone.c:459 |
1003b3a5 JX |
4813 | msgid "" |
4814 | "Clone succeeded, but checkout failed.\n" | |
4815 | "You can inspect what was checked out with 'git status'\n" | |
4816 | "and retry the checkout with 'git checkout -f HEAD'\n" | |
4817 | msgstr "" | |
4818 | "克隆成功,但是检出失败。\n" | |
4819 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
4820 | "'git checkout -f HEAD' 重试\n" | |
4821 | ||
276ceeaa | 4822 | #: builtin/clone.c:536 |
c04f5ac3 JX |
4823 | #, c-format |
4824 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 4825 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 4826 | |
276ceeaa | 4827 | #: builtin/clone.c:626 |
2e8451e8 JX |
4828 | #, c-format |
4829 | msgid "Checking connectivity... " | |
4830 | msgstr "检查连接... " | |
4831 | ||
276ceeaa | 4832 | #: builtin/clone.c:629 |
1003b3a5 JX |
4833 | msgid "remote did not send all necessary objects" |
4834 | msgstr "远程没有发送所有必须的对象" | |
4835 | ||
276ceeaa | 4836 | #: builtin/clone.c:696 |
c04f5ac3 JX |
4837 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
4838 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
4839 | ||
276ceeaa | 4840 | #: builtin/clone.c:727 |
1003b3a5 JX |
4841 | msgid "unable to checkout working tree" |
4842 | msgstr "不能检出工作区" | |
4843 | ||
276ceeaa | 4844 | #: builtin/clone.c:816 |
04cb2f28 JX |
4845 | msgid "cannot repack to clean up" |
4846 | msgstr "无法执行 repack 来清理" | |
4847 | ||
276ceeaa | 4848 | #: builtin/clone.c:818 |
04cb2f28 JX |
4849 | msgid "cannot unlink temporary alternates file" |
4850 | msgstr "无法删除临时的 alternates 文件" | |
4851 | ||
276ceeaa | 4852 | #: builtin/clone.c:850 |
c04f5ac3 JX |
4853 | msgid "Too many arguments." |
4854 | msgstr "太多参数。" | |
4855 | ||
276ceeaa | 4856 | #: builtin/clone.c:854 |
c04f5ac3 | 4857 | msgid "You must specify a repository to clone." |
160fb2b2 | 4858 | msgstr "您必须指定一个仓库来克隆。" |
c04f5ac3 | 4859 | |
276ceeaa | 4860 | #: builtin/clone.c:865 |
c04f5ac3 JX |
4861 | #, c-format |
4862 | msgid "--bare and --origin %s options are incompatible." | |
4863 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
4864 | ||
276ceeaa | 4865 | #: builtin/clone.c:868 |
07432cef WS |
4866 | msgid "--bare and --separate-git-dir are incompatible." |
4867 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
4868 | ||
276ceeaa | 4869 | #: builtin/clone.c:881 |
c04f5ac3 JX |
4870 | #, c-format |
4871 | msgid "repository '%s' does not exist" | |
160fb2b2 | 4872 | msgstr "仓库 '%s' 不存在" |
c04f5ac3 | 4873 | |
276ceeaa | 4874 | #: builtin/clone.c:887 builtin/fetch.c:1174 |
cfff71a9 JX |
4875 | #, c-format |
4876 | msgid "depth %s is not a positive number" | |
4877 | msgstr "深度 %s 不是一个正数" | |
4878 | ||
276ceeaa | 4879 | #: builtin/clone.c:897 |
c04f5ac3 JX |
4880 | #, c-format |
4881 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 4882 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 4883 | |
276ceeaa | 4884 | #: builtin/clone.c:907 |
c04f5ac3 JX |
4885 | #, c-format |
4886 | msgid "working tree '%s' already exists." | |
4887 | msgstr "工作区 '%s' 已经存在。" | |
4888 | ||
276ceeaa JX |
4889 | #: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 |
4890 | #: builtin/worktree.c:219 builtin/worktree.c:246 | |
5bb01d4f JX |
4891 | #, c-format |
4892 | msgid "could not create leading directories of '%s'" | |
4893 | msgstr "不能为 '%s' 创建先导目录" | |
4894 | ||
276ceeaa | 4895 | #: builtin/clone.c:925 |
c04f5ac3 | 4896 | #, c-format |
814ff314 JX |
4897 | msgid "could not create work tree dir '%s'" |
4898 | msgstr "不能创建工作区目录 '%s'" | |
c04f5ac3 | 4899 | |
276ceeaa | 4900 | #: builtin/clone.c:943 |
c04f5ac3 JX |
4901 | #, c-format |
4902 | msgid "Cloning into bare repository '%s'...\n" | |
160fb2b2 | 4903 | msgstr "克隆到纯仓库 '%s'...\n" |
c04f5ac3 | 4904 | |
276ceeaa | 4905 | #: builtin/clone.c:945 |
c04f5ac3 JX |
4906 | #, c-format |
4907 | msgid "Cloning into '%s'...\n" | |
4908 | msgstr "正克隆到 '%s'...\n" | |
4909 | ||
276ceeaa | 4910 | #: builtin/clone.c:984 |
6acbf033 JX |
4911 | msgid "--depth is ignored in local clones; use file:// instead." |
4912 | msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。" | |
4913 | ||
276ceeaa | 4914 | #: builtin/clone.c:987 |
6acbf033 | 4915 | msgid "source repository is shallow, ignoring --local" |
160fb2b2 | 4916 | msgstr "源仓库是浅克隆,忽略 --local" |
6acbf033 | 4917 | |
276ceeaa | 4918 | #: builtin/clone.c:992 |
6acbf033 JX |
4919 | msgid "--local is ignored" |
4920 | msgstr "--local 被忽略" | |
4921 | ||
276ceeaa | 4922 | #: builtin/clone.c:996 |
c04f5ac3 JX |
4923 | #, c-format |
4924 | msgid "Don't know how to clone %s" | |
4925 | msgstr "不知道如何克隆 %s" | |
4926 | ||
276ceeaa | 4927 | #: builtin/clone.c:1045 builtin/clone.c:1053 |
c04f5ac3 JX |
4928 | #, c-format |
4929 | msgid "Remote branch %s not found in upstream %s" | |
4930 | msgstr "远程分支 %s 在上游 %s 未发现" | |
4931 | ||
276ceeaa | 4932 | #: builtin/clone.c:1056 |
c04f5ac3 | 4933 | msgid "You appear to have cloned an empty repository." |
160fb2b2 | 4934 | msgstr "您似乎克隆了一个空仓库。" |
c04f5ac3 | 4935 | |
ef317cd5 | 4936 | #: builtin/column.c:9 |
814ff314 JX |
4937 | msgid "git column [<options>]" |
4938 | msgstr "git column [<选项>]" | |
ef317cd5 JX |
4939 | |
4940 | #: builtin/column.c:26 | |
4941 | msgid "lookup config vars" | |
07432cef | 4942 | msgstr "查找配置变量" |
ef317cd5 JX |
4943 | |
4944 | #: builtin/column.c:27 builtin/column.c:28 | |
ef317cd5 | 4945 | msgid "layout to use" |
07432cef | 4946 | msgstr "要使用的布局" |
ef317cd5 JX |
4947 | |
4948 | #: builtin/column.c:29 | |
4949 | msgid "Maximum width" | |
07432cef | 4950 | msgstr "最大宽度" |
ef317cd5 JX |
4951 | |
4952 | #: builtin/column.c:30 | |
4953 | msgid "Padding space on left border" | |
07432cef | 4954 | msgstr "左边框的填充空间" |
ef317cd5 JX |
4955 | |
4956 | #: builtin/column.c:31 | |
4957 | msgid "Padding space on right border" | |
07432cef | 4958 | msgstr "右边框的填充空间" |
ef317cd5 JX |
4959 | |
4960 | #: builtin/column.c:32 | |
4961 | msgid "Padding space between columns" | |
07432cef | 4962 | msgstr "两列之间的填充空间" |
ef317cd5 | 4963 | |
8ada9598 JX |
4964 | #: builtin/column.c:51 |
4965 | msgid "--command must be the first argument" | |
81809b99 | 4966 | msgstr "--command 必须是第一个参数" |
8ada9598 | 4967 | |
94550ed3 | 4968 | #: builtin/commit.c:38 |
814ff314 | 4969 | msgid "git commit [<options>] [--] <pathspec>..." |
160fb2b2 | 4970 | msgstr "git commit [<选项>] [--] <路径规格>..." |
ef317cd5 | 4971 | |
94550ed3 | 4972 | #: builtin/commit.c:43 |
814ff314 | 4973 | msgid "git status [<options>] [--] <pathspec>..." |
160fb2b2 | 4974 | msgstr "git status [<选项>] [--] <路径规格>..." |
ef317cd5 | 4975 | |
94550ed3 | 4976 | #: builtin/commit.c:48 |
220c313c JX |
4977 | msgid "" |
4978 | "Your name and email address were configured automatically based\n" | |
4979 | "on your username and hostname. Please check that they are accurate.\n" | |
4980 | "You can suppress this message by setting them explicitly. Run the\n" | |
4981 | "following command and follow the instructions in your editor to edit\n" | |
4982 | "your configuration file:\n" | |
4983 | "\n" | |
4984 | " git config --global --edit\n" | |
4985 | "\n" | |
4986 | "After doing this, you may fix the identity used for this commit with:\n" | |
4987 | "\n" | |
4988 | " git commit --amend --reset-author\n" | |
4989 | msgstr "" | |
4990 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
4991 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" | |
4992 | "中编辑您的配置文件:\n" | |
4993 | "\n" | |
4994 | " git config --global --edit\n" | |
4995 | "\n" | |
4996 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
4997 | "\n" | |
4998 | " git commit --amend --reset-author\n" | |
4999 | ||
94550ed3 | 5000 | #: builtin/commit.c:61 |
c04f5ac3 JX |
5001 | msgid "" |
5002 | "Your name and email address were configured automatically based\n" | |
5003 | "on your username and hostname. Please check that they are accurate.\n" | |
5004 | "You can suppress this message by setting them explicitly:\n" | |
5005 | "\n" | |
5006 | " git config --global user.name \"Your Name\"\n" | |
5007 | " git config --global user.email you@example.com\n" | |
5008 | "\n" | |
5009 | "After doing this, you may fix the identity used for this commit with:\n" | |
5010 | "\n" | |
5011 | " git commit --amend --reset-author\n" | |
5012 | msgstr "" | |
90e6ef53 | 5013 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" |
220c313c | 5014 | "与否。您可以对其进行设置以免再出现本提示信息:\n" |
c04f5ac3 JX |
5015 | "\n" |
5016 | " git config --global user.name \"Your Name\"\n" | |
5017 | " git config --global user.email you@example.com\n" | |
5018 | "\n" | |
90e6ef53 | 5019 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" |
c04f5ac3 JX |
5020 | "\n" |
5021 | " git commit --amend --reset-author\n" | |
5022 | ||
94550ed3 | 5023 | #: builtin/commit.c:73 |
c04f5ac3 JX |
5024 | msgid "" |
5025 | "You asked to amend the most recent commit, but doing so would make\n" | |
5026 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
5027 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
5028 | msgstr "" | |
1b150dc9 T |
5029 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
5030 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 5031 | |
94550ed3 | 5032 | #: builtin/commit.c:78 |
c04f5ac3 JX |
5033 | msgid "" |
5034 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
5035 | "If you wish to commit it anyway, use:\n" | |
5036 | "\n" | |
5037 | " git commit --allow-empty\n" | |
5038 | "\n" | |
c04f5ac3 | 5039 | msgstr "" |
a9ce4543 T |
5040 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
5041 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
5042 | "\n" |
5043 | " git commit --allow-empty\n" | |
5044 | "\n" | |
c04f5ac3 | 5045 | |
94550ed3 | 5046 | #: builtin/commit.c:85 |
b1894384 JX |
5047 | msgid "Otherwise, please use 'git reset'\n" |
5048 | msgstr "否则,请使用命令 'git reset'\n" | |
5049 | ||
94550ed3 | 5050 | #: builtin/commit.c:88 |
b1894384 JX |
5051 | msgid "" |
5052 | "If you wish to skip this commit, use:\n" | |
5053 | "\n" | |
5054 | " git reset\n" | |
5055 | "\n" | |
5056 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" | |
5057 | "the remaining commits.\n" | |
5058 | msgstr "" | |
5059 | "如果您想跳过这个提交,使用命令:\n" | |
5060 | "\n" | |
5061 | " git reset\n" | |
5062 | "\n" | |
5063 | "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" | |
5064 | "操作。\n" | |
5065 | ||
94550ed3 | 5066 | #: builtin/commit.c:305 |
c04f5ac3 | 5067 | msgid "failed to unpack HEAD tree object" |
90e6ef53 | 5068 | msgstr "无法解包 HEAD 树对象" |
c04f5ac3 | 5069 | |
94550ed3 | 5070 | #: builtin/commit.c:346 |
c04f5ac3 | 5071 | msgid "unable to create temporary index" |
90e6ef53 | 5072 | msgstr "不能创建临时索引" |
c04f5ac3 | 5073 | |
94550ed3 | 5074 | #: builtin/commit.c:352 |
c04f5ac3 JX |
5075 | msgid "interactive add failed" |
5076 | msgstr "交互式添加失败" | |
5077 | ||
94550ed3 | 5078 | #: builtin/commit.c:365 |
220c313c JX |
5079 | msgid "unable to update temporary index" |
5080 | msgstr "无法更新临时索引" | |
5081 | ||
94550ed3 | 5082 | #: builtin/commit.c:367 |
220c313c JX |
5083 | msgid "Failed to update main cache tree" |
5084 | msgstr "不能更新树的主缓存" | |
5085 | ||
94550ed3 | 5086 | #: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 |
c04f5ac3 | 5087 | msgid "unable to write new_index file" |
90e6ef53 | 5088 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 5089 | |
94550ed3 | 5090 | #: builtin/commit.c:445 |
8ada9598 | 5091 | msgid "cannot do a partial commit during a merge." |
81809b99 | 5092 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 5093 | |
94550ed3 | 5094 | #: builtin/commit.c:447 |
8ada9598 | 5095 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 5096 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 5097 | |
94550ed3 | 5098 | #: builtin/commit.c:456 |
c04f5ac3 | 5099 | msgid "cannot read the index" |
90e6ef53 | 5100 | msgstr "无法读取索引" |
c04f5ac3 | 5101 | |
94550ed3 | 5102 | #: builtin/commit.c:475 |
c04f5ac3 | 5103 | msgid "unable to write temporary index file" |
90e6ef53 | 5104 | msgstr "无法写临时索引文件" |
c04f5ac3 | 5105 | |
94550ed3 | 5106 | #: builtin/commit.c:580 |
220c313c JX |
5107 | #, c-format |
5108 | msgid "commit '%s' lacks author header" | |
5109 | msgstr "提交 '%s' 缺少作者信息" | |
5110 | ||
94550ed3 | 5111 | #: builtin/commit.c:582 |
c04f5ac3 | 5112 | #, c-format |
220c313c JX |
5113 | msgid "commit '%s' has malformed author line" |
5114 | msgstr "提交 '%s' 有非法的作者信息" | |
c04f5ac3 | 5115 | |
94550ed3 | 5116 | #: builtin/commit.c:601 |
c04f5ac3 JX |
5117 | msgid "malformed --author parameter" |
5118 | msgstr "非法的 --author 参数" | |
5119 | ||
94550ed3 | 5120 | #: builtin/commit.c:609 |
c04f5ac3 | 5121 | #, c-format |
6acbf033 JX |
5122 | msgid "invalid date format: %s" |
5123 | msgstr "无效的日期格式:%s" | |
5124 | ||
94550ed3 | 5125 | #: builtin/commit.c:653 |
6acbf033 JX |
5126 | msgid "" |
5127 | "unable to select a comment character that is not used\n" | |
5128 | "in the current commit message" | |
5129 | msgstr "无法选择一个未被当前提交说明使用的注释字符" | |
5130 | ||
94550ed3 | 5131 | #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 |
c04f5ac3 JX |
5132 | #, c-format |
5133 | msgid "could not lookup commit %s" | |
5134 | msgstr "不能查询提交 %s" | |
5135 | ||
276ceeaa | 5136 | #: builtin/commit.c:702 builtin/shortlog.c:285 |
c04f5ac3 JX |
5137 | #, c-format |
5138 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 5139 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 5140 | |
94550ed3 | 5141 | #: builtin/commit.c:704 |
c04f5ac3 | 5142 | msgid "could not read log from standard input" |
90e6ef53 | 5143 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 5144 | |
94550ed3 | 5145 | #: builtin/commit.c:708 |
c04f5ac3 JX |
5146 | #, c-format |
5147 | msgid "could not read log file '%s'" | |
90e6ef53 | 5148 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 5149 | |
94550ed3 | 5150 | #: builtin/commit.c:730 |
c04f5ac3 | 5151 | msgid "could not read MERGE_MSG" |
90e6ef53 | 5152 | msgstr "不能读取 MERGE_MSG" |
c04f5ac3 | 5153 | |
94550ed3 | 5154 | #: builtin/commit.c:734 |
c04f5ac3 | 5155 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 5156 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 5157 | |
94550ed3 | 5158 | #: builtin/commit.c:785 |
c04f5ac3 | 5159 | msgid "could not write commit template" |
90e6ef53 | 5160 | msgstr "不能写提交模版" |
c04f5ac3 | 5161 | |
94550ed3 | 5162 | #: builtin/commit.c:803 |
81809b99 | 5163 | #, c-format |
c04f5ac3 JX |
5164 | msgid "" |
5165 | "\n" | |
8ada9598 | 5166 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
5167 | "If this is not correct, please remove the file\n" |
5168 | "\t%s\n" | |
5169 | "and try again.\n" | |
5170 | msgstr "" | |
5171 | "\n" | |
649900bc | 5172 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
5173 | "\t%s\n" |
5174 | "然后重试。\n" | |
5175 | ||
94550ed3 | 5176 | #: builtin/commit.c:808 |
81809b99 | 5177 | #, c-format |
8ada9598 JX |
5178 | msgid "" |
5179 | "\n" | |
5180 | "It looks like you may be committing a cherry-pick.\n" | |
5181 | "If this is not correct, please remove the file\n" | |
5182 | "\t%s\n" | |
5183 | "and try again.\n" | |
5184 | msgstr "" | |
5185 | "\n" | |
649900bc | 5186 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
5187 | "\t%s\n" |
5188 | "然后重试。\n" | |
c04f5ac3 | 5189 | |
94550ed3 | 5190 | #: builtin/commit.c:821 |
a77c07d9 | 5191 | #, c-format |
c04f5ac3 | 5192 | msgid "" |
8ada9598 | 5193 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 5194 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
c04f5ac3 | 5195 | msgstr "" |
a77c07d9 | 5196 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
81809b99 | 5197 | "说明将会终止提交。\n" |
c04f5ac3 | 5198 | |
94550ed3 | 5199 | #: builtin/commit.c:828 |
a77c07d9 | 5200 | #, c-format |
c04f5ac3 | 5201 | msgid "" |
8ada9598 | 5202 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 5203 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
c04f5ac3 JX |
5204 | "An empty message aborts the commit.\n" |
5205 | msgstr "" | |
a77c07d9 JX |
5206 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
5207 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 5208 | |
90e6ef53 | 5209 | # 译者:为保证在输出中对齐,注意调整句中空格! |
94550ed3 | 5210 | #: builtin/commit.c:848 |
6acbf033 JX |
5211 | #, c-format |
5212 | msgid "%sAuthor: %.*s <%.*s>" | |
5213 | msgstr "%s作者: %.*s <%.*s>" | |
5214 | ||
5215 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
94550ed3 | 5216 | #: builtin/commit.c:856 |
c04f5ac3 | 5217 | #, c-format |
6acbf033 JX |
5218 | msgid "%sDate: %s" |
5219 | msgstr "%s日期: %s" | |
c04f5ac3 | 5220 | |
90e6ef53 | 5221 | # 译者:为保证在输出中对齐,注意调整句中空格! |
94550ed3 | 5222 | #: builtin/commit.c:863 |
c04f5ac3 | 5223 | #, c-format |
6acbf033 JX |
5224 | msgid "%sCommitter: %.*s <%.*s>" |
5225 | msgstr "%s提交者:%.*s <%.*s>" | |
c04f5ac3 | 5226 | |
94550ed3 | 5227 | #: builtin/commit.c:881 |
c04f5ac3 | 5228 | msgid "Cannot read index" |
90e6ef53 | 5229 | msgstr "无法读取索引" |
c04f5ac3 | 5230 | |
94550ed3 | 5231 | #: builtin/commit.c:938 |
c04f5ac3 JX |
5232 | msgid "Error building trees" |
5233 | msgstr "无法创建树对象" | |
5234 | ||
94550ed3 | 5235 | #: builtin/commit.c:953 builtin/tag.c:266 |
c04f5ac3 JX |
5236 | #, c-format |
5237 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 5238 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 5239 | |
94550ed3 | 5240 | #: builtin/commit.c:1055 |
c04f5ac3 | 5241 | #, c-format |
814ff314 JX |
5242 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
5243 | msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配" | |
c04f5ac3 | 5244 | |
94550ed3 | 5245 | #: builtin/commit.c:1070 builtin/commit.c:1310 |
c04f5ac3 JX |
5246 | #, c-format |
5247 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 5248 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 5249 | |
94550ed3 | 5250 | #: builtin/commit.c:1107 |
2e8451e8 JX |
5251 | msgid "--long and -z are incompatible" |
5252 | msgstr "--long 和 -z 选项不兼容" | |
5253 | ||
94550ed3 | 5254 | #: builtin/commit.c:1137 |
c04f5ac3 JX |
5255 | msgid "Using both --reset-author and --author does not make sense" |
5256 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
5257 | ||
94550ed3 | 5258 | #: builtin/commit.c:1146 |
c04f5ac3 | 5259 | msgid "You have nothing to amend." |
90e6ef53 | 5260 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 5261 | |
94550ed3 | 5262 | #: builtin/commit.c:1149 |
8ada9598 | 5263 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 5264 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 5265 | |
94550ed3 | 5266 | #: builtin/commit.c:1151 |
8ada9598 | 5267 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 5268 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 5269 | |
94550ed3 | 5270 | #: builtin/commit.c:1154 |
c04f5ac3 | 5271 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 5272 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 5273 | |
94550ed3 | 5274 | #: builtin/commit.c:1164 |
c04f5ac3 JX |
5275 | msgid "Only one of -c/-C/-F/--fixup can be used." |
5276 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
5277 | ||
94550ed3 | 5278 | #: builtin/commit.c:1166 |
c04f5ac3 | 5279 | msgid "Option -m cannot be combined with -c/-C/-F/--fixup." |
649900bc | 5280 | msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" |
c04f5ac3 | 5281 | |
94550ed3 | 5282 | #: builtin/commit.c:1174 |
c04f5ac3 | 5283 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 5284 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 5285 | |
94550ed3 | 5286 | #: builtin/commit.c:1191 |
c04f5ac3 JX |
5287 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
5288 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
5289 | ||
94550ed3 | 5290 | #: builtin/commit.c:1193 |
c04f5ac3 JX |
5291 | msgid "No paths with --include/--only does not make sense." |
5292 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
5293 | ||
94550ed3 | 5294 | #: builtin/commit.c:1195 |
c04f5ac3 | 5295 | msgid "Clever... amending the last one with dirty index." |
160fb2b2 | 5296 | msgstr "聪明... 用脏索引修补最后一个提交。" |
c04f5ac3 | 5297 | |
94550ed3 | 5298 | #: builtin/commit.c:1197 |
6c94aba5 JX |
5299 | msgid "Explicit paths specified without -i or -o; assuming --only paths..." |
5300 | msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..." | |
c04f5ac3 | 5301 | |
94550ed3 | 5302 | #: builtin/commit.c:1209 builtin/tag.c:475 |
c04f5ac3 JX |
5303 | #, c-format |
5304 | msgid "Invalid cleanup mode %s" | |
5305 | msgstr "无效的清理模式 %s" | |
5306 | ||
94550ed3 | 5307 | #: builtin/commit.c:1214 |
c04f5ac3 | 5308 | msgid "Paths with -a does not make sense." |
649900bc | 5309 | msgstr "路径和 -a 选项同时使用没有意义。" |
c04f5ac3 | 5310 | |
94550ed3 | 5311 | #: builtin/commit.c:1324 builtin/commit.c:1605 |
ef317cd5 | 5312 | msgid "show status concisely" |
07432cef | 5313 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 5314 | |
94550ed3 | 5315 | #: builtin/commit.c:1326 builtin/commit.c:1607 |
ef317cd5 | 5316 | msgid "show branch information" |
07432cef | 5317 | msgstr "显示分支信息" |
ef317cd5 | 5318 | |
276ceeaa JX |
5319 | #: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 |
5320 | #: builtin/worktree.c:430 | |
ef317cd5 | 5321 | msgid "machine-readable output" |
07432cef WS |
5322 | msgstr "机器可读的输出" |
5323 | ||
94550ed3 | 5324 | #: builtin/commit.c:1331 builtin/commit.c:1611 |
07432cef WS |
5325 | msgid "show status in long format (default)" |
5326 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 5327 | |
94550ed3 | 5328 | #: builtin/commit.c:1334 builtin/commit.c:1614 |
ef317cd5 | 5329 | msgid "terminate entries with NUL" |
4375c10e | 5330 | msgstr "条目以 NUL 字符结尾" |
ef317cd5 | 5331 | |
94550ed3 JX |
5332 | #: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 |
5333 | #: builtin/fast-export.c:984 builtin/tag.c:353 | |
ef317cd5 | 5334 | msgid "mode" |
07432cef | 5335 | msgstr "模式" |
ef317cd5 | 5336 | |
94550ed3 | 5337 | #: builtin/commit.c:1337 builtin/commit.c:1617 |
ef317cd5 | 5338 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 5339 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 5340 | |
94550ed3 | 5341 | #: builtin/commit.c:1340 |
ef317cd5 | 5342 | msgid "show ignored files" |
07432cef | 5343 | msgstr "显示忽略的文件" |
ef317cd5 | 5344 | |
94550ed3 | 5345 | #: builtin/commit.c:1341 parse-options.h:155 |
ef317cd5 JX |
5346 | msgid "when" |
5347 | msgstr "何时" | |
5348 | ||
94550ed3 | 5349 | #: builtin/commit.c:1342 |
ef317cd5 JX |
5350 | msgid "" |
5351 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
5352 | "(Default: all)" | |
5353 | msgstr "" | |
07432cef | 5354 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 5355 | |
94550ed3 | 5356 | #: builtin/commit.c:1344 |
ef317cd5 | 5357 | msgid "list untracked files in columns" |
07432cef | 5358 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 5359 | |
94550ed3 | 5360 | #: builtin/commit.c:1430 |
c04f5ac3 JX |
5361 | msgid "couldn't look up newly created commit" |
5362 | msgstr "无法找到新创建的提交" | |
5363 | ||
94550ed3 | 5364 | #: builtin/commit.c:1432 |
c04f5ac3 | 5365 | msgid "could not parse newly created commit" |
90e6ef53 | 5366 | msgstr "不能解析新创建的提交" |
c04f5ac3 | 5367 | |
94550ed3 | 5368 | #: builtin/commit.c:1477 |
c04f5ac3 JX |
5369 | msgid "detached HEAD" |
5370 | msgstr "分离头指针" | |
5371 | ||
7e238ab7 | 5372 | # 译者:中文字符串拼接,可删除前导空格 |
94550ed3 | 5373 | #: builtin/commit.c:1480 |
c04f5ac3 | 5374 | msgid " (root-commit)" |
7e238ab7 | 5375 | msgstr "(根提交)" |
c04f5ac3 | 5376 | |
94550ed3 | 5377 | #: builtin/commit.c:1575 |
ef317cd5 | 5378 | msgid "suppress summary after successful commit" |
07432cef | 5379 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 5380 | |
94550ed3 | 5381 | #: builtin/commit.c:1576 |
ef317cd5 | 5382 | msgid "show diff in commit message template" |
07432cef | 5383 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 5384 | |
94550ed3 | 5385 | #: builtin/commit.c:1578 |
ef317cd5 | 5386 | msgid "Commit message options" |
07432cef | 5387 | msgstr "提交说明选项" |
c04f5ac3 | 5388 | |
94550ed3 | 5389 | #: builtin/commit.c:1579 builtin/tag.c:351 |
ef317cd5 | 5390 | msgid "read message from file" |
07432cef | 5391 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 5392 | |
94550ed3 | 5393 | #: builtin/commit.c:1580 |
ef317cd5 | 5394 | msgid "author" |
07432cef | 5395 | msgstr "作者" |
c04f5ac3 | 5396 | |
94550ed3 | 5397 | #: builtin/commit.c:1580 |
ef317cd5 | 5398 | msgid "override author for commit" |
07432cef | 5399 | msgstr "提交时覆盖作者" |
73a60cd2 | 5400 | |
94550ed3 | 5401 | #: builtin/commit.c:1581 builtin/gc.c:326 |
ef317cd5 | 5402 | msgid "date" |
07432cef | 5403 | msgstr "日期" |
c04f5ac3 | 5404 | |
94550ed3 | 5405 | #: builtin/commit.c:1581 |
ef317cd5 | 5406 | msgid "override date for commit" |
07432cef | 5407 | msgstr "提交时覆盖日期" |
c04f5ac3 | 5408 | |
276ceeaa JX |
5409 | #: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 |
5410 | #: builtin/notes.c:558 builtin/tag.c:349 | |
ef317cd5 | 5411 | msgid "message" |
07432cef | 5412 | msgstr "说明" |
c04f5ac3 | 5413 | |
94550ed3 | 5414 | #: builtin/commit.c:1582 |
ef317cd5 | 5415 | msgid "commit message" |
07432cef | 5416 | msgstr "提交说明" |
ef317cd5 | 5417 | |
94550ed3 JX |
5418 | #: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 |
5419 | #: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 | |
5420 | msgid "commit" | |
5421 | msgstr "提交" | |
5422 | ||
5423 | #: builtin/commit.c:1583 | |
ef317cd5 | 5424 | msgid "reuse and edit message from specified commit" |
07432cef | 5425 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 5426 | |
94550ed3 | 5427 | #: builtin/commit.c:1584 |
ef317cd5 | 5428 | msgid "reuse message from specified commit" |
07432cef | 5429 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 5430 | |
94550ed3 | 5431 | #: builtin/commit.c:1585 |
ef317cd5 | 5432 | msgid "use autosquash formatted message to fixup specified commit" |
07432cef | 5433 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
ef317cd5 | 5434 | |
94550ed3 | 5435 | #: builtin/commit.c:1586 |
ef317cd5 | 5436 | msgid "use autosquash formatted message to squash specified commit" |
07432cef | 5437 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
ef317cd5 | 5438 | |
94550ed3 | 5439 | #: builtin/commit.c:1587 |
ef317cd5 | 5440 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 5441 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 5442 | |
276ceeaa | 5443 | #: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86 |
ef317cd5 | 5444 | msgid "add Signed-off-by:" |
07432cef | 5445 | msgstr "添加 Signed-off-by: 签名" |
ef317cd5 | 5446 | |
94550ed3 | 5447 | #: builtin/commit.c:1589 |
ef317cd5 | 5448 | msgid "use specified template file" |
07432cef | 5449 | msgstr "使用指定的模板文件" |
ef317cd5 | 5450 | |
94550ed3 | 5451 | #: builtin/commit.c:1590 |
ef317cd5 | 5452 | msgid "force edit of commit" |
07432cef | 5453 | msgstr "强制编辑提交" |
ef317cd5 | 5454 | |
07432cef | 5455 | # 译者:可选值,不能翻译(或是原文中笔误,应为 mode) |
94550ed3 | 5456 | #: builtin/commit.c:1591 |
ef317cd5 | 5457 | msgid "default" |
07432cef | 5458 | msgstr "default" |
ef317cd5 | 5459 | |
94550ed3 | 5460 | #: builtin/commit.c:1591 builtin/tag.c:354 |
ef317cd5 | 5461 | msgid "how to strip spaces and #comments from message" |
07432cef | 5462 | msgstr "设置如何删除提交说明里的空格和#注释" |
ef317cd5 | 5463 | |
94550ed3 | 5464 | #: builtin/commit.c:1592 |
ef317cd5 | 5465 | msgid "include status in commit message template" |
07432cef | 5466 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 5467 | |
276ceeaa | 5468 | #: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 |
1b7f4a34 | 5469 | #: builtin/revert.c:93 |
ef317cd5 | 5470 | msgid "GPG sign commit" |
07432cef | 5471 | msgstr "GPG 提交签名" |
ef317cd5 | 5472 | |
94550ed3 | 5473 | #: builtin/commit.c:1597 |
ef317cd5 | 5474 | msgid "Commit contents options" |
07432cef | 5475 | msgstr "提交内容选项" |
ef317cd5 | 5476 | |
94550ed3 | 5477 | #: builtin/commit.c:1598 |
ef317cd5 | 5478 | msgid "commit all changed files" |
07432cef | 5479 | msgstr "提交所有改动的文件" |
ef317cd5 | 5480 | |
94550ed3 | 5481 | #: builtin/commit.c:1599 |
ef317cd5 | 5482 | msgid "add specified files to index for commit" |
07432cef | 5483 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 5484 | |
94550ed3 | 5485 | #: builtin/commit.c:1600 |
ef317cd5 | 5486 | msgid "interactively add files" |
07432cef | 5487 | msgstr "交互式添加文件" |
ef317cd5 | 5488 | |
94550ed3 | 5489 | #: builtin/commit.c:1601 |
ef317cd5 | 5490 | msgid "interactively add changes" |
07432cef | 5491 | msgstr "交互式添加变更" |
ef317cd5 | 5492 | |
94550ed3 | 5493 | #: builtin/commit.c:1602 |
ef317cd5 | 5494 | msgid "commit only specified files" |
07432cef | 5495 | msgstr "只提交指定的文件" |
ef317cd5 | 5496 | |
94550ed3 | 5497 | #: builtin/commit.c:1603 |
ef317cd5 | 5498 | msgid "bypass pre-commit hook" |
07432cef | 5499 | msgstr "绕过 pre-commit 钩子" |
ef317cd5 | 5500 | |
94550ed3 | 5501 | #: builtin/commit.c:1604 |
ef317cd5 | 5502 | msgid "show what would be committed" |
07432cef | 5503 | msgstr "显示将要提交的内容" |
ef317cd5 | 5504 | |
94550ed3 | 5505 | #: builtin/commit.c:1615 |
ef317cd5 | 5506 | msgid "amend previous commit" |
07432cef | 5507 | msgstr "修改先前的提交" |
ef317cd5 | 5508 | |
94550ed3 | 5509 | #: builtin/commit.c:1616 |
ef317cd5 | 5510 | msgid "bypass post-rewrite hook" |
07432cef | 5511 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 5512 | |
94550ed3 | 5513 | #: builtin/commit.c:1621 |
ef317cd5 | 5514 | msgid "ok to record an empty change" |
07432cef | 5515 | msgstr "允许一个空提交" |
ef317cd5 | 5516 | |
94550ed3 | 5517 | #: builtin/commit.c:1623 |
ef317cd5 | 5518 | msgid "ok to record a change with an empty message" |
07432cef | 5519 | msgstr "允许空的提交说明" |
ef317cd5 | 5520 | |
94550ed3 | 5521 | #: builtin/commit.c:1652 |
c04f5ac3 | 5522 | msgid "could not parse HEAD commit" |
90e6ef53 | 5523 | msgstr "不能解析 HEAD 提交" |
c04f5ac3 | 5524 | |
94550ed3 | 5525 | #: builtin/commit.c:1698 |
c04f5ac3 JX |
5526 | #, c-format |
5527 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 5528 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 5529 | |
94550ed3 | 5530 | #: builtin/commit.c:1705 |
c04f5ac3 | 5531 | msgid "could not read MERGE_MODE" |
90e6ef53 | 5532 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 5533 | |
94550ed3 | 5534 | #: builtin/commit.c:1724 |
c04f5ac3 JX |
5535 | #, c-format |
5536 | msgid "could not read commit message: %s" | |
90e6ef53 | 5537 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 5538 | |
94550ed3 | 5539 | #: builtin/commit.c:1735 |
73a60cd2 JX |
5540 | #, c-format |
5541 | msgid "Aborting commit; you did not edit the message.\n" | |
5542 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
5543 | ||
94550ed3 | 5544 | #: builtin/commit.c:1740 |
c04f5ac3 JX |
5545 | #, c-format |
5546 | msgid "Aborting commit due to empty commit message.\n" | |
5547 | msgstr "终止提交因为提交说明为空。\n" | |
5548 | ||
94550ed3 | 5549 | #: builtin/commit.c:1788 |
c04f5ac3 JX |
5550 | msgid "" |
5551 | "Repository has been updated, but unable to write\n" | |
220c313c | 5552 | "new_index file. Check that disk is not full and quota is\n" |
c04f5ac3 JX |
5553 | "not exceeded, and then \"git reset HEAD\" to recover." |
5554 | msgstr "" | |
160fb2b2 | 5555 | "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" |
90e6ef53 | 5556 | "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" |
c04f5ac3 | 5557 | |
276ceeaa | 5558 | #: builtin/config.c:9 |
814ff314 JX |
5559 | msgid "git config [<options>]" |
5560 | msgstr "git config [<选项>]" | |
ef317cd5 | 5561 | |
276ceeaa | 5562 | #: builtin/config.c:56 |
ef317cd5 | 5563 | msgid "Config file location" |
07432cef | 5564 | msgstr "配置文件位置" |
ef317cd5 | 5565 | |
276ceeaa | 5566 | #: builtin/config.c:57 |
ef317cd5 | 5567 | msgid "use global config file" |
07432cef | 5568 | msgstr "使用全局配置文件" |
ef317cd5 | 5569 | |
276ceeaa | 5570 | #: builtin/config.c:58 |
ef317cd5 | 5571 | msgid "use system config file" |
07432cef | 5572 | msgstr "使用系统级配置文件" |
ef317cd5 | 5573 | |
276ceeaa | 5574 | #: builtin/config.c:59 |
ef317cd5 | 5575 | msgid "use repository config file" |
160fb2b2 | 5576 | msgstr "使用仓库级配置文件" |
ef317cd5 | 5577 | |
276ceeaa | 5578 | #: builtin/config.c:60 |
ef317cd5 | 5579 | msgid "use given config file" |
07432cef | 5580 | msgstr "使用指定的配置文件" |
ef317cd5 | 5581 | |
276ceeaa | 5582 | #: builtin/config.c:61 |
2e8451e8 | 5583 | msgid "blob-id" |
4375c10e | 5584 | msgstr "数据对象 ID" |
2e8451e8 | 5585 | |
276ceeaa | 5586 | #: builtin/config.c:61 |
2e8451e8 JX |
5587 | msgid "read config from given blob object" |
5588 | msgstr "从给定的数据对象读取配置" | |
5589 | ||
276ceeaa | 5590 | #: builtin/config.c:62 |
ef317cd5 | 5591 | msgid "Action" |
07432cef | 5592 | msgstr "操作" |
ef317cd5 | 5593 | |
276ceeaa | 5594 | #: builtin/config.c:63 |
ef317cd5 | 5595 | msgid "get value: name [value-regex]" |
07432cef | 5596 | msgstr "获取值:name [value-regex]" |
ef317cd5 | 5597 | |
276ceeaa | 5598 | #: builtin/config.c:64 |
ef317cd5 | 5599 | msgid "get all values: key [value-regex]" |
07432cef | 5600 | msgstr "获得所有的值:key [value-regex]" |
ef317cd5 | 5601 | |
276ceeaa | 5602 | #: builtin/config.c:65 |
ef317cd5 | 5603 | msgid "get values for regexp: name-regex [value-regex]" |
07432cef | 5604 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
ef317cd5 | 5605 | |
276ceeaa | 5606 | #: builtin/config.c:66 |
90314792 JX |
5607 | msgid "get value specific for the URL: section[.var] URL" |
5608 | msgstr "获得 URL 取值:section[.var] URL" | |
5609 | ||
276ceeaa | 5610 | #: builtin/config.c:67 |
ef317cd5 | 5611 | msgid "replace all matching variables: name value [value_regex]" |
07432cef | 5612 | msgstr "替换所有匹配的变量:name value [value_regex]" |
ef317cd5 | 5613 | |
276ceeaa | 5614 | #: builtin/config.c:68 |
ef317cd5 | 5615 | msgid "add a new variable: name value" |
07432cef | 5616 | msgstr "添加一个新的变量:name value" |
ef317cd5 | 5617 | |
276ceeaa | 5618 | #: builtin/config.c:69 |
ef317cd5 | 5619 | msgid "remove a variable: name [value-regex]" |
07432cef | 5620 | msgstr "删除一个变量:name [value-regex]" |
ef317cd5 | 5621 | |
276ceeaa | 5622 | #: builtin/config.c:70 |
ef317cd5 | 5623 | msgid "remove all matches: name [value-regex]" |
07432cef | 5624 | msgstr "删除所有匹配项:name [value-regex]" |
ef317cd5 | 5625 | |
276ceeaa | 5626 | #: builtin/config.c:71 |
ef317cd5 | 5627 | msgid "rename section: old-name new-name" |
07432cef | 5628 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 5629 | |
276ceeaa | 5630 | #: builtin/config.c:72 |
ef317cd5 | 5631 | msgid "remove a section: name" |
07432cef | 5632 | msgstr "删除一个小节:name" |
ef317cd5 | 5633 | |
276ceeaa | 5634 | #: builtin/config.c:73 |
ef317cd5 | 5635 | msgid "list all" |
07432cef | 5636 | msgstr "列出所有" |
ef317cd5 | 5637 | |
276ceeaa | 5638 | #: builtin/config.c:74 |
ef317cd5 | 5639 | msgid "open an editor" |
07432cef | 5640 | msgstr "打开一个编辑器" |
ef317cd5 | 5641 | |
276ceeaa | 5642 | #: builtin/config.c:75 |
04cb2f28 JX |
5643 | msgid "find the color configured: slot [default]" |
5644 | msgstr "获得配置的颜色:配置 [默认]" | |
ef317cd5 | 5645 | |
276ceeaa | 5646 | #: builtin/config.c:76 |
04cb2f28 JX |
5647 | msgid "find the color setting: slot [stdout-is-tty]" |
5648 | msgstr "获得颜色设置:配置 [stdout-is-tty]" | |
ef317cd5 | 5649 | |
276ceeaa | 5650 | #: builtin/config.c:77 |
ef317cd5 | 5651 | msgid "Type" |
07432cef | 5652 | msgstr "类型" |
ef317cd5 | 5653 | |
276ceeaa | 5654 | #: builtin/config.c:78 |
ef317cd5 | 5655 | msgid "value is \"true\" or \"false\"" |
07432cef | 5656 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 5657 | |
276ceeaa | 5658 | #: builtin/config.c:79 |
ef317cd5 | 5659 | msgid "value is decimal number" |
07432cef | 5660 | msgstr "值是十进制数" |
ef317cd5 | 5661 | |
276ceeaa | 5662 | #: builtin/config.c:80 |
ef317cd5 | 5663 | msgid "value is --bool or --int" |
07432cef | 5664 | msgstr "值是 --bool or --int" |
ef317cd5 | 5665 | |
276ceeaa | 5666 | #: builtin/config.c:81 |
ef317cd5 | 5667 | msgid "value is a path (file or directory name)" |
07432cef | 5668 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 5669 | |
276ceeaa | 5670 | #: builtin/config.c:82 |
ef317cd5 | 5671 | msgid "Other" |
07432cef | 5672 | msgstr "其它" |
ef317cd5 | 5673 | |
276ceeaa | 5674 | #: builtin/config.c:83 |
ef317cd5 | 5675 | msgid "terminate values with NUL byte" |
4375c10e | 5676 | msgstr "终止值是 NUL 字节" |
ef317cd5 | 5677 | |
276ceeaa | 5678 | #: builtin/config.c:84 |
1b7f4a34 JX |
5679 | msgid "show variable names only" |
5680 | msgstr "只显示变量名" | |
5681 | ||
276ceeaa | 5682 | #: builtin/config.c:85 |
ef317cd5 | 5683 | msgid "respect include directives on lookup" |
07432cef | 5684 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 5685 | |
276ceeaa JX |
5686 | #: builtin/config.c:86 |
5687 | msgid "show origin of config (file, standard input, blob, command line)" | |
5688 | msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)" | |
5689 | ||
5690 | #: builtin/config.c:328 | |
220c313c | 5691 | msgid "unable to parse default color value" |
160fb2b2 | 5692 | msgstr "不能解析默认颜色值" |
220c313c | 5693 | |
276ceeaa | 5694 | #: builtin/config.c:469 |
220c313c JX |
5695 | #, c-format |
5696 | msgid "" | |
5697 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 5698 | "[user]\n" |
220c313c | 5699 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 5700 | "#\tname = %s\n" |
220c313c JX |
5701 | "#\temail = %s\n" |
5702 | msgstr "" | |
5703 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 5704 | "[user]\n" |
220c313c | 5705 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 5706 | "#\tname = %s\n" |
220c313c JX |
5707 | "#\temail = %s\n" |
5708 | ||
276ceeaa | 5709 | #: builtin/config.c:611 |
220c313c JX |
5710 | #, c-format |
5711 | msgid "cannot create configuration file %s" | |
5712 | msgstr "不能创建配置文件 %s" | |
5713 | ||
94550ed3 | 5714 | #: builtin/count-objects.c:77 |
4dcdc3d8 JX |
5715 | msgid "git count-objects [-v] [-H | --human-readable]" |
5716 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
5717 | ||
94550ed3 | 5718 | #: builtin/count-objects.c:87 |
4dcdc3d8 JX |
5719 | msgid "print sizes in human readable format" |
5720 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 5721 | |
220c313c | 5722 | #: builtin/describe.c:17 |
814ff314 JX |
5723 | msgid "git describe [<options>] [<commit-ish>...]" |
5724 | msgstr "git describe [<选项>] [<提交号>...]" | |
ef317cd5 | 5725 | |
220c313c | 5726 | #: builtin/describe.c:18 |
814ff314 JX |
5727 | msgid "git describe [<options>] --dirty" |
5728 | msgstr "git describe [<选项>] --dirty" | |
ef317cd5 | 5729 | |
220c313c | 5730 | #: builtin/describe.c:217 |
c04f5ac3 JX |
5731 | #, c-format |
5732 | msgid "annotated tag %s not available" | |
55a16ee4 | 5733 | msgstr "附注标签 %s 无效" |
c04f5ac3 | 5734 | |
220c313c | 5735 | #: builtin/describe.c:221 |
c04f5ac3 JX |
5736 | #, c-format |
5737 | msgid "annotated tag %s has no embedded name" | |
55a16ee4 | 5738 | msgstr "附注标签 %s 没有嵌入名称" |
c04f5ac3 | 5739 | |
220c313c | 5740 | #: builtin/describe.c:223 |
c04f5ac3 JX |
5741 | #, c-format |
5742 | msgid "tag '%s' is really '%s' here" | |
55a16ee4 | 5743 | msgstr "标签 '%s' 的确是在 '%s'" |
c04f5ac3 | 5744 | |
1b7f4a34 | 5745 | #: builtin/describe.c:250 builtin/log.c:459 |
c04f5ac3 JX |
5746 | #, c-format |
5747 | msgid "Not a valid object name %s" | |
5748 | msgstr "不是一个有效的对象名 %s" | |
5749 | ||
220c313c | 5750 | #: builtin/describe.c:253 |
c04f5ac3 JX |
5751 | #, c-format |
5752 | msgid "%s is not a valid '%s' object" | |
5753 | msgstr "%s 不是一个有效的 '%s' 对象" | |
5754 | ||
220c313c | 5755 | #: builtin/describe.c:270 |
c04f5ac3 JX |
5756 | #, c-format |
5757 | msgid "no tag exactly matches '%s'" | |
55a16ee4 | 5758 | msgstr "没有标签准确匹配 '%s'" |
c04f5ac3 | 5759 | |
220c313c | 5760 | #: builtin/describe.c:272 |
c04f5ac3 JX |
5761 | #, c-format |
5762 | msgid "searching to describe %s\n" | |
5763 | msgstr "搜索描述 %s\n" | |
5764 | ||
220c313c | 5765 | #: builtin/describe.c:319 |
c04f5ac3 JX |
5766 | #, c-format |
5767 | msgid "finished search at %s\n" | |
5768 | msgstr "完成搜索 %s\n" | |
5769 | ||
220c313c | 5770 | #: builtin/describe.c:346 |
c04f5ac3 JX |
5771 | #, c-format |
5772 | msgid "" | |
5773 | "No annotated tags can describe '%s'.\n" | |
5774 | "However, there were unannotated tags: try --tags." | |
5775 | msgstr "" | |
55a16ee4 RC |
5776 | "没有附注标签能描述 '%s'。\n" |
5777 | "然而,存在未附注标签:尝试 --tags。" | |
c04f5ac3 | 5778 | |
220c313c | 5779 | #: builtin/describe.c:350 |
c04f5ac3 JX |
5780 | #, c-format |
5781 | msgid "" | |
5782 | "No tags can describe '%s'.\n" | |
5783 | "Try --always, or create some tags." | |
5784 | msgstr "" | |
55a16ee4 RC |
5785 | "没有标签能描述 '%s'。\n" |
5786 | "尝试 --always,或者创建一些标签。" | |
c04f5ac3 | 5787 | |
220c313c | 5788 | #: builtin/describe.c:371 |
c04f5ac3 JX |
5789 | #, c-format |
5790 | msgid "traversed %lu commits\n" | |
5791 | msgstr "已遍历 %lu 个提交\n" | |
5792 | ||
220c313c | 5793 | #: builtin/describe.c:374 |
c04f5ac3 JX |
5794 | #, c-format |
5795 | msgid "" | |
5796 | "more than %i tags found; listed %i most recent\n" | |
5797 | "gave up search at %s\n" | |
5798 | msgstr "" | |
55a16ee4 | 5799 | "发现多于 %i 个标签,列出最近的 %i 个\n" |
90e6ef53 | 5800 | "在 %s 放弃搜索\n" |
c04f5ac3 | 5801 | |
220c313c | 5802 | #: builtin/describe.c:396 |
ef317cd5 | 5803 | msgid "find the tag that comes after the commit" |
55a16ee4 | 5804 | msgstr "寻找该提交之后的标签" |
ef317cd5 | 5805 | |
220c313c | 5806 | #: builtin/describe.c:397 |
ef317cd5 | 5807 | msgid "debug search strategy on stderr" |
07432cef | 5808 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 5809 | |
220c313c | 5810 | #: builtin/describe.c:398 |
1003b3a5 JX |
5811 | msgid "use any ref" |
5812 | msgstr "使用任意引用" | |
5813 | ||
220c313c | 5814 | #: builtin/describe.c:399 |
1003b3a5 | 5815 | msgid "use any tag, even unannotated" |
55a16ee4 | 5816 | msgstr "使用任意标签,即使未附带注释" |
ef317cd5 | 5817 | |
220c313c | 5818 | #: builtin/describe.c:400 |
ef317cd5 | 5819 | msgid "always use long format" |
07432cef | 5820 | msgstr "始终使用长提交号格式" |
ef317cd5 | 5821 | |
220c313c | 5822 | #: builtin/describe.c:401 |
2e8451e8 JX |
5823 | msgid "only follow first parent" |
5824 | msgstr "只跟随第一个父提交" | |
5825 | ||
220c313c | 5826 | #: builtin/describe.c:404 |
ef317cd5 | 5827 | msgid "only output exact matches" |
07432cef | 5828 | msgstr "只输出精确匹配" |
ef317cd5 | 5829 | |
220c313c | 5830 | #: builtin/describe.c:406 |
ef317cd5 | 5831 | msgid "consider <n> most recent tags (default: 10)" |
55a16ee4 | 5832 | msgstr "考虑最近 <n> 个标签(默认:10)" |
ef317cd5 | 5833 | |
220c313c | 5834 | #: builtin/describe.c:408 |
ef317cd5 | 5835 | msgid "only consider tags matching <pattern>" |
55a16ee4 | 5836 | msgstr "只考虑匹配 <模式> 的标签" |
ef317cd5 | 5837 | |
94550ed3 | 5838 | #: builtin/describe.c:410 builtin/name-rev.c:314 |
ef317cd5 | 5839 | msgid "show abbreviated commit object as fallback" |
07432cef | 5840 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 5841 | |
220c313c | 5842 | #: builtin/describe.c:411 |
ef317cd5 | 5843 | msgid "mark" |
07432cef | 5844 | msgstr "标记" |
ef317cd5 | 5845 | |
220c313c | 5846 | #: builtin/describe.c:412 |
ef317cd5 | 5847 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
160fb2b2 | 5848 | msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 5849 | |
220c313c | 5850 | #: builtin/describe.c:430 |
c04f5ac3 JX |
5851 | msgid "--long is incompatible with --abbrev=0" |
5852 | msgstr "--long 与 --abbrev=0 不兼容" | |
5853 | ||
220c313c | 5854 | #: builtin/describe.c:456 |
c04f5ac3 | 5855 | msgid "No names found, cannot describe anything." |
90e6ef53 | 5856 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 5857 | |
220c313c | 5858 | #: builtin/describe.c:476 |
a8a5406a | 5859 | msgid "--dirty is incompatible with commit-ishes" |
649900bc | 5860 | msgstr "--dirty 不能与提交同时使用" |
c04f5ac3 | 5861 | |
220c313c | 5862 | #: builtin/diff.c:86 |
c04f5ac3 JX |
5863 | #, c-format |
5864 | msgid "'%s': not a regular file or symlink" | |
5865 | msgstr "'%s':不是一个正规文件或符号链接" | |
5866 | ||
220c313c | 5867 | #: builtin/diff.c:237 |
c04f5ac3 JX |
5868 | #, c-format |
5869 | msgid "invalid option: %s" | |
5870 | msgstr "无效选项:%s" | |
5871 | ||
220c313c | 5872 | #: builtin/diff.c:358 |
c04f5ac3 | 5873 | msgid "Not a git repository" |
160fb2b2 | 5874 | msgstr "不是一个 git 仓库" |
c04f5ac3 | 5875 | |
220c313c | 5876 | #: builtin/diff.c:401 |
c04f5ac3 JX |
5877 | #, c-format |
5878 | msgid "invalid object '%s' given." | |
5879 | msgstr "提供了无效对象 '%s'。" | |
5880 | ||
220c313c | 5881 | #: builtin/diff.c:410 |
c04f5ac3 JX |
5882 | #, c-format |
5883 | msgid "more than two blobs given: '%s'" | |
160fb2b2 | 5884 | msgstr "提供了超过两个数据对象:'%s'" |
c04f5ac3 | 5885 | |
220c313c | 5886 | #: builtin/diff.c:417 |
c04f5ac3 JX |
5887 | #, c-format |
5888 | msgid "unhandled object '%s' given." | |
6c94aba5 | 5889 | msgstr "无法处理的对象 '%s'。" |
c04f5ac3 | 5890 | |
1b7f4a34 | 5891 | #: builtin/fast-export.c:25 |
ef317cd5 | 5892 | msgid "git fast-export [rev-list-opts]" |
07432cef | 5893 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 5894 | |
1b7f4a34 | 5895 | #: builtin/fast-export.c:980 |
ef317cd5 | 5896 | msgid "show progress after <n> objects" |
07432cef | 5897 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 5898 | |
1b7f4a34 | 5899 | #: builtin/fast-export.c:982 |
ef317cd5 | 5900 | msgid "select handling of signed tags" |
55a16ee4 | 5901 | msgstr "选择如何处理签名标签" |
ef317cd5 | 5902 | |
1b7f4a34 | 5903 | #: builtin/fast-export.c:985 |
ef317cd5 | 5904 | msgid "select handling of tags that tag filtered objects" |
55a16ee4 | 5905 | msgstr "选择当标签指向被过滤对象时该标签的处理方式" |
ef317cd5 | 5906 | |
1b7f4a34 | 5907 | #: builtin/fast-export.c:988 |
ef317cd5 | 5908 | msgid "Dump marks to this file" |
07432cef | 5909 | msgstr "把标记存储到这个文件" |
ef317cd5 | 5910 | |
1b7f4a34 | 5911 | #: builtin/fast-export.c:990 |
ef317cd5 | 5912 | msgid "Import marks from this file" |
07432cef | 5913 | msgstr "从这个文件导入标记" |
ef317cd5 | 5914 | |
1b7f4a34 | 5915 | #: builtin/fast-export.c:992 |
ef317cd5 | 5916 | msgid "Fake a tagger when tags lack one" |
55a16ee4 | 5917 | msgstr "当标签缺少标记者字段时,假装提供一个" |
ef317cd5 | 5918 | |
1b7f4a34 | 5919 | #: builtin/fast-export.c:994 |
ef317cd5 | 5920 | msgid "Output full tree for each commit" |
07432cef | 5921 | msgstr "每次提交都输出整个树" |
ef317cd5 | 5922 | |
1b7f4a34 | 5923 | #: builtin/fast-export.c:996 |
ef317cd5 | 5924 | msgid "Use the done feature to terminate the stream" |
07432cef | 5925 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 5926 | |
1b7f4a34 | 5927 | #: builtin/fast-export.c:997 |
ef317cd5 | 5928 | msgid "Skip output of blob data" |
07432cef | 5929 | msgstr "跳过数据对象的输出" |
ef317cd5 | 5930 | |
1b7f4a34 | 5931 | #: builtin/fast-export.c:998 |
6acbf033 | 5932 | msgid "refspec" |
160fb2b2 | 5933 | msgstr "引用规格" |
6acbf033 | 5934 | |
1b7f4a34 | 5935 | #: builtin/fast-export.c:999 |
6acbf033 | 5936 | msgid "Apply refspec to exported refs" |
160fb2b2 | 5937 | msgstr "对导出的引用应用引用规格" |
6acbf033 | 5938 | |
1b7f4a34 | 5939 | #: builtin/fast-export.c:1000 |
220c313c JX |
5940 | msgid "anonymize output" |
5941 | msgstr "匿名输出" | |
5942 | ||
1b7f4a34 | 5943 | #: builtin/fetch.c:20 |
ef317cd5 | 5944 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 5945 | msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" |
ef317cd5 | 5946 | |
1b7f4a34 | 5947 | #: builtin/fetch.c:21 |
ef317cd5 | 5948 | msgid "git fetch [<options>] <group>" |
07432cef | 5949 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 | 5950 | |
1b7f4a34 | 5951 | #: builtin/fetch.c:22 |
ef317cd5 | 5952 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
160fb2b2 | 5953 | msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" |
ef317cd5 | 5954 | |
1b7f4a34 | 5955 | #: builtin/fetch.c:23 |
ef317cd5 | 5956 | msgid "git fetch --all [<options>]" |
07432cef | 5957 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 5958 | |
276ceeaa | 5959 | #: builtin/fetch.c:92 builtin/pull.c:166 |
ef317cd5 | 5960 | msgid "fetch from all remotes" |
07432cef | 5961 | msgstr "从所有的远程抓取" |
ef317cd5 | 5962 | |
276ceeaa | 5963 | #: builtin/fetch.c:94 builtin/pull.c:169 |
ef317cd5 | 5964 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 5965 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 5966 | |
276ceeaa | 5967 | #: builtin/fetch.c:96 builtin/pull.c:172 |
ef317cd5 | 5968 | msgid "path to upload pack on remote end" |
07432cef | 5969 | msgstr "上传包到远程的路径" |
ef317cd5 | 5970 | |
276ceeaa | 5971 | #: builtin/fetch.c:97 builtin/pull.c:174 |
ef317cd5 | 5972 | msgid "force overwrite of local branch" |
07432cef | 5973 | msgstr "强制覆盖本地分支" |
ef317cd5 | 5974 | |
276ceeaa | 5975 | #: builtin/fetch.c:99 |
ef317cd5 | 5976 | msgid "fetch from multiple remotes" |
07432cef | 5977 | msgstr "从多个远程抓取" |
ef317cd5 | 5978 | |
276ceeaa | 5979 | #: builtin/fetch.c:101 builtin/pull.c:176 |
ef317cd5 | 5980 | msgid "fetch all tags and associated objects" |
55a16ee4 | 5981 | msgstr "抓取所有的标签和关联对象" |
ef317cd5 | 5982 | |
276ceeaa | 5983 | #: builtin/fetch.c:103 |
ef317cd5 | 5984 | msgid "do not fetch all tags (--no-tags)" |
55a16ee4 | 5985 | msgstr "不抓取任何标签(--no-tags)" |
ef317cd5 | 5986 | |
276ceeaa JX |
5987 | #: builtin/fetch.c:105 |
5988 | msgid "number of submodules fetched in parallel" | |
5989 | msgstr "子模组获取的并发数" | |
5990 | ||
5991 | #: builtin/fetch.c:107 builtin/pull.c:179 | |
ef317cd5 | 5992 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 5993 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 5994 | |
07432cef | 5995 | # 译者:可选值,不能翻译 |
276ceeaa | 5996 | #: builtin/fetch.c:108 builtin/pull.c:182 |
ef317cd5 | 5997 | msgid "on-demand" |
07432cef | 5998 | msgstr "on-demand" |
ef317cd5 | 5999 | |
276ceeaa | 6000 | #: builtin/fetch.c:109 builtin/pull.c:183 |
ef317cd5 | 6001 | msgid "control recursive fetching of submodules" |
07432cef | 6002 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 6003 | |
276ceeaa | 6004 | #: builtin/fetch.c:113 builtin/pull.c:191 |
ef317cd5 | 6005 | msgid "keep downloaded pack" |
07432cef | 6006 | msgstr "保持下载包" |
ef317cd5 | 6007 | |
276ceeaa | 6008 | #: builtin/fetch.c:115 |
ef317cd5 | 6009 | msgid "allow updating of HEAD ref" |
07432cef | 6010 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 6011 | |
276ceeaa | 6012 | #: builtin/fetch.c:118 builtin/pull.c:194 |
ef317cd5 | 6013 | msgid "deepen history of shallow clone" |
07432cef | 6014 | msgstr "深化浅克隆的历史" |
ef317cd5 | 6015 | |
276ceeaa | 6016 | #: builtin/fetch.c:120 builtin/pull.c:197 |
a77c07d9 | 6017 | msgid "convert to a complete repository" |
160fb2b2 | 6018 | msgstr "转换为一个完整的仓库" |
a77c07d9 | 6019 | |
276ceeaa | 6020 | #: builtin/fetch.c:122 builtin/log.c:1236 |
ef317cd5 | 6021 | msgid "dir" |
07432cef | 6022 | msgstr "目录" |
ef317cd5 | 6023 | |
276ceeaa | 6024 | #: builtin/fetch.c:123 |
ef317cd5 | 6025 | msgid "prepend this to submodule path output" |
07432cef | 6026 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 6027 | |
276ceeaa | 6028 | #: builtin/fetch.c:126 |
ef317cd5 | 6029 | msgid "default mode for recursion" |
07432cef | 6030 | msgstr "递归的默认模式" |
ef317cd5 | 6031 | |
276ceeaa | 6032 | #: builtin/fetch.c:128 builtin/pull.c:200 |
cfff71a9 JX |
6033 | msgid "accept refs that update .git/shallow" |
6034 | msgstr "接受更新 .git/shallow 的引用" | |
6035 | ||
276ceeaa | 6036 | #: builtin/fetch.c:129 builtin/pull.c:202 |
6acbf033 JX |
6037 | msgid "refmap" |
6038 | msgstr "引用映射" | |
6039 | ||
276ceeaa | 6040 | #: builtin/fetch.c:130 builtin/pull.c:203 |
6acbf033 JX |
6041 | msgid "specify fetch refmap" |
6042 | msgstr "指定获取操作的引用映射" | |
6043 | ||
276ceeaa | 6044 | #: builtin/fetch.c:386 |
c04f5ac3 JX |
6045 | msgid "Couldn't find remote ref HEAD" |
6046 | msgstr "无法发现远程 HEAD 引用" | |
6047 | ||
276ceeaa | 6048 | #: builtin/fetch.c:466 |
c04f5ac3 JX |
6049 | #, c-format |
6050 | msgid "object %s not found" | |
6051 | msgstr "对象 %s 未发现" | |
6052 | ||
276ceeaa | 6053 | #: builtin/fetch.c:471 |
c04f5ac3 JX |
6054 | msgid "[up to date]" |
6055 | msgstr "[最新]" | |
6056 | ||
276ceeaa | 6057 | #: builtin/fetch.c:485 |
c04f5ac3 JX |
6058 | #, c-format |
6059 | msgid "! %-*s %-*s -> %s (can't fetch in current branch)" | |
6060 | msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)" | |
6061 | ||
276ceeaa | 6062 | #: builtin/fetch.c:486 builtin/fetch.c:574 |
c04f5ac3 JX |
6063 | msgid "[rejected]" |
6064 | msgstr "[已拒绝]" | |
6065 | ||
276ceeaa | 6066 | #: builtin/fetch.c:497 |
c04f5ac3 | 6067 | msgid "[tag update]" |
55a16ee4 | 6068 | msgstr "[标签更新]" |
c04f5ac3 | 6069 | |
90e6ef53 | 6070 | # 译者:注意保持前导空格 |
276ceeaa | 6071 | #: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552 |
c04f5ac3 JX |
6072 | msgid " (unable to update local ref)" |
6073 | msgstr " (不能更新本地引用)" | |
6074 | ||
276ceeaa | 6075 | #: builtin/fetch.c:517 |
c04f5ac3 | 6076 | msgid "[new tag]" |
55a16ee4 | 6077 | msgstr "[新标签]" |
c04f5ac3 | 6078 | |
276ceeaa | 6079 | #: builtin/fetch.c:520 |
c04f5ac3 JX |
6080 | msgid "[new branch]" |
6081 | msgstr "[新分支]" | |
6082 | ||
276ceeaa | 6083 | #: builtin/fetch.c:523 |
170e9899 JX |
6084 | msgid "[new ref]" |
6085 | msgstr "[新引用]" | |
6086 | ||
276ceeaa | 6087 | #: builtin/fetch.c:569 |
c04f5ac3 JX |
6088 | msgid "unable to update local ref" |
6089 | msgstr "不能更新本地引用" | |
6090 | ||
276ceeaa | 6091 | #: builtin/fetch.c:569 |
c04f5ac3 JX |
6092 | msgid "forced update" |
6093 | msgstr "强制更新" | |
6094 | ||
276ceeaa | 6095 | #: builtin/fetch.c:576 |
c04f5ac3 | 6096 | msgid "(non-fast-forward)" |
90e6ef53 | 6097 | msgstr "(非快进式)" |
c04f5ac3 | 6098 | |
276ceeaa | 6099 | #: builtin/fetch.c:610 builtin/fetch.c:851 |
c04f5ac3 JX |
6100 | #, c-format |
6101 | msgid "cannot open %s: %s\n" | |
6102 | msgstr "无法打开 %s:%s\n" | |
6103 | ||
276ceeaa | 6104 | #: builtin/fetch.c:619 |
c04f5ac3 JX |
6105 | #, c-format |
6106 | msgid "%s did not send all necessary objects\n" | |
6107 | msgstr "%s 未发送所有必须的对象\n" | |
6108 | ||
276ceeaa | 6109 | #: builtin/fetch.c:637 |
cfff71a9 JX |
6110 | #, c-format |
6111 | msgid "reject %s because shallow roots are not allowed to be updated" | |
6112 | msgstr "拒绝 %s 因为浅克隆不允许被更新" | |
6113 | ||
276ceeaa | 6114 | #: builtin/fetch.c:724 builtin/fetch.c:816 |
c04f5ac3 JX |
6115 | #, c-format |
6116 | msgid "From %.*s\n" | |
6117 | msgstr "来自 %.*s\n" | |
6118 | ||
276ceeaa | 6119 | #: builtin/fetch.c:735 |
c04f5ac3 JX |
6120 | #, c-format |
6121 | msgid "" | |
6122 | "some local refs could not be updated; try running\n" | |
6123 | " 'git remote prune %s' to remove any old, conflicting branches" | |
6124 | msgstr "" | |
6125 | "一些本地引用不能被更新;尝试运行\n" | |
6126 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
6127 | ||
90e6ef53 | 6128 | # 译者:注意保持前导空格 |
276ceeaa | 6129 | #: builtin/fetch.c:787 |
81809b99 | 6130 | #, c-format |
8ada9598 | 6131 | msgid " (%s will become dangling)" |
07432cef | 6132 | msgstr " (%s 将成为摇摆状态)" |
c04f5ac3 | 6133 | |
90e6ef53 | 6134 | # 译者:注意保持前导空格 |
276ceeaa | 6135 | #: builtin/fetch.c:788 |
81809b99 | 6136 | #, c-format |
8ada9598 | 6137 | msgid " (%s has become dangling)" |
07432cef | 6138 | msgstr " (%s 已成为摇摆状态)" |
c04f5ac3 | 6139 | |
276ceeaa | 6140 | #: builtin/fetch.c:820 |
c04f5ac3 JX |
6141 | msgid "[deleted]" |
6142 | msgstr "[已删除]" | |
6143 | ||
276ceeaa | 6144 | #: builtin/fetch.c:821 builtin/remote.c:1025 |
c04f5ac3 JX |
6145 | msgid "(none)" |
6146 | msgstr "(无)" | |
6147 | ||
276ceeaa | 6148 | #: builtin/fetch.c:841 |
c04f5ac3 JX |
6149 | #, c-format |
6150 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
160fb2b2 | 6151 | msgstr "拒绝获取到非纯仓库的当前分支 %s" |
c04f5ac3 | 6152 | |
276ceeaa | 6153 | #: builtin/fetch.c:860 |
c04f5ac3 JX |
6154 | #, c-format |
6155 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
6156 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
6157 | ||
276ceeaa | 6158 | #: builtin/fetch.c:863 |
c04f5ac3 JX |
6159 | #, c-format |
6160 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 6161 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 6162 | |
276ceeaa | 6163 | #: builtin/fetch.c:920 |
90314792 JX |
6164 | #, c-format |
6165 | msgid "Don't know how to fetch from %s" | |
6166 | msgstr "不知道如何从 %s 获取" | |
6167 | ||
276ceeaa | 6168 | #: builtin/fetch.c:1080 |
c04f5ac3 JX |
6169 | #, c-format |
6170 | msgid "Fetching %s\n" | |
d4a8e00b | 6171 | msgstr "正在获取 %s\n" |
c04f5ac3 | 6172 | |
276ceeaa | 6173 | #: builtin/fetch.c:1082 builtin/remote.c:96 |
c04f5ac3 JX |
6174 | #, c-format |
6175 | msgid "Could not fetch %s" | |
6176 | msgstr "不能获取 %s" | |
6177 | ||
276ceeaa | 6178 | #: builtin/fetch.c:1100 |
c04f5ac3 JX |
6179 | msgid "" |
6180 | "No remote repository specified. Please, specify either a URL or a\n" | |
6181 | "remote name from which new revisions should be fetched." | |
4375c10e | 6182 | msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。" |
c04f5ac3 | 6183 | |
276ceeaa | 6184 | #: builtin/fetch.c:1123 |
c04f5ac3 | 6185 | msgid "You need to specify a tag name." |
55a16ee4 | 6186 | msgstr "您需要指定一个标签名称。" |
c04f5ac3 | 6187 | |
276ceeaa | 6188 | #: builtin/fetch.c:1165 |
a77c07d9 JX |
6189 | msgid "--depth and --unshallow cannot be used together" |
6190 | msgstr "--depth 和 --unshallow 不能同时使用" | |
6191 | ||
276ceeaa | 6192 | #: builtin/fetch.c:1167 |
a77c07d9 | 6193 | msgid "--unshallow on a complete repository does not make sense" |
160fb2b2 | 6194 | msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" |
a77c07d9 | 6195 | |
276ceeaa | 6196 | #: builtin/fetch.c:1187 |
c04f5ac3 | 6197 | msgid "fetch --all does not take a repository argument" |
160fb2b2 | 6198 | msgstr "fetch --all 不能带一个仓库参数" |
c04f5ac3 | 6199 | |
276ceeaa | 6200 | #: builtin/fetch.c:1189 |
c04f5ac3 | 6201 | msgid "fetch --all does not make sense with refspecs" |
160fb2b2 | 6202 | msgstr "fetch --all 带引用规格没有任何意义" |
c04f5ac3 | 6203 | |
276ceeaa | 6204 | #: builtin/fetch.c:1200 |
c04f5ac3 JX |
6205 | #, c-format |
6206 | msgid "No such remote or remote group: %s" | |
6207 | msgstr "没有这样的远程或远程组:%s" | |
6208 | ||
276ceeaa | 6209 | #: builtin/fetch.c:1208 |
c04f5ac3 | 6210 | msgid "Fetching a group and specifying refspecs does not make sense" |
160fb2b2 | 6211 | msgstr "获取组并指定引用规格没有意义" |
c04f5ac3 | 6212 | |
1b7f4a34 | 6213 | #: builtin/fmt-merge-msg.c:14 |
814ff314 JX |
6214 | msgid "" |
6215 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
6216 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" | |
c04f5ac3 | 6217 | |
94550ed3 | 6218 | #: builtin/fmt-merge-msg.c:667 |
ef317cd5 | 6219 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 6220 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 6221 | |
94550ed3 | 6222 | #: builtin/fmt-merge-msg.c:670 |
ef317cd5 | 6223 | msgid "alias for --log (deprecated)" |
07432cef | 6224 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 6225 | |
94550ed3 | 6226 | #: builtin/fmt-merge-msg.c:673 |
ef317cd5 | 6227 | msgid "text" |
07432cef | 6228 | msgstr "文本" |
ef317cd5 | 6229 | |
94550ed3 | 6230 | #: builtin/fmt-merge-msg.c:674 |
ef317cd5 | 6231 | msgid "use <text> as start of message" |
07432cef | 6232 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 6233 | |
94550ed3 | 6234 | #: builtin/fmt-merge-msg.c:675 |
ef317cd5 | 6235 | msgid "file to read from" |
07432cef | 6236 | msgstr "从文件中读取" |
ef317cd5 | 6237 | |
1b7f4a34 | 6238 | #: builtin/for-each-ref.c:9 |
814ff314 JX |
6239 | msgid "git for-each-ref [<options>] [<pattern>]" |
6240 | msgstr "git for-each-ref [<选项>] [<模式>]" | |
ef317cd5 | 6241 | |
94550ed3 JX |
6242 | #: builtin/for-each-ref.c:10 |
6243 | msgid "git for-each-ref [--points-at <object>]" | |
6244 | msgstr "git for-each-ref [--points-at <对象>]" | |
6245 | ||
6246 | #: builtin/for-each-ref.c:11 | |
6247 | msgid "git for-each-ref [(--merged | --no-merged) [<object>]]" | |
6248 | msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]" | |
6249 | ||
6250 | #: builtin/for-each-ref.c:12 | |
6251 | msgid "git for-each-ref [--contains [<object>]]" | |
6252 | msgstr "git for-each-ref [--contains [<对象>]]" | |
6253 | ||
6254 | #: builtin/for-each-ref.c:27 | |
ef317cd5 | 6255 | msgid "quote placeholders suitably for shells" |
07432cef | 6256 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 6257 | |
94550ed3 | 6258 | #: builtin/for-each-ref.c:29 |
ef317cd5 | 6259 | msgid "quote placeholders suitably for perl" |
07432cef | 6260 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 6261 | |
94550ed3 | 6262 | #: builtin/for-each-ref.c:31 |
ef317cd5 | 6263 | msgid "quote placeholders suitably for python" |
07432cef | 6264 | msgstr "引用占位符适用于 python" |
ef317cd5 | 6265 | |
94550ed3 | 6266 | #: builtin/for-each-ref.c:33 |
04cb2f28 JX |
6267 | msgid "quote placeholders suitably for Tcl" |
6268 | msgstr "引用占位符适用于 Tcl" | |
ef317cd5 | 6269 | |
94550ed3 | 6270 | #: builtin/for-each-ref.c:36 |
ef317cd5 | 6271 | msgid "show only <n> matched refs" |
07432cef | 6272 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 6273 | |
94550ed3 | 6274 | #: builtin/for-each-ref.c:37 builtin/tag.c:372 |
ef317cd5 | 6275 | msgid "format to use for the output" |
07432cef | 6276 | msgstr "输出格式" |
ef317cd5 | 6277 | |
94550ed3 JX |
6278 | #: builtin/for-each-ref.c:41 |
6279 | msgid "print only refs which points at the given object" | |
6280 | msgstr "只打印指向给定对象的引用" | |
ef317cd5 | 6281 | |
94550ed3 JX |
6282 | #: builtin/for-each-ref.c:43 |
6283 | msgid "print only refs that are merged" | |
6284 | msgstr "只打印已经合并的引用" | |
6285 | ||
6286 | #: builtin/for-each-ref.c:44 | |
6287 | msgid "print only refs that are not merged" | |
6288 | msgstr "只打印没有合并的引用" | |
ef317cd5 | 6289 | |
94550ed3 JX |
6290 | #: builtin/for-each-ref.c:45 |
6291 | msgid "print only refs which contain the commit" | |
6292 | msgstr "只打印包含该提交的引用" | |
6293 | ||
6294 | #: builtin/fsck.c:156 builtin/prune.c:140 | |
6c94aba5 JX |
6295 | msgid "Checking connectivity" |
6296 | msgstr "检查连接中" | |
6297 | ||
94550ed3 | 6298 | #: builtin/fsck.c:486 |
6c94aba5 JX |
6299 | msgid "Checking object directories" |
6300 | msgstr "检查对象目录中" | |
6301 | ||
94550ed3 | 6302 | #: builtin/fsck.c:553 |
814ff314 JX |
6303 | msgid "git fsck [<options>] [<object>...]" |
6304 | msgstr "git fsck [<选项>] [<对象>...]" | |
ef317cd5 | 6305 | |
94550ed3 | 6306 | #: builtin/fsck.c:559 |
ef317cd5 | 6307 | msgid "show unreachable objects" |
07432cef | 6308 | msgstr "显示不可达的对象" |
ef317cd5 | 6309 | |
94550ed3 | 6310 | #: builtin/fsck.c:560 |
ef317cd5 | 6311 | msgid "show dangling objects" |
07432cef | 6312 | msgstr "显示摇摆的对象" |
ef317cd5 | 6313 | |
94550ed3 | 6314 | #: builtin/fsck.c:561 |
ef317cd5 | 6315 | msgid "report tags" |
55a16ee4 | 6316 | msgstr "报告标签" |
ef317cd5 | 6317 | |
94550ed3 | 6318 | #: builtin/fsck.c:562 |
ef317cd5 | 6319 | msgid "report root nodes" |
07432cef | 6320 | msgstr "报告根节点" |
ef317cd5 | 6321 | |
94550ed3 | 6322 | #: builtin/fsck.c:563 |
ef317cd5 | 6323 | msgid "make index objects head nodes" |
07432cef | 6324 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 6325 | |
94550ed3 | 6326 | #: builtin/fsck.c:564 |
ef317cd5 | 6327 | msgid "make reflogs head nodes (default)" |
07432cef | 6328 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 6329 | |
94550ed3 | 6330 | #: builtin/fsck.c:565 |
ef317cd5 | 6331 | msgid "also consider packs and alternate objects" |
07432cef | 6332 | msgstr "也考虑包和备用对象" |
ef317cd5 | 6333 | |
94550ed3 | 6334 | #: builtin/fsck.c:566 |
1b7f4a34 JX |
6335 | msgid "check only connectivity" |
6336 | msgstr "仅检查连通性" | |
6337 | ||
94550ed3 | 6338 | #: builtin/fsck.c:567 |
ef317cd5 | 6339 | msgid "enable more strict checking" |
07432cef | 6340 | msgstr "启用更严格的检查" |
ef317cd5 | 6341 | |
94550ed3 | 6342 | #: builtin/fsck.c:569 |
ef317cd5 | 6343 | msgid "write dangling objects in .git/lost-found" |
07432cef | 6344 | msgstr "将摇摆对象写入 .git/lost-found 中" |
ef317cd5 | 6345 | |
94550ed3 | 6346 | #: builtin/fsck.c:570 builtin/prune.c:107 |
ef317cd5 | 6347 | msgid "show progress" |
07432cef | 6348 | msgstr "显示进度" |
ef317cd5 | 6349 | |
94550ed3 | 6350 | #: builtin/fsck.c:631 |
6c94aba5 JX |
6351 | msgid "Checking objects" |
6352 | msgstr "检查对象中" | |
6353 | ||
1b7f4a34 | 6354 | #: builtin/gc.c:25 |
814ff314 JX |
6355 | msgid "git gc [<options>]" |
6356 | msgstr "git gc [<选项>]" | |
ef317cd5 | 6357 | |
94550ed3 | 6358 | #: builtin/gc.c:72 |
c04f5ac3 | 6359 | #, c-format |
7aea43ff JX |
6360 | msgid "Invalid %s: '%s'" |
6361 | msgstr "无效 %s:'%s'" | |
c04f5ac3 | 6362 | |
94550ed3 | 6363 | #: builtin/gc.c:139 |
c04f5ac3 JX |
6364 | #, c-format |
6365 | msgid "insanely long object directory %.*s" | |
6366 | msgstr "不正常的长对象目录 %.*s" | |
6367 | ||
94550ed3 JX |
6368 | #: builtin/gc.c:290 |
6369 | #, c-format | |
6370 | msgid "" | |
6371 | "The last gc run reported the following. Please correct the root cause\n" | |
6372 | "and remove %s.\n" | |
6373 | "Automatic cleanup will not be performed until the file is removed.\n" | |
6374 | "\n" | |
6375 | "%s" | |
6376 | msgstr "" | |
6377 | "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" | |
6378 | "在该文件被删除之前,自动清理将不会执行。\n" | |
6379 | "\n" | |
6380 | "%s" | |
6381 | ||
6382 | #: builtin/gc.c:327 | |
ef317cd5 | 6383 | msgid "prune unreferenced objects" |
07432cef | 6384 | msgstr "清除未引用的对象" |
ef317cd5 | 6385 | |
94550ed3 | 6386 | #: builtin/gc.c:329 |
ef317cd5 | 6387 | msgid "be more thorough (increased runtime)" |
07432cef | 6388 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 6389 | |
94550ed3 | 6390 | #: builtin/gc.c:330 |
ef317cd5 | 6391 | msgid "enable auto-gc mode" |
07432cef | 6392 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 6393 | |
94550ed3 | 6394 | #: builtin/gc.c:331 |
90314792 JX |
6395 | msgid "force running gc even if there may be another gc running" |
6396 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
6397 | ||
94550ed3 | 6398 | #: builtin/gc.c:373 |
c04f5ac3 | 6399 | #, c-format |
6c94aba5 | 6400 | msgid "Auto packing the repository in background for optimum performance.\n" |
160fb2b2 | 6401 | msgstr "自动在后台执行仓库打包以求最佳性能。\n" |
6c94aba5 | 6402 | |
94550ed3 | 6403 | #: builtin/gc.c:375 |
6c94aba5 JX |
6404 | #, c-format |
6405 | msgid "Auto packing the repository for optimum performance.\n" | |
160fb2b2 | 6406 | msgstr "自动打包仓库以求最佳性能。\n" |
6c94aba5 | 6407 | |
94550ed3 | 6408 | #: builtin/gc.c:376 |
6c94aba5 JX |
6409 | #, c-format |
6410 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
6411 | msgstr "手工维护参见 \"git help gc\"。\n" | |
c04f5ac3 | 6412 | |
94550ed3 | 6413 | #: builtin/gc.c:397 |
90314792 JX |
6414 | #, c-format |
6415 | msgid "" | |
6416 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
6417 | msgstr "" | |
6418 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)" | |
6419 | ||
94550ed3 | 6420 | #: builtin/gc.c:441 |
c04f5ac3 JX |
6421 | msgid "" |
6422 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 6423 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 6424 | |
90314792 | 6425 | #: builtin/grep.c:23 |
814ff314 JX |
6426 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
6427 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" | |
ef317cd5 | 6428 | |
276ceeaa | 6429 | #: builtin/grep.c:219 |
c04f5ac3 JX |
6430 | #, c-format |
6431 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 6432 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 6433 | |
276ceeaa JX |
6434 | #: builtin/grep.c:277 |
6435 | #, c-format | |
6436 | msgid "invalid number of threads specified (%d) for %s" | |
6437 | msgstr "为 %2$s 设定的线程数 (%1$d) 无效" | |
6438 | ||
6439 | #: builtin/grep.c:452 builtin/grep.c:487 | |
c04f5ac3 JX |
6440 | #, c-format |
6441 | msgid "unable to read tree (%s)" | |
90e6ef53 | 6442 | msgstr "无法读取树(%s)" |
c04f5ac3 | 6443 | |
276ceeaa | 6444 | #: builtin/grep.c:502 |
c04f5ac3 JX |
6445 | #, c-format |
6446 | msgid "unable to grep from object of type %s" | |
6447 | msgstr "无法抓取来自于 %s 类型的对象" | |
6448 | ||
276ceeaa | 6449 | #: builtin/grep.c:558 |
c04f5ac3 JX |
6450 | #, c-format |
6451 | msgid "switch `%c' expects a numerical value" | |
6452 | msgstr "开关 `%c' 期望一个数字值" | |
6453 | ||
276ceeaa | 6454 | #: builtin/grep.c:575 |
c04f5ac3 JX |
6455 | #, c-format |
6456 | msgid "cannot open '%s'" | |
6457 | msgstr "不能打开 '%s'" | |
6458 | ||
276ceeaa | 6459 | #: builtin/grep.c:644 |
ef317cd5 | 6460 | msgid "search in index instead of in the work tree" |
07432cef | 6461 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 6462 | |
276ceeaa | 6463 | #: builtin/grep.c:646 |
ef317cd5 | 6464 | msgid "find in contents not managed by git" |
07432cef | 6465 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 JX |
6466 | |
6467 | # 译者:中文字符串拼接,可删除前导空格 | |
276ceeaa | 6468 | #: builtin/grep.c:648 |
ef317cd5 | 6469 | msgid "search in both tracked and untracked files" |
07432cef | 6470 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 6471 | |
276ceeaa | 6472 | #: builtin/grep.c:650 |
814ff314 JX |
6473 | msgid "ignore files specified via '.gitignore'" |
6474 | msgstr "忽略 '.gitignore' 包含的文件" | |
ef317cd5 | 6475 | |
276ceeaa | 6476 | #: builtin/grep.c:653 |
ef317cd5 | 6477 | msgid "show non-matching lines" |
07432cef | 6478 | msgstr "显示未匹配的行" |
ef317cd5 | 6479 | |
276ceeaa | 6480 | #: builtin/grep.c:655 |
ef317cd5 | 6481 | msgid "case insensitive matching" |
07432cef | 6482 | msgstr "不区分大小写匹配" |
ef317cd5 | 6483 | |
276ceeaa | 6484 | #: builtin/grep.c:657 |
ef317cd5 | 6485 | msgid "match patterns only at word boundaries" |
07432cef | 6486 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 6487 | |
276ceeaa | 6488 | #: builtin/grep.c:659 |
ef317cd5 | 6489 | msgid "process binary files as text" |
07432cef | 6490 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 6491 | |
276ceeaa | 6492 | #: builtin/grep.c:661 |
ef317cd5 | 6493 | msgid "don't match patterns in binary files" |
07432cef | 6494 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 6495 | |
276ceeaa | 6496 | #: builtin/grep.c:664 |
90314792 JX |
6497 | msgid "process binary files with textconv filters" |
6498 | msgstr "用 textconv 过滤器处理二进制文件" | |
6499 | ||
276ceeaa | 6500 | #: builtin/grep.c:666 |
ef317cd5 | 6501 | msgid "descend at most <depth> levels" |
07432cef | 6502 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 6503 | |
276ceeaa | 6504 | #: builtin/grep.c:670 |
ef317cd5 | 6505 | msgid "use extended POSIX regular expressions" |
07432cef | 6506 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 6507 | |
276ceeaa | 6508 | #: builtin/grep.c:673 |
ef317cd5 | 6509 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 6510 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 6511 | |
276ceeaa | 6512 | #: builtin/grep.c:676 |
ef317cd5 | 6513 | msgid "interpret patterns as fixed strings" |
07432cef | 6514 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 6515 | |
276ceeaa | 6516 | #: builtin/grep.c:679 |
ef317cd5 | 6517 | msgid "use Perl-compatible regular expressions" |
07432cef | 6518 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 6519 | |
276ceeaa | 6520 | #: builtin/grep.c:682 |
ef317cd5 | 6521 | msgid "show line numbers" |
07432cef | 6522 | msgstr "显示行号" |
ef317cd5 | 6523 | |
276ceeaa | 6524 | #: builtin/grep.c:683 |
ef317cd5 | 6525 | msgid "don't show filenames" |
07432cef | 6526 | msgstr "不显示文件名" |
ef317cd5 | 6527 | |
276ceeaa | 6528 | #: builtin/grep.c:684 |
ef317cd5 | 6529 | msgid "show filenames" |
07432cef | 6530 | msgstr "显示文件名" |
ef317cd5 | 6531 | |
276ceeaa | 6532 | #: builtin/grep.c:686 |
ef317cd5 | 6533 | msgid "show filenames relative to top directory" |
07432cef | 6534 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 6535 | |
276ceeaa | 6536 | #: builtin/grep.c:688 |
ef317cd5 | 6537 | msgid "show only filenames instead of matching lines" |
07432cef | 6538 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 6539 | |
276ceeaa | 6540 | #: builtin/grep.c:690 |
ef317cd5 | 6541 | msgid "synonym for --files-with-matches" |
07432cef | 6542 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 6543 | |
276ceeaa | 6544 | #: builtin/grep.c:693 |
ef317cd5 | 6545 | msgid "show only the names of files without match" |
07432cef | 6546 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 6547 | |
276ceeaa | 6548 | #: builtin/grep.c:695 |
ef317cd5 | 6549 | msgid "print NUL after filenames" |
07432cef | 6550 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 6551 | |
276ceeaa | 6552 | #: builtin/grep.c:697 |
ef317cd5 | 6553 | msgid "show the number of matches instead of matching lines" |
07432cef | 6554 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 6555 | |
276ceeaa | 6556 | #: builtin/grep.c:698 |
ef317cd5 | 6557 | msgid "highlight matches" |
07432cef | 6558 | msgstr "高亮显示匹配项" |
ef317cd5 | 6559 | |
276ceeaa | 6560 | #: builtin/grep.c:700 |
ef317cd5 | 6561 | msgid "print empty line between matches from different files" |
07432cef | 6562 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 6563 | |
276ceeaa | 6564 | #: builtin/grep.c:702 |
ef317cd5 | 6565 | msgid "show filename only once above matches from same file" |
07432cef | 6566 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 6567 | |
276ceeaa | 6568 | #: builtin/grep.c:705 |
ef317cd5 | 6569 | msgid "show <n> context lines before and after matches" |
07432cef | 6570 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 6571 | |
276ceeaa | 6572 | #: builtin/grep.c:708 |
ef317cd5 | 6573 | msgid "show <n> context lines before matches" |
07432cef | 6574 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 6575 | |
276ceeaa | 6576 | #: builtin/grep.c:710 |
ef317cd5 | 6577 | msgid "show <n> context lines after matches" |
07432cef | 6578 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 6579 | |
276ceeaa JX |
6580 | #: builtin/grep.c:712 |
6581 | msgid "use <n> worker threads" | |
6582 | msgstr "使用 <n> 个工作线程" | |
6583 | ||
6584 | #: builtin/grep.c:713 | |
ef317cd5 | 6585 | msgid "shortcut for -C NUM" |
07432cef | 6586 | msgstr "快捷键 -C 数字" |
ef317cd5 | 6587 | |
276ceeaa | 6588 | #: builtin/grep.c:716 |
ef317cd5 | 6589 | msgid "show a line with the function name before matches" |
07432cef | 6590 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 6591 | |
276ceeaa | 6592 | #: builtin/grep.c:718 |
ef317cd5 | 6593 | msgid "show the surrounding function" |
07432cef | 6594 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 6595 | |
276ceeaa | 6596 | #: builtin/grep.c:721 |
ef317cd5 | 6597 | msgid "read patterns from file" |
07432cef | 6598 | msgstr "从文件读取模式" |
ef317cd5 | 6599 | |
276ceeaa | 6600 | #: builtin/grep.c:723 |
ef317cd5 | 6601 | msgid "match <pattern>" |
07432cef | 6602 | msgstr "匹配 <模式>" |
ef317cd5 | 6603 | |
276ceeaa | 6604 | #: builtin/grep.c:725 |
ef317cd5 | 6605 | msgid "combine patterns specified with -e" |
07432cef | 6606 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 6607 | |
276ceeaa | 6608 | #: builtin/grep.c:737 |
ef317cd5 | 6609 | msgid "indicate hit with exit status without output" |
07432cef | 6610 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 6611 | |
276ceeaa | 6612 | #: builtin/grep.c:739 |
ef317cd5 | 6613 | msgid "show only matches from files that match all patterns" |
07432cef | 6614 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 6615 | |
276ceeaa | 6616 | #: builtin/grep.c:741 |
07432cef WS |
6617 | msgid "show parse tree for grep expression" |
6618 | msgstr "显示 grep 表达式的解析树" | |
6619 | ||
276ceeaa | 6620 | #: builtin/grep.c:745 |
ef317cd5 | 6621 | msgid "pager" |
07432cef | 6622 | msgstr "分页" |
ef317cd5 | 6623 | |
276ceeaa | 6624 | #: builtin/grep.c:745 |
ef317cd5 | 6625 | msgid "show matching files in the pager" |
07432cef | 6626 | msgstr "分页显示匹配的文件" |
ef317cd5 | 6627 | |
276ceeaa | 6628 | #: builtin/grep.c:748 |
ef317cd5 | 6629 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 6630 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 6631 | |
276ceeaa | 6632 | #: builtin/grep.c:811 |
c04f5ac3 JX |
6633 | msgid "no pattern given." |
6634 | msgstr "未提供模式匹配。" | |
6635 | ||
276ceeaa JX |
6636 | #: builtin/grep.c:843 builtin/index-pack.c:1475 |
6637 | #, c-format | |
6638 | msgid "invalid number of threads specified (%d)" | |
6639 | msgstr "指定的线程数无效(%d)" | |
6640 | ||
6641 | #: builtin/grep.c:873 | |
c04f5ac3 JX |
6642 | msgid "--open-files-in-pager only works on the worktree" |
6643 | msgstr "--open-files-in-pager 仅用于工作区" | |
6644 | ||
276ceeaa | 6645 | #: builtin/grep.c:899 |
c04f5ac3 | 6646 | msgid "--cached or --untracked cannot be used with --no-index." |
649900bc | 6647 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" |
c04f5ac3 | 6648 | |
276ceeaa | 6649 | #: builtin/grep.c:904 |
c04f5ac3 | 6650 | msgid "--no-index or --untracked cannot be used with revs." |
649900bc | 6651 | msgstr "--no-index 或 --untracked 不能和版本同时使用。" |
c04f5ac3 | 6652 | |
276ceeaa | 6653 | #: builtin/grep.c:907 |
c04f5ac3 | 6654 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
90e6ef53 | 6655 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" |
c04f5ac3 | 6656 | |
276ceeaa | 6657 | #: builtin/grep.c:915 |
c04f5ac3 JX |
6658 | msgid "both --cached and trees are given." |
6659 | msgstr "同时给出了 --cached 和树对象。" | |
6660 | ||
276ceeaa | 6661 | #: builtin/hash-object.c:81 |
ef317cd5 | 6662 | msgid "" |
814ff314 JX |
6663 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
6664 | "[--] <file>..." | |
ef317cd5 | 6665 | msgstr "" |
814ff314 JX |
6666 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
6667 | "[--] <文件>..." | |
ef317cd5 | 6668 | |
276ceeaa | 6669 | #: builtin/hash-object.c:82 |
94550ed3 JX |
6670 | msgid "git hash-object --stdin-paths" |
6671 | msgstr "git hash-object --stdin-paths" | |
ef317cd5 | 6672 | |
276ceeaa | 6673 | #: builtin/hash-object.c:93 |
ef317cd5 | 6674 | msgid "type" |
07432cef | 6675 | msgstr "类型" |
ef317cd5 | 6676 | |
276ceeaa | 6677 | #: builtin/hash-object.c:93 |
ef317cd5 | 6678 | msgid "object type" |
07432cef | 6679 | msgstr "对象类型" |
ef317cd5 | 6680 | |
276ceeaa | 6681 | #: builtin/hash-object.c:94 |
ef317cd5 | 6682 | msgid "write the object into the object database" |
07432cef | 6683 | msgstr "将对象写入对象数据库" |
ef317cd5 | 6684 | |
276ceeaa | 6685 | #: builtin/hash-object.c:96 |
ef317cd5 | 6686 | msgid "read the object from stdin" |
07432cef | 6687 | msgstr "从标准输入读取对象" |
ef317cd5 | 6688 | |
276ceeaa | 6689 | #: builtin/hash-object.c:98 |
ef317cd5 | 6690 | msgid "store file as is without filters" |
07432cef | 6691 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 | 6692 | |
276ceeaa | 6693 | #: builtin/hash-object.c:99 |
220c313c JX |
6694 | msgid "" |
6695 | "just hash any random garbage to create corrupt objects for debugging Git" | |
6696 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
6697 | ||
276ceeaa | 6698 | #: builtin/hash-object.c:100 |
ef317cd5 | 6699 | msgid "process file as it were from this path" |
07432cef | 6700 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 6701 | |
2e8451e8 | 6702 | #: builtin/help.c:41 |
ef317cd5 | 6703 | msgid "print all available commands" |
07432cef | 6704 | msgstr "打印所有可用的命令" |
ef317cd5 | 6705 | |
2e8451e8 | 6706 | #: builtin/help.c:42 |
4dcdc3d8 JX |
6707 | msgid "print list of useful guides" |
6708 | msgstr "显示有用的指南列表" | |
6709 | ||
2e8451e8 | 6710 | #: builtin/help.c:43 |
ef317cd5 | 6711 | msgid "show man page" |
07432cef | 6712 | msgstr "显示 man 手册" |
ef317cd5 | 6713 | |
2e8451e8 | 6714 | #: builtin/help.c:44 |
ef317cd5 | 6715 | msgid "show manual in web browser" |
07432cef | 6716 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 6717 | |
2e8451e8 | 6718 | #: builtin/help.c:46 |
ef317cd5 | 6719 | msgid "show info page" |
07432cef | 6720 | msgstr "显示 info 手册" |
ef317cd5 | 6721 | |
2e8451e8 | 6722 | #: builtin/help.c:52 |
814ff314 JX |
6723 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
6724 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" | |
ef317cd5 | 6725 | |
2e8451e8 | 6726 | #: builtin/help.c:64 |
81809b99 | 6727 | #, c-format |
8ada9598 | 6728 | msgid "unrecognized help format '%s'" |
81809b99 | 6729 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 6730 | |
220c313c | 6731 | #: builtin/help.c:91 |
8ada9598 | 6732 | msgid "Failed to start emacsclient." |
81809b99 | 6733 | msgstr "无法启动 emacsclient。" |
8ada9598 | 6734 | |
220c313c | 6735 | #: builtin/help.c:104 |
8ada9598 | 6736 | msgid "Failed to parse emacsclient version." |
81809b99 | 6737 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 6738 | |
220c313c | 6739 | #: builtin/help.c:112 |
8ada9598 JX |
6740 | #, c-format |
6741 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 6742 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 6743 | |
94550ed3 | 6744 | #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 |
81809b99 | 6745 | #, c-format |
8ada9598 | 6746 | msgid "failed to exec '%s': %s" |
81809b99 | 6747 | msgstr "无法执行 '%s':%s" |
8ada9598 | 6748 | |
276ceeaa | 6749 | #: builtin/help.c:205 |
8ada9598 JX |
6750 | #, c-format |
6751 | msgid "" | |
6752 | "'%s': path for unsupported man viewer.\n" | |
6753 | "Please consider using 'man.<tool>.cmd' instead." | |
6754 | msgstr "" | |
81809b99 | 6755 | "'%s':不支持的 man 手册查看器的路径。\n" |
d9d56b23 | 6756 | "请使用 'man.<工具>.cmd'。" |
8ada9598 | 6757 | |
276ceeaa | 6758 | #: builtin/help.c:217 |
8ada9598 JX |
6759 | #, c-format |
6760 | msgid "" | |
6761 | "'%s': cmd for supported man viewer.\n" | |
6762 | "Please consider using 'man.<tool>.path' instead." | |
6763 | msgstr "" | |
81809b99 | 6764 | "'%s': 支持的 man 手册查看器命令。\n" |
d9d56b23 | 6765 | "请使用 'man.<工具>.path'。" |
8ada9598 | 6766 | |
276ceeaa | 6767 | #: builtin/help.c:334 |
8ada9598 JX |
6768 | #, c-format |
6769 | msgid "'%s': unknown man viewer." | |
81809b99 | 6770 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 6771 | |
276ceeaa | 6772 | #: builtin/help.c:351 |
8ada9598 | 6773 | msgid "no man viewer handled the request" |
81809b99 | 6774 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 6775 | |
276ceeaa | 6776 | #: builtin/help.c:359 |
8ada9598 | 6777 | msgid "no info viewer handled the request" |
81809b99 | 6778 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 6779 | |
276ceeaa | 6780 | #: builtin/help.c:408 |
4dcdc3d8 JX |
6781 | msgid "Defining attributes per path" |
6782 | msgstr "定义路径的属性" | |
6783 | ||
276ceeaa | 6784 | #: builtin/help.c:409 |
220c313c JX |
6785 | msgid "Everyday Git With 20 Commands Or So" |
6786 | msgstr "每一天 Git 常用的约 20 条命令" | |
6787 | ||
276ceeaa | 6788 | #: builtin/help.c:410 |
4dcdc3d8 JX |
6789 | msgid "A Git glossary" |
6790 | msgstr "Git 词汇表" | |
6791 | ||
276ceeaa | 6792 | #: builtin/help.c:411 |
4dcdc3d8 JX |
6793 | msgid "Specifies intentionally untracked files to ignore" |
6794 | msgstr "忽略指定的未跟踪文件" | |
6795 | ||
276ceeaa | 6796 | #: builtin/help.c:412 |
4dcdc3d8 JX |
6797 | msgid "Defining submodule properties" |
6798 | msgstr "定义子模组属性" | |
6799 | ||
276ceeaa | 6800 | #: builtin/help.c:413 |
4dcdc3d8 JX |
6801 | msgid "Specifying revisions and ranges for Git" |
6802 | msgstr "指定 Git 的版本和版本范围" | |
6803 | ||
276ceeaa | 6804 | #: builtin/help.c:414 |
4dcdc3d8 JX |
6805 | msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" |
6806 | msgstr "一个 Git 教程(针对 1.5.1 或更新版本)" | |
6807 | ||
276ceeaa | 6808 | #: builtin/help.c:415 |
4dcdc3d8 JX |
6809 | msgid "An overview of recommended workflows with Git" |
6810 | msgstr "Git 推荐的工作流概览" | |
6811 | ||
276ceeaa | 6812 | #: builtin/help.c:427 |
4dcdc3d8 JX |
6813 | msgid "The common Git guides are:\n" |
6814 | msgstr "最常用的 Git 向导有:\n" | |
6815 | ||
276ceeaa | 6816 | #: builtin/help.c:448 builtin/help.c:465 |
8ada9598 JX |
6817 | #, c-format |
6818 | msgid "usage: %s%s" | |
81809b99 | 6819 | msgstr "用法:%s%s" |
8ada9598 | 6820 | |
276ceeaa | 6821 | #: builtin/help.c:481 |
8ada9598 JX |
6822 | #, c-format |
6823 | msgid "`git %s' is aliased to `%s'" | |
81809b99 | 6824 | msgstr "`git %s' 是 `%s' 的别名" |
8ada9598 | 6825 | |
1b7f4a34 | 6826 | #: builtin/index-pack.c:152 |
6acbf033 JX |
6827 | #, c-format |
6828 | msgid "unable to open %s" | |
6829 | msgstr "不能打开 %s" | |
6830 | ||
1b7f4a34 | 6831 | #: builtin/index-pack.c:202 |
8ada9598 JX |
6832 | #, c-format |
6833 | msgid "object type mismatch at %s" | |
81809b99 | 6834 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 6835 | |
1b7f4a34 | 6836 | #: builtin/index-pack.c:222 |
6acbf033 JX |
6837 | #, c-format |
6838 | msgid "did not receive expected object %s" | |
6839 | msgstr "未能获取期望的对象 %s" | |
8ada9598 | 6840 | |
1b7f4a34 | 6841 | #: builtin/index-pack.c:225 |
6acbf033 JX |
6842 | #, c-format |
6843 | msgid "object %s: expected type %s, found %s" | |
6844 | msgstr "对象 %s:期待类型 %s,却是 %s" | |
6845 | ||
1b7f4a34 | 6846 | #: builtin/index-pack.c:267 |
81809b99 | 6847 | #, c-format |
8ada9598 JX |
6848 | msgid "cannot fill %d byte" |
6849 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 6850 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 6851 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 6852 | |
1b7f4a34 | 6853 | #: builtin/index-pack.c:277 |
8ada9598 | 6854 | msgid "early EOF" |
81809b99 | 6855 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 6856 | |
1b7f4a34 | 6857 | #: builtin/index-pack.c:278 |
8ada9598 | 6858 | msgid "read error on input" |
81809b99 | 6859 | msgstr "输入上的读错误" |
8ada9598 | 6860 | |
1b7f4a34 | 6861 | #: builtin/index-pack.c:290 |
8ada9598 | 6862 | msgid "used more bytes than were available" |
81809b99 | 6863 | msgstr "用掉了超过可用的字节" |
8ada9598 | 6864 | |
1b7f4a34 | 6865 | #: builtin/index-pack.c:297 |
8ada9598 | 6866 | msgid "pack too large for current definition of off_t" |
81809b99 | 6867 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 6868 | |
1b7f4a34 | 6869 | #: builtin/index-pack.c:313 |
81809b99 | 6870 | #, c-format |
8ada9598 | 6871 | msgid "unable to create '%s'" |
81809b99 | 6872 | msgstr "不能创建 '%s'" |
8ada9598 | 6873 | |
1b7f4a34 | 6874 | #: builtin/index-pack.c:318 |
81809b99 | 6875 | #, c-format |
8ada9598 | 6876 | msgid "cannot open packfile '%s'" |
81809b99 | 6877 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 6878 | |
1b7f4a34 | 6879 | #: builtin/index-pack.c:332 |
8ada9598 | 6880 | msgid "pack signature mismatch" |
81809b99 | 6881 | msgstr "包签名不匹配" |
8ada9598 | 6882 | |
1b7f4a34 | 6883 | #: builtin/index-pack.c:334 |
ef317cd5 JX |
6884 | #, c-format |
6885 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 6886 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 6887 | |
1b7f4a34 | 6888 | #: builtin/index-pack.c:352 |
8ada9598 JX |
6889 | #, c-format |
6890 | msgid "pack has bad object at offset %lu: %s" | |
81809b99 | 6891 | msgstr "包中有错误的对象位于 %lu:%s" |
8ada9598 | 6892 | |
1b7f4a34 | 6893 | #: builtin/index-pack.c:473 |
8ada9598 JX |
6894 | #, c-format |
6895 | msgid "inflate returned %d" | |
81809b99 | 6896 | msgstr "解压缩返回 %d" |
8ada9598 | 6897 | |
1b7f4a34 | 6898 | #: builtin/index-pack.c:522 |
8ada9598 | 6899 | msgid "offset value overflow for delta base object" |
81809b99 | 6900 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 6901 | |
1b7f4a34 | 6902 | #: builtin/index-pack.c:530 |
8ada9598 | 6903 | msgid "delta base offset is out of bound" |
81809b99 | 6904 | msgstr "delta 基准偏移越界" |
8ada9598 | 6905 | |
1b7f4a34 | 6906 | #: builtin/index-pack.c:538 |
81809b99 | 6907 | #, c-format |
8ada9598 | 6908 | msgid "unknown object type %d" |
81809b99 | 6909 | msgstr "未知对象类型 %d" |
8ada9598 | 6910 | |
1b7f4a34 | 6911 | #: builtin/index-pack.c:569 |
8ada9598 | 6912 | msgid "cannot pread pack file" |
81809b99 | 6913 | msgstr "无法读取包文件" |
8ada9598 | 6914 | |
1b7f4a34 | 6915 | #: builtin/index-pack.c:571 |
8ada9598 JX |
6916 | #, c-format |
6917 | msgid "premature end of pack file, %lu byte missing" | |
6918 | msgid_plural "premature end of pack file, %lu bytes missing" | |
81809b99 | 6919 | msgstr[0] "包文件过早结束,缺少 %lu 字节" |
5ae481e0 | 6920 | msgstr[1] "包文件过早结束,缺少 %lu 字节" |
8ada9598 | 6921 | |
1b7f4a34 | 6922 | #: builtin/index-pack.c:597 |
8ada9598 | 6923 | msgid "serious inflate inconsistency" |
81809b99 | 6924 | msgstr "解压缩严重的不一致" |
8ada9598 | 6925 | |
1b7f4a34 JX |
6926 | #: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772 |
6927 | #: builtin/index-pack.c:806 builtin/index-pack.c:815 | |
8ada9598 JX |
6928 | #, c-format |
6929 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 6930 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 6931 | |
1b7f4a34 | 6932 | #: builtin/index-pack.c:746 builtin/pack-objects.c:162 |
814ff314 | 6933 | #: builtin/pack-objects.c:254 |
6792b93b JX |
6934 | #, c-format |
6935 | msgid "unable to read %s" | |
6936 | msgstr "不能读 %s" | |
6937 | ||
1b7f4a34 | 6938 | #: builtin/index-pack.c:812 |
6792b93b JX |
6939 | #, c-format |
6940 | msgid "cannot read existing object %s" | |
6941 | msgstr "不能读取现存对象 %s" | |
6942 | ||
1b7f4a34 | 6943 | #: builtin/index-pack.c:826 |
81809b99 | 6944 | #, c-format |
8ada9598 | 6945 | msgid "invalid blob object %s" |
160fb2b2 | 6946 | msgstr "无效的数据对象 %s" |
8ada9598 | 6947 | |
1b7f4a34 | 6948 | #: builtin/index-pack.c:840 |
81809b99 | 6949 | #, c-format |
8ada9598 | 6950 | msgid "invalid %s" |
81809b99 | 6951 | msgstr "无效的 %s" |
8ada9598 | 6952 | |
7aea43ff | 6953 | #: builtin/index-pack.c:843 |
8ada9598 | 6954 | msgid "Error in object" |
81809b99 | 6955 | msgstr "对象中出错" |
8ada9598 | 6956 | |
7aea43ff | 6957 | #: builtin/index-pack.c:845 |
8ada9598 JX |
6958 | #, c-format |
6959 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 6960 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 6961 | |
7aea43ff | 6962 | #: builtin/index-pack.c:917 builtin/index-pack.c:948 |
8ada9598 | 6963 | msgid "failed to apply delta" |
81809b99 | 6964 | msgstr "无法应用 delta" |
8ada9598 | 6965 | |
7aea43ff | 6966 | #: builtin/index-pack.c:1118 |
8ada9598 | 6967 | msgid "Receiving objects" |
81809b99 | 6968 | msgstr "接收对象中" |
8ada9598 | 6969 | |
7aea43ff | 6970 | #: builtin/index-pack.c:1118 |
8ada9598 | 6971 | msgid "Indexing objects" |
81809b99 | 6972 | msgstr "索引对象中" |
8ada9598 | 6973 | |
7aea43ff | 6974 | #: builtin/index-pack.c:1150 |
8ada9598 | 6975 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 6976 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 6977 | |
7aea43ff | 6978 | #: builtin/index-pack.c:1155 |
8ada9598 | 6979 | msgid "cannot fstat packfile" |
81809b99 | 6980 | msgstr "不能枚举包文件状态" |
8ada9598 | 6981 | |
7aea43ff | 6982 | #: builtin/index-pack.c:1158 |
8ada9598 | 6983 | msgid "pack has junk at the end" |
81809b99 | 6984 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 6985 | |
7aea43ff | 6986 | #: builtin/index-pack.c:1169 |
6792b93b JX |
6987 | msgid "confusion beyond insanity in parse_pack_objects()" |
6988 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
6989 | ||
7aea43ff | 6990 | #: builtin/index-pack.c:1194 |
8ada9598 | 6991 | msgid "Resolving deltas" |
81809b99 | 6992 | msgstr "处理 delta 中" |
8ada9598 | 6993 | |
7aea43ff | 6994 | #: builtin/index-pack.c:1205 |
07432cef | 6995 | #, c-format |
ef317cd5 | 6996 | msgid "unable to create thread: %s" |
07432cef | 6997 | msgstr "不能创建线程:%s" |
ef317cd5 | 6998 | |
7aea43ff | 6999 | #: builtin/index-pack.c:1247 |
8ada9598 | 7000 | msgid "confusion beyond insanity" |
81809b99 | 7001 | msgstr "不可理喻" |
8ada9598 | 7002 | |
7aea43ff | 7003 | #: builtin/index-pack.c:1253 |
ef317cd5 JX |
7004 | #, c-format |
7005 | msgid "completed with %d local objects" | |
07432cef | 7006 | msgstr "完成 %d 个本地对象" |
ef317cd5 | 7007 | |
7aea43ff | 7008 | #: builtin/index-pack.c:1263 |
ef317cd5 JX |
7009 | #, c-format |
7010 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 7011 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 7012 | |
7aea43ff | 7013 | #: builtin/index-pack.c:1267 |
8ada9598 JX |
7014 | #, c-format |
7015 | msgid "pack has %d unresolved delta" | |
7016 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 7017 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 7018 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 7019 | |
7aea43ff | 7020 | #: builtin/index-pack.c:1291 |
81809b99 | 7021 | #, c-format |
8ada9598 | 7022 | msgid "unable to deflate appended object (%d)" |
07432cef | 7023 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 7024 | |
7aea43ff | 7025 | #: builtin/index-pack.c:1367 |
8ada9598 JX |
7026 | #, c-format |
7027 | msgid "local object %s is corrupt" | |
81809b99 | 7028 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 7029 | |
7aea43ff | 7030 | #: builtin/index-pack.c:1391 |
8ada9598 | 7031 | msgid "error while closing pack file" |
81809b99 | 7032 | msgstr "关闭包文件时出错" |
8ada9598 | 7033 | |
7aea43ff | 7034 | #: builtin/index-pack.c:1404 |
81809b99 | 7035 | #, c-format |
8ada9598 | 7036 | msgid "cannot write keep file '%s'" |
81809b99 | 7037 | msgstr "无法写保留文件 '%s'" |
8ada9598 | 7038 | |
7aea43ff | 7039 | #: builtin/index-pack.c:1412 |
81809b99 | 7040 | #, c-format |
8ada9598 | 7041 | msgid "cannot close written keep file '%s'" |
81809b99 | 7042 | msgstr "无法关闭保留文件 '%s'" |
8ada9598 | 7043 | |
7aea43ff | 7044 | #: builtin/index-pack.c:1425 |
8ada9598 | 7045 | msgid "cannot store pack file" |
81809b99 | 7046 | msgstr "无法存储包文件" |
8ada9598 | 7047 | |
7aea43ff | 7048 | #: builtin/index-pack.c:1436 |
8ada9598 | 7049 | msgid "cannot store index file" |
81809b99 | 7050 | msgstr "无法存储索引文件" |
8ada9598 | 7051 | |
7aea43ff | 7052 | #: builtin/index-pack.c:1469 |
07432cef | 7053 | #, c-format |
ef317cd5 | 7054 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 7055 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 7056 | |
1b7f4a34 | 7057 | #: builtin/index-pack.c:1479 builtin/index-pack.c:1663 |
ef317cd5 JX |
7058 | #, c-format |
7059 | msgid "no threads support, ignoring %s" | |
07432cef | 7060 | msgstr "没有线程支持,忽略 %s" |
ef317cd5 | 7061 | |
7aea43ff | 7062 | #: builtin/index-pack.c:1537 |
81809b99 | 7063 | #, c-format |
8ada9598 | 7064 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 7065 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 7066 | |
7aea43ff | 7067 | #: builtin/index-pack.c:1539 |
81809b99 | 7068 | #, c-format |
8ada9598 | 7069 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 7070 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 7071 | |
7aea43ff | 7072 | #: builtin/index-pack.c:1586 |
81809b99 | 7073 | #, c-format |
8ada9598 JX |
7074 | msgid "non delta: %d object" |
7075 | msgid_plural "non delta: %d objects" | |
81809b99 | 7076 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 7077 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 7078 | |
7aea43ff | 7079 | #: builtin/index-pack.c:1593 |
8ada9598 JX |
7080 | #, c-format |
7081 | msgid "chain length = %d: %lu object" | |
7082 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 7083 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 7084 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 7085 | |
1b7f4a34 | 7086 | #: builtin/index-pack.c:1623 |
8ada9598 | 7087 | msgid "Cannot come back to cwd" |
81809b99 | 7088 | msgstr "无法返回当前工作目录" |
8ada9598 | 7089 | |
1b7f4a34 JX |
7090 | #: builtin/index-pack.c:1675 builtin/index-pack.c:1678 |
7091 | #: builtin/index-pack.c:1690 builtin/index-pack.c:1694 | |
81809b99 | 7092 | #, c-format |
8ada9598 | 7093 | msgid "bad %s" |
81809b99 | 7094 | msgstr "错误选项 %s" |
8ada9598 | 7095 | |
1b7f4a34 | 7096 | #: builtin/index-pack.c:1708 |
8ada9598 | 7097 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 7098 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 7099 | |
1b7f4a34 | 7100 | #: builtin/index-pack.c:1712 builtin/index-pack.c:1721 |
8ada9598 JX |
7101 | #, c-format |
7102 | msgid "packfile name '%s' does not end with '.pack'" | |
dbd6cced | 7103 | msgstr "包文件名 '%s' 没有以 '.pack' 结尾" |
8ada9598 | 7104 | |
1b7f4a34 | 7105 | #: builtin/index-pack.c:1729 |
8ada9598 | 7106 | msgid "--verify with no packfile name given" |
dbd6cced | 7107 | msgstr "--verify 没有提供包文件名参数" |
8ada9598 | 7108 | |
94550ed3 | 7109 | #: builtin/init-db.c:55 |
c04f5ac3 JX |
7110 | #, c-format |
7111 | msgid "cannot stat '%s'" | |
7112 | msgstr "不能枚举 '%s' 状态" | |
7113 | ||
94550ed3 | 7114 | #: builtin/init-db.c:61 |
c04f5ac3 JX |
7115 | #, c-format |
7116 | msgid "cannot stat template '%s'" | |
7117 | msgstr "不能枚举模版 '%s' 状态" | |
7118 | ||
94550ed3 | 7119 | #: builtin/init-db.c:66 |
c04f5ac3 JX |
7120 | #, c-format |
7121 | msgid "cannot opendir '%s'" | |
7122 | msgstr "不能打开目录 '%s'" | |
7123 | ||
94550ed3 | 7124 | #: builtin/init-db.c:77 |
c04f5ac3 JX |
7125 | #, c-format |
7126 | msgid "cannot readlink '%s'" | |
7127 | msgstr "不能读取链接 '%s'" | |
7128 | ||
94550ed3 | 7129 | #: builtin/init-db.c:79 |
c04f5ac3 JX |
7130 | #, c-format |
7131 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 7132 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 | 7133 | |
94550ed3 | 7134 | #: builtin/init-db.c:85 |
c04f5ac3 JX |
7135 | #, c-format |
7136 | msgid "cannot copy '%s' to '%s'" | |
7137 | msgstr "不能拷贝 '%s' 至 '%s'" | |
7138 | ||
94550ed3 | 7139 | #: builtin/init-db.c:89 |
c04f5ac3 JX |
7140 | #, c-format |
7141 | msgid "ignoring template %s" | |
7142 | msgstr "忽略模版 %s" | |
7143 | ||
94550ed3 | 7144 | #: builtin/init-db.c:118 |
c04f5ac3 JX |
7145 | #, c-format |
7146 | msgid "templates not found %s" | |
7147 | msgstr "模版未找到 %s" | |
7148 | ||
94550ed3 | 7149 | #: builtin/init-db.c:131 |
c04f5ac3 JX |
7150 | #, c-format |
7151 | msgid "not copying templates of a wrong format version %d from '%s'" | |
81809b99 | 7152 | msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版" |
c04f5ac3 | 7153 | |
94550ed3 | 7154 | #: builtin/init-db.c:309 builtin/init-db.c:312 |
c04f5ac3 JX |
7155 | #, c-format |
7156 | msgid "%s already exists" | |
7157 | msgstr "%s 已经存在" | |
7158 | ||
94550ed3 | 7159 | #: builtin/init-db.c:340 |
c04f5ac3 JX |
7160 | #, c-format |
7161 | msgid "unable to handle file type %d" | |
7162 | msgstr "不能处理 %d 类型的文件" | |
7163 | ||
94550ed3 | 7164 | #: builtin/init-db.c:343 |
c04f5ac3 JX |
7165 | #, c-format |
7166 | msgid "unable to move %s to %s" | |
7167 | msgstr "不能移动 %s 至 %s" | |
7168 | ||
6c94aba5 JX |
7169 | #. TRANSLATORS: The first '%s' is either "Reinitialized |
7170 | #. existing" or "Initialized empty", the second " shared" or | |
7171 | #. "", and the last '%s%s' is the verbatim directory name. | |
94550ed3 | 7172 | #: builtin/init-db.c:399 |
c04f5ac3 JX |
7173 | #, c-format |
7174 | msgid "%s%s Git repository in %s%s\n" | |
160fb2b2 | 7175 | msgstr "%s%s Git 仓库于 %s%s\n" |
c04f5ac3 | 7176 | |
94550ed3 | 7177 | #: builtin/init-db.c:400 |
c04f5ac3 JX |
7178 | msgid "Reinitialized existing" |
7179 | msgstr "重新初始化现存的" | |
7180 | ||
94550ed3 | 7181 | #: builtin/init-db.c:400 |
c04f5ac3 JX |
7182 | msgid "Initialized empty" |
7183 | msgstr "初始化空的" | |
7184 | ||
7e238ab7 | 7185 | # 译者:中文字符串拼接,可删除前导空格 |
94550ed3 | 7186 | #: builtin/init-db.c:401 |
c04f5ac3 | 7187 | msgid " shared" |
90e6ef53 | 7188 | msgstr "共享" |
c04f5ac3 | 7189 | |
94550ed3 | 7190 | #: builtin/init-db.c:448 |
ef317cd5 | 7191 | msgid "" |
a77c07d9 | 7192 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
814ff314 | 7193 | "shared[=<permissions>]] [<directory>]" |
ef317cd5 | 7194 | msgstr "" |
07432cef | 7195 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
814ff314 | 7196 | "[<目录>]" |
ef317cd5 | 7197 | |
94550ed3 | 7198 | #: builtin/init-db.c:471 |
ef317cd5 | 7199 | msgid "permissions" |
07432cef | 7200 | msgstr "权限" |
ef317cd5 | 7201 | |
94550ed3 | 7202 | #: builtin/init-db.c:472 |
ef317cd5 | 7203 | msgid "specify that the git repository is to be shared amongst several users" |
160fb2b2 | 7204 | msgstr "指定 git 仓库是多个用户之间共享的" |
ef317cd5 | 7205 | |
94550ed3 | 7206 | #: builtin/init-db.c:506 builtin/init-db.c:511 |
c04f5ac3 JX |
7207 | #, c-format |
7208 | msgid "cannot mkdir %s" | |
7209 | msgstr "不能创建目录 %s" | |
7210 | ||
94550ed3 | 7211 | #: builtin/init-db.c:515 |
c04f5ac3 JX |
7212 | #, c-format |
7213 | msgid "cannot chdir to %s" | |
7214 | msgstr "不能切换目录到 %s" | |
7215 | ||
94550ed3 | 7216 | #: builtin/init-db.c:536 |
c04f5ac3 JX |
7217 | #, c-format |
7218 | msgid "" | |
7219 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
7220 | "dir=<directory>)" | |
1e607449 | 7221 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
c04f5ac3 | 7222 | |
94550ed3 | 7223 | #: builtin/init-db.c:564 |
c04f5ac3 JX |
7224 | #, c-format |
7225 | msgid "Cannot access work tree '%s'" | |
7226 | msgstr "不能访问工作区 '%s'" | |
7227 | ||
220c313c JX |
7228 | #: builtin/interpret-trailers.c:15 |
7229 | msgid "" | |
276ceeaa JX |
7230 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " |
7231 | "<token>[(=|:)<value>])...] [<file>...]" | |
7232 | msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件>...]" | |
7233 | ||
7234 | #: builtin/interpret-trailers.c:26 | |
7235 | msgid "edit files in place" | |
7236 | msgstr "在原位编辑文件" | |
220c313c | 7237 | |
276ceeaa | 7238 | #: builtin/interpret-trailers.c:27 |
220c313c JX |
7239 | msgid "trim empty trailers" |
7240 | msgstr "删除空签名" | |
7241 | ||
276ceeaa | 7242 | #: builtin/interpret-trailers.c:28 |
220c313c JX |
7243 | msgid "trailer" |
7244 | msgstr "签名" | |
7245 | ||
276ceeaa | 7246 | #: builtin/interpret-trailers.c:29 |
220c313c JX |
7247 | msgid "trailer(s) to add" |
7248 | msgstr "要添加的签名" | |
7249 | ||
276ceeaa JX |
7250 | #: builtin/interpret-trailers.c:42 |
7251 | msgid "no input file given for in-place editing" | |
7252 | msgstr "没有给出要原位编辑的文件" | |
7253 | ||
1b7f4a34 | 7254 | #: builtin/log.c:43 |
7aea43ff | 7255 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
d9d56b23 | 7256 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" |
ef317cd5 | 7257 | |
1b7f4a34 | 7258 | #: builtin/log.c:44 |
814ff314 JX |
7259 | msgid "git show [<options>] <object>..." |
7260 | msgstr "git show [<选项>] <对象>..." | |
ef317cd5 | 7261 | |
1b7f4a34 | 7262 | #: builtin/log.c:83 |
220c313c JX |
7263 | #, c-format |
7264 | msgid "invalid --decorate option: %s" | |
7265 | msgstr "无效的 --decorate 选项:%s" | |
7266 | ||
1b7f4a34 | 7267 | #: builtin/log.c:131 |
ef317cd5 | 7268 | msgid "suppress diff output" |
07432cef | 7269 | msgstr "不显示差异输出" |
ef317cd5 | 7270 | |
1b7f4a34 | 7271 | #: builtin/log.c:132 |
ef317cd5 | 7272 | msgid "show source" |
07432cef | 7273 | msgstr "显示源" |
ef317cd5 | 7274 | |
1b7f4a34 | 7275 | #: builtin/log.c:133 |
07432cef WS |
7276 | msgid "Use mail map file" |
7277 | msgstr "使用邮件映射文件" | |
7278 | ||
1b7f4a34 | 7279 | #: builtin/log.c:134 |
ef317cd5 | 7280 | msgid "decorate options" |
07432cef | 7281 | msgstr "修饰选项" |
ef317cd5 | 7282 | |
1b7f4a34 | 7283 | #: builtin/log.c:137 |
220c313c JX |
7284 | msgid "Process line range n,m in file, counting from 1" |
7285 | msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" | |
7286 | ||
1b7f4a34 | 7287 | #: builtin/log.c:233 |
c04f5ac3 JX |
7288 | #, c-format |
7289 | msgid "Final output: %d %s\n" | |
7290 | msgstr "最终输出:%d %s\n" | |
7291 | ||
1b7f4a34 | 7292 | #: builtin/log.c:465 |
220c313c JX |
7293 | #, c-format |
7294 | msgid "git show %s: bad file" | |
7295 | msgstr "git show %s: 损坏的文件" | |
7296 | ||
1b7f4a34 | 7297 | #: builtin/log.c:479 builtin/log.c:572 |
c04f5ac3 JX |
7298 | #, c-format |
7299 | msgid "Could not read object %s" | |
90e6ef53 | 7300 | msgstr "不能读取对象 %s" |
c04f5ac3 | 7301 | |
1b7f4a34 | 7302 | #: builtin/log.c:596 |
c04f5ac3 JX |
7303 | #, c-format |
7304 | msgid "Unknown type: %d" | |
7305 | msgstr "未知类型:%d" | |
7306 | ||
276ceeaa | 7307 | #: builtin/log.c:715 |
c04f5ac3 JX |
7308 | msgid "format.headers without value" |
7309 | msgstr "format.headers 没有值" | |
7310 | ||
276ceeaa | 7311 | #: builtin/log.c:801 |
c04f5ac3 JX |
7312 | msgid "name of output directory is too long" |
7313 | msgstr "输出目录名太长" | |
7314 | ||
276ceeaa | 7315 | #: builtin/log.c:816 |
c04f5ac3 JX |
7316 | #, c-format |
7317 | msgid "Cannot open patch file %s" | |
7318 | msgstr "无法打开补丁文件 %s" | |
7319 | ||
276ceeaa | 7320 | #: builtin/log.c:830 |
c04f5ac3 JX |
7321 | msgid "Need exactly one range." |
7322 | msgstr "只需要一个范围。" | |
7323 | ||
276ceeaa | 7324 | #: builtin/log.c:840 |
c04f5ac3 JX |
7325 | msgid "Not a range." |
7326 | msgstr "不是一个范围。" | |
7327 | ||
276ceeaa | 7328 | #: builtin/log.c:946 |
c04f5ac3 JX |
7329 | msgid "Cover letter needs email format" |
7330 | msgstr "信封需要邮件地址格式" | |
7331 | ||
276ceeaa | 7332 | #: builtin/log.c:1025 |
c04f5ac3 JX |
7333 | #, c-format |
7334 | msgid "insane in-reply-to: %s" | |
7335 | msgstr "不正常的 in-reply-to:%s" | |
7336 | ||
276ceeaa | 7337 | #: builtin/log.c:1053 |
814ff314 JX |
7338 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
7339 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" | |
ef317cd5 | 7340 | |
276ceeaa | 7341 | #: builtin/log.c:1098 |
c04f5ac3 JX |
7342 | msgid "Two output directories?" |
7343 | msgstr "两个输出目录?" | |
7344 | ||
276ceeaa | 7345 | #: builtin/log.c:1214 |
ef317cd5 | 7346 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 7347 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 7348 | |
276ceeaa | 7349 | #: builtin/log.c:1217 |
ef317cd5 | 7350 | msgid "use [PATCH] even with multiple patches" |
07432cef | 7351 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 7352 | |
276ceeaa | 7353 | #: builtin/log.c:1221 |
ef317cd5 | 7354 | msgid "print patches to standard out" |
07432cef | 7355 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 7356 | |
276ceeaa | 7357 | #: builtin/log.c:1223 |
ef317cd5 | 7358 | msgid "generate a cover letter" |
07432cef | 7359 | msgstr "生成一封附信" |
c04f5ac3 | 7360 | |
276ceeaa | 7361 | #: builtin/log.c:1225 |
ef317cd5 | 7362 | msgid "use simple number sequence for output file names" |
07432cef | 7363 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 7364 | |
276ceeaa | 7365 | #: builtin/log.c:1226 |
ef317cd5 | 7366 | msgid "sfx" |
07432cef | 7367 | msgstr "后缀" |
ef317cd5 | 7368 | |
276ceeaa | 7369 | #: builtin/log.c:1227 |
ef317cd5 | 7370 | msgid "use <sfx> instead of '.patch'" |
07432cef | 7371 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 7372 | |
276ceeaa | 7373 | #: builtin/log.c:1229 |
ef317cd5 | 7374 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
7375 | msgstr "补丁以 <n> 开始编号,而不是1" |
7376 | ||
276ceeaa | 7377 | #: builtin/log.c:1231 |
07432cef WS |
7378 | msgid "mark the series as Nth re-roll" |
7379 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 7380 | |
276ceeaa | 7381 | #: builtin/log.c:1233 |
ef317cd5 | 7382 | msgid "Use [<prefix>] instead of [PATCH]" |
07432cef | 7383 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 7384 | |
276ceeaa | 7385 | #: builtin/log.c:1236 |
ef317cd5 | 7386 | msgid "store resulting files in <dir>" |
d9d56b23 | 7387 | msgstr "把结果文件存储在 <目录>" |
ef317cd5 | 7388 | |
276ceeaa | 7389 | #: builtin/log.c:1239 |
ef317cd5 | 7390 | msgid "don't strip/add [PATCH]" |
07432cef | 7391 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 7392 | |
276ceeaa | 7393 | #: builtin/log.c:1242 |
ef317cd5 | 7394 | msgid "don't output binary diffs" |
07432cef | 7395 | msgstr "不输出二进制差异" |
ef317cd5 | 7396 | |
276ceeaa | 7397 | #: builtin/log.c:1244 |
89f80d72 JX |
7398 | msgid "output all-zero hash in From header" |
7399 | msgstr "在 From 头信息中输出全为零的哈希值" | |
7400 | ||
276ceeaa | 7401 | #: builtin/log.c:1246 |
ef317cd5 | 7402 | msgid "don't include a patch matching a commit upstream" |
07432cef | 7403 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 7404 | |
276ceeaa | 7405 | #: builtin/log.c:1248 |
ef317cd5 | 7406 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 7407 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 7408 | |
276ceeaa | 7409 | #: builtin/log.c:1250 |
ef317cd5 | 7410 | msgid "Messaging" |
07432cef | 7411 | msgstr "邮件发送" |
ef317cd5 | 7412 | |
276ceeaa | 7413 | #: builtin/log.c:1251 |
ef317cd5 | 7414 | msgid "header" |
07432cef | 7415 | msgstr "header" |
ef317cd5 | 7416 | |
276ceeaa | 7417 | #: builtin/log.c:1252 |
ef317cd5 | 7418 | msgid "add email header" |
07432cef | 7419 | msgstr "添加邮件头" |
ef317cd5 | 7420 | |
276ceeaa | 7421 | #: builtin/log.c:1253 builtin/log.c:1255 |
ef317cd5 | 7422 | msgid "email" |
07432cef | 7423 | msgstr "邮件地址" |
ef317cd5 | 7424 | |
276ceeaa | 7425 | #: builtin/log.c:1253 |
ef317cd5 | 7426 | msgid "add To: header" |
07432cef | 7427 | msgstr "添加收件人" |
ef317cd5 | 7428 | |
276ceeaa | 7429 | #: builtin/log.c:1255 |
ef317cd5 | 7430 | msgid "add Cc: header" |
07432cef | 7431 | msgstr "添加抄送" |
ef317cd5 | 7432 | |
276ceeaa | 7433 | #: builtin/log.c:1257 |
2e8451e8 | 7434 | msgid "ident" |
d9d56b23 | 7435 | msgstr "标识" |
2e8451e8 | 7436 | |
276ceeaa | 7437 | #: builtin/log.c:1258 |
2e8451e8 | 7438 | msgid "set From address to <ident> (or committer ident if absent)" |
4375c10e | 7439 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)" |
2e8451e8 | 7440 | |
276ceeaa | 7441 | #: builtin/log.c:1260 |
ef317cd5 | 7442 | msgid "message-id" |
d9d56b23 | 7443 | msgstr "邮件标识" |
ef317cd5 | 7444 | |
276ceeaa | 7445 | #: builtin/log.c:1261 |
ef317cd5 | 7446 | msgid "make first mail a reply to <message-id>" |
d9d56b23 | 7447 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
ef317cd5 | 7448 | |
276ceeaa | 7449 | #: builtin/log.c:1262 builtin/log.c:1265 |
ef317cd5 | 7450 | msgid "boundary" |
07432cef | 7451 | msgstr "边界" |
ef317cd5 | 7452 | |
276ceeaa | 7453 | #: builtin/log.c:1263 |
ef317cd5 | 7454 | msgid "attach the patch" |
07432cef | 7455 | msgstr "附件方式添加补丁" |
ef317cd5 | 7456 | |
276ceeaa | 7457 | #: builtin/log.c:1266 |
ef317cd5 | 7458 | msgid "inline the patch" |
07432cef | 7459 | msgstr "内联显示补丁" |
ef317cd5 | 7460 | |
276ceeaa | 7461 | #: builtin/log.c:1270 |
ef317cd5 | 7462 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 7463 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 7464 | |
276ceeaa | 7465 | #: builtin/log.c:1272 |
ef317cd5 | 7466 | msgid "signature" |
07432cef | 7467 | msgstr "签名" |
ef317cd5 | 7468 | |
276ceeaa | 7469 | #: builtin/log.c:1273 |
ef317cd5 | 7470 | msgid "add a signature" |
07432cef | 7471 | msgstr "添加一个签名" |
ef317cd5 | 7472 | |
276ceeaa | 7473 | #: builtin/log.c:1275 |
6acbf033 JX |
7474 | msgid "add a signature from a file" |
7475 | msgstr "从文件添加一个签名" | |
7476 | ||
276ceeaa | 7477 | #: builtin/log.c:1276 |
ef317cd5 | 7478 | msgid "don't print the patch filenames" |
07432cef | 7479 | msgstr "不要打印补丁文件名" |
ef317cd5 | 7480 | |
276ceeaa | 7481 | #: builtin/log.c:1365 |
c04f5ac3 JX |
7482 | msgid "-n and -k are mutually exclusive." |
7483 | msgstr "-n 和 -k 互斥。" | |
7484 | ||
276ceeaa | 7485 | #: builtin/log.c:1367 |
c04f5ac3 JX |
7486 | msgid "--subject-prefix and -k are mutually exclusive." |
7487 | msgstr "--subject-prefix 和 -k 互斥。" | |
7488 | ||
276ceeaa | 7489 | #: builtin/log.c:1375 |
c04f5ac3 JX |
7490 | msgid "--name-only does not make sense" |
7491 | msgstr "--name-only 无意义" | |
7492 | ||
276ceeaa | 7493 | #: builtin/log.c:1377 |
c04f5ac3 JX |
7494 | msgid "--name-status does not make sense" |
7495 | msgstr "--name-status 无意义" | |
7496 | ||
276ceeaa | 7497 | #: builtin/log.c:1379 |
c04f5ac3 JX |
7498 | msgid "--check does not make sense" |
7499 | msgstr "--check 无意义" | |
7500 | ||
276ceeaa | 7501 | #: builtin/log.c:1407 |
c04f5ac3 JX |
7502 | msgid "standard output, or directory, which one?" |
7503 | msgstr "标准输出或目录,哪一个?" | |
7504 | ||
276ceeaa | 7505 | #: builtin/log.c:1409 |
c04f5ac3 JX |
7506 | #, c-format |
7507 | msgid "Could not create directory '%s'" | |
90e6ef53 | 7508 | msgstr "不能创建目录 '%s'" |
c04f5ac3 | 7509 | |
276ceeaa | 7510 | #: builtin/log.c:1506 |
6acbf033 JX |
7511 | #, c-format |
7512 | msgid "unable to read signature file '%s'" | |
7513 | msgstr "无法读取签名文件 '%s'" | |
7514 | ||
276ceeaa | 7515 | #: builtin/log.c:1569 |
c04f5ac3 JX |
7516 | msgid "Failed to create output files" |
7517 | msgstr "无法创建输出文件" | |
7518 | ||
276ceeaa | 7519 | #: builtin/log.c:1617 |
ef317cd5 | 7520 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 7521 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 7522 | |
276ceeaa | 7523 | #: builtin/log.c:1671 |
c04f5ac3 JX |
7524 | #, c-format |
7525 | msgid "" | |
7526 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
d9d56b23 | 7527 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
c04f5ac3 | 7528 | |
276ceeaa | 7529 | #: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 |
c04f5ac3 JX |
7530 | #, c-format |
7531 | msgid "Unknown commit %s" | |
7532 | msgstr "未知提交 %s" | |
7533 | ||
276ceeaa | 7534 | #: builtin/ls-files.c:378 |
814ff314 JX |
7535 | msgid "git ls-files [<options>] [<file>...]" |
7536 | msgstr "git ls-files [<选项>] [<文件>...]" | |
ef317cd5 | 7537 | |
276ceeaa | 7538 | #: builtin/ls-files.c:427 |
ef317cd5 | 7539 | msgid "identify the file status with tags" |
07432cef | 7540 | msgstr "用标签标识文件的状态" |
ef317cd5 | 7541 | |
276ceeaa | 7542 | #: builtin/ls-files.c:429 |
ef317cd5 | 7543 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 7544 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 7545 | |
276ceeaa | 7546 | #: builtin/ls-files.c:431 |
ef317cd5 | 7547 | msgid "show cached files in the output (default)" |
07432cef | 7548 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 7549 | |
276ceeaa | 7550 | #: builtin/ls-files.c:433 |
ef317cd5 | 7551 | msgid "show deleted files in the output" |
07432cef | 7552 | msgstr "显示已删除的文件" |
ef317cd5 | 7553 | |
276ceeaa | 7554 | #: builtin/ls-files.c:435 |
ef317cd5 | 7555 | msgid "show modified files in the output" |
07432cef | 7556 | msgstr "显示已修改的文件" |
ef317cd5 | 7557 | |
276ceeaa | 7558 | #: builtin/ls-files.c:437 |
ef317cd5 | 7559 | msgid "show other files in the output" |
07432cef | 7560 | msgstr "显示其它文件" |
ef317cd5 | 7561 | |
276ceeaa | 7562 | #: builtin/ls-files.c:439 |
ef317cd5 | 7563 | msgid "show ignored files in the output" |
07432cef | 7564 | msgstr "显示忽略的文件" |
ef317cd5 | 7565 | |
276ceeaa | 7566 | #: builtin/ls-files.c:442 |
ef317cd5 | 7567 | msgid "show staged contents' object name in the output" |
07432cef | 7568 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 7569 | |
276ceeaa | 7570 | #: builtin/ls-files.c:444 |
ef317cd5 | 7571 | msgid "show files on the filesystem that need to be removed" |
07432cef | 7572 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 7573 | |
276ceeaa | 7574 | #: builtin/ls-files.c:446 |
220c313c | 7575 | msgid "show 'other' directories' names only" |
07432cef | 7576 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 7577 | |
276ceeaa JX |
7578 | #: builtin/ls-files.c:448 |
7579 | msgid "show line endings of files" | |
7580 | msgstr "显示文件换行符格式" | |
7581 | ||
7582 | #: builtin/ls-files.c:450 | |
ef317cd5 | 7583 | msgid "don't show empty directories" |
07432cef | 7584 | msgstr "不显示空目录" |
ef317cd5 | 7585 | |
276ceeaa | 7586 | #: builtin/ls-files.c:453 |
ef317cd5 | 7587 | msgid "show unmerged files in the output" |
07432cef | 7588 | msgstr "显示未合并的文件" |
ef317cd5 | 7589 | |
276ceeaa | 7590 | #: builtin/ls-files.c:455 |
ef317cd5 | 7591 | msgid "show resolve-undo information" |
07432cef | 7592 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 7593 | |
276ceeaa | 7594 | #: builtin/ls-files.c:457 |
ef317cd5 | 7595 | msgid "skip files matching pattern" |
07432cef | 7596 | msgstr "匹配排除文件的模式" |
ef317cd5 | 7597 | |
276ceeaa | 7598 | #: builtin/ls-files.c:460 |
ef317cd5 | 7599 | msgid "exclude patterns are read from <file>" |
07432cef | 7600 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 7601 | |
276ceeaa | 7602 | #: builtin/ls-files.c:463 |
ef317cd5 | 7603 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 7604 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 7605 | |
276ceeaa | 7606 | #: builtin/ls-files.c:465 |
ef317cd5 | 7607 | msgid "add the standard git exclusions" |
07432cef | 7608 | msgstr "添加标准的 git 排除" |
ef317cd5 | 7609 | |
276ceeaa | 7610 | #: builtin/ls-files.c:468 |
ef317cd5 | 7611 | msgid "make the output relative to the project top directory" |
07432cef | 7612 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 7613 | |
276ceeaa | 7614 | #: builtin/ls-files.c:471 |
ef317cd5 | 7615 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 7616 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 7617 | |
276ceeaa | 7618 | #: builtin/ls-files.c:472 |
ef317cd5 | 7619 | msgid "tree-ish" |
07432cef | 7620 | msgstr "树或提交" |
ef317cd5 | 7621 | |
276ceeaa | 7622 | #: builtin/ls-files.c:473 |
ef317cd5 | 7623 | msgid "pretend that paths removed since <tree-ish> are still present" |
07432cef | 7624 | msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" |
ef317cd5 | 7625 | |
276ceeaa | 7626 | #: builtin/ls-files.c:475 |
ef317cd5 | 7627 | msgid "show debugging data" |
07432cef | 7628 | msgstr "显示调试数据" |
ef317cd5 | 7629 | |
276ceeaa JX |
7630 | #: builtin/ls-remote.c:7 |
7631 | msgid "" | |
7632 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
7633 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
7634 | " [--symref] [<repository> [<refs>...]]" | |
7635 | msgstr "" | |
7636 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
7637 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
7638 | " [--symref] [<仓库> [<引用>...]]" | |
7639 | ||
7640 | #: builtin/ls-remote.c:50 | |
7641 | msgid "do not print remote URL" | |
7642 | msgstr "不打印远程 URL" | |
7643 | ||
7644 | #: builtin/ls-remote.c:51 builtin/ls-remote.c:53 | |
7645 | msgid "exec" | |
7646 | msgstr "exec" | |
7647 | ||
7648 | #: builtin/ls-remote.c:52 builtin/ls-remote.c:54 | |
7649 | msgid "path of git-upload-pack on the remote host" | |
7650 | msgstr "远程主机上的 git-upload-pack 路径" | |
7651 | ||
7652 | #: builtin/ls-remote.c:56 | |
7653 | msgid "limit to tags" | |
7654 | msgstr "仅限于标签" | |
7655 | ||
7656 | #: builtin/ls-remote.c:57 | |
7657 | msgid "limit to heads" | |
7658 | msgstr "仅限于分支" | |
7659 | ||
7660 | #: builtin/ls-remote.c:58 | |
7661 | msgid "do not show peeled tags" | |
7662 | msgstr "不显示已解析的标签" | |
7663 | ||
7664 | #: builtin/ls-remote.c:60 | |
7665 | msgid "take url.<base>.insteadOf into account" | |
7666 | msgstr "参考 url.<base>.insteadOf 设置" | |
7667 | ||
7668 | #: builtin/ls-remote.c:62 | |
7669 | msgid "exit with exit code 2 if no matching refs are found" | |
7670 | msgstr "若未找到匹配的引用则以退出码2退出" | |
7671 | ||
7672 | #: builtin/ls-remote.c:64 | |
7673 | msgid "show underlying ref in addition to the object pointed by it" | |
7674 | msgstr "除了显示指向的对象外,显示指向的引用名" | |
7675 | ||
90314792 | 7676 | #: builtin/ls-tree.c:28 |
ef317cd5 | 7677 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
07432cef | 7678 | msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 7679 | |
94550ed3 | 7680 | #: builtin/ls-tree.c:128 |
ef317cd5 | 7681 | msgid "only show trees" |
07432cef | 7682 | msgstr "只显示树" |
ef317cd5 | 7683 | |
94550ed3 | 7684 | #: builtin/ls-tree.c:130 |
ef317cd5 | 7685 | msgid "recurse into subtrees" |
07432cef | 7686 | msgstr "递归到子树" |
ef317cd5 | 7687 | |
94550ed3 | 7688 | #: builtin/ls-tree.c:132 |
ef317cd5 | 7689 | msgid "show trees when recursing" |
07432cef | 7690 | msgstr "当递归时显示树" |
ef317cd5 | 7691 | |
94550ed3 | 7692 | #: builtin/ls-tree.c:135 |
ef317cd5 | 7693 | msgid "terminate entries with NUL byte" |
4375c10e | 7694 | msgstr "条目以 NUL 字符终止" |
ef317cd5 | 7695 | |
94550ed3 | 7696 | #: builtin/ls-tree.c:136 |
ef317cd5 | 7697 | msgid "include object size" |
07432cef | 7698 | msgstr "包括对象大小" |
ef317cd5 | 7699 | |
94550ed3 | 7700 | #: builtin/ls-tree.c:138 builtin/ls-tree.c:140 |
ef317cd5 | 7701 | msgid "list only filenames" |
07432cef | 7702 | msgstr "只列出文件名" |
ef317cd5 | 7703 | |
94550ed3 | 7704 | #: builtin/ls-tree.c:143 |
ef317cd5 | 7705 | msgid "use full path names" |
07432cef | 7706 | msgstr "使用文件的全路径" |
ef317cd5 | 7707 | |
94550ed3 | 7708 | #: builtin/ls-tree.c:145 |
ef317cd5 | 7709 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 7710 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 | 7711 | |
04cb2f28 | 7712 | #: builtin/merge.c:45 |
814ff314 JX |
7713 | msgid "git merge [<options>] [<commit>...]" |
7714 | msgstr "git merge [<选项>] [<提交>...]" | |
ef317cd5 | 7715 | |
04cb2f28 | 7716 | #: builtin/merge.c:46 |
814ff314 JX |
7717 | msgid "git merge [<options>] <msg> HEAD <commit>" |
7718 | msgstr "git merge [<选项>] <说明> HEAD <提交>" | |
ef317cd5 | 7719 | |
04cb2f28 | 7720 | #: builtin/merge.c:47 |
ef317cd5 | 7721 | msgid "git merge --abort" |
07432cef | 7722 | msgstr "git merge --abort" |
ef317cd5 | 7723 | |
04cb2f28 | 7724 | #: builtin/merge.c:100 |
c04f5ac3 JX |
7725 | msgid "switch `m' requires a value" |
7726 | msgstr "开关 `m' 需要一个值" | |
7727 | ||
04cb2f28 | 7728 | #: builtin/merge.c:137 |
c04f5ac3 JX |
7729 | #, c-format |
7730 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 7731 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 7732 | |
04cb2f28 | 7733 | #: builtin/merge.c:138 |
c04f5ac3 JX |
7734 | #, c-format |
7735 | msgid "Available strategies are:" | |
7736 | msgstr "可用的策略有:" | |
7737 | ||
04cb2f28 | 7738 | #: builtin/merge.c:143 |
c04f5ac3 JX |
7739 | #, c-format |
7740 | msgid "Available custom strategies are:" | |
7741 | msgstr "可用的自定义策略有:" | |
7742 | ||
276ceeaa | 7743 | #: builtin/merge.c:193 builtin/pull.c:123 |
ef317cd5 | 7744 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 7745 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 7746 | |
276ceeaa | 7747 | #: builtin/merge.c:196 builtin/pull.c:126 |
ef317cd5 | 7748 | msgid "show a diffstat at the end of the merge" |
07432cef | 7749 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 7750 | |
276ceeaa | 7751 | #: builtin/merge.c:197 builtin/pull.c:129 |
ef317cd5 | 7752 | msgid "(synonym to --stat)" |
07432cef | 7753 | msgstr "(和 --stat 同义)" |
ef317cd5 | 7754 | |
276ceeaa | 7755 | #: builtin/merge.c:199 builtin/pull.c:132 |
ef317cd5 | 7756 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 7757 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 7758 | |
276ceeaa | 7759 | #: builtin/merge.c:202 builtin/pull.c:135 |
ef317cd5 | 7760 | msgid "create a single commit instead of doing a merge" |
07432cef | 7761 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 7762 | |
276ceeaa | 7763 | #: builtin/merge.c:204 builtin/pull.c:138 |
ef317cd5 | 7764 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 7765 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 7766 | |
276ceeaa | 7767 | #: builtin/merge.c:206 builtin/pull.c:141 |
ef317cd5 | 7768 | msgid "edit message before committing" |
07432cef | 7769 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 7770 | |
04cb2f28 | 7771 | #: builtin/merge.c:207 |
ef317cd5 | 7772 | msgid "allow fast-forward (default)" |
07432cef | 7773 | msgstr "允许快进(默认)" |
ef317cd5 | 7774 | |
276ceeaa | 7775 | #: builtin/merge.c:209 builtin/pull.c:147 |
ef317cd5 | 7776 | msgid "abort if fast-forward is not possible" |
07432cef | 7777 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 7778 | |
04cb2f28 | 7779 | #: builtin/merge.c:213 |
1003b3a5 JX |
7780 | msgid "Verify that the named commit has a valid GPG signature" |
7781 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" | |
7782 | ||
276ceeaa | 7783 | #: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 |
1b7f4a34 | 7784 | #: builtin/revert.c:89 |
ef317cd5 | 7785 | msgid "strategy" |
07432cef | 7786 | msgstr "策略" |
ef317cd5 | 7787 | |
276ceeaa | 7788 | #: builtin/merge.c:215 builtin/pull.c:153 |
ef317cd5 | 7789 | msgid "merge strategy to use" |
07432cef | 7790 | msgstr "要使用的合并策略" |
ef317cd5 | 7791 | |
276ceeaa | 7792 | #: builtin/merge.c:216 builtin/pull.c:156 |
ef317cd5 | 7793 | msgid "option=value" |
07432cef | 7794 | msgstr "option=value" |
ef317cd5 | 7795 | |
276ceeaa | 7796 | #: builtin/merge.c:217 builtin/pull.c:157 |
ef317cd5 | 7797 | msgid "option for selected merge strategy" |
07432cef | 7798 | msgstr "所选的合并策略的选项" |
ef317cd5 | 7799 | |
04cb2f28 | 7800 | #: builtin/merge.c:219 |
ef317cd5 | 7801 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 7802 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 7803 | |
04cb2f28 | 7804 | #: builtin/merge.c:223 |
ef317cd5 | 7805 | msgid "abort the current in-progress merge" |
07432cef | 7806 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 7807 | |
04cb2f28 | 7808 | #: builtin/merge.c:251 |
c04f5ac3 JX |
7809 | msgid "could not run stash." |
7810 | msgstr "不能进行进度保存。" | |
7811 | ||
04cb2f28 | 7812 | #: builtin/merge.c:256 |
c04f5ac3 JX |
7813 | msgid "stash failed" |
7814 | msgstr "进度保存失败" | |
7815 | ||
04cb2f28 | 7816 | #: builtin/merge.c:261 |
c04f5ac3 JX |
7817 | #, c-format |
7818 | msgid "not a valid object: %s" | |
7819 | msgstr "不是一个有效对象:%s" | |
7820 | ||
04cb2f28 | 7821 | #: builtin/merge.c:280 builtin/merge.c:297 |
c04f5ac3 JX |
7822 | msgid "read-tree failed" |
7823 | msgstr "读取树失败" | |
7824 | ||
90e6ef53 | 7825 | # 译者:注意保持前导空格 |
04cb2f28 | 7826 | #: builtin/merge.c:327 |
c04f5ac3 JX |
7827 | msgid " (nothing to squash)" |
7828 | msgstr " (无可压缩)" | |
7829 | ||
04cb2f28 | 7830 | #: builtin/merge.c:340 |
c04f5ac3 JX |
7831 | #, c-format |
7832 | msgid "Squash commit -- not updating HEAD\n" | |
7833 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
7834 | ||
276ceeaa JX |
7835 | #: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 |
7836 | #: builtin/merge.c:989 | |
1b7f4a34 JX |
7837 | #, c-format |
7838 | msgid "Could not write to '%s'" | |
7839 | msgstr "不能写入 '%s'" | |
7840 | ||
04cb2f28 | 7841 | #: builtin/merge.c:372 |
c04f5ac3 JX |
7842 | msgid "Writing SQUASH_MSG" |
7843 | msgstr "写入 SQUASH_MSG" | |
7844 | ||
04cb2f28 | 7845 | #: builtin/merge.c:374 |
c04f5ac3 JX |
7846 | msgid "Finishing SQUASH_MSG" |
7847 | msgstr "完成 SQUASH_MSG" | |
7848 | ||
04cb2f28 | 7849 | #: builtin/merge.c:397 |
c04f5ac3 JX |
7850 | #, c-format |
7851 | msgid "No merge message -- not updating HEAD\n" | |
7852 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
7853 | ||
276ceeaa | 7854 | #: builtin/merge.c:448 |
c04f5ac3 JX |
7855 | #, c-format |
7856 | msgid "'%s' does not point to a commit" | |
7857 | msgstr "'%s' 没有指向一个提交" | |
7858 | ||
276ceeaa | 7859 | #: builtin/merge.c:538 |
c04f5ac3 JX |
7860 | #, c-format |
7861 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 7862 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 7863 | |
276ceeaa | 7864 | #: builtin/merge.c:657 |
c04f5ac3 JX |
7865 | msgid "Not handling anything other than two heads merge." |
7866 | msgstr "不能处理两个头合并之外的任何操作。" | |
7867 | ||
276ceeaa | 7868 | #: builtin/merge.c:671 |
c04f5ac3 JX |
7869 | #, c-format |
7870 | msgid "Unknown option for merge-recursive: -X%s" | |
7871 | msgstr "merge-recursive 的未知选项:-X%s" | |
7872 | ||
276ceeaa | 7873 | #: builtin/merge.c:684 |
c04f5ac3 JX |
7874 | #, c-format |
7875 | msgid "unable to write %s" | |
7876 | msgstr "不能写 %s" | |
7877 | ||
276ceeaa | 7878 | #: builtin/merge.c:773 |
c04f5ac3 JX |
7879 | #, c-format |
7880 | msgid "Could not read from '%s'" | |
7881 | msgstr "不能从 '%s' 读取" | |
7882 | ||
276ceeaa | 7883 | #: builtin/merge.c:782 |
c04f5ac3 JX |
7884 | #, c-format |
7885 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
7886 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
7887 | ||
276ceeaa | 7888 | #: builtin/merge.c:788 |
a77c07d9 | 7889 | #, c-format |
c04f5ac3 JX |
7890 | msgid "" |
7891 | "Please enter a commit message to explain why this merge is necessary,\n" | |
7892 | "especially if it merges an updated upstream into a topic branch.\n" | |
7893 | "\n" | |
a77c07d9 | 7894 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" |
c04f5ac3 JX |
7895 | "the commit.\n" |
7896 | msgstr "" | |
7897 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
7898 | "合并到主题分支。\n" | |
7899 | "\n" | |
a77c07d9 | 7900 | "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n" |
c04f5ac3 | 7901 | |
276ceeaa | 7902 | #: builtin/merge.c:812 |
c04f5ac3 JX |
7903 | msgid "Empty commit message." |
7904 | msgstr "空提交信息。" | |
7905 | ||
276ceeaa | 7906 | #: builtin/merge.c:824 |
c04f5ac3 JX |
7907 | #, c-format |
7908 | msgid "Wonderful.\n" | |
7909 | msgstr "太棒了。\n" | |
7910 | ||
276ceeaa | 7911 | #: builtin/merge.c:879 |
c04f5ac3 JX |
7912 | #, c-format |
7913 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
7914 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
7915 | ||
276ceeaa | 7916 | #: builtin/merge.c:895 |
c04f5ac3 JX |
7917 | #, c-format |
7918 | msgid "'%s' is not a commit" | |
7919 | msgstr "'%s' 不是一个提交" | |
7920 | ||
276ceeaa | 7921 | #: builtin/merge.c:936 |
c04f5ac3 | 7922 | msgid "No current branch." |
90e6ef53 | 7923 | msgstr "没有当前分支。" |
c04f5ac3 | 7924 | |
276ceeaa | 7925 | #: builtin/merge.c:938 |
c04f5ac3 | 7926 | msgid "No remote for the current branch." |
160fb2b2 | 7927 | msgstr "当前分支没有对应的远程仓库。" |
c04f5ac3 | 7928 | |
276ceeaa | 7929 | #: builtin/merge.c:940 |
c04f5ac3 | 7930 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 7931 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 7932 | |
276ceeaa | 7933 | #: builtin/merge.c:945 |
170e9899 | 7934 | #, c-format |
2e8451e8 JX |
7935 | msgid "No remote-tracking branch for %s from %s" |
7936 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 7937 | |
276ceeaa | 7938 | #: builtin/merge.c:1080 |
7aea43ff JX |
7939 | #, c-format |
7940 | msgid "could not close '%s'" | |
7941 | msgstr "不能关闭 '%s'" | |
7942 | ||
276ceeaa | 7943 | #: builtin/merge.c:1207 |
c04f5ac3 | 7944 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 7945 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 7946 | |
276ceeaa | 7947 | #: builtin/merge.c:1223 |
c04f5ac3 JX |
7948 | msgid "" |
7949 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
220c313c | 7950 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
7951 | msgstr "" |
7952 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 7953 | "请在合并前先提交您的修改。" |
c04f5ac3 | 7954 | |
276ceeaa | 7955 | #: builtin/merge.c:1230 |
c04f5ac3 JX |
7956 | msgid "" |
7957 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
220c313c | 7958 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
7959 | msgstr "" |
7960 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 7961 | "请在合并前先提交您的修改。" |
c04f5ac3 | 7962 | |
276ceeaa | 7963 | #: builtin/merge.c:1233 |
c04f5ac3 JX |
7964 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
7965 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
7966 | ||
276ceeaa | 7967 | #: builtin/merge.c:1242 |
c04f5ac3 | 7968 | msgid "You cannot combine --squash with --no-ff." |
649900bc | 7969 | msgstr "您不能将 --squash 与 --no-ff 同时使用。" |
c04f5ac3 | 7970 | |
276ceeaa | 7971 | #: builtin/merge.c:1250 |
c04f5ac3 | 7972 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 7973 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 7974 | |
276ceeaa | 7975 | #: builtin/merge.c:1267 |
c04f5ac3 JX |
7976 | msgid "Squash commit into empty head not supported yet" |
7977 | msgstr "尚不支持到空分支的压缩提交" | |
7978 | ||
276ceeaa | 7979 | #: builtin/merge.c:1269 |
c04f5ac3 JX |
7980 | msgid "Non-fast-forward commit does not make sense into an empty head" |
7981 | msgstr "到空分支的非快进式提交没有意义" | |
7982 | ||
276ceeaa | 7983 | #: builtin/merge.c:1275 |
2e8451e8 JX |
7984 | #, c-format |
7985 | msgid "%s - not something we can merge" | |
7986 | msgstr "%s - 不能被合并" | |
7987 | ||
276ceeaa | 7988 | #: builtin/merge.c:1277 |
7aea43ff JX |
7989 | msgid "Can merge only exactly one commit into empty head" |
7990 | msgstr "只能将一个提交合并到空分支上" | |
7991 | ||
276ceeaa | 7992 | #: builtin/merge.c:1332 |
1003b3a5 JX |
7993 | #, c-format |
7994 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
7995 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
7996 | ||
276ceeaa | 7997 | #: builtin/merge.c:1335 |
1003b3a5 JX |
7998 | #, c-format |
7999 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
8000 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
8001 | ||
276ceeaa | 8002 | #: builtin/merge.c:1338 |
1003b3a5 JX |
8003 | #, c-format |
8004 | msgid "Commit %s does not have a GPG signature." | |
8005 | msgstr "提交 %s 没有一个 GPG 签名。" | |
8006 | ||
276ceeaa | 8007 | #: builtin/merge.c:1341 |
1003b3a5 JX |
8008 | #, c-format |
8009 | msgid "Commit %s has a good GPG signature by %s\n" | |
8010 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
8011 | ||
276ceeaa | 8012 | #: builtin/merge.c:1424 |
c04f5ac3 JX |
8013 | #, c-format |
8014 | msgid "Updating %s..%s\n" | |
8015 | msgstr "更新 %s..%s\n" | |
8016 | ||
276ceeaa | 8017 | #: builtin/merge.c:1461 |
c04f5ac3 JX |
8018 | #, c-format |
8019 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 8020 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 8021 | |
276ceeaa | 8022 | #: builtin/merge.c:1468 |
c04f5ac3 JX |
8023 | #, c-format |
8024 | msgid "Nope.\n" | |
8025 | msgstr "无。\n" | |
8026 | ||
276ceeaa | 8027 | #: builtin/merge.c:1500 |
c04f5ac3 | 8028 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 8029 | msgstr "无法快进,终止。" |
c04f5ac3 | 8030 | |
276ceeaa | 8031 | #: builtin/merge.c:1523 builtin/merge.c:1602 |
c04f5ac3 JX |
8032 | #, c-format |
8033 | msgid "Rewinding the tree to pristine...\n" | |
8034 | msgstr "将树回滚至原始状态...\n" | |
8035 | ||
276ceeaa | 8036 | #: builtin/merge.c:1527 |
c04f5ac3 JX |
8037 | #, c-format |
8038 | msgid "Trying merge strategy %s...\n" | |
8039 | msgstr "尝试合并策略 %s...\n" | |
8040 | ||
276ceeaa | 8041 | #: builtin/merge.c:1593 |
c04f5ac3 JX |
8042 | #, c-format |
8043 | msgid "No merge strategy handled the merge.\n" | |
8044 | msgstr "没有合并策略处理此合并。\n" | |
8045 | ||
276ceeaa | 8046 | #: builtin/merge.c:1595 |
c04f5ac3 JX |
8047 | #, c-format |
8048 | msgid "Merge with strategy %s failed.\n" | |
8049 | msgstr "使用策略 %s 合并失败。\n" | |
8050 | ||
276ceeaa | 8051 | #: builtin/merge.c:1604 |
c04f5ac3 JX |
8052 | #, c-format |
8053 | msgid "Using the %s to prepare resolving by hand.\n" | |
8054 | msgstr "使用 %s 以准备手工解决。\n" | |
8055 | ||
276ceeaa | 8056 | #: builtin/merge.c:1616 |
c04f5ac3 JX |
8057 | #, c-format |
8058 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
8059 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
8060 | ||
cfff71a9 | 8061 | #: builtin/merge-base.c:29 |
814ff314 JX |
8062 | msgid "git merge-base [-a | --all] <commit> <commit>..." |
8063 | msgstr "git merge-base [-a | --all] <提交> <提交>..." | |
ef317cd5 | 8064 | |
cfff71a9 | 8065 | #: builtin/merge-base.c:30 |
814ff314 JX |
8066 | msgid "git merge-base [-a | --all] --octopus <commit>..." |
8067 | msgstr "git merge-base [-a | --all] --octopus <提交>..." | |
ef317cd5 | 8068 | |
cfff71a9 | 8069 | #: builtin/merge-base.c:31 |
ef317cd5 | 8070 | msgid "git merge-base --independent <commit>..." |
07432cef | 8071 | msgstr "git merge-base --independent <提交>..." |
ef317cd5 | 8072 | |
cfff71a9 | 8073 | #: builtin/merge-base.c:32 |
ef317cd5 | 8074 | msgid "git merge-base --is-ancestor <commit> <commit>" |
07432cef | 8075 | msgstr "git merge-base --is-ancestor <提交> <提交>" |
ef317cd5 | 8076 | |
cfff71a9 JX |
8077 | #: builtin/merge-base.c:33 |
8078 | msgid "git merge-base --fork-point <ref> [<commit>]" | |
d9d56b23 | 8079 | msgstr "git merge-base --fork-point <引用> [<提交>]" |
cfff71a9 JX |
8080 | |
8081 | #: builtin/merge-base.c:214 | |
ef317cd5 | 8082 | msgid "output all common ancestors" |
07432cef | 8083 | msgstr "输出所有共同的祖先" |
ef317cd5 | 8084 | |
cfff71a9 | 8085 | #: builtin/merge-base.c:216 |
ef317cd5 | 8086 | msgid "find ancestors for a single n-way merge" |
07432cef | 8087 | msgstr "查找一个多路合并的祖先提交" |
ef317cd5 | 8088 | |
cfff71a9 | 8089 | #: builtin/merge-base.c:218 |
ef317cd5 | 8090 | msgid "list revs not reachable from others" |
07432cef | 8091 | msgstr "显示不能被其他访问到的版本" |
ef317cd5 | 8092 | |
cfff71a9 | 8093 | #: builtin/merge-base.c:220 |
ef317cd5 | 8094 | msgid "is the first one ancestor of the other?" |
07432cef | 8095 | msgstr "第一个是其他的祖先提交么?" |
ef317cd5 | 8096 | |
cfff71a9 JX |
8097 | #: builtin/merge-base.c:222 |
8098 | msgid "find where <commit> forked from reflog of <ref>" | |
e397e7e3 | 8099 | msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" |
cfff71a9 | 8100 | |
ef317cd5 JX |
8101 | #: builtin/merge-file.c:8 |
8102 | msgid "" | |
814ff314 JX |
8103 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " |
8104 | "<orig-file> <file2>" | |
ef317cd5 | 8105 | msgstr "" |
814ff314 JX |
8106 | "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" |
8107 | "件> <文件2>" | |
ef317cd5 JX |
8108 | |
8109 | #: builtin/merge-file.c:33 | |
8110 | msgid "send results to standard output" | |
07432cef | 8111 | msgstr "将结果发送到标准输出" |
ef317cd5 JX |
8112 | |
8113 | #: builtin/merge-file.c:34 | |
8114 | msgid "use a diff3 based merge" | |
07432cef | 8115 | msgstr "使用基于 diff3 的合并" |
ef317cd5 JX |
8116 | |
8117 | #: builtin/merge-file.c:35 | |
8118 | msgid "for conflicts, use our version" | |
07432cef | 8119 | msgstr "如果冲突,使用我们的版本" |
ef317cd5 JX |
8120 | |
8121 | #: builtin/merge-file.c:37 | |
8122 | msgid "for conflicts, use their version" | |
07432cef | 8123 | msgstr "如果冲突,使用他们的版本" |
ef317cd5 JX |
8124 | |
8125 | #: builtin/merge-file.c:39 | |
8126 | msgid "for conflicts, use a union version" | |
07432cef | 8127 | msgstr "如果冲突,使用联合版本" |
ef317cd5 JX |
8128 | |
8129 | #: builtin/merge-file.c:42 | |
8130 | msgid "for conflicts, use this marker size" | |
07432cef | 8131 | msgstr "如果冲突,使用指定长度的标记" |
ef317cd5 JX |
8132 | |
8133 | #: builtin/merge-file.c:43 | |
8134 | msgid "do not warn about conflicts" | |
07432cef | 8135 | msgstr "不要警告冲突" |
ef317cd5 JX |
8136 | |
8137 | #: builtin/merge-file.c:45 | |
814ff314 JX |
8138 | msgid "set labels for file1/orig-file/file2" |
8139 | msgstr "为 文件1/初始文件/文件2 设置标签" | |
c04f5ac3 | 8140 | |
276ceeaa | 8141 | #: builtin/mktree.c:65 |
ef317cd5 | 8142 | msgid "git mktree [-z] [--missing] [--batch]" |
07432cef | 8143 | msgstr "git mktree [-z] [--missing] [--batch]" |
c04f5ac3 | 8144 | |
276ceeaa | 8145 | #: builtin/mktree.c:152 |
ef317cd5 | 8146 | msgid "input is NUL terminated" |
07432cef | 8147 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 8148 | |
276ceeaa | 8149 | #: builtin/mktree.c:153 builtin/write-tree.c:24 |
ef317cd5 | 8150 | msgid "allow missing objects" |
07432cef | 8151 | msgstr "允许丢失的对象" |
c04f5ac3 | 8152 | |
276ceeaa | 8153 | #: builtin/mktree.c:154 |
ef317cd5 | 8154 | msgid "allow creation of more than one tree" |
07432cef | 8155 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 8156 | |
90314792 | 8157 | #: builtin/mv.c:15 |
814ff314 JX |
8158 | msgid "git mv [<options>] <source>... <destination>" |
8159 | msgstr "git mv [<选项>] <源>... <目标>" | |
c04f5ac3 | 8160 | |
276ceeaa | 8161 | #: builtin/mv.c:70 |
220c313c JX |
8162 | #, c-format |
8163 | msgid "Directory %s is in index and no submodule?" | |
8164 | msgstr "目录 %s 在索引中并且不是子模组?" | |
8165 | ||
276ceeaa | 8166 | #: builtin/mv.c:72 |
220c313c | 8167 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
160fb2b2 | 8168 | msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续" |
220c313c | 8169 | |
276ceeaa | 8170 | #: builtin/mv.c:90 |
220c313c JX |
8171 | #, c-format |
8172 | msgid "%.*s is in index" | |
8173 | msgstr "%.*s 在索引中" | |
8174 | ||
276ceeaa | 8175 | #: builtin/mv.c:112 |
ef317cd5 | 8176 | msgid "force move/rename even if target exists" |
07432cef | 8177 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 8178 | |
276ceeaa | 8179 | #: builtin/mv.c:113 |
ef317cd5 | 8180 | msgid "skip move/rename errors" |
07432cef | 8181 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 8182 | |
276ceeaa | 8183 | #: builtin/mv.c:152 |
220c313c JX |
8184 | #, c-format |
8185 | msgid "destination '%s' is not a directory" | |
8186 | msgstr "目标 '%s' 不是一个目录" | |
8187 | ||
276ceeaa | 8188 | #: builtin/mv.c:163 |
c04f5ac3 JX |
8189 | #, c-format |
8190 | msgid "Checking rename of '%s' to '%s'\n" | |
8191 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
8192 | ||
276ceeaa | 8193 | #: builtin/mv.c:167 |
c04f5ac3 JX |
8194 | msgid "bad source" |
8195 | msgstr "坏的源" | |
8196 | ||
276ceeaa | 8197 | #: builtin/mv.c:170 |
c04f5ac3 JX |
8198 | msgid "can not move directory into itself" |
8199 | msgstr "不能将目录移动到自身" | |
8200 | ||
276ceeaa | 8201 | #: builtin/mv.c:173 |
c04f5ac3 JX |
8202 | msgid "cannot move directory over file" |
8203 | msgstr "不能将目录移动到文件" | |
8204 | ||
276ceeaa | 8205 | #: builtin/mv.c:182 |
c04f5ac3 JX |
8206 | msgid "source directory is empty" |
8207 | msgstr "源目录为空" | |
8208 | ||
276ceeaa | 8209 | #: builtin/mv.c:207 |
c04f5ac3 JX |
8210 | msgid "not under version control" |
8211 | msgstr "不在版本控制之下" | |
8212 | ||
276ceeaa | 8213 | #: builtin/mv.c:210 |
c04f5ac3 JX |
8214 | msgid "destination exists" |
8215 | msgstr "目标已存在" | |
8216 | ||
276ceeaa | 8217 | #: builtin/mv.c:218 |
c04f5ac3 JX |
8218 | #, c-format |
8219 | msgid "overwriting '%s'" | |
8220 | msgstr "覆盖 '%s'" | |
8221 | ||
276ceeaa | 8222 | #: builtin/mv.c:221 |
c04f5ac3 JX |
8223 | msgid "Cannot overwrite" |
8224 | msgstr "不能覆盖" | |
8225 | ||
276ceeaa | 8226 | #: builtin/mv.c:224 |
c04f5ac3 JX |
8227 | msgid "multiple sources for the same target" |
8228 | msgstr "同一目标具有多个源" | |
8229 | ||
276ceeaa | 8230 | #: builtin/mv.c:226 |
cfff71a9 JX |
8231 | msgid "destination directory does not exist" |
8232 | msgstr "目标目录不存在" | |
8233 | ||
276ceeaa | 8234 | #: builtin/mv.c:233 |
c04f5ac3 JX |
8235 | #, c-format |
8236 | msgid "%s, source=%s, destination=%s" | |
8237 | msgstr "%s,源=%s,目标=%s" | |
8238 | ||
276ceeaa | 8239 | #: builtin/mv.c:254 |
c04f5ac3 JX |
8240 | #, c-format |
8241 | msgid "Renaming %s to %s\n" | |
8242 | msgstr "重命名 %s 至 %s\n" | |
8243 | ||
276ceeaa | 8244 | #: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 |
c04f5ac3 JX |
8245 | #, c-format |
8246 | msgid "renaming '%s' failed" | |
8247 | msgstr "重命名 '%s' 失败" | |
8248 | ||
94550ed3 | 8249 | #: builtin/name-rev.c:251 |
814ff314 JX |
8250 | msgid "git name-rev [<options>] <commit>..." |
8251 | msgstr "git name-rev [<选项>] <提交>..." | |
ef317cd5 | 8252 | |
94550ed3 | 8253 | #: builtin/name-rev.c:252 |
814ff314 JX |
8254 | msgid "git name-rev [<options>] --all" |
8255 | msgstr "git name-rev [<选项>] --all" | |
ef317cd5 | 8256 | |
94550ed3 | 8257 | #: builtin/name-rev.c:253 |
814ff314 JX |
8258 | msgid "git name-rev [<options>] --stdin" |
8259 | msgstr "git name-rev [<选项>] --stdin" | |
ef317cd5 | 8260 | |
94550ed3 | 8261 | #: builtin/name-rev.c:305 |
ef317cd5 | 8262 | msgid "print only names (no SHA-1)" |
07432cef | 8263 | msgstr "只打印名称(无 SHA-1)" |
ef317cd5 | 8264 | |
94550ed3 | 8265 | #: builtin/name-rev.c:306 |
ef317cd5 | 8266 | msgid "only use tags to name the commits" |
55a16ee4 | 8267 | msgstr "只使用标签来命名提交" |
ef317cd5 | 8268 | |
94550ed3 | 8269 | #: builtin/name-rev.c:308 |
ef317cd5 | 8270 | msgid "only use refs matching <pattern>" |
07432cef | 8271 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 8272 | |
94550ed3 | 8273 | #: builtin/name-rev.c:310 |
ef317cd5 | 8274 | msgid "list all commits reachable from all refs" |
07432cef | 8275 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 8276 | |
94550ed3 | 8277 | #: builtin/name-rev.c:311 |
ef317cd5 | 8278 | msgid "read from stdin" |
07432cef | 8279 | msgstr "从标准输入读取" |
ef317cd5 | 8280 | |
94550ed3 | 8281 | #: builtin/name-rev.c:312 |
90314792 JX |
8282 | msgid "allow to print `undefined` names (default)" |
8283 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 8284 | |
94550ed3 | 8285 | #: builtin/name-rev.c:318 |
2e8451e8 | 8286 | msgid "dereference tags in the input (internal use)" |
55a16ee4 | 8287 | msgstr "反向解析输入中的标签(内部使用)" |
2e8451e8 | 8288 | |
1b7f4a34 | 8289 | #: builtin/notes.c:25 |
814ff314 | 8290 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
07432cef | 8291 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 8292 | |
1b7f4a34 | 8293 | #: builtin/notes.c:26 |
ef317cd5 | 8294 | msgid "" |
814ff314 | 8295 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
04cb2f28 | 8296 | "| (-c | -C) <object>] [<object>]" |
ef317cd5 | 8297 | msgstr "" |
04cb2f28 JX |
8298 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
8299 | "| (-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 8300 | |
1b7f4a34 | 8301 | #: builtin/notes.c:27 |
814ff314 | 8302 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
07432cef | 8303 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 8304 | |
1b7f4a34 | 8305 | #: builtin/notes.c:28 |
ef317cd5 | 8306 | msgid "" |
814ff314 | 8307 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
04cb2f28 | 8308 | "(-c | -C) <object>] [<object>]" |
ef317cd5 | 8309 | msgstr "" |
04cb2f28 JX |
8310 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
8311 | "(-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 8312 | |
1b7f4a34 | 8313 | #: builtin/notes.c:29 |
814ff314 | 8314 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
04cb2f28 | 8315 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
ef317cd5 | 8316 | |
1b7f4a34 | 8317 | #: builtin/notes.c:30 |
814ff314 | 8318 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
07432cef | 8319 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 8320 | |
1b7f4a34 | 8321 | #: builtin/notes.c:31 |
ef317cd5 | 8322 | msgid "" |
814ff314 | 8323 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
07432cef | 8324 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 8325 | |
1b7f4a34 | 8326 | #: builtin/notes.c:32 |
ef317cd5 | 8327 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 8328 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 8329 | |
1b7f4a34 | 8330 | #: builtin/notes.c:33 |
ef317cd5 | 8331 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 8332 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 8333 | |
1b7f4a34 | 8334 | #: builtin/notes.c:34 |
814ff314 | 8335 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
07432cef | 8336 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 8337 | |
1b7f4a34 | 8338 | #: builtin/notes.c:35 |
814ff314 | 8339 | msgid "git notes [--ref <notes-ref>] prune [-n | -v]" |
07432cef | 8340 | msgstr "git notes [--ref <注解引用>] prune [-n | -v]" |
ef317cd5 | 8341 | |
1b7f4a34 | 8342 | #: builtin/notes.c:36 |
814ff314 | 8343 | msgid "git notes [--ref <notes-ref>] get-ref" |
07432cef | 8344 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 8345 | |
1b7f4a34 | 8346 | #: builtin/notes.c:41 |
ef317cd5 | 8347 | msgid "git notes [list [<object>]]" |
07432cef | 8348 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 8349 | |
1b7f4a34 | 8350 | #: builtin/notes.c:46 |
ef317cd5 | 8351 | msgid "git notes add [<options>] [<object>]" |
07432cef | 8352 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 8353 | |
1b7f4a34 | 8354 | #: builtin/notes.c:51 |
ef317cd5 | 8355 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 8356 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 8357 | |
1b7f4a34 | 8358 | #: builtin/notes.c:52 |
ef317cd5 | 8359 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 8360 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 8361 | |
1b7f4a34 | 8362 | #: builtin/notes.c:57 |
ef317cd5 | 8363 | msgid "git notes append [<options>] [<object>]" |
07432cef | 8364 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 8365 | |
1b7f4a34 | 8366 | #: builtin/notes.c:62 |
ef317cd5 | 8367 | msgid "git notes edit [<object>]" |
07432cef | 8368 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 8369 | |
1b7f4a34 | 8370 | #: builtin/notes.c:67 |
ef317cd5 | 8371 | msgid "git notes show [<object>]" |
07432cef | 8372 | msgstr "git notes show [<对象>]" |
ef317cd5 | 8373 | |
1b7f4a34 | 8374 | #: builtin/notes.c:72 |
814ff314 | 8375 | msgid "git notes merge [<options>] <notes-ref>" |
07432cef | 8376 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 8377 | |
1b7f4a34 | 8378 | #: builtin/notes.c:73 |
ef317cd5 | 8379 | msgid "git notes merge --commit [<options>]" |
07432cef | 8380 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 8381 | |
1b7f4a34 | 8382 | #: builtin/notes.c:74 |
ef317cd5 | 8383 | msgid "git notes merge --abort [<options>]" |
07432cef | 8384 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 8385 | |
1b7f4a34 | 8386 | #: builtin/notes.c:79 |
ef317cd5 | 8387 | msgid "git notes remove [<object>]" |
07432cef | 8388 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 8389 | |
1b7f4a34 | 8390 | #: builtin/notes.c:84 |
ef317cd5 | 8391 | msgid "git notes prune [<options>]" |
07432cef | 8392 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 8393 | |
1b7f4a34 | 8394 | #: builtin/notes.c:89 |
ef317cd5 | 8395 | msgid "git notes get-ref" |
07432cef | 8396 | msgstr "git notes get-ref" |
ef317cd5 | 8397 | |
1b7f4a34 | 8398 | #: builtin/notes.c:147 |
c04f5ac3 JX |
8399 | #, c-format |
8400 | msgid "unable to start 'show' for object '%s'" | |
8401 | msgstr "不能为对象 '%s' 开始 'show'" | |
8402 | ||
1b7f4a34 | 8403 | #: builtin/notes.c:151 |
a77c07d9 JX |
8404 | msgid "could not read 'show' output" |
8405 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 8406 | |
1b7f4a34 | 8407 | #: builtin/notes.c:159 |
c04f5ac3 JX |
8408 | #, c-format |
8409 | msgid "failed to finish 'show' for object '%s'" | |
8410 | msgstr "无法为对象 '%s' 完成 'show'" | |
8411 | ||
94550ed3 | 8412 | #: builtin/notes.c:174 builtin/tag.c:248 |
c04f5ac3 JX |
8413 | #, c-format |
8414 | msgid "could not create file '%s'" | |
8415 | msgstr "不能创建文件 '%s'" | |
8416 | ||
1b7f4a34 | 8417 | #: builtin/notes.c:193 |
c04f5ac3 JX |
8418 | msgid "Please supply the note contents using either -m or -F option" |
8419 | msgstr "请通过 -m 或 -F 选项为注解提供内容" | |
8420 | ||
1b7f4a34 | 8421 | #: builtin/notes.c:202 |
c04f5ac3 JX |
8422 | msgid "unable to write note object" |
8423 | msgstr "不能写注解对象" | |
8424 | ||
1b7f4a34 | 8425 | #: builtin/notes.c:204 |
c04f5ac3 | 8426 | #, c-format |
220c313c JX |
8427 | msgid "The note contents have been left in %s" |
8428 | msgstr "注解内容被留在 %s 中" | |
c04f5ac3 | 8429 | |
94550ed3 | 8430 | #: builtin/notes.c:232 builtin/tag.c:440 |
c04f5ac3 JX |
8431 | #, c-format |
8432 | msgid "cannot read '%s'" | |
8433 | msgstr "不能读取 '%s'" | |
8434 | ||
94550ed3 | 8435 | #: builtin/notes.c:234 builtin/tag.c:443 |
c04f5ac3 JX |
8436 | #, c-format |
8437 | msgid "could not open or read '%s'" | |
8438 | msgstr "不能打开或读取 '%s'" | |
8439 | ||
1b7f4a34 | 8440 | #: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 |
276ceeaa JX |
8441 | #: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510 |
8442 | #: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656 | |
8443 | #: builtin/notes.c:880 builtin/tag.c:456 | |
c04f5ac3 JX |
8444 | #, c-format |
8445 | msgid "Failed to resolve '%s' as a valid ref." | |
90e6ef53 | 8446 | msgstr "无法解析 '%s' 为一个有效引用。" |
c04f5ac3 | 8447 | |
1b7f4a34 | 8448 | #: builtin/notes.c:256 |
c04f5ac3 JX |
8449 | #, c-format |
8450 | msgid "Failed to read object '%s'." | |
8451 | msgstr "无法读取对象 '%s'。" | |
8452 | ||
1b7f4a34 | 8453 | #: builtin/notes.c:260 |
6c94aba5 JX |
8454 | #, c-format |
8455 | msgid "Cannot read note data from non-blob object '%s'." | |
8456 | msgstr "不能从非数据对象 '%s' 中读取注解数据" | |
8457 | ||
276ceeaa JX |
8458 | #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 |
8459 | #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 | |
8460 | #: builtin/notes.c:945 | |
c04f5ac3 JX |
8461 | msgid "too many parameters" |
8462 | msgstr "参数太多" | |
8463 | ||
276ceeaa | 8464 | #: builtin/notes.c:375 builtin/notes.c:662 |
c04f5ac3 JX |
8465 | #, c-format |
8466 | msgid "No note found for object %s." | |
8467 | msgstr "未发现对象 %s 的注解。" | |
8468 | ||
276ceeaa | 8469 | #: builtin/notes.c:396 builtin/notes.c:559 |
ef317cd5 | 8470 | msgid "note contents as a string" |
07432cef | 8471 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 8472 | |
276ceeaa | 8473 | #: builtin/notes.c:399 builtin/notes.c:562 |
ef317cd5 | 8474 | msgid "note contents in a file" |
07432cef | 8475 | msgstr "注解内容到一个文件中" |
ef317cd5 | 8476 | |
276ceeaa | 8477 | #: builtin/notes.c:402 builtin/notes.c:565 |
ef317cd5 | 8478 | msgid "reuse and edit specified note object" |
07432cef | 8479 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 8480 | |
276ceeaa | 8481 | #: builtin/notes.c:405 builtin/notes.c:568 |
ef317cd5 | 8482 | msgid "reuse specified note object" |
07432cef | 8483 | msgstr "重用指定的注解对象" |
ef317cd5 | 8484 | |
276ceeaa | 8485 | #: builtin/notes.c:408 builtin/notes.c:571 |
04cb2f28 JX |
8486 | msgid "allow storing empty note" |
8487 | msgstr "允许保存空白注释" | |
8488 | ||
276ceeaa | 8489 | #: builtin/notes.c:409 builtin/notes.c:480 |
ef317cd5 | 8490 | msgid "replace existing notes" |
07432cef | 8491 | msgstr "替换已存在的注解" |
ef317cd5 | 8492 | |
276ceeaa | 8493 | #: builtin/notes.c:434 |
c04f5ac3 JX |
8494 | #, c-format |
8495 | msgid "" | |
8496 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
8497 | "existing notes" | |
8498 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
8499 | ||
276ceeaa | 8500 | #: builtin/notes.c:449 builtin/notes.c:528 |
c04f5ac3 JX |
8501 | #, c-format |
8502 | msgid "Overwriting existing notes for object %s\n" | |
8503 | msgstr "覆盖对象 %s 现存注解\n" | |
8504 | ||
276ceeaa | 8505 | #: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 |
04cb2f28 JX |
8506 | #, c-format |
8507 | msgid "Removing note for object %s\n" | |
8508 | msgstr "删除对象 %s 的注解\n" | |
8509 | ||
276ceeaa | 8510 | #: builtin/notes.c:481 |
ef317cd5 | 8511 | msgid "read objects from stdin" |
07432cef | 8512 | msgstr "从标准输入读取对象" |
ef317cd5 | 8513 | |
276ceeaa | 8514 | #: builtin/notes.c:483 |
ef317cd5 | 8515 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 8516 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 8517 | |
276ceeaa | 8518 | #: builtin/notes.c:501 |
c04f5ac3 JX |
8519 | msgid "too few parameters" |
8520 | msgstr "参数太少" | |
8521 | ||
276ceeaa | 8522 | #: builtin/notes.c:522 |
c04f5ac3 JX |
8523 | #, c-format |
8524 | msgid "" | |
8525 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
8526 | "existing notes" | |
8527 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
8528 | ||
276ceeaa | 8529 | #: builtin/notes.c:534 |
c04f5ac3 JX |
8530 | #, c-format |
8531 | msgid "Missing notes on source object %s. Cannot copy." | |
8532 | msgstr "源对象 %s 缺少注解。不能拷贝。" | |
8533 | ||
276ceeaa | 8534 | #: builtin/notes.c:586 |
ef317cd5 JX |
8535 | #, c-format |
8536 | msgid "" | |
8537 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
8538 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
8539 | msgstr "" | |
8540 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
8541 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
8542 | ||
276ceeaa | 8543 | #: builtin/notes.c:767 |
ef317cd5 | 8544 | msgid "General options" |
07432cef | 8545 | msgstr "通用选项" |
ef317cd5 | 8546 | |
276ceeaa | 8547 | #: builtin/notes.c:769 |
ef317cd5 | 8548 | msgid "Merge options" |
07432cef | 8549 | msgstr "合并选项" |
ef317cd5 | 8550 | |
276ceeaa | 8551 | #: builtin/notes.c:771 |
ef317cd5 JX |
8552 | msgid "" |
8553 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
8554 | "cat_sort_uniq)" | |
07432cef | 8555 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 8556 | |
276ceeaa | 8557 | #: builtin/notes.c:773 |
ef317cd5 | 8558 | msgid "Committing unmerged notes" |
07432cef | 8559 | msgstr "提交未合并的注解" |
ef317cd5 | 8560 | |
276ceeaa | 8561 | #: builtin/notes.c:775 |
ef317cd5 | 8562 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 8563 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 8564 | |
276ceeaa | 8565 | #: builtin/notes.c:777 |
ef317cd5 | 8566 | msgid "Aborting notes merge resolution" |
07432cef | 8567 | msgstr "中止注解合并的方案" |
ef317cd5 | 8568 | |
276ceeaa | 8569 | #: builtin/notes.c:779 |
ef317cd5 | 8570 | msgid "abort notes merge" |
07432cef | 8571 | msgstr "中止注解合并" |
ef317cd5 | 8572 | |
276ceeaa | 8573 | #: builtin/notes.c:856 |
1b7f4a34 JX |
8574 | #, c-format |
8575 | msgid "A notes merge into %s is already in-progress at %s" | |
8576 | msgstr "一个到 %s 的注解合并已经在 %s 执行中" | |
8577 | ||
276ceeaa | 8578 | #: builtin/notes.c:883 |
ef317cd5 JX |
8579 | #, c-format |
8580 | msgid "Object %s has no note\n" | |
8581 | msgstr "对象 %s 没有注解\n" | |
8582 | ||
276ceeaa | 8583 | #: builtin/notes.c:895 |
ef317cd5 | 8584 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 8585 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 8586 | |
276ceeaa | 8587 | #: builtin/notes.c:898 |
ef317cd5 | 8588 | msgid "read object names from the standard input" |
07432cef | 8589 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 8590 | |
276ceeaa | 8591 | #: builtin/notes.c:979 |
6c94aba5 | 8592 | msgid "notes-ref" |
07432cef | 8593 | msgstr "注解引用" |
ef317cd5 | 8594 | |
276ceeaa | 8595 | #: builtin/notes.c:980 |
814ff314 | 8596 | msgid "use notes from <notes-ref>" |
07432cef | 8597 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 8598 | |
276ceeaa | 8599 | #: builtin/notes.c:1015 builtin/remote.c:1626 |
ef317cd5 JX |
8600 | #, c-format |
8601 | msgid "Unknown subcommand: %s" | |
8602 | msgstr "未知子命令:%s" | |
8603 | ||
220c313c | 8604 | #: builtin/pack-objects.c:28 |
1b7f4a34 JX |
8605 | msgid "" |
8606 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" | |
8607 | msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 8608 | |
220c313c | 8609 | #: builtin/pack-objects.c:29 |
1b7f4a34 JX |
8610 | msgid "" |
8611 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" | |
8612 | msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 8613 | |
814ff314 | 8614 | #: builtin/pack-objects.c:175 builtin/pack-objects.c:178 |
ef317cd5 JX |
8615 | #, c-format |
8616 | msgid "deflate error (%d)" | |
8617 | msgstr "压缩错误 (%d)" | |
8618 | ||
276ceeaa | 8619 | #: builtin/pack-objects.c:772 |
6c94aba5 JX |
8620 | msgid "Writing objects" |
8621 | msgstr "写入对象中" | |
8622 | ||
276ceeaa | 8623 | #: builtin/pack-objects.c:1012 |
6c94aba5 JX |
8624 | msgid "disabling bitmap writing, as some objects are not being packed" |
8625 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" | |
8626 | ||
276ceeaa | 8627 | #: builtin/pack-objects.c:2172 |
6c94aba5 JX |
8628 | msgid "Compressing objects" |
8629 | msgstr "压缩对象中" | |
8630 | ||
276ceeaa | 8631 | #: builtin/pack-objects.c:2558 |
ef317cd5 JX |
8632 | #, c-format |
8633 | msgid "unsupported index version %s" | |
8634 | msgstr "不支持的索引版本 %s" | |
8635 | ||
276ceeaa | 8636 | #: builtin/pack-objects.c:2562 |
ef317cd5 JX |
8637 | #, c-format |
8638 | msgid "bad index version '%s'" | |
8639 | msgstr "坏的索引版本 '%s'" | |
8640 | ||
276ceeaa | 8641 | #: builtin/pack-objects.c:2592 |
ef317cd5 | 8642 | msgid "do not show progress meter" |
07432cef | 8643 | msgstr "不显示进度表" |
ef317cd5 | 8644 | |
276ceeaa | 8645 | #: builtin/pack-objects.c:2594 |
ef317cd5 | 8646 | msgid "show progress meter" |
07432cef | 8647 | msgstr "显示进度表" |
ef317cd5 | 8648 | |
276ceeaa | 8649 | #: builtin/pack-objects.c:2596 |
ef317cd5 | 8650 | msgid "show progress meter during object writing phase" |
07432cef | 8651 | msgstr "在对象写入阶段显示进度表" |
ef317cd5 | 8652 | |
276ceeaa | 8653 | #: builtin/pack-objects.c:2599 |
ef317cd5 | 8654 | msgid "similar to --all-progress when progress meter is shown" |
07432cef | 8655 | msgstr "当进度表显示时类似于 --all-progress" |
ef317cd5 | 8656 | |
276ceeaa | 8657 | #: builtin/pack-objects.c:2600 |
ef317cd5 | 8658 | msgid "version[,offset]" |
07432cef | 8659 | msgstr "版本[,偏移]" |
ef317cd5 | 8660 | |
276ceeaa | 8661 | #: builtin/pack-objects.c:2601 |
ef317cd5 | 8662 | msgid "write the pack index file in the specified idx format version" |
07432cef | 8663 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 8664 | |
276ceeaa | 8665 | #: builtin/pack-objects.c:2604 |
ef317cd5 | 8666 | msgid "maximum size of each output pack file" |
07432cef | 8667 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 8668 | |
276ceeaa | 8669 | #: builtin/pack-objects.c:2606 |
ef317cd5 | 8670 | msgid "ignore borrowed objects from alternate object store" |
160fb2b2 | 8671 | msgstr "忽略从备用对象存储里借用对象" |
ef317cd5 | 8672 | |
276ceeaa | 8673 | #: builtin/pack-objects.c:2608 |
ef317cd5 | 8674 | msgid "ignore packed objects" |
07432cef | 8675 | msgstr "忽略包对象" |
ef317cd5 | 8676 | |
276ceeaa | 8677 | #: builtin/pack-objects.c:2610 |
ef317cd5 | 8678 | msgid "limit pack window by objects" |
07432cef | 8679 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 8680 | |
276ceeaa | 8681 | #: builtin/pack-objects.c:2612 |
ef317cd5 | 8682 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 8683 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 8684 | |
276ceeaa | 8685 | #: builtin/pack-objects.c:2614 |
ef317cd5 | 8686 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 8687 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 8688 | |
276ceeaa | 8689 | #: builtin/pack-objects.c:2616 |
ef317cd5 | 8690 | msgid "reuse existing deltas" |
07432cef | 8691 | msgstr "重用已存在的 deltas" |
ef317cd5 | 8692 | |
276ceeaa | 8693 | #: builtin/pack-objects.c:2618 |
ef317cd5 | 8694 | msgid "reuse existing objects" |
07432cef | 8695 | msgstr "重用已存在的对象" |
ef317cd5 | 8696 | |
276ceeaa | 8697 | #: builtin/pack-objects.c:2620 |
ef317cd5 | 8698 | msgid "use OFS_DELTA objects" |
07432cef | 8699 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 8700 | |
276ceeaa | 8701 | #: builtin/pack-objects.c:2622 |
ef317cd5 | 8702 | msgid "use threads when searching for best delta matches" |
07432cef | 8703 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 8704 | |
276ceeaa | 8705 | #: builtin/pack-objects.c:2624 |
ef317cd5 | 8706 | msgid "do not create an empty pack output" |
07432cef | 8707 | msgstr "不创建空的包输出" |
ef317cd5 | 8708 | |
276ceeaa | 8709 | #: builtin/pack-objects.c:2626 |
ef317cd5 | 8710 | msgid "read revision arguments from standard input" |
d9d56b23 | 8711 | msgstr "从标准输入读取版本号参数" |
ef317cd5 | 8712 | |
276ceeaa | 8713 | #: builtin/pack-objects.c:2628 |
ef317cd5 | 8714 | msgid "limit the objects to those that are not yet packed" |
07432cef | 8715 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 8716 | |
276ceeaa | 8717 | #: builtin/pack-objects.c:2631 |
ef317cd5 | 8718 | msgid "include objects reachable from any reference" |
07432cef | 8719 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 8720 | |
276ceeaa | 8721 | #: builtin/pack-objects.c:2634 |
ef317cd5 | 8722 | msgid "include objects referred by reflog entries" |
07432cef | 8723 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 8724 | |
276ceeaa | 8725 | #: builtin/pack-objects.c:2637 |
220c313c JX |
8726 | msgid "include objects referred to by the index" |
8727 | msgstr "包括被索引引用到的对象" | |
8728 | ||
276ceeaa | 8729 | #: builtin/pack-objects.c:2640 |
ef317cd5 | 8730 | msgid "output pack to stdout" |
07432cef | 8731 | msgstr "输出包到标准输出" |
ef317cd5 | 8732 | |
276ceeaa | 8733 | #: builtin/pack-objects.c:2642 |
ef317cd5 | 8734 | msgid "include tag objects that refer to objects to be packed" |
53438e8f | 8735 | msgstr "包括那些引用了待打包对象的标签对象" |
ef317cd5 | 8736 | |
276ceeaa | 8737 | #: builtin/pack-objects.c:2644 |
ef317cd5 | 8738 | msgid "keep unreachable objects" |
07432cef | 8739 | msgstr "维持不可达的对象" |
ef317cd5 | 8740 | |
276ceeaa | 8741 | #: builtin/pack-objects.c:2645 parse-options.h:142 |
ef317cd5 JX |
8742 | msgid "time" |
8743 | msgstr "时间" | |
8744 | ||
276ceeaa | 8745 | #: builtin/pack-objects.c:2646 |
ef317cd5 | 8746 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 8747 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 8748 | |
276ceeaa | 8749 | #: builtin/pack-objects.c:2649 |
ef317cd5 | 8750 | msgid "create thin packs" |
07432cef | 8751 | msgstr "创建精简包" |
ef317cd5 | 8752 | |
276ceeaa | 8753 | #: builtin/pack-objects.c:2651 |
04cb2f28 | 8754 | msgid "create packs suitable for shallow fetches" |
160fb2b2 | 8755 | msgstr "创建适合浅克隆仓库获取的包" |
04cb2f28 | 8756 | |
276ceeaa | 8757 | #: builtin/pack-objects.c:2653 |
ef317cd5 | 8758 | msgid "ignore packs that have companion .keep file" |
07432cef | 8759 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 8760 | |
276ceeaa | 8761 | #: builtin/pack-objects.c:2655 |
ef317cd5 | 8762 | msgid "pack compression level" |
07432cef | 8763 | msgstr "打包压缩级别" |
ef317cd5 | 8764 | |
276ceeaa | 8765 | #: builtin/pack-objects.c:2657 |
ef317cd5 | 8766 | msgid "do not hide commits by grafts" |
cfff71a9 | 8767 | msgstr "显示被嫁接隐藏的提交" |
ef317cd5 | 8768 | |
276ceeaa | 8769 | #: builtin/pack-objects.c:2659 |
6c94aba5 JX |
8770 | msgid "use a bitmap index if available to speed up counting objects" |
8771 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" | |
8772 | ||
276ceeaa | 8773 | #: builtin/pack-objects.c:2661 |
6c94aba5 JX |
8774 | msgid "write a bitmap index together with the pack index" |
8775 | msgstr "在建立包索引的同时创建 bitmap 索引" | |
8776 | ||
276ceeaa | 8777 | #: builtin/pack-objects.c:2752 |
6c94aba5 JX |
8778 | msgid "Counting objects" |
8779 | msgstr "对象计数中" | |
8780 | ||
ef317cd5 | 8781 | #: builtin/pack-refs.c:6 |
814ff314 JX |
8782 | msgid "git pack-refs [<options>]" |
8783 | msgstr "git pack-refs [<选项>]" | |
c04f5ac3 | 8784 | |
ef317cd5 JX |
8785 | #: builtin/pack-refs.c:14 |
8786 | msgid "pack everything" | |
07432cef | 8787 | msgstr "打包一切" |
c04f5ac3 | 8788 | |
ef317cd5 JX |
8789 | #: builtin/pack-refs.c:15 |
8790 | msgid "prune loose refs (default)" | |
07432cef | 8791 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 8792 | |
ef317cd5 | 8793 | #: builtin/prune-packed.c:7 |
814ff314 JX |
8794 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
8795 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
6792b93b | 8796 | |
220c313c | 8797 | #: builtin/prune-packed.c:40 |
6c94aba5 JX |
8798 | msgid "Removing duplicate objects" |
8799 | msgstr "正在删除重复对象" | |
8800 | ||
5bb01d4f | 8801 | #: builtin/prune.c:11 |
ef317cd5 | 8802 | msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" |
07432cef | 8803 | msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" |
7ac1c0ad | 8804 | |
94550ed3 | 8805 | #: builtin/prune.c:105 builtin/worktree.c:124 |
1b7f4a34 JX |
8806 | msgid "do not remove, show only" |
8807 | msgstr "不删除,只显示" | |
8808 | ||
94550ed3 | 8809 | #: builtin/prune.c:106 builtin/worktree.c:125 |
1b7f4a34 JX |
8810 | msgid "report pruned objects" |
8811 | msgstr "报告清除的对象" | |
8812 | ||
94550ed3 | 8813 | #: builtin/prune.c:109 builtin/worktree.c:127 |
1b7f4a34 JX |
8814 | msgid "expire objects older than <time>" |
8815 | msgstr "使早于给定时间的对象过期" | |
8816 | ||
94550ed3 JX |
8817 | #: builtin/prune.c:123 |
8818 | msgid "cannot prune in a precious-objects repo" | |
8819 | msgstr "不能在珍品仓库中执行清理操作" | |
8820 | ||
276ceeaa | 8821 | #: builtin/pull.c:72 |
94550ed3 | 8822 | msgid "git pull [<options>] [<repository> [<refspec>...]]" |
1b7f4a34 JX |
8823 | msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" |
8824 | ||
276ceeaa | 8825 | #: builtin/pull.c:117 |
1b7f4a34 JX |
8826 | msgid "Options related to merging" |
8827 | msgstr "和合并相关的选项" | |
8828 | ||
276ceeaa | 8829 | #: builtin/pull.c:120 |
1b7f4a34 JX |
8830 | msgid "incorporate changes by rebasing rather than merging" |
8831 | msgstr "使用变基操作取代合并操作以合入修改" | |
8832 | ||
276ceeaa | 8833 | #: builtin/pull.c:144 builtin/revert.c:105 |
1b7f4a34 JX |
8834 | msgid "allow fast-forward" |
8835 | msgstr "允许快进式" | |
8836 | ||
276ceeaa | 8837 | #: builtin/pull.c:150 |
1b7f4a34 JX |
8838 | msgid "verify that the named commit has a valid GPG signature" |
8839 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" | |
8840 | ||
276ceeaa | 8841 | #: builtin/pull.c:164 |
1b7f4a34 JX |
8842 | msgid "Options related to fetching" |
8843 | msgstr "和获取相关的参数" | |
8844 | ||
276ceeaa JX |
8845 | #: builtin/pull.c:186 |
8846 | msgid "number of submodules pulled in parallel" | |
8847 | msgstr "并发拉取的子模组的数量" | |
8848 | ||
8849 | #: builtin/pull.c:275 | |
1b7f4a34 JX |
8850 | #, c-format |
8851 | msgid "Invalid value for pull.ff: %s" | |
8852 | msgstr "pull.ff 的取值无效:%s" | |
8853 | ||
276ceeaa | 8854 | #: builtin/pull.c:359 |
1b7f4a34 JX |
8855 | msgid "Cannot pull with rebase: You have unstaged changes." |
8856 | msgstr "无法通过变基方式拉取:您有未暂存的变更。" | |
8857 | ||
276ceeaa | 8858 | #: builtin/pull.c:365 |
1b7f4a34 JX |
8859 | msgid "Additionally, your index contains uncommitted changes." |
8860 | msgstr "而且您的索引中包含未提交的变更。" | |
8861 | ||
276ceeaa | 8862 | #: builtin/pull.c:367 |
1b7f4a34 JX |
8863 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." |
8864 | msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。" | |
8865 | ||
276ceeaa | 8866 | #: builtin/pull.c:443 |
1b7f4a34 JX |
8867 | msgid "" |
8868 | "There is no candidate for rebasing against among the refs that you just " | |
8869 | "fetched." | |
8870 | msgstr "在您刚刚获取到的引用中没有变基操作的候选。" | |
8871 | ||
276ceeaa | 8872 | #: builtin/pull.c:445 |
1b7f4a34 JX |
8873 | msgid "" |
8874 | "There are no candidates for merging among the refs that you just fetched." | |
8875 | msgstr "在您刚刚获取到的引用中没有合并操作的候选。" | |
8876 | ||
276ceeaa | 8877 | #: builtin/pull.c:446 |
1b7f4a34 JX |
8878 | msgid "" |
8879 | "Generally this means that you provided a wildcard refspec which had no\n" | |
8880 | "matches on the remote end." | |
8881 | msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" | |
8882 | ||
276ceeaa | 8883 | #: builtin/pull.c:449 |
1b7f4a34 JX |
8884 | #, c-format |
8885 | msgid "" | |
8886 | "You asked to pull from the remote '%s', but did not specify\n" | |
8887 | "a branch. Because this is not the default configured remote\n" | |
8888 | "for your current branch, you must specify a branch on the command line." | |
8889 | msgstr "" | |
8890 | "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n" | |
8891 | "分支默认的远程仓库,您必须在命令行中指定一个分支名。" | |
8892 | ||
276ceeaa | 8893 | #: builtin/pull.c:454 |
1b7f4a34 JX |
8894 | msgid "You are not currently on a branch." |
8895 | msgstr "您当前不在一个分支上。" | |
8896 | ||
276ceeaa | 8897 | #: builtin/pull.c:456 builtin/pull.c:471 |
1b7f4a34 JX |
8898 | msgid "Please specify which branch you want to rebase against." |
8899 | msgstr "请指定您要变基到哪一个分支。" | |
8900 | ||
276ceeaa | 8901 | #: builtin/pull.c:458 builtin/pull.c:473 |
1b7f4a34 JX |
8902 | msgid "Please specify which branch you want to merge with." |
8903 | msgstr "请指定您要合并哪一个分支。" | |
8904 | ||
276ceeaa | 8905 | #: builtin/pull.c:459 builtin/pull.c:474 |
1b7f4a34 JX |
8906 | msgid "See git-pull(1) for details." |
8907 | msgstr "详见 git-pull(1)。" | |
8908 | ||
276ceeaa | 8909 | #: builtin/pull.c:469 |
1b7f4a34 JX |
8910 | msgid "There is no tracking information for the current branch." |
8911 | msgstr "当前分支没有跟踪信息。" | |
8912 | ||
276ceeaa | 8913 | #: builtin/pull.c:478 |
1b7f4a34 JX |
8914 | #, c-format |
8915 | msgid "" | |
8916 | "If you wish to set tracking information for this branch you can do so with:\n" | |
8917 | "\n" | |
8918 | " git branch --set-upstream-to=%s/<branch> %s\n" | |
8919 | msgstr "" | |
8920 | "如果您想要为此分支创建跟踪信息,您可以执行:\n" | |
8921 | "\n" | |
8922 | " git branch --set-upstream-to=%s/<branch> %s\n" | |
7ac1c0ad | 8923 | |
276ceeaa | 8924 | #: builtin/pull.c:483 |
1b7f4a34 JX |
8925 | #, c-format |
8926 | msgid "" | |
8927 | "Your configuration specifies to merge with the ref '%s'\n" | |
8928 | "from the remote, but no such ref was fetched." | |
8929 | msgstr "" | |
8930 | "您的配置中指定要合并远程的引用 '%s',\n" | |
8931 | "但是没有获取到这个引用。" | |
7ac1c0ad | 8932 | |
276ceeaa | 8933 | #: builtin/pull.c:841 |
1b7f4a34 JX |
8934 | msgid "Updating an unborn branch with changes added to the index." |
8935 | msgstr "更新尚未诞生的分支,变更添加至索引。" | |
8936 | ||
276ceeaa | 8937 | #: builtin/pull.c:870 |
1b7f4a34 JX |
8938 | #, c-format |
8939 | msgid "" | |
8940 | "fetch updated the current branch head.\n" | |
8941 | "fast-forwarding your working tree from\n" | |
8942 | "commit %s." | |
8943 | msgstr "" | |
8944 | "fetch 更新了当前的分支。快进您的工作区\n" | |
8945 | "至提交 %s。" | |
ef317cd5 | 8946 | |
276ceeaa | 8947 | #: builtin/pull.c:875 |
1b7f4a34 JX |
8948 | #, c-format |
8949 | msgid "" | |
8950 | "Cannot fast-forward your working tree.\n" | |
8951 | "After making sure that you saved anything precious from\n" | |
8952 | "$ git diff %s\n" | |
8953 | "output, run\n" | |
8954 | "$ git reset --hard\n" | |
8955 | "to recover." | |
8956 | msgstr "" | |
8957 | "您当前的工作区无法执行快进操作。\n" | |
8958 | "首先执行如下命令:\n" | |
8959 | "$ git diff %s\n" | |
8960 | "以确认所有有用的数据均已保存。然后执行下面的命令\n" | |
8961 | "$ git reset --hard\n" | |
8962 | "恢复之前的状态。" | |
8963 | ||
276ceeaa | 8964 | #: builtin/pull.c:890 |
1b7f4a34 JX |
8965 | msgid "Cannot merge multiple branches into empty head." |
8966 | msgstr "无法将多个分支合并到空分支。" | |
8967 | ||
276ceeaa | 8968 | #: builtin/pull.c:894 |
1b7f4a34 JX |
8969 | msgid "Cannot rebase onto multiple branches." |
8970 | msgstr "无法变基到多个分支。" | |
8971 | ||
89f80d72 | 8972 | #: builtin/push.c:16 |
ef317cd5 | 8973 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 8974 | msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" |
7ac1c0ad | 8975 | |
276ceeaa | 8976 | #: builtin/push.c:89 |
c04f5ac3 | 8977 | msgid "tag shorthand without <tag>" |
55a16ee4 | 8978 | msgstr "标签后面未提供 <标签> 参数" |
c04f5ac3 | 8979 | |
276ceeaa | 8980 | #: builtin/push.c:99 |
c04f5ac3 | 8981 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 8982 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 8983 | |
276ceeaa | 8984 | #: builtin/push.c:143 |
8ada9598 JX |
8985 | msgid "" |
8986 | "\n" | |
8987 | "To choose either option permanently, see push.default in 'git help config'." | |
8988 | msgstr "" | |
81809b99 JX |
8989 | "\n" |
8990 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 8991 | |
276ceeaa | 8992 | #: builtin/push.c:146 |
8ada9598 JX |
8993 | #, c-format |
8994 | msgid "" | |
8995 | "The upstream branch of your current branch does not match\n" | |
8996 | "the name of your current branch. To push to the upstream branch\n" | |
8997 | "on the remote, use\n" | |
8998 | "\n" | |
8999 | " git push %s HEAD:%s\n" | |
9000 | "\n" | |
9001 | "To push to the branch of the same name on the remote, use\n" | |
9002 | "\n" | |
9003 | " git push %s %s\n" | |
9004 | "%s" | |
9005 | msgstr "" | |
81809b99 JX |
9006 | "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n" |
9007 | "上游分支,使用\n" | |
9008 | "\n" | |
9009 | " git push %s HEAD:%s\n" | |
9010 | "\n" | |
9011 | "为推送至远程同名分支,使用\n" | |
9012 | "\n" | |
9013 | " git push %s %s\n" | |
9014 | "%s" | |
8ada9598 | 9015 | |
276ceeaa | 9016 | #: builtin/push.c:161 |
c04f5ac3 JX |
9017 | #, c-format |
9018 | msgid "" | |
9019 | "You are not currently on a branch.\n" | |
9020 | "To push the history leading to the current (detached HEAD)\n" | |
9021 | "state now, use\n" | |
9022 | "\n" | |
9023 | " git push %s HEAD:<name-of-remote-branch>\n" | |
9024 | msgstr "" | |
9025 | "您当前不在一个分支上。\n" | |
90e6ef53 | 9026 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 | 9027 | "\n" |
d9d56b23 | 9028 | " git push %s HEAD:<远程分支名字>\n" |
c04f5ac3 | 9029 | |
276ceeaa | 9030 | #: builtin/push.c:175 |
c04f5ac3 JX |
9031 | #, c-format |
9032 | msgid "" | |
9033 | "The current branch %s has no upstream branch.\n" | |
9034 | "To push the current branch and set the remote as upstream, use\n" | |
9035 | "\n" | |
9036 | " git push --set-upstream %s %s\n" | |
9037 | msgstr "" | |
9038 | "当前分支 %s 没有对应的上游分支。\n" | |
9039 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
9040 | "\n" | |
9041 | " git push --set-upstream %s %s\n" | |
9042 | ||
276ceeaa | 9043 | #: builtin/push.c:183 |
c04f5ac3 JX |
9044 | #, c-format |
9045 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
9046 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
9047 | ||
276ceeaa | 9048 | #: builtin/push.c:186 |
73a60cd2 JX |
9049 | #, c-format |
9050 | msgid "" | |
9051 | "You are pushing to remote '%s', which is not the upstream of\n" | |
9052 | "your current branch '%s', without telling me what to push\n" | |
9053 | "to update which remote branch." | |
9054 | msgstr "" | |
9055 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
9056 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
9057 | ||
276ceeaa | 9058 | #: builtin/push.c:242 |
c04f5ac3 JX |
9059 | msgid "" |
9060 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
160fb2b2 | 9061 | msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 9062 | |
276ceeaa | 9063 | #: builtin/push.c:249 |
170e9899 JX |
9064 | msgid "" |
9065 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
9066 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
9067 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
9068 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
9069 | msgstr "" | |
eff6d3a9 | 9070 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 9071 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 9072 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 9073 | |
276ceeaa | 9074 | #: builtin/push.c:255 |
170e9899 JX |
9075 | msgid "" |
9076 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
9077 | "counterpart. Check out this branch and integrate the remote changes\n" |
9078 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
9079 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
9080 | msgstr "" | |
eff6d3a9 | 9081 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 9082 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 9083 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 9084 | |
276ceeaa | 9085 | #: builtin/push.c:261 |
07432cef | 9086 | msgid "" |
a77c07d9 JX |
9087 | "Updates were rejected because the remote contains work that you do\n" |
9088 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
9089 | "to the same ref. You may want to first integrate the remote changes\n" |
9090 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
9091 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
9092 | msgstr "" | |
160fb2b2 JX |
9093 | "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" |
9094 | "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" | |
2e8451e8 | 9095 | "(如 'git pull ...')。\n" |
a77c07d9 JX |
9096 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
9097 | ||
276ceeaa | 9098 | #: builtin/push.c:268 |
a77c07d9 | 9099 | msgid "Updates were rejected because the tag already exists in the remote." |
55a16ee4 | 9100 | msgstr "更新被拒绝,因为该标签在远程已经存在。" |
a77c07d9 | 9101 | |
276ceeaa | 9102 | #: builtin/push.c:271 |
a77c07d9 JX |
9103 | msgid "" |
9104 | "You cannot update a remote ref that points at a non-commit object,\n" | |
9105 | "or update a remote ref to make it point at a non-commit object,\n" | |
9106 | "without using the '--force' option.\n" | |
9107 | msgstr "" | |
9108 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
9109 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 9110 | |
276ceeaa | 9111 | #: builtin/push.c:331 |
c04f5ac3 JX |
9112 | #, c-format |
9113 | msgid "Pushing to %s\n" | |
9114 | msgstr "推送到 %s\n" | |
9115 | ||
276ceeaa | 9116 | #: builtin/push.c:335 |
c04f5ac3 JX |
9117 | #, c-format |
9118 | msgid "failed to push some refs to '%s'" | |
9119 | msgstr "无法推送一些引用到 '%s'" | |
9120 | ||
276ceeaa | 9121 | #: builtin/push.c:365 |
c04f5ac3 JX |
9122 | #, c-format |
9123 | msgid "bad repository '%s'" | |
160fb2b2 | 9124 | msgstr "坏的仓库 '%s'" |
c04f5ac3 | 9125 | |
276ceeaa | 9126 | #: builtin/push.c:366 |
c04f5ac3 JX |
9127 | msgid "" |
9128 | "No configured push destination.\n" | |
9129 | "Either specify the URL from the command-line or configure a remote " | |
9130 | "repository using\n" | |
9131 | "\n" | |
9132 | " git remote add <name> <url>\n" | |
9133 | "\n" | |
9134 | "and then push using the remote name\n" | |
9135 | "\n" | |
9136 | " git push <name>\n" | |
9137 | msgstr "" | |
90e6ef53 | 9138 | "没有配置推送目标。\n" |
4375c10e | 9139 | "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n" |
c04f5ac3 | 9140 | "\n" |
d9d56b23 | 9141 | " git remote add <名称> <地址>\n" |
c04f5ac3 | 9142 | "\n" |
160fb2b2 | 9143 | "然后使用该远程仓库名执行推送\n" |
c04f5ac3 | 9144 | "\n" |
d9d56b23 | 9145 | " git push <名称>\n" |
c04f5ac3 | 9146 | |
276ceeaa | 9147 | #: builtin/push.c:381 |
c04f5ac3 JX |
9148 | msgid "--all and --tags are incompatible" |
9149 | msgstr "--all 和 --tags 不兼容" | |
9150 | ||
276ceeaa | 9151 | #: builtin/push.c:382 |
c04f5ac3 | 9152 | msgid "--all can't be combined with refspecs" |
160fb2b2 | 9153 | msgstr "--all 不能和引用规格同时使用" |
c04f5ac3 | 9154 | |
276ceeaa | 9155 | #: builtin/push.c:387 |
c04f5ac3 JX |
9156 | msgid "--mirror and --tags are incompatible" |
9157 | msgstr "--mirror 和 --tags 不兼容" | |
9158 | ||
276ceeaa | 9159 | #: builtin/push.c:388 |
c04f5ac3 | 9160 | msgid "--mirror can't be combined with refspecs" |
160fb2b2 | 9161 | msgstr "--mirror 不能和引用规格同时使用" |
c04f5ac3 | 9162 | |
276ceeaa | 9163 | #: builtin/push.c:393 |
c04f5ac3 JX |
9164 | msgid "--all and --mirror are incompatible" |
9165 | msgstr "--all 和 --mirror 不兼容" | |
9166 | ||
276ceeaa | 9167 | #: builtin/push.c:505 |
ef317cd5 | 9168 | msgid "repository" |
160fb2b2 | 9169 | msgstr "仓库" |
ef317cd5 | 9170 | |
276ceeaa | 9171 | #: builtin/push.c:506 builtin/send-pack.c:161 |
ef317cd5 | 9172 | msgid "push all refs" |
07432cef | 9173 | msgstr "推送所有引用" |
ef317cd5 | 9174 | |
276ceeaa | 9175 | #: builtin/push.c:507 builtin/send-pack.c:163 |
ef317cd5 | 9176 | msgid "mirror all refs" |
07432cef | 9177 | msgstr "镜像所有引用" |
ef317cd5 | 9178 | |
276ceeaa | 9179 | #: builtin/push.c:509 |
ef317cd5 | 9180 | msgid "delete refs" |
07432cef | 9181 | msgstr "删除引用" |
ef317cd5 | 9182 | |
276ceeaa | 9183 | #: builtin/push.c:510 |
ef317cd5 | 9184 | msgid "push tags (can't be used with --all or --mirror)" |
55a16ee4 | 9185 | msgstr "推送标签(不能使用 --all or --mirror)" |
ef317cd5 | 9186 | |
276ceeaa | 9187 | #: builtin/push.c:513 builtin/send-pack.c:164 |
ef317cd5 JX |
9188 | msgid "force updates" |
9189 | msgstr "强制更新" | |
9190 | ||
276ceeaa | 9191 | #: builtin/push.c:515 builtin/send-pack.c:175 |
90314792 JX |
9192 | msgid "refname>:<expect" |
9193 | msgstr "引用名>:<期望值" | |
9194 | ||
276ceeaa | 9195 | #: builtin/push.c:516 builtin/send-pack.c:176 |
90314792 JX |
9196 | msgid "require old value of ref to be at this value" |
9197 | msgstr "要求引用旧的取值为设定值" | |
9198 | ||
276ceeaa | 9199 | #: builtin/push.c:519 |
ef317cd5 | 9200 | msgid "control recursive pushing of submodules" |
07432cef | 9201 | msgstr "控制子模组的递归推送" |
ef317cd5 | 9202 | |
276ceeaa | 9203 | #: builtin/push.c:521 builtin/send-pack.c:169 |
ef317cd5 | 9204 | msgid "use thin pack" |
07432cef | 9205 | msgstr "使用精简打包" |
ef317cd5 | 9206 | |
276ceeaa | 9207 | #: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158 |
1b7f4a34 | 9208 | #: builtin/send-pack.c:159 |
ef317cd5 | 9209 | msgid "receive pack program" |
07432cef | 9210 | msgstr "接收包程序" |
ef317cd5 | 9211 | |
276ceeaa | 9212 | #: builtin/push.c:524 |
ef317cd5 | 9213 | msgid "set upstream for git pull/status" |
07432cef | 9214 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 9215 | |
276ceeaa | 9216 | #: builtin/push.c:527 |
ef317cd5 | 9217 | msgid "prune locally removed refs" |
07432cef | 9218 | msgstr "清除本地删除的引用" |
ef317cd5 | 9219 | |
276ceeaa | 9220 | #: builtin/push.c:529 |
a77c07d9 JX |
9221 | msgid "bypass pre-push hook" |
9222 | msgstr "绕过 pre-push 钩子" | |
9223 | ||
276ceeaa | 9224 | #: builtin/push.c:530 |
1003b3a5 | 9225 | msgid "push missing but relevant tags" |
55a16ee4 | 9226 | msgstr "推送缺失但有关的标签" |
1003b3a5 | 9227 | |
276ceeaa | 9228 | #: builtin/push.c:533 builtin/send-pack.c:166 |
220c313c JX |
9229 | msgid "GPG sign the push" |
9230 | msgstr "用 GPG 为推送签名" | |
9231 | ||
276ceeaa | 9232 | #: builtin/push.c:535 builtin/send-pack.c:170 |
814ff314 JX |
9233 | msgid "request atomic transaction on remote side" |
9234 | msgstr "需要远端支持原子事务" | |
9235 | ||
276ceeaa | 9236 | #: builtin/push.c:549 |
c04f5ac3 JX |
9237 | msgid "--delete is incompatible with --all, --mirror and --tags" |
9238 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
9239 | ||
276ceeaa | 9240 | #: builtin/push.c:551 |
c04f5ac3 JX |
9241 | msgid "--delete doesn't make sense without any refs" |
9242 | msgstr "--delete 未接任何引用没有意义" | |
9243 | ||
220c313c | 9244 | #: builtin/read-tree.c:37 |
ef317cd5 | 9245 | msgid "" |
1b7f4a34 | 9246 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " |
ef317cd5 JX |
9247 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
9248 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
9249 | msgstr "" | |
1b7f4a34 | 9250 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" |
07432cef | 9251 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
1b7f4a34 | 9252 | "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" |
ef317cd5 | 9253 | |
220c313c | 9254 | #: builtin/read-tree.c:110 |
ef317cd5 | 9255 | msgid "write resulting index to <file>" |
d9d56b23 | 9256 | msgstr "将索引结果写入 <文件>" |
ef317cd5 | 9257 | |
220c313c | 9258 | #: builtin/read-tree.c:113 |
ef317cd5 | 9259 | msgid "only empty the index" |
07432cef | 9260 | msgstr "只是清空索引" |
ef317cd5 | 9261 | |
220c313c | 9262 | #: builtin/read-tree.c:115 |
ef317cd5 | 9263 | msgid "Merging" |
07432cef | 9264 | msgstr "合并" |
ef317cd5 | 9265 | |
220c313c | 9266 | #: builtin/read-tree.c:117 |
ef317cd5 | 9267 | msgid "perform a merge in addition to a read" |
07432cef | 9268 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 9269 | |
220c313c | 9270 | #: builtin/read-tree.c:119 |
ef317cd5 | 9271 | msgid "3-way merge if no file level merging required" |
160fb2b2 | 9272 | msgstr "如果没有文件级合并需要,执行三方合并" |
ef317cd5 | 9273 | |
220c313c | 9274 | #: builtin/read-tree.c:121 |
ef317cd5 | 9275 | msgid "3-way merge in presence of adds and removes" |
160fb2b2 | 9276 | msgstr "存在添加和删除时,也执行三方合并" |
ef317cd5 | 9277 | |
220c313c | 9278 | #: builtin/read-tree.c:123 |
ef317cd5 | 9279 | msgid "same as -m, but discard unmerged entries" |
07432cef | 9280 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 9281 | |
220c313c | 9282 | #: builtin/read-tree.c:124 |
ef317cd5 | 9283 | msgid "<subdirectory>/" |
07432cef | 9284 | msgstr "<子目录>/" |
ef317cd5 | 9285 | |
220c313c | 9286 | #: builtin/read-tree.c:125 |
ef317cd5 | 9287 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 9288 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 9289 | |
220c313c | 9290 | #: builtin/read-tree.c:128 |
ef317cd5 | 9291 | msgid "update working tree with merge result" |
07432cef | 9292 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 9293 | |
220c313c | 9294 | #: builtin/read-tree.c:130 |
ef317cd5 | 9295 | msgid "gitignore" |
07432cef | 9296 | msgstr "gitignore" |
ef317cd5 | 9297 | |
220c313c | 9298 | #: builtin/read-tree.c:131 |
ef317cd5 | 9299 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 9300 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 9301 | |
220c313c | 9302 | #: builtin/read-tree.c:134 |
ef317cd5 | 9303 | msgid "don't check the working tree after merging" |
07432cef | 9304 | msgstr "合并后不检查工作区" |
ef317cd5 | 9305 | |
220c313c | 9306 | #: builtin/read-tree.c:135 |
ef317cd5 | 9307 | msgid "don't update the index or the work tree" |
07432cef | 9308 | msgstr "不更新索引区和工作区" |
ef317cd5 | 9309 | |
220c313c | 9310 | #: builtin/read-tree.c:137 |
ef317cd5 | 9311 | msgid "skip applying sparse checkout filter" |
07432cef | 9312 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 9313 | |
220c313c | 9314 | #: builtin/read-tree.c:139 |
ef317cd5 | 9315 | msgid "debug unpack-trees" |
07432cef | 9316 | msgstr "调试 unpack-trees" |
ef317cd5 | 9317 | |
276ceeaa | 9318 | #: builtin/reflog.c:423 |
2e8451e8 | 9319 | #, c-format |
1b7f4a34 | 9320 | msgid "'%s' for '%s' is not a valid timestamp" |
2e8451e8 JX |
9321 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" |
9322 | ||
276ceeaa | 9323 | #: builtin/reflog.c:540 builtin/reflog.c:545 |
2e8451e8 JX |
9324 | #, c-format |
9325 | msgid "'%s' is not a valid timestamp" | |
9326 | msgstr "'%s' 不是一个有效的时间戳" | |
9327 | ||
cfff71a9 | 9328 | #: builtin/remote.c:12 |
ef317cd5 | 9329 | msgid "git remote [-v | --verbose]" |
07432cef | 9330 | msgstr "git remote [-v | --verbose]" |
ef317cd5 | 9331 | |
cfff71a9 | 9332 | #: builtin/remote.c:13 |
ef317cd5 | 9333 | msgid "" |
814ff314 | 9334 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
ef317cd5 JX |
9335 | "mirror=<fetch|push>] <name> <url>" |
9336 | msgstr "" | |
814ff314 | 9337 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" |
d9d56b23 | 9338 | "mirror=<fetch|push>] <名称> <地址>" |
ef317cd5 | 9339 | |
94550ed3 | 9340 | #: builtin/remote.c:14 builtin/remote.c:34 |
ef317cd5 | 9341 | msgid "git remote rename <old> <new>" |
07432cef | 9342 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 | 9343 | |
94550ed3 | 9344 | #: builtin/remote.c:15 builtin/remote.c:39 |
ef317cd5 | 9345 | msgid "git remote remove <name>" |
07432cef | 9346 | msgstr "git remote remove <名称>" |
ef317cd5 | 9347 | |
94550ed3 | 9348 | #: builtin/remote.c:16 builtin/remote.c:44 |
814ff314 JX |
9349 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" |
9350 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
ef317cd5 | 9351 | |
cfff71a9 | 9352 | #: builtin/remote.c:17 |
ef317cd5 | 9353 | msgid "git remote [-v | --verbose] show [-n] <name>" |
07432cef | 9354 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 | 9355 | |
cfff71a9 | 9356 | #: builtin/remote.c:18 |
ef317cd5 | 9357 | msgid "git remote prune [-n | --dry-run] <name>" |
07432cef | 9358 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 | 9359 | |
cfff71a9 | 9360 | #: builtin/remote.c:19 |
ef317cd5 JX |
9361 | msgid "" |
9362 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 9363 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 | 9364 | |
cfff71a9 | 9365 | #: builtin/remote.c:20 |
ef317cd5 | 9366 | msgid "git remote set-branches [--add] <name> <branch>..." |
07432cef | 9367 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 | 9368 | |
94550ed3 JX |
9369 | #: builtin/remote.c:21 builtin/remote.c:70 |
9370 | msgid "git remote get-url [--push] [--all] <name>" | |
9371 | msgstr "git remote get-url [--push] [--all] <名称>" | |
9372 | ||
9373 | #: builtin/remote.c:22 builtin/remote.c:75 | |
ef317cd5 | 9374 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
07432cef | 9375 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 | 9376 | |
94550ed3 | 9377 | #: builtin/remote.c:23 builtin/remote.c:76 |
ef317cd5 | 9378 | msgid "git remote set-url --add <name> <newurl>" |
07432cef | 9379 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 | 9380 | |
94550ed3 | 9381 | #: builtin/remote.c:24 builtin/remote.c:77 |
ef317cd5 | 9382 | msgid "git remote set-url --delete <name> <url>" |
07432cef | 9383 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 | 9384 | |
94550ed3 | 9385 | #: builtin/remote.c:29 |
ef317cd5 | 9386 | msgid "git remote add [<options>] <name> <url>" |
07432cef | 9387 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 9388 | |
94550ed3 | 9389 | #: builtin/remote.c:49 |
ef317cd5 | 9390 | msgid "git remote set-branches <name> <branch>..." |
07432cef | 9391 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 | 9392 | |
94550ed3 | 9393 | #: builtin/remote.c:50 |
ef317cd5 | 9394 | msgid "git remote set-branches --add <name> <branch>..." |
07432cef | 9395 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 | 9396 | |
94550ed3 | 9397 | #: builtin/remote.c:55 |
ef317cd5 | 9398 | msgid "git remote show [<options>] <name>" |
07432cef | 9399 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 | 9400 | |
94550ed3 | 9401 | #: builtin/remote.c:60 |
ef317cd5 | 9402 | msgid "git remote prune [<options>] <name>" |
07432cef | 9403 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 | 9404 | |
94550ed3 | 9405 | #: builtin/remote.c:65 |
ef317cd5 | 9406 | msgid "git remote update [<options>] [<group> | <remote>]..." |
07432cef | 9407 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 9408 | |
94550ed3 | 9409 | #: builtin/remote.c:94 |
81809b99 | 9410 | #, c-format |
8ada9598 | 9411 | msgid "Updating %s" |
81809b99 | 9412 | msgstr "更新 %s 中" |
8ada9598 | 9413 | |
94550ed3 | 9414 | #: builtin/remote.c:126 |
8ada9598 JX |
9415 | msgid "" |
9416 | "--mirror is dangerous and deprecated; please\n" | |
9417 | "\t use --mirror=fetch or --mirror=push instead" | |
9418 | msgstr "" | |
81809b99 JX |
9419 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
9420 | "\t 或 --mirror=push" | |
8ada9598 | 9421 | |
94550ed3 | 9422 | #: builtin/remote.c:143 |
81809b99 | 9423 | #, c-format |
8ada9598 | 9424 | msgid "unknown mirror argument: %s" |
81809b99 | 9425 | msgstr "未知的镜像参数:%s" |
8ada9598 | 9426 | |
94550ed3 | 9427 | #: builtin/remote.c:159 |
ef317cd5 | 9428 | msgid "fetch the remote branches" |
07432cef | 9429 | msgstr "抓取远程的分支" |
ef317cd5 | 9430 | |
94550ed3 | 9431 | #: builtin/remote.c:161 |
ef317cd5 | 9432 | msgid "import all tags and associated objects when fetching" |
55a16ee4 | 9433 | msgstr "抓取时导入所有的标签和关联对象" |
ef317cd5 | 9434 | |
94550ed3 | 9435 | #: builtin/remote.c:164 |
ef317cd5 | 9436 | msgid "or do not fetch any tag at all (--no-tags)" |
55a16ee4 | 9437 | msgstr "或不抓取任何标签(--no-tags)" |
ef317cd5 | 9438 | |
94550ed3 | 9439 | #: builtin/remote.c:166 |
ef317cd5 | 9440 | msgid "branch(es) to track" |
07432cef | 9441 | msgstr "跟踪的分支" |
ef317cd5 | 9442 | |
94550ed3 | 9443 | #: builtin/remote.c:167 |
ef317cd5 | 9444 | msgid "master branch" |
07432cef | 9445 | msgstr "主线分支" |
ef317cd5 | 9446 | |
94550ed3 | 9447 | #: builtin/remote.c:168 |
ef317cd5 | 9448 | msgid "push|fetch" |
07432cef | 9449 | msgstr "push|fetch" |
ef317cd5 | 9450 | |
94550ed3 | 9451 | #: builtin/remote.c:169 |
ef317cd5 | 9452 | msgid "set up remote as a mirror to push to or fetch from" |
07432cef | 9453 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 9454 | |
94550ed3 | 9455 | #: builtin/remote.c:181 |
8ada9598 | 9456 | msgid "specifying a master branch makes no sense with --mirror" |
81809b99 | 9457 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 | 9458 | |
94550ed3 | 9459 | #: builtin/remote.c:183 |
8ada9598 | 9460 | msgid "specifying branches to track makes sense only with fetch mirrors" |
649900bc | 9461 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 | 9462 | |
276ceeaa | 9463 | #: builtin/remote.c:190 builtin/remote.c:633 |
81809b99 | 9464 | #, c-format |
8ada9598 | 9465 | msgid "remote %s already exists." |
81809b99 | 9466 | msgstr "远程 %s 已经存在。" |
8ada9598 | 9467 | |
276ceeaa | 9468 | #: builtin/remote.c:194 builtin/remote.c:637 |
81809b99 | 9469 | #, c-format |
8ada9598 | 9470 | msgid "'%s' is not a valid remote name" |
81809b99 | 9471 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 | 9472 | |
276ceeaa | 9473 | #: builtin/remote.c:234 |
81809b99 | 9474 | #, c-format |
8ada9598 | 9475 | msgid "Could not setup master '%s'" |
81809b99 | 9476 | msgstr "无法设置 master '%s'" |
8ada9598 | 9477 | |
276ceeaa | 9478 | #: builtin/remote.c:336 |
81809b99 | 9479 | #, c-format |
8ada9598 | 9480 | msgid "Could not get fetch map for refspec %s" |
160fb2b2 | 9481 | msgstr "无法得到引用规格 %s 的获取列表" |
8ada9598 | 9482 | |
276ceeaa | 9483 | #: builtin/remote.c:437 builtin/remote.c:445 |
8ada9598 | 9484 | msgid "(matching)" |
81809b99 | 9485 | msgstr "(匹配)" |
8ada9598 | 9486 | |
276ceeaa | 9487 | #: builtin/remote.c:449 |
8ada9598 | 9488 | msgid "(delete)" |
81809b99 | 9489 | msgstr "(删除)" |
8ada9598 | 9490 | |
276ceeaa | 9491 | #: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858 |
81809b99 | 9492 | #, c-format |
8ada9598 | 9493 | msgid "No such remote: %s" |
81809b99 | 9494 | msgstr "没有这样的远程:%s" |
8ada9598 | 9495 | |
276ceeaa | 9496 | #: builtin/remote.c:643 |
81809b99 | 9497 | #, c-format |
8ada9598 | 9498 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 9499 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 | 9500 | |
276ceeaa | 9501 | #: builtin/remote.c:663 |
8ada9598 JX |
9502 | #, c-format |
9503 | msgid "" | |
d691f479 | 9504 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
9505 | "\t%s\n" |
9506 | "\tPlease update the configuration manually if necessary." | |
9507 | msgstr "" | |
160fb2b2 | 9508 | "没有更新非默认的获取引用规格\n" |
81809b99 JX |
9509 | "\t%s\n" |
9510 | "\t如果必要请手动更新配置。" | |
8ada9598 | 9511 | |
276ceeaa | 9512 | #: builtin/remote.c:699 |
81809b99 | 9513 | #, c-format |
8ada9598 | 9514 | msgid "deleting '%s' failed" |
81809b99 | 9515 | msgstr "删除 '%s' 失败" |
8ada9598 | 9516 | |
276ceeaa | 9517 | #: builtin/remote.c:733 |
81809b99 | 9518 | #, c-format |
8ada9598 | 9519 | msgid "creating '%s' failed" |
81809b99 | 9520 | msgstr "创建 '%s' 失败" |
8ada9598 | 9521 | |
276ceeaa | 9522 | #: builtin/remote.c:796 |
8ada9598 JX |
9523 | msgid "" |
9524 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
9525 | "to delete it, use:" | |
9526 | msgid_plural "" | |
9527 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
9528 | "to delete them, use:" | |
5ae481e0 JX |
9529 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
9530 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 | 9531 | |
276ceeaa JX |
9532 | #: builtin/remote.c:810 |
9533 | #, c-format | |
9534 | msgid "Could not remove config section '%s'" | |
9535 | msgstr "不能移除配置小节 '%s'" | |
9536 | ||
9537 | #: builtin/remote.c:911 | |
8ada9598 JX |
9538 | #, c-format |
9539 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 9540 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 | 9541 | |
276ceeaa | 9542 | #: builtin/remote.c:914 |
8ada9598 | 9543 | msgid " tracked" |
81809b99 | 9544 | msgstr " 已跟踪" |
8ada9598 | 9545 | |
276ceeaa | 9546 | #: builtin/remote.c:916 |
8ada9598 | 9547 | msgid " stale (use 'git remote prune' to remove)" |
81809b99 | 9548 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 | 9549 | |
276ceeaa | 9550 | #: builtin/remote.c:918 |
8ada9598 | 9551 | msgid " ???" |
81809b99 | 9552 | msgstr " ???" |
8ada9598 | 9553 | |
276ceeaa | 9554 | #: builtin/remote.c:959 |
8ada9598 JX |
9555 | #, c-format |
9556 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 9557 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 | 9558 | |
276ceeaa | 9559 | #: builtin/remote.c:967 |
81809b99 | 9560 | #, c-format |
276ceeaa JX |
9561 | msgid "rebases interactively onto remote %s" |
9562 | msgstr "交互式变基到远程 %s" | |
8ada9598 | 9563 | |
276ceeaa | 9564 | #: builtin/remote.c:971 |
81809b99 | 9565 | #, c-format |
8ada9598 | 9566 | msgid " merges with remote %s" |
81809b99 | 9567 | msgstr " 与远程 %s 合并" |
8ada9598 | 9568 | |
276ceeaa | 9569 | #: builtin/remote.c:972 |
8ada9598 | 9570 | msgid " and with remote" |
81809b99 | 9571 | msgstr " 且有远程" |
8ada9598 | 9572 | |
276ceeaa | 9573 | #: builtin/remote.c:974 |
81809b99 | 9574 | #, c-format |
8ada9598 | 9575 | msgid "merges with remote %s" |
81809b99 | 9576 | msgstr "与远程 %s 合并" |
8ada9598 | 9577 | |
276ceeaa | 9578 | #: builtin/remote.c:975 |
8ada9598 | 9579 | msgid " and with remote" |
81809b99 | 9580 | msgstr " 且有远程" |
8ada9598 | 9581 | |
276ceeaa | 9582 | #: builtin/remote.c:1021 |
8ada9598 | 9583 | msgid "create" |
81809b99 | 9584 | msgstr "创建" |
8ada9598 | 9585 | |
276ceeaa | 9586 | #: builtin/remote.c:1024 |
8ada9598 | 9587 | msgid "delete" |
81809b99 | 9588 | msgstr "删除" |
8ada9598 | 9589 | |
276ceeaa | 9590 | #: builtin/remote.c:1028 |
8ada9598 | 9591 | msgid "up to date" |
81809b99 | 9592 | msgstr "最新" |
8ada9598 | 9593 | |
276ceeaa | 9594 | #: builtin/remote.c:1031 |
8ada9598 | 9595 | msgid "fast-forwardable" |
81809b99 | 9596 | msgstr "可快进" |
8ada9598 | 9597 | |
276ceeaa | 9598 | #: builtin/remote.c:1034 |
8ada9598 | 9599 | msgid "local out of date" |
81809b99 | 9600 | msgstr "本地已过时" |
8ada9598 | 9601 | |
276ceeaa | 9602 | #: builtin/remote.c:1041 |
8ada9598 JX |
9603 | #, c-format |
9604 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 9605 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 | 9606 | |
276ceeaa | 9607 | #: builtin/remote.c:1044 |
8ada9598 JX |
9608 | #, c-format |
9609 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 9610 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 | 9611 | |
276ceeaa | 9612 | #: builtin/remote.c:1048 |
8ada9598 JX |
9613 | #, c-format |
9614 | msgid " %-*s forces to %s" | |
81809b99 | 9615 | msgstr " %-*s 强制推送至 %s" |
8ada9598 | 9616 | |
276ceeaa | 9617 | #: builtin/remote.c:1051 |
8ada9598 JX |
9618 | #, c-format |
9619 | msgid " %-*s pushes to %s" | |
81809b99 | 9620 | msgstr " %-*s 推送至 %s" |
8ada9598 | 9621 | |
276ceeaa | 9622 | #: builtin/remote.c:1119 |
ef317cd5 | 9623 | msgid "do not query remotes" |
07432cef | 9624 | msgstr "不查询远程" |
ef317cd5 | 9625 | |
276ceeaa | 9626 | #: builtin/remote.c:1146 |
81809b99 | 9627 | #, c-format |
8ada9598 | 9628 | msgid "* remote %s" |
81809b99 | 9629 | msgstr "* 远程 %s" |
8ada9598 | 9630 | |
276ceeaa | 9631 | #: builtin/remote.c:1147 |
8ada9598 JX |
9632 | #, c-format |
9633 | msgid " Fetch URL: %s" | |
81809b99 | 9634 | msgstr " 获取地址:%s" |
8ada9598 | 9635 | |
276ceeaa | 9636 | #: builtin/remote.c:1148 builtin/remote.c:1299 |
8ada9598 | 9637 | msgid "(no URL)" |
81809b99 | 9638 | msgstr "(无 URL)" |
8ada9598 | 9639 | |
276ceeaa | 9640 | #: builtin/remote.c:1157 builtin/remote.c:1159 |
8ada9598 JX |
9641 | #, c-format |
9642 | msgid " Push URL: %s" | |
81809b99 | 9643 | msgstr " 推送地址:%s" |
8ada9598 | 9644 | |
276ceeaa | 9645 | #: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 |
81809b99 | 9646 | #, c-format |
8ada9598 | 9647 | msgid " HEAD branch: %s" |
4375c10e | 9648 | msgstr " HEAD 分支:%s" |
8ada9598 | 9649 | |
276ceeaa | 9650 | #: builtin/remote.c:1167 |
8ada9598 JX |
9651 | #, c-format |
9652 | msgid "" | |
9653 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 9654 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 | 9655 | |
276ceeaa | 9656 | #: builtin/remote.c:1179 |
81809b99 | 9657 | #, c-format |
8ada9598 JX |
9658 | msgid " Remote branch:%s" |
9659 | msgid_plural " Remote branches:%s" | |
81809b99 | 9660 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 9661 | msgstr[1] " 远程分支:%s" |
8ada9598 | 9662 | |
81809b99 | 9663 | # 译者:中文字符串拼接,可删除前导空格 |
276ceeaa | 9664 | #: builtin/remote.c:1182 builtin/remote.c:1209 |
8ada9598 | 9665 | msgid " (status not queried)" |
81809b99 | 9666 | msgstr "(状态未查询)" |
8ada9598 | 9667 | |
276ceeaa | 9668 | #: builtin/remote.c:1191 |
8ada9598 JX |
9669 | msgid " Local branch configured for 'git pull':" |
9670 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 9671 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 9672 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 | 9673 | |
276ceeaa | 9674 | #: builtin/remote.c:1199 |
8ada9598 | 9675 | msgid " Local refs will be mirrored by 'git push'" |
81809b99 | 9676 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 | 9677 | |
276ceeaa | 9678 | #: builtin/remote.c:1206 |
81809b99 | 9679 | #, c-format |
8ada9598 JX |
9680 | msgid " Local ref configured for 'git push'%s:" |
9681 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 9682 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 9683 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 9684 | |
276ceeaa | 9685 | #: builtin/remote.c:1227 |
ef317cd5 | 9686 | msgid "set refs/remotes/<name>/HEAD according to remote" |
07432cef | 9687 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 | 9688 | |
276ceeaa | 9689 | #: builtin/remote.c:1229 |
ef317cd5 | 9690 | msgid "delete refs/remotes/<name>/HEAD" |
07432cef | 9691 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 9692 | |
276ceeaa | 9693 | #: builtin/remote.c:1244 |
8ada9598 | 9694 | msgid "Cannot determine remote HEAD" |
81809b99 | 9695 | msgstr "无法确定远程 HEAD" |
8ada9598 | 9696 | |
276ceeaa | 9697 | #: builtin/remote.c:1246 |
8ada9598 | 9698 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
81809b99 | 9699 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 | 9700 | |
276ceeaa | 9701 | #: builtin/remote.c:1256 |
81809b99 | 9702 | #, c-format |
8ada9598 | 9703 | msgid "Could not delete %s" |
81809b99 | 9704 | msgstr "无法删除 %s" |
8ada9598 | 9705 | |
276ceeaa | 9706 | #: builtin/remote.c:1264 |
81809b99 | 9707 | #, c-format |
8ada9598 | 9708 | msgid "Not a valid ref: %s" |
81809b99 | 9709 | msgstr "不是一个有效引用:%s" |
8ada9598 | 9710 | |
276ceeaa | 9711 | #: builtin/remote.c:1266 |
81809b99 | 9712 | #, c-format |
8ada9598 | 9713 | msgid "Could not setup %s" |
81809b99 | 9714 | msgstr "不能设置 %s" |
8ada9598 JX |
9715 | |
9716 | # 译者:注意保持前导空格 | |
276ceeaa | 9717 | #: builtin/remote.c:1284 |
81809b99 | 9718 | #, c-format |
8ada9598 | 9719 | msgid " %s will become dangling!" |
07432cef | 9720 | msgstr " %s 将成为摇摆状态!" |
8ada9598 JX |
9721 | |
9722 | # 译者:注意保持前导空格 | |
276ceeaa | 9723 | #: builtin/remote.c:1285 |
81809b99 | 9724 | #, c-format |
8ada9598 | 9725 | msgid " %s has become dangling!" |
07432cef | 9726 | msgstr " %s 已成为摇摆状态!" |
8ada9598 | 9727 | |
276ceeaa | 9728 | #: builtin/remote.c:1295 |
81809b99 | 9729 | #, c-format |
8ada9598 | 9730 | msgid "Pruning %s" |
81809b99 | 9731 | msgstr "修剪 %s" |
8ada9598 | 9732 | |
276ceeaa | 9733 | #: builtin/remote.c:1296 |
8ada9598 JX |
9734 | #, c-format |
9735 | msgid "URL: %s" | |
81809b99 | 9736 | msgstr "URL:%s" |
8ada9598 | 9737 | |
276ceeaa | 9738 | #: builtin/remote.c:1312 |
8ada9598 JX |
9739 | #, c-format |
9740 | msgid " * [would prune] %s" | |
81809b99 | 9741 | msgstr " * [将删除] %s" |
8ada9598 | 9742 | |
276ceeaa | 9743 | #: builtin/remote.c:1315 |
8ada9598 JX |
9744 | #, c-format |
9745 | msgid " * [pruned] %s" | |
81809b99 | 9746 | msgstr " * [已删除] %s" |
8ada9598 | 9747 | |
276ceeaa | 9748 | #: builtin/remote.c:1360 |
ef317cd5 | 9749 | msgid "prune remotes after fetching" |
07432cef | 9750 | msgstr "抓取后清除远程" |
ef317cd5 | 9751 | |
276ceeaa | 9752 | #: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 |
81809b99 | 9753 | #, c-format |
8ada9598 | 9754 | msgid "No such remote '%s'" |
81809b99 | 9755 | msgstr "没有此远程 '%s'" |
8ada9598 | 9756 | |
276ceeaa | 9757 | #: builtin/remote.c:1439 |
ef317cd5 | 9758 | msgid "add branch" |
07432cef | 9759 | msgstr "添加分支" |
ef317cd5 | 9760 | |
276ceeaa | 9761 | #: builtin/remote.c:1446 |
8ada9598 | 9762 | msgid "no remote specified" |
81809b99 | 9763 | msgstr "未指定远程" |
8ada9598 | 9764 | |
276ceeaa | 9765 | #: builtin/remote.c:1463 |
94550ed3 JX |
9766 | msgid "query push URLs rather than fetch URLs" |
9767 | msgstr "查询推送 URL 地址,而非获取 URL 地址" | |
9768 | ||
276ceeaa | 9769 | #: builtin/remote.c:1465 |
94550ed3 JX |
9770 | msgid "return all URLs" |
9771 | msgstr "返回所有 URL 地址" | |
9772 | ||
276ceeaa | 9773 | #: builtin/remote.c:1493 |
94550ed3 JX |
9774 | #, c-format |
9775 | msgid "no URLs configured for remote '%s'" | |
9776 | msgstr "没有给远程仓库 '%s' 设定 URL" | |
9777 | ||
276ceeaa | 9778 | #: builtin/remote.c:1519 |
ef317cd5 | 9779 | msgid "manipulate push URLs" |
07432cef | 9780 | msgstr "操作推送 URLS" |
ef317cd5 | 9781 | |
276ceeaa | 9782 | #: builtin/remote.c:1521 |
ef317cd5 | 9783 | msgid "add URL" |
07432cef | 9784 | msgstr "添加 URL" |
ef317cd5 | 9785 | |
276ceeaa | 9786 | #: builtin/remote.c:1523 |
ef317cd5 | 9787 | msgid "delete URLs" |
07432cef | 9788 | msgstr "删除 URLS" |
ef317cd5 | 9789 | |
276ceeaa | 9790 | #: builtin/remote.c:1530 |
8ada9598 | 9791 | msgid "--add --delete doesn't make sense" |
81809b99 | 9792 | msgstr "--add --delete 无意义" |
8ada9598 | 9793 | |
276ceeaa | 9794 | #: builtin/remote.c:1571 |
81809b99 | 9795 | #, c-format |
8ada9598 | 9796 | msgid "Invalid old URL pattern: %s" |
4375c10e | 9797 | msgstr "无效的旧 URL 匹配模版:%s" |
8ada9598 | 9798 | |
276ceeaa | 9799 | #: builtin/remote.c:1579 |
81809b99 | 9800 | #, c-format |
8ada9598 | 9801 | msgid "No such URL found: %s" |
4375c10e | 9802 | msgstr "未找到此 URL:%s" |
8ada9598 | 9803 | |
276ceeaa | 9804 | #: builtin/remote.c:1581 |
8ada9598 | 9805 | msgid "Will not delete all non-push URLs" |
4375c10e | 9806 | msgstr "将不会删除所有非推送 URL 地址" |
8ada9598 | 9807 | |
276ceeaa | 9808 | #: builtin/remote.c:1595 |
ef317cd5 | 9809 | msgid "be verbose; must be placed before a subcommand" |
07432cef | 9810 | msgstr "冗长输出;必须置于子命令之前" |
ef317cd5 | 9811 | |
6acbf033 | 9812 | #: builtin/repack.c:17 |
814ff314 JX |
9813 | msgid "git repack [<options>]" |
9814 | msgstr "git repack [<选项>]" | |
90314792 | 9815 | |
04cb2f28 | 9816 | #: builtin/repack.c:159 |
90314792 JX |
9817 | msgid "pack everything in a single pack" |
9818 | msgstr "所有内容打包到一个包文件中" | |
9819 | ||
04cb2f28 | 9820 | #: builtin/repack.c:161 |
90314792 JX |
9821 | msgid "same as -a, and turn unreachable objects loose" |
9822 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
9823 | ||
04cb2f28 | 9824 | #: builtin/repack.c:164 |
90314792 JX |
9825 | msgid "remove redundant packs, and run git-prune-packed" |
9826 | msgstr "删除多余的包,运行 git-prune-packed" | |
9827 | ||
04cb2f28 | 9828 | #: builtin/repack.c:166 |
90314792 JX |
9829 | msgid "pass --no-reuse-delta to git-pack-objects" |
9830 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
9831 | ||
04cb2f28 | 9832 | #: builtin/repack.c:168 |
90314792 JX |
9833 | msgid "pass --no-reuse-object to git-pack-objects" |
9834 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
9835 | ||
04cb2f28 | 9836 | #: builtin/repack.c:170 |
90314792 JX |
9837 | msgid "do not run git-update-server-info" |
9838 | msgstr "不运行 git-update-server-info" | |
9839 | ||
04cb2f28 | 9840 | #: builtin/repack.c:173 |
90314792 JX |
9841 | msgid "pass --local to git-pack-objects" |
9842 | msgstr "向 git-pack-objects 传递参数 --local" | |
9843 | ||
04cb2f28 | 9844 | #: builtin/repack.c:175 |
6c94aba5 JX |
9845 | msgid "write bitmap index" |
9846 | msgstr "写 bitmap 索引" | |
9847 | ||
04cb2f28 | 9848 | #: builtin/repack.c:176 |
90314792 JX |
9849 | msgid "approxidate" |
9850 | msgstr "近似日期" | |
9851 | ||
04cb2f28 | 9852 | #: builtin/repack.c:177 |
90314792 JX |
9853 | msgid "with -A, do not loosen objects older than this" |
9854 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
9855 | ||
04cb2f28 | 9856 | #: builtin/repack.c:179 |
90314792 JX |
9857 | msgid "size of the window used for delta compression" |
9858 | msgstr "用于增量压缩的窗口值" | |
9859 | ||
04cb2f28 | 9860 | #: builtin/repack.c:180 builtin/repack.c:184 |
8376b58d JX |
9861 | msgid "bytes" |
9862 | msgstr "字节" | |
9863 | ||
04cb2f28 | 9864 | #: builtin/repack.c:181 |
90314792 JX |
9865 | msgid "same as the above, but limit memory size instead of entries count" |
9866 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
9867 | ||
04cb2f28 | 9868 | #: builtin/repack.c:183 |
90314792 JX |
9869 | msgid "limits the maximum delta depth" |
9870 | msgstr "限制最大增量深度" | |
9871 | ||
04cb2f28 | 9872 | #: builtin/repack.c:185 |
90314792 | 9873 | msgid "maximum size of each packfile" |
dbd6cced | 9874 | msgstr "每个包文件的最大尺寸" |
90314792 | 9875 | |
04cb2f28 | 9876 | #: builtin/repack.c:187 |
6c94aba5 JX |
9877 | msgid "repack objects in packs marked with .keep" |
9878 | msgstr "对标记为 .keep 的包中的对象重新打包" | |
9879 | ||
94550ed3 JX |
9880 | #: builtin/repack.c:197 |
9881 | msgid "cannot delete packs in a precious-objects repo" | |
9882 | msgstr "不能删除珍品仓库中的打包文件" | |
9883 | ||
9884 | #: builtin/repack.c:381 | |
90314792 JX |
9885 | #, c-format |
9886 | msgid "removing '%s' failed" | |
9887 | msgstr "删除 '%s' 失败" | |
9888 | ||
6acbf033 | 9889 | #: builtin/replace.c:19 |
ef317cd5 | 9890 | msgid "git replace [-f] <object> <replacement>" |
07432cef | 9891 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 | 9892 | |
6acbf033 JX |
9893 | #: builtin/replace.c:20 |
9894 | msgid "git replace [-f] --edit <object>" | |
9895 | msgstr "git replace [-f] --edit <对象>" | |
9896 | ||
9897 | #: builtin/replace.c:21 | |
9898 | msgid "git replace [-f] --graft <commit> [<parent>...]" | |
9899 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" | |
9900 | ||
9901 | #: builtin/replace.c:22 | |
ef317cd5 | 9902 | msgid "git replace -d <object>..." |
07432cef | 9903 | msgstr "git replace -d <对象>..." |
ef317cd5 | 9904 | |
6acbf033 | 9905 | #: builtin/replace.c:23 |
cfff71a9 JX |
9906 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
9907 | msgstr "git replace [--format=<格式>] [-l [<模式>]]" | |
ef317cd5 | 9908 | |
220c313c | 9909 | #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 |
6acbf033 JX |
9910 | #, c-format |
9911 | msgid "Not a valid object name: '%s'" | |
9912 | msgstr "不是一个有效的对象名:'%s'" | |
9913 | ||
220c313c | 9914 | #: builtin/replace.c:355 |
6acbf033 JX |
9915 | #, c-format |
9916 | msgid "bad mergetag in commit '%s'" | |
55a16ee4 | 9917 | msgstr "提交 '%s' 中含有损坏的合并标签" |
6acbf033 | 9918 | |
220c313c | 9919 | #: builtin/replace.c:357 |
6acbf033 JX |
9920 | #, c-format |
9921 | msgid "malformed mergetag in commit '%s'" | |
55a16ee4 | 9922 | msgstr "提交 '%s' 中含有非法的合并标签" |
6acbf033 | 9923 | |
220c313c | 9924 | #: builtin/replace.c:368 |
6acbf033 JX |
9925 | #, c-format |
9926 | msgid "" | |
9927 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
9928 | "instead of --graft" | |
55a16ee4 | 9929 | msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft" |
6acbf033 | 9930 | |
220c313c | 9931 | #: builtin/replace.c:401 |
6acbf033 JX |
9932 | #, c-format |
9933 | msgid "the original commit '%s' has a gpg signature." | |
9934 | msgstr "原始提交 '%s' 中包含一个 GPG 签名" | |
9935 | ||
220c313c | 9936 | #: builtin/replace.c:402 |
6acbf033 JX |
9937 | msgid "the signature will be removed in the replacement commit!" |
9938 | msgstr "在替换的提交中签名将被移除!" | |
9939 | ||
220c313c | 9940 | #: builtin/replace.c:408 |
6acbf033 JX |
9941 | #, c-format |
9942 | msgid "could not write replacement commit for: '%s'" | |
9943 | msgstr "不能为 '%s' 写替换提交" | |
9944 | ||
220c313c | 9945 | #: builtin/replace.c:432 |
ef317cd5 | 9946 | msgid "list replace refs" |
07432cef | 9947 | msgstr "列出替换的引用" |
ef317cd5 | 9948 | |
220c313c | 9949 | #: builtin/replace.c:433 |
ef317cd5 | 9950 | msgid "delete replace refs" |
07432cef | 9951 | msgstr "删除替换的引用" |
ef317cd5 | 9952 | |
220c313c | 9953 | #: builtin/replace.c:434 |
6acbf033 JX |
9954 | msgid "edit existing object" |
9955 | msgstr "编辑现存的对象" | |
9956 | ||
220c313c | 9957 | #: builtin/replace.c:435 |
6acbf033 JX |
9958 | msgid "change a commit's parents" |
9959 | msgstr "修改一个提交的父提交" | |
9960 | ||
220c313c | 9961 | #: builtin/replace.c:436 |
ef317cd5 | 9962 | msgid "replace the ref if it exists" |
07432cef | 9963 | msgstr "如果存在则替换引用" |
ef317cd5 | 9964 | |
220c313c | 9965 | #: builtin/replace.c:437 |
6acbf033 JX |
9966 | msgid "do not pretty-print contents for --edit" |
9967 | msgstr "不要为 --edit 操作美观显示内容" | |
9968 | ||
220c313c | 9969 | #: builtin/replace.c:438 |
cfff71a9 JX |
9970 | msgid "use this format" |
9971 | msgstr "使用此格式" | |
9972 | ||
90314792 | 9973 | #: builtin/rerere.c:12 |
814ff314 JX |
9974 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
9975 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" | |
ef317cd5 | 9976 | |
94550ed3 | 9977 | #: builtin/rerere.c:58 |
ef317cd5 | 9978 | msgid "register clean resolutions in index" |
07432cef | 9979 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 | 9980 | |
220c313c | 9981 | #: builtin/reset.c:26 |
ef317cd5 JX |
9982 | msgid "" |
9983 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 9984 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 | 9985 | |
220c313c | 9986 | #: builtin/reset.c:27 |
07432cef WS |
9987 | msgid "git reset [-q] <tree-ish> [--] <paths>..." |
9988 | msgstr "git reset [-q] <树或提交> [--] <路径>..." | |
ef317cd5 | 9989 | |
220c313c | 9990 | #: builtin/reset.c:28 |
07432cef WS |
9991 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
9992 | msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" | |
ef317cd5 | 9993 | |
220c313c | 9994 | #: builtin/reset.c:34 |
c04f5ac3 JX |
9995 | msgid "mixed" |
9996 | msgstr "混杂" | |
9997 | ||
220c313c | 9998 | #: builtin/reset.c:34 |
c04f5ac3 JX |
9999 | msgid "soft" |
10000 | msgstr "软性" | |
10001 | ||
220c313c | 10002 | #: builtin/reset.c:34 |
c04f5ac3 JX |
10003 | msgid "hard" |
10004 | msgstr "硬性" | |
10005 | ||
220c313c | 10006 | #: builtin/reset.c:34 |
8ada9598 JX |
10007 | msgid "merge" |
10008 | msgstr "合并" | |
10009 | ||
220c313c | 10010 | #: builtin/reset.c:34 |
c04f5ac3 JX |
10011 | msgid "keep" |
10012 | msgstr "保持" | |
10013 | ||
220c313c | 10014 | #: builtin/reset.c:74 |
c04f5ac3 JX |
10015 | msgid "You do not have a valid HEAD." |
10016 | msgstr "您没有一个有效的 HEAD。" | |
10017 | ||
220c313c | 10018 | #: builtin/reset.c:76 |
c04f5ac3 JX |
10019 | msgid "Failed to find tree of HEAD." |
10020 | msgstr "无法找到 HEAD 指向的树。" | |
10021 | ||
220c313c | 10022 | #: builtin/reset.c:82 |
c04f5ac3 JX |
10023 | #, c-format |
10024 | msgid "Failed to find tree of %s." | |
10025 | msgstr "无法找到 %s 指向的树。" | |
10026 | ||
220c313c | 10027 | #: builtin/reset.c:100 |
c04f5ac3 JX |
10028 | #, c-format |
10029 | msgid "HEAD is now at %s" | |
10030 | msgstr "HEAD 现在位于 %s" | |
10031 | ||
90e6ef53 | 10032 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 10033 | #: builtin/reset.c:183 |
c04f5ac3 JX |
10034 | #, c-format |
10035 | msgid "Cannot do a %s reset in the middle of a merge." | |
10036 | msgstr "在合并过程中不能做%s重置操作。" | |
10037 | ||
220c313c | 10038 | #: builtin/reset.c:276 |
ef317cd5 | 10039 | msgid "be quiet, only report errors" |
07432cef | 10040 | msgstr "安静模式,只报告错误" |
ef317cd5 | 10041 | |
220c313c | 10042 | #: builtin/reset.c:278 |
ef317cd5 | 10043 | msgid "reset HEAD and index" |
07432cef | 10044 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 10045 | |
220c313c | 10046 | #: builtin/reset.c:279 |
ef317cd5 | 10047 | msgid "reset only HEAD" |
07432cef | 10048 | msgstr "只重置 HEAD" |
ef317cd5 | 10049 | |
220c313c | 10050 | #: builtin/reset.c:281 builtin/reset.c:283 |
ef317cd5 | 10051 | msgid "reset HEAD, index and working tree" |
07432cef | 10052 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 10053 | |
220c313c | 10054 | #: builtin/reset.c:285 |
ef317cd5 | 10055 | msgid "reset HEAD but keep local changes" |
07432cef | 10056 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 10057 | |
220c313c | 10058 | #: builtin/reset.c:288 |
6c94aba5 JX |
10059 | msgid "record only the fact that removed paths will be added later" |
10060 | msgstr "将删除的路径标记为稍后添加" | |
10061 | ||
220c313c | 10062 | #: builtin/reset.c:305 |
07432cef WS |
10063 | #, c-format |
10064 | msgid "Failed to resolve '%s' as a valid revision." | |
10065 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
10066 | ||
220c313c | 10067 | #: builtin/reset.c:313 |
07432cef WS |
10068 | #, c-format |
10069 | msgid "Failed to resolve '%s' as a valid tree." | |
10070 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
10071 | ||
220c313c | 10072 | #: builtin/reset.c:322 |
c04f5ac3 | 10073 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 10074 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 10075 | |
220c313c | 10076 | #: builtin/reset.c:331 |
c04f5ac3 | 10077 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
d9d56b23 | 10078 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
c04f5ac3 | 10079 | |
90e6ef53 | 10080 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 10081 | #: builtin/reset.c:333 |
c04f5ac3 JX |
10082 | #, c-format |
10083 | msgid "Cannot do %s reset with paths." | |
10084 | msgstr "不能带路径进行%s重置。" | |
10085 | ||
90e6ef53 | 10086 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 10087 | #: builtin/reset.c:343 |
c04f5ac3 JX |
10088 | #, c-format |
10089 | msgid "%s reset is not allowed in a bare repository" | |
160fb2b2 | 10090 | msgstr "不能对纯仓库进行%s重置" |
c04f5ac3 | 10091 | |
220c313c | 10092 | #: builtin/reset.c:347 |
6c94aba5 JX |
10093 | msgid "-N can only be used with --mixed" |
10094 | msgstr "-N 只能和 --mixed 同时使用" | |
10095 | ||
220c313c | 10096 | #: builtin/reset.c:364 |
90314792 | 10097 | msgid "Unstaged changes after reset:" |
160fb2b2 | 10098 | msgstr "重置后取消暂存的变更:" |
90314792 | 10099 | |
220c313c | 10100 | #: builtin/reset.c:370 |
ef317cd5 JX |
10101 | #, c-format |
10102 | msgid "Could not reset index file to revision '%s'." | |
10103 | msgstr "不能重置索引文件至版本 '%s'。" | |
10104 | ||
220c313c | 10105 | #: builtin/reset.c:374 |
07432cef WS |
10106 | msgid "Could not write new index file." |
10107 | msgstr "不能写入新的索引文件。" | |
10108 | ||
276ceeaa | 10109 | #: builtin/rev-list.c:350 |
1b7f4a34 JX |
10110 | msgid "rev-list does not support display of notes" |
10111 | msgstr "rev-list 不支持显示注解" | |
10112 | ||
94550ed3 | 10113 | #: builtin/rev-parse.c:358 |
814ff314 JX |
10114 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
10115 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" | |
ef317cd5 | 10116 | |
94550ed3 | 10117 | #: builtin/rev-parse.c:363 |
ef317cd5 | 10118 | msgid "keep the `--` passed as an arg" |
07432cef | 10119 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 10120 | |
94550ed3 | 10121 | #: builtin/rev-parse.c:365 |
ef317cd5 | 10122 | msgid "stop parsing after the first non-option argument" |
07432cef | 10123 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 10124 | |
94550ed3 | 10125 | #: builtin/rev-parse.c:368 |
cfff71a9 JX |
10126 | msgid "output in stuck long form" |
10127 | msgstr "以固定长格式输出" | |
10128 | ||
94550ed3 | 10129 | #: builtin/rev-parse.c:499 |
ef317cd5 | 10130 | msgid "" |
814ff314 | 10131 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
ef317cd5 | 10132 | " or: git rev-parse --sq-quote [<arg>...]\n" |
814ff314 | 10133 | " or: git rev-parse [<options>] [<arg>...]\n" |
ef317cd5 JX |
10134 | "\n" |
10135 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
10136 | msgstr "" | |
814ff314 | 10137 | "git rev-parse --parseopt [<选项>] -- [<参数>...]\n" |
90314792 | 10138 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
814ff314 | 10139 | " 或者:git rev-parse [<选项>] [<参数>...]\n" |
07432cef WS |
10140 | "\n" |
10141 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" | |
ef317cd5 JX |
10142 | |
10143 | #: builtin/revert.c:22 | |
814ff314 JX |
10144 | msgid "git revert [<options>] <commit-ish>..." |
10145 | msgstr "git revert [<选项>] <提交号>..." | |
ef317cd5 JX |
10146 | |
10147 | #: builtin/revert.c:23 | |
10148 | msgid "git revert <subcommand>" | |
07432cef | 10149 | msgstr "git revert <子命令>" |
ef317cd5 JX |
10150 | |
10151 | #: builtin/revert.c:28 | |
814ff314 JX |
10152 | msgid "git cherry-pick [<options>] <commit-ish>..." |
10153 | msgstr "git cherry-pick [<选项>] <提交号>..." | |
ef317cd5 JX |
10154 | |
10155 | #: builtin/revert.c:29 | |
ef317cd5 | 10156 | msgid "git cherry-pick <subcommand>" |
07432cef | 10157 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 10158 | |
90314792 | 10159 | #: builtin/revert.c:71 |
ef317cd5 JX |
10160 | #, c-format |
10161 | msgid "%s: %s cannot be used with %s" | |
10162 | msgstr "%s:%s 不能和 %s 同时使用" | |
10163 | ||
90314792 | 10164 | #: builtin/revert.c:80 |
ef317cd5 | 10165 | msgid "end revert or cherry-pick sequence" |
07432cef | 10166 | msgstr "终止反转或拣选操作" |
ef317cd5 | 10167 | |
90314792 | 10168 | #: builtin/revert.c:81 |
ef317cd5 | 10169 | msgid "resume revert or cherry-pick sequence" |
07432cef | 10170 | msgstr "继续反转或拣选操作" |
ef317cd5 | 10171 | |
90314792 | 10172 | #: builtin/revert.c:82 |
ef317cd5 | 10173 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 10174 | msgstr "取消反转或拣选操作" |
ef317cd5 | 10175 | |
90314792 | 10176 | #: builtin/revert.c:83 |
ef317cd5 | 10177 | msgid "don't automatically commit" |
07432cef | 10178 | msgstr "不要自动提交" |
ef317cd5 | 10179 | |
90314792 | 10180 | #: builtin/revert.c:84 |
ef317cd5 | 10181 | msgid "edit the commit message" |
07432cef | 10182 | msgstr "编辑提交说明" |
ef317cd5 | 10183 | |
90314792 | 10184 | #: builtin/revert.c:87 |
ef317cd5 | 10185 | msgid "parent number" |
07432cef | 10186 | msgstr "父编号" |
ef317cd5 | 10187 | |
90314792 | 10188 | #: builtin/revert.c:89 |
ef317cd5 | 10189 | msgid "merge strategy" |
07432cef | 10190 | msgstr "合并策略" |
ef317cd5 | 10191 | |
90314792 | 10192 | #: builtin/revert.c:90 |
ef317cd5 | 10193 | msgid "option" |
07432cef | 10194 | msgstr "选项" |
ef317cd5 | 10195 | |
90314792 | 10196 | #: builtin/revert.c:91 |
ef317cd5 | 10197 | msgid "option for merge strategy" |
07432cef | 10198 | msgstr "合并策略的选项" |
ef317cd5 | 10199 | |
6c94aba5 | 10200 | #: builtin/revert.c:104 |
ef317cd5 | 10201 | msgid "append commit name" |
07432cef | 10202 | msgstr "追加提交名称" |
ef317cd5 | 10203 | |
6c94aba5 | 10204 | #: builtin/revert.c:106 |
ef317cd5 | 10205 | msgid "preserve initially empty commits" |
07432cef | 10206 | msgstr "保留初始化的空提交" |
ef317cd5 | 10207 | |
6c94aba5 | 10208 | #: builtin/revert.c:107 |
ef317cd5 | 10209 | msgid "allow commits with empty messages" |
07432cef | 10210 | msgstr "允许提交说明为空" |
c04f5ac3 | 10211 | |
6c94aba5 | 10212 | #: builtin/revert.c:108 |
ef317cd5 | 10213 | msgid "keep redundant, empty commits" |
07432cef | 10214 | msgstr "保持多余的、空的提交" |
ef317cd5 | 10215 | |
6c94aba5 | 10216 | #: builtin/revert.c:112 |
c04f5ac3 JX |
10217 | msgid "program error" |
10218 | msgstr "程序错误" | |
10219 | ||
6c94aba5 | 10220 | #: builtin/revert.c:197 |
c04f5ac3 JX |
10221 | msgid "revert failed" |
10222 | msgstr "还原失败" | |
10223 | ||
6c94aba5 | 10224 | #: builtin/revert.c:212 |
c04f5ac3 JX |
10225 | msgid "cherry-pick failed" |
10226 | msgstr "拣选失败" | |
10227 | ||
90314792 | 10228 | #: builtin/rm.c:17 |
814ff314 JX |
10229 | msgid "git rm [<options>] [--] <file>..." |
10230 | msgstr "git rm [<选项>] [--] <文件>..." | |
07432cef | 10231 | |
90314792 | 10232 | #: builtin/rm.c:65 |
2e8451e8 JX |
10233 | msgid "" |
10234 | "the following submodule (or one of its nested submodules)\n" | |
10235 | "uses a .git directory:" | |
10236 | msgid_plural "" | |
220c313c | 10237 | "the following submodules (or one of their nested submodules)\n" |
2e8451e8 | 10238 | "use a .git directory:" |
220c313c JX |
10239 | msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" |
10240 | msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" | |
2e8451e8 | 10241 | |
90314792 | 10242 | #: builtin/rm.c:71 |
07432cef | 10243 | msgid "" |
2e8451e8 | 10244 | "\n" |
07432cef WS |
10245 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
10246 | msgstr "" | |
2e8451e8 | 10247 | "\n" |
07432cef | 10248 | "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" |
ef317cd5 | 10249 | |
7aea43ff | 10250 | #: builtin/rm.c:230 |
c04f5ac3 | 10251 | msgid "" |
2e8451e8 JX |
10252 | "the following file has staged content different from both the\n" |
10253 | "file and the HEAD:" | |
10254 | msgid_plural "" | |
10255 | "the following files have staged content different from both the\n" | |
10256 | "file and the HEAD:" | |
10257 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
10258 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
10259 | ||
7aea43ff | 10260 | #: builtin/rm.c:235 |
2e8451e8 JX |
10261 | msgid "" |
10262 | "\n" | |
c04f5ac3 JX |
10263 | "(use -f to force removal)" |
10264 | msgstr "" | |
2e8451e8 | 10265 | "\n" |
c04f5ac3 JX |
10266 | "(使用 -f 强制删除)" |
10267 | ||
7aea43ff | 10268 | #: builtin/rm.c:239 |
2e8451e8 JX |
10269 | msgid "the following file has changes staged in the index:" |
10270 | msgid_plural "the following files have changes staged in the index:" | |
160fb2b2 JX |
10271 | msgstr[0] "下列文件索引中有变更" |
10272 | msgstr[1] "下列文件索引中有变更" | |
c04f5ac3 | 10273 | |
7aea43ff | 10274 | #: builtin/rm.c:243 builtin/rm.c:254 |
c04f5ac3 | 10275 | msgid "" |
2e8451e8 | 10276 | "\n" |
c04f5ac3 JX |
10277 | "(use --cached to keep the file, or -f to force removal)" |
10278 | msgstr "" | |
2e8451e8 JX |
10279 | "\n" |
10280 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
10281 | ||
7aea43ff | 10282 | #: builtin/rm.c:251 |
2e8451e8 JX |
10283 | msgid "the following file has local modifications:" |
10284 | msgid_plural "the following files have local modifications:" | |
10285 | msgstr[0] "如下文件有本地修改:" | |
10286 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 10287 | |
7aea43ff | 10288 | #: builtin/rm.c:269 |
ef317cd5 | 10289 | msgid "do not list removed files" |
07432cef | 10290 | msgstr "不列出删除的文件" |
ef317cd5 | 10291 | |
7aea43ff | 10292 | #: builtin/rm.c:270 |
ef317cd5 | 10293 | msgid "only remove from the index" |
07432cef | 10294 | msgstr "只从索引区删除" |
ef317cd5 | 10295 | |
7aea43ff | 10296 | #: builtin/rm.c:271 |
ef317cd5 | 10297 | msgid "override the up-to-date check" |
07432cef | 10298 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 10299 | |
7aea43ff | 10300 | #: builtin/rm.c:272 |
ef317cd5 | 10301 | msgid "allow recursive removal" |
07432cef | 10302 | msgstr "允许递归删除" |
ef317cd5 | 10303 | |
7aea43ff | 10304 | #: builtin/rm.c:274 |
ef317cd5 | 10305 | msgid "exit with a zero status even if nothing matched" |
07432cef | 10306 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 10307 | |
7aea43ff | 10308 | #: builtin/rm.c:317 |
220c313c JX |
10309 | msgid "Please, stage your changes to .gitmodules or stash them to proceed" |
10310 | msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" | |
10311 | ||
7aea43ff | 10312 | #: builtin/rm.c:335 |
c04f5ac3 JX |
10313 | #, c-format |
10314 | msgid "not removing '%s' recursively without -r" | |
10315 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
10316 | ||
7aea43ff | 10317 | #: builtin/rm.c:374 |
c04f5ac3 JX |
10318 | #, c-format |
10319 | msgid "git rm: unable to remove %s" | |
10320 | msgstr "git rm:不能删除 %s" | |
10321 | ||
1b7f4a34 JX |
10322 | #: builtin/send-pack.c:18 |
10323 | msgid "" | |
10324 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
10325 | "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " | |
10326 | "[<ref>...]\n" | |
10327 | " --all and explicit <ref> specification are mutually exclusive." | |
10328 | msgstr "" | |
10329 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
10330 | "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" | |
10331 | " --all 和明确的 <引用> 互斥。" | |
10332 | ||
10333 | #: builtin/send-pack.c:160 | |
10334 | msgid "remote name" | |
10335 | msgstr "远程名称" | |
10336 | ||
10337 | #: builtin/send-pack.c:171 | |
10338 | msgid "use stateless RPC protocol" | |
10339 | msgstr "使用无状态的 RPC 协议" | |
10340 | ||
10341 | #: builtin/send-pack.c:172 | |
10342 | msgid "read refs from stdin" | |
10343 | msgstr "从标准输入读取引用" | |
10344 | ||
10345 | #: builtin/send-pack.c:173 | |
10346 | msgid "print status from remote helper" | |
10347 | msgstr "打印来自远程 helper 的状态" | |
10348 | ||
ef317cd5 | 10349 | #: builtin/shortlog.c:13 |
814ff314 | 10350 | msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" |
4dcdc3d8 | 10351 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" |
ef317cd5 | 10352 | |
276ceeaa | 10353 | #: builtin/shortlog.c:242 |
ef317cd5 | 10354 | msgid "sort output according to the number of commits per author" |
07432cef | 10355 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 10356 | |
276ceeaa | 10357 | #: builtin/shortlog.c:244 |
ef317cd5 | 10358 | msgid "Suppress commit descriptions, only provides commit count" |
07432cef | 10359 | msgstr "隐藏提交说明,只提供提交数量" |
ef317cd5 | 10360 | |
276ceeaa | 10361 | #: builtin/shortlog.c:246 |
ef317cd5 | 10362 | msgid "Show the email address of each author" |
07432cef | 10363 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 10364 | |
276ceeaa | 10365 | #: builtin/shortlog.c:247 |
ef317cd5 | 10366 | msgid "w[,i1[,i2]]" |
07432cef | 10367 | msgstr "w[,i1[,i2]]" |
ef317cd5 | 10368 | |
276ceeaa | 10369 | #: builtin/shortlog.c:248 |
ef317cd5 | 10370 | msgid "Linewrap output" |
07432cef | 10371 | msgstr "折行输出" |
ef317cd5 | 10372 | |
94550ed3 | 10373 | #: builtin/show-branch.c:10 |
ef317cd5 | 10374 | msgid "" |
814ff314 | 10375 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
10376 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
10377 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
10378 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
ef317cd5 | 10379 | msgstr "" |
814ff314 | 10380 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
10381 | "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" |
10382 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
10383 | "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" | |
ef317cd5 | 10384 | |
94550ed3 | 10385 | #: builtin/show-branch.c:14 |
814ff314 JX |
10386 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
10387 | msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" | |
ef317cd5 | 10388 | |
94550ed3 | 10389 | #: builtin/show-branch.c:640 |
ef317cd5 | 10390 | msgid "show remote-tracking and local branches" |
07432cef | 10391 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 10392 | |
94550ed3 | 10393 | #: builtin/show-branch.c:642 |
ef317cd5 | 10394 | msgid "show remote-tracking branches" |
07432cef | 10395 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 10396 | |
94550ed3 | 10397 | #: builtin/show-branch.c:644 |
ef317cd5 | 10398 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 10399 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 10400 | |
94550ed3 | 10401 | #: builtin/show-branch.c:646 |
ef317cd5 | 10402 | msgid "show <n> more commits after the common ancestor" |
07432cef | 10403 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 10404 | |
94550ed3 | 10405 | #: builtin/show-branch.c:648 |
ef317cd5 | 10406 | msgid "synonym to more=-1" |
07432cef | 10407 | msgstr "和 more=-1 同义" |
ef317cd5 | 10408 | |
94550ed3 | 10409 | #: builtin/show-branch.c:649 |
ef317cd5 | 10410 | msgid "suppress naming strings" |
07432cef | 10411 | msgstr "不显示字符串命名" |
ef317cd5 | 10412 | |
94550ed3 | 10413 | #: builtin/show-branch.c:651 |
ef317cd5 | 10414 | msgid "include the current branch" |
07432cef | 10415 | msgstr "包括当前分支" |
ef317cd5 | 10416 | |
94550ed3 | 10417 | #: builtin/show-branch.c:653 |
ef317cd5 | 10418 | msgid "name commits with their object names" |
07432cef | 10419 | msgstr "以对象名字命名提交" |
ef317cd5 | 10420 | |
94550ed3 | 10421 | #: builtin/show-branch.c:655 |
ef317cd5 | 10422 | msgid "show possible merge bases" |
07432cef | 10423 | msgstr "显示可能合并的基线" |
ef317cd5 | 10424 | |
94550ed3 | 10425 | #: builtin/show-branch.c:657 |
ef317cd5 | 10426 | msgid "show refs unreachable from any other ref" |
07432cef | 10427 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 10428 | |
94550ed3 | 10429 | #: builtin/show-branch.c:659 |
ef317cd5 | 10430 | msgid "show commits in topological order" |
07432cef | 10431 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 10432 | |
94550ed3 | 10433 | #: builtin/show-branch.c:662 |
ef317cd5 | 10434 | msgid "show only commits not on the first branch" |
07432cef | 10435 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 10436 | |
94550ed3 | 10437 | #: builtin/show-branch.c:664 |
ef317cd5 | 10438 | msgid "show merges reachable from only one tip" |
07432cef | 10439 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 10440 | |
94550ed3 | 10441 | #: builtin/show-branch.c:666 |
2e8451e8 JX |
10442 | msgid "topologically sort, maintaining date order where possible" |
10443 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 10444 | |
94550ed3 | 10445 | #: builtin/show-branch.c:669 |
ef317cd5 | 10446 | msgid "<n>[,<base>]" |
07432cef | 10447 | msgstr "<n>[,<base>]" |
ef317cd5 | 10448 | |
94550ed3 | 10449 | #: builtin/show-branch.c:670 |
ef317cd5 | 10450 | msgid "show <n> most recent ref-log entries starting at base" |
07432cef | 10451 | msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" |
ef317cd5 JX |
10452 | |
10453 | #: builtin/show-ref.c:10 | |
10454 | msgid "" | |
814ff314 JX |
10455 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
10456 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
ef317cd5 | 10457 | msgstr "" |
814ff314 JX |
10458 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
10459 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" | |
ef317cd5 JX |
10460 | |
10461 | #: builtin/show-ref.c:11 | |
94550ed3 JX |
10462 | msgid "git show-ref --exclude-existing[=<pattern>]" |
10463 | msgstr "git show-ref --exclude-existing[=<模式>]" | |
ef317cd5 | 10464 | |
94550ed3 | 10465 | #: builtin/show-ref.c:165 |
ef317cd5 | 10466 | msgid "only show tags (can be combined with heads)" |
55a16ee4 | 10467 | msgstr "只显示标签(可以和头共用)" |
ef317cd5 | 10468 | |
94550ed3 | 10469 | #: builtin/show-ref.c:166 |
ef317cd5 | 10470 | msgid "only show heads (can be combined with tags)" |
55a16ee4 | 10471 | msgstr "只显示头(可以和标签共用)" |
ef317cd5 | 10472 | |
94550ed3 | 10473 | #: builtin/show-ref.c:167 |
ef317cd5 | 10474 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 10475 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 10476 | |
94550ed3 | 10477 | #: builtin/show-ref.c:170 builtin/show-ref.c:172 |
2e8451e8 JX |
10478 | msgid "show the HEAD reference, even if it would be filtered out" |
10479 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 10480 | |
94550ed3 | 10481 | #: builtin/show-ref.c:174 |
ef317cd5 | 10482 | msgid "dereference tags into object IDs" |
4375c10e | 10483 | msgstr "转换标签到对象 ID" |
ef317cd5 | 10484 | |
94550ed3 | 10485 | #: builtin/show-ref.c:176 |
ef317cd5 | 10486 | msgid "only show SHA1 hash using <n> digits" |
07432cef | 10487 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" |
ef317cd5 | 10488 | |
94550ed3 | 10489 | #: builtin/show-ref.c:180 |
ef317cd5 | 10490 | msgid "do not print results to stdout (useful with --verify)" |
07432cef | 10491 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" |
ef317cd5 | 10492 | |
94550ed3 | 10493 | #: builtin/show-ref.c:182 |
ef317cd5 | 10494 | msgid "show refs from stdin that aren't in local repository" |
160fb2b2 | 10495 | msgstr "显示从标准输入中读入的不在本地仓库中的引用" |
ef317cd5 | 10496 | |
94550ed3 JX |
10497 | #: builtin/stripspace.c:17 |
10498 | msgid "git stripspace [-s | --strip-comments]" | |
10499 | msgstr "git stripspace [-s | --strip-comments]" | |
10500 | ||
10501 | #: builtin/stripspace.c:18 | |
10502 | msgid "git stripspace [-c | --comment-lines]" | |
10503 | msgstr "git stripspace [-c | --comment-lines]" | |
10504 | ||
10505 | #: builtin/stripspace.c:35 | |
10506 | msgid "skip and remove all lines starting with comment character" | |
10507 | msgstr "跳过和移除所有的注释行" | |
10508 | ||
10509 | #: builtin/stripspace.c:38 | |
276ceeaa | 10510 | msgid "prepend comment character and space to each line" |
94550ed3 JX |
10511 | msgstr "为每一行的行首添加注释符和空格" |
10512 | ||
276ceeaa | 10513 | #: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 |
94550ed3 JX |
10514 | msgid "alternative anchor for relative paths" |
10515 | msgstr "相对路径的替代锚记(anchor)" | |
10516 | ||
276ceeaa | 10517 | #: builtin/submodule--helper.c:78 |
94550ed3 JX |
10518 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" |
10519 | msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" | |
10520 | ||
276ceeaa | 10521 | #: builtin/submodule--helper.c:108 |
94550ed3 JX |
10522 | msgid "git submodule--helper name <path>" |
10523 | msgstr "git submodule--helper name <路径>" | |
10524 | ||
276ceeaa | 10525 | #: builtin/submodule--helper.c:114 |
94550ed3 JX |
10526 | #, c-format |
10527 | msgid "no submodule mapping found in .gitmodules for path '%s'" | |
10528 | msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" | |
10529 | ||
276ceeaa | 10530 | #: builtin/submodule--helper.c:164 |
94550ed3 JX |
10531 | msgid "where the new submodule will be cloned to" |
10532 | msgstr "新的子模组将要克隆的路径" | |
10533 | ||
276ceeaa | 10534 | #: builtin/submodule--helper.c:167 |
94550ed3 JX |
10535 | msgid "name of the new submodule" |
10536 | msgstr "新子模组的名称" | |
10537 | ||
276ceeaa | 10538 | #: builtin/submodule--helper.c:170 |
94550ed3 JX |
10539 | msgid "url where to clone the submodule from" |
10540 | msgstr "克隆子模组的 url 地址" | |
10541 | ||
276ceeaa | 10542 | #: builtin/submodule--helper.c:176 |
94550ed3 JX |
10543 | msgid "depth for shallow clones" |
10544 | msgstr "浅克隆的深度" | |
10545 | ||
276ceeaa | 10546 | #: builtin/submodule--helper.c:182 |
94550ed3 JX |
10547 | msgid "" |
10548 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " | |
10549 | "<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" | |
10550 | msgstr "" | |
10551 | "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " | |
10552 | "[--name <名字>] [--url <地址>][--depth <深度>] [--] [<路径>...]" | |
10553 | ||
276ceeaa JX |
10554 | #: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 |
10555 | #: builtin/submodule--helper.c:210 | |
94550ed3 JX |
10556 | #, c-format |
10557 | msgid "could not create directory '%s'" | |
10558 | msgstr "不能创建目录 '%s'" | |
10559 | ||
276ceeaa | 10560 | #: builtin/submodule--helper.c:198 |
94550ed3 JX |
10561 | #, c-format |
10562 | msgid "clone of '%s' into submodule path '%s' failed" | |
10563 | msgstr "无法克隆 '%s' 到子模组路径 '%s'" | |
10564 | ||
276ceeaa | 10565 | #: builtin/submodule--helper.c:221 |
94550ed3 JX |
10566 | #, c-format |
10567 | msgid "cannot open file '%s'" | |
10568 | msgstr "无法打开文件 '%s'" | |
10569 | ||
276ceeaa | 10570 | #: builtin/submodule--helper.c:226 |
94550ed3 JX |
10571 | #, c-format |
10572 | msgid "could not close file %s" | |
10573 | msgstr "无法关闭文件 %s" | |
10574 | ||
276ceeaa | 10575 | #: builtin/submodule--helper.c:241 |
94550ed3 JX |
10576 | #, c-format |
10577 | msgid "could not get submodule directory for '%s'" | |
10578 | msgstr "无法得到 '%s' 的子模组目录" | |
10579 | ||
276ceeaa | 10580 | #: builtin/submodule--helper.c:267 |
94550ed3 JX |
10581 | msgid "fatal: submodule--helper subcommand must be called with a subcommand" |
10582 | msgstr "严重错误:submodule-helper 子命令必须由另外的子命令调用" | |
10583 | ||
276ceeaa | 10584 | #: builtin/submodule--helper.c:274 |
94550ed3 JX |
10585 | #, c-format |
10586 | msgid "fatal: '%s' is not a valid submodule--helper subcommand" | |
10587 | msgstr "严重错误:'%s' 不是一个有效的 submodule--helper 子命令" | |
10588 | ||
ef317cd5 | 10589 | #: builtin/symbolic-ref.c:7 |
814ff314 JX |
10590 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
10591 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" | |
07432cef WS |
10592 | |
10593 | #: builtin/symbolic-ref.c:8 | |
814ff314 JX |
10594 | msgid "git symbolic-ref -d [-q] <name>" |
10595 | msgstr "git symbolic-ref -d [-q] <名称>" | |
ef317cd5 | 10596 | |
07432cef | 10597 | #: builtin/symbolic-ref.c:40 |
ef317cd5 | 10598 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
10599 | msgstr "不显示非符号(分离的)引用的错误信息" |
10600 | ||
10601 | #: builtin/symbolic-ref.c:41 | |
10602 | msgid "delete symbolic ref" | |
10603 | msgstr "删除符号引用" | |
ef317cd5 | 10604 | |
07432cef | 10605 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 10606 | msgid "shorten ref output" |
07432cef | 10607 | msgstr "简短的引用输出" |
ef317cd5 | 10608 | |
1b7f4a34 | 10609 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 10610 | msgid "reason" |
07432cef | 10611 | msgstr "原因" |
ef317cd5 | 10612 | |
1b7f4a34 | 10613 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 10614 | msgid "reason of the update" |
07432cef | 10615 | msgstr "更新的原因" |
ef317cd5 | 10616 | |
94550ed3 | 10617 | #: builtin/tag.c:23 |
ef317cd5 | 10618 | msgid "" |
814ff314 JX |
10619 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " |
10620 | "[<head>]" | |
10621 | msgstr "" | |
10622 | "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" | |
ef317cd5 | 10623 | |
94550ed3 | 10624 | #: builtin/tag.c:24 |
ef317cd5 | 10625 | msgid "git tag -d <tagname>..." |
07432cef | 10626 | msgstr "git tag -d <标签名>..." |
ef317cd5 | 10627 | |
94550ed3 | 10628 | #: builtin/tag.c:25 |
ef317cd5 | 10629 | msgid "" |
814ff314 | 10630 | "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" |
94550ed3 | 10631 | "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" |
ef317cd5 | 10632 | msgstr "" |
94550ed3 JX |
10633 | "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n" |
10634 | "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" | |
ef317cd5 | 10635 | |
94550ed3 | 10636 | #: builtin/tag.c:27 |
ef317cd5 | 10637 | msgid "git tag -v <tagname>..." |
07432cef | 10638 | msgstr "git tag -v <标签名>..." |
ef317cd5 | 10639 | |
94550ed3 | 10640 | #: builtin/tag.c:80 |
c04f5ac3 JX |
10641 | #, c-format |
10642 | msgid "tag name too long: %.*s..." | |
55a16ee4 | 10643 | msgstr "标签名称太长:%.*s..." |
c04f5ac3 | 10644 | |
94550ed3 | 10645 | #: builtin/tag.c:85 |
c04f5ac3 JX |
10646 | #, c-format |
10647 | msgid "tag '%s' not found." | |
55a16ee4 | 10648 | msgstr "未发现标签 '%s'。" |
c04f5ac3 | 10649 | |
94550ed3 | 10650 | #: builtin/tag.c:100 |
c04f5ac3 JX |
10651 | #, c-format |
10652 | msgid "Deleted tag '%s' (was %s)\n" | |
55a16ee4 | 10653 | msgstr "已删除标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 10654 | |
94550ed3 | 10655 | #: builtin/tag.c:112 |
c04f5ac3 JX |
10656 | #, c-format |
10657 | msgid "could not verify the tag '%s'" | |
55a16ee4 | 10658 | msgstr "不能校验该标签 '%s'" |
c04f5ac3 | 10659 | |
94550ed3 | 10660 | #: builtin/tag.c:122 |
a77c07d9 | 10661 | #, c-format |
c04f5ac3 JX |
10662 | msgid "" |
10663 | "\n" | |
6acbf033 JX |
10664 | "Write a message for tag:\n" |
10665 | " %s\n" | |
a77c07d9 | 10666 | "Lines starting with '%c' will be ignored.\n" |
c04f5ac3 JX |
10667 | msgstr "" |
10668 | "\n" | |
55a16ee4 | 10669 | "输入一个标签说明:\n" |
6acbf033 | 10670 | " %s\n" |
a77c07d9 | 10671 | "以 '%c' 开头的行将被忽略。\n" |
c04f5ac3 | 10672 | |
94550ed3 | 10673 | #: builtin/tag.c:126 |
a77c07d9 | 10674 | #, c-format |
c04f5ac3 JX |
10675 | msgid "" |
10676 | "\n" | |
6acbf033 JX |
10677 | "Write a message for tag:\n" |
10678 | " %s\n" | |
a77c07d9 | 10679 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
c04f5ac3 | 10680 | "want to.\n" |
c04f5ac3 JX |
10681 | msgstr "" |
10682 | "\n" | |
55a16ee4 | 10683 | "输入一个标签说明:\n" |
6acbf033 | 10684 | " %s\n" |
a77c07d9 | 10685 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
c04f5ac3 | 10686 | |
94550ed3 | 10687 | #: builtin/tag.c:199 |
c04f5ac3 | 10688 | msgid "unable to sign the tag" |
55a16ee4 | 10689 | msgstr "无法签署标签" |
c04f5ac3 | 10690 | |
94550ed3 | 10691 | #: builtin/tag.c:201 |
c04f5ac3 | 10692 | msgid "unable to write tag file" |
55a16ee4 | 10693 | msgstr "无法写标签文件" |
c04f5ac3 | 10694 | |
94550ed3 | 10695 | #: builtin/tag.c:226 |
c04f5ac3 | 10696 | msgid "bad object type." |
90e6ef53 | 10697 | msgstr "坏的对象类型。" |
c04f5ac3 | 10698 | |
94550ed3 | 10699 | #: builtin/tag.c:239 |
c04f5ac3 | 10700 | msgid "tag header too big." |
55a16ee4 | 10701 | msgstr "标签头信息太大。" |
c04f5ac3 | 10702 | |
94550ed3 | 10703 | #: builtin/tag.c:275 |
c04f5ac3 | 10704 | msgid "no tag message?" |
55a16ee4 | 10705 | msgstr "无标签说明?" |
c04f5ac3 | 10706 | |
94550ed3 | 10707 | #: builtin/tag.c:281 |
c04f5ac3 JX |
10708 | #, c-format |
10709 | msgid "The tag message has been left in %s\n" | |
55a16ee4 | 10710 | msgstr "标签说明被保留在 %s\n" |
c04f5ac3 | 10711 | |
94550ed3 | 10712 | #: builtin/tag.c:339 |
ef317cd5 | 10713 | msgid "list tag names" |
55a16ee4 | 10714 | msgstr "列出标签名称" |
ef317cd5 | 10715 | |
94550ed3 | 10716 | #: builtin/tag.c:341 |
ef317cd5 | 10717 | msgid "print <n> lines of each tag message" |
55a16ee4 | 10718 | msgstr "每个标签信息打印 <n> 行" |
ef317cd5 | 10719 | |
94550ed3 | 10720 | #: builtin/tag.c:343 |
ef317cd5 | 10721 | msgid "delete tags" |
55a16ee4 | 10722 | msgstr "删除标签" |
ef317cd5 | 10723 | |
94550ed3 | 10724 | #: builtin/tag.c:344 |
ef317cd5 | 10725 | msgid "verify tags" |
55a16ee4 | 10726 | msgstr "验证标签" |
ef317cd5 | 10727 | |
94550ed3 | 10728 | #: builtin/tag.c:346 |
ef317cd5 | 10729 | msgid "Tag creation options" |
55a16ee4 | 10730 | msgstr "标签创建选项" |
ef317cd5 | 10731 | |
94550ed3 | 10732 | #: builtin/tag.c:348 |
ef317cd5 | 10733 | msgid "annotated tag, needs a message" |
55a16ee4 | 10734 | msgstr "附注标签,需要一个说明" |
ef317cd5 | 10735 | |
94550ed3 | 10736 | #: builtin/tag.c:350 |
ef317cd5 | 10737 | msgid "tag message" |
55a16ee4 | 10738 | msgstr "标签说明" |
ef317cd5 | 10739 | |
94550ed3 | 10740 | #: builtin/tag.c:352 |
ef317cd5 | 10741 | msgid "annotated and GPG-signed tag" |
55a16ee4 | 10742 | msgstr "附注并附加 GPG 签名的标签" |
ef317cd5 | 10743 | |
94550ed3 | 10744 | #: builtin/tag.c:356 |
ef317cd5 | 10745 | msgid "use another key to sign the tag" |
55a16ee4 | 10746 | msgstr "使用另外的私钥签名该标签" |
ef317cd5 | 10747 | |
94550ed3 | 10748 | #: builtin/tag.c:357 |
ef317cd5 | 10749 | msgid "replace the tag if exists" |
55a16ee4 | 10750 | msgstr "如果存在,替换现有的标签" |
ef317cd5 | 10751 | |
94550ed3 | 10752 | #: builtin/tag.c:358 builtin/update-ref.c:368 |
03ea3327 | 10753 | msgid "create a reflog" |
1b7f4a34 JX |
10754 | msgstr "创建引用日志" |
10755 | ||
94550ed3 | 10756 | #: builtin/tag.c:360 |
814ff314 | 10757 | msgid "Tag listing options" |
55a16ee4 | 10758 | msgstr "标签列表选项" |
814ff314 | 10759 | |
94550ed3 | 10760 | #: builtin/tag.c:361 |
ef317cd5 | 10761 | msgid "show tag list in columns" |
55a16ee4 | 10762 | msgstr "以列的方式显示标签列表" |
ef317cd5 | 10763 | |
94550ed3 | 10764 | #: builtin/tag.c:362 builtin/tag.c:363 |
ef317cd5 | 10765 | msgid "print only tags that contain the commit" |
55a16ee4 | 10766 | msgstr "只打印包含提交的标签" |
ef317cd5 | 10767 | |
94550ed3 JX |
10768 | #: builtin/tag.c:364 |
10769 | msgid "print only tags that are merged" | |
10770 | msgstr "只打印已经合并的标签" | |
10771 | ||
10772 | #: builtin/tag.c:365 | |
10773 | msgid "print only tags that are not merged" | |
10774 | msgstr "只打印尚未合并的标签" | |
10775 | ||
10776 | #: builtin/tag.c:370 | |
ef317cd5 | 10777 | msgid "print only tags of the object" |
55a16ee4 | 10778 | msgstr "只打印对象的标签" |
ef317cd5 | 10779 | |
94550ed3 | 10780 | #: builtin/tag.c:399 |
8ada9598 | 10781 | msgid "--column and -n are incompatible" |
81809b99 | 10782 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 10783 | |
94550ed3 | 10784 | #: builtin/tag.c:419 |
c04f5ac3 | 10785 | msgid "-n option is only allowed with -l." |
649900bc | 10786 | msgstr "-n 选项只允许和 -l 同时使用。" |
c04f5ac3 | 10787 | |
94550ed3 | 10788 | #: builtin/tag.c:421 |
c04f5ac3 | 10789 | msgid "--contains option is only allowed with -l." |
649900bc | 10790 | msgstr "--contains 选项只允许和 -l 同时使用。" |
c04f5ac3 | 10791 | |
94550ed3 | 10792 | #: builtin/tag.c:423 |
7ac1c0ad | 10793 | msgid "--points-at option is only allowed with -l." |
649900bc | 10794 | msgstr "--points-at 选项只允许和 -l 同时使用。" |
7ac1c0ad | 10795 | |
94550ed3 JX |
10796 | #: builtin/tag.c:425 |
10797 | msgid "--merged and --no-merged option are only allowed with -l" | |
10798 | msgstr "选项 --merged 和 --no-merged 只能和 -l 共用" | |
10799 | ||
10800 | #: builtin/tag.c:433 | |
c04f5ac3 JX |
10801 | msgid "only one -F or -m option is allowed." |
10802 | msgstr "只允许一个 -F 或 -m 选项。" | |
10803 | ||
94550ed3 | 10804 | #: builtin/tag.c:453 |
c04f5ac3 JX |
10805 | msgid "too many params" |
10806 | msgstr "太多参数" | |
10807 | ||
94550ed3 | 10808 | #: builtin/tag.c:459 |
c04f5ac3 JX |
10809 | #, c-format |
10810 | msgid "'%s' is not a valid tag name." | |
55a16ee4 | 10811 | msgstr "'%s' 不是一个有效的标签名称。" |
c04f5ac3 | 10812 | |
94550ed3 | 10813 | #: builtin/tag.c:464 |
c04f5ac3 JX |
10814 | #, c-format |
10815 | msgid "tag '%s' already exists" | |
55a16ee4 | 10816 | msgstr "标签 '%s' 已存在" |
c04f5ac3 | 10817 | |
94550ed3 | 10818 | #: builtin/tag.c:489 |
c04f5ac3 JX |
10819 | #, c-format |
10820 | msgid "Updated tag '%s' (was %s)\n" | |
55a16ee4 | 10821 | msgstr "已更新标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 10822 | |
1b7f4a34 | 10823 | #: builtin/unpack-objects.c:490 |
6c94aba5 JX |
10824 | msgid "Unpacking objects" |
10825 | msgstr "展开对象中" | |
10826 | ||
276ceeaa | 10827 | #: builtin/update-index.c:79 |
7aea43ff JX |
10828 | #, c-format |
10829 | msgid "failed to create directory %s" | |
10830 | msgstr "无法创建目录 %s" | |
10831 | ||
276ceeaa | 10832 | #: builtin/update-index.c:85 |
7aea43ff JX |
10833 | #, c-format |
10834 | msgid "failed to stat %s" | |
10835 | msgstr "无法枚举 %s 状态" | |
10836 | ||
276ceeaa | 10837 | #: builtin/update-index.c:95 |
7aea43ff JX |
10838 | #, c-format |
10839 | msgid "failed to create file %s" | |
10840 | msgstr "无法创建文件 %s" | |
10841 | ||
276ceeaa | 10842 | #: builtin/update-index.c:103 |
7aea43ff JX |
10843 | #, c-format |
10844 | msgid "failed to delete file %s" | |
10845 | msgstr "无法删除文件 %s" | |
10846 | ||
276ceeaa | 10847 | #: builtin/update-index.c:110 builtin/update-index.c:212 |
7aea43ff JX |
10848 | #, c-format |
10849 | msgid "failed to delete directory %s" | |
10850 | msgstr "无法删除目录 %s" | |
10851 | ||
276ceeaa | 10852 | #: builtin/update-index.c:133 |
7aea43ff | 10853 | #, c-format |
276ceeaa JX |
10854 | msgid "Testing mtime in '%s' " |
10855 | msgstr "在 '%s' 中测试 mtime " | |
7aea43ff | 10856 | |
276ceeaa | 10857 | #: builtin/update-index.c:145 |
7aea43ff JX |
10858 | msgid "directory stat info does not change after adding a new file" |
10859 | msgstr "添加一个新文件后,目录的状态信息未改变" | |
10860 | ||
276ceeaa | 10861 | #: builtin/update-index.c:158 |
7aea43ff JX |
10862 | msgid "directory stat info does not change after adding a new directory" |
10863 | msgstr "添加一个新目录后,目录的状态信息未改变" | |
10864 | ||
276ceeaa | 10865 | #: builtin/update-index.c:171 |
7aea43ff JX |
10866 | msgid "directory stat info changes after updating a file" |
10867 | msgstr "更新一个文件后,目录的状态信息被修改" | |
10868 | ||
276ceeaa | 10869 | #: builtin/update-index.c:182 |
7aea43ff JX |
10870 | msgid "directory stat info changes after adding a file inside subdirectory" |
10871 | msgstr "在子目录中添加文件后,目录的状态信息被修改" | |
10872 | ||
276ceeaa | 10873 | #: builtin/update-index.c:193 |
7aea43ff JX |
10874 | msgid "directory stat info does not change after deleting a file" |
10875 | msgstr "删除一个文件后,目录的状态信息未改变" | |
10876 | ||
276ceeaa | 10877 | #: builtin/update-index.c:206 |
7aea43ff JX |
10878 | msgid "directory stat info does not change after deleting a directory" |
10879 | msgstr "删除一个目录后,目录的状态信息未改变" | |
10880 | ||
276ceeaa | 10881 | #: builtin/update-index.c:213 |
7aea43ff JX |
10882 | msgid " OK" |
10883 | msgstr " OK" | |
10884 | ||
276ceeaa | 10885 | #: builtin/update-index.c:575 |
814ff314 JX |
10886 | msgid "git update-index [<options>] [--] [<file>...]" |
10887 | msgstr "git update-index [<选项>] [--] [<文件>...]" | |
8ada9598 | 10888 | |
276ceeaa | 10889 | #: builtin/update-index.c:930 |
ef317cd5 | 10890 | msgid "continue refresh even when index needs update" |
07432cef | 10891 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 10892 | |
276ceeaa | 10893 | #: builtin/update-index.c:933 |
ef317cd5 | 10894 | msgid "refresh: ignore submodules" |
07432cef | 10895 | msgstr "刷新:忽略子模组" |
8ada9598 | 10896 | |
276ceeaa | 10897 | #: builtin/update-index.c:936 |
ef317cd5 | 10898 | msgid "do not ignore new files" |
07432cef | 10899 | msgstr "不忽略新的文件" |
8ada9598 | 10900 | |
276ceeaa | 10901 | #: builtin/update-index.c:938 |
ef317cd5 | 10902 | msgid "let files replace directories and vice-versa" |
07432cef | 10903 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 10904 | |
276ceeaa | 10905 | #: builtin/update-index.c:940 |
ef317cd5 | 10906 | msgid "notice files missing from worktree" |
07432cef | 10907 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 10908 | |
276ceeaa | 10909 | #: builtin/update-index.c:942 |
ef317cd5 | 10910 | msgid "refresh even if index contains unmerged entries" |
07432cef | 10911 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 10912 | |
276ceeaa | 10913 | #: builtin/update-index.c:945 |
ef317cd5 | 10914 | msgid "refresh stat information" |
07432cef | 10915 | msgstr "刷新统计信息" |
ef317cd5 | 10916 | |
276ceeaa | 10917 | #: builtin/update-index.c:949 |
ef317cd5 | 10918 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 10919 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 10920 | |
276ceeaa | 10921 | #: builtin/update-index.c:953 |
6c94aba5 | 10922 | msgid "<mode>,<object>,<path>" |
d9d56b23 | 10923 | msgstr "<存取模式>,<对象>,<路径>" |
ef317cd5 | 10924 | |
276ceeaa | 10925 | #: builtin/update-index.c:954 |
ef317cd5 | 10926 | msgid "add the specified entry to the index" |
07432cef | 10927 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 10928 | |
276ceeaa | 10929 | #: builtin/update-index.c:958 |
ef317cd5 | 10930 | msgid "(+/-)x" |
07432cef | 10931 | msgstr "(+/-)x" |
ef317cd5 | 10932 | |
276ceeaa | 10933 | #: builtin/update-index.c:959 |
ef317cd5 | 10934 | msgid "override the executable bit of the listed files" |
07432cef | 10935 | msgstr "覆盖列表里文件的可执行位" |
ef317cd5 | 10936 | |
276ceeaa | 10937 | #: builtin/update-index.c:963 |
ef317cd5 | 10938 | msgid "mark files as \"not changing\"" |
07432cef | 10939 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 10940 | |
276ceeaa | 10941 | #: builtin/update-index.c:966 |
ef317cd5 | 10942 | msgid "clear assumed-unchanged bit" |
07432cef | 10943 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 10944 | |
276ceeaa | 10945 | #: builtin/update-index.c:969 |
ef317cd5 | 10946 | msgid "mark files as \"index-only\"" |
07432cef | 10947 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 10948 | |
276ceeaa | 10949 | #: builtin/update-index.c:972 |
ef317cd5 | 10950 | msgid "clear skip-worktree bit" |
07432cef | 10951 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 10952 | |
276ceeaa | 10953 | #: builtin/update-index.c:975 |
ef317cd5 | 10954 | msgid "add to index only; do not add content to object database" |
07432cef | 10955 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 10956 | |
276ceeaa | 10957 | #: builtin/update-index.c:977 |
ef317cd5 | 10958 | msgid "remove named paths even if present in worktree" |
07432cef | 10959 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 10960 | |
276ceeaa | 10961 | #: builtin/update-index.c:979 |
ef317cd5 | 10962 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 10963 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 10964 | |
276ceeaa | 10965 | #: builtin/update-index.c:981 |
ef317cd5 | 10966 | msgid "read list of paths to be updated from standard input" |
07432cef | 10967 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 10968 | |
276ceeaa | 10969 | #: builtin/update-index.c:985 |
ef317cd5 | 10970 | msgid "add entries from standard input to the index" |
07432cef | 10971 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 10972 | |
276ceeaa | 10973 | #: builtin/update-index.c:989 |
ef317cd5 | 10974 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 10975 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 10976 | |
276ceeaa | 10977 | #: builtin/update-index.c:993 |
ef317cd5 | 10978 | msgid "only update entries that differ from HEAD" |
07432cef | 10979 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 10980 | |
276ceeaa | 10981 | #: builtin/update-index.c:997 |
ef317cd5 | 10982 | msgid "ignore files missing from worktree" |
07432cef | 10983 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 10984 | |
276ceeaa | 10985 | #: builtin/update-index.c:1000 |
ef317cd5 | 10986 | msgid "report actions to standard output" |
07432cef | 10987 | msgstr "在标准输出显示操作" |
ef317cd5 | 10988 | |
276ceeaa | 10989 | #: builtin/update-index.c:1002 |
ef317cd5 | 10990 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 10991 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 10992 | |
276ceeaa | 10993 | #: builtin/update-index.c:1006 |
ef317cd5 | 10994 | msgid "write index in this format" |
07432cef | 10995 | msgstr "以这种格式写入索引区" |
ef317cd5 | 10996 | |
276ceeaa | 10997 | #: builtin/update-index.c:1008 |
6acbf033 JX |
10998 | msgid "enable or disable split index" |
10999 | msgstr "启用或禁用索引拆分" | |
11000 | ||
276ceeaa | 11001 | #: builtin/update-index.c:1010 |
7aea43ff JX |
11002 | msgid "enable/disable untracked cache" |
11003 | msgstr "启用/禁用对未跟踪文件的缓存" | |
11004 | ||
276ceeaa JX |
11005 | #: builtin/update-index.c:1012 |
11006 | msgid "test if the filesystem supports untracked cache" | |
11007 | msgstr "测试文件系统是否支持未跟踪文件缓存" | |
11008 | ||
11009 | #: builtin/update-index.c:1014 | |
7aea43ff JX |
11010 | msgid "enable untracked cache without testing the filesystem" |
11011 | msgstr "无需检测文件系统,启用对未跟踪文件的缓存" | |
11012 | ||
276ceeaa JX |
11013 | #: builtin/update-index.c:1134 |
11014 | msgid "Untracked cache disabled" | |
11015 | msgstr "缓存未跟踪文件被禁用" | |
11016 | ||
11017 | #: builtin/update-index.c:1146 | |
11018 | #, c-format | |
11019 | msgid "Untracked cache enabled for '%s'" | |
11020 | msgstr "缓存未跟踪文件在 '%s' 启用" | |
11021 | ||
90314792 | 11022 | #: builtin/update-ref.c:9 |
814ff314 JX |
11023 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
11024 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" | |
ef317cd5 | 11025 | |
90314792 | 11026 | #: builtin/update-ref.c:10 |
814ff314 JX |
11027 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
11028 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" | |
90314792 JX |
11029 | |
11030 | #: builtin/update-ref.c:11 | |
814ff314 JX |
11031 | msgid "git update-ref [<options>] --stdin [-z]" |
11032 | msgstr "git update-ref [<选项>] --stdin [-z]" | |
ef317cd5 | 11033 | |
1b7f4a34 | 11034 | #: builtin/update-ref.c:363 |
ef317cd5 | 11035 | msgid "delete the reference" |
07432cef | 11036 | msgstr "删除引用" |
ef317cd5 | 11037 | |
1b7f4a34 | 11038 | #: builtin/update-ref.c:365 |
ef317cd5 | 11039 | msgid "update <refname> not the one it points to" |
07432cef | 11040 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 11041 | |
1b7f4a34 | 11042 | #: builtin/update-ref.c:366 |
90314792 JX |
11043 | msgid "stdin has NUL-terminated arguments" |
11044 | msgstr "标准输入有以 NUL 字符终止的参数" | |
11045 | ||
1b7f4a34 | 11046 | #: builtin/update-ref.c:367 |
90314792 JX |
11047 | msgid "read updates from stdin" |
11048 | msgstr "从标准输入读取更新" | |
11049 | ||
ef317cd5 JX |
11050 | #: builtin/update-server-info.c:6 |
11051 | msgid "git update-server-info [--force]" | |
07432cef | 11052 | msgstr "git update-server-info [--force]" |
ef317cd5 JX |
11053 | |
11054 | #: builtin/update-server-info.c:14 | |
11055 | msgid "update the info files from scratch" | |
07432cef | 11056 | msgstr "从头开始更新文件信息" |
ef317cd5 | 11057 | |
6acbf033 | 11058 | #: builtin/verify-commit.c:17 |
814ff314 JX |
11059 | msgid "git verify-commit [-v | --verbose] <commit>..." |
11060 | msgstr "git verify-commit [-v | --verbose] <提交>..." | |
6acbf033 | 11061 | |
1b7f4a34 | 11062 | #: builtin/verify-commit.c:72 |
6acbf033 JX |
11063 | msgid "print commit contents" |
11064 | msgstr "打印提交内容" | |
11065 | ||
1b7f4a34 JX |
11066 | #: builtin/verify-commit.c:73 builtin/verify-tag.c:84 |
11067 | msgid "print raw gpg status output" | |
11068 | msgstr "打印原始 gpg 状态输出" | |
11069 | ||
220c313c | 11070 | #: builtin/verify-pack.c:54 |
814ff314 JX |
11071 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
11072 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." | |
ef317cd5 | 11073 | |
220c313c | 11074 | #: builtin/verify-pack.c:64 |
ef317cd5 JX |
11075 | msgid "verbose" |
11076 | msgstr "冗长输出" | |
11077 | ||
220c313c | 11078 | #: builtin/verify-pack.c:66 |
ef317cd5 | 11079 | msgid "show statistics only" |
07432cef | 11080 | msgstr "只显示统计" |
ef317cd5 JX |
11081 | |
11082 | #: builtin/verify-tag.c:17 | |
814ff314 JX |
11083 | msgid "git verify-tag [-v | --verbose] <tag>..." |
11084 | msgstr "git verify-tag [-v | --verbose] <标签>..." | |
ef317cd5 | 11085 | |
1b7f4a34 | 11086 | #: builtin/verify-tag.c:83 |
ef317cd5 | 11087 | msgid "print tag contents" |
55a16ee4 | 11088 | msgstr "打印标签内容" |
ef317cd5 | 11089 | |
94550ed3 JX |
11090 | #: builtin/worktree.c:15 |
11091 | msgid "git worktree add [<options>] <path> [<branch>]" | |
11092 | msgstr "git worktree add [<选项>] <路径> [<分支>]" | |
5bb01d4f | 11093 | |
94550ed3 | 11094 | #: builtin/worktree.c:16 |
5bb01d4f JX |
11095 | msgid "git worktree prune [<options>]" |
11096 | msgstr "git worktree prune [<选项>]" | |
11097 | ||
94550ed3 JX |
11098 | #: builtin/worktree.c:17 |
11099 | msgid "git worktree list [<options>]" | |
11100 | msgstr "git worktree list [<选项>]" | |
11101 | ||
11102 | #: builtin/worktree.c:39 | |
5bb01d4f JX |
11103 | #, c-format |
11104 | msgid "Removing worktrees/%s: not a valid directory" | |
11105 | msgstr "删除工作区/%s:不是一个有效的目录" | |
11106 | ||
94550ed3 | 11107 | #: builtin/worktree.c:45 |
5bb01d4f JX |
11108 | #, c-format |
11109 | msgid "Removing worktrees/%s: gitdir file does not exist" | |
11110 | msgstr "删除 worktrees/%s:gitdir 文件不存在" | |
11111 | ||
94550ed3 | 11112 | #: builtin/worktree.c:50 |
5bb01d4f JX |
11113 | #, c-format |
11114 | msgid "Removing worktrees/%s: unable to read gitdir file (%s)" | |
11115 | msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)" | |
11116 | ||
94550ed3 | 11117 | #: builtin/worktree.c:61 |
5bb01d4f JX |
11118 | #, c-format |
11119 | msgid "Removing worktrees/%s: invalid gitdir file" | |
11120 | msgstr "删除 worktrees/%s:无效的 gitdir 文件" | |
11121 | ||
94550ed3 | 11122 | #: builtin/worktree.c:77 |
5bb01d4f JX |
11123 | #, c-format |
11124 | msgid "Removing worktrees/%s: gitdir file points to non-existent location" | |
11125 | msgstr "删除 worktrees/%s:gitdir 文件的指向不存在" | |
11126 | ||
94550ed3 | 11127 | #: builtin/worktree.c:112 |
5bb01d4f JX |
11128 | #, c-format |
11129 | msgid "failed to remove: %s" | |
11130 | msgstr "无法删除:%s" | |
11131 | ||
94550ed3 | 11132 | #: builtin/worktree.c:201 |
5bb01d4f JX |
11133 | #, c-format |
11134 | msgid "'%s' already exists" | |
11135 | msgstr "'%s' 已经存在" | |
11136 | ||
276ceeaa | 11137 | #: builtin/worktree.c:233 |
5bb01d4f JX |
11138 | #, c-format |
11139 | msgid "could not create directory of '%s'" | |
11140 | msgstr "不能创建目录 '%s'" | |
11141 | ||
276ceeaa | 11142 | #: builtin/worktree.c:269 |
5bb01d4f | 11143 | #, c-format |
1b7f4a34 JX |
11144 | msgid "Preparing %s (identifier %s)" |
11145 | msgstr "准备 %s (标识符 %s)" | |
5bb01d4f | 11146 | |
276ceeaa | 11147 | #: builtin/worktree.c:317 |
5bb01d4f JX |
11148 | msgid "checkout <branch> even if already checked out in other worktree" |
11149 | msgstr "检出分支 <branch> 即使已经被检出到其它工作区" | |
11150 | ||
276ceeaa | 11151 | #: builtin/worktree.c:319 |
5bb01d4f JX |
11152 | msgid "create a new branch" |
11153 | msgstr "创建一个新分支" | |
11154 | ||
276ceeaa | 11155 | #: builtin/worktree.c:321 |
5bb01d4f JX |
11156 | msgid "create or reset a branch" |
11157 | msgstr "创建或重置一个分支" | |
11158 | ||
276ceeaa | 11159 | #: builtin/worktree.c:322 |
5bb01d4f JX |
11160 | msgid "detach HEAD at named commit" |
11161 | msgstr "HEAD 从指定的提交分离" | |
11162 | ||
276ceeaa | 11163 | #: builtin/worktree.c:329 |
1b7f4a34 JX |
11164 | msgid "-b, -B, and --detach are mutually exclusive" |
11165 | msgstr "-b、-B 和 --detach 是互斥的" | |
5bb01d4f | 11166 | |
ef317cd5 JX |
11167 | #: builtin/write-tree.c:13 |
11168 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" | |
07432cef | 11169 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 JX |
11170 | |
11171 | #: builtin/write-tree.c:26 | |
11172 | msgid "<prefix>/" | |
07432cef | 11173 | msgstr "<前缀>/" |
ef317cd5 JX |
11174 | |
11175 | #: builtin/write-tree.c:27 | |
11176 | msgid "write tree object for a subdirectory <prefix>" | |
07432cef | 11177 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 JX |
11178 | |
11179 | #: builtin/write-tree.c:30 | |
11180 | msgid "only useful for debugging" | |
07432cef | 11181 | msgstr "只对调试有用" |
ef317cd5 | 11182 | |
276ceeaa | 11183 | #: credential-cache--daemon.c:262 |
220c313c JX |
11184 | msgid "print debugging messages to stderr" |
11185 | msgstr "调试信息输出到标准错误" | |
11186 | ||
d9d56b23 | 11187 | #: git.c:14 |
4dcdc3d8 | 11188 | msgid "" |
220c313c | 11189 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
4dcdc3d8 JX |
11190 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
11191 | "to read about a specific subcommand or concept." | |
11192 | msgstr "" | |
220c313c JX |
11193 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" |
11194 | "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" | |
11195 | "帮助。" | |
8ada9598 | 11196 | |
276ceeaa JX |
11197 | #: http.c:320 |
11198 | msgid "Public key pinning not supported with cURL < 7.44.0" | |
11199 | msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0" | |
11200 | ||
1b7f4a34 | 11201 | #: common-cmds.h:9 |
7aea43ff JX |
11202 | msgid "start a working area (see also: git help tutorial)" |
11203 | msgstr "开始一个工作区(参见:git help tutorial)" | |
11204 | ||
1b7f4a34 | 11205 | #: common-cmds.h:10 |
7aea43ff JX |
11206 | msgid "work on the current change (see also: git help everyday)" |
11207 | msgstr "在当前变更上工作(参见:git help everyday)" | |
11208 | ||
1b7f4a34 | 11209 | #: common-cmds.h:11 |
7aea43ff JX |
11210 | msgid "examine the history and state (see also: git help revisions)" |
11211 | msgstr "检查历史和状态(参见:git help revisions)" | |
11212 | ||
1b7f4a34 | 11213 | #: common-cmds.h:12 |
7aea43ff JX |
11214 | msgid "grow, mark and tweak your common history" |
11215 | msgstr "扩展、标记和调校您的历史记录" | |
11216 | ||
1b7f4a34 | 11217 | #: common-cmds.h:13 |
7aea43ff JX |
11218 | msgid "collaborate (see also: git help workflows)" |
11219 | msgstr "协同(参见:git help workflows)" | |
11220 | ||
1b7f4a34 | 11221 | #: common-cmds.h:17 |
8ada9598 | 11222 | msgid "Add file contents to the index" |
81809b99 | 11223 | msgstr "添加文件内容至索引" |
8ada9598 | 11224 | |
1b7f4a34 JX |
11225 | #: common-cmds.h:18 |
11226 | msgid "Use binary search to find the commit that introduced a bug" | |
11227 | msgstr "通过二分查找定位引入 bug 的提交" | |
8ada9598 | 11228 | |
1b7f4a34 | 11229 | #: common-cmds.h:19 |
8ada9598 | 11230 | msgid "List, create, or delete branches" |
81809b99 | 11231 | msgstr "列出、创建或删除分支" |
8ada9598 | 11232 | |
1b7f4a34 | 11233 | #: common-cmds.h:20 |
5bb01d4f JX |
11234 | msgid "Switch branches or restore working tree files" |
11235 | msgstr "切换分支或恢复工作区文件" | |
8ada9598 | 11236 | |
1b7f4a34 | 11237 | #: common-cmds.h:21 |
8ada9598 | 11238 | msgid "Clone a repository into a new directory" |
160fb2b2 | 11239 | msgstr "克隆一个仓库到一个新目录" |
8ada9598 | 11240 | |
1b7f4a34 | 11241 | #: common-cmds.h:22 |
8ada9598 | 11242 | msgid "Record changes to the repository" |
160fb2b2 | 11243 | msgstr "记录变更到仓库" |
8ada9598 | 11244 | |
1b7f4a34 | 11245 | #: common-cmds.h:23 |
8ada9598 | 11246 | msgid "Show changes between commits, commit and working tree, etc" |
81809b99 | 11247 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 | 11248 | |
1b7f4a34 | 11249 | #: common-cmds.h:24 |
8ada9598 | 11250 | msgid "Download objects and refs from another repository" |
160fb2b2 | 11251 | msgstr "从另外一个仓库下载对象和引用" |
8ada9598 | 11252 | |
1b7f4a34 | 11253 | #: common-cmds.h:25 |
8ada9598 | 11254 | msgid "Print lines matching a pattern" |
81809b99 | 11255 | msgstr "输出和模式匹配的行" |
8ada9598 | 11256 | |
1b7f4a34 | 11257 | #: common-cmds.h:26 |
a77c07d9 | 11258 | msgid "Create an empty Git repository or reinitialize an existing one" |
160fb2b2 | 11259 | msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" |
8ada9598 | 11260 | |
1b7f4a34 | 11261 | #: common-cmds.h:27 |
8ada9598 | 11262 | msgid "Show commit logs" |
81809b99 | 11263 | msgstr "显示提交日志" |
8ada9598 | 11264 | |
1b7f4a34 | 11265 | #: common-cmds.h:28 |
8ada9598 | 11266 | msgid "Join two or more development histories together" |
81809b99 | 11267 | msgstr "合并两个或更多开发历史" |
8ada9598 | 11268 | |
1b7f4a34 | 11269 | #: common-cmds.h:29 |
8ada9598 | 11270 | msgid "Move or rename a file, a directory, or a symlink" |
81809b99 | 11271 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 | 11272 | |
1b7f4a34 | 11273 | #: common-cmds.h:30 |
2e8451e8 | 11274 | msgid "Fetch from and integrate with another repository or a local branch" |
160fb2b2 | 11275 | msgstr "获取并整合另外的仓库或一个本地分支" |
8ada9598 | 11276 | |
1b7f4a34 | 11277 | #: common-cmds.h:31 |
8ada9598 | 11278 | msgid "Update remote refs along with associated objects" |
81809b99 | 11279 | msgstr "更新远程引用和相关的对象" |
8ada9598 | 11280 | |
1b7f4a34 | 11281 | #: common-cmds.h:32 |
8ada9598 | 11282 | msgid "Forward-port local commits to the updated upstream head" |
81809b99 | 11283 | msgstr "本地提交转移至更新后的上游分支中" |
8ada9598 | 11284 | |
1b7f4a34 | 11285 | #: common-cmds.h:33 |
8ada9598 | 11286 | msgid "Reset current HEAD to the specified state" |
4375c10e | 11287 | msgstr "重置当前 HEAD 到指定状态" |
8ada9598 | 11288 | |
1b7f4a34 | 11289 | #: common-cmds.h:34 |
8ada9598 | 11290 | msgid "Remove files from the working tree and from the index" |
81809b99 | 11291 | msgstr "从工作区和索引中删除文件" |
8ada9598 | 11292 | |
1b7f4a34 | 11293 | #: common-cmds.h:35 |
8ada9598 | 11294 | msgid "Show various types of objects" |
81809b99 | 11295 | msgstr "显示各种类型的对象" |
8ada9598 | 11296 | |
1b7f4a34 | 11297 | #: common-cmds.h:36 |
8ada9598 | 11298 | msgid "Show the working tree status" |
81809b99 | 11299 | msgstr "显示工作区状态" |
8ada9598 | 11300 | |
1b7f4a34 | 11301 | #: common-cmds.h:37 |
8ada9598 | 11302 | msgid "Create, list, delete or verify a tag object signed with GPG" |
4375c10e | 11303 | msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" |
8ada9598 | 11304 | |
1b7f4a34 | 11305 | #: parse-options.h:145 |
220c313c JX |
11306 | msgid "expiry-date" |
11307 | msgstr "到期时间" | |
11308 | ||
1b7f4a34 | 11309 | #: parse-options.h:160 |
220c313c JX |
11310 | msgid "no-op (backward compatibility)" |
11311 | msgstr "空操作(向后兼容)" | |
11312 | ||
94550ed3 | 11313 | #: parse-options.h:237 |
220c313c JX |
11314 | msgid "be more verbose" |
11315 | msgstr "更加详细" | |
11316 | ||
94550ed3 | 11317 | #: parse-options.h:239 |
220c313c JX |
11318 | msgid "be more quiet" |
11319 | msgstr "更加安静" | |
11320 | ||
94550ed3 | 11321 | #: parse-options.h:245 |
220c313c JX |
11322 | msgid "use <n> digits to display SHA-1s" |
11323 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
11324 | ||
94550ed3 | 11325 | #: rerere.h:38 |
220c313c JX |
11326 | msgid "update the index with reused conflict resolution if possible" |
11327 | msgstr "如果可能,重用冲突解决更新索引" | |
11328 | ||
94550ed3 | 11329 | #: git-bisect.sh:55 |
b694fbb1 JX |
11330 | msgid "You need to start by \"git bisect start\"" |
11331 | msgstr "您需要执行 \"git bisect start\" 来开始" | |
11332 | ||
90e6ef53 | 11333 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
11334 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
11335 | #. translation. The program will only accept English input | |
11336 | #. at this point. | |
94550ed3 | 11337 | #: git-bisect.sh:61 |
c04f5ac3 JX |
11338 | msgid "Do you want me to do it for you [Y/n]? " |
11339 | msgstr "您想让我为您这样做么[Y/n]? " | |
11340 | ||
94550ed3 | 11341 | #: git-bisect.sh:122 |
c04f5ac3 JX |
11342 | #, sh-format |
11343 | msgid "unrecognised option: '$arg'" | |
81809b99 | 11344 | msgstr "未能识别的选项:'$arg'" |
c04f5ac3 | 11345 | |
94550ed3 | 11346 | #: git-bisect.sh:126 |
c04f5ac3 JX |
11347 | #, sh-format |
11348 | msgid "'$arg' does not appear to be a valid revision" | |
11349 | msgstr "'$arg' 看起来不像是一个有效的版本" | |
11350 | ||
94550ed3 | 11351 | #: git-bisect.sh:155 |
c04f5ac3 JX |
11352 | msgid "Bad HEAD - I need a HEAD" |
11353 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
11354 | ||
94550ed3 | 11355 | #: git-bisect.sh:168 |
c04f5ac3 JX |
11356 | #, sh-format |
11357 | msgid "" | |
814ff314 | 11358 | "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." |
d9d56b23 | 11359 | msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。" |
c04f5ac3 | 11360 | |
94550ed3 | 11361 | #: git-bisect.sh:178 |
cfff71a9 JX |
11362 | msgid "won't bisect on cg-seek'ed tree" |
11363 | msgstr "不会在做了 cg-seek 的树上做二分查找" | |
c04f5ac3 | 11364 | |
94550ed3 | 11365 | #: git-bisect.sh:182 |
c04f5ac3 | 11366 | msgid "Bad HEAD - strange symbolic ref" |
90e6ef53 | 11367 | msgstr "坏的 HEAD - 奇怪的符号引用" |
c04f5ac3 | 11368 | |
94550ed3 | 11369 | #: git-bisect.sh:234 |
c04f5ac3 JX |
11370 | #, sh-format |
11371 | msgid "Bad bisect_write argument: $state" | |
90e6ef53 | 11372 | msgstr "坏的 bisect_write 参数:$state" |
c04f5ac3 | 11373 | |
94550ed3 | 11374 | #: git-bisect.sh:263 |
c04f5ac3 JX |
11375 | #, sh-format |
11376 | msgid "Bad rev input: $arg" | |
90e6ef53 | 11377 | msgstr "输入坏的版本:$arg" |
c04f5ac3 | 11378 | |
94550ed3 | 11379 | #: git-bisect.sh:278 |
c04f5ac3 JX |
11380 | msgid "Please call 'bisect_state' with at least one argument." |
11381 | msgstr "请在调用 'bisect_state' 时跟至少一个参数。" | |
11382 | ||
94550ed3 | 11383 | #: git-bisect.sh:290 |
c04f5ac3 JX |
11384 | #, sh-format |
11385 | msgid "Bad rev input: $rev" | |
11386 | msgstr "输入坏的版本:$rev" | |
11387 | ||
94550ed3 | 11388 | #: git-bisect.sh:299 |
1b7f4a34 JX |
11389 | #, sh-format |
11390 | msgid "'git bisect $TERM_BAD' can take only one argument." | |
11391 | msgstr "'git bisect $TERM_BAD' 只能带一个参数。" | |
11392 | ||
94550ed3 | 11393 | #: git-bisect.sh:322 |
1b7f4a34 JX |
11394 | #, sh-format |
11395 | msgid "Warning: bisecting only with a $TERM_BAD commit." | |
11396 | msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。" | |
b694fbb1 | 11397 | |
90e6ef53 | 11398 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
11399 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
11400 | #. translation. The program will only accept English input | |
11401 | #. at this point. | |
94550ed3 | 11402 | #: git-bisect.sh:328 |
c04f5ac3 JX |
11403 | msgid "Are you sure [Y/n]? " |
11404 | msgstr "您确认么[Y/n]? " | |
11405 | ||
94550ed3 | 11406 | #: git-bisect.sh:340 |
1b7f4a34 | 11407 | #, sh-format |
b694fbb1 | 11408 | msgid "" |
1b7f4a34 JX |
11409 | "You need to give me at least one $bad_syn and one $good_syn revision.\n" |
11410 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
11411 | msgstr "" |
11412 | "您需要给我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 11413 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 11414 | |
94550ed3 | 11415 | #: git-bisect.sh:343 |
1b7f4a34 | 11416 | #, sh-format |
b694fbb1 JX |
11417 | msgid "" |
11418 | "You need to start by \"git bisect start\".\n" | |
1b7f4a34 JX |
11419 | "You then need to give me at least one $good_syn and one $bad_syn revision.\n" |
11420 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
11421 | msgstr "" |
11422 | "您需要执行 \"git bisect start\" 来开始。\n" | |
11423 | "然后需要提供我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 11424 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 11425 | |
94550ed3 | 11426 | #: git-bisect.sh:414 git-bisect.sh:546 |
b694fbb1 JX |
11427 | msgid "We are not bisecting." |
11428 | msgstr "我们没有在二分查找。" | |
11429 | ||
94550ed3 | 11430 | #: git-bisect.sh:421 |
c04f5ac3 JX |
11431 | #, sh-format |
11432 | msgid "'$invalid' is not a valid commit" | |
11433 | msgstr "'$invalid' 不是一个有效的提交" | |
11434 | ||
94550ed3 | 11435 | #: git-bisect.sh:430 |
c04f5ac3 JX |
11436 | #, sh-format |
11437 | msgid "" | |
11438 | "Could not check out original HEAD '$branch'.\n" | |
11439 | "Try 'git bisect reset <commit>'." | |
11440 | msgstr "" | |
11441 | "不能检出原始 HEAD '$branch'。\n" | |
07432cef | 11442 | "尝试 'git bisect reset <提交>'。" |
c04f5ac3 | 11443 | |
94550ed3 | 11444 | #: git-bisect.sh:458 |
c04f5ac3 JX |
11445 | msgid "No logfile given" |
11446 | msgstr "未提供日志文件" | |
11447 | ||
94550ed3 | 11448 | #: git-bisect.sh:459 |
c04f5ac3 JX |
11449 | #, sh-format |
11450 | msgid "cannot read $file for replaying" | |
11451 | msgstr "不能读取 $file 来重放" | |
11452 | ||
94550ed3 | 11453 | #: git-bisect.sh:480 |
c04f5ac3 JX |
11454 | msgid "?? what are you talking about?" |
11455 | msgstr "?? 您在说什么?" | |
11456 | ||
94550ed3 | 11457 | #: git-bisect.sh:492 |
b694fbb1 JX |
11458 | #, sh-format |
11459 | msgid "running $command" | |
11460 | msgstr "运行 $command" | |
11461 | ||
94550ed3 | 11462 | #: git-bisect.sh:499 |
b694fbb1 JX |
11463 | #, sh-format |
11464 | msgid "" | |
11465 | "bisect run failed:\n" | |
11466 | "exit code $res from '$command' is < 0 or >= 128" | |
11467 | msgstr "" | |
11468 | "二分查找运行失败:\n" | |
07432cef | 11469 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 11470 | |
94550ed3 | 11471 | #: git-bisect.sh:525 |
b694fbb1 JX |
11472 | msgid "bisect run cannot continue any more" |
11473 | msgstr "二分查找不能继续运行" | |
11474 | ||
94550ed3 | 11475 | #: git-bisect.sh:531 |
b694fbb1 JX |
11476 | #, sh-format |
11477 | msgid "" | |
11478 | "bisect run failed:\n" | |
11479 | "'bisect_state $state' exited with error code $res" | |
11480 | msgstr "" | |
11481 | "二分查找运行失败:\n" | |
11482 | "'bisect_state $state' 退出码为 $res" | |
11483 | ||
94550ed3 | 11484 | #: git-bisect.sh:538 |
b694fbb1 JX |
11485 | msgid "bisect run success" |
11486 | msgstr "二分查找运行成功" | |
c04f5ac3 | 11487 | |
94550ed3 JX |
11488 | #: git-bisect.sh:565 |
11489 | msgid "please use two different terms" | |
11490 | msgstr "请使用两个不同的术语" | |
11491 | ||
11492 | #: git-bisect.sh:575 | |
11493 | #, sh-format | |
11494 | msgid "'$term' is not a valid term" | |
11495 | msgstr "'$term' 不是一个有效的名称" | |
11496 | ||
11497 | #: git-bisect.sh:578 | |
11498 | #, sh-format | |
11499 | msgid "can't use the builtin command '$term' as a term" | |
11500 | msgstr "不能使用内置命令 '$term' 作为术语" | |
11501 | ||
11502 | #: git-bisect.sh:587 git-bisect.sh:593 | |
11503 | #, sh-format | |
11504 | msgid "can't change the meaning of term '$term'" | |
11505 | msgstr "不能修改术语 '$term' 的含义" | |
11506 | ||
11507 | #: git-bisect.sh:606 | |
b694fbb1 | 11508 | #, sh-format |
1b7f4a34 JX |
11509 | msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." |
11510 | msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。" | |
c04f5ac3 | 11511 | |
94550ed3 JX |
11512 | #: git-bisect.sh:636 |
11513 | msgid "no terms defined" | |
11514 | msgstr "未定义术语" | |
11515 | ||
11516 | #: git-bisect.sh:653 | |
11517 | #, sh-format | |
11518 | msgid "" | |
11519 | "invalid argument $arg for 'git bisect terms'.\n" | |
11520 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." | |
11521 | msgstr "" | |
11522 | "参数 $arg 对命令 'git bisect terms' 无效。\n" | |
11523 | "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。" | |
11524 | ||
6c94aba5 | 11525 | #: git-rebase.sh:57 |
649900bc JX |
11526 | msgid "" |
11527 | "When you have resolved this problem, run \"git rebase --continue\".\n" | |
11528 | "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" | |
11529 | "To check out the original branch and stop rebasing, run \"git rebase --abort" | |
11530 | "\"." | |
11531 | msgstr "" | |
11532 | "当您解决了此问题后,执行 \"git rebase --continue\"。\n" | |
11533 | "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n" | |
11534 | "要恢复原分支并停止变基,执行 \"git rebase --abort\"。" | |
11535 | ||
6acbf033 | 11536 | #: git-rebase.sh:165 |
2e8451e8 JX |
11537 | msgid "Applied autostash." |
11538 | msgstr "成功应用 autostash。" | |
11539 | ||
6acbf033 | 11540 | #: git-rebase.sh:168 |
2e8451e8 JX |
11541 | #, sh-format |
11542 | msgid "Cannot store $stash_sha1" | |
11543 | msgstr "无法保存 $stash_sha1" | |
11544 | ||
6acbf033 | 11545 | #: git-rebase.sh:169 |
2e8451e8 JX |
11546 | msgid "" |
11547 | "Applying autostash resulted in conflicts.\n" | |
11548 | "Your changes are safe in the stash.\n" | |
b1894384 | 11549 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" |
2e8451e8 JX |
11550 | msgstr "" |
11551 | "应用 autostash 导致冲突。\n" | |
11552 | "您的修改安全地保存在 stash 中。\n" | |
11553 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" | |
11554 | ||
6acbf033 | 11555 | #: git-rebase.sh:208 |
649900bc | 11556 | msgid "The pre-rebase hook refused to rebase." |
98b2761d | 11557 | msgstr "钩子 pre-rebase 拒绝变基操作。" |
649900bc | 11558 | |
6acbf033 | 11559 | #: git-rebase.sh:213 |
649900bc JX |
11560 | msgid "It looks like git-am is in progress. Cannot rebase." |
11561 | msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" | |
11562 | ||
94550ed3 | 11563 | #: git-rebase.sh:354 |
649900bc JX |
11564 | msgid "The --exec option must be used with the --interactive option" |
11565 | msgstr "选项 --exec 必须和选项 --interactive 同时使用" | |
11566 | ||
94550ed3 | 11567 | #: git-rebase.sh:359 |
649900bc JX |
11568 | msgid "No rebase in progress?" |
11569 | msgstr "没有正在进行的变基?" | |
11570 | ||
94550ed3 | 11571 | #: git-rebase.sh:370 |
07432cef WS |
11572 | msgid "The --edit-todo action can only be used during interactive rebase." |
11573 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
11574 | ||
94550ed3 | 11575 | #: git-rebase.sh:377 |
649900bc JX |
11576 | msgid "Cannot read HEAD" |
11577 | msgstr "不能读取 HEAD" | |
11578 | ||
94550ed3 | 11579 | #: git-rebase.sh:380 |
649900bc JX |
11580 | msgid "" |
11581 | "You must edit all merge conflicts and then\n" | |
11582 | "mark them as resolved using git add" | |
11583 | msgstr "" | |
11584 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
11585 | "命令将它们标记为已解决" | |
11586 | ||
94550ed3 | 11587 | #: git-rebase.sh:398 |
649900bc JX |
11588 | #, sh-format |
11589 | msgid "Could not move back to $head_name" | |
11590 | msgstr "无法移回 $head_name" | |
11591 | ||
94550ed3 | 11592 | #: git-rebase.sh:417 |
649900bc JX |
11593 | #, sh-format |
11594 | msgid "" | |
11595 | "It seems that there is already a $state_dir_base directory, and\n" | |
11596 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
11597 | "case, please try\n" | |
11598 | "\t$cmd_live_rebase\n" | |
11599 | "If that is not the case, please\n" | |
11600 | "\t$cmd_clear_stale_rebase\n" | |
11601 | "and run me again. I am stopping in case you still have something\n" | |
11602 | "valuable there." | |
11603 | msgstr "" | |
98b2761d JX |
11604 | "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n" |
11605 | "过程中。 如果是这样,请执行\n" | |
649900bc JX |
11606 | "\t$cmd_live_rebase\n" |
11607 | "如果不是这样,请执行\n" | |
11608 | "\t$cmd_clear_stale_rebase\n" | |
98b2761d | 11609 | "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。" |
649900bc | 11610 | |
94550ed3 | 11611 | #: git-rebase.sh:468 |
649900bc JX |
11612 | #, sh-format |
11613 | msgid "invalid upstream $upstream_name" | |
11614 | msgstr "无效的上游 $upstream_name" | |
11615 | ||
94550ed3 | 11616 | #: git-rebase.sh:492 |
649900bc JX |
11617 | #, sh-format |
11618 | msgid "$onto_name: there are more than one merge bases" | |
11619 | msgstr "$onto_name: 有一个以上的合并基准" | |
11620 | ||
94550ed3 | 11621 | #: git-rebase.sh:495 git-rebase.sh:499 |
649900bc JX |
11622 | #, sh-format |
11623 | msgid "$onto_name: there is no merge base" | |
11624 | msgstr "$onto_name: 没有合并基准" | |
11625 | ||
94550ed3 | 11626 | #: git-rebase.sh:504 |
649900bc JX |
11627 | #, sh-format |
11628 | msgid "Does not point to a valid commit: $onto_name" | |
11629 | msgstr "没有指向一个有效的提交:$onto_name" | |
11630 | ||
94550ed3 | 11631 | #: git-rebase.sh:527 |
649900bc JX |
11632 | #, sh-format |
11633 | msgid "fatal: no such branch: $branch_name" | |
11634 | msgstr "严重错误:无此分支:$branch_name" | |
11635 | ||
94550ed3 | 11636 | #: git-rebase.sh:560 |
2e8451e8 JX |
11637 | msgid "Cannot autostash" |
11638 | msgstr "无法 autostash" | |
11639 | ||
94550ed3 | 11640 | #: git-rebase.sh:565 |
2e8451e8 JX |
11641 | #, sh-format |
11642 | msgid "Created autostash: $stash_abbrev" | |
11643 | msgstr "创建了 autostash: $stash_abbrev" | |
11644 | ||
94550ed3 | 11645 | #: git-rebase.sh:569 |
649900bc JX |
11646 | msgid "Please commit or stash them." |
11647 | msgstr "请提交或为它们保存进度。" | |
11648 | ||
94550ed3 | 11649 | #: git-rebase.sh:589 |
649900bc JX |
11650 | #, sh-format |
11651 | msgid "Current branch $branch_name is up to date." | |
11652 | msgstr "当前分支 $branch_name 是最新的。" | |
11653 | ||
94550ed3 | 11654 | #: git-rebase.sh:593 |
649900bc JX |
11655 | #, sh-format |
11656 | msgid "Current branch $branch_name is up to date, rebase forced." | |
11657 | msgstr "当前分支 $branch_name 是最新的,强制变基。" | |
11658 | ||
94550ed3 | 11659 | #: git-rebase.sh:604 |
649900bc JX |
11660 | #, sh-format |
11661 | msgid "Changes from $mb to $onto:" | |
11662 | msgstr "变更从 $mb 到 $onto:" | |
11663 | ||
94550ed3 | 11664 | #: git-rebase.sh:613 |
649900bc | 11665 | msgid "First, rewinding head to replay your work on top of it..." |
160fb2b2 | 11666 | msgstr "首先,回退分支以便在上面重放您的工作..." |
649900bc | 11667 | |
94550ed3 | 11668 | #: git-rebase.sh:623 |
649900bc JX |
11669 | #, sh-format |
11670 | msgid "Fast-forwarded $branch_name to $onto_name." | |
11671 | msgstr "快进 $branch_name 至 $onto_name。" | |
11672 | ||
c04f5ac3 JX |
11673 | #: git-stash.sh:51 |
11674 | msgid "git stash clear with parameters is unimplemented" | |
11675 | msgstr "git stash clear 不支持参数" | |
11676 | ||
11677 | #: git-stash.sh:74 | |
11678 | msgid "You do not have the initial commit yet" | |
11679 | msgstr "您尚未建立初始提交" | |
11680 | ||
11681 | #: git-stash.sh:89 | |
11682 | msgid "Cannot save the current index state" | |
90e6ef53 | 11683 | msgstr "无法保存当前索引状态" |
c04f5ac3 | 11684 | |
6acbf033 | 11685 | #: git-stash.sh:124 git-stash.sh:137 |
c04f5ac3 JX |
11686 | msgid "Cannot save the current worktree state" |
11687 | msgstr "无法保存当前工作区状态" | |
11688 | ||
6acbf033 | 11689 | #: git-stash.sh:141 |
c04f5ac3 | 11690 | msgid "No changes selected" |
90e6ef53 | 11691 | msgstr "没有选择变更" |
c04f5ac3 | 11692 | |
6acbf033 | 11693 | #: git-stash.sh:144 |
c04f5ac3 | 11694 | msgid "Cannot remove temporary index (can't happen)" |
90e6ef53 | 11695 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 | 11696 | |
6acbf033 | 11697 | #: git-stash.sh:157 |
c04f5ac3 JX |
11698 | msgid "Cannot record working tree state" |
11699 | msgstr "不能记录工作区状态" | |
11700 | ||
1b7f4a34 | 11701 | #: git-stash.sh:189 |
2e8451e8 JX |
11702 | #, sh-format |
11703 | msgid "Cannot update $ref_stash with $w_commit" | |
11704 | msgstr "无法用 $w_commit 更新 $ref_stash" | |
11705 | ||
b694fbb1 JX |
11706 | #. TRANSLATORS: $option is an invalid option, like |
11707 | #. `--blah-blah'. The 7 spaces at the beginning of the | |
11708 | #. second line correspond to "error: ". So you should line | |
11709 | #. up the second line with however many characters the | |
11710 | #. translation of "error: " takes in your language. E.g. in | |
11711 | #. English this is: | |
11712 | #. | |
11713 | #. $ git stash save --blah-blah 2>&1 | head -n 2 | |
11714 | #. error: unknown option for 'stash save': --blah-blah | |
11715 | #. To provide a message, use git stash save -- '--blah-blah' | |
1b7f4a34 | 11716 | #: git-stash.sh:239 |
b694fbb1 JX |
11717 | #, sh-format |
11718 | msgid "" | |
11719 | "error: unknown option for 'stash save': $option\n" | |
11720 | " To provide a message, use git stash save -- '$option'" | |
11721 | msgstr "" | |
11722 | "错误:'stash save' 的未知选项:$option\n" | |
11723 | " 要提供一个描述信息,使用 git stash save -- '$option'" | |
11724 | ||
1b7f4a34 | 11725 | #: git-stash.sh:260 |
c04f5ac3 JX |
11726 | msgid "No local changes to save" |
11727 | msgstr "没有要保存的本地修改" | |
11728 | ||
1b7f4a34 | 11729 | #: git-stash.sh:264 |
c04f5ac3 | 11730 | msgid "Cannot initialize stash" |
90e6ef53 | 11731 | msgstr "无法初始化 stash" |
c04f5ac3 | 11732 | |
1b7f4a34 | 11733 | #: git-stash.sh:268 |
c04f5ac3 JX |
11734 | msgid "Cannot save the current status" |
11735 | msgstr "无法保存当前状态" | |
11736 | ||
1b7f4a34 | 11737 | #: git-stash.sh:286 |
c04f5ac3 JX |
11738 | msgid "Cannot remove worktree changes" |
11739 | msgstr "无法删除工作区变更" | |
11740 | ||
94550ed3 | 11741 | #: git-stash.sh:405 |
7aea43ff JX |
11742 | #, sh-format |
11743 | msgid "unknown option: $opt" | |
11744 | msgstr "未知选项: $opt" | |
11745 | ||
94550ed3 | 11746 | #: git-stash.sh:415 |
c04f5ac3 | 11747 | msgid "No stash found." |
90e6ef53 | 11748 | msgstr "未发现 stash。" |
c04f5ac3 | 11749 | |
94550ed3 | 11750 | #: git-stash.sh:422 |
c04f5ac3 JX |
11751 | #, sh-format |
11752 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 11753 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 | 11754 | |
94550ed3 | 11755 | #: git-stash.sh:428 |
c04f5ac3 | 11756 | #, sh-format |
220c313c JX |
11757 | msgid "$reference is not a valid reference" |
11758 | msgstr "$reference 不是一个有效的引用" | |
c04f5ac3 | 11759 | |
94550ed3 | 11760 | #: git-stash.sh:456 |
c04f5ac3 JX |
11761 | #, sh-format |
11762 | msgid "'$args' is not a stash-like commit" | |
90e6ef53 | 11763 | msgstr "'$args' 不是 stash 样提交" |
c04f5ac3 | 11764 | |
94550ed3 | 11765 | #: git-stash.sh:467 |
c04f5ac3 JX |
11766 | #, sh-format |
11767 | msgid "'$args' is not a stash reference" | |
90e6ef53 | 11768 | msgstr "'$args' 不是一个 stash 引用" |
c04f5ac3 | 11769 | |
94550ed3 | 11770 | #: git-stash.sh:475 |
c04f5ac3 | 11771 | msgid "unable to refresh index" |
90e6ef53 | 11772 | msgstr "无法刷新索引" |
c04f5ac3 | 11773 | |
94550ed3 | 11774 | #: git-stash.sh:479 |
c04f5ac3 JX |
11775 | msgid "Cannot apply a stash in the middle of a merge" |
11776 | msgstr "无法在合并过程中恢复进度" | |
11777 | ||
94550ed3 | 11778 | #: git-stash.sh:487 |
c04f5ac3 | 11779 | msgid "Conflicts in index. Try without --index." |
90e6ef53 | 11780 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 | 11781 | |
94550ed3 | 11782 | #: git-stash.sh:489 |
c04f5ac3 | 11783 | msgid "Could not save index tree" |
90e6ef53 | 11784 | msgstr "不能保存索引树" |
c04f5ac3 | 11785 | |
94550ed3 | 11786 | #: git-stash.sh:523 |
c04f5ac3 | 11787 | msgid "Cannot unstage modified files" |
160fb2b2 | 11788 | msgstr "无法将修改的文件取消暂存" |
c04f5ac3 | 11789 | |
94550ed3 | 11790 | #: git-stash.sh:538 |
b694fbb1 JX |
11791 | msgid "Index was not unstashed." |
11792 | msgstr "索引的进度没有被恢复。" | |
11793 | ||
94550ed3 | 11794 | #: git-stash.sh:561 |
c04f5ac3 JX |
11795 | #, sh-format |
11796 | msgid "Dropped ${REV} ($s)" | |
11797 | msgstr "丢弃了 ${REV} ($s)" | |
11798 | ||
94550ed3 | 11799 | #: git-stash.sh:562 |
c04f5ac3 JX |
11800 | #, sh-format |
11801 | msgid "${REV}: Could not drop stash entry" | |
90e6ef53 | 11802 | msgstr "${REV}:不能丢弃进度条目" |
c04f5ac3 | 11803 | |
94550ed3 | 11804 | #: git-stash.sh:570 |
c04f5ac3 JX |
11805 | msgid "No branch name specified" |
11806 | msgstr "未指定分支名" | |
11807 | ||
94550ed3 | 11808 | #: git-stash.sh:642 |
c04f5ac3 JX |
11809 | msgid "(To restore them type \"git stash apply\")" |
11810 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
11811 | ||
94550ed3 | 11812 | #: git-submodule.sh:104 |
c04f5ac3 JX |
11813 | #, sh-format |
11814 | msgid "cannot strip one component off url '$remoteurl'" | |
11815 | msgstr "无法从 url '$remoteurl' 剥离一个组件" | |
11816 | ||
94550ed3 | 11817 | #: git-submodule.sh:281 |
2e8451e8 JX |
11818 | msgid "Relative path can only be used from the toplevel of the working tree" |
11819 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
11820 | ||
94550ed3 | 11821 | #: git-submodule.sh:291 |
c04f5ac3 JX |
11822 | #, sh-format |
11823 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
4375c10e | 11824 | msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始" |
c04f5ac3 | 11825 | |
94550ed3 | 11826 | #: git-submodule.sh:308 |
c04f5ac3 | 11827 | #, sh-format |
170e9899 JX |
11828 | msgid "'$sm_path' already exists in the index" |
11829 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 11830 | |
94550ed3 | 11831 | #: git-submodule.sh:312 |
b694fbb1 JX |
11832 | #, sh-format |
11833 | msgid "" | |
11834 | "The following path is ignored by one of your .gitignore files:\n" | |
11835 | "$sm_path\n" | |
11836 | "Use -f if you really want to add it." | |
11837 | msgstr "" | |
11838 | "以下路径被您的一个 .gitignore 文件所忽略:\n" | |
11839 | "$sm_path\n" | |
11840 | "如果您确实想添加它,使用 -f 参数。" | |
11841 | ||
94550ed3 | 11842 | #: git-submodule.sh:330 |
b694fbb1 JX |
11843 | #, sh-format |
11844 | msgid "Adding existing repo at '$sm_path' to the index" | |
160fb2b2 | 11845 | msgstr "添加位于 '$sm_path' 的现存仓库到索引" |
b694fbb1 | 11846 | |
94550ed3 | 11847 | #: git-submodule.sh:332 |
c04f5ac3 | 11848 | #, sh-format |
170e9899 | 11849 | msgid "'$sm_path' already exists and is not a valid git repo" |
160fb2b2 | 11850 | msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" |
c04f5ac3 | 11851 | |
94550ed3 | 11852 | #: git-submodule.sh:340 |
07432cef WS |
11853 | #, sh-format |
11854 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
160fb2b2 | 11855 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" |
07432cef | 11856 | |
94550ed3 | 11857 | #: git-submodule.sh:342 |
07432cef WS |
11858 | #, sh-format |
11859 | msgid "" | |
11860 | "If you want to reuse this local git directory instead of cloning again from" | |
11861 | msgstr "如果您想重用此本地 git 目录而不是重新克隆自" | |
11862 | ||
94550ed3 | 11863 | #: git-submodule.sh:344 |
07432cef WS |
11864 | #, sh-format |
11865 | msgid "" | |
11866 | "use the '--force' option. If the local git directory is not the correct repo" | |
160fb2b2 | 11867 | msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库" |
07432cef | 11868 | |
94550ed3 | 11869 | #: git-submodule.sh:345 |
07432cef WS |
11870 | #, sh-format |
11871 | msgid "" | |
11872 | "or you are unsure what this means choose another name with the '--name' " | |
11873 | "option." | |
11874 | msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。" | |
11875 | ||
94550ed3 | 11876 | #: git-submodule.sh:347 |
07432cef WS |
11877 | #, sh-format |
11878 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
11879 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" | |
11880 | ||
94550ed3 | 11881 | #: git-submodule.sh:359 |
c04f5ac3 | 11882 | #, sh-format |
170e9899 JX |
11883 | msgid "Unable to checkout submodule '$sm_path'" |
11884 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 11885 | |
94550ed3 | 11886 | #: git-submodule.sh:364 |
c04f5ac3 | 11887 | #, sh-format |
170e9899 JX |
11888 | msgid "Failed to add submodule '$sm_path'" |
11889 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 11890 | |
94550ed3 | 11891 | #: git-submodule.sh:373 |
c04f5ac3 | 11892 | #, sh-format |
170e9899 JX |
11893 | msgid "Failed to register submodule '$sm_path'" |
11894 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 11895 | |
94550ed3 | 11896 | #: git-submodule.sh:417 |
c04f5ac3 | 11897 | #, sh-format |
2e8451e8 JX |
11898 | msgid "Entering '$prefix$displaypath'" |
11899 | msgstr "正在进入 '$prefix$displaypath'" | |
c04f5ac3 | 11900 | |
94550ed3 | 11901 | #: git-submodule.sh:437 |
c04f5ac3 | 11902 | #, sh-format |
2e8451e8 JX |
11903 | msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." |
11904 | msgstr "停止于 '$prefix$displaypath',脚本返回非零值。" | |
c04f5ac3 | 11905 | |
94550ed3 | 11906 | #: git-submodule.sh:483 |
c04f5ac3 | 11907 | #, sh-format |
2e8451e8 JX |
11908 | msgid "No url found for submodule path '$displaypath' in .gitmodules" |
11909 | msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url" | |
c04f5ac3 | 11910 | |
94550ed3 | 11911 | #: git-submodule.sh:492 |
c04f5ac3 | 11912 | #, sh-format |
2e8451e8 JX |
11913 | msgid "Failed to register url for submodule path '$displaypath'" |
11914 | msgstr "无法为子模组路径 '$displaypath' 注册 url" | |
c04f5ac3 | 11915 | |
94550ed3 | 11916 | #: git-submodule.sh:494 |
c04f5ac3 | 11917 | #, sh-format |
2e8451e8 JX |
11918 | msgid "Submodule '$name' ($url) registered for path '$displaypath'" |
11919 | msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
c04f5ac3 | 11920 | |
94550ed3 | 11921 | #: git-submodule.sh:511 |
d691f479 | 11922 | #, sh-format |
2e8451e8 JX |
11923 | msgid "Failed to register update mode for submodule path '$displaypath'" |
11924 | msgstr "无法为子模组路径 '$displaypath' 注册更新模式" | |
d691f479 | 11925 | |
94550ed3 | 11926 | #: git-submodule.sh:549 |
1003b3a5 JX |
11927 | #, sh-format |
11928 | msgid "Use '.' if you really want to deinitialize all submodules" | |
11929 | msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化" | |
11930 | ||
94550ed3 | 11931 | #: git-submodule.sh:566 |
1003b3a5 | 11932 | #, sh-format |
2e8451e8 JX |
11933 | msgid "Submodule work tree '$displaypath' contains a .git directory" |
11934 | msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录" | |
1003b3a5 | 11935 | |
94550ed3 | 11936 | #: git-submodule.sh:567 |
1003b3a5 JX |
11937 | #, sh-format |
11938 | msgid "" | |
11939 | "(use 'rm -rf' if you really want to remove it including all of its history)" | |
11940 | msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" | |
11941 | ||
94550ed3 | 11942 | #: git-submodule.sh:573 |
c04f5ac3 JX |
11943 | #, sh-format |
11944 | msgid "" | |
2e8451e8 | 11945 | "Submodule work tree '$displaypath' contains local modifications; use '-f' to " |
1003b3a5 | 11946 | "discard them" |
2e8451e8 | 11947 | msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们" |
1003b3a5 | 11948 | |
94550ed3 | 11949 | #: git-submodule.sh:576 |
1003b3a5 | 11950 | #, sh-format |
2e8451e8 JX |
11951 | msgid "Cleared directory '$displaypath'" |
11952 | msgstr "已清除目录 '$displaypath'" | |
1003b3a5 | 11953 | |
94550ed3 | 11954 | #: git-submodule.sh:577 |
1003b3a5 | 11955 | #, sh-format |
2e8451e8 JX |
11956 | msgid "Could not remove submodule work tree '$displaypath'" |
11957 | msgstr "无法移除子模组工作区 '$displaypath'" | |
1003b3a5 | 11958 | |
94550ed3 | 11959 | #: git-submodule.sh:580 |
1003b3a5 | 11960 | #, sh-format |
2e8451e8 JX |
11961 | msgid "Could not create empty submodule directory '$displaypath'" |
11962 | msgstr "不能创建空的子模组目录 '$displaypath'" | |
1003b3a5 | 11963 | |
94550ed3 | 11964 | #: git-submodule.sh:589 |
1003b3a5 | 11965 | #, sh-format |
2e8451e8 JX |
11966 | msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" |
11967 | msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
1003b3a5 | 11968 | |
276ceeaa | 11969 | #: git-submodule.sh:723 |
1003b3a5 JX |
11970 | #, sh-format |
11971 | msgid "" | |
2e8451e8 | 11972 | "Submodule path '$displaypath' not initialized\n" |
c04f5ac3 JX |
11973 | "Maybe you want to use 'update --init'?" |
11974 | msgstr "" | |
2e8451e8 | 11975 | "子模组路径 '$displaypath' 没有初始化\n" |
90e6ef53 | 11976 | "也许您想用 'update --init'?" |
c04f5ac3 | 11977 | |
276ceeaa | 11978 | #: git-submodule.sh:736 |
c04f5ac3 | 11979 | #, sh-format |
2e8451e8 JX |
11980 | msgid "Unable to find current revision in submodule path '$displaypath'" |
11981 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 11982 | |
276ceeaa | 11983 | #: git-submodule.sh:745 |
c04f5ac3 | 11984 | #, sh-format |
170e9899 JX |
11985 | msgid "Unable to fetch in submodule path '$sm_path'" |
11986 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 11987 | |
276ceeaa | 11988 | #: git-submodule.sh:768 |
2e8451e8 JX |
11989 | #, sh-format |
11990 | msgid "Unable to fetch in submodule path '$displaypath'" | |
11991 | msgstr "无法在子模组路径 '$displaypath' 中获取" | |
11992 | ||
276ceeaa | 11993 | #: git-submodule.sh:788 |
6c94aba5 JX |
11994 | #, sh-format |
11995 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
11996 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
11997 | ||
276ceeaa | 11998 | #: git-submodule.sh:789 |
c04f5ac3 | 11999 | #, sh-format |
6c94aba5 JX |
12000 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
12001 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
12002 | ||
276ceeaa | 12003 | #: git-submodule.sh:793 |
6c94aba5 | 12004 | #, sh-format |
2e8451e8 JX |
12005 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
12006 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 12007 | |
276ceeaa | 12008 | #: git-submodule.sh:794 |
c04f5ac3 | 12009 | #, sh-format |
2e8451e8 JX |
12010 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
12011 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 12012 | |
276ceeaa | 12013 | #: git-submodule.sh:799 |
c04f5ac3 | 12014 | #, sh-format |
2e8451e8 JX |
12015 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
12016 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 12017 | |
276ceeaa | 12018 | #: git-submodule.sh:800 |
c04f5ac3 | 12019 | #, sh-format |
2e8451e8 JX |
12020 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
12021 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 12022 | |
276ceeaa | 12023 | #: git-submodule.sh:805 |
c04f5ac3 | 12024 | #, sh-format |
2e8451e8 | 12025 | msgid "" |
1b7f4a34 | 12026 | "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" |
2e8451e8 | 12027 | msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败" |
c04f5ac3 | 12028 | |
276ceeaa | 12029 | #: git-submodule.sh:806 |
c04f5ac3 | 12030 | #, sh-format |
2e8451e8 JX |
12031 | msgid "Submodule path '$prefix$sm_path': '$command $sha1'" |
12032 | msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'" | |
c04f5ac3 | 12033 | |
276ceeaa | 12034 | #: git-submodule.sh:836 |
2e8451e8 JX |
12035 | #, sh-format |
12036 | msgid "Failed to recurse into submodule path '$displaypath'" | |
12037 | msgstr "无法递归进子模组路径 '$displaypath'" | |
12038 | ||
276ceeaa | 12039 | #: git-submodule.sh:944 |
649900bc JX |
12040 | msgid "The --cached option cannot be used with the --files option" |
12041 | msgstr "选项 --cached 不能和选项 --files 同时使用" | |
b694fbb1 | 12042 | |
276ceeaa | 12043 | #: git-submodule.sh:996 |
b694fbb1 JX |
12044 | #, sh-format |
12045 | msgid "unexpected mode $mod_dst" | |
12046 | msgstr "意外的模式 $mod_dst" | |
c04f5ac3 | 12047 | |
90e6ef53 | 12048 | # 译者:注意保持前导空格 |
276ceeaa | 12049 | #: git-submodule.sh:1016 |
c04f5ac3 | 12050 | #, sh-format |
2e8451e8 JX |
12051 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
12052 | msgstr " 警告:$display_name 未包含提交 $sha1_src" | |
c04f5ac3 | 12053 | |
90e6ef53 | 12054 | # 译者:注意保持前导空格 |
276ceeaa | 12055 | #: git-submodule.sh:1019 |
c04f5ac3 | 12056 | #, sh-format |
2e8451e8 JX |
12057 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
12058 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" | |
c04f5ac3 | 12059 | |
90e6ef53 | 12060 | # 译者:注意保持前导空格 |
276ceeaa | 12061 | #: git-submodule.sh:1022 |
c04f5ac3 | 12062 | #, sh-format |
2e8451e8 JX |
12063 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
12064 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" | |
c04f5ac3 | 12065 | |
276ceeaa | 12066 | #: git-submodule.sh:1047 |
c04f5ac3 | 12067 | msgid "blob" |
07432cef | 12068 | msgstr "数据对象" |
c04f5ac3 | 12069 | |
276ceeaa | 12070 | #: git-submodule.sh:1165 |
1003b3a5 JX |
12071 | #, sh-format |
12072 | msgid "Failed to recurse into submodule path '$sm_path'" | |
12073 | msgstr "无法递归进子模组路径 '$sm_path'" | |
12074 | ||
276ceeaa | 12075 | #: git-submodule.sh:1229 |
c04f5ac3 | 12076 | #, sh-format |
2e8451e8 JX |
12077 | msgid "Synchronizing submodule url for '$displaypath'" |
12078 | msgstr "为 '$displaypath' 同步子模组 url" | |
1b7f4a34 | 12079 | |
276ceeaa JX |
12080 | #~ msgid "unable to parse format" |
12081 | #~ msgstr "不能解析格式" | |
12082 | ||
12083 | #~ msgid "improper format entered align:%s" | |
12084 | #~ msgstr "输入了不正确的格式 align:%s" | |
12085 | ||
12086 | #~ msgid "Could not set core.worktree in %s" | |
12087 | #~ msgstr "不能在 %s 中设置 core.worktree" | |
12088 | ||
12089 | # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短 | |
12090 | #~ msgid "" | |
12091 | #~ "push.default is unset; its implicit value has changed in\n" | |
12092 | #~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" | |
12093 | #~ "and maintain the traditional behavior, use:\n" | |
12094 | #~ "\n" | |
12095 | #~ " git config --global push.default matching\n" | |
12096 | #~ "\n" | |
12097 | #~ "To squelch this message and adopt the new behavior now, use:\n" | |
12098 | #~ "\n" | |
12099 | #~ " git config --global push.default simple\n" | |
12100 | #~ "\n" | |
12101 | #~ "When push.default is set to 'matching', git will push local branches\n" | |
12102 | #~ "to the remote branches that already exist with the same name.\n" | |
12103 | #~ "\n" | |
12104 | #~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n" | |
12105 | #~ "behavior, which only pushes the current branch to the corresponding\n" | |
12106 | #~ "remote branch that 'git pull' uses to update the current branch.\n" | |
12107 | #~ "\n" | |
12108 | #~ "See 'git help config' and search for 'push.default' for further " | |
12109 | #~ "information.\n" | |
12110 | #~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" | |
12111 | #~ "'current' instead of 'simple' if you sometimes use older versions of Git)" | |
12112 | #~ msgstr "" | |
12113 | #~ "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n" | |
12114 | #~ "变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n" | |
12115 | #~ "\n" | |
12116 | #~ " git config --global push.default matching\n" | |
12117 | #~ "\n" | |
12118 | #~ "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n" | |
12119 | #~ "\n" | |
12120 | #~ " git config --global push.default simple\n" | |
12121 | #~ "\n" | |
12122 | #~ "当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n" | |
12123 | #~ "本地分支。\n" | |
12124 | #~ "\n" | |
12125 | #~ "从 Git 2.0 开始,Git 默认采用更为保守的 'simple' 模式,只推送当前\n" | |
12126 | #~ "分支到远程关联的同名分支,即 'git push' 推送当前分支。\n" | |
12127 | #~ "\n" | |
12128 | #~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n" | |
12129 | #~ "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n" | |
12130 | #~ "为保持兼容,请用 'current' 代替 'simple')" | |
12131 | ||
12132 | #~ msgid "Could not append '%s'" | |
12133 | #~ msgstr "不能追加 '%s'" | |
12134 | ||
12135 | #~ msgid "Could not set '%s'" | |
12136 | #~ msgstr "不能设置 '%s'" | |
12137 | ||
12138 | # 译者:可选值,不能翻译 | |
12139 | #~ msgid "check|on-demand|no" | |
12140 | #~ msgstr "check|on-demand|no" | |
12141 | ||
12142 | #~ msgid "Missing author: %s" | |
12143 | #~ msgstr "缺少作者:%s" | |
12144 | ||
12145 | #~ msgid "Testing " | |
12146 | #~ msgstr "正在测试 " | |
12147 | ||
89f80d72 JX |
12148 | #~ msgid "unable to look up current user in the passwd file: %s" |
12149 | #~ msgstr "无法在口令文件中查询到当前用户:%s" | |
12150 | ||
12151 | #~ msgid "no such user" | |
12152 | #~ msgstr "无此用户" | |
12153 | ||
94550ed3 JX |
12154 | #~ msgid "show usage" |
12155 | #~ msgstr "显示用法" | |
12156 | ||
12157 | #~ msgid "branch '%s' does not point at a commit" | |
12158 | #~ msgstr "分支 '%s' 未指向一个提交" | |
12159 | ||
12160 | #~ msgid "object '%s' does not point to a commit" | |
12161 | #~ msgstr "对象 '%s' 没有指向一个提交" | |
12162 | ||
12163 | #~ msgid "print only merged branches" | |
12164 | #~ msgstr "只打印合并的分支" | |
12165 | ||
12166 | #~ msgid "--dissociate given, but there is no --reference" | |
12167 | #~ msgstr "提供了参数 --dissociate,但未提供 --reference" | |
12168 | ||
12169 | #~ msgid "insanely long template name %s" | |
12170 | #~ msgstr "太长的模版名 %s" | |
12171 | ||
12172 | #~ msgid "insanely long symlink %s" | |
12173 | #~ msgstr "太长的符号链接 %s" | |
12174 | ||
12175 | #~ msgid "insanely long template path %s" | |
12176 | #~ msgstr "太长的模版路径 %s" | |
12177 | ||
12178 | #~ msgid "insane git directory %s" | |
12179 | #~ msgstr "不正常的 git 目录 %s" | |
12180 | ||
12181 | #~ msgid "unsupported sort specification '%s'" | |
12182 | #~ msgstr "不支持的排序规格 '%s'" | |
12183 | ||
12184 | #~ msgid "unsupported sort specification '%s' in variable '%s'" | |
12185 | #~ msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'" | |
12186 | ||
12187 | #~ msgid "switch 'points-at' requires an object" | |
12188 | #~ msgstr "开关 'points-at' 需要一个对象" | |
12189 | ||
12190 | #~ msgid "sort tags" | |
12191 | #~ msgstr "排序标签" | |
12192 | ||
12193 | #~ msgid "--sort and -n are incompatible" | |
12194 | #~ msgstr "--sort 和 -n 不兼容" | |
12195 | ||
12196 | #~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" | |
12197 | #~ msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反" | |
12198 | ||
03ea3327 JX |
12199 | #~ msgid "false|true|preserve" |
12200 | #~ msgstr "false|true|preserve" | |
12201 | ||
1b7f4a34 JX |
12202 | #~ msgid "BUG: reopen a lockfile that is still open" |
12203 | #~ msgstr "BUG: 重新打开一个仍打开着的锁文件" | |
12204 | ||
12205 | #~ msgid "BUG: reopen a lockfile that has been committed" | |
12206 | #~ msgstr "BUG: 重新打开一个已提交的锁文件" | |
12207 | ||
12208 | #~ msgid "option %s does not accept negative form" | |
12209 | #~ msgstr "选项 %s 不接受否定格式" | |
12210 | ||
12211 | #~ msgid "unable to parse value '%s' for option %s" | |
12212 | #~ msgstr "不能解析选项 %1$s 的值 '%2$s'" | |
12213 | ||
12214 | #~ msgid "unable to resolve HEAD" | |
12215 | #~ msgstr "不能解析 HEAD" | |
12216 | ||
12217 | #~ msgid "-b and -B are mutually exclusive" | |
12218 | #~ msgstr "-b 和 -B 互斥" | |
12219 | ||
12220 | #~ msgid "You need to set your committer info first" | |
12221 | #~ msgstr "您需要先设置你的提交者信息" | |
12222 | ||
12223 | #~ msgid "" | |
12224 | #~ "When you have resolved this problem, run \"$cmdline --continue\".\n" | |
12225 | #~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" | |
12226 | #~ "To restore the original branch and stop patching, run \"$cmdline --abort" | |
12227 | #~ "\"." | |
12228 | #~ msgstr "" | |
12229 | #~ "当您解决了此问题后,执行 \"$cmdline --continue\"。\n" | |
12230 | #~ "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n" | |
12231 | #~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。" | |
12232 | ||
12233 | #~ msgid "Patch format $patch_format is not supported." | |
12234 | #~ msgstr "不支持 $patch_format 补丁格式。" | |
12235 | ||
12236 | #~ msgid "Please make up your mind. --skip or --abort?" | |
12237 | #~ msgstr "请下决心。--skip 或是 --abort ?" | |
12238 | ||
12239 | #~ msgid "" | |
12240 | #~ "Patch is empty. Was it split wrong?\n" | |
12241 | #~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" | |
12242 | #~ "To restore the original branch and stop patching run \"$cmdline --abort\"." | |
12243 | #~ msgstr "" | |
12244 | #~ "补丁为空。是不是切分错误?\n" | |
12245 | #~ "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n" | |
12246 | #~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。" | |
12247 | ||
12248 | #~ msgid "Patch does not have a valid e-mail address." | |
12249 | #~ msgstr "补丁中没有一个有效的邮件地址。" | |
12250 | ||
12251 | #~ msgid "Applying: $FIRSTLINE" | |
12252 | #~ msgstr "正应用:$FIRSTLINE" | |
12253 | ||
12254 | #~ msgid "Patch failed at $msgnum $FIRSTLINE" | |
12255 | #~ msgstr "补丁失败于 $msgnum $FIRSTLINE" | |
12256 | ||
12257 | #~ msgid "" | |
12258 | #~ "Pull is not possible because you have unmerged files.\n" | |
12259 | #~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" | |
12260 | #~ "as appropriate to mark resolution and make a commit." | |
12261 | #~ msgstr "" | |
12262 | #~ "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n" | |
12263 | #~ "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。" | |
12264 | ||
12265 | #~ msgid "Pull is not possible because you have unmerged files." | |
12266 | #~ msgstr "Pull 不可用,因为您尚有未合并的文件。" |