]>
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" | |
44f518e6 JX |
15 | "POT-Creation-Date: 2015-04-03 08:13+0800\n" |
16 | "PO-Revision-Date: 2015-04-03 08:35+0800\n" | |
c04f5ac3 JX |
17 | "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" |
18 | "Language-Team: GitHub <https://github.com/gotgit/git/>\n" | |
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 | |
04cb2f28 | 56 | #: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 |
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 | |
220c313c | 79 | #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 |
814ff314 | 80 | #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 |
04cb2f28 | 81 | #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 |
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 | |
04cb2f28 | 113 | #: archive.c:449 builtin/archive.c:90 builtin/clone.c:86 |
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 | ||
814ff314 | 129 | #: attr.c:264 |
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 |
44f518e6 | 264 | #: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 |
04cb2f28 | 265 | #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 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 | ||
814ff314 | 512 | #: diff.c:2956 |
6acbf033 JX |
513 | #, c-format |
514 | msgid "external diff died, stopping at %s" | |
515 | msgstr "外部 diff 退出,停止在 %s" | |
516 | ||
814ff314 | 517 | #: diff.c:3351 |
6acbf033 JX |
518 | msgid "--follow requires exactly one pathspec" |
519 | msgstr "--follow 参数后只跟一个 pathspec" | |
520 | ||
814ff314 | 521 | #: diff.c:3514 |
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 | ||
814ff314 | 530 | #: diff.c:3528 |
07432cef WS |
531 | #, c-format |
532 | msgid "Failed to parse --submodule option parameter: '%s'" | |
533 | msgstr "无法解析 --submodule 选项的参数:'%s'" | |
534 | ||
220c313c | 535 | #: gpg-interface.c:129 gpg-interface.c:200 |
c04f5ac3 JX |
536 | msgid "could not run gpg." |
537 | msgstr "不能执行 gpg。" | |
538 | ||
220c313c | 539 | #: gpg-interface.c:141 |
c04f5ac3 JX |
540 | msgid "gpg did not accept the data" |
541 | msgstr "gpg 没有接受数据" | |
542 | ||
220c313c | 543 | #: gpg-interface.c:152 |
c04f5ac3 JX |
544 | msgid "gpg failed to sign the data" |
545 | msgstr "gpg 无法为数据签名" | |
546 | ||
220c313c | 547 | #: gpg-interface.c:185 |
a77c07d9 JX |
548 | #, c-format |
549 | msgid "could not create temporary file '%s': %s" | |
550 | msgstr "不能创建临时文件 '%s':%s" | |
551 | ||
220c313c | 552 | #: gpg-interface.c:188 |
a77c07d9 JX |
553 | #, c-format |
554 | msgid "failed writing detached signature to '%s': %s" | |
555 | msgstr "无法将分离式签名写入 '%s':%s" | |
556 | ||
220c313c | 557 | #: grep.c:1718 |
7ac1c0ad JX |
558 | #, c-format |
559 | msgid "'%s': unable to read %s" | |
560 | msgstr "'%s':无法读取 %s" | |
561 | ||
220c313c | 562 | #: grep.c:1735 |
7ac1c0ad JX |
563 | #, c-format |
564 | msgid "'%s': %s" | |
565 | msgstr "'%s':%s" | |
566 | ||
220c313c | 567 | #: grep.c:1746 |
7ac1c0ad JX |
568 | #, c-format |
569 | msgid "'%s': short read %s" | |
570 | msgstr "'%s':读取不完整 %s" | |
571 | ||
6acbf033 | 572 | #: help.c:207 |
81809b99 | 573 | #, c-format |
8ada9598 | 574 | msgid "available git commands in '%s'" |
81809b99 | 575 | msgstr "在 '%s' 下可用的 git 命令" |
8ada9598 | 576 | |
6acbf033 | 577 | #: help.c:214 |
8ada9598 | 578 | msgid "git commands available from elsewhere on your $PATH" |
81809b99 | 579 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" |
8ada9598 | 580 | |
6acbf033 | 581 | #: help.c:230 |
a77c07d9 JX |
582 | msgid "The most commonly used git commands are:" |
583 | msgstr "最常用的 git 命令有:" | |
584 | ||
6c94aba5 | 585 | #: help.c:289 |
c04f5ac3 JX |
586 | #, c-format |
587 | msgid "" | |
588 | "'%s' appears to be a git command, but we were not\n" | |
589 | "able to execute it. Maybe git-%s is broken?" | |
590 | msgstr "" | |
591 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
592 | "可能是 git-%s 受损?" | |
593 | ||
6c94aba5 | 594 | #: help.c:346 |
8ada9598 | 595 | msgid "Uh oh. Your system reports no Git commands at all." |
81809b99 | 596 | msgstr "唉呀,您的系统中未发现 Git 命令。" |
8ada9598 | 597 | |
6c94aba5 | 598 | #: help.c:368 |
8ada9598 JX |
599 | #, c-format |
600 | msgid "" | |
601 | "WARNING: You called a Git command named '%s', which does not exist.\n" | |
602 | "Continuing under the assumption that you meant '%s'" | |
603 | msgstr "" | |
81809b99 JX |
604 | "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" |
605 | "是 '%s'" | |
8ada9598 | 606 | |
6c94aba5 | 607 | #: help.c:373 |
8ada9598 JX |
608 | #, c-format |
609 | msgid "in %0.1f seconds automatically..." | |
81809b99 | 610 | msgstr "在 %0.1f 秒钟后自动运行..." |
8ada9598 | 611 | |
6c94aba5 | 612 | #: help.c:380 |
8ada9598 JX |
613 | #, c-format |
614 | msgid "git: '%s' is not a git command. See 'git --help'." | |
81809b99 | 615 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" |
8ada9598 | 616 | |
6acbf033 | 617 | #: help.c:384 help.c:444 |
8ada9598 JX |
618 | msgid "" |
619 | "\n" | |
620 | "Did you mean this?" | |
621 | msgid_plural "" | |
622 | "\n" | |
623 | "Did you mean one of these?" | |
624 | msgstr[0] "" | |
81809b99 JX |
625 | "\n" |
626 | "您指的是这个么?" | |
627 | msgstr[1] "" | |
628 | "\n" | |
195febda | 629 | "您指的是这其中的某一个么?" |
8ada9598 | 630 | |
6acbf033 | 631 | #: help.c:440 |
2e8451e8 JX |
632 | #, c-format |
633 | msgid "%s: %s - %s" | |
634 | msgstr "%s:%s - %s" | |
635 | ||
04cb2f28 | 636 | #: lockfile.c:283 |
220c313c JX |
637 | msgid "BUG: reopen a lockfile that is still open" |
638 | msgstr "BUG: 重新打开一个仍打开着的锁文件" | |
639 | ||
04cb2f28 | 640 | #: lockfile.c:285 |
220c313c JX |
641 | msgid "BUG: reopen a lockfile that has been committed" |
642 | msgstr "BUG: 重新打开一个已提交的锁文件" | |
643 | ||
644 | #: merge.c:41 | |
07432cef WS |
645 | msgid "failed to read the cache" |
646 | msgstr "无法读取缓存" | |
647 | ||
04cb2f28 JX |
648 | #: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580 |
649 | #: builtin/clone.c:662 | |
07432cef WS |
650 | msgid "unable to write new index file" |
651 | msgstr "无法写新的索引文件" | |
652 | ||
220c313c | 653 | #: merge-recursive.c:189 |
649900bc JX |
654 | #, c-format |
655 | msgid "(bad commit)\n" | |
656 | msgstr "(坏提交)\n" | |
657 | ||
220c313c | 658 | #: merge-recursive.c:209 |
649900bc JX |
659 | #, c-format |
660 | msgid "addinfo_cache failed for path '%s'" | |
661 | msgstr "为路径 '%s' addinfo_cache 失败" | |
662 | ||
220c313c | 663 | #: merge-recursive.c:270 |
649900bc JX |
664 | msgid "error building trees" |
665 | msgstr "无法创建树" | |
666 | ||
04cb2f28 | 667 | #: merge-recursive.c:688 |
649900bc JX |
668 | #, c-format |
669 | msgid "failed to create path '%s'%s" | |
670 | msgstr "无法创建路径 '%s'%s" | |
671 | ||
04cb2f28 | 672 | #: merge-recursive.c:699 |
649900bc JX |
673 | #, c-format |
674 | msgid "Removing %s to make room for subdirectory\n" | |
675 | msgstr "删除 %s 以便为子目录留出空间\n" | |
676 | ||
04cb2f28 | 677 | #: merge-recursive.c:713 merge-recursive.c:734 |
649900bc JX |
678 | msgid ": perhaps a D/F conflict?" |
679 | msgstr ":可能是一个目录/文件冲突?" | |
680 | ||
04cb2f28 | 681 | #: merge-recursive.c:724 |
649900bc JX |
682 | #, c-format |
683 | msgid "refusing to lose untracked file at '%s'" | |
684 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
685 | ||
04cb2f28 | 686 | #: merge-recursive.c:764 |
649900bc JX |
687 | #, c-format |
688 | msgid "cannot read object %s '%s'" | |
689 | msgstr "不能读取对象 %s '%s'" | |
690 | ||
04cb2f28 | 691 | #: merge-recursive.c:766 |
649900bc JX |
692 | #, c-format |
693 | msgid "blob expected for %s '%s'" | |
07432cef | 694 | msgstr "%s '%s' 应为数据(blob)对象" |
649900bc | 695 | |
04cb2f28 | 696 | #: merge-recursive.c:789 builtin/clone.c:321 |
649900bc JX |
697 | #, c-format |
698 | msgid "failed to open '%s'" | |
699 | msgstr "无法打开 '%s'" | |
700 | ||
04cb2f28 | 701 | #: merge-recursive.c:797 |
649900bc JX |
702 | #, c-format |
703 | msgid "failed to symlink '%s'" | |
704 | msgstr "无法创建符号链接 '%s'" | |
705 | ||
04cb2f28 | 706 | #: merge-recursive.c:800 |
649900bc JX |
707 | #, c-format |
708 | msgid "do not know what to do with %06o %s '%s'" | |
709 | msgstr "不知道如何处理 %06o %s '%s'" | |
710 | ||
04cb2f28 | 711 | #: merge-recursive.c:938 |
649900bc JX |
712 | msgid "Failed to execute internal merge" |
713 | msgstr "无法执行内部合并" | |
714 | ||
04cb2f28 | 715 | #: merge-recursive.c:942 |
649900bc JX |
716 | #, c-format |
717 | msgid "Unable to add %s to database" | |
718 | msgstr "不能添加 %s 至对象库" | |
719 | ||
04cb2f28 | 720 | #: merge-recursive.c:958 |
649900bc JX |
721 | msgid "unsupported object type in the tree" |
722 | msgstr "在树中有不支持的对象类型" | |
723 | ||
04cb2f28 | 724 | #: merge-recursive.c:1033 merge-recursive.c:1047 |
649900bc JX |
725 | #, c-format |
726 | msgid "" | |
727 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
728 | "in tree." | |
729 | msgstr "" | |
730 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" | |
731 | "的版本被保留。" | |
732 | ||
04cb2f28 | 733 | #: merge-recursive.c:1039 merge-recursive.c:1052 |
649900bc JX |
734 | #, c-format |
735 | msgid "" | |
736 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
737 | "in tree at %s." | |
738 | msgstr "" | |
739 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" | |
740 | "的版本保留于 %8$s 中。" | |
741 | ||
04cb2f28 | 742 | #: merge-recursive.c:1093 |
649900bc JX |
743 | msgid "rename" |
744 | msgstr "重命名" | |
745 | ||
04cb2f28 | 746 | #: merge-recursive.c:1093 |
649900bc JX |
747 | msgid "renamed" |
748 | msgstr "重命名" | |
749 | ||
04cb2f28 | 750 | #: merge-recursive.c:1149 |
649900bc JX |
751 | #, c-format |
752 | msgid "%s is a directory in %s adding as %s instead" | |
753 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
754 | ||
04cb2f28 | 755 | #: merge-recursive.c:1171 |
649900bc JX |
756 | #, c-format |
757 | msgid "" | |
758 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" | |
759 | "\"->\"%s\" in \"%s\"%s" | |
760 | msgstr "" | |
761 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " | |
762 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" | |
763 | ||
04cb2f28 | 764 | #: merge-recursive.c:1176 |
649900bc JX |
765 | msgid " (left unresolved)" |
766 | msgstr "(留下未解决)" | |
767 | ||
04cb2f28 | 768 | #: merge-recursive.c:1230 |
649900bc JX |
769 | #, c-format |
770 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" | |
771 | msgstr "" | |
772 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" | |
773 | "%5$s" | |
774 | ||
04cb2f28 | 775 | #: merge-recursive.c:1260 |
649900bc JX |
776 | #, c-format |
777 | msgid "Renaming %s to %s and %s to %s instead" | |
07432cef | 778 | msgstr "而是重命名 %s 至 %s,以及 %s 至 %s" |
649900bc | 779 | |
04cb2f28 | 780 | #: merge-recursive.c:1459 |
649900bc JX |
781 | #, c-format |
782 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" | |
783 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
784 | ||
04cb2f28 | 785 | #: merge-recursive.c:1469 |
649900bc JX |
786 | #, c-format |
787 | msgid "Adding merged %s" | |
788 | msgstr "添加合并后的 %s" | |
789 | ||
04cb2f28 | 790 | #: merge-recursive.c:1474 merge-recursive.c:1672 |
649900bc JX |
791 | #, c-format |
792 | msgid "Adding as %s instead" | |
793 | msgstr "而是以 %s 为名添加" | |
794 | ||
04cb2f28 | 795 | #: merge-recursive.c:1525 |
649900bc JX |
796 | #, c-format |
797 | msgid "cannot read object %s" | |
798 | msgstr "不能读取对象 %s" | |
799 | ||
04cb2f28 | 800 | #: merge-recursive.c:1528 |
649900bc JX |
801 | #, c-format |
802 | msgid "object %s is not a blob" | |
07432cef | 803 | msgstr "对象 %s 不是一个数据(blob)对象" |
649900bc | 804 | |
04cb2f28 | 805 | #: merge-recursive.c:1576 |
649900bc JX |
806 | msgid "modify" |
807 | msgstr "修改" | |
808 | ||
04cb2f28 | 809 | #: merge-recursive.c:1576 |
649900bc JX |
810 | msgid "modified" |
811 | msgstr "修改" | |
812 | ||
04cb2f28 | 813 | #: merge-recursive.c:1586 |
649900bc JX |
814 | msgid "content" |
815 | msgstr "内容" | |
816 | ||
04cb2f28 | 817 | #: merge-recursive.c:1593 |
649900bc JX |
818 | msgid "add/add" |
819 | msgstr "添加/添加" | |
820 | ||
04cb2f28 | 821 | #: merge-recursive.c:1627 |
649900bc JX |
822 | #, c-format |
823 | msgid "Skipped %s (merged same as existing)" | |
824 | msgstr "略过 %s(已经做过相同合并)" | |
825 | ||
04cb2f28 | 826 | #: merge-recursive.c:1641 |
649900bc JX |
827 | #, c-format |
828 | msgid "Auto-merging %s" | |
829 | msgstr "自动合并 %s" | |
830 | ||
04cb2f28 | 831 | #: merge-recursive.c:1645 git-submodule.sh:1150 |
649900bc JX |
832 | msgid "submodule" |
833 | msgstr "子模组" | |
834 | ||
04cb2f28 | 835 | #: merge-recursive.c:1646 |
649900bc JX |
836 | #, c-format |
837 | msgid "CONFLICT (%s): Merge conflict in %s" | |
838 | msgstr "冲突(%s):合并冲突于 %s" | |
839 | ||
04cb2f28 | 840 | #: merge-recursive.c:1732 |
649900bc JX |
841 | #, c-format |
842 | msgid "Removing %s" | |
843 | msgstr "删除 %s" | |
844 | ||
04cb2f28 | 845 | #: merge-recursive.c:1757 |
649900bc JX |
846 | msgid "file/directory" |
847 | msgstr "文件/目录" | |
848 | ||
04cb2f28 | 849 | #: merge-recursive.c:1763 |
649900bc JX |
850 | msgid "directory/file" |
851 | msgstr "目录/文件" | |
852 | ||
04cb2f28 | 853 | #: merge-recursive.c:1768 |
649900bc JX |
854 | #, c-format |
855 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" | |
856 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
857 | ||
04cb2f28 | 858 | #: merge-recursive.c:1778 |
649900bc JX |
859 | #, c-format |
860 | msgid "Adding %s" | |
861 | msgstr "添加 %s" | |
862 | ||
04cb2f28 | 863 | #: merge-recursive.c:1795 |
649900bc JX |
864 | msgid "Fatal merge failure, shouldn't happen." |
865 | msgstr "严重的合并错误,不应发生。" | |
866 | ||
04cb2f28 | 867 | #: merge-recursive.c:1814 |
649900bc JX |
868 | msgid "Already up-to-date!" |
869 | msgstr "已经是最新的!" | |
870 | ||
04cb2f28 | 871 | #: merge-recursive.c:1823 |
649900bc JX |
872 | #, c-format |
873 | msgid "merging of trees %s and %s failed" | |
874 | msgstr "无法合并树 %s 和 %s" | |
875 | ||
04cb2f28 | 876 | #: merge-recursive.c:1853 |
649900bc JX |
877 | #, c-format |
878 | msgid "Unprocessed path??? %s" | |
879 | msgstr "未处理的路径??? %s" | |
880 | ||
44f518e6 | 881 | #: merge-recursive.c:1901 |
649900bc JX |
882 | msgid "Merging:" |
883 | msgstr "合并:" | |
884 | ||
44f518e6 | 885 | #: merge-recursive.c:1914 |
649900bc | 886 | #, c-format |
e5e38ce4 JX |
887 | msgid "found %u common ancestor:" |
888 | msgid_plural "found %u common ancestors:" | |
889 | msgstr[0] "发现 %u 个共同祖先:" | |
890 | msgstr[1] "发现 %u 个共同祖先:" | |
649900bc | 891 | |
44f518e6 | 892 | #: merge-recursive.c:1951 |
649900bc JX |
893 | msgid "merge returned no commit" |
894 | msgstr "合并未返回提交" | |
895 | ||
44f518e6 | 896 | #: merge-recursive.c:2008 |
649900bc JX |
897 | #, c-format |
898 | msgid "Could not parse object '%s'" | |
899 | msgstr "不能解析对象 '%s'" | |
900 | ||
44f518e6 | 901 | #: merge-recursive.c:2019 builtin/merge.c:667 |
649900bc JX |
902 | msgid "Unable to write index." |
903 | msgstr "不能写入索引。" | |
904 | ||
6acbf033 | 905 | #: notes-utils.c:41 |
2e8451e8 JX |
906 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
907 | msgstr "不能提交未初始化/未引用的注解树" | |
908 | ||
04cb2f28 | 909 | #: notes-utils.c:82 |
2e8451e8 JX |
910 | #, c-format |
911 | msgid "Bad notes.rewriteMode value: '%s'" | |
912 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
913 | ||
04cb2f28 | 914 | #: notes-utils.c:92 |
2e8451e8 JX |
915 | #, c-format |
916 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" | |
917 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
918 | ||
919 | #. TRANSLATORS: The first %s is the name of the | |
920 | #. environment variable, the second %s is its value | |
04cb2f28 | 921 | #: notes-utils.c:119 |
2e8451e8 JX |
922 | #, c-format |
923 | msgid "Bad %s value: '%s'" | |
924 | msgstr "坏的 %s 值:'%s'" | |
925 | ||
220c313c | 926 | #: object.c:241 |
1003b3a5 JX |
927 | #, c-format |
928 | msgid "unable to parse object: %s" | |
929 | msgstr "不能解析对象:%s" | |
930 | ||
220c313c | 931 | #: parse-options.c:546 |
8ada9598 | 932 | msgid "..." |
81809b99 | 933 | msgstr "..." |
8ada9598 | 934 | |
220c313c | 935 | #: parse-options.c:564 |
81809b99 | 936 | #, c-format |
8ada9598 | 937 | msgid "usage: %s" |
81809b99 | 938 | msgstr "用法:%s" |
8ada9598 JX |
939 | |
940 | #. TRANSLATORS: the colon here should align with the | |
941 | #. one in "usage: %s" translation | |
220c313c | 942 | #: parse-options.c:568 |
81809b99 | 943 | #, c-format |
8ada9598 | 944 | msgid " or: %s" |
81809b99 | 945 | msgstr " 或:%s" |
8ada9598 JX |
946 | |
947 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
220c313c | 948 | #: parse-options.c:571 |
81809b99 | 949 | #, c-format |
8ada9598 | 950 | msgid " %s" |
81809b99 | 951 | msgstr " %s" |
8ada9598 | 952 | |
220c313c | 953 | #: parse-options.c:605 |
63af42fe JX |
954 | msgid "-NUM" |
955 | msgstr "-数字" | |
956 | ||
cfff71a9 | 957 | #: pathspec.c:133 |
90314792 JX |
958 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
959 | msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容" | |
960 | ||
cfff71a9 | 961 | #: pathspec.c:143 |
90314792 JX |
962 | msgid "" |
963 | "global 'literal' pathspec setting is incompatible with all other global " | |
964 | "pathspec settings" | |
965 | msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容" | |
966 | ||
cfff71a9 | 967 | #: pathspec.c:177 |
90314792 JX |
968 | msgid "invalid parameter for pathspec magic 'prefix'" |
969 | msgstr "路径规则包含无效的神奇前缀" | |
970 | ||
cfff71a9 | 971 | #: pathspec.c:183 |
90314792 JX |
972 | #, c-format |
973 | msgid "Invalid pathspec magic '%.*s' in '%s'" | |
974 | msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" | |
975 | ||
cfff71a9 | 976 | #: pathspec.c:187 |
90314792 JX |
977 | #, c-format |
978 | msgid "Missing ')' at the end of pathspec magic in '%s'" | |
979 | msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'" | |
980 | ||
cfff71a9 | 981 | #: pathspec.c:205 |
90314792 JX |
982 | #, c-format |
983 | msgid "Unimplemented pathspec magic '%c' in '%s'" | |
984 | msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'" | |
985 | ||
cfff71a9 | 986 | #: pathspec.c:230 |
a77c07d9 | 987 | #, c-format |
90314792 JX |
988 | msgid "%s: 'literal' and 'glob' are incompatible" |
989 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
a77c07d9 | 990 | |
cfff71a9 | 991 | #: pathspec.c:241 |
a77c07d9 | 992 | #, c-format |
90314792 JX |
993 | msgid "%s: '%s' is outside repository" |
994 | msgstr "%s:'%s' 在版本库之外" | |
a77c07d9 | 995 | |
cfff71a9 | 996 | #: pathspec.c:291 |
90314792 JX |
997 | #, c-format |
998 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
999 | msgstr "路径规则 '%s' 在子模组 '%.*s' 中" | |
1000 | ||
cfff71a9 | 1001 | #: pathspec.c:353 |
90314792 JX |
1002 | #, c-format |
1003 | msgid "%s: pathspec magic not supported by this command: %s" | |
1004 | msgstr "%s:路径规则神奇前缀不被此命令支持:%s" | |
1005 | ||
6acbf033 | 1006 | #: pathspec.c:432 |
90314792 JX |
1007 | #, c-format |
1008 | msgid "pathspec '%s' is beyond a symbolic link" | |
1009 | msgstr "路径规则 '%s' 位于符号链接中" | |
1010 | ||
6acbf033 | 1011 | #: pathspec.c:441 |
cfff71a9 JX |
1012 | msgid "" |
1013 | "There is nothing to exclude from by :(exclude) patterns.\n" | |
1014 | "Perhaps you forgot to add either ':/' or '.' ?" | |
1015 | msgstr "" | |
1016 | "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" | |
1017 | "添加 ':/' 或 '.' ?" | |
1018 | ||
220c313c JX |
1019 | #: pretty.c:968 |
1020 | msgid "unable to parse --pretty format" | |
1021 | msgstr "不能解析 --pretty 格式" | |
1022 | ||
6acbf033 | 1023 | #: progress.c:225 |
6c94aba5 JX |
1024 | msgid "done" |
1025 | msgstr "完成" | |
1026 | ||
44f518e6 | 1027 | #: read-cache.c:1275 |
6c94aba5 JX |
1028 | #, c-format |
1029 | msgid "" | |
1030 | "index.version set, but the value is invalid.\n" | |
1031 | "Using version %i" | |
1032 | msgstr "" | |
1033 | "设置了 index.version,但是取值无效。\n" | |
1034 | "使用版本 %i" | |
1035 | ||
44f518e6 | 1036 | #: read-cache.c:1285 |
6c94aba5 JX |
1037 | #, c-format |
1038 | msgid "" | |
1039 | "GIT_INDEX_VERSION set, but the value is invalid.\n" | |
1040 | "Using version %i" | |
1041 | msgstr "" | |
1042 | "设置了 GIT_INDEX_VERSION,但是取值无效。\n" | |
1043 | "使用版本 %i" | |
1044 | ||
220c313c | 1045 | #: remote.c:782 |
cfff71a9 JX |
1046 | #, c-format |
1047 | msgid "Cannot fetch both %s and %s to %s" | |
1048 | msgstr "不能同时获取 %s 和 %s 至 %s" | |
1049 | ||
220c313c | 1050 | #: remote.c:786 |
cfff71a9 JX |
1051 | #, c-format |
1052 | msgid "%s usually tracks %s, not %s" | |
1053 | msgstr "%s 通常跟踪 %s,而非 %s" | |
1054 | ||
220c313c | 1055 | #: remote.c:790 |
cfff71a9 JX |
1056 | #, c-format |
1057 | msgid "%s tracks both %s and %s" | |
1058 | msgstr "%s 同时跟踪 %s 和 %s" | |
1059 | ||
220c313c | 1060 | #: remote.c:798 |
cfff71a9 JX |
1061 | msgid "Internal error" |
1062 | msgstr "内部错误" | |
1063 | ||
04cb2f28 | 1064 | #: remote.c:1980 |
90314792 JX |
1065 | #, c-format |
1066 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
1067 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
1068 | ||
04cb2f28 | 1069 | #: remote.c:1984 |
90314792 JX |
1070 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
1071 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
1072 | ||
04cb2f28 | 1073 | #: remote.c:1987 |
90314792 JX |
1074 | #, c-format |
1075 | msgid "Your branch is up-to-date with '%s'.\n" | |
1076 | msgstr "您的分支与上游分支 '%s' 一致。\n" | |
1077 | ||
04cb2f28 | 1078 | #: remote.c:1991 |
c04f5ac3 JX |
1079 | #, c-format |
1080 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
1081 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
1082 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
5ae481e0 | 1083 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" |
c04f5ac3 | 1084 | |
04cb2f28 | 1085 | #: remote.c:1997 |
07432cef WS |
1086 | msgid " (use \"git push\" to publish your local commits)\n" |
1087 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
1088 | ||
04cb2f28 | 1089 | #: remote.c:2000 |
c04f5ac3 JX |
1090 | #, c-format |
1091 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
1092 | msgid_plural "" | |
1093 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
90e6ef53 | 1094 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
5ae481e0 | 1095 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
c04f5ac3 | 1096 | |
07432cef | 1097 | # 译者:注意保持前导空格 |
04cb2f28 | 1098 | #: remote.c:2008 |
07432cef WS |
1099 | msgid " (use \"git pull\" to update your local branch)\n" |
1100 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
1101 | ||
04cb2f28 | 1102 | #: remote.c:2011 |
c04f5ac3 JX |
1103 | #, c-format |
1104 | msgid "" | |
1105 | "Your branch and '%s' have diverged,\n" | |
1106 | "and have %d and %d different commit each, respectively.\n" | |
1107 | msgid_plural "" | |
1108 | "Your branch and '%s' have diverged,\n" | |
1109 | "and have %d and %d different commits each, respectively.\n" | |
1110 | msgstr[0] "" | |
1111 | "您的分支和 '%s' 出现了偏离,\n" | |
195febda | 1112 | "并且分别有 %d 和 %d 处不同的提交。\n" |
5ae481e0 JX |
1113 | msgstr[1] "" |
1114 | "您的分支和 '%s' 出现了偏离,\n" | |
195febda | 1115 | "并且分别有 %d 和 %d 处不同的提交。\n" |
c04f5ac3 | 1116 | |
07432cef | 1117 | # 译者:注意保持前导空格 |
04cb2f28 | 1118 | #: remote.c:2021 |
07432cef WS |
1119 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
1120 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
1121 | ||
814ff314 JX |
1122 | #: revision.c:2348 |
1123 | msgid "--first-parent is incompatible with --bisect" | |
1124 | msgstr "--first-parent 与 --bisect 不兼容" | |
1125 | ||
1126 | #: run-command.c:83 | |
2e8451e8 JX |
1127 | msgid "open /dev/null failed" |
1128 | msgstr "不能打开 /dev/null" | |
1129 | ||
814ff314 | 1130 | #: run-command.c:85 |
2e8451e8 JX |
1131 | #, c-format |
1132 | msgid "dup2(%d,%d) failed" | |
1133 | msgstr "不能调用 dup2(%d,%d)" | |
1134 | ||
814ff314 | 1135 | #: send-pack.c:272 |
220c313c JX |
1136 | msgid "failed to sign the push certificate" |
1137 | msgstr "无法为推送证书签名" | |
1138 | ||
814ff314 | 1139 | #: send-pack.c:356 |
220c313c JX |
1140 | msgid "the receiving end does not support --signed push" |
1141 | msgstr "接收端不支持签名推送" | |
1142 | ||
814ff314 | 1143 | #: send-pack.c:366 |
44f518e6 JX |
1144 | msgid "the receiving end does not support --atomic push" |
1145 | msgstr "接收端不支持原子推送" | |
814ff314 | 1146 | |
04cb2f28 JX |
1147 | #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 |
1148 | #: builtin/merge.c:1005 | |
c04f5ac3 JX |
1149 | #, c-format |
1150 | msgid "Could not open '%s' for writing" | |
90e6ef53 | 1151 | msgstr "不能为写入打开 '%s'" |
c04f5ac3 | 1152 | |
04cb2f28 JX |
1153 | #: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997 |
1154 | #: builtin/merge.c:1010 | |
c04f5ac3 JX |
1155 | #, c-format |
1156 | msgid "Could not write to '%s'" | |
90e6ef53 | 1157 | msgstr "不能写入 '%s'" |
c04f5ac3 | 1158 | |
220c313c | 1159 | #: sequencer.c:195 |
14c8bced JX |
1160 | msgid "" |
1161 | "after resolving the conflicts, mark the corrected paths\n" | |
1162 | "with 'git add <paths>' or 'git rm <paths>'" | |
1163 | msgstr "" | |
d9d56b23 | 1164 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" |
14c8bced JX |
1165 | "命令标记修正后的文件" |
1166 | ||
220c313c | 1167 | #: sequencer.c:198 |
c04f5ac3 JX |
1168 | msgid "" |
1169 | "after resolving the conflicts, mark the corrected paths\n" | |
1170 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
1171 | "and commit the result with 'git commit'" | |
1172 | msgstr "" | |
d9d56b23 | 1173 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" |
c04f5ac3 JX |
1174 | "对修正后的文件做标记,然后用 'git commit' 提交" |
1175 | ||
814ff314 | 1176 | #: sequencer.c:211 sequencer.c:861 sequencer.c:944 |
c04f5ac3 JX |
1177 | #, c-format |
1178 | msgid "Could not write to %s" | |
1179 | msgstr "不能写入 %s" | |
1180 | ||
220c313c | 1181 | #: sequencer.c:214 |
c04f5ac3 JX |
1182 | #, c-format |
1183 | msgid "Error wrapping up %s" | |
1184 | msgstr "错误收尾 %s" | |
1185 | ||
220c313c | 1186 | #: sequencer.c:229 |
c04f5ac3 JX |
1187 | msgid "Your local changes would be overwritten by cherry-pick." |
1188 | msgstr "您的本地修改将被拣选操作覆盖。" | |
1189 | ||
220c313c | 1190 | #: sequencer.c:231 |
c04f5ac3 JX |
1191 | msgid "Your local changes would be overwritten by revert." |
1192 | msgstr "您的本地修改将被还原操作覆盖。" | |
1193 | ||
220c313c | 1194 | #: sequencer.c:234 |
c04f5ac3 JX |
1195 | msgid "Commit your changes or stash them to proceed." |
1196 | msgstr "提交您的修改或保存进度后再继续。" | |
1197 | ||
1198 | #. TRANSLATORS: %s will be "revert" or "cherry-pick" | |
04cb2f28 | 1199 | #: sequencer.c:321 |
c04f5ac3 JX |
1200 | #, c-format |
1201 | msgid "%s: Unable to write new index file" | |
90e6ef53 | 1202 | msgstr "%s:无法写入新索引文件" |
c04f5ac3 | 1203 | |
04cb2f28 | 1204 | #: sequencer.c:339 |
8ada9598 | 1205 | msgid "Could not resolve HEAD commit\n" |
81809b99 | 1206 | msgstr "不能解析 HEAD 提交\n" |
8ada9598 | 1207 | |
04cb2f28 | 1208 | #: sequencer.c:359 |
8ada9598 | 1209 | msgid "Unable to update cache tree\n" |
81809b99 | 1210 | msgstr "不能更新缓存\n" |
8ada9598 | 1211 | |
814ff314 | 1212 | #: sequencer.c:411 |
81809b99 | 1213 | #, c-format |
8ada9598 | 1214 | msgid "Could not parse commit %s\n" |
81809b99 | 1215 | msgstr "不能解析提交 %s\n" |
8ada9598 | 1216 | |
814ff314 | 1217 | #: sequencer.c:416 |
81809b99 | 1218 | #, c-format |
8ada9598 | 1219 | msgid "Could not parse parent commit %s\n" |
81809b99 | 1220 | msgstr "不能解析父提交 %s\n" |
8ada9598 | 1221 | |
814ff314 | 1222 | #: sequencer.c:482 |
c04f5ac3 | 1223 | msgid "Your index file is unmerged." |
90e6ef53 | 1224 | msgstr "您的索引文件未完成合并。" |
c04f5ac3 | 1225 | |
814ff314 | 1226 | #: sequencer.c:501 |
c04f5ac3 JX |
1227 | #, c-format |
1228 | msgid "Commit %s is a merge but no -m option was given." | |
1229 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
1230 | ||
814ff314 | 1231 | #: sequencer.c:509 |
c04f5ac3 JX |
1232 | #, c-format |
1233 | msgid "Commit %s does not have parent %d" | |
1234 | msgstr "提交 %s 没有父提交 %d" | |
1235 | ||
814ff314 | 1236 | #: sequencer.c:513 |
c04f5ac3 JX |
1237 | #, c-format |
1238 | msgid "Mainline was specified but commit %s is not a merge." | |
90e6ef53 | 1239 | msgstr "指定了主线但提交 %s 不是一个合并。" |
c04f5ac3 JX |
1240 | |
1241 | #. TRANSLATORS: The first %s will be "revert" or | |
1242 | #. "cherry-pick", the second %s a SHA1 | |
814ff314 | 1243 | #: sequencer.c:526 |
c04f5ac3 JX |
1244 | #, c-format |
1245 | msgid "%s: cannot parse parent commit %s" | |
1246 | msgstr "%s:不能解析父提交 %s" | |
1247 | ||
814ff314 | 1248 | #: sequencer.c:530 |
c04f5ac3 JX |
1249 | #, c-format |
1250 | msgid "Cannot get commit message for %s" | |
1251 | msgstr "不能得到 %s 的提交说明" | |
1252 | ||
814ff314 | 1253 | #: sequencer.c:616 |
c04f5ac3 JX |
1254 | #, c-format |
1255 | msgid "could not revert %s... %s" | |
1256 | msgstr "不能还原 %s... %s" | |
1257 | ||
814ff314 | 1258 | #: sequencer.c:617 |
c04f5ac3 JX |
1259 | #, c-format |
1260 | msgid "could not apply %s... %s" | |
1261 | msgstr "不能应用 %s... %s" | |
1262 | ||
814ff314 | 1263 | #: sequencer.c:653 |
c04f5ac3 JX |
1264 | msgid "empty commit set passed" |
1265 | msgstr "提供了空的提交集" | |
1266 | ||
814ff314 | 1267 | #: sequencer.c:661 |
c04f5ac3 JX |
1268 | #, c-format |
1269 | msgid "git %s: failed to read the index" | |
90e6ef53 | 1270 | msgstr "git %s:无法读取索引" |
c04f5ac3 | 1271 | |
814ff314 | 1272 | #: sequencer.c:665 |
c04f5ac3 JX |
1273 | #, c-format |
1274 | msgid "git %s: failed to refresh the index" | |
90e6ef53 | 1275 | msgstr "git %s:无法刷新索引" |
c04f5ac3 | 1276 | |
814ff314 | 1277 | #: sequencer.c:725 |
c04f5ac3 JX |
1278 | #, c-format |
1279 | msgid "Cannot %s during a %s" | |
90e6ef53 | 1280 | msgstr "无法 %s 在一个 %s 过程中" |
c04f5ac3 | 1281 | |
814ff314 | 1282 | #: sequencer.c:747 |
c04f5ac3 JX |
1283 | #, c-format |
1284 | msgid "Could not parse line %d." | |
90e6ef53 | 1285 | msgstr "不能解析第 %d 行。" |
c04f5ac3 | 1286 | |
814ff314 | 1287 | #: sequencer.c:752 |
c04f5ac3 | 1288 | msgid "No commits parsed." |
7e238ab7 | 1289 | msgstr "没有提交被解析。" |
c04f5ac3 | 1290 | |
814ff314 | 1291 | #: sequencer.c:765 |
c04f5ac3 JX |
1292 | #, c-format |
1293 | msgid "Could not open %s" | |
1294 | msgstr "不能打开 %s" | |
1295 | ||
814ff314 | 1296 | #: sequencer.c:769 |
c04f5ac3 JX |
1297 | #, c-format |
1298 | msgid "Could not read %s." | |
1299 | msgstr "不能读取 %s。" | |
1300 | ||
814ff314 | 1301 | #: sequencer.c:776 |
c04f5ac3 JX |
1302 | #, c-format |
1303 | msgid "Unusable instruction sheet: %s" | |
1304 | msgstr "无用的指令表单:%s" | |
1305 | ||
814ff314 | 1306 | #: sequencer.c:806 |
c04f5ac3 JX |
1307 | #, c-format |
1308 | msgid "Invalid key: %s" | |
1309 | msgstr "无效键名:%s" | |
1310 | ||
814ff314 | 1311 | #: sequencer.c:809 |
c04f5ac3 JX |
1312 | #, c-format |
1313 | msgid "Invalid value for %s: %s" | |
81809b99 | 1314 | msgstr "%s 的值无效:%s" |
c04f5ac3 | 1315 | |
814ff314 | 1316 | #: sequencer.c:821 |
c04f5ac3 JX |
1317 | #, c-format |
1318 | msgid "Malformed options sheet: %s" | |
1319 | msgstr "非法的选项表单:%s" | |
1320 | ||
814ff314 | 1321 | #: sequencer.c:842 |
c04f5ac3 JX |
1322 | msgid "a cherry-pick or revert is already in progress" |
1323 | msgstr "一个拣选或还原操作已在进行" | |
1324 | ||
814ff314 | 1325 | #: sequencer.c:843 |
c04f5ac3 JX |
1326 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
1327 | msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" | |
1328 | ||
814ff314 | 1329 | #: sequencer.c:847 |
c04f5ac3 JX |
1330 | #, c-format |
1331 | msgid "Could not create sequencer directory %s" | |
90e6ef53 | 1332 | msgstr "不能创建序列目录 %s" |
c04f5ac3 | 1333 | |
814ff314 | 1334 | #: sequencer.c:863 sequencer.c:948 |
c04f5ac3 JX |
1335 | #, c-format |
1336 | msgid "Error wrapping up %s." | |
1337 | msgstr "错误收尾 %s。" | |
1338 | ||
814ff314 | 1339 | #: sequencer.c:882 sequencer.c:1018 |
c04f5ac3 | 1340 | msgid "no cherry-pick or revert in progress" |
195febda | 1341 | msgstr "拣选或还原操作并未进行" |
c04f5ac3 | 1342 | |
814ff314 | 1343 | #: sequencer.c:884 |
c04f5ac3 JX |
1344 | msgid "cannot resolve HEAD" |
1345 | msgstr "不能解析 HEAD" | |
1346 | ||
814ff314 | 1347 | #: sequencer.c:886 |
c04f5ac3 | 1348 | msgid "cannot abort from a branch yet to be born" |
90e6ef53 | 1349 | msgstr "不能从尚未建立的分支终止" |
c04f5ac3 | 1350 | |
44f518e6 | 1351 | #: sequencer.c:908 builtin/apply.c:4288 |
c04f5ac3 JX |
1352 | #, c-format |
1353 | msgid "cannot open %s: %s" | |
1354 | msgstr "不能打开 %s:%s" | |
1355 | ||
814ff314 | 1356 | #: sequencer.c:911 |
c04f5ac3 JX |
1357 | #, c-format |
1358 | msgid "cannot read %s: %s" | |
1359 | msgstr "不能读取 %s:%s" | |
1360 | ||
814ff314 | 1361 | #: sequencer.c:912 |
c04f5ac3 | 1362 | msgid "unexpected end of file" |
9aafc933 | 1363 | msgstr "意外的文件结束" |
c04f5ac3 | 1364 | |
814ff314 | 1365 | #: sequencer.c:918 |
c04f5ac3 JX |
1366 | #, c-format |
1367 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
90e6ef53 | 1368 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" |
c04f5ac3 | 1369 | |
814ff314 | 1370 | #: sequencer.c:941 |
c04f5ac3 JX |
1371 | #, c-format |
1372 | msgid "Could not format %s." | |
1373 | msgstr "不能格式化 %s。" | |
1374 | ||
814ff314 | 1375 | #: sequencer.c:1086 |
4dcdc3d8 JX |
1376 | #, c-format |
1377 | msgid "%s: can't cherry-pick a %s" | |
1378 | msgstr "%s:不能拣选一个%s" | |
1379 | ||
814ff314 | 1380 | #: sequencer.c:1089 |
4dcdc3d8 JX |
1381 | #, c-format |
1382 | msgid "%s: bad revision" | |
1383 | msgstr "%s:错误的版本" | |
1384 | ||
814ff314 | 1385 | #: sequencer.c:1123 |
c04f5ac3 JX |
1386 | msgid "Can't revert as initial commit" |
1387 | msgstr "不能作为初始提交还原" | |
1388 | ||
814ff314 | 1389 | #: sequencer.c:1124 |
c04f5ac3 JX |
1390 | msgid "Can't cherry-pick into empty head" |
1391 | msgstr "不能拣选到空分支" | |
1392 | ||
220c313c | 1393 | #: sha1_name.c:440 |
2e8451e8 JX |
1394 | msgid "" |
1395 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
1396 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
1397 | "may be created by mistake. For example,\n" | |
1398 | "\n" | |
1399 | " git checkout -b $br $(git rev-parse ...)\n" | |
1400 | "\n" | |
1401 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
1402 | "examine these refs and maybe delete them. Turn this message off by\n" | |
b1894384 | 1403 | "running \"git config advice.objectNameWarning false\"" |
2e8451e8 JX |
1404 | msgstr "" |
1405 | "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n" | |
1406 | "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n" | |
1407 | "\n" | |
1408 | " git checkout -b $br $(git rev-parse ...)\n" | |
1409 | "\n" | |
1410 | "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n" | |
b1894384 | 1411 | "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" |
2e8451e8 JX |
1412 | "命令关闭本消息通知。" |
1413 | ||
220c313c | 1414 | #: sha1_name.c:1068 |
170e9899 JX |
1415 | msgid "HEAD does not point to a branch" |
1416 | msgstr "HEAD 没有指向一个分支" | |
1417 | ||
220c313c | 1418 | #: sha1_name.c:1071 |
170e9899 JX |
1419 | #, c-format |
1420 | msgid "No such branch: '%s'" | |
1421 | msgstr "没有此分支:'%s'" | |
1422 | ||
220c313c | 1423 | #: sha1_name.c:1073 |
170e9899 JX |
1424 | #, c-format |
1425 | msgid "No upstream configured for branch '%s'" | |
1426 | msgstr "尚未给分支 '%s' 设置上游" | |
1427 | ||
220c313c | 1428 | #: sha1_name.c:1077 |
170e9899 JX |
1429 | #, c-format |
1430 | msgid "Upstream branch '%s' not stored as a remote-tracking branch" | |
1431 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
1432 | ||
90314792 JX |
1433 | #: submodule.c:64 submodule.c:98 |
1434 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" | |
1435 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
1436 | ||
1437 | #: submodule.c:68 submodule.c:102 | |
1438 | #, c-format | |
1439 | msgid "Could not find section in .gitmodules where path=%s" | |
1440 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
1441 | ||
90314792 JX |
1442 | #: submodule.c:76 |
1443 | #, c-format | |
1444 | msgid "Could not update .gitmodules entry %s" | |
1445 | msgstr "不能更新 .gitmodules 条目 %s" | |
1446 | ||
90314792 JX |
1447 | #: submodule.c:109 |
1448 | #, c-format | |
1449 | msgid "Could not remove .gitmodules entry for %s" | |
1450 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
1451 | ||
6c94aba5 | 1452 | #: submodule.c:120 |
90314792 JX |
1453 | msgid "staging updated .gitmodules failed" |
1454 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
1455 | ||
814ff314 | 1456 | #: submodule.c:1109 builtin/init-db.c:371 |
90314792 JX |
1457 | #, c-format |
1458 | msgid "Could not create git link %s" | |
1459 | msgstr "不能创建 git link %s" | |
1460 | ||
814ff314 | 1461 | #: submodule.c:1120 |
90314792 JX |
1462 | #, c-format |
1463 | msgid "Could not set core.worktree in %s" | |
1464 | msgstr "不能在 %s 中设置 core.worktree" | |
1465 | ||
814ff314 JX |
1466 | #: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 |
1467 | #: trailer.c:561 | |
220c313c JX |
1468 | #, c-format |
1469 | msgid "unknown value '%s' for key '%s'" | |
1470 | msgstr "键 '%2$s' 的未知取值 '%1$s'" | |
1471 | ||
814ff314 | 1472 | #: trailer.c:543 trailer.c:548 builtin/remote.c:290 |
220c313c JX |
1473 | #, c-format |
1474 | msgid "more than one %s" | |
1475 | msgstr "多于一个 %s" | |
1476 | ||
814ff314 | 1477 | #: trailer.c:581 |
220c313c | 1478 | #, c-format |
9aeb4c2b JX |
1479 | msgid "empty trailer token in trailer '%.*s'" |
1480 | msgstr "签名 '%.*s' 的键为空" | |
220c313c | 1481 | |
814ff314 | 1482 | #: trailer.c:701 |
220c313c JX |
1483 | #, c-format |
1484 | msgid "could not read input file '%s'" | |
1485 | msgstr "不能读取输入文件 '%s'" | |
1486 | ||
814ff314 | 1487 | #: trailer.c:704 |
220c313c JX |
1488 | msgid "could not read from stdin" |
1489 | msgstr "不能自标准输入读取" | |
1490 | ||
6acbf033 | 1491 | #: unpack-trees.c:202 |
6c94aba5 JX |
1492 | msgid "Checking out files" |
1493 | msgstr "正在检出文件" | |
1494 | ||
90314792 JX |
1495 | #: urlmatch.c:120 |
1496 | msgid "invalid URL scheme name or missing '://' suffix" | |
1497 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
1498 | ||
1499 | #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 | |
1500 | #, c-format | |
1501 | msgid "invalid %XX escape sequence" | |
1502 | msgstr "无效的 %XX 转义序列" | |
1503 | ||
1504 | #: urlmatch.c:172 | |
1505 | msgid "missing host and scheme is not 'file:'" | |
1506 | msgstr "缺失主机名且URL方案不是 'file:'" | |
1507 | ||
1508 | #: urlmatch.c:189 | |
1509 | msgid "a 'file:' URL may not have a port number" | |
1510 | msgstr "一个 'file:' URL 不应该包含端口号" | |
1511 | ||
1512 | #: urlmatch.c:199 | |
1513 | msgid "invalid characters in host name" | |
1514 | msgstr "主机名中包含无效的字符" | |
1515 | ||
1516 | #: urlmatch.c:244 urlmatch.c:255 | |
1517 | msgid "invalid port number" | |
1518 | msgstr "无效的端口号" | |
1519 | ||
1520 | #: urlmatch.c:322 | |
1521 | msgid "invalid '..' path segment" | |
1522 | msgstr "无效的 '..' 路径片段" | |
1523 | ||
814ff314 | 1524 | #: wrapper.c:523 |
07432cef | 1525 | #, c-format |
ef317cd5 | 1526 | msgid "unable to access '%s': %s" |
07432cef WS |
1527 | msgstr "不能访问 '%s':%s" |
1528 | ||
814ff314 | 1529 | #: wrapper.c:544 |
07432cef WS |
1530 | #, c-format |
1531 | msgid "unable to access '%s'" | |
1532 | msgstr "不能访问 '%s'" | |
ef317cd5 | 1533 | |
814ff314 | 1534 | #: wrapper.c:555 |
d691f479 JX |
1535 | #, c-format |
1536 | msgid "unable to look up current user in the passwd file: %s" | |
07432cef | 1537 | msgstr "无法在口令文件中查询到当前用户:%s" |
d691f479 | 1538 | |
814ff314 | 1539 | #: wrapper.c:556 |
d691f479 JX |
1540 | msgid "no such user" |
1541 | msgstr "无此用户" | |
1542 | ||
814ff314 | 1543 | #: wrapper.c:564 |
220c313c JX |
1544 | msgid "unable to get current working directory" |
1545 | msgstr "不能获取当前工作目录" | |
1546 | ||
cfff71a9 | 1547 | #: wt-status.c:150 |
c04f5ac3 JX |
1548 | msgid "Unmerged paths:" |
1549 | msgstr "未合并的路径:" | |
1550 | ||
90e6ef53 | 1551 | # 译者:注意保持前导空格 |
cfff71a9 | 1552 | #: wt-status.c:177 wt-status.c:204 |
c04f5ac3 JX |
1553 | #, c-format |
1554 | msgid " (use \"git reset %s <file>...\" to unstage)" | |
d9d56b23 | 1555 | msgstr " (使用 \"git reset %s <文件>...\" 撤出暂存区)" |
c04f5ac3 | 1556 | |
90e6ef53 | 1557 | # 译者:注意保持前导空格 |
cfff71a9 | 1558 | #: wt-status.c:179 wt-status.c:206 |
c04f5ac3 | 1559 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
d9d56b23 | 1560 | msgstr " (使用 \"git rm --cached <文件>...\" 撤出暂存区)" |
c04f5ac3 | 1561 | |
90e6ef53 | 1562 | # 译者:注意保持前导空格 |
cfff71a9 | 1563 | #: wt-status.c:183 |
6792b93b | 1564 | msgid " (use \"git add <file>...\" to mark resolution)" |
d9d56b23 | 1565 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" |
6792b93b JX |
1566 | |
1567 | # 译者:注意保持前导空格 | |
cfff71a9 | 1568 | #: wt-status.c:185 wt-status.c:189 |
c04f5ac3 | 1569 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
d9d56b23 | 1570 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" |
c04f5ac3 | 1571 | |
6792b93b | 1572 | # 译者:注意保持前导空格 |
cfff71a9 | 1573 | #: wt-status.c:187 |
6792b93b | 1574 | msgid " (use \"git rm <file>...\" to mark resolution)" |
d9d56b23 | 1575 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" |
6792b93b | 1576 | |
814ff314 | 1577 | #: wt-status.c:198 wt-status.c:878 |
c04f5ac3 JX |
1578 | msgid "Changes to be committed:" |
1579 | msgstr "要提交的变更:" | |
1580 | ||
814ff314 | 1581 | #: wt-status.c:216 wt-status.c:887 |
c04f5ac3 | 1582 | msgid "Changes not staged for commit:" |
7e238ab7 | 1583 | msgstr "尚未暂存以备提交的变更:" |
c04f5ac3 | 1584 | |
90e6ef53 | 1585 | # 译者:注意保持前导空格 |
cfff71a9 | 1586 | #: wt-status.c:220 |
c04f5ac3 | 1587 | msgid " (use \"git add <file>...\" to update what will be committed)" |
d9d56b23 | 1588 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" |
c04f5ac3 | 1589 | |
90e6ef53 | 1590 | # 译者:注意保持前导空格 |
cfff71a9 | 1591 | #: wt-status.c:222 |
c04f5ac3 | 1592 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
d9d56b23 | 1593 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" |
c04f5ac3 | 1594 | |
90e6ef53 | 1595 | # 译者:注意保持前导空格 |
cfff71a9 | 1596 | #: wt-status.c:223 |
c04f5ac3 JX |
1597 | msgid "" |
1598 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" | |
d9d56b23 | 1599 | msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)" |
c04f5ac3 | 1600 | |
90e6ef53 | 1601 | # 译者:注意保持前导空格 |
cfff71a9 | 1602 | #: wt-status.c:225 |
c04f5ac3 JX |
1603 | msgid " (commit or discard the untracked or modified content in submodules)" |
1604 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
1605 | ||
90e6ef53 | 1606 | # 译者:注意保持前导空格 |
cfff71a9 | 1607 | #: wt-status.c:237 |
c04f5ac3 JX |
1608 | #, c-format |
1609 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
d9d56b23 | 1610 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" |
c04f5ac3 | 1611 | |
6c94aba5 | 1612 | #: wt-status.c:252 |
c04f5ac3 JX |
1613 | msgid "both deleted:" |
1614 | msgstr "双方删除:" | |
1615 | ||
6c94aba5 | 1616 | #: wt-status.c:254 |
c04f5ac3 JX |
1617 | msgid "added by us:" |
1618 | msgstr "由我们添加:" | |
1619 | ||
6c94aba5 | 1620 | #: wt-status.c:256 |
c04f5ac3 JX |
1621 | msgid "deleted by them:" |
1622 | msgstr "由他们删除:" | |
1623 | ||
6c94aba5 | 1624 | #: wt-status.c:258 |
c04f5ac3 JX |
1625 | msgid "added by them:" |
1626 | msgstr "由他们添加:" | |
1627 | ||
6c94aba5 | 1628 | #: wt-status.c:260 |
c04f5ac3 JX |
1629 | msgid "deleted by us:" |
1630 | msgstr "由我们删除:" | |
1631 | ||
6c94aba5 | 1632 | #: wt-status.c:262 |
c04f5ac3 JX |
1633 | msgid "both added:" |
1634 | msgstr "双方添加:" | |
1635 | ||
6c94aba5 | 1636 | #: wt-status.c:264 |
c04f5ac3 JX |
1637 | msgid "both modified:" |
1638 | msgstr "双方修改:" | |
1639 | ||
6c94aba5 JX |
1640 | #: wt-status.c:266 |
1641 | #, c-format | |
1642 | msgid "bug: unhandled unmerged status %x" | |
1643 | msgstr "bug:无法处理的未合并状态 %x" | |
cfff71a9 | 1644 | |
6c94aba5 JX |
1645 | #: wt-status.c:274 |
1646 | msgid "new file:" | |
1647 | msgstr "新文件:" | |
cfff71a9 | 1648 | |
6c94aba5 JX |
1649 | #: wt-status.c:276 |
1650 | msgid "copied:" | |
1651 | msgstr "拷贝:" | |
cfff71a9 | 1652 | |
6c94aba5 JX |
1653 | #: wt-status.c:278 |
1654 | msgid "deleted:" | |
1655 | msgstr "删除:" | |
cfff71a9 | 1656 | |
6c94aba5 JX |
1657 | #: wt-status.c:280 |
1658 | msgid "modified:" | |
1659 | msgstr "修改:" | |
1660 | ||
1661 | #: wt-status.c:282 | |
1662 | msgid "renamed:" | |
1663 | msgstr "重命名:" | |
1664 | ||
1665 | #: wt-status.c:284 | |
1666 | msgid "typechange:" | |
1667 | msgstr "类型变更:" | |
1668 | ||
1669 | #: wt-status.c:286 | |
1670 | msgid "unknown:" | |
1671 | msgstr "未知:" | |
cfff71a9 | 1672 | |
6c94aba5 JX |
1673 | #: wt-status.c:288 |
1674 | msgid "unmerged:" | |
1675 | msgstr "未合并:" | |
cfff71a9 | 1676 | |
90e6ef53 | 1677 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
6c94aba5 | 1678 | #: wt-status.c:370 |
c04f5ac3 | 1679 | msgid "new commits, " |
aa9565f7 | 1680 | msgstr "新提交, " |
c04f5ac3 | 1681 | |
90e6ef53 | 1682 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
6c94aba5 | 1683 | #: wt-status.c:372 |
c04f5ac3 | 1684 | msgid "modified content, " |
aa9565f7 | 1685 | msgstr "修改的内容, " |
c04f5ac3 | 1686 | |
90e6ef53 | 1687 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
6c94aba5 | 1688 | #: wt-status.c:374 |
c04f5ac3 | 1689 | msgid "untracked content, " |
aa9565f7 | 1690 | msgstr "未跟踪的内容, " |
c04f5ac3 | 1691 | |
6c94aba5 | 1692 | #: wt-status.c:391 |
c04f5ac3 JX |
1693 | #, c-format |
1694 | msgid "bug: unhandled diff status %c" | |
6c94aba5 | 1695 | msgstr "bug:无法处理的差异状态 %c" |
c04f5ac3 | 1696 | |
814ff314 | 1697 | #: wt-status.c:753 |
90314792 JX |
1698 | msgid "Submodules changed but not updated:" |
1699 | msgstr "子模组已修改但尚未更新:" | |
1700 | ||
814ff314 | 1701 | #: wt-status.c:755 |
90314792 JX |
1702 | msgid "Submodule changes to be committed:" |
1703 | msgstr "要提交的子模组变更:" | |
1704 | ||
814ff314 | 1705 | #: wt-status.c:835 |
cfff71a9 JX |
1706 | msgid "" |
1707 | "Do not touch the line above.\n" | |
1708 | "Everything below will be removed." | |
1709 | msgstr "" | |
1710 | "不要改动上面的一行。\n" | |
1711 | "下面的所有内容均将被删除。" | |
1712 | ||
814ff314 | 1713 | #: wt-status.c:946 |
6792b93b | 1714 | msgid "You have unmerged paths." |
195febda | 1715 | msgstr "您有尚未合并的路径。" |
6792b93b JX |
1716 | |
1717 | # 译者:注意保持前导空格 | |
814ff314 | 1718 | #: wt-status.c:949 |
6792b93b JX |
1719 | msgid " (fix conflicts and run \"git commit\")" |
1720 | msgstr " (解决冲突并运行 \"git commit\")" | |
1721 | ||
814ff314 | 1722 | #: wt-status.c:952 |
6792b93b JX |
1723 | msgid "All conflicts fixed but you are still merging." |
1724 | msgstr "所有冲突已解决但您仍处于合并中。" | |
1725 | ||
1726 | # 译者:注意保持前导空格 | |
814ff314 | 1727 | #: wt-status.c:955 |
6792b93b JX |
1728 | msgid " (use \"git commit\" to conclude merge)" |
1729 | msgstr " (使用 \"git commit\" 结束合并)" | |
1730 | ||
814ff314 | 1731 | #: wt-status.c:965 |
6792b93b | 1732 | msgid "You are in the middle of an am session." |
98b2761d | 1733 | msgstr "您正处于 am 操作过程中。" |
6792b93b | 1734 | |
814ff314 | 1735 | #: wt-status.c:968 |
6792b93b JX |
1736 | msgid "The current patch is empty." |
1737 | msgstr "当前的补丁为空。" | |
1738 | ||
1739 | # 译者:注意保持前导空格 | |
814ff314 | 1740 | #: wt-status.c:972 |
2e8451e8 JX |
1741 | msgid " (fix conflicts and then run \"git am --continue\")" |
1742 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
6792b93b JX |
1743 | |
1744 | # 译者:注意保持前导空格 | |
814ff314 | 1745 | #: wt-status.c:974 |
6792b93b JX |
1746 | msgid " (use \"git am --skip\" to skip this patch)" |
1747 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
1748 | ||
1749 | # 译者:注意保持前导空格 | |
814ff314 | 1750 | #: wt-status.c:976 |
6792b93b JX |
1751 | msgid " (use \"git am --abort\" to restore the original branch)" |
1752 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
1753 | ||
814ff314 | 1754 | #: wt-status.c:1036 wt-status.c:1053 |
63af42fe JX |
1755 | #, c-format |
1756 | msgid "You are currently rebasing branch '%s' on '%s'." | |
98b2761d | 1757 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" |
63af42fe | 1758 | |
814ff314 | 1759 | #: wt-status.c:1041 wt-status.c:1058 |
6792b93b | 1760 | msgid "You are currently rebasing." |
98b2761d | 1761 | msgstr "您在执行变基操作。" |
6792b93b JX |
1762 | |
1763 | # 译者:注意保持前导空格 | |
814ff314 | 1764 | #: wt-status.c:1044 |
6792b93b JX |
1765 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
1766 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
1767 | ||
1768 | # 译者:注意保持前导空格 | |
814ff314 | 1769 | #: wt-status.c:1046 |
6792b93b JX |
1770 | msgid " (use \"git rebase --skip\" to skip this patch)" |
1771 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
1772 | ||
1773 | # 译者:注意保持前导空格 | |
814ff314 | 1774 | #: wt-status.c:1048 |
6792b93b JX |
1775 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
1776 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
1777 | ||
1778 | # 译者:注意保持前导空格 | |
814ff314 | 1779 | #: wt-status.c:1061 |
6792b93b JX |
1780 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
1781 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
1782 | ||
814ff314 | 1783 | #: wt-status.c:1065 |
63af42fe JX |
1784 | #, c-format |
1785 | msgid "" | |
1786 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." | |
98b2761d | 1787 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" |
63af42fe | 1788 | |
814ff314 | 1789 | #: wt-status.c:1070 |
6792b93b | 1790 | msgid "You are currently splitting a commit during a rebase." |
98b2761d | 1791 | msgstr "您在执行变基操作时拆分提交。" |
6792b93b JX |
1792 | |
1793 | # 译者:注意保持前导空格 | |
814ff314 | 1794 | #: wt-status.c:1073 |
6792b93b JX |
1795 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
1796 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
1797 | ||
814ff314 | 1798 | #: wt-status.c:1077 |
63af42fe JX |
1799 | #, c-format |
1800 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
98b2761d | 1801 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" |
63af42fe | 1802 | |
814ff314 | 1803 | #: wt-status.c:1082 |
6792b93b | 1804 | msgid "You are currently editing a commit during a rebase." |
98b2761d | 1805 | msgstr "您在执行变基操作时编辑提交。" |
6792b93b JX |
1806 | |
1807 | # 译者:注意保持前导空格 | |
814ff314 | 1808 | #: wt-status.c:1085 |
6792b93b JX |
1809 | msgid " (use \"git commit --amend\" to amend the current commit)" |
1810 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
1811 | ||
1812 | # 译者:注意保持前导空格 | |
814ff314 | 1813 | #: wt-status.c:1087 |
6792b93b JX |
1814 | msgid "" |
1815 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
195febda | 1816 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" |
6792b93b | 1817 | |
814ff314 | 1818 | #: wt-status.c:1097 |
90314792 JX |
1819 | #, c-format |
1820 | msgid "You are currently cherry-picking commit %s." | |
98b2761d | 1821 | msgstr "您在执行拣选提交 %s 的操作。" |
6792b93b | 1822 | |
2e8451e8 | 1823 | # 译者:注意保持前导空格 |
814ff314 | 1824 | #: wt-status.c:1102 |
2e8451e8 JX |
1825 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
1826 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
1827 | ||
6792b93b | 1828 | # 译者:注意保持前导空格 |
814ff314 | 1829 | #: wt-status.c:1105 |
2e8451e8 JX |
1830 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
1831 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
6792b93b | 1832 | |
2e8451e8 | 1833 | # 译者:注意保持前导空格 |
814ff314 | 1834 | #: wt-status.c:1107 |
2e8451e8 JX |
1835 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
1836 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
1837 | ||
814ff314 | 1838 | #: wt-status.c:1116 |
1003b3a5 JX |
1839 | #, c-format |
1840 | msgid "You are currently reverting commit %s." | |
98b2761d | 1841 | msgstr "您在执行反转提交 %s 的操作。" |
1003b3a5 JX |
1842 | |
1843 | # 译者:注意保持前导空格 | |
814ff314 | 1844 | #: wt-status.c:1121 |
1003b3a5 JX |
1845 | msgid " (fix conflicts and run \"git revert --continue\")" |
1846 | msgstr " (解决冲突并运行 \"git revert --continue\")" | |
1847 | ||
1848 | # 译者:注意保持前导空格 | |
814ff314 | 1849 | #: wt-status.c:1124 |
1003b3a5 JX |
1850 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
1851 | msgstr " (所有冲突已解决:运行 \"git revert --continue\")" | |
1852 | ||
1853 | # 译者:注意保持前导空格 | |
814ff314 | 1854 | #: wt-status.c:1126 |
1003b3a5 JX |
1855 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
1856 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
1857 | ||
814ff314 | 1858 | #: wt-status.c:1137 |
63af42fe | 1859 | #, c-format |
1003b3a5 | 1860 | msgid "You are currently bisecting, started from branch '%s'." |
98b2761d | 1861 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" |
63af42fe | 1862 | |
814ff314 | 1863 | #: wt-status.c:1141 |
6792b93b | 1864 | msgid "You are currently bisecting." |
98b2761d | 1865 | msgstr "您在执行二分查找操作。" |
6792b93b JX |
1866 | |
1867 | # 译者:注意保持前导空格 | |
814ff314 | 1868 | #: wt-status.c:1144 |
6792b93b JX |
1869 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
1870 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
1871 | ||
814ff314 | 1872 | #: wt-status.c:1321 |
c04f5ac3 JX |
1873 | msgid "On branch " |
1874 | msgstr "位于分支 " | |
1875 | ||
814ff314 | 1876 | #: wt-status.c:1328 |
2e8451e8 | 1877 | msgid "rebase in progress; onto " |
98b2761d | 1878 | msgstr "变基操作正在进行中;至 " |
2e8451e8 | 1879 | |
814ff314 | 1880 | #: wt-status.c:1333 |
1003b3a5 JX |
1881 | msgid "HEAD detached at " |
1882 | msgstr "头指针分离于 " | |
1883 | ||
814ff314 | 1884 | #: wt-status.c:1335 |
1003b3a5 JX |
1885 | msgid "HEAD detached from " |
1886 | msgstr "头指针分离自 " | |
1887 | ||
814ff314 | 1888 | #: wt-status.c:1338 |
c04f5ac3 JX |
1889 | msgid "Not currently on any branch." |
1890 | msgstr "当前不在任何分支上。" | |
1891 | ||
814ff314 | 1892 | #: wt-status.c:1355 |
c04f5ac3 JX |
1893 | msgid "Initial commit" |
1894 | msgstr "初始提交" | |
1895 | ||
814ff314 | 1896 | #: wt-status.c:1369 |
ef317cd5 | 1897 | msgid "Untracked files" |
07432cef | 1898 | msgstr "未跟踪的文件" |
c04f5ac3 | 1899 | |
814ff314 | 1900 | #: wt-status.c:1371 |
ef317cd5 | 1901 | msgid "Ignored files" |
07432cef | 1902 | msgstr "忽略的文件" |
c04f5ac3 | 1903 | |
814ff314 | 1904 | #: wt-status.c:1375 |
1003b3a5 | 1905 | #, c-format |
4dcdc3d8 JX |
1906 | msgid "" |
1907 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
1908 | "may speed it up, but you have to be careful not to forget to add\n" | |
1909 | "new files yourself (see 'git help status')." | |
1910 | msgstr "" | |
1911 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
1912 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1003b3a5 | 1913 | |
814ff314 | 1914 | #: wt-status.c:1381 |
c04f5ac3 JX |
1915 | #, c-format |
1916 | msgid "Untracked files not listed%s" | |
1917 | msgstr "未跟踪的文件没有列出%s" | |
1918 | ||
7e238ab7 | 1919 | # 译者:中文字符串拼接,可删除前导空格 |
814ff314 | 1920 | #: wt-status.c:1383 |
c04f5ac3 | 1921 | msgid " (use -u option to show untracked files)" |
7e238ab7 | 1922 | msgstr "(使用 -u 参数显示未跟踪的文件)" |
c04f5ac3 | 1923 | |
814ff314 | 1924 | #: wt-status.c:1389 |
c04f5ac3 JX |
1925 | msgid "No changes" |
1926 | msgstr "没有修改" | |
1927 | ||
814ff314 | 1928 | #: wt-status.c:1394 |
07432cef | 1929 | #, c-format |
ef317cd5 | 1930 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" |
07432cef | 1931 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" |
c04f5ac3 | 1932 | |
814ff314 | 1933 | #: wt-status.c:1397 |
07432cef | 1934 | #, c-format |
ef317cd5 | 1935 | msgid "no changes added to commit\n" |
07432cef | 1936 | msgstr "修改尚未加入提交\n" |
c04f5ac3 | 1937 | |
814ff314 | 1938 | #: wt-status.c:1400 |
07432cef | 1939 | #, c-format |
ef317cd5 JX |
1940 | msgid "" |
1941 | "nothing added to commit but untracked files present (use \"git add\" to " | |
1942 | "track)\n" | |
07432cef | 1943 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" |
c04f5ac3 | 1944 | |
814ff314 | 1945 | #: wt-status.c:1403 |
07432cef | 1946 | #, c-format |
ef317cd5 | 1947 | msgid "nothing added to commit but untracked files present\n" |
07432cef | 1948 | msgstr "提交为空,但是存在尚未跟踪的文件\n" |
c04f5ac3 | 1949 | |
7e238ab7 | 1950 | # 译者:中文字符串拼接,可删除前导空格 |
814ff314 | 1951 | #: wt-status.c:1406 |
07432cef | 1952 | #, c-format |
ef317cd5 | 1953 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" |
07432cef | 1954 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" |
c04f5ac3 | 1955 | |
814ff314 | 1956 | #: wt-status.c:1409 wt-status.c:1414 |
07432cef | 1957 | #, c-format |
ef317cd5 | 1958 | msgid "nothing to commit\n" |
07432cef | 1959 | msgstr "无文件要提交\n" |
ef317cd5 | 1960 | |
7e238ab7 | 1961 | # 译者:中文字符串拼接,可删除前导空格 |
814ff314 | 1962 | #: wt-status.c:1412 |
07432cef | 1963 | #, c-format |
ef317cd5 | 1964 | msgid "nothing to commit (use -u to show untracked files)\n" |
07432cef | 1965 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" |
c04f5ac3 | 1966 | |
7e238ab7 | 1967 | # 译者:中文字符串拼接,可删除前导空格 |
814ff314 | 1968 | #: wt-status.c:1416 |
07432cef | 1969 | #, c-format |
ef317cd5 | 1970 | msgid "nothing to commit, working directory clean\n" |
07432cef | 1971 | msgstr "无文件要提交,干净的工作区\n" |
c04f5ac3 | 1972 | |
814ff314 | 1973 | #: wt-status.c:1525 |
c04f5ac3 | 1974 | msgid "HEAD (no branch)" |
61bc0753 | 1975 | msgstr "HEAD(非分支)" |
c04f5ac3 | 1976 | |
90e6ef53 | 1977 | # 译者:注意保持句尾空格 |
814ff314 | 1978 | #: wt-status.c:1531 |
c04f5ac3 JX |
1979 | msgid "Initial commit on " |
1980 | msgstr "初始提交于 " | |
1981 | ||
814ff314 | 1982 | #: wt-status.c:1563 |
90314792 JX |
1983 | msgid "gone" |
1984 | msgstr "丢失" | |
1985 | ||
90e6ef53 | 1986 | # 译者:注意保持句尾空格 |
814ff314 | 1987 | #: wt-status.c:1565 wt-status.c:1573 |
c04f5ac3 JX |
1988 | msgid "behind " |
1989 | msgstr "落后 " | |
1990 | ||
04cb2f28 | 1991 | #: compat/precompose_utf8.c:55 builtin/clone.c:360 |
a77c07d9 JX |
1992 | #, c-format |
1993 | msgid "failed to unlink '%s'" | |
1994 | msgstr "无法删除 '%s'" | |
1995 | ||
220c313c | 1996 | #: builtin/add.c:22 |
814ff314 JX |
1997 | msgid "git add [<options>] [--] <pathspec>..." |
1998 | msgstr "git add [<选项>] [--] <路径规则>..." | |
ef317cd5 | 1999 | |
220c313c | 2000 | #: builtin/add.c:65 |
c04f5ac3 JX |
2001 | #, c-format |
2002 | msgid "unexpected diff status %c" | |
2003 | msgstr "意外的差异状态 %c" | |
2004 | ||
44f518e6 | 2005 | #: builtin/add.c:70 builtin/commit.c:277 |
c04f5ac3 JX |
2006 | msgid "updating files failed" |
2007 | msgstr "更新文件失败" | |
2008 | ||
220c313c | 2009 | #: builtin/add.c:80 |
c04f5ac3 JX |
2010 | #, c-format |
2011 | msgid "remove '%s'\n" | |
2012 | msgstr "删除 '%s'\n" | |
2013 | ||
220c313c | 2014 | #: builtin/add.c:134 |
c04f5ac3 | 2015 | msgid "Unstaged changes after refreshing the index:" |
90e6ef53 | 2016 | msgstr "刷新索引之后尚未被暂存的变更:" |
c04f5ac3 | 2017 | |
220c313c | 2018 | #: builtin/add.c:194 builtin/rev-parse.c:785 |
c04f5ac3 | 2019 | msgid "Could not read the index" |
90e6ef53 | 2020 | msgstr "不能读取索引" |
c04f5ac3 | 2021 | |
220c313c | 2022 | #: builtin/add.c:205 |
c04f5ac3 JX |
2023 | #, c-format |
2024 | msgid "Could not open '%s' for writing." | |
195febda | 2025 | msgstr "不能打开 '%s' 以写入。" |
c04f5ac3 | 2026 | |
220c313c | 2027 | #: builtin/add.c:209 |
c04f5ac3 | 2028 | msgid "Could not write patch" |
195febda | 2029 | msgstr "不能生成补丁" |
c04f5ac3 | 2030 | |
220c313c | 2031 | #: builtin/add.c:214 |
c04f5ac3 JX |
2032 | #, c-format |
2033 | msgid "Could not stat '%s'" | |
90e6ef53 | 2034 | msgstr "不能查看文件状态 '%s'" |
c04f5ac3 | 2035 | |
220c313c | 2036 | #: builtin/add.c:216 |
c04f5ac3 JX |
2037 | msgid "Empty patch. Aborted." |
2038 | msgstr "空补丁。异常终止。" | |
2039 | ||
6c94aba5 | 2040 | #: builtin/add.c:221 |
8ada9598 JX |
2041 | #, c-format |
2042 | msgid "Could not apply '%s'" | |
2043 | msgstr "不能应用 '%s'" | |
2044 | ||
6c94aba5 | 2045 | #: builtin/add.c:231 |
8ada9598 | 2046 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
195febda | 2047 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" |
8ada9598 | 2048 | |
814ff314 JX |
2049 | #: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 |
2050 | #: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 | |
90314792 | 2051 | #: builtin/rm.c:269 |
ef317cd5 | 2052 | msgid "dry run" |
07432cef | 2053 | msgstr "演习" |
ef317cd5 | 2054 | |
44f518e6 JX |
2055 | #: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 |
2056 | #: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608 | |
220c313c | 2057 | #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 |
ef317cd5 JX |
2058 | msgid "be verbose" |
2059 | msgstr "冗长输出" | |
2060 | ||
6c94aba5 | 2061 | #: builtin/add.c:251 |
ef317cd5 | 2062 | msgid "interactive picking" |
07432cef | 2063 | msgstr "交互式拣选" |
ef317cd5 | 2064 | |
04cb2f28 | 2065 | #: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286 |
ef317cd5 | 2066 | msgid "select hunks interactively" |
07432cef | 2067 | msgstr "交互式挑选数据块" |
ef317cd5 | 2068 | |
6c94aba5 | 2069 | #: builtin/add.c:253 |
ef317cd5 | 2070 | msgid "edit current diff and apply" |
07432cef | 2071 | msgstr "编辑当前差异并应用" |
ef317cd5 | 2072 | |
6c94aba5 | 2073 | #: builtin/add.c:254 |
ef317cd5 | 2074 | msgid "allow adding otherwise ignored files" |
07432cef | 2075 | msgstr "允许添加忽略的文件" |
ef317cd5 | 2076 | |
6c94aba5 | 2077 | #: builtin/add.c:255 |
ef317cd5 | 2078 | msgid "update tracked files" |
07432cef | 2079 | msgstr "更新已跟踪的文件" |
ef317cd5 | 2080 | |
6c94aba5 | 2081 | #: builtin/add.c:256 |
ef317cd5 | 2082 | msgid "record only the fact that the path will be added later" |
07432cef | 2083 | msgstr "只记录,该路径稍后再添加" |
ef317cd5 | 2084 | |
6c94aba5 | 2085 | #: builtin/add.c:257 |
ef317cd5 | 2086 | msgid "add changes from all tracked and untracked files" |
07432cef | 2087 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" |
ef317cd5 | 2088 | |
6c94aba5 | 2089 | #: builtin/add.c:260 |
4dcdc3d8 JX |
2090 | msgid "ignore paths removed in the working tree (same as --no-all)" |
2091 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
2092 | ||
6c94aba5 | 2093 | #: builtin/add.c:262 |
ef317cd5 | 2094 | msgid "don't add, only refresh the index" |
07432cef | 2095 | msgstr "不添加,只刷新索引" |
ef317cd5 | 2096 | |
6c94aba5 | 2097 | #: builtin/add.c:263 |
ef317cd5 | 2098 | msgid "just skip files which cannot be added because of errors" |
07432cef | 2099 | msgstr "跳过因出错不能添加的文件" |
ef317cd5 | 2100 | |
6c94aba5 | 2101 | #: builtin/add.c:264 |
ef317cd5 | 2102 | msgid "check if - even missing - files are ignored in dry run" |
07432cef | 2103 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" |
ef317cd5 | 2104 | |
6c94aba5 | 2105 | #: builtin/add.c:286 |
8ada9598 JX |
2106 | #, c-format |
2107 | msgid "Use -f if you really want to add them.\n" | |
2108 | msgstr "使用 -f 参数如果您确实要添加它们。\n" | |
2109 | ||
6c94aba5 | 2110 | #: builtin/add.c:293 |
8ada9598 JX |
2111 | msgid "adding files failed" |
2112 | msgstr "添加文件失败" | |
2113 | ||
6acbf033 | 2114 | #: builtin/add.c:329 |
8ada9598 JX |
2115 | msgid "-A and -u are mutually incompatible" |
2116 | msgstr "-A 和 -u 选项互斥" | |
2117 | ||
6acbf033 | 2118 | #: builtin/add.c:336 |
8ada9598 | 2119 | msgid "Option --ignore-missing can only be used together with --dry-run" |
649900bc | 2120 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" |
8ada9598 | 2121 | |
6acbf033 | 2122 | #: builtin/add.c:357 |
8ada9598 JX |
2123 | #, c-format |
2124 | msgid "Nothing specified, nothing added.\n" | |
2125 | msgstr "没有指定文件,也没有文件被添加。\n" | |
2126 | ||
6acbf033 | 2127 | #: builtin/add.c:358 |
8ada9598 JX |
2128 | #, c-format |
2129 | msgid "Maybe you wanted to say 'git add .'?\n" | |
2130 | msgstr "也许您想要执行 'git add .'?\n" | |
2131 | ||
814ff314 | 2132 | #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 |
44f518e6 | 2133 | #: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 |
8ada9598 JX |
2134 | msgid "index file corrupt" |
2135 | msgstr "索引文件损坏" | |
2136 | ||
44f518e6 | 2137 | #: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 |
8ada9598 JX |
2138 | msgid "Unable to write new index file" |
2139 | msgstr "无法写入新索引文件" | |
2140 | ||
814ff314 JX |
2141 | #: builtin/apply.c:59 |
2142 | msgid "git apply [<options>] [<patch>...]" | |
2143 | msgstr "git apply [<选项>] [<补丁>...]" | |
8ada9598 | 2144 | |
814ff314 | 2145 | #: builtin/apply.c:112 |
81809b99 | 2146 | #, c-format |
8ada9598 | 2147 | msgid "unrecognized whitespace option '%s'" |
81809b99 | 2148 | msgstr "未能识别的空白字符选项 '%s'" |
8ada9598 | 2149 | |
814ff314 | 2150 | #: builtin/apply.c:127 |
81809b99 | 2151 | #, c-format |
8ada9598 | 2152 | msgid "unrecognized whitespace ignore option '%s'" |
81809b99 | 2153 | msgstr "未能识别的空白字符忽略选项 '%s'" |
8ada9598 | 2154 | |
814ff314 | 2155 | #: builtin/apply.c:822 |
8ada9598 JX |
2156 | #, c-format |
2157 | msgid "Cannot prepare timestamp regexp %s" | |
81809b99 | 2158 | msgstr "无法准备时间戳正则表达式 %s" |
8ada9598 | 2159 | |
814ff314 | 2160 | #: builtin/apply.c:831 |
8ada9598 JX |
2161 | #, c-format |
2162 | msgid "regexec returned %d for input: %s" | |
81809b99 | 2163 | msgstr "regexec 返回 %d,输入为:%s" |
8ada9598 | 2164 | |
814ff314 | 2165 | #: builtin/apply.c:912 |
81809b99 | 2166 | #, c-format |
8ada9598 | 2167 | msgid "unable to find filename in patch at line %d" |
81809b99 | 2168 | msgstr "不能在补丁的第 %d 行找到文件名" |
8ada9598 | 2169 | |
814ff314 | 2170 | #: builtin/apply.c:944 |
8ada9598 JX |
2171 | #, c-format |
2172 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" | |
9aafc933 | 2173 | msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" |
8ada9598 | 2174 | |
814ff314 | 2175 | #: builtin/apply.c:948 |
8ada9598 JX |
2176 | #, c-format |
2177 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" | |
81809b99 | 2178 | msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" |
8ada9598 | 2179 | |
814ff314 | 2180 | #: builtin/apply.c:949 |
8ada9598 JX |
2181 | #, c-format |
2182 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" | |
81809b99 | 2183 | msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" |
8ada9598 | 2184 | |
814ff314 | 2185 | #: builtin/apply.c:956 |
8ada9598 JX |
2186 | #, c-format |
2187 | msgid "git apply: bad git-diff - expected /dev/null on line %d" | |
9aafc933 | 2188 | msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" |
8ada9598 | 2189 | |
814ff314 | 2190 | #: builtin/apply.c:1419 |
8ada9598 JX |
2191 | #, c-format |
2192 | msgid "recount: unexpected line: %.*s" | |
81809b99 | 2193 | msgstr "recount:意外的行:%.*s" |
8ada9598 | 2194 | |
814ff314 | 2195 | #: builtin/apply.c:1476 |
8ada9598 JX |
2196 | #, c-format |
2197 | msgid "patch fragment without header at line %d: %.*s" | |
81809b99 | 2198 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" |
8ada9598 | 2199 | |
814ff314 | 2200 | #: builtin/apply.c:1493 |
8ada9598 JX |
2201 | #, c-format |
2202 | msgid "" | |
2203 | "git diff header lacks filename information when removing %d leading pathname " | |
2204 | "component (line %d)" | |
2205 | msgid_plural "" | |
2206 | "git diff header lacks filename information when removing %d leading pathname " | |
2207 | "components (line %d)" | |
5ae481e0 JX |
2208 | msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" |
2209 | msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
8ada9598 | 2210 | |
814ff314 | 2211 | #: builtin/apply.c:1656 |
8ada9598 | 2212 | msgid "new file depends on old contents" |
81809b99 | 2213 | msgstr "新文件依赖旧内容" |
8ada9598 | 2214 | |
814ff314 | 2215 | #: builtin/apply.c:1658 |
8ada9598 | 2216 | msgid "deleted file still has contents" |
81809b99 | 2217 | msgstr "删除的文件仍有内容" |
8ada9598 | 2218 | |
814ff314 | 2219 | #: builtin/apply.c:1684 |
8ada9598 JX |
2220 | #, c-format |
2221 | msgid "corrupt patch at line %d" | |
195febda | 2222 | msgstr "补丁在第 %d 行损坏" |
8ada9598 | 2223 | |
814ff314 | 2224 | #: builtin/apply.c:1720 |
8ada9598 JX |
2225 | #, c-format |
2226 | msgid "new file %s depends on old contents" | |
81809b99 | 2227 | msgstr "新文件 %s 依赖旧内容" |
8ada9598 | 2228 | |
814ff314 | 2229 | #: builtin/apply.c:1722 |
8ada9598 JX |
2230 | #, c-format |
2231 | msgid "deleted file %s still has contents" | |
81809b99 | 2232 | msgstr "删除的文件 %s 仍有内容" |
8ada9598 | 2233 | |
814ff314 | 2234 | #: builtin/apply.c:1725 |
8ada9598 JX |
2235 | #, c-format |
2236 | msgid "** warning: file %s becomes empty but is not deleted" | |
81809b99 | 2237 | msgstr "** 警告:文件 %s 成为空文件但并未删除" |
8ada9598 | 2238 | |
814ff314 | 2239 | #: builtin/apply.c:1871 |
8ada9598 JX |
2240 | #, c-format |
2241 | msgid "corrupt binary patch at line %d: %.*s" | |
81809b99 | 2242 | msgstr "二进制补丁在第 %d 行损坏:%.*s" |
8ada9598 | 2243 | |
814ff314 | 2244 | #: builtin/apply.c:1900 |
8ada9598 JX |
2245 | #, c-format |
2246 | msgid "unrecognized binary patch at line %d" | |
81809b99 | 2247 | msgstr "未能识别的二进制补丁位于第 %d 行" |
8ada9598 | 2248 | |
814ff314 | 2249 | #: builtin/apply.c:2051 |
8ada9598 JX |
2250 | #, c-format |
2251 | msgid "patch with only garbage at line %d" | |
81809b99 | 2252 | msgstr "补丁文件的第 %d 行只有垃圾数据" |
8ada9598 | 2253 | |
814ff314 | 2254 | #: builtin/apply.c:2141 |
81809b99 | 2255 | #, c-format |
8ada9598 | 2256 | msgid "unable to read symlink %s" |
81809b99 | 2257 | msgstr "无法读取符号链接 %s" |
8ada9598 | 2258 | |
814ff314 | 2259 | #: builtin/apply.c:2145 |
81809b99 | 2260 | #, c-format |
8ada9598 | 2261 | msgid "unable to open or read %s" |
81809b99 | 2262 | msgstr "不能打开或读取 %s" |
8ada9598 | 2263 | |
814ff314 | 2264 | #: builtin/apply.c:2778 |
81809b99 | 2265 | #, c-format |
8ada9598 | 2266 | msgid "invalid start of line: '%c'" |
81809b99 | 2267 | msgstr "无效的行首字符:'%c'" |
8ada9598 | 2268 | |
44f518e6 | 2269 | #: builtin/apply.c:2897 |
8ada9598 JX |
2270 | #, c-format |
2271 | msgid "Hunk #%d succeeded at %d (offset %d line)." | |
2272 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." | |
07432cef WS |
2273 | msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" |
2274 | msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
8ada9598 | 2275 | |
44f518e6 | 2276 | #: builtin/apply.c:2909 |
8ada9598 JX |
2277 | #, c-format |
2278 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" | |
81809b99 | 2279 | msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" |
8ada9598 | 2280 | |
44f518e6 | 2281 | #: builtin/apply.c:2915 |
8ada9598 JX |
2282 | #, c-format |
2283 | msgid "" | |
2284 | "while searching for:\n" | |
2285 | "%.*s" | |
2286 | msgstr "" | |
81809b99 JX |
2287 | "当查询:\n" |
2288 | "%.*s" | |
8ada9598 | 2289 | |
44f518e6 | 2290 | #: builtin/apply.c:2935 |
8ada9598 JX |
2291 | #, c-format |
2292 | msgid "missing binary patch data for '%s'" | |
81809b99 | 2293 | msgstr "缺失 '%s' 的二进制补丁数据" |
8ada9598 | 2294 | |
44f518e6 | 2295 | #: builtin/apply.c:3036 |
8ada9598 JX |
2296 | #, c-format |
2297 | msgid "binary patch does not apply to '%s'" | |
81809b99 | 2298 | msgstr "二进制补丁未应用到 '%s'" |
8ada9598 | 2299 | |
44f518e6 | 2300 | #: builtin/apply.c:3042 |
8ada9598 JX |
2301 | #, c-format |
2302 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" | |
9aafc933 | 2303 | msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" |
8ada9598 | 2304 | |
44f518e6 | 2305 | #: builtin/apply.c:3063 |
8ada9598 JX |
2306 | #, c-format |
2307 | msgid "patch failed: %s:%ld" | |
81809b99 | 2308 | msgstr "打补丁失败:%s:%ld" |
8ada9598 | 2309 | |
44f518e6 | 2310 | #: builtin/apply.c:3187 |
8ada9598 | 2311 | #, c-format |
23ff3338 JX |
2312 | msgid "cannot checkout %s" |
2313 | msgstr "不能检出 %s" | |
8ada9598 | 2314 | |
44f518e6 | 2315 | #: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 |
81809b99 | 2316 | #, c-format |
8ada9598 | 2317 | msgid "read of %s failed" |
81809b99 | 2318 | msgstr "读取 %s 失败" |
8ada9598 | 2319 | |
44f518e6 | 2320 | #: builtin/apply.c:3240 |
814ff314 JX |
2321 | #, c-format |
2322 | msgid "reading from '%s' beyond a symbolic link" | |
2323 | msgstr "读取位于符号链接中的 '%s'" | |
2324 | ||
44f518e6 | 2325 | #: builtin/apply.c:3268 builtin/apply.c:3490 |
81809b99 | 2326 | #, c-format |
23ff3338 JX |
2327 | msgid "path %s has been renamed/deleted" |
2328 | msgstr "路径 %s 已经被重命名/删除" | |
8ada9598 | 2329 | |
44f518e6 | 2330 | #: builtin/apply.c:3349 builtin/apply.c:3504 |
8ada9598 | 2331 | #, c-format |
23ff3338 JX |
2332 | msgid "%s: does not exist in index" |
2333 | msgstr "%s:不存在于索引中" | |
8ada9598 | 2334 | |
44f518e6 | 2335 | #: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 |
81809b99 | 2336 | #, c-format |
8ada9598 | 2337 | msgid "%s: %s" |
81809b99 | 2338 | msgstr "%s:%s" |
8ada9598 | 2339 | |
44f518e6 | 2340 | #: builtin/apply.c:3358 builtin/apply.c:3512 |
81809b99 | 2341 | #, c-format |
8ada9598 | 2342 | msgid "%s: does not match index" |
81809b99 | 2343 | msgstr "%s:和索引不匹配" |
8ada9598 | 2344 | |
44f518e6 | 2345 | #: builtin/apply.c:3460 |
23ff3338 JX |
2346 | msgid "removal patch leaves file contents" |
2347 | msgstr "移除补丁仍留下了文件内容" | |
2348 | ||
44f518e6 | 2349 | #: builtin/apply.c:3529 |
8ada9598 JX |
2350 | #, c-format |
2351 | msgid "%s: wrong type" | |
81809b99 | 2352 | msgstr "%s:错误类型" |
8ada9598 | 2353 | |
44f518e6 | 2354 | #: builtin/apply.c:3531 |
8ada9598 JX |
2355 | #, c-format |
2356 | msgid "%s has type %o, expected %o" | |
9aafc933 | 2357 | msgstr "%s 的类型是 %o,应为 %o" |
8ada9598 | 2358 | |
44f518e6 | 2359 | #: builtin/apply.c:3690 builtin/apply.c:3692 |
814ff314 JX |
2360 | #, c-format |
2361 | msgid "invalid path '%s'" | |
2362 | msgstr "无效路径 '%s'" | |
2363 | ||
44f518e6 | 2364 | #: builtin/apply.c:3747 |
81809b99 | 2365 | #, c-format |
8ada9598 | 2366 | msgid "%s: already exists in index" |
81809b99 | 2367 | msgstr "%s:已经存在于索引中" |
8ada9598 | 2368 | |
44f518e6 | 2369 | #: builtin/apply.c:3750 |
23ff3338 JX |
2370 | #, c-format |
2371 | msgid "%s: already exists in working directory" | |
2372 | msgstr "%s:已经存在于工作区中" | |
2373 | ||
44f518e6 | 2374 | #: builtin/apply.c:3770 |
d691f479 JX |
2375 | #, c-format |
2376 | msgid "new mode (%o) of %s does not match old mode (%o)" | |
2377 | msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" | |
8ada9598 | 2378 | |
44f518e6 | 2379 | #: builtin/apply.c:3775 |
8ada9598 | 2380 | #, c-format |
d691f479 JX |
2381 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
2382 | msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" | |
2383 | ||
44f518e6 | 2384 | #: builtin/apply.c:3795 |
814ff314 JX |
2385 | #, c-format |
2386 | msgid "affected file '%s' is beyond a symbolic link" | |
2387 | msgstr "受影响的文件 '%s' 位于符号链接中" | |
2388 | ||
44f518e6 | 2389 | #: builtin/apply.c:3799 |
d691f479 | 2390 | #, c-format |
8ada9598 | 2391 | msgid "%s: patch does not apply" |
81809b99 | 2392 | msgstr "%s:补丁未应用" |
8ada9598 | 2393 | |
44f518e6 | 2394 | #: builtin/apply.c:3813 |
8ada9598 JX |
2395 | #, c-format |
2396 | msgid "Checking patch %s..." | |
81809b99 | 2397 | msgstr "检查补丁 %s..." |
8ada9598 | 2398 | |
44f518e6 | 2399 | #: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 |
8ada9598 JX |
2400 | #, c-format |
2401 | msgid "make_cache_entry failed for path '%s'" | |
2402 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" | |
2403 | ||
44f518e6 | 2404 | #: builtin/apply.c:4049 |
81809b99 | 2405 | #, c-format |
8ada9598 | 2406 | msgid "unable to remove %s from index" |
81809b99 | 2407 | msgstr "不能从索引中移除 %s" |
8ada9598 | 2408 | |
44f518e6 | 2409 | #: builtin/apply.c:4078 |
8ada9598 | 2410 | #, c-format |
2e8451e8 JX |
2411 | msgid "corrupt patch for submodule %s" |
2412 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 2413 | |
44f518e6 | 2414 | #: builtin/apply.c:4082 |
81809b99 | 2415 | #, c-format |
8ada9598 | 2416 | msgid "unable to stat newly created file '%s'" |
81809b99 | 2417 | msgstr "不能枚举新建文件 '%s' 的状态" |
8ada9598 | 2418 | |
44f518e6 | 2419 | #: builtin/apply.c:4087 |
8ada9598 JX |
2420 | #, c-format |
2421 | msgid "unable to create backing store for newly created file %s" | |
81809b99 | 2422 | msgstr "不能为新建文件 %s 创建后端存储" |
8ada9598 | 2423 | |
44f518e6 | 2424 | #: builtin/apply.c:4090 builtin/apply.c:4198 |
81809b99 | 2425 | #, c-format |
8ada9598 | 2426 | msgid "unable to add cache entry for %s" |
81809b99 | 2427 | msgstr "无法为 %s 添加缓存条目" |
8ada9598 | 2428 | |
44f518e6 | 2429 | #: builtin/apply.c:4123 |
81809b99 | 2430 | #, c-format |
8ada9598 | 2431 | msgid "closing file '%s'" |
81809b99 | 2432 | msgstr "关闭文件 '%s'" |
8ada9598 | 2433 | |
44f518e6 | 2434 | #: builtin/apply.c:4172 |
81809b99 | 2435 | #, c-format |
8ada9598 | 2436 | msgid "unable to write file '%s' mode %o" |
81809b99 | 2437 | msgstr "不能写文件 '%s' 权限 %o" |
8ada9598 | 2438 | |
44f518e6 | 2439 | #: builtin/apply.c:4259 |
8ada9598 JX |
2440 | #, c-format |
2441 | msgid "Applied patch %s cleanly." | |
81809b99 | 2442 | msgstr "成功应用补丁 %s。" |
8ada9598 | 2443 | |
44f518e6 | 2444 | #: builtin/apply.c:4267 |
8ada9598 | 2445 | msgid "internal error" |
81809b99 | 2446 | msgstr "内部错误" |
8ada9598 | 2447 | |
44f518e6 | 2448 | #: builtin/apply.c:4270 |
8ada9598 JX |
2449 | #, c-format |
2450 | msgid "Applying patch %%s with %d reject..." | |
2451 | msgid_plural "Applying patch %%s with %d rejects..." | |
195febda T |
2452 | msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." |
2453 | msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
8ada9598 | 2454 | |
44f518e6 | 2455 | #: builtin/apply.c:4280 |
8ada9598 JX |
2456 | #, c-format |
2457 | msgid "truncating .rej filename to %.*s.rej" | |
81809b99 | 2458 | msgstr "截短 .rej 文件名为 %.*s.rej" |
8ada9598 | 2459 | |
44f518e6 | 2460 | #: builtin/apply.c:4301 |
8ada9598 JX |
2461 | #, c-format |
2462 | msgid "Hunk #%d applied cleanly." | |
81809b99 | 2463 | msgstr "第 #%d 个片段成功应用。" |
8ada9598 | 2464 | |
44f518e6 | 2465 | #: builtin/apply.c:4304 |
8ada9598 JX |
2466 | #, c-format |
2467 | msgid "Rejected hunk #%d." | |
81809b99 | 2468 | msgstr "拒绝第 #%d 个片段。" |
8ada9598 | 2469 | |
44f518e6 | 2470 | #: builtin/apply.c:4394 |
8ada9598 | 2471 | msgid "unrecognized input" |
81809b99 | 2472 | msgstr "未能识别的输入" |
8ada9598 | 2473 | |
44f518e6 | 2474 | #: builtin/apply.c:4405 |
8ada9598 | 2475 | msgid "unable to read index file" |
81809b99 | 2476 | msgstr "无法读取索引文件" |
8ada9598 | 2477 | |
44f518e6 | 2478 | #: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 |
814ff314 | 2479 | #: builtin/fetch.c:92 |
8ada9598 | 2480 | msgid "path" |
81809b99 | 2481 | msgstr "路径" |
8ada9598 | 2482 | |
44f518e6 | 2483 | #: builtin/apply.c:4523 |
8ada9598 | 2484 | msgid "don't apply changes matching the given path" |
81809b99 | 2485 | msgstr "不要应用与给出路径向匹配的变更" |
8ada9598 | 2486 | |
44f518e6 | 2487 | #: builtin/apply.c:4526 |
8ada9598 | 2488 | msgid "apply changes matching the given path" |
81809b99 | 2489 | msgstr "应用与给出路径向匹配的变更" |
8ada9598 | 2490 | |
44f518e6 | 2491 | #: builtin/apply.c:4528 |
8ada9598 | 2492 | msgid "num" |
81809b99 | 2493 | msgstr "数字" |
8ada9598 | 2494 | |
44f518e6 | 2495 | #: builtin/apply.c:4529 |
8ada9598 | 2496 | msgid "remove <num> leading slashes from traditional diff paths" |
07432cef | 2497 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" |
8ada9598 | 2498 | |
44f518e6 | 2499 | #: builtin/apply.c:4532 |
8ada9598 | 2500 | msgid "ignore additions made by the patch" |
81809b99 | 2501 | msgstr "忽略补丁中的添加的文件" |
8ada9598 | 2502 | |
44f518e6 | 2503 | #: builtin/apply.c:4534 |
8ada9598 | 2504 | msgid "instead of applying the patch, output diffstat for the input" |
81809b99 | 2505 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" |
8ada9598 | 2506 | |
44f518e6 | 2507 | #: builtin/apply.c:4538 |
ef317cd5 | 2508 | msgid "show number of added and deleted lines in decimal notation" |
07432cef | 2509 | msgstr "以十进制数显示添加和删除的行数" |
8ada9598 | 2510 | |
44f518e6 | 2511 | #: builtin/apply.c:4540 |
8ada9598 | 2512 | msgid "instead of applying the patch, output a summary for the input" |
81809b99 | 2513 | msgstr "不应用补丁,而是显示输入的概要" |
8ada9598 | 2514 | |
44f518e6 | 2515 | #: builtin/apply.c:4542 |
8ada9598 | 2516 | msgid "instead of applying the patch, see if the patch is applicable" |
81809b99 | 2517 | msgstr "不应用补丁,而是查看补丁是否可应用" |
8ada9598 | 2518 | |
44f518e6 | 2519 | #: builtin/apply.c:4544 |
8ada9598 | 2520 | msgid "make sure the patch is applicable to the current index" |
81809b99 | 2521 | msgstr "确认补丁可以应用到当前索引" |
8ada9598 | 2522 | |
44f518e6 | 2523 | #: builtin/apply.c:4546 |
8ada9598 | 2524 | msgid "apply a patch without touching the working tree" |
81809b99 | 2525 | msgstr "应用补丁而不修改工作区" |
8ada9598 | 2526 | |
44f518e6 | 2527 | #: builtin/apply.c:4548 |
814ff314 JX |
2528 | msgid "accept a patch that touches outside the working area" |
2529 | msgstr "接受修改工作区之外文件的补丁" | |
2530 | ||
44f518e6 | 2531 | #: builtin/apply.c:4550 |
8ada9598 | 2532 | msgid "also apply the patch (use with --stat/--summary/--check)" |
195febda | 2533 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" |
8ada9598 | 2534 | |
44f518e6 | 2535 | #: builtin/apply.c:4552 |
23ff3338 JX |
2536 | msgid "attempt three-way merge if a patch does not apply" |
2537 | msgstr "如果一个补丁不能应用则尝试三路合并" | |
2538 | ||
44f518e6 | 2539 | #: builtin/apply.c:4554 |
8ada9598 | 2540 | msgid "build a temporary index based on embedded index information" |
81809b99 | 2541 | msgstr "创建一个临时索引基于嵌入的索引信息" |
8ada9598 | 2542 | |
44f518e6 | 2543 | #: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 |
8ada9598 | 2544 | msgid "paths are separated with NUL character" |
81809b99 | 2545 | msgstr "路径以 NUL 字符分隔" |
8ada9598 | 2546 | |
44f518e6 | 2547 | #: builtin/apply.c:4559 |
8ada9598 | 2548 | msgid "ensure at least <n> lines of context match" |
81809b99 | 2549 | msgstr "确保至少匹配 <n> 行上下文" |
8ada9598 | 2550 | |
44f518e6 | 2551 | #: builtin/apply.c:4560 |
8ada9598 | 2552 | msgid "action" |
81809b99 | 2553 | msgstr "动作" |
8ada9598 | 2554 | |
44f518e6 | 2555 | #: builtin/apply.c:4561 |
8ada9598 | 2556 | msgid "detect new or modified lines that have whitespace errors" |
81809b99 | 2557 | msgstr "检查新增和修改的行中间的空白字符滥用" |
8ada9598 | 2558 | |
44f518e6 | 2559 | #: builtin/apply.c:4564 builtin/apply.c:4567 |
8ada9598 | 2560 | msgid "ignore changes in whitespace when finding context" |
81809b99 | 2561 | msgstr "查找上下文时忽略空白字符的变更" |
8ada9598 | 2562 | |
44f518e6 | 2563 | #: builtin/apply.c:4570 |
8ada9598 | 2564 | msgid "apply the patch in reverse" |
81809b99 | 2565 | msgstr "反向应用补丁" |
8ada9598 | 2566 | |
44f518e6 | 2567 | #: builtin/apply.c:4572 |
8ada9598 | 2568 | msgid "don't expect at least one line of context" |
81809b99 | 2569 | msgstr "无需至少一行上下文" |
8ada9598 | 2570 | |
44f518e6 | 2571 | #: builtin/apply.c:4574 |
8ada9598 | 2572 | msgid "leave the rejected hunks in corresponding *.rej files" |
81809b99 | 2573 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" |
8ada9598 | 2574 | |
44f518e6 | 2575 | #: builtin/apply.c:4576 |
8ada9598 | 2576 | msgid "allow overlapping hunks" |
81809b99 | 2577 | msgstr "允许重叠的补丁片段" |
8ada9598 | 2578 | |
44f518e6 | 2579 | #: builtin/apply.c:4579 |
8ada9598 | 2580 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
195febda | 2581 | msgstr "允许不正确的文件末尾换行符" |
c04f5ac3 | 2582 | |
44f518e6 | 2583 | #: builtin/apply.c:4582 |
8ada9598 | 2584 | msgid "do not trust the line counts in the hunk headers" |
81809b99 | 2585 | msgstr "不信任补丁片段的头信息中的行号" |
c04f5ac3 | 2586 | |
44f518e6 | 2587 | #: builtin/apply.c:4584 |
8ada9598 | 2588 | msgid "root" |
81809b99 | 2589 | msgstr "根目录" |
c04f5ac3 | 2590 | |
44f518e6 | 2591 | #: builtin/apply.c:4585 |
8ada9598 | 2592 | msgid "prepend <root> to all filenames" |
81809b99 | 2593 | msgstr "为所有文件名前添加 <根目录>" |
c04f5ac3 | 2594 | |
44f518e6 | 2595 | #: builtin/apply.c:4607 |
23ff3338 JX |
2596 | msgid "--3way outside a repository" |
2597 | msgstr "--3way 在一个版本库之外" | |
2598 | ||
44f518e6 | 2599 | #: builtin/apply.c:4615 |
8ada9598 | 2600 | msgid "--index outside a repository" |
81809b99 | 2601 | msgstr "--index 在一个版本库之外" |
c04f5ac3 | 2602 | |
44f518e6 | 2603 | #: builtin/apply.c:4618 |
8ada9598 | 2604 | msgid "--cached outside a repository" |
81809b99 | 2605 | msgstr "--cached 在一个版本库之外" |
c04f5ac3 | 2606 | |
44f518e6 | 2607 | #: builtin/apply.c:4637 |
81809b99 | 2608 | #, c-format |
8ada9598 | 2609 | msgid "can't open patch '%s'" |
81809b99 | 2610 | msgstr "不能打开补丁 '%s'" |
c04f5ac3 | 2611 | |
44f518e6 | 2612 | #: builtin/apply.c:4651 |
c04f5ac3 | 2613 | #, c-format |
8ada9598 JX |
2614 | msgid "squelched %d whitespace error" |
2615 | msgid_plural "squelched %d whitespace errors" | |
81809b99 | 2616 | msgstr[0] "抑制下仍有 %d 个空白字符误用" |
5ae481e0 | 2617 | msgstr[1] "抑制下仍有 %d 个空白字符误用" |
c04f5ac3 | 2618 | |
44f518e6 | 2619 | #: builtin/apply.c:4657 builtin/apply.c:4667 |
8ada9598 JX |
2620 | #, c-format |
2621 | msgid "%d line adds whitespace errors." | |
2622 | msgid_plural "%d lines add whitespace errors." | |
81809b99 | 2623 | msgstr[0] "%d 行有空白字符误用。" |
5ae481e0 | 2624 | msgstr[1] "%d 行有空白字符误用。" |
c04f5ac3 JX |
2625 | |
2626 | #: builtin/archive.c:17 | |
2627 | #, c-format | |
2628 | msgid "could not create archive file '%s'" | |
90e6ef53 | 2629 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
2630 | |
2631 | #: builtin/archive.c:20 | |
2632 | msgid "could not redirect output" | |
195febda | 2633 | msgstr "不能重定向输出" |
c04f5ac3 JX |
2634 | |
2635 | #: builtin/archive.c:37 | |
2636 | msgid "git archive: Remote with no URL" | |
90e6ef53 | 2637 | msgstr "git archive:未提供远程URL" |
c04f5ac3 JX |
2638 | |
2639 | #: builtin/archive.c:58 | |
2640 | msgid "git archive: expected ACK/NAK, got EOF" | |
9aafc933 | 2641 | msgstr "git archive:应为ACK/NACK,却得到EOF" |
c04f5ac3 | 2642 | |
1003b3a5 | 2643 | #: builtin/archive.c:61 |
c04f5ac3 JX |
2644 | #, c-format |
2645 | msgid "git archive: NACK %s" | |
90e6ef53 | 2646 | msgstr "git archive:NACK %s" |
c04f5ac3 | 2647 | |
1003b3a5 | 2648 | #: builtin/archive.c:63 |
c04f5ac3 JX |
2649 | #, c-format |
2650 | msgid "remote error: %s" | |
2651 | msgstr "远程错误:%s" | |
2652 | ||
1003b3a5 | 2653 | #: builtin/archive.c:64 |
c04f5ac3 | 2654 | msgid "git archive: protocol error" |
90e6ef53 | 2655 | msgstr "git archive:协议错误" |
c04f5ac3 | 2656 | |
1003b3a5 | 2657 | #: builtin/archive.c:68 |
c04f5ac3 | 2658 | msgid "git archive: expected a flush" |
195febda | 2659 | msgstr "git archive:应为刷新" |
c04f5ac3 | 2660 | |
ef317cd5 JX |
2661 | #: builtin/bisect--helper.c:7 |
2662 | msgid "git bisect--helper --next-all [--no-checkout]" | |
07432cef | 2663 | msgstr "git bisect--helper --next-all [--no-checkout]" |
ef317cd5 JX |
2664 | |
2665 | #: builtin/bisect--helper.c:17 | |
2666 | msgid "perform 'git bisect next'" | |
07432cef | 2667 | msgstr "执行 'git bisect next'" |
ef317cd5 JX |
2668 | |
2669 | #: builtin/bisect--helper.c:19 | |
2670 | msgid "update BISECT_HEAD instead of checking out the current commit" | |
07432cef | 2671 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
ef317cd5 | 2672 | |
6acbf033 | 2673 | #: builtin/blame.c:30 |
814ff314 JX |
2674 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" |
2675 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] 文件" | |
ef317cd5 | 2676 | |
6acbf033 | 2677 | #: builtin/blame.c:35 |
814ff314 JX |
2678 | msgid "<rev-opts> are documented in git-rev-list(1)" |
2679 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" | |
ef317cd5 | 2680 | |
814ff314 | 2681 | #: builtin/blame.c:2500 |
ef317cd5 | 2682 | msgid "Show blame entries as we find them, incrementally" |
07432cef | 2683 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 2684 | |
814ff314 | 2685 | #: builtin/blame.c:2501 |
ef317cd5 | 2686 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
07432cef | 2687 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
ef317cd5 | 2688 | |
814ff314 | 2689 | #: builtin/blame.c:2502 |
ef317cd5 | 2690 | msgid "Do not treat root commits as boundaries (Default: off)" |
07432cef | 2691 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 2692 | |
814ff314 | 2693 | #: builtin/blame.c:2503 |
ef317cd5 | 2694 | msgid "Show work cost statistics" |
07432cef | 2695 | msgstr "显示命令消耗统计" |
ef317cd5 | 2696 | |
814ff314 | 2697 | #: builtin/blame.c:2504 |
ef317cd5 | 2698 | msgid "Show output score for blame entries" |
07432cef | 2699 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
ef317cd5 | 2700 | |
814ff314 | 2701 | #: builtin/blame.c:2505 |
ef317cd5 | 2702 | msgid "Show original filename (Default: auto)" |
07432cef | 2703 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 2704 | |
814ff314 | 2705 | #: builtin/blame.c:2506 |
ef317cd5 | 2706 | msgid "Show original linenumber (Default: off)" |
07432cef | 2707 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 2708 | |
814ff314 | 2709 | #: builtin/blame.c:2507 |
ef317cd5 | 2710 | msgid "Show in a format designed for machine consumption" |
07432cef | 2711 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 2712 | |
814ff314 | 2713 | #: builtin/blame.c:2508 |
ef317cd5 | 2714 | msgid "Show porcelain format with per-line commit information" |
07432cef | 2715 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 2716 | |
814ff314 | 2717 | #: builtin/blame.c:2509 |
ef317cd5 | 2718 | msgid "Use the same output mode as git-annotate (Default: off)" |
07432cef | 2719 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 2720 | |
814ff314 | 2721 | #: builtin/blame.c:2510 |
ef317cd5 | 2722 | msgid "Show raw timestamp (Default: off)" |
07432cef | 2723 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 2724 | |
814ff314 | 2725 | #: builtin/blame.c:2511 |
ef317cd5 | 2726 | msgid "Show long commit SHA1 (Default: off)" |
07432cef | 2727 | msgstr "显示长的SHA1提交号(默认:关闭)" |
ef317cd5 | 2728 | |
814ff314 | 2729 | #: builtin/blame.c:2512 |
ef317cd5 | 2730 | msgid "Suppress author name and timestamp (Default: off)" |
07432cef | 2731 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 2732 | |
814ff314 | 2733 | #: builtin/blame.c:2513 |
ef317cd5 | 2734 | msgid "Show author email instead of name (Default: off)" |
07432cef | 2735 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 2736 | |
814ff314 | 2737 | #: builtin/blame.c:2514 |
ef317cd5 | 2738 | msgid "Ignore whitespace differences" |
07432cef | 2739 | msgstr "忽略空白差异" |
ef317cd5 | 2740 | |
814ff314 | 2741 | #: builtin/blame.c:2515 |
ef317cd5 | 2742 | msgid "Spend extra cycles to find better match" |
07432cef | 2743 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 2744 | |
814ff314 | 2745 | #: builtin/blame.c:2516 |
ef317cd5 | 2746 | msgid "Use revisions from <file> instead of calling git-rev-list" |
d9d56b23 | 2747 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 2748 | |
814ff314 | 2749 | #: builtin/blame.c:2517 |
ef317cd5 | 2750 | msgid "Use <file>'s contents as the final image" |
d9d56b23 | 2751 | msgstr "使用 <文件> 的内容作为最终的图片" |
ef317cd5 | 2752 | |
814ff314 | 2753 | #: builtin/blame.c:2518 builtin/blame.c:2519 |
ef317cd5 | 2754 | msgid "score" |
07432cef | 2755 | msgstr "得分" |
ef317cd5 | 2756 | |
814ff314 | 2757 | #: builtin/blame.c:2518 |
ef317cd5 | 2758 | msgid "Find line copies within and across files" |
07432cef | 2759 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 2760 | |
814ff314 | 2761 | #: builtin/blame.c:2519 |
ef317cd5 | 2762 | msgid "Find line movements within and across files" |
07432cef | 2763 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 2764 | |
814ff314 | 2765 | #: builtin/blame.c:2520 |
ef317cd5 | 2766 | msgid "n,m" |
07432cef | 2767 | msgstr "n,m" |
ef317cd5 | 2768 | |
814ff314 | 2769 | #: builtin/blame.c:2520 |
ef317cd5 | 2770 | msgid "Process only line range n,m, counting from 1" |
07432cef | 2771 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
ef317cd5 | 2772 | |
6c94aba5 JX |
2773 | #. TRANSLATORS: This string is used to tell us the maximum |
2774 | #. display width for a relative timestamp in "git blame" | |
2775 | #. output. For C locale, "4 years, 11 months ago", which | |
2776 | #. takes 22 places, is the longest among various forms of | |
2777 | #. relative timestamps, but your language may need more or | |
2778 | #. fewer display columns. | |
814ff314 | 2779 | #: builtin/blame.c:2601 |
6c94aba5 JX |
2780 | msgid "4 years, 11 months ago" |
2781 | msgstr "4 年 11 个月前" | |
2782 | ||
1003b3a5 | 2783 | #: builtin/branch.c:24 |
814ff314 JX |
2784 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
2785 | msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" | |
ef317cd5 | 2786 | |
1003b3a5 | 2787 | #: builtin/branch.c:25 |
814ff314 JX |
2788 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
2789 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" | |
ef317cd5 | 2790 | |
1003b3a5 | 2791 | #: builtin/branch.c:26 |
814ff314 JX |
2792 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
2793 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." | |
ef317cd5 | 2794 | |
1003b3a5 | 2795 | #: builtin/branch.c:27 |
814ff314 JX |
2796 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
2797 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" | |
ef317cd5 | 2798 | |
90e6ef53 | 2799 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
220c313c | 2800 | #: builtin/branch.c:152 |
c04f5ac3 JX |
2801 | #, c-format |
2802 | msgid "" | |
2803 | "deleting branch '%s' that has been merged to\n" | |
2804 | " '%s', but not yet merged to HEAD." | |
2805 | msgstr "" | |
70fc47bf | 2806 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
2807 | " '%s',但未合并到 HEAD。" |
2808 | ||
90e6ef53 | 2809 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
220c313c | 2810 | #: builtin/branch.c:156 |
c04f5ac3 JX |
2811 | #, c-format |
2812 | msgid "" | |
2813 | "not deleting branch '%s' that is not yet merged to\n" | |
2814 | " '%s', even though it is merged to HEAD." | |
2815 | msgstr "" | |
70fc47bf T |
2816 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
2817 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 2818 | |
220c313c | 2819 | #: builtin/branch.c:170 |
07432cef WS |
2820 | #, c-format |
2821 | msgid "Couldn't look up commit object for '%s'" | |
2822 | msgstr "无法查询 '%s' 指向的提交对象" | |
2823 | ||
220c313c | 2824 | #: builtin/branch.c:174 |
07432cef WS |
2825 | #, c-format |
2826 | msgid "" | |
2827 | "The branch '%s' is not fully merged.\n" | |
2828 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
2829 | msgstr "" | |
2830 | "分支 '%s' 没有完全合并。\n" | |
2831 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
2832 | ||
220c313c | 2833 | #: builtin/branch.c:187 |
07432cef WS |
2834 | msgid "Update of config-file failed" |
2835 | msgstr "无法更新 config 文件" | |
2836 | ||
220c313c | 2837 | #: builtin/branch.c:215 |
c04f5ac3 | 2838 | msgid "cannot use -a with -d" |
649900bc | 2839 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 2840 | |
220c313c | 2841 | #: builtin/branch.c:221 |
c04f5ac3 JX |
2842 | msgid "Couldn't look up commit object for HEAD" |
2843 | msgstr "无法查询 HEAD 指向的提交对象" | |
2844 | ||
220c313c | 2845 | #: builtin/branch.c:229 |
c04f5ac3 JX |
2846 | #, c-format |
2847 | msgid "Cannot delete the branch '%s' which you are currently on." | |
2848 | msgstr "无法删除您当前所在的分支 '%s'。" | |
2849 | ||
220c313c | 2850 | #: builtin/branch.c:245 |
5ae481e0 | 2851 | #, c-format |
8ada9598 | 2852 | msgid "remote branch '%s' not found." |
81809b99 | 2853 | msgstr "远程分支 '%s' 未发现。" |
c04f5ac3 | 2854 | |
220c313c | 2855 | #: builtin/branch.c:246 |
81809b99 | 2856 | #, c-format |
8ada9598 | 2857 | msgid "branch '%s' not found." |
81809b99 | 2858 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 2859 | |
220c313c | 2860 | #: builtin/branch.c:260 |
81809b99 | 2861 | #, c-format |
8ada9598 | 2862 | msgid "Error deleting remote branch '%s'" |
81809b99 | 2863 | msgstr "删除远程分支 '%s' 时出错" |
c04f5ac3 | 2864 | |
220c313c | 2865 | #: builtin/branch.c:261 |
81809b99 | 2866 | #, c-format |
8ada9598 | 2867 | msgid "Error deleting branch '%s'" |
81809b99 | 2868 | msgstr "删除分支 '%s' 时出错" |
8ada9598 | 2869 | |
220c313c | 2870 | #: builtin/branch.c:268 |
81809b99 | 2871 | #, c-format |
8ada9598 | 2872 | msgid "Deleted remote branch %s (was %s).\n" |
81809b99 | 2873 | msgstr "已删除远程分支 %s(曾为 %s)。\n" |
c04f5ac3 | 2874 | |
220c313c | 2875 | #: builtin/branch.c:269 |
81809b99 | 2876 | #, c-format |
8ada9598 | 2877 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 2878 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 2879 | |
220c313c | 2880 | #: builtin/branch.c:370 |
c04f5ac3 JX |
2881 | #, c-format |
2882 | msgid "branch '%s' does not point at a commit" | |
2883 | msgstr "分支 '%s' 未指向一个提交" | |
2884 | ||
220c313c | 2885 | #: builtin/branch.c:459 |
81809b99 | 2886 | #, c-format |
90314792 JX |
2887 | msgid "[%s: gone]" |
2888 | msgstr "[%s: 丢失]" | |
2889 | ||
220c313c | 2890 | #: builtin/branch.c:464 |
90314792 JX |
2891 | #, c-format |
2892 | msgid "[%s]" | |
2893 | msgstr "[%s]" | |
2894 | ||
220c313c | 2895 | #: builtin/branch.c:469 |
90314792 | 2896 | #, c-format |
8ada9598 | 2897 | msgid "[%s: behind %d]" |
81809b99 | 2898 | msgstr "[%s:落后 %d]" |
c04f5ac3 | 2899 | |
220c313c | 2900 | #: builtin/branch.c:471 |
81809b99 | 2901 | #, c-format |
8ada9598 | 2902 | msgid "[behind %d]" |
81809b99 | 2903 | msgstr "[落后 %d]" |
8ada9598 | 2904 | |
220c313c | 2905 | #: builtin/branch.c:475 |
81809b99 | 2906 | #, c-format |
8ada9598 | 2907 | msgid "[%s: ahead %d]" |
81809b99 | 2908 | msgstr "[%s:领先 %d]" |
c04f5ac3 | 2909 | |
220c313c | 2910 | #: builtin/branch.c:477 |
81809b99 | 2911 | #, c-format |
8ada9598 | 2912 | msgid "[ahead %d]" |
81809b99 | 2913 | msgstr "[领先 %d]" |
8ada9598 | 2914 | |
220c313c | 2915 | #: builtin/branch.c:480 |
81809b99 | 2916 | #, c-format |
8ada9598 | 2917 | msgid "[%s: ahead %d, behind %d]" |
81809b99 | 2918 | msgstr "[%s:领先 %d,落后 %d]" |
8ada9598 | 2919 | |
220c313c | 2920 | #: builtin/branch.c:483 |
81809b99 | 2921 | #, c-format |
8ada9598 | 2922 | msgid "[ahead %d, behind %d]" |
81809b99 | 2923 | msgstr "[领先 %d,落后 %d]" |
c04f5ac3 | 2924 | |
220c313c | 2925 | #: builtin/branch.c:496 |
a77c07d9 JX |
2926 | msgid " **** invalid ref ****" |
2927 | msgstr " **** 无效引用 ****" | |
2928 | ||
220c313c | 2929 | #: builtin/branch.c:587 |
1003b3a5 JX |
2930 | #, c-format |
2931 | msgid "(no branch, rebasing %s)" | |
2932 | msgstr "(非分支,正变基 %s)" | |
2933 | ||
220c313c | 2934 | #: builtin/branch.c:590 |
1003b3a5 JX |
2935 | #, c-format |
2936 | msgid "(no branch, bisect started on %s)" | |
2937 | msgstr "(非分支,二分查找开始于 %s)" | |
2938 | ||
814ff314 | 2939 | #: builtin/branch.c:596 |
1003b3a5 | 2940 | #, c-format |
814ff314 JX |
2941 | msgid "(HEAD detached at %s)" |
2942 | msgstr "(头指针分离于 %s)" | |
1003b3a5 | 2943 | |
814ff314 JX |
2944 | #: builtin/branch.c:599 |
2945 | #, c-format | |
2946 | msgid "(HEAD detached from %s)" | |
2947 | msgstr "(头指针分离自 %s)" | |
2948 | ||
2949 | #: builtin/branch.c:603 | |
c04f5ac3 JX |
2950 | msgid "(no branch)" |
2951 | msgstr "(非分支)" | |
2952 | ||
814ff314 | 2953 | #: builtin/branch.c:650 |
a77c07d9 JX |
2954 | #, c-format |
2955 | msgid "object '%s' does not point to a commit" | |
2956 | msgstr "对象 '%s' 没有指向一个提交" | |
2957 | ||
814ff314 | 2958 | #: builtin/branch.c:698 |
c04f5ac3 | 2959 | msgid "some refs could not be read" |
90e6ef53 | 2960 | msgstr "一些引用不能读取" |
c04f5ac3 | 2961 | |
814ff314 | 2962 | #: builtin/branch.c:711 |
c04f5ac3 | 2963 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 2964 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 2965 | |
814ff314 | 2966 | #: builtin/branch.c:721 |
c04f5ac3 JX |
2967 | #, c-format |
2968 | msgid "Invalid branch name: '%s'" | |
2969 | msgstr "无效的分支名:'%s'" | |
2970 | ||
814ff314 | 2971 | #: builtin/branch.c:736 |
c04f5ac3 JX |
2972 | msgid "Branch rename failed" |
2973 | msgstr "分支重命名失败" | |
2974 | ||
814ff314 | 2975 | #: builtin/branch.c:740 |
c04f5ac3 JX |
2976 | #, c-format |
2977 | msgid "Renamed a misnamed branch '%s' away" | |
2978 | msgstr "重命名掉一个错误命名的旧分支 '%s'" | |
2979 | ||
814ff314 | 2980 | #: builtin/branch.c:744 |
c04f5ac3 JX |
2981 | #, c-format |
2982 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
2983 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
2984 | ||
814ff314 | 2985 | #: builtin/branch.c:751 |
c04f5ac3 JX |
2986 | msgid "Branch is renamed, but update of config-file failed" |
2987 | msgstr "分支被重命名,但更新 config 文件失败" | |
2988 | ||
814ff314 | 2989 | #: builtin/branch.c:766 |
c04f5ac3 JX |
2990 | #, c-format |
2991 | msgid "malformed object name %s" | |
2992 | msgstr "非法的对象名 %s" | |
2993 | ||
814ff314 | 2994 | #: builtin/branch.c:790 |
81809b99 | 2995 | #, c-format |
8ada9598 | 2996 | msgid "could not write branch description template: %s" |
81809b99 | 2997 | msgstr "不能写分支描述模版:%s" |
c04f5ac3 | 2998 | |
814ff314 | 2999 | #: builtin/branch.c:820 |
ef317cd5 | 3000 | msgid "Generic options" |
07432cef | 3001 | msgstr "通用选项" |
c04f5ac3 | 3002 | |
814ff314 | 3003 | #: builtin/branch.c:822 |
ef317cd5 | 3004 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 3005 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 3006 | |
814ff314 | 3007 | #: builtin/branch.c:823 |
ef317cd5 | 3008 | msgid "suppress informational messages" |
07432cef | 3009 | msgstr "不显示信息" |
8ada9598 | 3010 | |
814ff314 | 3011 | #: builtin/branch.c:824 |
ef317cd5 | 3012 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 3013 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 3014 | |
814ff314 | 3015 | #: builtin/branch.c:826 |
ef317cd5 | 3016 | msgid "change upstream info" |
07432cef | 3017 | msgstr "改变上游信息" |
c04f5ac3 | 3018 | |
814ff314 | 3019 | #: builtin/branch.c:830 |
ef317cd5 | 3020 | msgid "use colored output" |
07432cef | 3021 | msgstr "使用彩色输出" |
c04f5ac3 | 3022 | |
814ff314 | 3023 | #: builtin/branch.c:831 |
ef317cd5 | 3024 | msgid "act on remote-tracking branches" |
07432cef | 3025 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 3026 | |
814ff314 | 3027 | #: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 |
44f518e6 JX |
3028 | #: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 |
3029 | #: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 | |
220c313c | 3030 | #: builtin/tag.c:622 |
ef317cd5 | 3031 | msgid "commit" |
07432cef | 3032 | msgstr "提交" |
c04f5ac3 | 3033 | |
814ff314 | 3034 | #: builtin/branch.c:835 builtin/branch.c:841 |
ef317cd5 | 3035 | msgid "print only branches that contain the commit" |
07432cef | 3036 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 3037 | |
814ff314 | 3038 | #: builtin/branch.c:847 |
ef317cd5 | 3039 | msgid "Specific git-branch actions:" |
07432cef | 3040 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 3041 | |
814ff314 | 3042 | #: builtin/branch.c:848 |
ef317cd5 | 3043 | msgid "list both remote-tracking and local branches" |
07432cef | 3044 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 3045 | |
814ff314 | 3046 | #: builtin/branch.c:850 |
ef317cd5 | 3047 | msgid "delete fully merged branch" |
07432cef | 3048 | msgstr "删除完全合并的分支" |
c04f5ac3 | 3049 | |
814ff314 | 3050 | #: builtin/branch.c:851 |
ef317cd5 | 3051 | msgid "delete branch (even if not merged)" |
07432cef | 3052 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 3053 | |
814ff314 | 3054 | #: builtin/branch.c:852 |
ef317cd5 | 3055 | msgid "move/rename a branch and its reflog" |
07432cef | 3056 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 3057 | |
814ff314 | 3058 | #: builtin/branch.c:853 |
ef317cd5 | 3059 | msgid "move/rename a branch, even if target exists" |
07432cef | 3060 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 3061 | |
814ff314 | 3062 | #: builtin/branch.c:854 |
ef317cd5 | 3063 | msgid "list branch names" |
07432cef | 3064 | msgstr "列出分支名" |
c04f5ac3 | 3065 | |
814ff314 | 3066 | #: builtin/branch.c:855 |
ef317cd5 | 3067 | msgid "create the branch's reflog" |
07432cef | 3068 | msgstr "创建分支的引用日志" |
ef317cd5 | 3069 | |
814ff314 | 3070 | #: builtin/branch.c:857 |
ef317cd5 | 3071 | msgid "edit the description for the branch" |
07432cef | 3072 | msgstr "标记分支的描述" |
ef317cd5 | 3073 | |
814ff314 | 3074 | #: builtin/branch.c:858 |
04cb2f28 JX |
3075 | msgid "force creation, move/rename, deletion" |
3076 | msgstr "强制创建、移动/重命名、删除" | |
ef317cd5 | 3077 | |
814ff314 | 3078 | #: builtin/branch.c:861 |
ef317cd5 | 3079 | msgid "print only not merged branches" |
07432cef | 3080 | msgstr "只打印没有合并的分支" |
ef317cd5 | 3081 | |
814ff314 | 3082 | #: builtin/branch.c:867 |
ef317cd5 | 3083 | msgid "print only merged branches" |
07432cef | 3084 | msgstr "只打印合并的分支" |
ef317cd5 | 3085 | |
814ff314 | 3086 | #: builtin/branch.c:871 |
ef317cd5 | 3087 | msgid "list branches in columns" |
07432cef | 3088 | msgstr "以列的方式显示分支" |
ef317cd5 | 3089 | |
814ff314 | 3090 | #: builtin/branch.c:884 |
c04f5ac3 JX |
3091 | msgid "Failed to resolve HEAD as a valid ref." |
3092 | msgstr "无法将 HEAD 解析为有效引用。" | |
3093 | ||
814ff314 | 3094 | #: builtin/branch.c:888 builtin/clone.c:637 |
c04f5ac3 | 3095 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 3096 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 3097 | |
814ff314 | 3098 | #: builtin/branch.c:910 |
8ada9598 | 3099 | msgid "--column and --verbose are incompatible" |
81809b99 | 3100 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 3101 | |
814ff314 | 3102 | #: builtin/branch.c:921 builtin/branch.c:960 |
a77c07d9 JX |
3103 | msgid "branch name required" |
3104 | msgstr "必须提供分支名" | |
3105 | ||
814ff314 | 3106 | #: builtin/branch.c:936 |
a77c07d9 JX |
3107 | msgid "Cannot give description to detached HEAD" |
3108 | msgstr "不能向分离头指针提供描述" | |
3109 | ||
814ff314 | 3110 | #: builtin/branch.c:941 |
a77c07d9 JX |
3111 | msgid "cannot edit description of more than one branch" |
3112 | msgstr "不能为一个以上的分支编辑描述" | |
3113 | ||
814ff314 | 3114 | #: builtin/branch.c:948 |
a77c07d9 JX |
3115 | #, c-format |
3116 | msgid "No commit on branch '%s' yet." | |
3117 | msgstr "分支 '%s' 尚无提交。" | |
3118 | ||
814ff314 | 3119 | #: builtin/branch.c:951 |
a77c07d9 JX |
3120 | #, c-format |
3121 | msgid "No branch named '%s'." | |
3122 | msgstr "没有分支 '%s'。" | |
3123 | ||
814ff314 | 3124 | #: builtin/branch.c:966 |
a77c07d9 JX |
3125 | msgid "too many branches for a rename operation" |
3126 | msgstr "为重命名操作提供了太多的分支名" | |
3127 | ||
814ff314 | 3128 | #: builtin/branch.c:971 |
1003b3a5 JX |
3129 | msgid "too many branches to set new upstream" |
3130 | msgstr "为设置新上游提供了太多的分支名" | |
3131 | ||
814ff314 | 3132 | #: builtin/branch.c:975 |
1003b3a5 JX |
3133 | #, c-format |
3134 | msgid "" | |
3135 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
3136 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
3137 | ||
814ff314 | 3138 | #: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 |
1003b3a5 JX |
3139 | #, c-format |
3140 | msgid "no such branch '%s'" | |
3141 | msgstr "没有此分支 '%s'" | |
3142 | ||
814ff314 | 3143 | #: builtin/branch.c:982 |
07432cef | 3144 | #, c-format |
ef317cd5 | 3145 | msgid "branch '%s' does not exist" |
07432cef | 3146 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 3147 | |
814ff314 | 3148 | #: builtin/branch.c:994 |
1003b3a5 JX |
3149 | msgid "too many branches to unset upstream" |
3150 | msgstr "为取消上游设置操作提供了太多的分支名" | |
3151 | ||
814ff314 | 3152 | #: builtin/branch.c:998 |
1003b3a5 JX |
3153 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
3154 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
3155 | ||
814ff314 | 3156 | #: builtin/branch.c:1004 |
ef317cd5 JX |
3157 | #, c-format |
3158 | msgid "Branch '%s' has no upstream information" | |
07432cef | 3159 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 3160 | |
814ff314 | 3161 | #: builtin/branch.c:1018 |
1003b3a5 JX |
3162 | msgid "it does not make sense to create 'HEAD' manually" |
3163 | msgstr "手工创建 'HEAD' 没有意义" | |
3164 | ||
814ff314 | 3165 | #: builtin/branch.c:1024 |
c04f5ac3 JX |
3166 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
3167 | msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" | |
3168 | ||
814ff314 | 3169 | #: builtin/branch.c:1027 |
ef317cd5 JX |
3170 | #, c-format |
3171 | msgid "" | |
3172 | "The --set-upstream flag is deprecated and will be removed. Consider using --" | |
3173 | "track or --set-upstream-to\n" | |
3174 | msgstr "" | |
07432cef | 3175 | "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" |
ef317cd5 | 3176 | |
814ff314 | 3177 | #: builtin/branch.c:1044 |
ef317cd5 JX |
3178 | #, c-format |
3179 | msgid "" | |
3180 | "\n" | |
3181 | "If you wanted to make '%s' track '%s', do this:\n" | |
3182 | "\n" | |
3183 | msgstr "" | |
07432cef WS |
3184 | "\n" |
3185 | "如果你想用 '%s' 跟踪 '%s', 这么做:\n" | |
3186 | "\n" | |
ef317cd5 | 3187 | |
814ff314 | 3188 | #: builtin/branch.c:1045 |
07432cef | 3189 | #, c-format |
ef317cd5 | 3190 | msgid " git branch -d %s\n" |
07432cef | 3191 | msgstr " git branch -d %s\n" |
ef317cd5 | 3192 | |
814ff314 | 3193 | #: builtin/branch.c:1046 |
ef317cd5 JX |
3194 | #, c-format |
3195 | msgid " git branch --set-upstream-to %s\n" | |
07432cef | 3196 | msgstr " git branch --set-upstream-to %s\n" |
ef317cd5 | 3197 | |
c04f5ac3 JX |
3198 | #: builtin/bundle.c:47 |
3199 | #, c-format | |
3200 | msgid "%s is okay\n" | |
3201 | msgstr "%s 可以\n" | |
3202 | ||
3203 | #: builtin/bundle.c:56 | |
3204 | msgid "Need a repository to create a bundle." | |
90e6ef53 | 3205 | msgstr "需要一个版本库来创建包。" |
c04f5ac3 JX |
3206 | |
3207 | #: builtin/bundle.c:60 | |
3208 | msgid "Need a repository to unbundle." | |
90e6ef53 | 3209 | msgstr "需要一个版本库来解包。" |
c04f5ac3 | 3210 | |
814ff314 JX |
3211 | #: builtin/cat-file.c:326 |
3212 | msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" | |
3213 | msgstr "git cat-file (-t | -s | -e | -p | <类型> | --textconv) <对象>" | |
ef317cd5 | 3214 | |
814ff314 JX |
3215 | #: builtin/cat-file.c:327 |
3216 | msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" | |
3217 | msgstr "git cat-file (--batch | --batch-check) < <对象列表>" | |
ef317cd5 | 3218 | |
814ff314 | 3219 | #: builtin/cat-file.c:364 |
ef317cd5 | 3220 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 3221 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 3222 | |
814ff314 | 3223 | #: builtin/cat-file.c:365 |
ef317cd5 | 3224 | msgid "show object type" |
07432cef | 3225 | msgstr "显示对象类型" |
ef317cd5 | 3226 | |
814ff314 | 3227 | #: builtin/cat-file.c:366 |
ef317cd5 | 3228 | msgid "show object size" |
07432cef | 3229 | msgstr "显示对象大小" |
ef317cd5 | 3230 | |
814ff314 | 3231 | #: builtin/cat-file.c:368 |
ef317cd5 | 3232 | msgid "exit with zero when there's no error" |
07432cef | 3233 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 3234 | |
814ff314 | 3235 | #: builtin/cat-file.c:369 |
ef317cd5 | 3236 | msgid "pretty-print object's content" |
07432cef | 3237 | msgstr "美观地打印对象的内容" |
ef317cd5 | 3238 | |
814ff314 | 3239 | #: builtin/cat-file.c:371 |
ef317cd5 | 3240 | msgid "for blob objects, run textconv on object's content" |
07432cef | 3241 | msgstr "对于数据(blob)对象,对其内容执行 textconv" |
ef317cd5 | 3242 | |
814ff314 | 3243 | #: builtin/cat-file.c:373 |
ef317cd5 | 3244 | msgid "show info and content of objects fed from the standard input" |
07432cef | 3245 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 3246 | |
814ff314 | 3247 | #: builtin/cat-file.c:376 |
ef317cd5 | 3248 | msgid "show info about objects fed from the standard input" |
07432cef | 3249 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 JX |
3250 | |
3251 | #: builtin/check-attr.c:11 | |
814ff314 JX |
3252 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
3253 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." | |
ef317cd5 JX |
3254 | |
3255 | #: builtin/check-attr.c:12 | |
814ff314 JX |
3256 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" |
3257 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>" | |
ef317cd5 JX |
3258 | |
3259 | #: builtin/check-attr.c:19 | |
3260 | msgid "report all attributes set on file" | |
07432cef | 3261 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 JX |
3262 | |
3263 | #: builtin/check-attr.c:20 | |
3264 | msgid "use .gitattributes only from the index" | |
07432cef | 3265 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 3266 | |
220c313c | 3267 | #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 |
ef317cd5 | 3268 | msgid "read file names from stdin" |
07432cef | 3269 | msgstr "从标准输入读出文件名" |
ef317cd5 | 3270 | |
a77c07d9 | 3271 | #: builtin/check-attr.c:23 builtin/check-ignore.c:24 |
90314792 JX |
3272 | msgid "terminate input and output records by a NUL character" |
3273 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 3274 | |
04cb2f28 | 3275 | #: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274 |
a77c07d9 JX |
3276 | msgid "suppress progress reporting" |
3277 | msgstr "不显示进度报告" | |
3278 | ||
2e8451e8 JX |
3279 | #: builtin/check-ignore.c:26 |
3280 | msgid "show non-matching input paths" | |
3281 | msgstr "显示未匹配的输入路径" | |
3282 | ||
90314792 JX |
3283 | #: builtin/check-ignore.c:28 |
3284 | msgid "ignore index when checking" | |
3285 | msgstr "检查时忽略索引" | |
3286 | ||
3287 | #: builtin/check-ignore.c:154 | |
a77c07d9 JX |
3288 | msgid "cannot specify pathnames with --stdin" |
3289 | msgstr "不能同时提供路径及 --stdin 参数" | |
3290 | ||
90314792 | 3291 | #: builtin/check-ignore.c:157 |
a77c07d9 JX |
3292 | msgid "-z only makes sense with --stdin" |
3293 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
3294 | ||
90314792 | 3295 | #: builtin/check-ignore.c:159 |
a77c07d9 JX |
3296 | msgid "no path specified" |
3297 | msgstr "未指定路径" | |
3298 | ||
90314792 | 3299 | #: builtin/check-ignore.c:163 |
a77c07d9 JX |
3300 | msgid "--quiet is only valid with a single pathname" |
3301 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
3302 | ||
90314792 | 3303 | #: builtin/check-ignore.c:165 |
a77c07d9 JX |
3304 | msgid "cannot have both --quiet and --verbose" |
3305 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
3306 | ||
90314792 | 3307 | #: builtin/check-ignore.c:168 |
2e8451e8 JX |
3308 | msgid "--non-matching is only valid with --verbose" |
3309 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
3310 | ||
3311 | #: builtin/check-mailmap.c:8 | |
814ff314 JX |
3312 | msgid "git check-mailmap [<options>] <contact>..." |
3313 | msgstr "git check-mailmap [<选项>] <联系地址>..." | |
2e8451e8 JX |
3314 | |
3315 | #: builtin/check-mailmap.c:13 | |
3316 | msgid "also read contacts from stdin" | |
3317 | msgstr "还从标准输入读取联系地址" | |
3318 | ||
3319 | #: builtin/check-mailmap.c:24 | |
3320 | #, c-format | |
3321 | msgid "unable to parse contact: %s" | |
3322 | msgstr "不能解析联系地址:%s" | |
3323 | ||
3324 | #: builtin/check-mailmap.c:47 | |
3325 | msgid "no contacts specified" | |
3326 | msgstr "未指定联系地址" | |
3327 | ||
ef317cd5 | 3328 | #: builtin/checkout-index.c:126 |
814ff314 JX |
3329 | msgid "git checkout-index [<options>] [--] [<file>...]" |
3330 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" | |
ef317cd5 | 3331 | |
6acbf033 | 3332 | #: builtin/checkout-index.c:188 |
ef317cd5 | 3333 | msgid "check out all files in the index" |
07432cef | 3334 | msgstr "检出索引区的所有文件" |
ef317cd5 | 3335 | |
6acbf033 | 3336 | #: builtin/checkout-index.c:189 |
ef317cd5 | 3337 | msgid "force overwrite of existing files" |
07432cef | 3338 | msgstr "强制覆盖现有的文件" |
ef317cd5 | 3339 | |
6acbf033 | 3340 | #: builtin/checkout-index.c:191 |
ef317cd5 | 3341 | msgid "no warning for existing files and files not in index" |
07432cef | 3342 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 | 3343 | |
6acbf033 | 3344 | #: builtin/checkout-index.c:193 |
ef317cd5 | 3345 | msgid "don't checkout new files" |
07432cef | 3346 | msgstr "不检出新文件" |
ef317cd5 | 3347 | |
6acbf033 | 3348 | #: builtin/checkout-index.c:195 |
ef317cd5 | 3349 | msgid "update stat information in the index file" |
07432cef | 3350 | msgstr "更新索引中文件的状态信息" |
ef317cd5 | 3351 | |
6acbf033 | 3352 | #: builtin/checkout-index.c:201 |
ef317cd5 | 3353 | msgid "read list of paths from the standard input" |
07432cef | 3354 | msgstr "从标准输入读取路径列表" |
ef317cd5 | 3355 | |
6acbf033 | 3356 | #: builtin/checkout-index.c:203 |
ef317cd5 | 3357 | msgid "write the content to temporary files" |
07432cef | 3358 | msgstr "将内容写入临时文件" |
ef317cd5 | 3359 | |
6acbf033 | 3360 | #: builtin/checkout-index.c:204 builtin/column.c:30 |
ef317cd5 | 3361 | msgid "string" |
07432cef | 3362 | msgstr "字符串" |
ef317cd5 | 3363 | |
6acbf033 | 3364 | #: builtin/checkout-index.c:205 |
ef317cd5 | 3365 | msgid "when creating files, prepend <string>" |
07432cef | 3366 | msgstr "在创建文件时,在前面加上<字符串>" |
ef317cd5 | 3367 | |
6acbf033 | 3368 | #: builtin/checkout-index.c:208 |
ef317cd5 | 3369 | msgid "copy out the files from named stage" |
07432cef | 3370 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 JX |
3371 | |
3372 | #: builtin/checkout.c:25 | |
814ff314 JX |
3373 | msgid "git checkout [<options>] <branch>" |
3374 | msgstr "git checkout [<选项>] <分支>" | |
ef317cd5 JX |
3375 | |
3376 | #: builtin/checkout.c:26 | |
814ff314 JX |
3377 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
3378 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." | |
ef317cd5 | 3379 | |
04cb2f28 | 3380 | #: builtin/checkout.c:132 builtin/checkout.c:165 |
c04f5ac3 JX |
3381 | #, c-format |
3382 | msgid "path '%s' does not have our version" | |
3383 | msgstr "路径 '%s' 没有我们的版本" | |
3384 | ||
04cb2f28 | 3385 | #: builtin/checkout.c:134 builtin/checkout.c:167 |
c04f5ac3 JX |
3386 | #, c-format |
3387 | msgid "path '%s' does not have their version" | |
3388 | msgstr "路径 '%s' 没有他们的版本" | |
3389 | ||
04cb2f28 | 3390 | #: builtin/checkout.c:150 |
c04f5ac3 JX |
3391 | #, c-format |
3392 | msgid "path '%s' does not have all necessary versions" | |
3393 | msgstr "路径 '%s' 没有全部必须的版本" | |
3394 | ||
04cb2f28 | 3395 | #: builtin/checkout.c:194 |
c04f5ac3 JX |
3396 | #, c-format |
3397 | msgid "path '%s' does not have necessary versions" | |
3398 | msgstr "路径 '%s' 没有必须的版本" | |
3399 | ||
04cb2f28 | 3400 | #: builtin/checkout.c:211 |
c04f5ac3 JX |
3401 | #, c-format |
3402 | msgid "path '%s': cannot merge" | |
90e6ef53 | 3403 | msgstr "path '%s':无法合并" |
c04f5ac3 | 3404 | |
04cb2f28 | 3405 | #: builtin/checkout.c:228 |
c04f5ac3 JX |
3406 | #, c-format |
3407 | msgid "Unable to add merge result for '%s'" | |
3408 | msgstr "无法为 '%s' 添加合并结果" | |
3409 | ||
04cb2f28 JX |
3410 | #: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255 |
3411 | #: builtin/checkout.c:258 | |
07432cef | 3412 | #, c-format |
ef317cd5 | 3413 | msgid "'%s' cannot be used with updating paths" |
07432cef | 3414 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 3415 | |
04cb2f28 | 3416 | #: builtin/checkout.c:261 builtin/checkout.c:264 |
07432cef | 3417 | #, c-format |
ef317cd5 | 3418 | msgid "'%s' cannot be used with %s" |
07432cef | 3419 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 3420 | |
04cb2f28 | 3421 | #: builtin/checkout.c:267 |
ef317cd5 JX |
3422 | #, c-format |
3423 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 3424 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 3425 | |
04cb2f28 | 3426 | #: builtin/checkout.c:278 builtin/checkout.c:467 |
c04f5ac3 | 3427 | msgid "corrupt index file" |
90e6ef53 | 3428 | msgstr "损坏的索引文件" |
c04f5ac3 | 3429 | |
04cb2f28 | 3430 | #: builtin/checkout.c:338 builtin/checkout.c:345 |
c04f5ac3 JX |
3431 | #, c-format |
3432 | msgid "path '%s' is unmerged" | |
3433 | msgstr "路径 '%s' 未合并" | |
3434 | ||
04cb2f28 | 3435 | #: builtin/checkout.c:489 |
c04f5ac3 | 3436 | msgid "you need to resolve your current index first" |
90e6ef53 | 3437 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 3438 | |
04cb2f28 | 3439 | #: builtin/checkout.c:615 |
c04f5ac3 JX |
3440 | #, c-format |
3441 | msgid "Can not do reflog for '%s'\n" | |
90e6ef53 | 3442 | msgstr "不能对 '%s' 执行 reflog 操作\n" |
c04f5ac3 | 3443 | |
04cb2f28 | 3444 | #: builtin/checkout.c:653 |
c04f5ac3 JX |
3445 | msgid "HEAD is now at" |
3446 | msgstr "HEAD 目前位于" | |
3447 | ||
04cb2f28 | 3448 | #: builtin/checkout.c:660 |
c04f5ac3 JX |
3449 | #, c-format |
3450 | msgid "Reset branch '%s'\n" | |
3451 | msgstr "重置分支 '%s'\n" | |
3452 | ||
04cb2f28 | 3453 | #: builtin/checkout.c:663 |
c04f5ac3 JX |
3454 | #, c-format |
3455 | msgid "Already on '%s'\n" | |
3456 | msgstr "已经位于 '%s'\n" | |
3457 | ||
04cb2f28 | 3458 | #: builtin/checkout.c:667 |
c04f5ac3 JX |
3459 | #, c-format |
3460 | msgid "Switched to and reset branch '%s'\n" | |
3461 | msgstr "切换并重置分支 '%s'\n" | |
3462 | ||
04cb2f28 | 3463 | #: builtin/checkout.c:669 builtin/checkout.c:1050 |
c04f5ac3 JX |
3464 | #, c-format |
3465 | msgid "Switched to a new branch '%s'\n" | |
3466 | msgstr "切换到一个新分支 '%s'\n" | |
3467 | ||
04cb2f28 | 3468 | #: builtin/checkout.c:671 |
c04f5ac3 JX |
3469 | #, c-format |
3470 | msgid "Switched to branch '%s'\n" | |
3471 | msgstr "切换到分支 '%s'\n" | |
3472 | ||
90e6ef53 | 3473 | # 译者:注意保持前导空格 |
04cb2f28 | 3474 | #: builtin/checkout.c:723 |
c04f5ac3 JX |
3475 | #, c-format |
3476 | msgid " ... and %d more.\n" | |
90e6ef53 | 3477 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 | 3478 | |
04cb2f28 | 3479 | #: builtin/checkout.c:729 |
c04f5ac3 JX |
3480 | #, c-format |
3481 | msgid "" | |
3482 | "Warning: you are leaving %d commit behind, not connected to\n" | |
3483 | "any of your branches:\n" | |
3484 | "\n" | |
3485 | "%s\n" | |
3486 | msgid_plural "" | |
3487 | "Warning: you are leaving %d commits behind, not connected to\n" | |
3488 | "any of your branches:\n" | |
3489 | "\n" | |
3490 | "%s\n" | |
3491 | msgstr[0] "" | |
3492 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
3493 | "\n" | |
3494 | "%s\n" | |
5ae481e0 JX |
3495 | msgstr[1] "" |
3496 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
3497 | "\n" | |
3498 | "%s\n" | |
c04f5ac3 | 3499 | |
04cb2f28 | 3500 | #: builtin/checkout.c:747 |
c04f5ac3 JX |
3501 | #, c-format |
3502 | msgid "" | |
3503 | "If you want to keep them by creating a new branch, this may be a good time\n" | |
3504 | "to do so with:\n" | |
3505 | "\n" | |
814ff314 | 3506 | " git branch <new-branch-name> %s\n" |
c04f5ac3 JX |
3507 | "\n" |
3508 | msgstr "" | |
3509 | "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n" | |
3510 | "如下操作:\n" | |
3511 | "\n" | |
814ff314 | 3512 | " git branch <新分支名> %s\n" |
c04f5ac3 JX |
3513 | "\n" |
3514 | ||
04cb2f28 | 3515 | #: builtin/checkout.c:777 |
c04f5ac3 JX |
3516 | msgid "internal error in revision walk" |
3517 | msgstr "在版本遍历时遇到内部错误" | |
3518 | ||
04cb2f28 | 3519 | #: builtin/checkout.c:781 |
c04f5ac3 JX |
3520 | msgid "Previous HEAD position was" |
3521 | msgstr "之前的 HEAD 位置是" | |
3522 | ||
04cb2f28 | 3523 | #: builtin/checkout.c:808 builtin/checkout.c:1045 |
c04f5ac3 | 3524 | msgid "You are on a branch yet to be born" |
90e6ef53 | 3525 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 3526 | |
04cb2f28 | 3527 | #: builtin/checkout.c:952 |
90314792 JX |
3528 | #, c-format |
3529 | msgid "only one reference expected, %d given." | |
3530 | msgstr "只要一个引用,却给出了 %d 个" | |
3531 | ||
04cb2f28 | 3532 | #: builtin/checkout.c:991 |
c04f5ac3 JX |
3533 | #, c-format |
3534 | msgid "invalid reference: %s" | |
3535 | msgstr "无效引用:%s" | |
3536 | ||
04cb2f28 | 3537 | #: builtin/checkout.c:1020 |
c04f5ac3 JX |
3538 | #, c-format |
3539 | msgid "reference is not a tree: %s" | |
3540 | msgstr "引用不是一个树:%s" | |
3541 | ||
04cb2f28 | 3542 | #: builtin/checkout.c:1059 |
ef317cd5 | 3543 | msgid "paths cannot be used with switching branches" |
07432cef | 3544 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 3545 | |
04cb2f28 | 3546 | #: builtin/checkout.c:1062 builtin/checkout.c:1066 |
07432cef | 3547 | #, c-format |
ef317cd5 | 3548 | msgid "'%s' cannot be used with switching branches" |
07432cef | 3549 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 3550 | |
04cb2f28 JX |
3551 | #: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078 |
3552 | #: builtin/checkout.c:1081 | |
07432cef | 3553 | #, c-format |
ef317cd5 | 3554 | msgid "'%s' cannot be used with '%s'" |
07432cef | 3555 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 3556 | |
04cb2f28 | 3557 | #: builtin/checkout.c:1086 |
07432cef | 3558 | #, c-format |
ef317cd5 | 3559 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 3560 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 3561 | |
04cb2f28 | 3562 | #: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90 |
cfff71a9 | 3563 | #: builtin/remote.c:159 builtin/remote.c:161 |
ef317cd5 | 3564 | msgid "branch" |
07432cef | 3565 | msgstr "分支" |
c04f5ac3 | 3566 | |
04cb2f28 | 3567 | #: builtin/checkout.c:1109 |
ef317cd5 | 3568 | msgid "create and checkout a new branch" |
07432cef | 3569 | msgstr "创建并检出一个新的分支" |
c04f5ac3 | 3570 | |
04cb2f28 | 3571 | #: builtin/checkout.c:1111 |
ef317cd5 | 3572 | msgid "create/reset and checkout a branch" |
07432cef | 3573 | msgstr "创建/重置并检出一个分支" |
c04f5ac3 | 3574 | |
04cb2f28 | 3575 | #: builtin/checkout.c:1112 |
ef317cd5 | 3576 | msgid "create reflog for new branch" |
07432cef | 3577 | msgstr "为新的分支创建引用日志" |
ef317cd5 | 3578 | |
04cb2f28 | 3579 | #: builtin/checkout.c:1113 |
ef317cd5 | 3580 | msgid "detach the HEAD at named commit" |
07432cef | 3581 | msgstr "成为指向该提交的分离头指针" |
ef317cd5 | 3582 | |
04cb2f28 | 3583 | #: builtin/checkout.c:1114 |
ef317cd5 | 3584 | msgid "set upstream info for new branch" |
07432cef | 3585 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 3586 | |
04cb2f28 | 3587 | #: builtin/checkout.c:1116 |
6c94aba5 | 3588 | msgid "new-branch" |
07432cef | 3589 | msgstr "新分支" |
ef317cd5 | 3590 | |
04cb2f28 | 3591 | #: builtin/checkout.c:1116 |
ef317cd5 | 3592 | msgid "new unparented branch" |
07432cef | 3593 | msgstr "新的没有父提交的分支" |
ef317cd5 | 3594 | |
04cb2f28 | 3595 | #: builtin/checkout.c:1117 |
ef317cd5 | 3596 | msgid "checkout our version for unmerged files" |
07432cef | 3597 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 3598 | |
04cb2f28 | 3599 | #: builtin/checkout.c:1119 |
ef317cd5 | 3600 | msgid "checkout their version for unmerged files" |
07432cef | 3601 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 3602 | |
04cb2f28 | 3603 | #: builtin/checkout.c:1121 |
ef317cd5 | 3604 | msgid "force checkout (throw away local modifications)" |
07432cef | 3605 | msgstr "强制检出(丢弃本地修改)" |
c04f5ac3 | 3606 | |
04cb2f28 | 3607 | #: builtin/checkout.c:1122 |
ef317cd5 | 3608 | msgid "perform a 3-way merge with the new branch" |
07432cef | 3609 | msgstr "和新的分支执行三路合并" |
ef317cd5 | 3610 | |
04cb2f28 | 3611 | #: builtin/checkout.c:1123 builtin/merge.c:227 |
ef317cd5 | 3612 | msgid "update ignored files (default)" |
07432cef | 3613 | msgstr "更新忽略的文件(默认)" |
c04f5ac3 | 3614 | |
04cb2f28 | 3615 | #: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245 |
ef317cd5 | 3616 | msgid "style" |
07432cef | 3617 | msgstr "风格" |
ef317cd5 | 3618 | |
04cb2f28 | 3619 | #: builtin/checkout.c:1125 |
ef317cd5 | 3620 | msgid "conflict style (merge or diff3)" |
07432cef | 3621 | msgstr "冲突输出风格(merge 或 diff3)" |
ef317cd5 | 3622 | |
04cb2f28 | 3623 | #: builtin/checkout.c:1128 |
4dcdc3d8 JX |
3624 | msgid "do not limit pathspecs to sparse entries only" |
3625 | msgstr "对路径不做稀疏检出的限制" | |
3626 | ||
04cb2f28 | 3627 | #: builtin/checkout.c:1130 |
814ff314 JX |
3628 | msgid "second guess 'git checkout <no-such-branch>'" |
3629 | msgstr "二次猜测'git checkout <无此分支>'" | |
ef317cd5 | 3630 | |
04cb2f28 | 3631 | #: builtin/checkout.c:1153 |
ef317cd5 | 3632 | msgid "-b, -B and --orphan are mutually exclusive" |
07432cef | 3633 | msgstr "-b、-B 和 --orphan 是互斥的" |
ef317cd5 | 3634 | |
04cb2f28 | 3635 | #: builtin/checkout.c:1170 |
ef317cd5 JX |
3636 | msgid "--track needs a branch name" |
3637 | msgstr "--track 需要一个分支名" | |
3638 | ||
04cb2f28 | 3639 | #: builtin/checkout.c:1175 |
ef317cd5 JX |
3640 | msgid "Missing branch name; try -b" |
3641 | msgstr "缺少分支名;尝试 -b" | |
3642 | ||
04cb2f28 | 3643 | #: builtin/checkout.c:1212 |
c04f5ac3 | 3644 | msgid "invalid path specification" |
90e6ef53 | 3645 | msgstr "无效的路径规格" |
c04f5ac3 | 3646 | |
04cb2f28 | 3647 | #: builtin/checkout.c:1219 |
07432cef | 3648 | #, c-format |
c04f5ac3 | 3649 | msgid "" |
ef317cd5 | 3650 | "Cannot update paths and switch to branch '%s' at the same time.\n" |
c04f5ac3 JX |
3651 | "Did you intend to checkout '%s' which can not be resolved as commit?" |
3652 | msgstr "" | |
07432cef WS |
3653 | "不能同时更新路径并切换到分支'%s'。\n" |
3654 | "您是想要检出 '%s' 但其未能解析为提交么?" | |
c04f5ac3 | 3655 | |
04cb2f28 | 3656 | #: builtin/checkout.c:1224 |
07432cef | 3657 | #, c-format |
ef317cd5 | 3658 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 3659 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 3660 | |
04cb2f28 | 3661 | #: builtin/checkout.c:1228 |
c04f5ac3 JX |
3662 | msgid "" |
3663 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
3664 | "checking out of the index." | |
3665 | msgstr "" | |
90e6ef53 | 3666 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 3667 | |
90314792 | 3668 | #: builtin/clean.c:26 |
2e8451e8 JX |
3669 | msgid "" |
3670 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
3671 | msgstr "" | |
3672 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 3673 | |
90314792 | 3674 | #: builtin/clean.c:30 |
07432cef WS |
3675 | #, c-format |
3676 | msgid "Removing %s\n" | |
3677 | msgstr "正删除 %s\n" | |
3678 | ||
90314792 | 3679 | #: builtin/clean.c:31 |
07432cef WS |
3680 | #, c-format |
3681 | msgid "Would remove %s\n" | |
3682 | msgstr "将删除 %s\n" | |
3683 | ||
90314792 | 3684 | #: builtin/clean.c:32 |
07432cef WS |
3685 | #, c-format |
3686 | msgid "Skipping repository %s\n" | |
3687 | msgstr "忽略版本库 %s\n" | |
3688 | ||
90314792 | 3689 | #: builtin/clean.c:33 |
07432cef WS |
3690 | #, c-format |
3691 | msgid "Would skip repository %s\n" | |
3692 | msgstr "将忽略版本库 %s\n" | |
3693 | ||
90314792 | 3694 | #: builtin/clean.c:34 |
07432cef WS |
3695 | #, c-format |
3696 | msgid "failed to remove %s" | |
3697 | msgstr "无法删除 %s" | |
3698 | ||
6c94aba5 | 3699 | #: builtin/clean.c:295 |
2e8451e8 JX |
3700 | msgid "" |
3701 | "Prompt help:\n" | |
3702 | "1 - select a numbered item\n" | |
3703 | "foo - select item based on unique prefix\n" | |
3704 | " - (empty) select nothing" | |
3705 | msgstr "" | |
3706 | "帮助:\n" | |
3707 | "1 - 通过编号选择一个选项\n" | |
3708 | "foo - 通过标题选择一个选项\n" | |
3709 | " - (空)什么也不选择" | |
3710 | ||
6c94aba5 | 3711 | #: builtin/clean.c:299 |
2e8451e8 JX |
3712 | msgid "" |
3713 | "Prompt help:\n" | |
3714 | "1 - select a single item\n" | |
3715 | "3-5 - select a range of items\n" | |
3716 | "2-3,6-9 - select multiple ranges\n" | |
3717 | "foo - select item based on unique prefix\n" | |
3718 | "-... - unselect specified items\n" | |
3719 | "* - choose all items\n" | |
3720 | " - (empty) finish selecting" | |
3721 | msgstr "" | |
3722 | "帮助:\n" | |
3723 | "1 - 选择一个选项\n" | |
3724 | "3-5 - 选择一个范围内的所有选项\n" | |
3725 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
3726 | "foo - 通过标题选择一个选项\n" | |
3727 | "-... - 反选特定的选项\n" | |
3728 | "* - 选择所有选项\n" | |
3729 | " - (空)结束选择" | |
3730 | ||
6c94aba5 | 3731 | #: builtin/clean.c:517 |
2e8451e8 JX |
3732 | #, c-format |
3733 | msgid "Huh (%s)?" | |
3734 | msgstr "嗯(%s)?" | |
3735 | ||
6acbf033 | 3736 | #: builtin/clean.c:659 |
2e8451e8 JX |
3737 | #, c-format |
3738 | msgid "Input ignore patterns>> " | |
3739 | msgstr "输入模版以排除条目>> " | |
3740 | ||
6acbf033 | 3741 | #: builtin/clean.c:696 |
2e8451e8 JX |
3742 | #, c-format |
3743 | msgid "WARNING: Cannot find items matched by: %s" | |
3744 | msgstr "警告:无法找到和 %s 匹配的条目" | |
3745 | ||
6acbf033 | 3746 | #: builtin/clean.c:717 |
2e8451e8 JX |
3747 | msgid "Select items to delete" |
3748 | msgstr "选择要删除的条目" | |
3749 | ||
814ff314 JX |
3750 | #. TRANSLATORS: Make sure to keep [y/N] as is |
3751 | #: builtin/clean.c:758 | |
2e8451e8 | 3752 | #, c-format |
814ff314 JX |
3753 | msgid "Remove %s [y/N]? " |
3754 | msgstr "删除 %s [y/N]?" | |
2e8451e8 | 3755 | |
814ff314 | 3756 | #: builtin/clean.c:783 |
2e8451e8 JX |
3757 | msgid "Bye." |
3758 | msgstr "再见。" | |
3759 | ||
814ff314 | 3760 | #: builtin/clean.c:791 |
2e8451e8 JX |
3761 | msgid "" |
3762 | "clean - start cleaning\n" | |
3763 | "filter by pattern - exclude items from deletion\n" | |
3764 | "select by numbers - select items to be deleted by numbers\n" | |
3765 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
3766 | "quit - stop cleaning\n" | |
3767 | "help - this screen\n" | |
3768 | "? - help for prompt selection" | |
3769 | msgstr "" | |
3770 | "clean - 开始清理\n" | |
3771 | "filter by pattern - 通过模版排除要删除的条目\n" | |
3772 | "select by numbers - 通过数字选择要删除的条目\n" | |
3773 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
3774 | "quit - 停止删除并退出\n" | |
3775 | "help - 显示本帮助\n" | |
3776 | "? - 显示如何在提示符下选择的帮助" | |
3777 | ||
814ff314 | 3778 | #: builtin/clean.c:818 |
2e8451e8 JX |
3779 | msgid "*** Commands ***" |
3780 | msgstr "*** 命令 ***" | |
3781 | ||
814ff314 | 3782 | #: builtin/clean.c:819 |
2e8451e8 JX |
3783 | msgid "What now" |
3784 | msgstr "请选择" | |
3785 | ||
814ff314 | 3786 | #: builtin/clean.c:827 |
2e8451e8 JX |
3787 | msgid "Would remove the following item:" |
3788 | msgid_plural "Would remove the following items:" | |
3789 | msgstr[0] "将删除如下条目:" | |
3790 | msgstr[1] "将删除如下条目:" | |
3791 | ||
814ff314 | 3792 | #: builtin/clean.c:844 |
2e8451e8 JX |
3793 | msgid "No more files to clean, exiting." |
3794 | msgstr "没有要清理的文件,退出。" | |
3795 | ||
814ff314 | 3796 | #: builtin/clean.c:875 |
ef317cd5 | 3797 | msgid "do not print names of files removed" |
07432cef | 3798 | msgstr "不打印删除文件的名称" |
ef317cd5 | 3799 | |
814ff314 | 3800 | #: builtin/clean.c:877 |
ef317cd5 | 3801 | msgid "force" |
07432cef | 3802 | msgstr "强制" |
ef317cd5 | 3803 | |
814ff314 | 3804 | #: builtin/clean.c:878 |
2e8451e8 JX |
3805 | msgid "interactive cleaning" |
3806 | msgstr "交互式清除" | |
3807 | ||
814ff314 | 3808 | #: builtin/clean.c:880 |
ef317cd5 | 3809 | msgid "remove whole directories" |
07432cef | 3810 | msgstr "删除整个目录" |
ef317cd5 | 3811 | |
814ff314 JX |
3812 | #: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 |
3813 | #: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 | |
ef317cd5 | 3814 | msgid "pattern" |
07432cef | 3815 | msgstr "模式" |
ef317cd5 | 3816 | |
814ff314 | 3817 | #: builtin/clean.c:882 |
ef317cd5 | 3818 | msgid "add <pattern> to ignore rules" |
07432cef | 3819 | msgstr "添加<模式>到忽略规则" |
ef317cd5 | 3820 | |
814ff314 | 3821 | #: builtin/clean.c:883 |
ef317cd5 | 3822 | msgid "remove ignored files, too" |
07432cef | 3823 | msgstr "也删除忽略的文件" |
ef317cd5 | 3824 | |
814ff314 | 3825 | #: builtin/clean.c:885 |
ef317cd5 | 3826 | msgid "remove only ignored files" |
07432cef | 3827 | msgstr "只删除忽略的文件" |
c04f5ac3 | 3828 | |
814ff314 | 3829 | #: builtin/clean.c:903 |
c04f5ac3 | 3830 | msgid "-x and -X cannot be used together" |
649900bc | 3831 | msgstr "-x 和 -X 不能同时使用" |
c04f5ac3 | 3832 | |
814ff314 | 3833 | #: builtin/clean.c:907 |
c04f5ac3 | 3834 | msgid "" |
6c94aba5 | 3835 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
2e8451e8 | 3836 | "clean" |
c04f5ac3 | 3837 | msgstr "" |
2e8451e8 | 3838 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 3839 | |
814ff314 | 3840 | #: builtin/clean.c:910 |
c04f5ac3 | 3841 | msgid "" |
6c94aba5 | 3842 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
2e8451e8 | 3843 | "refusing to clean" |
c04f5ac3 | 3844 | msgstr "" |
2e8451e8 | 3845 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 3846 | |
220c313c | 3847 | #: builtin/clone.c:37 |
814ff314 JX |
3848 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
3849 | msgstr "git clone [<选项>] [--] <版本库> [<路径>]" | |
ef317cd5 | 3850 | |
814ff314 JX |
3851 | #: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 |
3852 | #: builtin/push.c:523 | |
ef317cd5 | 3853 | msgid "force progress reporting" |
07432cef | 3854 | msgstr "强制显示进度报告" |
ef317cd5 | 3855 | |
04cb2f28 | 3856 | #: builtin/clone.c:68 |
ef317cd5 | 3857 | msgid "don't create a checkout" |
07432cef | 3858 | msgstr "不创建一个检出" |
ef317cd5 | 3859 | |
04cb2f28 | 3860 | #: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496 |
ef317cd5 | 3861 | msgid "create a bare repository" |
220c313c | 3862 | msgstr "创建一个纯版本库" |
ef317cd5 | 3863 | |
04cb2f28 | 3864 | #: builtin/clone.c:73 |
ef317cd5 | 3865 | msgid "create a mirror repository (implies bare)" |
220c313c | 3866 | msgstr "创建一个镜像版本库(也是纯版本库)" |
ef317cd5 | 3867 | |
04cb2f28 | 3868 | #: builtin/clone.c:75 |
ef317cd5 | 3869 | msgid "to clone from a local repository" |
07432cef | 3870 | msgstr "从本地版本库克隆" |
ef317cd5 | 3871 | |
04cb2f28 | 3872 | #: builtin/clone.c:77 |
ef317cd5 | 3873 | msgid "don't use local hardlinks, always copy" |
07432cef | 3874 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 3875 | |
04cb2f28 | 3876 | #: builtin/clone.c:79 |
ef317cd5 | 3877 | msgid "setup as shared repository" |
07432cef | 3878 | msgstr "设置为共享版本库" |
ef317cd5 | 3879 | |
04cb2f28 | 3880 | #: builtin/clone.c:81 builtin/clone.c:83 |
ef317cd5 | 3881 | msgid "initialize submodules in the clone" |
07432cef | 3882 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 3883 | |
04cb2f28 | 3884 | #: builtin/clone.c:84 builtin/init-db.c:493 |
ef317cd5 | 3885 | msgid "template-directory" |
07432cef | 3886 | msgstr "模板目录" |
ef317cd5 | 3887 | |
04cb2f28 | 3888 | #: builtin/clone.c:85 builtin/init-db.c:494 |
ef317cd5 | 3889 | msgid "directory from which templates will be used" |
07432cef | 3890 | msgstr "模板目录将被使用" |
ef317cd5 | 3891 | |
04cb2f28 | 3892 | #: builtin/clone.c:87 |
ef317cd5 | 3893 | msgid "reference repository" |
cfff71a9 | 3894 | msgstr "参考版本库" |
ef317cd5 | 3895 | |
04cb2f28 | 3896 | #: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 |
ef317cd5 | 3897 | msgid "name" |
07432cef | 3898 | msgstr "名称" |
ef317cd5 | 3899 | |
04cb2f28 | 3900 | #: builtin/clone.c:89 |
ef317cd5 | 3901 | msgid "use <name> instead of 'origin' to track upstream" |
07432cef | 3902 | msgstr "使用<名称>而不是 'origin' 去跟踪上游" |
ef317cd5 | 3903 | |
04cb2f28 | 3904 | #: builtin/clone.c:91 |
ef317cd5 | 3905 | msgid "checkout <branch> instead of the remote's HEAD" |
07432cef | 3906 | msgstr "检出<分支>而不是远程HEAD" |
ef317cd5 | 3907 | |
04cb2f28 | 3908 | #: builtin/clone.c:93 |
ef317cd5 | 3909 | msgid "path to git-upload-pack on the remote" |
07432cef | 3910 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 3911 | |
814ff314 | 3912 | #: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 |
ef317cd5 | 3913 | msgid "depth" |
07432cef | 3914 | msgstr "深度" |
ef317cd5 | 3915 | |
04cb2f28 | 3916 | #: builtin/clone.c:95 |
ef317cd5 | 3917 | msgid "create a shallow clone of that depth" |
07432cef | 3918 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 3919 | |
04cb2f28 | 3920 | #: builtin/clone.c:97 |
ef317cd5 | 3921 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 3922 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 3923 | |
04cb2f28 JX |
3924 | #: builtin/clone.c:99 |
3925 | msgid "use --reference only while cloning" | |
3926 | msgstr "仅在克隆时参考 --reference 指向的本地版本库" | |
3927 | ||
3928 | #: builtin/clone.c:100 builtin/init-db.c:502 | |
ef317cd5 | 3929 | msgid "gitdir" |
07432cef | 3930 | msgstr "git目录" |
ef317cd5 | 3931 | |
04cb2f28 | 3932 | #: builtin/clone.c:101 builtin/init-db.c:503 |
ef317cd5 | 3933 | msgid "separate git dir from working tree" |
07432cef | 3934 | msgstr "git目录和工作区分离" |
ef317cd5 | 3935 | |
04cb2f28 | 3936 | #: builtin/clone.c:102 |
ef317cd5 | 3937 | msgid "key=value" |
07432cef | 3938 | msgstr "key=value" |
ef317cd5 | 3939 | |
04cb2f28 | 3940 | #: builtin/clone.c:103 |
ef317cd5 | 3941 | msgid "set config inside the new repository" |
07432cef | 3942 | msgstr "在新版本库中设置配置信息" |
ef317cd5 | 3943 | |
04cb2f28 | 3944 | #: builtin/clone.c:256 |
c04f5ac3 | 3945 | #, c-format |
4dcdc3d8 | 3946 | msgid "reference repository '%s' is not a local repository." |
cfff71a9 | 3947 | msgstr "参考版本库 '%s' 不是一个本地版本库。" |
c04f5ac3 | 3948 | |
04cb2f28 | 3949 | #: builtin/clone.c:260 |
cfff71a9 JX |
3950 | #, c-format |
3951 | msgid "reference repository '%s' is shallow" | |
3952 | msgstr "参考版本库 '%s' 是一个浅克隆" | |
3953 | ||
04cb2f28 | 3954 | #: builtin/clone.c:263 |
cfff71a9 JX |
3955 | #, c-format |
3956 | msgid "reference repository '%s' is grafted" | |
3957 | msgstr "参考版本库 '%s' 已被嫁接" | |
3958 | ||
04cb2f28 | 3959 | #: builtin/clone.c:325 |
c04f5ac3 JX |
3960 | #, c-format |
3961 | msgid "failed to create directory '%s'" | |
90e6ef53 | 3962 | msgstr "无法创建目录 '%s'" |
c04f5ac3 | 3963 | |
04cb2f28 | 3964 | #: builtin/clone.c:327 builtin/diff.c:84 |
c04f5ac3 JX |
3965 | #, c-format |
3966 | msgid "failed to stat '%s'" | |
90e6ef53 | 3967 | msgstr "无法枚举 '%s' 状态" |
c04f5ac3 | 3968 | |
04cb2f28 | 3969 | #: builtin/clone.c:329 |
c04f5ac3 JX |
3970 | #, c-format |
3971 | msgid "%s exists and is not a directory" | |
3972 | msgstr "%s 存在且不是一个目录" | |
3973 | ||
04cb2f28 | 3974 | #: builtin/clone.c:343 |
c04f5ac3 JX |
3975 | #, c-format |
3976 | msgid "failed to stat %s\n" | |
90e6ef53 | 3977 | msgstr "无法枚举 %s 状态\n" |
c04f5ac3 | 3978 | |
04cb2f28 | 3979 | #: builtin/clone.c:365 |
c04f5ac3 JX |
3980 | #, c-format |
3981 | msgid "failed to create link '%s'" | |
90e6ef53 | 3982 | msgstr "无法创建链接 '%s'" |
c04f5ac3 | 3983 | |
04cb2f28 | 3984 | #: builtin/clone.c:369 |
c04f5ac3 JX |
3985 | #, c-format |
3986 | msgid "failed to copy file to '%s'" | |
90e6ef53 | 3987 | msgstr "无法拷贝文件至 '%s'" |
c04f5ac3 | 3988 | |
04cb2f28 | 3989 | #: builtin/clone.c:392 builtin/clone.c:566 |
c04f5ac3 JX |
3990 | #, c-format |
3991 | msgid "done.\n" | |
3992 | msgstr "完成。\n" | |
3993 | ||
04cb2f28 | 3994 | #: builtin/clone.c:404 |
1003b3a5 JX |
3995 | msgid "" |
3996 | "Clone succeeded, but checkout failed.\n" | |
3997 | "You can inspect what was checked out with 'git status'\n" | |
3998 | "and retry the checkout with 'git checkout -f HEAD'\n" | |
3999 | msgstr "" | |
4000 | "克隆成功,但是检出失败。\n" | |
4001 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
4002 | "'git checkout -f HEAD' 重试\n" | |
4003 | ||
04cb2f28 | 4004 | #: builtin/clone.c:481 |
c04f5ac3 JX |
4005 | #, c-format |
4006 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 4007 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 4008 | |
04cb2f28 | 4009 | #: builtin/clone.c:561 |
2e8451e8 JX |
4010 | #, c-format |
4011 | msgid "Checking connectivity... " | |
4012 | msgstr "检查连接... " | |
4013 | ||
04cb2f28 | 4014 | #: builtin/clone.c:564 |
1003b3a5 JX |
4015 | msgid "remote did not send all necessary objects" |
4016 | msgstr "远程没有发送所有必须的对象" | |
4017 | ||
04cb2f28 | 4018 | #: builtin/clone.c:628 |
c04f5ac3 JX |
4019 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
4020 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
4021 | ||
04cb2f28 | 4022 | #: builtin/clone.c:659 |
1003b3a5 JX |
4023 | msgid "unable to checkout working tree" |
4024 | msgstr "不能检出工作区" | |
4025 | ||
04cb2f28 JX |
4026 | #: builtin/clone.c:746 |
4027 | msgid "cannot repack to clean up" | |
4028 | msgstr "无法执行 repack 来清理" | |
4029 | ||
4030 | #: builtin/clone.c:748 | |
4031 | msgid "cannot unlink temporary alternates file" | |
4032 | msgstr "无法删除临时的 alternates 文件" | |
4033 | ||
4034 | #: builtin/clone.c:778 | |
c04f5ac3 JX |
4035 | msgid "Too many arguments." |
4036 | msgstr "太多参数。" | |
4037 | ||
04cb2f28 | 4038 | #: builtin/clone.c:782 |
c04f5ac3 | 4039 | msgid "You must specify a repository to clone." |
90e6ef53 | 4040 | msgstr "您必须指定一个版本库来克隆。" |
c04f5ac3 | 4041 | |
04cb2f28 | 4042 | #: builtin/clone.c:793 |
c04f5ac3 JX |
4043 | #, c-format |
4044 | msgid "--bare and --origin %s options are incompatible." | |
4045 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
4046 | ||
04cb2f28 | 4047 | #: builtin/clone.c:796 |
07432cef WS |
4048 | msgid "--bare and --separate-git-dir are incompatible." |
4049 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
4050 | ||
04cb2f28 | 4051 | #: builtin/clone.c:809 |
c04f5ac3 JX |
4052 | #, c-format |
4053 | msgid "repository '%s' does not exist" | |
4054 | msgstr "版本库 '%s' 不存在" | |
4055 | ||
814ff314 | 4056 | #: builtin/clone.c:815 builtin/fetch.c:1156 |
cfff71a9 JX |
4057 | #, c-format |
4058 | msgid "depth %s is not a positive number" | |
4059 | msgstr "深度 %s 不是一个正数" | |
4060 | ||
04cb2f28 | 4061 | #: builtin/clone.c:825 |
c04f5ac3 JX |
4062 | #, c-format |
4063 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 4064 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 4065 | |
04cb2f28 | 4066 | #: builtin/clone.c:835 |
c04f5ac3 JX |
4067 | #, c-format |
4068 | msgid "working tree '%s' already exists." | |
4069 | msgstr "工作区 '%s' 已经存在。" | |
4070 | ||
814ff314 | 4071 | #: builtin/clone.c:850 builtin/clone.c:861 |
c04f5ac3 JX |
4072 | #, c-format |
4073 | msgid "could not create leading directories of '%s'" | |
90e6ef53 | 4074 | msgstr "不能为 '%s' 创建先导目录" |
c04f5ac3 | 4075 | |
814ff314 | 4076 | #: builtin/clone.c:853 |
c04f5ac3 | 4077 | #, c-format |
814ff314 JX |
4078 | msgid "could not create work tree dir '%s'" |
4079 | msgstr "不能创建工作区目录 '%s'" | |
c04f5ac3 | 4080 | |
814ff314 | 4081 | #: builtin/clone.c:871 |
c04f5ac3 JX |
4082 | #, c-format |
4083 | msgid "Cloning into bare repository '%s'...\n" | |
220c313c | 4084 | msgstr "克隆到纯版本库 '%s'...\n" |
c04f5ac3 | 4085 | |
814ff314 | 4086 | #: builtin/clone.c:873 |
c04f5ac3 JX |
4087 | #, c-format |
4088 | msgid "Cloning into '%s'...\n" | |
4089 | msgstr "正克隆到 '%s'...\n" | |
4090 | ||
814ff314 | 4091 | #: builtin/clone.c:898 |
04cb2f28 JX |
4092 | msgid "--dissociate given, but there is no --reference" |
4093 | msgstr "提供了参数 --dissociate,但未提供 --reference" | |
4094 | ||
814ff314 | 4095 | #: builtin/clone.c:913 |
6acbf033 JX |
4096 | msgid "--depth is ignored in local clones; use file:// instead." |
4097 | msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。" | |
4098 | ||
814ff314 | 4099 | #: builtin/clone.c:916 |
6acbf033 JX |
4100 | msgid "source repository is shallow, ignoring --local" |
4101 | msgstr "源版本库是浅克隆,忽略 --local" | |
4102 | ||
814ff314 | 4103 | #: builtin/clone.c:921 |
6acbf033 JX |
4104 | msgid "--local is ignored" |
4105 | msgstr "--local 被忽略" | |
4106 | ||
814ff314 | 4107 | #: builtin/clone.c:925 |
c04f5ac3 JX |
4108 | #, c-format |
4109 | msgid "Don't know how to clone %s" | |
4110 | msgstr "不知道如何克隆 %s" | |
4111 | ||
814ff314 | 4112 | #: builtin/clone.c:976 builtin/clone.c:984 |
c04f5ac3 JX |
4113 | #, c-format |
4114 | msgid "Remote branch %s not found in upstream %s" | |
4115 | msgstr "远程分支 %s 在上游 %s 未发现" | |
4116 | ||
814ff314 | 4117 | #: builtin/clone.c:987 |
c04f5ac3 JX |
4118 | msgid "You appear to have cloned an empty repository." |
4119 | msgstr "您似乎克隆了一个空版本库。" | |
4120 | ||
ef317cd5 | 4121 | #: builtin/column.c:9 |
814ff314 JX |
4122 | msgid "git column [<options>]" |
4123 | msgstr "git column [<选项>]" | |
ef317cd5 JX |
4124 | |
4125 | #: builtin/column.c:26 | |
4126 | msgid "lookup config vars" | |
07432cef | 4127 | msgstr "查找配置变量" |
ef317cd5 JX |
4128 | |
4129 | #: builtin/column.c:27 builtin/column.c:28 | |
ef317cd5 | 4130 | msgid "layout to use" |
07432cef | 4131 | msgstr "要使用的布局" |
ef317cd5 JX |
4132 | |
4133 | #: builtin/column.c:29 | |
4134 | msgid "Maximum width" | |
07432cef | 4135 | msgstr "最大宽度" |
ef317cd5 JX |
4136 | |
4137 | #: builtin/column.c:30 | |
4138 | msgid "Padding space on left border" | |
07432cef | 4139 | msgstr "左边框的填充空间" |
ef317cd5 JX |
4140 | |
4141 | #: builtin/column.c:31 | |
4142 | msgid "Padding space on right border" | |
07432cef | 4143 | msgstr "右边框的填充空间" |
ef317cd5 JX |
4144 | |
4145 | #: builtin/column.c:32 | |
4146 | msgid "Padding space between columns" | |
07432cef | 4147 | msgstr "两列之间的填充空间" |
ef317cd5 | 4148 | |
8ada9598 JX |
4149 | #: builtin/column.c:51 |
4150 | msgid "--command must be the first argument" | |
81809b99 | 4151 | msgstr "--command 必须是第一个参数" |
8ada9598 | 4152 | |
220c313c | 4153 | #: builtin/commit.c:37 |
814ff314 JX |
4154 | msgid "git commit [<options>] [--] <pathspec>..." |
4155 | msgstr "git commit [<选项>] [--] <路径规则>..." | |
ef317cd5 | 4156 | |
220c313c | 4157 | #: builtin/commit.c:42 |
814ff314 JX |
4158 | msgid "git status [<options>] [--] <pathspec>..." |
4159 | msgstr "git status [<选项>] [--] <路径规则>..." | |
ef317cd5 | 4160 | |
220c313c JX |
4161 | #: builtin/commit.c:47 |
4162 | msgid "" | |
4163 | "Your name and email address were configured automatically based\n" | |
4164 | "on your username and hostname. Please check that they are accurate.\n" | |
4165 | "You can suppress this message by setting them explicitly. Run the\n" | |
4166 | "following command and follow the instructions in your editor to edit\n" | |
4167 | "your configuration file:\n" | |
4168 | "\n" | |
4169 | " git config --global --edit\n" | |
4170 | "\n" | |
4171 | "After doing this, you may fix the identity used for this commit with:\n" | |
4172 | "\n" | |
4173 | " git commit --amend --reset-author\n" | |
4174 | msgstr "" | |
4175 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
4176 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" | |
4177 | "中编辑您的配置文件:\n" | |
4178 | "\n" | |
4179 | " git config --global --edit\n" | |
4180 | "\n" | |
4181 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
4182 | "\n" | |
4183 | " git commit --amend --reset-author\n" | |
4184 | ||
4185 | #: builtin/commit.c:60 | |
c04f5ac3 JX |
4186 | msgid "" |
4187 | "Your name and email address were configured automatically based\n" | |
4188 | "on your username and hostname. Please check that they are accurate.\n" | |
4189 | "You can suppress this message by setting them explicitly:\n" | |
4190 | "\n" | |
4191 | " git config --global user.name \"Your Name\"\n" | |
4192 | " git config --global user.email you@example.com\n" | |
4193 | "\n" | |
4194 | "After doing this, you may fix the identity used for this commit with:\n" | |
4195 | "\n" | |
4196 | " git commit --amend --reset-author\n" | |
4197 | msgstr "" | |
90e6ef53 | 4198 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" |
220c313c | 4199 | "与否。您可以对其进行设置以免再出现本提示信息:\n" |
c04f5ac3 JX |
4200 | "\n" |
4201 | " git config --global user.name \"Your Name\"\n" | |
4202 | " git config --global user.email you@example.com\n" | |
4203 | "\n" | |
90e6ef53 | 4204 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" |
c04f5ac3 JX |
4205 | "\n" |
4206 | " git commit --amend --reset-author\n" | |
4207 | ||
220c313c | 4208 | #: builtin/commit.c:72 |
c04f5ac3 JX |
4209 | msgid "" |
4210 | "You asked to amend the most recent commit, but doing so would make\n" | |
4211 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
4212 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
4213 | msgstr "" | |
1b150dc9 T |
4214 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
4215 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 4216 | |
220c313c | 4217 | #: builtin/commit.c:77 |
c04f5ac3 JX |
4218 | msgid "" |
4219 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
4220 | "If you wish to commit it anyway, use:\n" | |
4221 | "\n" | |
4222 | " git commit --allow-empty\n" | |
4223 | "\n" | |
c04f5ac3 | 4224 | msgstr "" |
a9ce4543 T |
4225 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
4226 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
4227 | "\n" |
4228 | " git commit --allow-empty\n" | |
4229 | "\n" | |
c04f5ac3 | 4230 | |
220c313c | 4231 | #: builtin/commit.c:84 |
b1894384 JX |
4232 | msgid "Otherwise, please use 'git reset'\n" |
4233 | msgstr "否则,请使用命令 'git reset'\n" | |
4234 | ||
220c313c | 4235 | #: builtin/commit.c:87 |
b1894384 JX |
4236 | msgid "" |
4237 | "If you wish to skip this commit, use:\n" | |
4238 | "\n" | |
4239 | " git reset\n" | |
4240 | "\n" | |
4241 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" | |
4242 | "the remaining commits.\n" | |
4243 | msgstr "" | |
4244 | "如果您想跳过这个提交,使用命令:\n" | |
4245 | "\n" | |
4246 | " git reset\n" | |
4247 | "\n" | |
4248 | "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" | |
4249 | "操作。\n" | |
4250 | ||
44f518e6 | 4251 | #: builtin/commit.c:304 |
c04f5ac3 | 4252 | msgid "failed to unpack HEAD tree object" |
90e6ef53 | 4253 | msgstr "无法解包 HEAD 树对象" |
c04f5ac3 | 4254 | |
44f518e6 | 4255 | #: builtin/commit.c:344 |
c04f5ac3 | 4256 | msgid "unable to create temporary index" |
90e6ef53 | 4257 | msgstr "不能创建临时索引" |
c04f5ac3 | 4258 | |
44f518e6 | 4259 | #: builtin/commit.c:350 |
c04f5ac3 JX |
4260 | msgid "interactive add failed" |
4261 | msgstr "交互式添加失败" | |
4262 | ||
44f518e6 | 4263 | #: builtin/commit.c:361 |
220c313c JX |
4264 | msgid "unable to write index file" |
4265 | msgstr "无法写入索引文件" | |
4266 | ||
44f518e6 | 4267 | #: builtin/commit.c:363 |
220c313c JX |
4268 | msgid "unable to update temporary index" |
4269 | msgstr "无法更新临时索引" | |
4270 | ||
44f518e6 | 4271 | #: builtin/commit.c:365 |
220c313c JX |
4272 | msgid "Failed to update main cache tree" |
4273 | msgstr "不能更新树的主缓存" | |
4274 | ||
44f518e6 | 4275 | #: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463 |
c04f5ac3 | 4276 | msgid "unable to write new_index file" |
90e6ef53 | 4277 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 4278 | |
44f518e6 | 4279 | #: builtin/commit.c:445 |
8ada9598 | 4280 | msgid "cannot do a partial commit during a merge." |
81809b99 | 4281 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 4282 | |
44f518e6 | 4283 | #: builtin/commit.c:447 |
8ada9598 | 4284 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 4285 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 4286 | |
44f518e6 | 4287 | #: builtin/commit.c:456 |
c04f5ac3 | 4288 | msgid "cannot read the index" |
90e6ef53 | 4289 | msgstr "无法读取索引" |
c04f5ac3 | 4290 | |
44f518e6 | 4291 | #: builtin/commit.c:475 |
c04f5ac3 | 4292 | msgid "unable to write temporary index file" |
90e6ef53 | 4293 | msgstr "无法写临时索引文件" |
c04f5ac3 | 4294 | |
44f518e6 | 4295 | #: builtin/commit.c:580 |
220c313c JX |
4296 | #, c-format |
4297 | msgid "commit '%s' lacks author header" | |
4298 | msgstr "提交 '%s' 缺少作者信息" | |
4299 | ||
44f518e6 | 4300 | #: builtin/commit.c:582 |
c04f5ac3 | 4301 | #, c-format |
220c313c JX |
4302 | msgid "commit '%s' has malformed author line" |
4303 | msgstr "提交 '%s' 有非法的作者信息" | |
c04f5ac3 | 4304 | |
44f518e6 | 4305 | #: builtin/commit.c:601 |
c04f5ac3 JX |
4306 | msgid "malformed --author parameter" |
4307 | msgstr "非法的 --author 参数" | |
4308 | ||
44f518e6 | 4309 | #: builtin/commit.c:609 |
c04f5ac3 | 4310 | #, c-format |
6acbf033 JX |
4311 | msgid "invalid date format: %s" |
4312 | msgstr "无效的日期格式:%s" | |
4313 | ||
44f518e6 | 4314 | #: builtin/commit.c:653 |
6acbf033 JX |
4315 | msgid "" |
4316 | "unable to select a comment character that is not used\n" | |
4317 | "in the current commit message" | |
4318 | msgstr "无法选择一个未被当前提交说明使用的注释字符" | |
4319 | ||
44f518e6 | 4320 | #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 |
c04f5ac3 JX |
4321 | #, c-format |
4322 | msgid "could not lookup commit %s" | |
4323 | msgstr "不能查询提交 %s" | |
4324 | ||
44f518e6 | 4325 | #: builtin/commit.c:702 builtin/shortlog.c:273 |
c04f5ac3 JX |
4326 | #, c-format |
4327 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 4328 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 4329 | |
44f518e6 | 4330 | #: builtin/commit.c:704 |
c04f5ac3 | 4331 | msgid "could not read log from standard input" |
90e6ef53 | 4332 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 4333 | |
44f518e6 | 4334 | #: builtin/commit.c:708 |
c04f5ac3 JX |
4335 | #, c-format |
4336 | msgid "could not read log file '%s'" | |
90e6ef53 | 4337 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 4338 | |
44f518e6 | 4339 | #: builtin/commit.c:730 |
c04f5ac3 | 4340 | msgid "could not read MERGE_MSG" |
90e6ef53 | 4341 | msgstr "不能读取 MERGE_MSG" |
c04f5ac3 | 4342 | |
44f518e6 | 4343 | #: builtin/commit.c:734 |
c04f5ac3 | 4344 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 4345 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 4346 | |
44f518e6 | 4347 | #: builtin/commit.c:738 |
c04f5ac3 JX |
4348 | #, c-format |
4349 | msgid "could not read '%s'" | |
90e6ef53 | 4350 | msgstr "不能读取 '%s'" |
c04f5ac3 | 4351 | |
44f518e6 | 4352 | #: builtin/commit.c:785 |
c04f5ac3 | 4353 | msgid "could not write commit template" |
90e6ef53 | 4354 | msgstr "不能写提交模版" |
c04f5ac3 | 4355 | |
44f518e6 | 4356 | #: builtin/commit.c:803 |
81809b99 | 4357 | #, c-format |
c04f5ac3 JX |
4358 | msgid "" |
4359 | "\n" | |
8ada9598 | 4360 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
4361 | "If this is not correct, please remove the file\n" |
4362 | "\t%s\n" | |
4363 | "and try again.\n" | |
4364 | msgstr "" | |
4365 | "\n" | |
649900bc | 4366 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
4367 | "\t%s\n" |
4368 | "然后重试。\n" | |
4369 | ||
44f518e6 | 4370 | #: builtin/commit.c:808 |
81809b99 | 4371 | #, c-format |
8ada9598 JX |
4372 | msgid "" |
4373 | "\n" | |
4374 | "It looks like you may be committing a cherry-pick.\n" | |
4375 | "If this is not correct, please remove the file\n" | |
4376 | "\t%s\n" | |
4377 | "and try again.\n" | |
4378 | msgstr "" | |
4379 | "\n" | |
649900bc | 4380 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
4381 | "\t%s\n" |
4382 | "然后重试。\n" | |
c04f5ac3 | 4383 | |
44f518e6 | 4384 | #: builtin/commit.c:821 |
a77c07d9 | 4385 | #, c-format |
c04f5ac3 | 4386 | msgid "" |
8ada9598 | 4387 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 4388 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
c04f5ac3 | 4389 | msgstr "" |
a77c07d9 | 4390 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
81809b99 | 4391 | "说明将会终止提交。\n" |
c04f5ac3 | 4392 | |
44f518e6 | 4393 | #: builtin/commit.c:828 |
a77c07d9 | 4394 | #, c-format |
c04f5ac3 | 4395 | msgid "" |
8ada9598 | 4396 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 4397 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
c04f5ac3 JX |
4398 | "An empty message aborts the commit.\n" |
4399 | msgstr "" | |
a77c07d9 JX |
4400 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
4401 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 4402 | |
90e6ef53 | 4403 | # 译者:为保证在输出中对齐,注意调整句中空格! |
44f518e6 | 4404 | #: builtin/commit.c:848 |
6acbf033 JX |
4405 | #, c-format |
4406 | msgid "%sAuthor: %.*s <%.*s>" | |
4407 | msgstr "%s作者: %.*s <%.*s>" | |
4408 | ||
4409 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
44f518e6 | 4410 | #: builtin/commit.c:856 |
c04f5ac3 | 4411 | #, c-format |
6acbf033 JX |
4412 | msgid "%sDate: %s" |
4413 | msgstr "%s日期: %s" | |
c04f5ac3 | 4414 | |
90e6ef53 | 4415 | # 译者:为保证在输出中对齐,注意调整句中空格! |
44f518e6 | 4416 | #: builtin/commit.c:863 |
c04f5ac3 | 4417 | #, c-format |
6acbf033 JX |
4418 | msgid "%sCommitter: %.*s <%.*s>" |
4419 | msgstr "%s提交者:%.*s <%.*s>" | |
c04f5ac3 | 4420 | |
44f518e6 | 4421 | #: builtin/commit.c:881 |
c04f5ac3 | 4422 | msgid "Cannot read index" |
90e6ef53 | 4423 | msgstr "无法读取索引" |
c04f5ac3 | 4424 | |
44f518e6 | 4425 | #: builtin/commit.c:938 |
c04f5ac3 JX |
4426 | msgid "Error building trees" |
4427 | msgstr "无法创建树对象" | |
4428 | ||
44f518e6 | 4429 | #: builtin/commit.c:953 builtin/tag.c:495 |
c04f5ac3 JX |
4430 | #, c-format |
4431 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 4432 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 4433 | |
44f518e6 | 4434 | #: builtin/commit.c:1055 |
c04f5ac3 | 4435 | #, c-format |
814ff314 JX |
4436 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
4437 | msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配" | |
c04f5ac3 | 4438 | |
44f518e6 | 4439 | #: builtin/commit.c:1070 builtin/commit.c:1310 |
c04f5ac3 JX |
4440 | #, c-format |
4441 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 4442 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 4443 | |
44f518e6 | 4444 | #: builtin/commit.c:1107 |
2e8451e8 JX |
4445 | msgid "--long and -z are incompatible" |
4446 | msgstr "--long 和 -z 选项不兼容" | |
4447 | ||
44f518e6 | 4448 | #: builtin/commit.c:1137 |
c04f5ac3 JX |
4449 | msgid "Using both --reset-author and --author does not make sense" |
4450 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
4451 | ||
44f518e6 | 4452 | #: builtin/commit.c:1146 |
c04f5ac3 | 4453 | msgid "You have nothing to amend." |
90e6ef53 | 4454 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 4455 | |
44f518e6 | 4456 | #: builtin/commit.c:1149 |
8ada9598 | 4457 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 4458 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 4459 | |
44f518e6 | 4460 | #: builtin/commit.c:1151 |
8ada9598 | 4461 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 4462 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 4463 | |
44f518e6 | 4464 | #: builtin/commit.c:1154 |
c04f5ac3 | 4465 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 4466 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 4467 | |
44f518e6 | 4468 | #: builtin/commit.c:1164 |
c04f5ac3 JX |
4469 | msgid "Only one of -c/-C/-F/--fixup can be used." |
4470 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
4471 | ||
44f518e6 | 4472 | #: builtin/commit.c:1166 |
c04f5ac3 | 4473 | msgid "Option -m cannot be combined with -c/-C/-F/--fixup." |
649900bc | 4474 | msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" |
c04f5ac3 | 4475 | |
44f518e6 | 4476 | #: builtin/commit.c:1174 |
c04f5ac3 | 4477 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 4478 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 4479 | |
44f518e6 | 4480 | #: builtin/commit.c:1191 |
c04f5ac3 JX |
4481 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
4482 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
4483 | ||
44f518e6 | 4484 | #: builtin/commit.c:1193 |
c04f5ac3 JX |
4485 | msgid "No paths with --include/--only does not make sense." |
4486 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
4487 | ||
44f518e6 | 4488 | #: builtin/commit.c:1195 |
c04f5ac3 | 4489 | msgid "Clever... amending the last one with dirty index." |
90e6ef53 | 4490 | msgstr "聪明... 在索引不干净下修补最后的提交。" |
c04f5ac3 | 4491 | |
44f518e6 | 4492 | #: builtin/commit.c:1197 |
6c94aba5 JX |
4493 | msgid "Explicit paths specified without -i or -o; assuming --only paths..." |
4494 | msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..." | |
c04f5ac3 | 4495 | |
44f518e6 | 4496 | #: builtin/commit.c:1209 builtin/tag.c:728 |
c04f5ac3 JX |
4497 | #, c-format |
4498 | msgid "Invalid cleanup mode %s" | |
4499 | msgstr "无效的清理模式 %s" | |
4500 | ||
44f518e6 | 4501 | #: builtin/commit.c:1214 |
c04f5ac3 | 4502 | msgid "Paths with -a does not make sense." |
649900bc | 4503 | msgstr "路径和 -a 选项同时使用没有意义。" |
c04f5ac3 | 4504 | |
44f518e6 | 4505 | #: builtin/commit.c:1324 builtin/commit.c:1604 |
ef317cd5 | 4506 | msgid "show status concisely" |
07432cef | 4507 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 4508 | |
44f518e6 | 4509 | #: builtin/commit.c:1326 builtin/commit.c:1606 |
ef317cd5 | 4510 | msgid "show branch information" |
07432cef | 4511 | msgstr "显示分支信息" |
ef317cd5 | 4512 | |
44f518e6 | 4513 | #: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 |
ef317cd5 | 4514 | msgid "machine-readable output" |
07432cef WS |
4515 | msgstr "机器可读的输出" |
4516 | ||
44f518e6 | 4517 | #: builtin/commit.c:1331 builtin/commit.c:1610 |
07432cef WS |
4518 | msgid "show status in long format (default)" |
4519 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 4520 | |
44f518e6 | 4521 | #: builtin/commit.c:1334 builtin/commit.c:1613 |
ef317cd5 | 4522 | msgid "terminate entries with NUL" |
07432cef | 4523 | msgstr "条目以NUL字符结尾" |
ef317cd5 | 4524 | |
44f518e6 | 4525 | #: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 |
220c313c | 4526 | #: builtin/fast-export.c:983 builtin/tag.c:603 |
ef317cd5 | 4527 | msgid "mode" |
07432cef | 4528 | msgstr "模式" |
ef317cd5 | 4529 | |
44f518e6 | 4530 | #: builtin/commit.c:1337 builtin/commit.c:1616 |
ef317cd5 | 4531 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 4532 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 4533 | |
44f518e6 | 4534 | #: builtin/commit.c:1340 |
ef317cd5 | 4535 | msgid "show ignored files" |
07432cef | 4536 | msgstr "显示忽略的文件" |
ef317cd5 | 4537 | |
44f518e6 | 4538 | #: builtin/commit.c:1341 parse-options.h:153 |
ef317cd5 JX |
4539 | msgid "when" |
4540 | msgstr "何时" | |
4541 | ||
44f518e6 | 4542 | #: builtin/commit.c:1342 |
ef317cd5 JX |
4543 | msgid "" |
4544 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
4545 | "(Default: all)" | |
4546 | msgstr "" | |
07432cef | 4547 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 4548 | |
44f518e6 | 4549 | #: builtin/commit.c:1344 |
ef317cd5 | 4550 | msgid "list untracked files in columns" |
07432cef | 4551 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 4552 | |
44f518e6 | 4553 | #: builtin/commit.c:1431 |
c04f5ac3 JX |
4554 | msgid "couldn't look up newly created commit" |
4555 | msgstr "无法找到新创建的提交" | |
4556 | ||
44f518e6 | 4557 | #: builtin/commit.c:1433 |
c04f5ac3 | 4558 | msgid "could not parse newly created commit" |
90e6ef53 | 4559 | msgstr "不能解析新创建的提交" |
c04f5ac3 | 4560 | |
44f518e6 | 4561 | #: builtin/commit.c:1478 |
c04f5ac3 JX |
4562 | msgid "detached HEAD" |
4563 | msgstr "分离头指针" | |
4564 | ||
7e238ab7 | 4565 | # 译者:中文字符串拼接,可删除前导空格 |
44f518e6 | 4566 | #: builtin/commit.c:1481 |
c04f5ac3 | 4567 | msgid " (root-commit)" |
7e238ab7 | 4568 | msgstr "(根提交)" |
c04f5ac3 | 4569 | |
44f518e6 | 4570 | #: builtin/commit.c:1574 |
ef317cd5 | 4571 | msgid "suppress summary after successful commit" |
07432cef | 4572 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 4573 | |
44f518e6 | 4574 | #: builtin/commit.c:1575 |
ef317cd5 | 4575 | msgid "show diff in commit message template" |
07432cef | 4576 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 4577 | |
44f518e6 | 4578 | #: builtin/commit.c:1577 |
ef317cd5 | 4579 | msgid "Commit message options" |
07432cef | 4580 | msgstr "提交说明选项" |
c04f5ac3 | 4581 | |
44f518e6 | 4582 | #: builtin/commit.c:1578 builtin/tag.c:601 |
ef317cd5 | 4583 | msgid "read message from file" |
07432cef | 4584 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 4585 | |
44f518e6 | 4586 | #: builtin/commit.c:1579 |
ef317cd5 | 4587 | msgid "author" |
07432cef | 4588 | msgstr "作者" |
c04f5ac3 | 4589 | |
44f518e6 | 4590 | #: builtin/commit.c:1579 |
ef317cd5 | 4591 | msgid "override author for commit" |
07432cef | 4592 | msgstr "提交时覆盖作者" |
73a60cd2 | 4593 | |
44f518e6 | 4594 | #: builtin/commit.c:1580 builtin/gc.c:275 |
ef317cd5 | 4595 | msgid "date" |
07432cef | 4596 | msgstr "日期" |
c04f5ac3 | 4597 | |
44f518e6 | 4598 | #: builtin/commit.c:1580 |
ef317cd5 | 4599 | msgid "override date for commit" |
07432cef | 4600 | msgstr "提交时覆盖日期" |
c04f5ac3 | 4601 | |
44f518e6 | 4602 | #: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 |
04cb2f28 | 4603 | #: builtin/notes.c:554 builtin/tag.c:599 |
ef317cd5 | 4604 | msgid "message" |
07432cef | 4605 | msgstr "说明" |
c04f5ac3 | 4606 | |
44f518e6 | 4607 | #: builtin/commit.c:1581 |
ef317cd5 | 4608 | msgid "commit message" |
07432cef | 4609 | msgstr "提交说明" |
ef317cd5 | 4610 | |
44f518e6 | 4611 | #: builtin/commit.c:1582 |
ef317cd5 | 4612 | msgid "reuse and edit message from specified commit" |
07432cef | 4613 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 4614 | |
44f518e6 | 4615 | #: builtin/commit.c:1583 |
ef317cd5 | 4616 | msgid "reuse message from specified commit" |
07432cef | 4617 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 4618 | |
44f518e6 | 4619 | #: builtin/commit.c:1584 |
ef317cd5 | 4620 | msgid "use autosquash formatted message to fixup specified commit" |
07432cef | 4621 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
ef317cd5 | 4622 | |
44f518e6 | 4623 | #: builtin/commit.c:1585 |
ef317cd5 | 4624 | msgid "use autosquash formatted message to squash specified commit" |
07432cef | 4625 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
ef317cd5 | 4626 | |
44f518e6 | 4627 | #: builtin/commit.c:1586 |
ef317cd5 | 4628 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 4629 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 4630 | |
44f518e6 | 4631 | #: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86 |
ef317cd5 | 4632 | msgid "add Signed-off-by:" |
07432cef | 4633 | msgstr "添加 Signed-off-by: 签名" |
ef317cd5 | 4634 | |
44f518e6 | 4635 | #: builtin/commit.c:1588 |
ef317cd5 | 4636 | msgid "use specified template file" |
07432cef | 4637 | msgstr "使用指定的模板文件" |
ef317cd5 | 4638 | |
44f518e6 | 4639 | #: builtin/commit.c:1589 |
ef317cd5 | 4640 | msgid "force edit of commit" |
07432cef | 4641 | msgstr "强制编辑提交" |
ef317cd5 | 4642 | |
07432cef | 4643 | # 译者:可选值,不能翻译(或是原文中笔误,应为 mode) |
44f518e6 | 4644 | #: builtin/commit.c:1590 |
ef317cd5 | 4645 | msgid "default" |
07432cef | 4646 | msgstr "default" |
ef317cd5 | 4647 | |
44f518e6 | 4648 | #: builtin/commit.c:1590 builtin/tag.c:604 |
ef317cd5 | 4649 | msgid "how to strip spaces and #comments from message" |
07432cef | 4650 | msgstr "设置如何删除提交说明里的空格和#注释" |
ef317cd5 | 4651 | |
44f518e6 | 4652 | #: builtin/commit.c:1591 |
ef317cd5 | 4653 | msgid "include status in commit message template" |
07432cef | 4654 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 4655 | |
44f518e6 | 4656 | #: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 |
220c313c | 4657 | #: builtin/tag.c:605 |
6c94aba5 JX |
4658 | msgid "key-id" |
4659 | msgstr "key-id" | |
ef317cd5 | 4660 | |
44f518e6 | 4661 | #: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 |
ef317cd5 | 4662 | msgid "GPG sign commit" |
07432cef | 4663 | msgstr "GPG 提交签名" |
ef317cd5 | 4664 | |
44f518e6 | 4665 | #: builtin/commit.c:1596 |
ef317cd5 | 4666 | msgid "Commit contents options" |
07432cef | 4667 | msgstr "提交内容选项" |
ef317cd5 | 4668 | |
44f518e6 | 4669 | #: builtin/commit.c:1597 |
ef317cd5 | 4670 | msgid "commit all changed files" |
07432cef | 4671 | msgstr "提交所有改动的文件" |
ef317cd5 | 4672 | |
44f518e6 | 4673 | #: builtin/commit.c:1598 |
ef317cd5 | 4674 | msgid "add specified files to index for commit" |
07432cef | 4675 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 4676 | |
44f518e6 | 4677 | #: builtin/commit.c:1599 |
ef317cd5 | 4678 | msgid "interactively add files" |
07432cef | 4679 | msgstr "交互式添加文件" |
ef317cd5 | 4680 | |
44f518e6 | 4681 | #: builtin/commit.c:1600 |
ef317cd5 | 4682 | msgid "interactively add changes" |
07432cef | 4683 | msgstr "交互式添加变更" |
ef317cd5 | 4684 | |
44f518e6 | 4685 | #: builtin/commit.c:1601 |
ef317cd5 | 4686 | msgid "commit only specified files" |
07432cef | 4687 | msgstr "只提交指定的文件" |
ef317cd5 | 4688 | |
44f518e6 | 4689 | #: builtin/commit.c:1602 |
ef317cd5 | 4690 | msgid "bypass pre-commit hook" |
07432cef | 4691 | msgstr "绕过 pre-commit 钩子" |
ef317cd5 | 4692 | |
44f518e6 | 4693 | #: builtin/commit.c:1603 |
ef317cd5 | 4694 | msgid "show what would be committed" |
07432cef | 4695 | msgstr "显示将要提交的内容" |
ef317cd5 | 4696 | |
44f518e6 | 4697 | #: builtin/commit.c:1614 |
ef317cd5 | 4698 | msgid "amend previous commit" |
07432cef | 4699 | msgstr "修改先前的提交" |
ef317cd5 | 4700 | |
44f518e6 | 4701 | #: builtin/commit.c:1615 |
ef317cd5 | 4702 | msgid "bypass post-rewrite hook" |
07432cef | 4703 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 4704 | |
44f518e6 | 4705 | #: builtin/commit.c:1620 |
ef317cd5 | 4706 | msgid "ok to record an empty change" |
07432cef | 4707 | msgstr "允许一个空提交" |
ef317cd5 | 4708 | |
44f518e6 | 4709 | #: builtin/commit.c:1622 |
ef317cd5 | 4710 | msgid "ok to record a change with an empty message" |
07432cef | 4711 | msgstr "允许空的提交说明" |
ef317cd5 | 4712 | |
44f518e6 | 4713 | #: builtin/commit.c:1651 |
c04f5ac3 | 4714 | msgid "could not parse HEAD commit" |
90e6ef53 | 4715 | msgstr "不能解析 HEAD 提交" |
c04f5ac3 | 4716 | |
44f518e6 | 4717 | #: builtin/commit.c:1690 builtin/merge.c:519 |
c04f5ac3 JX |
4718 | #, c-format |
4719 | msgid "could not open '%s' for reading" | |
90e6ef53 | 4720 | msgstr "不能为读入打开 '%s'" |
c04f5ac3 | 4721 | |
44f518e6 | 4722 | #: builtin/commit.c:1697 |
c04f5ac3 JX |
4723 | #, c-format |
4724 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 4725 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 4726 | |
44f518e6 | 4727 | #: builtin/commit.c:1704 |
c04f5ac3 | 4728 | msgid "could not read MERGE_MODE" |
90e6ef53 | 4729 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 4730 | |
44f518e6 | 4731 | #: builtin/commit.c:1723 |
c04f5ac3 JX |
4732 | #, c-format |
4733 | msgid "could not read commit message: %s" | |
90e6ef53 | 4734 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 4735 | |
44f518e6 | 4736 | #: builtin/commit.c:1734 |
73a60cd2 JX |
4737 | #, c-format |
4738 | msgid "Aborting commit; you did not edit the message.\n" | |
4739 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
4740 | ||
44f518e6 | 4741 | #: builtin/commit.c:1739 |
c04f5ac3 JX |
4742 | #, c-format |
4743 | msgid "Aborting commit due to empty commit message.\n" | |
4744 | msgstr "终止提交因为提交说明为空。\n" | |
4745 | ||
44f518e6 | 4746 | #: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 |
c04f5ac3 | 4747 | msgid "failed to write commit object" |
90e6ef53 | 4748 | msgstr "无法写提交对象" |
c04f5ac3 | 4749 | |
44f518e6 | 4750 | #: builtin/commit.c:1787 |
c04f5ac3 JX |
4751 | msgid "" |
4752 | "Repository has been updated, but unable to write\n" | |
220c313c | 4753 | "new_index file. Check that disk is not full and quota is\n" |
c04f5ac3 JX |
4754 | "not exceeded, and then \"git reset HEAD\" to recover." |
4755 | msgstr "" | |
90e6ef53 JX |
4756 | "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" |
4757 | "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" | |
c04f5ac3 | 4758 | |
90314792 | 4759 | #: builtin/config.c:8 |
814ff314 JX |
4760 | msgid "git config [<options>]" |
4761 | msgstr "git config [<选项>]" | |
ef317cd5 | 4762 | |
6c94aba5 | 4763 | #: builtin/config.c:53 |
ef317cd5 | 4764 | msgid "Config file location" |
07432cef | 4765 | msgstr "配置文件位置" |
ef317cd5 | 4766 | |
6c94aba5 | 4767 | #: builtin/config.c:54 |
ef317cd5 | 4768 | msgid "use global config file" |
07432cef | 4769 | msgstr "使用全局配置文件" |
ef317cd5 | 4770 | |
6c94aba5 | 4771 | #: builtin/config.c:55 |
ef317cd5 | 4772 | msgid "use system config file" |
07432cef | 4773 | msgstr "使用系统级配置文件" |
ef317cd5 | 4774 | |
6c94aba5 | 4775 | #: builtin/config.c:56 |
ef317cd5 | 4776 | msgid "use repository config file" |
07432cef | 4777 | msgstr "使用版本库级配置文件" |
ef317cd5 | 4778 | |
6c94aba5 | 4779 | #: builtin/config.c:57 |
ef317cd5 | 4780 | msgid "use given config file" |
07432cef | 4781 | msgstr "使用指定的配置文件" |
ef317cd5 | 4782 | |
6c94aba5 | 4783 | #: builtin/config.c:58 |
2e8451e8 JX |
4784 | msgid "blob-id" |
4785 | msgstr "数据对象ID" | |
4786 | ||
6c94aba5 | 4787 | #: builtin/config.c:58 |
2e8451e8 JX |
4788 | msgid "read config from given blob object" |
4789 | msgstr "从给定的数据对象读取配置" | |
4790 | ||
6c94aba5 | 4791 | #: builtin/config.c:59 |
ef317cd5 | 4792 | msgid "Action" |
07432cef | 4793 | msgstr "操作" |
ef317cd5 | 4794 | |
6c94aba5 | 4795 | #: builtin/config.c:60 |
ef317cd5 | 4796 | msgid "get value: name [value-regex]" |
07432cef | 4797 | msgstr "获取值:name [value-regex]" |
ef317cd5 | 4798 | |
6c94aba5 | 4799 | #: builtin/config.c:61 |
ef317cd5 | 4800 | msgid "get all values: key [value-regex]" |
07432cef | 4801 | msgstr "获得所有的值:key [value-regex]" |
ef317cd5 | 4802 | |
6c94aba5 | 4803 | #: builtin/config.c:62 |
ef317cd5 | 4804 | msgid "get values for regexp: name-regex [value-regex]" |
07432cef | 4805 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
ef317cd5 | 4806 | |
6c94aba5 | 4807 | #: builtin/config.c:63 |
90314792 JX |
4808 | msgid "get value specific for the URL: section[.var] URL" |
4809 | msgstr "获得 URL 取值:section[.var] URL" | |
4810 | ||
6c94aba5 | 4811 | #: builtin/config.c:64 |
ef317cd5 | 4812 | msgid "replace all matching variables: name value [value_regex]" |
07432cef | 4813 | msgstr "替换所有匹配的变量:name value [value_regex]" |
ef317cd5 | 4814 | |
6c94aba5 | 4815 | #: builtin/config.c:65 |
ef317cd5 | 4816 | msgid "add a new variable: name value" |
07432cef | 4817 | msgstr "添加一个新的变量:name value" |
ef317cd5 | 4818 | |
6c94aba5 | 4819 | #: builtin/config.c:66 |
ef317cd5 | 4820 | msgid "remove a variable: name [value-regex]" |
07432cef | 4821 | msgstr "删除一个变量:name [value-regex]" |
ef317cd5 | 4822 | |
6c94aba5 | 4823 | #: builtin/config.c:67 |
ef317cd5 | 4824 | msgid "remove all matches: name [value-regex]" |
07432cef | 4825 | msgstr "删除所有匹配项:name [value-regex]" |
ef317cd5 | 4826 | |
6c94aba5 | 4827 | #: builtin/config.c:68 |
ef317cd5 | 4828 | msgid "rename section: old-name new-name" |
07432cef | 4829 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 4830 | |
6c94aba5 | 4831 | #: builtin/config.c:69 |
ef317cd5 | 4832 | msgid "remove a section: name" |
07432cef | 4833 | msgstr "删除一个小节:name" |
ef317cd5 | 4834 | |
6c94aba5 | 4835 | #: builtin/config.c:70 |
ef317cd5 | 4836 | msgid "list all" |
07432cef | 4837 | msgstr "列出所有" |
ef317cd5 | 4838 | |
6c94aba5 | 4839 | #: builtin/config.c:71 |
ef317cd5 | 4840 | msgid "open an editor" |
07432cef | 4841 | msgstr "打开一个编辑器" |
ef317cd5 | 4842 | |
6c94aba5 | 4843 | #: builtin/config.c:72 |
04cb2f28 JX |
4844 | msgid "find the color configured: slot [default]" |
4845 | msgstr "获得配置的颜色:配置 [默认]" | |
ef317cd5 | 4846 | |
6c94aba5 | 4847 | #: builtin/config.c:73 |
04cb2f28 JX |
4848 | msgid "find the color setting: slot [stdout-is-tty]" |
4849 | msgstr "获得颜色设置:配置 [stdout-is-tty]" | |
ef317cd5 | 4850 | |
6c94aba5 | 4851 | #: builtin/config.c:74 |
ef317cd5 | 4852 | msgid "Type" |
07432cef | 4853 | msgstr "类型" |
ef317cd5 | 4854 | |
6c94aba5 | 4855 | #: builtin/config.c:75 |
ef317cd5 | 4856 | msgid "value is \"true\" or \"false\"" |
07432cef | 4857 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 4858 | |
6c94aba5 | 4859 | #: builtin/config.c:76 |
ef317cd5 | 4860 | msgid "value is decimal number" |
07432cef | 4861 | msgstr "值是十进制数" |
ef317cd5 | 4862 | |
6c94aba5 | 4863 | #: builtin/config.c:77 |
ef317cd5 | 4864 | msgid "value is --bool or --int" |
07432cef | 4865 | msgstr "值是 --bool or --int" |
ef317cd5 | 4866 | |
6c94aba5 | 4867 | #: builtin/config.c:78 |
ef317cd5 | 4868 | msgid "value is a path (file or directory name)" |
07432cef | 4869 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 4870 | |
6c94aba5 | 4871 | #: builtin/config.c:79 |
ef317cd5 | 4872 | msgid "Other" |
07432cef | 4873 | msgstr "其它" |
ef317cd5 | 4874 | |
6c94aba5 | 4875 | #: builtin/config.c:80 |
ef317cd5 | 4876 | msgid "terminate values with NUL byte" |
07432cef | 4877 | msgstr "终止值是NUL字节" |
ef317cd5 | 4878 | |
6c94aba5 | 4879 | #: builtin/config.c:81 |
ef317cd5 | 4880 | msgid "respect include directives on lookup" |
07432cef | 4881 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 4882 | |
04cb2f28 | 4883 | #: builtin/config.c:316 |
220c313c JX |
4884 | msgid "unable to parse default color value" |
4885 | msgstr "不能解析缺省的颜色值" | |
4886 | ||
04cb2f28 | 4887 | #: builtin/config.c:457 |
220c313c JX |
4888 | #, c-format |
4889 | msgid "" | |
4890 | "# This is Git's per-user configuration file.\n" | |
4891 | "[core]\n" | |
4892 | "# Please adapt and uncomment the following lines:\n" | |
4893 | "#\tuser = %s\n" | |
4894 | "#\temail = %s\n" | |
4895 | msgstr "" | |
4896 | "# This is Git's per-user configuration file.\n" | |
4897 | "[core]\n" | |
4898 | "# Please adapt and uncomment the following lines:\n" | |
4899 | "#\tuser = %s\n" | |
4900 | "#\temail = %s\n" | |
4901 | ||
04cb2f28 | 4902 | #: builtin/config.c:589 |
220c313c JX |
4903 | #, c-format |
4904 | msgid "cannot create configuration file %s" | |
4905 | msgstr "不能创建配置文件 %s" | |
4906 | ||
4907 | #: builtin/count-objects.c:55 | |
4dcdc3d8 JX |
4908 | msgid "git count-objects [-v] [-H | --human-readable]" |
4909 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
4910 | ||
220c313c | 4911 | #: builtin/count-objects.c:65 |
4dcdc3d8 JX |
4912 | msgid "print sizes in human readable format" |
4913 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 4914 | |
220c313c | 4915 | #: builtin/describe.c:17 |
814ff314 JX |
4916 | msgid "git describe [<options>] [<commit-ish>...]" |
4917 | msgstr "git describe [<选项>] [<提交号>...]" | |
ef317cd5 | 4918 | |
220c313c | 4919 | #: builtin/describe.c:18 |
814ff314 JX |
4920 | msgid "git describe [<options>] --dirty" |
4921 | msgstr "git describe [<选项>] --dirty" | |
ef317cd5 | 4922 | |
220c313c | 4923 | #: builtin/describe.c:217 |
c04f5ac3 JX |
4924 | #, c-format |
4925 | msgid "annotated tag %s not available" | |
4926 | msgstr "注释 tag %s 无效" | |
4927 | ||
220c313c | 4928 | #: builtin/describe.c:221 |
c04f5ac3 JX |
4929 | #, c-format |
4930 | msgid "annotated tag %s has no embedded name" | |
4931 | msgstr "注释 tag %s 没有嵌入名称" | |
4932 | ||
220c313c | 4933 | #: builtin/describe.c:223 |
c04f5ac3 JX |
4934 | #, c-format |
4935 | msgid "tag '%s' is really '%s' here" | |
90e6ef53 | 4936 | msgstr "tag '%s' 的确是在 '%s'" |
c04f5ac3 | 4937 | |
220c313c | 4938 | #: builtin/describe.c:250 builtin/log.c:452 |
c04f5ac3 JX |
4939 | #, c-format |
4940 | msgid "Not a valid object name %s" | |
4941 | msgstr "不是一个有效的对象名 %s" | |
4942 | ||
220c313c | 4943 | #: builtin/describe.c:253 |
c04f5ac3 JX |
4944 | #, c-format |
4945 | msgid "%s is not a valid '%s' object" | |
4946 | msgstr "%s 不是一个有效的 '%s' 对象" | |
4947 | ||
220c313c | 4948 | #: builtin/describe.c:270 |
c04f5ac3 JX |
4949 | #, c-format |
4950 | msgid "no tag exactly matches '%s'" | |
4951 | msgstr "没有 tag 准确匹配 '%s'" | |
4952 | ||
220c313c | 4953 | #: builtin/describe.c:272 |
c04f5ac3 JX |
4954 | #, c-format |
4955 | msgid "searching to describe %s\n" | |
4956 | msgstr "搜索描述 %s\n" | |
4957 | ||
220c313c | 4958 | #: builtin/describe.c:319 |
c04f5ac3 JX |
4959 | #, c-format |
4960 | msgid "finished search at %s\n" | |
4961 | msgstr "完成搜索 %s\n" | |
4962 | ||
220c313c | 4963 | #: builtin/describe.c:346 |
c04f5ac3 JX |
4964 | #, c-format |
4965 | msgid "" | |
4966 | "No annotated tags can describe '%s'.\n" | |
4967 | "However, there were unannotated tags: try --tags." | |
4968 | msgstr "" | |
4969 | "没有注释 tag 能描述 '%s'。\n" | |
4970 | "然而,有非注释 tag:尝试 --tags。" | |
4971 | ||
220c313c | 4972 | #: builtin/describe.c:350 |
c04f5ac3 JX |
4973 | #, c-format |
4974 | msgid "" | |
4975 | "No tags can describe '%s'.\n" | |
4976 | "Try --always, or create some tags." | |
4977 | msgstr "" | |
4978 | "没有注释 tag 能描述 '%s'。\n" | |
90e6ef53 | 4979 | "尝试 --always,或者创建一些 tag。" |
c04f5ac3 | 4980 | |
220c313c | 4981 | #: builtin/describe.c:371 |
c04f5ac3 JX |
4982 | #, c-format |
4983 | msgid "traversed %lu commits\n" | |
4984 | msgstr "已遍历 %lu 个提交\n" | |
4985 | ||
220c313c | 4986 | #: builtin/describe.c:374 |
c04f5ac3 JX |
4987 | #, c-format |
4988 | msgid "" | |
4989 | "more than %i tags found; listed %i most recent\n" | |
4990 | "gave up search at %s\n" | |
4991 | msgstr "" | |
90e6ef53 JX |
4992 | "发现多于 %i 个 tag,列出最近的 %i 个\n" |
4993 | "在 %s 放弃搜索\n" | |
c04f5ac3 | 4994 | |
220c313c | 4995 | #: builtin/describe.c:396 |
ef317cd5 | 4996 | msgid "find the tag that comes after the commit" |
07432cef | 4997 | msgstr "寻找提交之后的 tag(用于描述提交)" |
ef317cd5 | 4998 | |
220c313c | 4999 | #: builtin/describe.c:397 |
ef317cd5 | 5000 | msgid "debug search strategy on stderr" |
07432cef | 5001 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 5002 | |
220c313c | 5003 | #: builtin/describe.c:398 |
1003b3a5 JX |
5004 | msgid "use any ref" |
5005 | msgstr "使用任意引用" | |
5006 | ||
220c313c | 5007 | #: builtin/describe.c:399 |
1003b3a5 JX |
5008 | msgid "use any tag, even unannotated" |
5009 | msgstr "使用任意 tag,即使未带注解" | |
ef317cd5 | 5010 | |
220c313c | 5011 | #: builtin/describe.c:400 |
ef317cd5 | 5012 | msgid "always use long format" |
07432cef | 5013 | msgstr "始终使用长提交号格式" |
ef317cd5 | 5014 | |
220c313c | 5015 | #: builtin/describe.c:401 |
2e8451e8 JX |
5016 | msgid "only follow first parent" |
5017 | msgstr "只跟随第一个父提交" | |
5018 | ||
220c313c | 5019 | #: builtin/describe.c:404 |
ef317cd5 | 5020 | msgid "only output exact matches" |
07432cef | 5021 | msgstr "只输出精确匹配" |
ef317cd5 | 5022 | |
220c313c | 5023 | #: builtin/describe.c:406 |
ef317cd5 | 5024 | msgid "consider <n> most recent tags (default: 10)" |
07432cef | 5025 | msgstr "考虑最近 <n> 个 tags(默认:10)" |
ef317cd5 | 5026 | |
220c313c | 5027 | #: builtin/describe.c:408 |
ef317cd5 | 5028 | msgid "only consider tags matching <pattern>" |
07432cef | 5029 | msgstr "只考虑匹配 <模式> 的 tags" |
ef317cd5 | 5030 | |
220c313c | 5031 | #: builtin/describe.c:410 builtin/name-rev.c:318 |
ef317cd5 | 5032 | msgid "show abbreviated commit object as fallback" |
07432cef | 5033 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 5034 | |
220c313c | 5035 | #: builtin/describe.c:411 |
ef317cd5 | 5036 | msgid "mark" |
07432cef | 5037 | msgstr "标记" |
ef317cd5 | 5038 | |
220c313c | 5039 | #: builtin/describe.c:412 |
ef317cd5 | 5040 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
07432cef | 5041 | msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 5042 | |
220c313c | 5043 | #: builtin/describe.c:430 |
c04f5ac3 JX |
5044 | msgid "--long is incompatible with --abbrev=0" |
5045 | msgstr "--long 与 --abbrev=0 不兼容" | |
5046 | ||
220c313c | 5047 | #: builtin/describe.c:456 |
c04f5ac3 | 5048 | msgid "No names found, cannot describe anything." |
90e6ef53 | 5049 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 5050 | |
220c313c | 5051 | #: builtin/describe.c:476 |
a8a5406a | 5052 | msgid "--dirty is incompatible with commit-ishes" |
649900bc | 5053 | msgstr "--dirty 不能与提交同时使用" |
c04f5ac3 | 5054 | |
220c313c | 5055 | #: builtin/diff.c:86 |
c04f5ac3 JX |
5056 | #, c-format |
5057 | msgid "'%s': not a regular file or symlink" | |
5058 | msgstr "'%s':不是一个正规文件或符号链接" | |
5059 | ||
220c313c | 5060 | #: builtin/diff.c:237 |
c04f5ac3 JX |
5061 | #, c-format |
5062 | msgid "invalid option: %s" | |
5063 | msgstr "无效选项:%s" | |
5064 | ||
220c313c | 5065 | #: builtin/diff.c:358 |
c04f5ac3 JX |
5066 | msgid "Not a git repository" |
5067 | msgstr "不是一个 git 版本库" | |
5068 | ||
220c313c | 5069 | #: builtin/diff.c:401 |
c04f5ac3 JX |
5070 | #, c-format |
5071 | msgid "invalid object '%s' given." | |
5072 | msgstr "提供了无效对象 '%s'。" | |
5073 | ||
220c313c | 5074 | #: builtin/diff.c:410 |
c04f5ac3 JX |
5075 | #, c-format |
5076 | msgid "more than two blobs given: '%s'" | |
07432cef | 5077 | msgstr "提供了超过两个数据(blob)对象:'%s'" |
c04f5ac3 | 5078 | |
220c313c | 5079 | #: builtin/diff.c:417 |
c04f5ac3 JX |
5080 | #, c-format |
5081 | msgid "unhandled object '%s' given." | |
6c94aba5 | 5082 | msgstr "无法处理的对象 '%s'。" |
c04f5ac3 | 5083 | |
220c313c | 5084 | #: builtin/fast-export.c:24 |
ef317cd5 | 5085 | msgid "git fast-export [rev-list-opts]" |
07432cef | 5086 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 5087 | |
220c313c | 5088 | #: builtin/fast-export.c:979 |
ef317cd5 | 5089 | msgid "show progress after <n> objects" |
07432cef | 5090 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 5091 | |
220c313c | 5092 | #: builtin/fast-export.c:981 |
ef317cd5 | 5093 | msgid "select handling of signed tags" |
07432cef | 5094 | msgstr "选择如何处理签名 tags" |
ef317cd5 | 5095 | |
220c313c | 5096 | #: builtin/fast-export.c:984 |
ef317cd5 | 5097 | msgid "select handling of tags that tag filtered objects" |
07432cef | 5098 | msgstr "选择当 tag 指向被过滤时 tags 的处理方式" |
ef317cd5 | 5099 | |
220c313c | 5100 | #: builtin/fast-export.c:987 |
ef317cd5 | 5101 | msgid "Dump marks to this file" |
07432cef | 5102 | msgstr "把标记存储到这个文件" |
ef317cd5 | 5103 | |
220c313c | 5104 | #: builtin/fast-export.c:989 |
ef317cd5 | 5105 | msgid "Import marks from this file" |
07432cef | 5106 | msgstr "从这个文件导入标记" |
ef317cd5 | 5107 | |
220c313c | 5108 | #: builtin/fast-export.c:991 |
ef317cd5 | 5109 | msgid "Fake a tagger when tags lack one" |
07432cef | 5110 | msgstr "当 tags 缺少标记者字段时,假装提供一个" |
ef317cd5 | 5111 | |
220c313c | 5112 | #: builtin/fast-export.c:993 |
ef317cd5 | 5113 | msgid "Output full tree for each commit" |
07432cef | 5114 | msgstr "每次提交都输出整个树" |
ef317cd5 | 5115 | |
220c313c | 5116 | #: builtin/fast-export.c:995 |
ef317cd5 | 5117 | msgid "Use the done feature to terminate the stream" |
07432cef | 5118 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 5119 | |
220c313c | 5120 | #: builtin/fast-export.c:996 |
ef317cd5 | 5121 | msgid "Skip output of blob data" |
07432cef | 5122 | msgstr "跳过数据对象的输出" |
ef317cd5 | 5123 | |
220c313c | 5124 | #: builtin/fast-export.c:997 |
6acbf033 JX |
5125 | msgid "refspec" |
5126 | msgstr "引用表达式" | |
5127 | ||
220c313c | 5128 | #: builtin/fast-export.c:998 |
6acbf033 JX |
5129 | msgid "Apply refspec to exported refs" |
5130 | msgstr "对导出的引用应用引用表达式" | |
5131 | ||
220c313c JX |
5132 | #: builtin/fast-export.c:999 |
5133 | msgid "anonymize output" | |
5134 | msgstr "匿名输出" | |
5135 | ||
814ff314 | 5136 | #: builtin/fetch.c:19 |
ef317cd5 | 5137 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
90314792 | 5138 | msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]" |
ef317cd5 | 5139 | |
814ff314 | 5140 | #: builtin/fetch.c:20 |
ef317cd5 | 5141 | msgid "git fetch [<options>] <group>" |
07432cef | 5142 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 | 5143 | |
814ff314 | 5144 | #: builtin/fetch.c:21 |
ef317cd5 | 5145 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
07432cef | 5146 | msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]" |
ef317cd5 | 5147 | |
814ff314 | 5148 | #: builtin/fetch.c:22 |
ef317cd5 | 5149 | msgid "git fetch --all [<options>]" |
07432cef | 5150 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 5151 | |
814ff314 | 5152 | #: builtin/fetch.c:89 |
ef317cd5 | 5153 | msgid "fetch from all remotes" |
07432cef | 5154 | msgstr "从所有的远程抓取" |
ef317cd5 | 5155 | |
814ff314 | 5156 | #: builtin/fetch.c:91 |
ef317cd5 | 5157 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 5158 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 5159 | |
814ff314 | 5160 | #: builtin/fetch.c:93 |
ef317cd5 | 5161 | msgid "path to upload pack on remote end" |
07432cef | 5162 | msgstr "上传包到远程的路径" |
ef317cd5 | 5163 | |
814ff314 | 5164 | #: builtin/fetch.c:94 |
ef317cd5 | 5165 | msgid "force overwrite of local branch" |
07432cef | 5166 | msgstr "强制覆盖本地分支" |
ef317cd5 | 5167 | |
814ff314 | 5168 | #: builtin/fetch.c:96 |
ef317cd5 | 5169 | msgid "fetch from multiple remotes" |
07432cef | 5170 | msgstr "从多个远程抓取" |
ef317cd5 | 5171 | |
814ff314 | 5172 | #: builtin/fetch.c:98 |
ef317cd5 | 5173 | msgid "fetch all tags and associated objects" |
07432cef | 5174 | msgstr "抓取所有的 tags 和关联对象" |
ef317cd5 | 5175 | |
814ff314 | 5176 | #: builtin/fetch.c:100 |
ef317cd5 | 5177 | msgid "do not fetch all tags (--no-tags)" |
07432cef | 5178 | msgstr "不抓取任何 tags (--no-tags)" |
ef317cd5 | 5179 | |
814ff314 | 5180 | #: builtin/fetch.c:102 |
ef317cd5 | 5181 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 5182 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 5183 | |
07432cef | 5184 | # 译者:可选值,不能翻译 |
814ff314 | 5185 | #: builtin/fetch.c:103 |
ef317cd5 | 5186 | msgid "on-demand" |
07432cef | 5187 | msgstr "on-demand" |
ef317cd5 | 5188 | |
814ff314 | 5189 | #: builtin/fetch.c:104 |
ef317cd5 | 5190 | msgid "control recursive fetching of submodules" |
07432cef | 5191 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 5192 | |
814ff314 | 5193 | #: builtin/fetch.c:108 |
ef317cd5 | 5194 | msgid "keep downloaded pack" |
07432cef | 5195 | msgstr "保持下载包" |
ef317cd5 | 5196 | |
814ff314 | 5197 | #: builtin/fetch.c:110 |
ef317cd5 | 5198 | msgid "allow updating of HEAD ref" |
07432cef | 5199 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 5200 | |
814ff314 | 5201 | #: builtin/fetch.c:113 |
ef317cd5 | 5202 | msgid "deepen history of shallow clone" |
07432cef | 5203 | msgstr "深化浅克隆的历史" |
ef317cd5 | 5204 | |
814ff314 | 5205 | #: builtin/fetch.c:115 |
a77c07d9 JX |
5206 | msgid "convert to a complete repository" |
5207 | msgstr "转换为一个完整的版本库" | |
5208 | ||
814ff314 | 5209 | #: builtin/fetch.c:117 builtin/log.c:1208 |
ef317cd5 | 5210 | msgid "dir" |
07432cef | 5211 | msgstr "目录" |
ef317cd5 | 5212 | |
814ff314 | 5213 | #: builtin/fetch.c:118 |
ef317cd5 | 5214 | msgid "prepend this to submodule path output" |
07432cef | 5215 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 5216 | |
814ff314 | 5217 | #: builtin/fetch.c:121 |
ef317cd5 | 5218 | msgid "default mode for recursion" |
07432cef | 5219 | msgstr "递归的默认模式" |
ef317cd5 | 5220 | |
814ff314 | 5221 | #: builtin/fetch.c:123 |
cfff71a9 JX |
5222 | msgid "accept refs that update .git/shallow" |
5223 | msgstr "接受更新 .git/shallow 的引用" | |
5224 | ||
814ff314 | 5225 | #: builtin/fetch.c:124 |
6acbf033 JX |
5226 | msgid "refmap" |
5227 | msgstr "引用映射" | |
5228 | ||
814ff314 | 5229 | #: builtin/fetch.c:125 |
6acbf033 JX |
5230 | msgid "specify fetch refmap" |
5231 | msgstr "指定获取操作的引用映射" | |
5232 | ||
814ff314 | 5233 | #: builtin/fetch.c:375 |
c04f5ac3 JX |
5234 | msgid "Couldn't find remote ref HEAD" |
5235 | msgstr "无法发现远程 HEAD 引用" | |
5236 | ||
814ff314 | 5237 | #: builtin/fetch.c:455 |
c04f5ac3 JX |
5238 | #, c-format |
5239 | msgid "object %s not found" | |
5240 | msgstr "对象 %s 未发现" | |
5241 | ||
814ff314 | 5242 | #: builtin/fetch.c:460 |
c04f5ac3 JX |
5243 | msgid "[up to date]" |
5244 | msgstr "[最新]" | |
5245 | ||
814ff314 | 5246 | #: builtin/fetch.c:474 |
c04f5ac3 JX |
5247 | #, c-format |
5248 | msgid "! %-*s %-*s -> %s (can't fetch in current branch)" | |
5249 | msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)" | |
5250 | ||
814ff314 | 5251 | #: builtin/fetch.c:475 builtin/fetch.c:561 |
c04f5ac3 JX |
5252 | msgid "[rejected]" |
5253 | msgstr "[已拒绝]" | |
5254 | ||
814ff314 | 5255 | #: builtin/fetch.c:486 |
c04f5ac3 JX |
5256 | msgid "[tag update]" |
5257 | msgstr "[tag更新]" | |
5258 | ||
90e6ef53 | 5259 | # 译者:注意保持前导空格 |
814ff314 | 5260 | #: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 |
c04f5ac3 JX |
5261 | msgid " (unable to update local ref)" |
5262 | msgstr " (不能更新本地引用)" | |
5263 | ||
814ff314 | 5264 | #: builtin/fetch.c:506 |
c04f5ac3 JX |
5265 | msgid "[new tag]" |
5266 | msgstr "[新tag]" | |
5267 | ||
814ff314 | 5268 | #: builtin/fetch.c:509 |
c04f5ac3 JX |
5269 | msgid "[new branch]" |
5270 | msgstr "[新分支]" | |
5271 | ||
814ff314 | 5272 | #: builtin/fetch.c:512 |
170e9899 JX |
5273 | msgid "[new ref]" |
5274 | msgstr "[新引用]" | |
5275 | ||
814ff314 | 5276 | #: builtin/fetch.c:557 |
c04f5ac3 JX |
5277 | msgid "unable to update local ref" |
5278 | msgstr "不能更新本地引用" | |
5279 | ||
814ff314 | 5280 | #: builtin/fetch.c:557 |
c04f5ac3 JX |
5281 | msgid "forced update" |
5282 | msgstr "强制更新" | |
5283 | ||
814ff314 | 5284 | #: builtin/fetch.c:563 |
c04f5ac3 | 5285 | msgid "(non-fast-forward)" |
90e6ef53 | 5286 | msgstr "(非快进式)" |
c04f5ac3 | 5287 | |
814ff314 | 5288 | #: builtin/fetch.c:596 builtin/fetch.c:829 |
c04f5ac3 JX |
5289 | #, c-format |
5290 | msgid "cannot open %s: %s\n" | |
5291 | msgstr "无法打开 %s:%s\n" | |
5292 | ||
814ff314 | 5293 | #: builtin/fetch.c:605 |
c04f5ac3 JX |
5294 | #, c-format |
5295 | msgid "%s did not send all necessary objects\n" | |
5296 | msgstr "%s 未发送所有必须的对象\n" | |
5297 | ||
814ff314 | 5298 | #: builtin/fetch.c:623 |
cfff71a9 JX |
5299 | #, c-format |
5300 | msgid "reject %s because shallow roots are not allowed to be updated" | |
5301 | msgstr "拒绝 %s 因为浅克隆不允许被更新" | |
5302 | ||
814ff314 | 5303 | #: builtin/fetch.c:711 builtin/fetch.c:794 |
c04f5ac3 JX |
5304 | #, c-format |
5305 | msgid "From %.*s\n" | |
5306 | msgstr "来自 %.*s\n" | |
5307 | ||
814ff314 | 5308 | #: builtin/fetch.c:722 |
c04f5ac3 JX |
5309 | #, c-format |
5310 | msgid "" | |
5311 | "some local refs could not be updated; try running\n" | |
5312 | " 'git remote prune %s' to remove any old, conflicting branches" | |
5313 | msgstr "" | |
5314 | "一些本地引用不能被更新;尝试运行\n" | |
5315 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
5316 | ||
90e6ef53 | 5317 | # 译者:注意保持前导空格 |
814ff314 | 5318 | #: builtin/fetch.c:774 |
81809b99 | 5319 | #, c-format |
8ada9598 | 5320 | msgid " (%s will become dangling)" |
07432cef | 5321 | msgstr " (%s 将成为摇摆状态)" |
c04f5ac3 | 5322 | |
90e6ef53 | 5323 | # 译者:注意保持前导空格 |
814ff314 | 5324 | #: builtin/fetch.c:775 |
81809b99 | 5325 | #, c-format |
8ada9598 | 5326 | msgid " (%s has become dangling)" |
07432cef | 5327 | msgstr " (%s 已成为摇摆状态)" |
c04f5ac3 | 5328 | |
814ff314 | 5329 | #: builtin/fetch.c:799 |
c04f5ac3 JX |
5330 | msgid "[deleted]" |
5331 | msgstr "[已删除]" | |
5332 | ||
814ff314 | 5333 | #: builtin/fetch.c:800 builtin/remote.c:1060 |
c04f5ac3 JX |
5334 | msgid "(none)" |
5335 | msgstr "(无)" | |
5336 | ||
814ff314 | 5337 | #: builtin/fetch.c:819 |
c04f5ac3 JX |
5338 | #, c-format |
5339 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
220c313c | 5340 | msgstr "拒绝获取到非纯版本库的当前分支 %s" |
c04f5ac3 | 5341 | |
814ff314 | 5342 | #: builtin/fetch.c:838 |
c04f5ac3 JX |
5343 | #, c-format |
5344 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
5345 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
5346 | ||
814ff314 | 5347 | #: builtin/fetch.c:841 |
c04f5ac3 JX |
5348 | #, c-format |
5349 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 5350 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 5351 | |
814ff314 | 5352 | #: builtin/fetch.c:897 |
90314792 JX |
5353 | #, c-format |
5354 | msgid "Don't know how to fetch from %s" | |
5355 | msgstr "不知道如何从 %s 获取" | |
5356 | ||
814ff314 | 5357 | #: builtin/fetch.c:1059 |
c04f5ac3 JX |
5358 | #, c-format |
5359 | msgid "Fetching %s\n" | |
d4a8e00b | 5360 | msgstr "正在获取 %s\n" |
c04f5ac3 | 5361 | |
814ff314 | 5362 | #: builtin/fetch.c:1061 builtin/remote.c:90 |
c04f5ac3 JX |
5363 | #, c-format |
5364 | msgid "Could not fetch %s" | |
5365 | msgstr "不能获取 %s" | |
5366 | ||
814ff314 | 5367 | #: builtin/fetch.c:1079 |
c04f5ac3 JX |
5368 | msgid "" |
5369 | "No remote repository specified. Please, specify either a URL or a\n" | |
5370 | "remote name from which new revisions should be fetched." | |
90e6ef53 | 5371 | msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。" |
c04f5ac3 | 5372 | |
814ff314 | 5373 | #: builtin/fetch.c:1102 |
c04f5ac3 | 5374 | msgid "You need to specify a tag name." |
90e6ef53 | 5375 | msgstr "您需要指定一个 tag 名称。" |
c04f5ac3 | 5376 | |
814ff314 | 5377 | #: builtin/fetch.c:1144 |
a77c07d9 JX |
5378 | msgid "--depth and --unshallow cannot be used together" |
5379 | msgstr "--depth 和 --unshallow 不能同时使用" | |
5380 | ||
814ff314 | 5381 | #: builtin/fetch.c:1146 |
a77c07d9 JX |
5382 | msgid "--unshallow on a complete repository does not make sense" |
5383 | msgstr "对于一个完整的版本库,参数 --unshallow 没有意义" | |
5384 | ||
814ff314 | 5385 | #: builtin/fetch.c:1169 |
c04f5ac3 JX |
5386 | msgid "fetch --all does not take a repository argument" |
5387 | msgstr "fetch --all 不能带一个版本库参数" | |
5388 | ||
814ff314 | 5389 | #: builtin/fetch.c:1171 |
c04f5ac3 | 5390 | msgid "fetch --all does not make sense with refspecs" |
90314792 | 5391 | msgstr "fetch --all 带引用规则没有任何意义" |
c04f5ac3 | 5392 | |
814ff314 | 5393 | #: builtin/fetch.c:1182 |
c04f5ac3 JX |
5394 | #, c-format |
5395 | msgid "No such remote or remote group: %s" | |
5396 | msgstr "没有这样的远程或远程组:%s" | |
5397 | ||
814ff314 | 5398 | #: builtin/fetch.c:1190 |
c04f5ac3 | 5399 | msgid "Fetching a group and specifying refspecs does not make sense" |
90314792 | 5400 | msgstr "获取组并指定引用规则没有意义" |
c04f5ac3 | 5401 | |
ef317cd5 | 5402 | #: builtin/fmt-merge-msg.c:13 |
814ff314 JX |
5403 | msgid "" |
5404 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
5405 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" | |
c04f5ac3 | 5406 | |
04cb2f28 JX |
5407 | #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 |
5408 | #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 | |
d9d56b23 | 5409 | #: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590 |
6c94aba5 | 5410 | #: parse-options.h:132 parse-options.h:239 |
ef317cd5 | 5411 | msgid "n" |
07432cef | 5412 | msgstr "n" |
c04f5ac3 | 5413 | |
04cb2f28 | 5414 | #: builtin/fmt-merge-msg.c:663 |
ef317cd5 | 5415 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 5416 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 5417 | |
04cb2f28 | 5418 | #: builtin/fmt-merge-msg.c:666 |
ef317cd5 | 5419 | msgid "alias for --log (deprecated)" |
07432cef | 5420 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 5421 | |
04cb2f28 | 5422 | #: builtin/fmt-merge-msg.c:669 |
ef317cd5 | 5423 | msgid "text" |
07432cef | 5424 | msgstr "文本" |
ef317cd5 | 5425 | |
04cb2f28 | 5426 | #: builtin/fmt-merge-msg.c:670 |
ef317cd5 | 5427 | msgid "use <text> as start of message" |
07432cef | 5428 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 5429 | |
04cb2f28 | 5430 | #: builtin/fmt-merge-msg.c:671 |
ef317cd5 | 5431 | msgid "file to read from" |
07432cef | 5432 | msgstr "从文件中读取" |
ef317cd5 | 5433 | |
814ff314 | 5434 | #: builtin/for-each-ref.c:675 |
220c313c JX |
5435 | msgid "unable to parse format" |
5436 | msgstr "不能解析格式" | |
5437 | ||
814ff314 JX |
5438 | #: builtin/for-each-ref.c:1063 |
5439 | msgid "git for-each-ref [<options>] [<pattern>]" | |
5440 | msgstr "git for-each-ref [<选项>] [<模式>]" | |
ef317cd5 | 5441 | |
814ff314 | 5442 | #: builtin/for-each-ref.c:1078 |
ef317cd5 | 5443 | msgid "quote placeholders suitably for shells" |
07432cef | 5444 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 5445 | |
814ff314 | 5446 | #: builtin/for-each-ref.c:1080 |
ef317cd5 | 5447 | msgid "quote placeholders suitably for perl" |
07432cef | 5448 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 5449 | |
814ff314 | 5450 | #: builtin/for-each-ref.c:1082 |
ef317cd5 | 5451 | msgid "quote placeholders suitably for python" |
07432cef | 5452 | msgstr "引用占位符适用于 python" |
ef317cd5 | 5453 | |
814ff314 | 5454 | #: builtin/for-each-ref.c:1084 |
04cb2f28 JX |
5455 | msgid "quote placeholders suitably for Tcl" |
5456 | msgstr "引用占位符适用于 Tcl" | |
ef317cd5 | 5457 | |
814ff314 | 5458 | #: builtin/for-each-ref.c:1087 |
ef317cd5 | 5459 | msgid "show only <n> matched refs" |
07432cef | 5460 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 5461 | |
814ff314 | 5462 | #: builtin/for-each-ref.c:1088 builtin/replace.c:438 |
ef317cd5 | 5463 | msgid "format" |
07432cef | 5464 | msgstr "格式" |
ef317cd5 | 5465 | |
814ff314 | 5466 | #: builtin/for-each-ref.c:1088 |
ef317cd5 | 5467 | msgid "format to use for the output" |
07432cef | 5468 | msgstr "输出格式" |
ef317cd5 | 5469 | |
814ff314 | 5470 | #: builtin/for-each-ref.c:1089 |
ef317cd5 | 5471 | msgid "key" |
07432cef | 5472 | msgstr "key" |
ef317cd5 | 5473 | |
814ff314 | 5474 | #: builtin/for-each-ref.c:1090 |
ef317cd5 | 5475 | msgid "field name to sort on" |
07432cef | 5476 | msgstr "排序的字段名" |
ef317cd5 | 5477 | |
814ff314 | 5478 | #: builtin/fsck.c:147 builtin/prune.c:137 |
6c94aba5 JX |
5479 | msgid "Checking connectivity" |
5480 | msgstr "检查连接中" | |
5481 | ||
220c313c | 5482 | #: builtin/fsck.c:540 |
6c94aba5 JX |
5483 | msgid "Checking object directories" |
5484 | msgstr "检查对象目录中" | |
5485 | ||
220c313c | 5486 | #: builtin/fsck.c:603 |
814ff314 JX |
5487 | msgid "git fsck [<options>] [<object>...]" |
5488 | msgstr "git fsck [<选项>] [<对象>...]" | |
ef317cd5 | 5489 | |
220c313c | 5490 | #: builtin/fsck.c:609 |
ef317cd5 | 5491 | msgid "show unreachable objects" |
07432cef | 5492 | msgstr "显示不可达的对象" |
ef317cd5 | 5493 | |
220c313c | 5494 | #: builtin/fsck.c:610 |
ef317cd5 | 5495 | msgid "show dangling objects" |
07432cef | 5496 | msgstr "显示摇摆的对象" |
ef317cd5 | 5497 | |
220c313c | 5498 | #: builtin/fsck.c:611 |
ef317cd5 | 5499 | msgid "report tags" |
07432cef | 5500 | msgstr "报告 tags" |
ef317cd5 | 5501 | |
220c313c | 5502 | #: builtin/fsck.c:612 |
ef317cd5 | 5503 | msgid "report root nodes" |
07432cef | 5504 | msgstr "报告根节点" |
ef317cd5 | 5505 | |
220c313c | 5506 | #: builtin/fsck.c:613 |
ef317cd5 | 5507 | msgid "make index objects head nodes" |
07432cef | 5508 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 5509 | |
220c313c | 5510 | #: builtin/fsck.c:614 |
ef317cd5 | 5511 | msgid "make reflogs head nodes (default)" |
07432cef | 5512 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 5513 | |
220c313c | 5514 | #: builtin/fsck.c:615 |
ef317cd5 | 5515 | msgid "also consider packs and alternate objects" |
07432cef | 5516 | msgstr "也考虑包和备用对象" |
ef317cd5 | 5517 | |
220c313c | 5518 | #: builtin/fsck.c:616 |
ef317cd5 | 5519 | msgid "enable more strict checking" |
07432cef | 5520 | msgstr "启用更严格的检查" |
ef317cd5 | 5521 | |
220c313c | 5522 | #: builtin/fsck.c:618 |
ef317cd5 | 5523 | msgid "write dangling objects in .git/lost-found" |
07432cef | 5524 | msgstr "将摇摆对象写入 .git/lost-found 中" |
ef317cd5 | 5525 | |
220c313c | 5526 | #: builtin/fsck.c:619 builtin/prune.c:108 |
ef317cd5 | 5527 | msgid "show progress" |
07432cef | 5528 | msgstr "显示进度" |
ef317cd5 | 5529 | |
220c313c | 5530 | #: builtin/fsck.c:669 |
6c94aba5 JX |
5531 | msgid "Checking objects" |
5532 | msgstr "检查对象中" | |
5533 | ||
cfff71a9 | 5534 | #: builtin/gc.c:24 |
814ff314 JX |
5535 | msgid "git gc [<options>]" |
5536 | msgstr "git gc [<选项>]" | |
ef317cd5 | 5537 | |
220c313c | 5538 | #: builtin/gc.c:79 |
c04f5ac3 | 5539 | #, c-format |
220c313c JX |
5540 | msgid "Invalid gc.pruneexpire: '%s'" |
5541 | msgstr "无效的 gc.pruneexpire:'%s'" | |
c04f5ac3 | 5542 | |
220c313c | 5543 | #: builtin/gc.c:107 |
c04f5ac3 JX |
5544 | #, c-format |
5545 | msgid "insanely long object directory %.*s" | |
5546 | msgstr "不正常的长对象目录 %.*s" | |
5547 | ||
220c313c | 5548 | #: builtin/gc.c:276 |
ef317cd5 | 5549 | msgid "prune unreferenced objects" |
07432cef | 5550 | msgstr "清除未引用的对象" |
ef317cd5 | 5551 | |
220c313c | 5552 | #: builtin/gc.c:278 |
ef317cd5 | 5553 | msgid "be more thorough (increased runtime)" |
07432cef | 5554 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 5555 | |
220c313c | 5556 | #: builtin/gc.c:279 |
ef317cd5 | 5557 | msgid "enable auto-gc mode" |
07432cef | 5558 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 5559 | |
220c313c | 5560 | #: builtin/gc.c:280 |
90314792 JX |
5561 | msgid "force running gc even if there may be another gc running" |
5562 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
5563 | ||
220c313c | 5564 | #: builtin/gc.c:321 |
c04f5ac3 | 5565 | #, c-format |
6c94aba5 JX |
5566 | msgid "Auto packing the repository in background for optimum performance.\n" |
5567 | msgstr "自动在后台执行版本库打包以求最佳性能。\n" | |
5568 | ||
220c313c | 5569 | #: builtin/gc.c:323 |
6c94aba5 JX |
5570 | #, c-format |
5571 | msgid "Auto packing the repository for optimum performance.\n" | |
5572 | msgstr "自动打包版本库以求最佳性能。\n" | |
5573 | ||
220c313c | 5574 | #: builtin/gc.c:324 |
6c94aba5 JX |
5575 | #, c-format |
5576 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
5577 | msgstr "手工维护参见 \"git help gc\"。\n" | |
c04f5ac3 | 5578 | |
220c313c | 5579 | #: builtin/gc.c:342 |
90314792 JX |
5580 | #, c-format |
5581 | msgid "" | |
5582 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
5583 | msgstr "" | |
5584 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)" | |
5585 | ||
220c313c | 5586 | #: builtin/gc.c:364 |
c04f5ac3 JX |
5587 | msgid "" |
5588 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 5589 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 5590 | |
90314792 | 5591 | #: builtin/grep.c:23 |
814ff314 JX |
5592 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
5593 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" | |
ef317cd5 | 5594 | |
90314792 | 5595 | #: builtin/grep.c:218 |
c04f5ac3 JX |
5596 | #, c-format |
5597 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 5598 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 5599 | |
6acbf033 | 5600 | #: builtin/grep.c:441 builtin/grep.c:476 |
c04f5ac3 JX |
5601 | #, c-format |
5602 | msgid "unable to read tree (%s)" | |
90e6ef53 | 5603 | msgstr "无法读取树(%s)" |
c04f5ac3 | 5604 | |
6acbf033 | 5605 | #: builtin/grep.c:491 |
c04f5ac3 JX |
5606 | #, c-format |
5607 | msgid "unable to grep from object of type %s" | |
5608 | msgstr "无法抓取来自于 %s 类型的对象" | |
5609 | ||
6acbf033 | 5610 | #: builtin/grep.c:547 |
c04f5ac3 JX |
5611 | #, c-format |
5612 | msgid "switch `%c' expects a numerical value" | |
5613 | msgstr "开关 `%c' 期望一个数字值" | |
5614 | ||
6acbf033 | 5615 | #: builtin/grep.c:564 |
c04f5ac3 JX |
5616 | #, c-format |
5617 | msgid "cannot open '%s'" | |
5618 | msgstr "不能打开 '%s'" | |
5619 | ||
6acbf033 | 5620 | #: builtin/grep.c:638 |
ef317cd5 | 5621 | msgid "search in index instead of in the work tree" |
07432cef | 5622 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 5623 | |
6acbf033 | 5624 | #: builtin/grep.c:640 |
ef317cd5 | 5625 | msgid "find in contents not managed by git" |
07432cef | 5626 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 JX |
5627 | |
5628 | # 译者:中文字符串拼接,可删除前导空格 | |
6acbf033 | 5629 | #: builtin/grep.c:642 |
ef317cd5 | 5630 | msgid "search in both tracked and untracked files" |
07432cef | 5631 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 5632 | |
6acbf033 | 5633 | #: builtin/grep.c:644 |
814ff314 JX |
5634 | msgid "ignore files specified via '.gitignore'" |
5635 | msgstr "忽略 '.gitignore' 包含的文件" | |
ef317cd5 | 5636 | |
6acbf033 | 5637 | #: builtin/grep.c:647 |
ef317cd5 | 5638 | msgid "show non-matching lines" |
07432cef | 5639 | msgstr "显示未匹配的行" |
ef317cd5 | 5640 | |
6acbf033 | 5641 | #: builtin/grep.c:649 |
ef317cd5 | 5642 | msgid "case insensitive matching" |
07432cef | 5643 | msgstr "不区分大小写匹配" |
ef317cd5 | 5644 | |
6acbf033 | 5645 | #: builtin/grep.c:651 |
ef317cd5 | 5646 | msgid "match patterns only at word boundaries" |
07432cef | 5647 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 5648 | |
6acbf033 | 5649 | #: builtin/grep.c:653 |
ef317cd5 | 5650 | msgid "process binary files as text" |
07432cef | 5651 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 5652 | |
6acbf033 | 5653 | #: builtin/grep.c:655 |
ef317cd5 | 5654 | msgid "don't match patterns in binary files" |
07432cef | 5655 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 5656 | |
6acbf033 | 5657 | #: builtin/grep.c:658 |
90314792 JX |
5658 | msgid "process binary files with textconv filters" |
5659 | msgstr "用 textconv 过滤器处理二进制文件" | |
5660 | ||
6acbf033 | 5661 | #: builtin/grep.c:660 |
ef317cd5 | 5662 | msgid "descend at most <depth> levels" |
07432cef | 5663 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 5664 | |
6acbf033 | 5665 | #: builtin/grep.c:664 |
ef317cd5 | 5666 | msgid "use extended POSIX regular expressions" |
07432cef | 5667 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 5668 | |
6acbf033 | 5669 | #: builtin/grep.c:667 |
ef317cd5 | 5670 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 5671 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 5672 | |
6acbf033 | 5673 | #: builtin/grep.c:670 |
ef317cd5 | 5674 | msgid "interpret patterns as fixed strings" |
07432cef | 5675 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 5676 | |
6acbf033 | 5677 | #: builtin/grep.c:673 |
ef317cd5 | 5678 | msgid "use Perl-compatible regular expressions" |
07432cef | 5679 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 5680 | |
6acbf033 | 5681 | #: builtin/grep.c:676 |
ef317cd5 | 5682 | msgid "show line numbers" |
07432cef | 5683 | msgstr "显示行号" |
ef317cd5 | 5684 | |
6acbf033 | 5685 | #: builtin/grep.c:677 |
ef317cd5 | 5686 | msgid "don't show filenames" |
07432cef | 5687 | msgstr "不显示文件名" |
ef317cd5 | 5688 | |
6acbf033 | 5689 | #: builtin/grep.c:678 |
ef317cd5 | 5690 | msgid "show filenames" |
07432cef | 5691 | msgstr "显示文件名" |
ef317cd5 | 5692 | |
6acbf033 | 5693 | #: builtin/grep.c:680 |
ef317cd5 | 5694 | msgid "show filenames relative to top directory" |
07432cef | 5695 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 5696 | |
6acbf033 | 5697 | #: builtin/grep.c:682 |
ef317cd5 | 5698 | msgid "show only filenames instead of matching lines" |
07432cef | 5699 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 5700 | |
6acbf033 | 5701 | #: builtin/grep.c:684 |
ef317cd5 | 5702 | msgid "synonym for --files-with-matches" |
07432cef | 5703 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 5704 | |
6acbf033 | 5705 | #: builtin/grep.c:687 |
ef317cd5 | 5706 | msgid "show only the names of files without match" |
07432cef | 5707 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 5708 | |
6acbf033 | 5709 | #: builtin/grep.c:689 |
ef317cd5 | 5710 | msgid "print NUL after filenames" |
07432cef | 5711 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 5712 | |
6acbf033 | 5713 | #: builtin/grep.c:691 |
ef317cd5 | 5714 | msgid "show the number of matches instead of matching lines" |
07432cef | 5715 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 5716 | |
6acbf033 | 5717 | #: builtin/grep.c:692 |
ef317cd5 | 5718 | msgid "highlight matches" |
07432cef | 5719 | msgstr "高亮显示匹配项" |
ef317cd5 | 5720 | |
6acbf033 | 5721 | #: builtin/grep.c:694 |
ef317cd5 | 5722 | msgid "print empty line between matches from different files" |
07432cef | 5723 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 5724 | |
6acbf033 | 5725 | #: builtin/grep.c:696 |
ef317cd5 | 5726 | msgid "show filename only once above matches from same file" |
07432cef | 5727 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 5728 | |
6acbf033 | 5729 | #: builtin/grep.c:699 |
ef317cd5 | 5730 | msgid "show <n> context lines before and after matches" |
07432cef | 5731 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 5732 | |
6acbf033 | 5733 | #: builtin/grep.c:702 |
ef317cd5 | 5734 | msgid "show <n> context lines before matches" |
07432cef | 5735 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 5736 | |
6acbf033 | 5737 | #: builtin/grep.c:704 |
ef317cd5 | 5738 | msgid "show <n> context lines after matches" |
07432cef | 5739 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 5740 | |
6acbf033 | 5741 | #: builtin/grep.c:705 |
ef317cd5 | 5742 | msgid "shortcut for -C NUM" |
07432cef | 5743 | msgstr "快捷键 -C 数字" |
ef317cd5 | 5744 | |
6acbf033 | 5745 | #: builtin/grep.c:708 |
ef317cd5 | 5746 | msgid "show a line with the function name before matches" |
07432cef | 5747 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 5748 | |
6acbf033 | 5749 | #: builtin/grep.c:710 |
ef317cd5 | 5750 | msgid "show the surrounding function" |
07432cef | 5751 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 5752 | |
6acbf033 | 5753 | #: builtin/grep.c:713 |
ef317cd5 | 5754 | msgid "read patterns from file" |
07432cef | 5755 | msgstr "从文件读取模式" |
ef317cd5 | 5756 | |
6acbf033 | 5757 | #: builtin/grep.c:715 |
ef317cd5 | 5758 | msgid "match <pattern>" |
07432cef | 5759 | msgstr "匹配 <模式>" |
ef317cd5 | 5760 | |
6acbf033 | 5761 | #: builtin/grep.c:717 |
ef317cd5 | 5762 | msgid "combine patterns specified with -e" |
07432cef | 5763 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 5764 | |
6acbf033 | 5765 | #: builtin/grep.c:729 |
ef317cd5 | 5766 | msgid "indicate hit with exit status without output" |
07432cef | 5767 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 5768 | |
6acbf033 | 5769 | #: builtin/grep.c:731 |
ef317cd5 | 5770 | msgid "show only matches from files that match all patterns" |
07432cef | 5771 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 5772 | |
6acbf033 | 5773 | #: builtin/grep.c:733 |
07432cef WS |
5774 | msgid "show parse tree for grep expression" |
5775 | msgstr "显示 grep 表达式的解析树" | |
5776 | ||
6acbf033 | 5777 | #: builtin/grep.c:737 |
ef317cd5 | 5778 | msgid "pager" |
07432cef | 5779 | msgstr "分页" |
ef317cd5 | 5780 | |
6acbf033 | 5781 | #: builtin/grep.c:737 |
ef317cd5 | 5782 | msgid "show matching files in the pager" |
07432cef | 5783 | msgstr "分页显示匹配的文件" |
ef317cd5 | 5784 | |
6acbf033 | 5785 | #: builtin/grep.c:740 |
ef317cd5 | 5786 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 5787 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 5788 | |
6acbf033 | 5789 | #: builtin/grep.c:741 builtin/show-ref.c:187 |
ef317cd5 | 5790 | msgid "show usage" |
07432cef | 5791 | msgstr "显示用法" |
ef317cd5 | 5792 | |
6acbf033 | 5793 | #: builtin/grep.c:808 |
c04f5ac3 JX |
5794 | msgid "no pattern given." |
5795 | msgstr "未提供模式匹配。" | |
5796 | ||
6acbf033 | 5797 | #: builtin/grep.c:866 |
c04f5ac3 JX |
5798 | msgid "--open-files-in-pager only works on the worktree" |
5799 | msgstr "--open-files-in-pager 仅用于工作区" | |
5800 | ||
6acbf033 | 5801 | #: builtin/grep.c:892 |
c04f5ac3 | 5802 | msgid "--cached or --untracked cannot be used with --no-index." |
649900bc | 5803 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" |
c04f5ac3 | 5804 | |
6acbf033 | 5805 | #: builtin/grep.c:897 |
c04f5ac3 | 5806 | msgid "--no-index or --untracked cannot be used with revs." |
649900bc | 5807 | msgstr "--no-index 或 --untracked 不能和版本同时使用。" |
c04f5ac3 | 5808 | |
6acbf033 | 5809 | #: builtin/grep.c:900 |
c04f5ac3 | 5810 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
90e6ef53 | 5811 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" |
c04f5ac3 | 5812 | |
6acbf033 | 5813 | #: builtin/grep.c:908 |
c04f5ac3 JX |
5814 | msgid "both --cached and trees are given." |
5815 | msgstr "同时给出了 --cached 和树对象。" | |
5816 | ||
220c313c | 5817 | #: builtin/hash-object.c:82 |
ef317cd5 | 5818 | msgid "" |
814ff314 JX |
5819 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
5820 | "[--] <file>..." | |
ef317cd5 | 5821 | msgstr "" |
814ff314 JX |
5822 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
5823 | "[--] <文件>..." | |
ef317cd5 | 5824 | |
220c313c | 5825 | #: builtin/hash-object.c:83 |
ef317cd5 | 5826 | msgid "git hash-object --stdin-paths < <list-of-paths>" |
07432cef | 5827 | msgstr "git hash-object --stdin-paths < <路径列表>" |
ef317cd5 | 5828 | |
814ff314 | 5829 | #: builtin/hash-object.c:94 builtin/tag.c:612 |
ef317cd5 | 5830 | msgid "type" |
07432cef | 5831 | msgstr "类型" |
ef317cd5 | 5832 | |
220c313c | 5833 | #: builtin/hash-object.c:94 |
ef317cd5 | 5834 | msgid "object type" |
07432cef | 5835 | msgstr "对象类型" |
ef317cd5 | 5836 | |
220c313c | 5837 | #: builtin/hash-object.c:95 |
ef317cd5 | 5838 | msgid "write the object into the object database" |
07432cef | 5839 | msgstr "将对象写入对象数据库" |
ef317cd5 | 5840 | |
220c313c | 5841 | #: builtin/hash-object.c:97 |
ef317cd5 | 5842 | msgid "read the object from stdin" |
07432cef | 5843 | msgstr "从标准输入读取对象" |
ef317cd5 | 5844 | |
220c313c | 5845 | #: builtin/hash-object.c:99 |
ef317cd5 | 5846 | msgid "store file as is without filters" |
07432cef | 5847 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 | 5848 | |
220c313c JX |
5849 | #: builtin/hash-object.c:100 |
5850 | msgid "" | |
5851 | "just hash any random garbage to create corrupt objects for debugging Git" | |
5852 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
5853 | ||
5854 | #: builtin/hash-object.c:101 | |
ef317cd5 | 5855 | msgid "process file as it were from this path" |
07432cef | 5856 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 5857 | |
2e8451e8 | 5858 | #: builtin/help.c:41 |
ef317cd5 | 5859 | msgid "print all available commands" |
07432cef | 5860 | msgstr "打印所有可用的命令" |
ef317cd5 | 5861 | |
2e8451e8 | 5862 | #: builtin/help.c:42 |
4dcdc3d8 JX |
5863 | msgid "print list of useful guides" |
5864 | msgstr "显示有用的指南列表" | |
5865 | ||
2e8451e8 | 5866 | #: builtin/help.c:43 |
ef317cd5 | 5867 | msgid "show man page" |
07432cef | 5868 | msgstr "显示 man 手册" |
ef317cd5 | 5869 | |
2e8451e8 | 5870 | #: builtin/help.c:44 |
ef317cd5 | 5871 | msgid "show manual in web browser" |
07432cef | 5872 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 5873 | |
2e8451e8 | 5874 | #: builtin/help.c:46 |
ef317cd5 | 5875 | msgid "show info page" |
07432cef | 5876 | msgstr "显示 info 手册" |
ef317cd5 | 5877 | |
2e8451e8 | 5878 | #: builtin/help.c:52 |
814ff314 JX |
5879 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
5880 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" | |
ef317cd5 | 5881 | |
2e8451e8 | 5882 | #: builtin/help.c:64 |
81809b99 | 5883 | #, c-format |
8ada9598 | 5884 | msgid "unrecognized help format '%s'" |
81809b99 | 5885 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 5886 | |
220c313c | 5887 | #: builtin/help.c:91 |
8ada9598 | 5888 | msgid "Failed to start emacsclient." |
81809b99 | 5889 | msgstr "无法启动 emacsclient。" |
8ada9598 | 5890 | |
220c313c | 5891 | #: builtin/help.c:104 |
8ada9598 | 5892 | msgid "Failed to parse emacsclient version." |
81809b99 | 5893 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 5894 | |
220c313c | 5895 | #: builtin/help.c:112 |
8ada9598 JX |
5896 | #, c-format |
5897 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 5898 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 5899 | |
220c313c | 5900 | #: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 |
81809b99 | 5901 | #, c-format |
8ada9598 | 5902 | msgid "failed to exec '%s': %s" |
81809b99 | 5903 | msgstr "无法执行 '%s':%s" |
8ada9598 | 5904 | |
220c313c | 5905 | #: builtin/help.c:215 |
8ada9598 JX |
5906 | #, c-format |
5907 | msgid "" | |
5908 | "'%s': path for unsupported man viewer.\n" | |
5909 | "Please consider using 'man.<tool>.cmd' instead." | |
5910 | msgstr "" | |
81809b99 | 5911 | "'%s':不支持的 man 手册查看器的路径。\n" |
d9d56b23 | 5912 | "请使用 'man.<工具>.cmd'。" |
8ada9598 | 5913 | |
220c313c | 5914 | #: builtin/help.c:227 |
8ada9598 JX |
5915 | #, c-format |
5916 | msgid "" | |
5917 | "'%s': cmd for supported man viewer.\n" | |
5918 | "Please consider using 'man.<tool>.path' instead." | |
5919 | msgstr "" | |
81809b99 | 5920 | "'%s': 支持的 man 手册查看器命令。\n" |
d9d56b23 | 5921 | "请使用 'man.<工具>.path'。" |
8ada9598 | 5922 | |
04cb2f28 | 5923 | #: builtin/help.c:354 |
8ada9598 JX |
5924 | #, c-format |
5925 | msgid "'%s': unknown man viewer." | |
81809b99 | 5926 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 5927 | |
04cb2f28 | 5928 | #: builtin/help.c:371 |
8ada9598 | 5929 | msgid "no man viewer handled the request" |
81809b99 | 5930 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 5931 | |
04cb2f28 | 5932 | #: builtin/help.c:379 |
8ada9598 | 5933 | msgid "no info viewer handled the request" |
81809b99 | 5934 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 5935 | |
04cb2f28 | 5936 | #: builtin/help.c:428 |
4dcdc3d8 JX |
5937 | msgid "Defining attributes per path" |
5938 | msgstr "定义路径的属性" | |
5939 | ||
04cb2f28 | 5940 | #: builtin/help.c:429 |
220c313c JX |
5941 | msgid "Everyday Git With 20 Commands Or So" |
5942 | msgstr "每一天 Git 常用的约 20 条命令" | |
5943 | ||
04cb2f28 | 5944 | #: builtin/help.c:430 |
4dcdc3d8 JX |
5945 | msgid "A Git glossary" |
5946 | msgstr "Git 词汇表" | |
5947 | ||
04cb2f28 | 5948 | #: builtin/help.c:431 |
4dcdc3d8 JX |
5949 | msgid "Specifies intentionally untracked files to ignore" |
5950 | msgstr "忽略指定的未跟踪文件" | |
5951 | ||
04cb2f28 | 5952 | #: builtin/help.c:432 |
4dcdc3d8 JX |
5953 | msgid "Defining submodule properties" |
5954 | msgstr "定义子模组属性" | |
5955 | ||
04cb2f28 | 5956 | #: builtin/help.c:433 |
4dcdc3d8 JX |
5957 | msgid "Specifying revisions and ranges for Git" |
5958 | msgstr "指定 Git 的版本和版本范围" | |
5959 | ||
04cb2f28 | 5960 | #: builtin/help.c:434 |
4dcdc3d8 JX |
5961 | msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" |
5962 | msgstr "一个 Git 教程(针对 1.5.1 或更新版本)" | |
5963 | ||
04cb2f28 | 5964 | #: builtin/help.c:435 |
4dcdc3d8 JX |
5965 | msgid "An overview of recommended workflows with Git" |
5966 | msgstr "Git 推荐的工作流概览" | |
5967 | ||
04cb2f28 | 5968 | #: builtin/help.c:447 |
4dcdc3d8 JX |
5969 | msgid "The common Git guides are:\n" |
5970 | msgstr "最常用的 Git 向导有:\n" | |
5971 | ||
04cb2f28 | 5972 | #: builtin/help.c:468 builtin/help.c:485 |
8ada9598 JX |
5973 | #, c-format |
5974 | msgid "usage: %s%s" | |
81809b99 | 5975 | msgstr "用法:%s%s" |
8ada9598 | 5976 | |
04cb2f28 | 5977 | #: builtin/help.c:501 |
8ada9598 JX |
5978 | #, c-format |
5979 | msgid "`git %s' is aliased to `%s'" | |
81809b99 | 5980 | msgstr "`git %s' 是 `%s' 的别名" |
8ada9598 | 5981 | |
220c313c | 5982 | #: builtin/index-pack.c:150 |
6acbf033 JX |
5983 | #, c-format |
5984 | msgid "unable to open %s" | |
5985 | msgstr "不能打开 %s" | |
5986 | ||
220c313c | 5987 | #: builtin/index-pack.c:200 |
8ada9598 JX |
5988 | #, c-format |
5989 | msgid "object type mismatch at %s" | |
81809b99 | 5990 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 5991 | |
220c313c | 5992 | #: builtin/index-pack.c:220 |
6acbf033 JX |
5993 | #, c-format |
5994 | msgid "did not receive expected object %s" | |
5995 | msgstr "未能获取期望的对象 %s" | |
8ada9598 | 5996 | |
220c313c | 5997 | #: builtin/index-pack.c:223 |
6acbf033 JX |
5998 | #, c-format |
5999 | msgid "object %s: expected type %s, found %s" | |
6000 | msgstr "对象 %s:期待类型 %s,却是 %s" | |
6001 | ||
220c313c | 6002 | #: builtin/index-pack.c:265 |
81809b99 | 6003 | #, c-format |
8ada9598 JX |
6004 | msgid "cannot fill %d byte" |
6005 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 6006 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 6007 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 6008 | |
220c313c | 6009 | #: builtin/index-pack.c:275 |
8ada9598 | 6010 | msgid "early EOF" |
81809b99 | 6011 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 6012 | |
220c313c | 6013 | #: builtin/index-pack.c:276 |
8ada9598 | 6014 | msgid "read error on input" |
81809b99 | 6015 | msgstr "输入上的读错误" |
8ada9598 | 6016 | |
220c313c | 6017 | #: builtin/index-pack.c:288 |
8ada9598 | 6018 | msgid "used more bytes than were available" |
81809b99 | 6019 | msgstr "用掉了超过可用的字节" |
8ada9598 | 6020 | |
220c313c | 6021 | #: builtin/index-pack.c:295 |
8ada9598 | 6022 | msgid "pack too large for current definition of off_t" |
81809b99 | 6023 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 6024 | |
220c313c | 6025 | #: builtin/index-pack.c:311 |
81809b99 | 6026 | #, c-format |
8ada9598 | 6027 | msgid "unable to create '%s'" |
81809b99 | 6028 | msgstr "不能创建 '%s'" |
8ada9598 | 6029 | |
220c313c | 6030 | #: builtin/index-pack.c:316 |
81809b99 | 6031 | #, c-format |
8ada9598 | 6032 | msgid "cannot open packfile '%s'" |
81809b99 | 6033 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 6034 | |
220c313c | 6035 | #: builtin/index-pack.c:330 |
8ada9598 | 6036 | msgid "pack signature mismatch" |
81809b99 | 6037 | msgstr "包签名不匹配" |
8ada9598 | 6038 | |
220c313c | 6039 | #: builtin/index-pack.c:332 |
ef317cd5 JX |
6040 | #, c-format |
6041 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 6042 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 6043 | |
220c313c | 6044 | #: builtin/index-pack.c:350 |
8ada9598 JX |
6045 | #, c-format |
6046 | msgid "pack has bad object at offset %lu: %s" | |
81809b99 | 6047 | msgstr "包中有错误的对象位于 %lu:%s" |
8ada9598 | 6048 | |
220c313c | 6049 | #: builtin/index-pack.c:471 |
8ada9598 JX |
6050 | #, c-format |
6051 | msgid "inflate returned %d" | |
81809b99 | 6052 | msgstr "解压缩返回 %d" |
8ada9598 | 6053 | |
220c313c | 6054 | #: builtin/index-pack.c:520 |
8ada9598 | 6055 | msgid "offset value overflow for delta base object" |
81809b99 | 6056 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 6057 | |
220c313c | 6058 | #: builtin/index-pack.c:528 |
8ada9598 | 6059 | msgid "delta base offset is out of bound" |
81809b99 | 6060 | msgstr "delta 基准偏移越界" |
8ada9598 | 6061 | |
220c313c | 6062 | #: builtin/index-pack.c:536 |
81809b99 | 6063 | #, c-format |
8ada9598 | 6064 | msgid "unknown object type %d" |
81809b99 | 6065 | msgstr "未知对象类型 %d" |
8ada9598 | 6066 | |
220c313c | 6067 | #: builtin/index-pack.c:567 |
8ada9598 | 6068 | msgid "cannot pread pack file" |
81809b99 | 6069 | msgstr "无法读取包文件" |
8ada9598 | 6070 | |
220c313c | 6071 | #: builtin/index-pack.c:569 |
8ada9598 JX |
6072 | #, c-format |
6073 | msgid "premature end of pack file, %lu byte missing" | |
6074 | msgid_plural "premature end of pack file, %lu bytes missing" | |
81809b99 | 6075 | msgstr[0] "包文件过早结束,缺少 %lu 字节" |
5ae481e0 | 6076 | msgstr[1] "包文件过早结束,缺少 %lu 字节" |
8ada9598 | 6077 | |
220c313c | 6078 | #: builtin/index-pack.c:595 |
8ada9598 | 6079 | msgid "serious inflate inconsistency" |
81809b99 | 6080 | msgstr "解压缩严重的不一致" |
8ada9598 | 6081 | |
220c313c JX |
6082 | #: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715 |
6083 | #: builtin/index-pack.c:749 builtin/index-pack.c:758 | |
8ada9598 JX |
6084 | #, c-format |
6085 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 6086 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 6087 | |
814ff314 JX |
6088 | #: builtin/index-pack.c:689 builtin/pack-objects.c:162 |
6089 | #: builtin/pack-objects.c:254 | |
6792b93b JX |
6090 | #, c-format |
6091 | msgid "unable to read %s" | |
6092 | msgstr "不能读 %s" | |
6093 | ||
220c313c | 6094 | #: builtin/index-pack.c:755 |
6792b93b JX |
6095 | #, c-format |
6096 | msgid "cannot read existing object %s" | |
6097 | msgstr "不能读取现存对象 %s" | |
6098 | ||
220c313c | 6099 | #: builtin/index-pack.c:769 |
81809b99 | 6100 | #, c-format |
8ada9598 | 6101 | msgid "invalid blob object %s" |
07432cef | 6102 | msgstr "无效的数据(blob)对象 %s" |
8ada9598 | 6103 | |
220c313c | 6104 | #: builtin/index-pack.c:783 |
81809b99 | 6105 | #, c-format |
8ada9598 | 6106 | msgid "invalid %s" |
81809b99 | 6107 | msgstr "无效的 %s" |
8ada9598 | 6108 | |
220c313c | 6109 | #: builtin/index-pack.c:787 |
8ada9598 | 6110 | msgid "Error in object" |
81809b99 | 6111 | msgstr "对象中出错" |
8ada9598 | 6112 | |
220c313c | 6113 | #: builtin/index-pack.c:789 |
8ada9598 JX |
6114 | #, c-format |
6115 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 6116 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 6117 | |
220c313c | 6118 | #: builtin/index-pack.c:861 builtin/index-pack.c:890 |
8ada9598 | 6119 | msgid "failed to apply delta" |
81809b99 | 6120 | msgstr "无法应用 delta" |
8ada9598 | 6121 | |
220c313c | 6122 | #: builtin/index-pack.c:1055 |
8ada9598 | 6123 | msgid "Receiving objects" |
81809b99 | 6124 | msgstr "接收对象中" |
8ada9598 | 6125 | |
220c313c | 6126 | #: builtin/index-pack.c:1055 |
8ada9598 | 6127 | msgid "Indexing objects" |
81809b99 | 6128 | msgstr "索引对象中" |
8ada9598 | 6129 | |
220c313c | 6130 | #: builtin/index-pack.c:1081 |
8ada9598 | 6131 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 6132 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 6133 | |
220c313c | 6134 | #: builtin/index-pack.c:1086 |
8ada9598 | 6135 | msgid "cannot fstat packfile" |
81809b99 | 6136 | msgstr "不能枚举包文件状态" |
8ada9598 | 6137 | |
220c313c | 6138 | #: builtin/index-pack.c:1089 |
8ada9598 | 6139 | msgid "pack has junk at the end" |
81809b99 | 6140 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 6141 | |
220c313c | 6142 | #: builtin/index-pack.c:1100 |
6792b93b JX |
6143 | msgid "confusion beyond insanity in parse_pack_objects()" |
6144 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
6145 | ||
220c313c | 6146 | #: builtin/index-pack.c:1123 |
8ada9598 | 6147 | msgid "Resolving deltas" |
81809b99 | 6148 | msgstr "处理 delta 中" |
8ada9598 | 6149 | |
220c313c | 6150 | #: builtin/index-pack.c:1133 |
07432cef | 6151 | #, c-format |
ef317cd5 | 6152 | msgid "unable to create thread: %s" |
07432cef | 6153 | msgstr "不能创建线程:%s" |
ef317cd5 | 6154 | |
220c313c | 6155 | #: builtin/index-pack.c:1175 |
8ada9598 | 6156 | msgid "confusion beyond insanity" |
81809b99 | 6157 | msgstr "不可理喻" |
8ada9598 | 6158 | |
220c313c | 6159 | #: builtin/index-pack.c:1181 |
ef317cd5 JX |
6160 | #, c-format |
6161 | msgid "completed with %d local objects" | |
07432cef | 6162 | msgstr "完成 %d 个本地对象" |
ef317cd5 | 6163 | |
220c313c | 6164 | #: builtin/index-pack.c:1191 |
ef317cd5 JX |
6165 | #, c-format |
6166 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 6167 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 6168 | |
220c313c | 6169 | #: builtin/index-pack.c:1195 |
8ada9598 JX |
6170 | #, c-format |
6171 | msgid "pack has %d unresolved delta" | |
6172 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 6173 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 6174 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 6175 | |
814ff314 | 6176 | #: builtin/index-pack.c:1219 |
81809b99 | 6177 | #, c-format |
8ada9598 | 6178 | msgid "unable to deflate appended object (%d)" |
07432cef | 6179 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 6180 | |
814ff314 | 6181 | #: builtin/index-pack.c:1298 |
8ada9598 JX |
6182 | #, c-format |
6183 | msgid "local object %s is corrupt" | |
81809b99 | 6184 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 6185 | |
814ff314 | 6186 | #: builtin/index-pack.c:1322 |
8ada9598 | 6187 | msgid "error while closing pack file" |
81809b99 | 6188 | msgstr "关闭包文件时出错" |
8ada9598 | 6189 | |
814ff314 | 6190 | #: builtin/index-pack.c:1335 |
81809b99 | 6191 | #, c-format |
8ada9598 | 6192 | msgid "cannot write keep file '%s'" |
81809b99 | 6193 | msgstr "无法写保留文件 '%s'" |
8ada9598 | 6194 | |
814ff314 | 6195 | #: builtin/index-pack.c:1343 |
81809b99 | 6196 | #, c-format |
8ada9598 | 6197 | msgid "cannot close written keep file '%s'" |
81809b99 | 6198 | msgstr "无法关闭保留文件 '%s'" |
8ada9598 | 6199 | |
814ff314 | 6200 | #: builtin/index-pack.c:1356 |
8ada9598 | 6201 | msgid "cannot store pack file" |
81809b99 | 6202 | msgstr "无法存储包文件" |
8ada9598 | 6203 | |
814ff314 | 6204 | #: builtin/index-pack.c:1367 |
8ada9598 | 6205 | msgid "cannot store index file" |
81809b99 | 6206 | msgstr "无法存储索引文件" |
8ada9598 | 6207 | |
814ff314 | 6208 | #: builtin/index-pack.c:1400 |
07432cef | 6209 | #, c-format |
ef317cd5 | 6210 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 6211 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 6212 | |
814ff314 | 6213 | #: builtin/index-pack.c:1406 |
ef317cd5 JX |
6214 | #, c-format |
6215 | msgid "invalid number of threads specified (%d)" | |
07432cef | 6216 | msgstr "指定的线程数无效(%d)" |
ef317cd5 | 6217 | |
814ff314 | 6218 | #: builtin/index-pack.c:1410 builtin/index-pack.c:1589 |
ef317cd5 JX |
6219 | #, c-format |
6220 | msgid "no threads support, ignoring %s" | |
07432cef | 6221 | msgstr "没有线程支持,忽略 %s" |
ef317cd5 | 6222 | |
814ff314 | 6223 | #: builtin/index-pack.c:1468 |
81809b99 | 6224 | #, c-format |
8ada9598 | 6225 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 6226 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 6227 | |
814ff314 | 6228 | #: builtin/index-pack.c:1470 |
81809b99 | 6229 | #, c-format |
8ada9598 | 6230 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 6231 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 6232 | |
814ff314 | 6233 | #: builtin/index-pack.c:1517 |
81809b99 | 6234 | #, c-format |
8ada9598 JX |
6235 | msgid "non delta: %d object" |
6236 | msgid_plural "non delta: %d objects" | |
81809b99 | 6237 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 6238 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 6239 | |
814ff314 | 6240 | #: builtin/index-pack.c:1524 |
8ada9598 JX |
6241 | #, c-format |
6242 | msgid "chain length = %d: %lu object" | |
6243 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 6244 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 6245 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 6246 | |
814ff314 | 6247 | #: builtin/index-pack.c:1553 |
8ada9598 | 6248 | msgid "Cannot come back to cwd" |
81809b99 | 6249 | msgstr "无法返回当前工作目录" |
8ada9598 | 6250 | |
814ff314 JX |
6251 | #: builtin/index-pack.c:1601 builtin/index-pack.c:1604 |
6252 | #: builtin/index-pack.c:1616 builtin/index-pack.c:1620 | |
81809b99 | 6253 | #, c-format |
8ada9598 | 6254 | msgid "bad %s" |
81809b99 | 6255 | msgstr "错误选项 %s" |
8ada9598 | 6256 | |
814ff314 | 6257 | #: builtin/index-pack.c:1634 |
8ada9598 | 6258 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 6259 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 6260 | |
814ff314 | 6261 | #: builtin/index-pack.c:1638 builtin/index-pack.c:1647 |
8ada9598 JX |
6262 | #, c-format |
6263 | msgid "packfile name '%s' does not end with '.pack'" | |
81809b99 | 6264 | msgstr "包名 '%s' 没有以 '.pack' 结尾" |
8ada9598 | 6265 | |
814ff314 | 6266 | #: builtin/index-pack.c:1655 |
8ada9598 | 6267 | msgid "--verify with no packfile name given" |
81809b99 | 6268 | msgstr "--verify 没有提供包名参数" |
8ada9598 | 6269 | |
c04f5ac3 JX |
6270 | #: builtin/init-db.c:35 |
6271 | #, c-format | |
6272 | msgid "Could not make %s writable by group" | |
6273 | msgstr "不能设置 %s 为组可写" | |
6274 | ||
6275 | #: builtin/init-db.c:62 | |
6276 | #, c-format | |
6277 | msgid "insanely long template name %s" | |
6278 | msgstr "太长的模版名 %s" | |
6279 | ||
6280 | #: builtin/init-db.c:67 | |
6281 | #, c-format | |
6282 | msgid "cannot stat '%s'" | |
6283 | msgstr "不能枚举 '%s' 状态" | |
6284 | ||
6285 | #: builtin/init-db.c:73 | |
6286 | #, c-format | |
6287 | msgid "cannot stat template '%s'" | |
6288 | msgstr "不能枚举模版 '%s' 状态" | |
6289 | ||
6290 | #: builtin/init-db.c:80 | |
6291 | #, c-format | |
6292 | msgid "cannot opendir '%s'" | |
6293 | msgstr "不能打开目录 '%s'" | |
6294 | ||
6295 | #: builtin/init-db.c:97 | |
6296 | #, c-format | |
6297 | msgid "cannot readlink '%s'" | |
6298 | msgstr "不能读取链接 '%s'" | |
6299 | ||
6300 | #: builtin/init-db.c:99 | |
6301 | #, c-format | |
6302 | msgid "insanely long symlink %s" | |
6303 | msgstr "太长的符号链接 %s" | |
6304 | ||
6305 | #: builtin/init-db.c:102 | |
6306 | #, c-format | |
6307 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 6308 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 JX |
6309 | |
6310 | #: builtin/init-db.c:106 | |
6311 | #, c-format | |
6312 | msgid "cannot copy '%s' to '%s'" | |
6313 | msgstr "不能拷贝 '%s' 至 '%s'" | |
6314 | ||
6315 | #: builtin/init-db.c:110 | |
6316 | #, c-format | |
6317 | msgid "ignoring template %s" | |
6318 | msgstr "忽略模版 %s" | |
6319 | ||
04cb2f28 | 6320 | #: builtin/init-db.c:136 |
c04f5ac3 JX |
6321 | #, c-format |
6322 | msgid "insanely long template path %s" | |
6323 | msgstr "太长的模版路径 %s" | |
6324 | ||
04cb2f28 | 6325 | #: builtin/init-db.c:144 |
c04f5ac3 JX |
6326 | #, c-format |
6327 | msgid "templates not found %s" | |
6328 | msgstr "模版未找到 %s" | |
6329 | ||
04cb2f28 | 6330 | #: builtin/init-db.c:157 |
c04f5ac3 JX |
6331 | #, c-format |
6332 | msgid "not copying templates of a wrong format version %d from '%s'" | |
81809b99 | 6333 | msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版" |
c04f5ac3 | 6334 | |
04cb2f28 | 6335 | #: builtin/init-db.c:197 |
c04f5ac3 JX |
6336 | #, c-format |
6337 | msgid "insane git directory %s" | |
6338 | msgstr "不正常的 git 目录 %s" | |
6339 | ||
04cb2f28 | 6340 | #: builtin/init-db.c:331 builtin/init-db.c:334 |
c04f5ac3 JX |
6341 | #, c-format |
6342 | msgid "%s already exists" | |
6343 | msgstr "%s 已经存在" | |
6344 | ||
04cb2f28 | 6345 | #: builtin/init-db.c:363 |
c04f5ac3 JX |
6346 | #, c-format |
6347 | msgid "unable to handle file type %d" | |
6348 | msgstr "不能处理 %d 类型的文件" | |
6349 | ||
04cb2f28 | 6350 | #: builtin/init-db.c:366 |
c04f5ac3 JX |
6351 | #, c-format |
6352 | msgid "unable to move %s to %s" | |
6353 | msgstr "不能移动 %s 至 %s" | |
6354 | ||
6c94aba5 JX |
6355 | #. TRANSLATORS: The first '%s' is either "Reinitialized |
6356 | #. existing" or "Initialized empty", the second " shared" or | |
6357 | #. "", and the last '%s%s' is the verbatim directory name. | |
04cb2f28 | 6358 | #: builtin/init-db.c:426 |
c04f5ac3 JX |
6359 | #, c-format |
6360 | msgid "%s%s Git repository in %s%s\n" | |
6361 | msgstr "%s%s Git 版本库于 %s%s\n" | |
6362 | ||
04cb2f28 | 6363 | #: builtin/init-db.c:427 |
c04f5ac3 JX |
6364 | msgid "Reinitialized existing" |
6365 | msgstr "重新初始化现存的" | |
6366 | ||
04cb2f28 | 6367 | #: builtin/init-db.c:427 |
c04f5ac3 JX |
6368 | msgid "Initialized empty" |
6369 | msgstr "初始化空的" | |
6370 | ||
7e238ab7 | 6371 | # 译者:中文字符串拼接,可删除前导空格 |
04cb2f28 | 6372 | #: builtin/init-db.c:428 |
c04f5ac3 | 6373 | msgid " shared" |
90e6ef53 | 6374 | msgstr "共享" |
c04f5ac3 | 6375 | |
04cb2f28 | 6376 | #: builtin/init-db.c:475 |
ef317cd5 | 6377 | msgid "" |
a77c07d9 | 6378 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
814ff314 | 6379 | "shared[=<permissions>]] [<directory>]" |
ef317cd5 | 6380 | msgstr "" |
07432cef | 6381 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
814ff314 | 6382 | "[<目录>]" |
ef317cd5 | 6383 | |
04cb2f28 | 6384 | #: builtin/init-db.c:498 |
ef317cd5 | 6385 | msgid "permissions" |
07432cef | 6386 | msgstr "权限" |
ef317cd5 | 6387 | |
04cb2f28 | 6388 | #: builtin/init-db.c:499 |
ef317cd5 | 6389 | msgid "specify that the git repository is to be shared amongst several users" |
07432cef | 6390 | msgstr "指定 git 版本库是多个用户之间共享的" |
ef317cd5 | 6391 | |
04cb2f28 | 6392 | #: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171 |
ef317cd5 | 6393 | msgid "be quiet" |
07432cef | 6394 | msgstr "保持安静" |
ef317cd5 | 6395 | |
04cb2f28 | 6396 | #: builtin/init-db.c:533 builtin/init-db.c:538 |
c04f5ac3 JX |
6397 | #, c-format |
6398 | msgid "cannot mkdir %s" | |
6399 | msgstr "不能创建目录 %s" | |
6400 | ||
04cb2f28 | 6401 | #: builtin/init-db.c:542 |
c04f5ac3 JX |
6402 | #, c-format |
6403 | msgid "cannot chdir to %s" | |
6404 | msgstr "不能切换目录到 %s" | |
6405 | ||
04cb2f28 | 6406 | #: builtin/init-db.c:563 |
c04f5ac3 JX |
6407 | #, c-format |
6408 | msgid "" | |
6409 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
6410 | "dir=<directory>)" | |
1e607449 | 6411 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
c04f5ac3 | 6412 | |
04cb2f28 | 6413 | #: builtin/init-db.c:591 |
c04f5ac3 JX |
6414 | #, c-format |
6415 | msgid "Cannot access work tree '%s'" | |
6416 | msgstr "不能访问工作区 '%s'" | |
6417 | ||
220c313c JX |
6418 | #: builtin/interpret-trailers.c:15 |
6419 | msgid "" | |
6420 | "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " | |
6421 | "[<file>...]" | |
6422 | msgstr "" | |
6423 | "git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件" | |
6424 | ">...]" | |
6425 | ||
6426 | #: builtin/interpret-trailers.c:25 | |
6427 | msgid "trim empty trailers" | |
6428 | msgstr "删除空签名" | |
6429 | ||
6430 | #: builtin/interpret-trailers.c:26 | |
6431 | msgid "trailer" | |
6432 | msgstr "签名" | |
6433 | ||
6434 | #: builtin/interpret-trailers.c:27 | |
6435 | msgid "trailer(s) to add" | |
6436 | msgstr "要添加的签名" | |
6437 | ||
2e8451e8 | 6438 | #: builtin/log.c:41 |
d9d56b23 JX |
6439 | msgid "git log [<options>] [<revision range>] [[--] <path>...]" |
6440 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" | |
ef317cd5 | 6441 | |
2e8451e8 | 6442 | #: builtin/log.c:42 |
814ff314 JX |
6443 | msgid "git show [<options>] <object>..." |
6444 | msgstr "git show [<选项>] <对象>..." | |
ef317cd5 | 6445 | |
220c313c JX |
6446 | #: builtin/log.c:81 |
6447 | #, c-format | |
6448 | msgid "invalid --decorate option: %s" | |
6449 | msgstr "无效的 --decorate 选项:%s" | |
6450 | ||
6acbf033 | 6451 | #: builtin/log.c:127 |
ef317cd5 | 6452 | msgid "suppress diff output" |
07432cef | 6453 | msgstr "不显示差异输出" |
ef317cd5 | 6454 | |
6acbf033 | 6455 | #: builtin/log.c:128 |
ef317cd5 | 6456 | msgid "show source" |
07432cef | 6457 | msgstr "显示源" |
ef317cd5 | 6458 | |
6acbf033 | 6459 | #: builtin/log.c:129 |
07432cef WS |
6460 | msgid "Use mail map file" |
6461 | msgstr "使用邮件映射文件" | |
6462 | ||
6acbf033 | 6463 | #: builtin/log.c:130 |
ef317cd5 | 6464 | msgid "decorate options" |
07432cef | 6465 | msgstr "修饰选项" |
ef317cd5 | 6466 | |
220c313c JX |
6467 | #: builtin/log.c:133 |
6468 | msgid "Process line range n,m in file, counting from 1" | |
6469 | msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" | |
6470 | ||
6acbf033 | 6471 | #: builtin/log.c:229 |
c04f5ac3 JX |
6472 | #, c-format |
6473 | msgid "Final output: %d %s\n" | |
6474 | msgstr "最终输出:%d %s\n" | |
6475 | ||
220c313c JX |
6476 | #: builtin/log.c:458 |
6477 | #, c-format | |
6478 | msgid "git show %s: bad file" | |
6479 | msgstr "git show %s: 损坏的文件" | |
6480 | ||
6481 | #: builtin/log.c:472 builtin/log.c:564 | |
c04f5ac3 JX |
6482 | #, c-format |
6483 | msgid "Could not read object %s" | |
90e6ef53 | 6484 | msgstr "不能读取对象 %s" |
c04f5ac3 | 6485 | |
220c313c | 6486 | #: builtin/log.c:588 |
c04f5ac3 JX |
6487 | #, c-format |
6488 | msgid "Unknown type: %d" | |
6489 | msgstr "未知类型:%d" | |
6490 | ||
220c313c | 6491 | #: builtin/log.c:689 |
c04f5ac3 JX |
6492 | msgid "format.headers without value" |
6493 | msgstr "format.headers 没有值" | |
6494 | ||
220c313c | 6495 | #: builtin/log.c:773 |
c04f5ac3 JX |
6496 | msgid "name of output directory is too long" |
6497 | msgstr "输出目录名太长" | |
6498 | ||
220c313c | 6499 | #: builtin/log.c:789 |
c04f5ac3 JX |
6500 | #, c-format |
6501 | msgid "Cannot open patch file %s" | |
6502 | msgstr "无法打开补丁文件 %s" | |
6503 | ||
220c313c | 6504 | #: builtin/log.c:803 |
c04f5ac3 JX |
6505 | msgid "Need exactly one range." |
6506 | msgstr "只需要一个范围。" | |
6507 | ||
220c313c | 6508 | #: builtin/log.c:811 |
c04f5ac3 JX |
6509 | msgid "Not a range." |
6510 | msgstr "不是一个范围。" | |
6511 | ||
220c313c | 6512 | #: builtin/log.c:919 |
c04f5ac3 JX |
6513 | msgid "Cover letter needs email format" |
6514 | msgstr "信封需要邮件地址格式" | |
6515 | ||
220c313c | 6516 | #: builtin/log.c:998 |
c04f5ac3 JX |
6517 | #, c-format |
6518 | msgid "insane in-reply-to: %s" | |
6519 | msgstr "不正常的 in-reply-to:%s" | |
6520 | ||
220c313c | 6521 | #: builtin/log.c:1026 |
814ff314 JX |
6522 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
6523 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" | |
ef317cd5 | 6524 | |
220c313c | 6525 | #: builtin/log.c:1071 |
c04f5ac3 JX |
6526 | msgid "Two output directories?" |
6527 | msgstr "两个输出目录?" | |
6528 | ||
220c313c | 6529 | #: builtin/log.c:1186 |
ef317cd5 | 6530 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 6531 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 6532 | |
220c313c | 6533 | #: builtin/log.c:1189 |
ef317cd5 | 6534 | msgid "use [PATCH] even with multiple patches" |
07432cef | 6535 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 6536 | |
220c313c | 6537 | #: builtin/log.c:1193 |
ef317cd5 | 6538 | msgid "print patches to standard out" |
07432cef | 6539 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 6540 | |
220c313c | 6541 | #: builtin/log.c:1195 |
ef317cd5 | 6542 | msgid "generate a cover letter" |
07432cef | 6543 | msgstr "生成一封附信" |
c04f5ac3 | 6544 | |
220c313c | 6545 | #: builtin/log.c:1197 |
ef317cd5 | 6546 | msgid "use simple number sequence for output file names" |
07432cef | 6547 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 6548 | |
220c313c | 6549 | #: builtin/log.c:1198 |
ef317cd5 | 6550 | msgid "sfx" |
07432cef | 6551 | msgstr "后缀" |
ef317cd5 | 6552 | |
220c313c | 6553 | #: builtin/log.c:1199 |
ef317cd5 | 6554 | msgid "use <sfx> instead of '.patch'" |
07432cef | 6555 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 6556 | |
220c313c | 6557 | #: builtin/log.c:1201 |
ef317cd5 | 6558 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
6559 | msgstr "补丁以 <n> 开始编号,而不是1" |
6560 | ||
220c313c | 6561 | #: builtin/log.c:1203 |
07432cef WS |
6562 | msgid "mark the series as Nth re-roll" |
6563 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 6564 | |
220c313c | 6565 | #: builtin/log.c:1205 |
ef317cd5 | 6566 | msgid "Use [<prefix>] instead of [PATCH]" |
07432cef | 6567 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 6568 | |
220c313c | 6569 | #: builtin/log.c:1208 |
ef317cd5 | 6570 | msgid "store resulting files in <dir>" |
d9d56b23 | 6571 | msgstr "把结果文件存储在 <目录>" |
ef317cd5 | 6572 | |
220c313c | 6573 | #: builtin/log.c:1211 |
ef317cd5 | 6574 | msgid "don't strip/add [PATCH]" |
07432cef | 6575 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 6576 | |
220c313c | 6577 | #: builtin/log.c:1214 |
ef317cd5 | 6578 | msgid "don't output binary diffs" |
07432cef | 6579 | msgstr "不输出二进制差异" |
ef317cd5 | 6580 | |
220c313c | 6581 | #: builtin/log.c:1216 |
ef317cd5 | 6582 | msgid "don't include a patch matching a commit upstream" |
07432cef | 6583 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 6584 | |
220c313c | 6585 | #: builtin/log.c:1218 |
ef317cd5 | 6586 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 6587 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 6588 | |
220c313c | 6589 | #: builtin/log.c:1220 |
ef317cd5 | 6590 | msgid "Messaging" |
07432cef | 6591 | msgstr "邮件发送" |
ef317cd5 | 6592 | |
220c313c | 6593 | #: builtin/log.c:1221 |
ef317cd5 | 6594 | msgid "header" |
07432cef | 6595 | msgstr "header" |
ef317cd5 | 6596 | |
220c313c | 6597 | #: builtin/log.c:1222 |
ef317cd5 | 6598 | msgid "add email header" |
07432cef | 6599 | msgstr "添加邮件头" |
ef317cd5 | 6600 | |
220c313c | 6601 | #: builtin/log.c:1223 builtin/log.c:1225 |
ef317cd5 | 6602 | msgid "email" |
07432cef | 6603 | msgstr "邮件地址" |
ef317cd5 | 6604 | |
220c313c | 6605 | #: builtin/log.c:1223 |
ef317cd5 | 6606 | msgid "add To: header" |
07432cef | 6607 | msgstr "添加收件人" |
ef317cd5 | 6608 | |
220c313c | 6609 | #: builtin/log.c:1225 |
ef317cd5 | 6610 | msgid "add Cc: header" |
07432cef | 6611 | msgstr "添加抄送" |
ef317cd5 | 6612 | |
220c313c | 6613 | #: builtin/log.c:1227 |
2e8451e8 | 6614 | msgid "ident" |
d9d56b23 | 6615 | msgstr "标识" |
2e8451e8 | 6616 | |
220c313c | 6617 | #: builtin/log.c:1228 |
2e8451e8 | 6618 | msgid "set From address to <ident> (or committer ident if absent)" |
d9d56b23 | 6619 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者ID做为地址)" |
2e8451e8 | 6620 | |
220c313c | 6621 | #: builtin/log.c:1230 |
ef317cd5 | 6622 | msgid "message-id" |
d9d56b23 | 6623 | msgstr "邮件标识" |
ef317cd5 | 6624 | |
220c313c | 6625 | #: builtin/log.c:1231 |
ef317cd5 | 6626 | msgid "make first mail a reply to <message-id>" |
d9d56b23 | 6627 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
ef317cd5 | 6628 | |
220c313c | 6629 | #: builtin/log.c:1232 builtin/log.c:1235 |
ef317cd5 | 6630 | msgid "boundary" |
07432cef | 6631 | msgstr "边界" |
ef317cd5 | 6632 | |
220c313c | 6633 | #: builtin/log.c:1233 |
ef317cd5 | 6634 | msgid "attach the patch" |
07432cef | 6635 | msgstr "附件方式添加补丁" |
ef317cd5 | 6636 | |
220c313c | 6637 | #: builtin/log.c:1236 |
ef317cd5 | 6638 | msgid "inline the patch" |
07432cef | 6639 | msgstr "内联显示补丁" |
ef317cd5 | 6640 | |
220c313c | 6641 | #: builtin/log.c:1240 |
ef317cd5 | 6642 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 6643 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 6644 | |
220c313c | 6645 | #: builtin/log.c:1242 |
ef317cd5 | 6646 | msgid "signature" |
07432cef | 6647 | msgstr "签名" |
ef317cd5 | 6648 | |
220c313c | 6649 | #: builtin/log.c:1243 |
ef317cd5 | 6650 | msgid "add a signature" |
07432cef | 6651 | msgstr "添加一个签名" |
ef317cd5 | 6652 | |
220c313c | 6653 | #: builtin/log.c:1245 |
6acbf033 JX |
6654 | msgid "add a signature from a file" |
6655 | msgstr "从文件添加一个签名" | |
6656 | ||
220c313c | 6657 | #: builtin/log.c:1246 |
ef317cd5 | 6658 | msgid "don't print the patch filenames" |
07432cef | 6659 | msgstr "不要打印补丁文件名" |
ef317cd5 | 6660 | |
220c313c | 6661 | #: builtin/log.c:1320 |
2e8451e8 JX |
6662 | #, c-format |
6663 | msgid "invalid ident line: %s" | |
6664 | msgstr "包含无效的身份标识:%s" | |
6665 | ||
220c313c | 6666 | #: builtin/log.c:1335 |
c04f5ac3 JX |
6667 | msgid "-n and -k are mutually exclusive." |
6668 | msgstr "-n 和 -k 互斥。" | |
6669 | ||
220c313c | 6670 | #: builtin/log.c:1337 |
c04f5ac3 JX |
6671 | msgid "--subject-prefix and -k are mutually exclusive." |
6672 | msgstr "--subject-prefix 和 -k 互斥。" | |
6673 | ||
220c313c | 6674 | #: builtin/log.c:1345 |
c04f5ac3 JX |
6675 | msgid "--name-only does not make sense" |
6676 | msgstr "--name-only 无意义" | |
6677 | ||
220c313c | 6678 | #: builtin/log.c:1347 |
c04f5ac3 JX |
6679 | msgid "--name-status does not make sense" |
6680 | msgstr "--name-status 无意义" | |
6681 | ||
220c313c | 6682 | #: builtin/log.c:1349 |
c04f5ac3 JX |
6683 | msgid "--check does not make sense" |
6684 | msgstr "--check 无意义" | |
6685 | ||
220c313c | 6686 | #: builtin/log.c:1372 |
c04f5ac3 JX |
6687 | msgid "standard output, or directory, which one?" |
6688 | msgstr "标准输出或目录,哪一个?" | |
6689 | ||
220c313c | 6690 | #: builtin/log.c:1374 |
c04f5ac3 JX |
6691 | #, c-format |
6692 | msgid "Could not create directory '%s'" | |
90e6ef53 | 6693 | msgstr "不能创建目录 '%s'" |
c04f5ac3 | 6694 | |
220c313c | 6695 | #: builtin/log.c:1472 |
6acbf033 JX |
6696 | #, c-format |
6697 | msgid "unable to read signature file '%s'" | |
6698 | msgstr "无法读取签名文件 '%s'" | |
6699 | ||
220c313c | 6700 | #: builtin/log.c:1535 |
c04f5ac3 JX |
6701 | msgid "Failed to create output files" |
6702 | msgstr "无法创建输出文件" | |
6703 | ||
220c313c | 6704 | #: builtin/log.c:1583 |
ef317cd5 | 6705 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 6706 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 6707 | |
220c313c | 6708 | #: builtin/log.c:1638 |
c04f5ac3 JX |
6709 | #, c-format |
6710 | msgid "" | |
6711 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
d9d56b23 | 6712 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
c04f5ac3 | 6713 | |
220c313c | 6714 | #: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 |
c04f5ac3 JX |
6715 | #, c-format |
6716 | msgid "Unknown commit %s" | |
6717 | msgstr "未知提交 %s" | |
6718 | ||
814ff314 JX |
6719 | #: builtin/ls-files.c:358 |
6720 | msgid "git ls-files [<options>] [<file>...]" | |
6721 | msgstr "git ls-files [<选项>] [<文件>...]" | |
ef317cd5 | 6722 | |
814ff314 | 6723 | #: builtin/ls-files.c:415 |
ef317cd5 | 6724 | msgid "identify the file status with tags" |
07432cef | 6725 | msgstr "用标签标识文件的状态" |
ef317cd5 | 6726 | |
814ff314 | 6727 | #: builtin/ls-files.c:417 |
ef317cd5 | 6728 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 6729 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 6730 | |
814ff314 | 6731 | #: builtin/ls-files.c:419 |
ef317cd5 | 6732 | msgid "show cached files in the output (default)" |
07432cef | 6733 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 6734 | |
814ff314 | 6735 | #: builtin/ls-files.c:421 |
ef317cd5 | 6736 | msgid "show deleted files in the output" |
07432cef | 6737 | msgstr "显示已删除的文件" |
ef317cd5 | 6738 | |
814ff314 | 6739 | #: builtin/ls-files.c:423 |
ef317cd5 | 6740 | msgid "show modified files in the output" |
07432cef | 6741 | msgstr "显示已修改的文件" |
ef317cd5 | 6742 | |
814ff314 | 6743 | #: builtin/ls-files.c:425 |
ef317cd5 | 6744 | msgid "show other files in the output" |
07432cef | 6745 | msgstr "显示其它文件" |
ef317cd5 | 6746 | |
814ff314 | 6747 | #: builtin/ls-files.c:427 |
ef317cd5 | 6748 | msgid "show ignored files in the output" |
07432cef | 6749 | msgstr "显示忽略的文件" |
ef317cd5 | 6750 | |
814ff314 | 6751 | #: builtin/ls-files.c:430 |
ef317cd5 | 6752 | msgid "show staged contents' object name in the output" |
07432cef | 6753 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 6754 | |
814ff314 | 6755 | #: builtin/ls-files.c:432 |
ef317cd5 | 6756 | msgid "show files on the filesystem that need to be removed" |
07432cef | 6757 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 6758 | |
814ff314 | 6759 | #: builtin/ls-files.c:434 |
220c313c | 6760 | msgid "show 'other' directories' names only" |
07432cef | 6761 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 6762 | |
814ff314 | 6763 | #: builtin/ls-files.c:437 |
ef317cd5 | 6764 | msgid "don't show empty directories" |
07432cef | 6765 | msgstr "不显示空目录" |
ef317cd5 | 6766 | |
814ff314 | 6767 | #: builtin/ls-files.c:440 |
ef317cd5 | 6768 | msgid "show unmerged files in the output" |
07432cef | 6769 | msgstr "显示未合并的文件" |
ef317cd5 | 6770 | |
814ff314 | 6771 | #: builtin/ls-files.c:442 |
ef317cd5 | 6772 | msgid "show resolve-undo information" |
07432cef | 6773 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 6774 | |
814ff314 | 6775 | #: builtin/ls-files.c:444 |
ef317cd5 | 6776 | msgid "skip files matching pattern" |
07432cef | 6777 | msgstr "匹配排除文件的模式" |
ef317cd5 | 6778 | |
814ff314 | 6779 | #: builtin/ls-files.c:447 |
ef317cd5 | 6780 | msgid "exclude patterns are read from <file>" |
07432cef | 6781 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 6782 | |
814ff314 | 6783 | #: builtin/ls-files.c:450 |
ef317cd5 | 6784 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 6785 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 6786 | |
814ff314 | 6787 | #: builtin/ls-files.c:452 |
ef317cd5 | 6788 | msgid "add the standard git exclusions" |
07432cef | 6789 | msgstr "添加标准的 git 排除" |
ef317cd5 | 6790 | |
814ff314 | 6791 | #: builtin/ls-files.c:455 |
ef317cd5 | 6792 | msgid "make the output relative to the project top directory" |
07432cef | 6793 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 6794 | |
814ff314 | 6795 | #: builtin/ls-files.c:458 |
ef317cd5 | 6796 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 6797 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 6798 | |
814ff314 | 6799 | #: builtin/ls-files.c:459 |
ef317cd5 | 6800 | msgid "tree-ish" |
07432cef | 6801 | msgstr "树或提交" |
ef317cd5 | 6802 | |
814ff314 | 6803 | #: builtin/ls-files.c:460 |
ef317cd5 | 6804 | msgid "pretend that paths removed since <tree-ish> are still present" |
07432cef | 6805 | msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" |
ef317cd5 | 6806 | |
814ff314 | 6807 | #: builtin/ls-files.c:462 |
ef317cd5 | 6808 | msgid "show debugging data" |
07432cef | 6809 | msgstr "显示调试数据" |
ef317cd5 | 6810 | |
90314792 | 6811 | #: builtin/ls-tree.c:28 |
ef317cd5 | 6812 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
07432cef | 6813 | msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 6814 | |
04cb2f28 | 6815 | #: builtin/ls-tree.c:127 |
ef317cd5 | 6816 | msgid "only show trees" |
07432cef | 6817 | msgstr "只显示树" |
ef317cd5 | 6818 | |
04cb2f28 | 6819 | #: builtin/ls-tree.c:129 |
ef317cd5 | 6820 | msgid "recurse into subtrees" |
07432cef | 6821 | msgstr "递归到子树" |
ef317cd5 | 6822 | |
04cb2f28 | 6823 | #: builtin/ls-tree.c:131 |
ef317cd5 | 6824 | msgid "show trees when recursing" |
07432cef | 6825 | msgstr "当递归时显示树" |
ef317cd5 | 6826 | |
04cb2f28 | 6827 | #: builtin/ls-tree.c:134 |
ef317cd5 | 6828 | msgid "terminate entries with NUL byte" |
07432cef | 6829 | msgstr "条目以NUL字符终止" |
ef317cd5 | 6830 | |
04cb2f28 | 6831 | #: builtin/ls-tree.c:135 |
ef317cd5 | 6832 | msgid "include object size" |
07432cef | 6833 | msgstr "包括对象大小" |
ef317cd5 | 6834 | |
04cb2f28 | 6835 | #: builtin/ls-tree.c:137 builtin/ls-tree.c:139 |
ef317cd5 | 6836 | msgid "list only filenames" |
07432cef | 6837 | msgstr "只列出文件名" |
ef317cd5 | 6838 | |
04cb2f28 | 6839 | #: builtin/ls-tree.c:142 |
ef317cd5 | 6840 | msgid "use full path names" |
07432cef | 6841 | msgstr "使用文件的全路径" |
ef317cd5 | 6842 | |
04cb2f28 | 6843 | #: builtin/ls-tree.c:144 |
ef317cd5 | 6844 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 6845 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 | 6846 | |
04cb2f28 | 6847 | #: builtin/merge.c:45 |
814ff314 JX |
6848 | msgid "git merge [<options>] [<commit>...]" |
6849 | msgstr "git merge [<选项>] [<提交>...]" | |
ef317cd5 | 6850 | |
04cb2f28 | 6851 | #: builtin/merge.c:46 |
814ff314 JX |
6852 | msgid "git merge [<options>] <msg> HEAD <commit>" |
6853 | msgstr "git merge [<选项>] <说明> HEAD <提交>" | |
ef317cd5 | 6854 | |
04cb2f28 | 6855 | #: builtin/merge.c:47 |
ef317cd5 | 6856 | msgid "git merge --abort" |
07432cef | 6857 | msgstr "git merge --abort" |
ef317cd5 | 6858 | |
04cb2f28 | 6859 | #: builtin/merge.c:100 |
c04f5ac3 JX |
6860 | msgid "switch `m' requires a value" |
6861 | msgstr "开关 `m' 需要一个值" | |
6862 | ||
04cb2f28 | 6863 | #: builtin/merge.c:137 |
c04f5ac3 JX |
6864 | #, c-format |
6865 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 6866 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 6867 | |
04cb2f28 | 6868 | #: builtin/merge.c:138 |
c04f5ac3 JX |
6869 | #, c-format |
6870 | msgid "Available strategies are:" | |
6871 | msgstr "可用的策略有:" | |
6872 | ||
04cb2f28 | 6873 | #: builtin/merge.c:143 |
c04f5ac3 JX |
6874 | #, c-format |
6875 | msgid "Available custom strategies are:" | |
6876 | msgstr "可用的自定义策略有:" | |
6877 | ||
04cb2f28 | 6878 | #: builtin/merge.c:193 |
ef317cd5 | 6879 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 6880 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 6881 | |
04cb2f28 | 6882 | #: builtin/merge.c:196 |
ef317cd5 | 6883 | msgid "show a diffstat at the end of the merge" |
07432cef | 6884 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 6885 | |
04cb2f28 | 6886 | #: builtin/merge.c:197 |
ef317cd5 | 6887 | msgid "(synonym to --stat)" |
07432cef | 6888 | msgstr "(和 --stat 同义)" |
ef317cd5 | 6889 | |
04cb2f28 | 6890 | #: builtin/merge.c:199 |
ef317cd5 | 6891 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 6892 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 6893 | |
04cb2f28 | 6894 | #: builtin/merge.c:202 |
ef317cd5 | 6895 | msgid "create a single commit instead of doing a merge" |
07432cef | 6896 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 6897 | |
04cb2f28 | 6898 | #: builtin/merge.c:204 |
ef317cd5 | 6899 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 6900 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 6901 | |
04cb2f28 | 6902 | #: builtin/merge.c:206 |
ef317cd5 | 6903 | msgid "edit message before committing" |
07432cef | 6904 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 6905 | |
04cb2f28 | 6906 | #: builtin/merge.c:207 |
ef317cd5 | 6907 | msgid "allow fast-forward (default)" |
07432cef | 6908 | msgstr "允许快进(默认)" |
ef317cd5 | 6909 | |
04cb2f28 | 6910 | #: builtin/merge.c:209 |
ef317cd5 | 6911 | msgid "abort if fast-forward is not possible" |
07432cef | 6912 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 6913 | |
04cb2f28 | 6914 | #: builtin/merge.c:213 |
1003b3a5 JX |
6915 | msgid "Verify that the named commit has a valid GPG signature" |
6916 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" | |
6917 | ||
04cb2f28 | 6918 | #: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89 |
ef317cd5 | 6919 | msgid "strategy" |
07432cef | 6920 | msgstr "策略" |
ef317cd5 | 6921 | |
04cb2f28 | 6922 | #: builtin/merge.c:215 |
ef317cd5 | 6923 | msgid "merge strategy to use" |
07432cef | 6924 | msgstr "要使用的合并策略" |
ef317cd5 | 6925 | |
04cb2f28 | 6926 | #: builtin/merge.c:216 |
ef317cd5 | 6927 | msgid "option=value" |
07432cef | 6928 | msgstr "option=value" |
ef317cd5 | 6929 | |
04cb2f28 | 6930 | #: builtin/merge.c:217 |
ef317cd5 | 6931 | msgid "option for selected merge strategy" |
07432cef | 6932 | msgstr "所选的合并策略的选项" |
ef317cd5 | 6933 | |
04cb2f28 | 6934 | #: builtin/merge.c:219 |
ef317cd5 | 6935 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 6936 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 6937 | |
04cb2f28 | 6938 | #: builtin/merge.c:223 |
ef317cd5 | 6939 | msgid "abort the current in-progress merge" |
07432cef | 6940 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 6941 | |
04cb2f28 | 6942 | #: builtin/merge.c:251 |
c04f5ac3 JX |
6943 | msgid "could not run stash." |
6944 | msgstr "不能进行进度保存。" | |
6945 | ||
04cb2f28 | 6946 | #: builtin/merge.c:256 |
c04f5ac3 JX |
6947 | msgid "stash failed" |
6948 | msgstr "进度保存失败" | |
6949 | ||
04cb2f28 | 6950 | #: builtin/merge.c:261 |
c04f5ac3 JX |
6951 | #, c-format |
6952 | msgid "not a valid object: %s" | |
6953 | msgstr "不是一个有效对象:%s" | |
6954 | ||
04cb2f28 | 6955 | #: builtin/merge.c:280 builtin/merge.c:297 |
c04f5ac3 JX |
6956 | msgid "read-tree failed" |
6957 | msgstr "读取树失败" | |
6958 | ||
90e6ef53 | 6959 | # 译者:注意保持前导空格 |
04cb2f28 | 6960 | #: builtin/merge.c:327 |
c04f5ac3 JX |
6961 | msgid " (nothing to squash)" |
6962 | msgstr " (无可压缩)" | |
6963 | ||
04cb2f28 | 6964 | #: builtin/merge.c:340 |
c04f5ac3 JX |
6965 | #, c-format |
6966 | msgid "Squash commit -- not updating HEAD\n" | |
6967 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
6968 | ||
04cb2f28 | 6969 | #: builtin/merge.c:372 |
c04f5ac3 JX |
6970 | msgid "Writing SQUASH_MSG" |
6971 | msgstr "写入 SQUASH_MSG" | |
6972 | ||
04cb2f28 | 6973 | #: builtin/merge.c:374 |
c04f5ac3 JX |
6974 | msgid "Finishing SQUASH_MSG" |
6975 | msgstr "完成 SQUASH_MSG" | |
6976 | ||
04cb2f28 | 6977 | #: builtin/merge.c:397 |
c04f5ac3 JX |
6978 | #, c-format |
6979 | msgid "No merge message -- not updating HEAD\n" | |
6980 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
6981 | ||
04cb2f28 | 6982 | #: builtin/merge.c:447 |
c04f5ac3 JX |
6983 | #, c-format |
6984 | msgid "'%s' does not point to a commit" | |
6985 | msgstr "'%s' 没有指向一个提交" | |
6986 | ||
04cb2f28 | 6987 | #: builtin/merge.c:559 |
c04f5ac3 JX |
6988 | #, c-format |
6989 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 6990 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 6991 | |
04cb2f28 | 6992 | #: builtin/merge.c:654 |
c04f5ac3 JX |
6993 | msgid "git write-tree failed to write a tree" |
6994 | msgstr "git write-tree 无法写入一树对象" | |
6995 | ||
04cb2f28 | 6996 | #: builtin/merge.c:678 |
c04f5ac3 JX |
6997 | msgid "Not handling anything other than two heads merge." |
6998 | msgstr "不能处理两个头合并之外的任何操作。" | |
6999 | ||
04cb2f28 | 7000 | #: builtin/merge.c:692 |
c04f5ac3 JX |
7001 | #, c-format |
7002 | msgid "Unknown option for merge-recursive: -X%s" | |
7003 | msgstr "merge-recursive 的未知选项:-X%s" | |
7004 | ||
04cb2f28 | 7005 | #: builtin/merge.c:705 |
c04f5ac3 JX |
7006 | #, c-format |
7007 | msgid "unable to write %s" | |
7008 | msgstr "不能写 %s" | |
7009 | ||
04cb2f28 | 7010 | #: builtin/merge.c:794 |
c04f5ac3 JX |
7011 | #, c-format |
7012 | msgid "Could not read from '%s'" | |
7013 | msgstr "不能从 '%s' 读取" | |
7014 | ||
04cb2f28 | 7015 | #: builtin/merge.c:803 |
c04f5ac3 JX |
7016 | #, c-format |
7017 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
7018 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
7019 | ||
04cb2f28 | 7020 | #: builtin/merge.c:809 |
a77c07d9 | 7021 | #, c-format |
c04f5ac3 JX |
7022 | msgid "" |
7023 | "Please enter a commit message to explain why this merge is necessary,\n" | |
7024 | "especially if it merges an updated upstream into a topic branch.\n" | |
7025 | "\n" | |
a77c07d9 | 7026 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" |
c04f5ac3 JX |
7027 | "the commit.\n" |
7028 | msgstr "" | |
7029 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
7030 | "合并到主题分支。\n" | |
7031 | "\n" | |
a77c07d9 | 7032 | "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n" |
c04f5ac3 | 7033 | |
04cb2f28 | 7034 | #: builtin/merge.c:833 |
c04f5ac3 JX |
7035 | msgid "Empty commit message." |
7036 | msgstr "空提交信息。" | |
7037 | ||
04cb2f28 | 7038 | #: builtin/merge.c:845 |
c04f5ac3 JX |
7039 | #, c-format |
7040 | msgid "Wonderful.\n" | |
7041 | msgstr "太棒了。\n" | |
7042 | ||
04cb2f28 | 7043 | #: builtin/merge.c:900 |
c04f5ac3 JX |
7044 | #, c-format |
7045 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
7046 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
7047 | ||
04cb2f28 | 7048 | #: builtin/merge.c:916 |
c04f5ac3 JX |
7049 | #, c-format |
7050 | msgid "'%s' is not a commit" | |
7051 | msgstr "'%s' 不是一个提交" | |
7052 | ||
04cb2f28 | 7053 | #: builtin/merge.c:957 |
c04f5ac3 | 7054 | msgid "No current branch." |
90e6ef53 | 7055 | msgstr "没有当前分支。" |
c04f5ac3 | 7056 | |
04cb2f28 | 7057 | #: builtin/merge.c:959 |
c04f5ac3 | 7058 | msgid "No remote for the current branch." |
90e6ef53 | 7059 | msgstr "当前分支没有对应的远程版本库。" |
c04f5ac3 | 7060 | |
04cb2f28 | 7061 | #: builtin/merge.c:961 |
c04f5ac3 | 7062 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 7063 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 7064 | |
04cb2f28 | 7065 | #: builtin/merge.c:966 |
170e9899 | 7066 | #, c-format |
2e8451e8 JX |
7067 | msgid "No remote-tracking branch for %s from %s" |
7068 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 7069 | |
04cb2f28 | 7070 | #: builtin/merge.c:1122 |
c04f5ac3 | 7071 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 7072 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 7073 | |
04cb2f28 | 7074 | #: builtin/merge.c:1138 |
c04f5ac3 JX |
7075 | msgid "" |
7076 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
220c313c | 7077 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
7078 | msgstr "" |
7079 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 7080 | "请在合并前先提交您的修改。" |
c04f5ac3 | 7081 | |
04cb2f28 | 7082 | #: builtin/merge.c:1141 git-pull.sh:34 |
c04f5ac3 JX |
7083 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
7084 | msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" | |
7085 | ||
04cb2f28 | 7086 | #: builtin/merge.c:1145 |
c04f5ac3 JX |
7087 | msgid "" |
7088 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
220c313c | 7089 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
7090 | msgstr "" |
7091 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 7092 | "请在合并前先提交您的修改。" |
c04f5ac3 | 7093 | |
04cb2f28 | 7094 | #: builtin/merge.c:1148 |
c04f5ac3 JX |
7095 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
7096 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
7097 | ||
04cb2f28 | 7098 | #: builtin/merge.c:1157 |
c04f5ac3 | 7099 | msgid "You cannot combine --squash with --no-ff." |
649900bc | 7100 | msgstr "您不能将 --squash 与 --no-ff 同时使用。" |
c04f5ac3 | 7101 | |
04cb2f28 | 7102 | #: builtin/merge.c:1166 |
c04f5ac3 | 7103 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 7104 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 7105 | |
04cb2f28 | 7106 | #: builtin/merge.c:1198 |
c04f5ac3 | 7107 | msgid "Can merge only exactly one commit into empty head" |
90e6ef53 | 7108 | msgstr "只能将一个提交合并到空分支上" |
c04f5ac3 | 7109 | |
04cb2f28 | 7110 | #: builtin/merge.c:1201 |
c04f5ac3 JX |
7111 | msgid "Squash commit into empty head not supported yet" |
7112 | msgstr "尚不支持到空分支的压缩提交" | |
7113 | ||
04cb2f28 | 7114 | #: builtin/merge.c:1203 |
c04f5ac3 JX |
7115 | msgid "Non-fast-forward commit does not make sense into an empty head" |
7116 | msgstr "到空分支的非快进式提交没有意义" | |
7117 | ||
04cb2f28 | 7118 | #: builtin/merge.c:1208 |
2e8451e8 JX |
7119 | #, c-format |
7120 | msgid "%s - not something we can merge" | |
7121 | msgstr "%s - 不能被合并" | |
7122 | ||
04cb2f28 | 7123 | #: builtin/merge.c:1259 |
1003b3a5 JX |
7124 | #, c-format |
7125 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
7126 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
7127 | ||
04cb2f28 | 7128 | #: builtin/merge.c:1262 |
1003b3a5 JX |
7129 | #, c-format |
7130 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
7131 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
7132 | ||
04cb2f28 | 7133 | #: builtin/merge.c:1265 |
1003b3a5 JX |
7134 | #, c-format |
7135 | msgid "Commit %s does not have a GPG signature." | |
7136 | msgstr "提交 %s 没有一个 GPG 签名。" | |
7137 | ||
04cb2f28 | 7138 | #: builtin/merge.c:1268 |
1003b3a5 JX |
7139 | #, c-format |
7140 | msgid "Commit %s has a good GPG signature by %s\n" | |
7141 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
7142 | ||
04cb2f28 | 7143 | #: builtin/merge.c:1349 |
c04f5ac3 JX |
7144 | #, c-format |
7145 | msgid "Updating %s..%s\n" | |
7146 | msgstr "更新 %s..%s\n" | |
7147 | ||
04cb2f28 | 7148 | #: builtin/merge.c:1388 |
c04f5ac3 JX |
7149 | #, c-format |
7150 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 7151 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 7152 | |
04cb2f28 | 7153 | #: builtin/merge.c:1395 |
c04f5ac3 JX |
7154 | #, c-format |
7155 | msgid "Nope.\n" | |
7156 | msgstr "无。\n" | |
7157 | ||
04cb2f28 | 7158 | #: builtin/merge.c:1427 |
c04f5ac3 | 7159 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 7160 | msgstr "无法快进,终止。" |
c04f5ac3 | 7161 | |
04cb2f28 | 7162 | #: builtin/merge.c:1450 builtin/merge.c:1529 |
c04f5ac3 JX |
7163 | #, c-format |
7164 | msgid "Rewinding the tree to pristine...\n" | |
7165 | msgstr "将树回滚至原始状态...\n" | |
7166 | ||
04cb2f28 | 7167 | #: builtin/merge.c:1454 |
c04f5ac3 JX |
7168 | #, c-format |
7169 | msgid "Trying merge strategy %s...\n" | |
7170 | msgstr "尝试合并策略 %s...\n" | |
7171 | ||
04cb2f28 | 7172 | #: builtin/merge.c:1520 |
c04f5ac3 JX |
7173 | #, c-format |
7174 | msgid "No merge strategy handled the merge.\n" | |
7175 | msgstr "没有合并策略处理此合并。\n" | |
7176 | ||
04cb2f28 | 7177 | #: builtin/merge.c:1522 |
c04f5ac3 JX |
7178 | #, c-format |
7179 | msgid "Merge with strategy %s failed.\n" | |
7180 | msgstr "使用策略 %s 合并失败。\n" | |
7181 | ||
04cb2f28 | 7182 | #: builtin/merge.c:1531 |
c04f5ac3 JX |
7183 | #, c-format |
7184 | msgid "Using the %s to prepare resolving by hand.\n" | |
7185 | msgstr "使用 %s 以准备手工解决。\n" | |
7186 | ||
04cb2f28 | 7187 | #: builtin/merge.c:1543 |
c04f5ac3 JX |
7188 | #, c-format |
7189 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
7190 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
7191 | ||
cfff71a9 | 7192 | #: builtin/merge-base.c:29 |
814ff314 JX |
7193 | msgid "git merge-base [-a | --all] <commit> <commit>..." |
7194 | msgstr "git merge-base [-a | --all] <提交> <提交>..." | |
ef317cd5 | 7195 | |
cfff71a9 | 7196 | #: builtin/merge-base.c:30 |
814ff314 JX |
7197 | msgid "git merge-base [-a | --all] --octopus <commit>..." |
7198 | msgstr "git merge-base [-a | --all] --octopus <提交>..." | |
ef317cd5 | 7199 | |
cfff71a9 | 7200 | #: builtin/merge-base.c:31 |
ef317cd5 | 7201 | msgid "git merge-base --independent <commit>..." |
07432cef | 7202 | msgstr "git merge-base --independent <提交>..." |
ef317cd5 | 7203 | |
cfff71a9 | 7204 | #: builtin/merge-base.c:32 |
ef317cd5 | 7205 | msgid "git merge-base --is-ancestor <commit> <commit>" |
07432cef | 7206 | msgstr "git merge-base --is-ancestor <提交> <提交>" |
ef317cd5 | 7207 | |
cfff71a9 JX |
7208 | #: builtin/merge-base.c:33 |
7209 | msgid "git merge-base --fork-point <ref> [<commit>]" | |
d9d56b23 | 7210 | msgstr "git merge-base --fork-point <引用> [<提交>]" |
cfff71a9 JX |
7211 | |
7212 | #: builtin/merge-base.c:214 | |
ef317cd5 | 7213 | msgid "output all common ancestors" |
07432cef | 7214 | msgstr "输出所有共同的祖先" |
ef317cd5 | 7215 | |
cfff71a9 | 7216 | #: builtin/merge-base.c:216 |
ef317cd5 | 7217 | msgid "find ancestors for a single n-way merge" |
07432cef | 7218 | msgstr "查找一个多路合并的祖先提交" |
ef317cd5 | 7219 | |
cfff71a9 | 7220 | #: builtin/merge-base.c:218 |
ef317cd5 | 7221 | msgid "list revs not reachable from others" |
07432cef | 7222 | msgstr "显示不能被其他访问到的版本" |
ef317cd5 | 7223 | |
cfff71a9 | 7224 | #: builtin/merge-base.c:220 |
ef317cd5 | 7225 | msgid "is the first one ancestor of the other?" |
07432cef | 7226 | msgstr "第一个是其他的祖先提交么?" |
ef317cd5 | 7227 | |
cfff71a9 JX |
7228 | #: builtin/merge-base.c:222 |
7229 | msgid "find where <commit> forked from reflog of <ref>" | |
d9d56b23 | 7230 | msgstr "查找 <提交> 从<引用>日志的何处分支的" |
cfff71a9 | 7231 | |
ef317cd5 JX |
7232 | #: builtin/merge-file.c:8 |
7233 | msgid "" | |
814ff314 JX |
7234 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " |
7235 | "<orig-file> <file2>" | |
ef317cd5 | 7236 | msgstr "" |
814ff314 JX |
7237 | "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" |
7238 | "件> <文件2>" | |
ef317cd5 JX |
7239 | |
7240 | #: builtin/merge-file.c:33 | |
7241 | msgid "send results to standard output" | |
07432cef | 7242 | msgstr "将结果发送到标准输出" |
ef317cd5 JX |
7243 | |
7244 | #: builtin/merge-file.c:34 | |
7245 | msgid "use a diff3 based merge" | |
07432cef | 7246 | msgstr "使用基于 diff3 的合并" |
ef317cd5 JX |
7247 | |
7248 | #: builtin/merge-file.c:35 | |
7249 | msgid "for conflicts, use our version" | |
07432cef | 7250 | msgstr "如果冲突,使用我们的版本" |
ef317cd5 JX |
7251 | |
7252 | #: builtin/merge-file.c:37 | |
7253 | msgid "for conflicts, use their version" | |
07432cef | 7254 | msgstr "如果冲突,使用他们的版本" |
ef317cd5 JX |
7255 | |
7256 | #: builtin/merge-file.c:39 | |
7257 | msgid "for conflicts, use a union version" | |
07432cef | 7258 | msgstr "如果冲突,使用联合版本" |
ef317cd5 JX |
7259 | |
7260 | #: builtin/merge-file.c:42 | |
7261 | msgid "for conflicts, use this marker size" | |
07432cef | 7262 | msgstr "如果冲突,使用指定长度的标记" |
ef317cd5 JX |
7263 | |
7264 | #: builtin/merge-file.c:43 | |
7265 | msgid "do not warn about conflicts" | |
07432cef | 7266 | msgstr "不要警告冲突" |
ef317cd5 JX |
7267 | |
7268 | #: builtin/merge-file.c:45 | |
814ff314 JX |
7269 | msgid "set labels for file1/orig-file/file2" |
7270 | msgstr "为 文件1/初始文件/文件2 设置标签" | |
c04f5ac3 | 7271 | |
6c94aba5 | 7272 | #: builtin/mktree.c:64 |
ef317cd5 | 7273 | msgid "git mktree [-z] [--missing] [--batch]" |
07432cef | 7274 | msgstr "git mktree [-z] [--missing] [--batch]" |
c04f5ac3 | 7275 | |
6c94aba5 | 7276 | #: builtin/mktree.c:150 |
ef317cd5 | 7277 | msgid "input is NUL terminated" |
07432cef | 7278 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 7279 | |
6c94aba5 | 7280 | #: builtin/mktree.c:151 builtin/write-tree.c:24 |
ef317cd5 | 7281 | msgid "allow missing objects" |
07432cef | 7282 | msgstr "允许丢失的对象" |
c04f5ac3 | 7283 | |
6c94aba5 | 7284 | #: builtin/mktree.c:152 |
ef317cd5 | 7285 | msgid "allow creation of more than one tree" |
07432cef | 7286 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 7287 | |
90314792 | 7288 | #: builtin/mv.c:15 |
814ff314 JX |
7289 | msgid "git mv [<options>] <source>... <destination>" |
7290 | msgstr "git mv [<选项>] <源>... <目标>" | |
c04f5ac3 | 7291 | |
220c313c JX |
7292 | #: builtin/mv.c:69 |
7293 | #, c-format | |
7294 | msgid "Directory %s is in index and no submodule?" | |
7295 | msgstr "目录 %s 在索引中并且不是子模组?" | |
7296 | ||
cfff71a9 | 7297 | #: builtin/mv.c:71 |
220c313c JX |
7298 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
7299 | msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" | |
7300 | ||
7301 | #: builtin/mv.c:89 | |
7302 | #, c-format | |
7303 | msgid "%.*s is in index" | |
7304 | msgstr "%.*s 在索引中" | |
7305 | ||
7306 | #: builtin/mv.c:111 | |
ef317cd5 | 7307 | msgid "force move/rename even if target exists" |
07432cef | 7308 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 7309 | |
220c313c | 7310 | #: builtin/mv.c:112 |
ef317cd5 | 7311 | msgid "skip move/rename errors" |
07432cef | 7312 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 7313 | |
220c313c JX |
7314 | #: builtin/mv.c:151 |
7315 | #, c-format | |
7316 | msgid "destination '%s' is not a directory" | |
7317 | msgstr "目标 '%s' 不是一个目录" | |
7318 | ||
7319 | #: builtin/mv.c:162 | |
c04f5ac3 JX |
7320 | #, c-format |
7321 | msgid "Checking rename of '%s' to '%s'\n" | |
7322 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
7323 | ||
220c313c | 7324 | #: builtin/mv.c:166 |
c04f5ac3 JX |
7325 | msgid "bad source" |
7326 | msgstr "坏的源" | |
7327 | ||
220c313c | 7328 | #: builtin/mv.c:169 |
c04f5ac3 JX |
7329 | msgid "can not move directory into itself" |
7330 | msgstr "不能将目录移动到自身" | |
7331 | ||
220c313c | 7332 | #: builtin/mv.c:172 |
c04f5ac3 JX |
7333 | msgid "cannot move directory over file" |
7334 | msgstr "不能将目录移动到文件" | |
7335 | ||
220c313c | 7336 | #: builtin/mv.c:181 |
c04f5ac3 JX |
7337 | msgid "source directory is empty" |
7338 | msgstr "源目录为空" | |
7339 | ||
220c313c | 7340 | #: builtin/mv.c:206 |
c04f5ac3 JX |
7341 | msgid "not under version control" |
7342 | msgstr "不在版本控制之下" | |
7343 | ||
220c313c | 7344 | #: builtin/mv.c:209 |
c04f5ac3 JX |
7345 | msgid "destination exists" |
7346 | msgstr "目标已存在" | |
7347 | ||
220c313c | 7348 | #: builtin/mv.c:217 |
c04f5ac3 JX |
7349 | #, c-format |
7350 | msgid "overwriting '%s'" | |
7351 | msgstr "覆盖 '%s'" | |
7352 | ||
220c313c | 7353 | #: builtin/mv.c:220 |
c04f5ac3 JX |
7354 | msgid "Cannot overwrite" |
7355 | msgstr "不能覆盖" | |
7356 | ||
220c313c | 7357 | #: builtin/mv.c:223 |
c04f5ac3 JX |
7358 | msgid "multiple sources for the same target" |
7359 | msgstr "同一目标具有多个源" | |
7360 | ||
220c313c | 7361 | #: builtin/mv.c:225 |
cfff71a9 JX |
7362 | msgid "destination directory does not exist" |
7363 | msgstr "目标目录不存在" | |
7364 | ||
220c313c | 7365 | #: builtin/mv.c:232 |
c04f5ac3 JX |
7366 | #, c-format |
7367 | msgid "%s, source=%s, destination=%s" | |
7368 | msgstr "%s,源=%s,目标=%s" | |
7369 | ||
220c313c | 7370 | #: builtin/mv.c:253 |
c04f5ac3 JX |
7371 | #, c-format |
7372 | msgid "Renaming %s to %s\n" | |
7373 | msgstr "重命名 %s 至 %s\n" | |
7374 | ||
814ff314 | 7375 | #: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 |
c04f5ac3 JX |
7376 | #, c-format |
7377 | msgid "renaming '%s' failed" | |
7378 | msgstr "重命名 '%s' 失败" | |
7379 | ||
6acbf033 | 7380 | #: builtin/name-rev.c:255 |
814ff314 JX |
7381 | msgid "git name-rev [<options>] <commit>..." |
7382 | msgstr "git name-rev [<选项>] <提交>..." | |
ef317cd5 | 7383 | |
6acbf033 | 7384 | #: builtin/name-rev.c:256 |
814ff314 JX |
7385 | msgid "git name-rev [<options>] --all" |
7386 | msgstr "git name-rev [<选项>] --all" | |
ef317cd5 | 7387 | |
6acbf033 | 7388 | #: builtin/name-rev.c:257 |
814ff314 JX |
7389 | msgid "git name-rev [<options>] --stdin" |
7390 | msgstr "git name-rev [<选项>] --stdin" | |
ef317cd5 | 7391 | |
6acbf033 | 7392 | #: builtin/name-rev.c:309 |
ef317cd5 | 7393 | msgid "print only names (no SHA-1)" |
07432cef | 7394 | msgstr "只打印名称(无 SHA-1)" |
ef317cd5 | 7395 | |
6acbf033 | 7396 | #: builtin/name-rev.c:310 |
ef317cd5 | 7397 | msgid "only use tags to name the commits" |
07432cef | 7398 | msgstr "只使用 tags 来命名提交" |
ef317cd5 | 7399 | |
6acbf033 | 7400 | #: builtin/name-rev.c:312 |
ef317cd5 | 7401 | msgid "only use refs matching <pattern>" |
07432cef | 7402 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 7403 | |
6acbf033 | 7404 | #: builtin/name-rev.c:314 |
ef317cd5 | 7405 | msgid "list all commits reachable from all refs" |
07432cef | 7406 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 7407 | |
6acbf033 | 7408 | #: builtin/name-rev.c:315 |
ef317cd5 | 7409 | msgid "read from stdin" |
07432cef | 7410 | msgstr "从标准输入读取" |
ef317cd5 | 7411 | |
6acbf033 | 7412 | #: builtin/name-rev.c:316 |
90314792 JX |
7413 | msgid "allow to print `undefined` names (default)" |
7414 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 7415 | |
6acbf033 | 7416 | #: builtin/name-rev.c:322 |
2e8451e8 JX |
7417 | msgid "dereference tags in the input (internal use)" |
7418 | msgstr "反向解析输入中的 tags(内部使用)" | |
7419 | ||
7420 | #: builtin/notes.c:24 | |
814ff314 | 7421 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
07432cef | 7422 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 7423 | |
2e8451e8 | 7424 | #: builtin/notes.c:25 |
ef317cd5 | 7425 | msgid "" |
814ff314 | 7426 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
04cb2f28 | 7427 | "| (-c | -C) <object>] [<object>]" |
ef317cd5 | 7428 | msgstr "" |
04cb2f28 JX |
7429 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
7430 | "| (-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 7431 | |
2e8451e8 | 7432 | #: builtin/notes.c:26 |
814ff314 | 7433 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
07432cef | 7434 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 7435 | |
2e8451e8 | 7436 | #: builtin/notes.c:27 |
ef317cd5 | 7437 | msgid "" |
814ff314 | 7438 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
04cb2f28 | 7439 | "(-c | -C) <object>] [<object>]" |
ef317cd5 | 7440 | msgstr "" |
04cb2f28 JX |
7441 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
7442 | "(-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 7443 | |
2e8451e8 | 7444 | #: builtin/notes.c:28 |
814ff314 | 7445 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
04cb2f28 | 7446 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
ef317cd5 | 7447 | |
2e8451e8 | 7448 | #: builtin/notes.c:29 |
814ff314 | 7449 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
07432cef | 7450 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 7451 | |
2e8451e8 | 7452 | #: builtin/notes.c:30 |
ef317cd5 | 7453 | msgid "" |
814ff314 | 7454 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
07432cef | 7455 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 7456 | |
2e8451e8 | 7457 | #: builtin/notes.c:31 |
ef317cd5 | 7458 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 7459 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 7460 | |
2e8451e8 | 7461 | #: builtin/notes.c:32 |
ef317cd5 | 7462 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 7463 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 7464 | |
2e8451e8 | 7465 | #: builtin/notes.c:33 |
814ff314 | 7466 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
07432cef | 7467 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 7468 | |
2e8451e8 | 7469 | #: builtin/notes.c:34 |
814ff314 | 7470 | msgid "git notes [--ref <notes-ref>] prune [-n | -v]" |
07432cef | 7471 | msgstr "git notes [--ref <注解引用>] prune [-n | -v]" |
ef317cd5 | 7472 | |
2e8451e8 | 7473 | #: builtin/notes.c:35 |
814ff314 | 7474 | msgid "git notes [--ref <notes-ref>] get-ref" |
07432cef | 7475 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 7476 | |
2e8451e8 | 7477 | #: builtin/notes.c:40 |
ef317cd5 | 7478 | msgid "git notes [list [<object>]]" |
07432cef | 7479 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 7480 | |
2e8451e8 | 7481 | #: builtin/notes.c:45 |
ef317cd5 | 7482 | msgid "git notes add [<options>] [<object>]" |
07432cef | 7483 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 7484 | |
2e8451e8 | 7485 | #: builtin/notes.c:50 |
ef317cd5 | 7486 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 7487 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 7488 | |
2e8451e8 | 7489 | #: builtin/notes.c:51 |
ef317cd5 | 7490 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 7491 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 7492 | |
2e8451e8 | 7493 | #: builtin/notes.c:56 |
ef317cd5 | 7494 | msgid "git notes append [<options>] [<object>]" |
07432cef | 7495 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 7496 | |
2e8451e8 | 7497 | #: builtin/notes.c:61 |
ef317cd5 | 7498 | msgid "git notes edit [<object>]" |
07432cef | 7499 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 7500 | |
2e8451e8 | 7501 | #: builtin/notes.c:66 |
ef317cd5 | 7502 | msgid "git notes show [<object>]" |
07432cef | 7503 | msgstr "git notes show [<对象>]" |
ef317cd5 | 7504 | |
2e8451e8 | 7505 | #: builtin/notes.c:71 |
814ff314 | 7506 | msgid "git notes merge [<options>] <notes-ref>" |
07432cef | 7507 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 7508 | |
2e8451e8 | 7509 | #: builtin/notes.c:72 |
ef317cd5 | 7510 | msgid "git notes merge --commit [<options>]" |
07432cef | 7511 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 7512 | |
2e8451e8 | 7513 | #: builtin/notes.c:73 |
ef317cd5 | 7514 | msgid "git notes merge --abort [<options>]" |
07432cef | 7515 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 7516 | |
2e8451e8 | 7517 | #: builtin/notes.c:78 |
ef317cd5 | 7518 | msgid "git notes remove [<object>]" |
07432cef | 7519 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 7520 | |
2e8451e8 | 7521 | #: builtin/notes.c:83 |
ef317cd5 | 7522 | msgid "git notes prune [<options>]" |
07432cef | 7523 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 7524 | |
2e8451e8 | 7525 | #: builtin/notes.c:88 |
ef317cd5 | 7526 | msgid "git notes get-ref" |
07432cef | 7527 | msgstr "git notes get-ref" |
ef317cd5 | 7528 | |
04cb2f28 | 7529 | #: builtin/notes.c:146 |
c04f5ac3 JX |
7530 | #, c-format |
7531 | msgid "unable to start 'show' for object '%s'" | |
7532 | msgstr "不能为对象 '%s' 开始 'show'" | |
7533 | ||
04cb2f28 | 7534 | #: builtin/notes.c:150 |
a77c07d9 JX |
7535 | msgid "could not read 'show' output" |
7536 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 7537 | |
04cb2f28 | 7538 | #: builtin/notes.c:158 |
c04f5ac3 JX |
7539 | #, c-format |
7540 | msgid "failed to finish 'show' for object '%s'" | |
7541 | msgstr "无法为对象 '%s' 完成 'show'" | |
7542 | ||
04cb2f28 | 7543 | #: builtin/notes.c:173 builtin/tag.c:477 |
c04f5ac3 JX |
7544 | #, c-format |
7545 | msgid "could not create file '%s'" | |
7546 | msgstr "不能创建文件 '%s'" | |
7547 | ||
04cb2f28 | 7548 | #: builtin/notes.c:192 |
c04f5ac3 JX |
7549 | msgid "Please supply the note contents using either -m or -F option" |
7550 | msgstr "请通过 -m 或 -F 选项为注解提供内容" | |
7551 | ||
04cb2f28 | 7552 | #: builtin/notes.c:201 |
c04f5ac3 JX |
7553 | msgid "unable to write note object" |
7554 | msgstr "不能写注解对象" | |
7555 | ||
04cb2f28 | 7556 | #: builtin/notes.c:203 |
c04f5ac3 | 7557 | #, c-format |
220c313c JX |
7558 | msgid "The note contents have been left in %s" |
7559 | msgstr "注解内容被留在 %s 中" | |
c04f5ac3 | 7560 | |
04cb2f28 | 7561 | #: builtin/notes.c:231 builtin/tag.c:693 |
c04f5ac3 JX |
7562 | #, c-format |
7563 | msgid "cannot read '%s'" | |
7564 | msgstr "不能读取 '%s'" | |
7565 | ||
04cb2f28 | 7566 | #: builtin/notes.c:233 builtin/tag.c:696 |
c04f5ac3 JX |
7567 | #, c-format |
7568 | msgid "could not open or read '%s'" | |
7569 | msgstr "不能打开或读取 '%s'" | |
7570 | ||
04cb2f28 JX |
7571 | #: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305 |
7572 | #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506 | |
7573 | #: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652 | |
7574 | #: builtin/notes.c:854 builtin/tag.c:709 | |
c04f5ac3 JX |
7575 | #, c-format |
7576 | msgid "Failed to resolve '%s' as a valid ref." | |
90e6ef53 | 7577 | msgstr "无法解析 '%s' 为一个有效引用。" |
c04f5ac3 | 7578 | |
04cb2f28 | 7579 | #: builtin/notes.c:255 |
c04f5ac3 JX |
7580 | #, c-format |
7581 | msgid "Failed to read object '%s'." | |
7582 | msgstr "无法读取对象 '%s'。" | |
7583 | ||
04cb2f28 | 7584 | #: builtin/notes.c:259 |
6c94aba5 JX |
7585 | #, c-format |
7586 | msgid "Cannot read note data from non-blob object '%s'." | |
7587 | msgstr "不能从非数据对象 '%s' 中读取注解数据" | |
7588 | ||
04cb2f28 | 7589 | #: builtin/notes.c:299 |
c04f5ac3 JX |
7590 | #, c-format |
7591 | msgid "Malformed input line: '%s'." | |
7592 | msgstr "非法的输入行:'%s'。" | |
7593 | ||
04cb2f28 | 7594 | #: builtin/notes.c:314 |
c04f5ac3 JX |
7595 | #, c-format |
7596 | msgid "Failed to copy notes from '%s' to '%s'" | |
90e6ef53 | 7597 | msgstr "无法从 '%s' 到 '%s' 拷贝注解" |
c04f5ac3 | 7598 | |
04cb2f28 JX |
7599 | #: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489 |
7600 | #: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645 | |
7601 | #: builtin/notes.c:919 | |
c04f5ac3 JX |
7602 | msgid "too many parameters" |
7603 | msgstr "参数太多" | |
7604 | ||
04cb2f28 | 7605 | #: builtin/notes.c:371 builtin/notes.c:658 |
c04f5ac3 JX |
7606 | #, c-format |
7607 | msgid "No note found for object %s." | |
7608 | msgstr "未发现对象 %s 的注解。" | |
7609 | ||
04cb2f28 | 7610 | #: builtin/notes.c:392 builtin/notes.c:555 |
ef317cd5 | 7611 | msgid "note contents as a string" |
07432cef | 7612 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 7613 | |
04cb2f28 | 7614 | #: builtin/notes.c:395 builtin/notes.c:558 |
ef317cd5 | 7615 | msgid "note contents in a file" |
07432cef | 7616 | msgstr "注解内容到一个文件中" |
ef317cd5 | 7617 | |
04cb2f28 JX |
7618 | #: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560 |
7619 | #: builtin/notes.c:563 builtin/tag.c:628 | |
ef317cd5 | 7620 | msgid "object" |
07432cef | 7621 | msgstr "对象" |
ef317cd5 | 7622 | |
04cb2f28 | 7623 | #: builtin/notes.c:398 builtin/notes.c:561 |
ef317cd5 | 7624 | msgid "reuse and edit specified note object" |
07432cef | 7625 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 7626 | |
04cb2f28 | 7627 | #: builtin/notes.c:401 builtin/notes.c:564 |
ef317cd5 | 7628 | msgid "reuse specified note object" |
07432cef | 7629 | msgstr "重用指定的注解对象" |
ef317cd5 | 7630 | |
04cb2f28 JX |
7631 | #: builtin/notes.c:404 builtin/notes.c:567 |
7632 | msgid "allow storing empty note" | |
7633 | msgstr "允许保存空白注释" | |
7634 | ||
7635 | #: builtin/notes.c:405 builtin/notes.c:476 | |
ef317cd5 | 7636 | msgid "replace existing notes" |
07432cef | 7637 | msgstr "替换已存在的注解" |
ef317cd5 | 7638 | |
04cb2f28 | 7639 | #: builtin/notes.c:430 |
c04f5ac3 JX |
7640 | #, c-format |
7641 | msgid "" | |
7642 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
7643 | "existing notes" | |
7644 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
7645 | ||
04cb2f28 | 7646 | #: builtin/notes.c:445 builtin/notes.c:524 |
c04f5ac3 JX |
7647 | #, c-format |
7648 | msgid "Overwriting existing notes for object %s\n" | |
7649 | msgstr "覆盖对象 %s 现存注解\n" | |
7650 | ||
04cb2f28 JX |
7651 | #: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859 |
7652 | #, c-format | |
7653 | msgid "Removing note for object %s\n" | |
7654 | msgstr "删除对象 %s 的注解\n" | |
7655 | ||
7656 | #: builtin/notes.c:477 | |
ef317cd5 | 7657 | msgid "read objects from stdin" |
07432cef | 7658 | msgstr "从标准输入读取对象" |
ef317cd5 | 7659 | |
04cb2f28 | 7660 | #: builtin/notes.c:479 |
ef317cd5 | 7661 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 7662 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 7663 | |
04cb2f28 | 7664 | #: builtin/notes.c:497 |
c04f5ac3 JX |
7665 | msgid "too few parameters" |
7666 | msgstr "参数太少" | |
7667 | ||
04cb2f28 | 7668 | #: builtin/notes.c:518 |
c04f5ac3 JX |
7669 | #, c-format |
7670 | msgid "" | |
7671 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
7672 | "existing notes" | |
7673 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
7674 | ||
04cb2f28 | 7675 | #: builtin/notes.c:530 |
c04f5ac3 JX |
7676 | #, c-format |
7677 | msgid "Missing notes on source object %s. Cannot copy." | |
7678 | msgstr "源对象 %s 缺少注解。不能拷贝。" | |
7679 | ||
04cb2f28 | 7680 | #: builtin/notes.c:582 |
ef317cd5 JX |
7681 | #, c-format |
7682 | msgid "" | |
7683 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
7684 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
7685 | msgstr "" | |
7686 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
7687 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
7688 | ||
04cb2f28 | 7689 | #: builtin/notes.c:750 |
ef317cd5 | 7690 | msgid "General options" |
07432cef | 7691 | msgstr "通用选项" |
ef317cd5 | 7692 | |
04cb2f28 | 7693 | #: builtin/notes.c:752 |
ef317cd5 | 7694 | msgid "Merge options" |
07432cef | 7695 | msgstr "合并选项" |
ef317cd5 | 7696 | |
04cb2f28 | 7697 | #: builtin/notes.c:754 |
ef317cd5 JX |
7698 | msgid "" |
7699 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
7700 | "cat_sort_uniq)" | |
07432cef | 7701 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 7702 | |
04cb2f28 | 7703 | #: builtin/notes.c:756 |
ef317cd5 | 7704 | msgid "Committing unmerged notes" |
07432cef | 7705 | msgstr "提交未合并的注解" |
ef317cd5 | 7706 | |
04cb2f28 | 7707 | #: builtin/notes.c:758 |
ef317cd5 | 7708 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 7709 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 7710 | |
04cb2f28 | 7711 | #: builtin/notes.c:760 |
ef317cd5 | 7712 | msgid "Aborting notes merge resolution" |
07432cef | 7713 | msgstr "中止注解合并的方案" |
ef317cd5 | 7714 | |
04cb2f28 | 7715 | #: builtin/notes.c:762 |
ef317cd5 | 7716 | msgid "abort notes merge" |
07432cef | 7717 | msgstr "中止注解合并" |
ef317cd5 | 7718 | |
04cb2f28 | 7719 | #: builtin/notes.c:857 |
ef317cd5 JX |
7720 | #, c-format |
7721 | msgid "Object %s has no note\n" | |
7722 | msgstr "对象 %s 没有注解\n" | |
7723 | ||
04cb2f28 | 7724 | #: builtin/notes.c:869 |
ef317cd5 | 7725 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 7726 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 7727 | |
04cb2f28 | 7728 | #: builtin/notes.c:872 |
ef317cd5 | 7729 | msgid "read object names from the standard input" |
07432cef | 7730 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 7731 | |
04cb2f28 | 7732 | #: builtin/notes.c:953 |
6c94aba5 | 7733 | msgid "notes-ref" |
07432cef | 7734 | msgstr "注解引用" |
ef317cd5 | 7735 | |
04cb2f28 | 7736 | #: builtin/notes.c:954 |
814ff314 | 7737 | msgid "use notes from <notes-ref>" |
07432cef | 7738 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 7739 | |
d9d56b23 | 7740 | #: builtin/notes.c:989 builtin/remote.c:1621 |
ef317cd5 JX |
7741 | #, c-format |
7742 | msgid "Unknown subcommand: %s" | |
7743 | msgstr "未知子命令:%s" | |
7744 | ||
220c313c | 7745 | #: builtin/pack-objects.c:28 |
ef317cd5 | 7746 | msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" |
07432cef | 7747 | msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]" |
ef317cd5 | 7748 | |
220c313c | 7749 | #: builtin/pack-objects.c:29 |
ef317cd5 | 7750 | msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" |
07432cef | 7751 | msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]" |
ef317cd5 | 7752 | |
814ff314 | 7753 | #: builtin/pack-objects.c:175 builtin/pack-objects.c:178 |
ef317cd5 JX |
7754 | #, c-format |
7755 | msgid "deflate error (%d)" | |
7756 | msgstr "压缩错误 (%d)" | |
7757 | ||
814ff314 | 7758 | #: builtin/pack-objects.c:771 |
6c94aba5 JX |
7759 | msgid "Writing objects" |
7760 | msgstr "写入对象中" | |
7761 | ||
814ff314 | 7762 | #: builtin/pack-objects.c:1013 |
6c94aba5 JX |
7763 | msgid "disabling bitmap writing, as some objects are not being packed" |
7764 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" | |
7765 | ||
814ff314 | 7766 | #: builtin/pack-objects.c:2173 |
6c94aba5 JX |
7767 | msgid "Compressing objects" |
7768 | msgstr "压缩对象中" | |
7769 | ||
814ff314 | 7770 | #: builtin/pack-objects.c:2570 |
ef317cd5 JX |
7771 | #, c-format |
7772 | msgid "unsupported index version %s" | |
7773 | msgstr "不支持的索引版本 %s" | |
7774 | ||
814ff314 | 7775 | #: builtin/pack-objects.c:2574 |
ef317cd5 JX |
7776 | #, c-format |
7777 | msgid "bad index version '%s'" | |
7778 | msgstr "坏的索引版本 '%s'" | |
7779 | ||
814ff314 | 7780 | #: builtin/pack-objects.c:2597 |
ef317cd5 JX |
7781 | #, c-format |
7782 | msgid "option %s does not accept negative form" | |
7783 | msgstr "选项 %s 不接受否定格式" | |
7784 | ||
814ff314 | 7785 | #: builtin/pack-objects.c:2601 |
ef317cd5 JX |
7786 | #, c-format |
7787 | msgid "unable to parse value '%s' for option %s" | |
7788 | msgstr "不能解析选项 %1$s 的值 '%2$s'" | |
7789 | ||
814ff314 | 7790 | #: builtin/pack-objects.c:2621 |
ef317cd5 | 7791 | msgid "do not show progress meter" |
07432cef | 7792 | msgstr "不显示进度表" |
ef317cd5 | 7793 | |
814ff314 | 7794 | #: builtin/pack-objects.c:2623 |
ef317cd5 | 7795 | msgid "show progress meter" |
07432cef | 7796 | msgstr "显示进度表" |
ef317cd5 | 7797 | |
814ff314 | 7798 | #: builtin/pack-objects.c:2625 |
ef317cd5 | 7799 | msgid "show progress meter during object writing phase" |
07432cef | 7800 | msgstr "在对象写入阶段显示进度表" |
ef317cd5 | 7801 | |
814ff314 | 7802 | #: builtin/pack-objects.c:2628 |
ef317cd5 | 7803 | msgid "similar to --all-progress when progress meter is shown" |
07432cef | 7804 | msgstr "当进度表显示时类似于 --all-progress" |
ef317cd5 | 7805 | |
814ff314 | 7806 | #: builtin/pack-objects.c:2629 |
ef317cd5 | 7807 | msgid "version[,offset]" |
07432cef | 7808 | msgstr "版本[,偏移]" |
ef317cd5 | 7809 | |
814ff314 | 7810 | #: builtin/pack-objects.c:2630 |
ef317cd5 | 7811 | msgid "write the pack index file in the specified idx format version" |
07432cef | 7812 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 7813 | |
814ff314 | 7814 | #: builtin/pack-objects.c:2633 |
ef317cd5 | 7815 | msgid "maximum size of each output pack file" |
07432cef | 7816 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 7817 | |
814ff314 | 7818 | #: builtin/pack-objects.c:2635 |
ef317cd5 | 7819 | msgid "ignore borrowed objects from alternate object store" |
07432cef | 7820 | msgstr "忽略从替代对象存储里借用对象" |
ef317cd5 | 7821 | |
814ff314 | 7822 | #: builtin/pack-objects.c:2637 |
ef317cd5 | 7823 | msgid "ignore packed objects" |
07432cef | 7824 | msgstr "忽略包对象" |
ef317cd5 | 7825 | |
814ff314 | 7826 | #: builtin/pack-objects.c:2639 |
ef317cd5 | 7827 | msgid "limit pack window by objects" |
07432cef | 7828 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 7829 | |
814ff314 | 7830 | #: builtin/pack-objects.c:2641 |
ef317cd5 | 7831 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 7832 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 7833 | |
814ff314 | 7834 | #: builtin/pack-objects.c:2643 |
ef317cd5 | 7835 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 7836 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 7837 | |
814ff314 | 7838 | #: builtin/pack-objects.c:2645 |
ef317cd5 | 7839 | msgid "reuse existing deltas" |
07432cef | 7840 | msgstr "重用已存在的 deltas" |
ef317cd5 | 7841 | |
814ff314 | 7842 | #: builtin/pack-objects.c:2647 |
ef317cd5 | 7843 | msgid "reuse existing objects" |
07432cef | 7844 | msgstr "重用已存在的对象" |
ef317cd5 | 7845 | |
814ff314 | 7846 | #: builtin/pack-objects.c:2649 |
ef317cd5 | 7847 | msgid "use OFS_DELTA objects" |
07432cef | 7848 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 7849 | |
814ff314 | 7850 | #: builtin/pack-objects.c:2651 |
ef317cd5 | 7851 | msgid "use threads when searching for best delta matches" |
07432cef | 7852 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 7853 | |
814ff314 | 7854 | #: builtin/pack-objects.c:2653 |
ef317cd5 | 7855 | msgid "do not create an empty pack output" |
07432cef | 7856 | msgstr "不创建空的包输出" |
ef317cd5 | 7857 | |
814ff314 | 7858 | #: builtin/pack-objects.c:2655 |
ef317cd5 | 7859 | msgid "read revision arguments from standard input" |
d9d56b23 | 7860 | msgstr "从标准输入读取版本号参数" |
ef317cd5 | 7861 | |
814ff314 | 7862 | #: builtin/pack-objects.c:2657 |
ef317cd5 | 7863 | msgid "limit the objects to those that are not yet packed" |
07432cef | 7864 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 7865 | |
814ff314 | 7866 | #: builtin/pack-objects.c:2660 |
ef317cd5 | 7867 | msgid "include objects reachable from any reference" |
07432cef | 7868 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 7869 | |
814ff314 | 7870 | #: builtin/pack-objects.c:2663 |
ef317cd5 | 7871 | msgid "include objects referred by reflog entries" |
07432cef | 7872 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 7873 | |
814ff314 | 7874 | #: builtin/pack-objects.c:2666 |
220c313c JX |
7875 | msgid "include objects referred to by the index" |
7876 | msgstr "包括被索引引用到的对象" | |
7877 | ||
814ff314 | 7878 | #: builtin/pack-objects.c:2669 |
ef317cd5 | 7879 | msgid "output pack to stdout" |
07432cef | 7880 | msgstr "输出包到标准输出" |
ef317cd5 | 7881 | |
814ff314 | 7882 | #: builtin/pack-objects.c:2671 |
ef317cd5 | 7883 | msgid "include tag objects that refer to objects to be packed" |
07432cef | 7884 | msgstr "包括引用了打包对象的 tag" |
ef317cd5 | 7885 | |
814ff314 | 7886 | #: builtin/pack-objects.c:2673 |
ef317cd5 | 7887 | msgid "keep unreachable objects" |
07432cef | 7888 | msgstr "维持不可达的对象" |
ef317cd5 | 7889 | |
814ff314 | 7890 | #: builtin/pack-objects.c:2674 parse-options.h:140 |
ef317cd5 JX |
7891 | msgid "time" |
7892 | msgstr "时间" | |
7893 | ||
814ff314 | 7894 | #: builtin/pack-objects.c:2675 |
ef317cd5 | 7895 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 7896 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 7897 | |
814ff314 | 7898 | #: builtin/pack-objects.c:2678 |
ef317cd5 | 7899 | msgid "create thin packs" |
07432cef | 7900 | msgstr "创建精简包" |
ef317cd5 | 7901 | |
814ff314 | 7902 | #: builtin/pack-objects.c:2680 |
04cb2f28 JX |
7903 | msgid "create packs suitable for shallow fetches" |
7904 | msgstr "创建适合浅克隆版本库获取的包" | |
7905 | ||
814ff314 | 7906 | #: builtin/pack-objects.c:2682 |
ef317cd5 | 7907 | msgid "ignore packs that have companion .keep file" |
07432cef | 7908 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 7909 | |
814ff314 | 7910 | #: builtin/pack-objects.c:2684 |
ef317cd5 | 7911 | msgid "pack compression level" |
07432cef | 7912 | msgstr "打包压缩级别" |
ef317cd5 | 7913 | |
814ff314 | 7914 | #: builtin/pack-objects.c:2686 |
ef317cd5 | 7915 | msgid "do not hide commits by grafts" |
cfff71a9 | 7916 | msgstr "显示被嫁接隐藏的提交" |
ef317cd5 | 7917 | |
814ff314 | 7918 | #: builtin/pack-objects.c:2688 |
6c94aba5 JX |
7919 | msgid "use a bitmap index if available to speed up counting objects" |
7920 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" | |
7921 | ||
814ff314 | 7922 | #: builtin/pack-objects.c:2690 |
6c94aba5 JX |
7923 | msgid "write a bitmap index together with the pack index" |
7924 | msgstr "在建立包索引的同时创建 bitmap 索引" | |
7925 | ||
814ff314 | 7926 | #: builtin/pack-objects.c:2781 |
6c94aba5 JX |
7927 | msgid "Counting objects" |
7928 | msgstr "对象计数中" | |
7929 | ||
ef317cd5 | 7930 | #: builtin/pack-refs.c:6 |
814ff314 JX |
7931 | msgid "git pack-refs [<options>]" |
7932 | msgstr "git pack-refs [<选项>]" | |
c04f5ac3 | 7933 | |
ef317cd5 JX |
7934 | #: builtin/pack-refs.c:14 |
7935 | msgid "pack everything" | |
07432cef | 7936 | msgstr "打包一切" |
c04f5ac3 | 7937 | |
ef317cd5 JX |
7938 | #: builtin/pack-refs.c:15 |
7939 | msgid "prune loose refs (default)" | |
07432cef | 7940 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 7941 | |
ef317cd5 | 7942 | #: builtin/prune-packed.c:7 |
814ff314 JX |
7943 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
7944 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
6792b93b | 7945 | |
220c313c | 7946 | #: builtin/prune-packed.c:40 |
6c94aba5 JX |
7947 | msgid "Removing duplicate objects" |
7948 | msgstr "正在删除重复对象" | |
7949 | ||
ef317cd5 JX |
7950 | #: builtin/prune.c:12 |
7951 | msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" | |
07432cef | 7952 | msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" |
7ac1c0ad | 7953 | |
220c313c | 7954 | #: builtin/prune.c:106 |
ef317cd5 | 7955 | msgid "do not remove, show only" |
07432cef | 7956 | msgstr "不删除,只显示" |
7ac1c0ad | 7957 | |
220c313c | 7958 | #: builtin/prune.c:107 |
ef317cd5 | 7959 | msgid "report pruned objects" |
07432cef | 7960 | msgstr "报告清除的对象" |
7ac1c0ad | 7961 | |
220c313c | 7962 | #: builtin/prune.c:110 |
ef317cd5 | 7963 | msgid "expire objects older than <time>" |
07432cef | 7964 | msgstr "使早于给定时间的对象过期" |
ef317cd5 JX |
7965 | |
7966 | #: builtin/push.c:14 | |
ef317cd5 | 7967 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
90314792 | 7968 | msgstr "git push [<选项>] [<版本库> [<引用规则>...]]" |
7ac1c0ad | 7969 | |
6c94aba5 | 7970 | #: builtin/push.c:85 |
c04f5ac3 | 7971 | msgid "tag shorthand without <tag>" |
d9d56b23 | 7972 | msgstr "tag 后面未提供 <标签> 参数" |
c04f5ac3 | 7973 | |
6c94aba5 | 7974 | #: builtin/push.c:95 |
c04f5ac3 | 7975 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 7976 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 7977 | |
6acbf033 | 7978 | #: builtin/push.c:139 |
8ada9598 JX |
7979 | msgid "" |
7980 | "\n" | |
7981 | "To choose either option permanently, see push.default in 'git help config'." | |
7982 | msgstr "" | |
81809b99 JX |
7983 | "\n" |
7984 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 7985 | |
6acbf033 | 7986 | #: builtin/push.c:142 |
8ada9598 JX |
7987 | #, c-format |
7988 | msgid "" | |
7989 | "The upstream branch of your current branch does not match\n" | |
7990 | "the name of your current branch. To push to the upstream branch\n" | |
7991 | "on the remote, use\n" | |
7992 | "\n" | |
7993 | " git push %s HEAD:%s\n" | |
7994 | "\n" | |
7995 | "To push to the branch of the same name on the remote, use\n" | |
7996 | "\n" | |
7997 | " git push %s %s\n" | |
7998 | "%s" | |
7999 | msgstr "" | |
81809b99 JX |
8000 | "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n" |
8001 | "上游分支,使用\n" | |
8002 | "\n" | |
8003 | " git push %s HEAD:%s\n" | |
8004 | "\n" | |
8005 | "为推送至远程同名分支,使用\n" | |
8006 | "\n" | |
8007 | " git push %s %s\n" | |
8008 | "%s" | |
8ada9598 | 8009 | |
6acbf033 | 8010 | #: builtin/push.c:157 |
c04f5ac3 JX |
8011 | #, c-format |
8012 | msgid "" | |
8013 | "You are not currently on a branch.\n" | |
8014 | "To push the history leading to the current (detached HEAD)\n" | |
8015 | "state now, use\n" | |
8016 | "\n" | |
8017 | " git push %s HEAD:<name-of-remote-branch>\n" | |
8018 | msgstr "" | |
8019 | "您当前不在一个分支上。\n" | |
90e6ef53 | 8020 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 | 8021 | "\n" |
d9d56b23 | 8022 | " git push %s HEAD:<远程分支名字>\n" |
c04f5ac3 | 8023 | |
6acbf033 | 8024 | #: builtin/push.c:171 |
c04f5ac3 JX |
8025 | #, c-format |
8026 | msgid "" | |
8027 | "The current branch %s has no upstream branch.\n" | |
8028 | "To push the current branch and set the remote as upstream, use\n" | |
8029 | "\n" | |
8030 | " git push --set-upstream %s %s\n" | |
8031 | msgstr "" | |
8032 | "当前分支 %s 没有对应的上游分支。\n" | |
8033 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
8034 | "\n" | |
8035 | " git push --set-upstream %s %s\n" | |
8036 | ||
6acbf033 | 8037 | #: builtin/push.c:179 |
c04f5ac3 JX |
8038 | #, c-format |
8039 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
8040 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
8041 | ||
6acbf033 | 8042 | #: builtin/push.c:182 |
73a60cd2 JX |
8043 | #, c-format |
8044 | msgid "" | |
8045 | "You are pushing to remote '%s', which is not the upstream of\n" | |
8046 | "your current branch '%s', without telling me what to push\n" | |
8047 | "to update which remote branch." | |
8048 | msgstr "" | |
8049 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
8050 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
8051 | ||
c160d03f | 8052 | # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短 |
6acbf033 | 8053 | #: builtin/push.c:205 |
c160d03f | 8054 | msgid "" |
6c94aba5 | 8055 | "push.default is unset; its implicit value has changed in\n" |
c160d03f | 8056 | "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" |
6c94aba5 | 8057 | "and maintain the traditional behavior, use:\n" |
c160d03f JX |
8058 | "\n" |
8059 | " git config --global push.default matching\n" | |
8060 | "\n" | |
8061 | "To squelch this message and adopt the new behavior now, use:\n" | |
8062 | "\n" | |
8063 | " git config --global push.default simple\n" | |
8064 | "\n" | |
cfff71a9 JX |
8065 | "When push.default is set to 'matching', git will push local branches\n" |
8066 | "to the remote branches that already exist with the same name.\n" | |
8067 | "\n" | |
6c94aba5 | 8068 | "Since Git 2.0, Git defaults to the more conservative 'simple'\n" |
cfff71a9 JX |
8069 | "behavior, which only pushes the current branch to the corresponding\n" |
8070 | "remote branch that 'git pull' uses to update the current branch.\n" | |
8071 | "\n" | |
c160d03f JX |
8072 | "See 'git help config' and search for 'push.default' for further " |
8073 | "information.\n" | |
8074 | "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" | |
8075 | "'current' instead of 'simple' if you sometimes use older versions of Git)" | |
8076 | msgstr "" | |
6c94aba5 | 8077 | "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n" |
cfff71a9 | 8078 | "变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n" |
c160d03f JX |
8079 | "\n" |
8080 | " git config --global push.default matching\n" | |
8081 | "\n" | |
8082 | "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n" | |
8083 | "\n" | |
8084 | " git config --global push.default simple\n" | |
8085 | "\n" | |
cfff71a9 JX |
8086 | "当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n" |
8087 | "本地分支。\n" | |
8088 | "\n" | |
8089 | "从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n" | |
8090 | "分支到远程关联的同名分支,即 'git push' 推送当前分支。\n" | |
8091 | "\n" | |
c160d03f JX |
8092 | "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n" |
8093 | "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n" | |
90314792 | 8094 | "为保持兼容,请用 'current' 代替 'simple')" |
c160d03f | 8095 | |
6acbf033 | 8096 | #: builtin/push.c:272 |
c04f5ac3 JX |
8097 | msgid "" |
8098 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
90314792 | 8099 | msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 8100 | |
6acbf033 | 8101 | #: builtin/push.c:279 |
170e9899 JX |
8102 | msgid "" |
8103 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
8104 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
8105 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
8106 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
8107 | msgstr "" | |
eff6d3a9 | 8108 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 8109 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 8110 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 8111 | |
6acbf033 | 8112 | #: builtin/push.c:285 |
170e9899 JX |
8113 | msgid "" |
8114 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
8115 | "counterpart. Check out this branch and integrate the remote changes\n" |
8116 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
8117 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
8118 | msgstr "" | |
eff6d3a9 | 8119 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 8120 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 8121 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 8122 | |
6acbf033 | 8123 | #: builtin/push.c:291 |
07432cef | 8124 | msgid "" |
a77c07d9 JX |
8125 | "Updates were rejected because the remote contains work that you do\n" |
8126 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
8127 | "to the same ref. You may want to first integrate the remote changes\n" |
8128 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
8129 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
8130 | msgstr "" | |
8131 | "更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n" | |
2e8451e8 JX |
8132 | "一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" |
8133 | "(如 'git pull ...')。\n" | |
a77c07d9 JX |
8134 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
8135 | ||
6acbf033 | 8136 | #: builtin/push.c:298 |
a77c07d9 JX |
8137 | msgid "Updates were rejected because the tag already exists in the remote." |
8138 | msgstr "更新被拒绝因为 tag 在远程已经存在。" | |
8139 | ||
6acbf033 | 8140 | #: builtin/push.c:301 |
a77c07d9 JX |
8141 | msgid "" |
8142 | "You cannot update a remote ref that points at a non-commit object,\n" | |
8143 | "or update a remote ref to make it point at a non-commit object,\n" | |
8144 | "without using the '--force' option.\n" | |
8145 | msgstr "" | |
8146 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
8147 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 8148 | |
6acbf033 | 8149 | #: builtin/push.c:360 |
c04f5ac3 JX |
8150 | #, c-format |
8151 | msgid "Pushing to %s\n" | |
8152 | msgstr "推送到 %s\n" | |
8153 | ||
6acbf033 | 8154 | #: builtin/push.c:364 |
c04f5ac3 JX |
8155 | #, c-format |
8156 | msgid "failed to push some refs to '%s'" | |
8157 | msgstr "无法推送一些引用到 '%s'" | |
8158 | ||
6acbf033 | 8159 | #: builtin/push.c:394 |
c04f5ac3 JX |
8160 | #, c-format |
8161 | msgid "bad repository '%s'" | |
90e6ef53 | 8162 | msgstr "坏的版本库 '%s'" |
c04f5ac3 | 8163 | |
6acbf033 | 8164 | #: builtin/push.c:395 |
c04f5ac3 JX |
8165 | msgid "" |
8166 | "No configured push destination.\n" | |
8167 | "Either specify the URL from the command-line or configure a remote " | |
8168 | "repository using\n" | |
8169 | "\n" | |
8170 | " git remote add <name> <url>\n" | |
8171 | "\n" | |
8172 | "and then push using the remote name\n" | |
8173 | "\n" | |
8174 | " git push <name>\n" | |
8175 | msgstr "" | |
90e6ef53 | 8176 | "没有配置推送目标。\n" |
07432cef | 8177 | "或通过命令行指定URL,或用下面命令配置一个远程版本库\n" |
c04f5ac3 | 8178 | "\n" |
d9d56b23 | 8179 | " git remote add <名称> <地址>\n" |
c04f5ac3 JX |
8180 | "\n" |
8181 | "然后使用该远程版本库名执行推送\n" | |
8182 | "\n" | |
d9d56b23 | 8183 | " git push <名称>\n" |
c04f5ac3 | 8184 | |
6acbf033 | 8185 | #: builtin/push.c:410 |
c04f5ac3 JX |
8186 | msgid "--all and --tags are incompatible" |
8187 | msgstr "--all 和 --tags 不兼容" | |
8188 | ||
6acbf033 | 8189 | #: builtin/push.c:411 |
c04f5ac3 | 8190 | msgid "--all can't be combined with refspecs" |
90314792 | 8191 | msgstr "--all 不能和引用规则同时使用" |
c04f5ac3 | 8192 | |
6acbf033 | 8193 | #: builtin/push.c:416 |
c04f5ac3 JX |
8194 | msgid "--mirror and --tags are incompatible" |
8195 | msgstr "--mirror 和 --tags 不兼容" | |
8196 | ||
6acbf033 | 8197 | #: builtin/push.c:417 |
c04f5ac3 | 8198 | msgid "--mirror can't be combined with refspecs" |
90314792 | 8199 | msgstr "--mirror 不能和引用规则同时使用" |
c04f5ac3 | 8200 | |
6acbf033 | 8201 | #: builtin/push.c:422 |
c04f5ac3 JX |
8202 | msgid "--all and --mirror are incompatible" |
8203 | msgstr "--all 和 --mirror 不兼容" | |
8204 | ||
814ff314 | 8205 | #: builtin/push.c:502 |
ef317cd5 | 8206 | msgid "repository" |
07432cef | 8207 | msgstr "版本库" |
ef317cd5 | 8208 | |
814ff314 | 8209 | #: builtin/push.c:503 |
ef317cd5 | 8210 | msgid "push all refs" |
07432cef | 8211 | msgstr "推送所有引用" |
ef317cd5 | 8212 | |
814ff314 | 8213 | #: builtin/push.c:504 |
ef317cd5 | 8214 | msgid "mirror all refs" |
07432cef | 8215 | msgstr "镜像所有引用" |
ef317cd5 | 8216 | |
814ff314 | 8217 | #: builtin/push.c:506 |
ef317cd5 | 8218 | msgid "delete refs" |
07432cef | 8219 | msgstr "删除引用" |
ef317cd5 | 8220 | |
814ff314 | 8221 | #: builtin/push.c:507 |
ef317cd5 | 8222 | msgid "push tags (can't be used with --all or --mirror)" |
07432cef | 8223 | msgstr "推送 tags(不能使用 --all or --mirror)" |
ef317cd5 | 8224 | |
814ff314 | 8225 | #: builtin/push.c:510 |
ef317cd5 JX |
8226 | msgid "force updates" |
8227 | msgstr "强制更新" | |
8228 | ||
814ff314 | 8229 | #: builtin/push.c:512 |
90314792 JX |
8230 | msgid "refname>:<expect" |
8231 | msgstr "引用名>:<期望值" | |
8232 | ||
814ff314 | 8233 | #: builtin/push.c:513 |
90314792 JX |
8234 | msgid "require old value of ref to be at this value" |
8235 | msgstr "要求引用旧的取值为设定值" | |
8236 | ||
814ff314 | 8237 | #: builtin/push.c:516 |
ef317cd5 | 8238 | msgid "control recursive pushing of submodules" |
07432cef | 8239 | msgstr "控制子模组的递归推送" |
ef317cd5 | 8240 | |
814ff314 | 8241 | #: builtin/push.c:518 |
ef317cd5 | 8242 | msgid "use thin pack" |
07432cef | 8243 | msgstr "使用精简打包" |
ef317cd5 | 8244 | |
814ff314 | 8245 | #: builtin/push.c:519 builtin/push.c:520 |
ef317cd5 | 8246 | msgid "receive pack program" |
07432cef | 8247 | msgstr "接收包程序" |
ef317cd5 | 8248 | |
814ff314 | 8249 | #: builtin/push.c:521 |
ef317cd5 | 8250 | msgid "set upstream for git pull/status" |
07432cef | 8251 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 8252 | |
814ff314 | 8253 | #: builtin/push.c:524 |
ef317cd5 | 8254 | msgid "prune locally removed refs" |
07432cef | 8255 | msgstr "清除本地删除的引用" |
ef317cd5 | 8256 | |
814ff314 | 8257 | #: builtin/push.c:526 |
a77c07d9 JX |
8258 | msgid "bypass pre-push hook" |
8259 | msgstr "绕过 pre-push 钩子" | |
8260 | ||
814ff314 | 8261 | #: builtin/push.c:527 |
1003b3a5 JX |
8262 | msgid "push missing but relevant tags" |
8263 | msgstr "推送缺失的有关的 tags" | |
8264 | ||
814ff314 | 8265 | #: builtin/push.c:529 |
220c313c JX |
8266 | msgid "GPG sign the push" |
8267 | msgstr "用 GPG 为推送签名" | |
8268 | ||
814ff314 JX |
8269 | #: builtin/push.c:530 |
8270 | msgid "request atomic transaction on remote side" | |
8271 | msgstr "需要远端支持原子事务" | |
8272 | ||
8273 | #: builtin/push.c:539 | |
c04f5ac3 JX |
8274 | msgid "--delete is incompatible with --all, --mirror and --tags" |
8275 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
8276 | ||
814ff314 | 8277 | #: builtin/push.c:541 |
c04f5ac3 JX |
8278 | msgid "--delete doesn't make sense without any refs" |
8279 | msgstr "--delete 未接任何引用没有意义" | |
8280 | ||
220c313c | 8281 | #: builtin/read-tree.c:37 |
ef317cd5 JX |
8282 | msgid "" |
8283 | "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " | |
8284 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" | |
8285 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
8286 | msgstr "" | |
07432cef WS |
8287 | "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-" |
8288 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" | |
8289 | "index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])" | |
ef317cd5 | 8290 | |
220c313c | 8291 | #: builtin/read-tree.c:110 |
ef317cd5 | 8292 | msgid "write resulting index to <file>" |
d9d56b23 | 8293 | msgstr "将索引结果写入 <文件>" |
ef317cd5 | 8294 | |
220c313c | 8295 | #: builtin/read-tree.c:113 |
ef317cd5 | 8296 | msgid "only empty the index" |
07432cef | 8297 | msgstr "只是清空索引" |
ef317cd5 | 8298 | |
220c313c | 8299 | #: builtin/read-tree.c:115 |
ef317cd5 | 8300 | msgid "Merging" |
07432cef | 8301 | msgstr "合并" |
ef317cd5 | 8302 | |
220c313c | 8303 | #: builtin/read-tree.c:117 |
ef317cd5 | 8304 | msgid "perform a merge in addition to a read" |
07432cef | 8305 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 8306 | |
220c313c | 8307 | #: builtin/read-tree.c:119 |
ef317cd5 | 8308 | msgid "3-way merge if no file level merging required" |
07432cef | 8309 | msgstr "如果没有文件级合并需要,执行三路合并" |
ef317cd5 | 8310 | |
220c313c | 8311 | #: builtin/read-tree.c:121 |
ef317cd5 | 8312 | msgid "3-way merge in presence of adds and removes" |
07432cef | 8313 | msgstr "存在添加和删除时,也执行三路合并" |
ef317cd5 | 8314 | |
220c313c | 8315 | #: builtin/read-tree.c:123 |
ef317cd5 | 8316 | msgid "same as -m, but discard unmerged entries" |
07432cef | 8317 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 8318 | |
220c313c | 8319 | #: builtin/read-tree.c:124 |
ef317cd5 | 8320 | msgid "<subdirectory>/" |
07432cef | 8321 | msgstr "<子目录>/" |
ef317cd5 | 8322 | |
220c313c | 8323 | #: builtin/read-tree.c:125 |
ef317cd5 | 8324 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 8325 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 8326 | |
220c313c | 8327 | #: builtin/read-tree.c:128 |
ef317cd5 | 8328 | msgid "update working tree with merge result" |
07432cef | 8329 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 8330 | |
220c313c | 8331 | #: builtin/read-tree.c:130 |
ef317cd5 | 8332 | msgid "gitignore" |
07432cef | 8333 | msgstr "gitignore" |
ef317cd5 | 8334 | |
220c313c | 8335 | #: builtin/read-tree.c:131 |
ef317cd5 | 8336 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 8337 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 8338 | |
220c313c | 8339 | #: builtin/read-tree.c:134 |
ef317cd5 | 8340 | msgid "don't check the working tree after merging" |
07432cef | 8341 | msgstr "合并后不检查工作区" |
ef317cd5 | 8342 | |
220c313c | 8343 | #: builtin/read-tree.c:135 |
ef317cd5 | 8344 | msgid "don't update the index or the work tree" |
07432cef | 8345 | msgstr "不更新索引区和工作区" |
ef317cd5 | 8346 | |
220c313c | 8347 | #: builtin/read-tree.c:137 |
ef317cd5 | 8348 | msgid "skip applying sparse checkout filter" |
07432cef | 8349 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 8350 | |
220c313c | 8351 | #: builtin/read-tree.c:139 |
ef317cd5 | 8352 | msgid "debug unpack-trees" |
07432cef | 8353 | msgstr "调试 unpack-trees" |
ef317cd5 | 8354 | |
814ff314 | 8355 | #: builtin/reflog.c:429 |
2e8451e8 JX |
8356 | #, c-format |
8357 | msgid "%s' for '%s' is not a valid timestamp" | |
8358 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" | |
8359 | ||
814ff314 | 8360 | #: builtin/reflog.c:546 builtin/reflog.c:551 |
2e8451e8 JX |
8361 | #, c-format |
8362 | msgid "'%s' is not a valid timestamp" | |
8363 | msgstr "'%s' 不是一个有效的时间戳" | |
8364 | ||
cfff71a9 | 8365 | #: builtin/remote.c:12 |
ef317cd5 | 8366 | msgid "git remote [-v | --verbose]" |
07432cef | 8367 | msgstr "git remote [-v | --verbose]" |
ef317cd5 | 8368 | |
cfff71a9 | 8369 | #: builtin/remote.c:13 |
ef317cd5 | 8370 | msgid "" |
814ff314 | 8371 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
ef317cd5 JX |
8372 | "mirror=<fetch|push>] <name> <url>" |
8373 | msgstr "" | |
814ff314 | 8374 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" |
d9d56b23 | 8375 | "mirror=<fetch|push>] <名称> <地址>" |
ef317cd5 | 8376 | |
cfff71a9 | 8377 | #: builtin/remote.c:14 builtin/remote.c:33 |
ef317cd5 | 8378 | msgid "git remote rename <old> <new>" |
07432cef | 8379 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 | 8380 | |
cfff71a9 | 8381 | #: builtin/remote.c:15 builtin/remote.c:38 |
ef317cd5 | 8382 | msgid "git remote remove <name>" |
07432cef | 8383 | msgstr "git remote remove <名称>" |
ef317cd5 | 8384 | |
814ff314 JX |
8385 | #: builtin/remote.c:16 builtin/remote.c:43 |
8386 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" | |
8387 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
ef317cd5 | 8388 | |
cfff71a9 | 8389 | #: builtin/remote.c:17 |
ef317cd5 | 8390 | msgid "git remote [-v | --verbose] show [-n] <name>" |
07432cef | 8391 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 | 8392 | |
cfff71a9 | 8393 | #: builtin/remote.c:18 |
ef317cd5 | 8394 | msgid "git remote prune [-n | --dry-run] <name>" |
07432cef | 8395 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 | 8396 | |
cfff71a9 | 8397 | #: builtin/remote.c:19 |
ef317cd5 JX |
8398 | msgid "" |
8399 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 8400 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 | 8401 | |
cfff71a9 | 8402 | #: builtin/remote.c:20 |
ef317cd5 | 8403 | msgid "git remote set-branches [--add] <name> <branch>..." |
07432cef | 8404 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 | 8405 | |
cfff71a9 | 8406 | #: builtin/remote.c:21 builtin/remote.c:69 |
ef317cd5 | 8407 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
07432cef | 8408 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 | 8409 | |
cfff71a9 | 8410 | #: builtin/remote.c:22 builtin/remote.c:70 |
ef317cd5 | 8411 | msgid "git remote set-url --add <name> <newurl>" |
07432cef | 8412 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 | 8413 | |
cfff71a9 | 8414 | #: builtin/remote.c:23 builtin/remote.c:71 |
ef317cd5 | 8415 | msgid "git remote set-url --delete <name> <url>" |
07432cef | 8416 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 | 8417 | |
cfff71a9 | 8418 | #: builtin/remote.c:28 |
ef317cd5 | 8419 | msgid "git remote add [<options>] <name> <url>" |
07432cef | 8420 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 8421 | |
cfff71a9 | 8422 | #: builtin/remote.c:48 |
ef317cd5 | 8423 | msgid "git remote set-branches <name> <branch>..." |
07432cef | 8424 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 | 8425 | |
cfff71a9 | 8426 | #: builtin/remote.c:49 |
ef317cd5 | 8427 | msgid "git remote set-branches --add <name> <branch>..." |
07432cef | 8428 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 | 8429 | |
cfff71a9 | 8430 | #: builtin/remote.c:54 |
ef317cd5 | 8431 | msgid "git remote show [<options>] <name>" |
07432cef | 8432 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 | 8433 | |
cfff71a9 | 8434 | #: builtin/remote.c:59 |
ef317cd5 | 8435 | msgid "git remote prune [<options>] <name>" |
07432cef | 8436 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 | 8437 | |
cfff71a9 | 8438 | #: builtin/remote.c:64 |
ef317cd5 | 8439 | msgid "git remote update [<options>] [<group> | <remote>]..." |
07432cef | 8440 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 8441 | |
cfff71a9 | 8442 | #: builtin/remote.c:88 |
81809b99 | 8443 | #, c-format |
8ada9598 | 8444 | msgid "Updating %s" |
81809b99 | 8445 | msgstr "更新 %s 中" |
8ada9598 | 8446 | |
cfff71a9 | 8447 | #: builtin/remote.c:120 |
8ada9598 JX |
8448 | msgid "" |
8449 | "--mirror is dangerous and deprecated; please\n" | |
8450 | "\t use --mirror=fetch or --mirror=push instead" | |
8451 | msgstr "" | |
81809b99 JX |
8452 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
8453 | "\t 或 --mirror=push" | |
8ada9598 | 8454 | |
cfff71a9 | 8455 | #: builtin/remote.c:137 |
81809b99 | 8456 | #, c-format |
8ada9598 | 8457 | msgid "unknown mirror argument: %s" |
81809b99 | 8458 | msgstr "未知的镜像参数:%s" |
8ada9598 | 8459 | |
cfff71a9 | 8460 | #: builtin/remote.c:153 |
ef317cd5 | 8461 | msgid "fetch the remote branches" |
07432cef | 8462 | msgstr "抓取远程的分支" |
ef317cd5 | 8463 | |
cfff71a9 | 8464 | #: builtin/remote.c:155 |
ef317cd5 | 8465 | msgid "import all tags and associated objects when fetching" |
07432cef | 8466 | msgstr "抓取时导入所有的 tags 和关联对象" |
ef317cd5 | 8467 | |
cfff71a9 | 8468 | #: builtin/remote.c:158 |
ef317cd5 | 8469 | msgid "or do not fetch any tag at all (--no-tags)" |
07432cef | 8470 | msgstr "或不抓取任何 tag(--no-tags)" |
ef317cd5 | 8471 | |
cfff71a9 | 8472 | #: builtin/remote.c:160 |
ef317cd5 | 8473 | msgid "branch(es) to track" |
07432cef | 8474 | msgstr "跟踪的分支" |
ef317cd5 | 8475 | |
cfff71a9 | 8476 | #: builtin/remote.c:161 |
ef317cd5 | 8477 | msgid "master branch" |
07432cef | 8478 | msgstr "主线分支" |
ef317cd5 | 8479 | |
cfff71a9 | 8480 | #: builtin/remote.c:162 |
ef317cd5 | 8481 | msgid "push|fetch" |
07432cef | 8482 | msgstr "push|fetch" |
ef317cd5 | 8483 | |
cfff71a9 | 8484 | #: builtin/remote.c:163 |
ef317cd5 | 8485 | msgid "set up remote as a mirror to push to or fetch from" |
07432cef | 8486 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 8487 | |
cfff71a9 | 8488 | #: builtin/remote.c:175 |
8ada9598 | 8489 | msgid "specifying a master branch makes no sense with --mirror" |
81809b99 | 8490 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 | 8491 | |
cfff71a9 | 8492 | #: builtin/remote.c:177 |
8ada9598 | 8493 | msgid "specifying branches to track makes sense only with fetch mirrors" |
649900bc | 8494 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 | 8495 | |
d9d56b23 | 8496 | #: builtin/remote.c:187 builtin/remote.c:643 |
81809b99 | 8497 | #, c-format |
8ada9598 | 8498 | msgid "remote %s already exists." |
81809b99 | 8499 | msgstr "远程 %s 已经存在。" |
8ada9598 | 8500 | |
d9d56b23 | 8501 | #: builtin/remote.c:191 builtin/remote.c:647 |
81809b99 | 8502 | #, c-format |
8ada9598 | 8503 | msgid "'%s' is not a valid remote name" |
81809b99 | 8504 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 | 8505 | |
d9d56b23 | 8506 | #: builtin/remote.c:235 |
81809b99 | 8507 | #, c-format |
8ada9598 | 8508 | msgid "Could not setup master '%s'" |
81809b99 | 8509 | msgstr "无法设置 master '%s'" |
8ada9598 | 8510 | |
d9d56b23 | 8511 | #: builtin/remote.c:335 |
81809b99 | 8512 | #, c-format |
8ada9598 | 8513 | msgid "Could not get fetch map for refspec %s" |
90314792 | 8514 | msgstr "无法得到引用规则 %s 的获取列表" |
8ada9598 | 8515 | |
d9d56b23 | 8516 | #: builtin/remote.c:436 builtin/remote.c:444 |
8ada9598 | 8517 | msgid "(matching)" |
81809b99 | 8518 | msgstr "(匹配)" |
8ada9598 | 8519 | |
d9d56b23 | 8520 | #: builtin/remote.c:448 |
8ada9598 | 8521 | msgid "(delete)" |
81809b99 | 8522 | msgstr "(删除)" |
8ada9598 | 8523 | |
d9d56b23 | 8524 | #: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604 |
81809b99 | 8525 | #, c-format |
8ada9598 | 8526 | msgid "Could not append '%s' to '%s'" |
81809b99 | 8527 | msgstr "不能添加 '%s' 至 '%s'" |
8ada9598 | 8528 | |
d9d56b23 | 8529 | #: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895 |
81809b99 | 8530 | #, c-format |
8ada9598 | 8531 | msgid "No such remote: %s" |
81809b99 | 8532 | msgstr "没有这样的远程:%s" |
8ada9598 | 8533 | |
d9d56b23 | 8534 | #: builtin/remote.c:653 |
81809b99 | 8535 | #, c-format |
8ada9598 | 8536 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 8537 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 | 8538 | |
d9d56b23 | 8539 | #: builtin/remote.c:659 builtin/remote.c:847 |
81809b99 | 8540 | #, c-format |
8ada9598 | 8541 | msgid "Could not remove config section '%s'" |
81809b99 | 8542 | msgstr "不能移除配置小节 '%s'" |
8ada9598 | 8543 | |
d9d56b23 | 8544 | #: builtin/remote.c:674 |
8ada9598 JX |
8545 | #, c-format |
8546 | msgid "" | |
d691f479 | 8547 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
8548 | "\t%s\n" |
8549 | "\tPlease update the configuration manually if necessary." | |
8550 | msgstr "" | |
90314792 | 8551 | "没有更新非默认的获取引用规则\n" |
81809b99 JX |
8552 | "\t%s\n" |
8553 | "\t如果必要请手动更新配置。" | |
8ada9598 | 8554 | |
d9d56b23 | 8555 | #: builtin/remote.c:680 |
81809b99 | 8556 | #, c-format |
8ada9598 | 8557 | msgid "Could not append '%s'" |
81809b99 | 8558 | msgstr "不能追加 '%s'" |
8ada9598 | 8559 | |
d9d56b23 | 8560 | #: builtin/remote.c:691 |
81809b99 | 8561 | #, c-format |
8ada9598 | 8562 | msgid "Could not set '%s'" |
81809b99 | 8563 | msgstr "不能设置 '%s'" |
8ada9598 | 8564 | |
d9d56b23 | 8565 | #: builtin/remote.c:713 |
81809b99 | 8566 | #, c-format |
8ada9598 | 8567 | msgid "deleting '%s' failed" |
81809b99 | 8568 | msgstr "删除 '%s' 失败" |
8ada9598 | 8569 | |
d9d56b23 | 8570 | #: builtin/remote.c:747 |
81809b99 | 8571 | #, c-format |
8ada9598 | 8572 | msgid "creating '%s' failed" |
81809b99 | 8573 | msgstr "创建 '%s' 失败" |
8ada9598 | 8574 | |
d9d56b23 | 8575 | #: builtin/remote.c:766 |
81809b99 | 8576 | #, c-format |
8ada9598 | 8577 | msgid "Could not remove branch %s" |
81809b99 | 8578 | msgstr "无法移除分支 %s" |
8ada9598 | 8579 | |
d9d56b23 | 8580 | #: builtin/remote.c:833 |
8ada9598 JX |
8581 | msgid "" |
8582 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
8583 | "to delete it, use:" | |
8584 | msgid_plural "" | |
8585 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
8586 | "to delete them, use:" | |
5ae481e0 JX |
8587 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
8588 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 | 8589 | |
d9d56b23 | 8590 | #: builtin/remote.c:948 |
8ada9598 JX |
8591 | #, c-format |
8592 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 8593 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 | 8594 | |
d9d56b23 | 8595 | #: builtin/remote.c:951 |
8ada9598 | 8596 | msgid " tracked" |
81809b99 | 8597 | msgstr " 已跟踪" |
8ada9598 | 8598 | |
d9d56b23 | 8599 | #: builtin/remote.c:953 |
8ada9598 | 8600 | msgid " stale (use 'git remote prune' to remove)" |
81809b99 | 8601 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 | 8602 | |
d9d56b23 | 8603 | #: builtin/remote.c:955 |
8ada9598 | 8604 | msgid " ???" |
81809b99 | 8605 | msgstr " ???" |
8ada9598 | 8606 | |
d9d56b23 | 8607 | #: builtin/remote.c:996 |
8ada9598 JX |
8608 | #, c-format |
8609 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 8610 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 | 8611 | |
d9d56b23 | 8612 | #: builtin/remote.c:1003 |
81809b99 | 8613 | #, c-format |
8ada9598 | 8614 | msgid "rebases onto remote %s" |
81809b99 | 8615 | msgstr "变基到远程 %s" |
8ada9598 | 8616 | |
d9d56b23 | 8617 | #: builtin/remote.c:1006 |
81809b99 | 8618 | #, c-format |
8ada9598 | 8619 | msgid " merges with remote %s" |
81809b99 | 8620 | msgstr " 与远程 %s 合并" |
8ada9598 | 8621 | |
d9d56b23 | 8622 | #: builtin/remote.c:1007 |
8ada9598 | 8623 | msgid " and with remote" |
81809b99 | 8624 | msgstr " 且有远程" |
8ada9598 | 8625 | |
d9d56b23 | 8626 | #: builtin/remote.c:1009 |
81809b99 | 8627 | #, c-format |
8ada9598 | 8628 | msgid "merges with remote %s" |
81809b99 | 8629 | msgstr "与远程 %s 合并" |
8ada9598 | 8630 | |
d9d56b23 | 8631 | #: builtin/remote.c:1010 |
8ada9598 | 8632 | msgid " and with remote" |
81809b99 | 8633 | msgstr " 且有远程" |
8ada9598 | 8634 | |
d9d56b23 | 8635 | #: builtin/remote.c:1056 |
8ada9598 | 8636 | msgid "create" |
81809b99 | 8637 | msgstr "创建" |
8ada9598 | 8638 | |
d9d56b23 | 8639 | #: builtin/remote.c:1059 |
8ada9598 | 8640 | msgid "delete" |
81809b99 | 8641 | msgstr "删除" |
8ada9598 | 8642 | |
d9d56b23 | 8643 | #: builtin/remote.c:1063 |
8ada9598 | 8644 | msgid "up to date" |
81809b99 | 8645 | msgstr "最新" |
8ada9598 | 8646 | |
d9d56b23 | 8647 | #: builtin/remote.c:1066 |
8ada9598 | 8648 | msgid "fast-forwardable" |
81809b99 | 8649 | msgstr "可快进" |
8ada9598 | 8650 | |
d9d56b23 | 8651 | #: builtin/remote.c:1069 |
8ada9598 | 8652 | msgid "local out of date" |
81809b99 | 8653 | msgstr "本地已过时" |
8ada9598 | 8654 | |
d9d56b23 | 8655 | #: builtin/remote.c:1076 |
8ada9598 JX |
8656 | #, c-format |
8657 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 8658 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 | 8659 | |
d9d56b23 | 8660 | #: builtin/remote.c:1079 |
8ada9598 JX |
8661 | #, c-format |
8662 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 8663 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 | 8664 | |
d9d56b23 | 8665 | #: builtin/remote.c:1083 |
8ada9598 JX |
8666 | #, c-format |
8667 | msgid " %-*s forces to %s" | |
81809b99 | 8668 | msgstr " %-*s 强制推送至 %s" |
8ada9598 | 8669 | |
d9d56b23 | 8670 | #: builtin/remote.c:1086 |
8ada9598 JX |
8671 | #, c-format |
8672 | msgid " %-*s pushes to %s" | |
81809b99 | 8673 | msgstr " %-*s 推送至 %s" |
8ada9598 | 8674 | |
d9d56b23 | 8675 | #: builtin/remote.c:1154 |
ef317cd5 | 8676 | msgid "do not query remotes" |
07432cef | 8677 | msgstr "不查询远程" |
ef317cd5 | 8678 | |
d9d56b23 | 8679 | #: builtin/remote.c:1181 |
81809b99 | 8680 | #, c-format |
8ada9598 | 8681 | msgid "* remote %s" |
81809b99 | 8682 | msgstr "* 远程 %s" |
8ada9598 | 8683 | |
d9d56b23 | 8684 | #: builtin/remote.c:1182 |
8ada9598 JX |
8685 | #, c-format |
8686 | msgid " Fetch URL: %s" | |
81809b99 | 8687 | msgstr " 获取地址:%s" |
8ada9598 | 8688 | |
d9d56b23 | 8689 | #: builtin/remote.c:1183 builtin/remote.c:1334 |
8ada9598 | 8690 | msgid "(no URL)" |
81809b99 | 8691 | msgstr "(无 URL)" |
8ada9598 | 8692 | |
d9d56b23 | 8693 | #: builtin/remote.c:1192 builtin/remote.c:1194 |
8ada9598 JX |
8694 | #, c-format |
8695 | msgid " Push URL: %s" | |
81809b99 | 8696 | msgstr " 推送地址:%s" |
8ada9598 | 8697 | |
d9d56b23 | 8698 | #: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200 |
81809b99 | 8699 | #, c-format |
8ada9598 | 8700 | msgid " HEAD branch: %s" |
81809b99 | 8701 | msgstr " HEAD分支:%s" |
8ada9598 | 8702 | |
d9d56b23 | 8703 | #: builtin/remote.c:1202 |
8ada9598 JX |
8704 | #, c-format |
8705 | msgid "" | |
8706 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 8707 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 | 8708 | |
d9d56b23 | 8709 | #: builtin/remote.c:1214 |
81809b99 | 8710 | #, c-format |
8ada9598 JX |
8711 | msgid " Remote branch:%s" |
8712 | msgid_plural " Remote branches:%s" | |
81809b99 | 8713 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 8714 | msgstr[1] " 远程分支:%s" |
8ada9598 | 8715 | |
81809b99 | 8716 | # 译者:中文字符串拼接,可删除前导空格 |
d9d56b23 | 8717 | #: builtin/remote.c:1217 builtin/remote.c:1244 |
8ada9598 | 8718 | msgid " (status not queried)" |
81809b99 | 8719 | msgstr "(状态未查询)" |
8ada9598 | 8720 | |
d9d56b23 | 8721 | #: builtin/remote.c:1226 |
8ada9598 JX |
8722 | msgid " Local branch configured for 'git pull':" |
8723 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 8724 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 8725 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 | 8726 | |
d9d56b23 | 8727 | #: builtin/remote.c:1234 |
8ada9598 | 8728 | msgid " Local refs will be mirrored by 'git push'" |
81809b99 | 8729 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 | 8730 | |
d9d56b23 | 8731 | #: builtin/remote.c:1241 |
81809b99 | 8732 | #, c-format |
8ada9598 JX |
8733 | msgid " Local ref configured for 'git push'%s:" |
8734 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 8735 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 8736 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 8737 | |
d9d56b23 | 8738 | #: builtin/remote.c:1262 |
ef317cd5 | 8739 | msgid "set refs/remotes/<name>/HEAD according to remote" |
07432cef | 8740 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 | 8741 | |
d9d56b23 | 8742 | #: builtin/remote.c:1264 |
ef317cd5 | 8743 | msgid "delete refs/remotes/<name>/HEAD" |
07432cef | 8744 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 8745 | |
d9d56b23 | 8746 | #: builtin/remote.c:1279 |
8ada9598 | 8747 | msgid "Cannot determine remote HEAD" |
81809b99 | 8748 | msgstr "无法确定远程 HEAD" |
8ada9598 | 8749 | |
d9d56b23 | 8750 | #: builtin/remote.c:1281 |
8ada9598 | 8751 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
81809b99 | 8752 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 | 8753 | |
d9d56b23 | 8754 | #: builtin/remote.c:1291 |
81809b99 | 8755 | #, c-format |
8ada9598 | 8756 | msgid "Could not delete %s" |
81809b99 | 8757 | msgstr "无法删除 %s" |
8ada9598 | 8758 | |
d9d56b23 | 8759 | #: builtin/remote.c:1299 |
81809b99 | 8760 | #, c-format |
8ada9598 | 8761 | msgid "Not a valid ref: %s" |
81809b99 | 8762 | msgstr "不是一个有效引用:%s" |
8ada9598 | 8763 | |
d9d56b23 | 8764 | #: builtin/remote.c:1301 |
81809b99 | 8765 | #, c-format |
8ada9598 | 8766 | msgid "Could not setup %s" |
81809b99 | 8767 | msgstr "不能设置 %s" |
8ada9598 JX |
8768 | |
8769 | # 译者:注意保持前导空格 | |
d9d56b23 | 8770 | #: builtin/remote.c:1319 |
81809b99 | 8771 | #, c-format |
8ada9598 | 8772 | msgid " %s will become dangling!" |
07432cef | 8773 | msgstr " %s 将成为摇摆状态!" |
8ada9598 JX |
8774 | |
8775 | # 译者:注意保持前导空格 | |
d9d56b23 | 8776 | #: builtin/remote.c:1320 |
81809b99 | 8777 | #, c-format |
8ada9598 | 8778 | msgid " %s has become dangling!" |
07432cef | 8779 | msgstr " %s 已成为摇摆状态!" |
8ada9598 | 8780 | |
d9d56b23 | 8781 | #: builtin/remote.c:1330 |
81809b99 | 8782 | #, c-format |
8ada9598 | 8783 | msgid "Pruning %s" |
81809b99 | 8784 | msgstr "修剪 %s" |
8ada9598 | 8785 | |
d9d56b23 | 8786 | #: builtin/remote.c:1331 |
8ada9598 JX |
8787 | #, c-format |
8788 | msgid "URL: %s" | |
81809b99 | 8789 | msgstr "URL:%s" |
8ada9598 | 8790 | |
d9d56b23 | 8791 | #: builtin/remote.c:1354 |
8ada9598 JX |
8792 | #, c-format |
8793 | msgid " * [would prune] %s" | |
81809b99 | 8794 | msgstr " * [将删除] %s" |
8ada9598 | 8795 | |
d9d56b23 | 8796 | #: builtin/remote.c:1357 |
8ada9598 JX |
8797 | #, c-format |
8798 | msgid " * [pruned] %s" | |
81809b99 | 8799 | msgstr " * [已删除] %s" |
8ada9598 | 8800 | |
d9d56b23 | 8801 | #: builtin/remote.c:1402 |
ef317cd5 | 8802 | msgid "prune remotes after fetching" |
07432cef | 8803 | msgstr "抓取后清除远程" |
ef317cd5 | 8804 | |
d9d56b23 | 8805 | #: builtin/remote.c:1468 builtin/remote.c:1542 |
81809b99 | 8806 | #, c-format |
8ada9598 | 8807 | msgid "No such remote '%s'" |
81809b99 | 8808 | msgstr "没有此远程 '%s'" |
8ada9598 | 8809 | |
d9d56b23 | 8810 | #: builtin/remote.c:1488 |
ef317cd5 | 8811 | msgid "add branch" |
07432cef | 8812 | msgstr "添加分支" |
ef317cd5 | 8813 | |
d9d56b23 | 8814 | #: builtin/remote.c:1495 |
8ada9598 | 8815 | msgid "no remote specified" |
81809b99 | 8816 | msgstr "未指定远程" |
8ada9598 | 8817 | |
d9d56b23 | 8818 | #: builtin/remote.c:1517 |
ef317cd5 | 8819 | msgid "manipulate push URLs" |
07432cef | 8820 | msgstr "操作推送 URLS" |
ef317cd5 | 8821 | |
d9d56b23 | 8822 | #: builtin/remote.c:1519 |
ef317cd5 | 8823 | msgid "add URL" |
07432cef | 8824 | msgstr "添加 URL" |
ef317cd5 | 8825 | |
d9d56b23 | 8826 | #: builtin/remote.c:1521 |
ef317cd5 | 8827 | msgid "delete URLs" |
07432cef | 8828 | msgstr "删除 URLS" |
ef317cd5 | 8829 | |
d9d56b23 | 8830 | #: builtin/remote.c:1528 |
8ada9598 | 8831 | msgid "--add --delete doesn't make sense" |
81809b99 | 8832 | msgstr "--add --delete 无意义" |
8ada9598 | 8833 | |
d9d56b23 | 8834 | #: builtin/remote.c:1568 |
81809b99 | 8835 | #, c-format |
8ada9598 | 8836 | msgid "Invalid old URL pattern: %s" |
81809b99 | 8837 | msgstr "无效的旧URL匹配模版:%s" |
8ada9598 | 8838 | |
d9d56b23 | 8839 | #: builtin/remote.c:1576 |
81809b99 | 8840 | #, c-format |
8ada9598 | 8841 | msgid "No such URL found: %s" |
81809b99 | 8842 | msgstr "未找到此URL:%s" |
8ada9598 | 8843 | |
d9d56b23 | 8844 | #: builtin/remote.c:1578 |
8ada9598 | 8845 | msgid "Will not delete all non-push URLs" |
81809b99 | 8846 | msgstr "将不会删除所有非推送URL地址" |
8ada9598 | 8847 | |
d9d56b23 | 8848 | #: builtin/remote.c:1592 |
ef317cd5 | 8849 | msgid "be verbose; must be placed before a subcommand" |
07432cef | 8850 | msgstr "冗长输出;必须置于子命令之前" |
ef317cd5 | 8851 | |
6acbf033 | 8852 | #: builtin/repack.c:17 |
814ff314 JX |
8853 | msgid "git repack [<options>]" |
8854 | msgstr "git repack [<选项>]" | |
90314792 | 8855 | |
04cb2f28 | 8856 | #: builtin/repack.c:159 |
90314792 JX |
8857 | msgid "pack everything in a single pack" |
8858 | msgstr "所有内容打包到一个包文件中" | |
8859 | ||
04cb2f28 | 8860 | #: builtin/repack.c:161 |
90314792 JX |
8861 | msgid "same as -a, and turn unreachable objects loose" |
8862 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
8863 | ||
04cb2f28 | 8864 | #: builtin/repack.c:164 |
90314792 JX |
8865 | msgid "remove redundant packs, and run git-prune-packed" |
8866 | msgstr "删除多余的包,运行 git-prune-packed" | |
8867 | ||
04cb2f28 | 8868 | #: builtin/repack.c:166 |
90314792 JX |
8869 | msgid "pass --no-reuse-delta to git-pack-objects" |
8870 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
8871 | ||
04cb2f28 | 8872 | #: builtin/repack.c:168 |
90314792 JX |
8873 | msgid "pass --no-reuse-object to git-pack-objects" |
8874 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
8875 | ||
04cb2f28 | 8876 | #: builtin/repack.c:170 |
90314792 JX |
8877 | msgid "do not run git-update-server-info" |
8878 | msgstr "不运行 git-update-server-info" | |
8879 | ||
04cb2f28 | 8880 | #: builtin/repack.c:173 |
90314792 JX |
8881 | msgid "pass --local to git-pack-objects" |
8882 | msgstr "向 git-pack-objects 传递参数 --local" | |
8883 | ||
04cb2f28 | 8884 | #: builtin/repack.c:175 |
6c94aba5 JX |
8885 | msgid "write bitmap index" |
8886 | msgstr "写 bitmap 索引" | |
8887 | ||
04cb2f28 | 8888 | #: builtin/repack.c:176 |
90314792 JX |
8889 | msgid "approxidate" |
8890 | msgstr "近似日期" | |
8891 | ||
04cb2f28 | 8892 | #: builtin/repack.c:177 |
90314792 JX |
8893 | msgid "with -A, do not loosen objects older than this" |
8894 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
8895 | ||
04cb2f28 | 8896 | #: builtin/repack.c:179 |
90314792 JX |
8897 | msgid "size of the window used for delta compression" |
8898 | msgstr "用于增量压缩的窗口值" | |
8899 | ||
04cb2f28 | 8900 | #: builtin/repack.c:180 builtin/repack.c:184 |
8376b58d JX |
8901 | msgid "bytes" |
8902 | msgstr "字节" | |
8903 | ||
04cb2f28 | 8904 | #: builtin/repack.c:181 |
90314792 JX |
8905 | msgid "same as the above, but limit memory size instead of entries count" |
8906 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
8907 | ||
04cb2f28 | 8908 | #: builtin/repack.c:183 |
90314792 JX |
8909 | msgid "limits the maximum delta depth" |
8910 | msgstr "限制最大增量深度" | |
8911 | ||
04cb2f28 | 8912 | #: builtin/repack.c:185 |
90314792 JX |
8913 | msgid "maximum size of each packfile" |
8914 | msgstr "每个包的最大尺寸" | |
8915 | ||
04cb2f28 | 8916 | #: builtin/repack.c:187 |
6c94aba5 JX |
8917 | msgid "repack objects in packs marked with .keep" |
8918 | msgstr "对标记为 .keep 的包中的对象重新打包" | |
8919 | ||
814ff314 | 8920 | #: builtin/repack.c:375 |
90314792 JX |
8921 | #, c-format |
8922 | msgid "removing '%s' failed" | |
8923 | msgstr "删除 '%s' 失败" | |
8924 | ||
6acbf033 | 8925 | #: builtin/replace.c:19 |
ef317cd5 | 8926 | msgid "git replace [-f] <object> <replacement>" |
07432cef | 8927 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 | 8928 | |
6acbf033 JX |
8929 | #: builtin/replace.c:20 |
8930 | msgid "git replace [-f] --edit <object>" | |
8931 | msgstr "git replace [-f] --edit <对象>" | |
8932 | ||
8933 | #: builtin/replace.c:21 | |
8934 | msgid "git replace [-f] --graft <commit> [<parent>...]" | |
8935 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" | |
8936 | ||
8937 | #: builtin/replace.c:22 | |
ef317cd5 | 8938 | msgid "git replace -d <object>..." |
07432cef | 8939 | msgstr "git replace -d <对象>..." |
ef317cd5 | 8940 | |
6acbf033 | 8941 | #: builtin/replace.c:23 |
cfff71a9 JX |
8942 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
8943 | msgstr "git replace [--format=<格式>] [-l [<模式>]]" | |
ef317cd5 | 8944 | |
220c313c | 8945 | #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 |
6acbf033 JX |
8946 | #, c-format |
8947 | msgid "Not a valid object name: '%s'" | |
8948 | msgstr "不是一个有效的对象名:'%s'" | |
8949 | ||
220c313c | 8950 | #: builtin/replace.c:355 |
6acbf033 JX |
8951 | #, c-format |
8952 | msgid "bad mergetag in commit '%s'" | |
8953 | msgstr "提交 '%s' 中损坏的 mergetag" | |
8954 | ||
220c313c | 8955 | #: builtin/replace.c:357 |
6acbf033 JX |
8956 | #, c-format |
8957 | msgid "malformed mergetag in commit '%s'" | |
8958 | msgstr "提交 '%s' 中非法的 mergetag" | |
8959 | ||
220c313c | 8960 | #: builtin/replace.c:368 |
6acbf033 JX |
8961 | #, c-format |
8962 | msgid "" | |
8963 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
8964 | "instead of --graft" | |
8965 | msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s',使用 --edit 代替 --graft" | |
8966 | ||
220c313c | 8967 | #: builtin/replace.c:401 |
6acbf033 JX |
8968 | #, c-format |
8969 | msgid "the original commit '%s' has a gpg signature." | |
8970 | msgstr "原始提交 '%s' 中包含一个 GPG 签名" | |
8971 | ||
220c313c | 8972 | #: builtin/replace.c:402 |
6acbf033 JX |
8973 | msgid "the signature will be removed in the replacement commit!" |
8974 | msgstr "在替换的提交中签名将被移除!" | |
8975 | ||
220c313c | 8976 | #: builtin/replace.c:408 |
6acbf033 JX |
8977 | #, c-format |
8978 | msgid "could not write replacement commit for: '%s'" | |
8979 | msgstr "不能为 '%s' 写替换提交" | |
8980 | ||
220c313c | 8981 | #: builtin/replace.c:432 |
ef317cd5 | 8982 | msgid "list replace refs" |
07432cef | 8983 | msgstr "列出替换的引用" |
ef317cd5 | 8984 | |
220c313c | 8985 | #: builtin/replace.c:433 |
ef317cd5 | 8986 | msgid "delete replace refs" |
07432cef | 8987 | msgstr "删除替换的引用" |
ef317cd5 | 8988 | |
220c313c | 8989 | #: builtin/replace.c:434 |
6acbf033 JX |
8990 | msgid "edit existing object" |
8991 | msgstr "编辑现存的对象" | |
8992 | ||
220c313c | 8993 | #: builtin/replace.c:435 |
6acbf033 JX |
8994 | msgid "change a commit's parents" |
8995 | msgstr "修改一个提交的父提交" | |
8996 | ||
220c313c | 8997 | #: builtin/replace.c:436 |
ef317cd5 | 8998 | msgid "replace the ref if it exists" |
07432cef | 8999 | msgstr "如果存在则替换引用" |
ef317cd5 | 9000 | |
220c313c | 9001 | #: builtin/replace.c:437 |
6acbf033 JX |
9002 | msgid "do not pretty-print contents for --edit" |
9003 | msgstr "不要为 --edit 操作美观显示内容" | |
9004 | ||
220c313c | 9005 | #: builtin/replace.c:438 |
cfff71a9 JX |
9006 | msgid "use this format" |
9007 | msgstr "使用此格式" | |
9008 | ||
90314792 | 9009 | #: builtin/rerere.c:12 |
814ff314 JX |
9010 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
9011 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" | |
ef317cd5 | 9012 | |
90314792 | 9013 | #: builtin/rerere.c:57 |
ef317cd5 | 9014 | msgid "register clean resolutions in index" |
07432cef | 9015 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 | 9016 | |
220c313c | 9017 | #: builtin/reset.c:26 |
ef317cd5 JX |
9018 | msgid "" |
9019 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 9020 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 | 9021 | |
220c313c | 9022 | #: builtin/reset.c:27 |
07432cef WS |
9023 | msgid "git reset [-q] <tree-ish> [--] <paths>..." |
9024 | msgstr "git reset [-q] <树或提交> [--] <路径>..." | |
ef317cd5 | 9025 | |
220c313c | 9026 | #: builtin/reset.c:28 |
07432cef WS |
9027 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
9028 | msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" | |
ef317cd5 | 9029 | |
220c313c | 9030 | #: builtin/reset.c:34 |
c04f5ac3 JX |
9031 | msgid "mixed" |
9032 | msgstr "混杂" | |
9033 | ||
220c313c | 9034 | #: builtin/reset.c:34 |
c04f5ac3 JX |
9035 | msgid "soft" |
9036 | msgstr "软性" | |
9037 | ||
220c313c | 9038 | #: builtin/reset.c:34 |
c04f5ac3 JX |
9039 | msgid "hard" |
9040 | msgstr "硬性" | |
9041 | ||
220c313c | 9042 | #: builtin/reset.c:34 |
8ada9598 JX |
9043 | msgid "merge" |
9044 | msgstr "合并" | |
9045 | ||
220c313c | 9046 | #: builtin/reset.c:34 |
c04f5ac3 JX |
9047 | msgid "keep" |
9048 | msgstr "保持" | |
9049 | ||
220c313c | 9050 | #: builtin/reset.c:74 |
c04f5ac3 JX |
9051 | msgid "You do not have a valid HEAD." |
9052 | msgstr "您没有一个有效的 HEAD。" | |
9053 | ||
220c313c | 9054 | #: builtin/reset.c:76 |
c04f5ac3 JX |
9055 | msgid "Failed to find tree of HEAD." |
9056 | msgstr "无法找到 HEAD 指向的树。" | |
9057 | ||
220c313c | 9058 | #: builtin/reset.c:82 |
c04f5ac3 JX |
9059 | #, c-format |
9060 | msgid "Failed to find tree of %s." | |
9061 | msgstr "无法找到 %s 指向的树。" | |
9062 | ||
220c313c | 9063 | #: builtin/reset.c:100 |
c04f5ac3 JX |
9064 | #, c-format |
9065 | msgid "HEAD is now at %s" | |
9066 | msgstr "HEAD 现在位于 %s" | |
9067 | ||
90e6ef53 | 9068 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 9069 | #: builtin/reset.c:183 |
c04f5ac3 JX |
9070 | #, c-format |
9071 | msgid "Cannot do a %s reset in the middle of a merge." | |
9072 | msgstr "在合并过程中不能做%s重置操作。" | |
9073 | ||
220c313c | 9074 | #: builtin/reset.c:276 |
ef317cd5 | 9075 | msgid "be quiet, only report errors" |
07432cef | 9076 | msgstr "安静模式,只报告错误" |
ef317cd5 | 9077 | |
220c313c | 9078 | #: builtin/reset.c:278 |
ef317cd5 | 9079 | msgid "reset HEAD and index" |
07432cef | 9080 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 9081 | |
220c313c | 9082 | #: builtin/reset.c:279 |
ef317cd5 | 9083 | msgid "reset only HEAD" |
07432cef | 9084 | msgstr "只重置 HEAD" |
ef317cd5 | 9085 | |
220c313c | 9086 | #: builtin/reset.c:281 builtin/reset.c:283 |
ef317cd5 | 9087 | msgid "reset HEAD, index and working tree" |
07432cef | 9088 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 9089 | |
220c313c | 9090 | #: builtin/reset.c:285 |
ef317cd5 | 9091 | msgid "reset HEAD but keep local changes" |
07432cef | 9092 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 9093 | |
220c313c | 9094 | #: builtin/reset.c:288 |
6c94aba5 JX |
9095 | msgid "record only the fact that removed paths will be added later" |
9096 | msgstr "将删除的路径标记为稍后添加" | |
9097 | ||
220c313c | 9098 | #: builtin/reset.c:305 |
07432cef WS |
9099 | #, c-format |
9100 | msgid "Failed to resolve '%s' as a valid revision." | |
9101 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
9102 | ||
220c313c | 9103 | #: builtin/reset.c:308 builtin/reset.c:316 |
c04f5ac3 JX |
9104 | #, c-format |
9105 | msgid "Could not parse object '%s'." | |
9106 | msgstr "不能解析对象 '%s'。" | |
9107 | ||
220c313c | 9108 | #: builtin/reset.c:313 |
07432cef WS |
9109 | #, c-format |
9110 | msgid "Failed to resolve '%s' as a valid tree." | |
9111 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
9112 | ||
220c313c | 9113 | #: builtin/reset.c:322 |
c04f5ac3 | 9114 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 9115 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 9116 | |
220c313c | 9117 | #: builtin/reset.c:331 |
c04f5ac3 | 9118 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
d9d56b23 | 9119 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
c04f5ac3 | 9120 | |
90e6ef53 | 9121 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 9122 | #: builtin/reset.c:333 |
c04f5ac3 JX |
9123 | #, c-format |
9124 | msgid "Cannot do %s reset with paths." | |
9125 | msgstr "不能带路径进行%s重置。" | |
9126 | ||
90e6ef53 | 9127 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 9128 | #: builtin/reset.c:343 |
c04f5ac3 JX |
9129 | #, c-format |
9130 | msgid "%s reset is not allowed in a bare repository" | |
220c313c | 9131 | msgstr "不能对纯版本库进行%s重置" |
c04f5ac3 | 9132 | |
220c313c | 9133 | #: builtin/reset.c:347 |
6c94aba5 JX |
9134 | msgid "-N can only be used with --mixed" |
9135 | msgstr "-N 只能和 --mixed 同时使用" | |
9136 | ||
220c313c | 9137 | #: builtin/reset.c:364 |
90314792 JX |
9138 | msgid "Unstaged changes after reset:" |
9139 | msgstr "重置后撤出暂存区的变更:" | |
9140 | ||
220c313c | 9141 | #: builtin/reset.c:370 |
ef317cd5 JX |
9142 | #, c-format |
9143 | msgid "Could not reset index file to revision '%s'." | |
9144 | msgstr "不能重置索引文件至版本 '%s'。" | |
9145 | ||
220c313c | 9146 | #: builtin/reset.c:374 |
07432cef WS |
9147 | msgid "Could not write new index file." |
9148 | msgstr "不能写入新的索引文件。" | |
9149 | ||
220c313c | 9150 | #: builtin/rev-parse.c:361 |
814ff314 JX |
9151 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
9152 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" | |
ef317cd5 | 9153 | |
220c313c | 9154 | #: builtin/rev-parse.c:366 |
ef317cd5 | 9155 | msgid "keep the `--` passed as an arg" |
07432cef | 9156 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 9157 | |
220c313c | 9158 | #: builtin/rev-parse.c:368 |
ef317cd5 | 9159 | msgid "stop parsing after the first non-option argument" |
07432cef | 9160 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 9161 | |
220c313c | 9162 | #: builtin/rev-parse.c:371 |
cfff71a9 JX |
9163 | msgid "output in stuck long form" |
9164 | msgstr "以固定长格式输出" | |
9165 | ||
220c313c | 9166 | #: builtin/rev-parse.c:499 |
ef317cd5 | 9167 | msgid "" |
814ff314 | 9168 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
ef317cd5 | 9169 | " or: git rev-parse --sq-quote [<arg>...]\n" |
814ff314 | 9170 | " or: git rev-parse [<options>] [<arg>...]\n" |
ef317cd5 JX |
9171 | "\n" |
9172 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
9173 | msgstr "" | |
814ff314 | 9174 | "git rev-parse --parseopt [<选项>] -- [<参数>...]\n" |
90314792 | 9175 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
814ff314 | 9176 | " 或者:git rev-parse [<选项>] [<参数>...]\n" |
07432cef WS |
9177 | "\n" |
9178 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" | |
ef317cd5 JX |
9179 | |
9180 | #: builtin/revert.c:22 | |
814ff314 JX |
9181 | msgid "git revert [<options>] <commit-ish>..." |
9182 | msgstr "git revert [<选项>] <提交号>..." | |
ef317cd5 JX |
9183 | |
9184 | #: builtin/revert.c:23 | |
9185 | msgid "git revert <subcommand>" | |
07432cef | 9186 | msgstr "git revert <子命令>" |
ef317cd5 JX |
9187 | |
9188 | #: builtin/revert.c:28 | |
814ff314 JX |
9189 | msgid "git cherry-pick [<options>] <commit-ish>..." |
9190 | msgstr "git cherry-pick [<选项>] <提交号>..." | |
ef317cd5 JX |
9191 | |
9192 | #: builtin/revert.c:29 | |
ef317cd5 | 9193 | msgid "git cherry-pick <subcommand>" |
07432cef | 9194 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 9195 | |
90314792 | 9196 | #: builtin/revert.c:71 |
ef317cd5 JX |
9197 | #, c-format |
9198 | msgid "%s: %s cannot be used with %s" | |
9199 | msgstr "%s:%s 不能和 %s 同时使用" | |
9200 | ||
90314792 | 9201 | #: builtin/revert.c:80 |
ef317cd5 | 9202 | msgid "end revert or cherry-pick sequence" |
07432cef | 9203 | msgstr "终止反转或拣选操作" |
ef317cd5 | 9204 | |
90314792 | 9205 | #: builtin/revert.c:81 |
ef317cd5 | 9206 | msgid "resume revert or cherry-pick sequence" |
07432cef | 9207 | msgstr "继续反转或拣选操作" |
ef317cd5 | 9208 | |
90314792 | 9209 | #: builtin/revert.c:82 |
ef317cd5 | 9210 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 9211 | msgstr "取消反转或拣选操作" |
ef317cd5 | 9212 | |
90314792 | 9213 | #: builtin/revert.c:83 |
ef317cd5 | 9214 | msgid "don't automatically commit" |
07432cef | 9215 | msgstr "不要自动提交" |
ef317cd5 | 9216 | |
90314792 | 9217 | #: builtin/revert.c:84 |
ef317cd5 | 9218 | msgid "edit the commit message" |
07432cef | 9219 | msgstr "编辑提交说明" |
ef317cd5 | 9220 | |
90314792 | 9221 | #: builtin/revert.c:87 |
ef317cd5 | 9222 | msgid "parent number" |
07432cef | 9223 | msgstr "父编号" |
ef317cd5 | 9224 | |
90314792 | 9225 | #: builtin/revert.c:89 |
ef317cd5 | 9226 | msgid "merge strategy" |
07432cef | 9227 | msgstr "合并策略" |
ef317cd5 | 9228 | |
90314792 | 9229 | #: builtin/revert.c:90 |
ef317cd5 | 9230 | msgid "option" |
07432cef | 9231 | msgstr "选项" |
ef317cd5 | 9232 | |
90314792 | 9233 | #: builtin/revert.c:91 |
ef317cd5 | 9234 | msgid "option for merge strategy" |
07432cef | 9235 | msgstr "合并策略的选项" |
ef317cd5 | 9236 | |
6c94aba5 | 9237 | #: builtin/revert.c:104 |
ef317cd5 | 9238 | msgid "append commit name" |
07432cef | 9239 | msgstr "追加提交名称" |
ef317cd5 | 9240 | |
6c94aba5 | 9241 | #: builtin/revert.c:105 |
ef317cd5 | 9242 | msgid "allow fast-forward" |
07432cef | 9243 | msgstr "允许快进式" |
c04f5ac3 | 9244 | |
6c94aba5 | 9245 | #: builtin/revert.c:106 |
ef317cd5 | 9246 | msgid "preserve initially empty commits" |
07432cef | 9247 | msgstr "保留初始化的空提交" |
ef317cd5 | 9248 | |
6c94aba5 | 9249 | #: builtin/revert.c:107 |
ef317cd5 | 9250 | msgid "allow commits with empty messages" |
07432cef | 9251 | msgstr "允许提交说明为空" |
c04f5ac3 | 9252 | |
6c94aba5 | 9253 | #: builtin/revert.c:108 |
ef317cd5 | 9254 | msgid "keep redundant, empty commits" |
07432cef | 9255 | msgstr "保持多余的、空的提交" |
ef317cd5 | 9256 | |
6c94aba5 | 9257 | #: builtin/revert.c:112 |
c04f5ac3 JX |
9258 | msgid "program error" |
9259 | msgstr "程序错误" | |
9260 | ||
6c94aba5 | 9261 | #: builtin/revert.c:197 |
c04f5ac3 JX |
9262 | msgid "revert failed" |
9263 | msgstr "还原失败" | |
9264 | ||
6c94aba5 | 9265 | #: builtin/revert.c:212 |
c04f5ac3 JX |
9266 | msgid "cherry-pick failed" |
9267 | msgstr "拣选失败" | |
9268 | ||
90314792 | 9269 | #: builtin/rm.c:17 |
814ff314 JX |
9270 | msgid "git rm [<options>] [--] <file>..." |
9271 | msgstr "git rm [<选项>] [--] <文件>..." | |
07432cef | 9272 | |
90314792 | 9273 | #: builtin/rm.c:65 |
2e8451e8 JX |
9274 | msgid "" |
9275 | "the following submodule (or one of its nested submodules)\n" | |
9276 | "uses a .git directory:" | |
9277 | msgid_plural "" | |
220c313c | 9278 | "the following submodules (or one of their nested submodules)\n" |
2e8451e8 | 9279 | "use a .git directory:" |
220c313c JX |
9280 | msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" |
9281 | msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" | |
2e8451e8 | 9282 | |
90314792 | 9283 | #: builtin/rm.c:71 |
07432cef | 9284 | msgid "" |
2e8451e8 | 9285 | "\n" |
07432cef WS |
9286 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
9287 | msgstr "" | |
2e8451e8 | 9288 | "\n" |
07432cef | 9289 | "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" |
ef317cd5 | 9290 | |
90314792 | 9291 | #: builtin/rm.c:231 |
c04f5ac3 | 9292 | msgid "" |
2e8451e8 JX |
9293 | "the following file has staged content different from both the\n" |
9294 | "file and the HEAD:" | |
9295 | msgid_plural "" | |
9296 | "the following files have staged content different from both the\n" | |
9297 | "file and the HEAD:" | |
9298 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
9299 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
9300 | ||
90314792 | 9301 | #: builtin/rm.c:236 |
2e8451e8 JX |
9302 | msgid "" |
9303 | "\n" | |
c04f5ac3 JX |
9304 | "(use -f to force removal)" |
9305 | msgstr "" | |
2e8451e8 | 9306 | "\n" |
c04f5ac3 JX |
9307 | "(使用 -f 强制删除)" |
9308 | ||
90314792 | 9309 | #: builtin/rm.c:240 |
2e8451e8 JX |
9310 | msgid "the following file has changes staged in the index:" |
9311 | msgid_plural "the following files have changes staged in the index:" | |
9312 | msgstr[0] "如下文件相对索引区的内容有修改" | |
9313 | msgstr[1] "如下文件相对索引区的内容有修改" | |
c04f5ac3 | 9314 | |
90314792 | 9315 | #: builtin/rm.c:244 builtin/rm.c:255 |
c04f5ac3 | 9316 | msgid "" |
2e8451e8 | 9317 | "\n" |
c04f5ac3 JX |
9318 | "(use --cached to keep the file, or -f to force removal)" |
9319 | msgstr "" | |
2e8451e8 JX |
9320 | "\n" |
9321 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
9322 | ||
90314792 | 9323 | #: builtin/rm.c:252 |
2e8451e8 JX |
9324 | msgid "the following file has local modifications:" |
9325 | msgid_plural "the following files have local modifications:" | |
9326 | msgstr[0] "如下文件有本地修改:" | |
9327 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 9328 | |
90314792 | 9329 | #: builtin/rm.c:270 |
ef317cd5 | 9330 | msgid "do not list removed files" |
07432cef | 9331 | msgstr "不列出删除的文件" |
ef317cd5 | 9332 | |
90314792 | 9333 | #: builtin/rm.c:271 |
ef317cd5 | 9334 | msgid "only remove from the index" |
07432cef | 9335 | msgstr "只从索引区删除" |
ef317cd5 | 9336 | |
90314792 | 9337 | #: builtin/rm.c:272 |
ef317cd5 | 9338 | msgid "override the up-to-date check" |
07432cef | 9339 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 9340 | |
90314792 | 9341 | #: builtin/rm.c:273 |
ef317cd5 | 9342 | msgid "allow recursive removal" |
07432cef | 9343 | msgstr "允许递归删除" |
ef317cd5 | 9344 | |
90314792 | 9345 | #: builtin/rm.c:275 |
ef317cd5 | 9346 | msgid "exit with a zero status even if nothing matched" |
07432cef | 9347 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 9348 | |
220c313c JX |
9349 | #: builtin/rm.c:318 |
9350 | msgid "Please, stage your changes to .gitmodules or stash them to proceed" | |
9351 | msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" | |
9352 | ||
90314792 | 9353 | #: builtin/rm.c:336 |
c04f5ac3 JX |
9354 | #, c-format |
9355 | msgid "not removing '%s' recursively without -r" | |
9356 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
9357 | ||
90314792 | 9358 | #: builtin/rm.c:375 |
c04f5ac3 JX |
9359 | #, c-format |
9360 | msgid "git rm: unable to remove %s" | |
9361 | msgstr "git rm:不能删除 %s" | |
9362 | ||
ef317cd5 | 9363 | #: builtin/shortlog.c:13 |
814ff314 | 9364 | msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" |
4dcdc3d8 | 9365 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" |
ef317cd5 | 9366 | |
4dcdc3d8 | 9367 | #: builtin/shortlog.c:131 |
c04f5ac3 JX |
9368 | #, c-format |
9369 | msgid "Missing author: %s" | |
9370 | msgstr "缺少作者:%s" | |
9371 | ||
90314792 | 9372 | #: builtin/shortlog.c:230 |
ef317cd5 | 9373 | msgid "sort output according to the number of commits per author" |
07432cef | 9374 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 9375 | |
90314792 | 9376 | #: builtin/shortlog.c:232 |
ef317cd5 | 9377 | msgid "Suppress commit descriptions, only provides commit count" |
07432cef | 9378 | msgstr "隐藏提交说明,只提供提交数量" |
ef317cd5 | 9379 | |
90314792 | 9380 | #: builtin/shortlog.c:234 |
ef317cd5 | 9381 | msgid "Show the email address of each author" |
07432cef | 9382 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 9383 | |
90314792 | 9384 | #: builtin/shortlog.c:235 |
ef317cd5 | 9385 | msgid "w[,i1[,i2]]" |
07432cef | 9386 | msgstr "w[,i1[,i2]]" |
ef317cd5 | 9387 | |
90314792 | 9388 | #: builtin/shortlog.c:236 |
ef317cd5 | 9389 | msgid "Linewrap output" |
07432cef | 9390 | msgstr "折行输出" |
ef317cd5 JX |
9391 | |
9392 | #: builtin/show-branch.c:9 | |
9393 | msgid "" | |
814ff314 | 9394 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
9395 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
9396 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
9397 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
ef317cd5 | 9398 | msgstr "" |
814ff314 | 9399 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
9400 | "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" |
9401 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
9402 | "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" | |
ef317cd5 | 9403 | |
d9d56b23 | 9404 | #: builtin/show-branch.c:13 |
814ff314 JX |
9405 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
9406 | msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" | |
ef317cd5 | 9407 | |
d9d56b23 | 9408 | #: builtin/show-branch.c:652 |
ef317cd5 | 9409 | msgid "show remote-tracking and local branches" |
07432cef | 9410 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 9411 | |
d9d56b23 | 9412 | #: builtin/show-branch.c:654 |
ef317cd5 | 9413 | msgid "show remote-tracking branches" |
07432cef | 9414 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 9415 | |
d9d56b23 | 9416 | #: builtin/show-branch.c:656 |
ef317cd5 | 9417 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 9418 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 9419 | |
d9d56b23 | 9420 | #: builtin/show-branch.c:658 |
ef317cd5 | 9421 | msgid "show <n> more commits after the common ancestor" |
07432cef | 9422 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 9423 | |
d9d56b23 | 9424 | #: builtin/show-branch.c:660 |
ef317cd5 | 9425 | msgid "synonym to more=-1" |
07432cef | 9426 | msgstr "和 more=-1 同义" |
ef317cd5 | 9427 | |
d9d56b23 | 9428 | #: builtin/show-branch.c:661 |
ef317cd5 | 9429 | msgid "suppress naming strings" |
07432cef | 9430 | msgstr "不显示字符串命名" |
ef317cd5 | 9431 | |
d9d56b23 | 9432 | #: builtin/show-branch.c:663 |
ef317cd5 | 9433 | msgid "include the current branch" |
07432cef | 9434 | msgstr "包括当前分支" |
ef317cd5 | 9435 | |
d9d56b23 | 9436 | #: builtin/show-branch.c:665 |
ef317cd5 | 9437 | msgid "name commits with their object names" |
07432cef | 9438 | msgstr "以对象名字命名提交" |
ef317cd5 | 9439 | |
d9d56b23 | 9440 | #: builtin/show-branch.c:667 |
ef317cd5 | 9441 | msgid "show possible merge bases" |
07432cef | 9442 | msgstr "显示可能合并的基线" |
ef317cd5 | 9443 | |
d9d56b23 | 9444 | #: builtin/show-branch.c:669 |
ef317cd5 | 9445 | msgid "show refs unreachable from any other ref" |
07432cef | 9446 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 9447 | |
d9d56b23 | 9448 | #: builtin/show-branch.c:671 |
ef317cd5 | 9449 | msgid "show commits in topological order" |
07432cef | 9450 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 9451 | |
d9d56b23 | 9452 | #: builtin/show-branch.c:674 |
ef317cd5 | 9453 | msgid "show only commits not on the first branch" |
07432cef | 9454 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 9455 | |
d9d56b23 | 9456 | #: builtin/show-branch.c:676 |
ef317cd5 | 9457 | msgid "show merges reachable from only one tip" |
07432cef | 9458 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 9459 | |
d9d56b23 | 9460 | #: builtin/show-branch.c:678 |
2e8451e8 JX |
9461 | msgid "topologically sort, maintaining date order where possible" |
9462 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 9463 | |
d9d56b23 | 9464 | #: builtin/show-branch.c:681 |
ef317cd5 | 9465 | msgid "<n>[,<base>]" |
07432cef | 9466 | msgstr "<n>[,<base>]" |
ef317cd5 | 9467 | |
d9d56b23 | 9468 | #: builtin/show-branch.c:682 |
ef317cd5 | 9469 | msgid "show <n> most recent ref-log entries starting at base" |
07432cef | 9470 | msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" |
ef317cd5 JX |
9471 | |
9472 | #: builtin/show-ref.c:10 | |
9473 | msgid "" | |
814ff314 JX |
9474 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
9475 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
ef317cd5 | 9476 | msgstr "" |
814ff314 JX |
9477 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
9478 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" | |
ef317cd5 JX |
9479 | |
9480 | #: builtin/show-ref.c:11 | |
9481 | msgid "git show-ref --exclude-existing[=pattern] < ref-list" | |
07432cef | 9482 | msgstr "git show-ref --exclude-existing[=模式] < 引用列表" |
ef317cd5 | 9483 | |
2e8451e8 | 9484 | #: builtin/show-ref.c:168 |
ef317cd5 | 9485 | msgid "only show tags (can be combined with heads)" |
07432cef | 9486 | msgstr "只显示 tags(可以和头共用)" |
ef317cd5 | 9487 | |
2e8451e8 | 9488 | #: builtin/show-ref.c:169 |
ef317cd5 | 9489 | msgid "only show heads (can be combined with tags)" |
07432cef | 9490 | msgstr "只显示头(可以和 tags 共用)" |
ef317cd5 | 9491 | |
2e8451e8 | 9492 | #: builtin/show-ref.c:170 |
ef317cd5 | 9493 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 9494 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 9495 | |
90314792 | 9496 | #: builtin/show-ref.c:173 builtin/show-ref.c:175 |
2e8451e8 JX |
9497 | msgid "show the HEAD reference, even if it would be filtered out" |
9498 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 9499 | |
90314792 | 9500 | #: builtin/show-ref.c:177 |
ef317cd5 | 9501 | msgid "dereference tags into object IDs" |
07432cef | 9502 | msgstr "转换 tags 到对象ID" |
ef317cd5 | 9503 | |
90314792 | 9504 | #: builtin/show-ref.c:179 |
ef317cd5 | 9505 | msgid "only show SHA1 hash using <n> digits" |
07432cef | 9506 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" |
ef317cd5 | 9507 | |
90314792 | 9508 | #: builtin/show-ref.c:183 |
ef317cd5 | 9509 | msgid "do not print results to stdout (useful with --verify)" |
07432cef | 9510 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" |
ef317cd5 | 9511 | |
90314792 | 9512 | #: builtin/show-ref.c:185 |
ef317cd5 | 9513 | msgid "show refs from stdin that aren't in local repository" |
07432cef | 9514 | msgstr "显示从标准输入中读入的不在本地版本库中的引用" |
ef317cd5 JX |
9515 | |
9516 | #: builtin/symbolic-ref.c:7 | |
814ff314 JX |
9517 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
9518 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" | |
07432cef WS |
9519 | |
9520 | #: builtin/symbolic-ref.c:8 | |
814ff314 JX |
9521 | msgid "git symbolic-ref -d [-q] <name>" |
9522 | msgstr "git symbolic-ref -d [-q] <名称>" | |
ef317cd5 | 9523 | |
07432cef | 9524 | #: builtin/symbolic-ref.c:40 |
ef317cd5 | 9525 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
9526 | msgstr "不显示非符号(分离的)引用的错误信息" |
9527 | ||
9528 | #: builtin/symbolic-ref.c:41 | |
9529 | msgid "delete symbolic ref" | |
9530 | msgstr "删除符号引用" | |
ef317cd5 | 9531 | |
07432cef | 9532 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 9533 | msgid "shorten ref output" |
07432cef | 9534 | msgstr "简短的引用输出" |
ef317cd5 | 9535 | |
04cb2f28 | 9536 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 |
ef317cd5 | 9537 | msgid "reason" |
07432cef | 9538 | msgstr "原因" |
ef317cd5 | 9539 | |
04cb2f28 | 9540 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 |
ef317cd5 | 9541 | msgid "reason of the update" |
07432cef | 9542 | msgstr "更新的原因" |
ef317cd5 JX |
9543 | |
9544 | #: builtin/tag.c:22 | |
9545 | msgid "" | |
814ff314 JX |
9546 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " |
9547 | "[<head>]" | |
9548 | msgstr "" | |
9549 | "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" | |
ef317cd5 JX |
9550 | |
9551 | #: builtin/tag.c:23 | |
9552 | msgid "git tag -d <tagname>..." | |
07432cef | 9553 | msgstr "git tag -d <标签名>..." |
ef317cd5 JX |
9554 | |
9555 | #: builtin/tag.c:24 | |
9556 | msgid "" | |
814ff314 | 9557 | "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" |
ef317cd5 JX |
9558 | "\t\t[<pattern>...]" |
9559 | msgstr "" | |
814ff314 | 9560 | "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]" |
ef317cd5 JX |
9561 | |
9562 | #: builtin/tag.c:26 | |
9563 | msgid "git tag -v <tagname>..." | |
07432cef | 9564 | msgstr "git tag -v <标签名>..." |
ef317cd5 | 9565 | |
6acbf033 | 9566 | #: builtin/tag.c:69 |
7ac1c0ad JX |
9567 | #, c-format |
9568 | msgid "malformed object at '%s'" | |
9569 | msgstr "非法的对象于 '%s'" | |
9570 | ||
6acbf033 | 9571 | #: builtin/tag.c:301 |
c04f5ac3 JX |
9572 | #, c-format |
9573 | msgid "tag name too long: %.*s..." | |
9574 | msgstr "tag 名字太长:%.*s..." | |
9575 | ||
6acbf033 | 9576 | #: builtin/tag.c:306 |
c04f5ac3 JX |
9577 | #, c-format |
9578 | msgid "tag '%s' not found." | |
9579 | msgstr "tag '%s' 未发现。" | |
9580 | ||
6acbf033 | 9581 | #: builtin/tag.c:321 |
c04f5ac3 JX |
9582 | #, c-format |
9583 | msgid "Deleted tag '%s' (was %s)\n" | |
9584 | msgstr "已删除 tag '%s'(曾为 %s)\n" | |
9585 | ||
6acbf033 | 9586 | #: builtin/tag.c:333 |
c04f5ac3 JX |
9587 | #, c-format |
9588 | msgid "could not verify the tag '%s'" | |
9589 | msgstr "不能校验 tag '%s'" | |
9590 | ||
6acbf033 | 9591 | #: builtin/tag.c:343 |
a77c07d9 | 9592 | #, c-format |
c04f5ac3 JX |
9593 | msgid "" |
9594 | "\n" | |
6acbf033 JX |
9595 | "Write a message for tag:\n" |
9596 | " %s\n" | |
a77c07d9 | 9597 | "Lines starting with '%c' will be ignored.\n" |
c04f5ac3 JX |
9598 | msgstr "" |
9599 | "\n" | |
6acbf033 JX |
9600 | "输入一个 tag 说明:\n" |
9601 | " %s\n" | |
a77c07d9 | 9602 | "以 '%c' 开头的行将被忽略。\n" |
c04f5ac3 | 9603 | |
6acbf033 | 9604 | #: builtin/tag.c:347 |
a77c07d9 | 9605 | #, c-format |
c04f5ac3 JX |
9606 | msgid "" |
9607 | "\n" | |
6acbf033 JX |
9608 | "Write a message for tag:\n" |
9609 | " %s\n" | |
a77c07d9 | 9610 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
c04f5ac3 | 9611 | "want to.\n" |
c04f5ac3 JX |
9612 | msgstr "" |
9613 | "\n" | |
6acbf033 JX |
9614 | "输入一个 tag 说明:\n" |
9615 | " %s\n" | |
a77c07d9 | 9616 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
c04f5ac3 | 9617 | |
6acbf033 JX |
9618 | #: builtin/tag.c:371 |
9619 | #, c-format | |
9620 | msgid "unsupported sort specification '%s'" | |
9621 | msgstr "不支持的排序规格 '%s'" | |
9622 | ||
9623 | #: builtin/tag.c:373 | |
9624 | #, c-format | |
9625 | msgid "unsupported sort specification '%s' in variable '%s'" | |
9626 | msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'" | |
9627 | ||
9628 | #: builtin/tag.c:428 | |
c04f5ac3 JX |
9629 | msgid "unable to sign the tag" |
9630 | msgstr "无法签署 tag" | |
9631 | ||
6acbf033 | 9632 | #: builtin/tag.c:430 |
c04f5ac3 JX |
9633 | msgid "unable to write tag file" |
9634 | msgstr "无法写 tag 文件" | |
9635 | ||
6acbf033 | 9636 | #: builtin/tag.c:455 |
c04f5ac3 | 9637 | msgid "bad object type." |
90e6ef53 | 9638 | msgstr "坏的对象类型。" |
c04f5ac3 | 9639 | |
6acbf033 | 9640 | #: builtin/tag.c:468 |
c04f5ac3 | 9641 | msgid "tag header too big." |
90e6ef53 | 9642 | msgstr "tag 头信息太大。" |
c04f5ac3 | 9643 | |
6acbf033 | 9644 | #: builtin/tag.c:504 |
c04f5ac3 JX |
9645 | msgid "no tag message?" |
9646 | msgstr "无 tag 说明?" | |
9647 | ||
6acbf033 | 9648 | #: builtin/tag.c:510 |
c04f5ac3 JX |
9649 | #, c-format |
9650 | msgid "The tag message has been left in %s\n" | |
9651 | msgstr "tag 说明被保留在 %s\n" | |
9652 | ||
6acbf033 | 9653 | #: builtin/tag.c:559 |
7ac1c0ad JX |
9654 | msgid "switch 'points-at' requires an object" |
9655 | msgstr "开关 'points-at' 需要一个对象" | |
9656 | ||
6acbf033 | 9657 | #: builtin/tag.c:561 |
7ac1c0ad JX |
9658 | #, c-format |
9659 | msgid "malformed object name '%s'" | |
9660 | msgstr "非法的对象名 '%s'" | |
9661 | ||
220c313c | 9662 | #: builtin/tag.c:589 |
ef317cd5 | 9663 | msgid "list tag names" |
07432cef | 9664 | msgstr "列出tag名称" |
ef317cd5 | 9665 | |
220c313c | 9666 | #: builtin/tag.c:591 |
ef317cd5 | 9667 | msgid "print <n> lines of each tag message" |
07432cef | 9668 | msgstr "每个 tag 信息打印 <n> 行" |
ef317cd5 | 9669 | |
220c313c | 9670 | #: builtin/tag.c:593 |
ef317cd5 | 9671 | msgid "delete tags" |
07432cef | 9672 | msgstr "删除 tags" |
ef317cd5 | 9673 | |
220c313c | 9674 | #: builtin/tag.c:594 |
ef317cd5 | 9675 | msgid "verify tags" |
07432cef | 9676 | msgstr "验证 tags" |
ef317cd5 | 9677 | |
220c313c | 9678 | #: builtin/tag.c:596 |
ef317cd5 | 9679 | msgid "Tag creation options" |
07432cef | 9680 | msgstr "Tag 创建选项" |
ef317cd5 | 9681 | |
220c313c | 9682 | #: builtin/tag.c:598 |
ef317cd5 | 9683 | msgid "annotated tag, needs a message" |
07432cef | 9684 | msgstr "注解 tag,需要一个说明" |
ef317cd5 | 9685 | |
220c313c | 9686 | #: builtin/tag.c:600 |
ef317cd5 | 9687 | msgid "tag message" |
07432cef | 9688 | msgstr "tag 说明" |
ef317cd5 | 9689 | |
220c313c | 9690 | #: builtin/tag.c:602 |
ef317cd5 | 9691 | msgid "annotated and GPG-signed tag" |
07432cef | 9692 | msgstr "注解并 GPG 签名的 tag" |
ef317cd5 | 9693 | |
220c313c | 9694 | #: builtin/tag.c:606 |
ef317cd5 | 9695 | msgid "use another key to sign the tag" |
07432cef | 9696 | msgstr "使用另外的私钥签名 tag" |
ef317cd5 | 9697 | |
220c313c | 9698 | #: builtin/tag.c:607 |
ef317cd5 | 9699 | msgid "replace the tag if exists" |
07432cef | 9700 | msgstr "如果存在,替换现有的 tag" |
ef317cd5 | 9701 | |
814ff314 JX |
9702 | #: builtin/tag.c:609 |
9703 | msgid "Tag listing options" | |
9704 | msgstr "Tag 列表选项" | |
9705 | ||
9706 | #: builtin/tag.c:610 | |
ef317cd5 | 9707 | msgid "show tag list in columns" |
07432cef | 9708 | msgstr "以列的方式显示 tag" |
ef317cd5 | 9709 | |
814ff314 | 9710 | #: builtin/tag.c:612 |
6c94aba5 JX |
9711 | msgid "sort tags" |
9712 | msgstr "排序 tags" | |
9713 | ||
220c313c | 9714 | #: builtin/tag.c:617 builtin/tag.c:623 |
ef317cd5 | 9715 | msgid "print only tags that contain the commit" |
07432cef | 9716 | msgstr "只打印包含提交的tags" |
ef317cd5 | 9717 | |
220c313c | 9718 | #: builtin/tag.c:629 |
ef317cd5 | 9719 | msgid "print only tags of the object" |
07432cef | 9720 | msgstr "只打印tags对象" |
ef317cd5 | 9721 | |
220c313c | 9722 | #: builtin/tag.c:655 |
8ada9598 | 9723 | msgid "--column and -n are incompatible" |
81809b99 | 9724 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 9725 | |
220c313c | 9726 | #: builtin/tag.c:667 |
6c94aba5 JX |
9727 | msgid "--sort and -n are incompatible" |
9728 | msgstr "--sort 和 -n 不兼容" | |
9729 | ||
220c313c | 9730 | #: builtin/tag.c:674 |
c04f5ac3 | 9731 | msgid "-n option is only allowed with -l." |
649900bc | 9732 | msgstr "-n 选项只允许和 -l 同时使用。" |
c04f5ac3 | 9733 | |
220c313c | 9734 | #: builtin/tag.c:676 |
c04f5ac3 | 9735 | msgid "--contains option is only allowed with -l." |
649900bc | 9736 | msgstr "--contains 选项只允许和 -l 同时使用。" |
c04f5ac3 | 9737 | |
220c313c | 9738 | #: builtin/tag.c:678 |
7ac1c0ad | 9739 | msgid "--points-at option is only allowed with -l." |
649900bc | 9740 | msgstr "--points-at 选项只允许和 -l 同时使用。" |
7ac1c0ad | 9741 | |
220c313c | 9742 | #: builtin/tag.c:686 |
c04f5ac3 JX |
9743 | msgid "only one -F or -m option is allowed." |
9744 | msgstr "只允许一个 -F 或 -m 选项。" | |
9745 | ||
220c313c | 9746 | #: builtin/tag.c:706 |
c04f5ac3 JX |
9747 | msgid "too many params" |
9748 | msgstr "太多参数" | |
9749 | ||
220c313c | 9750 | #: builtin/tag.c:712 |
c04f5ac3 JX |
9751 | #, c-format |
9752 | msgid "'%s' is not a valid tag name." | |
90e6ef53 | 9753 | msgstr "'%s' 不是一个有效的tag名称。" |
c04f5ac3 | 9754 | |
220c313c | 9755 | #: builtin/tag.c:717 |
c04f5ac3 JX |
9756 | #, c-format |
9757 | msgid "tag '%s' already exists" | |
9758 | msgstr "tag '%s' 已存在" | |
9759 | ||
220c313c | 9760 | #: builtin/tag.c:741 |
c04f5ac3 JX |
9761 | #, c-format |
9762 | msgid "Updated tag '%s' (was %s)\n" | |
9763 | msgstr "已更新tag '%s'(曾为 %s)\n" | |
9764 | ||
220c313c | 9765 | #: builtin/unpack-objects.c:489 |
6c94aba5 JX |
9766 | msgid "Unpacking objects" |
9767 | msgstr "展开对象中" | |
9768 | ||
220c313c | 9769 | #: builtin/update-index.c:403 |
814ff314 JX |
9770 | msgid "git update-index [<options>] [--] [<file>...]" |
9771 | msgstr "git update-index [<选项>] [--] [<文件>...]" | |
8ada9598 | 9772 | |
44f518e6 | 9773 | #: builtin/update-index.c:757 |
ef317cd5 | 9774 | msgid "continue refresh even when index needs update" |
07432cef | 9775 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 9776 | |
44f518e6 | 9777 | #: builtin/update-index.c:760 |
ef317cd5 | 9778 | msgid "refresh: ignore submodules" |
07432cef | 9779 | msgstr "刷新:忽略子模组" |
8ada9598 | 9780 | |
44f518e6 | 9781 | #: builtin/update-index.c:763 |
ef317cd5 | 9782 | msgid "do not ignore new files" |
07432cef | 9783 | msgstr "不忽略新的文件" |
8ada9598 | 9784 | |
44f518e6 | 9785 | #: builtin/update-index.c:765 |
ef317cd5 | 9786 | msgid "let files replace directories and vice-versa" |
07432cef | 9787 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 9788 | |
44f518e6 | 9789 | #: builtin/update-index.c:767 |
ef317cd5 | 9790 | msgid "notice files missing from worktree" |
07432cef | 9791 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 9792 | |
44f518e6 | 9793 | #: builtin/update-index.c:769 |
ef317cd5 | 9794 | msgid "refresh even if index contains unmerged entries" |
07432cef | 9795 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 9796 | |
44f518e6 | 9797 | #: builtin/update-index.c:772 |
ef317cd5 | 9798 | msgid "refresh stat information" |
07432cef | 9799 | msgstr "刷新统计信息" |
ef317cd5 | 9800 | |
44f518e6 | 9801 | #: builtin/update-index.c:776 |
ef317cd5 | 9802 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 9803 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 9804 | |
44f518e6 | 9805 | #: builtin/update-index.c:780 |
6c94aba5 | 9806 | msgid "<mode>,<object>,<path>" |
d9d56b23 | 9807 | msgstr "<存取模式>,<对象>,<路径>" |
ef317cd5 | 9808 | |
44f518e6 | 9809 | #: builtin/update-index.c:781 |
ef317cd5 | 9810 | msgid "add the specified entry to the index" |
07432cef | 9811 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 9812 | |
44f518e6 | 9813 | #: builtin/update-index.c:785 |
ef317cd5 | 9814 | msgid "(+/-)x" |
07432cef | 9815 | msgstr "(+/-)x" |
ef317cd5 | 9816 | |
44f518e6 | 9817 | #: builtin/update-index.c:786 |
ef317cd5 | 9818 | msgid "override the executable bit of the listed files" |
07432cef | 9819 | msgstr "覆盖列表里文件的可执行位" |
ef317cd5 | 9820 | |
44f518e6 | 9821 | #: builtin/update-index.c:790 |
ef317cd5 | 9822 | msgid "mark files as \"not changing\"" |
07432cef | 9823 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 9824 | |
44f518e6 | 9825 | #: builtin/update-index.c:793 |
ef317cd5 | 9826 | msgid "clear assumed-unchanged bit" |
07432cef | 9827 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 9828 | |
44f518e6 | 9829 | #: builtin/update-index.c:796 |
ef317cd5 | 9830 | msgid "mark files as \"index-only\"" |
07432cef | 9831 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 9832 | |
44f518e6 | 9833 | #: builtin/update-index.c:799 |
ef317cd5 | 9834 | msgid "clear skip-worktree bit" |
07432cef | 9835 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 9836 | |
44f518e6 | 9837 | #: builtin/update-index.c:802 |
ef317cd5 | 9838 | msgid "add to index only; do not add content to object database" |
07432cef | 9839 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 9840 | |
44f518e6 | 9841 | #: builtin/update-index.c:804 |
ef317cd5 | 9842 | msgid "remove named paths even if present in worktree" |
07432cef | 9843 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 9844 | |
44f518e6 | 9845 | #: builtin/update-index.c:806 |
ef317cd5 | 9846 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 9847 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 9848 | |
44f518e6 | 9849 | #: builtin/update-index.c:808 |
ef317cd5 | 9850 | msgid "read list of paths to be updated from standard input" |
07432cef | 9851 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 9852 | |
44f518e6 | 9853 | #: builtin/update-index.c:812 |
ef317cd5 | 9854 | msgid "add entries from standard input to the index" |
07432cef | 9855 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 9856 | |
44f518e6 | 9857 | #: builtin/update-index.c:816 |
ef317cd5 | 9858 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 9859 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 9860 | |
44f518e6 | 9861 | #: builtin/update-index.c:820 |
ef317cd5 | 9862 | msgid "only update entries that differ from HEAD" |
07432cef | 9863 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 9864 | |
44f518e6 | 9865 | #: builtin/update-index.c:824 |
ef317cd5 | 9866 | msgid "ignore files missing from worktree" |
07432cef | 9867 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 9868 | |
44f518e6 | 9869 | #: builtin/update-index.c:827 |
ef317cd5 | 9870 | msgid "report actions to standard output" |
07432cef | 9871 | msgstr "在标准输出显示操作" |
ef317cd5 | 9872 | |
44f518e6 | 9873 | #: builtin/update-index.c:829 |
ef317cd5 | 9874 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 9875 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 9876 | |
44f518e6 | 9877 | #: builtin/update-index.c:833 |
ef317cd5 | 9878 | msgid "write index in this format" |
07432cef | 9879 | msgstr "以这种格式写入索引区" |
ef317cd5 | 9880 | |
44f518e6 | 9881 | #: builtin/update-index.c:835 |
6acbf033 JX |
9882 | msgid "enable or disable split index" |
9883 | msgstr "启用或禁用索引拆分" | |
9884 | ||
90314792 | 9885 | #: builtin/update-ref.c:9 |
814ff314 JX |
9886 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
9887 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" | |
ef317cd5 | 9888 | |
90314792 | 9889 | #: builtin/update-ref.c:10 |
814ff314 JX |
9890 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
9891 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" | |
90314792 JX |
9892 | |
9893 | #: builtin/update-ref.c:11 | |
814ff314 JX |
9894 | msgid "git update-ref [<options>] --stdin [-z]" |
9895 | msgstr "git update-ref [<选项>] --stdin [-z]" | |
ef317cd5 | 9896 | |
04cb2f28 | 9897 | #: builtin/update-ref.c:359 |
ef317cd5 | 9898 | msgid "delete the reference" |
07432cef | 9899 | msgstr "删除引用" |
ef317cd5 | 9900 | |
04cb2f28 | 9901 | #: builtin/update-ref.c:361 |
ef317cd5 | 9902 | msgid "update <refname> not the one it points to" |
07432cef | 9903 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 9904 | |
04cb2f28 | 9905 | #: builtin/update-ref.c:362 |
90314792 JX |
9906 | msgid "stdin has NUL-terminated arguments" |
9907 | msgstr "标准输入有以 NUL 字符终止的参数" | |
9908 | ||
04cb2f28 | 9909 | #: builtin/update-ref.c:363 |
90314792 JX |
9910 | msgid "read updates from stdin" |
9911 | msgstr "从标准输入读取更新" | |
9912 | ||
ef317cd5 JX |
9913 | #: builtin/update-server-info.c:6 |
9914 | msgid "git update-server-info [--force]" | |
07432cef | 9915 | msgstr "git update-server-info [--force]" |
ef317cd5 JX |
9916 | |
9917 | #: builtin/update-server-info.c:14 | |
9918 | msgid "update the info files from scratch" | |
07432cef | 9919 | msgstr "从头开始更新文件信息" |
ef317cd5 | 9920 | |
6acbf033 | 9921 | #: builtin/verify-commit.c:17 |
814ff314 JX |
9922 | msgid "git verify-commit [-v | --verbose] <commit>..." |
9923 | msgstr "git verify-commit [-v | --verbose] <提交>..." | |
6acbf033 JX |
9924 | |
9925 | #: builtin/verify-commit.c:75 | |
9926 | msgid "print commit contents" | |
9927 | msgstr "打印提交内容" | |
9928 | ||
220c313c | 9929 | #: builtin/verify-pack.c:54 |
814ff314 JX |
9930 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
9931 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." | |
ef317cd5 | 9932 | |
220c313c | 9933 | #: builtin/verify-pack.c:64 |
ef317cd5 JX |
9934 | msgid "verbose" |
9935 | msgstr "冗长输出" | |
9936 | ||
220c313c | 9937 | #: builtin/verify-pack.c:66 |
ef317cd5 | 9938 | msgid "show statistics only" |
07432cef | 9939 | msgstr "只显示统计" |
ef317cd5 JX |
9940 | |
9941 | #: builtin/verify-tag.c:17 | |
814ff314 JX |
9942 | msgid "git verify-tag [-v | --verbose] <tag>..." |
9943 | msgstr "git verify-tag [-v | --verbose] <标签>..." | |
ef317cd5 JX |
9944 | |
9945 | #: builtin/verify-tag.c:73 | |
9946 | msgid "print tag contents" | |
07432cef | 9947 | msgstr "打印 tag 内容" |
ef317cd5 JX |
9948 | |
9949 | #: builtin/write-tree.c:13 | |
9950 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" | |
07432cef | 9951 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 JX |
9952 | |
9953 | #: builtin/write-tree.c:26 | |
9954 | msgid "<prefix>/" | |
07432cef | 9955 | msgstr "<前缀>/" |
ef317cd5 JX |
9956 | |
9957 | #: builtin/write-tree.c:27 | |
9958 | msgid "write tree object for a subdirectory <prefix>" | |
07432cef | 9959 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 JX |
9960 | |
9961 | #: builtin/write-tree.c:30 | |
9962 | msgid "only useful for debugging" | |
07432cef | 9963 | msgstr "只对调试有用" |
ef317cd5 | 9964 | |
220c313c JX |
9965 | #: credential-cache--daemon.c:267 |
9966 | msgid "print debugging messages to stderr" | |
9967 | msgstr "调试信息输出到标准错误" | |
9968 | ||
d9d56b23 | 9969 | #: git.c:14 |
4dcdc3d8 | 9970 | msgid "" |
220c313c | 9971 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
4dcdc3d8 JX |
9972 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
9973 | "to read about a specific subcommand or concept." | |
9974 | msgstr "" | |
220c313c JX |
9975 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" |
9976 | "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" | |
9977 | "帮助。" | |
8ada9598 JX |
9978 | |
9979 | #: common-cmds.h:8 | |
9980 | msgid "Add file contents to the index" | |
81809b99 | 9981 | msgstr "添加文件内容至索引" |
8ada9598 JX |
9982 | |
9983 | #: common-cmds.h:9 | |
9984 | msgid "Find by binary search the change that introduced a bug" | |
81809b99 | 9985 | msgstr "通过二分查找定位引入 bug 的变更" |
8ada9598 JX |
9986 | |
9987 | #: common-cmds.h:10 | |
8ada9598 | 9988 | msgid "List, create, or delete branches" |
81809b99 | 9989 | msgstr "列出、创建或删除分支" |
8ada9598 JX |
9990 | |
9991 | #: common-cmds.h:11 | |
9992 | msgid "Checkout a branch or paths to the working tree" | |
81809b99 | 9993 | msgstr "检出一个分支或路径到工作区" |
8ada9598 JX |
9994 | |
9995 | #: common-cmds.h:12 | |
8ada9598 | 9996 | msgid "Clone a repository into a new directory" |
81809b99 | 9997 | msgstr "克隆一个版本库到一个新目录" |
8ada9598 JX |
9998 | |
9999 | #: common-cmds.h:13 | |
8ada9598 | 10000 | msgid "Record changes to the repository" |
81809b99 | 10001 | msgstr "记录变更到版本库" |
8ada9598 JX |
10002 | |
10003 | #: common-cmds.h:14 | |
10004 | msgid "Show changes between commits, commit and working tree, etc" | |
81809b99 | 10005 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 JX |
10006 | |
10007 | #: common-cmds.h:15 | |
10008 | msgid "Download objects and refs from another repository" | |
81809b99 | 10009 | msgstr "从另外一个版本库下载对象和引用" |
8ada9598 JX |
10010 | |
10011 | #: common-cmds.h:16 | |
10012 | msgid "Print lines matching a pattern" | |
81809b99 | 10013 | msgstr "输出和模式匹配的行" |
8ada9598 JX |
10014 | |
10015 | #: common-cmds.h:17 | |
a77c07d9 JX |
10016 | msgid "Create an empty Git repository or reinitialize an existing one" |
10017 | msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库" | |
8ada9598 JX |
10018 | |
10019 | #: common-cmds.h:18 | |
8ada9598 | 10020 | msgid "Show commit logs" |
81809b99 | 10021 | msgstr "显示提交日志" |
8ada9598 JX |
10022 | |
10023 | #: common-cmds.h:19 | |
10024 | msgid "Join two or more development histories together" | |
81809b99 | 10025 | msgstr "合并两个或更多开发历史" |
8ada9598 JX |
10026 | |
10027 | #: common-cmds.h:20 | |
10028 | msgid "Move or rename a file, a directory, or a symlink" | |
81809b99 | 10029 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 JX |
10030 | |
10031 | #: common-cmds.h:21 | |
2e8451e8 JX |
10032 | msgid "Fetch from and integrate with another repository or a local branch" |
10033 | msgstr "获取并整合另外的版本库或一个本地分支" | |
8ada9598 JX |
10034 | |
10035 | #: common-cmds.h:22 | |
10036 | msgid "Update remote refs along with associated objects" | |
81809b99 | 10037 | msgstr "更新远程引用和相关的对象" |
8ada9598 JX |
10038 | |
10039 | #: common-cmds.h:23 | |
10040 | msgid "Forward-port local commits to the updated upstream head" | |
81809b99 | 10041 | msgstr "本地提交转移至更新后的上游分支中" |
8ada9598 JX |
10042 | |
10043 | #: common-cmds.h:24 | |
10044 | msgid "Reset current HEAD to the specified state" | |
81809b99 | 10045 | msgstr "重置当前HEAD到指定状态" |
8ada9598 JX |
10046 | |
10047 | #: common-cmds.h:25 | |
10048 | msgid "Remove files from the working tree and from the index" | |
81809b99 | 10049 | msgstr "从工作区和索引中删除文件" |
8ada9598 JX |
10050 | |
10051 | #: common-cmds.h:26 | |
10052 | msgid "Show various types of objects" | |
81809b99 | 10053 | msgstr "显示各种类型的对象" |
8ada9598 JX |
10054 | |
10055 | #: common-cmds.h:27 | |
8ada9598 | 10056 | msgid "Show the working tree status" |
81809b99 | 10057 | msgstr "显示工作区状态" |
8ada9598 JX |
10058 | |
10059 | #: common-cmds.h:28 | |
10060 | msgid "Create, list, delete or verify a tag object signed with GPG" | |
81809b99 | 10061 | msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象" |
8ada9598 | 10062 | |
220c313c JX |
10063 | #: parse-options.h:143 |
10064 | msgid "expiry-date" | |
10065 | msgstr "到期时间" | |
10066 | ||
10067 | #: parse-options.h:158 | |
10068 | msgid "no-op (backward compatibility)" | |
10069 | msgstr "空操作(向后兼容)" | |
10070 | ||
10071 | #: parse-options.h:232 | |
10072 | msgid "be more verbose" | |
10073 | msgstr "更加详细" | |
10074 | ||
10075 | #: parse-options.h:234 | |
10076 | msgid "be more quiet" | |
10077 | msgstr "更加安静" | |
10078 | ||
10079 | #: parse-options.h:240 | |
10080 | msgid "use <n> digits to display SHA-1s" | |
10081 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
10082 | ||
10083 | #: rerere.h:27 | |
10084 | msgid "update the index with reused conflict resolution if possible" | |
10085 | msgstr "如果可能,重用冲突解决更新索引" | |
10086 | ||
04cb2f28 | 10087 | #: git-am.sh:53 |
c04f5ac3 JX |
10088 | msgid "You need to set your committer info first" |
10089 | msgstr "您需要先设置你的提交者信息" | |
10090 | ||
04cb2f28 | 10091 | #: git-am.sh:98 |
b694fbb1 JX |
10092 | msgid "" |
10093 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
10094 | "Not rewinding to ORIG_HEAD" | |
6792b93b | 10095 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" |
b694fbb1 | 10096 | |
04cb2f28 | 10097 | #: git-am.sh:108 |
b694fbb1 JX |
10098 | #, sh-format |
10099 | msgid "" | |
2e8451e8 | 10100 | "When you have resolved this problem, run \"$cmdline --continue\".\n" |
649900bc JX |
10101 | "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" |
10102 | "To restore the original branch and stop patching, run \"$cmdline --abort\"." | |
b694fbb1 | 10103 | msgstr "" |
2e8451e8 | 10104 | "当您解决了此问题后,执行 \"$cmdline --continue\"。\n" |
b694fbb1 JX |
10105 | "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n" |
10106 | "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。" | |
10107 | ||
04cb2f28 | 10108 | #: git-am.sh:124 |
b694fbb1 JX |
10109 | msgid "Cannot fall back to three-way merge." |
10110 | msgstr "无法求助于三路合并。" | |
10111 | ||
04cb2f28 | 10112 | #: git-am.sh:140 |
c04f5ac3 | 10113 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
07432cef | 10114 | msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。" |
649900bc | 10115 | |
04cb2f28 | 10116 | #: git-am.sh:142 |
649900bc | 10117 | msgid "Using index info to reconstruct a base tree..." |
63af42fe | 10118 | msgstr "使用索引来重建一个(三路合并的)基础目录树..." |
c04f5ac3 | 10119 | |
04cb2f28 | 10120 | #: git-am.sh:157 |
c04f5ac3 JX |
10121 | msgid "" |
10122 | "Did you hand edit your patch?\n" | |
10123 | "It does not apply to blobs recorded in its index." | |
10124 | msgstr "" | |
10125 | "您是否曾手动编辑过您的补丁?\n" | |
07432cef | 10126 | "无法应用补丁到索引中的数据(blob)对象上。" |
c04f5ac3 | 10127 | |
04cb2f28 | 10128 | #: git-am.sh:166 |
c04f5ac3 | 10129 | msgid "Falling back to patching base and 3-way merge..." |
b694fbb1 | 10130 | msgstr "转而在基础版本上打补丁及进行三路合并..." |
c04f5ac3 | 10131 | |
04cb2f28 | 10132 | #: git-am.sh:182 |
649900bc JX |
10133 | msgid "Failed to merge in the changes." |
10134 | msgstr "无法合并变更。" | |
10135 | ||
04cb2f28 | 10136 | #: git-am.sh:277 |
c04f5ac3 JX |
10137 | msgid "Only one StGIT patch series can be applied at once" |
10138 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
10139 | ||
04cb2f28 | 10140 | #: git-am.sh:364 |
c04f5ac3 JX |
10141 | #, sh-format |
10142 | msgid "Patch format $patch_format is not supported." | |
10143 | msgstr "不支持 $patch_format 补丁格式。" | |
10144 | ||
04cb2f28 | 10145 | #: git-am.sh:366 |
c04f5ac3 JX |
10146 | msgid "Patch format detection failed." |
10147 | msgstr "补丁格式检测失败。" | |
10148 | ||
04cb2f28 | 10149 | #: git-am.sh:398 |
649900bc JX |
10150 | msgid "" |
10151 | "The -b/--binary option has been a no-op for long time, and\n" | |
10152 | "it will be removed. Please do not use it anymore." | |
10153 | msgstr "" | |
10154 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n" | |
10155 | "请不要再使用它了。" | |
c04f5ac3 | 10156 | |
04cb2f28 | 10157 | #: git-am.sh:496 |
c04f5ac3 JX |
10158 | #, sh-format |
10159 | msgid "previous rebase directory $dotest still exists but mbox given." | |
2e8451e8 | 10160 | msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。" |
c04f5ac3 | 10161 | |
04cb2f28 | 10162 | #: git-am.sh:501 |
c04f5ac3 JX |
10163 | msgid "Please make up your mind. --skip or --abort?" |
10164 | msgstr "请下决心。--skip 或是 --abort ?" | |
10165 | ||
04cb2f28 | 10166 | #: git-am.sh:537 |
2e8451e8 JX |
10167 | #, sh-format |
10168 | msgid "" | |
10169 | "Stray $dotest directory found.\n" | |
10170 | "Use \"git am --abort\" to remove it." | |
10171 | msgstr "" | |
10172 | "发现了错误的 $dotest 目录。\n" | |
10173 | "使用 \"git am --abort\" 删除它。" | |
10174 | ||
04cb2f28 | 10175 | #: git-am.sh:545 |
c04f5ac3 JX |
10176 | msgid "Resolve operation not in progress, we are not resuming." |
10177 | msgstr "解决操作未进行,我们不会继续。" | |
10178 | ||
04cb2f28 | 10179 | #: git-am.sh:612 |
c04f5ac3 JX |
10180 | #, sh-format |
10181 | msgid "Dirty index: cannot apply patches (dirty: $files)" | |
90e6ef53 | 10182 | msgstr "脏的索引:不能应用补丁(脏文件:$files)" |
c04f5ac3 | 10183 | |
04cb2f28 | 10184 | #: git-am.sh:722 |
b694fbb1 JX |
10185 | #, sh-format |
10186 | msgid "" | |
10187 | "Patch is empty. Was it split wrong?\n" | |
10188 | "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" | |
10189 | "To restore the original branch and stop patching run \"$cmdline --abort\"." | |
10190 | msgstr "" | |
10191 | "补丁为空。是不是切分错误?\n" | |
10192 | "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n" | |
10193 | "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。" | |
10194 | ||
04cb2f28 | 10195 | #: git-am.sh:749 |
b694fbb1 JX |
10196 | msgid "Patch does not have a valid e-mail address." |
10197 | msgstr "补丁中没有一个有效的邮件地址。" | |
10198 | ||
04cb2f28 | 10199 | #: git-am.sh:796 |
c04f5ac3 | 10200 | msgid "cannot be interactive without stdin connected to a terminal." |
90e6ef53 | 10201 | msgstr "标准输入没有和终端关联,不能进行交互式操作。" |
c04f5ac3 | 10202 | |
04cb2f28 | 10203 | #: git-am.sh:800 |
b694fbb1 JX |
10204 | msgid "Commit Body is:" |
10205 | msgstr "提交内容为:" | |
10206 | ||
90e6ef53 | 10207 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
10208 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] |
10209 | #. in your translation. The program will only accept English | |
10210 | #. input at this point. | |
04cb2f28 | 10211 | #: git-am.sh:807 |
c04f5ac3 JX |
10212 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " |
10213 | msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " | |
10214 | ||
04cb2f28 | 10215 | #: git-am.sh:843 |
c04f5ac3 JX |
10216 | #, sh-format |
10217 | msgid "Applying: $FIRSTLINE" | |
10218 | msgstr "正应用:$FIRSTLINE" | |
10219 | ||
04cb2f28 | 10220 | #: git-am.sh:864 |
b694fbb1 JX |
10221 | msgid "" |
10222 | "No changes - did you forget to use 'git add'?\n" | |
10223 | "If there is nothing left to stage, chances are that something else\n" | |
10224 | "already introduced the same changes; you might want to skip this patch." | |
10225 | msgstr "" | |
10226 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
10227 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
10228 | "您也许想要跳过这个补丁。" | |
10229 | ||
04cb2f28 | 10230 | #: git-am.sh:872 |
b694fbb1 JX |
10231 | msgid "" |
10232 | "You still have unmerged paths in your index\n" | |
10233 | "did you forget to use 'git add'?" | |
6792b93b | 10234 | msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?" |
b694fbb1 | 10235 | |
04cb2f28 | 10236 | #: git-am.sh:888 |
c04f5ac3 | 10237 | msgid "No changes -- Patch already applied." |
63af42fe | 10238 | msgstr "没有变更 —— 补丁已经应用过。" |
c04f5ac3 | 10239 | |
04cb2f28 | 10240 | #: git-am.sh:898 |
b694fbb1 JX |
10241 | #, sh-format |
10242 | msgid "Patch failed at $msgnum $FIRSTLINE" | |
10243 | msgstr "补丁失败于 $msgnum $FIRSTLINE" | |
10244 | ||
04cb2f28 | 10245 | #: git-am.sh:901 |
ef317cd5 JX |
10246 | #, sh-format |
10247 | msgid "" | |
10248 | "The copy of the patch that failed is found in:\n" | |
10249 | " $dotest/patch" | |
10250 | msgstr "" | |
07432cef WS |
10251 | "失败的补丁文件副本位于:\n" |
10252 | " $dotest/patch" | |
ef317cd5 | 10253 | |
04cb2f28 | 10254 | #: git-am.sh:919 |
c04f5ac3 JX |
10255 | msgid "applying to an empty history" |
10256 | msgstr "正应用到一个空历史上" | |
10257 | ||
b694fbb1 JX |
10258 | #: git-bisect.sh:48 |
10259 | msgid "You need to start by \"git bisect start\"" | |
10260 | msgstr "您需要执行 \"git bisect start\" 来开始" | |
10261 | ||
90e6ef53 | 10262 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
10263 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
10264 | #. translation. The program will only accept English input | |
10265 | #. at this point. | |
10266 | #: git-bisect.sh:54 | |
10267 | msgid "Do you want me to do it for you [Y/n]? " | |
10268 | msgstr "您想让我为您这样做么[Y/n]? " | |
10269 | ||
10270 | #: git-bisect.sh:95 | |
10271 | #, sh-format | |
10272 | msgid "unrecognised option: '$arg'" | |
81809b99 | 10273 | msgstr "未能识别的选项:'$arg'" |
c04f5ac3 JX |
10274 | |
10275 | #: git-bisect.sh:99 | |
10276 | #, sh-format | |
10277 | msgid "'$arg' does not appear to be a valid revision" | |
10278 | msgstr "'$arg' 看起来不像是一个有效的版本" | |
10279 | ||
10280 | #: git-bisect.sh:117 | |
10281 | msgid "Bad HEAD - I need a HEAD" | |
10282 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
10283 | ||
10284 | #: git-bisect.sh:130 | |
10285 | #, sh-format | |
10286 | msgid "" | |
814ff314 | 10287 | "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." |
d9d56b23 | 10288 | msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。" |
c04f5ac3 JX |
10289 | |
10290 | #: git-bisect.sh:140 | |
cfff71a9 JX |
10291 | msgid "won't bisect on cg-seek'ed tree" |
10292 | msgstr "不会在做了 cg-seek 的树上做二分查找" | |
c04f5ac3 JX |
10293 | |
10294 | #: git-bisect.sh:144 | |
10295 | msgid "Bad HEAD - strange symbolic ref" | |
90e6ef53 | 10296 | msgstr "坏的 HEAD - 奇怪的符号引用" |
c04f5ac3 JX |
10297 | |
10298 | #: git-bisect.sh:189 | |
10299 | #, sh-format | |
10300 | msgid "Bad bisect_write argument: $state" | |
90e6ef53 | 10301 | msgstr "坏的 bisect_write 参数:$state" |
c04f5ac3 JX |
10302 | |
10303 | #: git-bisect.sh:218 | |
10304 | #, sh-format | |
10305 | msgid "Bad rev input: $arg" | |
90e6ef53 | 10306 | msgstr "输入坏的版本:$arg" |
c04f5ac3 JX |
10307 | |
10308 | #: git-bisect.sh:232 | |
10309 | msgid "Please call 'bisect_state' with at least one argument." | |
10310 | msgstr "请在调用 'bisect_state' 时跟至少一个参数。" | |
10311 | ||
10312 | #: git-bisect.sh:244 | |
10313 | #, sh-format | |
10314 | msgid "Bad rev input: $rev" | |
10315 | msgstr "输入坏的版本:$rev" | |
10316 | ||
04cb2f28 | 10317 | #: git-bisect.sh:253 |
c04f5ac3 JX |
10318 | msgid "'git bisect bad' can take only one argument." |
10319 | msgstr "'git bisect bad' 只能带一个参数。" | |
10320 | ||
04cb2f28 | 10321 | #: git-bisect.sh:276 |
b694fbb1 JX |
10322 | msgid "Warning: bisecting only with a bad commit." |
10323 | msgstr "警告:在仅有一个坏提交下进行二分查找。" | |
10324 | ||
90e6ef53 | 10325 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
10326 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
10327 | #. translation. The program will only accept English input | |
10328 | #. at this point. | |
04cb2f28 | 10329 | #: git-bisect.sh:282 |
c04f5ac3 JX |
10330 | msgid "Are you sure [Y/n]? " |
10331 | msgstr "您确认么[Y/n]? " | |
10332 | ||
04cb2f28 | 10333 | #: git-bisect.sh:292 |
b694fbb1 | 10334 | msgid "" |
220c313c | 10335 | "You need to give me at least one good and one bad revision.\n" |
b694fbb1 JX |
10336 | "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" |
10337 | msgstr "" | |
10338 | "您需要给我至少一个好版本和一个坏版本。\n" | |
220c313c | 10339 | "(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)" |
b694fbb1 | 10340 | |
04cb2f28 | 10341 | #: git-bisect.sh:295 |
b694fbb1 JX |
10342 | msgid "" |
10343 | "You need to start by \"git bisect start\".\n" | |
220c313c | 10344 | "You then need to give me at least one good and one bad revision.\n" |
b694fbb1 JX |
10345 | "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" |
10346 | msgstr "" | |
10347 | "您需要执行 \"git bisect start\" 来开始。\n" | |
10348 | "然后需要提供我至少一个好版本和一个坏版本。\n" | |
220c313c | 10349 | "(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)" |
b694fbb1 | 10350 | |
04cb2f28 | 10351 | #: git-bisect.sh:366 git-bisect.sh:493 |
b694fbb1 JX |
10352 | msgid "We are not bisecting." |
10353 | msgstr "我们没有在二分查找。" | |
10354 | ||
04cb2f28 | 10355 | #: git-bisect.sh:373 |
c04f5ac3 JX |
10356 | #, sh-format |
10357 | msgid "'$invalid' is not a valid commit" | |
10358 | msgstr "'$invalid' 不是一个有效的提交" | |
10359 | ||
04cb2f28 | 10360 | #: git-bisect.sh:382 |
c04f5ac3 JX |
10361 | #, sh-format |
10362 | msgid "" | |
10363 | "Could not check out original HEAD '$branch'.\n" | |
10364 | "Try 'git bisect reset <commit>'." | |
10365 | msgstr "" | |
10366 | "不能检出原始 HEAD '$branch'。\n" | |
07432cef | 10367 | "尝试 'git bisect reset <提交>'。" |
c04f5ac3 | 10368 | |
04cb2f28 | 10369 | #: git-bisect.sh:409 |
c04f5ac3 JX |
10370 | msgid "No logfile given" |
10371 | msgstr "未提供日志文件" | |
10372 | ||
04cb2f28 | 10373 | #: git-bisect.sh:410 |
c04f5ac3 JX |
10374 | #, sh-format |
10375 | msgid "cannot read $file for replaying" | |
10376 | msgstr "不能读取 $file 来重放" | |
10377 | ||
04cb2f28 | 10378 | #: git-bisect.sh:427 |
c04f5ac3 JX |
10379 | msgid "?? what are you talking about?" |
10380 | msgstr "?? 您在说什么?" | |
10381 | ||
04cb2f28 | 10382 | #: git-bisect.sh:439 |
b694fbb1 JX |
10383 | #, sh-format |
10384 | msgid "running $command" | |
10385 | msgstr "运行 $command" | |
10386 | ||
04cb2f28 | 10387 | #: git-bisect.sh:446 |
b694fbb1 JX |
10388 | #, sh-format |
10389 | msgid "" | |
10390 | "bisect run failed:\n" | |
10391 | "exit code $res from '$command' is < 0 or >= 128" | |
10392 | msgstr "" | |
10393 | "二分查找运行失败:\n" | |
07432cef | 10394 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 10395 | |
04cb2f28 | 10396 | #: git-bisect.sh:472 |
b694fbb1 JX |
10397 | msgid "bisect run cannot continue any more" |
10398 | msgstr "二分查找不能继续运行" | |
10399 | ||
04cb2f28 | 10400 | #: git-bisect.sh:478 |
b694fbb1 JX |
10401 | #, sh-format |
10402 | msgid "" | |
10403 | "bisect run failed:\n" | |
10404 | "'bisect_state $state' exited with error code $res" | |
10405 | msgstr "" | |
10406 | "二分查找运行失败:\n" | |
10407 | "'bisect_state $state' 退出码为 $res" | |
10408 | ||
04cb2f28 | 10409 | #: git-bisect.sh:485 |
b694fbb1 JX |
10410 | msgid "bisect run success" |
10411 | msgstr "二分查找运行成功" | |
c04f5ac3 JX |
10412 | |
10413 | #: git-pull.sh:21 | |
10414 | msgid "" | |
10415 | "Pull is not possible because you have unmerged files.\n" | |
10416 | "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" | |
220c313c | 10417 | "as appropriate to mark resolution and make a commit." |
c04f5ac3 | 10418 | msgstr "" |
90e6ef53 | 10419 | "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n" |
d9d56b23 | 10420 | "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。" |
c04f5ac3 JX |
10421 | |
10422 | #: git-pull.sh:25 | |
10423 | msgid "Pull is not possible because you have unmerged files." | |
90e6ef53 | 10424 | msgstr "Pull 不可用,因为您尚有未合并的文件。" |
c04f5ac3 | 10425 | |
220c313c JX |
10426 | #: git-pull.sh:31 |
10427 | msgid "" | |
10428 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
10429 | "Please, commit your changes before you can merge." | |
10430 | msgstr "" | |
10431 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
10432 | "请在合并前先提交您的修改。" | |
10433 | ||
6acbf033 | 10434 | #: git-pull.sh:245 |
c04f5ac3 | 10435 | msgid "updating an unborn branch with changes added to the index" |
90e6ef53 | 10436 | msgstr "更新尚未诞生的分支,变更添加至索引" |
c04f5ac3 | 10437 | |
6acbf033 | 10438 | #: git-pull.sh:269 |
b694fbb1 JX |
10439 | #, sh-format |
10440 | msgid "" | |
10441 | "Warning: fetch updated the current branch head.\n" | |
10442 | "Warning: fast-forwarding your working tree from\n" | |
10443 | "Warning: commit $orig_head." | |
10444 | msgstr "" | |
10445 | "警告:fetch 更新了当前的分支。您的工作区\n" | |
10446 | "警告:从原提交 $orig_head 快进。" | |
10447 | ||
6acbf033 | 10448 | #: git-pull.sh:294 |
c04f5ac3 JX |
10449 | msgid "Cannot merge multiple branches into empty head" |
10450 | msgstr "无法将多个分支合并到空分支" | |
10451 | ||
6acbf033 | 10452 | #: git-pull.sh:298 |
c04f5ac3 JX |
10453 | msgid "Cannot rebase onto multiple branches" |
10454 | msgstr "无法变基到多个分支" | |
10455 | ||
6c94aba5 | 10456 | #: git-rebase.sh:57 |
649900bc JX |
10457 | msgid "" |
10458 | "When you have resolved this problem, run \"git rebase --continue\".\n" | |
10459 | "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" | |
10460 | "To check out the original branch and stop rebasing, run \"git rebase --abort" | |
10461 | "\"." | |
10462 | msgstr "" | |
10463 | "当您解决了此问题后,执行 \"git rebase --continue\"。\n" | |
10464 | "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n" | |
10465 | "要恢复原分支并停止变基,执行 \"git rebase --abort\"。" | |
10466 | ||
6acbf033 | 10467 | #: git-rebase.sh:165 |
2e8451e8 JX |
10468 | msgid "Applied autostash." |
10469 | msgstr "成功应用 autostash。" | |
10470 | ||
6acbf033 | 10471 | #: git-rebase.sh:168 |
2e8451e8 JX |
10472 | #, sh-format |
10473 | msgid "Cannot store $stash_sha1" | |
10474 | msgstr "无法保存 $stash_sha1" | |
10475 | ||
6acbf033 | 10476 | #: git-rebase.sh:169 |
2e8451e8 JX |
10477 | msgid "" |
10478 | "Applying autostash resulted in conflicts.\n" | |
10479 | "Your changes are safe in the stash.\n" | |
b1894384 | 10480 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" |
2e8451e8 JX |
10481 | msgstr "" |
10482 | "应用 autostash 导致冲突。\n" | |
10483 | "您的修改安全地保存在 stash 中。\n" | |
10484 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" | |
10485 | ||
6acbf033 | 10486 | #: git-rebase.sh:208 |
649900bc | 10487 | msgid "The pre-rebase hook refused to rebase." |
98b2761d | 10488 | msgstr "钩子 pre-rebase 拒绝变基操作。" |
649900bc | 10489 | |
6acbf033 | 10490 | #: git-rebase.sh:213 |
649900bc JX |
10491 | msgid "It looks like git-am is in progress. Cannot rebase." |
10492 | msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" | |
10493 | ||
6acbf033 | 10494 | #: git-rebase.sh:351 |
649900bc JX |
10495 | msgid "The --exec option must be used with the --interactive option" |
10496 | msgstr "选项 --exec 必须和选项 --interactive 同时使用" | |
10497 | ||
6acbf033 | 10498 | #: git-rebase.sh:356 |
649900bc JX |
10499 | msgid "No rebase in progress?" |
10500 | msgstr "没有正在进行的变基?" | |
10501 | ||
6acbf033 | 10502 | #: git-rebase.sh:367 |
07432cef WS |
10503 | msgid "The --edit-todo action can only be used during interactive rebase." |
10504 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
10505 | ||
6acbf033 | 10506 | #: git-rebase.sh:374 |
649900bc JX |
10507 | msgid "Cannot read HEAD" |
10508 | msgstr "不能读取 HEAD" | |
10509 | ||
6acbf033 | 10510 | #: git-rebase.sh:377 |
649900bc JX |
10511 | msgid "" |
10512 | "You must edit all merge conflicts and then\n" | |
10513 | "mark them as resolved using git add" | |
10514 | msgstr "" | |
10515 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
10516 | "命令将它们标记为已解决" | |
10517 | ||
6acbf033 | 10518 | #: git-rebase.sh:395 |
649900bc JX |
10519 | #, sh-format |
10520 | msgid "Could not move back to $head_name" | |
10521 | msgstr "无法移回 $head_name" | |
10522 | ||
6acbf033 | 10523 | #: git-rebase.sh:414 |
649900bc JX |
10524 | #, sh-format |
10525 | msgid "" | |
10526 | "It seems that there is already a $state_dir_base directory, and\n" | |
10527 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
10528 | "case, please try\n" | |
10529 | "\t$cmd_live_rebase\n" | |
10530 | "If that is not the case, please\n" | |
10531 | "\t$cmd_clear_stale_rebase\n" | |
10532 | "and run me again. I am stopping in case you still have something\n" | |
10533 | "valuable there." | |
10534 | msgstr "" | |
98b2761d JX |
10535 | "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n" |
10536 | "过程中。 如果是这样,请执行\n" | |
649900bc JX |
10537 | "\t$cmd_live_rebase\n" |
10538 | "如果不是这样,请执行\n" | |
10539 | "\t$cmd_clear_stale_rebase\n" | |
98b2761d | 10540 | "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。" |
649900bc | 10541 | |
6acbf033 | 10542 | #: git-rebase.sh:465 |
649900bc JX |
10543 | #, sh-format |
10544 | msgid "invalid upstream $upstream_name" | |
10545 | msgstr "无效的上游 $upstream_name" | |
10546 | ||
6acbf033 | 10547 | #: git-rebase.sh:489 |
649900bc JX |
10548 | #, sh-format |
10549 | msgid "$onto_name: there are more than one merge bases" | |
10550 | msgstr "$onto_name: 有一个以上的合并基准" | |
10551 | ||
6acbf033 | 10552 | #: git-rebase.sh:492 git-rebase.sh:496 |
649900bc JX |
10553 | #, sh-format |
10554 | msgid "$onto_name: there is no merge base" | |
10555 | msgstr "$onto_name: 没有合并基准" | |
10556 | ||
6acbf033 | 10557 | #: git-rebase.sh:501 |
649900bc JX |
10558 | #, sh-format |
10559 | msgid "Does not point to a valid commit: $onto_name" | |
10560 | msgstr "没有指向一个有效的提交:$onto_name" | |
10561 | ||
6acbf033 | 10562 | #: git-rebase.sh:524 |
649900bc JX |
10563 | #, sh-format |
10564 | msgid "fatal: no such branch: $branch_name" | |
10565 | msgstr "严重错误:无此分支:$branch_name" | |
10566 | ||
6acbf033 | 10567 | #: git-rebase.sh:557 |
2e8451e8 JX |
10568 | msgid "Cannot autostash" |
10569 | msgstr "无法 autostash" | |
10570 | ||
6acbf033 | 10571 | #: git-rebase.sh:562 |
2e8451e8 JX |
10572 | #, sh-format |
10573 | msgid "Created autostash: $stash_abbrev" | |
10574 | msgstr "创建了 autostash: $stash_abbrev" | |
10575 | ||
6acbf033 | 10576 | #: git-rebase.sh:566 |
649900bc JX |
10577 | msgid "Please commit or stash them." |
10578 | msgstr "请提交或为它们保存进度。" | |
10579 | ||
6acbf033 | 10580 | #: git-rebase.sh:586 |
649900bc JX |
10581 | #, sh-format |
10582 | msgid "Current branch $branch_name is up to date." | |
10583 | msgstr "当前分支 $branch_name 是最新的。" | |
10584 | ||
6acbf033 | 10585 | #: git-rebase.sh:590 |
649900bc JX |
10586 | #, sh-format |
10587 | msgid "Current branch $branch_name is up to date, rebase forced." | |
10588 | msgstr "当前分支 $branch_name 是最新的,强制变基。" | |
10589 | ||
6acbf033 | 10590 | #: git-rebase.sh:601 |
649900bc JX |
10591 | #, sh-format |
10592 | msgid "Changes from $mb to $onto:" | |
10593 | msgstr "变更从 $mb 到 $onto:" | |
10594 | ||
6acbf033 | 10595 | #: git-rebase.sh:610 |
649900bc JX |
10596 | msgid "First, rewinding head to replay your work on top of it..." |
10597 | msgstr "首先,重置头指针以便在上面重放您的工作..." | |
10598 | ||
6acbf033 | 10599 | #: git-rebase.sh:620 |
649900bc JX |
10600 | #, sh-format |
10601 | msgid "Fast-forwarded $branch_name to $onto_name." | |
10602 | msgstr "快进 $branch_name 至 $onto_name。" | |
10603 | ||
c04f5ac3 JX |
10604 | #: git-stash.sh:51 |
10605 | msgid "git stash clear with parameters is unimplemented" | |
10606 | msgstr "git stash clear 不支持参数" | |
10607 | ||
10608 | #: git-stash.sh:74 | |
10609 | msgid "You do not have the initial commit yet" | |
10610 | msgstr "您尚未建立初始提交" | |
10611 | ||
10612 | #: git-stash.sh:89 | |
10613 | msgid "Cannot save the current index state" | |
90e6ef53 | 10614 | msgstr "无法保存当前索引状态" |
c04f5ac3 | 10615 | |
6acbf033 | 10616 | #: git-stash.sh:124 git-stash.sh:137 |
c04f5ac3 JX |
10617 | msgid "Cannot save the current worktree state" |
10618 | msgstr "无法保存当前工作区状态" | |
10619 | ||
6acbf033 | 10620 | #: git-stash.sh:141 |
c04f5ac3 | 10621 | msgid "No changes selected" |
90e6ef53 | 10622 | msgstr "没有选择变更" |
c04f5ac3 | 10623 | |
6acbf033 | 10624 | #: git-stash.sh:144 |
c04f5ac3 | 10625 | msgid "Cannot remove temporary index (can't happen)" |
90e6ef53 | 10626 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 | 10627 | |
6acbf033 | 10628 | #: git-stash.sh:157 |
c04f5ac3 JX |
10629 | msgid "Cannot record working tree state" |
10630 | msgstr "不能记录工作区状态" | |
10631 | ||
6acbf033 | 10632 | #: git-stash.sh:191 |
2e8451e8 JX |
10633 | #, sh-format |
10634 | msgid "Cannot update $ref_stash with $w_commit" | |
10635 | msgstr "无法用 $w_commit 更新 $ref_stash" | |
10636 | ||
b694fbb1 JX |
10637 | #. TRANSLATORS: $option is an invalid option, like |
10638 | #. `--blah-blah'. The 7 spaces at the beginning of the | |
10639 | #. second line correspond to "error: ". So you should line | |
10640 | #. up the second line with however many characters the | |
10641 | #. translation of "error: " takes in your language. E.g. in | |
10642 | #. English this is: | |
10643 | #. | |
10644 | #. $ git stash save --blah-blah 2>&1 | head -n 2 | |
10645 | #. error: unknown option for 'stash save': --blah-blah | |
10646 | #. To provide a message, use git stash save -- '--blah-blah' | |
6acbf033 | 10647 | #: git-stash.sh:238 |
b694fbb1 JX |
10648 | #, sh-format |
10649 | msgid "" | |
10650 | "error: unknown option for 'stash save': $option\n" | |
10651 | " To provide a message, use git stash save -- '$option'" | |
10652 | msgstr "" | |
10653 | "错误:'stash save' 的未知选项:$option\n" | |
10654 | " 要提供一个描述信息,使用 git stash save -- '$option'" | |
10655 | ||
6acbf033 | 10656 | #: git-stash.sh:259 |
c04f5ac3 JX |
10657 | msgid "No local changes to save" |
10658 | msgstr "没有要保存的本地修改" | |
10659 | ||
6acbf033 | 10660 | #: git-stash.sh:263 |
c04f5ac3 | 10661 | msgid "Cannot initialize stash" |
90e6ef53 | 10662 | msgstr "无法初始化 stash" |
c04f5ac3 | 10663 | |
6acbf033 | 10664 | #: git-stash.sh:267 |
c04f5ac3 JX |
10665 | msgid "Cannot save the current status" |
10666 | msgstr "无法保存当前状态" | |
10667 | ||
6acbf033 | 10668 | #: git-stash.sh:285 |
c04f5ac3 JX |
10669 | msgid "Cannot remove worktree changes" |
10670 | msgstr "无法删除工作区变更" | |
10671 | ||
6acbf033 | 10672 | #: git-stash.sh:384 |
c04f5ac3 | 10673 | msgid "No stash found." |
90e6ef53 | 10674 | msgstr "未发现 stash。" |
c04f5ac3 | 10675 | |
6acbf033 | 10676 | #: git-stash.sh:391 |
c04f5ac3 JX |
10677 | #, sh-format |
10678 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 10679 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 | 10680 | |
6acbf033 | 10681 | #: git-stash.sh:397 |
c04f5ac3 | 10682 | #, sh-format |
220c313c JX |
10683 | msgid "$reference is not a valid reference" |
10684 | msgstr "$reference 不是一个有效的引用" | |
c04f5ac3 | 10685 | |
6acbf033 | 10686 | #: git-stash.sh:425 |
c04f5ac3 JX |
10687 | #, sh-format |
10688 | msgid "'$args' is not a stash-like commit" | |
90e6ef53 | 10689 | msgstr "'$args' 不是 stash 样提交" |
c04f5ac3 | 10690 | |
6acbf033 | 10691 | #: git-stash.sh:436 |
c04f5ac3 JX |
10692 | #, sh-format |
10693 | msgid "'$args' is not a stash reference" | |
90e6ef53 | 10694 | msgstr "'$args' 不是一个 stash 引用" |
c04f5ac3 | 10695 | |
6acbf033 | 10696 | #: git-stash.sh:444 |
c04f5ac3 | 10697 | msgid "unable to refresh index" |
90e6ef53 | 10698 | msgstr "无法刷新索引" |
c04f5ac3 | 10699 | |
6acbf033 | 10700 | #: git-stash.sh:448 |
c04f5ac3 JX |
10701 | msgid "Cannot apply a stash in the middle of a merge" |
10702 | msgstr "无法在合并过程中恢复进度" | |
10703 | ||
6acbf033 | 10704 | #: git-stash.sh:456 |
c04f5ac3 | 10705 | msgid "Conflicts in index. Try without --index." |
90e6ef53 | 10706 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 | 10707 | |
6acbf033 | 10708 | #: git-stash.sh:458 |
c04f5ac3 | 10709 | msgid "Could not save index tree" |
90e6ef53 | 10710 | msgstr "不能保存索引树" |
c04f5ac3 | 10711 | |
6acbf033 | 10712 | #: git-stash.sh:492 |
c04f5ac3 JX |
10713 | msgid "Cannot unstage modified files" |
10714 | msgstr "无法还原修改的文件" | |
10715 | ||
6acbf033 | 10716 | #: git-stash.sh:507 |
b694fbb1 JX |
10717 | msgid "Index was not unstashed." |
10718 | msgstr "索引的进度没有被恢复。" | |
10719 | ||
6acbf033 | 10720 | #: git-stash.sh:530 |
c04f5ac3 JX |
10721 | #, sh-format |
10722 | msgid "Dropped ${REV} ($s)" | |
10723 | msgstr "丢弃了 ${REV} ($s)" | |
10724 | ||
6acbf033 | 10725 | #: git-stash.sh:531 |
c04f5ac3 JX |
10726 | #, sh-format |
10727 | msgid "${REV}: Could not drop stash entry" | |
90e6ef53 | 10728 | msgstr "${REV}:不能丢弃进度条目" |
c04f5ac3 | 10729 | |
220c313c | 10730 | #: git-stash.sh:539 |
c04f5ac3 JX |
10731 | msgid "No branch name specified" |
10732 | msgstr "未指定分支名" | |
10733 | ||
220c313c | 10734 | #: git-stash.sh:611 |
c04f5ac3 JX |
10735 | msgid "(To restore them type \"git stash apply\")" |
10736 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
10737 | ||
2e8451e8 | 10738 | #: git-submodule.sh:95 |
c04f5ac3 JX |
10739 | #, sh-format |
10740 | msgid "cannot strip one component off url '$remoteurl'" | |
10741 | msgstr "无法从 url '$remoteurl' 剥离一个组件" | |
10742 | ||
2e8451e8 | 10743 | #: git-submodule.sh:237 |
c04f5ac3 | 10744 | #, sh-format |
170e9899 JX |
10745 | msgid "No submodule mapping found in .gitmodules for path '$sm_path'" |
10746 | msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射" | |
c04f5ac3 | 10747 | |
6c94aba5 | 10748 | #: git-submodule.sh:287 |
c04f5ac3 | 10749 | #, sh-format |
170e9899 JX |
10750 | msgid "Clone of '$url' into submodule path '$sm_path' failed" |
10751 | msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'" | |
c04f5ac3 | 10752 | |
6acbf033 | 10753 | #: git-submodule.sh:296 |
dac1de7d JX |
10754 | #, sh-format |
10755 | msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" | |
07432cef | 10756 | msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反" |
dac1de7d | 10757 | |
6acbf033 | 10758 | #: git-submodule.sh:406 |
2e8451e8 JX |
10759 | msgid "Relative path can only be used from the toplevel of the working tree" |
10760 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
10761 | ||
6acbf033 | 10762 | #: git-submodule.sh:416 |
c04f5ac3 JX |
10763 | #, sh-format |
10764 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
10765 | msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始" | |
10766 | ||
6acbf033 | 10767 | #: git-submodule.sh:433 |
c04f5ac3 | 10768 | #, sh-format |
170e9899 JX |
10769 | msgid "'$sm_path' already exists in the index" |
10770 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 10771 | |
6acbf033 | 10772 | #: git-submodule.sh:437 |
b694fbb1 JX |
10773 | #, sh-format |
10774 | msgid "" | |
10775 | "The following path is ignored by one of your .gitignore files:\n" | |
10776 | "$sm_path\n" | |
10777 | "Use -f if you really want to add it." | |
10778 | msgstr "" | |
10779 | "以下路径被您的一个 .gitignore 文件所忽略:\n" | |
10780 | "$sm_path\n" | |
10781 | "如果您确实想添加它,使用 -f 参数。" | |
10782 | ||
6acbf033 | 10783 | #: git-submodule.sh:455 |
b694fbb1 JX |
10784 | #, sh-format |
10785 | msgid "Adding existing repo at '$sm_path' to the index" | |
10786 | msgstr "添加位于 '$sm_path' 的现存版本库到索引" | |
10787 | ||
6acbf033 | 10788 | #: git-submodule.sh:457 |
c04f5ac3 | 10789 | #, sh-format |
170e9899 JX |
10790 | msgid "'$sm_path' already exists and is not a valid git repo" |
10791 | msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库" | |
c04f5ac3 | 10792 | |
6acbf033 | 10793 | #: git-submodule.sh:465 |
07432cef WS |
10794 | #, sh-format |
10795 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
10796 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:" | |
10797 | ||
6acbf033 | 10798 | #: git-submodule.sh:467 |
07432cef WS |
10799 | #, sh-format |
10800 | msgid "" | |
10801 | "If you want to reuse this local git directory instead of cloning again from" | |
10802 | msgstr "如果您想重用此本地 git 目录而不是重新克隆自" | |
10803 | ||
6acbf033 | 10804 | #: git-submodule.sh:469 |
07432cef WS |
10805 | #, sh-format |
10806 | msgid "" | |
10807 | "use the '--force' option. If the local git directory is not the correct repo" | |
10808 | msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库" | |
10809 | ||
6acbf033 | 10810 | #: git-submodule.sh:470 |
07432cef WS |
10811 | #, sh-format |
10812 | msgid "" | |
10813 | "or you are unsure what this means choose another name with the '--name' " | |
10814 | "option." | |
10815 | msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。" | |
10816 | ||
6acbf033 | 10817 | #: git-submodule.sh:472 |
07432cef WS |
10818 | #, sh-format |
10819 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
10820 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" | |
10821 | ||
6acbf033 | 10822 | #: git-submodule.sh:484 |
c04f5ac3 | 10823 | #, sh-format |
170e9899 JX |
10824 | msgid "Unable to checkout submodule '$sm_path'" |
10825 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 10826 | |
6acbf033 | 10827 | #: git-submodule.sh:489 |
c04f5ac3 | 10828 | #, sh-format |
170e9899 JX |
10829 | msgid "Failed to add submodule '$sm_path'" |
10830 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 10831 | |
6acbf033 | 10832 | #: git-submodule.sh:498 |
c04f5ac3 | 10833 | #, sh-format |
170e9899 JX |
10834 | msgid "Failed to register submodule '$sm_path'" |
10835 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 10836 | |
6acbf033 | 10837 | #: git-submodule.sh:542 |
c04f5ac3 | 10838 | #, sh-format |
2e8451e8 JX |
10839 | msgid "Entering '$prefix$displaypath'" |
10840 | msgstr "正在进入 '$prefix$displaypath'" | |
c04f5ac3 | 10841 | |
6acbf033 | 10842 | #: git-submodule.sh:562 |
c04f5ac3 | 10843 | #, sh-format |
2e8451e8 JX |
10844 | msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." |
10845 | msgstr "停止于 '$prefix$displaypath',脚本返回非零值。" | |
c04f5ac3 | 10846 | |
6acbf033 | 10847 | #: git-submodule.sh:608 |
c04f5ac3 | 10848 | #, sh-format |
2e8451e8 JX |
10849 | msgid "No url found for submodule path '$displaypath' in .gitmodules" |
10850 | msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url" | |
c04f5ac3 | 10851 | |
6acbf033 | 10852 | #: git-submodule.sh:617 |
c04f5ac3 | 10853 | #, sh-format |
2e8451e8 JX |
10854 | msgid "Failed to register url for submodule path '$displaypath'" |
10855 | msgstr "无法为子模组路径 '$displaypath' 注册 url" | |
c04f5ac3 | 10856 | |
6acbf033 | 10857 | #: git-submodule.sh:619 |
c04f5ac3 | 10858 | #, sh-format |
2e8451e8 JX |
10859 | msgid "Submodule '$name' ($url) registered for path '$displaypath'" |
10860 | msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
c04f5ac3 | 10861 | |
6acbf033 | 10862 | #: git-submodule.sh:636 |
d691f479 | 10863 | #, sh-format |
2e8451e8 JX |
10864 | msgid "Failed to register update mode for submodule path '$displaypath'" |
10865 | msgstr "无法为子模组路径 '$displaypath' 注册更新模式" | |
d691f479 | 10866 | |
6acbf033 | 10867 | #: git-submodule.sh:674 |
1003b3a5 JX |
10868 | #, sh-format |
10869 | msgid "Use '.' if you really want to deinitialize all submodules" | |
10870 | msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化" | |
10871 | ||
6acbf033 | 10872 | #: git-submodule.sh:691 |
1003b3a5 | 10873 | #, sh-format |
2e8451e8 JX |
10874 | msgid "Submodule work tree '$displaypath' contains a .git directory" |
10875 | msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录" | |
1003b3a5 | 10876 | |
6acbf033 | 10877 | #: git-submodule.sh:692 |
1003b3a5 JX |
10878 | #, sh-format |
10879 | msgid "" | |
10880 | "(use 'rm -rf' if you really want to remove it including all of its history)" | |
10881 | msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" | |
10882 | ||
6acbf033 | 10883 | #: git-submodule.sh:698 |
c04f5ac3 JX |
10884 | #, sh-format |
10885 | msgid "" | |
2e8451e8 | 10886 | "Submodule work tree '$displaypath' contains local modifications; use '-f' to " |
1003b3a5 | 10887 | "discard them" |
2e8451e8 | 10888 | msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们" |
1003b3a5 | 10889 | |
6acbf033 | 10890 | #: git-submodule.sh:701 |
1003b3a5 | 10891 | #, sh-format |
2e8451e8 JX |
10892 | msgid "Cleared directory '$displaypath'" |
10893 | msgstr "已清除目录 '$displaypath'" | |
1003b3a5 | 10894 | |
6acbf033 | 10895 | #: git-submodule.sh:702 |
1003b3a5 | 10896 | #, sh-format |
2e8451e8 JX |
10897 | msgid "Could not remove submodule work tree '$displaypath'" |
10898 | msgstr "无法移除子模组工作区 '$displaypath'" | |
1003b3a5 | 10899 | |
6acbf033 | 10900 | #: git-submodule.sh:705 |
1003b3a5 | 10901 | #, sh-format |
2e8451e8 JX |
10902 | msgid "Could not create empty submodule directory '$displaypath'" |
10903 | msgstr "不能创建空的子模组目录 '$displaypath'" | |
1003b3a5 | 10904 | |
6acbf033 | 10905 | #: git-submodule.sh:714 |
1003b3a5 | 10906 | #, sh-format |
2e8451e8 JX |
10907 | msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" |
10908 | msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
1003b3a5 | 10909 | |
6acbf033 | 10910 | #: git-submodule.sh:830 |
1003b3a5 JX |
10911 | #, sh-format |
10912 | msgid "" | |
2e8451e8 | 10913 | "Submodule path '$displaypath' not initialized\n" |
c04f5ac3 JX |
10914 | "Maybe you want to use 'update --init'?" |
10915 | msgstr "" | |
2e8451e8 | 10916 | "子模组路径 '$displaypath' 没有初始化\n" |
90e6ef53 | 10917 | "也许您想用 'update --init'?" |
c04f5ac3 | 10918 | |
6acbf033 | 10919 | #: git-submodule.sh:843 |
c04f5ac3 | 10920 | #, sh-format |
2e8451e8 JX |
10921 | msgid "Unable to find current revision in submodule path '$displaypath'" |
10922 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 10923 | |
6acbf033 | 10924 | #: git-submodule.sh:852 |
c04f5ac3 | 10925 | #, sh-format |
170e9899 JX |
10926 | msgid "Unable to fetch in submodule path '$sm_path'" |
10927 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 10928 | |
6acbf033 | 10929 | #: git-submodule.sh:876 |
2e8451e8 JX |
10930 | #, sh-format |
10931 | msgid "Unable to fetch in submodule path '$displaypath'" | |
10932 | msgstr "无法在子模组路径 '$displaypath' 中获取" | |
10933 | ||
6acbf033 | 10934 | #: git-submodule.sh:890 |
6c94aba5 JX |
10935 | #, sh-format |
10936 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
10937 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
10938 | ||
6acbf033 | 10939 | #: git-submodule.sh:891 |
c04f5ac3 | 10940 | #, sh-format |
6c94aba5 JX |
10941 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
10942 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
10943 | ||
6acbf033 | 10944 | #: git-submodule.sh:895 |
6c94aba5 | 10945 | #, sh-format |
2e8451e8 JX |
10946 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
10947 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 10948 | |
6acbf033 | 10949 | #: git-submodule.sh:896 |
c04f5ac3 | 10950 | #, sh-format |
2e8451e8 JX |
10951 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
10952 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 10953 | |
6acbf033 | 10954 | #: git-submodule.sh:901 |
c04f5ac3 | 10955 | #, sh-format |
2e8451e8 JX |
10956 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
10957 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 10958 | |
6acbf033 | 10959 | #: git-submodule.sh:902 |
c04f5ac3 | 10960 | #, sh-format |
2e8451e8 JX |
10961 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
10962 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 10963 | |
6acbf033 | 10964 | #: git-submodule.sh:907 |
c04f5ac3 | 10965 | #, sh-format |
2e8451e8 JX |
10966 | msgid "" |
10967 | "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" | |
10968 | msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败" | |
c04f5ac3 | 10969 | |
6acbf033 | 10970 | #: git-submodule.sh:908 |
c04f5ac3 | 10971 | #, sh-format |
2e8451e8 JX |
10972 | msgid "Submodule path '$prefix$sm_path': '$command $sha1'" |
10973 | msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'" | |
c04f5ac3 | 10974 | |
6acbf033 | 10975 | #: git-submodule.sh:938 |
2e8451e8 JX |
10976 | #, sh-format |
10977 | msgid "Failed to recurse into submodule path '$displaypath'" | |
10978 | msgstr "无法递归进子模组路径 '$displaypath'" | |
10979 | ||
6acbf033 | 10980 | #: git-submodule.sh:1046 |
649900bc JX |
10981 | msgid "The --cached option cannot be used with the --files option" |
10982 | msgstr "选项 --cached 不能和选项 --files 同时使用" | |
b694fbb1 | 10983 | |
6acbf033 | 10984 | #: git-submodule.sh:1098 |
b694fbb1 JX |
10985 | #, sh-format |
10986 | msgid "unexpected mode $mod_dst" | |
10987 | msgstr "意外的模式 $mod_dst" | |
c04f5ac3 | 10988 | |
90e6ef53 | 10989 | # 译者:注意保持前导空格 |
6acbf033 | 10990 | #: git-submodule.sh:1118 |
c04f5ac3 | 10991 | #, sh-format |
2e8451e8 JX |
10992 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
10993 | msgstr " 警告:$display_name 未包含提交 $sha1_src" | |
c04f5ac3 | 10994 | |
90e6ef53 | 10995 | # 译者:注意保持前导空格 |
6acbf033 | 10996 | #: git-submodule.sh:1121 |
c04f5ac3 | 10997 | #, sh-format |
2e8451e8 JX |
10998 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
10999 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" | |
c04f5ac3 | 11000 | |
90e6ef53 | 11001 | # 译者:注意保持前导空格 |
6acbf033 | 11002 | #: git-submodule.sh:1124 |
c04f5ac3 | 11003 | #, sh-format |
2e8451e8 JX |
11004 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
11005 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" | |
c04f5ac3 | 11006 | |
6acbf033 | 11007 | #: git-submodule.sh:1149 |
c04f5ac3 | 11008 | msgid "blob" |
07432cef | 11009 | msgstr "数据对象" |
c04f5ac3 | 11010 | |
6acbf033 | 11011 | #: git-submodule.sh:1267 |
1003b3a5 JX |
11012 | #, sh-format |
11013 | msgid "Failed to recurse into submodule path '$sm_path'" | |
11014 | msgstr "无法递归进子模组路径 '$sm_path'" | |
11015 | ||
6acbf033 | 11016 | #: git-submodule.sh:1331 |
c04f5ac3 | 11017 | #, sh-format |
2e8451e8 JX |
11018 | msgid "Synchronizing submodule url for '$displaypath'" |
11019 | msgstr "为 '$displaypath' 同步子模组 url" |