f517e50dba · 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: 2016-03-16 00:16+0800\n"

11 +"POT-Creation-Date: 2016-05-24 23:42+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"

@@ -29,7 +29,7 @@ msgid ""

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

30 msgstr ""

31

32 -#: advice.c:101 builtin/merge.c:1226

32 +#: advice.c:101 builtin/merge.c:1238

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

34 msgstr ""

35

@@ -71,7 +71,7 @@ msgstr ""

71 msgid "archive format"

72 msgstr ""

73

74 -#: archive.c:430 builtin/log.c:1232

74 +#: archive.c:430 builtin/log.c:1395

75 msgid "prefix"

76 msgstr ""

77

@@ -79,9 +79,9 @@ msgstr ""

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

80 msgstr ""

81

82 -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547

83 -#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987

84 -#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100

82 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548

83 +#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987

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

85 #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398

86 #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153

87 msgid "file"

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

115 msgid "list supported archive formats"

116 msgstr ""

117

118 -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78

118 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82

119 +#: builtin/submodule--helper.c:776

120 msgid "repo"

121 msgstr ""

122

@@ -251,11 +252,16 @@ msgstr ""

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

253 msgstr ""

254

254 -#: branch.c:344

255 +#: branch.c:345

256 #, c-format

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

258 msgstr ""

259

260 +#: branch.c:364

261 +#, c-format

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

263 +msgstr ""

264 +

265 #: bundle.c:34

266 #, c-format

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

@@ -266,7 +272,7 @@ msgstr ""

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

273 msgstr ""

274

269 -#: bundle.c:87 builtin/commit.c:766

275 +#: bundle.c:87 builtin/commit.c:777

276 #, c-format

277 msgid "could not open '%s'"

278 msgstr ""

@@ -275,10 +281,10 @@ msgstr ""

281 msgid "Repository lacks these prerequisite commits:"

282 msgstr ""

283

278 -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074

279 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334

280 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358

281 -#: builtin/shortlog.c:170

284 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073

285 +#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340

286 +#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875

287 +#: builtin/merge.c:361 builtin/shortlog.c:170

288 msgid "revision walk setup failed"

289 msgstr ""

290

@@ -317,21 +323,21 @@ msgstr ""

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

324 msgstr ""

325

320 -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273

326 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273

327 #, c-format

328 msgid "unrecognized argument: %s"

329 msgstr ""

330

325 -#: bundle.c:449

331 +#: bundle.c:451

332 msgid "Refusing to create empty bundle."

333 msgstr ""

334

329 -#: bundle.c:459

335 +#: bundle.c:463

336 #, c-format

337 msgid "cannot create '%s'"

338 msgstr ""

339

334 -#: bundle.c:480

340 +#: bundle.c:491

341 msgid "index-pack died"

342 msgstr ""

343

@@ -340,8 +346,8 @@ msgstr ""

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

347 msgstr ""

348

343 -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505

344 -#: builtin/am.c:2135

349 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504

350 +#: builtin/am.c:2134

351 #, c-format

352 msgid "could not parse %s"

353 msgstr ""

@@ -375,21 +381,21 @@ msgstr ""

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

382 msgstr ""

383

378 -#: config.c:758 config.c:769

384 +#: config.c:761 config.c:772

385 #, c-format

386 msgid "bad zlib compression level %d"

387 msgstr ""

388

383 -#: config.c:891

389 +#: config.c:890

390 #, c-format

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

392 msgstr ""

393

388 -#: config.c:1220

394 +#: config.c:1228

395 msgid "unable to parse command-line config"

396 msgstr ""

397

392 -#: config.c:1281

398 +#: config.c:1284

399 msgid "unknown error occured while reading the configuration files"

400 msgstr ""

401

@@ -408,9 +414,14 @@ msgstr ""

414 msgid "%s has multiple values"

415 msgstr ""

416

417 +#: config.c:2224

418 +#, c-format

419 +msgid "could not set '%s' to '%s'"

420 +msgstr ""

421 +

422 #: config.c:2226

423 #, c-format

413 -msgid "Could not set '%s' to '%s'"

424 +msgid "could not unset '%s'"

425 msgstr ""

426

427 #: connected.c:69

@@ -418,13 +429,11 @@ msgid "Could not run 'git rev-list'"

429 msgstr ""

430

431 #: connected.c:89

421 -#, c-format

422 -msgid "failed write to rev-list: %s"

432 +msgid "failed write to rev-list"

433 msgstr ""

434

425 -#: connected.c:97

426 -#, c-format

427 -msgid "failed to close rev-list's stdin: %s"

435 +#: connected.c:96

436 +msgid "failed to close rev-list's stdin"

437 msgstr ""

438

439 #: date.c:95

@@ -500,62 +509,62 @@ msgstr[1] ""

509 msgid "failed to read orderfile '%s'"

510 msgstr ""

511

503 -#: diffcore-rename.c:536

512 +#: diffcore-rename.c:538

513 msgid "Performing inexact rename detection"

514 msgstr ""

515

507 -#: diff.c:115

516 +#: diff.c:116

517 #, c-format

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

519 msgstr ""

520

512 -#: diff.c:120

521 +#: diff.c:121

522 #, c-format

523 msgid " Unknown dirstat parameter '%s'\n"

524 msgstr ""

525

517 -#: diff.c:215

526 +#: diff.c:225

527 #, c-format

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

529 msgstr ""

530

522 -#: diff.c:267

531 +#: diff.c:277

532 #, c-format

533 msgid ""

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

535 "%s"

536 msgstr ""

537

529 -#: diff.c:2997

538 +#: diff.c:3007

539 #, c-format

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

541 msgstr ""

542

534 -#: diff.c:3393

543 +#: diff.c:3405

544 msgid "--follow requires exactly one pathspec"

545 msgstr ""

546

538 -#: diff.c:3556

547 +#: diff.c:3568

548 #, c-format

549 msgid ""

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

551 "%s"

552 msgstr ""

553

545 -#: diff.c:3570

554 +#: diff.c:3582

555 #, c-format

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

557 msgstr ""

558

550 -#: dir.c:2004

559 +#: dir.c:1823

560 msgid "failed to get kernel name and information"

561 msgstr ""

562

554 -#: dir.c:2123

563 +#: dir.c:1942

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

565 msgstr ""

566

558 -#: gpg-interface.c:166 gpg-interface.c:237

567 +#: gpg-interface.c:166 gpg-interface.c:235

568 msgid "could not run gpg."

569 msgstr ""

570

@@ -569,12 +578,12 @@ msgstr ""

578

579 #: gpg-interface.c:222

580 #, c-format

572 -msgid "could not create temporary file '%s': %s"

581 +msgid "could not create temporary file '%s'"

582 msgstr ""

583

575 -#: gpg-interface.c:225

584 +#: gpg-interface.c:224

585 #, c-format

577 -msgid "failed writing detached signature to '%s': %s"

586 +msgid "failed writing detached signature to '%s'"

587 msgstr ""

588

589 #: grep.c:1718

@@ -582,14 +591,14 @@ msgstr ""

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

592 msgstr ""

593

585 -#: grep.c:1735

594 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155

595 #, c-format

587 -msgid "'%s': %s"

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

597 msgstr ""

598

599 #: grep.c:1746

600 #, c-format

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

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

602 msgstr ""

603

604 #: help.c:205

@@ -648,12 +657,29 @@ msgstr[1] ""

657 msgid "%s: %s - %s"

658 msgstr ""

659

660 +#: lockfile.c:152

661 +#, c-format

662 +msgid ""

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

664 +"\n"

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

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

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

668 +"may have crashed in this repository earlier:\n"

669 +"remove the file manually to continue."

670 +msgstr ""

671 +

672 +#: lockfile.c:160

673 +#, c-format

674 +msgid "Unable to create '%s.lock': %s"

675 +msgstr ""

676 +

677 #: merge.c:41

678 msgid "failed to read the cache"

679 msgstr ""

680

655 -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376

656 -#: builtin/checkout.c:587 builtin/clone.c:730

681 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375

682 +#: builtin/checkout.c:586 builtin/clone.c:732

683 msgid "unable to write new index file"

684 msgstr ""

685

@@ -700,7 +726,7 @@ msgstr ""

726 msgid "blob expected for %s '%s'"

727 msgstr ""

728

703 -#: merge-recursive.c:790 builtin/clone.c:374

729 +#: merge-recursive.c:790 builtin/clone.c:376

730 #, c-format

731 msgid "failed to open '%s'"

732 msgstr ""

@@ -827,7 +853,7 @@ msgstr ""

853 msgid "Auto-merging %s"

854 msgstr ""

855

830 -#: merge-recursive.c:1650 git-submodule.sh:1048

856 +#: merge-recursive.c:1650 git-submodule.sh:941

857 msgid "submodule"

858 msgstr ""

859

@@ -854,50 +880,50 @@ msgstr ""

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

881 msgstr ""

882

857 -#: merge-recursive.c:1783

883 +#: merge-recursive.c:1781

884 #, c-format

885 msgid "Adding %s"

886 msgstr ""

887

862 -#: merge-recursive.c:1800

888 +#: merge-recursive.c:1798

889 msgid "Fatal merge failure, shouldn't happen."

890 msgstr ""

891

866 -#: merge-recursive.c:1819

892 +#: merge-recursive.c:1817

893 msgid "Already up-to-date!"

894 msgstr ""

895

870 -#: merge-recursive.c:1828

896 +#: merge-recursive.c:1826

897 #, c-format

898 msgid "merging of trees %s and %s failed"

899 msgstr ""

900

875 -#: merge-recursive.c:1858

901 +#: merge-recursive.c:1856

902 #, c-format

903 msgid "Unprocessed path??? %s"

904 msgstr ""

905

880 -#: merge-recursive.c:1906

906 +#: merge-recursive.c:1904

907 msgid "Merging:"

908 msgstr ""

909

884 -#: merge-recursive.c:1919

910 +#: merge-recursive.c:1917

911 #, c-format

912 msgid "found %u common ancestor:"

913 msgid_plural "found %u common ancestors:"

914 msgstr[0] ""

915 msgstr[1] ""

916

891 -#: merge-recursive.c:1956

917 +#: merge-recursive.c:1954

918 msgid "merge returned no commit"

919 msgstr ""

920

895 -#: merge-recursive.c:2013

921 +#: merge-recursive.c:2011

922 #, c-format

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

924 msgstr ""

925

900 -#: merge-recursive.c:2024 builtin/merge.c:646

926 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831

927 msgid "Unable to write index."

928 msgstr ""

929

@@ -927,28 +953,28 @@ msgstr ""

953 msgid "unable to parse object: %s"

954 msgstr ""

955

930 -#: parse-options.c:570

956 +#: parse-options.c:572

957 msgid "..."

958 msgstr ""

959

934 -#: parse-options.c:588

960 +#: parse-options.c:590

961 #, c-format

962 msgid "usage: %s"

963 msgstr ""

964

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

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

941 -#: parse-options.c:592

967 +#: parse-options.c:594

968 #, c-format

969 msgid " or: %s"

970 msgstr ""

971

946 -#: parse-options.c:595

972 +#: parse-options.c:597

973 #, c-format

974 msgid " %s"

975 msgstr ""

976

951 -#: parse-options.c:629

977 +#: parse-options.c:631

978 msgid "-NUM"

979 msgstr ""

980

@@ -957,7 +983,7 @@ msgstr ""

983 msgid "malformed object name '%s'"

984 msgstr ""

985

960 -#: path.c:752

986 +#: path.c:796

987 #, c-format

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

989 msgstr ""

@@ -1022,7 +1048,7 @@ msgid ""

1048 "Perhaps you forgot to add either ':/' or '.' ?"

1049 msgstr ""

1050

1025 -#: pretty.c:969

1051 +#: pretty.c:971

1052 msgid "unable to parse --pretty format"

1053 msgstr ""

1054

@@ -1044,23 +1070,23 @@ msgid ""

1070 "Using version %i"

1071 msgstr ""

1072

1047 -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974

1048 -#: builtin/merge.c:984

1073 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985

1074 +#: builtin/merge.c:995

1075 #, c-format

1076 msgid "Could not open '%s' for writing"

1077 msgstr ""

1078

1053 -#: refs/files-backend.c:2374

1079 +#: refs/files-backend.c:2243

1080 #, c-format

1081 msgid "could not delete reference %s: %s"

1082 msgstr ""

1083

1058 -#: refs/files-backend.c:2377

1084 +#: refs/files-backend.c:2246

1085 #, c-format

1086 msgid "could not delete references: %s"

1087 msgstr ""

1088

1063 -#: refs/files-backend.c:2386

1089 +#: refs/files-backend.c:2255

1090 #, c-format

1091 msgid "could not remove reference %s"

1092 msgstr ""

@@ -1199,93 +1225,93 @@ msgstr ""

1225 msgid "malformed object name %s"

1226 msgstr ""

1227

1202 -#: remote.c:745

1228 +#: remote.c:746

1229 #, c-format

1230 msgid "Cannot fetch both %s and %s to %s"

1231 msgstr ""

1232

1207 -#: remote.c:749

1233 +#: remote.c:750

1234 #, c-format

1235 msgid "%s usually tracks %s, not %s"

1236 msgstr ""

1237

1212 -#: remote.c:753

1238 +#: remote.c:754

1239 #, c-format

1240 msgid "%s tracks both %s and %s"

1241 msgstr ""

1242

1217 -#: remote.c:761

1243 +#: remote.c:762

1244 msgid "Internal error"

1245 msgstr ""

1246

1221 -#: remote.c:1677 remote.c:1720

1247 +#: remote.c:1678 remote.c:1721

1248 msgid "HEAD does not point to a branch"

1249 msgstr ""

1250

1225 -#: remote.c:1686

1251 +#: remote.c:1687

1252 #, c-format

1253 msgid "no such branch: '%s'"

1254 msgstr ""

1255

1230 -#: remote.c:1689

1256 +#: remote.c:1690

1257 #, c-format

1258 msgid "no upstream configured for branch '%s'"

1259 msgstr ""

1260

1235 -#: remote.c:1695

1261 +#: remote.c:1696

1262 #, c-format

1263 msgid "upstream branch '%s' not stored as a remote-tracking branch"

1264 msgstr ""

1265

1240 -#: remote.c:1710

1266 +#: remote.c:1711

1267 #, c-format

1268 msgid "push destination '%s' on remote '%s' has no local tracking branch"

1269 msgstr ""

1270

1245 -#: remote.c:1725

1271 +#: remote.c:1726

1272 #, c-format

1273 msgid "branch '%s' has no remote for pushing"

1274 msgstr ""

1275

1250 -#: remote.c:1736

1276 +#: remote.c:1737

1277 #, c-format

1278 msgid "push refspecs for '%s' do not include '%s'"

1279 msgstr ""

1280

1255 -#: remote.c:1749

1281 +#: remote.c:1750

1282 msgid "push has no destination (push.default is 'nothing')"

1283 msgstr ""

1284

1259 -#: remote.c:1771

1285 +#: remote.c:1772

1286 msgid "cannot resolve 'simple' push to a single destination"

1287 msgstr ""

1288

1263 -#: remote.c:2073

1289 +#: remote.c:2074

1290 #, c-format

1291 msgid "Your branch is based on '%s', but the upstream is gone.\n"

1292 msgstr ""

1293

1268 -#: remote.c:2077

1294 +#: remote.c:2078

1295 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

1296 msgstr ""

1297

1272 -#: remote.c:2080

1298 +#: remote.c:2081

1299 #, c-format

1300 msgid "Your branch is up-to-date with '%s'.\n"

1301 msgstr ""

1302

1277 -#: remote.c:2084

1303 +#: remote.c:2085

1304 #, c-format

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

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

1307 msgstr[0] ""

1308 msgstr[1] ""

1309

1284 -#: remote.c:2090

1310 +#: remote.c:2091

1311 msgid " (use \"git push\" to publish your local commits)\n"

1312 msgstr ""

1313

1288 -#: remote.c:2093

1314 +#: remote.c:2094

1315 #, c-format

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

1317 msgid_plural ""

@@ -1293,11 +1319,11 @@ msgid_plural ""

1319 msgstr[0] ""

1320 msgstr[1] ""

1321

1296 -#: remote.c:2101

1322 +#: remote.c:2102

1323 msgid " (use \"git pull\" to update your local branch)\n"

1324 msgstr ""

1325

1300 -#: remote.c:2104

1326 +#: remote.c:2105

1327 #, c-format

1328 msgid ""

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

@@ -1308,20 +1334,20 @@ msgid_plural ""

1334 msgstr[0] ""

1335 msgstr[1] ""

1336

1311 -#: remote.c:2114

1337 +#: remote.c:2115

1338 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

1339 msgstr ""

1340

1315 -#: revision.c:2131

1341 +#: revision.c:2142

1342 msgid "your current branch appears to be broken"

1343 msgstr ""

1344

1319 -#: revision.c:2134

1345 +#: revision.c:2145

1346 #, c-format

1347 msgid "your current branch '%s' does not have any commits yet"

1348 msgstr ""

1349

1324 -#: revision.c:2328

1350 +#: revision.c:2339

1351 msgid "--first-parent is incompatible with --bisect"

1352 msgstr ""

1353

@@ -1365,7 +1391,7 @@ msgid ""

1391 "and commit the result with 'git commit'"

1392 msgstr ""

1393

1368 -#: sequencer.c:190 sequencer.c:833 sequencer.c:913

1394 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912

1395 #, c-format

1396 msgid "Could not write to %s"

1397 msgstr ""

@@ -1523,12 +1549,12 @@ msgstr ""

1549 msgid "Could not create sequencer directory %s"

1550 msgstr ""

1551

1526 -#: sequencer.c:835 sequencer.c:917

1552 +#: sequencer.c:835 sequencer.c:916

1553 #, c-format

1554 msgid "Error wrapping up %s."

1555 msgstr ""

1556

1531 -#: sequencer.c:854 sequencer.c:987

1557 +#: sequencer.c:854 sequencer.c:986

1558 msgid "no cherry-pick or revert in progress"

1559 msgstr ""

1560

@@ -1540,63 +1566,72 @@ msgstr ""

1566 msgid "cannot abort from a branch yet to be born"

1567 msgstr ""

1568

1543 -#: sequencer.c:878 builtin/apply.c:4287

1569 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851

1570 #, c-format

1545 -msgid "cannot open %s: %s"

1571 +msgid "cannot open %s"

1572 msgstr ""

1573

1548 -#: sequencer.c:881

1574 +#: sequencer.c:880

1575 #, c-format

1576 msgid "cannot read %s: %s"

1577 msgstr ""

1578

1553 -#: sequencer.c:882

1579 +#: sequencer.c:881

1580 msgid "unexpected end of file"

1581 msgstr ""

1582

1557 -#: sequencer.c:888

1583 +#: sequencer.c:887

1584 #, c-format

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

1586 msgstr ""

1587

1562 -#: sequencer.c:910

1588 +#: sequencer.c:909

1589 #, c-format

1590 msgid "Could not format %s."

1591 msgstr ""

1592

1567 -#: sequencer.c:1055

1593 +#: sequencer.c:1054

1594 #, c-format

1595 msgid "%s: can't cherry-pick a %s"

1596 msgstr ""

1597

1572 -#: sequencer.c:1058

1598 +#: sequencer.c:1057

1599 #, c-format

1600 msgid "%s: bad revision"

1601 msgstr ""

1602

1577 -#: sequencer.c:1092

1603 +#: sequencer.c:1091

1604 msgid "Can't revert as initial commit"

1605 msgstr ""

1606

1581 -#: sequencer.c:1093

1607 +#: sequencer.c:1092

1608 msgid "Can't cherry-pick into empty head"

1609 msgstr ""

1610

1585 -#: setup.c:246

1611 +#: setup.c:248

1612 #, c-format

1613 msgid "failed to read %s"

1614 msgstr ""

1615

1616 +#: setup.c:468

1617 +#, c-format

1618 +msgid "Expected git repo version <= %d, found %d"

1619 +msgstr ""

1620 +

1621 +#: setup.c:476

1622 +msgid "unknown repository extensions found:"

1623 +msgstr ""

1624 +

1625 #: sha1_file.c:1080

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

1627 msgstr ""

1628

1594 -#: sha1_file.c:2459

1629 +#: sha1_file.c:2458

1630 #, c-format

1631 msgid "offset before start of pack index for %s (corrupt index?)"

1632 msgstr ""

1633

1599 -#: sha1_file.c:2463

1634 +#: sha1_file.c:2462

1635 #, c-format

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

1637 msgstr ""

@@ -1614,29 +1649,38 @@ msgid ""

1649 "running \"git config advice.objectNameWarning false\""

1650 msgstr ""

1651

1617 -#: submodule.c:62 submodule.c:96

1652 +#: submodule.c:64 submodule.c:98

1653 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

1654 msgstr ""

1655

1621 -#: submodule.c:66 submodule.c:100

1656 +#: submodule.c:68 submodule.c:102

1657 #, c-format

1658 msgid "Could not find section in .gitmodules where path=%s"

1659 msgstr ""

1660

1626 -#: submodule.c:74

1661 +#: submodule.c:76

1662 #, c-format

1663 msgid "Could not update .gitmodules entry %s"

1664 msgstr ""

1665

1631 -#: submodule.c:107

1666 +#: submodule.c:109

1667 #, c-format

1668 msgid "Could not remove .gitmodules entry for %s"

1669 msgstr ""

1670

1636 -#: submodule.c:118

1671 +#: submodule.c:120

1672 msgid "staging updated .gitmodules failed"

1673 msgstr ""

1674

1675 +#: submodule.c:177

1676 +msgid "negative values not allowed for submodule.fetchJobs"

1677 +msgstr ""

1678 +

1679 +#: submodule-config.c:355

1680 +#, c-format

1681 +msgid "invalid value for %s"

1682 +msgstr ""

1683 +

1684 #: trailer.c:237

1685 #, c-format

1686 msgid "running trailer command '%s' failed"

@@ -1696,7 +1740,175 @@ msgstr ""

1740 msgid "Could not read ref %s"

1741 msgstr ""

1742

1699 -#: unpack-trees.c:203

1743 +#: unpack-trees.c:64

1744 +#, c-format

1745 +msgid ""

1746 +"Your local changes to the following files would be overwritten by checkout:\n"

1747 +"%%sPlease commit your changes or stash them before you can switch branches."

1748 +msgstr ""

1749 +

1750 +#: unpack-trees.c:66

1751 +#, c-format

1752 +msgid ""

1753 +"Your local changes to the following files would be overwritten by checkout:\n"

1754 +"%%s"

1755 +msgstr ""

1756 +

1757 +#: unpack-trees.c:69

1758 +#, c-format

1759 +msgid ""

1760 +"Your local changes to the following files would be overwritten by merge:\n"

1761 +"%%sPlease commit your changes or stash them before you can merge."

1762 +msgstr ""

1763 +

1764 +#: unpack-trees.c:71

1765 +#, c-format

1766 +msgid ""

1767 +"Your local changes to the following files would be overwritten by merge:\n"

1768 +"%%s"

1769 +msgstr ""

1770 +

1771 +#: unpack-trees.c:74

1772 +#, c-format

1773 +msgid ""

1774 +"Your local changes to the following files would be overwritten by %s:\n"

1775 +"%%sPlease commit your changes or stash them before you can %s."

1776 +msgstr ""

1777 +

1778 +#: unpack-trees.c:76

1779 +#, c-format

1780 +msgid ""

1781 +"Your local changes to the following files would be overwritten by %s:\n"

1782 +"%%s"

1783 +msgstr ""

1784 +

1785 +#: unpack-trees.c:81

1786 +#, c-format

1787 +msgid ""

1788 +"Updating the following directories would lose untracked files in it:\n"

1789 +"%s"

1790 +msgstr ""

1791 +

1792 +#: unpack-trees.c:85

1793 +#, c-format

1794 +msgid ""

1795 +"The following untracked working tree files would be removed by checkout:\n"

1796 +"%%sPlease move or remove them before you can switch branches."

1797 +msgstr ""

1798 +

1799 +#: unpack-trees.c:87

1800 +#, c-format

1801 +msgid ""

1802 +"The following untracked working tree files would be removed by checkout:\n"

1803 +"%%s"

1804 +msgstr ""

1805 +

1806 +#: unpack-trees.c:90

1807 +#, c-format

1808 +msgid ""

1809 +"The following untracked working tree files would be removed by merge:\n"

1810 +"%%sPlease move or remove them before you can merge."

1811 +msgstr ""

1812 +

1813 +#: unpack-trees.c:92

1814 +#, c-format

1815 +msgid ""

1816 +"The following untracked working tree files would be removed by merge:\n"

1817 +"%%s"

1818 +msgstr ""

1819 +

1820 +#: unpack-trees.c:95

1821 +#, c-format

1822 +msgid ""

1823 +"The following untracked working tree files would be removed by %s:\n"

1824 +"%%sPlease move or remove them before you can %s."

1825 +msgstr ""

1826 +

1827 +#: unpack-trees.c:97

1828 +#, c-format

1829 +msgid ""

1830 +"The following untracked working tree files would be removed by %s:\n"

1831 +"%%s"

1832 +msgstr ""

1833 +

1834 +#: unpack-trees.c:102

1835 +#, c-format

1836 +msgid ""

1837 +"The following untracked working tree files would be overwritten by "

1838 +"checkout:\n"

1839 +"%%sPlease move or remove them before you can switch branches."

1840 +msgstr ""

1841 +

1842 +#: unpack-trees.c:104

1843 +#, c-format

1844 +msgid ""

1845 +"The following untracked working tree files would be overwritten by "

1846 +"checkout:\n"

1847 +"%%s"

1848 +msgstr ""

1849 +

1850 +#: unpack-trees.c:107

1851 +#, c-format

1852 +msgid ""

1853 +"The following untracked working tree files would be overwritten by merge:\n"

1854 +"%%sPlease move or remove them before you can merge."

1855 +msgstr ""

1856 +

1857 +#: unpack-trees.c:109

1858 +#, c-format

1859 +msgid ""

1860 +"The following untracked working tree files would be overwritten by merge:\n"

1861 +"%%s"

1862 +msgstr ""

1863 +

1864 +#: unpack-trees.c:112

1865 +#, c-format

1866 +msgid ""

1867 +"The following untracked working tree files would be overwritten by %s:\n"

1868 +"%%sPlease move or remove them before you can %s."

1869 +msgstr ""

1870 +

1871 +#: unpack-trees.c:114

1872 +#, c-format

1873 +msgid ""

1874 +"The following untracked working tree files would be overwritten by %s:\n"

1875 +"%%s"

1876 +msgstr ""

1877 +

1878 +#: unpack-trees.c:121

1879 +#, c-format

1880 +msgid "Entry '%s' overlaps with '%s'. Cannot bind."

1881 +msgstr ""

1882 +

1883 +#: unpack-trees.c:124

1884 +#, c-format

1885 +msgid ""

1886 +"Cannot update sparse checkout: the following entries are not up-to-date:\n"

1887 +"%s"

1888 +msgstr ""

1889 +

1890 +#: unpack-trees.c:126

1891 +#, c-format

1892 +msgid ""

1893 +"The following Working tree files would be overwritten by sparse checkout "

1894 +"update:\n"

1895 +"%s"

1896 +msgstr ""

1897 +

1898 +#: unpack-trees.c:128

1899 +#, c-format

1900 +msgid ""

1901 +"The following Working tree files would be removed by sparse checkout "

1902 +"update:\n"

1903 +"%s"

1904 +msgstr ""

1905 +

1906 +#: unpack-trees.c:205

1907 +#, c-format

1908 +msgid "Aborting\n"

1909 +msgstr ""

1910 +

1911 +#: unpack-trees.c:237

1912 msgid "Checking out files"

1913 msgstr ""

1914

@@ -1734,230 +1946,226 @@ msgstr ""

1946 msgid "could not open '%s' for reading and writing"

1947 msgstr ""

1948

1737 -#: wrapper.c:224 wrapper.c:383

1949 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779

1950 #, c-format

1951 msgid "could not open '%s' for writing"

1952 msgstr ""

1953

1742 -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691

1743 -#: builtin/merge.c:1075 builtin/pull.c:387

1954 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772

1955 +#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086

1956 +#: builtin/pull.c:407

1957 #, c-format

1958 msgid "could not open '%s' for reading"

1959 msgstr ""

1960

1748 -#: wrapper.c:611

1749 -#, c-format

1750 -msgid "unable to access '%s': %s"

1751 -msgstr ""

1752 -

1753 -#: wrapper.c:632

1961 +#: wrapper.c:594 wrapper.c:615

1962 #, c-format

1963 msgid "unable to access '%s'"

1964 msgstr ""

1965

1758 -#: wrapper.c:640

1966 +#: wrapper.c:623

1967 msgid "unable to get current working directory"

1968 msgstr ""

1969

1762 -#: wrapper.c:667

1970 +#: wrapper.c:650

1971 #, c-format

1972 msgid "could not open %s for writing"

1973 msgstr ""

1974

1767 -#: wrapper.c:678 builtin/am.c:410

1975 +#: wrapper.c:661 builtin/am.c:410

1976 #, c-format

1977 msgid "could not write to %s"

1978 msgstr ""

1979

1772 -#: wrapper.c:684

1980 +#: wrapper.c:667

1981 #, c-format

1982 msgid "could not close %s"

1983 msgstr ""

1984

1777 -#: wt-status.c:149

1985 +#: wt-status.c:150

1986 msgid "Unmerged paths:"

1987 msgstr ""

1988

1781 -#: wt-status.c:176 wt-status.c:203

1989 +#: wt-status.c:177 wt-status.c:204

1990 #, c-format

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

1992 msgstr ""

1993

1786 -#: wt-status.c:178 wt-status.c:205

1994 +#: wt-status.c:179 wt-status.c:206

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

1996 msgstr ""

1997

1790 -#: wt-status.c:182

1998 +#: wt-status.c:183

1999 msgid " (use \"git add <file>...\" to mark resolution)"

2000 msgstr ""

2001

1794 -#: wt-status.c:184 wt-status.c:188

2002 +#: wt-status.c:185 wt-status.c:189

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

2004 msgstr ""

2005

1798 -#: wt-status.c:186

2006 +#: wt-status.c:187

2007 msgid " (use \"git rm <file>...\" to mark resolution)"

2008 msgstr ""

2009

1802 -#: wt-status.c:197 wt-status.c:880

2010 +#: wt-status.c:198 wt-status.c:881

2011 msgid "Changes to be committed:"

2012 msgstr ""

2013

1806 -#: wt-status.c:215 wt-status.c:889

2014 +#: wt-status.c:216 wt-status.c:890

2015 msgid "Changes not staged for commit:"

2016 msgstr ""

2017

1810 -#: wt-status.c:219

2018 +#: wt-status.c:220

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

2020 msgstr ""

2021

1814 -#: wt-status.c:221

2022 +#: wt-status.c:222

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

2024 msgstr ""

2025

1818 -#: wt-status.c:222

2026 +#: wt-status.c:223

2027 msgid ""

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

2029 msgstr ""

2030

1823 -#: wt-status.c:224

2031 +#: wt-status.c:225

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

2033 msgstr ""

2034

1827 -#: wt-status.c:236

2035 +#: wt-status.c:237

2036 #, c-format

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

2038 msgstr ""

2039

1832 -#: wt-status.c:251

2040 +#: wt-status.c:252

2041 msgid "both deleted:"

2042 msgstr ""

2043

1836 -#: wt-status.c:253

2044 +#: wt-status.c:254

2045 msgid "added by us:"

2046 msgstr ""

2047

1840 -#: wt-status.c:255

2048 +#: wt-status.c:256

2049 msgid "deleted by them:"

2050 msgstr ""

2051

1844 -#: wt-status.c:257

2052 +#: wt-status.c:258

2053 msgid "added by them:"

2054 msgstr ""

2055

1848 -#: wt-status.c:259

2056 +#: wt-status.c:260

2057 msgid "deleted by us:"

2058 msgstr ""

2059

1852 -#: wt-status.c:261

2060 +#: wt-status.c:262

2061 msgid "both added:"

2062 msgstr ""

2063

1856 -#: wt-status.c:263

2064 +#: wt-status.c:264

2065 msgid "both modified:"

2066 msgstr ""

2067

1860 -#: wt-status.c:265

2068 +#: wt-status.c:266

2069 #, c-format

2070 msgid "bug: unhandled unmerged status %x"

2071 msgstr ""

2072

1865 -#: wt-status.c:273

2073 +#: wt-status.c:274

2074 msgid "new file:"

2075 msgstr ""

2076

1869 -#: wt-status.c:275

2077 +#: wt-status.c:276

2078 msgid "copied:"

2079 msgstr ""

2080

1873 -#: wt-status.c:277

2081 +#: wt-status.c:278

2082 msgid "deleted:"

2083 msgstr ""

2084

1877 -#: wt-status.c:279

2085 +#: wt-status.c:280

2086 msgid "modified:"

2087 msgstr ""

2088

1881 -#: wt-status.c:281

2089 +#: wt-status.c:282

2090 msgid "renamed:"

2091 msgstr ""

2092

1885 -#: wt-status.c:283

2093 +#: wt-status.c:284

2094 msgid "typechange:"

2095 msgstr ""

2096

1889 -#: wt-status.c:285

2097 +#: wt-status.c:286

2098 msgid "unknown:"

2099 msgstr ""

2100

1893 -#: wt-status.c:287

2101 +#: wt-status.c:288

2102 msgid "unmerged:"

2103 msgstr ""

2104

1897 -#: wt-status.c:369

2105 +#: wt-status.c:370

2106 msgid "new commits, "

2107 msgstr ""

2108

1901 -#: wt-status.c:371

2109 +#: wt-status.c:372

2110 msgid "modified content, "

2111 msgstr ""

2112

1905 -#: wt-status.c:373

2113 +#: wt-status.c:374

2114 msgid "untracked content, "

2115 msgstr ""

2116

1909 -#: wt-status.c:390

2117 +#: wt-status.c:391

2118 #, c-format

2119 msgid "bug: unhandled diff status %c"

2120 msgstr ""

2121

1914 -#: wt-status.c:754

2122 +#: wt-status.c:755

2123 msgid "Submodules changed but not updated:"

2124 msgstr ""

2125

1918 -#: wt-status.c:756

2126 +#: wt-status.c:757

2127 msgid "Submodule changes to be committed:"

2128 msgstr ""

2129

1922 -#: wt-status.c:837

2130 +#: wt-status.c:838

2131 msgid ""

2132 "Do not touch the line above.\n"

2133 "Everything below will be removed."

2134 msgstr ""

2135

1928 -#: wt-status.c:948

2136 +#: wt-status.c:949

2137 msgid "You have unmerged paths."

2138 msgstr ""

2139

1932 -#: wt-status.c:951

2140 +#: wt-status.c:952

2141 msgid " (fix conflicts and run \"git commit\")"

2142 msgstr ""

2143

1936 -#: wt-status.c:954

2144 +#: wt-status.c:956

2145 msgid "All conflicts fixed but you are still merging."

2146 msgstr ""

2147

1940 -#: wt-status.c:957

2148 +#: wt-status.c:959

2149 msgid " (use \"git commit\" to conclude merge)"

2150 msgstr ""

2151

1944 -#: wt-status.c:967

2152 +#: wt-status.c:969

2153 msgid "You are in the middle of an am session."

2154 msgstr ""

2155

1948 -#: wt-status.c:970

2156 +#: wt-status.c:972

2157 msgid "The current patch is empty."

2158 msgstr ""

2159

1952 -#: wt-status.c:974

2160 +#: wt-status.c:976

2161 msgid " (fix conflicts and then run \"git am --continue\")"

2162 msgstr ""

2163

1956 -#: wt-status.c:976

2164 +#: wt-status.c:978

2165 msgid " (use \"git am --skip\" to skip this patch)"

2166 msgstr ""

2167

1960 -#: wt-status.c:978

2168 +#: wt-status.c:980

2169 msgid " (use \"git am --abort\" to restore the original branch)"

2170 msgstr ""

2171

@@ -2096,43 +2304,43 @@ msgstr ""

2304 msgid " (use \"git bisect reset\" to get back to the original branch)"

2305 msgstr ""

2306

2099 -#: wt-status.c:1438

2307 +#: wt-status.c:1460

2308 msgid "On branch "

2309 msgstr ""

2310

2103 -#: wt-status.c:1444

2311 +#: wt-status.c:1466

2312 msgid "interactive rebase in progress; onto "

2313 msgstr ""

2314

2107 -#: wt-status.c:1446

2315 +#: wt-status.c:1468

2316 msgid "rebase in progress; onto "

2317 msgstr ""

2318

2111 -#: wt-status.c:1451

2319 +#: wt-status.c:1473

2320 msgid "HEAD detached at "

2321 msgstr ""

2322

2115 -#: wt-status.c:1453

2323 +#: wt-status.c:1475

2324 msgid "HEAD detached from "

2325 msgstr ""

2326

2119 -#: wt-status.c:1456

2327 +#: wt-status.c:1478

2328 msgid "Not currently on any branch."

2329 msgstr ""

2330

2123 -#: wt-status.c:1474

2331 +#: wt-status.c:1496

2332 msgid "Initial commit"

2333 msgstr ""

2334

2127 -#: wt-status.c:1488

2335 +#: wt-status.c:1510

2336 msgid "Untracked files"

2337 msgstr ""

2338

2131 -#: wt-status.c:1490

2339 +#: wt-status.c:1512

2340 msgid "Ignored files"

2341 msgstr ""

2342

2135 -#: wt-status.c:1494

2343 +#: wt-status.c:1516

2344 #, c-format

2345 msgid ""

2346 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -2140,82 +2348,82 @@ msgid ""

2348 "new files yourself (see 'git help status')."

2349 msgstr ""

2350

2143 -#: wt-status.c:1500

2351 +#: wt-status.c:1522

2352 #, c-format

2353 msgid "Untracked files not listed%s"

2354 msgstr ""

2355

2148 -#: wt-status.c:1502

2356 +#: wt-status.c:1524

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

2358 msgstr ""

2359

2152 -#: wt-status.c:1508

2360 +#: wt-status.c:1530

2361 msgid "No changes"

2362 msgstr ""

2363

2156 -#: wt-status.c:1513

2364 +#: wt-status.c:1535

2365 #, c-format

2366 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

2367 msgstr ""

2368

2161 -#: wt-status.c:1516

2369 +#: wt-status.c:1538

2370 #, c-format

2371 msgid "no changes added to commit\n"

2372 msgstr ""

2373

2166 -#: wt-status.c:1519

2374 +#: wt-status.c:1541

2375 #, c-format

2376 msgid ""

2377 "nothing added to commit but untracked files present (use \"git add\" to "

2378 "track)\n"

2379 msgstr ""

2380

2173 -#: wt-status.c:1522

2381 +#: wt-status.c:1544

2382 #, c-format

2383 msgid "nothing added to commit but untracked files present\n"

2384 msgstr ""

2385

2178 -#: wt-status.c:1525

2386 +#: wt-status.c:1547

2387 #, c-format

2388 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

2389 msgstr ""

2390

2183 -#: wt-status.c:1528 wt-status.c:1533

2391 +#: wt-status.c:1550 wt-status.c:1555

2392 #, c-format

2393 msgid "nothing to commit\n"

2394 msgstr ""

2395

2188 -#: wt-status.c:1531

2396 +#: wt-status.c:1553

2397 #, c-format

2398 msgid "nothing to commit (use -u to show untracked files)\n"

2399 msgstr ""

2400

2193 -#: wt-status.c:1535

2401 +#: wt-status.c:1557

2402 #, c-format

2403 msgid "nothing to commit, working directory clean\n"

2404 msgstr ""

2405

2198 -#: wt-status.c:1642

2406 +#: wt-status.c:1664

2407 msgid "Initial commit on "

2408 msgstr ""

2409

2202 -#: wt-status.c:1646

2410 +#: wt-status.c:1668

2411 msgid "HEAD (no branch)"

2412 msgstr ""

2413

2206 -#: wt-status.c:1675

2414 +#: wt-status.c:1697

2415 msgid "gone"

2416 msgstr ""

2417

2210 -#: wt-status.c:1677 wt-status.c:1685

2418 +#: wt-status.c:1699 wt-status.c:1707

2419 msgid "behind "

2420 msgstr ""

2421

2214 -#: wt-status.c:1680 wt-status.c:1683

2422 +#: wt-status.c:1702 wt-status.c:1705

2423 msgid "ahead "

2424 msgstr ""

2425

2218 -#: compat/precompose_utf8.c:57 builtin/clone.c:413

2426 +#: compat/precompose_utf8.c:57 builtin/clone.c:415

2427 #, c-format

2428 msgid "failed to unlink '%s'"

2429 msgstr ""

@@ -2229,7 +2437,7 @@ msgstr ""

2437 msgid "unexpected diff status %c"

2438 msgstr ""

2439

2232 -#: builtin/add.c:70 builtin/commit.c:278

2440 +#: builtin/add.c:70 builtin/commit.c:280

2441 msgid "updating files failed"

2442 msgstr ""

2443

@@ -2242,7 +2450,7 @@ msgstr ""

2450 msgid "Unstaged changes after refreshing the index:"

2451 msgstr ""

2452

2245 -#: builtin/add.c:194 builtin/rev-parse.c:797

2453 +#: builtin/add.c:194 builtin/rev-parse.c:811

2454 msgid "Could not read the index"

2455 msgstr ""

2456

@@ -2278,14 +2486,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

2486 msgstr ""

2487

2488 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111

2281 -#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511

2282 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162

2489 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511

2490 +#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162

2491 msgid "dry run"

2492 msgstr ""

2493

2286 -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19

2287 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558

2288 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114

2494 +#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19

2495 +#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557

2496 +#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114

2497 msgid "be verbose"

2498 msgstr ""

2499

@@ -2293,7 +2501,7 @@ msgstr ""

2501 msgid "interactive picking"

2502 msgstr ""

2503

2296 -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286

2504 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286

2505 msgid "select hunks interactively"

2506 msgstr ""

2507

@@ -2361,16 +2569,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"

2569 msgstr ""

2570

2571 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914

2364 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

2365 -#: builtin/submodule--helper.c:35

2572 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

2573 +#: builtin/submodule--helper.c:240

2574 msgid "index file corrupt"

2575 msgstr ""

2576

2369 -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430

2577 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430

2578 msgid "Unable to write new index file"

2579 msgstr ""

2580

2373 -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078

2581 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089

2582 #, c-format

2583 msgid "could not read '%s'"

2584 msgstr ""

@@ -2398,16 +2606,6 @@ msgstr ""

2606 msgid "fseek failed"

2607 msgstr ""

2608

2401 -#: builtin/am.c:772 builtin/am.c:860

2402 -#, c-format

2403 -msgid "could not open '%s' for reading: %s"

2404 -msgstr ""

2405 -

2406 -#: builtin/am.c:779

2407 -#, c-format

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

2409 -msgstr ""

2410 -

2609 #: builtin/am.c:788

2610 #, c-format

2611 msgid "could not parse patch '%s'"

@@ -2417,109 +2615,109 @@ msgstr ""

2615 msgid "Only one StGIT patch series can be applied at once"

2616 msgstr ""

2617

2420 -#: builtin/am.c:901

2618 +#: builtin/am.c:900

2619 msgid "invalid timestamp"

2620 msgstr ""

2621

2424 -#: builtin/am.c:904 builtin/am.c:912

2622 +#: builtin/am.c:903 builtin/am.c:911

2623 msgid "invalid Date line"

2624 msgstr ""

2625

2428 -#: builtin/am.c:909

2626 +#: builtin/am.c:908

2627 msgid "invalid timezone offset"

2628 msgstr ""

2629

2432 -#: builtin/am.c:996

2630 +#: builtin/am.c:995

2631 msgid "Patch format detection failed."

2632 msgstr ""

2633

2436 -#: builtin/am.c:1001 builtin/clone.c:378

2634 +#: builtin/am.c:1000 builtin/clone.c:380

2635 #, c-format

2636 msgid "failed to create directory '%s'"

2637 msgstr ""

2638

2441 -#: builtin/am.c:1005

2639 +#: builtin/am.c:1004

2640 msgid "Failed to split patches."

2641 msgstr ""

2642

2445 -#: builtin/am.c:1137 builtin/commit.c:363

2643 +#: builtin/am.c:1136 builtin/commit.c:365

2644 msgid "unable to write index file"

2645 msgstr ""

2646

2449 -#: builtin/am.c:1188

2647 +#: builtin/am.c:1187

2648 #, c-format

2649 msgid "When you have resolved this problem, run \"%s --continue\"."

2650 msgstr ""

2651

2454 -#: builtin/am.c:1189

2652 +#: builtin/am.c:1188

2653 #, c-format

2654 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

2655 msgstr ""

2656

2459 -#: builtin/am.c:1190

2657 +#: builtin/am.c:1189

2658 #, c-format

2659 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

2660 msgstr ""

2661

2464 -#: builtin/am.c:1328

2662 +#: builtin/am.c:1327

2663 msgid "Patch is empty. Was it split wrong?"

2664 msgstr ""

2665

2468 -#: builtin/am.c:1402 builtin/log.c:1350

2666 +#: builtin/am.c:1401 builtin/log.c:1516

2667 #, c-format

2668 msgid "invalid ident line: %s"

2669 msgstr ""

2670

2473 -#: builtin/am.c:1429

2671 +#: builtin/am.c:1428

2672 #, c-format

2673 msgid "unable to parse commit %s"

2674 msgstr ""

2675

2478 -#: builtin/am.c:1631

2676 +#: builtin/am.c:1630

2677 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

2678 msgstr ""

2679

2482 -#: builtin/am.c:1633

2680 +#: builtin/am.c:1632

2681 msgid "Using index info to reconstruct a base tree..."

2682 msgstr ""

2683

2486 -#: builtin/am.c:1652

2684 +#: builtin/am.c:1651

2685 msgid ""

2686 "Did you hand edit your patch?\n"

2687 "It does not apply to blobs recorded in its index."

2688 msgstr ""

2689

2492 -#: builtin/am.c:1658

2690 +#: builtin/am.c:1657

2691 msgid "Falling back to patching base and 3-way merge..."

2692 msgstr ""

2693

2496 -#: builtin/am.c:1673

2694 +#: builtin/am.c:1672

2695 msgid "Failed to merge in the changes."

2696 msgstr ""

2697

2500 -#: builtin/am.c:1697 builtin/merge.c:633

2698 +#: builtin/am.c:1696 builtin/merge.c:636

2699 msgid "git write-tree failed to write a tree"

2700 msgstr ""

2701

2504 -#: builtin/am.c:1704

2702 +#: builtin/am.c:1703

2703 msgid "applying to an empty history"

2704 msgstr ""

2705

2508 -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830

2509 -#: builtin/merge.c:855

2706 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841

2707 +#: builtin/merge.c:866

2708 msgid "failed to write commit object"

2709 msgstr ""

2710

2513 -#: builtin/am.c:1749 builtin/am.c:1753

2711 +#: builtin/am.c:1748 builtin/am.c:1752

2712 #, c-format

2713 msgid "cannot resume: %s does not exist."

2714 msgstr ""

2715

2518 -#: builtin/am.c:1769

2716 +#: builtin/am.c:1768

2717 msgid "cannot be interactive without stdin connected to a terminal."

2718 msgstr ""

2719

2522 -#: builtin/am.c:1774

2720 +#: builtin/am.c:1773

2721 msgid "Commit Body is:"

2722 msgstr ""

2723

@@ -2527,231 +2725,233 @@ msgstr ""

2725 #. in your translation. The program will only accept English

2726 #. input at this point.

2727 #.

2530 -#: builtin/am.c:1784

2728 +#: builtin/am.c:1783

2729 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

2730 msgstr ""

2731

2534 -#: builtin/am.c:1834

2732 +#: builtin/am.c:1833

2733 #, c-format

2734 msgid "Dirty index: cannot apply patches (dirty: %s)"

2735 msgstr ""

2736

2539 -#: builtin/am.c:1869 builtin/am.c:1941

2737 +#: builtin/am.c:1868 builtin/am.c:1940

2738 #, c-format

2739 msgid "Applying: %.*s"

2740 msgstr ""

2741

2544 -#: builtin/am.c:1885

2742 +#: builtin/am.c:1884

2743 msgid "No changes -- Patch already applied."

2744 msgstr ""

2745

2548 -#: builtin/am.c:1893

2746 +#: builtin/am.c:1892

2747 #, c-format

2748 msgid "Patch failed at %s %.*s"

2749 msgstr ""

2750

2553 -#: builtin/am.c:1899

2751 +#: builtin/am.c:1898

2752 #, c-format

2753 msgid "The copy of the patch that failed is found in: %s"

2754 msgstr ""

2755

2558 -#: builtin/am.c:1944

2756 +#: builtin/am.c:1943

2757 msgid ""

2758 "No changes - did you forget to use 'git add'?\n"

2759 "If there is nothing left to stage, chances are that something else\n"

2760 "already introduced the same changes; you might want to skip this patch."

2761 msgstr ""

2762

2565 -#: builtin/am.c:1951

2763 +#: builtin/am.c:1950

2764 msgid ""

2765 "You still have unmerged paths in your index.\n"

2766 "Did you forget to use 'git add'?"

2767 msgstr ""

2768

2571 -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308

2769 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308

2770 #: builtin/reset.c:316

2771 #, c-format

2772 msgid "Could not parse object '%s'."

2773 msgstr ""

2774

2577 -#: builtin/am.c:2111

2775 +#: builtin/am.c:2110

2776 msgid "failed to clean index"

2777 msgstr ""

2778

2581 -#: builtin/am.c:2145

2779 +#: builtin/am.c:2144

2780 msgid ""

2781 "You seem to have moved HEAD since the last 'am' failure.\n"

2782 "Not rewinding to ORIG_HEAD"

2783 msgstr ""

2784

2587 -#: builtin/am.c:2206

2785 +#: builtin/am.c:2205

2786 #, c-format

2787 msgid "Invalid value for --patch-format: %s"

2788 msgstr ""

2789

2592 -#: builtin/am.c:2239

2790 +#: builtin/am.c:2238

2791 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"

2792 msgstr ""

2793

2596 -#: builtin/am.c:2240

2794 +#: builtin/am.c:2239

2795 msgid "git am [<options>] (--continue | --skip | --abort)"

2796 msgstr ""

2797

2600 -#: builtin/am.c:2246

2798 +#: builtin/am.c:2245

2799 msgid "run interactively"

2800 msgstr ""

2801

2604 -#: builtin/am.c:2248

2802 +#: builtin/am.c:2247

2803 msgid "historical option -- no-op"

2804 msgstr ""

2805

2608 -#: builtin/am.c:2250

2806 +#: builtin/am.c:2249

2807 msgid "allow fall back on 3way merging if needed"

2808 msgstr ""

2809

2612 -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57

2810 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57

2811 #: builtin/repack.c:171

2812 msgid "be quiet"

2813 msgstr ""

2814

2617 -#: builtin/am.c:2253

2815 +#: builtin/am.c:2252

2816 msgid "add a Signed-off-by line to the commit message"

2817 msgstr ""

2818

2621 -#: builtin/am.c:2256

2819 +#: builtin/am.c:2255

2820 msgid "recode into utf8 (default)"

2821 msgstr ""

2822

2625 -#: builtin/am.c:2258

2823 +#: builtin/am.c:2257

2824 msgid "pass -k flag to git-mailinfo"

2825 msgstr ""

2826

2629 -#: builtin/am.c:2260

2827 +#: builtin/am.c:2259

2828 msgid "pass -b flag to git-mailinfo"

2829 msgstr ""

2830

2633 -#: builtin/am.c:2262

2831 +#: builtin/am.c:2261

2832 msgid "pass -m flag to git-mailinfo"

2833 msgstr ""

2834

2637 -#: builtin/am.c:2264

2835 +#: builtin/am.c:2263

2836 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

2837 msgstr ""

2838

2641 -#: builtin/am.c:2267

2839 +#: builtin/am.c:2266

2840 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

2841 msgstr ""

2842

2645 -#: builtin/am.c:2270

2843 +#: builtin/am.c:2269

2844 msgid "strip everything before a scissors line"

2845 msgstr ""

2846

2649 -#: builtin/am.c:2271 builtin/apply.c:4544

2847 +#: builtin/am.c:2270 builtin/apply.c:4546

2848 msgid "action"

2849 msgstr ""

2850

2653 -#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281

2654 -#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293

2655 -#: builtin/am.c:2299

2851 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280

2852 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292

2853 +#: builtin/am.c:2298

2854 msgid "pass it through git-apply"

2855 msgstr ""

2856

2659 -#: builtin/am.c:2280 builtin/apply.c:4568

2857 +#: builtin/am.c:2279 builtin/apply.c:4570

2858 msgid "root"

2859 msgstr ""

2860

2663 -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506

2664 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95

2665 -#: builtin/pull.c:171 builtin/submodule--helper.c:72

2666 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163

2861 +#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508

2862 +#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95

2863 +#: builtin/pull.c:179 builtin/submodule--helper.c:277

2864 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485

2865 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767

2866 +#: builtin/submodule--helper.c:770

2867 msgid "path"

2868 msgstr ""

2869

2670 -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

2671 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131

2672 -#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182

2870 +#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

2871 +#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134

2872 +#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182

2873 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340

2874 #: parse-options.h:132 parse-options.h:134 parse-options.h:244

2875 msgid "n"

2876 msgstr ""

2877

2678 -#: builtin/am.c:2292 builtin/apply.c:4512

2878 +#: builtin/am.c:2291 builtin/apply.c:4514

2879 msgid "num"

2880 msgstr ""

2881

2682 -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438

2882 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438

2883 #: builtin/tag.c:372

2884 msgid "format"

2885 msgstr ""

2886

2687 -#: builtin/am.c:2296

2887 +#: builtin/am.c:2295

2888 msgid "format the patch(es) are in"

2889 msgstr ""

2890

2691 -#: builtin/am.c:2302

2891 +#: builtin/am.c:2301

2892 msgid "override error message when patch failure occurs"

2893 msgstr ""

2894

2695 -#: builtin/am.c:2304

2895 +#: builtin/am.c:2303

2896 msgid "continue applying patches after resolving a conflict"

2897 msgstr ""

2898

2699 -#: builtin/am.c:2307

2899 +#: builtin/am.c:2306

2900 msgid "synonyms for --continue"

2901 msgstr ""

2902

2703 -#: builtin/am.c:2310

2903 +#: builtin/am.c:2309

2904 msgid "skip the current patch"

2905 msgstr ""

2906

2707 -#: builtin/am.c:2313

2907 +#: builtin/am.c:2312

2908 msgid "restore the original branch and abort the patching operation."

2909 msgstr ""

2910

2711 -#: builtin/am.c:2317

2911 +#: builtin/am.c:2316

2912 msgid "lie about committer date"

2913 msgstr ""

2914

2715 -#: builtin/am.c:2319

2915 +#: builtin/am.c:2318

2916 msgid "use current timestamp for author date"

2917 msgstr ""

2918

2719 -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225

2720 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355

2919 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228

2920 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355

2921 msgid "key-id"

2922 msgstr ""

2923

2724 -#: builtin/am.c:2322

2924 +#: builtin/am.c:2321

2925 msgid "GPG-sign commits"

2926 msgstr ""

2927

2728 -#: builtin/am.c:2325

2928 +#: builtin/am.c:2324

2929 msgid "(internal use for git-rebase)"

2930 msgstr ""

2931

2732 -#: builtin/am.c:2340

2932 +#: builtin/am.c:2339

2933 msgid ""

2934 "The -b/--binary option has been a no-op for long time, and\n"

2935 "it will be removed. Please do not use it anymore."

2936 msgstr ""

2937

2738 -#: builtin/am.c:2347

2938 +#: builtin/am.c:2346

2939 msgid "failed to read the index"

2940 msgstr ""

2941

2742 -#: builtin/am.c:2362

2942 +#: builtin/am.c:2361

2943 #, c-format

2944 msgid "previous rebase directory %s still exists but mbox given."

2945 msgstr ""

2946

2747 -#: builtin/am.c:2386

2947 +#: builtin/am.c:2385

2948 #, c-format

2949 msgid ""

2950 "Stray %s directory found.\n"

2951 "Use \"git am --abort\" to remove it."

2952 msgstr ""

2953

2754 -#: builtin/am.c:2392

2954 +#: builtin/am.c:2391

2955 msgid "Resolve operation not in progress, we are not resuming."

2956 msgstr ""

2957

@@ -2784,37 +2984,37 @@ msgstr ""

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

2985 msgstr ""

2986

2787 -#: builtin/apply.c:940

2987 +#: builtin/apply.c:937

2988 #, c-format

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

2990 msgstr ""

2991

2792 -#: builtin/apply.c:944

2992 +#: builtin/apply.c:942

2993 #, c-format

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

2995 msgstr ""

2996

2797 -#: builtin/apply.c:945

2997 +#: builtin/apply.c:943

2998 #, c-format

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

3000 msgstr ""

3001

2802 -#: builtin/apply.c:952

3002 +#: builtin/apply.c:949

3003 #, c-format

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

3005 msgstr ""

3006

2807 -#: builtin/apply.c:1415

3007 +#: builtin/apply.c:1406

3008 #, c-format

3009 msgid "recount: unexpected line: %.*s"

3010 msgstr ""

3011

2812 -#: builtin/apply.c:1472

3012 +#: builtin/apply.c:1463

3013 #, c-format

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

3015 msgstr ""

3016

2817 -#: builtin/apply.c:1489

3017 +#: builtin/apply.c:1480

3018 #, c-format

3019 msgid ""

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

@@ -2825,396 +3025,406 @@ msgid_plural ""

3025 msgstr[0] ""

3026 msgstr[1] ""

3027

2828 -#: builtin/apply.c:1655

3028 +#: builtin/apply.c:1646

3029 msgid "new file depends on old contents"

3030 msgstr ""

3031

2832 -#: builtin/apply.c:1657

3032 +#: builtin/apply.c:1648

3033 msgid "deleted file still has contents"

3034 msgstr ""

3035

2836 -#: builtin/apply.c:1683

3036 +#: builtin/apply.c:1674

3037 #, c-format

3038 msgid "corrupt patch at line %d"

3039 msgstr ""

3040

2841 -#: builtin/apply.c:1719

3041 +#: builtin/apply.c:1710

3042 #, c-format

3043 msgid "new file %s depends on old contents"

3044 msgstr ""

3045

2846 -#: builtin/apply.c:1721

3046 +#: builtin/apply.c:1712

3047 #, c-format

3048 msgid "deleted file %s still has contents"

3049 msgstr ""

3050

2851 -#: builtin/apply.c:1724

3051 +#: builtin/apply.c:1715

3052 #, c-format

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

3054 msgstr ""

3055

2856 -#: builtin/apply.c:1870

3056 +#: builtin/apply.c:1861

3057 #, c-format

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

3059 msgstr ""

3060

2861 -#: builtin/apply.c:1899

3061 +#: builtin/apply.c:1895

3062 #, c-format

3063 msgid "unrecognized binary patch at line %d"

3064 msgstr ""

3065

2866 -#: builtin/apply.c:2050

3066 +#: builtin/apply.c:2048

3067 #, c-format

3068 msgid "patch with only garbage at line %d"

3069 msgstr ""

3070

2871 -#: builtin/apply.c:2140

3071 +#: builtin/apply.c:2138

3072 #, c-format

3073 msgid "unable to read symlink %s"

3074 msgstr ""

3075

2876 -#: builtin/apply.c:2144

3076 +#: builtin/apply.c:2142

3077 #, c-format

3078 msgid "unable to open or read %s"

3079 msgstr ""

3080

2881 -#: builtin/apply.c:2777

3081 +#: builtin/apply.c:2775

3082 #, c-format

3083 msgid "invalid start of line: '%c'"

3084 msgstr ""

3085

2886 -#: builtin/apply.c:2896

3086 +#: builtin/apply.c:2894

3087 #, c-format

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

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

3090 msgstr[0] ""

3091 msgstr[1] ""

3092

2893 -#: builtin/apply.c:2908

3093 +#: builtin/apply.c:2906

3094 #, c-format

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

3096 msgstr ""

3097

2898 -#: builtin/apply.c:2914

3098 +#: builtin/apply.c:2912

3099 #, c-format

3100 msgid ""

3101 "while searching for:\n"

3102 "%.*s"

3103 msgstr ""

3104

2905 -#: builtin/apply.c:2934

3105 +#: builtin/apply.c:2932

3106 #, c-format

3107 msgid "missing binary patch data for '%s'"

3108 msgstr ""

3109

2910 -#: builtin/apply.c:3035

3110 +#: builtin/apply.c:3033

3111 #, c-format

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

3113 msgstr ""

3114

2915 -#: builtin/apply.c:3041

3115 +#: builtin/apply.c:3039

3116 #, c-format

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

3118 msgstr ""

3119

2920 -#: builtin/apply.c:3062

3120 +#: builtin/apply.c:3060

3121 #, c-format

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

3123 msgstr ""

3124

2925 -#: builtin/apply.c:3186

3125 +#: builtin/apply.c:3184

3126 #, c-format

3127 msgid "cannot checkout %s"

3128 msgstr ""

3129

2930 -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287

3130 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285

3131 #, c-format

3132 msgid "read of %s failed"

3133 msgstr ""

3134

2935 -#: builtin/apply.c:3239

3135 +#: builtin/apply.c:3237

3136 #, c-format

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

3138 msgstr ""

3139

2940 -#: builtin/apply.c:3267 builtin/apply.c:3489

3140 +#: builtin/apply.c:3265 builtin/apply.c:3487

3141 #, c-format

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

3143 msgstr ""

3144

2945 -#: builtin/apply.c:3348 builtin/apply.c:3503

3145 +#: builtin/apply.c:3346 builtin/apply.c:3501

3146 #, c-format

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

3148 msgstr ""

3149

2950 -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517

3150 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515

3151 #, c-format

3152 msgid "%s: %s"

3153 msgstr ""

3154

2955 -#: builtin/apply.c:3357 builtin/apply.c:3511

3155 +#: builtin/apply.c:3355 builtin/apply.c:3509

3156 #, c-format

3157 msgid "%s: does not match index"

3158 msgstr ""

3159

2960 -#: builtin/apply.c:3459

3160 +#: builtin/apply.c:3457

3161 msgid "removal patch leaves file contents"

3162 msgstr ""

3163

2964 -#: builtin/apply.c:3528

3164 +#: builtin/apply.c:3526

3165 #, c-format

3166 msgid "%s: wrong type"

3167 msgstr ""

3168

2969 -#: builtin/apply.c:3530

3169 +#: builtin/apply.c:3528

3170 #, c-format

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

3172 msgstr ""

3173

2974 -#: builtin/apply.c:3689 builtin/apply.c:3691

3174 +#: builtin/apply.c:3687 builtin/apply.c:3689

3175 #, c-format

3176 msgid "invalid path '%s'"

3177 msgstr ""

3178

2979 -#: builtin/apply.c:3746

3179 +#: builtin/apply.c:3744

3180 #, c-format

3181 msgid "%s: already exists in index"

3182 msgstr ""

3183

2984 -#: builtin/apply.c:3749

3184 +#: builtin/apply.c:3747

3185 #, c-format

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

3187 msgstr ""

3188

2989 -#: builtin/apply.c:3769

3189 +#: builtin/apply.c:3767

3190 #, c-format

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

3192 msgstr ""

3193

2994 -#: builtin/apply.c:3774

3194 +#: builtin/apply.c:3772

3195 #, c-format

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

3197 msgstr ""

3198

2999 -#: builtin/apply.c:3794

3199 +#: builtin/apply.c:3792

3200 #, c-format

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

3202 msgstr ""

3203

3004 -#: builtin/apply.c:3798

3204 +#: builtin/apply.c:3796

3205 #, c-format

3206 msgid "%s: patch does not apply"

3207 msgstr ""

3208

3009 -#: builtin/apply.c:3812

3209 +#: builtin/apply.c:3810

3210 #, c-format

3211 msgid "Checking patch %s..."

3212 msgstr ""

3213

3014 -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135

3214 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135

3215 #, c-format

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

3217 msgstr ""

3218

3019 -#: builtin/apply.c:4048

3219 +#: builtin/apply.c:4046

3220 #, c-format

3221 msgid "unable to remove %s from index"

3222 msgstr ""

3223

3024 -#: builtin/apply.c:4077

3224 +#: builtin/apply.c:4075

3225 #, c-format

3226 msgid "corrupt patch for submodule %s"

3227 msgstr ""

3228

3029 -#: builtin/apply.c:4081

3229 +#: builtin/apply.c:4079

3230 #, c-format

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

3232 msgstr ""

3233

3034 -#: builtin/apply.c:4086

3234 +#: builtin/apply.c:4084

3235 #, c-format

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

3237 msgstr ""

3238

3039 -#: builtin/apply.c:4089 builtin/apply.c:4197

3239 +#: builtin/apply.c:4087 builtin/apply.c:4195

3240 #, c-format

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

3242 msgstr ""

3243

3044 -#: builtin/apply.c:4122

3244 +#: builtin/apply.c:4120

3245 #, c-format

3246 msgid "closing file '%s'"

3247 msgstr ""

3248

3049 -#: builtin/apply.c:4171

3249 +#: builtin/apply.c:4169

3250 #, c-format

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

3252 msgstr ""

3253

3054 -#: builtin/apply.c:4258

3254 +#: builtin/apply.c:4256

3255 #, c-format

3256 msgid "Applied patch %s cleanly."

3257 msgstr ""

3258

3059 -#: builtin/apply.c:4266

3259 +#: builtin/apply.c:4264

3260 msgid "internal error"

3261 msgstr ""

3262

3063 -#: builtin/apply.c:4269

3263 +#: builtin/apply.c:4267

3264 #, c-format

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

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

3267 msgstr[0] ""

3268 msgstr[1] ""

3269

3070 -#: builtin/apply.c:4279

3270 +#: builtin/apply.c:4277

3271 #, c-format

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

3273 msgstr ""

3274

3075 -#: builtin/apply.c:4300

3275 +#: builtin/apply.c:4285

3276 +#, c-format

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

3278 +msgstr ""

3279 +

3280 +#: builtin/apply.c:4298

3281 #, c-format

3282 msgid "Hunk #%d applied cleanly."

3283 msgstr ""

3284

3080 -#: builtin/apply.c:4303

3285 +#: builtin/apply.c:4301

3286 #, c-format

3287 msgid "Rejected hunk #%d."

3288 msgstr ""

3289

3085 -#: builtin/apply.c:4393

3290 +#: builtin/apply.c:4387

3291 +#, c-format

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

3293 +msgstr ""

3294 +

3295 +#: builtin/apply.c:4395

3296 msgid "unrecognized input"

3297 msgstr ""

3298

3089 -#: builtin/apply.c:4404

3299 +#: builtin/apply.c:4406

3300 msgid "unable to read index file"

3301 msgstr ""

3302

3093 -#: builtin/apply.c:4507

3303 +#: builtin/apply.c:4509

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

3305 msgstr ""

3306

3097 -#: builtin/apply.c:4510

3307 +#: builtin/apply.c:4512

3308 msgid "apply changes matching the given path"

3309 msgstr ""

3310

3101 -#: builtin/apply.c:4513

3311 +#: builtin/apply.c:4515

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

3313 msgstr ""

3314

3105 -#: builtin/apply.c:4516

3315 +#: builtin/apply.c:4518

3316 msgid "ignore additions made by the patch"

3317 msgstr ""

3318

3109 -#: builtin/apply.c:4518

3319 +#: builtin/apply.c:4520

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

3321 msgstr ""

3322

3113 -#: builtin/apply.c:4522

3323 +#: builtin/apply.c:4524

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

3325 msgstr ""

3326

3117 -#: builtin/apply.c:4524

3327 +#: builtin/apply.c:4526

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

3329 msgstr ""

3330

3121 -#: builtin/apply.c:4526

3331 +#: builtin/apply.c:4528

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

3333 msgstr ""

3334

3125 -#: builtin/apply.c:4528

3335 +#: builtin/apply.c:4530

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

3337 msgstr ""

3338

3129 -#: builtin/apply.c:4530

3339 +#: builtin/apply.c:4532

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

3341 msgstr ""

3342

3133 -#: builtin/apply.c:4532

3343 +#: builtin/apply.c:4534

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

3345 msgstr ""

3346

3137 -#: builtin/apply.c:4534

3347 +#: builtin/apply.c:4536

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

3349 msgstr ""

3350

3141 -#: builtin/apply.c:4536

3351 +#: builtin/apply.c:4538

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

3353 msgstr ""

3354

3145 -#: builtin/apply.c:4538

3355 +#: builtin/apply.c:4540

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

3357 msgstr ""

3358

3149 -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425

3359 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425

3360 msgid "paths are separated with NUL character"

3361 msgstr ""

3362

3153 -#: builtin/apply.c:4543

3363 +#: builtin/apply.c:4545

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

3365 msgstr ""

3366

3157 -#: builtin/apply.c:4545

3367 +#: builtin/apply.c:4547

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

3369 msgstr ""

3370

3161 -#: builtin/apply.c:4548 builtin/apply.c:4551

3371 +#: builtin/apply.c:4550 builtin/apply.c:4553

3372 msgid "ignore changes in whitespace when finding context"

3373 msgstr ""

3374

3165 -#: builtin/apply.c:4554

3375 +#: builtin/apply.c:4556

3376 msgid "apply the patch in reverse"

3377 msgstr ""

3378

3169 -#: builtin/apply.c:4556

3379 +#: builtin/apply.c:4558

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

3381 msgstr ""

3382

3173 -#: builtin/apply.c:4558

3383 +#: builtin/apply.c:4560

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

3385 msgstr ""

3386

3177 -#: builtin/apply.c:4560

3387 +#: builtin/apply.c:4562

3388 msgid "allow overlapping hunks"

3389 msgstr ""

3390

3181 -#: builtin/apply.c:4563

3391 +#: builtin/apply.c:4565

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

3393 msgstr ""

3394

3185 -#: builtin/apply.c:4566

3395 +#: builtin/apply.c:4568

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

3397 msgstr ""

3398

3189 -#: builtin/apply.c:4569

3399 +#: builtin/apply.c:4571

3400 msgid "prepend <root> to all filenames"

3401 msgstr ""

3402

3193 -#: builtin/apply.c:4591

3403 +#: builtin/apply.c:4593

3404 msgid "--3way outside a repository"

3405 msgstr ""

3406

3197 -#: builtin/apply.c:4599

3407 +#: builtin/apply.c:4601

3408 msgid "--index outside a repository"

3409 msgstr ""

3410

3201 -#: builtin/apply.c:4602

3411 +#: builtin/apply.c:4604

3412 msgid "--cached outside a repository"

3413 msgstr ""

3414

3205 -#: builtin/apply.c:4621

3415 +#: builtin/apply.c:4623

3416 #, c-format

3417 msgid "can't open patch '%s'"

3418 msgstr ""

3419

3210 -#: builtin/apply.c:4635

3420 +#: builtin/apply.c:4637

3421 #, c-format

3422 msgid "squelched %d whitespace error"

3423 msgid_plural "squelched %d whitespace errors"

3424 msgstr[0] ""

3425 msgstr[1] ""

3426

3217 -#: builtin/apply.c:4641 builtin/apply.c:4651

3427 +#: builtin/apply.c:4643 builtin/apply.c:4653

3428 #, c-format

3429 msgid "%d line adds whitespace errors."

3430 msgid_plural "%d lines add whitespace errors."

@@ -3280,99 +3490,99 @@ msgstr ""

3490 msgid "Blaming lines"

3491 msgstr ""

3492

3283 -#: builtin/blame.c:2530

3493 +#: builtin/blame.c:2531

3494 msgid "Show blame entries as we find them, incrementally"

3495 msgstr ""

3496

3287 -#: builtin/blame.c:2531

3497 +#: builtin/blame.c:2532

3498 msgid "Show blank SHA-1 for boundary commits (Default: off)"

3499 msgstr ""

3500

3291 -#: builtin/blame.c:2532

3501 +#: builtin/blame.c:2533

3502 msgid "Do not treat root commits as boundaries (Default: off)"

3503 msgstr ""

3504

3295 -#: builtin/blame.c:2533

3505 +#: builtin/blame.c:2534

3506 msgid "Show work cost statistics"

3507 msgstr ""

3508

3299 -#: builtin/blame.c:2534

3509 +#: builtin/blame.c:2535

3510 msgid "Force progress reporting"

3511 msgstr ""

3512

3303 -#: builtin/blame.c:2535

3513 +#: builtin/blame.c:2536

3514 msgid "Show output score for blame entries"

3515 msgstr ""

3516

3307 -#: builtin/blame.c:2536

3517 +#: builtin/blame.c:2537

3518 msgid "Show original filename (Default: auto)"

3519 msgstr ""

3520

3311 -#: builtin/blame.c:2537

3521 +#: builtin/blame.c:2538

3522 msgid "Show original linenumber (Default: off)"

3523 msgstr ""

3524

3315 -#: builtin/blame.c:2538

3525 +#: builtin/blame.c:2539

3526 msgid "Show in a format designed for machine consumption"

3527 msgstr ""

3528

3319 -#: builtin/blame.c:2539

3529 +#: builtin/blame.c:2540

3530 msgid "Show porcelain format with per-line commit information"

3531 msgstr ""

3532

3323 -#: builtin/blame.c:2540

3533 +#: builtin/blame.c:2541

3534 msgid "Use the same output mode as git-annotate (Default: off)"

3535 msgstr ""

3536

3327 -#: builtin/blame.c:2541

3537 +#: builtin/blame.c:2542

3538 msgid "Show raw timestamp (Default: off)"

3539 msgstr ""

3540

3331 -#: builtin/blame.c:2542

3541 +#: builtin/blame.c:2543

3542 msgid "Show long commit SHA1 (Default: off)"

3543 msgstr ""

3544

3335 -#: builtin/blame.c:2543

3545 +#: builtin/blame.c:2544

3546 msgid "Suppress author name and timestamp (Default: off)"

3547 msgstr ""

3548

3339 -#: builtin/blame.c:2544

3549 +#: builtin/blame.c:2545

3550 msgid "Show author email instead of name (Default: off)"

3551 msgstr ""

3552

3343 -#: builtin/blame.c:2545

3553 +#: builtin/blame.c:2546

3554 msgid "Ignore whitespace differences"

3555 msgstr ""

3556

3347 -#: builtin/blame.c:2546

3557 +#: builtin/blame.c:2547

3558 msgid "Spend extra cycles to find better match"

3559 msgstr ""

3560

3351 -#: builtin/blame.c:2547

3561 +#: builtin/blame.c:2548

3562 msgid "Use revisions from <file> instead of calling git-rev-list"

3563 msgstr ""

3564

3355 -#: builtin/blame.c:2548

3565 +#: builtin/blame.c:2549

3566 msgid "Use <file>'s contents as the final image"

3567 msgstr ""

3568

3359 -#: builtin/blame.c:2549 builtin/blame.c:2550

3569 +#: builtin/blame.c:2550 builtin/blame.c:2551

3570 msgid "score"

3571 msgstr ""

3572

3363 -#: builtin/blame.c:2549

3573 +#: builtin/blame.c:2550

3574 msgid "Find line copies within and across files"

3575 msgstr ""

3576

3367 -#: builtin/blame.c:2550

3577 +#: builtin/blame.c:2551

3578 msgid "Find line movements within and across files"

3579 msgstr ""

3580

3371 -#: builtin/blame.c:2551

3581 +#: builtin/blame.c:2552

3582 msgid "n,m"

3583 msgstr ""

3584

3375 -#: builtin/blame.c:2551

3585 +#: builtin/blame.c:2552

3586 msgid "Process only line range n,m, counting from 1"

3587 msgstr ""

3588

@@ -3382,392 +3592,413 @@ msgstr ""

3592 #. takes 22 places, is the longest among various forms of

3593 #. relative timestamps, but your language may need more or

3594 #. fewer display columns.

3385 -#: builtin/blame.c:2640

3595 +#: builtin/blame.c:2641

3596 msgid "4 years, 11 months ago"

3597 msgstr ""

3598

3389 -#: builtin/branch.c:25

3599 +#: builtin/branch.c:26

3600 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"

3601 msgstr ""

3602

3393 -#: builtin/branch.c:26

3603 +#: builtin/branch.c:27

3604 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"

3605 msgstr ""

3606

3397 -#: builtin/branch.c:27

3607 +#: builtin/branch.c:28

3608 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."

3609 msgstr ""

3610

3401 -#: builtin/branch.c:28

3611 +#: builtin/branch.c:29

3612 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

3613 msgstr ""

3614

3405 -#: builtin/branch.c:29

3615 +#: builtin/branch.c:30

3616 msgid "git branch [<options>] [-r | -a] [--points-at]"

3617 msgstr ""

3618

3409 -#: builtin/branch.c:142

3619 +#: builtin/branch.c:143

3620 #, c-format

3621 msgid ""

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

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

3624 msgstr ""

3625

3416 -#: builtin/branch.c:146

3626 +#: builtin/branch.c:147

3627 #, c-format

3628 msgid ""

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

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

3631 msgstr ""

3632

3423 -#: builtin/branch.c:160

3633 +#: builtin/branch.c:161

3634 #, c-format

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

3636 msgstr ""

3637

3428 -#: builtin/branch.c:164

3638 +#: builtin/branch.c:165

3639 #, c-format

3640 msgid ""

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

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

3643 msgstr ""

3644

3435 -#: builtin/branch.c:177

3645 +#: builtin/branch.c:178

3646 msgid "Update of config-file failed"

3647 msgstr ""

3648

3439 -#: builtin/branch.c:205

3649 +#: builtin/branch.c:206

3650 msgid "cannot use -a with -d"

3651 msgstr ""

3652

3443 -#: builtin/branch.c:211

3653 +#: builtin/branch.c:212

3654 msgid "Couldn't look up commit object for HEAD"

3655 msgstr ""

3656

3447 -#: builtin/branch.c:219

3657 +#: builtin/branch.c:226

3658 #, c-format

3449 -msgid "Cannot delete the branch '%s' which you are currently on."

3659 +msgid "Cannot delete branch '%s' checked out at '%s'"

3660 msgstr ""

3661

3452 -#: builtin/branch.c:235

3662 +#: builtin/branch.c:241

3663 #, c-format

3664 msgid "remote-tracking branch '%s' not found."

3665 msgstr ""

3666

3457 -#: builtin/branch.c:236

3667 +#: builtin/branch.c:242

3668 #, c-format

3669 msgid "branch '%s' not found."

3670 msgstr ""

3671

3462 -#: builtin/branch.c:251

3672 +#: builtin/branch.c:257

3673 #, c-format

3674 msgid "Error deleting remote-tracking branch '%s'"

3675 msgstr ""

3676

3467 -#: builtin/branch.c:252

3677 +#: builtin/branch.c:258

3678 #, c-format

3679 msgid "Error deleting branch '%s'"

3680 msgstr ""

3681

3472 -#: builtin/branch.c:259

3682 +#: builtin/branch.c:265

3683 #, c-format

3684 msgid "Deleted remote-tracking branch %s (was %s).\n"

3685 msgstr ""

3686

3477 -#: builtin/branch.c:260

3687 +#: builtin/branch.c:266

3688 #, c-format

3689 msgid "Deleted branch %s (was %s).\n"

3690 msgstr ""

3691

3482 -#: builtin/branch.c:303

3692 +#: builtin/branch.c:309

3693 #, c-format

3694 msgid "[%s: gone]"

3695 msgstr ""

3696

3487 -#: builtin/branch.c:308

3697 +#: builtin/branch.c:314

3698 #, c-format

3699 msgid "[%s]"

3700 msgstr ""

3701

3492 -#: builtin/branch.c:313

3702 +#: builtin/branch.c:319

3703 #, c-format

3704 msgid "[%s: behind %d]"

3705 msgstr ""

3706

3497 -#: builtin/branch.c:315

3707 +#: builtin/branch.c:321

3708 #, c-format

3709 msgid "[behind %d]"

3710 msgstr ""

3711

3502 -#: builtin/branch.c:319

3712 +#: builtin/branch.c:325

3713 #, c-format

3714 msgid "[%s: ahead %d]"

3715 msgstr ""

3716

3507 -#: builtin/branch.c:321

3717 +#: builtin/branch.c:327

3718 #, c-format

3719 msgid "[ahead %d]"

3720 msgstr ""

3721

3512 -#: builtin/branch.c:324

3722 +#: builtin/branch.c:330

3723 #, c-format

3724 msgid "[%s: ahead %d, behind %d]"

3725 msgstr ""

3726

3517 -#: builtin/branch.c:327

3727 +#: builtin/branch.c:333

3728 #, c-format

3729 msgid "[ahead %d, behind %d]"

3730 msgstr ""

3731

3522 -#: builtin/branch.c:340

3732 +#: builtin/branch.c:346

3733 msgid " **** invalid ref ****"

3734 msgstr ""

3735

3526 -#: builtin/branch.c:366

3736 +#: builtin/branch.c:372

3737 #, c-format

3738 msgid "(no branch, rebasing %s)"

3739 msgstr ""

3740

3531 -#: builtin/branch.c:369

3741 +#: builtin/branch.c:375

3742 #, c-format

3743 msgid "(no branch, bisect started on %s)"

3744 msgstr ""

3745

3536 -#: builtin/branch.c:375

3746 +#. TRANSLATORS: make sure this matches

3747 +#. "HEAD detached at " in wt-status.c

3748 +#: builtin/branch.c:381

3749 #, c-format

3750 msgid "(HEAD detached at %s)"

3751 msgstr ""

3752

3541 -#: builtin/branch.c:378

3753 +#. TRANSLATORS: make sure this matches

3754 +#. "HEAD detached from " in wt-status.c

3755 +#: builtin/branch.c:386

3756 #, c-format

3757 msgid "(HEAD detached from %s)"

3758 msgstr ""

3759

3546 -#: builtin/branch.c:382

3760 +#: builtin/branch.c:390

3761 msgid "(no branch)"

3762 msgstr ""

3763

3550 -#: builtin/branch.c:524

3764 +#: builtin/branch.c:541

3765 +#, c-format

3766 +msgid "Branch %s is being rebased at %s"

3767 +msgstr ""

3768 +

3769 +#: builtin/branch.c:545

3770 +#, c-format

3771 +msgid "Branch %s is being bisected at %s"

3772 +msgstr ""

3773 +

3774 +#: builtin/branch.c:560

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

3776 msgstr ""

3777

3554 -#: builtin/branch.c:534

3778 +#: builtin/branch.c:570

3779 #, c-format

3780 msgid "Invalid branch name: '%s'"

3781 msgstr ""

3782

3559 -#: builtin/branch.c:549

3783 +#: builtin/branch.c:587

3784 msgid "Branch rename failed"

3785 msgstr ""

3786

3563 -#: builtin/branch.c:553

3787 +#: builtin/branch.c:591

3788 #, c-format

3789 msgid "Renamed a misnamed branch '%s' away"

3790 msgstr ""

3791

3568 -#: builtin/branch.c:557

3792 +#: builtin/branch.c:594

3793 #, c-format

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

3795 msgstr ""

3796

3573 -#: builtin/branch.c:564

3797 +#: builtin/branch.c:601

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

3799 msgstr ""

3800

3577 -#: builtin/branch.c:586

3578 -#, c-format

3579 -msgid "could not write branch description template: %s"

3801 +#: builtin/branch.c:623

3802 +msgid "could not write branch description template"

3803 msgstr ""

3804

3582 -#: builtin/branch.c:615

3805 +#: builtin/branch.c:651

3806 msgid "Generic options"

3807 msgstr ""

3808

3586 -#: builtin/branch.c:617

3809 +#: builtin/branch.c:653

3810 msgid "show hash and subject, give twice for upstream branch"

3811 msgstr ""

3812

3590 -#: builtin/branch.c:618

3813 +#: builtin/branch.c:654

3814 msgid "suppress informational messages"

3815 msgstr ""

3816

3594 -#: builtin/branch.c:619

3817 +#: builtin/branch.c:655

3818 msgid "set up tracking mode (see git-pull(1))"

3819 msgstr ""

3820

3598 -#: builtin/branch.c:621

3821 +#: builtin/branch.c:657

3822 msgid "change upstream info"

3823 msgstr ""

3824

3602 -#: builtin/branch.c:625

3825 +#: builtin/branch.c:659

3826 +msgid "upstream"

3827 +msgstr ""

3828 +

3829 +#: builtin/branch.c:659

3830 +msgid "change the upstream info"

3831 +msgstr ""

3832 +

3833 +#: builtin/branch.c:661

3834 msgid "use colored output"

3835 msgstr ""

3836

3606 -#: builtin/branch.c:626

3837 +#: builtin/branch.c:662

3838 msgid "act on remote-tracking branches"

3839 msgstr ""

3840

3610 -#: builtin/branch.c:628 builtin/branch.c:629

3841 +#: builtin/branch.c:664 builtin/branch.c:665

3842 msgid "print only branches that contain the commit"

3843 msgstr ""

3844

3614 -#: builtin/branch.c:632

3845 +#: builtin/branch.c:668

3846 msgid "Specific git-branch actions:"

3847 msgstr ""

3848

3618 -#: builtin/branch.c:633

3849 +#: builtin/branch.c:669

3850 msgid "list both remote-tracking and local branches"

3851 msgstr ""

3852

3622 -#: builtin/branch.c:635

3853 +#: builtin/branch.c:671

3854 msgid "delete fully merged branch"

3855 msgstr ""

3856

3626 -#: builtin/branch.c:636

3857 +#: builtin/branch.c:672

3858 msgid "delete branch (even if not merged)"

3859 msgstr ""

3860

3630 -#: builtin/branch.c:637

3861 +#: builtin/branch.c:673

3862 msgid "move/rename a branch and its reflog"

3863 msgstr ""

3864

3634 -#: builtin/branch.c:638

3865 +#: builtin/branch.c:674

3866 msgid "move/rename a branch, even if target exists"

3867 msgstr ""

3868

3638 -#: builtin/branch.c:639

3869 +#: builtin/branch.c:675

3870 msgid "list branch names"

3871 msgstr ""

3872

3642 -#: builtin/branch.c:640

3873 +#: builtin/branch.c:676

3874 msgid "create the branch's reflog"

3875 msgstr ""

3876

3646 -#: builtin/branch.c:642

3877 +#: builtin/branch.c:678

3878 msgid "edit the description for the branch"

3879 msgstr ""

3880

3650 -#: builtin/branch.c:643

3881 +#: builtin/branch.c:679

3882 msgid "force creation, move/rename, deletion"

3883 msgstr ""

3884

3654 -#: builtin/branch.c:644

3885 +#: builtin/branch.c:680

3886 msgid "print only branches that are merged"

3887 msgstr ""

3888

3658 -#: builtin/branch.c:645

3889 +#: builtin/branch.c:681

3890 msgid "print only branches that are not merged"

3891 msgstr ""

3892

3662 -#: builtin/branch.c:646

3893 +#: builtin/branch.c:682

3894 msgid "list branches in columns"

3895 msgstr ""

3896

3666 -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366

3897 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366

3898 msgid "key"

3899 msgstr ""

3900

3670 -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367

3901 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367

3902 msgid "field name to sort on"

3903 msgstr ""

3904

3674 -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401

3905 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401

3906 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567

3907 #: builtin/tag.c:369

3908 msgid "object"

3909 msgstr ""

3910

3680 -#: builtin/branch.c:651

3911 +#: builtin/branch.c:687

3912 msgid "print only branches of the object"

3913 msgstr ""

3914

3684 -#: builtin/branch.c:669

3915 +#: builtin/branch.c:705

3916 msgid "Failed to resolve HEAD as a valid ref."

3917 msgstr ""

3918

3688 -#: builtin/branch.c:673 builtin/clone.c:705

3919 +#: builtin/branch.c:709 builtin/clone.c:707

3920 msgid "HEAD not found below refs/heads!"

3921 msgstr ""

3922

3692 -#: builtin/branch.c:693

3923 +#: builtin/branch.c:729

3924 msgid "--column and --verbose are incompatible"

3925 msgstr ""

3926

3696 -#: builtin/branch.c:704 builtin/branch.c:746

3927 +#: builtin/branch.c:740 builtin/branch.c:782

3928 msgid "branch name required"

3929 msgstr ""

3930

3700 -#: builtin/branch.c:722

3931 +#: builtin/branch.c:758

3932 msgid "Cannot give description to detached HEAD"

3933 msgstr ""

3934

3704 -#: builtin/branch.c:727

3935 +#: builtin/branch.c:763

3936 msgid "cannot edit description of more than one branch"

3937 msgstr ""

3938

3708 -#: builtin/branch.c:734

3939 +#: builtin/branch.c:770

3940 #, c-format

3941 msgid "No commit on branch '%s' yet."

3942 msgstr ""

3943

3713 -#: builtin/branch.c:737

3944 +#: builtin/branch.c:773

3945 #, c-format

3946 msgid "No branch named '%s'."

3947 msgstr ""

3948

3718 -#: builtin/branch.c:752

3949 +#: builtin/branch.c:788

3950 msgid "too many branches for a rename operation"

3951 msgstr ""

3952

3722 -#: builtin/branch.c:757

3953 +#: builtin/branch.c:793

3954 msgid "too many branches to set new upstream"

3955 msgstr ""

3956

3726 -#: builtin/branch.c:761

3957 +#: builtin/branch.c:797

3958 #, c-format

3959 msgid ""

3960 "could not set upstream of HEAD to %s when it does not point to any branch."

3961 msgstr ""

3962

3732 -#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807

3963 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843

3964 #, c-format

3965 msgid "no such branch '%s'"

3966 msgstr ""

3967

3737 -#: builtin/branch.c:768

3968 +#: builtin/branch.c:804

3969 #, c-format

3970 msgid "branch '%s' does not exist"

3971 msgstr ""

3972

3742 -#: builtin/branch.c:780

3973 +#: builtin/branch.c:816

3974 msgid "too many branches to unset upstream"

3975 msgstr ""

3976

3746 -#: builtin/branch.c:784

3977 +#: builtin/branch.c:820

3978 msgid "could not unset upstream of HEAD when it does not point to any branch."

3979 msgstr ""

3980

3750 -#: builtin/branch.c:790

3981 +#: builtin/branch.c:826

3982 #, c-format

3983 msgid "Branch '%s' has no upstream information"

3984 msgstr ""

3985

3755 -#: builtin/branch.c:804

3986 +#: builtin/branch.c:840

3987 msgid "it does not make sense to create 'HEAD' manually"

3988 msgstr ""

3989

3759 -#: builtin/branch.c:810

3990 +#: builtin/branch.c:846

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

3992 msgstr ""

3993

3763 -#: builtin/branch.c:813

3994 +#: builtin/branch.c:849

3995 #, c-format

3996 msgid ""

3997 "The --set-upstream flag is deprecated and will be removed. Consider using --"

3998 "track or --set-upstream-to\n"

3999 msgstr ""

4000

3770 -#: builtin/branch.c:830

4001 +#: builtin/branch.c:866

4002 #, c-format

4003 msgid ""

4004 "\n"

@@ -3775,16 +4006,6 @@ msgid ""

4006 "\n"

4007 msgstr ""

4008

3778 -#: builtin/branch.c:831

3779 -#, c-format

3780 -msgid " git branch -d %s\n"

3781 -msgstr ""

3782 -

3783 -#: builtin/branch.c:832

3784 -#, c-format

3785 -msgid " git branch --set-upstream-to %s\n"

3786 -msgstr ""

3787 -

4009 #: builtin/bundle.c:51

4010 #, c-format

4011 msgid "%s is okay\n"

@@ -3880,7 +4101,7 @@ msgstr ""

4101 msgid "terminate input and output records by a NUL character"

4102 msgstr ""

4103

3883 -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325

4104 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325

4105 msgid "suppress progress reporting"

4106 msgstr ""

4107

@@ -3970,8 +4191,9 @@ msgid "write the content to temporary files"

4191 msgstr ""

4192

4193 #: builtin/checkout-index.c:174 builtin/column.c:30

3973 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169

3974 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175

4194 +#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494

4195 +#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500

4196 +#: builtin/submodule--helper.c:774

4197 msgid "string"

4198 msgstr ""

4199

@@ -4021,79 +4243,79 @@ msgstr ""

4243 msgid "Unable to add merge result for '%s'"

4244 msgstr ""

4245

4024 -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257

4025 -#: builtin/checkout.c:260

4246 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256

4247 +#: builtin/checkout.c:259

4248 #, c-format

4249 msgid "'%s' cannot be used with updating paths"

4250 msgstr ""

4251

4030 -#: builtin/checkout.c:263 builtin/checkout.c:266

4252 +#: builtin/checkout.c:262 builtin/checkout.c:265

4253 #, c-format

4254 msgid "'%s' cannot be used with %s"

4255 msgstr ""

4256

4035 -#: builtin/checkout.c:269

4257 +#: builtin/checkout.c:268

4258 #, c-format

4259 msgid "Cannot update paths and switch to branch '%s' at the same time."

4260 msgstr ""

4261

4040 -#: builtin/checkout.c:280 builtin/checkout.c:474

4262 +#: builtin/checkout.c:279 builtin/checkout.c:473

4263 msgid "corrupt index file"

4264 msgstr ""

4265

4044 -#: builtin/checkout.c:340 builtin/checkout.c:347

4266 +#: builtin/checkout.c:339 builtin/checkout.c:346

4267 #, c-format

4268 msgid "path '%s' is unmerged"

4269 msgstr ""

4270

4049 -#: builtin/checkout.c:496

4271 +#: builtin/checkout.c:495

4272 msgid "you need to resolve your current index first"

4273 msgstr ""

4274

4053 -#: builtin/checkout.c:623

4275 +#: builtin/checkout.c:622

4276 #, c-format

4277 msgid "Can not do reflog for '%s': %s\n"

4278 msgstr ""

4279

4058 -#: builtin/checkout.c:661

4280 +#: builtin/checkout.c:660

4281 msgid "HEAD is now at"

4282 msgstr ""

4283

4062 -#: builtin/checkout.c:665 builtin/clone.c:659

4284 +#: builtin/checkout.c:664 builtin/clone.c:661

4285 msgid "unable to update HEAD"

4286 msgstr ""

4287

4066 -#: builtin/checkout.c:669

4288 +#: builtin/checkout.c:668

4289 #, c-format

4290 msgid "Reset branch '%s'\n"

4291 msgstr ""

4292

4071 -#: builtin/checkout.c:672

4293 +#: builtin/checkout.c:671

4294 #, c-format

4295 msgid "Already on '%s'\n"

4296 msgstr ""

4297

4076 -#: builtin/checkout.c:676

4298 +#: builtin/checkout.c:675

4299 #, c-format

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

4301 msgstr ""

4302

4081 -#: builtin/checkout.c:678 builtin/checkout.c:1068

4303 +#: builtin/checkout.c:677 builtin/checkout.c:1067

4304 #, c-format

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

4306 msgstr ""

4307

4086 -#: builtin/checkout.c:680

4308 +#: builtin/checkout.c:679

4309 #, c-format

4310 msgid "Switched to branch '%s'\n"

4311 msgstr ""

4312

4091 -#: builtin/checkout.c:732

4313 +#: builtin/checkout.c:731

4314 #, c-format

4315 msgid " ... and %d more.\n"

4316 msgstr ""

4317

4096 -#: builtin/checkout.c:738

4318 +#: builtin/checkout.c:737

4319 #, c-format

4320 msgid ""

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

@@ -4108,7 +4330,7 @@ msgid_plural ""

4330 msgstr[0] ""

4331 msgstr[1] ""

4332

4111 -#: builtin/checkout.c:757

4333 +#: builtin/checkout.c:756

4334 #, c-format

4335 msgid ""

4336 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -4125,162 +4347,162 @@ msgid_plural ""

4347 msgstr[0] ""

4348 msgstr[1] ""

4349

4128 -#: builtin/checkout.c:793

4350 +#: builtin/checkout.c:792

4351 msgid "internal error in revision walk"

4352 msgstr ""

4353

4132 -#: builtin/checkout.c:797

4354 +#: builtin/checkout.c:796

4355 msgid "Previous HEAD position was"

4356 msgstr ""

4357

4136 -#: builtin/checkout.c:824 builtin/checkout.c:1063

4358 +#: builtin/checkout.c:823 builtin/checkout.c:1062

4359 msgid "You are on a branch yet to be born"

4360 msgstr ""

4361

4140 -#: builtin/checkout.c:969

4362 +#: builtin/checkout.c:968

4363 #, c-format

4364 msgid "only one reference expected, %d given."

4365 msgstr ""

4366

4145 -#: builtin/checkout.c:1009 builtin/worktree.c:211

4367 +#: builtin/checkout.c:1008 builtin/worktree.c:212

4368 #, c-format

4369 msgid "invalid reference: %s"

4370 msgstr ""

4371

4150 -#: builtin/checkout.c:1038

4372 +#: builtin/checkout.c:1037

4373 #, c-format

4374 msgid "reference is not a tree: %s"

4375 msgstr ""

4376

4155 -#: builtin/checkout.c:1077

4377 +#: builtin/checkout.c:1076

4378 msgid "paths cannot be used with switching branches"

4379 msgstr ""

4380

4159 -#: builtin/checkout.c:1080 builtin/checkout.c:1084

4381 +#: builtin/checkout.c:1079 builtin/checkout.c:1083

4382 #, c-format

4383 msgid "'%s' cannot be used with switching branches"

4384 msgstr ""

4385

4164 -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096

4165 -#: builtin/checkout.c:1099

4386 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095

4387 +#: builtin/checkout.c:1098

4388 #, c-format

4389 msgid "'%s' cannot be used with '%s'"

4390 msgstr ""

4391

4170 -#: builtin/checkout.c:1104

4392 +#: builtin/checkout.c:1103

4393 #, c-format

4394 msgid "Cannot switch branch to a non-commit '%s'"

4395 msgstr ""

4396

4175 -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84

4176 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318

4177 -#: builtin/worktree.c:320

4397 +#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88

4398 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323

4399 +#: builtin/worktree.c:325

4400 msgid "branch"

4401 msgstr ""

4402

4181 -#: builtin/checkout.c:1138

4403 +#: builtin/checkout.c:1137

4404 msgid "create and checkout a new branch"

4405 msgstr ""

4406

4185 -#: builtin/checkout.c:1140

4407 +#: builtin/checkout.c:1139

4408 msgid "create/reset and checkout a branch"

4409 msgstr ""

4410

4189 -#: builtin/checkout.c:1141

4411 +#: builtin/checkout.c:1140

4412 msgid "create reflog for new branch"

4413 msgstr ""

4414

4193 -#: builtin/checkout.c:1142

4415 +#: builtin/checkout.c:1141

4416 msgid "detach the HEAD at named commit"

4417 msgstr ""

4418

4197 -#: builtin/checkout.c:1143

4419 +#: builtin/checkout.c:1142

4420 msgid "set upstream info for new branch"

4421 msgstr ""

4422

4201 -#: builtin/checkout.c:1145

4423 +#: builtin/checkout.c:1144

4424 msgid "new-branch"

4425 msgstr ""

4426

4205 -#: builtin/checkout.c:1145

4427 +#: builtin/checkout.c:1144

4428 msgid "new unparented branch"

4429 msgstr ""

4430

4209 -#: builtin/checkout.c:1146

4431 +#: builtin/checkout.c:1145

4432 msgid "checkout our version for unmerged files"

4433 msgstr ""

4434

4213 -#: builtin/checkout.c:1148

4435 +#: builtin/checkout.c:1147

4436 msgid "checkout their version for unmerged files"

4437 msgstr ""

4438

4217 -#: builtin/checkout.c:1150

4439 +#: builtin/checkout.c:1149

4440 msgid "force checkout (throw away local modifications)"

4441 msgstr ""

4442

4221 -#: builtin/checkout.c:1151

4443 +#: builtin/checkout.c:1150

4444 msgid "perform a 3-way merge with the new branch"

4445 msgstr ""

4446

4225 -#: builtin/checkout.c:1152 builtin/merge.c:227

4447 +#: builtin/checkout.c:1151 builtin/merge.c:230

4448 msgid "update ignored files (default)"

4449 msgstr ""

4450

4229 -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250

4451 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250

4452 msgid "style"

4453 msgstr ""

4454

4233 -#: builtin/checkout.c:1154

4455 +#: builtin/checkout.c:1153

4456 msgid "conflict style (merge or diff3)"

4457 msgstr ""

4458

4237 -#: builtin/checkout.c:1157

4459 +#: builtin/checkout.c:1156

4460 msgid "do not limit pathspecs to sparse entries only"

4461 msgstr ""

4462

4241 -#: builtin/checkout.c:1159

4463 +#: builtin/checkout.c:1158

4464 msgid "second guess 'git checkout <no-such-branch>'"

4465 msgstr ""

4466

4245 -#: builtin/checkout.c:1161

4467 +#: builtin/checkout.c:1160

4468 msgid "do not check if another worktree is holding the given ref"

4469 msgstr ""

4470

4249 -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116

4250 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526

4471 +#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116

4472 +#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526

4473 #: builtin/send-pack.c:168

4474 msgid "force progress reporting"

4475 msgstr ""

4476

4255 -#: builtin/checkout.c:1193

4477 +#: builtin/checkout.c:1192

4478 msgid "-b, -B and --orphan are mutually exclusive"

4479 msgstr ""

4480

4259 -#: builtin/checkout.c:1210

4481 +#: builtin/checkout.c:1209

4482 msgid "--track needs a branch name"

4483 msgstr ""

4484

4263 -#: builtin/checkout.c:1215

4485 +#: builtin/checkout.c:1214

4486 msgid "Missing branch name; try -b"

4487 msgstr ""

4488

4267 -#: builtin/checkout.c:1251

4489 +#: builtin/checkout.c:1250

4490 msgid "invalid path specification"

4491 msgstr ""

4492

4271 -#: builtin/checkout.c:1258

4493 +#: builtin/checkout.c:1257

4494 #, c-format

4495 msgid ""

4496 "Cannot update paths and switch to branch '%s' at the same time.\n"

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

4498 msgstr ""

4499

4278 -#: builtin/checkout.c:1263

4500 +#: builtin/checkout.c:1262

4501 #, c-format

4502 msgid "git checkout: --detach does not take a path argument '%s'"

4503 msgstr ""

4504

4283 -#: builtin/checkout.c:1267

4505 +#: builtin/checkout.c:1266

4506 msgid ""

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

4508 "checking out of the index."

@@ -4410,8 +4632,8 @@ msgstr ""

4632 msgid "remove whole directories"

4633 msgstr ""

4634

4413 -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722

4414 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182

4635 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724

4636 +#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182

4637 msgid "pattern"

4638 msgstr ""

4639

@@ -4447,286 +4669,290 @@ msgstr ""

4669 msgid "git clone [<options>] [--] <repo> [<dir>]"

4670 msgstr ""

4671

4450 -#: builtin/clone.c:60

4672 +#: builtin/clone.c:62

4673 msgid "don't create a checkout"

4674 msgstr ""

4675

4454 -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469

4676 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473

4677 msgid "create a bare repository"

4678 msgstr ""

4679

4458 -#: builtin/clone.c:65

4680 +#: builtin/clone.c:67

4681 msgid "create a mirror repository (implies bare)"

4682 msgstr ""

4683

4462 -#: builtin/clone.c:67

4684 +#: builtin/clone.c:69

4685 msgid "to clone from a local repository"

4686 msgstr ""

4687

4466 -#: builtin/clone.c:69

4688 +#: builtin/clone.c:71

4689 msgid "don't use local hardlinks, always copy"

4690 msgstr ""

4691

4470 -#: builtin/clone.c:71

4692 +#: builtin/clone.c:73

4693 msgid "setup as shared repository"

4694 msgstr ""

4695

4474 -#: builtin/clone.c:73 builtin/clone.c:75

4696 +#: builtin/clone.c:75 builtin/clone.c:77

4697 msgid "initialize submodules in the clone"

4698 msgstr ""

4699

4478 -#: builtin/clone.c:76 builtin/init-db.c:466

4700 +#: builtin/clone.c:79

4701 +msgid "number of submodules cloned in parallel"

4702 +msgstr ""

4703 +

4704 +#: builtin/clone.c:80 builtin/init-db.c:470

4705 msgid "template-directory"

4706 msgstr ""

4707

4482 -#: builtin/clone.c:77 builtin/init-db.c:467

4708 +#: builtin/clone.c:81 builtin/init-db.c:471

4709 msgid "directory from which templates will be used"

4710 msgstr ""

4711

4486 -#: builtin/clone.c:79 builtin/submodule--helper.c:173

4712 +#: builtin/clone.c:83 builtin/submodule--helper.c:498

4713 +#: builtin/submodule--helper.c:777

4714 msgid "reference repository"

4715 msgstr ""

4716

4490 -#: builtin/clone.c:81

4717 +#: builtin/clone.c:85

4718 msgid "use --reference only while cloning"

4719 msgstr ""

4720

4494 -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44

4721 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44

4722 msgid "name"

4723 msgstr ""

4724

4498 -#: builtin/clone.c:83

4725 +#: builtin/clone.c:87

4726 msgid "use <name> instead of 'origin' to track upstream"

4727 msgstr ""

4728

4502 -#: builtin/clone.c:85

4729 +#: builtin/clone.c:89

4730 msgid "checkout <branch> instead of the remote's HEAD"

4731 msgstr ""

4732

4506 -#: builtin/clone.c:87

4733 +#: builtin/clone.c:91

4734 msgid "path to git-upload-pack on the remote"

4735 msgstr ""

4736

4510 -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665

4511 -#: builtin/pull.c:193

4737 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667

4738 +#: builtin/pull.c:201

4739 msgid "depth"

4740 msgstr ""

4741

4515 -#: builtin/clone.c:89

4742 +#: builtin/clone.c:93

4743 msgid "create a shallow clone of that depth"

4744 msgstr ""

4745

4519 -#: builtin/clone.c:91

4746 +#: builtin/clone.c:95

4747 msgid "clone only one branch, HEAD or --branch"

4748 msgstr ""

4749

4523 -#: builtin/clone.c:92 builtin/init-db.c:475

4750 +#: builtin/clone.c:97

4751 +msgid "any cloned submodules will be shallow"

4752 +msgstr ""

4753 +

4754 +#: builtin/clone.c:98 builtin/init-db.c:479

4755 msgid "gitdir"

4756 msgstr ""

4757

4527 -#: builtin/clone.c:93 builtin/init-db.c:476

4758 +#: builtin/clone.c:99 builtin/init-db.c:480

4759 msgid "separate git dir from working tree"

4760 msgstr ""

4761

4531 -#: builtin/clone.c:94

4762 +#: builtin/clone.c:100

4763 msgid "key=value"

4764 msgstr ""

4765

4535 -#: builtin/clone.c:95

4766 +#: builtin/clone.c:101

4767 msgid "set config inside the new repository"

4768 msgstr ""

4769

4539 -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536

4770 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536

4771 msgid "use IPv4 addresses only"

4772 msgstr ""

4773

4543 -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538

4774 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538

4775 msgid "use IPv6 addresses only"

4776 msgstr ""

4777

4547 -#: builtin/clone.c:239

4778 +#: builtin/clone.c:241

4779 msgid ""

4780 "No directory name could be guessed.\n"

4781 "Please specify a directory on the command line"

4782 msgstr ""

4783

4553 -#: builtin/clone.c:305

4784 +#: builtin/clone.c:307

4785 #, c-format

4786 msgid "reference repository '%s' as a linked checkout is not supported yet."

4787 msgstr ""

4788

4558 -#: builtin/clone.c:307

4789 +#: builtin/clone.c:309

4790 #, c-format

4791 msgid "reference repository '%s' is not a local repository."

4792 msgstr ""

4793

4563 -#: builtin/clone.c:312

4794 +#: builtin/clone.c:314

4795 #, c-format

4796 msgid "reference repository '%s' is shallow"

4797 msgstr ""

4798

4568 -#: builtin/clone.c:315

4799 +#: builtin/clone.c:317

4800 #, c-format

4801 msgid "reference repository '%s' is grafted"

4802 msgstr ""

4803

4573 -#: builtin/clone.c:380 builtin/diff.c:84

4574 -#, c-format

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

4576 -msgstr ""

4577 -

4578 -#: builtin/clone.c:382

4804 +#: builtin/clone.c:384

4805 #, c-format

4806 msgid "%s exists and is not a directory"

4807 msgstr ""

4808

4583 -#: builtin/clone.c:396

4809 +#: builtin/clone.c:398

4810 #, c-format

4811 msgid "failed to stat %s\n"

4812 msgstr ""

4813

4588 -#: builtin/clone.c:418

4814 +#: builtin/clone.c:420

4815 #, c-format

4816 msgid "failed to create link '%s'"

4817 msgstr ""

4818

4593 -#: builtin/clone.c:422

4819 +#: builtin/clone.c:424

4820 #, c-format

4821 msgid "failed to copy file to '%s'"

4822 msgstr ""

4823

4598 -#: builtin/clone.c:447 builtin/clone.c:631

4824 +#: builtin/clone.c:449 builtin/clone.c:633

4825 #, c-format

4826 msgid "done.\n"

4827 msgstr ""

4828

4603 -#: builtin/clone.c:459

4829 +#: builtin/clone.c:461

4830 msgid ""

4831 "Clone succeeded, but checkout failed.\n"

4832 "You can inspect what was checked out with 'git status'\n"

4833 "and retry the checkout with 'git checkout -f HEAD'\n"

4834 msgstr ""

4835

4610 -#: builtin/clone.c:536

4836 +#: builtin/clone.c:538

4837 #, c-format

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

4839 msgstr ""

4840

4615 -#: builtin/clone.c:626

4841 +#: builtin/clone.c:628

4842 #, c-format

4843 msgid "Checking connectivity... "

4844 msgstr ""

4845

4620 -#: builtin/clone.c:629

4846 +#: builtin/clone.c:631

4847 msgid "remote did not send all necessary objects"

4848 msgstr ""

4849

4624 -#: builtin/clone.c:647

4850 +#: builtin/clone.c:649

4851 #, c-format

4852 msgid "unable to update %s"

4853 msgstr ""

4854

4629 -#: builtin/clone.c:696

4855 +#: builtin/clone.c:698

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

4857 msgstr ""

4858

4633 -#: builtin/clone.c:727

4859 +#: builtin/clone.c:729

4860 msgid "unable to checkout working tree"

4861 msgstr ""

4862

4637 -#: builtin/clone.c:753

4863 +#: builtin/clone.c:767

4864 msgid "unable to write parameters to config file"

4865 msgstr ""

4866

4641 -#: builtin/clone.c:816

4867 +#: builtin/clone.c:830

4868 msgid "cannot repack to clean up"

4869 msgstr ""

4870

4645 -#: builtin/clone.c:818

4871 +#: builtin/clone.c:832

4872 msgid "cannot unlink temporary alternates file"

4873 msgstr ""

4874

4649 -#: builtin/clone.c:850

4875 +#: builtin/clone.c:864 builtin/receive-pack.c:1731

4876 msgid "Too many arguments."

4877 msgstr ""

4878

4653 -#: builtin/clone.c:854

4879 +#: builtin/clone.c:868

4880 msgid "You must specify a repository to clone."

4881 msgstr ""

4882

4657 -#: builtin/clone.c:865

4883 +#: builtin/clone.c:879

4884 #, c-format

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

4886 msgstr ""

4887

4662 -#: builtin/clone.c:868

4888 +#: builtin/clone.c:882

4889 msgid "--bare and --separate-git-dir are incompatible."

4890 msgstr ""

4891

4666 -#: builtin/clone.c:881

4892 +#: builtin/clone.c:895

4893 #, c-format

4894 msgid "repository '%s' does not exist"

4895 msgstr ""

4896

4671 -#: builtin/clone.c:887 builtin/fetch.c:1174

4897 +#: builtin/clone.c:901 builtin/fetch.c:1174

4898 #, c-format

4899 msgid "depth %s is not a positive number"

4900 msgstr ""

4901

4676 -#: builtin/clone.c:897

4902 +#: builtin/clone.c:911

4903 #, c-format

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

4905 msgstr ""

4906

4681 -#: builtin/clone.c:907

4907 +#: builtin/clone.c:921

4908 #, c-format

4909 msgid "working tree '%s' already exists."

4910 msgstr ""

4911

4686 -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218

4687 -#: builtin/worktree.c:219 builtin/worktree.c:246

4912 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547

4913 +#: builtin/worktree.c:220 builtin/worktree.c:247

4914 #, c-format

4915 msgid "could not create leading directories of '%s'"

4916 msgstr ""

4917

4692 -#: builtin/clone.c:925

4918 +#: builtin/clone.c:939

4919 #, c-format

4920 msgid "could not create work tree dir '%s'"

4921 msgstr ""

4922

4697 -#: builtin/clone.c:943

4923 +#: builtin/clone.c:957

4924 #, c-format

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

4926 msgstr ""

4927

4702 -#: builtin/clone.c:945

4928 +#: builtin/clone.c:959

4929 #, c-format

4930 msgid "Cloning into '%s'...\n"

4931 msgstr ""

4932

4707 -#: builtin/clone.c:984

4933 +#: builtin/clone.c:998

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

4935 msgstr ""

4936

4711 -#: builtin/clone.c:987

4937 +#: builtin/clone.c:1001

4938 msgid "source repository is shallow, ignoring --local"

4939 msgstr ""

4940

4715 -#: builtin/clone.c:992

4941 +#: builtin/clone.c:1006

4942 msgid "--local is ignored"

4943 msgstr ""

4944

4719 -#: builtin/clone.c:996

4945 +#: builtin/clone.c:1010

4946 #, c-format

4947 msgid "Don't know how to clone %s"

4948 msgstr ""

4949

4724 -#: builtin/clone.c:1045 builtin/clone.c:1053

4950 +#: builtin/clone.c:1059 builtin/clone.c:1067

4951 #, c-format

4952 msgid "Remote branch %s not found in upstream %s"

4953 msgstr ""

4954

4729 -#: builtin/clone.c:1056

4955 +#: builtin/clone.c:1070

4956 msgid "You appear to have cloned an empty repository."

4957 msgstr ""

4958

@@ -4829,103 +5055,103 @@ msgid ""

5055 "the remaining commits.\n"

5056 msgstr ""

5057

4832 -#: builtin/commit.c:305

5058 +#: builtin/commit.c:307

5059 msgid "failed to unpack HEAD tree object"

5060 msgstr ""

5061

4836 -#: builtin/commit.c:346

5062 +#: builtin/commit.c:348

5063 msgid "unable to create temporary index"

5064 msgstr ""

5065

4840 -#: builtin/commit.c:352

5066 +#: builtin/commit.c:354

5067 msgid "interactive add failed"

5068 msgstr ""

5069

4844 -#: builtin/commit.c:365

5070 +#: builtin/commit.c:367

5071 msgid "unable to update temporary index"

5072 msgstr ""

5073

4848 -#: builtin/commit.c:367

5074 +#: builtin/commit.c:369

5075 msgid "Failed to update main cache tree"

5076 msgstr ""

5077

4852 -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463

5078 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465

5079 msgid "unable to write new_index file"

5080 msgstr ""

5081

4856 -#: builtin/commit.c:445

5082 +#: builtin/commit.c:447

5083 msgid "cannot do a partial commit during a merge."

5084 msgstr ""

5085

4860 -#: builtin/commit.c:447

5086 +#: builtin/commit.c:449

5087 msgid "cannot do a partial commit during a cherry-pick."

5088 msgstr ""

5089

4864 -#: builtin/commit.c:456

5090 +#: builtin/commit.c:458

5091 msgid "cannot read the index"

5092 msgstr ""

5093

4868 -#: builtin/commit.c:475

5094 +#: builtin/commit.c:477

5095 msgid "unable to write temporary index file"

5096 msgstr ""

5097

4872 -#: builtin/commit.c:580

5098 +#: builtin/commit.c:582

5099 #, c-format

5100 msgid "commit '%s' lacks author header"

5101 msgstr ""

5102

4877 -#: builtin/commit.c:582

5103 +#: builtin/commit.c:584

5104 #, c-format

5105 msgid "commit '%s' has malformed author line"

5106 msgstr ""

5107

4882 -#: builtin/commit.c:601

5108 +#: builtin/commit.c:603

5109 msgid "malformed --author parameter"

5110 msgstr ""

5111

4886 -#: builtin/commit.c:609

5112 +#: builtin/commit.c:611

5113 #, c-format

5114 msgid "invalid date format: %s"

5115 msgstr ""

5116

4891 -#: builtin/commit.c:653

5117 +#: builtin/commit.c:655

5118 msgid ""

5119 "unable to select a comment character that is not used\n"

5120 "in the current commit message"

5121 msgstr ""

5122

4897 -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080

5123 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091

5124 #, c-format

5125 msgid "could not lookup commit %s"

5126 msgstr ""

5127

4902 -#: builtin/commit.c:702 builtin/shortlog.c:285

5128 +#: builtin/commit.c:704 builtin/shortlog.c:285

5129 #, c-format

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

5131 msgstr ""

5132

4907 -#: builtin/commit.c:704

5133 +#: builtin/commit.c:706

5134 msgid "could not read log from standard input"

5135 msgstr ""

5136

4911 -#: builtin/commit.c:708

5137 +#: builtin/commit.c:710

5138 #, c-format

5139 msgid "could not read log file '%s'"

5140 msgstr ""

5141

4916 -#: builtin/commit.c:730

4917 -msgid "could not read MERGE_MSG"

5142 +#: builtin/commit.c:737 builtin/commit.c:745

5143 +msgid "could not read SQUASH_MSG"

5144 msgstr ""

5145

4920 -#: builtin/commit.c:734

4921 -msgid "could not read SQUASH_MSG"

5146 +#: builtin/commit.c:742

5147 +msgid "could not read MERGE_MSG"

5148 msgstr ""

5149

4924 -#: builtin/commit.c:785

5150 +#: builtin/commit.c:796

5151 msgid "could not write commit template"

5152 msgstr ""

5153

4928 -#: builtin/commit.c:803

5154 +#: builtin/commit.c:814

5155 #, c-format

5156 msgid ""

5157 "\n"

@@ -4935,7 +5161,7 @@ msgid ""

5161 "and try again.\n"

5162 msgstr ""

5163

4938 -#: builtin/commit.c:808

5164 +#: builtin/commit.c:819

5165 #, c-format

5166 msgid ""

5167 "\n"

@@ -4945,14 +5171,14 @@ msgid ""

5171 "and try again.\n"

5172 msgstr ""

5173

4948 -#: builtin/commit.c:821

5174 +#: builtin/commit.c:832

5175 #, c-format

5176 msgid ""

5177 "Please enter the commit message for your changes. Lines starting\n"

5178 "with '%c' will be ignored, and an empty message aborts the commit.\n"

5179 msgstr ""

5180

4955 -#: builtin/commit.c:828

5181 +#: builtin/commit.c:839

5182 #, c-format

5183 msgid ""

5184 "Please enter the commit message for your changes. Lines starting\n"

@@ -4960,341 +5186,341 @@ msgid ""

5186 "An empty message aborts the commit.\n"

5187 msgstr ""

5188

4963 -#: builtin/commit.c:848

5189 +#: builtin/commit.c:859

5190 #, c-format

5191 msgid "%sAuthor: %.*s <%.*s>"

5192 msgstr ""

5193

4968 -#: builtin/commit.c:856

5194 +#: builtin/commit.c:867

5195 #, c-format

5196 msgid "%sDate: %s"

5197 msgstr ""

5198

4973 -#: builtin/commit.c:863

5199 +#: builtin/commit.c:874

5200 #, c-format

5201 msgid "%sCommitter: %.*s <%.*s>"

5202 msgstr ""

5203

4978 -#: builtin/commit.c:881

5204 +#: builtin/commit.c:892

5205 msgid "Cannot read index"

5206 msgstr ""

5207

4982 -#: builtin/commit.c:938

5208 +#: builtin/commit.c:949

5209 msgid "Error building trees"

5210 msgstr ""

5211

4986 -#: builtin/commit.c:953 builtin/tag.c:266

5212 +#: builtin/commit.c:964 builtin/tag.c:266

5213 #, c-format

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

5215 msgstr ""

5216

4991 -#: builtin/commit.c:1055

5217 +#: builtin/commit.c:1066

5218 #, c-format

5219 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

5220 msgstr ""

5221

4996 -#: builtin/commit.c:1070 builtin/commit.c:1310

5222 +#: builtin/commit.c:1081 builtin/commit.c:1321

5223 #, c-format

5224 msgid "Invalid untracked files mode '%s'"

5225 msgstr ""

5226

5001 -#: builtin/commit.c:1107

5227 +#: builtin/commit.c:1118

5228 msgid "--long and -z are incompatible"

5229 msgstr ""

5230

5005 -#: builtin/commit.c:1137

5231 +#: builtin/commit.c:1148

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

5233 msgstr ""

5234

5009 -#: builtin/commit.c:1146

5235 +#: builtin/commit.c:1157

5236 msgid "You have nothing to amend."

5237 msgstr ""

5238

5013 -#: builtin/commit.c:1149

5239 +#: builtin/commit.c:1160

5240 msgid "You are in the middle of a merge -- cannot amend."

5241 msgstr ""

5242

5017 -#: builtin/commit.c:1151

5243 +#: builtin/commit.c:1162

5244 msgid "You are in the middle of a cherry-pick -- cannot amend."

5245 msgstr ""

5246

5021 -#: builtin/commit.c:1154

5247 +#: builtin/commit.c:1165

5248 msgid "Options --squash and --fixup cannot be used together"

5249 msgstr ""

5250

5025 -#: builtin/commit.c:1164

5251 +#: builtin/commit.c:1175

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

5253 msgstr ""

5254

5029 -#: builtin/commit.c:1166

5255 +#: builtin/commit.c:1177

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

5257 msgstr ""

5258

5033 -#: builtin/commit.c:1174

5259 +#: builtin/commit.c:1185

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

5261 msgstr ""

5262

5037 -#: builtin/commit.c:1191

5263 +#: builtin/commit.c:1202

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

5265 msgstr ""

5266

5041 -#: builtin/commit.c:1193

5267 +#: builtin/commit.c:1204

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

5269 msgstr ""

5270

5045 -#: builtin/commit.c:1195

5271 +#: builtin/commit.c:1206

5272 msgid "Clever... amending the last one with dirty index."

5273 msgstr ""

5274

5049 -#: builtin/commit.c:1197

5275 +#: builtin/commit.c:1208

5276 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

5277 msgstr ""

5278

5053 -#: builtin/commit.c:1209 builtin/tag.c:475

5279 +#: builtin/commit.c:1220 builtin/tag.c:474

5280 #, c-format

5281 msgid "Invalid cleanup mode %s"

5282 msgstr ""

5283

5058 -#: builtin/commit.c:1214

5284 +#: builtin/commit.c:1225

5285 msgid "Paths with -a does not make sense."

5286 msgstr ""

5287

5062 -#: builtin/commit.c:1324 builtin/commit.c:1605

5288 +#: builtin/commit.c:1335 builtin/commit.c:1621

5289 msgid "show status concisely"

5290 msgstr ""

5291

5066 -#: builtin/commit.c:1326 builtin/commit.c:1607

5292 +#: builtin/commit.c:1337 builtin/commit.c:1623

5293 msgid "show branch information"

5294 msgstr ""

5295

5070 -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512

5071 -#: builtin/worktree.c:430

5296 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512

5297 +#: builtin/worktree.c:437

5298 msgid "machine-readable output"

5299 msgstr ""

5300

5075 -#: builtin/commit.c:1331 builtin/commit.c:1611

5301 +#: builtin/commit.c:1342 builtin/commit.c:1627

5302 msgid "show status in long format (default)"

5303 msgstr ""

5304

5079 -#: builtin/commit.c:1334 builtin/commit.c:1614

5305 +#: builtin/commit.c:1345 builtin/commit.c:1630

5306 msgid "terminate entries with NUL"

5307 msgstr ""

5308

5083 -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981

5309 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981

5310 #: builtin/fast-export.c:984 builtin/tag.c:353

5311 msgid "mode"

5312 msgstr ""

5313

5088 -#: builtin/commit.c:1337 builtin/commit.c:1617

5314 +#: builtin/commit.c:1348 builtin/commit.c:1633

5315 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

5316 msgstr ""

5317

5092 -#: builtin/commit.c:1340

5318 +#: builtin/commit.c:1351

5319 msgid "show ignored files"

5320 msgstr ""

5321

5096 -#: builtin/commit.c:1341 parse-options.h:155

5322 +#: builtin/commit.c:1352 parse-options.h:155

5323 msgid "when"

5324 msgstr ""

5325

5100 -#: builtin/commit.c:1342

5326 +#: builtin/commit.c:1353

5327 msgid ""

5328 "ignore changes to submodules, optional when: all, dirty, untracked. "

5329 "(Default: all)"

5330 msgstr ""

5331

5106 -#: builtin/commit.c:1344

5332 +#: builtin/commit.c:1355

5333 msgid "list untracked files in columns"

5334 msgstr ""

5335

5110 -#: builtin/commit.c:1430

5336 +#: builtin/commit.c:1441

5337 msgid "couldn't look up newly created commit"

5338 msgstr ""

5339

5114 -#: builtin/commit.c:1432

5340 +#: builtin/commit.c:1443

5341 msgid "could not parse newly created commit"

5342 msgstr ""

5343

5118 -#: builtin/commit.c:1477

5344 +#: builtin/commit.c:1488

5345 msgid "detached HEAD"

5346 msgstr ""

5347

5122 -#: builtin/commit.c:1480

5348 +#: builtin/commit.c:1491

5349 msgid " (root-commit)"

5350 msgstr ""

5351

5126 -#: builtin/commit.c:1575

5352 +#: builtin/commit.c:1591

5353 msgid "suppress summary after successful commit"

5354 msgstr ""

5355

5130 -#: builtin/commit.c:1576

5356 +#: builtin/commit.c:1592

5357 msgid "show diff in commit message template"

5358 msgstr ""

5359

5134 -#: builtin/commit.c:1578

5360 +#: builtin/commit.c:1594

5361 msgid "Commit message options"

5362 msgstr ""

5363

5138 -#: builtin/commit.c:1579 builtin/tag.c:351

5364 +#: builtin/commit.c:1595 builtin/tag.c:351

5365 msgid "read message from file"

5366 msgstr ""

5367

5142 -#: builtin/commit.c:1580

5368 +#: builtin/commit.c:1596

5369 msgid "author"

5370 msgstr ""

5371

5146 -#: builtin/commit.c:1580

5372 +#: builtin/commit.c:1596

5373 msgid "override author for commit"

5374 msgstr ""

5375

5150 -#: builtin/commit.c:1581 builtin/gc.c:326

5376 +#: builtin/commit.c:1597 builtin/gc.c:326

5377 msgid "date"

5378 msgstr ""

5379

5154 -#: builtin/commit.c:1581

5380 +#: builtin/commit.c:1597

5381 msgid "override date for commit"

5382 msgstr ""

5383

5158 -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395

5384 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395

5385 #: builtin/notes.c:558 builtin/tag.c:349

5386 msgid "message"

5387 msgstr ""

5388

5163 -#: builtin/commit.c:1582

5389 +#: builtin/commit.c:1598

5390 msgid "commit message"

5391 msgstr ""

5392

5167 -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585

5168 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79

5393 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601

5394 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79

5395 msgid "commit"

5396 msgstr ""

5397

5172 -#: builtin/commit.c:1583

5398 +#: builtin/commit.c:1599

5399 msgid "reuse and edit message from specified commit"

5400 msgstr ""

5401

5176 -#: builtin/commit.c:1584

5402 +#: builtin/commit.c:1600

5403 msgid "reuse message from specified commit"

5404 msgstr ""

5405

5180 -#: builtin/commit.c:1585

5406 +#: builtin/commit.c:1601

5407 msgid "use autosquash formatted message to fixup specified commit"

5408 msgstr ""

5409

5184 -#: builtin/commit.c:1586

5410 +#: builtin/commit.c:1602

5411 msgid "use autosquash formatted message to squash specified commit"

5412 msgstr ""

5413

5188 -#: builtin/commit.c:1587

5414 +#: builtin/commit.c:1603

5415 msgid "the commit is authored by me now (used with -C/-c/--amend)"

5416 msgstr ""

5417

5192 -#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86

5418 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86

5419 msgid "add Signed-off-by:"

5420 msgstr ""

5421

5196 -#: builtin/commit.c:1589

5422 +#: builtin/commit.c:1605

5423 msgid "use specified template file"

5424 msgstr ""

5425

5200 -#: builtin/commit.c:1590

5426 +#: builtin/commit.c:1606

5427 msgid "force edit of commit"

5428 msgstr ""

5429

5204 -#: builtin/commit.c:1591

5430 +#: builtin/commit.c:1607

5431 msgid "default"

5432 msgstr ""

5433

5208 -#: builtin/commit.c:1591 builtin/tag.c:354

5434 +#: builtin/commit.c:1607 builtin/tag.c:354

5435 msgid "how to strip spaces and #comments from message"

5436 msgstr ""

5437

5212 -#: builtin/commit.c:1592

5438 +#: builtin/commit.c:1608

5439 msgid "include status in commit message template"

5440 msgstr ""

5441

5216 -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160

5442 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165

5443 #: builtin/revert.c:93

5444 msgid "GPG sign commit"

5445 msgstr ""

5446

5221 -#: builtin/commit.c:1597

5447 +#: builtin/commit.c:1613

5448 msgid "Commit contents options"

5449 msgstr ""

5450

5225 -#: builtin/commit.c:1598

5451 +#: builtin/commit.c:1614

5452 msgid "commit all changed files"

5453 msgstr ""

5454

5229 -#: builtin/commit.c:1599

5455 +#: builtin/commit.c:1615

5456 msgid "add specified files to index for commit"

5457 msgstr ""

5458

5233 -#: builtin/commit.c:1600

5459 +#: builtin/commit.c:1616

5460 msgid "interactively add files"

5461 msgstr ""

5462

5237 -#: builtin/commit.c:1601

5463 +#: builtin/commit.c:1617

5464 msgid "interactively add changes"

5465 msgstr ""

5466

5241 -#: builtin/commit.c:1602

5467 +#: builtin/commit.c:1618

5468 msgid "commit only specified files"

5469 msgstr ""

5470

5245 -#: builtin/commit.c:1603

5471 +#: builtin/commit.c:1619

5472 msgid "bypass pre-commit hook"

5473 msgstr ""

5474

5249 -#: builtin/commit.c:1604

5475 +#: builtin/commit.c:1620

5476 msgid "show what would be committed"

5477 msgstr ""

5478

5253 -#: builtin/commit.c:1615

5479 +#: builtin/commit.c:1631

5480 msgid "amend previous commit"

5481 msgstr ""

5482

5257 -#: builtin/commit.c:1616

5483 +#: builtin/commit.c:1632

5484 msgid "bypass post-rewrite hook"

5485 msgstr ""

5486

5261 -#: builtin/commit.c:1621

5487 +#: builtin/commit.c:1637

5488 msgid "ok to record an empty change"

5489 msgstr ""

5490

5265 -#: builtin/commit.c:1623

5491 +#: builtin/commit.c:1639

5492 msgid "ok to record a change with an empty message"

5493 msgstr ""

5494

5269 -#: builtin/commit.c:1652

5495 +#: builtin/commit.c:1668

5496 msgid "could not parse HEAD commit"

5497 msgstr ""

5498

5273 -#: builtin/commit.c:1698

5499 +#: builtin/commit.c:1718

5500 #, c-format

5501 msgid "Corrupt MERGE_HEAD file (%s)"

5502 msgstr ""

5503

5278 -#: builtin/commit.c:1705

5504 +#: builtin/commit.c:1725

5505 msgid "could not read MERGE_MODE"

5506 msgstr ""

5507

5282 -#: builtin/commit.c:1724

5508 +#: builtin/commit.c:1744

5509 #, c-format

5510 msgid "could not read commit message: %s"

5511 msgstr ""

5512

5287 -#: builtin/commit.c:1735

5513 +#: builtin/commit.c:1755

5514 #, c-format

5515 msgid "Aborting commit; you did not edit the message.\n"

5516 msgstr ""

5517

5292 -#: builtin/commit.c:1740

5518 +#: builtin/commit.c:1760

5519 #, c-format

5520 msgid "Aborting commit due to empty commit message.\n"

5521 msgstr ""

5522

5297 -#: builtin/commit.c:1788

5523 +#: builtin/commit.c:1808

5524 msgid ""

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

5526 "new_index file. Check that disk is not full and quota is\n"

@@ -5437,7 +5663,7 @@ msgstr ""

5663 msgid "unable to parse default color value"

5664 msgstr ""

5665

5440 -#: builtin/config.c:469

5666 +#: builtin/config.c:472

5667 #, c-format

5668 msgid ""

5669 "# This is Git's per-user configuration file.\n"

@@ -5447,7 +5673,7 @@ msgid ""

5673 "#\temail = %s\n"

5674 msgstr ""

5675

5450 -#: builtin/config.c:611

5676 +#: builtin/config.c:614

5677 #, c-format

5678 msgid "cannot create configuration file %s"

5679 msgstr ""

@@ -5483,7 +5709,7 @@ msgstr ""

5709 msgid "tag '%s' is really '%s' here"

5710 msgstr ""

5711

5486 -#: builtin/describe.c:250 builtin/log.c:459

5712 +#: builtin/describe.c:250 builtin/log.c:465

5713 #, c-format

5714 msgid "Not a valid object name %s"

5715 msgstr ""

@@ -5570,7 +5796,7 @@ msgstr ""

5796 msgid "only consider tags matching <pattern>"

5797 msgstr ""

5798

5573 -#: builtin/describe.c:410 builtin/name-rev.c:314

5799 +#: builtin/describe.c:410 builtin/name-rev.c:321

5800 msgid "show abbreviated commit object as fallback"

5801 msgstr ""

5802

@@ -5604,21 +5830,21 @@ msgstr ""

5830 msgid "invalid option: %s"

5831 msgstr ""

5832

5607 -#: builtin/diff.c:358

5833 +#: builtin/diff.c:360

5834 msgid "Not a git repository"

5835 msgstr ""

5836

5611 -#: builtin/diff.c:401

5837 +#: builtin/diff.c:403

5838 #, c-format

5839 msgid "invalid object '%s' given."

5840 msgstr ""

5841

5616 -#: builtin/diff.c:410

5842 +#: builtin/diff.c:412

5843 #, c-format

5844 msgid "more than two blobs given: '%s'"

5845 msgstr ""

5846

5621 -#: builtin/diff.c:417

5847 +#: builtin/diff.c:419

5848 #, c-format

5849 msgid "unhandled object '%s' given."

5850 msgstr ""

@@ -5691,19 +5917,19 @@ msgstr ""

5917 msgid "git fetch --all [<options>]"

5918 msgstr ""

5919

5694 -#: builtin/fetch.c:92 builtin/pull.c:166

5920 +#: builtin/fetch.c:92 builtin/pull.c:174

5921 msgid "fetch from all remotes"

5922 msgstr ""

5923

5698 -#: builtin/fetch.c:94 builtin/pull.c:169

5924 +#: builtin/fetch.c:94 builtin/pull.c:177

5925 msgid "append to .git/FETCH_HEAD instead of overwriting"

5926 msgstr ""

5927

5702 -#: builtin/fetch.c:96 builtin/pull.c:172

5928 +#: builtin/fetch.c:96 builtin/pull.c:180

5929 msgid "path to upload pack on remote end"

5930 msgstr ""

5931

5706 -#: builtin/fetch.c:97 builtin/pull.c:174

5932 +#: builtin/fetch.c:97 builtin/pull.c:182

5933 msgid "force overwrite of local branch"

5934 msgstr ""

5935

@@ -5711,7 +5937,7 @@ msgstr ""

5937 msgid "fetch from multiple remotes"

5938 msgstr ""

5939

5714 -#: builtin/fetch.c:101 builtin/pull.c:176

5940 +#: builtin/fetch.c:101 builtin/pull.c:184

5941 msgid "fetch all tags and associated objects"

5942 msgstr ""

5943

@@ -5723,19 +5949,19 @@ msgstr ""

5949 msgid "number of submodules fetched in parallel"

5950 msgstr ""

5951

5726 -#: builtin/fetch.c:107 builtin/pull.c:179

5952 +#: builtin/fetch.c:107 builtin/pull.c:187

5953 msgid "prune remote-tracking branches no longer on remote"

5954 msgstr ""

5955

5730 -#: builtin/fetch.c:108 builtin/pull.c:182

5956 +#: builtin/fetch.c:108 builtin/pull.c:190

5957 msgid "on-demand"

5958 msgstr ""

5959

5734 -#: builtin/fetch.c:109 builtin/pull.c:183

5960 +#: builtin/fetch.c:109 builtin/pull.c:191

5961 msgid "control recursive fetching of submodules"

5962 msgstr ""

5963

5738 -#: builtin/fetch.c:113 builtin/pull.c:191

5964 +#: builtin/fetch.c:113 builtin/pull.c:199

5965 msgid "keep downloaded pack"

5966 msgstr ""

5967

@@ -5743,15 +5969,15 @@ msgstr ""

5969 msgid "allow updating of HEAD ref"

5970 msgstr ""

5971

5746 -#: builtin/fetch.c:118 builtin/pull.c:194

5972 +#: builtin/fetch.c:118 builtin/pull.c:202

5973 msgid "deepen history of shallow clone"

5974 msgstr ""

5975

5750 -#: builtin/fetch.c:120 builtin/pull.c:197

5976 +#: builtin/fetch.c:120 builtin/pull.c:205

5977 msgid "convert to a complete repository"

5978 msgstr ""

5979

5754 -#: builtin/fetch.c:122 builtin/log.c:1236

5980 +#: builtin/fetch.c:122 builtin/log.c:1399

5981 msgid "dir"

5982 msgstr ""

5983

@@ -5763,15 +5989,15 @@ msgstr ""

5989 msgid "default mode for recursion"

5990 msgstr ""

5991

5766 -#: builtin/fetch.c:128 builtin/pull.c:200

5992 +#: builtin/fetch.c:128 builtin/pull.c:208

5993 msgid "accept refs that update .git/shallow"

5994 msgstr ""

5995

5770 -#: builtin/fetch.c:129 builtin/pull.c:202

5996 +#: builtin/fetch.c:129 builtin/pull.c:210

5997 msgid "refmap"

5998 msgstr ""

5999

5774 -#: builtin/fetch.c:130 builtin/pull.c:203

6000 +#: builtin/fetch.c:130 builtin/pull.c:211

6001 msgid "specify fetch refmap"

6002 msgstr ""

6003

@@ -5829,11 +6055,6 @@ msgstr ""

6055 msgid "(non-fast-forward)"

6056 msgstr ""

6057

5832 -#: builtin/fetch.c:610 builtin/fetch.c:851

5833 -#, c-format

5834 -msgid "cannot open %s: %s\n"

5835 -msgstr ""

5836 -

6058 #: builtin/fetch.c:619

6059 #, c-format

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

@@ -6028,55 +6249,55 @@ msgstr ""

6249 msgid "Checking object directories"

6250 msgstr ""

6251

6031 -#: builtin/fsck.c:553

6252 +#: builtin/fsck.c:552

6253 msgid "git fsck [<options>] [<object>...]"

6254 msgstr ""

6255

6035 -#: builtin/fsck.c:559

6256 +#: builtin/fsck.c:558

6257 msgid "show unreachable objects"

6258 msgstr ""

6259

6039 -#: builtin/fsck.c:560

6260 +#: builtin/fsck.c:559

6261 msgid "show dangling objects"

6262 msgstr ""

6263

6043 -#: builtin/fsck.c:561

6264 +#: builtin/fsck.c:560

6265 msgid "report tags"

6266 msgstr ""

6267

6047 -#: builtin/fsck.c:562

6268 +#: builtin/fsck.c:561

6269 msgid "report root nodes"

6270 msgstr ""

6271

6051 -#: builtin/fsck.c:563

6272 +#: builtin/fsck.c:562

6273 msgid "make index objects head nodes"

6274 msgstr ""

6275

6055 -#: builtin/fsck.c:564

6276 +#: builtin/fsck.c:563

6277 msgid "make reflogs head nodes (default)"

6278 msgstr ""

6279

6059 -#: builtin/fsck.c:565

6280 +#: builtin/fsck.c:564

6281 msgid "also consider packs and alternate objects"

6282 msgstr ""

6283

6063 -#: builtin/fsck.c:566

6284 +#: builtin/fsck.c:565

6285 msgid "check only connectivity"

6286 msgstr ""

6287

6067 -#: builtin/fsck.c:567

6288 +#: builtin/fsck.c:566

6289 msgid "enable more strict checking"

6290 msgstr ""

6291

6071 -#: builtin/fsck.c:569

6292 +#: builtin/fsck.c:568

6293 msgid "write dangling objects in .git/lost-found"

6294 msgstr ""

6295

6075 -#: builtin/fsck.c:570 builtin/prune.c:107

6296 +#: builtin/fsck.c:569 builtin/prune.c:107

6297 msgid "show progress"

6298 msgstr ""

6299

6079 -#: builtin/fsck.c:631

6300 +#: builtin/fsck.c:630

6301 msgid "Checking objects"

6302 msgstr ""

6303

@@ -6170,214 +6391,214 @@ msgstr ""

6391 msgid "unable to grep from object of type %s"

6392 msgstr ""

6393

6173 -#: builtin/grep.c:558

6394 +#: builtin/grep.c:560

6395 #, c-format

6396 msgid "switch `%c' expects a numerical value"

6397 msgstr ""

6398

6178 -#: builtin/grep.c:575

6399 +#: builtin/grep.c:577

6400 #, c-format

6401 msgid "cannot open '%s'"

6402 msgstr ""

6403

6183 -#: builtin/grep.c:644

6404 +#: builtin/grep.c:646

6405 msgid "search in index instead of in the work tree"

6406 msgstr ""

6407

6187 -#: builtin/grep.c:646

6408 +#: builtin/grep.c:648

6409 msgid "find in contents not managed by git"

6410 msgstr ""

6411

6191 -#: builtin/grep.c:648

6412 +#: builtin/grep.c:650

6413 msgid "search in both tracked and untracked files"

6414 msgstr ""

6415

6195 -#: builtin/grep.c:650

6416 +#: builtin/grep.c:652

6417 msgid "ignore files specified via '.gitignore'"

6418 msgstr ""

6419

6199 -#: builtin/grep.c:653

6420 +#: builtin/grep.c:655

6421 msgid "show non-matching lines"

6422 msgstr ""

6423

6203 -#: builtin/grep.c:655

6424 +#: builtin/grep.c:657

6425 msgid "case insensitive matching"

6426 msgstr ""

6427

6207 -#: builtin/grep.c:657

6428 +#: builtin/grep.c:659

6429 msgid "match patterns only at word boundaries"

6430 msgstr ""

6431

6211 -#: builtin/grep.c:659

6432 +#: builtin/grep.c:661

6433 msgid "process binary files as text"

6434 msgstr ""

6435

6215 -#: builtin/grep.c:661

6436 +#: builtin/grep.c:663

6437 msgid "don't match patterns in binary files"

6438 msgstr ""

6439

6219 -#: builtin/grep.c:664

6440 +#: builtin/grep.c:666

6441 msgid "process binary files with textconv filters"

6442 msgstr ""

6443

6223 -#: builtin/grep.c:666

6444 +#: builtin/grep.c:668

6445 msgid "descend at most <depth> levels"

6446 msgstr ""

6447

6227 -#: builtin/grep.c:670

6448 +#: builtin/grep.c:672

6449 msgid "use extended POSIX regular expressions"

6450 msgstr ""

6451

6231 -#: builtin/grep.c:673

6452 +#: builtin/grep.c:675

6453 msgid "use basic POSIX regular expressions (default)"

6454 msgstr ""

6455

6235 -#: builtin/grep.c:676

6456 +#: builtin/grep.c:678

6457 msgid "interpret patterns as fixed strings"

6458 msgstr ""

6459

6239 -#: builtin/grep.c:679

6460 +#: builtin/grep.c:681

6461 msgid "use Perl-compatible regular expressions"

6462 msgstr ""

6463

6243 -#: builtin/grep.c:682

6464 +#: builtin/grep.c:684

6465 msgid "show line numbers"

6466 msgstr ""

6467

6247 -#: builtin/grep.c:683

6468 +#: builtin/grep.c:685

6469 msgid "don't show filenames"

6470 msgstr ""

6471

6251 -#: builtin/grep.c:684

6472 +#: builtin/grep.c:686

6473 msgid "show filenames"

6474 msgstr ""

6475

6255 -#: builtin/grep.c:686

6476 +#: builtin/grep.c:688

6477 msgid "show filenames relative to top directory"

6478 msgstr ""

6479

6259 -#: builtin/grep.c:688

6480 +#: builtin/grep.c:690

6481 msgid "show only filenames instead of matching lines"

6482 msgstr ""

6483

6263 -#: builtin/grep.c:690

6484 +#: builtin/grep.c:692

6485 msgid "synonym for --files-with-matches"

6486 msgstr ""

6487

6267 -#: builtin/grep.c:693

6488 +#: builtin/grep.c:695

6489 msgid "show only the names of files without match"

6490 msgstr ""

6491

6271 -#: builtin/grep.c:695

6492 +#: builtin/grep.c:697

6493 msgid "print NUL after filenames"

6494 msgstr ""

6495

6275 -#: builtin/grep.c:697

6496 +#: builtin/grep.c:699

6497 msgid "show the number of matches instead of matching lines"

6498 msgstr ""

6499

6279 -#: builtin/grep.c:698

6500 +#: builtin/grep.c:700

6501 msgid "highlight matches"

6502 msgstr ""

6503

6283 -#: builtin/grep.c:700

6504 +#: builtin/grep.c:702

6505 msgid "print empty line between matches from different files"

6506 msgstr ""

6507

6287 -#: builtin/grep.c:702

6508 +#: builtin/grep.c:704

6509 msgid "show filename only once above matches from same file"

6510 msgstr ""

6511

6291 -#: builtin/grep.c:705

6512 +#: builtin/grep.c:707

6513 msgid "show <n> context lines before and after matches"

6514 msgstr ""

6515

6295 -#: builtin/grep.c:708

6516 +#: builtin/grep.c:710

6517 msgid "show <n> context lines before matches"

6518 msgstr ""

6519

6299 -#: builtin/grep.c:710

6520 +#: builtin/grep.c:712

6521 msgid "show <n> context lines after matches"

6522 msgstr ""

6523

6303 -#: builtin/grep.c:712

6524 +#: builtin/grep.c:714

6525 msgid "use <n> worker threads"

6526 msgstr ""

6527

6307 -#: builtin/grep.c:713

6528 +#: builtin/grep.c:715

6529 msgid "shortcut for -C NUM"

6530 msgstr ""

6531

6311 -#: builtin/grep.c:716

6532 +#: builtin/grep.c:718

6533 msgid "show a line with the function name before matches"

6534 msgstr ""

6535

6315 -#: builtin/grep.c:718

6536 +#: builtin/grep.c:720

6537 msgid "show the surrounding function"

6538 msgstr ""

6539

6319 -#: builtin/grep.c:721

6540 +#: builtin/grep.c:723

6541 msgid "read patterns from file"

6542 msgstr ""

6543

6323 -#: builtin/grep.c:723

6544 +#: builtin/grep.c:725

6545 msgid "match <pattern>"

6546 msgstr ""

6547

6327 -#: builtin/grep.c:725

6548 +#: builtin/grep.c:727

6549 msgid "combine patterns specified with -e"

6550 msgstr ""

6551

6331 -#: builtin/grep.c:737

6552 +#: builtin/grep.c:739

6553 msgid "indicate hit with exit status without output"

6554 msgstr ""

6555

6335 -#: builtin/grep.c:739

6556 +#: builtin/grep.c:741

6557 msgid "show only matches from files that match all patterns"

6558 msgstr ""

6559

6339 -#: builtin/grep.c:741

6560 +#: builtin/grep.c:743

6561 msgid "show parse tree for grep expression"

6562 msgstr ""

6563

6343 -#: builtin/grep.c:745

6564 +#: builtin/grep.c:747

6565 msgid "pager"

6566 msgstr ""

6567

6347 -#: builtin/grep.c:745

6568 +#: builtin/grep.c:747

6569 msgid "show matching files in the pager"

6570 msgstr ""

6571

6351 -#: builtin/grep.c:748

6572 +#: builtin/grep.c:750

6573 msgid "allow calling of grep(1) (ignored by this build)"

6574 msgstr ""

6575

6355 -#: builtin/grep.c:811

6576 +#: builtin/grep.c:813

6577 msgid "no pattern given."

6578 msgstr ""

6579

6359 -#: builtin/grep.c:843 builtin/index-pack.c:1475

6580 +#: builtin/grep.c:845 builtin/index-pack.c:1477

6581 #, c-format

6582 msgid "invalid number of threads specified (%d)"

6583 msgstr ""

6584

6364 -#: builtin/grep.c:873

6585 +#: builtin/grep.c:875

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

6587 msgstr ""

6588

6368 -#: builtin/grep.c:899

6589 +#: builtin/grep.c:901

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

6591 msgstr ""

6592

6372 -#: builtin/grep.c:904

6593 +#: builtin/grep.c:906

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

6595 msgstr ""

6596

6376 -#: builtin/grep.c:907

6597 +#: builtin/grep.c:909

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

6599 msgstr ""

6600

6380 -#: builtin/grep.c:915

6601 +#: builtin/grep.c:917

6602 msgid "both --cached and trees are given."

6603 msgstr ""

6604

@@ -6464,7 +6685,7 @@ msgstr ""

6685

6686 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168

6687 #, c-format

6467 -msgid "failed to exec '%s': %s"

6688 +msgid "failed to exec '%s'"

6689 msgstr ""

6690

6691 #: builtin/help.c:205

@@ -6719,107 +6940,109 @@ msgstr ""

6940

6941 #: builtin/index-pack.c:1253

6942 #, c-format

6722 -msgid "completed with %d local objects"

6723 -msgstr ""

6943 +msgid "completed with %d local object"

6944 +msgid_plural "completed with %d local objects"

6945 +msgstr[0] ""

6946 +msgstr[1] ""

6947

6725 -#: builtin/index-pack.c:1263

6948 +#: builtin/index-pack.c:1265

6949 #, c-format

6950 msgid "Unexpected tail checksum for %s (disk corruption?)"

6951 msgstr ""

6952

6730 -#: builtin/index-pack.c:1267

6953 +#: builtin/index-pack.c:1269

6954 #, c-format

6955 msgid "pack has %d unresolved delta"

6956 msgid_plural "pack has %d unresolved deltas"

6957 msgstr[0] ""

6958 msgstr[1] ""

6959

6737 -#: builtin/index-pack.c:1291

6960 +#: builtin/index-pack.c:1293

6961 #, c-format

6962 msgid "unable to deflate appended object (%d)"

6963 msgstr ""

6964

6742 -#: builtin/index-pack.c:1367

6965 +#: builtin/index-pack.c:1369

6966 #, c-format

6967 msgid "local object %s is corrupt"

6968 msgstr ""

6969

6747 -#: builtin/index-pack.c:1391

6970 +#: builtin/index-pack.c:1393

6971 msgid "error while closing pack file"

6972 msgstr ""

6973

6751 -#: builtin/index-pack.c:1404

6974 +#: builtin/index-pack.c:1406

6975 #, c-format

6976 msgid "cannot write keep file '%s'"

6977 msgstr ""

6978

6756 -#: builtin/index-pack.c:1412

6979 +#: builtin/index-pack.c:1414

6980 #, c-format

6981 msgid "cannot close written keep file '%s'"

6982 msgstr ""

6983

6761 -#: builtin/index-pack.c:1425

6984 +#: builtin/index-pack.c:1427

6985 msgid "cannot store pack file"

6986 msgstr ""

6987

6765 -#: builtin/index-pack.c:1436

6988 +#: builtin/index-pack.c:1438

6989 msgid "cannot store index file"

6990 msgstr ""

6991

6769 -#: builtin/index-pack.c:1469

6992 +#: builtin/index-pack.c:1471

6993 #, c-format

6994 msgid "bad pack.indexversion=%<PRIu32>"

6995 msgstr ""

6996

6774 -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664

6997 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678

6998 #, c-format

6999 msgid "no threads support, ignoring %s"

7000 msgstr ""

7001

6779 -#: builtin/index-pack.c:1538

7002 +#: builtin/index-pack.c:1540

7003 #, c-format

7004 msgid "Cannot open existing pack file '%s'"

7005 msgstr ""

7006

6784 -#: builtin/index-pack.c:1540

7007 +#: builtin/index-pack.c:1542

7008 #, c-format

7009 msgid "Cannot open existing pack idx file for '%s'"

7010 msgstr ""

7011

6789 -#: builtin/index-pack.c:1587

7012 +#: builtin/index-pack.c:1589

7013 #, c-format

7014 msgid "non delta: %d object"

7015 msgid_plural "non delta: %d objects"

7016 msgstr[0] ""

7017 msgstr[1] ""

7018

6796 -#: builtin/index-pack.c:1594

7019 +#: builtin/index-pack.c:1596

7020 #, c-format

7021 msgid "chain length = %d: %lu object"

7022 msgid_plural "chain length = %d: %lu objects"

7023 msgstr[0] ""

7024 msgstr[1] ""

7025

l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed)