1c8ba5f1b3 · matheusbsbs/matheus-bagliano

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

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2019-05-14 17:09+0800\n"

11 -"PO-Revision-Date: 2019-05-28 11:32-0500\n"

10 +"POT-Creation-Date: 2019-05-31 14:35+0800\n"

11 +"PO-Revision-Date: 2019-06-03 09:33-0500\n"

12 "Last-Translator: christopher.diaz.riv@gmail.com\n"

13 "Language-Team: CodeLabora <codelabora@gmail.com>\n"

14 "Language: es\n"

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

622 msgstr "No es posible escribir el archivo índice"

623

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

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

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

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

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

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

@@ -823,7 +823,7 @@ msgstr "anteponer prefijo a cada ruta en el archivo"

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

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

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

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

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

827 msgid "file"

828 msgstr "carpeta"

829

@@ -855,7 +855,7 @@ msgstr "comprimir mejor"

855 msgid "list supported archive formats"

856 msgstr "listar los formatos de carpeta soportados"

857

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

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

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

860 msgid "repo"

861 msgstr "repo"

@@ -864,7 +864,7 @@ msgstr "repo"

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

865 msgstr "obtener la carpeta del repositorio remoto <repo>"

866

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

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

868 #: builtin/notes.c:498

869 msgid "command"

870 msgstr "comando"

@@ -1447,161 +1447,161 @@ msgstr "offset del chunk de commit-graph inapropiado %08x%08x"

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

1448 msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos"

1449

1450 -#: commit-graph.c:388

1450 +#: commit-graph.c:390

1451 #, c-format

1452 msgid "could not find commit %s"

1453 msgstr "no se pudo encontrar commit %s"

1454

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

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

1456 #, c-format

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

1458 msgstr "incapaz de obtener el tipo de objeto: %s"

1459

1460 -#: commit-graph.c:763

1460 +#: commit-graph.c:765

1461 msgid "Loading known commits in commit graph"

1462 msgstr "Cargando commits conocidos en commit graph"

1463

1464 -#: commit-graph.c:779

1464 +#: commit-graph.c:781

1465 msgid "Expanding reachable commits in commit graph"

1466 msgstr "Expandiendo commits alcanzables en commit graph"

1467

1468 -#: commit-graph.c:791

1468 +#: commit-graph.c:793

1469 msgid "Clearing commit marks in commit graph"

1470 msgstr "Limpiando marcas de commits en commit graph"

1471

1472 -#: commit-graph.c:811

1472 +#: commit-graph.c:813

1473 msgid "Computing commit graph generation numbers"

1474 msgstr "Calculando números de generación de commit graph"

1475

1476 -#: commit-graph.c:928

1476 +#: commit-graph.c:930

1477 #, c-format

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

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

1480 msgstr[0] "Encontrando commits para commit graph en %d pack"

1481 msgstr[1] "Encontrando commits para commit graph en %d packs"

1482

1483 -#: commit-graph.c:941

1483 +#: commit-graph.c:943

1484 #, c-format

1485 msgid "error adding pack %s"

1486 msgstr "error agregando pack %s"

1487

1488 -#: commit-graph.c:943

1488 +#: commit-graph.c:945

1489 #, c-format

1490 msgid "error opening index for %s"

1491 msgstr "error abriendo index para %s"

1492

1493 -#: commit-graph.c:957

1493 +#: commit-graph.c:959

1494 #, c-format

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

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

1497 msgstr[0] "Encontrando commits para commit graph de %d ref"

1498 msgstr[1] "Encontrando commits para commit graph de %d refs"

1499

1500 -#: commit-graph.c:989

1500 +#: commit-graph.c:991

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

1502 msgstr "Encontrando commits para commit graph entre los objetos empaquetados"

1503

1504 -#: commit-graph.c:1002

1504 +#: commit-graph.c:1004

1505 msgid "Counting distinct commits in commit graph"

1506 msgstr "Contando commits distintos en commit graph"

1507

1508 -#: commit-graph.c:1015

1508 +#: commit-graph.c:1017

1509 #, c-format

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

1511 msgstr "el formato de gráficos de commit no pudede escribir %d commits"

1512

1513 -#: commit-graph.c:1024

1513 +#: commit-graph.c:1026

1514 msgid "Finding extra edges in commit graph"

1515 msgstr "Encontrando esquinas extra en commit graph"

1516

1517 -#: commit-graph.c:1048

1517 +#: commit-graph.c:1050

1518 msgid "too many commits to write graph"

1519 msgstr "demasiados commits para escribir el gráfico"

1520

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

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

1522 #, c-format

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

1524 msgstr "no se pudo crear directorios principales para %s"

1525

1526 -#: commit-graph.c:1095

1526 +#: commit-graph.c:1097

1527 #, c-format

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

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

1530 msgstr[0] "Escribiendo commit graph en %d paso"

1531 msgstr[1] "Escribiendo commit graph en %d pasos"

1532

1533 -#: commit-graph.c:1160

1533 +#: commit-graph.c:1162

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

1535 msgstr ""

1536 "el archivo de commit-graph tiene checksums incorrectos y probablemente está "

1537 "corrupto"

1538

1539 -#: commit-graph.c:1170

1539 +#: commit-graph.c:1172

1540 #, c-format

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

1542 msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s"

1543

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

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

1545 #, c-format

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

1547 msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u"

1548

1549 -#: commit-graph.c:1187

1549 +#: commit-graph.c:1189

1550 #, c-format

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

1552 msgstr "falló al analizar commit %s para commit-graph"

1553

1554 -#: commit-graph.c:1204

1554 +#: commit-graph.c:1206

1555 msgid "Verifying commits in commit graph"

1556 msgstr "Verificando commits en commit graph"

1557

1558 -#: commit-graph.c:1217

1558 +#: commit-graph.c:1219

1559 #, c-format

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

1561 msgstr ""

1562 "falló al analizar el commit %s de la base de datos de objetos para commit-"

1563 "graph"

1564

1565 -#: commit-graph.c:1224

1565 +#: commit-graph.c:1226

1566 #, c-format

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

1568 msgstr "árbol raíz OID para commit %s en commit-graph es %s != %s"

1569

1570 -#: commit-graph.c:1234

1570 +#: commit-graph.c:1236

1571 #, c-format

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

1573 msgstr "lista padre de commit-graph para commit %s es muy larga"

1574

1575 -#: commit-graph.c:1240

1575 +#: commit-graph.c:1242

1576 #, c-format

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

1578 msgstr "padre de commit-graph para %s es %s != %s"

1579

1580 -#: commit-graph.c:1253

1580 +#: commit-graph.c:1255

1581 #, c-format

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

1583 msgstr "lista padre de commit-graph para commit %s termina antes"

1584

1585 -#: commit-graph.c:1258

1585 +#: commit-graph.c:1260

1586 #, c-format

1587 msgid ""

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

1589 msgstr ""

1590 "commit-graph ha generado número cero para %s, pero no-cero para los demás"

1591

1592 -#: commit-graph.c:1262

1592 +#: commit-graph.c:1264

1593 #, c-format

1594 msgid ""

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

1596 msgstr ""

1597 "commit-graph tiene generación no-cero para %s, pero cero para los demás"

1598

1599 -#: commit-graph.c:1277

1599 +#: commit-graph.c:1279

1600 #, c-format

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

1602 msgstr "generación commit-graph para commit %s es %u != %u"

1603

1604 -#: commit-graph.c:1283

1604 +#: commit-graph.c:1285

1605 #, c-format

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

1607 msgstr ""

@@ -2413,8 +2413,8 @@ msgstr "--follow requiere exactamente un pathspec"

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

2414 msgstr "valor --stat inválido: %s"

2415

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

2417 -#: parse-options.c:200

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

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

2418 #, c-format

2419 msgid "%s expects a numerical value"

2420 msgstr "%s espera un valor numérico"

@@ -2481,144 +2481,144 @@ msgstr "argumento inválido para %s"

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

2482 msgstr "falló al analizar parámetro de opción --submodule: '%s'"

2483

2484 -#: diff.c:5240

2484 +#: diff.c:5242

2485 #, c-format

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

2487 msgstr "mal argumento --word-diff: %s"

2488

2489 -#: diff.c:5263

2489 +#: diff.c:5265

2490 msgid "Diff output format options"

2491 msgstr "Opciones de formato de salida para diff"

2492

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

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

2494 msgid "generate patch"

2495 msgstr "generar parche"

2496

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

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

2498 msgid "suppress diff output"

2499 msgstr "suprimir salida de diff"

2500

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

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

2502 msgid "<n>"

2503 msgstr "<n>"

2504

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

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

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

2507 msgstr "genera diffs con <n> líneas de contexto"

2508

2509 -#: diff.c:5279

2509 +#: diff.c:5281

2510 msgid "generate the diff in raw format"

2511 msgstr "genera el diff en formato raw"

2512

2513 -#: diff.c:5282

2513 +#: diff.c:5284

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

2515 msgstr "sinónimo para '-p --stat'"

2516

2517 -#: diff.c:5286

2517 +#: diff.c:5288

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

2519 msgstr "sinónimo para '-p --stat'"

2520

2521 -#: diff.c:5290

2521 +#: diff.c:5292

2522 msgid "machine friendly --stat"

2523 msgstr "--stat amigable para máquina"

2524

2525 -#: diff.c:5293

2525 +#: diff.c:5295

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

2527 msgstr "mostrar solo la última línea para --stat"

2528

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

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

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

2531 msgstr "<param1,param2>..."

2532

2533 -#: diff.c:5296

2533 +#: diff.c:5298

2534 msgid ""

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

2536 msgstr ""

2537 "muestra la distribución de cantidades de cambios relativa para cada "

2538 "subdirectorio"

2539

2540 -#: diff.c:5300

2540 +#: diff.c:5302

2541 msgid "synonym for --dirstat=cumulative"

2542 msgstr "sinónimo para --dirstat=cumulative"

2543

2544 -#: diff.c:5304

2544 +#: diff.c:5306

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

2546 msgstr "sinonimo para --dirstat=archivos,param1,param2..."

2547

2548 -#: diff.c:5308

2548 +#: diff.c:5310

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

2550 msgstr ""

2551 "advierte si cambios introducen conflictos de markers o errores de espacios "

2552 "en blanco"

2553

2554 -#: diff.c:5311

2554 +#: diff.c:5313

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

2556 msgstr ""

2557 "resumen condensado de creaciones, cambios de nombres y cambios de modos"

2558

2559 -#: diff.c:5314

2559 +#: diff.c:5316

2560 msgid "show only names of changed files"

2561 msgstr "mostrar solo nombres de archivos cambiados"

2562

2563 -#: diff.c:5317

2563 +#: diff.c:5319

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

2565 msgstr "mostrar solo nombres y estados de archivos cambiados"

2566

2567 -#: diff.c:5319

2567 +#: diff.c:5321

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

2569 msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]"

2570

2571 -#: diff.c:5320

2571 +#: diff.c:5322

2572 msgid "generate diffstat"

2573 msgstr "generar diffstat"

2574

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

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

2576 msgid "<width>"

2577 msgstr "<ancho>"

2578

2579 -#: diff.c:5323

2579 +#: diff.c:5325

2580 msgid "generate diffstat with a given width"

2581 msgstr "genera diffstat con un ancho dado"

2582

2583 -#: diff.c:5326

2583 +#: diff.c:5328

2584 msgid "generate diffstat with a given name width"

2585 msgstr "genera diffstat con un nombre de ancho dado"

2586

2587 -#: diff.c:5329

2587 +#: diff.c:5331

2588 msgid "generate diffstat with a given graph width"

2589 msgstr "genera diffstat con un ancho de graph dado"

2590

2591 -#: diff.c:5331

2591 +#: diff.c:5333

2592 msgid "<count>"

2593 msgstr "<cantidad>"

2594

2595 -#: diff.c:5332

2595 +#: diff.c:5334

2596 msgid "generate diffstat with limited lines"

2597 msgstr "genera diffstat con líneas limitadas"

2598

2599 -#: diff.c:5335

2599 +#: diff.c:5337

2600 msgid "generate compact summary in diffstat"

2601 msgstr "genera un resumen compacto de diffstat"

2602

2603 -#: diff.c:5338

2603 +#: diff.c:5340

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

2605 msgstr "muestra un diff binario que puede ser aplicado"

2606

2607 -#: diff.c:5341

2607 +#: diff.c:5343

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

2609 msgstr ""

2610 "mostrar todo un pre- y post-image de nombres de objetos en las líneas \"index"

2611 "\""

2612

2613 -#: diff.c:5343

2613 +#: diff.c:5345

2614 msgid "show colored diff"

2615 msgstr "mostrar diff colorido"

2616

2617 -#: diff.c:5344

2617 +#: diff.c:5346

2618 msgid "<kind>"

2619 msgstr "<tipo>"

2620

2621 -#: diff.c:5345

2621 +#: diff.c:5347

2622 msgid ""

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

2624 "diff"

@@ -2626,7 +2626,7 @@ msgstr ""

2626 "resaltar errores de espacios en blanco en las líneas 'context', 'old' o "

2627 "'new' del diff"

2628

2629 -#: diff.c:5348

2629 +#: diff.c:5350

2630 msgid ""

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

2632 "--numstat"

@@ -2634,89 +2634,89 @@ msgstr ""

2634 "no consolidar los pathnames y usar NULs como terminadores de campos en --raw "

2635 "o --numstat"

2636

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

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

2638 msgid "<prefix>"

2639 msgstr "<prefijo>"

2640

2641 -#: diff.c:5352

2641 +#: diff.c:5354

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

2643 msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""

2644

2645 -#: diff.c:5355

2645 +#: diff.c:5357

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

2647 msgstr "mostrar el prefijo de fuente dado en lugar de \"b/\""

2648

2649 -#: diff.c:5358

2649 +#: diff.c:5360

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

2651 msgstr "anteponer un prefijo adicional a cada línea mostrada"

2652

2653 -#: diff.c:5361

2653 +#: diff.c:5363

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

2655 msgstr "no mostrar ningún prefijo de fuente o destino"

2656

2657 -#: diff.c:5364

2657 +#: diff.c:5366

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

2659 msgstr ""

2660 "muestra el contexto entre hunks de diff hasta el número especificado de "

2661 "líneas"

2662

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

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

2664 msgid "<char>"

2665 msgstr "<char>"

2666

2667 -#: diff.c:5369

2667 +#: diff.c:5371

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

2669 msgstr "especifica el char para indicar una nueva línea en lugar de '+'"

2670

2671 -#: diff.c:5374

2671 +#: diff.c:5376

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

2673 msgstr "especifica el char para indicar una línea vieja en lugar de '-'"

2674

2675 -#: diff.c:5379

2675 +#: diff.c:5381

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

2677 msgstr "especifica el char para indicar un contexto en lugar de ' '"

2678

2679 -#: diff.c:5382

2679 +#: diff.c:5384

2680 msgid "Diff rename options"

2681 msgstr "Opciones de diff rename"

2682

2683 -#: diff.c:5383

2683 +#: diff.c:5385

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

2685 msgstr "<n>[/<m>]"

2686

2687 -#: diff.c:5384

2687 +#: diff.c:5386

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

2689 msgstr "descomponer los cambios de reescritura en pares de borrar y crear"

2690

2691 -#: diff.c:5388

2691 +#: diff.c:5390

2692 msgid "detect renames"

2693 msgstr "detectar renombrados"

2694

2695 -#: diff.c:5392

2695 +#: diff.c:5394

2696 msgid "omit the preimage for deletes"

2697 msgstr "omite la preimage para borrados"

2698

2699 -#: diff.c:5395

2699 +#: diff.c:5397

2700 msgid "detect copies"

2701 msgstr "detectar copias"

2702

2703 -#: diff.c:5399

2703 +#: diff.c:5401

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

2705 msgstr "usa archivos no modificados como fuente para encontrar copias"

2706

2707 -#: diff.c:5401

2707 +#: diff.c:5403

2708 msgid "disable rename detection"

2709 msgstr "deshabilita detección de renombres"

2710

2711 -#: diff.c:5404

2711 +#: diff.c:5406

2712 msgid "use empty blobs as rename source"

2713 msgstr "usa blobs vacíos como fuente de renombre"

2714

2715 -#: diff.c:5406

2715 +#: diff.c:5408

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

2717 msgstr "continua listando el historial de un archivo más allá de renombres"

2718

2719 -#: diff.c:5409

2719 +#: diff.c:5411

2720 msgid ""

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

2722 "given limit"

@@ -2724,155 +2724,155 @@ msgstr ""

2724 "previene detección de renombre/copias si el número de objetivos para "

2725 "renombres/copias excede el límite dado"

2726

2727 -#: diff.c:5411

2727 +#: diff.c:5413

2728 msgid "Diff algorithm options"

2729 msgstr "Opciones de algoritmos de diff"

2730

2731 -#: diff.c:5413

2731 +#: diff.c:5415

2732 msgid "produce the smallest possible diff"

2733 msgstr "produce el diff más pequeño posible"

2734

2735 -#: diff.c:5416

2735 +#: diff.c:5418

2736 msgid "ignore whitespace when comparing lines"

2737 msgstr "ignorar espacios en blanco cuando comparando líneas"

2738

2739 -#: diff.c:5419

2739 +#: diff.c:5421

2740 msgid "ignore changes in amount of whitespace"

2741 msgstr "ignorar cambios en la cantidad de líneas en blanco"

2742

2743 -#: diff.c:5422

2743 +#: diff.c:5424

2744 msgid "ignore changes in whitespace at EOL"

2745 msgstr "ignorar cambios en espacios en blanco en EOL"

2746

2747 -#: diff.c:5425

2747 +#: diff.c:5427

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

2749 msgstr "ignora carrier-return al final de la línea"

2750

2751 -#: diff.c:5428

2751 +#: diff.c:5430

2752 msgid "ignore changes whose lines are all blank"

2753 msgstr "ignora cambios cuyas líneas son todas en blanco"

2754

2755 -#: diff.c:5431

2755 +#: diff.c:5433

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

2757 msgstr "heurística para cambiar los límites de hunk para una fácil lectura"

2758

2759 -#: diff.c:5434

2759 +#: diff.c:5436

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

2761 msgstr "genera un diff usando algoritmo \"patience diff\""

2762

2763 -#: diff.c:5438

2763 +#: diff.c:5440

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

2765 msgstr "genera un diff usando algoritmo \"histogram diff\""

2766

2767 -#: diff.c:5440

2767 +#: diff.c:5442

2768 msgid "<algorithm>"

2769 msgstr "<algoritmo>"

2770

2771 -#: diff.c:5441

2771 +#: diff.c:5443

2772 msgid "choose a diff algorithm"

2773 msgstr "escoge un algoritmo para diff"

2774

2775 -#: diff.c:5443

2775 +#: diff.c:5445

2776 msgid "<text>"

2777 msgstr "<texto>"

2778

2779 -#: diff.c:5444

2779 +#: diff.c:5446

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

2781 msgstr "genera un diff usando algoritmo \"anchored diff\""

2782

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

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

2784 msgid "<mode>"

2785 msgstr "<modo>"

2786

2787 -#: diff.c:5447

2787 +#: diff.c:5449

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

2789 msgstr ""

2790 "muestra diff por palabras usando <modo> para delimitar las palabras cambiadas"

2791

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

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

2793 msgid "<regex>"

2794 msgstr "<regex>"

2795

2796 -#: diff.c:5450

2796 +#: diff.c:5452

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

2798 msgstr "usa <regex> para decidir que palabra es"

2799

2800 -#: diff.c:5453

2800 +#: diff.c:5455

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

2802 msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"

2803

2804 -#: diff.c:5456

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

2806 -msgstr "líneas movidas de código son coloreadas diferente"

2804 +#: diff.c:5458

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

2806 +msgstr "líneas movidas de código están coloreadas diferente"

2807

2808 -#: diff.c:5459

2808 +#: diff.c:5461

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

2810 msgstr "como espacios en blanco son ignorados en --color-moved"

2811

2812 -#: diff.c:5462

2813 -msgid "Diff other options"

2812 +#: diff.c:5464

2813 +msgid "Other diff options"

2814 msgstr "Otras opciones de diff"

2815

2816 -#: diff.c:5464

2816 +#: diff.c:5466

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

2818 msgstr ""

2819 "cuando ejecutado desde un subdir, excluye cambios del exterior y muestra "

2820 "paths relativos"

2821

2822 -#: diff.c:5468

2822 +#: diff.c:5470

2823 msgid "treat all files as text"

2824 msgstr "tratar todos los archivos como texto"

2825

2826 -#: diff.c:5470

2826 +#: diff.c:5472

2827 msgid "swap two inputs, reverse the diff"

2828 msgstr "cambia dos inputs, invierte el diff"

2829

2830 -#: diff.c:5472

2830 +#: diff.c:5474

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

2832 msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0"

2833

2834 -#: diff.c:5474

2834 +#: diff.c:5476

2835 msgid "disable all output of the program"

2836 msgstr "deshabilita todo el output del programa"

2837

2838 -#: diff.c:5476

2838 +#: diff.c:5478

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

2840 msgstr "permite la ejecución de un diff helper externo"

2841

2842 -#: diff.c:5478

2842 +#: diff.c:5480

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

2844 msgstr ""

2845 "ejecuta filtros de conversión de texto externos cuando comparando binarios"

2846

2847 -#: diff.c:5480

2847 +#: diff.c:5482

2848 msgid "<when>"

2849 msgstr "<cuando>"

2850

2851 -#: diff.c:5481

2851 +#: diff.c:5483

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

2853 msgstr "ignorar cambios a submódulos en la generación de diff"

2854

2855 -#: diff.c:5484

2855 +#: diff.c:5486

2856 msgid "<format>"

2857 msgstr "<formato>"

2858

2859 -#: diff.c:5485

2859 +#: diff.c:5487

2860 msgid "specify how differences in submodules are shown"

2861 msgstr "especifica como son mostradas las diferencias en submódulos"

2862

2863 -#: diff.c:5489

2863 +#: diff.c:5491

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

2865 msgstr "ocultar entradas 'git add -N' del index"

2866

2867 -#: diff.c:5492

2867 +#: diff.c:5494

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

2869 msgstr "trata entradas 'git add -N' como reales en el index"

2870

2871 -#: diff.c:5494

2871 +#: diff.c:5496

2872 msgid "<string>"

2873 msgstr "<string>"

2874

2875 -#: diff.c:5495

2875 +#: diff.c:5497

2876 msgid ""

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

2878 "string"

@@ -2880,7 +2880,7 @@ msgstr ""

2880 "busca por diferencias que cambien el número de ocurrencias para el string "

2881 "especificado"

2882

2883 -#: diff.c:5498

2883 +#: diff.c:5500

2884 msgid ""

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

2886 "regex"

@@ -2888,23 +2888,23 @@ msgstr ""

2888 "busca por diferencias que cambien el número de ocurrencias para el regex "

2889 "especificado"

2890

2891 -#: diff.c:5501

2891 +#: diff.c:5503

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

2893 msgstr "mostrar todos los cambios en el changeset con -S o -G"

2894

2895 -#: diff.c:5504

2895 +#: diff.c:5506

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

2897 msgstr "tratar <string> en -S como una expresión regular extendida de POSIX"

2898

2899 -#: diff.c:5507

2899 +#: diff.c:5509

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

2901 msgstr "controlar el orden en el que los archivos aparecen en la salida"

2902

2903 -#: diff.c:5508

2903 +#: diff.c:5510

2904 msgid "<object-id>"

2905 msgstr "<id-objeto>"

2906

2907 -#: diff.c:5509

2907 +#: diff.c:5511

2908 msgid ""

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

2910 "object"

@@ -2912,33 +2912,33 @@ msgstr ""

2912 "busca por diferencias que cambien el número de ocurrencias para el objeto "

2913 "especificado"

2914

2915 -#: diff.c:5511

2915 +#: diff.c:5513

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

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

2918

2919 -#: diff.c:5512

2919 +#: diff.c:5514

2920 msgid "select files by diff type"

2921 msgstr "selecciona archivos por tipo de diff"

2922

2923 -#: diff.c:5514

2923 +#: diff.c:5516

2924 msgid "<file>"

2925 msgstr "<archivo>"

2926

2927 -#: diff.c:5515

2927 +#: diff.c:5517

2928 msgid "Output to a specific file"

2929 msgstr "Output a un archivo específico"

2930

2931 -#: diff.c:6148

2931 +#: diff.c:6150

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

2933 msgstr ""

2934 "detección de cambio de nombre inexacta fue saltada por haber muchos archivos."

2935

2936 -#: diff.c:6151

2936 +#: diff.c:6153

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

2938 msgstr ""

2939 "solo se encontraron copias de rutas modificadas por haber muchos archivos."

2940

2941 -#: diff.c:6154

2941 +#: diff.c:6156

2942 #, c-format

2943 msgid ""

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

@@ -3254,7 +3254,7 @@ msgstr "error procesando refs deseadas: %d"

3254 msgid "no matching remote head"

3255 msgstr "no concuerda el head remoto"

3256

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

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

3258 msgid "remote did not send all necessary objects"

3259 msgstr "remoto no mando todos los objetos necesarios"

3260

@@ -3291,7 +3291,7 @@ msgstr "ignora color inválido '%.*s' en log.graphColors"

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

3292 msgstr "'%s': no es posible leer %s"

3293

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

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

3295 #: builtin/rm.c:135

3296 #, c-format

3297 msgid "failed to stat '%s'"

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

3574 msgstr "falló al leer la cache"

3575

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

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

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

3578 #: builtin/stash.c:264

3579 msgid "unable to write new index file"

3580 msgstr "no es posible escribir el archivo índice"

@@ -4071,78 +4071,78 @@ msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido"

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

4072 msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'"

4073

4074 -#: midx.c:209

4074 +#: midx.c:208

4075 #, c-format

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

4077 msgstr "mal pack-int-id: %u (%u paquetes totales)"

4078

4079 -#: midx.c:250

4079 +#: midx.c:258

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

4081 msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño"

4082

4083 -#: midx.c:275

4083 +#: midx.c:286

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

4085 msgstr "error preparando packfile de multi-pack-index"

4086

4087 -#: midx.c:443

4087 +#: midx.c:457

4088 #, c-format

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

4090 msgstr "falló al agregar packfile '%s'"

4091

4092 -#: midx.c:449

4092 +#: midx.c:463

4093 #, c-format

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

4095 msgstr "falló al abrir pack-index '%s'"

4096

4097 -#: midx.c:543

4097 +#: midx.c:557

4098 #, c-format

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

4100 msgstr "falló al ubicar objeto %d en packfile"

4101

4102 -#: midx.c:979

4102 +#: midx.c:993

4103 #, c-format

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

4105 msgstr "falló al limpiar multi-pack-index en %s"

4106

4107 -#: midx.c:1034

4107 +#: midx.c:1048

4108 msgid "Looking for referenced packfiles"

4109 msgstr "Buscando por packfiles referidos"

4110

4111 -#: midx.c:1049

4111 +#: midx.c:1063

4112 #, c-format

4113 msgid ""

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

4115 msgstr ""

4116 "oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4117

4118 -#: midx.c:1053

4118 +#: midx.c:1067

4119 msgid "Verifying OID order in MIDX"

4120 msgstr "Verificando orden de OID en MIDX"

4121

4122 -#: midx.c:1062

4122 +#: midx.c:1076

4123 #, c-format

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

4125 msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]"

4126

4127 -#: midx.c:1081

4127 +#: midx.c:1095

4128 msgid "Sorting objects by packfile"

4129 msgstr "Ordenando objetos por packfile"

4130

4131 -#: midx.c:1087

4131 +#: midx.c:1101

4132 msgid "Verifying object offsets"

4133 msgstr "Verificando offsets de objetos"

4134

4135 -#: midx.c:1103

4135 +#: midx.c:1117

4136 #, c-format

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

4138 msgstr "fallo al cargar entrada pack para oid[%d] = %s"

4139

4140 -#: midx.c:1109

4140 +#: midx.c:1123

4141 #, c-format

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

4143 msgstr "falló al cargar el pack-index para packfile %s"

4144

4145 -#: midx.c:1118

4145 +#: midx.c:1132

4146 #, c-format

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

4148 msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"

@@ -4233,13 +4233,13 @@ msgstr "hash no concuerda %s"

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

4234 msgstr "offset antes del final del paquete (broken .idx?)"

4235

4236 -#: packfile.c:1880

4236 +#: packfile.c:1868

4237 #, c-format

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

4239 msgstr ""

4240 "offset antes del comienzo del índice del paquete para %s (índice corrupto?)"

4241

4242 -#: packfile.c:1884

4242 +#: packfile.c:1872

4243 #, c-format

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

4245 msgstr ""

@@ -4260,7 +4260,7 @@ msgstr "%s es incompatible con %s"

4260 msgid "%s : incompatible with something else"

4261 msgstr "%s : incompatible con otra cosa"

4262

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

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

4264 #, c-format

4265 msgid "%s takes no value"

4266 msgstr "%s no toma valores"

@@ -4270,41 +4270,41 @@ msgstr "%s no toma valores"

4270 msgid "%s isn't available"

4271 msgstr "%s no está disponible"

4272

4273 -#: parse-options.c:216

4273 +#: parse-options.c:219

4274 #, c-format

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

4276 msgstr "%s espera un valor entero no negativo con un sufijo opcional k/m/g"

4277

4278 -#: parse-options.c:356

4278 +#: parse-options.c:389

4279 #, c-format

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

4281 msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)"

4282

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

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

4284 #, c-format

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

4286 msgstr "¿quisiste decir `--%s` (con dos guiones)?"

4287

4288 -#: parse-options.c:733

4288 +#: parse-options.c:859

4289 #, c-format

4290 msgid "unknown option `%s'"

4291 msgstr "opción `%s' desconocida"

4292

4293 -#: parse-options.c:735

4293 +#: parse-options.c:861

4294 #, c-format

4295 msgid "unknown switch `%c'"

4296 msgstr "switch desconocido `%c'"

4297

4298 -#: parse-options.c:737

4298 +#: parse-options.c:863

4299 #, c-format

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

4301 msgstr "opcion desconocida en string no ascii: `%s'"

4302

4303 -#: parse-options.c:759

4303 +#: parse-options.c:887

4304 msgid "..."

4305 msgstr "..."

4306

4307 -#: parse-options.c:778

4307 +#: parse-options.c:906

4308 #, c-format

4309 msgid "usage: %s"

4310 msgstr "uso: %s"

@@ -4312,36 +4312,41 @@ msgstr "uso: %s"

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

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

4314 #.

4315 -#: parse-options.c:784

4315 +#: parse-options.c:912

4316 #, c-format

4317 msgid " or: %s"

4318 msgstr " o: %s"

4319

4320 -#: parse-options.c:787

4320 +#: parse-options.c:915

4321 #, c-format

4322 msgid " %s"

4323 msgstr " %s"

4324

4325 -#: parse-options.c:826

4325 +#: parse-options.c:954

4326 msgid "-NUM"

4327 msgstr "-NUM"

4328

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

4329 +#: parse-options.c:968

4330 +#, c-format

4331 +msgid "alias of --%s"

4332 +msgstr "alias de --%s"

4333 +

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

4335 #, c-format

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

4337 msgstr "opción `%s' espera un valor numérico"

4338

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

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

4340 #, c-format

4341 msgid "malformed expiration date '%s'"

4342 msgstr "fecha de expiración mal formada: '%s'"

4343

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

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

4345 #, c-format

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

4347 msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""

4348

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

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

4350 #, c-format

4351 msgid "malformed object name '%s'"

4352 msgstr "nombre de objeto mal formado '%s'"

@@ -4681,32 +4686,32 @@ msgstr "no se pudo refrescar el index compartido '%s'"

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

4687 msgstr "index roto, se esperaba %s en %s, se obtuvo %s"

4688

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

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

4690 #, c-format

4691 msgid "could not close '%s'"

4692 msgstr "no se pudo cerrar '%s'"

4693

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

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

4695 #, c-format

4696 msgid "could not stat '%s'"

4697 msgstr "no se pudo definir '%s'"

4698

4694 -#: read-cache.c:3104

4699 +#: read-cache.c:3105

4700 #, c-format

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

4702 msgstr "no es posible abrir el directorio de git: %s"

4703

4699 -#: read-cache.c:3116

4704 +#: read-cache.c:3117

4705 #, c-format

4706 msgid "unable to unlink: %s"

4707 msgstr "no es posible eliminar el vinculo: %s"

4708

4704 -#: read-cache.c:3141

4709 +#: read-cache.c:3142

4710 #, c-format

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

4712 msgstr "no se pudo arreglar bits de permisos en '%s'"

4713

4709 -#: read-cache.c:3290

4714 +#: read-cache.c:3291

4715 #, c-format

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

4717 msgstr "%s: no se puede eliminar a stage #0"

@@ -4965,7 +4970,7 @@ msgstr "no se pudo eliminar la referencia: %s"

4970 msgid "invalid refspec '%s'"

4971 msgstr "refspec inválido: '%s'"

4972

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

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

4974 msgid "gone"

4975 msgstr "desaparecido"

4976

@@ -6249,7 +6254,7 @@ msgstr "No se pudo aplicar %s... %.*s"

6254 msgid "Could not merge %.*s"

6255 msgstr "No se pudo fusionar %.*s"

6256

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

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

6258 #, c-format

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

6260 msgstr "no se pudo copiar '%s' a '%s'"

@@ -6945,16 +6950,16 @@ msgstr "incapaz de analizar header de %s"

6950 msgid "unable to unpack contents of %s"

6951 msgstr "no es posible desempaquetar contenidos de %s"

6952

6948 -#: sha1-name.c:487

6953 +#: sha1-name.c:490

6954 #, c-format

6955 msgid "short SHA1 %s is ambiguous"

6956 msgstr "SHA1 %s corto es ambiguo"

6957

6953 -#: sha1-name.c:498

6958 +#: sha1-name.c:501

6959 msgid "The candidates are:"

6960 msgstr "Los candidatos son:"

6961

6957 -#: sha1-name.c:794

6962 +#: sha1-name.c:800

6963 msgid ""

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

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

@@ -7981,67 +7986,67 @@ msgstr " (usa \"git am --skip\" para saltar este parche)"

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

7987 msgstr " (usa \"git am --abort\" para restaurar la rama original)"

7988

7984 -#: wt-status.c:1282

7989 +#: wt-status.c:1284

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

7991 msgstr "git-rebase-todo no está presente."

7992

7988 -#: wt-status.c:1284

7993 +#: wt-status.c:1286

7994 msgid "No commands done."

7995 msgstr "No se realizaron los comandos."

7996

7992 -#: wt-status.c:1287

7997 +#: wt-status.c:1289

7998 #, c-format

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

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

8001 msgstr[0] "El último comando realizado (%d comando realizado):"

8002 msgstr[1] "Los últimos comandos realizados (%d comandos realizados):"

8003

7999 -#: wt-status.c:1298

8004 +#: wt-status.c:1300

8005 #, c-format

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

8007 msgstr " (ver mas en el archivo %s)"

8008

8004 -#: wt-status.c:1303

8009 +#: wt-status.c:1305

8010 msgid "No commands remaining."

8011 msgstr "No quedan mas comandos."

8012

8008 -#: wt-status.c:1306

8013 +#: wt-status.c:1308

8014 #, c-format

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

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

8017 msgstr[0] "Siguiente comando a realizar (%d comando restante):"

8018 msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes):"

8019

8015 -#: wt-status.c:1314

8020 +#: wt-status.c:1316

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

8022 msgstr " (usa \"git rebase --edit-todo\" para ver y editar)"

8023

8019 -#: wt-status.c:1326

8024 +#: wt-status.c:1328

8025 #, c-format

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

8027 msgstr "Estás aplicando un rebase de la rama '%s' en '%s."

8028

8024 -#: wt-status.c:1331

8029 +#: wt-status.c:1333

8030 msgid "You are currently rebasing."

8031 msgstr "Estás aplicando un rebase."

8032

8028 -#: wt-status.c:1344

8033 +#: wt-status.c:1346

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

8035 msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")"

8036

8032 -#: wt-status.c:1346

8037 +#: wt-status.c:1348

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

8039 msgstr " (usa \"git rebase --skip\" para omitir este parche)"

8040

8036 -#: wt-status.c:1348

8041 +#: wt-status.c:1350

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

8043 msgstr " (usa \"git rebase --abort\" para volver a tu rama original)"

8044

8040 -#: wt-status.c:1355

8045 +#: wt-status.c:1357

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

8047 msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"

8048

8044 -#: wt-status.c:1359

8049 +#: wt-status.c:1361

8050 #, c-format

8051 msgid ""

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

@@ -8049,144 +8054,144 @@ msgstr ""

8054 "Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en "

8055 "'%s'."

8056

8052 -#: wt-status.c:1364

8057 +#: wt-status.c:1366

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

8059 msgstr "Estás dividiendo un commit durante un rebase."

8060

8056 -#: wt-status.c:1367

8061 +#: wt-status.c:1369

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

8063 msgstr ""

8064 " (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --"

8065 "continue\")"

8066

8062 -#: wt-status.c:1371

8067 +#: wt-status.c:1373

8068 #, c-format

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

8070 msgstr ""

8071 "Estás editando un commit mientras se aplica un rebase de la rama '%s' en "

8072 "'%s'."

8073

8069 -#: wt-status.c:1376

8074 +#: wt-status.c:1378

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

8076 msgstr "Estás editando un commit durante un rebase."

8077

8073 -#: wt-status.c:1379

8078 +#: wt-status.c:1381

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

8080 msgstr " (usa \"git commit --amend\" para enmendar el commit actual)"

8081

8077 -#: wt-status.c:1381

8082 +#: wt-status.c:1383

8083 msgid ""

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

8085 msgstr ""

8086 " (usa \"git rebase --continue\" una vez que estés satisfecho con tus "

8087 "cambios)"

8088

8084 -#: wt-status.c:1392

8089 +#: wt-status.c:1394

8090 msgid "Cherry-pick currently in progress."

8091 msgstr "Cherry-pick en progreso actualmente"

8092

8088 -#: wt-status.c:1395

8093 +#: wt-status.c:1397

8094 #, c-format

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

8096 msgstr "Estás realizando un cherry-picking en el commit %s."

8097

8093 -#: wt-status.c:1402

8098 +#: wt-status.c:1404

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

8100 msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"

8101

8097 -#: wt-status.c:1405

8102 +#: wt-status.c:1407

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

8104 msgstr " (ejecuta \"git cherry-pick --continue\" para continuar)"

8105

8101 -#: wt-status.c:1408

8106 +#: wt-status.c:1410

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

8108 msgstr ""

8109 " (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"

8110

8106 -#: wt-status.c:1410

8111 +#: wt-status.c:1412

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

8113 msgstr ""

8114 " (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"

8115

8111 -#: wt-status.c:1420

8116 +#: wt-status.c:1422

8117 msgid "Revert currently in progress."

8118 msgstr "Revierte el estado en progreso actual"

8119

8115 -#: wt-status.c:1423

8120 +#: wt-status.c:1425

8121 #, c-format

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

8123 msgstr "Estás revirtiendo el commit %s."

8124

8120 -#: wt-status.c:1429

8125 +#: wt-status.c:1431

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

8127 msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")"

8128

8124 -#: wt-status.c:1432

8129 +#: wt-status.c:1434

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

8131 msgstr " (ejecuta \"git revert --continue\" para continuar)"

8132

8128 -#: wt-status.c:1435

8133 +#: wt-status.c:1437

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

8135 msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")"

8136

8132 -#: wt-status.c:1437

8137 +#: wt-status.c:1439

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

8139 msgstr " (usa \"git revert --abort\" para cancelar la operación de revertir)"

8140

8136 -#: wt-status.c:1447

8141 +#: wt-status.c:1449

8142 #, c-format

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

8144 msgstr "Estás aplicando un bisect, comenzando en la rama '%s'."

8145

8141 -#: wt-status.c:1451

8146 +#: wt-status.c:1453

8147 msgid "You are currently bisecting."

8148 msgstr "Estás aplicando un bisect."

8149

8145 -#: wt-status.c:1454

8150 +#: wt-status.c:1456

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

8152 msgstr " (usa \"git bisect reset\" para volver a la rama original)"

8153

8149 -#: wt-status.c:1663

8154 +#: wt-status.c:1665

8155 msgid "On branch "

8156 msgstr "En la rama "

8157

8153 -#: wt-status.c:1670

8158 +#: wt-status.c:1672

8159 msgid "interactive rebase in progress; onto "

8160 msgstr "rebase interactivo en progreso; en "

8161

8157 -#: wt-status.c:1672

8162 +#: wt-status.c:1674

8163 msgid "rebase in progress; onto "

8164 msgstr "rebase en progreso; en "

8165

8161 -#: wt-status.c:1677

8166 +#: wt-status.c:1679

8167 msgid "HEAD detached at "

8168 msgstr "HEAD desacoplada en "

8169

8165 -#: wt-status.c:1679

8170 +#: wt-status.c:1681

8171 msgid "HEAD detached from "

8172 msgstr "HEAD desacoplada de "

8173

8169 -#: wt-status.c:1682

8174 +#: wt-status.c:1684

8175 msgid "Not currently on any branch."

8176 msgstr "Actualmente no estás en ninguna rama."

8177

8173 -#: wt-status.c:1699

8178 +#: wt-status.c:1701

8179 msgid "Initial commit"

8180 msgstr "Confirmación inicial"

8181

8177 -#: wt-status.c:1700

8182 +#: wt-status.c:1702

8183 msgid "No commits yet"

8184 msgstr "No hay commits todavía"

8185

8181 -#: wt-status.c:1714

8186 +#: wt-status.c:1716

8187 msgid "Untracked files"

8188 msgstr "Archivos sin seguimiento"

8189

8185 -#: wt-status.c:1716

8190 +#: wt-status.c:1718

8191 msgid "Ignored files"

8192 msgstr "Archivos ignorados"

8193

8189 -#: wt-status.c:1720

8194 +#: wt-status.c:1722

8195 #, c-format

8196 msgid ""

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

@@ -8197,31 +8202,31 @@ msgstr ""

8202 "puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n"

8203 "nuevos archivos usted mismo (vea 'git help status')."

8204

8200 -#: wt-status.c:1726

8205 +#: wt-status.c:1728

8206 #, c-format

8207 msgid "Untracked files not listed%s"

8208 msgstr "Archivos no rastreados no son mostrados %s"

8209

8205 -#: wt-status.c:1728

8210 +#: wt-status.c:1730

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

8212 msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"

8213

8209 -#: wt-status.c:1734

8214 +#: wt-status.c:1736

8215 msgid "No changes"

8216 msgstr "Sin cambios"

8217

8213 -#: wt-status.c:1739

8218 +#: wt-status.c:1741

8219 #, c-format

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

8221 msgstr ""

8222 "sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n"

8223

8219 -#: wt-status.c:1742

8224 +#: wt-status.c:1744

8225 #, c-format

8226 msgid "no changes added to commit\n"

8227 msgstr "no se agregaron cambios al commit\n"

8228

8224 -#: wt-status.c:1745

8229 +#: wt-status.c:1747

8230 #, c-format

8231 msgid ""

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

@@ -8230,67 +8235,67 @@ msgstr ""

8235 "no hay nada agregado al commit pero hay archivos sin seguimiento presentes "

8236 "(usa \"git add\" para hacerles seguimiento)\n"

8237

8233 -#: wt-status.c:1748

8238 +#: wt-status.c:1750

8239 #, c-format

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

8241 msgstr ""

8242 "no hay nada agregado para confirmar, pero hay archivos sin seguimiento "

8243 "presentes\n"

8244

8240 -#: wt-status.c:1751

8245 +#: wt-status.c:1753

8246 #, c-format

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

8248 msgstr ""

8249 "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "

8250 "hacerles seguimiento)\n"

8251

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

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

8253 #, c-format

8254 msgid "nothing to commit\n"

8255 msgstr "nada para hacer commit\n"

8256

8252 -#: wt-status.c:1757

8257 +#: wt-status.c:1759

8258 #, c-format

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

8260 msgstr ""

8261 "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"

8262

8258 -#: wt-status.c:1761

8263 +#: wt-status.c:1763

8264 #, c-format

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

8266 msgstr "nada para hacer commit, el árbol de trabajo está limpio\n"

8267

8263 -#: wt-status.c:1874

8268 +#: wt-status.c:1876

8269 msgid "No commits yet on "

8270 msgstr "No hay commits todavía en "

8271

8267 -#: wt-status.c:1878

8272 +#: wt-status.c:1880

8273 msgid "HEAD (no branch)"

8274 msgstr "HEAD (sin rama)"

8275

8271 -#: wt-status.c:1909

8276 +#: wt-status.c:1911

8277 msgid "different"

8278 msgstr "diferente"

8279

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

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

8281 msgid "behind "

8282 msgstr "detrás "

8283

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

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

8285 msgid "ahead "

8286 msgstr "adelante "

8287

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

8284 -#: wt-status.c:2441

8289 +#: wt-status.c:2443

8290 #, c-format

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

8292 msgstr "no se puede %s: Tienes cambios sin marcar."

8293

8289 -#: wt-status.c:2447

8294 +#: wt-status.c:2449

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

8296 msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."

8297

8293 -#: wt-status.c:2449

8298 +#: wt-status.c:2451

8299 #, c-format

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

8301 msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit."

@@ -8531,7 +8536,7 @@ msgstr "offset de zona horaria inválido"

8536 msgid "Patch format detection failed."

8537 msgstr "Falló al detectar el formato del parche."

8538

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

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

8540 #, c-format

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

8542 msgstr "falló al crear el directorio '%s'"

@@ -8769,8 +8774,8 @@ msgstr "pasarlo a través de git-apply"

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

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

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

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

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

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

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

8779 msgid "n"

8780 msgstr "n"

8781

@@ -9650,7 +9655,7 @@ msgstr "ordenamiento y filtrado son case-insensitive"

9655 msgid "format to use for the output"

9656 msgstr "formato para usar para el output"

9657

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

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

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

9660 msgstr "HEAD no encontrado abajo de refs/heads!"

9661

@@ -10075,7 +10080,7 @@ msgstr "No se puede hacer reflog para '%s': %s\n"

10080 msgid "HEAD is now at"

10081 msgstr "HEAD está ahora en"

10082

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

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

10084 msgid "unable to update HEAD"

10085 msgstr "no es posible actualizar HEAD"

10086

@@ -10215,7 +10220,7 @@ msgstr "'%s' no puede ser usado con '%s'"

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

10221 msgstr "No se puede cambiar rama a un '%s' sin commits"

10222

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

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

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

10225 #: builtin/worktree.c:494

10226 msgid "branch"

@@ -10269,7 +10274,7 @@ msgstr "realizar una fusión de tres vías con la rama nueva"

10274 msgid "update ignored files (default)"

10275 msgstr "actualizar archivos ignorados (default)"

10276

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

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

10278 msgid "style"

10279 msgstr "estilo"

10280

@@ -10518,7 +10523,7 @@ msgstr "borrar directorios completos"

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

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

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

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

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

10527 msgid "pattern"

10528 msgstr "patrón"

10529

@@ -10582,128 +10587,128 @@ msgstr "no usar hardlinks, siempre copiar"

10587 msgid "setup as shared repository"

10588 msgstr "configurar como repositorio compartido"

10589

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

10590 +#: builtin/clone.c:104

10591 msgid "pathspec"

10592 msgstr "pathspec"

10593

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

10594 +#: builtin/clone.c:104

10595 msgid "initialize submodules in the clone"

10596 msgstr "inicializar submódulos en el clonado"

10597

10593 -#: builtin/clone.c:110

10598 +#: builtin/clone.c:107

10599 msgid "number of submodules cloned in parallel"

10600 msgstr "numero de submódulos clonados en paralelo"

10601

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

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

10603 msgid "template-directory"

10604 msgstr "directorio-template"

10605

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

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

10607 msgid "directory from which templates will be used"

10608 msgstr "directorio del cual los templates serán usados"

10609

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

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

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

10612 msgid "reference repository"

10613 msgstr "repositorio de referencia"

10614

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

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

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

10617 msgid "use --reference only while cloning"

10618 msgstr "usa--reference solamente si estás clonado"

10619

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

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

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

10622 msgid "name"

10623 msgstr "nombre"

10624

10620 -#: builtin/clone.c:120

10625 +#: builtin/clone.c:117

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

10627 msgstr "use <nombre> en lugar de 'origin' para rastrear upstream"

10628

10624 -#: builtin/clone.c:122

10629 +#: builtin/clone.c:119

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

10631 msgstr "checkout <rama> en lugar de HEAD remota"

10632

10628 -#: builtin/clone.c:124

10633 +#: builtin/clone.c:121

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

10635 msgstr "ruta para git-upload-pack en el remoto"

10636

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

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

10638 #: builtin/pull.c:225

10639 msgid "depth"

10640 msgstr "profundidad"

10641

10637 -#: builtin/clone.c:126

10642 +#: builtin/clone.c:123

10643 msgid "create a shallow clone of that depth"

10644 msgstr "crear un clon superficial para esa profundidad"

10645

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

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

10647 msgid "time"

10648 msgstr "tiempo"

10649

10645 -#: builtin/clone.c:128

10650 +#: builtin/clone.c:125

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

10652 msgstr "crear un clon superficial desde el tiempo específico"

10653

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

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

10655 #: builtin/rebase.c:1389

10656 msgid "revision"

10657 msgstr "revision"

10658

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

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

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

10661 msgstr "ahondando historia de clon superficial, excluyendo rev"

10662

10658 -#: builtin/clone.c:132

10663 +#: builtin/clone.c:129

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

10665 msgstr "clonar solo una rama,HEAD o --branch"

10666

10662 -#: builtin/clone.c:134

10667 +#: builtin/clone.c:131

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

10669 msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan"

10670

10666 -#: builtin/clone.c:136

10671 +#: builtin/clone.c:133

10672 msgid "any cloned submodules will be shallow"

10673 msgstr "cualquier submódulo clonado será superficial"

10674

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

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

10676 msgid "gitdir"

10677 msgstr "gitdir"

10678

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

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

10680 msgid "separate git dir from working tree"

10681 msgstr "separa git dir del árbol de trabajo"

10682

10678 -#: builtin/clone.c:139

10683 +#: builtin/clone.c:136

10684 msgid "key=value"

10685 msgstr "llave=valor"

10686

10682 -#: builtin/clone.c:140

10687 +#: builtin/clone.c:137

10688 msgid "set config inside the new repository"

10689 msgstr "configurar config dentro del nuevo repositorio"

10690

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

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

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

10693 msgid "server-specific"

10694 msgstr "especifico-de-servidor"

10695

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

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

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

10698 msgid "option to transmit"

10699 msgstr "opción para trasmitir"

10700

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

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

10702 #: builtin/push.c:586

10703 msgid "use IPv4 addresses only"

10704 msgstr "solo usar direcciones IPv4"

10705

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

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

10707 #: builtin/push.c:588

10708 msgid "use IPv6 addresses only"

10709 msgstr "solo usar direcciones IPv6"

10710

10706 -#: builtin/clone.c:283

10711 +#: builtin/clone.c:280

10712 msgid ""

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

10714 "Please specify a directory on the command line"

@@ -10711,47 +10716,47 @@ msgstr ""

10716 "No se pudo adivinar ningún nombre de directorio.\n"

10717 "Por favor especifique un directorio en la línea de comando"

10718

10714 -#: builtin/clone.c:336

10719 +#: builtin/clone.c:333

10720 #, c-format

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

10722 msgstr "info: No se pudo agregar un alterno para '%s': %s\n"

10723

10719 -#: builtin/clone.c:408

10724 +#: builtin/clone.c:405

10725 #, c-format

10726 msgid "failed to open '%s'"

10727 msgstr "falló al abrir '%s'"

10728

10724 -#: builtin/clone.c:416

10729 +#: builtin/clone.c:413

10730 #, c-format

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

10732 msgstr "%s existe pero no es un directorio"

10733

10729 -#: builtin/clone.c:430

10734 +#: builtin/clone.c:427

10735 #, c-format

10736 msgid "failed to stat %s\n"

10737 msgstr "falló al analizar %s\n"

10738

10734 -#: builtin/clone.c:447

10739 +#: builtin/clone.c:444

10740 #, c-format

10741 msgid "failed to unlink '%s'"

10742 msgstr "falló al desvincular '%s'"

10743

10739 -#: builtin/clone.c:452

10744 +#: builtin/clone.c:449

10745 #, c-format

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

10747 msgstr "falló al crear link '%s'"

10748

10744 -#: builtin/clone.c:456

10749 +#: builtin/clone.c:453

10750 #, c-format

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

10752 msgstr "falló al copiar archivo a '%s'"

10753

10749 -#: builtin/clone.c:482

10754 +#: builtin/clone.c:479

10755 #, c-format

10756 msgid "done.\n"

10757 msgstr "hecho.\n"

10758

10754 -#: builtin/clone.c:496

10759 +#: builtin/clone.c:493

10760 msgid ""

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

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

@@ -10761,96 +10766,96 @@ msgstr ""

10766 "Puede inspeccionar a qué se hizo checkout con 'git status'\n"

10767 "y volver a intentarlo con 'git checkout -f HEAD'\n"

10768

10764 -#: builtin/clone.c:573

10769 +#: builtin/clone.c:570

10770 #, c-format

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

10772 msgstr "No se pudo encontrar la rama remota %s para clonar."

10773

10769 -#: builtin/clone.c:692

10774 +#: builtin/clone.c:689

10775 #, c-format

10776 msgid "unable to update %s"

10777 msgstr "incapaz de actualizar %s"

10778

10774 -#: builtin/clone.c:742

10779 +#: builtin/clone.c:739

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

10781 msgstr ""

10782 "remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n"

10783

10779 -#: builtin/clone.c:773

10784 +#: builtin/clone.c:770

10785 msgid "unable to checkout working tree"

10786 msgstr "no es posible realizar checkout en el árbol de trabajo"

10787

10783 -#: builtin/clone.c:818

10788 +#: builtin/clone.c:815

10789 msgid "unable to write parameters to config file"

10790 msgstr "no es posible escribir parámetros al archivo config"

10791

10787 -#: builtin/clone.c:881

10792 +#: builtin/clone.c:878

10793 msgid "cannot repack to clean up"

10794 msgstr "no se puede reempaquetar para limpiar"

10795

10791 -#: builtin/clone.c:883

10796 +#: builtin/clone.c:880

10797 msgid "cannot unlink temporary alternates file"

10798 msgstr "no se puede desvincular archivos alternos temporales"

10799

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

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

10801 msgid "Too many arguments."

10802 msgstr "Muchos argumentos."

10803

10799 -#: builtin/clone.c:927

10804 +#: builtin/clone.c:924

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

10806 msgstr "Tienes que especificar un repositorio para clonar."

10807

10803 -#: builtin/clone.c:940

10808 +#: builtin/clone.c:937

10809 #, c-format

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

10811 msgstr "Las opciones --bare y --origin %s son incompatibles."

10812

10808 -#: builtin/clone.c:943

10813 +#: builtin/clone.c:940

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

10815 msgstr "--bare y --separate-git-dir son incompatibles."

10816

10812 -#: builtin/clone.c:956

10817 +#: builtin/clone.c:953

10818 #, c-format

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

10820 msgstr "repositorio '%s' no existe"

10821

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

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

10823 #, c-format

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

10825 msgstr "profundidad %s no es un numero positivo"

10826

10822 -#: builtin/clone.c:972

10827 +#: builtin/clone.c:969

10828 #, c-format

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

10830 msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío."

10831

10827 -#: builtin/clone.c:982

10832 +#: builtin/clone.c:979

10833 #, c-format

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

10835 msgstr "directorio de trabajo '%s' ya existe."

10836

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

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

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

10839 #, c-format

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

10841 msgstr "no se pudo crear directorios principales de '%s'"

10842

10838 -#: builtin/clone.c:1002

10843 +#: builtin/clone.c:999

10844 #, c-format

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

10846 msgstr "no se pudo crear un árbol de trabajo '%s'"

10847

10843 -#: builtin/clone.c:1022

10848 +#: builtin/clone.c:1019

10849 #, c-format

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

10851 msgstr "Clonando en un repositorio vacío '%s'...\n"

10852

10848 -#: builtin/clone.c:1024

10853 +#: builtin/clone.c:1021

10854 #, c-format

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

10856 msgstr "Clonando en '%s'...\n"

10857

10853 -#: builtin/clone.c:1048

10858 +#: builtin/clone.c:1045

10859 msgid ""

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

10861 "able"

@@ -10858,36 +10863,36 @@ msgstr ""

10863 "clone --recursive no es compatible con --reference y --reference-if-able al "

10864 "mismo tiempo"

10865

10861 -#: builtin/clone.c:1109

10866 +#: builtin/clone.c:1106

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

10868 msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien."

10869

10865 -#: builtin/clone.c:1111

10870 +#: builtin/clone.c:1108

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

10872 msgstr "--shallow-since es ignorado en el clon local; use file:// ."

10873

10869 -#: builtin/clone.c:1113

10874 +#: builtin/clone.c:1110

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

10876 msgstr "--shallow-exclude es ignorado en clones locales; use file://."

10877

10873 -#: builtin/clone.c:1115

10878 +#: builtin/clone.c:1112

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

10880 msgstr "--filter es ignorado en clones locales; usa file:// en su lugar."

10881

10877 -#: builtin/clone.c:1118

10882 +#: builtin/clone.c:1115

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

10884 msgstr "repositorio fuente es superficial, ignorando --local"

10885

10881 -#: builtin/clone.c:1123

10886 +#: builtin/clone.c:1120

10887 msgid "--local is ignored"

10888 msgstr "--local es ignorado"

10889

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

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

10891 #, c-format

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

10893 msgstr "Rama remota %s no encontrada en upstream %s"

10894

10890 -#: builtin/clone.c:1211

10895 +#: builtin/clone.c:1208

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

10897 msgstr "Pareces haber clonado un repositorio sin contenido."

10898

@@ -11319,7 +11324,7 @@ msgstr "terminar entradas con NUL"

11324

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

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

11322 -#: parse-options.h:323

11327 +#: parse-options.h:331

11328 msgid "mode"

11329 msgstr "modo"

11330

@@ -11337,7 +11342,7 @@ msgstr ""

11342 "mostrar archivos ignorados, modos opcionales: traditional, matching, no. "

11343 "(Predeterminado: traditional)"

11344

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

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

11346 msgid "when"

11347 msgstr "cuando"

11348

@@ -11399,7 +11404,7 @@ msgid "override date for commit"

11404 msgstr "sobrescribe la fecha del commit"

11405

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

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

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

11408 msgid "commit"

11409 msgstr "confirmar"

11410

@@ -12092,31 +12097,31 @@ msgstr "más de dos blobs entregados: '%s'"

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

12098 msgstr "objeto no manejado '%s' entregado."

12099

12095 -#: builtin/difftool.c:31

12100 +#: builtin/difftool.c:30

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

12102 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"

12103

12099 -#: builtin/difftool.c:259

12104 +#: builtin/difftool.c:253

12105 #, c-format

12106 msgid "failed: %d"

12107 msgstr "falló: %d"

12108

12104 -#: builtin/difftool.c:301

12109 +#: builtin/difftool.c:295

12110 #, c-format

12111 msgid "could not read symlink %s"

12112 msgstr "no se pudo leer el symlink %s"

12113

12109 -#: builtin/difftool.c:303

12114 +#: builtin/difftool.c:297

12115 #, c-format

12116 msgid "could not read symlink file %s"

12117 msgstr "no se pudo leer el archivo symlink %s"

12118

12114 -#: builtin/difftool.c:311

12119 +#: builtin/difftool.c:305

12120 #, c-format

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

12122 msgstr "no se pudo leer el objeto %s para el symlink %s"

12123

12119 -#: builtin/difftool.c:412

12124 +#: builtin/difftool.c:406

12125 msgid ""

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

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

@@ -12124,54 +12129,54 @@ msgstr ""

12129 "formatos combinados de diff ('-c' y '--cc') no soportados en\n"

12130 "modo diff para directorio('-d' y '--dir-diff')."

12131

12127 -#: builtin/difftool.c:632

12132 +#: builtin/difftool.c:626

12133 #, c-format

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

12135 msgstr "ambos archivos modificados: '%s' y '%s'."

12136

12132 -#: builtin/difftool.c:634

12137 +#: builtin/difftool.c:628

12138 msgid "working tree file has been left."

12139 msgstr "archivo del árbol de trabajo ha sido dejado."

12140

12136 -#: builtin/difftool.c:645

12141 +#: builtin/difftool.c:639

12142 #, c-format

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

12144 msgstr "archivo temporal existe en '%s'."

12145

12141 -#: builtin/difftool.c:646

12146 +#: builtin/difftool.c:640

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

12148 msgstr "tal vez desee limpiar o recuperar estos."

12149

12145 -#: builtin/difftool.c:695

12150 +#: builtin/difftool.c:689

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

12152 msgstr "use `diff.guitool` en lugar de `diff.tool`"

12153

12149 -#: builtin/difftool.c:697

12154 +#: builtin/difftool.c:691

12155 msgid "perform a full-directory diff"

12156 msgstr "realizar un diff de todo el directorio"

12157

12153 -#: builtin/difftool.c:699

12158 +#: builtin/difftool.c:693

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

12160 msgstr "no mostrar antes de lanzar una herramienta de diff"

12161

12157 -#: builtin/difftool.c:704

12162 +#: builtin/difftool.c:698

12163 msgid "use symlinks in dir-diff mode"

12164 msgstr "usar enlaces simbólicos en modo dir-diff"

12165

12161 -#: builtin/difftool.c:705

12166 +#: builtin/difftool.c:699

12167 msgid "tool"

12168 msgstr "herramienta"

12169

12165 -#: builtin/difftool.c:706

12170 +#: builtin/difftool.c:700

12171 msgid "use the specified diff tool"

12172 msgstr "usar la herramienta de diff especificada"

12173

12169 -#: builtin/difftool.c:708

12174 +#: builtin/difftool.c:702

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

12176 msgstr ""

12177 "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"

12178

12174 -#: builtin/difftool.c:711

12179 +#: builtin/difftool.c:705

12180 msgid ""

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

12182 "code"

@@ -12179,23 +12184,31 @@ msgstr ""

12184 "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un "

12185 "código de salida distinto de cero"

12186

12182 -#: builtin/difftool.c:714

12187 +#: builtin/difftool.c:708

12188 msgid "specify a custom command for viewing diffs"

12189 msgstr "especificar un comando personalizado para ver diffs"

12190

12186 -#: builtin/difftool.c:715

12191 +#: builtin/difftool.c:709

12192 msgid "passed to `diff`"

12193 msgstr "pasado a `diff`"

12194

12190 -#: builtin/difftool.c:730

12195 +#: builtin/difftool.c:724

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

12197 msgstr "difftool requiere un árbol de trabajo o --no-index"

12198

12194 -#: builtin/difftool.c:744

12199 +#: builtin/difftool.c:731

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

12201 +msgstr "--dirty-diff es incompatible con --no-index"

12202 +

12203 +#: builtin/difftool.c:734

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

12205 +msgstr "--gui, --tool y --extcmd son mutuamente exclusivas"

12206 +

12207 +#: builtin/difftool.c:742

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

12209 msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"

12210

12198 -#: builtin/difftool.c:751

12211 +#: builtin/difftool.c:749

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

12213 msgstr "no se ha entregado <comando> para --extcmd=<comando>"

12214

@@ -15956,15 +15969,15 @@ msgstr "Enumerando objetos"

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

15970 msgstr "Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>)"

15971

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

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

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

15974 msgstr "git pack-refs [<opciones>]"

15975

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

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

15977 msgid "pack everything"

15978 msgstr "empaquetar todo"

15979

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

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

15981 msgid "prune loose refs (default)"

15982 msgstr "recortar refs perdidos (default)"

15983

@@ -18835,7 +18848,7 @@ msgstr "'%s' no es una ref válida."

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

18849 msgstr "no se puede encontrar el commit %s (%s)"

18850

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

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

18852 msgid ""

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

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

@@ -18843,39 +18856,39 @@ msgstr ""

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

18857 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patrón>...]"

18858

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

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

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

18861 msgstr "git show-ref --exclude-existing[=<patrón>]"

18862

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

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

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

18865 msgstr "solo mostrar tags (puede ser combinado con heads)"

18866

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

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

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

18869 msgstr "solo mostrar heads (puede ser combinado con tags)"

18870

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

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

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

18873 msgstr "revisar referencias más estrictamente, requiere ruta de ref exacta"

18874

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

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

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

18877 msgstr "mostrar la referencia de HEAD, incluso si se filtrara"

18878

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

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

18880 msgid "dereference tags into object IDs"

18881 msgstr "tags de deferencia en IDs de objeto"

18882

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

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

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

18885 msgstr "solo mostrar hash SHA1 usando <n> dígitos"

18886

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

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

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

18889 msgstr "no mostrar resultados en stdout (útil con --verify)"

18890

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

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

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

18893 msgstr "mostrar refs de stdin que no están en el repositorio local"

18894

@@ -19643,12 +19656,12 @@ msgstr "incapaz de escribir el archivo de tag"

19656 #: builtin/tag.c:210

19657 #, c-format

19658 msgid ""

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

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

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

19661 "\n"

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

19663 msgstr ""

19651 -"Has creado un tag anidado. El objeto referido por el nuevo ya\n"

19664 +"Has creado un tag anidado. El objeto referido por el nuevo tag ya\n"

19665 "es un tag. Si quisiste hacer el tag al objeto que apunta, usa:\n"

19666 "\n"

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

@@ -20779,27 +20792,27 @@ msgstr "args"

20792 msgid "object filtering"

20793 msgstr "filtrado de objeto"

20794

20782 -#: parse-options.h:169

20795 +#: parse-options.h:170

20796 msgid "expiry-date"

20797 msgstr "fecha de expiración"

20798

20786 -#: parse-options.h:183

20799 +#: parse-options.h:184

20800 msgid "no-op (backward compatibility)"

20801 msgstr "no-op (compatibilidad con versiones anteriores)"

20802

20790 -#: parse-options.h:296

20803 +#: parse-options.h:304

20804 msgid "be more verbose"

20805 msgstr "ser mas verboso"

20806

20794 -#: parse-options.h:298

20807 +#: parse-options.h:306

20808 msgid "be more quiet"

20809 msgstr "ser mas discreto"

20810

20798 -#: parse-options.h:304

20811 +#: parse-options.h:312

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

20813 msgstr "usa <n> dígitos para mostrar SHA-1s"

20814

20802 -#: parse-options.h:323

20815 +#: parse-options.h:331

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

20817 msgstr "cómo quitar espacios y #comentarios de mensajes"

20818

l10n: es: 2.22.0 round 2