bfef3f9d23 · matheusbsbs/matheus-bagliano

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

8 msgstr ""

9 "Project-Id-Version: PACKAGE VERSION\n"

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

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

11 +"POT-Creation-Date: 2020-05-15 09:11+0800\n"

12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14 "Language-Team: LANGUAGE <LL@li.org>\n"

@@ -23,9 +23,9 @@ msgstr ""

23 msgid "Huh (%s)?"

24 msgstr ""

25

26 -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124

27 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687

28 -#: builtin/rebase.c:2086 builtin/rebase.c:2130

26 +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142

27 +#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518

28 +#: builtin/rebase.c:1919

29 msgid "could not read index"

30 msgstr ""

31

@@ -53,8 +53,7 @@ msgstr ""

53 msgid "could not stage '%s'"

54 msgstr ""

55

56 -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317

57 -#: builtin/rebase.c:899

56 +#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336

57 msgid "could not write index"

58 msgstr ""

59

@@ -70,8 +69,8 @@ msgstr[1] ""

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

70 msgstr ""

71

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

74 -#: builtin/reset.c:144

72 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294

73 +#: builtin/reset.c:145

74 #, c-format

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

76 msgstr ""

@@ -194,11 +193,11 @@ msgstr ""

193 msgid "(empty) select nothing"

194 msgstr ""

195

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

196 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851

197 msgid "*** Commands ***"

198 msgstr ""

199

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

200 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848

201 msgid "What now"

202 msgstr ""

203

@@ -210,12 +209,13 @@ msgstr ""

209 msgid "unstaged"

210 msgstr ""

211

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

214 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144

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

212 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250

213 +#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145

214 +#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409

215 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397

216 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905

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

217 +#: builtin/submodule--helper.c:2148 bugreport.c:129

218 +#: git-add--interactive.perl:213

219 msgid "path"

220 msgstr ""

221

@@ -223,33 +223,33 @@ msgstr ""

223 msgid "could not refresh index"

224 msgstr ""

225

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

226 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765

227 #, c-format

228 msgid "Bye.\n"

229 msgstr ""

230

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

231 +#: add-patch.c:34 git-add--interactive.perl:1428

232 #, c-format, perl-format

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

234 msgstr ""

235

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

236 +#: add-patch.c:35 git-add--interactive.perl:1429

237 #, c-format, perl-format

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

239 msgstr ""

240

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

241 +#: add-patch.c:36 git-add--interactive.perl:1430

242 #, c-format, perl-format

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

244 msgstr ""

245

246 -#: add-patch.c:37

246 +#: add-patch.c:38

247 msgid ""

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

249 "staging."

250 msgstr ""

251

252 -#: add-patch.c:40

252 +#: add-patch.c:41

253 msgid ""

254 "y - stage this hunk\n"

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

@@ -258,28 +258,28 @@ msgid ""

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

259 msgstr ""

260

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

261 +#: add-patch.c:55 git-add--interactive.perl:1433

262 #, c-format, perl-format

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

264 msgstr ""

265

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

266 +#: add-patch.c:56 git-add--interactive.perl:1434

267 #, c-format, perl-format

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

269 msgstr ""

270

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

271 +#: add-patch.c:57 git-add--interactive.perl:1435

272 #, c-format, perl-format

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

274 msgstr ""

275

276 -#: add-patch.c:58

276 +#: add-patch.c:59

277 msgid ""

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

279 "stashing."

280 msgstr ""

281

282 -#: add-patch.c:61

282 +#: add-patch.c:62

283 msgid ""

284 "y - stash this hunk\n"

285 "n - do not stash this hunk\n"

@@ -288,28 +288,28 @@ msgid ""

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

289 msgstr ""

290

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

291 +#: add-patch.c:78 git-add--interactive.perl:1438

292 #, c-format, perl-format

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

294 msgstr ""

295

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

296 +#: add-patch.c:79 git-add--interactive.perl:1439

297 #, c-format, perl-format

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

299 msgstr ""

300

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

301 +#: add-patch.c:80 git-add--interactive.perl:1440

302 #, c-format, perl-format

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

304 msgstr ""

305

306 -#: add-patch.c:81

306 +#: add-patch.c:82

307 msgid ""

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

309 "unstaging."

310 msgstr ""

311

312 -#: add-patch.c:84

312 +#: add-patch.c:85

313 msgid ""

314 "y - unstage this hunk\n"

315 "n - do not unstage this hunk\n"

@@ -318,28 +318,28 @@ msgid ""

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

319 msgstr ""

320

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

321 +#: add-patch.c:100 git-add--interactive.perl:1443

322 #, c-format, perl-format

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

324 msgstr ""

325

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

326 +#: add-patch.c:101 git-add--interactive.perl:1444

327 #, c-format, perl-format

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

329 msgstr ""

330

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

331 +#: add-patch.c:102 git-add--interactive.perl:1445

332 #, c-format, perl-format

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

334 msgstr ""

335

336 -#: add-patch.c:103 add-patch.c:168 add-patch.c:211

336 +#: add-patch.c:104 add-patch.c:169 add-patch.c:212

337 msgid ""

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

339 "applying."

340 msgstr ""

341

342 -#: add-patch.c:106

342 +#: add-patch.c:107

343 msgid ""

344 "y - apply this hunk to index\n"

345 "n - do not apply this hunk to index\n"

@@ -348,31 +348,31 @@ msgid ""

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

349 msgstr ""

350

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

351 +#: add-patch.c:122 git-add--interactive.perl:1448

352 #: git-add--interactive.perl:1463

353 #, c-format, perl-format

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

355 msgstr ""

356

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

357 +#: add-patch.c:123 git-add--interactive.perl:1449

358 #: git-add--interactive.perl:1464

359 #, c-format, perl-format

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

361 msgstr ""

362

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

363 +#: add-patch.c:124 git-add--interactive.perl:1450

364 #: git-add--interactive.perl:1465

365 #, c-format, perl-format

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

367 msgstr ""

368

369 -#: add-patch.c:125 add-patch.c:147 add-patch.c:190

369 +#: add-patch.c:126 add-patch.c:148 add-patch.c:191

370 msgid ""

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

372 "discarding."

373 msgstr ""

374

375 -#: add-patch.c:128 add-patch.c:193

375 +#: add-patch.c:129 add-patch.c:194

376 msgid ""

377 "y - discard this hunk from worktree\n"

378 "n - do not discard this hunk from worktree\n"

@@ -381,22 +381,22 @@ msgid ""

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

382 msgstr ""

383

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

384 +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453

385 #, c-format, perl-format

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

387 msgstr ""

388

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

389 +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454

390 #, c-format, perl-format

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

392 msgstr ""

393

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

394 +#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455

395 #, c-format, perl-format

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

397 msgstr ""

398

399 -#: add-patch.c:150

399 +#: add-patch.c:151

400 msgid ""

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

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

@@ -405,22 +405,22 @@ msgid ""

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

406 msgstr ""

407

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

408 +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458

409 #, c-format, perl-format

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

411 msgstr ""

412

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

413 +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459

414 #, c-format, perl-format

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

416 msgstr ""

417

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

418 +#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460

419 #, c-format, perl-format

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

421 msgstr ""

422

423 -#: add-patch.c:171

423 +#: add-patch.c:172

424 msgid ""

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

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

@@ -429,7 +429,7 @@ msgid ""

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

430 msgstr ""

431

432 -#: add-patch.c:214

432 +#: add-patch.c:215

433 msgid ""

434 "y - apply this hunk to worktree\n"

435 "n - do not apply this hunk to worktree\n"

@@ -438,47 +438,47 @@ msgid ""

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

439 msgstr ""

440

441 -#: add-patch.c:318

441 +#: add-patch.c:319

442 #, c-format

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

444 msgstr ""

445

446 -#: add-patch.c:337 add-patch.c:341

446 +#: add-patch.c:338 add-patch.c:342

447 #, c-format

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

449 msgstr ""

450

451 -#: add-patch.c:395

451 +#: add-patch.c:396

452 msgid "could not parse diff"

453 msgstr ""

454

455 -#: add-patch.c:414

455 +#: add-patch.c:415

456 msgid "could not parse colored diff"

457 msgstr ""

458

459 -#: add-patch.c:428

459 +#: add-patch.c:429

460 #, c-format

461 msgid "failed to run '%s'"

462 msgstr ""

463

464 -#: add-patch.c:587

464 +#: add-patch.c:588

465 msgid "mismatched output from interactive.diffFilter"

466 msgstr ""

467

468 -#: add-patch.c:588

468 +#: add-patch.c:589

469 msgid ""

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

471 "between its input and output lines."

472 msgstr ""

473

474 -#: add-patch.c:761

474 +#: add-patch.c:762

475 #, c-format

476 msgid ""

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

478 "%.*s"

479 msgstr ""

480

481 -#: add-patch.c:776

481 +#: add-patch.c:777

482 #, c-format

483 msgid ""

484 "hunks do not overlap:\n"

@@ -487,11 +487,11 @@ msgid ""

487 "%.*s"

488 msgstr ""

489

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

490 +#: add-patch.c:1053 git-add--interactive.perl:1112

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

492 msgstr ""

493

494 -#: add-patch.c:1056

494 +#: add-patch.c:1057

495 #, c-format

496 msgid ""

497 "---\n"

@@ -501,18 +501,18 @@ msgid ""

501 msgstr ""

502

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

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

504 +#: add-patch.c:1071 git-add--interactive.perl:1126

505 msgid ""

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

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

508 "aborted and the hunk is left unchanged.\n"

509 msgstr ""

510

511 -#: add-patch.c:1103

511 +#: add-patch.c:1104

512 msgid "could not parse hunk header"

513 msgstr ""

514

515 -#: add-patch.c:1148

515 +#: add-patch.c:1149

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

517 msgstr ""

518

@@ -624,59 +624,66 @@ msgstr ""

624 msgid "'git apply' failed"

625 msgstr ""

626

627 -#: advice.c:115

627 +#: advice.c:140

628 +#, c-format

629 +msgid ""

630 +"\n"

631 +"Disable this message with \"git config advice.%s false\""

632 +msgstr ""

633 +

634 +#: advice.c:156

635 #, c-format

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

637 msgstr ""

638

632 -#: advice.c:168

639 +#: advice.c:247

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

641 msgstr ""

642

636 -#: advice.c:170

643 +#: advice.c:249

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

645 msgstr ""

646

640 -#: advice.c:172

647 +#: advice.c:251

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

649 msgstr ""

650

644 -#: advice.c:174

651 +#: advice.c:253

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

653 msgstr ""

654

648 -#: advice.c:176

655 +#: advice.c:255

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

657 msgstr ""

658

652 -#: advice.c:178

659 +#: advice.c:257

660 #, c-format

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

662 msgstr ""

663

657 -#: advice.c:186

664 +#: advice.c:265

665 msgid ""

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

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

668 msgstr ""

669

663 -#: advice.c:194

670 +#: advice.c:273

671 msgid "Exiting because of an unresolved conflict."

672 msgstr ""

673

667 -#: advice.c:199 builtin/merge.c:1335

674 +#: advice.c:278 builtin/merge.c:1353

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

676 msgstr ""

677

671 -#: advice.c:201

678 +#: advice.c:280

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

680 msgstr ""

681

675 -#: advice.c:202

682 +#: advice.c:281

683 msgid "Exiting because of unfinished merge."

684 msgstr ""

685

679 -#: advice.c:208

686 +#: advice.c:287

687 #, c-format

688 msgid ""

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

@@ -936,7 +943,7 @@ msgstr ""

943 msgid "cannot checkout %s"

944 msgstr ""

945

939 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298

946 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308

947 #, c-format

948 msgid "failed to read %s"

949 msgstr ""

@@ -1131,7 +1138,7 @@ msgstr[1] ""

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

1139 msgstr ""

1140

1134 -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201

1141 +#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195

1142 #, c-format

1143 msgid "cannot open %s"

1144 msgstr ""

@@ -1197,7 +1204,7 @@ msgstr ""

1204 msgid "apply changes matching the given path"

1205 msgstr ""

1206

1200 -#: apply.c:4973 builtin/am.c:2260

1207 +#: apply.c:4973 builtin/am.c:2259

1208 msgid "num"

1209 msgstr ""

1210

@@ -1253,7 +1260,7 @@ msgstr ""

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

1261 msgstr ""

1262

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

1263 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525

1264 msgid "paths are separated with NUL character"

1265 msgstr ""

1266

@@ -1261,9 +1268,9 @@ msgstr ""

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

1269 msgstr ""

1270

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

1271 +#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98

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

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

1273 +#: builtin/pack-objects.c:3458 builtin/rebase.c:1332

1274 msgid "action"

1275 msgstr ""

1276

@@ -1292,8 +1299,8 @@ msgid "allow overlapping hunks"

1299 msgstr ""

1300

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

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

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

1302 +#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:774

1303 +#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128

1304 msgid "be verbose"

1305 msgstr ""

1306

@@ -1305,7 +1312,7 @@ msgstr ""

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

1313 msgstr ""

1314

1308 -#: apply.c:5032 builtin/am.c:2248

1315 +#: apply.c:5032 builtin/am.c:2247

1316 msgid "root"

1317 msgstr ""

1318

@@ -1313,6 +1320,55 @@ msgstr ""

1320 msgid "prepend <root> to all filenames"

1321 msgstr ""

1322

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

1324 +#, c-format

1325 +msgid "cannot stream blob %s"

1326 +msgstr ""

1327 +

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

1329 +#, c-format

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

1331 +msgstr ""

1332 +

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

1334 +#, c-format

1335 +msgid "cannot read %s"

1336 +msgstr ""

1337 +

1338 +#: archive-tar.c:465

1339 +#, c-format

1340 +msgid "unable to start '%s' filter"

1341 +msgstr ""

1342 +

1343 +#: archive-tar.c:468

1344 +msgid "unable to redirect descriptor"

1345 +msgstr ""

1346 +

1347 +#: archive-tar.c:475

1348 +#, c-format

1349 +msgid "'%s' filter reported error"

1350 +msgstr ""

1351 +

1352 +#: archive-zip.c:319

1353 +#, c-format

1354 +msgid "path is not valid UTF-8: %s"

1355 +msgstr ""

1356 +

1357 +#: archive-zip.c:323

1358 +#, c-format

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

1360 +msgstr ""

1361 +

1362 +#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235

1363 +#, c-format

1364 +msgid "deflate error (%d)"

1365 +msgstr ""

1366 +

1367 +#: archive-zip.c:615

1368 +#, c-format

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

1370 +msgstr ""

1371 +

1372 #: archive.c:14

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

1374 msgstr ""

@@ -1330,172 +1386,123 @@ msgstr ""

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

1387 msgstr ""

1388

1333 -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1389 +#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1390 #, c-format

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

1392 msgstr ""

1393

1338 -#: archive.c:396

1394 +#: archive.c:401

1395 #, c-format

1396 msgid "no such ref: %.*s"

1397 msgstr ""

1398

1343 -#: archive.c:401

1399 +#: archive.c:407

1400 #, c-format

1401 msgid "not a valid object name: %s"

1402 msgstr ""

1403

1348 -#: archive.c:414

1404 +#: archive.c:420

1405 #, c-format

1406 msgid "not a tree object: %s"

1407 msgstr ""

1408

1353 -#: archive.c:426

1409 +#: archive.c:432

1410 msgid "current working directory is untracked"

1411 msgstr ""

1412

1357 -#: archive.c:457

1413 +#: archive.c:464

1414 msgid "fmt"

1415 msgstr ""

1416

1361 -#: archive.c:457

1417 +#: archive.c:464

1418 msgid "archive format"

1419 msgstr ""

1420

1365 -#: archive.c:458 builtin/log.c:1653

1421 +#: archive.c:465 builtin/log.c:1674

1422 msgid "prefix"

1423 msgstr ""

1424

1369 -#: archive.c:459

1425 +#: archive.c:466

1426 msgid "prepend prefix to each pathname in the archive"

1427 msgstr ""

1428

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

1429 +#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

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

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

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

1431 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907

1432 +#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564

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

1434 #: parse-options.h:190

1435 msgid "file"

1436 msgstr ""

1437

1382 -#: archive.c:461 builtin/archive.c:90

1438 +#: archive.c:468 builtin/archive.c:90

1439 msgid "write the archive to this file"

1440 msgstr ""

1441

1386 -#: archive.c:463

1442 +#: archive.c:470

1443 msgid "read .gitattributes in working directory"

1444 msgstr ""

1445

1390 -#: archive.c:464

1446 +#: archive.c:471

1447 msgid "report archived files on stderr"

1448 msgstr ""

1449

1394 -#: archive.c:465

1450 +#: archive.c:472

1451 msgid "store only"

1452 msgstr ""

1453

1398 -#: archive.c:466

1454 +#: archive.c:473

1455 msgid "compress faster"

1456 msgstr ""

1457

1402 -#: archive.c:474

1458 +#: archive.c:481

1459 msgid "compress better"

1460 msgstr ""

1461

1406 -#: archive.c:477

1462 +#: archive.c:484

1463 msgid "list supported archive formats"

1464 msgstr ""

1465

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

1466 +#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1467 #: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911

1468 msgid "repo"

1469 msgstr ""

1470

1415 -#: archive.c:480 builtin/archive.c:92

1471 +#: archive.c:487 builtin/archive.c:92

1472 msgid "retrieve the archive from remote repository <repo>"

1473 msgstr ""

1474

1419 -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715

1475 +#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715

1476 #: builtin/notes.c:498

1477 msgid "command"

1478 msgstr ""

1479

1424 -#: archive.c:482 builtin/archive.c:94

1480 +#: archive.c:489 builtin/archive.c:94

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

1482 msgstr ""

1483

1428 -#: archive.c:489

1484 +#: archive.c:496

1485 msgid "Unexpected option --remote"

1486 msgstr ""

1487

1432 -#: archive.c:491

1488 +#: archive.c:498

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

1490 msgstr ""

1491

1436 -#: archive.c:493

1492 +#: archive.c:500

1493 msgid "Unexpected option --output"

1494 msgstr ""

1495

1440 -#: archive.c:515

1496 +#: archive.c:522

1497 #, c-format

1498 msgid "Unknown archive format '%s'"

1499 msgstr ""

1500

1445 -#: archive.c:522

1501 +#: archive.c:529

1502 #, c-format

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

1504 msgstr ""

1505

1450 -#: archive-tar.c:125 archive-zip.c:351

1451 -#, c-format

1452 -msgid "cannot stream blob %s"

1453 -msgstr ""

1454 -

1455 -#: archive-tar.c:266 archive-zip.c:369

1456 -#, c-format

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

1458 -msgstr ""

1459 -

1460 -#: archive-tar.c:293 archive-zip.c:359

1461 -#, c-format

1462 -msgid "cannot read %s"

1463 -msgstr ""

1464 -

1465 -#: archive-tar.c:465

1466 -#, c-format

1467 -msgid "unable to start '%s' filter"

1468 -msgstr ""

1469 -

1470 -#: archive-tar.c:468

1471 -msgid "unable to redirect descriptor"

1472 -msgstr ""

1473 -

1474 -#: archive-tar.c:475

1475 -#, c-format

1476 -msgid "'%s' filter reported error"

1477 -msgstr ""

1478 -

1479 -#: archive-zip.c:319

1480 -#, c-format

1481 -msgid "path is not valid UTF-8: %s"

1482 -msgstr ""

1483 -

1484 -#: archive-zip.c:323

1485 -#, c-format

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

1487 -msgstr ""

1488 -

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

1490 -#, c-format

1491 -msgid "deflate error (%d)"

1492 -msgstr ""

1493 -

1494 -#: archive-zip.c:615

1495 -#, c-format

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

1497 -msgstr ""

1498 -

1506 #: attr.c:212

1507 #, c-format

1508 msgid "%.*s is not a valid attribute name"

@@ -1574,12 +1581,12 @@ msgstr ""

1581 msgid "a %s revision is needed"

1582 msgstr ""

1583

1577 -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254

1584 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255

1585 #, c-format

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

1587 msgstr ""

1588

1582 -#: bisect.c:966 builtin/merge.c:149

1589 +#: bisect.c:966 builtin/merge.c:151

1590 #, c-format

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

1592 msgstr ""

@@ -1617,37 +1624,37 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"

1624 msgstr[0] ""

1625 msgstr[1] ""

1626

1620 -#: blame.c:2700

1627 +#: blame.c:2777

1628 msgid "--contents and --reverse do not blend well."

1629 msgstr ""

1630

1624 -#: blame.c:2714

1631 +#: blame.c:2791

1632 msgid "cannot use --contents with final commit object name"

1633 msgstr ""

1634

1628 -#: blame.c:2735

1635 +#: blame.c:2812

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

1637 msgstr ""

1638

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

1633 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388

1634 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215

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

1639 +#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018

1640 +#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405

1641 +#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235

1642 +#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291

1643 #: builtin/shortlog.c:192

1644 msgid "revision walk setup failed"

1645 msgstr ""

1646

1640 -#: blame.c:2762

1647 +#: blame.c:2839

1648 msgid ""

1649 "--reverse --first-parent together require range along first-parent chain"

1650 msgstr ""

1651

1645 -#: blame.c:2773

1652 +#: blame.c:2850

1653 #, c-format

1654 msgid "no such path %s in %s"

1655 msgstr ""

1656

1650 -#: blame.c:2784

1657 +#: blame.c:2861

1658 #, c-format

1659 msgid "cannot read blob %s for path %s"

1660 msgstr ""

@@ -1766,12 +1773,12 @@ msgstr ""

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

1774 msgstr ""

1775

1769 -#: branch.c:364

1776 +#: branch.c:365

1777 #, c-format

1778 msgid "'%s' is already checked out at '%s'"

1779 msgstr ""

1780

1774 -#: branch.c:387

1781 +#: branch.c:388

1782 #, c-format

1783 msgid "HEAD of working tree %s is not updated"

1784 msgstr ""

@@ -1786,8 +1793,8 @@ msgstr ""

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

1794 msgstr ""

1795

1789 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016

1790 -#: builtin/commit.c:815

1796 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034

1797 +#: builtin/commit.c:814

1798 #, c-format

1799 msgid "could not open '%s'"

1800 msgstr ""

@@ -1839,7 +1846,7 @@ msgstr ""

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

1847 msgstr ""

1848

1842 -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306

1849 +#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306

1850 #, c-format

1851 msgid "unrecognized argument: %s"

1852 msgstr ""

@@ -1862,312 +1869,328 @@ msgstr ""

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

1870 msgstr ""

1871

1865 -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403

1866 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457

1867 -#, c-format

1868 -msgid "could not parse %s"

1869 -msgstr ""

1870 -

1871 -#: commit.c:53

1872 -#, c-format

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

1874 -msgstr ""

1875 -

1876 -#: commit.c:193

1877 -msgid ""

1878 -"Support for <GIT_DIR>/info/grafts is deprecated\n"

1879 -"and will be removed in a future Git version.\n"

1880 -"\n"

1881 -"Please use \"git replace --convert-graft-file\"\n"

1882 -"to convert the grafts into replace refs.\n"

1883 -"\n"

1884 -"Turn this message off by running\n"

1885 -"\"git config advice.graftFileDeprecated false\""

1886 -msgstr ""

1887 -

1888 -#: commit.c:1153

1889 -#, c-format

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

1891 -msgstr ""

1892 -

1893 -#: commit.c:1157

1894 -#, c-format

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

1896 -msgstr ""

1897 -

1898 -#: commit.c:1160

1899 -#, c-format

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

1901 -msgstr ""

1902 -

1903 -#: commit.c:1163

1904 -#, c-format

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

1906 -msgstr ""

1907 -

1908 -#: commit.c:1417

1909 -msgid ""

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

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

1912 -"variable i18n.commitencoding to the encoding your project uses.\n"

1913 -msgstr ""

1914 -

1915 -#: commit-graph.c:122

1872 +#: commit-graph.c:183

1873 msgid "commit-graph file is too small"

1874 msgstr ""

1875

1919 -#: commit-graph.c:189

1876 +#: commit-graph.c:248

1877 #, c-format

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

1879 msgstr ""

1880

1924 -#: commit-graph.c:196

1881 +#: commit-graph.c:255

1882 #, c-format

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

1884 msgstr ""

1885

1929 -#: commit-graph.c:203

1886 +#: commit-graph.c:262

1887 #, c-format

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

1889 msgstr ""

1890

1934 -#: commit-graph.c:226

1891 +#: commit-graph.c:284

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

1893 msgstr ""

1894

1938 -#: commit-graph.c:237

1895 +#: commit-graph.c:294

1896 #, c-format

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

1898 msgstr ""

1899

1943 -#: commit-graph.c:280

1900 +#: commit-graph.c:362

1901 #, c-format

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

1903 msgstr ""

1904

1948 -#: commit-graph.c:343

1905 +#: commit-graph.c:436

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

1907 msgstr ""

1908

1952 -#: commit-graph.c:353

1909 +#: commit-graph.c:446

1910 msgid "commit-graph chain does not match"

1911 msgstr ""

1912

1956 -#: commit-graph.c:401

1913 +#: commit-graph.c:494

1914 #, c-format

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

1916 msgstr ""

1917

1961 -#: commit-graph.c:425

1918 +#: commit-graph.c:518

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

1920 msgstr ""

1921

1965 -#: commit-graph.c:558 commit-graph.c:618

1922 +#: commit-graph.c:651 commit-graph.c:711

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

1924 msgstr ""

1925

1969 -#: commit-graph.c:579

1926 +#: commit-graph.c:672

1927 #, c-format

1928 msgid "could not find commit %s"

1929 msgstr ""

1930

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

1931 +#: commit-graph.c:948 builtin/am.c:1292

1932 #, c-format

1933 msgid "unable to parse commit %s"

1934 msgstr ""

1935

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

1936 +#: commit-graph.c:1096

1937 +msgid "Writing changed paths Bloom filters index"

1938 +msgstr ""

1939 +

1940 +#: commit-graph.c:1121

1941 +msgid "Writing changed paths Bloom filters data"

1942 +msgstr ""

1943 +

1944 +#: commit-graph.c:1160 builtin/pack-objects.c:2783

1945 #, c-format

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

1947 msgstr ""

1948

1984 -#: commit-graph.c:1043

1949 +#: commit-graph.c:1196

1950 msgid "Loading known commits in commit graph"

1951 msgstr ""

1952

1988 -#: commit-graph.c:1060

1953 +#: commit-graph.c:1213

1954 msgid "Expanding reachable commits in commit graph"

1955 msgstr ""

1956

1992 -#: commit-graph.c:1079

1957 +#: commit-graph.c:1233

1958 msgid "Clearing commit marks in commit graph"

1959 msgstr ""

1960

1996 -#: commit-graph.c:1098

1961 +#: commit-graph.c:1252

1962 msgid "Computing commit graph generation numbers"

1963 msgstr ""

1964

2000 -#: commit-graph.c:1173

1965 +#: commit-graph.c:1300

1966 +msgid "Computing commit changed paths Bloom filters"

1967 +msgstr ""

1968 +

1969 +#: commit-graph.c:1359

1970 #, c-format

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

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

1973 msgstr[0] ""

1974 msgstr[1] ""

1975

2007 -#: commit-graph.c:1186

1976 +#: commit-graph.c:1372

1977 #, c-format

1978 msgid "error adding pack %s"

1979 msgstr ""

1980

2012 -#: commit-graph.c:1190

1981 +#: commit-graph.c:1376

1982 #, c-format

1983 msgid "error opening index for %s"

1984 msgstr ""

1985

2017 -#: commit-graph.c:1214

1986 +#: commit-graph.c:1405

1987 #, c-format

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

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

1990 msgstr[0] ""

1991 msgstr[1] ""

1992

2024 -#: commit-graph.c:1234

1993 +#: commit-graph.c:1426

1994 #, c-format

1995 msgid "invalid commit object id: %s"

1996 msgstr ""

1997

2029 -#: commit-graph.c:1249

1998 +#: commit-graph.c:1442

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

2000 msgstr ""

2001

2033 -#: commit-graph.c:1264

2002 +#: commit-graph.c:1457

2003 msgid "Counting distinct commits in commit graph"

2004 msgstr ""

2005

2037 -#: commit-graph.c:1294

2006 +#: commit-graph.c:1489

2007 msgid "Finding extra edges in commit graph"

2008 msgstr ""

2009

2041 -#: commit-graph.c:1340

2010 +#: commit-graph.c:1538

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

2012 msgstr ""

2013

2045 -#: commit-graph.c:1373 midx.c:814

2014 +#: commit-graph.c:1572 midx.c:812

2015 #, c-format

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

2017 msgstr ""

2018

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

2019 +#: commit-graph.c:1585

2020 +msgid "unable to create temporary graph layer"

2021 +msgstr ""

2022 +

2023 +#: commit-graph.c:1590

2024 #, c-format

2052 -msgid "unable to create '%s'"

2025 +msgid "unable to adjust shared permissions for '%s'"

2026 msgstr ""

2027

2055 -#: commit-graph.c:1445

2028 +#: commit-graph.c:1667

2029 #, c-format

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

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

2032 msgstr[0] ""

2033 msgstr[1] ""

2034

2062 -#: commit-graph.c:1486

2035 +#: commit-graph.c:1712

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

2037 msgstr ""

2038

2066 -#: commit-graph.c:1498

2039 +#: commit-graph.c:1728

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

2041 msgstr ""

2042

2070 -#: commit-graph.c:1518

2043 +#: commit-graph.c:1748

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

2045 msgstr ""

2046

2074 -#: commit-graph.c:1631

2047 +#: commit-graph.c:1874

2048 msgid "Scanning merged commits"

2049 msgstr ""

2050

2078 -#: commit-graph.c:1642

2051 +#: commit-graph.c:1885

2052 #, c-format

2053 msgid "unexpected duplicate commit id %s"

2054 msgstr ""

2055

2083 -#: commit-graph.c:1665

2056 +#: commit-graph.c:1908

2057 msgid "Merging commit-graph"

2058 msgstr ""

2059

2087 -#: commit-graph.c:1844

2060 +#: commit-graph.c:2096

2061 #, c-format

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

2063 msgstr ""

2064

2092 -#: commit-graph.c:1855

2065 +#: commit-graph.c:2107

2066 msgid "too many commits to write graph"

2067 msgstr ""

2068

2096 -#: commit-graph.c:1944

2069 +#: commit-graph.c:2200

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

2071 msgstr ""

2072

2100 -#: commit-graph.c:1954

2073 +#: commit-graph.c:2210

2074 #, c-format

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

2076 msgstr ""

2077

2105 -#: commit-graph.c:1964 commit-graph.c:1979

2078 +#: commit-graph.c:2220 commit-graph.c:2235

2079 #, c-format

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

2081 msgstr ""

2082

2110 -#: commit-graph.c:1971

2083 +#: commit-graph.c:2227

2084 #, c-format

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

2086 msgstr ""

2087

2115 -#: commit-graph.c:1989

2088 +#: commit-graph.c:2245

2089 msgid "Verifying commits in commit graph"

2090 msgstr ""

2091

2119 -#: commit-graph.c:2003

2092 +#: commit-graph.c:2259

2093 #, c-format

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

2095 msgstr ""

2096

2124 -#: commit-graph.c:2010

2097 +#: commit-graph.c:2266

2098 #, c-format

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

2100 msgstr ""

2101

2129 -#: commit-graph.c:2020

2102 +#: commit-graph.c:2276

2103 #, c-format

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

2105 msgstr ""

2106

2134 -#: commit-graph.c:2029

2107 +#: commit-graph.c:2285

2108 #, c-format

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

2110 msgstr ""

2111

2139 -#: commit-graph.c:2042

2112 +#: commit-graph.c:2298

2113 #, c-format

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

2115 msgstr ""

2116

2144 -#: commit-graph.c:2047

2117 +#: commit-graph.c:2303

2118 #, c-format

2119 msgid ""

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

2121 msgstr ""

2122

2150 -#: commit-graph.c:2051

2123 +#: commit-graph.c:2307

2124 #, c-format

2125 msgid ""

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

2127 msgstr ""

2128

2156 -#: commit-graph.c:2066

2129 +#: commit-graph.c:2322

2130 #, c-format

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

2132 msgstr ""

2133

2161 -#: commit-graph.c:2072

2134 +#: commit-graph.c:2328

2135 #, c-format

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

2137 msgstr ""

2138

2139 +#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403

2140 +#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457

2141 +#, c-format

2142 +msgid "could not parse %s"

2143 +msgstr ""

2144 +

2145 +#: commit.c:54

2146 +#, c-format

2147 +msgid "%s %s is not a commit!"

2148 +msgstr ""

2149 +

2150 +#: commit.c:194

2151 +msgid ""

2152 +"Support for <GIT_DIR>/info/grafts is deprecated\n"

2153 +"and will be removed in a future Git version.\n"

2154 +"\n"

2155 +"Please use \"git replace --convert-graft-file\"\n"

2156 +"to convert the grafts into replace refs.\n"

2157 +"\n"

2158 +"Turn this message off by running\n"

2159 +"\"git config advice.graftFileDeprecated false\""

2160 +msgstr ""

2161 +

2162 +#: commit.c:1168

2163 +#, c-format

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

2165 +msgstr ""

2166 +

2167 +#: commit.c:1172

2168 +#, c-format

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

2170 +msgstr ""

2171 +

2172 +#: commit.c:1175

2173 +#, c-format

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

2175 +msgstr ""

2176 +

2177 +#: commit.c:1178

2178 +#, c-format

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

2180 +msgstr ""

2181 +

2182 +#: commit.c:1432

2183 +msgid ""

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

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

2186 +"variable i18n.commitencoding to the encoding your project uses.\n"

2187 +msgstr ""

2188 +

2189 #: compat/obstack.c:406 compat/obstack.c:408

2190 msgid "memory exhausted"

2191 msgstr ""

2192

2170 -#: config.c:124

2193 +#: config.c:125

2194 #, c-format

2195 msgid ""

2196 "exceeded maximum include depth (%d) while including\n"

@@ -2177,289 +2200,289 @@ msgid ""

2200 "This might be due to circular includes."

2201 msgstr ""

2202

2180 -#: config.c:140

2203 +#: config.c:141

2204 #, c-format

2205 msgid "could not expand include path '%s'"

2206 msgstr ""

2207

2185 -#: config.c:151

2208 +#: config.c:152

2209 msgid "relative config includes must come from files"

2210 msgstr ""

2211

2189 -#: config.c:197

2212 +#: config.c:198

2213 msgid "relative config include conditionals must come from files"

2214 msgstr ""

2215

2193 -#: config.c:376

2216 +#: config.c:378

2217 #, c-format

2218 msgid "key does not contain a section: %s"

2219 msgstr ""

2220

2198 -#: config.c:382

2221 +#: config.c:384

2222 #, c-format

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

2224 msgstr ""

2225

2203 -#: config.c:406 sequencer.c:2444

2226 +#: config.c:408 sequencer.c:2456

2227 #, c-format

2228 msgid "invalid key: %s"

2229 msgstr ""

2230

2208 -#: config.c:412

2231 +#: config.c:414

2232 #, c-format

2233 msgid "invalid key (newline): %s"

2234 msgstr ""

2235

2213 -#: config.c:448 config.c:460

2236 +#: config.c:450 config.c:462

2237 #, c-format

2238 msgid "bogus config parameter: %s"

2239 msgstr ""

2240

2218 -#: config.c:495

2241 +#: config.c:497

2242 #, c-format

2243 msgid "bogus format in %s"

2244 msgstr ""

2245

2223 -#: config.c:821

2246 +#: config.c:836

2247 #, c-format

2248 msgid "bad config line %d in blob %s"

2249 msgstr ""

2250

2228 -#: config.c:825

2251 +#: config.c:840

2252 #, c-format

2253 msgid "bad config line %d in file %s"

2254 msgstr ""

2255

2233 -#: config.c:829

2256 +#: config.c:844

2257 #, c-format

2258 msgid "bad config line %d in standard input"

2259 msgstr ""

2260

2238 -#: config.c:833

2261 +#: config.c:848

2262 #, c-format

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

2264 msgstr ""

2265

2243 -#: config.c:837

2266 +#: config.c:852

2267 #, c-format

2268 msgid "bad config line %d in command line %s"

2269 msgstr ""

2270

2248 -#: config.c:841

2271 +#: config.c:856

2272 #, c-format

2273 msgid "bad config line %d in %s"

2274 msgstr ""

2275

2253 -#: config.c:978

2276 +#: config.c:993

2277 msgid "out of range"

2278 msgstr ""

2279

2257 -#: config.c:978

2280 +#: config.c:993

2281 msgid "invalid unit"

2282 msgstr ""

2283

2261 -#: config.c:979

2284 +#: config.c:994

2285 #, c-format

2286 msgid "bad numeric config value '%s' for '%s': %s"

2287 msgstr ""

2288

2266 -#: config.c:998

2289 +#: config.c:1013

2290 #, c-format

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

2292 msgstr ""

2293

2271 -#: config.c:1001

2294 +#: config.c:1016

2295 #, c-format

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

2297 msgstr ""

2298

2276 -#: config.c:1004

2299 +#: config.c:1019

2300 #, c-format

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

2302 msgstr ""

2303

2281 -#: config.c:1007

2304 +#: config.c:1022

2305 #, c-format

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

2307 msgstr ""

2308

2286 -#: config.c:1010

2309 +#: config.c:1025

2310 #, c-format

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

2312 msgstr ""

2313

2291 -#: config.c:1013

2314 +#: config.c:1028

2315 #, c-format

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

2317 msgstr ""

2318

2296 -#: config.c:1108

2319 +#: config.c:1123

2320 #, c-format

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

2322 msgstr ""

2323

2301 -#: config.c:1117

2324 +#: config.c:1132

2325 #, c-format

2326 msgid "'%s' for '%s' is not a valid timestamp"

2327 msgstr ""

2328

2306 -#: config.c:1208

2329 +#: config.c:1223

2330 #, c-format

2331 msgid "abbrev length out of range: %d"

2332 msgstr ""

2333

2311 -#: config.c:1222 config.c:1233

2334 +#: config.c:1237 config.c:1248

2335 #, c-format

2336 msgid "bad zlib compression level %d"

2337 msgstr ""

2338

2316 -#: config.c:1325

2339 +#: config.c:1340

2340 msgid "core.commentChar should only be one character"

2341 msgstr ""

2342

2320 -#: config.c:1358

2343 +#: config.c:1373

2344 #, c-format

2345 msgid "invalid mode for object creation: %s"

2346 msgstr ""

2347

2325 -#: config.c:1430

2348 +#: config.c:1445

2349 #, c-format

2350 msgid "malformed value for %s"

2351 msgstr ""

2352

2330 -#: config.c:1456

2353 +#: config.c:1471

2354 #, c-format

2355 msgid "malformed value for %s: %s"

2356 msgstr ""

2357

2335 -#: config.c:1457

2358 +#: config.c:1472

2359 msgid "must be one of nothing, matching, simple, upstream or current"

2360 msgstr ""

2361

2339 -#: config.c:1518 builtin/pack-objects.c:3541

2362 +#: config.c:1533 builtin/pack-objects.c:3542

2363 #, c-format

2364 msgid "bad pack compression level %d"

2365 msgstr ""

2366

2344 -#: config.c:1639

2367 +#: config.c:1655

2368 #, c-format

2369 msgid "unable to load config blob object '%s'"

2370 msgstr ""

2371

2349 -#: config.c:1642

2372 +#: config.c:1658

2373 #, c-format

2374 msgid "reference '%s' does not point to a blob"

2375 msgstr ""

2376

2354 -#: config.c:1659

2377 +#: config.c:1675

2378 #, c-format

2379 msgid "unable to resolve config blob '%s'"

2380 msgstr ""

2381

2359 -#: config.c:1689

2382 +#: config.c:1705

2383 #, c-format

2384 msgid "failed to parse %s"

2385 msgstr ""

2386

2364 -#: config.c:1743

2387 +#: config.c:1759

2388 msgid "unable to parse command-line config"

2389 msgstr ""

2390

2368 -#: config.c:2097

2391 +#: config.c:2113

2392 msgid "unknown error occurred while reading the configuration files"

2393 msgstr ""

2394

2372 -#: config.c:2267

2395 +#: config.c:2283

2396 #, c-format

2397 msgid "Invalid %s: '%s'"

2398 msgstr ""

2399

2377 -#: config.c:2312

2400 +#: config.c:2328

2401 #, c-format

2402 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

2403 msgstr ""

2404

2382 -#: config.c:2358

2405 +#: config.c:2374

2406 #, c-format

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

2408 msgstr ""

2409

2387 -#: config.c:2360

2410 +#: config.c:2376

2411 #, c-format

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

2413 msgstr ""

2414

2392 -#: config.c:2441

2415 +#: config.c:2457

2416 #, c-format

2417 msgid "invalid section name '%s'"

2418 msgstr ""

2419

2397 -#: config.c:2473

2420 +#: config.c:2489

2421 #, c-format

2422 msgid "%s has multiple values"

2423 msgstr ""

2424

2402 -#: config.c:2502

2425 +#: config.c:2518

2426 #, c-format

2427 msgid "failed to write new configuration file %s"

2428 msgstr ""

2429

2407 -#: config.c:2754 config.c:3078

2430 +#: config.c:2770 config.c:3094

2431 #, c-format

2432 msgid "could not lock config file %s"

2433 msgstr ""

2434

2412 -#: config.c:2765

2435 +#: config.c:2781

2436 #, c-format

2437 msgid "opening %s"

2438 msgstr ""

2439

2417 -#: config.c:2800 builtin/config.c:344

2440 +#: config.c:2816 builtin/config.c:344

2441 #, c-format

2442 msgid "invalid pattern: %s"

2443 msgstr ""

2444

2422 -#: config.c:2825

2445 +#: config.c:2841

2446 #, c-format

2447 msgid "invalid config file %s"

2448 msgstr ""

2449

2427 -#: config.c:2838 config.c:3091

2450 +#: config.c:2854 config.c:3107

2451 #, c-format

2452 msgid "fstat on %s failed"

2453 msgstr ""

2454

2432 -#: config.c:2849

2455 +#: config.c:2865

2456 #, c-format

2457 msgid "unable to mmap '%s'"

2458 msgstr ""

2459

2437 -#: config.c:2858 config.c:3096

2460 +#: config.c:2874 config.c:3112

2461 #, c-format

2462 msgid "chmod on %s failed"

2463 msgstr ""

2464

2442 -#: config.c:2943 config.c:3193

2465 +#: config.c:2959 config.c:3209

2466 #, c-format

2467 msgid "could not write config file %s"

2468 msgstr ""

2469

2447 -#: config.c:2977

2470 +#: config.c:2993

2471 #, c-format

2472 msgid "could not set '%s' to '%s'"

2473 msgstr ""

2474

2452 -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857

2475 +#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857

2476 #, c-format

2477 msgid "could not unset '%s'"

2478 msgstr ""

2479

2457 -#: config.c:3069

2480 +#: config.c:3085

2481 #, c-format

2482 msgid "invalid section name: %s"

2483 msgstr ""

2484

2462 -#: config.c:3236

2485 +#: config.c:3252

2486 #, c-format

2487 msgid "missing value for '%s'"

2488 msgstr ""

@@ -2615,19 +2638,19 @@ msgstr ""

2638 msgid "unable to fork"

2639 msgstr ""

2640

2618 -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43

2641 +#: connected.c:107 builtin/fsck.c:208 builtin/prune.c:45

2642 msgid "Checking connectivity"

2643 msgstr ""

2644

2622 -#: connected.c:110

2645 +#: connected.c:119

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

2647 msgstr ""

2648

2626 -#: connected.c:130

2649 +#: connected.c:139

2650 msgid "failed write to rev-list"

2651 msgstr ""

2652

2630 -#: connected.c:137

2653 +#: connected.c:146

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

2655 msgstr ""

2656

@@ -2719,35 +2742,63 @@ msgstr ""

2742 msgid "external filter '%s' failed"

2743 msgstr ""

2744

2722 -#: convert.c:839

2745 +#: convert.c:840

2746 msgid "unexpected filter type"

2747 msgstr ""

2748

2726 -#: convert.c:850

2749 +#: convert.c:851

2750 msgid "path name too long for external filter"

2751 msgstr ""

2752

2730 -#: convert.c:924

2753 +#: convert.c:943

2754 #, c-format

2755 msgid ""

2756 "external filter '%s' is not available anymore although not all paths have "

2757 "been filtered"

2758 msgstr ""

2759

2737 -#: convert.c:1223

2760 +#: convert.c:1243

2761 msgid "true/false are no valid working-tree-encodings"

2762 msgstr ""

2763

2741 -#: convert.c:1411 convert.c:1445

2764 +#: convert.c:1431 convert.c:1465

2765 #, c-format

2766 msgid "%s: clean filter '%s' failed"

2767 msgstr ""

2768

2746 -#: convert.c:1489

2769 +#: convert.c:1511

2770 #, c-format

2771 msgid "%s: smudge filter %s failed"

2772 msgstr ""

2773

2774 +#: credential.c:96

2775 +#, c-format

2776 +msgid "skipping credential lookup for key: credential.%s"

2777 +msgstr ""

2778 +

2779 +#: credential.c:112

2780 +msgid "refusing to work with credential missing host field"

2781 +msgstr ""

2782 +

2783 +#: credential.c:114

2784 +msgid "refusing to work with credential missing protocol field"

2785 +msgstr ""

2786 +

2787 +#: credential.c:396

2788 +#, c-format

2789 +msgid "url contains a newline in its %s component: %s"

2790 +msgstr ""

2791 +

2792 +#: credential.c:440

2793 +#, c-format

2794 +msgid "url has no scheme: %s"

2795 +msgstr ""

2796 +

2797 +#: credential.c:513

2798 +#, c-format

2799 +msgid "credential url cannot be parsed: %s"

2800 +msgstr ""

2801 +

2802 #: date.c:138

2803 msgid "in the future"

2804 msgstr ""

@@ -2840,15 +2891,6 @@ msgstr ""

2891 msgid "Marked %d islands, done.\n"

2892 msgstr ""

2893

2843 -#: diffcore-order.c:24

2844 -#, c-format

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

2846 -msgstr ""

2847 -

2848 -#: diffcore-rename.c:543

2849 -msgid "Performing inexact rename detection"

2850 -msgstr ""

2851 -

2894 #: diff-no-index.c:238

2895 msgid "git diff --no-index [<options>] <path> <path>"

2896 msgstr ""

@@ -2900,528 +2942,537 @@ msgid ""

2942 "%s"

2943 msgstr ""

2944

2903 -#: diff.c:4202

2945 +#: diff.c:4238

2946 #, c-format

2947 msgid "external diff died, stopping at %s"

2948 msgstr ""

2949

2908 -#: diff.c:4547

2950 +#: diff.c:4583

2951 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

2952 msgstr ""

2953

2912 -#: diff.c:4550

2954 +#: diff.c:4586

2955 msgid "-G, -S and --find-object are mutually exclusive"

2956 msgstr ""

2957

2916 -#: diff.c:4628

2958 +#: diff.c:4664

2959 msgid "--follow requires exactly one pathspec"

2960 msgstr ""

2961

2920 -#: diff.c:4676

2962 +#: diff.c:4712

2963 #, c-format

2964 msgid "invalid --stat value: %s"

2965 msgstr ""

2966

2925 -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209

2967 +#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245

2968 #: parse-options.c:197 parse-options.c:201

2969 #, c-format

2970 msgid "%s expects a numerical value"

2971 msgstr ""

2972

2931 -#: diff.c:4713

2973 +#: diff.c:4749

2974 #, c-format

2975 msgid ""

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

2977 "%s"

2978 msgstr ""

2979

2938 -#: diff.c:4798

2980 +#: diff.c:4834

2981 #, c-format

2982 msgid "unknown change class '%c' in --diff-filter=%s"

2983 msgstr ""

2984

2943 -#: diff.c:4822

2985 +#: diff.c:4858

2986 #, c-format

2987 msgid "unknown value after ws-error-highlight=%.*s"

2988 msgstr ""

2989

2948 -#: diff.c:4836

2990 +#: diff.c:4872

2991 #, c-format

2992 msgid "unable to resolve '%s'"

2993 msgstr ""

2994

2953 -#: diff.c:4886 diff.c:4892

2995 +#: diff.c:4922 diff.c:4928

2996 #, c-format

2997 msgid "%s expects <n>/<m> form"

2998 msgstr ""

2999

2958 -#: diff.c:4904

3000 +#: diff.c:4940

3001 #, c-format

3002 msgid "%s expects a character, got '%s'"

3003 msgstr ""

3004

2963 -#: diff.c:4925

3005 +#: diff.c:4961

3006 #, c-format

3007 msgid "bad --color-moved argument: %s"

3008 msgstr ""

3009

2968 -#: diff.c:4944

3010 +#: diff.c:4980

3011 #, c-format

3012 msgid "invalid mode '%s' in --color-moved-ws"

3013 msgstr ""

3014

2973 -#: diff.c:4984

3015 +#: diff.c:5020

3016 msgid ""

3017 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3018 "\"histogram\""

3019 msgstr ""

3020

2979 -#: diff.c:5020 diff.c:5040

3021 +#: diff.c:5056 diff.c:5076

3022 #, c-format

3023 msgid "invalid argument to %s"

3024 msgstr ""

3025

2984 -#: diff.c:5178

3026 +#: diff.c:5214

3027 #, c-format

3028 msgid "failed to parse --submodule option parameter: '%s'"

3029 msgstr ""

3030

2989 -#: diff.c:5234

3031 +#: diff.c:5270

3032 #, c-format

3033 msgid "bad --word-diff argument: %s"

3034 msgstr ""

3035

2994 -#: diff.c:5257

3036 +#: diff.c:5293

3037 msgid "Diff output format options"

3038 msgstr ""

3039

2998 -#: diff.c:5259 diff.c:5265

3040 +#: diff.c:5295 diff.c:5301

3041 msgid "generate patch"

3042 msgstr ""

3043

3002 -#: diff.c:5262 builtin/log.c:173

3044 +#: diff.c:5298 builtin/log.c:177

3045 msgid "suppress diff output"

3046 msgstr ""

3047

3006 -#: diff.c:5267 diff.c:5381 diff.c:5388

3048 +#: diff.c:5303 diff.c:5417 diff.c:5424

3049 msgid "<n>"

3050 msgstr ""

3051

3010 -#: diff.c:5268 diff.c:5271

3052 +#: diff.c:5304 diff.c:5307

3053 msgid "generate diffs with <n> lines context"

3054 msgstr ""

3055

3014 -#: diff.c:5273

3056 +#: diff.c:5309

3057 msgid "generate the diff in raw format"

3058 msgstr ""

3059

3018 -#: diff.c:5276

3060 +#: diff.c:5312

3061 msgid "synonym for '-p --raw'"

3062 msgstr ""

3063

3022 -#: diff.c:5280

3064 +#: diff.c:5316

3065 msgid "synonym for '-p --stat'"

3066 msgstr ""

3067

3026 -#: diff.c:5284

3068 +#: diff.c:5320

3069 msgid "machine friendly --stat"

3070 msgstr ""

3071

3030 -#: diff.c:5287

3072 +#: diff.c:5323

3073 msgid "output only the last line of --stat"

3074 msgstr ""

3075

3034 -#: diff.c:5289 diff.c:5297

3076 +#: diff.c:5325 diff.c:5333

3077 msgid "<param1,param2>..."

3078 msgstr ""

3079

3038 -#: diff.c:5290

3080 +#: diff.c:5326

3081 msgid ""

3082 "output the distribution of relative amount of changes for each sub-directory"

3083 msgstr ""

3084

3043 -#: diff.c:5294

3085 +#: diff.c:5330

3086 msgid "synonym for --dirstat=cumulative"

3087 msgstr ""

3088

3047 -#: diff.c:5298

3089 +#: diff.c:5334

3090 msgid "synonym for --dirstat=files,param1,param2..."

3091 msgstr ""

3092

3051 -#: diff.c:5302

3093 +#: diff.c:5338

3094 msgid "warn if changes introduce conflict markers or whitespace errors"

3095 msgstr ""

3096

3055 -#: diff.c:5305

3097 +#: diff.c:5341

3098 msgid "condensed summary such as creations, renames and mode changes"

3099 msgstr ""

3100

3059 -#: diff.c:5308

3101 +#: diff.c:5344

3102 msgid "show only names of changed files"

3103 msgstr ""

3104

3063 -#: diff.c:5311

3105 +#: diff.c:5347

3106 msgid "show only names and status of changed files"

3107 msgstr ""

3108

3067 -#: diff.c:5313

3109 +#: diff.c:5349

3110 msgid "<width>[,<name-width>[,<count>]]"

3111 msgstr ""

3112

3071 -#: diff.c:5314

3113 +#: diff.c:5350

3114 msgid "generate diffstat"

3115 msgstr ""

3116

3075 -#: diff.c:5316 diff.c:5319 diff.c:5322

3117 +#: diff.c:5352 diff.c:5355 diff.c:5358

3118 msgid "<width>"

3119 msgstr ""

3120

3079 -#: diff.c:5317

3121 +#: diff.c:5353

3122 msgid "generate diffstat with a given width"

3123 msgstr ""

3124

3083 -#: diff.c:5320

3125 +#: diff.c:5356

3126 msgid "generate diffstat with a given name width"

3127 msgstr ""

3128

3087 -#: diff.c:5323

3129 +#: diff.c:5359

3130 msgid "generate diffstat with a given graph width"

3131 msgstr ""

3132

3091 -#: diff.c:5325

3133 +#: diff.c:5361

3134 msgid "<count>"

3135 msgstr ""

3136

3095 -#: diff.c:5326

3137 +#: diff.c:5362

3138 msgid "generate diffstat with limited lines"

3139 msgstr ""

3140

3099 -#: diff.c:5329

3141 +#: diff.c:5365

3142 msgid "generate compact summary in diffstat"

3143 msgstr ""

3144

3103 -#: diff.c:5332

3145 +#: diff.c:5368

3146 msgid "output a binary diff that can be applied"

3147 msgstr ""

3148

3107 -#: diff.c:5335

3149 +#: diff.c:5371

3150 msgid "show full pre- and post-image object names on the \"index\" lines"

3151 msgstr ""

3152

3111 -#: diff.c:5337

3153 +#: diff.c:5373

3154 msgid "show colored diff"

3155 msgstr ""

3156

3115 -#: diff.c:5338

3157 +#: diff.c:5374

3158 msgid "<kind>"

3159 msgstr ""

3160

3119 -#: diff.c:5339

3161 +#: diff.c:5375

3162 msgid ""

3163 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3164 "diff"

3165 msgstr ""

3166

3125 -#: diff.c:5342

3167 +#: diff.c:5378

3168 msgid ""

3169 "do not munge pathnames and use NULs as output field terminators in --raw or "

3170 "--numstat"

3171 msgstr ""

3172

3131 -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457

3173 +#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493

3174 msgid "<prefix>"

3175 msgstr ""

3176

3135 -#: diff.c:5346

3177 +#: diff.c:5382

3178 msgid "show the given source prefix instead of \"a/\""

3179 msgstr ""

3180

3139 -#: diff.c:5349

3181 +#: diff.c:5385

3182 msgid "show the given destination prefix instead of \"b/\""

3183 msgstr ""

3184

3143 -#: diff.c:5352

3185 +#: diff.c:5388

3186 msgid "prepend an additional prefix to every line of output"

3187 msgstr ""

3188

3147 -#: diff.c:5355

3189 +#: diff.c:5391

3190 msgid "do not show any source or destination prefix"

3191 msgstr ""

3192

3151 -#: diff.c:5358

3193 +#: diff.c:5394

3194 msgid "show context between diff hunks up to the specified number of lines"

3195 msgstr ""

3196

3155 -#: diff.c:5362 diff.c:5367 diff.c:5372

3197 +#: diff.c:5398 diff.c:5403 diff.c:5408

3198 msgid "<char>"

3199 msgstr ""

3200

3159 -#: diff.c:5363

3201 +#: diff.c:5399

3202 msgid "specify the character to indicate a new line instead of '+'"

3203 msgstr ""

3204

3163 -#: diff.c:5368

3205 +#: diff.c:5404

3206 msgid "specify the character to indicate an old line instead of '-'"

3207 msgstr ""

3208

3167 -#: diff.c:5373

3209 +#: diff.c:5409

3210 msgid "specify the character to indicate a context instead of ' '"

3211 msgstr ""

3212

3171 -#: diff.c:5376

3213 +#: diff.c:5412

3214 msgid "Diff rename options"

3215 msgstr ""

3216

3175 -#: diff.c:5377

3217 +#: diff.c:5413

3218 msgid "<n>[/<m>]"

3219 msgstr ""

3220

3179 -#: diff.c:5378

3221 +#: diff.c:5414

3222 msgid "break complete rewrite changes into pairs of delete and create"

3223 msgstr ""

3224

3183 -#: diff.c:5382

3225 +#: diff.c:5418

3226 msgid "detect renames"

3227 msgstr ""

3228

3187 -#: diff.c:5386

3229 +#: diff.c:5422

3230 msgid "omit the preimage for deletes"

3231 msgstr ""

3232

3191 -#: diff.c:5389

3233 +#: diff.c:5425

3234 msgid "detect copies"

3235 msgstr ""

3236

3195 -#: diff.c:5393

3237 +#: diff.c:5429

3238 msgid "use unmodified files as source to find copies"

3239 msgstr ""

3240

3199 -#: diff.c:5395

3241 +#: diff.c:5431

3242 msgid "disable rename detection"

3243 msgstr ""

3244

3203 -#: diff.c:5398

3245 +#: diff.c:5434

3246 msgid "use empty blobs as rename source"

3247 msgstr ""

3248

3207 -#: diff.c:5400

3249 +#: diff.c:5436

3250 msgid "continue listing the history of a file beyond renames"

3251 msgstr ""

3252

3211 -#: diff.c:5403

3253 +#: diff.c:5439

3254 msgid ""

3255 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3256 "given limit"

3257 msgstr ""

3258

3217 -#: diff.c:5405

3259 +#: diff.c:5441

3260 msgid "Diff algorithm options"

3261 msgstr ""

3262

3221 -#: diff.c:5407

3263 +#: diff.c:5443

3264 msgid "produce the smallest possible diff"

3265 msgstr ""

3266

3225 -#: diff.c:5410

3267 +#: diff.c:5446

3268 msgid "ignore whitespace when comparing lines"

3269 msgstr ""

3270

3229 -#: diff.c:5413

3271 +#: diff.c:5449

3272 msgid "ignore changes in amount of whitespace"

3273 msgstr ""

3274

3233 -#: diff.c:5416

3275 +#: diff.c:5452

3276 msgid "ignore changes in whitespace at EOL"

3277 msgstr ""

3278

3237 -#: diff.c:5419

3279 +#: diff.c:5455

3280 msgid "ignore carrier-return at the end of line"

3281 msgstr ""

3282

3241 -#: diff.c:5422

3283 +#: diff.c:5458

3284 msgid "ignore changes whose lines are all blank"

3285 msgstr ""

3286

3245 -#: diff.c:5425

3287 +#: diff.c:5461

3288 msgid "heuristic to shift diff hunk boundaries for easy reading"

3289 msgstr ""

3290

3249 -#: diff.c:5428

3291 +#: diff.c:5464

3292 msgid "generate diff using the \"patience diff\" algorithm"

3293 msgstr ""

3294

3253 -#: diff.c:5432

3295 +#: diff.c:5468

3296 msgid "generate diff using the \"histogram diff\" algorithm"

3297 msgstr ""

3298

3257 -#: diff.c:5434

3299 +#: diff.c:5470

3300 msgid "<algorithm>"

3301 msgstr ""

3302

3261 -#: diff.c:5435

3303 +#: diff.c:5471

3304 msgid "choose a diff algorithm"

3305 msgstr ""

3306

3265 -#: diff.c:5437

3307 +#: diff.c:5473

3308 msgid "<text>"

3309 msgstr ""

3310

3269 -#: diff.c:5438

3311 +#: diff.c:5474

3312 msgid "generate diff using the \"anchored diff\" algorithm"

3313 msgstr ""

3314

3273 -#: diff.c:5440 diff.c:5449 diff.c:5452

3315 +#: diff.c:5476 diff.c:5485 diff.c:5488

3316 msgid "<mode>"

3317 msgstr ""

3318

3277 -#: diff.c:5441

3319 +#: diff.c:5477

3320 msgid "show word diff, using <mode> to delimit changed words"

3321 msgstr ""

3322

3281 -#: diff.c:5443 diff.c:5446 diff.c:5491

3323 +#: diff.c:5479 diff.c:5482 diff.c:5527

3324 msgid "<regex>"

3325 msgstr ""

3326

3285 -#: diff.c:5444

3327 +#: diff.c:5480

3328 msgid "use <regex> to decide what a word is"

3329 msgstr ""

3330

3289 -#: diff.c:5447

3331 +#: diff.c:5483

3332 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3333 msgstr ""

3334

3293 -#: diff.c:5450

3335 +#: diff.c:5486

3336 msgid "moved lines of code are colored differently"

3337 msgstr ""

3338

3297 -#: diff.c:5453

3339 +#: diff.c:5489

3340 msgid "how white spaces are ignored in --color-moved"

3341 msgstr ""

3342

3301 -#: diff.c:5456

3343 +#: diff.c:5492

3344 msgid "Other diff options"

3345 msgstr ""

3346

3305 -#: diff.c:5458

3347 +#: diff.c:5494

3348 msgid "when run from subdir, exclude changes outside and show relative paths"

3349 msgstr ""

3350

3309 -#: diff.c:5462

3351 +#: diff.c:5498

3352 msgid "treat all files as text"

3353 msgstr ""

3354

3313 -#: diff.c:5464

3355 +#: diff.c:5500

3356 msgid "swap two inputs, reverse the diff"

3357 msgstr ""

3358

3317 -#: diff.c:5466

3359 +#: diff.c:5502

3360 msgid "exit with 1 if there were differences, 0 otherwise"

3361 msgstr ""

3362

3321 -#: diff.c:5468

3363 +#: diff.c:5504

3364 msgid "disable all output of the program"

3365 msgstr ""

3366

3325 -#: diff.c:5470

3367 +#: diff.c:5506

3368 msgid "allow an external diff helper to be executed"

3369 msgstr ""

3370

3329 -#: diff.c:5472

3371 +#: diff.c:5508

3372 msgid "run external text conversion filters when comparing binary files"

3373 msgstr ""

3374

3333 -#: diff.c:5474

3375 +#: diff.c:5510

3376 msgid "<when>"

3377 msgstr ""

3378

3337 -#: diff.c:5475

3379 +#: diff.c:5511

3380 msgid "ignore changes to submodules in the diff generation"

3381 msgstr ""

3382

3341 -#: diff.c:5478

3383 +#: diff.c:5514

3384 msgid "<format>"

3385 msgstr ""

3386

3345 -#: diff.c:5479

3387 +#: diff.c:5515

3388 msgid "specify how differences in submodules are shown"

3389 msgstr ""

3390

3349 -#: diff.c:5483

3391 +#: diff.c:5519

3392 msgid "hide 'git add -N' entries from the index"

3393 msgstr ""

3394

3353 -#: diff.c:5486

3395 +#: diff.c:5522

3396 msgid "treat 'git add -N' entries as real in the index"

3397 msgstr ""

3398

3357 -#: diff.c:5488

3399 +#: diff.c:5524

3400 msgid "<string>"

3401 msgstr ""

3402

3361 -#: diff.c:5489

3403 +#: diff.c:5525

3404 msgid ""

3405 "look for differences that change the number of occurrences of the specified "

3406 "string"

3407 msgstr ""

3408

3367 -#: diff.c:5492

3409 +#: diff.c:5528

3410 msgid ""

3411 "look for differences that change the number of occurrences of the specified "

3412 "regex"

3413 msgstr ""

3414

3373 -#: diff.c:5495

3415 +#: diff.c:5531

3416 msgid "show all changes in the changeset with -S or -G"

3417 msgstr ""

3418

3377 -#: diff.c:5498

3419 +#: diff.c:5534

3420 msgid "treat <string> in -S as extended POSIX regular expression"

3421 msgstr ""

3422

3381 -#: diff.c:5501

3423 +#: diff.c:5537

3424 msgid "control the order in which files appear in the output"

3425 msgstr ""

3426

3385 -#: diff.c:5502

3427 +#: diff.c:5538

3428 msgid "<object-id>"

3429 msgstr ""

3430

3389 -#: diff.c:5503

3431 +#: diff.c:5539

3432 msgid ""

3433 "look for differences that change the number of occurrences of the specified "

3434 "object"

3435 msgstr ""

3436

3395 -#: diff.c:5505

3437 +#: diff.c:5541

3438 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3439 msgstr ""

3440

3399 -#: diff.c:5506

3441 +#: diff.c:5542

3442 msgid "select files by diff type"

3443 msgstr ""

3444

3403 -#: diff.c:5508

3445 +#: diff.c:5544

3446 msgid "<file>"

3447 msgstr ""

3448

3407 -#: diff.c:5509

3449 +#: diff.c:5545

3450 msgid "Output to a specific file"

3451 msgstr ""

3452

3411 -#: diff.c:6164

3453 +#: diff.c:6200

3454 msgid "inexact rename detection was skipped due to too many files."

3455 msgstr ""

3456

3415 -#: diff.c:6167

3457 +#: diff.c:6203

3458 msgid "only found copies from modified paths due to too many files."

3459 msgstr ""

3460

3419 -#: diff.c:6170

3461 +#: diff.c:6206

3462 #, c-format

3463 msgid ""

3464 "you may want to set your %s variable to at least %d and retry the command."

3465 msgstr ""

3466

3467 +#: diffcore-order.c:24

3468 +#, c-format

3469 +msgid "failed to read orderfile '%s'"

3470 +msgstr ""

3471 +

3472 +#: diffcore-rename.c:592

3473 +msgid "Performing inexact rename detection"

3474 +msgstr ""

3475 +

3476 #: dir.c:555

3477 #, c-format

3478 msgid "pathspec '%s' did not match any file(s) known to git"

@@ -3451,35 +3502,35 @@ msgstr ""

3502 msgid "cannot use %s as an exclude file"

3503 msgstr ""

3504

3454 -#: dir.c:2144

3505 +#: dir.c:2275

3506 #, c-format

3507 msgid "could not open directory '%s'"

3508 msgstr ""

3509

3459 -#: dir.c:2479

3510 +#: dir.c:2575

3511 msgid "failed to get kernel name and information"

3512 msgstr ""

3513

3463 -#: dir.c:2603

3514 +#: dir.c:2699

3515 msgid "untracked cache is disabled on this system or location"

3516 msgstr ""

3517

3467 -#: dir.c:3407

3518 +#: dir.c:3481

3519 #, c-format

3520 msgid "index file corrupt in repo %s"

3521 msgstr ""

3522

3472 -#: dir.c:3452 dir.c:3457

3523 +#: dir.c:3526 dir.c:3531

3524 #, c-format

3525 msgid "could not create directories for %s"

3526 msgstr ""

3527

3477 -#: dir.c:3486

3528 +#: dir.c:3560

3529 #, c-format

3530 msgid "could not migrate git directory from '%s' to '%s'"

3531 msgstr ""

3532

3482 -#: editor.c:73

3533 +#: editor.c:74

3534 #, c-format

3535 msgid "hint: Waiting for your editor to close the file...%c"

3536 msgstr ""

@@ -3488,17 +3539,17 @@ msgstr ""

3539 msgid "Filtering content"

3540 msgstr ""

3541

3491 -#: entry.c:476

3542 +#: entry.c:479

3543 #, c-format

3544 msgid "could not stat file '%s'"

3545 msgstr ""

3546

3496 -#: environment.c:149

3547 +#: environment.c:150

3548 #, c-format

3549 msgid "bad git namespace path \"%s\""

3550 msgstr ""

3551

3501 -#: environment.c:331

3552 +#: environment.c:337

3553 #, c-format

3554 msgid "could not set GIT_DIR to '%s'"

3555 msgstr ""

@@ -3508,244 +3559,244 @@ msgstr ""

3559 msgid "too many args to run %s"

3560 msgstr ""

3561

3511 -#: fetch-pack.c:150

3562 +#: fetch-pack.c:151

3563 msgid "git fetch-pack: expected shallow list"

3564 msgstr ""

3565

3515 -#: fetch-pack.c:153

3566 +#: fetch-pack.c:154

3567 msgid "git fetch-pack: expected a flush packet after shallow list"

3568 msgstr ""

3569

3519 -#: fetch-pack.c:164

3570 +#: fetch-pack.c:165

3571 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

3572 msgstr ""

3573

3523 -#: fetch-pack.c:184

3574 +#: fetch-pack.c:185

3575 #, c-format

3576 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

3577 msgstr ""

3578

3528 -#: fetch-pack.c:195

3579 +#: fetch-pack.c:196

3580 msgid "unable to write to remote"

3581 msgstr ""

3582

3532 -#: fetch-pack.c:257

3583 +#: fetch-pack.c:258

3584 msgid "--stateless-rpc requires multi_ack_detailed"

3585 msgstr ""

3586

3536 -#: fetch-pack.c:356 fetch-pack.c:1340

3587 +#: fetch-pack.c:357 fetch-pack.c:1364

3588 #, c-format

3589 msgid "invalid shallow line: %s"

3590 msgstr ""

3591

3541 -#: fetch-pack.c:362 fetch-pack.c:1346

3592 +#: fetch-pack.c:363 fetch-pack.c:1370

3593 #, c-format

3594 msgid "invalid unshallow line: %s"

3595 msgstr ""

3596

3546 -#: fetch-pack.c:364 fetch-pack.c:1348

3597 +#: fetch-pack.c:365 fetch-pack.c:1372

3598 #, c-format

3599 msgid "object not found: %s"

3600 msgstr ""

3601

3551 -#: fetch-pack.c:367 fetch-pack.c:1351

3602 +#: fetch-pack.c:368 fetch-pack.c:1375

3603 #, c-format

3604 msgid "error in object: %s"

3605 msgstr ""

3606

3556 -#: fetch-pack.c:369 fetch-pack.c:1353

3607 +#: fetch-pack.c:370 fetch-pack.c:1377

3608 #, c-format

3609 msgid "no shallow found: %s"

3610 msgstr ""

3611

3561 -#: fetch-pack.c:372 fetch-pack.c:1357

3612 +#: fetch-pack.c:373 fetch-pack.c:1381

3613 #, c-format

3614 msgid "expected shallow/unshallow, got %s"

3615 msgstr ""

3616

3566 -#: fetch-pack.c:414

3617 +#: fetch-pack.c:415

3618 #, c-format

3619 msgid "got %s %d %s"

3620 msgstr ""

3621

3571 -#: fetch-pack.c:431

3622 +#: fetch-pack.c:432

3623 #, c-format

3624 msgid "invalid commit %s"

3625 msgstr ""

3626

3576 -#: fetch-pack.c:462

3627 +#: fetch-pack.c:463

3628 msgid "giving up"

3629 msgstr ""

3630

3580 -#: fetch-pack.c:475 progress.c:323

3631 +#: fetch-pack.c:476 progress.c:340

3632 msgid "done"

3633 msgstr ""

3634

3584 -#: fetch-pack.c:487

3635 +#: fetch-pack.c:488

3636 #, c-format

3637 msgid "got %s (%d) %s"

3638 msgstr ""

3639

3589 -#: fetch-pack.c:533

3640 +#: fetch-pack.c:534

3641 #, c-format

3642 msgid "Marking %s as complete"

3643 msgstr ""

3644

3594 -#: fetch-pack.c:754

3645 +#: fetch-pack.c:755

3646 #, c-format

3647 msgid "already have %s (%s)"

3648 msgstr ""

3649

3599 -#: fetch-pack.c:818

3650 +#: fetch-pack.c:819

3651 msgid "fetch-pack: unable to fork off sideband demultiplexer"

3652 msgstr ""

3653

3603 -#: fetch-pack.c:826

3654 +#: fetch-pack.c:827

3655 msgid "protocol error: bad pack header"

3656 msgstr ""

3657

3607 -#: fetch-pack.c:900

3658 +#: fetch-pack.c:901

3659 #, c-format

3660 msgid "fetch-pack: unable to fork off %s"

3661 msgstr ""

3662

3612 -#: fetch-pack.c:916

3663 +#: fetch-pack.c:917

3664 #, c-format

3665 msgid "%s failed"

3666 msgstr ""

3667

3617 -#: fetch-pack.c:918

3668 +#: fetch-pack.c:919

3669 msgid "error in sideband demultiplexer"

3670 msgstr ""

3671

3621 -#: fetch-pack.c:965

3672 +#: fetch-pack.c:966

3673 #, c-format

3674 msgid "Server version is %.*s"

3675 msgstr ""

3676

3626 -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985

3627 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001

3628 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017

3629 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039

3677 +#: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986

3678 +#: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002

3679 +#: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018

3680 +#: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040

3681 #, c-format

3682 msgid "Server supports %s"

3683 msgstr ""

3684

3634 -#: fetch-pack.c:972

3685 +#: fetch-pack.c:973

3686 msgid "Server does not support shallow clients"

3687 msgstr ""

3688

3638 -#: fetch-pack.c:1032

3689 +#: fetch-pack.c:1033

3690 msgid "Server does not support --shallow-since"

3691 msgstr ""

3692

3642 -#: fetch-pack.c:1037

3693 +#: fetch-pack.c:1038

3694 msgid "Server does not support --shallow-exclude"

3695 msgstr ""

3696

3646 -#: fetch-pack.c:1041

3697 +#: fetch-pack.c:1042

3698 msgid "Server does not support --deepen"

3699 msgstr ""

3700

3650 -#: fetch-pack.c:1058

3701 +#: fetch-pack.c:1059

3702 msgid "no common commits"

3703 msgstr ""

3704

3654 -#: fetch-pack.c:1070 fetch-pack.c:1536

3705 +#: fetch-pack.c:1071 fetch-pack.c:1563

3706 msgid "git fetch-pack: fetch failed."

3707 msgstr ""

3708

3658 -#: fetch-pack.c:1209

3709 +#: fetch-pack.c:1211

3710 msgid "Server does not support shallow requests"

3711 msgstr ""

3712

3662 -#: fetch-pack.c:1216

3713 +#: fetch-pack.c:1218

3714 msgid "Server supports filter"

3715 msgstr ""

3716

3666 -#: fetch-pack.c:1239

3717 +#: fetch-pack.c:1242

3718 msgid "unable to write request to remote"

3719 msgstr ""

3720

3670 -#: fetch-pack.c:1257

3721 +#: fetch-pack.c:1260

3722 #, c-format

3723 msgid "error reading section header '%s'"

3724 msgstr ""

3725

3675 -#: fetch-pack.c:1263

3726 +#: fetch-pack.c:1266

3727 #, c-format

3728 msgid "expected '%s', received '%s'"

3729 msgstr ""

3730

3680 -#: fetch-pack.c:1303

3731 +#: fetch-pack.c:1327

3732 #, c-format

3733 msgid "unexpected acknowledgment line: '%s'"

3734 msgstr ""

3735

3685 -#: fetch-pack.c:1308

3736 +#: fetch-pack.c:1332

3737 #, c-format

3738 msgid "error processing acks: %d"

3739 msgstr ""

3740

3690 -#: fetch-pack.c:1318

3741 +#: fetch-pack.c:1342

3742 msgid "expected packfile to be sent after 'ready'"

3743 msgstr ""

3744

3694 -#: fetch-pack.c:1320

3745 +#: fetch-pack.c:1344

3746 msgid "expected no other sections to be sent after no 'ready'"

3747 msgstr ""

3748

3698 -#: fetch-pack.c:1362

3749 +#: fetch-pack.c:1386

3750 #, c-format

3751 msgid "error processing shallow info: %d"

3752 msgstr ""

3753

3703 -#: fetch-pack.c:1409

3754 +#: fetch-pack.c:1433

3755 #, c-format

3756 msgid "expected wanted-ref, got '%s'"

3757 msgstr ""

3758

3708 -#: fetch-pack.c:1414

3759 +#: fetch-pack.c:1438

3760 #, c-format

3761 msgid "unexpected wanted-ref: '%s'"

3762 msgstr ""

3763

3713 -#: fetch-pack.c:1419

3764 +#: fetch-pack.c:1443

3765 #, c-format

3766 msgid "error processing wanted refs: %d"

3767 msgstr ""

3768

3718 -#: fetch-pack.c:1762

3769 +#: fetch-pack.c:1789

3770 msgid "no matching remote head"

3771 msgstr ""

3772

3722 -#: fetch-pack.c:1785 builtin/clone.c:689

3773 +#: fetch-pack.c:1812 builtin/clone.c:692

3774 msgid "remote did not send all necessary objects"

3775 msgstr ""

3776

3726 -#: fetch-pack.c:1812

3777 +#: fetch-pack.c:1839

3778 #, c-format

3779 msgid "no such remote ref %s"

3780 msgstr ""

3781

3731 -#: fetch-pack.c:1815

3782 +#: fetch-pack.c:1842

3783 #, c-format

3784 msgid "Server does not allow request for unadvertised object %s"

3785 msgstr ""

3786

3736 -#: gpg-interface.c:408

3737 -msgid "gpg failed to sign the data"

3738 -msgstr ""

3739 -

3740 -#: gpg-interface.c:434

3787 +#: gpg-interface.c:272

3788 msgid "could not create temporary file"

3789 msgstr ""

3790

3744 -#: gpg-interface.c:437

3791 +#: gpg-interface.c:275

3792 #, c-format

3793 msgid "failed writing detached signature to '%s'"

3794 msgstr ""

3795

3796 +#: gpg-interface.c:457

3797 +msgid "gpg failed to sign the data"

3798 +msgstr ""

3799 +

3800 #: graph.c:98

3801 #, c-format

3802 msgid "ignore invalid color '%.*s' in log.graphColors"

@@ -3762,7 +3813,7 @@ msgstr ""

3813 msgid "'%s': unable to read %s"

3814 msgstr ""

3815

3765 -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82

3816 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82

3817 #: builtin/rm.c:135

3818 #, c-format

3819 msgid "failed to stat '%s'"

@@ -3838,7 +3889,7 @@ msgstr ""

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

3890 msgstr ""

3891

3841 -#: help.c:363 git.c:98

3892 +#: help.c:363 git.c:99

3893 #, c-format

3894 msgid "unsupported command listing type '%s'"

3895 msgstr ""

@@ -3847,50 +3898,50 @@ msgstr ""

3898 msgid "The common Git guides are:"

3899 msgstr ""

3900

3850 -#: help.c:512

3901 +#: help.c:427

3902 msgid "See 'git help <command>' to read about a specific subcommand"

3903 msgstr ""

3904

3854 -#: help.c:517

3905 +#: help.c:432

3906 msgid "External commands"

3907 msgstr ""

3908

3858 -#: help.c:532

3909 +#: help.c:447

3910 msgid "Command aliases"

3911 msgstr ""

3912

3862 -#: help.c:596

3913 +#: help.c:511

3914 #, c-format

3915 msgid ""

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

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

3918 msgstr ""

3919

3869 -#: help.c:655

3920 +#: help.c:570

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

3922 msgstr ""

3923

3873 -#: help.c:677

3924 +#: help.c:592

3925 #, c-format

3926 msgid "WARNING: You called a Git command named '%s', which does not exist."

3927 msgstr ""

3928

3878 -#: help.c:682

3929 +#: help.c:597

3930 #, c-format

3931 msgid "Continuing under the assumption that you meant '%s'."

3932 msgstr ""

3933

3883 -#: help.c:687

3934 +#: help.c:602

3935 #, c-format

3936 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

3937 msgstr ""

3938

3888 -#: help.c:695

3939 +#: help.c:610

3940 #, c-format

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

3942 msgstr ""

3943

3893 -#: help.c:699

3944 +#: help.c:614

3945 msgid ""

3946 "\n"

3947 "The most similar command is"

@@ -3900,16 +3951,16 @@ msgid_plural ""

3951 msgstr[0] ""

3952 msgstr[1] ""

3953

3903 -#: help.c:714

3954 +#: help.c:653

3955 msgid "git version [<options>]"

3956 msgstr ""

3957

3907 -#: help.c:783

3958 +#: help.c:708

3959 #, c-format

3960 msgid "%s: %s - %s"

3961 msgstr ""

3962

3912 -#: help.c:787

3963 +#: help.c:712

3964 msgid ""

3965 "\n"

3966 "Did you mean this?"

@@ -3962,36 +4013,11 @@ msgstr ""

4013 msgid "name consists only of disallowed characters: %s"

4014 msgstr ""

4015

3965 -#: ident.c:436 builtin/commit.c:635

4016 +#: ident.c:436 builtin/commit.c:634

4017 #, c-format

4018 msgid "invalid date format: %s"

4019 msgstr ""

4020

3970 -#: list-objects.c:127

3971 -#, c-format

3972 -msgid "entry '%s' in tree %s has tree mode, but is not a tree"

3973 -msgstr ""

3974 -

3975 -#: list-objects.c:140

3976 -#, c-format

3977 -msgid "entry '%s' in tree %s has blob mode, but is not a blob"

3978 -msgstr ""

3979 -

3980 -#: list-objects.c:375

3981 -#, c-format

3982 -msgid "unable to load root tree for commit %s"

3983 -msgstr ""

3984 -

3985 -#: list-objects-filter.c:492

3986 -#, c-format

3987 -msgid "unable to access sparse blob in '%s'"

3988 -msgstr ""

3989 -

3990 -#: list-objects-filter.c:495

3991 -#, c-format

3992 -msgid "unable to parse sparse filter data in %s"

3993 -msgstr ""

3994 -

4021 #: list-objects-filter-options.c:58

4022 msgid "expected 'tree:<depth>'"

4023 msgstr ""

@@ -4018,7 +4044,32 @@ msgstr ""

4044 msgid "multiple filter-specs cannot be combined"

4045 msgstr ""

4046

4021 -#: lockfile.c:151

4047 +#: list-objects-filter.c:492

4048 +#, c-format

4049 +msgid "unable to access sparse blob in '%s'"

4050 +msgstr ""

4051 +

4052 +#: list-objects-filter.c:495

4053 +#, c-format

4054 +msgid "unable to parse sparse filter data in %s"

4055 +msgstr ""

4056 +

4057 +#: list-objects.c:127

4058 +#, c-format

4059 +msgid "entry '%s' in tree %s has tree mode, but is not a tree"

4060 +msgstr ""

4061 +

4062 +#: list-objects.c:140

4063 +#, c-format

4064 +msgid "entry '%s' in tree %s has blob mode, but is not a blob"

4065 +msgstr ""

4066 +

4067 +#: list-objects.c:375

4068 +#, c-format

4069 +msgid "unable to load root tree for commit %s"

4070 +msgstr ""

4071 +

4072 +#: lockfile.c:152

4073 #, c-format

4074 msgid ""

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

@@ -4030,19 +4081,13 @@ msgid ""

4081 "remove the file manually to continue."

4082 msgstr ""

4083

4033 -#: lockfile.c:159

4084 +#: lockfile.c:160

4085 #, c-format

4086 msgid "Unable to create '%s.lock': %s"

4087 msgstr ""

4088

4038 -#: merge.c:41

4039 -msgid "failed to read the cache"

4040 -msgstr ""

4041 -

4042 -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913

4043 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810

4044 -#: builtin/stash.c:265

4045 -msgid "unable to write new index file"

4089 +#: ls-refs.c:109

4090 +msgid "expected flush after ls-refs arguments"

4091 msgstr ""

4092

4093 #: merge-recursive.c:356

@@ -4321,7 +4366,7 @@ msgstr ""

4366 msgid "Skipped %s (merged same as existing)"

4367 msgstr ""

4368

4324 -#: merge-recursive.c:3089 git-submodule.sh:1003

4369 +#: merge-recursive.c:3089 git-submodule.sh:985

4370 msgid "submodule"

4371 msgstr ""

4372

@@ -4427,10 +4472,20 @@ msgstr ""

4472 msgid "Could not parse object '%s'"

4473 msgstr ""

4474

4430 -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877

4475 +#: merge-recursive.c:3774 builtin/merge.c:705 builtin/merge.c:885

4476 msgid "Unable to write index."

4477 msgstr ""

4478

4479 +#: merge.c:41

4480 +msgid "failed to read the cache"

4481 +msgstr ""

4482 +

4483 +#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912

4484 +#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816

4485 +#: builtin/stash.c:265

4486 +msgid "unable to write new index file"

4487 +msgstr ""

4488 +

4489 #: midx.c:68

4490 #, c-format

4491 msgid "multi-pack-index file %s is too small"

@@ -4480,107 +4535,115 @@ msgstr ""

4535 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4536 msgstr ""

4537

4483 -#: midx.c:210

4538 +#: midx.c:208

4539 #, c-format

4540 msgid "bad pack-int-id: %u (%u total packs)"

4541 msgstr ""

4542

4488 -#: midx.c:260

4543 +#: midx.c:258

4544 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

4545 msgstr ""

4546

4492 -#: midx.c:288

4547 +#: midx.c:286

4548 msgid "error preparing packfile from multi-pack-index"

4549 msgstr ""

4550

4496 -#: midx.c:472

4551 +#: midx.c:470

4552 #, c-format

4553 msgid "failed to add packfile '%s'"

4554 msgstr ""

4555

4501 -#: midx.c:478

4556 +#: midx.c:476

4557 #, c-format

4558 msgid "failed to open pack-index '%s'"

4559 msgstr ""

4560

4506 -#: midx.c:538

4561 +#: midx.c:536

4562 #, c-format

4563 msgid "failed to locate object %d in packfile"

4564 msgstr ""

4565

4511 -#: midx.c:842

4566 +#: midx.c:840

4567 msgid "Adding packfiles to multi-pack-index"

4568 msgstr ""

4569

4515 -#: midx.c:875

4570 +#: midx.c:873

4571 #, c-format

4572 msgid "did not see pack-file %s to drop"

4573 msgstr ""

4574

4520 -#: midx.c:973

4575 +#: midx.c:925

4576 +msgid "no pack files to index."

4577 +msgstr ""

4578 +

4579 +#: midx.c:977

4580 msgid "Writing chunks to multi-pack-index"

4581 msgstr ""

4582

4524 -#: midx.c:1052

4583 +#: midx.c:1056

4584 #, c-format

4585 msgid "failed to clear multi-pack-index at %s"

4586 msgstr ""

4587

4529 -#: midx.c:1108

4588 +#: midx.c:1112

4589 msgid "Looking for referenced packfiles"

4590 msgstr ""

4591

4533 -#: midx.c:1123

4592 +#: midx.c:1127

4593 #, c-format

4594 msgid ""

4595 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4596 msgstr ""

4597

4539 -#: midx.c:1128

4598 +#: midx.c:1132

4599 +msgid "the midx contains no oid"

4600 +msgstr ""

4601 +

4602 +#: midx.c:1141

4603 msgid "Verifying OID order in multi-pack-index"

4604 msgstr ""

4605

4543 -#: midx.c:1137

4606 +#: midx.c:1150

4607 #, c-format

4608 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4609 msgstr ""

4610

4548 -#: midx.c:1157

4611 +#: midx.c:1170

4612 msgid "Sorting objects by packfile"

4613 msgstr ""

4614

4552 -#: midx.c:1164

4615 +#: midx.c:1177

4616 msgid "Verifying object offsets"

4617 msgstr ""

4618

4556 -#: midx.c:1180

4619 +#: midx.c:1193

4620 #, c-format

4621 msgid "failed to load pack entry for oid[%d] = %s"

4622 msgstr ""

4623

4561 -#: midx.c:1186

4624 +#: midx.c:1199

4625 #, c-format

4626 msgid "failed to load pack-index for packfile %s"

4627 msgstr ""

4628

4566 -#: midx.c:1195

4629 +#: midx.c:1208

4630 #, c-format

4631 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4632 msgstr ""

4633

4571 -#: midx.c:1220

4634 +#: midx.c:1233

4635 msgid "Counting referenced objects"

4636 msgstr ""

4637

4575 -#: midx.c:1230

4638 +#: midx.c:1243

4639 msgid "Finding and deleting unreferenced packfiles"

4640 msgstr ""

4641

4579 -#: midx.c:1388

4642 +#: midx.c:1433

4643 msgid "could not start pack-objects"

4644 msgstr ""

4645

4583 -#: midx.c:1407

4646 +#: midx.c:1452

4647 msgid "could not finish pack-objects"

4648 msgstr ""

4649

@@ -4660,6 +4723,11 @@ msgstr ""

4723 msgid "hash mismatch %s"

4724 msgstr ""

4725

4726 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135

4727 +#, c-format

4728 +msgid "unable to get size of %s"

4729 +msgstr ""

4730 +

4731 #: packfile.c:629

4732 msgid "offset before end of packfile (broken .idx?)"

4733 msgstr ""

@@ -4674,9 +4742,24 @@ msgstr ""

4742 msgid "offset beyond end of pack index for %s (truncated index?)"

4743 msgstr ""

4744

4677 -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134

4745 +#: parse-options-cb.c:20 parse-options-cb.c:24

4746 #, c-format

4679 -msgid "unable to get size of %s"

4747 +msgid "option `%s' expects a numerical value"

4748 +msgstr ""

4749 +

4750 +#: parse-options-cb.c:41

4751 +#, c-format

4752 +msgid "malformed expiration date '%s'"

4753 +msgstr ""

4754 +

4755 +#: parse-options-cb.c:54

4756 +#, c-format

4757 +msgid "option `%s' expects \"always\", \"auto\", or \"never\""

4758 +msgstr ""

4759 +

4760 +#: parse-options-cb.c:130 parse-options-cb.c:147

4761 +#, c-format

4762 +msgid "malformed object name '%s'"

4763 msgstr ""

4764

4765 #: parse-options.c:38

@@ -4719,26 +4802,31 @@ msgstr ""

4802 msgid "did you mean `--%s` (with two dashes)?"

4803 msgstr ""

4804

4722 -#: parse-options.c:857

4805 +#: parse-options.c:663 parse-options.c:963

4806 +#, c-format

4807 +msgid "alias of --%s"

4808 +msgstr ""

4809 +

4810 +#: parse-options.c:854

4811 #, c-format

4812 msgid "unknown option `%s'"

4813 msgstr ""

4814

4727 -#: parse-options.c:859

4815 +#: parse-options.c:856

4816 #, c-format

4817 msgid "unknown switch `%c'"

4818 msgstr ""

4819

4732 -#: parse-options.c:861

4820 +#: parse-options.c:858

4821 #, c-format

4822 msgid "unknown non-ascii option in string: `%s'"

4823 msgstr ""

4824

4737 -#: parse-options.c:885

4825 +#: parse-options.c:882

4826 msgid "..."

4827 msgstr ""

4828

4741 -#: parse-options.c:904

4829 +#: parse-options.c:901

4830 #, c-format

4831 msgid "usage: %s"

4832 msgstr ""

@@ -4746,45 +4834,20 @@ msgstr ""

4834 #. TRANSLATORS: the colon here should align with the

4835 #. one in "usage: %s" translation.

4836 #.

4749 -#: parse-options.c:910

4837 +#: parse-options.c:907

4838 #, c-format

4839 msgid " or: %s"

4840 msgstr ""

4841

4754 -#: parse-options.c:913

4842 +#: parse-options.c:910

4843 #, c-format

4844 msgid " %s"

4845 msgstr ""

4846

4759 -#: parse-options.c:952

4847 +#: parse-options.c:949

4848 msgid "-NUM"

4849 msgstr ""

4850

4763 -#: parse-options.c:966

4764 -#, c-format

4765 -msgid "alias of --%s"

4766 -msgstr ""

4767 -

4768 -#: parse-options-cb.c:20 parse-options-cb.c:24

4769 -#, c-format

4770 -msgid "option `%s' expects a numerical value"

4771 -msgstr ""

4772 -

4773 -#: parse-options-cb.c:41

4774 -#, c-format

4775 -msgid "malformed expiration date '%s'"

4776 -msgstr ""

4777 -

4778 -#: parse-options-cb.c:54

4779 -#, c-format

4780 -msgid "option `%s' expects \"always\", \"auto\", or \"never\""

4781 -msgstr ""

4782 -

4783 -#: parse-options-cb.c:130 parse-options-cb.c:147

4784 -#, c-format

4785 -msgid "malformed object name '%s'"

4786 -msgstr ""

4787 -

4851 #: path.c:915

4852 #, c-format

4853 msgid "Could not make %s writable by group"

@@ -4841,27 +4904,27 @@ msgstr ""

4904 msgid "%s: 'literal' and 'glob' are incompatible"

4905 msgstr ""

4906

4844 -#: pathspec.c:442

4907 +#: pathspec.c:445

4908 #, c-format

4909 msgid "%s: '%s' is outside repository at '%s'"

4910 msgstr ""

4911

4849 -#: pathspec.c:517

4912 +#: pathspec.c:521

4913 #, c-format

4914 msgid "'%s' (mnemonic: '%c')"

4915 msgstr ""

4916

4854 -#: pathspec.c:527

4917 +#: pathspec.c:531

4918 #, c-format

4919 msgid "%s: pathspec magic not supported by this command: %s"

4920 msgstr ""

4921

4859 -#: pathspec.c:594

4922 +#: pathspec.c:598

4923 #, c-format

4924 msgid "pathspec '%s' is beyond a symbolic link"

4925 msgstr ""

4926

4864 -#: pathspec.c:639

4927 +#: pathspec.c:643

4928 #, c-format

4929 msgid "line is badly quoted: %s"

4930 msgstr ""

@@ -4926,7 +4989,7 @@ msgstr ""

4989 msgid "unable to create threaded lstat: %s"

4990 msgstr ""

4991

4929 -#: pretty.c:981

4992 +#: pretty.c:982

4993 msgid "unable to parse --pretty format"

4994 msgstr ""

4995

@@ -4939,29 +5002,40 @@ msgstr ""

5002 msgid "promisor remote name cannot begin with '/': %s"

5003 msgstr ""

5004

4942 -#: range-diff.c:75

4943 -msgid "could not start `log`"

5005 +#: prune-packed.c:35

5006 +msgid "Removing duplicate objects"

5007 msgstr ""

5008

5009 #: range-diff.c:77

5010 +msgid "could not start `log`"

5011 +msgstr ""

5012 +

5013 +#: range-diff.c:79

5014 msgid "could not read `log` output"

5015 msgstr ""

5016

4950 -#: range-diff.c:96 sequencer.c:5020

5017 +#: range-diff.c:98 sequencer.c:5143

5018 #, c-format

5019 msgid "could not parse commit '%s'"

5020 msgstr ""

5021

4955 -#: range-diff.c:122

5022 +#: range-diff.c:112

5023 +#, c-format

5024 +msgid ""

5025 +"could not parse first line of `log` output: did not start with 'commit ': "

5026 +"'%s'"

5027 +msgstr ""

5028 +

5029 +#: range-diff.c:137

5030 #, c-format

5031 msgid "could not parse git header '%.*s'"

5032 msgstr ""

5033

4960 -#: range-diff.c:285

5034 +#: range-diff.c:301

5035 msgid "failed to generate diff"

5036 msgstr ""

5037

4964 -#: range-diff.c:518 range-diff.c:520

5038 +#: range-diff.c:534 range-diff.c:536

5039 #, c-format

5040 msgid "could not parse log for '%s'"

5041 msgstr ""

@@ -5073,9 +5147,9 @@ msgstr ""

5147

5148 #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111

5149 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5076 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967

5077 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485

5078 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290

5150 +#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961

5151 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507

5152 +#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290

5153 #: builtin/submodule--helper.c:332

5154 msgid "index file corrupt"

5155 msgstr ""

@@ -5130,12 +5204,12 @@ msgstr ""

5204 msgid "broken index, expect %s in %s, got %s"

5205 msgstr ""

5206

5133 -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122

5207 +#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130

5208 #, c-format

5209 msgid "could not close '%s'"

5210 msgstr ""

5211

5138 -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959

5212 +#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066

5213 #, c-format

5214 msgid "could not stat '%s'"

5215 msgstr ""

@@ -5230,14 +5304,14 @@ msgid ""

5304 "\n"

5305 msgstr ""

5306

5233 -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444

5234 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252

5307 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463

5308 +#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:346 builtin/rebase.c:258

5309 #, c-format

5310 msgid "could not write '%s'"

5311 msgstr ""

5312

5239 -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210

5240 -#: builtin/rebase.c:234

5313 +#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216

5314 +#: builtin/rebase.c:240

5315 #, c-format

5316 msgid "could not write '%s'."

5317 msgstr ""

@@ -5260,424 +5334,424 @@ msgid ""

5334 "\n"

5335 msgstr ""

5336

5263 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262

5264 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221

5265 -#: builtin/rebase.c:246

5337 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274

5338 +#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227

5339 +#: builtin/rebase.c:252

5340 #, c-format

5341 msgid "could not read '%s'."

5342 msgstr ""

5343

5270 -#: refs.c:262

5271 -#, c-format

5272 -msgid "%s does not point to a valid object!"

5344 +#: ref-filter.c:42 wt-status.c:1936

5345 +msgid "gone"

5346 msgstr ""

5347

5275 -#: refs.c:667

5348 +#: ref-filter.c:43

5349 #, c-format

5277 -msgid "ignoring dangling symref %s"

5350 +msgid "ahead %d"

5351 msgstr ""

5352

5280 -#: refs.c:669 ref-filter.c:2098

5353 +#: ref-filter.c:44

5354 #, c-format

5282 -msgid "ignoring broken ref %s"

5355 +msgid "behind %d"

5356 msgstr ""

5357

5285 -#: refs.c:804

5358 +#: ref-filter.c:45

5359 #, c-format

5287 -msgid "could not open '%s' for writing: %s"

5360 +msgid "ahead %d, behind %d"

5361 msgstr ""

5362

5290 -#: refs.c:814 refs.c:865

5363 +#: ref-filter.c:165

5364 #, c-format

5292 -msgid "could not read ref '%s'"

5365 +msgid "expected format: %%(color:<color>)"

5366 msgstr ""

5367

5295 -#: refs.c:820

5368 +#: ref-filter.c:167

5369 #, c-format

5297 -msgid "ref '%s' already exists"

5370 +msgid "unrecognized color: %%(color:%s)"

5371 msgstr ""

5372

5300 -#: refs.c:825

5373 +#: ref-filter.c:189

5374 #, c-format

5302 -msgid "unexpected object ID when writing '%s'"

5375 +msgid "Integer value expected refname:lstrip=%s"

5376 msgstr ""

5377

5305 -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905

5306 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157

5307 -#: wrapper.c:620

5378 +#: ref-filter.c:193

5379 #, c-format

5309 -msgid "could not write to '%s'"

5380 +msgid "Integer value expected refname:rstrip=%s"

5381 msgstr ""

5382

5312 -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719

5313 -#: builtin/rebase.c:1029

5383 +#: ref-filter.c:195

5384 #, c-format

5315 -msgid "could not open '%s' for writing"

5385 +msgid "unrecognized %%(%s) argument: %s"

5386 msgstr ""

5387

5318 -#: refs.c:867

5388 +#: ref-filter.c:250

5389 #, c-format

5320 -msgid "unexpected object ID when deleting '%s'"

5390 +msgid "%%(objecttype) does not take arguments"

5391 msgstr ""

5392

5323 -#: refs.c:998

5393 +#: ref-filter.c:272

5394 #, c-format

5325 -msgid "log for ref %s has gap after %s"

5395 +msgid "unrecognized %%(objectsize) argument: %s"

5396 msgstr ""

5397

5328 -#: refs.c:1004

5398 +#: ref-filter.c:280

5399 #, c-format

5330 -msgid "log for ref %s unexpectedly ended on %s"

5400 +msgid "%%(deltabase) does not take arguments"

5401 msgstr ""

5402

5333 -#: refs.c:1063

5403 +#: ref-filter.c:292

5404 #, c-format

5335 -msgid "log for %s is empty"

5405 +msgid "%%(body) does not take arguments"

5406 msgstr ""

5407

5338 -#: refs.c:1155

5408 +#: ref-filter.c:301

5409 #, c-format

5340 -msgid "refusing to update ref with bad name '%s'"

5410 +msgid "%%(subject) does not take arguments"

5411 msgstr ""

5412

5343 -#: refs.c:1231

5413 +#: ref-filter.c:323

5414 #, c-format

5345 -msgid "update_ref failed for ref '%s': %s"

5415 +msgid "unknown %%(trailers) argument: %s"

5416 msgstr ""

5417

5348 -#: refs.c:2023

5418 +#: ref-filter.c:352

5419 #, c-format

5350 -msgid "multiple updates for ref '%s' not allowed"

5420 +msgid "positive value expected contents:lines=%s"

5421 msgstr ""

5422

5353 -#: refs.c:2055

5354 -msgid "ref updates forbidden inside quarantine environment"

5423 +#: ref-filter.c:354

5424 +#, c-format

5425 +msgid "unrecognized %%(contents) argument: %s"

5426 msgstr ""

5427

5357 -#: refs.c:2151 refs.c:2181

5428 +#: ref-filter.c:369

5429 #, c-format

5359 -msgid "'%s' exists; cannot create '%s'"

5430 +msgid "positive value expected objectname:short=%s"

5431 msgstr ""

5432

5362 -#: refs.c:2157 refs.c:2192

5433 +#: ref-filter.c:373

5434 #, c-format

5364 -msgid "cannot process '%s' and '%s' at the same time"

5435 +msgid "unrecognized %%(objectname) argument: %s"

5436 msgstr ""

5437

5367 -#: refs/files-backend.c:1233

5438 +#: ref-filter.c:403

5439 #, c-format

5369 -msgid "could not remove reference %s"

5440 +msgid "expected format: %%(align:<width>,<position>)"

5441 msgstr ""

5442

5372 -#: refs/files-backend.c:1247 refs/packed-backend.c:1541

5373 -#: refs/packed-backend.c:1551

5443 +#: ref-filter.c:415

5444 #, c-format

5375 -msgid "could not delete reference %s: %s"

5445 +msgid "unrecognized position:%s"

5446 msgstr ""

5447

5378 -#: refs/files-backend.c:1250 refs/packed-backend.c:1554

5448 +#: ref-filter.c:422

5449 #, c-format

5380 -msgid "could not delete references: %s"

5450 +msgid "unrecognized width:%s"

5451 msgstr ""

5452

5383 -#: refspec.c:137

5453 +#: ref-filter.c:431

5454 #, c-format

5385 -msgid "invalid refspec '%s'"

5455 +msgid "unrecognized %%(align) argument: %s"

5456 msgstr ""

5457

5388 -#: ref-filter.c:42 wt-status.c:1938

5389 -msgid "gone"

5458 +#: ref-filter.c:439

5459 +#, c-format

5460 +msgid "positive width expected with the %%(align) atom"

5461 msgstr ""

5462

5392 -#: ref-filter.c:43

5463 +#: ref-filter.c:457

5464 #, c-format

5394 -msgid "ahead %d"

5465 +msgid "unrecognized %%(if) argument: %s"

5466 msgstr ""

5467

5397 -#: ref-filter.c:44

5468 +#: ref-filter.c:559

5469 #, c-format

5399 -msgid "behind %d"

5470 +msgid "malformed field name: %.*s"

5471 msgstr ""

5472

5402 -#: ref-filter.c:45

5473 +#: ref-filter.c:586

5474 #, c-format

5404 -msgid "ahead %d, behind %d"

5475 +msgid "unknown field name: %.*s"

5476 msgstr ""

5477

5407 -#: ref-filter.c:165

5478 +#: ref-filter.c:590

5479 #, c-format

5409 -msgid "expected format: %%(color:<color>)"

5480 +msgid ""

5481 +"not a git repository, but the field '%.*s' requires access to object data"

5482 msgstr ""

5483

5412 -#: ref-filter.c:167

5484 +#: ref-filter.c:714

5485 #, c-format

5414 -msgid "unrecognized color: %%(color:%s)"

5486 +msgid "format: %%(if) atom used without a %%(then) atom"

5487 msgstr ""

5488

5417 -#: ref-filter.c:189

5489 +#: ref-filter.c:777

5490 #, c-format

5419 -msgid "Integer value expected refname:lstrip=%s"

5491 +msgid "format: %%(then) atom used without an %%(if) atom"

5492 msgstr ""

5493

5422 -#: ref-filter.c:193

5494 +#: ref-filter.c:779

5495 #, c-format

5424 -msgid "Integer value expected refname:rstrip=%s"

5496 +msgid "format: %%(then) atom used more than once"

5497 msgstr ""

5498

5427 -#: ref-filter.c:195

5499 +#: ref-filter.c:781

5500 #, c-format

5429 -msgid "unrecognized %%(%s) argument: %s"

5501 +msgid "format: %%(then) atom used after %%(else)"

5502 msgstr ""

5503

5432 -#: ref-filter.c:250

5504 +#: ref-filter.c:809

5505 #, c-format

5434 -msgid "%%(objecttype) does not take arguments"

5506 +msgid "format: %%(else) atom used without an %%(if) atom"

5507 msgstr ""

5508

5437 -#: ref-filter.c:272

5509 +#: ref-filter.c:811

5510 #, c-format

5439 -msgid "unrecognized %%(objectsize) argument: %s"

5511 +msgid "format: %%(else) atom used without a %%(then) atom"

5512 msgstr ""

5513

5442 -#: ref-filter.c:280

5514 +#: ref-filter.c:813

5515 #, c-format

5444 -msgid "%%(deltabase) does not take arguments"

5516 +msgid "format: %%(else) atom used more than once"

5517 msgstr ""

5518

5447 -#: ref-filter.c:292

5519 +#: ref-filter.c:828

5520 #, c-format

5449 -msgid "%%(body) does not take arguments"

5521 +msgid "format: %%(end) atom used without corresponding atom"

5522 msgstr ""

5523

5452 -#: ref-filter.c:301

5524 +#: ref-filter.c:885

5525 #, c-format

5454 -msgid "%%(subject) does not take arguments"

5526 +msgid "malformed format string %s"

5527 msgstr ""

5528

5457 -#: ref-filter.c:323

5529 +#: ref-filter.c:1486

5530 #, c-format

5459 -msgid "unknown %%(trailers) argument: %s"

5531 +msgid "no branch, rebasing %s"

5532 msgstr ""

5533

5462 -#: ref-filter.c:352

5534 +#: ref-filter.c:1489

5535 #, c-format

5464 -msgid "positive value expected contents:lines=%s"

5536 +msgid "no branch, rebasing detached HEAD %s"

5537 msgstr ""

5538

5467 -#: ref-filter.c:354

5539 +#: ref-filter.c:1492

5540 #, c-format

5469 -msgid "unrecognized %%(contents) argument: %s"

5541 +msgid "no branch, bisect started on %s"

5542 msgstr ""

5543

5472 -#: ref-filter.c:369

5473 -#, c-format

5474 -msgid "positive value expected objectname:short=%s"

5544 +#: ref-filter.c:1502

5545 +msgid "no branch"

5546 msgstr ""

5547

5477 -#: ref-filter.c:373

5548 +#: ref-filter.c:1538 ref-filter.c:1747

5549 #, c-format

5479 -msgid "unrecognized %%(objectname) argument: %s"

5550 +msgid "missing object %s for %s"

5551 msgstr ""

5552

5482 -#: ref-filter.c:403

5553 +#: ref-filter.c:1548

5554 #, c-format

5484 -msgid "expected format: %%(align:<width>,<position>)"

5555 +msgid "parse_object_buffer failed on %s for %s"

5556 msgstr ""

5557

5487 -#: ref-filter.c:415

5558 +#: ref-filter.c:2001

5559 #, c-format

5489 -msgid "unrecognized position:%s"

5560 +msgid "malformed object at '%s'"

5561 msgstr ""

5562

5492 -#: ref-filter.c:422

5563 +#: ref-filter.c:2090

5564 #, c-format

5494 -msgid "unrecognized width:%s"

5565 +msgid "ignoring ref with broken name %s"

5566 msgstr ""

5567

5497 -#: ref-filter.c:431

5568 +#: ref-filter.c:2095 refs.c:625

5569 #, c-format

5499 -msgid "unrecognized %%(align) argument: %s"

5570 +msgid "ignoring broken ref %s"

5571 msgstr ""

5572

5502 -#: ref-filter.c:439

5573 +#: ref-filter.c:2395

5574 #, c-format

5504 -msgid "positive width expected with the %%(align) atom"

5575 +msgid "format: %%(end) atom missing"

5576 msgstr ""

5577

5507 -#: ref-filter.c:457

5578 +#: ref-filter.c:2495

5579 #, c-format

5509 -msgid "unrecognized %%(if) argument: %s"

5580 +msgid "option `%s' is incompatible with --merged"

5581 msgstr ""

5582

5512 -#: ref-filter.c:559

5583 +#: ref-filter.c:2498

5584 #, c-format

5514 -msgid "malformed field name: %.*s"

5585 +msgid "option `%s' is incompatible with --no-merged"

5586 msgstr ""

5587

5517 -#: ref-filter.c:586

5588 +#: ref-filter.c:2508

5589 #, c-format

5519 -msgid "unknown field name: %.*s"

5590 +msgid "malformed object name %s"

5591 msgstr ""

5592

5522 -#: ref-filter.c:590

5593 +#: ref-filter.c:2513

5594 #, c-format

5524 -msgid ""

5525 -"not a git repository, but the field '%.*s' requires access to object data"

5595 +msgid "option `%s' must point to a commit"

5596 msgstr ""

5597

5528 -#: ref-filter.c:714

5598 +#: refs.c:262

5599 #, c-format

5530 -msgid "format: %%(if) atom used without a %%(then) atom"

5600 +msgid "%s does not point to a valid object!"

5601 msgstr ""

5602

5533 -#: ref-filter.c:777

5603 +#: refs.c:623

5604 #, c-format

5535 -msgid "format: %%(then) atom used without an %%(if) atom"

5605 +msgid "ignoring dangling symref %s"

5606 msgstr ""

5607

5538 -#: ref-filter.c:779

5608 +#: refs.c:760

5609 #, c-format

5540 -msgid "format: %%(then) atom used more than once"

5610 +msgid "could not open '%s' for writing: %s"

5611 msgstr ""

5612

5543 -#: ref-filter.c:781

5613 +#: refs.c:770 refs.c:821

5614 #, c-format

5545 -msgid "format: %%(then) atom used after %%(else)"

5615 +msgid "could not read ref '%s'"

5616 msgstr ""

5617

5548 -#: ref-filter.c:809

5618 +#: refs.c:776

5619 #, c-format

5550 -msgid "format: %%(else) atom used without an %%(if) atom"

5620 +msgid "ref '%s' already exists"

5621 msgstr ""

5622

5553 -#: ref-filter.c:811

5623 +#: refs.c:781

5624 #, c-format

5555 -msgid "format: %%(else) atom used without a %%(then) atom"

5625 +msgid "unexpected object ID when writing '%s'"

5626 msgstr ""

5627

5558 -#: ref-filter.c:813

5628 +#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925

5629 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173

5630 +#: wrapper.c:620

5631 #, c-format

5560 -msgid "format: %%(else) atom used more than once"

5632 +msgid "could not write to '%s'"

5633 msgstr ""

5634

5563 -#: ref-filter.c:828

5635 +#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719

5636 +#: builtin/rebase.c:852

5637 #, c-format

5565 -msgid "format: %%(end) atom used without corresponding atom"

5638 +msgid "could not open '%s' for writing"

5639 msgstr ""

5640

5568 -#: ref-filter.c:885

5641 +#: refs.c:823

5642 #, c-format

5570 -msgid "malformed format string %s"

5643 +msgid "unexpected object ID when deleting '%s'"

5644 msgstr ""

5645

5573 -#: ref-filter.c:1488

5646 +#: refs.c:954

5647 #, c-format

5575 -msgid "no branch, rebasing %s"

5648 +msgid "log for ref %s has gap after %s"

5649 msgstr ""

5650

5578 -#: ref-filter.c:1491

5651 +#: refs.c:960

5652 #, c-format

5580 -msgid "no branch, rebasing detached HEAD %s"

5653 +msgid "log for ref %s unexpectedly ended on %s"

5654 msgstr ""

5655

5583 -#: ref-filter.c:1494

5656 +#: refs.c:1019

5657 #, c-format

5585 -msgid "no branch, bisect started on %s"

5658 +msgid "log for %s is empty"

5659 msgstr ""

5660

5588 -#: ref-filter.c:1504

5589 -msgid "no branch"

5661 +#: refs.c:1111

5662 +#, c-format

5663 +msgid "refusing to update ref with bad name '%s'"

5664 msgstr ""

5665

5592 -#: ref-filter.c:1540 ref-filter.c:1749

5666 +#: refs.c:1187

5667 #, c-format

5594 -msgid "missing object %s for %s"

5668 +msgid "update_ref failed for ref '%s': %s"

5669 msgstr ""

5670

5597 -#: ref-filter.c:1550

5671 +#: refs.c:1979

5672 #, c-format

5599 -msgid "parse_object_buffer failed on %s for %s"

5673 +msgid "multiple updates for ref '%s' not allowed"

5674 msgstr ""

5675

5602 -#: ref-filter.c:2004

5603 -#, c-format

5604 -msgid "malformed object at '%s'"

5676 +#: refs.c:2011

5677 +msgid "ref updates forbidden inside quarantine environment"

5678 msgstr ""

5679

5607 -#: ref-filter.c:2093

5680 +#: refs.c:2107 refs.c:2137

5681 #, c-format

5609 -msgid "ignoring ref with broken name %s"

5682 +msgid "'%s' exists; cannot create '%s'"

5683 msgstr ""

5684

5612 -#: ref-filter.c:2389

5685 +#: refs.c:2113 refs.c:2148

5686 #, c-format

5614 -msgid "format: %%(end) atom missing"

5687 +msgid "cannot process '%s' and '%s' at the same time"

5688 msgstr ""

5689

5617 -#: ref-filter.c:2489

5690 +#: refs/files-backend.c:1233

5691 #, c-format

5619 -msgid "option `%s' is incompatible with --merged"

5692 +msgid "could not remove reference %s"

5693 msgstr ""

5694

5622 -#: ref-filter.c:2492

5695 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541

5696 +#: refs/packed-backend.c:1551

5697 #, c-format

5624 -msgid "option `%s' is incompatible with --no-merged"

5698 +msgid "could not delete reference %s: %s"

5699 msgstr ""

5700

5627 -#: ref-filter.c:2502

5701 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554

5702 #, c-format

5629 -msgid "malformed object name %s"

5703 +msgid "could not delete references: %s"

5704 msgstr ""

5705

5632 -#: ref-filter.c:2507

5706 +#: refspec.c:137

5707 #, c-format

5634 -msgid "option `%s' must point to a commit"

5708 +msgid "invalid refspec '%s'"

5709 msgstr ""

5710

5637 -#: remote.c:366

5711 +#: remote.c:355

5712 #, c-format

5713 msgid "config remote shorthand cannot begin with '/': %s"

5714 msgstr ""

5715

5642 -#: remote.c:414

5716 +#: remote.c:403

5717 msgid "more than one receivepack given, using the first"

5718 msgstr ""

5719

5646 -#: remote.c:422

5720 +#: remote.c:411

5721 msgid "more than one uploadpack given, using the first"

5722 msgstr ""

5723

5650 -#: remote.c:612

5724 +#: remote.c:594

5725 #, c-format

5726 msgid "Cannot fetch both %s and %s to %s"

5727 msgstr ""

5728

5655 -#: remote.c:616

5729 +#: remote.c:598

5730 #, c-format

5731 msgid "%s usually tracks %s, not %s"

5732 msgstr ""

5733

5660 -#: remote.c:620

5734 +#: remote.c:602

5735 #, c-format

5736 msgid "%s tracks both %s and %s"

5737 msgstr ""

5738

5665 -#: remote.c:688

5739 +#: remote.c:670

5740 #, c-format

5741 msgid "key '%s' of pattern had no '*'"

5742 msgstr ""

5743

5670 -#: remote.c:698

5744 +#: remote.c:680

5745 #, c-format

5746 msgid "value '%s' of pattern has no '*'"

5747 msgstr ""

5748

5675 -#: remote.c:1004

5749 +#: remote.c:986

5750 #, c-format

5751 msgid "src refspec %s does not match any"

5752 msgstr ""

5753

5680 -#: remote.c:1009

5754 +#: remote.c:991

5755 #, c-format

5756 msgid "src refspec %s matches more than one"

5757 msgstr ""

@@ -5686,7 +5760,7 @@ msgstr ""

5760 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

5761 #. the <src>.

5762 #.

5689 -#: remote.c:1024

5763 +#: remote.c:1006

5764 #, c-format

5765 msgid ""

5766 "The destination you provided is not a full refname (i.e.,\n"

@@ -5700,7 +5774,7 @@ msgid ""

5774 "Neither worked, so we gave up. You must fully qualify the ref."

5775 msgstr ""

5776

5703 -#: remote.c:1044

5777 +#: remote.c:1026

5778 #, c-format

5779 msgid ""

5780 "The <src> part of the refspec is a commit object.\n"

@@ -5708,7 +5782,7 @@ msgid ""

5782 "'%s:refs/heads/%s'?"

5783 msgstr ""

5784

5711 -#: remote.c:1049

5785 +#: remote.c:1031

5786 #, c-format

5787 msgid ""

5788 "The <src> part of the refspec is a tag object.\n"

@@ -5716,7 +5790,7 @@ msgid ""

5790 "'%s:refs/tags/%s'?"

5791 msgstr ""

5792

5719 -#: remote.c:1054

5793 +#: remote.c:1036

5794 #, c-format

5795 msgid ""

5796 "The <src> part of the refspec is a tree object.\n"

@@ -5724,7 +5798,7 @@ msgid ""

5798 "'%s:refs/tags/%s'?"

5799 msgstr ""

5800

5727 -#: remote.c:1059

5801 +#: remote.c:1041

5802 #, c-format

5803 msgid ""

5804 "The <src> part of the refspec is a blob object.\n"

@@ -5732,114 +5806,114 @@ msgid ""

5806 "'%s:refs/tags/%s'?"

5807 msgstr ""

5808

5735 -#: remote.c:1095

5809 +#: remote.c:1077

5810 #, c-format

5811 msgid "%s cannot be resolved to branch"

5812 msgstr ""

5813

5740 -#: remote.c:1106

5814 +#: remote.c:1088

5815 #, c-format

5816 msgid "unable to delete '%s': remote ref does not exist"

5817 msgstr ""

5818

5745 -#: remote.c:1118

5819 +#: remote.c:1100

5820 #, c-format

5821 msgid "dst refspec %s matches more than one"

5822 msgstr ""

5823

5750 -#: remote.c:1125

5824 +#: remote.c:1107

5825 #, c-format

5826 msgid "dst ref %s receives from more than one src"

5827 msgstr ""

5828

5755 -#: remote.c:1628 remote.c:1729

5829 +#: remote.c:1610 remote.c:1711

5830 msgid "HEAD does not point to a branch"

5831 msgstr ""

5832

5759 -#: remote.c:1637

5833 +#: remote.c:1619

5834 #, c-format

5835 msgid "no such branch: '%s'"

5836 msgstr ""

5837

5764 -#: remote.c:1640

5838 +#: remote.c:1622

5839 #, c-format

5840 msgid "no upstream configured for branch '%s'"

5841 msgstr ""

5842

5769 -#: remote.c:1646

5843 +#: remote.c:1628

5844 #, c-format

5845 msgid "upstream branch '%s' not stored as a remote-tracking branch"

5846 msgstr ""

5847

5774 -#: remote.c:1661

5848 +#: remote.c:1643

5849 #, c-format

5850 msgid "push destination '%s' on remote '%s' has no local tracking branch"

5851 msgstr ""

5852

5779 -#: remote.c:1673

5853 +#: remote.c:1655

5854 #, c-format

5855 msgid "branch '%s' has no remote for pushing"

5856 msgstr ""

5857

5784 -#: remote.c:1683

5858 +#: remote.c:1665

5859 #, c-format

5860 msgid "push refspecs for '%s' do not include '%s'"

5861 msgstr ""

5862

5789 -#: remote.c:1696

5863 +#: remote.c:1678

5864 msgid "push has no destination (push.default is 'nothing')"

5865 msgstr ""

5866

5793 -#: remote.c:1718

5867 +#: remote.c:1700

5868 msgid "cannot resolve 'simple' push to a single destination"

5869 msgstr ""

5870

5797 -#: remote.c:1844

5871 +#: remote.c:1826

5872 #, c-format

5873 msgid "couldn't find remote ref %s"

5874 msgstr ""

5875

5802 -#: remote.c:1857

5876 +#: remote.c:1839

5877 #, c-format

5878 msgid "* Ignoring funny ref '%s' locally"

5879 msgstr ""

5880

5807 -#: remote.c:2020

5881 +#: remote.c:2002

5882 #, c-format

5883 msgid "Your branch is based on '%s', but the upstream is gone.\n"

5884 msgstr ""

5885

5812 -#: remote.c:2024

5886 +#: remote.c:2006

5887 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

5888 msgstr ""

5889

5816 -#: remote.c:2027

5890 +#: remote.c:2009

5891 #, c-format

5892 msgid "Your branch is up to date with '%s'.\n"

5893 msgstr ""

5894

5821 -#: remote.c:2031

5895 +#: remote.c:2013

5896 #, c-format

5897 msgid "Your branch and '%s' refer to different commits.\n"

5898 msgstr ""

5899

5826 -#: remote.c:2034

5900 +#: remote.c:2016

5901 #, c-format

5902 msgid " (use \"%s\" for details)\n"

5903 msgstr ""

5904

5831 -#: remote.c:2038

5905 +#: remote.c:2020

5906 #, c-format

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

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

5909 msgstr[0] ""

5910 msgstr[1] ""

5911

5838 -#: remote.c:2044

5912 +#: remote.c:2026

5913 msgid " (use \"git push\" to publish your local commits)\n"

5914 msgstr ""

5915

5842 -#: remote.c:2047

5916 +#: remote.c:2029

5917 #, c-format

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

5919 msgid_plural ""

@@ -5847,11 +5921,11 @@ msgid_plural ""

5921 msgstr[0] ""

5922 msgstr[1] ""

5923

5850 -#: remote.c:2055

5924 +#: remote.c:2037

5925 msgid " (use \"git pull\" to update your local branch)\n"

5926 msgstr ""

5927

5854 -#: remote.c:2058

5928 +#: remote.c:2040

5929 #, c-format

5930 msgid ""

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

@@ -5862,11 +5936,11 @@ msgid_plural ""

5936 msgstr[0] ""

5937 msgstr[1] ""

5938

5865 -#: remote.c:2068

5939 +#: remote.c:2050

5940 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

5941 msgstr ""

5942

5869 -#: remote.c:2251

5943 +#: remote.c:2233

5944 #, c-format

5945 msgid "cannot parse expected object name '%s'"

5946 msgstr ""

@@ -5886,6 +5960,11 @@ msgstr ""

5960 msgid "replace depth too high for object %s"

5961 msgstr ""

5962

5963 +#: repository.c:94 builtin/init-db.c:188

5964 +#, c-format

5965 +msgid "The hash algorithm %s is not supported in this build."

5966 +msgstr ""

5967 +

5968 #: rerere.c:217 rerere.c:226 rerere.c:229

5969 msgid "corrupt MERGE_RR"

5970 msgstr ""

@@ -5944,7 +6023,7 @@ msgstr ""

6023 msgid "Recorded preimage for '%s'"

6024 msgstr ""

6025

5947 -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871

6026 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1891

6027 #: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466

6028 #, c-format

6029 msgid "could not create directory '%s'"

@@ -5979,20 +6058,29 @@ msgstr ""

6058 msgid "unable to open rr-cache directory"

6059 msgstr ""

6060

5982 -#: revision.c:2497

6061 +#: reset.c:42

6062 +msgid "could not determine HEAD revision"

6063 +msgstr ""

6064 +

6065 +#: reset.c:70 reset.c:76 sequencer.c:3318

6066 +#, c-format

6067 +msgid "failed to find tree of %s"

6068 +msgstr ""

6069 +

6070 +#: revision.c:2655

6071 msgid "your current branch appears to be broken"

6072 msgstr ""

6073

5986 -#: revision.c:2500

6074 +#: revision.c:2658

6075 #, c-format

6076 msgid "your current branch '%s' does not have any commits yet"

6077 msgstr ""

6078

5991 -#: revision.c:2708

6079 +#: revision.c:2866

6080 msgid "--first-parent is incompatible with --bisect"

6081 msgstr ""

6082

5995 -#: revision.c:2712

6083 +#: revision.c:2870

6084 msgid "-L does not yet support diff formats besides -p and -s"

6085 msgstr ""

6086

@@ -6012,125 +6100,124 @@ msgid ""

6100 "You can disable this warning with `git config advice.ignoredHook false`."

6101 msgstr ""

6102

6015 -#: send-pack.c:144

6103 +#: send-pack.c:145

6104 msgid "unexpected flush packet while reading remote unpack status"

6105 msgstr ""

6106

6019 -#: send-pack.c:146

6107 +#: send-pack.c:147

6108 #, c-format

6109 msgid "unable to parse remote unpack status: %s"

6110 msgstr ""

6111

6024 -#: send-pack.c:148

6112 +#: send-pack.c:149

6113 #, c-format

6114 msgid "remote unpack failed: %s"

6115 msgstr ""

6116

6029 -#: send-pack.c:309

6117 +#: send-pack.c:308

6118 msgid "failed to sign the push certificate"

6119 msgstr ""

6120

6033 -#: send-pack.c:423

6121 +#: send-pack.c:399

6122 msgid "the receiving end does not support --signed push"

6123 msgstr ""

6124

6037 -#: send-pack.c:425

6125 +#: send-pack.c:401

6126 msgid ""

6127 "not sending a push certificate since the receiving end does not support --"

6128 "signed push"

6129 msgstr ""

6130

6043 -#: send-pack.c:437

6131 +#: send-pack.c:413

6132 msgid "the receiving end does not support --atomic push"

6133 msgstr ""

6134

6047 -#: send-pack.c:442

6135 +#: send-pack.c:418

6136 msgid "the receiving end does not support push options"

6137 msgstr ""

6138

6051 -#: sequencer.c:191

6139 +#: sequencer.c:192

6140 #, c-format

6141 msgid "invalid commit message cleanup mode '%s'"

6142 msgstr ""

6143

6056 -#: sequencer.c:296

6144 +#: sequencer.c:297

6145 #, c-format

6146 msgid "could not delete '%s'"

6147 msgstr ""

6148

6061 -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385

6149 +#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385

6150 #, c-format

6151 msgid "could not remove '%s'"

6152 msgstr ""

6153

6066 -#: sequencer.c:325

6154 +#: sequencer.c:326

6155 msgid "revert"

6156 msgstr ""

6157

6070 -#: sequencer.c:327

6158 +#: sequencer.c:328

6159 msgid "cherry-pick"

6160 msgstr ""

6161

6074 -#: sequencer.c:329

6162 +#: sequencer.c:330

6163 msgid "rebase"

6164 msgstr ""

6165

6078 -#: sequencer.c:331

6166 +#: sequencer.c:332

6167 #, c-format

6168 msgid "unknown action: %d"

6169 msgstr ""

6170

6083 -#: sequencer.c:389

6171 +#: sequencer.c:390

6172 msgid ""

6173 "after resolving the conflicts, mark the corrected paths\n"

6174 "with 'git add <paths>' or 'git rm <paths>'"

6175 msgstr ""

6176

6089 -#: sequencer.c:392

6177 +#: sequencer.c:393

6178 msgid ""

6179 "after resolving the conflicts, mark the corrected paths\n"

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

6181 "and commit the result with 'git commit'"

6182 msgstr ""

6183

6096 -#: sequencer.c:405 sequencer.c:2901

6184 +#: sequencer.c:406 sequencer.c:2921

6185 #, c-format

6186 msgid "could not lock '%s'"

6187 msgstr ""

6188

6101 -#: sequencer.c:412

6189 +#: sequencer.c:413

6190 #, c-format

6191 msgid "could not write eol to '%s'"

6192 msgstr ""

6193

6106 -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921

6107 -#: sequencer.c:3185

6194 +#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941

6195 +#: sequencer.c:3203

6196 #, c-format

6197 msgid "failed to finalize '%s'"

6198 msgstr ""

6199

6112 -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167

6113 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120

6114 -#: builtin/rebase.c:593

6200 +#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185

6201 +#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128

6202 #, c-format

6203 msgid "could not read '%s'"

6204 msgstr ""

6205

6119 -#: sequencer.c:466

6206 +#: sequencer.c:457

6207 #, c-format

6208 msgid "your local changes would be overwritten by %s."

6209 msgstr ""

6210

6124 -#: sequencer.c:470

6211 +#: sequencer.c:461

6212 msgid "commit your changes or stash them to proceed."

6213 msgstr ""

6214

6128 -#: sequencer.c:502

6215 +#: sequencer.c:493

6216 #, c-format

6217 msgid "%s: fast-forward"

6218 msgstr ""

6219

6133 -#: sequencer.c:541 builtin/tag.c:565

6220 +#: sequencer.c:532 builtin/tag.c:566

6221 #, c-format

6222 msgid "Invalid cleanup mode %s"

6223 msgstr ""

@@ -6138,65 +6225,65 @@ msgstr ""

6225 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

6226 #. "rebase".

6227 #.

6141 -#: sequencer.c:635

6228 +#: sequencer.c:626

6229 #, c-format

6230 msgid "%s: Unable to write new index file"

6231 msgstr ""

6232

6146 -#: sequencer.c:652

6233 +#: sequencer.c:643

6234 msgid "unable to update cache tree"

6235 msgstr ""

6236

6150 -#: sequencer.c:666

6237 +#: sequencer.c:657

6238 msgid "could not resolve HEAD commit"

6239 msgstr ""

6240

6154 -#: sequencer.c:746

6241 +#: sequencer.c:737

6242 #, c-format

6243 msgid "no key present in '%.*s'"

6244 msgstr ""

6245

6159 -#: sequencer.c:757

6246 +#: sequencer.c:748

6247 #, c-format

6248 msgid "unable to dequote value of '%s'"

6249 msgstr ""

6250

6164 -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6165 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072

6251 +#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6252 +#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896

6253 #, c-format

6254 msgid "could not open '%s' for reading"

6255 msgstr ""

6256

6170 -#: sequencer.c:804

6257 +#: sequencer.c:795

6258 msgid "'GIT_AUTHOR_NAME' already given"

6259 msgstr ""

6260

6174 -#: sequencer.c:809

6261 +#: sequencer.c:800

6262 msgid "'GIT_AUTHOR_EMAIL' already given"

6263 msgstr ""

6264

6178 -#: sequencer.c:814

6265 +#: sequencer.c:805

6266 msgid "'GIT_AUTHOR_DATE' already given"

6267 msgstr ""

6268

6182 -#: sequencer.c:818

6269 +#: sequencer.c:809

6270 #, c-format

6271 msgid "unknown variable '%s'"

6272 msgstr ""

6273

6187 -#: sequencer.c:823

6274 +#: sequencer.c:814

6275 msgid "missing 'GIT_AUTHOR_NAME'"

6276 msgstr ""

6277

6191 -#: sequencer.c:825

6278 +#: sequencer.c:816

6279 msgid "missing 'GIT_AUTHOR_EMAIL'"

6280 msgstr ""

6281

6195 -#: sequencer.c:827

6282 +#: sequencer.c:818

6283 msgid "missing 'GIT_AUTHOR_DATE'"

6284 msgstr ""

6285

6199 -#: sequencer.c:876

6286 +#: sequencer.c:867

6287 #, c-format

6288 msgid ""

6289 "you have staged changes in your working tree\n"

@@ -6213,11 +6300,11 @@ msgid ""

6300 " git rebase --continue\n"

6301 msgstr ""

6302

6216 -#: sequencer.c:1148

6303 +#: sequencer.c:1141

6304 msgid "'prepare-commit-msg' hook failed"

6305 msgstr ""

6306

6220 -#: sequencer.c:1154

6307 +#: sequencer.c:1147

6308 msgid ""

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

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

@@ -6232,7 +6319,7 @@ msgid ""

6319 " git commit --amend --reset-author\n"

6320 msgstr ""

6321

6235 -#: sequencer.c:1167

6322 +#: sequencer.c:1160

6323 msgid ""

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

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

@@ -6246,345 +6333,345 @@ msgid ""

6333 " git commit --amend --reset-author\n"

6334 msgstr ""

6335

6249 -#: sequencer.c:1209

6336 +#: sequencer.c:1202

6337 msgid "couldn't look up newly created commit"

6338 msgstr ""

6339

6253 -#: sequencer.c:1211

6340 +#: sequencer.c:1204

6341 msgid "could not parse newly created commit"

6342 msgstr ""

6343

6257 -#: sequencer.c:1257

6344 +#: sequencer.c:1250

6345 msgid "unable to resolve HEAD after creating commit"

6346 msgstr ""

6347

6261 -#: sequencer.c:1259

6348 +#: sequencer.c:1252

6349 msgid "detached HEAD"

6350 msgstr ""

6351

6265 -#: sequencer.c:1263

6352 +#: sequencer.c:1256

6353 msgid " (root-commit)"

6354 msgstr ""

6355

6269 -#: sequencer.c:1284

6356 +#: sequencer.c:1277

6357 msgid "could not parse HEAD"

6358 msgstr ""

6359

6273 -#: sequencer.c:1286

6360 +#: sequencer.c:1279

6361 #, c-format

6362 msgid "HEAD %s is not a commit!"

6363 msgstr ""

6364

6278 -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574

6365 +#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579

6366 msgid "could not parse HEAD commit"

6367 msgstr ""

6368

6282 -#: sequencer.c:1342 sequencer.c:1968

6369 +#: sequencer.c:1335 sequencer.c:1980

6370 msgid "unable to parse commit author"

6371 msgstr ""

6372

6286 -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687

6373 +#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695

6374 msgid "git write-tree failed to write a tree"

6375 msgstr ""

6376

6290 -#: sequencer.c:1386 sequencer.c:1447

6377 +#: sequencer.c:1379 sequencer.c:1450

6378 #, c-format

6379 msgid "unable to read commit message from '%s'"

6380 msgstr ""

6381

6295 -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886

6296 -#: builtin/merge.c:911

6382 +#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894

6383 +#: builtin/merge.c:919

6384 msgid "failed to write commit object"

6385 msgstr ""

6386

6300 -#: sequencer.c:1474

6387 +#: sequencer.c:1433 sequencer.c:4118

6388 +#, c-format

6389 +msgid "could not update %s"

6390 +msgstr ""

6391 +

6392 +#: sequencer.c:1481

6393 #, c-format

6394 msgid "could not parse commit %s"

6395 msgstr ""

6396

6305 -#: sequencer.c:1479

6397 +#: sequencer.c:1486

6398 #, c-format

6399 msgid "could not parse parent commit %s"

6400 msgstr ""

6401

6310 -#: sequencer.c:1562 sequencer.c:1673

6402 +#: sequencer.c:1569 sequencer.c:1680

6403 #, c-format

6404 msgid "unknown command: %d"

6405 msgstr ""

6406

6315 -#: sequencer.c:1620 sequencer.c:1645

6407 +#: sequencer.c:1627 sequencer.c:1652

6408 #, c-format

6409 msgid "This is a combination of %d commits."

6410 msgstr ""

6411

6320 -#: sequencer.c:1630

6412 +#: sequencer.c:1637

6413 msgid "need a HEAD to fixup"

6414 msgstr ""

6415

6324 -#: sequencer.c:1632 sequencer.c:3212

6416 +#: sequencer.c:1639 sequencer.c:3230

6417 msgid "could not read HEAD"

6418 msgstr ""

6419

6328 -#: sequencer.c:1634

6420 +#: sequencer.c:1641

6421 msgid "could not read HEAD's commit message"

6422 msgstr ""

6423

6332 -#: sequencer.c:1640

6424 +#: sequencer.c:1647

6425 #, c-format

6426 msgid "cannot write '%s'"

6427 msgstr ""

6428

6337 -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496

6429 +#: sequencer.c:1654 git-rebase--preserve-merges.sh:496

6430 msgid "This is the 1st commit message:"

6431 msgstr ""

6432

6341 -#: sequencer.c:1655

6433 +#: sequencer.c:1662

6434 #, c-format

6435 msgid "could not read commit message of %s"

6436 msgstr ""

6437

6346 -#: sequencer.c:1662

6438 +#: sequencer.c:1669

6439 #, c-format

6440 msgid "This is the commit message #%d:"

6441 msgstr ""

6442

6351 -#: sequencer.c:1668

6443 +#: sequencer.c:1675

6444 #, c-format

6445 msgid "The commit message #%d will be skipped:"

6446 msgstr ""

6447

6356 -#: sequencer.c:1756

6448 +#: sequencer.c:1763

6449 msgid "your index file is unmerged."

6450 msgstr ""

6451

6360 -#: sequencer.c:1763

6452 +#: sequencer.c:1770

6453 msgid "cannot fixup root commit"

6454 msgstr ""

6455

6364 -#: sequencer.c:1782

6456 +#: sequencer.c:1789

6457 #, c-format

6458 msgid "commit %s is a merge but no -m option was given."

6459 msgstr ""

6460

6369 -#: sequencer.c:1790 sequencer.c:1798

6461 +#: sequencer.c:1797 sequencer.c:1805

6462 #, c-format

6463 msgid "commit %s does not have parent %d"

6464 msgstr ""

6465

6374 -#: sequencer.c:1804

6466 +#: sequencer.c:1811

6467 #, c-format

6468 msgid "cannot get commit message for %s"

6469 msgstr ""

6470

6471 #. TRANSLATORS: The first %s will be a "todo" command like

6472 #. "revert" or "pick", the second %s a SHA1.

6381 -#: sequencer.c:1823

6473 +#: sequencer.c:1830

6474 #, c-format

6475 msgid "%s: cannot parse parent commit %s"

6476 msgstr ""

6477

6386 -#: sequencer.c:1888

6478 +#: sequencer.c:1895

6479 #, c-format

6480 msgid "could not rename '%s' to '%s'"

6481 msgstr ""

6482

6391 -#: sequencer.c:1943

6483 +#: sequencer.c:1952

6484 #, c-format

6485 msgid "could not revert %s... %s"

6486 msgstr ""

6487

6396 -#: sequencer.c:1944

6488 +#: sequencer.c:1953

6489 #, c-format

6490 msgid "could not apply %s... %s"

6491 msgstr ""

6492

6401 -#: sequencer.c:1961

6493 +#: sequencer.c:1972

6494 #, c-format

6495 msgid "dropping %s %s -- patch contents already upstream\n"

6496 msgstr ""

6497

6406 -#: sequencer.c:2018

6498 +#: sequencer.c:2030

6499 #, c-format

6500 msgid "git %s: failed to read the index"

6501 msgstr ""

6502

6411 -#: sequencer.c:2025

6503 +#: sequencer.c:2037

6504 #, c-format

6505 msgid "git %s: failed to refresh the index"

6506 msgstr ""

6507

6416 -#: sequencer.c:2102

6508 +#: sequencer.c:2114

6509 #, c-format

6510 msgid "%s does not accept arguments: '%s'"

6511 msgstr ""

6512

6421 -#: sequencer.c:2111

6513 +#: sequencer.c:2123

6514 #, c-format

6515 msgid "missing arguments for %s"

6516 msgstr ""

6517

6426 -#: sequencer.c:2142

6518 +#: sequencer.c:2154

6519 #, c-format

6520 msgid "could not parse '%s'"

6521 msgstr ""

6522

6431 -#: sequencer.c:2203

6523 +#: sequencer.c:2215

6524 #, c-format

6525 msgid "invalid line %d: %.*s"

6526 msgstr ""

6527

6436 -#: sequencer.c:2214

6528 +#: sequencer.c:2226

6529 #, c-format

6530 msgid "cannot '%s' without a previous commit"

6531 msgstr ""

6532

6441 -#: sequencer.c:2298

6533 +#: sequencer.c:2310

6534 msgid "cancelling a cherry picking in progress"

6535 msgstr ""

6536

6445 -#: sequencer.c:2305

6537 +#: sequencer.c:2317

6538 msgid "cancelling a revert in progress"

6539 msgstr ""

6540

6449 -#: sequencer.c:2349

6541 +#: sequencer.c:2361

6542 msgid "please fix this using 'git rebase --edit-todo'."

6543 msgstr ""

6544

6453 -#: sequencer.c:2351

6545 +#: sequencer.c:2363

6546 #, c-format

6547 msgid "unusable instruction sheet: '%s'"

6548 msgstr ""

6549

6458 -#: sequencer.c:2356

6550 +#: sequencer.c:2368

6551 msgid "no commits parsed."

6552 msgstr ""

6553

6462 -#: sequencer.c:2367

6554 +#: sequencer.c:2379

6555 msgid "cannot cherry-pick during a revert."

6556 msgstr ""

6557

6466 -#: sequencer.c:2369

6558 +#: sequencer.c:2381

6559 msgid "cannot revert during a cherry-pick."

6560 msgstr ""

6561

6470 -#: sequencer.c:2447

6562 +#: sequencer.c:2459

6563 #, c-format

6564 msgid "invalid value for %s: %s"

6565 msgstr ""

6566

6475 -#: sequencer.c:2540

6567 +#: sequencer.c:2556

6568 msgid "unusable squash-onto"

6569 msgstr ""

6570

6479 -#: sequencer.c:2556

6571 +#: sequencer.c:2576

6572 #, c-format

6573 msgid "malformed options sheet: '%s'"

6574 msgstr ""

6575

6484 -#: sequencer.c:2644 sequencer.c:4361

6576 +#: sequencer.c:2664 sequencer.c:4469

6577 msgid "empty commit set passed"

6578 msgstr ""

6579

6488 -#: sequencer.c:2660

6580 +#: sequencer.c:2680

6581 msgid "revert is already in progress"

6582 msgstr ""

6583

6492 -#: sequencer.c:2662

6584 +#: sequencer.c:2682

6585 #, c-format

6586 msgid "try \"git revert (--continue | %s--abort | --quit)\""

6587 msgstr ""

6588

6497 -#: sequencer.c:2665

6589 +#: sequencer.c:2685

6590 msgid "cherry-pick is already in progress"

6591 msgstr ""

6592

6501 -#: sequencer.c:2667

6593 +#: sequencer.c:2687

6594 #, c-format

6595 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

6596 msgstr ""

6597

6506 -#: sequencer.c:2681

6598 +#: sequencer.c:2701

6599 #, c-format

6600 msgid "could not create sequencer directory '%s'"

6601 msgstr ""

6602

6511 -#: sequencer.c:2696

6603 +#: sequencer.c:2716

6604 msgid "could not lock HEAD"

6605 msgstr ""

6606

6515 -#: sequencer.c:2756 sequencer.c:4099

6607 +#: sequencer.c:2776 sequencer.c:4206

6608 msgid "no cherry-pick or revert in progress"

6609 msgstr ""

6610

6519 -#: sequencer.c:2758 sequencer.c:2769

6611 +#: sequencer.c:2778 sequencer.c:2789

6612 msgid "cannot resolve HEAD"

6613 msgstr ""

6614

6523 -#: sequencer.c:2760 sequencer.c:2804

6615 +#: sequencer.c:2780 sequencer.c:2824

6616 msgid "cannot abort from a branch yet to be born"

6617 msgstr ""

6618

6527 -#: sequencer.c:2790 builtin/grep.c:724

6619 +#: sequencer.c:2810 builtin/grep.c:744

6620 #, c-format

6621 msgid "cannot open '%s'"

6622 msgstr ""

6623

6532 -#: sequencer.c:2792

6624 +#: sequencer.c:2812

6625 #, c-format

6626 msgid "cannot read '%s': %s"

6627 msgstr ""

6628

6537 -#: sequencer.c:2793

6629 +#: sequencer.c:2813

6630 msgid "unexpected end of file"

6631 msgstr ""

6632

6541 -#: sequencer.c:2799

6633 +#: sequencer.c:2819

6634 #, c-format

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

6636 msgstr ""

6637

6546 -#: sequencer.c:2810

6638 +#: sequencer.c:2830

6639 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

6640 msgstr ""

6641

6550 -#: sequencer.c:2851

6642 +#: sequencer.c:2871

6643 msgid "no revert in progress"

6644 msgstr ""

6645

6554 -#: sequencer.c:2859

6646 +#: sequencer.c:2879

6647 msgid "no cherry-pick in progress"

6648 msgstr ""

6649

6558 -#: sequencer.c:2869

6650 +#: sequencer.c:2889

6651 msgid "failed to skip the commit"

6652 msgstr ""

6653

6562 -#: sequencer.c:2876

6654 +#: sequencer.c:2896

6655 msgid "there is nothing to skip"

6656 msgstr ""

6657

6566 -#: sequencer.c:2879

6658 +#: sequencer.c:2899

6659 #, c-format

6660 msgid ""

6661 "have you committed already?\n"

6662 "try \"git %s --continue\""

6663 msgstr ""

6664

6573 -#: sequencer.c:3003 sequencer.c:4011

6574 -#, c-format

6575 -msgid "could not update %s"

6576 -msgstr ""

6577 -

6578 -#: sequencer.c:3042 sequencer.c:3991

6665 +#: sequencer.c:3060 sequencer.c:4098

6666 msgid "cannot read HEAD"

6667 msgstr ""

6668

6582 -#: sequencer.c:3059

6669 +#: sequencer.c:3077

6670 #, c-format

6671 msgid "unable to copy '%s' to '%s'"

6672 msgstr ""

6673

6587 -#: sequencer.c:3067

6674 +#: sequencer.c:3085

6675 #, c-format

6676 msgid ""

6677 "You can amend the commit now, with\n"

@@ -6596,22 +6683,27 @@ msgid ""

l10n: git.pot: v2.27.0 round 1 (72 new, 37 removed)