c08fd7307c · 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: 2019-05-14 17:09+0800\n"

11 +"POT-Creation-Date: 2019-05-31 14:35+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"

@@ -582,7 +582,7 @@ msgid "Unable to write new index file"

582 msgstr ""

583

584 #: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213

585 -#: builtin/clone.c:123 builtin/fetch.c:118 builtin/merge.c:271

585 +#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271

586 #: builtin/pull.c:207 builtin/submodule--helper.c:407

587 #: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369

588 #: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852

@@ -775,7 +775,7 @@ msgstr ""

775 #: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091

776 #: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105

777 #: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412

778 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:176

778 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177

779 msgid "file"

780 msgstr ""

781

@@ -807,7 +807,7 @@ msgstr ""

807 msgid "list supported archive formats"

808 msgstr ""

809

810 -#: archive.c:477 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

810 +#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113

811 #: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858

812 msgid "repo"

813 msgstr ""

@@ -816,7 +816,7 @@ msgstr ""

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

817 msgstr ""

818

819 -#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:713

819 +#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707

820 #: builtin/notes.c:498

821 msgid "command"

822 msgstr ""

@@ -1341,155 +1341,155 @@ msgstr ""

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

1342 msgstr ""

1343

1344 -#: commit-graph.c:388

1344 +#: commit-graph.c:390

1345 #, c-format

1346 msgid "could not find commit %s"

1347 msgstr ""

1348

1349 -#: commit-graph.c:730 builtin/pack-objects.c:2649

1349 +#: commit-graph.c:732 builtin/pack-objects.c:2649

1350 #, c-format

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

1352 msgstr ""

1353

1354 -#: commit-graph.c:763

1354 +#: commit-graph.c:765

1355 msgid "Loading known commits in commit graph"

1356 msgstr ""

1357

1358 -#: commit-graph.c:779

1358 +#: commit-graph.c:781

1359 msgid "Expanding reachable commits in commit graph"

1360 msgstr ""

1361

1362 -#: commit-graph.c:791

1362 +#: commit-graph.c:793

1363 msgid "Clearing commit marks in commit graph"

1364 msgstr ""

1365

1366 -#: commit-graph.c:811

1366 +#: commit-graph.c:813

1367 msgid "Computing commit graph generation numbers"

1368 msgstr ""

1369

1370 -#: commit-graph.c:928

1370 +#: commit-graph.c:930

1371 #, c-format

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

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

1374 msgstr[0] ""

1375 msgstr[1] ""

1376

1377 -#: commit-graph.c:941

1377 +#: commit-graph.c:943

1378 #, c-format

1379 msgid "error adding pack %s"

1380 msgstr ""

1381

1382 -#: commit-graph.c:943

1382 +#: commit-graph.c:945

1383 #, c-format

1384 msgid "error opening index for %s"

1385 msgstr ""

1386

1387 -#: commit-graph.c:957

1387 +#: commit-graph.c:959

1388 #, c-format

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

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

1391 msgstr[0] ""

1392 msgstr[1] ""

1393

1394 -#: commit-graph.c:989

1394 +#: commit-graph.c:991

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

1396 msgstr ""

1397

1398 -#: commit-graph.c:1002

1398 +#: commit-graph.c:1004

1399 msgid "Counting distinct commits in commit graph"

1400 msgstr ""

1401

1402 -#: commit-graph.c:1015

1402 +#: commit-graph.c:1017

1403 #, c-format

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

1405 msgstr ""

1406

1407 -#: commit-graph.c:1024

1407 +#: commit-graph.c:1026

1408 msgid "Finding extra edges in commit graph"

1409 msgstr ""

1410

1411 -#: commit-graph.c:1048

1411 +#: commit-graph.c:1050

1412 msgid "too many commits to write graph"

1413 msgstr ""

1414

1415 -#: commit-graph.c:1055 midx.c:805

1415 +#: commit-graph.c:1057 midx.c:819

1416 #, c-format

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

1418 msgstr ""

1419

1420 -#: commit-graph.c:1095

1420 +#: commit-graph.c:1097

1421 #, c-format

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

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

1424 msgstr[0] ""

1425 msgstr[1] ""

1426

1427 -#: commit-graph.c:1160

1427 +#: commit-graph.c:1162

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

1429 msgstr ""

1430

1431 -#: commit-graph.c:1170

1431 +#: commit-graph.c:1172

1432 #, c-format

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

1434 msgstr ""

1435

1436 -#: commit-graph.c:1180 commit-graph.c:1195

1436 +#: commit-graph.c:1182 commit-graph.c:1197

1437 #, c-format

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

1439 msgstr ""

1440

1441 -#: commit-graph.c:1187

1441 +#: commit-graph.c:1189

1442 #, c-format

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

1444 msgstr ""

1445

1446 -#: commit-graph.c:1204

1446 +#: commit-graph.c:1206

1447 msgid "Verifying commits in commit graph"

1448 msgstr ""

1449

1450 -#: commit-graph.c:1217

1450 +#: commit-graph.c:1219

1451 #, c-format

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

1453 msgstr ""

1454

1455 -#: commit-graph.c:1224

1455 +#: commit-graph.c:1226

1456 #, c-format

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

1458 msgstr ""

1459

1460 -#: commit-graph.c:1234

1460 +#: commit-graph.c:1236

1461 #, c-format

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

1463 msgstr ""

1464

1465 -#: commit-graph.c:1240

1465 +#: commit-graph.c:1242

1466 #, c-format

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

1468 msgstr ""

1469

1470 -#: commit-graph.c:1253

1470 +#: commit-graph.c:1255

1471 #, c-format

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

1473 msgstr ""

1474

1475 -#: commit-graph.c:1258

1475 +#: commit-graph.c:1260

1476 #, c-format

1477 msgid ""

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

1479 msgstr ""

1480

1481 -#: commit-graph.c:1262

1481 +#: commit-graph.c:1264

1482 #, c-format

1483 msgid ""

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

1485 msgstr ""

1486

1487 -#: commit-graph.c:1277

1487 +#: commit-graph.c:1279

1488 #, c-format

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

1490 msgstr ""

1491

1492 -#: commit-graph.c:1283

1492 +#: commit-graph.c:1285

1493 #, c-format

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

1495 msgstr ""

@@ -2258,8 +2258,8 @@ msgstr ""

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

2259 msgstr ""

2260

2261 -#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5216

2262 -#: parse-options.c:200

2261 +#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217

2262 +#: parse-options.c:199 parse-options.c:203

2263 #, c-format

2264 msgid "%s expects a numerical value"

2265 msgstr ""

@@ -2322,437 +2322,437 @@ msgstr ""

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

2323 msgstr ""

2324

2325 -#: diff.c:5240

2325 +#: diff.c:5242

2326 #, c-format

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

2328 msgstr ""

2329

2330 -#: diff.c:5263

2330 +#: diff.c:5265

2331 msgid "Diff output format options"

2332 msgstr ""

2333

2334 -#: diff.c:5265 diff.c:5271

2334 +#: diff.c:5267 diff.c:5273

2335 msgid "generate patch"

2336 msgstr ""

2337

2338 -#: diff.c:5268 builtin/log.c:167

2338 +#: diff.c:5270 builtin/log.c:167

2339 msgid "suppress diff output"

2340 msgstr ""

2341

2342 -#: diff.c:5273 diff.c:5387 diff.c:5394

2342 +#: diff.c:5275 diff.c:5389 diff.c:5396

2343 msgid "<n>"

2344 msgstr ""

2345

2346 -#: diff.c:5274 diff.c:5277

2346 +#: diff.c:5276 diff.c:5279

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

2348 msgstr ""

2349

2350 -#: diff.c:5279

2350 +#: diff.c:5281

2351 msgid "generate the diff in raw format"

2352 msgstr ""

2353

2354 -#: diff.c:5282

2354 +#: diff.c:5284

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

2356 msgstr ""

2357

2358 -#: diff.c:5286

2358 +#: diff.c:5288

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

2360 msgstr ""

2361

2362 -#: diff.c:5290

2362 +#: diff.c:5292

2363 msgid "machine friendly --stat"

2364 msgstr ""

2365

2366 -#: diff.c:5293

2366 +#: diff.c:5295

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

2368 msgstr ""

2369

2370 -#: diff.c:5295 diff.c:5303

2370 +#: diff.c:5297 diff.c:5305

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

2372 msgstr ""

2373

2374 -#: diff.c:5296

2374 +#: diff.c:5298

2375 msgid ""

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

2377 msgstr ""

2378

2379 -#: diff.c:5300

2379 +#: diff.c:5302

2380 msgid "synonym for --dirstat=cumulative"

2381 msgstr ""

2382

2383 -#: diff.c:5304

2383 +#: diff.c:5306

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

2385 msgstr ""

2386

2387 -#: diff.c:5308

2387 +#: diff.c:5310

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

2389 msgstr ""

2390

2391 -#: diff.c:5311

2391 +#: diff.c:5313

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

2393 msgstr ""

2394

2395 -#: diff.c:5314

2395 +#: diff.c:5316

2396 msgid "show only names of changed files"

2397 msgstr ""

2398

2399 -#: diff.c:5317

2399 +#: diff.c:5319

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

2401 msgstr ""

2402

2403 -#: diff.c:5319

2403 +#: diff.c:5321

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

2405 msgstr ""

2406

2407 -#: diff.c:5320

2407 +#: diff.c:5322

2408 msgid "generate diffstat"

2409 msgstr ""

2410

2411 -#: diff.c:5322 diff.c:5325 diff.c:5328

2411 +#: diff.c:5324 diff.c:5327 diff.c:5330

2412 msgid "<width>"

2413 msgstr ""

2414

2415 -#: diff.c:5323

2415 +#: diff.c:5325

2416 msgid "generate diffstat with a given width"

2417 msgstr ""

2418

2419 -#: diff.c:5326

2419 +#: diff.c:5328

2420 msgid "generate diffstat with a given name width"

2421 msgstr ""

2422

2423 -#: diff.c:5329

2423 +#: diff.c:5331

2424 msgid "generate diffstat with a given graph width"

2425 msgstr ""

2426

2427 -#: diff.c:5331

2427 +#: diff.c:5333

2428 msgid "<count>"

2429 msgstr ""

2430

2431 -#: diff.c:5332

2431 +#: diff.c:5334

2432 msgid "generate diffstat with limited lines"

2433 msgstr ""

2434

2435 -#: diff.c:5335

2435 +#: diff.c:5337

2436 msgid "generate compact summary in diffstat"

2437 msgstr ""

2438

2439 -#: diff.c:5338

2439 +#: diff.c:5340

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

2441 msgstr ""

2442

2443 -#: diff.c:5341

2443 +#: diff.c:5343

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

2445 msgstr ""

2446

2447 -#: diff.c:5343

2447 +#: diff.c:5345

2448 msgid "show colored diff"

2449 msgstr ""

2450

2451 -#: diff.c:5344

2451 +#: diff.c:5346

2452 msgid "<kind>"

2453 msgstr ""

2454

2455 -#: diff.c:5345

2455 +#: diff.c:5347

2456 msgid ""

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

2458 "diff"

2459 msgstr ""

2460

2461 -#: diff.c:5348

2461 +#: diff.c:5350

2462 msgid ""

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

2464 "--numstat"

2465 msgstr ""

2466

2467 -#: diff.c:5351 diff.c:5354 diff.c:5357 diff.c:5463

2467 +#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465

2468 msgid "<prefix>"

2469 msgstr ""

2470

2471 -#: diff.c:5352

2471 +#: diff.c:5354

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

2473 msgstr ""

2474

2475 -#: diff.c:5355

2475 +#: diff.c:5357

2476 msgid "show the given source prefix instead of \"b/\""

2477 msgstr ""

2478

2479 -#: diff.c:5358

2479 +#: diff.c:5360

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

2481 msgstr ""

2482

2483 -#: diff.c:5361

2483 +#: diff.c:5363

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

2485 msgstr ""

2486

2487 -#: diff.c:5364

2487 +#: diff.c:5366

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

2489 msgstr ""

2490

2491 -#: diff.c:5368 diff.c:5373 diff.c:5378

2491 +#: diff.c:5370 diff.c:5375 diff.c:5380

2492 msgid "<char>"

2493 msgstr ""

2494

2495 -#: diff.c:5369

2495 +#: diff.c:5371

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

2497 msgstr ""

2498

2499 -#: diff.c:5374

2499 +#: diff.c:5376

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

2501 msgstr ""

2502

2503 -#: diff.c:5379

2503 +#: diff.c:5381

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

2505 msgstr ""

2506

2507 -#: diff.c:5382

2507 +#: diff.c:5384

2508 msgid "Diff rename options"

2509 msgstr ""

2510

2511 -#: diff.c:5383

2511 +#: diff.c:5385

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

2513 msgstr ""

2514

2515 -#: diff.c:5384

2515 +#: diff.c:5386

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

2517 msgstr ""

2518

2519 -#: diff.c:5388

2519 +#: diff.c:5390

2520 msgid "detect renames"

2521 msgstr ""

2522

2523 -#: diff.c:5392

2523 +#: diff.c:5394

2524 msgid "omit the preimage for deletes"

2525 msgstr ""

2526

2527 -#: diff.c:5395

2527 +#: diff.c:5397

2528 msgid "detect copies"

2529 msgstr ""

2530

2531 -#: diff.c:5399

2531 +#: diff.c:5401

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

2533 msgstr ""

2534

2535 -#: diff.c:5401

2535 +#: diff.c:5403

2536 msgid "disable rename detection"

2537 msgstr ""

2538

2539 -#: diff.c:5404

2539 +#: diff.c:5406

2540 msgid "use empty blobs as rename source"

2541 msgstr ""

2542

2543 -#: diff.c:5406

2543 +#: diff.c:5408

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

2545 msgstr ""

2546

2547 -#: diff.c:5409

2547 +#: diff.c:5411

2548 msgid ""

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

2550 "given limit"

2551 msgstr ""

2552

2553 -#: diff.c:5411

2553 +#: diff.c:5413

2554 msgid "Diff algorithm options"

2555 msgstr ""

2556

2557 -#: diff.c:5413

2557 +#: diff.c:5415

2558 msgid "produce the smallest possible diff"

2559 msgstr ""

2560

2561 -#: diff.c:5416

2561 +#: diff.c:5418

2562 msgid "ignore whitespace when comparing lines"

2563 msgstr ""

2564

2565 -#: diff.c:5419

2565 +#: diff.c:5421

2566 msgid "ignore changes in amount of whitespace"

2567 msgstr ""

2568

2569 -#: diff.c:5422

2569 +#: diff.c:5424

2570 msgid "ignore changes in whitespace at EOL"

2571 msgstr ""

2572

2573 -#: diff.c:5425

2573 +#: diff.c:5427

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

2575 msgstr ""

2576

2577 -#: diff.c:5428

2577 +#: diff.c:5430

2578 msgid "ignore changes whose lines are all blank"

2579 msgstr ""

2580

2581 -#: diff.c:5431

2581 +#: diff.c:5433

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

2583 msgstr ""

2584

2585 -#: diff.c:5434

2585 +#: diff.c:5436

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

2587 msgstr ""

2588

2589 -#: diff.c:5438

2589 +#: diff.c:5440

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

2591 msgstr ""

2592

2593 -#: diff.c:5440

2593 +#: diff.c:5442

2594 msgid "<algorithm>"

2595 msgstr ""

2596

2597 -#: diff.c:5441

2597 +#: diff.c:5443

2598 msgid "choose a diff algorithm"

2599 msgstr ""

2600

2601 -#: diff.c:5443

2601 +#: diff.c:5445

2602 msgid "<text>"

2603 msgstr ""

2604

2605 -#: diff.c:5444

2605 +#: diff.c:5446

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

2607 msgstr ""

2608

2609 -#: diff.c:5446 diff.c:5455 diff.c:5458

2609 +#: diff.c:5448 diff.c:5457 diff.c:5460

2610 msgid "<mode>"

2611 msgstr ""

2612

2613 -#: diff.c:5447

2613 +#: diff.c:5449

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

2615 msgstr ""

2616

2617 -#: diff.c:5449 diff.c:5452 diff.c:5497

2617 +#: diff.c:5451 diff.c:5454 diff.c:5499

2618 msgid "<regex>"

2619 msgstr ""

2620

2621 -#: diff.c:5450

2621 +#: diff.c:5452

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

2623 msgstr ""

2624

2625 -#: diff.c:5453

2625 +#: diff.c:5455

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

2627 msgstr ""

2628

2629 -#: diff.c:5456

2630 -msgid "move lines of code are colored differently"

2629 +#: diff.c:5458

2630 +msgid "moved lines of code are colored differently"

2631 msgstr ""

2632

2633 -#: diff.c:5459

2633 +#: diff.c:5461

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

2635 msgstr ""

2636

2637 -#: diff.c:5462

2638 -msgid "Diff other options"

2637 +#: diff.c:5464

2638 +msgid "Other diff options"

2639 msgstr ""

2640

2641 -#: diff.c:5464

2641 +#: diff.c:5466

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

2643 msgstr ""

2644

2645 -#: diff.c:5468

2645 +#: diff.c:5470

2646 msgid "treat all files as text"

2647 msgstr ""

2648

2649 -#: diff.c:5470

2649 +#: diff.c:5472

2650 msgid "swap two inputs, reverse the diff"

2651 msgstr ""

2652

2653 -#: diff.c:5472

2653 +#: diff.c:5474

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

2655 msgstr ""

2656

2657 -#: diff.c:5474

2657 +#: diff.c:5476

2658 msgid "disable all output of the program"

2659 msgstr ""

2660

2661 -#: diff.c:5476

2661 +#: diff.c:5478

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

2663 msgstr ""

2664

2665 -#: diff.c:5478

2665 +#: diff.c:5480

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

2667 msgstr ""

2668

2669 -#: diff.c:5480

2669 +#: diff.c:5482

2670 msgid "<when>"

2671 msgstr ""

2672

2673 -#: diff.c:5481

2673 +#: diff.c:5483

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

2675 msgstr ""

2676

2677 -#: diff.c:5484

2677 +#: diff.c:5486

2678 msgid "<format>"

2679 msgstr ""

2680

2681 -#: diff.c:5485

2681 +#: diff.c:5487

2682 msgid "specify how differences in submodules are shown"

2683 msgstr ""

2684

2685 -#: diff.c:5489

2685 +#: diff.c:5491

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

2687 msgstr ""

2688

2689 -#: diff.c:5492

2689 +#: diff.c:5494

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

2691 msgstr ""

2692

2693 -#: diff.c:5494

2693 +#: diff.c:5496

2694 msgid "<string>"

2695 msgstr ""

2696

2697 -#: diff.c:5495

2697 +#: diff.c:5497

2698 msgid ""

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

2700 "string"

2701 msgstr ""

2702

2703 -#: diff.c:5498

2703 +#: diff.c:5500

2704 msgid ""

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

2706 "regex"

2707 msgstr ""

2708

2709 -#: diff.c:5501

2709 +#: diff.c:5503

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

2711 msgstr ""

2712

2713 -#: diff.c:5504

2713 +#: diff.c:5506

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

2715 msgstr ""

2716

2717 -#: diff.c:5507

2717 +#: diff.c:5509

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

2719 msgstr ""

2720

2721 -#: diff.c:5508

2721 +#: diff.c:5510

2722 msgid "<object-id>"

2723 msgstr ""

2724

2725 -#: diff.c:5509

2725 +#: diff.c:5511

2726 msgid ""

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

2728 "object"

2729 msgstr ""

2730

2731 -#: diff.c:5511

2731 +#: diff.c:5513

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

2733 msgstr ""

2734

2735 -#: diff.c:5512

2735 +#: diff.c:5514

2736 msgid "select files by diff type"

2737 msgstr ""

2738

2739 -#: diff.c:5514

2739 +#: diff.c:5516

2740 msgid "<file>"

2741 msgstr ""

2742

2743 -#: diff.c:5515

2743 +#: diff.c:5517

2744 msgid "Output to a specific file"

2745 msgstr ""

2746

2747 -#: diff.c:6148

2747 +#: diff.c:6150

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

2749 msgstr ""

2750

2751 -#: diff.c:6151

2751 +#: diff.c:6153

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

2753 msgstr ""

2754

2755 -#: diff.c:6154

2755 +#: diff.c:6156

2756 #, c-format

2757 msgid ""

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

@@ -3064,7 +3064,7 @@ msgstr ""

3064 msgid "no matching remote head"

3065 msgstr ""

3066

3067 -#: fetch-pack.c:1699 builtin/clone.c:676

3067 +#: fetch-pack.c:1699 builtin/clone.c:673

3068 msgid "remote did not send all necessary objects"

3069 msgstr ""

3070

@@ -3101,7 +3101,7 @@ msgstr ""

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

3102 msgstr ""

3103

3104 -#: grep.c:2130 setup.c:164 builtin/clone.c:414 builtin/diff.c:82

3104 +#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82

3105 #: builtin/rm.c:135

3106 #, c-format

3107 msgid "failed to stat '%s'"

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

3355 msgstr ""

3356

3357 #: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921

3358 -#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:776

3358 +#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773

3359 #: builtin/stash.c:264

3360 msgid "unable to write new index file"

3361 msgstr ""

@@ -3799,77 +3799,77 @@ msgstr ""

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

3800 msgstr ""

3801

3802 -#: midx.c:209

3802 +#: midx.c:208

3803 #, c-format

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

3805 msgstr ""

3806

3807 -#: midx.c:250

3807 +#: midx.c:258

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

3809 msgstr ""

3810

3811 -#: midx.c:275

3811 +#: midx.c:286

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

3813 msgstr ""

3814

3815 -#: midx.c:443

3815 +#: midx.c:457

3816 #, c-format

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

3818 msgstr ""

3819

3820 -#: midx.c:449

3820 +#: midx.c:463

3821 #, c-format

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

3823 msgstr ""

3824

3825 -#: midx.c:543

3825 +#: midx.c:557

3826 #, c-format

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

3828 msgstr ""

3829

3830 -#: midx.c:979

3830 +#: midx.c:993

3831 #, c-format

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

3833 msgstr ""

3834

3835 -#: midx.c:1034

3835 +#: midx.c:1048

3836 msgid "Looking for referenced packfiles"

3837 msgstr ""

3838

3839 -#: midx.c:1049

3839 +#: midx.c:1063

3840 #, c-format

3841 msgid ""

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

3843 msgstr ""

3844

3845 -#: midx.c:1053

3845 +#: midx.c:1067

3846 msgid "Verifying OID order in MIDX"

3847 msgstr ""

3848

3849 -#: midx.c:1062

3849 +#: midx.c:1076

3850 #, c-format

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

3852 msgstr ""

3853

3854 -#: midx.c:1081

3854 +#: midx.c:1095

3855 msgid "Sorting objects by packfile"

3856 msgstr ""

3857

3858 -#: midx.c:1087

3858 +#: midx.c:1101

3859 msgid "Verifying object offsets"

3860 msgstr ""

3861

3862 -#: midx.c:1103

3862 +#: midx.c:1117

3863 #, c-format

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

3865 msgstr ""

3866

3867 -#: midx.c:1109

3867 +#: midx.c:1123

3868 #, c-format

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

3870 msgstr ""

3871

3872 -#: midx.c:1118

3872 +#: midx.c:1132

3873 #, c-format

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

3875 msgstr ""

@@ -3954,12 +3954,12 @@ msgstr ""

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

3955 msgstr ""

3956

3957 -#: packfile.c:1880

3957 +#: packfile.c:1868

3958 #, c-format

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

3960 msgstr ""

3961

3962 -#: packfile.c:1884

3962 +#: packfile.c:1872

3963 #, c-format

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

3965 msgstr ""

@@ -3979,7 +3979,7 @@ msgstr ""

3979 msgid "%s : incompatible with something else"

3980 msgstr ""

3981

3982 -#: parse-options.c:92 parse-options.c:96 parse-options.c:287

3982 +#: parse-options.c:92 parse-options.c:96 parse-options.c:319

3983 #, c-format

3984 msgid "%s takes no value"

3985 msgstr ""

@@ -3989,41 +3989,41 @@ msgstr ""

3989 msgid "%s isn't available"

3990 msgstr ""

3991

3992 -#: parse-options.c:216

3992 +#: parse-options.c:219

3993 #, c-format

3994 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

3995 msgstr ""

3996

3997 -#: parse-options.c:356

3997 +#: parse-options.c:389

3998 #, c-format

3999 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

4000 msgstr ""

4001

4002 -#: parse-options.c:390 parse-options.c:398

4002 +#: parse-options.c:423 parse-options.c:431

4003 #, c-format

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

4005 msgstr ""

4006

4007 -#: parse-options.c:733

4007 +#: parse-options.c:859

4008 #, c-format

4009 msgid "unknown option `%s'"

4010 msgstr ""

4011

4012 -#: parse-options.c:735

4012 +#: parse-options.c:861

4013 #, c-format

4014 msgid "unknown switch `%c'"

4015 msgstr ""

4016

4017 -#: parse-options.c:737

4017 +#: parse-options.c:863

4018 #, c-format

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

4020 msgstr ""

4021

4022 -#: parse-options.c:759

4022 +#: parse-options.c:887

4023 msgid "..."

4024 msgstr ""

4025

4026 -#: parse-options.c:778

4026 +#: parse-options.c:906

4027 #, c-format

4028 msgid "usage: %s"

4029 msgstr ""

@@ -4031,36 +4031,41 @@ msgstr ""

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

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

4033 #.

4034 -#: parse-options.c:784

4034 +#: parse-options.c:912

4035 #, c-format

4036 msgid " or: %s"

4037 msgstr ""

4038

4039 -#: parse-options.c:787

4039 +#: parse-options.c:915

4040 #, c-format

4041 msgid " %s"

4042 msgstr ""

4043

4044 -#: parse-options.c:826

4044 +#: parse-options.c:954

4045 msgid "-NUM"

4046 msgstr ""

4047

4048 -#: parse-options-cb.c:21

4048 +#: parse-options.c:968

4049 +#, c-format

4050 +msgid "alias of --%s"

4051 +msgstr ""

4052 +

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

4054 #, c-format

4055 msgid "option `%s' expects a numerical value"

4056 msgstr ""

4057

4053 -#: parse-options-cb.c:38

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

4059 #, c-format

4060 msgid "malformed expiration date '%s'"

4061 msgstr ""

4062

4058 -#: parse-options-cb.c:51

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

4064 #, c-format

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

4066 msgstr ""

4067

4063 -#: parse-options-cb.c:127 parse-options-cb.c:144

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

4069 #, c-format

4070 msgid "malformed object name '%s'"

4071 msgstr ""

@@ -4391,32 +4396,32 @@ msgstr ""

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

4397 msgstr ""

4398

4394 -#: read-cache.c:2988 wrapper.c:658 builtin/merge.c:1117

4399 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117

4400 #, c-format

4401 msgid "could not close '%s'"

4402 msgstr ""

4403

4399 -#: read-cache.c:3091 sequencer.c:2354 sequencer.c:3807

4404 +#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807

4405 #, c-format

4406 msgid "could not stat '%s'"

4407 msgstr ""

4408

4404 -#: read-cache.c:3104

4409 +#: read-cache.c:3105

4410 #, c-format

4411 msgid "unable to open git dir: %s"

4412 msgstr ""

4413

4409 -#: read-cache.c:3116

4414 +#: read-cache.c:3117

4415 #, c-format

4416 msgid "unable to unlink: %s"

4417 msgstr ""

4418

4414 -#: read-cache.c:3141

4419 +#: read-cache.c:3142

4420 #, c-format

4421 msgid "cannot fix permission bits on '%s'"

4422 msgstr ""

4423

4419 -#: read-cache.c:3290

4424 +#: read-cache.c:3291

4425 #, c-format

4426 msgid "%s: cannot drop to stage #0"

4427 msgstr ""

@@ -4633,7 +4638,7 @@ msgstr ""

4638 msgid "invalid refspec '%s'"

4639 msgstr ""

4640

4636 -#: ref-filter.c:39 wt-status.c:1907

4641 +#: ref-filter.c:39 wt-status.c:1909

4642 msgid "gone"

4643 msgstr ""

4644

@@ -5834,7 +5839,7 @@ msgstr ""

5839 msgid "Could not merge %.*s"

5840 msgstr ""

5841

5837 -#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:639

5842 +#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633

5843 #, c-format

5844 msgid "could not copy '%s' to '%s'"

5845 msgstr ""

@@ -6478,16 +6483,16 @@ msgstr ""

6483 msgid "unable to unpack contents of %s"

6484 msgstr ""

6485

6481 -#: sha1-name.c:487

6486 +#: sha1-name.c:490

6487 #, c-format

6488 msgid "short SHA1 %s is ambiguous"

6489 msgstr ""

6490

6486 -#: sha1-name.c:498

6491 +#: sha1-name.c:501

6492 msgid "The candidates are:"

6493 msgstr ""

6494

6490 -#: sha1-name.c:794

6495 +#: sha1-name.c:800

6496 msgid ""

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

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

@@ -7394,202 +7399,202 @@ msgstr ""

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

7400 msgstr ""

7401

7397 -#: wt-status.c:1282

7402 +#: wt-status.c:1284

7403 msgid "git-rebase-todo is missing."

7404 msgstr ""

7405

7401 -#: wt-status.c:1284

7406 +#: wt-status.c:1286

7407 msgid "No commands done."

7408 msgstr ""

7409

7405 -#: wt-status.c:1287

7410 +#: wt-status.c:1289

7411 #, c-format

7412 msgid "Last command done (%d command done):"

7413 msgid_plural "Last commands done (%d commands done):"

7414 msgstr[0] ""

7415 msgstr[1] ""

7416

7412 -#: wt-status.c:1298

7417 +#: wt-status.c:1300

7418 #, c-format

7419 msgid " (see more in file %s)"

7420 msgstr ""

7421

7417 -#: wt-status.c:1303

7422 +#: wt-status.c:1305

7423 msgid "No commands remaining."

7424 msgstr ""

7425

7421 -#: wt-status.c:1306

7426 +#: wt-status.c:1308

7427 #, c-format

7428 msgid "Next command to do (%d remaining command):"

7429 msgid_plural "Next commands to do (%d remaining commands):"

7430 msgstr[0] ""

7431 msgstr[1] ""

7432

7428 -#: wt-status.c:1314

7433 +#: wt-status.c:1316

7434 msgid " (use \"git rebase --edit-todo\" to view and edit)"

7435 msgstr ""

7436

7432 -#: wt-status.c:1326

7437 +#: wt-status.c:1328

7438 #, c-format

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

7440 msgstr ""

7441

7437 -#: wt-status.c:1331

7442 +#: wt-status.c:1333

7443 msgid "You are currently rebasing."

7444 msgstr ""

7445

7441 -#: wt-status.c:1344

7446 +#: wt-status.c:1346

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

7448 msgstr ""

7449

7445 -#: wt-status.c:1346

7450 +#: wt-status.c:1348

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

7452 msgstr ""

7453

7449 -#: wt-status.c:1348

7454 +#: wt-status.c:1350

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

7456 msgstr ""

7457

7453 -#: wt-status.c:1355

7458 +#: wt-status.c:1357

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

7460 msgstr ""

7461

7457 -#: wt-status.c:1359

7462 +#: wt-status.c:1361

7463 #, c-format

7464 msgid ""

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

7466 msgstr ""

7467

7463 -#: wt-status.c:1364

7468 +#: wt-status.c:1366

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

7470 msgstr ""

7471

7467 -#: wt-status.c:1367

7472 +#: wt-status.c:1369

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

7474 msgstr ""

7475

7471 -#: wt-status.c:1371

7476 +#: wt-status.c:1373

7477 #, c-format

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

7479 msgstr ""

7480

7476 -#: wt-status.c:1376

7481 +#: wt-status.c:1378

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

7483 msgstr ""

7484

7480 -#: wt-status.c:1379

7485 +#: wt-status.c:1381

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

7487 msgstr ""

7488

7484 -#: wt-status.c:1381

7489 +#: wt-status.c:1383

7490 msgid ""

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

7492 msgstr ""

7493

7489 -#: wt-status.c:1392

7494 +#: wt-status.c:1394

7495 msgid "Cherry-pick currently in progress."

7496 msgstr ""

7497

7493 -#: wt-status.c:1395

7498 +#: wt-status.c:1397

7499 #, c-format

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

7501 msgstr ""

7502

7498 -#: wt-status.c:1402

7503 +#: wt-status.c:1404

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

7505 msgstr ""

7506

7502 -#: wt-status.c:1405

7507 +#: wt-status.c:1407

7508 msgid " (run \"git cherry-pick --continue\" to continue)"

7509 msgstr ""

7510

7506 -#: wt-status.c:1408

7511 +#: wt-status.c:1410

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

7513 msgstr ""

7514

7510 -#: wt-status.c:1410

7515 +#: wt-status.c:1412

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

7517 msgstr ""

7518

7514 -#: wt-status.c:1420

7519 +#: wt-status.c:1422

7520 msgid "Revert currently in progress."

7521 msgstr ""

7522

7518 -#: wt-status.c:1423

7523 +#: wt-status.c:1425

7524 #, c-format

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

7526 msgstr ""

7527

7523 -#: wt-status.c:1429

7528 +#: wt-status.c:1431

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

7530 msgstr ""

7531

7527 -#: wt-status.c:1432

7532 +#: wt-status.c:1434

7533 msgid " (run \"git revert --continue\" to continue)"

7534 msgstr ""

7535

7531 -#: wt-status.c:1435

7536 +#: wt-status.c:1437

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

7538 msgstr ""

7539

7535 -#: wt-status.c:1437

7540 +#: wt-status.c:1439

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

7542 msgstr ""

7543

7539 -#: wt-status.c:1447

7544 +#: wt-status.c:1449

7545 #, c-format

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

7547 msgstr ""

7548

7544 -#: wt-status.c:1451

7549 +#: wt-status.c:1453

7550 msgid "You are currently bisecting."

7551 msgstr ""

7552

7548 -#: wt-status.c:1454

7553 +#: wt-status.c:1456

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

7555 msgstr ""

7556

7552 -#: wt-status.c:1663

7557 +#: wt-status.c:1665

7558 msgid "On branch "

7559 msgstr ""

7560

7556 -#: wt-status.c:1670

7561 +#: wt-status.c:1672

7562 msgid "interactive rebase in progress; onto "

7563 msgstr ""

7564

7560 -#: wt-status.c:1672

7565 +#: wt-status.c:1674

7566 msgid "rebase in progress; onto "

7567 msgstr ""

7568

7564 -#: wt-status.c:1677

7569 +#: wt-status.c:1679

7570 msgid "HEAD detached at "

7571 msgstr ""

7572

7568 -#: wt-status.c:1679

7573 +#: wt-status.c:1681

7574 msgid "HEAD detached from "

7575 msgstr ""

7576

7572 -#: wt-status.c:1682

7577 +#: wt-status.c:1684

7578 msgid "Not currently on any branch."

7579 msgstr ""

7580

7576 -#: wt-status.c:1699

7581 +#: wt-status.c:1701

7582 msgid "Initial commit"

7583 msgstr ""

7584

7580 -#: wt-status.c:1700

7585 +#: wt-status.c:1702

7586 msgid "No commits yet"

7587 msgstr ""

7588

7584 -#: wt-status.c:1714

7589 +#: wt-status.c:1716

7590 msgid "Untracked files"

7591 msgstr ""

7592

7588 -#: wt-status.c:1716

7593 +#: wt-status.c:1718

7594 msgid "Ignored files"

7595 msgstr ""

7596

7592 -#: wt-status.c:1720

7597 +#: wt-status.c:1722

7598 #, c-format

7599 msgid ""

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

@@ -7597,92 +7602,92 @@ msgid ""

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

7603 msgstr ""

7604

7600 -#: wt-status.c:1726

7605 +#: wt-status.c:1728

7606 #, c-format

7607 msgid "Untracked files not listed%s"

7608 msgstr ""

7609

7605 -#: wt-status.c:1728

7610 +#: wt-status.c:1730

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

7612 msgstr ""

7613

7609 -#: wt-status.c:1734

7614 +#: wt-status.c:1736

7615 msgid "No changes"

7616 msgstr ""

7617

7613 -#: wt-status.c:1739

7618 +#: wt-status.c:1741

7619 #, c-format

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

7621 msgstr ""

7622

7618 -#: wt-status.c:1742

7623 +#: wt-status.c:1744

7624 #, c-format

7625 msgid "no changes added to commit\n"

7626 msgstr ""

7627

7623 -#: wt-status.c:1745

7628 +#: wt-status.c:1747

7629 #, c-format

7630 msgid ""

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

7632 "track)\n"

7633 msgstr ""

7634

7630 -#: wt-status.c:1748

7635 +#: wt-status.c:1750

7636 #, c-format

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

7638 msgstr ""

7639

7635 -#: wt-status.c:1751

7640 +#: wt-status.c:1753

7641 #, c-format

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

7643 msgstr ""

7644

7640 -#: wt-status.c:1754 wt-status.c:1759

7645 +#: wt-status.c:1756 wt-status.c:1761

7646 #, c-format

7647 msgid "nothing to commit\n"

7648 msgstr ""

7649

7645 -#: wt-status.c:1757

7650 +#: wt-status.c:1759

7651 #, c-format

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

7653 msgstr ""

7654

7650 -#: wt-status.c:1761

7655 +#: wt-status.c:1763

7656 #, c-format

7657 msgid "nothing to commit, working tree clean\n"

7658 msgstr ""

7659

7655 -#: wt-status.c:1874

7660 +#: wt-status.c:1876

7661 msgid "No commits yet on "

7662 msgstr ""

7663

7659 -#: wt-status.c:1878

7664 +#: wt-status.c:1880

7665 msgid "HEAD (no branch)"

7666 msgstr ""

7667

7663 -#: wt-status.c:1909

7668 +#: wt-status.c:1911

7669 msgid "different"

7670 msgstr ""

7671

7667 -#: wt-status.c:1911 wt-status.c:1919

7672 +#: wt-status.c:1913 wt-status.c:1921

7673 msgid "behind "

7674 msgstr ""

7675

7671 -#: wt-status.c:1914 wt-status.c:1917

7676 +#: wt-status.c:1916 wt-status.c:1919

7677 msgid "ahead "

7678 msgstr ""

7679

7680 #. TRANSLATORS: the action is e.g. "pull with rebase"

7676 -#: wt-status.c:2441

7681 +#: wt-status.c:2443

7682 #, c-format

7683 msgid "cannot %s: You have unstaged changes."

7684 msgstr ""

7685

7681 -#: wt-status.c:2447

7686 +#: wt-status.c:2449

7687 msgid "additionally, your index contains uncommitted changes."

7688 msgstr ""

7689

7685 -#: wt-status.c:2449

7690 +#: wt-status.c:2451

7691 #, c-format

7692 msgid "cannot %s: Your index contains uncommitted changes."

7693 msgstr ""

@@ -7909,7 +7914,7 @@ msgstr ""

7914 msgid "Patch format detection failed."

7915 msgstr ""

7916

7912 -#: builtin/am.c:949 builtin/clone.c:412

7917 +#: builtin/am.c:949 builtin/clone.c:409

7918 #, c-format

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

7920 msgstr ""

@@ -8128,8 +8133,8 @@ msgstr ""

8133 #: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247

8134 #: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412

8135 #: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323

8131 -#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:397

8132 -#: parse-options.h:140 parse-options.h:161 parse-options.h:303

8136 +#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397

8137 +#: parse-options.h:141 parse-options.h:162 parse-options.h:311

8138 msgid "n"

8139 msgstr ""

8140

@@ -8972,7 +8977,7 @@ msgstr ""

8977 msgid "format to use for the output"

8978 msgstr ""

8979

8975 -#: builtin/branch.c:676 builtin/clone.c:751

8980 +#: builtin/branch.c:676 builtin/clone.c:748

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

8982 msgstr ""

8983

@@ -9380,7 +9385,7 @@ msgstr ""

9385 msgid "HEAD is now at"

9386 msgstr ""

9387

9383 -#: builtin/checkout.c:894 builtin/clone.c:704

9388 +#: builtin/checkout.c:894 builtin/clone.c:701

9389 msgid "unable to update HEAD"

9390 msgstr ""

9391

@@ -9500,7 +9505,7 @@ msgstr ""

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

9506 msgstr ""

9507

9503 -#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:121

9508 +#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118

9509 #: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492

9510 #: builtin/worktree.c:494

9511 msgid "branch"

@@ -9554,7 +9559,7 @@ msgstr ""

9559 msgid "update ignored files (default)"

9560 msgstr ""

9561

9557 -#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:309

9562 +#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317

9563 msgid "style"

9564 msgstr ""

9565

@@ -9768,7 +9773,7 @@ msgstr ""

9773 #: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548

9774 #: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173

9775 #: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419

9771 -#: builtin/show-ref.c:178

9776 +#: builtin/show-ref.c:179

9777 msgid "pattern"

9778 msgstr ""

9779

@@ -9828,304 +9833,304 @@ msgstr ""

9833 msgid "setup as shared repository"

9834 msgstr ""

9835

9831 -#: builtin/clone.c:103 builtin/clone.c:107

9836 +#: builtin/clone.c:104

9837 msgid "pathspec"

9838 msgstr ""

9839

9835 -#: builtin/clone.c:103 builtin/clone.c:107

9840 +#: builtin/clone.c:104

9841 msgid "initialize submodules in the clone"

9842 msgstr ""

9843

9839 -#: builtin/clone.c:110

9844 +#: builtin/clone.c:107

9845 msgid "number of submodules cloned in parallel"

9846 msgstr ""

9847

9843 -#: builtin/clone.c:111 builtin/init-db.c:486

9848 +#: builtin/clone.c:108 builtin/init-db.c:486

9849 msgid "template-directory"

9850 msgstr ""

9851

9847 -#: builtin/clone.c:112 builtin/init-db.c:487

9852 +#: builtin/clone.c:109 builtin/init-db.c:487

9853 msgid "directory from which templates will be used"

9854 msgstr ""

9855

9851 -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1379

9856 +#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379

9857 #: builtin/submodule--helper.c:1859

9858 msgid "reference repository"

9859 msgstr ""

9860

9856 -#: builtin/clone.c:118 builtin/submodule--helper.c:1381

9861 +#: builtin/clone.c:115 builtin/submodule--helper.c:1381

9862 #: builtin/submodule--helper.c:1861

9863 msgid "use --reference only while cloning"

9864 msgstr ""

9865

9861 -#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46

9866 +#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46

9867 #: builtin/pack-objects.c:3306 builtin/repack.c:329

9868 msgid "name"

9869 msgstr ""

9870

9866 -#: builtin/clone.c:120

9871 +#: builtin/clone.c:117

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

9873 msgstr ""

9874

9870 -#: builtin/clone.c:122

9875 +#: builtin/clone.c:119

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

9877 msgstr ""

9878

9874 -#: builtin/clone.c:124

9879 +#: builtin/clone.c:121

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

9881 msgstr ""

9882

9878 -#: builtin/clone.c:125 builtin/fetch.c:142 builtin/grep.c:836

9883 +#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836

9884 #: builtin/pull.c:225

9885 msgid "depth"

9886 msgstr ""

9887

9883 -#: builtin/clone.c:126

9888 +#: builtin/clone.c:123

9889 msgid "create a shallow clone of that depth"

9890 msgstr ""

9891

9887 -#: builtin/clone.c:127 builtin/fetch.c:144 builtin/pack-objects.c:3295

9892 +#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295

9893 msgid "time"

9894 msgstr ""

9895

9891 -#: builtin/clone.c:128

9896 +#: builtin/clone.c:125

9897 msgid "create a shallow clone since a specific time"

9898 msgstr ""

9899

9895 -#: builtin/clone.c:129 builtin/fetch.c:146 builtin/fetch.c:169

9900 +#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169

9901 #: builtin/rebase.c:1389

9902 msgid "revision"

9903 msgstr ""

9904

9900 -#: builtin/clone.c:130 builtin/fetch.c:147

9905 +#: builtin/clone.c:127 builtin/fetch.c:147

9906 msgid "deepen history of shallow clone, excluding rev"

9907 msgstr ""

9908

9904 -#: builtin/clone.c:132

9909 +#: builtin/clone.c:129

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

9911 msgstr ""

9912

9908 -#: builtin/clone.c:134

9913 +#: builtin/clone.c:131

9914 msgid "don't clone any tags, and make later fetches not to follow them"

9915 msgstr ""

9916

9912 -#: builtin/clone.c:136

9917 +#: builtin/clone.c:133

9918 msgid "any cloned submodules will be shallow"

9919 msgstr ""

9920

9916 -#: builtin/clone.c:137 builtin/init-db.c:495

9921 +#: builtin/clone.c:134 builtin/init-db.c:495

9922 msgid "gitdir"

9923 msgstr ""

9924

9920 -#: builtin/clone.c:138 builtin/init-db.c:496

9925 +#: builtin/clone.c:135 builtin/init-db.c:496

9926 msgid "separate git dir from working tree"

9927 msgstr ""

9928

9924 -#: builtin/clone.c:139

9929 +#: builtin/clone.c:136

9930 msgid "key=value"

9931 msgstr ""

9932

9928 -#: builtin/clone.c:140

9933 +#: builtin/clone.c:137

9934 msgid "set config inside the new repository"

9935 msgstr ""

9936

9932 -#: builtin/clone.c:142 builtin/fetch.c:164 builtin/ls-remote.c:76

9937 +#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76

9938 #: builtin/push.c:585 builtin/send-pack.c:172

9939 msgid "server-specific"

9940 msgstr ""

9941

9937 -#: builtin/clone.c:142 builtin/fetch.c:164 builtin/ls-remote.c:76

9942 +#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76

9943 #: builtin/push.c:585 builtin/send-pack.c:173

9944 msgid "option to transmit"

9945 msgstr ""

9946

9942 -#: builtin/clone.c:143 builtin/fetch.c:165 builtin/pull.c:238

9947 +#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238

9948 #: builtin/push.c:586

9949 msgid "use IPv4 addresses only"

9950 msgstr ""

9951

9947 -#: builtin/clone.c:145 builtin/fetch.c:167 builtin/pull.c:241

9952 +#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241

9953 #: builtin/push.c:588

9954 msgid "use IPv6 addresses only"

9955 msgstr ""

9956

9952 -#: builtin/clone.c:283

9957 +#: builtin/clone.c:280

9958 msgid ""

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

9960 "Please specify a directory on the command line"

9961 msgstr ""

9962

9958 -#: builtin/clone.c:336

9963 +#: builtin/clone.c:333

9964 #, c-format

9965 msgid "info: Could not add alternate for '%s': %s\n"

9966 msgstr ""

9967

9963 -#: builtin/clone.c:408

9968 +#: builtin/clone.c:405

9969 #, c-format

9970 msgid "failed to open '%s'"

9971 msgstr ""

9972

9968 -#: builtin/clone.c:416

9973 +#: builtin/clone.c:413

9974 #, c-format

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

9976 msgstr ""

9977

9973 -#: builtin/clone.c:430

9978 +#: builtin/clone.c:427

9979 #, c-format

9980 msgid "failed to stat %s\n"

9981 msgstr ""

9982

9978 -#: builtin/clone.c:447

9983 +#: builtin/clone.c:444

9984 #, c-format

9985 msgid "failed to unlink '%s'"

9986 msgstr ""

9987

9983 -#: builtin/clone.c:452

9988 +#: builtin/clone.c:449

9989 #, c-format

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

9991 msgstr ""

9992

9988 -#: builtin/clone.c:456

9993 +#: builtin/clone.c:453

9994 #, c-format

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

9996 msgstr ""

9997

9993 -#: builtin/clone.c:482

9998 +#: builtin/clone.c:479

9999 #, c-format

10000 msgid "done.\n"

10001 msgstr ""

10002

9998 -#: builtin/clone.c:496

10003 +#: builtin/clone.c:493

10004 msgid ""

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

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

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

10008 msgstr ""

10009

10005 -#: builtin/clone.c:573

10010 +#: builtin/clone.c:570

10011 #, c-format

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

10013 msgstr ""

10014

10010 -#: builtin/clone.c:692

10015 +#: builtin/clone.c:689

10016 #, c-format

10017 msgid "unable to update %s"

10018 msgstr ""

10019

10015 -#: builtin/clone.c:742

10020 +#: builtin/clone.c:739

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

10022 msgstr ""

10023

10019 -#: builtin/clone.c:773

10024 +#: builtin/clone.c:770

10025 msgid "unable to checkout working tree"

10026 msgstr ""

10027

10023 -#: builtin/clone.c:818

10028 +#: builtin/clone.c:815

10029 msgid "unable to write parameters to config file"

10030 msgstr ""

10031

10027 -#: builtin/clone.c:881

10032 +#: builtin/clone.c:878

10033 msgid "cannot repack to clean up"

10034 msgstr ""

10035

10031 -#: builtin/clone.c:883

10036 +#: builtin/clone.c:880

10037 msgid "cannot unlink temporary alternates file"

10038 msgstr ""

10039

10035 -#: builtin/clone.c:923 builtin/receive-pack.c:1952

10040 +#: builtin/clone.c:920 builtin/receive-pack.c:1952

10041 msgid "Too many arguments."

10042 msgstr ""

10043

10039 -#: builtin/clone.c:927

10044 +#: builtin/clone.c:924

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

10046 msgstr ""

10047

10043 -#: builtin/clone.c:940

10048 +#: builtin/clone.c:937

10049 #, c-format

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

10051 msgstr ""

10052

10048 -#: builtin/clone.c:943

10053 +#: builtin/clone.c:940

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

10055 msgstr ""

10056

10052 -#: builtin/clone.c:956

10057 +#: builtin/clone.c:953

10058 #, c-format

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

10060 msgstr ""

10061

10057 -#: builtin/clone.c:962 builtin/fetch.c:1610

10062 +#: builtin/clone.c:959 builtin/fetch.c:1610

10063 #, c-format

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

10065 msgstr ""

10066

10062 -#: builtin/clone.c:972

10067 +#: builtin/clone.c:969

10068 #, c-format

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

10070 msgstr ""

10071

10067 -#: builtin/clone.c:982

10072 +#: builtin/clone.c:979

10073 #, c-format

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

10075 msgstr ""

10076

10072 -#: builtin/clone.c:997 builtin/clone.c:1018 builtin/difftool.c:270

10077 +#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264

10078 #: builtin/worktree.c:296 builtin/worktree.c:328

10079 #, c-format

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

10081 msgstr ""

10082

10078 -#: builtin/clone.c:1002

10083 +#: builtin/clone.c:999

10084 #, c-format

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

10086 msgstr ""

10087

10083 -#: builtin/clone.c:1022

10088 +#: builtin/clone.c:1019

10089 #, c-format

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

10091 msgstr ""

10092

10088 -#: builtin/clone.c:1024

10093 +#: builtin/clone.c:1021

10094 #, c-format

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

10096 msgstr ""

10097

10093 -#: builtin/clone.c:1048

10098 +#: builtin/clone.c:1045

10099 msgid ""

10100 "clone --recursive is not compatible with both --reference and --reference-if-"

10101 "able"

10102 msgstr ""

10103

10099 -#: builtin/clone.c:1109

10104 +#: builtin/clone.c:1106

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

10106 msgstr ""

10107

10103 -#: builtin/clone.c:1111

10108 +#: builtin/clone.c:1108

10109 msgid "--shallow-since is ignored in local clones; use file:// instead."

10110 msgstr ""

10111

10107 -#: builtin/clone.c:1113

10112 +#: builtin/clone.c:1110

10113 msgid "--shallow-exclude is ignored in local clones; use file:// instead."

10114 msgstr ""

10115

10111 -#: builtin/clone.c:1115

10116 +#: builtin/clone.c:1112

10117 msgid "--filter is ignored in local clones; use file:// instead."

10118 msgstr ""

10119

10115 -#: builtin/clone.c:1118

10120 +#: builtin/clone.c:1115

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

10122 msgstr ""

10123

10119 -#: builtin/clone.c:1123

10124 +#: builtin/clone.c:1120

10125 msgid "--local is ignored"

10126 msgstr ""

10127

10123 -#: builtin/clone.c:1200 builtin/clone.c:1208

10128 +#: builtin/clone.c:1197 builtin/clone.c:1205

10129 #, c-format

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

10131 msgstr ""

10132

10128 -#: builtin/clone.c:1211

10133 +#: builtin/clone.c:1208

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

10135 msgstr ""

10136

@@ -10518,7 +10523,7 @@ msgstr ""

10523

10524 #: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517

10525 #: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465

10521 -#: parse-options.h:323

10526 +#: parse-options.h:331

10527 msgid "mode"

10528 msgstr ""

10529

@@ -10532,7 +10537,7 @@ msgid ""

10537 "traditional)"

10538 msgstr ""

10539

10535 -#: builtin/commit.c:1342 parse-options.h:178

10540 +#: builtin/commit.c:1342 parse-options.h:179

10541 msgid "when"

10542 msgstr ""

10543

@@ -10591,7 +10596,7 @@ msgid "override date for commit"

10596 msgstr ""

10597

10598 #: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483

10594 -#: builtin/commit.c:1484 parse-options.h:315 ref-filter.h:92

10599 +#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92

10600 msgid "commit"

10601 msgstr ""

10602

@@ -11256,105 +11261,113 @@ msgstr ""

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

11262 msgstr ""

11263

11259 -#: builtin/difftool.c:31

11264 +#: builtin/difftool.c:30

11265 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"

11266 msgstr ""

11267

11263 -#: builtin/difftool.c:259

11268 +#: builtin/difftool.c:253

11269 #, c-format

11270 msgid "failed: %d"

11271 msgstr ""

11272

11268 -#: builtin/difftool.c:301

11273 +#: builtin/difftool.c:295

11274 #, c-format

11275 msgid "could not read symlink %s"

11276 msgstr ""

11277

11273 -#: builtin/difftool.c:303

11278 +#: builtin/difftool.c:297

11279 #, c-format

11280 msgid "could not read symlink file %s"

11281 msgstr ""

11282

11278 -#: builtin/difftool.c:311

11283 +#: builtin/difftool.c:305

11284 #, c-format

11285 msgid "could not read object %s for symlink %s"

11286 msgstr ""

11287

11283 -#: builtin/difftool.c:412

11288 +#: builtin/difftool.c:406

11289 msgid ""

11290 "combined diff formats('-c' and '--cc') are not supported in\n"

11291 "directory diff mode('-d' and '--dir-diff')."

11292 msgstr ""

11293

11289 -#: builtin/difftool.c:632

11294 +#: builtin/difftool.c:626

11295 #, c-format

11296 msgid "both files modified: '%s' and '%s'."

11297 msgstr ""

11298

11294 -#: builtin/difftool.c:634

11299 +#: builtin/difftool.c:628

11300 msgid "working tree file has been left."

11301 msgstr ""

11302

11298 -#: builtin/difftool.c:645

11303 +#: builtin/difftool.c:639

11304 #, c-format

11305 msgid "temporary files exist in '%s'."

11306 msgstr ""

11307

11303 -#: builtin/difftool.c:646

11308 +#: builtin/difftool.c:640

11309 msgid "you may want to cleanup or recover these."

11310 msgstr ""

11311

11307 -#: builtin/difftool.c:695

11312 +#: builtin/difftool.c:689

11313 msgid "use `diff.guitool` instead of `diff.tool`"

11314 msgstr ""

11315

11311 -#: builtin/difftool.c:697

11316 +#: builtin/difftool.c:691

11317 msgid "perform a full-directory diff"

11318 msgstr ""

11319

11315 -#: builtin/difftool.c:699

11320 +#: builtin/difftool.c:693

11321 msgid "do not prompt before launching a diff tool"

11322 msgstr ""

11323

11319 -#: builtin/difftool.c:704

11324 +#: builtin/difftool.c:698

11325 msgid "use symlinks in dir-diff mode"

11326 msgstr ""

11327

11323 -#: builtin/difftool.c:705

11328 +#: builtin/difftool.c:699

11329 msgid "tool"

11330 msgstr ""

11331

11327 -#: builtin/difftool.c:706

11332 +#: builtin/difftool.c:700

11333 msgid "use the specified diff tool"

11334 msgstr ""

11335

11331 -#: builtin/difftool.c:708

11336 +#: builtin/difftool.c:702

11337 msgid "print a list of diff tools that may be used with `--tool`"

11338 msgstr ""

11339

11335 -#: builtin/difftool.c:711

11340 +#: builtin/difftool.c:705

11341 msgid ""

11342 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "

11343 "code"

11344 msgstr ""

11345

11341 -#: builtin/difftool.c:714

11346 +#: builtin/difftool.c:708

11347 msgid "specify a custom command for viewing diffs"

11348 msgstr ""

11349

11345 -#: builtin/difftool.c:715

11350 +#: builtin/difftool.c:709

11351 msgid "passed to `diff`"

11352 msgstr ""

11353

11349 -#: builtin/difftool.c:730

11354 +#: builtin/difftool.c:724

11355 msgid "difftool requires worktree or --no-index"

11356 msgstr ""

11357

11353 -#: builtin/difftool.c:744

11358 +#: builtin/difftool.c:731

11359 +msgid "--dir-diff is incompatible with --no-index"

11360 +msgstr ""

11361 +

11362 +#: builtin/difftool.c:734

11363 +msgid "--gui, --tool and --extcmd are mutually exclusive"

11364 +msgstr ""

11365 +

11366 +#: builtin/difftool.c:742

11367 msgid "no <tool> given for --tool=<tool>"

11368 msgstr ""

11369

11357 -#: builtin/difftool.c:751

11370 +#: builtin/difftool.c:749

11371 msgid "no <cmd> given for --extcmd=<cmd>"

11372 msgstr ""

11373

@@ -14989,15 +15002,15 @@ msgstr ""

15002 msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"

15003 msgstr ""

15004

14992 -#: builtin/pack-refs.c:7

15005 +#: builtin/pack-refs.c:8

15006 msgid "git pack-refs [<options>]"

15007 msgstr ""

15008

14996 -#: builtin/pack-refs.c:15

15009 +#: builtin/pack-refs.c:16

15010 msgid "pack everything"

15011 msgstr ""

15012

15000 -#: builtin/pack-refs.c:16

15013 +#: builtin/pack-refs.c:17

15014 msgid "prune loose refs (default)"

15015 msgstr ""

15016

@@ -17639,45 +17652,45 @@ msgstr ""

17652 msgid "cannot find commit %s (%s)"

17653 msgstr ""

17654

17642 -#: builtin/show-ref.c:11

17655 +#: builtin/show-ref.c:12

17656 msgid ""

17657 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"

17658 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"

17659 msgstr ""

17660

17648 -#: builtin/show-ref.c:12

17661 +#: builtin/show-ref.c:13

17662 msgid "git show-ref --exclude-existing[=<pattern>]"

17663 msgstr ""

17664

17652 -#: builtin/show-ref.c:161

17665 +#: builtin/show-ref.c:162

17666 msgid "only show tags (can be combined with heads)"

17667 msgstr ""

17668

17656 -#: builtin/show-ref.c:162

17669 +#: builtin/show-ref.c:163

17670 msgid "only show heads (can be combined with tags)"

17671 msgstr ""

17672

17660 -#: builtin/show-ref.c:163

17673 +#: builtin/show-ref.c:164

17674 msgid "stricter reference checking, requires exact ref path"

17675 msgstr ""

17676

17664 -#: builtin/show-ref.c:166 builtin/show-ref.c:168

17677 +#: builtin/show-ref.c:167 builtin/show-ref.c:169

17678 msgid "show the HEAD reference, even if it would be filtered out"

17679 msgstr ""

17680

17668 -#: builtin/show-ref.c:170

17681 +#: builtin/show-ref.c:171

17682 msgid "dereference tags into object IDs"

17683 msgstr ""

17684

17672 -#: builtin/show-ref.c:172

17685 +#: builtin/show-ref.c:173

17686 msgid "only show SHA1 hash using <n> digits"

17687 msgstr ""

17688

17676 -#: builtin/show-ref.c:176

17689 +#: builtin/show-ref.c:177

17690 msgid "do not print results to stdout (useful with --verify)"

17691 msgstr ""

17692

17680 -#: builtin/show-ref.c:178

17693 +#: builtin/show-ref.c:179

17694 msgid "show refs from stdin that aren't in local repository"

17695 msgstr ""

17696

@@ -18399,7 +18412,7 @@ msgstr ""

18412 #: builtin/tag.c:210

18413 #, c-format

18414 msgid ""

18402 -"You have created a nested tag. The object referred to by your new is\n"

18415 +"You have created a nested tag. The object referred to by your new tag is\n"

18416 "already a tag. If you meant to tag the object that it points to, use:\n"

18417 "\n"

18418 "\tgit tag -f %s %s^{}"

@@ -19462,27 +19475,27 @@ msgstr ""

19475 msgid "object filtering"

19476 msgstr ""

19477

19465 -#: parse-options.h:169

19478 +#: parse-options.h:170

19479 msgid "expiry-date"

19480 msgstr ""

19481

19469 -#: parse-options.h:183

19482 +#: parse-options.h:184

19483 msgid "no-op (backward compatibility)"

19484 msgstr ""

19485

19473 -#: parse-options.h:296

19486 +#: parse-options.h:304

19487 msgid "be more verbose"

19488 msgstr ""

19489

19477 -#: parse-options.h:298

19490 +#: parse-options.h:306

19491 msgid "be more quiet"

19492 msgstr ""

19493

19481 -#: parse-options.h:304

19494 +#: parse-options.h:312

19495 msgid "use <n> digits to display SHA-1s"

19496 msgstr ""

19497

19485 -#: parse-options.h:323

19498 +#: parse-options.h:331

19499 msgid "how to strip spaces and #comments from message"

19500 msgstr ""

19501

l10n: git.pot: v2.22.0 round 2 (6 new, 3 removed)