94ad57c893 · matheusbsbs/matheus-bagliano

@@ -7,10 +7,10 @@ msgid ""

7 msgstr ""

8 "Project-Id-Version: git 2.12.0\n"

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

10 -"POT-Creation-Date: 2017-02-18 01:00+0800\n"

11 -"PO-Revision-Date: 2017-02-20 19:38+0100\n"

10 +"POT-Creation-Date: 2017-04-23 09:54+0800\n"

11 +"PO-Revision-Date: 2017-04-23 19:46+0100\n"

12 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"

13 -"Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n"

13 +"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"

14 "Language: sv\n"

15 "MIME-Version: 1.0\n"

16 "Content-Type: text/plain; charset=UTF-8\n"

@@ -70,7 +70,7 @@ msgstr ""

70 msgid "Exiting because of an unresolved conflict."

71 msgstr "Avslutar på grund av olöst konflikgt."

72

73 -#: advice.c:114 builtin/merge.c:1206

73 +#: advice.c:114 builtin/merge.c:1185

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

75 msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."

76

@@ -342,7 +342,7 @@ msgstr "patch misslyckades: %s:%ld"

342 msgid "cannot checkout %s"

343 msgstr "kan inte checka ut %s"

344

345 -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248

345 +#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253

346 #, c-format

347 msgid "failed to read %s"

348 msgstr "misslyckades läsa %s"

@@ -467,7 +467,7 @@ msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"

467 msgid "sha1 information is lacking or useless (%s)."

468 msgstr "sha1-informationen saknas eller är oanvändbar (%s)."

469

470 -#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135

470 +#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135

471 #, c-format

472 msgid "make_cache_entry failed for path '%s'"

473 msgstr "make_cache_entry misslyckades för sökvägen \"%s\""

@@ -543,7 +543,7 @@ msgstr[1] "Tillämpade patchen %%s med %d refuserade..."

543 msgid "truncating .rej filename to %.*s.rej"

544 msgstr "trunkerar .rej-filnamnet till %.*s.rej"

545

546 -#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986

546 +#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988

547 #, c-format

548 msgid "cannot open %s"

549 msgstr "kan inte öppna %s"

@@ -571,160 +571,160 @@ msgstr "indata känns inte igen"

571 msgid "unable to read index file"

572 msgstr "kan inte läsa indexfilen"

573

574 -#: apply.c:4824

574 +#: apply.c:4823

575 #, c-format

576 msgid "can't open patch '%s': %s"

577 msgstr "kan inte öppna patchen \"%s\": %s"

578

579 -#: apply.c:4849

579 +#: apply.c:4850

580 #, c-format

581 msgid "squelched %d whitespace error"

582 msgid_plural "squelched %d whitespace errors"

583 msgstr[0] "undertryckte %d fel i blanksteg"

584 msgstr[1] "undertryckte %d fel i blanksteg"

585

586 -#: apply.c:4855 apply.c:4870

586 +#: apply.c:4856 apply.c:4871

587 #, c-format

588 msgid "%d line adds whitespace errors."

589 msgid_plural "%d lines add whitespace errors."

590 msgstr[0] "%d rad lägger till fel i blanksteg."

591 msgstr[1] "%d rader lägger till fel i blanksteg."

592

593 -#: apply.c:4863

593 +#: apply.c:4864

594 #, c-format

595 msgid "%d line applied after fixing whitespace errors."

596 msgid_plural "%d lines applied after fixing whitespace errors."

597 msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."

598 msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."

599

600 -#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

600 +#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

601 msgid "Unable to write new index file"

602 msgstr "Kunde inte skriva ny indexfil"

603

604 -#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280

605 -#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180

606 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591

607 -#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960

608 -#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104

604 +#: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280

605 +#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180

606 +#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629

607 +#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973

608 +#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161

609 #: git-add--interactive.perl:239

610 msgid "path"

611 msgstr "sökväg"

612

613 -#: apply.c:4911

613 +#: apply.c:4912

614 msgid "don't apply changes matching the given path"

615 msgstr "tillämpa inte ändringar som motsvarar given sökväg"

616

617 -#: apply.c:4914

617 +#: apply.c:4915

618 msgid "apply changes matching the given path"

619 msgstr "tillämpa ändringar som motsvarar given sökväg"

620

621 -#: apply.c:4916 builtin/am.c:2286

621 +#: apply.c:4917 builtin/am.c:2286

622 msgid "num"

623 msgstr "antal"

624

625 -#: apply.c:4917

625 +#: apply.c:4918

626 msgid "remove <num> leading slashes from traditional diff paths"

627 msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"

628

629 -#: apply.c:4920

629 +#: apply.c:4921

630 msgid "ignore additions made by the patch"

631 msgstr "ignorera tillägg gjorda av patchen"

632

633 -#: apply.c:4922

633 +#: apply.c:4923

634 msgid "instead of applying the patch, output diffstat for the input"

635 msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"

636

637 -#: apply.c:4926

637 +#: apply.c:4927

638 msgid "show number of added and deleted lines in decimal notation"

639 msgstr "visa antal tillagda och borttagna rader decimalt"

640

641 -#: apply.c:4928

641 +#: apply.c:4929

642 msgid "instead of applying the patch, output a summary for the input"

643 msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"

644

645 -#: apply.c:4930

645 +#: apply.c:4931

646 msgid "instead of applying the patch, see if the patch is applicable"

647 msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"

648

649 -#: apply.c:4932

649 +#: apply.c:4933

650 msgid "make sure the patch is applicable to the current index"

651 msgstr "se till att patchen kan tillämpas på aktuellt index"

652

653 -#: apply.c:4934

653 +#: apply.c:4935

654 msgid "apply a patch without touching the working tree"

655 msgstr "tillämpa en patch utan att röra arbetskatalogen"

656

657 -#: apply.c:4936

657 +#: apply.c:4937

658 msgid "accept a patch that touches outside the working area"

659 msgstr "godta en patch som rör filer utanför arbetskatalogen"

660

661 -#: apply.c:4938

661 +#: apply.c:4939

662 msgid "also apply the patch (use with --stat/--summary/--check)"

663 msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"

664

665 -#: apply.c:4940

665 +#: apply.c:4941

666 msgid "attempt three-way merge if a patch does not apply"

667 msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"

668

669 -#: apply.c:4942

669 +#: apply.c:4943

670 msgid "build a temporary index based on embedded index information"

671 msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"

672

673 -#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507

673 +#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508

674 msgid "paths are separated with NUL character"

675 msgstr "sökvägar avdelas med NUL-tecken"

676

677 -#: apply.c:4947

677 +#: apply.c:4948

678 msgid "ensure at least <n> lines of context match"

679 msgstr "se till att åtminstone <n> rader sammanhang är lika"

680

681 -#: apply.c:4948 builtin/am.c:2265

681 +#: apply.c:4949 builtin/am.c:2265

682 msgid "action"

683 msgstr "åtgärd"

684

685 -#: apply.c:4949

685 +#: apply.c:4950

686 msgid "detect new or modified lines that have whitespace errors"

687 msgstr "detektera nya eller ändrade rader som har fel i blanktecken"

688

689 -#: apply.c:4952 apply.c:4955

689 +#: apply.c:4953 apply.c:4956

690 msgid "ignore changes in whitespace when finding context"

691 msgstr "ignorera ändringar i blanktecken för sammanhang"

692

693 -#: apply.c:4958

693 +#: apply.c:4959

694 msgid "apply the patch in reverse"

695 msgstr "tillämpa patchen baklänges"

696

697 -#: apply.c:4960

697 +#: apply.c:4961

698 msgid "don't expect at least one line of context"

699 msgstr "förvänta inte minst en rad sammanhang"

700

701 -#: apply.c:4962

701 +#: apply.c:4963

702 msgid "leave the rejected hunks in corresponding *.rej files"

703 msgstr "lämna refuserade stycken i motsvarande *.rej-filer"

704

705 -#: apply.c:4964

705 +#: apply.c:4965

706 msgid "allow overlapping hunks"

707 msgstr "tillåt överlappande stycken"

708

709 -#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19

709 +#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19

710 #: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651

711 -#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114

711 +#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134

712 msgid "be verbose"

713 msgstr "var pratsam"

714

715 -#: apply.c:4967

715 +#: apply.c:4968

716 msgid "tolerate incorrectly detected missing new-line at the end of file"

717 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

718

719 -#: apply.c:4970

719 +#: apply.c:4971

720 msgid "do not trust the line counts in the hunk headers"

721 msgstr "lite inte på antalet linjer i styckehuvuden"

722

723 -#: apply.c:4972 builtin/am.c:2274

723 +#: apply.c:4973 builtin/am.c:2274

724 msgid "root"

725 msgstr "rot"

726

727 -#: apply.c:4973

727 +#: apply.c:4974

728 msgid "prepend <root> to all filenames"

729 msgstr "lägg till <rot> i alla filnamn"

730

@@ -747,103 +747,108 @@ msgstr ""

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

748 msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"

749

750 -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300

750 +#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300

751 #, c-format

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

753 msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"

754

755 -#: archive.c:429

755 +#: archive.c:417

756 msgid "fmt"

757 msgstr "fmt"

758

759 -#: archive.c:429

759 +#: archive.c:417

760 msgid "archive format"

761 msgstr "arkivformat"

762

763 -#: archive.c:430 builtin/log.c:1429

763 +#: archive.c:418 builtin/log.c:1436

764 msgid "prefix"

765 msgstr "prefix"

766

767 -#: archive.c:431

767 +#: archive.c:419

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

769 msgstr "lägg till prefix till varje sökväg i arkivet"

770

771 -#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59

772 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054

773 -#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544

774 -#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109

771 +#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59

772 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061

773 +#: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545

774 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129

775 #: parse-options.h:153

776 msgid "file"

777 msgstr "fil"

778

779 -#: archive.c:433 builtin/archive.c:89

779 +#: archive.c:421 builtin/archive.c:89

780 msgid "write the archive to this file"

781 msgstr "skriv arkivet till filen"

782

783 -#: archive.c:435

783 +#: archive.c:423

784 msgid "read .gitattributes in working directory"

785 msgstr "läs .gitattributes i arbetskatalogen"

786

787 -#: archive.c:436

787 +#: archive.c:424

788 msgid "report archived files on stderr"

789 msgstr "rapportera arkiverade filer på standard fel"

790

791 -#: archive.c:437

791 +#: archive.c:425

792 msgid "store only"

793 msgstr "endast spara"

794

795 -#: archive.c:438

795 +#: archive.c:426

796 msgid "compress faster"

797 msgstr "komprimera snabbare"

798

799 -#: archive.c:446

799 +#: archive.c:434

800 msgid "compress better"

801 msgstr "komprimera bättre"

802

803 -#: archive.c:449

803 +#: archive.c:437

804 msgid "list supported archive formats"

805 msgstr "visa understödda arkivformat"

806

807 -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88

808 -#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969

807 +#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106

808 +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982

809 msgid "repo"

810 msgstr "arkiv"

811

812 -#: archive.c:452 builtin/archive.c:91

812 +#: archive.c:440 builtin/archive.c:91

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

814 msgstr "hämta arkivet från fjärrarkivet <arkiv>"

815

816 -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485

816 +#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485

817 msgid "command"

818 msgstr "kommando"

819

820 -#: archive.c:454 builtin/archive.c:93

820 +#: archive.c:442 builtin/archive.c:93

821 msgid "path to the remote git-upload-archive command"

822 msgstr "sökväg till kommandot git-upload-archive på fjärren"

823

824 -#: archive.c:461

824 +#: archive.c:449

825 msgid "Unexpected option --remote"

826 msgstr "Oväntad flagga --remote"

827

828 -#: archive.c:463

828 +#: archive.c:451

829 msgid "Option --exec can only be used together with --remote"

830 msgstr "Flaggan --exec kan endast användas tillsammans med --remote"

831

832 -#: archive.c:465

832 +#: archive.c:453

833 msgid "Unexpected option --output"

834 msgstr "Oväntad flagga --output"

835

836 -#: archive.c:487

836 +#: archive.c:475

837 #, c-format

838 msgid "Unknown archive format '%s'"

839 msgstr "Okänt arkivformat \"%s\""

840

841 -#: archive.c:494

841 +#: archive.c:482

842 #, c-format

843 msgid "Argument not supported for format '%s': -%d"

844 msgstr "Argumentet stöd inte för formatet \"%s\": -%d"

845

846 -#: attr.c:263

846 +#: attr.c:212

847 +#, c-format

848 +msgid "%.*s is not a valid attribute name"

849 +msgstr "%-*s är inte ett giltigt namn på attribut"

850 +

851 +#: attr.c:408

852 msgid ""

853 "Negative patterns are ignored in git attributes\n"

854 "Use '\\!' for literal leading exclamation."

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

856 "Negativa mönster ignoreras i git-attribut\n"

857 "Använd '\\!' för att inleda med ett utropstecken."

858

854 -#: bisect.c:441

859 +#: bisect.c:443

860 #, c-format

861 msgid "Could not open file '%s'"

862 msgstr "Kunde inte öppna filen \"%s\""

863

859 -#: bisect.c:446

864 +#: bisect.c:448

865 #, c-format

866 msgid "Badly quoted content in file '%s': %s"

867 msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"

868

864 -#: bisect.c:655

869 +#: bisect.c:656

870 #, c-format

871 msgid "We cannot bisect more!\n"

872 msgstr "Det finns inte mer att göra \"bisect\" på!\n"

873

869 -#: bisect.c:708

874 +#: bisect.c:709

875 #, c-format

876 msgid "Not a valid commit name %s"

877 msgstr "Namnet på incheckningen är inte giltigt: %s"

878

874 -#: bisect.c:732

879 +#: bisect.c:733

880 #, c-format

881 msgid ""

882 "The merge base %s is bad.\n"

@@ -880,7 +885,7 @@ msgstr ""

885 "Sammanslagningsbasen %s är trasig.\n"

886 "Det betyder att felet har rättats mellan %s och [%s].\n"

887

883 -#: bisect.c:737

888 +#: bisect.c:738

889 #, c-format

890 msgid ""

891 "The merge base %s is new.\n"

@@ -889,7 +894,7 @@ msgstr ""

894 "Sammanslagningsbasen %s är ny.\n"

895 "Egenskapen har ändrats mellan %s och [%s].\n"

896

892 -#: bisect.c:742

897 +#: bisect.c:743

898 #, c-format

899 msgid ""

900 "The merge base %s is %s.\n"

@@ -898,7 +903,7 @@ msgstr ""

903 "Sammanslagningsbasen %s är %s.\n"

904 "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"

905

901 -#: bisect.c:750

906 +#: bisect.c:751

907 #, c-format

908 msgid ""

909 "Some %s revs are not ancestors of the %s rev.\n"

@@ -909,7 +914,7 @@ msgstr ""

914 "git bisect kan inte fungera korrekt i detta fall.\n"

915 "Kanske du skrev fel %s- och %s-revisioner?\n"

916

912 -#: bisect.c:763

917 +#: bisect.c:764

918 #, c-format

919 msgid ""

920 "the merge base between %s and [%s] must be skipped.\n"

@@ -921,36 +926,36 @@ msgstr ""

926 "%s.\n"

927 "Vi fortsätter ändå."

928

924 -#: bisect.c:798

929 +#: bisect.c:799

930 #, c-format

931 msgid "Bisecting: a merge base must be tested\n"

932 msgstr "Bisect: en sammanslagningsbas måste testas\n"

933

929 -#: bisect.c:849

934 +#: bisect.c:850

935 #, c-format

936 msgid "a %s revision is needed"

937 msgstr "en %s-revision behövs"

938

934 -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262

939 +#: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255

940 #, c-format

941 msgid "could not create file '%s'"

942 msgstr "kunde inte skapa filen \"%s\""

943

939 -#: bisect.c:917

944 +#: bisect.c:918

945 #, c-format

946 msgid "could not read file '%s'"

947 msgstr "kunde inte läsa filen \"%s\""

948

944 -#: bisect.c:947

949 +#: bisect.c:948

950 msgid "reading bisect refs failed"

951 msgstr "misslyckades läsa bisect-referenser"

952

948 -#: bisect.c:967

953 +#: bisect.c:968

954 #, c-format

955 msgid "%s was both %s and %s\n"

956 msgstr "%s var både %s och %s\n"

957

953 -#: bisect.c:975

958 +#: bisect.c:976

959 #, c-format

960 msgid ""

961 "No testable commit found.\n"

@@ -959,7 +964,7 @@ msgstr ""

964 "Ingen testbar incheckning hittades.\n"

965 "Kanske du startade med felaktiga sökvägsparametrar?\n"

966

962 -#: bisect.c:994

967 +#: bisect.c:995

968 #, c-format

969 msgid "(roughly %d step)"

970 msgid_plural "(roughly %d steps)"

@@ -968,7 +973,7 @@ msgstr[1] "(ungefär %d steg)"

973

974 #. TRANSLATORS: the last %s will be replaced with

975 #. "(roughly %d steps)" translation

971 -#: bisect.c:998

976 +#: bisect.c:999

977 #, c-format

978 msgid "Bisecting: %d revision left to test after this %s\n"

979 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

@@ -1108,7 +1113,7 @@ msgstr "Avgreningspunkten är inte giltig: \"%s\""

1113 msgid "'%s' is already checked out at '%s'"

1114 msgstr "\"%s\" är redan utcheckad på \"%s\""

1115

1111 -#: branch.c:363

1116 +#: branch.c:364

1117 #, c-format

1118 msgid "HEAD of working tree %s is not updated"

1119 msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"

@@ -1123,7 +1128,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"

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

1129 msgstr "okänt huvud: %s%s (%d)"

1130

1126 -#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777

1131 +#: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777

1132 #, c-format

1133 msgid "could not open '%s'"

1134 msgstr "kunde inte öppna \"%s\""

@@ -1132,10 +1137,10 @@ msgstr "kunde inte öppna \"%s\""

1137 msgid "Repository lacks these prerequisite commits:"

1138 msgstr "Arkivet saknar dessa nödvändiga incheckningar:"

1139

1135 -#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290

1136 -#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348

1137 -#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909

1138 -#: builtin/merge.c:360 builtin/shortlog.c:177

1140 +#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299

1141 +#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353

1142 +#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916

1143 +#: builtin/merge.c:359 builtin/shortlog.c:176

1144 msgid "revision walk setup failed"

1145 msgstr "misslyckades skapa revisionstraversering"

1146

@@ -1174,7 +1179,7 @@ msgstr "rev-list dog"

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

1180 msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"

1181

1177 -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282

1182 +#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281

1183 #, c-format

1184 msgid "unrecognized argument: %s"

1185 msgstr "okänt argument: %s"

@@ -1197,7 +1202,7 @@ msgstr "index-pack dog"

1202 msgid "invalid color value: %.*s"

1203 msgstr "felaktigt färgvärde: %.*s"

1204

1200 -#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457

1205 +#: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457

1206 #: builtin/am.c:1493 builtin/am.c:2127

1207 #, c-format

1208 msgid "could not parse %s"

@@ -1208,7 +1213,7 @@ msgstr "kunde inte tolka %s"

1213 msgid "%s %s is not a commit!"

1214 msgstr "%s %s är inte en incheckning!"

1215

1211 -#: commit.c:1514

1216 +#: commit.c:1511

1217 msgid ""

1218 "Warning: commit message did not conform to UTF-8.\n"

1219 "You may want to amend it after fixing the message, or set the config\n"

@@ -1222,140 +1227,160 @@ msgstr ""

1227 msgid "memory exhausted"

1228 msgstr "minnet slut"

1229

1225 -#: config.c:518

1230 +#: config.c:191

1231 +msgid "relative config include conditionals must come from files"

1232 +msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"

1233 +

1234 +#: config.c:701

1235 #, c-format

1236 msgid "bad config line %d in blob %s"

1237 msgstr "felaktig konfigurationsfil rad %d i blob:en %s"

1238

1230 -#: config.c:522

1239 +#: config.c:705

1240 #, c-format

1241 msgid "bad config line %d in file %s"

1242 msgstr "felaktig konfigurationsfil rad %d i filen %s"

1243

1235 -#: config.c:526

1244 +#: config.c:709

1245 #, c-format

1246 msgid "bad config line %d in standard input"

1247 msgstr "felaktig konfigurationsfil rad %d i standard in"

1248

1240 -#: config.c:530

1249 +#: config.c:713

1250 #, c-format

1251 msgid "bad config line %d in submodule-blob %s"

1252 msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"

1253

1245 -#: config.c:534

1254 +#: config.c:717

1255 #, c-format

1256 msgid "bad config line %d in command line %s"

1257 msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"

1258

1250 -#: config.c:538

1259 +#: config.c:721

1260 #, c-format

1261 msgid "bad config line %d in %s"

1262 msgstr "felaktig konfigurationsfil rad %d i %s"

1263

1255 -#: config.c:657

1264 +#: config.c:840

1265 msgid "out of range"

1266 msgstr "utanför intervallet"

1267

1259 -#: config.c:657

1268 +#: config.c:840

1269 msgid "invalid unit"

1270 msgstr "ogiltig enhet"

1271

1263 -#: config.c:663

1272 +#: config.c:846

1273 #, c-format

1274 msgid "bad numeric config value '%s' for '%s': %s"

1275 msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"

1276

1268 -#: config.c:668

1277 +#: config.c:851

1278 #, c-format

1279 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

1280 msgstr ""

1281 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"

1282

1274 -#: config.c:671

1283 +#: config.c:854

1284 #, c-format

1285 msgid "bad numeric config value '%s' for '%s' in file %s: %s"

1286 msgstr ""

1287 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"

1288

1280 -#: config.c:674

1289 +#: config.c:857

1290 #, c-format

1291 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

1292 msgstr ""

1293 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"

1294

1286 -#: config.c:677

1295 +#: config.c:860

1296 #, c-format

1297 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

1298 msgstr ""

1299 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"

1300 "en %s: %s"

1301

1293 -#: config.c:680

1302 +#: config.c:863

1303 #, c-format

1304 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

1305 msgstr ""

1306 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "

1307 "%s: %s"

1308

1300 -#: config.c:683

1309 +#: config.c:866

1310 #, c-format

1311 msgid "bad numeric config value '%s' for '%s' in %s: %s"

1312 msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"

1313

1305 -#: config.c:770

1314 +#: config.c:953

1315 #, c-format

1316 msgid "failed to expand user dir in: '%s'"

1317 msgstr "misslyckades expandera användarkatalog i: \"%s\""

1318

1310 -#: config.c:865 config.c:876

1319 +#: config.c:1048 config.c:1059

1320 #, c-format

1321 msgid "bad zlib compression level %d"

1322 msgstr "felaktigt zlib-komprimeringsgrad %d"

1323

1315 -#: config.c:993

1324 +#: config.c:1176

1325 #, c-format

1326 msgid "invalid mode for object creation: %s"

1327 msgstr "felaktigt läge för skapande av objekt: %s"

1328

1320 -#: config.c:1149

1329 +#: config.c:1332

1330 #, c-format

1331 msgid "bad pack compression level %d"

1332 msgstr "felaktig paketkomprimeringsgrad %d"

1333

1325 -#: config.c:1339

1334 +#: config.c:1522

1335 msgid "unable to parse command-line config"

1336 msgstr "kan inte tolka kommandoradskonfiguration"

1337

1329 -#: config.c:1389

1338 +#: config.c:1572

1339 msgid "unknown error occurred while reading the configuration files"

1340 msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"

1341

1333 -#: config.c:1743

1342 +#: config.c:1931

1343 +#, c-format

1344 +msgid "Invalid %s: '%s'"

1345 +msgstr "Felaktigt %s: \"%s\""

1346 +

1347 +#: config.c:1952

1348 +#, c-format

1349 +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"

1350 +msgstr ""

1351 +"okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\""

1352 +

1353 +#: config.c:1978

1354 +#, c-format

1355 +msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

1356 +msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"

1357 +

1358 +#: config.c:1989

1359 #, c-format

1360 msgid "unable to parse '%s' from command-line config"

1361 msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"

1362

1338 -#: config.c:1745

1363 +#: config.c:1991

1364 #, c-format

1365 msgid "bad config variable '%s' in file '%s' at line %d"

1366 msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"

1367

1343 -#: config.c:1804

1368 +#: config.c:2050

1369 #, c-format

1370 msgid "%s has multiple values"

1371 msgstr "%s har flera värden"

1372

1348 -#: config.c:2225 config.c:2450

1373 +#: config.c:2384 config.c:2609

1374 #, c-format

1375 msgid "fstat on %s failed"

1376 msgstr "fstat misslyckades på %s"

1377

1353 -#: config.c:2343

1378 +#: config.c:2502

1379 #, c-format

1380 msgid "could not set '%s' to '%s'"

1381 msgstr "kunde inte ställa in \"%s\" till \"%s\""

1382

1358 -#: config.c:2345

1383 +#: config.c:2504 builtin/remote.c:774

1384 #, c-format

1385 msgid "could not unset '%s'"

1386 msgstr "kunde inte ta bort inställning för \"%s\""

@@ -1528,20 +1553,20 @@ msgstr ""

1553 "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"

1554 "%s"

1555

1531 -#: diff.c:3085

1556 +#: diff.c:3102

1557 #, c-format

1558 msgid "external diff died, stopping at %s"

1559 msgstr "extern diff dog, stannar vid %s"

1560

1536 -#: diff.c:3411

1561 +#: diff.c:3428

1562 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

1563 msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande"

1564

1540 -#: diff.c:3501

1565 +#: diff.c:3518

1566 msgid "--follow requires exactly one pathspec"

1567 msgstr "--follow kräver exakt en sökvägsangivelse"

1568

1544 -#: diff.c:3664

1569 +#: diff.c:3681

1570 #, c-format

1571 msgid ""

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

@@ -1550,207 +1575,227 @@ msgstr ""

1575 "Misslyckades tolka argument till flaggan --dirstat/-X;\n"

1576 "%s"

1577

1553 -#: diff.c:3678

1578 +#: diff.c:3695

1579 #, c-format

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

1581 msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""

1582

1558 -#: diff.c:4696

1583 +#: diff.c:4719

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

1585 msgstr ""

1586 "onöjaktig namnbytesdetektering utfördes inte på grund av för många filer"

1587

1563 -#: diff.c:4699

1588 +#: diff.c:4722

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

1590 msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer."

1591

1567 -#: diff.c:4702

1592 +#: diff.c:4725

1593 #, c-format

1594 msgid ""

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

1596 msgstr ""

1597 "du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt."

1598

1574 -#: dir.c:1862

1599 +#: dir.c:1899

1600 msgid "failed to get kernel name and information"

1601 msgstr "misslyckades hämta kärnans namn och information"

1602

1578 -#: dir.c:1981

1603 +#: dir.c:2018

1604 msgid "Untracked cache is disabled on this system or location."

1605 msgstr "Ospårad cache är inaktiverad på systemet eller platsen."

1606

1582 -#: dir.c:2759

1607 +#: dir.c:2776 dir.c:2781

1608 +#, c-format

1609 +msgid "could not create directories for %s"

1610 +msgstr "kunde inte skapa kataloger för %s"

1611 +

1612 +#: dir.c:2806

1613 #, c-format

1614 msgid "could not migrate git directory from '%s' to '%s'"

1615 msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""

1616

1587 -#: fetch-pack.c:213

1617 +#: entry.c:280

1618 +#, c-format

1619 +msgid "could not stat file '%s'"

1620 +msgstr "kunde inte ta status på filen \"%s\""

1621 +

1622 +#: fetch-pack.c:249

1623 msgid "git fetch-pack: expected shallow list"

1624 msgstr "git fetch-pack: förväntade grund lista"

1625

1591 -#: fetch-pack.c:225

1626 +#: fetch-pack.c:261

1627 msgid "git fetch-pack: expected ACK/NAK, got EOF"

1628 msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF"

1629

1595 -#: fetch-pack.c:243

1630 +#: fetch-pack.c:279

1631 #, c-format

1632 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

1633 msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""

1634

1600 -#: fetch-pack.c:295

1635 +#: fetch-pack.c:331

1636 msgid "--stateless-rpc requires multi_ack_detailed"

1637 msgstr "--stateless-rpc kräver \"multi ack detailed\""

1638

1604 -#: fetch-pack.c:381

1639 +#: fetch-pack.c:417

1640 #, c-format

1641 msgid "invalid shallow line: %s"

1642 msgstr "ogiltig \"shallow\"-rad: %s"

1643

1609 -#: fetch-pack.c:387

1644 +#: fetch-pack.c:423

1645 #, c-format

1646 msgid "invalid unshallow line: %s"

1647 msgstr "ogiltig \"unshallow\"-rad: %s"

1648

1614 -#: fetch-pack.c:389

1649 +#: fetch-pack.c:425

1650 #, c-format

1651 msgid "object not found: %s"

1652 msgstr "objektet hittades inte: %s"

1653

1619 -#: fetch-pack.c:392

1654 +#: fetch-pack.c:428

1655 #, c-format

1656 msgid "error in object: %s"

1657 msgstr "fel i objekt: %s"

1658

1624 -#: fetch-pack.c:394

1659 +#: fetch-pack.c:430

1660 #, c-format

1661 msgid "no shallow found: %s"

1662 msgstr "ingen \"shallow\" hittades: %s"

1663

1629 -#: fetch-pack.c:397

1664 +#: fetch-pack.c:433

1665 #, c-format

1666 msgid "expected shallow/unshallow, got %s"

1667 msgstr "förväntade shallow/unshallow, fick %s"

1668

1634 -#: fetch-pack.c:436

1669 +#: fetch-pack.c:472

1670 #, c-format

1671 msgid "got %s %d %s"

1672 msgstr "fick %s %d %s"

1673

1639 -#: fetch-pack.c:450

1674 +#: fetch-pack.c:486

1675 #, c-format

1676 msgid "invalid commit %s"

1677 msgstr "ogiltig incheckning %s"

1678

1644 -#: fetch-pack.c:483

1679 +#: fetch-pack.c:519

1680 msgid "giving up"

1681 msgstr "ger upp"

1682

1648 -#: fetch-pack.c:493 progress.c:235

1683 +#: fetch-pack.c:529 progress.c:235

1684 msgid "done"

1685 msgstr "klart"

1686

1652 -#: fetch-pack.c:505

1687 +#: fetch-pack.c:541

1688 #, c-format

1689 msgid "got %s (%d) %s"

1690 msgstr "fick %s (%d) %s"

1691

1657 -#: fetch-pack.c:551

1692 +#: fetch-pack.c:587

1693 #, c-format

1694 msgid "Marking %s as complete"

1695 msgstr "Markerar %s som komplett"

1696

1662 -#: fetch-pack.c:697

1697 +#: fetch-pack.c:735

1698 #, c-format

1699 msgid "already have %s (%s)"

1700 msgstr "har redan %s (%s)"

1701

1667 -#: fetch-pack.c:735

1702 +#: fetch-pack.c:773

1703 msgid "fetch-pack: unable to fork off sideband demultiplexer"

1704 msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"

1705

1671 -#: fetch-pack.c:743

1706 +#: fetch-pack.c:781

1707 msgid "protocol error: bad pack header"

1708 msgstr "protokollfel: felaktigt packhuvud"

1709

1675 -#: fetch-pack.c:799

1710 +#: fetch-pack.c:837

1711 #, c-format

1712 msgid "fetch-pack: unable to fork off %s"

1713 msgstr "fetch-patch: kunde inte grena av %s"

1714

1680 -#: fetch-pack.c:815

1715 +#: fetch-pack.c:853

1716 #, c-format

1717 msgid "%s failed"

1718 msgstr "%s misslyckades"

1719

1685 -#: fetch-pack.c:817

1720 +#: fetch-pack.c:855

1721 msgid "error in sideband demultiplexer"

1722 msgstr "fel i sidbands-avmultiplexare"

1723

1689 -#: fetch-pack.c:844

1724 +#: fetch-pack.c:882

1725 msgid "Server does not support shallow clients"

1726 msgstr "Servern stöder inte klienter med grunda arkiv"

1727

1693 -#: fetch-pack.c:848

1728 +#: fetch-pack.c:886

1729 msgid "Server supports multi_ack_detailed"

1730 msgstr "Servern stöder \"multi_ack_detailed\""

1731

1697 -#: fetch-pack.c:851

1732 +#: fetch-pack.c:889

1733 msgid "Server supports no-done"

1734 msgstr "Servern stöder \"no-done\""

1735

1701 -#: fetch-pack.c:857

1736 +#: fetch-pack.c:895

1737 msgid "Server supports multi_ack"

1738 msgstr "Servern stöder \"multi_ack\""

1739

1705 -#: fetch-pack.c:861

1740 +#: fetch-pack.c:899

1741 msgid "Server supports side-band-64k"

1742 msgstr "Servern stöder \"side-band-64k\""

1743

1709 -#: fetch-pack.c:865

1744 +#: fetch-pack.c:903

1745 msgid "Server supports side-band"

1746 msgstr "Servern stöder \"side-band\""

1747

1713 -#: fetch-pack.c:869

1748 +#: fetch-pack.c:907

1749 msgid "Server supports allow-tip-sha1-in-want"

1750 msgstr "Servern stöder \"allow-tip-sha1-in-want\""

1751

1717 -#: fetch-pack.c:873

1752 +#: fetch-pack.c:911

1753 msgid "Server supports allow-reachable-sha1-in-want"

1754 msgstr "Servern stöder \"allow-reachable-sha1-in-want\""

1755

1721 -#: fetch-pack.c:883

1756 +#: fetch-pack.c:921

1757 msgid "Server supports ofs-delta"

1758 msgstr "Servern stöder \"ofs-delta\""

1759

1725 -#: fetch-pack.c:890

1760 +#: fetch-pack.c:928

1761 #, c-format

1762 msgid "Server version is %.*s"

1763 msgstr "Serverversionen är %.*s"

1764

1730 -#: fetch-pack.c:896

1765 +#: fetch-pack.c:934

1766 msgid "Server does not support --shallow-since"

1767 msgstr "Servern stöder inte --shallow-since"

1768

1734 -#: fetch-pack.c:900

1769 +#: fetch-pack.c:938

1770 msgid "Server does not support --shallow-exclude"

1771 msgstr "Servern stöder inte --shallow-exclude"

1772

1738 -#: fetch-pack.c:902

1773 +#: fetch-pack.c:940

1774 msgid "Server does not support --deepen"

1775 msgstr "Servern stöder inte --deepen"

1776

1742 -#: fetch-pack.c:913

1777 +#: fetch-pack.c:951

1778 msgid "no common commits"

1779 msgstr "inga gemensamma incheckningar"

1780

1746 -#: fetch-pack.c:925

1781 +#: fetch-pack.c:963

1782 msgid "git fetch-pack: fetch failed."

1783 msgstr "git fetch-patch: hämtning misslyckades."

1784

1750 -#: fetch-pack.c:1087

1785 +#: fetch-pack.c:1125

1786 msgid "no matching remote head"

1787 msgstr "inget motsvarande fjärrhuvud"

1788

1789 +#: fetch-pack.c:1147

1790 +#, c-format

1791 +msgid "no such remote ref %s"

1792 +msgstr "ingen sådan fjärreferens: %s"

1793 +

1794 +#: fetch-pack.c:1150

1795 +#, c-format

1796 +msgid "Server does not allow request for unadvertised object %s"

1797 +msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"

1798 +

1799 #: gpg-interface.c:185

1800 msgid "gpg failed to sign the data"

1801 msgstr "gpg misslyckades signera data"

@@ -1769,17 +1814,17 @@ msgstr "misslyckades skriva fristående signatur till \"%s\""

1814 msgid "ignore invalid color '%.*s' in log.graphColors"

1815 msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"

1816

1772 -#: grep.c:1794

1817 +#: grep.c:1796

1818 #, c-format

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

1820 msgstr "\"%s\" kunde inte läsa %s"

1821

1777 -#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133

1822 +#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133

1823 #, c-format

1824 msgid "failed to stat '%s'"

1825 msgstr "misslyckades ta status på \"%s\""

1826

1782 -#: grep.c:1822

1827 +#: grep.c:1824

1828 #, c-format

1829 msgid "'%s': short read"

1830 msgstr "\"%s\": kort läsning"

@@ -1848,7 +1893,7 @@ msgstr[1] ""

1893 msgid "%s: %s - %s"

1894 msgstr "%s: %s - %s"

1895

1851 -#: ident.c:334

1896 +#: ident.c:343

1897 msgid ""

1898 "\n"

1899 "*** Please tell me who you are.\n"

@@ -1874,6 +1919,39 @@ msgstr ""

1919 "Kör utan --global för att endast ändra i aktuellt arkiv.\n"

1920 "\n"

1921

1922 +#: ident.c:367

1923 +msgid "no email was given and auto-detection is disabled"

1924 +msgstr "ingen e-post angavs och autodetektering är inaktiverad"

1925 +

1926 +#: ident.c:372

1927 +#, c-format

1928 +msgid "unable to auto-detect email address (got '%s')"

1929 +msgstr "kunde inte autodetektera e-postadress (fick \"%s\")"

1930 +

1931 +#: ident.c:382

1932 +msgid "no name was given and auto-detection is disabled"

1933 +msgstr "inget namn angavs och autodetektering är inaktiverad"

1934 +

1935 +#: ident.c:388

1936 +#, c-format

1937 +msgid "unable to auto-detect name (got '%s')"

1938 +msgstr "kunde inte autodetektera namn (fick \"%s\")"

1939 +

1940 +#: ident.c:396

1941 +#, c-format

1942 +msgid "empty ident name (for <%s>) not allowed"

1943 +msgstr "tomt ident-namn (för <%s>) ej tillåtet"

1944 +

1945 +#: ident.c:402

1946 +#, c-format

1947 +msgid "name consists only of disallowed characters: %s"

1948 +msgstr "namnet består enbart av ej tillåtna tecken: %s"

1949 +

1950 +#: ident.c:417 builtin/commit.c:611

1951 +#, c-format

1952 +msgid "invalid date format: %s"

1953 +msgstr "felaktigt datumformat: %s"

1954 +

1955 #: lockfile.c:152

1956 #, c-format

1957 msgid ""

@@ -1903,8 +1981,8 @@ msgstr "kunde inte skapa \"%s.lock\": %s"

1981 msgid "failed to read the cache"

1982 msgstr "misslyckades läsa cachen"

1983

1906 -#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374

1907 -#: builtin/checkout.c:588 builtin/clone.c:731

1984 +#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393

1985 +#: builtin/checkout.c:607 builtin/clone.c:749

1986 msgid "unable to write new index file"

1987 msgstr "kunde inte skriva ny indexfil"

1988

@@ -1974,7 +2052,7 @@ msgstr "Misslyckades exekvera intern sammanslagning"

2052 msgid "Unable to add %s to database"

2053 msgstr "Kunde inte lägga till %s till databasen"

2054

1977 -#: merge-recursive.c:1088 merge-recursive.c:1102

2055 +#: merge-recursive.c:1092

2056 #, c-format

2057 msgid ""

2058 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -1983,7 +2061,16 @@ msgstr ""

2061 "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "

2062 "i trädet."

2063

1986 -#: merge-recursive.c:1094 merge-recursive.c:1107

2064 +#: merge-recursive.c:1097

2065 +#, c-format

2066 +msgid ""

2067 +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

2068 +"left in tree."

2069 +msgstr ""

2070 +"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "

2071 +"%s lämnad i trädet."

2072 +

2073 +#: merge-recursive.c:1104

2074 #, c-format

2075 msgid ""

2076 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -1992,20 +2079,29 @@ msgstr ""

2079 "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "

2080 "i trädet vid %s."

2081

1995 -#: merge-recursive.c:1150

2082 +#: merge-recursive.c:1109

2083 +#, c-format

2084 +msgid ""

2085 +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

2086 +"left in tree at %s."

2087 +msgstr ""

2088 +"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "

2089 +"%s lämnad i trädet vid %s."

2090 +

2091 +#: merge-recursive.c:1143

2092 msgid "rename"

2093 msgstr "namnbyte"

2094

1999 -#: merge-recursive.c:1150

2095 +#: merge-recursive.c:1143

2096 msgid "renamed"

2097 msgstr "namnbytt"

2098

2003 -#: merge-recursive.c:1207

2099 +#: merge-recursive.c:1200

2100 #, c-format

2101 msgid "%s is a directory in %s adding as %s instead"

2102 msgstr "%s är en katalog i %s lägger till som %s istället"

2103

2008 -#: merge-recursive.c:1232

2104 +#: merge-recursive.c:1225

2105 #, c-format

2106 msgid ""

2107 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -2014,135 +2110,135 @@ msgstr ""

2110 "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "

2111 "namnbyte \"%s\"->\"%s\" i \"%s\"%s"

2112

2017 -#: merge-recursive.c:1237

2113 +#: merge-recursive.c:1230

2114 msgid " (left unresolved)"

2115 msgstr " (lämnad olöst)"

2116

2021 -#: merge-recursive.c:1299

2117 +#: merge-recursive.c:1292

2118 #, c-format

2119 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

2120 msgstr ""

2121 "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"

2122

2027 -#: merge-recursive.c:1332

2123 +#: merge-recursive.c:1325

2124 #, c-format

2125 msgid "Renaming %s to %s and %s to %s instead"

2126 msgstr "Byter namn på %s till %s och %s till %s istället"

2127

2032 -#: merge-recursive.c:1535

2128 +#: merge-recursive.c:1528

2129 #, c-format

2130 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

2131 msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s"

2132

2037 -#: merge-recursive.c:1550

2133 +#: merge-recursive.c:1543

2134 #, c-format

2135 msgid "Adding merged %s"

2136 msgstr "Lägger till sammanslagen %s"

2137

2042 -#: merge-recursive.c:1557 merge-recursive.c:1771

2138 +#: merge-recursive.c:1550 merge-recursive.c:1780

2139 #, c-format

2140 msgid "Adding as %s instead"

2141 msgstr "Lägger till som %s istället"

2142

2047 -#: merge-recursive.c:1614

2143 +#: merge-recursive.c:1607

2144 #, c-format

2145 msgid "cannot read object %s"

2146 msgstr "kan inte läsa objektet %s"

2147

2052 -#: merge-recursive.c:1617

2148 +#: merge-recursive.c:1610

2149 #, c-format

2150 msgid "object %s is not a blob"

2151 msgstr "objektet %s är inte en blob"

2152

2057 -#: merge-recursive.c:1670

2153 +#: merge-recursive.c:1679

2154 msgid "modify"

2155 msgstr "ändra"

2156

2061 -#: merge-recursive.c:1670

2157 +#: merge-recursive.c:1679

2158 msgid "modified"

2159 msgstr "ändrad"

2160

2065 -#: merge-recursive.c:1680

2161 +#: merge-recursive.c:1689

2162 msgid "content"

2163 msgstr "innehåll"

2164

2069 -#: merge-recursive.c:1687

2165 +#: merge-recursive.c:1696

2166 msgid "add/add"

2167 msgstr "tillägg/tillägg"

2168

2073 -#: merge-recursive.c:1723

2169 +#: merge-recursive.c:1732

2170 #, c-format

2171 msgid "Skipped %s (merged same as existing)"

2172 msgstr "Hoppade över %s (sammanslagen samma som befintlig)"

2173

2078 -#: merge-recursive.c:1737

2174 +#: merge-recursive.c:1746

2175 #, c-format

2176 msgid "Auto-merging %s"

2177 msgstr "Slår ihop %s automatiskt"

2178

2083 -#: merge-recursive.c:1741 git-submodule.sh:930

2179 +#: merge-recursive.c:1750 git-submodule.sh:944

2180 msgid "submodule"

2181 msgstr "undermodul"

2182

2087 -#: merge-recursive.c:1742

2183 +#: merge-recursive.c:1751

2184 #, c-format

2185 msgid "CONFLICT (%s): Merge conflict in %s"

2186 msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"

2187

2092 -#: merge-recursive.c:1836

2188 +#: merge-recursive.c:1845

2189 #, c-format

2190 msgid "Removing %s"

2191 msgstr "Tar bort %s"

2192

2097 -#: merge-recursive.c:1862

2193 +#: merge-recursive.c:1871

2194 msgid "file/directory"

2195 msgstr "fil/katalog"

2196

2101 -#: merge-recursive.c:1868

2197 +#: merge-recursive.c:1877

2198 msgid "directory/file"

2199 msgstr "katalog/fil"

2200

2105 -#: merge-recursive.c:1874

2201 +#: merge-recursive.c:1883

2202 #, c-format

2203 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

2204 msgstr ""

2205 "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"

2206

2111 -#: merge-recursive.c:1883

2207 +#: merge-recursive.c:1892

2208 #, c-format

2209 msgid "Adding %s"

2210 msgstr "Lägger till %s"

2211

2116 -#: merge-recursive.c:1920

2212 +#: merge-recursive.c:1929

2213 msgid "Already up-to-date!"

2214 msgstr "Redan à jour!"

2215

2120 -#: merge-recursive.c:1929

2216 +#: merge-recursive.c:1938

2217 #, c-format

2218 msgid "merging of trees %s and %s failed"

2219 msgstr "sammanslagning av träden %s och %s misslyckades"

2220

2125 -#: merge-recursive.c:2012

2221 +#: merge-recursive.c:2021

2222 msgid "Merging:"

2223 msgstr "Slår ihop:"

2224

2129 -#: merge-recursive.c:2025

2225 +#: merge-recursive.c:2034

2226 #, c-format

2227 msgid "found %u common ancestor:"

2228 msgid_plural "found %u common ancestors:"

2229 msgstr[0] "hittade %u gemensam förfader:"

2230 msgstr[1] "hittade %u gemensamma förfäder:"

2231

2136 -#: merge-recursive.c:2064

2232 +#: merge-recursive.c:2073

2233 msgid "merge returned no commit"

2234 msgstr "sammanslagningen returnerade ingen incheckning"

2235

2140 -#: merge-recursive.c:2127

2236 +#: merge-recursive.c:2136

2237 #, c-format

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

2239 msgstr "Kunde inte tolka objektet \"%s\""

2240

2145 -#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792

2241 +#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792

2242 msgid "Unable to write index."

2243 msgstr "Kunde inte skriva indexet."

2244

@@ -2219,17 +2315,34 @@ msgstr "-TAL"

2315 msgid "malformed object name '%s'"

2316 msgstr "felformat objektnamn \"%s\""

2317

2222 -#: path.c:826

2318 +#: path.c:805

2319 #, c-format

2320 msgid "Could not make %s writable by group"

2321 msgstr "Kunde inte göra %s skrivbar för gruppen"

2322

2227 -#: pathspec.c:142

2323 +#: pathspec.c:125

2324 +msgid "Escape character '\\' not allowed as last character in attr value"

2325 +msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde"

2326 +

2327 +#: pathspec.c:143

2328 +msgid "Only one 'attr:' specification is allowed."

2329 +msgstr "Endast en \"attr:\"-angivelse tillåten."

2330 +

2331 +#: pathspec.c:146

2332 +msgid "attr spec must not be empty"

2333 +msgstr "attr-angivelse kan inte vara tom"

2334 +

2335 +#: pathspec.c:189

2336 +#, c-format

2337 +msgid "invalid attribute name %s"

2338 +msgstr "ogiltigt attributnamn %s"

2339 +

2340 +#: pathspec.c:254

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

2342 msgstr ""

2343 "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla"

2344

2232 -#: pathspec.c:149

2345 +#: pathspec.c:261

2346 msgid ""

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

2348 "pathspec settings"

@@ -2237,51 +2350,51 @@ msgstr ""

2350 "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra "

2351 "globala sökvägsinställningar"

2352

2240 -#: pathspec.c:188

2353 +#: pathspec.c:301

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

2355 msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""

2356

2244 -#: pathspec.c:201

2357 +#: pathspec.c:322

2358 #, c-format

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

2360 msgstr "felaktigt sökvägsuttryck \"%.*s\" i \"%s\""

2361

2249 -#: pathspec.c:206

2362 +#: pathspec.c:327

2363 #, c-format

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

2365 msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\""

2366

2254 -#: pathspec.c:238

2367 +#: pathspec.c:365

2368 #, c-format

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

2370 msgstr "Tecknet \"%c\" i sökvägsuttrycket i \"%s\" har inte implementerats"

2371

2259 -#: pathspec.c:293 pathspec.c:315

2372 +#: pathspec.c:421 pathspec.c:443

2373 #, c-format

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

2375 msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""

2376

2264 -#: pathspec.c:350

2377 +#: pathspec.c:483

2378 #, c-format

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

2380 msgstr "%s: \"literal\" och \"glob\" är inkompatibla"

2381

2269 -#: pathspec.c:363

2382 +#: pathspec.c:496

2383 #, c-format

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

2385 msgstr "%s: \"%s\" är utanför arkivet"

2386

2274 -#: pathspec.c:451

2387 +#: pathspec.c:584

2388 #, c-format

2389 msgid "'%s' (mnemonic: '%c')"

2390 msgstr "\"%s\" (minnesstöd: \"%c\")"

2391

2279 -#: pathspec.c:461

2392 +#: pathspec.c:594

2393 #, c-format

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

2395 msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s"

2396

2284 -#: pathspec.c:511

2397 +#: pathspec.c:644

2398 msgid ""

2399 "empty strings as pathspecs will be made invalid in upcoming releases. please "

2400 "use . instead if you meant to match all paths"

@@ -2289,19 +2402,11 @@ msgstr ""

2402 "tomma strängar som sökvägsangivelser kommer bli ogiltiga i en kommande "

2403 "utgåva. använd istället . om du vill träffa alla sökvägar"

2404

2292 -#: pathspec.c:535

2405 +#: pathspec.c:668

2406 #, c-format

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

2408 msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"

2409

2297 -#: pathspec.c:544

2298 -msgid ""

2299 -"There is nothing to exclude from by :(exclude) patterns.\n"

2300 -"Perhaps you forgot to add either ':/' or '.' ?"

2301 -msgstr ""

2302 -"Ingenting att exkludera från med :(exkludera)-mönster.\n"

2303 -"Glömde du kanske att antingen lägga till \":/\" eller \".\"?"

2304 -

2410 #: pretty.c:982

2411 msgid "unable to parse --pretty format"

2412 msgstr "kunde inte tolka format för --pretty"

@@ -2324,161 +2429,269 @@ msgstr ""

2429 "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"

2430 "Använder version %i"

2431

2327 -#: refs.c:576 builtin/merge.c:844

2432 +#: read-cache.c:2232

2433 +#, c-format

2434 +msgid "could not stat '%s"

2435 +msgstr "kunde inte ta status på \"%s\""

2436 +

2437 +#: read-cache.c:2232

2438 +#, c-format

2439 +msgid "could not stat '%s'"

2440 +msgstr "kunde inte ta status på \"%s\""

2441 +

2442 +#: read-cache.c:2245

2443 +#, c-format

2444 +msgid "unable to open git dir: %s"

2445 +msgstr "kunde inte öppna git-katalog: %s"

2446 +

2447 +#: read-cache.c:2257

2448 +#, c-format

2449 +msgid "unable to unlink: %s"

2450 +msgstr "misslyckades ta bort länken: %s"

2451 +

2452 +#: refs.c:619 builtin/merge.c:844

2453 #, c-format

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

2455 msgstr "Kunde inte öppna \"%s\" för skrivning"

2456

2332 -#: refs/files-backend.c:2481

2457 +#: refs/files-backend.c:2531

2458 #, c-format

2459 msgid "could not delete reference %s: %s"

2460 msgstr "kunde inte ta bort referensen %s: %s"

2461

2337 -#: refs/files-backend.c:2484

2462 +#: refs/files-backend.c:2534

2463 #, c-format

2464 msgid "could not delete references: %s"

2465 msgstr "kunde inte ta bort referenser: %s"

2466

2342 -#: refs/files-backend.c:2493

2467 +#: refs/files-backend.c:2543

2468 #, c-format

2469 msgid "could not remove reference %s"

2470 msgstr "kunde inte ta bort referensen %s"

2471

2347 -#: ref-filter.c:56

2472 +#: ref-filter.c:35 wt-status.c:1780

2473 +msgid "gone"

2474 +msgstr "försvunnen"

2475 +

2476 +#: ref-filter.c:36

2477 +#, c-format

2478 +msgid "ahead %d"

2479 +msgstr "före %d"

2480 +

2481 +#: ref-filter.c:37

2482 +#, c-format

2483 +msgid "behind %d"

2484 +msgstr "bakom %d"

2485 +

2486 +#: ref-filter.c:38

2487 +#, c-format

2488 +msgid "ahead %d, behind %d"

2489 +msgstr "före %d, bakom %d"

2490 +

2491 +#: ref-filter.c:104

2492 #, c-format

2493 msgid "expected format: %%(color:<color>)"

2494 msgstr "förväntat format: %%(color:<color>)"

2495

2352 -#: ref-filter.c:58

2496 +#: ref-filter.c:106

2497 #, c-format

2498 msgid "unrecognized color: %%(color:%s)"

2499 msgstr "okänd färg: %%(color:%s)"

2500

2357 -#: ref-filter.c:72

2501 +#: ref-filter.c:120

2502 +#, c-format

2503 +msgid "Integer value expected refname:lstrip=%s"

2504 +msgstr "Heltalsvärde förväntades refname:lstrip=%s"

2505 +

2506 +#: ref-filter.c:124

2507 +#, c-format

2508 +msgid "Integer value expected refname:rstrip=%s"

2509 +msgstr "Heltalsvärde förväntades refname:rstrip=%s"

2510 +

2511 +#: ref-filter.c:126

2512 #, c-format

2359 -msgid "unrecognized format: %%(%s)"

2360 -msgstr "okänt format: %%(%s)"

2513 +msgid "unrecognized %%(%s) argument: %s"

2514 +msgstr "okänt %%(%s)-argument: %s"

2515

2362 -#: ref-filter.c:78

2516 +#: ref-filter.c:166

2517 #, c-format

2518 msgid "%%(body) does not take arguments"

2519 msgstr "%%(body) tar inte argument"

2520

2367 -#: ref-filter.c:85

2521 +#: ref-filter.c:173

2522 #, c-format

2523 msgid "%%(subject) does not take arguments"

2524 msgstr "%%(subject) tar inte argument"

2525

2372 -#: ref-filter.c:92

2526 +#: ref-filter.c:180

2527 #, c-format

2528 msgid "%%(trailers) does not take arguments"

2529 msgstr "%%(trailers) tar inte argument"

2530

2377 -#: ref-filter.c:111

2531 +#: ref-filter.c:199

2532 #, c-format

2533 msgid "positive value expected contents:lines=%s"

2534 msgstr "positivt värde förväntat contents:lines=%s"

2535

2382 -#: ref-filter.c:113

2536 +#: ref-filter.c:201

2537 #, c-format

2538 msgid "unrecognized %%(contents) argument: %s"

2539 msgstr "okänt %%(contents)-argument: %s"

2540

2387 -#: ref-filter.c:123

2541 +#: ref-filter.c:214

2542 +#, c-format

2543 +msgid "positive value expected objectname:short=%s"

2544 +msgstr "positivt värde förväntat objectname:short=%s"

2545 +

2546 +#: ref-filter.c:218

2547 #, c-format

2548 msgid "unrecognized %%(objectname) argument: %s"

2549 msgstr "okänt %%(objectname)-argument: %s"

2550

2392 -#: ref-filter.c:145

2551 +#: ref-filter.c:245

2552 #, c-format

2553 msgid "expected format: %%(align:<width>,<position>)"

2554 msgstr "förväntat format: %%(align:<bredd>,<position>)"

2555

2397 -#: ref-filter.c:157

2556 +#: ref-filter.c:257

2557 #, c-format

2558 msgid "unrecognized position:%s"

2559 msgstr "okänd position:%s"

2560

2402 -#: ref-filter.c:161

2561 +#: ref-filter.c:261

2562 #, c-format

2563 msgid "unrecognized width:%s"

2564 msgstr "okänd bredd:%s"

2565

2407 -#: ref-filter.c:167

2566 +#: ref-filter.c:267

2567 #, c-format

2568 msgid "unrecognized %%(align) argument: %s"

2569 msgstr "okänt %%(align)-argument: %s"

2570

2412 -#: ref-filter.c:171

2571 +#: ref-filter.c:271

2572 #, c-format

2573 msgid "positive width expected with the %%(align) atom"

2574 msgstr "positiv bredd förväntad med atomen %%(align)"

2575

2417 -#: ref-filter.c:255

2576 +#: ref-filter.c:286

2577 +#, c-format

2578 +msgid "unrecognized %%(if) argument: %s"

2579 +msgstr "okänt %%(if)-argument: %s"

2580 +

2581 +#: ref-filter.c:371

2582 #, c-format

2583 msgid "malformed field name: %.*s"

2584 msgstr "felformat fältnamn: %.*s"

2585

2422 -#: ref-filter.c:281

2586 +#: ref-filter.c:397

2587 #, c-format

2588 msgid "unknown field name: %.*s"

2589 msgstr "okänt fältnamn: %.*s"

2590

2427 -#: ref-filter.c:383

2591 +#: ref-filter.c:501

2592 +#, c-format

2593 +msgid "format: %%(if) atom used without a %%(then) atom"

2594 +msgstr "format: atomen %%(if) använd utan en %%(then)-atom"

2595 +

2596 +#: ref-filter.c:561

2597 +#, c-format

2598 +msgid "format: %%(then) atom used without an %%(if) atom"

2599 +msgstr "format: atomen %%(then) använd utan en %%(if)-atom"

2600 +

2601 +#: ref-filter.c:563

2602 +#, c-format

2603 +msgid "format: %%(then) atom used more than once"

2604 +msgstr "format: atomen %%(then) använd mer än en gång"

2605 +

2606 +#: ref-filter.c:565

2607 +#, c-format

2608 +msgid "format: %%(then) atom used after %%(else)"

2609 +msgstr "format: atomen %%(then) använd efter %%(else)"

2610 +

2611 +#: ref-filter.c:591

2612 +#, c-format

2613 +msgid "format: %%(else) atom used without an %%(if) atom"

2614 +msgstr "format: atomen %%(else) använd utan en %%(if)-atom"

2615 +

2616 +#: ref-filter.c:593

2617 +#, c-format

2618 +msgid "format: %%(else) atom used without a %%(then) atom"

2619 +msgstr "format: atomen %%(else) använd utan en %%(then)-atom"

2620 +

2621 +#: ref-filter.c:595

2622 +#, c-format

2623 +msgid "format: %%(else) atom used more than once"

2624 +msgstr "format: atomen %%(else) använd mer än en gång"

2625 +

2626 +#: ref-filter.c:608

2627 #, c-format

2628 msgid "format: %%(end) atom used without corresponding atom"

2629 msgstr "format: atomen %%(end) använd utan motsvarande atom"

2630

2432 -#: ref-filter.c:435

2631 +#: ref-filter.c:663

2632 #, c-format

2633 msgid "malformed format string %s"

2634 msgstr "felformad formatsträng %s"

2635

2437 -#: ref-filter.c:898

2438 -msgid ":strip= requires a positive integer argument"

2439 -msgstr ":strip= kräver ett positivt heltalsargument"

2636 +#: ref-filter.c:1247

2637 +#, c-format

2638 +msgid "(no branch, rebasing %s)"

2639 +msgstr "(ingen gren, ombaserar %s)"

2640

2441 -#: ref-filter.c:903

2641 +#: ref-filter.c:1250

2642 #, c-format

2443 -msgid "ref '%s' does not have %ld components to :strip"

2444 -msgstr "referensen \"%s\" har inte %ld komponenter för :strip"

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

2644 +msgstr "(ingen gren, \"bisect\" startad på %s)"

2645

2446 -#: ref-filter.c:1066

2646 +#. TRANSLATORS: make sure this matches

2647 +#. "HEAD detached at " in wt-status.c

2648 +#: ref-filter.c:1256

2649 #, c-format

2448 -msgid "unknown %.*s format %s"

2449 -msgstr "okänt \"%.*s\"-format %s"

2650 +msgid "(HEAD detached at %s)"

2651 +msgstr "(HEAD frånkopplat vid %s)"

2652

2451 -#: ref-filter.c:1086 ref-filter.c:1117

2653 +#. TRANSLATORS: make sure this matches

2654 +#. "HEAD detached from " in wt-status.c

2655 +#: ref-filter.c:1261

2656 +#, c-format

2657 +msgid "(HEAD detached from %s)"

2658 +msgstr "(HEAD frånkopplat från %s)"

2659 +

2660 +#: ref-filter.c:1265

2661 +msgid "(no branch)"

2662 +msgstr "(ingen gren)"

2663 +

2664 +#: ref-filter.c:1420 ref-filter.c:1451

2665 #, c-format

2666 msgid "missing object %s for %s"

2667 msgstr "objektet %s saknas för %s"

2668

2456 -#: ref-filter.c:1089 ref-filter.c:1120

2669 +#: ref-filter.c:1423 ref-filter.c:1454

2670 #, c-format

2671 msgid "parse_object_buffer failed on %s for %s"

2672 msgstr "parse_object_buffer misslyckades på %s för %s"

2673

2461 -#: ref-filter.c:1343

2674 +#: ref-filter.c:1692

2675 #, c-format

2676 msgid "malformed object at '%s'"

2677 msgstr "felformat objekt vid \"%s\""

2678

2466 -#: ref-filter.c:1410

2679 +#: ref-filter.c:1759

2680 #, c-format

2681 msgid "ignoring ref with broken name %s"

2682 msgstr "ignorerar referens med trasigt namn %s"

2683

2471 -#: ref-filter.c:1415

2684 +#: ref-filter.c:1764

2685 #, c-format

2686 msgid "ignoring broken ref %s"

2687 msgstr "ignorerar trasig referens %s"

2688

2476 -#: ref-filter.c:1670

2689 +#: ref-filter.c:2028

2690 #, c-format

2691 msgid "format: %%(end) atom missing"

2692 msgstr "format: atomen %%(end) saknas"

2693

2481 -#: ref-filter.c:1734

2694 +#: ref-filter.c:2109

2695 #, c-format

2696 msgid "malformed object name %s"

2697 msgstr "felformat objektnamn %s"

@@ -2624,15 +2837,25 @@ msgstr "misslyckades öppna /dev/null"

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

2838 msgstr "dup2(%d,%d) misslyckades"

2839

2627 -#: send-pack.c:297

2840 +#: send-pack.c:150

2841 +#, c-format

2842 +msgid "unable to parse remote unpack status: %s"

2843 +msgstr "kunde inte tolka fjärruppackningsstatus: %s"

2844 +

2845 +#: send-pack.c:152

2846 +#, c-format

2847 +msgid "remote unpack failed: %s"

2848 +msgstr "fjärruppackning misslyckades: %s"

2849 +

2850 +#: send-pack.c:315

2851 msgid "failed to sign the push certificate"

2852 msgstr "misslyckades underteckna push-certifikatet"

2853

2631 -#: send-pack.c:410

2854 +#: send-pack.c:428

2855 msgid "the receiving end does not support --signed push"

2856 msgstr "mottagarsidan stöder inte push med --signed"

2857

2635 -#: send-pack.c:412

2858 +#: send-pack.c:430

2859 msgid ""

2860 "not sending a push certificate since the receiving end does not support --"

2861 "signed push"

@@ -2640,11 +2863,11 @@ msgstr ""

2863 "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"

2864 "signed"

2865

2643 -#: send-pack.c:424

2866 +#: send-pack.c:442

2867 msgid "the receiving end does not support --atomic push"

2868 msgstr "mottagarsidan stöder inte push med --atomic"

2869

2647 -#: send-pack.c:429

2870 +#: send-pack.c:447

2871 msgid "the receiving end does not support push options"

2872 msgstr "mottagarsidan stöder inte push-flaggor"

2873

@@ -2683,12 +2906,12 @@ msgstr ""

2906 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"

2907 "och checka in resultatet med \"git commit\""

2908

2686 -#: sequencer.c:294 sequencer.c:1667

2909 +#: sequencer.c:294 sequencer.c:1675

2910 #, c-format

2911 msgid "could not lock '%s'"

2912 msgstr "kunde inte låsa \"%s\""

2913

2691 -#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686

2914 +#: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694

2915 #, c-format

2916 msgid "could not write to '%s'"

2917 msgstr "kunde inte skriva till \"%s\""

@@ -2698,13 +2921,13 @@ msgstr "kunde inte skriva till \"%s\""

2921 msgid "could not write eol to '%s'"

2922 msgstr "kunde inte skriva radslut till \"%s\""

2923

2701 -#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674

2924 +#: sequencer.c:305 sequencer.c:1558 sequencer.c:1682

2925 #, c-format

2926 msgid "failed to finalize '%s'."

2927 msgstr "misslyckades färdigställa \"%s\"."

2928

2706 -#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259

2707 -#: builtin/commit.c:749 builtin/merge.c:1036

2929 +#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259

2930 +#: builtin/commit.c:749 builtin/merge.c:1018

2931 #, c-format

2932 msgid "could not read '%s'"

2933 msgstr "kunde inte läsa \"%s\""

@@ -2768,17 +2991,17 @@ msgstr ""

2991 "\n"

2992 " git rebase --continue\n"

2993

2771 -#: sequencer.c:688

2994 +#: sequencer.c:694

2995 #, c-format

2996 msgid "could not parse commit %s\n"

2997 msgstr "kunde inte tolka incheckningen %s\n"

2998

2776 -#: sequencer.c:693

2999 +#: sequencer.c:699

3000 #, c-format

3001 msgid "could not parse parent commit %s\n"

3002 msgstr "kunde inte tolka föräldraincheckningen %s\n"

3003

2781 -#: sequencer.c:815

3004 +#: sequencer.c:821

3005 #, c-format

3006 msgid ""

3007 "unexpected 1st line of squash message:\n"

@@ -2789,7 +3012,7 @@ msgstr ""

3012 "\n"

3013 "\t%.*s"

3014

2792 -#: sequencer.c:821

3015 +#: sequencer.c:827

3016 #, c-format

3017 msgid ""

3018 "invalid 1st line of squash message:\n"

@@ -2800,231 +3023,231 @@ msgstr ""

3023 "\n"

3024 "\t%.*s"

3025

2803 -#: sequencer.c:827 sequencer.c:852

3026 +#: sequencer.c:833 sequencer.c:858

3027 #, c-format

3028 msgid "This is a combination of %d commits."

3029 msgstr "Det här är en kombination av %d incheckningar."

3030

2808 -#: sequencer.c:836

3031 +#: sequencer.c:842

3032 msgid "need a HEAD to fixup"

3033 msgstr "behöver en HEAD-incheckning att rätta"

3034

2812 -#: sequencer.c:838

3035 +#: sequencer.c:844

3036 msgid "could not read HEAD"

3037 msgstr "kunde inte läsa HEAD"

3038

2816 -#: sequencer.c:840

3039 +#: sequencer.c:846

3040 msgid "could not read HEAD's commit message"

3041 msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"

3042

2820 -#: sequencer.c:846

3043 +#: sequencer.c:852

3044 #, c-format

3045 msgid "cannot write '%s'"

3046 msgstr "kan inte skriva \"%s\""

3047

2825 -#: sequencer.c:855 git-rebase--interactive.sh:445

3048 +#: sequencer.c:861 git-rebase--interactive.sh:445

3049 msgid "This is the 1st commit message:"

3050 msgstr "Det här är 1:a incheckningsmeddelandet:"

3051

2829 -#: sequencer.c:863

3052 +#: sequencer.c:869

3053 #, c-format

3054 msgid "could not read commit message of %s"

3055 msgstr "kunde inte läsa incheckningsmeddelande för %s"

3056

2834 -#: sequencer.c:870

3057 +#: sequencer.c:876

3058 #, c-format

3059 msgid "This is the commit message #%d:"

3060 msgstr "Det här är incheckningsmeddelande %d:"

3061

2839 -#: sequencer.c:875

3062 +#: sequencer.c:881

3063 #, c-format

3064 msgid "The commit message #%d will be skipped:"

3065 msgstr "Incheckningsmeddelande %d kommer hoppas över:"

3066

2844 -#: sequencer.c:880

3067 +#: sequencer.c:886

3068 #, c-format

3069 msgid "unknown command: %d"

3070 msgstr "okänt kommando: %d"

3071

2849 -#: sequencer.c:946

3072 +#: sequencer.c:952

3073 msgid "your index file is unmerged."

3074 msgstr "din indexfil har inte slagits ihop."

3075

2853 -#: sequencer.c:964

3076 +#: sequencer.c:970

3077 #, c-format

3078 msgid "commit %s is a merge but no -m option was given."

3079 msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte."

3080

2858 -#: sequencer.c:972

3081 +#: sequencer.c:978

3082 #, c-format

3083 msgid "commit %s does not have parent %d"

3084 msgstr "incheckning %s har inte förälder %d"

3085

2863 -#: sequencer.c:976

3086 +#: sequencer.c:982

3087 #, c-format

3088 msgid "mainline was specified but commit %s is not a merge."

3089 msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning"

3090

2868 -#: sequencer.c:982

3091 +#: sequencer.c:988

3092 #, c-format

3093 msgid "cannot get commit message for %s"

3094 msgstr "kan inte hämta incheckningsmeddelande för %s"

3095

3096 #. TRANSLATORS: The first %s will be a "todo" command like

3097 #. "revert" or "pick", the second %s a SHA1.

2875 -#: sequencer.c:1001

3098 +#: sequencer.c:1009

3099 #, c-format

3100 msgid "%s: cannot parse parent commit %s"

3101 msgstr "%s: kan inte tolka föräldraincheckningen %s"

3102

2880 -#: sequencer.c:1063 sequencer.c:1812

3103 +#: sequencer.c:1071 sequencer.c:1820

3104 #, c-format

3105 msgid "could not rename '%s' to '%s'"

3106 msgstr "kunde inte byta namn på \"%s\" till \"%s\""

3107

2885 -#: sequencer.c:1114

3108 +#: sequencer.c:1122

3109 #, c-format

3110 msgid "could not revert %s... %s"

3111 msgstr "kunde inte ångra %s... %s"

3112

2890 -#: sequencer.c:1115

3113 +#: sequencer.c:1123

3114 #, c-format

3115 msgid "could not apply %s... %s"

3116 msgstr "kunde inte tillämpa %s... %s"

3117

2895 -#: sequencer.c:1157

3118 +#: sequencer.c:1165

3119 msgid "empty commit set passed"

3120 msgstr "den angivna uppsättningen incheckningar är tom"

3121

2899 -#: sequencer.c:1167

3122 +#: sequencer.c:1175

3123 #, c-format

3124 msgid "git %s: failed to read the index"

3125 msgstr "git %s: misslyckades läsa indexet"

3126

2904 -#: sequencer.c:1174

3127 +#: sequencer.c:1182

3128 #, c-format

3129 msgid "git %s: failed to refresh the index"

3130 msgstr "git %s: misslyckades uppdatera indexet"

3131

2909 -#: sequencer.c:1294

3132 +#: sequencer.c:1302

3133 #, c-format

3134 msgid "invalid line %d: %.*s"

3135 msgstr "ogiltig rad %d: %.*s"

3136

2914 -#: sequencer.c:1302

3137 +#: sequencer.c:1310

3138 #, c-format

3139 msgid "cannot '%s' without a previous commit"

3140 msgstr "Kan inte utföra \"%s\" utan en föregående incheckning"

3141

2919 -#: sequencer.c:1334

3142 +#: sequencer.c:1342

3143 #, c-format

3144 msgid "could not read '%s'."

3145 msgstr "kunde inte läsa \"%s\"."

3146

2924 -#: sequencer.c:1341

3147 +#: sequencer.c:1349

3148 msgid "please fix this using 'git rebase --edit-todo'."

3149 msgstr "rätta det med \"git rebase --edit-todo\"."

3150

2928 -#: sequencer.c:1343

3151 +#: sequencer.c:1351

3152 #, c-format

3153 msgid "unusable instruction sheet: '%s'"

3154 msgstr "oanvändbart manus: %s"

3155

2933 -#: sequencer.c:1348

3156 +#: sequencer.c:1356

3157 msgid "no commits parsed."

3158 msgstr "inga incheckningar lästes."

3159

2937 -#: sequencer.c:1359

3160 +#: sequencer.c:1367

3161 msgid "cannot cherry-pick during a revert."

3162 msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."

3163

2941 -#: sequencer.c:1361

3164 +#: sequencer.c:1369

3165 msgid "cannot revert during a cherry-pick."

3166 msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."

3167

2945 -#: sequencer.c:1424

3168 +#: sequencer.c:1432

3169 #, c-format

3170 msgid "invalid key: %s"

3171 msgstr "felaktig nyckel: %s"

3172

2950 -#: sequencer.c:1427

3173 +#: sequencer.c:1435

3174 #, c-format

3175 msgid "invalid value for %s: %s"

3176 msgstr "felaktigt värde för %s: %s"

3177

2955 -#: sequencer.c:1484

3178 +#: sequencer.c:1492

3179 #, c-format

3180 msgid "malformed options sheet: '%s'"

3181 msgstr "trasigt manus: %s"

3182

2960 -#: sequencer.c:1522

3183 +#: sequencer.c:1530

3184 msgid "a cherry-pick or revert is already in progress"

3185 msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"

3186

2964 -#: sequencer.c:1523

3187 +#: sequencer.c:1531

3188 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

3189 msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""

3190

2968 -#: sequencer.c:1526

3191 +#: sequencer.c:1534

3192 #, c-format

3193 msgid "could not create sequencer directory '%s'"

3194 msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""

3195

2973 -#: sequencer.c:1540

3196 +#: sequencer.c:1548

3197 msgid "could not lock HEAD"

3198 msgstr "kunde inte låsa HEAD"

3199

2977 -#: sequencer.c:1596 sequencer.c:2150

3200 +#: sequencer.c:1604 sequencer.c:2159

3201 msgid "no cherry-pick or revert in progress"

3202 msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"

3203

2981 -#: sequencer.c:1598

3204 +#: sequencer.c:1606

3205 msgid "cannot resolve HEAD"

3206 msgstr "kan inte bestämma HEAD"

3207

2985 -#: sequencer.c:1600 sequencer.c:1634

3208 +#: sequencer.c:1608 sequencer.c:1642

3209 msgid "cannot abort from a branch yet to be born"

3210 msgstr "kan inte avbryta från en gren som ännu inte är född"

3211

2989 -#: sequencer.c:1620 builtin/grep.c:904

3212 +#: sequencer.c:1628 builtin/grep.c:910

3213 #, c-format

3214 msgid "cannot open '%s'"

3215 msgstr "kan inte öppna \"%s\""

3216

2994 -#: sequencer.c:1622

3217 +#: sequencer.c:1630

3218 #, c-format

3219 msgid "cannot read '%s': %s"

3220 msgstr "kan inte läsa \"%s\": %s"

3221

2999 -#: sequencer.c:1623

3222 +#: sequencer.c:1631

3223 msgid "unexpected end of file"

3224 msgstr "oväntat filslut"

3225

3003 -#: sequencer.c:1629

3226 +#: sequencer.c:1637

3227 #, c-format

3228 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

3229 msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"

3230

3008 -#: sequencer.c:1640

3231 +#: sequencer.c:1648

3232 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3233 msgstr ""

3234 "Du verkar ha flyttat HEAD.\n"

3235 "Spolar inte tillbaka, kontrollera HEAD!"

3236

3014 -#: sequencer.c:1777 sequencer.c:2049

3237 +#: sequencer.c:1785 sequencer.c:2058

3238 msgid "cannot read HEAD"

3239 msgstr "kan inte läsa HEAD"

3240

3018 -#: sequencer.c:1817 builtin/difftool.c:574

3241 +#: sequencer.c:1825 builtin/difftool.c:616

3242 #, c-format

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

3244 msgstr "kunde inte kopiera in \"%s\" till \"%s\""

3245

3023 -#: sequencer.c:1833

3246 +#: sequencer.c:1841

3247 msgid "could not read index"

3248 msgstr "Kunde inte läsa indexet"

3249

3027 -#: sequencer.c:1838

3250 +#: sequencer.c:1846

3251 #, c-format

3252 msgid ""

3253 "execution failed: %s\n"

@@ -3039,11 +3262,11 @@ msgstr ""

3262 "\tgit rebase --continue\n"

3263 "\n"

3264

3042 -#: sequencer.c:1844

3265 +#: sequencer.c:1852

3266 msgid "and made changes to the index and/or the working tree\n"

3267 msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"

3268

3046 -#: sequencer.c:1850

3269 +#: sequencer.c:1858

3270 #, c-format

3271 msgid ""

3272 "execution succeeded: %s\n"

@@ -3060,17 +3283,17 @@ msgstr ""

3283 "\tgit rebase --continue\n"

3284 "\n"

3285

3063 -#: sequencer.c:1905 git-rebase.sh:168

3286 +#: sequencer.c:1913 git-rebase.sh:168

3287 #, c-format

3288 msgid "Applied autostash."

3289 msgstr "Tillämpade autostash."

3290

3068 -#: sequencer.c:1917

3291 +#: sequencer.c:1925

3292 #, c-format

3293 msgid "cannot store %s"

3294 msgstr "kan inte spara %s"

3295

3073 -#: sequencer.c:1919 git-rebase.sh:172

3296 +#: sequencer.c:1927 git-rebase.sh:172

3297 #, c-format

3298 msgid ""

3299 "Applying autostash resulted in conflicts.\n"

@@ -3081,57 +3304,57 @@ msgstr ""

3304 "Dina ändringar är säkra i stashen.\n"

3305 "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"

3306

3084 -#: sequencer.c:2000

3307 +#: sequencer.c:2009

3308 #, c-format

3086 -msgid "stopped at %s... %.*s"

3087 -msgstr "stoppade på %s... %.*s"

3309 +msgid "Stopped at %s... %.*s\n"

3310 +msgstr "Stoppade på %s... %.*s\n"

3311

3089 -#: sequencer.c:2027

3312 +#: sequencer.c:2036

3313 #, c-format

3314 msgid "unknown command %d"

3315 msgstr "okänt kommando %d"

3316

3094 -#: sequencer.c:2057

3317 +#: sequencer.c:2066

3318 msgid "could not read orig-head"

3319 msgstr "Kunde inte läsa orig-head"

3320

3098 -#: sequencer.c:2061

3321 +#: sequencer.c:2070

3322 msgid "could not read 'onto'"

3323 msgstr "kunde inte läsa \"onto\""

3324

3102 -#: sequencer.c:2068

3325 +#: sequencer.c:2077

3326 #, c-format

3327 msgid "could not update %s"

3328 msgstr "kunde inte uppdatera %s"

3329

3107 -#: sequencer.c:2075

3330 +#: sequencer.c:2084

3331 #, c-format

3332 msgid "could not update HEAD to %s"

3333 msgstr "kunde inte uppdatera HEAD till %s"

3334

3112 -#: sequencer.c:2159

3335 +#: sequencer.c:2168

3336 msgid "cannot rebase: You have unstaged changes."

3337 msgstr "kan inte ombasera: Du har oköade ändringar."

3338

3116 -#: sequencer.c:2164

3339 +#: sequencer.c:2173

3340 msgid "could not remove CHERRY_PICK_HEAD"

3341 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"

3342

3120 -#: sequencer.c:2173

3343 +#: sequencer.c:2182

3344 msgid "cannot amend non-existing commit"

3345 msgstr "kan inte lägga till incheckning som inte finns"

3346

3124 -#: sequencer.c:2175

3347 +#: sequencer.c:2184

3348 #, c-format

3349 msgid "invalid file: '%s'"

3350 msgstr "ogiltig fil: \"%s\""

3351

3129 -#: sequencer.c:2177

3352 +#: sequencer.c:2186

3353 #, c-format

3354 msgid "invalid contents: '%s'"

3355 msgstr "ogiltigt innehåll: \"%s\""

3356

3134 -#: sequencer.c:2180

3357 +#: sequencer.c:2189

3358 msgid ""

3359 "\n"

3360 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3141,25 +3364,25 @@ msgstr ""

3364 "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"

3365 "först och kör sedan \"git rebase --continute\" igen."

3366

3144 -#: sequencer.c:2190

3367 +#: sequencer.c:2199

3368 msgid "could not commit staged changes."

3369 msgstr "kunde inte checka in köade ändringar."

3370

3148 -#: sequencer.c:2270

3371 +#: sequencer.c:2279

3372 #, c-format

3373 msgid "%s: can't cherry-pick a %s"

3374 msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""

3375

3153 -#: sequencer.c:2274

3376 +#: sequencer.c:2283

3377 #, c-format

3378 msgid "%s: bad revision"

3379 msgstr "%s: felaktig revision"

3380

3158 -#: sequencer.c:2307

3381 +#: sequencer.c:2316

3382 msgid "can't revert as initial commit"

3383 msgstr "kan inte ångra som första incheckning"

3384

3162 -#: setup.c:160

3385 +#: setup.c:165

3386 #, c-format

3387 msgid ""

3388 "%s: no such path in the working tree.\n"

@@ -3169,7 +3392,7 @@ msgstr ""

3392 "Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns "

3393 "lokalt."

3394

3172 -#: setup.c:173

3395 +#: setup.c:178

3396 #, c-format

3397 msgid ""

3398 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"

@@ -3181,7 +3404,7 @@ msgstr ""

3404 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"

3405 "\"git <kommando> [<revision>...] -- [<fil>...]\""

3406

3184 -#: setup.c:223

3407 +#: setup.c:228

3408 #, c-format

3409 msgid ""

3410 "ambiguous argument '%s': both revision and filename\n"

@@ -3192,29 +3415,34 @@ msgstr ""

3415 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"

3416 "\"git <kommando> [<revision>...] -- [<fil>...]\""

3417

3195 -#: setup.c:470

3418 +#: setup.c:475

3419 #, c-format

3420 msgid "Expected git repo version <= %d, found %d"

3421 msgstr "Förväntade git-arkivversion <= %d, hittade %d"

3422

3200 -#: setup.c:478

3423 +#: setup.c:483

3424 msgid "unknown repository extensions found:"

3425 msgstr "okända arkivutökningar hittades:"

3426

3204 -#: setup.c:768

3427 +#: setup.c:776

3428 #, c-format

3429 msgid "Not a git repository (or any of the parent directories): %s"

3430 msgstr "Inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"

3431

3209 -#: setup.c:770 setup.c:922 builtin/index-pack.c:1643

3432 +#: setup.c:778 builtin/index-pack.c:1646

3433 msgid "Cannot come back to cwd"

3434 msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"

3435

3213 -#: setup.c:852

3436 +#: setup.c:1010

3437 msgid "Unable to read current working directory"

3438 msgstr "Kan inte läsa aktuell arbetskatalog"

3439

3217 -#: setup.c:927

3440 +#: setup.c:1022 setup.c:1028

3441 +#, c-format

3442 +msgid "Cannot change to '%s'"

3443 +msgstr "Kan inte byta till \"%s\""

3444 +

3445 +#: setup.c:1041

3446 #, c-format

3447 msgid ""

3448 "Not a git repository (or any parent up to mount point %s)\n"

@@ -3224,12 +3452,7 @@ msgstr ""

3452 "monteringspunkten %s)\n"

3453 "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."

3454

3227 -#: setup.c:934

3228 -#, c-format

3229 -msgid "Cannot change to '%s/..'"

3230 -msgstr "kan inte byta till \"%s/..\""

3231 -

3232 -#: setup.c:996

3455 +#: setup.c:1106

3456 #, c-format

3457 msgid ""

3458 "Problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -3238,55 +3461,55 @@ msgstr ""

3461 "Problem med filläges-värdet i core.sharedRepository (0%.3o).\n"

3462 "Ägaren av filerna måste alltid ha läs- och skrivbehörighet."

3463

3241 -#: sha1_file.c:490

3464 +#: sha1_file.c:559

3465 #, c-format

3466 msgid "path '%s' does not exist"

3467 msgstr "sökvägen \"%s\" finns inte"

3468

3246 -#: sha1_file.c:516

3469 +#: sha1_file.c:585

3470 #, c-format

3471 msgid "reference repository '%s' as a linked checkout is not supported yet."

3472 msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."

3473

3251 -#: sha1_file.c:522

3474 +#: sha1_file.c:591

3475 #, c-format

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

3477 msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."

3478

3256 -#: sha1_file.c:528

3479 +#: sha1_file.c:597

3480 #, c-format

3481 msgid "reference repository '%s' is shallow"

3482 msgstr "referensarkivet \"%s\" är grunt"

3483

3261 -#: sha1_file.c:536

3484 +#: sha1_file.c:605

3485 #, c-format

3486 msgid "reference repository '%s' is grafted"

3487 msgstr "referensarkivet \"%s\" är ympat"

3488

3266 -#: sha1_file.c:1176

3489 +#: sha1_file.c:1245

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

3491 msgstr "offset före slutet av packfilen (trasig .idx?)"

3492

3270 -#: sha1_file.c:2637

3493 +#: sha1_file.c:2721

3494 #, c-format

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

3496 msgstr "offset före slutet av packindex för %s (trasigt index?)"

3497

3275 -#: sha1_file.c:2641

3498 +#: sha1_file.c:2725

3499 #, c-format

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

3501 msgstr "offset borton slutet av packindex för %s (trunkerat index?)"

3502

3280 -#: sha1_name.c:407

3503 +#: sha1_name.c:409

3504 #, c-format

3505 msgid "short SHA1 %s is ambiguous"

3506 msgstr "kort SHA1 %s är tvetydig"

3507

3285 -#: sha1_name.c:418

3508 +#: sha1_name.c:420

3509 msgid "The candidates are:"

3510 msgstr "Kandidaterna är:"

3511

3289 -#: sha1_name.c:578

3512 +#: sha1_name.c:580

3513 msgid ""

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

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

@@ -3308,46 +3531,56 @@ msgstr ""

3531 "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"

3532 "genom att köra \"git config advice.objectNameWarning false\""

3533

3311 -#: submodule.c:65 submodule.c:99

3534 +#: submodule.c:67 submodule.c:101

3535 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

3536 msgstr ""

3537 "Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "

3538 "sammanslagningskonflikter först"

3539

3317 -#: submodule.c:69 submodule.c:103

3540 +#: submodule.c:71 submodule.c:105

3541 #, c-format

3542 msgid "Could not find section in .gitmodules where path=%s"

3543 msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s"

3544

3322 -#: submodule.c:77

3545 +#: submodule.c:79

3546 #, c-format

3547 msgid "Could not update .gitmodules entry %s"

3548 msgstr "Kunde inte uppdatera .gitmodules-posten %s"

3549

3327 -#: submodule.c:110

3550 +#: submodule.c:112

3551 #, c-format

3552 msgid "Could not remove .gitmodules entry for %s"

3553 msgstr "Kunde inte ta bort .gitmodules-posten för %s"

3554

3332 -#: submodule.c:121

3555 +#: submodule.c:123

3556 msgid "staging updated .gitmodules failed"

3557 msgstr "misslyckades köa uppdaterad .gitmodules"

3558

3336 -#: submodule.c:159

3559 +#: submodule.c:161

3560 msgid "negative values not allowed for submodule.fetchJobs"

3561 msgstr "negativa värden är inte tillåtna för submodule.fetchJobs"

3562

3340 -#: submodule.c:1184

3563 +#: submodule.c:1194

3564 #, c-format

3342 -msgid "could not start 'git status in submodule '%s'"

3565 +msgid "'%s' not recognized as a git repository"

3566 +msgstr "\"%s\" känns inte igen som ett git-arkiv"

3567 +

3568 +#: submodule.c:1332

3569 +#, c-format

3570 +msgid "could not start 'git status' in submodule '%s'"

3571 msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""

3572

3345 -#: submodule.c:1197

3573 +#: submodule.c:1345

3574 #, c-format

3347 -msgid "could not run 'git status in submodule '%s'"

3575 +msgid "could not run 'git status' in submodule '%s'"

3576 msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""

3577

3350 -#: submodule.c:1398

3578 +#: submodule.c:1421

3579 +#, c-format

3580 +msgid "submodule '%s' has dirty index"

3581 +msgstr "undermodulen \"%s\" har ett smutsigt index"

3582 +

3583 +#: submodule.c:1679

3584 #, c-format

3585 msgid ""

3586 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -3355,18 +3588,18 @@ msgstr ""

3588 "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "

3589 "stöds ej"

3590

3358 -#: submodule.c:1410 submodule.c:1471

3591 +#: submodule.c:1691 submodule.c:1747

3592 #, c-format

3593 msgid "could not lookup name for submodule '%s'"

3594 msgstr "kunde inte slå upp namnet för undermodulen \"%s\""

3595

3363 -#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640

3364 -#: builtin/submodule--helper.c:650

3596 +#: submodule.c:1695 builtin/submodule--helper.c:678

3597 +#: builtin/submodule--helper.c:688

3598 #, c-format

3599 msgid "could not create directory '%s'"

3600 msgstr "kunde inte skapa katalogen \"%s\""

3601

3369 -#: submodule.c:1420

3602 +#: submodule.c:1698

3603 #, c-format

3604 msgid ""

3605 "Migrating git directory of '%s%s' from\n"

@@ -3377,12 +3610,25 @@ msgstr ""

3610 "\"%s\" till\n"

3611 "\"%s\"\n"

3612

3380 -#: submodule.c:1512

3613 +#: submodule.c:1782

3614 #, c-format

3615 msgid "could not recurse into submodule '%s'"

3616 msgstr "kunde inte rekursera in i undermodulen \"%s\""

3617

3385 -#: submodule-config.c:360

3618 +#: submodule.c:1826

3619 +msgid "could not start ls-files in .."

3620 +msgstr "kunde inte starta ls-files i .."

3621 +

3622 +#: submodule.c:1846

3623 +msgid "BUG: returned path string doesn't match cwd?"

3624 +msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"

3625 +

3626 +#: submodule.c:1865

3627 +#, c-format

3628 +msgid "ls-tree returned unexpected return code %d"

3629 +msgstr "ls-tree returnerade en oväntad returkod %d"

3630 +

3631 +#: submodule-config.c:380

3632 #, c-format

3633 msgid "invalid value for %s"

3634 msgstr "ogiltigt värde för %s"

@@ -3451,7 +3697,7 @@ msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"

3697 msgid "transport: invalid depth option '%s'"

3698 msgstr "transport: ogiltig flagga för depth: %s"

3699

3454 -#: transport.c:885

3700 +#: transport.c:889

3701 #, c-format

3702 msgid ""

3703 "The following submodule paths contain changes that can\n"

@@ -3460,7 +3706,7 @@ msgstr ""

3706 "Följande undermodulsökvägar innehåller ändringar som\n"

3707 "inte kan hittas av fjärrarna:\n"

3708

3463 -#: transport.c:889

3709 +#: transport.c:893

3710 #, c-format

3711 msgid ""

3712 "\n"

@@ -3487,11 +3733,11 @@ msgstr ""

3733 "för att sända dem till fjärren.\n"

3734 "\n"

3735

3490 -#: transport.c:897

3736 +#: transport.c:901

3737 msgid "Aborting."

3738 msgstr "Avbryter."

3739

3494 -#: transport-helper.c:1082

3740 +#: transport-helper.c:1080

3741 #, c-format

3742 msgid "Could not read ref %s"

3743 msgstr "Kunde inte läsa referensen %s"

@@ -3512,7 +3758,7 @@ msgstr "tomt filnamn i trädpost"

3758 msgid "too-short tree file"

3759 msgstr "trädfil för kort"

3760

3515 -#: unpack-trees.c:99

3761 +#: unpack-trees.c:104

3762 #, c-format

3763 msgid ""

3764 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3521,7 +3767,7 @@ msgstr ""

3767 "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"

3768 "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."

3769

3524 -#: unpack-trees.c:101

3770 +#: unpack-trees.c:106

3771 #, c-format

3772 msgid ""

3773 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3530,7 +3776,7 @@ msgstr ""

3776 "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"

3777 "%%s"

3778

3533 -#: unpack-trees.c:104

3779 +#: unpack-trees.c:109

3780 #, c-format

3781 msgid ""

3782 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3540,7 +3786,7 @@ msgstr ""

3786 "sammanslagning:\n"

3787 "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."

3788

3543 -#: unpack-trees.c:106

3789 +#: unpack-trees.c:111

3790 #, c-format

3791 msgid ""

3792 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3550,7 +3796,7 @@ msgstr ""

3796 "sammanslagning:\n"

3797 "%%s"

3798

3553 -#: unpack-trees.c:109

3799 +#: unpack-trees.c:114

3800 #, c-format

3801 msgid ""

3802 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3559,7 +3805,7 @@ msgstr ""

3805 "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"

3806 "%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."

3807

3562 -#: unpack-trees.c:111

3808 +#: unpack-trees.c:116

3809 #, c-format

3810 msgid ""

3811 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3568,7 +3814,7 @@ msgstr ""

3814 "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"

3815 "%%s"

3816

3571 -#: unpack-trees.c:116

3817 +#: unpack-trees.c:121

3818 #, c-format

3819 msgid ""

3820 "Updating the following directories would lose untracked files in them:\n"

@@ -3578,7 +3824,7 @@ msgstr ""

3824 "dem:\n"

3825 "%s"

3826

3581 -#: unpack-trees.c:120

3827 +#: unpack-trees.c:125

3828 #, c-format

3829 msgid ""

3830 "The following untracked working tree files would be removed by checkout:\n"

@@ -3587,7 +3833,7 @@ msgstr ""

3833 "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"

3834 "%%sFlytta eller ta bort dem innan du byter gren."

3835

3590 -#: unpack-trees.c:122

3836 +#: unpack-trees.c:127

3837 #, c-format

3838 msgid ""

3839 "The following untracked working tree files would be removed by checkout:\n"

@@ -3596,7 +3842,7 @@ msgstr ""

3842 "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"

3843 "%%s"

3844

3599 -#: unpack-trees.c:125

3845 +#: unpack-trees.c:130

3846 #, c-format

3847 msgid ""

3848 "The following untracked working tree files would be removed by merge:\n"

@@ -3606,7 +3852,7 @@ msgstr ""

3852 "sammanslagningen:\n"

3853 "%%sFlytta eller ta bort dem innan du slår samman."

3854

3609 -#: unpack-trees.c:127

3855 +#: unpack-trees.c:132

3856 #, c-format

3857 msgid ""

3858 "The following untracked working tree files would be removed by merge:\n"

@@ -3616,7 +3862,7 @@ msgstr ""

3862 "sammanslagningen:\n"

3863 "%%s"

3864

3619 -#: unpack-trees.c:130

3865 +#: unpack-trees.c:135

3866 #, c-format

3867 msgid ""

3868 "The following untracked working tree files would be removed by %s:\n"

@@ -3625,7 +3871,7 @@ msgstr ""

3871 "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"

3872 "%%sFlytta eller ta bort dem innan du \"%s\"."

3873

3628 -#: unpack-trees.c:132

3874 +#: unpack-trees.c:137

3875 #, c-format

3876 msgid ""

3877 "The following untracked working tree files would be removed by %s:\n"

@@ -3634,7 +3880,7 @@ msgstr ""

3880 "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"

3881 "%%s"

3882

3637 -#: unpack-trees.c:137

3883 +#: unpack-trees.c:142

3884 #, c-format

3885 msgid ""

3886 "The following untracked working tree files would be overwritten by "

@@ -3645,7 +3891,7 @@ msgstr ""

3891 "utcheckningen:\n"

3892 "%%sFlytta eller ta bort dem innan du byter gren."

3893

3648 -#: unpack-trees.c:139

3894 +#: unpack-trees.c:144

3895 #, c-format

3896 msgid ""

3897 "The following untracked working tree files would be overwritten by "

@@ -3656,7 +3902,7 @@ msgstr ""

3902 "utcheckningen:\n"

3903 "%%s"

3904

3659 -#: unpack-trees.c:142

3905 +#: unpack-trees.c:147

3906 #, c-format

3907 msgid ""

3908 "The following untracked working tree files would be overwritten by merge:\n"

@@ -3666,7 +3912,7 @@ msgstr ""

3912 "sammanslagningen:\n"

3913 "%%sFlytta eller ta bort dem innan du byter gren."

3914

3669 -#: unpack-trees.c:144

3915 +#: unpack-trees.c:149

3916 #, c-format

3917 msgid ""

3918 "The following untracked working tree files would be overwritten by merge:\n"

@@ -3676,7 +3922,7 @@ msgstr ""

3922 "sammanslagningen:\n"

3923 "%%s"

3924

3679 -#: unpack-trees.c:147

3925 +#: unpack-trees.c:152

3926 #, c-format

3927 msgid ""

3928 "The following untracked working tree files would be overwritten by %s:\n"

@@ -3685,7 +3931,7 @@ msgstr ""

3931 "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"

3932 "%%sFlytta eller ta bort dem innan du \"%s\"."

3933

3688 -#: unpack-trees.c:149

3934 +#: unpack-trees.c:154

3935 #, c-format

3936 msgid ""

3937 "The following untracked working tree files would be overwritten by %s:\n"

@@ -3694,12 +3940,12 @@ msgstr ""

3940 "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"

3941 "%%s"

3942

3697 -#: unpack-trees.c:156

3943 +#: unpack-trees.c:161

3944 #, c-format

3945 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

3946 msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."

3947

3702 -#: unpack-trees.c:159

3948 +#: unpack-trees.c:164

3949 #, c-format

3950 msgid ""

3951 "Cannot update sparse checkout: the following entries are not up-to-date:\n"

@@ -3708,7 +3954,7 @@ msgstr ""

3954 "Kan inte uppdatera gles utcheckning: följande poster är inte àjour:\n"

3955 "%s"

3956

3711 -#: unpack-trees.c:161

3957 +#: unpack-trees.c:166

3958 #, c-format

3959 msgid ""

3960 "The following working tree files would be overwritten by sparse checkout "

@@ -3719,7 +3965,7 @@ msgstr ""

3965 "utcheckning:\n"

3966 "%s"

3967

3722 -#: unpack-trees.c:163

3968 +#: unpack-trees.c:168

3969 #, c-format

3970 msgid ""

3971 "The following working tree files would be removed by sparse checkout "

@@ -3730,45 +3976,59 @@ msgstr ""

3976 "utcheckning:\n"

3977 "%s"

3978

3733 -#: unpack-trees.c:240

3979 +#: unpack-trees.c:170

3980 +#, c-format

3981 +msgid ""

3982 +"Cannot update submodule:\n"

3983 +"%s"

3984 +msgstr ""

3985 +"Kan inte uppdatera undermodul:\n"

3986 +"%s"

3987 +

3988 +#: unpack-trees.c:247

3989 #, c-format

3990 msgid "Aborting\n"

3991 msgstr "Avbryter\n"

3992

3738 -#: unpack-trees.c:270

3993 +#: unpack-trees.c:272

3994 +#, c-format

3995 +msgid "submodule update strategy not supported for submodule '%s'"

3996 +msgstr "uppdateringsstrategi för undermodul stöds inte för undermodulen \"%s\""

3997 +

3998 +#: unpack-trees.c:340

3999 msgid "Checking out files"

4000 msgstr "Checkar ut filer"

4001

3742 -#: urlmatch.c:120

4002 +#: urlmatch.c:163

4003 msgid "invalid URL scheme name or missing '://' suffix"

4004 msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix"

4005

3746 -#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356

4006 +#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405

4007 #, c-format

4008 msgid "invalid %XX escape sequence"

4009 msgstr "ogiltig %XX-teckensekvens"

4010

3751 -#: urlmatch.c:172

4011 +#: urlmatch.c:215

4012 msgid "missing host and scheme is not 'file:'"

4013 msgstr "värd saknas och schemat är inte \"file:\""

4014

3755 -#: urlmatch.c:189

4015 +#: urlmatch.c:232

4016 msgid "a 'file:' URL may not have a port number"

4017 msgstr "en \"file:\"-URL kan inte innehålla portnummer"

4018

3759 -#: urlmatch.c:199

4019 +#: urlmatch.c:247

4020 msgid "invalid characters in host name"

4021 msgstr "ogiltiga tecken i värdnamnet"

4022

3763 -#: urlmatch.c:244 urlmatch.c:255

4023 +#: urlmatch.c:292 urlmatch.c:303

4024 msgid "invalid port number"

4025 msgstr "felaktigt portnummer"

4026

3767 -#: urlmatch.c:322

4027 +#: urlmatch.c:371

4028 msgid "invalid '..' path segment"

4029 msgstr "felaktigt \"..\"-sökvägssegment"

4030

3771 -#: worktree.c:282

4031 +#: worktree.c:285

4032 #, c-format

4033 msgid "failed to read '%s'"

4034 msgstr "misslyckades läsa \"%s\""

@@ -3784,27 +4044,27 @@ msgid "could not open '%s' for writing"

4044 msgstr "kunde inte öppna \"%s\" för skrivning"

4045

4046 #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759

3787 -#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033

4047 +#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015

4048 #: builtin/pull.c:341

4049 #, c-format

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

4051 msgstr "kunde inte öppna \"%s\" för läsning"

4052

3793 -#: wrapper.c:605 wrapper.c:626

4053 +#: wrapper.c:581 wrapper.c:602

4054 #, c-format

4055 msgid "unable to access '%s'"

4056 msgstr "kan inte komma åt \"%s\""

4057

3798 -#: wrapper.c:634

4058 +#: wrapper.c:610

4059 msgid "unable to get current working directory"

4060 msgstr "kan inte hämta aktuell arbetskatalog"

4061

3802 -#: wrapper.c:658

4062 +#: wrapper.c:634

4063 #, c-format

4064 msgid "could not write to %s"

4065 msgstr "kunde inte skriva till %s"

4066

3807 -#: wrapper.c:660

4067 +#: wrapper.c:636

4068 #, c-format

4069 msgid "could not close %s"

4070 msgstr "kunde inte stänga %s"

@@ -3834,11 +4094,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)

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

4095 msgstr " (använd \"git rm <fil>...\" för att ange lösning)"

4096

3837 -#: wt-status.c:199 wt-status.c:945

4097 +#: wt-status.c:199 wt-status.c:958

4098 msgid "Changes to be committed:"

4099 msgstr "Ändringar att checka in:"

4100

3841 -#: wt-status.c:217 wt-status.c:954

4101 +#: wt-status.c:217 wt-status.c:967

4102 msgid "Changes not staged for commit:"

4103 msgstr "Ändringar ej i incheckningskön:"

4104

@@ -3942,15 +4202,15 @@ msgstr "ändrat innehåll, "

4202 msgid "untracked content, "

4203 msgstr "ospårat innehåll, "

4204

3945 -#: wt-status.c:818

4205 +#: wt-status.c:831

4206 msgid "Submodules changed but not updated:"

4207 msgstr "Undermoduler ändrade men inte uppdaterade:"

4208

3949 -#: wt-status.c:820

4209 +#: wt-status.c:833

4210 msgid "Submodule changes to be committed:"

4211 msgstr "Undermodulers ändringar att checka in:"

4212

3953 -#: wt-status.c:901

4213 +#: wt-status.c:914

4214 msgid ""

4215 "Do not touch the line above.\n"

4216 "Everything below will be removed."

@@ -3958,107 +4218,107 @@ msgstr ""

4218 "Rör inte raden ovan.\n"

4219 "Allt nedan kommer tas bort."

4220

3961 -#: wt-status.c:1013

4221 +#: wt-status.c:1026

4222 msgid "You have unmerged paths."

4223 msgstr "Du har ej sammanslagna sökvägar."

4224

3965 -#: wt-status.c:1016

4225 +#: wt-status.c:1029

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

4227 msgstr " (rätta konflikter och kör \"git commit\")"

4228

3969 -#: wt-status.c:1018

4229 +#: wt-status.c:1031

4230 msgid " (use \"git merge --abort\" to abort the merge)"

4231 msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"

4232

3973 -#: wt-status.c:1023

4233 +#: wt-status.c:1036

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

4235 msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."

4236

3977 -#: wt-status.c:1026

4237 +#: wt-status.c:1039

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

4239 msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"

4240

3981 -#: wt-status.c:1036

4241 +#: wt-status.c:1049

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

4243 msgstr "Du är i mitten av en körning av \"git am\"."

4244

3985 -#: wt-status.c:1039

4245 +#: wt-status.c:1052

4246 msgid "The current patch is empty."

4247 msgstr "Aktuell patch är tom."

4248

3989 -#: wt-status.c:1043

4249 +#: wt-status.c:1056

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

4251 msgstr " (rätta konflikter och kör sedan \"git am --continue\")"

4252

3993 -#: wt-status.c:1045

4253 +#: wt-status.c:1058

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

4255 msgstr " (använd \"git am --skip\" för att hoppa över patchen)"

4256

3997 -#: wt-status.c:1047

4257 +#: wt-status.c:1060

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

4259 msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"

4260

4001 -#: wt-status.c:1176

4261 +#: wt-status.c:1189

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

4263 msgstr "git-rebase-todo saknas."

4264

4005 -#: wt-status.c:1178

4265 +#: wt-status.c:1191

4266 msgid "No commands done."

4267 msgstr "Inga kommandon utförda."

4268

4009 -#: wt-status.c:1181

4269 +#: wt-status.c:1194

4270 #, c-format

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

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

4273 msgstr[0] "Sista kommandot utfört (%d kommando utfört):"

4274 msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"

4275

4016 -#: wt-status.c:1192

4276 +#: wt-status.c:1205

4277 #, c-format

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

4279 msgstr " (se fler i filen %s)"

4280

4021 -#: wt-status.c:1197

4281 +#: wt-status.c:1210

4282 msgid "No commands remaining."

4283 msgstr "Inga kommandon återstår."

4284

4025 -#: wt-status.c:1200

4285 +#: wt-status.c:1213

4286 #, c-format

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

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

4289 msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"

4290 msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"

4291

4032 -#: wt-status.c:1208

4292 +#: wt-status.c:1221

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

4294 msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"

4295

4036 -#: wt-status.c:1221

4296 +#: wt-status.c:1234

4297 #, c-format

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

4299 msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."

4300

4041 -#: wt-status.c:1226

4301 +#: wt-status.c:1239

4302 msgid "You are currently rebasing."

4303 msgstr "Du håller på med en ombasering."

4304

4045 -#: wt-status.c:1240

4305 +#: wt-status.c:1253

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

4307 msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"

4308

4049 -#: wt-status.c:1242

4309 +#: wt-status.c:1255

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

4311 msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"

4312

4053 -#: wt-status.c:1244

4313 +#: wt-status.c:1257

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

4315 msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"

4316

4057 -#: wt-status.c:1250

4317 +#: wt-status.c:1263

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

4319 msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"

4320

4061 -#: wt-status.c:1254

4321 +#: wt-status.c:1267

4322 #, c-format

4323 msgid ""

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

@@ -4066,122 +4326,122 @@ msgstr ""

4326 "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "

4327 "ovanpå \"%s\"."

4328

4069 -#: wt-status.c:1259

4329 +#: wt-status.c:1272

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

4331 msgstr "Du håller på att dela upp en incheckning i en ombasering."

4332

4073 -#: wt-status.c:1262

4333 +#: wt-status.c:1275

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

4335 msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"

4336

4077 -#: wt-status.c:1266

4337 +#: wt-status.c:1279

4338 #, c-format

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

4340 msgstr ""

4341 "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "

4342 "ovanpå \"%s\"."

4343

4084 -#: wt-status.c:1271

4344 +#: wt-status.c:1284

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

4346 msgstr "Du håller på att redigera en incheckning under en ombasering."

4347

4088 -#: wt-status.c:1274

4348 +#: wt-status.c:1287

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

4350 msgstr ""

4351 " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"

4352

4093 -#: wt-status.c:1276

4353 +#: wt-status.c:1289

4354 msgid ""

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

4356 msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"

4357

4098 -#: wt-status.c:1286

4358 +#: wt-status.c:1299

4359 #, c-format

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

4361 msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."

4362

4103 -#: wt-status.c:1291

4363 +#: wt-status.c:1304

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

4365 msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"

4366

4107 -#: wt-status.c:1294

4367 +#: wt-status.c:1307

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

4369 msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"

4370

4111 -#: wt-status.c:1296

4371 +#: wt-status.c:1309

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

4373 msgstr ""

4374 " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"

4375 "operationen)"

4376

4117 -#: wt-status.c:1305

4377 +#: wt-status.c:1318

4378 #, c-format

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

4380 msgstr "Du håller på med att ångra incheckningen %s."

4381

4122 -#: wt-status.c:1310

4382 +#: wt-status.c:1323

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

4384 msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"

4385

4126 -#: wt-status.c:1313

4386 +#: wt-status.c:1326

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

4388 msgstr " (alla konflikter rättade: kör \"git revert --continue\")"

4389

4130 -#: wt-status.c:1315

4390 +#: wt-status.c:1328

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

4392 msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"

4393

4134 -#: wt-status.c:1326

4394 +#: wt-status.c:1339

4395 #, c-format

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

4397 msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."

4398

4139 -#: wt-status.c:1330

4399 +#: wt-status.c:1343

4400 msgid "You are currently bisecting."

4401 msgstr "Du håller på med en \"bisect\"."

4402

4143 -#: wt-status.c:1333

4403 +#: wt-status.c:1346

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

4405 msgstr ""

4406 " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"

4407

4148 -#: wt-status.c:1530

4408 +#: wt-status.c:1543

4409 msgid "On branch "

4410 msgstr "På grenen "

4411

4152 -#: wt-status.c:1536

4412 +#: wt-status.c:1549

4413 msgid "interactive rebase in progress; onto "

4414 msgstr "interaktiv ombasering pågår; ovanpå"

4415

4156 -#: wt-status.c:1538

4416 +#: wt-status.c:1551

4417 msgid "rebase in progress; onto "

4418 msgstr "ombasering pågår; ovanpå"

4419

4160 -#: wt-status.c:1543

4420 +#: wt-status.c:1556

4421 msgid "HEAD detached at "

4422 msgstr "HEAD frånkopplad vid "

4423

4164 -#: wt-status.c:1545

4424 +#: wt-status.c:1558

4425 msgid "HEAD detached from "

4426 msgstr "HEAD frånkopplad från "

4427

4168 -#: wt-status.c:1548

4428 +#: wt-status.c:1561

4429 msgid "Not currently on any branch."

4430 msgstr "Inte på någon gren för närvarande."

4431

4172 -#: wt-status.c:1566

4432 +#: wt-status.c:1579

4433 msgid "Initial commit"

4434 msgstr "Första incheckning"

4435

4176 -#: wt-status.c:1580

4436 +#: wt-status.c:1593

4437 msgid "Untracked files"

4438 msgstr "Ospårade filer"

4439

4180 -#: wt-status.c:1582

4440 +#: wt-status.c:1595

4441 msgid "Ignored files"

4442 msgstr "Ignorerade filer"

4443

4184 -#: wt-status.c:1586

4444 +#: wt-status.c:1599

4445 #, c-format

4446 msgid ""

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

@@ -4193,32 +4453,32 @@ msgstr ""

4453 "lägga till nya filer själv (se \"git help status\")."

4454

4455 # %s är nästa sträng eller tom.

4196 -#: wt-status.c:1592

4456 +#: wt-status.c:1605

4457 #, c-format

4458 msgid "Untracked files not listed%s"

4459 msgstr "Ospårade filer visas ej%s"

4460

4201 -#: wt-status.c:1594

4461 +#: wt-status.c:1607

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

4463 msgstr " (använd flaggan -u för att visa ospårade filer)"

4464

4205 -#: wt-status.c:1600

4465 +#: wt-status.c:1613

4466 msgid "No changes"

4467 msgstr "Inga ändringar"

4468

4209 -#: wt-status.c:1605

4469 +#: wt-status.c:1618

4470 #, c-format

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

4472 msgstr ""

4473 "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"

4474 "\")\n"

4475

4216 -#: wt-status.c:1608

4476 +#: wt-status.c:1621

4477 #, c-format

4478 msgid "no changes added to commit\n"

4479 msgstr "inga ändringar att checka in\n"

4480

4221 -#: wt-status.c:1611

4481 +#: wt-status.c:1624

4482 #, c-format

4483 msgid ""

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

@@ -4227,67 +4487,63 @@ msgstr ""

4487 "inget köat för incheckning, men ospårade filer finns (spåra med \"git add"

4488 "\")\n"

4489

4230 -#: wt-status.c:1614

4490 +#: wt-status.c:1627

4491 #, c-format

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

4493 msgstr "inget köat för incheckning, men ospårade filer finns\n"

4494

4235 -#: wt-status.c:1617

4495 +#: wt-status.c:1630

4496 #, c-format

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

4498 msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"

4499

4240 -#: wt-status.c:1620 wt-status.c:1625

4500 +#: wt-status.c:1633 wt-status.c:1638

4501 #, c-format

4502 msgid "nothing to commit\n"

4503 msgstr "inget att checka in\n"

4504

4245 -#: wt-status.c:1623

4505 +#: wt-status.c:1636

4506 #, c-format

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

4508 msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"

4509

4250 -#: wt-status.c:1627

4510 +#: wt-status.c:1640

4511 #, c-format

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

4513 msgstr "inget att checka in, arbetskatalogen ren\n"

4514

4255 -#: wt-status.c:1734

4515 +#: wt-status.c:1749

4516 msgid "Initial commit on "

4517 msgstr "Första incheckning på "

4518

4259 -#: wt-status.c:1738

4519 +#: wt-status.c:1753

4520 msgid "HEAD (no branch)"

4521 msgstr "HEAD (ingen gren)"

4522

4263 -#: wt-status.c:1767

4264 -msgid "gone"

4265 -msgstr "försvunnen"

4266 -

4267 -#: wt-status.c:1769 wt-status.c:1777

4523 +#: wt-status.c:1782 wt-status.c:1790

4524 msgid "behind "

4525 msgstr "efter "

4526

4271 -#: wt-status.c:1772 wt-status.c:1775

4527 +#: wt-status.c:1785 wt-status.c:1788

4528 msgid "ahead "

4529 msgstr "före "

4530

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

4276 -#: wt-status.c:2277

4532 +#: wt-status.c:2280

4533 #, c-format

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

4535 msgstr "kan inte %s: Du har oköade ändringar."

4536

4281 -#: wt-status.c:2283

4537 +#: wt-status.c:2286

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

4539 msgstr "dessutom innehåller dit index ändringar som inte har checkats in."

4540

4285 -#: wt-status.c:2285

4541 +#: wt-status.c:2288

4542 #, c-format

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

4544 msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."

4545

4290 -#: compat/precompose_utf8.c:57 builtin/clone.c:414

4546 +#: compat/precompose_utf8.c:57 builtin/clone.c:432

4547 #, c-format

4548 msgid "failed to unlink '%s'"

4549 msgstr "misslyckades ta bort länken \"%s\""

@@ -4314,7 +4570,7 @@ msgstr "ta bort \"%s\"\n"

4570 msgid "Unstaged changes after refreshing the index:"

4571 msgstr "Oköade ändringar efter att ha uppdaterat indexet:"

4572

4317 -#: builtin/add.c:209 builtin/rev-parse.c:845

4573 +#: builtin/add.c:209 builtin/rev-parse.c:872

4574 msgid "Could not read the index"

4575 msgstr "Kunde inte läsa indexet"

4576

@@ -4349,9 +4605,9 @@ msgstr "Kunde inte tillämpa \"%s\""

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

4606 msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"

4607

4352 -#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123

4608 +#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123

4609 #: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524

4354 -#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162

4610 +#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163

4611 msgid "dry run"

4612 msgstr "testkörning"

4613

@@ -4359,7 +4615,7 @@ msgstr "testkörning"

4615 msgid "interactive picking"

4616 msgstr "plocka interaktivt"

4617

4362 -#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286

4618 +#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286

4619 msgid "select hunks interactively"

4620 msgstr "välj stycken interaktivt"

4621

@@ -4399,11 +4655,11 @@ msgstr "hoppa bara över filer som inte kan läggas till på grund av fel"

4655 msgid "check if - even missing - files are ignored in dry run"

4656 msgstr "se om - även saknade - filer ignoreras i testkörning"

4657

4402 -#: builtin/add.c:283 builtin/update-index.c:947

4658 +#: builtin/add.c:283 builtin/update-index.c:951

4659 msgid "(+/-)x"

4660 msgstr "(+/-)x"

4661

4406 -#: builtin/add.c:283 builtin/update-index.c:948

4662 +#: builtin/add.c:283 builtin/update-index.c:952

4663 msgid "override the executable bit of the listed files"

4664 msgstr "överstyr exekveringsbiten för angivna filer"

4665

@@ -4439,8 +4695,8 @@ msgstr "Inget angivet, inget tillagt.\n"

4695 msgid "Maybe you wanted to say 'git add .'?\n"

4696 msgstr "Kanske menade du att skriva \"git add .\"?\n"

4697

4442 -#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279

4443 -#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350

4698 +#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298

4699 +#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350

4700 #: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271

4701 #: builtin/submodule--helper.c:244

4702 msgid "index file corrupt"

@@ -4494,7 +4750,7 @@ msgstr "ogiltig tidszons-offset"

4750 msgid "Patch format detection failed."

4751 msgstr "Misslyckades detektera patchformat."

4752

4497 -#: builtin/am.c:989 builtin/clone.c:379

4753 +#: builtin/am.c:989 builtin/clone.c:397

4754 #, c-format

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

4756 msgstr "misslyckades skapa katalogen \"%s\""

@@ -4527,7 +4783,7 @@ msgstr ""

4783 msgid "Patch is empty. Was it split wrong?"

4784 msgstr "Patchen är tom. Delades den upp felaktigt?"

4785

4530 -#: builtin/am.c:1390 builtin/log.c:1550

4786 +#: builtin/am.c:1390 builtin/log.c:1557

4787 #, c-format

4788 msgid "invalid ident line: %s"

4789 msgstr "ogiltig ident-rad: %s"

@@ -4564,7 +4820,7 @@ msgstr ""

4820 msgid "Failed to merge in the changes."

4821 msgstr "Misslyckades slå ihop ändringarna."

4822

4567 -#: builtin/am.c:1686 builtin/merge.c:632

4823 +#: builtin/am.c:1686 builtin/merge.c:631

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

4825 msgstr "git write-tree misslyckades skriva ett träd"

4826

@@ -4728,15 +4984,15 @@ msgid "pass it through git-apply"

4984 msgstr "sänd det genom git-apply"

4985

4986 #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665

4731 -#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135

4987 +#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135

4988 #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191

4733 -#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355

4989 +#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398

4990 #: parse-options.h:132 parse-options.h:134 parse-options.h:245

4991 msgid "n"

4992 msgstr "n"

4993

4738 -#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438

4739 -#: builtin/tag.c:387 builtin/verify-tag.c:38

4994 +#: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37

4995 +#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38

4996 msgid "format"

4997 msgstr "format"

4998

@@ -4772,8 +5028,8 @@ msgstr "ljug om incheckningsdatum"

5028 msgid "use current timestamp for author date"

5029 msgstr "använd nuvarande tidsstämpel för författardatum"

5030

4775 -#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233

4776 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370

5031 +#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232

5032 +#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413

5033 msgid "key-id"

5034 msgstr "nyckel-id"

5035

@@ -4874,111 +5130,111 @@ msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"

5130 msgid "<rev-opts> are documented in git-rev-list(1)"

5131 msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"

5132

4877 -#: builtin/blame.c:1786

5133 +#: builtin/blame.c:1777

5134 msgid "Blaming lines"

5135 msgstr "Klandra rader"

5136

4881 -#: builtin/blame.c:2582

5137 +#: builtin/blame.c:2573

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

5139 msgstr "Visa klandringsposter när vi hittar dem, interaktivt"

5140

4885 -#: builtin/blame.c:2583

5141 +#: builtin/blame.c:2574

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

5143 msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"

5144

4889 -#: builtin/blame.c:2584

5145 +#: builtin/blame.c:2575

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

5147 msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"

5148

4893 -#: builtin/blame.c:2585

5149 +#: builtin/blame.c:2576

5150 msgid "Show work cost statistics"

5151 msgstr "Visa statistik över arbetskostnad"

5152

4897 -#: builtin/blame.c:2586

5153 +#: builtin/blame.c:2577

5154 msgid "Force progress reporting"

5155 msgstr "Tvinga förloppsrapportering"

5156

4901 -#: builtin/blame.c:2587

5157 +#: builtin/blame.c:2578

5158 msgid "Show output score for blame entries"

5159 msgstr "Visa utdatapoäng för klandringsposter"

5160

4905 -#: builtin/blame.c:2588

5161 +#: builtin/blame.c:2579

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

5163 msgstr "Visa originalfilnamn (Standard: auto)"

5164

4909 -#: builtin/blame.c:2589

5165 +#: builtin/blame.c:2580

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

5167 msgstr "Visa ursprungligt radnummer (Standard: av)"

5168

4913 -#: builtin/blame.c:2590

5169 +#: builtin/blame.c:2581

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

5171 msgstr "Visa i ett format avsett för maskinkonsumtion"

5172

4917 -#: builtin/blame.c:2591

5173 +#: builtin/blame.c:2582

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

5175 msgstr "Visa porslinsformat med per-rad-incheckningsinformation"

5176

4921 -#: builtin/blame.c:2592

5177 +#: builtin/blame.c:2583

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

5179 msgstr "Använd samma utdataläge som git-annotate (Standard: av)"

5180

4925 -#: builtin/blame.c:2593

5181 +#: builtin/blame.c:2584

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

5183 msgstr "Visa rå tidsstämpel (Standard: av)"

5184

4929 -#: builtin/blame.c:2594

5185 +#: builtin/blame.c:2585

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

5187 msgstr "Visa lång inchecknings-SHA1 (Standard: av)"

5188

4933 -#: builtin/blame.c:2595

5189 +#: builtin/blame.c:2586

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

5191 msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"

5192

4937 -#: builtin/blame.c:2596

5193 +#: builtin/blame.c:2587

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

5195 msgstr "Visa författarens e-post istället för namn (Standard: av)"

5196

4941 -#: builtin/blame.c:2597

5197 +#: builtin/blame.c:2588

5198 msgid "Ignore whitespace differences"

5199 msgstr "Ignorera ändringar i blanksteg"

5200

4945 -#: builtin/blame.c:2604

5201 +#: builtin/blame.c:2595

5202 msgid "Use an experimental heuristic to improve diffs"

5203 msgstr "Använd en experimentell algoritm för att förbättra diffar"

5204

4949 -#: builtin/blame.c:2606

5205 +#: builtin/blame.c:2597

5206 msgid "Spend extra cycles to find better match"

5207 msgstr "Slösa extra cykler med att hitta bättre träff"

5208

4953 -#: builtin/blame.c:2607

5209 +#: builtin/blame.c:2598

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

5211 msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"

5212

4957 -#: builtin/blame.c:2608

5213 +#: builtin/blame.c:2599

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

5215 msgstr "Använd <fil>s innehåll som slutgiltig bild"

5216

4961 -#: builtin/blame.c:2609 builtin/blame.c:2610

5217 +#: builtin/blame.c:2600 builtin/blame.c:2601

5218 msgid "score"

5219 msgstr "poäng"

5220

4965 -#: builtin/blame.c:2609

5221 +#: builtin/blame.c:2600

5222 msgid "Find line copies within and across files"

5223 msgstr "Hitta kopierade rader inuti och mellan filer"

5224

4969 -#: builtin/blame.c:2610

5225 +#: builtin/blame.c:2601

5226 msgid "Find line movements within and across files"

5227 msgstr "Hitta flyttade rader inuti och mellan filer"

5228

4973 -#: builtin/blame.c:2611

5229 +#: builtin/blame.c:2602

5230 msgid "n,m"

5231 msgstr "n,m"

5232

4977 -#: builtin/blame.c:2611

5233 +#: builtin/blame.c:2602

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

5235 msgstr "Behandla endast radintervallet n,m, med början på 1"

5236

4981 -#: builtin/blame.c:2658

5237 +#: builtin/blame.c:2649

5238 msgid "--progress can't be used with --incremental or porcelain formats"

5239 msgstr "--progress kan inte användas med --incremental eller porslinsformat"

5240

@@ -4988,42 +5244,42 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat"

5244 #. takes 22 places, is the longest among various forms of

5245 #. relative timestamps, but your language may need more or

5246 #. fewer display columns.

4991 -#: builtin/blame.c:2706

5247 +#: builtin/blame.c:2697

5248 msgid "4 years, 11 months ago"

5249 msgstr "4 år, 11 månader sedan"

5250

4995 -#: builtin/blame.c:2786

5251 +#: builtin/blame.c:2777

5252 msgid "--contents and --reverse do not blend well."

5253 msgstr "--contents och --reverse fungerar inte så bra tillsammans."

5254

4999 -#: builtin/blame.c:2806

5255 +#: builtin/blame.c:2797

5256 msgid "cannot use --contents with final commit object name"

5257 msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"

5258

5003 -#: builtin/blame.c:2811

5259 +#: builtin/blame.c:2802

5260 msgid "--reverse and --first-parent together require specified latest commit"

5261 msgstr ""

5262 "--reverse och --first-parent tillsammans kräver att du anger senaste "

5263 "incheckningen"

5264

5009 -#: builtin/blame.c:2838

5265 +#: builtin/blame.c:2829

5266 msgid ""

5267 "--reverse --first-parent together require range along first-parent chain"

5268 msgstr ""

5269 "--reverse --first-parent tillsammans kräver ett intervall på första-förälder-"

5270 "kedjan"

5271

5016 -#: builtin/blame.c:2849

5272 +#: builtin/blame.c:2840

5273 #, c-format

5274 msgid "no such path %s in %s"

5275 msgstr "sökvägen %s i %s finns inte"

5276

5021 -#: builtin/blame.c:2860

5277 +#: builtin/blame.c:2851

5278 #, c-format

5279 msgid "cannot read blob %s for path %s"

5280 msgstr "kan inte läsa objektet %s för sökvägen %s"

5281

5026 -#: builtin/blame.c:2879

5282 +#: builtin/blame.c:2870

5283 #, c-format

5284 msgid "file %s has only %lu line"

5285 msgid_plural "file %s has only %lu lines"

@@ -5050,7 +5306,11 @@ msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>"

5306 msgid "git branch [<options>] [-r | -a] [--points-at]"

5307 msgstr "git branch [<flaggor>] [-r | -a] [--points-at]"

5308

5053 -#: builtin/branch.c:143

5309 +#: builtin/branch.c:31

5310 +msgid "git branch [<options>] [-r | -a] [--format]"

5311 +msgstr "git branch [<flaggor>] [-r | -a] [--format]"

5312 +

5313 +#: builtin/branch.c:144

5314 #, c-format

5315 msgid ""

5316 "deleting branch '%s' that has been merged to\n"

@@ -5059,7 +5319,7 @@ msgstr ""

5319 "tar bort grenen \"%s\" som har slagits ihop med\n"

5320 " \"%s\", men ännu inte slagits ihop med HEAD."

5321

5062 -#: builtin/branch.c:147

5322 +#: builtin/branch.c:148

5323 #, c-format

5324 msgid ""

5325 "not deleting branch '%s' that is not yet merged to\n"

@@ -5068,12 +5328,12 @@ msgstr ""

5328 "tar inte bort grenen \"%s\" som inte har slagits ihop med\n"

5329 " \"%s\", trots att den har slagits ihop med HEAD."

5330

5071 -#: builtin/branch.c:161

5331 +#: builtin/branch.c:162

5332 #, c-format

5333 msgid "Couldn't look up commit object for '%s'"

5334 msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""

5335

5076 -#: builtin/branch.c:165

5336 +#: builtin/branch.c:166

5337 #, c-format

5338 msgid ""

5339 "The branch '%s' is not fully merged.\n"

@@ -5082,164 +5342,92 @@ msgstr ""

5342 "Grenen \"%s\" har inte slagits samman i sin helhet.\n"

5343 "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."

5344

5085 -#: builtin/branch.c:178

5345 +#: builtin/branch.c:179

5346 msgid "Update of config-file failed"

5347 msgstr "Misslyckades uppdatera konfigurationsfil"

5348

5089 -#: builtin/branch.c:206

5349 +#: builtin/branch.c:210

5350 msgid "cannot use -a with -d"

5351 msgstr "kan inte ange -a med -d"

5352

5093 -#: builtin/branch.c:212

5353 +#: builtin/branch.c:216

5354 msgid "Couldn't look up commit object for HEAD"

5355 msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"

5356

5097 -#: builtin/branch.c:226

5357 +#: builtin/branch.c:230

5358 #, c-format

5359 msgid "Cannot delete branch '%s' checked out at '%s'"

5360 msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\""

5361

5102 -#: builtin/branch.c:241

5362 +#: builtin/branch.c:245

5363 #, c-format

5364 msgid "remote-tracking branch '%s' not found."

5365 msgstr "fjärrspårande grenen \"%s\" hittades inte."

5366

5107 -#: builtin/branch.c:242

5367 +#: builtin/branch.c:246

5368 #, c-format

5369 msgid "branch '%s' not found."

5370 msgstr "grenen \"%s\" hittades inte."

5371

5112 -#: builtin/branch.c:257

5372 +#: builtin/branch.c:261

5373 #, c-format

5374 msgid "Error deleting remote-tracking branch '%s'"

5375 msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""

5376

5117 -#: builtin/branch.c:258

5377 +#: builtin/branch.c:262

5378 #, c-format

5379 msgid "Error deleting branch '%s'"

5380 msgstr "Fel vid borttagning av grenen \"%s\""

5381

5122 -#: builtin/branch.c:265

5382 +#: builtin/branch.c:269

5383 #, c-format

5384 msgid "Deleted remote-tracking branch %s (was %s).\n"

5385 msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"

5386

5127 -#: builtin/branch.c:266

5387 +#: builtin/branch.c:270

5388 #, c-format

5389 msgid "Deleted branch %s (was %s).\n"

5390 msgstr "Tog bort grenen %s (var %s).\n"

5391

5132 -#: builtin/branch.c:312

5133 -#, c-format

5134 -msgid "[%s: gone]"

5135 -msgstr "[%s: försvunnen]"

5136 -

5137 -#: builtin/branch.c:317

5138 -#, c-format

5139 -msgid "[%s]"

5140 -msgstr "[%s]"

5141 -

5142 -#: builtin/branch.c:322

5143 -#, c-format

5144 -msgid "[%s: behind %d]"

5145 -msgstr "[%s: bakom %d] "

5146 -

5147 -#: builtin/branch.c:324

5148 -#, c-format

5149 -msgid "[behind %d]"

5150 -msgstr "[bakom %d] "

5151 -

5152 -#: builtin/branch.c:328

5153 -#, c-format

5154 -msgid "[%s: ahead %d]"

5155 -msgstr "[%s: före %d] "

5156 -

5157 -#: builtin/branch.c:330

5158 -#, c-format

5159 -msgid "[ahead %d]"

5160 -msgstr "[före %d] "

5161 -

5162 -#: builtin/branch.c:333

5163 -#, c-format

5164 -msgid "[%s: ahead %d, behind %d]"

5165 -msgstr "[%s: före %d, bakom %d] "

5166 -

5167 -#: builtin/branch.c:336

5168 -#, c-format

5169 -msgid "[ahead %d, behind %d]"

5170 -msgstr "[före %d, bakom %d] "

5171 -

5172 -#: builtin/branch.c:349

5173 -msgid " **** invalid ref ****"

5174 -msgstr " **** ogiltig ref ****"

5175 -

5176 -#: builtin/branch.c:375

5177 -#, c-format

5178 -msgid "(no branch, rebasing %s)"

5179 -msgstr "(ingen gren, ombaserar %s)"

5180 -

5181 -#: builtin/branch.c:378

5182 -#, c-format

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

5184 -msgstr "(ingen gren, \"bisect\" startad på %s)"

5185 -

5186 -#. TRANSLATORS: make sure this matches

5187 -#. "HEAD detached at " in wt-status.c

5188 -#: builtin/branch.c:384

5189 -#, c-format

5190 -msgid "(HEAD detached at %s)"

5191 -msgstr "(HEAD frånkopplat vid %s)"

5192 -

5193 -#. TRANSLATORS: make sure this matches

5194 -#. "HEAD detached from " in wt-status.c

5195 -#: builtin/branch.c:389

5196 -#, c-format

5197 -msgid "(HEAD detached from %s)"

5198 -msgstr "(HEAD frånkopplat från %s)"

5199 -

5200 -#: builtin/branch.c:393

5201 -msgid "(no branch)"

5202 -msgstr "(ingen gren)"

5203 -

5204 -#: builtin/branch.c:535

5392 +#: builtin/branch.c:441

5393 #, c-format

5394 msgid "Branch %s is being rebased at %s"

5395 msgstr "Grenen %s ombaseras på %s"

5396

5209 -#: builtin/branch.c:539

5397 +#: builtin/branch.c:445

5398 #, c-format

5399 msgid "Branch %s is being bisected at %s"

5400 msgstr "Grenen %s är i en \"bisect\" på %s"

5401

5214 -#: builtin/branch.c:554

5402 +#: builtin/branch.c:460

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

5404 msgstr ""

5405 "kunde inte byta namn på aktuell gren när du inte befinner dig på någon."

5406

5219 -#: builtin/branch.c:564

5407 +#: builtin/branch.c:470

5408 #, c-format

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

5410 msgstr "Felaktigt namn på gren: \"%s\""

5411

5224 -#: builtin/branch.c:581

5412 +#: builtin/branch.c:487

5413 msgid "Branch rename failed"

5414 msgstr "Misslyckades byta namn på gren"

5415

5228 -#: builtin/branch.c:585

5416 +#: builtin/branch.c:490

5417 #, c-format

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

5419 msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""

5420

5233 -#: builtin/branch.c:588

5421 +#: builtin/branch.c:493

5422 #, c-format

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

5424 msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"

5425

5238 -#: builtin/branch.c:595

5426 +#: builtin/branch.c:502

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

5428 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

5429

5242 -#: builtin/branch.c:611

5430 +#: builtin/branch.c:518

5431 #, c-format

5432 msgid ""

5433 "Please edit the description for the branch\n"

@@ -5250,208 +5438,217 @@ msgstr ""

5438 " %s\n"

5439 "Rader som inleds med \"%c\" ignoreras.\n"

5440

5253 -#: builtin/branch.c:643

5441 +#: builtin/branch.c:551

5442 msgid "Generic options"

5443 msgstr "Allmänna flaggor"

5444

5257 -#: builtin/branch.c:645

5445 +#: builtin/branch.c:553

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

5447 msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"

5448

5261 -#: builtin/branch.c:646

5449 +#: builtin/branch.c:554

5450 msgid "suppress informational messages"

5451 msgstr "undertryck informationsmeddelanden"

5452

5265 -#: builtin/branch.c:647

5453 +#: builtin/branch.c:555

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

5455 msgstr "ställ in spårningsläge (se git-pull(1))"

5456

5269 -#: builtin/branch.c:649

5457 +#: builtin/branch.c:557

5458 msgid "change upstream info"

5459 msgstr "ändra uppströmsinformation"

5460

5273 -#: builtin/branch.c:651

5461 +#: builtin/branch.c:559

5462 msgid "upstream"

5463 msgstr "uppströms"

5464

5277 -#: builtin/branch.c:651

5465 +#: builtin/branch.c:559

5466 msgid "change the upstream info"

5467 msgstr "ändra uppströmsinformationen"

5468

5281 -#: builtin/branch.c:652

5469 +#: builtin/branch.c:560

5470 msgid "Unset the upstream info"

5471 msgstr "ta bort uppströmsinformationen"

5472

5285 -#: builtin/branch.c:653

5473 +#: builtin/branch.c:561

5474 msgid "use colored output"

5475 msgstr "använd färgad utdata"

5476

5289 -#: builtin/branch.c:654

5477 +#: builtin/branch.c:562

5478 msgid "act on remote-tracking branches"

5479 msgstr "arbeta på fjärrspårande grenar"

5480

5293 -#: builtin/branch.c:656 builtin/branch.c:657

5481 +#: builtin/branch.c:564 builtin/branch.c:566

5482 msgid "print only branches that contain the commit"

5483 msgstr "visa endast grenar som innehåller incheckningen"

5484

5297 -#: builtin/branch.c:660

5485 +#: builtin/branch.c:565 builtin/branch.c:567

5486 +msgid "print only branches that don't contain the commit"

5487 +msgstr "visa endast grenar som inte innehåller incheckningen"

5488 +

5489 +#: builtin/branch.c:570

5490 msgid "Specific git-branch actions:"

5491 msgstr "Specifika git-branch-åtgärder:"

5492

5301 -#: builtin/branch.c:661

5493 +#: builtin/branch.c:571

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

5495 msgstr "visa både fjärrspårande och lokala grenar"

5496

5305 -#: builtin/branch.c:663

5497 +#: builtin/branch.c:573

5498 msgid "delete fully merged branch"

5499 msgstr "ta bort helt sammanslagen gren"

5500

5309 -#: builtin/branch.c:664

5501 +#: builtin/branch.c:574

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

5503 msgstr "ta bort gren (även om inte helt sammanslagen)"

5504

5313 -#: builtin/branch.c:665

5505 +#: builtin/branch.c:575

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

5507 msgstr "flytta/ta bort en gren och dess reflogg"

5508

5317 -#: builtin/branch.c:666

5509 +#: builtin/branch.c:576

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

5511 msgstr "flytta/ta bort en gren, även om målet finns"

5512

5321 -#: builtin/branch.c:667

5513 +#: builtin/branch.c:577

5514 msgid "list branch names"

5515 msgstr "lista namn på grenar"

5516

5325 -#: builtin/branch.c:668

5517 +#: builtin/branch.c:578

5518 msgid "create the branch's reflog"

5519 msgstr "skapa grenens reflogg"

5520

5329 -#: builtin/branch.c:670

5521 +#: builtin/branch.c:580

5522 msgid "edit the description for the branch"

5523 msgstr "redigera beskrivning för grenen"

5524

5333 -#: builtin/branch.c:671

5525 +#: builtin/branch.c:581

5526 msgid "force creation, move/rename, deletion"

5527 msgstr "tvinga skapande, flytt/namnändring, borttagande"

5528

5337 -#: builtin/branch.c:672

5529 +#: builtin/branch.c:582

5530 msgid "print only branches that are merged"

5531 msgstr "visa endast sammanslagna grenar"

5532

5341 -#: builtin/branch.c:673

5533 +#: builtin/branch.c:583

5534 msgid "print only branches that are not merged"

5535 msgstr "visa endast ej sammanslagna grenar"

5536

5345 -#: builtin/branch.c:674

5537 +#: builtin/branch.c:584

5538 msgid "list branches in columns"

5539 msgstr "visa grenar i spalter"

5540

5349 -#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381

5541 +#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426

5542 msgid "key"

5543 msgstr "nyckel"

5544

5353 -#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382

5545 +#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427

5546 msgid "field name to sort on"

5547 msgstr "fältnamn att sortera på"

5548

5357 -#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404

5549 +#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404

5550 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570

5359 -#: builtin/tag.c:384

5551 +#: builtin/tag.c:429

5552 msgid "object"

5553 msgstr "objekt"

5554

5363 -#: builtin/branch.c:679

5555 +#: builtin/branch.c:589

5556 msgid "print only branches of the object"

5557 msgstr "visa endast grenar för objektet"

5558

5367 -#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388

5559 +#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434

5560 msgid "sorting and filtering are case insensitive"

5561 msgstr "sortering och filtrering skiljer gemener och VERSALER"

5562

5371 -#: builtin/branch.c:698

5563 +#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433

5564 +#: builtin/verify-tag.c:38

5565 +msgid "format to use for the output"

5566 +msgstr "format att använda för utdata"

5567 +

5568 +#: builtin/branch.c:611

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

5570 msgstr "Misslyckades slå upp HEAD som giltig referens"

5571

5375 -#: builtin/branch.c:702 builtin/clone.c:706

5572 +#: builtin/branch.c:615 builtin/clone.c:724

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

5574 msgstr "HEAD hittades inte under refs/heads!"

5575

5379 -#: builtin/branch.c:724

5576 +#: builtin/branch.c:638

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

5578 msgstr "--column och --verbose är inkompatibla"

5579

5383 -#: builtin/branch.c:735 builtin/branch.c:787

5580 +#: builtin/branch.c:649 builtin/branch.c:701

5581 msgid "branch name required"

5582 msgstr "grennamn krävs"

5583

5387 -#: builtin/branch.c:763

5584 +#: builtin/branch.c:677

5585 msgid "Cannot give description to detached HEAD"

5586 msgstr "Kan inte beskriva frånkopplad HEAD"

5587

5391 -#: builtin/branch.c:768

5588 +#: builtin/branch.c:682

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

5590 msgstr "kan inte redigera beskrivning för mer än en gren"

5591

5395 -#: builtin/branch.c:775

5592 +#: builtin/branch.c:689

5593 #, c-format

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

5595 msgstr "Inga incheckningar på grenen \"%s\" ännu"

5596

5400 -#: builtin/branch.c:778

5597 +#: builtin/branch.c:692

5598 #, c-format

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

5600 msgstr "Ingen gren vid namnet \"%s\"."

5601

5405 -#: builtin/branch.c:793

5602 +#: builtin/branch.c:707

5603 msgid "too many branches for a rename operation"

5604 msgstr "för många grenar för namnbyte"

5605

5409 -#: builtin/branch.c:798

5606 +#: builtin/branch.c:712

5607 msgid "too many branches to set new upstream"

5608 msgstr "för många grenar för att byta uppström"

5609

5413 -#: builtin/branch.c:802

5610 +#: builtin/branch.c:716

5611 #, c-format

5612 msgid ""

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

5614 msgstr ""

5615 "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."

5616

5420 -#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848

5617 +#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762

5618 #, c-format

5619 msgid "no such branch '%s'"

5620 msgstr "okänd gren \"%s\""

5621

5425 -#: builtin/branch.c:809

5622 +#: builtin/branch.c:723

5623 #, c-format

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

5625 msgstr "grenen \"%s\" finns inte"

5626

5430 -#: builtin/branch.c:821

5627 +#: builtin/branch.c:735

5628 msgid "too many branches to unset upstream"

5629 msgstr "för många grenar för att ta bort uppström"

5630

5434 -#: builtin/branch.c:825

5631 +#: builtin/branch.c:739

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

5633 msgstr ""

5634 "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."

5635

5439 -#: builtin/branch.c:831

5636 +#: builtin/branch.c:745

5637 #, c-format

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

5639 msgstr "Grenen \"%s\" har ingen uppströmsinformation"

5640

5444 -#: builtin/branch.c:845

5641 +#: builtin/branch.c:759

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

5643 msgstr "kan inte skapa \"HEAD\" manuellt"

5644

5448 -#: builtin/branch.c:851

5645 +#: builtin/branch.c:765

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

5647 msgstr ""

5648 "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "

5649 "grennamn"

5650

5454 -#: builtin/branch.c:854

5651 +#: builtin/branch.c:768

5652 #, c-format

5653 msgid ""

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

@@ -5460,7 +5657,7 @@ msgstr ""

5657 "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "

5658 "eller --set-upstream-to\n"

5659

5463 -#: builtin/branch.c:871

5660 +#: builtin/branch.c:785

5661 #, c-format

5662 msgid ""

5663 "\n"

@@ -5471,16 +5668,16 @@ msgstr ""

5668 "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"

5669 "\n"

5670

5474 -#: builtin/bundle.c:51

5671 +#: builtin/bundle.c:45

5672 #, c-format

5673 msgid "%s is okay\n"

5674 msgstr "%s är okej\n"

5675

5479 -#: builtin/bundle.c:64

5676 +#: builtin/bundle.c:58

5677 msgid "Need a repository to create a bundle."

5678 msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."

5679

5483 -#: builtin/bundle.c:68

5680 +#: builtin/bundle.c:62

5681 msgid "Need a repository to unbundle."

5682 msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."

5683

@@ -5528,7 +5725,7 @@ msgstr "för blob-objekt, kör filter på objektets innehåll"

5725 msgid "for blob objects, run filters on object's content"

5726 msgstr "för blob-objekt, kör filger på objektets innehåll"

5727

5531 -#: builtin/cat-file.c:561 git-submodule.sh:929

5728 +#: builtin/cat-file.c:561 git-submodule.sh:943

5729 msgid "blob"

5730 msgstr "blob"

5731

@@ -5585,7 +5782,7 @@ msgstr "läs filnamn från standard in"

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

5783 msgstr "avsluta in- och utdataposter med NUL-tecken"

5784

5588 -#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332

5785 +#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352

5786 msgid "suppress progress reporting"

5787 msgstr "undertryck förloppsrapportering"

5788

@@ -5675,9 +5872,9 @@ msgid "write the content to temporary files"

5872 msgstr "skriv innehåll till temporära filer"

5873

5874 #: builtin/checkout-index.c:174 builtin/column.c:30

5678 -#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600

5679 -#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967

5680 -#: builtin/worktree.c:471

5875 +#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638

5876 +#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980

5877 +#: builtin/worktree.c:472

5878 msgid "string"

5879 msgstr "sträng"

5880

@@ -5689,113 +5886,113 @@ msgstr "när filer skapas, lägg till <sträng> först"

5886 msgid "copy out the files from named stage"

5887 msgstr "kopiera ut filer från namngiven etapp"

5888

5692 -#: builtin/checkout.c:25

5889 +#: builtin/checkout.c:27

5890 msgid "git checkout [<options>] <branch>"

5891 msgstr "git checkout [<flaggor>] <gren>"

5892

5696 -#: builtin/checkout.c:26

5893 +#: builtin/checkout.c:28

5894 msgid "git checkout [<options>] [<branch>] -- <file>..."

5895 msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..."

5896

5700 -#: builtin/checkout.c:134 builtin/checkout.c:167

5897 +#: builtin/checkout.c:153 builtin/checkout.c:186

5898 #, c-format

5899 msgid "path '%s' does not have our version"

5900 msgstr "sökvägen \"%s\" har inte vår version"

5901

5705 -#: builtin/checkout.c:136 builtin/checkout.c:169

5902 +#: builtin/checkout.c:155 builtin/checkout.c:188

5903 #, c-format

5904 msgid "path '%s' does not have their version"

5905 msgstr "sökvägen \"%s\" har inte deras version"

5906

5710 -#: builtin/checkout.c:152

5907 +#: builtin/checkout.c:171

5908 #, c-format

5909 msgid "path '%s' does not have all necessary versions"

5910 msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"

5911

5715 -#: builtin/checkout.c:196

5912 +#: builtin/checkout.c:215

5913 #, c-format

5914 msgid "path '%s' does not have necessary versions"

5915 msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"

5916

5720 -#: builtin/checkout.c:213

5917 +#: builtin/checkout.c:232

5918 #, c-format

5919 msgid "path '%s': cannot merge"

5920 msgstr "sökväg \"%s\": kan inte slå ihop"

5921

5725 -#: builtin/checkout.c:230

5922 +#: builtin/checkout.c:249

5923 #, c-format

5924 msgid "Unable to add merge result for '%s'"

5925 msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""

5926

5730 -#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256

5731 -#: builtin/checkout.c:259

5927 +#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275

5928 +#: builtin/checkout.c:278

5929 #, c-format

5930 msgid "'%s' cannot be used with updating paths"

5931 msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"

5932

5736 -#: builtin/checkout.c:262 builtin/checkout.c:265

5933 +#: builtin/checkout.c:281 builtin/checkout.c:284

5934 #, c-format

5935 msgid "'%s' cannot be used with %s"

5936 msgstr "\"%s\" kan inte användas med %s"

5937

5741 -#: builtin/checkout.c:268

5938 +#: builtin/checkout.c:287

5939 #, c-format

5940 msgid "Cannot update paths and switch to branch '%s' at the same time."

5941 msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."

5942

5746 -#: builtin/checkout.c:339 builtin/checkout.c:346

5943 +#: builtin/checkout.c:358 builtin/checkout.c:365

5944 #, c-format

5945 msgid "path '%s' is unmerged"

5946 msgstr "sökvägen \"%s\" har inte slagits ihop"

5947

5751 -#: builtin/checkout.c:494

5948 +#: builtin/checkout.c:513

5949 msgid "you need to resolve your current index first"

5950 msgstr "du måste lösa ditt befintliga index först"

5951

5755 -#: builtin/checkout.c:625

5952 +#: builtin/checkout.c:644

5953 #, c-format

5954 msgid "Can not do reflog for '%s': %s\n"

5955 msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"

5956

5760 -#: builtin/checkout.c:666

5957 +#: builtin/checkout.c:685

5958 msgid "HEAD is now at"

5959 msgstr "HEAD är nu på"

5960

5764 -#: builtin/checkout.c:670 builtin/clone.c:660

5961 +#: builtin/checkout.c:689 builtin/clone.c:678

5962 msgid "unable to update HEAD"

5963 msgstr "kan inte uppdatera HEAD"

5964

5768 -#: builtin/checkout.c:674

5965 +#: builtin/checkout.c:693

5966 #, c-format

5967 msgid "Reset branch '%s'\n"

5968 msgstr "Återställ gren \"%s\"\n"

5969

5773 -#: builtin/checkout.c:677

5970 +#: builtin/checkout.c:696

5971 #, c-format

5972 msgid "Already on '%s'\n"

5973 msgstr "Redan på \"%s\"\n"

5974

5778 -#: builtin/checkout.c:681

5975 +#: builtin/checkout.c:700

5976 #, c-format

5977 msgid "Switched to and reset branch '%s'\n"

5978 msgstr "Växlade till och nollställde grenen \"%s\"\n"

5979

5783 -#: builtin/checkout.c:683 builtin/checkout.c:1072

5980 +#: builtin/checkout.c:702 builtin/checkout.c:1090

5981 #, c-format

5982 msgid "Switched to a new branch '%s'\n"

5983 msgstr "Växlade till en ny gren \"%s\"\n"

5984

5788 -#: builtin/checkout.c:685

5985 +#: builtin/checkout.c:704

5986 #, c-format

5987 msgid "Switched to branch '%s'\n"

5988 msgstr "Växlade till grenen \"%s\"\n"

5989

5793 -#: builtin/checkout.c:736

5990 +#: builtin/checkout.c:755

5991 #, c-format

5992 msgid " ... and %d more.\n"

5993 msgstr " ... och %d till.\n"

5994

5798 -#: builtin/checkout.c:742

5995 +#: builtin/checkout.c:761

5996 #, c-format

5997 msgid ""

5998 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -5818,7 +6015,7 @@ msgstr[1] ""

6015 "\n"

6016 "%s\n"

6017

5821 -#: builtin/checkout.c:761

6018 +#: builtin/checkout.c:780

6019 #, c-format

6020 msgid ""

6021 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -5845,151 +6042,151 @@ msgstr[1] ""

6042 " git branch <nytt_grennamn> %s\n"

6043 "\n"

6044

5848 -#: builtin/checkout.c:797

6045 +#: builtin/checkout.c:816

6046 msgid "internal error in revision walk"

6047 msgstr "internt fel vid genomgång av revisioner (revision walk)"

6048

5852 -#: builtin/checkout.c:801

6049 +#: builtin/checkout.c:820

6050 msgid "Previous HEAD position was"

6051 msgstr "Tidigare position för HEAD var"

6052

5856 -#: builtin/checkout.c:828 builtin/checkout.c:1067

6053 +#: builtin/checkout.c:847 builtin/checkout.c:1085

6054 msgid "You are on a branch yet to be born"

6055 msgstr "Du är på en gren som ännu inte är född"

6056

5860 -#: builtin/checkout.c:973

6057 +#: builtin/checkout.c:991

6058 #, c-format

6059 msgid "only one reference expected, %d given."

6060 msgstr "endast en referens förväntades, %d gavs."

6061

5865 -#: builtin/checkout.c:1013 builtin/worktree.c:214

6062 +#: builtin/checkout.c:1031 builtin/worktree.c:214

6063 #, c-format

6064 msgid "invalid reference: %s"

6065 msgstr "felaktig referens: %s"

6066

5870 -#: builtin/checkout.c:1042

6067 +#: builtin/checkout.c:1060

6068 #, c-format

6069 msgid "reference is not a tree: %s"

6070 msgstr "referensen är inte ett träd: %s"

6071

5875 -#: builtin/checkout.c:1081

6072 +#: builtin/checkout.c:1099

6073 msgid "paths cannot be used with switching branches"

6074 msgstr "sökvägar kan inte användas vid byte av gren"

6075

5879 -#: builtin/checkout.c:1084 builtin/checkout.c:1088

6076 +#: builtin/checkout.c:1102 builtin/checkout.c:1106

6077 #, c-format

6078 msgid "'%s' cannot be used with switching branches"

6079 msgstr "\"%s\" kan inte användas vid byte av gren"

6080

5884 -#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100

5885 -#: builtin/checkout.c:1103

6081 +#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118

6082 +#: builtin/checkout.c:1121

6083 #, c-format

6084 msgid "'%s' cannot be used with '%s'"

6085 msgstr "\"%s\" kan inte användas med \"%s\""

6086

5890 -#: builtin/checkout.c:1108

6087 +#: builtin/checkout.c:1126

6088 #, c-format

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

6090 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""

6091

5895 -#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93

5896 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324

5897 -#: builtin/worktree.c:326

6092 +#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111

6093 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325

6094 +#: builtin/worktree.c:327

6095 msgid "branch"

6096 msgstr "gren"

6097

5901 -#: builtin/checkout.c:1142

6098 +#: builtin/checkout.c:1160

6099 msgid "create and checkout a new branch"

6100 msgstr "skapa och checka ut en ny gren"

6101

5905 -#: builtin/checkout.c:1144

6102 +#: builtin/checkout.c:1162

6103 msgid "create/reset and checkout a branch"

6104 msgstr "skapa/nollställ och checka ut en gren"

6105

5909 -#: builtin/checkout.c:1145

6106 +#: builtin/checkout.c:1163

6107 msgid "create reflog for new branch"

6108 msgstr "skapa reflogg för ny gren"

6109

5913 -#: builtin/checkout.c:1146 builtin/worktree.c:328

6110 +#: builtin/checkout.c:1164 builtin/worktree.c:329

6111 msgid "detach HEAD at named commit"

6112 msgstr "koppla från HEAD vid namngiven incheckning"

6113

5917 -#: builtin/checkout.c:1147

6114 +#: builtin/checkout.c:1165

6115 msgid "set upstream info for new branch"

6116 msgstr "sätt uppströmsinformation för ny gren"

6117

5921 -#: builtin/checkout.c:1149

6118 +#: builtin/checkout.c:1167

6119 msgid "new-branch"

6120 msgstr "ny-gren"

6121

5925 -#: builtin/checkout.c:1149

6122 +#: builtin/checkout.c:1167

6123 msgid "new unparented branch"

6124 msgstr "ny gren utan förälder"

6125

5929 -#: builtin/checkout.c:1150

6126 +#: builtin/checkout.c:1168

6127 msgid "checkout our version for unmerged files"

6128 msgstr "checka ut vår version för ej sammanslagna filer"

6129

5933 -#: builtin/checkout.c:1152

6130 +#: builtin/checkout.c:1170

6131 msgid "checkout their version for unmerged files"

6132 msgstr "checka ut deras version för ej sammanslagna filer"

6133

5937 -#: builtin/checkout.c:1154

6134 +#: builtin/checkout.c:1172

6135 msgid "force checkout (throw away local modifications)"

6136 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"

6137

5941 -#: builtin/checkout.c:1155

6138 +#: builtin/checkout.c:1173

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

6140 msgstr "utför en 3-vägssammanslagning för den nya grenen"

6141

5945 -#: builtin/checkout.c:1156 builtin/merge.c:235

6142 +#: builtin/checkout.c:1174 builtin/merge.c:234

6143 msgid "update ignored files (default)"

6144 msgstr "uppdatera ignorerade filer (standard)"

6145

5949 -#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251

6146 +#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251

6147 msgid "style"

6148 msgstr "stil"

6149

5953 -#: builtin/checkout.c:1158

6150 +#: builtin/checkout.c:1176

6151 msgid "conflict style (merge or diff3)"

6152 msgstr "konfliktstil (merge eller diff3)"

6153

5957 -#: builtin/checkout.c:1161

6154 +#: builtin/checkout.c:1179

6155 msgid "do not limit pathspecs to sparse entries only"

6156 msgstr "begränsa inte sökvägar till endast glesa poster"

6157

5961 -#: builtin/checkout.c:1163

6158 +#: builtin/checkout.c:1181

6159 msgid "second guess 'git checkout <no-such-branch>'"

6160 msgstr "förutspå \"git checkout <gren-saknas>\""

6161

5965 -#: builtin/checkout.c:1165

6162 +#: builtin/checkout.c:1183

6163 msgid "do not check if another worktree is holding the given ref"

6164 msgstr ""

6165 "kontrollera inte om en annan arbetskatalog håller den angivna referensen"

6166

5970 -#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119

5971 -#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539

5972 -#: builtin/send-pack.c:168

6167 +#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119

6168 +#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539

6169 +#: builtin/send-pack.c:172

6170 msgid "force progress reporting"

6171 msgstr "tvinga förloppsrapportering"

6172

5976 -#: builtin/checkout.c:1197

6173 +#: builtin/checkout.c:1224

6174 msgid "-b, -B and --orphan are mutually exclusive"

6175 msgstr "-b, -B och --orphan är ömsesidigt uteslutande"

6176

5980 -#: builtin/checkout.c:1214

6177 +#: builtin/checkout.c:1241

6178 msgid "--track needs a branch name"

6179 msgstr "--track behöver ett namn på en gren"

6180

5984 -#: builtin/checkout.c:1219

6181 +#: builtin/checkout.c:1246

6182 msgid "Missing branch name; try -b"

6183 msgstr "Grennamn saknas; försök med -b"

6184

5988 -#: builtin/checkout.c:1255

6185 +#: builtin/checkout.c:1282

6186 msgid "invalid path specification"

6187 msgstr "felaktig sökvägsangivelse"

6188

5992 -#: builtin/checkout.c:1262

6189 +#: builtin/checkout.c:1289

6190 #, c-format

6191 msgid ""

6192 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -5998,12 +6195,12 @@ msgstr ""

6195 "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"

6196 "Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"

6197

6001 -#: builtin/checkout.c:1267

6198 +#: builtin/checkout.c:1294

6199 #, c-format

6200 msgid "git checkout: --detach does not take a path argument '%s'"

6201 msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""

6202

6006 -#: builtin/checkout.c:1271

6203 +#: builtin/checkout.c:1298

6204 msgid ""

6205 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

6206 "checking out of the index."

@@ -6043,7 +6240,7 @@ msgstr "Skulle hoppa över arkivet %s\n"

6240 msgid "failed to remove %s"

6241 msgstr "misslyckades ta bort %s"

6242

6046 -#: builtin/clean.c:291 git-add--interactive.perl:623

6243 +#: builtin/clean.c:297 git-add--interactive.perl:614

6244 #, c-format

6245 msgid ""

6246 "Prompt help:\n"

@@ -6056,7 +6253,7 @@ msgstr ""

6253 "foo - markera post baserad på unikt prefix\n"

6254 " - (tomt) markera ingenting\n"

6255

6059 -#: builtin/clean.c:295 git-add--interactive.perl:632

6256 +#: builtin/clean.c:301 git-add--interactive.perl:623

6257 #, c-format

6258 msgid ""

6259 "Prompt help:\n"

@@ -6077,38 +6274,38 @@ msgstr ""

6274 "* - välj alla poster\n"

6275 " - (tomt) avsluta markering\n"

6276

6080 -#: builtin/clean.c:511 git-add--interactive.perl:598

6081 -#: git-add--interactive.perl:603

6277 +#: builtin/clean.c:517 git-add--interactive.perl:589

6278 +#: git-add--interactive.perl:594

6279 #, c-format, perl-format

6280 msgid "Huh (%s)?\n"

6281 msgstr "Vadå (%s)?\n"

6282

6086 -#: builtin/clean.c:653

6283 +#: builtin/clean.c:659

6284 #, c-format

6285 msgid "Input ignore patterns>> "

6286 msgstr "Ange ignoreringsmönster>>"

6287

6091 -#: builtin/clean.c:690

6288 +#: builtin/clean.c:696

6289 #, c-format

6290 msgid "WARNING: Cannot find items matched by: %s"

6291 msgstr "VARNING: Hittar inte poster som motsvarar: %s"

6292

6096 -#: builtin/clean.c:711

6293 +#: builtin/clean.c:717

6294 msgid "Select items to delete"

6295 msgstr "Välj poster att ta bort"

6296

6297 #. TRANSLATORS: Make sure to keep [y/N] as is

6101 -#: builtin/clean.c:752

6298 +#: builtin/clean.c:758

6299 #, c-format

6300 msgid "Remove %s [y/N]? "

6301 msgstr "Ta bort %s [Y=ja / N=nej]?"

6302

6106 -#: builtin/clean.c:777 git-add--interactive.perl:1669

6303 +#: builtin/clean.c:783 git-add--interactive.perl:1660

6304 #, c-format

6305 msgid "Bye.\n"

6306 msgstr "Hej då.\n"

6307

6111 -#: builtin/clean.c:785

6308 +#: builtin/clean.c:791

6309 msgid ""

6310 "clean - start cleaning\n"

6311 "filter by pattern - exclude items from deletion\n"

@@ -6126,62 +6323,63 @@ msgstr ""

6323 "help - denna skärm\n"

6324 "? - hjälp för kommandoval"

6325

6129 -#: builtin/clean.c:812 git-add--interactive.perl:1745

6326 +#: builtin/clean.c:818 git-add--interactive.perl:1736

6327 msgid "*** Commands ***"

6328 msgstr "*** Kommandon ***"

6329

6133 -#: builtin/clean.c:813 git-add--interactive.perl:1742

6330 +#: builtin/clean.c:819 git-add--interactive.perl:1733

6331 msgid "What now"

6332 msgstr "Vad nu"

6333

6137 -#: builtin/clean.c:821

6334 +#: builtin/clean.c:827

6335 msgid "Would remove the following item:"

6336 msgid_plural "Would remove the following items:"

6337 msgstr[0] "Skulle ta bort följande post:"

6338 msgstr[1] "Skulle ta bort följande poster:"

6339

6143 -#: builtin/clean.c:838

6340 +#: builtin/clean.c:844

6341 msgid "No more files to clean, exiting."

6342 msgstr "Inga fler filer att städa, avslutar."

6343

6147 -#: builtin/clean.c:869

6344 +#: builtin/clean.c:875

6345 msgid "do not print names of files removed"

6346 msgstr "skriv inte ut namn på borttagna filer"

6347

6151 -#: builtin/clean.c:871

6348 +#: builtin/clean.c:877

6349 msgid "force"

6350 msgstr "tvinga"

6351

6155 -#: builtin/clean.c:872

6352 +#: builtin/clean.c:878

6353 msgid "interactive cleaning"

6354 msgstr "städa interaktivt"

6355

6159 -#: builtin/clean.c:874

6356 +#: builtin/clean.c:880

6357 msgid "remove whole directories"

6358 msgstr "ta bort hela kataloger"

6359

6163 -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056

6164 -#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176

6360 +#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451

6361 +#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348

6362 +#: builtin/name-rev.c:350 builtin/show-ref.c:176

6363 msgid "pattern"

6364 msgstr "mönster"

6365

6168 -#: builtin/clean.c:876

6366 +#: builtin/clean.c:882

6367 msgid "add <pattern> to ignore rules"

6368 msgstr "lägg till <mönster> till ignoreringsregler"

6369

6172 -#: builtin/clean.c:877

6370 +#: builtin/clean.c:883

6371 msgid "remove ignored files, too"

6372 msgstr "ta även bort ignorerade filer"

6373

6176 -#: builtin/clean.c:879

6374 +#: builtin/clean.c:885

6375 msgid "remove only ignored files"

6376 msgstr "ta endast bort ignorerade filer"

6377

6180 -#: builtin/clean.c:897

6378 +#: builtin/clean.c:903

6379 msgid "-x and -X cannot be used together"

6380 msgstr "-x och -X kan inte användas samtidigt"

6381

6184 -#: builtin/clean.c:901

6382 +#: builtin/clean.c:907

6383 msgid ""

6384 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

6385 "clean"

@@ -6189,7 +6387,7 @@ msgstr ""

6387 "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "

6388 "städa"

6389

6192 -#: builtin/clean.c:904

6390 +#: builtin/clean.c:910

6391 msgid ""

6392 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

6393 "refusing to clean"

@@ -6201,130 +6399,134 @@ msgstr ""

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

6400 msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"

6401

6204 -#: builtin/clone.c:65

6402 +#: builtin/clone.c:80

6403 msgid "don't create a checkout"

6404 msgstr "skapa inte någon utcheckning"

6405

6208 -#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478

6406 +#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478

6407 msgid "create a bare repository"

6408 msgstr "skapa ett naket (\"bare\") arkiv"

6409

6212 -#: builtin/clone.c:70

6410 +#: builtin/clone.c:85

6411 msgid "create a mirror repository (implies bare)"

6412 msgstr "skapa ett spegelarkiv (implicerar \"bare\")"

6413

6216 -#: builtin/clone.c:72

6414 +#: builtin/clone.c:87

6415 msgid "to clone from a local repository"

6416 msgstr "för att klona från ett lokalt arkiv"

6417

6220 -#: builtin/clone.c:74

6418 +#: builtin/clone.c:89

6419 msgid "don't use local hardlinks, always copy"

6420 msgstr "skapa inte lokala hårda länkar, kopiera alltid"

6421

6224 -#: builtin/clone.c:76

6422 +#: builtin/clone.c:91

6423 msgid "setup as shared repository"

6424 msgstr "skapa som ett delat arkiv"

6425

6228 -#: builtin/clone.c:78 builtin/clone.c:80

6426 +#: builtin/clone.c:93 builtin/clone.c:97

6427 +msgid "pathspec"

6428 +msgstr "sökvägsangivelse"

6429 +

6430 +#: builtin/clone.c:93 builtin/clone.c:97

6431 msgid "initialize submodules in the clone"

6432 msgstr "initiera undermoduler i klonen"

6433

6232 -#: builtin/clone.c:82

6434 +#: builtin/clone.c:100

6435 msgid "number of submodules cloned in parallel"

6436 msgstr "antal undermoduler som klonas parallellt"

6437

6236 -#: builtin/clone.c:83 builtin/init-db.c:475

6438 +#: builtin/clone.c:101 builtin/init-db.c:475

6439 msgid "template-directory"

6440 msgstr "mallkatalog"

6441

6240 -#: builtin/clone.c:84 builtin/init-db.c:476

6442 +#: builtin/clone.c:102 builtin/init-db.c:476

6443 msgid "directory from which templates will be used"

6444 msgstr "katalog att använda mallar från"

6445

6244 -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604

6245 -#: builtin/submodule--helper.c:970

6446 +#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642

6447 +#: builtin/submodule--helper.c:983

6448 msgid "reference repository"

6449 msgstr "referensarkiv"

6450

6249 -#: builtin/clone.c:90

6451 +#: builtin/clone.c:108

6452 msgid "use --reference only while cloning"

6453 msgstr "använd --reference endast under kloningen"

6454

6253 -#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44

6455 +#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43

6456 msgid "name"

6457 msgstr "namn"

6458

6257 -#: builtin/clone.c:92

6459 +#: builtin/clone.c:110

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

6461 msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"

6462

6261 -#: builtin/clone.c:94

6463 +#: builtin/clone.c:112

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

6465 msgstr "checka ut <gren> istället för fjärrens HEAD"

6466

6265 -#: builtin/clone.c:96

6467 +#: builtin/clone.c:114

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

6469 msgstr "sökväg till git-upload-pack på fjärren"

6470

6269 -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999

6471 +#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006

6472 #: builtin/pull.c:202

6473 msgid "depth"

6474 msgstr "djup"

6475

6274 -#: builtin/clone.c:98

6476 +#: builtin/clone.c:116

6477 msgid "create a shallow clone of that depth"

6478 msgstr "skapa en grund klon på detta djup"

6479

6278 -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836

6480 +#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918

6481 #: parse-options.h:142

6482 msgid "time"

6483 msgstr "tid"

6484

6283 -#: builtin/clone.c:100

6485 +#: builtin/clone.c:118

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

6487 msgstr "skapa en grund klon från en angiven tidpunkt"

6488

6287 -#: builtin/clone.c:101 builtin/fetch.c:124

6489 +#: builtin/clone.c:119 builtin/fetch.c:124

6490 msgid "revision"

6491 msgstr "revision"

6492

6291 -#: builtin/clone.c:102 builtin/fetch.c:125

6493 +#: builtin/clone.c:120 builtin/fetch.c:125

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

6495 msgstr "fördjupa historik för grund klon, exkludera revisionen"

6496

6295 -#: builtin/clone.c:104

6497 +#: builtin/clone.c:122

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

6499 msgstr "klona endast en gren, HEAD eller --branch"

6500

6299 -#: builtin/clone.c:106

6501 +#: builtin/clone.c:124

6502 msgid "any cloned submodules will be shallow"

6503 msgstr "klonade undermoduler kommer vara grunda"

6504

6303 -#: builtin/clone.c:107 builtin/init-db.c:484

6505 +#: builtin/clone.c:125 builtin/init-db.c:484

6506 msgid "gitdir"

6507 msgstr "gitkat"

6508

6307 -#: builtin/clone.c:108 builtin/init-db.c:485

6509 +#: builtin/clone.c:126 builtin/init-db.c:485

6510 msgid "separate git dir from working tree"

6511 msgstr "separera gitkatalogen från arbetskatalogen"

6512

6311 -#: builtin/clone.c:109

6513 +#: builtin/clone.c:127

6514 msgid "key=value"

6515 msgstr "nyckel=värde"

6516

6315 -#: builtin/clone.c:110

6517 +#: builtin/clone.c:128

6518 msgid "set config inside the new repository"

6519 msgstr "ställ in konfiguration i det nya arkivet"

6520

6319 -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550

6521 +#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550

6522 msgid "use IPv4 addresses only"

6523 msgstr "använd endast IPv4-adresser"

6524

6323 -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552

6525 +#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552

6526 msgid "use IPv6 addresses only"

6527 msgstr "använd endast IPv6-adresser"

6528

6327 -#: builtin/clone.c:250

6529 +#: builtin/clone.c:268

6530 msgid ""

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

6532 "Please specify a directory on the command line"

@@ -6332,42 +6534,42 @@ msgstr ""

6534 "Kunde inte gissa katalognamn.\n"

6535 "Ange en katalog på kommandoraden"

6536

6335 -#: builtin/clone.c:303

6537 +#: builtin/clone.c:321

6538 #, c-format

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

6540 msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n"

6541

6340 -#: builtin/clone.c:375

6542 +#: builtin/clone.c:393

6543 #, c-format

6544 msgid "failed to open '%s'"

6545 msgstr "misslyckades öppna \"%s\""

6546

6345 -#: builtin/clone.c:383

6547 +#: builtin/clone.c:401

6548 #, c-format

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

6550 msgstr "%s finns och är ingen katalog"

6551

6350 -#: builtin/clone.c:397

6552 +#: builtin/clone.c:415

6553 #, c-format

6554 msgid "failed to stat %s\n"

6555 msgstr "misslyckades ta status på %s\n"

6556

6355 -#: builtin/clone.c:419

6557 +#: builtin/clone.c:437

6558 #, c-format

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

6560 msgstr "misslyckades skapa länken \"%s\""

6561

6360 -#: builtin/clone.c:423

6562 +#: builtin/clone.c:441

6563 #, c-format

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

6565 msgstr "misslyckades kopiera filen till \"%s\""

6566

6365 -#: builtin/clone.c:448

6567 +#: builtin/clone.c:466

6568 #, c-format

6569 msgid "done.\n"

6570 msgstr "klart.\n"

6571

6370 -#: builtin/clone.c:460

6572 +#: builtin/clone.c:478

6573 msgid ""

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

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

@@ -6377,139 +6579,138 @@ msgstr ""

6579 "Du kan inspektera det som checkades ut med \"git status\"\n"

6580 "och försöka checka ut igen med \"git checkout -f HEAD\"\n"

6581

6380 -#: builtin/clone.c:537

6582 +#: builtin/clone.c:555

6583 #, c-format

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

6585 msgstr "Kunde inte hitta fjärrgrenen %s för att klona."

6586

6385 -#: builtin/clone.c:632

6587 +#: builtin/clone.c:650

6588 msgid "remote did not send all necessary objects"

6589 msgstr "fjärren sände inte alla nödvändiga objekt"

6590

6389 -#: builtin/clone.c:648

6591 +#: builtin/clone.c:666

6592 #, c-format

6593 msgid "unable to update %s"

6594 msgstr "kan inte uppdatera %s"

6595

6394 -#: builtin/clone.c:697

6596 +#: builtin/clone.c:715

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

6598 msgstr ""

6599 "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"

6600

6399 -#: builtin/clone.c:728

6601 +#: builtin/clone.c:746

6602 msgid "unable to checkout working tree"

6603 msgstr "kunde inte checka ut arbetskatalogen"

6604

6403 -#: builtin/clone.c:768

6605 +#: builtin/clone.c:786

6606 msgid "unable to write parameters to config file"

6607 msgstr "kunde inte skriva parametrar till konfigurationsfilen"

6608

6407 -#: builtin/clone.c:831

6609 +#: builtin/clone.c:849

6610 msgid "cannot repack to clean up"

6611 msgstr "kan inte packa om för att städa upp"

6612

6411 -#: builtin/clone.c:833

6613 +#: builtin/clone.c:851

6614 msgid "cannot unlink temporary alternates file"

6615 msgstr "kunde inte ta bort temporär \"alternates\"-fil"

6616

6415 -#: builtin/clone.c:866 builtin/receive-pack.c:1895

6617 +#: builtin/clone.c:884 builtin/receive-pack.c:1901

6618 msgid "Too many arguments."

6619 msgstr "För många argument."

6620

6419 -#: builtin/clone.c:870

6621 +#: builtin/clone.c:888

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

6623 msgstr "Du måste ange ett arkiv att klona."

6624

6423 -#: builtin/clone.c:883

6625 +#: builtin/clone.c:901

6626 #, c-format

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

6628 msgstr "flaggorna --bare och --origin %s är inkompatibla."

6629

6428 -#: builtin/clone.c:886

6630 +#: builtin/clone.c:904

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

6632 msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."

l10n: sv.po: Update Swedish translation (3199t0f0u)