|
7 | 7 | msgstr "" |
8 | 8 | "Project-Id-Version: git 2.15.0\n" |
9 | 9 | "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" |
10 | | -"POT-Creation-Date: 2017-10-08 09:48+0800\n" |
11 | | -"PO-Revision-Date: 2017-10-11 11:31+0100\n" |
| 10 | +"POT-Creation-Date: 2017-10-17 09:44+0800\n" |
| 11 | +"PO-Revision-Date: 2017-10-18 19:34+0100\n" |
12 | 12 | "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" |
13 | 13 | "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" |
14 | 14 | "Language: sv\n" |
@@ -1001,7 +1001,7 @@ msgstr "" |
1001 | 1001 | "--reverse och --first-parent tillsammans kräver att du anger senaste " |
1002 | 1002 | "incheckningen" |
1003 | 1003 |
|
1004 | | -#: blame.c:1797 bundle.c:169 ref-filter.c:1932 sequencer.c:1168 |
| 1004 | +#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168 |
1005 | 1005 | #: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 |
1006 | 1006 | #: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369 |
1007 | 1007 | #: builtin/shortlog.c:191 |
@@ -1671,7 +1671,7 @@ msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" |
1671 | 1671 | msgid "Filtering content" |
1672 | 1672 | msgstr "Filtrerar innehåll" |
1673 | 1673 |
|
1674 | | -#: entry.c:417 |
| 1674 | +#: entry.c:433 |
1675 | 1675 | #, c-format |
1676 | 1676 | msgid "could not stat file '%s'" |
1677 | 1677 | msgstr "kunde inte ta status på filen \"%s\"" |
@@ -2548,7 +2548,7 @@ msgstr "misslyckades ta bort länken: %s" |
2548 | 2548 | msgid "Could not open '%s' for writing" |
2549 | 2549 | msgstr "Kunde inte öppna \"%s\" för skrivning" |
2550 | 2550 |
|
2551 | | -#: refs.c:1779 |
| 2551 | +#: refs.c:1792 |
2552 | 2552 | msgid "ref updates forbidden inside quarantine environment" |
2553 | 2553 | msgstr "referensuppdateringar förbjudna i karantänmiljö" |
2554 | 2554 |
|
@@ -2587,212 +2587,212 @@ msgstr "bakom %d" |
2587 | 2587 | msgid "ahead %d, behind %d" |
2588 | 2588 | msgstr "före %d, bakom %d" |
2589 | 2589 |
|
2590 | | -#: ref-filter.c:104 |
| 2590 | +#: ref-filter.c:105 |
2591 | 2591 | #, c-format |
2592 | 2592 | msgid "expected format: %%(color:<color>)" |
2593 | 2593 | msgstr "förväntat format: %%(color:<color>)" |
2594 | 2594 |
|
2595 | | -#: ref-filter.c:106 |
| 2595 | +#: ref-filter.c:107 |
2596 | 2596 | #, c-format |
2597 | 2597 | msgid "unrecognized color: %%(color:%s)" |
2598 | 2598 | msgstr "okänd färg: %%(color:%s)" |
2599 | 2599 |
|
2600 | | -#: ref-filter.c:126 |
| 2600 | +#: ref-filter.c:127 |
2601 | 2601 | #, c-format |
2602 | 2602 | msgid "Integer value expected refname:lstrip=%s" |
2603 | 2603 | msgstr "Heltalsvärde förväntades refname:lstrip=%s" |
2604 | 2604 |
|
2605 | | -#: ref-filter.c:130 |
| 2605 | +#: ref-filter.c:131 |
2606 | 2606 | #, c-format |
2607 | 2607 | msgid "Integer value expected refname:rstrip=%s" |
2608 | 2608 | msgstr "Heltalsvärde förväntades refname:rstrip=%s" |
2609 | 2609 |
|
2610 | | -#: ref-filter.c:132 |
| 2610 | +#: ref-filter.c:133 |
2611 | 2611 | #, c-format |
2612 | 2612 | msgid "unrecognized %%(%s) argument: %s" |
2613 | 2613 | msgstr "okänt %%(%s)-argument: %s" |
2614 | 2614 |
|
2615 | | -#: ref-filter.c:172 |
| 2615 | +#: ref-filter.c:173 |
2616 | 2616 | #, c-format |
2617 | 2617 | msgid "%%(body) does not take arguments" |
2618 | 2618 | msgstr "%%(body) tar inte argument" |
2619 | 2619 |
|
2620 | | -#: ref-filter.c:179 |
| 2620 | +#: ref-filter.c:180 |
2621 | 2621 | #, c-format |
2622 | 2622 | msgid "%%(subject) does not take arguments" |
2623 | 2623 | msgstr "%%(subject) tar inte argument" |
2624 | 2624 |
|
2625 | | -#: ref-filter.c:186 |
| 2625 | +#: ref-filter.c:198 |
2626 | 2626 | #, c-format |
2627 | | -msgid "%%(trailers) does not take arguments" |
2628 | | -msgstr "%%(trailers) tar inte argument" |
| 2627 | +msgid "unknown %%(trailers) argument: %s" |
| 2628 | +msgstr "okänt %%(trailers)-argument: %s" |
2629 | 2629 |
|
2630 | | -#: ref-filter.c:205 |
| 2630 | +#: ref-filter.c:221 |
2631 | 2631 | #, c-format |
2632 | 2632 | msgid "positive value expected contents:lines=%s" |
2633 | 2633 | msgstr "positivt värde förväntat contents:lines=%s" |
2634 | 2634 |
|
2635 | | -#: ref-filter.c:207 |
| 2635 | +#: ref-filter.c:223 |
2636 | 2636 | #, c-format |
2637 | 2637 | msgid "unrecognized %%(contents) argument: %s" |
2638 | 2638 | msgstr "okänt %%(contents)-argument: %s" |
2639 | 2639 |
|
2640 | | -#: ref-filter.c:220 |
| 2640 | +#: ref-filter.c:236 |
2641 | 2641 | #, c-format |
2642 | 2642 | msgid "positive value expected objectname:short=%s" |
2643 | 2643 | msgstr "positivt värde förväntat objectname:short=%s" |
2644 | 2644 |
|
2645 | | -#: ref-filter.c:224 |
| 2645 | +#: ref-filter.c:240 |
2646 | 2646 | #, c-format |
2647 | 2647 | msgid "unrecognized %%(objectname) argument: %s" |
2648 | 2648 | msgstr "okänt %%(objectname)-argument: %s" |
2649 | 2649 |
|
2650 | | -#: ref-filter.c:251 |
| 2650 | +#: ref-filter.c:267 |
2651 | 2651 | #, c-format |
2652 | 2652 | msgid "expected format: %%(align:<width>,<position>)" |
2653 | 2653 | msgstr "förväntat format: %%(align:<bredd>,<position>)" |
2654 | 2654 |
|
2655 | | -#: ref-filter.c:263 |
| 2655 | +#: ref-filter.c:279 |
2656 | 2656 | #, c-format |
2657 | 2657 | msgid "unrecognized position:%s" |
2658 | 2658 | msgstr "okänd position:%s" |
2659 | 2659 |
|
2660 | | -#: ref-filter.c:267 |
| 2660 | +#: ref-filter.c:283 |
2661 | 2661 | #, c-format |
2662 | 2662 | msgid "unrecognized width:%s" |
2663 | 2663 | msgstr "okänd bredd:%s" |
2664 | 2664 |
|
2665 | | -#: ref-filter.c:273 |
| 2665 | +#: ref-filter.c:289 |
2666 | 2666 | #, c-format |
2667 | 2667 | msgid "unrecognized %%(align) argument: %s" |
2668 | 2668 | msgstr "okänt %%(align)-argument: %s" |
2669 | 2669 |
|
2670 | | -#: ref-filter.c:277 |
| 2670 | +#: ref-filter.c:293 |
2671 | 2671 | #, c-format |
2672 | 2672 | msgid "positive width expected with the %%(align) atom" |
2673 | 2673 | msgstr "positiv bredd förväntad med atomen %%(align)" |
2674 | 2674 |
|
2675 | | -#: ref-filter.c:292 |
| 2675 | +#: ref-filter.c:308 |
2676 | 2676 | #, c-format |
2677 | 2677 | msgid "unrecognized %%(if) argument: %s" |
2678 | 2678 | msgstr "okänt %%(if)-argument: %s" |
2679 | 2679 |
|
2680 | | -#: ref-filter.c:382 |
| 2680 | +#: ref-filter.c:398 |
2681 | 2681 | #, c-format |
2682 | 2682 | msgid "malformed field name: %.*s" |
2683 | 2683 | msgstr "felformat fältnamn: %.*s" |
2684 | 2684 |
|
2685 | | -#: ref-filter.c:408 |
| 2685 | +#: ref-filter.c:424 |
2686 | 2686 | #, c-format |
2687 | 2687 | msgid "unknown field name: %.*s" |
2688 | 2688 | msgstr "okänt fältnamn: %.*s" |
2689 | 2689 |
|
2690 | | -#: ref-filter.c:520 |
| 2690 | +#: ref-filter.c:536 |
2691 | 2691 | #, c-format |
2692 | 2692 | msgid "format: %%(if) atom used without a %%(then) atom" |
2693 | 2693 | msgstr "format: atomen %%(if) använd utan en %%(then)-atom" |
2694 | 2694 |
|
2695 | | -#: ref-filter.c:580 |
| 2695 | +#: ref-filter.c:596 |
2696 | 2696 | #, c-format |
2697 | 2697 | msgid "format: %%(then) atom used without an %%(if) atom" |
2698 | 2698 | msgstr "format: atomen %%(then) använd utan en %%(if)-atom" |
2699 | 2699 |
|
2700 | | -#: ref-filter.c:582 |
| 2700 | +#: ref-filter.c:598 |
2701 | 2701 | #, c-format |
2702 | 2702 | msgid "format: %%(then) atom used more than once" |
2703 | 2703 | msgstr "format: atomen %%(then) använd mer än en gång" |
2704 | 2704 |
|
2705 | | -#: ref-filter.c:584 |
| 2705 | +#: ref-filter.c:600 |
2706 | 2706 | #, c-format |
2707 | 2707 | msgid "format: %%(then) atom used after %%(else)" |
2708 | 2708 | msgstr "format: atomen %%(then) använd efter %%(else)" |
2709 | 2709 |
|
2710 | | -#: ref-filter.c:610 |
| 2710 | +#: ref-filter.c:626 |
2711 | 2711 | #, c-format |
2712 | 2712 | msgid "format: %%(else) atom used without an %%(if) atom" |
2713 | 2713 | msgstr "format: atomen %%(else) använd utan en %%(if)-atom" |
2714 | 2714 |
|
2715 | | -#: ref-filter.c:612 |
| 2715 | +#: ref-filter.c:628 |
2716 | 2716 | #, c-format |
2717 | 2717 | msgid "format: %%(else) atom used without a %%(then) atom" |
2718 | 2718 | msgstr "format: atomen %%(else) använd utan en %%(then)-atom" |
2719 | 2719 |
|
2720 | | -#: ref-filter.c:614 |
| 2720 | +#: ref-filter.c:630 |
2721 | 2721 | #, c-format |
2722 | 2722 | msgid "format: %%(else) atom used more than once" |
2723 | 2723 | msgstr "format: atomen %%(else) använd mer än en gång" |
2724 | 2724 |
|
2725 | | -#: ref-filter.c:627 |
| 2725 | +#: ref-filter.c:643 |
2726 | 2726 | #, c-format |
2727 | 2727 | msgid "format: %%(end) atom used without corresponding atom" |
2728 | 2728 | msgstr "format: atomen %%(end) använd utan motsvarande atom" |
2729 | 2729 |
|
2730 | | -#: ref-filter.c:682 |
| 2730 | +#: ref-filter.c:698 |
2731 | 2731 | #, c-format |
2732 | 2732 | msgid "malformed format string %s" |
2733 | 2733 | msgstr "felformad formatsträng %s" |
2734 | 2734 |
|
2735 | | -#: ref-filter.c:1268 |
| 2735 | +#: ref-filter.c:1283 |
2736 | 2736 | #, c-format |
2737 | 2737 | msgid "(no branch, rebasing %s)" |
2738 | 2738 | msgstr "(ingen gren, ombaserar %s)" |
2739 | 2739 |
|
2740 | | -#: ref-filter.c:1271 |
| 2740 | +#: ref-filter.c:1286 |
2741 | 2741 | #, c-format |
2742 | 2742 | msgid "(no branch, bisect started on %s)" |
2743 | 2743 | msgstr "(ingen gren, \"bisect\" startad på %s)" |
2744 | 2744 |
|
2745 | 2745 | #. TRANSLATORS: make sure this matches "HEAD |
2746 | 2746 | #. detached at " in wt-status.c |
2747 | 2747 | #. |
2748 | | -#: ref-filter.c:1279 |
| 2748 | +#: ref-filter.c:1294 |
2749 | 2749 | #, c-format |
2750 | 2750 | msgid "(HEAD detached at %s)" |
2751 | 2751 | msgstr "(HEAD frånkopplat vid %s)" |
2752 | 2752 |
|
2753 | 2753 | #. TRANSLATORS: make sure this matches "HEAD |
2754 | 2754 | #. detached from " in wt-status.c |
2755 | 2755 | #. |
2756 | | -#: ref-filter.c:1286 |
| 2756 | +#: ref-filter.c:1301 |
2757 | 2757 | #, c-format |
2758 | 2758 | msgid "(HEAD detached from %s)" |
2759 | 2759 | msgstr "(HEAD frånkopplat från %s)" |
2760 | 2760 |
|
2761 | | -#: ref-filter.c:1290 |
| 2761 | +#: ref-filter.c:1305 |
2762 | 2762 | msgid "(no branch)" |
2763 | 2763 | msgstr "(ingen gren)" |
2764 | 2764 |
|
2765 | | -#: ref-filter.c:1439 ref-filter.c:1470 |
| 2765 | +#: ref-filter.c:1454 ref-filter.c:1485 |
2766 | 2766 | #, c-format |
2767 | 2767 | msgid "missing object %s for %s" |
2768 | 2768 | msgstr "objektet %s saknas för %s" |
2769 | 2769 |
|
2770 | | -#: ref-filter.c:1442 ref-filter.c:1473 |
| 2770 | +#: ref-filter.c:1457 ref-filter.c:1488 |
2771 | 2771 | #, c-format |
2772 | 2772 | msgid "parse_object_buffer failed on %s for %s" |
2773 | 2773 | msgstr "parse_object_buffer misslyckades på %s för %s" |
2774 | 2774 |
|
2775 | | -#: ref-filter.c:1773 |
| 2775 | +#: ref-filter.c:1788 |
2776 | 2776 | #, c-format |
2777 | 2777 | msgid "malformed object at '%s'" |
2778 | 2778 | msgstr "felformat objekt vid \"%s\"" |
2779 | 2779 |
|
2780 | | -#: ref-filter.c:1840 |
| 2780 | +#: ref-filter.c:1855 |
2781 | 2781 | #, c-format |
2782 | 2782 | msgid "ignoring ref with broken name %s" |
2783 | 2783 | msgstr "ignorerar referens med trasigt namn %s" |
2784 | 2784 |
|
2785 | | -#: ref-filter.c:1845 |
| 2785 | +#: ref-filter.c:1860 |
2786 | 2786 | #, c-format |
2787 | 2787 | msgid "ignoring broken ref %s" |
2788 | 2788 | msgstr "ignorerar trasig referens %s" |
2789 | 2789 |
|
2790 | | -#: ref-filter.c:2107 |
| 2790 | +#: ref-filter.c:2122 |
2791 | 2791 | #, c-format |
2792 | 2792 | msgid "format: %%(end) atom missing" |
2793 | 2793 | msgstr "format: atomen %%(end) saknas" |
2794 | 2794 |
|
2795 | | -#: ref-filter.c:2201 |
| 2795 | +#: ref-filter.c:2216 |
2796 | 2796 | #, c-format |
2797 | 2797 | msgid "malformed object name %s" |
2798 | 2798 | msgstr "felformat objektnamn %s" |
@@ -3500,13 +3500,8 @@ msgstr "kunde inte öppna \"%s\" för skrivning" |
3500 | 3500 |
|
3501 | 3501 | #: sequencer.c:2561 |
3502 | 3502 | #, c-format |
3503 | | -msgid "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring." |
3504 | | -msgstr "" |
3505 | | -"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar." |
3506 | | - |
3507 | | -#: sequencer.c:2561 |
3508 | | -#, c-format |
3509 | | -msgid "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." |
| 3503 | +msgid "" |
| 3504 | +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." |
3510 | 3505 | msgstr "" |
3511 | 3506 | "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar." |
3512 | 3507 |
|
@@ -16425,6 +16420,14 @@ msgstr "" |
16425 | 16420 | msgid "Do you really want to send %s? [y|N]: " |
16426 | 16421 | msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " |
16427 | 16422 |
|
| 16423 | +#~ msgid "%%(trailers) does not take arguments" |
| 16424 | +#~ msgstr "%%(trailers) tar inte argument" |
| 16425 | + |
| 16426 | +#~ msgid "" |
| 16427 | +#~ "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring." |
| 16428 | +#~ msgstr "" |
| 16429 | +#~ "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar." |
| 16430 | + |
16428 | 16431 | #~ msgid "%" |
16429 | 16432 | #~ msgid_plural "%" |
16430 | 16433 | #~ msgstr[0] "%" |
|
0 commit comments