]>
Commit | Line | Data |
---|---|---|
c04f5ac3 JX |
1 | # Chinese translations for Git package |
2 | # Git 软件包的简体中文翻译. | |
3 | # Copyright (C) 2012 Jiang Xin <worldhello.net AT gmail.com> | |
4 | # This file is distributed under the same license as the Git package. | |
5 | # Contributers: | |
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" | |
8ada9598 | 15 | "POT-Creation-Date: 2012-05-21 08:57+0800\n" |
5ae481e0 | 16 | "PO-Revision-Date: 2012-06-01 17:43+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 | |
170e9899 | 25 | #: advice.c:40 |
c04f5ac3 JX |
26 | #, c-format |
27 | msgid "hint: %.*s\n" | |
28 | msgstr "提示:%.*s\n" | |
29 | ||
30 | #. | |
31 | #. * Message used both when 'git commit' fails and when | |
32 | #. * other commands doing a merge do. | |
33 | #. | |
170e9899 | 34 | #: advice.c:70 |
c04f5ac3 JX |
35 | msgid "" |
36 | "Fix them up in the work tree,\n" | |
37 | "and then use 'git add/rm <file>' as\n" | |
38 | "appropriate to mark resolution and make a commit,\n" | |
39 | "or use 'git commit -a'." | |
40 | msgstr "" | |
41 | "请先在工作区改正文件,然后酌情使用\n" | |
42 | "'git add/rm <file>' 标记解决方案,\n" | |
43 | "或使用 'git commit -a'。" | |
44 | ||
8ada9598 JX |
45 | #: bundle.c:36 |
46 | #, c-format | |
47 | msgid "'%s' does not look like a v2 bundle file" | |
81809b99 | 48 | msgstr "'%s' 不像是一个 v2 版本的包文件" |
8ada9598 JX |
49 | |
50 | #: bundle.c:63 | |
81809b99 | 51 | #, c-format |
8ada9598 | 52 | msgid "unrecognized header: %s%s (%d)" |
81809b99 | 53 | msgstr "未能识别的包头:%s%s (%d)" |
8ada9598 JX |
54 | |
55 | #: bundle.c:89 builtin/commit.c:697 | |
56 | #, c-format | |
57 | msgid "could not open '%s'" | |
58 | msgstr "不能打开 '%s'" | |
59 | ||
60 | #: bundle.c:140 | |
61 | msgid "Repository lacks these prerequisite commits:" | |
81809b99 | 62 | msgstr "版本库缺少这些必备的提交:" |
8ada9598 JX |
63 | |
64 | #: bundle.c:164 sequencer.c:533 sequencer.c:965 builtin/log.c:289 | |
65 | #: builtin/log.c:719 builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347 | |
66 | #: builtin/shortlog.c:181 | |
67 | msgid "revision walk setup failed" | |
68 | msgstr "版本遍历设置失败" | |
69 | ||
70 | #: bundle.c:186 | |
71 | #, c-format | |
72 | msgid "The bundle contains %d ref" | |
73 | msgid_plural "The bundle contains %d refs" | |
81809b99 | 74 | msgstr[0] "这个包中含有 %d 个引用" |
5ae481e0 | 75 | msgstr[1] "这个包中含有 %d 个引用" |
8ada9598 JX |
76 | |
77 | #: bundle.c:192 | |
78 | #, c-format | |
79 | msgid "The bundle requires this ref" | |
80 | msgid_plural "The bundle requires these %d refs" | |
81809b99 JX |
81 | msgstr[0] "这个包需要这个引用" |
82 | msgstr[1] "这个包需要 %d 个这些引用" | |
8ada9598 JX |
83 | |
84 | #: bundle.c:290 | |
85 | msgid "rev-list died" | |
81809b99 | 86 | msgstr "rev-list 终止" |
8ada9598 JX |
87 | |
88 | #: bundle.c:296 builtin/log.c:1231 builtin/shortlog.c:284 | |
89 | #, c-format | |
90 | msgid "unrecognized argument: %s" | |
81809b99 | 91 | msgstr "未能识别的参数:%s" |
8ada9598 JX |
92 | |
93 | #: bundle.c:331 | |
94 | #, c-format | |
95 | msgid "ref '%s' is excluded by the rev-list options" | |
81809b99 | 96 | msgstr "引用 '%s' 被 rev-list 选项排除" |
8ada9598 JX |
97 | |
98 | #: bundle.c:376 | |
8ada9598 | 99 | msgid "Refusing to create empty bundle." |
81809b99 | 100 | msgstr "不能创建空包。" |
8ada9598 JX |
101 | |
102 | #: bundle.c:394 | |
8ada9598 | 103 | msgid "Could not spawn pack-objects" |
81809b99 | 104 | msgstr "不能生成 pack-objects 进程" |
8ada9598 JX |
105 | |
106 | #: bundle.c:412 | |
107 | msgid "pack-objects died" | |
81809b99 | 108 | msgstr "pack-objects 终止" |
8ada9598 JX |
109 | |
110 | #: bundle.c:415 | |
81809b99 | 111 | #, c-format |
8ada9598 | 112 | msgid "cannot create '%s'" |
81809b99 | 113 | msgstr "不能创建 '%s'" |
8ada9598 JX |
114 | |
115 | #: bundle.c:437 | |
116 | msgid "index-pack died" | |
81809b99 | 117 | msgstr "index-pack 终止" |
8ada9598 | 118 | |
170e9899 | 119 | #: commit.c:48 |
c04f5ac3 JX |
120 | #, c-format |
121 | msgid "could not parse %s" | |
122 | msgstr "不能解析 %s" | |
123 | ||
170e9899 | 124 | #: commit.c:50 |
c04f5ac3 JX |
125 | #, c-format |
126 | msgid "%s %s is not a commit!" | |
127 | msgstr "%s %s 不是一个提交!" | |
128 | ||
129 | #: compat/obstack.c:406 compat/obstack.c:408 | |
130 | msgid "memory exhausted" | |
131 | msgstr "内存耗尽" | |
132 | ||
133 | #: connected.c:39 | |
134 | msgid "Could not run 'git rev-list'" | |
135 | msgstr "不能执行 'git rev-list'" | |
136 | ||
137 | #: connected.c:48 | |
138 | #, c-format | |
139 | msgid "failed write to rev-list: %s" | |
140 | msgstr "无法写入 rev-list:%s" | |
141 | ||
142 | #: connected.c:56 | |
143 | #, c-format | |
144 | msgid "failed to close rev-list's stdin: %s" | |
145 | msgstr "无法关闭 rev-list 的标准输入:%s" | |
146 | ||
8ada9598 JX |
147 | #: date.c:95 |
148 | msgid "in the future" | |
81809b99 | 149 | msgstr "在将来" |
8ada9598 JX |
150 | |
151 | #: date.c:101 | |
152 | #, c-format | |
153 | msgid "%lu second ago" | |
154 | msgid_plural "%lu seconds ago" | |
81809b99 | 155 | msgstr[0] "%lu 秒钟之前" |
5ae481e0 | 156 | msgstr[1] "%lu 秒钟之前" |
8ada9598 JX |
157 | |
158 | #: date.c:108 | |
159 | #, c-format | |
160 | msgid "%lu minute ago" | |
161 | msgid_plural "%lu minutes ago" | |
81809b99 | 162 | msgstr[0] "%lu 分钟之前" |
5ae481e0 | 163 | msgstr[1] "%lu 分钟之前" |
8ada9598 JX |
164 | |
165 | #: date.c:115 | |
166 | #, c-format | |
167 | msgid "%lu hour ago" | |
168 | msgid_plural "%lu hours ago" | |
81809b99 | 169 | msgstr[0] "%lu 小时之前" |
5ae481e0 | 170 | msgstr[1] "%lu 小时之前" |
8ada9598 JX |
171 | |
172 | #: date.c:122 | |
173 | #, c-format | |
174 | msgid "%lu day ago" | |
175 | msgid_plural "%lu days ago" | |
81809b99 | 176 | msgstr[0] "%lu 天之前" |
5ae481e0 | 177 | msgstr[1] "%lu 天之前" |
8ada9598 JX |
178 | |
179 | #: date.c:128 | |
180 | #, c-format | |
181 | msgid "%lu week ago" | |
182 | msgid_plural "%lu weeks ago" | |
81809b99 | 183 | msgstr[0] "%lu 周之前" |
5ae481e0 | 184 | msgstr[1] "%lu 周之前" |
8ada9598 JX |
185 | |
186 | #: date.c:135 | |
187 | #, c-format | |
188 | msgid "%lu month ago" | |
189 | msgid_plural "%lu months ago" | |
81809b99 | 190 | msgstr[0] "%lu 个月之前" |
5ae481e0 | 191 | msgstr[1] "%lu 个月之前" |
8ada9598 JX |
192 | |
193 | #: date.c:146 | |
194 | #, c-format | |
195 | msgid "%lu year" | |
196 | msgid_plural "%lu years" | |
81809b99 | 197 | msgstr[0] "%lu 年" |
5ae481e0 | 198 | msgstr[1] "%lu 年" |
8ada9598 JX |
199 | |
200 | #: date.c:149 | |
201 | #, c-format | |
202 | msgid "%s, %lu month ago" | |
203 | msgid_plural "%s, %lu months ago" | |
81809b99 | 204 | msgstr[0] "%s,%lu 个月之前" |
5ae481e0 | 205 | msgstr[1] "%s,%lu 个月之前" |
8ada9598 JX |
206 | |
207 | #: date.c:154 date.c:159 | |
208 | #, c-format | |
209 | msgid "%lu year ago" | |
210 | msgid_plural "%lu years ago" | |
81809b99 | 211 | msgstr[0] "%lu 年前" |
5ae481e0 | 212 | msgstr[1] "%lu 年前" |
8ada9598 | 213 | |
90e6ef53 | 214 | # 译者:注意保持前导空格 |
14c8bced | 215 | #: diff.c:105 |
c04f5ac3 JX |
216 | #, c-format |
217 | msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" | |
218 | msgstr " 无法解析 dirstat 阈值 '%.*s'\n" | |
219 | ||
90e6ef53 | 220 | # 译者:注意保持前导空格 |
14c8bced | 221 | #: diff.c:110 |
c04f5ac3 JX |
222 | #, c-format |
223 | msgid " Unknown dirstat parameter '%.*s'\n" | |
224 | msgstr " 未知 dirstat 参数 '%.*s'\n" | |
225 | ||
14c8bced | 226 | #: diff.c:210 |
c04f5ac3 JX |
227 | #, c-format |
228 | msgid "" | |
229 | "Found errors in 'diff.dirstat' config variable:\n" | |
230 | "%s" | |
231 | msgstr "" | |
90e6ef53 | 232 | "发现配置变量 'diff.dirstat' 中的错误:\n" |
c04f5ac3 JX |
233 | "%s" |
234 | ||
73a60cd2 | 235 | #: diff.c:1400 |
7ac1c0ad | 236 | msgid " 0 files changed\n" |
90e6ef53 | 237 | msgstr " 0 个文件被修改\n" |
7ac1c0ad | 238 | |
73a60cd2 | 239 | #: diff.c:1404 |
7ac1c0ad JX |
240 | #, c-format |
241 | msgid " %d file changed" | |
242 | msgid_plural " %d files changed" | |
61bc0753 | 243 | msgstr[0] " %d 个文件被修改" |
5ae481e0 | 244 | msgstr[1] " %d 个文件被修改" |
7ac1c0ad | 245 | |
73a60cd2 | 246 | #: diff.c:1421 |
7ac1c0ad JX |
247 | #, c-format |
248 | msgid ", %d insertion(+)" | |
249 | msgid_plural ", %d insertions(+)" | |
8ea38f47 | 250 | msgstr[0] ",插入 %d 行(+)" |
5ae481e0 | 251 | msgstr[1] ",插入 %d 行(+)" |
7ac1c0ad | 252 | |
73a60cd2 | 253 | #: diff.c:1432 |
7ac1c0ad JX |
254 | #, c-format |
255 | msgid ", %d deletion(-)" | |
256 | msgid_plural ", %d deletions(-)" | |
8ea38f47 | 257 | msgstr[0] ",删除 %d 行(-)" |
5ae481e0 | 258 | msgstr[1] ",删除 %d 行(-)" |
7ac1c0ad | 259 | |
8ada9598 | 260 | #: diff.c:3478 |
c04f5ac3 JX |
261 | #, c-format |
262 | msgid "" | |
263 | "Failed to parse --dirstat/-X option parameter:\n" | |
264 | "%s" | |
265 | msgstr "" | |
266 | "无法解析 --dirstat/-X 选项的参数:\n" | |
267 | "%s" | |
268 | ||
269 | #: gpg-interface.c:59 | |
270 | msgid "could not run gpg." | |
271 | msgstr "不能执行 gpg。" | |
272 | ||
273 | #: gpg-interface.c:71 | |
274 | msgid "gpg did not accept the data" | |
275 | msgstr "gpg 没有接受数据" | |
276 | ||
277 | #: gpg-interface.c:82 | |
278 | msgid "gpg failed to sign the data" | |
279 | msgstr "gpg 无法为数据签名" | |
280 | ||
14c8bced | 281 | #: grep.c:1280 |
7ac1c0ad JX |
282 | #, c-format |
283 | msgid "'%s': unable to read %s" | |
284 | msgstr "'%s':无法读取 %s" | |
285 | ||
14c8bced | 286 | #: grep.c:1297 |
7ac1c0ad JX |
287 | #, c-format |
288 | msgid "'%s': %s" | |
289 | msgstr "'%s':%s" | |
290 | ||
14c8bced | 291 | #: grep.c:1308 |
7ac1c0ad JX |
292 | #, c-format |
293 | msgid "'%s': short read %s" | |
294 | msgstr "'%s':读取不完整 %s" | |
295 | ||
8ada9598 | 296 | #: help.c:207 |
81809b99 | 297 | #, c-format |
8ada9598 | 298 | msgid "available git commands in '%s'" |
81809b99 | 299 | msgstr "在 '%s' 下可用的 git 命令" |
8ada9598 JX |
300 | |
301 | #: help.c:214 | |
302 | msgid "git commands available from elsewhere on your $PATH" | |
81809b99 | 303 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" |
8ada9598 JX |
304 | |
305 | #: help.c:270 | |
c04f5ac3 JX |
306 | #, c-format |
307 | msgid "" | |
308 | "'%s' appears to be a git command, but we were not\n" | |
309 | "able to execute it. Maybe git-%s is broken?" | |
310 | msgstr "" | |
311 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
312 | "可能是 git-%s 受损?" | |
313 | ||
8ada9598 JX |
314 | #: help.c:327 |
315 | msgid "Uh oh. Your system reports no Git commands at all." | |
81809b99 | 316 | msgstr "唉呀,您的系统中未发现 Git 命令。" |
8ada9598 JX |
317 | |
318 | #: help.c:349 | |
319 | #, c-format | |
320 | msgid "" | |
321 | "WARNING: You called a Git command named '%s', which does not exist.\n" | |
322 | "Continuing under the assumption that you meant '%s'" | |
323 | msgstr "" | |
81809b99 JX |
324 | "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" |
325 | "是 '%s'" | |
8ada9598 JX |
326 | |
327 | #: help.c:354 | |
328 | #, c-format | |
329 | msgid "in %0.1f seconds automatically..." | |
81809b99 | 330 | msgstr "在 %0.1f 秒钟后自动运行..." |
8ada9598 JX |
331 | |
332 | #: help.c:361 | |
333 | #, c-format | |
334 | msgid "git: '%s' is not a git command. See 'git --help'." | |
81809b99 | 335 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" |
8ada9598 JX |
336 | |
337 | #: help.c:365 | |
338 | msgid "" | |
339 | "\n" | |
340 | "Did you mean this?" | |
341 | msgid_plural "" | |
342 | "\n" | |
343 | "Did you mean one of these?" | |
344 | msgstr[0] "" | |
81809b99 JX |
345 | "\n" |
346 | "您指的是这个么?" | |
347 | msgstr[1] "" | |
348 | "\n" | |
349 | "您指的是这些其中一个么?" | |
8ada9598 JX |
350 | |
351 | #: parse-options.c:493 | |
352 | msgid "..." | |
81809b99 | 353 | msgstr "..." |
8ada9598 JX |
354 | |
355 | #: parse-options.c:511 | |
81809b99 | 356 | #, c-format |
8ada9598 | 357 | msgid "usage: %s" |
81809b99 | 358 | msgstr "用法:%s" |
8ada9598 JX |
359 | |
360 | #. TRANSLATORS: the colon here should align with the | |
361 | #. one in "usage: %s" translation | |
362 | #: parse-options.c:515 | |
81809b99 | 363 | #, c-format |
8ada9598 | 364 | msgid " or: %s" |
81809b99 | 365 | msgstr " 或:%s" |
8ada9598 JX |
366 | |
367 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
368 | #: parse-options.c:518 | |
81809b99 | 369 | #, c-format |
8ada9598 | 370 | msgid " %s" |
81809b99 | 371 | msgstr " %s" |
8ada9598 | 372 | |
7ac1c0ad | 373 | #: remote.c:1607 |
c04f5ac3 JX |
374 | #, c-format |
375 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
376 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
377 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
5ae481e0 | 378 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" |
c04f5ac3 | 379 | |
7ac1c0ad | 380 | #: remote.c:1613 |
c04f5ac3 JX |
381 | #, c-format |
382 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
383 | msgid_plural "" | |
384 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
90e6ef53 | 385 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
5ae481e0 | 386 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
c04f5ac3 | 387 | |
7ac1c0ad | 388 | #: remote.c:1621 |
c04f5ac3 JX |
389 | #, c-format |
390 | msgid "" | |
391 | "Your branch and '%s' have diverged,\n" | |
392 | "and have %d and %d different commit each, respectively.\n" | |
393 | msgid_plural "" | |
394 | "Your branch and '%s' have diverged,\n" | |
395 | "and have %d and %d different commits each, respectively.\n" | |
396 | msgstr[0] "" | |
397 | "您的分支和 '%s' 出现了偏离,\n" | |
398 | "并且各自分别有 %d 和 %d 处不同的提交。\n" | |
5ae481e0 JX |
399 | msgstr[1] "" |
400 | "您的分支和 '%s' 出现了偏离,\n" | |
401 | "并且各自分别有 %d 和 %d 处不同的提交。\n" | |
c04f5ac3 | 402 | |
8ada9598 | 403 | #: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978 |
170e9899 | 404 | #: builtin/merge.c:1088 builtin/merge.c:1098 |
c04f5ac3 JX |
405 | #, c-format |
406 | msgid "Could not open '%s' for writing" | |
90e6ef53 | 407 | msgstr "不能为写入打开 '%s'" |
c04f5ac3 | 408 | |
8ada9598 | 409 | #: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868 |
170e9899 | 410 | #: builtin/merge.c:1090 builtin/merge.c:1103 |
c04f5ac3 JX |
411 | #, c-format |
412 | msgid "Could not write to '%s'" | |
90e6ef53 | 413 | msgstr "不能写入 '%s'" |
c04f5ac3 | 414 | |
8ada9598 | 415 | #: sequencer.c:144 |
14c8bced JX |
416 | msgid "" |
417 | "after resolving the conflicts, mark the corrected paths\n" | |
418 | "with 'git add <paths>' or 'git rm <paths>'" | |
419 | msgstr "" | |
420 | "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n" | |
421 | "命令标记修正后的文件" | |
422 | ||
8ada9598 | 423 | #: sequencer.c:147 |
c04f5ac3 JX |
424 | msgid "" |
425 | "after resolving the conflicts, mark the corrected paths\n" | |
426 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
427 | "and commit the result with 'git commit'" | |
428 | msgstr "" | |
429 | "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n" | |
430 | "对修正后的文件做标记,然后用 'git commit' 提交" | |
431 | ||
8ada9598 | 432 | #: sequencer.c:160 sequencer.c:741 sequencer.c:824 |
c04f5ac3 JX |
433 | #, c-format |
434 | msgid "Could not write to %s" | |
435 | msgstr "不能写入 %s" | |
436 | ||
8ada9598 | 437 | #: sequencer.c:163 |
c04f5ac3 JX |
438 | #, c-format |
439 | msgid "Error wrapping up %s" | |
440 | msgstr "错误收尾 %s" | |
441 | ||
8ada9598 | 442 | #: sequencer.c:178 |
c04f5ac3 JX |
443 | msgid "Your local changes would be overwritten by cherry-pick." |
444 | msgstr "您的本地修改将被拣选操作覆盖。" | |
445 | ||
8ada9598 | 446 | #: sequencer.c:180 |
c04f5ac3 JX |
447 | msgid "Your local changes would be overwritten by revert." |
448 | msgstr "您的本地修改将被还原操作覆盖。" | |
449 | ||
8ada9598 | 450 | #: sequencer.c:183 |
c04f5ac3 JX |
451 | msgid "Commit your changes or stash them to proceed." |
452 | msgstr "提交您的修改或保存进度后再继续。" | |
453 | ||
454 | #. TRANSLATORS: %s will be "revert" or "cherry-pick" | |
8ada9598 | 455 | #: sequencer.c:233 |
c04f5ac3 JX |
456 | #, c-format |
457 | msgid "%s: Unable to write new index file" | |
90e6ef53 | 458 | msgstr "%s:无法写入新索引文件" |
c04f5ac3 | 459 | |
8ada9598 | 460 | #: sequencer.c:261 |
8ada9598 | 461 | msgid "Could not resolve HEAD commit\n" |
81809b99 | 462 | msgstr "不能解析 HEAD 提交\n" |
8ada9598 JX |
463 | |
464 | #: sequencer.c:282 | |
8ada9598 | 465 | msgid "Unable to update cache tree\n" |
81809b99 | 466 | msgstr "不能更新缓存\n" |
8ada9598 JX |
467 | |
468 | #: sequencer.c:323 | |
81809b99 | 469 | #, c-format |
8ada9598 | 470 | msgid "Could not parse commit %s\n" |
81809b99 | 471 | msgstr "不能解析提交 %s\n" |
8ada9598 JX |
472 | |
473 | #: sequencer.c:328 | |
81809b99 | 474 | #, c-format |
8ada9598 | 475 | msgid "Could not parse parent commit %s\n" |
81809b99 | 476 | msgstr "不能解析父提交 %s\n" |
8ada9598 JX |
477 | |
478 | #: sequencer.c:358 | |
c04f5ac3 | 479 | msgid "Your index file is unmerged." |
90e6ef53 | 480 | msgstr "您的索引文件未完成合并。" |
c04f5ac3 | 481 | |
8ada9598 | 482 | #: sequencer.c:361 |
c04f5ac3 JX |
483 | msgid "You do not have a valid HEAD" |
484 | msgstr "您没有一个有效的 HEAD" | |
485 | ||
8ada9598 | 486 | #: sequencer.c:376 |
c04f5ac3 JX |
487 | #, c-format |
488 | msgid "Commit %s is a merge but no -m option was given." | |
489 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
490 | ||
8ada9598 | 491 | #: sequencer.c:384 |
c04f5ac3 JX |
492 | #, c-format |
493 | msgid "Commit %s does not have parent %d" | |
494 | msgstr "提交 %s 没有父提交 %d" | |
495 | ||
8ada9598 | 496 | #: sequencer.c:388 |
c04f5ac3 JX |
497 | #, c-format |
498 | msgid "Mainline was specified but commit %s is not a merge." | |
90e6ef53 | 499 | msgstr "指定了主线但提交 %s 不是一个合并。" |
c04f5ac3 JX |
500 | |
501 | #. TRANSLATORS: The first %s will be "revert" or | |
502 | #. "cherry-pick", the second %s a SHA1 | |
8ada9598 | 503 | #: sequencer.c:399 |
c04f5ac3 JX |
504 | #, c-format |
505 | msgid "%s: cannot parse parent commit %s" | |
506 | msgstr "%s:不能解析父提交 %s" | |
507 | ||
8ada9598 | 508 | #: sequencer.c:403 |
c04f5ac3 JX |
509 | #, c-format |
510 | msgid "Cannot get commit message for %s" | |
511 | msgstr "不能得到 %s 的提交说明" | |
512 | ||
8ada9598 | 513 | #: sequencer.c:491 |
c04f5ac3 JX |
514 | #, c-format |
515 | msgid "could not revert %s... %s" | |
516 | msgstr "不能还原 %s... %s" | |
517 | ||
8ada9598 | 518 | #: sequencer.c:492 |
c04f5ac3 JX |
519 | #, c-format |
520 | msgid "could not apply %s... %s" | |
521 | msgstr "不能应用 %s... %s" | |
522 | ||
8ada9598 | 523 | #: sequencer.c:536 |
c04f5ac3 JX |
524 | msgid "empty commit set passed" |
525 | msgstr "提供了空的提交集" | |
526 | ||
8ada9598 | 527 | #: sequencer.c:544 |
c04f5ac3 JX |
528 | #, c-format |
529 | msgid "git %s: failed to read the index" | |
90e6ef53 | 530 | msgstr "git %s:无法读取索引" |
c04f5ac3 | 531 | |
8ada9598 | 532 | #: sequencer.c:549 |
c04f5ac3 JX |
533 | #, c-format |
534 | msgid "git %s: failed to refresh the index" | |
90e6ef53 | 535 | msgstr "git %s:无法刷新索引" |
c04f5ac3 | 536 | |
8ada9598 | 537 | #: sequencer.c:607 |
c04f5ac3 JX |
538 | #, c-format |
539 | msgid "Cannot %s during a %s" | |
90e6ef53 | 540 | msgstr "无法 %s 在一个 %s 过程中" |
c04f5ac3 | 541 | |
8ada9598 | 542 | #: sequencer.c:629 |
c04f5ac3 JX |
543 | #, c-format |
544 | msgid "Could not parse line %d." | |
90e6ef53 | 545 | msgstr "不能解析第 %d 行。" |
c04f5ac3 | 546 | |
8ada9598 | 547 | #: sequencer.c:634 |
c04f5ac3 | 548 | msgid "No commits parsed." |
7e238ab7 | 549 | msgstr "没有提交被解析。" |
c04f5ac3 | 550 | |
8ada9598 | 551 | #: sequencer.c:647 |
c04f5ac3 JX |
552 | #, c-format |
553 | msgid "Could not open %s" | |
554 | msgstr "不能打开 %s" | |
555 | ||
8ada9598 | 556 | #: sequencer.c:651 |
c04f5ac3 JX |
557 | #, c-format |
558 | msgid "Could not read %s." | |
559 | msgstr "不能读取 %s。" | |
560 | ||
8ada9598 | 561 | #: sequencer.c:658 |
c04f5ac3 JX |
562 | #, c-format |
563 | msgid "Unusable instruction sheet: %s" | |
564 | msgstr "无用的指令表单:%s" | |
565 | ||
8ada9598 | 566 | #: sequencer.c:686 |
c04f5ac3 JX |
567 | #, c-format |
568 | msgid "Invalid key: %s" | |
569 | msgstr "无效键名:%s" | |
570 | ||
8ada9598 | 571 | #: sequencer.c:689 |
c04f5ac3 JX |
572 | #, c-format |
573 | msgid "Invalid value for %s: %s" | |
81809b99 | 574 | msgstr "%s 的值无效:%s" |
c04f5ac3 | 575 | |
8ada9598 | 576 | #: sequencer.c:701 |
c04f5ac3 JX |
577 | #, c-format |
578 | msgid "Malformed options sheet: %s" | |
579 | msgstr "非法的选项表单:%s" | |
580 | ||
8ada9598 | 581 | #: sequencer.c:722 |
c04f5ac3 JX |
582 | msgid "a cherry-pick or revert is already in progress" |
583 | msgstr "一个拣选或还原操作已在进行" | |
584 | ||
8ada9598 | 585 | #: sequencer.c:723 |
c04f5ac3 JX |
586 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
587 | msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" | |
588 | ||
8ada9598 | 589 | #: sequencer.c:727 |
c04f5ac3 JX |
590 | #, c-format |
591 | msgid "Could not create sequencer directory %s" | |
90e6ef53 | 592 | msgstr "不能创建序列目录 %s" |
c04f5ac3 | 593 | |
8ada9598 | 594 | #: sequencer.c:743 sequencer.c:828 |
c04f5ac3 JX |
595 | #, c-format |
596 | msgid "Error wrapping up %s." | |
597 | msgstr "错误收尾 %s。" | |
598 | ||
8ada9598 | 599 | #: sequencer.c:762 sequencer.c:896 |
c04f5ac3 JX |
600 | msgid "no cherry-pick or revert in progress" |
601 | msgstr "没有拣选或还原操作在进行" | |
602 | ||
8ada9598 | 603 | #: sequencer.c:764 |
c04f5ac3 JX |
604 | msgid "cannot resolve HEAD" |
605 | msgstr "不能解析 HEAD" | |
606 | ||
8ada9598 | 607 | #: sequencer.c:766 |
c04f5ac3 | 608 | msgid "cannot abort from a branch yet to be born" |
90e6ef53 | 609 | msgstr "不能从尚未建立的分支终止" |
c04f5ac3 | 610 | |
8ada9598 | 611 | #: sequencer.c:788 builtin/apply.c:3689 |
c04f5ac3 JX |
612 | #, c-format |
613 | msgid "cannot open %s: %s" | |
614 | msgstr "不能打开 %s:%s" | |
615 | ||
8ada9598 | 616 | #: sequencer.c:791 |
c04f5ac3 JX |
617 | #, c-format |
618 | msgid "cannot read %s: %s" | |
619 | msgstr "不能读取 %s:%s" | |
620 | ||
8ada9598 | 621 | #: sequencer.c:792 |
c04f5ac3 JX |
622 | msgid "unexpected end of file" |
623 | msgstr "未预期的文件结束" | |
624 | ||
8ada9598 | 625 | #: sequencer.c:798 |
c04f5ac3 JX |
626 | #, c-format |
627 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
90e6ef53 | 628 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" |
c04f5ac3 | 629 | |
8ada9598 | 630 | #: sequencer.c:821 |
c04f5ac3 JX |
631 | #, c-format |
632 | msgid "Could not format %s." | |
633 | msgstr "不能格式化 %s。" | |
634 | ||
8ada9598 | 635 | #: sequencer.c:983 |
c04f5ac3 JX |
636 | msgid "Can't revert as initial commit" |
637 | msgstr "不能作为初始提交还原" | |
638 | ||
8ada9598 | 639 | #: sequencer.c:984 |
c04f5ac3 JX |
640 | msgid "Can't cherry-pick into empty head" |
641 | msgstr "不能拣选到空分支" | |
642 | ||
170e9899 JX |
643 | #: sha1_name.c:864 |
644 | msgid "HEAD does not point to a branch" | |
645 | msgstr "HEAD 没有指向一个分支" | |
646 | ||
647 | #: sha1_name.c:867 | |
648 | #, c-format | |
649 | msgid "No such branch: '%s'" | |
650 | msgstr "没有此分支:'%s'" | |
651 | ||
652 | #: sha1_name.c:869 | |
653 | #, c-format | |
654 | msgid "No upstream configured for branch '%s'" | |
655 | msgstr "尚未给分支 '%s' 设置上游" | |
656 | ||
657 | #: sha1_name.c:872 | |
658 | #, c-format | |
659 | msgid "Upstream branch '%s' not stored as a remote-tracking branch" | |
660 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
661 | ||
8ada9598 | 662 | #: wt-status.c:135 |
c04f5ac3 JX |
663 | msgid "Unmerged paths:" |
664 | msgstr "未合并的路径:" | |
665 | ||
90e6ef53 | 666 | # 译者:注意保持前导空格 |
8ada9598 | 667 | #: wt-status.c:141 wt-status.c:158 |
c04f5ac3 JX |
668 | #, c-format |
669 | msgid " (use \"git reset %s <file>...\" to unstage)" | |
670 | msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)" | |
671 | ||
90e6ef53 | 672 | # 译者:注意保持前导空格 |
8ada9598 | 673 | #: wt-status.c:143 wt-status.c:160 |
c04f5ac3 JX |
674 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
675 | msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)" | |
676 | ||
90e6ef53 | 677 | # 译者:注意保持前导空格 |
8ada9598 | 678 | #: wt-status.c:144 |
c04f5ac3 JX |
679 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
680 | msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)" | |
681 | ||
8ada9598 | 682 | #: wt-status.c:152 |
c04f5ac3 JX |
683 | msgid "Changes to be committed:" |
684 | msgstr "要提交的变更:" | |
685 | ||
8ada9598 | 686 | #: wt-status.c:170 |
c04f5ac3 | 687 | msgid "Changes not staged for commit:" |
7e238ab7 | 688 | msgstr "尚未暂存以备提交的变更:" |
c04f5ac3 | 689 | |
90e6ef53 | 690 | # 译者:注意保持前导空格 |
8ada9598 | 691 | #: wt-status.c:174 |
c04f5ac3 JX |
692 | msgid " (use \"git add <file>...\" to update what will be committed)" |
693 | msgstr " (使用 \"git add <file>...\" 更新要提交的内容)" | |
694 | ||
90e6ef53 | 695 | # 译者:注意保持前导空格 |
8ada9598 | 696 | #: wt-status.c:176 |
c04f5ac3 JX |
697 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
698 | msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)" | |
699 | ||
90e6ef53 | 700 | # 译者:注意保持前导空格 |
8ada9598 | 701 | #: wt-status.c:177 |
c04f5ac3 JX |
702 | msgid "" |
703 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" | |
704 | msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)" | |
705 | ||
90e6ef53 | 706 | # 译者:注意保持前导空格 |
8ada9598 | 707 | #: wt-status.c:179 |
c04f5ac3 JX |
708 | msgid " (commit or discard the untracked or modified content in submodules)" |
709 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
710 | ||
8ada9598 | 711 | #: wt-status.c:188 |
c04f5ac3 JX |
712 | #, c-format |
713 | msgid "%s files:" | |
714 | msgstr "%s文件:" | |
715 | ||
90e6ef53 | 716 | # 译者:注意保持前导空格 |
8ada9598 | 717 | #: wt-status.c:191 |
c04f5ac3 JX |
718 | #, c-format |
719 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
90e6ef53 | 720 | msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)" |
c04f5ac3 | 721 | |
8ada9598 | 722 | #: wt-status.c:208 |
c04f5ac3 JX |
723 | msgid "bug" |
724 | msgstr "bug" | |
725 | ||
8ada9598 | 726 | #: wt-status.c:213 |
c04f5ac3 JX |
727 | msgid "both deleted:" |
728 | msgstr "双方删除:" | |
729 | ||
8ada9598 | 730 | #: wt-status.c:214 |
c04f5ac3 JX |
731 | msgid "added by us:" |
732 | msgstr "由我们添加:" | |
733 | ||
8ada9598 | 734 | #: wt-status.c:215 |
c04f5ac3 JX |
735 | msgid "deleted by them:" |
736 | msgstr "由他们删除:" | |
737 | ||
8ada9598 | 738 | #: wt-status.c:216 |
c04f5ac3 JX |
739 | msgid "added by them:" |
740 | msgstr "由他们添加:" | |
741 | ||
8ada9598 | 742 | #: wt-status.c:217 |
c04f5ac3 JX |
743 | msgid "deleted by us:" |
744 | msgstr "由我们删除:" | |
745 | ||
8ada9598 | 746 | #: wt-status.c:218 |
c04f5ac3 JX |
747 | msgid "both added:" |
748 | msgstr "双方添加:" | |
749 | ||
8ada9598 | 750 | #: wt-status.c:219 |
c04f5ac3 JX |
751 | msgid "both modified:" |
752 | msgstr "双方修改:" | |
753 | ||
90e6ef53 | 754 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
8ada9598 | 755 | #: wt-status.c:249 |
c04f5ac3 | 756 | msgid "new commits, " |
aa9565f7 | 757 | msgstr "新提交, " |
c04f5ac3 | 758 | |
90e6ef53 | 759 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
8ada9598 | 760 | #: wt-status.c:251 |
c04f5ac3 | 761 | msgid "modified content, " |
aa9565f7 | 762 | msgstr "修改的内容, " |
c04f5ac3 | 763 | |
90e6ef53 | 764 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
8ada9598 | 765 | #: wt-status.c:253 |
c04f5ac3 | 766 | msgid "untracked content, " |
aa9565f7 | 767 | msgstr "未跟踪的内容, " |
c04f5ac3 | 768 | |
90e6ef53 | 769 | # 译者:为保证在输出中对齐,注意调整句中空格! |
8ada9598 | 770 | #: wt-status.c:267 |
c04f5ac3 JX |
771 | #, c-format |
772 | msgid "new file: %s" | |
773 | msgstr "新文件: %s" | |
774 | ||
90e6ef53 | 775 | # 译者:为保证在输出中对齐,注意调整句中空格! |
8ada9598 | 776 | #: wt-status.c:270 |
c04f5ac3 JX |
777 | #, c-format |
778 | msgid "copied: %s -> %s" | |
779 | msgstr "拷贝: %s -> %s" | |
780 | ||
90e6ef53 | 781 | # 译者:为保证在输出中对齐,注意调整句中空格! |
8ada9598 | 782 | #: wt-status.c:273 |
c04f5ac3 JX |
783 | #, c-format |
784 | msgid "deleted: %s" | |
785 | msgstr "删除: %s" | |
786 | ||
90e6ef53 | 787 | # 译者:为保证在输出中对齐,注意调整句中空格! |
8ada9598 | 788 | #: wt-status.c:276 |
c04f5ac3 JX |
789 | #, c-format |
790 | msgid "modified: %s" | |
791 | msgstr "修改: %s" | |
792 | ||
90e6ef53 | 793 | # 译者:为保证在输出中对齐,注意调整句中空格! |
8ada9598 | 794 | #: wt-status.c:279 |
c04f5ac3 JX |
795 | #, c-format |
796 | msgid "renamed: %s -> %s" | |
797 | msgstr "重命名: %s -> %s" | |
798 | ||
90e6ef53 | 799 | # 译者:为保证在输出中对齐,注意调整句中空格! |
8ada9598 | 800 | #: wt-status.c:282 |
c04f5ac3 JX |
801 | #, c-format |
802 | msgid "typechange: %s" | |
803 | msgstr "类型变更: %s" | |
804 | ||
90e6ef53 | 805 | # 译者:为保证在输出中对齐,注意调整句中空格! |
8ada9598 | 806 | #: wt-status.c:285 |
c04f5ac3 JX |
807 | #, c-format |
808 | msgid "unknown: %s" | |
809 | msgstr "未知: %s" | |
810 | ||
90e6ef53 | 811 | # 译者:为保证在输出中对齐,注意调整句中空格! |
8ada9598 | 812 | #: wt-status.c:288 |
c04f5ac3 JX |
813 | #, c-format |
814 | msgid "unmerged: %s" | |
815 | msgstr "未合并: %s" | |
816 | ||
8ada9598 | 817 | #: wt-status.c:291 |
c04f5ac3 JX |
818 | #, c-format |
819 | msgid "bug: unhandled diff status %c" | |
90e6ef53 | 820 | msgstr "bug:未处理的差异状态 %c" |
c04f5ac3 | 821 | |
8ada9598 | 822 | #: wt-status.c:737 |
c04f5ac3 JX |
823 | msgid "On branch " |
824 | msgstr "位于分支 " | |
825 | ||
8ada9598 | 826 | #: wt-status.c:744 |
c04f5ac3 JX |
827 | msgid "Not currently on any branch." |
828 | msgstr "当前不在任何分支上。" | |
829 | ||
8ada9598 | 830 | #: wt-status.c:755 |
c04f5ac3 JX |
831 | msgid "Initial commit" |
832 | msgstr "初始提交" | |
833 | ||
8ada9598 | 834 | #: wt-status.c:769 |
c04f5ac3 JX |
835 | msgid "Untracked" |
836 | msgstr "未跟踪的" | |
837 | ||
8ada9598 | 838 | #: wt-status.c:771 |
c04f5ac3 JX |
839 | msgid "Ignored" |
840 | msgstr "忽略的" | |
841 | ||
8ada9598 | 842 | #: wt-status.c:773 |
c04f5ac3 JX |
843 | #, c-format |
844 | msgid "Untracked files not listed%s" | |
845 | msgstr "未跟踪的文件没有列出%s" | |
846 | ||
7e238ab7 | 847 | # 译者:中文字符串拼接,可删除前导空格 |
8ada9598 | 848 | #: wt-status.c:775 |
c04f5ac3 | 849 | msgid " (use -u option to show untracked files)" |
7e238ab7 | 850 | msgstr "(使用 -u 参数显示未跟踪的文件)" |
c04f5ac3 | 851 | |
8ada9598 | 852 | #: wt-status.c:781 |
c04f5ac3 JX |
853 | msgid "No changes" |
854 | msgstr "没有修改" | |
855 | ||
8ada9598 | 856 | #: wt-status.c:785 |
c04f5ac3 JX |
857 | #, c-format |
858 | msgid "no changes added to commit%s\n" | |
859 | msgstr "修改尚未加入提交%s\n" | |
860 | ||
7e238ab7 | 861 | # 译者:中文字符串拼接,可删除前导空格 |
8ada9598 | 862 | #: wt-status.c:787 |
c04f5ac3 | 863 | msgid " (use \"git add\" and/or \"git commit -a\")" |
7e238ab7 | 864 | msgstr "(使用 \"git add\" 和/或 \"git commit -a\")" |
c04f5ac3 | 865 | |
8ada9598 | 866 | #: wt-status.c:789 |
c04f5ac3 JX |
867 | #, c-format |
868 | msgid "nothing added to commit but untracked files present%s\n" | |
869 | msgstr "空提交但存在未跟踪文件%s\n" | |
870 | ||
7e238ab7 | 871 | # 译者:中文字符串拼接,可删除前导空格 |
8ada9598 | 872 | #: wt-status.c:791 |
c04f5ac3 | 873 | msgid " (use \"git add\" to track)" |
7e238ab7 | 874 | msgstr "(使用 \"git add\" 建立跟踪)" |
c04f5ac3 | 875 | |
8ada9598 | 876 | #: wt-status.c:793 wt-status.c:796 wt-status.c:799 |
c04f5ac3 JX |
877 | #, c-format |
878 | msgid "nothing to commit%s\n" | |
879 | msgstr "无须提交%s\n" | |
880 | ||
7e238ab7 | 881 | # 译者:中文字符串拼接,可删除前导空格 |
8ada9598 | 882 | #: wt-status.c:794 |
c04f5ac3 | 883 | msgid " (create/copy files and use \"git add\" to track)" |
7e238ab7 | 884 | msgstr "(新建/拷贝的文件使用 \"git add\" 建立跟踪)" |
c04f5ac3 | 885 | |
7e238ab7 | 886 | # 译者:中文字符串拼接,可删除前导空格 |
8ada9598 | 887 | #: wt-status.c:797 |
c04f5ac3 | 888 | msgid " (use -u to show untracked files)" |
7e238ab7 | 889 | msgstr "(使用 -u 显示未跟踪文件)" |
c04f5ac3 | 890 | |
7e238ab7 | 891 | # 译者:中文字符串拼接,可删除前导空格 |
8ada9598 | 892 | #: wt-status.c:800 |
c04f5ac3 | 893 | msgid " (working directory clean)" |
7e238ab7 | 894 | msgstr "(干净的工作区)" |
c04f5ac3 | 895 | |
8ada9598 | 896 | #: wt-status.c:908 |
c04f5ac3 | 897 | msgid "HEAD (no branch)" |
61bc0753 | 898 | msgstr "HEAD(非分支)" |
c04f5ac3 | 899 | |
90e6ef53 | 900 | # 译者:注意保持句尾空格 |
8ada9598 | 901 | #: wt-status.c:914 |
c04f5ac3 JX |
902 | msgid "Initial commit on " |
903 | msgstr "初始提交于 " | |
904 | ||
90e6ef53 | 905 | # 译者:注意保持句尾空格 |
8ada9598 | 906 | #: wt-status.c:929 |
c04f5ac3 JX |
907 | msgid "behind " |
908 | msgstr "落后 " | |
909 | ||
90e6ef53 | 910 | # 译者:注意保持句尾空格 |
8ada9598 | 911 | #: wt-status.c:932 wt-status.c:935 |
c04f5ac3 JX |
912 | msgid "ahead " |
913 | msgstr "领先 " | |
914 | ||
90e6ef53 | 915 | # 译者:注意保持句尾空格 |
8ada9598 | 916 | #: wt-status.c:937 |
c04f5ac3 JX |
917 | msgid ", behind " |
918 | msgstr ",落后 " | |
919 | ||
920 | #: builtin/add.c:62 | |
921 | #, c-format | |
922 | msgid "unexpected diff status %c" | |
923 | msgstr "意外的差异状态 %c" | |
924 | ||
8ada9598 | 925 | #: builtin/add.c:67 builtin/commit.c:226 |
c04f5ac3 JX |
926 | msgid "updating files failed" |
927 | msgstr "更新文件失败" | |
928 | ||
929 | #: builtin/add.c:77 | |
930 | #, c-format | |
931 | msgid "remove '%s'\n" | |
932 | msgstr "删除 '%s'\n" | |
933 | ||
934 | #: builtin/add.c:176 | |
935 | #, c-format | |
936 | msgid "Path '%s' is in submodule '%.*s'" | |
937 | msgstr "路径 '%s' 属于模组 '%.*s'" | |
938 | ||
939 | #: builtin/add.c:192 | |
940 | msgid "Unstaged changes after refreshing the index:" | |
90e6ef53 | 941 | msgstr "刷新索引之后尚未被暂存的变更:" |
c04f5ac3 JX |
942 | |
943 | #: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186 | |
944 | #, c-format | |
945 | msgid "pathspec '%s' did not match any files" | |
946 | msgstr "路径 '%s' 未匹配任何文件" | |
947 | ||
948 | #: builtin/add.c:209 | |
949 | #, c-format | |
950 | msgid "'%s' is beyond a symbolic link" | |
951 | msgstr "'%s' 位于符号链接中" | |
952 | ||
953 | #: builtin/add.c:276 | |
954 | msgid "Could not read the index" | |
90e6ef53 | 955 | msgstr "不能读取索引" |
c04f5ac3 JX |
956 | |
957 | #: builtin/add.c:286 | |
958 | #, c-format | |
959 | msgid "Could not open '%s' for writing." | |
90e6ef53 | 960 | msgstr "不能为写入打开 '%s'。" |
c04f5ac3 JX |
961 | |
962 | #: builtin/add.c:290 | |
963 | msgid "Could not write patch" | |
90e6ef53 | 964 | msgstr "不能写补丁" |
c04f5ac3 JX |
965 | |
966 | #: builtin/add.c:295 | |
967 | #, c-format | |
968 | msgid "Could not stat '%s'" | |
90e6ef53 | 969 | msgstr "不能查看文件状态 '%s'" |
c04f5ac3 JX |
970 | |
971 | #: builtin/add.c:297 | |
972 | msgid "Empty patch. Aborted." | |
973 | msgstr "空补丁。异常终止。" | |
974 | ||
8ada9598 JX |
975 | #: builtin/add.c:303 |
976 | #, c-format | |
977 | msgid "Could not apply '%s'" | |
978 | msgstr "不能应用 '%s'" | |
979 | ||
980 | #: builtin/add.c:312 | |
981 | msgid "The following paths are ignored by one of your .gitignore files:\n" | |
982 | msgstr "下列路径被您的一个 .gitignore 文件所忽略:\n" | |
983 | ||
984 | #: builtin/add.c:352 | |
985 | #, c-format | |
986 | msgid "Use -f if you really want to add them.\n" | |
987 | msgstr "使用 -f 参数如果您确实要添加它们。\n" | |
988 | ||
989 | #: builtin/add.c:353 | |
990 | msgid "no files added" | |
991 | msgstr "没有文件被添加" | |
992 | ||
993 | #: builtin/add.c:359 | |
994 | msgid "adding files failed" | |
995 | msgstr "添加文件失败" | |
996 | ||
997 | #: builtin/add.c:391 | |
998 | msgid "-A and -u are mutually incompatible" | |
999 | msgstr "-A 和 -u 选项互斥" | |
1000 | ||
1001 | #: builtin/add.c:393 | |
1002 | msgid "Option --ignore-missing can only be used together with --dry-run" | |
1003 | msgstr "选项 --ignore-missing 只能和 --dry-run 共用" | |
1004 | ||
1005 | #: builtin/add.c:413 | |
1006 | #, c-format | |
1007 | msgid "Nothing specified, nothing added.\n" | |
1008 | msgstr "没有指定文件,也没有文件被添加。\n" | |
1009 | ||
1010 | #: builtin/add.c:414 | |
1011 | #, c-format | |
1012 | msgid "Maybe you wanted to say 'git add .'?\n" | |
1013 | msgstr "也许您想要执行 'git add .'?\n" | |
1014 | ||
1015 | #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82 | |
1016 | #: builtin/rm.c:162 | |
1017 | msgid "index file corrupt" | |
1018 | msgstr "索引文件损坏" | |
1019 | ||
1020 | #: builtin/add.c:476 builtin/apply.c:4100 builtin/mv.c:229 builtin/rm.c:260 | |
1021 | msgid "Unable to write new index file" | |
1022 | msgstr "无法写入新索引文件" | |
1023 | ||
1024 | #: builtin/apply.c:53 | |
1025 | msgid "git apply [options] [<patch>...]" | |
81809b99 | 1026 | msgstr "git apply [选项] [<补丁>...]" |
8ada9598 JX |
1027 | |
1028 | #: builtin/apply.c:106 | |
81809b99 | 1029 | #, c-format |
8ada9598 | 1030 | msgid "unrecognized whitespace option '%s'" |
81809b99 | 1031 | msgstr "未能识别的空白字符选项 '%s'" |
8ada9598 JX |
1032 | |
1033 | #: builtin/apply.c:121 | |
81809b99 | 1034 | #, c-format |
8ada9598 | 1035 | msgid "unrecognized whitespace ignore option '%s'" |
81809b99 | 1036 | msgstr "未能识别的空白字符忽略选项 '%s'" |
8ada9598 JX |
1037 | |
1038 | #: builtin/apply.c:815 | |
1039 | #, c-format | |
1040 | msgid "Cannot prepare timestamp regexp %s" | |
81809b99 | 1041 | msgstr "无法准备时间戳正则表达式 %s" |
8ada9598 JX |
1042 | |
1043 | #: builtin/apply.c:824 | |
1044 | #, c-format | |
1045 | msgid "regexec returned %d for input: %s" | |
81809b99 | 1046 | msgstr "regexec 返回 %d,输入为:%s" |
8ada9598 JX |
1047 | |
1048 | #: builtin/apply.c:905 | |
81809b99 | 1049 | #, c-format |
8ada9598 | 1050 | msgid "unable to find filename in patch at line %d" |
81809b99 | 1051 | msgstr "不能在补丁的第 %d 行找到文件名" |
8ada9598 JX |
1052 | |
1053 | #: builtin/apply.c:937 | |
1054 | #, c-format | |
1055 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" | |
81809b99 | 1056 | msgstr "git apply:错误的 git-diff - 期望 /dev/null,但在第 %2$d 行得到 %1$s" |
8ada9598 JX |
1057 | |
1058 | #: builtin/apply.c:941 | |
1059 | #, c-format | |
1060 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" | |
81809b99 | 1061 | msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" |
8ada9598 JX |
1062 | |
1063 | #: builtin/apply.c:942 | |
1064 | #, c-format | |
1065 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" | |
81809b99 | 1066 | msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" |
8ada9598 JX |
1067 | |
1068 | #: builtin/apply.c:949 | |
1069 | #, c-format | |
1070 | msgid "git apply: bad git-diff - expected /dev/null on line %d" | |
81809b99 | 1071 | msgstr "git apply:错误的 git-diff - 期望 /dev/null 于第 %d 行" |
8ada9598 JX |
1072 | |
1073 | #: builtin/apply.c:1394 | |
1074 | #, c-format | |
1075 | msgid "recount: unexpected line: %.*s" | |
81809b99 | 1076 | msgstr "recount:意外的行:%.*s" |
8ada9598 JX |
1077 | |
1078 | #: builtin/apply.c:1451 | |
1079 | #, c-format | |
1080 | msgid "patch fragment without header at line %d: %.*s" | |
81809b99 | 1081 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" |
8ada9598 JX |
1082 | |
1083 | #: builtin/apply.c:1468 | |
1084 | #, c-format | |
1085 | msgid "" | |
1086 | "git diff header lacks filename information when removing %d leading pathname " | |
1087 | "component (line %d)" | |
1088 | msgid_plural "" | |
1089 | "git diff header lacks filename information when removing %d leading pathname " | |
1090 | "components (line %d)" | |
5ae481e0 JX |
1091 | msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" |
1092 | msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
8ada9598 JX |
1093 | |
1094 | #: builtin/apply.c:1628 | |
1095 | msgid "new file depends on old contents" | |
81809b99 | 1096 | msgstr "新文件依赖旧内容" |
8ada9598 JX |
1097 | |
1098 | #: builtin/apply.c:1630 | |
1099 | msgid "deleted file still has contents" | |
81809b99 | 1100 | msgstr "删除的文件仍有内容" |
8ada9598 JX |
1101 | |
1102 | #: builtin/apply.c:1656 | |
1103 | #, c-format | |
1104 | msgid "corrupt patch at line %d" | |
81809b99 | 1105 | msgstr "补丁损坏位于第 %d 行" |
8ada9598 JX |
1106 | |
1107 | #: builtin/apply.c:1692 | |
1108 | #, c-format | |
1109 | msgid "new file %s depends on old contents" | |
81809b99 | 1110 | msgstr "新文件 %s 依赖旧内容" |
8ada9598 JX |
1111 | |
1112 | #: builtin/apply.c:1694 | |
1113 | #, c-format | |
1114 | msgid "deleted file %s still has contents" | |
81809b99 | 1115 | msgstr "删除的文件 %s 仍有内容" |
8ada9598 JX |
1116 | |
1117 | #: builtin/apply.c:1697 | |
1118 | #, c-format | |
1119 | msgid "** warning: file %s becomes empty but is not deleted" | |
81809b99 | 1120 | msgstr "** 警告:文件 %s 成为空文件但并未删除" |
8ada9598 JX |
1121 | |
1122 | #: builtin/apply.c:1843 | |
1123 | #, c-format | |
1124 | msgid "corrupt binary patch at line %d: %.*s" | |
81809b99 | 1125 | msgstr "二进制补丁在第 %d 行损坏:%.*s" |
8ada9598 JX |
1126 | |
1127 | #. there has to be one hunk (forward hunk) | |
1128 | #: builtin/apply.c:1872 | |
1129 | #, c-format | |
1130 | msgid "unrecognized binary patch at line %d" | |
81809b99 | 1131 | msgstr "未能识别的二进制补丁位于第 %d 行" |
8ada9598 JX |
1132 | |
1133 | #: builtin/apply.c:1958 | |
1134 | #, c-format | |
1135 | msgid "patch with only garbage at line %d" | |
81809b99 | 1136 | msgstr "补丁文件的第 %d 行只有垃圾数据" |
8ada9598 JX |
1137 | |
1138 | #: builtin/apply.c:2048 | |
81809b99 | 1139 | #, c-format |
8ada9598 | 1140 | msgid "unable to read symlink %s" |
81809b99 | 1141 | msgstr "无法读取符号链接 %s" |
8ada9598 JX |
1142 | |
1143 | #: builtin/apply.c:2052 | |
81809b99 | 1144 | #, c-format |
8ada9598 | 1145 | msgid "unable to open or read %s" |
81809b99 | 1146 | msgstr "不能打开或读取 %s" |
8ada9598 JX |
1147 | |
1148 | #: builtin/apply.c:2123 | |
1149 | msgid "oops" | |
81809b99 | 1150 | msgstr "哎哟" |
8ada9598 JX |
1151 | |
1152 | #: builtin/apply.c:2645 | |
81809b99 | 1153 | #, c-format |
8ada9598 | 1154 | msgid "invalid start of line: '%c'" |
81809b99 | 1155 | msgstr "无效的行首字符:'%c'" |
8ada9598 JX |
1156 | |
1157 | #: builtin/apply.c:2763 | |
1158 | #, c-format | |
1159 | msgid "Hunk #%d succeeded at %d (offset %d line)." | |
1160 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." | |
81809b99 | 1161 | msgstr[0] "块 #%d 成功应用于 %d (偏移 %d 行)" |
5ae481e0 | 1162 | msgstr[1] "块 #%d 成功应用于 %d (偏移 %d 行)" |
8ada9598 JX |
1163 | |
1164 | #: builtin/apply.c:2775 | |
1165 | #, c-format | |
1166 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" | |
81809b99 | 1167 | msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" |
8ada9598 JX |
1168 | |
1169 | #: builtin/apply.c:2781 | |
1170 | #, c-format | |
1171 | msgid "" | |
1172 | "while searching for:\n" | |
1173 | "%.*s" | |
1174 | msgstr "" | |
81809b99 JX |
1175 | "当查询:\n" |
1176 | "%.*s" | |
8ada9598 JX |
1177 | |
1178 | #: builtin/apply.c:2800 | |
1179 | #, c-format | |
1180 | msgid "missing binary patch data for '%s'" | |
81809b99 | 1181 | msgstr "缺失 '%s' 的二进制补丁数据" |
8ada9598 JX |
1182 | |
1183 | #: builtin/apply.c:2903 | |
1184 | #, c-format | |
1185 | msgid "binary patch does not apply to '%s'" | |
81809b99 | 1186 | msgstr "二进制补丁未应用到 '%s'" |
8ada9598 JX |
1187 | |
1188 | #: builtin/apply.c:2909 | |
1189 | #, c-format | |
1190 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" | |
81809b99 | 1191 | msgstr "到 '%s' 的二进制补丁产生了不正确的结果(预期 %s,得到 %s)" |
8ada9598 JX |
1192 | |
1193 | #: builtin/apply.c:2930 | |
1194 | #, c-format | |
1195 | msgid "patch failed: %s:%ld" | |
81809b99 | 1196 | msgstr "打补丁失败:%s:%ld" |
8ada9598 JX |
1197 | |
1198 | #: builtin/apply.c:3045 | |
1199 | #, c-format | |
1200 | msgid "patch %s has been renamed/deleted" | |
81809b99 | 1201 | msgstr "补丁 %s 已经被重命名/删除" |
8ada9598 JX |
1202 | |
1203 | #: builtin/apply.c:3052 builtin/apply.c:3069 | |
81809b99 | 1204 | #, c-format |
8ada9598 | 1205 | msgid "read of %s failed" |
81809b99 | 1206 | msgstr "读取 %s 失败" |
8ada9598 JX |
1207 | |
1208 | #: builtin/apply.c:3084 | |
1209 | msgid "removal patch leaves file contents" | |
81809b99 | 1210 | msgstr "移除补丁仍留下了文件内容" |
8ada9598 JX |
1211 | |
1212 | #: builtin/apply.c:3105 | |
81809b99 | 1213 | #, c-format |
8ada9598 | 1214 | msgid "%s: already exists in working directory" |
81809b99 | 1215 | msgstr "%s:已经存在于工作区中" |
8ada9598 JX |
1216 | |
1217 | #: builtin/apply.c:3143 | |
1218 | #, c-format | |
1219 | msgid "%s: has been deleted/renamed" | |
81809b99 | 1220 | msgstr "%s:已经被删除/重命名" |
8ada9598 JX |
1221 | |
1222 | #: builtin/apply.c:3148 builtin/apply.c:3179 | |
81809b99 | 1223 | #, c-format |
8ada9598 | 1224 | msgid "%s: %s" |
81809b99 | 1225 | msgstr "%s:%s" |
8ada9598 JX |
1226 | |
1227 | #: builtin/apply.c:3159 | |
1228 | #, c-format | |
1229 | msgid "%s: does not exist in index" | |
81809b99 | 1230 | msgstr "%s:不存在于索引中" |
8ada9598 JX |
1231 | |
1232 | #: builtin/apply.c:3173 | |
81809b99 | 1233 | #, c-format |
8ada9598 | 1234 | msgid "%s: does not match index" |
81809b99 | 1235 | msgstr "%s:和索引不匹配" |
8ada9598 JX |
1236 | |
1237 | #: builtin/apply.c:3190 | |
1238 | #, c-format | |
1239 | msgid "%s: wrong type" | |
81809b99 | 1240 | msgstr "%s:错误类型" |
8ada9598 JX |
1241 | |
1242 | #: builtin/apply.c:3192 | |
1243 | #, c-format | |
1244 | msgid "%s has type %o, expected %o" | |
81809b99 | 1245 | msgstr "%s 的类型是 %o,预期是 %o" |
8ada9598 JX |
1246 | |
1247 | #: builtin/apply.c:3247 | |
81809b99 | 1248 | #, c-format |
8ada9598 | 1249 | msgid "%s: already exists in index" |
81809b99 | 1250 | msgstr "%s:已经存在于索引中" |
8ada9598 JX |
1251 | |
1252 | #: builtin/apply.c:3266 | |
81809b99 | 1253 | #, fuzzy, c-format |
8ada9598 | 1254 | msgid "new mode (%o) of %s does not match old mode (%o)%s%s" |
81809b99 | 1255 | msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)%4$s%5$s 不匹配" |
8ada9598 JX |
1256 | |
1257 | #: builtin/apply.c:3272 | |
1258 | #, c-format | |
1259 | msgid "%s: patch does not apply" | |
81809b99 | 1260 | msgstr "%s:补丁未应用" |
8ada9598 JX |
1261 | |
1262 | #: builtin/apply.c:3285 | |
1263 | #, c-format | |
1264 | msgid "Checking patch %s..." | |
81809b99 | 1265 | msgstr "检查补丁 %s..." |
8ada9598 JX |
1266 | |
1267 | #: builtin/apply.c:3340 builtin/checkout.c:212 builtin/reset.c:158 | |
1268 | #, c-format | |
1269 | msgid "make_cache_entry failed for path '%s'" | |
1270 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" | |
1271 | ||
1272 | #: builtin/apply.c:3483 | |
81809b99 | 1273 | #, c-format |
8ada9598 | 1274 | msgid "unable to remove %s from index" |
81809b99 | 1275 | msgstr "不能从索引中移除 %s" |
8ada9598 JX |
1276 | |
1277 | #: builtin/apply.c:3510 | |
1278 | #, c-format | |
1279 | msgid "corrupt patch for subproject %s" | |
81809b99 | 1280 | msgstr "子项目 %s 损坏的补丁" |
8ada9598 JX |
1281 | |
1282 | #: builtin/apply.c:3514 | |
81809b99 | 1283 | #, c-format |
8ada9598 | 1284 | msgid "unable to stat newly created file '%s'" |
81809b99 | 1285 | msgstr "不能枚举新建文件 '%s' 的状态" |
8ada9598 JX |
1286 | |
1287 | #: builtin/apply.c:3519 | |
1288 | #, c-format | |
1289 | msgid "unable to create backing store for newly created file %s" | |
81809b99 | 1290 | msgstr "不能为新建文件 %s 创建后端存储" |
8ada9598 JX |
1291 | |
1292 | #: builtin/apply.c:3522 | |
81809b99 | 1293 | #, c-format |
8ada9598 | 1294 | msgid "unable to add cache entry for %s" |
81809b99 | 1295 | msgstr "无法为 %s 添加缓存条目" |
8ada9598 JX |
1296 | |
1297 | #: builtin/apply.c:3555 | |
81809b99 | 1298 | #, c-format |
8ada9598 | 1299 | msgid "closing file '%s'" |
81809b99 | 1300 | msgstr "关闭文件 '%s'" |
8ada9598 JX |
1301 | |
1302 | #: builtin/apply.c:3604 | |
81809b99 | 1303 | #, c-format |
8ada9598 | 1304 | msgid "unable to write file '%s' mode %o" |
81809b99 | 1305 | msgstr "不能写文件 '%s' 权限 %o" |
8ada9598 JX |
1306 | |
1307 | #: builtin/apply.c:3660 | |
1308 | #, c-format | |
1309 | msgid "Applied patch %s cleanly." | |
81809b99 | 1310 | msgstr "成功应用补丁 %s。" |
8ada9598 JX |
1311 | |
1312 | #: builtin/apply.c:3668 | |
8ada9598 | 1313 | msgid "internal error" |
81809b99 | 1314 | msgstr "内部错误" |
8ada9598 JX |
1315 | |
1316 | #. Say this even without --verbose | |
1317 | #: builtin/apply.c:3671 | |
1318 | #, c-format | |
1319 | msgid "Applying patch %%s with %d reject..." | |
1320 | msgid_plural "Applying patch %%s with %d rejects..." | |
81809b99 | 1321 | msgstr[0] "应用补丁 %%s 时 %d 个被拒绝..." |
5ae481e0 | 1322 | msgstr[1] "应用补丁 %%s 时 %d 个被拒绝..." |
8ada9598 JX |
1323 | |
1324 | #: builtin/apply.c:3681 | |
1325 | #, c-format | |
1326 | msgid "truncating .rej filename to %.*s.rej" | |
81809b99 | 1327 | msgstr "截短 .rej 文件名为 %.*s.rej" |
8ada9598 JX |
1328 | |
1329 | #: builtin/apply.c:3702 | |
1330 | #, c-format | |
1331 | msgid "Hunk #%d applied cleanly." | |
81809b99 | 1332 | msgstr "第 #%d 个片段成功应用。" |
8ada9598 JX |
1333 | |
1334 | #: builtin/apply.c:3705 | |
1335 | #, c-format | |
1336 | msgid "Rejected hunk #%d." | |
81809b99 | 1337 | msgstr "拒绝第 #%d 个片段。" |
8ada9598 JX |
1338 | |
1339 | #: builtin/apply.c:3836 | |
8ada9598 | 1340 | msgid "unrecognized input" |
81809b99 | 1341 | msgstr "未能识别的输入" |
8ada9598 JX |
1342 | |
1343 | #: builtin/apply.c:3847 | |
8ada9598 | 1344 | msgid "unable to read index file" |
81809b99 | 1345 | msgstr "无法读取索引文件" |
8ada9598 JX |
1346 | |
1347 | #: builtin/apply.c:3962 builtin/apply.c:3965 | |
1348 | msgid "path" | |
81809b99 | 1349 | msgstr "路径" |
8ada9598 JX |
1350 | |
1351 | #: builtin/apply.c:3963 | |
1352 | msgid "don't apply changes matching the given path" | |
81809b99 | 1353 | msgstr "不要应用与给出路径向匹配的变更" |
8ada9598 JX |
1354 | |
1355 | #: builtin/apply.c:3966 | |
1356 | msgid "apply changes matching the given path" | |
81809b99 | 1357 | msgstr "应用与给出路径向匹配的变更" |
8ada9598 JX |
1358 | |
1359 | #: builtin/apply.c:3968 | |
1360 | msgid "num" | |
81809b99 | 1361 | msgstr "数字" |
8ada9598 JX |
1362 | |
1363 | #: builtin/apply.c:3969 | |
1364 | msgid "remove <num> leading slashes from traditional diff paths" | |
81809b99 | 1365 | msgstr "从传统的 diff 路径中移除 <数字> 个前导路径" |
8ada9598 JX |
1366 | |
1367 | #: builtin/apply.c:3972 | |
1368 | msgid "ignore additions made by the patch" | |
81809b99 | 1369 | msgstr "忽略补丁中的添加的文件" |
8ada9598 JX |
1370 | |
1371 | #: builtin/apply.c:3974 | |
1372 | msgid "instead of applying the patch, output diffstat for the input" | |
81809b99 | 1373 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" |
8ada9598 JX |
1374 | |
1375 | #: builtin/apply.c:3978 | |
1376 | msgid "shows number of added and deleted lines in decimal notation" | |
81809b99 | 1377 | msgstr "以数字方式显示添加或删除行的数量" |
8ada9598 JX |
1378 | |
1379 | #: builtin/apply.c:3980 | |
1380 | msgid "instead of applying the patch, output a summary for the input" | |
81809b99 | 1381 | msgstr "不应用补丁,而是显示输入的概要" |
8ada9598 JX |
1382 | |
1383 | #: builtin/apply.c:3982 | |
1384 | msgid "instead of applying the patch, see if the patch is applicable" | |
81809b99 | 1385 | msgstr "不应用补丁,而是查看补丁是否可应用" |
8ada9598 JX |
1386 | |
1387 | #: builtin/apply.c:3984 | |
1388 | msgid "make sure the patch is applicable to the current index" | |
81809b99 | 1389 | msgstr "确认补丁可以应用到当前索引" |
8ada9598 JX |
1390 | |
1391 | #: builtin/apply.c:3986 | |
1392 | msgid "apply a patch without touching the working tree" | |
81809b99 | 1393 | msgstr "应用补丁而不修改工作区" |
8ada9598 JX |
1394 | |
1395 | #: builtin/apply.c:3988 | |
1396 | msgid "also apply the patch (use with --stat/--summary/--check)" | |
81809b99 | 1397 | msgstr "同时应用此补丁(和 --stat/--summary/--check 共用)" |
8ada9598 JX |
1398 | |
1399 | #: builtin/apply.c:3990 | |
1400 | msgid "build a temporary index based on embedded index information" | |
81809b99 | 1401 | msgstr "创建一个临时索引基于嵌入的索引信息" |
8ada9598 JX |
1402 | |
1403 | #: builtin/apply.c:3992 | |
1404 | msgid "paths are separated with NUL character" | |
81809b99 | 1405 | msgstr "路径以 NUL 字符分隔" |
8ada9598 JX |
1406 | |
1407 | #: builtin/apply.c:3995 | |
1408 | msgid "ensure at least <n> lines of context match" | |
81809b99 | 1409 | msgstr "确保至少匹配 <n> 行上下文" |
8ada9598 JX |
1410 | |
1411 | #: builtin/apply.c:3996 | |
1412 | msgid "action" | |
81809b99 | 1413 | msgstr "动作" |
8ada9598 JX |
1414 | |
1415 | #: builtin/apply.c:3997 | |
1416 | msgid "detect new or modified lines that have whitespace errors" | |
81809b99 | 1417 | msgstr "检查新增和修改的行中间的空白字符滥用" |
8ada9598 JX |
1418 | |
1419 | #: builtin/apply.c:4000 builtin/apply.c:4003 | |
1420 | msgid "ignore changes in whitespace when finding context" | |
81809b99 | 1421 | msgstr "查找上下文时忽略空白字符的变更" |
8ada9598 JX |
1422 | |
1423 | #: builtin/apply.c:4006 | |
1424 | msgid "apply the patch in reverse" | |
81809b99 | 1425 | msgstr "反向应用补丁" |
8ada9598 JX |
1426 | |
1427 | #: builtin/apply.c:4008 | |
1428 | msgid "don't expect at least one line of context" | |
81809b99 | 1429 | msgstr "无需至少一行上下文" |
8ada9598 JX |
1430 | |
1431 | #: builtin/apply.c:4010 | |
1432 | msgid "leave the rejected hunks in corresponding *.rej files" | |
81809b99 | 1433 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" |
8ada9598 JX |
1434 | |
1435 | #: builtin/apply.c:4012 | |
1436 | msgid "allow overlapping hunks" | |
81809b99 | 1437 | msgstr "允许重叠的补丁片段" |
8ada9598 JX |
1438 | |
1439 | #: builtin/apply.c:4013 | |
1440 | msgid "be verbose" | |
81809b99 | 1441 | msgstr "冗长输出" |
c04f5ac3 | 1442 | |
8ada9598 JX |
1443 | #: builtin/apply.c:4015 |
1444 | msgid "tolerate incorrectly detected missing new-line at the end of file" | |
81809b99 | 1445 | msgstr "宽容不正确的文件末尾换行符" |
c04f5ac3 | 1446 | |
8ada9598 JX |
1447 | #: builtin/apply.c:4018 |
1448 | msgid "do not trust the line counts in the hunk headers" | |
81809b99 | 1449 | msgstr "不信任补丁片段的头信息中的行号" |
c04f5ac3 | 1450 | |
8ada9598 JX |
1451 | #: builtin/apply.c:4020 |
1452 | msgid "root" | |
81809b99 | 1453 | msgstr "根目录" |
c04f5ac3 | 1454 | |
8ada9598 JX |
1455 | #: builtin/apply.c:4021 |
1456 | msgid "prepend <root> to all filenames" | |
81809b99 | 1457 | msgstr "为所有文件名前添加 <根目录>" |
c04f5ac3 | 1458 | |
8ada9598 | 1459 | #: builtin/apply.c:4042 |
8ada9598 | 1460 | msgid "--index outside a repository" |
81809b99 | 1461 | msgstr "--index 在一个版本库之外" |
c04f5ac3 | 1462 | |
8ada9598 | 1463 | #: builtin/apply.c:4045 |
8ada9598 | 1464 | msgid "--cached outside a repository" |
81809b99 | 1465 | msgstr "--cached 在一个版本库之外" |
c04f5ac3 | 1466 | |
8ada9598 | 1467 | #: builtin/apply.c:4061 |
81809b99 | 1468 | #, c-format |
8ada9598 | 1469 | msgid "can't open patch '%s'" |
81809b99 | 1470 | msgstr "不能打开补丁 '%s'" |
c04f5ac3 | 1471 | |
8ada9598 | 1472 | #: builtin/apply.c:4075 |
c04f5ac3 | 1473 | #, c-format |
8ada9598 JX |
1474 | msgid "squelched %d whitespace error" |
1475 | msgid_plural "squelched %d whitespace errors" | |
81809b99 | 1476 | msgstr[0] "抑制下仍有 %d 个空白字符误用" |
5ae481e0 | 1477 | msgstr[1] "抑制下仍有 %d 个空白字符误用" |
c04f5ac3 | 1478 | |
8ada9598 JX |
1479 | #: builtin/apply.c:4081 builtin/apply.c:4091 |
1480 | #, c-format | |
1481 | msgid "%d line adds whitespace errors." | |
1482 | msgid_plural "%d lines add whitespace errors." | |
81809b99 | 1483 | msgstr[0] "%d 行有空白字符误用。" |
5ae481e0 | 1484 | msgstr[1] "%d 行有空白字符误用。" |
c04f5ac3 JX |
1485 | |
1486 | #: builtin/archive.c:17 | |
1487 | #, c-format | |
1488 | msgid "could not create archive file '%s'" | |
90e6ef53 | 1489 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
1490 | |
1491 | #: builtin/archive.c:20 | |
1492 | msgid "could not redirect output" | |
90e6ef53 | 1493 | msgstr "不能输出重定向" |
c04f5ac3 JX |
1494 | |
1495 | #: builtin/archive.c:37 | |
1496 | msgid "git archive: Remote with no URL" | |
90e6ef53 | 1497 | msgstr "git archive:未提供远程URL" |
c04f5ac3 JX |
1498 | |
1499 | #: builtin/archive.c:58 | |
1500 | msgid "git archive: expected ACK/NAK, got EOF" | |
90e6ef53 | 1501 | msgstr "git archive:期待ACK/NACK,却得到EOF" |
c04f5ac3 JX |
1502 | |
1503 | #: builtin/archive.c:63 | |
1504 | #, c-format | |
1505 | msgid "git archive: NACK %s" | |
90e6ef53 | 1506 | msgstr "git archive:NACK %s" |
c04f5ac3 JX |
1507 | |
1508 | #: builtin/archive.c:65 | |
1509 | #, c-format | |
1510 | msgid "remote error: %s" | |
1511 | msgstr "远程错误:%s" | |
1512 | ||
1513 | #: builtin/archive.c:66 | |
1514 | msgid "git archive: protocol error" | |
90e6ef53 | 1515 | msgstr "git archive:协议错误" |
c04f5ac3 JX |
1516 | |
1517 | #: builtin/archive.c:71 | |
1518 | msgid "git archive: expected a flush" | |
90e6ef53 | 1519 | msgstr "git archive:预期一个刷新" |
c04f5ac3 | 1520 | |
90e6ef53 | 1521 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
8ada9598 | 1522 | #: builtin/branch.c:144 |
c04f5ac3 JX |
1523 | #, c-format |
1524 | msgid "" | |
1525 | "deleting branch '%s' that has been merged to\n" | |
1526 | " '%s', but not yet merged to HEAD." | |
1527 | msgstr "" | |
70fc47bf | 1528 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
1529 | " '%s',但未合并到 HEAD。" |
1530 | ||
90e6ef53 | 1531 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
8ada9598 | 1532 | #: builtin/branch.c:148 |
c04f5ac3 JX |
1533 | #, c-format |
1534 | msgid "" | |
1535 | "not deleting branch '%s' that is not yet merged to\n" | |
1536 | " '%s', even though it is merged to HEAD." | |
1537 | msgstr "" | |
70fc47bf T |
1538 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
1539 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 1540 | |
8ada9598 | 1541 | #: builtin/branch.c:180 |
c04f5ac3 JX |
1542 | msgid "cannot use -a with -d" |
1543 | msgstr "不能将 -a 和 -d 共用" | |
1544 | ||
8ada9598 | 1545 | #: builtin/branch.c:186 |
c04f5ac3 JX |
1546 | msgid "Couldn't look up commit object for HEAD" |
1547 | msgstr "无法查询 HEAD 指向的提交对象" | |
1548 | ||
8ada9598 | 1549 | #: builtin/branch.c:191 |
c04f5ac3 JX |
1550 | #, c-format |
1551 | msgid "Cannot delete the branch '%s' which you are currently on." | |
1552 | msgstr "无法删除您当前所在的分支 '%s'。" | |
1553 | ||
8ada9598 | 1554 | #: builtin/branch.c:202 |
5ae481e0 | 1555 | #, c-format |
8ada9598 | 1556 | msgid "remote branch '%s' not found." |
81809b99 | 1557 | msgstr "远程分支 '%s' 未发现。" |
c04f5ac3 | 1558 | |
8ada9598 | 1559 | #: builtin/branch.c:203 |
81809b99 | 1560 | #, c-format |
8ada9598 | 1561 | msgid "branch '%s' not found." |
81809b99 | 1562 | msgstr "分支 '%s' 未发现。" |
8ada9598 JX |
1563 | |
1564 | #: builtin/branch.c:210 | |
c04f5ac3 JX |
1565 | #, c-format |
1566 | msgid "Couldn't look up commit object for '%s'" | |
1567 | msgstr "无法查询 '%s' 指向的提交对象" | |
1568 | ||
8ada9598 | 1569 | #: builtin/branch.c:216 |
c04f5ac3 JX |
1570 | #, c-format |
1571 | msgid "" | |
1572 | "The branch '%s' is not fully merged.\n" | |
1573 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
1574 | msgstr "" | |
1575 | "分支 '%s' 没有完全合并。\n" | |
1576 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
1577 | ||
8ada9598 | 1578 | #: builtin/branch.c:225 |
81809b99 | 1579 | #, c-format |
8ada9598 | 1580 | msgid "Error deleting remote branch '%s'" |
81809b99 | 1581 | msgstr "删除远程分支 '%s' 时出错" |
c04f5ac3 | 1582 | |
8ada9598 | 1583 | #: builtin/branch.c:226 |
81809b99 | 1584 | #, c-format |
8ada9598 | 1585 | msgid "Error deleting branch '%s'" |
81809b99 | 1586 | msgstr "删除分支 '%s' 时出错" |
8ada9598 JX |
1587 | |
1588 | #: builtin/branch.c:233 | |
81809b99 | 1589 | #, c-format |
8ada9598 | 1590 | msgid "Deleted remote branch %s (was %s).\n" |
81809b99 | 1591 | msgstr "已删除远程分支 %s(曾为 %s)。\n" |
c04f5ac3 | 1592 | |
8ada9598 | 1593 | #: builtin/branch.c:234 |
81809b99 | 1594 | #, c-format |
8ada9598 | 1595 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 1596 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 JX |
1597 | |
1598 | #: builtin/branch.c:239 | |
c04f5ac3 JX |
1599 | msgid "Update of config-file failed" |
1600 | msgstr "无法更新 config 文件" | |
1601 | ||
8ada9598 | 1602 | #: builtin/branch.c:337 |
c04f5ac3 JX |
1603 | #, c-format |
1604 | msgid "branch '%s' does not point at a commit" | |
1605 | msgstr "分支 '%s' 未指向一个提交" | |
1606 | ||
8ada9598 | 1607 | #: builtin/branch.c:409 |
81809b99 | 1608 | #, c-format |
8ada9598 | 1609 | msgid "[%s: behind %d]" |
81809b99 | 1610 | msgstr "[%s:落后 %d]" |
c04f5ac3 | 1611 | |
8ada9598 | 1612 | #: builtin/branch.c:411 |
81809b99 | 1613 | #, c-format |
8ada9598 | 1614 | msgid "[behind %d]" |
81809b99 | 1615 | msgstr "[落后 %d]" |
8ada9598 | 1616 | |
8ada9598 | 1617 | #: builtin/branch.c:415 |
81809b99 | 1618 | #, c-format |
8ada9598 | 1619 | msgid "[%s: ahead %d]" |
81809b99 | 1620 | msgstr "[%s:领先 %d]" |
c04f5ac3 | 1621 | |
8ada9598 | 1622 | #: builtin/branch.c:417 |
81809b99 | 1623 | #, c-format |
8ada9598 | 1624 | msgid "[ahead %d]" |
81809b99 | 1625 | msgstr "[领先 %d]" |
8ada9598 | 1626 | |
8ada9598 | 1627 | #: builtin/branch.c:420 |
81809b99 | 1628 | #, c-format |
8ada9598 | 1629 | msgid "[%s: ahead %d, behind %d]" |
81809b99 | 1630 | msgstr "[%s:领先 %d,落后 %d]" |
8ada9598 | 1631 | |
8ada9598 | 1632 | #: builtin/branch.c:423 |
81809b99 | 1633 | #, c-format |
8ada9598 | 1634 | msgid "[ahead %d, behind %d]" |
81809b99 | 1635 | msgstr "[领先 %d,落后 %d]" |
c04f5ac3 | 1636 | |
8ada9598 | 1637 | #: builtin/branch.c:535 |
c04f5ac3 JX |
1638 | msgid "(no branch)" |
1639 | msgstr "(非分支)" | |
1640 | ||
8ada9598 | 1641 | #: builtin/branch.c:600 |
c04f5ac3 | 1642 | msgid "some refs could not be read" |
90e6ef53 | 1643 | msgstr "一些引用不能读取" |
c04f5ac3 | 1644 | |
8ada9598 | 1645 | #: builtin/branch.c:613 |
c04f5ac3 | 1646 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 1647 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 1648 | |
8ada9598 | 1649 | #: builtin/branch.c:623 |
c04f5ac3 JX |
1650 | #, c-format |
1651 | msgid "Invalid branch name: '%s'" | |
1652 | msgstr "无效的分支名:'%s'" | |
1653 | ||
8ada9598 | 1654 | #: builtin/branch.c:638 |
c04f5ac3 JX |
1655 | msgid "Branch rename failed" |
1656 | msgstr "分支重命名失败" | |
1657 | ||
8ada9598 | 1658 | #: builtin/branch.c:642 |
c04f5ac3 JX |
1659 | #, c-format |
1660 | msgid "Renamed a misnamed branch '%s' away" | |
1661 | msgstr "重命名掉一个错误命名的旧分支 '%s'" | |
1662 | ||
8ada9598 | 1663 | #: builtin/branch.c:646 |
c04f5ac3 JX |
1664 | #, c-format |
1665 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
1666 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
1667 | ||
8ada9598 | 1668 | #: builtin/branch.c:653 |
c04f5ac3 JX |
1669 | msgid "Branch is renamed, but update of config-file failed" |
1670 | msgstr "分支被重命名,但更新 config 文件失败" | |
1671 | ||
8ada9598 | 1672 | #: builtin/branch.c:668 |
c04f5ac3 JX |
1673 | #, c-format |
1674 | msgid "malformed object name %s" | |
1675 | msgstr "非法的对象名 %s" | |
1676 | ||
8ada9598 | 1677 | #: builtin/branch.c:692 |
81809b99 | 1678 | #, c-format |
8ada9598 | 1679 | msgid "could not write branch description template: %s" |
81809b99 | 1680 | msgstr "不能写分支描述模版:%s" |
c04f5ac3 | 1681 | |
8ada9598 | 1682 | #: builtin/branch.c:783 |
c04f5ac3 JX |
1683 | msgid "Failed to resolve HEAD as a valid ref." |
1684 | msgstr "无法将 HEAD 解析为有效引用。" | |
1685 | ||
8ada9598 | 1686 | #: builtin/branch.c:788 builtin/clone.c:558 |
c04f5ac3 | 1687 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 1688 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 1689 | |
8ada9598 | 1690 | #: builtin/branch.c:808 |
8ada9598 | 1691 | msgid "--column and --verbose are incompatible" |
81809b99 | 1692 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 JX |
1693 | |
1694 | #: builtin/branch.c:857 | |
c04f5ac3 JX |
1695 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
1696 | msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" | |
1697 | ||
1698 | #: builtin/bundle.c:47 | |
1699 | #, c-format | |
1700 | msgid "%s is okay\n" | |
1701 | msgstr "%s 可以\n" | |
1702 | ||
1703 | #: builtin/bundle.c:56 | |
1704 | msgid "Need a repository to create a bundle." | |
90e6ef53 | 1705 | msgstr "需要一个版本库来创建包。" |
c04f5ac3 JX |
1706 | |
1707 | #: builtin/bundle.c:60 | |
1708 | msgid "Need a repository to unbundle." | |
90e6ef53 | 1709 | msgstr "需要一个版本库来解包。" |
c04f5ac3 JX |
1710 | |
1711 | #: builtin/checkout.c:113 builtin/checkout.c:146 | |
1712 | #, c-format | |
1713 | msgid "path '%s' does not have our version" | |
1714 | msgstr "路径 '%s' 没有我们的版本" | |
1715 | ||
1716 | #: builtin/checkout.c:115 builtin/checkout.c:148 | |
1717 | #, c-format | |
1718 | msgid "path '%s' does not have their version" | |
1719 | msgstr "路径 '%s' 没有他们的版本" | |
1720 | ||
1721 | #: builtin/checkout.c:131 | |
1722 | #, c-format | |
1723 | msgid "path '%s' does not have all necessary versions" | |
1724 | msgstr "路径 '%s' 没有全部必须的版本" | |
1725 | ||
1726 | #: builtin/checkout.c:175 | |
1727 | #, c-format | |
1728 | msgid "path '%s' does not have necessary versions" | |
1729 | msgstr "路径 '%s' 没有必须的版本" | |
1730 | ||
1731 | #: builtin/checkout.c:192 | |
1732 | #, c-format | |
1733 | msgid "path '%s': cannot merge" | |
90e6ef53 | 1734 | msgstr "path '%s':无法合并" |
c04f5ac3 JX |
1735 | |
1736 | #: builtin/checkout.c:209 | |
1737 | #, c-format | |
1738 | msgid "Unable to add merge result for '%s'" | |
1739 | msgstr "无法为 '%s' 添加合并结果" | |
1740 | ||
c04f5ac3 JX |
1741 | #: builtin/checkout.c:234 builtin/checkout.c:392 |
1742 | msgid "corrupt index file" | |
90e6ef53 | 1743 | msgstr "损坏的索引文件" |
c04f5ac3 JX |
1744 | |
1745 | #: builtin/checkout.c:264 builtin/checkout.c:271 | |
1746 | #, c-format | |
1747 | msgid "path '%s' is unmerged" | |
1748 | msgstr "路径 '%s' 未合并" | |
1749 | ||
7ac1c0ad | 1750 | #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 |
170e9899 | 1751 | #: builtin/merge.c:812 |
c04f5ac3 | 1752 | msgid "unable to write new index file" |
90e6ef53 | 1753 | msgstr "无法写新的索引文件" |
c04f5ac3 | 1754 | |
14c8bced | 1755 | #: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 |
c04f5ac3 JX |
1756 | msgid "diff_setup_done failed" |
1757 | msgstr "diff_setup_done 失败" | |
1758 | ||
1759 | #: builtin/checkout.c:414 | |
1760 | msgid "you need to resolve your current index first" | |
90e6ef53 | 1761 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 JX |
1762 | |
1763 | #: builtin/checkout.c:533 | |
1764 | #, c-format | |
1765 | msgid "Can not do reflog for '%s'\n" | |
90e6ef53 | 1766 | msgstr "不能对 '%s' 执行 reflog 操作\n" |
c04f5ac3 | 1767 | |
170e9899 | 1768 | #: builtin/checkout.c:566 |
c04f5ac3 JX |
1769 | msgid "HEAD is now at" |
1770 | msgstr "HEAD 目前位于" | |
1771 | ||
170e9899 | 1772 | #: builtin/checkout.c:573 |
c04f5ac3 JX |
1773 | #, c-format |
1774 | msgid "Reset branch '%s'\n" | |
1775 | msgstr "重置分支 '%s'\n" | |
1776 | ||
170e9899 | 1777 | #: builtin/checkout.c:576 |
c04f5ac3 JX |
1778 | #, c-format |
1779 | msgid "Already on '%s'\n" | |
1780 | msgstr "已经位于 '%s'\n" | |
1781 | ||
170e9899 | 1782 | #: builtin/checkout.c:580 |
c04f5ac3 JX |
1783 | #, c-format |
1784 | msgid "Switched to and reset branch '%s'\n" | |
1785 | msgstr "切换并重置分支 '%s'\n" | |
1786 | ||
170e9899 | 1787 | #: builtin/checkout.c:582 |
c04f5ac3 JX |
1788 | #, c-format |
1789 | msgid "Switched to a new branch '%s'\n" | |
1790 | msgstr "切换到一个新分支 '%s'\n" | |
1791 | ||
170e9899 | 1792 | #: builtin/checkout.c:584 |
c04f5ac3 JX |
1793 | #, c-format |
1794 | msgid "Switched to branch '%s'\n" | |
1795 | msgstr "切换到分支 '%s'\n" | |
1796 | ||
90e6ef53 | 1797 | # 译者:注意保持前导空格 |
170e9899 | 1798 | #: builtin/checkout.c:640 |
c04f5ac3 JX |
1799 | #, c-format |
1800 | msgid " ... and %d more.\n" | |
90e6ef53 | 1801 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 JX |
1802 | |
1803 | #. The singular version | |
170e9899 | 1804 | #: builtin/checkout.c:646 |
c04f5ac3 JX |
1805 | #, c-format |
1806 | msgid "" | |
1807 | "Warning: you are leaving %d commit behind, not connected to\n" | |
1808 | "any of your branches:\n" | |
1809 | "\n" | |
1810 | "%s\n" | |
1811 | msgid_plural "" | |
1812 | "Warning: you are leaving %d commits behind, not connected to\n" | |
1813 | "any of your branches:\n" | |
1814 | "\n" | |
1815 | "%s\n" | |
1816 | msgstr[0] "" | |
1817 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
1818 | "\n" | |
1819 | "%s\n" | |
5ae481e0 JX |
1820 | msgstr[1] "" |
1821 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
1822 | "\n" | |
1823 | "%s\n" | |
c04f5ac3 | 1824 | |
170e9899 | 1825 | #: builtin/checkout.c:664 |
c04f5ac3 JX |
1826 | #, c-format |
1827 | msgid "" | |
1828 | "If you want to keep them by creating a new branch, this may be a good time\n" | |
1829 | "to do so with:\n" | |
1830 | "\n" | |
1831 | " git branch new_branch_name %s\n" | |
1832 | "\n" | |
1833 | msgstr "" | |
1834 | "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n" | |
1835 | "如下操作:\n" | |
1836 | "\n" | |
1837 | " git branch new_branch_name %s\n" | |
1838 | "\n" | |
1839 | ||
8ada9598 | 1840 | #: builtin/checkout.c:694 |
c04f5ac3 JX |
1841 | msgid "internal error in revision walk" |
1842 | msgstr "在版本遍历时遇到内部错误" | |
1843 | ||
8ada9598 | 1844 | #: builtin/checkout.c:698 |
c04f5ac3 JX |
1845 | msgid "Previous HEAD position was" |
1846 | msgstr "之前的 HEAD 位置是" | |
1847 | ||
8ada9598 | 1848 | #: builtin/checkout.c:724 |
c04f5ac3 | 1849 | msgid "You are on a branch yet to be born" |
90e6ef53 | 1850 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 JX |
1851 | |
1852 | #. case (1) | |
8ada9598 | 1853 | #: builtin/checkout.c:855 |
c04f5ac3 JX |
1854 | #, c-format |
1855 | msgid "invalid reference: %s" | |
1856 | msgstr "无效引用:%s" | |
1857 | ||
1858 | #. case (1): want a tree | |
8ada9598 | 1859 | #: builtin/checkout.c:894 |
c04f5ac3 JX |
1860 | #, c-format |
1861 | msgid "reference is not a tree: %s" | |
1862 | msgstr "引用不是一个树:%s" | |
1863 | ||
8ada9598 | 1864 | #: builtin/checkout.c:974 |
c04f5ac3 JX |
1865 | msgid "-B cannot be used with -b" |
1866 | msgstr "-B 不能和 -b 共用" | |
1867 | ||
8ada9598 | 1868 | #: builtin/checkout.c:983 |
c04f5ac3 JX |
1869 | msgid "--patch is incompatible with all other options" |
1870 | msgstr "--patch 选项和其他选项不兼容" | |
1871 | ||
8ada9598 | 1872 | #: builtin/checkout.c:986 |
c04f5ac3 JX |
1873 | msgid "--detach cannot be used with -b/-B/--orphan" |
1874 | msgstr "--detach 不能和 -b/-B/--orphan 共用" | |
1875 | ||
8ada9598 | 1876 | #: builtin/checkout.c:988 |
c04f5ac3 JX |
1877 | msgid "--detach cannot be used with -t" |
1878 | msgstr "--detach 不能和 -t 共用" | |
1879 | ||
8ada9598 | 1880 | #: builtin/checkout.c:994 |
c04f5ac3 JX |
1881 | msgid "--track needs a branch name" |
1882 | msgstr "--track 需要一个分支名" | |
1883 | ||
8ada9598 | 1884 | #: builtin/checkout.c:1001 |
c04f5ac3 JX |
1885 | msgid "Missing branch name; try -b" |
1886 | msgstr "缺少分支名;尝试 -b" | |
1887 | ||
8ada9598 | 1888 | #: builtin/checkout.c:1007 |
c04f5ac3 JX |
1889 | msgid "--orphan and -b|-B are mutually exclusive" |
1890 | msgstr "--orphan 和 -b|-B 互斥" | |
1891 | ||
8ada9598 | 1892 | #: builtin/checkout.c:1009 |
c04f5ac3 JX |
1893 | msgid "--orphan cannot be used with -t" |
1894 | msgstr "--orphan 不能和 -t 共用" | |
1895 | ||
8ada9598 | 1896 | #: builtin/checkout.c:1019 |
c04f5ac3 | 1897 | msgid "git checkout: -f and -m are incompatible" |
90e6ef53 | 1898 | msgstr "git checkout:-f 和 -m 不兼容" |
c04f5ac3 | 1899 | |
8ada9598 | 1900 | #: builtin/checkout.c:1053 |
c04f5ac3 | 1901 | msgid "invalid path specification" |
90e6ef53 | 1902 | msgstr "无效的路径规格" |
c04f5ac3 | 1903 | |
8ada9598 | 1904 | #: builtin/checkout.c:1061 |
c04f5ac3 JX |
1905 | #, c-format |
1906 | msgid "" | |
1907 | "git checkout: updating paths is incompatible with switching branches.\n" | |
1908 | "Did you intend to checkout '%s' which can not be resolved as commit?" | |
1909 | msgstr "" | |
90e6ef53 | 1910 | "git checkout:更新路径和切换分支不兼容。\n" |
c04f5ac3 JX |
1911 | "您是想要检出 '%s' 但未能将其解析为提交么?" |
1912 | ||
8ada9598 | 1913 | #: builtin/checkout.c:1063 |
c04f5ac3 | 1914 | msgid "git checkout: updating paths is incompatible with switching branches." |
90e6ef53 | 1915 | msgstr "git checkout:更新路径和切换分支不兼容。" |
c04f5ac3 | 1916 | |
8ada9598 | 1917 | #: builtin/checkout.c:1068 |
c04f5ac3 | 1918 | msgid "git checkout: --detach does not take a path argument" |
90e6ef53 | 1919 | msgstr "git checkout:--detach 不跟路径参数" |
c04f5ac3 | 1920 | |
8ada9598 | 1921 | #: builtin/checkout.c:1071 |
c04f5ac3 JX |
1922 | msgid "" |
1923 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
1924 | "checking out of the index." | |
1925 | msgstr "" | |
90e6ef53 | 1926 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 1927 | |
8ada9598 | 1928 | #: builtin/checkout.c:1090 |
c04f5ac3 JX |
1929 | msgid "Cannot switch branch to a non-commit." |
1930 | msgstr "无法切换分支到一个非提交。" | |
1931 | ||
8ada9598 | 1932 | #: builtin/checkout.c:1093 |
c04f5ac3 JX |
1933 | msgid "--ours/--theirs is incompatible with switching branches." |
1934 | msgstr "--ours/--theirs 和切换分支不兼容。" | |
1935 | ||
1936 | #: builtin/clean.c:78 | |
1937 | msgid "-x and -X cannot be used together" | |
1938 | msgstr "-x 和 -X 不能共用" | |
1939 | ||
1940 | #: builtin/clean.c:82 | |
1941 | msgid "" | |
1942 | "clean.requireForce set to true and neither -n nor -f given; refusing to clean" | |
1943 | msgstr "" | |
90e6ef53 | 1944 | "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 JX |
1945 | |
1946 | #: builtin/clean.c:85 | |
1947 | msgid "" | |
1948 | "clean.requireForce defaults to true and neither -n nor -f given; refusing to " | |
1949 | "clean" | |
1950 | msgstr "" | |
90e6ef53 | 1951 | "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 JX |
1952 | |
1953 | #: builtin/clean.c:155 builtin/clean.c:176 | |
1954 | #, c-format | |
1955 | msgid "Would remove %s\n" | |
1956 | msgstr "将删除 %s\n" | |
1957 | ||
1958 | #: builtin/clean.c:159 builtin/clean.c:179 | |
1959 | #, c-format | |
1960 | msgid "Removing %s\n" | |
1961 | msgstr "正删除 %s\n" | |
1962 | ||
1963 | #: builtin/clean.c:162 builtin/clean.c:182 | |
1964 | #, c-format | |
1965 | msgid "failed to remove %s" | |
1966 | msgstr "无法删除 %s" | |
1967 | ||
1968 | #: builtin/clean.c:166 | |
1969 | #, c-format | |
1970 | msgid "Would not remove %s\n" | |
1971 | msgstr "不会删除 %s\n" | |
1972 | ||
1973 | #: builtin/clean.c:168 | |
1974 | #, c-format | |
1975 | msgid "Not removing %s\n" | |
1976 | msgstr "未删除 %s\n" | |
1977 | ||
7ac1c0ad | 1978 | #: builtin/clone.c:243 |
c04f5ac3 JX |
1979 | #, c-format |
1980 | msgid "reference repository '%s' is not a local directory." | |
1981 | msgstr "引用版本库 '%s' 不是一个本地目录。" | |
1982 | ||
7ac1c0ad | 1983 | #: builtin/clone.c:302 |
c04f5ac3 JX |
1984 | #, c-format |
1985 | msgid "failed to open '%s'" | |
90e6ef53 | 1986 | msgstr "无法打开 '%s'" |
c04f5ac3 | 1987 | |
7ac1c0ad | 1988 | #: builtin/clone.c:306 |
c04f5ac3 JX |
1989 | #, c-format |
1990 | msgid "failed to create directory '%s'" | |
90e6ef53 | 1991 | msgstr "无法创建目录 '%s'" |
c04f5ac3 | 1992 | |
7ac1c0ad | 1993 | #: builtin/clone.c:308 builtin/diff.c:75 |
c04f5ac3 JX |
1994 | #, c-format |
1995 | msgid "failed to stat '%s'" | |
90e6ef53 | 1996 | msgstr "无法枚举 '%s' 状态" |
c04f5ac3 | 1997 | |
7ac1c0ad | 1998 | #: builtin/clone.c:310 |
c04f5ac3 JX |
1999 | #, c-format |
2000 | msgid "%s exists and is not a directory" | |
2001 | msgstr "%s 存在且不是一个目录" | |
2002 | ||
7ac1c0ad | 2003 | #: builtin/clone.c:324 |
c04f5ac3 JX |
2004 | #, c-format |
2005 | msgid "failed to stat %s\n" | |
90e6ef53 | 2006 | msgstr "无法枚举 %s 状态\n" |
c04f5ac3 | 2007 | |
7ac1c0ad | 2008 | #: builtin/clone.c:341 |
c04f5ac3 JX |
2009 | #, c-format |
2010 | msgid "failed to unlink '%s'" | |
90e6ef53 | 2011 | msgstr "无法删除 '%s'" |
c04f5ac3 | 2012 | |
7ac1c0ad | 2013 | #: builtin/clone.c:346 |
c04f5ac3 JX |
2014 | #, c-format |
2015 | msgid "failed to create link '%s'" | |
90e6ef53 | 2016 | msgstr "无法创建链接 '%s'" |
c04f5ac3 | 2017 | |
7ac1c0ad | 2018 | #: builtin/clone.c:350 |
c04f5ac3 JX |
2019 | #, c-format |
2020 | msgid "failed to copy file to '%s'" | |
90e6ef53 | 2021 | msgstr "无法拷贝文件至 '%s'" |
c04f5ac3 | 2022 | |
7ac1c0ad | 2023 | #: builtin/clone.c:373 |
c04f5ac3 JX |
2024 | #, c-format |
2025 | msgid "done.\n" | |
2026 | msgstr "完成。\n" | |
2027 | ||
7ac1c0ad | 2028 | #: builtin/clone.c:440 |
c04f5ac3 JX |
2029 | #, c-format |
2030 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 2031 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 2032 | |
7ac1c0ad | 2033 | #: builtin/clone.c:549 |
c04f5ac3 JX |
2034 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
2035 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
2036 | ||
7ac1c0ad | 2037 | #: builtin/clone.c:639 |
c04f5ac3 JX |
2038 | msgid "Too many arguments." |
2039 | msgstr "太多参数。" | |
2040 | ||
7ac1c0ad | 2041 | #: builtin/clone.c:643 |
c04f5ac3 | 2042 | msgid "You must specify a repository to clone." |
90e6ef53 | 2043 | msgstr "您必须指定一个版本库来克隆。" |
c04f5ac3 | 2044 | |
7ac1c0ad | 2045 | #: builtin/clone.c:654 |
c04f5ac3 JX |
2046 | #, c-format |
2047 | msgid "--bare and --origin %s options are incompatible." | |
2048 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
2049 | ||
7ac1c0ad | 2050 | #: builtin/clone.c:668 |
c04f5ac3 JX |
2051 | #, c-format |
2052 | msgid "repository '%s' does not exist" | |
2053 | msgstr "版本库 '%s' 不存在" | |
2054 | ||
7ac1c0ad | 2055 | #: builtin/clone.c:673 |
c04f5ac3 JX |
2056 | msgid "--depth is ignored in local clones; use file:// instead." |
2057 | msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。" | |
2058 | ||
7ac1c0ad | 2059 | #: builtin/clone.c:683 |
c04f5ac3 JX |
2060 | #, c-format |
2061 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 2062 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 2063 | |
7ac1c0ad | 2064 | #: builtin/clone.c:693 |
c04f5ac3 JX |
2065 | #, c-format |
2066 | msgid "working tree '%s' already exists." | |
2067 | msgstr "工作区 '%s' 已经存在。" | |
2068 | ||
7ac1c0ad | 2069 | #: builtin/clone.c:706 builtin/clone.c:720 |
c04f5ac3 JX |
2070 | #, c-format |
2071 | msgid "could not create leading directories of '%s'" | |
90e6ef53 | 2072 | msgstr "不能为 '%s' 创建先导目录" |
c04f5ac3 | 2073 | |
7ac1c0ad | 2074 | #: builtin/clone.c:709 |
c04f5ac3 JX |
2075 | #, c-format |
2076 | msgid "could not create work tree dir '%s'." | |
90e6ef53 | 2077 | msgstr "不能为 '%s' 创建工作区目录。" |
c04f5ac3 | 2078 | |
7ac1c0ad | 2079 | #: builtin/clone.c:728 |
c04f5ac3 JX |
2080 | #, c-format |
2081 | msgid "Cloning into bare repository '%s'...\n" | |
2082 | msgstr "克隆到裸版本库 '%s'...\n" | |
2083 | ||
7ac1c0ad | 2084 | #: builtin/clone.c:730 |
c04f5ac3 JX |
2085 | #, c-format |
2086 | msgid "Cloning into '%s'...\n" | |
2087 | msgstr "正克隆到 '%s'...\n" | |
2088 | ||
7ac1c0ad | 2089 | #: builtin/clone.c:786 |
c04f5ac3 JX |
2090 | #, c-format |
2091 | msgid "Don't know how to clone %s" | |
2092 | msgstr "不知道如何克隆 %s" | |
2093 | ||
7ac1c0ad | 2094 | #: builtin/clone.c:835 |
c04f5ac3 JX |
2095 | #, c-format |
2096 | msgid "Remote branch %s not found in upstream %s" | |
2097 | msgstr "远程分支 %s 在上游 %s 未发现" | |
2098 | ||
7ac1c0ad | 2099 | #: builtin/clone.c:842 |
c04f5ac3 JX |
2100 | msgid "You appear to have cloned an empty repository." |
2101 | msgstr "您似乎克隆了一个空版本库。" | |
2102 | ||
8ada9598 JX |
2103 | #: builtin/column.c:51 |
2104 | msgid "--command must be the first argument" | |
81809b99 | 2105 | msgstr "--command 必须是第一个参数" |
8ada9598 JX |
2106 | |
2107 | #: builtin/commit.c:43 | |
c04f5ac3 JX |
2108 | msgid "" |
2109 | "Your name and email address were configured automatically based\n" | |
2110 | "on your username and hostname. Please check that they are accurate.\n" | |
2111 | "You can suppress this message by setting them explicitly:\n" | |
2112 | "\n" | |
2113 | " git config --global user.name \"Your Name\"\n" | |
2114 | " git config --global user.email you@example.com\n" | |
2115 | "\n" | |
2116 | "After doing this, you may fix the identity used for this commit with:\n" | |
2117 | "\n" | |
2118 | " git commit --amend --reset-author\n" | |
2119 | msgstr "" | |
90e6ef53 JX |
2120 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" |
2121 | "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n" | |
c04f5ac3 JX |
2122 | "\n" |
2123 | " git config --global user.name \"Your Name\"\n" | |
2124 | " git config --global user.email you@example.com\n" | |
2125 | "\n" | |
90e6ef53 | 2126 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" |
c04f5ac3 JX |
2127 | "\n" |
2128 | " git commit --amend --reset-author\n" | |
2129 | ||
8ada9598 | 2130 | #: builtin/commit.c:55 |
c04f5ac3 JX |
2131 | msgid "" |
2132 | "You asked to amend the most recent commit, but doing so would make\n" | |
2133 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
2134 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
2135 | msgstr "" | |
1b150dc9 T |
2136 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
2137 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 2138 | |
8ada9598 | 2139 | #: builtin/commit.c:60 |
c04f5ac3 JX |
2140 | msgid "" |
2141 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
2142 | "If you wish to commit it anyway, use:\n" | |
2143 | "\n" | |
2144 | " git commit --allow-empty\n" | |
2145 | "\n" | |
2146 | "Otherwise, please use 'git reset'\n" | |
2147 | msgstr "" | |
a9ce4543 T |
2148 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
2149 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
2150 | "\n" |
2151 | " git commit --allow-empty\n" | |
2152 | "\n" | |
a9ce4543 | 2153 | "否则,请使用命令 'git reset'\n" |
c04f5ac3 | 2154 | |
8ada9598 | 2155 | #: builtin/commit.c:253 |
c04f5ac3 | 2156 | msgid "failed to unpack HEAD tree object" |
90e6ef53 | 2157 | msgstr "无法解包 HEAD 树对象" |
c04f5ac3 | 2158 | |
8ada9598 | 2159 | #: builtin/commit.c:295 |
c04f5ac3 | 2160 | msgid "unable to create temporary index" |
90e6ef53 | 2161 | msgstr "不能创建临时索引" |
c04f5ac3 | 2162 | |
8ada9598 | 2163 | #: builtin/commit.c:301 |
c04f5ac3 JX |
2164 | msgid "interactive add failed" |
2165 | msgstr "交互式添加失败" | |
2166 | ||
8ada9598 | 2167 | #: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405 |
c04f5ac3 | 2168 | msgid "unable to write new_index file" |
90e6ef53 | 2169 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 2170 | |
8ada9598 | 2171 | #: builtin/commit.c:386 |
8ada9598 | 2172 | msgid "cannot do a partial commit during a merge." |
81809b99 | 2173 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 2174 | |
8ada9598 | 2175 | #: builtin/commit.c:388 |
8ada9598 | 2176 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 2177 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 JX |
2178 | |
2179 | #: builtin/commit.c:398 | |
c04f5ac3 | 2180 | msgid "cannot read the index" |
90e6ef53 | 2181 | msgstr "无法读取索引" |
c04f5ac3 | 2182 | |
8ada9598 | 2183 | #: builtin/commit.c:418 |
c04f5ac3 | 2184 | msgid "unable to write temporary index file" |
90e6ef53 | 2185 | msgstr "无法写临时索引文件" |
c04f5ac3 | 2186 | |
8ada9598 | 2187 | #: builtin/commit.c:493 builtin/commit.c:499 |
c04f5ac3 JX |
2188 | #, c-format |
2189 | msgid "invalid commit: %s" | |
2190 | msgstr "无效的提交:%s" | |
2191 | ||
8ada9598 | 2192 | #: builtin/commit.c:522 |
c04f5ac3 JX |
2193 | msgid "malformed --author parameter" |
2194 | msgstr "非法的 --author 参数" | |
2195 | ||
8ada9598 | 2196 | #: builtin/commit.c:583 |
c04f5ac3 JX |
2197 | #, c-format |
2198 | msgid "Malformed ident string: '%s'" | |
90e6ef53 | 2199 | msgstr "非法的身份字符串:'%s'" |
c04f5ac3 | 2200 | |
8ada9598 | 2201 | #: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:968 |
c04f5ac3 JX |
2202 | #, c-format |
2203 | msgid "could not lookup commit %s" | |
2204 | msgstr "不能查询提交 %s" | |
2205 | ||
8ada9598 | 2206 | #: builtin/commit.c:633 builtin/shortlog.c:296 |
c04f5ac3 JX |
2207 | #, c-format |
2208 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 2209 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 2210 | |
8ada9598 | 2211 | #: builtin/commit.c:635 |
c04f5ac3 | 2212 | msgid "could not read log from standard input" |
90e6ef53 | 2213 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 2214 | |
8ada9598 | 2215 | #: builtin/commit.c:639 |
c04f5ac3 JX |
2216 | #, c-format |
2217 | msgid "could not read log file '%s'" | |
90e6ef53 | 2218 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 2219 | |
8ada9598 | 2220 | #: builtin/commit.c:645 |
c04f5ac3 JX |
2221 | msgid "commit has empty message" |
2222 | msgstr "提交说明为空" | |
2223 | ||
8ada9598 | 2224 | #: builtin/commit.c:661 |
c04f5ac3 | 2225 | msgid "could not read MERGE_MSG" |
90e6ef53 | 2226 | msgstr "不能读取 MERGE_MSG" |
c04f5ac3 | 2227 | |
8ada9598 | 2228 | #: builtin/commit.c:665 |
c04f5ac3 | 2229 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 2230 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 2231 | |
8ada9598 | 2232 | #: builtin/commit.c:669 |
c04f5ac3 JX |
2233 | #, c-format |
2234 | msgid "could not read '%s'" | |
90e6ef53 | 2235 | msgstr "不能读取 '%s'" |
c04f5ac3 | 2236 | |
8ada9598 | 2237 | #: builtin/commit.c:721 |
c04f5ac3 | 2238 | msgid "could not write commit template" |
90e6ef53 | 2239 | msgstr "不能写提交模版" |
c04f5ac3 | 2240 | |
8ada9598 | 2241 | #: builtin/commit.c:732 |
81809b99 | 2242 | #, c-format |
c04f5ac3 JX |
2243 | msgid "" |
2244 | "\n" | |
8ada9598 | 2245 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
2246 | "If this is not correct, please remove the file\n" |
2247 | "\t%s\n" | |
2248 | "and try again.\n" | |
2249 | msgstr "" | |
2250 | "\n" | |
81809b99 | 2251 | "看起来您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
2252 | "\t%s\n" |
2253 | "然后重试。\n" | |
2254 | ||
8ada9598 | 2255 | #: builtin/commit.c:737 |
81809b99 | 2256 | #, c-format |
8ada9598 JX |
2257 | msgid "" |
2258 | "\n" | |
2259 | "It looks like you may be committing a cherry-pick.\n" | |
2260 | "If this is not correct, please remove the file\n" | |
2261 | "\t%s\n" | |
2262 | "and try again.\n" | |
2263 | msgstr "" | |
2264 | "\n" | |
81809b99 | 2265 | "看起来您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
2266 | "\t%s\n" |
2267 | "然后重试。\n" | |
c04f5ac3 | 2268 | |
8ada9598 | 2269 | #: builtin/commit.c:749 |
c04f5ac3 | 2270 | msgid "" |
8ada9598 | 2271 | "Please enter the commit message for your changes. Lines starting\n" |
c04f5ac3 JX |
2272 | "with '#' will be ignored, and an empty message aborts the commit.\n" |
2273 | msgstr "" | |
81809b99 JX |
2274 | "请为您的变更输入提交说明。以 '#' 开始的行将被忽略,而一个空的提交\n" |
2275 | "说明将会终止提交。\n" | |
c04f5ac3 | 2276 | |
8ada9598 | 2277 | #: builtin/commit.c:754 |
c04f5ac3 | 2278 | msgid "" |
8ada9598 | 2279 | "Please enter the commit message for your changes. Lines starting\n" |
c04f5ac3 JX |
2280 | "with '#' will be kept; you may remove them yourself if you want to.\n" |
2281 | "An empty message aborts the commit.\n" | |
2282 | msgstr "" | |
81809b99 JX |
2283 | "请为您的变更输入提交说明。以 '#' 开始的行将被保留,您可以删除它们\n" |
2284 | "如果您想这样做的话。而一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 2285 | |
90e6ef53 | 2286 | # 译者:为保证在输出中对齐,注意调整句中空格! |
8ada9598 | 2287 | #: builtin/commit.c:767 |
c04f5ac3 JX |
2288 | #, c-format |
2289 | msgid "%sAuthor: %s" | |
2290 | msgstr "%s作者: %s" | |
2291 | ||
90e6ef53 | 2292 | # 译者:为保证在输出中对齐,注意调整句中空格! |
8ada9598 | 2293 | #: builtin/commit.c:774 |
c04f5ac3 JX |
2294 | #, c-format |
2295 | msgid "%sCommitter: %s" | |
2296 | msgstr "%s提交者: %s" | |
2297 | ||
8ada9598 | 2298 | #: builtin/commit.c:794 |
c04f5ac3 | 2299 | msgid "Cannot read index" |
90e6ef53 | 2300 | msgstr "无法读取索引" |
c04f5ac3 | 2301 | |
8ada9598 | 2302 | #: builtin/commit.c:831 |
c04f5ac3 JX |
2303 | msgid "Error building trees" |
2304 | msgstr "无法创建树对象" | |
2305 | ||
8ada9598 | 2306 | #: builtin/commit.c:846 builtin/tag.c:361 |
c04f5ac3 JX |
2307 | #, c-format |
2308 | msgid "Please supply the message using either -m or -F option.\n" | |
90e6ef53 | 2309 | msgstr "请使用 -m 或者 -F 选项提供提交说明。\n" |
c04f5ac3 | 2310 | |
8ada9598 | 2311 | #: builtin/commit.c:943 |
c04f5ac3 JX |
2312 | #, c-format |
2313 | msgid "No existing author found with '%s'" | |
2314 | msgstr "没有找到匹配 '%s' 的作者" | |
2315 | ||
8ada9598 | 2316 | #: builtin/commit.c:958 builtin/commit.c:1158 |
c04f5ac3 JX |
2317 | #, c-format |
2318 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 2319 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 2320 | |
8ada9598 | 2321 | #: builtin/commit.c:998 |
c04f5ac3 JX |
2322 | msgid "Using both --reset-author and --author does not make sense" |
2323 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
2324 | ||
8ada9598 | 2325 | #: builtin/commit.c:1009 |
c04f5ac3 | 2326 | msgid "You have nothing to amend." |
90e6ef53 | 2327 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 2328 | |
8ada9598 | 2329 | #: builtin/commit.c:1012 |
8ada9598 | 2330 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 2331 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 2332 | |
8ada9598 | 2333 | #: builtin/commit.c:1014 |
8ada9598 | 2334 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 2335 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 2336 | |
8ada9598 | 2337 | #: builtin/commit.c:1017 |
c04f5ac3 JX |
2338 | msgid "Options --squash and --fixup cannot be used together" |
2339 | msgstr "选项 --squash 和 --fixup 不能共用" | |
2340 | ||
8ada9598 | 2341 | #: builtin/commit.c:1027 |
c04f5ac3 JX |
2342 | msgid "Only one of -c/-C/-F/--fixup can be used." |
2343 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
2344 | ||
8ada9598 | 2345 | #: builtin/commit.c:1029 |
c04f5ac3 JX |
2346 | msgid "Option -m cannot be combined with -c/-C/-F/--fixup." |
2347 | msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。" | |
2348 | ||
8ada9598 | 2349 | #: builtin/commit.c:1037 |
c04f5ac3 | 2350 | msgid "--reset-author can be used only with -C, -c or --amend." |
90e6ef53 | 2351 | msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。" |
c04f5ac3 | 2352 | |
8ada9598 | 2353 | #: builtin/commit.c:1054 |
c04f5ac3 JX |
2354 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
2355 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
2356 | ||
8ada9598 | 2357 | #: builtin/commit.c:1056 |
c04f5ac3 JX |
2358 | msgid "No paths with --include/--only does not make sense." |
2359 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
2360 | ||
8ada9598 | 2361 | #: builtin/commit.c:1058 |
c04f5ac3 | 2362 | msgid "Clever... amending the last one with dirty index." |
90e6ef53 | 2363 | msgstr "聪明... 在索引不干净下修补最后的提交。" |
c04f5ac3 | 2364 | |
8ada9598 | 2365 | #: builtin/commit.c:1060 |
c04f5ac3 | 2366 | msgid "Explicit paths specified without -i nor -o; assuming --only paths..." |
90e6ef53 | 2367 | msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..." |
c04f5ac3 | 2368 | |
8ada9598 | 2369 | #: builtin/commit.c:1070 builtin/tag.c:577 |
c04f5ac3 JX |
2370 | #, c-format |
2371 | msgid "Invalid cleanup mode %s" | |
2372 | msgstr "无效的清理模式 %s" | |
2373 | ||
8ada9598 | 2374 | #: builtin/commit.c:1075 |
c04f5ac3 JX |
2375 | msgid "Paths with -a does not make sense." |
2376 | msgstr "路径和 -a 选项共用没有意义。" | |
2377 | ||
8ada9598 | 2378 | #: builtin/commit.c:1258 |
c04f5ac3 JX |
2379 | msgid "couldn't look up newly created commit" |
2380 | msgstr "无法找到新创建的提交" | |
2381 | ||
8ada9598 | 2382 | #: builtin/commit.c:1260 |
c04f5ac3 | 2383 | msgid "could not parse newly created commit" |
90e6ef53 | 2384 | msgstr "不能解析新创建的提交" |
c04f5ac3 | 2385 | |
8ada9598 | 2386 | #: builtin/commit.c:1301 |
c04f5ac3 JX |
2387 | msgid "detached HEAD" |
2388 | msgstr "分离头指针" | |
2389 | ||
7e238ab7 | 2390 | # 译者:中文字符串拼接,可删除前导空格 |
8ada9598 | 2391 | #: builtin/commit.c:1303 |
c04f5ac3 | 2392 | msgid " (root-commit)" |
7e238ab7 | 2393 | msgstr "(根提交)" |
c04f5ac3 | 2394 | |
8ada9598 | 2395 | #: builtin/commit.c:1447 |
c04f5ac3 | 2396 | msgid "could not parse HEAD commit" |
90e6ef53 | 2397 | msgstr "不能解析 HEAD 提交" |
c04f5ac3 | 2398 | |
8ada9598 | 2399 | #: builtin/commit.c:1485 builtin/merge.c:509 |
c04f5ac3 JX |
2400 | #, c-format |
2401 | msgid "could not open '%s' for reading" | |
90e6ef53 | 2402 | msgstr "不能为读入打开 '%s'" |
c04f5ac3 | 2403 | |
8ada9598 | 2404 | #: builtin/commit.c:1492 |
c04f5ac3 JX |
2405 | #, c-format |
2406 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 2407 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 2408 | |
8ada9598 | 2409 | #: builtin/commit.c:1499 |
c04f5ac3 | 2410 | msgid "could not read MERGE_MODE" |
90e6ef53 | 2411 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 2412 | |
8ada9598 | 2413 | #: builtin/commit.c:1518 |
c04f5ac3 JX |
2414 | #, c-format |
2415 | msgid "could not read commit message: %s" | |
90e6ef53 | 2416 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 2417 | |
8ada9598 | 2418 | #: builtin/commit.c:1532 |
73a60cd2 JX |
2419 | #, c-format |
2420 | msgid "Aborting commit; you did not edit the message.\n" | |
2421 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
2422 | ||
8ada9598 | 2423 | #: builtin/commit.c:1537 |
c04f5ac3 JX |
2424 | #, c-format |
2425 | msgid "Aborting commit due to empty commit message.\n" | |
2426 | msgstr "终止提交因为提交说明为空。\n" | |
2427 | ||
8ada9598 | 2428 | #: builtin/commit.c:1552 builtin/merge.c:936 builtin/merge.c:961 |
c04f5ac3 | 2429 | msgid "failed to write commit object" |
90e6ef53 | 2430 | msgstr "无法写提交对象" |
c04f5ac3 | 2431 | |
8ada9598 | 2432 | #: builtin/commit.c:1573 |
c04f5ac3 JX |
2433 | msgid "cannot lock HEAD ref" |
2434 | msgstr "无法锁定 HEAD 引用" | |
2435 | ||
8ada9598 | 2436 | #: builtin/commit.c:1577 |
c04f5ac3 JX |
2437 | msgid "cannot update HEAD ref" |
2438 | msgstr "无法更新 HEAD 引用" | |
2439 | ||
8ada9598 | 2440 | #: builtin/commit.c:1588 |
c04f5ac3 JX |
2441 | msgid "" |
2442 | "Repository has been updated, but unable to write\n" | |
2443 | "new_index file. Check that disk is not full or quota is\n" | |
2444 | "not exceeded, and then \"git reset HEAD\" to recover." | |
2445 | msgstr "" | |
90e6ef53 JX |
2446 | "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" |
2447 | "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" | |
c04f5ac3 JX |
2448 | |
2449 | #: builtin/describe.c:234 | |
2450 | #, c-format | |
2451 | msgid "annotated tag %s not available" | |
2452 | msgstr "注释 tag %s 无效" | |
2453 | ||
2454 | #: builtin/describe.c:238 | |
2455 | #, c-format | |
2456 | msgid "annotated tag %s has no embedded name" | |
2457 | msgstr "注释 tag %s 没有嵌入名称" | |
2458 | ||
2459 | #: builtin/describe.c:240 | |
2460 | #, c-format | |
2461 | msgid "tag '%s' is really '%s' here" | |
90e6ef53 | 2462 | msgstr "tag '%s' 的确是在 '%s'" |
c04f5ac3 JX |
2463 | |
2464 | #: builtin/describe.c:267 | |
2465 | #, c-format | |
2466 | msgid "Not a valid object name %s" | |
2467 | msgstr "不是一个有效的对象名 %s" | |
2468 | ||
2469 | #: builtin/describe.c:270 | |
2470 | #, c-format | |
2471 | msgid "%s is not a valid '%s' object" | |
2472 | msgstr "%s 不是一个有效的 '%s' 对象" | |
2473 | ||
2474 | #: builtin/describe.c:287 | |
2475 | #, c-format | |
2476 | msgid "no tag exactly matches '%s'" | |
2477 | msgstr "没有 tag 准确匹配 '%s'" | |
2478 | ||
2479 | #: builtin/describe.c:289 | |
2480 | #, c-format | |
2481 | msgid "searching to describe %s\n" | |
2482 | msgstr "搜索描述 %s\n" | |
2483 | ||
2484 | #: builtin/describe.c:329 | |
2485 | #, c-format | |
2486 | msgid "finished search at %s\n" | |
2487 | msgstr "完成搜索 %s\n" | |
2488 | ||
2489 | #: builtin/describe.c:353 | |
2490 | #, c-format | |
2491 | msgid "" | |
2492 | "No annotated tags can describe '%s'.\n" | |
2493 | "However, there were unannotated tags: try --tags." | |
2494 | msgstr "" | |
2495 | "没有注释 tag 能描述 '%s'。\n" | |
2496 | "然而,有非注释 tag:尝试 --tags。" | |
2497 | ||
2498 | #: builtin/describe.c:357 | |
2499 | #, c-format | |
2500 | msgid "" | |
2501 | "No tags can describe '%s'.\n" | |
2502 | "Try --always, or create some tags." | |
2503 | msgstr "" | |
2504 | "没有注释 tag 能描述 '%s'。\n" | |
90e6ef53 | 2505 | "尝试 --always,或者创建一些 tag。" |
c04f5ac3 JX |
2506 | |
2507 | #: builtin/describe.c:378 | |
2508 | #, c-format | |
2509 | msgid "traversed %lu commits\n" | |
2510 | msgstr "已遍历 %lu 个提交\n" | |
2511 | ||
2512 | #: builtin/describe.c:381 | |
2513 | #, c-format | |
2514 | msgid "" | |
2515 | "more than %i tags found; listed %i most recent\n" | |
2516 | "gave up search at %s\n" | |
2517 | msgstr "" | |
90e6ef53 JX |
2518 | "发现多于 %i 个 tag,列出最近的 %i 个\n" |
2519 | "在 %s 放弃搜索\n" | |
c04f5ac3 JX |
2520 | |
2521 | #: builtin/describe.c:436 | |
2522 | msgid "--long is incompatible with --abbrev=0" | |
2523 | msgstr "--long 与 --abbrev=0 不兼容" | |
2524 | ||
2525 | #: builtin/describe.c:462 | |
2526 | msgid "No names found, cannot describe anything." | |
90e6ef53 | 2527 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 JX |
2528 | |
2529 | #: builtin/describe.c:482 | |
2530 | msgid "--dirty is incompatible with committishes" | |
2531 | msgstr "--dirty 不能与提交共用" | |
2532 | ||
2533 | #: builtin/diff.c:77 | |
2534 | #, c-format | |
2535 | msgid "'%s': not a regular file or symlink" | |
2536 | msgstr "'%s':不是一个正规文件或符号链接" | |
2537 | ||
2538 | #: builtin/diff.c:220 | |
2539 | #, c-format | |
2540 | msgid "invalid option: %s" | |
2541 | msgstr "无效选项:%s" | |
2542 | ||
14c8bced | 2543 | #: builtin/diff.c:297 |
c04f5ac3 JX |
2544 | msgid "Not a git repository" |
2545 | msgstr "不是一个 git 版本库" | |
2546 | ||
14c8bced | 2547 | #: builtin/diff.c:347 |
c04f5ac3 JX |
2548 | #, c-format |
2549 | msgid "invalid object '%s' given." | |
2550 | msgstr "提供了无效对象 '%s'。" | |
2551 | ||
14c8bced | 2552 | #: builtin/diff.c:352 |
c04f5ac3 JX |
2553 | #, c-format |
2554 | msgid "more than %d trees given: '%s'" | |
2555 | msgstr "提供了超过 %d 个树对象:'%s'" | |
2556 | ||
14c8bced | 2557 | #: builtin/diff.c:362 |
c04f5ac3 JX |
2558 | #, c-format |
2559 | msgid "more than two blobs given: '%s'" | |
2560 | msgstr "提供了超过两个 blob 对象:'%s'" | |
2561 | ||
14c8bced | 2562 | #: builtin/diff.c:370 |
c04f5ac3 JX |
2563 | #, c-format |
2564 | msgid "unhandled object '%s' given." | |
2565 | msgstr "提供了无法处理的对象 '%s'。" | |
2566 | ||
2567 | #: builtin/fetch.c:200 | |
2568 | msgid "Couldn't find remote ref HEAD" | |
2569 | msgstr "无法发现远程 HEAD 引用" | |
2570 | ||
170e9899 | 2571 | #: builtin/fetch.c:253 |
c04f5ac3 JX |
2572 | #, c-format |
2573 | msgid "object %s not found" | |
2574 | msgstr "对象 %s 未发现" | |
2575 | ||
170e9899 | 2576 | #: builtin/fetch.c:259 |
c04f5ac3 JX |
2577 | msgid "[up to date]" |
2578 | msgstr "[最新]" | |
2579 | ||
170e9899 | 2580 | #: builtin/fetch.c:273 |
c04f5ac3 JX |
2581 | #, c-format |
2582 | msgid "! %-*s %-*s -> %s (can't fetch in current branch)" | |
2583 | msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)" | |
2584 | ||
170e9899 | 2585 | #: builtin/fetch.c:274 builtin/fetch.c:360 |
c04f5ac3 JX |
2586 | msgid "[rejected]" |
2587 | msgstr "[已拒绝]" | |
2588 | ||
170e9899 | 2589 | #: builtin/fetch.c:285 |
c04f5ac3 JX |
2590 | msgid "[tag update]" |
2591 | msgstr "[tag更新]" | |
2592 | ||
90e6ef53 | 2593 | # 译者:注意保持前导空格 |
170e9899 | 2594 | #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 |
c04f5ac3 JX |
2595 | msgid " (unable to update local ref)" |
2596 | msgstr " (不能更新本地引用)" | |
2597 | ||
170e9899 | 2598 | #: builtin/fetch.c:305 |
c04f5ac3 JX |
2599 | msgid "[new tag]" |
2600 | msgstr "[新tag]" | |
2601 | ||
170e9899 | 2602 | #: builtin/fetch.c:308 |
c04f5ac3 JX |
2603 | msgid "[new branch]" |
2604 | msgstr "[新分支]" | |
2605 | ||
170e9899 JX |
2606 | #: builtin/fetch.c:311 |
2607 | msgid "[new ref]" | |
2608 | msgstr "[新引用]" | |
2609 | ||
2610 | #: builtin/fetch.c:356 | |
c04f5ac3 JX |
2611 | msgid "unable to update local ref" |
2612 | msgstr "不能更新本地引用" | |
2613 | ||
170e9899 | 2614 | #: builtin/fetch.c:356 |
c04f5ac3 JX |
2615 | msgid "forced update" |
2616 | msgstr "强制更新" | |
2617 | ||
170e9899 | 2618 | #: builtin/fetch.c:362 |
c04f5ac3 | 2619 | msgid "(non-fast-forward)" |
90e6ef53 | 2620 | msgstr "(非快进式)" |
c04f5ac3 | 2621 | |
170e9899 | 2622 | #: builtin/fetch.c:393 builtin/fetch.c:685 |
c04f5ac3 JX |
2623 | #, c-format |
2624 | msgid "cannot open %s: %s\n" | |
2625 | msgstr "无法打开 %s:%s\n" | |
2626 | ||
170e9899 | 2627 | #: builtin/fetch.c:402 |
c04f5ac3 JX |
2628 | #, c-format |
2629 | msgid "%s did not send all necessary objects\n" | |
2630 | msgstr "%s 未发送所有必须的对象\n" | |
2631 | ||
170e9899 | 2632 | #: builtin/fetch.c:488 |
c04f5ac3 JX |
2633 | #, c-format |
2634 | msgid "From %.*s\n" | |
2635 | msgstr "来自 %.*s\n" | |
2636 | ||
170e9899 | 2637 | #: builtin/fetch.c:499 |
c04f5ac3 JX |
2638 | #, c-format |
2639 | msgid "" | |
2640 | "some local refs could not be updated; try running\n" | |
2641 | " 'git remote prune %s' to remove any old, conflicting branches" | |
2642 | msgstr "" | |
2643 | "一些本地引用不能被更新;尝试运行\n" | |
2644 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
2645 | ||
90e6ef53 | 2646 | # 译者:注意保持前导空格 |
170e9899 | 2647 | #: builtin/fetch.c:549 |
81809b99 | 2648 | #, c-format |
8ada9598 | 2649 | msgid " (%s will become dangling)" |
81809b99 | 2650 | msgstr " (%s 将成为悬空状态)" |
c04f5ac3 | 2651 | |
90e6ef53 | 2652 | # 译者:注意保持前导空格 |
170e9899 | 2653 | #: builtin/fetch.c:550 |
81809b99 | 2654 | #, c-format |
8ada9598 | 2655 | msgid " (%s has become dangling)" |
81809b99 | 2656 | msgstr " (%s 已成为悬空状态)" |
c04f5ac3 | 2657 | |
170e9899 | 2658 | #: builtin/fetch.c:557 |
c04f5ac3 JX |
2659 | msgid "[deleted]" |
2660 | msgstr "[已删除]" | |
2661 | ||
8ada9598 | 2662 | #: builtin/fetch.c:558 builtin/remote.c:1055 |
c04f5ac3 JX |
2663 | msgid "(none)" |
2664 | msgstr "(无)" | |
2665 | ||
170e9899 | 2666 | #: builtin/fetch.c:675 |
c04f5ac3 JX |
2667 | #, c-format |
2668 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
2669 | msgstr "拒绝获取到非裸版本库的当前分支 %s" | |
2670 | ||
170e9899 | 2671 | #: builtin/fetch.c:709 |
c04f5ac3 JX |
2672 | #, c-format |
2673 | msgid "Don't know how to fetch from %s" | |
2674 | msgstr "不知道如何从 %s 获取" | |
2675 | ||
170e9899 | 2676 | #: builtin/fetch.c:786 |
c04f5ac3 JX |
2677 | #, c-format |
2678 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
2679 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
2680 | ||
170e9899 | 2681 | #: builtin/fetch.c:789 |
c04f5ac3 JX |
2682 | #, c-format |
2683 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 2684 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 2685 | |
170e9899 | 2686 | #: builtin/fetch.c:888 |
c04f5ac3 JX |
2687 | #, c-format |
2688 | msgid "Fetching %s\n" | |
d4a8e00b | 2689 | msgstr "正在获取 %s\n" |
c04f5ac3 | 2690 | |
8ada9598 | 2691 | #: builtin/fetch.c:890 builtin/remote.c:100 |
c04f5ac3 JX |
2692 | #, c-format |
2693 | msgid "Could not fetch %s" | |
2694 | msgstr "不能获取 %s" | |
2695 | ||
170e9899 | 2696 | #: builtin/fetch.c:907 |
c04f5ac3 JX |
2697 | msgid "" |
2698 | "No remote repository specified. Please, specify either a URL or a\n" | |
2699 | "remote name from which new revisions should be fetched." | |
90e6ef53 | 2700 | msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。" |
c04f5ac3 | 2701 | |
170e9899 | 2702 | #: builtin/fetch.c:927 |
c04f5ac3 | 2703 | msgid "You need to specify a tag name." |
90e6ef53 | 2704 | msgstr "您需要指定一个 tag 名称。" |
c04f5ac3 | 2705 | |
170e9899 | 2706 | #: builtin/fetch.c:979 |
c04f5ac3 JX |
2707 | msgid "fetch --all does not take a repository argument" |
2708 | msgstr "fetch --all 不能带一个版本库参数" | |
2709 | ||
170e9899 | 2710 | #: builtin/fetch.c:981 |
c04f5ac3 JX |
2711 | msgid "fetch --all does not make sense with refspecs" |
2712 | msgstr "fetch --all 带引用表达式没有任何意义" | |
2713 | ||
170e9899 | 2714 | #: builtin/fetch.c:992 |
c04f5ac3 JX |
2715 | #, c-format |
2716 | msgid "No such remote or remote group: %s" | |
2717 | msgstr "没有这样的远程或远程组:%s" | |
2718 | ||
170e9899 | 2719 | #: builtin/fetch.c:1000 |
c04f5ac3 | 2720 | msgid "Fetching a group and specifying refspecs does not make sense" |
90e6ef53 | 2721 | msgstr "获取组并指定引用表达式没有意义" |
c04f5ac3 JX |
2722 | |
2723 | #: builtin/gc.c:63 | |
2724 | #, c-format | |
2725 | msgid "Invalid %s: '%s'" | |
2726 | msgstr "无效的 %s:'%s'" | |
2727 | ||
eff6d3a9 | 2728 | #: builtin/gc.c:90 |
c04f5ac3 JX |
2729 | #, c-format |
2730 | msgid "insanely long object directory %.*s" | |
2731 | msgstr "不正常的长对象目录 %.*s" | |
2732 | ||
eff6d3a9 | 2733 | #: builtin/gc.c:221 |
c04f5ac3 JX |
2734 | #, c-format |
2735 | msgid "Auto packing the repository for optimum performance.\n" | |
2736 | msgstr "自动打包版本库以求最佳性能。\n" | |
2737 | ||
eff6d3a9 | 2738 | #: builtin/gc.c:224 |
c04f5ac3 JX |
2739 | #, c-format |
2740 | msgid "" | |
2741 | "Auto packing the repository for optimum performance. You may also\n" | |
2742 | "run \"git gc\" manually. See \"git help gc\" for more information.\n" | |
2743 | msgstr "" | |
90e6ef53 JX |
2744 | "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n" |
2745 | "参见 \"git help gc\" 以获取更多信息。\n" | |
c04f5ac3 | 2746 | |
eff6d3a9 | 2747 | #: builtin/gc.c:251 |
c04f5ac3 JX |
2748 | msgid "" |
2749 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 2750 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 2751 | |
7ac1c0ad | 2752 | #: builtin/grep.c:216 |
c04f5ac3 JX |
2753 | #, c-format |
2754 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 2755 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 2756 | |
7ac1c0ad | 2757 | #: builtin/grep.c:402 |
c04f5ac3 JX |
2758 | #, c-format |
2759 | msgid "Failed to chdir: %s" | |
2760 | msgstr "无法切换目录:%s" | |
2761 | ||
7ac1c0ad | 2762 | #: builtin/grep.c:478 builtin/grep.c:512 |
c04f5ac3 JX |
2763 | #, c-format |
2764 | msgid "unable to read tree (%s)" | |
90e6ef53 | 2765 | msgstr "无法读取树(%s)" |
c04f5ac3 | 2766 | |
7ac1c0ad | 2767 | #: builtin/grep.c:526 |
c04f5ac3 JX |
2768 | #, c-format |
2769 | msgid "unable to grep from object of type %s" | |
2770 | msgstr "无法抓取来自于 %s 类型的对象" | |
2771 | ||
7ac1c0ad | 2772 | #: builtin/grep.c:584 |
c04f5ac3 JX |
2773 | #, c-format |
2774 | msgid "switch `%c' expects a numerical value" | |
2775 | msgstr "开关 `%c' 期望一个数字值" | |
2776 | ||
7ac1c0ad | 2777 | #: builtin/grep.c:601 |
c04f5ac3 JX |
2778 | #, c-format |
2779 | msgid "cannot open '%s'" | |
2780 | msgstr "不能打开 '%s'" | |
2781 | ||
14c8bced | 2782 | #: builtin/grep.c:888 |
c04f5ac3 JX |
2783 | msgid "no pattern given." |
2784 | msgstr "未提供模式匹配。" | |
2785 | ||
14c8bced | 2786 | #: builtin/grep.c:902 |
c04f5ac3 JX |
2787 | #, c-format |
2788 | msgid "bad object %s" | |
2789 | msgstr "坏对象 %s" | |
2790 | ||
14c8bced | 2791 | #: builtin/grep.c:943 |
c04f5ac3 JX |
2792 | msgid "--open-files-in-pager only works on the worktree" |
2793 | msgstr "--open-files-in-pager 仅用于工作区" | |
2794 | ||
14c8bced | 2795 | #: builtin/grep.c:966 |
c04f5ac3 | 2796 | msgid "--cached or --untracked cannot be used with --no-index." |
90e6ef53 | 2797 | msgstr "--cached 或 --untracked 不能与 --no-index 共用。" |
c04f5ac3 | 2798 | |
14c8bced | 2799 | #: builtin/grep.c:971 |
c04f5ac3 JX |
2800 | msgid "--no-index or --untracked cannot be used with revs." |
2801 | msgstr "--no-index 或 --untracked 不能和版本共用。" | |
2802 | ||
14c8bced | 2803 | #: builtin/grep.c:974 |
c04f5ac3 | 2804 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
90e6ef53 | 2805 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" |
c04f5ac3 | 2806 | |
14c8bced | 2807 | #: builtin/grep.c:982 |
c04f5ac3 JX |
2808 | msgid "both --cached and trees are given." |
2809 | msgstr "同时给出了 --cached 和树对象。" | |
2810 | ||
8ada9598 | 2811 | #: builtin/help.c:59 |
81809b99 | 2812 | #, c-format |
8ada9598 | 2813 | msgid "unrecognized help format '%s'" |
81809b99 | 2814 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 JX |
2815 | |
2816 | #: builtin/help.c:87 | |
8ada9598 | 2817 | msgid "Failed to start emacsclient." |
81809b99 | 2818 | msgstr "无法启动 emacsclient。" |
8ada9598 JX |
2819 | |
2820 | #: builtin/help.c:100 | |
8ada9598 | 2821 | msgid "Failed to parse emacsclient version." |
81809b99 | 2822 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 JX |
2823 | |
2824 | #: builtin/help.c:108 | |
2825 | #, c-format | |
2826 | msgid "emacsclient version '%d' too old (< 22)." | |
81809b99 | 2827 | msgstr "emacsclient 版本 '%d' 太老 (< 22)。" |
8ada9598 JX |
2828 | |
2829 | #: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 | |
81809b99 | 2830 | #, c-format |
8ada9598 | 2831 | msgid "failed to exec '%s': %s" |
81809b99 | 2832 | msgstr "无法执行 '%s':%s" |
8ada9598 JX |
2833 | |
2834 | #: builtin/help.c:211 | |
2835 | #, c-format | |
2836 | msgid "" | |
2837 | "'%s': path for unsupported man viewer.\n" | |
2838 | "Please consider using 'man.<tool>.cmd' instead." | |
2839 | msgstr "" | |
81809b99 JX |
2840 | "'%s':不支持的 man 手册查看器的路径。\n" |
2841 | "请使用 'man.<tool>.cmd'。" | |
8ada9598 JX |
2842 | |
2843 | #: builtin/help.c:223 | |
2844 | #, c-format | |
2845 | msgid "" | |
2846 | "'%s': cmd for supported man viewer.\n" | |
2847 | "Please consider using 'man.<tool>.path' instead." | |
2848 | msgstr "" | |
81809b99 JX |
2849 | "'%s': 支持的 man 手册查看器命令。\n" |
2850 | "请使用 'man.<tool>.path'。" | |
8ada9598 JX |
2851 | |
2852 | #: builtin/help.c:287 | |
2853 | msgid "The most commonly used git commands are:" | |
81809b99 | 2854 | msgstr "最常用的 git 命令有:" |
8ada9598 JX |
2855 | |
2856 | #: builtin/help.c:355 | |
2857 | #, c-format | |
2858 | msgid "'%s': unknown man viewer." | |
81809b99 | 2859 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 JX |
2860 | |
2861 | #: builtin/help.c:372 | |
8ada9598 | 2862 | msgid "no man viewer handled the request" |
81809b99 | 2863 | msgstr "没有 man 查看器处理此请求" |
8ada9598 JX |
2864 | |
2865 | #: builtin/help.c:380 | |
2866 | msgid "no info viewer handled the request" | |
81809b99 | 2867 | msgstr "没有 info 查看器处理此请求" |
8ada9598 JX |
2868 | |
2869 | #: builtin/help.c:391 | |
81809b99 | 2870 | #, c-format |
8ada9598 | 2871 | msgid "'%s': not a documentation directory." |
81809b99 | 2872 | msgstr "'%s':不是一个文档目录。" |
8ada9598 JX |
2873 | |
2874 | #: builtin/help.c:432 builtin/help.c:439 | |
2875 | #, c-format | |
2876 | msgid "usage: %s%s" | |
81809b99 | 2877 | msgstr "用法:%s%s" |
8ada9598 JX |
2878 | |
2879 | #: builtin/help.c:453 | |
2880 | #, c-format | |
2881 | msgid "`git %s' is aliased to `%s'" | |
81809b99 | 2882 | msgstr "`git %s' 是 `%s' 的别名" |
8ada9598 JX |
2883 | |
2884 | #: builtin/index-pack.c:169 | |
2885 | #, c-format | |
2886 | msgid "object type mismatch at %s" | |
81809b99 | 2887 | msgstr "%s 的对象类型不匹配" |
8ada9598 JX |
2888 | |
2889 | #: builtin/index-pack.c:189 | |
2890 | msgid "object of unexpected type" | |
81809b99 | 2891 | msgstr "意外的类型的对象" |
8ada9598 JX |
2892 | |
2893 | #: builtin/index-pack.c:226 | |
81809b99 | 2894 | #, c-format |
8ada9598 JX |
2895 | msgid "cannot fill %d byte" |
2896 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 2897 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 2898 | msgstr[1] "无法填充 %d 字节" |
8ada9598 JX |
2899 | |
2900 | #: builtin/index-pack.c:236 | |
2901 | msgid "early EOF" | |
81809b99 | 2902 | msgstr "过早的文件结束符(EOF)" |
8ada9598 JX |
2903 | |
2904 | #: builtin/index-pack.c:237 | |
2905 | msgid "read error on input" | |
81809b99 | 2906 | msgstr "输入上的读错误" |
8ada9598 JX |
2907 | |
2908 | #: builtin/index-pack.c:249 | |
2909 | msgid "used more bytes than were available" | |
81809b99 | 2910 | msgstr "用掉了超过可用的字节" |
8ada9598 JX |
2911 | |
2912 | #: builtin/index-pack.c:256 | |
2913 | msgid "pack too large for current definition of off_t" | |
81809b99 | 2914 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 JX |
2915 | |
2916 | #: builtin/index-pack.c:272 | |
81809b99 | 2917 | #, c-format |
8ada9598 | 2918 | msgid "unable to create '%s'" |
81809b99 | 2919 | msgstr "不能创建 '%s'" |
8ada9598 JX |
2920 | |
2921 | #: builtin/index-pack.c:277 | |
81809b99 | 2922 | #, c-format |
8ada9598 | 2923 | msgid "cannot open packfile '%s'" |
81809b99 | 2924 | msgstr "无法打开包文件 '%s'" |
8ada9598 JX |
2925 | |
2926 | #: builtin/index-pack.c:291 | |
2927 | msgid "pack signature mismatch" | |
81809b99 | 2928 | msgstr "包签名不匹配" |
8ada9598 JX |
2929 | |
2930 | #: builtin/index-pack.c:311 | |
2931 | #, c-format | |
2932 | msgid "pack has bad object at offset %lu: %s" | |
81809b99 | 2933 | msgstr "包中有错误的对象位于 %lu:%s" |
8ada9598 JX |
2934 | |
2935 | #: builtin/index-pack.c:405 | |
2936 | #, c-format | |
2937 | msgid "inflate returned %d" | |
81809b99 | 2938 | msgstr "解压缩返回 %d" |
8ada9598 JX |
2939 | |
2940 | #: builtin/index-pack.c:450 | |
2941 | msgid "offset value overflow for delta base object" | |
81809b99 | 2942 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 JX |
2943 | |
2944 | #: builtin/index-pack.c:458 | |
2945 | msgid "delta base offset is out of bound" | |
81809b99 | 2946 | msgstr "delta 基准偏移越界" |
8ada9598 JX |
2947 | |
2948 | #: builtin/index-pack.c:466 | |
81809b99 | 2949 | #, c-format |
8ada9598 | 2950 | msgid "unknown object type %d" |
81809b99 | 2951 | msgstr "未知对象类型 %d" |
8ada9598 JX |
2952 | |
2953 | #: builtin/index-pack.c:495 | |
8ada9598 | 2954 | msgid "cannot pread pack file" |
81809b99 | 2955 | msgstr "无法读取包文件" |
8ada9598 JX |
2956 | |
2957 | #: builtin/index-pack.c:497 | |
2958 | #, c-format | |
2959 | msgid "premature end of pack file, %lu byte missing" | |
2960 | msgid_plural "premature end of pack file, %lu bytes missing" | |
81809b99 | 2961 | msgstr[0] "包文件过早结束,缺少 %lu 字节" |
5ae481e0 | 2962 | msgstr[1] "包文件过早结束,缺少 %lu 字节" |
8ada9598 JX |
2963 | |
2964 | #: builtin/index-pack.c:510 | |
2965 | msgid "serious inflate inconsistency" | |
81809b99 | 2966 | msgstr "解压缩严重的不一致" |
8ada9598 JX |
2967 | |
2968 | #: builtin/index-pack.c:583 | |
81809b99 | 2969 | #, c-format |
8ada9598 | 2970 | msgid "cannot read existing object %s" |
81809b99 | 2971 | msgstr "不能读取现存对象 %s" |
8ada9598 JX |
2972 | |
2973 | #: builtin/index-pack.c:586 | |
2974 | #, c-format | |
2975 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 2976 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 JX |
2977 | |
2978 | #: builtin/index-pack.c:598 | |
81809b99 | 2979 | #, c-format |
8ada9598 | 2980 | msgid "invalid blob object %s" |
81809b99 | 2981 | msgstr "无效的 blob 对象 %s" |
8ada9598 JX |
2982 | |
2983 | #: builtin/index-pack.c:610 | |
81809b99 | 2984 | #, c-format |
8ada9598 | 2985 | msgid "invalid %s" |
81809b99 | 2986 | msgstr "无效的 %s" |
8ada9598 JX |
2987 | |
2988 | #: builtin/index-pack.c:612 | |
2989 | msgid "Error in object" | |
81809b99 | 2990 | msgstr "对象中出错" |
8ada9598 JX |
2991 | |
2992 | #: builtin/index-pack.c:614 | |
2993 | #, c-format | |
2994 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 2995 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 JX |
2996 | |
2997 | #: builtin/index-pack.c:687 builtin/index-pack.c:713 | |
8ada9598 | 2998 | msgid "failed to apply delta" |
81809b99 | 2999 | msgstr "无法应用 delta" |
8ada9598 JX |
3000 | |
3001 | #: builtin/index-pack.c:850 | |
8ada9598 | 3002 | msgid "Receiving objects" |
81809b99 | 3003 | msgstr "接收对象中" |
8ada9598 JX |
3004 | |
3005 | #: builtin/index-pack.c:850 | |
8ada9598 | 3006 | msgid "Indexing objects" |
81809b99 | 3007 | msgstr "索引对象中" |
8ada9598 JX |
3008 | |
3009 | #: builtin/index-pack.c:872 | |
3010 | msgid "pack is corrupted (SHA1 mismatch)" | |
81809b99 | 3011 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 JX |
3012 | |
3013 | #: builtin/index-pack.c:877 | |
8ada9598 | 3014 | msgid "cannot fstat packfile" |
81809b99 | 3015 | msgstr "不能枚举包文件状态" |
8ada9598 JX |
3016 | |
3017 | #: builtin/index-pack.c:880 | |
3018 | msgid "pack has junk at the end" | |
81809b99 | 3019 | msgstr "包的结尾有垃圾数据" |
8ada9598 JX |
3020 | |
3021 | #: builtin/index-pack.c:903 | |
8ada9598 | 3022 | msgid "Resolving deltas" |
81809b99 | 3023 | msgstr "处理 delta 中" |
8ada9598 JX |
3024 | |
3025 | #: builtin/index-pack.c:954 | |
3026 | msgid "confusion beyond insanity" | |
81809b99 | 3027 | msgstr "不可理喻" |
8ada9598 JX |
3028 | |
3029 | #: builtin/index-pack.c:973 | |
3030 | #, c-format | |
3031 | msgid "pack has %d unresolved delta" | |
3032 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 3033 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 3034 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 JX |
3035 | |
3036 | #: builtin/index-pack.c:998 | |
81809b99 | 3037 | #, c-format |
8ada9598 | 3038 | msgid "unable to deflate appended object (%d)" |
81809b99 | 3039 | msgstr "不能缩小附加对象(%d)" |
8ada9598 JX |
3040 | |
3041 | #: builtin/index-pack.c:1077 | |
3042 | #, c-format | |
3043 | msgid "local object %s is corrupt" | |
81809b99 | 3044 | msgstr "本地对象 %s 已损坏" |
8ada9598 JX |
3045 | |
3046 | #: builtin/index-pack.c:1101 | |
3047 | msgid "error while closing pack file" | |
81809b99 | 3048 | msgstr "关闭包文件时出错" |
8ada9598 JX |
3049 | |
3050 | #: builtin/index-pack.c:1114 | |
81809b99 | 3051 | #, c-format |
8ada9598 | 3052 | msgid "cannot write keep file '%s'" |
81809b99 | 3053 | msgstr "无法写保留文件 '%s'" |
8ada9598 JX |
3054 | |
3055 | #: builtin/index-pack.c:1122 | |
81809b99 | 3056 | #, c-format |
8ada9598 | 3057 | msgid "cannot close written keep file '%s'" |
81809b99 | 3058 | msgstr "无法关闭保留文件 '%s'" |
8ada9598 JX |
3059 | |
3060 | #: builtin/index-pack.c:1135 | |
8ada9598 | 3061 | msgid "cannot store pack file" |
81809b99 | 3062 | msgstr "无法存储包文件" |
8ada9598 JX |
3063 | |
3064 | #: builtin/index-pack.c:1146 | |
8ada9598 | 3065 | msgid "cannot store index file" |
81809b99 | 3066 | msgstr "无法存储索引文件" |
8ada9598 JX |
3067 | |
3068 | #: builtin/index-pack.c:1247 | |
81809b99 | 3069 | #, c-format |
8ada9598 | 3070 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 3071 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 JX |
3072 | |
3073 | #: builtin/index-pack.c:1249 | |
81809b99 | 3074 | #, c-format |
8ada9598 | 3075 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 3076 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 JX |
3077 | |
3078 | #: builtin/index-pack.c:1296 | |
81809b99 | 3079 | #, c-format |
8ada9598 JX |
3080 | msgid "non delta: %d object" |
3081 | msgid_plural "non delta: %d objects" | |
81809b99 | 3082 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 3083 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 JX |
3084 | |
3085 | #: builtin/index-pack.c:1303 | |
3086 | #, c-format | |
3087 | msgid "chain length = %d: %lu object" | |
3088 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 3089 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 3090 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 JX |
3091 | |
3092 | #: builtin/index-pack.c:1330 | |
3093 | msgid "Cannot come back to cwd" | |
81809b99 | 3094 | msgstr "无法返回当前工作目录" |
8ada9598 JX |
3095 | |
3096 | #: builtin/index-pack.c:1374 builtin/index-pack.c:1377 | |
3097 | #: builtin/index-pack.c:1389 builtin/index-pack.c:1393 | |
81809b99 | 3098 | #, c-format |
8ada9598 | 3099 | msgid "bad %s" |
81809b99 | 3100 | msgstr "错误选项 %s" |
8ada9598 JX |
3101 | |
3102 | #: builtin/index-pack.c:1407 | |
8ada9598 | 3103 | msgid "--fix-thin cannot be used without --stdin" |
81809b99 | 3104 | msgstr "--fix-thin 不能和 --stdin 共用" |
8ada9598 JX |
3105 | |
3106 | #: builtin/index-pack.c:1411 builtin/index-pack.c:1421 | |
3107 | #, c-format | |
3108 | msgid "packfile name '%s' does not end with '.pack'" | |
81809b99 | 3109 | msgstr "包名 '%s' 没有以 '.pack' 结尾" |
8ada9598 JX |
3110 | |
3111 | #: builtin/index-pack.c:1430 | |
3112 | msgid "--verify with no packfile name given" | |
81809b99 | 3113 | msgstr "--verify 没有提供包名参数" |
8ada9598 | 3114 | |
c04f5ac3 JX |
3115 | #: builtin/init-db.c:35 |
3116 | #, c-format | |
3117 | msgid "Could not make %s writable by group" | |
3118 | msgstr "不能设置 %s 为组可写" | |
3119 | ||
3120 | #: builtin/init-db.c:62 | |
3121 | #, c-format | |
3122 | msgid "insanely long template name %s" | |
3123 | msgstr "太长的模版名 %s" | |
3124 | ||
3125 | #: builtin/init-db.c:67 | |
3126 | #, c-format | |
3127 | msgid "cannot stat '%s'" | |
3128 | msgstr "不能枚举 '%s' 状态" | |
3129 | ||
3130 | #: builtin/init-db.c:73 | |
3131 | #, c-format | |
3132 | msgid "cannot stat template '%s'" | |
3133 | msgstr "不能枚举模版 '%s' 状态" | |
3134 | ||
3135 | #: builtin/init-db.c:80 | |
3136 | #, c-format | |
3137 | msgid "cannot opendir '%s'" | |
3138 | msgstr "不能打开目录 '%s'" | |
3139 | ||
3140 | #: builtin/init-db.c:97 | |
3141 | #, c-format | |
3142 | msgid "cannot readlink '%s'" | |
3143 | msgstr "不能读取链接 '%s'" | |
3144 | ||
3145 | #: builtin/init-db.c:99 | |
3146 | #, c-format | |
3147 | msgid "insanely long symlink %s" | |
3148 | msgstr "太长的符号链接 %s" | |
3149 | ||
3150 | #: builtin/init-db.c:102 | |
3151 | #, c-format | |
3152 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 3153 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 JX |
3154 | |
3155 | #: builtin/init-db.c:106 | |
3156 | #, c-format | |
3157 | msgid "cannot copy '%s' to '%s'" | |
3158 | msgstr "不能拷贝 '%s' 至 '%s'" | |
3159 | ||
3160 | #: builtin/init-db.c:110 | |
3161 | #, c-format | |
3162 | msgid "ignoring template %s" | |
3163 | msgstr "忽略模版 %s" | |
3164 | ||
3165 | #: builtin/init-db.c:133 | |
3166 | #, c-format | |
3167 | msgid "insanely long template path %s" | |
3168 | msgstr "太长的模版路径 %s" | |
3169 | ||
3170 | #: builtin/init-db.c:141 | |
3171 | #, c-format | |
3172 | msgid "templates not found %s" | |
3173 | msgstr "模版未找到 %s" | |
3174 | ||
3175 | #: builtin/init-db.c:154 | |
3176 | #, c-format | |
3177 | msgid "not copying templates of a wrong format version %d from '%s'" | |
81809b99 | 3178 | msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版" |
c04f5ac3 JX |
3179 | |
3180 | #: builtin/init-db.c:192 | |
3181 | #, c-format | |
3182 | msgid "insane git directory %s" | |
3183 | msgstr "不正常的 git 目录 %s" | |
3184 | ||
3185 | #: builtin/init-db.c:322 builtin/init-db.c:325 | |
3186 | #, c-format | |
3187 | msgid "%s already exists" | |
3188 | msgstr "%s 已经存在" | |
3189 | ||
3190 | #: builtin/init-db.c:354 | |
3191 | #, c-format | |
3192 | msgid "unable to handle file type %d" | |
3193 | msgstr "不能处理 %d 类型的文件" | |
3194 | ||
3195 | #: builtin/init-db.c:357 | |
3196 | #, c-format | |
3197 | msgid "unable to move %s to %s" | |
3198 | msgstr "不能移动 %s 至 %s" | |
3199 | ||
3200 | #: builtin/init-db.c:362 | |
3201 | #, c-format | |
3202 | msgid "Could not create git link %s" | |
3203 | msgstr "不能创建 git link %s" | |
3204 | ||
3205 | #. | |
3206 | #. * TRANSLATORS: The first '%s' is either "Reinitialized | |
3207 | #. * existing" or "Initialized empty", the second " shared" or | |
3208 | #. * "", and the last '%s%s' is the verbatim directory name. | |
3209 | #. | |
3210 | #: builtin/init-db.c:419 | |
3211 | #, c-format | |
3212 | msgid "%s%s Git repository in %s%s\n" | |
3213 | msgstr "%s%s Git 版本库于 %s%s\n" | |
3214 | ||
3215 | #: builtin/init-db.c:420 | |
3216 | msgid "Reinitialized existing" | |
3217 | msgstr "重新初始化现存的" | |
3218 | ||
3219 | #: builtin/init-db.c:420 | |
3220 | msgid "Initialized empty" | |
3221 | msgstr "初始化空的" | |
3222 | ||
7e238ab7 | 3223 | # 译者:中文字符串拼接,可删除前导空格 |
c04f5ac3 JX |
3224 | #: builtin/init-db.c:421 |
3225 | msgid " shared" | |
90e6ef53 | 3226 | msgstr "共享" |
c04f5ac3 JX |
3227 | |
3228 | #: builtin/init-db.c:440 | |
3229 | msgid "cannot tell cwd" | |
3230 | msgstr "无法获知当前路径" | |
3231 | ||
3232 | #: builtin/init-db.c:521 builtin/init-db.c:528 | |
3233 | #, c-format | |
3234 | msgid "cannot mkdir %s" | |
3235 | msgstr "不能创建目录 %s" | |
3236 | ||
3237 | #: builtin/init-db.c:532 | |
3238 | #, c-format | |
3239 | msgid "cannot chdir to %s" | |
3240 | msgstr "不能切换目录到 %s" | |
3241 | ||
3242 | #: builtin/init-db.c:554 | |
3243 | #, c-format | |
3244 | msgid "" | |
3245 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
3246 | "dir=<directory>)" | |
3247 | msgstr "" | |
73a60cd2 JX |
3248 | "不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-" |
3249 | "dir=<directory>)" | |
c04f5ac3 JX |
3250 | |
3251 | #: builtin/init-db.c:578 | |
3252 | msgid "Cannot access current working directory" | |
3253 | msgstr "不能访问当前工作目录" | |
3254 | ||
3255 | #: builtin/init-db.c:585 | |
3256 | #, c-format | |
3257 | msgid "Cannot access work tree '%s'" | |
3258 | msgstr "不能访问工作区 '%s'" | |
3259 | ||
170e9899 | 3260 | #: builtin/log.c:188 |
c04f5ac3 JX |
3261 | #, c-format |
3262 | msgid "Final output: %d %s\n" | |
3263 | msgstr "最终输出:%d %s\n" | |
3264 | ||
170e9899 | 3265 | #: builtin/log.c:401 builtin/log.c:489 |
c04f5ac3 JX |
3266 | #, c-format |
3267 | msgid "Could not read object %s" | |
90e6ef53 | 3268 | msgstr "不能读取对象 %s" |
c04f5ac3 | 3269 | |
170e9899 | 3270 | #: builtin/log.c:513 |
c04f5ac3 JX |
3271 | #, c-format |
3272 | msgid "Unknown type: %d" | |
3273 | msgstr "未知类型:%d" | |
3274 | ||
170e9899 | 3275 | #: builtin/log.c:602 |
c04f5ac3 JX |
3276 | msgid "format.headers without value" |
3277 | msgstr "format.headers 没有值" | |
3278 | ||
170e9899 | 3279 | #: builtin/log.c:675 |
c04f5ac3 JX |
3280 | msgid "name of output directory is too long" |
3281 | msgstr "输出目录名太长" | |
3282 | ||
170e9899 | 3283 | #: builtin/log.c:686 |
c04f5ac3 JX |
3284 | #, c-format |
3285 | msgid "Cannot open patch file %s" | |
3286 | msgstr "无法打开补丁文件 %s" | |
3287 | ||
170e9899 | 3288 | #: builtin/log.c:700 |
c04f5ac3 JX |
3289 | msgid "Need exactly one range." |
3290 | msgstr "只需要一个范围。" | |
3291 | ||
170e9899 | 3292 | #: builtin/log.c:708 |
c04f5ac3 JX |
3293 | msgid "Not a range." |
3294 | msgstr "不是一个范围。" | |
3295 | ||
170e9899 | 3296 | #: builtin/log.c:745 |
c04f5ac3 | 3297 | msgid "Could not extract email from committer identity." |
90e6ef53 | 3298 | msgstr "不能从提交者身份中提取邮件地址。" |
c04f5ac3 | 3299 | |
170e9899 | 3300 | #: builtin/log.c:791 |
c04f5ac3 JX |
3301 | msgid "Cover letter needs email format" |
3302 | msgstr "信封需要邮件地址格式" | |
3303 | ||
170e9899 | 3304 | #: builtin/log.c:885 |
c04f5ac3 JX |
3305 | #, c-format |
3306 | msgid "insane in-reply-to: %s" | |
3307 | msgstr "不正常的 in-reply-to:%s" | |
3308 | ||
170e9899 | 3309 | #: builtin/log.c:958 |
c04f5ac3 JX |
3310 | msgid "Two output directories?" |
3311 | msgstr "两个输出目录?" | |
3312 | ||
170e9899 | 3313 | #: builtin/log.c:1179 |
c04f5ac3 JX |
3314 | #, c-format |
3315 | msgid "bogus committer info %s" | |
3316 | msgstr "虚假的提交者信息 %s" | |
3317 | ||
170e9899 | 3318 | #: builtin/log.c:1224 |
c04f5ac3 JX |
3319 | msgid "-n and -k are mutually exclusive." |
3320 | msgstr "-n 和 -k 互斥。" | |
3321 | ||
170e9899 | 3322 | #: builtin/log.c:1226 |
c04f5ac3 JX |
3323 | msgid "--subject-prefix and -k are mutually exclusive." |
3324 | msgstr "--subject-prefix 和 -k 互斥。" | |
3325 | ||
170e9899 | 3326 | #: builtin/log.c:1234 |
c04f5ac3 JX |
3327 | msgid "--name-only does not make sense" |
3328 | msgstr "--name-only 无意义" | |
3329 | ||
170e9899 | 3330 | #: builtin/log.c:1236 |
c04f5ac3 JX |
3331 | msgid "--name-status does not make sense" |
3332 | msgstr "--name-status 无意义" | |
3333 | ||
170e9899 | 3334 | #: builtin/log.c:1238 |
c04f5ac3 JX |
3335 | msgid "--check does not make sense" |
3336 | msgstr "--check 无意义" | |
3337 | ||
170e9899 | 3338 | #: builtin/log.c:1261 |
c04f5ac3 JX |
3339 | msgid "standard output, or directory, which one?" |
3340 | msgstr "标准输出或目录,哪一个?" | |
3341 | ||
170e9899 | 3342 | #: builtin/log.c:1263 |
c04f5ac3 JX |
3343 | #, c-format |
3344 | msgid "Could not create directory '%s'" | |
90e6ef53 | 3345 | msgstr "不能创建目录 '%s'" |
c04f5ac3 | 3346 | |
170e9899 | 3347 | #: builtin/log.c:1416 |
c04f5ac3 JX |
3348 | msgid "Failed to create output files" |
3349 | msgstr "无法创建输出文件" | |
3350 | ||
170e9899 | 3351 | #: builtin/log.c:1520 |
c04f5ac3 JX |
3352 | #, c-format |
3353 | msgid "" | |
3354 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
90e6ef53 | 3355 | msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n" |
c04f5ac3 | 3356 | |
170e9899 | 3357 | #: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550 |
c04f5ac3 JX |
3358 | #, c-format |
3359 | msgid "Unknown commit %s" | |
3360 | msgstr "未知提交 %s" | |
3361 | ||
170e9899 | 3362 | #: builtin/merge.c:90 |
c04f5ac3 JX |
3363 | msgid "switch `m' requires a value" |
3364 | msgstr "开关 `m' 需要一个值" | |
3365 | ||
170e9899 | 3366 | #: builtin/merge.c:127 |
c04f5ac3 JX |
3367 | #, c-format |
3368 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 3369 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 3370 | |
170e9899 | 3371 | #: builtin/merge.c:128 |
c04f5ac3 JX |
3372 | #, c-format |
3373 | msgid "Available strategies are:" | |
3374 | msgstr "可用的策略有:" | |
3375 | ||
170e9899 | 3376 | #: builtin/merge.c:133 |
c04f5ac3 JX |
3377 | #, c-format |
3378 | msgid "Available custom strategies are:" | |
3379 | msgstr "可用的自定义策略有:" | |
3380 | ||
170e9899 | 3381 | #: builtin/merge.c:240 |
c04f5ac3 JX |
3382 | msgid "could not run stash." |
3383 | msgstr "不能进行进度保存。" | |
3384 | ||
170e9899 | 3385 | #: builtin/merge.c:245 |
c04f5ac3 JX |
3386 | msgid "stash failed" |
3387 | msgstr "进度保存失败" | |
3388 | ||
170e9899 | 3389 | #: builtin/merge.c:250 |
c04f5ac3 JX |
3390 | #, c-format |
3391 | msgid "not a valid object: %s" | |
3392 | msgstr "不是一个有效对象:%s" | |
3393 | ||
170e9899 | 3394 | #: builtin/merge.c:269 builtin/merge.c:286 |
c04f5ac3 JX |
3395 | msgid "read-tree failed" |
3396 | msgstr "读取树失败" | |
3397 | ||
90e6ef53 | 3398 | # 译者:注意保持前导空格 |
170e9899 | 3399 | #: builtin/merge.c:316 |
c04f5ac3 JX |
3400 | msgid " (nothing to squash)" |
3401 | msgstr " (无可压缩)" | |
3402 | ||
170e9899 | 3403 | #: builtin/merge.c:329 |
c04f5ac3 JX |
3404 | #, c-format |
3405 | msgid "Squash commit -- not updating HEAD\n" | |
3406 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
3407 | ||
170e9899 | 3408 | #: builtin/merge.c:361 |
c04f5ac3 JX |
3409 | msgid "Writing SQUASH_MSG" |
3410 | msgstr "写入 SQUASH_MSG" | |
3411 | ||
170e9899 | 3412 | #: builtin/merge.c:363 |
c04f5ac3 JX |
3413 | msgid "Finishing SQUASH_MSG" |
3414 | msgstr "完成 SQUASH_MSG" | |
3415 | ||
3416 | #: builtin/merge.c:386 | |
3417 | #, c-format | |
3418 | msgid "No merge message -- not updating HEAD\n" | |
3419 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
3420 | ||
14c8bced | 3421 | #: builtin/merge.c:437 |
c04f5ac3 JX |
3422 | #, c-format |
3423 | msgid "'%s' does not point to a commit" | |
3424 | msgstr "'%s' 没有指向一个提交" | |
3425 | ||
14c8bced | 3426 | #: builtin/merge.c:536 |
c04f5ac3 JX |
3427 | #, c-format |
3428 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 3429 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 3430 | |
14c8bced | 3431 | #: builtin/merge.c:629 |
c04f5ac3 JX |
3432 | msgid "git write-tree failed to write a tree" |
3433 | msgstr "git write-tree 无法写入一树对象" | |
3434 | ||
14c8bced | 3435 | #: builtin/merge.c:679 |
c04f5ac3 JX |
3436 | msgid "failed to read the cache" |
3437 | msgstr "无法读取缓存" | |
3438 | ||
170e9899 | 3439 | #: builtin/merge.c:697 |
c04f5ac3 | 3440 | msgid "Unable to write index." |
90e6ef53 | 3441 | msgstr "不能写索引。" |
c04f5ac3 | 3442 | |
170e9899 | 3443 | #: builtin/merge.c:710 |
c04f5ac3 JX |
3444 | msgid "Not handling anything other than two heads merge." |
3445 | msgstr "不能处理两个头合并之外的任何操作。" | |
3446 | ||
170e9899 | 3447 | #: builtin/merge.c:724 |
c04f5ac3 JX |
3448 | #, c-format |
3449 | msgid "Unknown option for merge-recursive: -X%s" | |
3450 | msgstr "merge-recursive 的未知选项:-X%s" | |
3451 | ||
170e9899 | 3452 | #: builtin/merge.c:738 |
c04f5ac3 JX |
3453 | #, c-format |
3454 | msgid "unable to write %s" | |
3455 | msgstr "不能写 %s" | |
3456 | ||
170e9899 | 3457 | #: builtin/merge.c:877 |
c04f5ac3 JX |
3458 | #, c-format |
3459 | msgid "Could not read from '%s'" | |
3460 | msgstr "不能从 '%s' 读取" | |
3461 | ||
170e9899 | 3462 | #: builtin/merge.c:886 |
c04f5ac3 JX |
3463 | #, c-format |
3464 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
3465 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
3466 | ||
170e9899 | 3467 | #: builtin/merge.c:892 |
c04f5ac3 JX |
3468 | msgid "" |
3469 | "Please enter a commit message to explain why this merge is necessary,\n" | |
3470 | "especially if it merges an updated upstream into a topic branch.\n" | |
3471 | "\n" | |
3472 | "Lines starting with '#' will be ignored, and an empty message aborts\n" | |
3473 | "the commit.\n" | |
3474 | msgstr "" | |
3475 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
3476 | "合并到主题分支。\n" | |
3477 | "\n" | |
3478 | "以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n" | |
3479 | ||
170e9899 | 3480 | #: builtin/merge.c:916 |
c04f5ac3 JX |
3481 | msgid "Empty commit message." |
3482 | msgstr "空提交信息。" | |
3483 | ||
170e9899 | 3484 | #: builtin/merge.c:928 |
c04f5ac3 JX |
3485 | #, c-format |
3486 | msgid "Wonderful.\n" | |
3487 | msgstr "太棒了。\n" | |
3488 | ||
170e9899 | 3489 | #: builtin/merge.c:993 |
c04f5ac3 JX |
3490 | #, c-format |
3491 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
3492 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
3493 | ||
170e9899 | 3494 | #: builtin/merge.c:1009 |
c04f5ac3 JX |
3495 | #, c-format |
3496 | msgid "'%s' is not a commit" | |
3497 | msgstr "'%s' 不是一个提交" | |
3498 | ||
170e9899 | 3499 | #: builtin/merge.c:1050 |
c04f5ac3 | 3500 | msgid "No current branch." |
90e6ef53 | 3501 | msgstr "没有当前分支。" |
c04f5ac3 | 3502 | |
170e9899 | 3503 | #: builtin/merge.c:1052 |
c04f5ac3 | 3504 | msgid "No remote for the current branch." |
90e6ef53 | 3505 | msgstr "当前分支没有对应的远程版本库。" |
c04f5ac3 | 3506 | |
170e9899 | 3507 | #: builtin/merge.c:1054 |
c04f5ac3 | 3508 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 3509 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 3510 | |
170e9899 | 3511 | #: builtin/merge.c:1059 |
c04f5ac3 JX |
3512 | #, c-format |
3513 | msgid "No remote tracking branch for %s from %s" | |
3514 | msgstr "%s 没有来自 %s 的远程跟踪分支" | |
3515 | ||
170e9899 JX |
3516 | #: builtin/merge.c:1146 builtin/merge.c:1303 |
3517 | #, c-format | |
3518 | msgid "%s - not something we can merge" | |
3519 | msgstr "%s - 不能被合并" | |
3520 | ||
3521 | #: builtin/merge.c:1214 | |
c04f5ac3 | 3522 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 3523 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 3524 | |
170e9899 | 3525 | #: builtin/merge.c:1230 git-pull.sh:31 |
c04f5ac3 JX |
3526 | msgid "" |
3527 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
3528 | "Please, commit your changes before you can merge." | |
3529 | msgstr "" | |
3530 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 3531 | "请在合并前先提交您的修改。" |
c04f5ac3 | 3532 | |
170e9899 | 3533 | #: builtin/merge.c:1233 git-pull.sh:34 |
c04f5ac3 JX |
3534 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
3535 | msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" | |
3536 | ||
170e9899 | 3537 | #: builtin/merge.c:1237 |
c04f5ac3 JX |
3538 | msgid "" |
3539 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
3540 | "Please, commit your changes before you can merge." | |
3541 | msgstr "" | |
3542 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 3543 | "请在合并前先提交您的修改。" |
c04f5ac3 | 3544 | |
170e9899 | 3545 | #: builtin/merge.c:1240 |
c04f5ac3 JX |
3546 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
3547 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
3548 | ||
170e9899 | 3549 | #: builtin/merge.c:1249 |
c04f5ac3 JX |
3550 | msgid "You cannot combine --squash with --no-ff." |
3551 | msgstr "您不能将 --squash 与 --no-ff 共用。" | |
3552 | ||
170e9899 | 3553 | #: builtin/merge.c:1254 |
c04f5ac3 JX |
3554 | msgid "You cannot combine --no-ff with --ff-only." |
3555 | msgstr "您不能将 --no-ff 与 --ff-only 共用。" | |
3556 | ||
170e9899 | 3557 | #: builtin/merge.c:1261 |
c04f5ac3 | 3558 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 3559 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 3560 | |
170e9899 | 3561 | #: builtin/merge.c:1293 |
c04f5ac3 | 3562 | msgid "Can merge only exactly one commit into empty head" |
90e6ef53 | 3563 | msgstr "只能将一个提交合并到空分支上" |
c04f5ac3 | 3564 | |
170e9899 | 3565 | #: builtin/merge.c:1296 |
c04f5ac3 JX |
3566 | msgid "Squash commit into empty head not supported yet" |
3567 | msgstr "尚不支持到空分支的压缩提交" | |
3568 | ||
170e9899 | 3569 | #: builtin/merge.c:1298 |
c04f5ac3 JX |
3570 | msgid "Non-fast-forward commit does not make sense into an empty head" |
3571 | msgstr "到空分支的非快进式提交没有意义" | |
3572 | ||
170e9899 | 3573 | #: builtin/merge.c:1413 |
c04f5ac3 JX |
3574 | #, c-format |
3575 | msgid "Updating %s..%s\n" | |
3576 | msgstr "更新 %s..%s\n" | |
3577 | ||
170e9899 | 3578 | #: builtin/merge.c:1451 |
c04f5ac3 JX |
3579 | #, c-format |
3580 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 3581 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 3582 | |
170e9899 | 3583 | #: builtin/merge.c:1458 |
c04f5ac3 JX |
3584 | #, c-format |
3585 | msgid "Nope.\n" | |
3586 | msgstr "无。\n" | |
3587 | ||
170e9899 | 3588 | #: builtin/merge.c:1490 |
c04f5ac3 | 3589 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 3590 | msgstr "无法快进,终止。" |
c04f5ac3 | 3591 | |
170e9899 | 3592 | #: builtin/merge.c:1513 builtin/merge.c:1592 |
c04f5ac3 JX |
3593 | #, c-format |
3594 | msgid "Rewinding the tree to pristine...\n" | |
3595 | msgstr "将树回滚至原始状态...\n" | |
3596 | ||
170e9899 | 3597 | #: builtin/merge.c:1517 |
c04f5ac3 JX |
3598 | #, c-format |
3599 | msgid "Trying merge strategy %s...\n" | |
3600 | msgstr "尝试合并策略 %s...\n" | |
3601 | ||
170e9899 | 3602 | #: builtin/merge.c:1583 |
c04f5ac3 JX |
3603 | #, c-format |
3604 | msgid "No merge strategy handled the merge.\n" | |
3605 | msgstr "没有合并策略处理此合并。\n" | |
3606 | ||
170e9899 | 3607 | #: builtin/merge.c:1585 |
c04f5ac3 JX |
3608 | #, c-format |
3609 | msgid "Merge with strategy %s failed.\n" | |
3610 | msgstr "使用策略 %s 合并失败。\n" | |
3611 | ||
170e9899 | 3612 | #: builtin/merge.c:1594 |
c04f5ac3 JX |
3613 | #, c-format |
3614 | msgid "Using the %s to prepare resolving by hand.\n" | |
3615 | msgstr "使用 %s 以准备手工解决。\n" | |
3616 | ||
170e9899 | 3617 | #: builtin/merge.c:1606 |
c04f5ac3 JX |
3618 | #, c-format |
3619 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
3620 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
3621 | ||
3622 | #: builtin/mv.c:108 | |
3623 | #, c-format | |
3624 | msgid "Checking rename of '%s' to '%s'\n" | |
3625 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
3626 | ||
3627 | #: builtin/mv.c:112 | |
3628 | msgid "bad source" | |
3629 | msgstr "坏的源" | |
3630 | ||
3631 | #: builtin/mv.c:115 | |
3632 | msgid "can not move directory into itself" | |
3633 | msgstr "不能将目录移动到自身" | |
3634 | ||
3635 | #: builtin/mv.c:118 | |
3636 | msgid "cannot move directory over file" | |
3637 | msgstr "不能将目录移动到文件" | |
3638 | ||
3639 | #: builtin/mv.c:128 | |
3640 | #, c-format | |
3641 | msgid "Huh? %.*s is in index?" | |
90e6ef53 | 3642 | msgstr "嗯?%.*s 在索引中?" |
c04f5ac3 JX |
3643 | |
3644 | #: builtin/mv.c:140 | |
3645 | msgid "source directory is empty" | |
3646 | msgstr "源目录为空" | |
3647 | ||
3648 | #: builtin/mv.c:171 | |
3649 | msgid "not under version control" | |
3650 | msgstr "不在版本控制之下" | |
3651 | ||
3652 | #: builtin/mv.c:173 | |
3653 | msgid "destination exists" | |
3654 | msgstr "目标已存在" | |
3655 | ||
3656 | #: builtin/mv.c:181 | |
3657 | #, c-format | |
3658 | msgid "overwriting '%s'" | |
3659 | msgstr "覆盖 '%s'" | |
3660 | ||
3661 | #: builtin/mv.c:184 | |
3662 | msgid "Cannot overwrite" | |
3663 | msgstr "不能覆盖" | |
3664 | ||
3665 | #: builtin/mv.c:187 | |
3666 | msgid "multiple sources for the same target" | |
3667 | msgstr "同一目标具有多个源" | |
3668 | ||
3669 | #: builtin/mv.c:202 | |
3670 | #, c-format | |
3671 | msgid "%s, source=%s, destination=%s" | |
3672 | msgstr "%s,源=%s,目标=%s" | |
3673 | ||
3674 | #: builtin/mv.c:212 | |
3675 | #, c-format | |
3676 | msgid "Renaming %s to %s\n" | |
3677 | msgstr "重命名 %s 至 %s\n" | |
3678 | ||
8ada9598 | 3679 | #: builtin/mv.c:215 builtin/remote.c:731 |
c04f5ac3 JX |
3680 | #, c-format |
3681 | msgid "renaming '%s' failed" | |
3682 | msgstr "重命名 '%s' 失败" | |
3683 | ||
3684 | #: builtin/notes.c:139 | |
3685 | #, c-format | |
3686 | msgid "unable to start 'show' for object '%s'" | |
3687 | msgstr "不能为对象 '%s' 开始 'show'" | |
3688 | ||
3689 | #: builtin/notes.c:145 | |
3690 | msgid "can't fdopen 'show' output fd" | |
3691 | msgstr "不能打开 'show' 输出文件句柄" | |
3692 | ||
3693 | #: builtin/notes.c:155 | |
3694 | #, c-format | |
3695 | msgid "failed to close pipe to 'show' for object '%s'" | |
3696 | msgstr "无法为对象 '%s' 的 'show' 关闭管道" | |
3697 | ||
3698 | #: builtin/notes.c:158 | |
3699 | #, c-format | |
3700 | msgid "failed to finish 'show' for object '%s'" | |
3701 | msgstr "无法为对象 '%s' 完成 'show'" | |
3702 | ||
8ada9598 | 3703 | #: builtin/notes.c:175 builtin/tag.c:347 |
c04f5ac3 JX |
3704 | #, c-format |
3705 | msgid "could not create file '%s'" | |
3706 | msgstr "不能创建文件 '%s'" | |
3707 | ||
3708 | #: builtin/notes.c:189 | |
3709 | msgid "Please supply the note contents using either -m or -F option" | |
3710 | msgstr "请通过 -m 或 -F 选项为注解提供内容" | |
3711 | ||
3712 | #: builtin/notes.c:210 builtin/notes.c:973 | |
3713 | #, c-format | |
3714 | msgid "Removing note for object %s\n" | |
3715 | msgstr "删除对象 %s 的注解\n" | |
3716 | ||
3717 | #: builtin/notes.c:215 | |
3718 | msgid "unable to write note object" | |
3719 | msgstr "不能写注解对象" | |
3720 | ||
3721 | #: builtin/notes.c:217 | |
3722 | #, c-format | |
3723 | msgid "The note contents has been left in %s" | |
3724 | msgstr "注解内容被留在文件 %s 中" | |
3725 | ||
8ada9598 | 3726 | #: builtin/notes.c:251 builtin/tag.c:542 |
c04f5ac3 JX |
3727 | #, c-format |
3728 | msgid "cannot read '%s'" | |
3729 | msgstr "不能读取 '%s'" | |
3730 | ||
8ada9598 | 3731 | #: builtin/notes.c:253 builtin/tag.c:545 |
c04f5ac3 JX |
3732 | #, c-format |
3733 | msgid "could not open or read '%s'" | |
3734 | msgstr "不能打开或读取 '%s'" | |
3735 | ||
3736 | #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 | |
3737 | #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 | |
3738 | #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 | |
8ada9598 | 3739 | #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 |
c04f5ac3 JX |
3740 | #, c-format |
3741 | msgid "Failed to resolve '%s' as a valid ref." | |
90e6ef53 | 3742 | msgstr "无法解析 '%s' 为一个有效引用。" |
c04f5ac3 JX |
3743 | |
3744 | #: builtin/notes.c:275 | |
3745 | #, c-format | |
3746 | msgid "Failed to read object '%s'." | |
3747 | msgstr "无法读取对象 '%s'。" | |
3748 | ||
3749 | #: builtin/notes.c:299 | |
3750 | msgid "Cannot commit uninitialized/unreferenced notes tree" | |
3751 | msgstr "不能提交未初始化/未引用的注解树" | |
3752 | ||
3753 | #: builtin/notes.c:340 | |
3754 | #, c-format | |
3755 | msgid "Bad notes.rewriteMode value: '%s'" | |
90e6ef53 | 3756 | msgstr "坏的 notes.rewriteMode 值:'%s'" |
c04f5ac3 JX |
3757 | |
3758 | #: builtin/notes.c:350 | |
3759 | #, c-format | |
3760 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" | |
3761 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
3762 | ||
3763 | #. TRANSLATORS: The first %s is the name of the | |
3764 | #. environment variable, the second %s is its value | |
3765 | #: builtin/notes.c:377 | |
3766 | #, c-format | |
3767 | msgid "Bad %s value: '%s'" | |
90e6ef53 | 3768 | msgstr "坏的 %s 值:'%s'" |
c04f5ac3 JX |
3769 | |
3770 | #: builtin/notes.c:441 | |
3771 | #, c-format | |
3772 | msgid "Malformed input line: '%s'." | |
3773 | msgstr "非法的输入行:'%s'。" | |
3774 | ||
3775 | #: builtin/notes.c:456 | |
3776 | #, c-format | |
3777 | msgid "Failed to copy notes from '%s' to '%s'" | |
90e6ef53 | 3778 | msgstr "无法从 '%s' 到 '%s' 拷贝注解" |
c04f5ac3 JX |
3779 | |
3780 | #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 | |
3781 | #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 | |
3782 | #: builtin/notes.c:1033 | |
3783 | msgid "too many parameters" | |
3784 | msgstr "参数太多" | |
3785 | ||
3786 | #: builtin/notes.c:513 builtin/notes.c:772 | |
3787 | #, c-format | |
3788 | msgid "No note found for object %s." | |
3789 | msgstr "未发现对象 %s 的注解。" | |
3790 | ||
3791 | #: builtin/notes.c:580 | |
3792 | #, c-format | |
3793 | msgid "" | |
3794 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
3795 | "existing notes" | |
3796 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
3797 | ||
3798 | #: builtin/notes.c:585 builtin/notes.c:662 | |
3799 | #, c-format | |
3800 | msgid "Overwriting existing notes for object %s\n" | |
3801 | msgstr "覆盖对象 %s 现存注解\n" | |
3802 | ||
3803 | #: builtin/notes.c:635 | |
3804 | msgid "too few parameters" | |
3805 | msgstr "参数太少" | |
3806 | ||
3807 | #: builtin/notes.c:656 | |
3808 | #, c-format | |
3809 | msgid "" | |
3810 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
3811 | "existing notes" | |
3812 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
3813 | ||
3814 | #: builtin/notes.c:668 | |
3815 | #, c-format | |
3816 | msgid "Missing notes on source object %s. Cannot copy." | |
3817 | msgstr "源对象 %s 缺少注解。不能拷贝。" | |
3818 | ||
3819 | #: builtin/notes.c:717 | |
3820 | #, c-format | |
3821 | msgid "" | |
3822 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
3823 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
3824 | msgstr "" | |
90e6ef53 | 3825 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" |
c04f5ac3 JX |
3826 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" |
3827 | ||
3828 | #: builtin/notes.c:971 | |
3829 | #, c-format | |
3830 | msgid "Object %s has no note\n" | |
3831 | msgstr "对象 %s 没有注解\n" | |
3832 | ||
8ada9598 | 3833 | #: builtin/notes.c:1103 builtin/remote.c:1598 |
c04f5ac3 JX |
3834 | #, c-format |
3835 | msgid "Unknown subcommand: %s" | |
3836 | msgstr "未知子命令:%s" | |
3837 | ||
eff6d3a9 | 3838 | #: builtin/pack-objects.c:2315 |
7ac1c0ad JX |
3839 | #, c-format |
3840 | msgid "unsupported index version %s" | |
90e6ef53 | 3841 | msgstr "不支持的索引版本 %s" |
7ac1c0ad | 3842 | |
eff6d3a9 | 3843 | #: builtin/pack-objects.c:2319 |
7ac1c0ad JX |
3844 | #, c-format |
3845 | msgid "bad index version '%s'" | |
90e6ef53 | 3846 | msgstr "坏的索引版本 '%s'" |
7ac1c0ad | 3847 | |
eff6d3a9 | 3848 | #: builtin/pack-objects.c:2342 |
7ac1c0ad JX |
3849 | #, c-format |
3850 | msgid "option %s does not accept negative form" | |
90e6ef53 | 3851 | msgstr "选项 %s 不接受否定格式" |
7ac1c0ad | 3852 | |
eff6d3a9 | 3853 | #: builtin/pack-objects.c:2346 |
7ac1c0ad JX |
3854 | #, c-format |
3855 | msgid "unable to parse value '%s' for option %s" | |
81809b99 | 3856 | msgstr "不能解析选项 %1$s 的值 '%2$s'" |
7ac1c0ad | 3857 | |
170e9899 | 3858 | #: builtin/push.c:45 |
c04f5ac3 JX |
3859 | msgid "tag shorthand without <tag>" |
3860 | msgstr "tag 简写没有跟 <tag> 参数" | |
3861 | ||
170e9899 | 3862 | #: builtin/push.c:64 |
c04f5ac3 | 3863 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 3864 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 3865 | |
8ada9598 JX |
3866 | #: builtin/push.c:99 |
3867 | msgid "" | |
3868 | "\n" | |
3869 | "To choose either option permanently, see push.default in 'git help config'." | |
3870 | msgstr "" | |
81809b99 JX |
3871 | "\n" |
3872 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 JX |
3873 | |
3874 | #: builtin/push.c:102 | |
3875 | #, c-format | |
3876 | msgid "" | |
3877 | "The upstream branch of your current branch does not match\n" | |
3878 | "the name of your current branch. To push to the upstream branch\n" | |
3879 | "on the remote, use\n" | |
3880 | "\n" | |
3881 | " git push %s HEAD:%s\n" | |
3882 | "\n" | |
3883 | "To push to the branch of the same name on the remote, use\n" | |
3884 | "\n" | |
3885 | " git push %s %s\n" | |
3886 | "%s" | |
3887 | msgstr "" | |
81809b99 JX |
3888 | "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n" |
3889 | "上游分支,使用\n" | |
3890 | "\n" | |
3891 | " git push %s HEAD:%s\n" | |
3892 | "\n" | |
3893 | "为推送至远程同名分支,使用\n" | |
3894 | "\n" | |
3895 | " git push %s %s\n" | |
3896 | "%s" | |
8ada9598 JX |
3897 | |
3898 | #: builtin/push.c:121 | |
c04f5ac3 JX |
3899 | #, c-format |
3900 | msgid "" | |
3901 | "You are not currently on a branch.\n" | |
3902 | "To push the history leading to the current (detached HEAD)\n" | |
3903 | "state now, use\n" | |
3904 | "\n" | |
3905 | " git push %s HEAD:<name-of-remote-branch>\n" | |
3906 | msgstr "" | |
3907 | "您当前不在一个分支上。\n" | |
90e6ef53 | 3908 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 JX |
3909 | "\n" |
3910 | " git push %s HEAD:<name-of-remote-branch>\n" | |
3911 | ||
8ada9598 | 3912 | #: builtin/push.c:128 |
c04f5ac3 JX |
3913 | #, c-format |
3914 | msgid "" | |
3915 | "The current branch %s has no upstream branch.\n" | |
3916 | "To push the current branch and set the remote as upstream, use\n" | |
3917 | "\n" | |
3918 | " git push --set-upstream %s %s\n" | |
3919 | msgstr "" | |
3920 | "当前分支 %s 没有对应的上游分支。\n" | |
3921 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
3922 | "\n" | |
3923 | " git push --set-upstream %s %s\n" | |
3924 | ||
8ada9598 | 3925 | #: builtin/push.c:136 |
c04f5ac3 JX |
3926 | #, c-format |
3927 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
3928 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
3929 | ||
8ada9598 | 3930 | #: builtin/push.c:139 |
73a60cd2 JX |
3931 | #, c-format |
3932 | msgid "" | |
3933 | "You are pushing to remote '%s', which is not the upstream of\n" | |
3934 | "your current branch '%s', without telling me what to push\n" | |
3935 | "to update which remote branch." | |
3936 | msgstr "" | |
3937 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
3938 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
3939 | ||
8ada9598 | 3940 | #: builtin/push.c:174 |
c04f5ac3 JX |
3941 | msgid "" |
3942 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
90e6ef53 | 3943 | msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 3944 | |
8ada9598 | 3945 | #: builtin/push.c:181 |
170e9899 JX |
3946 | msgid "" |
3947 | "Updates were rejected because the tip of your current branch is behind\n" | |
3948 | "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" | |
3949 | "before pushing again.\n" | |
3950 | "See the 'Note about fast-forwards' in 'git push --help' for details." | |
3951 | msgstr "" | |
eff6d3a9 JX |
3952 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
3953 | "再次推送前,先与远程变更合并(如 'git pull')。详见\n" | |
3954 | "'git push --help' 中的 'Note about fast-forwards' 小节。" | |
170e9899 | 3955 | |
8ada9598 | 3956 | #: builtin/push.c:187 |
170e9899 JX |
3957 | msgid "" |
3958 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
3959 | "counterpart. If you did not intend to push that branch, you may want to\n" | |
3960 | "specify branches to push or set the 'push.default' configuration\n" | |
3961 | "variable to 'current' or 'upstream' to push only the current branch." | |
3962 | msgstr "" | |
eff6d3a9 JX |
3963 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
3964 | "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n" | |
8ada9598 | 3965 | "配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送当前分支。" |
170e9899 | 3966 | |
8ada9598 | 3967 | #: builtin/push.c:193 |
170e9899 JX |
3968 | msgid "" |
3969 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
3970 | "counterpart. Check out this branch and merge the remote changes\n" | |
3971 | "(e.g. 'git pull') before pushing again.\n" | |
3972 | "See the 'Note about fast-forwards' in 'git push --help' for details." | |
3973 | msgstr "" | |
eff6d3a9 JX |
3974 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
3975 | "检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n" | |
3976 | "'git push --help' 中的 'Note about fast-forwards' 小节。" | |
170e9899 | 3977 | |
8ada9598 | 3978 | #: builtin/push.c:233 |
c04f5ac3 JX |
3979 | #, c-format |
3980 | msgid "Pushing to %s\n" | |
3981 | msgstr "推送到 %s\n" | |
3982 | ||
8ada9598 | 3983 | #: builtin/push.c:237 |
c04f5ac3 JX |
3984 | #, c-format |
3985 | msgid "failed to push some refs to '%s'" | |
3986 | msgstr "无法推送一些引用到 '%s'" | |
3987 | ||
8ada9598 | 3988 | #: builtin/push.c:269 |
c04f5ac3 JX |
3989 | #, c-format |
3990 | msgid "bad repository '%s'" | |
90e6ef53 | 3991 | msgstr "坏的版本库 '%s'" |
c04f5ac3 | 3992 | |
8ada9598 | 3993 | #: builtin/push.c:270 |
c04f5ac3 JX |
3994 | msgid "" |
3995 | "No configured push destination.\n" | |
3996 | "Either specify the URL from the command-line or configure a remote " | |
3997 | "repository using\n" | |
3998 | "\n" | |
3999 | " git remote add <name> <url>\n" | |
4000 | "\n" | |
4001 | "and then push using the remote name\n" | |
4002 | "\n" | |
4003 | " git push <name>\n" | |
4004 | msgstr "" | |
90e6ef53 JX |
4005 | "没有配置推送目标。\n" |
4006 | "或者通过命令行指定URL,或者用下面命令配置一个远程版本库\n" | |
c04f5ac3 JX |
4007 | "\n" |
4008 | " git remote add <name> <url>\n" | |
4009 | "\n" | |
4010 | "然后使用该远程版本库名执行推送\n" | |
4011 | "\n" | |
4012 | " git push <name>\n" | |
4013 | ||
8ada9598 | 4014 | #: builtin/push.c:285 |
c04f5ac3 JX |
4015 | msgid "--all and --tags are incompatible" |
4016 | msgstr "--all 和 --tags 不兼容" | |
4017 | ||
8ada9598 | 4018 | #: builtin/push.c:286 |
c04f5ac3 JX |
4019 | msgid "--all can't be combined with refspecs" |
4020 | msgstr "--all 不能和引用表达式共用" | |
4021 | ||
8ada9598 | 4022 | #: builtin/push.c:291 |
c04f5ac3 JX |
4023 | msgid "--mirror and --tags are incompatible" |
4024 | msgstr "--mirror 和 --tags 不兼容" | |
4025 | ||
8ada9598 | 4026 | #: builtin/push.c:292 |
c04f5ac3 JX |
4027 | msgid "--mirror can't be combined with refspecs" |
4028 | msgstr "--mirror 不能和引用表达式共用" | |
4029 | ||
8ada9598 | 4030 | #: builtin/push.c:297 |
c04f5ac3 JX |
4031 | msgid "--all and --mirror are incompatible" |
4032 | msgstr "--all 和 --mirror 不兼容" | |
4033 | ||
8ada9598 | 4034 | #: builtin/push.c:385 |
c04f5ac3 JX |
4035 | msgid "--delete is incompatible with --all, --mirror and --tags" |
4036 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
4037 | ||
8ada9598 | 4038 | #: builtin/push.c:387 |
c04f5ac3 JX |
4039 | msgid "--delete doesn't make sense without any refs" |
4040 | msgstr "--delete 未接任何引用没有意义" | |
4041 | ||
8ada9598 | 4042 | #: builtin/remote.c:98 |
81809b99 | 4043 | #, c-format |
8ada9598 | 4044 | msgid "Updating %s" |
81809b99 | 4045 | msgstr "更新 %s 中" |
8ada9598 JX |
4046 | |
4047 | #: builtin/remote.c:130 | |
4048 | msgid "" | |
4049 | "--mirror is dangerous and deprecated; please\n" | |
4050 | "\t use --mirror=fetch or --mirror=push instead" | |
4051 | msgstr "" | |
81809b99 JX |
4052 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
4053 | "\t 或 --mirror=push" | |
8ada9598 JX |
4054 | |
4055 | #: builtin/remote.c:147 | |
81809b99 | 4056 | #, c-format |
8ada9598 | 4057 | msgid "unknown mirror argument: %s" |
81809b99 | 4058 | msgstr "未知的镜像参数:%s" |
8ada9598 JX |
4059 | |
4060 | #: builtin/remote.c:185 | |
4061 | msgid "specifying a master branch makes no sense with --mirror" | |
81809b99 | 4062 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 JX |
4063 | |
4064 | #: builtin/remote.c:187 | |
4065 | msgid "specifying branches to track makes sense only with fetch mirrors" | |
81809b99 | 4066 | msgstr "指定要跟踪的分支只在与获取镜像共用才有意义" |
8ada9598 JX |
4067 | |
4068 | #: builtin/remote.c:195 builtin/remote.c:646 | |
81809b99 | 4069 | #, c-format |
8ada9598 | 4070 | msgid "remote %s already exists." |
81809b99 | 4071 | msgstr "远程 %s 已经存在。" |
8ada9598 JX |
4072 | |
4073 | #: builtin/remote.c:199 builtin/remote.c:650 | |
81809b99 | 4074 | #, c-format |
8ada9598 | 4075 | msgid "'%s' is not a valid remote name" |
81809b99 | 4076 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 JX |
4077 | |
4078 | #: builtin/remote.c:243 | |
81809b99 | 4079 | #, c-format |
8ada9598 | 4080 | msgid "Could not setup master '%s'" |
81809b99 | 4081 | msgstr "无法设置 master '%s'" |
8ada9598 JX |
4082 | |
4083 | #: builtin/remote.c:299 | |
81809b99 | 4084 | #, c-format |
8ada9598 | 4085 | msgid "more than one %s" |
81809b99 | 4086 | msgstr "多于一个 %s" |
8ada9598 JX |
4087 | |
4088 | #: builtin/remote.c:339 | |
81809b99 | 4089 | #, c-format |
8ada9598 | 4090 | msgid "Could not get fetch map for refspec %s" |
81809b99 | 4091 | msgstr "无法得到引用表达式 %s 的获取列表" |
8ada9598 JX |
4092 | |
4093 | #: builtin/remote.c:440 builtin/remote.c:448 | |
4094 | msgid "(matching)" | |
81809b99 | 4095 | msgstr "(匹配)" |
8ada9598 JX |
4096 | |
4097 | #: builtin/remote.c:452 | |
8ada9598 | 4098 | msgid "(delete)" |
81809b99 | 4099 | msgstr "(删除)" |
8ada9598 JX |
4100 | |
4101 | #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 | |
81809b99 | 4102 | #, c-format |
8ada9598 | 4103 | msgid "Could not append '%s' to '%s'" |
81809b99 | 4104 | msgstr "不能添加 '%s' 至 '%s'" |
8ada9598 JX |
4105 | |
4106 | #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 | |
81809b99 | 4107 | #, c-format |
8ada9598 | 4108 | msgid "No such remote: %s" |
81809b99 | 4109 | msgstr "没有这样的远程:%s" |
8ada9598 JX |
4110 | |
4111 | #: builtin/remote.c:656 | |
81809b99 | 4112 | #, c-format |
8ada9598 | 4113 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 4114 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 JX |
4115 | |
4116 | #: builtin/remote.c:662 builtin/remote.c:799 | |
81809b99 | 4117 | #, c-format |
8ada9598 | 4118 | msgid "Could not remove config section '%s'" |
81809b99 | 4119 | msgstr "不能移除配置小节 '%s'" |
8ada9598 JX |
4120 | |
4121 | #: builtin/remote.c:677 | |
4122 | #, c-format | |
4123 | msgid "" | |
4124 | "Not updating non-default fetch respec\n" | |
4125 | "\t%s\n" | |
4126 | "\tPlease update the configuration manually if necessary." | |
4127 | msgstr "" | |
81809b99 JX |
4128 | "没有更新非默认的获取引用表达式\n" |
4129 | "\t%s\n" | |
4130 | "\t如果必要请手动更新配置。" | |
8ada9598 JX |
4131 | |
4132 | #: builtin/remote.c:683 | |
81809b99 | 4133 | #, c-format |
8ada9598 | 4134 | msgid "Could not append '%s'" |
81809b99 | 4135 | msgstr "不能追加 '%s'" |
8ada9598 JX |
4136 | |
4137 | #: builtin/remote.c:694 | |
81809b99 | 4138 | #, c-format |
8ada9598 | 4139 | msgid "Could not set '%s'" |
81809b99 | 4140 | msgstr "不能设置 '%s'" |
8ada9598 JX |
4141 | |
4142 | #: builtin/remote.c:716 | |
81809b99 | 4143 | #, c-format |
8ada9598 | 4144 | msgid "deleting '%s' failed" |
81809b99 | 4145 | msgstr "删除 '%s' 失败" |
8ada9598 JX |
4146 | |
4147 | #: builtin/remote.c:750 | |
81809b99 | 4148 | #, c-format |
8ada9598 | 4149 | msgid "creating '%s' failed" |
81809b99 | 4150 | msgstr "创建 '%s' 失败" |
8ada9598 JX |
4151 | |
4152 | #: builtin/remote.c:764 | |
81809b99 | 4153 | #, c-format |
8ada9598 | 4154 | msgid "Could not remove branch %s" |
81809b99 | 4155 | msgstr "无法移除分支 %s" |
8ada9598 JX |
4156 | |
4157 | #: builtin/remote.c:834 | |
4158 | msgid "" | |
4159 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
4160 | "to delete it, use:" | |
4161 | msgid_plural "" | |
4162 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
4163 | "to delete them, use:" | |
5ae481e0 JX |
4164 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
4165 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 JX |
4166 | |
4167 | #: builtin/remote.c:943 | |
4168 | #, c-format | |
4169 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 4170 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 JX |
4171 | |
4172 | #: builtin/remote.c:946 | |
8ada9598 | 4173 | msgid " tracked" |
81809b99 | 4174 | msgstr " 已跟踪" |
8ada9598 JX |
4175 | |
4176 | #: builtin/remote.c:948 | |
4177 | msgid " stale (use 'git remote prune' to remove)" | |
81809b99 | 4178 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 JX |
4179 | |
4180 | #: builtin/remote.c:950 | |
4181 | msgid " ???" | |
81809b99 | 4182 | msgstr " ???" |
8ada9598 JX |
4183 | |
4184 | #: builtin/remote.c:991 | |
4185 | #, c-format | |
4186 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 4187 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 JX |
4188 | |
4189 | #: builtin/remote.c:998 | |
81809b99 | 4190 | #, c-format |
8ada9598 | 4191 | msgid "rebases onto remote %s" |
81809b99 | 4192 | msgstr "变基到远程 %s" |
8ada9598 JX |
4193 | |
4194 | #: builtin/remote.c:1001 | |
81809b99 | 4195 | #, c-format |
8ada9598 | 4196 | msgid " merges with remote %s" |
81809b99 | 4197 | msgstr " 与远程 %s 合并" |
8ada9598 JX |
4198 | |
4199 | #: builtin/remote.c:1002 | |
4200 | msgid " and with remote" | |
81809b99 | 4201 | msgstr " 且有远程" |
8ada9598 JX |
4202 | |
4203 | #: builtin/remote.c:1004 | |
81809b99 | 4204 | #, c-format |
8ada9598 | 4205 | msgid "merges with remote %s" |
81809b99 | 4206 | msgstr "与远程 %s 合并" |
8ada9598 JX |
4207 | |
4208 | #: builtin/remote.c:1005 | |
4209 | msgid " and with remote" | |
81809b99 | 4210 | msgstr " 且有远程" |
8ada9598 JX |
4211 | |
4212 | #: builtin/remote.c:1051 | |
4213 | msgid "create" | |
81809b99 | 4214 | msgstr "创建" |
8ada9598 JX |
4215 | |
4216 | #: builtin/remote.c:1054 | |
8ada9598 | 4217 | msgid "delete" |
81809b99 | 4218 | msgstr "删除" |
8ada9598 JX |
4219 | |
4220 | #: builtin/remote.c:1058 | |
8ada9598 | 4221 | msgid "up to date" |
81809b99 | 4222 | msgstr "最新" |
8ada9598 JX |
4223 | |
4224 | #: builtin/remote.c:1061 | |
8ada9598 | 4225 | msgid "fast-forwardable" |
81809b99 | 4226 | msgstr "可快进" |
8ada9598 JX |
4227 | |
4228 | #: builtin/remote.c:1064 | |
4229 | msgid "local out of date" | |
81809b99 | 4230 | msgstr "本地已过时" |
8ada9598 JX |
4231 | |
4232 | #: builtin/remote.c:1071 | |
4233 | #, c-format | |
4234 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 4235 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 JX |
4236 | |
4237 | #: builtin/remote.c:1074 | |
4238 | #, c-format | |
4239 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 4240 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 JX |
4241 | |
4242 | #: builtin/remote.c:1078 | |
4243 | #, c-format | |
4244 | msgid " %-*s forces to %s" | |
81809b99 | 4245 | msgstr " %-*s 强制推送至 %s" |
8ada9598 JX |
4246 | |
4247 | #: builtin/remote.c:1081 | |
4248 | #, c-format | |
4249 | msgid " %-*s pushes to %s" | |
81809b99 | 4250 | msgstr " %-*s 推送至 %s" |
8ada9598 | 4251 | |
8ada9598 | 4252 | #: builtin/remote.c:1118 |
81809b99 | 4253 | #, c-format |
8ada9598 | 4254 | msgid "* remote %s" |
81809b99 | 4255 | msgstr "* 远程 %s" |
8ada9598 JX |
4256 | |
4257 | #: builtin/remote.c:1119 | |
4258 | #, c-format | |
4259 | msgid " Fetch URL: %s" | |
81809b99 | 4260 | msgstr " 获取地址:%s" |
8ada9598 JX |
4261 | |
4262 | #: builtin/remote.c:1120 builtin/remote.c:1285 | |
4263 | msgid "(no URL)" | |
81809b99 | 4264 | msgstr "(无 URL)" |
8ada9598 JX |
4265 | |
4266 | #: builtin/remote.c:1129 builtin/remote.c:1131 | |
4267 | #, c-format | |
4268 | msgid " Push URL: %s" | |
81809b99 | 4269 | msgstr " 推送地址:%s" |
8ada9598 JX |
4270 | |
4271 | #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 | |
81809b99 | 4272 | #, c-format |
8ada9598 | 4273 | msgid " HEAD branch: %s" |
81809b99 | 4274 | msgstr " HEAD分支:%s" |
8ada9598 JX |
4275 | |
4276 | #: builtin/remote.c:1139 | |
4277 | #, c-format | |
4278 | msgid "" | |
4279 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 4280 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 JX |
4281 | |
4282 | #: builtin/remote.c:1151 | |
81809b99 | 4283 | #, c-format |
8ada9598 JX |
4284 | msgid " Remote branch:%s" |
4285 | msgid_plural " Remote branches:%s" | |
81809b99 | 4286 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 4287 | msgstr[1] " 远程分支:%s" |
8ada9598 | 4288 | |
81809b99 | 4289 | # 译者:中文字符串拼接,可删除前导空格 |
8ada9598 JX |
4290 | #: builtin/remote.c:1154 builtin/remote.c:1181 |
4291 | msgid " (status not queried)" | |
81809b99 | 4292 | msgstr "(状态未查询)" |
8ada9598 JX |
4293 | |
4294 | #: builtin/remote.c:1163 | |
4295 | msgid " Local branch configured for 'git pull':" | |
4296 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 4297 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 4298 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 JX |
4299 | |
4300 | #: builtin/remote.c:1171 | |
4301 | msgid " Local refs will be mirrored by 'git push'" | |
81809b99 | 4302 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 JX |
4303 | |
4304 | #: builtin/remote.c:1178 | |
81809b99 | 4305 | #, c-format |
8ada9598 JX |
4306 | msgid " Local ref configured for 'git push'%s:" |
4307 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 4308 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 4309 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 JX |
4310 | |
4311 | #: builtin/remote.c:1216 | |
8ada9598 | 4312 | msgid "Cannot determine remote HEAD" |
81809b99 | 4313 | msgstr "无法确定远程 HEAD" |
8ada9598 JX |
4314 | |
4315 | #: builtin/remote.c:1218 | |
4316 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" | |
81809b99 | 4317 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 JX |
4318 | |
4319 | #: builtin/remote.c:1228 | |
81809b99 | 4320 | #, c-format |
8ada9598 | 4321 | msgid "Could not delete %s" |
81809b99 | 4322 | msgstr "无法删除 %s" |
8ada9598 JX |
4323 | |
4324 | #: builtin/remote.c:1236 | |
81809b99 | 4325 | #, c-format |
8ada9598 | 4326 | msgid "Not a valid ref: %s" |
81809b99 | 4327 | msgstr "不是一个有效引用:%s" |
8ada9598 JX |
4328 | |
4329 | #: builtin/remote.c:1238 | |
81809b99 | 4330 | #, c-format |
8ada9598 | 4331 | msgid "Could not setup %s" |
81809b99 | 4332 | msgstr "不能设置 %s" |
8ada9598 JX |
4333 | |
4334 | # 译者:注意保持前导空格 | |
4335 | #: builtin/remote.c:1274 | |
81809b99 | 4336 | #, c-format |
8ada9598 | 4337 | msgid " %s will become dangling!" |
81809b99 | 4338 | msgstr " %s 将成为悬空状态!" |
8ada9598 JX |
4339 | |
4340 | # 译者:注意保持前导空格 | |
4341 | #: builtin/remote.c:1275 | |
81809b99 | 4342 | #, c-format |
8ada9598 | 4343 | msgid " %s has become dangling!" |
81809b99 | 4344 | msgstr " %s 已成为悬空状态!" |
8ada9598 JX |
4345 | |
4346 | #: builtin/remote.c:1281 | |
81809b99 | 4347 | #, c-format |
8ada9598 | 4348 | msgid "Pruning %s" |
81809b99 | 4349 | msgstr "修剪 %s" |
8ada9598 JX |
4350 | |
4351 | #: builtin/remote.c:1282 | |
4352 | #, c-format | |
4353 | msgid "URL: %s" | |
81809b99 | 4354 | msgstr "URL:%s" |
8ada9598 JX |
4355 | |
4356 | #: builtin/remote.c:1295 | |
4357 | #, c-format | |
4358 | msgid " * [would prune] %s" | |
81809b99 | 4359 | msgstr " * [将删除] %s" |
8ada9598 JX |
4360 | |
4361 | #: builtin/remote.c:1298 | |
4362 | #, c-format | |
4363 | msgid " * [pruned] %s" | |
81809b99 | 4364 | msgstr " * [已删除] %s" |
8ada9598 JX |
4365 | |
4366 | #: builtin/remote.c:1387 builtin/remote.c:1461 | |
81809b99 | 4367 | #, c-format |
8ada9598 | 4368 | msgid "No such remote '%s'" |
81809b99 | 4369 | msgstr "没有此远程 '%s'" |
8ada9598 JX |
4370 | |
4371 | #: builtin/remote.c:1414 | |
8ada9598 | 4372 | msgid "no remote specified" |
81809b99 | 4373 | msgstr "未指定远程" |
8ada9598 JX |
4374 | |
4375 | #: builtin/remote.c:1447 | |
8ada9598 | 4376 | msgid "--add --delete doesn't make sense" |
81809b99 | 4377 | msgstr "--add --delete 无意义" |
8ada9598 JX |
4378 | |
4379 | #: builtin/remote.c:1487 | |
81809b99 | 4380 | #, c-format |
8ada9598 | 4381 | msgid "Invalid old URL pattern: %s" |
81809b99 | 4382 | msgstr "无效的旧URL匹配模版:%s" |
8ada9598 JX |
4383 | |
4384 | #: builtin/remote.c:1495 | |
81809b99 | 4385 | #, c-format |
8ada9598 | 4386 | msgid "No such URL found: %s" |
81809b99 | 4387 | msgstr "未找到此URL:%s" |
8ada9598 JX |
4388 | |
4389 | #: builtin/remote.c:1497 | |
4390 | msgid "Will not delete all non-push URLs" | |
81809b99 | 4391 | msgstr "将不会删除所有非推送URL地址" |
8ada9598 | 4392 | |
c04f5ac3 JX |
4393 | #: builtin/reset.c:33 |
4394 | msgid "mixed" | |
4395 | msgstr "混杂" | |
4396 | ||
4397 | #: builtin/reset.c:33 | |
4398 | msgid "soft" | |
4399 | msgstr "软性" | |
4400 | ||
4401 | #: builtin/reset.c:33 | |
4402 | msgid "hard" | |
4403 | msgstr "硬性" | |
4404 | ||
8ada9598 JX |
4405 | #: builtin/reset.c:33 |
4406 | msgid "merge" | |
4407 | msgstr "合并" | |
4408 | ||
c04f5ac3 JX |
4409 | #: builtin/reset.c:33 |
4410 | msgid "keep" | |
4411 | msgstr "保持" | |
4412 | ||
4413 | #: builtin/reset.c:77 | |
4414 | msgid "You do not have a valid HEAD." | |
4415 | msgstr "您没有一个有效的 HEAD。" | |
4416 | ||
4417 | #: builtin/reset.c:79 | |
4418 | msgid "Failed to find tree of HEAD." | |
4419 | msgstr "无法找到 HEAD 指向的树。" | |
4420 | ||
4421 | #: builtin/reset.c:85 | |
4422 | #, c-format | |
4423 | msgid "Failed to find tree of %s." | |
4424 | msgstr "无法找到 %s 指向的树。" | |
4425 | ||
4426 | #: builtin/reset.c:96 | |
4427 | msgid "Could not write new index file." | |
90e6ef53 | 4428 | msgstr "不能写入新的索引文件。" |
c04f5ac3 JX |
4429 | |
4430 | #: builtin/reset.c:106 | |
4431 | #, c-format | |
4432 | msgid "HEAD is now at %s" | |
4433 | msgstr "HEAD 现在位于 %s" | |
4434 | ||
4435 | #: builtin/reset.c:130 | |
4436 | msgid "Could not read index" | |
90e6ef53 | 4437 | msgstr "不能读取索引" |
c04f5ac3 JX |
4438 | |
4439 | #: builtin/reset.c:133 | |
4440 | msgid "Unstaged changes after reset:" | |
90e6ef53 | 4441 | msgstr "重置后撤出暂存区的变更:" |
c04f5ac3 | 4442 | |
90e6ef53 | 4443 | # 译者:汉字之间无空格,故删除%s前后空格 |
c04f5ac3 JX |
4444 | #: builtin/reset.c:223 |
4445 | #, c-format | |
4446 | msgid "Cannot do a %s reset in the middle of a merge." | |
4447 | msgstr "在合并过程中不能做%s重置操作。" | |
4448 | ||
4449 | #: builtin/reset.c:297 | |
4450 | #, c-format | |
4451 | msgid "Could not parse object '%s'." | |
4452 | msgstr "不能解析对象 '%s'。" | |
4453 | ||
4454 | #: builtin/reset.c:302 | |
4455 | msgid "--patch is incompatible with --{hard,mixed,soft}" | |
4456 | msgstr "--patch 与 --{hard,mixed,soft} 不兼容" | |
4457 | ||
4458 | #: builtin/reset.c:311 | |
4459 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." | |
4460 | msgstr "--mixed 带路径已弃用,代之以 'git reset -- <paths>'。" | |
4461 | ||
90e6ef53 | 4462 | # 译者:汉字之间无空格,故删除%s前后空格 |
c04f5ac3 JX |
4463 | #: builtin/reset.c:313 |
4464 | #, c-format | |
4465 | msgid "Cannot do %s reset with paths." | |
4466 | msgstr "不能带路径进行%s重置。" | |
4467 | ||
90e6ef53 | 4468 | # 译者:汉字之间无空格,故删除%s前后空格 |
c04f5ac3 JX |
4469 | #: builtin/reset.c:325 |
4470 | #, c-format | |
4471 | msgid "%s reset is not allowed in a bare repository" | |
4472 | msgstr "不能对裸版本库进行%s重置" | |
4473 | ||
4474 | #: builtin/reset.c:341 | |
4475 | #, c-format | |
4476 | msgid "Could not reset index file to revision '%s'." | |
90e6ef53 | 4477 | msgstr "不能重置索引文件至版本 '%s'。" |
c04f5ac3 | 4478 | |
170e9899 | 4479 | #: builtin/revert.c:70 builtin/revert.c:92 |
c04f5ac3 JX |
4480 | #, c-format |
4481 | msgid "%s: %s cannot be used with %s" | |
90e6ef53 | 4482 | msgstr "%s:%s 不能和 %s 共用" |
c04f5ac3 | 4483 | |
8ada9598 | 4484 | #: builtin/revert.c:131 |
c04f5ac3 JX |
4485 | msgid "program error" |
4486 | msgstr "程序错误" | |
4487 | ||
8ada9598 | 4488 | #: builtin/revert.c:221 |
c04f5ac3 JX |
4489 | msgid "revert failed" |
4490 | msgstr "还原失败" | |
4491 | ||
8ada9598 | 4492 | #: builtin/revert.c:236 |
c04f5ac3 JX |
4493 | msgid "cherry-pick failed" |
4494 | msgstr "拣选失败" | |
4495 | ||
4496 | #: builtin/rm.c:109 | |
4497 | #, c-format | |
4498 | msgid "" | |
4499 | "'%s' has staged content different from both the file and the HEAD\n" | |
4500 | "(use -f to force removal)" | |
4501 | msgstr "" | |
90e6ef53 | 4502 | "'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n" |
c04f5ac3 JX |
4503 | "(使用 -f 强制删除)" |
4504 | ||
4505 | #: builtin/rm.c:115 | |
4506 | #, c-format | |
4507 | msgid "" | |
4508 | "'%s' has changes staged in the index\n" | |
4509 | "(use --cached to keep the file, or -f to force removal)" | |
4510 | msgstr "" | |
90e6ef53 | 4511 | "'%s' 有变更已暂存至索引中\n" |
c04f5ac3 JX |
4512 | "(使用 --cached 保存文件,或用 -f 强制删除)" |
4513 | ||
4514 | #: builtin/rm.c:119 | |
4515 | #, c-format | |
4516 | msgid "" | |
4517 | "'%s' has local modifications\n" | |
4518 | "(use --cached to keep the file, or -f to force removal)" | |
4519 | msgstr "" | |
4520 | "'%s' 有本地修改\n" | |
4521 | "(使用 --cached 保存文件,或用 -f 强制删除)" | |
4522 | ||
4523 | #: builtin/rm.c:194 | |
4524 | #, c-format | |
4525 | msgid "not removing '%s' recursively without -r" | |
4526 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
4527 | ||
4528 | #: builtin/rm.c:230 | |
4529 | #, c-format | |
4530 | msgid "git rm: unable to remove %s" | |
4531 | msgstr "git rm:不能删除 %s" | |
4532 | ||
4533 | #: builtin/shortlog.c:157 | |
4534 | #, c-format | |
4535 | msgid "Missing author: %s" | |
4536 | msgstr "缺少作者:%s" | |
4537 | ||
8ada9598 | 4538 | #: builtin/tag.c:60 |
7ac1c0ad JX |
4539 | #, c-format |
4540 | msgid "malformed object at '%s'" | |
4541 | msgstr "非法的对象于 '%s'" | |
4542 | ||
8ada9598 | 4543 | #: builtin/tag.c:207 |
c04f5ac3 JX |
4544 | #, c-format |
4545 | msgid "tag name too long: %.*s..." | |
4546 | msgstr "tag 名字太长:%.*s..." | |
4547 | ||
8ada9598 | 4548 | #: builtin/tag.c:212 |
c04f5ac3 JX |
4549 | #, c-format |
4550 | msgid "tag '%s' not found." | |
4551 | msgstr "tag '%s' 未发现。" | |
4552 | ||
8ada9598 | 4553 | #: builtin/tag.c:227 |
c04f5ac3 JX |
4554 | #, c-format |
4555 | msgid "Deleted tag '%s' (was %s)\n" | |
4556 | msgstr "已删除 tag '%s'(曾为 %s)\n" | |
4557 | ||
8ada9598 | 4558 | #: builtin/tag.c:239 |
c04f5ac3 JX |
4559 | #, c-format |
4560 | msgid "could not verify the tag '%s'" | |
4561 | msgstr "不能校验 tag '%s'" | |
4562 | ||
8ada9598 | 4563 | #: builtin/tag.c:249 |
c04f5ac3 JX |
4564 | msgid "" |
4565 | "\n" | |
4566 | "#\n" | |
4567 | "# Write a tag message\n" | |
4568 | "# Lines starting with '#' will be ignored.\n" | |
4569 | "#\n" | |
4570 | msgstr "" | |
4571 | "\n" | |
4572 | "#\n" | |
4573 | "# 输入一个 tag 说明\n" | |
4574 | "# 以 '#' 开头的行将被忽略。\n" | |
4575 | "#\n" | |
4576 | ||
8ada9598 | 4577 | #: builtin/tag.c:256 |
c04f5ac3 JX |
4578 | msgid "" |
4579 | "\n" | |
4580 | "#\n" | |
4581 | "# Write a tag message\n" | |
4582 | "# Lines starting with '#' will be kept; you may remove them yourself if you " | |
4583 | "want to.\n" | |
4584 | "#\n" | |
4585 | msgstr "" | |
4586 | "\n" | |
4587 | "#\n" | |
4588 | "# 输入一个 tag 说明\n" | |
4589 | "# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n" | |
4590 | "#\n" | |
4591 | ||
8ada9598 | 4592 | #: builtin/tag.c:298 |
c04f5ac3 JX |
4593 | msgid "unable to sign the tag" |
4594 | msgstr "无法签署 tag" | |
4595 | ||
8ada9598 | 4596 | #: builtin/tag.c:300 |
c04f5ac3 JX |
4597 | msgid "unable to write tag file" |
4598 | msgstr "无法写 tag 文件" | |
4599 | ||
8ada9598 | 4600 | #: builtin/tag.c:325 |
c04f5ac3 | 4601 | msgid "bad object type." |
90e6ef53 | 4602 | msgstr "坏的对象类型。" |
c04f5ac3 | 4603 | |
8ada9598 | 4604 | #: builtin/tag.c:338 |
c04f5ac3 | 4605 | msgid "tag header too big." |
90e6ef53 | 4606 | msgstr "tag 头信息太大。" |
c04f5ac3 | 4607 | |
8ada9598 | 4608 | #: builtin/tag.c:370 |
c04f5ac3 JX |
4609 | msgid "no tag message?" |
4610 | msgstr "无 tag 说明?" | |
4611 | ||
8ada9598 | 4612 | #: builtin/tag.c:376 |
c04f5ac3 JX |
4613 | #, c-format |
4614 | msgid "The tag message has been left in %s\n" | |
4615 | msgstr "tag 说明被保留在 %s\n" | |
4616 | ||
8ada9598 | 4617 | #: builtin/tag.c:425 |
7ac1c0ad JX |
4618 | msgid "switch 'points-at' requires an object" |
4619 | msgstr "开关 'points-at' 需要一个对象" | |
4620 | ||
8ada9598 | 4621 | #: builtin/tag.c:427 |
7ac1c0ad JX |
4622 | #, c-format |
4623 | msgid "malformed object name '%s'" | |
4624 | msgstr "非法的对象名 '%s'" | |
4625 | ||
8ada9598 | 4626 | #: builtin/tag.c:506 |
8ada9598 | 4627 | msgid "--column and -n are incompatible" |
81809b99 | 4628 | msgstr "--column 和 -n 不兼容" |
8ada9598 JX |
4629 | |
4630 | #: builtin/tag.c:523 | |
c04f5ac3 JX |
4631 | msgid "-n option is only allowed with -l." |
4632 | msgstr "-n 选项只允许和 -l 共用。" | |
4633 | ||
8ada9598 | 4634 | #: builtin/tag.c:525 |
c04f5ac3 JX |
4635 | msgid "--contains option is only allowed with -l." |
4636 | msgstr "--contains 选项只允许和 -l 共用。" | |
4637 | ||
8ada9598 | 4638 | #: builtin/tag.c:527 |
7ac1c0ad JX |
4639 | msgid "--points-at option is only allowed with -l." |
4640 | msgstr "--points-at 选项只允许和 -l 共用。" | |
4641 | ||
8ada9598 | 4642 | #: builtin/tag.c:535 |
c04f5ac3 JX |
4643 | msgid "only one -F or -m option is allowed." |
4644 | msgstr "只允许一个 -F 或 -m 选项。" | |
4645 | ||
8ada9598 | 4646 | #: builtin/tag.c:555 |
c04f5ac3 JX |
4647 | msgid "too many params" |
4648 | msgstr "太多参数" | |
4649 | ||
8ada9598 | 4650 | #: builtin/tag.c:561 |
c04f5ac3 JX |
4651 | #, c-format |
4652 | msgid "'%s' is not a valid tag name." | |
90e6ef53 | 4653 | msgstr "'%s' 不是一个有效的tag名称。" |
c04f5ac3 | 4654 | |
8ada9598 | 4655 | #: builtin/tag.c:566 |
c04f5ac3 JX |
4656 | #, c-format |
4657 | msgid "tag '%s' already exists" | |
4658 | msgstr "tag '%s' 已存在" | |
4659 | ||
8ada9598 | 4660 | #: builtin/tag.c:584 |
c04f5ac3 JX |
4661 | #, c-format |
4662 | msgid "%s: cannot lock the ref" | |
4663 | msgstr "%s:不能锁定引用" | |
4664 | ||
8ada9598 | 4665 | #: builtin/tag.c:586 |
c04f5ac3 JX |
4666 | #, c-format |
4667 | msgid "%s: cannot update the ref" | |
4668 | msgstr "%s:不能更新引用" | |
4669 | ||
8ada9598 | 4670 | #: builtin/tag.c:588 |
c04f5ac3 JX |
4671 | #, c-format |
4672 | msgid "Updated tag '%s' (was %s)\n" | |
4673 | msgstr "已更新tag '%s'(曾为 %s)\n" | |
4674 | ||
8ada9598 JX |
4675 | #: git.c:16 |
4676 | msgid "See 'git help <command>' for more information on a specific command." | |
81809b99 | 4677 | msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。" |
8ada9598 JX |
4678 | |
4679 | #: parse-options.h:133 parse-options.h:235 | |
4680 | msgid "n" | |
81809b99 | 4681 | msgstr "数字" |
8ada9598 JX |
4682 | |
4683 | #: parse-options.h:141 | |
4684 | msgid "time" | |
81809b99 | 4685 | msgstr "时间" |
8ada9598 JX |
4686 | |
4687 | #: parse-options.h:149 | |
8ada9598 | 4688 | msgid "file" |
81809b99 | 4689 | msgstr "文件" |
8ada9598 JX |
4690 | |
4691 | #: parse-options.h:151 | |
4692 | msgid "when" | |
81809b99 | 4693 | msgstr "何时" |
8ada9598 JX |
4694 | |
4695 | #: parse-options.h:156 | |
4696 | msgid "no-op (backward compatibility)" | |
81809b99 | 4697 | msgstr "空操作(向后兼容)" |
8ada9598 JX |
4698 | |
4699 | #: parse-options.h:228 | |
4700 | msgid "be more verbose" | |
81809b99 | 4701 | msgstr "更加详细" |
8ada9598 JX |
4702 | |
4703 | #: parse-options.h:230 | |
4704 | msgid "be more quiet" | |
81809b99 | 4705 | msgstr "更加安静" |
8ada9598 JX |
4706 | |
4707 | #: parse-options.h:236 | |
4708 | msgid "use <n> digits to display SHA-1s" | |
81809b99 | 4709 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" |
8ada9598 JX |
4710 | |
4711 | #: common-cmds.h:8 | |
4712 | msgid "Add file contents to the index" | |
81809b99 | 4713 | msgstr "添加文件内容至索引" |
8ada9598 JX |
4714 | |
4715 | #: common-cmds.h:9 | |
4716 | msgid "Find by binary search the change that introduced a bug" | |
81809b99 | 4717 | msgstr "通过二分查找定位引入 bug 的变更" |
8ada9598 JX |
4718 | |
4719 | #: common-cmds.h:10 | |
8ada9598 | 4720 | msgid "List, create, or delete branches" |
81809b99 | 4721 | msgstr "列出、创建或删除分支" |
8ada9598 JX |
4722 | |
4723 | #: common-cmds.h:11 | |
4724 | msgid "Checkout a branch or paths to the working tree" | |
81809b99 | 4725 | msgstr "检出一个分支或路径到工作区" |
8ada9598 JX |
4726 | |
4727 | #: common-cmds.h:12 | |
8ada9598 | 4728 | msgid "Clone a repository into a new directory" |
81809b99 | 4729 | msgstr "克隆一个版本库到一个新目录" |
8ada9598 JX |
4730 | |
4731 | #: common-cmds.h:13 | |
8ada9598 | 4732 | msgid "Record changes to the repository" |
81809b99 | 4733 | msgstr "记录变更到版本库" |
8ada9598 JX |
4734 | |
4735 | #: common-cmds.h:14 | |
4736 | msgid "Show changes between commits, commit and working tree, etc" | |
81809b99 | 4737 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 JX |
4738 | |
4739 | #: common-cmds.h:15 | |
4740 | msgid "Download objects and refs from another repository" | |
81809b99 | 4741 | msgstr "从另外一个版本库下载对象和引用" |
8ada9598 JX |
4742 | |
4743 | #: common-cmds.h:16 | |
4744 | msgid "Print lines matching a pattern" | |
81809b99 | 4745 | msgstr "输出和模式匹配的行" |
8ada9598 JX |
4746 | |
4747 | #: common-cmds.h:17 | |
4748 | msgid "Create an empty git repository or reinitialize an existing one" | |
81809b99 | 4749 | msgstr "创建一个空的 git 版本库或者重新初始化一个" |
8ada9598 JX |
4750 | |
4751 | #: common-cmds.h:18 | |
8ada9598 | 4752 | msgid "Show commit logs" |
81809b99 | 4753 | msgstr "显示提交日志" |
8ada9598 JX |
4754 | |
4755 | #: common-cmds.h:19 | |
4756 | msgid "Join two or more development histories together" | |
81809b99 | 4757 | msgstr "合并两个或更多开发历史" |
8ada9598 JX |
4758 | |
4759 | #: common-cmds.h:20 | |
4760 | msgid "Move or rename a file, a directory, or a symlink" | |
81809b99 | 4761 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 JX |
4762 | |
4763 | #: common-cmds.h:21 | |
4764 | msgid "Fetch from and merge with another repository or a local branch" | |
81809b99 | 4765 | msgstr "获取并合并另外的版本库或一个本地分支" |
8ada9598 JX |
4766 | |
4767 | #: common-cmds.h:22 | |
4768 | msgid "Update remote refs along with associated objects" | |
81809b99 | 4769 | msgstr "更新远程引用和相关的对象" |
8ada9598 JX |
4770 | |
4771 | #: common-cmds.h:23 | |
4772 | msgid "Forward-port local commits to the updated upstream head" | |
81809b99 | 4773 | msgstr "本地提交转移至更新后的上游分支中" |
8ada9598 JX |
4774 | |
4775 | #: common-cmds.h:24 | |
4776 | msgid "Reset current HEAD to the specified state" | |
81809b99 | 4777 | msgstr "重置当前HEAD到指定状态" |
8ada9598 JX |
4778 | |
4779 | #: common-cmds.h:25 | |
4780 | msgid "Remove files from the working tree and from the index" | |
81809b99 | 4781 | msgstr "从工作区和索引中删除文件" |
8ada9598 JX |
4782 | |
4783 | #: common-cmds.h:26 | |
4784 | msgid "Show various types of objects" | |
81809b99 | 4785 | msgstr "显示各种类型的对象" |
8ada9598 JX |
4786 | |
4787 | #: common-cmds.h:27 | |
8ada9598 | 4788 | msgid "Show the working tree status" |
81809b99 | 4789 | msgstr "显示工作区状态" |
8ada9598 JX |
4790 | |
4791 | #: common-cmds.h:28 | |
4792 | msgid "Create, list, delete or verify a tag object signed with GPG" | |
81809b99 | 4793 | msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象" |
8ada9598 | 4794 | |
170e9899 | 4795 | #: git-am.sh:50 |
c04f5ac3 JX |
4796 | msgid "You need to set your committer info first" |
4797 | msgstr "您需要先设置你的提交者信息" | |
4798 | ||
170e9899 | 4799 | #: git-am.sh:137 |
c04f5ac3 JX |
4800 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
4801 | msgstr "版本库缺乏必要的 blob 数据以进行三路合并。" | |
4802 | ||
170e9899 | 4803 | #: git-am.sh:154 |
c04f5ac3 JX |
4804 | msgid "" |
4805 | "Did you hand edit your patch?\n" | |
4806 | "It does not apply to blobs recorded in its index." | |
4807 | msgstr "" | |
4808 | "您是否曾手动编辑过您的补丁?\n" | |
90e6ef53 | 4809 | "无法应用补丁到索引中的数据上。" |
c04f5ac3 | 4810 | |
170e9899 | 4811 | #: git-am.sh:163 |
c04f5ac3 | 4812 | msgid "Falling back to patching base and 3-way merge..." |
90e6ef53 | 4813 | msgstr "回退到补丁基础版本并使用三路合并..." |
c04f5ac3 | 4814 | |
170e9899 | 4815 | #: git-am.sh:275 |
c04f5ac3 JX |
4816 | msgid "Only one StGIT patch series can be applied at once" |
4817 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
4818 | ||
170e9899 | 4819 | #: git-am.sh:362 |
c04f5ac3 JX |
4820 | #, sh-format |
4821 | msgid "Patch format $patch_format is not supported." | |
4822 | msgstr "不支持 $patch_format 补丁格式。" | |
4823 | ||
170e9899 | 4824 | #: git-am.sh:364 |
c04f5ac3 JX |
4825 | msgid "Patch format detection failed." |
4826 | msgstr "补丁格式检测失败。" | |
4827 | ||
170e9899 | 4828 | #: git-am.sh:418 |
c04f5ac3 JX |
4829 | msgid "-d option is no longer supported. Do not use." |
4830 | msgstr "不再支持 -d 选项。不要使用。" | |
4831 | ||
170e9899 | 4832 | #: git-am.sh:481 |
c04f5ac3 JX |
4833 | #, sh-format |
4834 | msgid "previous rebase directory $dotest still exists but mbox given." | |
4835 | msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。" | |
4836 | ||
170e9899 | 4837 | #: git-am.sh:486 |
c04f5ac3 JX |
4838 | msgid "Please make up your mind. --skip or --abort?" |
4839 | msgstr "请下决心。--skip 或是 --abort ?" | |
4840 | ||
170e9899 | 4841 | #: git-am.sh:513 |
c04f5ac3 JX |
4842 | msgid "Resolve operation not in progress, we are not resuming." |
4843 | msgstr "解决操作未进行,我们不会继续。" | |
4844 | ||
170e9899 | 4845 | #: git-am.sh:579 |
c04f5ac3 JX |
4846 | #, sh-format |
4847 | msgid "Dirty index: cannot apply patches (dirty: $files)" | |
90e6ef53 | 4848 | msgstr "脏的索引:不能应用补丁(脏文件:$files)" |
c04f5ac3 | 4849 | |
170e9899 | 4850 | #: git-am.sh:755 |
c04f5ac3 | 4851 | msgid "cannot be interactive without stdin connected to a terminal." |
90e6ef53 | 4852 | msgstr "标准输入没有和终端关联,不能进行交互式操作。" |
c04f5ac3 | 4853 | |
90e6ef53 | 4854 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
4855 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] |
4856 | #. in your translation. The program will only accept English | |
4857 | #. input at this point. | |
170e9899 | 4858 | #: git-am.sh:766 |
c04f5ac3 JX |
4859 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " |
4860 | msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " | |
4861 | ||
170e9899 | 4862 | #: git-am.sh:802 |
c04f5ac3 JX |
4863 | #, sh-format |
4864 | msgid "Applying: $FIRSTLINE" | |
4865 | msgstr "正应用:$FIRSTLINE" | |
4866 | ||
170e9899 | 4867 | #: git-am.sh:847 |
c04f5ac3 JX |
4868 | msgid "No changes -- Patch already applied." |
4869 | msgstr "没有变更 -- 补丁已经应用过。" | |
4870 | ||
170e9899 | 4871 | #: git-am.sh:873 |
c04f5ac3 JX |
4872 | msgid "applying to an empty history" |
4873 | msgstr "正应用到一个空历史上" | |
4874 | ||
90e6ef53 | 4875 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
4876 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
4877 | #. translation. The program will only accept English input | |
4878 | #. at this point. | |
4879 | #: git-bisect.sh:54 | |
4880 | msgid "Do you want me to do it for you [Y/n]? " | |
4881 | msgstr "您想让我为您这样做么[Y/n]? " | |
4882 | ||
4883 | #: git-bisect.sh:95 | |
4884 | #, sh-format | |
4885 | msgid "unrecognised option: '$arg'" | |
81809b99 | 4886 | msgstr "未能识别的选项:'$arg'" |
c04f5ac3 JX |
4887 | |
4888 | #: git-bisect.sh:99 | |
4889 | #, sh-format | |
4890 | msgid "'$arg' does not appear to be a valid revision" | |
4891 | msgstr "'$arg' 看起来不像是一个有效的版本" | |
4892 | ||
4893 | #: git-bisect.sh:117 | |
4894 | msgid "Bad HEAD - I need a HEAD" | |
4895 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
4896 | ||
4897 | #: git-bisect.sh:130 | |
4898 | #, sh-format | |
4899 | msgid "" | |
4900 | "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." | |
4901 | msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。" | |
4902 | ||
4903 | #: git-bisect.sh:140 | |
4904 | msgid "won't bisect on seeked tree" | |
4905 | msgstr "不会在已查找过的树上二分查找" | |
4906 | ||
4907 | #: git-bisect.sh:144 | |
4908 | msgid "Bad HEAD - strange symbolic ref" | |
90e6ef53 | 4909 | msgstr "坏的 HEAD - 奇怪的符号引用" |
c04f5ac3 JX |
4910 | |
4911 | #: git-bisect.sh:189 | |
4912 | #, sh-format | |
4913 | msgid "Bad bisect_write argument: $state" | |
90e6ef53 | 4914 | msgstr "坏的 bisect_write 参数:$state" |
c04f5ac3 JX |
4915 | |
4916 | #: git-bisect.sh:218 | |
4917 | #, sh-format | |
4918 | msgid "Bad rev input: $arg" | |
90e6ef53 | 4919 | msgstr "输入坏的版本:$arg" |
c04f5ac3 JX |
4920 | |
4921 | #: git-bisect.sh:232 | |
4922 | msgid "Please call 'bisect_state' with at least one argument." | |
4923 | msgstr "请在调用 'bisect_state' 时跟至少一个参数。" | |
4924 | ||
4925 | #: git-bisect.sh:244 | |
4926 | #, sh-format | |
4927 | msgid "Bad rev input: $rev" | |
4928 | msgstr "输入坏的版本:$rev" | |
4929 | ||
4930 | #: git-bisect.sh:250 | |
4931 | msgid "'git bisect bad' can take only one argument." | |
4932 | msgstr "'git bisect bad' 只能带一个参数。" | |
4933 | ||
90e6ef53 | 4934 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
4935 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
4936 | #. translation. The program will only accept English input | |
4937 | #. at this point. | |
4938 | #: git-bisect.sh:279 | |
4939 | msgid "Are you sure [Y/n]? " | |
4940 | msgstr "您确认么[Y/n]? " | |
4941 | ||
4942 | #: git-bisect.sh:354 | |
4943 | #, sh-format | |
4944 | msgid "'$invalid' is not a valid commit" | |
4945 | msgstr "'$invalid' 不是一个有效的提交" | |
4946 | ||
4947 | #: git-bisect.sh:363 | |
4948 | #, sh-format | |
4949 | msgid "" | |
4950 | "Could not check out original HEAD '$branch'.\n" | |
4951 | "Try 'git bisect reset <commit>'." | |
4952 | msgstr "" | |
4953 | "不能检出原始 HEAD '$branch'。\n" | |
4954 | "尝试 'git bisect reset <commit>'。" | |
4955 | ||
4956 | #: git-bisect.sh:390 | |
4957 | msgid "No logfile given" | |
4958 | msgstr "未提供日志文件" | |
4959 | ||
4960 | #: git-bisect.sh:391 | |
4961 | #, sh-format | |
4962 | msgid "cannot read $file for replaying" | |
4963 | msgstr "不能读取 $file 来重放" | |
4964 | ||
4965 | #: git-bisect.sh:408 | |
4966 | msgid "?? what are you talking about?" | |
4967 | msgstr "?? 您在说什么?" | |
4968 | ||
4969 | #: git-bisect.sh:474 | |
4970 | msgid "We are not bisecting." | |
90e6ef53 | 4971 | msgstr "我们没有在二分查找。" |
c04f5ac3 JX |
4972 | |
4973 | #: git-pull.sh:21 | |
4974 | msgid "" | |
4975 | "Pull is not possible because you have unmerged files.\n" | |
4976 | "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" | |
4977 | "as appropriate to mark resolution, or use 'git commit -a'." | |
4978 | msgstr "" | |
90e6ef53 | 4979 | "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n" |
c04f5ac3 | 4980 | "然后酌情使用 'git add/rm <file>' 标记解决方案,\n" |
90e6ef53 | 4981 | "或者使用 'git commit -a'。" |
c04f5ac3 JX |
4982 | |
4983 | #: git-pull.sh:25 | |
4984 | msgid "Pull is not possible because you have unmerged files." | |
90e6ef53 | 4985 | msgstr "Pull 不可用,因为您尚有未合并的文件。" |
c04f5ac3 | 4986 | |
7ac1c0ad | 4987 | #: git-pull.sh:197 |
c04f5ac3 | 4988 | msgid "updating an unborn branch with changes added to the index" |
90e6ef53 | 4989 | msgstr "更新尚未诞生的分支,变更添加至索引" |
c04f5ac3 | 4990 | |
7ac1c0ad | 4991 | #: git-pull.sh:253 |
c04f5ac3 JX |
4992 | msgid "Cannot merge multiple branches into empty head" |
4993 | msgstr "无法将多个分支合并到空分支" | |
4994 | ||
7ac1c0ad | 4995 | #: git-pull.sh:257 |
c04f5ac3 JX |
4996 | msgid "Cannot rebase onto multiple branches" |
4997 | msgstr "无法变基到多个分支" | |
4998 | ||
4999 | #: git-stash.sh:51 | |
5000 | msgid "git stash clear with parameters is unimplemented" | |
5001 | msgstr "git stash clear 不支持参数" | |
5002 | ||
5003 | #: git-stash.sh:74 | |
5004 | msgid "You do not have the initial commit yet" | |
5005 | msgstr "您尚未建立初始提交" | |
5006 | ||
5007 | #: git-stash.sh:89 | |
5008 | msgid "Cannot save the current index state" | |
90e6ef53 | 5009 | msgstr "无法保存当前索引状态" |
c04f5ac3 JX |
5010 | |
5011 | #: git-stash.sh:123 git-stash.sh:136 | |
5012 | msgid "Cannot save the current worktree state" | |
5013 | msgstr "无法保存当前工作区状态" | |
5014 | ||
5015 | #: git-stash.sh:140 | |
5016 | msgid "No changes selected" | |
90e6ef53 | 5017 | msgstr "没有选择变更" |
c04f5ac3 JX |
5018 | |
5019 | #: git-stash.sh:143 | |
5020 | msgid "Cannot remove temporary index (can't happen)" | |
90e6ef53 | 5021 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 JX |
5022 | |
5023 | #: git-stash.sh:156 | |
5024 | msgid "Cannot record working tree state" | |
5025 | msgstr "不能记录工作区状态" | |
5026 | ||
5027 | #: git-stash.sh:223 | |
5028 | msgid "No local changes to save" | |
5029 | msgstr "没有要保存的本地修改" | |
5030 | ||
5031 | #: git-stash.sh:227 | |
5032 | msgid "Cannot initialize stash" | |
90e6ef53 | 5033 | msgstr "无法初始化 stash" |
c04f5ac3 JX |
5034 | |
5035 | #: git-stash.sh:235 | |
5036 | msgid "Cannot save the current status" | |
5037 | msgstr "无法保存当前状态" | |
5038 | ||
5039 | #: git-stash.sh:253 | |
5040 | msgid "Cannot remove worktree changes" | |
5041 | msgstr "无法删除工作区变更" | |
5042 | ||
5043 | #: git-stash.sh:352 | |
5044 | msgid "No stash found." | |
90e6ef53 | 5045 | msgstr "未发现 stash。" |
c04f5ac3 JX |
5046 | |
5047 | #: git-stash.sh:359 | |
5048 | #, sh-format | |
5049 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 5050 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 JX |
5051 | |
5052 | #: git-stash.sh:365 | |
5053 | #, sh-format | |
5054 | msgid "$reference is not valid reference" | |
5055 | msgstr "$reference 不是有效的引用" | |
5056 | ||
5057 | #: git-stash.sh:393 | |
5058 | #, sh-format | |
5059 | msgid "'$args' is not a stash-like commit" | |
90e6ef53 | 5060 | msgstr "'$args' 不是 stash 样提交" |
c04f5ac3 JX |
5061 | |
5062 | #: git-stash.sh:404 | |
5063 | #, sh-format | |
5064 | msgid "'$args' is not a stash reference" | |
90e6ef53 | 5065 | msgstr "'$args' 不是一个 stash 引用" |
c04f5ac3 JX |
5066 | |
5067 | #: git-stash.sh:412 | |
5068 | msgid "unable to refresh index" | |
90e6ef53 | 5069 | msgstr "无法刷新索引" |
c04f5ac3 JX |
5070 | |
5071 | #: git-stash.sh:416 | |
5072 | msgid "Cannot apply a stash in the middle of a merge" | |
5073 | msgstr "无法在合并过程中恢复进度" | |
5074 | ||
5075 | #: git-stash.sh:424 | |
5076 | msgid "Conflicts in index. Try without --index." | |
90e6ef53 | 5077 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 JX |
5078 | |
5079 | #: git-stash.sh:426 | |
5080 | msgid "Could not save index tree" | |
90e6ef53 | 5081 | msgstr "不能保存索引树" |
c04f5ac3 JX |
5082 | |
5083 | #: git-stash.sh:460 | |
5084 | msgid "Cannot unstage modified files" | |
5085 | msgstr "无法还原修改的文件" | |
5086 | ||
5087 | #: git-stash.sh:491 | |
5088 | #, sh-format | |
5089 | msgid "Dropped ${REV} ($s)" | |
5090 | msgstr "丢弃了 ${REV} ($s)" | |
5091 | ||
5092 | #: git-stash.sh:492 | |
5093 | #, sh-format | |
5094 | msgid "${REV}: Could not drop stash entry" | |
90e6ef53 | 5095 | msgstr "${REV}:不能丢弃进度条目" |
c04f5ac3 JX |
5096 | |
5097 | #: git-stash.sh:499 | |
5098 | msgid "No branch name specified" | |
5099 | msgstr "未指定分支名" | |
5100 | ||
5101 | #: git-stash.sh:570 | |
5102 | msgid "(To restore them type \"git stash apply\")" | |
5103 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
5104 | ||
5105 | #: git-submodule.sh:56 | |
5106 | #, sh-format | |
5107 | msgid "cannot strip one component off url '$remoteurl'" | |
5108 | msgstr "无法从 url '$remoteurl' 剥离一个组件" | |
5109 | ||
170e9899 | 5110 | #: git-submodule.sh:109 |
c04f5ac3 | 5111 | #, sh-format |
170e9899 JX |
5112 | msgid "No submodule mapping found in .gitmodules for path '$sm_path'" |
5113 | msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射" | |
c04f5ac3 | 5114 | |
170e9899 | 5115 | #: git-submodule.sh:150 |
c04f5ac3 | 5116 | #, sh-format |
170e9899 JX |
5117 | msgid "Clone of '$url' into submodule path '$sm_path' failed" |
5118 | msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'" | |
c04f5ac3 | 5119 | |
170e9899 | 5120 | #: git-submodule.sh:160 |
dac1de7d JX |
5121 | #, sh-format |
5122 | msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" | |
5123 | msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反" | |
5124 | ||
8ada9598 | 5125 | #: git-submodule.sh:249 |
c04f5ac3 JX |
5126 | #, sh-format |
5127 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
5128 | msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始" | |
5129 | ||
8ada9598 | 5130 | #: git-submodule.sh:266 |
c04f5ac3 | 5131 | #, sh-format |
170e9899 JX |
5132 | msgid "'$sm_path' already exists in the index" |
5133 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 5134 | |
8ada9598 | 5135 | #: git-submodule.sh:283 |
c04f5ac3 | 5136 | #, sh-format |
170e9899 JX |
5137 | msgid "'$sm_path' already exists and is not a valid git repo" |
5138 | msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库" | |
c04f5ac3 | 5139 | |
8ada9598 | 5140 | #: git-submodule.sh:297 |
c04f5ac3 | 5141 | #, sh-format |
170e9899 JX |
5142 | msgid "Unable to checkout submodule '$sm_path'" |
5143 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 5144 | |
8ada9598 | 5145 | #: git-submodule.sh:302 |
c04f5ac3 | 5146 | #, sh-format |
170e9899 JX |
5147 | msgid "Failed to add submodule '$sm_path'" |
5148 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 5149 | |
8ada9598 | 5150 | #: git-submodule.sh:307 |
c04f5ac3 | 5151 | #, sh-format |
170e9899 JX |
5152 | msgid "Failed to register submodule '$sm_path'" |
5153 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 5154 | |
8ada9598 | 5155 | #: git-submodule.sh:349 |
c04f5ac3 | 5156 | #, sh-format |
170e9899 JX |
5157 | msgid "Entering '$prefix$sm_path'" |
5158 | msgstr "正在进入 '$prefix$sm_path'" | |
c04f5ac3 | 5159 | |
8ada9598 | 5160 | #: git-submodule.sh:363 |
c04f5ac3 | 5161 | #, sh-format |
170e9899 JX |
5162 | msgid "Stopping at '$sm_path'; script returned non-zero status." |
5163 | msgstr "停止于 '$sm_path',脚本返回非零值。" | |
c04f5ac3 | 5164 | |
8ada9598 | 5165 | #: git-submodule.sh:405 |
c04f5ac3 | 5166 | #, sh-format |
170e9899 JX |
5167 | msgid "No url found for submodule path '$sm_path' in .gitmodules" |
5168 | msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url" | |
c04f5ac3 | 5169 | |
8ada9598 | 5170 | #: git-submodule.sh:414 |
c04f5ac3 | 5171 | #, sh-format |
170e9899 JX |
5172 | msgid "Failed to register url for submodule path '$sm_path'" |
5173 | msgstr "无法为子模组路径 '$sm_path' 注册 url" | |
c04f5ac3 | 5174 | |
8ada9598 | 5175 | #: git-submodule.sh:422 |
c04f5ac3 | 5176 | #, sh-format |
170e9899 JX |
5177 | msgid "Failed to register update mode for submodule path '$sm_path'" |
5178 | msgstr "无法为子模组路径 '$sm_path' 注册更新模式" | |
c04f5ac3 | 5179 | |
8ada9598 | 5180 | #: git-submodule.sh:424 |
c04f5ac3 | 5181 | #, sh-format |
170e9899 JX |
5182 | msgid "Submodule '$name' ($url) registered for path '$sm_path'" |
5183 | msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册" | |
c04f5ac3 | 5184 | |
8ada9598 | 5185 | #: git-submodule.sh:523 |
c04f5ac3 JX |
5186 | #, sh-format |
5187 | msgid "" | |
170e9899 | 5188 | "Submodule path '$sm_path' not initialized\n" |
c04f5ac3 JX |
5189 | "Maybe you want to use 'update --init'?" |
5190 | msgstr "" | |
170e9899 | 5191 | "子模组路径 '$sm_path' 没有初始化\n" |
90e6ef53 | 5192 | "也许您想用 'update --init'?" |
c04f5ac3 | 5193 | |
8ada9598 | 5194 | #: git-submodule.sh:536 |
c04f5ac3 | 5195 | #, sh-format |
170e9899 JX |
5196 | msgid "Unable to find current revision in submodule path '$sm_path'" |
5197 | msgstr "无法在子模组路径 '$sm_path' 中找到当前版本" | |
c04f5ac3 | 5198 | |
8ada9598 | 5199 | #: git-submodule.sh:555 |
c04f5ac3 | 5200 | #, sh-format |
170e9899 JX |
5201 | msgid "Unable to fetch in submodule path '$sm_path'" |
5202 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 5203 | |
8ada9598 | 5204 | #: git-submodule.sh:569 |
c04f5ac3 | 5205 | #, sh-format |
170e9899 JX |
5206 | msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" |
5207 | msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'" | |
c04f5ac3 | 5208 | |
8ada9598 | 5209 | #: git-submodule.sh:570 |
c04f5ac3 | 5210 | #, sh-format |
170e9899 JX |
5211 | msgid "Submodule path '$sm_path': rebased into '$sha1'" |
5212 | msgstr "子模组路径 '$sm_path':变基至 '$sha1'" | |
c04f5ac3 | 5213 | |
8ada9598 | 5214 | #: git-submodule.sh:575 |
c04f5ac3 | 5215 | #, sh-format |
170e9899 JX |
5216 | msgid "Unable to merge '$sha1' in submodule path '$sm_path'" |
5217 | msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中" | |
c04f5ac3 | 5218 | |
8ada9598 | 5219 | #: git-submodule.sh:576 |
c04f5ac3 | 5220 | #, sh-format |
170e9899 JX |
5221 | msgid "Submodule path '$sm_path': merged in '$sha1'" |
5222 | msgstr "子模组路径 '$sm_path':已合并入 '$sha1'" | |
c04f5ac3 | 5223 | |
8ada9598 | 5224 | #: git-submodule.sh:581 |
c04f5ac3 | 5225 | #, sh-format |
170e9899 JX |
5226 | msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" |
5227 | msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'" | |
c04f5ac3 | 5228 | |
8ada9598 | 5229 | #: git-submodule.sh:582 |
c04f5ac3 | 5230 | #, sh-format |
170e9899 JX |
5231 | msgid "Submodule path '$sm_path': checked out '$sha1'" |
5232 | msgstr "子模组路径 '$sm_path':检出 '$sha1'" | |
c04f5ac3 | 5233 | |
8ada9598 | 5234 | #: git-submodule.sh:604 git-submodule.sh:927 |
c04f5ac3 | 5235 | #, sh-format |
170e9899 JX |
5236 | msgid "Failed to recurse into submodule path '$sm_path'" |
5237 | msgstr "无法递归进子模组路径 '$sm_path'" | |
c04f5ac3 | 5238 | |
8ada9598 | 5239 | #: git-submodule.sh:712 |
c04f5ac3 JX |
5240 | msgid "--" |
5241 | msgstr "--" | |
5242 | ||
90e6ef53 | 5243 | # 译者:注意保持前导空格 |
8ada9598 | 5244 | #: git-submodule.sh:770 |
c04f5ac3 JX |
5245 | #, sh-format |
5246 | msgid " Warn: $name doesn't contain commit $sha1_src" | |
5247 | msgstr " 警告:$name 未包含提交 $sha1_src" | |
5248 | ||
90e6ef53 | 5249 | # 译者:注意保持前导空格 |
8ada9598 | 5250 | #: git-submodule.sh:773 |
c04f5ac3 JX |
5251 | #, sh-format |
5252 | msgid " Warn: $name doesn't contain commit $sha1_dst" | |
5253 | msgstr " 警告:$name 未包含提交 $sha1_dst" | |
5254 | ||
90e6ef53 | 5255 | # 译者:注意保持前导空格 |
8ada9598 | 5256 | #: git-submodule.sh:776 |
c04f5ac3 JX |
5257 | #, sh-format |
5258 | msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" | |
5259 | msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst" | |
5260 | ||
8ada9598 | 5261 | #: git-submodule.sh:801 |
c04f5ac3 JX |
5262 | msgid "blob" |
5263 | msgstr "blob" | |
5264 | ||
8ada9598 | 5265 | #: git-submodule.sh:802 |
c04f5ac3 JX |
5266 | msgid "submodule" |
5267 | msgstr "子模组" | |
5268 | ||
8ada9598 | 5269 | #: git-submodule.sh:973 |
c04f5ac3 JX |
5270 | #, sh-format |
5271 | msgid "Synchronizing submodule url for '$name'" | |
90e6ef53 | 5272 | msgstr "为 '$name' 同步子模组 url" |
eff6d3a9 | 5273 | |
8ada9598 JX |
5274 | #~ msgid "cherry-pick" |
5275 | #~ msgstr "拣选" | |
5276 | ||
5277 | #~ msgid "Please enter the commit message for your changes." | |
5278 | #~ msgstr "请为您的修改输入提交说明。" | |
5279 | ||
eff6d3a9 JX |
5280 | #~ msgid "Too many options specified" |
5281 | #~ msgstr "指定了太多的选项" |