2b472aae5c · matheusbsbs/matheus-bagliano

@@ -139,8 +139,8 @@ msgid ""

139 msgstr ""

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

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

142 -"POT-Creation-Date: 2019-12-30 08:48+0800\n"

143 -"PO-Revision-Date: 2020-01-12 17:16+0800\n"

142 +"POT-Creation-Date: 2020-03-11 15:26+0800\n"

143 +"PO-Revision-Date: 2020-03-11 15:38+0800\n"

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

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

146 "Language: zh_CN\n"

@@ -149,250 +149,500 @@ msgstr ""

149 "Content-Transfer-Encoding: 8bit\n"

150 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

151

152 -#: add-interactive.c:347

152 +#: add-interactive.c:368

153 #, c-format

154 msgid "Huh (%s)?"

155 msgstr "嗯（%s）？"

156

157 -#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216

158 -#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643

159 -#: builtin/rebase.c:2019 builtin/rebase.c:2063

157 +#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124

158 +#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687

159 +#: builtin/rebase.c:2086 builtin/rebase.c:2130

160 msgid "could not read index"

161 msgstr "不能读取索引"

162

163 -#: add-interactive.c:555 git-add--interactive.perl:269

163 +#: add-interactive.c:576 git-add--interactive.perl:269

164 #: git-add--interactive.perl:294

165 msgid "binary"

166 msgstr "二进制"

167

168 -#: add-interactive.c:613 git-add--interactive.perl:278

168 +#: add-interactive.c:634 git-add--interactive.perl:278

169 #: git-add--interactive.perl:332

170 msgid "nothing"

171 msgstr "无"

172

173 -#: add-interactive.c:614 git-add--interactive.perl:314

173 +#: add-interactive.c:635 git-add--interactive.perl:314

174 #: git-add--interactive.perl:329

175 msgid "unchanged"

176 msgstr "没有修改"

177

178 -#: add-interactive.c:651 git-add--interactive.perl:643

178 +#: add-interactive.c:672 git-add--interactive.perl:643

179 msgid "Update"

180 msgstr "更新"

181

182 -#: add-interactive.c:668 add-interactive.c:856

182 +#: add-interactive.c:689 add-interactive.c:877

183 #, c-format

184 msgid "could not stage '%s'"

185 msgstr "不能暂存 '%s'"

186

187 -#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409

188 -#: builtin/rebase.c:895

187 +#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317

188 +#: builtin/rebase.c:899

189 msgid "could not write index"

190 msgstr "不能写入索引"

191

192 -#: add-interactive.c:677 git-add--interactive.perl:628

192 +#: add-interactive.c:698 git-add--interactive.perl:628

193 #, c-format, perl-format

194 msgid "updated %d path\n"

195 msgid_plural "updated %d paths\n"

196 msgstr[0] "更新了 %d 个路径\n"

197 msgstr[1] "更新了 %d 个路径\n"

198

199 -#: add-interactive.c:695 git-add--interactive.perl:678

199 +#: add-interactive.c:716 git-add--interactive.perl:678

200 #, c-format, perl-format

201 msgid "note: %s is untracked now.\n"

202 msgstr "说明：%s 现已成为未跟踪的。\n"

203

204 -#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281

204 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281

205 #: builtin/reset.c:144

206 #, c-format

207 msgid "make_cache_entry failed for path '%s'"

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

209

210 -#: add-interactive.c:730 git-add--interactive.perl:655

210 +#: add-interactive.c:751 git-add--interactive.perl:655

211 msgid "Revert"

212 msgstr "还原"

213

214 -#: add-interactive.c:746

214 +#: add-interactive.c:767

215 msgid "Could not parse HEAD^{tree}"

216 msgstr "不能解析 HEAD^{tree}"

217

218 -#: add-interactive.c:784 git-add--interactive.perl:631

218 +#: add-interactive.c:805 git-add--interactive.perl:631

219 #, c-format, perl-format

220 msgid "reverted %d path\n"

221 msgid_plural "reverted %d paths\n"

222 msgstr[0] "还原了 %d 个路径\n"

223 msgstr[1] "还原了 %d 个路径\n"

224

225 -#: add-interactive.c:835 git-add--interactive.perl:695

225 +#: add-interactive.c:856 git-add--interactive.perl:695

226 #, c-format

227 msgid "No untracked files.\n"

228 msgstr "没有未跟踪的文件。\n"

229

230 -#: add-interactive.c:839 git-add--interactive.perl:689

230 +#: add-interactive.c:860 git-add--interactive.perl:689

231 msgid "Add untracked"

232 msgstr "添加未跟踪的"

233

234 -#: add-interactive.c:866 git-add--interactive.perl:625

234 +#: add-interactive.c:887 git-add--interactive.perl:625

235 #, c-format, perl-format

236 msgid "added %d path\n"

237 msgid_plural "added %d paths\n"

238 msgstr[0] "增加了 %d 个路径\n"

239 msgstr[1] "增加了 %d 个路径\n"

240

241 -#: add-interactive.c:896

241 +#: add-interactive.c:917

242 #, c-format

243 msgid "ignoring unmerged: %s"

244 msgstr "忽略未合入的：%s"

245

246 -#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366

246 +#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366

247 #, c-format

248 msgid "Only binary files changed.\n"

249 msgstr "只有二进制文件被修改。\n"

250

251 -#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368

251 +#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368

252 #, c-format

253 msgid "No changes.\n"

254 msgstr "没有修改。\n"

255

256 -#: add-interactive.c:914 git-add--interactive.perl:1376

256 +#: add-interactive.c:935 git-add--interactive.perl:1376

257 msgid "Patch update"

258 msgstr "补丁更新"

259

260 -#: add-interactive.c:953 git-add--interactive.perl:1754

260 +#: add-interactive.c:974 git-add--interactive.perl:1754

261 msgid "Review diff"

262 msgstr "检视 diff"

263

264 -#: add-interactive.c:981

264 +#: add-interactive.c:1002

265 msgid "show paths with changes"

266 msgstr "显示含变更的路径"

267

268 -#: add-interactive.c:983

268 +#: add-interactive.c:1004

269 msgid "add working tree state to the staged set of changes"

270 msgstr "将工作区状态添加到暂存区修改集中"

271

272 -#: add-interactive.c:985

272 +#: add-interactive.c:1006

273 msgid "revert staged set of changes back to the HEAD version"

274 msgstr "将暂存的修改集恢复为 HEAD 版本"

275

276 -#: add-interactive.c:987

276 +#: add-interactive.c:1008

277 msgid "pick hunks and update selectively"

278 msgstr "挑选数据块并有选择地更新"

279

280 -#: add-interactive.c:989

280 +#: add-interactive.c:1010

281 msgid "view diff between HEAD and index"

282 msgstr "显示 HEAD 和索引的差异"

283

284 -#: add-interactive.c:991

284 +#: add-interactive.c:1012

285 msgid "add contents of untracked files to the staged set of changes"

286 msgstr "将未跟踪文件的内容添加到暂存区修改集中"

287

288 -#: add-interactive.c:999 add-interactive.c:1048

288 +#: add-interactive.c:1020 add-interactive.c:1069

289 msgid "Prompt help:"

290 msgstr "帮助："

291

292 -#: add-interactive.c:1001

292 +#: add-interactive.c:1022

293 msgid "select a single item"

294 msgstr "选择一个条目"

295

296 -#: add-interactive.c:1003

296 +#: add-interactive.c:1024

297 msgid "select a range of items"

298 msgstr "选择一系列条目"

299

300 -#: add-interactive.c:1005

300 +#: add-interactive.c:1026

301 msgid "select multiple ranges"

302 msgstr "选择多个范围"

303

304 -#: add-interactive.c:1007 add-interactive.c:1052

304 +#: add-interactive.c:1028 add-interactive.c:1073

305 msgid "select item based on unique prefix"

306 msgstr "基于唯一前缀选择条目"

307

308 -#: add-interactive.c:1009

308 +#: add-interactive.c:1030

309 msgid "unselect specified items"

310 msgstr "反选指定的条目"

311

312 -#: add-interactive.c:1011

312 +#: add-interactive.c:1032

313 msgid "choose all items"

314 msgstr "选择所有条目"

315

316 -#: add-interactive.c:1013

316 +#: add-interactive.c:1034

317 msgid "(empty) finish selecting"

318 msgstr "（空）结束选择"

319

320 -#: add-interactive.c:1050

320 +#: add-interactive.c:1071

321 msgid "select a numbered item"

322 msgstr "选择一个编号条目"

323

324 -#: add-interactive.c:1054

324 +#: add-interactive.c:1075

325 msgid "(empty) select nothing"

326 msgstr "（空）不选择任何内容"

327

328 -#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851

328 +#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851

329 msgid "*** Commands ***"

330 msgstr "*** 命令 ***"

331

332 -#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848

332 +#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848

333 msgid "What now"

334 msgstr "请选择"

335

336 -#: add-interactive.c:1115 git-add--interactive.perl:213

336 +#: add-interactive.c:1136 git-add--interactive.perl:213

337 msgid "staged"

338 msgstr "缓存"

339

340 -#: add-interactive.c:1115 git-add--interactive.perl:213

340 +#: add-interactive.c:1136 git-add--interactive.perl:213

341 msgid "unstaged"

342 msgstr "未缓存"

343

344 -#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197

345 -#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144

346 -#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409

347 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382

348 -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878

349 -#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213

344 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251

345 +#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144

346 +#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409

347 +#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397

348 +#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905

349 +#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213

350 msgid "path"

351 msgstr "路径"

352

353 -#: add-interactive.c:1122

353 +#: add-interactive.c:1143

354 msgid "could not refresh index"

355 msgstr "不能刷新索引"

356

357 -#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765

357 +#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765

358 #, c-format

359 msgid "Bye.\n"

360 msgstr "再见。\n"

361

362 -#: add-patch.c:15

363 -#, c-format

364 -msgid "Stage mode change [y,n,a,q,d%s,?]? "

365 -msgstr "暂存模式变更 [y,n,a,q,d%s,?]? "

362 +#: add-patch.c:33 git-add--interactive.perl:1428

363 +#, c-format, perl-format

364 +msgid "Stage mode change [y,n,q,a,d%s,?]? "

365 +msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "

366

367 -#: add-patch.c:16

368 -#, c-format

369 -msgid "Stage deletion [y,n,a,q,d%s,?]? "

370 -msgstr "暂存删除动作 [y,n,a,q,d%s,?]? "

367 +#: add-patch.c:34 git-add--interactive.perl:1429

368 +#, c-format, perl-format

369 +msgid "Stage deletion [y,n,q,a,d%s,?]? "

370 +msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "

371

372 -#: add-patch.c:17

373 -#, c-format

374 -msgid "Stage this hunk [y,n,a,q,d%s,?]? "

375 -msgstr "暂存该块 [y,n,a,q,d%s,?]? "

372 +#: add-patch.c:35 git-add--interactive.perl:1430

373 +#, c-format, perl-format

374 +msgid "Stage this hunk [y,n,q,a,d%s,?]? "

375 +msgstr "暂存该块 [y,n,q,a,d%s,?]? "

376 +

377 +#: add-patch.c:37

378 +msgid ""

379 +"If the patch applies cleanly, the edited hunk will immediately be marked for "

380 +"staging."

381 +msgstr "如果补丁能正确地应用，编辑块将立即标记为暂存。"

382 +

383 +#: add-patch.c:40

384 +msgid ""

385 +"y - stage this hunk\n"

386 +"n - do not stage this hunk\n"

387 +"q - quit; do not stage this hunk or any of the remaining ones\n"

388 +"a - stage this hunk and all later hunks in the file\n"

389 +"d - do not stage this hunk or any of the later hunks in the file\n"

390 +msgstr ""

391 +"y - 暂存该块\n"

392 +"n - 不要暂存该块\n"

393 +"q - 退出。不暂存该块及后面的全部块\n"

394 +"a - 暂存该块和本文件中后面的全部块\n"

395 +"d - 不暂存该块和本文件中后面的全部块\n"

396 +

397 +#: add-patch.c:54 git-add--interactive.perl:1433

398 +#, c-format, perl-format

399 +msgid "Stash mode change [y,n,q,a,d%s,?]? "

400 +msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "

401 +

402 +#: add-patch.c:55 git-add--interactive.perl:1434

403 +#, c-format, perl-format

404 +msgid "Stash deletion [y,n,q,a,d%s,?]? "

405 +msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "

406 +

407 +#: add-patch.c:56 git-add--interactive.perl:1435

408 +#, c-format, perl-format

409 +msgid "Stash this hunk [y,n,q,a,d%s,?]? "

410 +msgstr "贮藏该块 [y,n,q,a,d%s,?]? "

411 +

412 +#: add-patch.c:58

413 +msgid ""

414 +"If the patch applies cleanly, the edited hunk will immediately be marked for "

415 +"stashing."

416 +msgstr "如果补丁能正确地应用，编辑块将立即标记为贮藏。"

417 +

418 +#: add-patch.c:61

419 +msgid ""

420 +"y - stash this hunk\n"

421 +"n - do not stash this hunk\n"

422 +"q - quit; do not stash this hunk or any of the remaining ones\n"

423 +"a - stash this hunk and all later hunks in the file\n"

424 +"d - do not stash this hunk or any of the later hunks in the file\n"

425 +msgstr ""

426 +"y - 贮藏该块\n"

427 +"n - 不要贮藏该块\n"

428 +"q - 退出。不贮藏该块及后面的全部块\n"

429 +"a - 贮藏该块和本文件中后面的全部块\n"

430 +"d - 不贮藏该块和本文件中后面的全部块\n"

431 +

432 +#: add-patch.c:77 git-add--interactive.perl:1438

433 +#, c-format, perl-format

434 +msgid "Unstage mode change [y,n,q,a,d%s,?]? "

435 +msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "

436 +

437 +#: add-patch.c:78 git-add--interactive.perl:1439

438 +#, c-format, perl-format

439 +msgid "Unstage deletion [y,n,q,a,d%s,?]? "

440 +msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "

441 +

442 +#: add-patch.c:79 git-add--interactive.perl:1440

443 +#, c-format, perl-format

444 +msgid "Unstage this hunk [y,n,q,a,d%s,?]? "

445 +msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "

446 +

447 +#: add-patch.c:81

448 +msgid ""

449 +"If the patch applies cleanly, the edited hunk will immediately be marked for "

450 +"unstaging."

451 +msgstr "如果补丁能正确地应用，编辑块将立即标记为未暂存。"

452 +

453 +#: add-patch.c:84

454 +msgid ""

455 +"y - unstage this hunk\n"

456 +"n - do not unstage this hunk\n"

457 +"q - quit; do not unstage this hunk or any of the remaining ones\n"

458 +"a - unstage this hunk and all later hunks in the file\n"

459 +"d - do not unstage this hunk or any of the later hunks in the file\n"

460 +msgstr ""

461 +"y - 不暂存该块\n"

462 +"n - 不要不暂存该块\n"

463 +"q - 退出。不要不暂存该块及后面的全部块\n"

464 +"a - 不暂存该块和本文件中后面的全部块\n"

465 +"d - 不要不暂存该块和本文件中后面的全部块\n"

466 +

467 +#: add-patch.c:99 git-add--interactive.perl:1443

468 +#, c-format, perl-format

469 +msgid "Apply mode change to index [y,n,q,a,d%s,?]? "

470 +msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "

471 +

472 +#: add-patch.c:100 git-add--interactive.perl:1444

473 +#, c-format, perl-format

474 +msgid "Apply deletion to index [y,n,q,a,d%s,?]? "

475 +msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "

476 +

477 +#: add-patch.c:101 git-add--interactive.perl:1445

478 +#, c-format, perl-format

479 +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "

480 +msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "

481 +

482 +#: add-patch.c:103 add-patch.c:168 add-patch.c:211

483 +msgid ""

484 +"If the patch applies cleanly, the edited hunk will immediately be marked for "

485 +"applying."

486 +msgstr "如果补丁能正确地应用，编辑块将立即标记为应用。"

487 +

488 +#: add-patch.c:106

489 +msgid ""

490 +"y - apply this hunk to index\n"

491 +"n - do not apply this hunk to index\n"

492 +"q - quit; do not apply this hunk or any of the remaining ones\n"

493 +"a - apply this hunk and all later hunks in the file\n"

494 +"d - do not apply this hunk or any of the later hunks in the file\n"

495 +msgstr ""

496 +"y - 在索引中应用该块\n"

497 +"n - 不要在索引中应用该块\n"

498 +"q - 退出。不要应用该块及后面的全部块\n"

499 +"a - 应用该块和本文件中后面的全部块\n"

500 +"d - 不要应用该块和本文件中后面的全部块\n"

501 +

502 +#: add-patch.c:121 git-add--interactive.perl:1448

503 +#: git-add--interactive.perl:1463

504 +#, c-format, perl-format

505 +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "

506 +msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "

507 +

508 +#: add-patch.c:122 git-add--interactive.perl:1449

509 +#: git-add--interactive.perl:1464

510 +#, c-format, perl-format

511 +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "

512 +msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "

513

377 -#: add-patch.c:111

514 +#: add-patch.c:123 git-add--interactive.perl:1450

515 +#: git-add--interactive.perl:1465

516 +#, c-format, perl-format

517 +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "

518 +msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "

519 +

520 +#: add-patch.c:125 add-patch.c:147 add-patch.c:190

521 +msgid ""

522 +"If the patch applies cleanly, the edited hunk will immediately be marked for "

523 +"discarding."

524 +msgstr "如果补丁能正确地应用，编辑块将立即标记为丢弃。"

525 +

526 +#: add-patch.c:128 add-patch.c:193

527 +msgid ""

528 +"y - discard this hunk from worktree\n"

529 +"n - do not discard this hunk from worktree\n"

530 +"q - quit; do not discard this hunk or any of the remaining ones\n"

531 +"a - discard this hunk and all later hunks in the file\n"

532 +"d - do not discard this hunk or any of the later hunks in the file\n"

533 +msgstr ""

534 +"y - 在工作区中丢弃该块\n"

535 +"n - 不要在工作区中丢弃该块\n"

536 +"q - 退出。不要丢弃该块及后面的全部块\n"

537 +"a - 丢弃该块和本文件中后面的全部块\n"

538 +"d - 不要丢弃该块和本文件中后面的全部块\n"

539 +

540 +#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453

541 +#, c-format, perl-format

542 +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "

543 +msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "

544 +

545 +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454

546 +#, c-format, perl-format

547 +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "

548 +msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "

549 +

550 +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455

551 +#, c-format, perl-format

552 +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "

553 +msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "

554 +

555 +#: add-patch.c:150

556 +msgid ""

557 +"y - discard this hunk from index and worktree\n"

558 +"n - do not discard this hunk from index and worktree\n"

559 +"q - quit; do not discard this hunk or any of the remaining ones\n"

560 +"a - discard this hunk and all later hunks in the file\n"

561 +"d - do not discard this hunk or any of the later hunks in the file\n"

562 +msgstr ""

563 +"y - 在索引和工作区中丢弃该块\n"

564 +"n - 不要在索引和工作区中丢弃该块\n"

565 +"q - 退出。不要丢弃该块及后面的全部块\n"

566 +"a - 丢弃该块和本文件中后面的全部块\n"

567 +"d - 不要丢弃该块和本文件中后面的全部块\n"

568 +

569 +#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458

570 +#, c-format, perl-format

571 +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "

572 +msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "

573 +

574 +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459

575 +#, c-format, perl-format

576 +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "

577 +msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "

578 +

579 +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460

580 +#, c-format, perl-format

581 +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "

582 +msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "

583 +

584 +#: add-patch.c:171

585 +msgid ""

586 +"y - apply this hunk to index and worktree\n"

587 +"n - do not apply this hunk to index and worktree\n"

588 +"q - quit; do not apply this hunk or any of the remaining ones\n"

589 +"a - apply this hunk and all later hunks in the file\n"

590 +"d - do not apply this hunk or any of the later hunks in the file\n"

591 +msgstr ""

592 +"y - 在索引和工作区中应用该块\n"

593 +"n - 不要在索引和工作区中应用该块\n"

594 +"q - 退出。不要应用该块及后面的全部块\n"

595 +"a - 应用该块和本文件中后面的全部块\n"

596 +"d - 不要应用该块和本文件中后面的全部块\n"

597 +

598 +#: add-patch.c:214

599 +msgid ""

600 +"y - apply this hunk to worktree\n"

601 +"n - do not apply this hunk to worktree\n"

602 +"q - quit; do not apply this hunk or any of the remaining ones\n"

603 +"a - apply this hunk and all later hunks in the file\n"

604 +"d - do not apply this hunk or any of the later hunks in the file\n"

605 +msgstr ""

606 +"y - 在工作区中应用该块\n"

607 +"n - 不要在工作区中应用该块\n"

608 +"q - 退出。不要应用该块及后面的全部块\n"

609 +"a - 应用该块和本文件中后面的全部块\n"

610 +"d - 不要应用该块和本文件中后面的全部块\n"

611 +

612 +#: add-patch.c:318

613 #, c-format

614 msgid "could not parse hunk header '%.*s'"

615 msgstr "无法解析数据块头信息 '%.*s'"

616

382 -#: add-patch.c:130 add-patch.c:134

617 +#: add-patch.c:337 add-patch.c:341

618 #, c-format

619 msgid "could not parse colored hunk header '%.*s'"

620 msgstr "无法解析彩色数据块头信息 '%.*s'"

621

387 -#: add-patch.c:176

622 +#: add-patch.c:395

623 msgid "could not parse diff"

624 msgstr "不能解析差异信息"

625

391 -#: add-patch.c:194

626 +#: add-patch.c:414

627 msgid "could not parse colored diff"

628 msgstr "不能解析彩色差异信息"

629

395 -#: add-patch.c:508

630 +#: add-patch.c:428

631 +#, c-format

632 +msgid "failed to run '%s'"

633 +msgstr "运行 '%s' 失败"

634 +

635 +#: add-patch.c:587

636 +msgid "mismatched output from interactive.diffFilter"

637 +msgstr "interactive.diffFilter 的输出不匹配"

638 +

639 +#: add-patch.c:588

640 +msgid ""

641 +"Your filter must maintain a one-to-one correspondence\n"

642 +"between its input and output lines."

643 +msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"

644 +

645 +#: add-patch.c:761

646 #, c-format

647 msgid ""

648 "expected context line #%d in\n"

@@ -401,7 +651,7 @@ msgstr ""

651 "预期上下文行 #%d 于\n"

652 "%.*s"

653

404 -#: add-patch.c:523

654 +#: add-patch.c:776

655 #, c-format

656 msgid ""

657 "hunks do not overlap:\n"

@@ -414,11 +664,11 @@ msgstr ""

664 "\t不是结尾于：\n"

665 "%.*s"

666

417 -#: add-patch.c:799 git-add--interactive.perl:1112

667 +#: add-patch.c:1052 git-add--interactive.perl:1112

668 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"

669 msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"

670

421 -#: add-patch.c:803

671 +#: add-patch.c:1056

672 #, c-format

673 msgid ""

674 "---\n"

@@ -431,14 +681,8 @@ msgstr ""

681 "要删除 '%c' 开始的行，删除它们。\n"

682 "以 %c 开始的行将被删除。\n"

683

434 -#: add-patch.c:810

435 -msgid ""

436 -"If the patch applies cleanly, the edited hunk will immediately be\n"

437 -"marked for staging.\n"

438 -msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。\n"

439 -

684 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

441 -#: add-patch.c:818 git-add--interactive.perl:1126

685 +#: add-patch.c:1070 git-add--interactive.perl:1126

686 msgid ""

687 "If it does not apply cleanly, you will be given an opportunity to\n"

688 "edit again. If all lines of the hunk are removed, then the edit is\n"

@@ -447,11 +691,11 @@ msgstr ""

691 "如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"

692 "此次编辑被终止，该块不会被修改。\n"

693

450 -#: add-patch.c:851

694 +#: add-patch.c:1103

695 msgid "could not parse hunk header"

696 msgstr "无法解析数据块头信息"

697

454 -#: add-patch.c:895 add-patch.c:1294

698 +#: add-patch.c:1148

699 msgid "'git apply --cached' failed"

700 msgstr "'git apply --cached' 失败"

701

@@ -467,26 +711,24 @@ msgstr "'git apply --cached' 失败"

711 #. Consider translating (saying "no" discards!) as

712 #. (saying "n" for "no" discards!) if the translation

713 #. of the word "no" does not start with n.

470 -#: add-patch.c:952 git-add--interactive.perl:1239

714 +#: add-patch.c:1218 git-add--interactive.perl:1239

715 msgid ""

716 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "

717 msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "

718

475 -#: add-patch.c:1009

476 -msgid ""

477 -"y - stage this hunk\n"

478 -"n - do not stage this hunk\n"

479 -"q - quit; do not stage this hunk or any of the remaining ones\n"

480 -"a - stage this and all the remaining hunks\n"

481 -"d - do not stage this hunk nor any of the remaining hunks\n"

482 -msgstr ""

483 -"y - 暂存该块\n"

484 -"n - 不要暂存该块\n"

485 -"q - 退出。不暂存该块及后面的全部块\n"

486 -"a - 暂存该块和所有剩余的块\n"

487 -"d - 不暂存该块和任何剩余的块\n"

719 +#: add-patch.c:1261

720 +msgid "The selected hunks do not apply to the index!"

721 +msgstr "选中的块不能应用到索引！"

722 +

723 +#: add-patch.c:1262 git-add--interactive.perl:1343

724 +msgid "Apply them to the worktree anyway? "

725 +msgstr "无论如何都要应用到工作区么？"

726 +

727 +#: add-patch.c:1269 git-add--interactive.perl:1346

728 +msgid "Nothing was applied.\n"

729 +msgstr "未应用。\n"

730

489 -#: add-patch.c:1016

731 +#: add-patch.c:1326

732 msgid ""

733 "j - leave this hunk undecided, see next undecided hunk\n"

734 "J - leave this hunk undecided, see next hunk\n"

@@ -508,99 +750,103 @@ msgstr ""

750 "e - 手动编辑当前块\n"

751 "? - 显示帮助\n"

752

511 -#: add-patch.c:1137 add-patch.c:1147

753 +#: add-patch.c:1447 add-patch.c:1457

754 msgid "No previous hunk"

755 msgstr "没有前一个块"

756

515 -#: add-patch.c:1142 add-patch.c:1152

757 +#: add-patch.c:1452 add-patch.c:1462

758 msgid "No next hunk"

759 msgstr "没有下一个块"

760

519 -#: add-patch.c:1158

761 +#: add-patch.c:1468

762 msgid "No other hunks to goto"

763 msgstr "没有其它可供跳转的块"

764

523 -#: add-patch.c:1169 git-add--interactive.perl:1577

765 +#: add-patch.c:1479 git-add--interactive.perl:1577

766 msgid "go to which hunk (<ret> to see more)? "

767 msgstr "跳转到哪个块（<回车> 查看更多）？ "

768

527 -#: add-patch.c:1170 git-add--interactive.perl:1579

769 +#: add-patch.c:1480 git-add--interactive.perl:1579

770 msgid "go to which hunk? "

771 msgstr "跳转到哪个块？"

772

531 -#: add-patch.c:1181

773 +#: add-patch.c:1491

774 #, c-format

775 msgid "Invalid number: '%s'"

776 msgstr "无效数字：'%s'"

777

536 -#: add-patch.c:1186

778 +#: add-patch.c:1496

779 #, c-format

780 msgid "Sorry, only %d hunk available."

781 msgid_plural "Sorry, only %d hunks available."

782 msgstr[0] "对不起，只有 %d 个可用块。"

783 msgstr[1] "对不起，只有 %d 个可用块。"

784

543 -#: add-patch.c:1195

785 +#: add-patch.c:1505

786 msgid "No other hunks to search"

787 msgstr "没有其它可供查找的块"

788

547 -#: add-patch.c:1201 git-add--interactive.perl:1623

789 +#: add-patch.c:1511 git-add--interactive.perl:1623

790 msgid "search for regex? "

791 msgstr "使用正则表达式搜索？"

792

551 -#: add-patch.c:1216

793 +#: add-patch.c:1526

794 #, c-format

795 msgid "Malformed search regexp %s: %s"

796 msgstr "错误的正则表达式 %s：%s"

797

556 -#: add-patch.c:1233

798 +#: add-patch.c:1543

799 msgid "No hunk matches the given pattern"

800 msgstr "没有和给定模式相匹配的块"

801

560 -#: add-patch.c:1240

802 +#: add-patch.c:1550

803 msgid "Sorry, cannot split this hunk"

804 msgstr "对不起，不能拆分这个块"

805

564 -#: add-patch.c:1244

806 +#: add-patch.c:1554

807 #, c-format

808 msgid "Split into %d hunks."

809 msgstr "拆分为 %d 块。"

810

569 -#: add-patch.c:1248

811 +#: add-patch.c:1558

812 msgid "Sorry, cannot edit this hunk"

813 msgstr "对不起，不能编辑这个块"

814

573 -#: advice.c:111

815 +#: add-patch.c:1609

816 +msgid "'git apply' failed"

817 +msgstr "'git apply' 失败"

818 +

819 +#: advice.c:115

820 #, c-format

821 msgid "%shint: %.*s%s\n"

822 msgstr "%s提示：%.*s%s\n"

823

578 -#: advice.c:164

824 +#: advice.c:168

825 msgid "Cherry-picking is not possible because you have unmerged files."

826 msgstr "无法拣选，因为您有未合并的文件。"

827

582 -#: advice.c:166

828 +#: advice.c:170

829 msgid "Committing is not possible because you have unmerged files."

830 msgstr "无法提交，因为您有未合并的文件。"

831

586 -#: advice.c:168

832 +#: advice.c:172

833 msgid "Merging is not possible because you have unmerged files."

834 msgstr "无法合并，因为您有未合并的文件。"

835

590 -#: advice.c:170

836 +#: advice.c:174

837 msgid "Pulling is not possible because you have unmerged files."

838 msgstr "无法拉取，因为您有未合并的文件。"

839

594 -#: advice.c:172

840 +#: advice.c:176

841 msgid "Reverting is not possible because you have unmerged files."

842 msgstr "无法回退，因为您有未合并的文件。"

843

598 -#: advice.c:174

844 +#: advice.c:178

845 #, c-format

846 msgid "It is not possible to %s because you have unmerged files."

847 msgstr "无法 %s，因为您有未合并的文件。"

848

603 -#: advice.c:182

849 +#: advice.c:186

850 msgid ""

851 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

852 "as appropriate to mark resolution and make a commit."

@@ -608,23 +854,23 @@ msgstr ""

854 "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"

855 "解决方案并提交。"

856

611 -#: advice.c:190

857 +#: advice.c:194

858 msgid "Exiting because of an unresolved conflict."

859 msgstr "因为存在未解决的冲突而退出。"

860

615 -#: advice.c:195 builtin/merge.c:1332

861 +#: advice.c:199 builtin/merge.c:1335

862 msgid "You have not concluded your merge (MERGE_HEAD exists)."

863 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"

864

619 -#: advice.c:197

865 +#: advice.c:201

866 msgid "Please, commit your changes before merging."

867 msgstr "请在合并前先提交您的修改。"

868

623 -#: advice.c:198

869 +#: advice.c:202

870 msgid "Exiting because of unfinished merge."

871 msgstr "因为存在未完成的合并而退出。"

872

627 -#: advice.c:204

873 +#: advice.c:208

874 #, c-format

875 msgid ""

876 "Note: switching to '%s'.\n"

@@ -866,416 +1112,416 @@ msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补

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

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

1114

869 -#: apply.c:3162

1115 +#: apply.c:3163

1116 #, c-format

1117 msgid ""

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

1119 msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"

1120

875 -#: apply.c:3170

1121 +#: apply.c:3171

1122 #, c-format

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

1124 msgstr "补丁应用到空文件 '%s'，但其并非空文件"

1125

880 -#: apply.c:3188

1126 +#: apply.c:3189

1127 #, c-format

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

1129 msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"

1130

885 -#: apply.c:3201

1131 +#: apply.c:3202

1132 #, c-format

1133 msgid "binary patch does not apply to '%s'"

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

1135

890 -#: apply.c:3207

1136 +#: apply.c:3209

1137 #, c-format

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

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

1140

895 -#: apply.c:3228

1141 +#: apply.c:3230

1142 #, c-format

1143 msgid "patch failed: %s:%ld"

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

1145

900 -#: apply.c:3351

1146 +#: apply.c:3353

1147 #, c-format

1148 msgid "cannot checkout %s"

1149 msgstr "不能检出 %s"

1150

905 -#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280

1151 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298

1152 #, c-format

1153 msgid "failed to read %s"

1154 msgstr "无法读取 %s"

1155

910 -#: apply.c:3411

1156 +#: apply.c:3413

1157 #, c-format

1158 msgid "reading from '%s' beyond a symbolic link"

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

1160

915 -#: apply.c:3440 apply.c:3683

1161 +#: apply.c:3442 apply.c:3685

1162 #, c-format

1163 msgid "path %s has been renamed/deleted"

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

1165

920 -#: apply.c:3526 apply.c:3698

1166 +#: apply.c:3528 apply.c:3700

1167 #, c-format

1168 msgid "%s: does not exist in index"

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

1170

925 -#: apply.c:3535 apply.c:3706

1171 +#: apply.c:3537 apply.c:3708

1172 #, c-format

1173 msgid "%s: does not match index"

1174 msgstr "%s：和索引不匹配"

1175

930 -#: apply.c:3570

1176 +#: apply.c:3572

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

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

1179

934 -#: apply.c:3573

1180 +#: apply.c:3575

1181 #, c-format

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

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

1184

939 -#: apply.c:3589 apply.c:3593

1185 +#: apply.c:3591 apply.c:3595

1186 #, c-format

1187 msgid "cannot read the current contents of '%s'"

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

1189

944 -#: apply.c:3605

1190 +#: apply.c:3607

1191 #, c-format

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

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

1194

949 -#: apply.c:3619

1195 +#: apply.c:3621

1196 #, c-format

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

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

1199

954 -#: apply.c:3624

1200 +#: apply.c:3626

1201 #, c-format

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

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

1204

959 -#: apply.c:3650

1205 +#: apply.c:3652

1206 msgid "removal patch leaves file contents"

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

1208

963 -#: apply.c:3723

1209 +#: apply.c:3725

1210 #, c-format

1211 msgid "%s: wrong type"

1212 msgstr "%s：错误类型"

1213

968 -#: apply.c:3725

1214 +#: apply.c:3727

1215 #, c-format

1216 msgid "%s has type %o, expected %o"

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

1218

973 -#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856

974 -#: read-cache.c:1320

1219 +#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856

1220 +#: read-cache.c:1325

1221 #, c-format

1222 msgid "invalid path '%s'"

1223 msgstr "无效路径 '%s'"

1224

979 -#: apply.c:3934

1225 +#: apply.c:3936

1226 #, c-format

1227 msgid "%s: already exists in index"

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

1229

984 -#: apply.c:3937

1230 +#: apply.c:3939

1231 #, c-format

1232 msgid "%s: already exists in working directory"

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

1234

989 -#: apply.c:3957

1235 +#: apply.c:3959

1236 #, c-format

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

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

1239

994 -#: apply.c:3962

1240 +#: apply.c:3964

1241 #, c-format

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

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

1244

999 -#: apply.c:3982

1245 +#: apply.c:3984

1246 #, c-format

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

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

1249

1004 -#: apply.c:3986

1250 +#: apply.c:3988

1251 #, c-format

1252 msgid "%s: patch does not apply"

1253 msgstr "%s：补丁未应用"

1254

1009 -#: apply.c:4001

1255 +#: apply.c:4003

1256 #, c-format

1257 msgid "Checking patch %s..."

1258 msgstr "正在检查补丁 %s..."

1259

1014 -#: apply.c:4093

1260 +#: apply.c:4095

1261 #, c-format

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

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

1264

1019 -#: apply.c:4100

1265 +#: apply.c:4102

1266 #, c-format

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

1268 msgstr "%s 的模式变更，但它不在当前 HEAD 中"

1269

1024 -#: apply.c:4103

1270 +#: apply.c:4105

1271 #, c-format

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

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

1274

1029 -#: apply.c:4112

1275 +#: apply.c:4114

1276 #, c-format

1277 msgid "could not add %s to temporary index"

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

1279

1034 -#: apply.c:4122

1280 +#: apply.c:4124

1281 #, c-format

1282 msgid "could not write temporary index to %s"

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

1284

1039 -#: apply.c:4260

1285 +#: apply.c:4262

1286 #, c-format

1287 msgid "unable to remove %s from index"

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

1289

1044 -#: apply.c:4294

1290 +#: apply.c:4296

1291 #, c-format

1292 msgid "corrupt patch for submodule %s"

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

1294

1049 -#: apply.c:4300

1295 +#: apply.c:4302

1296 #, c-format

1297 msgid "unable to stat newly created file '%s'"

1298 msgstr "不能对新建文件 '%s' 调用 stat"

1299

1054 -#: apply.c:4308

1300 +#: apply.c:4310

1301 #, c-format

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

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

1304

1059 -#: apply.c:4314 apply.c:4459

1305 +#: apply.c:4316 apply.c:4461

1306 #, c-format

1307 msgid "unable to add cache entry for %s"

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

1309

1064 -#: apply.c:4357

1310 +#: apply.c:4359

1311 #, c-format

1312 msgid "failed to write to '%s'"

1313 msgstr "写入 '%s' 失败"

1314

1069 -#: apply.c:4361

1315 +#: apply.c:4363

1316 #, c-format

1317 msgid "closing file '%s'"

1318 msgstr "关闭文件 '%s'"

1319

1074 -#: apply.c:4431

1320 +#: apply.c:4433

1321 #, c-format

1322 msgid "unable to write file '%s' mode %o"

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

1324

1079 -#: apply.c:4529

1325 +#: apply.c:4531

1326 #, c-format

1327 msgid "Applied patch %s cleanly."

1328 msgstr "成功应用补丁 %s。"

1329

1084 -#: apply.c:4537

1330 +#: apply.c:4539

1331 msgid "internal error"

1332 msgstr "内部错误"

1333

1088 -#: apply.c:4540

1334 +#: apply.c:4542

1335 #, c-format

1336 msgid "Applying patch %%s with %d reject..."

1337 msgid_plural "Applying patch %%s with %d rejects..."

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

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

1340

1095 -#: apply.c:4551

1341 +#: apply.c:4553

1342 #, c-format

1343 msgid "truncating .rej filename to %.*s.rej"

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

1345

1100 -#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192

1346 +#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201

1347 #, c-format

1348 msgid "cannot open %s"

1349 msgstr "不能打开 %s"

1350

1105 -#: apply.c:4573

1351 +#: apply.c:4575

1352 #, c-format

1353 msgid "Hunk #%d applied cleanly."

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

1355

1110 -#: apply.c:4577

1356 +#: apply.c:4579

1357 #, c-format

1358 msgid "Rejected hunk #%d."

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

1360

1115 -#: apply.c:4696

1361 +#: apply.c:4698

1362 #, c-format

1363 msgid "Skipped patch '%s'."

1364 msgstr "略过补丁 '%s'。"

1365

1120 -#: apply.c:4704

1366 +#: apply.c:4706

1367 msgid "unrecognized input"

1368 msgstr "未能识别的输入"

1369

1124 -#: apply.c:4724

1370 +#: apply.c:4726

1371 msgid "unable to read index file"

1372 msgstr "无法读取索引文件"

1373

1128 -#: apply.c:4881

1374 +#: apply.c:4883

1375 #, c-format

1376 msgid "can't open patch '%s': %s"

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

1378

1133 -#: apply.c:4908

1379 +#: apply.c:4910

1380 #, c-format

1381 msgid "squelched %d whitespace error"

1382 msgid_plural "squelched %d whitespace errors"

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

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

1385

1140 -#: apply.c:4914 apply.c:4929

1386 +#: apply.c:4916 apply.c:4931

1387 #, c-format

1388 msgid "%d line adds whitespace errors."

1389 msgid_plural "%d lines add whitespace errors."

1390 msgstr[0] "%d 行新增了空白字符误用。"

1391 msgstr[1] "%d 行新增了空白字符误用。"

1392

1147 -#: apply.c:4922

1393 +#: apply.c:4924

1394 #, c-format

1395 msgid "%d line applied after fixing whitespace errors."

1396 msgid_plural "%d lines applied after fixing whitespace errors."

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

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

1399

1154 -#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390

1400 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406

1401 msgid "Unable to write new index file"

1402 msgstr "无法写入新索引文件"

1403

1158 -#: apply.c:4966

1404 +#: apply.c:4968

1405 msgid "don't apply changes matching the given path"

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

1407

1162 -#: apply.c:4969

1408 +#: apply.c:4971

1409 msgid "apply changes matching the given path"

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

1411

1166 -#: apply.c:4971 builtin/am.c:2206

1412 +#: apply.c:4973 builtin/am.c:2260

1413 msgid "num"

1414 msgstr "数字"

1415

1170 -#: apply.c:4972

1416 +#: apply.c:4974

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

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

1419

1174 -#: apply.c:4975

1420 +#: apply.c:4977

1421 msgid "ignore additions made by the patch"

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

1423

1178 -#: apply.c:4977

1424 +#: apply.c:4979

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

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

1427

1182 -#: apply.c:4981

1428 +#: apply.c:4983

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

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

1431

1186 -#: apply.c:4983

1432 +#: apply.c:4985

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

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

1435

1190 -#: apply.c:4985

1436 +#: apply.c:4987

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

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

1439

1194 -#: apply.c:4987

1440 +#: apply.c:4989

1441 msgid "make sure the patch is applicable to the current index"

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

1443

1198 -#: apply.c:4989

1444 +#: apply.c:4991

1445 msgid "mark new files with `git add --intent-to-add`"

1446 msgstr "使用命令 `git add --intent-to-add` 标记新增文件"

1447

1202 -#: apply.c:4991

1448 +#: apply.c:4993

1449 msgid "apply a patch without touching the working tree"

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

1451

1206 -#: apply.c:4993

1452 +#: apply.c:4995

1453 msgid "accept a patch that touches outside the working area"

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

1455

1210 -#: apply.c:4996

1456 +#: apply.c:4998

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

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

1459

1214 -#: apply.c:4998

1460 +#: apply.c:5000

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

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

1463

1218 -#: apply.c:5000

1464 +#: apply.c:5002

1465 msgid "build a temporary index based on embedded index information"

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

1467

1222 -#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524

1468 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524

1469 msgid "paths are separated with NUL character"

1470 msgstr "路径以 NUL 字符分隔"

1471

1226 -#: apply.c:5005

1472 +#: apply.c:5007

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

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

1475

1230 -#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98

1476 +#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98

1477 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

1232 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1474

1478 +#: builtin/pack-objects.c:3457 builtin/rebase.c:1508

1479 msgid "action"

1480 msgstr "动作"

1481

1236 -#: apply.c:5007

1482 +#: apply.c:5009

1483 msgid "detect new or modified lines that have whitespace errors"

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

1485

1240 -#: apply.c:5010 apply.c:5013

1486 +#: apply.c:5012 apply.c:5015

1487 msgid "ignore changes in whitespace when finding context"

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

1489

1244 -#: apply.c:5016

1490 +#: apply.c:5018

1491 msgid "apply the patch in reverse"

1492 msgstr "反向应用补丁"

1493

1248 -#: apply.c:5018

1494 +#: apply.c:5020

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

1496 msgstr "无需至少一行上下文"

1497

1252 -#: apply.c:5020

1498 +#: apply.c:5022

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

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

1501

1256 -#: apply.c:5022

1502 +#: apply.c:5024

1503 msgid "allow overlapping hunks"

1504 msgstr "允许重叠的补丁片段"

1505

1260 -#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22

1261 -#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774

1506 +#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22

1507 +#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774

1508 #: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128

1509 msgid "be verbose"

1510 msgstr "冗长输出"

1511

1266 -#: apply.c:5025

1512 +#: apply.c:5027

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

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

1515

1270 -#: apply.c:5028

1516 +#: apply.c:5030

1517 msgid "do not trust the line counts in the hunk headers"

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

1519

1274 -#: apply.c:5030 builtin/am.c:2194

1520 +#: apply.c:5032 builtin/am.c:2248

1521 msgid "root"

1522 msgstr "根目录"

1523

1278 -#: apply.c:5031

1524 +#: apply.c:5033

1525 msgid "prepend <root> to all filenames"

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

1527

@@ -1297,7 +1543,7 @@ msgstr ""

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

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

1545

1300 -#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299

1546 +#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1547 #, c-format

1548 msgid "pathspec '%s' did not match any files"

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

@@ -1338,8 +1584,8 @@ msgid "prepend prefix to each pathname in the archive"

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

1585

1586 #: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

1341 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162

1342 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899

1587 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162

1588 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887

1589 #: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563

1590 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123

1591 #: parse-options.h:190

@@ -1375,7 +1621,7 @@ msgid "list supported archive formats"

1621 msgstr "列出支持的归档格式"

1622

1623 #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1378 -#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884

1624 +#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911

1625 msgid "repo"

1626 msgstr "仓库"

1627

@@ -1414,17 +1660,17 @@ msgstr "未知归档格式 '%s'"

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

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

1662

1417 -#: archive-tar.c:125 archive-zip.c:350

1663 +#: archive-tar.c:125 archive-zip.c:351

1664 #, c-format

1665 msgid "cannot stream blob %s"

1666 msgstr "不能打开数据对象 %s"

1667

1422 -#: archive-tar.c:266 archive-zip.c:368

1668 +#: archive-tar.c:266 archive-zip.c:369

1669 #, c-format

1670 msgid "unsupported file mode: 0%o (SHA1: %s)"

1671 msgstr "不支持的文件模式：0%o (SHA1: %s)"

1672

1427 -#: archive-tar.c:293 archive-zip.c:358

1673 +#: archive-tar.c:293 archive-zip.c:359

1674 #, c-format

1675 msgid "cannot read %s"

1676 msgstr "不能读取 %s"

@@ -1453,12 +1699,12 @@ msgstr "路径不是有效的 UTF-8：%s"

1699 msgid "path too long (%d chars, SHA1: %s): %s"

1700 msgstr "路径太长（%d 字符，SHA1：%s）：%s"

1701

1456 -#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233

1702 +#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234

1703 #, c-format

1704 msgid "deflate error (%d)"

1705 msgstr "压缩错误 (%d)"

1706

1461 -#: archive-zip.c:614

1707 +#: archive-zip.c:615

1708 #, c-format

1709 msgid "timestamp too large for this system: %<PRIuMAX>"

1710 msgstr "对于本系统时间戳太大：%<PRIuMAX>"

@@ -1491,12 +1737,12 @@ msgstr "文件 '%s' 包含错误的引用格式：%s"

1737 msgid "We cannot bisect more!\n"

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

1739

1494 -#: bisect.c:733

1740 +#: bisect.c:745

1741 #, c-format

1742 msgid "Not a valid commit name %s"

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

1744

1499 -#: bisect.c:758

1745 +#: bisect.c:770

1746 #, c-format

1747 msgid ""

1748 "The merge base %s is bad.\n"

@@ -1505,7 +1751,7 @@ msgstr ""

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

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

1753

1508 -#: bisect.c:763

1754 +#: bisect.c:775

1755 #, c-format

1756 msgid ""

1757 "The merge base %s is new.\n"

@@ -1514,7 +1760,7 @@ msgstr ""

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

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

1762

1517 -#: bisect.c:768

1763 +#: bisect.c:780

1764 #, c-format

1765 msgid ""

1766 "The merge base %s is %s.\n"

@@ -1523,7 +1769,7 @@ msgstr ""

1769 "合并基线 %s 是 %s。\n"

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

1771

1526 -#: bisect.c:776

1772 +#: bisect.c:788

1773 #, c-format

1774 msgid ""

1775 "Some %s revs are not ancestors of the %s rev.\n"

@@ -1534,7 +1780,7 @@ msgstr ""

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

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

1782

1537 -#: bisect.c:789

1783 +#: bisect.c:801

1784 #, c-format

1785 msgid ""

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

@@ -1545,36 +1791,36 @@ msgstr ""

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

1792 "我们仍旧继续。"

1793

1548 -#: bisect.c:822

1794 +#: bisect.c:840

1795 #, c-format

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

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

1798

1553 -#: bisect.c:865

1799 +#: bisect.c:890

1800 #, c-format

1801 msgid "a %s revision is needed"

1802 msgstr "需要一个 %s 版本"

1803

1558 -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254

1804 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254

1805 #, c-format

1806 msgid "could not create file '%s'"

1807 msgstr "不能创建文件 '%s'"

1808

1563 -#: bisect.c:928 builtin/merge.c:148

1809 +#: bisect.c:966 builtin/merge.c:149

1810 #, c-format

1811 msgid "could not read file '%s'"

1812 msgstr "不能读取文件 '%s'"

1813

1568 -#: bisect.c:958

1814 +#: bisect.c:997

1815 msgid "reading bisect refs failed"

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

1817

1572 -#: bisect.c:977

1818 +#: bisect.c:1019

1819 #, c-format

1820 msgid "%s was both %s and %s\n"

1821 msgstr "%s 同时为 %s 和 %s\n"

1822

1577 -#: bisect.c:985

1823 +#: bisect.c:1028

1824 #, c-format

1825 msgid ""

1826 "No testable commit found.\n"

@@ -1583,7 +1829,7 @@ msgstr ""

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

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

1831

1586 -#: bisect.c:1004

1832 +#: bisect.c:1057

1833 #, c-format

1834 msgid "(roughly %d step)"

1835 msgid_plural "(roughly %d steps)"

@@ -1593,7 +1839,7 @@ msgstr[1] "（大概 %d 步）"

1839 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

1840 #. steps)" translation.

1841 #.

1596 -#: bisect.c:1010

1842 +#: bisect.c:1063

1843 #, c-format

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

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

@@ -1612,10 +1858,10 @@ msgstr "不能将 --contents 和最终的提交对象名共用"

1858 msgid "--reverse and --first-parent together require specified latest commit"

1859 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"

1860

1615 -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093

1616 -#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991

1617 -#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411

1618 -#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143

1861 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006

1862 +#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388

1863 +#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215

1864 +#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290

1865 #: builtin/shortlog.c:192

1866 msgid "revision walk setup failed"

1867 msgstr "版本遍历设置失败"

@@ -1778,8 +2024,8 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"

2024 msgid "unrecognized header: %s%s (%d)"

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

2026

1781 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108

1782 -#: builtin/commit.c:811

2027 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016

2028 +#: builtin/commit.c:815

2029 #, c-format

2030 msgid "could not open '%s'"

2031 msgstr "不能打开 '%s'"

@@ -1849,13 +2095,13 @@ msgstr "不能创建 '%s'"

2095 msgid "index-pack died"

2096 msgstr "index-pack 终止"

2097

1852 -#: color.c:296

2098 +#: color.c:329

2099 #, c-format

2100 msgid "invalid color value: %.*s"

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

2102

1857 -#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398

1858 -#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456

2103 +#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403

2104 +#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457

2105 #, c-format

2106 msgid "could not parse %s"

2107 msgstr "不能解析 %s"

@@ -1885,27 +2131,27 @@ msgstr ""

2131 "设置 \"git config advice.graftFileDeprecated false\"\n"

2132 "可关闭本消息"

2133

1888 -#: commit.c:1152

2134 +#: commit.c:1153

2135 #, c-format

2136 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

2137 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"

2138

1893 -#: commit.c:1155

2139 +#: commit.c:1157

2140 #, c-format

2141 msgid "Commit %s has a bad GPG signature allegedly by %s."

2142 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"

2143

1898 -#: commit.c:1158

2144 +#: commit.c:1160

2145 #, c-format

2146 msgid "Commit %s does not have a GPG signature."

2147 msgstr "提交 %s 没有 GPG 签名。"

2148

1903 -#: commit.c:1161

2149 +#: commit.c:1163

2150 #, c-format

2151 msgid "Commit %s has a good GPG signature by %s\n"

2152 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"

2153

1908 -#: commit.c:1415

2154 +#: commit.c:1417

2155 msgid ""

2156 "Warning: commit message did not conform to UTF-8.\n"

2157 "You may want to amend it after fixing the message, or set the config\n"

@@ -1915,253 +2161,253 @@ msgstr ""

2161 "您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"

2162 "设置为您项目所用的字符编码。\n"

2163

1918 -#: commit-graph.c:130

2164 +#: commit-graph.c:122

2165 msgid "commit-graph file is too small"

2166 msgstr "提交图形文件太小"

2167

1922 -#: commit-graph.c:195

2168 +#: commit-graph.c:189

2169 #, c-format

2170 msgid "commit-graph signature %X does not match signature %X"

2171 msgstr "提交图形签名 %X 和签名 %X 不匹配"

2172

1927 -#: commit-graph.c:202

2173 +#: commit-graph.c:196

2174 #, c-format

2175 msgid "commit-graph version %X does not match version %X"

2176 msgstr "提交图形版本 %X 和版本 %X 不匹配"

2177

1932 -#: commit-graph.c:209

2178 +#: commit-graph.c:203

2179 #, c-format

2180 msgid "commit-graph hash version %X does not match version %X"

2181 msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"

2182

1937 -#: commit-graph.c:232

2183 +#: commit-graph.c:226

2184 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"

2185 msgstr "提交图形块查找表条目丢失，文件可能不完整"

2186

1941 -#: commit-graph.c:243

2187 +#: commit-graph.c:237

2188 #, c-format

2189 msgid "commit-graph improper chunk offset %08x%08x"

2190 msgstr "提交图形不正确的块偏移 %08x%08x"

2191

1946 -#: commit-graph.c:286

2192 +#: commit-graph.c:280

2193 #, c-format

2194 msgid "commit-graph chunk id %08x appears multiple times"

2195 msgstr "提交图形块 id %08x 出现了多次"

2196

1951 -#: commit-graph.c:350

2197 +#: commit-graph.c:343

2198 msgid "commit-graph has no base graphs chunk"

2199 msgstr "提交图形没有基础图形块"

2200

1955 -#: commit-graph.c:360

2201 +#: commit-graph.c:353

2202 msgid "commit-graph chain does not match"

2203 msgstr "提交图形链不匹配"

2204

1959 -#: commit-graph.c:407

2205 +#: commit-graph.c:401

2206 #, c-format

2207 msgid "invalid commit-graph chain: line '%s' not a hash"

2208 msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"

2209

1964 -#: commit-graph.c:433

2210 +#: commit-graph.c:425

2211 msgid "unable to find all commit-graph files"

2212 msgstr "无法找到所有提交图形文件"

2213

1968 -#: commit-graph.c:564 commit-graph.c:624

2214 +#: commit-graph.c:558 commit-graph.c:618

2215 msgid "invalid commit position. commit-graph is likely corrupt"

2216 msgstr "无效的提交位置。提交图形可能已损坏"

2217

1972 -#: commit-graph.c:585

2218 +#: commit-graph.c:579

2219 #, c-format

2220 msgid "could not find commit %s"

2221 msgstr "无法找到提交 %s"

2222

1977 -#: commit-graph.c:858 builtin/am.c:1287

2223 +#: commit-graph.c:852 builtin/am.c:1292

2224 #, c-format

2225 msgid "unable to parse commit %s"

2226 msgstr "不能解析提交 %s"

2227

1982 -#: commit-graph.c:1017 builtin/pack-objects.c:2641

2228 +#: commit-graph.c:1011 builtin/pack-objects.c:2782

2229 #, c-format

2230 msgid "unable to get type of object %s"

2231 msgstr "无法获得对象 %s 类型"

2232

1987 -#: commit-graph.c:1049

2233 +#: commit-graph.c:1043

2234 msgid "Loading known commits in commit graph"

2235 msgstr "正在加载提交图中的已知提交"

2236

1991 -#: commit-graph.c:1066

2237 +#: commit-graph.c:1060

2238 msgid "Expanding reachable commits in commit graph"

2239 msgstr "正在扩展提交图中的可达提交"

2240

1995 -#: commit-graph.c:1085

2241 +#: commit-graph.c:1079

2242 msgid "Clearing commit marks in commit graph"

2243 msgstr "正在清除提交图中的提交标记"

2244

1999 -#: commit-graph.c:1104

2245 +#: commit-graph.c:1098

2246 msgid "Computing commit graph generation numbers"

2247 msgstr "正在计算提交图世代数字"

2248

2003 -#: commit-graph.c:1179

2249 +#: commit-graph.c:1173

2250 #, c-format

2251 msgid "Finding commits for commit graph in %d pack"

2252 msgid_plural "Finding commits for commit graph in %d packs"

2253 msgstr[0] "正在 %d 个包中查找提交图的提交"

2254 msgstr[1] "正在 %d 个包中查找提交图的提交"

2255

2010 -#: commit-graph.c:1192

2256 +#: commit-graph.c:1186

2257 #, c-format

2258 msgid "error adding pack %s"

2259 msgstr "添加包 %s 出错"

2260

2015 -#: commit-graph.c:1196

2261 +#: commit-graph.c:1190

2262 #, c-format

2263 msgid "error opening index for %s"

2264 msgstr "为 %s 打开索引出错"

2265

2020 -#: commit-graph.c:1220

2266 +#: commit-graph.c:1214

2267 #, c-format

2268 msgid "Finding commits for commit graph from %d ref"

2269 msgid_plural "Finding commits for commit graph from %d refs"

2270 msgstr[0] "正在从 %d 个引用中查找提交图的提交"

2271 msgstr[1] "正在从 %d 个引用中查找提交图的提交"

2272

2027 -#: commit-graph.c:1240

2273 +#: commit-graph.c:1234

2274 #, c-format

2275 msgid "invalid commit object id: %s"

2276 msgstr "无效的提交对象 ID：%s"

2277

2032 -#: commit-graph.c:1255

2278 +#: commit-graph.c:1249

2279 msgid "Finding commits for commit graph among packed objects"

2280 msgstr "正在打包对象中查找提交图的提交"

2281

2036 -#: commit-graph.c:1270

2282 +#: commit-graph.c:1264

2283 msgid "Counting distinct commits in commit graph"

2284 msgstr "正在计算提交图中不同的提交"

2285

2040 -#: commit-graph.c:1300

2286 +#: commit-graph.c:1294

2287 msgid "Finding extra edges in commit graph"

2288 msgstr "正在查找提交图中额外的边"

2289

2044 -#: commit-graph.c:1346

2290 +#: commit-graph.c:1340

2291 msgid "failed to write correct number of base graph ids"

2292 msgstr "无法写入正确数量的基础图形 ID"

2293

2048 -#: commit-graph.c:1379 midx.c:814

2294 +#: commit-graph.c:1373 midx.c:814

2295 #, c-format

2296 msgid "unable to create leading directories of %s"

2297 msgstr "不能为 %s 创建先导目录"

2298

2053 -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248

2299 +#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248

2300 #, c-format

2301 msgid "unable to create '%s'"

2302 msgstr "不能创建 '%s'"

2303

2058 -#: commit-graph.c:1451

2304 +#: commit-graph.c:1445

2305 #, c-format

2306 msgid "Writing out commit graph in %d pass"

2307 msgid_plural "Writing out commit graph in %d passes"

2308 msgstr[0] "正在用 %d 步写出提交图"

2309 msgstr[1] "正在用 %d 步写出提交图"

2310

2065 -#: commit-graph.c:1492

2311 +#: commit-graph.c:1486

2312 msgid "unable to open commit-graph chain file"

2313 msgstr "无法打开提交图形链文件"

2314

2069 -#: commit-graph.c:1504

2315 +#: commit-graph.c:1498

2316 msgid "failed to rename base commit-graph file"

2317 msgstr "无法重命名基础提交图形文件"

2318

2073 -#: commit-graph.c:1524

2319 +#: commit-graph.c:1518

2320 msgid "failed to rename temporary commit-graph file"

2321 msgstr "无法重命名临时提交图形文件"

2322

2077 -#: commit-graph.c:1635

2323 +#: commit-graph.c:1631

2324 msgid "Scanning merged commits"

2325 msgstr "正在扫描合并提交"

2326

2081 -#: commit-graph.c:1646

2327 +#: commit-graph.c:1642

2328 #, c-format

2329 msgid "unexpected duplicate commit id %s"

2330 msgstr "意外的重复提交 ID %s"

2331

2086 -#: commit-graph.c:1670

2332 +#: commit-graph.c:1665

2333 msgid "Merging commit-graph"

2334 msgstr "正在合并提交图形"

2335

2090 -#: commit-graph.c:1860

2336 +#: commit-graph.c:1844

2337 #, c-format

2338 msgid "the commit graph format cannot write %d commits"

2339 msgstr "提交图格式不能写入 %d 个提交"

2340

2095 -#: commit-graph.c:1871

2341 +#: commit-graph.c:1855

2342 msgid "too many commits to write graph"

2343 msgstr "提交太多不能画图"

2344

2099 -#: commit-graph.c:1961

2345 +#: commit-graph.c:1944

2346 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

2347 msgstr "提交图文件的校验码错误，可能已经损坏"

2348

2103 -#: commit-graph.c:1971

2349 +#: commit-graph.c:1954

2350 #, c-format

2351 msgid "commit-graph has incorrect OID order: %s then %s"

2352 msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"

2353

2108 -#: commit-graph.c:1981 commit-graph.c:1996

2354 +#: commit-graph.c:1964 commit-graph.c:1979

2355 #, c-format

2356 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

2357 msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"

2358

2113 -#: commit-graph.c:1988

2359 +#: commit-graph.c:1971

2360 #, c-format

2361 msgid "failed to parse commit %s from commit-graph"

2362 msgstr "无法从提交图形中解析提交 %s"

2363

2118 -#: commit-graph.c:2006

2364 +#: commit-graph.c:1989

2365 msgid "Verifying commits in commit graph"

2366 msgstr "正在校验提交图中的提交"

2367

2122 -#: commit-graph.c:2020

2368 +#: commit-graph.c:2003

2369 #, c-format

2370 msgid "failed to parse commit %s from object database for commit-graph"

2371 msgstr "无法从提交图形的对象库中解析提交 %s"

2372

2127 -#: commit-graph.c:2027

2373 +#: commit-graph.c:2010

2374 #, c-format

2375 msgid "root tree OID for commit %s in commit-graph is %s != %s"

2376 msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"

2377

2132 -#: commit-graph.c:2037

2378 +#: commit-graph.c:2020

2379 #, c-format

2380 msgid "commit-graph parent list for commit %s is too long"

2381 msgstr "提交 %s 的提交图形父提交列表太长了"

2382

2137 -#: commit-graph.c:2046

2383 +#: commit-graph.c:2029

2384 #, c-format

2385 msgid "commit-graph parent for %s is %s != %s"

2386 msgstr "%s 的提交图形父提交是 %s != %s"

2387

2142 -#: commit-graph.c:2059

2388 +#: commit-graph.c:2042

2389 #, c-format

2390 msgid "commit-graph parent list for commit %s terminates early"

2391 msgstr "提交 %s 的提交图形父提交列表过早终止"

2392

2147 -#: commit-graph.c:2064

2393 +#: commit-graph.c:2047

2394 #, c-format

2395 msgid ""

2396 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"

2397 msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"

2398

2153 -#: commit-graph.c:2068

2399 +#: commit-graph.c:2051

2400 #, c-format

2401 msgid ""

2402 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"

2403 msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"

2404

2159 -#: commit-graph.c:2083

2405 +#: commit-graph.c:2066

2406 #, c-format

2407 msgid "commit-graph generation for commit %s is %u != %u"

2408 msgstr "提交图形中的提交 %s 的世代号是 %u != %u"

2409

2164 -#: commit-graph.c:2089

2410 +#: commit-graph.c:2072

2411 #, c-format

2412 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

2413 msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"

@@ -2208,7 +2454,7 @@ msgstr "键名没有包含一个小节名称：%s"

2454 msgid "key does not contain variable name: %s"

2455 msgstr "键名没有包含变量名：%s"

2456

2211 -#: config.c:406 sequencer.c:2530

2457 +#: config.c:406 sequencer.c:2444

2458 #, c-format

2459 msgid "invalid key: %s"

2460 msgstr "无效键名：%s"

@@ -2344,7 +2590,7 @@ msgstr "%s 的取值格式错误：%s"

2590 msgid "must be one of nothing, matching, simple, upstream or current"

2591 msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"

2592

2347 -#: config.c:1518 builtin/pack-objects.c:3394

2593 +#: config.c:1518 builtin/pack-objects.c:3541

2594 #, c-format

2595 msgid "bad pack compression level %d"

2596 msgstr "错误的打包压缩级别 %d"

@@ -2369,105 +2615,105 @@ msgstr "不能解析配置对象 '%s'"

2615 msgid "failed to parse %s"

2616 msgstr "解析 %s 失败"

2617

2372 -#: config.c:1745

2618 +#: config.c:1743

2619 msgid "unable to parse command-line config"

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

2621

2376 -#: config.c:2096

2622 +#: config.c:2097

2623 msgid "unknown error occurred while reading the configuration files"

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

2625

2380 -#: config.c:2266

2626 +#: config.c:2267

2627 #, c-format

2628 msgid "Invalid %s: '%s'"

2629 msgstr "无效 %s：'%s'"

2630

2385 -#: config.c:2311

2631 +#: config.c:2312

2632 #, c-format

2633 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

2634 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"

2635

2390 -#: config.c:2357

2636 +#: config.c:2358

2637 #, c-format

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

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

2640

2395 -#: config.c:2359

2641 +#: config.c:2360

2642 #, c-format

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

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

2645

2400 -#: config.c:2440

2646 +#: config.c:2441

2647 #, c-format

2648 msgid "invalid section name '%s'"

2649 msgstr "无效的小节名称 '%s'"

2650

2405 -#: config.c:2472

2651 +#: config.c:2473

2652 #, c-format

2653 msgid "%s has multiple values"

2654 msgstr "%s 有多个取值"

2655

2410 -#: config.c:2501

2656 +#: config.c:2502

2657 #, c-format

2658 msgid "failed to write new configuration file %s"

2659 msgstr "写入新的配置文件 %s 失败"

2660

2415 -#: config.c:2753 config.c:3077

2661 +#: config.c:2754 config.c:3078

2662 #, c-format

2663 msgid "could not lock config file %s"

2664 msgstr "不能锁定配置文件 %s"

2665

2420 -#: config.c:2764

2666 +#: config.c:2765

2667 #, c-format

2668 msgid "opening %s"

2669 msgstr "打开 %s"

2670

2425 -#: config.c:2799 builtin/config.c:328

2671 +#: config.c:2800 builtin/config.c:344

2672 #, c-format

2673 msgid "invalid pattern: %s"

2674 msgstr "无效模式：%s"

2675

2430 -#: config.c:2824

2676 +#: config.c:2825

2677 #, c-format

2678 msgid "invalid config file %s"

2679 msgstr "无效的配置文件 %s"

2680

2435 -#: config.c:2837 config.c:3090

2681 +#: config.c:2838 config.c:3091

2682 #, c-format

2683 msgid "fstat on %s failed"

2684 msgstr "对 %s 调用 fstat 失败"

2685

2440 -#: config.c:2848

2686 +#: config.c:2849

2687 #, c-format

2688 msgid "unable to mmap '%s'"

2689 msgstr "不能 mmap '%s'"

2690

2445 -#: config.c:2857 config.c:3095

2691 +#: config.c:2858 config.c:3096

2692 #, c-format

2693 msgid "chmod on %s failed"

2694 msgstr "对 %s 调用 chmod 失败"

2695

2450 -#: config.c:2942 config.c:3192

2696 +#: config.c:2943 config.c:3193

2697 #, c-format

2698 msgid "could not write config file %s"

2699 msgstr "不能写入配置文件 %s"

2700

2455 -#: config.c:2976

2701 +#: config.c:2977

2702 #, c-format

2703 msgid "could not set '%s' to '%s'"

2704 msgstr "不能设置 '%s' 为 '%s'"

2705

2460 -#: config.c:2978 builtin/remote.c:781

2706 +#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857

2707 #, c-format

2708 msgid "could not unset '%s'"

2709 msgstr "不能取消设置 '%s'"

2710

2465 -#: config.c:3068

2711 +#: config.c:3069

2712 #, c-format

2713 msgid "invalid section name: %s"

2714 msgstr "无效的小节名称：%s"

2715

2470 -#: config.c:3235

2716 +#: config.c:3236

2717 #, c-format

2718 msgid "missing value for '%s'"

2719 msgstr "%s 的取值缺失"

@@ -2630,19 +2876,19 @@ msgstr "已阻止奇怪的路径名 '%s'"

2876 msgid "unable to fork"

2877 msgstr "无法 fork"

2878

2633 -#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43

2879 +#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43

2880 msgid "Checking connectivity"

2881 msgstr "正在检查连通性"

2882

2637 -#: connected.c:101

2883 +#: connected.c:110

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

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

2886

2641 -#: connected.c:121

2887 +#: connected.c:130

2888 msgid "failed write to rev-list"

2889 msgstr "写入 rev-list 失败"

2890

2645 -#: connected.c:128

2891 +#: connected.c:137

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

2893 msgstr "关闭 rev-list 的标准输入失败"

2894

@@ -2689,7 +2935,8 @@ msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM"

2935 msgid ""

2936 "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "

2937 "working-tree-encoding."

2692 -msgstr "文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%.*s 作为工作区编码。"

2938 +msgstr ""

2939 +"文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%.*s 作为工作区编码。"

2940

2941 #: convert.c:304

2942 #, c-format

@@ -2952,7 +3199,7 @@ msgid "invalid --stat value: %s"

3199 msgstr "无效的 --stat 值：%s"

3200

3201 #: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209

2955 -#: parse-options.c:199 parse-options.c:203

3202 +#: parse-options.c:197 parse-options.c:201

3203 #, c-format

3204 msgid "%s expects a numerical value"

3205 msgstr "%s 期望一个数字值"

@@ -3456,59 +3703,59 @@ msgid ""

3703 "you may want to set your %s variable to at least %d and retry the command."

3704 msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"

3705

3459 -#: dir.c:554

3706 +#: dir.c:555

3707 #, c-format

3708 msgid "pathspec '%s' did not match any file(s) known to git"

3709 msgstr "路径规格 '%s' 未匹配任何 git 已知文件"

3710

3464 -#: dir.c:664

3711 +#: dir.c:695 dir.c:724 dir.c:737

3712 #, c-format

3713 msgid "unrecognized pattern: '%s'"

3714 msgstr "未识别的模式：'%s'"

3715

3469 -#: dir.c:682 dir.c:696

3716 +#: dir.c:754 dir.c:768

3717 #, c-format

3718 msgid "unrecognized negative pattern: '%s'"

3719 msgstr "未识别的反向模式：'%s'"

3720

3474 -#: dir.c:714

3721 +#: dir.c:786

3722 #, c-format

3723 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

3724 msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'"

3725

3479 -#: dir.c:724

3726 +#: dir.c:796

3727 msgid "disabling cone pattern matching"

3728 msgstr "禁止 cone 模式匹配"

3729

3483 -#: dir.c:1101

3730 +#: dir.c:1173

3731 #, c-format

3732 msgid "cannot use %s as an exclude file"

3733 msgstr "不能将 %s 用作排除文件"

3734

3488 -#: dir.c:2078

3735 +#: dir.c:2144

3736 #, c-format

3737 msgid "could not open directory '%s'"

3738 msgstr "不能打开目录 '%s'"

3739

3493 -#: dir.c:2415

3740 +#: dir.c:2479

3741 msgid "failed to get kernel name and information"

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

3743

3497 -#: dir.c:2539

3744 +#: dir.c:2603

3745 msgid "untracked cache is disabled on this system or location"

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

3747

3501 -#: dir.c:3343

3748 +#: dir.c:3407

3749 #, c-format

3750 msgid "index file corrupt in repo %s"

3751 msgstr "仓库 %s 中的索引文件损坏"

3752

3506 -#: dir.c:3388 dir.c:3393

3753 +#: dir.c:3452 dir.c:3457

3754 #, c-format

3755 msgid "could not create directories for %s"

3756 msgstr "不能为 %s 创建目录"

3757

3511 -#: dir.c:3422

3758 +#: dir.c:3486

3759 #, c-format

3760 msgid "could not migrate git directory from '%s' to '%s'"

3761 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

@@ -3753,7 +4000,7 @@ msgstr "处理要获取的引用出错：%d"

4000 msgid "no matching remote head"

4001 msgstr "没有匹配的远程分支"

4002

3756 -#: fetch-pack.c:1785 builtin/clone.c:688

4003 +#: fetch-pack.c:1785 builtin/clone.c:689

4004 msgid "remote did not send all necessary objects"

4005 msgstr "远程没有发送所有必需的对象"

4006

@@ -3767,19 +4014,19 @@ msgstr "没有这样的远程引用 %s"

4014 msgid "Server does not allow request for unadvertised object %s"

4015 msgstr "服务器不允许请求未公开的对象 %s"

4016

3770 -#: gpg-interface.c:223

4017 +#: gpg-interface.c:408

4018 +msgid "gpg failed to sign the data"

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

4020 +

4021 +#: gpg-interface.c:434

4022 msgid "could not create temporary file"

4023 msgstr "不能创建临时文件"

4024

3774 -#: gpg-interface.c:226

4025 +#: gpg-interface.c:437

4026 #, c-format

4027 msgid "failed writing detached signature to '%s'"

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

4029

3779 -#: gpg-interface.c:390

3780 -msgid "gpg failed to sign the data"

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

3782 -

4030 #: graph.c:98

4031 #, c-format

4032 msgid "ignore invalid color '%.*s' in log.graphColors"

@@ -3793,18 +4040,18 @@ msgstr ""

4040 "给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此"

4041 "功能"

4042

3796 -#: grep.c:2124

4043 +#: grep.c:2128

4044 #, c-format

4045 msgid "'%s': unable to read %s"

4046 msgstr "'%s'：无法读取 %s"

4047

3801 -#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82

4048 +#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82

4049 #: builtin/rm.c:135

4050 #, c-format

4051 msgid "failed to stat '%s'"

4052 msgstr "对 '%s' 调用 stat 失败"

4053

3807 -#: grep.c:2152

4054 +#: grep.c:2156

4055 #, c-format

4056 msgid "'%s': short read"

4057 msgstr "'%s'：读取不完整"

@@ -4018,7 +4265,7 @@ msgstr "不允许空的姓名（对于 <%s>）"

4265 msgid "name consists only of disallowed characters: %s"

4266 msgstr "姓名中仅包含禁用字符：%s"

4267

4021 -#: ident.c:436 builtin/commit.c:631

4268 +#: ident.c:436 builtin/commit.c:635

4269 #, c-format

4270 msgid "invalid date format: %s"

4271 msgstr "无效的日期格式：%s"

@@ -4101,110 +4348,110 @@ msgstr "不能创建 '%s.lock'：%s"

4348 msgid "failed to read the cache"

4349 msgstr "读取缓存失败"

4350

4104 -#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908

4105 -#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809

4106 -#: builtin/stash.c:264

4351 +#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913

4352 +#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810

4353 +#: builtin/stash.c:265

4354 msgid "unable to write new index file"

4355 msgstr "无法写新的索引文件"

4356

4110 -#: merge-recursive.c:367

4357 +#: merge-recursive.c:356

4358 msgid "(bad commit)\n"

4359 msgstr "（坏提交）\n"

4360

4114 -#: merge-recursive.c:390

4361 +#: merge-recursive.c:379

4362 #, c-format

4363 msgid "add_cacheinfo failed for path '%s'; merge aborting."

4364 msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"

4365

4119 -#: merge-recursive.c:399

4366 +#: merge-recursive.c:388

4367 #, c-format

4368 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

4369 msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"

4370

4124 -#: merge-recursive.c:885

4371 +#: merge-recursive.c:874

4372 #, c-format

4373 msgid "failed to create path '%s'%s"

4374 msgstr "创建路径 '%s'%s 失败"

4375

4129 -#: merge-recursive.c:896

4376 +#: merge-recursive.c:885

4377 #, c-format

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

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

4380

4134 -#: merge-recursive.c:910 merge-recursive.c:929

4381 +#: merge-recursive.c:899 merge-recursive.c:918

4382 msgid ": perhaps a D/F conflict?"

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

4384

4138 -#: merge-recursive.c:919

4385 +#: merge-recursive.c:908

4386 #, c-format

4387 msgid "refusing to lose untracked file at '%s'"

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

4389

4143 -#: merge-recursive.c:960 builtin/cat-file.c:41

4390 +#: merge-recursive.c:949 builtin/cat-file.c:41

4391 #, c-format

4392 msgid "cannot read object %s '%s'"

4393 msgstr "不能读取对象 %s '%s'"

4394

4148 -#: merge-recursive.c:965

4395 +#: merge-recursive.c:954

4396 #, c-format

4397 msgid "blob expected for %s '%s'"

4398 msgstr "%s '%s' 应为数据对象"

4399

4153 -#: merge-recursive.c:990

4400 +#: merge-recursive.c:979

4401 #, c-format

4402 msgid "failed to open '%s': %s"

4403 msgstr "打开 '%s' 失败：%s"

4404

4158 -#: merge-recursive.c:1001

4405 +#: merge-recursive.c:990

4406 #, c-format

4407 msgid "failed to symlink '%s': %s"

4408 msgstr "创建符号链接 '%s' 失败：%s"

4409

4163 -#: merge-recursive.c:1006

4410 +#: merge-recursive.c:995

4411 #, c-format

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

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

4414

4168 -#: merge-recursive.c:1199

4415 +#: merge-recursive.c:1191

4416 #, c-format

4417 msgid "Failed to merge submodule %s (not checked out)"

4418 msgstr "无法合并子模组 %s （没有检出）"

4419

4173 -#: merge-recursive.c:1206

4420 +#: merge-recursive.c:1198

4421 #, c-format

4422 msgid "Failed to merge submodule %s (commits not present)"

4423 msgstr "无法合并子模组 %s（提交不存在）"

4424

4178 -#: merge-recursive.c:1213

4425 +#: merge-recursive.c:1205

4426 #, c-format

4427 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

4428 msgstr "无法合并子模组 %s （提交未跟随合并基线）"

4429

4183 -#: merge-recursive.c:1221 merge-recursive.c:1233

4430 +#: merge-recursive.c:1213 merge-recursive.c:1225

4431 #, c-format

4432 msgid "Fast-forwarding submodule %s to the following commit:"

4433 msgstr "子模组 %s 快进到如下提交："

4434

4188 -#: merge-recursive.c:1224 merge-recursive.c:1236

4435 +#: merge-recursive.c:1216 merge-recursive.c:1228

4436 #, c-format

4437 msgid "Fast-forwarding submodule %s"

4438 msgstr "快进子模组 %s"

4439

4193 -#: merge-recursive.c:1259

4440 +#: merge-recursive.c:1251

4441 #, c-format

4442 msgid "Failed to merge submodule %s (merge following commits not found)"

4443 msgstr "无法合并子模组 %s （没发现合并跟随的提交）"

4444

4198 -#: merge-recursive.c:1263

4445 +#: merge-recursive.c:1255

4446 #, c-format

4447 msgid "Failed to merge submodule %s (not fast-forward)"

4448 msgstr "无法合并子模组 %s（非快进）"

4449

4203 -#: merge-recursive.c:1264

4450 +#: merge-recursive.c:1256

4451 msgid "Found a possible merge resolution for the submodule:\n"

4452 msgstr "找到子模组的一个可能的合并方案：\n"

4453

4207 -#: merge-recursive.c:1267

4454 +#: merge-recursive.c:1259

4455 #, c-format

4456 msgid ""

4457 "If this is correct simply add it to the index for example\n"

@@ -4220,31 +4467,31 @@ msgstr ""

4467 "\n"

4468 "以接受此建议。\n"

4469

4223 -#: merge-recursive.c:1276

4470 +#: merge-recursive.c:1268

4471 #, c-format

4472 msgid "Failed to merge submodule %s (multiple merges found)"

4473 msgstr "无法合并子模组 %s （发现多个合并）"

4474

4228 -#: merge-recursive.c:1349

4475 +#: merge-recursive.c:1341

4476 msgid "Failed to execute internal merge"

4477 msgstr "无法执行内部合并"

4478

4232 -#: merge-recursive.c:1354

4479 +#: merge-recursive.c:1346

4480 #, c-format

4481 msgid "Unable to add %s to database"

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

4483

4237 -#: merge-recursive.c:1386

4484 +#: merge-recursive.c:1378

4485 #, c-format

4486 msgid "Auto-merging %s"

4487 msgstr "自动合并 %s"

4488

4242 -#: merge-recursive.c:1410

4489 +#: merge-recursive.c:1402

4490 #, c-format

4491 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

4492 msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"

4493

4247 -#: merge-recursive.c:1482

4494 +#: merge-recursive.c:1474

4495 #, c-format

4496 msgid ""

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

@@ -4253,7 +4500,7 @@ msgstr ""

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

4501 "本被保留。"

4502

4256 -#: merge-recursive.c:1487

4503 +#: merge-recursive.c:1479

4504 #, c-format

4505 msgid ""

4506 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -4262,7 +4509,7 @@ msgstr ""

4509 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

4510 "%7$s 版本被保留。"

4511

4265 -#: merge-recursive.c:1494

4512 +#: merge-recursive.c:1486

4513 #, c-format

4514 msgid ""

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

@@ -4271,7 +4518,7 @@ msgstr ""

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

4519 "本保留在 %8$s 中。"

4520

4274 -#: merge-recursive.c:1499

4521 +#: merge-recursive.c:1491

4522 #, c-format

4523 msgid ""

4524 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -4280,40 +4527,40 @@ msgstr ""

4527 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

4528 "%7$s 版本保留在 %9$s 中。"

4529

4283 -#: merge-recursive.c:1534

4530 +#: merge-recursive.c:1526

4531 msgid "rename"

4532 msgstr "重命名"

4533

4287 -#: merge-recursive.c:1534

4534 +#: merge-recursive.c:1526

4535 msgid "renamed"

4536 msgstr "重命名"

4537

4291 -#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175

4538 +#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117

4539 #, c-format

4540 msgid "Refusing to lose dirty file at %s"

4541 msgstr "拒绝丢失脏文件 '%s'"

4542

4296 -#: merge-recursive.c:1624

4543 +#: merge-recursive.c:1587

4544 #, c-format

4545 msgid "Refusing to lose untracked file at %s, even though it's in the way."

4546 msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"

4547

4301 -#: merge-recursive.c:1682

4548 +#: merge-recursive.c:1645

4549 #, c-format

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

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

4552

4306 -#: merge-recursive.c:1713

4553 +#: merge-recursive.c:1676

4554 #, c-format

4555 msgid "%s is a directory in %s adding as %s instead"

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

4557

4311 -#: merge-recursive.c:1718

4558 +#: merge-recursive.c:1681

4559 #, c-format

4560 msgid "Refusing to lose untracked file at %s; adding as %s instead"

4561 msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"

4562

4316 -#: merge-recursive.c:1737

4563 +#: merge-recursive.c:1708

4564 #, c-format

4565 msgid ""

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

@@ -4322,18 +4569,18 @@ msgstr ""

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

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

4571

4325 -#: merge-recursive.c:1742

4572 +#: merge-recursive.c:1713

4573 msgid " (left unresolved)"

4574 msgstr "（留下未解决）"

4575

4329 -#: merge-recursive.c:1851

4576 +#: merge-recursive.c:1793

4577 #, c-format

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

4579 msgstr ""

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

4581 "%5$s"

4582

4336 -#: merge-recursive.c:2114

4583 +#: merge-recursive.c:2056

4584 #, c-format

4585 msgid ""

4586 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -4343,7 +4590,7 @@ msgstr ""

4590 "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"

4591 "其它目录，没有目录包含大部分文件。"

4592

4346 -#: merge-recursive.c:2146

4593 +#: merge-recursive.c:2088

4594 #, c-format

4595 msgid ""

4596 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -4352,7 +4599,7 @@ msgstr ""

4599 "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"

4600 "在：%s。"

4601

4355 -#: merge-recursive.c:2156

4602 +#: merge-recursive.c:2098

4603 #, c-format

4604 msgid ""

4605 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -4361,7 +4608,7 @@ msgstr ""

4608 "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"

4609 "径放置于此：%s"

4610

4364 -#: merge-recursive.c:2248

4611 +#: merge-recursive.c:2190

4612 #, c-format

4613 msgid ""

4614 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -4370,59 +4617,59 @@ msgstr ""

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

4618 "%4$s->%5$s"

4619

4373 -#: merge-recursive.c:2493

4620 +#: merge-recursive.c:2435

4621 #, c-format

4622 msgid ""

4623 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

4624 "renamed."

4625 msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"

4626

4380 -#: merge-recursive.c:3019

4627 +#: merge-recursive.c:2961

4628 #, c-format

4629 msgid "cannot read object %s"

4630 msgstr "不能读取对象 %s"

4631

4385 -#: merge-recursive.c:3022

4632 +#: merge-recursive.c:2964

4633 #, c-format

4634 msgid "object %s is not a blob"

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

4636

4390 -#: merge-recursive.c:3086

4637 +#: merge-recursive.c:3028

4638 msgid "modify"

4639 msgstr "修改"

4640

4394 -#: merge-recursive.c:3086

4641 +#: merge-recursive.c:3028

4642 msgid "modified"

4643 msgstr "修改"

4644

4398 -#: merge-recursive.c:3098

4645 +#: merge-recursive.c:3040

4646 msgid "content"

4647 msgstr "内容"

4648

4402 -#: merge-recursive.c:3102

4649 +#: merge-recursive.c:3044

4650 msgid "add/add"

4651 msgstr "添加/添加"

4652

4406 -#: merge-recursive.c:3125

4653 +#: merge-recursive.c:3067

4654 #, c-format

4655 msgid "Skipped %s (merged same as existing)"

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

4657

4411 -#: merge-recursive.c:3147 git-submodule.sh:993

4658 +#: merge-recursive.c:3089 git-submodule.sh:1003

4659 msgid "submodule"

4660 msgstr "子模组"

4661

4415 -#: merge-recursive.c:3148

4662 +#: merge-recursive.c:3090

4663 #, c-format

4664 msgid "CONFLICT (%s): Merge conflict in %s"

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

4666

4420 -#: merge-recursive.c:3178

4667 +#: merge-recursive.c:3120

4668 #, c-format

4669 msgid "Adding as %s instead"

4670 msgstr "而是以 %s 为名添加"

4671

4425 -#: merge-recursive.c:3261

4672 +#: merge-recursive.c:3203

4673 #, c-format

4674 msgid ""

4675 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -4430,7 +4677,7 @@ msgid ""

4677 msgstr ""

4678 "路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"

4679

4433 -#: merge-recursive.c:3264

4680 +#: merge-recursive.c:3206

4681 #, c-format

4682 msgid ""

4683 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -4439,7 +4686,7 @@ msgstr ""

4686 "冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"

4687 "到 %s。"

4688

4442 -#: merge-recursive.c:3268

4689 +#: merge-recursive.c:3210

4690 #, c-format

4691 msgid ""

4692 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4448,7 +4695,7 @@ msgstr ""

4695 "路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"

4696 "动到 %5$s。"

4697

4451 -#: merge-recursive.c:3271

4698 +#: merge-recursive.c:3213

4699 #, c-format

4700 msgid ""

4701 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4457,59 +4704,59 @@ msgstr ""

4704 "冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"

4705 "建议将其移动到 %5$s。"

4706

4460 -#: merge-recursive.c:3385

4707 +#: merge-recursive.c:3327

4708 #, c-format

4709 msgid "Removing %s"

4710 msgstr "删除 %s"

4711

4465 -#: merge-recursive.c:3408

4712 +#: merge-recursive.c:3350

4713 msgid "file/directory"

4714 msgstr "文件/目录"

4715

4469 -#: merge-recursive.c:3413

4716 +#: merge-recursive.c:3355

4717 msgid "directory/file"

4718 msgstr "目录/文件"

4719

4473 -#: merge-recursive.c:3420

4720 +#: merge-recursive.c:3362

4721 #, c-format

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

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

4724

4478 -#: merge-recursive.c:3429

4725 +#: merge-recursive.c:3371

4726 #, c-format

4727 msgid "Adding %s"

4728 msgstr "添加 %s"

4729

4483 -#: merge-recursive.c:3438

4730 +#: merge-recursive.c:3380

4731 #, c-format

4732 msgid "CONFLICT (add/add): Merge conflict in %s"

4733 msgstr "冲突（add/add）：合并冲突于 %s"

4734

4488 -#: merge-recursive.c:3482

4735 +#: merge-recursive.c:3424

4736 msgid "Already up to date!"

4737 msgstr "已经是最新的！"

4738

4492 -#: merge-recursive.c:3491

4739 +#: merge-recursive.c:3433

4740 #, c-format

4741 msgid "merging of trees %s and %s failed"

4742 msgstr "无法合并树 %s 和 %s"

4743

4497 -#: merge-recursive.c:3595

4744 +#: merge-recursive.c:3537

4745 msgid "Merging:"

4746 msgstr "合并："

4747

4501 -#: merge-recursive.c:3608

4748 +#: merge-recursive.c:3550

4749 #, c-format

4750 msgid "found %u common ancestor:"

4751 msgid_plural "found %u common ancestors:"

4752 msgstr[0] "发现 %u 个共同祖先："

4753 msgstr[1] "发现 %u 个共同祖先："

4754

4508 -#: merge-recursive.c:3658

4755 +#: merge-recursive.c:3600

4756 msgid "merge returned no commit"

4757 msgstr "合并未返回提交"

4758

4512 -#: merge-recursive.c:3717

4759 +#: merge-recursive.c:3659

4760 #, c-format

4761 msgid ""

4762 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4518,12 +4765,12 @@ msgstr ""

4765 "您对下列文件的本地修改将被合并操作覆盖：\n"

4766 " %s"

4767

4521 -#: merge-recursive.c:3814

4768 +#: merge-recursive.c:3756

4769 #, c-format

4770 msgid "Could not parse object '%s'"

4771 msgstr "不能解析对象 '%s'"

4772

4526 -#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874

4773 +#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877

4774 msgid "Unable to write index."

4775 msgstr "不能写入索引。"

4776

@@ -4754,25 +5001,30 @@ msgstr "对象 %s 有未知的类型 id %d"

5001 msgid "unable to parse object: %s"

5002 msgstr "不能解析对象：%s"

5003

4757 -#: object.c:266 object.c:277

5004 +#: object.c:266 object.c:278

5005 #, c-format

5006 msgid "hash mismatch %s"

5007 msgstr "哈希值与 %s 不匹配"

5008

4762 -#: packfile.c:641

5009 +#: packfile.c:629

5010 msgid "offset before end of packfile (broken .idx?)"

5011 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

5012

4766 -#: packfile.c:1888

5013 +#: packfile.c:1899

5014 #, c-format

5015 msgid "offset before start of pack index for %s (corrupt index?)"

5016 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

5017

4771 -#: packfile.c:1892

5018 +#: packfile.c:1903

5019 #, c-format

5020 msgid "offset beyond end of pack index for %s (truncated index?)"

5021 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

5022

5023 +#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134

5024 +#, c-format

5025 +msgid "unable to get size of %s"

5026 +msgstr "不能得到 %s 的大小"

5027 +

5028 #: parse-options.c:38

5029 #, c-format

5030 msgid "%s requires a value"

@@ -4788,7 +5040,7 @@ msgstr "%s 与 %s 不兼容"

5040 msgid "%s : incompatible with something else"

5041 msgstr "%s：和其它的不兼容"

5042

4791 -#: parse-options.c:92 parse-options.c:96 parse-options.c:319

5043 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317

5044 #, c-format

5045 msgid "%s takes no value"

5046 msgstr "%s 不取值"

@@ -4798,41 +5050,41 @@ msgstr "%s 不取值"

5050 msgid "%s isn't available"

5051 msgstr "%s 不可用"

5052

4801 -#: parse-options.c:219

5053 +#: parse-options.c:217

5054 #, c-format

5055 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

5056 msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"

5057

4806 -#: parse-options.c:389

5058 +#: parse-options.c:386

5059 #, c-format

5060 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

5061 msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）"

5062

4811 -#: parse-options.c:423 parse-options.c:431

5063 +#: parse-options.c:420 parse-options.c:428

5064 #, c-format

4813 -msgid "did you mean `--%s` (with two dashes ?)"

4814 -msgstr "你的意思是 `--%s`（有两个短线？）"

5065 +msgid "did you mean `--%s` (with two dashes)?"

5066 +msgstr "你的意思是 `--%s`（有两个短线）？"

5067

4816 -#: parse-options.c:860

5068 +#: parse-options.c:857

5069 #, c-format

5070 msgid "unknown option `%s'"

5071 msgstr "未知选项 `%s'"

5072

4821 -#: parse-options.c:862

5073 +#: parse-options.c:859

5074 #, c-format

5075 msgid "unknown switch `%c'"

5076 msgstr "未知开关 `%c'"

5077

4826 -#: parse-options.c:864

5078 +#: parse-options.c:861

5079 #, c-format

5080 msgid "unknown non-ascii option in string: `%s'"

5081 msgstr "字符串中未知的非 ascii 字符选项：`%s'"

5082

4831 -#: parse-options.c:888

5083 +#: parse-options.c:885

5084 msgid "..."

5085 msgstr "..."

5086

4835 -#: parse-options.c:907

5087 +#: parse-options.c:904

5088 #, c-format

5089 msgid "usage: %s"

5090 msgstr "用法：%s"

@@ -4840,22 +5092,22 @@ msgstr "用法：%s"

5092 #. TRANSLATORS: the colon here should align with the

5093 #. one in "usage: %s" translation.

5094 #.

4843 -#: parse-options.c:913

5095 +#: parse-options.c:910

5096 #, c-format

5097 msgid " or: %s"

5098 msgstr " 或：%s"

5099

5100 # 译者：为保证在输出中对齐，注意调整句中空格！

4849 -#: parse-options.c:916

5101 +#: parse-options.c:913

5102 #, c-format

5103 msgid " %s"

5104 msgstr " %s"

5105

4854 -#: parse-options.c:955

5106 +#: parse-options.c:952

5107 msgid "-NUM"

5108 msgstr "-数字"

5109

4858 -#: parse-options.c:969

5110 +#: parse-options.c:966

5111 #, c-format

5112 msgid "alias of --%s"

5113 msgstr "--%s 的别名"

@@ -4938,25 +5190,25 @@ msgstr "%s：'literal' 和 'glob' 不兼容"

5190

5191 #: pathspec.c:442

5192 #, c-format

4941 -msgid "%s: '%s' is outside repository"

4942 -msgstr "%s：'%s' 在仓库之外"

5193 +msgid "%s: '%s' is outside repository at '%s'"

5194 +msgstr "%s：'%s' 在仓库（'%s' 中）之外"

5195

4944 -#: pathspec.c:516

5196 +#: pathspec.c:517

5197 #, c-format

5198 msgid "'%s' (mnemonic: '%c')"

5199 msgstr "'%s'（助记符：'%c'）"

5200

4949 -#: pathspec.c:526

5201 +#: pathspec.c:527

5202 #, c-format

5203 msgid "%s: pathspec magic not supported by this command: %s"

5204 msgstr "%s：路径规格神奇前缀不被此命令支持：%s"

5205

4954 -#: pathspec.c:593

5206 +#: pathspec.c:594

5207 #, c-format

5208 msgid "pathspec '%s' is beyond a symbolic link"

5209 msgstr "路径规格 '%s' 位于符号链接中"

5210

4959 -#: pathspec.c:638

5211 +#: pathspec.c:639

5212 #, c-format

5213 msgid "line is badly quoted: %s"

5214 msgstr "行被错误地引用：%s"

@@ -5042,7 +5294,7 @@ msgstr "不能启动 `log`"

5294 msgid "could not read `log` output"

5295 msgstr "不能读取 `log` 的输出"

5296

5045 -#: range-diff.c:96 sequencer.c:5163

5297 +#: range-diff.c:96 sequencer.c:5020

5298 #, c-format

5299 msgid "could not parse commit '%s'"

5300 msgstr "不能解析提交 '%s'"

@@ -5095,16 +5347,16 @@ msgstr "无法在索引中添加 '%s'"

5347 msgid "unable to stat '%s'"

5348 msgstr "无法对 %s 执行 stat"

5349

5098 -#: read-cache.c:1325

5350 +#: read-cache.c:1330

5351 #, c-format

5352 msgid "'%s' appears as both a file and as a directory"

5353 msgstr "'%s' 看起来既是文件又是目录"

5354

5103 -#: read-cache.c:1531

5355 +#: read-cache.c:1536

5356 msgid "Refresh index"

5357 msgstr "刷新索引"

5358

5107 -#: read-cache.c:1646

5359 +#: read-cache.c:1651

5360 #, c-format

5361 msgid ""

5362 "index.version set, but the value is invalid.\n"

@@ -5113,7 +5365,7 @@ msgstr ""

5365 "设置了 index.version，但是取值无效。\n"

5366 "使用版本 %i"

5367

5116 -#: read-cache.c:1656

5368 +#: read-cache.c:1661

5369 #, c-format

5370 msgid ""

5371 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -5122,150 +5374,160 @@ msgstr ""

5374 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"

5375 "使用版本 %i"

5376

5125 -#: read-cache.c:1712

5377 +#: read-cache.c:1717

5378 #, c-format

5379 msgid "bad signature 0x%08x"

5380 msgstr "坏的签名 0x%08x"

5381

5130 -#: read-cache.c:1715

5382 +#: read-cache.c:1720

5383 #, c-format

5384 msgid "bad index version %d"

5385 msgstr "坏的索引版本 %d"

5386

5135 -#: read-cache.c:1724

5387 +#: read-cache.c:1729

5388 msgid "bad index file sha1 signature"

5389 msgstr "坏的索引文件 sha1 签名"

5390

5139 -#: read-cache.c:1754

5391 +#: read-cache.c:1759

5392 #, c-format

5393 msgid "index uses %.4s extension, which we do not understand"

5394 msgstr "索引使用不被支持的 %.4s 扩展"

5395

5396 #

5145 -#: read-cache.c:1756

5397 +#: read-cache.c:1761

5398 #, c-format

5399 msgid "ignoring %.4s extension"

5400 msgstr "忽略 %.4s 扩展"

5401

5150 -#: read-cache.c:1793

5402 +#: read-cache.c:1798

5403 #, c-format

5404 msgid "unknown index entry format 0x%08x"

5405 msgstr "未知的索引条目格式 0x%08x"

5406

5155 -#: read-cache.c:1809

5407 +#: read-cache.c:1814

5408 #, c-format

5409 msgid "malformed name field in the index, near path '%s'"

5410 msgstr "索引中靠近路径 '%s' 有错误的名称字段"

5411

5160 -#: read-cache.c:1866

5412 +#: read-cache.c:1871

5413 msgid "unordered stage entries in index"

5414 msgstr "索引中有未排序的暂存条目"

5415

5164 -#: read-cache.c:1869

5416 +#: read-cache.c:1874

5417 #, c-format

5418 msgid "multiple stage entries for merged file '%s'"

5419 msgstr "合并文件 '%s' 有多个暂存条目"

5420

5169 -#: read-cache.c:1872

5421 +#: read-cache.c:1877

5422 #, c-format

5423 msgid "unordered stage entries for '%s'"

5424 msgstr "'%s' 的未排序暂存条目"

5425

5174 -#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111

5175 -#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470

5176 -#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367

5177 -#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145

5178 -#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332

5426 +#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111

5427 +#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5428 +#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967

5429 +#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485

5430 +#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290

5431 +#: builtin/submodule--helper.c:332

5432 msgid "index file corrupt"

5433 msgstr "索引文件损坏"

5434

5182 -#: read-cache.c:2119

5435 +#: read-cache.c:2124

5436 #, c-format

5437 msgid "unable to create load_cache_entries thread: %s"

5438 msgstr "无法创建 load_cache_entries 线程：%s"

5439

5187 -#: read-cache.c:2132

5440 +#: read-cache.c:2137

5441 #, c-format

5442 msgid "unable to join load_cache_entries thread: %s"

5443 msgstr "无法加入 load_cache_entries 线程：%s"

5444

5192 -#: read-cache.c:2165

5445 +#: read-cache.c:2170

5446 #, c-format

5447 msgid "%s: index file open failed"

5448 msgstr "%s：打开索引文件失败"

5449

5197 -#: read-cache.c:2169

5450 +#: read-cache.c:2174

5451 #, c-format

5452 msgid "%s: cannot stat the open index"

5453 msgstr "%s：不能对打开的索引执行 stat 操作"

5454

5202 -#: read-cache.c:2173

5455 +#: read-cache.c:2178

5456 #, c-format

5457 msgid "%s: index file smaller than expected"

5458 msgstr "%s：索引文件比预期的小"

5459

5207 -#: read-cache.c:2177

5460 +#: read-cache.c:2182

5461 #, c-format

5462 msgid "%s: unable to map index file"

5463 msgstr "%s：无法对索引文件执行 map 操作"

5464

5212 -#: read-cache.c:2219

5465 +#: read-cache.c:2224

5466 #, c-format

5467 msgid "unable to create load_index_extensions thread: %s"

5468 msgstr "无法创建 load_index_extensions 线程：%s"

5469

5217 -#: read-cache.c:2246

5470 +#: read-cache.c:2251

5471 #, c-format

5472 msgid "unable to join load_index_extensions thread: %s"

5473 msgstr "无法加入 load_index_extensions 线程：%s"

5474

5222 -#: read-cache.c:2278

5475 +#: read-cache.c:2283

5476 #, c-format

5477 msgid "could not freshen shared index '%s'"

5478 msgstr "无法刷新共享索引 '%s'"

5479

5227 -#: read-cache.c:2325

5480 +#: read-cache.c:2330

5481 #, c-format

5482 msgid "broken index, expect %s in %s, got %s"

5483 msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

5484

5232 -#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119

5485 +#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122

5486 #, c-format

5487 msgid "could not close '%s'"

5488 msgstr "不能关闭 '%s'"

5489

5237 -#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069

5490 +#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959

5491 #, c-format

5492 msgid "could not stat '%s'"

5493 msgstr "不能对 '%s' 调用 stat"

5494

5242 -#: read-cache.c:3137

5495 +#: read-cache.c:3142

5496 #, c-format

5497 msgid "unable to open git dir: %s"

5498 msgstr "不能打开 git 目录：%s"

5499

5247 -#: read-cache.c:3149

5500 +#: read-cache.c:3154

5501 #, c-format

5502 msgid "unable to unlink: %s"

5503 msgstr "无法删除：%s"

5504

5252 -#: read-cache.c:3174

5505 +#: read-cache.c:3179

5506 #, c-format

5507 msgid "cannot fix permission bits on '%s'"

5508 msgstr "不能修复 '%s' 的权限位"

5509

5257 -#: read-cache.c:3323

5510 +#: read-cache.c:3328

5511 #, c-format

5512 msgid "%s: cannot drop to stage #0"

5513 msgstr "%s：不能落到暂存区 #0"

5514

5262 -#: rebase-interactive.c:26

5515 +#: rebase-interactive.c:11

5516 +msgid ""

5517 +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

5518 +"continue'.\n"

5519 +"Or you can abort the rebase with 'git rebase --abort'.\n"

5520 +msgstr ""

5521 +"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"

5522 +"或者您可以用 'git rebase --abort' 终止变基。\n"

5523 +

5524 +#: rebase-interactive.c:33

5525 #, c-format

5526 msgid ""

5527 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

5528 msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"

5529

5268 -#: rebase-interactive.c:35

5530 +#: rebase-interactive.c:42

5531 msgid ""

5532 "\n"

5533 "Commands:\n"

@@ -5305,14 +5567,14 @@ msgstr ""

5567 "\n"

5568 "可以对这些行重新排序，将从上至下执行。\n"

5569

5308 -#: rebase-interactive.c:56

5570 +#: rebase-interactive.c:63

5571 #, c-format

5572 msgid "Rebase %s onto %s (%d command)"

5573 msgid_plural "Rebase %s onto %s (%d commands)"

5574 msgstr[0] "变基 %s 到 %s（%d 个提交）"

5575 msgstr[1] "变基 %s 到 %s（%d 个提交）"

5576

5315 -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228

5577 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228

5578 msgid ""

5579 "\n"

5580 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

@@ -5320,7 +5582,7 @@ msgstr ""

5582 "\n"

5583 "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"

5584

5323 -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232

5585 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232

5586 msgid ""

5587 "\n"

5588 "If you remove a line here THAT COMMIT WILL BE LOST.\n"

@@ -5328,7 +5590,7 @@ msgstr ""

5590 "\n"

5591 "如果您在这里删除一行，对应的提交将会丢失。\n"

5592

5331 -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871

5593 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871

5594 msgid ""

5595 "\n"

5596 "You are editing the todo file of an ongoing interactive rebase.\n"

@@ -5342,7 +5604,7 @@ msgstr ""

5604 " git rebase --continue\n"

5605 "\n"

5606

5345 -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948

5607 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948

5608 msgid ""

5609 "\n"

5610 "However, if you remove everything, the rebase will be aborted.\n"

@@ -5352,22 +5614,19 @@ msgstr ""

5614 "然而，如果您删除全部内容，变基操作将会终止。\n"

5615 "\n"

5616

5355 -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955

5356 -msgid "Note that empty commits are commented out"

5357 -msgstr "注意空提交已被注释掉"

5358 -

5359 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536

5360 -#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254

5617 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444

5618 +#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252

5619 #, c-format

5620 msgid "could not write '%s'"

5621 msgstr "不能写入 '%s'"

5622

5365 -#: rebase-interactive.c:108

5623 +#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210

5624 +#: builtin/rebase.c:234

5625 #, c-format

5367 -msgid "could not copy '%s' to '%s'."

5368 -msgstr "不能拷贝 '%s' 至 '%s'。"

5626 +msgid "could not write '%s'."

5627 +msgstr "不能写入 '%s'。"

5628

5370 -#: rebase-interactive.c:173

5629 +#: rebase-interactive.c:193

5630 #, c-format

5631 msgid ""

5632 "Warning: some commits may have been dropped accidentally.\n"

@@ -5376,7 +5635,7 @@ msgstr ""

5635 "警告：一些提交可能被意外丢弃。\n"

5636 "丢弃的提交（从新到旧）：\n"

5637

5379 -#: rebase-interactive.c:180

5638 +#: rebase-interactive.c:200

5639 #, c-format

5640 msgid ""

5641 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -5392,6 +5651,13 @@ msgstr ""

5651 "可选值有：ignore、warn、error。\n"

5652 "\n"

5653

5654 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262

5655 +#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221

5656 +#: builtin/rebase.c:246

5657 +#, c-format

5658 +msgid "could not read '%s'."

5659 +msgstr "不能读取 '%s'。"

5660 +

5661 #: refs.c:262

5662 #, c-format

5663 msgid "%s does not point to a valid object!"

@@ -5427,15 +5693,15 @@ msgstr "引用 '%s' 已经存在"

5693 msgid "unexpected object ID when writing '%s'"

5694 msgstr "写入 '%s' 时意外的对象 ID"

5695

5430 -#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997

5431 -#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142

5696 +#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905

5697 +#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157

5698 #: wrapper.c:620

5699 #, c-format

5700 msgid "could not write to '%s'"

5701 msgstr "不能写入 '%s'"

5702

5437 -#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714

5438 -#: builtin/rebase.c:1031

5703 +#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719

5704 +#: builtin/rebase.c:1029

5705 #, c-format

5706 msgid "could not open '%s' for writing"

5707 msgstr "无法打开 '%s' 进行写入"

@@ -5489,18 +5755,18 @@ msgstr "'%s' 已存在，无法创建 '%s'"

5755 msgid "cannot process '%s' and '%s' at the same time"

5756 msgstr "无法同时处理 '%s' 和 '%s'"

5757

5492 -#: refs/files-backend.c:1234

5758 +#: refs/files-backend.c:1233

5759 #, c-format

5760 msgid "could not remove reference %s"

5761 msgstr "无法删除引用 %s"

5762

5497 -#: refs/files-backend.c:1248 refs/packed-backend.c:1541

5763 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541

5764 #: refs/packed-backend.c:1551

5765 #, c-format

5766 msgid "could not delete reference %s: %s"

5767 msgstr "无法删除引用 %s：%s"

5768

5503 -#: refs/files-backend.c:1251 refs/packed-backend.c:1554

5769 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554

5770 #, c-format

5771 msgid "could not delete references: %s"

5772 msgstr "无法删除引用：%s"

@@ -5764,45 +6030,45 @@ msgstr "选项 `%s' 必须指向一个提交"

6030 msgid "config remote shorthand cannot begin with '/': %s"

6031 msgstr "配置的远程短名称不能以 '/' 开始：%s"

6032

5767 -#: remote.c:413

6033 +#: remote.c:414

6034 msgid "more than one receivepack given, using the first"

6035 msgstr "提供了一个以上的 receivepack，使用第一个"

6036

5771 -#: remote.c:421

6037 +#: remote.c:422

6038 msgid "more than one uploadpack given, using the first"

6039 msgstr "提供了一个以上的 uploadpack，使用第一个"

6040

5775 -#: remote.c:611

6041 +#: remote.c:612

6042 #, c-format

6043 msgid "Cannot fetch both %s and %s to %s"

6044 msgstr "不能同时获取 %s 和 %s 至 %s"

6045

5780 -#: remote.c:615

6046 +#: remote.c:616

6047 #, c-format

6048 msgid "%s usually tracks %s, not %s"

6049 msgstr "%s 通常跟踪 %s，而非 %s"

6050

5785 -#: remote.c:619

6051 +#: remote.c:620

6052 #, c-format

6053 msgid "%s tracks both %s and %s"

6054 msgstr "%s 同时跟踪 %s 和 %s"

6055

5790 -#: remote.c:687

6056 +#: remote.c:688

6057 #, c-format

6058 msgid "key '%s' of pattern had no '*'"

6059 msgstr "模式的键 '%s' 没有 '*'"

6060

5795 -#: remote.c:697

6061 +#: remote.c:698

6062 #, c-format

6063 msgid "value '%s' of pattern has no '*'"

6064 msgstr "模式的值 '%s' 没有 '*'"

6065

5800 -#: remote.c:1003

6066 +#: remote.c:1004

6067 #, c-format

6068 msgid "src refspec %s does not match any"

6069 msgstr "源引用表达式 %s 没有匹配"

6070

5805 -#: remote.c:1008

6071 +#: remote.c:1009

6072 #, c-format

6073 msgid "src refspec %s matches more than one"

6074 msgstr "源引用表达式 %s 匹配超过一个"

@@ -5811,7 +6077,7 @@ msgstr "源引用表达式 %s 匹配超过一个"

6077 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

6078 #. the <src>.

6079 #.

5814 -#: remote.c:1023

6080 +#: remote.c:1024

6081 #, c-format

6082 msgid ""

6083 "The destination you provided is not a full refname (i.e.,\n"

@@ -5833,7 +6099,7 @@ msgstr ""

6099 "\n"

6100 "都不行，所以我们已放弃。您必须给出完整的引用。"

6101

5836 -#: remote.c:1043

6102 +#: remote.c:1044

6103 #, c-format

6104 msgid ""

6105 "The <src> part of the refspec is a commit object.\n"

@@ -5843,7 +6109,7 @@ msgstr ""

6109 "引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"

6110 "'%s:refs/heads/%s' 推送么？"

6111

5846 -#: remote.c:1048

6112 +#: remote.c:1049

6113 #, c-format

6114 msgid ""

6115 "The <src> part of the refspec is a tag object.\n"

@@ -5853,7 +6119,7 @@ msgstr ""

6119 "引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"

6120 "'%s:refs/tags/%s' 推送么？"

6121

5856 -#: remote.c:1053

6122 +#: remote.c:1054

6123 #, c-format

6124 msgid ""

6125 "The <src> part of the refspec is a tree object.\n"

@@ -5863,7 +6129,7 @@ msgstr ""

6129 "引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"

6130 "'%s:refs/tags/%s' 推送么？"

6131

5866 -#: remote.c:1058

6132 +#: remote.c:1059

6133 #, c-format

6134 msgid ""

6135 "The <src> part of the refspec is a blob object.\n"

@@ -5873,114 +6139,114 @@ msgstr ""

6139 "引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"

6140 "'%s:refs/tags/%s' 推送么？"

6141

5876 -#: remote.c:1094

6142 +#: remote.c:1095

6143 #, c-format

6144 msgid "%s cannot be resolved to branch"

6145 msgstr "%s 无法被解析为分支"

6146

5881 -#: remote.c:1105

6147 +#: remote.c:1106

6148 #, c-format

6149 msgid "unable to delete '%s': remote ref does not exist"

6150 msgstr "无法删除 '%s'：远程引用不存在"

6151

5886 -#: remote.c:1117

6152 +#: remote.c:1118

6153 #, c-format

6154 msgid "dst refspec %s matches more than one"

6155 msgstr "目标引用表达式 %s 匹配超过一个"

6156

5891 -#: remote.c:1124

6157 +#: remote.c:1125

6158 #, c-format

6159 msgid "dst ref %s receives from more than one src"

6160 msgstr "目标引用 %s 接收超过一个源"

6161

5896 -#: remote.c:1627 remote.c:1728

6162 +#: remote.c:1628 remote.c:1729

6163 msgid "HEAD does not point to a branch"

6164 msgstr "HEAD 没有指向一个分支"

6165

5900 -#: remote.c:1636

6166 +#: remote.c:1637

6167 #, c-format

6168 msgid "no such branch: '%s'"

6169 msgstr "没有此分支：'%s'"

6170

5905 -#: remote.c:1639

6171 +#: remote.c:1640

6172 #, c-format

6173 msgid "no upstream configured for branch '%s'"

6174 msgstr "尚未给分支 '%s' 设置上游"

6175

5910 -#: remote.c:1645

6176 +#: remote.c:1646

6177 #, c-format

6178 msgid "upstream branch '%s' not stored as a remote-tracking branch"

6179 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

6180

5915 -#: remote.c:1660

6181 +#: remote.c:1661

6182 #, c-format

6183 msgid "push destination '%s' on remote '%s' has no local tracking branch"

6184 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"

6185

5920 -#: remote.c:1672

6186 +#: remote.c:1673

6187 #, c-format

6188 msgid "branch '%s' has no remote for pushing"

6189 msgstr "分支 '%s' 没有设置要推送的远程服务器"

6190

5925 -#: remote.c:1682

6191 +#: remote.c:1683

6192 #, c-format

6193 msgid "push refspecs for '%s' do not include '%s'"

6194 msgstr "向 '%s' 推送引用规格未包含 '%s'"

6195

5930 -#: remote.c:1695

6196 +#: remote.c:1696

6197 msgid "push has no destination (push.default is 'nothing')"

6198 msgstr "推送无目标（push.default 是 'nothing'）"

6199

5934 -#: remote.c:1717

6200 +#: remote.c:1718

6201 msgid "cannot resolve 'simple' push to a single destination"

6202 msgstr "无法解析 'simple' 推送至一个单独的目标"

6203

5938 -#: remote.c:1843

6204 +#: remote.c:1844

6205 #, c-format

6206 msgid "couldn't find remote ref %s"

6207 msgstr "无法找到远程引用 %s"

6208

5943 -#: remote.c:1856

6209 +#: remote.c:1857

6210 #, c-format

6211 msgid "* Ignoring funny ref '%s' locally"

6212 msgstr "* 在本地忽略可笑的引用 '%s'"

6213

5948 -#: remote.c:2019

6214 +#: remote.c:2020

6215 #, c-format

6216 msgid "Your branch is based on '%s', but the upstream is gone.\n"

6217 msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"

6218

5953 -#: remote.c:2023

6219 +#: remote.c:2024

6220 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

6221 msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"

6222

5957 -#: remote.c:2026

6223 +#: remote.c:2027

6224 #, c-format

6225 msgid "Your branch is up to date with '%s'.\n"

6226 msgstr "您的分支与上游分支 '%s' 一致。\n"

6227

5962 -#: remote.c:2030

6228 +#: remote.c:2031

6229 #, c-format

6230 msgid "Your branch and '%s' refer to different commits.\n"

6231 msgstr "您的分支和 '%s' 指向不同的提交。\n"

6232

5967 -#: remote.c:2033

6233 +#: remote.c:2034

6234 #, c-format

6235 msgid " (use \"%s\" for details)\n"

6236 msgstr " （使用 \"%s\" 查看详情）\n"

6237

5972 -#: remote.c:2037

6238 +#: remote.c:2038

6239 #, c-format

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

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

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

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

6244

5979 -#: remote.c:2043

6245 +#: remote.c:2044

6246 msgid " (use \"git push\" to publish your local commits)\n"

6247 msgstr " （使用 \"git push\" 来发布您的本地提交）\n"

6248

5983 -#: remote.c:2046

6249 +#: remote.c:2047

6250 #, c-format

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

6252 msgid_plural ""

@@ -5989,11 +6255,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

6255 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

6256

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

5992 -#: remote.c:2054

6258 +#: remote.c:2055

6259 msgid " (use \"git pull\" to update your local branch)\n"

6260 msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"

6261

5996 -#: remote.c:2057

6262 +#: remote.c:2058

6263 #, c-format

6264 msgid ""

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

@@ -6009,11 +6275,11 @@ msgstr[1] ""

6275 "并且分别有 %d 和 %d 处不同的提交。\n"

6276

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

6012 -#: remote.c:2067

6278 +#: remote.c:2068

6279 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

6280 msgstr " （使用 \"git pull\" 来合并远程分支）\n"

6281

6016 -#: remote.c:2250

6282 +#: remote.c:2251

6283 #, c-format

6284 msgid "cannot parse expected object name '%s'"

6285 msgstr "无法解析期望的对象名 '%s'"

@@ -6028,7 +6294,7 @@ msgstr "错误的替换引用名称：%s"

6294 msgid "duplicate replace ref: %s"

6295 msgstr "重复的替换引用：%s"

6296

6031 -#: replace-object.c:73

6297 +#: replace-object.c:82

6298 #, c-format

6299 msgid "replace depth too high for object %s"

6300 msgstr "对象 %s 的替换层级太深"

@@ -6091,8 +6357,8 @@ msgstr "不能删除 stray '%s'"

6357 msgid "Recorded preimage for '%s'"

6358 msgstr "为 '%s' 记录 preimage"

6359

6094 -#: rerere.c:881 submodule.c:2067 builtin/log.c:1871

6095 -#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448

6360 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1871

6361 +#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466

6362 #, c-format

6363 msgid "could not create directory '%s'"

6364 msgstr "不能创建目录 '%s'"

@@ -6143,16 +6409,16 @@ msgstr "--first-parent 与 --bisect 不兼容"

6409 msgid "-L does not yet support diff formats besides -p and -s"

6410 msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"

6411

6146 -#: run-command.c:762

6412 +#: run-command.c:763

6413 msgid "open /dev/null failed"

6414 msgstr "不能打开 /dev/null"

6415

6150 -#: run-command.c:1268

6416 +#: run-command.c:1269

6417 #, c-format

6418 msgid "cannot create async thread: %s"

6419 msgstr "不能创建 async 线程：%s"

6420

6155 -#: run-command.c:1332

6421 +#: run-command.c:1333

6422 #, c-format

6423 msgid ""

6424 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -6197,39 +6463,39 @@ msgstr "接收端不支持原子推送"

6463 msgid "the receiving end does not support push options"

6464 msgstr "接收端不支持推送选项"

6465

6200 -#: sequencer.c:189

6466 +#: sequencer.c:191

6467 #, c-format

6468 msgid "invalid commit message cleanup mode '%s'"

6469 msgstr "无效的提交信息清理模式 '%s'"

6470

6205 -#: sequencer.c:294

6471 +#: sequencer.c:296

6472 #, c-format

6473 msgid "could not delete '%s'"

6474 msgstr "无法删除 '%s'"

6475

6210 -#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369

6476 +#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385

6477 #, c-format

6478 msgid "could not remove '%s'"

6479 msgstr "无法删除 '%s'"

6480

6215 -#: sequencer.c:323

6481 +#: sequencer.c:325

6482 msgid "revert"

6483 msgstr "还原"

6484

6219 -#: sequencer.c:325

6485 +#: sequencer.c:327

6486 msgid "cherry-pick"

6487 msgstr "拣选"

6488

6223 -#: sequencer.c:327

6224 -msgid "rebase -i"

6225 -msgstr "rebase -i"

6226 -

6489 #: sequencer.c:329

6490 +msgid "rebase"

6491 +msgstr "变基"

6492 +

6493 +#: sequencer.c:331

6494 #, c-format

6495 msgid "unknown action: %d"

6496 msgstr "未知动作：%d"

6497

6232 -#: sequencer.c:387

6498 +#: sequencer.c:389

6499 msgid ""

6500 "after resolving the conflicts, mark the corrected paths\n"

6501 "with 'git add <paths>' or 'git rm <paths>'"

@@ -6237,7 +6503,7 @@ msgstr ""

6503 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

6504 "命令标记修正后的文件"

6505

6240 -#: sequencer.c:390

6506 +#: sequencer.c:392

6507 msgid ""

6508 "after resolving the conflicts, mark the corrected paths\n"

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

@@ -6246,114 +6512,110 @@ msgstr ""

6512 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

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

6514

6249 -#: sequencer.c:403 sequencer.c:2993

6515 +#: sequencer.c:405 sequencer.c:2901

6516 #, c-format

6517 msgid "could not lock '%s'"

6518 msgstr "不能锁定 '%s'"

6519

6254 -#: sequencer.c:410

6520 +#: sequencer.c:412

6521 #, c-format

6522 msgid "could not write eol to '%s'"

6523 msgstr "不能将换行符写入 '%s'"

6524

6259 -#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013

6260 -#: sequencer.c:3277

6525 +#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921

6526 +#: sequencer.c:3185

6527 #, c-format

6528 msgid "failed to finalize '%s'"

6529 msgstr "无法完成 '%s'"

6530

6265 -#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259

6266 -#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117

6267 -#: builtin/rebase.c:589

6531 +#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167

6532 +#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120

6533 +#: builtin/rebase.c:593

6534 #, c-format

6535 msgid "could not read '%s'"

6536 msgstr "不能读取 '%s'"

6537

6272 -#: sequencer.c:464

6538 +#: sequencer.c:466

6539 #, c-format

6540 msgid "your local changes would be overwritten by %s."

6541 msgstr "您的本地修改将被%s覆盖。"

6542

6277 -#: sequencer.c:468

6543 +#: sequencer.c:470

6544 msgid "commit your changes or stash them to proceed."

6545 msgstr "提交您的修改或贮藏后再继续。"

6546

6281 -#: sequencer.c:500

6547 +#: sequencer.c:502

6548 #, c-format

6549 msgid "%s: fast-forward"

6550 msgstr "%s：快进"

6551

6286 -#: sequencer.c:539 builtin/tag.c:565

6552 +#: sequencer.c:541 builtin/tag.c:565

6553 #, c-format

6554 msgid "Invalid cleanup mode %s"

6555 msgstr "无效的清理模式 %s"

6556

6557 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

6292 -#. "rebase -i".

6558 +#. "rebase".

6559 #.

6294 -#: sequencer.c:633

6560 +#: sequencer.c:635

6561 #, c-format

6562 msgid "%s: Unable to write new index file"

6563 msgstr "%s：无法写入新索引文件"

6564

6299 -#: sequencer.c:650

6565 +#: sequencer.c:652

6566 msgid "unable to update cache tree"

6567 msgstr "不能更新缓存树"

6568

6303 -#: sequencer.c:664

6569 +#: sequencer.c:666

6570 msgid "could not resolve HEAD commit"

6571 msgstr "不能解析 HEAD 提交"

6572

6307 -#: sequencer.c:744

6573 +#: sequencer.c:746

6574 #, c-format

6575 msgid "no key present in '%.*s'"

6576 msgstr "在 '%.*s' 中没有 key"

6577

6312 -#: sequencer.c:755

6578 +#: sequencer.c:757

6579 #, c-format

6580 msgid "unable to dequote value of '%s'"

6581 msgstr "无法为 '%s' 的值去引号"

6582

6317 -#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705

6318 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074

6583 +#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6584 +#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072

6585 #, c-format

6586 msgid "could not open '%s' for reading"

6587 msgstr "无法打开 '%s' 进行读取"

6588

6323 -#: sequencer.c:802

6589 +#: sequencer.c:804

6590 msgid "'GIT_AUTHOR_NAME' already given"

6591 msgstr "已经给出 'GIT_AUTHOR_NAME'"

6592

6327 -#: sequencer.c:807

6593 +#: sequencer.c:809

6594 msgid "'GIT_AUTHOR_EMAIL' already given"

6595 msgstr "已经给出 'GIT_AUTHOR_EMAIL'"

6596

6331 -#: sequencer.c:812

6597 +#: sequencer.c:814

6598 msgid "'GIT_AUTHOR_DATE' already given"

6599 msgstr "已经给出 'GIT_AUTHOR_DATE'"

6600

6335 -#: sequencer.c:816

6601 +#: sequencer.c:818

6602 #, c-format

6603 msgid "unknown variable '%s'"

6604 msgstr "未知变量 '%s'"

6605

6340 -#: sequencer.c:821

6606 +#: sequencer.c:823

6607 msgid "missing 'GIT_AUTHOR_NAME'"

6608 msgstr "缺少 'GIT_AUTHOR_NAME'"

6609

6344 -#: sequencer.c:823

6610 +#: sequencer.c:825

6611 msgid "missing 'GIT_AUTHOR_EMAIL'"

6612 msgstr "缺少 'GIT_AUTHOR_EMAIL'"

6613

6348 -#: sequencer.c:825

6614 +#: sequencer.c:827

6615 msgid "missing 'GIT_AUTHOR_DATE'"

6616 msgstr "缺少 'GIT_AUTHOR_DATE'"

6617

6352 -#: sequencer.c:902 sequencer.c:1427

6353 -msgid "malformed ident line"

6354 -msgstr "错误的身份信息"

6355 -

6356 -#: sequencer.c:925

6618 +#: sequencer.c:876

6619 #, c-format

6620 msgid ""

6621 "you have staged changes in your working tree\n"

@@ -6382,11 +6644,11 @@ msgstr ""

6644 "\n"

6645 " git rebase --continue\n"

6646

6385 -#: sequencer.c:1218

6647 +#: sequencer.c:1148

6648 msgid "'prepare-commit-msg' hook failed"

6649 msgstr "'prepare-commit-msg' 钩子失败"

6650

6389 -#: sequencer.c:1224

6651 +#: sequencer.c:1154

6652 msgid ""

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

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

@@ -6410,7 +6672,7 @@ msgstr ""

6672 "\n"

6673 " git commit --amend --reset-author\n"

6674

6413 -#: sequencer.c:1237

6675 +#: sequencer.c:1167

6676 msgid ""

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

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

@@ -6433,330 +6695,325 @@ msgstr ""

6695 "\n"

6696 " git commit --amend --reset-author\n"

6697

6436 -#: sequencer.c:1279

6698 +#: sequencer.c:1209

6699 msgid "couldn't look up newly created commit"

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

6701

6440 -#: sequencer.c:1281

6702 +#: sequencer.c:1211

6703 msgid "could not parse newly created commit"

6704 msgstr "不能解析新创建的提交"

6705

6444 -#: sequencer.c:1327

6706 +#: sequencer.c:1257

6707 msgid "unable to resolve HEAD after creating commit"

6708 msgstr "创建提交后，不能解析 HEAD"

6709

6448 -#: sequencer.c:1329

6710 +#: sequencer.c:1259

6711 msgid "detached HEAD"

6712 msgstr "分离头指针"

6713

6714 # 译者：中文字符串拼接，可删除前导空格

6453 -#: sequencer.c:1333

6715 +#: sequencer.c:1263

6716 msgid " (root-commit)"

6717 msgstr "（根提交）"

6718

6457 -#: sequencer.c:1354

6719 +#: sequencer.c:1284

6720 msgid "could not parse HEAD"

6721 msgstr "不能解析 HEAD"

6722

6461 -#: sequencer.c:1356

6723 +#: sequencer.c:1286

6724 #, c-format

6725 msgid "HEAD %s is not a commit!"

6726 msgstr "HEAD %s 不是一个提交！"

6727

6466 -#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569

6728 +#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574

6729 msgid "could not parse HEAD commit"

6730 msgstr "不能解析 HEAD 提交"

6731

6470 -#: sequencer.c:1411 sequencer.c:2055

6732 +#: sequencer.c:1342 sequencer.c:1968

6733 msgid "unable to parse commit author"

6734 msgstr "不能解析提交作者"

6735

6474 -#: sequencer.c:1431

6475 -msgid "corrupted author without date information"

6476 -msgstr "损坏的没有日期的作者信息"

6477 -

6478 -#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684

6736 +#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687

6737 msgid "git write-tree failed to write a tree"

6738 msgstr "git write-tree 无法写入树对象"

6739

6482 -#: sequencer.c:1480 sequencer.c:1550

6740 +#: sequencer.c:1386 sequencer.c:1447

6741 #, c-format

6742 msgid "unable to read commit message from '%s'"

6743 msgstr "不能从 '%s' 读取提交说明"

6744

6487 -#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883

6488 -#: builtin/merge.c:908

6745 +#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886

6746 +#: builtin/merge.c:911

6747 msgid "failed to write commit object"

6748 msgstr "写提交对象失败"

6749

6492 -#: sequencer.c:1577

6750 +#: sequencer.c:1474

6751 #, c-format

6752 msgid "could not parse commit %s"

6753 msgstr "不能解析提交 %s"

6754

6497 -#: sequencer.c:1582

6755 +#: sequencer.c:1479

6756 #, c-format

6757 msgid "could not parse parent commit %s"

6758 msgstr "不能解析父提交 %s"

6759

6502 -#: sequencer.c:1656 sequencer.c:1767

6760 +#: sequencer.c:1562 sequencer.c:1673

6761 #, c-format

6762 msgid "unknown command: %d"

6763 msgstr "未知命令：%d"

6764

6507 -#: sequencer.c:1714 sequencer.c:1739

6765 +#: sequencer.c:1620 sequencer.c:1645

6766 #, c-format

6767 msgid "This is a combination of %d commits."

6768 msgstr "这是一个 %d 个提交的组合。"

6769

6512 -#: sequencer.c:1724

6770 +#: sequencer.c:1630

6771 msgid "need a HEAD to fixup"

6772 msgstr "需要一个 HEAD 来修复"

6773

6516 -#: sequencer.c:1726 sequencer.c:3304

6774 +#: sequencer.c:1632 sequencer.c:3212

6775 msgid "could not read HEAD"

6776 msgstr "不能读取 HEAD"

6777

6520 -#: sequencer.c:1728

6778 +#: sequencer.c:1634

6779 msgid "could not read HEAD's commit message"

6780 msgstr "不能读取 HEAD 的提交说明"

6781

6524 -#: sequencer.c:1734

6782 +#: sequencer.c:1640

6783 #, c-format

6784 msgid "cannot write '%s'"

6785 msgstr "不能写 '%s'"

6786

6529 -#: sequencer.c:1741 git-rebase--preserve-merges.sh:496

6787 +#: sequencer.c:1647 git-rebase--preserve-merges.sh:496

6788 msgid "This is the 1st commit message:"

6789 msgstr "这是第一个提交说明："

6790

6533 -#: sequencer.c:1749

6791 +#: sequencer.c:1655

6792 #, c-format

6793 msgid "could not read commit message of %s"

6794 msgstr "不能读取 %s 的提交说明"

6795

6538 -#: sequencer.c:1756

6796 +#: sequencer.c:1662

6797 #, c-format

6798 msgid "This is the commit message #%d:"

6799 msgstr "这是提交说明 #%d："

6800

6543 -#: sequencer.c:1762

6801 +#: sequencer.c:1668

6802 #, c-format

6803 msgid "The commit message #%d will be skipped:"

6804 msgstr "提交说明 #%d 将被跳过："

6805

6548 -#: sequencer.c:1850

6806 +#: sequencer.c:1756

6807 msgid "your index file is unmerged."

6808 msgstr "您的索引文件未完成合并。"

6809

6552 -#: sequencer.c:1857

6810 +#: sequencer.c:1763

6811 msgid "cannot fixup root commit"

6812 msgstr "不能修复根提交"

6813

6556 -#: sequencer.c:1876

6814 +#: sequencer.c:1782

6815 #, c-format

6816 msgid "commit %s is a merge but no -m option was given."

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

6818

6561 -#: sequencer.c:1884 sequencer.c:1892

6819 +#: sequencer.c:1790 sequencer.c:1798

6820 #, c-format

6821 msgid "commit %s does not have parent %d"

6822 msgstr "提交 %s 没有第 %d 个父提交"

6823

6566 -#: sequencer.c:1898

6824 +#: sequencer.c:1804

6825 #, c-format

6826 msgid "cannot get commit message for %s"

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

6828

6829 #. TRANSLATORS: The first %s will be a "todo" command like

6830 #. "revert" or "pick", the second %s a SHA1.

6573 -#: sequencer.c:1917

6831 +#: sequencer.c:1823

6832 #, c-format

6833 msgid "%s: cannot parse parent commit %s"

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

6835

6578 -#: sequencer.c:1982

6836 +#: sequencer.c:1888

6837 #, c-format

6838 msgid "could not rename '%s' to '%s'"

6839 msgstr "不能将 '%s' 重命名为 '%s'"

6840

6583 -#: sequencer.c:2037

6841 +#: sequencer.c:1943

6842 #, c-format

6843 msgid "could not revert %s... %s"

6844 msgstr "不能还原 %s... %s"

6845

6588 -#: sequencer.c:2038

6846 +#: sequencer.c:1944

6847 #, c-format

6848 msgid "could not apply %s... %s"

6849 msgstr "不能应用 %s... %s"

6850

6593 -#: sequencer.c:2105

6851 +#: sequencer.c:1961

6852 +#, c-format

6853 +msgid "dropping %s %s -- patch contents already upstream\n"

6854 +msgstr "丢弃 %s %s -- 补丁内容已在上游\n"

6855 +

6856 +#: sequencer.c:2018

6857 #, c-format

6858 msgid "git %s: failed to read the index"

6859 msgstr "git %s：无法读取索引"

6860

6598 -#: sequencer.c:2112

6861 +#: sequencer.c:2025

6862 #, c-format

6863 msgid "git %s: failed to refresh the index"

6864 msgstr "git %s：无法刷新索引"

6865

6603 -#: sequencer.c:2189

6866 +#: sequencer.c:2102

6867 #, c-format

6868 msgid "%s does not accept arguments: '%s'"

6869 msgstr "%s 不接受参数：'%s'"

6870

6608 -#: sequencer.c:2198

6871 +#: sequencer.c:2111

6872 #, c-format

6873 msgid "missing arguments for %s"

6874 msgstr "缺少 %s 的参数"

6875

6613 -#: sequencer.c:2235

6876 +#: sequencer.c:2142

6877 #, c-format

6615 -msgid "could not parse '%.*s'"

6616 -msgstr "无法解析 '%.*s'"

6878 +msgid "could not parse '%s'"

6879 +msgstr "无法解析 '%s'"

6880

6618 -#: sequencer.c:2289

6881 +#: sequencer.c:2203

6882 #, c-format

6883 msgid "invalid line %d: %.*s"

6884 msgstr "无效行 %d：%.*s"

6885

6623 -#: sequencer.c:2300

6886 +#: sequencer.c:2214

6887 #, c-format

6888 msgid "cannot '%s' without a previous commit"

6889 msgstr "没有父提交的情况下不能 '%s'"

6890

6628 -#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197

6629 -#: builtin/rebase.c:223 builtin/rebase.c:248

6630 -#, c-format

6631 -msgid "could not read '%s'."

6632 -msgstr "不能读取 '%s'。"

6633 -

6634 -#: sequencer.c:2384

6891 +#: sequencer.c:2298

6892 msgid "cancelling a cherry picking in progress"

6893 msgstr "正在取消一个进行中的拣选"

6894

6638 -#: sequencer.c:2391

6895 +#: sequencer.c:2305

6896 msgid "cancelling a revert in progress"

6897 msgstr "正在取消一个进行中的还原"

6898

6642 -#: sequencer.c:2435

6899 +#: sequencer.c:2349

6900 msgid "please fix this using 'git rebase --edit-todo'."

6901 msgstr "请用 'git rebase --edit-todo' 来修改。"

6902

6646 -#: sequencer.c:2437

6903 +#: sequencer.c:2351

6904 #, c-format

6905 msgid "unusable instruction sheet: '%s'"

6906 msgstr "不可用的指令清单：'%s'"

6907

6651 -#: sequencer.c:2442

6908 +#: sequencer.c:2356

6909 msgid "no commits parsed."

6910 msgstr "没有解析提交。"

6911

6655 -#: sequencer.c:2453

6912 +#: sequencer.c:2367

6913 msgid "cannot cherry-pick during a revert."

6914 msgstr "不能在回退中执行拣选。"

6915

6659 -#: sequencer.c:2455

6916 +#: sequencer.c:2369

6917 msgid "cannot revert during a cherry-pick."

6918 msgstr "不能在拣选中执行回退。"

6919

6663 -#: sequencer.c:2533

6920 +#: sequencer.c:2447

6921 #, c-format

6922 msgid "invalid value for %s: %s"

6923 msgstr "%s 的值无效：%s"

6924

6668 -#: sequencer.c:2630

6925 +#: sequencer.c:2540

6926 msgid "unusable squash-onto"

6927 msgstr "不可用的 squash-onto"

6928

6672 -#: sequencer.c:2646

6929 +#: sequencer.c:2556

6930 #, c-format

6931 msgid "malformed options sheet: '%s'"

6932 msgstr "格式错误的选项清单：'%s'"

6933

6677 -#: sequencer.c:2736 sequencer.c:4463

6934 +#: sequencer.c:2644 sequencer.c:4361

6935 msgid "empty commit set passed"

6936 msgstr "提供了空的提交集"

6937

6681 -#: sequencer.c:2752

6938 +#: sequencer.c:2660

6939 msgid "revert is already in progress"

6940 msgstr "一个还原操作已在进行"

6941

6685 -#: sequencer.c:2754

6942 +#: sequencer.c:2662

6943 #, c-format

6944 msgid "try \"git revert (--continue | %s--abort | --quit)\""

6945 msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""

6946

6690 -#: sequencer.c:2757

6947 +#: sequencer.c:2665

6948 msgid "cherry-pick is already in progress"

6949 msgstr "拣选操作已在进行"

6950

6694 -#: sequencer.c:2759

6951 +#: sequencer.c:2667

6952 #, c-format

6953 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

6954 msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""

6955

6699 -#: sequencer.c:2773

6956 +#: sequencer.c:2681

6957 #, c-format

6958 msgid "could not create sequencer directory '%s'"

6959 msgstr "不能创建序列目录 '%s'"

6960

6704 -#: sequencer.c:2788

6961 +#: sequencer.c:2696

6962 msgid "could not lock HEAD"

6963 msgstr "不能锁定 HEAD"

6964

6708 -#: sequencer.c:2848 sequencer.c:4209

6965 +#: sequencer.c:2756 sequencer.c:4099

6966 msgid "no cherry-pick or revert in progress"

6967 msgstr "拣选或还原操作并未进行"

6968

6712 -#: sequencer.c:2850 sequencer.c:2861

6969 +#: sequencer.c:2758 sequencer.c:2769

6970 msgid "cannot resolve HEAD"

6971 msgstr "不能解析 HEAD"

6972

6716 -#: sequencer.c:2852 sequencer.c:2896

6973 +#: sequencer.c:2760 sequencer.c:2804

6974 msgid "cannot abort from a branch yet to be born"

6975 msgstr "不能从尚未建立的分支终止"

6976

6720 -#: sequencer.c:2882 builtin/grep.c:736

6977 +#: sequencer.c:2790 builtin/grep.c:724

6978 #, c-format

6979 msgid "cannot open '%s'"

6980 msgstr "不能打开 '%s'"

6981

6725 -#: sequencer.c:2884

6982 +#: sequencer.c:2792

6983 #, c-format

6984 msgid "cannot read '%s': %s"

6985 msgstr "不能读取 '%s'：%s"

6986

6730 -#: sequencer.c:2885

6987 +#: sequencer.c:2793

6988 msgid "unexpected end of file"

6989 msgstr "意外的文件结束"

6990

6734 -#: sequencer.c:2891

6991 +#: sequencer.c:2799

6992 #, c-format

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

6994 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"

6995

6739 -#: sequencer.c:2902

6996 +#: sequencer.c:2810

6997 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

6998 msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"

6999

6743 -#: sequencer.c:2943

7000 +#: sequencer.c:2851

7001 msgid "no revert in progress"

7002 msgstr "没有正在进行的还原"

7003

6747 -#: sequencer.c:2951

7004 +#: sequencer.c:2859

7005 msgid "no cherry-pick in progress"

7006 msgstr "没有正在进行的拣选"

7007

6751 -#: sequencer.c:2961

7008 +#: sequencer.c:2869

7009 msgid "failed to skip the commit"

7010 msgstr "无法跳过这个提交"

7011

6755 -#: sequencer.c:2968

7012 +#: sequencer.c:2876

7013 msgid "there is nothing to skip"

7014 msgstr "没有要跳过的"

7015

6759 -#: sequencer.c:2971

7016 +#: sequencer.c:2879

7017 #, c-format

7018 msgid ""

7019 "have you committed already?\n"

@@ -6765,21 +7022,21 @@ msgstr ""

7022 "您已经提交了么？\n"

7023 "试试 \"git %s --continue\""

7024

6768 -#: sequencer.c:3095 sequencer.c:4121

7025 +#: sequencer.c:3003 sequencer.c:4011

7026 #, c-format

7027 msgid "could not update %s"

7028 msgstr "不能更新 %s"

7029

6773 -#: sequencer.c:3134 sequencer.c:4101

7030 +#: sequencer.c:3042 sequencer.c:3991

7031 msgid "cannot read HEAD"

7032 msgstr "不能读取 HEAD"

7033

6777 -#: sequencer.c:3151

7034 +#: sequencer.c:3059

7035 #, c-format

7036 msgid "unable to copy '%s' to '%s'"

7037 msgstr "无法拷贝 '%s' 至 '%s'"

7038

6782 -#: sequencer.c:3159

7039 +#: sequencer.c:3067

7040 #, c-format

7041 msgid ""

7042 "You can amend the commit now, with\n"

@@ -6798,23 +7055,23 @@ msgstr ""

7055 "\n"

7056 " git rebase --continue\n"

7057

6801 -#: sequencer.c:3169

7058 +#: sequencer.c:3077

7059 #, c-format

7060 msgid "Could not apply %s... %.*s"

7061 msgstr "不能应用 %s... %.*s"

7062

6806 -#: sequencer.c:3176

7063 +#: sequencer.c:3084

7064 #, c-format

7065 msgid "Could not merge %.*s"

7066 msgstr "不能合并 %.*s"

7067

6811 -#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641

7068 +#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641

7069 #, c-format

7070 msgid "could not copy '%s' to '%s'"

7071 msgstr "不能拷贝 '%s' 至 '%s'"

7072

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

6817 -#: sequencer.c:3221

7074 +#: sequencer.c:3129

7075 #, c-format

7076 msgid ""

7077 "execution failed: %s\n"

@@ -6829,11 +7086,11 @@ msgstr ""

7086 " git rebase --continue\n"

7087 "\n"

7088

6832 -#: sequencer.c:3227

7089 +#: sequencer.c:3135

7090 msgid "and made changes to the index and/or the working tree\n"

7091 msgstr "并且修改索引和/或工作区\n"

7092

6836 -#: sequencer.c:3233

7093 +#: sequencer.c:3141

7094 #, c-format

7095 msgid ""

7096 "execution succeeded: %s\n"

@@ -6850,72 +7107,72 @@ msgstr ""

7107 " git rebase --continue\n"

7108 "\n"

7109

6853 -#: sequencer.c:3294

7110 +#: sequencer.c:3202

7111 #, c-format

7112 msgid "illegal label name: '%.*s'"

7113 msgstr "非法的标签名称：'%.*s'"

7114

6858 -#: sequencer.c:3348

7115 +#: sequencer.c:3256

7116 msgid "writing fake root commit"

7117 msgstr "写伪根提交"

7118

6862 -#: sequencer.c:3353

7119 +#: sequencer.c:3261

7120 msgid "writing squash-onto"

7121 msgstr "写入 squash-onto"

7122

6866 -#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882

7123 +#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886

7124 #, c-format

7125 msgid "failed to find tree of %s"

7126 msgstr "无法找到 %s 指向的树。"

7127

6871 -#: sequencer.c:3436

7128 +#: sequencer.c:3344

7129 #, c-format

7130 msgid "could not resolve '%s'"

7131 msgstr "无法解析 '%s'"

7132

6876 -#: sequencer.c:3467

7133 +#: sequencer.c:3375

7134 msgid "cannot merge without a current revision"

7135 msgstr "没有当前版本不能合并"

7136

6880 -#: sequencer.c:3489

7137 +#: sequencer.c:3397

7138 #, c-format

7139 msgid "unable to parse '%.*s'"

7140 msgstr "无法解析 '%.*s'"

7141

6885 -#: sequencer.c:3498

7142 +#: sequencer.c:3406

7143 #, c-format

7144 msgid "nothing to merge: '%.*s'"

7145 msgstr "无可用合并：'%.*s'"

7146

6890 -#: sequencer.c:3510

7147 +#: sequencer.c:3418

7148 msgid "octopus merge cannot be executed on top of a [new root]"

7149 msgstr "章鱼合并不能在一个新的根提交上执行"

7150

6894 -#: sequencer.c:3526

7151 +#: sequencer.c:3434

7152 #, c-format

7153 msgid "could not get commit message of '%s'"

7154 msgstr "不能获取 '%s' 的提交说明"

7155

6899 -#: sequencer.c:3688

7156 +#: sequencer.c:3594

7157 #, c-format

7158 msgid "could not even attempt to merge '%.*s'"

7159 msgstr "甚至不能尝试合并 '%.*s'"

7160

6904 -#: sequencer.c:3704

7161 +#: sequencer.c:3610

7162 msgid "merge: Unable to write new index file"

7163 msgstr "合并：无法写入新索引文件"

7164

6908 -#: sequencer.c:3773 builtin/rebase.c:733

7165 +#: sequencer.c:3679 builtin/rebase.c:737

7166 #, c-format

7167 msgid "Applied autostash.\n"

7168 msgstr "已应用 autostash。\n"

7169

6913 -#: sequencer.c:3785

7170 +#: sequencer.c:3691

7171 #, c-format

7172 msgid "cannot store %s"

7173 msgstr "不能存储 %s"

7174

6918 -#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113

7175 +#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113

7176 #, c-format

7177 msgid ""

7178 "Applying autostash resulted in conflicts.\n"

@@ -6926,31 +7183,26 @@ msgstr ""

7183 "您的修改安全地保存在贮藏区中。\n"

7184 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"

7185

6929 -#: sequencer.c:3849

6930 -#, c-format

6931 -msgid "could not checkout %s"

6932 -msgstr "不能检出 %s"

6933 -

6934 -#: sequencer.c:3863

7186 +#: sequencer.c:3755

7187 #, c-format

7188 msgid "%s: not a valid OID"

7189 msgstr "%s：不是一个有效的对象 ID"

7190

6939 -#: sequencer.c:3868 git-rebase--preserve-merges.sh:779

7191 +#: sequencer.c:3760 git-rebase--preserve-merges.sh:779

7192 msgid "could not detach HEAD"

7193 msgstr "不能分离头指针"

7194

6943 -#: sequencer.c:3883

7195 +#: sequencer.c:3775

7196 #, c-format

7197 msgid "Stopped at HEAD\n"

7198 msgstr "停止在 HEAD\n"

7199

6948 -#: sequencer.c:3885

7200 +#: sequencer.c:3777

7201 #, c-format

7202 msgid "Stopped at %s\n"

7203 msgstr "停止在 %s\n"

7204

6953 -#: sequencer.c:3893

7205 +#: sequencer.c:3785

7206 #, c-format

7207 msgid ""

7208 "Could not execute the todo command\n"

@@ -6970,48 +7222,48 @@ msgstr ""

7222 " git rebase --edit-todo\n"

7223 " git rebase --continue\n"

7224

6973 -#: sequencer.c:3979

7225 +#: sequencer.c:3869

7226 #, c-format

7227 msgid "Stopped at %s... %.*s\n"

7228 msgstr "停止在 %s... %.*s\n"

7229

6978 -#: sequencer.c:4050

7230 +#: sequencer.c:3940

7231 #, c-format

7232 msgid "unknown command %d"

7233 msgstr "未知命令 %d"

7234

6983 -#: sequencer.c:4109

7235 +#: sequencer.c:3999

7236 msgid "could not read orig-head"

7237 msgstr "不能读取 orig-head"

7238

6987 -#: sequencer.c:4114

7239 +#: sequencer.c:4004

7240 msgid "could not read 'onto'"

7241 msgstr "不能读取 'onto'"

7242

6991 -#: sequencer.c:4128

7243 +#: sequencer.c:4018

7244 #, c-format

7245 msgid "could not update HEAD to %s"

7246 msgstr "不能更新 HEAD 为 %s"

7247

6996 -#: sequencer.c:4221

7248 +#: sequencer.c:4111

7249 msgid "cannot rebase: You have unstaged changes."

7250 msgstr "不能变基：您有未暂存的变更。"

7251

7000 -#: sequencer.c:4230

7252 +#: sequencer.c:4120

7253 msgid "cannot amend non-existing commit"

7254 msgstr "不能修补不存在的提交"

7255

7004 -#: sequencer.c:4232

7256 +#: sequencer.c:4122

7257 #, c-format

7258 msgid "invalid file: '%s'"

7259 msgstr "无效文件：'%s'"

7260

7009 -#: sequencer.c:4234

7261 +#: sequencer.c:4124

7262 #, c-format

7263 msgid "invalid contents: '%s'"

7264 msgstr "无效内容：'%s'"

7265

7014 -#: sequencer.c:4237

7266 +#: sequencer.c:4127

7267 msgid ""

7268 "\n"

7269 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -7020,68 +7272,59 @@ msgstr ""

7272 "\n"

7273 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"

7274

7023 -#: sequencer.c:4273 sequencer.c:4312

7275 +#: sequencer.c:4163 sequencer.c:4202

7276 #, c-format

7277 msgid "could not write file: '%s'"

7278 msgstr "不能写入文件：'%s'"

7279

7028 -#: sequencer.c:4327

7280 +#: sequencer.c:4217

7281 msgid "could not remove CHERRY_PICK_HEAD"

7282 msgstr "不能删除 CHERRY_PICK_HEAD"

7283

7032 -#: sequencer.c:4334

7284 +#: sequencer.c:4224

7285 msgid "could not commit staged changes."

7286 msgstr "不能提交暂存的修改。"

7287

7036 -#: sequencer.c:4440

7288 +#: sequencer.c:4338

7289 #, c-format

7290 msgid "%s: can't cherry-pick a %s"

7291 msgstr "%s：不能拣选一个%s"

7292

7041 -#: sequencer.c:4444

7293 +#: sequencer.c:4342

7294 #, c-format

7295 msgid "%s: bad revision"

7296 msgstr "%s：错误的版本"

7297

7046 -#: sequencer.c:4479

7298 +#: sequencer.c:4377

7299 msgid "can't revert as initial commit"

7300 msgstr "不能作为初始提交回退"

7301

7050 -#: sequencer.c:4952

7302 +#: sequencer.c:4846

7303 msgid "make_script: unhandled options"

7304 msgstr "make_script：有未能处理的选项"

7305

7054 -#: sequencer.c:4955

7306 +#: sequencer.c:4849

7307 msgid "make_script: error preparing revisions"

7308 msgstr "make_script：准备版本时错误"

7309

7058 -#: sequencer.c:5113

7059 -msgid ""

7060 -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

7061 -"continue'.\n"

7062 -"Or you can abort the rebase with 'git rebase --abort'.\n"

7063 -msgstr ""

7064 -"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"

7065 -"或者您可以用 'git rebase --abort' 终止变基。\n"

7066 -

7067 -#: sequencer.c:5226 sequencer.c:5243

7310 +#: sequencer.c:5083 sequencer.c:5100

7311 msgid "nothing to do"

7312 msgstr "无事可做"

7313

7071 -#: sequencer.c:5257

7314 +#: sequencer.c:5119

7315 msgid "could not skip unnecessary pick commands"

7316 msgstr "无法跳过不必要的拣选"

7317

7075 -#: sequencer.c:5351

7318 +#: sequencer.c:5213

7319 msgid "the script was already rearranged."

7320 msgstr "脚本已经重新编排。"

7321

7322 #: setup.c:124

7323 #, c-format

7081 -msgid "'%s' is outside repository"

7082 -msgstr "'%s' 在仓库之外"

7324 +msgid "'%s' is outside repository at '%s'"

7325 +msgstr "'%s' 在仓库（'%s' 中）之外"

7326

7084 -#: setup.c:174

7327 +#: setup.c:175

7328 #, c-format

7329 msgid ""

7330 "%s: no such path in the working tree.\n"

@@ -7090,7 +7333,7 @@ msgstr ""

7333 "%s：工作区中无此路径。\n"

7334 "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"

7335

7093 -#: setup.c:187

7336 +#: setup.c:188

7337 #, c-format

7338 msgid ""

7339 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"

@@ -7101,12 +7344,12 @@ msgstr ""

7344 "使用 '--' 来分隔版本和路径，例如：\n"

7345 "'git <命令> [<版本>...] -- [<文件>...]'"

7346

7104 -#: setup.c:236

7347 +#: setup.c:254

7348 #, c-format

7349 msgid "option '%s' must come before non-option arguments"

7350 msgstr "选项 '%s' 必须在其他非选项参数之前"

7351

7109 -#: setup.c:255

7352 +#: setup.c:273

7353 #, c-format

7354 msgid ""

7355 "ambiguous argument '%s': both revision and filename\n"

@@ -7117,92 +7360,92 @@ msgstr ""

7360 "使用 '--' 来分隔版本和路径，例如：\n"

7361 "'git <命令> [<版本>...] -- [<文件>...]'"

7362

7120 -#: setup.c:391

7363 +#: setup.c:409

7364 msgid "unable to set up work tree using invalid config"

7365 msgstr "无法使用无效配置来创建工作区"

7366

7124 -#: setup.c:395

7367 +#: setup.c:413

7368 msgid "this operation must be run in a work tree"

7369 msgstr "该操作必须在一个工作区中运行"

7370

7128 -#: setup.c:541

7371 +#: setup.c:559

7372 #, c-format

7373 msgid "Expected git repo version <= %d, found %d"

7374 msgstr "期望 git 仓库版本 <= %d，却得到 %d"

7375

7133 -#: setup.c:549

7376 +#: setup.c:567

7377 msgid "unknown repository extensions found:"

7378 msgstr "发现未知的仓库扩展："

7379

7137 -#: setup.c:568

7380 +#: setup.c:586

7381 #, c-format

7382 msgid "error opening '%s'"

7383 msgstr "打开 '%s' 出错"

7384

7142 -#: setup.c:570

7385 +#: setup.c:588

7386 #, c-format

7387 msgid "too large to be a .git file: '%s'"

7388 msgstr "文件太大，无法作为 .git 文件：'%s'"

7389

7147 -#: setup.c:572

7390 +#: setup.c:590

7391 #, c-format

7392 msgid "error reading %s"

7393 msgstr "读取 %s 出错"

7394

7152 -#: setup.c:574

7395 +#: setup.c:592

7396 #, c-format

7397 msgid "invalid gitfile format: %s"

7398 msgstr "无效的 gitfile 格式：%s"

7399

7157 -#: setup.c:576

7400 +#: setup.c:594

7401 #, c-format

7402 msgid "no path in gitfile: %s"

7403 msgstr "在 gitfile 中没有路径：%s"

7404

7162 -#: setup.c:578

7405 +#: setup.c:596

7406 #, c-format

7407 msgid "not a git repository: %s"

7408 msgstr "不是一个 git 仓库：%s"

7409

7167 -#: setup.c:677

7410 +#: setup.c:695

7411 #, c-format

7412 msgid "'$%s' too big"

7413 msgstr "'$%s' 太大"

7414

7172 -#: setup.c:691

7415 +#: setup.c:709

7416 #, c-format

7417 msgid "not a git repository: '%s'"

7418 msgstr "不是一个 git 仓库：'%s'"

7419

7177 -#: setup.c:720 setup.c:722 setup.c:753

7420 +#: setup.c:738 setup.c:740 setup.c:771

7421 #, c-format

7422 msgid "cannot chdir to '%s'"

7423 msgstr "不能切换目录到 '%s'"

7424

7182 -#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838

7425 +#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856

7426 msgid "cannot come back to cwd"

7427 msgstr "无法返回当前工作目录"

7428

7186 -#: setup.c:852

7429 +#: setup.c:870

7430 #, c-format

7431 msgid "failed to stat '%*s%s%s'"

7432 msgstr "获取 '%*s%s%s' 状态（stat）失败"

7433

7191 -#: setup.c:1090

7434 +#: setup.c:1108

7435 msgid "Unable to read current working directory"

7436 msgstr "不能读取当前工作目录"

7437

7195 -#: setup.c:1099 setup.c:1105

7438 +#: setup.c:1117 setup.c:1123

7439 #, c-format

7440 msgid "cannot change to '%s'"

7441 msgstr "不能切换到 '%s'"

7442

7200 -#: setup.c:1110

7443 +#: setup.c:1128

7444 #, c-format

7445 msgid "not a git repository (or any of the parent directories): %s"

7446 msgstr "不是一个 git 仓库（或者任何父目录）：%s"

7447

7205 -#: setup.c:1116

7448 +#: setup.c:1134

7449 #, c-format

7450 msgid ""

7451 "not a git repository (or any parent up to mount point %s)\n"

@@ -7211,7 +7454,7 @@ msgstr ""

7454 "不是一个 git 仓库（或者直至挂载点 %s 的任何父目录）\n"

7455 "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"

7456

7214 -#: setup.c:1227

7457 +#: setup.c:1245

7458 #, c-format

7459 msgid ""

7460 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -7220,15 +7463,15 @@ msgstr ""

7463 "参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"

7464 "文件属主必须始终拥有读写权限。"

7465

7223 -#: setup.c:1271

7466 +#: setup.c:1289

7467 msgid "open /dev/null or dup failed"

7468 msgstr "不能打开或者复制 /dev/null"

7469

7227 -#: setup.c:1286

7470 +#: setup.c:1304

7471 msgid "fork failed"

7472 msgstr "fork 失败"

7473

7231 -#: setup.c:1291

7474 +#: setup.c:1309

7475 msgid "setsid failed"

7476 msgstr "setsid 失败"

7477

@@ -7308,194 +7551,194 @@ msgstr "mmap 失败"

7551 msgid "object file %s is empty"

7552 msgstr "对象文件 %s 为空"

7553

7311 -#: sha1-file.c:1252 sha1-file.c:2392

7554 +#: sha1-file.c:1263 sha1-file.c:2443

7555 #, c-format

7556 msgid "corrupt loose object '%s'"

7557 msgstr "损坏的松散对象 '%s'"

7558

7316 -#: sha1-file.c:1254 sha1-file.c:2396

7559 +#: sha1-file.c:1265 sha1-file.c:2447

7560 #, c-format

7561 msgid "garbage at end of loose object '%s'"

7562 msgstr "松散对象 '%s' 后面有垃圾数据"

7563

7321 -#: sha1-file.c:1296

7564 +#: sha1-file.c:1307

7565 msgid "invalid object type"

7566 msgstr "无效的对象类型"

7567

7325 -#: sha1-file.c:1380

7568 +#: sha1-file.c:1391

7569 #, c-format

7570 msgid "unable to unpack %s header with --allow-unknown-type"

7571 msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"

7572

7330 -#: sha1-file.c:1383

7573 +#: sha1-file.c:1394

7574 #, c-format

7575 msgid "unable to unpack %s header"

7576 msgstr "无法解开 %s 头部"

7577

7335 -#: sha1-file.c:1389

7578 +#: sha1-file.c:1400

7579 #, c-format

7580 msgid "unable to parse %s header with --allow-unknown-type"

7581 msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"

7582

7340 -#: sha1-file.c:1392

7583 +#: sha1-file.c:1403

7584 #, c-format

7585 msgid "unable to parse %s header"

7586 msgstr "无法解析 %s 头部"

7587

7345 -#: sha1-file.c:1584

7588 +#: sha1-file.c:1629

7589 #, c-format

7590 msgid "failed to read object %s"

7591 msgstr "读取对象 %s 失败"

7592

7350 -#: sha1-file.c:1588

7593 +#: sha1-file.c:1633

7594 #, c-format

7595 msgid "replacement %s not found for %s"

7596 msgstr "找不到 %2$s 的替代 %1$s"

7597

7355 -#: sha1-file.c:1592

7598 +#: sha1-file.c:1637

7599 #, c-format

7600 msgid "loose object %s (stored in %s) is corrupt"

7601 msgstr "松散对象 %s（保存在 %s）已损坏"

7602

7360 -#: sha1-file.c:1596

7603 +#: sha1-file.c:1641

7604 #, c-format

7605 msgid "packed object %s (stored in %s) is corrupt"

7606 msgstr "打包对象 %s（保存在 %s）已损坏"

7607

7365 -#: sha1-file.c:1699

7608 +#: sha1-file.c:1746

7609 #, c-format

7610 msgid "unable to write file %s"

7611 msgstr "无法写文件 %s"

7612

7370 -#: sha1-file.c:1706

7613 +#: sha1-file.c:1753

7614 #, c-format

7615 msgid "unable to set permission to '%s'"

7616 msgstr "无法为 '%s' 设置权限"

7617

7375 -#: sha1-file.c:1713

7618 +#: sha1-file.c:1760

7619 msgid "file write error"

7620 msgstr "文件写错误"

7621

7379 -#: sha1-file.c:1732

7622 +#: sha1-file.c:1780

7623 msgid "error when closing loose object file"

7624 msgstr "关闭松散对象文件时出错"

7625

7383 -#: sha1-file.c:1797

7626 +#: sha1-file.c:1845

7627 #, c-format

7628 msgid "insufficient permission for adding an object to repository database %s"

7629 msgstr "权限不足，无法在仓库对象库 %s 中添加对象"

7630

7388 -#: sha1-file.c:1799

7631 +#: sha1-file.c:1847

7632 msgid "unable to create temporary file"

7633 msgstr "无法创建临时文件"

7634

7392 -#: sha1-file.c:1823

7635 +#: sha1-file.c:1871

7636 msgid "unable to write loose object file"

7637 msgstr "不能写松散对象文件"

7638

7396 -#: sha1-file.c:1829

7639 +#: sha1-file.c:1877

7640 #, c-format

7641 msgid "unable to deflate new object %s (%d)"

7642 msgstr "不能压缩新对象 %s（%d）"

7643

7401 -#: sha1-file.c:1833

7644 +#: sha1-file.c:1881

7645 #, c-format

7646 msgid "deflateEnd on object %s failed (%d)"

7647 msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"

7648

7406 -#: sha1-file.c:1837

7649 +#: sha1-file.c:1885

7650 #, c-format

7651 msgid "confused by unstable object source data for %s"

7652 msgstr "被 %s 的不稳定对象源数据搞糊涂了"

7653

7411 -#: sha1-file.c:1847 builtin/pack-objects.c:925

7654 +#: sha1-file.c:1895 builtin/pack-objects.c:1054

7655 #, c-format

7656 msgid "failed utime() on %s"

7657 msgstr "在 %s 上调用 utime() 失败"

7658

7416 -#: sha1-file.c:1922

7659 +#: sha1-file.c:1972

7660 #, c-format

7661 msgid "cannot read object for %s"

7662 msgstr "不能读取对象 %s"

7663

7421 -#: sha1-file.c:1962

7664 +#: sha1-file.c:2011

7665 msgid "corrupt commit"

7666 msgstr "损坏的提交"

7667

7425 -#: sha1-file.c:1970

7668 +#: sha1-file.c:2019

7669 msgid "corrupt tag"

7670 msgstr "损坏的标签"

7671

7429 -#: sha1-file.c:2069

7672 +#: sha1-file.c:2119

7673 #, c-format

7674 msgid "read error while indexing %s"

7675 msgstr "索引 %s 时读取错误"

7676

7434 -#: sha1-file.c:2072

7677 +#: sha1-file.c:2122

7678 #, c-format

7679 msgid "short read while indexing %s"

7680 msgstr "索引 %s 时读入不完整"

7681

7439 -#: sha1-file.c:2145 sha1-file.c:2154

7682 +#: sha1-file.c:2195 sha1-file.c:2205

7683 #, c-format

7684 msgid "%s: failed to insert into database"

7685 msgstr "%s：插入数据库失败"

7686

7444 -#: sha1-file.c:2160

7687 +#: sha1-file.c:2211

7688 #, c-format

7689 msgid "%s: unsupported file type"

7690 msgstr "%s：不支持的文件类型"

7691

7449 -#: sha1-file.c:2184

7692 +#: sha1-file.c:2235

7693 #, c-format

7694 msgid "%s is not a valid object"

7695 msgstr "%s 不是一个有效的对象"

7696

7454 -#: sha1-file.c:2186

7697 +#: sha1-file.c:2237

7698 #, c-format

7699 msgid "%s is not a valid '%s' object"

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

7701

7459 -#: sha1-file.c:2213 builtin/index-pack.c:155

7702 +#: sha1-file.c:2264 builtin/index-pack.c:155

7703 #, c-format

7704 msgid "unable to open %s"

7705 msgstr "不能打开 %s"

7706

7464 -#: sha1-file.c:2403 sha1-file.c:2455

7707 +#: sha1-file.c:2454 sha1-file.c:2507

7708 #, c-format

7709 msgid "hash mismatch for %s (expected %s)"

7710 msgstr "%s 的哈希值不匹配（预期 %s）"

7711

7469 -#: sha1-file.c:2427

7712 +#: sha1-file.c:2478

7713 #, c-format

7714 msgid "unable to mmap %s"

7715 msgstr "不能 mmap %s"

7716

7474 -#: sha1-file.c:2432

7717 +#: sha1-file.c:2483

7718 #, c-format

7719 msgid "unable to unpack header of %s"

7720 msgstr "无法解压缩 %s 的头部"

7721

7479 -#: sha1-file.c:2438

7722 +#: sha1-file.c:2489

7723 #, c-format

7724 msgid "unable to parse header of %s"

7725 msgstr "无法解析 %s 的头部"

7726

7484 -#: sha1-file.c:2449

7727 +#: sha1-file.c:2500

7728 #, c-format

7729 msgid "unable to unpack contents of %s"

7730 msgstr "无法解压缩 %s 的内容"

7731

7489 -#: sha1-name.c:487

7732 +#: sha1-name.c:486

7733 #, c-format

7734 msgid "short SHA1 %s is ambiguous"

7735 msgstr "短 SHA1 %s 存在歧义"

7736

7494 -#: sha1-name.c:498

7737 +#: sha1-name.c:497

7738 msgid "The candidates are:"

7739 msgstr "候选者有："

7740

7498 -#: sha1-name.c:797

7741 +#: sha1-name.c:796

7742 msgid ""

7743 "Git normally never creates a ref that ends with 40 hex characters\n"

7744 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -7516,44 +7759,110 @@ msgstr ""

7759 "引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n"

7760 "false\" 命令关闭本消息通知。"

7761

7762 +#: sha1-name.c:916

7763 +#, c-format

7764 +msgid "log for '%.*s' only goes back to %s"

7765 +msgstr "'%.*s' 的日志仅能回到 %s"

7766 +

7767 +#: sha1-name.c:924

7768 +#, c-format

7769 +msgid "log for '%.*s' only has %d entries"

7770 +msgstr "'%.*s' 的日志仅有 %d 个条目"

7771 +

7772 +#: sha1-name.c:1689

7773 +#, c-format

7774 +msgid "path '%s' exists on disk, but not in '%.*s'"

7775 +msgstr "路径 '%s' 在磁盘上，但是不在 '%.*s' 中"

7776 +

7777 +#: sha1-name.c:1695

7778 +#, c-format

7779 +msgid ""

7780 +"path '%s' exists, but not '%s'\n"

7781 +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"

7782 +msgstr ""

7783 +"路径 '%s' 存在，但是不在 '%s' 中\n"

7784 +"提示：您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'？"

7785 +

7786 +#: sha1-name.c:1704

7787 +#, c-format

7788 +msgid "path '%s' does not exist in '%.*s'"

7789 +msgstr "路径 '%s' 不在 '%.*s' 中"

7790 +

7791 +#: sha1-name.c:1732

7792 +#, c-format

7793 +msgid ""

7794 +"path '%s' is in the index, but not at stage %d\n"

7795 +"hint: Did you mean ':%d:%s'?"

7796 +msgstr ""

7797 +"路径 '%s' 在索引中，但不在暂存区 %d 中\n"

7798 +"提示：您的意思是 ':%d:%s'？"

7799 +

7800 +#: sha1-name.c:1748

7801 +#, c-format

7802 +msgid ""

7803 +"path '%s' is in the index, but not '%s'\n"

7804 +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"

7805 +msgstr ""

7806 +"路径 '%s' 在索引中，但是不在 '%s' 中\n"

7807 +"提示：您的意思是 ':%d:%s' 亦即 ':%d:./%s'？"

7808 +

7809 +#: sha1-name.c:1756

7810 +#, c-format

7811 +msgid "path '%s' exists on disk, but not in the index"

7812 +msgstr "路径 '%s' 在磁盘中，但不在索引里"

7813 +

7814 +#: sha1-name.c:1758

7815 +#, c-format

7816 +msgid "path '%s' does not exist (neither on disk nor in the index)"

7817 +msgstr "路径 '%s' 不存在（既不在磁盘中，也不在索引中）"

7818 +

7819 +#: sha1-name.c:1771

7820 +msgid "relative path syntax can't be used outside working tree"

7821 +msgstr "不能在工作区之外使用相对路径语法"

7822 +

7823 +#: sha1-name.c:1909

7824 +#, c-format

7825 +msgid "invalid object name '%.*s'."

7826 +msgstr "无效的对象名 '%.*s'。"

7827 +

7828 #. TRANSLATORS: IEC 80000-13:2008 gibibyte

7520 -#: strbuf.c:822

7829 +#: strbuf.c:837

7830 #, c-format

7831 msgid "%u.%2.2u GiB"

7832 msgstr "%u.%2.2u GiB"

7833

7834 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second

7526 -#: strbuf.c:824

7835 +#: strbuf.c:839

7836 #, c-format

7837 msgid "%u.%2.2u GiB/s"

7838 msgstr "%u.%2.2u GiB/s"

7839

7840 #. TRANSLATORS: IEC 80000-13:2008 mebibyte

7532 -#: strbuf.c:832

7841 +#: strbuf.c:847

7842 #, c-format

7843 msgid "%u.%2.2u MiB"

7844 msgstr "%u.%2.2u MiB"

7845

7846 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second

7538 -#: strbuf.c:834

l10n: zh_CN: for git v2.26.0 l10n round 1 and 2