c04f5ac304 · matheusbsbs/matheus-bagliano

@@ -0,0 +1,3611 @@

1 +# Chinese translations for Git package

2 +# Git 软件包的简体中文翻译.

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"

15 +"POT-Creation-Date: 2012-02-13 14:24+0800\n"

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 +

73 +# 注意保持前导空格

74 +#: diff.c:104

75 +#, c-format

76 +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"

77 +msgstr " 无法解析 dirstat 阈值 '%.*s'\n"

78 +

79 +# 注意保持前导空格

80 +#: diff.c:109

81 +#, c-format

82 +msgid " Unknown dirstat parameter '%.*s'\n"

83 +msgstr " 未知 dirstat 参数 '%.*s'\n"

84 +

85 +#: diff.c:208

86 +#, c-format

87 +msgid ""

88 +"Found errors in 'diff.dirstat' config variable:\n"

89 +"%s"

90 +msgstr ""

91 +"配置变量 'diff.dirstat' 出错：\n"

92 +"%s"

93 +

94 +#: diff.c:3308

95 +#, c-format

96 +msgid ""

97 +"Failed to parse --dirstat/-X option parameter:\n"

98 +"%s"

99 +msgstr ""

100 +"无法解析 --dirstat/-X 选项的参数：\n"

101 +"%s"

102 +

103 +#: gpg-interface.c:59

104 +msgid "could not run gpg."

105 +msgstr "不能执行 gpg。"

106 +

107 +#: gpg-interface.c:71

108 +msgid "gpg did not accept the data"

109 +msgstr "gpg 没有接受数据"

110 +

111 +#: gpg-interface.c:82

112 +msgid "gpg failed to sign the data"

113 +msgstr "gpg 无法为数据签名"

114 +

115 +#: help.c:309

116 +#, c-format

117 +msgid ""

118 +"'%s' appears to be a git command, but we were not\n"

119 +"able to execute it. Maybe git-%s is broken?"

120 +msgstr ""

121 +"'%s' 像是一个 git 命令，但却无法运行。\n"

122 +"可能是 git-%s 受损？"

123 +

124 +#: remote.c:1576

125 +#, c-format

126 +msgid "Your branch is ahead of '%s' by %d commit.\n"

127 +msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

128 +msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"

129 +

130 +#: remote.c:1582

131 +#, c-format

132 +msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

133 +msgid_plural ""

134 +"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"

135 +msgstr[0] "您的分支落后 '%s' 共 %d 个提交，且可以快进式推送。\n"

136 +

137 +#: remote.c:1590

138 +#, c-format

139 +msgid ""

140 +"Your branch and '%s' have diverged,\n"

141 +"and have %d and %d different commit each, respectively.\n"

142 +msgid_plural ""

143 +"Your branch and '%s' have diverged,\n"

144 +"and have %d and %d different commits each, respectively.\n"

145 +msgstr[0] ""

146 +"您的分支和 '%s' 出现了偏离，\n"

147 +"并且各自分别有 %d 和 %d 处不同的提交。\n"

148 +

149 +#: sequencer.c:120 builtin/merge.c:862 builtin/merge.c:983

150 +#: builtin/merge.c:1093 builtin/merge.c:1103

151 +#, c-format

152 +msgid "Could not open '%s' for writing"

153 +msgstr "无法为写入打开 '%s'"

154 +

155 +#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:865

156 +#: builtin/merge.c:1095 builtin/merge.c:1108

157 +#, c-format

158 +msgid "Could not write to '%s'"

159 +msgstr "无法写入 '%s'"

160 +

161 +#: sequencer.c:142

162 +msgid ""

163 +"after resolving the conflicts, mark the corrected paths\n"

164 +"with 'git add <paths>' or 'git rm <paths>'\n"

165 +"and commit the result with 'git commit'"

166 +msgstr ""

167 +"冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"

168 +"对修正后的文件做标记，然后用 'git commit' 提交"

169 +

170 +#: sequencer.c:154 sequencer.c:680 sequencer.c:763

171 +#, c-format

172 +msgid "Could not write to %s"

173 +msgstr "不能写入 %s"

174 +

175 +#: sequencer.c:157

176 +#, c-format

177 +msgid "Error wrapping up %s"

178 +msgstr "错误收尾 %s"

179 +

180 +#: sequencer.c:172

181 +msgid "Your local changes would be overwritten by cherry-pick."

182 +msgstr "您的本地修改将被拣选操作覆盖。"

183 +

184 +#: sequencer.c:174

185 +msgid "Your local changes would be overwritten by revert."

186 +msgstr "您的本地修改将被还原操作覆盖。"

187 +

188 +#: sequencer.c:177

189 +msgid "Commit your changes or stash them to proceed."

190 +msgstr "提交您的修改或保存进度后再继续。"

191 +

192 +#. TRANSLATORS: %s will be "revert" or "cherry-pick"

193 +#: sequencer.c:227

194 +#, c-format

195 +msgid "%s: Unable to write new index file"

196 +msgstr "%s：无法写入新暂存区文件"

197 +

198 +#: sequencer.c:293

199 +msgid "Your index file is unmerged."

200 +msgstr "您的暂存区文件未完成合并。"

201 +

202 +#: sequencer.c:296

203 +msgid "You do not have a valid HEAD"

204 +msgstr "您没有一个有效的 HEAD"

205 +

206 +#: sequencer.c:311

207 +#, c-format

208 +msgid "Commit %s is a merge but no -m option was given."

209 +msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"

210 +

211 +#: sequencer.c:319

212 +#, c-format

213 +msgid "Commit %s does not have parent %d"

214 +msgstr "提交 %s 没有父提交 %d"

215 +

216 +#: sequencer.c:323

217 +#, c-format

218 +msgid "Mainline was specified but commit %s is not a merge."

219 +msgstr "提供了主线但提交 %s 不是一个合并。"

220 +

221 +#. TRANSLATORS: The first %s will be "revert" or

222 +#. "cherry-pick", the second %s a SHA1

223 +#: sequencer.c:334

224 +#, c-format

225 +msgid "%s: cannot parse parent commit %s"

226 +msgstr "%s：不能解析父提交 %s"

227 +

228 +#: sequencer.c:338

229 +#, c-format

230 +msgid "Cannot get commit message for %s"

231 +msgstr "不能得到 %s 的提交说明"

232 +

233 +#: sequencer.c:422

234 +#, c-format

235 +msgid "could not revert %s... %s"

236 +msgstr "不能还原 %s... %s"

237 +

238 +#: sequencer.c:423

239 +#, c-format

240 +msgid "could not apply %s... %s"

241 +msgstr "不能应用 %s... %s"

242 +

243 +#: sequencer.c:445 sequencer.c:904 builtin/log.c:286 builtin/log.c:709

244 +#: builtin/log.c:1325 builtin/log.c:1544 builtin/merge.c:348

245 +#: builtin/shortlog.c:181

246 +msgid "revision walk setup failed"

247 +msgstr "版本遍历设置失败"

248 +

249 +#: sequencer.c:448

250 +msgid "empty commit set passed"

251 +msgstr "提供了空的提交集"

252 +

253 +#: sequencer.c:456

254 +#, c-format

255 +msgid "git %s: failed to read the index"

256 +msgstr "git %s: 无法读取暂存区"

257 +

258 +#: sequencer.c:461

259 +#, c-format

260 +msgid "git %s: failed to refresh the index"

261 +msgstr "git %s: 无法刷新暂存区"

262 +

263 +#: sequencer.c:546

264 +#, c-format

265 +msgid "Cannot %s during a %s"

266 +msgstr "无法 %s 在 %s 过程中"

267 +

268 +#: sequencer.c:568

269 +#, c-format

270 +msgid "Could not parse line %d."

271 +msgstr "无法解析第 %d 行。"

272 +

273 +#: sequencer.c:573

274 +msgid "No commits parsed."

275 +msgstr "未有提交被解析。"

276 +

277 +#: sequencer.c:586

278 +#, c-format

279 +msgid "Could not open %s"

280 +msgstr "不能打开 %s"

281 +

282 +#: sequencer.c:590

283 +#, c-format

284 +msgid "Could not read %s."

285 +msgstr "不能读取 %s。"

286 +

287 +#: sequencer.c:597

288 +#, c-format

289 +msgid "Unusable instruction sheet: %s"

290 +msgstr "无用的指令表单：%s"

291 +

292 +#: sequencer.c:625

293 +#, c-format

294 +msgid "Invalid key: %s"

295 +msgstr "无效键名：%s"

296 +

297 +#: sequencer.c:628

298 +#, c-format

299 +msgid "Invalid value for %s: %s"

300 +msgstr "无效的 %s 值：%s"

301 +

302 +#: sequencer.c:640

303 +#, c-format

304 +msgid "Malformed options sheet: %s"

305 +msgstr "非法的选项表单：%s"

306 +

307 +#: sequencer.c:661

308 +msgid "a cherry-pick or revert is already in progress"

309 +msgstr "一个拣选或还原操作已在进行"

310 +

311 +#: sequencer.c:662

312 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

313 +msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""

314 +

315 +#: sequencer.c:666

316 +#, c-format

317 +msgid "Could not create sequencer directory %s"

318 +msgstr "无法创建序列目录 %s"

319 +

320 +#: sequencer.c:682 sequencer.c:767

321 +#, c-format

322 +msgid "Error wrapping up %s."

323 +msgstr "错误收尾 %s。"

324 +

325 +#: sequencer.c:701 sequencer.c:835

326 +msgid "no cherry-pick or revert in progress"

327 +msgstr "没有拣选或还原操作在进行"

328 +

329 +#: sequencer.c:703

330 +msgid "cannot resolve HEAD"

331 +msgstr "不能解析 HEAD"

332 +

333 +#: sequencer.c:705

334 +msgid "cannot abort from a branch yet to be born"

335 +msgstr "不能从未初始分支终止"

336 +

337 +#: sequencer.c:727

338 +#, c-format

339 +msgid "cannot open %s: %s"

340 +msgstr "不能打开 %s：%s"

341 +

342 +#: sequencer.c:730

343 +#, c-format

344 +msgid "cannot read %s: %s"

345 +msgstr "不能读取 %s：%s"

346 +

347 +#: sequencer.c:731

348 +msgid "unexpected end of file"

349 +msgstr "未预期的文件结束"

350 +

351 +#: sequencer.c:737

352 +#, c-format

353 +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

354 +msgstr "保存预拣选提交的 HEAD 文件 '%s' 损坏"

355 +

356 +#: sequencer.c:760

357 +#, c-format

358 +msgid "Could not format %s."

359 +msgstr "不能格式化 %s。"

360 +

361 +#: sequencer.c:922

362 +msgid "Can't revert as initial commit"

363 +msgstr "不能作为初始提交还原"

364 +

365 +#: sequencer.c:923

366 +msgid "Can't cherry-pick into empty head"

367 +msgstr "不能拣选到空分支"

368 +

369 +#: wt-status.c:134

370 +msgid "Unmerged paths:"

371 +msgstr "未合并的路径："

372 +

373 +# 注意保持前导空格

374 +#: wt-status.c:140 wt-status.c:157

375 +#, c-format

376 +msgid " (use \"git reset %s <file>...\" to unstage)"

377 +msgstr " （使用 \"git reset %s <file>...\" 撤出暂存区）"

378 +

379 +# 注意保持前导空格

380 +#: wt-status.c:142 wt-status.c:159

381 +msgid " (use \"git rm --cached <file>...\" to unstage)"

382 +msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）"

383 +

384 +# 注意保持前导空格

385 +#: wt-status.c:143

386 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

387 +msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）"

388 +

389 +#: wt-status.c:151

390 +msgid "Changes to be committed:"

391 +msgstr "要提交的变更："

392 +

393 +#: wt-status.c:169

394 +msgid "Changes not staged for commit:"

395 +msgstr "未暂存至提交的变更："

396 +

397 +# 注意保持前导空格

398 +#: wt-status.c:173

399 +msgid " (use \"git add <file>...\" to update what will be committed)"

400 +msgstr " （使用 \"git add <file>...\" 更新要提交的内容）"

401 +

402 +# 注意保持前导空格

403 +#: wt-status.c:175

404 +msgid " (use \"git add/rm <file>...\" to update what will be committed)"

405 +msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）"

406 +

407 +# 注意保持前导空格

408 +#: wt-status.c:176

409 +msgid ""

410 +" (use \"git checkout -- <file>...\" to discard changes in working directory)"

411 +msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）"

412 +

413 +# 注意保持前导空格

414 +#: wt-status.c:178

415 +msgid " (commit or discard the untracked or modified content in submodules)"

416 +msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"

417 +

418 +#: wt-status.c:187

419 +#, c-format

420 +msgid "%s files:"

421 +msgstr "%s文件："

422 +

423 +# 注意保持前导空格

424 +#: wt-status.c:190

425 +#, c-format

426 +msgid " (use \"git %s <file>...\" to include in what will be committed)"

427 +msgstr " （使用 \"git %s <file>...\" 包含到提交列表）"

428 +

429 +#: wt-status.c:207

430 +msgid "bug"

431 +msgstr "bug"

432 +

433 +#: wt-status.c:212

434 +msgid "both deleted:"

435 +msgstr "双方删除："

436 +

437 +#: wt-status.c:213

438 +msgid "added by us:"

439 +msgstr "由我们添加："

440 +

441 +#: wt-status.c:214

442 +msgid "deleted by them:"

443 +msgstr "由他们删除："

444 +

445 +#: wt-status.c:215

446 +msgid "added by them:"

447 +msgstr "由他们添加："

448 +

449 +#: wt-status.c:216

450 +msgid "deleted by us:"

451 +msgstr "由我们删除："

452 +

453 +#: wt-status.c:217

454 +msgid "both added:"

455 +msgstr "双方添加："

456 +

457 +#: wt-status.c:218

458 +msgid "both modified:"

459 +msgstr "双方修改："

460 +

461 +#: wt-status.c:248

462 +msgid "new commits, "

463 +msgstr "新提交，"

464 +

465 +#: wt-status.c:250

466 +msgid "modified content, "

467 +msgstr "修改的内容，"

468 +

469 +#: wt-status.c:252

470 +msgid "untracked content, "

471 +msgstr "未跟踪的内容，"

472 +

473 +# 为保证在输出中对齐，注意调整句中空格！

474 +#: wt-status.c:266

475 +#, c-format

476 +msgid "new file: %s"

477 +msgstr "新文件： %s"

478 +

479 +# 为保证在输出中对齐，注意调整句中空格！

480 +#: wt-status.c:269

481 +#, c-format

482 +msgid "copied: %s -> %s"

483 +msgstr "拷贝： %s -> %s"

484 +

485 +# 为保证在输出中对齐，注意调整句中空格！

486 +#: wt-status.c:272

487 +#, c-format

488 +msgid "deleted: %s"

489 +msgstr "删除： %s"

490 +

491 +# 为保证在输出中对齐，注意调整句中空格！

492 +#: wt-status.c:275

493 +#, c-format

494 +msgid "modified: %s"

495 +msgstr "修改： %s"

496 +

497 +# 为保证在输出中对齐，注意调整句中空格！

498 +#: wt-status.c:278

499 +#, c-format

500 +msgid "renamed: %s -> %s"

501 +msgstr "重命名： %s -> %s"

502 +

503 +# 为保证在输出中对齐，注意调整句中空格！

504 +#: wt-status.c:281

505 +#, c-format

506 +msgid "typechange: %s"

507 +msgstr "类型变更： %s"

508 +

509 +# 为保证在输出中对齐，注意调整句中空格！

510 +#: wt-status.c:284

511 +#, c-format

512 +msgid "unknown: %s"

513 +msgstr "未知： %s"

514 +

515 +# 为保证在输出中对齐，注意调整句中空格！

516 +#: wt-status.c:287

517 +#, c-format

518 +msgid "unmerged: %s"

519 +msgstr "未合并： %s"

520 +

521 +#: wt-status.c:290

522 +#, c-format

523 +msgid "bug: unhandled diff status %c"

524 +msgstr "bug: 未处理的差异状态 %c"

525 +

526 +#: wt-status.c:713

527 +msgid "On branch "

528 +msgstr "位于分支 "

529 +

530 +#: wt-status.c:720

531 +msgid "Not currently on any branch."

532 +msgstr "当前不在任何分支上。"

533 +

534 +#: wt-status.c:731

535 +msgid "Initial commit"

536 +msgstr "初始提交"

537 +

538 +#: wt-status.c:745

539 +msgid "Untracked"

540 +msgstr "未跟踪的"

541 +

542 +#: wt-status.c:747

543 +msgid "Ignored"

544 +msgstr "忽略的"

545 +

546 +#: wt-status.c:749

547 +#, c-format

548 +msgid "Untracked files not listed%s"

549 +msgstr "未跟踪的文件没有列出%s"

550 +

551 +# 注意保持前导空格

552 +#: wt-status.c:751

553 +msgid " (use -u option to show untracked files)"

554 +msgstr " （使用 -u 参数显示未跟踪的文件）"

555 +

556 +#: wt-status.c:757

557 +msgid "No changes"

558 +msgstr "没有修改"

559 +

560 +#: wt-status.c:761

561 +#, c-format

562 +msgid "no changes added to commit%s\n"

563 +msgstr "修改尚未加入提交%s\n"

564 +

565 +# 注意保持前导空格

566 +#: wt-status.c:763

567 +msgid " (use \"git add\" and/or \"git commit -a\")"

568 +msgstr " （使用 \"git add\" 和/或 \"git commit -a\"）"

569 +

570 +#: wt-status.c:765

571 +#, c-format

572 +msgid "nothing added to commit but untracked files present%s\n"

573 +msgstr "空提交但存在未跟踪文件%s\n"

574 +

575 +# 注意保持前导空格

576 +#: wt-status.c:767

577 +msgid " (use \"git add\" to track)"

578 +msgstr " （使用 \"git add\" 建立跟踪）"

579 +

580 +#: wt-status.c:769 wt-status.c:772 wt-status.c:775

581 +#, c-format

582 +msgid "nothing to commit%s\n"

583 +msgstr "无须提交%s\n"

584 +

585 +# 注意保持前导空格

586 +#: wt-status.c:770

587 +msgid " (create/copy files and use \"git add\" to track)"

588 +msgstr " （新建/拷贝的文件使用 \"git add\" 建立跟踪）"

589 +

590 +# 注意保持前导空格

591 +#: wt-status.c:773

592 +msgid " (use -u to show untracked files)"

593 +msgstr " （使用 -u 显示未跟踪文件）"

594 +

595 +# 注意保持前导空格

596 +#: wt-status.c:776

597 +msgid " (working directory clean)"

598 +msgstr " （干净的工作区）"

599 +

600 +#: wt-status.c:884

601 +msgid "HEAD (no branch)"

602 +msgstr "头（非分支）"

603 +

604 +# 注意保持句尾空格

605 +#: wt-status.c:890

606 +msgid "Initial commit on "

607 +msgstr "初始提交于 "

608 +

609 +# 注意保持句尾空格

610 +#: wt-status.c:905

611 +msgid "behind "

612 +msgstr "落后 "

613 +

614 +# 注意保持句尾空格

615 +#: wt-status.c:908 wt-status.c:911

616 +msgid "ahead "

617 +msgstr "领先 "

618 +

619 +# 注意保持句尾空格

620 +#: wt-status.c:913

621 +msgid ", behind "

622 +msgstr "，落后 "

623 +

624 +#: builtin/add.c:62

625 +#, c-format

626 +msgid "unexpected diff status %c"

627 +msgstr "意外的差异状态 %c"

628 +

629 +#: builtin/add.c:67 builtin/commit.c:298

630 +msgid "updating files failed"

631 +msgstr "更新文件失败"

632 +

633 +#: builtin/add.c:77

634 +#, c-format

635 +msgid "remove '%s'\n"

636 +msgstr "删除 '%s'\n"

637 +

638 +#: builtin/add.c:176

639 +#, c-format

640 +msgid "Path '%s' is in submodule '%.*s'"

641 +msgstr "路径 '%s' 属于模组 '%.*s'"

642 +

643 +#: builtin/add.c:192

644 +msgid "Unstaged changes after refreshing the index:"

645 +msgstr "刷新暂存区后未暂存的变更："

646 +

647 +#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186

648 +#, c-format

649 +msgid "pathspec '%s' did not match any files"

650 +msgstr "路径 '%s' 未匹配任何文件"

651 +

652 +#: builtin/add.c:209

653 +#, c-format

654 +msgid "'%s' is beyond a symbolic link"

655 +msgstr "'%s' 位于符号链接中"

656 +

657 +#: builtin/add.c:276

658 +msgid "Could not read the index"

659 +msgstr "无法读取暂存区"

660 +

661 +#: builtin/add.c:286

662 +#, c-format

663 +msgid "Could not open '%s' for writing."

664 +msgstr "无法打开 '%s' 以写入。"

665 +

666 +#: builtin/add.c:290

667 +msgid "Could not write patch"

668 +msgstr "无法写补丁"

669 +

670 +#: builtin/add.c:295

671 +#, c-format

672 +msgid "Could not stat '%s'"

673 +msgstr "无法查看文件状态 '%s'"

674 +

675 +#: builtin/add.c:297

676 +msgid "Empty patch. Aborted."

677 +msgstr "空补丁。异常终止。"

678 +

679 +#: builtin/add.c:303

680 +#, c-format

681 +msgid "Could not apply '%s'"

682 +msgstr "无法应用 '%s'"

683 +

684 +#: builtin/add.c:312

685 +msgid "The following paths are ignored by one of your .gitignore files:\n"

686 +msgstr "下列路径被您的一个 .gitignore 文件所忽略：\n"

687 +

688 +#: builtin/add.c:352

689 +#, c-format

690 +msgid "Use -f if you really want to add them.\n"

691 +msgstr "使用 -f 参数如果你确实要添加它们。\n"

692 +

693 +#: builtin/add.c:353

694 +msgid "no files added"

695 +msgstr "没有文件被添加"

696 +

697 +#: builtin/add.c:359

698 +msgid "adding files failed"

699 +msgstr "添加文件失败"

700 +

701 +#: builtin/add.c:391

702 +msgid "-A and -u are mutually incompatible"

703 +msgstr "-A 和 -u 选项互斥"

704 +

705 +#: builtin/add.c:393

706 +msgid "Option --ignore-missing can only be used together with --dry-run"

707 +msgstr "选项 --ignore-missing 只能和 --dry-run 共用"

708 +

709 +#: builtin/add.c:413

710 +#, c-format

711 +msgid "Nothing specified, nothing added.\n"

712 +msgstr "未提供参数，没有文件被添加。\n"

713 +

714 +#: builtin/add.c:414

715 +#, c-format

716 +msgid "Maybe you wanted to say 'git add .'?\n"

717 +msgstr "也许您想要执行 'git add .'？\n"

718 +

719 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82

720 +#: builtin/rm.c:162

721 +msgid "index file corrupt"

722 +msgstr "暂存区文件损坏"

723 +

724 +#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260

725 +msgid "Unable to write new index file"

726 +msgstr "无法写入新暂存区文件"

727 +

728 +#: builtin/archive.c:17

729 +#, c-format

730 +msgid "could not create archive file '%s'"

731 +msgstr "无法创建归档文件 '%s'"

732 +

733 +#: builtin/archive.c:20

734 +msgid "could not redirect output"

735 +msgstr "无法重定向输出"

736 +

737 +#: builtin/archive.c:37

738 +msgid "git archive: Remote with no URL"

739 +msgstr "git archive: 未提供远程URL"

740 +

741 +#: builtin/archive.c:58

742 +msgid "git archive: expected ACK/NAK, got EOF"

743 +msgstr "git archive: 期待ACK/NACK，却得到EOF"

744 +

745 +#: builtin/archive.c:63

746 +#, c-format

747 +msgid "git archive: NACK %s"

748 +msgstr "git archive: NACK %s"

749 +

750 +#: builtin/archive.c:65

751 +#, c-format

752 +msgid "remote error: %s"

753 +msgstr "远程错误：%s"

754 +

755 +#: builtin/archive.c:66

756 +msgid "git archive: protocol error"

757 +msgstr "git archive: 协议错误"

758 +

759 +#: builtin/archive.c:71

760 +msgid "git archive: expected a flush"

761 +msgstr "git archive: 预期一个刷新"

762 +

763 +#: builtin/branch.c:137

764 +#, c-format

765 +msgid ""

766 +"deleting branch '%s' that has been merged to\n"

767 +" '%s', but not yet merged to HEAD."

768 +msgstr ""

769 +"要删除的分支 '%s' 已经合并到\n"

770 +" '%s'，但未合并到 HEAD。"

771 +

772 +#: builtin/branch.c:141

773 +#, c-format

774 +msgid ""

775 +"not deleting branch '%s' that is not yet merged to\n"

776 +" '%s', even though it is merged to HEAD."

777 +msgstr ""

778 +"不要删除分支 '%s' 其尚未合并到\n"

779 +" '%s'，虽然它已经合并到 HEAD。"

780 +

781 +# 汉字之间无空格，故删除尾部空格

782 +#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"

783 +#: builtin/branch.c:163

784 +msgid "remote "

785 +msgstr "远程"

786 +

787 +#: builtin/branch.c:171

788 +msgid "cannot use -a with -d"

789 +msgstr "不能将 -a 和 -d 共用"

790 +

791 +#: builtin/branch.c:177

792 +msgid "Couldn't look up commit object for HEAD"

793 +msgstr "无法查询 HEAD 指向的提交对象"

794 +

795 +#: builtin/branch.c:182

796 +#, c-format

797 +msgid "Cannot delete the branch '%s' which you are currently on."

798 +msgstr "无法删除您当前所在的分支 '%s'。"

799 +

800 +#: builtin/branch.c:192

801 +#, c-format

802 +msgid "%sbranch '%s' not found."

803 +msgstr "%s分支 '%s' 未发现。"

804 +

805 +#: builtin/branch.c:200

806 +#, c-format

807 +msgid "Couldn't look up commit object for '%s'"

808 +msgstr "无法查询 '%s' 指向的提交对象"

809 +

810 +#: builtin/branch.c:206

811 +#, c-format

812 +msgid ""

813 +"The branch '%s' is not fully merged.\n"

814 +"If you are sure you want to delete it, run 'git branch -D %s'."

815 +msgstr ""

816 +"分支 '%s' 没有完全合并。\n"

817 +"如果您确认要删除它，执行 'git branch -D %s'。"

818 +

819 +#: builtin/branch.c:214

820 +#, c-format

821 +msgid "Error deleting %sbranch '%s'"

822 +msgstr "错误删除 %s分支 '%s'"

823 +

824 +#: builtin/branch.c:219

825 +#, c-format

826 +msgid "Deleted %sbranch %s (was %s).\n"

827 +msgstr "已删除 %s分支 %s（曾为 %s）。\n"

828 +

829 +#: builtin/branch.c:224

830 +msgid "Update of config-file failed"

831 +msgstr "无法更新 config 文件"

832 +

833 +#: builtin/branch.c:322

834 +#, c-format

835 +msgid "branch '%s' does not point at a commit"

836 +msgstr "分支 '%s' 未指向一个提交"

837 +

838 +# 注意保持句尾空格

839 +#: builtin/branch.c:394

840 +#, c-format

841 +msgid "behind %d] "

842 +msgstr "落后 %d] "

843 +

844 +# 注意保持句尾空格

845 +#: builtin/branch.c:396

846 +#, c-format

847 +msgid "ahead %d] "

848 +msgstr "领先 %d] "

849 +

850 +# 注意保持句尾空格

851 +#: builtin/branch.c:398

852 +#, c-format

853 +msgid "ahead %d, behind %d] "

854 +msgstr "领先 %d，落后 %d] "

855 +

856 +#: builtin/branch.c:501

857 +msgid "(no branch)"

858 +msgstr "（非分支）"

859 +

860 +#: builtin/branch.c:562

861 +msgid "some refs could not be read"

862 +msgstr "一些引用无法读取"

863 +

864 +#: builtin/branch.c:575

865 +msgid "cannot rename the current branch while not on any."

866 +msgstr "无法重命名不存在的当前分支。"

867 +

868 +#: builtin/branch.c:585

869 +#, c-format

870 +msgid "Invalid branch name: '%s'"

871 +msgstr "无效的分支名：'%s'"

872 +

873 +#: builtin/branch.c:600

874 +msgid "Branch rename failed"

875 +msgstr "分支重命名失败"

876 +

877 +#: builtin/branch.c:604

878 +#, c-format

879 +msgid "Renamed a misnamed branch '%s' away"

880 +msgstr "重命名掉一个错误命名的旧分支 '%s'"

881 +

882 +#: builtin/branch.c:608

883 +#, c-format

884 +msgid "Branch renamed to %s, but HEAD is not updated!"

885 +msgstr "分支重命名为 %s，但 HEAD 没有更新！"

886 +

887 +#: builtin/branch.c:615

888 +msgid "Branch is renamed, but update of config-file failed"

889 +msgstr "分支被重命名，但更新 config 文件失败"

890 +

891 +#: builtin/branch.c:630

892 +#, c-format

893 +msgid "malformed object name %s"

894 +msgstr "非法的对象名 %s"

895 +

896 +#: builtin/branch.c:654

897 +#, c-format

898 +msgid "could not write branch description template: %s\n"

899 +msgstr "不能写分支描述模版：%s\n"

900 +

901 +#: builtin/branch.c:742

902 +msgid "Failed to resolve HEAD as a valid ref."

903 +msgstr "无法将 HEAD 解析为有效引用。"

904 +

905 +#: builtin/branch.c:747 builtin/clone.c:570

906 +msgid "HEAD not found below refs/heads!"

907 +msgstr "未在 /refs/heads 下发现 HEAD！"

908 +

909 +#: builtin/branch.c:805

910 +msgid "-a and -r options to 'git branch' do not make sense with a branch name"

911 +msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"

912 +

913 +#: builtin/bundle.c:47

914 +#, c-format

915 +msgid "%s is okay\n"

916 +msgstr "%s 可以\n"

917 +

918 +#: builtin/bundle.c:56

919 +msgid "Need a repository to create a bundle."

920 +msgstr "需要一个版本库来创建包"

921 +

922 +#: builtin/bundle.c:60

923 +msgid "Need a repository to unbundle."

924 +msgstr "需要一个版本库来解包"

925 +

926 +#: builtin/checkout.c:113 builtin/checkout.c:146

927 +#, c-format

928 +msgid "path '%s' does not have our version"

929 +msgstr "路径 '%s' 没有我们的版本"

930 +

931 +#: builtin/checkout.c:115 builtin/checkout.c:148

932 +#, c-format

933 +msgid "path '%s' does not have their version"

934 +msgstr "路径 '%s' 没有他们的版本"

935 +

936 +#: builtin/checkout.c:131

937 +#, c-format

938 +msgid "path '%s' does not have all necessary versions"

939 +msgstr "路径 '%s' 没有全部必须的版本"

940 +

941 +#: builtin/checkout.c:175

942 +#, c-format

943 +msgid "path '%s' does not have necessary versions"

944 +msgstr "路径 '%s' 没有必须的版本"

945 +

946 +#: builtin/checkout.c:192

947 +#, c-format

948 +msgid "path '%s': cannot merge"

949 +msgstr "path '%s': 无法合并"

950 +

951 +#: builtin/checkout.c:209

952 +#, c-format

953 +msgid "Unable to add merge result for '%s'"

954 +msgstr "无法为 '%s' 添加合并结果"

955 +

956 +#: builtin/checkout.c:212 builtin/reset.c:158

957 +#, c-format

958 +msgid "make_cache_entry failed for path '%s'"

959 +msgstr "对路径 '%s' 的 make_cache_entry 操作失败"

960 +

961 +#: builtin/checkout.c:234 builtin/checkout.c:392

962 +msgid "corrupt index file"

963 +msgstr "冲突的暂存区文件"

964 +

965 +#: builtin/checkout.c:264 builtin/checkout.c:271

966 +#, c-format

967 +msgid "path '%s' is unmerged"

968 +msgstr "路径 '%s' 未合并"

969 +

970 +#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:595

971 +#: builtin/merge.c:809

972 +msgid "unable to write new index file"

973 +msgstr "无法写新的暂存区文件"

974 +

975 +#: builtin/checkout.c:319 builtin/diff.c:298 builtin/merge.c:406

976 +msgid "diff_setup_done failed"

977 +msgstr "diff_setup_done 失败"

978 +

979 +#: builtin/checkout.c:414

980 +msgid "you need to resolve your current index first"

981 +msgstr "您需要先解决当前暂存区的冲突"

982 +

983 +#: builtin/checkout.c:533

984 +#, c-format

985 +msgid "Can not do reflog for '%s'\n"

986 +msgstr "不能对 '%s' 保存引用日志\n"

987 +

988 +#: builtin/checkout.c:565

989 +msgid "HEAD is now at"

990 +msgstr "HEAD 目前位于"

991 +

992 +#: builtin/checkout.c:572

993 +#, c-format

994 +msgid "Reset branch '%s'\n"

995 +msgstr "重置分支 '%s'\n"

996 +

997 +#: builtin/checkout.c:575

998 +#, c-format

999 +msgid "Already on '%s'\n"

1000 +msgstr "已经位于 '%s'\n"

1001 +

1002 +#: builtin/checkout.c:579

1003 +#, c-format

1004 +msgid "Switched to and reset branch '%s'\n"

1005 +msgstr "切换并重置分支 '%s'\n"

1006 +

1007 +#: builtin/checkout.c:581

1008 +#, c-format

1009 +msgid "Switched to a new branch '%s'\n"

1010 +msgstr "切换到一个新分支 '%s'\n"

1011 +

1012 +#: builtin/checkout.c:583

1013 +#, c-format

1014 +msgid "Switched to branch '%s'\n"

1015 +msgstr "切换到分支 '%s'\n"

1016 +

1017 +# 注意保持前导空格

1018 +#: builtin/checkout.c:639

1019 +#, c-format

1020 +msgid " ... and %d more.\n"

1021 +msgstr " ... 及 %d 更多。\n"

1022 +

1023 +#. The singular version

1024 +#: builtin/checkout.c:645

1025 +#, c-format

1026 +msgid ""

1027 +"Warning: you are leaving %d commit behind, not connected to\n"

1028 +"any of your branches:\n"

1029 +"\n"

1030 +"%s\n"

1031 +msgid_plural ""

1032 +"Warning: you are leaving %d commits behind, not connected to\n"

1033 +"any of your branches:\n"

1034 +"\n"

1035 +"%s\n"

1036 +msgstr[0] ""

1037 +"警告：您正丢下 %d 个提交，未和任何分支关联：\n"

1038 +"\n"

1039 +"%s\n"

1040 +

1041 +#: builtin/checkout.c:663

1042 +#, c-format

1043 +msgid ""

1044 +"If you want to keep them by creating a new branch, this may be a good time\n"

1045 +"to do so with:\n"

1046 +"\n"

1047 +" git branch new_branch_name %s\n"

1048 +"\n"

1049 +msgstr ""

1050 +"如果您想要通过创建新分支保存他们，这可能是一个好时候。\n"

1051 +"如下操作：\n"

1052 +"\n"

1053 +" git branch new_branch_name %s\n"

1054 +"\n"

1055 +

1056 +#: builtin/checkout.c:692

1057 +msgid "internal error in revision walk"

1058 +msgstr "在版本遍历时遇到内部错误"

1059 +

1060 +#: builtin/checkout.c:696

1061 +msgid "Previous HEAD position was"

1062 +msgstr "之前的 HEAD 位置是"

1063 +

1064 +#: builtin/checkout.c:722

1065 +msgid "You are on a branch yet to be born"

1066 +msgstr "您位于一个未初始化的分支"

1067 +

1068 +#. case (1)

1069 +#: builtin/checkout.c:853

1070 +#, c-format

1071 +msgid "invalid reference: %s"

1072 +msgstr "无效引用：%s"

1073 +

1074 +#. case (1): want a tree

1075 +#: builtin/checkout.c:892

1076 +#, c-format

1077 +msgid "reference is not a tree: %s"

1078 +msgstr "引用不是一个树：%s"

1079 +

1080 +#: builtin/checkout.c:961

1081 +msgid "-B cannot be used with -b"

1082 +msgstr "-B 不能和 -b 共用"

1083 +

1084 +#: builtin/checkout.c:970

1085 +msgid "--patch is incompatible with all other options"

1086 +msgstr "--patch 选项和其他选项不兼容"

1087 +

1088 +#: builtin/checkout.c:973

1089 +msgid "--detach cannot be used with -b/-B/--orphan"

1090 +msgstr "--detach 不能和 -b/-B/--orphan 共用"

1091 +

1092 +#: builtin/checkout.c:975

1093 +msgid "--detach cannot be used with -t"

1094 +msgstr "--detach 不能和 -t 共用"

1095 +

1096 +#: builtin/checkout.c:981

1097 +msgid "--track needs a branch name"

1098 +msgstr "--track 需要一个分支名"

1099 +

1100 +#: builtin/checkout.c:988

1101 +msgid "Missing branch name; try -b"

1102 +msgstr "缺少分支名；尝试 -b"

1103 +

1104 +#: builtin/checkout.c:994

1105 +msgid "--orphan and -b|-B are mutually exclusive"

1106 +msgstr "--orphan 和 -b|-B 互斥"

1107 +

1108 +#: builtin/checkout.c:996

1109 +msgid "--orphan cannot be used with -t"

1110 +msgstr "--orphan 不能和 -t 共用"

1111 +

1112 +#: builtin/checkout.c:1006

1113 +msgid "git checkout: -f and -m are incompatible"

1114 +msgstr "git checkout: -f 和 -m 不兼容"

1115 +

1116 +#: builtin/checkout.c:1040

1117 +msgid "invalid path specification"

1118 +msgstr "无效的路径"

1119 +

1120 +#: builtin/checkout.c:1048

1121 +#, c-format

1122 +msgid ""

1123 +"git checkout: updating paths is incompatible with switching branches.\n"

1124 +"Did you intend to checkout '%s' which can not be resolved as commit?"

1125 +msgstr ""

1126 +"git checkout: 更新路径和切换分支不兼容。\n"

1127 +"您是想要检出 '%s' 但未能将其解析为提交么？"

1128 +

1129 +#: builtin/checkout.c:1050

1130 +msgid "git checkout: updating paths is incompatible with switching branches."

1131 +msgstr "git checkout: 更新路径和切换分支不兼容。"

1132 +

1133 +#: builtin/checkout.c:1055

1134 +msgid "git checkout: --detach does not take a path argument"

1135 +msgstr "git checkout: --detach 不跟路径参数"

1136 +

1137 +#: builtin/checkout.c:1058

1138 +msgid ""

1139 +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

1140 +"checking out of the index."

1141 +msgstr ""

1142 +"git checkout: --ours/--theirs, --force 和 --merge 不兼容当\n"

1143 +"检出暂存区时。"

1144 +

1145 +#: builtin/checkout.c:1077

1146 +msgid "Cannot switch branch to a non-commit."

1147 +msgstr "无法切换分支到一个非提交。"

1148 +

1149 +#: builtin/checkout.c:1080

1150 +msgid "--ours/--theirs is incompatible with switching branches."

1151 +msgstr "--ours/--theirs 和切换分支不兼容。"

1152 +

1153 +#: builtin/clean.c:78

1154 +msgid "-x and -X cannot be used together"

1155 +msgstr "-x 和 -X 不能共用"

1156 +

1157 +#: builtin/clean.c:82

1158 +msgid ""

1159 +"clean.requireForce set to true and neither -n nor -f given; refusing to clean"

1160 +msgstr ""

1161 +"clean.requireForce 设置为 true，若未提供 -n 或 -f 选项，拒绝执行清理动作"

1162 +

1163 +#: builtin/clean.c:85

1164 +msgid ""

1165 +"clean.requireForce defaults to true and neither -n nor -f given; refusing to "

1166 +"clean"

1167 +msgstr ""

1168 +"clean.requireForce 默认为 true，若未提供 -n 或 -f 选项，拒绝执行清理动作"

1169 +

1170 +#: builtin/clean.c:155 builtin/clean.c:176

1171 +#, c-format

1172 +msgid "Would remove %s\n"

1173 +msgstr "将删除 %s\n"

1174 +

1175 +#: builtin/clean.c:159 builtin/clean.c:179

1176 +#, c-format

1177 +msgid "Removing %s\n"

1178 +msgstr "正删除 %s\n"

1179 +

1180 +#: builtin/clean.c:162 builtin/clean.c:182

1181 +#, c-format

1182 +msgid "failed to remove %s"

1183 +msgstr "无法删除 %s"

1184 +

1185 +#: builtin/clean.c:166

1186 +#, c-format

1187 +msgid "Would not remove %s\n"

1188 +msgstr "不会删除 %s\n"

1189 +

1190 +#: builtin/clean.c:168

1191 +#, c-format

1192 +msgid "Not removing %s\n"

1193 +msgstr "未删除 %s\n"

1194 +

1195 +#: builtin/clone.c:246

1196 +#, c-format

1197 +msgid "reference repository '%s' is not a local directory."

1198 +msgstr "引用版本库 '%s' 不是一个本地目录。"

1199 +

1200 +#: builtin/clone.c:313

1201 +#, c-format

1202 +msgid "failed to open '%s'"

1203 +msgstr "打开 '%s' 失败"

1204 +

1205 +#: builtin/clone.c:317

1206 +#, c-format

1207 +msgid "failed to create directory '%s'"

1208 +msgstr "创建目录 '%s' 失败"

1209 +

1210 +#: builtin/clone.c:319 builtin/diff.c:75

1211 +#, c-format

1212 +msgid "failed to stat '%s'"

1213 +msgstr "枚举 '%s' 状态失败"

1214 +

1215 +#: builtin/clone.c:321

1216 +#, c-format

1217 +msgid "%s exists and is not a directory"

1218 +msgstr "%s 存在且不是一个目录"

1219 +

1220 +#: builtin/clone.c:335

1221 +#, c-format

1222 +msgid "failed to stat %s\n"

1223 +msgstr "枚举 %s 状态失败\n"

1224 +

1225 +#: builtin/clone.c:352

1226 +#, c-format

1227 +msgid "failed to unlink '%s'"

1228 +msgstr "删除 '%s' 失败"

1229 +

1230 +#: builtin/clone.c:357

1231 +#, c-format

1232 +msgid "failed to create link '%s'"

1233 +msgstr "创建链接 '%s' 失败"

1234 +

1235 +#: builtin/clone.c:361

1236 +#, c-format

1237 +msgid "failed to copy file to '%s'"

1238 +msgstr "拷贝文件至 '%s' 失败"

1239 +

1240 +#: builtin/clone.c:384

1241 +#, c-format

1242 +msgid "done.\n"

1243 +msgstr "完成。\n"

1244 +

1245 +#: builtin/clone.c:451

1246 +#, c-format

1247 +msgid "Could not find remote branch %s to clone."

1248 +msgstr "无法发现要克隆的远程分支 %s。"

1249 +

1250 +#: builtin/clone.c:561

1251 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

1252 +msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

1253 +

1254 +#: builtin/clone.c:651

1255 +msgid "Too many arguments."

1256 +msgstr "太多参数。"

1257 +

1258 +#: builtin/clone.c:655

1259 +msgid "You must specify a repository to clone."

1260 +msgstr "你必须指定一个版本库来克隆"

1261 +

1262 +#: builtin/clone.c:666

1263 +#, c-format

1264 +msgid "--bare and --origin %s options are incompatible."

1265 +msgstr "--bare 和 --origin %s 选项不兼容。"

1266 +

1267 +#: builtin/clone.c:680

1268 +#, c-format

1269 +msgid "repository '%s' does not exist"

1270 +msgstr "版本库 '%s' 不存在"

1271 +

1272 +#: builtin/clone.c:685

1273 +msgid "--depth is ignored in local clones; use file:// instead."

1274 +msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

1275 +

1276 +#: builtin/clone.c:695

1277 +#, c-format

1278 +msgid "destination path '%s' already exists and is not an empty directory."

1279 +msgstr "目标路径 '%s' 已经存在且不是一个空目录。"

1280 +

1281 +#: builtin/clone.c:705

1282 +#, c-format

1283 +msgid "working tree '%s' already exists."

1284 +msgstr "工作区 '%s' 已经存在。"

1285 +

1286 +#: builtin/clone.c:718 builtin/clone.c:732

1287 +#, c-format

1288 +msgid "could not create leading directories of '%s'"

1289 +msgstr "无法为 '%s' 创建目录"

1290 +

1291 +#: builtin/clone.c:721

1292 +#, c-format

1293 +msgid "could not create work tree dir '%s'."

1294 +msgstr "无法为 '%s' 创建工作区目录。"

1295 +

1296 +#: builtin/clone.c:740

1297 +#, c-format

1298 +msgid "Cloning into bare repository '%s'...\n"

1299 +msgstr "克隆到裸版本库 '%s'...\n"

1300 +

1301 +#: builtin/clone.c:742

1302 +#, c-format

1303 +msgid "Cloning into '%s'...\n"

1304 +msgstr "正克隆到 '%s'...\n"

1305 +

1306 +#: builtin/clone.c:798

1307 +#, c-format

1308 +msgid "Don't know how to clone %s"

1309 +msgstr "不知道如何克隆 %s"

1310 +

1311 +#: builtin/clone.c:847

1312 +#, c-format

1313 +msgid "Remote branch %s not found in upstream %s"

1314 +msgstr "远程分支 %s 在上游 %s 未发现"

1315 +

1316 +#: builtin/clone.c:854

1317 +msgid "You appear to have cloned an empty repository."

1318 +msgstr "您似乎克隆了一个空版本库。"

1319 +

1320 +#: builtin/commit.c:42

1321 +msgid ""

1322 +"Your name and email address were configured automatically based\n"

1323 +"on your username and hostname. Please check that they are accurate.\n"

1324 +"You can suppress this message by setting them explicitly:\n"

1325 +"\n"

1326 +" git config --global user.name \"Your Name\"\n"

1327 +" git config --global user.email you@example.com\n"

1328 +"\n"

1329 +"After doing this, you may fix the identity used for this commit with:\n"

1330 +"\n"

1331 +" git commit --amend --reset-author\n"

1332 +msgstr ""

1333 +"您的姓名和邮件地址会基于您的用户名和主机地址自动配置。请检查它们\n"

1334 +"正确与否。您可通过下面命令对其显式声明以避免重复出现类似提示：\n"

1335 +"\n"

1336 +" git config --global user.name \"Your Name\"\n"

1337 +" git config --global user.email you@example.com\n"

1338 +"\n"

1339 +"设置完毕后，您可用下面命令来更改此次提交所使用的用户ID：\n"

1340 +"\n"

1341 +" git commit --amend --reset-author\n"

1342 +

1343 +#: builtin/commit.c:54

1344 +msgid ""

1345 +"You asked to amend the most recent commit, but doing so would make\n"

1346 +"it empty. You can repeat your command with --allow-empty, or you can\n"

1347 +"remove the commit entirely with \"git reset HEAD^\".\n"

1348 +msgstr ""

1349 +"您要求修补最近的提交，但这么做会造成空提交。您可重复您的命令并带上\n"

1350 +"--allow-empty 选项，或者您可以整个删除该提交用 \"git reset HEAD^\"。\n"

1351 +

1352 +#: builtin/commit.c:59

1353 +msgid ""

1354 +"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

1355 +"If you wish to commit it anyway, use:\n"

1356 +"\n"

1357 +" git commit --allow-empty\n"

1358 +"\n"

1359 +"Otherwise, please use 'git reset'\n"

1360 +msgstr ""

1361 +"之前的拣选操作现在为空，可能是由冲突解决导致的。如果您想继续提交，用：\n"

1362 +"\n"

1363 +" git commit --allow-empty\n"

1364 +"\n"

1365 +"否则，请用 'git reset'\n"

1366 +

1367 +#: builtin/commit.c:205 builtin/reset.c:33

1368 +msgid "merge"

1369 +msgstr "合并"

1370 +

1371 +#: builtin/commit.c:208

1372 +msgid "cherry-pick"

1373 +msgstr "拣选"

1374 +

1375 +#: builtin/commit.c:325

1376 +msgid "failed to unpack HEAD tree object"

1377 +msgstr "解包 HEAD 树对象失败"

1378 +

1379 +#: builtin/commit.c:367

1380 +msgid "unable to create temporary index"

1381 +msgstr "不能创建临时暂存区"

1382 +

1383 +#: builtin/commit.c:373

1384 +msgid "interactive add failed"

1385 +msgstr "交互式添加失败"

1386 +

1387 +#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473

1388 +msgid "unable to write new_index file"

1389 +msgstr "无法写入新暂存区文件"

1390 +

1391 +# %s若翻为中文，前后不需要空格

1392 +#: builtin/commit.c:457

1393 +#, c-format

1394 +msgid "cannot do a partial commit during a %s."

1395 +msgstr "在%s过程中不能做部分提交。"

1396 +

1397 +#: builtin/commit.c:466

1398 +msgid "cannot read the index"

1399 +msgstr "无法读取暂存区"

1400 +

1401 +#: builtin/commit.c:486

1402 +msgid "unable to write temporary index file"

1403 +msgstr "无法写临时暂存区文件"

1404 +

1405 +#: builtin/commit.c:550 builtin/commit.c:556

1406 +#, c-format

1407 +msgid "invalid commit: %s"

1408 +msgstr "无效的提交：%s"

1409 +

1410 +#: builtin/commit.c:579

1411 +msgid "malformed --author parameter"

1412 +msgstr "非法的 --author 参数"

1413 +

1414 +#: builtin/commit.c:635

1415 +#, c-format

1416 +msgid "Malformed ident string: '%s'"

1417 +msgstr "非法的识别字串：'%s'"

1418 +

1419 +#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000

1420 +#, c-format

1421 +msgid "could not lookup commit %s"

1422 +msgstr "不能查询提交 %s"

1423 +

1424 +#: builtin/commit.c:682 builtin/shortlog.c:296

1425 +#, c-format

1426 +msgid "(reading log message from standard input)\n"

1427 +msgstr "（正从标准输入中读取说明信息）\n"

1428 +

1429 +#: builtin/commit.c:684

1430 +msgid "could not read log from standard input"

1431 +msgstr "无法从标准输入中读取说明信息"

1432 +

1433 +#: builtin/commit.c:688

1434 +#, c-format

1435 +msgid "could not read log file '%s'"

1436 +msgstr "无法读取说明文件 '%s'"

1437 +

1438 +#: builtin/commit.c:694

1439 +msgid "commit has empty message"

1440 +msgstr "提交说明为空"

1441 +

1442 +#: builtin/commit.c:710

1443 +msgid "could not read MERGE_MSG"

1444 +msgstr "无法读取 MERGE_MSG"

1445 +

1446 +#: builtin/commit.c:714

1447 +msgid "could not read SQUASH_MSG"

1448 +msgstr "无法读取 SQUASH_MSG"

1449 +

1450 +#: builtin/commit.c:718

1451 +#, c-format

1452 +msgid "could not read '%s'"

1453 +msgstr "无法读取 '%s'"

1454 +

1455 +#: builtin/commit.c:746

1456 +#, c-format

1457 +msgid "could not open '%s'"

1458 +msgstr "无法打开 '%s'"

1459 +

1460 +#: builtin/commit.c:770

1461 +msgid "could not write commit template"

1462 +msgstr "无法写提交模版"

1463 +

1464 +# %s若翻为中文，前后不需要空格

1465 +#: builtin/commit.c:783

1466 +#, c-format

1467 +msgid ""

1468 +"\n"

1469 +"It looks like you may be committing a %s.\n"

1470 +"If this is not correct, please remove the file\n"

1471 +"\t%s\n"

1472 +"and try again.\n"

1473 +msgstr ""

1474 +"\n"

1475 +"看起来您正在提交一个%s。\n"

1476 +"如果不是这样，请删除文件\n"

1477 +"\t%s\n"

1478 +"然后重试。\n"

1479 +

1480 +# 注意保持前导空格

1481 +#: builtin/commit.c:796

1482 +msgid "Please enter the commit message for your changes."

1483 +msgstr "请为您的修改输入提交说明。"

1484 +

1485 +#: builtin/commit.c:799

1486 +msgid ""

1487 +" Lines starting\n"

1488 +"with '#' will be ignored, and an empty message aborts the commit.\n"

1489 +msgstr ""

1490 +" 以 '#' 开头\n"

1491 +"的行将被忽略，而且空提交说明将会终止提交。\n"

1492 +

1493 +# 注意保持前导空格

1494 +#: builtin/commit.c:804

1495 +msgid ""

1496 +" Lines starting\n"

1497 +"with '#' will be kept; you may remove them yourself if you want to.\n"

1498 +"An empty message aborts the commit.\n"

1499 +msgstr ""

1500 +" 以 '#' 开头\n"

1501 +"的行将被保留，您可以删除它们如果您想这样做。空提交说明将会终止提交。\n"

1502 +

1503 +# 为保证在输出中对齐，注意调整句中空格！

1504 +#: builtin/commit.c:816

1505 +#, c-format

1506 +msgid "%sAuthor: %s"

1507 +msgstr "%s作者： %s"

1508 +

1509 +# 为保证在输出中对齐，注意调整句中空格！

1510 +#: builtin/commit.c:823

1511 +#, c-format

1512 +msgid "%sCommitter: %s"

1513 +msgstr "%s提交者： %s"

1514 +

1515 +#: builtin/commit.c:843

1516 +msgid "Cannot read index"

1517 +msgstr "无法读取暂存区"

1518 +

1519 +#: builtin/commit.c:880

1520 +msgid "Error building trees"

1521 +msgstr "无法创建树对象"

1522 +

1523 +#: builtin/commit.c:895 builtin/tag.c:324

1524 +#, c-format

1525 +msgid "Please supply the message using either -m or -F option.\n"

1526 +msgstr "请使用 -m 或者 -F 选项提供说明。\n"

1527 +

1528 +#: builtin/commit.c:975

1529 +#, c-format

1530 +msgid "No existing author found with '%s'"

1531 +msgstr "没有找到匹配 '%s' 的作者"

1532 +

1533 +#: builtin/commit.c:990 builtin/commit.c:1182

1534 +#, c-format

1535 +msgid "Invalid untracked files mode '%s'"

1536 +msgstr "无效的非追踪文件参数 '%s'"

1537 +

1538 +#: builtin/commit.c:1030

1539 +msgid "Using both --reset-author and --author does not make sense"

1540 +msgstr "同时使用 --reset-author 和 --author 没有意义"

1541 +

1542 +#: builtin/commit.c:1041

1543 +msgid "You have nothing to amend."

1544 +msgstr "您没有要修补。"

1545 +

1546 +# %s若翻为中文，前后不需要空格

1547 +#: builtin/commit.c:1043

1548 +#, c-format

1549 +msgid "You are in the middle of a %s -- cannot amend."

1550 +msgstr "您正处于一个%s过程中 -- 无法修补提交。"

1551 +

1552 +#: builtin/commit.c:1045

1553 +msgid "Options --squash and --fixup cannot be used together"

1554 +msgstr "选项 --squash 和 --fixup 不能共用"

1555 +

1556 +#: builtin/commit.c:1055

1557 +msgid "Only one of -c/-C/-F/--fixup can be used."

1558 +msgstr "只能用一个 -c/-C/-F/--fixup 选项。"

1559 +

1560 +#: builtin/commit.c:1057

1561 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

1562 +msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"

1563 +

1564 +#: builtin/commit.c:1063

1565 +msgid "--reset-author can be used only with -C, -c or --amend."

1566 +msgstr "--reset-author 只能和 -C, -c 或 --amend 共用。"

1567 +

1568 +#: builtin/commit.c:1080

1569 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

1570 +msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"

1571 +

1572 +#: builtin/commit.c:1082

1573 +msgid "No paths with --include/--only does not make sense."

1574 +msgstr "参数 --include/--only 不跟路径没有意义。"

1575 +

1576 +#: builtin/commit.c:1084

1577 +msgid "Clever... amending the last one with dirty index."

1578 +msgstr "聪明... 在暂存区不干净下修补最后的提交。"

1579 +

1580 +#: builtin/commit.c:1086

1581 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

1582 +msgstr "没有用 -i 或 -o 选项而显式地提供路径，认为是 --only paths..."

1583 +

1584 +#: builtin/commit.c:1096 builtin/tag.c:500

1585 +#, c-format

1586 +msgid "Invalid cleanup mode %s"

1587 +msgstr "无效的清理模式 %s"

1588 +

1589 +#: builtin/commit.c:1101

1590 +msgid "Paths with -a does not make sense."

1591 +msgstr "路径和 -a 选项共用没有意义。"

1592 +

1593 +#: builtin/commit.c:1280

1594 +msgid "couldn't look up newly created commit"

1595 +msgstr "无法找到新创建的提交"

1596 +

1597 +#: builtin/commit.c:1282

1598 +msgid "could not parse newly created commit"

1599 +msgstr "无法解析新创建的提交"

1600 +

1601 +#: builtin/commit.c:1323

1602 +msgid "detached HEAD"

1603 +msgstr "分离头指针"

1604 +

1605 +# 注意保持前导空格

1606 +#: builtin/commit.c:1325

1607 +msgid " (root-commit)"

1608 +msgstr " （根提交）"

1609 +

1610 +#: builtin/commit.c:1415

1611 +msgid "could not parse HEAD commit"

1612 +msgstr "无法解析 HEAD 提交"

1613 +

1614 +#: builtin/commit.c:1452 builtin/merge.c:507

1615 +#, c-format

1616 +msgid "could not open '%s' for reading"

1617 +msgstr "无法打开 '%s' 读取"

1618 +

1619 +#: builtin/commit.c:1459

1620 +#, c-format

1621 +msgid "Corrupt MERGE_HEAD file (%s)"

1622 +msgstr "损坏的 MERGE_HEAD 文件 (%s)"

1623 +

1624 +#: builtin/commit.c:1466

1625 +msgid "could not read MERGE_MODE"

1626 +msgstr "无法读取 MERGE_MODE"

1627 +

1628 +#: builtin/commit.c:1485

1629 +#, c-format

1630 +msgid "could not read commit message: %s"

1631 +msgstr "无法读取提交说明：%s"

1632 +

1633 +#: builtin/commit.c:1499

1634 +#, c-format

1635 +msgid "Aborting commit due to empty commit message.\n"

1636 +msgstr "终止提交因为提交说明为空。\n"

1637 +

1638 +#: builtin/commit.c:1514 builtin/merge.c:933 builtin/merge.c:966

1639 +msgid "failed to write commit object"

1640 +msgstr "写提交对象失败"

1641 +

1642 +#: builtin/commit.c:1535

1643 +msgid "cannot lock HEAD ref"

1644 +msgstr "无法锁定 HEAD 引用"

1645 +

1646 +#: builtin/commit.c:1539

1647 +msgid "cannot update HEAD ref"

1648 +msgstr "无法更新 HEAD 引用"

1649 +

1650 +#: builtin/commit.c:1550

1651 +msgid ""

1652 +"Repository has been updated, but unable to write\n"

1653 +"new_index file. Check that disk is not full or quota is\n"

1654 +"not exceeded, and then \"git reset HEAD\" to recover."

1655 +msgstr ""

1656 +"版本库已被更新，但无法写入新暂存区文件。检查是否磁盘\n"

1657 +"已满或磁盘配额耗尽，然后执行 \"git reset HEAD\" 恢复。"

1658 +

1659 +#: builtin/describe.c:234

1660 +#, c-format

1661 +msgid "annotated tag %s not available"

1662 +msgstr "注释 tag %s 无效"

1663 +

1664 +#: builtin/describe.c:238

1665 +#, c-format

1666 +msgid "annotated tag %s has no embedded name"

1667 +msgstr "注释 tag %s 没有嵌入名称"

1668 +

1669 +#: builtin/describe.c:240

1670 +#, c-format

1671 +msgid "tag '%s' is really '%s' here"

1672 +msgstr "tag '%s' 确是在 '%s'"

1673 +

1674 +#: builtin/describe.c:267

1675 +#, c-format

1676 +msgid "Not a valid object name %s"

1677 +msgstr "不是一个有效的对象名 %s"

1678 +

1679 +#: builtin/describe.c:270

1680 +#, c-format

1681 +msgid "%s is not a valid '%s' object"

1682 +msgstr "%s 不是一个有效的 '%s' 对象"

1683 +

1684 +#: builtin/describe.c:287

1685 +#, c-format

1686 +msgid "no tag exactly matches '%s'"

1687 +msgstr "没有 tag 准确匹配 '%s'"

1688 +

1689 +#: builtin/describe.c:289

1690 +#, c-format

1691 +msgid "searching to describe %s\n"

1692 +msgstr "搜索描述 %s\n"

1693 +

1694 +#: builtin/describe.c:329

1695 +#, c-format

1696 +msgid "finished search at %s\n"

1697 +msgstr "完成搜索 %s\n"

1698 +

1699 +#: builtin/describe.c:353

1700 +#, c-format

1701 +msgid ""

1702 +"No annotated tags can describe '%s'.\n"

1703 +"However, there were unannotated tags: try --tags."

1704 +msgstr ""

1705 +"没有注释 tag 能描述 '%s'。\n"

1706 +"然而，有非注释 tag：尝试 --tags。"

1707 +

1708 +#: builtin/describe.c:357

1709 +#, c-format

1710 +msgid ""

1711 +"No tags can describe '%s'.\n"

1712 +"Try --always, or create some tags."

1713 +msgstr ""

1714 +"没有注释 tag 能描述 '%s'。\n"

1715 +"尝试 --always，或创建一些 tag。"

1716 +

1717 +#: builtin/describe.c:378

1718 +#, c-format

1719 +msgid "traversed %lu commits\n"

1720 +msgstr "已遍历 %lu 个提交\n"

1721 +

1722 +#: builtin/describe.c:381

1723 +#, c-format

1724 +msgid ""

1725 +"more than %i tags found; listed %i most recent\n"

1726 +"gave up search at %s\n"

1727 +msgstr ""

1728 +"发现多于 %i 个 tag；列出最近的 %i 个\n"

1729 +"放弃搜索 %s\n"

1730 +

1731 +#: builtin/describe.c:436

1732 +msgid "--long is incompatible with --abbrev=0"

1733 +msgstr "--long 与 --abbrev=0 不兼容"

1734 +

1735 +#: builtin/describe.c:462

1736 +msgid "No names found, cannot describe anything."

1737 +msgstr "没有发现名称，无法描述任何东西"

1738 +

1739 +#: builtin/describe.c:482

1740 +msgid "--dirty is incompatible with committishes"

1741 +msgstr "--dirty 不能与提交共用"

1742 +

1743 +#: builtin/diff.c:77

1744 +#, c-format

1745 +msgid "'%s': not a regular file or symlink"

1746 +msgstr "'%s'：不是一个正规文件或符号链接"

1747 +

1748 +#: builtin/diff.c:220

1749 +#, c-format

1750 +msgid "invalid option: %s"

1751 +msgstr "无效选项：%s"

1752 +

1753 +#: builtin/diff.c:293

1754 +msgid "Not a git repository"

1755 +msgstr "不是一个 git 版本库"

1756 +

1757 +#: builtin/diff.c:343

1758 +#, c-format

1759 +msgid "invalid object '%s' given."

1760 +msgstr "提供了无效对象 '%s'。"

1761 +

1762 +#: builtin/diff.c:348

1763 +#, c-format

1764 +msgid "more than %d trees given: '%s'"

1765 +msgstr "提供了超过 %d 个树对象：'%s'"

1766 +

1767 +#: builtin/diff.c:358

1768 +#, c-format

1769 +msgid "more than two blobs given: '%s'"

1770 +msgstr "提供了超过两个 blob 对象：'%s'"

1771 +

1772 +#: builtin/diff.c:366

1773 +#, c-format

1774 +msgid "unhandled object '%s' given."

1775 +msgstr "提供了无法处理的对象 '%s'。"

1776 +

1777 +#: builtin/fetch.c:200

1778 +msgid "Couldn't find remote ref HEAD"

1779 +msgstr "无法发现远程 HEAD 引用"

1780 +

1781 +#: builtin/fetch.c:252

1782 +#, c-format

1783 +msgid "object %s not found"

1784 +msgstr "对象 %s 未发现"

1785 +

1786 +#: builtin/fetch.c:258

1787 +msgid "[up to date]"

1788 +msgstr "[最新]"

1789 +

1790 +#: builtin/fetch.c:272

1791 +#, c-format

1792 +msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

1793 +msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"

1794 +

1795 +#: builtin/fetch.c:273 builtin/fetch.c:351

1796 +msgid "[rejected]"

1797 +msgstr "[已拒绝]"

1798 +

1799 +#: builtin/fetch.c:284

1800 +msgid "[tag update]"

1801 +msgstr "[tag更新]"

1802 +

1803 +# 注意保持前导空格

1804 +#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331

1805 +msgid " (unable to update local ref)"

1806 +msgstr " （不能更新本地引用）"

1807 +

1808 +#: builtin/fetch.c:298

1809 +msgid "[new tag]"

1810 +msgstr "[新tag]"

1811 +

1812 +#: builtin/fetch.c:302

1813 +msgid "[new branch]"

1814 +msgstr "[新分支]"

1815 +

1816 +#: builtin/fetch.c:347

1817 +msgid "unable to update local ref"

1818 +msgstr "不能更新本地引用"

1819 +

1820 +#: builtin/fetch.c:347

1821 +msgid "forced update"

1822 +msgstr "强制更新"

1823 +

1824 +#: builtin/fetch.c:353

1825 +msgid "(non-fast-forward)"

1826 +msgstr "（非快进式推送）"

1827 +

1828 +#: builtin/fetch.c:384 builtin/fetch.c:676

1829 +#, c-format

1830 +msgid "cannot open %s: %s\n"

1831 +msgstr "无法打开 %s：%s\n"

1832 +

1833 +#: builtin/fetch.c:393

1834 +#, c-format

1835 +msgid "%s did not send all necessary objects\n"

1836 +msgstr "%s 未发送所有必须的对象\n"

1837 +

1838 +#: builtin/fetch.c:479

1839 +#, c-format

1840 +msgid "From %.*s\n"

1841 +msgstr "来自 %.*s\n"

1842 +

1843 +#: builtin/fetch.c:490

1844 +#, c-format

1845 +msgid ""

1846 +"some local refs could not be updated; try running\n"

1847 +" 'git remote prune %s' to remove any old, conflicting branches"

1848 +msgstr ""

1849 +"一些本地引用不能被更新；尝试运行\n"

1850 +" 'git remote prune %s' 来删除旧的、有冲突的分支"

1851 +

1852 +# 注意保持前导空格

1853 +#: builtin/fetch.c:540

1854 +#, c-format

1855 +msgid " (%s will become dangling)\n"

1856 +msgstr " （%s 将成为悬空状态）\n"

1857 +

1858 +# 注意保持前导空格

1859 +#: builtin/fetch.c:541

1860 +#, c-format

1861 +msgid " (%s has become dangling)\n"

1862 +msgstr " （%s 已成为悬空状态）\n"

1863 +

1864 +#: builtin/fetch.c:548

1865 +msgid "[deleted]"

1866 +msgstr "[已删除]"

1867 +

1868 +#: builtin/fetch.c:549

1869 +msgid "(none)"

1870 +msgstr "（无）"

1871 +

1872 +#: builtin/fetch.c:666

1873 +#, c-format

1874 +msgid "Refusing to fetch into current branch %s of non-bare repository"

1875 +msgstr "拒绝获取到非裸版本库的当前分支 %s"

1876 +

1877 +#: builtin/fetch.c:700

1878 +#, c-format

1879 +msgid "Don't know how to fetch from %s"

1880 +msgstr "不知道如何从 %s 获取"

1881 +

1882 +#: builtin/fetch.c:777

1883 +#, c-format

1884 +msgid "Option \"%s\" value \"%s\" is not valid for %s"

1885 +msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"

1886 +

1887 +#: builtin/fetch.c:780

1888 +#, c-format

1889 +msgid "Option \"%s\" is ignored for %s\n"

1890 +msgstr "选项 \"%s\" 对于 %s 被忽略\n"

1891 +

1892 +#: builtin/fetch.c:879

1893 +#, c-format

1894 +msgid "Fetching %s\n"

1895 +msgstr "正获取 %s\n"

1896 +

1897 +#: builtin/fetch.c:881

1898 +#, c-format

1899 +msgid "Could not fetch %s"

1900 +msgstr "不能获取 %s"

1901 +

1902 +#: builtin/fetch.c:898

1903 +msgid ""

1904 +"No remote repository specified. Please, specify either a URL or a\n"

1905 +"remote name from which new revisions should be fetched."

1906 +msgstr "未提供远程版本库。请提供一个URL或远程版本库名，用于获取新版本。"

1907 +

1908 +#: builtin/fetch.c:918

1909 +msgid "You need to specify a tag name."

1910 +msgstr "你需要提供一个 tag 名称"

1911 +

1912 +#: builtin/fetch.c:970

1913 +msgid "fetch --all does not take a repository argument"

1914 +msgstr "fetch --all 不能带一个版本库参数"

1915 +

1916 +#: builtin/fetch.c:972

1917 +msgid "fetch --all does not make sense with refspecs"

1918 +msgstr "fetch --all 带引用表达式没有任何意义"

1919 +

1920 +#: builtin/fetch.c:983

1921 +#, c-format

1922 +msgid "No such remote or remote group: %s"

1923 +msgstr "没有这样的远程或远程组：%s"

1924 +

1925 +#: builtin/fetch.c:991

1926 +msgid "Fetching a group and specifying refspecs does not make sense"

1927 +msgstr "获取组并提供引用表达式没有意义"

1928 +

1929 +#: builtin/gc.c:63

1930 +#, c-format

1931 +msgid "Invalid %s: '%s'"

1932 +msgstr "无效的 %s：'%s'"

1933 +

1934 +#: builtin/gc.c:78

1935 +msgid "Too many options specified"

1936 +msgstr "提供了太多的选项"

1937 +

1938 +#: builtin/gc.c:103

1939 +#, c-format

1940 +msgid "insanely long object directory %.*s"

1941 +msgstr "不正常的长对象目录 %.*s"

1942 +

1943 +#: builtin/gc.c:223

1944 +#, c-format

1945 +msgid "Auto packing the repository for optimum performance.\n"

1946 +msgstr "自动打包版本库以求最佳性能。\n"

1947 +

1948 +#: builtin/gc.c:226

1949 +#, c-format

1950 +msgid ""

1951 +"Auto packing the repository for optimum performance. You may also\n"

1952 +"run \"git gc\" manually. See \"git help gc\" for more information.\n"

1953 +msgstr ""

1954 +"自动打包版本库以求最佳性能。你还可以\n"

1955 +"手动运行 \"git gc\"。参见 \"git help gc\" 获取更多信息。\n"

1956 +

1957 +#: builtin/gc.c:256

1958 +msgid ""

1959 +"There are too many unreachable loose objects; run 'git prune' to remove them."

1960 +msgstr "有太多无指向的松散对象，运行 'git prune' 删除它们。"

1961 +

1962 +#: builtin/grep.c:275

1963 +#, c-format

1964 +msgid "grep: failed to create thread: %s"

1965 +msgstr "grep: 无法创建线程：%s"

1966 +

1967 +#: builtin/grep.c:390

1968 +#, c-format

1969 +msgid "'%s': unable to read %s"

1970 +msgstr "'%s'：无法读取 %s"

1971 +

1972 +#: builtin/grep.c:441

1973 +#, c-format

1974 +msgid "'%s': %s"

1975 +msgstr "'%s'：%s"

1976 +

1977 +#: builtin/grep.c:452

1978 +#, c-format

1979 +msgid "'%s': short read %s"

1980 +msgstr "'%s'：读取不完整 %s"

1981 +

1982 +#: builtin/grep.c:514

1983 +#, c-format

1984 +msgid "Failed to chdir: %s"

1985 +msgstr "无法切换目录：%s"

1986 +

1987 +#: builtin/grep.c:590 builtin/grep.c:624

1988 +#, c-format

1989 +msgid "unable to read tree (%s)"

1990 +msgstr "无法读取代码树（%s）"

1991 +

1992 +#: builtin/grep.c:638

1993 +#, c-format

1994 +msgid "unable to grep from object of type %s"

1995 +msgstr "无法抓取来自于 %s 类型的对象"

1996 +

1997 +#: builtin/grep.c:696

1998 +#, c-format

1999 +msgid "switch `%c' expects a numerical value"

2000 +msgstr "开关 `%c' 期望一个数字值"

2001 +

2002 +#: builtin/grep.c:713

2003 +#, c-format

2004 +msgid "cannot open '%s'"

2005 +msgstr "不能打开 '%s'"

2006 +

2007 +#: builtin/grep.c:1001

2008 +msgid "no pattern given."

2009 +msgstr "未提供模式匹配。"

2010 +

2011 +#: builtin/grep.c:1015

2012 +#, c-format

2013 +msgid "bad object %s"

2014 +msgstr "坏对象 %s"

2015 +

2016 +#: builtin/grep.c:1058

2017 +msgid "--open-files-in-pager only works on the worktree"

2018 +msgstr "--open-files-in-pager 仅用于工作区"

2019 +

2020 +#: builtin/grep.c:1081

2021 +msgid "--cached or --untracked cannot be used with --no-index."

2022 +msgstr "--cached 或 --untracked 不能与 --no-index 共用"

2023 +

2024 +#: builtin/grep.c:1086

2025 +msgid "--no-index or --untracked cannot be used with revs."

2026 +msgstr "--no-index 或 --untracked 不能和版本共用。"

2027 +

2028 +#: builtin/grep.c:1089

2029 +msgid "--[no-]exclude-standard cannot be used for tracked contents."

2030 +msgstr "--[no-]exclude-standard 不能用于跟踪内容。"

2031 +

2032 +#: builtin/grep.c:1097

2033 +msgid "both --cached and trees are given."

2034 +msgstr "同时给出了 --cached 和树对象。"

2035 +

2036 +#: builtin/init-db.c:35

2037 +#, c-format

2038 +msgid "Could not make %s writable by group"

2039 +msgstr "不能设置 %s 为组可写"

2040 +

2041 +#: builtin/init-db.c:62

2042 +#, c-format

2043 +msgid "insanely long template name %s"

2044 +msgstr "太长的模版名 %s"

2045 +

2046 +#: builtin/init-db.c:67

2047 +#, c-format

2048 +msgid "cannot stat '%s'"

2049 +msgstr "不能枚举 '%s' 状态"

2050 +

2051 +#: builtin/init-db.c:73

2052 +#, c-format

2053 +msgid "cannot stat template '%s'"

2054 +msgstr "不能枚举模版 '%s' 状态"

2055 +

2056 +#: builtin/init-db.c:80

2057 +#, c-format

2058 +msgid "cannot opendir '%s'"

2059 +msgstr "不能打开目录 '%s'"

2060 +

2061 +#: builtin/init-db.c:97

2062 +#, c-format

2063 +msgid "cannot readlink '%s'"

2064 +msgstr "不能读取链接 '%s'"

2065 +

2066 +#: builtin/init-db.c:99

2067 +#, c-format

2068 +msgid "insanely long symlink %s"

2069 +msgstr "太长的符号链接 %s"

2070 +

2071 +#: builtin/init-db.c:102

2072 +#, c-format

2073 +msgid "cannot symlink '%s' '%s'"

2074 +msgstr "不能创建符号链接 '%s' 到 '%s'"

2075 +

2076 +#: builtin/init-db.c:106

2077 +#, c-format

2078 +msgid "cannot copy '%s' to '%s'"

2079 +msgstr "不能拷贝 '%s' 至 '%s'"

2080 +

2081 +#: builtin/init-db.c:110

2082 +#, c-format

2083 +msgid "ignoring template %s"

2084 +msgstr "忽略模版 %s"

2085 +

2086 +#: builtin/init-db.c:133

2087 +#, c-format

2088 +msgid "insanely long template path %s"

2089 +msgstr "太长的模版路径 %s"

2090 +

2091 +#: builtin/init-db.c:141

2092 +#, c-format

2093 +msgid "templates not found %s"

2094 +msgstr "模版未找到 %s"

2095 +

2096 +#: builtin/init-db.c:154

2097 +#, c-format

2098 +msgid "not copying templates of a wrong format version %d from '%s'"

2099 +msgstr "未复制错误版本 %d 的模版自 '%s'"

2100 +

2101 +#: builtin/init-db.c:192

2102 +#, c-format

2103 +msgid "insane git directory %s"

2104 +msgstr "不正常的 git 目录 %s"

2105 +

2106 +#: builtin/init-db.c:322 builtin/init-db.c:325

2107 +#, c-format

2108 +msgid "%s already exists"

2109 +msgstr "%s 已经存在"

2110 +

2111 +#: builtin/init-db.c:354

2112 +#, c-format

2113 +msgid "unable to handle file type %d"

2114 +msgstr "不能处理 %d 类型的文件"

2115 +

2116 +#: builtin/init-db.c:357

2117 +#, c-format

2118 +msgid "unable to move %s to %s"

2119 +msgstr "不能移动 %s 至 %s"

2120 +

2121 +#: builtin/init-db.c:362

2122 +#, c-format

2123 +msgid "Could not create git link %s"

2124 +msgstr "不能创建 git link %s"

2125 +

2126 +#.

2127 +#. * TRANSLATORS: The first '%s' is either "Reinitialized

2128 +#. * existing" or "Initialized empty", the second " shared" or

2129 +#. * "", and the last '%s%s' is the verbatim directory name.

2130 +#.

2131 +#: builtin/init-db.c:419

2132 +#, c-format

2133 +msgid "%s%s Git repository in %s%s\n"

2134 +msgstr "%s%s Git 版本库于 %s%s\n"

2135 +

2136 +#: builtin/init-db.c:420

2137 +msgid "Reinitialized existing"

2138 +msgstr "重新初始化现存的"

2139 +

2140 +#: builtin/init-db.c:420

2141 +msgid "Initialized empty"

2142 +msgstr "初始化空的"

2143 +

2144 +# 汉字字串合并，之间无空格，故删除前导空格

2145 +#: builtin/init-db.c:421

2146 +msgid " shared"

2147 +msgstr "共享的"

2148 +

2149 +#: builtin/init-db.c:440

2150 +msgid "cannot tell cwd"

2151 +msgstr "无法获知当前路径"

2152 +

2153 +#: builtin/init-db.c:521 builtin/init-db.c:528

2154 +#, c-format

2155 +msgid "cannot mkdir %s"

2156 +msgstr "不能创建目录 %s"

2157 +

2158 +#: builtin/init-db.c:532

2159 +#, c-format

2160 +msgid "cannot chdir to %s"

2161 +msgstr "不能切换目录到 %s"

2162 +

2163 +#: builtin/init-db.c:554

2164 +#, c-format

2165 +msgid ""

2166 +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

2167 +"dir=<directory>)"

2168 +msgstr ""

2169 +"不允许 %s（或 --work-tree=<directory>）而没有 %s（或 --git-dir=<directory>）"

2170 +

2171 +#: builtin/init-db.c:578

2172 +msgid "Cannot access current working directory"

2173 +msgstr "不能访问当前工作目录"

2174 +

2175 +#: builtin/init-db.c:585

2176 +#, c-format

2177 +msgid "Cannot access work tree '%s'"

2178 +msgstr "不能访问工作区 '%s'"

2179 +

2180 +#: builtin/log.c:185

2181 +#, c-format

2182 +msgid "Final output: %d %s\n"

2183 +msgstr "最终输出：%d %s\n"

2184 +

2185 +#: builtin/log.c:393 builtin/log.c:479

2186 +#, c-format

2187 +msgid "Could not read object %s"

2188 +msgstr "无法读取对象 %s"

2189 +

2190 +#: builtin/log.c:503

2191 +#, c-format

2192 +msgid "Unknown type: %d"

2193 +msgstr "未知类型：%d"

2194 +

2195 +#: builtin/log.c:592

2196 +msgid "format.headers without value"

2197 +msgstr "format.headers 没有值"

2198 +

2199 +#: builtin/log.c:665

2200 +msgid "name of output directory is too long"

2201 +msgstr "输出目录名太长"

2202 +

2203 +#: builtin/log.c:676

2204 +#, c-format

2205 +msgid "Cannot open patch file %s"

2206 +msgstr "无法打开补丁文件 %s"

2207 +

2208 +#: builtin/log.c:690

2209 +msgid "Need exactly one range."

2210 +msgstr "只需要一个范围。"

2211 +

2212 +#: builtin/log.c:698

2213 +msgid "Not a range."

2214 +msgstr "不是一个范围。"

2215 +

2216 +#: builtin/log.c:735

2217 +msgid "Could not extract email from committer identity."

2218 +msgstr "无法从提交者身份中提取邮件地址。"

2219 +

2220 +#: builtin/log.c:781

2221 +msgid "Cover letter needs email format"

2222 +msgstr "信封需要邮件地址格式"

2223 +

2224 +#: builtin/log.c:875

2225 +#, c-format

2226 +msgid "insane in-reply-to: %s"

2227 +msgstr "不正常的 in-reply-to：%s"

2228 +

2229 +#: builtin/log.c:948

2230 +msgid "Two output directories?"

2231 +msgstr "两个输出目录？"

2232 +

2233 +#: builtin/log.c:1169

2234 +#, c-format

2235 +msgid "bogus committer info %s"

2236 +msgstr "虚假的提交者信息 %s"

2237 +

2238 +#: builtin/log.c:1214

2239 +msgid "-n and -k are mutually exclusive."

2240 +msgstr "-n 和 -k 互斥。"

2241 +

2242 +#: builtin/log.c:1216

2243 +msgid "--subject-prefix and -k are mutually exclusive."

2244 +msgstr "--subject-prefix 和 -k 互斥。"

2245 +

2246 +#: builtin/log.c:1221 builtin/shortlog.c:284

2247 +#, c-format

2248 +msgid "unrecognized argument: %s"

2249 +msgstr "未识别的参数：%s"

2250 +

2251 +#: builtin/log.c:1224

2252 +msgid "--name-only does not make sense"

2253 +msgstr "--name-only 无意义"

2254 +

2255 +#: builtin/log.c:1226

2256 +msgid "--name-status does not make sense"

2257 +msgstr "--name-status 无意义"

2258 +

2259 +#: builtin/log.c:1228

2260 +msgid "--check does not make sense"

2261 +msgstr "--check 无意义"

2262 +

2263 +#: builtin/log.c:1251

2264 +msgid "standard output, or directory, which one?"

2265 +msgstr "标准输出或目录，哪一个？"

2266 +

2267 +#: builtin/log.c:1253

2268 +#, c-format

2269 +msgid "Could not create directory '%s'"

2270 +msgstr "无法创建目录 '%s'"

2271 +

2272 +#: builtin/log.c:1406

2273 +msgid "Failed to create output files"

2274 +msgstr "无法创建输出文件"

2275 +

2276 +#: builtin/log.c:1510

2277 +#, c-format

2278 +msgid ""

2279 +"Could not find a tracked remote branch, please specify <upstream> manually.\n"

2280 +msgstr "无法找到跟踪的远程分支，请手工提供 <upstream>。\n"

2281 +

2282 +#: builtin/log.c:1526 builtin/log.c:1528 builtin/log.c:1540

2283 +#, c-format

2284 +msgid "Unknown commit %s"

2285 +msgstr "未知提交 %s"

2286 +

2287 +#: builtin/merge.c:91

2288 +msgid "switch `m' requires a value"

2289 +msgstr "开关 `m' 需要一个值"

2290 +

2291 +#: builtin/merge.c:128

2292 +#, c-format

2293 +msgid "Could not find merge strategy '%s'.\n"

2294 +msgstr "无法找到合并策略 '%s'。\n"

2295 +

2296 +#: builtin/merge.c:129

2297 +#, c-format

2298 +msgid "Available strategies are:"

2299 +msgstr "可用的策略有："

2300 +

2301 +#: builtin/merge.c:134

2302 +#, c-format

2303 +msgid "Available custom strategies are:"

2304 +msgstr "可用的自定义策略有："

2305 +

2306 +#: builtin/merge.c:241

2307 +msgid "could not run stash."

2308 +msgstr "不能进行进度保存。"

2309 +

2310 +#: builtin/merge.c:246

2311 +msgid "stash failed"

2312 +msgstr "进度保存失败"

2313 +

2314 +#: builtin/merge.c:251

2315 +#, c-format

2316 +msgid "not a valid object: %s"

2317 +msgstr "不是一个有效对象：%s"

2318 +

2319 +#: builtin/merge.c:270 builtin/merge.c:287

2320 +msgid "read-tree failed"

2321 +msgstr "读取树失败"

2322 +

2323 +# 注意保持前导空格

2324 +#: builtin/merge.c:317

2325 +msgid " (nothing to squash)"

2326 +msgstr " （无可压缩）"

2327 +

2328 +#: builtin/merge.c:330

2329 +#, c-format

2330 +msgid "Squash commit -- not updating HEAD\n"

2331 +msgstr "压缩提交 -- 未更新 HEAD\n"

2332 +

2333 +#: builtin/merge.c:362

2334 +msgid "Writing SQUASH_MSG"

2335 +msgstr "写入 SQUASH_MSG"

2336 +

2337 +#: builtin/merge.c:364

2338 +msgid "Finishing SQUASH_MSG"

2339 +msgstr "完成 SQUASH_MSG"

2340 +

2341 +#: builtin/merge.c:386

2342 +#, c-format

2343 +msgid "No merge message -- not updating HEAD\n"

2344 +msgstr "无合并信息 -- 未更新 HEAD\n"

2345 +

2346 +#: builtin/merge.c:435

2347 +#, c-format

2348 +msgid "'%s' does not point to a commit"

2349 +msgstr "'%s' 没有指向一个提交"

2350 +

2351 +#: builtin/merge.c:534

2352 +#, c-format

2353 +msgid "Bad branch.%s.mergeoptions string: %s"

2354 +msgstr "错的 branch.%s.mergeoptions 字串：%s"

2355 +

2356 +#: builtin/merge.c:627

2357 +msgid "git write-tree failed to write a tree"

2358 +msgstr "git write-tree 无法写入一树对象"

2359 +

2360 +#: builtin/merge.c:677

2361 +msgid "failed to read the cache"

2362 +msgstr "无法读取缓存"

2363 +

2364 +#: builtin/merge.c:694

2365 +msgid "Unable to write index."

2366 +msgstr "不能写暂存区。"

2367 +

2368 +#: builtin/merge.c:707

2369 +msgid "Not handling anything other than two heads merge."

2370 +msgstr "不能处理两个头合并之外的任何操作。"

2371 +

2372 +#: builtin/merge.c:721

2373 +#, c-format

2374 +msgid "Unknown option for merge-recursive: -X%s"

2375 +msgstr "merge-recursive 的未知选项：-X%s"

2376 +

2377 +#: builtin/merge.c:735

2378 +#, c-format

2379 +msgid "unable to write %s"

2380 +msgstr "不能写 %s"

2381 +

2382 +#: builtin/merge.c:874

2383 +#, c-format

2384 +msgid "Could not read from '%s'"

2385 +msgstr "不能从 '%s' 读取"

2386 +

2387 +#: builtin/merge.c:883

2388 +#, c-format

2389 +msgid "Not committing merge; use 'git commit' to complete the merge.\n"

2390 +msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"

2391 +

2392 +#: builtin/merge.c:889

2393 +msgid ""

2394 +"Please enter a commit message to explain why this merge is necessary,\n"

2395 +"especially if it merges an updated upstream into a topic branch.\n"

2396 +"\n"

2397 +"Lines starting with '#' will be ignored, and an empty message aborts\n"

2398 +"the commit.\n"

2399 +msgstr ""

2400 +"请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n"

2401 +"合并到主题分支。\n"

2402 +"\n"

2403 +"以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。\n"

2404 +

2405 +#: builtin/merge.c:913

2406 +msgid "Empty commit message."

2407 +msgstr "空提交信息。"

2408 +

2409 +#: builtin/merge.c:925

2410 +#, c-format

2411 +msgid "Wonderful.\n"

2412 +msgstr "太棒了。\n"

2413 +

2414 +#: builtin/merge.c:998

2415 +#, c-format

2416 +msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

2417 +msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"

2418 +

2419 +#: builtin/merge.c:1014

2420 +#, c-format

2421 +msgid "'%s' is not a commit"

2422 +msgstr "'%s' 不是一个提交"

2423 +

2424 +#: builtin/merge.c:1055

2425 +msgid "No current branch."

2426 +msgstr "当前不在分支上。"

2427 +

2428 +#: builtin/merge.c:1057

2429 +msgid "No remote for the current branch."

2430 +msgstr "当前分支没有远程版本库。"

2431 +

2432 +#: builtin/merge.c:1059

2433 +msgid "No default upstream defined for the current branch."

2434 +msgstr "当前分支未定义默认上游分支。"

2435 +

2436 +#: builtin/merge.c:1064

2437 +#, c-format

2438 +msgid "No remote tracking branch for %s from %s"

2439 +msgstr "%s 没有来自 %s 的远程跟踪分支"

2440 +

2441 +#: builtin/merge.c:1186

2442 +msgid "There is no merge to abort (MERGE_HEAD missing)."

2443 +msgstr "没有要终止的合并（MERGE_HEAD 丢失）"

2444 +

2445 +#: builtin/merge.c:1202 git-pull.sh:31

2446 +msgid ""

2447 +"You have not concluded your merge (MERGE_HEAD exists).\n"

2448 +"Please, commit your changes before you can merge."

2449 +msgstr ""

2450 +"您尚未结束您的合并（存在 MERGE_HEAD）。\n"

2451 +"请先提交您的修改，您才能合并。"

2452 +

2453 +#: builtin/merge.c:1205 git-pull.sh:34

2454 +msgid "You have not concluded your merge (MERGE_HEAD exists)."

2455 +msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"

2456 +

2457 +#: builtin/merge.c:1209

2458 +msgid ""

2459 +"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

2460 +"Please, commit your changes before you can merge."

2461 +msgstr ""

2462 +"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"

2463 +"请先提交您的修改，您才能合并。"

2464 +

2465 +#: builtin/merge.c:1212

2466 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

2467 +msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"

2468 +

2469 +#: builtin/merge.c:1221

2470 +msgid "You cannot combine --squash with --no-ff."

2471 +msgstr "您不能将 --squash 与 --no-ff 共用。"

2472 +

2473 +#: builtin/merge.c:1226

2474 +msgid "You cannot combine --no-ff with --ff-only."

2475 +msgstr "您不能将 --no-ff 与 --ff-only 共用。"

2476 +

2477 +#: builtin/merge.c:1233

2478 +msgid "No commit specified and merge.defaultToUpstream not set."

2479 +msgstr "未指出提交并且 merge.defaultToUpstream 未设置。"

2480 +

2481 +#: builtin/merge.c:1264

2482 +msgid "Can merge only exactly one commit into empty head"

2483 +msgstr "只可将一个提交合并到空分支上"

2484 +

2485 +#: builtin/merge.c:1267

2486 +msgid "Squash commit into empty head not supported yet"

2487 +msgstr "尚不支持到空分支的压缩提交"

2488 +

2489 +#: builtin/merge.c:1269

2490 +msgid "Non-fast-forward commit does not make sense into an empty head"

2491 +msgstr "到空分支的非快进式提交没有意义"

2492 +

2493 +#: builtin/merge.c:1273 builtin/merge.c:1317

2494 +#, c-format

2495 +msgid "%s - not something we can merge"

2496 +msgstr "%s - 不是我们可以合并的东西"

2497 +

2498 +#: builtin/merge.c:1382

2499 +#, c-format

2500 +msgid "Updating %s..%s\n"

2501 +msgstr "更新 %s..%s\n"

2502 +

2503 +#: builtin/merge.c:1420

2504 +#, c-format

2505 +msgid "Trying really trivial in-index merge...\n"

2506 +msgstr "尝试非常小的暂存区内合并...\n"

2507 +

2508 +#: builtin/merge.c:1427

2509 +#, c-format

2510 +msgid "Nope.\n"

2511 +msgstr "无。\n"

2512 +

2513 +#: builtin/merge.c:1459

2514 +msgid "Not possible to fast-forward, aborting."

2515 +msgstr "不可能快进式，终止。"

2516 +

2517 +#: builtin/merge.c:1482 builtin/merge.c:1559

2518 +#, c-format

2519 +msgid "Rewinding the tree to pristine...\n"

2520 +msgstr "将树回滚至原始状态...\n"

2521 +

2522 +#: builtin/merge.c:1486

2523 +#, c-format

2524 +msgid "Trying merge strategy %s...\n"

2525 +msgstr "尝试合并策略 %s...\n"

2526 +

2527 +#: builtin/merge.c:1550

2528 +#, c-format

2529 +msgid "No merge strategy handled the merge.\n"

2530 +msgstr "没有合并策略处理此合并。\n"

2531 +

2532 +#: builtin/merge.c:1552

2533 +#, c-format

2534 +msgid "Merge with strategy %s failed.\n"

2535 +msgstr "使用策略 %s 合并失败。\n"

2536 +

2537 +#: builtin/merge.c:1561

2538 +#, c-format

2539 +msgid "Using the %s to prepare resolving by hand.\n"

2540 +msgstr "使用 %s 以准备手工解决。\n"

2541 +

2542 +#: builtin/merge.c:1572

2543 +#, c-format

2544 +msgid "Automatic merge went well; stopped before committing as requested\n"

2545 +msgstr "自动合并进展顺利，按要求在提交前停止\n"

2546 +

2547 +#: builtin/mv.c:108

2548 +#, c-format

2549 +msgid "Checking rename of '%s' to '%s'\n"

2550 +msgstr "检查 '%s' 到 '%s' 的重命名\n"

2551 +

2552 +#: builtin/mv.c:112

2553 +msgid "bad source"

2554 +msgstr "坏的源"

2555 +

2556 +#: builtin/mv.c:115

2557 +msgid "can not move directory into itself"

2558 +msgstr "不能将目录移动到自身"

2559 +

2560 +#: builtin/mv.c:118

2561 +msgid "cannot move directory over file"

2562 +msgstr "不能将目录移动到文件"

2563 +

2564 +#: builtin/mv.c:128

2565 +#, c-format

2566 +msgid "Huh? %.*s is in index?"

2567 +msgstr "嗯？%.*s 在暂存区中？"

2568 +

2569 +#: builtin/mv.c:140

2570 +msgid "source directory is empty"

2571 +msgstr "源目录为空"

2572 +

2573 +#: builtin/mv.c:171

2574 +msgid "not under version control"

2575 +msgstr "不在版本控制之下"

2576 +

2577 +#: builtin/mv.c:173

2578 +msgid "destination exists"

2579 +msgstr "目标已存在"

2580 +

2581 +#: builtin/mv.c:181

2582 +#, c-format

2583 +msgid "overwriting '%s'"

2584 +msgstr "覆盖 '%s'"

2585 +

2586 +#: builtin/mv.c:184

2587 +msgid "Cannot overwrite"

2588 +msgstr "不能覆盖"

2589 +

2590 +#: builtin/mv.c:187

2591 +msgid "multiple sources for the same target"

2592 +msgstr "同一目标具有多个源"

2593 +

2594 +#: builtin/mv.c:202

2595 +#, c-format

2596 +msgid "%s, source=%s, destination=%s"

2597 +msgstr "%s，源=%s，目标=%s"

2598 +

2599 +#: builtin/mv.c:212

2600 +#, c-format

2601 +msgid "Renaming %s to %s\n"

2602 +msgstr "重命名 %s 至 %s\n"

2603 +

2604 +#: builtin/mv.c:215

2605 +#, c-format

2606 +msgid "renaming '%s' failed"

2607 +msgstr "重命名 '%s' 失败"

2608 +

2609 +#: builtin/notes.c:139

2610 +#, c-format

2611 +msgid "unable to start 'show' for object '%s'"

2612 +msgstr "不能为对象 '%s' 开始 'show'"

2613 +

2614 +#: builtin/notes.c:145

2615 +msgid "can't fdopen 'show' output fd"

2616 +msgstr "不能打开 'show' 输出文件句柄"

2617 +

2618 +#: builtin/notes.c:155

2619 +#, c-format

2620 +msgid "failed to close pipe to 'show' for object '%s'"

2621 +msgstr "无法为对象 '%s' 的 'show' 关闭管道"

2622 +

2623 +#: builtin/notes.c:158

2624 +#, c-format

2625 +msgid "failed to finish 'show' for object '%s'"

2626 +msgstr "无法为对象 '%s' 完成 'show'"

2627 +

2628 +#: builtin/notes.c:175 builtin/tag.c:310

2629 +#, c-format

2630 +msgid "could not create file '%s'"

2631 +msgstr "不能创建文件 '%s'"

2632 +

2633 +#: builtin/notes.c:189

2634 +msgid "Please supply the note contents using either -m or -F option"

2635 +msgstr "请通过 -m 或 -F 选项为注解提供内容"

2636 +

2637 +#: builtin/notes.c:210 builtin/notes.c:973

2638 +#, c-format

2639 +msgid "Removing note for object %s\n"

2640 +msgstr "删除对象 %s 的注解\n"

2641 +

2642 +#: builtin/notes.c:215

2643 +msgid "unable to write note object"

2644 +msgstr "不能写注解对象"

2645 +

2646 +#: builtin/notes.c:217

2647 +#, c-format

2648 +msgid "The note contents has been left in %s"

2649 +msgstr "注解内容被留在文件 %s 中"

2650 +

2651 +#: builtin/notes.c:251 builtin/tag.c:465

2652 +#, c-format

2653 +msgid "cannot read '%s'"

2654 +msgstr "不能读取 '%s'"

2655 +

2656 +#: builtin/notes.c:253 builtin/tag.c:468

2657 +#, c-format

2658 +msgid "could not open or read '%s'"

2659 +msgstr "不能打开或读取 '%s'"

2660 +

2661 +#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447

2662 +#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644

2663 +#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766

2664 +#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:481

2665 +#, c-format

2666 +msgid "Failed to resolve '%s' as a valid ref."

2667 +msgstr "无法解析 '%s' 为一个有效引用"

2668 +

2669 +#: builtin/notes.c:275

2670 +#, c-format

2671 +msgid "Failed to read object '%s'."

2672 +msgstr "无法读取对象 '%s'。"

2673 +

2674 +#: builtin/notes.c:299

2675 +msgid "Cannot commit uninitialized/unreferenced notes tree"

2676 +msgstr "不能提交未初始化/未引用的注解树"

2677 +

2678 +#: builtin/notes.c:340

2679 +#, c-format

2680 +msgid "Bad notes.rewriteMode value: '%s'"

2681 +msgstr "错误的 notes.rewriteMode 值：'%s'"

2682 +

2683 +#: builtin/notes.c:350

2684 +#, c-format

2685 +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

2686 +msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

2687 +

2688 +#. TRANSLATORS: The first %s is the name of the

2689 +#. environment variable, the second %s is its value

2690 +#: builtin/notes.c:377

2691 +#, c-format

2692 +msgid "Bad %s value: '%s'"

2693 +msgstr "错误的 %s 值：'%s'"

2694 +

2695 +#: builtin/notes.c:441

2696 +#, c-format

2697 +msgid "Malformed input line: '%s'."

2698 +msgstr "非法的输入行：'%s'。"

2699 +

2700 +#: builtin/notes.c:456

2701 +#, c-format

2702 +msgid "Failed to copy notes from '%s' to '%s'"

2703 +msgstr "无法从 '%s' 拷贝注解到 '%s'"

2704 +

2705 +#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627

2706 +#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759

2707 +#: builtin/notes.c:1033

2708 +msgid "too many parameters"

2709 +msgstr "参数太多"

2710 +

2711 +#: builtin/notes.c:513 builtin/notes.c:772

2712 +#, c-format

2713 +msgid "No note found for object %s."

2714 +msgstr "未发现对象 %s 的注解。"

2715 +

2716 +#: builtin/notes.c:580

2717 +#, c-format

2718 +msgid ""

2719 +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "

2720 +"existing notes"

2721 +msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"

2722 +

2723 +#: builtin/notes.c:585 builtin/notes.c:662

2724 +#, c-format

2725 +msgid "Overwriting existing notes for object %s\n"

2726 +msgstr "覆盖对象 %s 现存注解\n"

2727 +

2728 +#: builtin/notes.c:635

2729 +msgid "too few parameters"

2730 +msgstr "参数太少"

2731 +

2732 +#: builtin/notes.c:656

2733 +#, c-format

2734 +msgid ""

2735 +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "

2736 +"existing notes"

2737 +msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"

2738 +

2739 +#: builtin/notes.c:668

2740 +#, c-format

2741 +msgid "Missing notes on source object %s. Cannot copy."

2742 +msgstr "源对象 %s 缺少注解。不能拷贝。"

2743 +

2744 +#: builtin/notes.c:717

2745 +#, c-format

2746 +msgid ""

2747 +"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"

2748 +"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"

2749 +msgstr ""

2750 +"选项 -m/-F/-c/-C 已为 'edit' 子命令废弃。\n"

2751 +"请换用 'git notes add -f -m/-F/-c/-C'。\n"

2752 +

2753 +#: builtin/notes.c:971

2754 +#, c-format

2755 +msgid "Object %s has no note\n"

2756 +msgstr "对象 %s 没有注解\n"

2757 +

2758 +#: builtin/notes.c:1103

2759 +#, c-format

2760 +msgid "Unknown subcommand: %s"

2761 +msgstr "未知子命令：%s"

2762 +

2763 +#: builtin/push.c:44

2764 +msgid "tag shorthand without <tag>"

2765 +msgstr "tag 简写没有跟 <tag> 参数"

2766 +

2767 +#: builtin/push.c:63

2768 +msgid "--delete only accepts plain target ref names"

2769 +msgstr "--delete 只接受简单的引用名称"

2770 +

2771 +#: builtin/push.c:73

2772 +#, c-format

2773 +msgid ""

2774 +"You are not currently on a branch.\n"

2775 +"To push the history leading to the current (detached HEAD)\n"

2776 +"state now, use\n"

2777 +"\n"

2778 +" git push %s HEAD:<name-of-remote-branch>\n"

2779 +msgstr ""

2780 +"您当前不在一个分支上。\n"

2781 +"现在为推送当前历史（分离头指针），使用\n"

2782 +"\n"

2783 +" git push %s HEAD:<name-of-remote-branch>\n"

2784 +

2785 +#: builtin/push.c:80

2786 +#, c-format

2787 +msgid ""

2788 +"The current branch %s has no upstream branch.\n"

2789 +"To push the current branch and set the remote as upstream, use\n"

2790 +"\n"

2791 +" git push --set-upstream %s %s\n"

2792 +msgstr ""

2793 +"当前分支 %s 没有对应的上游分支。\n"

2794 +"为推送当前分支并建立与远程上游的跟踪，使用\n"

2795 +"\n"

2796 +" git push --set-upstream %s %s\n"

2797 +

2798 +#: builtin/push.c:88

2799 +#, c-format

2800 +msgid "The current branch %s has multiple upstream branches, refusing to push."

2801 +msgstr "当前分支 %s 有多个上游分支，拒绝推送。"

2802 +

2803 +#: builtin/push.c:111

2804 +msgid ""

2805 +"You didn't specify any refspecs to push, and push.default is \"nothing\"."

2806 +msgstr "您没有为推送提供任何引用表达式，并且 push.default 为 \"nothing\"。"

2807 +

2808 +#: builtin/push.c:131

2809 +#, c-format

2810 +msgid "Pushing to %s\n"

2811 +msgstr "推送到 %s\n"

2812 +

2813 +#: builtin/push.c:135

2814 +#, c-format

2815 +msgid "failed to push some refs to '%s'"

2816 +msgstr "无法推送一些引用到 '%s'"

2817 +

2818 +#: builtin/push.c:143

2819 +#, c-format

2820 +msgid ""

2821 +"To prevent you from losing history, non-fast-forward updates were rejected\n"

2822 +"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"

2823 +"'Note about fast-forwards' section of 'git push --help' for details.\n"

2824 +msgstr ""

2825 +"为防止您丢失提交历史，禁止非快进式推送。\n"

2826 +"再次推送前先与远程变更合并（如 'git pull'）。详见\n"

2827 +"'git push --help' 中的 'Note about fast-forwards' 小节。\n"

2828 +

2829 +#: builtin/push.c:160

2830 +#, c-format

2831 +msgid "bad repository '%s'"

2832 +msgstr "错误的版本库 '%s'"

2833 +

2834 +#: builtin/push.c:161

2835 +msgid ""

2836 +"No configured push destination.\n"

2837 +"Either specify the URL from the command-line or configure a remote "

2838 +"repository using\n"

2839 +"\n"

2840 +" git remote add <name> <url>\n"

2841 +"\n"

2842 +"and then push using the remote name\n"

2843 +"\n"

2844 +" git push <name>\n"

2845 +msgstr ""

2846 +"未配置推送目标。\n"

2847 +"或者通过命令行提供URL，或者用下面命令配置一个远程版本库\n"

2848 +"\n"

2849 +" git remote add <name> <url>\n"

2850 +"\n"

2851 +"然后使用该远程版本库名执行推送\n"

2852 +"\n"

2853 +" git push <name>\n"

2854 +

2855 +#: builtin/push.c:176

2856 +msgid "--all and --tags are incompatible"

2857 +msgstr "--all 和 --tags 不兼容"

2858 +

2859 +#: builtin/push.c:177

2860 +msgid "--all can't be combined with refspecs"

2861 +msgstr "--all 不能和引用表达式共用"

2862 +

2863 +#: builtin/push.c:182

2864 +msgid "--mirror and --tags are incompatible"

2865 +msgstr "--mirror 和 --tags 不兼容"

2866 +

2867 +#: builtin/push.c:183

2868 +msgid "--mirror can't be combined with refspecs"

2869 +msgstr "--mirror 不能和引用表达式共用"

2870 +

2871 +#: builtin/push.c:188

2872 +msgid "--all and --mirror are incompatible"

2873 +msgstr "--all 和 --mirror 不兼容"

2874 +

2875 +#: builtin/push.c:272

2876 +msgid "--delete is incompatible with --all, --mirror and --tags"

2877 +msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"

2878 +

2879 +#: builtin/push.c:274

2880 +msgid "--delete doesn't make sense without any refs"

2881 +msgstr "--delete 未接任何引用没有意义"

2882 +

2883 +#: builtin/reset.c:33

2884 +msgid "mixed"

2885 +msgstr "混杂"

2886 +

2887 +#: builtin/reset.c:33

2888 +msgid "soft"

2889 +msgstr "软性"

2890 +

2891 +#: builtin/reset.c:33

2892 +msgid "hard"

2893 +msgstr "硬性"

2894 +

2895 +#: builtin/reset.c:33

2896 +msgid "keep"

2897 +msgstr "保持"

2898 +

2899 +#: builtin/reset.c:77

2900 +msgid "You do not have a valid HEAD."

2901 +msgstr "您没有一个有效的 HEAD。"

2902 +

2903 +#: builtin/reset.c:79

2904 +msgid "Failed to find tree of HEAD."

2905 +msgstr "无法找到 HEAD 指向的树。"

2906 +

2907 +#: builtin/reset.c:85

2908 +#, c-format

2909 +msgid "Failed to find tree of %s."

2910 +msgstr "无法找到 %s 指向的树。"

2911 +

2912 +#: builtin/reset.c:96

2913 +msgid "Could not write new index file."

2914 +msgstr "无法写入新的暂存区文件。"

2915 +

2916 +#: builtin/reset.c:106

2917 +#, c-format

2918 +msgid "HEAD is now at %s"

2919 +msgstr "HEAD 现在位于 %s"

2920 +

2921 +#: builtin/reset.c:130

2922 +msgid "Could not read index"

2923 +msgstr "不能读取暂存区"

2924 +

2925 +#: builtin/reset.c:133

2926 +msgid "Unstaged changes after reset:"

2927 +msgstr "重置后变更撤出暂存区："

2928 +

2929 +# 汉字之间无空格，故删除%s前后空格

2930 +#: builtin/reset.c:223

2931 +#, c-format

2932 +msgid "Cannot do a %s reset in the middle of a merge."

2933 +msgstr "在合并过程中不能做%s重置操作。"

2934 +

2935 +#: builtin/reset.c:297

2936 +#, c-format

2937 +msgid "Could not parse object '%s'."

2938 +msgstr "不能解析对象 '%s'。"

2939 +

2940 +#: builtin/reset.c:302

2941 +msgid "--patch is incompatible with --{hard,mixed,soft}"

2942 +msgstr "--patch 与 --{hard,mixed,soft} 不兼容"

2943 +

2944 +#: builtin/reset.c:311

2945 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."

2946 +msgstr "--mixed 带路径已弃用，代之以 'git reset -- <paths>'。"

2947 +

2948 +# 汉字之间无空格，故删除%s前后空格

2949 +#: builtin/reset.c:313

2950 +#, c-format

2951 +msgid "Cannot do %s reset with paths."

2952 +msgstr "不能带路径进行%s重置。"

2953 +

2954 +# 汉字之间无空格，故删除%s前后空格

2955 +#: builtin/reset.c:325

2956 +#, c-format

2957 +msgid "%s reset is not allowed in a bare repository"

2958 +msgstr "不能对裸版本库进行%s重置"

2959 +

2960 +#: builtin/reset.c:341

2961 +#, c-format

2962 +msgid "Could not reset index file to revision '%s'."

2963 +msgstr "不能重置暂存区至版本 '%s'。"

2964 +

2965 +#: builtin/revert.c:70 builtin/revert.c:91

2966 +#, c-format

2967 +msgid "%s: %s cannot be used with %s"

2968 +msgstr "%s: %s 不能和 %s 共用"

2969 +

2970 +#: builtin/revert.c:126

2971 +msgid "program error"

2972 +msgstr "程序错误"

2973 +

2974 +#: builtin/revert.c:209

2975 +msgid "revert failed"

2976 +msgstr "还原失败"

2977 +

2978 +#: builtin/revert.c:224

2979 +msgid "cherry-pick failed"

2980 +msgstr "拣选失败"

2981 +

2982 +#: builtin/rm.c:109

2983 +#, c-format

2984 +msgid ""

2985 +"'%s' has staged content different from both the file and the HEAD\n"

2986 +"(use -f to force removal)"

2987 +msgstr ""

2988 +"'%s' 暂存的内容和工作区文件及 HEAD 中的都不一样\n"

2989 +"（使用 -f 强制删除）"

2990 +

2991 +#: builtin/rm.c:115

2992 +#, c-format

2993 +msgid ""

2994 +"'%s' has changes staged in the index\n"

2995 +"(use --cached to keep the file, or -f to force removal)"

2996 +msgstr ""

2997 +"'%s' 有变更已加入暂存区中\n"

2998 +"（使用 --cached 保存文件，或用 -f 强制删除）"

2999 +

3000 +#: builtin/rm.c:119

3001 +#, c-format

3002 +msgid ""

3003 +"'%s' has local modifications\n"

3004 +"(use --cached to keep the file, or -f to force removal)"

3005 +msgstr ""

3006 +"'%s' 有本地修改\n"

3007 +"（使用 --cached 保存文件，或用 -f 强制删除）"

3008 +

3009 +#: builtin/rm.c:194

3010 +#, c-format

3011 +msgid "not removing '%s' recursively without -r"

3012 +msgstr "未提供 -r 选项不会递归删除 '%s'"

3013 +

3014 +#: builtin/rm.c:230

3015 +#, c-format

3016 +msgid "git rm: unable to remove %s"

3017 +msgstr "git rm：不能删除 %s"

3018 +

3019 +#: builtin/shortlog.c:157

3020 +#, c-format

3021 +msgid "Missing author: %s"

3022 +msgstr "缺少作者：%s"

3023 +

3024 +#: builtin/tag.c:172

3025 +#, c-format

3026 +msgid "tag name too long: %.*s..."

3027 +msgstr "tag 名字太长：%.*s..."

3028 +

3029 +#: builtin/tag.c:177

3030 +#, c-format

3031 +msgid "tag '%s' not found."

3032 +msgstr "tag '%s' 未发现。"

3033 +

3034 +#: builtin/tag.c:192

3035 +#, c-format

3036 +msgid "Deleted tag '%s' (was %s)\n"

3037 +msgstr "已删除 tag '%s'（曾为 %s）\n"

3038 +

3039 +#: builtin/tag.c:204

3040 +#, c-format

3041 +msgid "could not verify the tag '%s'"

3042 +msgstr "不能校验 tag '%s'"

3043 +

3044 +#: builtin/tag.c:214

3045 +msgid ""

3046 +"\n"

3047 +"#\n"

3048 +"# Write a tag message\n"

3049 +"# Lines starting with '#' will be ignored.\n"

3050 +"#\n"

3051 +msgstr ""

3052 +"\n"

3053 +"#\n"

3054 +"# 输入一个 tag 说明\n"

3055 +"# 以 '#' 开头的行将被忽略。\n"

3056 +"#\n"

3057 +

3058 +#: builtin/tag.c:221

3059 +msgid ""

3060 +"\n"

3061 +"#\n"

3062 +"# Write a tag message\n"

3063 +"# Lines starting with '#' will be kept; you may remove them yourself if you "

3064 +"want to.\n"

3065 +"#\n"

3066 +msgstr ""

3067 +"\n"

3068 +"#\n"

3069 +"# 输入一个 tag 说明\n"

3070 +"# 以 '#' 开头的行将被忽略，您可以删除它们如果您想这样做。\n"

3071 +"#\n"

3072 +

3073 +#: builtin/tag.c:261

3074 +msgid "unable to sign the tag"

3075 +msgstr "无法签署 tag"

3076 +

3077 +#: builtin/tag.c:263

3078 +msgid "unable to write tag file"

3079 +msgstr "无法写 tag 文件"

3080 +

3081 +#: builtin/tag.c:288

3082 +msgid "bad object type."

3083 +msgstr "无效的对象类型"

3084 +

3085 +#: builtin/tag.c:301

3086 +msgid "tag header too big."

3087 +msgstr "tag 头信息太大"

3088 +

3089 +#: builtin/tag.c:333

3090 +msgid "no tag message?"

3091 +msgstr "无 tag 说明？"

3092 +

3093 +#: builtin/tag.c:339

3094 +#, c-format

3095 +msgid "The tag message has been left in %s\n"

3096 +msgstr "tag 说明被保留在 %s\n"

3097 +

3098 +#: builtin/tag.c:448

3099 +msgid "-n option is only allowed with -l."

3100 +msgstr "-n 选项只允许和 -l 共用。"

3101 +

3102 +#: builtin/tag.c:450

3103 +msgid "--contains option is only allowed with -l."

3104 +msgstr "--contains 选项只允许和 -l 共用。"

3105 +

3106 +#: builtin/tag.c:458

3107 +msgid "only one -F or -m option is allowed."

3108 +msgstr "只允许一个 -F 或 -m 选项。"

3109 +

3110 +#: builtin/tag.c:478

3111 +msgid "too many params"

3112 +msgstr "太多参数"

3113 +

3114 +#: builtin/tag.c:484

3115 +#, c-format

3116 +msgid "'%s' is not a valid tag name."

3117 +msgstr "'%s' 不是一个有效的tag名称"

3118 +

3119 +#: builtin/tag.c:489

3120 +#, c-format

3121 +msgid "tag '%s' already exists"

3122 +msgstr "tag '%s' 已存在"

3123 +

3124 +#: builtin/tag.c:507

3125 +#, c-format

3126 +msgid "%s: cannot lock the ref"

3127 +msgstr "%s：不能锁定引用"

3128 +

3129 +#: builtin/tag.c:509

3130 +#, c-format

3131 +msgid "%s: cannot update the ref"

3132 +msgstr "%s：不能更新引用"

3133 +

3134 +#: builtin/tag.c:511

3135 +#, c-format

3136 +msgid "Updated tag '%s' (was %s)\n"

3137 +msgstr "已更新tag '%s'（曾为 %s）\n"

3138 +

3139 +#: git-am.sh:49

3140 +msgid "You need to set your committer info first"

3141 +msgstr "您需要先设置你的提交者信息"

3142 +

3143 +#: git-am.sh:135

3144 +msgid "Repository lacks necessary blobs to fall back on 3-way merge."

3145 +msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"

3146 +

3147 +#: git-am.sh:144

3148 +msgid ""

3149 +"Did you hand edit your patch?\n"

3150 +"It does not apply to blobs recorded in its index."

3151 +msgstr ""

3152 +"您是否曾手动编辑过您的补丁？\n"

3153 +"无法应用补丁到暂存区的数据中。"

3154 +

3155 +#: git-am.sh:153

3156 +msgid "Falling back to patching base and 3-way merge..."

3157 +msgstr "转而使用补丁应用的基础版本和三路合并..."

3158 +

3159 +#: git-am.sh:265

3160 +msgid "Only one StGIT patch series can be applied at once"

3161 +msgstr "一次只能有一个 StGIT 补丁队列被应用"

3162 +

3163 +#: git-am.sh:352

3164 +#, sh-format

3165 +msgid "Patch format $patch_format is not supported."

3166 +msgstr "不支持 $patch_format 补丁格式。"

3167 +

3168 +#: git-am.sh:354

3169 +msgid "Patch format detection failed."

3170 +msgstr "补丁格式检测失败。"

3171 +

3172 +#: git-am.sh:406

3173 +msgid "-d option is no longer supported. Do not use."

3174 +msgstr "不再支持 -d 选项。不要使用。"

3175 +

3176 +#: git-am.sh:469

3177 +#, sh-format

3178 +msgid "previous rebase directory $dotest still exists but mbox given."

3179 +msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"

3180 +

3181 +#: git-am.sh:474

3182 +msgid "Please make up your mind. --skip or --abort?"

3183 +msgstr "请下决心。--skip 或是 --abort ？"

3184 +

3185 +#: git-am.sh:501

3186 +msgid "Resolve operation not in progress, we are not resuming."

3187 +msgstr "解决操作未进行，我们不会继续。"

3188 +

3189 +#: git-am.sh:567

3190 +#, sh-format

3191 +msgid "Dirty index: cannot apply patches (dirty: $files)"

3192 +msgstr "脏的暂存区：不能应用补丁（脏文件：$files）"

3193 +

3194 +#: git-am.sh:743

3195 +msgid "cannot be interactive without stdin connected to a terminal."

3196 +msgstr "没有和终端关联的标准输入不能进行交互式操作。"

3197 +

3198 +# 注意保持句尾空格

3199 +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]

3200 +#. in your translation. The program will only accept English

3201 +#. input at this point.

3202 +#: git-am.sh:754

3203 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "

3204 +msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "

3205 +

3206 +#: git-am.sh:790

3207 +#, sh-format

3208 +msgid "Applying: $FIRSTLINE"

3209 +msgstr "正应用：$FIRSTLINE"

3210 +

3211 +#: git-am.sh:835

3212 +msgid "No changes -- Patch already applied."

3213 +msgstr "没有变更 -- 补丁已经应用过。"

3214 +

3215 +#: git-am.sh:861

3216 +msgid "applying to an empty history"

3217 +msgstr "正应用到一个空历史上"

3218 +

3219 +# 注意保持句尾空格

3220 +#. TRANSLATORS: Make sure to include [Y] and [n] in your

3221 +#. translation. The program will only accept English input

3222 +#. at this point.

3223 +#: git-bisect.sh:54

3224 +msgid "Do you want me to do it for you [Y/n]? "

3225 +msgstr "您想让我为您这样做么[Y/n]？ "

3226 +

3227 +#: git-bisect.sh:95

3228 +#, sh-format

3229 +msgid "unrecognised option: '$arg'"

3230 +msgstr "未识别的选项：'$arg'"

3231 +

3232 +#: git-bisect.sh:99

3233 +#, sh-format

3234 +msgid "'$arg' does not appear to be a valid revision"

3235 +msgstr "'$arg' 看起来不像是一个有效的版本"

3236 +

3237 +#: git-bisect.sh:117

3238 +msgid "Bad HEAD - I need a HEAD"

3239 +msgstr "坏的 HEAD - 我需要一个 HEAD"

3240 +

3241 +#: git-bisect.sh:130

3242 +#, sh-format

3243 +msgid ""

3244 +"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."

3245 +msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"

3246 +

3247 +#: git-bisect.sh:140

3248 +msgid "won't bisect on seeked tree"

3249 +msgstr "不会在已查找过的树上二分查找"

3250 +

3251 +#: git-bisect.sh:144

3252 +msgid "Bad HEAD - strange symbolic ref"

3253 +msgstr "错误的 HEAD - 奇怪的符号引用"

3254 +

3255 +#: git-bisect.sh:189

3256 +#, sh-format

3257 +msgid "Bad bisect_write argument: $state"

3258 +msgstr "错误的bisect_write参数：$state"

3259 +

3260 +#: git-bisect.sh:218

3261 +#, sh-format

3262 +msgid "Bad rev input: $arg"

3263 +msgstr "输入错误版本：$arg"

3264 +

3265 +#: git-bisect.sh:232

3266 +msgid "Please call 'bisect_state' with at least one argument."

3267 +msgstr "请在调用 'bisect_state' 时跟至少一个参数。"

3268 +

3269 +#: git-bisect.sh:244

3270 +#, sh-format

3271 +msgid "Bad rev input: $rev"

3272 +msgstr "输入坏的版本：$rev"

3273 +

3274 +#: git-bisect.sh:250

3275 +msgid "'git bisect bad' can take only one argument."

3276 +msgstr "'git bisect bad' 只能带一个参数。"

3277 +

3278 +# 注意保持句尾空格

3279 +#. TRANSLATORS: Make sure to include [Y] and [n] in your

3280 +#. translation. The program will only accept English input

3281 +#. at this point.

3282 +#: git-bisect.sh:279

3283 +msgid "Are you sure [Y/n]? "

3284 +msgstr "您确认么[Y/n]？ "

3285 +

3286 +#: git-bisect.sh:354

3287 +#, sh-format

3288 +msgid "'$invalid' is not a valid commit"

3289 +msgstr "'$invalid' 不是一个有效的提交"

3290 +

3291 +#: git-bisect.sh:363

3292 +#, sh-format

3293 +msgid ""

3294 +"Could not check out original HEAD '$branch'.\n"

3295 +"Try 'git bisect reset <commit>'."

3296 +msgstr ""

3297 +"不能检出原始 HEAD '$branch'。\n"

3298 +"尝试 'git bisect reset <commit>'。"

3299 +

3300 +#: git-bisect.sh:390

3301 +msgid "No logfile given"

3302 +msgstr "未提供日志文件"

3303 +

3304 +#: git-bisect.sh:391

3305 +#, sh-format

3306 +msgid "cannot read $file for replaying"

3307 +msgstr "不能读取 $file 来重放"

3308 +

3309 +#: git-bisect.sh:408

3310 +msgid "?? what are you talking about?"

3311 +msgstr "?? 您在说什么?"

3312 +

3313 +#: git-bisect.sh:474

3314 +msgid "We are not bisecting."

3315 +msgstr "我们没有进行二分查找。"

3316 +

3317 +#: git-pull.sh:21

3318 +msgid ""

3319 +"Pull is not possible because you have unmerged files.\n"

3320 +"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"

3321 +"as appropriate to mark resolution, or use 'git commit -a'."

3322 +msgstr ""

3323 +"Pull 不可用，因为你尚有未合并的文件。请先在工作区改正文件，\n"

3324 +"然后酌情使用 'git add/rm <file>' 标记解决方案，\n"

3325 +"或使用 'git commit -a'。"

3326 +

3327 +#: git-pull.sh:25

3328 +msgid "Pull is not possible because you have unmerged files."

3329 +msgstr "Pull 不可用，因为你尚有未合并的文件。"

3330 +

3331 +#: git-pull.sh:193

3332 +msgid "updating an unborn branch with changes added to the index"

3333 +msgstr "更新尚未诞生的分支，变更添加至暂存区"

3334 +

3335 +#: git-pull.sh:249

3336 +msgid "Cannot merge multiple branches into empty head"

3337 +msgstr "无法将多个分支合并到空分支"

3338 +

3339 +#: git-pull.sh:253

3340 +msgid "Cannot rebase onto multiple branches"

3341 +msgstr "无法变基到多个分支"

3342 +

3343 +#: git-stash.sh:51

3344 +msgid "git stash clear with parameters is unimplemented"

3345 +msgstr "git stash clear 不支持参数"

3346 +

3347 +#: git-stash.sh:74

3348 +msgid "You do not have the initial commit yet"

3349 +msgstr "您尚未建立初始提交"

3350 +

3351 +#: git-stash.sh:89

3352 +msgid "Cannot save the current index state"

3353 +msgstr "无法保存当前暂存区状态"

3354 +

3355 +#: git-stash.sh:123 git-stash.sh:136

3356 +msgid "Cannot save the current worktree state"

3357 +msgstr "无法保存当前工作区状态"

3358 +

3359 +#: git-stash.sh:140

3360 +msgid "No changes selected"

3361 +msgstr "没有修改被选择"

3362 +

3363 +#: git-stash.sh:143

3364 +msgid "Cannot remove temporary index (can't happen)"

3365 +msgstr "无法删除临时暂存区（不应发生）"

3366 +

3367 +#: git-stash.sh:156

3368 +msgid "Cannot record working tree state"

3369 +msgstr "不能记录工作区状态"

3370 +

3371 +#: git-stash.sh:223

3372 +msgid "No local changes to save"

3373 +msgstr "没有要保存的本地修改"

3374 +

3375 +#: git-stash.sh:227

3376 +msgid "Cannot initialize stash"

3377 +msgstr "无法初始化stash"

3378 +

3379 +#: git-stash.sh:235

3380 +msgid "Cannot save the current status"

3381 +msgstr "无法保存当前状态"

3382 +

3383 +#: git-stash.sh:253

3384 +msgid "Cannot remove worktree changes"

3385 +msgstr "无法删除工作区变更"

3386 +

3387 +#: git-stash.sh:352

3388 +msgid "No stash found."

3389 +msgstr "未发现stash。"

3390 +

3391 +#: git-stash.sh:359

3392 +#, sh-format

3393 +msgid "Too many revisions specified: $REV"

3394 +msgstr "提供太多的版本：$REV"

3395 +

3396 +#: git-stash.sh:365

3397 +#, sh-format

3398 +msgid "$reference is not valid reference"

3399 +msgstr "$reference 不是有效的引用"

3400 +

3401 +#: git-stash.sh:393

3402 +#, sh-format

3403 +msgid "'$args' is not a stash-like commit"

3404 +msgstr "'$args' 不是stash样提交"

3405 +

3406 +#: git-stash.sh:404

3407 +#, sh-format

3408 +msgid "'$args' is not a stash reference"

3409 +msgstr "'$args' 不是一个stash引用"

3410 +

3411 +#: git-stash.sh:412

3412 +msgid "unable to refresh index"

3413 +msgstr "无法刷新暂存区"

3414 +

3415 +#: git-stash.sh:416

3416 +msgid "Cannot apply a stash in the middle of a merge"

3417 +msgstr "无法在合并过程中恢复进度"

3418 +

3419 +#: git-stash.sh:424

3420 +msgid "Conflicts in index. Try without --index."

3421 +msgstr "暂存区冲突。尝试不用 --index。"

3422 +

3423 +#: git-stash.sh:426

3424 +msgid "Could not save index tree"

3425 +msgstr "无法保存暂存区"

3426 +

3427 +#: git-stash.sh:460

3428 +msgid "Cannot unstage modified files"

3429 +msgstr "无法还原修改的文件"

3430 +

3431 +#: git-stash.sh:491

3432 +#, sh-format

3433 +msgid "Dropped ${REV} ($s)"

3434 +msgstr "丢弃了 ${REV} ($s)"

3435 +

3436 +#: git-stash.sh:492

3437 +#, sh-format

3438 +msgid "${REV}: Could not drop stash entry"

3439 +msgstr "${REV}: 无法丢弃进度条目"

3440 +

3441 +#: git-stash.sh:499

3442 +msgid "No branch name specified"

3443 +msgstr "未指定分支名"

3444 +

3445 +#: git-stash.sh:570

3446 +msgid "(To restore them type \"git stash apply\")"

3447 +msgstr "（为恢复数据输入 \"git stash apply\"）"

3448 +

3449 +#: git-submodule.sh:56

3450 +#, sh-format

3451 +msgid "cannot strip one component off url '$remoteurl'"

3452 +msgstr "无法从 url '$remoteurl' 剥离一个组件"

3453 +

3454 +#: git-submodule.sh:108

3455 +#, sh-format

3456 +msgid "No submodule mapping found in .gitmodules for path '$path'"

3457 +msgstr "未在 .gitmodules 中发现路径 '$path' 的子模组映射"

3458 +

3459 +#: git-submodule.sh:173

3460 +#, sh-format

3461 +msgid "Clone of '$url' into submodule path '$path' failed"

3462 +msgstr "克隆 '$url' 到子模组路径 '$path' 失败"

3463 +

3464 +#: git-submodule.sh:247

3465 +#, sh-format

3466 +msgid "repo URL: '$repo' must be absolute or begin with ./|../"

3467 +msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"

3468 +

3469 +#: git-submodule.sh:264

3470 +#, sh-format

3471 +msgid "'$path' already exists in the index"

3472 +msgstr "'$path' 已经存在于暂存区中"

3473 +

3474 +#: git-submodule.sh:281

3475 +#, sh-format

3476 +msgid "'$path' already exists and is not a valid git repo"

3477 +msgstr "'$path' 已存在且不是一个有效的 git 版本库"

3478 +

3479 +#: git-submodule.sh:295

3480 +#, sh-format

3481 +msgid "Unable to checkout submodule '$path'"

3482 +msgstr "不能检出子模组 '$path'"

3483 +

3484 +#: git-submodule.sh:300

3485 +#, sh-format

3486 +msgid "Failed to add submodule '$path'"

3487 +msgstr "无法添加子模组 '$path'"

3488 +

3489 +#: git-submodule.sh:305

3490 +#, sh-format

3491 +msgid "Failed to register submodule '$path'"

3492 +msgstr "无法注册子模组 '$path'"

3493 +

3494 +#: git-submodule.sh:347

3495 +#, sh-format

3496 +msgid "Entering '$prefix$path'"

3497 +msgstr "正在进入 '$prefix$path'"

3498 +

3499 +#: git-submodule.sh:359

3500 +#, sh-format

3501 +msgid "Stopping at '$path'; script returned non-zero status."

3502 +msgstr "停止于 '$path'，脚本返回非零值。"

3503 +

3504 +#: git-submodule.sh:401

3505 +#, sh-format

3506 +msgid "No url found for submodule path '$path' in .gitmodules"

3507 +msgstr "在 .gitmodules 中未找到子模组路径 '$path' 的url"

3508 +

3509 +#: git-submodule.sh:410

3510 +#, sh-format

3511 +msgid "Failed to register url for submodule path '$path'"

3512 +msgstr "无法为子模组路径 '$path' 注册 url"

3513 +

3514 +#: git-submodule.sh:418

3515 +#, sh-format

3516 +msgid "Failed to register update mode for submodule path '$path'"

3517 +msgstr "无法为子模组路径 '$path' 注册更新模式"

3518 +

3519 +#: git-submodule.sh:420

3520 +#, sh-format

3521 +msgid "Submodule '$name' ($url) registered for path '$path'"

3522 +msgstr "子模组 '$name' ($url) 已为路径 '$path' 注册"

3523 +

3524 +#: git-submodule.sh:519

3525 +#, sh-format

3526 +msgid ""

3527 +"Submodule path '$path' not initialized\n"

3528 +"Maybe you want to use 'update --init'?"

3529 +msgstr ""

3530 +"子模组路径 '$path' 没有初始化\n"

3531 +"也许你想用 'update --init'？"

3532 +

3533 +#: git-submodule.sh:532

3534 +#, sh-format

3535 +msgid "Unable to find current revision in submodule path '$path'"

3536 +msgstr "无法在子模组路径 '$path' 中找到当前版本"

3537 +

3538 +#: git-submodule.sh:551

3539 +#, sh-format

3540 +msgid "Unable to fetch in submodule path '$path'"

3541 +msgstr "无法在子模组路径 '$path' 中获取"

3542 +

3543 +#: git-submodule.sh:565

3544 +#, sh-format

3545 +msgid "Unable to rebase '$sha1' in submodule path '$path'"

3546 +msgstr "无法在子模组路径 '$path' 中变基 '$sha1'"

3547 +

3548 +#: git-submodule.sh:566

3549 +#, sh-format

3550 +msgid "Submodule path '$path': rebased into '$sha1'"

3551 +msgstr "子模组路径 '$path'：变基至 '$sha1'"

3552 +

3553 +#: git-submodule.sh:571

3554 +#, sh-format

3555 +msgid "Unable to merge '$sha1' in submodule path '$path'"

3556 +msgstr "无法合并 '$sha1' 到子模组路径 '$path' 中"

3557 +

3558 +#: git-submodule.sh:572

3559 +#, sh-format

3560 +msgid "Submodule path '$path': merged in '$sha1'"

3561 +msgstr "子模组路径 '$path'：已合并入 '$sha1'"

3562 +

3563 +#: git-submodule.sh:577

3564 +#, sh-format

3565 +msgid "Unable to checkout '$sha1' in submodule path '$path'"

3566 +msgstr "无法在子模组路径 '$path' 中检出 '$sha1'"

3567 +

3568 +#: git-submodule.sh:578

3569 +#, sh-format

3570 +msgid "Submodule path '$path': checked out '$sha1'"

3571 +msgstr "子模组路径 '$path'：检出 '$sha1'"

3572 +

3573 +#: git-submodule.sh:600 git-submodule.sh:923

3574 +#, sh-format

3575 +msgid "Failed to recurse into submodule path '$path'"

3576 +msgstr "无法递归进子模组路径 '$path'"

3577 +

3578 +#: git-submodule.sh:708

3579 +msgid "--"

3580 +msgstr "--"

3581 +

3582 +# 注意保持前导空格

3583 +#: git-submodule.sh:766

3584 +#, sh-format

3585 +msgid " Warn: $name doesn't contain commit $sha1_src"

3586 +msgstr " 警告：$name 未包含提交 $sha1_src"

3587 +

3588 +# 注意保持前导空格

3589 +#: git-submodule.sh:769

3590 +#, sh-format

3591 +msgid " Warn: $name doesn't contain commit $sha1_dst"

3592 +msgstr " 警告：$name 未包含提交 $sha1_dst"

3593 +

3594 +# 注意保持前导空格

3595 +#: git-submodule.sh:772

3596 +#, sh-format

3597 +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"

3598 +msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst"

3599 +

3600 +#: git-submodule.sh:797

3601 +msgid "blob"

3602 +msgstr "blob"

3603 +

3604 +#: git-submodule.sh:798

3605 +msgid "submodule"

3606 +msgstr "子模组"

3607 +

3608 +#: git-submodule.sh:969

3609 +#, sh-format

3610 +msgid "Synchronizing submodule url for '$name'"

3611 +msgstr "为 '$name' 同步子模组url"

l10n: po for zh_CN