|
7 | 7 | msgstr ""
|
8 | 8 | "Project-Id-Version: Git\n"
|
9 | 9 | " Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
|
10 |
| -"POT-Creation-Date: 2017-10-08 09:48+0800\n" |
11 |
| -"PO-Revision-Date: 2017-10-08 11:17-0500\n" |
| 10 | +"POT-Creation-Date: 2017-10-17 09:44+0800\n" |
| 11 | +"PO-Revision-Date: 2017-10-16 21:15-0500\n" |
12 | 12 | " Last-Translator: [email protected]\n"
|
13 | 13 | " Language-Team: CodeLabora <[email protected]>\n"
|
14 | 14 | "Language: es\n"
|
@@ -1006,7 +1006,7 @@ msgid "--reverse and --first-parent together require specified latest commit"
|
1006 | 1006 | msgstr ""
|
1007 | 1007 | "--reverse y --first-parent juntos requieren especificar el ultimo commit"
|
1008 | 1008 |
|
1009 |
| -#: blame.c:1797 bundle.c:169 ref-filter.c:1932 sequencer.c:1168 |
| 1009 | +#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168 |
1010 | 1010 | #: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911
|
1011 | 1011 | #: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369
|
1012 | 1012 | #: builtin/shortlog.c:191
|
@@ -1681,7 +1681,7 @@ msgstr "no se pudo migrar el directorio git de '%s' a '%s'"
|
1681 | 1681 | msgid "Filtering content"
|
1682 | 1682 | msgstr "Filtrando contenido"
|
1683 | 1683 |
|
1684 |
| -#: entry.c:417 |
| 1684 | +#: entry.c:433 |
1685 | 1685 | #, c-format
|
1686 | 1686 | msgid "could not stat file '%s'"
|
1687 | 1687 | msgstr "no se pudo establecer el archivo '%s'"
|
@@ -2566,7 +2566,7 @@ msgstr "no es posible remover el vinculo: %s"
|
2566 | 2566 | msgid "Could not open '%s' for writing"
|
2567 | 2567 | msgstr "No sepudo abrir '%s' para escritura"
|
2568 | 2568 |
|
2569 |
| -#: refs.c:1779 |
| 2569 | +#: refs.c:1792 |
2570 | 2570 | msgid "ref updates forbidden inside quarantine environment"
|
2571 | 2571 | msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
|
2572 | 2572 |
|
@@ -2605,212 +2605,212 @@ msgstr "detras %d"
|
2605 | 2605 | msgid "ahead %d, behind %d"
|
2606 | 2606 | msgstr "delante %d, detras %d"
|
2607 | 2607 |
|
2608 |
| -#: ref-filter.c:104 |
| 2608 | +#: ref-filter.c:105 |
2609 | 2609 | #, c-format
|
2610 | 2610 | msgid "expected format: %%(color:<color>)"
|
2611 | 2611 | msgstr "formato esperado: %%(color:<color>)"
|
2612 | 2612 |
|
2613 |
| -#: ref-filter.c:106 |
| 2613 | +#: ref-filter.c:107 |
2614 | 2614 | #, c-format
|
2615 | 2615 | msgid "unrecognized color: %%(color:%s)"
|
2616 | 2616 | msgstr "color no reconocido: %%(color:%s)"
|
2617 | 2617 |
|
2618 |
| -#: ref-filter.c:126 |
| 2618 | +#: ref-filter.c:127 |
2619 | 2619 | #, c-format
|
2620 | 2620 | msgid "Integer value expected refname:lstrip=%s"
|
2621 | 2621 | msgstr "valor entero esperado refname:lstrip=%s"
|
2622 | 2622 |
|
2623 |
| -#: ref-filter.c:130 |
| 2623 | +#: ref-filter.c:131 |
2624 | 2624 | #, c-format
|
2625 | 2625 | msgid "Integer value expected refname:rstrip=%s"
|
2626 | 2626 | msgstr "valor entero esperado refname:rstrip=%s"
|
2627 | 2627 |
|
2628 |
| -#: ref-filter.c:132 |
| 2628 | +#: ref-filter.c:133 |
2629 | 2629 | #, c-format
|
2630 | 2630 | msgid "unrecognized %%(%s) argument: %s"
|
2631 | 2631 | msgstr "argumento: %s no reconocido %%(%s)"
|
2632 | 2632 |
|
2633 |
| -#: ref-filter.c:172 |
| 2633 | +#: ref-filter.c:173 |
2634 | 2634 | #, c-format
|
2635 | 2635 | msgid "%%(body) does not take arguments"
|
2636 | 2636 | msgstr "%%(body) no toma ningún argumento"
|
2637 | 2637 |
|
2638 |
| -#: ref-filter.c:179 |
| 2638 | +#: ref-filter.c:180 |
2639 | 2639 | #, c-format
|
2640 | 2640 | msgid "%%(subject) does not take arguments"
|
2641 | 2641 | msgstr "%%(subject) no toma ningún argumento"
|
2642 | 2642 |
|
2643 |
| -#: ref-filter.c:186 |
| 2643 | +#: ref-filter.c:198 |
2644 | 2644 | #, c-format
|
2645 |
| -msgid "%%(trailers) does not take arguments" |
2646 |
| -msgstr "%%(trailers) no toma argumentos" |
| 2645 | +msgid "unknown %%(trailers) argument: %s" |
| 2646 | +msgstr "%%(trailers) desconocidos, argumento: %s" |
2647 | 2647 |
|
2648 |
| -#: ref-filter.c:205 |
| 2648 | +#: ref-filter.c:221 |
2649 | 2649 | #, c-format
|
2650 | 2650 | msgid "positive value expected contents:lines=%s"
|
2651 | 2651 | msgstr "valor positivo esperado contents:lines=%s"
|
2652 | 2652 |
|
2653 |
| -#: ref-filter.c:207 |
| 2653 | +#: ref-filter.c:223 |
2654 | 2654 | #, c-format
|
2655 | 2655 | msgid "unrecognized %%(contents) argument: %s"
|
2656 | 2656 | msgstr "argumento %s no reconocido %%(contents)"
|
2657 | 2657 |
|
2658 |
| -#: ref-filter.c:220 |
| 2658 | +#: ref-filter.c:236 |
2659 | 2659 | #, c-format
|
2660 | 2660 | msgid "positive value expected objectname:short=%s"
|
2661 | 2661 | msgstr "valor positivo esperado objectname:short=%s"
|
2662 | 2662 |
|
2663 |
| -#: ref-filter.c:224 |
| 2663 | +#: ref-filter.c:240 |
2664 | 2664 | #, c-format
|
2665 | 2665 | msgid "unrecognized %%(objectname) argument: %s"
|
2666 | 2666 | msgstr "argumento: %s no reconocido %%(objectname)"
|
2667 | 2667 |
|
2668 |
| -#: ref-filter.c:251 |
| 2668 | +#: ref-filter.c:267 |
2669 | 2669 | #, c-format
|
2670 | 2670 | msgid "expected format: %%(align:<width>,<position>)"
|
2671 | 2671 | msgstr "formato esperado: %%(align:<ancho>,<posición>)"
|
2672 | 2672 |
|
2673 |
| -#: ref-filter.c:263 |
| 2673 | +#: ref-filter.c:279 |
2674 | 2674 | #, c-format
|
2675 | 2675 | msgid "unrecognized position:%s"
|
2676 | 2676 | msgstr "posición desconocida: %s"
|
2677 | 2677 |
|
2678 |
| -#: ref-filter.c:267 |
| 2678 | +#: ref-filter.c:283 |
2679 | 2679 | #, c-format
|
2680 | 2680 | msgid "unrecognized width:%s"
|
2681 | 2681 | msgstr "ancho desconocido: %s"
|
2682 | 2682 |
|
2683 |
| -#: ref-filter.c:273 |
| 2683 | +#: ref-filter.c:289 |
2684 | 2684 | #, c-format
|
2685 | 2685 | msgid "unrecognized %%(align) argument: %s"
|
2686 | 2686 | msgstr "argumento no reconocido para %%(align): %s"
|
2687 | 2687 |
|
2688 |
| -#: ref-filter.c:277 |
| 2688 | +#: ref-filter.c:293 |
2689 | 2689 | #, c-format
|
2690 | 2690 | msgid "positive width expected with the %%(align) atom"
|
2691 | 2691 | msgstr "se esperaba un ancho positivo con el átomo %%(align)"
|
2692 | 2692 |
|
2693 |
| -#: ref-filter.c:292 |
| 2693 | +#: ref-filter.c:308 |
2694 | 2694 | #, c-format
|
2695 | 2695 | msgid "unrecognized %%(if) argument: %s"
|
2696 | 2696 | msgstr "argumento: %s no reconocido %%(if)"
|
2697 | 2697 |
|
2698 |
| -#: ref-filter.c:382 |
| 2698 | +#: ref-filter.c:398 |
2699 | 2699 | #, c-format
|
2700 | 2700 | msgid "malformed field name: %.*s"
|
2701 | 2701 | msgstr "nombre malformado de campo: %.*s"
|
2702 | 2702 |
|
2703 |
| -#: ref-filter.c:408 |
| 2703 | +#: ref-filter.c:424 |
2704 | 2704 | #, c-format
|
2705 | 2705 | msgid "unknown field name: %.*s"
|
2706 | 2706 | msgstr "nombre de campo desconocido: %.*s"
|
2707 | 2707 |
|
2708 |
| -#: ref-filter.c:520 |
| 2708 | +#: ref-filter.c:536 |
2709 | 2709 | #, c-format
|
2710 | 2710 | msgid "format: %%(if) atom used without a %%(then) atom"
|
2711 | 2711 | msgstr "formato: atomo %%(if) usado sin un atomo %%(then)"
|
2712 | 2712 |
|
2713 |
| -#: ref-filter.c:580 |
| 2713 | +#: ref-filter.c:596 |
2714 | 2714 | #, c-format
|
2715 | 2715 | msgid "format: %%(then) atom used without an %%(if) atom"
|
2716 | 2716 | msgstr "formato: atomo %%(then) usado sin atomo %%(if)"
|
2717 | 2717 |
|
2718 |
| -#: ref-filter.c:582 |
| 2718 | +#: ref-filter.c:598 |
2719 | 2719 | #, c-format
|
2720 | 2720 | msgid "format: %%(then) atom used more than once"
|
2721 | 2721 | msgstr "formato: atomo %%(then) usado mas de una vez"
|
2722 | 2722 |
|
2723 |
| -#: ref-filter.c:584 |
| 2723 | +#: ref-filter.c:600 |
2724 | 2724 | #, c-format
|
2725 | 2725 | msgid "format: %%(then) atom used after %%(else)"
|
2726 | 2726 | msgstr "formato: atomo %%(then) usado despues de %%(else)"
|
2727 | 2727 |
|
2728 |
| -#: ref-filter.c:610 |
| 2728 | +#: ref-filter.c:626 |
2729 | 2729 | #, c-format
|
2730 | 2730 | msgid "format: %%(else) atom used without an %%(if) atom"
|
2731 | 2731 | msgstr "formato: atomo %%(else) usado sin un atomo %%(if)"
|
2732 | 2732 |
|
2733 |
| -#: ref-filter.c:612 |
| 2733 | +#: ref-filter.c:628 |
2734 | 2734 | #, c-format
|
2735 | 2735 | msgid "format: %%(else) atom used without a %%(then) atom"
|
2736 | 2736 | msgstr "formato: atomo %%(else) usado sin un atomo %%(then) "
|
2737 | 2737 |
|
2738 |
| -#: ref-filter.c:614 |
| 2738 | +#: ref-filter.c:630 |
2739 | 2739 | #, c-format
|
2740 | 2740 | msgid "format: %%(else) atom used more than once"
|
2741 | 2741 | msgstr "formato: atomo %%(else) usado mas de una vez"
|
2742 | 2742 |
|
2743 |
| -#: ref-filter.c:627 |
| 2743 | +#: ref-filter.c:643 |
2744 | 2744 | #, c-format
|
2745 | 2745 | msgid "format: %%(end) atom used without corresponding atom"
|
2746 | 2746 | msgstr "formato: atomo %%(end) usado sin atomo correspondiente"
|
2747 | 2747 |
|
2748 |
| -#: ref-filter.c:682 |
| 2748 | +#: ref-filter.c:698 |
2749 | 2749 | #, c-format
|
2750 | 2750 | msgid "malformed format string %s"
|
2751 | 2751 | msgstr "formato de cadena malformado %s"
|
2752 | 2752 |
|
2753 |
| -#: ref-filter.c:1268 |
| 2753 | +#: ref-filter.c:1283 |
2754 | 2754 | #, c-format
|
2755 | 2755 | msgid "(no branch, rebasing %s)"
|
2756 | 2756 | msgstr "(no hay rama, rebasando %s)"
|
2757 | 2757 |
|
2758 |
| -#: ref-filter.c:1271 |
| 2758 | +#: ref-filter.c:1286 |
2759 | 2759 | #, c-format
|
2760 | 2760 | msgid "(no branch, bisect started on %s)"
|
2761 | 2761 | msgstr "(no hay rama, comenzando bisectado en %s)"
|
2762 | 2762 |
|
2763 | 2763 | #. TRANSLATORS: make sure this matches "HEAD
|
2764 | 2764 | #. detached at " in wt-status.c
|
2765 | 2765 | #.
|
2766 |
| -#: ref-filter.c:1279 |
| 2766 | +#: ref-filter.c:1294 |
2767 | 2767 | #, c-format
|
2768 | 2768 | msgid "(HEAD detached at %s)"
|
2769 | 2769 | msgstr "(HEAD desascoplado en %s)"
|
2770 | 2770 |
|
2771 | 2771 | #. TRANSLATORS: make sure this matches "HEAD
|
2772 | 2772 | #. detached from " in wt-status.c
|
2773 | 2773 | #.
|
2774 |
| -#: ref-filter.c:1286 |
| 2774 | +#: ref-filter.c:1301 |
2775 | 2775 | #, c-format
|
2776 | 2776 | msgid "(HEAD detached from %s)"
|
2777 | 2777 | msgstr "(HEAD desacoplado de %s)"
|
2778 | 2778 |
|
2779 |
| -#: ref-filter.c:1290 |
| 2779 | +#: ref-filter.c:1305 |
2780 | 2780 | msgid "(no branch)"
|
2781 | 2781 | msgstr "(sin rama)"
|
2782 | 2782 |
|
2783 |
| -#: ref-filter.c:1439 ref-filter.c:1470 |
| 2783 | +#: ref-filter.c:1454 ref-filter.c:1485 |
2784 | 2784 | #, c-format
|
2785 | 2785 | msgid "missing object %s for %s"
|
2786 | 2786 | msgstr "objeto %s faltante para %s"
|
2787 | 2787 |
|
2788 |
| -#: ref-filter.c:1442 ref-filter.c:1473 |
| 2788 | +#: ref-filter.c:1457 ref-filter.c:1488 |
2789 | 2789 | #, c-format
|
2790 | 2790 | msgid "parse_object_buffer failed on %s for %s"
|
2791 | 2791 | msgstr "parse_object_buffer falló en %s para %s"
|
2792 | 2792 |
|
2793 |
| -#: ref-filter.c:1773 |
| 2793 | +#: ref-filter.c:1788 |
2794 | 2794 | #, c-format
|
2795 | 2795 | msgid "malformed object at '%s'"
|
2796 | 2796 | msgstr "objeto malformado en '%s'"
|
2797 | 2797 |
|
2798 |
| -#: ref-filter.c:1840 |
| 2798 | +#: ref-filter.c:1855 |
2799 | 2799 | #, c-format
|
2800 | 2800 | msgid "ignoring ref with broken name %s"
|
2801 | 2801 | msgstr "ignorando referencia con nombre roto %s"
|
2802 | 2802 |
|
2803 |
| -#: ref-filter.c:1845 |
| 2803 | +#: ref-filter.c:1860 |
2804 | 2804 | #, c-format
|
2805 | 2805 | msgid "ignoring broken ref %s"
|
2806 | 2806 | msgstr "ignorando referencia rota %s"
|
2807 | 2807 |
|
2808 |
| -#: ref-filter.c:2107 |
| 2808 | +#: ref-filter.c:2122 |
2809 | 2809 | #, c-format
|
2810 | 2810 | msgid "format: %%(end) atom missing"
|
2811 | 2811 | msgstr "formato: falta atomo %%(end)"
|
2812 | 2812 |
|
2813 |
| -#: ref-filter.c:2201 |
| 2813 | +#: ref-filter.c:2216 |
2814 | 2814 | #, c-format
|
2815 | 2815 | msgid "malformed object name %s"
|
2816 | 2816 | msgstr "nombre de objeto malformado %s"
|
@@ -3522,9 +3522,10 @@ msgstr "No se pudo abrir '%s' para escritura"
|
3522 | 3522 |
|
3523 | 3523 | #: sequencer.c:2561
|
3524 | 3524 | #, c-format
|
3525 |
| -msgid "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring." |
| 3525 | +msgid "" |
| 3526 | +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." |
3526 | 3527 | msgstr ""
|
3527 |
| -"Opcion %s no reconocida para optionrebase.missingCommitsCheck. Ingorando." |
| 3528 | +"Opción %s no reconocida para la opción rebase.missingCommitsCheck. Ingorando." |
3528 | 3529 |
|
3529 | 3530 | #: sequencer.c:2641
|
3530 | 3531 | #, c-format
|
@@ -16555,6 +16556,9 @@ msgstr "Saltando %s con el sufijo de backup '%s'.\n"
|
16555 | 16556 | msgid "Do you really want to send %s? [y|N]: "
|
16556 | 16557 | msgstr "Realmente deseas mandar %s?[y|N]"
|
16557 | 16558 |
|
| 16559 | +#~ msgid "%%(trailers) does not take arguments" |
| 16560 | +#~ msgstr "%%(trailers) no toma argumentos" |
| 16561 | + |
16558 | 16562 | #~ msgid "submodule update strategy not supported for submodule '%s'"
|
16559 | 16563 | #~ msgstr ""
|
16560 | 16564 | #~ "estrategia de actualización de submódulo no soportada para submódulo '%s'"
|
|
0 commit comments