a0b6b24660 · matheusbsbs/matheus-bagliano

@@ -135,8 +135,8 @@ msgid ""

135 msgstr ""

136 "Project-Id-Version: Git\n"

137 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

138 -"POT-Creation-Date: 2016-08-27 23:21+0800\n"

139 -"PO-Revision-Date: 2016-09-05 23:36+0800\n"

138 +"POT-Creation-Date: 2016-11-01 21:35+0800\n"

139 +"PO-Revision-Date: 2016-11-21 23:14+0800\n"

140 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"

141 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"

142 "Language: zh_CN\n"

@@ -216,7 +216,8 @@ msgid ""

216 msgstr ""

217 "注意：正在检出 '%s'。\n"

218 "\n"

219 -"您正处于分离头指针状态。您可以查看、做试验性的修改及提交，并且您可以通过另外\n"

219 +"您正处于分离头指针状态。您可以查看、做试验性的修改及提交，并且您可以通过另"

220 +"外\n"

221 "的检出分支操作丢弃在这个状态下所做的任何提交。\n"

222 "\n"

223 "如果您想要通过创建分支来保留在此状态下所做的提交，您可以通过在检出命令添加\n"

@@ -225,3874 +226,4355 @@ msgstr ""

226 " git checkout -b <new-branch-name>\n"

227 "\n"

228

228 -#: archive.c:12

229 -msgid "git archive [<options>] <tree-ish> [<path>...]"

230 -msgstr "git archive [<选项>] <树或提交> [<路径>...]"

231 -

232 -#: archive.c:13

233 -msgid "git archive --list"

234 -msgstr "git archive --list"

235 -

236 -#: archive.c:14

237 -msgid ""

238 -"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"

239 -msgstr ""

240 -"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"

241 -

242 -#: archive.c:15

243 -msgid "git archive --remote <repo> [--exec <cmd>] --list"

244 -msgstr "git archive --remote <仓库> [--exec <命令>] --list"

229 +#: apply.c:57

230 +#, c-format

231 +msgid "unrecognized whitespace option '%s'"

232 +msgstr "未能识别的空白字符选项 '%s'"

233

246 -#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327

234 +#: apply.c:73

235 #, c-format

248 -msgid "pathspec '%s' did not match any files"

249 -msgstr "路径规格 '%s' 未匹配任何文件"

236 +msgid "unrecognized whitespace ignore option '%s'"

237 +msgstr "未能识别的空白字符忽略选项 '%s'"

238

251 -#: archive.c:429

252 -msgid "fmt"

253 -msgstr "格式"

239 +#: apply.c:125

240 +msgid "--reject and --3way cannot be used together."

241 +msgstr "--reject 和 --3say 不能同时使用。"

242

255 -#: archive.c:429

256 -msgid "archive format"

257 -msgstr "归档格式"

243 +#: apply.c:127

244 +msgid "--cached and --3way cannot be used together."

245 +msgstr "--cached 和 --3way 不能同时使用。"

246

259 -#: archive.c:430 builtin/log.c:1422

260 -msgid "prefix"

261 -msgstr "前缀"

247 +#: apply.c:130

248 +msgid "--3way outside a repository"

249 +msgstr "--3way 在一个仓库之外"

250

263 -#: archive.c:431

264 -msgid "prepend prefix to each pathname in the archive"

265 -msgstr "为归档中每个路径名加上前缀"

251 +#: apply.c:141

252 +msgid "--index outside a repository"

253 +msgstr "--index 在一个仓库之外"

254

267 -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553

268 -#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987

269 -#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100

270 -#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399

271 -#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153

272 -msgid "file"

273 -msgstr "文件"

255 +#: apply.c:144

256 +msgid "--cached outside a repository"

257 +msgstr "--cached 在一个仓库之外"

258

275 -#: archive.c:433 builtin/archive.c:89

276 -msgid "write the archive to this file"

277 -msgstr "归档写入此文件"

259 +#: apply.c:845

260 +#, c-format

261 +msgid "Cannot prepare timestamp regexp %s"

262 +msgstr "无法准备时间戳正则表达式 %s"

263

279 -#: archive.c:435

280 -msgid "read .gitattributes in working directory"

281 -msgstr "读取工作区中的 .gitattributes"

264 +#: apply.c:854

265 +#, c-format

266 +msgid "regexec returned %d for input: %s"

267 +msgstr "regexec 返回 %d，输入为：%s"

268

283 -#: archive.c:436

284 -msgid "report archived files on stderr"

285 -msgstr "在标准错误上报告归档文件"

269 +#: apply.c:938

270 +#, c-format

271 +msgid "unable to find filename in patch at line %d"

272 +msgstr "不能在补丁的第 %d 行找到文件名"

273

287 -#: archive.c:437

288 -msgid "store only"

289 -msgstr "只存储"

274 +#: apply.c:977

275 +#, c-format

276 +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

277 +msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"

278

291 -#: archive.c:438

292 -msgid "compress faster"

293 -msgstr "压缩速度更快"

279 +#: apply.c:983

280 +#, c-format

281 +msgid "git apply: bad git-diff - inconsistent new filename on line %d"

282 +msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"

283

295 -#: archive.c:446

296 -msgid "compress better"

297 -msgstr "压缩效果更好"

284 +#: apply.c:984

285 +#, c-format

286 +msgid "git apply: bad git-diff - inconsistent old filename on line %d"

287 +msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"

288

299 -#: archive.c:449

300 -msgid "list supported archive formats"

301 -msgstr "列出支持的归档格式"

289 +#: apply.c:990

290 +#, c-format

291 +msgid "git apply: bad git-diff - expected /dev/null on line %d"

292 +msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"

293

303 -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82

304 -#: builtin/submodule--helper.c:832

305 -msgid "repo"

306 -msgstr "仓库"

294 +#: apply.c:1488

295 +#, c-format

296 +msgid "recount: unexpected line: %.*s"

297 +msgstr "recount：意外的行：%.*s"

298

308 -#: archive.c:452 builtin/archive.c:91

309 -msgid "retrieve the archive from remote repository <repo>"

310 -msgstr "从远程仓库（<仓库>）提取归档文件"

299 +#: apply.c:1557

300 +#, c-format

301 +msgid "patch fragment without header at line %d: %.*s"

302 +msgstr "第 %d 行的补丁片段没有头信息：%.*s"

303

312 -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483

313 -msgid "command"

314 -msgstr "命令"

304 +#: apply.c:1577

305 +#, c-format

306 +msgid ""

307 +"git diff header lacks filename information when removing %d leading pathname "

308 +"component (line %d)"

309 +msgid_plural ""

310 +"git diff header lacks filename information when removing %d leading pathname "

311 +"components (line %d)"

312 +msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"

313 +msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"

314

316 -#: archive.c:454 builtin/archive.c:93

317 -msgid "path to the remote git-upload-archive command"

318 -msgstr "远程 git-upload-archive 命令的路径"

315 +#: apply.c:1589

316 +#, c-format

317 +msgid "git diff header lacks filename information (line %d)"

318 +msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"

319

320 -#: archive.c:461

321 -msgid "Unexpected option --remote"

322 -msgstr "未知参数 --remote"

320 +#: apply.c:1759

321 +msgid "new file depends on old contents"

322 +msgstr "新文件依赖旧内容"

323

324 -#: archive.c:463

325 -msgid "Option --exec can only be used together with --remote"

326 -msgstr "选项 --exec 只能和 --remote 同时使用"

324 +#: apply.c:1761

325 +msgid "deleted file still has contents"

326 +msgstr "删除的文件仍有内容"

327

328 -#: archive.c:465

329 -msgid "Unexpected option --output"

330 -msgstr "未知参数 --output"

328 +#: apply.c:1795

329 +#, c-format

330 +msgid "corrupt patch at line %d"

331 +msgstr "补丁在第 %d 行损坏"

332

332 -#: archive.c:487

333 +#: apply.c:1832

334 #, c-format

334 -msgid "Unknown archive format '%s'"

335 -msgstr "未知归档格式 '%s'"

335 +msgid "new file %s depends on old contents"

336 +msgstr "新文件 %s 依赖旧内容"

337

337 -#: archive.c:494

338 +#: apply.c:1834

339 #, c-format

339 -msgid "Argument not supported for format '%s': -%d"

340 -msgstr "参数不支持此格式 '%s'：-%d"

340 +msgid "deleted file %s still has contents"

341 +msgstr "删除的文件 %s 仍有内容"

342

342 -#: attr.c:263

343 -msgid ""

344 -"Negative patterns are ignored in git attributes\n"

345 -"Use '\\!' for literal leading exclamation."

346 -msgstr ""

347 -"负值模版在 git attributes 中被忽略\n"

348 -"当字符串确实要以感叹号开始时，使用 '\\!'。"

343 +#: apply.c:1837

344 +#, c-format

345 +msgid "** warning: file %s becomes empty but is not deleted"

346 +msgstr "** 警告：文件 %s 成为空文件但并未删除"

347

350 -#: bisect.c:441

348 +#: apply.c:1984

349 #, c-format

352 -msgid "Could not open file '%s'"

353 -msgstr "不能打开文件 '%s'"

350 +msgid "corrupt binary patch at line %d: %.*s"

351 +msgstr "二进制补丁在第 %d 行损坏：%.*s"

352

355 -#: bisect.c:446

353 +#: apply.c:2021

354 #, c-format

357 -msgid "Badly quoted content in file '%s': %s"

358 -msgstr "文件 '%s' 包含错误的引用格式：%s"

355 +msgid "unrecognized binary patch at line %d"

356 +msgstr "未能识别的二进制补丁位于第 %d 行"

357

360 -#: bisect.c:655

358 +#: apply.c:2182

359 #, c-format

362 -msgid "We cannot bisect more!\n"

363 -msgstr "我们无法进行更多的二分查找！\n"

360 +msgid "patch with only garbage at line %d"

361 +msgstr "补丁文件的第 %d 行只有垃圾数据"

362

365 -#: bisect.c:708

363 +#: apply.c:2274

364 #, c-format

367 -msgid "Not a valid commit name %s"

368 -msgstr "不是一个有效的提交名 %s"

365 +msgid "unable to read symlink %s"

366 +msgstr "无法读取符号链接 %s"

367

370 -#: bisect.c:732

368 +#: apply.c:2278

369 #, c-format

372 -msgid ""

373 -"The merge base %s is bad.\n"

374 -"This means the bug has been fixed between %s and [%s].\n"

375 -msgstr ""

376 -"合并基线 %s 是坏的。\n"

377 -"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"

370 +msgid "unable to open or read %s"

371 +msgstr "不能打开或读取 %s"

372

379 -#: bisect.c:737

373 +#: apply.c:2931

374 #, c-format

381 -msgid ""

382 -"The merge base %s is new.\n"

383 -"The property has changed between %s and [%s].\n"

384 -msgstr ""

385 -"合并基线 %s 是新的。\n"

386 -"介于 %s 和 [%s] 之间的属性已经被修改。\n"

375 +msgid "invalid start of line: '%c'"

376 +msgstr "无效的行首字符：'%c'"

377

388 -#: bisect.c:742

378 +#: apply.c:3050

379 #, c-format

390 -msgid ""

391 -"The merge base %s is %s.\n"

392 -"This means the first '%s' commit is between %s and [%s].\n"

393 -msgstr ""

394 -"合并基线 %s 是 %s。\n"

395 -"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"

380 +msgid "Hunk #%d succeeded at %d (offset %d line)."

381 +msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."

382 +msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"

383 +msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"

384

397 -#: bisect.c:750

385 +#: apply.c:3062

386 #, c-format

399 -msgid ""

400 -"Some %s revs are not ancestor of the %s rev.\n"

401 -"git bisect cannot work properly in this case.\n"

402 -"Maybe you mistook %s and %s revs?\n"

403 -msgstr ""

404 -"一些 %s 版本不是 %s 版本的祖先。\n"

405 -"这种情况下 git 二分查找无法正常工作。\n"

406 -"您可能弄错了 %s 和 %s 版本？\n"

387 +msgid "Context reduced to (%ld/%ld) to apply fragment at %d"

388 +msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"

389

408 -#: bisect.c:763

390 +#: apply.c:3068

391 #, c-format

392 msgid ""

411 -"the merge base between %s and [%s] must be skipped.\n"

412 -"So we cannot be sure the first %s commit is between %s and %s.\n"

413 -"We continue anyway."

393 +"while searching for:\n"

394 +"%.*s"

395 msgstr ""

415 -"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"

416 -"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"

417 -"我们仍旧继续。"

396 +"当查询：\n"

397 +"%.*s"

398

419 -#: bisect.c:798

399 +#: apply.c:3090

400 #, c-format

421 -msgid "Bisecting: a merge base must be tested\n"

422 -msgstr "二分查找中：合并基线必须是经过测试的\n"

401 +msgid "missing binary patch data for '%s'"

402 +msgstr "缺失 '%s' 的二进制补丁数据"

403

424 -#: bisect.c:849

404 +#: apply.c:3098

405 #, c-format

426 -msgid "a %s revision is needed"

427 -msgstr "需要一个 %s 版本"

406 +msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

407 +msgstr "不能反向应用一个没有至 '%s' 的反向数据块的二进制补丁"

408

429 -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248

409 +#: apply.c:3144

410 #, c-format

431 -msgid "could not create file '%s'"

432 -msgstr "不能创建文件 '%s'"

411 +msgid "cannot apply binary patch to '%s' without full index line"

412 +msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"

413

434 -#: bisect.c:917

414 +#: apply.c:3154

415 #, c-format

436 -msgid "could not read file '%s'"

437 -msgstr "不能读取文件 '%s'"

416 +msgid ""

417 +"the patch applies to '%s' (%s), which does not match the current contents."

418 +msgstr "补丁引用到 '%s' (%s)，但是和当前内容不匹配。"

419

439 -#: bisect.c:947

440 -msgid "reading bisect refs failed"

441 -msgstr "读取二分查找引用失败"

420 +#: apply.c:3162

421 +#, c-format

422 +msgid "the patch applies to an empty '%s' but it is not empty"

423 +msgstr "补丁应用到空文件 '%s'，但是它并不空"

424

443 -#: bisect.c:967

425 +#: apply.c:3180

426 #, c-format

445 -msgid "%s was both %s and %s\n"

446 -msgstr "%s 同时为 %s 和 %s\n"

427 +msgid "the necessary postimage %s for '%s' cannot be read"

428 +msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"

429

448 -#: bisect.c:975

430 +#: apply.c:3193

431 #, c-format

450 -msgid ""

451 -"No testable commit found.\n"

452 -"Maybe you started with bad path parameters?\n"

453 -msgstr ""

454 -"没有发现可测试的提交。\n"

455 -"可能您在运行时使用了错误的路径参数？\n"

432 +msgid "binary patch does not apply to '%s'"

433 +msgstr "二进制补丁未应用到 '%s'"

434

457 -#: bisect.c:994

435 +#: apply.c:3199

436 #, c-format

459 -msgid "(roughly %d step)"

460 -msgid_plural "(roughly %d steps)"

461 -msgstr[0] "（大概 %d 步）"

462 -msgstr[1] "（大概 %d 步）"

437 +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"

438 +msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"

439

464 -#. TRANSLATORS: the last %s will be replaced with

465 -#. "(roughly %d steps)" translation

466 -#: bisect.c:998

467 -#, c-format

468 -msgid "Bisecting: %d revision left to test after this %s\n"

469 -msgid_plural "Bisecting: %d revisions left to test after this %s\n"

470 -msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

471 -msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

472 -

473 -#: branch.c:53

440 +#: apply.c:3220

441 #, c-format

475 -msgid ""

476 -"\n"

477 -"After fixing the error cause you may try to fix up\n"

478 -"the remote tracking information by invoking\n"

479 -"\"git branch --set-upstream-to=%s%s%s\"."

480 -msgstr ""

481 -"\n"

482 -"在修复错误后，您可以尝试修改远程跟踪分支，通过执行命令\n"

483 -"\"git branch --set-upstream-to=%s%s%s\" 。"

442 +msgid "patch failed: %s:%ld"

443 +msgstr "打补丁失败：%s:%ld"

444

485 -#: branch.c:67

445 +#: apply.c:3342

446 #, c-format

487 -msgid "Not setting branch %s as its own upstream."

488 -msgstr "未设置分支 %s 作为它自己的上游。"

447 +msgid "cannot checkout %s"

448 +msgstr "不能检出 %s"

449

490 -#: branch.c:93

450 +#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248

451 #, c-format

492 -msgid "Branch %s set up to track remote branch %s from %s by rebasing."

493 -msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"

452 +msgid "failed to read %s"

453 +msgstr "无法读取 %s"

454

495 -#: branch.c:94

455 +#: apply.c:3398

456 #, c-format

497 -msgid "Branch %s set up to track remote branch %s from %s."

498 -msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"

457 +msgid "reading from '%s' beyond a symbolic link"

458 +msgstr "读取位于符号链接中的 '%s'"

459

500 -#: branch.c:98

460 +#: apply.c:3427 apply.c:3667

461 #, c-format

502 -msgid "Branch %s set up to track local branch %s by rebasing."

503 -msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"

462 +msgid "path %s has been renamed/deleted"

463 +msgstr "路径 %s 已经被重命名/删除"

464

505 -#: branch.c:99

465 +#: apply.c:3510 apply.c:3681

466 #, c-format

507 -msgid "Branch %s set up to track local branch %s."

508 -msgstr "分支 %s 设置为跟踪本地分支 %s。"

467 +msgid "%s: does not exist in index"

468 +msgstr "%s：不存在于索引中"

469

510 -#: branch.c:104

470 +#: apply.c:3519 apply.c:3689

471 #, c-format

512 -msgid "Branch %s set up to track remote ref %s by rebasing."

513 -msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"

472 +msgid "%s: does not match index"

473 +msgstr "%s：和索引不匹配"

474

515 -#: branch.c:105

516 -#, c-format

517 -msgid "Branch %s set up to track remote ref %s."

518 -msgstr "分支 %s 设置为跟踪远程引用 %s。"

475 +#: apply.c:3554

476 +msgid "repository lacks the necessary blob to fall back on 3-way merge."

477 +msgstr "仓库缺乏必要的数据对象以进行三方合并。"

478

520 -#: branch.c:109

479 +#: apply.c:3557

480 #, c-format

522 -msgid "Branch %s set up to track local ref %s by rebasing."

523 -msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"

481 +msgid "Falling back to three-way merge...\n"

482 +msgstr "回落到三方合并...\n"

483

525 -#: branch.c:110

484 +#: apply.c:3573 apply.c:3577

485 #, c-format

527 -msgid "Branch %s set up to track local ref %s."

528 -msgstr "分支 %s 设置为跟踪本地引用 %s。"

529 -

530 -#: branch.c:119

531 -msgid "Unable to write upstream branch configuration"

532 -msgstr "无法写入上游分支配置"

486 +msgid "cannot read the current contents of '%s'"

487 +msgstr "无法读取 '%s' 的当前内容"

488

534 -#: branch.c:156

489 +#: apply.c:3589

490 #, c-format

536 -msgid "Not tracking: ambiguous information for ref %s"

537 -msgstr "未跟踪：引用 %s 有歧义"

491 +msgid "Failed to fall back on three-way merge...\n"

492 +msgstr "无法回落到三方合并...\n"

493

539 -#: branch.c:185

494 +#: apply.c:3603

495 #, c-format

541 -msgid "'%s' is not a valid branch name."

542 -msgstr "'%s' 不是一个有效的分支名称。"

496 +msgid "Applied patch to '%s' with conflicts.\n"

497 +msgstr "应用补丁到 '%s' 存在冲突。\n"

498

544 -#: branch.c:190

499 +#: apply.c:3608

500 #, c-format

546 -msgid "A branch named '%s' already exists."

547 -msgstr "一个分支名 '%s' 已经存在。"

501 +msgid "Applied patch to '%s' cleanly.\n"

502 +msgstr "成功应用补丁到 '%s'。\n"

503

549 -#: branch.c:198

550 -msgid "Cannot force update the current branch."

551 -msgstr "无法强制更新当前分支。"

504 +#: apply.c:3634

505 +msgid "removal patch leaves file contents"

506 +msgstr "移除补丁仍留下了文件内容"

507

553 -#: branch.c:218

508 +#: apply.c:3706

509 #, c-format

555 -msgid "Cannot setup tracking information; starting point '%s' is not a branch."

556 -msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"

510 +msgid "%s: wrong type"

511 +msgstr "%s：错误类型"

512

558 -#: branch.c:220

513 +#: apply.c:3708

514 #, c-format

560 -msgid "the requested upstream branch '%s' does not exist"

561 -msgstr "请求的上游分支 '%s' 不存在"

562 -

563 -#: branch.c:222

564 -msgid ""

565 -"\n"

566 -"If you are planning on basing your work on an upstream\n"

567 -"branch that already exists at the remote, you may need to\n"

568 -"run \"git fetch\" to retrieve it.\n"

569 -"\n"

570 -"If you are planning to push out a new local branch that\n"

571 -"will track its remote counterpart, you may want to use\n"

572 -"\"git push -u\" to set the upstream config as you push."

573 -msgstr ""

574 -"\n"

575 -"如果您正计划基于远程一个现存的上游分支开始你的工作，\n"

576 -"您可能需要执行 \"git fetch\" 来获取分支。\n"

577 -"\n"

578 -"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"

579 -"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"

515 +msgid "%s has type %o, expected %o"

516 +msgstr "%s 的类型是 %o，应为 %o"

517

581 -#: branch.c:266

518 +#: apply.c:3859 apply.c:3861

519 #, c-format

583 -msgid "Not a valid object name: '%s'."

584 -msgstr "不是一个有效的对象名：'%s'。"

520 +msgid "invalid path '%s'"

521 +msgstr "无效路径 '%s'"

522

586 -#: branch.c:286

523 +#: apply.c:3917

524 #, c-format

588 -msgid "Ambiguous object name: '%s'."

589 -msgstr "歧义的对象名：'%s'。"

525 +msgid "%s: already exists in index"

526 +msgstr "%s：已经存在于索引中"

527

591 -#: branch.c:291

528 +#: apply.c:3920

529 #, c-format

593 -msgid "Not a valid branch point: '%s'."

594 -msgstr "无效的分支点：'%s'。"

530 +msgid "%s: already exists in working directory"

531 +msgstr "%s：已经存在于工作区中"

532

596 -#: branch.c:345

533 +#: apply.c:3940

534 #, c-format

598 -msgid "'%s' is already checked out at '%s'"

599 -msgstr "'%s' 已经检出到 '%s'"

535 +msgid "new mode (%o) of %s does not match old mode (%o)"

536 +msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"

537

601 -#: branch.c:364

538 +#: apply.c:3945

539 #, c-format

603 -msgid "HEAD of working tree %s is not updated"

604 -msgstr "工作区 %s 的 HEAD 指向没有被更新"

540 +msgid "new mode (%o) of %s does not match old mode (%o) of %s"

541 +msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"

542

606 -#: bundle.c:34

543 +#: apply.c:3965

544 #, c-format

608 -msgid "'%s' does not look like a v2 bundle file"

609 -msgstr "'%s' 不像是一个 v2 版本的包文件"

545 +msgid "affected file '%s' is beyond a symbolic link"

546 +msgstr "受影响的文件 '%s' 位于符号链接中"

547

611 -#: bundle.c:61

548 +#: apply.c:3969

549 #, c-format

613 -msgid "unrecognized header: %s%s (%d)"

614 -msgstr "未能识别的包头：%s%s (%d)"

550 +msgid "%s: patch does not apply"

551 +msgstr "%s：补丁未应用"

552

616 -#: bundle.c:87 builtin/commit.c:778

553 +#: apply.c:3984

554 #, c-format

618 -msgid "could not open '%s'"

619 -msgstr "不能打开 '%s'"

620 -

621 -#: bundle.c:139

622 -msgid "Repository lacks these prerequisite commits:"

623 -msgstr "仓库中缺少这些必备的提交："

555 +msgid "Checking patch %s..."

556 +msgstr "检查补丁 %s..."

557

625 -#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085

626 -#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348

627 -#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901

628 -#: builtin/merge.c:356 builtin/shortlog.c:170

629 -msgid "revision walk setup failed"

630 -msgstr "版本遍历设置失败"

558 +#: apply.c:4075

559 +#, c-format

560 +msgid "sha1 information is lacking or useless for submodule %s"

561 +msgstr "子模组 %s 的 sha1 信息缺失或无效"

562

632 -#: bundle.c:185

563 +#: apply.c:4082

564 #, c-format

634 -msgid "The bundle contains this ref:"

635 -msgid_plural "The bundle contains these %d refs:"

636 -msgstr[0] "这个包中含有这个引用："

637 -msgstr[1] "这个包中含有 %d 个引用："

565 +msgid "mode change for %s, which is not in current HEAD"

566 +msgstr "%s 的属性改变，但它不再当前 HEAD 中"

567

639 -#: bundle.c:192

640 -msgid "The bundle records a complete history."

641 -msgstr "这个包记录一个完整历史。"

568 +#: apply.c:4085

569 +#, c-format

570 +msgid "sha1 information is lacking or useless (%s)."

571 +msgstr "sha1 信息缺失或无效（%s）。"

572

643 -#: bundle.c:194

573 +#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135

574 #, c-format

645 -msgid "The bundle requires this ref:"

646 -msgid_plural "The bundle requires these %d refs:"

647 -msgstr[0] "这个包需要这个引用："

648 -msgstr[1] "这个包需要 %d 个引用："

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

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

577

650 -#: bundle.c:253

651 -msgid "Could not spawn pack-objects"

652 -msgstr "不能生成 pack-objects 进程"

578 +#: apply.c:4094

579 +#, c-format

580 +msgid "could not add %s to temporary index"

581 +msgstr "不能在临时索引中添加 %s"

582

654 -#: bundle.c:264

655 -msgid "pack-objects died"

656 -msgstr "pack-objects 终止"

583 +#: apply.c:4104

584 +#, c-format

585 +msgid "could not write temporary index to %s"

586 +msgstr "不能把临时索引写入到 %s"

587

658 -#: bundle.c:304

659 -msgid "rev-list died"

660 -msgstr "rev-list 终止"

588 +#: apply.c:4242

589 +#, c-format

590 +msgid "unable to remove %s from index"

591 +msgstr "不能从索引中移除 %s"

592

662 -#: bundle.c:353

593 +#: apply.c:4277

594 #, c-format

664 -msgid "ref '%s' is excluded by the rev-list options"

665 -msgstr "引用 '%s' 被 rev-list 选项排除"

595 +msgid "corrupt patch for submodule %s"

596 +msgstr "子模组 %s 损坏的补丁"

597

667 -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273

598 +#: apply.c:4283

599 #, c-format

669 -msgid "unrecognized argument: %s"

670 -msgstr "未能识别的参数：%s"

600 +msgid "unable to stat newly created file '%s'"

601 +msgstr "不能枚举新建文件 '%s' 的状态"

602

672 -#: bundle.c:451

673 -msgid "Refusing to create empty bundle."

674 -msgstr "不能创建空包。"

603 +#: apply.c:4291

604 +#, c-format

605 +msgid "unable to create backing store for newly created file %s"

606 +msgstr "不能为新建文件 %s 创建后端存储"

607

676 -#: bundle.c:463

608 +#: apply.c:4297 apply.c:4441

609 #, c-format

678 -msgid "cannot create '%s'"

679 -msgstr "不能创建 '%s'"

610 +msgid "unable to add cache entry for %s"

611 +msgstr "无法为 %s 添加缓存条目"

612

681 -#: bundle.c:491

682 -msgid "index-pack died"

683 -msgstr "index-pack 终止"

613 +#: apply.c:4338

614 +#, c-format

615 +msgid "failed to write to '%s'"

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

617

685 -#: color.c:290

618 +#: apply.c:4342

619 #, c-format

687 -msgid "invalid color value: %.*s"

688 -msgstr "无效的颜色值：%.*s"

620 +msgid "closing file '%s'"

621 +msgstr "关闭文件 '%s'"

622

690 -#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505

691 -#: builtin/am.c:2119

623 +#: apply.c:4412

624 #, c-format

693 -msgid "could not parse %s"

694 -msgstr "不能解析 %s"

625 +msgid "unable to write file '%s' mode %o"

626 +msgstr "不能写文件 '%s' 权限 %o"

627

696 -#: commit.c:42

628 +#: apply.c:4510

629 #, c-format

698 -msgid "%s %s is not a commit!"

699 -msgstr "%s %s 不是一个提交!"

630 +msgid "Applied patch %s cleanly."

631 +msgstr "成功应用补丁 %s。"

632

701 -#: compat/obstack.c:406 compat/obstack.c:408

702 -msgid "memory exhausted"

703 -msgstr "内存耗尽"

633 +#: apply.c:4518

634 +msgid "internal error"

635 +msgstr "内部错误"

636

705 -#: config.c:516

637 +#: apply.c:4521

638 #, c-format

707 -msgid "bad config line %d in blob %s"

708 -msgstr "数据对象 %2$s 中错误的配置行 %1$d"

639 +msgid "Applying patch %%s with %d reject..."

640 +msgid_plural "Applying patch %%s with %d rejects..."

641 +msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."

642 +msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."

643

710 -#: config.c:520

644 +#: apply.c:4532

645 #, c-format

712 -msgid "bad config line %d in file %s"

713 -msgstr "文件 %2$s 中错误的配置行 %1$d"

646 +msgid "truncating .rej filename to %.*s.rej"

647 +msgstr "截短 .rej 文件名为 %.*s.rej"

648

715 -#: config.c:524

649 +#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989

650 #, c-format

717 -msgid "bad config line %d in standard input"

718 -msgstr "标准输入中错误的配置行 %d"

651 +msgid "cannot open %s"

652 +msgstr "不能打开 %s"

653

720 -#: config.c:528

654 +#: apply.c:4554

655 #, c-format

722 -msgid "bad config line %d in submodule-blob %s"

723 -msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"

656 +msgid "Hunk #%d applied cleanly."

657 +msgstr "第 #%d 个片段成功应用。"

658

725 -#: config.c:532

659 +#: apply.c:4558

660 #, c-format

727 -msgid "bad config line %d in command line %s"

728 -msgstr "命令行 %2$s 中错误的配置行 %1$d"

661 +msgid "Rejected hunk #%d."

662 +msgstr "拒绝第 #%d 个片段。"

663

730 -#: config.c:536

664 +#: apply.c:4668

665 #, c-format

732 -msgid "bad config line %d in %s"

733 -msgstr "在 %2$s 中错误的配置行 %1$d"

666 +msgid "Skipped patch '%s'."

667 +msgstr "略过补丁 '%s'。"

668

735 -#: config.c:655

736 -msgid "out of range"

737 -msgstr "超出范围"

669 +#: apply.c:4676

670 +msgid "unrecognized input"

671 +msgstr "未能识别的输入"

672

739 -#: config.c:655

740 -msgid "invalid unit"

741 -msgstr "无效的单位"

673 +#: apply.c:4695

674 +msgid "unable to read index file"

675 +msgstr "无法读取索引文件"

676

743 -#: config.c:661

677 +#: apply.c:4833

678 #, c-format

745 -msgid "bad numeric config value '%s' for '%s': %s"

746 -msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"

679 +msgid "can't open patch '%s': %s"

680 +msgstr "不能打开补丁 '%s'：%s"

681

748 -#: config.c:666

682 +#: apply.c:4858

683 #, c-format

750 -msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

751 -msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

684 +msgid "squelched %d whitespace error"

685 +msgid_plural "squelched %d whitespace errors"

686 +msgstr[0] "抑制下仍有 %d 个空白字符误用"

687 +msgstr[1] "抑制下仍有 %d 个空白字符误用"

688

753 -#: config.c:669

689 +#: apply.c:4864 apply.c:4879

690 #, c-format

755 -msgid "bad numeric config value '%s' for '%s' in file %s: %s"

756 -msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

691 +msgid "%d line adds whitespace errors."

692 +msgid_plural "%d lines add whitespace errors."

693 +msgstr[0] "%d 行有空白字符误用。"

694 +msgstr[1] "%d 行有空白字符误用。"

695

758 -#: config.c:672

696 +#: apply.c:4872

697 #, c-format

760 -msgid "bad numeric config value '%s' for '%s' in standard input: %s"

761 -msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"

698 +msgid "%d line applied after fixing whitespace errors."

699 +msgid_plural "%d lines applied after fixing whitespace errors."

700 +msgstr[0] "修复空白错误后，应用了 %d 行。"

701 +msgstr[1] "修复空白错误后，应用了 %d 行。"

702

763 -#: config.c:675

764 -#, c-format

765 -msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

766 -msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

703 +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431

704 +msgid "Unable to write new index file"

705 +msgstr "无法写入新索引文件"

706

768 -#: config.c:678

769 -#, c-format

770 -msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

771 -msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

707 +#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280

708 +#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180

709 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407

710 +#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592

711 +#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947

712 +msgid "path"

713 +msgstr "路径"

714

773 -#: config.c:681

774 -#, c-format

775 -msgid "bad numeric config value '%s' for '%s' in %s: %s"

776 -msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

715 +#: apply.c:4920

716 +msgid "don't apply changes matching the given path"

717 +msgstr "不要应用与给出路径向匹配的变更"

718

778 -#: config.c:768

779 -#, c-format

780 -msgid "failed to expand user dir in: '%s'"

781 -msgstr "无法扩展 '%s' 中的用户目录"

719 +#: apply.c:4923

720 +msgid "apply changes matching the given path"

721 +msgstr "应用与给出路径向匹配的变更"

722

783 -#: config.c:849 config.c:860

784 -#, c-format

785 -msgid "bad zlib compression level %d"

786 -msgstr "错误的 zlib 压缩级别 %d"

723 +#: apply.c:4925 builtin/am.c:2286

724 +msgid "num"

725 +msgstr "数字"

726

788 -#: config.c:978

789 -#, c-format

790 -msgid "invalid mode for object creation: %s"

791 -msgstr "无效的对象创建模式：%s"

727 +#: apply.c:4926

728 +msgid "remove <num> leading slashes from traditional diff paths"

729 +msgstr "从传统的 diff 路径中移除指定数量的前导斜线"

730

793 -#: config.c:1312

794 -msgid "unable to parse command-line config"

795 -msgstr "无法解析命令行中的配置"

731 +#: apply.c:4929

732 +msgid "ignore additions made by the patch"

733 +msgstr "忽略补丁中的添加的文件"

734

797 -#: config.c:1362

798 -msgid "unknown error occurred while reading the configuration files"

799 -msgstr "在读取配置文件时遇到未知错误"

735 +#: apply.c:4931

736 +msgid "instead of applying the patch, output diffstat for the input"

737 +msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"

738

801 -#: config.c:1716

802 -#, c-format

803 -msgid "unable to parse '%s' from command-line config"

804 -msgstr "无法解析命令行配置中的 '%s'"

739 +#: apply.c:4935

740 +msgid "show number of added and deleted lines in decimal notation"

741 +msgstr "以十进制数显示添加和删除的行数"

742

806 -#: config.c:1718

807 -#, c-format

808 -msgid "bad config variable '%s' in file '%s' at line %d"

809 -msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"

743 +#: apply.c:4937

744 +msgid "instead of applying the patch, output a summary for the input"

745 +msgstr "不应用补丁，而是显示输入的概要"

746

811 -#: config.c:1777

812 -#, c-format

813 -msgid "%s has multiple values"

814 -msgstr "%s 有多个取值"

747 +#: apply.c:4939

748 +msgid "instead of applying the patch, see if the patch is applicable"

749 +msgstr "不应用补丁，而是查看补丁是否可应用"

750

816 -#: config.c:2311

817 -#, c-format

818 -msgid "could not set '%s' to '%s'"

819 -msgstr "不能设置 '%s' 为 '%s'"

751 +#: apply.c:4941

752 +msgid "make sure the patch is applicable to the current index"

753 +msgstr "确认补丁可以应用到当前索引"

754

821 -#: config.c:2313

822 -#, c-format

823 -msgid "could not unset '%s'"

824 -msgstr "不能取消设置 '%s'"

755 +#: apply.c:4943

756 +msgid "apply a patch without touching the working tree"

757 +msgstr "应用补丁而不修改工作区"

758

826 -#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140

827 -msgid "Checking connectivity"

828 -msgstr "检查连接中"

759 +#: apply.c:4945

760 +msgid "accept a patch that touches outside the working area"

761 +msgstr "接受修改工作区之外文件的补丁"

762

830 -#: connected.c:74

831 -msgid "Could not run 'git rev-list'"

832 -msgstr "不能执行 'git rev-list'"

763 +#: apply.c:4947

764 +msgid "also apply the patch (use with --stat/--summary/--check)"

765 +msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"

766

834 -#: connected.c:94

835 -msgid "failed write to rev-list"

836 -msgstr "无法写入 rev-list"

767 +#: apply.c:4949

768 +msgid "attempt three-way merge if a patch does not apply"

769 +msgstr "如果一个补丁不能应用则尝试三方合并"

770

838 -#: connected.c:101

839 -msgid "failed to close rev-list's stdin"

840 -msgstr "无法关闭 rev-list 的标准输入"

771 +#: apply.c:4951

772 +msgid "build a temporary index based on embedded index information"

773 +msgstr "创建一个临时索引基于嵌入的索引信息"

774

842 -#: date.c:97

843 -msgid "in the future"

844 -msgstr "在将来"

775 +#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505

776 +msgid "paths are separated with NUL character"

777 +msgstr "路径以 NUL 字符分隔"

778

846 -#: date.c:103

847 -#, c-format

848 -msgid "%lu second ago"

849 -msgid_plural "%lu seconds ago"

850 -msgstr[0] "%lu 秒钟前"

851 -msgstr[1] "%lu 秒钟前"

779 +#: apply.c:4956

780 +msgid "ensure at least <n> lines of context match"

781 +msgstr "确保至少匹配 <n> 行上下文"

782

853 -#: date.c:110

854 -#, c-format

855 -msgid "%lu minute ago"

856 -msgid_plural "%lu minutes ago"

857 -msgstr[0] "%lu 分钟前"

858 -msgstr[1] "%lu 分钟前"

783 +#: apply.c:4957 builtin/am.c:2265

784 +msgid "action"

785 +msgstr "动作"

786

860 -#: date.c:117

861 -#, c-format

862 -msgid "%lu hour ago"

863 -msgid_plural "%lu hours ago"

864 -msgstr[0] "%lu 小时前"

865 -msgstr[1] "%lu 小时前"

787 +#: apply.c:4958

788 +msgid "detect new or modified lines that have whitespace errors"

789 +msgstr "检查新增和修改的行中间的空白字符滥用"

790

867 -#: date.c:124

868 -#, c-format

869 -msgid "%lu day ago"

870 -msgid_plural "%lu days ago"

871 -msgstr[0] "%lu 天前"

872 -msgstr[1] "%lu 天前"

791 +#: apply.c:4961 apply.c:4964

792 +msgid "ignore changes in whitespace when finding context"

793 +msgstr "查找上下文时忽略空白字符的变更"

794

874 -#: date.c:130

875 -#, c-format

876 -msgid "%lu week ago"

877 -msgid_plural "%lu weeks ago"

878 -msgstr[0] "%lu 周前"

879 -msgstr[1] "%lu 周前"

795 +#: apply.c:4967

796 +msgid "apply the patch in reverse"

797 +msgstr "反向应用补丁"

798

881 -#: date.c:137

882 -#, c-format

883 -msgid "%lu month ago"

884 -msgid_plural "%lu months ago"

885 -msgstr[0] "%lu 个月前"

886 -msgstr[1] "%lu 个月前"

799 +#: apply.c:4969

800 +msgid "don't expect at least one line of context"

801 +msgstr "无需至少一行上下文"

802

888 -#: date.c:148

889 -#, c-format

890 -msgid "%lu year"

891 -msgid_plural "%lu years"

892 -msgstr[0] "%lu 年"

893 -msgstr[1] "%lu 年"

803 +#: apply.c:4971

804 +msgid "leave the rejected hunks in corresponding *.rej files"

805 +msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"

806

895 -#. TRANSLATORS: "%s" is "<n> years"

896 -#: date.c:151

897 -#, c-format

898 -msgid "%s, %lu month ago"

899 -msgid_plural "%s, %lu months ago"

900 -msgstr[0] "%s %lu 个月前"

901 -msgstr[1] "%s %lu 个月前"

807 +#: apply.c:4973

808 +msgid "allow overlapping hunks"

809 +msgstr "允许重叠的补丁片段"

810

903 -#: date.c:156 date.c:161

904 -#, c-format

905 -msgid "%lu year ago"

906 -msgid_plural "%lu years ago"

907 -msgstr[0] "%lu 年前"

908 -msgstr[1] "%lu 年前"

811 +#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19

812 +#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593

813 +#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114

814 +msgid "be verbose"

815 +msgstr "冗长输出"

816

910 -#: diffcore-order.c:24

911 -#, c-format

912 -msgid "failed to read orderfile '%s'"

913 -msgstr "无法读取排序文件 '%s'"

817 +#: apply.c:4976

818 +msgid "tolerate incorrectly detected missing new-line at the end of file"

819 +msgstr "允许不正确的文件末尾换行符"

820

915 -#: diffcore-rename.c:540

916 -msgid "Performing inexact rename detection"

917 -msgstr "正在进行非精确的重命名检测"

821 +#: apply.c:4979

822 +msgid "do not trust the line counts in the hunk headers"

823 +msgstr "不信任补丁片段的头信息中的行号"

824

919 -# 译者：注意保持前导空格

920 -#: diff.c:116

921 -#, c-format

922 -msgid " Failed to parse dirstat cut-off percentage '%s'\n"

923 -msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"

825 +#: apply.c:4981 builtin/am.c:2274

826 +msgid "root"

827 +msgstr "根目录"

828

925 -# 译者：注意保持前导空格

926 -#: diff.c:121

927 -#, c-format

928 -msgid " Unknown dirstat parameter '%s'\n"

929 -msgstr " 未知的 dirstat 参数 '%s'\n"

829 +#: apply.c:4982

830 +msgid "prepend <root> to all filenames"

831 +msgstr "为所有文件名前添加 <根目录>"

832

931 -#: diff.c:225

932 -#, c-format

933 -msgid "Unknown value for 'diff.submodule' config variable: '%s'"

934 -msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"

833 +#: archive.c:12

834 +msgid "git archive [<options>] <tree-ish> [<path>...]"

835 +msgstr "git archive [<选项>] <树或提交> [<路径>...]"

836

936 -#: diff.c:277

937 -#, c-format

837 +#: archive.c:13

838 +msgid "git archive --list"

839 +msgstr "git archive --list"

840 +

841 +#: archive.c:14

842 msgid ""

939 -"Found errors in 'diff.dirstat' config variable:\n"

940 -"%s"

843 +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"

844 msgstr ""

942 -"发现配置变量 'diff.dirstat' 中的错误：\n"

943 -"%s"

944 -

945 -#: diff.c:3017

946 -#, c-format

947 -msgid "external diff died, stopping at %s"

948 -msgstr "外部 diff 退出，停止在 %s"

845 +"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"

846

950 -#: diff.c:3415

951 -msgid "--follow requires exactly one pathspec"

952 -msgstr "--follow 明确要求只跟一个路径规格"

847 +#: archive.c:15

848 +msgid "git archive --remote <repo> [--exec <cmd>] --list"

849 +msgstr "git archive --remote <仓库> [--exec <命令>] --list"

850

954 -#: diff.c:3578

851 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327

852 #, c-format

956 -msgid ""

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

958 -"%s"

959 -msgstr ""

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

961 -"%s"

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

854 +msgstr "路径规格 '%s' 未匹配任何文件"

855

963 -#: diff.c:3592

964 -#, c-format

965 -msgid "Failed to parse --submodule option parameter: '%s'"

966 -msgstr "无法解析 --submodule 选项的参数：'%s'"

856 +#: archive.c:429

857 +msgid "fmt"

858 +msgstr "格式"

859

968 -#: dir.c:1823

969 -msgid "failed to get kernel name and information"

970 -msgstr "无法获得内核名称和信息"

860 +#: archive.c:429

861 +msgid "archive format"

862 +msgstr "归档格式"

863

972 -#: dir.c:1942

973 -msgid "Untracked cache is disabled on this system or location."

974 -msgstr "缓存未跟踪文件在本系统或位置中被禁用。"

864 +#: archive.c:430 builtin/log.c:1429

865 +msgid "prefix"

866 +msgstr "前缀"

867

976 -#: gpg-interface.c:178

977 -msgid "gpg failed to sign the data"

978 -msgstr "gpg 无法为数据签名"

868 +#: archive.c:431

869 +msgid "prepend prefix to each pathname in the archive"

870 +msgstr "为归档中每个路径名加上前缀"

871

980 -#: gpg-interface.c:208

981 -msgid "could not create temporary file"

982 -msgstr "不能创建临时文件"

872 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603

873 +#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987

874 +#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101

875 +#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401

876 +#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153

877 +msgid "file"

878 +msgstr "文件"

879

984 -#: gpg-interface.c:210

985 -#, c-format

986 -msgid "failed writing detached signature to '%s'"

987 -msgstr "无法将分离式签名写入 '%s'"

880 +#: archive.c:433 builtin/archive.c:89

881 +msgid "write the archive to this file"

882 +msgstr "归档写入此文件"

883

989 -#: grep.c:1792

990 -#, c-format

991 -msgid "'%s': unable to read %s"

992 -msgstr "'%s'：无法读取 %s"

884 +#: archive.c:435

885 +msgid "read .gitattributes in working directory"

886 +msgstr "读取工作区中的 .gitattributes"

887

994 -#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155

995 -#, c-format

996 -msgid "failed to stat '%s'"

997 -msgstr "无法枚举 '%s' 状态"

888 +#: archive.c:436

889 +msgid "report archived files on stderr"

890 +msgstr "在标准错误上报告归档文件"

891

999 -#: grep.c:1820

1000 -#, c-format

1001 -msgid "'%s': short read"

1002 -msgstr "'%s'：读取不完整"

892 +#: archive.c:437

893 +msgid "store only"

894 +msgstr "只存储"

895

1004 -#: help.c:205

1005 -#, c-format

1006 -msgid "available git commands in '%s'"

1007 -msgstr "在 '%s' 下可用的 git 命令"

896 +#: archive.c:438

897 +msgid "compress faster"

898 +msgstr "压缩速度更快"

899

1009 -#: help.c:212

1010 -msgid "git commands available from elsewhere on your $PATH"

1011 -msgstr "在 $PATH 路径中的其他地方可用的 git 命令"

900 +#: archive.c:446

901 +msgid "compress better"

902 +msgstr "压缩效果更好"

903

1013 -#: help.c:244

1014 -msgid "These are common Git commands used in various situations:"

1015 -msgstr "这些是各种场合常见的 Git 命令："

904 +#: archive.c:449

905 +msgid "list supported archive formats"

906 +msgstr "列出支持的归档格式"

907

1017 -#: help.c:309

1018 -#, c-format

1019 -msgid ""

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

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

1022 -msgstr ""

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

1024 -"可能是 git-%s 受损？"

908 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88

909 +#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953

910 +msgid "repo"

911 +msgstr "仓库"

912

1026 -#: help.c:366

1027 -msgid "Uh oh. Your system reports no Git commands at all."

1028 -msgstr "唉呀，您的系统中未发现 Git 命令。"

913 +#: archive.c:452 builtin/archive.c:91

914 +msgid "retrieve the archive from remote repository <repo>"

915 +msgstr "从远程仓库（<仓库>）提取归档文件"

916

1030 -#: help.c:388

917 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485

918 +msgid "command"

919 +msgstr "命令"

920 +

921 +#: archive.c:454 builtin/archive.c:93

922 +msgid "path to the remote git-upload-archive command"

923 +msgstr "远程 git-upload-archive 命令的路径"

924 +

925 +#: archive.c:461

926 +msgid "Unexpected option --remote"

927 +msgstr "未知参数 --remote"

928 +

929 +#: archive.c:463

930 +msgid "Option --exec can only be used together with --remote"

931 +msgstr "选项 --exec 只能和 --remote 同时使用"

932 +

933 +#: archive.c:465

934 +msgid "Unexpected option --output"

935 +msgstr "未知参数 --output"

936 +

937 +#: archive.c:487

938 +#, c-format

939 +msgid "Unknown archive format '%s'"

940 +msgstr "未知归档格式 '%s'"

941 +

942 +#: archive.c:494

943 #, c-format

944 +msgid "Argument not supported for format '%s': -%d"

945 +msgstr "参数不支持此格式 '%s'：-%d"

946 +

947 +#: attr.c:263

948 msgid ""

1033 -"WARNING: You called a Git command named '%s', which does not exist.\n"

1034 -"Continuing under the assumption that you meant '%s'"

949 +"Negative patterns are ignored in git attributes\n"

950 +"Use '\\!' for literal leading exclamation."

951 msgstr ""

1036 -"警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n"

1037 -"是 '%s'"

952 +"负值模版在 git attributes 中被忽略\n"

953 +"当字符串确实要以感叹号开始时，使用 '\\!'。"

954

1039 -#: help.c:393

955 +#: bisect.c:441

956 #, c-format

1041 -msgid "in %0.1f seconds automatically..."

1042 -msgstr "在 %0.1f 秒钟后自动运行..."

957 +msgid "Could not open file '%s'"

958 +msgstr "不能打开文件 '%s'"

959

1044 -#: help.c:400

960 +#: bisect.c:446

961 #, c-format

1046 -msgid "git: '%s' is not a git command. See 'git --help'."

1047 -msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"

962 +msgid "Badly quoted content in file '%s': %s"

963 +msgstr "文件 '%s' 包含错误的引用格式：%s"

964

1049 -#: help.c:404 help.c:470

1050 -msgid ""

1051 -"\n"

1052 -"Did you mean this?"

1053 -msgid_plural ""

1054 -"\n"

1055 -"Did you mean one of these?"

1056 -msgstr[0] ""

1057 -"\n"

1058 -"您指的是这个么？"

1059 -msgstr[1] ""

1060 -"\n"

1061 -"您指的是这其中的某一个么？"

965 +#: bisect.c:655

966 +#, c-format

967 +msgid "We cannot bisect more!\n"

968 +msgstr "我们无法进行更多的二分查找！\n"

969

1063 -#: help.c:466

970 +#: bisect.c:708

971 #, c-format

1065 -msgid "%s: %s - %s"

1066 -msgstr "%s：%s - %s"

972 +msgid "Not a valid commit name %s"

973 +msgstr "不是一个有效的提交名 %s"

974

1068 -#: lockfile.c:152

975 +#: bisect.c:732

976 #, c-format

977 msgid ""

1071 -"Unable to create '%s.lock': %s.\n"

1072 -"\n"

1073 -"Another git process seems to be running in this repository, e.g.\n"

1074 -"an editor opened by 'git commit'. Please make sure all processes\n"

1075 -"are terminated then try again. If it still fails, a git process\n"

1076 -"may have crashed in this repository earlier:\n"

1077 -"remove the file manually to continue."

978 +"The merge base %s is bad.\n"

979 +"This means the bug has been fixed between %s and [%s].\n"

980 msgstr ""

1079 -"无法创建 '%s.lock'：%s。\n"

1080 -"\n"

1081 -"似乎另外一个 git 进程在这个仓库中运行，例如：'git commit' 命令打\n"

1082 -"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错，\n"

1083 -"可能之前有一个 git 进程在这个仓库中异常退出：\n"

1084 -"手动删除这个文件再继续。"

981 +"合并基线 %s 是坏的。\n"

982 +"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"

983

1086 -#: lockfile.c:160

984 +#: bisect.c:737

985 #, c-format

1088 -msgid "Unable to create '%s.lock': %s"

1089 -msgstr "不能创建 '%s.lock'：%s"

986 +msgid ""

987 +"The merge base %s is new.\n"

988 +"The property has changed between %s and [%s].\n"

989 +msgstr ""

990 +"合并基线 %s 是新的。\n"

991 +"介于 %s 和 [%s] 之间的属性已经被修改。\n"

992

1091 -#: merge.c:41

1092 -msgid "failed to read the cache"

1093 -msgstr "无法读取缓存"

993 +#: bisect.c:742

994 +#, c-format

995 +msgid ""

996 +"The merge base %s is %s.\n"

997 +"This means the first '%s' commit is between %s and [%s].\n"

998 +msgstr ""

999 +"合并基线 %s 是 %s。\n"

1000 +"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"

1001

1095 -#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375

1096 -#: builtin/checkout.c:589 builtin/clone.c:732

1097 -msgid "unable to write new index file"

1098 -msgstr "无法写新的索引文件"

1002 +#: bisect.c:750

1003 +#, c-format

1004 +msgid ""

1005 +"Some %s revs are not ancestor of the %s rev.\n"

1006 +"git bisect cannot work properly in this case.\n"

1007 +"Maybe you mistook %s and %s revs?\n"

1008 +msgstr ""

1009 +"一些 %s 版本不是 %s 版本的祖先。\n"

1010 +"这种情况下 git 二分查找无法正常工作。\n"

1011 +"您可能弄错了 %s 和 %s 版本？\n"

1012

1100 -#: merge-recursive.c:209

1101 -msgid "(bad commit)\n"

1102 -msgstr "（坏提交）\n"

1013 +#: bisect.c:763

1014 +#, c-format

1015 +msgid ""

1016 +"the merge base between %s and [%s] must be skipped.\n"

1017 +"So we cannot be sure the first %s commit is between %s and %s.\n"

1018 +"We continue anyway."

1019 +msgstr ""

1020 +"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"

1021 +"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"

1022 +"我们仍旧继续。"

1023

1104 -#: merge-recursive.c:231

1024 +#: bisect.c:798

1025 #, c-format

1106 -msgid "addinfo_cache failed for path '%s'"

1107 -msgstr "为路径 '%s' addinfo_cache 失败"

1026 +msgid "Bisecting: a merge base must be tested\n"

1027 +msgstr "二分查找中：合并基线必须是经过测试的\n"

1028

1109 -#: merge-recursive.c:301

1110 -msgid "error building trees"

1111 -msgstr "无法创建树"

1029 +#: bisect.c:849

1030 +#, c-format

1031 +msgid "a %s revision is needed"

1032 +msgstr "需要一个 %s 版本"

1033

1113 -#: merge-recursive.c:720

1034 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248

1035 #, c-format

1115 -msgid "failed to create path '%s'%s"

1116 -msgstr "无法创建路径 '%s'%s"

1036 +msgid "could not create file '%s'"

1037 +msgstr "不能创建文件 '%s'"

1038

1118 -#: merge-recursive.c:731

1039 +#: bisect.c:917

1040 #, c-format

1120 -msgid "Removing %s to make room for subdirectory\n"

1121 -msgstr "删除 %s 以便为子目录留出空间\n"

1041 +msgid "could not read file '%s'"

1042 +msgstr "不能读取文件 '%s'"

1043

1123 -#: merge-recursive.c:745 merge-recursive.c:764

1124 -msgid ": perhaps a D/F conflict?"

1125 -msgstr "：可能是一个目录/文件冲突？"

1044 +#: bisect.c:947

1045 +msgid "reading bisect refs failed"

1046 +msgstr "读取二分查找引用失败"

1047

1127 -#: merge-recursive.c:754

1048 +#: bisect.c:967

1049 #, c-format

1129 -msgid "refusing to lose untracked file at '%s'"

1130 -msgstr "拒绝丢弃 '%s' 中的未跟踪文件"

1050 +msgid "%s was both %s and %s\n"

1051 +msgstr "%s 同时为 %s 和 %s\n"

1052

1132 -#: merge-recursive.c:796

1053 +#: bisect.c:975

1054 #, c-format

1134 -msgid "cannot read object %s '%s'"

1135 -msgstr "不能读取对象 %s '%s'"

1055 +msgid ""

1056 +"No testable commit found.\n"

1057 +"Maybe you started with bad path parameters?\n"

1058 +msgstr ""

1059 +"没有发现可测试的提交。\n"

1060 +"可能您在运行时使用了错误的路径参数？\n"

1061

1137 -#: merge-recursive.c:798

1062 +#: bisect.c:994

1063 #, c-format

1139 -msgid "blob expected for %s '%s'"

1140 -msgstr "%s '%s' 应为数据对象"

1064 +msgid "(roughly %d step)"

1065 +msgid_plural "(roughly %d steps)"

1066 +msgstr[0] "（大概 %d 步）"

1067 +msgstr[1] "（大概 %d 步）"

1068

1142 -#: merge-recursive.c:822

1069 +#. TRANSLATORS: the last %s will be replaced with

1070 +#. "(roughly %d steps)" translation

1071 +#: bisect.c:998

1072 #, c-format

1144 -msgid "failed to open '%s': %s"

1145 -msgstr "无法打开 '%s'：%s"

1073 +msgid "Bisecting: %d revision left to test after this %s\n"

1074 +msgid_plural "Bisecting: %d revisions left to test after this %s\n"

1075 +msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1076 +msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1077

1147 -#: merge-recursive.c:833

1078 +#: branch.c:53

1079 #, c-format

1149 -msgid "failed to symlink '%s': %s"

1150 -msgstr "无法创建符号链接 '%s'：%s"

1080 +msgid ""

1081 +"\n"

1082 +"After fixing the error cause you may try to fix up\n"

1083 +"the remote tracking information by invoking\n"

1084 +"\"git branch --set-upstream-to=%s%s%s\"."

1085 +msgstr ""

1086 +"\n"

1087 +"在修复错误后，您可以尝试修改远程跟踪分支，通过执行命令\n"

1088 +"\"git branch --set-upstream-to=%s%s%s\" 。"

1089

1152 -#: merge-recursive.c:838

1090 +#: branch.c:67

1091 #, c-format

1154 -msgid "do not know what to do with %06o %s '%s'"

1155 -msgstr "不知道如何处理 %06o %s '%s'"

1156 -

1157 -#: merge-recursive.c:978

1158 -msgid "Failed to execute internal merge"

1159 -msgstr "无法执行内部合并"

1092 +msgid "Not setting branch %s as its own upstream."

1093 +msgstr "未设置分支 %s 作为它自己的上游。"

1094

1161 -#: merge-recursive.c:982

1095 +#: branch.c:93

1096 #, c-format

1163 -msgid "Unable to add %s to database"

1164 -msgstr "不能添加 %s 至对象库"

1097 +msgid "Branch %s set up to track remote branch %s from %s by rebasing."

1098 +msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"

1099

1166 -#: merge-recursive.c:1081 merge-recursive.c:1095

1100 +#: branch.c:94

1101 #, c-format

1168 -msgid ""

1169 -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

1170 -"in tree."

1171 -msgstr ""

1172 -"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"

1173 -"的版本被保留。"

1102 +msgid "Branch %s set up to track remote branch %s from %s."

1103 +msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"

1104

1175 -#: merge-recursive.c:1087 merge-recursive.c:1100

1105 +#: branch.c:98

1106 #, c-format

1177 -msgid ""

1178 -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

1179 -"in tree at %s."

1180 -msgstr ""

1181 -"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"

1182 -"的版本保留于 %8$s 中。"

1183 -

1184 -#: merge-recursive.c:1143

1185 -msgid "rename"

1186 -msgstr "重命名"

1187 -

1188 -#: merge-recursive.c:1143

1189 -msgid "renamed"

1190 -msgstr "重命名"

1107 +msgid "Branch %s set up to track local branch %s by rebasing."

1108 +msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"

1109

1192 -#: merge-recursive.c:1200

1110 +#: branch.c:99

1111 #, c-format

1194 -msgid "%s is a directory in %s adding as %s instead"

1195 -msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"

1112 +msgid "Branch %s set up to track local branch %s."

1113 +msgstr "分支 %s 设置为跟踪本地分支 %s。"

1114

1197 -#: merge-recursive.c:1225

1115 +#: branch.c:104

1116 #, c-format

1199 -msgid ""

1200 -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

1201 -"\"->\"%s\" in \"%s\"%s"

1202 -msgstr ""

1203 -"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "

1204 -"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"

1205 -

1206 -#: merge-recursive.c:1230

1207 -msgid " (left unresolved)"

1208 -msgstr "（留下未解决）"

1117 +msgid "Branch %s set up to track remote ref %s by rebasing."

1118 +msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"

1119

1210 -#: merge-recursive.c:1292

1120 +#: branch.c:105

1121 #, c-format

1212 -msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

1213 -msgstr ""

1214 -"冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"

1215 -"%5$s"

1122 +msgid "Branch %s set up to track remote ref %s."

1123 +msgstr "分支 %s 设置为跟踪远程引用 %s。"

1124

1217 -#: merge-recursive.c:1325

1125 +#: branch.c:109

1126 #, c-format

1219 -msgid "Renaming %s to %s and %s to %s instead"

1220 -msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"

1127 +msgid "Branch %s set up to track local ref %s by rebasing."

1128 +msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"

1129

1222 -#: merge-recursive.c:1531

1130 +#: branch.c:110

1131 #, c-format

1224 -msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

1225 -msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"

1132 +msgid "Branch %s set up to track local ref %s."

1133 +msgstr "分支 %s 设置为跟踪本地引用 %s。"

1134

1227 -#: merge-recursive.c:1546

1228 -#, c-format

1229 -msgid "Adding merged %s"

1230 -msgstr "添加合并后的 %s"

1135 +#: branch.c:119

1136 +msgid "Unable to write upstream branch configuration"

1137 +msgstr "无法写入上游分支配置"

1138

1232 -#: merge-recursive.c:1553 merge-recursive.c:1766

1139 +#: branch.c:156

1140 #, c-format

1234 -msgid "Adding as %s instead"

1235 -msgstr "而是以 %s 为名添加"

1141 +msgid "Not tracking: ambiguous information for ref %s"

1142 +msgstr "未跟踪：引用 %s 有歧义"

1143

1237 -#: merge-recursive.c:1610

1144 +#: branch.c:185

1145 #, c-format

1239 -msgid "cannot read object %s"

1240 -msgstr "不能读取对象 %s"

1146 +msgid "'%s' is not a valid branch name."

1147 +msgstr "'%s' 不是一个有效的分支名称。"

1148

1242 -#: merge-recursive.c:1613

1149 +#: branch.c:190

1150 #, c-format

1244 -msgid "object %s is not a blob"

1245 -msgstr "对象 %s 不是一个数据对象"

1246 -

1247 -#: merge-recursive.c:1666

1248 -msgid "modify"

1249 -msgstr "修改"

1250 -

1251 -#: merge-recursive.c:1666

1252 -msgid "modified"

1253 -msgstr "修改"

1254 -

1255 -#: merge-recursive.c:1676

1256 -msgid "content"

1257 -msgstr "内容"

1151 +msgid "A branch named '%s' already exists."

1152 +msgstr "一个分支名 '%s' 已经存在。"

1153

1259 -#: merge-recursive.c:1683

1260 -msgid "add/add"

1261 -msgstr "添加/添加"

1154 +#: branch.c:198

1155 +msgid "Cannot force update the current branch."

1156 +msgstr "无法强制更新当前分支。"

1157

1263 -#: merge-recursive.c:1718

1158 +#: branch.c:218

1159 #, c-format

1265 -msgid "Skipped %s (merged same as existing)"

1266 -msgstr "略过 %s（已经做过相同合并）"

1160 +msgid "Cannot setup tracking information; starting point '%s' is not a branch."

1161 +msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"

1162

1268 -#: merge-recursive.c:1732

1163 +#: branch.c:220

1164 #, c-format

1270 -msgid "Auto-merging %s"

1271 -msgstr "自动合并 %s"

1165 +msgid "the requested upstream branch '%s' does not exist"

1166 +msgstr "请求的上游分支 '%s' 不存在"

1167

1273 -#: merge-recursive.c:1736 git-submodule.sh:919

1274 -msgid "submodule"

1275 -msgstr "子模组"

1168 +#: branch.c:222

1169 +msgid ""

1170 +"\n"

1171 +"If you are planning on basing your work on an upstream\n"

1172 +"branch that already exists at the remote, you may need to\n"

1173 +"run \"git fetch\" to retrieve it.\n"

1174 +"\n"

1175 +"If you are planning to push out a new local branch that\n"

1176 +"will track its remote counterpart, you may want to use\n"

1177 +"\"git push -u\" to set the upstream config as you push."

1178 +msgstr ""

1179 +"\n"

1180 +"如果您正计划基于远程一个现存的上游分支开始你的工作，\n"

1181 +"您可能需要执行 \"git fetch\" 来获取分支。\n"

1182 +"\n"

1183 +"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"

1184 +"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"

1185

1277 -#: merge-recursive.c:1737

1186 +#: branch.c:266

1187 #, c-format

1279 -msgid "CONFLICT (%s): Merge conflict in %s"

1280 -msgstr "冲突（%s）：合并冲突于 %s"

1188 +msgid "Not a valid object name: '%s'."

1189 +msgstr "不是一个有效的对象名：'%s'。"

1190

1282 -#: merge-recursive.c:1831

1191 +#: branch.c:286

1192 #, c-format

1284 -msgid "Removing %s"

1285 -msgstr "删除 %s"

1286 -

1287 -#: merge-recursive.c:1857

1288 -msgid "file/directory"

1289 -msgstr "文件/目录"

1290 -

1291 -#: merge-recursive.c:1863

1292 -msgid "directory/file"

1293 -msgstr "目录/文件"

1193 +msgid "Ambiguous object name: '%s'."

1194 +msgstr "歧义的对象名：'%s'。"

1195

1295 -#: merge-recursive.c:1868

1196 +#: branch.c:291

1197 #, c-format

1297 -msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

1298 -msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"

1198 +msgid "Not a valid branch point: '%s'."

1199 +msgstr "无效的分支点：'%s'。"

1200

1300 -#: merge-recursive.c:1877

1201 +#: branch.c:345

1202 #, c-format

1302 -msgid "Adding %s"

1303 -msgstr "添加 %s"

1203 +msgid "'%s' is already checked out at '%s'"

1204 +msgstr "'%s' 已经检出到 '%s'"

1205

1305 -#: merge-recursive.c:1914

1306 -msgid "Already up-to-date!"

1307 -msgstr "已经是最新的！"

1206 +#: branch.c:364

1207 +#, c-format

1208 +msgid "HEAD of working tree %s is not updated"

1209 +msgstr "工作区 %s 的 HEAD 指向没有被更新"

1210

1309 -#: merge-recursive.c:1923

1211 +#: bundle.c:34

1212 #, c-format

1311 -msgid "merging of trees %s and %s failed"

1312 -msgstr "无法合并树 %s 和 %s"

1213 +msgid "'%s' does not look like a v2 bundle file"

1214 +msgstr "'%s' 不像是一个 v2 版本的包文件"

1215

1314 -#: merge-recursive.c:2006

1315 -msgid "Merging:"

1316 -msgstr "合并："

1216 +#: bundle.c:61

1217 +#, c-format

1218 +msgid "unrecognized header: %s%s (%d)"

1219 +msgstr "未能识别的包头：%s%s (%d)"

1220

1318 -#: merge-recursive.c:2019

1221 +#: bundle.c:87 sequencer.c:963 builtin/commit.c:777

1222 #, c-format

1320 -msgid "found %u common ancestor:"

1321 -msgid_plural "found %u common ancestors:"

1322 -msgstr[0] "发现 %u 个共同祖先："

1323 -msgstr[1] "发现 %u 个共同祖先："

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

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

1225

1325 -#: merge-recursive.c:2058

1326 -msgid "merge returned no commit"

1327 -msgstr "合并未返回提交"

1328 -

1329 -#: merge-recursive.c:2121

1330 -#, c-format

1331 -msgid "Could not parse object '%s'"

1332 -msgstr "不能解析对象 '%s'"

1333 -

1334 -#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788

1335 -msgid "Unable to write index."

1336 -msgstr "不能写入索引。"

1226 +#: bundle.c:139

1227 +msgid "Repository lacks these prerequisite commits:"

1228 +msgstr "仓库中缺少这些必备的提交："

1229

1338 -#: notes-utils.c:41

1339 -msgid "Cannot commit uninitialized/unreferenced notes tree"

1340 -msgstr "不能提交未初始化/未引用的注解树"

1230 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374

1231 +#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348

1232 +#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909

1233 +#: builtin/merge.c:356 builtin/shortlog.c:170

1234 +msgid "revision walk setup failed"

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

1236

1342 -#: notes-utils.c:100

1237 +#: bundle.c:185

1238 #, c-format

1344 -msgid "Bad notes.rewriteMode value: '%s'"

1345 -msgstr "坏的 notes.rewriteMode 值：'%s'"

1239 +msgid "The bundle contains this ref:"

1240 +msgid_plural "The bundle contains these %d refs:"

1241 +msgstr[0] "这个包中含有这个引用："

1242 +msgstr[1] "这个包中含有 %d 个引用："

1243

1347 -#: notes-utils.c:110

1348 -#, c-format

1349 -msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

1350 -msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

1244 +#: bundle.c:192

1245 +msgid "The bundle records a complete history."

1246 +msgstr "这个包记录一个完整历史。"

1247

1352 -#. TRANSLATORS: The first %s is the name of the

1353 -#. environment variable, the second %s is its value

1354 -#: notes-utils.c:137

1248 +#: bundle.c:194

1249 #, c-format

1356 -msgid "Bad %s value: '%s'"

1357 -msgstr "坏的 %s 值：'%s'"

1250 +msgid "The bundle requires this ref:"

1251 +msgid_plural "The bundle requires these %d refs:"

1252 +msgstr[0] "这个包需要这个引用："

1253 +msgstr[1] "这个包需要 %d 个引用："

1254

1359 -#: object.c:242

1360 -#, c-format

1361 -msgid "unable to parse object: %s"

1362 -msgstr "不能解析对象：%s"

1255 +#: bundle.c:253

1256 +msgid "Could not spawn pack-objects"

1257 +msgstr "不能生成 pack-objects 进程"

1258

1364 -#: parse-options.c:572

1365 -msgid "..."

1366 -msgstr "..."

1259 +#: bundle.c:264

1260 +msgid "pack-objects died"

1261 +msgstr "pack-objects 终止"

1262

1368 -#: parse-options.c:590

1263 +#: bundle.c:304

1264 +msgid "rev-list died"

1265 +msgstr "rev-list 终止"

1266 +

1267 +#: bundle.c:353

1268 #, c-format

1370 -msgid "usage: %s"

1371 -msgstr "用法：%s"

1269 +msgid "ref '%s' is excluded by the rev-list options"

1270 +msgstr "引用 '%s' 被 rev-list 选项排除"

1271

1373 -#. TRANSLATORS: the colon here should align with the

1374 -#. one in "usage: %s" translation

1375 -#: parse-options.c:594

1272 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273

1273 #, c-format

1377 -msgid " or: %s"

1378 -msgstr " 或：%s"

1274 +msgid "unrecognized argument: %s"

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

1276

1380 -# 译者：为保证在输出中对齐，注意调整句中空格！

1381 -#: parse-options.c:597

1277 +#: bundle.c:451

1278 +msgid "Refusing to create empty bundle."

1279 +msgstr "不能创建空包。"

1280 +

1281 +#: bundle.c:463

1282 #, c-format

1383 -msgid " %s"

1384 -msgstr " %s"

1283 +msgid "cannot create '%s'"

1284 +msgstr "不能创建 '%s'"

1285

1386 -#: parse-options.c:631

1387 -msgid "-NUM"

1388 -msgstr "-数字"

1286 +#: bundle.c:491

1287 +msgid "index-pack died"

1288 +msgstr "index-pack 终止"

1289

1390 -#: parse-options-cb.c:108

1290 +#: color.c:290

1291 #, c-format

1392 -msgid "malformed object name '%s'"

1393 -msgstr "非法的对象名 '%s'"

1292 +msgid "invalid color value: %.*s"

1293 +msgstr "无效的颜色值：%.*s"

1294

1395 -#: path.c:798

1295 +#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493

1296 +#: builtin/am.c:2127

1297 #, c-format

1397 -msgid "Could not make %s writable by group"

1398 -msgstr "不能设置 %s 为组可写"

1298 +msgid "could not parse %s"

1299 +msgstr "不能解析 %s"

1300

1400 -#: pathspec.c:133

1401 -msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

1402 -msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"

1301 +#: commit.c:42

1302 +#, c-format

1303 +msgid "%s %s is not a commit!"

1304 +msgstr "%s %s 不是一个提交!"

1305

1404 -#: pathspec.c:143

1306 +#: commit.c:1514

1307 msgid ""

1406 -"global 'literal' pathspec setting is incompatible with all other global "

1407 -"pathspec settings"

1408 -msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"

1409 -

1410 -#: pathspec.c:177

1411 -msgid "invalid parameter for pathspec magic 'prefix'"

1412 -msgstr "路径规格包含无效的神奇前缀"

1413 -

1414 -#: pathspec.c:183

1415 -#, c-format

1416 -msgid "Invalid pathspec magic '%.*s' in '%s'"

1417 -msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"

1308 +"Warning: commit message did not conform to UTF-8.\n"

1309 +"You may want to amend it after fixing the message, or set the config\n"

1310 +"variable i18n.commitencoding to the encoding your project uses.\n"

1311 +msgstr ""

1312 +"警告：提交说明不符合 UTF-8 字符集。\n"

1313 +"您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"

1314 +"设置为您项目所用的字符集。\n"

1315

1419 -#: pathspec.c:187

1420 -#, c-format

1421 -msgid "Missing ')' at the end of pathspec magic in '%s'"

1422 -msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"

1316 +#: compat/obstack.c:406 compat/obstack.c:408

1317 +msgid "memory exhausted"

1318 +msgstr "内存耗尽"

1319

1424 -#: pathspec.c:205

1320 +#: config.c:516

1321 #, c-format

1426 -msgid "Unimplemented pathspec magic '%c' in '%s'"

1427 -msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"

1322 +msgid "bad config line %d in blob %s"

1323 +msgstr "数据对象 %2$s 中错误的配置行 %1$d"

1324

1429 -#: pathspec.c:230

1325 +#: config.c:520

1326 #, c-format

1431 -msgid "%s: 'literal' and 'glob' are incompatible"

1432 -msgstr "%s：'literal' 和 'glob' 不兼容"

1327 +msgid "bad config line %d in file %s"

1328 +msgstr "文件 %2$s 中错误的配置行 %1$d"

1329

1434 -#: pathspec.c:241

1330 +#: config.c:524

1331 #, c-format

1436 -msgid "%s: '%s' is outside repository"

1437 -msgstr "%s：'%s' 在仓库之外"

1332 +msgid "bad config line %d in standard input"

1333 +msgstr "标准输入中错误的配置行 %d"

1334

1439 -#: pathspec.c:291

1335 +#: config.c:528

1336 #, c-format

1441 -msgid "Pathspec '%s' is in submodule '%.*s'"

1442 -msgstr "路径规格 '%s' 在子模组 '%.*s' 中"

1337 +msgid "bad config line %d in submodule-blob %s"

1338 +msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"

1339

1444 -#: pathspec.c:353

1340 +#: config.c:532

1341 #, c-format

1446 -msgid "%s: pathspec magic not supported by this command: %s"

1447 -msgstr "%s：路径规格神奇前缀不被此命令支持：%s"

1342 +msgid "bad config line %d in command line %s"

1343 +msgstr "命令行 %2$s 中错误的配置行 %1$d"

1344

1449 -#: pathspec.c:433

1345 +#: config.c:536

1346 #, c-format

1451 -msgid "pathspec '%s' is beyond a symbolic link"

1452 -msgstr "路径规格 '%s' 位于符号链接中"

1453 -

1454 -#: pathspec.c:442

1455 -msgid ""

1456 -"There is nothing to exclude from by :(exclude) patterns.\n"

1457 -"Perhaps you forgot to add either ':/' or '.' ?"

1458 -msgstr ""

1459 -"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"

1460 -"添加 ':/' 或 '.' ？"

1461 -

1462 -#: pretty.c:973

1463 -msgid "unable to parse --pretty format"

1464 -msgstr "不能解析 --pretty 格式"

1347 +msgid "bad config line %d in %s"

1348 +msgstr "在 %2$s 中错误的配置行 %1$d"

1349

1466 -#: progress.c:235

1467 -msgid "done"

1468 -msgstr "完成"

1350 +#: config.c:655

1351 +msgid "out of range"

1352 +msgstr "超出范围"

1353

1470 -#: read-cache.c:1281

1471 -#, c-format

1472 -msgid ""

1473 -"index.version set, but the value is invalid.\n"

1474 -"Using version %i"

1475 -msgstr ""

1476 -"设置了 index.version，但是取值无效。\n"

1477 -"使用版本 %i"

1354 +#: config.c:655

1355 +msgid "invalid unit"

1356 +msgstr "无效的单位"

1357

1479 -#: read-cache.c:1291

1358 +#: config.c:661

1359 #, c-format

1481 -msgid ""

1482 -"GIT_INDEX_VERSION set, but the value is invalid.\n"

1483 -"Using version %i"

1484 -msgstr ""

1485 -"设置了 GIT_INDEX_VERSION，但是取值无效。\n"

1486 -"使用版本 %i"

1360 +msgid "bad numeric config value '%s' for '%s': %s"

1361 +msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"

1362

1488 -#: refs.c:551 builtin/merge.c:840

1363 +#: config.c:666

1364 #, c-format

1490 -msgid "Could not open '%s' for writing"

1491 -msgstr "无法打开 '%s' 进行写入"

1365 +msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

1366 +msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1367

1493 -#: refs/files-backend.c:2534

1368 +#: config.c:669

1369 #, c-format

1495 -msgid "could not delete reference %s: %s"

1496 -msgstr "无法删除引用 %s：%s"

1370 +msgid "bad numeric config value '%s' for '%s' in file %s: %s"

1371 +msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1372

1498 -#: refs/files-backend.c:2537

1373 +#: config.c:672

1374 #, c-format

1500 -msgid "could not delete references: %s"

1501 -msgstr "无法删除引用：%s"

1375 +msgid "bad numeric config value '%s' for '%s' in standard input: %s"

1376 +msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"

1377

1503 -#: refs/files-backend.c:2546

1378 +#: config.c:675

1379 #, c-format

1505 -msgid "could not remove reference %s"

1506 -msgstr "无法删除引用 %s"

1380 +msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

1381 +msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1382

1508 -#: ref-filter.c:55

1383 +#: config.c:678

1384 #, c-format

1510 -msgid "expected format: %%(color:<color>)"

1511 -msgstr "期望的格式：%%(color:<color>)"

1385 +msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

1386 +msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1387

1513 -#: ref-filter.c:57

1388 +#: config.c:681

1389 #, c-format

1515 -msgid "unrecognized color: %%(color:%s)"

1516 -msgstr "未能识别的颜色：%%(color:%s)"

1390 +msgid "bad numeric config value '%s' for '%s' in %s: %s"

1391 +msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1392

1518 -#: ref-filter.c:71

1393 +#: config.c:768

1394 #, c-format

1520 -msgid "unrecognized format: %%(%s)"

1521 -msgstr "未能识别的格式：%%(%s)"

1395 +msgid "failed to expand user dir in: '%s'"

1396 +msgstr "无法扩展 '%s' 中的用户目录"

1397

1523 -#: ref-filter.c:77

1398 +#: config.c:852 config.c:863

1399 #, c-format

1525 -msgid "%%(body) does not take arguments"

1526 -msgstr "%%(body) 不带参数"

1400 +msgid "bad zlib compression level %d"

1401 +msgstr "错误的 zlib 压缩级别 %d"

1402

1528 -#: ref-filter.c:84

1403 +#: config.c:978

1404 #, c-format

1530 -msgid "%%(subject) does not take arguments"

1531 -msgstr "%%(subject) 不带参数"

1405 +msgid "invalid mode for object creation: %s"

1406 +msgstr "无效的对象创建模式：%s"

1407

1533 -#: ref-filter.c:101

1534 -#, c-format

1535 -msgid "positive value expected contents:lines=%s"

1536 -msgstr "要为 contents:lines=%s 提供一个正数"

1408 +#: config.c:1312

1409 +msgid "unable to parse command-line config"

1410 +msgstr "无法解析命令行中的配置"

1411

1538 -#: ref-filter.c:103

1539 -#, c-format

1540 -msgid "unrecognized %%(contents) argument: %s"

1541 -msgstr "未能识别的 %%(contents) 参数：%s"

1412 +#: config.c:1362

1413 +msgid "unknown error occurred while reading the configuration files"

1414 +msgstr "在读取配置文件时遇到未知错误"

1415

1543 -#: ref-filter.c:113

1416 +#: config.c:1716

1417 #, c-format

1545 -msgid "unrecognized %%(objectname) argument: %s"

1546 -msgstr "未能识别的 %%(objectname) 参数：%s"

1418 +msgid "unable to parse '%s' from command-line config"

1419 +msgstr "无法解析命令行配置中的 '%s'"

1420

1548 -#: ref-filter.c:135

1421 +#: config.c:1718

1422 #, c-format

1550 -msgid "expected format: %%(align:<width>,<position>)"

1551 -msgstr "期望的格式：%%(align:<width>,<position>)"

1423 +msgid "bad config variable '%s' in file '%s' at line %d"

1424 +msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"

1425

1553 -#: ref-filter.c:147

1426 +#: config.c:1777

1427 #, c-format

1555 -msgid "unrecognized position:%s"

1556 -msgstr "未能识别的位置：%s"

1428 +msgid "%s has multiple values"

1429 +msgstr "%s 有多个取值"

1430

1558 -#: ref-filter.c:151

1431 +#: config.c:2311

1432 #, c-format

1560 -msgid "unrecognized width:%s"

1561 -msgstr "未能识别的宽度：%s"

1433 +msgid "could not set '%s' to '%s'"

1434 +msgstr "不能设置 '%s' 为 '%s'"

1435

1563 -#: ref-filter.c:157

1436 +#: config.c:2313

1437 #, c-format

1565 -msgid "unrecognized %%(align) argument: %s"

1566 -msgstr "未能识别的 %%(align) 参数：%s"

1438 +msgid "could not unset '%s'"

1439 +msgstr "不能取消设置 '%s'"

1440

1568 -#: ref-filter.c:161

1569 -#, c-format

1570 -msgid "positive width expected with the %%(align) atom"

1571 -msgstr "元素 %%(align) 需要一个正数的宽度"

1441 +#: connect.c:49

1442 +msgid "The remote end hung up upon initial contact"

1443 +msgstr "远端在初始连接时即挂断"

1444

1573 -#: ref-filter.c:244

1445 +#: connect.c:51

1446 +msgid ""

1447 +"Could not read from remote repository.\n"

1448 +"\n"

1449 +"Please make sure you have the correct access rights\n"

1450 +"and the repository exists."

1451 +msgstr ""

1452 +"无法读取远程仓库。\n"

1453 +"\n"

1454 +"请确认您有正确的访问权限并且仓库存在。"

1455 +

1456 +#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140

1457 +msgid "Checking connectivity"

1458 +msgstr "检查连接中"

1459 +

1460 +#: connected.c:75

1461 +msgid "Could not run 'git rev-list'"

1462 +msgstr "不能执行 'git rev-list'"

1463 +

1464 +#: connected.c:95

1465 +msgid "failed write to rev-list"

1466 +msgstr "无法写入 rev-list"

1467 +

1468 +#: connected.c:102

1469 +msgid "failed to close rev-list's stdin"

1470 +msgstr "无法关闭 rev-list 的标准输入"

1471 +

1472 +#: convert.c:201

1473 #, c-format

1575 -msgid "malformed field name: %.*s"

1576 -msgstr "非法的字段名：%.*s"

1474 +msgid ""

1475 +"CRLF will be replaced by LF in %s.\n"

1476 +"The file will have its original line endings in your working directory."

1477 +msgstr ""

1478 +"文件 %s 中的 CRLF 将被 LF 替换。\n"

1479 +"在工作区中该文件仍保持原有的换行符。"

1480

1578 -#: ref-filter.c:270

1481 +#: convert.c:205

1482 #, c-format

1580 -msgid "unknown field name: %.*s"

1581 -msgstr "未知的字段名：%.*s"

1483 +msgid "CRLF would be replaced by LF in %s."

1484 +msgstr "文件 %s 中的 CRLF 将被 LF 替换。"

1485

1583 -#: ref-filter.c:372

1486 +#: convert.c:211

1487 #, c-format

1585 -msgid "format: %%(end) atom used without corresponding atom"

1586 -msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"

1488 +msgid ""

1489 +"LF will be replaced by CRLF in %s.\n"

1490 +"The file will have its original line endings in your working directory."

1491 +msgstr ""

1492 +"文件 %s 中的 LF 将被 CRLF 替换。\n"

1493 +"在工作区中该文件仍保持原有的换行符。"

1494

1588 -#: ref-filter.c:424

1495 +#: convert.c:215

1496 #, c-format

1590 -msgid "malformed format string %s"

1591 -msgstr "非法的格式化字符串 %s"

1497 +msgid "LF would be replaced by CRLF in %s"

1498 +msgstr "文件 %s 中的 LF 将被 CRLF 替换"

1499

1593 -#: ref-filter.c:878

1594 -msgid ":strip= requires a positive integer argument"

1595 -msgstr ":strip= 需要一个正整型参数"

1500 +#: date.c:97

1501 +msgid "in the future"

1502 +msgstr "在将来"

1503

1597 -#: ref-filter.c:883

1504 +#: date.c:103

1505 #, c-format

1599 -msgid "ref '%s' does not have %ld components to :strip"

1600 -msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"

1506 +msgid "%lu second ago"

1507 +msgid_plural "%lu seconds ago"

1508 +msgstr[0] "%lu 秒钟前"

1509 +msgstr[1] "%lu 秒钟前"

1510

1602 -#: ref-filter.c:1046

1511 +#: date.c:110

1512 #, c-format

1604 -msgid "unknown %.*s format %s"

1605 -msgstr "未知的 %.*s 格式 %s"

1513 +msgid "%lu minute ago"

1514 +msgid_plural "%lu minutes ago"

1515 +msgstr[0] "%lu 分钟前"

1516 +msgstr[1] "%lu 分钟前"

1517

1607 -#: ref-filter.c:1066 ref-filter.c:1097

1518 +#: date.c:117

1519 #, c-format

1609 -msgid "missing object %s for %s"

1610 -msgstr "缺失 %2$s 的对象 %1$s"

1520 +msgid "%lu hour ago"

1521 +msgid_plural "%lu hours ago"

1522 +msgstr[0] "%lu 小时前"

1523 +msgstr[1] "%lu 小时前"

1524

1612 -#: ref-filter.c:1069 ref-filter.c:1100

1525 +#: date.c:124

1526 #, c-format

1614 -msgid "parse_object_buffer failed on %s for %s"

1615 -msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"

1527 +msgid "%lu day ago"

1528 +msgid_plural "%lu days ago"

1529 +msgstr[0] "%lu 天前"

1530 +msgstr[1] "%lu 天前"

1531

1617 -#: ref-filter.c:1311

1532 +#: date.c:130

1533 #, c-format

1619 -msgid "malformed object at '%s'"

1620 -msgstr "非法的对象于 '%s'"

1534 +msgid "%lu week ago"

1535 +msgid_plural "%lu weeks ago"

1536 +msgstr[0] "%lu 周前"

1537 +msgstr[1] "%lu 周前"

1538

1622 -#: ref-filter.c:1373

1539 +#: date.c:137

1540 #, c-format

1624 -msgid "ignoring ref with broken name %s"

1625 -msgstr "忽略带有错误名称 %s 的引用"

1541 +msgid "%lu month ago"

1542 +msgid_plural "%lu months ago"

1543 +msgstr[0] "%lu 个月前"

1544 +msgstr[1] "%lu 个月前"

1545

1627 -#: ref-filter.c:1378

1546 +#: date.c:148

1547 #, c-format

1629 -msgid "ignoring broken ref %s"

1630 -msgstr "忽略损坏的引用 %s"

1548 +msgid "%lu year"

1549 +msgid_plural "%lu years"

1550 +msgstr[0] "%lu 年"

1551 +msgstr[1] "%lu 年"

1552

1632 -#: ref-filter.c:1651

1553 +#. TRANSLATORS: "%s" is "<n> years"

1554 +#: date.c:151

1555 #, c-format

1634 -msgid "format: %%(end) atom missing"

1635 -msgstr "格式：缺少 %%(end) 元素"

1556 +msgid "%s, %lu month ago"

1557 +msgid_plural "%s, %lu months ago"

1558 +msgstr[0] "%s %lu 个月前"

1559 +msgstr[1] "%s %lu 个月前"

1560

1637 -#: ref-filter.c:1705

1561 +#: date.c:156 date.c:161

1562 #, c-format

1639 -msgid "malformed object name %s"

1640 -msgstr "非法的对象名 %s"

1563 +msgid "%lu year ago"

1564 +msgid_plural "%lu years ago"

1565 +msgstr[0] "%lu 年前"

1566 +msgstr[1] "%lu 年前"

1567

1642 -#: remote.c:746

1568 +#: diffcore-order.c:24

1569 #, c-format

1644 -msgid "Cannot fetch both %s and %s to %s"

1645 -msgstr "不能同时获取 %s 和 %s 至 %s"

1570 +msgid "failed to read orderfile '%s'"

1571 +msgstr "无法读取排序文件 '%s'"

1572

1647 -#: remote.c:750

1648 -#, c-format

1649 -msgid "%s usually tracks %s, not %s"

1650 -msgstr "%s 通常跟踪 %s，而非 %s"

1573 +#: diffcore-rename.c:540

1574 +msgid "Performing inexact rename detection"

1575 +msgstr "正在进行非精确的重命名检测"

1576

1652 -#: remote.c:754

1577 +#: diff.c:62

1578 #, c-format

1654 -msgid "%s tracks both %s and %s"

1655 -msgstr "%s 同时跟踪 %s 和 %s"

1579 +msgid "option '%s' requires a value"

1580 +msgstr "选项 '%s' 需要一个值"

1581

1657 -#: remote.c:762

1658 -msgid "Internal error"

1659 -msgstr "内部错误"

1582 +# 译者：注意保持前导空格

1583 +#: diff.c:124

1584 +#, c-format

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

1586 +msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"

1587

1661 -#: remote.c:1677 remote.c:1720

1662 -msgid "HEAD does not point to a branch"

1663 -msgstr "HEAD 没有指向一个分支"

1588 +# 译者：注意保持前导空格

1589 +#: diff.c:129

1590 +#, c-format

1591 +msgid " Unknown dirstat parameter '%s'\n"

1592 +msgstr " 未知的 dirstat 参数 '%s'\n"

1593

1665 -#: remote.c:1686

1594 +#: diff.c:283

1595 #, c-format

1667 -msgid "no such branch: '%s'"

1668 -msgstr "没有此分支：'%s'"

1596 +msgid "Unknown value for 'diff.submodule' config variable: '%s'"

1597 +msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"

1598

1670 -#: remote.c:1689

1599 +#: diff.c:346

1600 #, c-format

1672 -msgid "no upstream configured for branch '%s'"

1673 -msgstr "尚未给分支 '%s' 设置上游"

1601 +msgid ""

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

1603 +"%s"

1604 +msgstr ""

1605 +"发现配置变量 'diff.dirstat' 中的错误：\n"

1606 +"%s"

1607

1675 -#: remote.c:1695

1608 +#: diff.c:3087

1609 #, c-format

1677 -msgid "upstream branch '%s' not stored as a remote-tracking branch"

1678 -msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

1610 +msgid "external diff died, stopping at %s"

1611 +msgstr "外部 diff 退出，停止在 %s"

1612

1680 -#: remote.c:1710

1613 +#: diff.c:3412

1614 +msgid "--name-only, --name-status, --check and -s are mutually exclusive"

1615 +msgstr "--name-only、--name-status、--check 和 -s 是互斥的"

1616 +

1617 +#: diff.c:3502

1618 +msgid "--follow requires exactly one pathspec"

1619 +msgstr "--follow 明确要求只跟一个路径规格"

1620 +

1621 +#: diff.c:3665

1622 #, c-format

1682 -msgid "push destination '%s' on remote '%s' has no local tracking branch"

1683 -msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"

1623 +msgid ""

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

1625 +"%s"

1626 +msgstr ""

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

1628 +"%s"

1629

1685 -#: remote.c:1725

1630 +#: diff.c:3679

1631 #, c-format

1687 -msgid "branch '%s' has no remote for pushing"

1688 -msgstr "分支 '%s' 没有设置要推送的远程服务器"

1632 +msgid "Failed to parse --submodule option parameter: '%s'"

1633 +msgstr "无法解析 --submodule 选项的参数：'%s'"

1634

1690 -#: remote.c:1736

1635 +#: diff.c:4700

1636 +msgid "inexact rename detection was skipped due to too many files."

1637 +msgstr "因为文件太多，略过不严格的重命名检查。"

1638 +

1639 +#: diff.c:4703

1640 +msgid "only found copies from modified paths due to too many files."

1641 +msgstr "因为文件太多，只在修改的路径中查找拷贝。"

1642 +

1643 +#: diff.c:4706

1644 #, c-format

1692 -msgid "push refspecs for '%s' do not include '%s'"

1693 -msgstr "向 '%s' 推送引用规格未包含 '%s'"

1645 +msgid ""

1646 +"you may want to set your %s variable to at least %d and retry the command."

1647 +msgstr "您可能想要将您的 %s 变量至少设置为 %d 并重复此命令。"

1648

1695 -#: remote.c:1749

1696 -msgid "push has no destination (push.default is 'nothing')"

1697 -msgstr "推送无目标（push.default 是 'nothing'）"

1649 +#: dir.c:1866

1650 +msgid "failed to get kernel name and information"

1651 +msgstr "无法获得内核名称和信息"

1652

1699 -#: remote.c:1771

1700 -msgid "cannot resolve 'simple' push to a single destination"

1701 -msgstr "无法解析 'simple' 推送至一个单独的目标"

1653 +#: dir.c:1985

1654 +msgid "Untracked cache is disabled on this system or location."

1655 +msgstr "缓存未跟踪文件在本系统或位置中被禁用。"

1656

1703 -#: remote.c:2073

1657 +#: fetch-pack.c:213

1658 +msgid "git fetch-pack: expected shallow list"

1659 +msgstr "git fetch-pack：应为 shallow 列表"

1660 +

1661 +#: fetch-pack.c:225

1662 +msgid "git fetch-pack: expected ACK/NAK, got EOF"

1663 +msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF"

1664 +

1665 +#: fetch-pack.c:243

1666 #, c-format

1705 -msgid "Your branch is based on '%s', but the upstream is gone.\n"

1706 -msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"

1667 +msgid "git fetch_pack: expected ACK/NAK, got '%s'"

1668 +msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"

1669

1708 -#: remote.c:2077

1709 -msgid " (use \"git branch --unset-upstream\" to fixup)\n"

1710 -msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"

1670 +#: fetch-pack.c:295

1671 +msgid "--stateless-rpc requires multi_ack_detailed"

1672 +msgstr "--stateless-rpc 需要 multi_ack_detailed"

1673

1712 -#: remote.c:2080

1674 +#: fetch-pack.c:381

1675 #, c-format

1714 -msgid "Your branch is up-to-date with '%s'.\n"

1715 -msgstr "您的分支与上游分支 '%s' 一致。\n"

1676 +msgid "invalid shallow line: %s"

1677 +msgstr "无效的 shallow 信息：%s"

1678

1717 -#: remote.c:2084

1679 +#: fetch-pack.c:387

1680 #, c-format

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

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

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

1722 -msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"

1681 +msgid "invalid unshallow line: %s"

1682 +msgstr "无效的 unshallow 信息：%s"

1683

1724 -#: remote.c:2090

1725 -msgid " (use \"git push\" to publish your local commits)\n"

1726 -msgstr " （使用 \"git push\" 来发布您的本地提交）\n"

1684 +#: fetch-pack.c:389

1685 +#, c-format

1686 +msgid "object not found: %s"

1687 +msgstr "对象未找到：%s"

1688

1728 -#: remote.c:2093

1689 +#: fetch-pack.c:392

1690 #, c-format

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

1731 -msgid_plural ""

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

1733 -msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

1734 -msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

1735 -

1736 -# 译者：注意保持前导空格

1737 -#: remote.c:2101

1738 -msgid " (use \"git pull\" to update your local branch)\n"

1739 -msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"

1691 +msgid "error in object: %s"

1692 +msgstr "对象中出错：%s"

1693

1741 -#: remote.c:2104

1694 +#: fetch-pack.c:394

1695 #, c-format

1743 -msgid ""

1744 -"Your branch and '%s' have diverged,\n"

1745 -"and have %d and %d different commit each, respectively.\n"

1746 -msgid_plural ""

1747 -"Your branch and '%s' have diverged,\n"

1748 -"and have %d and %d different commits each, respectively.\n"

1749 -msgstr[0] ""

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

1751 -"并且分别有 %d 和 %d 处不同的提交。\n"

1752 -msgstr[1] ""

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

1754 -"并且分别有 %d 和 %d 处不同的提交。\n"

1696 +msgid "no shallow found: %s"

1697 +msgstr "未发现 shallow：%s"

1698

1756 -# 译者：注意保持前导空格

1757 -#: remote.c:2114

1758 -msgid " (use \"git pull\" to merge the remote branch into yours)\n"

1759 -msgstr " （使用 \"git pull\" 来合并远程分支）\n"

1699 +#: fetch-pack.c:397

1700 +#, c-format

1701 +msgid "expected shallow/unshallow, got %s"

1702 +msgstr "应为 shallow/unshallow，却得到 %s"

1703

1761 -#: revision.c:2132

1762 -msgid "your current branch appears to be broken"

1763 -msgstr "您的当前分支好像被损坏"

1704 +#: fetch-pack.c:436

1705 +#, c-format

1706 +msgid "got %s %d %s"

1707 +msgstr "得到 %s %d %s"

1708

1765 -#: revision.c:2135

1709 +#: fetch-pack.c:450

1710 #, c-format

1767 -msgid "your current branch '%s' does not have any commits yet"

1768 -msgstr "您的当前分支 '%s' 尚无任何提交"

1711 +msgid "invalid commit %s"

1712 +msgstr "无效提交 %s"

1713

1770 -#: revision.c:2329

1771 -msgid "--first-parent is incompatible with --bisect"

1772 -msgstr "--first-parent 与 --bisect 不兼容"

1714 +#: fetch-pack.c:483

1715 +msgid "giving up"

1716 +msgstr "放弃"

1717

1774 -#: run-command.c:92

1775 -msgid "open /dev/null failed"

1776 -msgstr "不能打开 /dev/null"

1718 +#: fetch-pack.c:493 progress.c:235

1719 +msgid "done"

1720 +msgstr "完成"

1721

1778 -#: run-command.c:94

1722 +#: fetch-pack.c:505

1723 #, c-format

1780 -msgid "dup2(%d,%d) failed"

1781 -msgstr "不能调用 dup2(%d,%d)"

1724 +msgid "got %s (%d) %s"

1725 +msgstr "得到 %s (%d) %s"

1726

1783 -#: send-pack.c:298

1784 -msgid "failed to sign the push certificate"

1785 -msgstr "无法为推送证书签名"

1727 +#: fetch-pack.c:551

1728 +#, c-format

1729 +msgid "Marking %s as complete"

1730 +msgstr "标记 %s 为完成"

1731

1787 -#: send-pack.c:411

1788 -msgid "the receiving end does not support --signed push"

1789 -msgstr "接收端不支持签名推送"

1732 +#: fetch-pack.c:697

1733 +#, c-format

1734 +msgid "already have %s (%s)"

1735 +msgstr "已经有 %s (%s)"

1736

1791 -#: send-pack.c:413

1792 -msgid ""

1793 -"not sending a push certificate since the receiving end does not support --"

1794 -"signed push"

1795 -msgstr "未发送推送证书，因为接收端不支持签名推送"

1737 +#: fetch-pack.c:735

1738 +msgid "fetch-pack: unable to fork off sideband demultiplexer"

1739 +msgstr "fetch-pack：无法派生 sideband 多路输出"

1740

1797 -#: send-pack.c:425

1798 -msgid "the receiving end does not support --atomic push"

1799 -msgstr "接收端不支持原子推送"

1741 +#: fetch-pack.c:743

1742 +msgid "protocol error: bad pack header"

1743 +msgstr "协议错误：坏的包头"

1744

1801 -#: send-pack.c:430

1802 -msgid "the receiving end does not support push options"

1803 -msgstr "接收端不支持推送选项"

1745 +#: fetch-pack.c:799

1746 +#, c-format

1747 +msgid "fetch-pack: unable to fork off %s"

1748 +msgstr "fetch-pack：无法派生进程 %s"

1749

1805 -#: sequencer.c:174

1806 -msgid ""

1807 -"after resolving the conflicts, mark the corrected paths\n"

1808 -"with 'git add <paths>' or 'git rm <paths>'"

1809 -msgstr ""

1810 -"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

1811 -"命令标记修正后的文件"

1750 +#: fetch-pack.c:815

1751 +#, c-format

1752 +msgid "%s failed"

1753 +msgstr "%s 失败"

1754

1813 -#: sequencer.c:177

1814 -msgid ""

1815 -"after resolving the conflicts, mark the corrected paths\n"

1816 -"with 'git add <paths>' or 'git rm <paths>'\n"

1817 -"and commit the result with 'git commit'"

1818 -msgstr ""

1819 -"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

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

1755 +#: fetch-pack.c:817

1756 +msgid "error in sideband demultiplexer"

1757 +msgstr "sideband 多路输出出错"

1758

1822 -#: sequencer.c:190 sequencer.c:841 sequencer.c:924

1823 -#, c-format

1824 -msgid "Could not write to %s"

1825 -msgstr "不能写入 %s"

1759 +#: fetch-pack.c:844

1760 +msgid "Server does not support shallow clients"

1761 +msgstr "服务器不支持 shalllow 客户端"

1762

1827 -#: sequencer.c:193 sequencer.c:843 sequencer.c:928

1828 -#, c-format

1829 -msgid "Error wrapping up %s."

1830 -msgstr "错误收尾 %s。"

1763 +#: fetch-pack.c:848

1764 +msgid "Server supports multi_ack_detailed"

1765 +msgstr "服务器支持 multi_ack_detailed"

1766

1832 -#: sequencer.c:208

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

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

1767 +#: fetch-pack.c:851

1768 +msgid "Server supports no-done"

1769 +msgstr "服务器支持 no-done"

1770

1836 -#: sequencer.c:210

1837 -msgid "Your local changes would be overwritten by revert."

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

1771 +#: fetch-pack.c:857

1772 +msgid "Server supports multi_ack"

1773 +msgstr "服务器支持 multi_ack"

1774

1840 -#: sequencer.c:213

1841 -msgid "Commit your changes or stash them to proceed."

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

1775 +#: fetch-pack.c:861

1776 +msgid "Server supports side-band-64k"

1777 +msgstr "服务器支持 side-band-64k"

1778

1844 -#: sequencer.c:228

1845 -#, c-format

1846 -msgid "%s: fast-forward"

1847 -msgstr "%s：快进"

1779 +#: fetch-pack.c:865

1780 +msgid "Server supports side-band"

1781 +msgstr "服务器支持 side-band"

1782

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

1850 -#: sequencer.c:303

1851 -#, c-format

1852 -msgid "%s: Unable to write new index file"

1853 -msgstr "%s：无法写入新索引文件"

1783 +#: fetch-pack.c:869

1784 +msgid "Server supports allow-tip-sha1-in-want"

1785 +msgstr "服务器支持 allow-tip-sha1-in-want"

1786

1855 -#: sequencer.c:321

1856 -msgid "Could not resolve HEAD commit\n"

1857 -msgstr "不能解析 HEAD 提交\n"

1787 +#: fetch-pack.c:873

1788 +msgid "Server supports allow-reachable-sha1-in-want"

1789 +msgstr "服务器支持 allow-reachable-sha1-in-want"

1790

1859 -#: sequencer.c:341

1860 -msgid "Unable to update cache tree\n"

1861 -msgstr "不能更新缓存\n"

1791 +#: fetch-pack.c:883

1792 +msgid "Server supports ofs-delta"

1793 +msgstr "服务器支持 ofs-delta"

1794

1863 -#: sequencer.c:393

1795 +#: fetch-pack.c:890

1796 #, c-format

1865 -msgid "Could not parse commit %s\n"

1866 -msgstr "不能解析提交 %s\n"

1797 +msgid "Server version is %.*s"

1798 +msgstr "服务器版本 %.*s"

1799

1868 -#: sequencer.c:398

1869 -#, c-format

1870 -msgid "Could not parse parent commit %s\n"

1871 -msgstr "不能解析父提交 %s\n"

1800 +#: fetch-pack.c:896

1801 +msgid "Server does not support --shallow-since"

1802 +msgstr "服务器不支持 --shallow-since"

1803

1873 -#: sequencer.c:463

1874 -msgid "Your index file is unmerged."

1875 -msgstr "您的索引文件未完成合并。"

1804 +#: fetch-pack.c:900

1805 +msgid "Server does not support --shallow-exclude"

1806 +msgstr "服务器不支持 --shallow-exclude"

1807

1877 -#: sequencer.c:482

1878 -#, c-format

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

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

1808 +#: fetch-pack.c:902

1809 +msgid "Server does not support --deepen"

1810 +msgstr "服务器不支持 --deepen"

1811

1882 -#: sequencer.c:490

1883 -#, c-format

1884 -msgid "Commit %s does not have parent %d"

1885 -msgstr "提交 %s 没有父提交 %d"

1812 +#: fetch-pack.c:913

1813 +msgid "no common commits"

1814 +msgstr "没有共同的提交"

1815

1887 -#: sequencer.c:494

1888 -#, c-format

1889 -msgid "Mainline was specified but commit %s is not a merge."

1890 -msgstr "指定了主线但提交 %s 不是一个合并。"

1816 +#: fetch-pack.c:925

1817 +msgid "git fetch-pack: fetch failed."

1818 +msgstr "git fetch-pack：获取失败。"

1819

1892 -#. TRANSLATORS: The first %s will be "revert" or

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

1894 -#: sequencer.c:507

1895 -#, c-format

1896 -msgid "%s: cannot parse parent commit %s"

1897 -msgstr "%s：不能解析父提交 %s"

1820 +#: fetch-pack.c:1087

1821 +msgid "no matching remote head"

1822 +msgstr "没有匹配的远程分支"

1823

1899 -#: sequencer.c:511

1900 -#, c-format

1901 -msgid "Cannot get commit message for %s"

1902 -msgstr "不能得到 %s 的提交说明"

1824 +#: gpg-interface.c:185

1825 +msgid "gpg failed to sign the data"

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

1827

1904 -#: sequencer.c:597

1905 -#, c-format

1906 -msgid "could not revert %s... %s"

1907 -msgstr "不能还原 %s... %s"

1828 +#: gpg-interface.c:215

1829 +msgid "could not create temporary file"

1830 +msgstr "不能创建临时文件"

1831

1909 -#: sequencer.c:598

1832 +#: gpg-interface.c:217

1833 #, c-format

1911 -msgid "could not apply %s... %s"

1912 -msgstr "不能应用 %s... %s"

1913 -

1914 -#: sequencer.c:633

1915 -msgid "empty commit set passed"

1916 -msgstr "提供了空的提交集"

1834 +msgid "failed writing detached signature to '%s'"

1835 +msgstr "无法将分离式签名写入 '%s'"

1836

1918 -#: sequencer.c:641

1837 +#: grep.c:1782

1838 #, c-format

1920 -msgid "git %s: failed to read the index"

1921 -msgstr "git %s：无法读取索引"

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

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

1841

1923 -#: sequencer.c:645

1842 +#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155

1843 #, c-format

1925 -msgid "git %s: failed to refresh the index"

1926 -msgstr "git %s：无法刷新索引"

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

1845 +msgstr "无法枚举 '%s' 状态"

1846

1928 -#: sequencer.c:705

1929 -msgid "Cannot revert during another revert."

1930 -msgstr "不能在回退中执行另一回退。"

1847 +#: grep.c:1810

1848 +#, c-format

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

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

1851

1932 -#: sequencer.c:706

1933 -msgid "Cannot revert during a cherry-pick."

1934 -msgstr "不能在拣选中执行回退。"

1852 +#: help.c:203

1853 +#, c-format

1854 +msgid "available git commands in '%s'"

1855 +msgstr "在 '%s' 下可用的 git 命令"

1856

1936 -#: sequencer.c:709

1937 -msgid "Cannot cherry-pick during a revert."

1938 -msgstr "不能在回退中执行拣选。"

1857 +#: help.c:210

1858 +msgid "git commands available from elsewhere on your $PATH"

1859 +msgstr "在 $PATH 路径中的其他地方可用的 git 命令"

1860

1940 -#: sequencer.c:710

1941 -msgid "Cannot cherry-pick during another cherry-pick."

1942 -msgstr "不能在拣选过程中执行另一拣选。"

1861 +#: help.c:241

1862 +msgid "These are common Git commands used in various situations:"

1863 +msgstr "这些是各种场合常见的 Git 命令："

1864

1944 -#: sequencer.c:732

1865 +#: help.c:306

1866 #, c-format

1946 -msgid "Could not parse line %d."

1947 -msgstr "不能解析第 %d 行。"

1867 +msgid ""

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

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

1870 +msgstr ""

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

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

1873

1949 -#: sequencer.c:737

1950 -msgid "No commits parsed."

1951 -msgstr "没有提交被解析。"

1874 +#: help.c:361

1875 +msgid "Uh oh. Your system reports no Git commands at all."

1876 +msgstr "唉呀，您的系统中未发现 Git 命令。"

1877

1953 -#: sequencer.c:749

1878 +#: help.c:383

1879 #, c-format

1955 -msgid "Could not open %s"

1956 -msgstr "不能打开 %s"

1880 +msgid ""

1881 +"WARNING: You called a Git command named '%s', which does not exist.\n"

1882 +"Continuing under the assumption that you meant '%s'"

1883 +msgstr ""

1884 +"警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n"

1885 +"是 '%s'"

1886

1958 -#: sequencer.c:753

1887 +#: help.c:388

1888 #, c-format

1960 -msgid "Could not read %s."

1961 -msgstr "不能读取 %s。"

1889 +msgid "in %0.1f seconds automatically..."

1890 +msgstr "在 %0.1f 秒钟后自动运行..."

1891

1963 -#: sequencer.c:760

1892 +#: help.c:395

1893 #, c-format

1965 -msgid "Unusable instruction sheet: %s"

1966 -msgstr "无用的指令表单：%s"

1894 +msgid "git: '%s' is not a git command. See 'git --help'."

1895 +msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"

1896

1968 -#: sequencer.c:790

1969 -#, c-format

1970 -msgid "Invalid key: %s"

1971 -msgstr "无效键名：%s"

1897 +#: help.c:399 help.c:465

1898 +msgid ""

1899 +"\n"

1900 +"Did you mean this?"

1901 +msgid_plural ""

1902 +"\n"

1903 +"Did you mean one of these?"

1904 +msgstr[0] ""

1905 +"\n"

1906 +"您指的是这个么？"

1907 +msgstr[1] ""

1908 +"\n"

1909 +"您指的是这其中的某一个么？"

1910

1973 -#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52

1911 +#: help.c:461

1912 #, c-format

1975 -msgid "Invalid value for %s: %s"

1976 -msgstr "%s 的值无效：%s"

1913 +msgid "%s: %s - %s"

1914 +msgstr "%s：%s - %s"

1915 +

1916 +#: ident.c:334

1917 +msgid ""

1918 +"\n"

1919 +"*** Please tell me who you are.\n"

1920 +"\n"

1921 +"Run\n"

1922 +"\n"

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

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

1925 +"\n"

1926 +"to set your account's default identity.\n"

1927 +"Omit --global to set the identity only in this repository.\n"

1928 +"\n"

1929 +msgstr ""

1930 +"\n"

1931 +"*** 请告诉我你是谁。\n"

1932 +"\n"

1933 +"运行\n"

1934 +"\n"

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

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

1937 +"\n"

1938 +"来设置您账号的缺省身份标识。\n"

1939 +"如果仅在本仓库设置身份标识，则省略 --global 参数。\n"

1940

1978 -#: sequencer.c:803

1941 +#: lockfile.c:152

1942 #, c-format

1980 -msgid "Malformed options sheet: %s"

1981 -msgstr "非法的选项表单：%s"

1943 +msgid ""

1944 +"Unable to create '%s.lock': %s.\n"

1945 +"\n"

1946 +"Another git process seems to be running in this repository, e.g.\n"

1947 +"an editor opened by 'git commit'. Please make sure all processes\n"

1948 +"are terminated then try again. If it still fails, a git process\n"

1949 +"may have crashed in this repository earlier:\n"

1950 +"remove the file manually to continue."

1951 +msgstr ""

1952 +"无法创建 '%s.lock'：%s。\n"

1953 +"\n"

1954 +"似乎另外一个 git 进程在这个仓库中运行，例如：'git commit' 命令打\n"

1955 +"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错，\n"

1956 +"可能之前有一个 git 进程在这个仓库中异常退出：\n"

1957 +"手动删除这个文件再继续。"

1958

1983 -#: sequencer.c:822

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

1985 -msgstr "一个拣选或还原操作已在进行"

1959 +#: lockfile.c:160

1960 +#, c-format

1961 +msgid "Unable to create '%s.lock': %s"

1962 +msgstr "不能创建 '%s.lock'：%s"

1963

1987 -#: sequencer.c:823

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

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

1964 +#: merge.c:41

1965 +msgid "failed to read the cache"

1966 +msgstr "无法读取缓存"

1967

1991 -#: sequencer.c:827

1992 -#, c-format

1993 -msgid "Could not create sequencer directory %s"

1994 -msgstr "不能创建序列目录 %s"

1968 +#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374

1969 +#: builtin/checkout.c:588 builtin/clone.c:731

1970 +msgid "unable to write new index file"

1971 +msgstr "无法写新的索引文件"

1972

1996 -#: sequencer.c:862 sequencer.c:998

1997 -msgid "no cherry-pick or revert in progress"

1998 -msgstr "拣选或还原操作并未进行"

1973 +#: merge-recursive.c:209

1974 +msgid "(bad commit)\n"

1975 +msgstr "（坏提交）\n"

1976

2000 -#: sequencer.c:864

2001 -msgid "cannot resolve HEAD"

2002 -msgstr "不能解析 HEAD"

1977 +#: merge-recursive.c:231

1978 +#, c-format

1979 +msgid "addinfo_cache failed for path '%s'"

1980 +msgstr "为路径 '%s' addinfo_cache 失败"

1981

2004 -#: sequencer.c:866 sequencer.c:900

2005 -msgid "cannot abort from a branch yet to be born"

2006 -msgstr "不能从尚未建立的分支终止"

1982 +#: merge-recursive.c:301

1983 +msgid "error building trees"

1984 +msgstr "无法创建树"

1985

2008 -#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970

1986 +#: merge-recursive.c:720

1987 #, c-format

2010 -msgid "cannot open %s"

2011 -msgstr "不能打开 %s"

1988 +msgid "failed to create path '%s'%s"

1989 +msgstr "无法创建路径 '%s'%s"

1990

2013 -#: sequencer.c:888

1991 +#: merge-recursive.c:731

1992 #, c-format

2015 -msgid "cannot read %s: %s"

2016 -msgstr "不能读取 %s：%s"

1993 +msgid "Removing %s to make room for subdirectory\n"

1994 +msgstr "删除 %s 以便为子目录留出空间\n"

1995

2018 -#: sequencer.c:889

2019 -msgid "unexpected end of file"

2020 -msgstr "意外的文件结束"

1996 +#: merge-recursive.c:745 merge-recursive.c:764

1997 +msgid ": perhaps a D/F conflict?"

1998 +msgstr "：可能是一个目录/文件冲突？"

1999

2022 -#: sequencer.c:895

2000 +#: merge-recursive.c:754

2001 #, c-format

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

2025 -msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"

2002 +msgid "refusing to lose untracked file at '%s'"

2003 +msgstr "拒绝丢弃 '%s' 中的未跟踪文件"

2004

2027 -#: sequencer.c:921

2005 +#: merge-recursive.c:796 builtin/cat-file.c:34

2006 #, c-format

2029 -msgid "Could not format %s."

2030 -msgstr "不能格式化 %s。"

2007 +msgid "cannot read object %s '%s'"

2008 +msgstr "不能读取对象 %s '%s'"

2009

2032 -#: sequencer.c:1066

2010 +#: merge-recursive.c:798

2011 #, c-format

2034 -msgid "%s: can't cherry-pick a %s"

2035 -msgstr "%s：不能拣选一个%s"

2012 +msgid "blob expected for %s '%s'"

2013 +msgstr "%s '%s' 应为数据对象"

2014

2037 -#: sequencer.c:1069

2015 +#: merge-recursive.c:822

2016 #, c-format

2039 -msgid "%s: bad revision"

2040 -msgstr "%s：错误的版本"

2017 +msgid "failed to open '%s': %s"

2018 +msgstr "无法打开 '%s'：%s"

2019

2042 -#: sequencer.c:1102

2043 -msgid "Can't revert as initial commit"

2044 -msgstr "不能作为初始提交还原"

2020 +#: merge-recursive.c:833

2021 +#, c-format

2022 +msgid "failed to symlink '%s': %s"

2023 +msgstr "无法创建符号链接 '%s'：%s"

2024

2046 -#: setup.c:160

2025 +#: merge-recursive.c:838

2026 #, c-format

2048 -msgid ""

2049 -"%s: no such path in the working tree.\n"

2050 -"Use 'git <command> -- <path>...' to specify paths that do not exist locally."

2051 -msgstr ""

2052 -"%s：工作区中无此路径。\n"

2053 -"使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"

2027 +msgid "do not know what to do with %06o %s '%s'"

2028 +msgstr "不知道如何处理 %06o %s '%s'"

2029

2055 -#: setup.c:173

2030 +#: merge-recursive.c:978

2031 +msgid "Failed to execute internal merge"

2032 +msgstr "无法执行内部合并"

2033 +

2034 +#: merge-recursive.c:982

2035 #, c-format

2057 -msgid ""

2058 -"ambiguous argument '%s': unknown revision or path not in the working tree.\n"

2059 -"Use '--' to separate paths from revisions, like this:\n"

2060 -"'git <command> [<revision>...] -- [<file>...]'"

2061 -msgstr ""

2062 -"有歧义的参数 '%s'：未知的版本或路径不存在于工作区中。\n"

2063 -"使用 '--' 来分隔版本和路径，例如：\n"

2064 -"'git <command> [<revision>...] -- [<file>...]'"

2036 +msgid "Unable to add %s to database"

2037 +msgstr "不能添加 %s 至对象库"

2038

2066 -#: setup.c:223

2039 +#: merge-recursive.c:1081 merge-recursive.c:1095

2040 #, c-format

2041 msgid ""

2069 -"ambiguous argument '%s': both revision and filename\n"

2070 -"Use '--' to separate paths from revisions, like this:\n"

2071 -"'git <command> [<revision>...] -- [<file>...]'"

2042 +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

2043 +"in tree."

2044 msgstr ""

2073 -"有歧义的参数 '%s'：可同时是版本和文件\n"

2074 -"使用 '--' 来分隔版本和路径，例如：\n"

2075 -"'git <command> [<revision>...] -- [<file>...]'"

2045 +"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"

2046 +"的版本被保留。"

2047

2077 -#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419

2048 +#: merge-recursive.c:1087 merge-recursive.c:1100

2049 #, c-format

2079 -msgid "failed to read %s"

2080 -msgstr "无法读取 %s"

2050 +msgid ""

2051 +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

2052 +"in tree at %s."

2053 +msgstr ""

2054 +"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"

2055 +"的版本保留于 %8$s 中。"

2056

2082 -#: setup.c:468

2083 -#, c-format

2084 -msgid "Expected git repo version <= %d, found %d"

2085 -msgstr "期望 git 仓库版本 <= %d，却得到 %d"

2057 +#: merge-recursive.c:1143

2058 +msgid "rename"

2059 +msgstr "重命名"

2060

2087 -#: setup.c:476

2088 -msgid "unknown repository extensions found:"

2089 -msgstr "发现未知的仓库扩展："

2061 +#: merge-recursive.c:1143

2062 +msgid "renamed"

2063 +msgstr "重命名"

2064

2091 -#: setup.c:762

2065 +#: merge-recursive.c:1200

2066 #, c-format

2093 -msgid "Not a git repository (or any of the parent directories): %s"

2094 -msgstr "不是一个 git 仓库（或者任何父目录）：%s"

2095 -

2096 -#: setup.c:764 setup.c:915 builtin/index-pack.c:1641

2097 -msgid "Cannot come back to cwd"

2098 -msgstr "无法返回当前工作目录"

2099 -

2100 -#: setup.c:845

2101 -msgid "Unable to read current working directory"

2102 -msgstr "不能读取当前工作目录"

2067 +msgid "%s is a directory in %s adding as %s instead"

2068 +msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"

2069

2104 -#: setup.c:920

2070 +#: merge-recursive.c:1225

2071 #, c-format

2072 msgid ""

2107 -"Not a git repository (or any parent up to mount point %s)\n"

2108 -"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

2073 +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

2074 +"\"->\"%s\" in \"%s\"%s"

2075 msgstr ""

2110 -"不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n"

2111 -"停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"

2076 +"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "

2077 +"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"

2078

2113 -#: setup.c:927

2114 -#, c-format

2115 -msgid "Cannot change to '%s/..'"

2116 -msgstr "不能切换到 '%s/..'"

2079 +#: merge-recursive.c:1230

2080 +msgid " (left unresolved)"

2081 +msgstr "（留下未解决）"

2082

2118 -#: setup.c:989

2083 +#: merge-recursive.c:1292

2084 #, c-format

2120 -msgid ""

2121 -"Problem with core.sharedRepository filemode value (0%.3o).\n"

2122 -"The owner of files must always have read and write permissions."

2085 +msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

2086 msgstr ""

2124 -"参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n"

2125 -"文件属主必须始终拥有读写权限。"

2126 -

2127 -#: sha1_file.c:1046

2128 -msgid "offset before end of packfile (broken .idx?)"

2129 -msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

2087 +"冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"

2088 +"%5$s"

2089

2131 -#: sha1_file.c:2434

2090 +#: merge-recursive.c:1325

2091 #, c-format

2133 -msgid "offset before start of pack index for %s (corrupt index?)"

2134 -msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

2092 +msgid "Renaming %s to %s and %s to %s instead"

2093 +msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"

2094

2136 -#: sha1_file.c:2438

2095 +#: merge-recursive.c:1531

2096 #, c-format

2138 -msgid "offset beyond end of pack index for %s (truncated index?)"

2139 -msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

2140 -

2141 -#: sha1_name.c:462

2142 -msgid ""

2143 -"Git normally never creates a ref that ends with 40 hex characters\n"

2144 -"because it will be ignored when you just specify 40-hex. These refs\n"

2145 -"may be created by mistake. For example,\n"

2146 -"\n"

2147 -" git checkout -b $br $(git rev-parse ...)\n"

2148 -"\n"

2149 -"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"

2150 -"examine these refs and maybe delete them. Turn this message off by\n"

2151 -"running \"git config advice.objectNameWarning false\""

2152 -msgstr ""

2153 -"Git 通常不会创建一个以40位十六进制字符命名的引用，因为当你提供40位\n"

2154 -"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n"

2155 -"\n"

2156 -" git checkout -b $br $(git rev-parse ...)\n"

2157 -"\n"

2158 -"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n"

2159 -"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"

2160 -"命令关闭本消息通知。"

2097 +msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

2098 +msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"

2099

2162 -#: submodule.c:64 submodule.c:98

2163 -msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

2164 -msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"

2100 +#: merge-recursive.c:1546

2101 +#, c-format

2102 +msgid "Adding merged %s"

2103 +msgstr "添加合并后的 %s"

2104

2166 -#: submodule.c:68 submodule.c:102

2105 +#: merge-recursive.c:1553 merge-recursive.c:1766

2106 #, c-format

2168 -msgid "Could not find section in .gitmodules where path=%s"

2169 -msgstr "无法在 .gitmodules 中找到 path=%s 的小节"

2107 +msgid "Adding as %s instead"

2108 +msgstr "而是以 %s 为名添加"

2109

2171 -#: submodule.c:76

2110 +#: merge-recursive.c:1610

2111 #, c-format

2173 -msgid "Could not update .gitmodules entry %s"

2174 -msgstr "不能更新 .gitmodules 条目 %s"

2112 +msgid "cannot read object %s"

2113 +msgstr "不能读取对象 %s"

2114

2176 -#: submodule.c:109

2115 +#: merge-recursive.c:1613

2116 #, c-format

2178 -msgid "Could not remove .gitmodules entry for %s"

2179 -msgstr "无法移除 %s 的 .gitmodules 条目"

2117 +msgid "object %s is not a blob"

2118 +msgstr "对象 %s 不是一个数据对象"

2119

2181 -#: submodule.c:120

2182 -msgid "staging updated .gitmodules failed"

2183 -msgstr "将更新后 .gitmodules 添加暂存区失败"

2120 +#: merge-recursive.c:1666

2121 +msgid "modify"

2122 +msgstr "修改"

2123

2185 -#: submodule.c:177

2186 -msgid "negative values not allowed for submodule.fetchJobs"

2187 -msgstr "submodule.fetchJobs 不允许为负值"

2124 +#: merge-recursive.c:1666

2125 +msgid "modified"

2126 +msgstr "修改"

2127

2189 -#: submodule-config.c:358

2190 -#, c-format

2191 -msgid "invalid value for %s"

2192 -msgstr "%s 的值无效"

2128 +#: merge-recursive.c:1676

2129 +msgid "content"

2130 +msgstr "内容"

2131

2194 -#: trailer.c:237

2195 -#, c-format

2196 -msgid "running trailer command '%s' failed"

2197 -msgstr "执行 trailer 命令 '%s' 失败"

2132 +#: merge-recursive.c:1683

2133 +msgid "add/add"

2134 +msgstr "添加/添加"

2135

2199 -#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558

2200 -#: trailer.c:562

2136 +#: merge-recursive.c:1718

2137 #, c-format

2202 -msgid "unknown value '%s' for key '%s'"

2203 -msgstr "键 '%2$s' 的未知取值 '%1$s'"

2138 +msgid "Skipped %s (merged same as existing)"

2139 +msgstr "略过 %s（已经做过相同合并）"

2140

2205 -#: trailer.c:544 trailer.c:549 builtin/remote.c:289

2141 +#: merge-recursive.c:1732

2142 #, c-format

2207 -msgid "more than one %s"

2208 -msgstr "多于一个 %s"

2143 +msgid "Auto-merging %s"

2144 +msgstr "自动合并 %s"

2145

2210 -#: trailer.c:582

2146 +#: merge-recursive.c:1736 git-submodule.sh:924

2147 +msgid "submodule"

2148 +msgstr "子模组"

2149 +

2150 +#: merge-recursive.c:1737

2151 #, c-format

2212 -msgid "empty trailer token in trailer '%.*s'"

2213 -msgstr "签名 '%.*s' 的键为空"

2152 +msgid "CONFLICT (%s): Merge conflict in %s"

2153 +msgstr "冲突（%s）：合并冲突于 %s"

2154

2215 -#: trailer.c:702

2155 +#: merge-recursive.c:1831

2156 #, c-format

2217 -msgid "could not read input file '%s'"

2218 -msgstr "不能读取输入文件 '%s'"

2157 +msgid "Removing %s"

2158 +msgstr "删除 %s"

2159

2220 -#: trailer.c:705

2221 -msgid "could not read from stdin"

2222 -msgstr "不能自标准输入读取"

2160 +#: merge-recursive.c:1857

2161 +msgid "file/directory"

2162 +msgstr "文件/目录"

2163

2224 -#: trailer.c:857 builtin/am.c:42

2225 -#, c-format

2226 -msgid "could not stat %s"

2227 -msgstr "不能获取 %s 的文件状态"

2164 +#: merge-recursive.c:1863

2165 +msgid "directory/file"

2166 +msgstr "目录/文件"

2167

2229 -#: trailer.c:859

2168 +#: merge-recursive.c:1868

2169 #, c-format

2231 -msgid "file %s is not a regular file"

2232 -msgstr "文件 %s 不是一个正规文件"

2170 +msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

2171 +msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"

2172

2234 -#: trailer.c:861

2173 +#: merge-recursive.c:1877

2174 #, c-format

2236 -msgid "file %s is not writable by user"

2237 -msgstr "文件 %s 用户不可写"

2175 +msgid "Adding %s"

2176 +msgstr "添加 %s"

2177

2239 -#: trailer.c:873

2240 -msgid "could not open temporary file"

2241 -msgstr "不能打开临时文件"

2178 +#: merge-recursive.c:1914

2179 +msgid "Already up-to-date!"

2180 +msgstr "已经是最新的！"

2181

2243 -#: trailer.c:912

2182 +#: merge-recursive.c:1923

2183 #, c-format

2245 -msgid "could not rename temporary file to %s"

2246 -msgstr "不能重命名临时文件为 %s"

2184 +msgid "merging of trees %s and %s failed"

2185 +msgstr "无法合并树 %s 和 %s"

2186

2248 -#: transport.c:62

2249 -#, c-format

2250 -msgid "Would set upstream of '%s' to '%s' of '%s'\n"

2251 -msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"

2187 +#: merge-recursive.c:2006

2188 +msgid "Merging:"

2189 +msgstr "合并："

2190

2253 -#: transport.c:151

2191 +#: merge-recursive.c:2019

2192 #, c-format

2255 -msgid "transport: invalid depth option '%s'"

2256 -msgstr "传输：无效的深度选项 '%s'"

2257 -

2258 -#: transport.c:771

2193 +msgid "found %u common ancestor:"

2194 +msgid_plural "found %u common ancestors:"

2195 +msgstr[0] "发现 %u 个共同祖先："

2196 +msgstr[1] "发现 %u 个共同祖先："

2197 +

2198 +#: merge-recursive.c:2058

2199 +msgid "merge returned no commit"

2200 +msgstr "合并未返回提交"

2201 +

2202 +#: merge-recursive.c:2121

2203 #, c-format

2260 -msgid ""

2261 -"The following submodule paths contain changes that can\n"

2262 -"not be found on any remote:\n"

2263 -msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"

2204 +msgid "Could not parse object '%s'"

2205 +msgstr "不能解析对象 '%s'"

2206

2265 -#: transport.c:775

2207 +#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788

2208 +msgid "Unable to write index."

2209 +msgstr "不能写入索引。"

2210 +

2211 +#: notes-merge.c:273

2212 #, c-format

2213 msgid ""

2268 -"\n"

2269 -"Please try\n"

2270 -"\n"

2271 -"\tgit push --recurse-submodules=on-demand\n"

2272 -"\n"

2273 -"or cd to the path and use\n"

2274 -"\n"

2275 -"\tgit push\n"

2276 -"\n"

2277 -"to push them to a remote.\n"

2278 -"\n"

2214 +"You have not concluded your previous notes merge (%s exists).\n"

2215 +"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "

2216 +"commit/abort the previous merge before you start a new notes merge."

2217 msgstr ""

2280 -"\n"

2281 -"请尝试\n"

2282 -"\n"

2283 -"\tgit push --recurse-submodules=on-demand\n"

2284 -"\n"

2285 -"或者进入到子目录执行\n"

2286 -"\n"

2287 -"\tgit push\n"

2288 -"\n"

2289 -"以推送至远程。\n"

2290 -"\n"

2218 +"您尚未结束您前一次注释合并（存在 %s）。\n"

2219 +"请您在开始一个新的注释合并之前，使用 'git notes merge --commit' 或者 "

2220 +"'git notes merge --abort' 来提交/终止前一次合并。"

2221

2292 -#: transport.c:783

2293 -msgid "Aborting."

2294 -msgstr "正在终止。"

2222 +#: notes-merge.c:280

2223 +#, c-format

2224 +msgid "You have not concluded your notes merge (%s exists)."

2225 +msgstr "您尚未结束注释合并（存在 %s）。"

2226 +

2227 +#: notes-utils.c:41

2228 +msgid "Cannot commit uninitialized/unreferenced notes tree"

2229 +msgstr "不能提交未初始化/未引用的注解树"

2230

2296 -#: transport-helper.c:1041

2231 +#: notes-utils.c:100

2232 #, c-format

2298 -msgid "Could not read ref %s"

2299 -msgstr "不能读取引用 %s"

2233 +msgid "Bad notes.rewriteMode value: '%s'"

2234 +msgstr "坏的 notes.rewriteMode 值：'%s'"

2235

2301 -#: unpack-trees.c:64

2236 +#: notes-utils.c:110

2237 #, c-format

2303 -msgid ""

2304 -"Your local changes to the following files would be overwritten by checkout:\n"

2305 -"%%sPlease commit your changes or stash them before you switch branches."

2306 -msgstr ""

2307 -"您对下列文件的本地修改将被检出操作覆盖：\n"

2308 -"%%s请在切换分支前提交您的修改或者保存进度。"

2238 +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

2239 +msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

2240

2310 -#: unpack-trees.c:66

2241 +#. TRANSLATORS: The first %s is the name of the

2242 +#. environment variable, the second %s is its value

2243 +#: notes-utils.c:137

2244 #, c-format

2312 -msgid ""

2313 -"Your local changes to the following files would be overwritten by checkout:\n"

2314 -"%%s"

2315 -msgstr ""

2316 -"您对下列文件的本地修改将被检出操作覆盖：\n"

2317 -"%%s"

2245 +msgid "Bad %s value: '%s'"

2246 +msgstr "坏的 %s 值：'%s'"

2247

2319 -#: unpack-trees.c:69

2248 +#: object.c:242

2249 #, c-format

2321 -msgid ""

2322 -"Your local changes to the following files would be overwritten by merge:\n"

2323 -"%%sPlease commit your changes or stash them before you merge."

2324 -msgstr ""

2325 -"您对下列文件的本地修改将被合并操作覆盖：\n"

2326 -"%%s请在合并前提交您的修改或者保存进度。"

2250 +msgid "unable to parse object: %s"

2251 +msgstr "不能解析对象：%s"

2252

2328 -#: unpack-trees.c:71

2253 +#: parse-options.c:572

2254 +msgid "..."

2255 +msgstr "..."

2256 +

2257 +#: parse-options.c:590

2258 #, c-format

2330 -msgid ""

2331 -"Your local changes to the following files would be overwritten by merge:\n"

2332 -"%%s"

2333 -msgstr ""

2334 -"您对下列文件的本地修改将被合并操作覆盖：\n"

2335 -"%%s"

2259 +msgid "usage: %s"

2260 +msgstr "用法：%s"

2261

2337 -#: unpack-trees.c:74

2262 +#. TRANSLATORS: the colon here should align with the

2263 +#. one in "usage: %s" translation

2264 +#: parse-options.c:594

2265 #, c-format

2339 -msgid ""

2340 -"Your local changes to the following files would be overwritten by %s:\n"

2341 -"%%sPlease commit your changes or stash them before you %s."

2342 -msgstr ""

2343 -"您对下列文件的本地修改将被 %s 覆盖：\n"

2344 -"%%s请在 %s 之前提交您的修改或者保存进度。"

2266 +msgid " or: %s"

2267 +msgstr " 或：%s"

2268

2346 -#: unpack-trees.c:76

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

2270 +#: parse-options.c:597

2271 #, c-format

2348 -msgid ""

2349 -"Your local changes to the following files would be overwritten by %s:\n"

2350 -"%%s"

2351 -msgstr ""

2352 -"您对下列文件的本地修改将被 %s 覆盖：\n"

2353 -"%%s"

2272 +msgid " %s"

2273 +msgstr " %s"

2274

2355 -#: unpack-trees.c:81

2275 +#: parse-options.c:631

2276 +msgid "-NUM"

2277 +msgstr "-数字"

2278 +

2279 +#: parse-options-cb.c:108

2280 #, c-format

2357 -msgid ""

2358 -"Updating the following directories would lose untracked files in it:\n"

2359 -"%s"

2360 -msgstr ""

2361 -"更新如下目录将会丢失其中未跟踪的文件：\n"

2362 -"%s"

2281 +msgid "malformed object name '%s'"

2282 +msgstr "非法的对象名 '%s'"

2283

2364 -#: unpack-trees.c:85

2284 +#: path.c:826

2285 #, c-format

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

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

2288 +

2289 +#: pathspec.c:133

2290 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

2291 +msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"

2292 +

2293 +#: pathspec.c:143

2294 msgid ""

2367 -"The following untracked working tree files would be removed by checkout:\n"

2368 -"%%sPlease move or remove them before you switch branches."

2369 -msgstr ""

2370 -"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"

2371 -"%%s请在切换分支之前移动或删除。"

2295 +"global 'literal' pathspec setting is incompatible with all other global "

2296 +"pathspec settings"

2297 +msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"

2298

2373 -#: unpack-trees.c:87

2299 +#: pathspec.c:177

2300 +msgid "invalid parameter for pathspec magic 'prefix'"

2301 +msgstr "路径规格包含无效的神奇前缀"

2302 +

2303 +#: pathspec.c:183

2304 #, c-format

2375 -msgid ""

2376 -"The following untracked working tree files would be removed by checkout:\n"

2377 -"%%s"

2378 -msgstr ""

2379 -"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"

2380 -"%%s"

2305 +msgid "Invalid pathspec magic '%.*s' in '%s'"

2306 +msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"

2307

2382 -#: unpack-trees.c:90

2308 +#: pathspec.c:187

2309 #, c-format

2384 -msgid ""

2385 -"The following untracked working tree files would be removed by merge:\n"

2386 -"%%sPlease move or remove them before you merge."

2387 -msgstr ""

2388 -"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"

2389 -"%%s请在合并前移动或删除。"

2310 +msgid "Missing ')' at the end of pathspec magic in '%s'"

2311 +msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"

2312

2391 -#: unpack-trees.c:92

2313 +#: pathspec.c:205

2314 #, c-format

2393 -msgid ""

2394 -"The following untracked working tree files would be removed by merge:\n"

2395 -"%%s"

2396 -msgstr ""

2397 -"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"

2398 -"%%s"

2315 +msgid "Unimplemented pathspec magic '%c' in '%s'"

2316 +msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"

2317

2400 -#: unpack-trees.c:95

2318 +#: pathspec.c:230

2319 #, c-format

2402 -msgid ""

2403 -"The following untracked working tree files would be removed by %s:\n"

2404 -"%%sPlease move or remove them before you %s."

2405 -msgstr ""

2406 -"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"

2407 -"%%s请在 %s 前移动或删除。"

2320 +msgid "%s: 'literal' and 'glob' are incompatible"

2321 +msgstr "%s：'literal' 和 'glob' 不兼容"

2322

2409 -#: unpack-trees.c:97

2323 +#: pathspec.c:241

2324 #, c-format

2411 -msgid ""

2412 -"The following untracked working tree files would be removed by %s:\n"

2413 -"%%s"

2414 -msgstr ""

2415 -"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"

2416 -"%%s"

2325 +msgid "%s: '%s' is outside repository"

2326 +msgstr "%s：'%s' 在仓库之外"

2327

2418 -#: unpack-trees.c:102

2328 +#: pathspec.c:291

2329 #, c-format

2420 -msgid ""

2421 -"The following untracked working tree files would be overwritten by "

2422 -"checkout:\n"

2423 -"%%sPlease move or remove them before you switch branches."

2424 -msgstr ""

2425 -"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"

2426 -"%%s请在切换分支前移动或删除。"

2330 +msgid "Pathspec '%s' is in submodule '%.*s'"

2331 +msgstr "路径规格 '%s' 在子模组 '%.*s' 中"

2332

2428 -#: unpack-trees.c:104

2333 +#: pathspec.c:353

2334 #, c-format

2335 +msgid "%s: pathspec magic not supported by this command: %s"

2336 +msgstr "%s：路径规格神奇前缀不被此命令支持：%s"

2337 +

2338 +#: pathspec.c:408

2339 msgid ""

2431 -"The following untracked working tree files would be overwritten by "

2432 -"checkout:\n"

2433 -"%%s"

2340 +"empty strings as pathspecs will be made invalid in upcoming releases. please "

2341 +"use . instead if you meant to match all paths"

2342 msgstr ""

2435 -"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"

2436 -"%%s"

2343 +"在即将到来的版本，不能再使用空字符串作为路径表达式。如果要匹配所有路径，\n"

2344 +"请代之以 ."

2345

2438 -#: unpack-trees.c:107

2346 +#: pathspec.c:440

2347 #, c-format

2348 +msgid "pathspec '%s' is beyond a symbolic link"

2349 +msgstr "路径规格 '%s' 位于符号链接中"

2350 +

2351 +#: pathspec.c:449

2352 msgid ""

2441 -"The following untracked working tree files would be overwritten by merge:\n"

2442 -"%%sPlease move or remove them before you merge."

2353 +"There is nothing to exclude from by :(exclude) patterns.\n"

2354 +"Perhaps you forgot to add either ':/' or '.' ?"

2355 msgstr ""

2444 -"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"

2445 -"%%s请在合并前移动或删除。"

2356 +"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"

2357 +"添加 ':/' 或 '.' ？"

2358

2447 -#: unpack-trees.c:109

2359 +#: pretty.c:971

2360 +msgid "unable to parse --pretty format"

2361 +msgstr "不能解析 --pretty 格式"

2362 +

2363 +#: read-cache.c:1315

2364 #, c-format

2365 msgid ""

2450 -"The following untracked working tree files would be overwritten by merge:\n"

2451 -"%%s"

2366 +"index.version set, but the value is invalid.\n"

2367 +"Using version %i"

2368 msgstr ""

2453 -"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"

2454 -"%%s"

2369 +"设置了 index.version，但是取值无效。\n"

2370 +"使用版本 %i"

2371

2456 -#: unpack-trees.c:112

2372 +#: read-cache.c:1325

2373 #, c-format

2374 msgid ""

2459 -"The following untracked working tree files would be overwritten by %s:\n"

2460 -"%%sPlease move or remove them before you %s."

2375 +"GIT_INDEX_VERSION set, but the value is invalid.\n"

2376 +"Using version %i"

2377 msgstr ""

2462 -"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"

2463 -"%%s请在 %s 前移动或删除。"

2378 +"设置了 GIT_INDEX_VERSION，但是取值无效。\n"

2379 +"使用版本 %i"

2380

2465 -#: unpack-trees.c:114

2381 +#: refs.c:576 builtin/merge.c:840

2382 #, c-format

2467 -msgid ""

2468 -"The following untracked working tree files would be overwritten by %s:\n"

2469 -"%%s"

2470 -msgstr ""

2471 -"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"

2472 -"%%s"

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

2384 +msgstr "无法打开 '%s' 进行写入"

2385

2474 -#: unpack-trees.c:121

2386 +#: refs/files-backend.c:2481

2387 #, c-format

2476 -msgid "Entry '%s' overlaps with '%s'. Cannot bind."

2477 -msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"

2388 +msgid "could not delete reference %s: %s"

2389 +msgstr "无法删除引用 %s：%s"

2390

2479 -#: unpack-trees.c:124

2391 +#: refs/files-backend.c:2484

2392 #, c-format

2481 -msgid ""

2482 -"Cannot update sparse checkout: the following entries are not up-to-date:\n"

2483 -"%s"

2484 -msgstr ""

2485 -"无法更新稀疏检出：如下条目不是最新：\n"

2486 -"%s"

2393 +msgid "could not delete references: %s"

2394 +msgstr "无法删除引用：%s"

2395

2488 -#: unpack-trees.c:126

2396 +#: refs/files-backend.c:2493

2397 #, c-format

2490 -msgid ""

2491 -"The following Working tree files would be overwritten by sparse checkout "

2492 -"update:\n"

2493 -"%s"

2494 -msgstr ""

2495 -"工作区中下列文件将会因为稀疏检出而被覆盖：\n"

2496 -"%s"

2398 +msgid "could not remove reference %s"

2399 +msgstr "无法删除引用 %s"

2400

2498 -#: unpack-trees.c:128

2401 +#: ref-filter.c:55

2402 #, c-format

2500 -msgid ""

2501 -"The following Working tree files would be removed by sparse checkout "

2502 -"update:\n"

2503 -"%s"

2504 -msgstr ""

2505 -"工作区中下列文件将会因为稀疏检出而被删除：\n"

2506 -"%s"

2403 +msgid "expected format: %%(color:<color>)"

2404 +msgstr "期望的格式：%%(color:<color>)"

2405

2508 -#: unpack-trees.c:205

2406 +#: ref-filter.c:57

2407 #, c-format

2510 -msgid "Aborting\n"

2511 -msgstr "终止中\n"

2512 -

2513 -#: unpack-trees.c:237

2514 -msgid "Checking out files"

2515 -msgstr "正在检出文件"

2408 +msgid "unrecognized color: %%(color:%s)"

2409 +msgstr "未能识别的颜色：%%(color:%s)"

2410

2517 -#: urlmatch.c:120

2518 -msgid "invalid URL scheme name or missing '://' suffix"

2519 -msgstr "无效的 URL 方案名称或丢失 '://' 后缀"

2411 +#: ref-filter.c:71

2412 +#, c-format

2413 +msgid "unrecognized format: %%(%s)"

2414 +msgstr "未能识别的格式：%%(%s)"

2415

2521 -#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356

2416 +#: ref-filter.c:77

2417 #, c-format

2523 -msgid "invalid %XX escape sequence"

2524 -msgstr "无效的 %XX 转义序列"

2418 +msgid "%%(body) does not take arguments"

2419 +msgstr "%%(body) 不带参数"

2420

2526 -#: urlmatch.c:172

2527 -msgid "missing host and scheme is not 'file:'"

2528 -msgstr "缺失主机名且 URL 方案不是 'file:'"

2421 +#: ref-filter.c:84

2422 +#, c-format

2423 +msgid "%%(subject) does not take arguments"

2424 +msgstr "%%(subject) 不带参数"

2425

2530 -#: urlmatch.c:189

2531 -msgid "a 'file:' URL may not have a port number"

2532 -msgstr "一个 'file:' URL 不应该包含端口号"

2426 +#: ref-filter.c:101

2427 +#, c-format

2428 +msgid "positive value expected contents:lines=%s"

2429 +msgstr "要为 contents:lines=%s 提供一个正数"

2430

2534 -#: urlmatch.c:199

2535 -msgid "invalid characters in host name"

2536 -msgstr "主机名中包含无效的字符"

2431 +#: ref-filter.c:103

2432 +#, c-format

2433 +msgid "unrecognized %%(contents) argument: %s"

2434 +msgstr "未能识别的 %%(contents) 参数：%s"

2435

2538 -#: urlmatch.c:244 urlmatch.c:255

2539 -msgid "invalid port number"

2540 -msgstr "无效的端口号"

2436 +#: ref-filter.c:113

2437 +#, c-format

2438 +msgid "unrecognized %%(objectname) argument: %s"

2439 +msgstr "未能识别的 %%(objectname) 参数：%s"

2440

2542 -#: urlmatch.c:322

2543 -msgid "invalid '..' path segment"

2544 -msgstr "无效的 '..' 路径片段"

2441 +#: ref-filter.c:135

2442 +#, c-format

2443 +msgid "expected format: %%(align:<width>,<position>)"

2444 +msgstr "期望的格式：%%(align:<width>,<position>)"

2445

2546 -#: worktree.c:282

2446 +#: ref-filter.c:147

2447 #, c-format

2548 -msgid "failed to read '%s'"

2549 -msgstr "无法读取 '%s'"

2448 +msgid "unrecognized position:%s"

2449 +msgstr "未能识别的位置：%s"

2450

2551 -#: wrapper.c:222 wrapper.c:392

2451 +#: ref-filter.c:151

2452 #, c-format

2553 -msgid "could not open '%s' for reading and writing"

2554 -msgstr "无法打开 '%s' 进行读写"

2453 +msgid "unrecognized width:%s"

2454 +msgstr "未能识别的宽度：%s"

2455

2556 -#: wrapper.c:224 wrapper.c:394 builtin/am.c:778

2456 +#: ref-filter.c:157

2457 #, c-format

2558 -msgid "could not open '%s' for writing"

2559 -msgstr "无法打开 '%s' 进行写入"

2458 +msgid "unrecognized %%(align) argument: %s"

2459 +msgstr "未能识别的 %%(align) 参数：%s"

2460

2561 -#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771

2562 -#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029

2563 -#: builtin/pull.c:407

2461 +#: ref-filter.c:161

2462 #, c-format

2565 -msgid "could not open '%s' for reading"

2566 -msgstr "无法打开 '%s' 进行读取"

2463 +msgid "positive width expected with the %%(align) atom"

2464 +msgstr "元素 %%(align) 需要一个正数的宽度"

2465

2568 -#: wrapper.c:605 wrapper.c:626

2466 +#: ref-filter.c:244

2467 #, c-format

2570 -msgid "unable to access '%s'"

2571 -msgstr "不能访问 '%s'"

2468 +msgid "malformed field name: %.*s"

2469 +msgstr "非法的字段名：%.*s"

2470

2573 -#: wrapper.c:634

2574 -msgid "unable to get current working directory"

2575 -msgstr "不能获取当前工作目录"

2471 +#: ref-filter.c:270

2472 +#, c-format

2473 +msgid "unknown field name: %.*s"

2474 +msgstr "未知的字段名：%.*s"

2475

2577 -#: wrapper.c:658

2476 +#: ref-filter.c:372

2477 #, c-format

2579 -msgid "could not write to %s"

2580 -msgstr "不能写入 %s"

2478 +msgid "format: %%(end) atom used without corresponding atom"

2479 +msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"

2480

2582 -#: wrapper.c:660

2481 +#: ref-filter.c:424

2482 #, c-format

2584 -msgid "could not close %s"

2585 -msgstr "不能关闭 %s"

2483 +msgid "malformed format string %s"

2484 +msgstr "非法的格式化字符串 %s"

2485

2587 -#: wt-status.c:150

2588 -msgid "Unmerged paths:"

2589 -msgstr "未合并的路径："

2486 +#: ref-filter.c:878

2487 +msgid ":strip= requires a positive integer argument"

2488 +msgstr ":strip= 需要一个正整型参数"

2489

2591 -# 译者：注意保持前导空格

2592 -#: wt-status.c:177 wt-status.c:204

2490 +#: ref-filter.c:883

2491 #, c-format

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

2595 -msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）"

2596 -

2597 -# 译者：注意保持前导空格

2598 -#: wt-status.c:179 wt-status.c:206

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

2600 -msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）"

2492 +msgid "ref '%s' does not have %ld components to :strip"

2493 +msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"

2494

2602 -# 译者：注意保持前导空格

2603 -#: wt-status.c:183

2604 -msgid " (use \"git add <file>...\" to mark resolution)"

2605 -msgstr " （使用 \"git add <文件>...\" 标记解决方案）"

2495 +#: ref-filter.c:1046

2496 +#, c-format

2497 +msgid "unknown %.*s format %s"

2498 +msgstr "未知的 %.*s 格式 %s"

2499

2607 -# 译者：注意保持前导空格

2608 -#: wt-status.c:185 wt-status.c:189

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

2610 -msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"

2500 +#: ref-filter.c:1066 ref-filter.c:1097

2501 +#, c-format

2502 +msgid "missing object %s for %s"

2503 +msgstr "缺失 %2$s 的对象 %1$s"

2504

2612 -# 译者：注意保持前导空格

2613 -#: wt-status.c:187

2614 -msgid " (use \"git rm <file>...\" to mark resolution)"

2615 -msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"

2505 +#: ref-filter.c:1069 ref-filter.c:1100

2506 +#, c-format

2507 +msgid "parse_object_buffer failed on %s for %s"

2508 +msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"

2509

2617 -#: wt-status.c:198 wt-status.c:882

2618 -msgid "Changes to be committed:"

2619 -msgstr "要提交的变更："

2510 +#: ref-filter.c:1311

2511 +#, c-format

2512 +msgid "malformed object at '%s'"

2513 +msgstr "非法的对象于 '%s'"

2514

2621 -#: wt-status.c:216 wt-status.c:891

2622 -msgid "Changes not staged for commit:"

2623 -msgstr "尚未暂存以备提交的变更："

2515 +#: ref-filter.c:1373

2516 +#, c-format

2517 +msgid "ignoring ref with broken name %s"

2518 +msgstr "忽略带有错误名称 %s 的引用"

2519

2625 -# 译者：注意保持前导空格

2626 -#: wt-status.c:220

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

2628 -msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）"

2520 +#: ref-filter.c:1378

2521 +#, c-format

2522 +msgid "ignoring broken ref %s"

2523 +msgstr "忽略损坏的引用 %s"

2524

2630 -# 译者：注意保持前导空格

2631 -#: wt-status.c:222

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

2633 -msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）"

2525 +#: ref-filter.c:1633

2526 +#, c-format

2527 +msgid "format: %%(end) atom missing"

2528 +msgstr "格式：缺少 %%(end) 元素"

2529

2635 -# 译者：注意保持前导空格

2636 -#: wt-status.c:223

2637 -msgid ""

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

2639 -msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"

2530 +#: ref-filter.c:1687

2531 +#, c-format

2532 +msgid "malformed object name %s"

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

2534

2641 -# 译者：注意保持前导空格

2642 -#: wt-status.c:225

2643 -msgid " (commit or discard the untracked or modified content in submodules)"

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

2535 +#: remote.c:746

2536 +#, c-format

2537 +msgid "Cannot fetch both %s and %s to %s"

2538 +msgstr "不能同时获取 %s 和 %s 至 %s"

2539

2646 -# 译者：注意保持前导空格

2647 -#: wt-status.c:237

2540 +#: remote.c:750

2541 #, c-format

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

2650 -msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）"

2542 +msgid "%s usually tracks %s, not %s"

2543 +msgstr "%s 通常跟踪 %s，而非 %s"

2544

2652 -#: wt-status.c:252

2653 -msgid "both deleted:"

2654 -msgstr "双方删除："

2545 +#: remote.c:754

2546 +#, c-format

2547 +msgid "%s tracks both %s and %s"

2548 +msgstr "%s 同时跟踪 %s 和 %s"

2549

2656 -#: wt-status.c:254

2657 -msgid "added by us:"

2658 -msgstr "由我们添加："

2550 +#: remote.c:762

2551 +msgid "Internal error"

2552 +msgstr "内部错误"

2553

2660 -#: wt-status.c:256

2661 -msgid "deleted by them:"

2662 -msgstr "由他们删除："

2554 +#: remote.c:1677 remote.c:1720

2555 +msgid "HEAD does not point to a branch"

2556 +msgstr "HEAD 没有指向一个分支"

2557

2664 -#: wt-status.c:258

2665 -msgid "added by them:"

2666 -msgstr "由他们添加："

2558 +#: remote.c:1686

2559 +#, c-format

2560 +msgid "no such branch: '%s'"

2561 +msgstr "没有此分支：'%s'"

2562

2668 -#: wt-status.c:260

2669 -msgid "deleted by us:"

2670 -msgstr "由我们删除："

2563 +#: remote.c:1689

2564 +#, c-format

2565 +msgid "no upstream configured for branch '%s'"

2566 +msgstr "尚未给分支 '%s' 设置上游"

2567

2672 -#: wt-status.c:262

2673 -msgid "both added:"

2674 -msgstr "双方添加："

2568 +#: remote.c:1695

2569 +#, c-format

2570 +msgid "upstream branch '%s' not stored as a remote-tracking branch"

2571 +msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

2572

2676 -#: wt-status.c:264

2677 -msgid "both modified:"

2678 -msgstr "双方修改："

2573 +#: remote.c:1710

2574 +#, c-format

2575 +msgid "push destination '%s' on remote '%s' has no local tracking branch"

2576 +msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"

2577

2680 -#: wt-status.c:274

2681 -msgid "new file:"

2682 -msgstr "新文件："

2578 +#: remote.c:1725

2579 +#, c-format

2580 +msgid "branch '%s' has no remote for pushing"

2581 +msgstr "分支 '%s' 没有设置要推送的远程服务器"

2582

2684 -#: wt-status.c:276

2685 -msgid "copied:"

2686 -msgstr "拷贝："

2583 +#: remote.c:1736

2584 +#, c-format

2585 +msgid "push refspecs for '%s' do not include '%s'"

2586 +msgstr "向 '%s' 推送引用规格未包含 '%s'"

2587

2688 -#: wt-status.c:278

2689 -msgid "deleted:"

2690 -msgstr "删除："

2588 +#: remote.c:1749

2589 +msgid "push has no destination (push.default is 'nothing')"

2590 +msgstr "推送无目标（push.default 是 'nothing'）"

2591

2692 -#: wt-status.c:280

2693 -msgid "modified:"

2694 -msgstr "修改："

2592 +#: remote.c:1771

2593 +msgid "cannot resolve 'simple' push to a single destination"

2594 +msgstr "无法解析 'simple' 推送至一个单独的目标"

2595

2696 -#: wt-status.c:282

2697 -msgid "renamed:"

2698 -msgstr "重命名："

2596 +#: remote.c:2073

2597 +#, c-format

2598 +msgid "Your branch is based on '%s', but the upstream is gone.\n"

2599 +msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"

2600

2700 -#: wt-status.c:284

2701 -msgid "typechange:"

2702 -msgstr "类型变更："

2601 +#: remote.c:2077

2602 +msgid " (use \"git branch --unset-upstream\" to fixup)\n"

2603 +msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"

2604

2704 -#: wt-status.c:286

2705 -msgid "unknown:"

2706 -msgstr "未知："

2605 +#: remote.c:2080

2606 +#, c-format

2607 +msgid "Your branch is up-to-date with '%s'.\n"

2608 +msgstr "您的分支与上游分支 '%s' 一致。\n"

2609

2708 -#: wt-status.c:288

2709 -msgid "unmerged:"

2710 -msgstr "未合并："

2610 +#: remote.c:2084

2611 +#, c-format

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

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

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

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

2616

2712 -# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

2713 -#: wt-status.c:370

2714 -msgid "new commits, "

2715 -msgstr "新提交, "

2617 +#: remote.c:2090

2618 +msgid " (use \"git push\" to publish your local commits)\n"

2619 +msgstr " （使用 \"git push\" 来发布您的本地提交）\n"

2620

2717 -# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

2718 -#: wt-status.c:372

2719 -msgid "modified content, "

2720 -msgstr "修改的内容, "

2621 +#: remote.c:2093

2622 +#, c-format

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

2624 +msgid_plural ""

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

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

2627 +msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

2628

2722 -# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

2723 -#: wt-status.c:374

2724 -msgid "untracked content, "

2725 -msgstr "未跟踪的内容, "

2629 +# 译者：注意保持前导空格

2630 +#: remote.c:2101

2631 +msgid " (use \"git pull\" to update your local branch)\n"

2632 +msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"

2633

2727 -#: wt-status.c:756

2728 -msgid "Submodules changed but not updated:"

2729 -msgstr "子模组已修改但尚未更新："

2634 +#: remote.c:2104

2635 +#, c-format

2636 +msgid ""

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

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

2639 +msgid_plural ""

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

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

2642 +msgstr[0] ""

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

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

2645 +msgstr[1] ""

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

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

2648

2731 -#: wt-status.c:758

2732 -msgid "Submodule changes to be committed:"

2733 -msgstr "要提交的子模组变更："

2649 +# 译者：注意保持前导空格

2650 +#: remote.c:2114

2651 +msgid " (use \"git pull\" to merge the remote branch into yours)\n"

2652 +msgstr " （使用 \"git pull\" 来合并远程分支）\n"

2653

2735 -#: wt-status.c:839

2736 -msgid ""

2737 -"Do not touch the line above.\n"

2738 -"Everything below will be removed."

2739 -msgstr ""

2740 -"不要改动上面的一行。\n"

2741 -"下面的所有内容均将被删除。"

2654 +#: revision.c:2158

2655 +msgid "your current branch appears to be broken"

2656 +msgstr "您的当前分支好像被损坏"

2657

2743 -#: wt-status.c:950

2744 -msgid "You have unmerged paths."

2745 -msgstr "您有尚未合并的路径。"

2658 +#: revision.c:2161

2659 +#, c-format

2660 +msgid "your current branch '%s' does not have any commits yet"

2661 +msgstr "您的当前分支 '%s' 尚无任何提交"

2662

2747 -# 译者：注意保持前导空格

2748 -#: wt-status.c:953

2749 -msgid " (fix conflicts and run \"git commit\")"

2750 -msgstr " （解决冲突并运行 \"git commit\"）"

2663 +#: revision.c:2355

2664 +msgid "--first-parent is incompatible with --bisect"

2665 +msgstr "--first-parent 与 --bisect 不兼容"

2666

2752 -# 译者：注意保持前导空格

2753 -#: wt-status.c:955

2754 -msgid " (use \"git merge --abort\" to abort the merge)"

2755 -msgstr " （使用 \"git merge --abort\" 终止合并）"

2667 +#: run-command.c:106

2668 +msgid "open /dev/null failed"

2669 +msgstr "不能打开 /dev/null"

2670

2757 -#: wt-status.c:960

2758 -msgid "All conflicts fixed but you are still merging."

2759 -msgstr "所有冲突已解决但您仍处于合并中。"

2671 +#: run-command.c:108

2672 +#, c-format

2673 +msgid "dup2(%d,%d) failed"

2674 +msgstr "不能调用 dup2(%d,%d)"

2675

2761 -# 译者：注意保持前导空格

2762 -#: wt-status.c:963

2763 -msgid " (use \"git commit\" to conclude merge)"

2764 -msgstr " （使用 \"git commit\" 结束合并）"

2676 +#: send-pack.c:297

2677 +msgid "failed to sign the push certificate"

2678 +msgstr "无法为推送证书签名"

2679

2766 -#: wt-status.c:973

2767 -msgid "You are in the middle of an am session."

2768 -msgstr "您正处于 am 操作过程中。"

2680 +#: send-pack.c:410

2681 +msgid "the receiving end does not support --signed push"

2682 +msgstr "接收端不支持签名推送"

2683

2770 -#: wt-status.c:976

2771 -msgid "The current patch is empty."

2772 -msgstr "当前的补丁为空。"

2684 +#: send-pack.c:412

2685 +msgid ""

2686 +"not sending a push certificate since the receiving end does not support --"

2687 +"signed push"

2688 +msgstr "未发送推送证书，因为接收端不支持签名推送"

2689

2774 -# 译者：注意保持前导空格

2775 -#: wt-status.c:980

2776 -msgid " (fix conflicts and then run \"git am --continue\")"

2777 -msgstr " （解决冲突，然后运行 \"git am --continue\"）"

2690 +#: send-pack.c:424

2691 +msgid "the receiving end does not support --atomic push"

2692 +msgstr "接收端不支持原子推送"

2693

2779 -# 译者：注意保持前导空格

2780 -#: wt-status.c:982

2781 -msgid " (use \"git am --skip\" to skip this patch)"

2782 -msgstr " （使用 \"git am --skip\" 跳过此补丁）"

2694 +#: send-pack.c:429

2695 +msgid "the receiving end does not support push options"

2696 +msgstr "接收端不支持推送选项"

2697

2784 -# 译者：注意保持前导空格

2785 -#: wt-status.c:984

2786 -msgid " (use \"git am --abort\" to restore the original branch)"

2787 -msgstr " （使用 \"git am --abort\" 恢复原有分支）"

2698 +#: sequencer.c:171

2699 +msgid "revert"

2700 +msgstr "还原"

2701

2789 -#: wt-status.c:1109

2790 -msgid "No commands done."

2791 -msgstr "没有命令被执行。"

2702 +#: sequencer.c:171

2703 +msgid "cherry-pick"

2704 +msgstr "拣选"

2705 +

2706 +#: sequencer.c:228

2707 +msgid ""

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

2709 +"with 'git add <paths>' or 'git rm <paths>'"

2710 +msgstr ""

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

2712 +"命令标记修正后的文件"

2713 +

2714 +#: sequencer.c:231

2715 +msgid ""

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

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

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

2719 +msgstr ""

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

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

2722

2793 -#: wt-status.c:1112

2723 +#: sequencer.c:244 sequencer.c:1209

2724 #, c-format

2795 -msgid "Last command done (%d command done):"

2796 -msgid_plural "Last commands done (%d commands done):"

2797 -msgstr[0] "最后一条命令已完成（%d 条命令被执行）："

2798 -msgstr[1] "最后的命令已完成（%d 条命令被执行）："

2725 +msgid "could not lock '%s'"

2726 +msgstr "不能锁定 '%s'"

2727

2800 -#: wt-status.c:1123

2728 +#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214

2729 #, c-format

2802 -msgid " (see more in file %s)"

2803 -msgstr " （更多参见文件 %s）"

2730 +msgid "could not write to '%s'"

2731 +msgstr "不能写入 '%s'"

2732

2805 -#: wt-status.c:1128

2806 -msgid "No commands remaining."

2807 -msgstr "未剩下任何命令。"

2733 +#: sequencer.c:251

2734 +#, c-format

2735 +msgid "could not write eol to '%s"

2736 +msgstr "不能将换行符写入 '%s'"

2737

2809 -#: wt-status.c:1131

2738 +#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216

2739 #, c-format

2811 -msgid "Next command to do (%d remaining command):"

2812 -msgid_plural "Next commands to do (%d remaining commands):"

2813 -msgstr[0] "接下来要执行的命令（剩余 %d 条命令）："

2814 -msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："

2740 +msgid "failed to finalize '%s'."

2741 +msgstr "无法完成 '%s'。"

2742

2816 -# 译者：注意保持前导空格

2817 -#: wt-status.c:1139

2818 -msgid " (use \"git rebase --edit-todo\" to view and edit)"

2819 -msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"

2743 +#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032

2744 +#, c-format

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

2746 +msgstr "不能读取 '%s'"

2747

2821 -#: wt-status.c:1152

2748 +#: sequencer.c:305

2749 #, c-format

2823 -msgid "You are currently rebasing branch '%s' on '%s'."

2824 -msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"

2750 +msgid "your local changes would be overwritten by %s."

2751 +msgstr "您的本地修改将被%s覆盖。"

2752

2826 -#: wt-status.c:1157

2827 -msgid "You are currently rebasing."

2828 -msgstr "您在执行变基操作。"

2753 +#: sequencer.c:309

2754 +msgid "commit your changes or stash them to proceed."

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

2756

2830 -# 译者：注意保持前导空格

2831 -#: wt-status.c:1171

2832 -msgid " (fix conflicts and then run \"git rebase --continue\")"

2833 -msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"

2757 +#: sequencer.c:324

2758 +#, c-format

2759 +msgid "%s: fast-forward"

2760 +msgstr "%s：快进"

2761

2835 -# 译者：注意保持前导空格

2836 -#: wt-status.c:1173

2837 -msgid " (use \"git rebase --skip\" to skip this patch)"

2838 -msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"

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

2763 +#: sequencer.c:399

2764 +#, c-format

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

2766 +msgstr "%s：无法写入新索引文件"

2767

2840 -# 译者：注意保持前导空格

2841 -#: wt-status.c:1175

2842 -msgid " (use \"git rebase --abort\" to check out the original branch)"

2843 -msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"

2768 +#: sequencer.c:418

2769 +msgid "could not resolve HEAD commit\n"

2770 +msgstr "不能解析 HEAD 提交\n"

2771

2845 -# 译者：注意保持前导空格

2846 -#: wt-status.c:1181

2847 -msgid " (all conflicts fixed: run \"git rebase --continue\")"

2848 -msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"

2772 +#: sequencer.c:438

2773 +msgid "unable to update cache tree\n"

2774 +msgstr "不能更新缓存\n"

2775

2850 -#: wt-status.c:1185

2776 +#: sequencer.c:483

2777 #, c-format

2778 msgid ""

2853 -"You are currently splitting a commit while rebasing branch '%s' on '%s'."

2854 -msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"

2855 -

2856 -#: wt-status.c:1190

2857 -msgid "You are currently splitting a commit during a rebase."

2858 -msgstr "您在执行变基操作时拆分提交。"

2779 +"you have staged changes in your working tree\n"

2780 +"If these changes are meant to be squashed into the previous commit, run:\n"

2781 +"\n"

2782 +" git commit --amend %s\n"

2783 +"\n"

2784 +"If they are meant to go into a new commit, run:\n"

2785 +"\n"

2786 +" git commit %s\n"

2787 +"\n"

2788 +"In both cases, once you're done, continue with:\n"

2789 +"\n"

2790 +" git rebase --continue\n"

2791 +msgstr ""

2792 +"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交，执行：\n"

2793 +"\n"

2794 +" git commit --amend %s\n"

2795 +"\n"

2796 +"如果这些变更要形成一个新提交，执行：\n"

2797 +"\n"

2798 +" git commit %s\n"

2799 +"\n"

2800 +"无论哪种情况，当您完成提交，继续执行：\n"

2801 +"\n"

2802 +" git rebase --continue\n"

2803

2860 -# 译者：注意保持前导空格

2861 -#: wt-status.c:1193

2862 -msgid " (Once your working directory is clean, run \"git rebase --continue\")"

2863 -msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"

2804 +#: sequencer.c:567

2805 +#, c-format

2806 +msgid "could not parse commit %s\n"

2807 +msgstr "不能解析提交 %s\n"

2808

2865 -#: wt-status.c:1197

2809 +#: sequencer.c:572

2810 #, c-format

2867 -msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

2868 -msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"

2811 +msgid "could not parse parent commit %s\n"

2812 +msgstr "不能解析父提交 %s\n"

2813

2870 -#: wt-status.c:1202

2871 -msgid "You are currently editing a commit during a rebase."

2872 -msgstr "您在执行变基操作时编辑提交。"

2814 +#: sequencer.c:656

2815 +msgid "your index file is unmerged."

2816 +msgstr "您的索引文件未完成合并。"

2817

2874 -# 译者：注意保持前导空格

2875 -#: wt-status.c:1205

2876 -msgid " (use \"git commit --amend\" to amend the current commit)"

2877 -msgstr " （使用 \"git commit --amend\" 修补当前提交）"

2818 +#: sequencer.c:675

2819 +#, c-format

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

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

2822

2879 -# 译者：注意保持前导空格

2880 -#: wt-status.c:1207

2823 +#: sequencer.c:683

2824 +#, c-format

2825 +msgid "commit %s does not have parent %d"

2826 +msgstr "提交 %s 没有第 %d 个父提交"

2827 +

2828 +#: sequencer.c:687

2829 +#, c-format

2830 +msgid "mainline was specified but commit %s is not a merge."

2831 +msgstr "指定了主线，但是提交 %s 不是一个合并提交。"

2832 +

2833 +#. TRANSLATORS: The first %s will be a "todo" command like

2834 +#. "revert" or "pick", the second %s a SHA1.

2835 +#: sequencer.c:700

2836 +#, c-format

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

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

2839 +

2840 +#: sequencer.c:705

2841 +#, c-format

2842 +msgid "cannot get commit message for %s"

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

2844 +

2845 +#: sequencer.c:797

2846 +#, c-format

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

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

2849 +

2850 +#: sequencer.c:798

2851 +#, c-format

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

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

2854 +

2855 +#: sequencer.c:833

2856 +msgid "empty commit set passed"

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

2858 +

2859 +#: sequencer.c:843

2860 +#, c-format

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

2862 +msgstr "git %s：无法读取索引"

2863 +

2864 +#: sequencer.c:850

2865 +#, c-format

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

2867 +msgstr "git %s：无法刷新索引"

2868 +

2869 +#: sequencer.c:944

2870 +#, c-format

2871 +msgid "invalid line %d: %.*s"

2872 +msgstr "无效行 %d：%.*s"

2873 +

2874 +#: sequencer.c:950

2875 +msgid "no commits parsed."

2876 +msgstr "没有解析提交。"

2877 +

2878 +#: sequencer.c:966

2879 +#, c-format

2880 +msgid "could not read '%s'."

2881 +msgstr "不能读取 '%s'。"

2882 +

2883 +#: sequencer.c:972

2884 +#, c-format

2885 +msgid "unusable instruction sheet: '%s'"

2886 +msgstr "无用的指令清单：'%s'"

2887 +

2888 +#: sequencer.c:983

2889 +msgid "cannot cherry-pick during a revert."

2890 +msgstr "不能在回退中执行拣选。"

2891 +

2892 +#: sequencer.c:985

2893 +msgid "cannot revert during a cherry-pick."

2894 +msgstr "不能在拣选中执行回退。"

2895 +

2896 +#: sequencer.c:1028

2897 +#, c-format

2898 +msgid "invalid key: %s"

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

2900 +

2901 +#: sequencer.c:1031

2902 +#, c-format

2903 +msgid "invalid value for %s: %s"

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

2905 +

2906 +#: sequencer.c:1063

2907 +#, c-format

2908 +msgid "malformed options sheet: '%s'"

2909 +msgstr "非法的选项清单：'%s'"

2910 +

2911 +#: sequencer.c:1101

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

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

2914 +

2915 +#: sequencer.c:1102

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

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

2918 +

2919 +#: sequencer.c:1106

2920 +#, c-format

2921 +msgid "could not create sequencer directory '%s'"

2922 +msgstr "不能创建序列目录 '%s'"

2923 +

2924 +#: sequencer.c:1120

2925 +msgid "could not lock HEAD"

2926 +msgstr "不能锁定 HEAD"

2927 +

2928 +#: sequencer.c:1151 sequencer.c:1289

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

2930 +msgstr "拣选或还原操作并未进行"

2931 +

2932 +#: sequencer.c:1153

2933 +msgid "cannot resolve HEAD"

2934 +msgstr "不能解析 HEAD"

2935 +

2936 +#: sequencer.c:1155 sequencer.c:1189

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

2938 +msgstr "不能从尚未建立的分支终止"

2939 +

2940 +#: sequencer.c:1175 builtin/grep.c:578

2941 +#, c-format

2942 +msgid "cannot open '%s'"

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

2944 +

2945 +#: sequencer.c:1177

2946 +#, c-format

2947 +msgid "cannot read '%s': %s"

2948 +msgstr "不能读取 '%s'：%s"

2949 +

2950 +#: sequencer.c:1178

2951 +msgid "unexpected end of file"

2952 +msgstr "意外的文件结束"

2953 +

2954 +#: sequencer.c:1184

2955 +#, c-format

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

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

2958 +

2959 +#: sequencer.c:1354

2960 +#, c-format

2961 +msgid "%s: can't cherry-pick a %s"

2962 +msgstr "%s：不能拣选一个%s"

2963 +

2964 +#: sequencer.c:1358

2965 +#, c-format

2966 +msgid "%s: bad revision"

2967 +msgstr "%s：错误的版本"

2968 +

2969 +#: sequencer.c:1391

2970 +msgid "can't revert as initial commit"

2971 +msgstr "不能作为初始提交回退"

2972 +

2973 +#: setup.c:160

2974 +#, c-format

2975 msgid ""

2882 -" (use \"git rebase --continue\" once you are satisfied with your changes)"

2883 -msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"

2976 +"%s: no such path in the working tree.\n"

2977 +"Use 'git <command> -- <path>...' to specify paths that do not exist locally."

2978 +msgstr ""

2979 +"%s：工作区中无此路径。\n"

2980 +"使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"

2981

2885 -#: wt-status.c:1217

2982 +#: setup.c:173

2983 #, c-format

2887 -msgid "You are currently cherry-picking commit %s."

2888 -msgstr "您在执行拣选提交 %s 的操作。"

2984 +msgid ""

2985 +"ambiguous argument '%s': unknown revision or path not in the working tree.\n"

2986 +"Use '--' to separate paths from revisions, like this:\n"

2987 +"'git <command> [<revision>...] -- [<file>...]'"

2988 +msgstr ""

2989 +"有歧义的参数 '%s'：未知的版本或路径不存在于工作区中。\n"

2990 +"使用 '--' 来分隔版本和路径，例如：\n"

2991 +"'git <command> [<revision>...] -- [<file>...]'"

2992

2890 -# 译者：注意保持前导空格

2891 -#: wt-status.c:1222

2892 -msgid " (fix conflicts and run \"git cherry-pick --continue\")"

2893 -msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"

2993 +#: setup.c:223

2994 +#, c-format

2995 +msgid ""

2996 +"ambiguous argument '%s': both revision and filename\n"

2997 +"Use '--' to separate paths from revisions, like this:\n"

2998 +"'git <command> [<revision>...] -- [<file>...]'"

2999 +msgstr ""

3000 +"有歧义的参数 '%s'：可同时是版本和文件\n"

3001 +"使用 '--' 来分隔版本和路径，例如：\n"

3002 +"'git <command> [<revision>...] -- [<file>...]'"

3003

2895 -# 译者：注意保持前导空格

2896 -#: wt-status.c:1225

2897 -msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

2898 -msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"

3004 +#: setup.c:468

3005 +#, c-format

3006 +msgid "Expected git repo version <= %d, found %d"

3007 +msgstr "期望 git 仓库版本 <= %d，却得到 %d"

3008

2900 -# 译者：注意保持前导空格

2901 -#: wt-status.c:1227

2902 -msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

2903 -msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"

3009 +#: setup.c:476

3010 +msgid "unknown repository extensions found:"

3011 +msgstr "发现未知的仓库扩展："

3012

2905 -#: wt-status.c:1236

3013 +#: setup.c:762

3014 #, c-format

2907 -msgid "You are currently reverting commit %s."

2908 -msgstr "您在执行反转提交 %s 的操作。"

3015 +msgid "Not a git repository (or any of the parent directories): %s"

3016 +msgstr "不是一个 git 仓库（或者任何父目录）：%s"

3017

2910 -# 译者：注意保持前导空格

2911 -#: wt-status.c:1241

2912 -msgid " (fix conflicts and run \"git revert --continue\")"

2913 -msgstr " （解决冲突并运行 \"git revert --continue\"）"

3018 +#: setup.c:764 setup.c:915 builtin/index-pack.c:1641

3019 +msgid "Cannot come back to cwd"

3020 +msgstr "无法返回当前工作目录"

3021

2915 -# 译者：注意保持前导空格

2916 -#: wt-status.c:1244

2917 -msgid " (all conflicts fixed: run \"git revert --continue\")"

2918 -msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"

3022 +#: setup.c:845

3023 +msgid "Unable to read current working directory"

3024 +msgstr "不能读取当前工作目录"

3025

2920 -# 译者：注意保持前导空格

2921 -#: wt-status.c:1246

2922 -msgid " (use \"git revert --abort\" to cancel the revert operation)"

2923 -msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"

3026 +#: setup.c:920

3027 +#, c-format

3028 +msgid ""

3029 +"Not a git repository (or any parent up to mount point %s)\n"

3030 +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

3031 +msgstr ""

3032 +"不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n"

3033 +"停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"

3034

2925 -#: wt-status.c:1257

3035 +#: setup.c:927

3036 #, c-format

2927 -msgid "You are currently bisecting, started from branch '%s'."

2928 -msgstr "您在执行从分支 '%s' 开始的二分查找操作。"

3037 +msgid "Cannot change to '%s/..'"

3038 +msgstr "不能切换到 '%s/..'"

3039

2930 -#: wt-status.c:1261

2931 -msgid "You are currently bisecting."

2932 -msgstr "您在执行二分查找操作。"

3040 +#: setup.c:989

3041 +#, c-format

3042 +msgid ""

3043 +"Problem with core.sharedRepository filemode value (0%.3o).\n"

3044 +"The owner of files must always have read and write permissions."

3045 +msgstr ""

3046 +"参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n"

3047 +"文件属主必须始终拥有读写权限。"

3048

2934 -# 译者：注意保持前导空格

2935 -#: wt-status.c:1264

2936 -msgid " (use \"git bisect reset\" to get back to the original branch)"

2937 -msgstr " （使用 \"git bisect reset\" 以回到原有分支）"

3049 +#: sha1_file.c:473

3050 +#, c-format

3051 +msgid "path '%s' does not exist"

3052 +msgstr "路径 '%s' 不存在"

3053 +

3054 +#: sha1_file.c:499

3055 +#, c-format

3056 +msgid "reference repository '%s' as a linked checkout is not supported yet."

3057 +msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"

3058 +

3059 +#: sha1_file.c:505

3060 +#, c-format

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

3062 +msgstr "参考仓库 '%s' 不是一个本地仓库。"

3063 +

3064 +#: sha1_file.c:511

3065 +#, c-format

3066 +msgid "reference repository '%s' is shallow"

3067 +msgstr "参考仓库 '%s' 是一个浅克隆"

3068 +

3069 +#: sha1_file.c:519

3070 +#, c-format

3071 +msgid "reference repository '%s' is grafted"

3072 +msgstr "参考仓库 '%s' 已被嫁接"

3073 +

3074 +#: sha1_file.c:1159

3075 +msgid "offset before end of packfile (broken .idx?)"

3076 +msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

3077 +

3078 +#: sha1_file.c:2592

3079 +#, c-format

3080 +msgid "offset before start of pack index for %s (corrupt index?)"

3081 +msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

3082 +

3083 +#: sha1_file.c:2596

3084 +#, c-format

3085 +msgid "offset beyond end of pack index for %s (truncated index?)"

3086 +msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

3087 +

3088 +#: sha1_name.c:407

3089 +#, c-format

3090 +msgid "short SHA1 %s is ambiguous"

3091 +msgstr "歧义的短 SHA1 %s"

3092 +

3093 +#: sha1_name.c:418

3094 +msgid "The candidates are:"

3095 +msgstr "候选者有："

3096 +

3097 +#: sha1_name.c:577

3098 +msgid ""

3099 +"Git normally never creates a ref that ends with 40 hex characters\n"

3100 +"because it will be ignored when you just specify 40-hex. These refs\n"

3101 +"may be created by mistake. For example,\n"

3102 +"\n"

3103 +" git checkout -b $br $(git rev-parse ...)\n"

3104 +"\n"

3105 +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"

3106 +"examine these refs and maybe delete them. Turn this message off by\n"

3107 +"running \"git config advice.objectNameWarning false\""

3108 +msgstr ""

3109 +"Git 通常不会创建一个以40位十六进制字符命名的引用，因为当你提供40位\n"

3110 +"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n"

3111 +"\n"

3112 +" git checkout -b $br $(git rev-parse ...)\n"

3113 +"\n"

3114 +"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n"

3115 +"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"

3116 +"命令关闭本消息通知。"

3117 +

3118 +#: submodule.c:64 submodule.c:98

3119 +msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

3120 +msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"

3121 +

3122 +#: submodule.c:68 submodule.c:102

3123 +#, c-format

3124 +msgid "Could not find section in .gitmodules where path=%s"

3125 +msgstr "无法在 .gitmodules 中找到 path=%s 的小节"

3126 +

3127 +#: submodule.c:76

3128 +#, c-format

3129 +msgid "Could not update .gitmodules entry %s"

3130 +msgstr "不能更新 .gitmodules 条目 %s"

3131 +

3132 +#: submodule.c:109

3133 +#, c-format

3134 +msgid "Could not remove .gitmodules entry for %s"

3135 +msgstr "无法移除 %s 的 .gitmodules 条目"

3136 +

3137 +#: submodule.c:120

3138 +msgid "staging updated .gitmodules failed"

3139 +msgstr "将更新后 .gitmodules 添加暂存区失败"

3140 +

3141 +#: submodule.c:158

3142 +msgid "negative values not allowed for submodule.fetchJobs"

3143 +msgstr "submodule.fetchJobs 不允许为负值"

3144 +

3145 +#: submodule-config.c:358

3146 +#, c-format

3147 +msgid "invalid value for %s"

3148 +msgstr "%s 的值无效"

3149 +

3150 +#: trailer.c:238

3151 +#, c-format

3152 +msgid "running trailer command '%s' failed"

3153 +msgstr "执行 trailer 命令 '%s' 失败"

3154 +

3155 +#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537

3156 +#: trailer.c:541

3157 +#, c-format

3158 +msgid "unknown value '%s' for key '%s'"

3159 +msgstr "键 '%2$s' 的未知取值 '%1$s'"

3160 +

3161 +#: trailer.c:523 trailer.c:528 builtin/remote.c:289

3162 +#, c-format

3163 +msgid "more than one %s"

3164 +msgstr "多于一个 %s"

3165 +

3166 +#: trailer.c:672

3167 +#, c-format

3168 +msgid "empty trailer token in trailer '%.*s'"

3169 +msgstr "签名 '%.*s' 的键为空"

3170 +

3171 +#: trailer.c:695

3172 +#, c-format

3173 +msgid "could not read input file '%s'"

3174 +msgstr "不能读取输入文件 '%s'"

3175 +

3176 +#: trailer.c:698

3177 +msgid "could not read from stdin"

3178 +msgstr "不能自标准输入读取"

3179 +

3180 +#: trailer.c:929 builtin/am.c:44

3181 +#, c-format

3182 +msgid "could not stat %s"

3183 +msgstr "不能获取 %s 的文件状态"

3184 +

3185 +#: trailer.c:931

3186 +#, c-format

3187 +msgid "file %s is not a regular file"

3188 +msgstr "文件 %s 不是一个正规文件"

3189 +

3190 +#: trailer.c:933

3191 +#, c-format

3192 +msgid "file %s is not writable by user"

3193 +msgstr "文件 %s 用户不可写"

3194 +

3195 +#: trailer.c:945

3196 +msgid "could not open temporary file"

3197 +msgstr "不能打开临时文件"

3198 +

3199 +#: trailer.c:983

3200 +#, c-format

3201 +msgid "could not rename temporary file to %s"

3202 +msgstr "不能重命名临时文件为 %s"

3203 +

3204 +#: transport.c:62

3205 +#, c-format

3206 +msgid "Would set upstream of '%s' to '%s' of '%s'\n"

3207 +msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"

3208 +

3209 +#: transport.c:151

3210 +#, c-format

3211 +msgid "transport: invalid depth option '%s'"

3212 +msgstr "传输：无效的深度选项 '%s'"

3213 +

3214 +#: transport.c:817

3215 +#, c-format

3216 +msgid ""

3217 +"The following submodule paths contain changes that can\n"

3218 +"not be found on any remote:\n"

3219 +msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"

3220 +

l10n: zh_CN: for git v2.11.0 l10n round 1