]>
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" | |
73a60cd2 | 15 | "POT-Creation-Date: 2012-04-28 20:33+0800\n" |
c04f5ac3 JX |
16 | "PO-Revision-Date: 2012-01-30 00:00+0800\n" |
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" | |
23 | "Plural-Forms: nplurals=1; plural=0;\n" | |
24 | ||
25 | #: advice.c:34 | |
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 | #. | |
34 | #: advice.c:64 | |
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 | ||
45 | #: commit.c:47 | |
46 | #, c-format | |
47 | msgid "could not parse %s" | |
48 | msgstr "不能解析 %s" | |
49 | ||
50 | #: commit.c:49 | |
51 | #, c-format | |
52 | msgid "%s %s is not a commit!" | |
53 | msgstr "%s %s 不是一个提交!" | |
54 | ||
55 | #: compat/obstack.c:406 compat/obstack.c:408 | |
56 | msgid "memory exhausted" | |
57 | msgstr "内存耗尽" | |
58 | ||
59 | #: connected.c:39 | |
60 | msgid "Could not run 'git rev-list'" | |
61 | msgstr "不能执行 'git rev-list'" | |
62 | ||
63 | #: connected.c:48 | |
64 | #, c-format | |
65 | msgid "failed write to rev-list: %s" | |
66 | msgstr "无法写入 rev-list:%s" | |
67 | ||
68 | #: connected.c:56 | |
69 | #, c-format | |
70 | msgid "failed to close rev-list's stdin: %s" | |
71 | msgstr "无法关闭 rev-list 的标准输入:%s" | |
72 | ||
90e6ef53 | 73 | # 译者:注意保持前导空格 |
14c8bced | 74 | #: diff.c:105 |
c04f5ac3 JX |
75 | #, c-format |
76 | msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" | |
77 | msgstr " 无法解析 dirstat 阈值 '%.*s'\n" | |
78 | ||
90e6ef53 | 79 | # 译者:注意保持前导空格 |
14c8bced | 80 | #: diff.c:110 |
c04f5ac3 JX |
81 | #, c-format |
82 | msgid " Unknown dirstat parameter '%.*s'\n" | |
83 | msgstr " 未知 dirstat 参数 '%.*s'\n" | |
84 | ||
14c8bced | 85 | #: diff.c:210 |
c04f5ac3 JX |
86 | #, c-format |
87 | msgid "" | |
88 | "Found errors in 'diff.dirstat' config variable:\n" | |
89 | "%s" | |
90 | msgstr "" | |
90e6ef53 | 91 | "发现配置变量 'diff.dirstat' 中的错误:\n" |
c04f5ac3 JX |
92 | "%s" |
93 | ||
73a60cd2 | 94 | #: diff.c:1400 |
7ac1c0ad | 95 | msgid " 0 files changed\n" |
90e6ef53 | 96 | msgstr " 0 个文件被修改\n" |
7ac1c0ad | 97 | |
73a60cd2 | 98 | #: diff.c:1404 |
7ac1c0ad JX |
99 | #, c-format |
100 | msgid " %d file changed" | |
101 | msgid_plural " %d files changed" | |
61bc0753 | 102 | msgstr[0] " %d 个文件被修改" |
7ac1c0ad | 103 | |
73a60cd2 | 104 | #: diff.c:1421 |
7ac1c0ad JX |
105 | #, c-format |
106 | msgid ", %d insertion(+)" | |
107 | msgid_plural ", %d insertions(+)" | |
8ea38f47 | 108 | msgstr[0] ",插入 %d 行(+)" |
7ac1c0ad | 109 | |
73a60cd2 | 110 | #: diff.c:1432 |
7ac1c0ad JX |
111 | #, c-format |
112 | msgid ", %d deletion(-)" | |
113 | msgid_plural ", %d deletions(-)" | |
8ea38f47 | 114 | msgstr[0] ",删除 %d 行(-)" |
7ac1c0ad | 115 | |
73a60cd2 | 116 | #: diff.c:3435 |
c04f5ac3 JX |
117 | #, c-format |
118 | msgid "" | |
119 | "Failed to parse --dirstat/-X option parameter:\n" | |
120 | "%s" | |
121 | msgstr "" | |
122 | "无法解析 --dirstat/-X 选项的参数:\n" | |
123 | "%s" | |
124 | ||
125 | #: gpg-interface.c:59 | |
126 | msgid "could not run gpg." | |
127 | msgstr "不能执行 gpg。" | |
128 | ||
129 | #: gpg-interface.c:71 | |
130 | msgid "gpg did not accept the data" | |
131 | msgstr "gpg 没有接受数据" | |
132 | ||
133 | #: gpg-interface.c:82 | |
134 | msgid "gpg failed to sign the data" | |
135 | msgstr "gpg 无法为数据签名" | |
136 | ||
14c8bced | 137 | #: grep.c:1280 |
7ac1c0ad JX |
138 | #, c-format |
139 | msgid "'%s': unable to read %s" | |
140 | msgstr "'%s':无法读取 %s" | |
141 | ||
14c8bced | 142 | #: grep.c:1297 |
7ac1c0ad JX |
143 | #, c-format |
144 | msgid "'%s': %s" | |
145 | msgstr "'%s':%s" | |
146 | ||
14c8bced | 147 | #: grep.c:1308 |
7ac1c0ad JX |
148 | #, c-format |
149 | msgid "'%s': short read %s" | |
150 | msgstr "'%s':读取不完整 %s" | |
151 | ||
152 | #: help.c:287 | |
c04f5ac3 JX |
153 | #, c-format |
154 | msgid "" | |
155 | "'%s' appears to be a git command, but we were not\n" | |
156 | "able to execute it. Maybe git-%s is broken?" | |
157 | msgstr "" | |
158 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
159 | "可能是 git-%s 受损?" | |
160 | ||
7ac1c0ad | 161 | #: remote.c:1607 |
c04f5ac3 JX |
162 | #, c-format |
163 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
164 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
165 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
166 | ||
7ac1c0ad | 167 | #: remote.c:1613 |
c04f5ac3 JX |
168 | #, c-format |
169 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
170 | msgid_plural "" | |
171 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
90e6ef53 | 172 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
c04f5ac3 | 173 | |
7ac1c0ad | 174 | #: remote.c:1621 |
c04f5ac3 JX |
175 | #, c-format |
176 | msgid "" | |
177 | "Your branch and '%s' have diverged,\n" | |
178 | "and have %d and %d different commit each, respectively.\n" | |
179 | msgid_plural "" | |
180 | "Your branch and '%s' have diverged,\n" | |
181 | "and have %d and %d different commits each, respectively.\n" | |
182 | msgstr[0] "" | |
183 | "您的分支和 '%s' 出现了偏离,\n" | |
184 | "并且各自分别有 %d 和 %d 处不同的提交。\n" | |
185 | ||
14c8bced JX |
186 | #: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985 |
187 | #: builtin/merge.c:1095 builtin/merge.c:1105 | |
c04f5ac3 JX |
188 | #, c-format |
189 | msgid "Could not open '%s' for writing" | |
90e6ef53 | 190 | msgstr "不能为写入打开 '%s'" |
c04f5ac3 | 191 | |
14c8bced JX |
192 | #: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867 |
193 | #: builtin/merge.c:1097 builtin/merge.c:1110 | |
c04f5ac3 JX |
194 | #, c-format |
195 | msgid "Could not write to '%s'" | |
90e6ef53 | 196 | msgstr "不能写入 '%s'" |
c04f5ac3 | 197 | |
14c8bced JX |
198 | #: sequencer.c:143 |
199 | msgid "" | |
200 | "after resolving the conflicts, mark the corrected paths\n" | |
201 | "with 'git add <paths>' or 'git rm <paths>'" | |
202 | msgstr "" | |
203 | "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n" | |
204 | "命令标记修正后的文件" | |
205 | ||
206 | #: sequencer.c:146 | |
c04f5ac3 JX |
207 | msgid "" |
208 | "after resolving the conflicts, mark the corrected paths\n" | |
209 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
210 | "and commit the result with 'git commit'" | |
211 | msgstr "" | |
212 | "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n" | |
213 | "对修正后的文件做标记,然后用 'git commit' 提交" | |
214 | ||
14c8bced | 215 | #: sequencer.c:159 sequencer.c:685 sequencer.c:768 |
c04f5ac3 JX |
216 | #, c-format |
217 | msgid "Could not write to %s" | |
218 | msgstr "不能写入 %s" | |
219 | ||
14c8bced | 220 | #: sequencer.c:162 |
c04f5ac3 JX |
221 | #, c-format |
222 | msgid "Error wrapping up %s" | |
223 | msgstr "错误收尾 %s" | |
224 | ||
14c8bced | 225 | #: sequencer.c:177 |
c04f5ac3 JX |
226 | msgid "Your local changes would be overwritten by cherry-pick." |
227 | msgstr "您的本地修改将被拣选操作覆盖。" | |
228 | ||
14c8bced | 229 | #: sequencer.c:179 |
c04f5ac3 JX |
230 | msgid "Your local changes would be overwritten by revert." |
231 | msgstr "您的本地修改将被还原操作覆盖。" | |
232 | ||
14c8bced | 233 | #: sequencer.c:182 |
c04f5ac3 JX |
234 | msgid "Commit your changes or stash them to proceed." |
235 | msgstr "提交您的修改或保存进度后再继续。" | |
236 | ||
237 | #. TRANSLATORS: %s will be "revert" or "cherry-pick" | |
14c8bced | 238 | #: sequencer.c:232 |
c04f5ac3 JX |
239 | #, c-format |
240 | msgid "%s: Unable to write new index file" | |
90e6ef53 | 241 | msgstr "%s:无法写入新索引文件" |
c04f5ac3 | 242 | |
14c8bced | 243 | #: sequencer.c:298 |
c04f5ac3 | 244 | msgid "Your index file is unmerged." |
90e6ef53 | 245 | msgstr "您的索引文件未完成合并。" |
c04f5ac3 | 246 | |
14c8bced | 247 | #: sequencer.c:301 |
c04f5ac3 JX |
248 | msgid "You do not have a valid HEAD" |
249 | msgstr "您没有一个有效的 HEAD" | |
250 | ||
14c8bced | 251 | #: sequencer.c:316 |
c04f5ac3 JX |
252 | #, c-format |
253 | msgid "Commit %s is a merge but no -m option was given." | |
254 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
255 | ||
14c8bced | 256 | #: sequencer.c:324 |
c04f5ac3 JX |
257 | #, c-format |
258 | msgid "Commit %s does not have parent %d" | |
259 | msgstr "提交 %s 没有父提交 %d" | |
260 | ||
14c8bced | 261 | #: sequencer.c:328 |
c04f5ac3 JX |
262 | #, c-format |
263 | msgid "Mainline was specified but commit %s is not a merge." | |
90e6ef53 | 264 | msgstr "指定了主线但提交 %s 不是一个合并。" |
c04f5ac3 JX |
265 | |
266 | #. TRANSLATORS: The first %s will be "revert" or | |
267 | #. "cherry-pick", the second %s a SHA1 | |
14c8bced | 268 | #: sequencer.c:339 |
c04f5ac3 JX |
269 | #, c-format |
270 | msgid "%s: cannot parse parent commit %s" | |
271 | msgstr "%s:不能解析父提交 %s" | |
272 | ||
14c8bced | 273 | #: sequencer.c:343 |
c04f5ac3 JX |
274 | #, c-format |
275 | msgid "Cannot get commit message for %s" | |
276 | msgstr "不能得到 %s 的提交说明" | |
277 | ||
14c8bced | 278 | #: sequencer.c:427 |
c04f5ac3 JX |
279 | #, c-format |
280 | msgid "could not revert %s... %s" | |
281 | msgstr "不能还原 %s... %s" | |
282 | ||
14c8bced | 283 | #: sequencer.c:428 |
c04f5ac3 JX |
284 | #, c-format |
285 | msgid "could not apply %s... %s" | |
286 | msgstr "不能应用 %s... %s" | |
287 | ||
14c8bced JX |
288 | #: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713 |
289 | #: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348 | |
c04f5ac3 JX |
290 | #: builtin/shortlog.c:181 |
291 | msgid "revision walk setup failed" | |
292 | msgstr "版本遍历设置失败" | |
293 | ||
14c8bced | 294 | #: sequencer.c:453 |
c04f5ac3 JX |
295 | msgid "empty commit set passed" |
296 | msgstr "提供了空的提交集" | |
297 | ||
14c8bced | 298 | #: sequencer.c:461 |
c04f5ac3 JX |
299 | #, c-format |
300 | msgid "git %s: failed to read the index" | |
90e6ef53 | 301 | msgstr "git %s:无法读取索引" |
c04f5ac3 | 302 | |
14c8bced | 303 | #: sequencer.c:466 |
c04f5ac3 JX |
304 | #, c-format |
305 | msgid "git %s: failed to refresh the index" | |
90e6ef53 | 306 | msgstr "git %s:无法刷新索引" |
c04f5ac3 | 307 | |
14c8bced | 308 | #: sequencer.c:551 |
c04f5ac3 JX |
309 | #, c-format |
310 | msgid "Cannot %s during a %s" | |
90e6ef53 | 311 | msgstr "无法 %s 在一个 %s 过程中" |
c04f5ac3 | 312 | |
14c8bced | 313 | #: sequencer.c:573 |
c04f5ac3 JX |
314 | #, c-format |
315 | msgid "Could not parse line %d." | |
90e6ef53 | 316 | msgstr "不能解析第 %d 行。" |
c04f5ac3 | 317 | |
14c8bced | 318 | #: sequencer.c:578 |
c04f5ac3 | 319 | msgid "No commits parsed." |
7e238ab7 | 320 | msgstr "没有提交被解析。" |
c04f5ac3 | 321 | |
14c8bced | 322 | #: sequencer.c:591 |
c04f5ac3 JX |
323 | #, c-format |
324 | msgid "Could not open %s" | |
325 | msgstr "不能打开 %s" | |
326 | ||
14c8bced | 327 | #: sequencer.c:595 |
c04f5ac3 JX |
328 | #, c-format |
329 | msgid "Could not read %s." | |
330 | msgstr "不能读取 %s。" | |
331 | ||
14c8bced | 332 | #: sequencer.c:602 |
c04f5ac3 JX |
333 | #, c-format |
334 | msgid "Unusable instruction sheet: %s" | |
335 | msgstr "无用的指令表单:%s" | |
336 | ||
14c8bced | 337 | #: sequencer.c:630 |
c04f5ac3 JX |
338 | #, c-format |
339 | msgid "Invalid key: %s" | |
340 | msgstr "无效键名:%s" | |
341 | ||
14c8bced | 342 | #: sequencer.c:633 |
c04f5ac3 JX |
343 | #, c-format |
344 | msgid "Invalid value for %s: %s" | |
345 | msgstr "无效的 %s 值:%s" | |
346 | ||
14c8bced | 347 | #: sequencer.c:645 |
c04f5ac3 JX |
348 | #, c-format |
349 | msgid "Malformed options sheet: %s" | |
350 | msgstr "非法的选项表单:%s" | |
351 | ||
14c8bced | 352 | #: sequencer.c:666 |
c04f5ac3 JX |
353 | msgid "a cherry-pick or revert is already in progress" |
354 | msgstr "一个拣选或还原操作已在进行" | |
355 | ||
14c8bced | 356 | #: sequencer.c:667 |
c04f5ac3 JX |
357 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
358 | msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" | |
359 | ||
14c8bced | 360 | #: sequencer.c:671 |
c04f5ac3 JX |
361 | #, c-format |
362 | msgid "Could not create sequencer directory %s" | |
90e6ef53 | 363 | msgstr "不能创建序列目录 %s" |
c04f5ac3 | 364 | |
14c8bced | 365 | #: sequencer.c:687 sequencer.c:772 |
c04f5ac3 JX |
366 | #, c-format |
367 | msgid "Error wrapping up %s." | |
368 | msgstr "错误收尾 %s。" | |
369 | ||
14c8bced | 370 | #: sequencer.c:706 sequencer.c:840 |
c04f5ac3 JX |
371 | msgid "no cherry-pick or revert in progress" |
372 | msgstr "没有拣选或还原操作在进行" | |
373 | ||
14c8bced | 374 | #: sequencer.c:708 |
c04f5ac3 JX |
375 | msgid "cannot resolve HEAD" |
376 | msgstr "不能解析 HEAD" | |
377 | ||
14c8bced | 378 | #: sequencer.c:710 |
c04f5ac3 | 379 | msgid "cannot abort from a branch yet to be born" |
90e6ef53 | 380 | msgstr "不能从尚未建立的分支终止" |
c04f5ac3 | 381 | |
14c8bced | 382 | #: sequencer.c:732 |
c04f5ac3 JX |
383 | #, c-format |
384 | msgid "cannot open %s: %s" | |
385 | msgstr "不能打开 %s:%s" | |
386 | ||
14c8bced | 387 | #: sequencer.c:735 |
c04f5ac3 JX |
388 | #, c-format |
389 | msgid "cannot read %s: %s" | |
390 | msgstr "不能读取 %s:%s" | |
391 | ||
14c8bced | 392 | #: sequencer.c:736 |
c04f5ac3 JX |
393 | msgid "unexpected end of file" |
394 | msgstr "未预期的文件结束" | |
395 | ||
14c8bced | 396 | #: sequencer.c:742 |
c04f5ac3 JX |
397 | #, c-format |
398 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
90e6ef53 | 399 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" |
c04f5ac3 | 400 | |
14c8bced | 401 | #: sequencer.c:765 |
c04f5ac3 JX |
402 | #, c-format |
403 | msgid "Could not format %s." | |
404 | msgstr "不能格式化 %s。" | |
405 | ||
14c8bced | 406 | #: sequencer.c:927 |
c04f5ac3 JX |
407 | msgid "Can't revert as initial commit" |
408 | msgstr "不能作为初始提交还原" | |
409 | ||
14c8bced | 410 | #: sequencer.c:928 |
c04f5ac3 JX |
411 | msgid "Can't cherry-pick into empty head" |
412 | msgstr "不能拣选到空分支" | |
413 | ||
414 | #: wt-status.c:134 | |
415 | msgid "Unmerged paths:" | |
416 | msgstr "未合并的路径:" | |
417 | ||
90e6ef53 | 418 | # 译者:注意保持前导空格 |
c04f5ac3 JX |
419 | #: wt-status.c:140 wt-status.c:157 |
420 | #, c-format | |
421 | msgid " (use \"git reset %s <file>...\" to unstage)" | |
422 | msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)" | |
423 | ||
90e6ef53 | 424 | # 译者:注意保持前导空格 |
c04f5ac3 JX |
425 | #: wt-status.c:142 wt-status.c:159 |
426 | msgid " (use \"git rm --cached <file>...\" to unstage)" | |
427 | msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)" | |
428 | ||
90e6ef53 | 429 | # 译者:注意保持前导空格 |
c04f5ac3 JX |
430 | #: wt-status.c:143 |
431 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" | |
432 | msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)" | |
433 | ||
434 | #: wt-status.c:151 | |
435 | msgid "Changes to be committed:" | |
436 | msgstr "要提交的变更:" | |
437 | ||
438 | #: wt-status.c:169 | |
439 | msgid "Changes not staged for commit:" | |
7e238ab7 | 440 | msgstr "尚未暂存以备提交的变更:" |
c04f5ac3 | 441 | |
90e6ef53 | 442 | # 译者:注意保持前导空格 |
c04f5ac3 JX |
443 | #: wt-status.c:173 |
444 | msgid " (use \"git add <file>...\" to update what will be committed)" | |
445 | msgstr " (使用 \"git add <file>...\" 更新要提交的内容)" | |
446 | ||
90e6ef53 | 447 | # 译者:注意保持前导空格 |
c04f5ac3 JX |
448 | #: wt-status.c:175 |
449 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" | |
450 | msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)" | |
451 | ||
90e6ef53 | 452 | # 译者:注意保持前导空格 |
c04f5ac3 JX |
453 | #: wt-status.c:176 |
454 | msgid "" | |
455 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" | |
456 | msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)" | |
457 | ||
90e6ef53 | 458 | # 译者:注意保持前导空格 |
c04f5ac3 JX |
459 | #: wt-status.c:178 |
460 | msgid " (commit or discard the untracked or modified content in submodules)" | |
461 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
462 | ||
463 | #: wt-status.c:187 | |
464 | #, c-format | |
465 | msgid "%s files:" | |
466 | msgstr "%s文件:" | |
467 | ||
90e6ef53 | 468 | # 译者:注意保持前导空格 |
c04f5ac3 JX |
469 | #: wt-status.c:190 |
470 | #, c-format | |
471 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
90e6ef53 | 472 | msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)" |
c04f5ac3 JX |
473 | |
474 | #: wt-status.c:207 | |
475 | msgid "bug" | |
476 | msgstr "bug" | |
477 | ||
478 | #: wt-status.c:212 | |
479 | msgid "both deleted:" | |
480 | msgstr "双方删除:" | |
481 | ||
482 | #: wt-status.c:213 | |
483 | msgid "added by us:" | |
484 | msgstr "由我们添加:" | |
485 | ||
486 | #: wt-status.c:214 | |
487 | msgid "deleted by them:" | |
488 | msgstr "由他们删除:" | |
489 | ||
490 | #: wt-status.c:215 | |
491 | msgid "added by them:" | |
492 | msgstr "由他们添加:" | |
493 | ||
494 | #: wt-status.c:216 | |
495 | msgid "deleted by us:" | |
496 | msgstr "由我们删除:" | |
497 | ||
498 | #: wt-status.c:217 | |
499 | msgid "both added:" | |
500 | msgstr "双方添加:" | |
501 | ||
502 | #: wt-status.c:218 | |
503 | msgid "both modified:" | |
504 | msgstr "双方修改:" | |
505 | ||
90e6ef53 | 506 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
c04f5ac3 JX |
507 | #: wt-status.c:248 |
508 | msgid "new commits, " | |
aa9565f7 | 509 | msgstr "新提交, " |
c04f5ac3 | 510 | |
90e6ef53 | 511 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
c04f5ac3 JX |
512 | #: wt-status.c:250 |
513 | msgid "modified content, " | |
aa9565f7 | 514 | msgstr "修改的内容, " |
c04f5ac3 | 515 | |
90e6ef53 | 516 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
c04f5ac3 JX |
517 | #: wt-status.c:252 |
518 | msgid "untracked content, " | |
aa9565f7 | 519 | msgstr "未跟踪的内容, " |
c04f5ac3 | 520 | |
90e6ef53 | 521 | # 译者:为保证在输出中对齐,注意调整句中空格! |
c04f5ac3 JX |
522 | #: wt-status.c:266 |
523 | #, c-format | |
524 | msgid "new file: %s" | |
525 | msgstr "新文件: %s" | |
526 | ||
90e6ef53 | 527 | # 译者:为保证在输出中对齐,注意调整句中空格! |
c04f5ac3 JX |
528 | #: wt-status.c:269 |
529 | #, c-format | |
530 | msgid "copied: %s -> %s" | |
531 | msgstr "拷贝: %s -> %s" | |
532 | ||
90e6ef53 | 533 | # 译者:为保证在输出中对齐,注意调整句中空格! |
c04f5ac3 JX |
534 | #: wt-status.c:272 |
535 | #, c-format | |
536 | msgid "deleted: %s" | |
537 | msgstr "删除: %s" | |
538 | ||
90e6ef53 | 539 | # 译者:为保证在输出中对齐,注意调整句中空格! |
c04f5ac3 JX |
540 | #: wt-status.c:275 |
541 | #, c-format | |
542 | msgid "modified: %s" | |
543 | msgstr "修改: %s" | |
544 | ||
90e6ef53 | 545 | # 译者:为保证在输出中对齐,注意调整句中空格! |
c04f5ac3 JX |
546 | #: wt-status.c:278 |
547 | #, c-format | |
548 | msgid "renamed: %s -> %s" | |
549 | msgstr "重命名: %s -> %s" | |
550 | ||
90e6ef53 | 551 | # 译者:为保证在输出中对齐,注意调整句中空格! |
c04f5ac3 JX |
552 | #: wt-status.c:281 |
553 | #, c-format | |
554 | msgid "typechange: %s" | |
555 | msgstr "类型变更: %s" | |
556 | ||
90e6ef53 | 557 | # 译者:为保证在输出中对齐,注意调整句中空格! |
c04f5ac3 JX |
558 | #: wt-status.c:284 |
559 | #, c-format | |
560 | msgid "unknown: %s" | |
561 | msgstr "未知: %s" | |
562 | ||
90e6ef53 | 563 | # 译者:为保证在输出中对齐,注意调整句中空格! |
c04f5ac3 JX |
564 | #: wt-status.c:287 |
565 | #, c-format | |
566 | msgid "unmerged: %s" | |
567 | msgstr "未合并: %s" | |
568 | ||
569 | #: wt-status.c:290 | |
570 | #, c-format | |
571 | msgid "bug: unhandled diff status %c" | |
90e6ef53 | 572 | msgstr "bug:未处理的差异状态 %c" |
c04f5ac3 JX |
573 | |
574 | #: wt-status.c:713 | |
575 | msgid "On branch " | |
576 | msgstr "位于分支 " | |
577 | ||
578 | #: wt-status.c:720 | |
579 | msgid "Not currently on any branch." | |
580 | msgstr "当前不在任何分支上。" | |
581 | ||
582 | #: wt-status.c:731 | |
583 | msgid "Initial commit" | |
584 | msgstr "初始提交" | |
585 | ||
586 | #: wt-status.c:745 | |
587 | msgid "Untracked" | |
588 | msgstr "未跟踪的" | |
589 | ||
590 | #: wt-status.c:747 | |
591 | msgid "Ignored" | |
592 | msgstr "忽略的" | |
593 | ||
594 | #: wt-status.c:749 | |
595 | #, c-format | |
596 | msgid "Untracked files not listed%s" | |
597 | msgstr "未跟踪的文件没有列出%s" | |
598 | ||
7e238ab7 | 599 | # 译者:中文字符串拼接,可删除前导空格 |
c04f5ac3 JX |
600 | #: wt-status.c:751 |
601 | msgid " (use -u option to show untracked files)" | |
7e238ab7 | 602 | msgstr "(使用 -u 参数显示未跟踪的文件)" |
c04f5ac3 JX |
603 | |
604 | #: wt-status.c:757 | |
605 | msgid "No changes" | |
606 | msgstr "没有修改" | |
607 | ||
608 | #: wt-status.c:761 | |
609 | #, c-format | |
610 | msgid "no changes added to commit%s\n" | |
611 | msgstr "修改尚未加入提交%s\n" | |
612 | ||
7e238ab7 | 613 | # 译者:中文字符串拼接,可删除前导空格 |
c04f5ac3 JX |
614 | #: wt-status.c:763 |
615 | msgid " (use \"git add\" and/or \"git commit -a\")" | |
7e238ab7 | 616 | msgstr "(使用 \"git add\" 和/或 \"git commit -a\")" |
c04f5ac3 JX |
617 | |
618 | #: wt-status.c:765 | |
619 | #, c-format | |
620 | msgid "nothing added to commit but untracked files present%s\n" | |
621 | msgstr "空提交但存在未跟踪文件%s\n" | |
622 | ||
7e238ab7 | 623 | # 译者:中文字符串拼接,可删除前导空格 |
c04f5ac3 JX |
624 | #: wt-status.c:767 |
625 | msgid " (use \"git add\" to track)" | |
7e238ab7 | 626 | msgstr "(使用 \"git add\" 建立跟踪)" |
c04f5ac3 JX |
627 | |
628 | #: wt-status.c:769 wt-status.c:772 wt-status.c:775 | |
629 | #, c-format | |
630 | msgid "nothing to commit%s\n" | |
631 | msgstr "无须提交%s\n" | |
632 | ||
7e238ab7 | 633 | # 译者:中文字符串拼接,可删除前导空格 |
c04f5ac3 JX |
634 | #: wt-status.c:770 |
635 | msgid " (create/copy files and use \"git add\" to track)" | |
7e238ab7 | 636 | msgstr "(新建/拷贝的文件使用 \"git add\" 建立跟踪)" |
c04f5ac3 | 637 | |
7e238ab7 | 638 | # 译者:中文字符串拼接,可删除前导空格 |
c04f5ac3 JX |
639 | #: wt-status.c:773 |
640 | msgid " (use -u to show untracked files)" | |
7e238ab7 | 641 | msgstr "(使用 -u 显示未跟踪文件)" |
c04f5ac3 | 642 | |
7e238ab7 | 643 | # 译者:中文字符串拼接,可删除前导空格 |
c04f5ac3 JX |
644 | #: wt-status.c:776 |
645 | msgid " (working directory clean)" | |
7e238ab7 | 646 | msgstr "(干净的工作区)" |
c04f5ac3 JX |
647 | |
648 | #: wt-status.c:884 | |
649 | msgid "HEAD (no branch)" | |
61bc0753 | 650 | msgstr "HEAD(非分支)" |
c04f5ac3 | 651 | |
90e6ef53 | 652 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
653 | #: wt-status.c:890 |
654 | msgid "Initial commit on " | |
655 | msgstr "初始提交于 " | |
656 | ||
90e6ef53 | 657 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
658 | #: wt-status.c:905 |
659 | msgid "behind " | |
660 | msgstr "落后 " | |
661 | ||
90e6ef53 | 662 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
663 | #: wt-status.c:908 wt-status.c:911 |
664 | msgid "ahead " | |
665 | msgstr "领先 " | |
666 | ||
90e6ef53 | 667 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
668 | #: wt-status.c:913 |
669 | msgid ", behind " | |
670 | msgstr ",落后 " | |
671 | ||
672 | #: builtin/add.c:62 | |
673 | #, c-format | |
674 | msgid "unexpected diff status %c" | |
675 | msgstr "意外的差异状态 %c" | |
676 | ||
677 | #: builtin/add.c:67 builtin/commit.c:298 | |
678 | msgid "updating files failed" | |
679 | msgstr "更新文件失败" | |
680 | ||
681 | #: builtin/add.c:77 | |
682 | #, c-format | |
683 | msgid "remove '%s'\n" | |
684 | msgstr "删除 '%s'\n" | |
685 | ||
686 | #: builtin/add.c:176 | |
687 | #, c-format | |
688 | msgid "Path '%s' is in submodule '%.*s'" | |
689 | msgstr "路径 '%s' 属于模组 '%.*s'" | |
690 | ||
691 | #: builtin/add.c:192 | |
692 | msgid "Unstaged changes after refreshing the index:" | |
90e6ef53 | 693 | msgstr "刷新索引之后尚未被暂存的变更:" |
c04f5ac3 JX |
694 | |
695 | #: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186 | |
696 | #, c-format | |
697 | msgid "pathspec '%s' did not match any files" | |
698 | msgstr "路径 '%s' 未匹配任何文件" | |
699 | ||
700 | #: builtin/add.c:209 | |
701 | #, c-format | |
702 | msgid "'%s' is beyond a symbolic link" | |
703 | msgstr "'%s' 位于符号链接中" | |
704 | ||
705 | #: builtin/add.c:276 | |
706 | msgid "Could not read the index" | |
90e6ef53 | 707 | msgstr "不能读取索引" |
c04f5ac3 JX |
708 | |
709 | #: builtin/add.c:286 | |
710 | #, c-format | |
711 | msgid "Could not open '%s' for writing." | |
90e6ef53 | 712 | msgstr "不能为写入打开 '%s'。" |
c04f5ac3 JX |
713 | |
714 | #: builtin/add.c:290 | |
715 | msgid "Could not write patch" | |
90e6ef53 | 716 | msgstr "不能写补丁" |
c04f5ac3 JX |
717 | |
718 | #: builtin/add.c:295 | |
719 | #, c-format | |
720 | msgid "Could not stat '%s'" | |
90e6ef53 | 721 | msgstr "不能查看文件状态 '%s'" |
c04f5ac3 JX |
722 | |
723 | #: builtin/add.c:297 | |
724 | msgid "Empty patch. Aborted." | |
725 | msgstr "空补丁。异常终止。" | |
726 | ||
727 | #: builtin/add.c:303 | |
728 | #, c-format | |
729 | msgid "Could not apply '%s'" | |
90e6ef53 | 730 | msgstr "不能应用 '%s'" |
c04f5ac3 JX |
731 | |
732 | #: builtin/add.c:312 | |
733 | msgid "The following paths are ignored by one of your .gitignore files:\n" | |
734 | msgstr "下列路径被您的一个 .gitignore 文件所忽略:\n" | |
735 | ||
736 | #: builtin/add.c:352 | |
737 | #, c-format | |
738 | msgid "Use -f if you really want to add them.\n" | |
90e6ef53 | 739 | msgstr "使用 -f 参数如果您确实要添加它们。\n" |
c04f5ac3 JX |
740 | |
741 | #: builtin/add.c:353 | |
742 | msgid "no files added" | |
743 | msgstr "没有文件被添加" | |
744 | ||
745 | #: builtin/add.c:359 | |
746 | msgid "adding files failed" | |
747 | msgstr "添加文件失败" | |
748 | ||
749 | #: builtin/add.c:391 | |
750 | msgid "-A and -u are mutually incompatible" | |
751 | msgstr "-A 和 -u 选项互斥" | |
752 | ||
753 | #: builtin/add.c:393 | |
754 | msgid "Option --ignore-missing can only be used together with --dry-run" | |
755 | msgstr "选项 --ignore-missing 只能和 --dry-run 共用" | |
756 | ||
757 | #: builtin/add.c:413 | |
758 | #, c-format | |
759 | msgid "Nothing specified, nothing added.\n" | |
90e6ef53 | 760 | msgstr "没有指定文件,也没有文件被添加。\n" |
c04f5ac3 JX |
761 | |
762 | #: builtin/add.c:414 | |
763 | #, c-format | |
764 | msgid "Maybe you wanted to say 'git add .'?\n" | |
765 | msgstr "也许您想要执行 'git add .'?\n" | |
766 | ||
767 | #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82 | |
768 | #: builtin/rm.c:162 | |
769 | msgid "index file corrupt" | |
90e6ef53 | 770 | msgstr "索引文件损坏" |
c04f5ac3 JX |
771 | |
772 | #: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260 | |
773 | msgid "Unable to write new index file" | |
90e6ef53 | 774 | msgstr "无法写入新索引文件" |
c04f5ac3 JX |
775 | |
776 | #: builtin/archive.c:17 | |
777 | #, c-format | |
778 | msgid "could not create archive file '%s'" | |
90e6ef53 | 779 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
780 | |
781 | #: builtin/archive.c:20 | |
782 | msgid "could not redirect output" | |
90e6ef53 | 783 | msgstr "不能输出重定向" |
c04f5ac3 JX |
784 | |
785 | #: builtin/archive.c:37 | |
786 | msgid "git archive: Remote with no URL" | |
90e6ef53 | 787 | msgstr "git archive:未提供远程URL" |
c04f5ac3 JX |
788 | |
789 | #: builtin/archive.c:58 | |
790 | msgid "git archive: expected ACK/NAK, got EOF" | |
90e6ef53 | 791 | msgstr "git archive:期待ACK/NACK,却得到EOF" |
c04f5ac3 JX |
792 | |
793 | #: builtin/archive.c:63 | |
794 | #, c-format | |
795 | msgid "git archive: NACK %s" | |
90e6ef53 | 796 | msgstr "git archive:NACK %s" |
c04f5ac3 JX |
797 | |
798 | #: builtin/archive.c:65 | |
799 | #, c-format | |
800 | msgid "remote error: %s" | |
801 | msgstr "远程错误:%s" | |
802 | ||
803 | #: builtin/archive.c:66 | |
804 | msgid "git archive: protocol error" | |
90e6ef53 | 805 | msgstr "git archive:协议错误" |
c04f5ac3 JX |
806 | |
807 | #: builtin/archive.c:71 | |
808 | msgid "git archive: expected a flush" | |
90e6ef53 | 809 | msgstr "git archive:预期一个刷新" |
c04f5ac3 | 810 | |
90e6ef53 | 811 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
c04f5ac3 JX |
812 | #: builtin/branch.c:137 |
813 | #, c-format | |
814 | msgid "" | |
815 | "deleting branch '%s' that has been merged to\n" | |
816 | " '%s', but not yet merged to HEAD." | |
817 | msgstr "" | |
70fc47bf | 818 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
819 | " '%s',但未合并到 HEAD。" |
820 | ||
90e6ef53 | 821 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
c04f5ac3 JX |
822 | #: builtin/branch.c:141 |
823 | #, c-format | |
824 | msgid "" | |
825 | "not deleting branch '%s' that is not yet merged to\n" | |
826 | " '%s', even though it is merged to HEAD." | |
827 | msgstr "" | |
70fc47bf T |
828 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
829 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 830 | |
90e6ef53 | 831 | # 译者:汉字之间无空格,故删除尾部空格 |
c04f5ac3 JX |
832 | #. TRANSLATORS: This is "remote " in "remote branch '%s' not found" |
833 | #: builtin/branch.c:163 | |
834 | msgid "remote " | |
835 | msgstr "远程" | |
836 | ||
837 | #: builtin/branch.c:171 | |
838 | msgid "cannot use -a with -d" | |
839 | msgstr "不能将 -a 和 -d 共用" | |
840 | ||
841 | #: builtin/branch.c:177 | |
842 | msgid "Couldn't look up commit object for HEAD" | |
843 | msgstr "无法查询 HEAD 指向的提交对象" | |
844 | ||
845 | #: builtin/branch.c:182 | |
846 | #, c-format | |
847 | msgid "Cannot delete the branch '%s' which you are currently on." | |
848 | msgstr "无法删除您当前所在的分支 '%s'。" | |
849 | ||
850 | #: builtin/branch.c:192 | |
851 | #, c-format | |
852 | msgid "%sbranch '%s' not found." | |
853 | msgstr "%s分支 '%s' 未发现。" | |
854 | ||
855 | #: builtin/branch.c:200 | |
856 | #, c-format | |
857 | msgid "Couldn't look up commit object for '%s'" | |
858 | msgstr "无法查询 '%s' 指向的提交对象" | |
859 | ||
860 | #: builtin/branch.c:206 | |
861 | #, c-format | |
862 | msgid "" | |
863 | "The branch '%s' is not fully merged.\n" | |
864 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
865 | msgstr "" | |
866 | "分支 '%s' 没有完全合并。\n" | |
867 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
868 | ||
869 | #: builtin/branch.c:214 | |
870 | #, c-format | |
871 | msgid "Error deleting %sbranch '%s'" | |
90e6ef53 | 872 | msgstr "删除 %s分支 '%s' 时出错" |
c04f5ac3 JX |
873 | |
874 | #: builtin/branch.c:219 | |
875 | #, c-format | |
876 | msgid "Deleted %sbranch %s (was %s).\n" | |
877 | msgstr "已删除 %s分支 %s(曾为 %s)。\n" | |
878 | ||
879 | #: builtin/branch.c:224 | |
880 | msgid "Update of config-file failed" | |
881 | msgstr "无法更新 config 文件" | |
882 | ||
883 | #: builtin/branch.c:322 | |
884 | #, c-format | |
885 | msgid "branch '%s' does not point at a commit" | |
886 | msgstr "分支 '%s' 未指向一个提交" | |
887 | ||
90e6ef53 | 888 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
889 | #: builtin/branch.c:394 |
890 | #, c-format | |
891 | msgid "behind %d] " | |
892 | msgstr "落后 %d] " | |
893 | ||
90e6ef53 | 894 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
895 | #: builtin/branch.c:396 |
896 | #, c-format | |
897 | msgid "ahead %d] " | |
898 | msgstr "领先 %d] " | |
899 | ||
90e6ef53 | 900 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
901 | #: builtin/branch.c:398 |
902 | #, c-format | |
903 | msgid "ahead %d, behind %d] " | |
904 | msgstr "领先 %d,落后 %d] " | |
905 | ||
906 | #: builtin/branch.c:501 | |
907 | msgid "(no branch)" | |
908 | msgstr "(非分支)" | |
909 | ||
14c8bced | 910 | #: builtin/branch.c:566 |
c04f5ac3 | 911 | msgid "some refs could not be read" |
90e6ef53 | 912 | msgstr "一些引用不能读取" |
c04f5ac3 | 913 | |
14c8bced | 914 | #: builtin/branch.c:579 |
c04f5ac3 | 915 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 916 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 917 | |
14c8bced | 918 | #: builtin/branch.c:589 |
c04f5ac3 JX |
919 | #, c-format |
920 | msgid "Invalid branch name: '%s'" | |
921 | msgstr "无效的分支名:'%s'" | |
922 | ||
14c8bced | 923 | #: builtin/branch.c:604 |
c04f5ac3 JX |
924 | msgid "Branch rename failed" |
925 | msgstr "分支重命名失败" | |
926 | ||
14c8bced | 927 | #: builtin/branch.c:608 |
c04f5ac3 JX |
928 | #, c-format |
929 | msgid "Renamed a misnamed branch '%s' away" | |
930 | msgstr "重命名掉一个错误命名的旧分支 '%s'" | |
931 | ||
14c8bced | 932 | #: builtin/branch.c:612 |
c04f5ac3 JX |
933 | #, c-format |
934 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
935 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
936 | ||
14c8bced | 937 | #: builtin/branch.c:619 |
c04f5ac3 JX |
938 | msgid "Branch is renamed, but update of config-file failed" |
939 | msgstr "分支被重命名,但更新 config 文件失败" | |
940 | ||
14c8bced | 941 | #: builtin/branch.c:634 |
c04f5ac3 JX |
942 | #, c-format |
943 | msgid "malformed object name %s" | |
944 | msgstr "非法的对象名 %s" | |
945 | ||
14c8bced | 946 | #: builtin/branch.c:658 |
c04f5ac3 JX |
947 | #, c-format |
948 | msgid "could not write branch description template: %s\n" | |
949 | msgstr "不能写分支描述模版:%s\n" | |
950 | ||
14c8bced | 951 | #: builtin/branch.c:746 |
c04f5ac3 JX |
952 | msgid "Failed to resolve HEAD as a valid ref." |
953 | msgstr "无法将 HEAD 解析为有效引用。" | |
954 | ||
14c8bced | 955 | #: builtin/branch.c:751 builtin/clone.c:558 |
c04f5ac3 | 956 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 957 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 958 | |
14c8bced | 959 | #: builtin/branch.c:809 |
c04f5ac3 JX |
960 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
961 | msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" | |
962 | ||
963 | #: builtin/bundle.c:47 | |
964 | #, c-format | |
965 | msgid "%s is okay\n" | |
966 | msgstr "%s 可以\n" | |
967 | ||
968 | #: builtin/bundle.c:56 | |
969 | msgid "Need a repository to create a bundle." | |
90e6ef53 | 970 | msgstr "需要一个版本库来创建包。" |
c04f5ac3 JX |
971 | |
972 | #: builtin/bundle.c:60 | |
973 | msgid "Need a repository to unbundle." | |
90e6ef53 | 974 | msgstr "需要一个版本库来解包。" |
c04f5ac3 JX |
975 | |
976 | #: builtin/checkout.c:113 builtin/checkout.c:146 | |
977 | #, c-format | |
978 | msgid "path '%s' does not have our version" | |
979 | msgstr "路径 '%s' 没有我们的版本" | |
980 | ||
981 | #: builtin/checkout.c:115 builtin/checkout.c:148 | |
982 | #, c-format | |
983 | msgid "path '%s' does not have their version" | |
984 | msgstr "路径 '%s' 没有他们的版本" | |
985 | ||
986 | #: builtin/checkout.c:131 | |
987 | #, c-format | |
988 | msgid "path '%s' does not have all necessary versions" | |
989 | msgstr "路径 '%s' 没有全部必须的版本" | |
990 | ||
991 | #: builtin/checkout.c:175 | |
992 | #, c-format | |
993 | msgid "path '%s' does not have necessary versions" | |
994 | msgstr "路径 '%s' 没有必须的版本" | |
995 | ||
996 | #: builtin/checkout.c:192 | |
997 | #, c-format | |
998 | msgid "path '%s': cannot merge" | |
90e6ef53 | 999 | msgstr "path '%s':无法合并" |
c04f5ac3 JX |
1000 | |
1001 | #: builtin/checkout.c:209 | |
1002 | #, c-format | |
1003 | msgid "Unable to add merge result for '%s'" | |
1004 | msgstr "无法为 '%s' 添加合并结果" | |
1005 | ||
1006 | #: builtin/checkout.c:212 builtin/reset.c:158 | |
1007 | #, c-format | |
1008 | msgid "make_cache_entry failed for path '%s'" | |
1009 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" | |
1010 | ||
1011 | #: builtin/checkout.c:234 builtin/checkout.c:392 | |
1012 | msgid "corrupt index file" | |
90e6ef53 | 1013 | msgstr "损坏的索引文件" |
c04f5ac3 JX |
1014 | |
1015 | #: builtin/checkout.c:264 builtin/checkout.c:271 | |
1016 | #, c-format | |
1017 | msgid "path '%s' is unmerged" | |
1018 | msgstr "路径 '%s' 未合并" | |
1019 | ||
7ac1c0ad | 1020 | #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 |
14c8bced | 1021 | #: builtin/merge.c:811 |
c04f5ac3 | 1022 | msgid "unable to write new index file" |
90e6ef53 | 1023 | msgstr "无法写新的索引文件" |
c04f5ac3 | 1024 | |
14c8bced | 1025 | #: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 |
c04f5ac3 JX |
1026 | msgid "diff_setup_done failed" |
1027 | msgstr "diff_setup_done 失败" | |
1028 | ||
1029 | #: builtin/checkout.c:414 | |
1030 | msgid "you need to resolve your current index first" | |
90e6ef53 | 1031 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 JX |
1032 | |
1033 | #: builtin/checkout.c:533 | |
1034 | #, c-format | |
1035 | msgid "Can not do reflog for '%s'\n" | |
90e6ef53 | 1036 | msgstr "不能对 '%s' 执行 reflog 操作\n" |
c04f5ac3 JX |
1037 | |
1038 | #: builtin/checkout.c:565 | |
1039 | msgid "HEAD is now at" | |
1040 | msgstr "HEAD 目前位于" | |
1041 | ||
1042 | #: builtin/checkout.c:572 | |
1043 | #, c-format | |
1044 | msgid "Reset branch '%s'\n" | |
1045 | msgstr "重置分支 '%s'\n" | |
1046 | ||
1047 | #: builtin/checkout.c:575 | |
1048 | #, c-format | |
1049 | msgid "Already on '%s'\n" | |
1050 | msgstr "已经位于 '%s'\n" | |
1051 | ||
1052 | #: builtin/checkout.c:579 | |
1053 | #, c-format | |
1054 | msgid "Switched to and reset branch '%s'\n" | |
1055 | msgstr "切换并重置分支 '%s'\n" | |
1056 | ||
1057 | #: builtin/checkout.c:581 | |
1058 | #, c-format | |
1059 | msgid "Switched to a new branch '%s'\n" | |
1060 | msgstr "切换到一个新分支 '%s'\n" | |
1061 | ||
1062 | #: builtin/checkout.c:583 | |
1063 | #, c-format | |
1064 | msgid "Switched to branch '%s'\n" | |
1065 | msgstr "切换到分支 '%s'\n" | |
1066 | ||
90e6ef53 | 1067 | # 译者:注意保持前导空格 |
c04f5ac3 JX |
1068 | #: builtin/checkout.c:639 |
1069 | #, c-format | |
1070 | msgid " ... and %d more.\n" | |
90e6ef53 | 1071 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 JX |
1072 | |
1073 | #. The singular version | |
1074 | #: builtin/checkout.c:645 | |
1075 | #, c-format | |
1076 | msgid "" | |
1077 | "Warning: you are leaving %d commit behind, not connected to\n" | |
1078 | "any of your branches:\n" | |
1079 | "\n" | |
1080 | "%s\n" | |
1081 | msgid_plural "" | |
1082 | "Warning: you are leaving %d commits behind, not connected to\n" | |
1083 | "any of your branches:\n" | |
1084 | "\n" | |
1085 | "%s\n" | |
1086 | msgstr[0] "" | |
1087 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
1088 | "\n" | |
1089 | "%s\n" | |
1090 | ||
1091 | #: builtin/checkout.c:663 | |
1092 | #, c-format | |
1093 | msgid "" | |
1094 | "If you want to keep them by creating a new branch, this may be a good time\n" | |
1095 | "to do so with:\n" | |
1096 | "\n" | |
1097 | " git branch new_branch_name %s\n" | |
1098 | "\n" | |
1099 | msgstr "" | |
1100 | "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n" | |
1101 | "如下操作:\n" | |
1102 | "\n" | |
1103 | " git branch new_branch_name %s\n" | |
1104 | "\n" | |
1105 | ||
1106 | #: builtin/checkout.c:692 | |
1107 | msgid "internal error in revision walk" | |
1108 | msgstr "在版本遍历时遇到内部错误" | |
1109 | ||
1110 | #: builtin/checkout.c:696 | |
1111 | msgid "Previous HEAD position was" | |
1112 | msgstr "之前的 HEAD 位置是" | |
1113 | ||
1114 | #: builtin/checkout.c:722 | |
1115 | msgid "You are on a branch yet to be born" | |
90e6ef53 | 1116 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 JX |
1117 | |
1118 | #. case (1) | |
1119 | #: builtin/checkout.c:853 | |
1120 | #, c-format | |
1121 | msgid "invalid reference: %s" | |
1122 | msgstr "无效引用:%s" | |
1123 | ||
1124 | #. case (1): want a tree | |
1125 | #: builtin/checkout.c:892 | |
1126 | #, c-format | |
1127 | msgid "reference is not a tree: %s" | |
1128 | msgstr "引用不是一个树:%s" | |
1129 | ||
7ac1c0ad | 1130 | #: builtin/checkout.c:972 |
c04f5ac3 JX |
1131 | msgid "-B cannot be used with -b" |
1132 | msgstr "-B 不能和 -b 共用" | |
1133 | ||
7ac1c0ad | 1134 | #: builtin/checkout.c:981 |
c04f5ac3 JX |
1135 | msgid "--patch is incompatible with all other options" |
1136 | msgstr "--patch 选项和其他选项不兼容" | |
1137 | ||
7ac1c0ad | 1138 | #: builtin/checkout.c:984 |
c04f5ac3 JX |
1139 | msgid "--detach cannot be used with -b/-B/--orphan" |
1140 | msgstr "--detach 不能和 -b/-B/--orphan 共用" | |
1141 | ||
7ac1c0ad | 1142 | #: builtin/checkout.c:986 |
c04f5ac3 JX |
1143 | msgid "--detach cannot be used with -t" |
1144 | msgstr "--detach 不能和 -t 共用" | |
1145 | ||
7ac1c0ad | 1146 | #: builtin/checkout.c:992 |
c04f5ac3 JX |
1147 | msgid "--track needs a branch name" |
1148 | msgstr "--track 需要一个分支名" | |
1149 | ||
7ac1c0ad | 1150 | #: builtin/checkout.c:999 |
c04f5ac3 JX |
1151 | msgid "Missing branch name; try -b" |
1152 | msgstr "缺少分支名;尝试 -b" | |
1153 | ||
7ac1c0ad | 1154 | #: builtin/checkout.c:1005 |
c04f5ac3 JX |
1155 | msgid "--orphan and -b|-B are mutually exclusive" |
1156 | msgstr "--orphan 和 -b|-B 互斥" | |
1157 | ||
7ac1c0ad | 1158 | #: builtin/checkout.c:1007 |
c04f5ac3 JX |
1159 | msgid "--orphan cannot be used with -t" |
1160 | msgstr "--orphan 不能和 -t 共用" | |
1161 | ||
7ac1c0ad | 1162 | #: builtin/checkout.c:1017 |
c04f5ac3 | 1163 | msgid "git checkout: -f and -m are incompatible" |
90e6ef53 | 1164 | msgstr "git checkout:-f 和 -m 不兼容" |
c04f5ac3 | 1165 | |
7ac1c0ad | 1166 | #: builtin/checkout.c:1051 |
c04f5ac3 | 1167 | msgid "invalid path specification" |
90e6ef53 | 1168 | msgstr "无效的路径规格" |
c04f5ac3 | 1169 | |
7ac1c0ad | 1170 | #: builtin/checkout.c:1059 |
c04f5ac3 JX |
1171 | #, c-format |
1172 | msgid "" | |
1173 | "git checkout: updating paths is incompatible with switching branches.\n" | |
1174 | "Did you intend to checkout '%s' which can not be resolved as commit?" | |
1175 | msgstr "" | |
90e6ef53 | 1176 | "git checkout:更新路径和切换分支不兼容。\n" |
c04f5ac3 JX |
1177 | "您是想要检出 '%s' 但未能将其解析为提交么?" |
1178 | ||
7ac1c0ad | 1179 | #: builtin/checkout.c:1061 |
c04f5ac3 | 1180 | msgid "git checkout: updating paths is incompatible with switching branches." |
90e6ef53 | 1181 | msgstr "git checkout:更新路径和切换分支不兼容。" |
c04f5ac3 | 1182 | |
7ac1c0ad | 1183 | #: builtin/checkout.c:1066 |
c04f5ac3 | 1184 | msgid "git checkout: --detach does not take a path argument" |
90e6ef53 | 1185 | msgstr "git checkout:--detach 不跟路径参数" |
c04f5ac3 | 1186 | |
7ac1c0ad | 1187 | #: builtin/checkout.c:1069 |
c04f5ac3 JX |
1188 | msgid "" |
1189 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
1190 | "checking out of the index." | |
1191 | msgstr "" | |
90e6ef53 | 1192 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 1193 | |
7ac1c0ad | 1194 | #: builtin/checkout.c:1088 |
c04f5ac3 JX |
1195 | msgid "Cannot switch branch to a non-commit." |
1196 | msgstr "无法切换分支到一个非提交。" | |
1197 | ||
7ac1c0ad | 1198 | #: builtin/checkout.c:1091 |
c04f5ac3 JX |
1199 | msgid "--ours/--theirs is incompatible with switching branches." |
1200 | msgstr "--ours/--theirs 和切换分支不兼容。" | |
1201 | ||
1202 | #: builtin/clean.c:78 | |
1203 | msgid "-x and -X cannot be used together" | |
1204 | msgstr "-x 和 -X 不能共用" | |
1205 | ||
1206 | #: builtin/clean.c:82 | |
1207 | msgid "" | |
1208 | "clean.requireForce set to true and neither -n nor -f given; refusing to clean" | |
1209 | msgstr "" | |
90e6ef53 | 1210 | "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 JX |
1211 | |
1212 | #: builtin/clean.c:85 | |
1213 | msgid "" | |
1214 | "clean.requireForce defaults to true and neither -n nor -f given; refusing to " | |
1215 | "clean" | |
1216 | msgstr "" | |
90e6ef53 | 1217 | "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 JX |
1218 | |
1219 | #: builtin/clean.c:155 builtin/clean.c:176 | |
1220 | #, c-format | |
1221 | msgid "Would remove %s\n" | |
1222 | msgstr "将删除 %s\n" | |
1223 | ||
1224 | #: builtin/clean.c:159 builtin/clean.c:179 | |
1225 | #, c-format | |
1226 | msgid "Removing %s\n" | |
1227 | msgstr "正删除 %s\n" | |
1228 | ||
1229 | #: builtin/clean.c:162 builtin/clean.c:182 | |
1230 | #, c-format | |
1231 | msgid "failed to remove %s" | |
1232 | msgstr "无法删除 %s" | |
1233 | ||
1234 | #: builtin/clean.c:166 | |
1235 | #, c-format | |
1236 | msgid "Would not remove %s\n" | |
1237 | msgstr "不会删除 %s\n" | |
1238 | ||
1239 | #: builtin/clean.c:168 | |
1240 | #, c-format | |
1241 | msgid "Not removing %s\n" | |
1242 | msgstr "未删除 %s\n" | |
1243 | ||
7ac1c0ad | 1244 | #: builtin/clone.c:243 |
c04f5ac3 JX |
1245 | #, c-format |
1246 | msgid "reference repository '%s' is not a local directory." | |
1247 | msgstr "引用版本库 '%s' 不是一个本地目录。" | |
1248 | ||
7ac1c0ad | 1249 | #: builtin/clone.c:302 |
c04f5ac3 JX |
1250 | #, c-format |
1251 | msgid "failed to open '%s'" | |
90e6ef53 | 1252 | msgstr "无法打开 '%s'" |
c04f5ac3 | 1253 | |
7ac1c0ad | 1254 | #: builtin/clone.c:306 |
c04f5ac3 JX |
1255 | #, c-format |
1256 | msgid "failed to create directory '%s'" | |
90e6ef53 | 1257 | msgstr "无法创建目录 '%s'" |
c04f5ac3 | 1258 | |
7ac1c0ad | 1259 | #: builtin/clone.c:308 builtin/diff.c:75 |
c04f5ac3 JX |
1260 | #, c-format |
1261 | msgid "failed to stat '%s'" | |
90e6ef53 | 1262 | msgstr "无法枚举 '%s' 状态" |
c04f5ac3 | 1263 | |
7ac1c0ad | 1264 | #: builtin/clone.c:310 |
c04f5ac3 JX |
1265 | #, c-format |
1266 | msgid "%s exists and is not a directory" | |
1267 | msgstr "%s 存在且不是一个目录" | |
1268 | ||
7ac1c0ad | 1269 | #: builtin/clone.c:324 |
c04f5ac3 JX |
1270 | #, c-format |
1271 | msgid "failed to stat %s\n" | |
90e6ef53 | 1272 | msgstr "无法枚举 %s 状态\n" |
c04f5ac3 | 1273 | |
7ac1c0ad | 1274 | #: builtin/clone.c:341 |
c04f5ac3 JX |
1275 | #, c-format |
1276 | msgid "failed to unlink '%s'" | |
90e6ef53 | 1277 | msgstr "无法删除 '%s'" |
c04f5ac3 | 1278 | |
7ac1c0ad | 1279 | #: builtin/clone.c:346 |
c04f5ac3 JX |
1280 | #, c-format |
1281 | msgid "failed to create link '%s'" | |
90e6ef53 | 1282 | msgstr "无法创建链接 '%s'" |
c04f5ac3 | 1283 | |
7ac1c0ad | 1284 | #: builtin/clone.c:350 |
c04f5ac3 JX |
1285 | #, c-format |
1286 | msgid "failed to copy file to '%s'" | |
90e6ef53 | 1287 | msgstr "无法拷贝文件至 '%s'" |
c04f5ac3 | 1288 | |
7ac1c0ad | 1289 | #: builtin/clone.c:373 |
c04f5ac3 JX |
1290 | #, c-format |
1291 | msgid "done.\n" | |
1292 | msgstr "完成。\n" | |
1293 | ||
7ac1c0ad | 1294 | #: builtin/clone.c:440 |
c04f5ac3 JX |
1295 | #, c-format |
1296 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 1297 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 1298 | |
7ac1c0ad | 1299 | #: builtin/clone.c:549 |
c04f5ac3 JX |
1300 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
1301 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
1302 | ||
7ac1c0ad | 1303 | #: builtin/clone.c:639 |
c04f5ac3 JX |
1304 | msgid "Too many arguments." |
1305 | msgstr "太多参数。" | |
1306 | ||
7ac1c0ad | 1307 | #: builtin/clone.c:643 |
c04f5ac3 | 1308 | msgid "You must specify a repository to clone." |
90e6ef53 | 1309 | msgstr "您必须指定一个版本库来克隆。" |
c04f5ac3 | 1310 | |
7ac1c0ad | 1311 | #: builtin/clone.c:654 |
c04f5ac3 JX |
1312 | #, c-format |
1313 | msgid "--bare and --origin %s options are incompatible." | |
1314 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
1315 | ||
7ac1c0ad | 1316 | #: builtin/clone.c:668 |
c04f5ac3 JX |
1317 | #, c-format |
1318 | msgid "repository '%s' does not exist" | |
1319 | msgstr "版本库 '%s' 不存在" | |
1320 | ||
7ac1c0ad | 1321 | #: builtin/clone.c:673 |
c04f5ac3 JX |
1322 | msgid "--depth is ignored in local clones; use file:// instead." |
1323 | msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。" | |
1324 | ||
7ac1c0ad | 1325 | #: builtin/clone.c:683 |
c04f5ac3 JX |
1326 | #, c-format |
1327 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 1328 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 1329 | |
7ac1c0ad | 1330 | #: builtin/clone.c:693 |
c04f5ac3 JX |
1331 | #, c-format |
1332 | msgid "working tree '%s' already exists." | |
1333 | msgstr "工作区 '%s' 已经存在。" | |
1334 | ||
7ac1c0ad | 1335 | #: builtin/clone.c:706 builtin/clone.c:720 |
c04f5ac3 JX |
1336 | #, c-format |
1337 | msgid "could not create leading directories of '%s'" | |
90e6ef53 | 1338 | msgstr "不能为 '%s' 创建先导目录" |
c04f5ac3 | 1339 | |
7ac1c0ad | 1340 | #: builtin/clone.c:709 |
c04f5ac3 JX |
1341 | #, c-format |
1342 | msgid "could not create work tree dir '%s'." | |
90e6ef53 | 1343 | msgstr "不能为 '%s' 创建工作区目录。" |
c04f5ac3 | 1344 | |
7ac1c0ad | 1345 | #: builtin/clone.c:728 |
c04f5ac3 JX |
1346 | #, c-format |
1347 | msgid "Cloning into bare repository '%s'...\n" | |
1348 | msgstr "克隆到裸版本库 '%s'...\n" | |
1349 | ||
7ac1c0ad | 1350 | #: builtin/clone.c:730 |
c04f5ac3 JX |
1351 | #, c-format |
1352 | msgid "Cloning into '%s'...\n" | |
1353 | msgstr "正克隆到 '%s'...\n" | |
1354 | ||
7ac1c0ad | 1355 | #: builtin/clone.c:786 |
c04f5ac3 JX |
1356 | #, c-format |
1357 | msgid "Don't know how to clone %s" | |
1358 | msgstr "不知道如何克隆 %s" | |
1359 | ||
7ac1c0ad | 1360 | #: builtin/clone.c:835 |
c04f5ac3 JX |
1361 | #, c-format |
1362 | msgid "Remote branch %s not found in upstream %s" | |
1363 | msgstr "远程分支 %s 在上游 %s 未发现" | |
1364 | ||
7ac1c0ad | 1365 | #: builtin/clone.c:842 |
c04f5ac3 JX |
1366 | msgid "You appear to have cloned an empty repository." |
1367 | msgstr "您似乎克隆了一个空版本库。" | |
1368 | ||
1369 | #: builtin/commit.c:42 | |
1370 | msgid "" | |
1371 | "Your name and email address were configured automatically based\n" | |
1372 | "on your username and hostname. Please check that they are accurate.\n" | |
1373 | "You can suppress this message by setting them explicitly:\n" | |
1374 | "\n" | |
1375 | " git config --global user.name \"Your Name\"\n" | |
1376 | " git config --global user.email you@example.com\n" | |
1377 | "\n" | |
1378 | "After doing this, you may fix the identity used for this commit with:\n" | |
1379 | "\n" | |
1380 | " git commit --amend --reset-author\n" | |
1381 | msgstr "" | |
90e6ef53 JX |
1382 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" |
1383 | "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n" | |
c04f5ac3 JX |
1384 | "\n" |
1385 | " git config --global user.name \"Your Name\"\n" | |
1386 | " git config --global user.email you@example.com\n" | |
1387 | "\n" | |
90e6ef53 | 1388 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" |
c04f5ac3 JX |
1389 | "\n" |
1390 | " git commit --amend --reset-author\n" | |
1391 | ||
1392 | #: builtin/commit.c:54 | |
1393 | msgid "" | |
1394 | "You asked to amend the most recent commit, but doing so would make\n" | |
1395 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
1396 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
1397 | msgstr "" | |
1b150dc9 T |
1398 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
1399 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 JX |
1400 | |
1401 | #: builtin/commit.c:59 | |
1402 | msgid "" | |
1403 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
1404 | "If you wish to commit it anyway, use:\n" | |
1405 | "\n" | |
1406 | " git commit --allow-empty\n" | |
1407 | "\n" | |
1408 | "Otherwise, please use 'git reset'\n" | |
1409 | msgstr "" | |
a9ce4543 T |
1410 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
1411 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
1412 | "\n" |
1413 | " git commit --allow-empty\n" | |
1414 | "\n" | |
a9ce4543 | 1415 | "否则,请使用命令 'git reset'\n" |
c04f5ac3 JX |
1416 | |
1417 | #: builtin/commit.c:205 builtin/reset.c:33 | |
1418 | msgid "merge" | |
1419 | msgstr "合并" | |
1420 | ||
1421 | #: builtin/commit.c:208 | |
1422 | msgid "cherry-pick" | |
1423 | msgstr "拣选" | |
1424 | ||
1425 | #: builtin/commit.c:325 | |
1426 | msgid "failed to unpack HEAD tree object" | |
90e6ef53 | 1427 | msgstr "无法解包 HEAD 树对象" |
c04f5ac3 JX |
1428 | |
1429 | #: builtin/commit.c:367 | |
1430 | msgid "unable to create temporary index" | |
90e6ef53 | 1431 | msgstr "不能创建临时索引" |
c04f5ac3 JX |
1432 | |
1433 | #: builtin/commit.c:373 | |
1434 | msgid "interactive add failed" | |
1435 | msgstr "交互式添加失败" | |
1436 | ||
1437 | #: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473 | |
1438 | msgid "unable to write new_index file" | |
90e6ef53 | 1439 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 1440 | |
90e6ef53 | 1441 | # 译者:%s若翻为中文,前后不需要空格 |
c04f5ac3 JX |
1442 | #: builtin/commit.c:457 |
1443 | #, c-format | |
1444 | msgid "cannot do a partial commit during a %s." | |
1445 | msgstr "在%s过程中不能做部分提交。" | |
1446 | ||
1447 | #: builtin/commit.c:466 | |
1448 | msgid "cannot read the index" | |
90e6ef53 | 1449 | msgstr "无法读取索引" |
c04f5ac3 JX |
1450 | |
1451 | #: builtin/commit.c:486 | |
1452 | msgid "unable to write temporary index file" | |
90e6ef53 | 1453 | msgstr "无法写临时索引文件" |
c04f5ac3 | 1454 | |
73a60cd2 | 1455 | #: builtin/commit.c:561 builtin/commit.c:567 |
c04f5ac3 JX |
1456 | #, c-format |
1457 | msgid "invalid commit: %s" | |
1458 | msgstr "无效的提交:%s" | |
1459 | ||
73a60cd2 | 1460 | #: builtin/commit.c:590 |
c04f5ac3 JX |
1461 | msgid "malformed --author parameter" |
1462 | msgstr "非法的 --author 参数" | |
1463 | ||
73a60cd2 | 1464 | #: builtin/commit.c:651 |
c04f5ac3 JX |
1465 | #, c-format |
1466 | msgid "Malformed ident string: '%s'" | |
90e6ef53 | 1467 | msgstr "非法的身份字符串:'%s'" |
c04f5ac3 | 1468 | |
73a60cd2 | 1469 | #: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033 |
c04f5ac3 JX |
1470 | #, c-format |
1471 | msgid "could not lookup commit %s" | |
1472 | msgstr "不能查询提交 %s" | |
1473 | ||
73a60cd2 | 1474 | #: builtin/commit.c:701 builtin/shortlog.c:296 |
c04f5ac3 JX |
1475 | #, c-format |
1476 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 1477 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 1478 | |
73a60cd2 | 1479 | #: builtin/commit.c:703 |
c04f5ac3 | 1480 | msgid "could not read log from standard input" |
90e6ef53 | 1481 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 1482 | |
73a60cd2 | 1483 | #: builtin/commit.c:707 |
c04f5ac3 JX |
1484 | #, c-format |
1485 | msgid "could not read log file '%s'" | |
90e6ef53 | 1486 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 1487 | |
73a60cd2 | 1488 | #: builtin/commit.c:713 |
c04f5ac3 JX |
1489 | msgid "commit has empty message" |
1490 | msgstr "提交说明为空" | |
1491 | ||
73a60cd2 | 1492 | #: builtin/commit.c:729 |
c04f5ac3 | 1493 | msgid "could not read MERGE_MSG" |
90e6ef53 | 1494 | msgstr "不能读取 MERGE_MSG" |
c04f5ac3 | 1495 | |
73a60cd2 | 1496 | #: builtin/commit.c:733 |
c04f5ac3 | 1497 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 1498 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 1499 | |
73a60cd2 | 1500 | #: builtin/commit.c:737 |
c04f5ac3 JX |
1501 | #, c-format |
1502 | msgid "could not read '%s'" | |
90e6ef53 | 1503 | msgstr "不能读取 '%s'" |
c04f5ac3 | 1504 | |
73a60cd2 | 1505 | #: builtin/commit.c:765 |
c04f5ac3 JX |
1506 | #, c-format |
1507 | msgid "could not open '%s'" | |
90e6ef53 | 1508 | msgstr "不能打开 '%s'" |
c04f5ac3 | 1509 | |
73a60cd2 | 1510 | #: builtin/commit.c:789 |
c04f5ac3 | 1511 | msgid "could not write commit template" |
90e6ef53 | 1512 | msgstr "不能写提交模版" |
c04f5ac3 | 1513 | |
90e6ef53 | 1514 | # 译者:%s若翻为中文,前后不需要空格 |
73a60cd2 | 1515 | #: builtin/commit.c:799 |
c04f5ac3 JX |
1516 | #, c-format |
1517 | msgid "" | |
1518 | "\n" | |
1519 | "It looks like you may be committing a %s.\n" | |
1520 | "If this is not correct, please remove the file\n" | |
1521 | "\t%s\n" | |
1522 | "and try again.\n" | |
1523 | msgstr "" | |
1524 | "\n" | |
1525 | "看起来您正在提交一个%s。\n" | |
1526 | "如果不是这样,请删除文件\n" | |
1527 | "\t%s\n" | |
1528 | "然后重试。\n" | |
1529 | ||
73a60cd2 | 1530 | #: builtin/commit.c:812 |
c04f5ac3 JX |
1531 | msgid "Please enter the commit message for your changes." |
1532 | msgstr "请为您的修改输入提交说明。" | |
1533 | ||
7e238ab7 | 1534 | # 译者:中文字符串拼接,可删除前导空格 |
73a60cd2 | 1535 | #: builtin/commit.c:815 |
c04f5ac3 JX |
1536 | msgid "" |
1537 | " Lines starting\n" | |
1538 | "with '#' will be ignored, and an empty message aborts the commit.\n" | |
1539 | msgstr "" | |
2d0dc474 T |
1540 | "以 '#' 开头\n" |
1541 | "的行将被忽略,并且空的提交说明将会中止提交。\n" | |
c04f5ac3 | 1542 | |
7e238ab7 | 1543 | # 译者:中文字符串拼接,可删除前导空格 |
73a60cd2 | 1544 | #: builtin/commit.c:820 |
c04f5ac3 JX |
1545 | msgid "" |
1546 | " Lines starting\n" | |
1547 | "with '#' will be kept; you may remove them yourself if you want to.\n" | |
1548 | "An empty message aborts the commit.\n" | |
1549 | msgstr "" | |
2d0dc474 T |
1550 | "以 '#' 开头\n" |
1551 | "的行将被保留,您可以删除它们如果您想这样做的话。空的提交说明将会\n" | |
1552 | "中止提交。\n" | |
c04f5ac3 | 1553 | |
90e6ef53 | 1554 | # 译者:为保证在输出中对齐,注意调整句中空格! |
73a60cd2 | 1555 | #: builtin/commit.c:832 |
c04f5ac3 JX |
1556 | #, c-format |
1557 | msgid "%sAuthor: %s" | |
1558 | msgstr "%s作者: %s" | |
1559 | ||
90e6ef53 | 1560 | # 译者:为保证在输出中对齐,注意调整句中空格! |
73a60cd2 | 1561 | #: builtin/commit.c:839 |
c04f5ac3 JX |
1562 | #, c-format |
1563 | msgid "%sCommitter: %s" | |
1564 | msgstr "%s提交者: %s" | |
1565 | ||
73a60cd2 | 1566 | #: builtin/commit.c:859 |
c04f5ac3 | 1567 | msgid "Cannot read index" |
90e6ef53 | 1568 | msgstr "无法读取索引" |
c04f5ac3 | 1569 | |
73a60cd2 | 1570 | #: builtin/commit.c:896 |
c04f5ac3 JX |
1571 | msgid "Error building trees" |
1572 | msgstr "无法创建树对象" | |
1573 | ||
73a60cd2 | 1574 | #: builtin/commit.c:911 builtin/tag.c:357 |
c04f5ac3 JX |
1575 | #, c-format |
1576 | msgid "Please supply the message using either -m or -F option.\n" | |
90e6ef53 | 1577 | msgstr "请使用 -m 或者 -F 选项提供提交说明。\n" |
c04f5ac3 | 1578 | |
73a60cd2 | 1579 | #: builtin/commit.c:1008 |
c04f5ac3 JX |
1580 | #, c-format |
1581 | msgid "No existing author found with '%s'" | |
1582 | msgstr "没有找到匹配 '%s' 的作者" | |
1583 | ||
73a60cd2 | 1584 | #: builtin/commit.c:1023 builtin/commit.c:1217 |
c04f5ac3 JX |
1585 | #, c-format |
1586 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 1587 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 1588 | |
73a60cd2 | 1589 | #: builtin/commit.c:1063 |
c04f5ac3 JX |
1590 | msgid "Using both --reset-author and --author does not make sense" |
1591 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
1592 | ||
73a60cd2 | 1593 | #: builtin/commit.c:1074 |
c04f5ac3 | 1594 | msgid "You have nothing to amend." |
90e6ef53 | 1595 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 1596 | |
90e6ef53 | 1597 | # 译者:%s若翻为中文,前后不需要空格 |
73a60cd2 | 1598 | #: builtin/commit.c:1076 |
c04f5ac3 JX |
1599 | #, c-format |
1600 | msgid "You are in the middle of a %s -- cannot amend." | |
90e6ef53 | 1601 | msgstr "您正处于一个%s的过程中 -- 无法修补提交。" |
c04f5ac3 | 1602 | |
73a60cd2 | 1603 | #: builtin/commit.c:1078 |
c04f5ac3 JX |
1604 | msgid "Options --squash and --fixup cannot be used together" |
1605 | msgstr "选项 --squash 和 --fixup 不能共用" | |
1606 | ||
73a60cd2 | 1607 | #: builtin/commit.c:1088 |
c04f5ac3 JX |
1608 | msgid "Only one of -c/-C/-F/--fixup can be used." |
1609 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
1610 | ||
73a60cd2 | 1611 | #: builtin/commit.c:1090 |
c04f5ac3 JX |
1612 | msgid "Option -m cannot be combined with -c/-C/-F/--fixup." |
1613 | msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。" | |
1614 | ||
73a60cd2 | 1615 | #: builtin/commit.c:1098 |
c04f5ac3 | 1616 | msgid "--reset-author can be used only with -C, -c or --amend." |
90e6ef53 | 1617 | msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。" |
c04f5ac3 | 1618 | |
73a60cd2 | 1619 | #: builtin/commit.c:1115 |
c04f5ac3 JX |
1620 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
1621 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
1622 | ||
73a60cd2 | 1623 | #: builtin/commit.c:1117 |
c04f5ac3 JX |
1624 | msgid "No paths with --include/--only does not make sense." |
1625 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
1626 | ||
73a60cd2 | 1627 | #: builtin/commit.c:1119 |
c04f5ac3 | 1628 | msgid "Clever... amending the last one with dirty index." |
90e6ef53 | 1629 | msgstr "聪明... 在索引不干净下修补最后的提交。" |
c04f5ac3 | 1630 | |
73a60cd2 | 1631 | #: builtin/commit.c:1121 |
c04f5ac3 | 1632 | msgid "Explicit paths specified without -i nor -o; assuming --only paths..." |
90e6ef53 | 1633 | msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..." |
c04f5ac3 | 1634 | |
73a60cd2 | 1635 | #: builtin/commit.c:1131 builtin/tag.c:556 |
c04f5ac3 JX |
1636 | #, c-format |
1637 | msgid "Invalid cleanup mode %s" | |
1638 | msgstr "无效的清理模式 %s" | |
1639 | ||
73a60cd2 | 1640 | #: builtin/commit.c:1136 |
c04f5ac3 JX |
1641 | msgid "Paths with -a does not make sense." |
1642 | msgstr "路径和 -a 选项共用没有意义。" | |
1643 | ||
73a60cd2 | 1644 | #: builtin/commit.c:1315 |
c04f5ac3 JX |
1645 | msgid "couldn't look up newly created commit" |
1646 | msgstr "无法找到新创建的提交" | |
1647 | ||
73a60cd2 | 1648 | #: builtin/commit.c:1317 |
c04f5ac3 | 1649 | msgid "could not parse newly created commit" |
90e6ef53 | 1650 | msgstr "不能解析新创建的提交" |
c04f5ac3 | 1651 | |
73a60cd2 | 1652 | #: builtin/commit.c:1358 |
c04f5ac3 JX |
1653 | msgid "detached HEAD" |
1654 | msgstr "分离头指针" | |
1655 | ||
7e238ab7 | 1656 | # 译者:中文字符串拼接,可删除前导空格 |
73a60cd2 | 1657 | #: builtin/commit.c:1360 |
c04f5ac3 | 1658 | msgid " (root-commit)" |
7e238ab7 | 1659 | msgstr "(根提交)" |
c04f5ac3 | 1660 | |
73a60cd2 | 1661 | #: builtin/commit.c:1450 |
c04f5ac3 | 1662 | msgid "could not parse HEAD commit" |
90e6ef53 | 1663 | msgstr "不能解析 HEAD 提交" |
c04f5ac3 | 1664 | |
73a60cd2 | 1665 | #: builtin/commit.c:1487 builtin/merge.c:509 |
c04f5ac3 JX |
1666 | #, c-format |
1667 | msgid "could not open '%s' for reading" | |
90e6ef53 | 1668 | msgstr "不能为读入打开 '%s'" |
c04f5ac3 | 1669 | |
73a60cd2 | 1670 | #: builtin/commit.c:1494 |
c04f5ac3 JX |
1671 | #, c-format |
1672 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 1673 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 1674 | |
73a60cd2 | 1675 | #: builtin/commit.c:1501 |
c04f5ac3 | 1676 | msgid "could not read MERGE_MODE" |
90e6ef53 | 1677 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 1678 | |
73a60cd2 | 1679 | #: builtin/commit.c:1520 |
c04f5ac3 JX |
1680 | #, c-format |
1681 | msgid "could not read commit message: %s" | |
90e6ef53 | 1682 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 1683 | |
73a60cd2 JX |
1684 | #: builtin/commit.c:1534 |
1685 | #, c-format | |
1686 | msgid "Aborting commit; you did not edit the message.\n" | |
1687 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
1688 | ||
1689 | #: builtin/commit.c:1539 | |
c04f5ac3 JX |
1690 | #, c-format |
1691 | msgid "Aborting commit due to empty commit message.\n" | |
1692 | msgstr "终止提交因为提交说明为空。\n" | |
1693 | ||
73a60cd2 | 1694 | #: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:968 |
c04f5ac3 | 1695 | msgid "failed to write commit object" |
90e6ef53 | 1696 | msgstr "无法写提交对象" |
c04f5ac3 | 1697 | |
73a60cd2 | 1698 | #: builtin/commit.c:1575 |
c04f5ac3 JX |
1699 | msgid "cannot lock HEAD ref" |
1700 | msgstr "无法锁定 HEAD 引用" | |
1701 | ||
73a60cd2 | 1702 | #: builtin/commit.c:1579 |
c04f5ac3 JX |
1703 | msgid "cannot update HEAD ref" |
1704 | msgstr "无法更新 HEAD 引用" | |
1705 | ||
73a60cd2 | 1706 | #: builtin/commit.c:1590 |
c04f5ac3 JX |
1707 | msgid "" |
1708 | "Repository has been updated, but unable to write\n" | |
1709 | "new_index file. Check that disk is not full or quota is\n" | |
1710 | "not exceeded, and then \"git reset HEAD\" to recover." | |
1711 | msgstr "" | |
90e6ef53 JX |
1712 | "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" |
1713 | "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" | |
c04f5ac3 JX |
1714 | |
1715 | #: builtin/describe.c:234 | |
1716 | #, c-format | |
1717 | msgid "annotated tag %s not available" | |
1718 | msgstr "注释 tag %s 无效" | |
1719 | ||
1720 | #: builtin/describe.c:238 | |
1721 | #, c-format | |
1722 | msgid "annotated tag %s has no embedded name" | |
1723 | msgstr "注释 tag %s 没有嵌入名称" | |
1724 | ||
1725 | #: builtin/describe.c:240 | |
1726 | #, c-format | |
1727 | msgid "tag '%s' is really '%s' here" | |
90e6ef53 | 1728 | msgstr "tag '%s' 的确是在 '%s'" |
c04f5ac3 JX |
1729 | |
1730 | #: builtin/describe.c:267 | |
1731 | #, c-format | |
1732 | msgid "Not a valid object name %s" | |
1733 | msgstr "不是一个有效的对象名 %s" | |
1734 | ||
1735 | #: builtin/describe.c:270 | |
1736 | #, c-format | |
1737 | msgid "%s is not a valid '%s' object" | |
1738 | msgstr "%s 不是一个有效的 '%s' 对象" | |
1739 | ||
1740 | #: builtin/describe.c:287 | |
1741 | #, c-format | |
1742 | msgid "no tag exactly matches '%s'" | |
1743 | msgstr "没有 tag 准确匹配 '%s'" | |
1744 | ||
1745 | #: builtin/describe.c:289 | |
1746 | #, c-format | |
1747 | msgid "searching to describe %s\n" | |
1748 | msgstr "搜索描述 %s\n" | |
1749 | ||
1750 | #: builtin/describe.c:329 | |
1751 | #, c-format | |
1752 | msgid "finished search at %s\n" | |
1753 | msgstr "完成搜索 %s\n" | |
1754 | ||
1755 | #: builtin/describe.c:353 | |
1756 | #, c-format | |
1757 | msgid "" | |
1758 | "No annotated tags can describe '%s'.\n" | |
1759 | "However, there were unannotated tags: try --tags." | |
1760 | msgstr "" | |
1761 | "没有注释 tag 能描述 '%s'。\n" | |
1762 | "然而,有非注释 tag:尝试 --tags。" | |
1763 | ||
1764 | #: builtin/describe.c:357 | |
1765 | #, c-format | |
1766 | msgid "" | |
1767 | "No tags can describe '%s'.\n" | |
1768 | "Try --always, or create some tags." | |
1769 | msgstr "" | |
1770 | "没有注释 tag 能描述 '%s'。\n" | |
90e6ef53 | 1771 | "尝试 --always,或者创建一些 tag。" |
c04f5ac3 JX |
1772 | |
1773 | #: builtin/describe.c:378 | |
1774 | #, c-format | |
1775 | msgid "traversed %lu commits\n" | |
1776 | msgstr "已遍历 %lu 个提交\n" | |
1777 | ||
1778 | #: builtin/describe.c:381 | |
1779 | #, c-format | |
1780 | msgid "" | |
1781 | "more than %i tags found; listed %i most recent\n" | |
1782 | "gave up search at %s\n" | |
1783 | msgstr "" | |
90e6ef53 JX |
1784 | "发现多于 %i 个 tag,列出最近的 %i 个\n" |
1785 | "在 %s 放弃搜索\n" | |
c04f5ac3 JX |
1786 | |
1787 | #: builtin/describe.c:436 | |
1788 | msgid "--long is incompatible with --abbrev=0" | |
1789 | msgstr "--long 与 --abbrev=0 不兼容" | |
1790 | ||
1791 | #: builtin/describe.c:462 | |
1792 | msgid "No names found, cannot describe anything." | |
90e6ef53 | 1793 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 JX |
1794 | |
1795 | #: builtin/describe.c:482 | |
1796 | msgid "--dirty is incompatible with committishes" | |
1797 | msgstr "--dirty 不能与提交共用" | |
1798 | ||
1799 | #: builtin/diff.c:77 | |
1800 | #, c-format | |
1801 | msgid "'%s': not a regular file or symlink" | |
1802 | msgstr "'%s':不是一个正规文件或符号链接" | |
1803 | ||
1804 | #: builtin/diff.c:220 | |
1805 | #, c-format | |
1806 | msgid "invalid option: %s" | |
1807 | msgstr "无效选项:%s" | |
1808 | ||
14c8bced | 1809 | #: builtin/diff.c:297 |
c04f5ac3 JX |
1810 | msgid "Not a git repository" |
1811 | msgstr "不是一个 git 版本库" | |
1812 | ||
14c8bced | 1813 | #: builtin/diff.c:347 |
c04f5ac3 JX |
1814 | #, c-format |
1815 | msgid "invalid object '%s' given." | |
1816 | msgstr "提供了无效对象 '%s'。" | |
1817 | ||
14c8bced | 1818 | #: builtin/diff.c:352 |
c04f5ac3 JX |
1819 | #, c-format |
1820 | msgid "more than %d trees given: '%s'" | |
1821 | msgstr "提供了超过 %d 个树对象:'%s'" | |
1822 | ||
14c8bced | 1823 | #: builtin/diff.c:362 |
c04f5ac3 JX |
1824 | #, c-format |
1825 | msgid "more than two blobs given: '%s'" | |
1826 | msgstr "提供了超过两个 blob 对象:'%s'" | |
1827 | ||
14c8bced | 1828 | #: builtin/diff.c:370 |
c04f5ac3 JX |
1829 | #, c-format |
1830 | msgid "unhandled object '%s' given." | |
1831 | msgstr "提供了无法处理的对象 '%s'。" | |
1832 | ||
1833 | #: builtin/fetch.c:200 | |
1834 | msgid "Couldn't find remote ref HEAD" | |
1835 | msgstr "无法发现远程 HEAD 引用" | |
1836 | ||
1837 | #: builtin/fetch.c:252 | |
1838 | #, c-format | |
1839 | msgid "object %s not found" | |
1840 | msgstr "对象 %s 未发现" | |
1841 | ||
1842 | #: builtin/fetch.c:258 | |
1843 | msgid "[up to date]" | |
1844 | msgstr "[最新]" | |
1845 | ||
1846 | #: builtin/fetch.c:272 | |
1847 | #, c-format | |
1848 | msgid "! %-*s %-*s -> %s (can't fetch in current branch)" | |
1849 | msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)" | |
1850 | ||
1851 | #: builtin/fetch.c:273 builtin/fetch.c:351 | |
1852 | msgid "[rejected]" | |
1853 | msgstr "[已拒绝]" | |
1854 | ||
1855 | #: builtin/fetch.c:284 | |
1856 | msgid "[tag update]" | |
1857 | msgstr "[tag更新]" | |
1858 | ||
90e6ef53 | 1859 | # 译者:注意保持前导空格 |
c04f5ac3 JX |
1860 | #: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331 |
1861 | msgid " (unable to update local ref)" | |
1862 | msgstr " (不能更新本地引用)" | |
1863 | ||
1864 | #: builtin/fetch.c:298 | |
1865 | msgid "[new tag]" | |
1866 | msgstr "[新tag]" | |
1867 | ||
1868 | #: builtin/fetch.c:302 | |
1869 | msgid "[new branch]" | |
1870 | msgstr "[新分支]" | |
1871 | ||
1872 | #: builtin/fetch.c:347 | |
1873 | msgid "unable to update local ref" | |
1874 | msgstr "不能更新本地引用" | |
1875 | ||
1876 | #: builtin/fetch.c:347 | |
1877 | msgid "forced update" | |
1878 | msgstr "强制更新" | |
1879 | ||
1880 | #: builtin/fetch.c:353 | |
1881 | msgid "(non-fast-forward)" | |
90e6ef53 | 1882 | msgstr "(非快进式)" |
c04f5ac3 JX |
1883 | |
1884 | #: builtin/fetch.c:384 builtin/fetch.c:676 | |
1885 | #, c-format | |
1886 | msgid "cannot open %s: %s\n" | |
1887 | msgstr "无法打开 %s:%s\n" | |
1888 | ||
1889 | #: builtin/fetch.c:393 | |
1890 | #, c-format | |
1891 | msgid "%s did not send all necessary objects\n" | |
1892 | msgstr "%s 未发送所有必须的对象\n" | |
1893 | ||
1894 | #: builtin/fetch.c:479 | |
1895 | #, c-format | |
1896 | msgid "From %.*s\n" | |
1897 | msgstr "来自 %.*s\n" | |
1898 | ||
1899 | #: builtin/fetch.c:490 | |
1900 | #, c-format | |
1901 | msgid "" | |
1902 | "some local refs could not be updated; try running\n" | |
1903 | " 'git remote prune %s' to remove any old, conflicting branches" | |
1904 | msgstr "" | |
1905 | "一些本地引用不能被更新;尝试运行\n" | |
1906 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
1907 | ||
90e6ef53 | 1908 | # 译者:注意保持前导空格 |
c04f5ac3 JX |
1909 | #: builtin/fetch.c:540 |
1910 | #, c-format | |
1911 | msgid " (%s will become dangling)\n" | |
1912 | msgstr " (%s 将成为悬空状态)\n" | |
1913 | ||
90e6ef53 | 1914 | # 译者:注意保持前导空格 |
c04f5ac3 JX |
1915 | #: builtin/fetch.c:541 |
1916 | #, c-format | |
1917 | msgid " (%s has become dangling)\n" | |
1918 | msgstr " (%s 已成为悬空状态)\n" | |
1919 | ||
1920 | #: builtin/fetch.c:548 | |
1921 | msgid "[deleted]" | |
1922 | msgstr "[已删除]" | |
1923 | ||
1924 | #: builtin/fetch.c:549 | |
1925 | msgid "(none)" | |
1926 | msgstr "(无)" | |
1927 | ||
1928 | #: builtin/fetch.c:666 | |
1929 | #, c-format | |
1930 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
1931 | msgstr "拒绝获取到非裸版本库的当前分支 %s" | |
1932 | ||
1933 | #: builtin/fetch.c:700 | |
1934 | #, c-format | |
1935 | msgid "Don't know how to fetch from %s" | |
1936 | msgstr "不知道如何从 %s 获取" | |
1937 | ||
1938 | #: builtin/fetch.c:777 | |
1939 | #, c-format | |
1940 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
1941 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
1942 | ||
1943 | #: builtin/fetch.c:780 | |
1944 | #, c-format | |
1945 | msgid "Option \"%s\" is ignored for %s\n" | |
1946 | msgstr "选项 \"%s\" 对于 %s 被忽略\n" | |
1947 | ||
1948 | #: builtin/fetch.c:879 | |
1949 | #, c-format | |
1950 | msgid "Fetching %s\n" | |
d4a8e00b | 1951 | msgstr "正在获取 %s\n" |
c04f5ac3 JX |
1952 | |
1953 | #: builtin/fetch.c:881 | |
1954 | #, c-format | |
1955 | msgid "Could not fetch %s" | |
1956 | msgstr "不能获取 %s" | |
1957 | ||
1958 | #: builtin/fetch.c:898 | |
1959 | msgid "" | |
1960 | "No remote repository specified. Please, specify either a URL or a\n" | |
1961 | "remote name from which new revisions should be fetched." | |
90e6ef53 | 1962 | msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。" |
c04f5ac3 JX |
1963 | |
1964 | #: builtin/fetch.c:918 | |
1965 | msgid "You need to specify a tag name." | |
90e6ef53 | 1966 | msgstr "您需要指定一个 tag 名称。" |
c04f5ac3 JX |
1967 | |
1968 | #: builtin/fetch.c:970 | |
1969 | msgid "fetch --all does not take a repository argument" | |
1970 | msgstr "fetch --all 不能带一个版本库参数" | |
1971 | ||
1972 | #: builtin/fetch.c:972 | |
1973 | msgid "fetch --all does not make sense with refspecs" | |
1974 | msgstr "fetch --all 带引用表达式没有任何意义" | |
1975 | ||
1976 | #: builtin/fetch.c:983 | |
1977 | #, c-format | |
1978 | msgid "No such remote or remote group: %s" | |
1979 | msgstr "没有这样的远程或远程组:%s" | |
1980 | ||
1981 | #: builtin/fetch.c:991 | |
1982 | msgid "Fetching a group and specifying refspecs does not make sense" | |
90e6ef53 | 1983 | msgstr "获取组并指定引用表达式没有意义" |
c04f5ac3 JX |
1984 | |
1985 | #: builtin/gc.c:63 | |
1986 | #, c-format | |
1987 | msgid "Invalid %s: '%s'" | |
1988 | msgstr "无效的 %s:'%s'" | |
1989 | ||
1990 | #: builtin/gc.c:78 | |
1991 | msgid "Too many options specified" | |
90e6ef53 | 1992 | msgstr "指定了太多的选项" |
c04f5ac3 JX |
1993 | |
1994 | #: builtin/gc.c:103 | |
1995 | #, c-format | |
1996 | msgid "insanely long object directory %.*s" | |
1997 | msgstr "不正常的长对象目录 %.*s" | |
1998 | ||
1999 | #: builtin/gc.c:223 | |
2000 | #, c-format | |
2001 | msgid "Auto packing the repository for optimum performance.\n" | |
2002 | msgstr "自动打包版本库以求最佳性能。\n" | |
2003 | ||
2004 | #: builtin/gc.c:226 | |
2005 | #, c-format | |
2006 | msgid "" | |
2007 | "Auto packing the repository for optimum performance. You may also\n" | |
2008 | "run \"git gc\" manually. See \"git help gc\" for more information.\n" | |
2009 | msgstr "" | |
90e6ef53 JX |
2010 | "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n" |
2011 | "参见 \"git help gc\" 以获取更多信息。\n" | |
c04f5ac3 JX |
2012 | |
2013 | #: builtin/gc.c:256 | |
2014 | msgid "" | |
2015 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 2016 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 2017 | |
7ac1c0ad | 2018 | #: builtin/grep.c:216 |
c04f5ac3 JX |
2019 | #, c-format |
2020 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 2021 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 2022 | |
7ac1c0ad | 2023 | #: builtin/grep.c:402 |
c04f5ac3 JX |
2024 | #, c-format |
2025 | msgid "Failed to chdir: %s" | |
2026 | msgstr "无法切换目录:%s" | |
2027 | ||
7ac1c0ad | 2028 | #: builtin/grep.c:478 builtin/grep.c:512 |
c04f5ac3 JX |
2029 | #, c-format |
2030 | msgid "unable to read tree (%s)" | |
90e6ef53 | 2031 | msgstr "无法读取树(%s)" |
c04f5ac3 | 2032 | |
7ac1c0ad | 2033 | #: builtin/grep.c:526 |
c04f5ac3 JX |
2034 | #, c-format |
2035 | msgid "unable to grep from object of type %s" | |
2036 | msgstr "无法抓取来自于 %s 类型的对象" | |
2037 | ||
7ac1c0ad | 2038 | #: builtin/grep.c:584 |
c04f5ac3 JX |
2039 | #, c-format |
2040 | msgid "switch `%c' expects a numerical value" | |
2041 | msgstr "开关 `%c' 期望一个数字值" | |
2042 | ||
7ac1c0ad | 2043 | #: builtin/grep.c:601 |
c04f5ac3 JX |
2044 | #, c-format |
2045 | msgid "cannot open '%s'" | |
2046 | msgstr "不能打开 '%s'" | |
2047 | ||
14c8bced | 2048 | #: builtin/grep.c:888 |
c04f5ac3 JX |
2049 | msgid "no pattern given." |
2050 | msgstr "未提供模式匹配。" | |
2051 | ||
14c8bced | 2052 | #: builtin/grep.c:902 |
c04f5ac3 JX |
2053 | #, c-format |
2054 | msgid "bad object %s" | |
2055 | msgstr "坏对象 %s" | |
2056 | ||
14c8bced | 2057 | #: builtin/grep.c:943 |
c04f5ac3 JX |
2058 | msgid "--open-files-in-pager only works on the worktree" |
2059 | msgstr "--open-files-in-pager 仅用于工作区" | |
2060 | ||
14c8bced | 2061 | #: builtin/grep.c:966 |
c04f5ac3 | 2062 | msgid "--cached or --untracked cannot be used with --no-index." |
90e6ef53 | 2063 | msgstr "--cached 或 --untracked 不能与 --no-index 共用。" |
c04f5ac3 | 2064 | |
14c8bced | 2065 | #: builtin/grep.c:971 |
c04f5ac3 JX |
2066 | msgid "--no-index or --untracked cannot be used with revs." |
2067 | msgstr "--no-index 或 --untracked 不能和版本共用。" | |
2068 | ||
14c8bced | 2069 | #: builtin/grep.c:974 |
c04f5ac3 | 2070 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
90e6ef53 | 2071 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" |
c04f5ac3 | 2072 | |
14c8bced | 2073 | #: builtin/grep.c:982 |
c04f5ac3 JX |
2074 | msgid "both --cached and trees are given." |
2075 | msgstr "同时给出了 --cached 和树对象。" | |
2076 | ||
2077 | #: builtin/init-db.c:35 | |
2078 | #, c-format | |
2079 | msgid "Could not make %s writable by group" | |
2080 | msgstr "不能设置 %s 为组可写" | |
2081 | ||
2082 | #: builtin/init-db.c:62 | |
2083 | #, c-format | |
2084 | msgid "insanely long template name %s" | |
2085 | msgstr "太长的模版名 %s" | |
2086 | ||
2087 | #: builtin/init-db.c:67 | |
2088 | #, c-format | |
2089 | msgid "cannot stat '%s'" | |
2090 | msgstr "不能枚举 '%s' 状态" | |
2091 | ||
2092 | #: builtin/init-db.c:73 | |
2093 | #, c-format | |
2094 | msgid "cannot stat template '%s'" | |
2095 | msgstr "不能枚举模版 '%s' 状态" | |
2096 | ||
2097 | #: builtin/init-db.c:80 | |
2098 | #, c-format | |
2099 | msgid "cannot opendir '%s'" | |
2100 | msgstr "不能打开目录 '%s'" | |
2101 | ||
2102 | #: builtin/init-db.c:97 | |
2103 | #, c-format | |
2104 | msgid "cannot readlink '%s'" | |
2105 | msgstr "不能读取链接 '%s'" | |
2106 | ||
2107 | #: builtin/init-db.c:99 | |
2108 | #, c-format | |
2109 | msgid "insanely long symlink %s" | |
2110 | msgstr "太长的符号链接 %s" | |
2111 | ||
2112 | #: builtin/init-db.c:102 | |
2113 | #, c-format | |
2114 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 2115 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 JX |
2116 | |
2117 | #: builtin/init-db.c:106 | |
2118 | #, c-format | |
2119 | msgid "cannot copy '%s' to '%s'" | |
2120 | msgstr "不能拷贝 '%s' 至 '%s'" | |
2121 | ||
2122 | #: builtin/init-db.c:110 | |
2123 | #, c-format | |
2124 | msgid "ignoring template %s" | |
2125 | msgstr "忽略模版 %s" | |
2126 | ||
2127 | #: builtin/init-db.c:133 | |
2128 | #, c-format | |
2129 | msgid "insanely long template path %s" | |
2130 | msgstr "太长的模版路径 %s" | |
2131 | ||
2132 | #: builtin/init-db.c:141 | |
2133 | #, c-format | |
2134 | msgid "templates not found %s" | |
2135 | msgstr "模版未找到 %s" | |
2136 | ||
2137 | #: builtin/init-db.c:154 | |
2138 | #, c-format | |
2139 | msgid "not copying templates of a wrong format version %d from '%s'" | |
2140 | msgstr "未复制错误版本 %d 的模版自 '%s'" | |
2141 | ||
2142 | #: builtin/init-db.c:192 | |
2143 | #, c-format | |
2144 | msgid "insane git directory %s" | |
2145 | msgstr "不正常的 git 目录 %s" | |
2146 | ||
2147 | #: builtin/init-db.c:322 builtin/init-db.c:325 | |
2148 | #, c-format | |
2149 | msgid "%s already exists" | |
2150 | msgstr "%s 已经存在" | |
2151 | ||
2152 | #: builtin/init-db.c:354 | |
2153 | #, c-format | |
2154 | msgid "unable to handle file type %d" | |
2155 | msgstr "不能处理 %d 类型的文件" | |
2156 | ||
2157 | #: builtin/init-db.c:357 | |
2158 | #, c-format | |
2159 | msgid "unable to move %s to %s" | |
2160 | msgstr "不能移动 %s 至 %s" | |
2161 | ||
2162 | #: builtin/init-db.c:362 | |
2163 | #, c-format | |
2164 | msgid "Could not create git link %s" | |
2165 | msgstr "不能创建 git link %s" | |
2166 | ||
2167 | #. | |
2168 | #. * TRANSLATORS: The first '%s' is either "Reinitialized | |
2169 | #. * existing" or "Initialized empty", the second " shared" or | |
2170 | #. * "", and the last '%s%s' is the verbatim directory name. | |
2171 | #. | |
2172 | #: builtin/init-db.c:419 | |
2173 | #, c-format | |
2174 | msgid "%s%s Git repository in %s%s\n" | |
2175 | msgstr "%s%s Git 版本库于 %s%s\n" | |
2176 | ||
2177 | #: builtin/init-db.c:420 | |
2178 | msgid "Reinitialized existing" | |
2179 | msgstr "重新初始化现存的" | |
2180 | ||
2181 | #: builtin/init-db.c:420 | |
2182 | msgid "Initialized empty" | |
2183 | msgstr "初始化空的" | |
2184 | ||
7e238ab7 | 2185 | # 译者:中文字符串拼接,可删除前导空格 |
c04f5ac3 JX |
2186 | #: builtin/init-db.c:421 |
2187 | msgid " shared" | |
90e6ef53 | 2188 | msgstr "共享" |
c04f5ac3 JX |
2189 | |
2190 | #: builtin/init-db.c:440 | |
2191 | msgid "cannot tell cwd" | |
2192 | msgstr "无法获知当前路径" | |
2193 | ||
2194 | #: builtin/init-db.c:521 builtin/init-db.c:528 | |
2195 | #, c-format | |
2196 | msgid "cannot mkdir %s" | |
2197 | msgstr "不能创建目录 %s" | |
2198 | ||
2199 | #: builtin/init-db.c:532 | |
2200 | #, c-format | |
2201 | msgid "cannot chdir to %s" | |
2202 | msgstr "不能切换目录到 %s" | |
2203 | ||
2204 | #: builtin/init-db.c:554 | |
2205 | #, c-format | |
2206 | msgid "" | |
2207 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
2208 | "dir=<directory>)" | |
2209 | msgstr "" | |
73a60cd2 JX |
2210 | "不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-" |
2211 | "dir=<directory>)" | |
c04f5ac3 JX |
2212 | |
2213 | #: builtin/init-db.c:578 | |
2214 | msgid "Cannot access current working directory" | |
2215 | msgstr "不能访问当前工作目录" | |
2216 | ||
2217 | #: builtin/init-db.c:585 | |
2218 | #, c-format | |
2219 | msgid "Cannot access work tree '%s'" | |
2220 | msgstr "不能访问工作区 '%s'" | |
2221 | ||
14c8bced | 2222 | #: builtin/log.c:187 |
c04f5ac3 JX |
2223 | #, c-format |
2224 | msgid "Final output: %d %s\n" | |
2225 | msgstr "最终输出:%d %s\n" | |
2226 | ||
14c8bced | 2227 | #: builtin/log.c:395 builtin/log.c:483 |
c04f5ac3 JX |
2228 | #, c-format |
2229 | msgid "Could not read object %s" | |
90e6ef53 | 2230 | msgstr "不能读取对象 %s" |
c04f5ac3 | 2231 | |
14c8bced | 2232 | #: builtin/log.c:507 |
c04f5ac3 JX |
2233 | #, c-format |
2234 | msgid "Unknown type: %d" | |
2235 | msgstr "未知类型:%d" | |
2236 | ||
14c8bced | 2237 | #: builtin/log.c:596 |
c04f5ac3 JX |
2238 | msgid "format.headers without value" |
2239 | msgstr "format.headers 没有值" | |
2240 | ||
14c8bced | 2241 | #: builtin/log.c:669 |
c04f5ac3 JX |
2242 | msgid "name of output directory is too long" |
2243 | msgstr "输出目录名太长" | |
2244 | ||
14c8bced | 2245 | #: builtin/log.c:680 |
c04f5ac3 JX |
2246 | #, c-format |
2247 | msgid "Cannot open patch file %s" | |
2248 | msgstr "无法打开补丁文件 %s" | |
2249 | ||
14c8bced | 2250 | #: builtin/log.c:694 |
c04f5ac3 JX |
2251 | msgid "Need exactly one range." |
2252 | msgstr "只需要一个范围。" | |
2253 | ||
14c8bced | 2254 | #: builtin/log.c:702 |
c04f5ac3 JX |
2255 | msgid "Not a range." |
2256 | msgstr "不是一个范围。" | |
2257 | ||
14c8bced | 2258 | #: builtin/log.c:739 |
c04f5ac3 | 2259 | msgid "Could not extract email from committer identity." |
90e6ef53 | 2260 | msgstr "不能从提交者身份中提取邮件地址。" |
c04f5ac3 | 2261 | |
14c8bced | 2262 | #: builtin/log.c:785 |
c04f5ac3 JX |
2263 | msgid "Cover letter needs email format" |
2264 | msgstr "信封需要邮件地址格式" | |
2265 | ||
14c8bced | 2266 | #: builtin/log.c:879 |
c04f5ac3 JX |
2267 | #, c-format |
2268 | msgid "insane in-reply-to: %s" | |
2269 | msgstr "不正常的 in-reply-to:%s" | |
2270 | ||
14c8bced | 2271 | #: builtin/log.c:952 |
c04f5ac3 JX |
2272 | msgid "Two output directories?" |
2273 | msgstr "两个输出目录?" | |
2274 | ||
14c8bced | 2275 | #: builtin/log.c:1173 |
c04f5ac3 JX |
2276 | #, c-format |
2277 | msgid "bogus committer info %s" | |
2278 | msgstr "虚假的提交者信息 %s" | |
2279 | ||
14c8bced | 2280 | #: builtin/log.c:1218 |
c04f5ac3 JX |
2281 | msgid "-n and -k are mutually exclusive." |
2282 | msgstr "-n 和 -k 互斥。" | |
2283 | ||
14c8bced | 2284 | #: builtin/log.c:1220 |
c04f5ac3 JX |
2285 | msgid "--subject-prefix and -k are mutually exclusive." |
2286 | msgstr "--subject-prefix 和 -k 互斥。" | |
2287 | ||
14c8bced | 2288 | #: builtin/log.c:1225 builtin/shortlog.c:284 |
c04f5ac3 JX |
2289 | #, c-format |
2290 | msgid "unrecognized argument: %s" | |
2291 | msgstr "未识别的参数:%s" | |
2292 | ||
14c8bced | 2293 | #: builtin/log.c:1228 |
c04f5ac3 JX |
2294 | msgid "--name-only does not make sense" |
2295 | msgstr "--name-only 无意义" | |
2296 | ||
14c8bced | 2297 | #: builtin/log.c:1230 |
c04f5ac3 JX |
2298 | msgid "--name-status does not make sense" |
2299 | msgstr "--name-status 无意义" | |
2300 | ||
14c8bced | 2301 | #: builtin/log.c:1232 |
c04f5ac3 JX |
2302 | msgid "--check does not make sense" |
2303 | msgstr "--check 无意义" | |
2304 | ||
14c8bced | 2305 | #: builtin/log.c:1255 |
c04f5ac3 JX |
2306 | msgid "standard output, or directory, which one?" |
2307 | msgstr "标准输出或目录,哪一个?" | |
2308 | ||
14c8bced | 2309 | #: builtin/log.c:1257 |
c04f5ac3 JX |
2310 | #, c-format |
2311 | msgid "Could not create directory '%s'" | |
90e6ef53 | 2312 | msgstr "不能创建目录 '%s'" |
c04f5ac3 | 2313 | |
14c8bced | 2314 | #: builtin/log.c:1410 |
c04f5ac3 JX |
2315 | msgid "Failed to create output files" |
2316 | msgstr "无法创建输出文件" | |
2317 | ||
14c8bced | 2318 | #: builtin/log.c:1514 |
c04f5ac3 JX |
2319 | #, c-format |
2320 | msgid "" | |
2321 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
90e6ef53 | 2322 | msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n" |
c04f5ac3 | 2323 | |
14c8bced | 2324 | #: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544 |
c04f5ac3 JX |
2325 | #, c-format |
2326 | msgid "Unknown commit %s" | |
2327 | msgstr "未知提交 %s" | |
2328 | ||
2329 | #: builtin/merge.c:91 | |
2330 | msgid "switch `m' requires a value" | |
2331 | msgstr "开关 `m' 需要一个值" | |
2332 | ||
2333 | #: builtin/merge.c:128 | |
2334 | #, c-format | |
2335 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 2336 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 JX |
2337 | |
2338 | #: builtin/merge.c:129 | |
2339 | #, c-format | |
2340 | msgid "Available strategies are:" | |
2341 | msgstr "可用的策略有:" | |
2342 | ||
2343 | #: builtin/merge.c:134 | |
2344 | #, c-format | |
2345 | msgid "Available custom strategies are:" | |
2346 | msgstr "可用的自定义策略有:" | |
2347 | ||
2348 | #: builtin/merge.c:241 | |
2349 | msgid "could not run stash." | |
2350 | msgstr "不能进行进度保存。" | |
2351 | ||
2352 | #: builtin/merge.c:246 | |
2353 | msgid "stash failed" | |
2354 | msgstr "进度保存失败" | |
2355 | ||
2356 | #: builtin/merge.c:251 | |
2357 | #, c-format | |
2358 | msgid "not a valid object: %s" | |
2359 | msgstr "不是一个有效对象:%s" | |
2360 | ||
2361 | #: builtin/merge.c:270 builtin/merge.c:287 | |
2362 | msgid "read-tree failed" | |
2363 | msgstr "读取树失败" | |
2364 | ||
90e6ef53 | 2365 | # 译者:注意保持前导空格 |
c04f5ac3 JX |
2366 | #: builtin/merge.c:317 |
2367 | msgid " (nothing to squash)" | |
2368 | msgstr " (无可压缩)" | |
2369 | ||
2370 | #: builtin/merge.c:330 | |
2371 | #, c-format | |
2372 | msgid "Squash commit -- not updating HEAD\n" | |
2373 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
2374 | ||
2375 | #: builtin/merge.c:362 | |
2376 | msgid "Writing SQUASH_MSG" | |
2377 | msgstr "写入 SQUASH_MSG" | |
2378 | ||
2379 | #: builtin/merge.c:364 | |
2380 | msgid "Finishing SQUASH_MSG" | |
2381 | msgstr "完成 SQUASH_MSG" | |
2382 | ||
2383 | #: builtin/merge.c:386 | |
2384 | #, c-format | |
2385 | msgid "No merge message -- not updating HEAD\n" | |
2386 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
2387 | ||
14c8bced | 2388 | #: builtin/merge.c:437 |
c04f5ac3 JX |
2389 | #, c-format |
2390 | msgid "'%s' does not point to a commit" | |
2391 | msgstr "'%s' 没有指向一个提交" | |
2392 | ||
14c8bced | 2393 | #: builtin/merge.c:536 |
c04f5ac3 JX |
2394 | #, c-format |
2395 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 2396 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 2397 | |
14c8bced | 2398 | #: builtin/merge.c:629 |
c04f5ac3 JX |
2399 | msgid "git write-tree failed to write a tree" |
2400 | msgstr "git write-tree 无法写入一树对象" | |
2401 | ||
14c8bced | 2402 | #: builtin/merge.c:679 |
c04f5ac3 JX |
2403 | msgid "failed to read the cache" |
2404 | msgstr "无法读取缓存" | |
2405 | ||
14c8bced | 2406 | #: builtin/merge.c:696 |
c04f5ac3 | 2407 | msgid "Unable to write index." |
90e6ef53 | 2408 | msgstr "不能写索引。" |
c04f5ac3 | 2409 | |
14c8bced | 2410 | #: builtin/merge.c:709 |
c04f5ac3 JX |
2411 | msgid "Not handling anything other than two heads merge." |
2412 | msgstr "不能处理两个头合并之外的任何操作。" | |
2413 | ||
14c8bced | 2414 | #: builtin/merge.c:723 |
c04f5ac3 JX |
2415 | #, c-format |
2416 | msgid "Unknown option for merge-recursive: -X%s" | |
2417 | msgstr "merge-recursive 的未知选项:-X%s" | |
2418 | ||
14c8bced | 2419 | #: builtin/merge.c:737 |
c04f5ac3 JX |
2420 | #, c-format |
2421 | msgid "unable to write %s" | |
2422 | msgstr "不能写 %s" | |
2423 | ||
14c8bced | 2424 | #: builtin/merge.c:876 |
c04f5ac3 JX |
2425 | #, c-format |
2426 | msgid "Could not read from '%s'" | |
2427 | msgstr "不能从 '%s' 读取" | |
2428 | ||
14c8bced | 2429 | #: builtin/merge.c:885 |
c04f5ac3 JX |
2430 | #, c-format |
2431 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
2432 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
2433 | ||
14c8bced | 2434 | #: builtin/merge.c:891 |
c04f5ac3 JX |
2435 | msgid "" |
2436 | "Please enter a commit message to explain why this merge is necessary,\n" | |
2437 | "especially if it merges an updated upstream into a topic branch.\n" | |
2438 | "\n" | |
2439 | "Lines starting with '#' will be ignored, and an empty message aborts\n" | |
2440 | "the commit.\n" | |
2441 | msgstr "" | |
2442 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
2443 | "合并到主题分支。\n" | |
2444 | "\n" | |
2445 | "以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n" | |
2446 | ||
14c8bced | 2447 | #: builtin/merge.c:915 |
c04f5ac3 JX |
2448 | msgid "Empty commit message." |
2449 | msgstr "空提交信息。" | |
2450 | ||
14c8bced | 2451 | #: builtin/merge.c:927 |
c04f5ac3 JX |
2452 | #, c-format |
2453 | msgid "Wonderful.\n" | |
2454 | msgstr "太棒了。\n" | |
2455 | ||
14c8bced | 2456 | #: builtin/merge.c:1000 |
c04f5ac3 JX |
2457 | #, c-format |
2458 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
2459 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
2460 | ||
14c8bced | 2461 | #: builtin/merge.c:1016 |
c04f5ac3 JX |
2462 | #, c-format |
2463 | msgid "'%s' is not a commit" | |
2464 | msgstr "'%s' 不是一个提交" | |
2465 | ||
14c8bced | 2466 | #: builtin/merge.c:1057 |
c04f5ac3 | 2467 | msgid "No current branch." |
90e6ef53 | 2468 | msgstr "没有当前分支。" |
c04f5ac3 | 2469 | |
14c8bced | 2470 | #: builtin/merge.c:1059 |
c04f5ac3 | 2471 | msgid "No remote for the current branch." |
90e6ef53 | 2472 | msgstr "当前分支没有对应的远程版本库。" |
c04f5ac3 | 2473 | |
14c8bced | 2474 | #: builtin/merge.c:1061 |
c04f5ac3 | 2475 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 2476 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 2477 | |
14c8bced | 2478 | #: builtin/merge.c:1066 |
c04f5ac3 JX |
2479 | #, c-format |
2480 | msgid "No remote tracking branch for %s from %s" | |
2481 | msgstr "%s 没有来自 %s 的远程跟踪分支" | |
2482 | ||
14c8bced | 2483 | #: builtin/merge.c:1188 |
c04f5ac3 | 2484 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 2485 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 2486 | |
14c8bced | 2487 | #: builtin/merge.c:1204 git-pull.sh:31 |
c04f5ac3 JX |
2488 | msgid "" |
2489 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
2490 | "Please, commit your changes before you can merge." | |
2491 | msgstr "" | |
2492 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 2493 | "请在合并前先提交您的修改。" |
c04f5ac3 | 2494 | |
14c8bced | 2495 | #: builtin/merge.c:1207 git-pull.sh:34 |
c04f5ac3 JX |
2496 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
2497 | msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" | |
2498 | ||
14c8bced | 2499 | #: builtin/merge.c:1211 |
c04f5ac3 JX |
2500 | msgid "" |
2501 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
2502 | "Please, commit your changes before you can merge." | |
2503 | msgstr "" | |
2504 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 2505 | "请在合并前先提交您的修改。" |
c04f5ac3 | 2506 | |
14c8bced | 2507 | #: builtin/merge.c:1214 |
c04f5ac3 JX |
2508 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
2509 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
2510 | ||
14c8bced | 2511 | #: builtin/merge.c:1223 |
c04f5ac3 JX |
2512 | msgid "You cannot combine --squash with --no-ff." |
2513 | msgstr "您不能将 --squash 与 --no-ff 共用。" | |
2514 | ||
14c8bced | 2515 | #: builtin/merge.c:1228 |
c04f5ac3 JX |
2516 | msgid "You cannot combine --no-ff with --ff-only." |
2517 | msgstr "您不能将 --no-ff 与 --ff-only 共用。" | |
2518 | ||
14c8bced | 2519 | #: builtin/merge.c:1235 |
c04f5ac3 | 2520 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 2521 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 2522 | |
14c8bced | 2523 | #: builtin/merge.c:1266 |
c04f5ac3 | 2524 | msgid "Can merge only exactly one commit into empty head" |
90e6ef53 | 2525 | msgstr "只能将一个提交合并到空分支上" |
c04f5ac3 | 2526 | |
14c8bced | 2527 | #: builtin/merge.c:1269 |
c04f5ac3 JX |
2528 | msgid "Squash commit into empty head not supported yet" |
2529 | msgstr "尚不支持到空分支的压缩提交" | |
2530 | ||
14c8bced | 2531 | #: builtin/merge.c:1271 |
c04f5ac3 JX |
2532 | msgid "Non-fast-forward commit does not make sense into an empty head" |
2533 | msgstr "到空分支的非快进式提交没有意义" | |
2534 | ||
14c8bced | 2535 | #: builtin/merge.c:1275 builtin/merge.c:1319 |
c04f5ac3 JX |
2536 | #, c-format |
2537 | msgid "%s - not something we can merge" | |
6672dc8e | 2538 | msgstr "%s - 不能被合并" |
c04f5ac3 | 2539 | |
73a60cd2 | 2540 | #: builtin/merge.c:1382 |
c04f5ac3 JX |
2541 | #, c-format |
2542 | msgid "Updating %s..%s\n" | |
2543 | msgstr "更新 %s..%s\n" | |
2544 | ||
73a60cd2 | 2545 | #: builtin/merge.c:1420 |
c04f5ac3 JX |
2546 | #, c-format |
2547 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 2548 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 2549 | |
73a60cd2 | 2550 | #: builtin/merge.c:1427 |
c04f5ac3 JX |
2551 | #, c-format |
2552 | msgid "Nope.\n" | |
2553 | msgstr "无。\n" | |
2554 | ||
73a60cd2 | 2555 | #: builtin/merge.c:1459 |
c04f5ac3 | 2556 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 2557 | msgstr "无法快进,终止。" |
c04f5ac3 | 2558 | |
73a60cd2 | 2559 | #: builtin/merge.c:1482 builtin/merge.c:1559 |
c04f5ac3 JX |
2560 | #, c-format |
2561 | msgid "Rewinding the tree to pristine...\n" | |
2562 | msgstr "将树回滚至原始状态...\n" | |
2563 | ||
73a60cd2 | 2564 | #: builtin/merge.c:1486 |
c04f5ac3 JX |
2565 | #, c-format |
2566 | msgid "Trying merge strategy %s...\n" | |
2567 | msgstr "尝试合并策略 %s...\n" | |
2568 | ||
73a60cd2 | 2569 | #: builtin/merge.c:1550 |
c04f5ac3 JX |
2570 | #, c-format |
2571 | msgid "No merge strategy handled the merge.\n" | |
2572 | msgstr "没有合并策略处理此合并。\n" | |
2573 | ||
73a60cd2 | 2574 | #: builtin/merge.c:1552 |
c04f5ac3 JX |
2575 | #, c-format |
2576 | msgid "Merge with strategy %s failed.\n" | |
2577 | msgstr "使用策略 %s 合并失败。\n" | |
2578 | ||
73a60cd2 | 2579 | #: builtin/merge.c:1561 |
c04f5ac3 JX |
2580 | #, c-format |
2581 | msgid "Using the %s to prepare resolving by hand.\n" | |
2582 | msgstr "使用 %s 以准备手工解决。\n" | |
2583 | ||
73a60cd2 | 2584 | #: builtin/merge.c:1572 |
c04f5ac3 JX |
2585 | #, c-format |
2586 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
2587 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
2588 | ||
2589 | #: builtin/mv.c:108 | |
2590 | #, c-format | |
2591 | msgid "Checking rename of '%s' to '%s'\n" | |
2592 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
2593 | ||
2594 | #: builtin/mv.c:112 | |
2595 | msgid "bad source" | |
2596 | msgstr "坏的源" | |
2597 | ||
2598 | #: builtin/mv.c:115 | |
2599 | msgid "can not move directory into itself" | |
2600 | msgstr "不能将目录移动到自身" | |
2601 | ||
2602 | #: builtin/mv.c:118 | |
2603 | msgid "cannot move directory over file" | |
2604 | msgstr "不能将目录移动到文件" | |
2605 | ||
2606 | #: builtin/mv.c:128 | |
2607 | #, c-format | |
2608 | msgid "Huh? %.*s is in index?" | |
90e6ef53 | 2609 | msgstr "嗯?%.*s 在索引中?" |
c04f5ac3 JX |
2610 | |
2611 | #: builtin/mv.c:140 | |
2612 | msgid "source directory is empty" | |
2613 | msgstr "源目录为空" | |
2614 | ||
2615 | #: builtin/mv.c:171 | |
2616 | msgid "not under version control" | |
2617 | msgstr "不在版本控制之下" | |
2618 | ||
2619 | #: builtin/mv.c:173 | |
2620 | msgid "destination exists" | |
2621 | msgstr "目标已存在" | |
2622 | ||
2623 | #: builtin/mv.c:181 | |
2624 | #, c-format | |
2625 | msgid "overwriting '%s'" | |
2626 | msgstr "覆盖 '%s'" | |
2627 | ||
2628 | #: builtin/mv.c:184 | |
2629 | msgid "Cannot overwrite" | |
2630 | msgstr "不能覆盖" | |
2631 | ||
2632 | #: builtin/mv.c:187 | |
2633 | msgid "multiple sources for the same target" | |
2634 | msgstr "同一目标具有多个源" | |
2635 | ||
2636 | #: builtin/mv.c:202 | |
2637 | #, c-format | |
2638 | msgid "%s, source=%s, destination=%s" | |
2639 | msgstr "%s,源=%s,目标=%s" | |
2640 | ||
2641 | #: builtin/mv.c:212 | |
2642 | #, c-format | |
2643 | msgid "Renaming %s to %s\n" | |
2644 | msgstr "重命名 %s 至 %s\n" | |
2645 | ||
2646 | #: builtin/mv.c:215 | |
2647 | #, c-format | |
2648 | msgid "renaming '%s' failed" | |
2649 | msgstr "重命名 '%s' 失败" | |
2650 | ||
2651 | #: builtin/notes.c:139 | |
2652 | #, c-format | |
2653 | msgid "unable to start 'show' for object '%s'" | |
2654 | msgstr "不能为对象 '%s' 开始 'show'" | |
2655 | ||
2656 | #: builtin/notes.c:145 | |
2657 | msgid "can't fdopen 'show' output fd" | |
2658 | msgstr "不能打开 'show' 输出文件句柄" | |
2659 | ||
2660 | #: builtin/notes.c:155 | |
2661 | #, c-format | |
2662 | msgid "failed to close pipe to 'show' for object '%s'" | |
2663 | msgstr "无法为对象 '%s' 的 'show' 关闭管道" | |
2664 | ||
2665 | #: builtin/notes.c:158 | |
2666 | #, c-format | |
2667 | msgid "failed to finish 'show' for object '%s'" | |
2668 | msgstr "无法为对象 '%s' 完成 'show'" | |
2669 | ||
7ac1c0ad | 2670 | #: builtin/notes.c:175 builtin/tag.c:343 |
c04f5ac3 JX |
2671 | #, c-format |
2672 | msgid "could not create file '%s'" | |
2673 | msgstr "不能创建文件 '%s'" | |
2674 | ||
2675 | #: builtin/notes.c:189 | |
2676 | msgid "Please supply the note contents using either -m or -F option" | |
2677 | msgstr "请通过 -m 或 -F 选项为注解提供内容" | |
2678 | ||
2679 | #: builtin/notes.c:210 builtin/notes.c:973 | |
2680 | #, c-format | |
2681 | msgid "Removing note for object %s\n" | |
2682 | msgstr "删除对象 %s 的注解\n" | |
2683 | ||
2684 | #: builtin/notes.c:215 | |
2685 | msgid "unable to write note object" | |
2686 | msgstr "不能写注解对象" | |
2687 | ||
2688 | #: builtin/notes.c:217 | |
2689 | #, c-format | |
2690 | msgid "The note contents has been left in %s" | |
2691 | msgstr "注解内容被留在文件 %s 中" | |
2692 | ||
7ac1c0ad | 2693 | #: builtin/notes.c:251 builtin/tag.c:521 |
c04f5ac3 JX |
2694 | #, c-format |
2695 | msgid "cannot read '%s'" | |
2696 | msgstr "不能读取 '%s'" | |
2697 | ||
7ac1c0ad | 2698 | #: builtin/notes.c:253 builtin/tag.c:524 |
c04f5ac3 JX |
2699 | #, c-format |
2700 | msgid "could not open or read '%s'" | |
2701 | msgstr "不能打开或读取 '%s'" | |
2702 | ||
2703 | #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 | |
2704 | #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 | |
2705 | #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 | |
7ac1c0ad | 2706 | #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537 |
c04f5ac3 JX |
2707 | #, c-format |
2708 | msgid "Failed to resolve '%s' as a valid ref." | |
90e6ef53 | 2709 | msgstr "无法解析 '%s' 为一个有效引用。" |
c04f5ac3 JX |
2710 | |
2711 | #: builtin/notes.c:275 | |
2712 | #, c-format | |
2713 | msgid "Failed to read object '%s'." | |
2714 | msgstr "无法读取对象 '%s'。" | |
2715 | ||
2716 | #: builtin/notes.c:299 | |
2717 | msgid "Cannot commit uninitialized/unreferenced notes tree" | |
2718 | msgstr "不能提交未初始化/未引用的注解树" | |
2719 | ||
2720 | #: builtin/notes.c:340 | |
2721 | #, c-format | |
2722 | msgid "Bad notes.rewriteMode value: '%s'" | |
90e6ef53 | 2723 | msgstr "坏的 notes.rewriteMode 值:'%s'" |
c04f5ac3 JX |
2724 | |
2725 | #: builtin/notes.c:350 | |
2726 | #, c-format | |
2727 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" | |
2728 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
2729 | ||
2730 | #. TRANSLATORS: The first %s is the name of the | |
2731 | #. environment variable, the second %s is its value | |
2732 | #: builtin/notes.c:377 | |
2733 | #, c-format | |
2734 | msgid "Bad %s value: '%s'" | |
90e6ef53 | 2735 | msgstr "坏的 %s 值:'%s'" |
c04f5ac3 JX |
2736 | |
2737 | #: builtin/notes.c:441 | |
2738 | #, c-format | |
2739 | msgid "Malformed input line: '%s'." | |
2740 | msgstr "非法的输入行:'%s'。" | |
2741 | ||
2742 | #: builtin/notes.c:456 | |
2743 | #, c-format | |
2744 | msgid "Failed to copy notes from '%s' to '%s'" | |
90e6ef53 | 2745 | msgstr "无法从 '%s' 到 '%s' 拷贝注解" |
c04f5ac3 JX |
2746 | |
2747 | #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 | |
2748 | #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 | |
2749 | #: builtin/notes.c:1033 | |
2750 | msgid "too many parameters" | |
2751 | msgstr "参数太多" | |
2752 | ||
2753 | #: builtin/notes.c:513 builtin/notes.c:772 | |
2754 | #, c-format | |
2755 | msgid "No note found for object %s." | |
2756 | msgstr "未发现对象 %s 的注解。" | |
2757 | ||
2758 | #: builtin/notes.c:580 | |
2759 | #, c-format | |
2760 | msgid "" | |
2761 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
2762 | "existing notes" | |
2763 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
2764 | ||
2765 | #: builtin/notes.c:585 builtin/notes.c:662 | |
2766 | #, c-format | |
2767 | msgid "Overwriting existing notes for object %s\n" | |
2768 | msgstr "覆盖对象 %s 现存注解\n" | |
2769 | ||
2770 | #: builtin/notes.c:635 | |
2771 | msgid "too few parameters" | |
2772 | msgstr "参数太少" | |
2773 | ||
2774 | #: builtin/notes.c:656 | |
2775 | #, c-format | |
2776 | msgid "" | |
2777 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
2778 | "existing notes" | |
2779 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
2780 | ||
2781 | #: builtin/notes.c:668 | |
2782 | #, c-format | |
2783 | msgid "Missing notes on source object %s. Cannot copy." | |
2784 | msgstr "源对象 %s 缺少注解。不能拷贝。" | |
2785 | ||
2786 | #: builtin/notes.c:717 | |
2787 | #, c-format | |
2788 | msgid "" | |
2789 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
2790 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
2791 | msgstr "" | |
90e6ef53 | 2792 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" |
c04f5ac3 JX |
2793 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" |
2794 | ||
2795 | #: builtin/notes.c:971 | |
2796 | #, c-format | |
2797 | msgid "Object %s has no note\n" | |
2798 | msgstr "对象 %s 没有注解\n" | |
2799 | ||
2800 | #: builtin/notes.c:1103 | |
2801 | #, c-format | |
2802 | msgid "Unknown subcommand: %s" | |
2803 | msgstr "未知子命令:%s" | |
2804 | ||
7ac1c0ad JX |
2805 | #: builtin/pack-objects.c:2310 |
2806 | #, c-format | |
2807 | msgid "unsupported index version %s" | |
90e6ef53 | 2808 | msgstr "不支持的索引版本 %s" |
7ac1c0ad JX |
2809 | |
2810 | #: builtin/pack-objects.c:2314 | |
2811 | #, c-format | |
2812 | msgid "bad index version '%s'" | |
90e6ef53 | 2813 | msgstr "坏的索引版本 '%s'" |
7ac1c0ad JX |
2814 | |
2815 | #: builtin/pack-objects.c:2322 | |
2816 | #, c-format | |
2817 | msgid "option %s does not accept negative form" | |
90e6ef53 | 2818 | msgstr "选项 %s 不接受否定格式" |
7ac1c0ad JX |
2819 | |
2820 | #: builtin/pack-objects.c:2326 | |
2821 | #, c-format | |
2822 | msgid "unable to parse value '%s' for option %s" | |
2823 | msgstr "不能解析值 '%s' 针对于选项 %s" | |
2824 | ||
c04f5ac3 JX |
2825 | #: builtin/push.c:44 |
2826 | msgid "tag shorthand without <tag>" | |
2827 | msgstr "tag 简写没有跟 <tag> 参数" | |
2828 | ||
2829 | #: builtin/push.c:63 | |
2830 | msgid "--delete only accepts plain target ref names" | |
90e6ef53 | 2831 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 2832 | |
73a60cd2 | 2833 | #: builtin/push.c:83 |
c04f5ac3 JX |
2834 | #, c-format |
2835 | msgid "" | |
2836 | "You are not currently on a branch.\n" | |
2837 | "To push the history leading to the current (detached HEAD)\n" | |
2838 | "state now, use\n" | |
2839 | "\n" | |
2840 | " git push %s HEAD:<name-of-remote-branch>\n" | |
2841 | msgstr "" | |
2842 | "您当前不在一个分支上。\n" | |
90e6ef53 | 2843 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 JX |
2844 | "\n" |
2845 | " git push %s HEAD:<name-of-remote-branch>\n" | |
2846 | ||
73a60cd2 | 2847 | #: builtin/push.c:90 |
c04f5ac3 JX |
2848 | #, c-format |
2849 | msgid "" | |
2850 | "The current branch %s has no upstream branch.\n" | |
2851 | "To push the current branch and set the remote as upstream, use\n" | |
2852 | "\n" | |
2853 | " git push --set-upstream %s %s\n" | |
2854 | msgstr "" | |
2855 | "当前分支 %s 没有对应的上游分支。\n" | |
2856 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
2857 | "\n" | |
2858 | " git push --set-upstream %s %s\n" | |
2859 | ||
73a60cd2 | 2860 | #: builtin/push.c:98 |
c04f5ac3 JX |
2861 | #, c-format |
2862 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
2863 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
2864 | ||
73a60cd2 JX |
2865 | #: builtin/push.c:101 |
2866 | #, c-format | |
2867 | msgid "" | |
2868 | "You are pushing to remote '%s', which is not the upstream of\n" | |
2869 | "your current branch '%s', without telling me what to push\n" | |
2870 | "to update which remote branch." | |
2871 | msgstr "" | |
2872 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
2873 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
2874 | ||
2875 | #: builtin/push.c:127 | |
c04f5ac3 JX |
2876 | msgid "" |
2877 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
90e6ef53 | 2878 | msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 2879 | |
73a60cd2 | 2880 | #: builtin/push.c:147 |
c04f5ac3 JX |
2881 | #, c-format |
2882 | msgid "Pushing to %s\n" | |
2883 | msgstr "推送到 %s\n" | |
2884 | ||
73a60cd2 | 2885 | #: builtin/push.c:151 |
c04f5ac3 JX |
2886 | #, c-format |
2887 | msgid "failed to push some refs to '%s'" | |
2888 | msgstr "无法推送一些引用到 '%s'" | |
2889 | ||
73a60cd2 | 2890 | #: builtin/push.c:159 |
c04f5ac3 JX |
2891 | #, c-format |
2892 | msgid "" | |
2893 | "To prevent you from losing history, non-fast-forward updates were rejected\n" | |
2894 | "Merge the remote changes (e.g. 'git pull') before pushing again. See the\n" | |
2895 | "'Note about fast-forwards' section of 'git push --help' for details.\n" | |
2896 | msgstr "" | |
90e6ef53 | 2897 | "为了防止您丢失提交历史,非快进式更新被拒绝。\n" |
c04f5ac3 JX |
2898 | "再次推送前先与远程变更合并(如 'git pull')。详见\n" |
2899 | "'git push --help' 中的 'Note about fast-forwards' 小节。\n" | |
2900 | ||
73a60cd2 | 2901 | #: builtin/push.c:176 |
c04f5ac3 JX |
2902 | #, c-format |
2903 | msgid "bad repository '%s'" | |
90e6ef53 | 2904 | msgstr "坏的版本库 '%s'" |
c04f5ac3 | 2905 | |
73a60cd2 | 2906 | #: builtin/push.c:177 |
c04f5ac3 JX |
2907 | msgid "" |
2908 | "No configured push destination.\n" | |
2909 | "Either specify the URL from the command-line or configure a remote " | |
2910 | "repository using\n" | |
2911 | "\n" | |
2912 | " git remote add <name> <url>\n" | |
2913 | "\n" | |
2914 | "and then push using the remote name\n" | |
2915 | "\n" | |
2916 | " git push <name>\n" | |
2917 | msgstr "" | |
90e6ef53 JX |
2918 | "没有配置推送目标。\n" |
2919 | "或者通过命令行指定URL,或者用下面命令配置一个远程版本库\n" | |
c04f5ac3 JX |
2920 | "\n" |
2921 | " git remote add <name> <url>\n" | |
2922 | "\n" | |
2923 | "然后使用该远程版本库名执行推送\n" | |
2924 | "\n" | |
2925 | " git push <name>\n" | |
2926 | ||
73a60cd2 | 2927 | #: builtin/push.c:192 |
c04f5ac3 JX |
2928 | msgid "--all and --tags are incompatible" |
2929 | msgstr "--all 和 --tags 不兼容" | |
2930 | ||
73a60cd2 | 2931 | #: builtin/push.c:193 |
c04f5ac3 JX |
2932 | msgid "--all can't be combined with refspecs" |
2933 | msgstr "--all 不能和引用表达式共用" | |
2934 | ||
73a60cd2 | 2935 | #: builtin/push.c:198 |
c04f5ac3 JX |
2936 | msgid "--mirror and --tags are incompatible" |
2937 | msgstr "--mirror 和 --tags 不兼容" | |
2938 | ||
73a60cd2 | 2939 | #: builtin/push.c:199 |
c04f5ac3 JX |
2940 | msgid "--mirror can't be combined with refspecs" |
2941 | msgstr "--mirror 不能和引用表达式共用" | |
2942 | ||
73a60cd2 | 2943 | #: builtin/push.c:204 |
c04f5ac3 JX |
2944 | msgid "--all and --mirror are incompatible" |
2945 | msgstr "--all 和 --mirror 不兼容" | |
2946 | ||
73a60cd2 | 2947 | #: builtin/push.c:284 |
c04f5ac3 JX |
2948 | msgid "--delete is incompatible with --all, --mirror and --tags" |
2949 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
2950 | ||
73a60cd2 | 2951 | #: builtin/push.c:286 |
c04f5ac3 JX |
2952 | msgid "--delete doesn't make sense without any refs" |
2953 | msgstr "--delete 未接任何引用没有意义" | |
2954 | ||
2955 | #: builtin/reset.c:33 | |
2956 | msgid "mixed" | |
2957 | msgstr "混杂" | |
2958 | ||
2959 | #: builtin/reset.c:33 | |
2960 | msgid "soft" | |
2961 | msgstr "软性" | |
2962 | ||
2963 | #: builtin/reset.c:33 | |
2964 | msgid "hard" | |
2965 | msgstr "硬性" | |
2966 | ||
2967 | #: builtin/reset.c:33 | |
2968 | msgid "keep" | |
2969 | msgstr "保持" | |
2970 | ||
2971 | #: builtin/reset.c:77 | |
2972 | msgid "You do not have a valid HEAD." | |
2973 | msgstr "您没有一个有效的 HEAD。" | |
2974 | ||
2975 | #: builtin/reset.c:79 | |
2976 | msgid "Failed to find tree of HEAD." | |
2977 | msgstr "无法找到 HEAD 指向的树。" | |
2978 | ||
2979 | #: builtin/reset.c:85 | |
2980 | #, c-format | |
2981 | msgid "Failed to find tree of %s." | |
2982 | msgstr "无法找到 %s 指向的树。" | |
2983 | ||
2984 | #: builtin/reset.c:96 | |
2985 | msgid "Could not write new index file." | |
90e6ef53 | 2986 | msgstr "不能写入新的索引文件。" |
c04f5ac3 JX |
2987 | |
2988 | #: builtin/reset.c:106 | |
2989 | #, c-format | |
2990 | msgid "HEAD is now at %s" | |
2991 | msgstr "HEAD 现在位于 %s" | |
2992 | ||
2993 | #: builtin/reset.c:130 | |
2994 | msgid "Could not read index" | |
90e6ef53 | 2995 | msgstr "不能读取索引" |
c04f5ac3 JX |
2996 | |
2997 | #: builtin/reset.c:133 | |
2998 | msgid "Unstaged changes after reset:" | |
90e6ef53 | 2999 | msgstr "重置后撤出暂存区的变更:" |
c04f5ac3 | 3000 | |
90e6ef53 | 3001 | # 译者:汉字之间无空格,故删除%s前后空格 |
c04f5ac3 JX |
3002 | #: builtin/reset.c:223 |
3003 | #, c-format | |
3004 | msgid "Cannot do a %s reset in the middle of a merge." | |
3005 | msgstr "在合并过程中不能做%s重置操作。" | |
3006 | ||
3007 | #: builtin/reset.c:297 | |
3008 | #, c-format | |
3009 | msgid "Could not parse object '%s'." | |
3010 | msgstr "不能解析对象 '%s'。" | |
3011 | ||
3012 | #: builtin/reset.c:302 | |
3013 | msgid "--patch is incompatible with --{hard,mixed,soft}" | |
3014 | msgstr "--patch 与 --{hard,mixed,soft} 不兼容" | |
3015 | ||
3016 | #: builtin/reset.c:311 | |
3017 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." | |
3018 | msgstr "--mixed 带路径已弃用,代之以 'git reset -- <paths>'。" | |
3019 | ||
90e6ef53 | 3020 | # 译者:汉字之间无空格,故删除%s前后空格 |
c04f5ac3 JX |
3021 | #: builtin/reset.c:313 |
3022 | #, c-format | |
3023 | msgid "Cannot do %s reset with paths." | |
3024 | msgstr "不能带路径进行%s重置。" | |
3025 | ||
90e6ef53 | 3026 | # 译者:汉字之间无空格,故删除%s前后空格 |
c04f5ac3 JX |
3027 | #: builtin/reset.c:325 |
3028 | #, c-format | |
3029 | msgid "%s reset is not allowed in a bare repository" | |
3030 | msgstr "不能对裸版本库进行%s重置" | |
3031 | ||
3032 | #: builtin/reset.c:341 | |
3033 | #, c-format | |
3034 | msgid "Could not reset index file to revision '%s'." | |
90e6ef53 | 3035 | msgstr "不能重置索引文件至版本 '%s'。" |
c04f5ac3 JX |
3036 | |
3037 | #: builtin/revert.c:70 builtin/revert.c:91 | |
3038 | #, c-format | |
3039 | msgid "%s: %s cannot be used with %s" | |
90e6ef53 | 3040 | msgstr "%s:%s 不能和 %s 共用" |
c04f5ac3 JX |
3041 | |
3042 | #: builtin/revert.c:126 | |
3043 | msgid "program error" | |
3044 | msgstr "程序错误" | |
3045 | ||
3046 | #: builtin/revert.c:209 | |
3047 | msgid "revert failed" | |
3048 | msgstr "还原失败" | |
3049 | ||
3050 | #: builtin/revert.c:224 | |
3051 | msgid "cherry-pick failed" | |
3052 | msgstr "拣选失败" | |
3053 | ||
3054 | #: builtin/rm.c:109 | |
3055 | #, c-format | |
3056 | msgid "" | |
3057 | "'%s' has staged content different from both the file and the HEAD\n" | |
3058 | "(use -f to force removal)" | |
3059 | msgstr "" | |
90e6ef53 | 3060 | "'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n" |
c04f5ac3 JX |
3061 | "(使用 -f 强制删除)" |
3062 | ||
3063 | #: builtin/rm.c:115 | |
3064 | #, c-format | |
3065 | msgid "" | |
3066 | "'%s' has changes staged in the index\n" | |
3067 | "(use --cached to keep the file, or -f to force removal)" | |
3068 | msgstr "" | |
90e6ef53 | 3069 | "'%s' 有变更已暂存至索引中\n" |
c04f5ac3 JX |
3070 | "(使用 --cached 保存文件,或用 -f 强制删除)" |
3071 | ||
3072 | #: builtin/rm.c:119 | |
3073 | #, c-format | |
3074 | msgid "" | |
3075 | "'%s' has local modifications\n" | |
3076 | "(use --cached to keep the file, or -f to force removal)" | |
3077 | msgstr "" | |
3078 | "'%s' 有本地修改\n" | |
3079 | "(使用 --cached 保存文件,或用 -f 强制删除)" | |
3080 | ||
3081 | #: builtin/rm.c:194 | |
3082 | #, c-format | |
3083 | msgid "not removing '%s' recursively without -r" | |
3084 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
3085 | ||
3086 | #: builtin/rm.c:230 | |
3087 | #, c-format | |
3088 | msgid "git rm: unable to remove %s" | |
3089 | msgstr "git rm:不能删除 %s" | |
3090 | ||
3091 | #: builtin/shortlog.c:157 | |
3092 | #, c-format | |
3093 | msgid "Missing author: %s" | |
3094 | msgstr "缺少作者:%s" | |
3095 | ||
7ac1c0ad JX |
3096 | #: builtin/tag.c:58 |
3097 | #, c-format | |
3098 | msgid "malformed object at '%s'" | |
3099 | msgstr "非法的对象于 '%s'" | |
3100 | ||
3101 | #: builtin/tag.c:205 | |
c04f5ac3 JX |
3102 | #, c-format |
3103 | msgid "tag name too long: %.*s..." | |
3104 | msgstr "tag 名字太长:%.*s..." | |
3105 | ||
7ac1c0ad | 3106 | #: builtin/tag.c:210 |
c04f5ac3 JX |
3107 | #, c-format |
3108 | msgid "tag '%s' not found." | |
3109 | msgstr "tag '%s' 未发现。" | |
3110 | ||
7ac1c0ad | 3111 | #: builtin/tag.c:225 |
c04f5ac3 JX |
3112 | #, c-format |
3113 | msgid "Deleted tag '%s' (was %s)\n" | |
3114 | msgstr "已删除 tag '%s'(曾为 %s)\n" | |
3115 | ||
7ac1c0ad | 3116 | #: builtin/tag.c:237 |
c04f5ac3 JX |
3117 | #, c-format |
3118 | msgid "could not verify the tag '%s'" | |
3119 | msgstr "不能校验 tag '%s'" | |
3120 | ||
7ac1c0ad | 3121 | #: builtin/tag.c:247 |
c04f5ac3 JX |
3122 | msgid "" |
3123 | "\n" | |
3124 | "#\n" | |
3125 | "# Write a tag message\n" | |
3126 | "# Lines starting with '#' will be ignored.\n" | |
3127 | "#\n" | |
3128 | msgstr "" | |
3129 | "\n" | |
3130 | "#\n" | |
3131 | "# 输入一个 tag 说明\n" | |
3132 | "# 以 '#' 开头的行将被忽略。\n" | |
3133 | "#\n" | |
3134 | ||
7ac1c0ad | 3135 | #: builtin/tag.c:254 |
c04f5ac3 JX |
3136 | msgid "" |
3137 | "\n" | |
3138 | "#\n" | |
3139 | "# Write a tag message\n" | |
3140 | "# Lines starting with '#' will be kept; you may remove them yourself if you " | |
3141 | "want to.\n" | |
3142 | "#\n" | |
3143 | msgstr "" | |
3144 | "\n" | |
3145 | "#\n" | |
3146 | "# 输入一个 tag 说明\n" | |
3147 | "# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n" | |
3148 | "#\n" | |
3149 | ||
7ac1c0ad | 3150 | #: builtin/tag.c:294 |
c04f5ac3 JX |
3151 | msgid "unable to sign the tag" |
3152 | msgstr "无法签署 tag" | |
3153 | ||
7ac1c0ad | 3154 | #: builtin/tag.c:296 |
c04f5ac3 JX |
3155 | msgid "unable to write tag file" |
3156 | msgstr "无法写 tag 文件" | |
3157 | ||
7ac1c0ad | 3158 | #: builtin/tag.c:321 |
c04f5ac3 | 3159 | msgid "bad object type." |
90e6ef53 | 3160 | msgstr "坏的对象类型。" |
c04f5ac3 | 3161 | |
7ac1c0ad | 3162 | #: builtin/tag.c:334 |
c04f5ac3 | 3163 | msgid "tag header too big." |
90e6ef53 | 3164 | msgstr "tag 头信息太大。" |
c04f5ac3 | 3165 | |
7ac1c0ad | 3166 | #: builtin/tag.c:366 |
c04f5ac3 JX |
3167 | msgid "no tag message?" |
3168 | msgstr "无 tag 说明?" | |
3169 | ||
7ac1c0ad | 3170 | #: builtin/tag.c:372 |
c04f5ac3 JX |
3171 | #, c-format |
3172 | msgid "The tag message has been left in %s\n" | |
3173 | msgstr "tag 说明被保留在 %s\n" | |
3174 | ||
7ac1c0ad JX |
3175 | #: builtin/tag.c:421 |
3176 | msgid "switch 'points-at' requires an object" | |
3177 | msgstr "开关 'points-at' 需要一个对象" | |
3178 | ||
3179 | #: builtin/tag.c:423 | |
3180 | #, c-format | |
3181 | msgid "malformed object name '%s'" | |
3182 | msgstr "非法的对象名 '%s'" | |
3183 | ||
3184 | #: builtin/tag.c:502 | |
c04f5ac3 JX |
3185 | msgid "-n option is only allowed with -l." |
3186 | msgstr "-n 选项只允许和 -l 共用。" | |
3187 | ||
7ac1c0ad | 3188 | #: builtin/tag.c:504 |
c04f5ac3 JX |
3189 | msgid "--contains option is only allowed with -l." |
3190 | msgstr "--contains 选项只允许和 -l 共用。" | |
3191 | ||
7ac1c0ad JX |
3192 | #: builtin/tag.c:506 |
3193 | msgid "--points-at option is only allowed with -l." | |
3194 | msgstr "--points-at 选项只允许和 -l 共用。" | |
3195 | ||
3196 | #: builtin/tag.c:514 | |
c04f5ac3 JX |
3197 | msgid "only one -F or -m option is allowed." |
3198 | msgstr "只允许一个 -F 或 -m 选项。" | |
3199 | ||
7ac1c0ad | 3200 | #: builtin/tag.c:534 |
c04f5ac3 JX |
3201 | msgid "too many params" |
3202 | msgstr "太多参数" | |
3203 | ||
7ac1c0ad | 3204 | #: builtin/tag.c:540 |
c04f5ac3 JX |
3205 | #, c-format |
3206 | msgid "'%s' is not a valid tag name." | |
90e6ef53 | 3207 | msgstr "'%s' 不是一个有效的tag名称。" |
c04f5ac3 | 3208 | |
7ac1c0ad | 3209 | #: builtin/tag.c:545 |
c04f5ac3 JX |
3210 | #, c-format |
3211 | msgid "tag '%s' already exists" | |
3212 | msgstr "tag '%s' 已存在" | |
3213 | ||
7ac1c0ad | 3214 | #: builtin/tag.c:563 |
c04f5ac3 JX |
3215 | #, c-format |
3216 | msgid "%s: cannot lock the ref" | |
3217 | msgstr "%s:不能锁定引用" | |
3218 | ||
7ac1c0ad | 3219 | #: builtin/tag.c:565 |
c04f5ac3 JX |
3220 | #, c-format |
3221 | msgid "%s: cannot update the ref" | |
3222 | msgstr "%s:不能更新引用" | |
3223 | ||
7ac1c0ad | 3224 | #: builtin/tag.c:567 |
c04f5ac3 JX |
3225 | #, c-format |
3226 | msgid "Updated tag '%s' (was %s)\n" | |
3227 | msgstr "已更新tag '%s'(曾为 %s)\n" | |
3228 | ||
3229 | #: git-am.sh:49 | |
3230 | msgid "You need to set your committer info first" | |
3231 | msgstr "您需要先设置你的提交者信息" | |
3232 | ||
14c8bced | 3233 | #: git-am.sh:136 |
c04f5ac3 JX |
3234 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
3235 | msgstr "版本库缺乏必要的 blob 数据以进行三路合并。" | |
3236 | ||
14c8bced | 3237 | #: git-am.sh:147 |
c04f5ac3 JX |
3238 | msgid "" |
3239 | "Did you hand edit your patch?\n" | |
3240 | "It does not apply to blobs recorded in its index." | |
3241 | msgstr "" | |
3242 | "您是否曾手动编辑过您的补丁?\n" | |
90e6ef53 | 3243 | "无法应用补丁到索引中的数据上。" |
c04f5ac3 | 3244 | |
14c8bced | 3245 | #: git-am.sh:156 |
c04f5ac3 | 3246 | msgid "Falling back to patching base and 3-way merge..." |
90e6ef53 | 3247 | msgstr "回退到补丁基础版本并使用三路合并..." |
c04f5ac3 | 3248 | |
14c8bced | 3249 | #: git-am.sh:268 |
c04f5ac3 JX |
3250 | msgid "Only one StGIT patch series can be applied at once" |
3251 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
3252 | ||
14c8bced | 3253 | #: git-am.sh:355 |
c04f5ac3 JX |
3254 | #, sh-format |
3255 | msgid "Patch format $patch_format is not supported." | |
3256 | msgstr "不支持 $patch_format 补丁格式。" | |
3257 | ||
14c8bced | 3258 | #: git-am.sh:357 |
c04f5ac3 JX |
3259 | msgid "Patch format detection failed." |
3260 | msgstr "补丁格式检测失败。" | |
3261 | ||
dac1de7d | 3262 | #: git-am.sh:411 |
c04f5ac3 JX |
3263 | msgid "-d option is no longer supported. Do not use." |
3264 | msgstr "不再支持 -d 选项。不要使用。" | |
3265 | ||
dac1de7d | 3266 | #: git-am.sh:474 |
c04f5ac3 JX |
3267 | #, sh-format |
3268 | msgid "previous rebase directory $dotest still exists but mbox given." | |
3269 | msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。" | |
3270 | ||
dac1de7d | 3271 | #: git-am.sh:479 |
c04f5ac3 JX |
3272 | msgid "Please make up your mind. --skip or --abort?" |
3273 | msgstr "请下决心。--skip 或是 --abort ?" | |
3274 | ||
dac1de7d | 3275 | #: git-am.sh:506 |
c04f5ac3 JX |
3276 | msgid "Resolve operation not in progress, we are not resuming." |
3277 | msgstr "解决操作未进行,我们不会继续。" | |
3278 | ||
dac1de7d | 3279 | #: git-am.sh:572 |
c04f5ac3 JX |
3280 | #, sh-format |
3281 | msgid "Dirty index: cannot apply patches (dirty: $files)" | |
90e6ef53 | 3282 | msgstr "脏的索引:不能应用补丁(脏文件:$files)" |
c04f5ac3 | 3283 | |
dac1de7d | 3284 | #: git-am.sh:748 |
c04f5ac3 | 3285 | msgid "cannot be interactive without stdin connected to a terminal." |
90e6ef53 | 3286 | msgstr "标准输入没有和终端关联,不能进行交互式操作。" |
c04f5ac3 | 3287 | |
90e6ef53 | 3288 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
3289 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] |
3290 | #. in your translation. The program will only accept English | |
3291 | #. input at this point. | |
dac1de7d | 3292 | #: git-am.sh:759 |
c04f5ac3 JX |
3293 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " |
3294 | msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " | |
3295 | ||
dac1de7d | 3296 | #: git-am.sh:795 |
c04f5ac3 JX |
3297 | #, sh-format |
3298 | msgid "Applying: $FIRSTLINE" | |
3299 | msgstr "正应用:$FIRSTLINE" | |
3300 | ||
dac1de7d | 3301 | #: git-am.sh:840 |
c04f5ac3 JX |
3302 | msgid "No changes -- Patch already applied." |
3303 | msgstr "没有变更 -- 补丁已经应用过。" | |
3304 | ||
dac1de7d | 3305 | #: git-am.sh:866 |
c04f5ac3 JX |
3306 | msgid "applying to an empty history" |
3307 | msgstr "正应用到一个空历史上" | |
3308 | ||
90e6ef53 | 3309 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
3310 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
3311 | #. translation. The program will only accept English input | |
3312 | #. at this point. | |
3313 | #: git-bisect.sh:54 | |
3314 | msgid "Do you want me to do it for you [Y/n]? " | |
3315 | msgstr "您想让我为您这样做么[Y/n]? " | |
3316 | ||
3317 | #: git-bisect.sh:95 | |
3318 | #, sh-format | |
3319 | msgid "unrecognised option: '$arg'" | |
3320 | msgstr "未识别的选项:'$arg'" | |
3321 | ||
3322 | #: git-bisect.sh:99 | |
3323 | #, sh-format | |
3324 | msgid "'$arg' does not appear to be a valid revision" | |
3325 | msgstr "'$arg' 看起来不像是一个有效的版本" | |
3326 | ||
3327 | #: git-bisect.sh:117 | |
3328 | msgid "Bad HEAD - I need a HEAD" | |
3329 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
3330 | ||
3331 | #: git-bisect.sh:130 | |
3332 | #, sh-format | |
3333 | msgid "" | |
3334 | "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." | |
3335 | msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。" | |
3336 | ||
3337 | #: git-bisect.sh:140 | |
3338 | msgid "won't bisect on seeked tree" | |
3339 | msgstr "不会在已查找过的树上二分查找" | |
3340 | ||
3341 | #: git-bisect.sh:144 | |
3342 | msgid "Bad HEAD - strange symbolic ref" | |
90e6ef53 | 3343 | msgstr "坏的 HEAD - 奇怪的符号引用" |
c04f5ac3 JX |
3344 | |
3345 | #: git-bisect.sh:189 | |
3346 | #, sh-format | |
3347 | msgid "Bad bisect_write argument: $state" | |
90e6ef53 | 3348 | msgstr "坏的 bisect_write 参数:$state" |
c04f5ac3 JX |
3349 | |
3350 | #: git-bisect.sh:218 | |
3351 | #, sh-format | |
3352 | msgid "Bad rev input: $arg" | |
90e6ef53 | 3353 | msgstr "输入坏的版本:$arg" |
c04f5ac3 JX |
3354 | |
3355 | #: git-bisect.sh:232 | |
3356 | msgid "Please call 'bisect_state' with at least one argument." | |
3357 | msgstr "请在调用 'bisect_state' 时跟至少一个参数。" | |
3358 | ||
3359 | #: git-bisect.sh:244 | |
3360 | #, sh-format | |
3361 | msgid "Bad rev input: $rev" | |
3362 | msgstr "输入坏的版本:$rev" | |
3363 | ||
3364 | #: git-bisect.sh:250 | |
3365 | msgid "'git bisect bad' can take only one argument." | |
3366 | msgstr "'git bisect bad' 只能带一个参数。" | |
3367 | ||
90e6ef53 | 3368 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
3369 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
3370 | #. translation. The program will only accept English input | |
3371 | #. at this point. | |
3372 | #: git-bisect.sh:279 | |
3373 | msgid "Are you sure [Y/n]? " | |
3374 | msgstr "您确认么[Y/n]? " | |
3375 | ||
3376 | #: git-bisect.sh:354 | |
3377 | #, sh-format | |
3378 | msgid "'$invalid' is not a valid commit" | |
3379 | msgstr "'$invalid' 不是一个有效的提交" | |
3380 | ||
3381 | #: git-bisect.sh:363 | |
3382 | #, sh-format | |
3383 | msgid "" | |
3384 | "Could not check out original HEAD '$branch'.\n" | |
3385 | "Try 'git bisect reset <commit>'." | |
3386 | msgstr "" | |
3387 | "不能检出原始 HEAD '$branch'。\n" | |
3388 | "尝试 'git bisect reset <commit>'。" | |
3389 | ||
3390 | #: git-bisect.sh:390 | |
3391 | msgid "No logfile given" | |
3392 | msgstr "未提供日志文件" | |
3393 | ||
3394 | #: git-bisect.sh:391 | |
3395 | #, sh-format | |
3396 | msgid "cannot read $file for replaying" | |
3397 | msgstr "不能读取 $file 来重放" | |
3398 | ||
3399 | #: git-bisect.sh:408 | |
3400 | msgid "?? what are you talking about?" | |
3401 | msgstr "?? 您在说什么?" | |
3402 | ||
3403 | #: git-bisect.sh:474 | |
3404 | msgid "We are not bisecting." | |
90e6ef53 | 3405 | msgstr "我们没有在二分查找。" |
c04f5ac3 JX |
3406 | |
3407 | #: git-pull.sh:21 | |
3408 | msgid "" | |
3409 | "Pull is not possible because you have unmerged files.\n" | |
3410 | "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" | |
3411 | "as appropriate to mark resolution, or use 'git commit -a'." | |
3412 | msgstr "" | |
90e6ef53 | 3413 | "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n" |
c04f5ac3 | 3414 | "然后酌情使用 'git add/rm <file>' 标记解决方案,\n" |
90e6ef53 | 3415 | "或者使用 'git commit -a'。" |
c04f5ac3 JX |
3416 | |
3417 | #: git-pull.sh:25 | |
3418 | msgid "Pull is not possible because you have unmerged files." | |
90e6ef53 | 3419 | msgstr "Pull 不可用,因为您尚有未合并的文件。" |
c04f5ac3 | 3420 | |
7ac1c0ad | 3421 | #: git-pull.sh:197 |
c04f5ac3 | 3422 | msgid "updating an unborn branch with changes added to the index" |
90e6ef53 | 3423 | msgstr "更新尚未诞生的分支,变更添加至索引" |
c04f5ac3 | 3424 | |
7ac1c0ad | 3425 | #: git-pull.sh:253 |
c04f5ac3 JX |
3426 | msgid "Cannot merge multiple branches into empty head" |
3427 | msgstr "无法将多个分支合并到空分支" | |
3428 | ||
7ac1c0ad | 3429 | #: git-pull.sh:257 |
c04f5ac3 JX |
3430 | msgid "Cannot rebase onto multiple branches" |
3431 | msgstr "无法变基到多个分支" | |
3432 | ||
3433 | #: git-stash.sh:51 | |
3434 | msgid "git stash clear with parameters is unimplemented" | |
3435 | msgstr "git stash clear 不支持参数" | |
3436 | ||
3437 | #: git-stash.sh:74 | |
3438 | msgid "You do not have the initial commit yet" | |
3439 | msgstr "您尚未建立初始提交" | |
3440 | ||
3441 | #: git-stash.sh:89 | |
3442 | msgid "Cannot save the current index state" | |
90e6ef53 | 3443 | msgstr "无法保存当前索引状态" |
c04f5ac3 JX |
3444 | |
3445 | #: git-stash.sh:123 git-stash.sh:136 | |
3446 | msgid "Cannot save the current worktree state" | |
3447 | msgstr "无法保存当前工作区状态" | |
3448 | ||
3449 | #: git-stash.sh:140 | |
3450 | msgid "No changes selected" | |
90e6ef53 | 3451 | msgstr "没有选择变更" |
c04f5ac3 JX |
3452 | |
3453 | #: git-stash.sh:143 | |
3454 | msgid "Cannot remove temporary index (can't happen)" | |
90e6ef53 | 3455 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 JX |
3456 | |
3457 | #: git-stash.sh:156 | |
3458 | msgid "Cannot record working tree state" | |
3459 | msgstr "不能记录工作区状态" | |
3460 | ||
3461 | #: git-stash.sh:223 | |
3462 | msgid "No local changes to save" | |
3463 | msgstr "没有要保存的本地修改" | |
3464 | ||
3465 | #: git-stash.sh:227 | |
3466 | msgid "Cannot initialize stash" | |
90e6ef53 | 3467 | msgstr "无法初始化 stash" |
c04f5ac3 JX |
3468 | |
3469 | #: git-stash.sh:235 | |
3470 | msgid "Cannot save the current status" | |
3471 | msgstr "无法保存当前状态" | |
3472 | ||
3473 | #: git-stash.sh:253 | |
3474 | msgid "Cannot remove worktree changes" | |
3475 | msgstr "无法删除工作区变更" | |
3476 | ||
3477 | #: git-stash.sh:352 | |
3478 | msgid "No stash found." | |
90e6ef53 | 3479 | msgstr "未发现 stash。" |
c04f5ac3 JX |
3480 | |
3481 | #: git-stash.sh:359 | |
3482 | #, sh-format | |
3483 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 3484 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 JX |
3485 | |
3486 | #: git-stash.sh:365 | |
3487 | #, sh-format | |
3488 | msgid "$reference is not valid reference" | |
3489 | msgstr "$reference 不是有效的引用" | |
3490 | ||
3491 | #: git-stash.sh:393 | |
3492 | #, sh-format | |
3493 | msgid "'$args' is not a stash-like commit" | |
90e6ef53 | 3494 | msgstr "'$args' 不是 stash 样提交" |
c04f5ac3 JX |
3495 | |
3496 | #: git-stash.sh:404 | |
3497 | #, sh-format | |
3498 | msgid "'$args' is not a stash reference" | |
90e6ef53 | 3499 | msgstr "'$args' 不是一个 stash 引用" |
c04f5ac3 JX |
3500 | |
3501 | #: git-stash.sh:412 | |
3502 | msgid "unable to refresh index" | |
90e6ef53 | 3503 | msgstr "无法刷新索引" |
c04f5ac3 JX |
3504 | |
3505 | #: git-stash.sh:416 | |
3506 | msgid "Cannot apply a stash in the middle of a merge" | |
3507 | msgstr "无法在合并过程中恢复进度" | |
3508 | ||
3509 | #: git-stash.sh:424 | |
3510 | msgid "Conflicts in index. Try without --index." | |
90e6ef53 | 3511 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 JX |
3512 | |
3513 | #: git-stash.sh:426 | |
3514 | msgid "Could not save index tree" | |
90e6ef53 | 3515 | msgstr "不能保存索引树" |
c04f5ac3 JX |
3516 | |
3517 | #: git-stash.sh:460 | |
3518 | msgid "Cannot unstage modified files" | |
3519 | msgstr "无法还原修改的文件" | |
3520 | ||
3521 | #: git-stash.sh:491 | |
3522 | #, sh-format | |
3523 | msgid "Dropped ${REV} ($s)" | |
3524 | msgstr "丢弃了 ${REV} ($s)" | |
3525 | ||
3526 | #: git-stash.sh:492 | |
3527 | #, sh-format | |
3528 | msgid "${REV}: Could not drop stash entry" | |
90e6ef53 | 3529 | msgstr "${REV}:不能丢弃进度条目" |
c04f5ac3 JX |
3530 | |
3531 | #: git-stash.sh:499 | |
3532 | msgid "No branch name specified" | |
3533 | msgstr "未指定分支名" | |
3534 | ||
3535 | #: git-stash.sh:570 | |
3536 | msgid "(To restore them type \"git stash apply\")" | |
3537 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
3538 | ||
3539 | #: git-submodule.sh:56 | |
3540 | #, sh-format | |
3541 | msgid "cannot strip one component off url '$remoteurl'" | |
3542 | msgstr "无法从 url '$remoteurl' 剥离一个组件" | |
3543 | ||
3544 | #: git-submodule.sh:108 | |
3545 | #, sh-format | |
3546 | msgid "No submodule mapping found in .gitmodules for path '$path'" | |
3547 | msgstr "未在 .gitmodules 中发现路径 '$path' 的子模组映射" | |
3548 | ||
dac1de7d | 3549 | #: git-submodule.sh:149 |
c04f5ac3 JX |
3550 | #, sh-format |
3551 | msgid "Clone of '$url' into submodule path '$path' failed" | |
90e6ef53 | 3552 | msgstr "无法克隆 '$url' 到子模组路径 '$path'" |
c04f5ac3 | 3553 | |
dac1de7d JX |
3554 | #: git-submodule.sh:159 |
3555 | #, sh-format | |
3556 | msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" | |
3557 | msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反" | |
3558 | ||
c04f5ac3 JX |
3559 | #: git-submodule.sh:247 |
3560 | #, sh-format | |
3561 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
3562 | msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始" | |
3563 | ||
3564 | #: git-submodule.sh:264 | |
3565 | #, sh-format | |
3566 | msgid "'$path' already exists in the index" | |
90e6ef53 | 3567 | msgstr "'$path' 已经存在于索引中" |
c04f5ac3 JX |
3568 | |
3569 | #: git-submodule.sh:281 | |
3570 | #, sh-format | |
3571 | msgid "'$path' already exists and is not a valid git repo" | |
3572 | msgstr "'$path' 已存在且不是一个有效的 git 版本库" | |
3573 | ||
3574 | #: git-submodule.sh:295 | |
3575 | #, sh-format | |
3576 | msgid "Unable to checkout submodule '$path'" | |
3577 | msgstr "不能检出子模组 '$path'" | |
3578 | ||
3579 | #: git-submodule.sh:300 | |
3580 | #, sh-format | |
3581 | msgid "Failed to add submodule '$path'" | |
3582 | msgstr "无法添加子模组 '$path'" | |
3583 | ||
3584 | #: git-submodule.sh:305 | |
3585 | #, sh-format | |
3586 | msgid "Failed to register submodule '$path'" | |
3587 | msgstr "无法注册子模组 '$path'" | |
3588 | ||
3589 | #: git-submodule.sh:347 | |
3590 | #, sh-format | |
3591 | msgid "Entering '$prefix$path'" | |
3592 | msgstr "正在进入 '$prefix$path'" | |
3593 | ||
3594 | #: git-submodule.sh:359 | |
3595 | #, sh-format | |
3596 | msgid "Stopping at '$path'; script returned non-zero status." | |
3597 | msgstr "停止于 '$path',脚本返回非零值。" | |
3598 | ||
3599 | #: git-submodule.sh:401 | |
3600 | #, sh-format | |
3601 | msgid "No url found for submodule path '$path' in .gitmodules" | |
90e6ef53 | 3602 | msgstr "在 .gitmodules 中未找到子模组路径 '$path' 的 url" |
c04f5ac3 JX |
3603 | |
3604 | #: git-submodule.sh:410 | |
3605 | #, sh-format | |
3606 | msgid "Failed to register url for submodule path '$path'" | |
3607 | msgstr "无法为子模组路径 '$path' 注册 url" | |
3608 | ||
3609 | #: git-submodule.sh:418 | |
3610 | #, sh-format | |
3611 | msgid "Failed to register update mode for submodule path '$path'" | |
3612 | msgstr "无法为子模组路径 '$path' 注册更新模式" | |
3613 | ||
3614 | #: git-submodule.sh:420 | |
3615 | #, sh-format | |
3616 | msgid "Submodule '$name' ($url) registered for path '$path'" | |
3617 | msgstr "子模组 '$name' ($url) 已为路径 '$path' 注册" | |
3618 | ||
3619 | #: git-submodule.sh:519 | |
3620 | #, sh-format | |
3621 | msgid "" | |
3622 | "Submodule path '$path' not initialized\n" | |
3623 | "Maybe you want to use 'update --init'?" | |
3624 | msgstr "" | |
3625 | "子模组路径 '$path' 没有初始化\n" | |
90e6ef53 | 3626 | "也许您想用 'update --init'?" |
c04f5ac3 JX |
3627 | |
3628 | #: git-submodule.sh:532 | |
3629 | #, sh-format | |
3630 | msgid "Unable to find current revision in submodule path '$path'" | |
3631 | msgstr "无法在子模组路径 '$path' 中找到当前版本" | |
3632 | ||
3633 | #: git-submodule.sh:551 | |
3634 | #, sh-format | |
3635 | msgid "Unable to fetch in submodule path '$path'" | |
3636 | msgstr "无法在子模组路径 '$path' 中获取" | |
3637 | ||
3638 | #: git-submodule.sh:565 | |
3639 | #, sh-format | |
3640 | msgid "Unable to rebase '$sha1' in submodule path '$path'" | |
3641 | msgstr "无法在子模组路径 '$path' 中变基 '$sha1'" | |
3642 | ||
3643 | #: git-submodule.sh:566 | |
3644 | #, sh-format | |
3645 | msgid "Submodule path '$path': rebased into '$sha1'" | |
3646 | msgstr "子模组路径 '$path':变基至 '$sha1'" | |
3647 | ||
3648 | #: git-submodule.sh:571 | |
3649 | #, sh-format | |
3650 | msgid "Unable to merge '$sha1' in submodule path '$path'" | |
3651 | msgstr "无法合并 '$sha1' 到子模组路径 '$path' 中" | |
3652 | ||
3653 | #: git-submodule.sh:572 | |
3654 | #, sh-format | |
3655 | msgid "Submodule path '$path': merged in '$sha1'" | |
3656 | msgstr "子模组路径 '$path':已合并入 '$sha1'" | |
3657 | ||
3658 | #: git-submodule.sh:577 | |
3659 | #, sh-format | |
3660 | msgid "Unable to checkout '$sha1' in submodule path '$path'" | |
3661 | msgstr "无法在子模组路径 '$path' 中检出 '$sha1'" | |
3662 | ||
3663 | #: git-submodule.sh:578 | |
3664 | #, sh-format | |
3665 | msgid "Submodule path '$path': checked out '$sha1'" | |
3666 | msgstr "子模组路径 '$path':检出 '$sha1'" | |
3667 | ||
3668 | #: git-submodule.sh:600 git-submodule.sh:923 | |
3669 | #, sh-format | |
3670 | msgid "Failed to recurse into submodule path '$path'" | |
3671 | msgstr "无法递归进子模组路径 '$path'" | |
3672 | ||
3673 | #: git-submodule.sh:708 | |
3674 | msgid "--" | |
3675 | msgstr "--" | |
3676 | ||
90e6ef53 | 3677 | # 译者:注意保持前导空格 |
c04f5ac3 JX |
3678 | #: git-submodule.sh:766 |
3679 | #, sh-format | |
3680 | msgid " Warn: $name doesn't contain commit $sha1_src" | |
3681 | msgstr " 警告:$name 未包含提交 $sha1_src" | |
3682 | ||
90e6ef53 | 3683 | # 译者:注意保持前导空格 |
c04f5ac3 JX |
3684 | #: git-submodule.sh:769 |
3685 | #, sh-format | |
3686 | msgid " Warn: $name doesn't contain commit $sha1_dst" | |
3687 | msgstr " 警告:$name 未包含提交 $sha1_dst" | |
3688 | ||
90e6ef53 | 3689 | # 译者:注意保持前导空格 |
c04f5ac3 JX |
3690 | #: git-submodule.sh:772 |
3691 | #, sh-format | |
3692 | msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" | |
3693 | msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst" | |
3694 | ||
3695 | #: git-submodule.sh:797 | |
3696 | msgid "blob" | |
3697 | msgstr "blob" | |
3698 | ||
3699 | #: git-submodule.sh:798 | |
3700 | msgid "submodule" | |
3701 | msgstr "子模组" | |
3702 | ||
3703 | #: git-submodule.sh:969 | |
3704 | #, sh-format | |
3705 | msgid "Synchronizing submodule url for '$name'" | |
90e6ef53 | 3706 | msgstr "为 '$name' 同步子模组 url" |