]>
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 JX |
6 | # - Jiang Xin <worldhello.net AT gmail.com> |
7 | # - Riku <lu.riku AT gmail.com> | |
8 | # - Zhuang Ya <zhuangya AT me.com> | |
9 | # - Lian Cheng <rhythm.mail AT gmail.com> | |
10 | # | |
11 | msgid "" | |
12 | msgstr "" | |
13 | "Project-Id-Version: Git\n" | |
14 | "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" | |
5bb01d4f JX |
15 | "POT-Creation-Date: 2015-07-14 07:19+0800\n" |
16 | "PO-Revision-Date: 2015-07-14 07:32+0800\n" | |
c04f5ac3 | 17 | "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" |
7aea43ff | 18 | "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" |
c04f5ac3 JX |
19 | "Language: zh_CN\n" |
20 | "MIME-Version: 1.0\n" | |
21 | "Content-Type: text/plain; charset=UTF-8\n" | |
22 | "Content-Transfer-Encoding: 8bit\n" | |
5ae481e0 | 23 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
c04f5ac3 | 24 | |
6c94aba5 | 25 | #: advice.c:55 |
c04f5ac3 JX |
26 | #, c-format |
27 | msgid "hint: %.*s\n" | |
28 | msgstr "提示:%.*s\n" | |
29 | ||
6acbf033 | 30 | #: advice.c:88 |
c04f5ac3 | 31 | msgid "" |
6acbf033 | 32 | "Fix them up in the work tree, and then use 'git add/rm <file>'\n" |
220c313c | 33 | "as appropriate to mark resolution and make a commit." |
c04f5ac3 | 34 | msgstr "" |
d9d56b23 | 35 | "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n" |
220c313c | 36 | "解决方案并提交。" |
c04f5ac3 | 37 | |
220c313c | 38 | #: archive.c:11 |
814ff314 JX |
39 | msgid "git archive [<options>] <tree-ish> [<path>...]" |
40 | msgstr "git archive [<选项>] <树或提交> [<路径>...]" | |
ef317cd5 | 41 | |
220c313c | 42 | #: archive.c:12 |
ef317cd5 | 43 | msgid "git archive --list" |
07432cef | 44 | msgstr "git archive --list" |
ef317cd5 | 45 | |
220c313c | 46 | #: archive.c:13 |
ef317cd5 | 47 | msgid "" |
814ff314 | 48 | "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" |
ef317cd5 | 49 | msgstr "" |
814ff314 | 50 | "git archive --remote <版本库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 51 | |
220c313c | 52 | #: archive.c:14 |
ef317cd5 | 53 | msgid "git archive --remote <repo> [--exec <cmd>] --list" |
07432cef | 54 | msgstr "git archive --remote <版本库> [--exec <命令>] --list" |
ef317cd5 | 55 | |
7aea43ff | 56 | #: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327 |
90314792 JX |
57 | #, c-format |
58 | msgid "pathspec '%s' did not match any files" | |
59 | msgstr "路径规则 '%s' 未匹配任何文件" | |
60 | ||
04cb2f28 | 61 | #: archive.c:427 |
ef317cd5 | 62 | msgid "fmt" |
07432cef | 63 | msgstr "格式" |
ef317cd5 | 64 | |
04cb2f28 | 65 | #: archive.c:427 |
ef317cd5 | 66 | msgid "archive format" |
07432cef | 67 | msgstr "归档格式" |
ef317cd5 | 68 | |
04cb2f28 | 69 | #: archive.c:428 builtin/log.c:1204 |
ef317cd5 | 70 | msgid "prefix" |
07432cef | 71 | msgstr "前缀" |
ef317cd5 | 72 | |
04cb2f28 | 73 | #: archive.c:429 |
ef317cd5 | 74 | msgid "prepend prefix to each pathname in the archive" |
07432cef | 75 | msgstr "为归档中每个路径名加上前缀" |
ef317cd5 | 76 | |
814ff314 JX |
77 | #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 |
78 | #: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 | |
7aea43ff | 79 | #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99 |
814ff314 | 80 | #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 |
7aea43ff | 81 | #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150 |
ef317cd5 JX |
82 | msgid "file" |
83 | msgstr "文件" | |
84 | ||
04cb2f28 | 85 | #: archive.c:431 builtin/archive.c:89 |
ef317cd5 | 86 | msgid "write the archive to this file" |
07432cef | 87 | msgstr "归档写入此文件" |
ef317cd5 | 88 | |
04cb2f28 | 89 | #: archive.c:433 |
ef317cd5 | 90 | msgid "read .gitattributes in working directory" |
07432cef | 91 | msgstr "读取工作区中的 .gitattributes" |
ef317cd5 | 92 | |
04cb2f28 | 93 | #: archive.c:434 |
ef317cd5 | 94 | msgid "report archived files on stderr" |
07432cef | 95 | msgstr "在标准错误上报告归档文件" |
ef317cd5 | 96 | |
04cb2f28 | 97 | #: archive.c:435 |
ef317cd5 | 98 | msgid "store only" |
07432cef | 99 | msgstr "只存储" |
ef317cd5 | 100 | |
04cb2f28 | 101 | #: archive.c:436 |
ef317cd5 | 102 | msgid "compress faster" |
07432cef | 103 | msgstr "压缩速度更快" |
ef317cd5 | 104 | |
04cb2f28 | 105 | #: archive.c:444 |
ef317cd5 | 106 | msgid "compress better" |
07432cef | 107 | msgstr "压缩效果更好" |
ef317cd5 | 108 | |
04cb2f28 | 109 | #: archive.c:447 |
ef317cd5 | 110 | msgid "list supported archive formats" |
07432cef | 111 | msgstr "列出支持的归档格式" |
ef317cd5 | 112 | |
7aea43ff | 113 | #: archive.c:449 builtin/archive.c:90 builtin/clone.c:77 |
ef317cd5 | 114 | msgid "repo" |
07432cef | 115 | msgstr "版本库" |
ef317cd5 | 116 | |
04cb2f28 | 117 | #: archive.c:450 builtin/archive.c:91 |
ef317cd5 | 118 | msgid "retrieve the archive from remote repository <repo>" |
07432cef | 119 | msgstr "从远程版本库(<版本库>)提取归档文件" |
ef317cd5 | 120 | |
04cb2f28 | 121 | #: archive.c:451 builtin/archive.c:92 builtin/notes.c:478 |
ef317cd5 | 122 | msgid "command" |
07432cef | 123 | msgstr "命令" |
ef317cd5 | 124 | |
04cb2f28 | 125 | #: archive.c:452 builtin/archive.c:93 |
ef317cd5 | 126 | msgid "path to the remote git-upload-archive command" |
07432cef WS |
127 | msgstr "远程 git-upload-archive 命令的路径" |
128 | ||
7aea43ff | 129 | #: attr.c:265 |
07432cef | 130 | msgid "" |
a7409dfb | 131 | "Negative patterns are ignored in git attributes\n" |
07432cef | 132 | "Use '\\!' for literal leading exclamation." |
ef317cd5 | 133 | msgstr "" |
a7409dfb | 134 | "负值模版在 git attributes 中被忽略\n" |
07432cef | 135 | "当字符串确实要以感叹号开始时,使用 '\\!'。" |
ef317cd5 | 136 | |
4dcdc3d8 JX |
137 | #: branch.c:60 |
138 | #, c-format | |
139 | msgid "Not setting branch %s as its own upstream." | |
140 | msgstr "未设置分支 %s 作为它自己的上游。" | |
141 | ||
6c94aba5 | 142 | #: branch.c:83 |
4dcdc3d8 JX |
143 | #, c-format |
144 | msgid "Branch %s set up to track remote branch %s from %s by rebasing." | |
145 | msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。" | |
146 | ||
6c94aba5 | 147 | #: branch.c:84 |
4dcdc3d8 JX |
148 | #, c-format |
149 | msgid "Branch %s set up to track remote branch %s from %s." | |
150 | msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。" | |
151 | ||
6c94aba5 | 152 | #: branch.c:88 |
4dcdc3d8 JX |
153 | #, c-format |
154 | msgid "Branch %s set up to track local branch %s by rebasing." | |
155 | msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。" | |
156 | ||
6c94aba5 | 157 | #: branch.c:89 |
4dcdc3d8 JX |
158 | #, c-format |
159 | msgid "Branch %s set up to track local branch %s." | |
160 | msgstr "分支 %s 设置为跟踪本地分支 %s。" | |
161 | ||
6c94aba5 | 162 | #: branch.c:94 |
4dcdc3d8 JX |
163 | #, c-format |
164 | msgid "Branch %s set up to track remote ref %s by rebasing." | |
165 | msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。" | |
166 | ||
6c94aba5 | 167 | #: branch.c:95 |
4dcdc3d8 JX |
168 | #, c-format |
169 | msgid "Branch %s set up to track remote ref %s." | |
170 | msgstr "分支 %s 设置为跟踪远程引用 %s。" | |
171 | ||
6c94aba5 | 172 | #: branch.c:99 |
4dcdc3d8 JX |
173 | #, c-format |
174 | msgid "Branch %s set up to track local ref %s by rebasing." | |
175 | msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。" | |
176 | ||
6c94aba5 | 177 | #: branch.c:100 |
4dcdc3d8 JX |
178 | #, c-format |
179 | msgid "Branch %s set up to track local ref %s." | |
180 | msgstr "分支 %s 设置为跟踪本地引用 %s。" | |
181 | ||
6c94aba5 | 182 | #: branch.c:133 |
4dcdc3d8 JX |
183 | #, c-format |
184 | msgid "Not tracking: ambiguous information for ref %s" | |
185 | msgstr "未跟踪:引用 %s 有歧义" | |
186 | ||
220c313c | 187 | #: branch.c:162 |
4dcdc3d8 JX |
188 | #, c-format |
189 | msgid "'%s' is not a valid branch name." | |
190 | msgstr "'%s' 不是一个有效的分支名称。" | |
191 | ||
220c313c | 192 | #: branch.c:167 |
4dcdc3d8 JX |
193 | #, c-format |
194 | msgid "A branch named '%s' already exists." | |
195 | msgstr "一个分支名 '%s' 已经存在。" | |
196 | ||
220c313c | 197 | #: branch.c:175 |
4dcdc3d8 JX |
198 | msgid "Cannot force update the current branch." |
199 | msgstr "无法强制更新当前分支。" | |
200 | ||
220c313c | 201 | #: branch.c:195 |
1003b3a5 JX |
202 | #, c-format |
203 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." | |
204 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" | |
205 | ||
220c313c | 206 | #: branch.c:197 |
1003b3a5 JX |
207 | #, c-format |
208 | msgid "the requested upstream branch '%s' does not exist" | |
209 | msgstr "请求的上游分支 '%s' 不存在" | |
210 | ||
220c313c | 211 | #: branch.c:199 |
1003b3a5 JX |
212 | msgid "" |
213 | "\n" | |
214 | "If you are planning on basing your work on an upstream\n" | |
215 | "branch that already exists at the remote, you may need to\n" | |
216 | "run \"git fetch\" to retrieve it.\n" | |
217 | "\n" | |
218 | "If you are planning to push out a new local branch that\n" | |
219 | "will track its remote counterpart, you may want to use\n" | |
220 | "\"git push -u\" to set the upstream config as you push." | |
221 | msgstr "" | |
222 | "\n" | |
223 | "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" | |
224 | "您可能需要执行 \"git fetch\" 来获取分支。\n" | |
225 | "\n" | |
226 | "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" | |
227 | "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" | |
228 | ||
220c313c | 229 | #: branch.c:243 |
4dcdc3d8 JX |
230 | #, c-format |
231 | msgid "Not a valid object name: '%s'." | |
232 | msgstr "不是一个有效的对象名:'%s'。" | |
233 | ||
220c313c | 234 | #: branch.c:263 |
4dcdc3d8 JX |
235 | #, c-format |
236 | msgid "Ambiguous object name: '%s'." | |
237 | msgstr "歧义的对象名:'%s'。" | |
238 | ||
220c313c | 239 | #: branch.c:268 |
4dcdc3d8 JX |
240 | #, c-format |
241 | msgid "Not a valid branch point: '%s'." | |
242 | msgstr "无效的分支点:'%s'。" | |
243 | ||
220c313c | 244 | #: bundle.c:34 |
8ada9598 JX |
245 | #, c-format |
246 | msgid "'%s' does not look like a v2 bundle file" | |
81809b99 | 247 | msgstr "'%s' 不像是一个 v2 版本的包文件" |
8ada9598 | 248 | |
220c313c | 249 | #: bundle.c:61 |
81809b99 | 250 | #, c-format |
8ada9598 | 251 | msgid "unrecognized header: %s%s (%d)" |
81809b99 | 252 | msgstr "未能识别的包头:%s%s (%d)" |
8ada9598 | 253 | |
44f518e6 | 254 | #: bundle.c:87 builtin/commit.c:766 |
8ada9598 JX |
255 | #, c-format |
256 | msgid "could not open '%s'" | |
257 | msgstr "不能打开 '%s'" | |
258 | ||
220c313c | 259 | #: bundle.c:139 |
8ada9598 | 260 | msgid "Repository lacks these prerequisite commits:" |
81809b99 | 261 | msgstr "版本库缺少这些必备的提交:" |
8ada9598 | 262 | |
814ff314 | 263 | #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 |
7aea43ff JX |
264 | #: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330 |
265 | #: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358 | |
90314792 | 266 | #: builtin/shortlog.c:158 |
8ada9598 JX |
267 | msgid "revision walk setup failed" |
268 | msgstr "版本遍历设置失败" | |
269 | ||
220c313c | 270 | #: bundle.c:185 |
8ada9598 | 271 | #, c-format |
1003b3a5 JX |
272 | msgid "The bundle contains this ref:" |
273 | msgid_plural "The bundle contains these %d refs:" | |
274 | msgstr[0] "这个包中含有这个引用:" | |
275 | msgstr[1] "这个包中含有 %d 个引用:" | |
8ada9598 | 276 | |
220c313c | 277 | #: bundle.c:192 |
6792b93b JX |
278 | msgid "The bundle records a complete history." |
279 | msgstr "这个包记录一个完整历史。" | |
280 | ||
220c313c | 281 | #: bundle.c:194 |
8ada9598 | 282 | #, c-format |
1003b3a5 JX |
283 | msgid "The bundle requires this ref:" |
284 | msgid_plural "The bundle requires these %d refs:" | |
285 | msgstr[0] "这个包需要这个引用:" | |
286 | msgstr[1] "这个包需要 %d 个引用:" | |
8ada9598 | 287 | |
9aeb4c2b JX |
288 | #: bundle.c:251 |
289 | msgid "Could not spawn pack-objects" | |
290 | msgstr "不能生成 pack-objects 进程" | |
291 | ||
292 | #: bundle.c:269 | |
293 | msgid "pack-objects died" | |
294 | msgstr "pack-objects 终止" | |
295 | ||
296 | #: bundle.c:309 | |
8ada9598 | 297 | msgid "rev-list died" |
81809b99 | 298 | msgstr "rev-list 终止" |
8ada9598 | 299 | |
9aeb4c2b | 300 | #: bundle.c:358 |
8ada9598 JX |
301 | #, c-format |
302 | msgid "ref '%s' is excluded by the rev-list options" | |
81809b99 | 303 | msgstr "引用 '%s' 被 rev-list 选项排除" |
8ada9598 | 304 | |
814ff314 | 305 | #: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 |
9aeb4c2b JX |
306 | #, c-format |
307 | msgid "unrecognized argument: %s" | |
308 | msgstr "未能识别的参数:%s" | |
309 | ||
814ff314 | 310 | #: bundle.c:443 |
8ada9598 | 311 | msgid "Refusing to create empty bundle." |
81809b99 | 312 | msgstr "不能创建空包。" |
8ada9598 | 313 | |
814ff314 | 314 | #: bundle.c:453 |
81809b99 | 315 | #, c-format |
8ada9598 | 316 | msgid "cannot create '%s'" |
81809b99 | 317 | msgstr "不能创建 '%s'" |
8ada9598 | 318 | |
814ff314 | 319 | #: bundle.c:474 |
8ada9598 | 320 | msgid "index-pack died" |
81809b99 | 321 | msgstr "index-pack 终止" |
8ada9598 | 322 | |
1e607449 | 323 | #: color.c:260 |
220c313c JX |
324 | #, c-format |
325 | msgid "invalid color value: %.*s" | |
326 | msgstr "无效的颜色值:%.*s" | |
327 | ||
6acbf033 | 328 | #: commit.c:40 |
c04f5ac3 JX |
329 | #, c-format |
330 | msgid "could not parse %s" | |
331 | msgstr "不能解析 %s" | |
332 | ||
6acbf033 | 333 | #: commit.c:42 |
c04f5ac3 JX |
334 | #, c-format |
335 | msgid "%s %s is not a commit!" | |
336 | msgstr "%s %s 不是一个提交!" | |
337 | ||
338 | #: compat/obstack.c:406 compat/obstack.c:408 | |
339 | msgid "memory exhausted" | |
340 | msgstr "内存耗尽" | |
341 | ||
814ff314 | 342 | #: config.c:474 config.c:476 |
220c313c JX |
343 | #, c-format |
344 | msgid "bad config file line %d in %s" | |
345 | msgstr "配置文件 %2$s 出错于第 %1$d 行" | |
346 | ||
814ff314 | 347 | #: config.c:592 |
220c313c JX |
348 | #, c-format |
349 | msgid "bad numeric config value '%s' for '%s' in %s: %s" | |
350 | msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s" | |
351 | ||
814ff314 | 352 | #: config.c:594 |
220c313c JX |
353 | #, c-format |
354 | msgid "bad numeric config value '%s' for '%s': %s" | |
355 | msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s" | |
356 | ||
814ff314 | 357 | #: config.c:679 |
220c313c JX |
358 | #, c-format |
359 | msgid "failed to expand user dir in: '%s'" | |
360 | msgstr "无法扩展 '%s' 中的用户目录" | |
361 | ||
814ff314 | 362 | #: config.c:757 config.c:768 |
220c313c JX |
363 | #, c-format |
364 | msgid "bad zlib compression level %d" | |
365 | msgstr "错误的 zlib 压缩级别 %d" | |
366 | ||
814ff314 | 367 | #: config.c:890 |
220c313c JX |
368 | #, c-format |
369 | msgid "invalid mode for object creation: %s" | |
370 | msgstr "无效的对象创建模式:%s" | |
371 | ||
814ff314 | 372 | #: config.c:1216 |
220c313c JX |
373 | msgid "unable to parse command-line config" |
374 | msgstr "无法解析命令行中的配置" | |
375 | ||
814ff314 | 376 | #: config.c:1277 |
220c313c JX |
377 | msgid "unknown error occured while reading the configuration files" |
378 | msgstr "在读取配置文件时遇到未知错误" | |
379 | ||
814ff314 | 380 | #: config.c:1601 |
220c313c JX |
381 | #, c-format |
382 | msgid "unable to parse '%s' from command-line config" | |
383 | msgstr "无法解析命令行配置中的 '%s'" | |
384 | ||
814ff314 | 385 | #: config.c:1603 |
220c313c JX |
386 | #, c-format |
387 | msgid "bad config variable '%s' in file '%s' at line %d" | |
388 | msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" | |
389 | ||
814ff314 | 390 | #: config.c:1662 |
220c313c JX |
391 | #, c-format |
392 | msgid "%s has multiple values" | |
393 | msgstr "%s 有多个取值" | |
394 | ||
395 | #: connected.c:69 | |
c04f5ac3 JX |
396 | msgid "Could not run 'git rev-list'" |
397 | msgstr "不能执行 'git rev-list'" | |
398 | ||
220c313c | 399 | #: connected.c:89 |
c04f5ac3 JX |
400 | #, c-format |
401 | msgid "failed write to rev-list: %s" | |
402 | msgstr "无法写入 rev-list:%s" | |
403 | ||
220c313c | 404 | #: connected.c:97 |
c04f5ac3 JX |
405 | #, c-format |
406 | msgid "failed to close rev-list's stdin: %s" | |
407 | msgstr "无法关闭 rev-list 的标准输入:%s" | |
408 | ||
8ada9598 JX |
409 | #: date.c:95 |
410 | msgid "in the future" | |
81809b99 | 411 | msgstr "在将来" |
8ada9598 JX |
412 | |
413 | #: date.c:101 | |
414 | #, c-format | |
415 | msgid "%lu second ago" | |
416 | msgid_plural "%lu seconds ago" | |
6c94aba5 JX |
417 | msgstr[0] "%lu 秒钟前" |
418 | msgstr[1] "%lu 秒钟前" | |
8ada9598 JX |
419 | |
420 | #: date.c:108 | |
421 | #, c-format | |
422 | msgid "%lu minute ago" | |
423 | msgid_plural "%lu minutes ago" | |
6c94aba5 JX |
424 | msgstr[0] "%lu 分钟前" |
425 | msgstr[1] "%lu 分钟前" | |
8ada9598 JX |
426 | |
427 | #: date.c:115 | |
428 | #, c-format | |
429 | msgid "%lu hour ago" | |
430 | msgid_plural "%lu hours ago" | |
6c94aba5 JX |
431 | msgstr[0] "%lu 小时前" |
432 | msgstr[1] "%lu 小时前" | |
8ada9598 JX |
433 | |
434 | #: date.c:122 | |
435 | #, c-format | |
436 | msgid "%lu day ago" | |
437 | msgid_plural "%lu days ago" | |
6c94aba5 JX |
438 | msgstr[0] "%lu 天前" |
439 | msgstr[1] "%lu 天前" | |
8ada9598 JX |
440 | |
441 | #: date.c:128 | |
442 | #, c-format | |
443 | msgid "%lu week ago" | |
444 | msgid_plural "%lu weeks ago" | |
6c94aba5 JX |
445 | msgstr[0] "%lu 周前" |
446 | msgstr[1] "%lu 周前" | |
8ada9598 JX |
447 | |
448 | #: date.c:135 | |
449 | #, c-format | |
450 | msgid "%lu month ago" | |
451 | msgid_plural "%lu months ago" | |
6c94aba5 JX |
452 | msgstr[0] "%lu 个月前" |
453 | msgstr[1] "%lu 个月前" | |
8ada9598 JX |
454 | |
455 | #: date.c:146 | |
456 | #, c-format | |
457 | msgid "%lu year" | |
458 | msgid_plural "%lu years" | |
81809b99 | 459 | msgstr[0] "%lu 年" |
5ae481e0 | 460 | msgstr[1] "%lu 年" |
8ada9598 | 461 | |
6c94aba5 | 462 | #. TRANSLATORS: "%s" is "<n> years" |
8ada9598 JX |
463 | #: date.c:149 |
464 | #, c-format | |
465 | msgid "%s, %lu month ago" | |
466 | msgid_plural "%s, %lu months ago" | |
6c94aba5 JX |
467 | msgstr[0] "%s %lu 个月前" |
468 | msgstr[1] "%s %lu 个月前" | |
8ada9598 JX |
469 | |
470 | #: date.c:154 date.c:159 | |
471 | #, c-format | |
472 | msgid "%lu year ago" | |
473 | msgid_plural "%lu years ago" | |
81809b99 | 474 | msgstr[0] "%lu 年前" |
5ae481e0 | 475 | msgstr[1] "%lu 年前" |
8ada9598 | 476 | |
cfff71a9 JX |
477 | #: diffcore-order.c:24 |
478 | #, c-format | |
479 | msgid "failed to read orderfile '%s'" | |
480 | msgstr "无法读取排序文件 '%s'" | |
481 | ||
814ff314 | 482 | #: diffcore-rename.c:536 |
6c94aba5 JX |
483 | msgid "Performing inexact rename detection" |
484 | msgstr "正在进行非精确的重命名检测" | |
485 | ||
90e6ef53 | 486 | # 译者:注意保持前导空格 |
6acbf033 | 487 | #: diff.c:114 |
c04f5ac3 | 488 | #, c-format |
07432cef WS |
489 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" |
490 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" | |
c04f5ac3 | 491 | |
90e6ef53 | 492 | # 译者:注意保持前导空格 |
6acbf033 | 493 | #: diff.c:119 |
c04f5ac3 | 494 | #, c-format |
07432cef WS |
495 | msgid " Unknown dirstat parameter '%s'\n" |
496 | msgstr " 未知的 dirstat 参数 '%s'\n" | |
c04f5ac3 | 497 | |
6acbf033 | 498 | #: diff.c:214 |
07432cef WS |
499 | #, c-format |
500 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" | |
501 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" | |
502 | ||
220c313c | 503 | #: diff.c:266 |
c04f5ac3 JX |
504 | #, c-format |
505 | msgid "" | |
506 | "Found errors in 'diff.dirstat' config variable:\n" | |
507 | "%s" | |
508 | msgstr "" | |
90e6ef53 | 509 | "发现配置变量 'diff.dirstat' 中的错误:\n" |
c04f5ac3 JX |
510 | "%s" |
511 | ||
7aea43ff | 512 | #: diff.c:2997 |
6acbf033 JX |
513 | #, c-format |
514 | msgid "external diff died, stopping at %s" | |
515 | msgstr "外部 diff 退出,停止在 %s" | |
516 | ||
7aea43ff | 517 | #: diff.c:3393 |
6acbf033 JX |
518 | msgid "--follow requires exactly one pathspec" |
519 | msgstr "--follow 参数后只跟一个 pathspec" | |
520 | ||
7aea43ff | 521 | #: diff.c:3556 |
c04f5ac3 JX |
522 | #, c-format |
523 | msgid "" | |
524 | "Failed to parse --dirstat/-X option parameter:\n" | |
525 | "%s" | |
526 | msgstr "" | |
527 | "无法解析 --dirstat/-X 选项的参数:\n" | |
528 | "%s" | |
529 | ||
7aea43ff | 530 | #: diff.c:3570 |
07432cef WS |
531 | #, c-format |
532 | msgid "Failed to parse --submodule option parameter: '%s'" | |
533 | msgstr "无法解析 --submodule 选项的参数:'%s'" | |
534 | ||
7aea43ff JX |
535 | #: dir.c:1852 |
536 | msgid "failed to get kernel name and information" | |
537 | msgstr "无法获得内核名称和信息" | |
538 | ||
539 | #: dir.c:1945 | |
540 | msgid "Untracked cache is disabled on this system." | |
541 | msgstr "缓存未跟踪文件在本系统被禁用" | |
542 | ||
220c313c | 543 | #: gpg-interface.c:129 gpg-interface.c:200 |
c04f5ac3 JX |
544 | msgid "could not run gpg." |
545 | msgstr "不能执行 gpg。" | |
546 | ||
220c313c | 547 | #: gpg-interface.c:141 |
c04f5ac3 JX |
548 | msgid "gpg did not accept the data" |
549 | msgstr "gpg 没有接受数据" | |
550 | ||
220c313c | 551 | #: gpg-interface.c:152 |
c04f5ac3 JX |
552 | msgid "gpg failed to sign the data" |
553 | msgstr "gpg 无法为数据签名" | |
554 | ||
220c313c | 555 | #: gpg-interface.c:185 |
a77c07d9 JX |
556 | #, c-format |
557 | msgid "could not create temporary file '%s': %s" | |
558 | msgstr "不能创建临时文件 '%s':%s" | |
559 | ||
220c313c | 560 | #: gpg-interface.c:188 |
a77c07d9 JX |
561 | #, c-format |
562 | msgid "failed writing detached signature to '%s': %s" | |
563 | msgstr "无法将分离式签名写入 '%s':%s" | |
564 | ||
220c313c | 565 | #: grep.c:1718 |
7ac1c0ad JX |
566 | #, c-format |
567 | msgid "'%s': unable to read %s" | |
568 | msgstr "'%s':无法读取 %s" | |
569 | ||
220c313c | 570 | #: grep.c:1735 |
7ac1c0ad JX |
571 | #, c-format |
572 | msgid "'%s': %s" | |
573 | msgstr "'%s':%s" | |
574 | ||
220c313c | 575 | #: grep.c:1746 |
7ac1c0ad JX |
576 | #, c-format |
577 | msgid "'%s': short read %s" | |
578 | msgstr "'%s':读取不完整 %s" | |
579 | ||
6acbf033 | 580 | #: help.c:207 |
81809b99 | 581 | #, c-format |
8ada9598 | 582 | msgid "available git commands in '%s'" |
81809b99 | 583 | msgstr "在 '%s' 下可用的 git 命令" |
8ada9598 | 584 | |
6acbf033 | 585 | #: help.c:214 |
8ada9598 | 586 | msgid "git commands available from elsewhere on your $PATH" |
81809b99 | 587 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" |
8ada9598 | 588 | |
7aea43ff JX |
589 | #: help.c:246 |
590 | msgid "These are common Git commands used in various situations:" | |
591 | msgstr "这些是各种场合常见的 Git 命令:" | |
a77c07d9 | 592 | |
7aea43ff | 593 | #: help.c:311 |
c04f5ac3 JX |
594 | #, c-format |
595 | msgid "" | |
596 | "'%s' appears to be a git command, but we were not\n" | |
597 | "able to execute it. Maybe git-%s is broken?" | |
598 | msgstr "" | |
599 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
600 | "可能是 git-%s 受损?" | |
601 | ||
7aea43ff | 602 | #: help.c:368 |
8ada9598 | 603 | msgid "Uh oh. Your system reports no Git commands at all." |
81809b99 | 604 | msgstr "唉呀,您的系统中未发现 Git 命令。" |
8ada9598 | 605 | |
7aea43ff | 606 | #: help.c:390 |
8ada9598 JX |
607 | #, c-format |
608 | msgid "" | |
609 | "WARNING: You called a Git command named '%s', which does not exist.\n" | |
610 | "Continuing under the assumption that you meant '%s'" | |
611 | msgstr "" | |
81809b99 JX |
612 | "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" |
613 | "是 '%s'" | |
8ada9598 | 614 | |
7aea43ff | 615 | #: help.c:395 |
8ada9598 JX |
616 | #, c-format |
617 | msgid "in %0.1f seconds automatically..." | |
81809b99 | 618 | msgstr "在 %0.1f 秒钟后自动运行..." |
8ada9598 | 619 | |
7aea43ff | 620 | #: help.c:402 |
8ada9598 JX |
621 | #, c-format |
622 | msgid "git: '%s' is not a git command. See 'git --help'." | |
81809b99 | 623 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" |
8ada9598 | 624 | |
7aea43ff | 625 | #: help.c:406 help.c:466 |
8ada9598 JX |
626 | msgid "" |
627 | "\n" | |
628 | "Did you mean this?" | |
629 | msgid_plural "" | |
630 | "\n" | |
631 | "Did you mean one of these?" | |
632 | msgstr[0] "" | |
81809b99 JX |
633 | "\n" |
634 | "您指的是这个么?" | |
635 | msgstr[1] "" | |
636 | "\n" | |
195febda | 637 | "您指的是这其中的某一个么?" |
8ada9598 | 638 | |
7aea43ff | 639 | #: help.c:462 |
2e8451e8 JX |
640 | #, c-format |
641 | msgid "%s: %s - %s" | |
642 | msgstr "%s:%s - %s" | |
643 | ||
7aea43ff | 644 | #: lockfile.c:345 |
220c313c JX |
645 | msgid "BUG: reopen a lockfile that is still open" |
646 | msgstr "BUG: 重新打开一个仍打开着的锁文件" | |
647 | ||
7aea43ff | 648 | #: lockfile.c:347 |
220c313c JX |
649 | msgid "BUG: reopen a lockfile that has been committed" |
650 | msgstr "BUG: 重新打开一个已提交的锁文件" | |
651 | ||
652 | #: merge.c:41 | |
07432cef WS |
653 | msgid "failed to read the cache" |
654 | msgstr "无法读取缓存" | |
655 | ||
5bb01d4f JX |
656 | #: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587 |
657 | #: builtin/clone.c:647 | |
07432cef WS |
658 | msgid "unable to write new index file" |
659 | msgstr "无法写新的索引文件" | |
660 | ||
220c313c | 661 | #: merge-recursive.c:189 |
649900bc JX |
662 | #, c-format |
663 | msgid "(bad commit)\n" | |
664 | msgstr "(坏提交)\n" | |
665 | ||
220c313c | 666 | #: merge-recursive.c:209 |
649900bc JX |
667 | #, c-format |
668 | msgid "addinfo_cache failed for path '%s'" | |
669 | msgstr "为路径 '%s' addinfo_cache 失败" | |
670 | ||
220c313c | 671 | #: merge-recursive.c:270 |
649900bc JX |
672 | msgid "error building trees" |
673 | msgstr "无法创建树" | |
674 | ||
7aea43ff | 675 | #: merge-recursive.c:687 |
649900bc JX |
676 | #, c-format |
677 | msgid "failed to create path '%s'%s" | |
678 | msgstr "无法创建路径 '%s'%s" | |
679 | ||
7aea43ff | 680 | #: merge-recursive.c:698 |
649900bc JX |
681 | #, c-format |
682 | msgid "Removing %s to make room for subdirectory\n" | |
683 | msgstr "删除 %s 以便为子目录留出空间\n" | |
684 | ||
7aea43ff | 685 | #: merge-recursive.c:712 merge-recursive.c:733 |
649900bc JX |
686 | msgid ": perhaps a D/F conflict?" |
687 | msgstr ":可能是一个目录/文件冲突?" | |
688 | ||
7aea43ff | 689 | #: merge-recursive.c:723 |
649900bc JX |
690 | #, c-format |
691 | msgid "refusing to lose untracked file at '%s'" | |
692 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
693 | ||
7aea43ff | 694 | #: merge-recursive.c:763 |
649900bc JX |
695 | #, c-format |
696 | msgid "cannot read object %s '%s'" | |
697 | msgstr "不能读取对象 %s '%s'" | |
698 | ||
7aea43ff | 699 | #: merge-recursive.c:765 |
649900bc JX |
700 | #, c-format |
701 | msgid "blob expected for %s '%s'" | |
07432cef | 702 | msgstr "%s '%s' 应为数据(blob)对象" |
649900bc | 703 | |
5bb01d4f | 704 | #: merge-recursive.c:788 builtin/clone.c:306 |
649900bc JX |
705 | #, c-format |
706 | msgid "failed to open '%s'" | |
707 | msgstr "无法打开 '%s'" | |
708 | ||
7aea43ff | 709 | #: merge-recursive.c:796 |
649900bc JX |
710 | #, c-format |
711 | msgid "failed to symlink '%s'" | |
712 | msgstr "无法创建符号链接 '%s'" | |
713 | ||
7aea43ff | 714 | #: merge-recursive.c:799 |
649900bc JX |
715 | #, c-format |
716 | msgid "do not know what to do with %06o %s '%s'" | |
717 | msgstr "不知道如何处理 %06o %s '%s'" | |
718 | ||
7aea43ff | 719 | #: merge-recursive.c:937 |
649900bc JX |
720 | msgid "Failed to execute internal merge" |
721 | msgstr "无法执行内部合并" | |
722 | ||
7aea43ff | 723 | #: merge-recursive.c:941 |
649900bc JX |
724 | #, c-format |
725 | msgid "Unable to add %s to database" | |
726 | msgstr "不能添加 %s 至对象库" | |
727 | ||
7aea43ff | 728 | #: merge-recursive.c:957 |
649900bc JX |
729 | msgid "unsupported object type in the tree" |
730 | msgstr "在树中有不支持的对象类型" | |
731 | ||
7aea43ff | 732 | #: merge-recursive.c:1032 merge-recursive.c:1046 |
649900bc JX |
733 | #, c-format |
734 | msgid "" | |
735 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
736 | "in tree." | |
737 | msgstr "" | |
738 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" | |
739 | "的版本被保留。" | |
740 | ||
7aea43ff | 741 | #: merge-recursive.c:1038 merge-recursive.c:1051 |
649900bc JX |
742 | #, c-format |
743 | msgid "" | |
744 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
745 | "in tree at %s." | |
746 | msgstr "" | |
747 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" | |
748 | "的版本保留于 %8$s 中。" | |
749 | ||
7aea43ff | 750 | #: merge-recursive.c:1092 |
649900bc JX |
751 | msgid "rename" |
752 | msgstr "重命名" | |
753 | ||
7aea43ff | 754 | #: merge-recursive.c:1092 |
649900bc JX |
755 | msgid "renamed" |
756 | msgstr "重命名" | |
757 | ||
7aea43ff | 758 | #: merge-recursive.c:1148 |
649900bc JX |
759 | #, c-format |
760 | msgid "%s is a directory in %s adding as %s instead" | |
761 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
762 | ||
7aea43ff | 763 | #: merge-recursive.c:1170 |
649900bc JX |
764 | #, c-format |
765 | msgid "" | |
766 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" | |
767 | "\"->\"%s\" in \"%s\"%s" | |
768 | msgstr "" | |
769 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " | |
770 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" | |
771 | ||
7aea43ff | 772 | #: merge-recursive.c:1175 |
649900bc JX |
773 | msgid " (left unresolved)" |
774 | msgstr "(留下未解决)" | |
775 | ||
7aea43ff | 776 | #: merge-recursive.c:1229 |
649900bc JX |
777 | #, c-format |
778 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" | |
779 | msgstr "" | |
780 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" | |
781 | "%5$s" | |
782 | ||
7aea43ff | 783 | #: merge-recursive.c:1259 |
649900bc JX |
784 | #, c-format |
785 | msgid "Renaming %s to %s and %s to %s instead" | |
07432cef | 786 | msgstr "而是重命名 %s 至 %s,以及 %s 至 %s" |
649900bc | 787 | |
7aea43ff | 788 | #: merge-recursive.c:1458 |
649900bc JX |
789 | #, c-format |
790 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" | |
791 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
792 | ||
7aea43ff | 793 | #: merge-recursive.c:1468 |
649900bc JX |
794 | #, c-format |
795 | msgid "Adding merged %s" | |
796 | msgstr "添加合并后的 %s" | |
797 | ||
7aea43ff | 798 | #: merge-recursive.c:1473 merge-recursive.c:1671 |
649900bc JX |
799 | #, c-format |
800 | msgid "Adding as %s instead" | |
801 | msgstr "而是以 %s 为名添加" | |
802 | ||
7aea43ff | 803 | #: merge-recursive.c:1524 |
649900bc JX |
804 | #, c-format |
805 | msgid "cannot read object %s" | |
806 | msgstr "不能读取对象 %s" | |
807 | ||
7aea43ff | 808 | #: merge-recursive.c:1527 |
649900bc JX |
809 | #, c-format |
810 | msgid "object %s is not a blob" | |
07432cef | 811 | msgstr "对象 %s 不是一个数据(blob)对象" |
649900bc | 812 | |
7aea43ff | 813 | #: merge-recursive.c:1575 |
649900bc JX |
814 | msgid "modify" |
815 | msgstr "修改" | |
816 | ||
7aea43ff | 817 | #: merge-recursive.c:1575 |
649900bc JX |
818 | msgid "modified" |
819 | msgstr "修改" | |
820 | ||
7aea43ff | 821 | #: merge-recursive.c:1585 |
649900bc JX |
822 | msgid "content" |
823 | msgstr "内容" | |
824 | ||
7aea43ff | 825 | #: merge-recursive.c:1592 |
649900bc JX |
826 | msgid "add/add" |
827 | msgstr "添加/添加" | |
828 | ||
7aea43ff | 829 | #: merge-recursive.c:1626 |
649900bc JX |
830 | #, c-format |
831 | msgid "Skipped %s (merged same as existing)" | |
832 | msgstr "略过 %s(已经做过相同合并)" | |
833 | ||
7aea43ff | 834 | #: merge-recursive.c:1640 |
649900bc JX |
835 | #, c-format |
836 | msgid "Auto-merging %s" | |
837 | msgstr "自动合并 %s" | |
838 | ||
7aea43ff | 839 | #: merge-recursive.c:1644 git-submodule.sh:1150 |
649900bc JX |
840 | msgid "submodule" |
841 | msgstr "子模组" | |
842 | ||
7aea43ff | 843 | #: merge-recursive.c:1645 |
649900bc JX |
844 | #, c-format |
845 | msgid "CONFLICT (%s): Merge conflict in %s" | |
846 | msgstr "冲突(%s):合并冲突于 %s" | |
847 | ||
7aea43ff | 848 | #: merge-recursive.c:1731 |
649900bc JX |
849 | #, c-format |
850 | msgid "Removing %s" | |
851 | msgstr "删除 %s" | |
852 | ||
7aea43ff | 853 | #: merge-recursive.c:1756 |
649900bc JX |
854 | msgid "file/directory" |
855 | msgstr "文件/目录" | |
856 | ||
7aea43ff | 857 | #: merge-recursive.c:1762 |
649900bc JX |
858 | msgid "directory/file" |
859 | msgstr "目录/文件" | |
860 | ||
7aea43ff | 861 | #: merge-recursive.c:1767 |
649900bc JX |
862 | #, c-format |
863 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" | |
864 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
865 | ||
7aea43ff | 866 | #: merge-recursive.c:1777 |
649900bc JX |
867 | #, c-format |
868 | msgid "Adding %s" | |
869 | msgstr "添加 %s" | |
870 | ||
7aea43ff | 871 | #: merge-recursive.c:1794 |
649900bc JX |
872 | msgid "Fatal merge failure, shouldn't happen." |
873 | msgstr "严重的合并错误,不应发生。" | |
874 | ||
7aea43ff | 875 | #: merge-recursive.c:1813 |
649900bc JX |
876 | msgid "Already up-to-date!" |
877 | msgstr "已经是最新的!" | |
878 | ||
7aea43ff | 879 | #: merge-recursive.c:1822 |
649900bc JX |
880 | #, c-format |
881 | msgid "merging of trees %s and %s failed" | |
882 | msgstr "无法合并树 %s 和 %s" | |
883 | ||
7aea43ff | 884 | #: merge-recursive.c:1852 |
649900bc JX |
885 | #, c-format |
886 | msgid "Unprocessed path??? %s" | |
887 | msgstr "未处理的路径??? %s" | |
888 | ||
7aea43ff | 889 | #: merge-recursive.c:1900 |
649900bc JX |
890 | msgid "Merging:" |
891 | msgstr "合并:" | |
892 | ||
7aea43ff | 893 | #: merge-recursive.c:1913 |
649900bc | 894 | #, c-format |
e5e38ce4 JX |
895 | msgid "found %u common ancestor:" |
896 | msgid_plural "found %u common ancestors:" | |
897 | msgstr[0] "发现 %u 个共同祖先:" | |
898 | msgstr[1] "发现 %u 个共同祖先:" | |
649900bc | 899 | |
7aea43ff | 900 | #: merge-recursive.c:1950 |
649900bc JX |
901 | msgid "merge returned no commit" |
902 | msgstr "合并未返回提交" | |
903 | ||
7aea43ff | 904 | #: merge-recursive.c:2007 |
649900bc JX |
905 | #, c-format |
906 | msgid "Could not parse object '%s'" | |
907 | msgstr "不能解析对象 '%s'" | |
908 | ||
7aea43ff | 909 | #: merge-recursive.c:2018 builtin/merge.c:645 |
649900bc JX |
910 | msgid "Unable to write index." |
911 | msgstr "不能写入索引。" | |
912 | ||
6acbf033 | 913 | #: notes-utils.c:41 |
2e8451e8 JX |
914 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
915 | msgstr "不能提交未初始化/未引用的注解树" | |
916 | ||
04cb2f28 | 917 | #: notes-utils.c:82 |
2e8451e8 JX |
918 | #, c-format |
919 | msgid "Bad notes.rewriteMode value: '%s'" | |
920 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
921 | ||
04cb2f28 | 922 | #: notes-utils.c:92 |
2e8451e8 JX |
923 | #, c-format |
924 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" | |
925 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
926 | ||
927 | #. TRANSLATORS: The first %s is the name of the | |
928 | #. environment variable, the second %s is its value | |
04cb2f28 | 929 | #: notes-utils.c:119 |
2e8451e8 JX |
930 | #, c-format |
931 | msgid "Bad %s value: '%s'" | |
932 | msgstr "坏的 %s 值:'%s'" | |
933 | ||
7aea43ff | 934 | #: object.c:242 |
1003b3a5 JX |
935 | #, c-format |
936 | msgid "unable to parse object: %s" | |
937 | msgstr "不能解析对象:%s" | |
938 | ||
220c313c | 939 | #: parse-options.c:546 |
8ada9598 | 940 | msgid "..." |
81809b99 | 941 | msgstr "..." |
8ada9598 | 942 | |
220c313c | 943 | #: parse-options.c:564 |
81809b99 | 944 | #, c-format |
8ada9598 | 945 | msgid "usage: %s" |
81809b99 | 946 | msgstr "用法:%s" |
8ada9598 JX |
947 | |
948 | #. TRANSLATORS: the colon here should align with the | |
949 | #. one in "usage: %s" translation | |
220c313c | 950 | #: parse-options.c:568 |
81809b99 | 951 | #, c-format |
8ada9598 | 952 | msgid " or: %s" |
81809b99 | 953 | msgstr " 或:%s" |
8ada9598 JX |
954 | |
955 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
220c313c | 956 | #: parse-options.c:571 |
81809b99 | 957 | #, c-format |
8ada9598 | 958 | msgid " %s" |
81809b99 | 959 | msgstr " %s" |
8ada9598 | 960 | |
220c313c | 961 | #: parse-options.c:605 |
63af42fe JX |
962 | msgid "-NUM" |
963 | msgstr "-数字" | |
964 | ||
cfff71a9 | 965 | #: pathspec.c:133 |
90314792 JX |
966 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
967 | msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容" | |
968 | ||
cfff71a9 | 969 | #: pathspec.c:143 |
90314792 JX |
970 | msgid "" |
971 | "global 'literal' pathspec setting is incompatible with all other global " | |
972 | "pathspec settings" | |
973 | msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容" | |
974 | ||
cfff71a9 | 975 | #: pathspec.c:177 |
90314792 JX |
976 | msgid "invalid parameter for pathspec magic 'prefix'" |
977 | msgstr "路径规则包含无效的神奇前缀" | |
978 | ||
cfff71a9 | 979 | #: pathspec.c:183 |
90314792 JX |
980 | #, c-format |
981 | msgid "Invalid pathspec magic '%.*s' in '%s'" | |
982 | msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" | |
983 | ||
cfff71a9 | 984 | #: pathspec.c:187 |
90314792 JX |
985 | #, c-format |
986 | msgid "Missing ')' at the end of pathspec magic in '%s'" | |
987 | msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'" | |
988 | ||
cfff71a9 | 989 | #: pathspec.c:205 |
90314792 JX |
990 | #, c-format |
991 | msgid "Unimplemented pathspec magic '%c' in '%s'" | |
992 | msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'" | |
993 | ||
cfff71a9 | 994 | #: pathspec.c:230 |
a77c07d9 | 995 | #, c-format |
90314792 JX |
996 | msgid "%s: 'literal' and 'glob' are incompatible" |
997 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
a77c07d9 | 998 | |
cfff71a9 | 999 | #: pathspec.c:241 |
a77c07d9 | 1000 | #, c-format |
90314792 JX |
1001 | msgid "%s: '%s' is outside repository" |
1002 | msgstr "%s:'%s' 在版本库之外" | |
a77c07d9 | 1003 | |
cfff71a9 | 1004 | #: pathspec.c:291 |
90314792 JX |
1005 | #, c-format |
1006 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
1007 | msgstr "路径规则 '%s' 在子模组 '%.*s' 中" | |
1008 | ||
cfff71a9 | 1009 | #: pathspec.c:353 |
90314792 JX |
1010 | #, c-format |
1011 | msgid "%s: pathspec magic not supported by this command: %s" | |
1012 | msgstr "%s:路径规则神奇前缀不被此命令支持:%s" | |
1013 | ||
6acbf033 | 1014 | #: pathspec.c:432 |
90314792 JX |
1015 | #, c-format |
1016 | msgid "pathspec '%s' is beyond a symbolic link" | |
1017 | msgstr "路径规则 '%s' 位于符号链接中" | |
1018 | ||
6acbf033 | 1019 | #: pathspec.c:441 |
cfff71a9 JX |
1020 | msgid "" |
1021 | "There is nothing to exclude from by :(exclude) patterns.\n" | |
1022 | "Perhaps you forgot to add either ':/' or '.' ?" | |
1023 | msgstr "" | |
1024 | "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" | |
1025 | "添加 ':/' 或 '.' ?" | |
1026 | ||
220c313c JX |
1027 | #: pretty.c:968 |
1028 | msgid "unable to parse --pretty format" | |
1029 | msgstr "不能解析 --pretty 格式" | |
1030 | ||
7aea43ff | 1031 | #: progress.c:236 |
6c94aba5 JX |
1032 | msgid "done" |
1033 | msgstr "完成" | |
1034 | ||
7aea43ff | 1035 | #: read-cache.c:1295 |
6c94aba5 JX |
1036 | #, c-format |
1037 | msgid "" | |
1038 | "index.version set, but the value is invalid.\n" | |
1039 | "Using version %i" | |
1040 | msgstr "" | |
1041 | "设置了 index.version,但是取值无效。\n" | |
1042 | "使用版本 %i" | |
1043 | ||
7aea43ff | 1044 | #: read-cache.c:1305 |
6c94aba5 JX |
1045 | #, c-format |
1046 | msgid "" | |
1047 | "GIT_INDEX_VERSION set, but the value is invalid.\n" | |
1048 | "Using version %i" | |
1049 | msgstr "" | |
1050 | "设置了 GIT_INDEX_VERSION,但是取值无效。\n" | |
1051 | "使用版本 %i" | |
1052 | ||
7aea43ff | 1053 | #: remote.c:792 |
cfff71a9 JX |
1054 | #, c-format |
1055 | msgid "Cannot fetch both %s and %s to %s" | |
1056 | msgstr "不能同时获取 %s 和 %s 至 %s" | |
1057 | ||
7aea43ff | 1058 | #: remote.c:796 |
cfff71a9 JX |
1059 | #, c-format |
1060 | msgid "%s usually tracks %s, not %s" | |
1061 | msgstr "%s 通常跟踪 %s,而非 %s" | |
1062 | ||
7aea43ff | 1063 | #: remote.c:800 |
cfff71a9 JX |
1064 | #, c-format |
1065 | msgid "%s tracks both %s and %s" | |
1066 | msgstr "%s 同时跟踪 %s 和 %s" | |
1067 | ||
7aea43ff | 1068 | #: remote.c:808 |
cfff71a9 JX |
1069 | msgid "Internal error" |
1070 | msgstr "内部错误" | |
1071 | ||
7aea43ff JX |
1072 | #: remote.c:1723 remote.c:1766 |
1073 | msgid "HEAD does not point to a branch" | |
1074 | msgstr "HEAD 没有指向一个分支" | |
1075 | ||
1076 | #: remote.c:1732 | |
1077 | #, c-format | |
1078 | msgid "no such branch: '%s'" | |
1079 | msgstr "没有此分支:'%s'" | |
1080 | ||
1081 | #: remote.c:1735 | |
1082 | #, c-format | |
1083 | msgid "no upstream configured for branch '%s'" | |
1084 | msgstr "尚未给分支 '%s' 设置上游" | |
1085 | ||
1086 | #: remote.c:1741 | |
1087 | #, c-format | |
1088 | msgid "upstream branch '%s' not stored as a remote-tracking branch" | |
1089 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
1090 | ||
1091 | #: remote.c:1756 | |
1092 | #, c-format | |
1093 | msgid "push destination '%s' on remote '%s' has no local tracking branch" | |
1094 | msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" | |
1095 | ||
1096 | #: remote.c:1771 | |
1097 | #, c-format | |
1098 | msgid "branch '%s' has no remote for pushing" | |
1099 | msgstr "分支 '%s' 没有设置要推送的远程服务器" | |
1100 | ||
1101 | #: remote.c:1782 | |
1102 | #, c-format | |
1103 | msgid "push refspecs for '%s' do not include '%s'" | |
1104 | msgstr "向 '%s' 推送引用表达式未包含 '%s'" | |
1105 | ||
1106 | #: remote.c:1795 | |
1107 | msgid "push has no destination (push.default is 'nothing')" | |
1108 | msgstr "推送无目标(push.default 是 'nothing')" | |
1109 | ||
1110 | #: remote.c:1817 | |
1111 | msgid "cannot resolve 'simple' push to a single destination" | |
1112 | msgstr "无法解析 'simple' 推送至一个单独的目标" | |
1113 | ||
1114 | #: remote.c:2124 | |
90314792 JX |
1115 | #, c-format |
1116 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
1117 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
1118 | ||
7aea43ff | 1119 | #: remote.c:2128 |
90314792 JX |
1120 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
1121 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
1122 | ||
7aea43ff | 1123 | #: remote.c:2131 |
90314792 JX |
1124 | #, c-format |
1125 | msgid "Your branch is up-to-date with '%s'.\n" | |
1126 | msgstr "您的分支与上游分支 '%s' 一致。\n" | |
1127 | ||
7aea43ff | 1128 | #: remote.c:2135 |
c04f5ac3 JX |
1129 | #, c-format |
1130 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
1131 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
1132 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
5ae481e0 | 1133 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" |
c04f5ac3 | 1134 | |
7aea43ff | 1135 | #: remote.c:2141 |
07432cef WS |
1136 | msgid " (use \"git push\" to publish your local commits)\n" |
1137 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
1138 | ||
7aea43ff | 1139 | #: remote.c:2144 |
c04f5ac3 JX |
1140 | #, c-format |
1141 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
1142 | msgid_plural "" | |
1143 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
90e6ef53 | 1144 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
5ae481e0 | 1145 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
c04f5ac3 | 1146 | |
07432cef | 1147 | # 译者:注意保持前导空格 |
7aea43ff | 1148 | #: remote.c:2152 |
07432cef WS |
1149 | msgid " (use \"git pull\" to update your local branch)\n" |
1150 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
1151 | ||
7aea43ff | 1152 | #: remote.c:2155 |
c04f5ac3 JX |
1153 | #, c-format |
1154 | msgid "" | |
1155 | "Your branch and '%s' have diverged,\n" | |
1156 | "and have %d and %d different commit each, respectively.\n" | |
1157 | msgid_plural "" | |
1158 | "Your branch and '%s' have diverged,\n" | |
1159 | "and have %d and %d different commits each, respectively.\n" | |
1160 | msgstr[0] "" | |
1161 | "您的分支和 '%s' 出现了偏离,\n" | |
195febda | 1162 | "并且分别有 %d 和 %d 处不同的提交。\n" |
5ae481e0 JX |
1163 | msgstr[1] "" |
1164 | "您的分支和 '%s' 出现了偏离,\n" | |
195febda | 1165 | "并且分别有 %d 和 %d 处不同的提交。\n" |
c04f5ac3 | 1166 | |
07432cef | 1167 | # 译者:注意保持前导空格 |
7aea43ff | 1168 | #: remote.c:2165 |
07432cef WS |
1169 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
1170 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
1171 | ||
7aea43ff | 1172 | #: revision.c:2366 |
814ff314 JX |
1173 | msgid "--first-parent is incompatible with --bisect" |
1174 | msgstr "--first-parent 与 --bisect 不兼容" | |
1175 | ||
1176 | #: run-command.c:83 | |
2e8451e8 JX |
1177 | msgid "open /dev/null failed" |
1178 | msgstr "不能打开 /dev/null" | |
1179 | ||
814ff314 | 1180 | #: run-command.c:85 |
2e8451e8 JX |
1181 | #, c-format |
1182 | msgid "dup2(%d,%d) failed" | |
1183 | msgstr "不能调用 dup2(%d,%d)" | |
1184 | ||
814ff314 | 1185 | #: send-pack.c:272 |
220c313c JX |
1186 | msgid "failed to sign the push certificate" |
1187 | msgstr "无法为推送证书签名" | |
1188 | ||
7aea43ff | 1189 | #: send-pack.c:378 |
220c313c JX |
1190 | msgid "the receiving end does not support --signed push" |
1191 | msgstr "接收端不支持签名推送" | |
1192 | ||
7aea43ff | 1193 | #: send-pack.c:389 |
44f518e6 JX |
1194 | msgid "the receiving end does not support --atomic push" |
1195 | msgstr "接收端不支持原子推送" | |
814ff314 | 1196 | |
7aea43ff JX |
1197 | #: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 |
1198 | #: builtin/merge.c:983 | |
c04f5ac3 JX |
1199 | #, c-format |
1200 | msgid "Could not open '%s' for writing" | |
90e6ef53 | 1201 | msgstr "不能为写入打开 '%s'" |
c04f5ac3 | 1202 | |
7aea43ff JX |
1203 | #: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 |
1204 | #: builtin/merge.c:988 | |
c04f5ac3 JX |
1205 | #, c-format |
1206 | msgid "Could not write to '%s'" | |
90e6ef53 | 1207 | msgstr "不能写入 '%s'" |
c04f5ac3 | 1208 | |
220c313c | 1209 | #: sequencer.c:195 |
14c8bced JX |
1210 | msgid "" |
1211 | "after resolving the conflicts, mark the corrected paths\n" | |
1212 | "with 'git add <paths>' or 'git rm <paths>'" | |
1213 | msgstr "" | |
d9d56b23 | 1214 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" |
14c8bced JX |
1215 | "命令标记修正后的文件" |
1216 | ||
220c313c | 1217 | #: sequencer.c:198 |
c04f5ac3 JX |
1218 | msgid "" |
1219 | "after resolving the conflicts, mark the corrected paths\n" | |
1220 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
1221 | "and commit the result with 'git commit'" | |
1222 | msgstr "" | |
d9d56b23 | 1223 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" |
c04f5ac3 JX |
1224 | "对修正后的文件做标记,然后用 'git commit' 提交" |
1225 | ||
814ff314 | 1226 | #: sequencer.c:211 sequencer.c:861 sequencer.c:944 |
c04f5ac3 JX |
1227 | #, c-format |
1228 | msgid "Could not write to %s" | |
1229 | msgstr "不能写入 %s" | |
1230 | ||
220c313c | 1231 | #: sequencer.c:214 |
c04f5ac3 JX |
1232 | #, c-format |
1233 | msgid "Error wrapping up %s" | |
1234 | msgstr "错误收尾 %s" | |
1235 | ||
220c313c | 1236 | #: sequencer.c:229 |
c04f5ac3 JX |
1237 | msgid "Your local changes would be overwritten by cherry-pick." |
1238 | msgstr "您的本地修改将被拣选操作覆盖。" | |
1239 | ||
220c313c | 1240 | #: sequencer.c:231 |
c04f5ac3 JX |
1241 | msgid "Your local changes would be overwritten by revert." |
1242 | msgstr "您的本地修改将被还原操作覆盖。" | |
1243 | ||
220c313c | 1244 | #: sequencer.c:234 |
c04f5ac3 JX |
1245 | msgid "Commit your changes or stash them to proceed." |
1246 | msgstr "提交您的修改或保存进度后再继续。" | |
1247 | ||
1248 | #. TRANSLATORS: %s will be "revert" or "cherry-pick" | |
04cb2f28 | 1249 | #: sequencer.c:321 |
c04f5ac3 JX |
1250 | #, c-format |
1251 | msgid "%s: Unable to write new index file" | |
90e6ef53 | 1252 | msgstr "%s:无法写入新索引文件" |
c04f5ac3 | 1253 | |
04cb2f28 | 1254 | #: sequencer.c:339 |
8ada9598 | 1255 | msgid "Could not resolve HEAD commit\n" |
81809b99 | 1256 | msgstr "不能解析 HEAD 提交\n" |
8ada9598 | 1257 | |
04cb2f28 | 1258 | #: sequencer.c:359 |
8ada9598 | 1259 | msgid "Unable to update cache tree\n" |
81809b99 | 1260 | msgstr "不能更新缓存\n" |
8ada9598 | 1261 | |
814ff314 | 1262 | #: sequencer.c:411 |
81809b99 | 1263 | #, c-format |
8ada9598 | 1264 | msgid "Could not parse commit %s\n" |
81809b99 | 1265 | msgstr "不能解析提交 %s\n" |
8ada9598 | 1266 | |
814ff314 | 1267 | #: sequencer.c:416 |
81809b99 | 1268 | #, c-format |
8ada9598 | 1269 | msgid "Could not parse parent commit %s\n" |
81809b99 | 1270 | msgstr "不能解析父提交 %s\n" |
8ada9598 | 1271 | |
814ff314 | 1272 | #: sequencer.c:482 |
c04f5ac3 | 1273 | msgid "Your index file is unmerged." |
90e6ef53 | 1274 | msgstr "您的索引文件未完成合并。" |
c04f5ac3 | 1275 | |
814ff314 | 1276 | #: sequencer.c:501 |
c04f5ac3 JX |
1277 | #, c-format |
1278 | msgid "Commit %s is a merge but no -m option was given." | |
1279 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
1280 | ||
814ff314 | 1281 | #: sequencer.c:509 |
c04f5ac3 JX |
1282 | #, c-format |
1283 | msgid "Commit %s does not have parent %d" | |
1284 | msgstr "提交 %s 没有父提交 %d" | |
1285 | ||
814ff314 | 1286 | #: sequencer.c:513 |
c04f5ac3 JX |
1287 | #, c-format |
1288 | msgid "Mainline was specified but commit %s is not a merge." | |
90e6ef53 | 1289 | msgstr "指定了主线但提交 %s 不是一个合并。" |
c04f5ac3 JX |
1290 | |
1291 | #. TRANSLATORS: The first %s will be "revert" or | |
1292 | #. "cherry-pick", the second %s a SHA1 | |
814ff314 | 1293 | #: sequencer.c:526 |
c04f5ac3 JX |
1294 | #, c-format |
1295 | msgid "%s: cannot parse parent commit %s" | |
1296 | msgstr "%s:不能解析父提交 %s" | |
1297 | ||
814ff314 | 1298 | #: sequencer.c:530 |
c04f5ac3 JX |
1299 | #, c-format |
1300 | msgid "Cannot get commit message for %s" | |
1301 | msgstr "不能得到 %s 的提交说明" | |
1302 | ||
814ff314 | 1303 | #: sequencer.c:616 |
c04f5ac3 JX |
1304 | #, c-format |
1305 | msgid "could not revert %s... %s" | |
1306 | msgstr "不能还原 %s... %s" | |
1307 | ||
814ff314 | 1308 | #: sequencer.c:617 |
c04f5ac3 JX |
1309 | #, c-format |
1310 | msgid "could not apply %s... %s" | |
1311 | msgstr "不能应用 %s... %s" | |
1312 | ||
814ff314 | 1313 | #: sequencer.c:653 |
c04f5ac3 JX |
1314 | msgid "empty commit set passed" |
1315 | msgstr "提供了空的提交集" | |
1316 | ||
814ff314 | 1317 | #: sequencer.c:661 |
c04f5ac3 JX |
1318 | #, c-format |
1319 | msgid "git %s: failed to read the index" | |
90e6ef53 | 1320 | msgstr "git %s:无法读取索引" |
c04f5ac3 | 1321 | |
814ff314 | 1322 | #: sequencer.c:665 |
c04f5ac3 JX |
1323 | #, c-format |
1324 | msgid "git %s: failed to refresh the index" | |
90e6ef53 | 1325 | msgstr "git %s:无法刷新索引" |
c04f5ac3 | 1326 | |
814ff314 | 1327 | #: sequencer.c:725 |
c04f5ac3 JX |
1328 | #, c-format |
1329 | msgid "Cannot %s during a %s" | |
90e6ef53 | 1330 | msgstr "无法 %s 在一个 %s 过程中" |
c04f5ac3 | 1331 | |
814ff314 | 1332 | #: sequencer.c:747 |
c04f5ac3 JX |
1333 | #, c-format |
1334 | msgid "Could not parse line %d." | |
90e6ef53 | 1335 | msgstr "不能解析第 %d 行。" |
c04f5ac3 | 1336 | |
814ff314 | 1337 | #: sequencer.c:752 |
c04f5ac3 | 1338 | msgid "No commits parsed." |
7e238ab7 | 1339 | msgstr "没有提交被解析。" |
c04f5ac3 | 1340 | |
814ff314 | 1341 | #: sequencer.c:765 |
c04f5ac3 JX |
1342 | #, c-format |
1343 | msgid "Could not open %s" | |
1344 | msgstr "不能打开 %s" | |
1345 | ||
814ff314 | 1346 | #: sequencer.c:769 |
c04f5ac3 JX |
1347 | #, c-format |
1348 | msgid "Could not read %s." | |
1349 | msgstr "不能读取 %s。" | |
1350 | ||
814ff314 | 1351 | #: sequencer.c:776 |
c04f5ac3 JX |
1352 | #, c-format |
1353 | msgid "Unusable instruction sheet: %s" | |
1354 | msgstr "无用的指令表单:%s" | |
1355 | ||
814ff314 | 1356 | #: sequencer.c:806 |
c04f5ac3 JX |
1357 | #, c-format |
1358 | msgid "Invalid key: %s" | |
1359 | msgstr "无效键名:%s" | |
1360 | ||
814ff314 | 1361 | #: sequencer.c:809 |
c04f5ac3 JX |
1362 | #, c-format |
1363 | msgid "Invalid value for %s: %s" | |
81809b99 | 1364 | msgstr "%s 的值无效:%s" |
c04f5ac3 | 1365 | |
814ff314 | 1366 | #: sequencer.c:821 |
c04f5ac3 JX |
1367 | #, c-format |
1368 | msgid "Malformed options sheet: %s" | |
1369 | msgstr "非法的选项表单:%s" | |
1370 | ||
814ff314 | 1371 | #: sequencer.c:842 |
c04f5ac3 JX |
1372 | msgid "a cherry-pick or revert is already in progress" |
1373 | msgstr "一个拣选或还原操作已在进行" | |
1374 | ||
814ff314 | 1375 | #: sequencer.c:843 |
c04f5ac3 JX |
1376 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
1377 | msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" | |
1378 | ||
814ff314 | 1379 | #: sequencer.c:847 |
c04f5ac3 JX |
1380 | #, c-format |
1381 | msgid "Could not create sequencer directory %s" | |
90e6ef53 | 1382 | msgstr "不能创建序列目录 %s" |
c04f5ac3 | 1383 | |
814ff314 | 1384 | #: sequencer.c:863 sequencer.c:948 |
c04f5ac3 JX |
1385 | #, c-format |
1386 | msgid "Error wrapping up %s." | |
1387 | msgstr "错误收尾 %s。" | |
1388 | ||
814ff314 | 1389 | #: sequencer.c:882 sequencer.c:1018 |
c04f5ac3 | 1390 | msgid "no cherry-pick or revert in progress" |
195febda | 1391 | msgstr "拣选或还原操作并未进行" |
c04f5ac3 | 1392 | |
814ff314 | 1393 | #: sequencer.c:884 |
c04f5ac3 JX |
1394 | msgid "cannot resolve HEAD" |
1395 | msgstr "不能解析 HEAD" | |
1396 | ||
814ff314 | 1397 | #: sequencer.c:886 |
c04f5ac3 | 1398 | msgid "cannot abort from a branch yet to be born" |
90e6ef53 | 1399 | msgstr "不能从尚未建立的分支终止" |
c04f5ac3 | 1400 | |
7aea43ff | 1401 | #: sequencer.c:908 builtin/apply.c:4291 |
c04f5ac3 JX |
1402 | #, c-format |
1403 | msgid "cannot open %s: %s" | |
1404 | msgstr "不能打开 %s:%s" | |
1405 | ||
814ff314 | 1406 | #: sequencer.c:911 |
c04f5ac3 JX |
1407 | #, c-format |
1408 | msgid "cannot read %s: %s" | |
1409 | msgstr "不能读取 %s:%s" | |
1410 | ||
814ff314 | 1411 | #: sequencer.c:912 |
c04f5ac3 | 1412 | msgid "unexpected end of file" |
9aafc933 | 1413 | msgstr "意外的文件结束" |
c04f5ac3 | 1414 | |
814ff314 | 1415 | #: sequencer.c:918 |
c04f5ac3 JX |
1416 | #, c-format |
1417 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
90e6ef53 | 1418 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" |
c04f5ac3 | 1419 | |
814ff314 | 1420 | #: sequencer.c:941 |
c04f5ac3 JX |
1421 | #, c-format |
1422 | msgid "Could not format %s." | |
1423 | msgstr "不能格式化 %s。" | |
1424 | ||
814ff314 | 1425 | #: sequencer.c:1086 |
4dcdc3d8 JX |
1426 | #, c-format |
1427 | msgid "%s: can't cherry-pick a %s" | |
1428 | msgstr "%s:不能拣选一个%s" | |
1429 | ||
814ff314 | 1430 | #: sequencer.c:1089 |
4dcdc3d8 JX |
1431 | #, c-format |
1432 | msgid "%s: bad revision" | |
1433 | msgstr "%s:错误的版本" | |
1434 | ||
814ff314 | 1435 | #: sequencer.c:1123 |
c04f5ac3 JX |
1436 | msgid "Can't revert as initial commit" |
1437 | msgstr "不能作为初始提交还原" | |
1438 | ||
814ff314 | 1439 | #: sequencer.c:1124 |
c04f5ac3 JX |
1440 | msgid "Can't cherry-pick into empty head" |
1441 | msgstr "不能拣选到空分支" | |
1442 | ||
7aea43ff JX |
1443 | #: setup.c:243 |
1444 | #, c-format | |
1445 | msgid "failed to read %s" | |
1446 | msgstr "无法读取 %s" | |
1447 | ||
1448 | #: sha1_name.c:453 | |
2e8451e8 JX |
1449 | msgid "" |
1450 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
1451 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
1452 | "may be created by mistake. For example,\n" | |
1453 | "\n" | |
1454 | " git checkout -b $br $(git rev-parse ...)\n" | |
1455 | "\n" | |
1456 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
1457 | "examine these refs and maybe delete them. Turn this message off by\n" | |
b1894384 | 1458 | "running \"git config advice.objectNameWarning false\"" |
2e8451e8 JX |
1459 | msgstr "" |
1460 | "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n" | |
1461 | "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n" | |
1462 | "\n" | |
1463 | " git checkout -b $br $(git rev-parse ...)\n" | |
1464 | "\n" | |
1465 | "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n" | |
b1894384 | 1466 | "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" |
2e8451e8 JX |
1467 | "命令关闭本消息通知。" |
1468 | ||
90314792 JX |
1469 | #: submodule.c:64 submodule.c:98 |
1470 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" | |
1471 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
1472 | ||
1473 | #: submodule.c:68 submodule.c:102 | |
1474 | #, c-format | |
1475 | msgid "Could not find section in .gitmodules where path=%s" | |
1476 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
1477 | ||
90314792 JX |
1478 | #: submodule.c:76 |
1479 | #, c-format | |
1480 | msgid "Could not update .gitmodules entry %s" | |
1481 | msgstr "不能更新 .gitmodules 条目 %s" | |
1482 | ||
90314792 JX |
1483 | #: submodule.c:109 |
1484 | #, c-format | |
1485 | msgid "Could not remove .gitmodules entry for %s" | |
1486 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
1487 | ||
6c94aba5 | 1488 | #: submodule.c:120 |
90314792 JX |
1489 | msgid "staging updated .gitmodules failed" |
1490 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
1491 | ||
7aea43ff | 1492 | #: submodule.c:1115 |
90314792 JX |
1493 | #, c-format |
1494 | msgid "Could not set core.worktree in %s" | |
1495 | msgstr "不能在 %s 中设置 core.worktree" | |
1496 | ||
814ff314 JX |
1497 | #: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 |
1498 | #: trailer.c:561 | |
220c313c JX |
1499 | #, c-format |
1500 | msgid "unknown value '%s' for key '%s'" | |
1501 | msgstr "键 '%2$s' 的未知取值 '%1$s'" | |
1502 | ||
814ff314 | 1503 | #: trailer.c:543 trailer.c:548 builtin/remote.c:290 |
220c313c JX |
1504 | #, c-format |
1505 | msgid "more than one %s" | |
1506 | msgstr "多于一个 %s" | |
1507 | ||
814ff314 | 1508 | #: trailer.c:581 |
220c313c | 1509 | #, c-format |
9aeb4c2b JX |
1510 | msgid "empty trailer token in trailer '%.*s'" |
1511 | msgstr "签名 '%.*s' 的键为空" | |
220c313c | 1512 | |
814ff314 | 1513 | #: trailer.c:701 |
220c313c JX |
1514 | #, c-format |
1515 | msgid "could not read input file '%s'" | |
1516 | msgstr "不能读取输入文件 '%s'" | |
1517 | ||
814ff314 | 1518 | #: trailer.c:704 |
220c313c JX |
1519 | msgid "could not read from stdin" |
1520 | msgstr "不能自标准输入读取" | |
1521 | ||
7aea43ff | 1522 | #: unpack-trees.c:203 |
6c94aba5 JX |
1523 | msgid "Checking out files" |
1524 | msgstr "正在检出文件" | |
1525 | ||
90314792 JX |
1526 | #: urlmatch.c:120 |
1527 | msgid "invalid URL scheme name or missing '://' suffix" | |
1528 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
1529 | ||
1530 | #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 | |
1531 | #, c-format | |
1532 | msgid "invalid %XX escape sequence" | |
1533 | msgstr "无效的 %XX 转义序列" | |
1534 | ||
1535 | #: urlmatch.c:172 | |
1536 | msgid "missing host and scheme is not 'file:'" | |
1537 | msgstr "缺失主机名且URL方案不是 'file:'" | |
1538 | ||
1539 | #: urlmatch.c:189 | |
1540 | msgid "a 'file:' URL may not have a port number" | |
1541 | msgstr "一个 'file:' URL 不应该包含端口号" | |
1542 | ||
1543 | #: urlmatch.c:199 | |
1544 | msgid "invalid characters in host name" | |
1545 | msgstr "主机名中包含无效的字符" | |
1546 | ||
1547 | #: urlmatch.c:244 urlmatch.c:255 | |
1548 | msgid "invalid port number" | |
1549 | msgstr "无效的端口号" | |
1550 | ||
1551 | #: urlmatch.c:322 | |
1552 | msgid "invalid '..' path segment" | |
1553 | msgstr "无效的 '..' 路径片段" | |
1554 | ||
814ff314 | 1555 | #: wrapper.c:523 |
07432cef | 1556 | #, c-format |
ef317cd5 | 1557 | msgid "unable to access '%s': %s" |
07432cef WS |
1558 | msgstr "不能访问 '%s':%s" |
1559 | ||
814ff314 | 1560 | #: wrapper.c:544 |
07432cef WS |
1561 | #, c-format |
1562 | msgid "unable to access '%s'" | |
1563 | msgstr "不能访问 '%s'" | |
ef317cd5 | 1564 | |
814ff314 | 1565 | #: wrapper.c:555 |
d691f479 JX |
1566 | #, c-format |
1567 | msgid "unable to look up current user in the passwd file: %s" | |
07432cef | 1568 | msgstr "无法在口令文件中查询到当前用户:%s" |
d691f479 | 1569 | |
814ff314 | 1570 | #: wrapper.c:556 |
d691f479 JX |
1571 | msgid "no such user" |
1572 | msgstr "无此用户" | |
1573 | ||
814ff314 | 1574 | #: wrapper.c:564 |
220c313c JX |
1575 | msgid "unable to get current working directory" |
1576 | msgstr "不能获取当前工作目录" | |
1577 | ||
7aea43ff JX |
1578 | #: wrapper.c:575 |
1579 | #, c-format | |
1580 | msgid "could not open %s for writing" | |
1581 | msgstr "不能写入 %s" | |
1582 | ||
1583 | #: wrapper.c:587 | |
1584 | #, c-format | |
1585 | msgid "could not write to %s" | |
1586 | msgstr "不能写入 %s" | |
1587 | ||
1588 | #: wrapper.c:593 | |
1589 | #, c-format | |
1590 | msgid "could not close %s" | |
1591 | msgstr "不能关闭 %s" | |
1592 | ||
cfff71a9 | 1593 | #: wt-status.c:150 |
c04f5ac3 JX |
1594 | msgid "Unmerged paths:" |
1595 | msgstr "未合并的路径:" | |
1596 | ||
90e6ef53 | 1597 | # 译者:注意保持前导空格 |
cfff71a9 | 1598 | #: wt-status.c:177 wt-status.c:204 |
c04f5ac3 JX |
1599 | #, c-format |
1600 | msgid " (use \"git reset %s <file>...\" to unstage)" | |
d9d56b23 | 1601 | msgstr " (使用 \"git reset %s <文件>...\" 撤出暂存区)" |
c04f5ac3 | 1602 | |
90e6ef53 | 1603 | # 译者:注意保持前导空格 |
cfff71a9 | 1604 | #: wt-status.c:179 wt-status.c:206 |
c04f5ac3 | 1605 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
d9d56b23 | 1606 | msgstr " (使用 \"git rm --cached <文件>...\" 撤出暂存区)" |
c04f5ac3 | 1607 | |
90e6ef53 | 1608 | # 译者:注意保持前导空格 |
cfff71a9 | 1609 | #: wt-status.c:183 |
6792b93b | 1610 | msgid " (use \"git add <file>...\" to mark resolution)" |
d9d56b23 | 1611 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" |
6792b93b JX |
1612 | |
1613 | # 译者:注意保持前导空格 | |
cfff71a9 | 1614 | #: wt-status.c:185 wt-status.c:189 |
c04f5ac3 | 1615 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
d9d56b23 | 1616 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" |
c04f5ac3 | 1617 | |
6792b93b | 1618 | # 译者:注意保持前导空格 |
cfff71a9 | 1619 | #: wt-status.c:187 |
6792b93b | 1620 | msgid " (use \"git rm <file>...\" to mark resolution)" |
d9d56b23 | 1621 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" |
6792b93b | 1622 | |
7aea43ff | 1623 | #: wt-status.c:198 wt-status.c:881 |
c04f5ac3 JX |
1624 | msgid "Changes to be committed:" |
1625 | msgstr "要提交的变更:" | |
1626 | ||
7aea43ff | 1627 | #: wt-status.c:216 wt-status.c:890 |
c04f5ac3 | 1628 | msgid "Changes not staged for commit:" |
7e238ab7 | 1629 | msgstr "尚未暂存以备提交的变更:" |
c04f5ac3 | 1630 | |
90e6ef53 | 1631 | # 译者:注意保持前导空格 |
cfff71a9 | 1632 | #: wt-status.c:220 |
c04f5ac3 | 1633 | msgid " (use \"git add <file>...\" to update what will be committed)" |
d9d56b23 | 1634 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" |
c04f5ac3 | 1635 | |
90e6ef53 | 1636 | # 译者:注意保持前导空格 |
cfff71a9 | 1637 | #: wt-status.c:222 |
c04f5ac3 | 1638 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
d9d56b23 | 1639 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" |
c04f5ac3 | 1640 | |
90e6ef53 | 1641 | # 译者:注意保持前导空格 |
cfff71a9 | 1642 | #: wt-status.c:223 |
c04f5ac3 JX |
1643 | msgid "" |
1644 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" | |
d9d56b23 | 1645 | msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)" |
c04f5ac3 | 1646 | |
90e6ef53 | 1647 | # 译者:注意保持前导空格 |
cfff71a9 | 1648 | #: wt-status.c:225 |
c04f5ac3 JX |
1649 | msgid " (commit or discard the untracked or modified content in submodules)" |
1650 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
1651 | ||
90e6ef53 | 1652 | # 译者:注意保持前导空格 |
cfff71a9 | 1653 | #: wt-status.c:237 |
c04f5ac3 JX |
1654 | #, c-format |
1655 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
d9d56b23 | 1656 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" |
c04f5ac3 | 1657 | |
6c94aba5 | 1658 | #: wt-status.c:252 |
c04f5ac3 JX |
1659 | msgid "both deleted:" |
1660 | msgstr "双方删除:" | |
1661 | ||
6c94aba5 | 1662 | #: wt-status.c:254 |
c04f5ac3 JX |
1663 | msgid "added by us:" |
1664 | msgstr "由我们添加:" | |
1665 | ||
6c94aba5 | 1666 | #: wt-status.c:256 |
c04f5ac3 JX |
1667 | msgid "deleted by them:" |
1668 | msgstr "由他们删除:" | |
1669 | ||
6c94aba5 | 1670 | #: wt-status.c:258 |
c04f5ac3 JX |
1671 | msgid "added by them:" |
1672 | msgstr "由他们添加:" | |
1673 | ||
6c94aba5 | 1674 | #: wt-status.c:260 |
c04f5ac3 JX |
1675 | msgid "deleted by us:" |
1676 | msgstr "由我们删除:" | |
1677 | ||
6c94aba5 | 1678 | #: wt-status.c:262 |
c04f5ac3 JX |
1679 | msgid "both added:" |
1680 | msgstr "双方添加:" | |
1681 | ||
6c94aba5 | 1682 | #: wt-status.c:264 |
c04f5ac3 JX |
1683 | msgid "both modified:" |
1684 | msgstr "双方修改:" | |
1685 | ||
6c94aba5 JX |
1686 | #: wt-status.c:266 |
1687 | #, c-format | |
1688 | msgid "bug: unhandled unmerged status %x" | |
1689 | msgstr "bug:无法处理的未合并状态 %x" | |
cfff71a9 | 1690 | |
6c94aba5 JX |
1691 | #: wt-status.c:274 |
1692 | msgid "new file:" | |
1693 | msgstr "新文件:" | |
cfff71a9 | 1694 | |
6c94aba5 JX |
1695 | #: wt-status.c:276 |
1696 | msgid "copied:" | |
1697 | msgstr "拷贝:" | |
cfff71a9 | 1698 | |
6c94aba5 JX |
1699 | #: wt-status.c:278 |
1700 | msgid "deleted:" | |
1701 | msgstr "删除:" | |
cfff71a9 | 1702 | |
6c94aba5 JX |
1703 | #: wt-status.c:280 |
1704 | msgid "modified:" | |
1705 | msgstr "修改:" | |
1706 | ||
1707 | #: wt-status.c:282 | |
1708 | msgid "renamed:" | |
1709 | msgstr "重命名:" | |
1710 | ||
1711 | #: wt-status.c:284 | |
1712 | msgid "typechange:" | |
1713 | msgstr "类型变更:" | |
1714 | ||
1715 | #: wt-status.c:286 | |
1716 | msgid "unknown:" | |
1717 | msgstr "未知:" | |
cfff71a9 | 1718 | |
6c94aba5 JX |
1719 | #: wt-status.c:288 |
1720 | msgid "unmerged:" | |
1721 | msgstr "未合并:" | |
cfff71a9 | 1722 | |
90e6ef53 | 1723 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
6c94aba5 | 1724 | #: wt-status.c:370 |
c04f5ac3 | 1725 | msgid "new commits, " |
aa9565f7 | 1726 | msgstr "新提交, " |
c04f5ac3 | 1727 | |
90e6ef53 | 1728 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
6c94aba5 | 1729 | #: wt-status.c:372 |
c04f5ac3 | 1730 | msgid "modified content, " |
aa9565f7 | 1731 | msgstr "修改的内容, " |
c04f5ac3 | 1732 | |
90e6ef53 | 1733 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
6c94aba5 | 1734 | #: wt-status.c:374 |
c04f5ac3 | 1735 | msgid "untracked content, " |
aa9565f7 | 1736 | msgstr "未跟踪的内容, " |
c04f5ac3 | 1737 | |
6c94aba5 | 1738 | #: wt-status.c:391 |
c04f5ac3 JX |
1739 | #, c-format |
1740 | msgid "bug: unhandled diff status %c" | |
6c94aba5 | 1741 | msgstr "bug:无法处理的差异状态 %c" |
c04f5ac3 | 1742 | |
7aea43ff | 1743 | #: wt-status.c:755 |
90314792 JX |
1744 | msgid "Submodules changed but not updated:" |
1745 | msgstr "子模组已修改但尚未更新:" | |
1746 | ||
7aea43ff | 1747 | #: wt-status.c:757 |
90314792 JX |
1748 | msgid "Submodule changes to be committed:" |
1749 | msgstr "要提交的子模组变更:" | |
1750 | ||
7aea43ff | 1751 | #: wt-status.c:838 |
cfff71a9 JX |
1752 | msgid "" |
1753 | "Do not touch the line above.\n" | |
1754 | "Everything below will be removed." | |
1755 | msgstr "" | |
1756 | "不要改动上面的一行。\n" | |
1757 | "下面的所有内容均将被删除。" | |
1758 | ||
7aea43ff | 1759 | #: wt-status.c:949 |
6792b93b | 1760 | msgid "You have unmerged paths." |
195febda | 1761 | msgstr "您有尚未合并的路径。" |
6792b93b JX |
1762 | |
1763 | # 译者:注意保持前导空格 | |
7aea43ff | 1764 | #: wt-status.c:952 |
6792b93b JX |
1765 | msgid " (fix conflicts and run \"git commit\")" |
1766 | msgstr " (解决冲突并运行 \"git commit\")" | |
1767 | ||
7aea43ff | 1768 | #: wt-status.c:955 |
6792b93b JX |
1769 | msgid "All conflicts fixed but you are still merging." |
1770 | msgstr "所有冲突已解决但您仍处于合并中。" | |
1771 | ||
1772 | # 译者:注意保持前导空格 | |
7aea43ff | 1773 | #: wt-status.c:958 |
6792b93b JX |
1774 | msgid " (use \"git commit\" to conclude merge)" |
1775 | msgstr " (使用 \"git commit\" 结束合并)" | |
1776 | ||
7aea43ff | 1777 | #: wt-status.c:968 |
6792b93b | 1778 | msgid "You are in the middle of an am session." |
98b2761d | 1779 | msgstr "您正处于 am 操作过程中。" |
6792b93b | 1780 | |
7aea43ff | 1781 | #: wt-status.c:971 |
6792b93b JX |
1782 | msgid "The current patch is empty." |
1783 | msgstr "当前的补丁为空。" | |
1784 | ||
1785 | # 译者:注意保持前导空格 | |
7aea43ff | 1786 | #: wt-status.c:975 |
2e8451e8 JX |
1787 | msgid " (fix conflicts and then run \"git am --continue\")" |
1788 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
6792b93b JX |
1789 | |
1790 | # 译者:注意保持前导空格 | |
7aea43ff | 1791 | #: wt-status.c:977 |
6792b93b JX |
1792 | msgid " (use \"git am --skip\" to skip this patch)" |
1793 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
1794 | ||
1795 | # 译者:注意保持前导空格 | |
7aea43ff | 1796 | #: wt-status.c:979 |
6792b93b JX |
1797 | msgid " (use \"git am --abort\" to restore the original branch)" |
1798 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
1799 | ||
7aea43ff | 1800 | #: wt-status.c:1039 wt-status.c:1056 |
63af42fe JX |
1801 | #, c-format |
1802 | msgid "You are currently rebasing branch '%s' on '%s'." | |
98b2761d | 1803 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" |
63af42fe | 1804 | |
7aea43ff | 1805 | #: wt-status.c:1044 wt-status.c:1061 |
6792b93b | 1806 | msgid "You are currently rebasing." |
98b2761d | 1807 | msgstr "您在执行变基操作。" |
6792b93b JX |
1808 | |
1809 | # 译者:注意保持前导空格 | |
7aea43ff | 1810 | #: wt-status.c:1047 |
6792b93b JX |
1811 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
1812 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
1813 | ||
1814 | # 译者:注意保持前导空格 | |
7aea43ff | 1815 | #: wt-status.c:1049 |
6792b93b JX |
1816 | msgid " (use \"git rebase --skip\" to skip this patch)" |
1817 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
1818 | ||
1819 | # 译者:注意保持前导空格 | |
7aea43ff | 1820 | #: wt-status.c:1051 |
6792b93b JX |
1821 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
1822 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
1823 | ||
1824 | # 译者:注意保持前导空格 | |
7aea43ff | 1825 | #: wt-status.c:1064 |
6792b93b JX |
1826 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
1827 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
1828 | ||
7aea43ff | 1829 | #: wt-status.c:1068 |
63af42fe JX |
1830 | #, c-format |
1831 | msgid "" | |
1832 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." | |
98b2761d | 1833 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" |
63af42fe | 1834 | |
7aea43ff | 1835 | #: wt-status.c:1073 |
6792b93b | 1836 | msgid "You are currently splitting a commit during a rebase." |
98b2761d | 1837 | msgstr "您在执行变基操作时拆分提交。" |
6792b93b JX |
1838 | |
1839 | # 译者:注意保持前导空格 | |
7aea43ff | 1840 | #: wt-status.c:1076 |
6792b93b JX |
1841 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
1842 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
1843 | ||
7aea43ff | 1844 | #: wt-status.c:1080 |
63af42fe JX |
1845 | #, c-format |
1846 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
98b2761d | 1847 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" |
63af42fe | 1848 | |
7aea43ff | 1849 | #: wt-status.c:1085 |
6792b93b | 1850 | msgid "You are currently editing a commit during a rebase." |
98b2761d | 1851 | msgstr "您在执行变基操作时编辑提交。" |
6792b93b JX |
1852 | |
1853 | # 译者:注意保持前导空格 | |
7aea43ff | 1854 | #: wt-status.c:1088 |
6792b93b JX |
1855 | msgid " (use \"git commit --amend\" to amend the current commit)" |
1856 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
1857 | ||
1858 | # 译者:注意保持前导空格 | |
7aea43ff | 1859 | #: wt-status.c:1090 |
6792b93b JX |
1860 | msgid "" |
1861 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
195febda | 1862 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" |
6792b93b | 1863 | |
7aea43ff | 1864 | #: wt-status.c:1100 |
90314792 JX |
1865 | #, c-format |
1866 | msgid "You are currently cherry-picking commit %s." | |
98b2761d | 1867 | msgstr "您在执行拣选提交 %s 的操作。" |
6792b93b | 1868 | |
2e8451e8 | 1869 | # 译者:注意保持前导空格 |
7aea43ff | 1870 | #: wt-status.c:1105 |
2e8451e8 JX |
1871 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
1872 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
1873 | ||
6792b93b | 1874 | # 译者:注意保持前导空格 |
7aea43ff | 1875 | #: wt-status.c:1108 |
2e8451e8 JX |
1876 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
1877 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
6792b93b | 1878 | |
2e8451e8 | 1879 | # 译者:注意保持前导空格 |
7aea43ff | 1880 | #: wt-status.c:1110 |
2e8451e8 JX |
1881 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
1882 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
1883 | ||
7aea43ff | 1884 | #: wt-status.c:1119 |
1003b3a5 JX |
1885 | #, c-format |
1886 | msgid "You are currently reverting commit %s." | |
98b2761d | 1887 | msgstr "您在执行反转提交 %s 的操作。" |
1003b3a5 JX |
1888 | |
1889 | # 译者:注意保持前导空格 | |
7aea43ff | 1890 | #: wt-status.c:1124 |
1003b3a5 JX |
1891 | msgid " (fix conflicts and run \"git revert --continue\")" |
1892 | msgstr " (解决冲突并运行 \"git revert --continue\")" | |
1893 | ||
1894 | # 译者:注意保持前导空格 | |
7aea43ff | 1895 | #: wt-status.c:1127 |
1003b3a5 JX |
1896 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
1897 | msgstr " (所有冲突已解决:运行 \"git revert --continue\")" | |
1898 | ||
1899 | # 译者:注意保持前导空格 | |
7aea43ff | 1900 | #: wt-status.c:1129 |
1003b3a5 JX |
1901 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
1902 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
1903 | ||
7aea43ff | 1904 | #: wt-status.c:1140 |
63af42fe | 1905 | #, c-format |
1003b3a5 | 1906 | msgid "You are currently bisecting, started from branch '%s'." |
98b2761d | 1907 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" |
63af42fe | 1908 | |
7aea43ff | 1909 | #: wt-status.c:1144 |
6792b93b | 1910 | msgid "You are currently bisecting." |
98b2761d | 1911 | msgstr "您在执行二分查找操作。" |
6792b93b JX |
1912 | |
1913 | # 译者:注意保持前导空格 | |
7aea43ff | 1914 | #: wt-status.c:1147 |
6792b93b JX |
1915 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
1916 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
1917 | ||
7aea43ff | 1918 | #: wt-status.c:1324 |
c04f5ac3 JX |
1919 | msgid "On branch " |
1920 | msgstr "位于分支 " | |
1921 | ||
7aea43ff | 1922 | #: wt-status.c:1331 |
2e8451e8 | 1923 | msgid "rebase in progress; onto " |
98b2761d | 1924 | msgstr "变基操作正在进行中;至 " |
2e8451e8 | 1925 | |
7aea43ff | 1926 | #: wt-status.c:1336 |
1003b3a5 JX |
1927 | msgid "HEAD detached at " |
1928 | msgstr "头指针分离于 " | |
1929 | ||
7aea43ff | 1930 | #: wt-status.c:1338 |
1003b3a5 JX |
1931 | msgid "HEAD detached from " |
1932 | msgstr "头指针分离自 " | |
1933 | ||
7aea43ff | 1934 | #: wt-status.c:1341 |
c04f5ac3 JX |
1935 | msgid "Not currently on any branch." |
1936 | msgstr "当前不在任何分支上。" | |
1937 | ||
7aea43ff | 1938 | #: wt-status.c:1358 |
c04f5ac3 JX |
1939 | msgid "Initial commit" |
1940 | msgstr "初始提交" | |
1941 | ||
7aea43ff | 1942 | #: wt-status.c:1372 |
ef317cd5 | 1943 | msgid "Untracked files" |
07432cef | 1944 | msgstr "未跟踪的文件" |
c04f5ac3 | 1945 | |
7aea43ff | 1946 | #: wt-status.c:1374 |
ef317cd5 | 1947 | msgid "Ignored files" |
07432cef | 1948 | msgstr "忽略的文件" |
c04f5ac3 | 1949 | |
7aea43ff | 1950 | #: wt-status.c:1378 |
1003b3a5 | 1951 | #, c-format |
4dcdc3d8 JX |
1952 | msgid "" |
1953 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
1954 | "may speed it up, but you have to be careful not to forget to add\n" | |
1955 | "new files yourself (see 'git help status')." | |
1956 | msgstr "" | |
1957 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
1958 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1003b3a5 | 1959 | |
7aea43ff | 1960 | #: wt-status.c:1384 |
c04f5ac3 JX |
1961 | #, c-format |
1962 | msgid "Untracked files not listed%s" | |
1963 | msgstr "未跟踪的文件没有列出%s" | |
1964 | ||
7e238ab7 | 1965 | # 译者:中文字符串拼接,可删除前导空格 |
7aea43ff | 1966 | #: wt-status.c:1386 |
c04f5ac3 | 1967 | msgid " (use -u option to show untracked files)" |
7e238ab7 | 1968 | msgstr "(使用 -u 参数显示未跟踪的文件)" |
c04f5ac3 | 1969 | |
7aea43ff | 1970 | #: wt-status.c:1392 |
c04f5ac3 JX |
1971 | msgid "No changes" |
1972 | msgstr "没有修改" | |
1973 | ||
7aea43ff | 1974 | #: wt-status.c:1397 |
07432cef | 1975 | #, c-format |
ef317cd5 | 1976 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" |
07432cef | 1977 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" |
c04f5ac3 | 1978 | |
7aea43ff | 1979 | #: wt-status.c:1400 |
07432cef | 1980 | #, c-format |
ef317cd5 | 1981 | msgid "no changes added to commit\n" |
07432cef | 1982 | msgstr "修改尚未加入提交\n" |
c04f5ac3 | 1983 | |
7aea43ff | 1984 | #: wt-status.c:1403 |
07432cef | 1985 | #, c-format |
ef317cd5 JX |
1986 | msgid "" |
1987 | "nothing added to commit but untracked files present (use \"git add\" to " | |
1988 | "track)\n" | |
07432cef | 1989 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" |
c04f5ac3 | 1990 | |
7aea43ff | 1991 | #: wt-status.c:1406 |
07432cef | 1992 | #, c-format |
ef317cd5 | 1993 | msgid "nothing added to commit but untracked files present\n" |
07432cef | 1994 | msgstr "提交为空,但是存在尚未跟踪的文件\n" |
c04f5ac3 | 1995 | |
7e238ab7 | 1996 | # 译者:中文字符串拼接,可删除前导空格 |
7aea43ff | 1997 | #: wt-status.c:1409 |
07432cef | 1998 | #, c-format |
ef317cd5 | 1999 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" |
07432cef | 2000 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" |
c04f5ac3 | 2001 | |
7aea43ff | 2002 | #: wt-status.c:1412 wt-status.c:1417 |
07432cef | 2003 | #, c-format |
ef317cd5 | 2004 | msgid "nothing to commit\n" |
07432cef | 2005 | msgstr "无文件要提交\n" |
ef317cd5 | 2006 | |
7e238ab7 | 2007 | # 译者:中文字符串拼接,可删除前导空格 |
7aea43ff | 2008 | #: wt-status.c:1415 |
07432cef | 2009 | #, c-format |
ef317cd5 | 2010 | msgid "nothing to commit (use -u to show untracked files)\n" |
07432cef | 2011 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" |
c04f5ac3 | 2012 | |
7e238ab7 | 2013 | # 译者:中文字符串拼接,可删除前导空格 |
7aea43ff | 2014 | #: wt-status.c:1419 |
07432cef | 2015 | #, c-format |
ef317cd5 | 2016 | msgid "nothing to commit, working directory clean\n" |
07432cef | 2017 | msgstr "无文件要提交,干净的工作区\n" |
c04f5ac3 | 2018 | |
7aea43ff | 2019 | #: wt-status.c:1528 |
c04f5ac3 | 2020 | msgid "HEAD (no branch)" |
61bc0753 | 2021 | msgstr "HEAD(非分支)" |
c04f5ac3 | 2022 | |
90e6ef53 | 2023 | # 译者:注意保持句尾空格 |
7aea43ff | 2024 | #: wt-status.c:1534 |
c04f5ac3 JX |
2025 | msgid "Initial commit on " |
2026 | msgstr "初始提交于 " | |
2027 | ||
7aea43ff | 2028 | #: wt-status.c:1561 |
90314792 JX |
2029 | msgid "gone" |
2030 | msgstr "丢失" | |
2031 | ||
90e6ef53 | 2032 | # 译者:注意保持句尾空格 |
7aea43ff | 2033 | #: wt-status.c:1563 wt-status.c:1571 |
c04f5ac3 JX |
2034 | msgid "behind " |
2035 | msgstr "落后 " | |
2036 | ||
5bb01d4f | 2037 | #: compat/precompose_utf8.c:55 builtin/clone.c:345 |
a77c07d9 JX |
2038 | #, c-format |
2039 | msgid "failed to unlink '%s'" | |
2040 | msgstr "无法删除 '%s'" | |
2041 | ||
220c313c | 2042 | #: builtin/add.c:22 |
814ff314 JX |
2043 | msgid "git add [<options>] [--] <pathspec>..." |
2044 | msgstr "git add [<选项>] [--] <路径规则>..." | |
ef317cd5 | 2045 | |
220c313c | 2046 | #: builtin/add.c:65 |
c04f5ac3 JX |
2047 | #, c-format |
2048 | msgid "unexpected diff status %c" | |
2049 | msgstr "意外的差异状态 %c" | |
2050 | ||
44f518e6 | 2051 | #: builtin/add.c:70 builtin/commit.c:277 |
c04f5ac3 JX |
2052 | msgid "updating files failed" |
2053 | msgstr "更新文件失败" | |
2054 | ||
220c313c | 2055 | #: builtin/add.c:80 |
c04f5ac3 JX |
2056 | #, c-format |
2057 | msgid "remove '%s'\n" | |
2058 | msgstr "删除 '%s'\n" | |
2059 | ||
220c313c | 2060 | #: builtin/add.c:134 |
c04f5ac3 | 2061 | msgid "Unstaged changes after refreshing the index:" |
90e6ef53 | 2062 | msgstr "刷新索引之后尚未被暂存的变更:" |
c04f5ac3 | 2063 | |
7aea43ff | 2064 | #: builtin/add.c:194 builtin/rev-parse.c:796 |
c04f5ac3 | 2065 | msgid "Could not read the index" |
90e6ef53 | 2066 | msgstr "不能读取索引" |
c04f5ac3 | 2067 | |
220c313c | 2068 | #: builtin/add.c:205 |
c04f5ac3 JX |
2069 | #, c-format |
2070 | msgid "Could not open '%s' for writing." | |
195febda | 2071 | msgstr "不能打开 '%s' 以写入。" |
c04f5ac3 | 2072 | |
220c313c | 2073 | #: builtin/add.c:209 |
c04f5ac3 | 2074 | msgid "Could not write patch" |
195febda | 2075 | msgstr "不能生成补丁" |
c04f5ac3 | 2076 | |
7aea43ff JX |
2077 | #: builtin/add.c:212 |
2078 | msgid "editing patch failed" | |
2079 | msgstr "编辑补丁失败" | |
2080 | ||
2081 | #: builtin/add.c:215 | |
c04f5ac3 JX |
2082 | #, c-format |
2083 | msgid "Could not stat '%s'" | |
90e6ef53 | 2084 | msgstr "不能查看文件状态 '%s'" |
c04f5ac3 | 2085 | |
7aea43ff | 2086 | #: builtin/add.c:217 |
c04f5ac3 JX |
2087 | msgid "Empty patch. Aborted." |
2088 | msgstr "空补丁。异常终止。" | |
2089 | ||
7aea43ff | 2090 | #: builtin/add.c:222 |
8ada9598 JX |
2091 | #, c-format |
2092 | msgid "Could not apply '%s'" | |
2093 | msgstr "不能应用 '%s'" | |
2094 | ||
7aea43ff | 2095 | #: builtin/add.c:232 |
8ada9598 | 2096 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
195febda | 2097 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" |
8ada9598 | 2098 | |
7aea43ff JX |
2099 | #: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110 |
2100 | #: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369 | |
2101 | #: builtin/rm.c:268 | |
ef317cd5 | 2102 | msgid "dry run" |
07432cef | 2103 | msgstr "演习" |
ef317cd5 | 2104 | |
7aea43ff JX |
2105 | #: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19 |
2106 | #: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616 | |
220c313c | 2107 | #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 |
ef317cd5 JX |
2108 | msgid "be verbose" |
2109 | msgstr "冗长输出" | |
2110 | ||
7aea43ff | 2111 | #: builtin/add.c:252 |
ef317cd5 | 2112 | msgid "interactive picking" |
07432cef | 2113 | msgstr "交互式拣选" |
ef317cd5 | 2114 | |
5bb01d4f | 2115 | #: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286 |
ef317cd5 | 2116 | msgid "select hunks interactively" |
07432cef | 2117 | msgstr "交互式挑选数据块" |
ef317cd5 | 2118 | |
7aea43ff | 2119 | #: builtin/add.c:254 |
ef317cd5 | 2120 | msgid "edit current diff and apply" |
07432cef | 2121 | msgstr "编辑当前差异并应用" |
ef317cd5 | 2122 | |
7aea43ff | 2123 | #: builtin/add.c:255 |
ef317cd5 | 2124 | msgid "allow adding otherwise ignored files" |
07432cef | 2125 | msgstr "允许添加忽略的文件" |
ef317cd5 | 2126 | |
7aea43ff | 2127 | #: builtin/add.c:256 |
ef317cd5 | 2128 | msgid "update tracked files" |
07432cef | 2129 | msgstr "更新已跟踪的文件" |
ef317cd5 | 2130 | |
7aea43ff | 2131 | #: builtin/add.c:257 |
ef317cd5 | 2132 | msgid "record only the fact that the path will be added later" |
07432cef | 2133 | msgstr "只记录,该路径稍后再添加" |
ef317cd5 | 2134 | |
7aea43ff | 2135 | #: builtin/add.c:258 |
ef317cd5 | 2136 | msgid "add changes from all tracked and untracked files" |
07432cef | 2137 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" |
ef317cd5 | 2138 | |
7aea43ff | 2139 | #: builtin/add.c:261 |
4dcdc3d8 JX |
2140 | msgid "ignore paths removed in the working tree (same as --no-all)" |
2141 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
2142 | ||
7aea43ff | 2143 | #: builtin/add.c:263 |
ef317cd5 | 2144 | msgid "don't add, only refresh the index" |
07432cef | 2145 | msgstr "不添加,只刷新索引" |
ef317cd5 | 2146 | |
7aea43ff | 2147 | #: builtin/add.c:264 |
ef317cd5 | 2148 | msgid "just skip files which cannot be added because of errors" |
07432cef | 2149 | msgstr "跳过因出错不能添加的文件" |
ef317cd5 | 2150 | |
7aea43ff | 2151 | #: builtin/add.c:265 |
ef317cd5 | 2152 | msgid "check if - even missing - files are ignored in dry run" |
07432cef | 2153 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" |
ef317cd5 | 2154 | |
7aea43ff | 2155 | #: builtin/add.c:287 |
8ada9598 JX |
2156 | #, c-format |
2157 | msgid "Use -f if you really want to add them.\n" | |
2158 | msgstr "使用 -f 参数如果您确实要添加它们。\n" | |
2159 | ||
7aea43ff | 2160 | #: builtin/add.c:294 |
8ada9598 JX |
2161 | msgid "adding files failed" |
2162 | msgstr "添加文件失败" | |
2163 | ||
7aea43ff | 2164 | #: builtin/add.c:330 |
8ada9598 JX |
2165 | msgid "-A and -u are mutually incompatible" |
2166 | msgstr "-A 和 -u 选项互斥" | |
2167 | ||
7aea43ff | 2168 | #: builtin/add.c:337 |
8ada9598 | 2169 | msgid "Option --ignore-missing can only be used together with --dry-run" |
649900bc | 2170 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" |
8ada9598 | 2171 | |
7aea43ff | 2172 | #: builtin/add.c:358 |
8ada9598 JX |
2173 | #, c-format |
2174 | msgid "Nothing specified, nothing added.\n" | |
2175 | msgstr "没有指定文件,也没有文件被添加。\n" | |
2176 | ||
7aea43ff | 2177 | #: builtin/add.c:359 |
8ada9598 JX |
2178 | #, c-format |
2179 | msgid "Maybe you wanted to say 'git add .'?\n" | |
2180 | msgstr "也许您想要执行 'git add .'?\n" | |
2181 | ||
7aea43ff JX |
2182 | #: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918 |
2183 | #: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 | |
8ada9598 JX |
2184 | msgid "index file corrupt" |
2185 | msgstr "索引文件损坏" | |
2186 | ||
7aea43ff | 2187 | #: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430 |
8ada9598 JX |
2188 | msgid "Unable to write new index file" |
2189 | msgstr "无法写入新索引文件" | |
2190 | ||
814ff314 JX |
2191 | #: builtin/apply.c:59 |
2192 | msgid "git apply [<options>] [<patch>...]" | |
2193 | msgstr "git apply [<选项>] [<补丁>...]" | |
8ada9598 | 2194 | |
814ff314 | 2195 | #: builtin/apply.c:112 |
81809b99 | 2196 | #, c-format |
8ada9598 | 2197 | msgid "unrecognized whitespace option '%s'" |
81809b99 | 2198 | msgstr "未能识别的空白字符选项 '%s'" |
8ada9598 | 2199 | |
814ff314 | 2200 | #: builtin/apply.c:127 |
81809b99 | 2201 | #, c-format |
8ada9598 | 2202 | msgid "unrecognized whitespace ignore option '%s'" |
81809b99 | 2203 | msgstr "未能识别的空白字符忽略选项 '%s'" |
8ada9598 | 2204 | |
814ff314 | 2205 | #: builtin/apply.c:822 |
8ada9598 JX |
2206 | #, c-format |
2207 | msgid "Cannot prepare timestamp regexp %s" | |
81809b99 | 2208 | msgstr "无法准备时间戳正则表达式 %s" |
8ada9598 | 2209 | |
814ff314 | 2210 | #: builtin/apply.c:831 |
8ada9598 JX |
2211 | #, c-format |
2212 | msgid "regexec returned %d for input: %s" | |
81809b99 | 2213 | msgstr "regexec 返回 %d,输入为:%s" |
8ada9598 | 2214 | |
814ff314 | 2215 | #: builtin/apply.c:912 |
81809b99 | 2216 | #, c-format |
8ada9598 | 2217 | msgid "unable to find filename in patch at line %d" |
81809b99 | 2218 | msgstr "不能在补丁的第 %d 行找到文件名" |
8ada9598 | 2219 | |
814ff314 | 2220 | #: builtin/apply.c:944 |
8ada9598 JX |
2221 | #, c-format |
2222 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" | |
9aafc933 | 2223 | msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" |
8ada9598 | 2224 | |
814ff314 | 2225 | #: builtin/apply.c:948 |
8ada9598 JX |
2226 | #, c-format |
2227 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" | |
81809b99 | 2228 | msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" |
8ada9598 | 2229 | |
814ff314 | 2230 | #: builtin/apply.c:949 |
8ada9598 JX |
2231 | #, c-format |
2232 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" | |
81809b99 | 2233 | msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" |
8ada9598 | 2234 | |
814ff314 | 2235 | #: builtin/apply.c:956 |
8ada9598 JX |
2236 | #, c-format |
2237 | msgid "git apply: bad git-diff - expected /dev/null on line %d" | |
9aafc933 | 2238 | msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" |
8ada9598 | 2239 | |
814ff314 | 2240 | #: builtin/apply.c:1419 |
8ada9598 JX |
2241 | #, c-format |
2242 | msgid "recount: unexpected line: %.*s" | |
81809b99 | 2243 | msgstr "recount:意外的行:%.*s" |
8ada9598 | 2244 | |
814ff314 | 2245 | #: builtin/apply.c:1476 |
8ada9598 JX |
2246 | #, c-format |
2247 | msgid "patch fragment without header at line %d: %.*s" | |
81809b99 | 2248 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" |
8ada9598 | 2249 | |
814ff314 | 2250 | #: builtin/apply.c:1493 |
8ada9598 JX |
2251 | #, c-format |
2252 | msgid "" | |
2253 | "git diff header lacks filename information when removing %d leading pathname " | |
2254 | "component (line %d)" | |
2255 | msgid_plural "" | |
2256 | "git diff header lacks filename information when removing %d leading pathname " | |
2257 | "components (line %d)" | |
5ae481e0 JX |
2258 | msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" |
2259 | msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
8ada9598 | 2260 | |
7aea43ff | 2261 | #: builtin/apply.c:1659 |
8ada9598 | 2262 | msgid "new file depends on old contents" |
81809b99 | 2263 | msgstr "新文件依赖旧内容" |
8ada9598 | 2264 | |
7aea43ff | 2265 | #: builtin/apply.c:1661 |
8ada9598 | 2266 | msgid "deleted file still has contents" |
81809b99 | 2267 | msgstr "删除的文件仍有内容" |
8ada9598 | 2268 | |
7aea43ff | 2269 | #: builtin/apply.c:1687 |
8ada9598 JX |
2270 | #, c-format |
2271 | msgid "corrupt patch at line %d" | |
195febda | 2272 | msgstr "补丁在第 %d 行损坏" |
8ada9598 | 2273 | |
7aea43ff | 2274 | #: builtin/apply.c:1723 |
8ada9598 JX |
2275 | #, c-format |
2276 | msgid "new file %s depends on old contents" | |
81809b99 | 2277 | msgstr "新文件 %s 依赖旧内容" |
8ada9598 | 2278 | |
7aea43ff | 2279 | #: builtin/apply.c:1725 |
8ada9598 JX |
2280 | #, c-format |
2281 | msgid "deleted file %s still has contents" | |
81809b99 | 2282 | msgstr "删除的文件 %s 仍有内容" |
8ada9598 | 2283 | |
7aea43ff | 2284 | #: builtin/apply.c:1728 |
8ada9598 JX |
2285 | #, c-format |
2286 | msgid "** warning: file %s becomes empty but is not deleted" | |
81809b99 | 2287 | msgstr "** 警告:文件 %s 成为空文件但并未删除" |
8ada9598 | 2288 | |
7aea43ff | 2289 | #: builtin/apply.c:1874 |
8ada9598 JX |
2290 | #, c-format |
2291 | msgid "corrupt binary patch at line %d: %.*s" | |
81809b99 | 2292 | msgstr "二进制补丁在第 %d 行损坏:%.*s" |
8ada9598 | 2293 | |
7aea43ff | 2294 | #: builtin/apply.c:1903 |
8ada9598 JX |
2295 | #, c-format |
2296 | msgid "unrecognized binary patch at line %d" | |
81809b99 | 2297 | msgstr "未能识别的二进制补丁位于第 %d 行" |
8ada9598 | 2298 | |
7aea43ff | 2299 | #: builtin/apply.c:2054 |
8ada9598 JX |
2300 | #, c-format |
2301 | msgid "patch with only garbage at line %d" | |
81809b99 | 2302 | msgstr "补丁文件的第 %d 行只有垃圾数据" |
8ada9598 | 2303 | |
7aea43ff | 2304 | #: builtin/apply.c:2144 |
81809b99 | 2305 | #, c-format |
8ada9598 | 2306 | msgid "unable to read symlink %s" |
81809b99 | 2307 | msgstr "无法读取符号链接 %s" |
8ada9598 | 2308 | |
7aea43ff | 2309 | #: builtin/apply.c:2148 |
81809b99 | 2310 | #, c-format |
8ada9598 | 2311 | msgid "unable to open or read %s" |
81809b99 | 2312 | msgstr "不能打开或读取 %s" |
8ada9598 | 2313 | |
7aea43ff | 2314 | #: builtin/apply.c:2781 |
81809b99 | 2315 | #, c-format |
8ada9598 | 2316 | msgid "invalid start of line: '%c'" |
81809b99 | 2317 | msgstr "无效的行首字符:'%c'" |
8ada9598 | 2318 | |
7aea43ff | 2319 | #: builtin/apply.c:2900 |
8ada9598 JX |
2320 | #, c-format |
2321 | msgid "Hunk #%d succeeded at %d (offset %d line)." | |
2322 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." | |
07432cef WS |
2323 | msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" |
2324 | msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
8ada9598 | 2325 | |
7aea43ff | 2326 | #: builtin/apply.c:2912 |
8ada9598 JX |
2327 | #, c-format |
2328 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" | |
81809b99 | 2329 | msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" |
8ada9598 | 2330 | |
7aea43ff | 2331 | #: builtin/apply.c:2918 |
8ada9598 JX |
2332 | #, c-format |
2333 | msgid "" | |
2334 | "while searching for:\n" | |
2335 | "%.*s" | |
2336 | msgstr "" | |
81809b99 JX |
2337 | "当查询:\n" |
2338 | "%.*s" | |
8ada9598 | 2339 | |
7aea43ff | 2340 | #: builtin/apply.c:2938 |
8ada9598 JX |
2341 | #, c-format |
2342 | msgid "missing binary patch data for '%s'" | |
81809b99 | 2343 | msgstr "缺失 '%s' 的二进制补丁数据" |
8ada9598 | 2344 | |
7aea43ff | 2345 | #: builtin/apply.c:3039 |
8ada9598 JX |
2346 | #, c-format |
2347 | msgid "binary patch does not apply to '%s'" | |
81809b99 | 2348 | msgstr "二进制补丁未应用到 '%s'" |
8ada9598 | 2349 | |
7aea43ff | 2350 | #: builtin/apply.c:3045 |
8ada9598 JX |
2351 | #, c-format |
2352 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" | |
9aafc933 | 2353 | msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" |
8ada9598 | 2354 | |
7aea43ff | 2355 | #: builtin/apply.c:3066 |
8ada9598 JX |
2356 | #, c-format |
2357 | msgid "patch failed: %s:%ld" | |
81809b99 | 2358 | msgstr "打补丁失败:%s:%ld" |
8ada9598 | 2359 | |
7aea43ff | 2360 | #: builtin/apply.c:3190 |
8ada9598 | 2361 | #, c-format |
23ff3338 JX |
2362 | msgid "cannot checkout %s" |
2363 | msgstr "不能检出 %s" | |
8ada9598 | 2364 | |
7aea43ff | 2365 | #: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291 |
81809b99 | 2366 | #, c-format |
8ada9598 | 2367 | msgid "read of %s failed" |
81809b99 | 2368 | msgstr "读取 %s 失败" |
8ada9598 | 2369 | |
7aea43ff | 2370 | #: builtin/apply.c:3243 |
814ff314 JX |
2371 | #, c-format |
2372 | msgid "reading from '%s' beyond a symbolic link" | |
2373 | msgstr "读取位于符号链接中的 '%s'" | |
2374 | ||
7aea43ff | 2375 | #: builtin/apply.c:3271 builtin/apply.c:3493 |
81809b99 | 2376 | #, c-format |
23ff3338 JX |
2377 | msgid "path %s has been renamed/deleted" |
2378 | msgstr "路径 %s 已经被重命名/删除" | |
8ada9598 | 2379 | |
7aea43ff | 2380 | #: builtin/apply.c:3352 builtin/apply.c:3507 |
8ada9598 | 2381 | #, c-format |
23ff3338 JX |
2382 | msgid "%s: does not exist in index" |
2383 | msgstr "%s:不存在于索引中" | |
8ada9598 | 2384 | |
7aea43ff | 2385 | #: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521 |
81809b99 | 2386 | #, c-format |
8ada9598 | 2387 | msgid "%s: %s" |
81809b99 | 2388 | msgstr "%s:%s" |
8ada9598 | 2389 | |
7aea43ff | 2390 | #: builtin/apply.c:3361 builtin/apply.c:3515 |
81809b99 | 2391 | #, c-format |
8ada9598 | 2392 | msgid "%s: does not match index" |
81809b99 | 2393 | msgstr "%s:和索引不匹配" |
8ada9598 | 2394 | |
7aea43ff | 2395 | #: builtin/apply.c:3463 |
23ff3338 JX |
2396 | msgid "removal patch leaves file contents" |
2397 | msgstr "移除补丁仍留下了文件内容" | |
2398 | ||
7aea43ff | 2399 | #: builtin/apply.c:3532 |
8ada9598 JX |
2400 | #, c-format |
2401 | msgid "%s: wrong type" | |
81809b99 | 2402 | msgstr "%s:错误类型" |
8ada9598 | 2403 | |
7aea43ff | 2404 | #: builtin/apply.c:3534 |
8ada9598 JX |
2405 | #, c-format |
2406 | msgid "%s has type %o, expected %o" | |
9aafc933 | 2407 | msgstr "%s 的类型是 %o,应为 %o" |
8ada9598 | 2408 | |
7aea43ff | 2409 | #: builtin/apply.c:3693 builtin/apply.c:3695 |
814ff314 JX |
2410 | #, c-format |
2411 | msgid "invalid path '%s'" | |
2412 | msgstr "无效路径 '%s'" | |
2413 | ||
7aea43ff | 2414 | #: builtin/apply.c:3750 |
81809b99 | 2415 | #, c-format |
8ada9598 | 2416 | msgid "%s: already exists in index" |
81809b99 | 2417 | msgstr "%s:已经存在于索引中" |
8ada9598 | 2418 | |
7aea43ff | 2419 | #: builtin/apply.c:3753 |
23ff3338 JX |
2420 | #, c-format |
2421 | msgid "%s: already exists in working directory" | |
2422 | msgstr "%s:已经存在于工作区中" | |
2423 | ||
7aea43ff | 2424 | #: builtin/apply.c:3773 |
d691f479 JX |
2425 | #, c-format |
2426 | msgid "new mode (%o) of %s does not match old mode (%o)" | |
2427 | msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" | |
8ada9598 | 2428 | |
7aea43ff | 2429 | #: builtin/apply.c:3778 |
8ada9598 | 2430 | #, c-format |
d691f479 JX |
2431 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
2432 | msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" | |
2433 | ||
7aea43ff | 2434 | #: builtin/apply.c:3798 |
814ff314 JX |
2435 | #, c-format |
2436 | msgid "affected file '%s' is beyond a symbolic link" | |
2437 | msgstr "受影响的文件 '%s' 位于符号链接中" | |
2438 | ||
7aea43ff | 2439 | #: builtin/apply.c:3802 |
d691f479 | 2440 | #, c-format |
8ada9598 | 2441 | msgid "%s: patch does not apply" |
81809b99 | 2442 | msgstr "%s:补丁未应用" |
8ada9598 | 2443 | |
7aea43ff | 2444 | #: builtin/apply.c:3816 |
8ada9598 JX |
2445 | #, c-format |
2446 | msgid "Checking patch %s..." | |
81809b99 | 2447 | msgstr "检查补丁 %s..." |
8ada9598 | 2448 | |
5bb01d4f | 2449 | #: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135 |
8ada9598 JX |
2450 | #, c-format |
2451 | msgid "make_cache_entry failed for path '%s'" | |
2452 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" | |
2453 | ||
7aea43ff | 2454 | #: builtin/apply.c:4052 |
81809b99 | 2455 | #, c-format |
8ada9598 | 2456 | msgid "unable to remove %s from index" |
81809b99 | 2457 | msgstr "不能从索引中移除 %s" |
8ada9598 | 2458 | |
7aea43ff | 2459 | #: builtin/apply.c:4081 |
8ada9598 | 2460 | #, c-format |
2e8451e8 JX |
2461 | msgid "corrupt patch for submodule %s" |
2462 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 2463 | |
7aea43ff | 2464 | #: builtin/apply.c:4085 |
81809b99 | 2465 | #, c-format |
8ada9598 | 2466 | msgid "unable to stat newly created file '%s'" |
81809b99 | 2467 | msgstr "不能枚举新建文件 '%s' 的状态" |
8ada9598 | 2468 | |
7aea43ff | 2469 | #: builtin/apply.c:4090 |
8ada9598 JX |
2470 | #, c-format |
2471 | msgid "unable to create backing store for newly created file %s" | |
81809b99 | 2472 | msgstr "不能为新建文件 %s 创建后端存储" |
8ada9598 | 2473 | |
7aea43ff | 2474 | #: builtin/apply.c:4093 builtin/apply.c:4201 |
81809b99 | 2475 | #, c-format |
8ada9598 | 2476 | msgid "unable to add cache entry for %s" |
81809b99 | 2477 | msgstr "无法为 %s 添加缓存条目" |
8ada9598 | 2478 | |
7aea43ff | 2479 | #: builtin/apply.c:4126 |
81809b99 | 2480 | #, c-format |
8ada9598 | 2481 | msgid "closing file '%s'" |
81809b99 | 2482 | msgstr "关闭文件 '%s'" |
8ada9598 | 2483 | |
7aea43ff | 2484 | #: builtin/apply.c:4175 |
81809b99 | 2485 | #, c-format |
8ada9598 | 2486 | msgid "unable to write file '%s' mode %o" |
81809b99 | 2487 | msgstr "不能写文件 '%s' 权限 %o" |
8ada9598 | 2488 | |
7aea43ff | 2489 | #: builtin/apply.c:4262 |
8ada9598 JX |
2490 | #, c-format |
2491 | msgid "Applied patch %s cleanly." | |
81809b99 | 2492 | msgstr "成功应用补丁 %s。" |
8ada9598 | 2493 | |
7aea43ff | 2494 | #: builtin/apply.c:4270 |
8ada9598 | 2495 | msgid "internal error" |
81809b99 | 2496 | msgstr "内部错误" |
8ada9598 | 2497 | |
7aea43ff | 2498 | #: builtin/apply.c:4273 |
8ada9598 JX |
2499 | #, c-format |
2500 | msgid "Applying patch %%s with %d reject..." | |
2501 | msgid_plural "Applying patch %%s with %d rejects..." | |
195febda T |
2502 | msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." |
2503 | msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
8ada9598 | 2504 | |
7aea43ff | 2505 | #: builtin/apply.c:4283 |
8ada9598 JX |
2506 | #, c-format |
2507 | msgid "truncating .rej filename to %.*s.rej" | |
81809b99 | 2508 | msgstr "截短 .rej 文件名为 %.*s.rej" |
8ada9598 | 2509 | |
7aea43ff | 2510 | #: builtin/apply.c:4304 |
8ada9598 JX |
2511 | #, c-format |
2512 | msgid "Hunk #%d applied cleanly." | |
81809b99 | 2513 | msgstr "第 #%d 个片段成功应用。" |
8ada9598 | 2514 | |
7aea43ff | 2515 | #: builtin/apply.c:4307 |
8ada9598 JX |
2516 | #, c-format |
2517 | msgid "Rejected hunk #%d." | |
81809b99 | 2518 | msgstr "拒绝第 #%d 个片段。" |
8ada9598 | 2519 | |
7aea43ff | 2520 | #: builtin/apply.c:4397 |
8ada9598 | 2521 | msgid "unrecognized input" |
81809b99 | 2522 | msgstr "未能识别的输入" |
8ada9598 | 2523 | |
7aea43ff | 2524 | #: builtin/apply.c:4408 |
8ada9598 | 2525 | msgid "unable to read index file" |
81809b99 | 2526 | msgstr "无法读取索引文件" |
8ada9598 | 2527 | |
7aea43ff | 2528 | #: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85 |
814ff314 | 2529 | #: builtin/fetch.c:92 |
8ada9598 | 2530 | msgid "path" |
81809b99 | 2531 | msgstr "路径" |
8ada9598 | 2532 | |
7aea43ff | 2533 | #: builtin/apply.c:4526 |
8ada9598 | 2534 | msgid "don't apply changes matching the given path" |
81809b99 | 2535 | msgstr "不要应用与给出路径向匹配的变更" |
8ada9598 | 2536 | |
7aea43ff | 2537 | #: builtin/apply.c:4529 |
8ada9598 | 2538 | msgid "apply changes matching the given path" |
81809b99 | 2539 | msgstr "应用与给出路径向匹配的变更" |
8ada9598 | 2540 | |
7aea43ff | 2541 | #: builtin/apply.c:4531 |
8ada9598 | 2542 | msgid "num" |
81809b99 | 2543 | msgstr "数字" |
8ada9598 | 2544 | |
7aea43ff | 2545 | #: builtin/apply.c:4532 |
8ada9598 | 2546 | msgid "remove <num> leading slashes from traditional diff paths" |
07432cef | 2547 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" |
8ada9598 | 2548 | |
7aea43ff | 2549 | #: builtin/apply.c:4535 |
8ada9598 | 2550 | msgid "ignore additions made by the patch" |
81809b99 | 2551 | msgstr "忽略补丁中的添加的文件" |
8ada9598 | 2552 | |
7aea43ff | 2553 | #: builtin/apply.c:4537 |
8ada9598 | 2554 | msgid "instead of applying the patch, output diffstat for the input" |
81809b99 | 2555 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" |
8ada9598 | 2556 | |
7aea43ff | 2557 | #: builtin/apply.c:4541 |
ef317cd5 | 2558 | msgid "show number of added and deleted lines in decimal notation" |
07432cef | 2559 | msgstr "以十进制数显示添加和删除的行数" |
8ada9598 | 2560 | |
7aea43ff | 2561 | #: builtin/apply.c:4543 |
8ada9598 | 2562 | msgid "instead of applying the patch, output a summary for the input" |
81809b99 | 2563 | msgstr "不应用补丁,而是显示输入的概要" |
8ada9598 | 2564 | |
7aea43ff | 2565 | #: builtin/apply.c:4545 |
8ada9598 | 2566 | msgid "instead of applying the patch, see if the patch is applicable" |
81809b99 | 2567 | msgstr "不应用补丁,而是查看补丁是否可应用" |
8ada9598 | 2568 | |
7aea43ff | 2569 | #: builtin/apply.c:4547 |
8ada9598 | 2570 | msgid "make sure the patch is applicable to the current index" |
81809b99 | 2571 | msgstr "确认补丁可以应用到当前索引" |
8ada9598 | 2572 | |
7aea43ff | 2573 | #: builtin/apply.c:4549 |
8ada9598 | 2574 | msgid "apply a patch without touching the working tree" |
81809b99 | 2575 | msgstr "应用补丁而不修改工作区" |
8ada9598 | 2576 | |
7aea43ff | 2577 | #: builtin/apply.c:4551 |
814ff314 JX |
2578 | msgid "accept a patch that touches outside the working area" |
2579 | msgstr "接受修改工作区之外文件的补丁" | |
2580 | ||
7aea43ff | 2581 | #: builtin/apply.c:4553 |
8ada9598 | 2582 | msgid "also apply the patch (use with --stat/--summary/--check)" |
195febda | 2583 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" |
8ada9598 | 2584 | |
7aea43ff | 2585 | #: builtin/apply.c:4555 |
23ff3338 JX |
2586 | msgid "attempt three-way merge if a patch does not apply" |
2587 | msgstr "如果一个补丁不能应用则尝试三路合并" | |
2588 | ||
7aea43ff | 2589 | #: builtin/apply.c:4557 |
8ada9598 | 2590 | msgid "build a temporary index based on embedded index information" |
81809b99 | 2591 | msgstr "创建一个临时索引基于嵌入的索引信息" |
8ada9598 | 2592 | |
7aea43ff | 2593 | #: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412 |
8ada9598 | 2594 | msgid "paths are separated with NUL character" |
81809b99 | 2595 | msgstr "路径以 NUL 字符分隔" |
8ada9598 | 2596 | |
7aea43ff | 2597 | #: builtin/apply.c:4562 |
8ada9598 | 2598 | msgid "ensure at least <n> lines of context match" |
81809b99 | 2599 | msgstr "确保至少匹配 <n> 行上下文" |
8ada9598 | 2600 | |
7aea43ff | 2601 | #: builtin/apply.c:4563 |
8ada9598 | 2602 | msgid "action" |
81809b99 | 2603 | msgstr "动作" |
8ada9598 | 2604 | |
7aea43ff | 2605 | #: builtin/apply.c:4564 |
8ada9598 | 2606 | msgid "detect new or modified lines that have whitespace errors" |
81809b99 | 2607 | msgstr "检查新增和修改的行中间的空白字符滥用" |
8ada9598 | 2608 | |
7aea43ff | 2609 | #: builtin/apply.c:4567 builtin/apply.c:4570 |
8ada9598 | 2610 | msgid "ignore changes in whitespace when finding context" |
81809b99 | 2611 | msgstr "查找上下文时忽略空白字符的变更" |
8ada9598 | 2612 | |
7aea43ff | 2613 | #: builtin/apply.c:4573 |
8ada9598 | 2614 | msgid "apply the patch in reverse" |
81809b99 | 2615 | msgstr "反向应用补丁" |
8ada9598 | 2616 | |
7aea43ff | 2617 | #: builtin/apply.c:4575 |
8ada9598 | 2618 | msgid "don't expect at least one line of context" |
81809b99 | 2619 | msgstr "无需至少一行上下文" |
8ada9598 | 2620 | |
7aea43ff | 2621 | #: builtin/apply.c:4577 |
8ada9598 | 2622 | msgid "leave the rejected hunks in corresponding *.rej files" |
81809b99 | 2623 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" |
8ada9598 | 2624 | |
7aea43ff | 2625 | #: builtin/apply.c:4579 |
8ada9598 | 2626 | msgid "allow overlapping hunks" |
81809b99 | 2627 | msgstr "允许重叠的补丁片段" |
8ada9598 | 2628 | |
7aea43ff | 2629 | #: builtin/apply.c:4582 |
8ada9598 | 2630 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
195febda | 2631 | msgstr "允许不正确的文件末尾换行符" |
c04f5ac3 | 2632 | |
7aea43ff | 2633 | #: builtin/apply.c:4585 |
8ada9598 | 2634 | msgid "do not trust the line counts in the hunk headers" |
81809b99 | 2635 | msgstr "不信任补丁片段的头信息中的行号" |
c04f5ac3 | 2636 | |
7aea43ff | 2637 | #: builtin/apply.c:4587 |
8ada9598 | 2638 | msgid "root" |
81809b99 | 2639 | msgstr "根目录" |
c04f5ac3 | 2640 | |
7aea43ff | 2641 | #: builtin/apply.c:4588 |
8ada9598 | 2642 | msgid "prepend <root> to all filenames" |
81809b99 | 2643 | msgstr "为所有文件名前添加 <根目录>" |
c04f5ac3 | 2644 | |
7aea43ff | 2645 | #: builtin/apply.c:4610 |
23ff3338 JX |
2646 | msgid "--3way outside a repository" |
2647 | msgstr "--3way 在一个版本库之外" | |
2648 | ||
7aea43ff | 2649 | #: builtin/apply.c:4618 |
8ada9598 | 2650 | msgid "--index outside a repository" |
81809b99 | 2651 | msgstr "--index 在一个版本库之外" |
c04f5ac3 | 2652 | |
7aea43ff | 2653 | #: builtin/apply.c:4621 |
8ada9598 | 2654 | msgid "--cached outside a repository" |
81809b99 | 2655 | msgstr "--cached 在一个版本库之外" |
c04f5ac3 | 2656 | |
7aea43ff | 2657 | #: builtin/apply.c:4640 |
81809b99 | 2658 | #, c-format |
8ada9598 | 2659 | msgid "can't open patch '%s'" |
81809b99 | 2660 | msgstr "不能打开补丁 '%s'" |
c04f5ac3 | 2661 | |
7aea43ff | 2662 | #: builtin/apply.c:4654 |
c04f5ac3 | 2663 | #, c-format |
8ada9598 JX |
2664 | msgid "squelched %d whitespace error" |
2665 | msgid_plural "squelched %d whitespace errors" | |
81809b99 | 2666 | msgstr[0] "抑制下仍有 %d 个空白字符误用" |
5ae481e0 | 2667 | msgstr[1] "抑制下仍有 %d 个空白字符误用" |
c04f5ac3 | 2668 | |
7aea43ff | 2669 | #: builtin/apply.c:4660 builtin/apply.c:4670 |
8ada9598 JX |
2670 | #, c-format |
2671 | msgid "%d line adds whitespace errors." | |
2672 | msgid_plural "%d lines add whitespace errors." | |
81809b99 | 2673 | msgstr[0] "%d 行有空白字符误用。" |
5ae481e0 | 2674 | msgstr[1] "%d 行有空白字符误用。" |
c04f5ac3 JX |
2675 | |
2676 | #: builtin/archive.c:17 | |
2677 | #, c-format | |
2678 | msgid "could not create archive file '%s'" | |
90e6ef53 | 2679 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
2680 | |
2681 | #: builtin/archive.c:20 | |
2682 | msgid "could not redirect output" | |
195febda | 2683 | msgstr "不能重定向输出" |
c04f5ac3 JX |
2684 | |
2685 | #: builtin/archive.c:37 | |
2686 | msgid "git archive: Remote with no URL" | |
90e6ef53 | 2687 | msgstr "git archive:未提供远程URL" |
c04f5ac3 JX |
2688 | |
2689 | #: builtin/archive.c:58 | |
2690 | msgid "git archive: expected ACK/NAK, got EOF" | |
9aafc933 | 2691 | msgstr "git archive:应为ACK/NACK,却得到EOF" |
c04f5ac3 | 2692 | |
1003b3a5 | 2693 | #: builtin/archive.c:61 |
c04f5ac3 JX |
2694 | #, c-format |
2695 | msgid "git archive: NACK %s" | |
90e6ef53 | 2696 | msgstr "git archive:NACK %s" |
c04f5ac3 | 2697 | |
1003b3a5 | 2698 | #: builtin/archive.c:63 |
c04f5ac3 JX |
2699 | #, c-format |
2700 | msgid "remote error: %s" | |
2701 | msgstr "远程错误:%s" | |
2702 | ||
1003b3a5 | 2703 | #: builtin/archive.c:64 |
c04f5ac3 | 2704 | msgid "git archive: protocol error" |
90e6ef53 | 2705 | msgstr "git archive:协议错误" |
c04f5ac3 | 2706 | |
1003b3a5 | 2707 | #: builtin/archive.c:68 |
c04f5ac3 | 2708 | msgid "git archive: expected a flush" |
195febda | 2709 | msgstr "git archive:应为刷新" |
c04f5ac3 | 2710 | |
ef317cd5 JX |
2711 | #: builtin/bisect--helper.c:7 |
2712 | msgid "git bisect--helper --next-all [--no-checkout]" | |
07432cef | 2713 | msgstr "git bisect--helper --next-all [--no-checkout]" |
ef317cd5 JX |
2714 | |
2715 | #: builtin/bisect--helper.c:17 | |
2716 | msgid "perform 'git bisect next'" | |
07432cef | 2717 | msgstr "执行 'git bisect next'" |
ef317cd5 JX |
2718 | |
2719 | #: builtin/bisect--helper.c:19 | |
2720 | msgid "update BISECT_HEAD instead of checking out the current commit" | |
07432cef | 2721 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
ef317cd5 | 2722 | |
7aea43ff JX |
2723 | #: builtin/blame.c:31 |
2724 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" | |
2725 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" | |
ef317cd5 | 2726 | |
7aea43ff | 2727 | #: builtin/blame.c:36 |
814ff314 JX |
2728 | msgid "<rev-opts> are documented in git-rev-list(1)" |
2729 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" | |
ef317cd5 | 2730 | |
814ff314 | 2731 | #: builtin/blame.c:2500 |
ef317cd5 | 2732 | msgid "Show blame entries as we find them, incrementally" |
07432cef | 2733 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 2734 | |
814ff314 | 2735 | #: builtin/blame.c:2501 |
ef317cd5 | 2736 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
07432cef | 2737 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
ef317cd5 | 2738 | |
814ff314 | 2739 | #: builtin/blame.c:2502 |
ef317cd5 | 2740 | msgid "Do not treat root commits as boundaries (Default: off)" |
07432cef | 2741 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 2742 | |
814ff314 | 2743 | #: builtin/blame.c:2503 |
ef317cd5 | 2744 | msgid "Show work cost statistics" |
07432cef | 2745 | msgstr "显示命令消耗统计" |
ef317cd5 | 2746 | |
814ff314 | 2747 | #: builtin/blame.c:2504 |
ef317cd5 | 2748 | msgid "Show output score for blame entries" |
07432cef | 2749 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
ef317cd5 | 2750 | |
814ff314 | 2751 | #: builtin/blame.c:2505 |
ef317cd5 | 2752 | msgid "Show original filename (Default: auto)" |
07432cef | 2753 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 2754 | |
814ff314 | 2755 | #: builtin/blame.c:2506 |
ef317cd5 | 2756 | msgid "Show original linenumber (Default: off)" |
07432cef | 2757 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 2758 | |
814ff314 | 2759 | #: builtin/blame.c:2507 |
ef317cd5 | 2760 | msgid "Show in a format designed for machine consumption" |
07432cef | 2761 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 2762 | |
814ff314 | 2763 | #: builtin/blame.c:2508 |
ef317cd5 | 2764 | msgid "Show porcelain format with per-line commit information" |
07432cef | 2765 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 2766 | |
814ff314 | 2767 | #: builtin/blame.c:2509 |
ef317cd5 | 2768 | msgid "Use the same output mode as git-annotate (Default: off)" |
07432cef | 2769 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 2770 | |
814ff314 | 2771 | #: builtin/blame.c:2510 |
ef317cd5 | 2772 | msgid "Show raw timestamp (Default: off)" |
07432cef | 2773 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 2774 | |
814ff314 | 2775 | #: builtin/blame.c:2511 |
ef317cd5 | 2776 | msgid "Show long commit SHA1 (Default: off)" |
07432cef | 2777 | msgstr "显示长的SHA1提交号(默认:关闭)" |
ef317cd5 | 2778 | |
814ff314 | 2779 | #: builtin/blame.c:2512 |
ef317cd5 | 2780 | msgid "Suppress author name and timestamp (Default: off)" |
07432cef | 2781 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 2782 | |
814ff314 | 2783 | #: builtin/blame.c:2513 |
ef317cd5 | 2784 | msgid "Show author email instead of name (Default: off)" |
07432cef | 2785 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 2786 | |
814ff314 | 2787 | #: builtin/blame.c:2514 |
ef317cd5 | 2788 | msgid "Ignore whitespace differences" |
07432cef | 2789 | msgstr "忽略空白差异" |
ef317cd5 | 2790 | |
814ff314 | 2791 | #: builtin/blame.c:2515 |
ef317cd5 | 2792 | msgid "Spend extra cycles to find better match" |
07432cef | 2793 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 2794 | |
814ff314 | 2795 | #: builtin/blame.c:2516 |
ef317cd5 | 2796 | msgid "Use revisions from <file> instead of calling git-rev-list" |
d9d56b23 | 2797 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 2798 | |
814ff314 | 2799 | #: builtin/blame.c:2517 |
ef317cd5 | 2800 | msgid "Use <file>'s contents as the final image" |
d9d56b23 | 2801 | msgstr "使用 <文件> 的内容作为最终的图片" |
ef317cd5 | 2802 | |
814ff314 | 2803 | #: builtin/blame.c:2518 builtin/blame.c:2519 |
ef317cd5 | 2804 | msgid "score" |
07432cef | 2805 | msgstr "得分" |
ef317cd5 | 2806 | |
814ff314 | 2807 | #: builtin/blame.c:2518 |
ef317cd5 | 2808 | msgid "Find line copies within and across files" |
07432cef | 2809 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 2810 | |
814ff314 | 2811 | #: builtin/blame.c:2519 |
ef317cd5 | 2812 | msgid "Find line movements within and across files" |
07432cef | 2813 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 2814 | |
814ff314 | 2815 | #: builtin/blame.c:2520 |
ef317cd5 | 2816 | msgid "n,m" |
07432cef | 2817 | msgstr "n,m" |
ef317cd5 | 2818 | |
814ff314 | 2819 | #: builtin/blame.c:2520 |
ef317cd5 | 2820 | msgid "Process only line range n,m, counting from 1" |
07432cef | 2821 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
ef317cd5 | 2822 | |
6c94aba5 JX |
2823 | #. TRANSLATORS: This string is used to tell us the maximum |
2824 | #. display width for a relative timestamp in "git blame" | |
2825 | #. output. For C locale, "4 years, 11 months ago", which | |
2826 | #. takes 22 places, is the longest among various forms of | |
2827 | #. relative timestamps, but your language may need more or | |
2828 | #. fewer display columns. | |
814ff314 | 2829 | #: builtin/blame.c:2601 |
6c94aba5 JX |
2830 | msgid "4 years, 11 months ago" |
2831 | msgstr "4 年 11 个月前" | |
2832 | ||
1003b3a5 | 2833 | #: builtin/branch.c:24 |
814ff314 JX |
2834 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
2835 | msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" | |
ef317cd5 | 2836 | |
1003b3a5 | 2837 | #: builtin/branch.c:25 |
814ff314 JX |
2838 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
2839 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" | |
ef317cd5 | 2840 | |
1003b3a5 | 2841 | #: builtin/branch.c:26 |
814ff314 JX |
2842 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
2843 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." | |
ef317cd5 | 2844 | |
1003b3a5 | 2845 | #: builtin/branch.c:27 |
814ff314 JX |
2846 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
2847 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" | |
ef317cd5 | 2848 | |
90e6ef53 | 2849 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
7aea43ff | 2850 | #: builtin/branch.c:150 |
c04f5ac3 JX |
2851 | #, c-format |
2852 | msgid "" | |
2853 | "deleting branch '%s' that has been merged to\n" | |
2854 | " '%s', but not yet merged to HEAD." | |
2855 | msgstr "" | |
70fc47bf | 2856 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
2857 | " '%s',但未合并到 HEAD。" |
2858 | ||
90e6ef53 | 2859 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
7aea43ff | 2860 | #: builtin/branch.c:154 |
c04f5ac3 JX |
2861 | #, c-format |
2862 | msgid "" | |
2863 | "not deleting branch '%s' that is not yet merged to\n" | |
2864 | " '%s', even though it is merged to HEAD." | |
2865 | msgstr "" | |
70fc47bf T |
2866 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
2867 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 2868 | |
7aea43ff | 2869 | #: builtin/branch.c:168 |
07432cef WS |
2870 | #, c-format |
2871 | msgid "Couldn't look up commit object for '%s'" | |
2872 | msgstr "无法查询 '%s' 指向的提交对象" | |
2873 | ||
7aea43ff | 2874 | #: builtin/branch.c:172 |
07432cef WS |
2875 | #, c-format |
2876 | msgid "" | |
2877 | "The branch '%s' is not fully merged.\n" | |
2878 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
2879 | msgstr "" | |
2880 | "分支 '%s' 没有完全合并。\n" | |
2881 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
2882 | ||
7aea43ff | 2883 | #: builtin/branch.c:185 |
07432cef WS |
2884 | msgid "Update of config-file failed" |
2885 | msgstr "无法更新 config 文件" | |
2886 | ||
7aea43ff | 2887 | #: builtin/branch.c:213 |
c04f5ac3 | 2888 | msgid "cannot use -a with -d" |
649900bc | 2889 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 2890 | |
7aea43ff | 2891 | #: builtin/branch.c:219 |
c04f5ac3 JX |
2892 | msgid "Couldn't look up commit object for HEAD" |
2893 | msgstr "无法查询 HEAD 指向的提交对象" | |
2894 | ||
7aea43ff | 2895 | #: builtin/branch.c:227 |
c04f5ac3 JX |
2896 | #, c-format |
2897 | msgid "Cannot delete the branch '%s' which you are currently on." | |
2898 | msgstr "无法删除您当前所在的分支 '%s'。" | |
2899 | ||
7aea43ff | 2900 | #: builtin/branch.c:243 |
5ae481e0 | 2901 | #, c-format |
7aea43ff JX |
2902 | msgid "remote-tracking branch '%s' not found." |
2903 | msgstr "未能找到远程跟踪分支 '%s'。" | |
c04f5ac3 | 2904 | |
7aea43ff | 2905 | #: builtin/branch.c:244 |
81809b99 | 2906 | #, c-format |
8ada9598 | 2907 | msgid "branch '%s' not found." |
81809b99 | 2908 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 2909 | |
7aea43ff | 2910 | #: builtin/branch.c:258 |
81809b99 | 2911 | #, c-format |
7aea43ff JX |
2912 | msgid "Error deleting remote-tracking branch '%s'" |
2913 | msgstr "无法删除远程跟踪分支 '%s'" | |
c04f5ac3 | 2914 | |
7aea43ff | 2915 | #: builtin/branch.c:259 |
81809b99 | 2916 | #, c-format |
8ada9598 | 2917 | msgid "Error deleting branch '%s'" |
7aea43ff | 2918 | msgstr "无法删除分支 '%s'" |
8ada9598 | 2919 | |
7aea43ff | 2920 | #: builtin/branch.c:266 |
81809b99 | 2921 | #, c-format |
7aea43ff JX |
2922 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
2923 | msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" | |
c04f5ac3 | 2924 | |
7aea43ff | 2925 | #: builtin/branch.c:267 |
81809b99 | 2926 | #, c-format |
8ada9598 | 2927 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 2928 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 2929 | |
7aea43ff | 2930 | #: builtin/branch.c:368 |
c04f5ac3 JX |
2931 | #, c-format |
2932 | msgid "branch '%s' does not point at a commit" | |
2933 | msgstr "分支 '%s' 未指向一个提交" | |
2934 | ||
7aea43ff | 2935 | #: builtin/branch.c:451 |
81809b99 | 2936 | #, c-format |
90314792 JX |
2937 | msgid "[%s: gone]" |
2938 | msgstr "[%s: 丢失]" | |
2939 | ||
7aea43ff | 2940 | #: builtin/branch.c:456 |
90314792 JX |
2941 | #, c-format |
2942 | msgid "[%s]" | |
2943 | msgstr "[%s]" | |
2944 | ||
7aea43ff | 2945 | #: builtin/branch.c:461 |
90314792 | 2946 | #, c-format |
8ada9598 | 2947 | msgid "[%s: behind %d]" |
81809b99 | 2948 | msgstr "[%s:落后 %d]" |
c04f5ac3 | 2949 | |
7aea43ff | 2950 | #: builtin/branch.c:463 |
81809b99 | 2951 | #, c-format |
8ada9598 | 2952 | msgid "[behind %d]" |
81809b99 | 2953 | msgstr "[落后 %d]" |
8ada9598 | 2954 | |
7aea43ff | 2955 | #: builtin/branch.c:467 |
81809b99 | 2956 | #, c-format |
8ada9598 | 2957 | msgid "[%s: ahead %d]" |
81809b99 | 2958 | msgstr "[%s:领先 %d]" |
c04f5ac3 | 2959 | |
7aea43ff | 2960 | #: builtin/branch.c:469 |
81809b99 | 2961 | #, c-format |
8ada9598 | 2962 | msgid "[ahead %d]" |
81809b99 | 2963 | msgstr "[领先 %d]" |
8ada9598 | 2964 | |
7aea43ff | 2965 | #: builtin/branch.c:472 |
81809b99 | 2966 | #, c-format |
8ada9598 | 2967 | msgid "[%s: ahead %d, behind %d]" |
81809b99 | 2968 | msgstr "[%s:领先 %d,落后 %d]" |
8ada9598 | 2969 | |
7aea43ff | 2970 | #: builtin/branch.c:475 |
81809b99 | 2971 | #, c-format |
8ada9598 | 2972 | msgid "[ahead %d, behind %d]" |
81809b99 | 2973 | msgstr "[领先 %d,落后 %d]" |
c04f5ac3 | 2974 | |
7aea43ff | 2975 | #: builtin/branch.c:488 |
a77c07d9 JX |
2976 | msgid " **** invalid ref ****" |
2977 | msgstr " **** 无效引用 ****" | |
2978 | ||
7aea43ff | 2979 | #: builtin/branch.c:579 |
1003b3a5 JX |
2980 | #, c-format |
2981 | msgid "(no branch, rebasing %s)" | |
2982 | msgstr "(非分支,正变基 %s)" | |
2983 | ||
7aea43ff | 2984 | #: builtin/branch.c:582 |
1003b3a5 JX |
2985 | #, c-format |
2986 | msgid "(no branch, bisect started on %s)" | |
2987 | msgstr "(非分支,二分查找开始于 %s)" | |
2988 | ||
7aea43ff | 2989 | #: builtin/branch.c:588 |
1003b3a5 | 2990 | #, c-format |
814ff314 JX |
2991 | msgid "(HEAD detached at %s)" |
2992 | msgstr "(头指针分离于 %s)" | |
1003b3a5 | 2993 | |
7aea43ff | 2994 | #: builtin/branch.c:591 |
814ff314 JX |
2995 | #, c-format |
2996 | msgid "(HEAD detached from %s)" | |
2997 | msgstr "(头指针分离自 %s)" | |
2998 | ||
7aea43ff | 2999 | #: builtin/branch.c:595 |
c04f5ac3 JX |
3000 | msgid "(no branch)" |
3001 | msgstr "(非分支)" | |
3002 | ||
7aea43ff | 3003 | #: builtin/branch.c:642 |
a77c07d9 JX |
3004 | #, c-format |
3005 | msgid "object '%s' does not point to a commit" | |
3006 | msgstr "对象 '%s' 没有指向一个提交" | |
3007 | ||
7aea43ff | 3008 | #: builtin/branch.c:690 |
c04f5ac3 | 3009 | msgid "some refs could not be read" |
90e6ef53 | 3010 | msgstr "一些引用不能读取" |
c04f5ac3 | 3011 | |
7aea43ff | 3012 | #: builtin/branch.c:703 |
c04f5ac3 | 3013 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 3014 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 3015 | |
7aea43ff | 3016 | #: builtin/branch.c:713 |
c04f5ac3 JX |
3017 | #, c-format |
3018 | msgid "Invalid branch name: '%s'" | |
3019 | msgstr "无效的分支名:'%s'" | |
3020 | ||
7aea43ff | 3021 | #: builtin/branch.c:728 |
c04f5ac3 JX |
3022 | msgid "Branch rename failed" |
3023 | msgstr "分支重命名失败" | |
3024 | ||
7aea43ff | 3025 | #: builtin/branch.c:732 |
c04f5ac3 JX |
3026 | #, c-format |
3027 | msgid "Renamed a misnamed branch '%s' away" | |
3028 | msgstr "重命名掉一个错误命名的旧分支 '%s'" | |
3029 | ||
7aea43ff | 3030 | #: builtin/branch.c:736 |
c04f5ac3 JX |
3031 | #, c-format |
3032 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
3033 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
3034 | ||
7aea43ff | 3035 | #: builtin/branch.c:743 |
c04f5ac3 JX |
3036 | msgid "Branch is renamed, but update of config-file failed" |
3037 | msgstr "分支被重命名,但更新 config 文件失败" | |
3038 | ||
7aea43ff | 3039 | #: builtin/branch.c:758 |
c04f5ac3 JX |
3040 | #, c-format |
3041 | msgid "malformed object name %s" | |
3042 | msgstr "非法的对象名 %s" | |
3043 | ||
7aea43ff | 3044 | #: builtin/branch.c:780 |
81809b99 | 3045 | #, c-format |
8ada9598 | 3046 | msgid "could not write branch description template: %s" |
81809b99 | 3047 | msgstr "不能写分支描述模版:%s" |
c04f5ac3 | 3048 | |
7aea43ff | 3049 | #: builtin/branch.c:810 |
ef317cd5 | 3050 | msgid "Generic options" |
07432cef | 3051 | msgstr "通用选项" |
c04f5ac3 | 3052 | |
7aea43ff | 3053 | #: builtin/branch.c:812 |
ef317cd5 | 3054 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 3055 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 3056 | |
7aea43ff | 3057 | #: builtin/branch.c:813 |
ef317cd5 | 3058 | msgid "suppress informational messages" |
07432cef | 3059 | msgstr "不显示信息" |
8ada9598 | 3060 | |
7aea43ff | 3061 | #: builtin/branch.c:814 |
ef317cd5 | 3062 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 3063 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 3064 | |
7aea43ff | 3065 | #: builtin/branch.c:816 |
ef317cd5 | 3066 | msgid "change upstream info" |
07432cef | 3067 | msgstr "改变上游信息" |
c04f5ac3 | 3068 | |
7aea43ff | 3069 | #: builtin/branch.c:820 |
ef317cd5 | 3070 | msgid "use colored output" |
07432cef | 3071 | msgstr "使用彩色输出" |
c04f5ac3 | 3072 | |
7aea43ff | 3073 | #: builtin/branch.c:821 |
ef317cd5 | 3074 | msgid "act on remote-tracking branches" |
07432cef | 3075 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 3076 | |
7aea43ff JX |
3077 | #: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851 |
3078 | #: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582 | |
3079 | #: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616 | |
220c313c | 3080 | #: builtin/tag.c:622 |
ef317cd5 | 3081 | msgid "commit" |
07432cef | 3082 | msgstr "提交" |
c04f5ac3 | 3083 | |
7aea43ff | 3084 | #: builtin/branch.c:825 builtin/branch.c:831 |
ef317cd5 | 3085 | msgid "print only branches that contain the commit" |
07432cef | 3086 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 3087 | |
7aea43ff | 3088 | #: builtin/branch.c:837 |
ef317cd5 | 3089 | msgid "Specific git-branch actions:" |
07432cef | 3090 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 3091 | |
7aea43ff | 3092 | #: builtin/branch.c:838 |
ef317cd5 | 3093 | msgid "list both remote-tracking and local branches" |
07432cef | 3094 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 3095 | |
7aea43ff | 3096 | #: builtin/branch.c:840 |
ef317cd5 | 3097 | msgid "delete fully merged branch" |
07432cef | 3098 | msgstr "删除完全合并的分支" |
c04f5ac3 | 3099 | |
7aea43ff | 3100 | #: builtin/branch.c:841 |
ef317cd5 | 3101 | msgid "delete branch (even if not merged)" |
07432cef | 3102 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 3103 | |
7aea43ff | 3104 | #: builtin/branch.c:842 |
ef317cd5 | 3105 | msgid "move/rename a branch and its reflog" |
07432cef | 3106 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 3107 | |
7aea43ff | 3108 | #: builtin/branch.c:843 |
ef317cd5 | 3109 | msgid "move/rename a branch, even if target exists" |
07432cef | 3110 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 3111 | |
7aea43ff | 3112 | #: builtin/branch.c:844 |
ef317cd5 | 3113 | msgid "list branch names" |
07432cef | 3114 | msgstr "列出分支名" |
c04f5ac3 | 3115 | |
7aea43ff | 3116 | #: builtin/branch.c:845 |
ef317cd5 | 3117 | msgid "create the branch's reflog" |
07432cef | 3118 | msgstr "创建分支的引用日志" |
ef317cd5 | 3119 | |
7aea43ff | 3120 | #: builtin/branch.c:847 |
ef317cd5 | 3121 | msgid "edit the description for the branch" |
07432cef | 3122 | msgstr "标记分支的描述" |
ef317cd5 | 3123 | |
7aea43ff | 3124 | #: builtin/branch.c:848 |
04cb2f28 JX |
3125 | msgid "force creation, move/rename, deletion" |
3126 | msgstr "强制创建、移动/重命名、删除" | |
ef317cd5 | 3127 | |
7aea43ff | 3128 | #: builtin/branch.c:851 |
ef317cd5 | 3129 | msgid "print only not merged branches" |
07432cef | 3130 | msgstr "只打印没有合并的分支" |
ef317cd5 | 3131 | |
7aea43ff | 3132 | #: builtin/branch.c:857 |
ef317cd5 | 3133 | msgid "print only merged branches" |
07432cef | 3134 | msgstr "只打印合并的分支" |
ef317cd5 | 3135 | |
7aea43ff | 3136 | #: builtin/branch.c:861 |
ef317cd5 | 3137 | msgid "list branches in columns" |
07432cef | 3138 | msgstr "以列的方式显示分支" |
ef317cd5 | 3139 | |
7aea43ff | 3140 | #: builtin/branch.c:874 |
c04f5ac3 JX |
3141 | msgid "Failed to resolve HEAD as a valid ref." |
3142 | msgstr "无法将 HEAD 解析为有效引用。" | |
3143 | ||
5bb01d4f | 3144 | #: builtin/branch.c:878 builtin/clone.c:622 |
c04f5ac3 | 3145 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 3146 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 3147 | |
7aea43ff | 3148 | #: builtin/branch.c:900 |
8ada9598 | 3149 | msgid "--column and --verbose are incompatible" |
81809b99 | 3150 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 3151 | |
7aea43ff | 3152 | #: builtin/branch.c:911 builtin/branch.c:950 |
a77c07d9 JX |
3153 | msgid "branch name required" |
3154 | msgstr "必须提供分支名" | |
3155 | ||
7aea43ff | 3156 | #: builtin/branch.c:926 |
a77c07d9 JX |
3157 | msgid "Cannot give description to detached HEAD" |
3158 | msgstr "不能向分离头指针提供描述" | |
3159 | ||
7aea43ff | 3160 | #: builtin/branch.c:931 |
a77c07d9 JX |
3161 | msgid "cannot edit description of more than one branch" |
3162 | msgstr "不能为一个以上的分支编辑描述" | |
3163 | ||
7aea43ff | 3164 | #: builtin/branch.c:938 |
a77c07d9 JX |
3165 | #, c-format |
3166 | msgid "No commit on branch '%s' yet." | |
3167 | msgstr "分支 '%s' 尚无提交。" | |
3168 | ||
7aea43ff | 3169 | #: builtin/branch.c:941 |
a77c07d9 JX |
3170 | #, c-format |
3171 | msgid "No branch named '%s'." | |
3172 | msgstr "没有分支 '%s'。" | |
3173 | ||
7aea43ff | 3174 | #: builtin/branch.c:956 |
a77c07d9 JX |
3175 | msgid "too many branches for a rename operation" |
3176 | msgstr "为重命名操作提供了太多的分支名" | |
3177 | ||
7aea43ff | 3178 | #: builtin/branch.c:961 |
1003b3a5 JX |
3179 | msgid "too many branches to set new upstream" |
3180 | msgstr "为设置新上游提供了太多的分支名" | |
3181 | ||
7aea43ff | 3182 | #: builtin/branch.c:965 |
1003b3a5 JX |
3183 | #, c-format |
3184 | msgid "" | |
3185 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
3186 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
3187 | ||
7aea43ff | 3188 | #: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011 |
1003b3a5 JX |
3189 | #, c-format |
3190 | msgid "no such branch '%s'" | |
3191 | msgstr "没有此分支 '%s'" | |
3192 | ||
7aea43ff | 3193 | #: builtin/branch.c:972 |
07432cef | 3194 | #, c-format |
ef317cd5 | 3195 | msgid "branch '%s' does not exist" |
07432cef | 3196 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 3197 | |
7aea43ff | 3198 | #: builtin/branch.c:984 |
1003b3a5 JX |
3199 | msgid "too many branches to unset upstream" |
3200 | msgstr "为取消上游设置操作提供了太多的分支名" | |
3201 | ||
7aea43ff | 3202 | #: builtin/branch.c:988 |
1003b3a5 JX |
3203 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
3204 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
3205 | ||
7aea43ff | 3206 | #: builtin/branch.c:994 |
ef317cd5 JX |
3207 | #, c-format |
3208 | msgid "Branch '%s' has no upstream information" | |
07432cef | 3209 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 3210 | |
7aea43ff | 3211 | #: builtin/branch.c:1008 |
1003b3a5 JX |
3212 | msgid "it does not make sense to create 'HEAD' manually" |
3213 | msgstr "手工创建 'HEAD' 没有意义" | |
3214 | ||
7aea43ff | 3215 | #: builtin/branch.c:1014 |
c04f5ac3 JX |
3216 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
3217 | msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" | |
3218 | ||
7aea43ff | 3219 | #: builtin/branch.c:1017 |
ef317cd5 JX |
3220 | #, c-format |
3221 | msgid "" | |
3222 | "The --set-upstream flag is deprecated and will be removed. Consider using --" | |
3223 | "track or --set-upstream-to\n" | |
3224 | msgstr "" | |
07432cef | 3225 | "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" |
ef317cd5 | 3226 | |
7aea43ff | 3227 | #: builtin/branch.c:1034 |
ef317cd5 JX |
3228 | #, c-format |
3229 | msgid "" | |
3230 | "\n" | |
3231 | "If you wanted to make '%s' track '%s', do this:\n" | |
3232 | "\n" | |
3233 | msgstr "" | |
07432cef WS |
3234 | "\n" |
3235 | "如果你想用 '%s' 跟踪 '%s', 这么做:\n" | |
3236 | "\n" | |
ef317cd5 | 3237 | |
7aea43ff | 3238 | #: builtin/branch.c:1035 |
07432cef | 3239 | #, c-format |
ef317cd5 | 3240 | msgid " git branch -d %s\n" |
07432cef | 3241 | msgstr " git branch -d %s\n" |
ef317cd5 | 3242 | |
7aea43ff | 3243 | #: builtin/branch.c:1036 |
ef317cd5 JX |
3244 | #, c-format |
3245 | msgid " git branch --set-upstream-to %s\n" | |
07432cef | 3246 | msgstr " git branch --set-upstream-to %s\n" |
ef317cd5 | 3247 | |
7aea43ff | 3248 | #: builtin/bundle.c:51 |
c04f5ac3 JX |
3249 | #, c-format |
3250 | msgid "%s is okay\n" | |
3251 | msgstr "%s 可以\n" | |
3252 | ||
7aea43ff | 3253 | #: builtin/bundle.c:64 |
c04f5ac3 | 3254 | msgid "Need a repository to create a bundle." |
90e6ef53 | 3255 | msgstr "需要一个版本库来创建包。" |
c04f5ac3 | 3256 | |
7aea43ff | 3257 | #: builtin/bundle.c:68 |
c04f5ac3 | 3258 | msgid "Need a repository to unbundle." |
90e6ef53 | 3259 | msgstr "需要一个版本库来解包。" |
c04f5ac3 | 3260 | |
7aea43ff JX |
3261 | #: builtin/cat-file.c:369 |
3262 | msgid "" | |
3263 | "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" | |
3264 | "<type>|--textconv) <object>" | |
3265 | msgstr "" | |
3266 | "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型" | |
3267 | ">|--textconv) <对象>" | |
ef317cd5 | 3268 | |
7aea43ff JX |
3269 | #: builtin/cat-file.c:370 |
3270 | msgid "" | |
3271 | "git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-" | |
3272 | "objects>" | |
3273 | msgstr "" | |
3274 | "git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>" | |
ef317cd5 | 3275 | |
7aea43ff | 3276 | #: builtin/cat-file.c:407 |
ef317cd5 | 3277 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 3278 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 3279 | |
7aea43ff | 3280 | #: builtin/cat-file.c:408 |
ef317cd5 | 3281 | msgid "show object type" |
07432cef | 3282 | msgstr "显示对象类型" |
ef317cd5 | 3283 | |
7aea43ff | 3284 | #: builtin/cat-file.c:409 |
ef317cd5 | 3285 | msgid "show object size" |
07432cef | 3286 | msgstr "显示对象大小" |
ef317cd5 | 3287 | |
7aea43ff | 3288 | #: builtin/cat-file.c:411 |
ef317cd5 | 3289 | msgid "exit with zero when there's no error" |
07432cef | 3290 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 3291 | |
7aea43ff | 3292 | #: builtin/cat-file.c:412 |
ef317cd5 | 3293 | msgid "pretty-print object's content" |
07432cef | 3294 | msgstr "美观地打印对象的内容" |
ef317cd5 | 3295 | |
7aea43ff | 3296 | #: builtin/cat-file.c:414 |
ef317cd5 | 3297 | msgid "for blob objects, run textconv on object's content" |
07432cef | 3298 | msgstr "对于数据(blob)对象,对其内容执行 textconv" |
ef317cd5 | 3299 | |
7aea43ff JX |
3300 | #: builtin/cat-file.c:416 |
3301 | msgid "allow -s and -t to work with broken/corrupt objects" | |
3302 | msgstr "允许 -s 和 -t 对损坏的对象生效" | |
3303 | ||
3304 | #: builtin/cat-file.c:418 | |
ef317cd5 | 3305 | msgid "show info and content of objects fed from the standard input" |
07432cef | 3306 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 3307 | |
7aea43ff | 3308 | #: builtin/cat-file.c:421 |
ef317cd5 | 3309 | msgid "show info about objects fed from the standard input" |
07432cef | 3310 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 | 3311 | |
7aea43ff JX |
3312 | #: builtin/cat-file.c:424 |
3313 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" | |
3314 | msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)" | |
3315 | ||
ef317cd5 | 3316 | #: builtin/check-attr.c:11 |
814ff314 JX |
3317 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
3318 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." | |
ef317cd5 JX |
3319 | |
3320 | #: builtin/check-attr.c:12 | |
814ff314 JX |
3321 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" |
3322 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>" | |
ef317cd5 JX |
3323 | |
3324 | #: builtin/check-attr.c:19 | |
3325 | msgid "report all attributes set on file" | |
07432cef | 3326 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 JX |
3327 | |
3328 | #: builtin/check-attr.c:20 | |
3329 | msgid "use .gitattributes only from the index" | |
07432cef | 3330 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 3331 | |
7aea43ff | 3332 | #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96 |
ef317cd5 | 3333 | msgid "read file names from stdin" |
07432cef | 3334 | msgstr "从标准输入读出文件名" |
ef317cd5 | 3335 | |
a77c07d9 | 3336 | #: builtin/check-attr.c:23 builtin/check-ignore.c:24 |
90314792 JX |
3337 | msgid "terminate input and output records by a NUL character" |
3338 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 3339 | |
5bb01d4f | 3340 | #: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279 |
a77c07d9 JX |
3341 | msgid "suppress progress reporting" |
3342 | msgstr "不显示进度报告" | |
3343 | ||
2e8451e8 JX |
3344 | #: builtin/check-ignore.c:26 |
3345 | msgid "show non-matching input paths" | |
3346 | msgstr "显示未匹配的输入路径" | |
3347 | ||
90314792 JX |
3348 | #: builtin/check-ignore.c:28 |
3349 | msgid "ignore index when checking" | |
3350 | msgstr "检查时忽略索引" | |
3351 | ||
3352 | #: builtin/check-ignore.c:154 | |
a77c07d9 JX |
3353 | msgid "cannot specify pathnames with --stdin" |
3354 | msgstr "不能同时提供路径及 --stdin 参数" | |
3355 | ||
90314792 | 3356 | #: builtin/check-ignore.c:157 |
a77c07d9 JX |
3357 | msgid "-z only makes sense with --stdin" |
3358 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
3359 | ||
90314792 | 3360 | #: builtin/check-ignore.c:159 |
a77c07d9 JX |
3361 | msgid "no path specified" |
3362 | msgstr "未指定路径" | |
3363 | ||
90314792 | 3364 | #: builtin/check-ignore.c:163 |
a77c07d9 JX |
3365 | msgid "--quiet is only valid with a single pathname" |
3366 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
3367 | ||
90314792 | 3368 | #: builtin/check-ignore.c:165 |
a77c07d9 JX |
3369 | msgid "cannot have both --quiet and --verbose" |
3370 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
3371 | ||
90314792 | 3372 | #: builtin/check-ignore.c:168 |
2e8451e8 JX |
3373 | msgid "--non-matching is only valid with --verbose" |
3374 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
3375 | ||
3376 | #: builtin/check-mailmap.c:8 | |
814ff314 JX |
3377 | msgid "git check-mailmap [<options>] <contact>..." |
3378 | msgstr "git check-mailmap [<选项>] <联系地址>..." | |
2e8451e8 JX |
3379 | |
3380 | #: builtin/check-mailmap.c:13 | |
3381 | msgid "also read contacts from stdin" | |
3382 | msgstr "还从标准输入读取联系地址" | |
3383 | ||
3384 | #: builtin/check-mailmap.c:24 | |
3385 | #, c-format | |
3386 | msgid "unable to parse contact: %s" | |
3387 | msgstr "不能解析联系地址:%s" | |
3388 | ||
3389 | #: builtin/check-mailmap.c:47 | |
3390 | msgid "no contacts specified" | |
3391 | msgstr "未指定联系地址" | |
3392 | ||
ef317cd5 | 3393 | #: builtin/checkout-index.c:126 |
814ff314 JX |
3394 | msgid "git checkout-index [<options>] [--] [<file>...]" |
3395 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" | |
ef317cd5 | 3396 | |
6acbf033 | 3397 | #: builtin/checkout-index.c:188 |
ef317cd5 | 3398 | msgid "check out all files in the index" |
07432cef | 3399 | msgstr "检出索引区的所有文件" |
ef317cd5 | 3400 | |
6acbf033 | 3401 | #: builtin/checkout-index.c:189 |
ef317cd5 | 3402 | msgid "force overwrite of existing files" |
07432cef | 3403 | msgstr "强制覆盖现有的文件" |
ef317cd5 | 3404 | |
6acbf033 | 3405 | #: builtin/checkout-index.c:191 |
ef317cd5 | 3406 | msgid "no warning for existing files and files not in index" |
07432cef | 3407 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 | 3408 | |
6acbf033 | 3409 | #: builtin/checkout-index.c:193 |
ef317cd5 | 3410 | msgid "don't checkout new files" |
07432cef | 3411 | msgstr "不检出新文件" |
ef317cd5 | 3412 | |
6acbf033 | 3413 | #: builtin/checkout-index.c:195 |
ef317cd5 | 3414 | msgid "update stat information in the index file" |
07432cef | 3415 | msgstr "更新索引中文件的状态信息" |
ef317cd5 | 3416 | |
6acbf033 | 3417 | #: builtin/checkout-index.c:201 |
ef317cd5 | 3418 | msgid "read list of paths from the standard input" |
07432cef | 3419 | msgstr "从标准输入读取路径列表" |
ef317cd5 | 3420 | |
6acbf033 | 3421 | #: builtin/checkout-index.c:203 |
ef317cd5 | 3422 | msgid "write the content to temporary files" |
07432cef | 3423 | msgstr "将内容写入临时文件" |
ef317cd5 | 3424 | |
6acbf033 | 3425 | #: builtin/checkout-index.c:204 builtin/column.c:30 |
ef317cd5 | 3426 | msgid "string" |
07432cef | 3427 | msgstr "字符串" |
ef317cd5 | 3428 | |
6acbf033 | 3429 | #: builtin/checkout-index.c:205 |
ef317cd5 | 3430 | msgid "when creating files, prepend <string>" |
07432cef | 3431 | msgstr "在创建文件时,在前面加上<字符串>" |
ef317cd5 | 3432 | |
6acbf033 | 3433 | #: builtin/checkout-index.c:208 |
ef317cd5 | 3434 | msgid "copy out the files from named stage" |
07432cef | 3435 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 | 3436 | |
5bb01d4f | 3437 | #: builtin/checkout.c:24 |
814ff314 JX |
3438 | msgid "git checkout [<options>] <branch>" |
3439 | msgstr "git checkout [<选项>] <分支>" | |
ef317cd5 | 3440 | |
5bb01d4f | 3441 | #: builtin/checkout.c:25 |
814ff314 JX |
3442 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
3443 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." | |
ef317cd5 | 3444 | |
5bb01d4f | 3445 | #: builtin/checkout.c:134 builtin/checkout.c:167 |
c04f5ac3 JX |
3446 | #, c-format |
3447 | msgid "path '%s' does not have our version" | |
3448 | msgstr "路径 '%s' 没有我们的版本" | |
3449 | ||
5bb01d4f | 3450 | #: builtin/checkout.c:136 builtin/checkout.c:169 |
c04f5ac3 JX |
3451 | #, c-format |
3452 | msgid "path '%s' does not have their version" | |
3453 | msgstr "路径 '%s' 没有他们的版本" | |
3454 | ||
5bb01d4f | 3455 | #: builtin/checkout.c:152 |
c04f5ac3 JX |
3456 | #, c-format |
3457 | msgid "path '%s' does not have all necessary versions" | |
3458 | msgstr "路径 '%s' 没有全部必须的版本" | |
3459 | ||
5bb01d4f | 3460 | #: builtin/checkout.c:196 |
c04f5ac3 JX |
3461 | #, c-format |
3462 | msgid "path '%s' does not have necessary versions" | |
3463 | msgstr "路径 '%s' 没有必须的版本" | |
3464 | ||
5bb01d4f | 3465 | #: builtin/checkout.c:213 |
c04f5ac3 JX |
3466 | #, c-format |
3467 | msgid "path '%s': cannot merge" | |
90e6ef53 | 3468 | msgstr "path '%s':无法合并" |
c04f5ac3 | 3469 | |
5bb01d4f | 3470 | #: builtin/checkout.c:230 |
c04f5ac3 JX |
3471 | #, c-format |
3472 | msgid "Unable to add merge result for '%s'" | |
3473 | msgstr "无法为 '%s' 添加合并结果" | |
3474 | ||
5bb01d4f JX |
3475 | #: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 |
3476 | #: builtin/checkout.c:260 | |
07432cef | 3477 | #, c-format |
ef317cd5 | 3478 | msgid "'%s' cannot be used with updating paths" |
07432cef | 3479 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 3480 | |
5bb01d4f | 3481 | #: builtin/checkout.c:263 builtin/checkout.c:266 |
07432cef | 3482 | #, c-format |
ef317cd5 | 3483 | msgid "'%s' cannot be used with %s" |
07432cef | 3484 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 3485 | |
5bb01d4f | 3486 | #: builtin/checkout.c:269 |
ef317cd5 JX |
3487 | #, c-format |
3488 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 3489 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 3490 | |
5bb01d4f | 3491 | #: builtin/checkout.c:280 builtin/checkout.c:474 |
c04f5ac3 | 3492 | msgid "corrupt index file" |
90e6ef53 | 3493 | msgstr "损坏的索引文件" |
c04f5ac3 | 3494 | |
5bb01d4f | 3495 | #: builtin/checkout.c:340 builtin/checkout.c:347 |
c04f5ac3 JX |
3496 | #, c-format |
3497 | msgid "path '%s' is unmerged" | |
3498 | msgstr "路径 '%s' 未合并" | |
3499 | ||
5bb01d4f | 3500 | #: builtin/checkout.c:496 |
c04f5ac3 | 3501 | msgid "you need to resolve your current index first" |
90e6ef53 | 3502 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 3503 | |
5bb01d4f | 3504 | #: builtin/checkout.c:627 |
c04f5ac3 JX |
3505 | #, c-format |
3506 | msgid "Can not do reflog for '%s'\n" | |
90e6ef53 | 3507 | msgstr "不能对 '%s' 执行 reflog 操作\n" |
c04f5ac3 | 3508 | |
5bb01d4f | 3509 | #: builtin/checkout.c:663 |
c04f5ac3 JX |
3510 | msgid "HEAD is now at" |
3511 | msgstr "HEAD 目前位于" | |
3512 | ||
5bb01d4f | 3513 | #: builtin/checkout.c:670 |
c04f5ac3 JX |
3514 | #, c-format |
3515 | msgid "Reset branch '%s'\n" | |
3516 | msgstr "重置分支 '%s'\n" | |
3517 | ||
5bb01d4f | 3518 | #: builtin/checkout.c:673 |
c04f5ac3 JX |
3519 | #, c-format |
3520 | msgid "Already on '%s'\n" | |
3521 | msgstr "已经位于 '%s'\n" | |
3522 | ||
5bb01d4f | 3523 | #: builtin/checkout.c:677 |
c04f5ac3 JX |
3524 | #, c-format |
3525 | msgid "Switched to and reset branch '%s'\n" | |
3526 | msgstr "切换并重置分支 '%s'\n" | |
3527 | ||
5bb01d4f | 3528 | #: builtin/checkout.c:679 builtin/checkout.c:1134 |
c04f5ac3 JX |
3529 | #, c-format |
3530 | msgid "Switched to a new branch '%s'\n" | |
3531 | msgstr "切换到一个新分支 '%s'\n" | |
3532 | ||
5bb01d4f | 3533 | #: builtin/checkout.c:681 |
c04f5ac3 JX |
3534 | #, c-format |
3535 | msgid "Switched to branch '%s'\n" | |
3536 | msgstr "切换到分支 '%s'\n" | |
3537 | ||
90e6ef53 | 3538 | # 译者:注意保持前导空格 |
5bb01d4f | 3539 | #: builtin/checkout.c:733 |
c04f5ac3 JX |
3540 | #, c-format |
3541 | msgid " ... and %d more.\n" | |
90e6ef53 | 3542 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 | 3543 | |
5bb01d4f | 3544 | #: builtin/checkout.c:739 |
c04f5ac3 JX |
3545 | #, c-format |
3546 | msgid "" | |
3547 | "Warning: you are leaving %d commit behind, not connected to\n" | |
3548 | "any of your branches:\n" | |
3549 | "\n" | |
3550 | "%s\n" | |
3551 | msgid_plural "" | |
3552 | "Warning: you are leaving %d commits behind, not connected to\n" | |
3553 | "any of your branches:\n" | |
3554 | "\n" | |
3555 | "%s\n" | |
3556 | msgstr[0] "" | |
3557 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
3558 | "\n" | |
3559 | "%s\n" | |
5ae481e0 JX |
3560 | msgstr[1] "" |
3561 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
3562 | "\n" | |
3563 | "%s\n" | |
c04f5ac3 | 3564 | |
5bb01d4f | 3565 | #: builtin/checkout.c:758 |
c04f5ac3 JX |
3566 | #, c-format |
3567 | msgid "" | |
7aea43ff JX |
3568 | "If you want to keep it by creating a new branch, this may be a good time\n" |
3569 | "to do so with:\n" | |
3570 | "\n" | |
3571 | " git branch <new-branch-name> %s\n" | |
3572 | "\n" | |
3573 | msgid_plural "" | |
c04f5ac3 JX |
3574 | "If you want to keep them by creating a new branch, this may be a good time\n" |
3575 | "to do so with:\n" | |
3576 | "\n" | |
814ff314 | 3577 | " git branch <new-branch-name> %s\n" |
c04f5ac3 | 3578 | "\n" |
7aea43ff JX |
3579 | msgstr[0] "" |
3580 | "如果您想要通过创建新分支保存它,这可能是一个好时候。\n" | |
3581 | "如下操作:\n" | |
3582 | "\n" | |
3583 | " git branch <新分支名> %s\n" | |
3584 | "\n" | |
3585 | msgstr[1] "" | |
3586 | "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n" | |
c04f5ac3 JX |
3587 | "如下操作:\n" |
3588 | "\n" | |
814ff314 | 3589 | " git branch <新分支名> %s\n" |
c04f5ac3 JX |
3590 | "\n" |
3591 | ||
5bb01d4f | 3592 | #: builtin/checkout.c:794 |
c04f5ac3 JX |
3593 | msgid "internal error in revision walk" |
3594 | msgstr "在版本遍历时遇到内部错误" | |
3595 | ||
5bb01d4f | 3596 | #: builtin/checkout.c:798 |
c04f5ac3 JX |
3597 | msgid "Previous HEAD position was" |
3598 | msgstr "之前的 HEAD 位置是" | |
3599 | ||
5bb01d4f | 3600 | #: builtin/checkout.c:825 builtin/checkout.c:1129 |
c04f5ac3 | 3601 | msgid "You are on a branch yet to be born" |
90e6ef53 | 3602 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 3603 | |
5bb01d4f | 3604 | #: builtin/checkout.c:931 |
7aea43ff JX |
3605 | #, c-format |
3606 | msgid "'%s' is already checked out at '%s'" | |
3607 | msgstr "'%s' 已经检出到 '%s'" | |
3608 | ||
5bb01d4f | 3609 | #: builtin/checkout.c:1036 |
90314792 JX |
3610 | #, c-format |
3611 | msgid "only one reference expected, %d given." | |
3612 | msgstr "只要一个引用,却给出了 %d 个" | |
3613 | ||
5bb01d4f | 3614 | #: builtin/checkout.c:1075 |
c04f5ac3 JX |
3615 | #, c-format |
3616 | msgid "invalid reference: %s" | |
3617 | msgstr "无效引用:%s" | |
3618 | ||
5bb01d4f | 3619 | #: builtin/checkout.c:1104 |
c04f5ac3 JX |
3620 | #, c-format |
3621 | msgid "reference is not a tree: %s" | |
3622 | msgstr "引用不是一个树:%s" | |
3623 | ||
5bb01d4f | 3624 | #: builtin/checkout.c:1143 |
ef317cd5 | 3625 | msgid "paths cannot be used with switching branches" |
07432cef | 3626 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 3627 | |
5bb01d4f | 3628 | #: builtin/checkout.c:1146 builtin/checkout.c:1150 |
07432cef | 3629 | #, c-format |
ef317cd5 | 3630 | msgid "'%s' cannot be used with switching branches" |
07432cef | 3631 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 3632 | |
5bb01d4f JX |
3633 | #: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162 |
3634 | #: builtin/checkout.c:1165 | |
07432cef | 3635 | #, c-format |
ef317cd5 | 3636 | msgid "'%s' cannot be used with '%s'" |
07432cef | 3637 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 3638 | |
5bb01d4f | 3639 | #: builtin/checkout.c:1170 |
07432cef | 3640 | #, c-format |
ef317cd5 | 3641 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 3642 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 3643 | |
5bb01d4f JX |
3644 | #: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83 |
3645 | #: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282 | |
3646 | #: builtin/worktree.c:284 | |
ef317cd5 | 3647 | msgid "branch" |
07432cef | 3648 | msgstr "分支" |
c04f5ac3 | 3649 | |
5bb01d4f | 3650 | #: builtin/checkout.c:1204 |
ef317cd5 | 3651 | msgid "create and checkout a new branch" |
07432cef | 3652 | msgstr "创建并检出一个新的分支" |
c04f5ac3 | 3653 | |
5bb01d4f | 3654 | #: builtin/checkout.c:1206 |
ef317cd5 | 3655 | msgid "create/reset and checkout a branch" |
07432cef | 3656 | msgstr "创建/重置并检出一个分支" |
c04f5ac3 | 3657 | |
5bb01d4f | 3658 | #: builtin/checkout.c:1207 |
ef317cd5 | 3659 | msgid "create reflog for new branch" |
07432cef | 3660 | msgstr "为新的分支创建引用日志" |
ef317cd5 | 3661 | |
5bb01d4f | 3662 | #: builtin/checkout.c:1208 |
ef317cd5 | 3663 | msgid "detach the HEAD at named commit" |
07432cef | 3664 | msgstr "成为指向该提交的分离头指针" |
ef317cd5 | 3665 | |
5bb01d4f | 3666 | #: builtin/checkout.c:1209 |
ef317cd5 | 3667 | msgid "set upstream info for new branch" |
07432cef | 3668 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 3669 | |
5bb01d4f | 3670 | #: builtin/checkout.c:1211 |
6c94aba5 | 3671 | msgid "new-branch" |
07432cef | 3672 | msgstr "新分支" |
ef317cd5 | 3673 | |
5bb01d4f | 3674 | #: builtin/checkout.c:1211 |
ef317cd5 | 3675 | msgid "new unparented branch" |
07432cef | 3676 | msgstr "新的没有父提交的分支" |
ef317cd5 | 3677 | |
5bb01d4f | 3678 | #: builtin/checkout.c:1212 |
ef317cd5 | 3679 | msgid "checkout our version for unmerged files" |
07432cef | 3680 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 3681 | |
5bb01d4f | 3682 | #: builtin/checkout.c:1214 |
ef317cd5 | 3683 | msgid "checkout their version for unmerged files" |
07432cef | 3684 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 3685 | |
5bb01d4f | 3686 | #: builtin/checkout.c:1216 |
ef317cd5 | 3687 | msgid "force checkout (throw away local modifications)" |
07432cef | 3688 | msgstr "强制检出(丢弃本地修改)" |
c04f5ac3 | 3689 | |
5bb01d4f | 3690 | #: builtin/checkout.c:1217 |
ef317cd5 | 3691 | msgid "perform a 3-way merge with the new branch" |
07432cef | 3692 | msgstr "和新的分支执行三路合并" |
ef317cd5 | 3693 | |
5bb01d4f | 3694 | #: builtin/checkout.c:1218 builtin/merge.c:227 |
ef317cd5 | 3695 | msgid "update ignored files (default)" |
07432cef | 3696 | msgstr "更新忽略的文件(默认)" |
c04f5ac3 | 3697 | |
5bb01d4f | 3698 | #: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244 |
ef317cd5 | 3699 | msgid "style" |
07432cef | 3700 | msgstr "风格" |
ef317cd5 | 3701 | |
5bb01d4f | 3702 | #: builtin/checkout.c:1220 |
ef317cd5 | 3703 | msgid "conflict style (merge or diff3)" |
07432cef | 3704 | msgstr "冲突输出风格(merge 或 diff3)" |
ef317cd5 | 3705 | |
5bb01d4f | 3706 | #: builtin/checkout.c:1223 |
4dcdc3d8 JX |
3707 | msgid "do not limit pathspecs to sparse entries only" |
3708 | msgstr "对路径不做稀疏检出的限制" | |
3709 | ||
5bb01d4f | 3710 | #: builtin/checkout.c:1225 |
814ff314 JX |
3711 | msgid "second guess 'git checkout <no-such-branch>'" |
3712 | msgstr "二次猜测'git checkout <无此分支>'" | |
ef317cd5 | 3713 | |
5bb01d4f | 3714 | #: builtin/checkout.c:1227 |
7aea43ff JX |
3715 | msgid "do not check if another worktree is holding the given ref" |
3716 | msgstr "不检查指定的引用是否被其他工作区所占用" | |
3717 | ||
5bb01d4f | 3718 | #: builtin/checkout.c:1252 |
ef317cd5 | 3719 | msgid "-b, -B and --orphan are mutually exclusive" |
07432cef | 3720 | msgstr "-b、-B 和 --orphan 是互斥的" |
ef317cd5 | 3721 | |
5bb01d4f | 3722 | #: builtin/checkout.c:1269 |
ef317cd5 JX |
3723 | msgid "--track needs a branch name" |
3724 | msgstr "--track 需要一个分支名" | |
3725 | ||
5bb01d4f | 3726 | #: builtin/checkout.c:1274 |
ef317cd5 JX |
3727 | msgid "Missing branch name; try -b" |
3728 | msgstr "缺少分支名;尝试 -b" | |
3729 | ||
5bb01d4f | 3730 | #: builtin/checkout.c:1310 |
c04f5ac3 | 3731 | msgid "invalid path specification" |
90e6ef53 | 3732 | msgstr "无效的路径规格" |
c04f5ac3 | 3733 | |
5bb01d4f | 3734 | #: builtin/checkout.c:1317 |
07432cef | 3735 | #, c-format |
c04f5ac3 | 3736 | msgid "" |
ef317cd5 | 3737 | "Cannot update paths and switch to branch '%s' at the same time.\n" |
c04f5ac3 JX |
3738 | "Did you intend to checkout '%s' which can not be resolved as commit?" |
3739 | msgstr "" | |
07432cef WS |
3740 | "不能同时更新路径并切换到分支'%s'。\n" |
3741 | "您是想要检出 '%s' 但其未能解析为提交么?" | |
c04f5ac3 | 3742 | |
5bb01d4f | 3743 | #: builtin/checkout.c:1322 |
07432cef | 3744 | #, c-format |
ef317cd5 | 3745 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 3746 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 3747 | |
5bb01d4f | 3748 | #: builtin/checkout.c:1326 |
c04f5ac3 JX |
3749 | msgid "" |
3750 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
3751 | "checking out of the index." | |
3752 | msgstr "" | |
90e6ef53 | 3753 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 3754 | |
90314792 | 3755 | #: builtin/clean.c:26 |
2e8451e8 JX |
3756 | msgid "" |
3757 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
3758 | msgstr "" | |
3759 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 3760 | |
90314792 | 3761 | #: builtin/clean.c:30 |
07432cef WS |
3762 | #, c-format |
3763 | msgid "Removing %s\n" | |
3764 | msgstr "正删除 %s\n" | |
3765 | ||
90314792 | 3766 | #: builtin/clean.c:31 |
07432cef WS |
3767 | #, c-format |
3768 | msgid "Would remove %s\n" | |
3769 | msgstr "将删除 %s\n" | |
3770 | ||
90314792 | 3771 | #: builtin/clean.c:32 |
07432cef WS |
3772 | #, c-format |
3773 | msgid "Skipping repository %s\n" | |
3774 | msgstr "忽略版本库 %s\n" | |
3775 | ||
90314792 | 3776 | #: builtin/clean.c:33 |
07432cef WS |
3777 | #, c-format |
3778 | msgid "Would skip repository %s\n" | |
3779 | msgstr "将忽略版本库 %s\n" | |
3780 | ||
90314792 | 3781 | #: builtin/clean.c:34 |
07432cef WS |
3782 | #, c-format |
3783 | msgid "failed to remove %s" | |
3784 | msgstr "无法删除 %s" | |
3785 | ||
6c94aba5 | 3786 | #: builtin/clean.c:295 |
2e8451e8 JX |
3787 | msgid "" |
3788 | "Prompt help:\n" | |
3789 | "1 - select a numbered item\n" | |
3790 | "foo - select item based on unique prefix\n" | |
3791 | " - (empty) select nothing" | |
3792 | msgstr "" | |
3793 | "帮助:\n" | |
3794 | "1 - 通过编号选择一个选项\n" | |
3795 | "foo - 通过标题选择一个选项\n" | |
3796 | " - (空)什么也不选择" | |
3797 | ||
6c94aba5 | 3798 | #: builtin/clean.c:299 |
2e8451e8 JX |
3799 | msgid "" |
3800 | "Prompt help:\n" | |
3801 | "1 - select a single item\n" | |
3802 | "3-5 - select a range of items\n" | |
3803 | "2-3,6-9 - select multiple ranges\n" | |
3804 | "foo - select item based on unique prefix\n" | |
3805 | "-... - unselect specified items\n" | |
3806 | "* - choose all items\n" | |
3807 | " - (empty) finish selecting" | |
3808 | msgstr "" | |
3809 | "帮助:\n" | |
3810 | "1 - 选择一个选项\n" | |
3811 | "3-5 - 选择一个范围内的所有选项\n" | |
3812 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
3813 | "foo - 通过标题选择一个选项\n" | |
3814 | "-... - 反选特定的选项\n" | |
3815 | "* - 选择所有选项\n" | |
3816 | " - (空)结束选择" | |
3817 | ||
7aea43ff | 3818 | #: builtin/clean.c:515 |
2e8451e8 JX |
3819 | #, c-format |
3820 | msgid "Huh (%s)?" | |
3821 | msgstr "嗯(%s)?" | |
3822 | ||
7aea43ff | 3823 | #: builtin/clean.c:657 |
2e8451e8 JX |
3824 | #, c-format |
3825 | msgid "Input ignore patterns>> " | |
3826 | msgstr "输入模版以排除条目>> " | |
3827 | ||
7aea43ff | 3828 | #: builtin/clean.c:694 |
2e8451e8 JX |
3829 | #, c-format |
3830 | msgid "WARNING: Cannot find items matched by: %s" | |
3831 | msgstr "警告:无法找到和 %s 匹配的条目" | |
3832 | ||
7aea43ff | 3833 | #: builtin/clean.c:715 |
2e8451e8 JX |
3834 | msgid "Select items to delete" |
3835 | msgstr "选择要删除的条目" | |
3836 | ||
814ff314 | 3837 | #. TRANSLATORS: Make sure to keep [y/N] as is |
7aea43ff | 3838 | #: builtin/clean.c:756 |
2e8451e8 | 3839 | #, c-format |
814ff314 JX |
3840 | msgid "Remove %s [y/N]? " |
3841 | msgstr "删除 %s [y/N]?" | |
2e8451e8 | 3842 | |
7aea43ff | 3843 | #: builtin/clean.c:781 |
2e8451e8 JX |
3844 | msgid "Bye." |
3845 | msgstr "再见。" | |
3846 | ||
7aea43ff | 3847 | #: builtin/clean.c:789 |
2e8451e8 JX |
3848 | msgid "" |
3849 | "clean - start cleaning\n" | |
3850 | "filter by pattern - exclude items from deletion\n" | |
3851 | "select by numbers - select items to be deleted by numbers\n" | |
3852 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
3853 | "quit - stop cleaning\n" | |
3854 | "help - this screen\n" | |
3855 | "? - help for prompt selection" | |
3856 | msgstr "" | |
3857 | "clean - 开始清理\n" | |
3858 | "filter by pattern - 通过模版排除要删除的条目\n" | |
3859 | "select by numbers - 通过数字选择要删除的条目\n" | |
3860 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
3861 | "quit - 停止删除并退出\n" | |
3862 | "help - 显示本帮助\n" | |
3863 | "? - 显示如何在提示符下选择的帮助" | |
3864 | ||
7aea43ff | 3865 | #: builtin/clean.c:816 |
2e8451e8 JX |
3866 | msgid "*** Commands ***" |
3867 | msgstr "*** 命令 ***" | |
3868 | ||
7aea43ff | 3869 | #: builtin/clean.c:817 |
2e8451e8 JX |
3870 | msgid "What now" |
3871 | msgstr "请选择" | |
3872 | ||
7aea43ff | 3873 | #: builtin/clean.c:825 |
2e8451e8 JX |
3874 | msgid "Would remove the following item:" |
3875 | msgid_plural "Would remove the following items:" | |
3876 | msgstr[0] "将删除如下条目:" | |
3877 | msgstr[1] "将删除如下条目:" | |
3878 | ||
7aea43ff | 3879 | #: builtin/clean.c:842 |
2e8451e8 JX |
3880 | msgid "No more files to clean, exiting." |
3881 | msgstr "没有要清理的文件,退出。" | |
3882 | ||
7aea43ff | 3883 | #: builtin/clean.c:873 |
ef317cd5 | 3884 | msgid "do not print names of files removed" |
07432cef | 3885 | msgstr "不打印删除文件的名称" |
ef317cd5 | 3886 | |
7aea43ff | 3887 | #: builtin/clean.c:875 |
ef317cd5 | 3888 | msgid "force" |
07432cef | 3889 | msgstr "强制" |
ef317cd5 | 3890 | |
7aea43ff | 3891 | #: builtin/clean.c:876 |
2e8451e8 JX |
3892 | msgid "interactive cleaning" |
3893 | msgstr "交互式清除" | |
3894 | ||
7aea43ff | 3895 | #: builtin/clean.c:878 |
ef317cd5 | 3896 | msgid "remove whole directories" |
07432cef | 3897 | msgstr "删除整个目录" |
ef317cd5 | 3898 | |
7aea43ff JX |
3899 | #: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714 |
3900 | #: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187 | |
ef317cd5 | 3901 | msgid "pattern" |
07432cef | 3902 | msgstr "模式" |
ef317cd5 | 3903 | |
7aea43ff | 3904 | #: builtin/clean.c:880 |
ef317cd5 | 3905 | msgid "add <pattern> to ignore rules" |
07432cef | 3906 | msgstr "添加<模式>到忽略规则" |
ef317cd5 | 3907 | |
7aea43ff | 3908 | #: builtin/clean.c:881 |
ef317cd5 | 3909 | msgid "remove ignored files, too" |
07432cef | 3910 | msgstr "也删除忽略的文件" |
ef317cd5 | 3911 | |
7aea43ff | 3912 | #: builtin/clean.c:883 |
ef317cd5 | 3913 | msgid "remove only ignored files" |
07432cef | 3914 | msgstr "只删除忽略的文件" |
c04f5ac3 | 3915 | |
7aea43ff | 3916 | #: builtin/clean.c:901 |
c04f5ac3 | 3917 | msgid "-x and -X cannot be used together" |
649900bc | 3918 | msgstr "-x 和 -X 不能同时使用" |
c04f5ac3 | 3919 | |
7aea43ff | 3920 | #: builtin/clean.c:905 |
c04f5ac3 | 3921 | msgid "" |
6c94aba5 | 3922 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
2e8451e8 | 3923 | "clean" |
c04f5ac3 | 3924 | msgstr "" |
2e8451e8 | 3925 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 3926 | |
7aea43ff | 3927 | #: builtin/clean.c:908 |
c04f5ac3 | 3928 | msgid "" |
6c94aba5 | 3929 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
2e8451e8 | 3930 | "refusing to clean" |
c04f5ac3 | 3931 | msgstr "" |
2e8451e8 | 3932 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 3933 | |
220c313c | 3934 | #: builtin/clone.c:37 |
814ff314 JX |
3935 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
3936 | msgstr "git clone [<选项>] [--] <版本库> [<路径>]" | |
ef317cd5 | 3937 | |
7aea43ff | 3938 | #: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224 |
814ff314 | 3939 | #: builtin/push.c:523 |
ef317cd5 | 3940 | msgid "force progress reporting" |
07432cef | 3941 | msgstr "强制显示进度报告" |
ef317cd5 | 3942 | |
7aea43ff | 3943 | #: builtin/clone.c:59 |
ef317cd5 | 3944 | msgid "don't create a checkout" |
07432cef | 3945 | msgstr "不创建一个检出" |
ef317cd5 | 3946 | |
7aea43ff | 3947 | #: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503 |
ef317cd5 | 3948 | msgid "create a bare repository" |
220c313c | 3949 | msgstr "创建一个纯版本库" |
ef317cd5 | 3950 | |
7aea43ff | 3951 | #: builtin/clone.c:64 |
ef317cd5 | 3952 | msgid "create a mirror repository (implies bare)" |
220c313c | 3953 | msgstr "创建一个镜像版本库(也是纯版本库)" |
ef317cd5 | 3954 | |
7aea43ff | 3955 | #: builtin/clone.c:66 |
ef317cd5 | 3956 | msgid "to clone from a local repository" |
07432cef | 3957 | msgstr "从本地版本库克隆" |
ef317cd5 | 3958 | |
7aea43ff | 3959 | #: builtin/clone.c:68 |
ef317cd5 | 3960 | msgid "don't use local hardlinks, always copy" |
07432cef | 3961 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 3962 | |
7aea43ff | 3963 | #: builtin/clone.c:70 |
ef317cd5 | 3964 | msgid "setup as shared repository" |
07432cef | 3965 | msgstr "设置为共享版本库" |
ef317cd5 | 3966 | |
7aea43ff | 3967 | #: builtin/clone.c:72 builtin/clone.c:74 |
ef317cd5 | 3968 | msgid "initialize submodules in the clone" |
07432cef | 3969 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 3970 | |
7aea43ff | 3971 | #: builtin/clone.c:75 builtin/init-db.c:500 |
ef317cd5 | 3972 | msgid "template-directory" |
07432cef | 3973 | msgstr "模板目录" |
ef317cd5 | 3974 | |
7aea43ff | 3975 | #: builtin/clone.c:76 builtin/init-db.c:501 |
ef317cd5 | 3976 | msgid "directory from which templates will be used" |
07432cef | 3977 | msgstr "模板目录将被使用" |
ef317cd5 | 3978 | |
7aea43ff | 3979 | #: builtin/clone.c:78 |
ef317cd5 | 3980 | msgid "reference repository" |
cfff71a9 | 3981 | msgstr "参考版本库" |
ef317cd5 | 3982 | |
7aea43ff JX |
3983 | #: builtin/clone.c:80 |
3984 | msgid "use --reference only while cloning" | |
3985 | msgstr "仅在克隆时参考 --reference 指向的本地版本库" | |
3986 | ||
3987 | #: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44 | |
ef317cd5 | 3988 | msgid "name" |
07432cef | 3989 | msgstr "名称" |
ef317cd5 | 3990 | |
7aea43ff | 3991 | #: builtin/clone.c:82 |
ef317cd5 | 3992 | msgid "use <name> instead of 'origin' to track upstream" |
07432cef | 3993 | msgstr "使用<名称>而不是 'origin' 去跟踪上游" |
ef317cd5 | 3994 | |
7aea43ff | 3995 | #: builtin/clone.c:84 |
ef317cd5 | 3996 | msgid "checkout <branch> instead of the remote's HEAD" |
07432cef | 3997 | msgstr "检出<分支>而不是远程HEAD" |
ef317cd5 | 3998 | |
7aea43ff | 3999 | #: builtin/clone.c:86 |
ef317cd5 | 4000 | msgid "path to git-upload-pack on the remote" |
07432cef | 4001 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 4002 | |
7aea43ff | 4003 | #: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659 |
ef317cd5 | 4004 | msgid "depth" |
07432cef | 4005 | msgstr "深度" |
ef317cd5 | 4006 | |
7aea43ff | 4007 | #: builtin/clone.c:88 |
ef317cd5 | 4008 | msgid "create a shallow clone of that depth" |
07432cef | 4009 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 4010 | |
7aea43ff | 4011 | #: builtin/clone.c:90 |
ef317cd5 | 4012 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 4013 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 4014 | |
7aea43ff | 4015 | #: builtin/clone.c:91 builtin/init-db.c:509 |
ef317cd5 | 4016 | msgid "gitdir" |
07432cef | 4017 | msgstr "git目录" |
ef317cd5 | 4018 | |
7aea43ff | 4019 | #: builtin/clone.c:92 builtin/init-db.c:510 |
ef317cd5 | 4020 | msgid "separate git dir from working tree" |
07432cef | 4021 | msgstr "git目录和工作区分离" |
ef317cd5 | 4022 | |
7aea43ff | 4023 | #: builtin/clone.c:93 |
ef317cd5 | 4024 | msgid "key=value" |
07432cef | 4025 | msgstr "key=value" |
ef317cd5 | 4026 | |
7aea43ff | 4027 | #: builtin/clone.c:94 |
ef317cd5 | 4028 | msgid "set config inside the new repository" |
07432cef | 4029 | msgstr "在新版本库中设置配置信息" |
ef317cd5 | 4030 | |
5bb01d4f | 4031 | #: builtin/clone.c:240 |
c04f5ac3 | 4032 | #, c-format |
4dcdc3d8 | 4033 | msgid "reference repository '%s' is not a local repository." |
cfff71a9 | 4034 | msgstr "参考版本库 '%s' 不是一个本地版本库。" |
c04f5ac3 | 4035 | |
5bb01d4f | 4036 | #: builtin/clone.c:244 |
cfff71a9 JX |
4037 | #, c-format |
4038 | msgid "reference repository '%s' is shallow" | |
4039 | msgstr "参考版本库 '%s' 是一个浅克隆" | |
4040 | ||
5bb01d4f | 4041 | #: builtin/clone.c:247 |
cfff71a9 JX |
4042 | #, c-format |
4043 | msgid "reference repository '%s' is grafted" | |
4044 | msgstr "参考版本库 '%s' 已被嫁接" | |
4045 | ||
5bb01d4f | 4046 | #: builtin/clone.c:310 |
c04f5ac3 JX |
4047 | #, c-format |
4048 | msgid "failed to create directory '%s'" | |
90e6ef53 | 4049 | msgstr "无法创建目录 '%s'" |
c04f5ac3 | 4050 | |
5bb01d4f | 4051 | #: builtin/clone.c:312 builtin/diff.c:84 |
c04f5ac3 JX |
4052 | #, c-format |
4053 | msgid "failed to stat '%s'" | |
90e6ef53 | 4054 | msgstr "无法枚举 '%s' 状态" |
c04f5ac3 | 4055 | |
5bb01d4f | 4056 | #: builtin/clone.c:314 |
c04f5ac3 JX |
4057 | #, c-format |
4058 | msgid "%s exists and is not a directory" | |
4059 | msgstr "%s 存在且不是一个目录" | |
4060 | ||
5bb01d4f | 4061 | #: builtin/clone.c:328 |
c04f5ac3 JX |
4062 | #, c-format |
4063 | msgid "failed to stat %s\n" | |
90e6ef53 | 4064 | msgstr "无法枚举 %s 状态\n" |
c04f5ac3 | 4065 | |
5bb01d4f | 4066 | #: builtin/clone.c:350 |
c04f5ac3 JX |
4067 | #, c-format |
4068 | msgid "failed to create link '%s'" | |
90e6ef53 | 4069 | msgstr "无法创建链接 '%s'" |
c04f5ac3 | 4070 | |
5bb01d4f | 4071 | #: builtin/clone.c:354 |
c04f5ac3 JX |
4072 | #, c-format |
4073 | msgid "failed to copy file to '%s'" | |
90e6ef53 | 4074 | msgstr "无法拷贝文件至 '%s'" |
c04f5ac3 | 4075 | |
5bb01d4f | 4076 | #: builtin/clone.c:377 builtin/clone.c:551 |
c04f5ac3 JX |
4077 | #, c-format |
4078 | msgid "done.\n" | |
4079 | msgstr "完成。\n" | |
4080 | ||
5bb01d4f | 4081 | #: builtin/clone.c:389 |
1003b3a5 JX |
4082 | msgid "" |
4083 | "Clone succeeded, but checkout failed.\n" | |
4084 | "You can inspect what was checked out with 'git status'\n" | |
4085 | "and retry the checkout with 'git checkout -f HEAD'\n" | |
4086 | msgstr "" | |
4087 | "克隆成功,但是检出失败。\n" | |
4088 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
4089 | "'git checkout -f HEAD' 重试\n" | |
4090 | ||
5bb01d4f | 4091 | #: builtin/clone.c:466 |
c04f5ac3 JX |
4092 | #, c-format |
4093 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 4094 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 4095 | |
5bb01d4f | 4096 | #: builtin/clone.c:546 |
2e8451e8 JX |
4097 | #, c-format |
4098 | msgid "Checking connectivity... " | |
4099 | msgstr "检查连接... " | |
4100 | ||
5bb01d4f | 4101 | #: builtin/clone.c:549 |
1003b3a5 JX |
4102 | msgid "remote did not send all necessary objects" |
4103 | msgstr "远程没有发送所有必须的对象" | |
4104 | ||
5bb01d4f | 4105 | #: builtin/clone.c:613 |
c04f5ac3 JX |
4106 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
4107 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
4108 | ||
5bb01d4f | 4109 | #: builtin/clone.c:644 |
1003b3a5 JX |
4110 | msgid "unable to checkout working tree" |
4111 | msgstr "不能检出工作区" | |
4112 | ||
5bb01d4f | 4113 | #: builtin/clone.c:731 |
04cb2f28 JX |
4114 | msgid "cannot repack to clean up" |
4115 | msgstr "无法执行 repack 来清理" | |
4116 | ||
5bb01d4f | 4117 | #: builtin/clone.c:733 |
04cb2f28 JX |
4118 | msgid "cannot unlink temporary alternates file" |
4119 | msgstr "无法删除临时的 alternates 文件" | |
4120 | ||
5bb01d4f | 4121 | #: builtin/clone.c:763 |
c04f5ac3 JX |
4122 | msgid "Too many arguments." |
4123 | msgstr "太多参数。" | |
4124 | ||
5bb01d4f | 4125 | #: builtin/clone.c:767 |
c04f5ac3 | 4126 | msgid "You must specify a repository to clone." |
90e6ef53 | 4127 | msgstr "您必须指定一个版本库来克隆。" |
c04f5ac3 | 4128 | |
5bb01d4f | 4129 | #: builtin/clone.c:778 |
c04f5ac3 JX |
4130 | #, c-format |
4131 | msgid "--bare and --origin %s options are incompatible." | |
4132 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
4133 | ||
5bb01d4f | 4134 | #: builtin/clone.c:781 |
07432cef WS |
4135 | msgid "--bare and --separate-git-dir are incompatible." |
4136 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
4137 | ||
5bb01d4f | 4138 | #: builtin/clone.c:794 |
c04f5ac3 JX |
4139 | #, c-format |
4140 | msgid "repository '%s' does not exist" | |
4141 | msgstr "版本库 '%s' 不存在" | |
4142 | ||
5bb01d4f | 4143 | #: builtin/clone.c:800 builtin/fetch.c:1160 |
cfff71a9 JX |
4144 | #, c-format |
4145 | msgid "depth %s is not a positive number" | |
4146 | msgstr "深度 %s 不是一个正数" | |
4147 | ||
5bb01d4f | 4148 | #: builtin/clone.c:810 |
c04f5ac3 JX |
4149 | #, c-format |
4150 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 4151 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 4152 | |
5bb01d4f | 4153 | #: builtin/clone.c:820 |
c04f5ac3 JX |
4154 | #, c-format |
4155 | msgid "working tree '%s' already exists." | |
4156 | msgstr "工作区 '%s' 已经存在。" | |
4157 | ||
5bb01d4f JX |
4158 | #: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193 |
4159 | #: builtin/worktree.c:220 | |
4160 | #, c-format | |
4161 | msgid "could not create leading directories of '%s'" | |
4162 | msgstr "不能为 '%s' 创建先导目录" | |
4163 | ||
4164 | #: builtin/clone.c:838 | |
c04f5ac3 | 4165 | #, c-format |
814ff314 JX |
4166 | msgid "could not create work tree dir '%s'" |
4167 | msgstr "不能创建工作区目录 '%s'" | |
c04f5ac3 | 4168 | |
5bb01d4f | 4169 | #: builtin/clone.c:856 |
c04f5ac3 JX |
4170 | #, c-format |
4171 | msgid "Cloning into bare repository '%s'...\n" | |
220c313c | 4172 | msgstr "克隆到纯版本库 '%s'...\n" |
c04f5ac3 | 4173 | |
5bb01d4f | 4174 | #: builtin/clone.c:858 |
c04f5ac3 JX |
4175 | #, c-format |
4176 | msgid "Cloning into '%s'...\n" | |
4177 | msgstr "正克隆到 '%s'...\n" | |
4178 | ||
5bb01d4f | 4179 | #: builtin/clone.c:883 |
04cb2f28 JX |
4180 | msgid "--dissociate given, but there is no --reference" |
4181 | msgstr "提供了参数 --dissociate,但未提供 --reference" | |
4182 | ||
5bb01d4f | 4183 | #: builtin/clone.c:900 |
6acbf033 JX |
4184 | msgid "--depth is ignored in local clones; use file:// instead." |
4185 | msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。" | |
4186 | ||
5bb01d4f | 4187 | #: builtin/clone.c:903 |
6acbf033 JX |
4188 | msgid "source repository is shallow, ignoring --local" |
4189 | msgstr "源版本库是浅克隆,忽略 --local" | |
4190 | ||
5bb01d4f | 4191 | #: builtin/clone.c:908 |
6acbf033 JX |
4192 | msgid "--local is ignored" |
4193 | msgstr "--local 被忽略" | |
4194 | ||
5bb01d4f | 4195 | #: builtin/clone.c:912 |
c04f5ac3 JX |
4196 | #, c-format |
4197 | msgid "Don't know how to clone %s" | |
4198 | msgstr "不知道如何克隆 %s" | |
4199 | ||
5bb01d4f | 4200 | #: builtin/clone.c:961 builtin/clone.c:969 |
c04f5ac3 JX |
4201 | #, c-format |
4202 | msgid "Remote branch %s not found in upstream %s" | |
4203 | msgstr "远程分支 %s 在上游 %s 未发现" | |
4204 | ||
5bb01d4f | 4205 | #: builtin/clone.c:972 |
c04f5ac3 JX |
4206 | msgid "You appear to have cloned an empty repository." |
4207 | msgstr "您似乎克隆了一个空版本库。" | |
4208 | ||
ef317cd5 | 4209 | #: builtin/column.c:9 |
814ff314 JX |
4210 | msgid "git column [<options>]" |
4211 | msgstr "git column [<选项>]" | |
ef317cd5 JX |
4212 | |
4213 | #: builtin/column.c:26 | |
4214 | msgid "lookup config vars" | |
07432cef | 4215 | msgstr "查找配置变量" |
ef317cd5 JX |
4216 | |
4217 | #: builtin/column.c:27 builtin/column.c:28 | |
ef317cd5 | 4218 | msgid "layout to use" |
07432cef | 4219 | msgstr "要使用的布局" |
ef317cd5 JX |
4220 | |
4221 | #: builtin/column.c:29 | |
4222 | msgid "Maximum width" | |
07432cef | 4223 | msgstr "最大宽度" |
ef317cd5 JX |
4224 | |
4225 | #: builtin/column.c:30 | |
4226 | msgid "Padding space on left border" | |
07432cef | 4227 | msgstr "左边框的填充空间" |
ef317cd5 JX |
4228 | |
4229 | #: builtin/column.c:31 | |
4230 | msgid "Padding space on right border" | |
07432cef | 4231 | msgstr "右边框的填充空间" |
ef317cd5 JX |
4232 | |
4233 | #: builtin/column.c:32 | |
4234 | msgid "Padding space between columns" | |
07432cef | 4235 | msgstr "两列之间的填充空间" |
ef317cd5 | 4236 | |
8ada9598 JX |
4237 | #: builtin/column.c:51 |
4238 | msgid "--command must be the first argument" | |
81809b99 | 4239 | msgstr "--command 必须是第一个参数" |
8ada9598 | 4240 | |
220c313c | 4241 | #: builtin/commit.c:37 |
814ff314 JX |
4242 | msgid "git commit [<options>] [--] <pathspec>..." |
4243 | msgstr "git commit [<选项>] [--] <路径规则>..." | |
ef317cd5 | 4244 | |
220c313c | 4245 | #: builtin/commit.c:42 |
814ff314 JX |
4246 | msgid "git status [<options>] [--] <pathspec>..." |
4247 | msgstr "git status [<选项>] [--] <路径规则>..." | |
ef317cd5 | 4248 | |
220c313c JX |
4249 | #: builtin/commit.c:47 |
4250 | msgid "" | |
4251 | "Your name and email address were configured automatically based\n" | |
4252 | "on your username and hostname. Please check that they are accurate.\n" | |
4253 | "You can suppress this message by setting them explicitly. Run the\n" | |
4254 | "following command and follow the instructions in your editor to edit\n" | |
4255 | "your configuration file:\n" | |
4256 | "\n" | |
4257 | " git config --global --edit\n" | |
4258 | "\n" | |
4259 | "After doing this, you may fix the identity used for this commit with:\n" | |
4260 | "\n" | |
4261 | " git commit --amend --reset-author\n" | |
4262 | msgstr "" | |
4263 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
4264 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" | |
4265 | "中编辑您的配置文件:\n" | |
4266 | "\n" | |
4267 | " git config --global --edit\n" | |
4268 | "\n" | |
4269 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
4270 | "\n" | |
4271 | " git commit --amend --reset-author\n" | |
4272 | ||
4273 | #: builtin/commit.c:60 | |
c04f5ac3 JX |
4274 | msgid "" |
4275 | "Your name and email address were configured automatically based\n" | |
4276 | "on your username and hostname. Please check that they are accurate.\n" | |
4277 | "You can suppress this message by setting them explicitly:\n" | |
4278 | "\n" | |
4279 | " git config --global user.name \"Your Name\"\n" | |
4280 | " git config --global user.email you@example.com\n" | |
4281 | "\n" | |
4282 | "After doing this, you may fix the identity used for this commit with:\n" | |
4283 | "\n" | |
4284 | " git commit --amend --reset-author\n" | |
4285 | msgstr "" | |
90e6ef53 | 4286 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" |
220c313c | 4287 | "与否。您可以对其进行设置以免再出现本提示信息:\n" |
c04f5ac3 JX |
4288 | "\n" |
4289 | " git config --global user.name \"Your Name\"\n" | |
4290 | " git config --global user.email you@example.com\n" | |
4291 | "\n" | |
90e6ef53 | 4292 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" |
c04f5ac3 JX |
4293 | "\n" |
4294 | " git commit --amend --reset-author\n" | |
4295 | ||
220c313c | 4296 | #: builtin/commit.c:72 |
c04f5ac3 JX |
4297 | msgid "" |
4298 | "You asked to amend the most recent commit, but doing so would make\n" | |
4299 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
4300 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
4301 | msgstr "" | |
1b150dc9 T |
4302 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
4303 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 4304 | |
220c313c | 4305 | #: builtin/commit.c:77 |
c04f5ac3 JX |
4306 | msgid "" |
4307 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
4308 | "If you wish to commit it anyway, use:\n" | |
4309 | "\n" | |
4310 | " git commit --allow-empty\n" | |
4311 | "\n" | |
c04f5ac3 | 4312 | msgstr "" |
a9ce4543 T |
4313 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
4314 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
4315 | "\n" |
4316 | " git commit --allow-empty\n" | |
4317 | "\n" | |
c04f5ac3 | 4318 | |
220c313c | 4319 | #: builtin/commit.c:84 |
b1894384 JX |
4320 | msgid "Otherwise, please use 'git reset'\n" |
4321 | msgstr "否则,请使用命令 'git reset'\n" | |
4322 | ||
220c313c | 4323 | #: builtin/commit.c:87 |
b1894384 JX |
4324 | msgid "" |
4325 | "If you wish to skip this commit, use:\n" | |
4326 | "\n" | |
4327 | " git reset\n" | |
4328 | "\n" | |
4329 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" | |
4330 | "the remaining commits.\n" | |
4331 | msgstr "" | |
4332 | "如果您想跳过这个提交,使用命令:\n" | |
4333 | "\n" | |
4334 | " git reset\n" | |
4335 | "\n" | |
4336 | "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" | |
4337 | "操作。\n" | |
4338 | ||
44f518e6 | 4339 | #: builtin/commit.c:304 |
c04f5ac3 | 4340 | msgid "failed to unpack HEAD tree object" |
90e6ef53 | 4341 | msgstr "无法解包 HEAD 树对象" |
c04f5ac3 | 4342 | |
44f518e6 | 4343 | #: builtin/commit.c:344 |
c04f5ac3 | 4344 | msgid "unable to create temporary index" |
90e6ef53 | 4345 | msgstr "不能创建临时索引" |
c04f5ac3 | 4346 | |
44f518e6 | 4347 | #: builtin/commit.c:350 |
c04f5ac3 JX |
4348 | msgid "interactive add failed" |
4349 | msgstr "交互式添加失败" | |
4350 | ||
44f518e6 | 4351 | #: builtin/commit.c:361 |
220c313c JX |
4352 | msgid "unable to write index file" |
4353 | msgstr "无法写入索引文件" | |
4354 | ||
44f518e6 | 4355 | #: builtin/commit.c:363 |
220c313c JX |
4356 | msgid "unable to update temporary index" |
4357 | msgstr "无法更新临时索引" | |
4358 | ||
44f518e6 | 4359 | #: builtin/commit.c:365 |
220c313c JX |
4360 | msgid "Failed to update main cache tree" |
4361 | msgstr "不能更新树的主缓存" | |
4362 | ||
44f518e6 | 4363 | #: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463 |
c04f5ac3 | 4364 | msgid "unable to write new_index file" |
90e6ef53 | 4365 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 4366 | |
44f518e6 | 4367 | #: builtin/commit.c:445 |
8ada9598 | 4368 | msgid "cannot do a partial commit during a merge." |
81809b99 | 4369 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 4370 | |
44f518e6 | 4371 | #: builtin/commit.c:447 |
8ada9598 | 4372 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 4373 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 4374 | |
44f518e6 | 4375 | #: builtin/commit.c:456 |
c04f5ac3 | 4376 | msgid "cannot read the index" |
90e6ef53 | 4377 | msgstr "无法读取索引" |
c04f5ac3 | 4378 | |
44f518e6 | 4379 | #: builtin/commit.c:475 |
c04f5ac3 | 4380 | msgid "unable to write temporary index file" |
90e6ef53 | 4381 | msgstr "无法写临时索引文件" |
c04f5ac3 | 4382 | |
44f518e6 | 4383 | #: builtin/commit.c:580 |
220c313c JX |
4384 | #, c-format |
4385 | msgid "commit '%s' lacks author header" | |
4386 | msgstr "提交 '%s' 缺少作者信息" | |
4387 | ||
44f518e6 | 4388 | #: builtin/commit.c:582 |
c04f5ac3 | 4389 | #, c-format |
220c313c JX |
4390 | msgid "commit '%s' has malformed author line" |
4391 | msgstr "提交 '%s' 有非法的作者信息" | |
c04f5ac3 | 4392 | |
44f518e6 | 4393 | #: builtin/commit.c:601 |
c04f5ac3 JX |
4394 | msgid "malformed --author parameter" |
4395 | msgstr "非法的 --author 参数" | |
4396 | ||
44f518e6 | 4397 | #: builtin/commit.c:609 |
c04f5ac3 | 4398 | #, c-format |
6acbf033 JX |
4399 | msgid "invalid date format: %s" |
4400 | msgstr "无效的日期格式:%s" | |
4401 | ||
44f518e6 | 4402 | #: builtin/commit.c:653 |
6acbf033 JX |
4403 | msgid "" |
4404 | "unable to select a comment character that is not used\n" | |
4405 | "in the current commit message" | |
4406 | msgstr "无法选择一个未被当前提交说明使用的注释字符" | |
4407 | ||
44f518e6 | 4408 | #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 |
c04f5ac3 JX |
4409 | #, c-format |
4410 | msgid "could not lookup commit %s" | |
4411 | msgstr "不能查询提交 %s" | |
4412 | ||
44f518e6 | 4413 | #: builtin/commit.c:702 builtin/shortlog.c:273 |
c04f5ac3 JX |
4414 | #, c-format |
4415 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 4416 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 4417 | |
44f518e6 | 4418 | #: builtin/commit.c:704 |
c04f5ac3 | 4419 | msgid "could not read log from standard input" |
90e6ef53 | 4420 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 4421 | |
44f518e6 | 4422 | #: builtin/commit.c:708 |
c04f5ac3 JX |
4423 | #, c-format |
4424 | msgid "could not read log file '%s'" | |
90e6ef53 | 4425 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 4426 | |
44f518e6 | 4427 | #: builtin/commit.c:730 |
c04f5ac3 | 4428 | msgid "could not read MERGE_MSG" |
90e6ef53 | 4429 | msgstr "不能读取 MERGE_MSG" |
c04f5ac3 | 4430 | |
44f518e6 | 4431 | #: builtin/commit.c:734 |
c04f5ac3 | 4432 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 4433 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 4434 | |
7aea43ff | 4435 | #: builtin/commit.c:738 builtin/merge.c:1079 |
c04f5ac3 JX |
4436 | #, c-format |
4437 | msgid "could not read '%s'" | |
90e6ef53 | 4438 | msgstr "不能读取 '%s'" |
c04f5ac3 | 4439 | |
44f518e6 | 4440 | #: builtin/commit.c:785 |
c04f5ac3 | 4441 | msgid "could not write commit template" |
90e6ef53 | 4442 | msgstr "不能写提交模版" |
c04f5ac3 | 4443 | |
44f518e6 | 4444 | #: builtin/commit.c:803 |
81809b99 | 4445 | #, c-format |
c04f5ac3 JX |
4446 | msgid "" |
4447 | "\n" | |
8ada9598 | 4448 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
4449 | "If this is not correct, please remove the file\n" |
4450 | "\t%s\n" | |
4451 | "and try again.\n" | |
4452 | msgstr "" | |
4453 | "\n" | |
649900bc | 4454 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
4455 | "\t%s\n" |
4456 | "然后重试。\n" | |
4457 | ||
44f518e6 | 4458 | #: builtin/commit.c:808 |
81809b99 | 4459 | #, c-format |
8ada9598 JX |
4460 | msgid "" |
4461 | "\n" | |
4462 | "It looks like you may be committing a cherry-pick.\n" | |
4463 | "If this is not correct, please remove the file\n" | |
4464 | "\t%s\n" | |
4465 | "and try again.\n" | |
4466 | msgstr "" | |
4467 | "\n" | |
649900bc | 4468 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
4469 | "\t%s\n" |
4470 | "然后重试。\n" | |
c04f5ac3 | 4471 | |
44f518e6 | 4472 | #: builtin/commit.c:821 |
a77c07d9 | 4473 | #, c-format |
c04f5ac3 | 4474 | msgid "" |
8ada9598 | 4475 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 4476 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
c04f5ac3 | 4477 | msgstr "" |
a77c07d9 | 4478 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
81809b99 | 4479 | "说明将会终止提交。\n" |
c04f5ac3 | 4480 | |
44f518e6 | 4481 | #: builtin/commit.c:828 |
a77c07d9 | 4482 | #, c-format |
c04f5ac3 | 4483 | msgid "" |
8ada9598 | 4484 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 4485 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
c04f5ac3 JX |
4486 | "An empty message aborts the commit.\n" |
4487 | msgstr "" | |
a77c07d9 JX |
4488 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
4489 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 4490 | |
90e6ef53 | 4491 | # 译者:为保证在输出中对齐,注意调整句中空格! |
44f518e6 | 4492 | #: builtin/commit.c:848 |
6acbf033 JX |
4493 | #, c-format |
4494 | msgid "%sAuthor: %.*s <%.*s>" | |
4495 | msgstr "%s作者: %.*s <%.*s>" | |
4496 | ||
4497 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
44f518e6 | 4498 | #: builtin/commit.c:856 |
c04f5ac3 | 4499 | #, c-format |
6acbf033 JX |
4500 | msgid "%sDate: %s" |
4501 | msgstr "%s日期: %s" | |
c04f5ac3 | 4502 | |
90e6ef53 | 4503 | # 译者:为保证在输出中对齐,注意调整句中空格! |
44f518e6 | 4504 | #: builtin/commit.c:863 |
c04f5ac3 | 4505 | #, c-format |
6acbf033 JX |
4506 | msgid "%sCommitter: %.*s <%.*s>" |
4507 | msgstr "%s提交者:%.*s <%.*s>" | |
c04f5ac3 | 4508 | |
44f518e6 | 4509 | #: builtin/commit.c:881 |
c04f5ac3 | 4510 | msgid "Cannot read index" |
90e6ef53 | 4511 | msgstr "无法读取索引" |
c04f5ac3 | 4512 | |
44f518e6 | 4513 | #: builtin/commit.c:938 |
c04f5ac3 JX |
4514 | msgid "Error building trees" |
4515 | msgstr "无法创建树对象" | |
4516 | ||
44f518e6 | 4517 | #: builtin/commit.c:953 builtin/tag.c:495 |
c04f5ac3 JX |
4518 | #, c-format |
4519 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 4520 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 4521 | |
44f518e6 | 4522 | #: builtin/commit.c:1055 |
c04f5ac3 | 4523 | #, c-format |
814ff314 JX |
4524 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
4525 | msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配" | |
c04f5ac3 | 4526 | |
44f518e6 | 4527 | #: builtin/commit.c:1070 builtin/commit.c:1310 |
c04f5ac3 JX |
4528 | #, c-format |
4529 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 4530 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 4531 | |
44f518e6 | 4532 | #: builtin/commit.c:1107 |
2e8451e8 JX |
4533 | msgid "--long and -z are incompatible" |
4534 | msgstr "--long 和 -z 选项不兼容" | |
4535 | ||
44f518e6 | 4536 | #: builtin/commit.c:1137 |
c04f5ac3 JX |
4537 | msgid "Using both --reset-author and --author does not make sense" |
4538 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
4539 | ||
44f518e6 | 4540 | #: builtin/commit.c:1146 |
c04f5ac3 | 4541 | msgid "You have nothing to amend." |
90e6ef53 | 4542 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 4543 | |
44f518e6 | 4544 | #: builtin/commit.c:1149 |
8ada9598 | 4545 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 4546 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 4547 | |
44f518e6 | 4548 | #: builtin/commit.c:1151 |
8ada9598 | 4549 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 4550 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 4551 | |
44f518e6 | 4552 | #: builtin/commit.c:1154 |
c04f5ac3 | 4553 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 4554 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 4555 | |
44f518e6 | 4556 | #: builtin/commit.c:1164 |
c04f5ac3 JX |
4557 | msgid "Only one of -c/-C/-F/--fixup can be used." |
4558 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
4559 | ||
44f518e6 | 4560 | #: builtin/commit.c:1166 |
c04f5ac3 | 4561 | msgid "Option -m cannot be combined with -c/-C/-F/--fixup." |
649900bc | 4562 | msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" |
c04f5ac3 | 4563 | |
44f518e6 | 4564 | #: builtin/commit.c:1174 |
c04f5ac3 | 4565 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 4566 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 4567 | |
44f518e6 | 4568 | #: builtin/commit.c:1191 |
c04f5ac3 JX |
4569 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
4570 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
4571 | ||
44f518e6 | 4572 | #: builtin/commit.c:1193 |
c04f5ac3 JX |
4573 | msgid "No paths with --include/--only does not make sense." |
4574 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
4575 | ||
44f518e6 | 4576 | #: builtin/commit.c:1195 |
c04f5ac3 | 4577 | msgid "Clever... amending the last one with dirty index." |
90e6ef53 | 4578 | msgstr "聪明... 在索引不干净下修补最后的提交。" |
c04f5ac3 | 4579 | |
44f518e6 | 4580 | #: builtin/commit.c:1197 |
6c94aba5 JX |
4581 | msgid "Explicit paths specified without -i or -o; assuming --only paths..." |
4582 | msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..." | |
c04f5ac3 | 4583 | |
44f518e6 | 4584 | #: builtin/commit.c:1209 builtin/tag.c:728 |
c04f5ac3 JX |
4585 | #, c-format |
4586 | msgid "Invalid cleanup mode %s" | |
4587 | msgstr "无效的清理模式 %s" | |
4588 | ||
44f518e6 | 4589 | #: builtin/commit.c:1214 |
c04f5ac3 | 4590 | msgid "Paths with -a does not make sense." |
649900bc | 4591 | msgstr "路径和 -a 选项同时使用没有意义。" |
c04f5ac3 | 4592 | |
7aea43ff | 4593 | #: builtin/commit.c:1324 builtin/commit.c:1603 |
ef317cd5 | 4594 | msgid "show status concisely" |
07432cef | 4595 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 4596 | |
7aea43ff | 4597 | #: builtin/commit.c:1326 builtin/commit.c:1605 |
ef317cd5 | 4598 | msgid "show branch information" |
07432cef | 4599 | msgstr "显示分支信息" |
ef317cd5 | 4600 | |
7aea43ff | 4601 | #: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509 |
ef317cd5 | 4602 | msgid "machine-readable output" |
07432cef WS |
4603 | msgstr "机器可读的输出" |
4604 | ||
7aea43ff | 4605 | #: builtin/commit.c:1331 builtin/commit.c:1609 |
07432cef WS |
4606 | msgid "show status in long format (default)" |
4607 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 4608 | |
7aea43ff | 4609 | #: builtin/commit.c:1334 builtin/commit.c:1612 |
ef317cd5 | 4610 | msgid "terminate entries with NUL" |
07432cef | 4611 | msgstr "条目以NUL字符结尾" |
ef317cd5 | 4612 | |
7aea43ff | 4613 | #: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980 |
220c313c | 4614 | #: builtin/fast-export.c:983 builtin/tag.c:603 |
ef317cd5 | 4615 | msgid "mode" |
07432cef | 4616 | msgstr "模式" |
ef317cd5 | 4617 | |
7aea43ff | 4618 | #: builtin/commit.c:1337 builtin/commit.c:1615 |
ef317cd5 | 4619 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 4620 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 4621 | |
44f518e6 | 4622 | #: builtin/commit.c:1340 |
ef317cd5 | 4623 | msgid "show ignored files" |
07432cef | 4624 | msgstr "显示忽略的文件" |
ef317cd5 | 4625 | |
7aea43ff | 4626 | #: builtin/commit.c:1341 parse-options.h:152 |
ef317cd5 JX |
4627 | msgid "when" |
4628 | msgstr "何时" | |
4629 | ||
44f518e6 | 4630 | #: builtin/commit.c:1342 |
ef317cd5 JX |
4631 | msgid "" |
4632 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
4633 | "(Default: all)" | |
4634 | msgstr "" | |
07432cef | 4635 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 4636 | |
44f518e6 | 4637 | #: builtin/commit.c:1344 |
ef317cd5 | 4638 | msgid "list untracked files in columns" |
07432cef | 4639 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 4640 | |
7aea43ff | 4641 | #: builtin/commit.c:1430 |
c04f5ac3 JX |
4642 | msgid "couldn't look up newly created commit" |
4643 | msgstr "无法找到新创建的提交" | |
4644 | ||
7aea43ff | 4645 | #: builtin/commit.c:1432 |
c04f5ac3 | 4646 | msgid "could not parse newly created commit" |
90e6ef53 | 4647 | msgstr "不能解析新创建的提交" |
c04f5ac3 | 4648 | |
7aea43ff | 4649 | #: builtin/commit.c:1477 |
c04f5ac3 JX |
4650 | msgid "detached HEAD" |
4651 | msgstr "分离头指针" | |
4652 | ||
7e238ab7 | 4653 | # 译者:中文字符串拼接,可删除前导空格 |
7aea43ff | 4654 | #: builtin/commit.c:1480 |
c04f5ac3 | 4655 | msgid " (root-commit)" |
7e238ab7 | 4656 | msgstr "(根提交)" |
c04f5ac3 | 4657 | |
7aea43ff | 4658 | #: builtin/commit.c:1573 |
ef317cd5 | 4659 | msgid "suppress summary after successful commit" |
07432cef | 4660 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 4661 | |
7aea43ff | 4662 | #: builtin/commit.c:1574 |
ef317cd5 | 4663 | msgid "show diff in commit message template" |
07432cef | 4664 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 4665 | |
7aea43ff | 4666 | #: builtin/commit.c:1576 |
ef317cd5 | 4667 | msgid "Commit message options" |
07432cef | 4668 | msgstr "提交说明选项" |
c04f5ac3 | 4669 | |
7aea43ff | 4670 | #: builtin/commit.c:1577 builtin/tag.c:601 |
ef317cd5 | 4671 | msgid "read message from file" |
07432cef | 4672 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 4673 | |
7aea43ff | 4674 | #: builtin/commit.c:1578 |
ef317cd5 | 4675 | msgid "author" |
07432cef | 4676 | msgstr "作者" |
c04f5ac3 | 4677 | |
7aea43ff | 4678 | #: builtin/commit.c:1578 |
ef317cd5 | 4679 | msgid "override author for commit" |
07432cef | 4680 | msgstr "提交时覆盖作者" |
73a60cd2 | 4681 | |
7aea43ff | 4682 | #: builtin/commit.c:1579 builtin/gc.c:280 |
ef317cd5 | 4683 | msgid "date" |
07432cef | 4684 | msgstr "日期" |
c04f5ac3 | 4685 | |
7aea43ff | 4686 | #: builtin/commit.c:1579 |
ef317cd5 | 4687 | msgid "override date for commit" |
07432cef | 4688 | msgstr "提交时覆盖日期" |
c04f5ac3 | 4689 | |
7aea43ff | 4690 | #: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391 |
04cb2f28 | 4691 | #: builtin/notes.c:554 builtin/tag.c:599 |
ef317cd5 | 4692 | msgid "message" |
07432cef | 4693 | msgstr "说明" |
c04f5ac3 | 4694 | |
7aea43ff | 4695 | #: builtin/commit.c:1580 |
ef317cd5 | 4696 | msgid "commit message" |
07432cef | 4697 | msgstr "提交说明" |
ef317cd5 | 4698 | |
7aea43ff | 4699 | #: builtin/commit.c:1581 |
ef317cd5 | 4700 | msgid "reuse and edit message from specified commit" |
07432cef | 4701 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 4702 | |
7aea43ff | 4703 | #: builtin/commit.c:1582 |
ef317cd5 | 4704 | msgid "reuse message from specified commit" |
07432cef | 4705 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 4706 | |
7aea43ff | 4707 | #: builtin/commit.c:1583 |
ef317cd5 | 4708 | msgid "use autosquash formatted message to fixup specified commit" |
07432cef | 4709 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
ef317cd5 | 4710 | |
7aea43ff | 4711 | #: builtin/commit.c:1584 |
ef317cd5 | 4712 | msgid "use autosquash formatted message to squash specified commit" |
07432cef | 4713 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
ef317cd5 | 4714 | |
7aea43ff | 4715 | #: builtin/commit.c:1585 |
ef317cd5 | 4716 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 4717 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 4718 | |
7aea43ff | 4719 | #: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86 |
ef317cd5 | 4720 | msgid "add Signed-off-by:" |
07432cef | 4721 | msgstr "添加 Signed-off-by: 签名" |
ef317cd5 | 4722 | |
7aea43ff | 4723 | #: builtin/commit.c:1587 |
ef317cd5 | 4724 | msgid "use specified template file" |
07432cef | 4725 | msgstr "使用指定的模板文件" |
ef317cd5 | 4726 | |
7aea43ff | 4727 | #: builtin/commit.c:1588 |
ef317cd5 | 4728 | msgid "force edit of commit" |
07432cef | 4729 | msgstr "强制编辑提交" |
ef317cd5 | 4730 | |
07432cef | 4731 | # 译者:可选值,不能翻译(或是原文中笔误,应为 mode) |
7aea43ff | 4732 | #: builtin/commit.c:1589 |
ef317cd5 | 4733 | msgid "default" |
07432cef | 4734 | msgstr "default" |
ef317cd5 | 4735 | |
7aea43ff | 4736 | #: builtin/commit.c:1589 builtin/tag.c:604 |
ef317cd5 | 4737 | msgid "how to strip spaces and #comments from message" |
07432cef | 4738 | msgstr "设置如何删除提交说明里的空格和#注释" |
ef317cd5 | 4739 | |
7aea43ff | 4740 | #: builtin/commit.c:1590 |
ef317cd5 | 4741 | msgid "include status in commit message template" |
07432cef | 4742 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 4743 | |
7aea43ff | 4744 | #: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92 |
220c313c | 4745 | #: builtin/tag.c:605 |
6c94aba5 JX |
4746 | msgid "key-id" |
4747 | msgstr "key-id" | |
ef317cd5 | 4748 | |
7aea43ff | 4749 | #: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93 |
ef317cd5 | 4750 | msgid "GPG sign commit" |
07432cef | 4751 | msgstr "GPG 提交签名" |
ef317cd5 | 4752 | |
7aea43ff | 4753 | #: builtin/commit.c:1595 |
ef317cd5 | 4754 | msgid "Commit contents options" |
07432cef | 4755 | msgstr "提交内容选项" |
ef317cd5 | 4756 | |
7aea43ff | 4757 | #: builtin/commit.c:1596 |
ef317cd5 | 4758 | msgid "commit all changed files" |
07432cef | 4759 | msgstr "提交所有改动的文件" |
ef317cd5 | 4760 | |
7aea43ff | 4761 | #: builtin/commit.c:1597 |
ef317cd5 | 4762 | msgid "add specified files to index for commit" |
07432cef | 4763 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 4764 | |
7aea43ff | 4765 | #: builtin/commit.c:1598 |
ef317cd5 | 4766 | msgid "interactively add files" |
07432cef | 4767 | msgstr "交互式添加文件" |
ef317cd5 | 4768 | |
7aea43ff | 4769 | #: builtin/commit.c:1599 |
ef317cd5 | 4770 | msgid "interactively add changes" |
07432cef | 4771 | msgstr "交互式添加变更" |
ef317cd5 | 4772 | |
7aea43ff | 4773 | #: builtin/commit.c:1600 |
ef317cd5 | 4774 | msgid "commit only specified files" |
07432cef | 4775 | msgstr "只提交指定的文件" |
ef317cd5 | 4776 | |
7aea43ff | 4777 | #: builtin/commit.c:1601 |
ef317cd5 | 4778 | msgid "bypass pre-commit hook" |
07432cef | 4779 | msgstr "绕过 pre-commit 钩子" |
ef317cd5 | 4780 | |
7aea43ff | 4781 | #: builtin/commit.c:1602 |
ef317cd5 | 4782 | msgid "show what would be committed" |
07432cef | 4783 | msgstr "显示将要提交的内容" |
ef317cd5 | 4784 | |
7aea43ff | 4785 | #: builtin/commit.c:1613 |
ef317cd5 | 4786 | msgid "amend previous commit" |
07432cef | 4787 | msgstr "修改先前的提交" |
ef317cd5 | 4788 | |
7aea43ff | 4789 | #: builtin/commit.c:1614 |
ef317cd5 | 4790 | msgid "bypass post-rewrite hook" |
07432cef | 4791 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 4792 | |
7aea43ff | 4793 | #: builtin/commit.c:1619 |
ef317cd5 | 4794 | msgid "ok to record an empty change" |
07432cef | 4795 | msgstr "允许一个空提交" |
ef317cd5 | 4796 | |
7aea43ff | 4797 | #: builtin/commit.c:1621 |
ef317cd5 | 4798 | msgid "ok to record a change with an empty message" |
07432cef | 4799 | msgstr "允许空的提交说明" |
ef317cd5 | 4800 | |
7aea43ff | 4801 | #: builtin/commit.c:1650 |
c04f5ac3 | 4802 | msgid "could not parse HEAD commit" |
90e6ef53 | 4803 | msgstr "不能解析 HEAD 提交" |
c04f5ac3 | 4804 | |
7aea43ff | 4805 | #: builtin/commit.c:1689 builtin/merge.c:1076 |
c04f5ac3 JX |
4806 | #, c-format |
4807 | msgid "could not open '%s' for reading" | |
90e6ef53 | 4808 | msgstr "不能为读入打开 '%s'" |
c04f5ac3 | 4809 | |
7aea43ff | 4810 | #: builtin/commit.c:1696 |
c04f5ac3 JX |
4811 | #, c-format |
4812 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 4813 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 4814 | |
7aea43ff | 4815 | #: builtin/commit.c:1703 |
c04f5ac3 | 4816 | msgid "could not read MERGE_MODE" |
90e6ef53 | 4817 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 4818 | |
7aea43ff | 4819 | #: builtin/commit.c:1722 |
c04f5ac3 JX |
4820 | #, c-format |
4821 | msgid "could not read commit message: %s" | |
90e6ef53 | 4822 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 4823 | |
7aea43ff | 4824 | #: builtin/commit.c:1733 |
73a60cd2 JX |
4825 | #, c-format |
4826 | msgid "Aborting commit; you did not edit the message.\n" | |
4827 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
4828 | ||
7aea43ff | 4829 | #: builtin/commit.c:1738 |
c04f5ac3 JX |
4830 | #, c-format |
4831 | msgid "Aborting commit due to empty commit message.\n" | |
4832 | msgstr "终止提交因为提交说明为空。\n" | |
4833 | ||
7aea43ff | 4834 | #: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854 |
c04f5ac3 | 4835 | msgid "failed to write commit object" |
90e6ef53 | 4836 | msgstr "无法写提交对象" |
c04f5ac3 | 4837 | |
7aea43ff | 4838 | #: builtin/commit.c:1786 |
c04f5ac3 JX |
4839 | msgid "" |
4840 | "Repository has been updated, but unable to write\n" | |
220c313c | 4841 | "new_index file. Check that disk is not full and quota is\n" |
c04f5ac3 JX |
4842 | "not exceeded, and then \"git reset HEAD\" to recover." |
4843 | msgstr "" | |
90e6ef53 JX |
4844 | "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" |
4845 | "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" | |
c04f5ac3 | 4846 | |
90314792 | 4847 | #: builtin/config.c:8 |
814ff314 JX |
4848 | msgid "git config [<options>]" |
4849 | msgstr "git config [<选项>]" | |
ef317cd5 | 4850 | |
6c94aba5 | 4851 | #: builtin/config.c:53 |
ef317cd5 | 4852 | msgid "Config file location" |
07432cef | 4853 | msgstr "配置文件位置" |
ef317cd5 | 4854 | |
6c94aba5 | 4855 | #: builtin/config.c:54 |
ef317cd5 | 4856 | msgid "use global config file" |
07432cef | 4857 | msgstr "使用全局配置文件" |
ef317cd5 | 4858 | |
6c94aba5 | 4859 | #: builtin/config.c:55 |
ef317cd5 | 4860 | msgid "use system config file" |
07432cef | 4861 | msgstr "使用系统级配置文件" |
ef317cd5 | 4862 | |
6c94aba5 | 4863 | #: builtin/config.c:56 |
ef317cd5 | 4864 | msgid "use repository config file" |
07432cef | 4865 | msgstr "使用版本库级配置文件" |
ef317cd5 | 4866 | |
6c94aba5 | 4867 | #: builtin/config.c:57 |
ef317cd5 | 4868 | msgid "use given config file" |
07432cef | 4869 | msgstr "使用指定的配置文件" |
ef317cd5 | 4870 | |
6c94aba5 | 4871 | #: builtin/config.c:58 |
2e8451e8 JX |
4872 | msgid "blob-id" |
4873 | msgstr "数据对象ID" | |
4874 | ||
6c94aba5 | 4875 | #: builtin/config.c:58 |
2e8451e8 JX |
4876 | msgid "read config from given blob object" |
4877 | msgstr "从给定的数据对象读取配置" | |
4878 | ||
6c94aba5 | 4879 | #: builtin/config.c:59 |
ef317cd5 | 4880 | msgid "Action" |
07432cef | 4881 | msgstr "操作" |
ef317cd5 | 4882 | |
6c94aba5 | 4883 | #: builtin/config.c:60 |
ef317cd5 | 4884 | msgid "get value: name [value-regex]" |
07432cef | 4885 | msgstr "获取值:name [value-regex]" |
ef317cd5 | 4886 | |
6c94aba5 | 4887 | #: builtin/config.c:61 |
ef317cd5 | 4888 | msgid "get all values: key [value-regex]" |
07432cef | 4889 | msgstr "获得所有的值:key [value-regex]" |
ef317cd5 | 4890 | |
6c94aba5 | 4891 | #: builtin/config.c:62 |
ef317cd5 | 4892 | msgid "get values for regexp: name-regex [value-regex]" |
07432cef | 4893 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
ef317cd5 | 4894 | |
6c94aba5 | 4895 | #: builtin/config.c:63 |
90314792 JX |
4896 | msgid "get value specific for the URL: section[.var] URL" |
4897 | msgstr "获得 URL 取值:section[.var] URL" | |
4898 | ||
6c94aba5 | 4899 | #: builtin/config.c:64 |
ef317cd5 | 4900 | msgid "replace all matching variables: name value [value_regex]" |
07432cef | 4901 | msgstr "替换所有匹配的变量:name value [value_regex]" |
ef317cd5 | 4902 | |
6c94aba5 | 4903 | #: builtin/config.c:65 |
ef317cd5 | 4904 | msgid "add a new variable: name value" |
07432cef | 4905 | msgstr "添加一个新的变量:name value" |
ef317cd5 | 4906 | |
6c94aba5 | 4907 | #: builtin/config.c:66 |
ef317cd5 | 4908 | msgid "remove a variable: name [value-regex]" |
07432cef | 4909 | msgstr "删除一个变量:name [value-regex]" |
ef317cd5 | 4910 | |
6c94aba5 | 4911 | #: builtin/config.c:67 |
ef317cd5 | 4912 | msgid "remove all matches: name [value-regex]" |
07432cef | 4913 | msgstr "删除所有匹配项:name [value-regex]" |
ef317cd5 | 4914 | |
6c94aba5 | 4915 | #: builtin/config.c:68 |
ef317cd5 | 4916 | msgid "rename section: old-name new-name" |
07432cef | 4917 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 4918 | |
6c94aba5 | 4919 | #: builtin/config.c:69 |
ef317cd5 | 4920 | msgid "remove a section: name" |
07432cef | 4921 | msgstr "删除一个小节:name" |
ef317cd5 | 4922 | |
6c94aba5 | 4923 | #: builtin/config.c:70 |
ef317cd5 | 4924 | msgid "list all" |
07432cef | 4925 | msgstr "列出所有" |
ef317cd5 | 4926 | |
6c94aba5 | 4927 | #: builtin/config.c:71 |
ef317cd5 | 4928 | msgid "open an editor" |
07432cef | 4929 | msgstr "打开一个编辑器" |
ef317cd5 | 4930 | |
6c94aba5 | 4931 | #: builtin/config.c:72 |
04cb2f28 JX |
4932 | msgid "find the color configured: slot [default]" |
4933 | msgstr "获得配置的颜色:配置 [默认]" | |
ef317cd5 | 4934 | |
6c94aba5 | 4935 | #: builtin/config.c:73 |
04cb2f28 JX |
4936 | msgid "find the color setting: slot [stdout-is-tty]" |
4937 | msgstr "获得颜色设置:配置 [stdout-is-tty]" | |
ef317cd5 | 4938 | |
6c94aba5 | 4939 | #: builtin/config.c:74 |
ef317cd5 | 4940 | msgid "Type" |
07432cef | 4941 | msgstr "类型" |
ef317cd5 | 4942 | |
6c94aba5 | 4943 | #: builtin/config.c:75 |
ef317cd5 | 4944 | msgid "value is \"true\" or \"false\"" |
07432cef | 4945 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 4946 | |
6c94aba5 | 4947 | #: builtin/config.c:76 |
ef317cd5 | 4948 | msgid "value is decimal number" |
07432cef | 4949 | msgstr "值是十进制数" |
ef317cd5 | 4950 | |
6c94aba5 | 4951 | #: builtin/config.c:77 |
ef317cd5 | 4952 | msgid "value is --bool or --int" |
07432cef | 4953 | msgstr "值是 --bool or --int" |
ef317cd5 | 4954 | |
6c94aba5 | 4955 | #: builtin/config.c:78 |
ef317cd5 | 4956 | msgid "value is a path (file or directory name)" |
07432cef | 4957 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 4958 | |
6c94aba5 | 4959 | #: builtin/config.c:79 |
ef317cd5 | 4960 | msgid "Other" |
07432cef | 4961 | msgstr "其它" |
ef317cd5 | 4962 | |
6c94aba5 | 4963 | #: builtin/config.c:80 |
ef317cd5 | 4964 | msgid "terminate values with NUL byte" |
07432cef | 4965 | msgstr "终止值是NUL字节" |
ef317cd5 | 4966 | |
6c94aba5 | 4967 | #: builtin/config.c:81 |
ef317cd5 | 4968 | msgid "respect include directives on lookup" |
07432cef | 4969 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 4970 | |
04cb2f28 | 4971 | #: builtin/config.c:316 |
220c313c JX |
4972 | msgid "unable to parse default color value" |
4973 | msgstr "不能解析缺省的颜色值" | |
4974 | ||
04cb2f28 | 4975 | #: builtin/config.c:457 |
220c313c JX |
4976 | #, c-format |
4977 | msgid "" | |
4978 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 4979 | "[user]\n" |
220c313c | 4980 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 4981 | "#\tname = %s\n" |
220c313c JX |
4982 | "#\temail = %s\n" |
4983 | msgstr "" | |
4984 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 4985 | "[user]\n" |
220c313c | 4986 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 4987 | "#\tname = %s\n" |
220c313c JX |
4988 | "#\temail = %s\n" |
4989 | ||
7aea43ff | 4990 | #: builtin/config.c:587 |
220c313c JX |
4991 | #, c-format |
4992 | msgid "cannot create configuration file %s" | |
4993 | msgstr "不能创建配置文件 %s" | |
4994 | ||
4995 | #: builtin/count-objects.c:55 | |
4dcdc3d8 JX |
4996 | msgid "git count-objects [-v] [-H | --human-readable]" |
4997 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
4998 | ||
220c313c | 4999 | #: builtin/count-objects.c:65 |
4dcdc3d8 JX |
5000 | msgid "print sizes in human readable format" |
5001 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 5002 | |
220c313c | 5003 | #: builtin/describe.c:17 |
814ff314 JX |
5004 | msgid "git describe [<options>] [<commit-ish>...]" |
5005 | msgstr "git describe [<选项>] [<提交号>...]" | |
ef317cd5 | 5006 | |
220c313c | 5007 | #: builtin/describe.c:18 |
814ff314 JX |
5008 | msgid "git describe [<options>] --dirty" |
5009 | msgstr "git describe [<选项>] --dirty" | |
ef317cd5 | 5010 | |
220c313c | 5011 | #: builtin/describe.c:217 |
c04f5ac3 JX |
5012 | #, c-format |
5013 | msgid "annotated tag %s not available" | |
5014 | msgstr "注释 tag %s 无效" | |
5015 | ||
220c313c | 5016 | #: builtin/describe.c:221 |
c04f5ac3 JX |
5017 | #, c-format |
5018 | msgid "annotated tag %s has no embedded name" | |
5019 | msgstr "注释 tag %s 没有嵌入名称" | |
5020 | ||
220c313c | 5021 | #: builtin/describe.c:223 |
c04f5ac3 JX |
5022 | #, c-format |
5023 | msgid "tag '%s' is really '%s' here" | |
90e6ef53 | 5024 | msgstr "tag '%s' 的确是在 '%s'" |
c04f5ac3 | 5025 | |
220c313c | 5026 | #: builtin/describe.c:250 builtin/log.c:452 |
c04f5ac3 JX |
5027 | #, c-format |
5028 | msgid "Not a valid object name %s" | |
5029 | msgstr "不是一个有效的对象名 %s" | |
5030 | ||
220c313c | 5031 | #: builtin/describe.c:253 |
c04f5ac3 JX |
5032 | #, c-format |
5033 | msgid "%s is not a valid '%s' object" | |
5034 | msgstr "%s 不是一个有效的 '%s' 对象" | |
5035 | ||
220c313c | 5036 | #: builtin/describe.c:270 |
c04f5ac3 JX |
5037 | #, c-format |
5038 | msgid "no tag exactly matches '%s'" | |
5039 | msgstr "没有 tag 准确匹配 '%s'" | |
5040 | ||
220c313c | 5041 | #: builtin/describe.c:272 |
c04f5ac3 JX |
5042 | #, c-format |
5043 | msgid "searching to describe %s\n" | |
5044 | msgstr "搜索描述 %s\n" | |
5045 | ||
220c313c | 5046 | #: builtin/describe.c:319 |
c04f5ac3 JX |
5047 | #, c-format |
5048 | msgid "finished search at %s\n" | |
5049 | msgstr "完成搜索 %s\n" | |
5050 | ||
220c313c | 5051 | #: builtin/describe.c:346 |
c04f5ac3 JX |
5052 | #, c-format |
5053 | msgid "" | |
5054 | "No annotated tags can describe '%s'.\n" | |
5055 | "However, there were unannotated tags: try --tags." | |
5056 | msgstr "" | |
5057 | "没有注释 tag 能描述 '%s'。\n" | |
5058 | "然而,有非注释 tag:尝试 --tags。" | |
5059 | ||
220c313c | 5060 | #: builtin/describe.c:350 |
c04f5ac3 JX |
5061 | #, c-format |
5062 | msgid "" | |
5063 | "No tags can describe '%s'.\n" | |
5064 | "Try --always, or create some tags." | |
5065 | msgstr "" | |
5066 | "没有注释 tag 能描述 '%s'。\n" | |
90e6ef53 | 5067 | "尝试 --always,或者创建一些 tag。" |
c04f5ac3 | 5068 | |
220c313c | 5069 | #: builtin/describe.c:371 |
c04f5ac3 JX |
5070 | #, c-format |
5071 | msgid "traversed %lu commits\n" | |
5072 | msgstr "已遍历 %lu 个提交\n" | |
5073 | ||
220c313c | 5074 | #: builtin/describe.c:374 |
c04f5ac3 JX |
5075 | #, c-format |
5076 | msgid "" | |
5077 | "more than %i tags found; listed %i most recent\n" | |
5078 | "gave up search at %s\n" | |
5079 | msgstr "" | |
90e6ef53 JX |
5080 | "发现多于 %i 个 tag,列出最近的 %i 个\n" |
5081 | "在 %s 放弃搜索\n" | |
c04f5ac3 | 5082 | |
220c313c | 5083 | #: builtin/describe.c:396 |
ef317cd5 | 5084 | msgid "find the tag that comes after the commit" |
07432cef | 5085 | msgstr "寻找提交之后的 tag(用于描述提交)" |
ef317cd5 | 5086 | |
220c313c | 5087 | #: builtin/describe.c:397 |
ef317cd5 | 5088 | msgid "debug search strategy on stderr" |
07432cef | 5089 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 5090 | |
220c313c | 5091 | #: builtin/describe.c:398 |
1003b3a5 JX |
5092 | msgid "use any ref" |
5093 | msgstr "使用任意引用" | |
5094 | ||
220c313c | 5095 | #: builtin/describe.c:399 |
1003b3a5 JX |
5096 | msgid "use any tag, even unannotated" |
5097 | msgstr "使用任意 tag,即使未带注解" | |
ef317cd5 | 5098 | |
220c313c | 5099 | #: builtin/describe.c:400 |
ef317cd5 | 5100 | msgid "always use long format" |
07432cef | 5101 | msgstr "始终使用长提交号格式" |
ef317cd5 | 5102 | |
220c313c | 5103 | #: builtin/describe.c:401 |
2e8451e8 JX |
5104 | msgid "only follow first parent" |
5105 | msgstr "只跟随第一个父提交" | |
5106 | ||
220c313c | 5107 | #: builtin/describe.c:404 |
ef317cd5 | 5108 | msgid "only output exact matches" |
07432cef | 5109 | msgstr "只输出精确匹配" |
ef317cd5 | 5110 | |
220c313c | 5111 | #: builtin/describe.c:406 |
ef317cd5 | 5112 | msgid "consider <n> most recent tags (default: 10)" |
07432cef | 5113 | msgstr "考虑最近 <n> 个 tags(默认:10)" |
ef317cd5 | 5114 | |
220c313c | 5115 | #: builtin/describe.c:408 |
ef317cd5 | 5116 | msgid "only consider tags matching <pattern>" |
07432cef | 5117 | msgstr "只考虑匹配 <模式> 的 tags" |
ef317cd5 | 5118 | |
220c313c | 5119 | #: builtin/describe.c:410 builtin/name-rev.c:318 |
ef317cd5 | 5120 | msgid "show abbreviated commit object as fallback" |
07432cef | 5121 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 5122 | |
220c313c | 5123 | #: builtin/describe.c:411 |
ef317cd5 | 5124 | msgid "mark" |
07432cef | 5125 | msgstr "标记" |
ef317cd5 | 5126 | |
220c313c | 5127 | #: builtin/describe.c:412 |
ef317cd5 | 5128 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
07432cef | 5129 | msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 5130 | |
220c313c | 5131 | #: builtin/describe.c:430 |
c04f5ac3 JX |
5132 | msgid "--long is incompatible with --abbrev=0" |
5133 | msgstr "--long 与 --abbrev=0 不兼容" | |
5134 | ||
220c313c | 5135 | #: builtin/describe.c:456 |
c04f5ac3 | 5136 | msgid "No names found, cannot describe anything." |
90e6ef53 | 5137 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 5138 | |
220c313c | 5139 | #: builtin/describe.c:476 |
a8a5406a | 5140 | msgid "--dirty is incompatible with commit-ishes" |
649900bc | 5141 | msgstr "--dirty 不能与提交同时使用" |
c04f5ac3 | 5142 | |
220c313c | 5143 | #: builtin/diff.c:86 |
c04f5ac3 JX |
5144 | #, c-format |
5145 | msgid "'%s': not a regular file or symlink" | |
5146 | msgstr "'%s':不是一个正规文件或符号链接" | |
5147 | ||
220c313c | 5148 | #: builtin/diff.c:237 |
c04f5ac3 JX |
5149 | #, c-format |
5150 | msgid "invalid option: %s" | |
5151 | msgstr "无效选项:%s" | |
5152 | ||
220c313c | 5153 | #: builtin/diff.c:358 |
c04f5ac3 JX |
5154 | msgid "Not a git repository" |
5155 | msgstr "不是一个 git 版本库" | |
5156 | ||
220c313c | 5157 | #: builtin/diff.c:401 |
c04f5ac3 JX |
5158 | #, c-format |
5159 | msgid "invalid object '%s' given." | |
5160 | msgstr "提供了无效对象 '%s'。" | |
5161 | ||
220c313c | 5162 | #: builtin/diff.c:410 |
c04f5ac3 JX |
5163 | #, c-format |
5164 | msgid "more than two blobs given: '%s'" | |
07432cef | 5165 | msgstr "提供了超过两个数据(blob)对象:'%s'" |
c04f5ac3 | 5166 | |
220c313c | 5167 | #: builtin/diff.c:417 |
c04f5ac3 JX |
5168 | #, c-format |
5169 | msgid "unhandled object '%s' given." | |
6c94aba5 | 5170 | msgstr "无法处理的对象 '%s'。" |
c04f5ac3 | 5171 | |
220c313c | 5172 | #: builtin/fast-export.c:24 |
ef317cd5 | 5173 | msgid "git fast-export [rev-list-opts]" |
07432cef | 5174 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 5175 | |
220c313c | 5176 | #: builtin/fast-export.c:979 |
ef317cd5 | 5177 | msgid "show progress after <n> objects" |
07432cef | 5178 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 5179 | |
220c313c | 5180 | #: builtin/fast-export.c:981 |
ef317cd5 | 5181 | msgid "select handling of signed tags" |
07432cef | 5182 | msgstr "选择如何处理签名 tags" |
ef317cd5 | 5183 | |
220c313c | 5184 | #: builtin/fast-export.c:984 |
ef317cd5 | 5185 | msgid "select handling of tags that tag filtered objects" |
07432cef | 5186 | msgstr "选择当 tag 指向被过滤时 tags 的处理方式" |
ef317cd5 | 5187 | |
220c313c | 5188 | #: builtin/fast-export.c:987 |
ef317cd5 | 5189 | msgid "Dump marks to this file" |
07432cef | 5190 | msgstr "把标记存储到这个文件" |
ef317cd5 | 5191 | |
220c313c | 5192 | #: builtin/fast-export.c:989 |
ef317cd5 | 5193 | msgid "Import marks from this file" |
07432cef | 5194 | msgstr "从这个文件导入标记" |
ef317cd5 | 5195 | |
220c313c | 5196 | #: builtin/fast-export.c:991 |
ef317cd5 | 5197 | msgid "Fake a tagger when tags lack one" |
07432cef | 5198 | msgstr "当 tags 缺少标记者字段时,假装提供一个" |
ef317cd5 | 5199 | |
220c313c | 5200 | #: builtin/fast-export.c:993 |
ef317cd5 | 5201 | msgid "Output full tree for each commit" |
07432cef | 5202 | msgstr "每次提交都输出整个树" |
ef317cd5 | 5203 | |
220c313c | 5204 | #: builtin/fast-export.c:995 |
ef317cd5 | 5205 | msgid "Use the done feature to terminate the stream" |
07432cef | 5206 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 5207 | |
220c313c | 5208 | #: builtin/fast-export.c:996 |
ef317cd5 | 5209 | msgid "Skip output of blob data" |
07432cef | 5210 | msgstr "跳过数据对象的输出" |
ef317cd5 | 5211 | |
220c313c | 5212 | #: builtin/fast-export.c:997 |
6acbf033 JX |
5213 | msgid "refspec" |
5214 | msgstr "引用表达式" | |
5215 | ||
220c313c | 5216 | #: builtin/fast-export.c:998 |
6acbf033 JX |
5217 | msgid "Apply refspec to exported refs" |
5218 | msgstr "对导出的引用应用引用表达式" | |
5219 | ||
220c313c JX |
5220 | #: builtin/fast-export.c:999 |
5221 | msgid "anonymize output" | |
5222 | msgstr "匿名输出" | |
5223 | ||
814ff314 | 5224 | #: builtin/fetch.c:19 |
ef317cd5 | 5225 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
90314792 | 5226 | msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]" |
ef317cd5 | 5227 | |
814ff314 | 5228 | #: builtin/fetch.c:20 |
ef317cd5 | 5229 | msgid "git fetch [<options>] <group>" |
07432cef | 5230 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 | 5231 | |
814ff314 | 5232 | #: builtin/fetch.c:21 |
ef317cd5 | 5233 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
07432cef | 5234 | msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]" |
ef317cd5 | 5235 | |
814ff314 | 5236 | #: builtin/fetch.c:22 |
ef317cd5 | 5237 | msgid "git fetch --all [<options>]" |
07432cef | 5238 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 5239 | |
814ff314 | 5240 | #: builtin/fetch.c:89 |
ef317cd5 | 5241 | msgid "fetch from all remotes" |
07432cef | 5242 | msgstr "从所有的远程抓取" |
ef317cd5 | 5243 | |
814ff314 | 5244 | #: builtin/fetch.c:91 |
ef317cd5 | 5245 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 5246 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 5247 | |
814ff314 | 5248 | #: builtin/fetch.c:93 |
ef317cd5 | 5249 | msgid "path to upload pack on remote end" |
07432cef | 5250 | msgstr "上传包到远程的路径" |
ef317cd5 | 5251 | |
814ff314 | 5252 | #: builtin/fetch.c:94 |
ef317cd5 | 5253 | msgid "force overwrite of local branch" |
07432cef | 5254 | msgstr "强制覆盖本地分支" |
ef317cd5 | 5255 | |
814ff314 | 5256 | #: builtin/fetch.c:96 |
ef317cd5 | 5257 | msgid "fetch from multiple remotes" |
07432cef | 5258 | msgstr "从多个远程抓取" |
ef317cd5 | 5259 | |
814ff314 | 5260 | #: builtin/fetch.c:98 |
ef317cd5 | 5261 | msgid "fetch all tags and associated objects" |
07432cef | 5262 | msgstr "抓取所有的 tags 和关联对象" |
ef317cd5 | 5263 | |
814ff314 | 5264 | #: builtin/fetch.c:100 |
ef317cd5 | 5265 | msgid "do not fetch all tags (--no-tags)" |
07432cef | 5266 | msgstr "不抓取任何 tags (--no-tags)" |
ef317cd5 | 5267 | |
814ff314 | 5268 | #: builtin/fetch.c:102 |
ef317cd5 | 5269 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 5270 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 5271 | |
07432cef | 5272 | # 译者:可选值,不能翻译 |
814ff314 | 5273 | #: builtin/fetch.c:103 |
ef317cd5 | 5274 | msgid "on-demand" |
07432cef | 5275 | msgstr "on-demand" |
ef317cd5 | 5276 | |
814ff314 | 5277 | #: builtin/fetch.c:104 |
ef317cd5 | 5278 | msgid "control recursive fetching of submodules" |
07432cef | 5279 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 5280 | |
814ff314 | 5281 | #: builtin/fetch.c:108 |
ef317cd5 | 5282 | msgid "keep downloaded pack" |
07432cef | 5283 | msgstr "保持下载包" |
ef317cd5 | 5284 | |
814ff314 | 5285 | #: builtin/fetch.c:110 |
ef317cd5 | 5286 | msgid "allow updating of HEAD ref" |
07432cef | 5287 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 5288 | |
814ff314 | 5289 | #: builtin/fetch.c:113 |
ef317cd5 | 5290 | msgid "deepen history of shallow clone" |
07432cef | 5291 | msgstr "深化浅克隆的历史" |
ef317cd5 | 5292 | |
814ff314 | 5293 | #: builtin/fetch.c:115 |
a77c07d9 JX |
5294 | msgid "convert to a complete repository" |
5295 | msgstr "转换为一个完整的版本库" | |
5296 | ||
814ff314 | 5297 | #: builtin/fetch.c:117 builtin/log.c:1208 |
ef317cd5 | 5298 | msgid "dir" |
07432cef | 5299 | msgstr "目录" |
ef317cd5 | 5300 | |
814ff314 | 5301 | #: builtin/fetch.c:118 |
ef317cd5 | 5302 | msgid "prepend this to submodule path output" |
07432cef | 5303 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 5304 | |
814ff314 | 5305 | #: builtin/fetch.c:121 |
ef317cd5 | 5306 | msgid "default mode for recursion" |
07432cef | 5307 | msgstr "递归的默认模式" |
ef317cd5 | 5308 | |
814ff314 | 5309 | #: builtin/fetch.c:123 |
cfff71a9 JX |
5310 | msgid "accept refs that update .git/shallow" |
5311 | msgstr "接受更新 .git/shallow 的引用" | |
5312 | ||
814ff314 | 5313 | #: builtin/fetch.c:124 |
6acbf033 JX |
5314 | msgid "refmap" |
5315 | msgstr "引用映射" | |
5316 | ||
814ff314 | 5317 | #: builtin/fetch.c:125 |
6acbf033 JX |
5318 | msgid "specify fetch refmap" |
5319 | msgstr "指定获取操作的引用映射" | |
5320 | ||
7aea43ff | 5321 | #: builtin/fetch.c:377 |
c04f5ac3 JX |
5322 | msgid "Couldn't find remote ref HEAD" |
5323 | msgstr "无法发现远程 HEAD 引用" | |
5324 | ||
7aea43ff | 5325 | #: builtin/fetch.c:457 |
c04f5ac3 JX |
5326 | #, c-format |
5327 | msgid "object %s not found" | |
5328 | msgstr "对象 %s 未发现" | |
5329 | ||
7aea43ff | 5330 | #: builtin/fetch.c:462 |
c04f5ac3 JX |
5331 | msgid "[up to date]" |
5332 | msgstr "[最新]" | |
5333 | ||
7aea43ff | 5334 | #: builtin/fetch.c:476 |
c04f5ac3 JX |
5335 | #, c-format |
5336 | msgid "! %-*s %-*s -> %s (can't fetch in current branch)" | |
5337 | msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)" | |
5338 | ||
7aea43ff | 5339 | #: builtin/fetch.c:477 builtin/fetch.c:563 |
c04f5ac3 JX |
5340 | msgid "[rejected]" |
5341 | msgstr "[已拒绝]" | |
5342 | ||
7aea43ff | 5343 | #: builtin/fetch.c:488 |
c04f5ac3 JX |
5344 | msgid "[tag update]" |
5345 | msgstr "[tag更新]" | |
5346 | ||
90e6ef53 | 5347 | # 译者:注意保持前导空格 |
7aea43ff | 5348 | #: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543 |
c04f5ac3 JX |
5349 | msgid " (unable to update local ref)" |
5350 | msgstr " (不能更新本地引用)" | |
5351 | ||
7aea43ff | 5352 | #: builtin/fetch.c:508 |
c04f5ac3 JX |
5353 | msgid "[new tag]" |
5354 | msgstr "[新tag]" | |
5355 | ||
7aea43ff | 5356 | #: builtin/fetch.c:511 |
c04f5ac3 JX |
5357 | msgid "[new branch]" |
5358 | msgstr "[新分支]" | |
5359 | ||
7aea43ff | 5360 | #: builtin/fetch.c:514 |
170e9899 JX |
5361 | msgid "[new ref]" |
5362 | msgstr "[新引用]" | |
5363 | ||
7aea43ff | 5364 | #: builtin/fetch.c:559 |
c04f5ac3 JX |
5365 | msgid "unable to update local ref" |
5366 | msgstr "不能更新本地引用" | |
5367 | ||
7aea43ff | 5368 | #: builtin/fetch.c:559 |
c04f5ac3 JX |
5369 | msgid "forced update" |
5370 | msgstr "强制更新" | |
5371 | ||
7aea43ff | 5372 | #: builtin/fetch.c:565 |
c04f5ac3 | 5373 | msgid "(non-fast-forward)" |
90e6ef53 | 5374 | msgstr "(非快进式)" |
c04f5ac3 | 5375 | |
7aea43ff | 5376 | #: builtin/fetch.c:599 builtin/fetch.c:832 |
c04f5ac3 JX |
5377 | #, c-format |
5378 | msgid "cannot open %s: %s\n" | |
5379 | msgstr "无法打开 %s:%s\n" | |
5380 | ||
7aea43ff | 5381 | #: builtin/fetch.c:608 |
c04f5ac3 JX |
5382 | #, c-format |
5383 | msgid "%s did not send all necessary objects\n" | |
5384 | msgstr "%s 未发送所有必须的对象\n" | |
5385 | ||
7aea43ff | 5386 | #: builtin/fetch.c:626 |
cfff71a9 JX |
5387 | #, c-format |
5388 | msgid "reject %s because shallow roots are not allowed to be updated" | |
5389 | msgstr "拒绝 %s 因为浅克隆不允许被更新" | |
5390 | ||
7aea43ff | 5391 | #: builtin/fetch.c:714 builtin/fetch.c:797 |
c04f5ac3 JX |
5392 | #, c-format |
5393 | msgid "From %.*s\n" | |
5394 | msgstr "来自 %.*s\n" | |
5395 | ||
7aea43ff | 5396 | #: builtin/fetch.c:725 |
c04f5ac3 JX |
5397 | #, c-format |
5398 | msgid "" | |
5399 | "some local refs could not be updated; try running\n" | |
5400 | " 'git remote prune %s' to remove any old, conflicting branches" | |
5401 | msgstr "" | |
5402 | "一些本地引用不能被更新;尝试运行\n" | |
5403 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
5404 | ||
90e6ef53 | 5405 | # 译者:注意保持前导空格 |
7aea43ff | 5406 | #: builtin/fetch.c:777 |
81809b99 | 5407 | #, c-format |
8ada9598 | 5408 | msgid " (%s will become dangling)" |
07432cef | 5409 | msgstr " (%s 将成为摇摆状态)" |
c04f5ac3 | 5410 | |
90e6ef53 | 5411 | # 译者:注意保持前导空格 |
7aea43ff | 5412 | #: builtin/fetch.c:778 |
81809b99 | 5413 | #, c-format |
8ada9598 | 5414 | msgid " (%s has become dangling)" |
07432cef | 5415 | msgstr " (%s 已成为摇摆状态)" |
c04f5ac3 | 5416 | |
7aea43ff | 5417 | #: builtin/fetch.c:802 |
c04f5ac3 JX |
5418 | msgid "[deleted]" |
5419 | msgstr "[已删除]" | |
5420 | ||
7aea43ff | 5421 | #: builtin/fetch.c:803 builtin/remote.c:1057 |
c04f5ac3 JX |
5422 | msgid "(none)" |
5423 | msgstr "(无)" | |
5424 | ||
7aea43ff | 5425 | #: builtin/fetch.c:822 |
c04f5ac3 JX |
5426 | #, c-format |
5427 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
220c313c | 5428 | msgstr "拒绝获取到非纯版本库的当前分支 %s" |
c04f5ac3 | 5429 | |
7aea43ff | 5430 | #: builtin/fetch.c:841 |
c04f5ac3 JX |
5431 | #, c-format |
5432 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
5433 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
5434 | ||
7aea43ff | 5435 | #: builtin/fetch.c:844 |
c04f5ac3 JX |
5436 | #, c-format |
5437 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 5438 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 5439 | |
7aea43ff | 5440 | #: builtin/fetch.c:900 |
90314792 JX |
5441 | #, c-format |
5442 | msgid "Don't know how to fetch from %s" | |
5443 | msgstr "不知道如何从 %s 获取" | |
5444 | ||
7aea43ff | 5445 | #: builtin/fetch.c:1063 |
c04f5ac3 JX |
5446 | #, c-format |
5447 | msgid "Fetching %s\n" | |
d4a8e00b | 5448 | msgstr "正在获取 %s\n" |
c04f5ac3 | 5449 | |
7aea43ff | 5450 | #: builtin/fetch.c:1065 builtin/remote.c:90 |
c04f5ac3 JX |
5451 | #, c-format |
5452 | msgid "Could not fetch %s" | |
5453 | msgstr "不能获取 %s" | |
5454 | ||
7aea43ff | 5455 | #: builtin/fetch.c:1083 |
c04f5ac3 JX |
5456 | msgid "" |
5457 | "No remote repository specified. Please, specify either a URL or a\n" | |
5458 | "remote name from which new revisions should be fetched." | |
90e6ef53 | 5459 | msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。" |
c04f5ac3 | 5460 | |
7aea43ff | 5461 | #: builtin/fetch.c:1106 |
c04f5ac3 | 5462 | msgid "You need to specify a tag name." |
90e6ef53 | 5463 | msgstr "您需要指定一个 tag 名称。" |
c04f5ac3 | 5464 | |
7aea43ff | 5465 | #: builtin/fetch.c:1148 |
a77c07d9 JX |
5466 | msgid "--depth and --unshallow cannot be used together" |
5467 | msgstr "--depth 和 --unshallow 不能同时使用" | |
5468 | ||
7aea43ff | 5469 | #: builtin/fetch.c:1150 |
a77c07d9 JX |
5470 | msgid "--unshallow on a complete repository does not make sense" |
5471 | msgstr "对于一个完整的版本库,参数 --unshallow 没有意义" | |
5472 | ||
7aea43ff | 5473 | #: builtin/fetch.c:1173 |
c04f5ac3 JX |
5474 | msgid "fetch --all does not take a repository argument" |
5475 | msgstr "fetch --all 不能带一个版本库参数" | |
5476 | ||
7aea43ff | 5477 | #: builtin/fetch.c:1175 |
c04f5ac3 | 5478 | msgid "fetch --all does not make sense with refspecs" |
90314792 | 5479 | msgstr "fetch --all 带引用规则没有任何意义" |
c04f5ac3 | 5480 | |
7aea43ff | 5481 | #: builtin/fetch.c:1186 |
c04f5ac3 JX |
5482 | #, c-format |
5483 | msgid "No such remote or remote group: %s" | |
5484 | msgstr "没有这样的远程或远程组:%s" | |
5485 | ||
7aea43ff | 5486 | #: builtin/fetch.c:1194 |
c04f5ac3 | 5487 | msgid "Fetching a group and specifying refspecs does not make sense" |
90314792 | 5488 | msgstr "获取组并指定引用规则没有意义" |
c04f5ac3 | 5489 | |
ef317cd5 | 5490 | #: builtin/fmt-merge-msg.c:13 |
814ff314 JX |
5491 | msgid "" |
5492 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
5493 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" | |
c04f5ac3 | 5494 | |
7aea43ff | 5495 | #: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698 |
04cb2f28 | 5496 | #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 |
7aea43ff JX |
5497 | #: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590 |
5498 | #: parse-options.h:131 parse-options.h:238 | |
ef317cd5 | 5499 | msgid "n" |
07432cef | 5500 | msgstr "n" |
c04f5ac3 | 5501 | |
7aea43ff | 5502 | #: builtin/fmt-merge-msg.c:669 |
ef317cd5 | 5503 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 5504 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 5505 | |
7aea43ff | 5506 | #: builtin/fmt-merge-msg.c:672 |
ef317cd5 | 5507 | msgid "alias for --log (deprecated)" |
07432cef | 5508 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 5509 | |
7aea43ff | 5510 | #: builtin/fmt-merge-msg.c:675 |
ef317cd5 | 5511 | msgid "text" |
07432cef | 5512 | msgstr "文本" |
ef317cd5 | 5513 | |
7aea43ff | 5514 | #: builtin/fmt-merge-msg.c:676 |
ef317cd5 | 5515 | msgid "use <text> as start of message" |
07432cef | 5516 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 5517 | |
7aea43ff | 5518 | #: builtin/fmt-merge-msg.c:677 |
ef317cd5 | 5519 | msgid "file to read from" |
07432cef | 5520 | msgstr "从文件中读取" |
ef317cd5 | 5521 | |
7aea43ff | 5522 | #: builtin/for-each-ref.c:687 |
220c313c JX |
5523 | msgid "unable to parse format" |
5524 | msgstr "不能解析格式" | |
5525 | ||
7aea43ff | 5526 | #: builtin/for-each-ref.c:1083 |
814ff314 JX |
5527 | msgid "git for-each-ref [<options>] [<pattern>]" |
5528 | msgstr "git for-each-ref [<选项>] [<模式>]" | |
ef317cd5 | 5529 | |
7aea43ff | 5530 | #: builtin/for-each-ref.c:1098 |
ef317cd5 | 5531 | msgid "quote placeholders suitably for shells" |
07432cef | 5532 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 5533 | |
7aea43ff | 5534 | #: builtin/for-each-ref.c:1100 |
ef317cd5 | 5535 | msgid "quote placeholders suitably for perl" |
07432cef | 5536 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 5537 | |
7aea43ff | 5538 | #: builtin/for-each-ref.c:1102 |
ef317cd5 | 5539 | msgid "quote placeholders suitably for python" |
07432cef | 5540 | msgstr "引用占位符适用于 python" |
ef317cd5 | 5541 | |
7aea43ff | 5542 | #: builtin/for-each-ref.c:1104 |
04cb2f28 JX |
5543 | msgid "quote placeholders suitably for Tcl" |
5544 | msgstr "引用占位符适用于 Tcl" | |
ef317cd5 | 5545 | |
7aea43ff | 5546 | #: builtin/for-each-ref.c:1107 |
ef317cd5 | 5547 | msgid "show only <n> matched refs" |
07432cef | 5548 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 5549 | |
7aea43ff | 5550 | #: builtin/for-each-ref.c:1108 builtin/replace.c:438 |
ef317cd5 | 5551 | msgid "format" |
07432cef | 5552 | msgstr "格式" |
ef317cd5 | 5553 | |
7aea43ff | 5554 | #: builtin/for-each-ref.c:1108 |
ef317cd5 | 5555 | msgid "format to use for the output" |
07432cef | 5556 | msgstr "输出格式" |
ef317cd5 | 5557 | |
7aea43ff | 5558 | #: builtin/for-each-ref.c:1109 |
ef317cd5 | 5559 | msgid "key" |
07432cef | 5560 | msgstr "key" |
ef317cd5 | 5561 | |
7aea43ff | 5562 | #: builtin/for-each-ref.c:1110 |
ef317cd5 | 5563 | msgid "field name to sort on" |
07432cef | 5564 | msgstr "排序的字段名" |
ef317cd5 | 5565 | |
5bb01d4f | 5566 | #: builtin/fsck.c:147 builtin/prune.c:137 |
6c94aba5 JX |
5567 | msgid "Checking connectivity" |
5568 | msgstr "检查连接中" | |
5569 | ||
7aea43ff | 5570 | #: builtin/fsck.c:548 |
6c94aba5 JX |
5571 | msgid "Checking object directories" |
5572 | msgstr "检查对象目录中" | |
5573 | ||
7aea43ff | 5574 | #: builtin/fsck.c:611 |
814ff314 JX |
5575 | msgid "git fsck [<options>] [<object>...]" |
5576 | msgstr "git fsck [<选项>] [<对象>...]" | |
ef317cd5 | 5577 | |
7aea43ff | 5578 | #: builtin/fsck.c:617 |
ef317cd5 | 5579 | msgid "show unreachable objects" |
07432cef | 5580 | msgstr "显示不可达的对象" |
ef317cd5 | 5581 | |
7aea43ff | 5582 | #: builtin/fsck.c:618 |
ef317cd5 | 5583 | msgid "show dangling objects" |
07432cef | 5584 | msgstr "显示摇摆的对象" |
ef317cd5 | 5585 | |
7aea43ff | 5586 | #: builtin/fsck.c:619 |
ef317cd5 | 5587 | msgid "report tags" |
07432cef | 5588 | msgstr "报告 tags" |
ef317cd5 | 5589 | |
7aea43ff | 5590 | #: builtin/fsck.c:620 |
ef317cd5 | 5591 | msgid "report root nodes" |
07432cef | 5592 | msgstr "报告根节点" |
ef317cd5 | 5593 | |
7aea43ff | 5594 | #: builtin/fsck.c:621 |
ef317cd5 | 5595 | msgid "make index objects head nodes" |
07432cef | 5596 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 5597 | |
7aea43ff | 5598 | #: builtin/fsck.c:622 |
ef317cd5 | 5599 | msgid "make reflogs head nodes (default)" |
07432cef | 5600 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 5601 | |
7aea43ff | 5602 | #: builtin/fsck.c:623 |
ef317cd5 | 5603 | msgid "also consider packs and alternate objects" |
07432cef | 5604 | msgstr "也考虑包和备用对象" |
ef317cd5 | 5605 | |
7aea43ff | 5606 | #: builtin/fsck.c:624 |
ef317cd5 | 5607 | msgid "enable more strict checking" |
07432cef | 5608 | msgstr "启用更严格的检查" |
ef317cd5 | 5609 | |
7aea43ff | 5610 | #: builtin/fsck.c:626 |
ef317cd5 | 5611 | msgid "write dangling objects in .git/lost-found" |
07432cef | 5612 | msgstr "将摇摆对象写入 .git/lost-found 中" |
ef317cd5 | 5613 | |
5bb01d4f | 5614 | #: builtin/fsck.c:627 builtin/prune.c:107 |
ef317cd5 | 5615 | msgid "show progress" |
07432cef | 5616 | msgstr "显示进度" |
ef317cd5 | 5617 | |
7aea43ff | 5618 | #: builtin/fsck.c:677 |
6c94aba5 JX |
5619 | msgid "Checking objects" |
5620 | msgstr "检查对象中" | |
5621 | ||
cfff71a9 | 5622 | #: builtin/gc.c:24 |
814ff314 JX |
5623 | msgid "git gc [<options>]" |
5624 | msgstr "git gc [<选项>]" | |
ef317cd5 | 5625 | |
7aea43ff | 5626 | #: builtin/gc.c:67 |
c04f5ac3 | 5627 | #, c-format |
7aea43ff JX |
5628 | msgid "Invalid %s: '%s'" |
5629 | msgstr "无效 %s:'%s'" | |
c04f5ac3 | 5630 | |
7aea43ff | 5631 | #: builtin/gc.c:112 |
c04f5ac3 JX |
5632 | #, c-format |
5633 | msgid "insanely long object directory %.*s" | |
5634 | msgstr "不正常的长对象目录 %.*s" | |
5635 | ||
7aea43ff | 5636 | #: builtin/gc.c:281 |
ef317cd5 | 5637 | msgid "prune unreferenced objects" |
07432cef | 5638 | msgstr "清除未引用的对象" |
ef317cd5 | 5639 | |
7aea43ff | 5640 | #: builtin/gc.c:283 |
ef317cd5 | 5641 | msgid "be more thorough (increased runtime)" |
07432cef | 5642 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 5643 | |
7aea43ff | 5644 | #: builtin/gc.c:284 |
ef317cd5 | 5645 | msgid "enable auto-gc mode" |
07432cef | 5646 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 5647 | |
7aea43ff | 5648 | #: builtin/gc.c:285 |
90314792 JX |
5649 | msgid "force running gc even if there may be another gc running" |
5650 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
5651 | ||
7aea43ff | 5652 | #: builtin/gc.c:327 |
c04f5ac3 | 5653 | #, c-format |
6c94aba5 JX |
5654 | msgid "Auto packing the repository in background for optimum performance.\n" |
5655 | msgstr "自动在后台执行版本库打包以求最佳性能。\n" | |
5656 | ||
7aea43ff | 5657 | #: builtin/gc.c:329 |
6c94aba5 JX |
5658 | #, c-format |
5659 | msgid "Auto packing the repository for optimum performance.\n" | |
5660 | msgstr "自动打包版本库以求最佳性能。\n" | |
5661 | ||
7aea43ff | 5662 | #: builtin/gc.c:330 |
6c94aba5 JX |
5663 | #, c-format |
5664 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
5665 | msgstr "手工维护参见 \"git help gc\"。\n" | |
c04f5ac3 | 5666 | |
7aea43ff | 5667 | #: builtin/gc.c:348 |
90314792 JX |
5668 | #, c-format |
5669 | msgid "" | |
5670 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
5671 | msgstr "" | |
5672 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)" | |
5673 | ||
7aea43ff | 5674 | #: builtin/gc.c:376 |
c04f5ac3 JX |
5675 | msgid "" |
5676 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 5677 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 5678 | |
90314792 | 5679 | #: builtin/grep.c:23 |
814ff314 JX |
5680 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
5681 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" | |
ef317cd5 | 5682 | |
90314792 | 5683 | #: builtin/grep.c:218 |
c04f5ac3 JX |
5684 | #, c-format |
5685 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 5686 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 5687 | |
6acbf033 | 5688 | #: builtin/grep.c:441 builtin/grep.c:476 |
c04f5ac3 JX |
5689 | #, c-format |
5690 | msgid "unable to read tree (%s)" | |
90e6ef53 | 5691 | msgstr "无法读取树(%s)" |
c04f5ac3 | 5692 | |
6acbf033 | 5693 | #: builtin/grep.c:491 |
c04f5ac3 JX |
5694 | #, c-format |
5695 | msgid "unable to grep from object of type %s" | |
5696 | msgstr "无法抓取来自于 %s 类型的对象" | |
5697 | ||
6acbf033 | 5698 | #: builtin/grep.c:547 |
c04f5ac3 JX |
5699 | #, c-format |
5700 | msgid "switch `%c' expects a numerical value" | |
5701 | msgstr "开关 `%c' 期望一个数字值" | |
5702 | ||
6acbf033 | 5703 | #: builtin/grep.c:564 |
c04f5ac3 JX |
5704 | #, c-format |
5705 | msgid "cannot open '%s'" | |
5706 | msgstr "不能打开 '%s'" | |
5707 | ||
6acbf033 | 5708 | #: builtin/grep.c:638 |
ef317cd5 | 5709 | msgid "search in index instead of in the work tree" |
07432cef | 5710 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 5711 | |
6acbf033 | 5712 | #: builtin/grep.c:640 |
ef317cd5 | 5713 | msgid "find in contents not managed by git" |
07432cef | 5714 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 JX |
5715 | |
5716 | # 译者:中文字符串拼接,可删除前导空格 | |
6acbf033 | 5717 | #: builtin/grep.c:642 |
ef317cd5 | 5718 | msgid "search in both tracked and untracked files" |
07432cef | 5719 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 5720 | |
6acbf033 | 5721 | #: builtin/grep.c:644 |
814ff314 JX |
5722 | msgid "ignore files specified via '.gitignore'" |
5723 | msgstr "忽略 '.gitignore' 包含的文件" | |
ef317cd5 | 5724 | |
6acbf033 | 5725 | #: builtin/grep.c:647 |
ef317cd5 | 5726 | msgid "show non-matching lines" |
07432cef | 5727 | msgstr "显示未匹配的行" |
ef317cd5 | 5728 | |
6acbf033 | 5729 | #: builtin/grep.c:649 |
ef317cd5 | 5730 | msgid "case insensitive matching" |
07432cef | 5731 | msgstr "不区分大小写匹配" |
ef317cd5 | 5732 | |
6acbf033 | 5733 | #: builtin/grep.c:651 |
ef317cd5 | 5734 | msgid "match patterns only at word boundaries" |
07432cef | 5735 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 5736 | |
6acbf033 | 5737 | #: builtin/grep.c:653 |
ef317cd5 | 5738 | msgid "process binary files as text" |
07432cef | 5739 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 5740 | |
6acbf033 | 5741 | #: builtin/grep.c:655 |
ef317cd5 | 5742 | msgid "don't match patterns in binary files" |
07432cef | 5743 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 5744 | |
6acbf033 | 5745 | #: builtin/grep.c:658 |
90314792 JX |
5746 | msgid "process binary files with textconv filters" |
5747 | msgstr "用 textconv 过滤器处理二进制文件" | |
5748 | ||
6acbf033 | 5749 | #: builtin/grep.c:660 |
ef317cd5 | 5750 | msgid "descend at most <depth> levels" |
07432cef | 5751 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 5752 | |
6acbf033 | 5753 | #: builtin/grep.c:664 |
ef317cd5 | 5754 | msgid "use extended POSIX regular expressions" |
07432cef | 5755 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 5756 | |
6acbf033 | 5757 | #: builtin/grep.c:667 |
ef317cd5 | 5758 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 5759 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 5760 | |
6acbf033 | 5761 | #: builtin/grep.c:670 |
ef317cd5 | 5762 | msgid "interpret patterns as fixed strings" |
07432cef | 5763 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 5764 | |
6acbf033 | 5765 | #: builtin/grep.c:673 |
ef317cd5 | 5766 | msgid "use Perl-compatible regular expressions" |
07432cef | 5767 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 5768 | |
6acbf033 | 5769 | #: builtin/grep.c:676 |
ef317cd5 | 5770 | msgid "show line numbers" |
07432cef | 5771 | msgstr "显示行号" |
ef317cd5 | 5772 | |
6acbf033 | 5773 | #: builtin/grep.c:677 |
ef317cd5 | 5774 | msgid "don't show filenames" |
07432cef | 5775 | msgstr "不显示文件名" |
ef317cd5 | 5776 | |
6acbf033 | 5777 | #: builtin/grep.c:678 |
ef317cd5 | 5778 | msgid "show filenames" |
07432cef | 5779 | msgstr "显示文件名" |
ef317cd5 | 5780 | |
6acbf033 | 5781 | #: builtin/grep.c:680 |
ef317cd5 | 5782 | msgid "show filenames relative to top directory" |
07432cef | 5783 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 5784 | |
6acbf033 | 5785 | #: builtin/grep.c:682 |
ef317cd5 | 5786 | msgid "show only filenames instead of matching lines" |
07432cef | 5787 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 5788 | |
6acbf033 | 5789 | #: builtin/grep.c:684 |
ef317cd5 | 5790 | msgid "synonym for --files-with-matches" |
07432cef | 5791 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 5792 | |
6acbf033 | 5793 | #: builtin/grep.c:687 |
ef317cd5 | 5794 | msgid "show only the names of files without match" |
07432cef | 5795 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 5796 | |
6acbf033 | 5797 | #: builtin/grep.c:689 |
ef317cd5 | 5798 | msgid "print NUL after filenames" |
07432cef | 5799 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 5800 | |
6acbf033 | 5801 | #: builtin/grep.c:691 |
ef317cd5 | 5802 | msgid "show the number of matches instead of matching lines" |
07432cef | 5803 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 5804 | |
6acbf033 | 5805 | #: builtin/grep.c:692 |
ef317cd5 | 5806 | msgid "highlight matches" |
07432cef | 5807 | msgstr "高亮显示匹配项" |
ef317cd5 | 5808 | |
6acbf033 | 5809 | #: builtin/grep.c:694 |
ef317cd5 | 5810 | msgid "print empty line between matches from different files" |
07432cef | 5811 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 5812 | |
6acbf033 | 5813 | #: builtin/grep.c:696 |
ef317cd5 | 5814 | msgid "show filename only once above matches from same file" |
07432cef | 5815 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 5816 | |
6acbf033 | 5817 | #: builtin/grep.c:699 |
ef317cd5 | 5818 | msgid "show <n> context lines before and after matches" |
07432cef | 5819 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 5820 | |
6acbf033 | 5821 | #: builtin/grep.c:702 |
ef317cd5 | 5822 | msgid "show <n> context lines before matches" |
07432cef | 5823 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 5824 | |
6acbf033 | 5825 | #: builtin/grep.c:704 |
ef317cd5 | 5826 | msgid "show <n> context lines after matches" |
07432cef | 5827 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 5828 | |
6acbf033 | 5829 | #: builtin/grep.c:705 |
ef317cd5 | 5830 | msgid "shortcut for -C NUM" |
07432cef | 5831 | msgstr "快捷键 -C 数字" |
ef317cd5 | 5832 | |
6acbf033 | 5833 | #: builtin/grep.c:708 |
ef317cd5 | 5834 | msgid "show a line with the function name before matches" |
07432cef | 5835 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 5836 | |
6acbf033 | 5837 | #: builtin/grep.c:710 |
ef317cd5 | 5838 | msgid "show the surrounding function" |
07432cef | 5839 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 5840 | |
6acbf033 | 5841 | #: builtin/grep.c:713 |
ef317cd5 | 5842 | msgid "read patterns from file" |
07432cef | 5843 | msgstr "从文件读取模式" |
ef317cd5 | 5844 | |
6acbf033 | 5845 | #: builtin/grep.c:715 |
ef317cd5 | 5846 | msgid "match <pattern>" |
07432cef | 5847 | msgstr "匹配 <模式>" |
ef317cd5 | 5848 | |
6acbf033 | 5849 | #: builtin/grep.c:717 |
ef317cd5 | 5850 | msgid "combine patterns specified with -e" |
07432cef | 5851 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 5852 | |
6acbf033 | 5853 | #: builtin/grep.c:729 |
ef317cd5 | 5854 | msgid "indicate hit with exit status without output" |
07432cef | 5855 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 5856 | |
6acbf033 | 5857 | #: builtin/grep.c:731 |
ef317cd5 | 5858 | msgid "show only matches from files that match all patterns" |
07432cef | 5859 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 5860 | |
6acbf033 | 5861 | #: builtin/grep.c:733 |
07432cef WS |
5862 | msgid "show parse tree for grep expression" |
5863 | msgstr "显示 grep 表达式的解析树" | |
5864 | ||
6acbf033 | 5865 | #: builtin/grep.c:737 |
ef317cd5 | 5866 | msgid "pager" |
07432cef | 5867 | msgstr "分页" |
ef317cd5 | 5868 | |
6acbf033 | 5869 | #: builtin/grep.c:737 |
ef317cd5 | 5870 | msgid "show matching files in the pager" |
07432cef | 5871 | msgstr "分页显示匹配的文件" |
ef317cd5 | 5872 | |
6acbf033 | 5873 | #: builtin/grep.c:740 |
ef317cd5 | 5874 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 5875 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 5876 | |
7aea43ff | 5877 | #: builtin/grep.c:741 builtin/show-ref.c:189 |
ef317cd5 | 5878 | msgid "show usage" |
07432cef | 5879 | msgstr "显示用法" |
ef317cd5 | 5880 | |
6acbf033 | 5881 | #: builtin/grep.c:808 |
c04f5ac3 JX |
5882 | msgid "no pattern given." |
5883 | msgstr "未提供模式匹配。" | |
5884 | ||
6acbf033 | 5885 | #: builtin/grep.c:866 |
c04f5ac3 JX |
5886 | msgid "--open-files-in-pager only works on the worktree" |
5887 | msgstr "--open-files-in-pager 仅用于工作区" | |
5888 | ||
6acbf033 | 5889 | #: builtin/grep.c:892 |
c04f5ac3 | 5890 | msgid "--cached or --untracked cannot be used with --no-index." |
649900bc | 5891 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" |
c04f5ac3 | 5892 | |
6acbf033 | 5893 | #: builtin/grep.c:897 |
c04f5ac3 | 5894 | msgid "--no-index or --untracked cannot be used with revs." |
649900bc | 5895 | msgstr "--no-index 或 --untracked 不能和版本同时使用。" |
c04f5ac3 | 5896 | |
6acbf033 | 5897 | #: builtin/grep.c:900 |
c04f5ac3 | 5898 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
90e6ef53 | 5899 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" |
c04f5ac3 | 5900 | |
6acbf033 | 5901 | #: builtin/grep.c:908 |
c04f5ac3 JX |
5902 | msgid "both --cached and trees are given." |
5903 | msgstr "同时给出了 --cached 和树对象。" | |
5904 | ||
7aea43ff | 5905 | #: builtin/hash-object.c:80 |
ef317cd5 | 5906 | msgid "" |
814ff314 JX |
5907 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
5908 | "[--] <file>..." | |
ef317cd5 | 5909 | msgstr "" |
814ff314 JX |
5910 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
5911 | "[--] <文件>..." | |
ef317cd5 | 5912 | |
7aea43ff | 5913 | #: builtin/hash-object.c:81 |
ef317cd5 | 5914 | msgid "git hash-object --stdin-paths < <list-of-paths>" |
07432cef | 5915 | msgstr "git hash-object --stdin-paths < <路径列表>" |
ef317cd5 | 5916 | |
7aea43ff | 5917 | #: builtin/hash-object.c:92 builtin/tag.c:612 |
ef317cd5 | 5918 | msgid "type" |
07432cef | 5919 | msgstr "类型" |
ef317cd5 | 5920 | |
7aea43ff | 5921 | #: builtin/hash-object.c:92 |
ef317cd5 | 5922 | msgid "object type" |
07432cef | 5923 | msgstr "对象类型" |
ef317cd5 | 5924 | |
7aea43ff | 5925 | #: builtin/hash-object.c:93 |
ef317cd5 | 5926 | msgid "write the object into the object database" |
07432cef | 5927 | msgstr "将对象写入对象数据库" |
ef317cd5 | 5928 | |
7aea43ff | 5929 | #: builtin/hash-object.c:95 |
ef317cd5 | 5930 | msgid "read the object from stdin" |
07432cef | 5931 | msgstr "从标准输入读取对象" |
ef317cd5 | 5932 | |
7aea43ff | 5933 | #: builtin/hash-object.c:97 |
ef317cd5 | 5934 | msgid "store file as is without filters" |
07432cef | 5935 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 | 5936 | |
7aea43ff | 5937 | #: builtin/hash-object.c:98 |
220c313c JX |
5938 | msgid "" |
5939 | "just hash any random garbage to create corrupt objects for debugging Git" | |
5940 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
5941 | ||
7aea43ff | 5942 | #: builtin/hash-object.c:99 |
ef317cd5 | 5943 | msgid "process file as it were from this path" |
07432cef | 5944 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 5945 | |
2e8451e8 | 5946 | #: builtin/help.c:41 |
ef317cd5 | 5947 | msgid "print all available commands" |
07432cef | 5948 | msgstr "打印所有可用的命令" |
ef317cd5 | 5949 | |
2e8451e8 | 5950 | #: builtin/help.c:42 |
4dcdc3d8 JX |
5951 | msgid "print list of useful guides" |
5952 | msgstr "显示有用的指南列表" | |
5953 | ||
2e8451e8 | 5954 | #: builtin/help.c:43 |
ef317cd5 | 5955 | msgid "show man page" |
07432cef | 5956 | msgstr "显示 man 手册" |
ef317cd5 | 5957 | |
2e8451e8 | 5958 | #: builtin/help.c:44 |
ef317cd5 | 5959 | msgid "show manual in web browser" |
07432cef | 5960 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 5961 | |
2e8451e8 | 5962 | #: builtin/help.c:46 |
ef317cd5 | 5963 | msgid "show info page" |
07432cef | 5964 | msgstr "显示 info 手册" |
ef317cd5 | 5965 | |
2e8451e8 | 5966 | #: builtin/help.c:52 |
814ff314 JX |
5967 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
5968 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" | |
ef317cd5 | 5969 | |
2e8451e8 | 5970 | #: builtin/help.c:64 |
81809b99 | 5971 | #, c-format |
8ada9598 | 5972 | msgid "unrecognized help format '%s'" |
81809b99 | 5973 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 5974 | |
220c313c | 5975 | #: builtin/help.c:91 |
8ada9598 | 5976 | msgid "Failed to start emacsclient." |
81809b99 | 5977 | msgstr "无法启动 emacsclient。" |
8ada9598 | 5978 | |
220c313c | 5979 | #: builtin/help.c:104 |
8ada9598 | 5980 | msgid "Failed to parse emacsclient version." |
81809b99 | 5981 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 5982 | |
220c313c | 5983 | #: builtin/help.c:112 |
8ada9598 JX |
5984 | #, c-format |
5985 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 5986 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 5987 | |
220c313c | 5988 | #: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 |
81809b99 | 5989 | #, c-format |
8ada9598 | 5990 | msgid "failed to exec '%s': %s" |
81809b99 | 5991 | msgstr "无法执行 '%s':%s" |
8ada9598 | 5992 | |
220c313c | 5993 | #: builtin/help.c:215 |
8ada9598 JX |
5994 | #, c-format |
5995 | msgid "" | |
5996 | "'%s': path for unsupported man viewer.\n" | |
5997 | "Please consider using 'man.<tool>.cmd' instead." | |
5998 | msgstr "" | |
81809b99 | 5999 | "'%s':不支持的 man 手册查看器的路径。\n" |
d9d56b23 | 6000 | "请使用 'man.<工具>.cmd'。" |
8ada9598 | 6001 | |
220c313c | 6002 | #: builtin/help.c:227 |
8ada9598 JX |
6003 | #, c-format |
6004 | msgid "" | |
6005 | "'%s': cmd for supported man viewer.\n" | |
6006 | "Please consider using 'man.<tool>.path' instead." | |
6007 | msgstr "" | |
81809b99 | 6008 | "'%s': 支持的 man 手册查看器命令。\n" |
d9d56b23 | 6009 | "请使用 'man.<工具>.path'。" |
8ada9598 | 6010 | |
04cb2f28 | 6011 | #: builtin/help.c:354 |
8ada9598 JX |
6012 | #, c-format |
6013 | msgid "'%s': unknown man viewer." | |
81809b99 | 6014 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 6015 | |
04cb2f28 | 6016 | #: builtin/help.c:371 |
8ada9598 | 6017 | msgid "no man viewer handled the request" |
81809b99 | 6018 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 6019 | |
04cb2f28 | 6020 | #: builtin/help.c:379 |
8ada9598 | 6021 | msgid "no info viewer handled the request" |
81809b99 | 6022 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 6023 | |
04cb2f28 | 6024 | #: builtin/help.c:428 |
4dcdc3d8 JX |
6025 | msgid "Defining attributes per path" |
6026 | msgstr "定义路径的属性" | |
6027 | ||
04cb2f28 | 6028 | #: builtin/help.c:429 |
220c313c JX |
6029 | msgid "Everyday Git With 20 Commands Or So" |
6030 | msgstr "每一天 Git 常用的约 20 条命令" | |
6031 | ||
04cb2f28 | 6032 | #: builtin/help.c:430 |
4dcdc3d8 JX |
6033 | msgid "A Git glossary" |
6034 | msgstr "Git 词汇表" | |
6035 | ||
04cb2f28 | 6036 | #: builtin/help.c:431 |
4dcdc3d8 JX |
6037 | msgid "Specifies intentionally untracked files to ignore" |
6038 | msgstr "忽略指定的未跟踪文件" | |
6039 | ||
04cb2f28 | 6040 | #: builtin/help.c:432 |
4dcdc3d8 JX |
6041 | msgid "Defining submodule properties" |
6042 | msgstr "定义子模组属性" | |
6043 | ||
04cb2f28 | 6044 | #: builtin/help.c:433 |
4dcdc3d8 JX |
6045 | msgid "Specifying revisions and ranges for Git" |
6046 | msgstr "指定 Git 的版本和版本范围" | |
6047 | ||
04cb2f28 | 6048 | #: builtin/help.c:434 |
4dcdc3d8 JX |
6049 | msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" |
6050 | msgstr "一个 Git 教程(针对 1.5.1 或更新版本)" | |
6051 | ||
04cb2f28 | 6052 | #: builtin/help.c:435 |
4dcdc3d8 JX |
6053 | msgid "An overview of recommended workflows with Git" |
6054 | msgstr "Git 推荐的工作流概览" | |
6055 | ||
04cb2f28 | 6056 | #: builtin/help.c:447 |
4dcdc3d8 JX |
6057 | msgid "The common Git guides are:\n" |
6058 | msgstr "最常用的 Git 向导有:\n" | |
6059 | ||
04cb2f28 | 6060 | #: builtin/help.c:468 builtin/help.c:485 |
8ada9598 JX |
6061 | #, c-format |
6062 | msgid "usage: %s%s" | |
81809b99 | 6063 | msgstr "用法:%s%s" |
8ada9598 | 6064 | |
04cb2f28 | 6065 | #: builtin/help.c:501 |
8ada9598 JX |
6066 | #, c-format |
6067 | msgid "`git %s' is aliased to `%s'" | |
81809b99 | 6068 | msgstr "`git %s' 是 `%s' 的别名" |
8ada9598 | 6069 | |
7aea43ff | 6070 | #: builtin/index-pack.c:151 |
6acbf033 JX |
6071 | #, c-format |
6072 | msgid "unable to open %s" | |
6073 | msgstr "不能打开 %s" | |
6074 | ||
7aea43ff | 6075 | #: builtin/index-pack.c:201 |
8ada9598 JX |
6076 | #, c-format |
6077 | msgid "object type mismatch at %s" | |
81809b99 | 6078 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 6079 | |
7aea43ff | 6080 | #: builtin/index-pack.c:221 |
6acbf033 JX |
6081 | #, c-format |
6082 | msgid "did not receive expected object %s" | |
6083 | msgstr "未能获取期望的对象 %s" | |
8ada9598 | 6084 | |
7aea43ff | 6085 | #: builtin/index-pack.c:224 |
6acbf033 JX |
6086 | #, c-format |
6087 | msgid "object %s: expected type %s, found %s" | |
6088 | msgstr "对象 %s:期待类型 %s,却是 %s" | |
6089 | ||
7aea43ff | 6090 | #: builtin/index-pack.c:266 |
81809b99 | 6091 | #, c-format |
8ada9598 JX |
6092 | msgid "cannot fill %d byte" |
6093 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 6094 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 6095 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 6096 | |
7aea43ff | 6097 | #: builtin/index-pack.c:276 |
8ada9598 | 6098 | msgid "early EOF" |
81809b99 | 6099 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 6100 | |
7aea43ff | 6101 | #: builtin/index-pack.c:277 |
8ada9598 | 6102 | msgid "read error on input" |
81809b99 | 6103 | msgstr "输入上的读错误" |
8ada9598 | 6104 | |
7aea43ff | 6105 | #: builtin/index-pack.c:289 |
8ada9598 | 6106 | msgid "used more bytes than were available" |
81809b99 | 6107 | msgstr "用掉了超过可用的字节" |
8ada9598 | 6108 | |
7aea43ff | 6109 | #: builtin/index-pack.c:296 |
8ada9598 | 6110 | msgid "pack too large for current definition of off_t" |
81809b99 | 6111 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 6112 | |
7aea43ff | 6113 | #: builtin/index-pack.c:312 |
81809b99 | 6114 | #, c-format |
8ada9598 | 6115 | msgid "unable to create '%s'" |
81809b99 | 6116 | msgstr "不能创建 '%s'" |
8ada9598 | 6117 | |
7aea43ff | 6118 | #: builtin/index-pack.c:317 |
81809b99 | 6119 | #, c-format |
8ada9598 | 6120 | msgid "cannot open packfile '%s'" |
81809b99 | 6121 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 6122 | |
7aea43ff | 6123 | #: builtin/index-pack.c:331 |
8ada9598 | 6124 | msgid "pack signature mismatch" |
81809b99 | 6125 | msgstr "包签名不匹配" |
8ada9598 | 6126 | |
7aea43ff | 6127 | #: builtin/index-pack.c:333 |
ef317cd5 JX |
6128 | #, c-format |
6129 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 6130 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 6131 | |
7aea43ff | 6132 | #: builtin/index-pack.c:351 |
8ada9598 JX |
6133 | #, c-format |
6134 | msgid "pack has bad object at offset %lu: %s" | |
81809b99 | 6135 | msgstr "包中有错误的对象位于 %lu:%s" |
8ada9598 | 6136 | |
7aea43ff | 6137 | #: builtin/index-pack.c:472 |
8ada9598 JX |
6138 | #, c-format |
6139 | msgid "inflate returned %d" | |
81809b99 | 6140 | msgstr "解压缩返回 %d" |
8ada9598 | 6141 | |
7aea43ff | 6142 | #: builtin/index-pack.c:521 |
8ada9598 | 6143 | msgid "offset value overflow for delta base object" |
81809b99 | 6144 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 6145 | |
7aea43ff | 6146 | #: builtin/index-pack.c:529 |
8ada9598 | 6147 | msgid "delta base offset is out of bound" |
81809b99 | 6148 | msgstr "delta 基准偏移越界" |
8ada9598 | 6149 | |
7aea43ff | 6150 | #: builtin/index-pack.c:537 |
81809b99 | 6151 | #, c-format |
8ada9598 | 6152 | msgid "unknown object type %d" |
81809b99 | 6153 | msgstr "未知对象类型 %d" |
8ada9598 | 6154 | |
7aea43ff | 6155 | #: builtin/index-pack.c:568 |
8ada9598 | 6156 | msgid "cannot pread pack file" |
81809b99 | 6157 | msgstr "无法读取包文件" |
8ada9598 | 6158 | |
7aea43ff | 6159 | #: builtin/index-pack.c:570 |
8ada9598 JX |
6160 | #, c-format |
6161 | msgid "premature end of pack file, %lu byte missing" | |
6162 | msgid_plural "premature end of pack file, %lu bytes missing" | |
81809b99 | 6163 | msgstr[0] "包文件过早结束,缺少 %lu 字节" |
5ae481e0 | 6164 | msgstr[1] "包文件过早结束,缺少 %lu 字节" |
8ada9598 | 6165 | |
7aea43ff | 6166 | #: builtin/index-pack.c:596 |
8ada9598 | 6167 | msgid "serious inflate inconsistency" |
81809b99 | 6168 | msgstr "解压缩严重的不一致" |
8ada9598 | 6169 | |
7aea43ff JX |
6170 | #: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771 |
6171 | #: builtin/index-pack.c:805 builtin/index-pack.c:814 | |
8ada9598 JX |
6172 | #, c-format |
6173 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 6174 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 6175 | |
7aea43ff | 6176 | #: builtin/index-pack.c:745 builtin/pack-objects.c:162 |
814ff314 | 6177 | #: builtin/pack-objects.c:254 |
6792b93b JX |
6178 | #, c-format |
6179 | msgid "unable to read %s" | |
6180 | msgstr "不能读 %s" | |
6181 | ||
7aea43ff | 6182 | #: builtin/index-pack.c:811 |
6792b93b JX |
6183 | #, c-format |
6184 | msgid "cannot read existing object %s" | |
6185 | msgstr "不能读取现存对象 %s" | |
6186 | ||
7aea43ff | 6187 | #: builtin/index-pack.c:825 |
81809b99 | 6188 | #, c-format |
8ada9598 | 6189 | msgid "invalid blob object %s" |
07432cef | 6190 | msgstr "无效的数据(blob)对象 %s" |
8ada9598 | 6191 | |
7aea43ff | 6192 | #: builtin/index-pack.c:839 |
81809b99 | 6193 | #, c-format |
8ada9598 | 6194 | msgid "invalid %s" |
81809b99 | 6195 | msgstr "无效的 %s" |
8ada9598 | 6196 | |
7aea43ff | 6197 | #: builtin/index-pack.c:843 |
8ada9598 | 6198 | msgid "Error in object" |
81809b99 | 6199 | msgstr "对象中出错" |
8ada9598 | 6200 | |
7aea43ff | 6201 | #: builtin/index-pack.c:845 |
8ada9598 JX |
6202 | #, c-format |
6203 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 6204 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 6205 | |
7aea43ff | 6206 | #: builtin/index-pack.c:917 builtin/index-pack.c:948 |
8ada9598 | 6207 | msgid "failed to apply delta" |
81809b99 | 6208 | msgstr "无法应用 delta" |
8ada9598 | 6209 | |
7aea43ff | 6210 | #: builtin/index-pack.c:1118 |
8ada9598 | 6211 | msgid "Receiving objects" |
81809b99 | 6212 | msgstr "接收对象中" |
8ada9598 | 6213 | |
7aea43ff | 6214 | #: builtin/index-pack.c:1118 |
8ada9598 | 6215 | msgid "Indexing objects" |
81809b99 | 6216 | msgstr "索引对象中" |
8ada9598 | 6217 | |
7aea43ff | 6218 | #: builtin/index-pack.c:1150 |
8ada9598 | 6219 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 6220 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 6221 | |
7aea43ff | 6222 | #: builtin/index-pack.c:1155 |
8ada9598 | 6223 | msgid "cannot fstat packfile" |
81809b99 | 6224 | msgstr "不能枚举包文件状态" |
8ada9598 | 6225 | |
7aea43ff | 6226 | #: builtin/index-pack.c:1158 |
8ada9598 | 6227 | msgid "pack has junk at the end" |
81809b99 | 6228 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 6229 | |
7aea43ff | 6230 | #: builtin/index-pack.c:1169 |
6792b93b JX |
6231 | msgid "confusion beyond insanity in parse_pack_objects()" |
6232 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
6233 | ||
7aea43ff | 6234 | #: builtin/index-pack.c:1194 |
8ada9598 | 6235 | msgid "Resolving deltas" |
81809b99 | 6236 | msgstr "处理 delta 中" |
8ada9598 | 6237 | |
7aea43ff | 6238 | #: builtin/index-pack.c:1205 |
07432cef | 6239 | #, c-format |
ef317cd5 | 6240 | msgid "unable to create thread: %s" |
07432cef | 6241 | msgstr "不能创建线程:%s" |
ef317cd5 | 6242 | |
7aea43ff | 6243 | #: builtin/index-pack.c:1247 |
8ada9598 | 6244 | msgid "confusion beyond insanity" |
81809b99 | 6245 | msgstr "不可理喻" |
8ada9598 | 6246 | |
7aea43ff | 6247 | #: builtin/index-pack.c:1253 |
ef317cd5 JX |
6248 | #, c-format |
6249 | msgid "completed with %d local objects" | |
07432cef | 6250 | msgstr "完成 %d 个本地对象" |
ef317cd5 | 6251 | |
7aea43ff | 6252 | #: builtin/index-pack.c:1263 |
ef317cd5 JX |
6253 | #, c-format |
6254 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 6255 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 6256 | |
7aea43ff | 6257 | #: builtin/index-pack.c:1267 |
8ada9598 JX |
6258 | #, c-format |
6259 | msgid "pack has %d unresolved delta" | |
6260 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 6261 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 6262 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 6263 | |
7aea43ff | 6264 | #: builtin/index-pack.c:1291 |
81809b99 | 6265 | #, c-format |
8ada9598 | 6266 | msgid "unable to deflate appended object (%d)" |
07432cef | 6267 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 6268 | |
7aea43ff | 6269 | #: builtin/index-pack.c:1367 |
8ada9598 JX |
6270 | #, c-format |
6271 | msgid "local object %s is corrupt" | |
81809b99 | 6272 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 6273 | |
7aea43ff | 6274 | #: builtin/index-pack.c:1391 |
8ada9598 | 6275 | msgid "error while closing pack file" |
81809b99 | 6276 | msgstr "关闭包文件时出错" |
8ada9598 | 6277 | |
7aea43ff | 6278 | #: builtin/index-pack.c:1404 |
81809b99 | 6279 | #, c-format |
8ada9598 | 6280 | msgid "cannot write keep file '%s'" |
81809b99 | 6281 | msgstr "无法写保留文件 '%s'" |
8ada9598 | 6282 | |
7aea43ff | 6283 | #: builtin/index-pack.c:1412 |
81809b99 | 6284 | #, c-format |
8ada9598 | 6285 | msgid "cannot close written keep file '%s'" |
81809b99 | 6286 | msgstr "无法关闭保留文件 '%s'" |
8ada9598 | 6287 | |
7aea43ff | 6288 | #: builtin/index-pack.c:1425 |
8ada9598 | 6289 | msgid "cannot store pack file" |
81809b99 | 6290 | msgstr "无法存储包文件" |
8ada9598 | 6291 | |
7aea43ff | 6292 | #: builtin/index-pack.c:1436 |
8ada9598 | 6293 | msgid "cannot store index file" |
81809b99 | 6294 | msgstr "无法存储索引文件" |
8ada9598 | 6295 | |
7aea43ff | 6296 | #: builtin/index-pack.c:1469 |
07432cef | 6297 | #, c-format |
ef317cd5 | 6298 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 6299 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 6300 | |
7aea43ff | 6301 | #: builtin/index-pack.c:1475 |
ef317cd5 JX |
6302 | #, c-format |
6303 | msgid "invalid number of threads specified (%d)" | |
07432cef | 6304 | msgstr "指定的线程数无效(%d)" |
ef317cd5 | 6305 | |
7aea43ff | 6306 | #: builtin/index-pack.c:1479 builtin/index-pack.c:1658 |
ef317cd5 JX |
6307 | #, c-format |
6308 | msgid "no threads support, ignoring %s" | |
07432cef | 6309 | msgstr "没有线程支持,忽略 %s" |
ef317cd5 | 6310 | |
7aea43ff | 6311 | #: builtin/index-pack.c:1537 |
81809b99 | 6312 | #, c-format |
8ada9598 | 6313 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 6314 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 6315 | |
7aea43ff | 6316 | #: builtin/index-pack.c:1539 |
81809b99 | 6317 | #, c-format |
8ada9598 | 6318 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 6319 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 6320 | |
7aea43ff | 6321 | #: builtin/index-pack.c:1586 |
81809b99 | 6322 | #, c-format |
8ada9598 JX |
6323 | msgid "non delta: %d object" |
6324 | msgid_plural "non delta: %d objects" | |
81809b99 | 6325 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 6326 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 6327 | |
7aea43ff | 6328 | #: builtin/index-pack.c:1593 |
8ada9598 JX |
6329 | #, c-format |
6330 | msgid "chain length = %d: %lu object" | |
6331 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 6332 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 6333 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 6334 | |
7aea43ff | 6335 | #: builtin/index-pack.c:1622 |
8ada9598 | 6336 | msgid "Cannot come back to cwd" |
81809b99 | 6337 | msgstr "无法返回当前工作目录" |
8ada9598 | 6338 | |
7aea43ff JX |
6339 | #: builtin/index-pack.c:1670 builtin/index-pack.c:1673 |
6340 | #: builtin/index-pack.c:1685 builtin/index-pack.c:1689 | |
81809b99 | 6341 | #, c-format |
8ada9598 | 6342 | msgid "bad %s" |
81809b99 | 6343 | msgstr "错误选项 %s" |
8ada9598 | 6344 | |
7aea43ff | 6345 | #: builtin/index-pack.c:1703 |
8ada9598 | 6346 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 6347 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 6348 | |
7aea43ff | 6349 | #: builtin/index-pack.c:1707 builtin/index-pack.c:1716 |
8ada9598 JX |
6350 | #, c-format |
6351 | msgid "packfile name '%s' does not end with '.pack'" | |
81809b99 | 6352 | msgstr "包名 '%s' 没有以 '.pack' 结尾" |
8ada9598 | 6353 | |
7aea43ff | 6354 | #: builtin/index-pack.c:1724 |
8ada9598 | 6355 | msgid "--verify with no packfile name given" |
81809b99 | 6356 | msgstr "--verify 没有提供包名参数" |
8ada9598 | 6357 | |
c04f5ac3 JX |
6358 | #: builtin/init-db.c:35 |
6359 | #, c-format | |
6360 | msgid "Could not make %s writable by group" | |
6361 | msgstr "不能设置 %s 为组可写" | |
6362 | ||
6363 | #: builtin/init-db.c:62 | |
6364 | #, c-format | |
6365 | msgid "insanely long template name %s" | |
6366 | msgstr "太长的模版名 %s" | |
6367 | ||
6368 | #: builtin/init-db.c:67 | |
6369 | #, c-format | |
6370 | msgid "cannot stat '%s'" | |
6371 | msgstr "不能枚举 '%s' 状态" | |
6372 | ||
6373 | #: builtin/init-db.c:73 | |
6374 | #, c-format | |
6375 | msgid "cannot stat template '%s'" | |
6376 | msgstr "不能枚举模版 '%s' 状态" | |
6377 | ||
6378 | #: builtin/init-db.c:80 | |
6379 | #, c-format | |
6380 | msgid "cannot opendir '%s'" | |
6381 | msgstr "不能打开目录 '%s'" | |
6382 | ||
6383 | #: builtin/init-db.c:97 | |
6384 | #, c-format | |
6385 | msgid "cannot readlink '%s'" | |
6386 | msgstr "不能读取链接 '%s'" | |
6387 | ||
6388 | #: builtin/init-db.c:99 | |
6389 | #, c-format | |
6390 | msgid "insanely long symlink %s" | |
6391 | msgstr "太长的符号链接 %s" | |
6392 | ||
6393 | #: builtin/init-db.c:102 | |
6394 | #, c-format | |
6395 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 6396 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 JX |
6397 | |
6398 | #: builtin/init-db.c:106 | |
6399 | #, c-format | |
6400 | msgid "cannot copy '%s' to '%s'" | |
6401 | msgstr "不能拷贝 '%s' 至 '%s'" | |
6402 | ||
6403 | #: builtin/init-db.c:110 | |
6404 | #, c-format | |
6405 | msgid "ignoring template %s" | |
6406 | msgstr "忽略模版 %s" | |
6407 | ||
04cb2f28 | 6408 | #: builtin/init-db.c:136 |
c04f5ac3 JX |
6409 | #, c-format |
6410 | msgid "insanely long template path %s" | |
6411 | msgstr "太长的模版路径 %s" | |
6412 | ||
04cb2f28 | 6413 | #: builtin/init-db.c:144 |
c04f5ac3 JX |
6414 | #, c-format |
6415 | msgid "templates not found %s" | |
6416 | msgstr "模版未找到 %s" | |
6417 | ||
04cb2f28 | 6418 | #: builtin/init-db.c:157 |
c04f5ac3 JX |
6419 | #, c-format |
6420 | msgid "not copying templates of a wrong format version %d from '%s'" | |
81809b99 | 6421 | msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版" |
c04f5ac3 | 6422 | |
7aea43ff | 6423 | #: builtin/init-db.c:211 |
c04f5ac3 JX |
6424 | #, c-format |
6425 | msgid "insane git directory %s" | |
6426 | msgstr "不正常的 git 目录 %s" | |
6427 | ||
7aea43ff | 6428 | #: builtin/init-db.c:343 builtin/init-db.c:346 |
c04f5ac3 JX |
6429 | #, c-format |
6430 | msgid "%s already exists" | |
6431 | msgstr "%s 已经存在" | |
6432 | ||
7aea43ff | 6433 | #: builtin/init-db.c:374 |
c04f5ac3 JX |
6434 | #, c-format |
6435 | msgid "unable to handle file type %d" | |
6436 | msgstr "不能处理 %d 类型的文件" | |
6437 | ||
7aea43ff | 6438 | #: builtin/init-db.c:377 |
c04f5ac3 JX |
6439 | #, c-format |
6440 | msgid "unable to move %s to %s" | |
6441 | msgstr "不能移动 %s 至 %s" | |
6442 | ||
6c94aba5 JX |
6443 | #. TRANSLATORS: The first '%s' is either "Reinitialized |
6444 | #. existing" or "Initialized empty", the second " shared" or | |
6445 | #. "", and the last '%s%s' is the verbatim directory name. | |
7aea43ff | 6446 | #: builtin/init-db.c:433 |
c04f5ac3 JX |
6447 | #, c-format |
6448 | msgid "%s%s Git repository in %s%s\n" | |
6449 | msgstr "%s%s Git 版本库于 %s%s\n" | |
6450 | ||
7aea43ff | 6451 | #: builtin/init-db.c:434 |
c04f5ac3 JX |
6452 | msgid "Reinitialized existing" |
6453 | msgstr "重新初始化现存的" | |
6454 | ||
7aea43ff | 6455 | #: builtin/init-db.c:434 |
c04f5ac3 JX |
6456 | msgid "Initialized empty" |
6457 | msgstr "初始化空的" | |
6458 | ||
7e238ab7 | 6459 | # 译者:中文字符串拼接,可删除前导空格 |
7aea43ff | 6460 | #: builtin/init-db.c:435 |
c04f5ac3 | 6461 | msgid " shared" |
90e6ef53 | 6462 | msgstr "共享" |
c04f5ac3 | 6463 | |
7aea43ff | 6464 | #: builtin/init-db.c:482 |
ef317cd5 | 6465 | msgid "" |
a77c07d9 | 6466 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
814ff314 | 6467 | "shared[=<permissions>]] [<directory>]" |
ef317cd5 | 6468 | msgstr "" |
07432cef | 6469 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
814ff314 | 6470 | "[<目录>]" |
ef317cd5 | 6471 | |
7aea43ff | 6472 | #: builtin/init-db.c:505 |
ef317cd5 | 6473 | msgid "permissions" |
07432cef | 6474 | msgstr "权限" |
ef317cd5 | 6475 | |
7aea43ff | 6476 | #: builtin/init-db.c:506 |
ef317cd5 | 6477 | msgid "specify that the git repository is to be shared amongst several users" |
07432cef | 6478 | msgstr "指定 git 版本库是多个用户之间共享的" |
ef317cd5 | 6479 | |
7aea43ff | 6480 | #: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171 |
ef317cd5 | 6481 | msgid "be quiet" |
07432cef | 6482 | msgstr "保持安静" |
ef317cd5 | 6483 | |
7aea43ff | 6484 | #: builtin/init-db.c:540 builtin/init-db.c:545 |
c04f5ac3 JX |
6485 | #, c-format |
6486 | msgid "cannot mkdir %s" | |
6487 | msgstr "不能创建目录 %s" | |
6488 | ||
7aea43ff | 6489 | #: builtin/init-db.c:549 |
c04f5ac3 JX |
6490 | #, c-format |
6491 | msgid "cannot chdir to %s" | |
6492 | msgstr "不能切换目录到 %s" | |
6493 | ||
7aea43ff | 6494 | #: builtin/init-db.c:570 |
c04f5ac3 JX |
6495 | #, c-format |
6496 | msgid "" | |
6497 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
6498 | "dir=<directory>)" | |
1e607449 | 6499 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
c04f5ac3 | 6500 | |
7aea43ff | 6501 | #: builtin/init-db.c:598 |
c04f5ac3 JX |
6502 | #, c-format |
6503 | msgid "Cannot access work tree '%s'" | |
6504 | msgstr "不能访问工作区 '%s'" | |
6505 | ||
220c313c JX |
6506 | #: builtin/interpret-trailers.c:15 |
6507 | msgid "" | |
6508 | "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " | |
6509 | "[<file>...]" | |
6510 | msgstr "" | |
6511 | "git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件" | |
6512 | ">...]" | |
6513 | ||
6514 | #: builtin/interpret-trailers.c:25 | |
6515 | msgid "trim empty trailers" | |
6516 | msgstr "删除空签名" | |
6517 | ||
6518 | #: builtin/interpret-trailers.c:26 | |
6519 | msgid "trailer" | |
6520 | msgstr "签名" | |
6521 | ||
6522 | #: builtin/interpret-trailers.c:27 | |
6523 | msgid "trailer(s) to add" | |
6524 | msgstr "要添加的签名" | |
6525 | ||
2e8451e8 | 6526 | #: builtin/log.c:41 |
7aea43ff | 6527 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
d9d56b23 | 6528 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" |
ef317cd5 | 6529 | |
2e8451e8 | 6530 | #: builtin/log.c:42 |
814ff314 JX |
6531 | msgid "git show [<options>] <object>..." |
6532 | msgstr "git show [<选项>] <对象>..." | |
ef317cd5 | 6533 | |
220c313c JX |
6534 | #: builtin/log.c:81 |
6535 | #, c-format | |
6536 | msgid "invalid --decorate option: %s" | |
6537 | msgstr "无效的 --decorate 选项:%s" | |
6538 | ||
6acbf033 | 6539 | #: builtin/log.c:127 |
ef317cd5 | 6540 | msgid "suppress diff output" |
07432cef | 6541 | msgstr "不显示差异输出" |
ef317cd5 | 6542 | |
6acbf033 | 6543 | #: builtin/log.c:128 |
ef317cd5 | 6544 | msgid "show source" |
07432cef | 6545 | msgstr "显示源" |
ef317cd5 | 6546 | |
6acbf033 | 6547 | #: builtin/log.c:129 |
07432cef WS |
6548 | msgid "Use mail map file" |
6549 | msgstr "使用邮件映射文件" | |
6550 | ||
6acbf033 | 6551 | #: builtin/log.c:130 |
ef317cd5 | 6552 | msgid "decorate options" |
07432cef | 6553 | msgstr "修饰选项" |
ef317cd5 | 6554 | |
220c313c JX |
6555 | #: builtin/log.c:133 |
6556 | msgid "Process line range n,m in file, counting from 1" | |
6557 | msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" | |
6558 | ||
6acbf033 | 6559 | #: builtin/log.c:229 |
c04f5ac3 JX |
6560 | #, c-format |
6561 | msgid "Final output: %d %s\n" | |
6562 | msgstr "最终输出:%d %s\n" | |
6563 | ||
220c313c JX |
6564 | #: builtin/log.c:458 |
6565 | #, c-format | |
6566 | msgid "git show %s: bad file" | |
6567 | msgstr "git show %s: 损坏的文件" | |
6568 | ||
6569 | #: builtin/log.c:472 builtin/log.c:564 | |
c04f5ac3 JX |
6570 | #, c-format |
6571 | msgid "Could not read object %s" | |
90e6ef53 | 6572 | msgstr "不能读取对象 %s" |
c04f5ac3 | 6573 | |
220c313c | 6574 | #: builtin/log.c:588 |
c04f5ac3 JX |
6575 | #, c-format |
6576 | msgid "Unknown type: %d" | |
6577 | msgstr "未知类型:%d" | |
6578 | ||
220c313c | 6579 | #: builtin/log.c:689 |
c04f5ac3 JX |
6580 | msgid "format.headers without value" |
6581 | msgstr "format.headers 没有值" | |
6582 | ||
220c313c | 6583 | #: builtin/log.c:773 |
c04f5ac3 JX |
6584 | msgid "name of output directory is too long" |
6585 | msgstr "输出目录名太长" | |
6586 | ||
220c313c | 6587 | #: builtin/log.c:789 |
c04f5ac3 JX |
6588 | #, c-format |
6589 | msgid "Cannot open patch file %s" | |
6590 | msgstr "无法打开补丁文件 %s" | |
6591 | ||
220c313c | 6592 | #: builtin/log.c:803 |
c04f5ac3 JX |
6593 | msgid "Need exactly one range." |
6594 | msgstr "只需要一个范围。" | |
6595 | ||
7aea43ff | 6596 | #: builtin/log.c:813 |
c04f5ac3 JX |
6597 | msgid "Not a range." |
6598 | msgstr "不是一个范围。" | |
6599 | ||
220c313c | 6600 | #: builtin/log.c:919 |
c04f5ac3 JX |
6601 | msgid "Cover letter needs email format" |
6602 | msgstr "信封需要邮件地址格式" | |
6603 | ||
220c313c | 6604 | #: builtin/log.c:998 |
c04f5ac3 JX |
6605 | #, c-format |
6606 | msgid "insane in-reply-to: %s" | |
6607 | msgstr "不正常的 in-reply-to:%s" | |
6608 | ||
220c313c | 6609 | #: builtin/log.c:1026 |
814ff314 JX |
6610 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
6611 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" | |
ef317cd5 | 6612 | |
220c313c | 6613 | #: builtin/log.c:1071 |
c04f5ac3 JX |
6614 | msgid "Two output directories?" |
6615 | msgstr "两个输出目录?" | |
6616 | ||
220c313c | 6617 | #: builtin/log.c:1186 |
ef317cd5 | 6618 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 6619 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 6620 | |
220c313c | 6621 | #: builtin/log.c:1189 |
ef317cd5 | 6622 | msgid "use [PATCH] even with multiple patches" |
07432cef | 6623 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 6624 | |
220c313c | 6625 | #: builtin/log.c:1193 |
ef317cd5 | 6626 | msgid "print patches to standard out" |
07432cef | 6627 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 6628 | |
220c313c | 6629 | #: builtin/log.c:1195 |
ef317cd5 | 6630 | msgid "generate a cover letter" |
07432cef | 6631 | msgstr "生成一封附信" |
c04f5ac3 | 6632 | |
220c313c | 6633 | #: builtin/log.c:1197 |
ef317cd5 | 6634 | msgid "use simple number sequence for output file names" |
07432cef | 6635 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 6636 | |
220c313c | 6637 | #: builtin/log.c:1198 |
ef317cd5 | 6638 | msgid "sfx" |
07432cef | 6639 | msgstr "后缀" |
ef317cd5 | 6640 | |
220c313c | 6641 | #: builtin/log.c:1199 |
ef317cd5 | 6642 | msgid "use <sfx> instead of '.patch'" |
07432cef | 6643 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 6644 | |
220c313c | 6645 | #: builtin/log.c:1201 |
ef317cd5 | 6646 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
6647 | msgstr "补丁以 <n> 开始编号,而不是1" |
6648 | ||
220c313c | 6649 | #: builtin/log.c:1203 |
07432cef WS |
6650 | msgid "mark the series as Nth re-roll" |
6651 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 6652 | |
220c313c | 6653 | #: builtin/log.c:1205 |
ef317cd5 | 6654 | msgid "Use [<prefix>] instead of [PATCH]" |
07432cef | 6655 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 6656 | |
220c313c | 6657 | #: builtin/log.c:1208 |
ef317cd5 | 6658 | msgid "store resulting files in <dir>" |
d9d56b23 | 6659 | msgstr "把结果文件存储在 <目录>" |
ef317cd5 | 6660 | |
220c313c | 6661 | #: builtin/log.c:1211 |
ef317cd5 | 6662 | msgid "don't strip/add [PATCH]" |
07432cef | 6663 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 6664 | |
220c313c | 6665 | #: builtin/log.c:1214 |
ef317cd5 | 6666 | msgid "don't output binary diffs" |
07432cef | 6667 | msgstr "不输出二进制差异" |
ef317cd5 | 6668 | |
220c313c | 6669 | #: builtin/log.c:1216 |
ef317cd5 | 6670 | msgid "don't include a patch matching a commit upstream" |
07432cef | 6671 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 6672 | |
220c313c | 6673 | #: builtin/log.c:1218 |
ef317cd5 | 6674 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 6675 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 6676 | |
220c313c | 6677 | #: builtin/log.c:1220 |
ef317cd5 | 6678 | msgid "Messaging" |
07432cef | 6679 | msgstr "邮件发送" |
ef317cd5 | 6680 | |
220c313c | 6681 | #: builtin/log.c:1221 |
ef317cd5 | 6682 | msgid "header" |
07432cef | 6683 | msgstr "header" |
ef317cd5 | 6684 | |
220c313c | 6685 | #: builtin/log.c:1222 |
ef317cd5 | 6686 | msgid "add email header" |
07432cef | 6687 | msgstr "添加邮件头" |
ef317cd5 | 6688 | |
220c313c | 6689 | #: builtin/log.c:1223 builtin/log.c:1225 |
ef317cd5 | 6690 | msgid "email" |
07432cef | 6691 | msgstr "邮件地址" |
ef317cd5 | 6692 | |
220c313c | 6693 | #: builtin/log.c:1223 |
ef317cd5 | 6694 | msgid "add To: header" |
07432cef | 6695 | msgstr "添加收件人" |
ef317cd5 | 6696 | |
220c313c | 6697 | #: builtin/log.c:1225 |
ef317cd5 | 6698 | msgid "add Cc: header" |
07432cef | 6699 | msgstr "添加抄送" |
ef317cd5 | 6700 | |
220c313c | 6701 | #: builtin/log.c:1227 |
2e8451e8 | 6702 | msgid "ident" |
d9d56b23 | 6703 | msgstr "标识" |
2e8451e8 | 6704 | |
220c313c | 6705 | #: builtin/log.c:1228 |
2e8451e8 | 6706 | msgid "set From address to <ident> (or committer ident if absent)" |
d9d56b23 | 6707 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者ID做为地址)" |
2e8451e8 | 6708 | |
220c313c | 6709 | #: builtin/log.c:1230 |
ef317cd5 | 6710 | msgid "message-id" |
d9d56b23 | 6711 | msgstr "邮件标识" |
ef317cd5 | 6712 | |
220c313c | 6713 | #: builtin/log.c:1231 |
ef317cd5 | 6714 | msgid "make first mail a reply to <message-id>" |
d9d56b23 | 6715 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
ef317cd5 | 6716 | |
220c313c | 6717 | #: builtin/log.c:1232 builtin/log.c:1235 |
ef317cd5 | 6718 | msgid "boundary" |
07432cef | 6719 | msgstr "边界" |
ef317cd5 | 6720 | |
220c313c | 6721 | #: builtin/log.c:1233 |
ef317cd5 | 6722 | msgid "attach the patch" |
07432cef | 6723 | msgstr "附件方式添加补丁" |
ef317cd5 | 6724 | |
220c313c | 6725 | #: builtin/log.c:1236 |
ef317cd5 | 6726 | msgid "inline the patch" |
07432cef | 6727 | msgstr "内联显示补丁" |
ef317cd5 | 6728 | |
220c313c | 6729 | #: builtin/log.c:1240 |
ef317cd5 | 6730 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 6731 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 6732 | |
220c313c | 6733 | #: builtin/log.c:1242 |
ef317cd5 | 6734 | msgid "signature" |
07432cef | 6735 | msgstr "签名" |
ef317cd5 | 6736 | |
220c313c | 6737 | #: builtin/log.c:1243 |
ef317cd5 | 6738 | msgid "add a signature" |
07432cef | 6739 | msgstr "添加一个签名" |
ef317cd5 | 6740 | |
220c313c | 6741 | #: builtin/log.c:1245 |
6acbf033 JX |
6742 | msgid "add a signature from a file" |
6743 | msgstr "从文件添加一个签名" | |
6744 | ||
220c313c | 6745 | #: builtin/log.c:1246 |
ef317cd5 | 6746 | msgid "don't print the patch filenames" |
07432cef | 6747 | msgstr "不要打印补丁文件名" |
ef317cd5 | 6748 | |
220c313c | 6749 | #: builtin/log.c:1320 |
2e8451e8 JX |
6750 | #, c-format |
6751 | msgid "invalid ident line: %s" | |
6752 | msgstr "包含无效的身份标识:%s" | |
6753 | ||
220c313c | 6754 | #: builtin/log.c:1335 |
c04f5ac3 JX |
6755 | msgid "-n and -k are mutually exclusive." |
6756 | msgstr "-n 和 -k 互斥。" | |
6757 | ||
220c313c | 6758 | #: builtin/log.c:1337 |
c04f5ac3 JX |
6759 | msgid "--subject-prefix and -k are mutually exclusive." |
6760 | msgstr "--subject-prefix 和 -k 互斥。" | |
6761 | ||
220c313c | 6762 | #: builtin/log.c:1345 |
c04f5ac3 JX |
6763 | msgid "--name-only does not make sense" |
6764 | msgstr "--name-only 无意义" | |
6765 | ||
220c313c | 6766 | #: builtin/log.c:1347 |
c04f5ac3 JX |
6767 | msgid "--name-status does not make sense" |
6768 | msgstr "--name-status 无意义" | |
6769 | ||
220c313c | 6770 | #: builtin/log.c:1349 |
c04f5ac3 JX |
6771 | msgid "--check does not make sense" |
6772 | msgstr "--check 无意义" | |
6773 | ||
220c313c | 6774 | #: builtin/log.c:1372 |
c04f5ac3 JX |
6775 | msgid "standard output, or directory, which one?" |
6776 | msgstr "标准输出或目录,哪一个?" | |
6777 | ||
220c313c | 6778 | #: builtin/log.c:1374 |
c04f5ac3 JX |
6779 | #, c-format |
6780 | msgid "Could not create directory '%s'" | |
90e6ef53 | 6781 | msgstr "不能创建目录 '%s'" |
c04f5ac3 | 6782 | |
220c313c | 6783 | #: builtin/log.c:1472 |
6acbf033 JX |
6784 | #, c-format |
6785 | msgid "unable to read signature file '%s'" | |
6786 | msgstr "无法读取签名文件 '%s'" | |
6787 | ||
220c313c | 6788 | #: builtin/log.c:1535 |
c04f5ac3 JX |
6789 | msgid "Failed to create output files" |
6790 | msgstr "无法创建输出文件" | |
6791 | ||
220c313c | 6792 | #: builtin/log.c:1583 |
ef317cd5 | 6793 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 6794 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 6795 | |
7aea43ff | 6796 | #: builtin/log.c:1637 |
c04f5ac3 JX |
6797 | #, c-format |
6798 | msgid "" | |
6799 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
d9d56b23 | 6800 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
c04f5ac3 | 6801 | |
7aea43ff | 6802 | #: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662 |
c04f5ac3 JX |
6803 | #, c-format |
6804 | msgid "Unknown commit %s" | |
6805 | msgstr "未知提交 %s" | |
6806 | ||
814ff314 JX |
6807 | #: builtin/ls-files.c:358 |
6808 | msgid "git ls-files [<options>] [<file>...]" | |
6809 | msgstr "git ls-files [<选项>] [<文件>...]" | |
ef317cd5 | 6810 | |
814ff314 | 6811 | #: builtin/ls-files.c:415 |
ef317cd5 | 6812 | msgid "identify the file status with tags" |
07432cef | 6813 | msgstr "用标签标识文件的状态" |
ef317cd5 | 6814 | |
814ff314 | 6815 | #: builtin/ls-files.c:417 |
ef317cd5 | 6816 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 6817 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 6818 | |
814ff314 | 6819 | #: builtin/ls-files.c:419 |
ef317cd5 | 6820 | msgid "show cached files in the output (default)" |
07432cef | 6821 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 6822 | |
814ff314 | 6823 | #: builtin/ls-files.c:421 |
ef317cd5 | 6824 | msgid "show deleted files in the output" |
07432cef | 6825 | msgstr "显示已删除的文件" |
ef317cd5 | 6826 | |
814ff314 | 6827 | #: builtin/ls-files.c:423 |
ef317cd5 | 6828 | msgid "show modified files in the output" |
07432cef | 6829 | msgstr "显示已修改的文件" |
ef317cd5 | 6830 | |
814ff314 | 6831 | #: builtin/ls-files.c:425 |
ef317cd5 | 6832 | msgid "show other files in the output" |
07432cef | 6833 | msgstr "显示其它文件" |
ef317cd5 | 6834 | |
814ff314 | 6835 | #: builtin/ls-files.c:427 |
ef317cd5 | 6836 | msgid "show ignored files in the output" |
07432cef | 6837 | msgstr "显示忽略的文件" |
ef317cd5 | 6838 | |
814ff314 | 6839 | #: builtin/ls-files.c:430 |
ef317cd5 | 6840 | msgid "show staged contents' object name in the output" |
07432cef | 6841 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 6842 | |
814ff314 | 6843 | #: builtin/ls-files.c:432 |
ef317cd5 | 6844 | msgid "show files on the filesystem that need to be removed" |
07432cef | 6845 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 6846 | |
814ff314 | 6847 | #: builtin/ls-files.c:434 |
220c313c | 6848 | msgid "show 'other' directories' names only" |
07432cef | 6849 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 6850 | |
814ff314 | 6851 | #: builtin/ls-files.c:437 |
ef317cd5 | 6852 | msgid "don't show empty directories" |
07432cef | 6853 | msgstr "不显示空目录" |
ef317cd5 | 6854 | |
814ff314 | 6855 | #: builtin/ls-files.c:440 |
ef317cd5 | 6856 | msgid "show unmerged files in the output" |
07432cef | 6857 | msgstr "显示未合并的文件" |
ef317cd5 | 6858 | |
814ff314 | 6859 | #: builtin/ls-files.c:442 |
ef317cd5 | 6860 | msgid "show resolve-undo information" |
07432cef | 6861 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 6862 | |
814ff314 | 6863 | #: builtin/ls-files.c:444 |
ef317cd5 | 6864 | msgid "skip files matching pattern" |
07432cef | 6865 | msgstr "匹配排除文件的模式" |
ef317cd5 | 6866 | |
814ff314 | 6867 | #: builtin/ls-files.c:447 |
ef317cd5 | 6868 | msgid "exclude patterns are read from <file>" |
07432cef | 6869 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 6870 | |
814ff314 | 6871 | #: builtin/ls-files.c:450 |
ef317cd5 | 6872 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 6873 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 6874 | |
814ff314 | 6875 | #: builtin/ls-files.c:452 |
ef317cd5 | 6876 | msgid "add the standard git exclusions" |
07432cef | 6877 | msgstr "添加标准的 git 排除" |
ef317cd5 | 6878 | |
814ff314 | 6879 | #: builtin/ls-files.c:455 |
ef317cd5 | 6880 | msgid "make the output relative to the project top directory" |
07432cef | 6881 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 6882 | |
814ff314 | 6883 | #: builtin/ls-files.c:458 |
ef317cd5 | 6884 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 6885 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 6886 | |
814ff314 | 6887 | #: builtin/ls-files.c:459 |
ef317cd5 | 6888 | msgid "tree-ish" |
07432cef | 6889 | msgstr "树或提交" |
ef317cd5 | 6890 | |
814ff314 | 6891 | #: builtin/ls-files.c:460 |
ef317cd5 | 6892 | msgid "pretend that paths removed since <tree-ish> are still present" |
07432cef | 6893 | msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" |
ef317cd5 | 6894 | |
814ff314 | 6895 | #: builtin/ls-files.c:462 |
ef317cd5 | 6896 | msgid "show debugging data" |
07432cef | 6897 | msgstr "显示调试数据" |
ef317cd5 | 6898 | |
90314792 | 6899 | #: builtin/ls-tree.c:28 |
ef317cd5 | 6900 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
07432cef | 6901 | msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 6902 | |
04cb2f28 | 6903 | #: builtin/ls-tree.c:127 |
ef317cd5 | 6904 | msgid "only show trees" |
07432cef | 6905 | msgstr "只显示树" |
ef317cd5 | 6906 | |
04cb2f28 | 6907 | #: builtin/ls-tree.c:129 |
ef317cd5 | 6908 | msgid "recurse into subtrees" |
07432cef | 6909 | msgstr "递归到子树" |
ef317cd5 | 6910 | |
04cb2f28 | 6911 | #: builtin/ls-tree.c:131 |
ef317cd5 | 6912 | msgid "show trees when recursing" |
07432cef | 6913 | msgstr "当递归时显示树" |
ef317cd5 | 6914 | |
04cb2f28 | 6915 | #: builtin/ls-tree.c:134 |
ef317cd5 | 6916 | msgid "terminate entries with NUL byte" |
07432cef | 6917 | msgstr "条目以NUL字符终止" |
ef317cd5 | 6918 | |
04cb2f28 | 6919 | #: builtin/ls-tree.c:135 |
ef317cd5 | 6920 | msgid "include object size" |
07432cef | 6921 | msgstr "包括对象大小" |
ef317cd5 | 6922 | |
04cb2f28 | 6923 | #: builtin/ls-tree.c:137 builtin/ls-tree.c:139 |
ef317cd5 | 6924 | msgid "list only filenames" |
07432cef | 6925 | msgstr "只列出文件名" |
ef317cd5 | 6926 | |
04cb2f28 | 6927 | #: builtin/ls-tree.c:142 |
ef317cd5 | 6928 | msgid "use full path names" |
07432cef | 6929 | msgstr "使用文件的全路径" |
ef317cd5 | 6930 | |
04cb2f28 | 6931 | #: builtin/ls-tree.c:144 |
ef317cd5 | 6932 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 6933 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 | 6934 | |
04cb2f28 | 6935 | #: builtin/merge.c:45 |
814ff314 JX |
6936 | msgid "git merge [<options>] [<commit>...]" |
6937 | msgstr "git merge [<选项>] [<提交>...]" | |
ef317cd5 | 6938 | |
04cb2f28 | 6939 | #: builtin/merge.c:46 |
814ff314 JX |
6940 | msgid "git merge [<options>] <msg> HEAD <commit>" |
6941 | msgstr "git merge [<选项>] <说明> HEAD <提交>" | |
ef317cd5 | 6942 | |
04cb2f28 | 6943 | #: builtin/merge.c:47 |
ef317cd5 | 6944 | msgid "git merge --abort" |
07432cef | 6945 | msgstr "git merge --abort" |
ef317cd5 | 6946 | |
04cb2f28 | 6947 | #: builtin/merge.c:100 |
c04f5ac3 JX |
6948 | msgid "switch `m' requires a value" |
6949 | msgstr "开关 `m' 需要一个值" | |
6950 | ||
04cb2f28 | 6951 | #: builtin/merge.c:137 |
c04f5ac3 JX |
6952 | #, c-format |
6953 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 6954 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 6955 | |
04cb2f28 | 6956 | #: builtin/merge.c:138 |
c04f5ac3 JX |
6957 | #, c-format |
6958 | msgid "Available strategies are:" | |
6959 | msgstr "可用的策略有:" | |
6960 | ||
04cb2f28 | 6961 | #: builtin/merge.c:143 |
c04f5ac3 JX |
6962 | #, c-format |
6963 | msgid "Available custom strategies are:" | |
6964 | msgstr "可用的自定义策略有:" | |
6965 | ||
04cb2f28 | 6966 | #: builtin/merge.c:193 |
ef317cd5 | 6967 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 6968 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 6969 | |
04cb2f28 | 6970 | #: builtin/merge.c:196 |
ef317cd5 | 6971 | msgid "show a diffstat at the end of the merge" |
07432cef | 6972 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 6973 | |
04cb2f28 | 6974 | #: builtin/merge.c:197 |
ef317cd5 | 6975 | msgid "(synonym to --stat)" |
07432cef | 6976 | msgstr "(和 --stat 同义)" |
ef317cd5 | 6977 | |
04cb2f28 | 6978 | #: builtin/merge.c:199 |
ef317cd5 | 6979 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 6980 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 6981 | |
04cb2f28 | 6982 | #: builtin/merge.c:202 |
ef317cd5 | 6983 | msgid "create a single commit instead of doing a merge" |
07432cef | 6984 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 6985 | |
04cb2f28 | 6986 | #: builtin/merge.c:204 |
ef317cd5 | 6987 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 6988 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 6989 | |
04cb2f28 | 6990 | #: builtin/merge.c:206 |
ef317cd5 | 6991 | msgid "edit message before committing" |
07432cef | 6992 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 6993 | |
04cb2f28 | 6994 | #: builtin/merge.c:207 |
ef317cd5 | 6995 | msgid "allow fast-forward (default)" |
07432cef | 6996 | msgstr "允许快进(默认)" |
ef317cd5 | 6997 | |
04cb2f28 | 6998 | #: builtin/merge.c:209 |
ef317cd5 | 6999 | msgid "abort if fast-forward is not possible" |
07432cef | 7000 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 7001 | |
04cb2f28 | 7002 | #: builtin/merge.c:213 |
1003b3a5 JX |
7003 | msgid "Verify that the named commit has a valid GPG signature" |
7004 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" | |
7005 | ||
04cb2f28 | 7006 | #: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89 |
ef317cd5 | 7007 | msgid "strategy" |
07432cef | 7008 | msgstr "策略" |
ef317cd5 | 7009 | |
04cb2f28 | 7010 | #: builtin/merge.c:215 |
ef317cd5 | 7011 | msgid "merge strategy to use" |
07432cef | 7012 | msgstr "要使用的合并策略" |
ef317cd5 | 7013 | |
04cb2f28 | 7014 | #: builtin/merge.c:216 |
ef317cd5 | 7015 | msgid "option=value" |
07432cef | 7016 | msgstr "option=value" |
ef317cd5 | 7017 | |
04cb2f28 | 7018 | #: builtin/merge.c:217 |
ef317cd5 | 7019 | msgid "option for selected merge strategy" |
07432cef | 7020 | msgstr "所选的合并策略的选项" |
ef317cd5 | 7021 | |
04cb2f28 | 7022 | #: builtin/merge.c:219 |
ef317cd5 | 7023 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 7024 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 7025 | |
04cb2f28 | 7026 | #: builtin/merge.c:223 |
ef317cd5 | 7027 | msgid "abort the current in-progress merge" |
07432cef | 7028 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 7029 | |
04cb2f28 | 7030 | #: builtin/merge.c:251 |
c04f5ac3 JX |
7031 | msgid "could not run stash." |
7032 | msgstr "不能进行进度保存。" | |
7033 | ||
04cb2f28 | 7034 | #: builtin/merge.c:256 |
c04f5ac3 JX |
7035 | msgid "stash failed" |
7036 | msgstr "进度保存失败" | |
7037 | ||
04cb2f28 | 7038 | #: builtin/merge.c:261 |
c04f5ac3 JX |
7039 | #, c-format |
7040 | msgid "not a valid object: %s" | |
7041 | msgstr "不是一个有效对象:%s" | |
7042 | ||
04cb2f28 | 7043 | #: builtin/merge.c:280 builtin/merge.c:297 |
c04f5ac3 JX |
7044 | msgid "read-tree failed" |
7045 | msgstr "读取树失败" | |
7046 | ||
90e6ef53 | 7047 | # 译者:注意保持前导空格 |
04cb2f28 | 7048 | #: builtin/merge.c:327 |
c04f5ac3 JX |
7049 | msgid " (nothing to squash)" |
7050 | msgstr " (无可压缩)" | |
7051 | ||
04cb2f28 | 7052 | #: builtin/merge.c:340 |
c04f5ac3 JX |
7053 | #, c-format |
7054 | msgid "Squash commit -- not updating HEAD\n" | |
7055 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
7056 | ||
04cb2f28 | 7057 | #: builtin/merge.c:372 |
c04f5ac3 JX |
7058 | msgid "Writing SQUASH_MSG" |
7059 | msgstr "写入 SQUASH_MSG" | |
7060 | ||
04cb2f28 | 7061 | #: builtin/merge.c:374 |
c04f5ac3 JX |
7062 | msgid "Finishing SQUASH_MSG" |
7063 | msgstr "完成 SQUASH_MSG" | |
7064 | ||
04cb2f28 | 7065 | #: builtin/merge.c:397 |
c04f5ac3 JX |
7066 | #, c-format |
7067 | msgid "No merge message -- not updating HEAD\n" | |
7068 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
7069 | ||
04cb2f28 | 7070 | #: builtin/merge.c:447 |
c04f5ac3 JX |
7071 | #, c-format |
7072 | msgid "'%s' does not point to a commit" | |
7073 | msgstr "'%s' 没有指向一个提交" | |
7074 | ||
7aea43ff | 7075 | #: builtin/merge.c:537 |
c04f5ac3 JX |
7076 | #, c-format |
7077 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 7078 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 7079 | |
7aea43ff | 7080 | #: builtin/merge.c:632 |
c04f5ac3 JX |
7081 | msgid "git write-tree failed to write a tree" |
7082 | msgstr "git write-tree 无法写入一树对象" | |
7083 | ||
7aea43ff | 7084 | #: builtin/merge.c:656 |
c04f5ac3 JX |
7085 | msgid "Not handling anything other than two heads merge." |
7086 | msgstr "不能处理两个头合并之外的任何操作。" | |
7087 | ||
7aea43ff | 7088 | #: builtin/merge.c:670 |
c04f5ac3 JX |
7089 | #, c-format |
7090 | msgid "Unknown option for merge-recursive: -X%s" | |
7091 | msgstr "merge-recursive 的未知选项:-X%s" | |
7092 | ||
7aea43ff | 7093 | #: builtin/merge.c:683 |
c04f5ac3 JX |
7094 | #, c-format |
7095 | msgid "unable to write %s" | |
7096 | msgstr "不能写 %s" | |
7097 | ||
7aea43ff | 7098 | #: builtin/merge.c:772 |
c04f5ac3 JX |
7099 | #, c-format |
7100 | msgid "Could not read from '%s'" | |
7101 | msgstr "不能从 '%s' 读取" | |
7102 | ||
7aea43ff | 7103 | #: builtin/merge.c:781 |
c04f5ac3 JX |
7104 | #, c-format |
7105 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
7106 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
7107 | ||
7aea43ff | 7108 | #: builtin/merge.c:787 |
a77c07d9 | 7109 | #, c-format |
c04f5ac3 JX |
7110 | msgid "" |
7111 | "Please enter a commit message to explain why this merge is necessary,\n" | |
7112 | "especially if it merges an updated upstream into a topic branch.\n" | |
7113 | "\n" | |
a77c07d9 | 7114 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" |
c04f5ac3 JX |
7115 | "the commit.\n" |
7116 | msgstr "" | |
7117 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
7118 | "合并到主题分支。\n" | |
7119 | "\n" | |
a77c07d9 | 7120 | "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n" |
c04f5ac3 | 7121 | |
7aea43ff | 7122 | #: builtin/merge.c:811 |
c04f5ac3 JX |
7123 | msgid "Empty commit message." |
7124 | msgstr "空提交信息。" | |
7125 | ||
7aea43ff | 7126 | #: builtin/merge.c:823 |
c04f5ac3 JX |
7127 | #, c-format |
7128 | msgid "Wonderful.\n" | |
7129 | msgstr "太棒了。\n" | |
7130 | ||
7aea43ff | 7131 | #: builtin/merge.c:878 |
c04f5ac3 JX |
7132 | #, c-format |
7133 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
7134 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
7135 | ||
7aea43ff | 7136 | #: builtin/merge.c:894 |
c04f5ac3 JX |
7137 | #, c-format |
7138 | msgid "'%s' is not a commit" | |
7139 | msgstr "'%s' 不是一个提交" | |
7140 | ||
7aea43ff | 7141 | #: builtin/merge.c:935 |
c04f5ac3 | 7142 | msgid "No current branch." |
90e6ef53 | 7143 | msgstr "没有当前分支。" |
c04f5ac3 | 7144 | |
7aea43ff | 7145 | #: builtin/merge.c:937 |
c04f5ac3 | 7146 | msgid "No remote for the current branch." |
90e6ef53 | 7147 | msgstr "当前分支没有对应的远程版本库。" |
c04f5ac3 | 7148 | |
7aea43ff | 7149 | #: builtin/merge.c:939 |
c04f5ac3 | 7150 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 7151 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 7152 | |
7aea43ff | 7153 | #: builtin/merge.c:944 |
170e9899 | 7154 | #, c-format |
2e8451e8 JX |
7155 | msgid "No remote-tracking branch for %s from %s" |
7156 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 7157 | |
7aea43ff JX |
7158 | #: builtin/merge.c:1081 |
7159 | #, c-format | |
7160 | msgid "could not close '%s'" | |
7161 | msgstr "不能关闭 '%s'" | |
7162 | ||
7163 | #: builtin/merge.c:1208 | |
c04f5ac3 | 7164 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 7165 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 7166 | |
7aea43ff | 7167 | #: builtin/merge.c:1224 |
c04f5ac3 JX |
7168 | msgid "" |
7169 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
220c313c | 7170 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
7171 | msgstr "" |
7172 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 7173 | "请在合并前先提交您的修改。" |
c04f5ac3 | 7174 | |
7aea43ff | 7175 | #: builtin/merge.c:1227 git-pull.sh:74 |
c04f5ac3 JX |
7176 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
7177 | msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" | |
7178 | ||
7aea43ff | 7179 | #: builtin/merge.c:1231 |
c04f5ac3 JX |
7180 | msgid "" |
7181 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
220c313c | 7182 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
7183 | msgstr "" |
7184 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 7185 | "请在合并前先提交您的修改。" |
c04f5ac3 | 7186 | |
7aea43ff | 7187 | #: builtin/merge.c:1234 |
c04f5ac3 JX |
7188 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
7189 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
7190 | ||
7aea43ff | 7191 | #: builtin/merge.c:1243 |
c04f5ac3 | 7192 | msgid "You cannot combine --squash with --no-ff." |
649900bc | 7193 | msgstr "您不能将 --squash 与 --no-ff 同时使用。" |
c04f5ac3 | 7194 | |
7aea43ff | 7195 | #: builtin/merge.c:1251 |
c04f5ac3 | 7196 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 7197 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 7198 | |
7aea43ff | 7199 | #: builtin/merge.c:1268 |
c04f5ac3 JX |
7200 | msgid "Squash commit into empty head not supported yet" |
7201 | msgstr "尚不支持到空分支的压缩提交" | |
7202 | ||
7aea43ff | 7203 | #: builtin/merge.c:1270 |
c04f5ac3 JX |
7204 | msgid "Non-fast-forward commit does not make sense into an empty head" |
7205 | msgstr "到空分支的非快进式提交没有意义" | |
7206 | ||
7aea43ff | 7207 | #: builtin/merge.c:1276 |
2e8451e8 JX |
7208 | #, c-format |
7209 | msgid "%s - not something we can merge" | |
7210 | msgstr "%s - 不能被合并" | |
7211 | ||
7aea43ff JX |
7212 | #: builtin/merge.c:1278 |
7213 | msgid "Can merge only exactly one commit into empty head" | |
7214 | msgstr "只能将一个提交合并到空分支上" | |
7215 | ||
7216 | #: builtin/merge.c:1333 | |
1003b3a5 JX |
7217 | #, c-format |
7218 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
7219 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
7220 | ||
7aea43ff | 7221 | #: builtin/merge.c:1336 |
1003b3a5 JX |
7222 | #, c-format |
7223 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
7224 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
7225 | ||
7aea43ff | 7226 | #: builtin/merge.c:1339 |
1003b3a5 JX |
7227 | #, c-format |
7228 | msgid "Commit %s does not have a GPG signature." | |
7229 | msgstr "提交 %s 没有一个 GPG 签名。" | |
7230 | ||
7aea43ff | 7231 | #: builtin/merge.c:1342 |
1003b3a5 JX |
7232 | #, c-format |
7233 | msgid "Commit %s has a good GPG signature by %s\n" | |
7234 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
7235 | ||
7aea43ff | 7236 | #: builtin/merge.c:1423 |
c04f5ac3 JX |
7237 | #, c-format |
7238 | msgid "Updating %s..%s\n" | |
7239 | msgstr "更新 %s..%s\n" | |
7240 | ||
7aea43ff | 7241 | #: builtin/merge.c:1462 |
c04f5ac3 JX |
7242 | #, c-format |
7243 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 7244 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 7245 | |
7aea43ff | 7246 | #: builtin/merge.c:1469 |
c04f5ac3 JX |
7247 | #, c-format |
7248 | msgid "Nope.\n" | |
7249 | msgstr "无。\n" | |
7250 | ||
7aea43ff | 7251 | #: builtin/merge.c:1501 |
c04f5ac3 | 7252 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 7253 | msgstr "无法快进,终止。" |
c04f5ac3 | 7254 | |
7aea43ff | 7255 | #: builtin/merge.c:1524 builtin/merge.c:1603 |
c04f5ac3 JX |
7256 | #, c-format |
7257 | msgid "Rewinding the tree to pristine...\n" | |
7258 | msgstr "将树回滚至原始状态...\n" | |
7259 | ||
7aea43ff | 7260 | #: builtin/merge.c:1528 |
c04f5ac3 JX |
7261 | #, c-format |
7262 | msgid "Trying merge strategy %s...\n" | |
7263 | msgstr "尝试合并策略 %s...\n" | |
7264 | ||
7aea43ff | 7265 | #: builtin/merge.c:1594 |
c04f5ac3 JX |
7266 | #, c-format |
7267 | msgid "No merge strategy handled the merge.\n" | |
7268 | msgstr "没有合并策略处理此合并。\n" | |
7269 | ||
7aea43ff | 7270 | #: builtin/merge.c:1596 |
c04f5ac3 JX |
7271 | #, c-format |
7272 | msgid "Merge with strategy %s failed.\n" | |
7273 | msgstr "使用策略 %s 合并失败。\n" | |
7274 | ||
7aea43ff | 7275 | #: builtin/merge.c:1605 |
c04f5ac3 JX |
7276 | #, c-format |
7277 | msgid "Using the %s to prepare resolving by hand.\n" | |
7278 | msgstr "使用 %s 以准备手工解决。\n" | |
7279 | ||
7aea43ff | 7280 | #: builtin/merge.c:1617 |
c04f5ac3 JX |
7281 | #, c-format |
7282 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
7283 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
7284 | ||
cfff71a9 | 7285 | #: builtin/merge-base.c:29 |
814ff314 JX |
7286 | msgid "git merge-base [-a | --all] <commit> <commit>..." |
7287 | msgstr "git merge-base [-a | --all] <提交> <提交>..." | |
ef317cd5 | 7288 | |
cfff71a9 | 7289 | #: builtin/merge-base.c:30 |
814ff314 JX |
7290 | msgid "git merge-base [-a | --all] --octopus <commit>..." |
7291 | msgstr "git merge-base [-a | --all] --octopus <提交>..." | |
ef317cd5 | 7292 | |
cfff71a9 | 7293 | #: builtin/merge-base.c:31 |
ef317cd5 | 7294 | msgid "git merge-base --independent <commit>..." |
07432cef | 7295 | msgstr "git merge-base --independent <提交>..." |
ef317cd5 | 7296 | |
cfff71a9 | 7297 | #: builtin/merge-base.c:32 |
ef317cd5 | 7298 | msgid "git merge-base --is-ancestor <commit> <commit>" |
07432cef | 7299 | msgstr "git merge-base --is-ancestor <提交> <提交>" |
ef317cd5 | 7300 | |
cfff71a9 JX |
7301 | #: builtin/merge-base.c:33 |
7302 | msgid "git merge-base --fork-point <ref> [<commit>]" | |
d9d56b23 | 7303 | msgstr "git merge-base --fork-point <引用> [<提交>]" |
cfff71a9 JX |
7304 | |
7305 | #: builtin/merge-base.c:214 | |
ef317cd5 | 7306 | msgid "output all common ancestors" |
07432cef | 7307 | msgstr "输出所有共同的祖先" |
ef317cd5 | 7308 | |
cfff71a9 | 7309 | #: builtin/merge-base.c:216 |
ef317cd5 | 7310 | msgid "find ancestors for a single n-way merge" |
07432cef | 7311 | msgstr "查找一个多路合并的祖先提交" |
ef317cd5 | 7312 | |
cfff71a9 | 7313 | #: builtin/merge-base.c:218 |
ef317cd5 | 7314 | msgid "list revs not reachable from others" |
07432cef | 7315 | msgstr "显示不能被其他访问到的版本" |
ef317cd5 | 7316 | |
cfff71a9 | 7317 | #: builtin/merge-base.c:220 |
ef317cd5 | 7318 | msgid "is the first one ancestor of the other?" |
07432cef | 7319 | msgstr "第一个是其他的祖先提交么?" |
ef317cd5 | 7320 | |
cfff71a9 JX |
7321 | #: builtin/merge-base.c:222 |
7322 | msgid "find where <commit> forked from reflog of <ref>" | |
d9d56b23 | 7323 | msgstr "查找 <提交> 从<引用>日志的何处分支的" |
cfff71a9 | 7324 | |
ef317cd5 JX |
7325 | #: builtin/merge-file.c:8 |
7326 | msgid "" | |
814ff314 JX |
7327 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " |
7328 | "<orig-file> <file2>" | |
ef317cd5 | 7329 | msgstr "" |
814ff314 JX |
7330 | "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" |
7331 | "件> <文件2>" | |
ef317cd5 JX |
7332 | |
7333 | #: builtin/merge-file.c:33 | |
7334 | msgid "send results to standard output" | |
07432cef | 7335 | msgstr "将结果发送到标准输出" |
ef317cd5 JX |
7336 | |
7337 | #: builtin/merge-file.c:34 | |
7338 | msgid "use a diff3 based merge" | |
07432cef | 7339 | msgstr "使用基于 diff3 的合并" |
ef317cd5 JX |
7340 | |
7341 | #: builtin/merge-file.c:35 | |
7342 | msgid "for conflicts, use our version" | |
07432cef | 7343 | msgstr "如果冲突,使用我们的版本" |
ef317cd5 JX |
7344 | |
7345 | #: builtin/merge-file.c:37 | |
7346 | msgid "for conflicts, use their version" | |
07432cef | 7347 | msgstr "如果冲突,使用他们的版本" |
ef317cd5 JX |
7348 | |
7349 | #: builtin/merge-file.c:39 | |
7350 | msgid "for conflicts, use a union version" | |
07432cef | 7351 | msgstr "如果冲突,使用联合版本" |
ef317cd5 JX |
7352 | |
7353 | #: builtin/merge-file.c:42 | |
7354 | msgid "for conflicts, use this marker size" | |
07432cef | 7355 | msgstr "如果冲突,使用指定长度的标记" |
ef317cd5 JX |
7356 | |
7357 | #: builtin/merge-file.c:43 | |
7358 | msgid "do not warn about conflicts" | |
07432cef | 7359 | msgstr "不要警告冲突" |
ef317cd5 JX |
7360 | |
7361 | #: builtin/merge-file.c:45 | |
814ff314 JX |
7362 | msgid "set labels for file1/orig-file/file2" |
7363 | msgstr "为 文件1/初始文件/文件2 设置标签" | |
c04f5ac3 | 7364 | |
6c94aba5 | 7365 | #: builtin/mktree.c:64 |
ef317cd5 | 7366 | msgid "git mktree [-z] [--missing] [--batch]" |
07432cef | 7367 | msgstr "git mktree [-z] [--missing] [--batch]" |
c04f5ac3 | 7368 | |
6c94aba5 | 7369 | #: builtin/mktree.c:150 |
ef317cd5 | 7370 | msgid "input is NUL terminated" |
07432cef | 7371 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 7372 | |
6c94aba5 | 7373 | #: builtin/mktree.c:151 builtin/write-tree.c:24 |
ef317cd5 | 7374 | msgid "allow missing objects" |
07432cef | 7375 | msgstr "允许丢失的对象" |
c04f5ac3 | 7376 | |
6c94aba5 | 7377 | #: builtin/mktree.c:152 |
ef317cd5 | 7378 | msgid "allow creation of more than one tree" |
07432cef | 7379 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 7380 | |
90314792 | 7381 | #: builtin/mv.c:15 |
814ff314 JX |
7382 | msgid "git mv [<options>] <source>... <destination>" |
7383 | msgstr "git mv [<选项>] <源>... <目标>" | |
c04f5ac3 | 7384 | |
220c313c JX |
7385 | #: builtin/mv.c:69 |
7386 | #, c-format | |
7387 | msgid "Directory %s is in index and no submodule?" | |
7388 | msgstr "目录 %s 在索引中并且不是子模组?" | |
7389 | ||
cfff71a9 | 7390 | #: builtin/mv.c:71 |
220c313c JX |
7391 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
7392 | msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" | |
7393 | ||
7394 | #: builtin/mv.c:89 | |
7395 | #, c-format | |
7396 | msgid "%.*s is in index" | |
7397 | msgstr "%.*s 在索引中" | |
7398 | ||
7399 | #: builtin/mv.c:111 | |
ef317cd5 | 7400 | msgid "force move/rename even if target exists" |
07432cef | 7401 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 7402 | |
220c313c | 7403 | #: builtin/mv.c:112 |
ef317cd5 | 7404 | msgid "skip move/rename errors" |
07432cef | 7405 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 7406 | |
220c313c JX |
7407 | #: builtin/mv.c:151 |
7408 | #, c-format | |
7409 | msgid "destination '%s' is not a directory" | |
7410 | msgstr "目标 '%s' 不是一个目录" | |
7411 | ||
7412 | #: builtin/mv.c:162 | |
c04f5ac3 JX |
7413 | #, c-format |
7414 | msgid "Checking rename of '%s' to '%s'\n" | |
7415 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
7416 | ||
220c313c | 7417 | #: builtin/mv.c:166 |
c04f5ac3 JX |
7418 | msgid "bad source" |
7419 | msgstr "坏的源" | |
7420 | ||
220c313c | 7421 | #: builtin/mv.c:169 |
c04f5ac3 JX |
7422 | msgid "can not move directory into itself" |
7423 | msgstr "不能将目录移动到自身" | |
7424 | ||
220c313c | 7425 | #: builtin/mv.c:172 |
c04f5ac3 JX |
7426 | msgid "cannot move directory over file" |
7427 | msgstr "不能将目录移动到文件" | |
7428 | ||
220c313c | 7429 | #: builtin/mv.c:181 |
c04f5ac3 JX |
7430 | msgid "source directory is empty" |
7431 | msgstr "源目录为空" | |
7432 | ||
220c313c | 7433 | #: builtin/mv.c:206 |
c04f5ac3 JX |
7434 | msgid "not under version control" |
7435 | msgstr "不在版本控制之下" | |
7436 | ||
220c313c | 7437 | #: builtin/mv.c:209 |
c04f5ac3 JX |
7438 | msgid "destination exists" |
7439 | msgstr "目标已存在" | |
7440 | ||
220c313c | 7441 | #: builtin/mv.c:217 |
c04f5ac3 JX |
7442 | #, c-format |
7443 | msgid "overwriting '%s'" | |
7444 | msgstr "覆盖 '%s'" | |
7445 | ||
220c313c | 7446 | #: builtin/mv.c:220 |
c04f5ac3 JX |
7447 | msgid "Cannot overwrite" |
7448 | msgstr "不能覆盖" | |
7449 | ||
220c313c | 7450 | #: builtin/mv.c:223 |
c04f5ac3 JX |
7451 | msgid "multiple sources for the same target" |
7452 | msgstr "同一目标具有多个源" | |
7453 | ||
220c313c | 7454 | #: builtin/mv.c:225 |
cfff71a9 JX |
7455 | msgid "destination directory does not exist" |
7456 | msgstr "目标目录不存在" | |
7457 | ||
220c313c | 7458 | #: builtin/mv.c:232 |
c04f5ac3 JX |
7459 | #, c-format |
7460 | msgid "%s, source=%s, destination=%s" | |
7461 | msgstr "%s,源=%s,目标=%s" | |
7462 | ||
220c313c | 7463 | #: builtin/mv.c:253 |
c04f5ac3 JX |
7464 | #, c-format |
7465 | msgid "Renaming %s to %s\n" | |
7466 | msgstr "重命名 %s 至 %s\n" | |
7467 | ||
7aea43ff | 7468 | #: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361 |
c04f5ac3 JX |
7469 | #, c-format |
7470 | msgid "renaming '%s' failed" | |
7471 | msgstr "重命名 '%s' 失败" | |
7472 | ||
6acbf033 | 7473 | #: builtin/name-rev.c:255 |
814ff314 JX |
7474 | msgid "git name-rev [<options>] <commit>..." |
7475 | msgstr "git name-rev [<选项>] <提交>..." | |
ef317cd5 | 7476 | |
6acbf033 | 7477 | #: builtin/name-rev.c:256 |
814ff314 JX |
7478 | msgid "git name-rev [<options>] --all" |
7479 | msgstr "git name-rev [<选项>] --all" | |
ef317cd5 | 7480 | |
6acbf033 | 7481 | #: builtin/name-rev.c:257 |
814ff314 JX |
7482 | msgid "git name-rev [<options>] --stdin" |
7483 | msgstr "git name-rev [<选项>] --stdin" | |
ef317cd5 | 7484 | |
6acbf033 | 7485 | #: builtin/name-rev.c:309 |
ef317cd5 | 7486 | msgid "print only names (no SHA-1)" |
07432cef | 7487 | msgstr "只打印名称(无 SHA-1)" |
ef317cd5 | 7488 | |
6acbf033 | 7489 | #: builtin/name-rev.c:310 |
ef317cd5 | 7490 | msgid "only use tags to name the commits" |
07432cef | 7491 | msgstr "只使用 tags 来命名提交" |
ef317cd5 | 7492 | |
6acbf033 | 7493 | #: builtin/name-rev.c:312 |
ef317cd5 | 7494 | msgid "only use refs matching <pattern>" |
07432cef | 7495 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 7496 | |
6acbf033 | 7497 | #: builtin/name-rev.c:314 |
ef317cd5 | 7498 | msgid "list all commits reachable from all refs" |
07432cef | 7499 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 7500 | |
6acbf033 | 7501 | #: builtin/name-rev.c:315 |
ef317cd5 | 7502 | msgid "read from stdin" |
07432cef | 7503 | msgstr "从标准输入读取" |
ef317cd5 | 7504 | |
6acbf033 | 7505 | #: builtin/name-rev.c:316 |
90314792 JX |
7506 | msgid "allow to print `undefined` names (default)" |
7507 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 7508 | |
6acbf033 | 7509 | #: builtin/name-rev.c:322 |
2e8451e8 JX |
7510 | msgid "dereference tags in the input (internal use)" |
7511 | msgstr "反向解析输入中的 tags(内部使用)" | |
7512 | ||
7513 | #: builtin/notes.c:24 | |
814ff314 | 7514 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
07432cef | 7515 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 7516 | |
2e8451e8 | 7517 | #: builtin/notes.c:25 |
ef317cd5 | 7518 | msgid "" |
814ff314 | 7519 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
04cb2f28 | 7520 | "| (-c | -C) <object>] [<object>]" |
ef317cd5 | 7521 | msgstr "" |
04cb2f28 JX |
7522 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
7523 | "| (-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 7524 | |
2e8451e8 | 7525 | #: builtin/notes.c:26 |
814ff314 | 7526 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
07432cef | 7527 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 7528 | |
2e8451e8 | 7529 | #: builtin/notes.c:27 |
ef317cd5 | 7530 | msgid "" |
814ff314 | 7531 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
04cb2f28 | 7532 | "(-c | -C) <object>] [<object>]" |
ef317cd5 | 7533 | msgstr "" |
04cb2f28 JX |
7534 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
7535 | "(-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 7536 | |
2e8451e8 | 7537 | #: builtin/notes.c:28 |
814ff314 | 7538 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
04cb2f28 | 7539 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
ef317cd5 | 7540 | |
2e8451e8 | 7541 | #: builtin/notes.c:29 |
814ff314 | 7542 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
07432cef | 7543 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 7544 | |
2e8451e8 | 7545 | #: builtin/notes.c:30 |
ef317cd5 | 7546 | msgid "" |
814ff314 | 7547 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
07432cef | 7548 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 7549 | |
2e8451e8 | 7550 | #: builtin/notes.c:31 |
ef317cd5 | 7551 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 7552 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 7553 | |
2e8451e8 | 7554 | #: builtin/notes.c:32 |
ef317cd5 | 7555 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 7556 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 7557 | |
2e8451e8 | 7558 | #: builtin/notes.c:33 |
814ff314 | 7559 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
07432cef | 7560 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 7561 | |
2e8451e8 | 7562 | #: builtin/notes.c:34 |
814ff314 | 7563 | msgid "git notes [--ref <notes-ref>] prune [-n | -v]" |
07432cef | 7564 | msgstr "git notes [--ref <注解引用>] prune [-n | -v]" |
ef317cd5 | 7565 | |
2e8451e8 | 7566 | #: builtin/notes.c:35 |
814ff314 | 7567 | msgid "git notes [--ref <notes-ref>] get-ref" |
07432cef | 7568 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 7569 | |
2e8451e8 | 7570 | #: builtin/notes.c:40 |
ef317cd5 | 7571 | msgid "git notes [list [<object>]]" |
07432cef | 7572 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 7573 | |
2e8451e8 | 7574 | #: builtin/notes.c:45 |
ef317cd5 | 7575 | msgid "git notes add [<options>] [<object>]" |
07432cef | 7576 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 7577 | |
2e8451e8 | 7578 | #: builtin/notes.c:50 |
ef317cd5 | 7579 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 7580 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 7581 | |
2e8451e8 | 7582 | #: builtin/notes.c:51 |
ef317cd5 | 7583 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 7584 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 7585 | |
2e8451e8 | 7586 | #: builtin/notes.c:56 |
ef317cd5 | 7587 | msgid "git notes append [<options>] [<object>]" |
07432cef | 7588 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 7589 | |
2e8451e8 | 7590 | #: builtin/notes.c:61 |
ef317cd5 | 7591 | msgid "git notes edit [<object>]" |
07432cef | 7592 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 7593 | |
2e8451e8 | 7594 | #: builtin/notes.c:66 |
ef317cd5 | 7595 | msgid "git notes show [<object>]" |
07432cef | 7596 | msgstr "git notes show [<对象>]" |
ef317cd5 | 7597 | |
2e8451e8 | 7598 | #: builtin/notes.c:71 |
814ff314 | 7599 | msgid "git notes merge [<options>] <notes-ref>" |
07432cef | 7600 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 7601 | |
2e8451e8 | 7602 | #: builtin/notes.c:72 |
ef317cd5 | 7603 | msgid "git notes merge --commit [<options>]" |
07432cef | 7604 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 7605 | |
2e8451e8 | 7606 | #: builtin/notes.c:73 |
ef317cd5 | 7607 | msgid "git notes merge --abort [<options>]" |
07432cef | 7608 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 7609 | |
2e8451e8 | 7610 | #: builtin/notes.c:78 |
ef317cd5 | 7611 | msgid "git notes remove [<object>]" |
07432cef | 7612 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 7613 | |
2e8451e8 | 7614 | #: builtin/notes.c:83 |
ef317cd5 | 7615 | msgid "git notes prune [<options>]" |
07432cef | 7616 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 7617 | |
2e8451e8 | 7618 | #: builtin/notes.c:88 |
ef317cd5 | 7619 | msgid "git notes get-ref" |
07432cef | 7620 | msgstr "git notes get-ref" |
ef317cd5 | 7621 | |
04cb2f28 | 7622 | #: builtin/notes.c:146 |
c04f5ac3 JX |
7623 | #, c-format |
7624 | msgid "unable to start 'show' for object '%s'" | |
7625 | msgstr "不能为对象 '%s' 开始 'show'" | |
7626 | ||
04cb2f28 | 7627 | #: builtin/notes.c:150 |
a77c07d9 JX |
7628 | msgid "could not read 'show' output" |
7629 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 7630 | |
04cb2f28 | 7631 | #: builtin/notes.c:158 |
c04f5ac3 JX |
7632 | #, c-format |
7633 | msgid "failed to finish 'show' for object '%s'" | |
7634 | msgstr "无法为对象 '%s' 完成 'show'" | |
7635 | ||
04cb2f28 | 7636 | #: builtin/notes.c:173 builtin/tag.c:477 |
c04f5ac3 JX |
7637 | #, c-format |
7638 | msgid "could not create file '%s'" | |
7639 | msgstr "不能创建文件 '%s'" | |
7640 | ||
04cb2f28 | 7641 | #: builtin/notes.c:192 |
c04f5ac3 JX |
7642 | msgid "Please supply the note contents using either -m or -F option" |
7643 | msgstr "请通过 -m 或 -F 选项为注解提供内容" | |
7644 | ||
04cb2f28 | 7645 | #: builtin/notes.c:201 |
c04f5ac3 JX |
7646 | msgid "unable to write note object" |
7647 | msgstr "不能写注解对象" | |
7648 | ||
04cb2f28 | 7649 | #: builtin/notes.c:203 |
c04f5ac3 | 7650 | #, c-format |
220c313c JX |
7651 | msgid "The note contents have been left in %s" |
7652 | msgstr "注解内容被留在 %s 中" | |
c04f5ac3 | 7653 | |
04cb2f28 | 7654 | #: builtin/notes.c:231 builtin/tag.c:693 |
c04f5ac3 JX |
7655 | #, c-format |
7656 | msgid "cannot read '%s'" | |
7657 | msgstr "不能读取 '%s'" | |
7658 | ||
04cb2f28 | 7659 | #: builtin/notes.c:233 builtin/tag.c:696 |
c04f5ac3 JX |
7660 | #, c-format |
7661 | msgid "could not open or read '%s'" | |
7662 | msgstr "不能打开或读取 '%s'" | |
7663 | ||
04cb2f28 JX |
7664 | #: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305 |
7665 | #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506 | |
7666 | #: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652 | |
7667 | #: builtin/notes.c:854 builtin/tag.c:709 | |
c04f5ac3 JX |
7668 | #, c-format |
7669 | msgid "Failed to resolve '%s' as a valid ref." | |
90e6ef53 | 7670 | msgstr "无法解析 '%s' 为一个有效引用。" |
c04f5ac3 | 7671 | |
04cb2f28 | 7672 | #: builtin/notes.c:255 |
c04f5ac3 JX |
7673 | #, c-format |
7674 | msgid "Failed to read object '%s'." | |
7675 | msgstr "无法读取对象 '%s'。" | |
7676 | ||
04cb2f28 | 7677 | #: builtin/notes.c:259 |
6c94aba5 JX |
7678 | #, c-format |
7679 | msgid "Cannot read note data from non-blob object '%s'." | |
7680 | msgstr "不能从非数据对象 '%s' 中读取注解数据" | |
7681 | ||
04cb2f28 | 7682 | #: builtin/notes.c:299 |
c04f5ac3 JX |
7683 | #, c-format |
7684 | msgid "Malformed input line: '%s'." | |
7685 | msgstr "非法的输入行:'%s'。" | |
7686 | ||
04cb2f28 | 7687 | #: builtin/notes.c:314 |
c04f5ac3 JX |
7688 | #, c-format |
7689 | msgid "Failed to copy notes from '%s' to '%s'" | |
90e6ef53 | 7690 | msgstr "无法从 '%s' 到 '%s' 拷贝注解" |
c04f5ac3 | 7691 | |
04cb2f28 JX |
7692 | #: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489 |
7693 | #: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645 | |
7694 | #: builtin/notes.c:919 | |
c04f5ac3 JX |
7695 | msgid "too many parameters" |
7696 | msgstr "参数太多" | |
7697 | ||
04cb2f28 | 7698 | #: builtin/notes.c:371 builtin/notes.c:658 |
c04f5ac3 JX |
7699 | #, c-format |
7700 | msgid "No note found for object %s." | |
7701 | msgstr "未发现对象 %s 的注解。" | |
7702 | ||
04cb2f28 | 7703 | #: builtin/notes.c:392 builtin/notes.c:555 |
ef317cd5 | 7704 | msgid "note contents as a string" |
07432cef | 7705 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 7706 | |
04cb2f28 | 7707 | #: builtin/notes.c:395 builtin/notes.c:558 |
ef317cd5 | 7708 | msgid "note contents in a file" |
07432cef | 7709 | msgstr "注解内容到一个文件中" |
ef317cd5 | 7710 | |
04cb2f28 JX |
7711 | #: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560 |
7712 | #: builtin/notes.c:563 builtin/tag.c:628 | |
ef317cd5 | 7713 | msgid "object" |
07432cef | 7714 | msgstr "对象" |
ef317cd5 | 7715 | |
04cb2f28 | 7716 | #: builtin/notes.c:398 builtin/notes.c:561 |
ef317cd5 | 7717 | msgid "reuse and edit specified note object" |
07432cef | 7718 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 7719 | |
04cb2f28 | 7720 | #: builtin/notes.c:401 builtin/notes.c:564 |
ef317cd5 | 7721 | msgid "reuse specified note object" |
07432cef | 7722 | msgstr "重用指定的注解对象" |
ef317cd5 | 7723 | |
04cb2f28 JX |
7724 | #: builtin/notes.c:404 builtin/notes.c:567 |
7725 | msgid "allow storing empty note" | |
7726 | msgstr "允许保存空白注释" | |
7727 | ||
7728 | #: builtin/notes.c:405 builtin/notes.c:476 | |
ef317cd5 | 7729 | msgid "replace existing notes" |
07432cef | 7730 | msgstr "替换已存在的注解" |
ef317cd5 | 7731 | |
04cb2f28 | 7732 | #: builtin/notes.c:430 |
c04f5ac3 JX |
7733 | #, c-format |
7734 | msgid "" | |
7735 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
7736 | "existing notes" | |
7737 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
7738 | ||
04cb2f28 | 7739 | #: builtin/notes.c:445 builtin/notes.c:524 |
c04f5ac3 JX |
7740 | #, c-format |
7741 | msgid "Overwriting existing notes for object %s\n" | |
7742 | msgstr "覆盖对象 %s 现存注解\n" | |
7743 | ||
04cb2f28 JX |
7744 | #: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859 |
7745 | #, c-format | |
7746 | msgid "Removing note for object %s\n" | |
7747 | msgstr "删除对象 %s 的注解\n" | |
7748 | ||
7749 | #: builtin/notes.c:477 | |
ef317cd5 | 7750 | msgid "read objects from stdin" |
07432cef | 7751 | msgstr "从标准输入读取对象" |
ef317cd5 | 7752 | |
04cb2f28 | 7753 | #: builtin/notes.c:479 |
ef317cd5 | 7754 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 7755 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 7756 | |
04cb2f28 | 7757 | #: builtin/notes.c:497 |
c04f5ac3 JX |
7758 | msgid "too few parameters" |
7759 | msgstr "参数太少" | |
7760 | ||
04cb2f28 | 7761 | #: builtin/notes.c:518 |
c04f5ac3 JX |
7762 | #, c-format |
7763 | msgid "" | |
7764 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
7765 | "existing notes" | |
7766 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
7767 | ||
04cb2f28 | 7768 | #: builtin/notes.c:530 |
c04f5ac3 JX |
7769 | #, c-format |
7770 | msgid "Missing notes on source object %s. Cannot copy." | |
7771 | msgstr "源对象 %s 缺少注解。不能拷贝。" | |
7772 | ||
04cb2f28 | 7773 | #: builtin/notes.c:582 |
ef317cd5 JX |
7774 | #, c-format |
7775 | msgid "" | |
7776 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
7777 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
7778 | msgstr "" | |
7779 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
7780 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
7781 | ||
04cb2f28 | 7782 | #: builtin/notes.c:750 |
ef317cd5 | 7783 | msgid "General options" |
07432cef | 7784 | msgstr "通用选项" |
ef317cd5 | 7785 | |
04cb2f28 | 7786 | #: builtin/notes.c:752 |
ef317cd5 | 7787 | msgid "Merge options" |
07432cef | 7788 | msgstr "合并选项" |
ef317cd5 | 7789 | |
04cb2f28 | 7790 | #: builtin/notes.c:754 |
ef317cd5 JX |
7791 | msgid "" |
7792 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
7793 | "cat_sort_uniq)" | |
07432cef | 7794 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 7795 | |
04cb2f28 | 7796 | #: builtin/notes.c:756 |
ef317cd5 | 7797 | msgid "Committing unmerged notes" |
07432cef | 7798 | msgstr "提交未合并的注解" |
ef317cd5 | 7799 | |
04cb2f28 | 7800 | #: builtin/notes.c:758 |
ef317cd5 | 7801 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 7802 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 7803 | |
04cb2f28 | 7804 | #: builtin/notes.c:760 |
ef317cd5 | 7805 | msgid "Aborting notes merge resolution" |
07432cef | 7806 | msgstr "中止注解合并的方案" |
ef317cd5 | 7807 | |
04cb2f28 | 7808 | #: builtin/notes.c:762 |
ef317cd5 | 7809 | msgid "abort notes merge" |
07432cef | 7810 | msgstr "中止注解合并" |
ef317cd5 | 7811 | |
04cb2f28 | 7812 | #: builtin/notes.c:857 |
ef317cd5 JX |
7813 | #, c-format |
7814 | msgid "Object %s has no note\n" | |
7815 | msgstr "对象 %s 没有注解\n" | |
7816 | ||
04cb2f28 | 7817 | #: builtin/notes.c:869 |
ef317cd5 | 7818 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 7819 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 7820 | |
04cb2f28 | 7821 | #: builtin/notes.c:872 |
ef317cd5 | 7822 | msgid "read object names from the standard input" |
07432cef | 7823 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 7824 | |
04cb2f28 | 7825 | #: builtin/notes.c:953 |
6c94aba5 | 7826 | msgid "notes-ref" |
07432cef | 7827 | msgstr "注解引用" |
ef317cd5 | 7828 | |
04cb2f28 | 7829 | #: builtin/notes.c:954 |
814ff314 | 7830 | msgid "use notes from <notes-ref>" |
07432cef | 7831 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 7832 | |
7aea43ff | 7833 | #: builtin/notes.c:989 builtin/remote.c:1618 |
ef317cd5 JX |
7834 | #, c-format |
7835 | msgid "Unknown subcommand: %s" | |
7836 | msgstr "未知子命令:%s" | |
7837 | ||
220c313c | 7838 | #: builtin/pack-objects.c:28 |
ef317cd5 | 7839 | msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" |
07432cef | 7840 | msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]" |
ef317cd5 | 7841 | |
220c313c | 7842 | #: builtin/pack-objects.c:29 |
ef317cd5 | 7843 | msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" |
07432cef | 7844 | msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]" |
ef317cd5 | 7845 | |
814ff314 | 7846 | #: builtin/pack-objects.c:175 builtin/pack-objects.c:178 |
ef317cd5 JX |
7847 | #, c-format |
7848 | msgid "deflate error (%d)" | |
7849 | msgstr "压缩错误 (%d)" | |
7850 | ||
814ff314 | 7851 | #: builtin/pack-objects.c:771 |
6c94aba5 JX |
7852 | msgid "Writing objects" |
7853 | msgstr "写入对象中" | |
7854 | ||
7aea43ff | 7855 | #: builtin/pack-objects.c:1011 |
6c94aba5 JX |
7856 | msgid "disabling bitmap writing, as some objects are not being packed" |
7857 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" | |
7858 | ||
7aea43ff | 7859 | #: builtin/pack-objects.c:2171 |
6c94aba5 JX |
7860 | msgid "Compressing objects" |
7861 | msgstr "压缩对象中" | |
7862 | ||
7aea43ff | 7863 | #: builtin/pack-objects.c:2568 |
ef317cd5 JX |
7864 | #, c-format |
7865 | msgid "unsupported index version %s" | |
7866 | msgstr "不支持的索引版本 %s" | |
7867 | ||
7aea43ff | 7868 | #: builtin/pack-objects.c:2572 |
ef317cd5 JX |
7869 | #, c-format |
7870 | msgid "bad index version '%s'" | |
7871 | msgstr "坏的索引版本 '%s'" | |
7872 | ||
7aea43ff | 7873 | #: builtin/pack-objects.c:2595 |
ef317cd5 JX |
7874 | #, c-format |
7875 | msgid "option %s does not accept negative form" | |
7876 | msgstr "选项 %s 不接受否定格式" | |
7877 | ||
7aea43ff | 7878 | #: builtin/pack-objects.c:2599 |
ef317cd5 JX |
7879 | #, c-format |
7880 | msgid "unable to parse value '%s' for option %s" | |
7881 | msgstr "不能解析选项 %1$s 的值 '%2$s'" | |
7882 | ||
7aea43ff | 7883 | #: builtin/pack-objects.c:2619 |
ef317cd5 | 7884 | msgid "do not show progress meter" |
07432cef | 7885 | msgstr "不显示进度表" |
ef317cd5 | 7886 | |
7aea43ff | 7887 | #: builtin/pack-objects.c:2621 |
ef317cd5 | 7888 | msgid "show progress meter" |
07432cef | 7889 | msgstr "显示进度表" |
ef317cd5 | 7890 | |
7aea43ff | 7891 | #: builtin/pack-objects.c:2623 |
ef317cd5 | 7892 | msgid "show progress meter during object writing phase" |
07432cef | 7893 | msgstr "在对象写入阶段显示进度表" |
ef317cd5 | 7894 | |
7aea43ff | 7895 | #: builtin/pack-objects.c:2626 |
ef317cd5 | 7896 | msgid "similar to --all-progress when progress meter is shown" |
07432cef | 7897 | msgstr "当进度表显示时类似于 --all-progress" |
ef317cd5 | 7898 | |
7aea43ff | 7899 | #: builtin/pack-objects.c:2627 |
ef317cd5 | 7900 | msgid "version[,offset]" |
07432cef | 7901 | msgstr "版本[,偏移]" |
ef317cd5 | 7902 | |
7aea43ff | 7903 | #: builtin/pack-objects.c:2628 |
ef317cd5 | 7904 | msgid "write the pack index file in the specified idx format version" |
07432cef | 7905 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 7906 | |
7aea43ff | 7907 | #: builtin/pack-objects.c:2631 |
ef317cd5 | 7908 | msgid "maximum size of each output pack file" |
07432cef | 7909 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 7910 | |
7aea43ff | 7911 | #: builtin/pack-objects.c:2633 |
ef317cd5 | 7912 | msgid "ignore borrowed objects from alternate object store" |
07432cef | 7913 | msgstr "忽略从替代对象存储里借用对象" |
ef317cd5 | 7914 | |
7aea43ff | 7915 | #: builtin/pack-objects.c:2635 |
ef317cd5 | 7916 | msgid "ignore packed objects" |
07432cef | 7917 | msgstr "忽略包对象" |
ef317cd5 | 7918 | |
7aea43ff | 7919 | #: builtin/pack-objects.c:2637 |
ef317cd5 | 7920 | msgid "limit pack window by objects" |
07432cef | 7921 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 7922 | |
7aea43ff | 7923 | #: builtin/pack-objects.c:2639 |
ef317cd5 | 7924 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 7925 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 7926 | |
7aea43ff | 7927 | #: builtin/pack-objects.c:2641 |
ef317cd5 | 7928 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 7929 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 7930 | |
7aea43ff | 7931 | #: builtin/pack-objects.c:2643 |
ef317cd5 | 7932 | msgid "reuse existing deltas" |
07432cef | 7933 | msgstr "重用已存在的 deltas" |
ef317cd5 | 7934 | |
7aea43ff | 7935 | #: builtin/pack-objects.c:2645 |
ef317cd5 | 7936 | msgid "reuse existing objects" |
07432cef | 7937 | msgstr "重用已存在的对象" |
ef317cd5 | 7938 | |
7aea43ff | 7939 | #: builtin/pack-objects.c:2647 |
ef317cd5 | 7940 | msgid "use OFS_DELTA objects" |
07432cef | 7941 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 7942 | |
7aea43ff | 7943 | #: builtin/pack-objects.c:2649 |
ef317cd5 | 7944 | msgid "use threads when searching for best delta matches" |
07432cef | 7945 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 7946 | |
7aea43ff | 7947 | #: builtin/pack-objects.c:2651 |
ef317cd5 | 7948 | msgid "do not create an empty pack output" |
07432cef | 7949 | msgstr "不创建空的包输出" |
ef317cd5 | 7950 | |
7aea43ff | 7951 | #: builtin/pack-objects.c:2653 |
ef317cd5 | 7952 | msgid "read revision arguments from standard input" |
d9d56b23 | 7953 | msgstr "从标准输入读取版本号参数" |
ef317cd5 | 7954 | |
7aea43ff | 7955 | #: builtin/pack-objects.c:2655 |
ef317cd5 | 7956 | msgid "limit the objects to those that are not yet packed" |
07432cef | 7957 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 7958 | |
7aea43ff | 7959 | #: builtin/pack-objects.c:2658 |
ef317cd5 | 7960 | msgid "include objects reachable from any reference" |
07432cef | 7961 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 7962 | |
7aea43ff | 7963 | #: builtin/pack-objects.c:2661 |
ef317cd5 | 7964 | msgid "include objects referred by reflog entries" |
07432cef | 7965 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 7966 | |
7aea43ff | 7967 | #: builtin/pack-objects.c:2664 |
220c313c JX |
7968 | msgid "include objects referred to by the index" |
7969 | msgstr "包括被索引引用到的对象" | |
7970 | ||
7aea43ff | 7971 | #: builtin/pack-objects.c:2667 |
ef317cd5 | 7972 | msgid "output pack to stdout" |
07432cef | 7973 | msgstr "输出包到标准输出" |
ef317cd5 | 7974 | |
7aea43ff | 7975 | #: builtin/pack-objects.c:2669 |
ef317cd5 | 7976 | msgid "include tag objects that refer to objects to be packed" |
07432cef | 7977 | msgstr "包括引用了打包对象的 tag" |
ef317cd5 | 7978 | |
7aea43ff | 7979 | #: builtin/pack-objects.c:2671 |
ef317cd5 | 7980 | msgid "keep unreachable objects" |
07432cef | 7981 | msgstr "维持不可达的对象" |
ef317cd5 | 7982 | |
7aea43ff | 7983 | #: builtin/pack-objects.c:2672 parse-options.h:139 |
ef317cd5 JX |
7984 | msgid "time" |
7985 | msgstr "时间" | |
7986 | ||
7aea43ff | 7987 | #: builtin/pack-objects.c:2673 |
ef317cd5 | 7988 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 7989 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 7990 | |
7aea43ff | 7991 | #: builtin/pack-objects.c:2676 |
ef317cd5 | 7992 | msgid "create thin packs" |
07432cef | 7993 | msgstr "创建精简包" |
ef317cd5 | 7994 | |
7aea43ff | 7995 | #: builtin/pack-objects.c:2678 |
04cb2f28 JX |
7996 | msgid "create packs suitable for shallow fetches" |
7997 | msgstr "创建适合浅克隆版本库获取的包" | |
7998 | ||
7aea43ff | 7999 | #: builtin/pack-objects.c:2680 |
ef317cd5 | 8000 | msgid "ignore packs that have companion .keep file" |
07432cef | 8001 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 8002 | |
7aea43ff | 8003 | #: builtin/pack-objects.c:2682 |
ef317cd5 | 8004 | msgid "pack compression level" |
07432cef | 8005 | msgstr "打包压缩级别" |
ef317cd5 | 8006 | |
7aea43ff | 8007 | #: builtin/pack-objects.c:2684 |
ef317cd5 | 8008 | msgid "do not hide commits by grafts" |
cfff71a9 | 8009 | msgstr "显示被嫁接隐藏的提交" |
ef317cd5 | 8010 | |
7aea43ff | 8011 | #: builtin/pack-objects.c:2686 |
6c94aba5 JX |
8012 | msgid "use a bitmap index if available to speed up counting objects" |
8013 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" | |
8014 | ||
7aea43ff | 8015 | #: builtin/pack-objects.c:2688 |
6c94aba5 JX |
8016 | msgid "write a bitmap index together with the pack index" |
8017 | msgstr "在建立包索引的同时创建 bitmap 索引" | |
8018 | ||
7aea43ff | 8019 | #: builtin/pack-objects.c:2779 |
6c94aba5 JX |
8020 | msgid "Counting objects" |
8021 | msgstr "对象计数中" | |
8022 | ||
ef317cd5 | 8023 | #: builtin/pack-refs.c:6 |
814ff314 JX |
8024 | msgid "git pack-refs [<options>]" |
8025 | msgstr "git pack-refs [<选项>]" | |
c04f5ac3 | 8026 | |
ef317cd5 JX |
8027 | #: builtin/pack-refs.c:14 |
8028 | msgid "pack everything" | |
07432cef | 8029 | msgstr "打包一切" |
c04f5ac3 | 8030 | |
ef317cd5 JX |
8031 | #: builtin/pack-refs.c:15 |
8032 | msgid "prune loose refs (default)" | |
07432cef | 8033 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 8034 | |
ef317cd5 | 8035 | #: builtin/prune-packed.c:7 |
814ff314 JX |
8036 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
8037 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
6792b93b | 8038 | |
220c313c | 8039 | #: builtin/prune-packed.c:40 |
6c94aba5 JX |
8040 | msgid "Removing duplicate objects" |
8041 | msgstr "正在删除重复对象" | |
8042 | ||
5bb01d4f | 8043 | #: builtin/prune.c:11 |
ef317cd5 | 8044 | msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" |
07432cef | 8045 | msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" |
7ac1c0ad | 8046 | |
5bb01d4f | 8047 | #: builtin/prune.c:105 builtin/worktree.c:112 |
ef317cd5 | 8048 | msgid "do not remove, show only" |
07432cef | 8049 | msgstr "不删除,只显示" |
7ac1c0ad | 8050 | |
5bb01d4f | 8051 | #: builtin/prune.c:106 builtin/worktree.c:113 |
ef317cd5 | 8052 | msgid "report pruned objects" |
07432cef | 8053 | msgstr "报告清除的对象" |
7ac1c0ad | 8054 | |
5bb01d4f | 8055 | #: builtin/prune.c:109 builtin/worktree.c:115 |
ef317cd5 | 8056 | msgid "expire objects older than <time>" |
07432cef | 8057 | msgstr "使早于给定时间的对象过期" |
ef317cd5 JX |
8058 | |
8059 | #: builtin/push.c:14 | |
ef317cd5 | 8060 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
90314792 | 8061 | msgstr "git push [<选项>] [<版本库> [<引用规则>...]]" |
7ac1c0ad | 8062 | |
6c94aba5 | 8063 | #: builtin/push.c:85 |
c04f5ac3 | 8064 | msgid "tag shorthand without <tag>" |
d9d56b23 | 8065 | msgstr "tag 后面未提供 <标签> 参数" |
c04f5ac3 | 8066 | |
6c94aba5 | 8067 | #: builtin/push.c:95 |
c04f5ac3 | 8068 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 8069 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 8070 | |
6acbf033 | 8071 | #: builtin/push.c:139 |
8ada9598 JX |
8072 | msgid "" |
8073 | "\n" | |
8074 | "To choose either option permanently, see push.default in 'git help config'." | |
8075 | msgstr "" | |
81809b99 JX |
8076 | "\n" |
8077 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 8078 | |
6acbf033 | 8079 | #: builtin/push.c:142 |
8ada9598 JX |
8080 | #, c-format |
8081 | msgid "" | |
8082 | "The upstream branch of your current branch does not match\n" | |
8083 | "the name of your current branch. To push to the upstream branch\n" | |
8084 | "on the remote, use\n" | |
8085 | "\n" | |
8086 | " git push %s HEAD:%s\n" | |
8087 | "\n" | |
8088 | "To push to the branch of the same name on the remote, use\n" | |
8089 | "\n" | |
8090 | " git push %s %s\n" | |
8091 | "%s" | |
8092 | msgstr "" | |
81809b99 JX |
8093 | "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n" |
8094 | "上游分支,使用\n" | |
8095 | "\n" | |
8096 | " git push %s HEAD:%s\n" | |
8097 | "\n" | |
8098 | "为推送至远程同名分支,使用\n" | |
8099 | "\n" | |
8100 | " git push %s %s\n" | |
8101 | "%s" | |
8ada9598 | 8102 | |
6acbf033 | 8103 | #: builtin/push.c:157 |
c04f5ac3 JX |
8104 | #, c-format |
8105 | msgid "" | |
8106 | "You are not currently on a branch.\n" | |
8107 | "To push the history leading to the current (detached HEAD)\n" | |
8108 | "state now, use\n" | |
8109 | "\n" | |
8110 | " git push %s HEAD:<name-of-remote-branch>\n" | |
8111 | msgstr "" | |
8112 | "您当前不在一个分支上。\n" | |
90e6ef53 | 8113 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 | 8114 | "\n" |
d9d56b23 | 8115 | " git push %s HEAD:<远程分支名字>\n" |
c04f5ac3 | 8116 | |
6acbf033 | 8117 | #: builtin/push.c:171 |
c04f5ac3 JX |
8118 | #, c-format |
8119 | msgid "" | |
8120 | "The current branch %s has no upstream branch.\n" | |
8121 | "To push the current branch and set the remote as upstream, use\n" | |
8122 | "\n" | |
8123 | " git push --set-upstream %s %s\n" | |
8124 | msgstr "" | |
8125 | "当前分支 %s 没有对应的上游分支。\n" | |
8126 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
8127 | "\n" | |
8128 | " git push --set-upstream %s %s\n" | |
8129 | ||
6acbf033 | 8130 | #: builtin/push.c:179 |
c04f5ac3 JX |
8131 | #, c-format |
8132 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
8133 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
8134 | ||
6acbf033 | 8135 | #: builtin/push.c:182 |
73a60cd2 JX |
8136 | #, c-format |
8137 | msgid "" | |
8138 | "You are pushing to remote '%s', which is not the upstream of\n" | |
8139 | "your current branch '%s', without telling me what to push\n" | |
8140 | "to update which remote branch." | |
8141 | msgstr "" | |
8142 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
8143 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
8144 | ||
c160d03f | 8145 | # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短 |
6acbf033 | 8146 | #: builtin/push.c:205 |
c160d03f | 8147 | msgid "" |
6c94aba5 | 8148 | "push.default is unset; its implicit value has changed in\n" |
c160d03f | 8149 | "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" |
6c94aba5 | 8150 | "and maintain the traditional behavior, use:\n" |
c160d03f JX |
8151 | "\n" |
8152 | " git config --global push.default matching\n" | |
8153 | "\n" | |
8154 | "To squelch this message and adopt the new behavior now, use:\n" | |
8155 | "\n" | |
8156 | " git config --global push.default simple\n" | |
8157 | "\n" | |
cfff71a9 JX |
8158 | "When push.default is set to 'matching', git will push local branches\n" |
8159 | "to the remote branches that already exist with the same name.\n" | |
8160 | "\n" | |
6c94aba5 | 8161 | "Since Git 2.0, Git defaults to the more conservative 'simple'\n" |
cfff71a9 JX |
8162 | "behavior, which only pushes the current branch to the corresponding\n" |
8163 | "remote branch that 'git pull' uses to update the current branch.\n" | |
8164 | "\n" | |
c160d03f JX |
8165 | "See 'git help config' and search for 'push.default' for further " |
8166 | "information.\n" | |
8167 | "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" | |
8168 | "'current' instead of 'simple' if you sometimes use older versions of Git)" | |
8169 | msgstr "" | |
6c94aba5 | 8170 | "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n" |
cfff71a9 | 8171 | "变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n" |
c160d03f JX |
8172 | "\n" |
8173 | " git config --global push.default matching\n" | |
8174 | "\n" | |
8175 | "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n" | |
8176 | "\n" | |
8177 | " git config --global push.default simple\n" | |
8178 | "\n" | |
cfff71a9 JX |
8179 | "当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n" |
8180 | "本地分支。\n" | |
8181 | "\n" | |
8182 | "从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n" | |
8183 | "分支到远程关联的同名分支,即 'git push' 推送当前分支。\n" | |
8184 | "\n" | |
c160d03f JX |
8185 | "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n" |
8186 | "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n" | |
90314792 | 8187 | "为保持兼容,请用 'current' 代替 'simple')" |
c160d03f | 8188 | |
6acbf033 | 8189 | #: builtin/push.c:272 |
c04f5ac3 JX |
8190 | msgid "" |
8191 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
90314792 | 8192 | msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 8193 | |
6acbf033 | 8194 | #: builtin/push.c:279 |
170e9899 JX |
8195 | msgid "" |
8196 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
8197 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
8198 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
8199 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
8200 | msgstr "" | |
eff6d3a9 | 8201 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 8202 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 8203 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 8204 | |
6acbf033 | 8205 | #: builtin/push.c:285 |
170e9899 JX |
8206 | msgid "" |
8207 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
8208 | "counterpart. Check out this branch and integrate the remote changes\n" |
8209 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
8210 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
8211 | msgstr "" | |
eff6d3a9 | 8212 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 8213 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 8214 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 8215 | |
6acbf033 | 8216 | #: builtin/push.c:291 |
07432cef | 8217 | msgid "" |
a77c07d9 JX |
8218 | "Updates were rejected because the remote contains work that you do\n" |
8219 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
8220 | "to the same ref. You may want to first integrate the remote changes\n" |
8221 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
8222 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
8223 | msgstr "" | |
8224 | "更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n" | |
2e8451e8 JX |
8225 | "一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" |
8226 | "(如 'git pull ...')。\n" | |
a77c07d9 JX |
8227 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
8228 | ||
6acbf033 | 8229 | #: builtin/push.c:298 |
a77c07d9 JX |
8230 | msgid "Updates were rejected because the tag already exists in the remote." |
8231 | msgstr "更新被拒绝因为 tag 在远程已经存在。" | |
8232 | ||
6acbf033 | 8233 | #: builtin/push.c:301 |
a77c07d9 JX |
8234 | msgid "" |
8235 | "You cannot update a remote ref that points at a non-commit object,\n" | |
8236 | "or update a remote ref to make it point at a non-commit object,\n" | |
8237 | "without using the '--force' option.\n" | |
8238 | msgstr "" | |
8239 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
8240 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 8241 | |
6acbf033 | 8242 | #: builtin/push.c:360 |
c04f5ac3 JX |
8243 | #, c-format |
8244 | msgid "Pushing to %s\n" | |
8245 | msgstr "推送到 %s\n" | |
8246 | ||
6acbf033 | 8247 | #: builtin/push.c:364 |
c04f5ac3 JX |
8248 | #, c-format |
8249 | msgid "failed to push some refs to '%s'" | |
8250 | msgstr "无法推送一些引用到 '%s'" | |
8251 | ||
6acbf033 | 8252 | #: builtin/push.c:394 |
c04f5ac3 JX |
8253 | #, c-format |
8254 | msgid "bad repository '%s'" | |
90e6ef53 | 8255 | msgstr "坏的版本库 '%s'" |
c04f5ac3 | 8256 | |
6acbf033 | 8257 | #: builtin/push.c:395 |
c04f5ac3 JX |
8258 | msgid "" |
8259 | "No configured push destination.\n" | |
8260 | "Either specify the URL from the command-line or configure a remote " | |
8261 | "repository using\n" | |
8262 | "\n" | |
8263 | " git remote add <name> <url>\n" | |
8264 | "\n" | |
8265 | "and then push using the remote name\n" | |
8266 | "\n" | |
8267 | " git push <name>\n" | |
8268 | msgstr "" | |
90e6ef53 | 8269 | "没有配置推送目标。\n" |
07432cef | 8270 | "或通过命令行指定URL,或用下面命令配置一个远程版本库\n" |
c04f5ac3 | 8271 | "\n" |
d9d56b23 | 8272 | " git remote add <名称> <地址>\n" |
c04f5ac3 JX |
8273 | "\n" |
8274 | "然后使用该远程版本库名执行推送\n" | |
8275 | "\n" | |
d9d56b23 | 8276 | " git push <名称>\n" |
c04f5ac3 | 8277 | |
6acbf033 | 8278 | #: builtin/push.c:410 |
c04f5ac3 JX |
8279 | msgid "--all and --tags are incompatible" |
8280 | msgstr "--all 和 --tags 不兼容" | |
8281 | ||
6acbf033 | 8282 | #: builtin/push.c:411 |
c04f5ac3 | 8283 | msgid "--all can't be combined with refspecs" |
90314792 | 8284 | msgstr "--all 不能和引用规则同时使用" |
c04f5ac3 | 8285 | |
6acbf033 | 8286 | #: builtin/push.c:416 |
c04f5ac3 JX |
8287 | msgid "--mirror and --tags are incompatible" |
8288 | msgstr "--mirror 和 --tags 不兼容" | |
8289 | ||
6acbf033 | 8290 | #: builtin/push.c:417 |
c04f5ac3 | 8291 | msgid "--mirror can't be combined with refspecs" |
90314792 | 8292 | msgstr "--mirror 不能和引用规则同时使用" |
c04f5ac3 | 8293 | |
6acbf033 | 8294 | #: builtin/push.c:422 |
c04f5ac3 JX |
8295 | msgid "--all and --mirror are incompatible" |
8296 | msgstr "--all 和 --mirror 不兼容" | |
8297 | ||
814ff314 | 8298 | #: builtin/push.c:502 |
ef317cd5 | 8299 | msgid "repository" |
07432cef | 8300 | msgstr "版本库" |
ef317cd5 | 8301 | |
814ff314 | 8302 | #: builtin/push.c:503 |
ef317cd5 | 8303 | msgid "push all refs" |
07432cef | 8304 | msgstr "推送所有引用" |
ef317cd5 | 8305 | |
814ff314 | 8306 | #: builtin/push.c:504 |
ef317cd5 | 8307 | msgid "mirror all refs" |
07432cef | 8308 | msgstr "镜像所有引用" |
ef317cd5 | 8309 | |
814ff314 | 8310 | #: builtin/push.c:506 |
ef317cd5 | 8311 | msgid "delete refs" |
07432cef | 8312 | msgstr "删除引用" |
ef317cd5 | 8313 | |
814ff314 | 8314 | #: builtin/push.c:507 |
ef317cd5 | 8315 | msgid "push tags (can't be used with --all or --mirror)" |
07432cef | 8316 | msgstr "推送 tags(不能使用 --all or --mirror)" |
ef317cd5 | 8317 | |
814ff314 | 8318 | #: builtin/push.c:510 |
ef317cd5 JX |
8319 | msgid "force updates" |
8320 | msgstr "强制更新" | |
8321 | ||
814ff314 | 8322 | #: builtin/push.c:512 |
90314792 JX |
8323 | msgid "refname>:<expect" |
8324 | msgstr "引用名>:<期望值" | |
8325 | ||
814ff314 | 8326 | #: builtin/push.c:513 |
90314792 JX |
8327 | msgid "require old value of ref to be at this value" |
8328 | msgstr "要求引用旧的取值为设定值" | |
8329 | ||
814ff314 | 8330 | #: builtin/push.c:516 |
ef317cd5 | 8331 | msgid "control recursive pushing of submodules" |
07432cef | 8332 | msgstr "控制子模组的递归推送" |
ef317cd5 | 8333 | |
814ff314 | 8334 | #: builtin/push.c:518 |
ef317cd5 | 8335 | msgid "use thin pack" |
07432cef | 8336 | msgstr "使用精简打包" |
ef317cd5 | 8337 | |
814ff314 | 8338 | #: builtin/push.c:519 builtin/push.c:520 |
ef317cd5 | 8339 | msgid "receive pack program" |
07432cef | 8340 | msgstr "接收包程序" |
ef317cd5 | 8341 | |
814ff314 | 8342 | #: builtin/push.c:521 |
ef317cd5 | 8343 | msgid "set upstream for git pull/status" |
07432cef | 8344 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 8345 | |
814ff314 | 8346 | #: builtin/push.c:524 |
ef317cd5 | 8347 | msgid "prune locally removed refs" |
07432cef | 8348 | msgstr "清除本地删除的引用" |
ef317cd5 | 8349 | |
814ff314 | 8350 | #: builtin/push.c:526 |
a77c07d9 JX |
8351 | msgid "bypass pre-push hook" |
8352 | msgstr "绕过 pre-push 钩子" | |
8353 | ||
814ff314 | 8354 | #: builtin/push.c:527 |
1003b3a5 JX |
8355 | msgid "push missing but relevant tags" |
8356 | msgstr "推送缺失的有关的 tags" | |
8357 | ||
814ff314 | 8358 | #: builtin/push.c:529 |
220c313c JX |
8359 | msgid "GPG sign the push" |
8360 | msgstr "用 GPG 为推送签名" | |
8361 | ||
814ff314 JX |
8362 | #: builtin/push.c:530 |
8363 | msgid "request atomic transaction on remote side" | |
8364 | msgstr "需要远端支持原子事务" | |
8365 | ||
8366 | #: builtin/push.c:539 | |
c04f5ac3 JX |
8367 | msgid "--delete is incompatible with --all, --mirror and --tags" |
8368 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
8369 | ||
814ff314 | 8370 | #: builtin/push.c:541 |
c04f5ac3 JX |
8371 | msgid "--delete doesn't make sense without any refs" |
8372 | msgstr "--delete 未接任何引用没有意义" | |
8373 | ||
220c313c | 8374 | #: builtin/read-tree.c:37 |
ef317cd5 JX |
8375 | msgid "" |
8376 | "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " | |
8377 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" | |
8378 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
8379 | msgstr "" | |
07432cef WS |
8380 | "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-" |
8381 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" | |
8382 | "index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])" | |
ef317cd5 | 8383 | |
220c313c | 8384 | #: builtin/read-tree.c:110 |
ef317cd5 | 8385 | msgid "write resulting index to <file>" |
d9d56b23 | 8386 | msgstr "将索引结果写入 <文件>" |
ef317cd5 | 8387 | |
220c313c | 8388 | #: builtin/read-tree.c:113 |
ef317cd5 | 8389 | msgid "only empty the index" |
07432cef | 8390 | msgstr "只是清空索引" |
ef317cd5 | 8391 | |
220c313c | 8392 | #: builtin/read-tree.c:115 |
ef317cd5 | 8393 | msgid "Merging" |
07432cef | 8394 | msgstr "合并" |
ef317cd5 | 8395 | |
220c313c | 8396 | #: builtin/read-tree.c:117 |
ef317cd5 | 8397 | msgid "perform a merge in addition to a read" |
07432cef | 8398 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 8399 | |
220c313c | 8400 | #: builtin/read-tree.c:119 |
ef317cd5 | 8401 | msgid "3-way merge if no file level merging required" |
07432cef | 8402 | msgstr "如果没有文件级合并需要,执行三路合并" |
ef317cd5 | 8403 | |
220c313c | 8404 | #: builtin/read-tree.c:121 |
ef317cd5 | 8405 | msgid "3-way merge in presence of adds and removes" |
07432cef | 8406 | msgstr "存在添加和删除时,也执行三路合并" |
ef317cd5 | 8407 | |
220c313c | 8408 | #: builtin/read-tree.c:123 |
ef317cd5 | 8409 | msgid "same as -m, but discard unmerged entries" |
07432cef | 8410 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 8411 | |
220c313c | 8412 | #: builtin/read-tree.c:124 |
ef317cd5 | 8413 | msgid "<subdirectory>/" |
07432cef | 8414 | msgstr "<子目录>/" |
ef317cd5 | 8415 | |
220c313c | 8416 | #: builtin/read-tree.c:125 |
ef317cd5 | 8417 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 8418 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 8419 | |
220c313c | 8420 | #: builtin/read-tree.c:128 |
ef317cd5 | 8421 | msgid "update working tree with merge result" |
07432cef | 8422 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 8423 | |
220c313c | 8424 | #: builtin/read-tree.c:130 |
ef317cd5 | 8425 | msgid "gitignore" |
07432cef | 8426 | msgstr "gitignore" |
ef317cd5 | 8427 | |
220c313c | 8428 | #: builtin/read-tree.c:131 |
ef317cd5 | 8429 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 8430 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 8431 | |
220c313c | 8432 | #: builtin/read-tree.c:134 |
ef317cd5 | 8433 | msgid "don't check the working tree after merging" |
07432cef | 8434 | msgstr "合并后不检查工作区" |
ef317cd5 | 8435 | |
220c313c | 8436 | #: builtin/read-tree.c:135 |
ef317cd5 | 8437 | msgid "don't update the index or the work tree" |
07432cef | 8438 | msgstr "不更新索引区和工作区" |
ef317cd5 | 8439 | |
220c313c | 8440 | #: builtin/read-tree.c:137 |
ef317cd5 | 8441 | msgid "skip applying sparse checkout filter" |
07432cef | 8442 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 8443 | |
220c313c | 8444 | #: builtin/read-tree.c:139 |
ef317cd5 | 8445 | msgid "debug unpack-trees" |
07432cef | 8446 | msgstr "调试 unpack-trees" |
ef317cd5 | 8447 | |
7aea43ff | 8448 | #: builtin/reflog.c:430 |
2e8451e8 JX |
8449 | #, c-format |
8450 | msgid "%s' for '%s' is not a valid timestamp" | |
8451 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" | |
8452 | ||
7aea43ff | 8453 | #: builtin/reflog.c:547 builtin/reflog.c:552 |
2e8451e8 JX |
8454 | #, c-format |
8455 | msgid "'%s' is not a valid timestamp" | |
8456 | msgstr "'%s' 不是一个有效的时间戳" | |
8457 | ||
cfff71a9 | 8458 | #: builtin/remote.c:12 |
ef317cd5 | 8459 | msgid "git remote [-v | --verbose]" |
07432cef | 8460 | msgstr "git remote [-v | --verbose]" |
ef317cd5 | 8461 | |
cfff71a9 | 8462 | #: builtin/remote.c:13 |
ef317cd5 | 8463 | msgid "" |
814ff314 | 8464 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
ef317cd5 JX |
8465 | "mirror=<fetch|push>] <name> <url>" |
8466 | msgstr "" | |
814ff314 | 8467 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" |
d9d56b23 | 8468 | "mirror=<fetch|push>] <名称> <地址>" |
ef317cd5 | 8469 | |
cfff71a9 | 8470 | #: builtin/remote.c:14 builtin/remote.c:33 |
ef317cd5 | 8471 | msgid "git remote rename <old> <new>" |
07432cef | 8472 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 | 8473 | |
cfff71a9 | 8474 | #: builtin/remote.c:15 builtin/remote.c:38 |
ef317cd5 | 8475 | msgid "git remote remove <name>" |
07432cef | 8476 | msgstr "git remote remove <名称>" |
ef317cd5 | 8477 | |
814ff314 JX |
8478 | #: builtin/remote.c:16 builtin/remote.c:43 |
8479 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" | |
8480 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
ef317cd5 | 8481 | |
cfff71a9 | 8482 | #: builtin/remote.c:17 |
ef317cd5 | 8483 | msgid "git remote [-v | --verbose] show [-n] <name>" |
07432cef | 8484 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 | 8485 | |
cfff71a9 | 8486 | #: builtin/remote.c:18 |
ef317cd5 | 8487 | msgid "git remote prune [-n | --dry-run] <name>" |
07432cef | 8488 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 | 8489 | |
cfff71a9 | 8490 | #: builtin/remote.c:19 |
ef317cd5 JX |
8491 | msgid "" |
8492 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 8493 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 | 8494 | |
cfff71a9 | 8495 | #: builtin/remote.c:20 |
ef317cd5 | 8496 | msgid "git remote set-branches [--add] <name> <branch>..." |
07432cef | 8497 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 | 8498 | |
cfff71a9 | 8499 | #: builtin/remote.c:21 builtin/remote.c:69 |
ef317cd5 | 8500 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
07432cef | 8501 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 | 8502 | |
cfff71a9 | 8503 | #: builtin/remote.c:22 builtin/remote.c:70 |
ef317cd5 | 8504 | msgid "git remote set-url --add <name> <newurl>" |
07432cef | 8505 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 | 8506 | |
cfff71a9 | 8507 | #: builtin/remote.c:23 builtin/remote.c:71 |
ef317cd5 | 8508 | msgid "git remote set-url --delete <name> <url>" |
07432cef | 8509 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 | 8510 | |
cfff71a9 | 8511 | #: builtin/remote.c:28 |
ef317cd5 | 8512 | msgid "git remote add [<options>] <name> <url>" |
07432cef | 8513 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 8514 | |
cfff71a9 | 8515 | #: builtin/remote.c:48 |
ef317cd5 | 8516 | msgid "git remote set-branches <name> <branch>..." |
07432cef | 8517 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 | 8518 | |
cfff71a9 | 8519 | #: builtin/remote.c:49 |
ef317cd5 | 8520 | msgid "git remote set-branches --add <name> <branch>..." |
07432cef | 8521 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 | 8522 | |
cfff71a9 | 8523 | #: builtin/remote.c:54 |
ef317cd5 | 8524 | msgid "git remote show [<options>] <name>" |
07432cef | 8525 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 | 8526 | |
cfff71a9 | 8527 | #: builtin/remote.c:59 |
ef317cd5 | 8528 | msgid "git remote prune [<options>] <name>" |
07432cef | 8529 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 | 8530 | |
cfff71a9 | 8531 | #: builtin/remote.c:64 |
ef317cd5 | 8532 | msgid "git remote update [<options>] [<group> | <remote>]..." |
07432cef | 8533 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 8534 | |
cfff71a9 | 8535 | #: builtin/remote.c:88 |
81809b99 | 8536 | #, c-format |
8ada9598 | 8537 | msgid "Updating %s" |
81809b99 | 8538 | msgstr "更新 %s 中" |
8ada9598 | 8539 | |
cfff71a9 | 8540 | #: builtin/remote.c:120 |
8ada9598 JX |
8541 | msgid "" |
8542 | "--mirror is dangerous and deprecated; please\n" | |
8543 | "\t use --mirror=fetch or --mirror=push instead" | |
8544 | msgstr "" | |
81809b99 JX |
8545 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
8546 | "\t 或 --mirror=push" | |
8ada9598 | 8547 | |
cfff71a9 | 8548 | #: builtin/remote.c:137 |
81809b99 | 8549 | #, c-format |
8ada9598 | 8550 | msgid "unknown mirror argument: %s" |
81809b99 | 8551 | msgstr "未知的镜像参数:%s" |
8ada9598 | 8552 | |
cfff71a9 | 8553 | #: builtin/remote.c:153 |
ef317cd5 | 8554 | msgid "fetch the remote branches" |
07432cef | 8555 | msgstr "抓取远程的分支" |
ef317cd5 | 8556 | |
cfff71a9 | 8557 | #: builtin/remote.c:155 |
ef317cd5 | 8558 | msgid "import all tags and associated objects when fetching" |
07432cef | 8559 | msgstr "抓取时导入所有的 tags 和关联对象" |
ef317cd5 | 8560 | |
cfff71a9 | 8561 | #: builtin/remote.c:158 |
ef317cd5 | 8562 | msgid "or do not fetch any tag at all (--no-tags)" |
07432cef | 8563 | msgstr "或不抓取任何 tag(--no-tags)" |
ef317cd5 | 8564 | |
cfff71a9 | 8565 | #: builtin/remote.c:160 |
ef317cd5 | 8566 | msgid "branch(es) to track" |
07432cef | 8567 | msgstr "跟踪的分支" |
ef317cd5 | 8568 | |
cfff71a9 | 8569 | #: builtin/remote.c:161 |
ef317cd5 | 8570 | msgid "master branch" |
07432cef | 8571 | msgstr "主线分支" |
ef317cd5 | 8572 | |
cfff71a9 | 8573 | #: builtin/remote.c:162 |
ef317cd5 | 8574 | msgid "push|fetch" |
07432cef | 8575 | msgstr "push|fetch" |
ef317cd5 | 8576 | |
cfff71a9 | 8577 | #: builtin/remote.c:163 |
ef317cd5 | 8578 | msgid "set up remote as a mirror to push to or fetch from" |
07432cef | 8579 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 8580 | |
cfff71a9 | 8581 | #: builtin/remote.c:175 |
8ada9598 | 8582 | msgid "specifying a master branch makes no sense with --mirror" |
81809b99 | 8583 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 | 8584 | |
cfff71a9 | 8585 | #: builtin/remote.c:177 |
8ada9598 | 8586 | msgid "specifying branches to track makes sense only with fetch mirrors" |
649900bc | 8587 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 | 8588 | |
7aea43ff | 8589 | #: builtin/remote.c:187 builtin/remote.c:640 |
81809b99 | 8590 | #, c-format |
8ada9598 | 8591 | msgid "remote %s already exists." |
81809b99 | 8592 | msgstr "远程 %s 已经存在。" |
8ada9598 | 8593 | |
7aea43ff | 8594 | #: builtin/remote.c:191 builtin/remote.c:644 |
81809b99 | 8595 | #, c-format |
8ada9598 | 8596 | msgid "'%s' is not a valid remote name" |
81809b99 | 8597 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 | 8598 | |
d9d56b23 | 8599 | #: builtin/remote.c:235 |
81809b99 | 8600 | #, c-format |
8ada9598 | 8601 | msgid "Could not setup master '%s'" |
81809b99 | 8602 | msgstr "无法设置 master '%s'" |
8ada9598 | 8603 | |
d9d56b23 | 8604 | #: builtin/remote.c:335 |
81809b99 | 8605 | #, c-format |
8ada9598 | 8606 | msgid "Could not get fetch map for refspec %s" |
90314792 | 8607 | msgstr "无法得到引用规则 %s 的获取列表" |
8ada9598 | 8608 | |
d9d56b23 | 8609 | #: builtin/remote.c:436 builtin/remote.c:444 |
8ada9598 | 8610 | msgid "(matching)" |
81809b99 | 8611 | msgstr "(匹配)" |
8ada9598 | 8612 | |
d9d56b23 | 8613 | #: builtin/remote.c:448 |
8ada9598 | 8614 | msgid "(delete)" |
81809b99 | 8615 | msgstr "(删除)" |
8ada9598 | 8616 | |
7aea43ff | 8617 | #: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 |
81809b99 | 8618 | #, c-format |
8ada9598 | 8619 | msgid "Could not append '%s' to '%s'" |
81809b99 | 8620 | msgstr "不能添加 '%s' 至 '%s'" |
8ada9598 | 8621 | |
7aea43ff | 8622 | #: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892 |
81809b99 | 8623 | #, c-format |
8ada9598 | 8624 | msgid "No such remote: %s" |
81809b99 | 8625 | msgstr "没有这样的远程:%s" |
8ada9598 | 8626 | |
7aea43ff | 8627 | #: builtin/remote.c:650 |
81809b99 | 8628 | #, c-format |
8ada9598 | 8629 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 8630 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 | 8631 | |
7aea43ff | 8632 | #: builtin/remote.c:656 builtin/remote.c:844 |
81809b99 | 8633 | #, c-format |
8ada9598 | 8634 | msgid "Could not remove config section '%s'" |
81809b99 | 8635 | msgstr "不能移除配置小节 '%s'" |
8ada9598 | 8636 | |
7aea43ff | 8637 | #: builtin/remote.c:671 |
8ada9598 JX |
8638 | #, c-format |
8639 | msgid "" | |
d691f479 | 8640 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
8641 | "\t%s\n" |
8642 | "\tPlease update the configuration manually if necessary." | |
8643 | msgstr "" | |
90314792 | 8644 | "没有更新非默认的获取引用规则\n" |
81809b99 JX |
8645 | "\t%s\n" |
8646 | "\t如果必要请手动更新配置。" | |
8ada9598 | 8647 | |
7aea43ff | 8648 | #: builtin/remote.c:677 |
81809b99 | 8649 | #, c-format |
8ada9598 | 8650 | msgid "Could not append '%s'" |
81809b99 | 8651 | msgstr "不能追加 '%s'" |
8ada9598 | 8652 | |
7aea43ff | 8653 | #: builtin/remote.c:688 |
81809b99 | 8654 | #, c-format |
8ada9598 | 8655 | msgid "Could not set '%s'" |
81809b99 | 8656 | msgstr "不能设置 '%s'" |
8ada9598 | 8657 | |
7aea43ff | 8658 | #: builtin/remote.c:710 |
81809b99 | 8659 | #, c-format |
8ada9598 | 8660 | msgid "deleting '%s' failed" |
81809b99 | 8661 | msgstr "删除 '%s' 失败" |
8ada9598 | 8662 | |
7aea43ff | 8663 | #: builtin/remote.c:744 |
81809b99 | 8664 | #, c-format |
8ada9598 | 8665 | msgid "creating '%s' failed" |
81809b99 | 8666 | msgstr "创建 '%s' 失败" |
8ada9598 | 8667 | |
7aea43ff | 8668 | #: builtin/remote.c:763 |
81809b99 | 8669 | #, c-format |
8ada9598 | 8670 | msgid "Could not remove branch %s" |
81809b99 | 8671 | msgstr "无法移除分支 %s" |
8ada9598 | 8672 | |
7aea43ff | 8673 | #: builtin/remote.c:830 |
8ada9598 JX |
8674 | msgid "" |
8675 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
8676 | "to delete it, use:" | |
8677 | msgid_plural "" | |
8678 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
8679 | "to delete them, use:" | |
5ae481e0 JX |
8680 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
8681 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 | 8682 | |
7aea43ff | 8683 | #: builtin/remote.c:945 |
8ada9598 JX |
8684 | #, c-format |
8685 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 8686 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 | 8687 | |
7aea43ff | 8688 | #: builtin/remote.c:948 |
8ada9598 | 8689 | msgid " tracked" |
81809b99 | 8690 | msgstr " 已跟踪" |
8ada9598 | 8691 | |
7aea43ff | 8692 | #: builtin/remote.c:950 |
8ada9598 | 8693 | msgid " stale (use 'git remote prune' to remove)" |
81809b99 | 8694 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 | 8695 | |
7aea43ff | 8696 | #: builtin/remote.c:952 |
8ada9598 | 8697 | msgid " ???" |
81809b99 | 8698 | msgstr " ???" |
8ada9598 | 8699 | |
7aea43ff | 8700 | #: builtin/remote.c:993 |
8ada9598 JX |
8701 | #, c-format |
8702 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 8703 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 | 8704 | |
7aea43ff | 8705 | #: builtin/remote.c:1000 |
81809b99 | 8706 | #, c-format |
8ada9598 | 8707 | msgid "rebases onto remote %s" |
81809b99 | 8708 | msgstr "变基到远程 %s" |
8ada9598 | 8709 | |
7aea43ff | 8710 | #: builtin/remote.c:1003 |
81809b99 | 8711 | #, c-format |
8ada9598 | 8712 | msgid " merges with remote %s" |
81809b99 | 8713 | msgstr " 与远程 %s 合并" |
8ada9598 | 8714 | |
7aea43ff | 8715 | #: builtin/remote.c:1004 |
8ada9598 | 8716 | msgid " and with remote" |
81809b99 | 8717 | msgstr " 且有远程" |
8ada9598 | 8718 | |
7aea43ff | 8719 | #: builtin/remote.c:1006 |
81809b99 | 8720 | #, c-format |
8ada9598 | 8721 | msgid "merges with remote %s" |
81809b99 | 8722 | msgstr "与远程 %s 合并" |
8ada9598 | 8723 | |
7aea43ff | 8724 | #: builtin/remote.c:1007 |
8ada9598 | 8725 | msgid " and with remote" |
81809b99 | 8726 | msgstr " 且有远程" |
8ada9598 | 8727 | |
7aea43ff | 8728 | #: builtin/remote.c:1053 |
8ada9598 | 8729 | msgid "create" |
81809b99 | 8730 | msgstr "创建" |
8ada9598 | 8731 | |
7aea43ff | 8732 | #: builtin/remote.c:1056 |
8ada9598 | 8733 | msgid "delete" |
81809b99 | 8734 | msgstr "删除" |
8ada9598 | 8735 | |
7aea43ff | 8736 | #: builtin/remote.c:1060 |
8ada9598 | 8737 | msgid "up to date" |
81809b99 | 8738 | msgstr "最新" |
8ada9598 | 8739 | |
7aea43ff | 8740 | #: builtin/remote.c:1063 |
8ada9598 | 8741 | msgid "fast-forwardable" |
81809b99 | 8742 | msgstr "可快进" |
8ada9598 | 8743 | |
7aea43ff | 8744 | #: builtin/remote.c:1066 |
8ada9598 | 8745 | msgid "local out of date" |
81809b99 | 8746 | msgstr "本地已过时" |
8ada9598 | 8747 | |
7aea43ff | 8748 | #: builtin/remote.c:1073 |
8ada9598 JX |
8749 | #, c-format |
8750 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 8751 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 | 8752 | |
7aea43ff | 8753 | #: builtin/remote.c:1076 |
8ada9598 JX |
8754 | #, c-format |
8755 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 8756 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 | 8757 | |
7aea43ff | 8758 | #: builtin/remote.c:1080 |
8ada9598 JX |
8759 | #, c-format |
8760 | msgid " %-*s forces to %s" | |
81809b99 | 8761 | msgstr " %-*s 强制推送至 %s" |
8ada9598 | 8762 | |
7aea43ff | 8763 | #: builtin/remote.c:1083 |
8ada9598 JX |
8764 | #, c-format |
8765 | msgid " %-*s pushes to %s" | |
81809b99 | 8766 | msgstr " %-*s 推送至 %s" |
8ada9598 | 8767 | |
7aea43ff | 8768 | #: builtin/remote.c:1151 |
ef317cd5 | 8769 | msgid "do not query remotes" |
07432cef | 8770 | msgstr "不查询远程" |
ef317cd5 | 8771 | |
7aea43ff | 8772 | #: builtin/remote.c:1178 |
81809b99 | 8773 | #, c-format |
8ada9598 | 8774 | msgid "* remote %s" |
81809b99 | 8775 | msgstr "* 远程 %s" |
8ada9598 | 8776 | |
7aea43ff | 8777 | #: builtin/remote.c:1179 |
8ada9598 JX |
8778 | #, c-format |
8779 | msgid " Fetch URL: %s" | |
81809b99 | 8780 | msgstr " 获取地址:%s" |
8ada9598 | 8781 | |
7aea43ff | 8782 | #: builtin/remote.c:1180 builtin/remote.c:1331 |
8ada9598 | 8783 | msgid "(no URL)" |
81809b99 | 8784 | msgstr "(无 URL)" |
8ada9598 | 8785 | |
7aea43ff | 8786 | #: builtin/remote.c:1189 builtin/remote.c:1191 |
8ada9598 JX |
8787 | #, c-format |
8788 | msgid " Push URL: %s" | |
81809b99 | 8789 | msgstr " 推送地址:%s" |
8ada9598 | 8790 | |
7aea43ff | 8791 | #: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197 |
81809b99 | 8792 | #, c-format |
8ada9598 | 8793 | msgid " HEAD branch: %s" |
81809b99 | 8794 | msgstr " HEAD分支:%s" |
8ada9598 | 8795 | |
7aea43ff | 8796 | #: builtin/remote.c:1199 |
8ada9598 JX |
8797 | #, c-format |
8798 | msgid "" | |
8799 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 8800 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 | 8801 | |
7aea43ff | 8802 | #: builtin/remote.c:1211 |
81809b99 | 8803 | #, c-format |
8ada9598 JX |
8804 | msgid " Remote branch:%s" |
8805 | msgid_plural " Remote branches:%s" | |
81809b99 | 8806 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 8807 | msgstr[1] " 远程分支:%s" |
8ada9598 | 8808 | |
81809b99 | 8809 | # 译者:中文字符串拼接,可删除前导空格 |
7aea43ff | 8810 | #: builtin/remote.c:1214 builtin/remote.c:1241 |
8ada9598 | 8811 | msgid " (status not queried)" |
81809b99 | 8812 | msgstr "(状态未查询)" |
8ada9598 | 8813 | |
7aea43ff | 8814 | #: builtin/remote.c:1223 |
8ada9598 JX |
8815 | msgid " Local branch configured for 'git pull':" |
8816 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 8817 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 8818 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 | 8819 | |
7aea43ff | 8820 | #: builtin/remote.c:1231 |
8ada9598 | 8821 | msgid " Local refs will be mirrored by 'git push'" |
81809b99 | 8822 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 | 8823 | |
7aea43ff | 8824 | #: builtin/remote.c:1238 |
81809b99 | 8825 | #, c-format |
8ada9598 JX |
8826 | msgid " Local ref configured for 'git push'%s:" |
8827 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 8828 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 8829 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 8830 | |
7aea43ff | 8831 | #: builtin/remote.c:1259 |
ef317cd5 | 8832 | msgid "set refs/remotes/<name>/HEAD according to remote" |
07432cef | 8833 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 | 8834 | |
7aea43ff | 8835 | #: builtin/remote.c:1261 |
ef317cd5 | 8836 | msgid "delete refs/remotes/<name>/HEAD" |
07432cef | 8837 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 8838 | |
7aea43ff | 8839 | #: builtin/remote.c:1276 |
8ada9598 | 8840 | msgid "Cannot determine remote HEAD" |
81809b99 | 8841 | msgstr "无法确定远程 HEAD" |
8ada9598 | 8842 | |
7aea43ff | 8843 | #: builtin/remote.c:1278 |
8ada9598 | 8844 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
81809b99 | 8845 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 | 8846 | |
7aea43ff | 8847 | #: builtin/remote.c:1288 |
81809b99 | 8848 | #, c-format |
8ada9598 | 8849 | msgid "Could not delete %s" |
81809b99 | 8850 | msgstr "无法删除 %s" |
8ada9598 | 8851 | |
7aea43ff | 8852 | #: builtin/remote.c:1296 |
81809b99 | 8853 | #, c-format |
8ada9598 | 8854 | msgid "Not a valid ref: %s" |
81809b99 | 8855 | msgstr "不是一个有效引用:%s" |
8ada9598 | 8856 | |
7aea43ff | 8857 | #: builtin/remote.c:1298 |
81809b99 | 8858 | #, c-format |
8ada9598 | 8859 | msgid "Could not setup %s" |
81809b99 | 8860 | msgstr "不能设置 %s" |
8ada9598 JX |
8861 | |
8862 | # 译者:注意保持前导空格 | |
7aea43ff | 8863 | #: builtin/remote.c:1316 |
81809b99 | 8864 | #, c-format |
8ada9598 | 8865 | msgid " %s will become dangling!" |
07432cef | 8866 | msgstr " %s 将成为摇摆状态!" |
8ada9598 JX |
8867 | |
8868 | # 译者:注意保持前导空格 | |
7aea43ff | 8869 | #: builtin/remote.c:1317 |
81809b99 | 8870 | #, c-format |
8ada9598 | 8871 | msgid " %s has become dangling!" |
07432cef | 8872 | msgstr " %s 已成为摇摆状态!" |
8ada9598 | 8873 | |
7aea43ff | 8874 | #: builtin/remote.c:1327 |
81809b99 | 8875 | #, c-format |
8ada9598 | 8876 | msgid "Pruning %s" |
81809b99 | 8877 | msgstr "修剪 %s" |
8ada9598 | 8878 | |
7aea43ff | 8879 | #: builtin/remote.c:1328 |
8ada9598 JX |
8880 | #, c-format |
8881 | msgid "URL: %s" | |
81809b99 | 8882 | msgstr "URL:%s" |
8ada9598 | 8883 | |
7aea43ff | 8884 | #: builtin/remote.c:1351 |
8ada9598 JX |
8885 | #, c-format |
8886 | msgid " * [would prune] %s" | |
81809b99 | 8887 | msgstr " * [将删除] %s" |
8ada9598 | 8888 | |
7aea43ff | 8889 | #: builtin/remote.c:1354 |
8ada9598 JX |
8890 | #, c-format |
8891 | msgid " * [pruned] %s" | |
81809b99 | 8892 | msgstr " * [已删除] %s" |
8ada9598 | 8893 | |
7aea43ff | 8894 | #: builtin/remote.c:1399 |
ef317cd5 | 8895 | msgid "prune remotes after fetching" |
07432cef | 8896 | msgstr "抓取后清除远程" |
ef317cd5 | 8897 | |
7aea43ff | 8898 | #: builtin/remote.c:1465 builtin/remote.c:1539 |
81809b99 | 8899 | #, c-format |
8ada9598 | 8900 | msgid "No such remote '%s'" |
81809b99 | 8901 | msgstr "没有此远程 '%s'" |
8ada9598 | 8902 | |
7aea43ff | 8903 | #: builtin/remote.c:1485 |
ef317cd5 | 8904 | msgid "add branch" |
07432cef | 8905 | msgstr "添加分支" |
ef317cd5 | 8906 | |
7aea43ff | 8907 | #: builtin/remote.c:1492 |
8ada9598 | 8908 | msgid "no remote specified" |
81809b99 | 8909 | msgstr "未指定远程" |
8ada9598 | 8910 | |
7aea43ff | 8911 | #: builtin/remote.c:1514 |
ef317cd5 | 8912 | msgid "manipulate push URLs" |
07432cef | 8913 | msgstr "操作推送 URLS" |
ef317cd5 | 8914 | |
7aea43ff | 8915 | #: builtin/remote.c:1516 |
ef317cd5 | 8916 | msgid "add URL" |
07432cef | 8917 | msgstr "添加 URL" |
ef317cd5 | 8918 | |
7aea43ff | 8919 | #: builtin/remote.c:1518 |
ef317cd5 | 8920 | msgid "delete URLs" |
07432cef | 8921 | msgstr "删除 URLS" |
ef317cd5 | 8922 | |
7aea43ff | 8923 | #: builtin/remote.c:1525 |
8ada9598 | 8924 | msgid "--add --delete doesn't make sense" |
81809b99 | 8925 | msgstr "--add --delete 无意义" |
8ada9598 | 8926 | |
7aea43ff | 8927 | #: builtin/remote.c:1565 |
81809b99 | 8928 | #, c-format |
8ada9598 | 8929 | msgid "Invalid old URL pattern: %s" |
81809b99 | 8930 | msgstr "无效的旧URL匹配模版:%s" |
8ada9598 | 8931 | |
7aea43ff | 8932 | #: builtin/remote.c:1573 |
81809b99 | 8933 | #, c-format |
8ada9598 | 8934 | msgid "No such URL found: %s" |
81809b99 | 8935 | msgstr "未找到此URL:%s" |
8ada9598 | 8936 | |
7aea43ff | 8937 | #: builtin/remote.c:1575 |
8ada9598 | 8938 | msgid "Will not delete all non-push URLs" |
81809b99 | 8939 | msgstr "将不会删除所有非推送URL地址" |
8ada9598 | 8940 | |
7aea43ff | 8941 | #: builtin/remote.c:1589 |
ef317cd5 | 8942 | msgid "be verbose; must be placed before a subcommand" |
07432cef | 8943 | msgstr "冗长输出;必须置于子命令之前" |
ef317cd5 | 8944 | |
6acbf033 | 8945 | #: builtin/repack.c:17 |
814ff314 JX |
8946 | msgid "git repack [<options>]" |
8947 | msgstr "git repack [<选项>]" | |
90314792 | 8948 | |
04cb2f28 | 8949 | #: builtin/repack.c:159 |
90314792 JX |
8950 | msgid "pack everything in a single pack" |
8951 | msgstr "所有内容打包到一个包文件中" | |
8952 | ||
04cb2f28 | 8953 | #: builtin/repack.c:161 |
90314792 JX |
8954 | msgid "same as -a, and turn unreachable objects loose" |
8955 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
8956 | ||
04cb2f28 | 8957 | #: builtin/repack.c:164 |
90314792 JX |
8958 | msgid "remove redundant packs, and run git-prune-packed" |
8959 | msgstr "删除多余的包,运行 git-prune-packed" | |
8960 | ||
04cb2f28 | 8961 | #: builtin/repack.c:166 |
90314792 JX |
8962 | msgid "pass --no-reuse-delta to git-pack-objects" |
8963 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
8964 | ||
04cb2f28 | 8965 | #: builtin/repack.c:168 |
90314792 JX |
8966 | msgid "pass --no-reuse-object to git-pack-objects" |
8967 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
8968 | ||
04cb2f28 | 8969 | #: builtin/repack.c:170 |
90314792 JX |
8970 | msgid "do not run git-update-server-info" |
8971 | msgstr "不运行 git-update-server-info" | |
8972 | ||
04cb2f28 | 8973 | #: builtin/repack.c:173 |
90314792 JX |
8974 | msgid "pass --local to git-pack-objects" |
8975 | msgstr "向 git-pack-objects 传递参数 --local" | |
8976 | ||
04cb2f28 | 8977 | #: builtin/repack.c:175 |
6c94aba5 JX |
8978 | msgid "write bitmap index" |
8979 | msgstr "写 bitmap 索引" | |
8980 | ||
04cb2f28 | 8981 | #: builtin/repack.c:176 |
90314792 JX |
8982 | msgid "approxidate" |
8983 | msgstr "近似日期" | |
8984 | ||
04cb2f28 | 8985 | #: builtin/repack.c:177 |
90314792 JX |
8986 | msgid "with -A, do not loosen objects older than this" |
8987 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
8988 | ||
04cb2f28 | 8989 | #: builtin/repack.c:179 |
90314792 JX |
8990 | msgid "size of the window used for delta compression" |
8991 | msgstr "用于增量压缩的窗口值" | |
8992 | ||
04cb2f28 | 8993 | #: builtin/repack.c:180 builtin/repack.c:184 |
8376b58d JX |
8994 | msgid "bytes" |
8995 | msgstr "字节" | |
8996 | ||
04cb2f28 | 8997 | #: builtin/repack.c:181 |
90314792 JX |
8998 | msgid "same as the above, but limit memory size instead of entries count" |
8999 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
9000 | ||
04cb2f28 | 9001 | #: builtin/repack.c:183 |
90314792 JX |
9002 | msgid "limits the maximum delta depth" |
9003 | msgstr "限制最大增量深度" | |
9004 | ||
04cb2f28 | 9005 | #: builtin/repack.c:185 |
90314792 JX |
9006 | msgid "maximum size of each packfile" |
9007 | msgstr "每个包的最大尺寸" | |
9008 | ||
04cb2f28 | 9009 | #: builtin/repack.c:187 |
6c94aba5 JX |
9010 | msgid "repack objects in packs marked with .keep" |
9011 | msgstr "对标记为 .keep 的包中的对象重新打包" | |
9012 | ||
7aea43ff | 9013 | #: builtin/repack.c:377 |
90314792 JX |
9014 | #, c-format |
9015 | msgid "removing '%s' failed" | |
9016 | msgstr "删除 '%s' 失败" | |
9017 | ||
6acbf033 | 9018 | #: builtin/replace.c:19 |
ef317cd5 | 9019 | msgid "git replace [-f] <object> <replacement>" |
07432cef | 9020 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 | 9021 | |
6acbf033 JX |
9022 | #: builtin/replace.c:20 |
9023 | msgid "git replace [-f] --edit <object>" | |
9024 | msgstr "git replace [-f] --edit <对象>" | |
9025 | ||
9026 | #: builtin/replace.c:21 | |
9027 | msgid "git replace [-f] --graft <commit> [<parent>...]" | |
9028 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" | |
9029 | ||
9030 | #: builtin/replace.c:22 | |
ef317cd5 | 9031 | msgid "git replace -d <object>..." |
07432cef | 9032 | msgstr "git replace -d <对象>..." |
ef317cd5 | 9033 | |
6acbf033 | 9034 | #: builtin/replace.c:23 |
cfff71a9 JX |
9035 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
9036 | msgstr "git replace [--format=<格式>] [-l [<模式>]]" | |
ef317cd5 | 9037 | |
220c313c | 9038 | #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 |
6acbf033 JX |
9039 | #, c-format |
9040 | msgid "Not a valid object name: '%s'" | |
9041 | msgstr "不是一个有效的对象名:'%s'" | |
9042 | ||
220c313c | 9043 | #: builtin/replace.c:355 |
6acbf033 JX |
9044 | #, c-format |
9045 | msgid "bad mergetag in commit '%s'" | |
9046 | msgstr "提交 '%s' 中损坏的 mergetag" | |
9047 | ||
220c313c | 9048 | #: builtin/replace.c:357 |
6acbf033 JX |
9049 | #, c-format |
9050 | msgid "malformed mergetag in commit '%s'" | |
9051 | msgstr "提交 '%s' 中非法的 mergetag" | |
9052 | ||
220c313c | 9053 | #: builtin/replace.c:368 |
6acbf033 JX |
9054 | #, c-format |
9055 | msgid "" | |
9056 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
9057 | "instead of --graft" | |
9058 | msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s',使用 --edit 代替 --graft" | |
9059 | ||
220c313c | 9060 | #: builtin/replace.c:401 |
6acbf033 JX |
9061 | #, c-format |
9062 | msgid "the original commit '%s' has a gpg signature." | |
9063 | msgstr "原始提交 '%s' 中包含一个 GPG 签名" | |
9064 | ||
220c313c | 9065 | #: builtin/replace.c:402 |
6acbf033 JX |
9066 | msgid "the signature will be removed in the replacement commit!" |
9067 | msgstr "在替换的提交中签名将被移除!" | |
9068 | ||
220c313c | 9069 | #: builtin/replace.c:408 |
6acbf033 JX |
9070 | #, c-format |
9071 | msgid "could not write replacement commit for: '%s'" | |
9072 | msgstr "不能为 '%s' 写替换提交" | |
9073 | ||
220c313c | 9074 | #: builtin/replace.c:432 |
ef317cd5 | 9075 | msgid "list replace refs" |
07432cef | 9076 | msgstr "列出替换的引用" |
ef317cd5 | 9077 | |
220c313c | 9078 | #: builtin/replace.c:433 |
ef317cd5 | 9079 | msgid "delete replace refs" |
07432cef | 9080 | msgstr "删除替换的引用" |
ef317cd5 | 9081 | |
220c313c | 9082 | #: builtin/replace.c:434 |
6acbf033 JX |
9083 | msgid "edit existing object" |
9084 | msgstr "编辑现存的对象" | |
9085 | ||
220c313c | 9086 | #: builtin/replace.c:435 |
6acbf033 JX |
9087 | msgid "change a commit's parents" |
9088 | msgstr "修改一个提交的父提交" | |
9089 | ||
220c313c | 9090 | #: builtin/replace.c:436 |
ef317cd5 | 9091 | msgid "replace the ref if it exists" |
07432cef | 9092 | msgstr "如果存在则替换引用" |
ef317cd5 | 9093 | |
220c313c | 9094 | #: builtin/replace.c:437 |
6acbf033 JX |
9095 | msgid "do not pretty-print contents for --edit" |
9096 | msgstr "不要为 --edit 操作美观显示内容" | |
9097 | ||
220c313c | 9098 | #: builtin/replace.c:438 |
cfff71a9 JX |
9099 | msgid "use this format" |
9100 | msgstr "使用此格式" | |
9101 | ||
90314792 | 9102 | #: builtin/rerere.c:12 |
814ff314 JX |
9103 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
9104 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" | |
ef317cd5 | 9105 | |
90314792 | 9106 | #: builtin/rerere.c:57 |
ef317cd5 | 9107 | msgid "register clean resolutions in index" |
07432cef | 9108 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 | 9109 | |
220c313c | 9110 | #: builtin/reset.c:26 |
ef317cd5 JX |
9111 | msgid "" |
9112 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 9113 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 | 9114 | |
220c313c | 9115 | #: builtin/reset.c:27 |
07432cef WS |
9116 | msgid "git reset [-q] <tree-ish> [--] <paths>..." |
9117 | msgstr "git reset [-q] <树或提交> [--] <路径>..." | |
ef317cd5 | 9118 | |
220c313c | 9119 | #: builtin/reset.c:28 |
07432cef WS |
9120 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
9121 | msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" | |
ef317cd5 | 9122 | |
220c313c | 9123 | #: builtin/reset.c:34 |
c04f5ac3 JX |
9124 | msgid "mixed" |
9125 | msgstr "混杂" | |
9126 | ||
220c313c | 9127 | #: builtin/reset.c:34 |
c04f5ac3 JX |
9128 | msgid "soft" |
9129 | msgstr "软性" | |
9130 | ||
220c313c | 9131 | #: builtin/reset.c:34 |
c04f5ac3 JX |
9132 | msgid "hard" |
9133 | msgstr "硬性" | |
9134 | ||
220c313c | 9135 | #: builtin/reset.c:34 |
8ada9598 JX |
9136 | msgid "merge" |
9137 | msgstr "合并" | |
9138 | ||
220c313c | 9139 | #: builtin/reset.c:34 |
c04f5ac3 JX |
9140 | msgid "keep" |
9141 | msgstr "保持" | |
9142 | ||
220c313c | 9143 | #: builtin/reset.c:74 |
c04f5ac3 JX |
9144 | msgid "You do not have a valid HEAD." |
9145 | msgstr "您没有一个有效的 HEAD。" | |
9146 | ||
220c313c | 9147 | #: builtin/reset.c:76 |
c04f5ac3 JX |
9148 | msgid "Failed to find tree of HEAD." |
9149 | msgstr "无法找到 HEAD 指向的树。" | |
9150 | ||
220c313c | 9151 | #: builtin/reset.c:82 |
c04f5ac3 JX |
9152 | #, c-format |
9153 | msgid "Failed to find tree of %s." | |
9154 | msgstr "无法找到 %s 指向的树。" | |
9155 | ||
220c313c | 9156 | #: builtin/reset.c:100 |
c04f5ac3 JX |
9157 | #, c-format |
9158 | msgid "HEAD is now at %s" | |
9159 | msgstr "HEAD 现在位于 %s" | |
9160 | ||
90e6ef53 | 9161 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 9162 | #: builtin/reset.c:183 |
c04f5ac3 JX |
9163 | #, c-format |
9164 | msgid "Cannot do a %s reset in the middle of a merge." | |
9165 | msgstr "在合并过程中不能做%s重置操作。" | |
9166 | ||
220c313c | 9167 | #: builtin/reset.c:276 |
ef317cd5 | 9168 | msgid "be quiet, only report errors" |
07432cef | 9169 | msgstr "安静模式,只报告错误" |
ef317cd5 | 9170 | |
220c313c | 9171 | #: builtin/reset.c:278 |
ef317cd5 | 9172 | msgid "reset HEAD and index" |
07432cef | 9173 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 9174 | |
220c313c | 9175 | #: builtin/reset.c:279 |
ef317cd5 | 9176 | msgid "reset only HEAD" |
07432cef | 9177 | msgstr "只重置 HEAD" |
ef317cd5 | 9178 | |
220c313c | 9179 | #: builtin/reset.c:281 builtin/reset.c:283 |
ef317cd5 | 9180 | msgid "reset HEAD, index and working tree" |
07432cef | 9181 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 9182 | |
220c313c | 9183 | #: builtin/reset.c:285 |
ef317cd5 | 9184 | msgid "reset HEAD but keep local changes" |
07432cef | 9185 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 9186 | |
220c313c | 9187 | #: builtin/reset.c:288 |
6c94aba5 JX |
9188 | msgid "record only the fact that removed paths will be added later" |
9189 | msgstr "将删除的路径标记为稍后添加" | |
9190 | ||
220c313c | 9191 | #: builtin/reset.c:305 |
07432cef WS |
9192 | #, c-format |
9193 | msgid "Failed to resolve '%s' as a valid revision." | |
9194 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
9195 | ||
220c313c | 9196 | #: builtin/reset.c:308 builtin/reset.c:316 |
c04f5ac3 JX |
9197 | #, c-format |
9198 | msgid "Could not parse object '%s'." | |
9199 | msgstr "不能解析对象 '%s'。" | |
9200 | ||
220c313c | 9201 | #: builtin/reset.c:313 |
07432cef WS |
9202 | #, c-format |
9203 | msgid "Failed to resolve '%s' as a valid tree." | |
9204 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
9205 | ||
220c313c | 9206 | #: builtin/reset.c:322 |
c04f5ac3 | 9207 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 9208 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 9209 | |
220c313c | 9210 | #: builtin/reset.c:331 |
c04f5ac3 | 9211 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
d9d56b23 | 9212 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
c04f5ac3 | 9213 | |
90e6ef53 | 9214 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 9215 | #: builtin/reset.c:333 |
c04f5ac3 JX |
9216 | #, c-format |
9217 | msgid "Cannot do %s reset with paths." | |
9218 | msgstr "不能带路径进行%s重置。" | |
9219 | ||
90e6ef53 | 9220 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 9221 | #: builtin/reset.c:343 |
c04f5ac3 JX |
9222 | #, c-format |
9223 | msgid "%s reset is not allowed in a bare repository" | |
220c313c | 9224 | msgstr "不能对纯版本库进行%s重置" |
c04f5ac3 | 9225 | |
220c313c | 9226 | #: builtin/reset.c:347 |
6c94aba5 JX |
9227 | msgid "-N can only be used with --mixed" |
9228 | msgstr "-N 只能和 --mixed 同时使用" | |
9229 | ||
220c313c | 9230 | #: builtin/reset.c:364 |
90314792 JX |
9231 | msgid "Unstaged changes after reset:" |
9232 | msgstr "重置后撤出暂存区的变更:" | |
9233 | ||
220c313c | 9234 | #: builtin/reset.c:370 |
ef317cd5 JX |
9235 | #, c-format |
9236 | msgid "Could not reset index file to revision '%s'." | |
9237 | msgstr "不能重置索引文件至版本 '%s'。" | |
9238 | ||
220c313c | 9239 | #: builtin/reset.c:374 |
07432cef WS |
9240 | msgid "Could not write new index file." |
9241 | msgstr "不能写入新的索引文件。" | |
9242 | ||
220c313c | 9243 | #: builtin/rev-parse.c:361 |
814ff314 JX |
9244 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
9245 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" | |
ef317cd5 | 9246 | |
220c313c | 9247 | #: builtin/rev-parse.c:366 |
ef317cd5 | 9248 | msgid "keep the `--` passed as an arg" |
07432cef | 9249 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 9250 | |
220c313c | 9251 | #: builtin/rev-parse.c:368 |
ef317cd5 | 9252 | msgid "stop parsing after the first non-option argument" |
07432cef | 9253 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 9254 | |
220c313c | 9255 | #: builtin/rev-parse.c:371 |
cfff71a9 JX |
9256 | msgid "output in stuck long form" |
9257 | msgstr "以固定长格式输出" | |
9258 | ||
220c313c | 9259 | #: builtin/rev-parse.c:499 |
ef317cd5 | 9260 | msgid "" |
814ff314 | 9261 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
ef317cd5 | 9262 | " or: git rev-parse --sq-quote [<arg>...]\n" |
814ff314 | 9263 | " or: git rev-parse [<options>] [<arg>...]\n" |
ef317cd5 JX |
9264 | "\n" |
9265 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
9266 | msgstr "" | |
814ff314 | 9267 | "git rev-parse --parseopt [<选项>] -- [<参数>...]\n" |
90314792 | 9268 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
814ff314 | 9269 | " 或者:git rev-parse [<选项>] [<参数>...]\n" |
07432cef WS |
9270 | "\n" |
9271 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" | |
ef317cd5 JX |
9272 | |
9273 | #: builtin/revert.c:22 | |
814ff314 JX |
9274 | msgid "git revert [<options>] <commit-ish>..." |
9275 | msgstr "git revert [<选项>] <提交号>..." | |
ef317cd5 JX |
9276 | |
9277 | #: builtin/revert.c:23 | |
9278 | msgid "git revert <subcommand>" | |
07432cef | 9279 | msgstr "git revert <子命令>" |
ef317cd5 JX |
9280 | |
9281 | #: builtin/revert.c:28 | |
814ff314 JX |
9282 | msgid "git cherry-pick [<options>] <commit-ish>..." |
9283 | msgstr "git cherry-pick [<选项>] <提交号>..." | |
ef317cd5 JX |
9284 | |
9285 | #: builtin/revert.c:29 | |
ef317cd5 | 9286 | msgid "git cherry-pick <subcommand>" |
07432cef | 9287 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 9288 | |
90314792 | 9289 | #: builtin/revert.c:71 |
ef317cd5 JX |
9290 | #, c-format |
9291 | msgid "%s: %s cannot be used with %s" | |
9292 | msgstr "%s:%s 不能和 %s 同时使用" | |
9293 | ||
90314792 | 9294 | #: builtin/revert.c:80 |
ef317cd5 | 9295 | msgid "end revert or cherry-pick sequence" |
07432cef | 9296 | msgstr "终止反转或拣选操作" |
ef317cd5 | 9297 | |
90314792 | 9298 | #: builtin/revert.c:81 |
ef317cd5 | 9299 | msgid "resume revert or cherry-pick sequence" |
07432cef | 9300 | msgstr "继续反转或拣选操作" |
ef317cd5 | 9301 | |
90314792 | 9302 | #: builtin/revert.c:82 |
ef317cd5 | 9303 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 9304 | msgstr "取消反转或拣选操作" |
ef317cd5 | 9305 | |
90314792 | 9306 | #: builtin/revert.c:83 |
ef317cd5 | 9307 | msgid "don't automatically commit" |
07432cef | 9308 | msgstr "不要自动提交" |
ef317cd5 | 9309 | |
90314792 | 9310 | #: builtin/revert.c:84 |
ef317cd5 | 9311 | msgid "edit the commit message" |
07432cef | 9312 | msgstr "编辑提交说明" |
ef317cd5 | 9313 | |
90314792 | 9314 | #: builtin/revert.c:87 |
ef317cd5 | 9315 | msgid "parent number" |
07432cef | 9316 | msgstr "父编号" |
ef317cd5 | 9317 | |
90314792 | 9318 | #: builtin/revert.c:89 |
ef317cd5 | 9319 | msgid "merge strategy" |
07432cef | 9320 | msgstr "合并策略" |
ef317cd5 | 9321 | |
90314792 | 9322 | #: builtin/revert.c:90 |
ef317cd5 | 9323 | msgid "option" |
07432cef | 9324 | msgstr "选项" |
ef317cd5 | 9325 | |
90314792 | 9326 | #: builtin/revert.c:91 |
ef317cd5 | 9327 | msgid "option for merge strategy" |
07432cef | 9328 | msgstr "合并策略的选项" |
ef317cd5 | 9329 | |
6c94aba5 | 9330 | #: builtin/revert.c:104 |
ef317cd5 | 9331 | msgid "append commit name" |
07432cef | 9332 | msgstr "追加提交名称" |
ef317cd5 | 9333 | |
6c94aba5 | 9334 | #: builtin/revert.c:105 |
ef317cd5 | 9335 | msgid "allow fast-forward" |
07432cef | 9336 | msgstr "允许快进式" |
c04f5ac3 | 9337 | |
6c94aba5 | 9338 | #: builtin/revert.c:106 |
ef317cd5 | 9339 | msgid "preserve initially empty commits" |
07432cef | 9340 | msgstr "保留初始化的空提交" |
ef317cd5 | 9341 | |
6c94aba5 | 9342 | #: builtin/revert.c:107 |
ef317cd5 | 9343 | msgid "allow commits with empty messages" |
07432cef | 9344 | msgstr "允许提交说明为空" |
c04f5ac3 | 9345 | |
6c94aba5 | 9346 | #: builtin/revert.c:108 |
ef317cd5 | 9347 | msgid "keep redundant, empty commits" |
07432cef | 9348 | msgstr "保持多余的、空的提交" |
ef317cd5 | 9349 | |
6c94aba5 | 9350 | #: builtin/revert.c:112 |
c04f5ac3 JX |
9351 | msgid "program error" |
9352 | msgstr "程序错误" | |
9353 | ||
6c94aba5 | 9354 | #: builtin/revert.c:197 |
c04f5ac3 JX |
9355 | msgid "revert failed" |
9356 | msgstr "还原失败" | |
9357 | ||
6c94aba5 | 9358 | #: builtin/revert.c:212 |
c04f5ac3 JX |
9359 | msgid "cherry-pick failed" |
9360 | msgstr "拣选失败" | |
9361 | ||
90314792 | 9362 | #: builtin/rm.c:17 |
814ff314 JX |
9363 | msgid "git rm [<options>] [--] <file>..." |
9364 | msgstr "git rm [<选项>] [--] <文件>..." | |
07432cef | 9365 | |
90314792 | 9366 | #: builtin/rm.c:65 |
2e8451e8 JX |
9367 | msgid "" |
9368 | "the following submodule (or one of its nested submodules)\n" | |
9369 | "uses a .git directory:" | |
9370 | msgid_plural "" | |
220c313c | 9371 | "the following submodules (or one of their nested submodules)\n" |
2e8451e8 | 9372 | "use a .git directory:" |
220c313c JX |
9373 | msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" |
9374 | msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" | |
2e8451e8 | 9375 | |
90314792 | 9376 | #: builtin/rm.c:71 |
07432cef | 9377 | msgid "" |
2e8451e8 | 9378 | "\n" |
07432cef WS |
9379 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
9380 | msgstr "" | |
2e8451e8 | 9381 | "\n" |
07432cef | 9382 | "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" |
ef317cd5 | 9383 | |
7aea43ff | 9384 | #: builtin/rm.c:230 |
c04f5ac3 | 9385 | msgid "" |
2e8451e8 JX |
9386 | "the following file has staged content different from both the\n" |
9387 | "file and the HEAD:" | |
9388 | msgid_plural "" | |
9389 | "the following files have staged content different from both the\n" | |
9390 | "file and the HEAD:" | |
9391 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
9392 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
9393 | ||
7aea43ff | 9394 | #: builtin/rm.c:235 |
2e8451e8 JX |
9395 | msgid "" |
9396 | "\n" | |
c04f5ac3 JX |
9397 | "(use -f to force removal)" |
9398 | msgstr "" | |
2e8451e8 | 9399 | "\n" |
c04f5ac3 JX |
9400 | "(使用 -f 强制删除)" |
9401 | ||
7aea43ff | 9402 | #: builtin/rm.c:239 |
2e8451e8 JX |
9403 | msgid "the following file has changes staged in the index:" |
9404 | msgid_plural "the following files have changes staged in the index:" | |
9405 | msgstr[0] "如下文件相对索引区的内容有修改" | |
9406 | msgstr[1] "如下文件相对索引区的内容有修改" | |
c04f5ac3 | 9407 | |
7aea43ff | 9408 | #: builtin/rm.c:243 builtin/rm.c:254 |
c04f5ac3 | 9409 | msgid "" |
2e8451e8 | 9410 | "\n" |
c04f5ac3 JX |
9411 | "(use --cached to keep the file, or -f to force removal)" |
9412 | msgstr "" | |
2e8451e8 JX |
9413 | "\n" |
9414 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
9415 | ||
7aea43ff | 9416 | #: builtin/rm.c:251 |
2e8451e8 JX |
9417 | msgid "the following file has local modifications:" |
9418 | msgid_plural "the following files have local modifications:" | |
9419 | msgstr[0] "如下文件有本地修改:" | |
9420 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 9421 | |
7aea43ff | 9422 | #: builtin/rm.c:269 |
ef317cd5 | 9423 | msgid "do not list removed files" |
07432cef | 9424 | msgstr "不列出删除的文件" |
ef317cd5 | 9425 | |
7aea43ff | 9426 | #: builtin/rm.c:270 |
ef317cd5 | 9427 | msgid "only remove from the index" |
07432cef | 9428 | msgstr "只从索引区删除" |
ef317cd5 | 9429 | |
7aea43ff | 9430 | #: builtin/rm.c:271 |
ef317cd5 | 9431 | msgid "override the up-to-date check" |
07432cef | 9432 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 9433 | |
7aea43ff | 9434 | #: builtin/rm.c:272 |
ef317cd5 | 9435 | msgid "allow recursive removal" |
07432cef | 9436 | msgstr "允许递归删除" |
ef317cd5 | 9437 | |
7aea43ff | 9438 | #: builtin/rm.c:274 |
ef317cd5 | 9439 | msgid "exit with a zero status even if nothing matched" |
07432cef | 9440 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 9441 | |
7aea43ff | 9442 | #: builtin/rm.c:317 |
220c313c JX |
9443 | msgid "Please, stage your changes to .gitmodules or stash them to proceed" |
9444 | msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" | |
9445 | ||
7aea43ff | 9446 | #: builtin/rm.c:335 |
c04f5ac3 JX |
9447 | #, c-format |
9448 | msgid "not removing '%s' recursively without -r" | |
9449 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
9450 | ||
7aea43ff | 9451 | #: builtin/rm.c:374 |
c04f5ac3 JX |
9452 | #, c-format |
9453 | msgid "git rm: unable to remove %s" | |
9454 | msgstr "git rm:不能删除 %s" | |
9455 | ||
ef317cd5 | 9456 | #: builtin/shortlog.c:13 |
814ff314 | 9457 | msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" |
4dcdc3d8 | 9458 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" |
ef317cd5 | 9459 | |
4dcdc3d8 | 9460 | #: builtin/shortlog.c:131 |
c04f5ac3 JX |
9461 | #, c-format |
9462 | msgid "Missing author: %s" | |
9463 | msgstr "缺少作者:%s" | |
9464 | ||
90314792 | 9465 | #: builtin/shortlog.c:230 |
ef317cd5 | 9466 | msgid "sort output according to the number of commits per author" |
07432cef | 9467 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 9468 | |
90314792 | 9469 | #: builtin/shortlog.c:232 |
ef317cd5 | 9470 | msgid "Suppress commit descriptions, only provides commit count" |
07432cef | 9471 | msgstr "隐藏提交说明,只提供提交数量" |
ef317cd5 | 9472 | |
90314792 | 9473 | #: builtin/shortlog.c:234 |
ef317cd5 | 9474 | msgid "Show the email address of each author" |
07432cef | 9475 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 9476 | |
90314792 | 9477 | #: builtin/shortlog.c:235 |
ef317cd5 | 9478 | msgid "w[,i1[,i2]]" |
07432cef | 9479 | msgstr "w[,i1[,i2]]" |
ef317cd5 | 9480 | |
90314792 | 9481 | #: builtin/shortlog.c:236 |
ef317cd5 | 9482 | msgid "Linewrap output" |
07432cef | 9483 | msgstr "折行输出" |
ef317cd5 JX |
9484 | |
9485 | #: builtin/show-branch.c:9 | |
9486 | msgid "" | |
814ff314 | 9487 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
9488 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
9489 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
9490 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
ef317cd5 | 9491 | msgstr "" |
814ff314 | 9492 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
9493 | "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" |
9494 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
9495 | "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" | |
ef317cd5 | 9496 | |
d9d56b23 | 9497 | #: builtin/show-branch.c:13 |
814ff314 JX |
9498 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
9499 | msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" | |
ef317cd5 | 9500 | |
7aea43ff | 9501 | #: builtin/show-branch.c:659 |
ef317cd5 | 9502 | msgid "show remote-tracking and local branches" |
07432cef | 9503 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 9504 | |
7aea43ff | 9505 | #: builtin/show-branch.c:661 |
ef317cd5 | 9506 | msgid "show remote-tracking branches" |
07432cef | 9507 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 9508 | |
7aea43ff | 9509 | #: builtin/show-branch.c:663 |
ef317cd5 | 9510 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 9511 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 9512 | |
7aea43ff | 9513 | #: builtin/show-branch.c:665 |
ef317cd5 | 9514 | msgid "show <n> more commits after the common ancestor" |
07432cef | 9515 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 9516 | |
7aea43ff | 9517 | #: builtin/show-branch.c:667 |
ef317cd5 | 9518 | msgid "synonym to more=-1" |
07432cef | 9519 | msgstr "和 more=-1 同义" |
ef317cd5 | 9520 | |
7aea43ff | 9521 | #: builtin/show-branch.c:668 |
ef317cd5 | 9522 | msgid "suppress naming strings" |
07432cef | 9523 | msgstr "不显示字符串命名" |
ef317cd5 | 9524 | |
7aea43ff | 9525 | #: builtin/show-branch.c:670 |
ef317cd5 | 9526 | msgid "include the current branch" |
07432cef | 9527 | msgstr "包括当前分支" |
ef317cd5 | 9528 | |
7aea43ff | 9529 | #: builtin/show-branch.c:672 |
ef317cd5 | 9530 | msgid "name commits with their object names" |
07432cef | 9531 | msgstr "以对象名字命名提交" |
ef317cd5 | 9532 | |
7aea43ff | 9533 | #: builtin/show-branch.c:674 |
ef317cd5 | 9534 | msgid "show possible merge bases" |
07432cef | 9535 | msgstr "显示可能合并的基线" |
ef317cd5 | 9536 | |
7aea43ff | 9537 | #: builtin/show-branch.c:676 |
ef317cd5 | 9538 | msgid "show refs unreachable from any other ref" |
07432cef | 9539 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 9540 | |
7aea43ff | 9541 | #: builtin/show-branch.c:678 |
ef317cd5 | 9542 | msgid "show commits in topological order" |
07432cef | 9543 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 9544 | |
7aea43ff | 9545 | #: builtin/show-branch.c:681 |
ef317cd5 | 9546 | msgid "show only commits not on the first branch" |
07432cef | 9547 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 9548 | |
7aea43ff | 9549 | #: builtin/show-branch.c:683 |
ef317cd5 | 9550 | msgid "show merges reachable from only one tip" |
07432cef | 9551 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 9552 | |
7aea43ff | 9553 | #: builtin/show-branch.c:685 |
2e8451e8 JX |
9554 | msgid "topologically sort, maintaining date order where possible" |
9555 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 9556 | |
7aea43ff | 9557 | #: builtin/show-branch.c:688 |
ef317cd5 | 9558 | msgid "<n>[,<base>]" |
07432cef | 9559 | msgstr "<n>[,<base>]" |
ef317cd5 | 9560 | |
7aea43ff | 9561 | #: builtin/show-branch.c:689 |
ef317cd5 | 9562 | msgid "show <n> most recent ref-log entries starting at base" |
07432cef | 9563 | msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" |
ef317cd5 JX |
9564 | |
9565 | #: builtin/show-ref.c:10 | |
9566 | msgid "" | |
814ff314 JX |
9567 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
9568 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
ef317cd5 | 9569 | msgstr "" |
814ff314 JX |
9570 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
9571 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" | |
ef317cd5 JX |
9572 | |
9573 | #: builtin/show-ref.c:11 | |
9574 | msgid "git show-ref --exclude-existing[=pattern] < ref-list" | |
07432cef | 9575 | msgstr "git show-ref --exclude-existing[=模式] < 引用列表" |
ef317cd5 | 9576 | |
7aea43ff | 9577 | #: builtin/show-ref.c:170 |
ef317cd5 | 9578 | msgid "only show tags (can be combined with heads)" |
07432cef | 9579 | msgstr "只显示 tags(可以和头共用)" |
ef317cd5 | 9580 | |
7aea43ff | 9581 | #: builtin/show-ref.c:171 |
ef317cd5 | 9582 | msgid "only show heads (can be combined with tags)" |
07432cef | 9583 | msgstr "只显示头(可以和 tags 共用)" |
ef317cd5 | 9584 | |
7aea43ff | 9585 | #: builtin/show-ref.c:172 |
ef317cd5 | 9586 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 9587 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 9588 | |
7aea43ff | 9589 | #: builtin/show-ref.c:175 builtin/show-ref.c:177 |
2e8451e8 JX |
9590 | msgid "show the HEAD reference, even if it would be filtered out" |
9591 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 9592 | |
7aea43ff | 9593 | #: builtin/show-ref.c:179 |
ef317cd5 | 9594 | msgid "dereference tags into object IDs" |
07432cef | 9595 | msgstr "转换 tags 到对象ID" |
ef317cd5 | 9596 | |
7aea43ff | 9597 | #: builtin/show-ref.c:181 |
ef317cd5 | 9598 | msgid "only show SHA1 hash using <n> digits" |
07432cef | 9599 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" |
ef317cd5 | 9600 | |
7aea43ff | 9601 | #: builtin/show-ref.c:185 |
ef317cd5 | 9602 | msgid "do not print results to stdout (useful with --verify)" |
07432cef | 9603 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" |
ef317cd5 | 9604 | |
7aea43ff | 9605 | #: builtin/show-ref.c:187 |
ef317cd5 | 9606 | msgid "show refs from stdin that aren't in local repository" |
07432cef | 9607 | msgstr "显示从标准输入中读入的不在本地版本库中的引用" |
ef317cd5 JX |
9608 | |
9609 | #: builtin/symbolic-ref.c:7 | |
814ff314 JX |
9610 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
9611 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" | |
07432cef WS |
9612 | |
9613 | #: builtin/symbolic-ref.c:8 | |
814ff314 JX |
9614 | msgid "git symbolic-ref -d [-q] <name>" |
9615 | msgstr "git symbolic-ref -d [-q] <名称>" | |
ef317cd5 | 9616 | |
07432cef | 9617 | #: builtin/symbolic-ref.c:40 |
ef317cd5 | 9618 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
9619 | msgstr "不显示非符号(分离的)引用的错误信息" |
9620 | ||
9621 | #: builtin/symbolic-ref.c:41 | |
9622 | msgid "delete symbolic ref" | |
9623 | msgstr "删除符号引用" | |
ef317cd5 | 9624 | |
07432cef | 9625 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 9626 | msgid "shorten ref output" |
07432cef | 9627 | msgstr "简短的引用输出" |
ef317cd5 | 9628 | |
04cb2f28 | 9629 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 |
ef317cd5 | 9630 | msgid "reason" |
07432cef | 9631 | msgstr "原因" |
ef317cd5 | 9632 | |
04cb2f28 | 9633 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 |
ef317cd5 | 9634 | msgid "reason of the update" |
07432cef | 9635 | msgstr "更新的原因" |
ef317cd5 JX |
9636 | |
9637 | #: builtin/tag.c:22 | |
9638 | msgid "" | |
814ff314 JX |
9639 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " |
9640 | "[<head>]" | |
9641 | msgstr "" | |
9642 | "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" | |
ef317cd5 JX |
9643 | |
9644 | #: builtin/tag.c:23 | |
9645 | msgid "git tag -d <tagname>..." | |
07432cef | 9646 | msgstr "git tag -d <标签名>..." |
ef317cd5 JX |
9647 | |
9648 | #: builtin/tag.c:24 | |
9649 | msgid "" | |
814ff314 | 9650 | "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" |
ef317cd5 JX |
9651 | "\t\t[<pattern>...]" |
9652 | msgstr "" | |
814ff314 | 9653 | "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]" |
ef317cd5 JX |
9654 | |
9655 | #: builtin/tag.c:26 | |
9656 | msgid "git tag -v <tagname>..." | |
07432cef | 9657 | msgstr "git tag -v <标签名>..." |
ef317cd5 | 9658 | |
6acbf033 | 9659 | #: builtin/tag.c:69 |
7ac1c0ad JX |
9660 | #, c-format |
9661 | msgid "malformed object at '%s'" | |
9662 | msgstr "非法的对象于 '%s'" | |
9663 | ||
6acbf033 | 9664 | #: builtin/tag.c:301 |
c04f5ac3 JX |
9665 | #, c-format |
9666 | msgid "tag name too long: %.*s..." | |
9667 | msgstr "tag 名字太长:%.*s..." | |
9668 | ||
6acbf033 | 9669 | #: builtin/tag.c:306 |
c04f5ac3 JX |
9670 | #, c-format |
9671 | msgid "tag '%s' not found." | |
9672 | msgstr "tag '%s' 未发现。" | |
9673 | ||
6acbf033 | 9674 | #: builtin/tag.c:321 |
c04f5ac3 JX |
9675 | #, c-format |
9676 | msgid "Deleted tag '%s' (was %s)\n" | |
9677 | msgstr "已删除 tag '%s'(曾为 %s)\n" | |
9678 | ||
6acbf033 | 9679 | #: builtin/tag.c:333 |
c04f5ac3 JX |
9680 | #, c-format |
9681 | msgid "could not verify the tag '%s'" | |
9682 | msgstr "不能校验 tag '%s'" | |
9683 | ||
6acbf033 | 9684 | #: builtin/tag.c:343 |
a77c07d9 | 9685 | #, c-format |
c04f5ac3 JX |
9686 | msgid "" |
9687 | "\n" | |
6acbf033 JX |
9688 | "Write a message for tag:\n" |
9689 | " %s\n" | |
a77c07d9 | 9690 | "Lines starting with '%c' will be ignored.\n" |
c04f5ac3 JX |
9691 | msgstr "" |
9692 | "\n" | |
6acbf033 JX |
9693 | "输入一个 tag 说明:\n" |
9694 | " %s\n" | |
a77c07d9 | 9695 | "以 '%c' 开头的行将被忽略。\n" |
c04f5ac3 | 9696 | |
6acbf033 | 9697 | #: builtin/tag.c:347 |
a77c07d9 | 9698 | #, c-format |
c04f5ac3 JX |
9699 | msgid "" |
9700 | "\n" | |
6acbf033 JX |
9701 | "Write a message for tag:\n" |
9702 | " %s\n" | |
a77c07d9 | 9703 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
c04f5ac3 | 9704 | "want to.\n" |
c04f5ac3 JX |
9705 | msgstr "" |
9706 | "\n" | |
6acbf033 JX |
9707 | "输入一个 tag 说明:\n" |
9708 | " %s\n" | |
a77c07d9 | 9709 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
c04f5ac3 | 9710 | |
6acbf033 JX |
9711 | #: builtin/tag.c:371 |
9712 | #, c-format | |
9713 | msgid "unsupported sort specification '%s'" | |
9714 | msgstr "不支持的排序规格 '%s'" | |
9715 | ||
9716 | #: builtin/tag.c:373 | |
9717 | #, c-format | |
9718 | msgid "unsupported sort specification '%s' in variable '%s'" | |
9719 | msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'" | |
9720 | ||
9721 | #: builtin/tag.c:428 | |
c04f5ac3 JX |
9722 | msgid "unable to sign the tag" |
9723 | msgstr "无法签署 tag" | |
9724 | ||
6acbf033 | 9725 | #: builtin/tag.c:430 |
c04f5ac3 JX |
9726 | msgid "unable to write tag file" |
9727 | msgstr "无法写 tag 文件" | |
9728 | ||
6acbf033 | 9729 | #: builtin/tag.c:455 |
c04f5ac3 | 9730 | msgid "bad object type." |
90e6ef53 | 9731 | msgstr "坏的对象类型。" |
c04f5ac3 | 9732 | |
6acbf033 | 9733 | #: builtin/tag.c:468 |
c04f5ac3 | 9734 | msgid "tag header too big." |
90e6ef53 | 9735 | msgstr "tag 头信息太大。" |
c04f5ac3 | 9736 | |
6acbf033 | 9737 | #: builtin/tag.c:504 |
c04f5ac3 JX |
9738 | msgid "no tag message?" |
9739 | msgstr "无 tag 说明?" | |
9740 | ||
6acbf033 | 9741 | #: builtin/tag.c:510 |
c04f5ac3 JX |
9742 | #, c-format |
9743 | msgid "The tag message has been left in %s\n" | |
9744 | msgstr "tag 说明被保留在 %s\n" | |
9745 | ||
6acbf033 | 9746 | #: builtin/tag.c:559 |
7ac1c0ad JX |
9747 | msgid "switch 'points-at' requires an object" |
9748 | msgstr "开关 'points-at' 需要一个对象" | |
9749 | ||
6acbf033 | 9750 | #: builtin/tag.c:561 |
7ac1c0ad JX |
9751 | #, c-format |
9752 | msgid "malformed object name '%s'" | |
9753 | msgstr "非法的对象名 '%s'" | |
9754 | ||
220c313c | 9755 | #: builtin/tag.c:589 |
ef317cd5 | 9756 | msgid "list tag names" |
07432cef | 9757 | msgstr "列出tag名称" |
ef317cd5 | 9758 | |
220c313c | 9759 | #: builtin/tag.c:591 |
ef317cd5 | 9760 | msgid "print <n> lines of each tag message" |
07432cef | 9761 | msgstr "每个 tag 信息打印 <n> 行" |
ef317cd5 | 9762 | |
220c313c | 9763 | #: builtin/tag.c:593 |
ef317cd5 | 9764 | msgid "delete tags" |
07432cef | 9765 | msgstr "删除 tags" |
ef317cd5 | 9766 | |
220c313c | 9767 | #: builtin/tag.c:594 |
ef317cd5 | 9768 | msgid "verify tags" |
07432cef | 9769 | msgstr "验证 tags" |
ef317cd5 | 9770 | |
220c313c | 9771 | #: builtin/tag.c:596 |
ef317cd5 | 9772 | msgid "Tag creation options" |
07432cef | 9773 | msgstr "Tag 创建选项" |
ef317cd5 | 9774 | |
220c313c | 9775 | #: builtin/tag.c:598 |
ef317cd5 | 9776 | msgid "annotated tag, needs a message" |
07432cef | 9777 | msgstr "注解 tag,需要一个说明" |
ef317cd5 | 9778 | |
220c313c | 9779 | #: builtin/tag.c:600 |
ef317cd5 | 9780 | msgid "tag message" |
07432cef | 9781 | msgstr "tag 说明" |
ef317cd5 | 9782 | |
220c313c | 9783 | #: builtin/tag.c:602 |
ef317cd5 | 9784 | msgid "annotated and GPG-signed tag" |
07432cef | 9785 | msgstr "注解并 GPG 签名的 tag" |
ef317cd5 | 9786 | |
220c313c | 9787 | #: builtin/tag.c:606 |
ef317cd5 | 9788 | msgid "use another key to sign the tag" |
07432cef | 9789 | msgstr "使用另外的私钥签名 tag" |
ef317cd5 | 9790 | |
220c313c | 9791 | #: builtin/tag.c:607 |
ef317cd5 | 9792 | msgid "replace the tag if exists" |
07432cef | 9793 | msgstr "如果存在,替换现有的 tag" |
ef317cd5 | 9794 | |
814ff314 JX |
9795 | #: builtin/tag.c:609 |
9796 | msgid "Tag listing options" | |
9797 | msgstr "Tag 列表选项" | |
9798 | ||
9799 | #: builtin/tag.c:610 | |
ef317cd5 | 9800 | msgid "show tag list in columns" |
07432cef | 9801 | msgstr "以列的方式显示 tag" |
ef317cd5 | 9802 | |
814ff314 | 9803 | #: builtin/tag.c:612 |
6c94aba5 JX |
9804 | msgid "sort tags" |
9805 | msgstr "排序 tags" | |
9806 | ||
220c313c | 9807 | #: builtin/tag.c:617 builtin/tag.c:623 |
ef317cd5 | 9808 | msgid "print only tags that contain the commit" |
07432cef | 9809 | msgstr "只打印包含提交的tags" |
ef317cd5 | 9810 | |
220c313c | 9811 | #: builtin/tag.c:629 |
ef317cd5 | 9812 | msgid "print only tags of the object" |
07432cef | 9813 | msgstr "只打印tags对象" |
ef317cd5 | 9814 | |
220c313c | 9815 | #: builtin/tag.c:655 |
8ada9598 | 9816 | msgid "--column and -n are incompatible" |
81809b99 | 9817 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 9818 | |
220c313c | 9819 | #: builtin/tag.c:667 |
6c94aba5 JX |
9820 | msgid "--sort and -n are incompatible" |
9821 | msgstr "--sort 和 -n 不兼容" | |
9822 | ||
220c313c | 9823 | #: builtin/tag.c:674 |
c04f5ac3 | 9824 | msgid "-n option is only allowed with -l." |
649900bc | 9825 | msgstr "-n 选项只允许和 -l 同时使用。" |
c04f5ac3 | 9826 | |
220c313c | 9827 | #: builtin/tag.c:676 |
c04f5ac3 | 9828 | msgid "--contains option is only allowed with -l." |
649900bc | 9829 | msgstr "--contains 选项只允许和 -l 同时使用。" |
c04f5ac3 | 9830 | |
220c313c | 9831 | #: builtin/tag.c:678 |
7ac1c0ad | 9832 | msgid "--points-at option is only allowed with -l." |
649900bc | 9833 | msgstr "--points-at 选项只允许和 -l 同时使用。" |
7ac1c0ad | 9834 | |
220c313c | 9835 | #: builtin/tag.c:686 |
c04f5ac3 JX |
9836 | msgid "only one -F or -m option is allowed." |
9837 | msgstr "只允许一个 -F 或 -m 选项。" | |
9838 | ||
220c313c | 9839 | #: builtin/tag.c:706 |
c04f5ac3 JX |
9840 | msgid "too many params" |
9841 | msgstr "太多参数" | |
9842 | ||
220c313c | 9843 | #: builtin/tag.c:712 |
c04f5ac3 JX |
9844 | #, c-format |
9845 | msgid "'%s' is not a valid tag name." | |
90e6ef53 | 9846 | msgstr "'%s' 不是一个有效的tag名称。" |
c04f5ac3 | 9847 | |
220c313c | 9848 | #: builtin/tag.c:717 |
c04f5ac3 JX |
9849 | #, c-format |
9850 | msgid "tag '%s' already exists" | |
9851 | msgstr "tag '%s' 已存在" | |
9852 | ||
220c313c | 9853 | #: builtin/tag.c:741 |
c04f5ac3 JX |
9854 | #, c-format |
9855 | msgid "Updated tag '%s' (was %s)\n" | |
9856 | msgstr "已更新tag '%s'(曾为 %s)\n" | |
9857 | ||
220c313c | 9858 | #: builtin/unpack-objects.c:489 |
6c94aba5 JX |
9859 | msgid "Unpacking objects" |
9860 | msgstr "展开对象中" | |
9861 | ||
7aea43ff JX |
9862 | #: builtin/update-index.c:70 |
9863 | #, c-format | |
9864 | msgid "failed to create directory %s" | |
9865 | msgstr "无法创建目录 %s" | |
9866 | ||
9867 | #: builtin/update-index.c:76 | |
9868 | #, c-format | |
9869 | msgid "failed to stat %s" | |
9870 | msgstr "无法枚举 %s 状态" | |
9871 | ||
9872 | #: builtin/update-index.c:86 | |
9873 | #, c-format | |
9874 | msgid "failed to create file %s" | |
9875 | msgstr "无法创建文件 %s" | |
9876 | ||
9877 | #: builtin/update-index.c:94 | |
9878 | #, c-format | |
9879 | msgid "failed to delete file %s" | |
9880 | msgstr "无法删除文件 %s" | |
9881 | ||
9882 | #: builtin/update-index.c:101 builtin/update-index.c:203 | |
9883 | #, c-format | |
9884 | msgid "failed to delete directory %s" | |
9885 | msgstr "无法删除目录 %s" | |
9886 | ||
9887 | #: builtin/update-index.c:124 | |
9888 | #, c-format | |
9889 | msgid "Testing " | |
9890 | msgstr "正在测试 " | |
9891 | ||
9892 | #: builtin/update-index.c:136 | |
9893 | msgid "directory stat info does not change after adding a new file" | |
9894 | msgstr "添加一个新文件后,目录的状态信息未改变" | |
9895 | ||
9896 | #: builtin/update-index.c:149 | |
9897 | msgid "directory stat info does not change after adding a new directory" | |
9898 | msgstr "添加一个新目录后,目录的状态信息未改变" | |
9899 | ||
9900 | #: builtin/update-index.c:162 | |
9901 | msgid "directory stat info changes after updating a file" | |
9902 | msgstr "更新一个文件后,目录的状态信息被修改" | |
9903 | ||
9904 | #: builtin/update-index.c:173 | |
9905 | msgid "directory stat info changes after adding a file inside subdirectory" | |
9906 | msgstr "在子目录中添加文件后,目录的状态信息被修改" | |
9907 | ||
9908 | #: builtin/update-index.c:184 | |
9909 | msgid "directory stat info does not change after deleting a file" | |
9910 | msgstr "删除一个文件后,目录的状态信息未改变" | |
9911 | ||
9912 | #: builtin/update-index.c:197 | |
9913 | msgid "directory stat info does not change after deleting a directory" | |
9914 | msgstr "删除一个目录后,目录的状态信息未改变" | |
9915 | ||
9916 | #: builtin/update-index.c:204 | |
9917 | msgid " OK" | |
9918 | msgstr " OK" | |
9919 | ||
9920 | #: builtin/update-index.c:564 | |
814ff314 JX |
9921 | msgid "git update-index [<options>] [--] [<file>...]" |
9922 | msgstr "git update-index [<选项>] [--] [<文件>...]" | |
8ada9598 | 9923 | |
7aea43ff | 9924 | #: builtin/update-index.c:918 |
ef317cd5 | 9925 | msgid "continue refresh even when index needs update" |
07432cef | 9926 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 9927 | |
7aea43ff | 9928 | #: builtin/update-index.c:921 |
ef317cd5 | 9929 | msgid "refresh: ignore submodules" |
07432cef | 9930 | msgstr "刷新:忽略子模组" |
8ada9598 | 9931 | |
7aea43ff | 9932 | #: builtin/update-index.c:924 |
ef317cd5 | 9933 | msgid "do not ignore new files" |
07432cef | 9934 | msgstr "不忽略新的文件" |
8ada9598 | 9935 | |
7aea43ff | 9936 | #: builtin/update-index.c:926 |
ef317cd5 | 9937 | msgid "let files replace directories and vice-versa" |
07432cef | 9938 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 9939 | |
7aea43ff | 9940 | #: builtin/update-index.c:928 |
ef317cd5 | 9941 | msgid "notice files missing from worktree" |
07432cef | 9942 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 9943 | |
7aea43ff | 9944 | #: builtin/update-index.c:930 |
ef317cd5 | 9945 | msgid "refresh even if index contains unmerged entries" |
07432cef | 9946 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 9947 | |
7aea43ff | 9948 | #: builtin/update-index.c:933 |
ef317cd5 | 9949 | msgid "refresh stat information" |
07432cef | 9950 | msgstr "刷新统计信息" |
ef317cd5 | 9951 | |
7aea43ff | 9952 | #: builtin/update-index.c:937 |
ef317cd5 | 9953 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 9954 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 9955 | |
7aea43ff | 9956 | #: builtin/update-index.c:941 |
6c94aba5 | 9957 | msgid "<mode>,<object>,<path>" |
d9d56b23 | 9958 | msgstr "<存取模式>,<对象>,<路径>" |
ef317cd5 | 9959 | |
7aea43ff | 9960 | #: builtin/update-index.c:942 |
ef317cd5 | 9961 | msgid "add the specified entry to the index" |
07432cef | 9962 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 9963 | |
7aea43ff | 9964 | #: builtin/update-index.c:946 |
ef317cd5 | 9965 | msgid "(+/-)x" |
07432cef | 9966 | msgstr "(+/-)x" |
ef317cd5 | 9967 | |
7aea43ff | 9968 | #: builtin/update-index.c:947 |
ef317cd5 | 9969 | msgid "override the executable bit of the listed files" |
07432cef | 9970 | msgstr "覆盖列表里文件的可执行位" |
ef317cd5 | 9971 | |
7aea43ff | 9972 | #: builtin/update-index.c:951 |
ef317cd5 | 9973 | msgid "mark files as \"not changing\"" |
07432cef | 9974 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 9975 | |
7aea43ff | 9976 | #: builtin/update-index.c:954 |
ef317cd5 | 9977 | msgid "clear assumed-unchanged bit" |
07432cef | 9978 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 9979 | |
7aea43ff | 9980 | #: builtin/update-index.c:957 |
ef317cd5 | 9981 | msgid "mark files as \"index-only\"" |
07432cef | 9982 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 9983 | |
7aea43ff | 9984 | #: builtin/update-index.c:960 |
ef317cd5 | 9985 | msgid "clear skip-worktree bit" |
07432cef | 9986 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 9987 | |
7aea43ff | 9988 | #: builtin/update-index.c:963 |
ef317cd5 | 9989 | msgid "add to index only; do not add content to object database" |
07432cef | 9990 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 9991 | |
7aea43ff | 9992 | #: builtin/update-index.c:965 |
ef317cd5 | 9993 | msgid "remove named paths even if present in worktree" |
07432cef | 9994 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 9995 | |
7aea43ff | 9996 | #: builtin/update-index.c:967 |
ef317cd5 | 9997 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 9998 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 9999 | |
7aea43ff | 10000 | #: builtin/update-index.c:969 |
ef317cd5 | 10001 | msgid "read list of paths to be updated from standard input" |
07432cef | 10002 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 10003 | |
7aea43ff | 10004 | #: builtin/update-index.c:973 |
ef317cd5 | 10005 | msgid "add entries from standard input to the index" |
07432cef | 10006 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 10007 | |
7aea43ff | 10008 | #: builtin/update-index.c:977 |
ef317cd5 | 10009 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 10010 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 10011 | |
7aea43ff | 10012 | #: builtin/update-index.c:981 |
ef317cd5 | 10013 | msgid "only update entries that differ from HEAD" |
07432cef | 10014 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 10015 | |
7aea43ff | 10016 | #: builtin/update-index.c:985 |
ef317cd5 | 10017 | msgid "ignore files missing from worktree" |
07432cef | 10018 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 10019 | |
7aea43ff | 10020 | #: builtin/update-index.c:988 |
ef317cd5 | 10021 | msgid "report actions to standard output" |
07432cef | 10022 | msgstr "在标准输出显示操作" |
ef317cd5 | 10023 | |
7aea43ff | 10024 | #: builtin/update-index.c:990 |
ef317cd5 | 10025 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 10026 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 10027 | |
7aea43ff | 10028 | #: builtin/update-index.c:994 |
ef317cd5 | 10029 | msgid "write index in this format" |
07432cef | 10030 | msgstr "以这种格式写入索引区" |
ef317cd5 | 10031 | |
7aea43ff | 10032 | #: builtin/update-index.c:996 |
6acbf033 JX |
10033 | msgid "enable or disable split index" |
10034 | msgstr "启用或禁用索引拆分" | |
10035 | ||
7aea43ff JX |
10036 | #: builtin/update-index.c:998 |
10037 | msgid "enable/disable untracked cache" | |
10038 | msgstr "启用/禁用对未跟踪文件的缓存" | |
10039 | ||
10040 | #: builtin/update-index.c:1000 | |
10041 | msgid "enable untracked cache without testing the filesystem" | |
10042 | msgstr "无需检测文件系统,启用对未跟踪文件的缓存" | |
10043 | ||
90314792 | 10044 | #: builtin/update-ref.c:9 |
814ff314 JX |
10045 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
10046 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" | |
ef317cd5 | 10047 | |
90314792 | 10048 | #: builtin/update-ref.c:10 |
814ff314 JX |
10049 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
10050 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" | |
90314792 JX |
10051 | |
10052 | #: builtin/update-ref.c:11 | |
814ff314 JX |
10053 | msgid "git update-ref [<options>] --stdin [-z]" |
10054 | msgstr "git update-ref [<选项>] --stdin [-z]" | |
ef317cd5 | 10055 | |
04cb2f28 | 10056 | #: builtin/update-ref.c:359 |
ef317cd5 | 10057 | msgid "delete the reference" |
07432cef | 10058 | msgstr "删除引用" |
ef317cd5 | 10059 | |
04cb2f28 | 10060 | #: builtin/update-ref.c:361 |
ef317cd5 | 10061 | msgid "update <refname> not the one it points to" |
07432cef | 10062 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 10063 | |
04cb2f28 | 10064 | #: builtin/update-ref.c:362 |
90314792 JX |
10065 | msgid "stdin has NUL-terminated arguments" |
10066 | msgstr "标准输入有以 NUL 字符终止的参数" | |
10067 | ||
04cb2f28 | 10068 | #: builtin/update-ref.c:363 |
90314792 JX |
10069 | msgid "read updates from stdin" |
10070 | msgstr "从标准输入读取更新" | |
10071 | ||
ef317cd5 JX |
10072 | #: builtin/update-server-info.c:6 |
10073 | msgid "git update-server-info [--force]" | |
07432cef | 10074 | msgstr "git update-server-info [--force]" |
ef317cd5 JX |
10075 | |
10076 | #: builtin/update-server-info.c:14 | |
10077 | msgid "update the info files from scratch" | |
07432cef | 10078 | msgstr "从头开始更新文件信息" |
ef317cd5 | 10079 | |
6acbf033 | 10080 | #: builtin/verify-commit.c:17 |
814ff314 JX |
10081 | msgid "git verify-commit [-v | --verbose] <commit>..." |
10082 | msgstr "git verify-commit [-v | --verbose] <提交>..." | |
6acbf033 JX |
10083 | |
10084 | #: builtin/verify-commit.c:75 | |
10085 | msgid "print commit contents" | |
10086 | msgstr "打印提交内容" | |
10087 | ||
220c313c | 10088 | #: builtin/verify-pack.c:54 |
814ff314 JX |
10089 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
10090 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." | |
ef317cd5 | 10091 | |
220c313c | 10092 | #: builtin/verify-pack.c:64 |
ef317cd5 JX |
10093 | msgid "verbose" |
10094 | msgstr "冗长输出" | |
10095 | ||
220c313c | 10096 | #: builtin/verify-pack.c:66 |
ef317cd5 | 10097 | msgid "show statistics only" |
07432cef | 10098 | msgstr "只显示统计" |
ef317cd5 JX |
10099 | |
10100 | #: builtin/verify-tag.c:17 | |
814ff314 JX |
10101 | msgid "git verify-tag [-v | --verbose] <tag>..." |
10102 | msgstr "git verify-tag [-v | --verbose] <标签>..." | |
ef317cd5 JX |
10103 | |
10104 | #: builtin/verify-tag.c:73 | |
10105 | msgid "print tag contents" | |
07432cef | 10106 | msgstr "打印 tag 内容" |
ef317cd5 | 10107 | |
5bb01d4f JX |
10108 | #: builtin/worktree.c:11 |
10109 | msgid "git worktree add [<options>] <path> <branch>" | |
10110 | msgstr "git worktree add [<选项>] <路径> <分支>" | |
10111 | ||
10112 | #: builtin/worktree.c:12 | |
10113 | msgid "git worktree prune [<options>]" | |
10114 | msgstr "git worktree prune [<选项>]" | |
10115 | ||
10116 | #: builtin/worktree.c:27 | |
10117 | #, c-format | |
10118 | msgid "Removing worktrees/%s: not a valid directory" | |
10119 | msgstr "删除工作区/%s:不是一个有效的目录" | |
10120 | ||
10121 | #: builtin/worktree.c:33 | |
10122 | #, c-format | |
10123 | msgid "Removing worktrees/%s: gitdir file does not exist" | |
10124 | msgstr "删除 worktrees/%s:gitdir 文件不存在" | |
10125 | ||
10126 | #: builtin/worktree.c:38 | |
10127 | #, c-format | |
10128 | msgid "Removing worktrees/%s: unable to read gitdir file (%s)" | |
10129 | msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)" | |
10130 | ||
10131 | #: builtin/worktree.c:49 | |
10132 | #, c-format | |
10133 | msgid "Removing worktrees/%s: invalid gitdir file" | |
10134 | msgstr "删除 worktrees/%s:无效的 gitdir 文件" | |
10135 | ||
10136 | #: builtin/worktree.c:65 | |
10137 | #, c-format | |
10138 | msgid "Removing worktrees/%s: gitdir file points to non-existent location" | |
10139 | msgstr "删除 worktrees/%s:gitdir 文件的指向不存在" | |
10140 | ||
10141 | #: builtin/worktree.c:100 | |
10142 | #, c-format | |
10143 | msgid "failed to remove: %s" | |
10144 | msgstr "无法删除:%s" | |
10145 | ||
10146 | #: builtin/worktree.c:186 | |
10147 | #, c-format | |
10148 | msgid "'%s' already exists" | |
10149 | msgstr "'%s' 已经存在" | |
10150 | ||
10151 | #: builtin/worktree.c:207 | |
10152 | #, c-format | |
10153 | msgid "could not create directory of '%s'" | |
10154 | msgstr "不能创建目录 '%s'" | |
10155 | ||
10156 | #: builtin/worktree.c:241 | |
10157 | msgid "unable to resolve HEAD" | |
10158 | msgstr "不能解析 HEAD" | |
10159 | ||
10160 | #: builtin/worktree.c:249 | |
10161 | #, c-format | |
10162 | msgid "Enter %s (identifier %s)" | |
10163 | msgstr "输入 %s (标识符 %s)" | |
10164 | ||
10165 | #: builtin/worktree.c:281 | |
10166 | msgid "checkout <branch> even if already checked out in other worktree" | |
10167 | msgstr "检出分支 <branch> 即使已经被检出到其它工作区" | |
10168 | ||
10169 | #: builtin/worktree.c:283 | |
10170 | msgid "create a new branch" | |
10171 | msgstr "创建一个新分支" | |
10172 | ||
10173 | #: builtin/worktree.c:285 | |
10174 | msgid "create or reset a branch" | |
10175 | msgstr "创建或重置一个分支" | |
10176 | ||
10177 | #: builtin/worktree.c:286 | |
10178 | msgid "detach HEAD at named commit" | |
10179 | msgstr "HEAD 从指定的提交分离" | |
10180 | ||
10181 | #: builtin/worktree.c:292 | |
10182 | msgid "-b and -B are mutually exclusive" | |
10183 | msgstr "-b 和 -B 互斥" | |
10184 | ||
ef317cd5 JX |
10185 | #: builtin/write-tree.c:13 |
10186 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" | |
07432cef | 10187 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 JX |
10188 | |
10189 | #: builtin/write-tree.c:26 | |
10190 | msgid "<prefix>/" | |
07432cef | 10191 | msgstr "<前缀>/" |
ef317cd5 JX |
10192 | |
10193 | #: builtin/write-tree.c:27 | |
10194 | msgid "write tree object for a subdirectory <prefix>" | |
07432cef | 10195 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 JX |
10196 | |
10197 | #: builtin/write-tree.c:30 | |
10198 | msgid "only useful for debugging" | |
07432cef | 10199 | msgstr "只对调试有用" |
ef317cd5 | 10200 | |
220c313c JX |
10201 | #: credential-cache--daemon.c:267 |
10202 | msgid "print debugging messages to stderr" | |
10203 | msgstr "调试信息输出到标准错误" | |
10204 | ||
d9d56b23 | 10205 | #: git.c:14 |
4dcdc3d8 | 10206 | msgid "" |
220c313c | 10207 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
4dcdc3d8 JX |
10208 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
10209 | "to read about a specific subcommand or concept." | |
10210 | msgstr "" | |
220c313c JX |
10211 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" |
10212 | "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" | |
10213 | "帮助。" | |
8ada9598 | 10214 | |
7aea43ff JX |
10215 | #: common-cmds.h:10 |
10216 | msgid "start a working area (see also: git help tutorial)" | |
10217 | msgstr "开始一个工作区(参见:git help tutorial)" | |
10218 | ||
10219 | #: common-cmds.h:11 | |
10220 | msgid "work on the current change (see also: git help everyday)" | |
10221 | msgstr "在当前变更上工作(参见:git help everyday)" | |
10222 | ||
10223 | #: common-cmds.h:12 | |
10224 | msgid "examine the history and state (see also: git help revisions)" | |
10225 | msgstr "检查历史和状态(参见:git help revisions)" | |
10226 | ||
10227 | #: common-cmds.h:13 | |
10228 | msgid "grow, mark and tweak your common history" | |
10229 | msgstr "扩展、标记和调校您的历史记录" | |
10230 | ||
10231 | #: common-cmds.h:14 | |
10232 | msgid "collaborate (see also: git help workflows)" | |
10233 | msgstr "协同(参见:git help workflows)" | |
10234 | ||
10235 | #: common-cmds.h:18 | |
8ada9598 | 10236 | msgid "Add file contents to the index" |
81809b99 | 10237 | msgstr "添加文件内容至索引" |
8ada9598 | 10238 | |
7aea43ff | 10239 | #: common-cmds.h:19 |
8ada9598 | 10240 | msgid "Find by binary search the change that introduced a bug" |
81809b99 | 10241 | msgstr "通过二分查找定位引入 bug 的变更" |
8ada9598 | 10242 | |
7aea43ff | 10243 | #: common-cmds.h:20 |
8ada9598 | 10244 | msgid "List, create, or delete branches" |
81809b99 | 10245 | msgstr "列出、创建或删除分支" |
8ada9598 | 10246 | |
7aea43ff | 10247 | #: common-cmds.h:21 |
5bb01d4f JX |
10248 | msgid "Switch branches or restore working tree files" |
10249 | msgstr "切换分支或恢复工作区文件" | |
8ada9598 | 10250 | |
7aea43ff | 10251 | #: common-cmds.h:22 |
8ada9598 | 10252 | msgid "Clone a repository into a new directory" |
81809b99 | 10253 | msgstr "克隆一个版本库到一个新目录" |
8ada9598 | 10254 | |
7aea43ff | 10255 | #: common-cmds.h:23 |
8ada9598 | 10256 | msgid "Record changes to the repository" |
81809b99 | 10257 | msgstr "记录变更到版本库" |
8ada9598 | 10258 | |
7aea43ff | 10259 | #: common-cmds.h:24 |
8ada9598 | 10260 | msgid "Show changes between commits, commit and working tree, etc" |
81809b99 | 10261 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 | 10262 | |
7aea43ff | 10263 | #: common-cmds.h:25 |
8ada9598 | 10264 | msgid "Download objects and refs from another repository" |
81809b99 | 10265 | msgstr "从另外一个版本库下载对象和引用" |
8ada9598 | 10266 | |
7aea43ff | 10267 | #: common-cmds.h:26 |
8ada9598 | 10268 | msgid "Print lines matching a pattern" |
81809b99 | 10269 | msgstr "输出和模式匹配的行" |
8ada9598 | 10270 | |
7aea43ff | 10271 | #: common-cmds.h:27 |
a77c07d9 JX |
10272 | msgid "Create an empty Git repository or reinitialize an existing one" |
10273 | msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库" | |
8ada9598 | 10274 | |
7aea43ff | 10275 | #: common-cmds.h:28 |
8ada9598 | 10276 | msgid "Show commit logs" |
81809b99 | 10277 | msgstr "显示提交日志" |
8ada9598 | 10278 | |
7aea43ff | 10279 | #: common-cmds.h:29 |
8ada9598 | 10280 | msgid "Join two or more development histories together" |
81809b99 | 10281 | msgstr "合并两个或更多开发历史" |
8ada9598 | 10282 | |
7aea43ff | 10283 | #: common-cmds.h:30 |
8ada9598 | 10284 | msgid "Move or rename a file, a directory, or a symlink" |
81809b99 | 10285 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 | 10286 | |
7aea43ff | 10287 | #: common-cmds.h:31 |
2e8451e8 JX |
10288 | msgid "Fetch from and integrate with another repository or a local branch" |
10289 | msgstr "获取并整合另外的版本库或一个本地分支" | |
8ada9598 | 10290 | |
7aea43ff | 10291 | #: common-cmds.h:32 |
8ada9598 | 10292 | msgid "Update remote refs along with associated objects" |
81809b99 | 10293 | msgstr "更新远程引用和相关的对象" |
8ada9598 | 10294 | |
7aea43ff | 10295 | #: common-cmds.h:33 |
8ada9598 | 10296 | msgid "Forward-port local commits to the updated upstream head" |
81809b99 | 10297 | msgstr "本地提交转移至更新后的上游分支中" |
8ada9598 | 10298 | |
7aea43ff | 10299 | #: common-cmds.h:34 |
8ada9598 | 10300 | msgid "Reset current HEAD to the specified state" |
81809b99 | 10301 | msgstr "重置当前HEAD到指定状态" |
8ada9598 | 10302 | |
7aea43ff | 10303 | #: common-cmds.h:35 |
8ada9598 | 10304 | msgid "Remove files from the working tree and from the index" |
81809b99 | 10305 | msgstr "从工作区和索引中删除文件" |
8ada9598 | 10306 | |
7aea43ff | 10307 | #: common-cmds.h:36 |
8ada9598 | 10308 | msgid "Show various types of objects" |
81809b99 | 10309 | msgstr "显示各种类型的对象" |
8ada9598 | 10310 | |
7aea43ff | 10311 | #: common-cmds.h:37 |
8ada9598 | 10312 | msgid "Show the working tree status" |
81809b99 | 10313 | msgstr "显示工作区状态" |
8ada9598 | 10314 | |
7aea43ff | 10315 | #: common-cmds.h:38 |
8ada9598 | 10316 | msgid "Create, list, delete or verify a tag object signed with GPG" |
81809b99 | 10317 | msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象" |
8ada9598 | 10318 | |
7aea43ff | 10319 | #: parse-options.h:142 |
220c313c JX |
10320 | msgid "expiry-date" |
10321 | msgstr "到期时间" | |
10322 | ||
7aea43ff | 10323 | #: parse-options.h:157 |
220c313c JX |
10324 | msgid "no-op (backward compatibility)" |
10325 | msgstr "空操作(向后兼容)" | |
10326 | ||
7aea43ff | 10327 | #: parse-options.h:231 |
220c313c JX |
10328 | msgid "be more verbose" |
10329 | msgstr "更加详细" | |
10330 | ||
7aea43ff | 10331 | #: parse-options.h:233 |
220c313c JX |
10332 | msgid "be more quiet" |
10333 | msgstr "更加安静" | |
10334 | ||
7aea43ff | 10335 | #: parse-options.h:239 |
220c313c JX |
10336 | msgid "use <n> digits to display SHA-1s" |
10337 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
10338 | ||
10339 | #: rerere.h:27 | |
10340 | msgid "update the index with reused conflict resolution if possible" | |
10341 | msgstr "如果可能,重用冲突解决更新索引" | |
10342 | ||
04cb2f28 | 10343 | #: git-am.sh:53 |
c04f5ac3 JX |
10344 | msgid "You need to set your committer info first" |
10345 | msgstr "您需要先设置你的提交者信息" | |
10346 | ||
7aea43ff | 10347 | #: git-am.sh:100 |
b694fbb1 JX |
10348 | msgid "" |
10349 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
10350 | "Not rewinding to ORIG_HEAD" | |
6792b93b | 10351 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" |
b694fbb1 | 10352 | |
7aea43ff | 10353 | #: git-am.sh:110 |
b694fbb1 JX |
10354 | #, sh-format |
10355 | msgid "" | |
2e8451e8 | 10356 | "When you have resolved this problem, run \"$cmdline --continue\".\n" |
649900bc JX |
10357 | "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" |
10358 | "To restore the original branch and stop patching, run \"$cmdline --abort\"." | |
b694fbb1 | 10359 | msgstr "" |
2e8451e8 | 10360 | "当您解决了此问题后,执行 \"$cmdline --continue\"。\n" |
b694fbb1 JX |
10361 | "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n" |
10362 | "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。" | |
10363 | ||
7aea43ff | 10364 | #: git-am.sh:126 |
b694fbb1 JX |
10365 | msgid "Cannot fall back to three-way merge." |
10366 | msgstr "无法求助于三路合并。" | |
10367 | ||
7aea43ff | 10368 | #: git-am.sh:142 |
c04f5ac3 | 10369 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
07432cef | 10370 | msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。" |
649900bc | 10371 | |
7aea43ff | 10372 | #: git-am.sh:144 |
649900bc | 10373 | msgid "Using index info to reconstruct a base tree..." |
63af42fe | 10374 | msgstr "使用索引来重建一个(三路合并的)基础目录树..." |
c04f5ac3 | 10375 | |
7aea43ff | 10376 | #: git-am.sh:159 |
c04f5ac3 JX |
10377 | msgid "" |
10378 | "Did you hand edit your patch?\n" | |
10379 | "It does not apply to blobs recorded in its index." | |
10380 | msgstr "" | |
10381 | "您是否曾手动编辑过您的补丁?\n" | |
07432cef | 10382 | "无法应用补丁到索引中的数据(blob)对象上。" |
c04f5ac3 | 10383 | |
7aea43ff | 10384 | #: git-am.sh:168 |
c04f5ac3 | 10385 | msgid "Falling back to patching base and 3-way merge..." |
b694fbb1 | 10386 | msgstr "转而在基础版本上打补丁及进行三路合并..." |
c04f5ac3 | 10387 | |
7aea43ff | 10388 | #: git-am.sh:185 |
649900bc JX |
10389 | msgid "Failed to merge in the changes." |
10390 | msgstr "无法合并变更。" | |
10391 | ||
7aea43ff | 10392 | #: git-am.sh:280 |
c04f5ac3 JX |
10393 | msgid "Only one StGIT patch series can be applied at once" |
10394 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
10395 | ||
7aea43ff | 10396 | #: git-am.sh:367 |
c04f5ac3 JX |
10397 | #, sh-format |
10398 | msgid "Patch format $patch_format is not supported." | |
10399 | msgstr "不支持 $patch_format 补丁格式。" | |
10400 | ||
7aea43ff | 10401 | #: git-am.sh:369 |
c04f5ac3 JX |
10402 | msgid "Patch format detection failed." |
10403 | msgstr "补丁格式检测失败。" | |
10404 | ||
7aea43ff | 10405 | #: git-am.sh:407 |
649900bc JX |
10406 | msgid "" |
10407 | "The -b/--binary option has been a no-op for long time, and\n" | |
10408 | "it will be removed. Please do not use it anymore." | |
10409 | msgstr "" | |
10410 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n" | |
10411 | "请不要再使用它了。" | |
c04f5ac3 | 10412 | |
7aea43ff | 10413 | #: git-am.sh:507 |
c04f5ac3 JX |
10414 | #, sh-format |
10415 | msgid "previous rebase directory $dotest still exists but mbox given." | |
2e8451e8 | 10416 | msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。" |
c04f5ac3 | 10417 | |
7aea43ff | 10418 | #: git-am.sh:512 |
c04f5ac3 JX |
10419 | msgid "Please make up your mind. --skip or --abort?" |
10420 | msgstr "请下决心。--skip 或是 --abort ?" | |
10421 | ||
7aea43ff | 10422 | #: git-am.sh:560 |
2e8451e8 JX |
10423 | #, sh-format |
10424 | msgid "" | |
10425 | "Stray $dotest directory found.\n" | |
10426 | "Use \"git am --abort\" to remove it." | |
10427 | msgstr "" | |
10428 | "发现了错误的 $dotest 目录。\n" | |
10429 | "使用 \"git am --abort\" 删除它。" | |
10430 | ||
7aea43ff | 10431 | #: git-am.sh:568 |
c04f5ac3 JX |
10432 | msgid "Resolve operation not in progress, we are not resuming." |
10433 | msgstr "解决操作未进行,我们不会继续。" | |
10434 | ||
7aea43ff | 10435 | #: git-am.sh:635 |
c04f5ac3 JX |
10436 | #, sh-format |
10437 | msgid "Dirty index: cannot apply patches (dirty: $files)" | |
90e6ef53 | 10438 | msgstr "脏的索引:不能应用补丁(脏文件:$files)" |
c04f5ac3 | 10439 | |
7aea43ff | 10440 | #: git-am.sh:747 |
b694fbb1 JX |
10441 | #, sh-format |
10442 | msgid "" | |
10443 | "Patch is empty. Was it split wrong?\n" | |
10444 | "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" | |
10445 | "To restore the original branch and stop patching run \"$cmdline --abort\"." | |
10446 | msgstr "" | |
10447 | "补丁为空。是不是切分错误?\n" | |
10448 | "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n" | |
10449 | "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。" | |
10450 | ||
7aea43ff | 10451 | #: git-am.sh:774 |
b694fbb1 JX |
10452 | msgid "Patch does not have a valid e-mail address." |
10453 | msgstr "补丁中没有一个有效的邮件地址。" | |
10454 | ||
7aea43ff | 10455 | #: git-am.sh:821 |
c04f5ac3 | 10456 | msgid "cannot be interactive without stdin connected to a terminal." |
90e6ef53 | 10457 | msgstr "标准输入没有和终端关联,不能进行交互式操作。" |
c04f5ac3 | 10458 | |
7aea43ff | 10459 | #: git-am.sh:825 |
b694fbb1 JX |
10460 | msgid "Commit Body is:" |
10461 | msgstr "提交内容为:" | |
10462 | ||
90e6ef53 | 10463 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
10464 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] |
10465 | #. in your translation. The program will only accept English | |
10466 | #. input at this point. | |
7aea43ff | 10467 | #: git-am.sh:832 |
c04f5ac3 JX |
10468 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " |
10469 | msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " | |
10470 | ||
7aea43ff | 10471 | #: git-am.sh:868 |
c04f5ac3 JX |
10472 | #, sh-format |
10473 | msgid "Applying: $FIRSTLINE" | |
10474 | msgstr "正应用:$FIRSTLINE" | |
10475 | ||
7aea43ff | 10476 | #: git-am.sh:889 |
b694fbb1 JX |
10477 | msgid "" |
10478 | "No changes - did you forget to use 'git add'?\n" | |
10479 | "If there is nothing left to stage, chances are that something else\n" | |
10480 | "already introduced the same changes; you might want to skip this patch." | |
10481 | msgstr "" | |
10482 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
10483 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
10484 | "您也许想要跳过这个补丁。" | |
10485 | ||
7aea43ff | 10486 | #: git-am.sh:897 |
b694fbb1 JX |
10487 | msgid "" |
10488 | "You still have unmerged paths in your index\n" | |
10489 | "did you forget to use 'git add'?" | |
6792b93b | 10490 | msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?" |
b694fbb1 | 10491 | |
7aea43ff | 10492 | #: git-am.sh:913 |
c04f5ac3 | 10493 | msgid "No changes -- Patch already applied." |
63af42fe | 10494 | msgstr "没有变更 —— 补丁已经应用过。" |
c04f5ac3 | 10495 | |
7aea43ff | 10496 | #: git-am.sh:923 |
b694fbb1 JX |
10497 | #, sh-format |
10498 | msgid "Patch failed at $msgnum $FIRSTLINE" | |
10499 | msgstr "补丁失败于 $msgnum $FIRSTLINE" | |
10500 | ||
7aea43ff | 10501 | #: git-am.sh:926 |
ef317cd5 JX |
10502 | #, sh-format |
10503 | msgid "" | |
10504 | "The copy of the patch that failed is found in:\n" | |
10505 | " $dotest/patch" | |
10506 | msgstr "" | |
07432cef WS |
10507 | "失败的补丁文件副本位于:\n" |
10508 | " $dotest/patch" | |
ef317cd5 | 10509 | |
7aea43ff | 10510 | #: git-am.sh:945 |
c04f5ac3 JX |
10511 | msgid "applying to an empty history" |
10512 | msgstr "正应用到一个空历史上" | |
10513 | ||
b694fbb1 JX |
10514 | #: git-bisect.sh:48 |
10515 | msgid "You need to start by \"git bisect start\"" | |
10516 | msgstr "您需要执行 \"git bisect start\" 来开始" | |
10517 | ||
90e6ef53 | 10518 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
10519 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
10520 | #. translation. The program will only accept English input | |
10521 | #. at this point. | |
10522 | #: git-bisect.sh:54 | |
10523 | msgid "Do you want me to do it for you [Y/n]? " | |
10524 | msgstr "您想让我为您这样做么[Y/n]? " | |
10525 | ||
10526 | #: git-bisect.sh:95 | |
10527 | #, sh-format | |
10528 | msgid "unrecognised option: '$arg'" | |
81809b99 | 10529 | msgstr "未能识别的选项:'$arg'" |
c04f5ac3 JX |
10530 | |
10531 | #: git-bisect.sh:99 | |
10532 | #, sh-format | |
10533 | msgid "'$arg' does not appear to be a valid revision" | |
10534 | msgstr "'$arg' 看起来不像是一个有效的版本" | |
10535 | ||
10536 | #: git-bisect.sh:117 | |
10537 | msgid "Bad HEAD - I need a HEAD" | |
10538 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
10539 | ||
10540 | #: git-bisect.sh:130 | |
10541 | #, sh-format | |
10542 | msgid "" | |
814ff314 | 10543 | "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." |
d9d56b23 | 10544 | msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。" |
c04f5ac3 JX |
10545 | |
10546 | #: git-bisect.sh:140 | |
cfff71a9 JX |
10547 | msgid "won't bisect on cg-seek'ed tree" |
10548 | msgstr "不会在做了 cg-seek 的树上做二分查找" | |
c04f5ac3 JX |
10549 | |
10550 | #: git-bisect.sh:144 | |
10551 | msgid "Bad HEAD - strange symbolic ref" | |
90e6ef53 | 10552 | msgstr "坏的 HEAD - 奇怪的符号引用" |
c04f5ac3 JX |
10553 | |
10554 | #: git-bisect.sh:189 | |
10555 | #, sh-format | |
10556 | msgid "Bad bisect_write argument: $state" | |
90e6ef53 | 10557 | msgstr "坏的 bisect_write 参数:$state" |
c04f5ac3 JX |
10558 | |
10559 | #: git-bisect.sh:218 | |
10560 | #, sh-format | |
10561 | msgid "Bad rev input: $arg" | |
90e6ef53 | 10562 | msgstr "输入坏的版本:$arg" |
c04f5ac3 JX |
10563 | |
10564 | #: git-bisect.sh:232 | |
10565 | msgid "Please call 'bisect_state' with at least one argument." | |
10566 | msgstr "请在调用 'bisect_state' 时跟至少一个参数。" | |
10567 | ||
10568 | #: git-bisect.sh:244 | |
10569 | #, sh-format | |
10570 | msgid "Bad rev input: $rev" | |
10571 | msgstr "输入坏的版本:$rev" | |
10572 | ||
04cb2f28 | 10573 | #: git-bisect.sh:253 |
c04f5ac3 JX |
10574 | msgid "'git bisect bad' can take only one argument." |
10575 | msgstr "'git bisect bad' 只能带一个参数。" | |
10576 | ||
04cb2f28 | 10577 | #: git-bisect.sh:276 |
b694fbb1 JX |
10578 | msgid "Warning: bisecting only with a bad commit." |
10579 | msgstr "警告:在仅有一个坏提交下进行二分查找。" | |
10580 | ||
90e6ef53 | 10581 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
10582 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
10583 | #. translation. The program will only accept English input | |
10584 | #. at this point. | |
04cb2f28 | 10585 | #: git-bisect.sh:282 |
c04f5ac3 JX |
10586 | msgid "Are you sure [Y/n]? " |
10587 | msgstr "您确认么[Y/n]? " | |
10588 | ||
04cb2f28 | 10589 | #: git-bisect.sh:292 |
b694fbb1 | 10590 | msgid "" |
220c313c | 10591 | "You need to give me at least one good and one bad revision.\n" |
b694fbb1 JX |
10592 | "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" |
10593 | msgstr "" | |
10594 | "您需要给我至少一个好版本和一个坏版本。\n" | |
220c313c | 10595 | "(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)" |
b694fbb1 | 10596 | |
04cb2f28 | 10597 | #: git-bisect.sh:295 |
b694fbb1 JX |
10598 | msgid "" |
10599 | "You need to start by \"git bisect start\".\n" | |
220c313c | 10600 | "You then need to give me at least one good and one bad revision.\n" |
b694fbb1 JX |
10601 | "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" |
10602 | msgstr "" | |
10603 | "您需要执行 \"git bisect start\" 来开始。\n" | |
10604 | "然后需要提供我至少一个好版本和一个坏版本。\n" | |
220c313c | 10605 | "(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)" |
b694fbb1 | 10606 | |
04cb2f28 | 10607 | #: git-bisect.sh:366 git-bisect.sh:493 |
b694fbb1 JX |
10608 | msgid "We are not bisecting." |
10609 | msgstr "我们没有在二分查找。" | |
10610 | ||
04cb2f28 | 10611 | #: git-bisect.sh:373 |
c04f5ac3 JX |
10612 | #, sh-format |
10613 | msgid "'$invalid' is not a valid commit" | |
10614 | msgstr "'$invalid' 不是一个有效的提交" | |
10615 | ||
04cb2f28 | 10616 | #: git-bisect.sh:382 |
c04f5ac3 JX |
10617 | #, sh-format |
10618 | msgid "" | |
10619 | "Could not check out original HEAD '$branch'.\n" | |
10620 | "Try 'git bisect reset <commit>'." | |
10621 | msgstr "" | |
10622 | "不能检出原始 HEAD '$branch'。\n" | |
07432cef | 10623 | "尝试 'git bisect reset <提交>'。" |
c04f5ac3 | 10624 | |
04cb2f28 | 10625 | #: git-bisect.sh:409 |
c04f5ac3 JX |
10626 | msgid "No logfile given" |
10627 | msgstr "未提供日志文件" | |
10628 | ||
04cb2f28 | 10629 | #: git-bisect.sh:410 |
c04f5ac3 JX |
10630 | #, sh-format |
10631 | msgid "cannot read $file for replaying" | |
10632 | msgstr "不能读取 $file 来重放" | |
10633 | ||
04cb2f28 | 10634 | #: git-bisect.sh:427 |
c04f5ac3 JX |
10635 | msgid "?? what are you talking about?" |
10636 | msgstr "?? 您在说什么?" | |
10637 | ||
04cb2f28 | 10638 | #: git-bisect.sh:439 |
b694fbb1 JX |
10639 | #, sh-format |
10640 | msgid "running $command" | |
10641 | msgstr "运行 $command" | |
10642 | ||
04cb2f28 | 10643 | #: git-bisect.sh:446 |
b694fbb1 JX |
10644 | #, sh-format |
10645 | msgid "" | |
10646 | "bisect run failed:\n" | |
10647 | "exit code $res from '$command' is < 0 or >= 128" | |
10648 | msgstr "" | |
10649 | "二分查找运行失败:\n" | |
07432cef | 10650 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 10651 | |
04cb2f28 | 10652 | #: git-bisect.sh:472 |
b694fbb1 JX |
10653 | msgid "bisect run cannot continue any more" |
10654 | msgstr "二分查找不能继续运行" | |
10655 | ||
04cb2f28 | 10656 | #: git-bisect.sh:478 |
b694fbb1 JX |
10657 | #, sh-format |
10658 | msgid "" | |
10659 | "bisect run failed:\n" | |
10660 | "'bisect_state $state' exited with error code $res" | |
10661 | msgstr "" | |
10662 | "二分查找运行失败:\n" | |
10663 | "'bisect_state $state' 退出码为 $res" | |
10664 | ||
04cb2f28 | 10665 | #: git-bisect.sh:485 |
b694fbb1 JX |
10666 | msgid "bisect run success" |
10667 | msgstr "二分查找运行成功" | |
c04f5ac3 | 10668 | |
7aea43ff | 10669 | #: git-pull.sh:61 |
c04f5ac3 JX |
10670 | msgid "" |
10671 | "Pull is not possible because you have unmerged files.\n" | |
10672 | "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" | |
220c313c | 10673 | "as appropriate to mark resolution and make a commit." |
c04f5ac3 | 10674 | msgstr "" |
90e6ef53 | 10675 | "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n" |
d9d56b23 | 10676 | "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。" |
c04f5ac3 | 10677 | |
7aea43ff | 10678 | #: git-pull.sh:65 |
c04f5ac3 | 10679 | msgid "Pull is not possible because you have unmerged files." |
90e6ef53 | 10680 | msgstr "Pull 不可用,因为您尚有未合并的文件。" |
c04f5ac3 | 10681 | |
7aea43ff | 10682 | #: git-pull.sh:71 |
220c313c JX |
10683 | msgid "" |
10684 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
10685 | "Please, commit your changes before you can merge." | |
10686 | msgstr "" | |
10687 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
10688 | "请在合并前先提交您的修改。" | |
10689 | ||
7aea43ff | 10690 | #: git-pull.sh:285 |
c04f5ac3 | 10691 | msgid "updating an unborn branch with changes added to the index" |
90e6ef53 | 10692 | msgstr "更新尚未诞生的分支,变更添加至索引" |
c04f5ac3 | 10693 | |
7aea43ff | 10694 | #: git-pull.sh:311 |
b694fbb1 JX |
10695 | #, sh-format |
10696 | msgid "" | |
10697 | "Warning: fetch updated the current branch head.\n" | |
10698 | "Warning: fast-forwarding your working tree from\n" | |
10699 | "Warning: commit $orig_head." | |
10700 | msgstr "" | |
10701 | "警告:fetch 更新了当前的分支。您的工作区\n" | |
10702 | "警告:从原提交 $orig_head 快进。" | |
10703 | ||
7aea43ff | 10704 | #: git-pull.sh:336 |
c04f5ac3 JX |
10705 | msgid "Cannot merge multiple branches into empty head" |
10706 | msgstr "无法将多个分支合并到空分支" | |
10707 | ||
7aea43ff | 10708 | #: git-pull.sh:340 |
c04f5ac3 JX |
10709 | msgid "Cannot rebase onto multiple branches" |
10710 | msgstr "无法变基到多个分支" | |
10711 | ||
6c94aba5 | 10712 | #: git-rebase.sh:57 |
649900bc JX |
10713 | msgid "" |
10714 | "When you have resolved this problem, run \"git rebase --continue\".\n" | |
10715 | "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" | |
10716 | "To check out the original branch and stop rebasing, run \"git rebase --abort" | |
10717 | "\"." | |
10718 | msgstr "" | |
10719 | "当您解决了此问题后,执行 \"git rebase --continue\"。\n" | |
10720 | "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n" | |
10721 | "要恢复原分支并停止变基,执行 \"git rebase --abort\"。" | |
10722 | ||
6acbf033 | 10723 | #: git-rebase.sh:165 |
2e8451e8 JX |
10724 | msgid "Applied autostash." |
10725 | msgstr "成功应用 autostash。" | |
10726 | ||
6acbf033 | 10727 | #: git-rebase.sh:168 |
2e8451e8 JX |
10728 | #, sh-format |
10729 | msgid "Cannot store $stash_sha1" | |
10730 | msgstr "无法保存 $stash_sha1" | |
10731 | ||
6acbf033 | 10732 | #: git-rebase.sh:169 |
2e8451e8 JX |
10733 | msgid "" |
10734 | "Applying autostash resulted in conflicts.\n" | |
10735 | "Your changes are safe in the stash.\n" | |
b1894384 | 10736 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" |
2e8451e8 JX |
10737 | msgstr "" |
10738 | "应用 autostash 导致冲突。\n" | |
10739 | "您的修改安全地保存在 stash 中。\n" | |
10740 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" | |
10741 | ||
6acbf033 | 10742 | #: git-rebase.sh:208 |
649900bc | 10743 | msgid "The pre-rebase hook refused to rebase." |
98b2761d | 10744 | msgstr "钩子 pre-rebase 拒绝变基操作。" |
649900bc | 10745 | |
6acbf033 | 10746 | #: git-rebase.sh:213 |
649900bc JX |
10747 | msgid "It looks like git-am is in progress. Cannot rebase." |
10748 | msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" | |
10749 | ||
6acbf033 | 10750 | #: git-rebase.sh:351 |
649900bc JX |
10751 | msgid "The --exec option must be used with the --interactive option" |
10752 | msgstr "选项 --exec 必须和选项 --interactive 同时使用" | |
10753 | ||
6acbf033 | 10754 | #: git-rebase.sh:356 |
649900bc JX |
10755 | msgid "No rebase in progress?" |
10756 | msgstr "没有正在进行的变基?" | |
10757 | ||
6acbf033 | 10758 | #: git-rebase.sh:367 |
07432cef WS |
10759 | msgid "The --edit-todo action can only be used during interactive rebase." |
10760 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
10761 | ||
6acbf033 | 10762 | #: git-rebase.sh:374 |
649900bc JX |
10763 | msgid "Cannot read HEAD" |
10764 | msgstr "不能读取 HEAD" | |
10765 | ||
6acbf033 | 10766 | #: git-rebase.sh:377 |
649900bc JX |
10767 | msgid "" |
10768 | "You must edit all merge conflicts and then\n" | |
10769 | "mark them as resolved using git add" | |
10770 | msgstr "" | |
10771 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
10772 | "命令将它们标记为已解决" | |
10773 | ||
6acbf033 | 10774 | #: git-rebase.sh:395 |
649900bc JX |
10775 | #, sh-format |
10776 | msgid "Could not move back to $head_name" | |
10777 | msgstr "无法移回 $head_name" | |
10778 | ||
6acbf033 | 10779 | #: git-rebase.sh:414 |
649900bc JX |
10780 | #, sh-format |
10781 | msgid "" | |
10782 | "It seems that there is already a $state_dir_base directory, and\n" | |
10783 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
10784 | "case, please try\n" | |
10785 | "\t$cmd_live_rebase\n" | |
10786 | "If that is not the case, please\n" | |
10787 | "\t$cmd_clear_stale_rebase\n" | |
10788 | "and run me again. I am stopping in case you still have something\n" | |
10789 | "valuable there." | |
10790 | msgstr "" | |
98b2761d JX |
10791 | "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n" |
10792 | "过程中。 如果是这样,请执行\n" | |
649900bc JX |
10793 | "\t$cmd_live_rebase\n" |
10794 | "如果不是这样,请执行\n" | |
10795 | "\t$cmd_clear_stale_rebase\n" | |
98b2761d | 10796 | "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。" |
649900bc | 10797 | |
6acbf033 | 10798 | #: git-rebase.sh:465 |
649900bc JX |
10799 | #, sh-format |
10800 | msgid "invalid upstream $upstream_name" | |
10801 | msgstr "无效的上游 $upstream_name" | |
10802 | ||
6acbf033 | 10803 | #: git-rebase.sh:489 |
649900bc JX |
10804 | #, sh-format |
10805 | msgid "$onto_name: there are more than one merge bases" | |
10806 | msgstr "$onto_name: 有一个以上的合并基准" | |
10807 | ||
6acbf033 | 10808 | #: git-rebase.sh:492 git-rebase.sh:496 |
649900bc JX |
10809 | #, sh-format |
10810 | msgid "$onto_name: there is no merge base" | |
10811 | msgstr "$onto_name: 没有合并基准" | |
10812 | ||
6acbf033 | 10813 | #: git-rebase.sh:501 |
649900bc JX |
10814 | #, sh-format |
10815 | msgid "Does not point to a valid commit: $onto_name" | |
10816 | msgstr "没有指向一个有效的提交:$onto_name" | |
10817 | ||
6acbf033 | 10818 | #: git-rebase.sh:524 |
649900bc JX |
10819 | #, sh-format |
10820 | msgid "fatal: no such branch: $branch_name" | |
10821 | msgstr "严重错误:无此分支:$branch_name" | |
10822 | ||
6acbf033 | 10823 | #: git-rebase.sh:557 |
2e8451e8 JX |
10824 | msgid "Cannot autostash" |
10825 | msgstr "无法 autostash" | |
10826 | ||
6acbf033 | 10827 | #: git-rebase.sh:562 |
2e8451e8 JX |
10828 | #, sh-format |
10829 | msgid "Created autostash: $stash_abbrev" | |
10830 | msgstr "创建了 autostash: $stash_abbrev" | |
10831 | ||
6acbf033 | 10832 | #: git-rebase.sh:566 |
649900bc JX |
10833 | msgid "Please commit or stash them." |
10834 | msgstr "请提交或为它们保存进度。" | |
10835 | ||
6acbf033 | 10836 | #: git-rebase.sh:586 |
649900bc JX |
10837 | #, sh-format |
10838 | msgid "Current branch $branch_name is up to date." | |
10839 | msgstr "当前分支 $branch_name 是最新的。" | |
10840 | ||
6acbf033 | 10841 | #: git-rebase.sh:590 |
649900bc JX |
10842 | #, sh-format |
10843 | msgid "Current branch $branch_name is up to date, rebase forced." | |
10844 | msgstr "当前分支 $branch_name 是最新的,强制变基。" | |
10845 | ||
6acbf033 | 10846 | #: git-rebase.sh:601 |
649900bc JX |
10847 | #, sh-format |
10848 | msgid "Changes from $mb to $onto:" | |
10849 | msgstr "变更从 $mb 到 $onto:" | |
10850 | ||
6acbf033 | 10851 | #: git-rebase.sh:610 |
649900bc JX |
10852 | msgid "First, rewinding head to replay your work on top of it..." |
10853 | msgstr "首先,重置头指针以便在上面重放您的工作..." | |
10854 | ||
6acbf033 | 10855 | #: git-rebase.sh:620 |
649900bc JX |
10856 | #, sh-format |
10857 | msgid "Fast-forwarded $branch_name to $onto_name." | |
10858 | msgstr "快进 $branch_name 至 $onto_name。" | |
10859 | ||
c04f5ac3 JX |
10860 | #: git-stash.sh:51 |
10861 | msgid "git stash clear with parameters is unimplemented" | |
10862 | msgstr "git stash clear 不支持参数" | |
10863 | ||
10864 | #: git-stash.sh:74 | |
10865 | msgid "You do not have the initial commit yet" | |
10866 | msgstr "您尚未建立初始提交" | |
10867 | ||
10868 | #: git-stash.sh:89 | |
10869 | msgid "Cannot save the current index state" | |
90e6ef53 | 10870 | msgstr "无法保存当前索引状态" |
c04f5ac3 | 10871 | |
6acbf033 | 10872 | #: git-stash.sh:124 git-stash.sh:137 |
c04f5ac3 JX |
10873 | msgid "Cannot save the current worktree state" |
10874 | msgstr "无法保存当前工作区状态" | |
10875 | ||
6acbf033 | 10876 | #: git-stash.sh:141 |
c04f5ac3 | 10877 | msgid "No changes selected" |
90e6ef53 | 10878 | msgstr "没有选择变更" |
c04f5ac3 | 10879 | |
6acbf033 | 10880 | #: git-stash.sh:144 |
c04f5ac3 | 10881 | msgid "Cannot remove temporary index (can't happen)" |
90e6ef53 | 10882 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 | 10883 | |
6acbf033 | 10884 | #: git-stash.sh:157 |
c04f5ac3 JX |
10885 | msgid "Cannot record working tree state" |
10886 | msgstr "不能记录工作区状态" | |
10887 | ||
6acbf033 | 10888 | #: git-stash.sh:191 |
2e8451e8 JX |
10889 | #, sh-format |
10890 | msgid "Cannot update $ref_stash with $w_commit" | |
10891 | msgstr "无法用 $w_commit 更新 $ref_stash" | |
10892 | ||
b694fbb1 JX |
10893 | #. TRANSLATORS: $option is an invalid option, like |
10894 | #. `--blah-blah'. The 7 spaces at the beginning of the | |
10895 | #. second line correspond to "error: ". So you should line | |
10896 | #. up the second line with however many characters the | |
10897 | #. translation of "error: " takes in your language. E.g. in | |
10898 | #. English this is: | |
10899 | #. | |
10900 | #. $ git stash save --blah-blah 2>&1 | head -n 2 | |
10901 | #. error: unknown option for 'stash save': --blah-blah | |
10902 | #. To provide a message, use git stash save -- '--blah-blah' | |
7aea43ff | 10903 | #: git-stash.sh:241 |
b694fbb1 JX |
10904 | #, sh-format |
10905 | msgid "" | |
10906 | "error: unknown option for 'stash save': $option\n" | |
10907 | " To provide a message, use git stash save -- '$option'" | |
10908 | msgstr "" | |
10909 | "错误:'stash save' 的未知选项:$option\n" | |
10910 | " 要提供一个描述信息,使用 git stash save -- '$option'" | |
10911 | ||
7aea43ff | 10912 | #: git-stash.sh:262 |
c04f5ac3 JX |
10913 | msgid "No local changes to save" |
10914 | msgstr "没有要保存的本地修改" | |
10915 | ||
7aea43ff | 10916 | #: git-stash.sh:266 |
c04f5ac3 | 10917 | msgid "Cannot initialize stash" |
90e6ef53 | 10918 | msgstr "无法初始化 stash" |
c04f5ac3 | 10919 | |
7aea43ff | 10920 | #: git-stash.sh:270 |
c04f5ac3 JX |
10921 | msgid "Cannot save the current status" |
10922 | msgstr "无法保存当前状态" | |
10923 | ||
7aea43ff | 10924 | #: git-stash.sh:288 |
c04f5ac3 JX |
10925 | msgid "Cannot remove worktree changes" |
10926 | msgstr "无法删除工作区变更" | |
10927 | ||
7aea43ff JX |
10928 | #: git-stash.sh:389 |
10929 | #, sh-format | |
10930 | msgid "unknown option: $opt" | |
10931 | msgstr "未知选项: $opt" | |
10932 | ||
10933 | #: git-stash.sh:399 | |
c04f5ac3 | 10934 | msgid "No stash found." |
90e6ef53 | 10935 | msgstr "未发现 stash。" |
c04f5ac3 | 10936 | |
7aea43ff | 10937 | #: git-stash.sh:406 |
c04f5ac3 JX |
10938 | #, sh-format |
10939 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 10940 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 | 10941 | |
7aea43ff | 10942 | #: git-stash.sh:412 |
c04f5ac3 | 10943 | #, sh-format |
220c313c JX |
10944 | msgid "$reference is not a valid reference" |
10945 | msgstr "$reference 不是一个有效的引用" | |
c04f5ac3 | 10946 | |
7aea43ff | 10947 | #: git-stash.sh:440 |
c04f5ac3 JX |
10948 | #, sh-format |
10949 | msgid "'$args' is not a stash-like commit" | |
90e6ef53 | 10950 | msgstr "'$args' 不是 stash 样提交" |
c04f5ac3 | 10951 | |
7aea43ff | 10952 | #: git-stash.sh:451 |
c04f5ac3 JX |
10953 | #, sh-format |
10954 | msgid "'$args' is not a stash reference" | |
90e6ef53 | 10955 | msgstr "'$args' 不是一个 stash 引用" |
c04f5ac3 | 10956 | |
7aea43ff | 10957 | #: git-stash.sh:459 |
c04f5ac3 | 10958 | msgid "unable to refresh index" |
90e6ef53 | 10959 | msgstr "无法刷新索引" |
c04f5ac3 | 10960 | |
7aea43ff | 10961 | #: git-stash.sh:463 |
c04f5ac3 JX |
10962 | msgid "Cannot apply a stash in the middle of a merge" |
10963 | msgstr "无法在合并过程中恢复进度" | |
10964 | ||
7aea43ff | 10965 | #: git-stash.sh:471 |
c04f5ac3 | 10966 | msgid "Conflicts in index. Try without --index." |
90e6ef53 | 10967 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 | 10968 | |
7aea43ff | 10969 | #: git-stash.sh:473 |
c04f5ac3 | 10970 | msgid "Could not save index tree" |
90e6ef53 | 10971 | msgstr "不能保存索引树" |
c04f5ac3 | 10972 | |
7aea43ff | 10973 | #: git-stash.sh:507 |
c04f5ac3 JX |
10974 | msgid "Cannot unstage modified files" |
10975 | msgstr "无法还原修改的文件" | |
10976 | ||
7aea43ff | 10977 | #: git-stash.sh:522 |
b694fbb1 JX |
10978 | msgid "Index was not unstashed." |
10979 | msgstr "索引的进度没有被恢复。" | |
10980 | ||
7aea43ff | 10981 | #: git-stash.sh:545 |
c04f5ac3 JX |
10982 | #, sh-format |
10983 | msgid "Dropped ${REV} ($s)" | |
10984 | msgstr "丢弃了 ${REV} ($s)" | |
10985 | ||
7aea43ff | 10986 | #: git-stash.sh:546 |
c04f5ac3 JX |
10987 | #, sh-format |
10988 | msgid "${REV}: Could not drop stash entry" | |
90e6ef53 | 10989 | msgstr "${REV}:不能丢弃进度条目" |
c04f5ac3 | 10990 | |
7aea43ff | 10991 | #: git-stash.sh:554 |
c04f5ac3 JX |
10992 | msgid "No branch name specified" |
10993 | msgstr "未指定分支名" | |
10994 | ||
7aea43ff | 10995 | #: git-stash.sh:626 |
c04f5ac3 JX |
10996 | msgid "(To restore them type \"git stash apply\")" |
10997 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
10998 | ||
2e8451e8 | 10999 | #: git-submodule.sh:95 |
c04f5ac3 JX |
11000 | #, sh-format |
11001 | msgid "cannot strip one component off url '$remoteurl'" | |
11002 | msgstr "无法从 url '$remoteurl' 剥离一个组件" | |
11003 | ||
2e8451e8 | 11004 | #: git-submodule.sh:237 |
c04f5ac3 | 11005 | #, sh-format |
170e9899 JX |
11006 | msgid "No submodule mapping found in .gitmodules for path '$sm_path'" |
11007 | msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射" | |
c04f5ac3 | 11008 | |
6c94aba5 | 11009 | #: git-submodule.sh:287 |
c04f5ac3 | 11010 | #, sh-format |
170e9899 JX |
11011 | msgid "Clone of '$url' into submodule path '$sm_path' failed" |
11012 | msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'" | |
c04f5ac3 | 11013 | |
6acbf033 | 11014 | #: git-submodule.sh:296 |
dac1de7d JX |
11015 | #, sh-format |
11016 | msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" | |
07432cef | 11017 | msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反" |
dac1de7d | 11018 | |
6acbf033 | 11019 | #: git-submodule.sh:406 |
2e8451e8 JX |
11020 | msgid "Relative path can only be used from the toplevel of the working tree" |
11021 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
11022 | ||
6acbf033 | 11023 | #: git-submodule.sh:416 |
c04f5ac3 JX |
11024 | #, sh-format |
11025 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
11026 | msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始" | |
11027 | ||
6acbf033 | 11028 | #: git-submodule.sh:433 |
c04f5ac3 | 11029 | #, sh-format |
170e9899 JX |
11030 | msgid "'$sm_path' already exists in the index" |
11031 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 11032 | |
6acbf033 | 11033 | #: git-submodule.sh:437 |
b694fbb1 JX |
11034 | #, sh-format |
11035 | msgid "" | |
11036 | "The following path is ignored by one of your .gitignore files:\n" | |
11037 | "$sm_path\n" | |
11038 | "Use -f if you really want to add it." | |
11039 | msgstr "" | |
11040 | "以下路径被您的一个 .gitignore 文件所忽略:\n" | |
11041 | "$sm_path\n" | |
11042 | "如果您确实想添加它,使用 -f 参数。" | |
11043 | ||
6acbf033 | 11044 | #: git-submodule.sh:455 |
b694fbb1 JX |
11045 | #, sh-format |
11046 | msgid "Adding existing repo at '$sm_path' to the index" | |
11047 | msgstr "添加位于 '$sm_path' 的现存版本库到索引" | |
11048 | ||
6acbf033 | 11049 | #: git-submodule.sh:457 |
c04f5ac3 | 11050 | #, sh-format |
170e9899 JX |
11051 | msgid "'$sm_path' already exists and is not a valid git repo" |
11052 | msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库" | |
c04f5ac3 | 11053 | |
6acbf033 | 11054 | #: git-submodule.sh:465 |
07432cef WS |
11055 | #, sh-format |
11056 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
11057 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:" | |
11058 | ||
6acbf033 | 11059 | #: git-submodule.sh:467 |
07432cef WS |
11060 | #, sh-format |
11061 | msgid "" | |
11062 | "If you want to reuse this local git directory instead of cloning again from" | |
11063 | msgstr "如果您想重用此本地 git 目录而不是重新克隆自" | |
11064 | ||
6acbf033 | 11065 | #: git-submodule.sh:469 |
07432cef WS |
11066 | #, sh-format |
11067 | msgid "" | |
11068 | "use the '--force' option. If the local git directory is not the correct repo" | |
11069 | msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库" | |
11070 | ||
6acbf033 | 11071 | #: git-submodule.sh:470 |
07432cef WS |
11072 | #, sh-format |
11073 | msgid "" | |
11074 | "or you are unsure what this means choose another name with the '--name' " | |
11075 | "option." | |
11076 | msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。" | |
11077 | ||
6acbf033 | 11078 | #: git-submodule.sh:472 |
07432cef WS |
11079 | #, sh-format |
11080 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
11081 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" | |
11082 | ||
6acbf033 | 11083 | #: git-submodule.sh:484 |
c04f5ac3 | 11084 | #, sh-format |
170e9899 JX |
11085 | msgid "Unable to checkout submodule '$sm_path'" |
11086 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 11087 | |
6acbf033 | 11088 | #: git-submodule.sh:489 |
c04f5ac3 | 11089 | #, sh-format |
170e9899 JX |
11090 | msgid "Failed to add submodule '$sm_path'" |
11091 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 11092 | |
6acbf033 | 11093 | #: git-submodule.sh:498 |
c04f5ac3 | 11094 | #, sh-format |
170e9899 JX |
11095 | msgid "Failed to register submodule '$sm_path'" |
11096 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 11097 | |
6acbf033 | 11098 | #: git-submodule.sh:542 |
c04f5ac3 | 11099 | #, sh-format |
2e8451e8 JX |
11100 | msgid "Entering '$prefix$displaypath'" |
11101 | msgstr "正在进入 '$prefix$displaypath'" | |
c04f5ac3 | 11102 | |
6acbf033 | 11103 | #: git-submodule.sh:562 |
c04f5ac3 | 11104 | #, sh-format |
2e8451e8 JX |
11105 | msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." |
11106 | msgstr "停止于 '$prefix$displaypath',脚本返回非零值。" | |
c04f5ac3 | 11107 | |
6acbf033 | 11108 | #: git-submodule.sh:608 |
c04f5ac3 | 11109 | #, sh-format |
2e8451e8 JX |
11110 | msgid "No url found for submodule path '$displaypath' in .gitmodules" |
11111 | msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url" | |
c04f5ac3 | 11112 | |
6acbf033 | 11113 | #: git-submodule.sh:617 |
c04f5ac3 | 11114 | #, sh-format |
2e8451e8 JX |
11115 | msgid "Failed to register url for submodule path '$displaypath'" |
11116 | msgstr "无法为子模组路径 '$displaypath' 注册 url" | |
c04f5ac3 | 11117 | |
6acbf033 | 11118 | #: git-submodule.sh:619 |
c04f5ac3 | 11119 | #, sh-format |
2e8451e8 JX |
11120 | msgid "Submodule '$name' ($url) registered for path '$displaypath'" |
11121 | msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
c04f5ac3 | 11122 | |
6acbf033 | 11123 | #: git-submodule.sh:636 |
d691f479 | 11124 | #, sh-format |
2e8451e8 JX |
11125 | msgid "Failed to register update mode for submodule path '$displaypath'" |
11126 | msgstr "无法为子模组路径 '$displaypath' 注册更新模式" | |
d691f479 | 11127 | |
6acbf033 | 11128 | #: git-submodule.sh:674 |
1003b3a5 JX |
11129 | #, sh-format |
11130 | msgid "Use '.' if you really want to deinitialize all submodules" | |
11131 | msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化" | |
11132 | ||
6acbf033 | 11133 | #: git-submodule.sh:691 |
1003b3a5 | 11134 | #, sh-format |
2e8451e8 JX |
11135 | msgid "Submodule work tree '$displaypath' contains a .git directory" |
11136 | msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录" | |
1003b3a5 | 11137 | |
6acbf033 | 11138 | #: git-submodule.sh:692 |
1003b3a5 JX |
11139 | #, sh-format |
11140 | msgid "" | |
11141 | "(use 'rm -rf' if you really want to remove it including all of its history)" | |
11142 | msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" | |
11143 | ||
6acbf033 | 11144 | #: git-submodule.sh:698 |
c04f5ac3 JX |
11145 | #, sh-format |
11146 | msgid "" | |
2e8451e8 | 11147 | "Submodule work tree '$displaypath' contains local modifications; use '-f' to " |
1003b3a5 | 11148 | "discard them" |
2e8451e8 | 11149 | msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们" |
1003b3a5 | 11150 | |
6acbf033 | 11151 | #: git-submodule.sh:701 |
1003b3a5 | 11152 | #, sh-format |
2e8451e8 JX |
11153 | msgid "Cleared directory '$displaypath'" |
11154 | msgstr "已清除目录 '$displaypath'" | |
1003b3a5 | 11155 | |
6acbf033 | 11156 | #: git-submodule.sh:702 |
1003b3a5 | 11157 | #, sh-format |
2e8451e8 JX |
11158 | msgid "Could not remove submodule work tree '$displaypath'" |
11159 | msgstr "无法移除子模组工作区 '$displaypath'" | |
1003b3a5 | 11160 | |
6acbf033 | 11161 | #: git-submodule.sh:705 |
1003b3a5 | 11162 | #, sh-format |
2e8451e8 JX |
11163 | msgid "Could not create empty submodule directory '$displaypath'" |
11164 | msgstr "不能创建空的子模组目录 '$displaypath'" | |
1003b3a5 | 11165 | |
6acbf033 | 11166 | #: git-submodule.sh:714 |
1003b3a5 | 11167 | #, sh-format |
2e8451e8 JX |
11168 | msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" |
11169 | msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
1003b3a5 | 11170 | |
6acbf033 | 11171 | #: git-submodule.sh:830 |
1003b3a5 JX |
11172 | #, sh-format |
11173 | msgid "" | |
2e8451e8 | 11174 | "Submodule path '$displaypath' not initialized\n" |
c04f5ac3 JX |
11175 | "Maybe you want to use 'update --init'?" |
11176 | msgstr "" | |
2e8451e8 | 11177 | "子模组路径 '$displaypath' 没有初始化\n" |
90e6ef53 | 11178 | "也许您想用 'update --init'?" |
c04f5ac3 | 11179 | |
6acbf033 | 11180 | #: git-submodule.sh:843 |
c04f5ac3 | 11181 | #, sh-format |
2e8451e8 JX |
11182 | msgid "Unable to find current revision in submodule path '$displaypath'" |
11183 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 11184 | |
6acbf033 | 11185 | #: git-submodule.sh:852 |
c04f5ac3 | 11186 | #, sh-format |
170e9899 JX |
11187 | msgid "Unable to fetch in submodule path '$sm_path'" |
11188 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 11189 | |
6acbf033 | 11190 | #: git-submodule.sh:876 |
2e8451e8 JX |
11191 | #, sh-format |
11192 | msgid "Unable to fetch in submodule path '$displaypath'" | |
11193 | msgstr "无法在子模组路径 '$displaypath' 中获取" | |
11194 | ||
6acbf033 | 11195 | #: git-submodule.sh:890 |
6c94aba5 JX |
11196 | #, sh-format |
11197 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
11198 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
11199 | ||
6acbf033 | 11200 | #: git-submodule.sh:891 |
c04f5ac3 | 11201 | #, sh-format |
6c94aba5 JX |
11202 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
11203 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
11204 | ||
6acbf033 | 11205 | #: git-submodule.sh:895 |
6c94aba5 | 11206 | #, sh-format |
2e8451e8 JX |
11207 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
11208 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 11209 | |
6acbf033 | 11210 | #: git-submodule.sh:896 |
c04f5ac3 | 11211 | #, sh-format |
2e8451e8 JX |
11212 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
11213 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 11214 | |
6acbf033 | 11215 | #: git-submodule.sh:901 |
c04f5ac3 | 11216 | #, sh-format |
2e8451e8 JX |
11217 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
11218 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 11219 | |
6acbf033 | 11220 | #: git-submodule.sh:902 |
c04f5ac3 | 11221 | #, sh-format |
2e8451e8 JX |
11222 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
11223 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 11224 | |
6acbf033 | 11225 | #: git-submodule.sh:907 |
c04f5ac3 | 11226 | #, sh-format |
2e8451e8 JX |
11227 | msgid "" |
11228 | "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" | |
11229 | msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败" | |
c04f5ac3 | 11230 | |
6acbf033 | 11231 | #: git-submodule.sh:908 |
c04f5ac3 | 11232 | #, sh-format |
2e8451e8 JX |
11233 | msgid "Submodule path '$prefix$sm_path': '$command $sha1'" |
11234 | msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'" | |
c04f5ac3 | 11235 | |
6acbf033 | 11236 | #: git-submodule.sh:938 |
2e8451e8 JX |
11237 | #, sh-format |
11238 | msgid "Failed to recurse into submodule path '$displaypath'" | |
11239 | msgstr "无法递归进子模组路径 '$displaypath'" | |
11240 | ||
6acbf033 | 11241 | #: git-submodule.sh:1046 |
649900bc JX |
11242 | msgid "The --cached option cannot be used with the --files option" |
11243 | msgstr "选项 --cached 不能和选项 --files 同时使用" | |
b694fbb1 | 11244 | |
6acbf033 | 11245 | #: git-submodule.sh:1098 |
b694fbb1 JX |
11246 | #, sh-format |
11247 | msgid "unexpected mode $mod_dst" | |
11248 | msgstr "意外的模式 $mod_dst" | |
c04f5ac3 | 11249 | |
90e6ef53 | 11250 | # 译者:注意保持前导空格 |
6acbf033 | 11251 | #: git-submodule.sh:1118 |
c04f5ac3 | 11252 | #, sh-format |
2e8451e8 JX |
11253 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
11254 | msgstr " 警告:$display_name 未包含提交 $sha1_src" | |
c04f5ac3 | 11255 | |
90e6ef53 | 11256 | # 译者:注意保持前导空格 |
6acbf033 | 11257 | #: git-submodule.sh:1121 |
c04f5ac3 | 11258 | #, sh-format |
2e8451e8 JX |
11259 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
11260 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" | |
c04f5ac3 | 11261 | |
90e6ef53 | 11262 | # 译者:注意保持前导空格 |
6acbf033 | 11263 | #: git-submodule.sh:1124 |
c04f5ac3 | 11264 | #, sh-format |
2e8451e8 JX |
11265 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
11266 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" | |
c04f5ac3 | 11267 | |
6acbf033 | 11268 | #: git-submodule.sh:1149 |
c04f5ac3 | 11269 | msgid "blob" |
07432cef | 11270 | msgstr "数据对象" |
c04f5ac3 | 11271 | |
6acbf033 | 11272 | #: git-submodule.sh:1267 |
1003b3a5 JX |
11273 | #, sh-format |
11274 | msgid "Failed to recurse into submodule path '$sm_path'" | |
11275 | msgstr "无法递归进子模组路径 '$sm_path'" | |
11276 | ||
6acbf033 | 11277 | #: git-submodule.sh:1331 |
c04f5ac3 | 11278 | #, sh-format |
2e8451e8 JX |
11279 | msgid "Synchronizing submodule url for '$displaypath'" |
11280 | msgstr "为 '$displaypath' 同步子模组 url" |