df49095ac2 · 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: 2013-11-02 08:06+0800\n"

11 +"POT-Creation-Date: 2014-01-18 07: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"

@@ -52,7 +52,7 @@ msgstr ""

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

53 msgstr ""

54

55 -#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328

55 +#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328

56 #, c-format

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

58 msgstr ""

@@ -73,8 +73,8 @@ msgstr ""

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

74 msgstr ""

75

76 -#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264

77 -#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680

76 +#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265

77 +#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680

78 #: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77

79 #: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408

80 #: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154

@@ -245,64 +245,64 @@ msgstr ""

245 msgid "Failed to write ref"

246 msgstr ""

247

248 -#: bundle.c:36

248 +#: bundle.c:37

249 #, c-format

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

251 msgstr ""

252

253 -#: bundle.c:63

253 +#: bundle.c:64

254 #, c-format

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

256 msgstr ""

257

258 -#: bundle.c:89 builtin/commit.c:706

258 +#: bundle.c:90 builtin/commit.c:706

259 #, c-format

260 msgid "could not open '%s'"

261 msgstr ""

262

263 -#: bundle.c:140

263 +#: bundle.c:141

264 msgid "Repository lacks these prerequisite commits:"

265 msgstr ""

266

267 -#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332

268 -#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364

267 +#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332

268 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357

269 #: builtin/shortlog.c:158

270 msgid "revision walk setup failed"

271 msgstr ""

272

273 -#: bundle.c:186

273 +#: bundle.c:187

274 #, c-format

275 msgid "The bundle contains this ref:"

276 msgid_plural "The bundle contains these %d refs:"

277 msgstr[0] ""

278 msgstr[1] ""

279

280 -#: bundle.c:193

280 +#: bundle.c:194

281 msgid "The bundle records a complete history."

282 msgstr ""

283

284 -#: bundle.c:195

284 +#: bundle.c:196

285 #, c-format

286 msgid "The bundle requires this ref:"

287 msgid_plural "The bundle requires these %d refs:"

288 msgstr[0] ""

289 msgstr[1] ""

290

291 -#: bundle.c:294

291 +#: bundle.c:296

292 msgid "rev-list died"

293 msgstr ""

294

295 -#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261

295 +#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261

296 #, c-format

297 msgid "unrecognized argument: %s"

298 msgstr ""

299

300 -#: bundle.c:335

300 +#: bundle.c:337

301 #, c-format

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

303 msgstr ""

304

305 -#: bundle.c:380

305 +#: bundle.c:382

306 msgid "Refusing to create empty bundle."

307 msgstr ""

308

@@ -337,16 +337,16 @@ msgstr ""

337 msgid "memory exhausted"

338 msgstr ""

339

340 -#: connected.c:60

340 +#: connected.c:70

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

342 msgstr ""

343

344 -#: connected.c:80

344 +#: connected.c:90

345 #, c-format

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

347 msgstr ""

348

349 -#: connected.c:88

349 +#: connected.c:98

350 #, c-format

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

352 msgstr ""

@@ -418,36 +418,41 @@ msgid_plural "%lu years ago"

418 msgstr[0] ""

419 msgstr[1] ""

420

421 -#: diff.c:112

421 +#: diffcore-order.c:24

422 +#, c-format

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

424 +msgstr ""

425 +

426 +#: diff.c:113

427 #, c-format

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

429 msgstr ""

430

426 -#: diff.c:117

431 +#: diff.c:118

432 #, c-format

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

434 msgstr ""

435

431 -#: diff.c:210

436 +#: diff.c:213

437 #, c-format

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

439 msgstr ""

440

436 -#: diff.c:260

441 +#: diff.c:263

442 #, c-format

443 msgid ""

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

445 "%s"

446 msgstr ""

447

443 -#: diff.c:3490

448 +#: diff.c:3509

449 #, c-format

450 msgid ""

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

452 "%s"

453 msgstr ""

454

450 -#: diff.c:3504

455 +#: diff.c:3523

456 #, c-format

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

458 msgstr ""

@@ -550,7 +555,7 @@ msgid "failed to read the cache"

555 msgstr ""

556

557 #: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559

553 -#: builtin/clone.c:655

558 +#: builtin/clone.c:661

559 msgid "unable to write new index file"

560 msgstr ""

561

@@ -599,7 +604,7 @@ msgstr ""

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

605 msgstr ""

606

602 -#: merge-recursive.c:774 builtin/clone.c:311

607 +#: merge-recursive.c:774 builtin/clone.c:317

608 #, c-format

609 msgid "failed to open '%s'"

610 msgstr ""

@@ -645,7 +650,7 @@ msgstr ""

650 msgid "rename"

651 msgstr ""

652

648 -#: merge-recursive.c:1082

653 +#: merge-recursive.c:1082 wt-status.c:283

654 msgid "renamed"

655 msgstr ""

656

@@ -704,7 +709,7 @@ msgstr ""

709 msgid "modify"

710 msgstr ""

711

707 -#: merge-recursive.c:1565

712 +#: merge-recursive.c:1565 wt-status.c:281

713 msgid "modified"

714 msgstr ""

715

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

731 msgid "Auto-merging %s"

732 msgstr ""

733

729 -#: merge-recursive.c:1634 git-submodule.sh:1125

734 +#: merge-recursive.c:1634 git-submodule.sh:1148

735 msgid "submodule"

736 msgstr ""

737

@@ -796,7 +801,7 @@ msgstr ""

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

802 msgstr ""

803

799 -#: merge-recursive.c:2010 builtin/merge.c:672

804 +#: merge-recursive.c:2010 builtin/merge.c:665

805 msgid "Unable to write index."

806 msgstr ""

807

@@ -851,46 +856,46 @@ msgstr ""

856 msgid "-NUM"

857 msgstr ""

858

854 -#: pathspec.c:118

859 +#: pathspec.c:133

860 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

861 msgstr ""

862

858 -#: pathspec.c:128

863 +#: pathspec.c:143

864 msgid ""

865 "global 'literal' pathspec setting is incompatible with all other global "

866 "pathspec settings"

867 msgstr ""

868

864 -#: pathspec.c:158

869 +#: pathspec.c:177

870 msgid "invalid parameter for pathspec magic 'prefix'"

871 msgstr ""

872

868 -#: pathspec.c:164

873 +#: pathspec.c:183

874 #, c-format

875 msgid "Invalid pathspec magic '%.*s' in '%s'"

876 msgstr ""

877

873 -#: pathspec.c:168

878 +#: pathspec.c:187

879 #, c-format

880 msgid "Missing ')' at the end of pathspec magic in '%s'"

881 msgstr ""

882

878 -#: pathspec.c:186

883 +#: pathspec.c:205

884 #, c-format

885 msgid "Unimplemented pathspec magic '%c' in '%s'"

886 msgstr ""

887

883 -#: pathspec.c:211

888 +#: pathspec.c:230

889 #, c-format

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

891 msgstr ""

892

888 -#: pathspec.c:222

893 +#: pathspec.c:241

894 #, c-format

895 msgid "%s: '%s' is outside repository"

896 msgstr ""

897

893 -#: pathspec.c:278

898 +#: pathspec.c:291

899 #, c-format

900 msgid "Pathspec '%s' is in submodule '%.*s'"

901 msgstr ""

@@ -900,42 +905,72 @@ msgstr ""

905 #. * name. E.g. when add--interactive dies when running

906 #. * "checkout -p"

907 #.

903 -#: pathspec.c:340

908 +#: pathspec.c:353

909 #, c-format

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

911 msgstr ""

912

908 -#: pathspec.c:415

913 +#: pathspec.c:433

914 #, c-format

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

916 msgstr ""

917

913 -#: remote.c:1833

918 +#: pathspec.c:442

919 +msgid ""

920 +"There is nothing to exclude from by :(exclude) patterns.\n"

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

922 +msgstr ""

923 +

924 +#: remote.c:753

925 +#, c-format

926 +msgid "Cannot fetch both %s and %s to %s"

927 +msgstr ""

928 +

929 +#: remote.c:757

930 +#, c-format

931 +msgid "%s usually tracks %s, not %s"

932 +msgstr ""

933 +

934 +#: remote.c:761

935 +#, c-format

936 +msgid "%s tracks both %s and %s"

937 +msgstr ""

938 +

939 +#.

940 +#. * This last possibility doesn't occur because

941 +#. * FETCH_HEAD_IGNORE entries always appear at

942 +#. * the end of the list.

943 +#.

944 +#: remote.c:769

945 +msgid "Internal error"

946 +msgstr ""

947 +

948 +#: remote.c:1871

949 #, c-format

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

951 msgstr ""

952

918 -#: remote.c:1837

953 +#: remote.c:1875

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

955 msgstr ""

956

922 -#: remote.c:1840

957 +#: remote.c:1878

958 #, c-format

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

960 msgstr ""

961

927 -#: remote.c:1844

962 +#: remote.c:1882

963 #, c-format

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

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

966 msgstr[0] ""

967 msgstr[1] ""

968

934 -#: remote.c:1850

969 +#: remote.c:1888

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

971 msgstr ""

972

938 -#: remote.c:1853

973 +#: remote.c:1891

974 #, c-format

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

976 msgid_plural ""

@@ -943,11 +978,11 @@ msgid_plural ""

978 msgstr[0] ""

979 msgstr[1] ""

980

946 -#: remote.c:1861

981 +#: remote.c:1899

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

983 msgstr ""

984

950 -#: remote.c:1864

985 +#: remote.c:1902

986 #, c-format

987 msgid ""

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

@@ -958,7 +993,7 @@ msgid_plural ""

993 msgstr[0] ""

994 msgstr[1] ""

995

961 -#: remote.c:1874

996 +#: remote.c:1912

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

998 msgstr ""

999

@@ -971,14 +1006,14 @@ msgstr ""

1006 msgid "dup2(%d,%d) failed"

1007 msgstr ""

1008

974 -#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903

975 -#: builtin/merge.c:1013 builtin/merge.c:1023

1009 +#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896

1010 +#: builtin/merge.c:1006 builtin/merge.c:1016

1011 #, c-format

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

1013 msgstr ""

1014

980 -#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793

981 -#: builtin/merge.c:1015 builtin/merge.c:1028

1015 +#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786

1016 +#: builtin/merge.c:1008 builtin/merge.c:1021

1017 #, c-format

1018 msgid "Could not write to '%s'"

1019 msgstr ""

@@ -1213,7 +1248,7 @@ msgstr ""

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

1249 msgstr ""

1250

1216 -#: sha1_name.c:440

1251 +#: sha1_name.c:439

1252 msgid ""

1253 "Git normally never creates a ref that ends with 40 hex characters\n"

1254 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -1226,21 +1261,21 @@ msgid ""

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

1262 msgstr ""

1263

1229 -#: sha1_name.c:1112

1264 +#: sha1_name.c:1109

1265 msgid "HEAD does not point to a branch"

1266 msgstr ""

1267

1233 -#: sha1_name.c:1115

1268 +#: sha1_name.c:1112

1269 #, c-format

1270 msgid "No such branch: '%s'"

1271 msgstr ""

1272

1238 -#: sha1_name.c:1117

1273 +#: sha1_name.c:1114

1274 #, c-format

1275 msgid "No upstream configured for branch '%s'"

1276 msgstr ""

1277

1243 -#: sha1_name.c:1121

1278 +#: sha1_name.c:1118

1279 #, c-format

1280 msgid "Upstream branch '%s' not stored as a remote-tracking branch"

1281 msgstr ""

@@ -1348,331 +1383,321 @@ msgstr ""

1383 msgid "no such user"

1384 msgstr ""

1385

1351 -#: wt-status.c:146

1386 +#: wt-status.c:150

1387 msgid "Unmerged paths:"

1388 msgstr ""

1389

1355 -#: wt-status.c:173 wt-status.c:200

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

1391 #, c-format

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

1393 msgstr ""

1394

1360 -#: wt-status.c:175 wt-status.c:202

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

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

1397 msgstr ""

1398

1364 -#: wt-status.c:179

1399 +#: wt-status.c:183

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

1401 msgstr ""

1402

1368 -#: wt-status.c:181 wt-status.c:185

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

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

1405 msgstr ""

1406

1372 -#: wt-status.c:183

1407 +#: wt-status.c:187

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

1409 msgstr ""

1410

1376 -#: wt-status.c:194

1411 +#: wt-status.c:198

1412 msgid "Changes to be committed:"

1413 msgstr ""

1414

1380 -#: wt-status.c:212

1415 +#: wt-status.c:216

1416 msgid "Changes not staged for commit:"

1417 msgstr ""

1418

1384 -#: wt-status.c:216

1419 +#: wt-status.c:220

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

1421 msgstr ""

1422

1388 -#: wt-status.c:218

1423 +#: wt-status.c:222

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

1425 msgstr ""

1426

1392 -#: wt-status.c:219

1427 +#: wt-status.c:223

1428 msgid ""

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

1430 msgstr ""

1431

1397 -#: wt-status.c:221

1432 +#: wt-status.c:225

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

1434 msgstr ""

1435

1401 -#: wt-status.c:233

1436 +#: wt-status.c:237

1437 #, c-format

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

1439 msgstr ""

1440

1406 -#: wt-status.c:250

1441 +#: wt-status.c:254

1442 msgid "bug"

1443 msgstr ""

1444

1410 -#: wt-status.c:255

1445 +#: wt-status.c:259

1446 msgid "both deleted:"

1447 msgstr ""

1448

1414 -#: wt-status.c:256

1449 +#: wt-status.c:260

1450 msgid "added by us:"

1451 msgstr ""

1452

1418 -#: wt-status.c:257

1453 +#: wt-status.c:261

1454 msgid "deleted by them:"

1455 msgstr ""

1456

1422 -#: wt-status.c:258

1457 +#: wt-status.c:262

1458 msgid "added by them:"

1459 msgstr ""

1460

1426 -#: wt-status.c:259

1461 +#: wt-status.c:263

1462 msgid "deleted by us:"

1463 msgstr ""

1464

1430 -#: wt-status.c:260

1465 +#: wt-status.c:264

1466 msgid "both added:"

1467 msgstr ""

1468

1434 -#: wt-status.c:261

1469 +#: wt-status.c:265

1470 msgid "both modified:"

1471 msgstr ""

1472

1438 -#: wt-status.c:291

1439 -msgid "new commits, "

1473 +#: wt-status.c:275

1474 +msgid "new file"

1475 msgstr ""

1476

1442 -#: wt-status.c:293

1443 -msgid "modified content, "

1477 +#: wt-status.c:277

1478 +msgid "copied"

1479 msgstr ""

1480

1446 -#: wt-status.c:295

1447 -msgid "untracked content, "

1481 +#: wt-status.c:279

1482 +msgid "deleted"

1483 msgstr ""

1484

1450 -#: wt-status.c:312

1451 -#, c-format

1452 -msgid "new file: %s"

1485 +#: wt-status.c:285

1486 +msgid "typechange"

1487 msgstr ""

1488

1455 -#: wt-status.c:315

1456 -#, c-format

1457 -msgid "copied: %s -> %s"

1489 +#: wt-status.c:287

1490 +msgid "unknown"

1491 msgstr ""

1492

1460 -#: wt-status.c:318

1461 -#, c-format

1462 -msgid "deleted: %s"

1463 -msgstr ""

1464 -

1465 -#: wt-status.c:321

1466 -#, c-format

1467 -msgid "modified: %s"

1468 -msgstr ""

1469 -

1470 -#: wt-status.c:324

1471 -#, c-format

1472 -msgid "renamed: %s -> %s"

1493 +#: wt-status.c:289

1494 +msgid "unmerged"

1495 msgstr ""

1496

1475 -#: wt-status.c:327

1476 -#, c-format

1477 -msgid "typechange: %s"

1497 +#: wt-status.c:336

1498 +msgid "new commits, "

1499 msgstr ""

1500

1480 -#: wt-status.c:330

1481 -#, c-format

1482 -msgid "unknown: %s"

1501 +#: wt-status.c:338

1502 +msgid "modified content, "

1503 msgstr ""

1504

1485 -#: wt-status.c:333

1486 -#, c-format

1487 -msgid "unmerged: %s"

1505 +#: wt-status.c:340

1506 +msgid "untracked content, "

1507 msgstr ""

1508

1490 -#: wt-status.c:336

1509 +#: wt-status.c:357

1510 #, c-format

1511 msgid "bug: unhandled diff status %c"

1512 msgstr ""

1513

1495 -#: wt-status.c:703

1514 +#: wt-status.c:732

1515 msgid "Submodules changed but not updated:"

1516 msgstr ""

1517

1499 -#: wt-status.c:705

1518 +#: wt-status.c:734

1519 msgid "Submodule changes to be committed:"

1520 msgstr ""

1521

1503 -#: wt-status.c:848

1522 +#: wt-status.c:836

1523 +msgid ""

1524 +"Do not touch the line above.\n"

1525 +"Everything below will be removed."

1526 +msgstr ""

1527 +

1528 +#: wt-status.c:899

1529 msgid "You have unmerged paths."

1530 msgstr ""

1531

1507 -#: wt-status.c:851

1532 +#: wt-status.c:902

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

1534 msgstr ""

1535

1511 -#: wt-status.c:854

1536 +#: wt-status.c:905

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

1538 msgstr ""

1539

1515 -#: wt-status.c:857

1540 +#: wt-status.c:908

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

1542 msgstr ""

1543

1519 -#: wt-status.c:867

1544 +#: wt-status.c:918

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

1546 msgstr ""

1547

1523 -#: wt-status.c:870

1548 +#: wt-status.c:921

1549 msgid "The current patch is empty."

1550 msgstr ""

1551

1527 -#: wt-status.c:874

1552 +#: wt-status.c:925

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

1554 msgstr ""

1555

1531 -#: wt-status.c:876

1556 +#: wt-status.c:927

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

1558 msgstr ""

1559

1535 -#: wt-status.c:878

1560 +#: wt-status.c:929

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

1562 msgstr ""

1563

1539 -#: wt-status.c:938 wt-status.c:955

1564 +#: wt-status.c:989 wt-status.c:1006

1565 #, c-format

1566 msgid "You are currently rebasing branch '%s' on '%s'."

1567 msgstr ""

1568

1544 -#: wt-status.c:943 wt-status.c:960

1569 +#: wt-status.c:994 wt-status.c:1011

1570 msgid "You are currently rebasing."

1571 msgstr ""

1572

1548 -#: wt-status.c:946

1573 +#: wt-status.c:997

1574 msgid " (fix conflicts and then run \"git rebase --continue\")"

1575 msgstr ""

1576

1552 -#: wt-status.c:948

1577 +#: wt-status.c:999

1578 msgid " (use \"git rebase --skip\" to skip this patch)"

1579 msgstr ""

1580

1556 -#: wt-status.c:950

1581 +#: wt-status.c:1001

1582 msgid " (use \"git rebase --abort\" to check out the original branch)"

1583 msgstr ""

1584

1560 -#: wt-status.c:963

1585 +#: wt-status.c:1014

1586 msgid " (all conflicts fixed: run \"git rebase --continue\")"

1587 msgstr ""

1588

1564 -#: wt-status.c:967

1589 +#: wt-status.c:1018

1590 #, c-format

1591 msgid ""

1592 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

1593 msgstr ""

1594

1570 -#: wt-status.c:972

1595 +#: wt-status.c:1023

1596 msgid "You are currently splitting a commit during a rebase."

1597 msgstr ""

1598

1574 -#: wt-status.c:975

1599 +#: wt-status.c:1026

1600 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

1601 msgstr ""

1602

1578 -#: wt-status.c:979

1603 +#: wt-status.c:1030

1604 #, c-format

1605 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

1606 msgstr ""

1607

1583 -#: wt-status.c:984

1608 +#: wt-status.c:1035

1609 msgid "You are currently editing a commit during a rebase."

1610 msgstr ""

1611

1587 -#: wt-status.c:987

1612 +#: wt-status.c:1038

1613 msgid " (use \"git commit --amend\" to amend the current commit)"

1614 msgstr ""

1615

1591 -#: wt-status.c:989

1616 +#: wt-status.c:1040

1617 msgid ""

1618 " (use \"git rebase --continue\" once you are satisfied with your changes)"

1619 msgstr ""

1620

1596 -#: wt-status.c:999

1621 +#: wt-status.c:1050

1622 #, c-format

1623 msgid "You are currently cherry-picking commit %s."

1624 msgstr ""

1625

1601 -#: wt-status.c:1004

1626 +#: wt-status.c:1055

1627 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

1628 msgstr ""

1629

1605 -#: wt-status.c:1007

1630 +#: wt-status.c:1058

1631 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

1632 msgstr ""

1633

1609 -#: wt-status.c:1009

1634 +#: wt-status.c:1060

1635 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

1636 msgstr ""

1637

1613 -#: wt-status.c:1018

1638 +#: wt-status.c:1069

1639 #, c-format

1640 msgid "You are currently reverting commit %s."

1641 msgstr ""

1642

1618 -#: wt-status.c:1023

1643 +#: wt-status.c:1074

1644 msgid " (fix conflicts and run \"git revert --continue\")"

1645 msgstr ""

1646

1622 -#: wt-status.c:1026

1647 +#: wt-status.c:1077

1648 msgid " (all conflicts fixed: run \"git revert --continue\")"

1649 msgstr ""

1650

1626 -#: wt-status.c:1028

1651 +#: wt-status.c:1079

1652 msgid " (use \"git revert --abort\" to cancel the revert operation)"

1653 msgstr ""

1654

1630 -#: wt-status.c:1039

1655 +#: wt-status.c:1090

1656 #, c-format

1657 msgid "You are currently bisecting, started from branch '%s'."

1658 msgstr ""

1659

1635 -#: wt-status.c:1043

1660 +#: wt-status.c:1094

1661 msgid "You are currently bisecting."

1662 msgstr ""

1663

1639 -#: wt-status.c:1046

1664 +#: wt-status.c:1097

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

1666 msgstr ""

1667

1643 -#: wt-status.c:1221

1668 +#: wt-status.c:1272

1669 msgid "On branch "

1670 msgstr ""

1671

1647 -#: wt-status.c:1228

1672 +#: wt-status.c:1279

1673 msgid "rebase in progress; onto "

1674 msgstr ""

1675

1651 -#: wt-status.c:1235

1676 +#: wt-status.c:1286

1677 msgid "HEAD detached at "

1678 msgstr ""

1679

1655 -#: wt-status.c:1237

1680 +#: wt-status.c:1288

1681 msgid "HEAD detached from "

1682 msgstr ""

1683

1659 -#: wt-status.c:1240

1684 +#: wt-status.c:1291

1685 msgid "Not currently on any branch."

1686 msgstr ""

1687

1663 -#: wt-status.c:1257

1688 +#: wt-status.c:1308

1689 msgid "Initial commit"

1690 msgstr ""

1691

1667 -#: wt-status.c:1271

1692 +#: wt-status.c:1322

1693 msgid "Untracked files"

1694 msgstr ""

1695

1671 -#: wt-status.c:1273

1696 +#: wt-status.c:1324

1697 msgid "Ignored files"

1698 msgstr ""

1699

1675 -#: wt-status.c:1277

1700 +#: wt-status.c:1328

1701 #, c-format

1702 msgid ""

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

@@ -1680,86 +1705,86 @@ msgid ""

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

1706 msgstr ""

1707

1683 -#: wt-status.c:1283

1708 +#: wt-status.c:1334

1709 #, c-format

1710 msgid "Untracked files not listed%s"

1711 msgstr ""

1712

1688 -#: wt-status.c:1285

1713 +#: wt-status.c:1336

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

1715 msgstr ""

1716

1692 -#: wt-status.c:1291

1717 +#: wt-status.c:1342

1718 msgid "No changes"

1719 msgstr ""

1720

1696 -#: wt-status.c:1296

1721 +#: wt-status.c:1347

1722 #, c-format

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

1724 msgstr ""

1725

1701 -#: wt-status.c:1299

1726 +#: wt-status.c:1350

1727 #, c-format

1728 msgid "no changes added to commit\n"

1729 msgstr ""

1730

1706 -#: wt-status.c:1302

1731 +#: wt-status.c:1353

1732 #, c-format

1733 msgid ""

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

1735 "track)\n"

1736 msgstr ""

1737

1713 -#: wt-status.c:1305

1738 +#: wt-status.c:1356

1739 #, c-format

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

1741 msgstr ""

1742

1718 -#: wt-status.c:1308

1743 +#: wt-status.c:1359

1744 #, c-format

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

1746 msgstr ""

1747

1723 -#: wt-status.c:1311 wt-status.c:1316

1748 +#: wt-status.c:1362 wt-status.c:1367

1749 #, c-format

1750 msgid "nothing to commit\n"

1751 msgstr ""

1752

1728 -#: wt-status.c:1314

1753 +#: wt-status.c:1365

1754 #, c-format

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

1756 msgstr ""

1757

1733 -#: wt-status.c:1318

1758 +#: wt-status.c:1369

1759 #, c-format

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

1761 msgstr ""

1762

1738 -#: wt-status.c:1427

1763 +#: wt-status.c:1478

1764 msgid "HEAD (no branch)"

1765 msgstr ""

1766

1742 -#: wt-status.c:1433

1767 +#: wt-status.c:1484

1768 msgid "Initial commit on "

1769 msgstr ""

1770

1746 -#: wt-status.c:1463

1771 +#: wt-status.c:1514

1772 msgid "gone"

1773 msgstr ""

1774

1750 -#: wt-status.c:1465

1775 +#: wt-status.c:1516

1776 msgid "behind "

1777 msgstr ""

1778

1754 -#: wt-status.c:1468 wt-status.c:1471

1779 +#: wt-status.c:1519 wt-status.c:1522

1780 msgid "ahead "

1781 msgstr ""

1782

1758 -#: wt-status.c:1473

1783 +#: wt-status.c:1524

1784 msgid ", behind "

1785 msgstr ""

1786

1762 -#: compat/precompose_utf8.c:55 builtin/clone.c:350

1787 +#: compat/precompose_utf8.c:55 builtin/clone.c:356

1788 #, c-format

1789 msgid "failed to unlink '%s'"

1790 msgstr ""

@@ -1863,15 +1888,15 @@ msgstr ""

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

1889 msgstr ""

1890

1866 -#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66

1867 -#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253

1891 +#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70

1892 +#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344

1893 #: builtin/rm.c:269

1894 msgid "dry run"

1895 msgstr ""

1896

1897 #: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19

1898 #: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612

1874 -#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113

1899 +#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113

1900 msgid "be verbose"

1901 msgstr ""

1902

@@ -1952,11 +1977,11 @@ msgid "Maybe you wanted to say 'git add .'?\n"

1977 msgstr ""

1978

1979 #: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919

1955 -#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299

1980 +#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299

1981 msgid "index file corrupt"

1982 msgstr ""

1983

1959 -#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432

1984 +#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432

1985 msgid "Unable to write new index file"

1986 msgstr ""

1987

@@ -2283,7 +2308,7 @@ msgid "unable to read index file"

2308 msgstr ""

2309

2310 #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90

2286 -#: builtin/fetch.c:77

2311 +#: builtin/fetch.c:78

2312 msgid "path"

2313 msgstr ""

2314

@@ -2481,95 +2506,95 @@ msgstr ""

2506 msgid "[rev-opts] are documented in git-rev-list(1)"

2507 msgstr ""

2508

2484 -#: builtin/blame.c:2248

2509 +#: builtin/blame.c:2249

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

2511 msgstr ""

2512

2488 -#: builtin/blame.c:2249

2513 +#: builtin/blame.c:2250

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

2515 msgstr ""

2516

2492 -#: builtin/blame.c:2250

2517 +#: builtin/blame.c:2251

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

2519 msgstr ""

2520

2496 -#: builtin/blame.c:2251

2521 +#: builtin/blame.c:2252

2522 msgid "Show work cost statistics"

2523 msgstr ""

2524

2500 -#: builtin/blame.c:2252

2525 +#: builtin/blame.c:2253

2526 msgid "Show output score for blame entries"

2527 msgstr ""

2528

2504 -#: builtin/blame.c:2253

2529 +#: builtin/blame.c:2254

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

2531 msgstr ""

2532

2508 -#: builtin/blame.c:2254

2533 +#: builtin/blame.c:2255

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

2535 msgstr ""

2536

2512 -#: builtin/blame.c:2255

2537 +#: builtin/blame.c:2256

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

2539 msgstr ""

2540

2516 -#: builtin/blame.c:2256

2541 +#: builtin/blame.c:2257

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

2543 msgstr ""

2544

2520 -#: builtin/blame.c:2257

2545 +#: builtin/blame.c:2258

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

2547 msgstr ""

2548

2524 -#: builtin/blame.c:2258

2549 +#: builtin/blame.c:2259

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

2551 msgstr ""

2552

2528 -#: builtin/blame.c:2259

2553 +#: builtin/blame.c:2260

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

2555 msgstr ""

2556

2532 -#: builtin/blame.c:2260

2557 +#: builtin/blame.c:2261

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

2559 msgstr ""

2560

2536 -#: builtin/blame.c:2261

2561 +#: builtin/blame.c:2262

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

2563 msgstr ""

2564

2540 -#: builtin/blame.c:2262

2565 +#: builtin/blame.c:2263

2566 msgid "Ignore whitespace differences"

2567 msgstr ""

2568

2544 -#: builtin/blame.c:2263

2569 +#: builtin/blame.c:2264

2570 msgid "Spend extra cycles to find better match"

2571 msgstr ""

2572

2548 -#: builtin/blame.c:2264

2573 +#: builtin/blame.c:2265

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

2575 msgstr ""

2576

2552 -#: builtin/blame.c:2265

2577 +#: builtin/blame.c:2266

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

2579 msgstr ""

2580

2556 -#: builtin/blame.c:2266 builtin/blame.c:2267

2581 +#: builtin/blame.c:2267 builtin/blame.c:2268

2582 msgid "score"

2583 msgstr ""

2584

2560 -#: builtin/blame.c:2266

2585 +#: builtin/blame.c:2267

2586 msgid "Find line copies within and across files"

2587 msgstr ""

2588

2564 -#: builtin/blame.c:2267

2589 +#: builtin/blame.c:2268

2590 msgid "Find line movements within and across files"

2591 msgstr ""

2592

2568 -#: builtin/blame.c:2268

2593 +#: builtin/blame.c:2269

2594 msgid "n,m"

2595 msgstr ""

2596

2572 -#: builtin/blame.c:2268

2597 +#: builtin/blame.c:2269

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

2599 msgstr ""

2600

@@ -2667,292 +2692,292 @@ msgstr ""

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

2693 msgstr ""

2694

2670 -#: builtin/branch.c:453

2695 +#: builtin/branch.c:454

2696 #, c-format

2697 msgid "[%s: gone]"

2698 msgstr ""

2699

2675 -#: builtin/branch.c:456

2700 +#: builtin/branch.c:459

2701 #, c-format

2702 msgid "[%s]"

2703 msgstr ""

2704

2680 -#: builtin/branch.c:459

2705 +#: builtin/branch.c:464

2706 #, c-format

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

2708 msgstr ""

2709

2685 -#: builtin/branch.c:461

2710 +#: builtin/branch.c:466

2711 #, c-format

2712 msgid "[behind %d]"

2713 msgstr ""

2714

2690 -#: builtin/branch.c:465

2715 +#: builtin/branch.c:470

2716 #, c-format

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

2718 msgstr ""

2719

2695 -#: builtin/branch.c:467

2720 +#: builtin/branch.c:472

2721 #, c-format

2722 msgid "[ahead %d]"

2723 msgstr ""

2724

2700 -#: builtin/branch.c:470

2725 +#: builtin/branch.c:475

2726 #, c-format

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

2728 msgstr ""

2729

2705 -#: builtin/branch.c:473

2730 +#: builtin/branch.c:478

2731 #, c-format

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

2733 msgstr ""

2734

2710 -#: builtin/branch.c:496

2735 +#: builtin/branch.c:502

2736 msgid " **** invalid ref ****"

2737 msgstr ""

2738

2714 -#: builtin/branch.c:588

2739 +#: builtin/branch.c:594

2740 #, c-format

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

2742 msgstr ""

2743

2719 -#: builtin/branch.c:591

2744 +#: builtin/branch.c:597

2745 #, c-format

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

2747 msgstr ""

2748

2724 -#: builtin/branch.c:594

2749 +#: builtin/branch.c:600

2750 #, c-format

2751 msgid "(detached from %s)"

2752 msgstr ""

2753

2729 -#: builtin/branch.c:597

2754 +#: builtin/branch.c:603

2755 msgid "(no branch)"

2756 msgstr ""

2757

2733 -#: builtin/branch.c:643

2758 +#: builtin/branch.c:649

2759 #, c-format

2760 msgid "object '%s' does not point to a commit"

2761 msgstr ""

2762

2738 -#: builtin/branch.c:675

2763 +#: builtin/branch.c:681

2764 msgid "some refs could not be read"

2765 msgstr ""

2766

2742 -#: builtin/branch.c:688

2767 +#: builtin/branch.c:694

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

2769 msgstr ""

2770

2746 -#: builtin/branch.c:698

2771 +#: builtin/branch.c:704

2772 #, c-format

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

2774 msgstr ""

2775

2751 -#: builtin/branch.c:713

2776 +#: builtin/branch.c:719

2777 msgid "Branch rename failed"

2778 msgstr ""

2779

2755 -#: builtin/branch.c:717

2780 +#: builtin/branch.c:723

2781 #, c-format

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

2783 msgstr ""

2784

2760 -#: builtin/branch.c:721

2785 +#: builtin/branch.c:727

2786 #, c-format

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

2788 msgstr ""

2789

2765 -#: builtin/branch.c:728

2790 +#: builtin/branch.c:734

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

2792 msgstr ""

2793

2769 -#: builtin/branch.c:743

2794 +#: builtin/branch.c:749

2795 #, c-format

2796 msgid "malformed object name %s"

2797 msgstr ""

2798

2774 -#: builtin/branch.c:767

2799 +#: builtin/branch.c:773

2800 #, c-format

2801 msgid "could not write branch description template: %s"

2802 msgstr ""

2803

2779 -#: builtin/branch.c:797

2804 +#: builtin/branch.c:803

2805 msgid "Generic options"

2806 msgstr ""

2807

2783 -#: builtin/branch.c:799

2808 +#: builtin/branch.c:805

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

2810 msgstr ""

2811

2787 -#: builtin/branch.c:800

2812 +#: builtin/branch.c:806

2813 msgid "suppress informational messages"

2814 msgstr ""

2815

2791 -#: builtin/branch.c:801

2816 +#: builtin/branch.c:807

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

2818 msgstr ""

2819

2795 -#: builtin/branch.c:803

2820 +#: builtin/branch.c:809

2821 msgid "change upstream info"

2822 msgstr ""

2823

2799 -#: builtin/branch.c:807

2824 +#: builtin/branch.c:813

2825 msgid "use colored output"

2826 msgstr ""

2827

2803 -#: builtin/branch.c:808

2828 +#: builtin/branch.c:814

2829 msgid "act on remote-tracking branches"

2830 msgstr ""

2831

2807 -#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838

2808 -#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461

2832 +#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844

2833 +#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461

2834 #: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468

2835 msgid "commit"

2836 msgstr ""

2837

2813 -#: builtin/branch.c:812 builtin/branch.c:818

2838 +#: builtin/branch.c:818 builtin/branch.c:824

2839 msgid "print only branches that contain the commit"

2840 msgstr ""

2841

2817 -#: builtin/branch.c:824

2842 +#: builtin/branch.c:830

2843 msgid "Specific git-branch actions:"

2844 msgstr ""

2845

2821 -#: builtin/branch.c:825

2846 +#: builtin/branch.c:831

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

2848 msgstr ""

2849

2825 -#: builtin/branch.c:827

2850 +#: builtin/branch.c:833

2851 msgid "delete fully merged branch"

2852 msgstr ""

2853

2829 -#: builtin/branch.c:828

2854 +#: builtin/branch.c:834

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

2856 msgstr ""

2857

2833 -#: builtin/branch.c:829

2858 +#: builtin/branch.c:835

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

2860 msgstr ""

2861

2837 -#: builtin/branch.c:830

2862 +#: builtin/branch.c:836

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

2864 msgstr ""

2865

2841 -#: builtin/branch.c:831

2866 +#: builtin/branch.c:837

2867 msgid "list branch names"

2868 msgstr ""

2869

2845 -#: builtin/branch.c:832

2870 +#: builtin/branch.c:838

2871 msgid "create the branch's reflog"

2872 msgstr ""

2873

2849 -#: builtin/branch.c:834

2874 +#: builtin/branch.c:840

2875 msgid "edit the description for the branch"

2876 msgstr ""

2877

2853 -#: builtin/branch.c:835

2878 +#: builtin/branch.c:841

2879 msgid "force creation (when already exists)"

2880 msgstr ""

2881

2857 -#: builtin/branch.c:838

2882 +#: builtin/branch.c:844

2883 msgid "print only not merged branches"

2884 msgstr ""

2885

2861 -#: builtin/branch.c:844

2886 +#: builtin/branch.c:850

2887 msgid "print only merged branches"

2888 msgstr ""

2889

2865 -#: builtin/branch.c:848

2890 +#: builtin/branch.c:854

2891 msgid "list branches in columns"

2892 msgstr ""

2893

2869 -#: builtin/branch.c:861

2894 +#: builtin/branch.c:867

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

2896 msgstr ""

2897

2873 -#: builtin/branch.c:866 builtin/clone.c:629

2898 +#: builtin/branch.c:872 builtin/clone.c:635

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

2900 msgstr ""

2901

2877 -#: builtin/branch.c:890

2902 +#: builtin/branch.c:896

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

2904 msgstr ""

2905

2881 -#: builtin/branch.c:896 builtin/branch.c:935

2906 +#: builtin/branch.c:902 builtin/branch.c:941

2907 msgid "branch name required"

2908 msgstr ""

2909

2885 -#: builtin/branch.c:911

2910 +#: builtin/branch.c:917

2911 msgid "Cannot give description to detached HEAD"

2912 msgstr ""

2913

2889 -#: builtin/branch.c:916

2914 +#: builtin/branch.c:922

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

2916 msgstr ""

2917

2893 -#: builtin/branch.c:923

2918 +#: builtin/branch.c:929

2919 #, c-format

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

2921 msgstr ""

2922

2898 -#: builtin/branch.c:926

2923 +#: builtin/branch.c:932

2924 #, c-format

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

2926 msgstr ""

2927

2903 -#: builtin/branch.c:941

2928 +#: builtin/branch.c:947

2929 msgid "too many branches for a rename operation"

2930 msgstr ""

2931

2907 -#: builtin/branch.c:946

2932 +#: builtin/branch.c:952

2933 msgid "too many branches to set new upstream"

2934 msgstr ""

2935

2911 -#: builtin/branch.c:950

2936 +#: builtin/branch.c:956

2937 #, c-format

2938 msgid ""

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

2940 msgstr ""

2941

2917 -#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997

2942 +#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002

2943 #, c-format

2944 msgid "no such branch '%s'"

2945 msgstr ""

2946

2922 -#: builtin/branch.c:957

2947 +#: builtin/branch.c:963

2948 #, c-format

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

2950 msgstr ""

2951

2927 -#: builtin/branch.c:969

2952 +#: builtin/branch.c:975

2953 msgid "too many branches to unset upstream"

2954 msgstr ""

2955

2931 -#: builtin/branch.c:973

2956 +#: builtin/branch.c:979

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

2958 msgstr ""

2959

2935 -#: builtin/branch.c:979

2960 +#: builtin/branch.c:985

2961 #, c-format

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

2963 msgstr ""

2964

2940 -#: builtin/branch.c:994

2965 +#: builtin/branch.c:999

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

2967 msgstr ""

2968

2944 -#: builtin/branch.c:1000

2969 +#: builtin/branch.c:1005

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

2971 msgstr ""

2972

2948 -#: builtin/branch.c:1003

2973 +#: builtin/branch.c:1008

2974 #, c-format

2975 msgid ""

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

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

2978 msgstr ""

2979

2955 -#: builtin/branch.c:1020

2980 +#: builtin/branch.c:1025

2981 #, c-format

2982 msgid ""

2983 "\n"

@@ -2960,12 +2985,12 @@ msgid ""

2985 "\n"

2986 msgstr ""

2987

2963 -#: builtin/branch.c:1021

2988 +#: builtin/branch.c:1026

2989 #, c-format

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

2991 msgstr ""

2992

2968 -#: builtin/branch.c:1022

2993 +#: builtin/branch.c:1027

2994 #, c-format

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

2996 msgstr ""

@@ -2983,43 +3008,43 @@ msgstr ""

3008 msgid "Need a repository to unbundle."

3009 msgstr ""

3010

2986 -#: builtin/cat-file.c:312

3011 +#: builtin/cat-file.c:328

3012 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"

3013 msgstr ""

3014

2990 -#: builtin/cat-file.c:313

3015 +#: builtin/cat-file.c:329

3016 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"

3017 msgstr ""

3018

2994 -#: builtin/cat-file.c:350

3019 +#: builtin/cat-file.c:366

3020 msgid "<type> can be one of: blob, tree, commit, tag"

3021 msgstr ""

3022

2998 -#: builtin/cat-file.c:351

3023 +#: builtin/cat-file.c:367

3024 msgid "show object type"

3025 msgstr ""

3026

3002 -#: builtin/cat-file.c:352

3027 +#: builtin/cat-file.c:368

3028 msgid "show object size"

3029 msgstr ""

3030

3006 -#: builtin/cat-file.c:354

3031 +#: builtin/cat-file.c:370

3032 msgid "exit with zero when there's no error"

3033 msgstr ""

3034

3010 -#: builtin/cat-file.c:355

3035 +#: builtin/cat-file.c:371

3036 msgid "pretty-print object's content"

3037 msgstr ""

3038

3014 -#: builtin/cat-file.c:357

3039 +#: builtin/cat-file.c:373

3040 msgid "for blob objects, run textconv on object's content"

3041 msgstr ""

3042

3018 -#: builtin/cat-file.c:359

3043 +#: builtin/cat-file.c:375

3044 msgid "show info and content of objects fed from the standard input"

3045 msgstr ""

3046

3022 -#: builtin/cat-file.c:362

3047 +#: builtin/cat-file.c:378

3048 msgid "show info about objects fed from the standard input"

3049 msgstr ""

3050

@@ -3047,7 +3072,7 @@ msgstr ""

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

3073 msgstr ""

3074

3050 -#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259

3075 +#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260

3076 msgid "suppress progress reporting"

3077 msgstr ""

3078

@@ -3325,7 +3350,7 @@ msgid "Cannot switch branch to a non-commit '%s'"

3350 msgstr ""

3351

3352 #: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88

3328 -#: builtin/remote.c:169 builtin/remote.c:171

3353 +#: builtin/remote.c:159 builtin/remote.c:161

3354 msgid "branch"

3355 msgstr ""

3356

@@ -3373,11 +3398,11 @@ msgstr ""

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

3399 msgstr ""

3400

3376 -#: builtin/checkout.c:1106 builtin/merge.c:232

3401 +#: builtin/checkout.c:1106 builtin/merge.c:225

3402 msgid "update ignored files (default)"

3403 msgstr ""

3404

3380 -#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251

3405 +#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248

3406 msgid "style"

3407 msgstr ""

3408

@@ -3551,7 +3576,7 @@ msgid "remove whole directories"

3576 msgstr ""

3577

3578 #: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718

3554 -#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185

3579 +#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185

3580 msgid "pattern"

3581 msgstr ""

3582

@@ -3587,8 +3612,8 @@ msgstr ""

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

3613 msgstr ""

3614

3590 -#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229

3591 -#: builtin/push.c:474

3615 +#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222

3616 +#: builtin/push.c:521

3617 msgid "force progress reporting"

3618 msgstr ""

3619

@@ -3648,7 +3673,7 @@ msgstr ""

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

3674 msgstr ""

3675

3651 -#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663

3676 +#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663

3677 msgid "depth"

3678 msgstr ""

3679

@@ -3681,141 +3706,160 @@ msgstr ""

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

3707 msgstr ""

3708

3684 -#: builtin/clone.c:315

3709 +#: builtin/clone.c:256

3710 +#, c-format

3711 +msgid "reference repository '%s' is shallow"

3712 +msgstr ""

3713 +

3714 +#: builtin/clone.c:259

3715 +#, c-format

3716 +msgid "reference repository '%s' is grafted"

3717 +msgstr ""

3718 +

3719 +#: builtin/clone.c:321

3720 #, c-format

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

3722 msgstr ""

3723

3689 -#: builtin/clone.c:317 builtin/diff.c:77

3724 +#: builtin/clone.c:323 builtin/diff.c:83

3725 #, c-format

3726 msgid "failed to stat '%s'"

3727 msgstr ""

3728

3694 -#: builtin/clone.c:319

3729 +#: builtin/clone.c:325

3730 #, c-format

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

3732 msgstr ""

3733

3699 -#: builtin/clone.c:333

3734 +#: builtin/clone.c:339

3735 #, c-format

3736 msgid "failed to stat %s\n"

3737 msgstr ""

3738

3704 -#: builtin/clone.c:355

3739 +#: builtin/clone.c:361

3740 #, c-format

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

3742 msgstr ""

3743

3709 -#: builtin/clone.c:359

3744 +#: builtin/clone.c:365

3745 #, c-format

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

3747 msgstr ""

3748

3714 -#: builtin/clone.c:382 builtin/clone.c:559

3749 +#: builtin/clone.c:388 builtin/clone.c:565

3750 #, c-format

3751 msgid "done.\n"

3752 msgstr ""

3753

3719 -#: builtin/clone.c:395

3754 +#: builtin/clone.c:401

3755 msgid ""

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

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

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

3759 msgstr ""

3760

3726 -#: builtin/clone.c:474

3761 +#: builtin/clone.c:480

3762 #, c-format

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

3764 msgstr ""

3765

3731 -#: builtin/clone.c:554

3766 +#: builtin/clone.c:560

3767 #, c-format

3768 msgid "Checking connectivity... "

3769 msgstr ""

3770

3736 -#: builtin/clone.c:557

3771 +#: builtin/clone.c:563

3772 msgid "remote did not send all necessary objects"

3773 msgstr ""

3774

3740 -#: builtin/clone.c:620

3775 +#: builtin/clone.c:626

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

3777 msgstr ""

3778

3744 -#: builtin/clone.c:651

3779 +#: builtin/clone.c:657

3780 msgid "unable to checkout working tree"

3781 msgstr ""

3782

3748 -#: builtin/clone.c:759

3783 +#: builtin/clone.c:765

3784 msgid "Too many arguments."

3785 msgstr ""

3786

3752 -#: builtin/clone.c:763

3787 +#: builtin/clone.c:769

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

3789 msgstr ""

3790

3756 -#: builtin/clone.c:774

3791 +#: builtin/clone.c:780

3792 #, c-format

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

3794 msgstr ""

3795

3761 -#: builtin/clone.c:777

3796 +#: builtin/clone.c:783

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

3798 msgstr ""

3799

3765 -#: builtin/clone.c:790

3800 +#: builtin/clone.c:796

3801 #, c-format

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

3803 msgstr ""

3804

3770 -#: builtin/clone.c:795

3805 +#: builtin/clone.c:802

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

3807 msgstr ""

3808

3774 -#: builtin/clone.c:797

3809 +#: builtin/clone.c:805

3810 +msgid "source repository is shallow, ignoring --local"

3811 +msgstr ""

3812 +

3813 +#: builtin/clone.c:810

3814 msgid "--local is ignored"

3815 msgstr ""

3816

3778 -#: builtin/clone.c:807

3817 +#: builtin/clone.c:814 builtin/fetch.c:1119

3818 +#, c-format

3819 +msgid "depth %s is not a positive number"

3820 +msgstr ""

3821 +

3822 +#: builtin/clone.c:824

3823 #, c-format

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

3825 msgstr ""

3826

3783 -#: builtin/clone.c:817

3827 +#: builtin/clone.c:834

3828 #, c-format

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

3830 msgstr ""

3831

3788 -#: builtin/clone.c:830 builtin/clone.c:842

3832 +#: builtin/clone.c:847 builtin/clone.c:859

3833 #, c-format

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

3835 msgstr ""

3836

3793 -#: builtin/clone.c:833

3837 +#: builtin/clone.c:850

3838 #, c-format

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

3840 msgstr ""

3841

3798 -#: builtin/clone.c:852

3842 +#: builtin/clone.c:869

3843 #, c-format

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

3845 msgstr ""

3846

3803 -#: builtin/clone.c:854

3847 +#: builtin/clone.c:871

3848 #, c-format

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

3850 msgstr ""

3851

3808 -#: builtin/clone.c:888

3852 +#: builtin/clone.c:906

3853 #, c-format

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

3855 msgstr ""

3856

3813 -#: builtin/clone.c:939 builtin/clone.c:947

3857 +#: builtin/clone.c:957 builtin/clone.c:965

3858 #, c-format

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

3860 msgstr ""

3861

3818 -#: builtin/clone.c:950

3862 +#: builtin/clone.c:968

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

3864 msgstr ""

3865

@@ -4126,7 +4170,7 @@ msgstr ""

4170 msgid "show branch information"

4171 msgstr ""

4172

4129 -#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460

4173 +#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507

4174 msgid "machine-readable output"

4175 msgstr ""

4176

@@ -4205,7 +4249,7 @@ msgstr ""

4249 msgid "override author for commit"

4250 msgstr ""

4251

4208 -#: builtin/commit.c:1458 builtin/gc.c:260

4252 +#: builtin/commit.c:1458 builtin/gc.c:261

4253 msgid "date"

4254 msgstr ""

4255

@@ -4213,7 +4257,7 @@ msgstr ""

4257 msgid "override date for commit"

4258 msgstr ""

4259

4216 -#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405

4260 +#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405

4261 #: builtin/notes.c:562 builtin/tag.c:455

4262 msgid "message"

4263 msgstr ""

@@ -4266,11 +4310,11 @@ msgstr ""

4310 msgid "include status in commit message template"

4311 msgstr ""

4312

4269 -#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461

4313 +#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461

4314 msgid "key id"

4315 msgstr ""

4316

4273 -#: builtin/commit.c:1471 builtin/merge.c:231

4317 +#: builtin/commit.c:1471 builtin/merge.c:224

4318 msgid "GPG sign commit"

4319 msgstr ""

4320

@@ -4327,7 +4371,7 @@ msgstr ""

4371 msgid "could not parse HEAD commit"

4372 msgstr ""

4373

4330 -#: builtin/commit.c:1567 builtin/merge.c:525

4374 +#: builtin/commit.c:1567 builtin/merge.c:518

4375 #, c-format

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

4377 msgstr ""

@@ -4346,29 +4390,29 @@ msgstr ""

4390 msgid "could not read commit message: %s"

4391 msgstr ""

4392

4349 -#: builtin/commit.c:1614

4393 +#: builtin/commit.c:1611

4394 #, c-format

4395 msgid "Aborting commit; you did not edit the message.\n"

4396 msgstr ""

4397

4354 -#: builtin/commit.c:1619

4398 +#: builtin/commit.c:1616

4399 #, c-format

4400 msgid "Aborting commit due to empty commit message.\n"

4401 msgstr ""

4402

4359 -#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886

4403 +#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879

4404 msgid "failed to write commit object"

4405 msgstr ""

4406

4363 -#: builtin/commit.c:1655

4407 +#: builtin/commit.c:1652

4408 msgid "cannot lock HEAD ref"

4409 msgstr ""

4410

4367 -#: builtin/commit.c:1659

4411 +#: builtin/commit.c:1656

4412 msgid "cannot update HEAD ref"

4413 msgstr ""

4414

4371 -#: builtin/commit.c:1670

4415 +#: builtin/commit.c:1667

4416 msgid ""

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

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

@@ -4621,7 +4665,7 @@ msgstr ""

4665 msgid "only consider tags matching <pattern>"

4666 msgstr ""

4667

4624 -#: builtin/describe.c:423 builtin/name-rev.c:322

4668 +#: builtin/describe.c:423 builtin/name-rev.c:321

4669 msgid "show abbreviated commit object as fallback"

4670 msgstr ""

4671

@@ -4645,31 +4689,31 @@ msgstr ""

4689 msgid "--dirty is incompatible with commit-ishes"

4690 msgstr ""

4691

4648 -#: builtin/diff.c:79

4692 +#: builtin/diff.c:85

4693 #, c-format

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

4695 msgstr ""

4696

4653 -#: builtin/diff.c:230

4697 +#: builtin/diff.c:236

4698 #, c-format

4699 msgid "invalid option: %s"

4700 msgstr ""

4701

4658 -#: builtin/diff.c:307

4702 +#: builtin/diff.c:357

4703 msgid "Not a git repository"

4704 msgstr ""

4705

4662 -#: builtin/diff.c:350

4706 +#: builtin/diff.c:400

4707 #, c-format

4708 msgid "invalid object '%s' given."

4709 msgstr ""

4710

4667 -#: builtin/diff.c:359

4711 +#: builtin/diff.c:409

4712 #, c-format

4713 msgid "more than two blobs given: '%s'"

4714 msgstr ""

4715

4672 -#: builtin/diff.c:366

4716 +#: builtin/diff.c:416

4717 #, c-format

4718 msgid "unhandled object '%s' given."

4719 msgstr ""

@@ -4730,230 +4774,239 @@ msgstr ""

4774 msgid "git fetch --all [<options>]"

4775 msgstr ""

4776

4733 -#: builtin/fetch.c:74

4777 +#: builtin/fetch.c:75

4778 msgid "fetch from all remotes"

4779 msgstr ""

4780

4737 -#: builtin/fetch.c:76

4781 +#: builtin/fetch.c:77

4782 msgid "append to .git/FETCH_HEAD instead of overwriting"

4783 msgstr ""

4784

4741 -#: builtin/fetch.c:78

4785 +#: builtin/fetch.c:79

4786 msgid "path to upload pack on remote end"

4787 msgstr ""

4788

4745 -#: builtin/fetch.c:79

4789 +#: builtin/fetch.c:80

4790 msgid "force overwrite of local branch"

4791 msgstr ""

4792

4749 -#: builtin/fetch.c:81

4793 +#: builtin/fetch.c:82

4794 msgid "fetch from multiple remotes"

4795 msgstr ""

4796

4753 -#: builtin/fetch.c:83

4797 +#: builtin/fetch.c:84

4798 msgid "fetch all tags and associated objects"

4799 msgstr ""

4800

4757 -#: builtin/fetch.c:85

4801 +#: builtin/fetch.c:86

4802 msgid "do not fetch all tags (--no-tags)"

4803 msgstr ""

4804

4761 -#: builtin/fetch.c:87

4805 +#: builtin/fetch.c:88

4806 msgid "prune remote-tracking branches no longer on remote"

4807 msgstr ""

4808

4765 -#: builtin/fetch.c:88

4809 +#: builtin/fetch.c:89

4810 msgid "on-demand"

4811 msgstr ""

4812

4769 -#: builtin/fetch.c:89

4813 +#: builtin/fetch.c:90

4814 msgid "control recursive fetching of submodules"

4815 msgstr ""

4816

4773 -#: builtin/fetch.c:93

4817 +#: builtin/fetch.c:94

4818 msgid "keep downloaded pack"

4819 msgstr ""

4820

4777 -#: builtin/fetch.c:95

4821 +#: builtin/fetch.c:96

4822 msgid "allow updating of HEAD ref"

4823 msgstr ""

4824

4781 -#: builtin/fetch.c:98

4825 +#: builtin/fetch.c:99

4826 msgid "deepen history of shallow clone"

4827 msgstr ""

4828

4785 -#: builtin/fetch.c:100

4829 +#: builtin/fetch.c:101

4830 msgid "convert to a complete repository"

4831 msgstr ""

4832

4789 -#: builtin/fetch.c:102 builtin/log.c:1197

4833 +#: builtin/fetch.c:103 builtin/log.c:1197

4834 msgid "dir"

4835 msgstr ""

4836

4793 -#: builtin/fetch.c:103

4837 +#: builtin/fetch.c:104

4838 msgid "prepend this to submodule path output"

4839 msgstr ""

4840

4797 -#: builtin/fetch.c:106

4841 +#: builtin/fetch.c:107

4842 msgid "default mode for recursion"

4843 msgstr ""

4844

4801 -#: builtin/fetch.c:236

4845 +#: builtin/fetch.c:109

4846 +msgid "accept refs that update .git/shallow"

4847 +msgstr ""

4848 +

4849 +#: builtin/fetch.c:347

4850 msgid "Couldn't find remote ref HEAD"

4851 msgstr ""

4852

4805 -#: builtin/fetch.c:290

4853 +#: builtin/fetch.c:411

4854 #, c-format

4855 msgid "object %s not found"

4856 msgstr ""

4857

4810 -#: builtin/fetch.c:295

4858 +#: builtin/fetch.c:416

4859 msgid "[up to date]"

4860 msgstr ""

4861

4814 -#: builtin/fetch.c:309

4862 +#: builtin/fetch.c:430

4863 #, c-format

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

4865 msgstr ""

4866

4819 -#: builtin/fetch.c:310 builtin/fetch.c:396

4867 +#: builtin/fetch.c:431 builtin/fetch.c:517

4868 msgid "[rejected]"

4869 msgstr ""

4870

4823 -#: builtin/fetch.c:321

4871 +#: builtin/fetch.c:442

4872 msgid "[tag update]"

4873 msgstr ""

4874

4827 -#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376

4875 +#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497

4876 msgid " (unable to update local ref)"

4877 msgstr ""

4878

4831 -#: builtin/fetch.c:341

4879 +#: builtin/fetch.c:462

4880 msgid "[new tag]"

4881 msgstr ""

4882

4835 -#: builtin/fetch.c:344

4883 +#: builtin/fetch.c:465

4884 msgid "[new branch]"

4885 msgstr ""

4886

4839 -#: builtin/fetch.c:347

4887 +#: builtin/fetch.c:468

4888 msgid "[new ref]"

4889 msgstr ""

4890

4843 -#: builtin/fetch.c:392

4891 +#: builtin/fetch.c:513

4892 msgid "unable to update local ref"

4893 msgstr ""

4894

4847 -#: builtin/fetch.c:392

4895 +#: builtin/fetch.c:513

4896 msgid "forced update"

4897 msgstr ""

4898

4851 -#: builtin/fetch.c:398

4899 +#: builtin/fetch.c:519

4900 msgid "(non-fast-forward)"

4901 msgstr ""

4902

4855 -#: builtin/fetch.c:429 builtin/fetch.c:735

4903 +#: builtin/fetch.c:552 builtin/fetch.c:785

4904 #, c-format

4905 msgid "cannot open %s: %s\n"

4906 msgstr ""

4907

4860 -#: builtin/fetch.c:438

4908 +#: builtin/fetch.c:561

4909 #, c-format

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

4911 msgstr ""

4912

4865 -#: builtin/fetch.c:537

4913 +#: builtin/fetch.c:579

4914 +#, c-format

4915 +msgid "reject %s because shallow roots are not allowed to be updated"

4916 +msgstr ""

4917 +

4918 +#: builtin/fetch.c:667 builtin/fetch.c:750

4919 #, c-format

4920 msgid "From %.*s\n"

4921 msgstr ""

4922

4870 -#: builtin/fetch.c:548

4923 +#: builtin/fetch.c:678

4924 #, c-format

4925 msgid ""

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

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

4928 msgstr ""

4929

4877 -#: builtin/fetch.c:598

4930 +#: builtin/fetch.c:730

4931 #, c-format

4932 msgid " (%s will become dangling)"

4933 msgstr ""

4934

4882 -#: builtin/fetch.c:599

4935 +#: builtin/fetch.c:731

4936 #, c-format

4937 msgid " (%s has become dangling)"

4938 msgstr ""

4939

4887 -#: builtin/fetch.c:606

4940 +#: builtin/fetch.c:755

4941 msgid "[deleted]"

4942 msgstr ""

4943

4891 -#: builtin/fetch.c:607 builtin/remote.c:1055

4944 +#: builtin/fetch.c:756 builtin/remote.c:1050

4945 msgid "(none)"

4946 msgstr ""

4947

4895 -#: builtin/fetch.c:725

4948 +#: builtin/fetch.c:775

4949 #, c-format

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

4951 msgstr ""

4952

4900 -#: builtin/fetch.c:744

4953 +#: builtin/fetch.c:794

4954 #, c-format

4955 msgid "Option \"%s\" value \"%s\" is not valid for %s"

4956 msgstr ""

4957

4905 -#: builtin/fetch.c:747

4958 +#: builtin/fetch.c:797

4959 #, c-format

4960 msgid "Option \"%s\" is ignored for %s\n"

4961 msgstr ""

4962

4910 -#: builtin/fetch.c:801

4963 +#: builtin/fetch.c:853

4964 #, c-format

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

4966 msgstr ""

4967

4915 -#: builtin/fetch.c:976

4968 +#: builtin/fetch.c:1015

4969 #, c-format

4970 msgid "Fetching %s\n"

4971 msgstr ""

4972

4920 -#: builtin/fetch.c:978 builtin/remote.c:100

4973 +#: builtin/fetch.c:1017 builtin/remote.c:90

4974 #, c-format

4975 msgid "Could not fetch %s"

4976 msgstr ""

4977

4925 -#: builtin/fetch.c:997

4978 +#: builtin/fetch.c:1036

4979 msgid ""

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

4981 "remote name from which new revisions should be fetched."

4982 msgstr ""

4983

4931 -#: builtin/fetch.c:1020

4984 +#: builtin/fetch.c:1059

4985 msgid "You need to specify a tag name."

4986 msgstr ""

4987

4935 -#: builtin/fetch.c:1068

4988 +#: builtin/fetch.c:1107

4989 msgid "--depth and --unshallow cannot be used together"

4990 msgstr ""

4991

4939 -#: builtin/fetch.c:1070

4992 +#: builtin/fetch.c:1109

4993 msgid "--unshallow on a complete repository does not make sense"

4994 msgstr ""

4995

4943 -#: builtin/fetch.c:1089

4996 +#: builtin/fetch.c:1132

4997 msgid "fetch --all does not take a repository argument"

4998 msgstr ""

4999

4947 -#: builtin/fetch.c:1091

5000 +#: builtin/fetch.c:1134

5001 msgid "fetch --all does not make sense with refspecs"

5002 msgstr ""

5003

4951 -#: builtin/fetch.c:1102

5004 +#: builtin/fetch.c:1145

5005 #, c-format

5006 msgid "No such remote or remote group: %s"

5007 msgstr ""

5008

4956 -#: builtin/fetch.c:1110

5009 +#: builtin/fetch.c:1153

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

5011 msgstr ""

5012

@@ -4962,8 +5015,8 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5015 msgstr ""

5016

5017 #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702

4965 -#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178

4966 -#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245

5018 +#: builtin/merge.c:196 builtin/show-branch.c:654 builtin/show-ref.c:178

5019 +#: builtin/tag.c:446 parse-options.h:135 parse-options.h:242

5020 msgid "n"

5021 msgstr ""

5022

@@ -4987,43 +5040,43 @@ msgstr ""

5040 msgid "file to read from"

5041 msgstr ""

5042

4990 -#: builtin/for-each-ref.c:995

5043 +#: builtin/for-each-ref.c:1063

5044 msgid "git for-each-ref [options] [<pattern>]"

5045 msgstr ""

5046

4994 -#: builtin/for-each-ref.c:1010

5047 +#: builtin/for-each-ref.c:1078

5048 msgid "quote placeholders suitably for shells"

5049 msgstr ""

5050

4998 -#: builtin/for-each-ref.c:1012

5051 +#: builtin/for-each-ref.c:1080

5052 msgid "quote placeholders suitably for perl"

5053 msgstr ""

5054

5002 -#: builtin/for-each-ref.c:1014

5055 +#: builtin/for-each-ref.c:1082

5056 msgid "quote placeholders suitably for python"

5057 msgstr ""

5058

5006 -#: builtin/for-each-ref.c:1016

5059 +#: builtin/for-each-ref.c:1084

5060 msgid "quote placeholders suitably for tcl"

5061 msgstr ""

5062

5010 -#: builtin/for-each-ref.c:1019

5063 +#: builtin/for-each-ref.c:1087

5064 msgid "show only <n> matched refs"

5065 msgstr ""

5066

5014 -#: builtin/for-each-ref.c:1020

5067 +#: builtin/for-each-ref.c:1088 builtin/replace.c:177

5068 msgid "format"

5069 msgstr ""

5070

5018 -#: builtin/for-each-ref.c:1020

5071 +#: builtin/for-each-ref.c:1088

5072 msgid "format to use for the output"

5073 msgstr ""

5074

5022 -#: builtin/for-each-ref.c:1021

5075 +#: builtin/for-each-ref.c:1089

5076 msgid "key"

5077 msgstr ""

5078

5026 -#: builtin/for-each-ref.c:1022

5079 +#: builtin/for-each-ref.c:1090

5080 msgid "field name to sort on"

5081 msgstr ""

5082

@@ -5067,41 +5120,41 @@ msgstr ""

5120 msgid "write dangling objects in .git/lost-found"

5121 msgstr ""

5122

5070 -#: builtin/fsck.c:623 builtin/prune.c:134

5123 +#: builtin/fsck.c:623 builtin/prune.c:144

5124 msgid "show progress"

5125 msgstr ""

5126

5074 -#: builtin/gc.c:23

5127 +#: builtin/gc.c:24

5128 msgid "git gc [options]"

5129 msgstr ""

5130

5078 -#: builtin/gc.c:79

5131 +#: builtin/gc.c:80

5132 #, c-format

5133 msgid "Invalid %s: '%s'"

5134 msgstr ""

5135

5083 -#: builtin/gc.c:106

5136 +#: builtin/gc.c:107

5137 #, c-format

5138 msgid "insanely long object directory %.*s"

5139 msgstr ""

5140

5088 -#: builtin/gc.c:261

5141 +#: builtin/gc.c:262

5142 msgid "prune unreferenced objects"

5143 msgstr ""

5144

5092 -#: builtin/gc.c:263

5145 +#: builtin/gc.c:264

5146 msgid "be more thorough (increased runtime)"

5147 msgstr ""

5148

5096 -#: builtin/gc.c:264

5149 +#: builtin/gc.c:265

5150 msgid "enable auto-gc mode"

5151 msgstr ""

5152

5100 -#: builtin/gc.c:265

5153 +#: builtin/gc.c:266

5154 msgid "force running gc even if there may be another gc running"

5155 msgstr ""

5156

5104 -#: builtin/gc.c:305

5157 +#: builtin/gc.c:306

5158 #, c-format

5159 msgid ""

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

@@ -5109,13 +5162,13 @@ msgid ""

5162 msgstr ""

5163

5164 #. be quiet on --auto

5112 -#: builtin/gc.c:315

5165 +#: builtin/gc.c:316

5166 #, c-format

5167 msgid ""

5168 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

5169 msgstr ""

5170

5118 -#: builtin/gc.c:340

5171 +#: builtin/gc.c:341

5172 msgid ""

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

5174 msgstr ""

@@ -5445,57 +5498,57 @@ msgid ""

5498 "Please consider using 'man.<tool>.path' instead."

5499 msgstr ""

5500

5448 -#: builtin/help.c:349

5501 +#: builtin/help.c:353

5502 #, c-format

5503 msgid "'%s': unknown man viewer."

5504 msgstr ""

5505

5453 -#: builtin/help.c:366

5506 +#: builtin/help.c:370

5507 msgid "no man viewer handled the request"

5508 msgstr ""

5509

5457 -#: builtin/help.c:374

5510 +#: builtin/help.c:378

5511 msgid "no info viewer handled the request"

5512 msgstr ""

5513

5461 -#: builtin/help.c:420

5514 +#: builtin/help.c:424

5515 msgid "Defining attributes per path"

5516 msgstr ""

5517

5465 -#: builtin/help.c:421

5518 +#: builtin/help.c:425

5519 msgid "A Git glossary"

5520 msgstr ""

5521

5469 -#: builtin/help.c:422

5522 +#: builtin/help.c:426

5523 msgid "Specifies intentionally untracked files to ignore"

5524 msgstr ""

5525

5473 -#: builtin/help.c:423

5526 +#: builtin/help.c:427

5527 msgid "Defining submodule properties"

5528 msgstr ""

5529

5477 -#: builtin/help.c:424

5530 +#: builtin/help.c:428

5531 msgid "Specifying revisions and ranges for Git"

5532 msgstr ""

5533

5481 -#: builtin/help.c:425

5534 +#: builtin/help.c:429

5535 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

5536 msgstr ""

5537

5485 -#: builtin/help.c:426

5538 +#: builtin/help.c:430

5539 msgid "An overview of recommended workflows with Git"

5540 msgstr ""

5541

5489 -#: builtin/help.c:438

5542 +#: builtin/help.c:442

5543 msgid "The common Git guides are:\n"

5544 msgstr ""

5545

5493 -#: builtin/help.c:460 builtin/help.c:476

5546 +#: builtin/help.c:463 builtin/help.c:480

5547 #, c-format

5548 msgid "usage: %s%s"

5549 msgstr ""

5550

5498 -#: builtin/help.c:492

5551 +#: builtin/help.c:496

5552 #, c-format

5553 msgid "`git %s' is aliased to `%s'"

5554 msgstr ""

@@ -5902,7 +5955,7 @@ msgstr ""

5955 msgid "specify that the git repository is to be shared amongst several users"

5956 msgstr ""

5957

5905 -#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155

5958 +#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155

5959 msgid "be quiet"

5960 msgstr ""

5961

@@ -6349,148 +6402,148 @@ msgstr ""

6402 msgid "Available custom strategies are:"

6403 msgstr ""

6404

6352 -#: builtin/merge.c:198

6405 +#: builtin/merge.c:191

6406 msgid "do not show a diffstat at the end of the merge"

6407 msgstr ""

6408

6356 -#: builtin/merge.c:201

6409 +#: builtin/merge.c:194

6410 msgid "show a diffstat at the end of the merge"

6411 msgstr ""

6412

6360 -#: builtin/merge.c:202

6413 +#: builtin/merge.c:195

6414 msgid "(synonym to --stat)"

6415 msgstr ""

6416

6364 -#: builtin/merge.c:204

6417 +#: builtin/merge.c:197

6418 msgid "add (at most <n>) entries from shortlog to merge commit message"

6419 msgstr ""

6420

6368 -#: builtin/merge.c:207

6421 +#: builtin/merge.c:200

6422 msgid "create a single commit instead of doing a merge"

6423 msgstr ""

6424

6372 -#: builtin/merge.c:209

6425 +#: builtin/merge.c:202

6426 msgid "perform a commit if the merge succeeds (default)"

6427 msgstr ""

6428

6376 -#: builtin/merge.c:211

6429 +#: builtin/merge.c:204

6430 msgid "edit message before committing"

6431 msgstr ""

6432

6380 -#: builtin/merge.c:212

6433 +#: builtin/merge.c:205

6434 msgid "allow fast-forward (default)"

6435 msgstr ""

6436

6384 -#: builtin/merge.c:214

6437 +#: builtin/merge.c:207

6438 msgid "abort if fast-forward is not possible"

6439 msgstr ""

6440

6388 -#: builtin/merge.c:218

6441 +#: builtin/merge.c:211

6442 msgid "Verify that the named commit has a valid GPG signature"

6443 msgstr ""

6444

6392 -#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89

6445 +#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89

6446 msgid "strategy"

6447 msgstr ""

6448

6396 -#: builtin/merge.c:220

6449 +#: builtin/merge.c:213

6450 msgid "merge strategy to use"

6451 msgstr ""

6452

6400 -#: builtin/merge.c:221

6453 +#: builtin/merge.c:214

6454 msgid "option=value"

6455 msgstr ""

6456

6404 -#: builtin/merge.c:222

6457 +#: builtin/merge.c:215

6458 msgid "option for selected merge strategy"

6459 msgstr ""

6460

6408 -#: builtin/merge.c:224

6461 +#: builtin/merge.c:217

6462 msgid "merge commit message (for a non-fast-forward merge)"

6463 msgstr ""

6464

6412 -#: builtin/merge.c:228

6465 +#: builtin/merge.c:221

6466 msgid "abort the current in-progress merge"

6467 msgstr ""

6468

6416 -#: builtin/merge.c:257

6469 +#: builtin/merge.c:250

6470 msgid "could not run stash."

6471 msgstr ""

6472

6420 -#: builtin/merge.c:262

6473 +#: builtin/merge.c:255

6474 msgid "stash failed"

6475 msgstr ""

6476

6424 -#: builtin/merge.c:267

6477 +#: builtin/merge.c:260

6478 #, c-format

6479 msgid "not a valid object: %s"

6480 msgstr ""

6481

6429 -#: builtin/merge.c:286 builtin/merge.c:303

6482 +#: builtin/merge.c:279 builtin/merge.c:296

6483 msgid "read-tree failed"

6484 msgstr ""

6485

6433 -#: builtin/merge.c:333

6486 +#: builtin/merge.c:326

6487 msgid " (nothing to squash)"

6488 msgstr ""

6489

6437 -#: builtin/merge.c:346

6490 +#: builtin/merge.c:339

6491 #, c-format

6492 msgid "Squash commit -- not updating HEAD\n"

6493 msgstr ""

6494

6442 -#: builtin/merge.c:378

6495 +#: builtin/merge.c:371

6496 msgid "Writing SQUASH_MSG"

6497 msgstr ""

6498

6446 -#: builtin/merge.c:380

6499 +#: builtin/merge.c:373

6500 msgid "Finishing SQUASH_MSG"

6501 msgstr ""

6502

6450 -#: builtin/merge.c:403

6503 +#: builtin/merge.c:396

6504 #, c-format

6505 msgid "No merge message -- not updating HEAD\n"

6506 msgstr ""

6507

6455 -#: builtin/merge.c:453

6508 +#: builtin/merge.c:446

6509 #, c-format

6510 msgid "'%s' does not point to a commit"

6511 msgstr ""

6512

6460 -#: builtin/merge.c:565

6513 +#: builtin/merge.c:558

6514 #, c-format

6515 msgid "Bad branch.%s.mergeoptions string: %s"

6516 msgstr ""

6517

6465 -#: builtin/merge.c:657

6518 +#: builtin/merge.c:650

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

6520 msgstr ""

6521

6469 -#: builtin/merge.c:685

6522 +#: builtin/merge.c:678

6523 msgid "Not handling anything other than two heads merge."

6524 msgstr ""

6525

6473 -#: builtin/merge.c:699

6526 +#: builtin/merge.c:692

6527 #, c-format

6528 msgid "Unknown option for merge-recursive: -X%s"

6529 msgstr ""

6530

6478 -#: builtin/merge.c:713

6531 +#: builtin/merge.c:706

6532 #, c-format

6533 msgid "unable to write %s"

6534 msgstr ""

6535

6483 -#: builtin/merge.c:802

6536 +#: builtin/merge.c:795

6537 #, c-format

6538 msgid "Could not read from '%s'"

6539 msgstr ""

6540

6488 -#: builtin/merge.c:811

6541 +#: builtin/merge.c:804

6542 #, c-format

6543 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

6544 msgstr ""

6545

6493 -#: builtin/merge.c:817

6546 +#: builtin/merge.c:810

6547 #, c-format

6548 msgid ""

6549 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -6500,193 +6553,201 @@ msgid ""

6553 "the commit.\n"

6554 msgstr ""

6555

6503 -#: builtin/merge.c:841

6556 +#: builtin/merge.c:834

6557 msgid "Empty commit message."

6558 msgstr ""

6559

6507 -#: builtin/merge.c:853

6560 +#: builtin/merge.c:846

6561 #, c-format

6562 msgid "Wonderful.\n"

6563 msgstr ""

6564

6512 -#: builtin/merge.c:918

6565 +#: builtin/merge.c:911

6566 #, c-format

6567 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

6568 msgstr ""

6569

6517 -#: builtin/merge.c:934

6570 +#: builtin/merge.c:927

6571 #, c-format

6572 msgid "'%s' is not a commit"

6573 msgstr ""

6574

6522 -#: builtin/merge.c:975

6575 +#: builtin/merge.c:968

6576 msgid "No current branch."

6577 msgstr ""

6578

6526 -#: builtin/merge.c:977

6579 +#: builtin/merge.c:970

6580 msgid "No remote for the current branch."

6581 msgstr ""

6582

6530 -#: builtin/merge.c:979

6583 +#: builtin/merge.c:972

6584 msgid "No default upstream defined for the current branch."

6585 msgstr ""

6586

6534 -#: builtin/merge.c:984

6587 +#: builtin/merge.c:977

6588 #, c-format

6589 msgid "No remote-tracking branch for %s from %s"

6590 msgstr ""

6591

6539 -#: builtin/merge.c:1140

6592 +#: builtin/merge.c:1133

6593 msgid "There is no merge to abort (MERGE_HEAD missing)."

6594 msgstr ""

6595

6543 -#: builtin/merge.c:1156 git-pull.sh:31

6596 +#: builtin/merge.c:1149 git-pull.sh:31

6597 msgid ""

6598 "You have not concluded your merge (MERGE_HEAD exists).\n"

6599 "Please, commit your changes before you can merge."

6600 msgstr ""

6601

6549 -#: builtin/merge.c:1159 git-pull.sh:34

6602 +#: builtin/merge.c:1152 git-pull.sh:34

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

6604 msgstr ""

6605

6553 -#: builtin/merge.c:1163

6606 +#: builtin/merge.c:1156

6607 msgid ""

6608 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

6609 "Please, commit your changes before you can merge."

6610 msgstr ""

6611

6559 -#: builtin/merge.c:1166

6612 +#: builtin/merge.c:1159

6613 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

6614 msgstr ""

6615

6563 -#: builtin/merge.c:1175

6616 +#: builtin/merge.c:1168

6617 msgid "You cannot combine --squash with --no-ff."

6618 msgstr ""

6619

6567 -#: builtin/merge.c:1184

6620 +#: builtin/merge.c:1177

6621 msgid "No commit specified and merge.defaultToUpstream not set."

6622 msgstr ""

6623

6571 -#: builtin/merge.c:1216

6624 +#: builtin/merge.c:1209

6625 msgid "Can merge only exactly one commit into empty head"

6626 msgstr ""

6627

6575 -#: builtin/merge.c:1219

6628 +#: builtin/merge.c:1212

6629 msgid "Squash commit into empty head not supported yet"

6630 msgstr ""

6631

6579 -#: builtin/merge.c:1221

6632 +#: builtin/merge.c:1214

6633 msgid "Non-fast-forward commit does not make sense into an empty head"

6634 msgstr ""

6635

6583 -#: builtin/merge.c:1226

6636 +#: builtin/merge.c:1219

6637 #, c-format

6638 msgid "%s - not something we can merge"

6639 msgstr ""

6640

6588 -#: builtin/merge.c:1277

6641 +#: builtin/merge.c:1270

6642 #, c-format

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

6644 msgstr ""

6645

6593 -#: builtin/merge.c:1280

6646 +#: builtin/merge.c:1273

6647 #, c-format

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

6649 msgstr ""

6650

6651 #. 'N'

6599 -#: builtin/merge.c:1283

6652 +#: builtin/merge.c:1276

6653 #, c-format

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

6655 msgstr ""

6656

6604 -#: builtin/merge.c:1286

6657 +#: builtin/merge.c:1279

6658 #, c-format

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

6660 msgstr ""

6661

6609 -#: builtin/merge.c:1370

6662 +#: builtin/merge.c:1363

6663 #, c-format

6664 msgid "Updating %s..%s\n"

6665 msgstr ""

6666

6614 -#: builtin/merge.c:1409

6667 +#: builtin/merge.c:1402

6668 #, c-format

6669 msgid "Trying really trivial in-index merge...\n"

6670 msgstr ""

6671

6619 -#: builtin/merge.c:1416

6672 +#: builtin/merge.c:1409

6673 #, c-format

6674 msgid "Nope.\n"

6675 msgstr ""

6676

6624 -#: builtin/merge.c:1448

6677 +#: builtin/merge.c:1441

6678 msgid "Not possible to fast-forward, aborting."

6679 msgstr ""

6680

6628 -#: builtin/merge.c:1471 builtin/merge.c:1550

6681 +#: builtin/merge.c:1464 builtin/merge.c:1543

6682 #, c-format

6683 msgid "Rewinding the tree to pristine...\n"

6684 msgstr ""

6685

6633 -#: builtin/merge.c:1475

6686 +#: builtin/merge.c:1468

6687 #, c-format

6688 msgid "Trying merge strategy %s...\n"

6689 msgstr ""

6690

6638 -#: builtin/merge.c:1541

6691 +#: builtin/merge.c:1534

6692 #, c-format

6693 msgid "No merge strategy handled the merge.\n"

6694 msgstr ""

6695

6643 -#: builtin/merge.c:1543

6696 +#: builtin/merge.c:1536

6697 #, c-format

6698 msgid "Merge with strategy %s failed.\n"

6699 msgstr ""

6700

6648 -#: builtin/merge.c:1552

6701 +#: builtin/merge.c:1545

6702 #, c-format

6703 msgid "Using the %s to prepare resolving by hand.\n"

6704 msgstr ""

6705

6653 -#: builtin/merge.c:1564

6706 +#: builtin/merge.c:1557

6707 #, c-format

6708 msgid "Automatic merge went well; stopped before committing as requested\n"

6709 msgstr ""

6710

6658 -#: builtin/merge-base.c:26

6711 +#: builtin/merge-base.c:29

6712 msgid "git merge-base [-a|--all] <commit> <commit>..."

6713 msgstr ""

6714

6662 -#: builtin/merge-base.c:27

6715 +#: builtin/merge-base.c:30

6716 msgid "git merge-base [-a|--all] --octopus <commit>..."

6717 msgstr ""

6718

6666 -#: builtin/merge-base.c:28

6719 +#: builtin/merge-base.c:31

6720 msgid "git merge-base --independent <commit>..."

6721 msgstr ""

6722

6670 -#: builtin/merge-base.c:29

6723 +#: builtin/merge-base.c:32

6724 msgid "git merge-base --is-ancestor <commit> <commit>"

6725 msgstr ""

6726

6674 -#: builtin/merge-base.c:98

6727 +#: builtin/merge-base.c:33

6728 +msgid "git merge-base --fork-point <ref> [<commit>]"

6729 +msgstr ""

6730 +

6731 +#: builtin/merge-base.c:214

6732 msgid "output all common ancestors"

6733 msgstr ""

6734

6678 -#: builtin/merge-base.c:99

6735 +#: builtin/merge-base.c:216

6736 msgid "find ancestors for a single n-way merge"

6737 msgstr ""

6738

6682 -#: builtin/merge-base.c:100

6739 +#: builtin/merge-base.c:218

6740 msgid "list revs not reachable from others"

6741 msgstr ""

6742

6686 -#: builtin/merge-base.c:102

6743 +#: builtin/merge-base.c:220

6744 msgid "is the first one ancestor of the other?"

6745 msgstr ""

6746

6747 +#: builtin/merge-base.c:222

6748 +msgid "find where <commit> forked from reflog of <ref>"

6749 +msgstr ""

6750 +

6751 #: builtin/merge-file.c:8

6752 msgid ""

6753 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "

@@ -6745,122 +6806,126 @@ msgstr ""

6806 msgid "git mv [options] <source>... <destination>"

6807 msgstr ""

6808

6748 -#: builtin/mv.c:67

6809 +#: builtin/mv.c:71

6810 msgid "force move/rename even if target exists"

6811 msgstr ""

6812

6752 -#: builtin/mv.c:68

6813 +#: builtin/mv.c:72

6814 msgid "skip move/rename errors"

6815 msgstr ""

6816

6756 -#: builtin/mv.c:113

6817 +#: builtin/mv.c:122

6818 #, c-format

6819 msgid "Checking rename of '%s' to '%s'\n"

6820 msgstr ""

6821

6761 -#: builtin/mv.c:117

6822 +#: builtin/mv.c:126

6823 msgid "bad source"

6824 msgstr ""

6825

6765 -#: builtin/mv.c:120

6826 +#: builtin/mv.c:129

6827 msgid "can not move directory into itself"

6828 msgstr ""

6829

6769 -#: builtin/mv.c:123

6830 +#: builtin/mv.c:132

6831 msgid "cannot move directory over file"

6832 msgstr ""

6833

6773 -#: builtin/mv.c:129

6834 +#: builtin/mv.c:138

6835 #, c-format

6836 msgid "Huh? Directory %s is in index and no submodule?"

6837 msgstr ""

6838

6778 -#: builtin/mv.c:131 builtin/rm.c:318

6839 +#: builtin/mv.c:140 builtin/rm.c:318

6840 msgid "Please, stage your changes to .gitmodules or stash them to proceed"

6841 msgstr ""

6842

6782 -#: builtin/mv.c:147

6843 +#: builtin/mv.c:156

6844 #, c-format

6845 msgid "Huh? %.*s is in index?"

6846 msgstr ""

6847

6787 -#: builtin/mv.c:159

6848 +#: builtin/mv.c:168

6849 msgid "source directory is empty"

6850 msgstr ""

6851

6791 -#: builtin/mv.c:191

6852 +#: builtin/mv.c:200

6853 msgid "not under version control"

6854 msgstr ""

6855

6795 -#: builtin/mv.c:193

6856 +#: builtin/mv.c:202

6857 msgid "destination exists"

6858 msgstr ""

6859

6799 -#: builtin/mv.c:201

6860 +#: builtin/mv.c:210

6861 #, c-format

6862 msgid "overwriting '%s'"

6863 msgstr ""

6864

6804 -#: builtin/mv.c:204

6865 +#: builtin/mv.c:213

6866 msgid "Cannot overwrite"

6867 msgstr ""

6868

6808 -#: builtin/mv.c:207

6869 +#: builtin/mv.c:216

6870 msgid "multiple sources for the same target"

6871 msgstr ""

6872

6812 -#: builtin/mv.c:222

6873 +#: builtin/mv.c:218

6874 +msgid "destination directory does not exist"

6875 +msgstr ""

6876 +

6877 +#: builtin/mv.c:233

6878 #, c-format

6879 msgid "%s, source=%s, destination=%s"

6880 msgstr ""

6881

6817 -#: builtin/mv.c:232

6882 +#: builtin/mv.c:243

6883 #, c-format

6884 msgid "Renaming %s to %s\n"

6885 msgstr ""

6886

6822 -#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330

6887 +#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328

6888 #, c-format

6889 msgid "renaming '%s' failed"

6890 msgstr ""

6891

6827 -#: builtin/name-rev.c:259

6892 +#: builtin/name-rev.c:258

6893 msgid "git name-rev [options] <commit>..."

6894 msgstr ""

6895

6831 -#: builtin/name-rev.c:260

6896 +#: builtin/name-rev.c:259

6897 msgid "git name-rev [options] --all"

6898 msgstr ""

6899

6835 -#: builtin/name-rev.c:261

6900 +#: builtin/name-rev.c:260

6901 msgid "git name-rev [options] --stdin"

6902 msgstr ""

6903

6839 -#: builtin/name-rev.c:313

6904 +#: builtin/name-rev.c:312

6905 msgid "print only names (no SHA-1)"

6906 msgstr ""

6907

6843 -#: builtin/name-rev.c:314

6908 +#: builtin/name-rev.c:313

6909 msgid "only use tags to name the commits"

6910 msgstr ""

6911

6847 -#: builtin/name-rev.c:316

6912 +#: builtin/name-rev.c:315

6913 msgid "only use refs matching <pattern>"

6914 msgstr ""

6915

6851 -#: builtin/name-rev.c:318

6916 +#: builtin/name-rev.c:317

6917 msgid "list all commits reachable from all refs"

6918 msgstr ""

6919

6855 -#: builtin/name-rev.c:319

6920 +#: builtin/name-rev.c:318

6921 msgid "read from stdin"

6922 msgstr ""

6923

6859 -#: builtin/name-rev.c:320

6924 +#: builtin/name-rev.c:319

6925 msgid "allow to print `undefined` names (default)"

6926 msgstr ""

6927

6863 -#: builtin/name-rev.c:326

6928 +#: builtin/name-rev.c:325

6929 msgid "dereference tags in the input (internal use)"

6930 msgstr ""

6931

@@ -7169,7 +7234,7 @@ msgstr ""

7234 msgid "use notes from <notes_ref>"

7235 msgstr ""

7236

7172 -#: builtin/notes.c:974 builtin/remote.c:1598

7237 +#: builtin/notes.c:974 builtin/remote.c:1593

7238 #, c-format

7239 msgid "Unknown subcommand: %s"

7240 msgstr ""

@@ -7187,143 +7252,143 @@ msgstr ""

7252 msgid "deflate error (%d)"

7253 msgstr ""

7254

7190 -#: builtin/pack-objects.c:2398

7255 +#: builtin/pack-objects.c:2396

7256 #, c-format

7257 msgid "unsupported index version %s"

7258 msgstr ""

7259

7195 -#: builtin/pack-objects.c:2402

7260 +#: builtin/pack-objects.c:2400

7261 #, c-format

7262 msgid "bad index version '%s'"

7263 msgstr ""

7264

7200 -#: builtin/pack-objects.c:2425

7265 +#: builtin/pack-objects.c:2423

7266 #, c-format

7267 msgid "option %s does not accept negative form"

7268 msgstr ""

7269

7205 -#: builtin/pack-objects.c:2429

7270 +#: builtin/pack-objects.c:2427

7271 #, c-format

7272 msgid "unable to parse value '%s' for option %s"

7273 msgstr ""

7274

7210 -#: builtin/pack-objects.c:2448

7275 +#: builtin/pack-objects.c:2446

7276 msgid "do not show progress meter"

7277 msgstr ""

7278

7214 -#: builtin/pack-objects.c:2450

7279 +#: builtin/pack-objects.c:2448

7280 msgid "show progress meter"

7281 msgstr ""

7282

7218 -#: builtin/pack-objects.c:2452

7283 +#: builtin/pack-objects.c:2450

7284 msgid "show progress meter during object writing phase"

7285 msgstr ""

7286

7222 -#: builtin/pack-objects.c:2455

7287 +#: builtin/pack-objects.c:2453

7288 msgid "similar to --all-progress when progress meter is shown"

7289 msgstr ""

7290

7226 -#: builtin/pack-objects.c:2456

7291 +#: builtin/pack-objects.c:2454

7292 msgid "version[,offset]"

7293 msgstr ""

7294

7230 -#: builtin/pack-objects.c:2457

7295 +#: builtin/pack-objects.c:2455

7296 msgid "write the pack index file in the specified idx format version"

7297 msgstr ""

7298

7234 -#: builtin/pack-objects.c:2460

7299 +#: builtin/pack-objects.c:2458

7300 msgid "maximum size of each output pack file"

7301 msgstr ""

7302

7238 -#: builtin/pack-objects.c:2462

7303 +#: builtin/pack-objects.c:2460

7304 msgid "ignore borrowed objects from alternate object store"

7305 msgstr ""

7306

7242 -#: builtin/pack-objects.c:2464

7307 +#: builtin/pack-objects.c:2462

7308 msgid "ignore packed objects"

7309 msgstr ""

7310

7246 -#: builtin/pack-objects.c:2466

7311 +#: builtin/pack-objects.c:2464

7312 msgid "limit pack window by objects"

7313 msgstr ""

7314

7250 -#: builtin/pack-objects.c:2468

7315 +#: builtin/pack-objects.c:2466

7316 msgid "limit pack window by memory in addition to object limit"

7317 msgstr ""

7318

7254 -#: builtin/pack-objects.c:2470

7319 +#: builtin/pack-objects.c:2468

7320 msgid "maximum length of delta chain allowed in the resulting pack"

7321 msgstr ""

7322

7258 -#: builtin/pack-objects.c:2472

7323 +#: builtin/pack-objects.c:2470

7324 msgid "reuse existing deltas"

7325 msgstr ""

7326

7262 -#: builtin/pack-objects.c:2474

7327 +#: builtin/pack-objects.c:2472

7328 msgid "reuse existing objects"

7329 msgstr ""

7330

7266 -#: builtin/pack-objects.c:2476

7331 +#: builtin/pack-objects.c:2474

7332 msgid "use OFS_DELTA objects"

7333 msgstr ""

7334

7270 -#: builtin/pack-objects.c:2478

7335 +#: builtin/pack-objects.c:2476

7336 msgid "use threads when searching for best delta matches"

7337 msgstr ""

7338

7274 -#: builtin/pack-objects.c:2480

7339 +#: builtin/pack-objects.c:2478

7340 msgid "do not create an empty pack output"

7341 msgstr ""

7342

7278 -#: builtin/pack-objects.c:2482

7343 +#: builtin/pack-objects.c:2480

7344 msgid "read revision arguments from standard input"

7345 msgstr ""

7346

7282 -#: builtin/pack-objects.c:2484

7347 +#: builtin/pack-objects.c:2482

7348 msgid "limit the objects to those that are not yet packed"

7349 msgstr ""

7350

7286 -#: builtin/pack-objects.c:2487

7351 +#: builtin/pack-objects.c:2485

7352 msgid "include objects reachable from any reference"

7353 msgstr ""

7354

7290 -#: builtin/pack-objects.c:2490

7355 +#: builtin/pack-objects.c:2488

7356 msgid "include objects referred by reflog entries"

7357 msgstr ""

7358

7294 -#: builtin/pack-objects.c:2493

7359 +#: builtin/pack-objects.c:2491

7360 msgid "output pack to stdout"

7361 msgstr ""

7362

7298 -#: builtin/pack-objects.c:2495

7363 +#: builtin/pack-objects.c:2493

7364 msgid "include tag objects that refer to objects to be packed"

7365 msgstr ""

7366

7302 -#: builtin/pack-objects.c:2497

7367 +#: builtin/pack-objects.c:2495

7368 msgid "keep unreachable objects"

7369 msgstr ""

7370

7306 -#: builtin/pack-objects.c:2498 parse-options.h:143

7371 +#: builtin/pack-objects.c:2496 parse-options.h:143

7372 msgid "time"

7373 msgstr ""

7374

7310 -#: builtin/pack-objects.c:2499

7375 +#: builtin/pack-objects.c:2497

7376 msgid "unpack unreachable objects newer than <time>"

7377 msgstr ""

7378

7314 -#: builtin/pack-objects.c:2502

7379 +#: builtin/pack-objects.c:2500

7380 msgid "create thin packs"

7381 msgstr ""

7382

7318 -#: builtin/pack-objects.c:2504

7383 +#: builtin/pack-objects.c:2502

7384 msgid "ignore packs that have companion .keep file"

7385 msgstr ""

7386

7322 -#: builtin/pack-objects.c:2506

7387 +#: builtin/pack-objects.c:2504

7388 msgid "pack compression level"

7389 msgstr ""

7390

7326 -#: builtin/pack-objects.c:2508

7391 +#: builtin/pack-objects.c:2506

7392 msgid "do not hide commits by grafts"

7393 msgstr ""

7394

@@ -7347,15 +7412,15 @@ msgstr ""

7412 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"

7413 msgstr ""

7414

7350 -#: builtin/prune.c:132

7415 +#: builtin/prune.c:142

7416 msgid "do not remove, show only"

7417 msgstr ""

7418

7354 -#: builtin/prune.c:133

7419 +#: builtin/prune.c:143

7420 msgid "report pruned objects"

7421 msgstr ""

7422

7358 -#: builtin/prune.c:136

7423 +#: builtin/prune.c:146

7424 msgid "expire objects older than <time>"

7425 msgstr ""

7426

@@ -7363,21 +7428,21 @@ msgstr ""

7428 msgid "git push [<options>] [<repository> [<refspec>...]]"

7429 msgstr ""

7430

7366 -#: builtin/push.c:47

7431 +#: builtin/push.c:86

7432 msgid "tag shorthand without <tag>"

7433 msgstr ""

7434

7370 -#: builtin/push.c:66

7435 +#: builtin/push.c:96

7436 msgid "--delete only accepts plain target ref names"

7437 msgstr ""

7438

7374 -#: builtin/push.c:101

7439 +#: builtin/push.c:141

7440 msgid ""

7441 "\n"

7442 "To choose either option permanently, see push.default in 'git help config'."

7443 msgstr ""

7444

7380 -#: builtin/push.c:104

7445 +#: builtin/push.c:144

7446 #, c-format

7447 msgid ""

7448 "The upstream branch of your current branch does not match\n"

@@ -7392,7 +7457,7 @@ msgid ""

7457 "%s"

7458 msgstr ""

7459

7395 -#: builtin/push.c:119

7460 +#: builtin/push.c:159

7461 #, c-format

7462 msgid ""

7463 "You are not currently on a branch.\n"

@@ -7402,7 +7467,7 @@ msgid ""

7467 " git push %s HEAD:<name-of-remote-branch>\n"

7468 msgstr ""

7469

7405 -#: builtin/push.c:133

7470 +#: builtin/push.c:173

7471 #, c-format

7472 msgid ""

7473 "The current branch %s has no upstream branch.\n"

@@ -7411,12 +7476,12 @@ msgid ""

7476 " git push --set-upstream %s %s\n"

7477 msgstr ""

7478

7414 -#: builtin/push.c:141

7479 +#: builtin/push.c:181

7480 #, c-format

7481 msgid "The current branch %s has multiple upstream branches, refusing to push."

7482 msgstr ""

7483

7419 -#: builtin/push.c:144

7484 +#: builtin/push.c:184

7485 #, c-format

7486 msgid ""

7487 "You are pushing to remote '%s', which is not the upstream of\n"

@@ -7424,7 +7489,7 @@ msgid ""

7489 "to update which remote branch."

7490 msgstr ""

7491

7427 -#: builtin/push.c:167

7492 +#: builtin/push.c:207

7493 msgid ""

7494 "push.default is unset; its implicit value is changing in\n"

7495 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"

@@ -7436,18 +7501,25 @@ msgid ""

7501 "\n"

7502 " git config --global push.default simple\n"

7503 "\n"

7504 +"When push.default is set to 'matching', git will push local branches\n"

7505 +"to the remote branches that already exist with the same name.\n"

7506 +"\n"

7507 +"In Git 2.0, Git will default to the more conservative 'simple'\n"

7508 +"behavior, which only pushes the current branch to the corresponding\n"

7509 +"remote branch that 'git pull' uses to update the current branch.\n"

7510 +"\n"

7511 "See 'git help config' and search for 'push.default' for further "

7512 "information.\n"

7513 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"

7514 "'current' instead of 'simple' if you sometimes use older versions of Git)"

7515 msgstr ""

7516

7445 -#: builtin/push.c:227

7517 +#: builtin/push.c:274

7518 msgid ""

7519 "You didn't specify any refspecs to push, and push.default is \"nothing\"."

7520 msgstr ""

7521

7450 -#: builtin/push.c:234

7522 +#: builtin/push.c:281

7523 msgid ""

7524 "Updates were rejected because the tip of your current branch is behind\n"

7525 "its remote counterpart. Integrate the remote changes (e.g.\n"

@@ -7455,7 +7527,7 @@ msgid ""

7527 "See the 'Note about fast-forwards' in 'git push --help' for details."

7528 msgstr ""

7529

7458 -#: builtin/push.c:240

7530 +#: builtin/push.c:287

7531 msgid ""

7532 "Updates were rejected because a pushed branch tip is behind its remote\n"

7533 "counterpart. If you did not intend to push that branch, you may want to\n"

@@ -7463,7 +7535,7 @@ msgid ""

7535 "to 'simple', 'current' or 'upstream' to push only the current branch."

7536 msgstr ""

7537

7466 -#: builtin/push.c:246

7538 +#: builtin/push.c:293

7539 msgid ""

7540 "Updates were rejected because a pushed branch tip is behind its remote\n"

7541 "counterpart. Check out this branch and integrate the remote changes\n"

@@ -7471,7 +7543,7 @@ msgid ""

7543 "See the 'Note about fast-forwards' in 'git push --help' for details."

7544 msgstr ""

7545

7474 -#: builtin/push.c:252

7546 +#: builtin/push.c:299

7547 msgid ""

7548 "Updates were rejected because the remote contains work that you do\n"

7549 "not have locally. This is usually caused by another repository pushing\n"

@@ -7480,33 +7552,33 @@ msgid ""

7552 "See the 'Note about fast-forwards' in 'git push --help' for details."

7553 msgstr ""

7554

7483 -#: builtin/push.c:259

7555 +#: builtin/push.c:306

7556 msgid "Updates were rejected because the tag already exists in the remote."

7557 msgstr ""

7558

7487 -#: builtin/push.c:262

7559 +#: builtin/push.c:309

7560 msgid ""

7561 "You cannot update a remote ref that points at a non-commit object,\n"

7562 "or update a remote ref to make it point at a non-commit object,\n"

7563 "without using the '--force' option.\n"

7564 msgstr ""

7565

7494 -#: builtin/push.c:328

7566 +#: builtin/push.c:375

7567 #, c-format

7568 msgid "Pushing to %s\n"

7569 msgstr ""

7570

7499 -#: builtin/push.c:332

7571 +#: builtin/push.c:379

7572 #, c-format

7573 msgid "failed to push some refs to '%s'"

7574 msgstr ""

7575

7504 -#: builtin/push.c:365

7576 +#: builtin/push.c:412

7577 #, c-format

7578 msgid "bad repository '%s'"

7579 msgstr ""

7580

7509 -#: builtin/push.c:366

7581 +#: builtin/push.c:413

7582 msgid ""

7583 "No configured push destination.\n"

7584 "Either specify the URL from the command-line or configure a remote "

@@ -7519,95 +7591,95 @@ msgid ""

7591 " git push <name>\n"

7592 msgstr ""

7593

7522 -#: builtin/push.c:381

7594 +#: builtin/push.c:428

7595 msgid "--all and --tags are incompatible"

7596 msgstr ""

7597

7526 -#: builtin/push.c:382

7598 +#: builtin/push.c:429

7599 msgid "--all can't be combined with refspecs"

7600 msgstr ""

7601

7530 -#: builtin/push.c:387

7602 +#: builtin/push.c:434

7603 msgid "--mirror and --tags are incompatible"

7604 msgstr ""

7605

7534 -#: builtin/push.c:388

7606 +#: builtin/push.c:435

7607 msgid "--mirror can't be combined with refspecs"

7608 msgstr ""

7609

7538 -#: builtin/push.c:393

7610 +#: builtin/push.c:440

7611 msgid "--all and --mirror are incompatible"

7612 msgstr ""

7613

7542 -#: builtin/push.c:453

7614 +#: builtin/push.c:500

7615 msgid "repository"

7616 msgstr ""

7617

7546 -#: builtin/push.c:454

7618 +#: builtin/push.c:501

7619 msgid "push all refs"

7620 msgstr ""

7621

7550 -#: builtin/push.c:455

7622 +#: builtin/push.c:502

7623 msgid "mirror all refs"

7624 msgstr ""

7625

7554 -#: builtin/push.c:457

7626 +#: builtin/push.c:504

7627 msgid "delete refs"

7628 msgstr ""

7629

7558 -#: builtin/push.c:458

7630 +#: builtin/push.c:505

7631 msgid "push tags (can't be used with --all or --mirror)"

7632 msgstr ""

7633

7562 -#: builtin/push.c:461

7634 +#: builtin/push.c:508

7635 msgid "force updates"

7636 msgstr ""

7637

7566 -#: builtin/push.c:463

7638 +#: builtin/push.c:510

7639 msgid "refname>:<expect"

7640 msgstr ""

7641

7570 -#: builtin/push.c:464

7642 +#: builtin/push.c:511

7643 msgid "require old value of ref to be at this value"

7644 msgstr ""

7645

7574 -#: builtin/push.c:466

7646 +#: builtin/push.c:513

7647 msgid "check"

7648 msgstr ""

7649

7578 -#: builtin/push.c:467

7650 +#: builtin/push.c:514

7651 msgid "control recursive pushing of submodules"

7652 msgstr ""

7653

7582 -#: builtin/push.c:469

7654 +#: builtin/push.c:516

7655 msgid "use thin pack"

7656 msgstr ""

7657

7586 -#: builtin/push.c:470 builtin/push.c:471

7658 +#: builtin/push.c:517 builtin/push.c:518

7659 msgid "receive pack program"

7660 msgstr ""

7661

7590 -#: builtin/push.c:472

7662 +#: builtin/push.c:519

7663 msgid "set upstream for git pull/status"

7664 msgstr ""

7665

7594 -#: builtin/push.c:475

7666 +#: builtin/push.c:522

7667 msgid "prune locally removed refs"

7668 msgstr ""

7669

7598 -#: builtin/push.c:477

7670 +#: builtin/push.c:524

7671 msgid "bypass pre-push hook"

7672 msgstr ""

7673

7602 -#: builtin/push.c:478

7674 +#: builtin/push.c:525

7675 msgid "push missing but relevant tags"

7676 msgstr ""

7677

7606 -#: builtin/push.c:488

7678 +#: builtin/push.c:535

7679 msgid "--delete is incompatible with --all, --mirror and --tags"

7680 msgstr ""

7681

7610 -#: builtin/push.c:490

7682 +#: builtin/push.c:537

7683 msgid "--delete doesn't make sense without any refs"

7684 msgstr ""

7685

@@ -7692,191 +7764,191 @@ msgstr ""

7764 msgid "'%s' is not a valid timestamp"

7765 msgstr ""

7766

7695 -#: builtin/remote.c:11

7767 +#: builtin/remote.c:12

7768 msgid "git remote [-v | --verbose]"

7769 msgstr ""

7770

7699 -#: builtin/remote.c:12

7771 +#: builtin/remote.c:13

7772 msgid ""

7773 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"

7774 "mirror=<fetch|push>] <name> <url>"

7775 msgstr ""

7776

7705 -#: builtin/remote.c:13 builtin/remote.c:32

7777 +#: builtin/remote.c:14 builtin/remote.c:33

7778 msgid "git remote rename <old> <new>"

7779 msgstr ""

7780

7709 -#: builtin/remote.c:14 builtin/remote.c:37

7781 +#: builtin/remote.c:15 builtin/remote.c:38

7782 msgid "git remote remove <name>"

7783 msgstr ""

7784

7713 -#: builtin/remote.c:15

7785 +#: builtin/remote.c:16

7786 msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"

7787 msgstr ""

7788

7717 -#: builtin/remote.c:16

7789 +#: builtin/remote.c:17

7790 msgid "git remote [-v | --verbose] show [-n] <name>"

7791 msgstr ""

7792

7721 -#: builtin/remote.c:17

7793 +#: builtin/remote.c:18

7794 msgid "git remote prune [-n | --dry-run] <name>"

7795 msgstr ""

7796

7725 -#: builtin/remote.c:18

7797 +#: builtin/remote.c:19

7798 msgid ""

7799 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"

7800 msgstr ""

7801

7730 -#: builtin/remote.c:19

7802 +#: builtin/remote.c:20

7803 msgid "git remote set-branches [--add] <name> <branch>..."

7804 msgstr ""

7805

7734 -#: builtin/remote.c:20 builtin/remote.c:68

7806 +#: builtin/remote.c:21 builtin/remote.c:69

7807 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"

7808 msgstr ""

7809

7738 -#: builtin/remote.c:21 builtin/remote.c:69

7810 +#: builtin/remote.c:22 builtin/remote.c:70

7811 msgid "git remote set-url --add <name> <newurl>"

7812 msgstr ""

7813

7742 -#: builtin/remote.c:22 builtin/remote.c:70

7814 +#: builtin/remote.c:23 builtin/remote.c:71

7815 msgid "git remote set-url --delete <name> <url>"

7816 msgstr ""

7817

7746 -#: builtin/remote.c:27

7818 +#: builtin/remote.c:28

7819 msgid "git remote add [<options>] <name> <url>"

7820 msgstr ""

7821

7750 -#: builtin/remote.c:42

7822 +#: builtin/remote.c:43

7823 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"

7824 msgstr ""

7825

7754 -#: builtin/remote.c:47

7826 +#: builtin/remote.c:48

7827 msgid "git remote set-branches <name> <branch>..."

7828 msgstr ""

7829

7758 -#: builtin/remote.c:48

7830 +#: builtin/remote.c:49

7831 msgid "git remote set-branches --add <name> <branch>..."

7832 msgstr ""

7833

7762 -#: builtin/remote.c:53

7834 +#: builtin/remote.c:54

7835 msgid "git remote show [<options>] <name>"

7836 msgstr ""

7837

7766 -#: builtin/remote.c:58

7838 +#: builtin/remote.c:59

7839 msgid "git remote prune [<options>] <name>"

7840 msgstr ""

7841

7770 -#: builtin/remote.c:63

7842 +#: builtin/remote.c:64

7843 msgid "git remote update [<options>] [<group> | <remote>]..."

7844 msgstr ""

7845

7774 -#: builtin/remote.c:98

7846 +#: builtin/remote.c:88

7847 #, c-format

7848 msgid "Updating %s"

7849 msgstr ""

7850

7779 -#: builtin/remote.c:130

7851 +#: builtin/remote.c:120

7852 msgid ""

7853 "--mirror is dangerous and deprecated; please\n"

7854 "\t use --mirror=fetch or --mirror=push instead"

7855 msgstr ""

7856

7785 -#: builtin/remote.c:147

7857 +#: builtin/remote.c:137

7858 #, c-format

7859 msgid "unknown mirror argument: %s"

7860 msgstr ""

7861

7790 -#: builtin/remote.c:163

7862 +#: builtin/remote.c:153

7863 msgid "fetch the remote branches"

7864 msgstr ""

7865

7794 -#: builtin/remote.c:165

7866 +#: builtin/remote.c:155

7867 msgid "import all tags and associated objects when fetching"

7868 msgstr ""

7869

7798 -#: builtin/remote.c:168

7870 +#: builtin/remote.c:158

7871 msgid "or do not fetch any tag at all (--no-tags)"

7872 msgstr ""

7873

7802 -#: builtin/remote.c:170

7874 +#: builtin/remote.c:160

7875 msgid "branch(es) to track"

7876 msgstr ""

7877

7806 -#: builtin/remote.c:171

7878 +#: builtin/remote.c:161

7879 msgid "master branch"

7880 msgstr ""

7881

7810 -#: builtin/remote.c:172

7882 +#: builtin/remote.c:162

7883 msgid "push|fetch"

7884 msgstr ""

7885

7814 -#: builtin/remote.c:173

7886 +#: builtin/remote.c:163

7887 msgid "set up remote as a mirror to push to or fetch from"

7888 msgstr ""

7889

7818 -#: builtin/remote.c:185

7890 +#: builtin/remote.c:175

7891 msgid "specifying a master branch makes no sense with --mirror"

7892 msgstr ""

7893

7822 -#: builtin/remote.c:187

7894 +#: builtin/remote.c:177

7895 msgid "specifying branches to track makes sense only with fetch mirrors"

7896 msgstr ""

7897

7826 -#: builtin/remote.c:195 builtin/remote.c:646

7898 +#: builtin/remote.c:185 builtin/remote.c:641

7899 #, c-format

7900 msgid "remote %s already exists."

7901 msgstr ""

7902

7831 -#: builtin/remote.c:199 builtin/remote.c:650

7903 +#: builtin/remote.c:189 builtin/remote.c:645

7904 #, c-format

7905 msgid "'%s' is not a valid remote name"

7906 msgstr ""

7907

7836 -#: builtin/remote.c:243

7908 +#: builtin/remote.c:233

7909 #, c-format

7910 msgid "Could not setup master '%s'"

7911 msgstr ""

7912

7841 -#: builtin/remote.c:299

7913 +#: builtin/remote.c:289

7914 #, c-format

7915 msgid "more than one %s"

7916 msgstr ""

7917

7846 -#: builtin/remote.c:339

7918 +#: builtin/remote.c:334

7919 #, c-format

7920 msgid "Could not get fetch map for refspec %s"

7921 msgstr ""

7922

7851 -#: builtin/remote.c:440 builtin/remote.c:448

7923 +#: builtin/remote.c:435 builtin/remote.c:443

7924 msgid "(matching)"

7925 msgstr ""

7926

7855 -#: builtin/remote.c:452

7927 +#: builtin/remote.c:447

7928 msgid "(delete)"

7929 msgstr ""

7930

7859 -#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607

7931 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602

7932 #, c-format

7933 msgid "Could not append '%s' to '%s'"

7934 msgstr ""

7935

7864 -#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890

7936 +#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885

7937 #, c-format

7938 msgid "No such remote: %s"

7939 msgstr ""

7940

7869 -#: builtin/remote.c:656

7941 +#: builtin/remote.c:651

7942 #, c-format

7943 msgid "Could not rename config section '%s' to '%s'"

7944 msgstr ""

7945

7874 -#: builtin/remote.c:662 builtin/remote.c:799

7946 +#: builtin/remote.c:657 builtin/remote.c:794

7947 #, c-format

7948 msgid "Could not remove config section '%s'"

7949 msgstr ""

7950

7879 -#: builtin/remote.c:677

7951 +#: builtin/remote.c:672

7952 #, c-format

7953 msgid ""

7954 "Not updating non-default fetch refspec\n"

@@ -7884,32 +7956,32 @@ msgid ""

7956 "\tPlease update the configuration manually if necessary."

7957 msgstr ""

7958

7887 -#: builtin/remote.c:683

7959 +#: builtin/remote.c:678

7960 #, c-format

7961 msgid "Could not append '%s'"

7962 msgstr ""

7963

7892 -#: builtin/remote.c:694

7964 +#: builtin/remote.c:689

7965 #, c-format

7966 msgid "Could not set '%s'"

7967 msgstr ""

7968

7897 -#: builtin/remote.c:716

7969 +#: builtin/remote.c:711

7970 #, c-format

7971 msgid "deleting '%s' failed"

7972 msgstr ""

7973

7902 -#: builtin/remote.c:750

7974 +#: builtin/remote.c:745

7975 #, c-format

7976 msgid "creating '%s' failed"

7977 msgstr ""

7978

7907 -#: builtin/remote.c:764

7979 +#: builtin/remote.c:759

7980 #, c-format

7981 msgid "Could not remove branch %s"

7982 msgstr ""

7983

7912 -#: builtin/remote.c:834

7984 +#: builtin/remote.c:829

7985 msgid ""

7986 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"

7987 "to delete it, use:"

@@ -7919,262 +7991,262 @@ msgid_plural ""

7991 msgstr[0] ""

7992 msgstr[1] ""

7993

7922 -#: builtin/remote.c:943

7994 +#: builtin/remote.c:938

7995 #, c-format

7996 msgid " new (next fetch will store in remotes/%s)"

7997 msgstr ""

7998

7927 -#: builtin/remote.c:946

7999 +#: builtin/remote.c:941

8000 msgid " tracked"

8001 msgstr ""

8002

7931 -#: builtin/remote.c:948

8003 +#: builtin/remote.c:943

8004 msgid " stale (use 'git remote prune' to remove)"

8005 msgstr ""

8006

7935 -#: builtin/remote.c:950

8007 +#: builtin/remote.c:945

8008 msgid " ???"

8009 msgstr ""

8010

7939 -#: builtin/remote.c:991

8011 +#: builtin/remote.c:986

8012 #, c-format

8013 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"

8014 msgstr ""

8015

7944 -#: builtin/remote.c:998

8016 +#: builtin/remote.c:993

8017 #, c-format

8018 msgid "rebases onto remote %s"

8019 msgstr ""

8020

7949 -#: builtin/remote.c:1001

8021 +#: builtin/remote.c:996

8022 #, c-format

8023 msgid " merges with remote %s"

8024 msgstr ""

8025

7954 -#: builtin/remote.c:1002

8026 +#: builtin/remote.c:997

8027 msgid " and with remote"

8028 msgstr ""

8029

7958 -#: builtin/remote.c:1004

8030 +#: builtin/remote.c:999

8031 #, c-format

8032 msgid "merges with remote %s"

8033 msgstr ""

8034

7963 -#: builtin/remote.c:1005

8035 +#: builtin/remote.c:1000

8036 msgid " and with remote"

8037 msgstr ""

8038

7967 -#: builtin/remote.c:1051

8039 +#: builtin/remote.c:1046

8040 msgid "create"

8041 msgstr ""

8042

7971 -#: builtin/remote.c:1054

8043 +#: builtin/remote.c:1049

8044 msgid "delete"

8045 msgstr ""

8046

7975 -#: builtin/remote.c:1058

8047 +#: builtin/remote.c:1053

8048 msgid "up to date"

8049 msgstr ""

8050

7979 -#: builtin/remote.c:1061

8051 +#: builtin/remote.c:1056

8052 msgid "fast-forwardable"

8053 msgstr ""

8054

7983 -#: builtin/remote.c:1064

8055 +#: builtin/remote.c:1059

8056 msgid "local out of date"

8057 msgstr ""

8058

7987 -#: builtin/remote.c:1071

8059 +#: builtin/remote.c:1066

8060 #, c-format

8061 msgid " %-*s forces to %-*s (%s)"

8062 msgstr ""

8063

7992 -#: builtin/remote.c:1074

8064 +#: builtin/remote.c:1069

8065 #, c-format

8066 msgid " %-*s pushes to %-*s (%s)"

8067 msgstr ""

8068

7997 -#: builtin/remote.c:1078

8069 +#: builtin/remote.c:1073

8070 #, c-format

8071 msgid " %-*s forces to %s"

8072 msgstr ""

8073

8002 -#: builtin/remote.c:1081

8074 +#: builtin/remote.c:1076

8075 #, c-format

8076 msgid " %-*s pushes to %s"

8077 msgstr ""

8078

8007 -#: builtin/remote.c:1091

8079 +#: builtin/remote.c:1144

8080 msgid "do not query remotes"

8081 msgstr ""

8082

8011 -#: builtin/remote.c:1118

8083 +#: builtin/remote.c:1171

8084 #, c-format

8085 msgid "* remote %s"

8086 msgstr ""

8087

8016 -#: builtin/remote.c:1119

8088 +#: builtin/remote.c:1172

8089 #, c-format

8090 msgid " Fetch URL: %s"

8091 msgstr ""

8092

8021 -#: builtin/remote.c:1120 builtin/remote.c:1285

8093 +#: builtin/remote.c:1173 builtin/remote.c:1318

8094 msgid "(no URL)"

8095 msgstr ""

8096

8025 -#: builtin/remote.c:1129 builtin/remote.c:1131

8097 +#: builtin/remote.c:1182 builtin/remote.c:1184

8098 #, c-format

8099 msgid " Push URL: %s"

8100 msgstr ""

8101

8030 -#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137

8102 +#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190

8103 #, c-format

8104 msgid " HEAD branch: %s"

8105 msgstr ""

8106

8035 -#: builtin/remote.c:1139

8107 +#: builtin/remote.c:1192

8108 #, c-format

8109 msgid ""

8110 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"

8111 msgstr ""

8112

8041 -#: builtin/remote.c:1151

8113 +#: builtin/remote.c:1204

8114 #, c-format

8115 msgid " Remote branch:%s"

8116 msgid_plural " Remote branches:%s"

8117 msgstr[0] ""

8118 msgstr[1] ""

8119

8048 -#: builtin/remote.c:1154 builtin/remote.c:1181

8120 +#: builtin/remote.c:1207 builtin/remote.c:1234

8121 msgid " (status not queried)"

8122 msgstr ""

8123

8052 -#: builtin/remote.c:1163

8124 +#: builtin/remote.c:1216

8125 msgid " Local branch configured for 'git pull':"

8126 msgid_plural " Local branches configured for 'git pull':"

8127 msgstr[0] ""

8128 msgstr[1] ""

8129

8058 -#: builtin/remote.c:1171

8130 +#: builtin/remote.c:1224

8131 msgid " Local refs will be mirrored by 'git push'"

8132 msgstr ""

8133

8062 -#: builtin/remote.c:1178

8134 +#: builtin/remote.c:1231

8135 #, c-format

8136 msgid " Local ref configured for 'git push'%s:"

8137 msgid_plural " Local refs configured for 'git push'%s:"

8138 msgstr[0] ""

8139 msgstr[1] ""

8140

8069 -#: builtin/remote.c:1199

8141 +#: builtin/remote.c:1252

8142 msgid "set refs/remotes/<name>/HEAD according to remote"

8143 msgstr ""

8144

8073 -#: builtin/remote.c:1201

8145 +#: builtin/remote.c:1254

8146 msgid "delete refs/remotes/<name>/HEAD"

8147 msgstr ""

8148

8077 -#: builtin/remote.c:1216

8149 +#: builtin/remote.c:1269

8150 msgid "Cannot determine remote HEAD"

8151 msgstr ""

8152

8081 -#: builtin/remote.c:1218

8153 +#: builtin/remote.c:1271

8154 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"

8155 msgstr ""

8156

8085 -#: builtin/remote.c:1228

8157 +#: builtin/remote.c:1281

8158 #, c-format

8159 msgid "Could not delete %s"

8160 msgstr ""

8161

8090 -#: builtin/remote.c:1236

8162 +#: builtin/remote.c:1289

8163 #, c-format

8164 msgid "Not a valid ref: %s"

8165 msgstr ""

8166

8095 -#: builtin/remote.c:1238

8167 +#: builtin/remote.c:1291

8168 #, c-format

8169 msgid "Could not setup %s"

8170 msgstr ""

8171

8100 -#: builtin/remote.c:1274

8172 +#: builtin/remote.c:1307

8173 #, c-format

8174 msgid " %s will become dangling!"

8175 msgstr ""

8176

8105 -#: builtin/remote.c:1275

8177 +#: builtin/remote.c:1308

8178 #, c-format

8179 msgid " %s has become dangling!"

8180 msgstr ""

8181

8110 -#: builtin/remote.c:1281

8182 +#: builtin/remote.c:1314

8183 #, c-format

8184 msgid "Pruning %s"

8185 msgstr ""

8186

8115 -#: builtin/remote.c:1282

8187 +#: builtin/remote.c:1315

8188 #, c-format

8189 msgid "URL: %s"

8190 msgstr ""

8191

8120 -#: builtin/remote.c:1295

8192 +#: builtin/remote.c:1328

8193 #, c-format

8194 msgid " * [would prune] %s"

8195 msgstr ""

8196

8125 -#: builtin/remote.c:1298

8197 +#: builtin/remote.c:1331

8198 #, c-format

8199 msgid " * [pruned] %s"

8200 msgstr ""

8201

8130 -#: builtin/remote.c:1321

8202 +#: builtin/remote.c:1374

8203 msgid "prune remotes after fetching"

8204 msgstr ""

8205

8134 -#: builtin/remote.c:1387 builtin/remote.c:1461

8206 +#: builtin/remote.c:1440 builtin/remote.c:1514

8207 #, c-format

8208 msgid "No such remote '%s'"

8209 msgstr ""

8210

8139 -#: builtin/remote.c:1407

8211 +#: builtin/remote.c:1460

8212 msgid "add branch"

8213 msgstr ""

8214

8143 -#: builtin/remote.c:1414

8215 +#: builtin/remote.c:1467

8216 msgid "no remote specified"

8217 msgstr ""

8218

8147 -#: builtin/remote.c:1436

8219 +#: builtin/remote.c:1489

8220 msgid "manipulate push URLs"

8221 msgstr ""

8222

8151 -#: builtin/remote.c:1438

8223 +#: builtin/remote.c:1491

8224 msgid "add URL"

8225 msgstr ""

8226

8155 -#: builtin/remote.c:1440

8227 +#: builtin/remote.c:1493

8228 msgid "delete URLs"

8229 msgstr ""

8230

8159 -#: builtin/remote.c:1447

8231 +#: builtin/remote.c:1500

8232 msgid "--add --delete doesn't make sense"

8233 msgstr ""

8234

8163 -#: builtin/remote.c:1487

8235 +#: builtin/remote.c:1540

8236 #, c-format

8237 msgid "Invalid old URL pattern: %s"

8238 msgstr ""

8239

8168 -#: builtin/remote.c:1495

8240 +#: builtin/remote.c:1548

8241 #, c-format

8242 msgid "No such URL found: %s"

8243 msgstr ""

8244

8173 -#: builtin/remote.c:1497

8245 +#: builtin/remote.c:1550

8246 msgid "Will not delete all non-push URLs"

8247 msgstr ""

8248

8177 -#: builtin/remote.c:1569

8249 +#: builtin/remote.c:1564

8250 msgid "be verbose; must be placed before a subcommand"

8251 msgstr ""

8252

@@ -8234,7 +8306,7 @@ msgstr ""

8306 msgid "maximum size of each packfile"

8307 msgstr ""

8308

8237 -#: builtin/repack.c:345

8309 +#: builtin/repack.c:343

8310 #, c-format

8311 msgid "removing '%s' failed"

8312 msgstr ""

@@ -8248,21 +8320,25 @@ msgid "git replace -d <object>..."

8320 msgstr ""

8321

8322 #: builtin/replace.c:19

8251 -msgid "git replace -l [<pattern>]"

8323 +msgid "git replace [--format=<format>] [-l [<pattern>]]"

8324 msgstr ""

8325

8254 -#: builtin/replace.c:131

8326 +#: builtin/replace.c:174

8327 msgid "list replace refs"

8328 msgstr ""

8329

8258 -#: builtin/replace.c:132

8330 +#: builtin/replace.c:175

8331 msgid "delete replace refs"

8332 msgstr ""

8333

8262 -#: builtin/replace.c:133

8334 +#: builtin/replace.c:176

8335 msgid "replace the ref if it exists"

8336 msgstr ""

8337

8338 +#: builtin/replace.c:177

8339 +msgid "use this format"

8340 +msgstr ""

8341 +

8342 #: builtin/rerere.c:12

8344 msgstr ""

@@ -8393,19 +8469,23 @@ msgstr ""

8469 msgid "Could not write new index file."

8470 msgstr ""

8471

8396 -#: builtin/rev-parse.c:345

8472 +#: builtin/rev-parse.c:359

8473 msgid "git rev-parse --parseopt [options] -- [<args>...]"

8474 msgstr ""

8475

8400 -#: builtin/rev-parse.c:350

8476 +#: builtin/rev-parse.c:364

8477 msgid "keep the `--` passed as an arg"

8478 msgstr ""

8479

8404 -#: builtin/rev-parse.c:352

8480 +#: builtin/rev-parse.c:366

8481 msgid "stop parsing after the first non-option argument"

8482 msgstr ""

8483

8408 -#: builtin/rev-parse.c:470

8484 +#: builtin/rev-parse.c:369

8485 +msgid "output in stuck long form"

8486 +msgstr ""

8487 +

8488 +#: builtin/rev-parse.c:486

8489 msgid ""

8490 "git rev-parse --parseopt [options] -- [<args>...]\n"

8491 " or: git rev-parse --sq-quote [<arg>...]\n"

@@ -8628,67 +8708,67 @@ msgstr ""

8708 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"

8709 msgstr ""

8710

8631 -#: builtin/show-branch.c:650

8711 +#: builtin/show-branch.c:649

8712 msgid "show remote-tracking and local branches"

8713 msgstr ""

8714

8635 -#: builtin/show-branch.c:652

8715 +#: builtin/show-branch.c:651

8716 msgid "show remote-tracking branches"

8717 msgstr ""

8718

8639 -#: builtin/show-branch.c:654

8719 +#: builtin/show-branch.c:653

8720 msgid "color '*!+-' corresponding to the branch"

8721 msgstr ""

8722

8643 -#: builtin/show-branch.c:656

8723 +#: builtin/show-branch.c:655

8724 msgid "show <n> more commits after the common ancestor"

8725 msgstr ""

8726

8647 -#: builtin/show-branch.c:658

8727 +#: builtin/show-branch.c:657

8728 msgid "synonym to more=-1"

8729 msgstr ""

8730

8651 -#: builtin/show-branch.c:659

8731 +#: builtin/show-branch.c:658

8732 msgid "suppress naming strings"

8733 msgstr ""

8734

8655 -#: builtin/show-branch.c:661

8735 +#: builtin/show-branch.c:660

8736 msgid "include the current branch"

8737 msgstr ""

8738

8659 -#: builtin/show-branch.c:663

8739 +#: builtin/show-branch.c:662

8740 msgid "name commits with their object names"

8741 msgstr ""

8742

8663 -#: builtin/show-branch.c:665

8743 +#: builtin/show-branch.c:664

8744 msgid "show possible merge bases"

8745 msgstr ""

8746

8667 -#: builtin/show-branch.c:667

8747 +#: builtin/show-branch.c:666

8748 msgid "show refs unreachable from any other ref"

8749 msgstr ""

8750

8671 -#: builtin/show-branch.c:669

8751 +#: builtin/show-branch.c:668

8752 msgid "show commits in topological order"

8753 msgstr ""

8754

8675 -#: builtin/show-branch.c:672

8755 +#: builtin/show-branch.c:671

8756 msgid "show only commits not on the first branch"

8757 msgstr ""

8758

8679 -#: builtin/show-branch.c:674

8759 +#: builtin/show-branch.c:673

8760 msgid "show merges reachable from only one tip"

8761 msgstr ""

8762

8683 -#: builtin/show-branch.c:676

8763 +#: builtin/show-branch.c:675

8764 msgid "topologically sort, maintaining date order where possible"

8765 msgstr ""

8766

8687 -#: builtin/show-branch.c:679

8767 +#: builtin/show-branch.c:678

8768 msgid "<n>[,<base>]"

8769 msgstr ""

8770

8691 -#: builtin/show-branch.c:680

8771 +#: builtin/show-branch.c:679

8772 msgid "show <n> most recent ref-log entries starting at base"

8773 msgstr ""

8774

@@ -9161,15 +9241,15 @@ msgstr ""

9241 msgid "no-op (backward compatibility)"

9242 msgstr ""

9243

9164 -#: parse-options.h:238

9244 +#: parse-options.h:235

9245 msgid "be more verbose"

9246 msgstr ""

9247

9168 -#: parse-options.h:240

9248 +#: parse-options.h:237

9249 msgid "be more quiet"

9250 msgstr ""

9251

9172 -#: parse-options.h:246

9252 +#: parse-options.h:243

9253 msgid "use <n> digits to display SHA-1s"

9254 msgstr ""

9255

@@ -9442,7 +9522,7 @@ msgid ""

9522 msgstr ""

9523

9524 #: git-bisect.sh:140

9445 -msgid "won't bisect on seeked tree"

9525 +msgid "won't bisect on cg-seek'ed tree"

9526 msgstr ""

9527

9528 #: git-bisect.sh:144

@@ -9573,7 +9653,7 @@ msgstr ""

9653 #. The working tree and the index file is still based on the

9654 #. $orig_head commit, but we are merging into $curr_head.

9655 #. First update the working tree to match $curr_head.

9576 -#: git-pull.sh:255

9656 +#: git-pull.sh:247

9657 #, sh-format

9658 msgid ""

9659 "Warning: fetch updated the current branch head.\n"

@@ -9581,15 +9661,15 @@ msgid ""

9661 "Warning: commit $orig_head."

9662 msgstr ""

9663

9584 -#: git-pull.sh:280

9664 +#: git-pull.sh:272

9665 msgid "Cannot merge multiple branches into empty head"

9666 msgstr ""

9667

9588 -#: git-pull.sh:284

9668 +#: git-pull.sh:276

9669 msgid "Cannot rebase onto multiple branches"

9670 msgstr ""

9671

9592 -#: git-rebase.sh:54

9672 +#: git-rebase.sh:55

9673 msgid ""

9674 "When you have resolved this problem, run \"git rebase --continue\".\n"

9675 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"

@@ -9597,58 +9677,58 @@ msgid ""

9677 "\"."

9678 msgstr ""

9679

9600 -#: git-rebase.sh:156

9680 +#: git-rebase.sh:158

9681 msgid "Applied autostash."

9682 msgstr ""

9683

9604 -#: git-rebase.sh:159

9684 +#: git-rebase.sh:161

9685 #, sh-format

9686 msgid "Cannot store $stash_sha1"

9687 msgstr ""

9688

9609 -#: git-rebase.sh:160

9689 +#: git-rebase.sh:162

9690 msgid ""

9691 "Applying autostash resulted in conflicts.\n"

9692 "Your changes are safe in the stash.\n"

9693 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

9694 msgstr ""

9695

9616 -#: git-rebase.sh:199

9696 +#: git-rebase.sh:201

9697 msgid "The pre-rebase hook refused to rebase."

9698 msgstr ""

9699

9620 -#: git-rebase.sh:204

9700 +#: git-rebase.sh:206

9701 msgid "It looks like git-am is in progress. Cannot rebase."

9702 msgstr ""

9703

9624 -#: git-rebase.sh:338

9704 +#: git-rebase.sh:346

9705 msgid "The --exec option must be used with the --interactive option"

9706 msgstr ""

9707

9628 -#: git-rebase.sh:343

9708 +#: git-rebase.sh:351

9709 msgid "No rebase in progress?"

9710 msgstr ""

9711

9632 -#: git-rebase.sh:354

9712 +#: git-rebase.sh:362

9713 msgid "The --edit-todo action can only be used during interactive rebase."

9714 msgstr ""

9715

9636 -#: git-rebase.sh:361

9716 +#: git-rebase.sh:369

9717 msgid "Cannot read HEAD"

9718 msgstr ""

9719

9640 -#: git-rebase.sh:364

9720 +#: git-rebase.sh:372

9721 msgid ""

9722 "You must edit all merge conflicts and then\n"

9723 "mark them as resolved using git add"

9724 msgstr ""

9725

9646 -#: git-rebase.sh:382

9726 +#: git-rebase.sh:390

9727 #, sh-format

9728 msgid "Could not move back to $head_name"

9729 msgstr ""

9730

9651 -#: git-rebase.sh:401

9731 +#: git-rebase.sh:409

9732 #, sh-format

9733 msgid ""

9734 "It seems that there is already a $state_dir_base directory, and\n"

@@ -9661,65 +9741,65 @@ msgid ""

9741 "valuable there."

9742 msgstr ""

9743

9664 -#: git-rebase.sh:446

9744 +#: git-rebase.sh:456

9745 #, sh-format

9746 msgid "invalid upstream $upstream_name"

9747 msgstr ""

9748

9669 -#: git-rebase.sh:470

9749 +#: git-rebase.sh:480

9750 #, sh-format

9751 msgid "$onto_name: there are more than one merge bases"

9752 msgstr ""

9753

9674 -#: git-rebase.sh:473 git-rebase.sh:477

9754 +#: git-rebase.sh:483 git-rebase.sh:487

9755 #, sh-format

9756 msgid "$onto_name: there is no merge base"

9757 msgstr ""

9758

9679 -#: git-rebase.sh:482

9759 +#: git-rebase.sh:492

9760 #, sh-format

9761 msgid "Does not point to a valid commit: $onto_name"

9762 msgstr ""

9763

9684 -#: git-rebase.sh:505

9764 +#: git-rebase.sh:515

9765 #, sh-format

9766 msgid "fatal: no such branch: $branch_name"

9767 msgstr ""

9768

9689 -#: git-rebase.sh:528

9769 +#: git-rebase.sh:548

9770 msgid "Cannot autostash"

9771 msgstr ""

9772

9693 -#: git-rebase.sh:533

9773 +#: git-rebase.sh:553

9774 #, sh-format

9775 msgid "Created autostash: $stash_abbrev"

9776 msgstr ""

9777

9698 -#: git-rebase.sh:537

9778 +#: git-rebase.sh:557

9779 msgid "Please commit or stash them."

9780 msgstr ""

9781

9702 -#: git-rebase.sh:557

9782 +#: git-rebase.sh:577

9783 #, sh-format

9784 msgid "Current branch $branch_name is up to date."

9785 msgstr ""

9786

9707 -#: git-rebase.sh:561

9787 +#: git-rebase.sh:581

9788 #, sh-format

9789 msgid "Current branch $branch_name is up to date, rebase forced."

9790 msgstr ""

9791

9712 -#: git-rebase.sh:572

9792 +#: git-rebase.sh:592

9793 #, sh-format

9794 msgid "Changes from $mb to $onto:"

9795 msgstr ""

9796

9797 #. Detach HEAD and reset the tree

9718 -#: git-rebase.sh:581

9798 +#: git-rebase.sh:601

9799 msgid "First, rewinding head to replay your work on top of it..."

9800 msgstr ""

9801

9722 -#: git-rebase.sh:591

9802 +#: git-rebase.sh:611

9803 #, sh-format

9804 msgid "Fast-forwarded $branch_name to $onto_name."

9805 msgstr ""

@@ -9957,177 +10037,177 @@ msgstr ""

10037 msgid "Entering '$prefix$displaypath'"

10038 msgstr ""

10039

9960 -#: git-submodule.sh:554

10040 +#: git-submodule.sh:559

10041 #, sh-format

10042 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."

10043 msgstr ""

10044

9965 -#: git-submodule.sh:600

10045 +#: git-submodule.sh:605

10046 #, sh-format

10047 msgid "No url found for submodule path '$displaypath' in .gitmodules"

10048 msgstr ""

10049

9970 -#: git-submodule.sh:609

10050 +#: git-submodule.sh:614

10051 #, sh-format

10052 msgid "Failed to register url for submodule path '$displaypath'"

10053 msgstr ""

10054

9975 -#: git-submodule.sh:611

10055 +#: git-submodule.sh:616

10056 #, sh-format

10057 msgid "Submodule '$name' ($url) registered for path '$displaypath'"

10058 msgstr ""

10059

9980 -#: git-submodule.sh:619

10060 +#: git-submodule.sh:633

10061 #, sh-format

10062 msgid "Failed to register update mode for submodule path '$displaypath'"

10063 msgstr ""

10064

9985 -#: git-submodule.sh:656

10065 +#: git-submodule.sh:671

10066 #, sh-format

10067 msgid "Use '.' if you really want to deinitialize all submodules"

10068 msgstr ""

10069

9990 -#: git-submodule.sh:673

10070 +#: git-submodule.sh:688

10071 #, sh-format

10072 msgid "Submodule work tree '$displaypath' contains a .git directory"

10073 msgstr ""

10074

9995 -#: git-submodule.sh:674

10075 +#: git-submodule.sh:689

10076 #, sh-format

10077 msgid ""

10078 "(use 'rm -rf' if you really want to remove it including all of its history)"

10079 msgstr ""

10080

10001 -#: git-submodule.sh:680

10081 +#: git-submodule.sh:695

10082 #, sh-format

10083 msgid ""

10084 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "

10085 "discard them"

10086 msgstr ""

10087

10008 -#: git-submodule.sh:683

10088 +#: git-submodule.sh:698

10089 #, sh-format

10090 msgid "Cleared directory '$displaypath'"

10091 msgstr ""

10092

10013 -#: git-submodule.sh:684

10093 +#: git-submodule.sh:699

10094 #, sh-format

10095 msgid "Could not remove submodule work tree '$displaypath'"

10096 msgstr ""

10097

10018 -#: git-submodule.sh:687

10098 +#: git-submodule.sh:702

10099 #, sh-format

10100 msgid "Could not create empty submodule directory '$displaypath'"

10101 msgstr ""

10102

10023 -#: git-submodule.sh:696

10103 +#: git-submodule.sh:711

10104 #, sh-format

10105 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"

10106 msgstr ""

10107

10028 -#: git-submodule.sh:811

10108 +#: git-submodule.sh:834

10109 #, sh-format

10110 msgid ""

10111 "Submodule path '$displaypath' not initialized\n"

10112 "Maybe you want to use 'update --init'?"

10113 msgstr ""

10114

10035 -#: git-submodule.sh:824

10115 +#: git-submodule.sh:847

10116 #, sh-format

10117 msgid "Unable to find current revision in submodule path '$displaypath'"

10118 msgstr ""

10119

10040 -#: git-submodule.sh:833

10120 +#: git-submodule.sh:856

10121 #, sh-format

10122 msgid "Unable to fetch in submodule path '$sm_path'"

10123 msgstr ""

10124

10045 -#: git-submodule.sh:857

10125 +#: git-submodule.sh:880

10126 #, sh-format

10127 msgid "Unable to fetch in submodule path '$displaypath'"

10128 msgstr ""

10129

10050 -#: git-submodule.sh:871

10130 +#: git-submodule.sh:894

10131 #, sh-format

10132 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"

10133 msgstr ""

10134

10055 -#: git-submodule.sh:872

10135 +#: git-submodule.sh:895

10136 #, sh-format

10137 msgid "Submodule path '$displaypath': rebased into '$sha1'"

10138 msgstr ""

10139

10060 -#: git-submodule.sh:877

10140 +#: git-submodule.sh:900

10141 #, sh-format

10142 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"

10143 msgstr ""

10144

10065 -#: git-submodule.sh:878

10145 +#: git-submodule.sh:901

10146 #, sh-format

10147 msgid "Submodule path '$displaypath': merged in '$sha1'"

10148 msgstr ""

10149

10070 -#: git-submodule.sh:883

10150 +#: git-submodule.sh:906

10151 #, sh-format

10152 msgid ""

10153 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"

10154 msgstr ""

10155

10076 -#: git-submodule.sh:884

10156 +#: git-submodule.sh:907

10157 #, sh-format

10158 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"

10159 msgstr ""

10160

10081 -#: git-submodule.sh:889

10161 +#: git-submodule.sh:912

10162 #, sh-format

10163 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"

10164 msgstr ""

10165

10086 -#: git-submodule.sh:890

10166 +#: git-submodule.sh:913

10167 #, sh-format

10168 msgid "Submodule path '$displaypath': checked out '$sha1'"

10169 msgstr ""

10170

10091 -#: git-submodule.sh:917

10171 +#: git-submodule.sh:940

10172 #, sh-format

10173 msgid "Failed to recurse into submodule path '$displaypath'"

10174 msgstr ""

10175

10096 -#: git-submodule.sh:1025

10176 +#: git-submodule.sh:1048

10177 msgid "The --cached option cannot be used with the --files option"

10178 msgstr ""

10179

10180 #. unexpected type

10101 -#: git-submodule.sh:1073

10181 +#: git-submodule.sh:1096

10182 #, sh-format

10183 msgid "unexpected mode $mod_dst"

10184 msgstr ""

10185

10106 -#: git-submodule.sh:1093

10186 +#: git-submodule.sh:1116

10187 #, sh-format

10188 msgid " Warn: $display_name doesn't contain commit $sha1_src"

10189 msgstr ""

10190

10111 -#: git-submodule.sh:1096

10191 +#: git-submodule.sh:1119

10192 #, sh-format

10193 msgid " Warn: $display_name doesn't contain commit $sha1_dst"

10194 msgstr ""

10195

10116 -#: git-submodule.sh:1099

10196 +#: git-submodule.sh:1122

10197 #, sh-format

10198 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"

10199 msgstr ""

10200

10121 -#: git-submodule.sh:1124

10201 +#: git-submodule.sh:1147

10202 msgid "blob"

10203 msgstr ""

10204

10125 -#: git-submodule.sh:1238

10205 +#: git-submodule.sh:1261

10206 #, sh-format

10207 msgid "Failed to recurse into submodule path '$sm_path'"

10208 msgstr ""

10209

10130 -#: git-submodule.sh:1302

10210 +#: git-submodule.sh:1325

10211 #, sh-format

10212 msgid "Synchronizing submodule url for '$displaypath'"

10213 msgstr ""

l10n: git.pot: v1.9 round 1 (27 new, 11 removed)