a7ec9810be · matheusbsbs/matheus-bagliano

@@ -5,10 +5,10 @@

5 #

6 msgid ""

7 msgstr ""

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

8 +"Project-Id-Version: git 2.5.0\n"

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

10 -"POT-Creation-Date: 2015-04-03 08:13+0800\n"

11 -"PO-Revision-Date: 2015-04-07 08:44+0100\n"

10 +"POT-Creation-Date: 2015-06-27 19:17+0800\n"

11 +"PO-Revision-Date: 2015-06-28 18:49+0100\n"

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

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

14 "Language: sv\n"

@@ -50,7 +50,7 @@ msgstr ""

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

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

52

53 -#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328

53 +#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327

54 #, c-format

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

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

@@ -73,9 +73,9 @@ msgstr "lägg till prefix till varje sökväg i arkivet"

73

74 #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516

75 #: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986

76 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101

76 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99

77 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394

78 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151

78 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150

79 msgid "file"

80 msgstr "fil"

81

@@ -107,7 +107,7 @@ msgstr "komprimera bättre"

107 msgid "list supported archive formats"

108 msgstr "visa understödda arkivformat"

109

110 -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86

110 +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77

111 msgid "repo"

112 msgstr "arkiv"

113

@@ -123,7 +123,7 @@ msgstr "kommando"

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

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

125

126 -#: attr.c:264

126 +#: attr.c:265

127 msgid ""

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

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

@@ -262,8 +262,8 @@ msgid "Repository lacks these prerequisite commits:"

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

263

264 #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705

265 -#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330

266 -#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358

265 +#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330

266 +#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358

267 #: builtin/shortlog.c:158

268 msgid "revision walk setup failed"

269 msgstr "misslyckades skapa revisionstraversering"

@@ -508,16 +508,16 @@ msgstr ""

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

509 "%s"

510

511 -#: diff.c:2956

511 +#: diff.c:2997

512 #, c-format

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

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

515

516 -#: diff.c:3351

516 +#: diff.c:3393

517 msgid "--follow requires exactly one pathspec"

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

519

520 -#: diff.c:3514

520 +#: diff.c:3556

521 #, c-format

522 msgid ""

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

@@ -526,11 +526,19 @@ msgstr ""

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

527 "%s"

528

529 -#: diff.c:3528

529 +#: diff.c:3570

530 #, c-format

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

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

533

534 +#: dir.c:1852

535 +msgid "failed to get kernel name and information"

536 +msgstr "misslyckades hämta kärnans namn och information"

537 +

538 +#: dir.c:1945

539 +msgid "Untracked cache is disabled on this system."

540 +msgstr "Ospårad cache är inaktiverad på detta system."

541 +

542 #: gpg-interface.c:129 gpg-interface.c:200

543 msgid "could not run gpg."

544 msgstr "kunde inte köra gpg."

@@ -577,11 +585,11 @@ msgstr "git-kommandon tillgängliga i \"%s\""

585 msgid "git commands available from elsewhere on your $PATH"

586 msgstr "git-kommandon från andra platser i din $PATH"

587

580 -#: help.c:230

581 -msgid "The most commonly used git commands are:"

582 -msgstr "De mest använda git-kommandona är:"

588 +#: help.c:246

589 +msgid "These are common Git commands used in various situations:"

590 +msgstr "Dessa vanliga Git-kommandon används i olika situationer:"

591

584 -#: help.c:289

592 +#: help.c:311

593 #, c-format

594 msgid ""

595 "'%s' appears to be a git command, but we were not\n"

@@ -590,11 +598,11 @@ msgstr ""

598 "\"%s\" verkar vara ett git-kommando, men vi kan inte\n"

599 "köra det. Kanske git-%s är trasigt?"

600

593 -#: help.c:346

601 +#: help.c:368

602 msgid "Uh oh. Your system reports no Git commands at all."

603 msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."

604

597 -#: help.c:368

605 +#: help.c:390

606 #, c-format

607 msgid ""

608 "WARNING: You called a Git command named '%s', which does not exist.\n"

@@ -603,17 +611,17 @@ msgstr ""

611 "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n"

612 "Fortsätter under förutsättningen att du menade \"%s\""

613

606 -#: help.c:373

614 +#: help.c:395

615 #, c-format

616 msgid "in %0.1f seconds automatically..."

617 msgstr "automatiskt om %0.1f sekunder..."

618

611 -#: help.c:380

619 +#: help.c:402

620 #, c-format

621 msgid "git: '%s' is not a git command. See 'git --help'."

622 msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."

623

616 -#: help.c:384 help.c:444

624 +#: help.c:406 help.c:466

625 msgid ""

626 "\n"

627 "Did you mean this?"

@@ -627,16 +635,16 @@ msgstr[1] ""

635 "\n"

636 "Menade du ett av dessa?"

637

630 -#: help.c:440

638 +#: help.c:462

639 #, c-format

640 msgid "%s: %s - %s"

641 msgstr "%s: %s - %s"

642

635 -#: lockfile.c:283

643 +#: lockfile.c:345

644 msgid "BUG: reopen a lockfile that is still open"

645 msgstr "FEL: återöppna en låsfil som fortfarande är öppen"

646

639 -#: lockfile.c:285

647 +#: lockfile.c:347

648 msgid "BUG: reopen a lockfile that has been committed"

649 msgstr "FEL: återöppna en låsfil som har överlämnats"

650

@@ -644,8 +652,8 @@ msgstr "FEL: återöppna en låsfil som har överlämnats"

652 msgid "failed to read the cache"

653 msgstr "misslyckades läsa cachen"

654

647 -#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580

648 -#: builtin/clone.c:662

655 +#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594

656 +#: builtin/clone.c:654

657 msgid "unable to write new index file"

658 msgstr "kunde inte skriva ny indexfil"

659

@@ -663,64 +671,64 @@ msgstr "addinfo_cache misslyckades för sökvägen \"%s\""

671 msgid "error building trees"

672 msgstr "fel vid byggande av träd"

673

666 -#: merge-recursive.c:688

674 +#: merge-recursive.c:687

675 #, c-format

676 msgid "failed to create path '%s'%s"

677 msgstr "misslyckades skapa sökvägen \"%s\"%s"

678

671 -#: merge-recursive.c:699

679 +#: merge-recursive.c:698

680 #, c-format

681 msgid "Removing %s to make room for subdirectory\n"

682 msgstr "Tar bort %s för att göra plats för underkatalog\n"

683

676 -#: merge-recursive.c:713 merge-recursive.c:734

684 +#: merge-recursive.c:712 merge-recursive.c:733

685 msgid ": perhaps a D/F conflict?"

686 msgstr ": kanske en K/F-konflikt?"

687

680 -#: merge-recursive.c:724

688 +#: merge-recursive.c:723

689 #, c-format

690 msgid "refusing to lose untracked file at '%s'"

691 msgstr "vägrar förlora ospårad fil vid \"%s\""

692

685 -#: merge-recursive.c:764

693 +#: merge-recursive.c:763

694 #, c-format

695 msgid "cannot read object %s '%s'"

696 msgstr "kan inte läsa objektet %s: \"%s\""

697

690 -#: merge-recursive.c:766

698 +#: merge-recursive.c:765

699 #, c-format

700 msgid "blob expected for %s '%s'"

701 msgstr "blob förväntades för %s \"%s\""

702

695 -#: merge-recursive.c:789 builtin/clone.c:321

703 +#: merge-recursive.c:788 builtin/clone.c:313

704 #, c-format

705 msgid "failed to open '%s'"

706 msgstr "misslyckades öppna \"%s\""

707

700 -#: merge-recursive.c:797

708 +#: merge-recursive.c:796

709 #, c-format

710 msgid "failed to symlink '%s'"

711 msgstr "misslyckades skapa symboliska länken \"%s\""

712

705 -#: merge-recursive.c:800

713 +#: merge-recursive.c:799

714 #, c-format

715 msgid "do not know what to do with %06o %s '%s'"

716 msgstr "vet inte hur %06o %s \"%s\" skall hanteras"

717

710 -#: merge-recursive.c:938

718 +#: merge-recursive.c:937

719 msgid "Failed to execute internal merge"

720 msgstr "Misslyckades exekvera intern sammanslagning"

721

714 -#: merge-recursive.c:942

722 +#: merge-recursive.c:941

723 #, c-format

724 msgid "Unable to add %s to database"

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

726

719 -#: merge-recursive.c:958

727 +#: merge-recursive.c:957

728 msgid "unsupported object type in the tree"

729 msgstr "objekttyp som ej stöds upptäcktes i trädet"

730

723 -#: merge-recursive.c:1033 merge-recursive.c:1047

731 +#: merge-recursive.c:1032 merge-recursive.c:1046

732 #, c-format

733 msgid ""

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

@@ -729,7 +737,7 @@ msgstr ""

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

738 "i trädet."

739

732 -#: merge-recursive.c:1039 merge-recursive.c:1052

740 +#: merge-recursive.c:1038 merge-recursive.c:1051

741 #, c-format

742 msgid ""

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

@@ -738,20 +746,20 @@ msgstr ""

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

747 "i trädet vid %s."

748

741 -#: merge-recursive.c:1093

749 +#: merge-recursive.c:1092

750 msgid "rename"

751 msgstr "namnbyte"

752

745 -#: merge-recursive.c:1093

753 +#: merge-recursive.c:1092

754 msgid "renamed"

755 msgstr "namnbytt"

756

749 -#: merge-recursive.c:1149

757 +#: merge-recursive.c:1148

758 #, c-format

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

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

761

754 -#: merge-recursive.c:1171

762 +#: merge-recursive.c:1170

763 #, c-format

764 msgid ""

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

@@ -760,144 +768,144 @@ msgstr ""

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

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

770

763 -#: merge-recursive.c:1176

771 +#: merge-recursive.c:1175

772 msgid " (left unresolved)"

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

774

767 -#: merge-recursive.c:1230

775 +#: merge-recursive.c:1229

776 #, c-format

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

778 msgstr ""

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

780

773 -#: merge-recursive.c:1260

781 +#: merge-recursive.c:1259

782 #, c-format

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

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

785

778 -#: merge-recursive.c:1459

786 +#: merge-recursive.c:1458

787 #, c-format

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

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

790

783 -#: merge-recursive.c:1469

791 +#: merge-recursive.c:1468

792 #, c-format

793 msgid "Adding merged %s"

794 msgstr "Lägger till sammanslagen %s"

795

788 -#: merge-recursive.c:1474 merge-recursive.c:1672

796 +#: merge-recursive.c:1473 merge-recursive.c:1671

797 #, c-format

798 msgid "Adding as %s instead"

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

800

793 -#: merge-recursive.c:1525

801 +#: merge-recursive.c:1524

802 #, c-format

803 msgid "cannot read object %s"

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

805

798 -#: merge-recursive.c:1528

806 +#: merge-recursive.c:1527

807 #, c-format

808 msgid "object %s is not a blob"

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

810

803 -#: merge-recursive.c:1576

811 +#: merge-recursive.c:1575

812 msgid "modify"

813 msgstr "ändra"

814

807 -#: merge-recursive.c:1576

815 +#: merge-recursive.c:1575

816 msgid "modified"

817 msgstr "ändrad"

818

811 -#: merge-recursive.c:1586

819 +#: merge-recursive.c:1585

820 msgid "content"

821 msgstr "innehåll"

822

815 -#: merge-recursive.c:1593

823 +#: merge-recursive.c:1592

824 msgid "add/add"

825 msgstr "tillägg/tillägg"

826

819 -#: merge-recursive.c:1627

827 +#: merge-recursive.c:1626

828 #, c-format

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

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

831

824 -#: merge-recursive.c:1641

832 +#: merge-recursive.c:1640

833 #, c-format

834 msgid "Auto-merging %s"

835 msgstr "Slår ihop %s automatiskt"

836

829 -#: merge-recursive.c:1645 git-submodule.sh:1150

837 +#: merge-recursive.c:1644 git-submodule.sh:1150

838 msgid "submodule"

839 msgstr "undermodul"

840

833 -#: merge-recursive.c:1646

841 +#: merge-recursive.c:1645

842 #, c-format

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

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

845

838 -#: merge-recursive.c:1732

846 +#: merge-recursive.c:1731

847 #, c-format

848 msgid "Removing %s"

849 msgstr "Tar bort %s"

850

843 -#: merge-recursive.c:1757

851 +#: merge-recursive.c:1756

852 msgid "file/directory"

853 msgstr "fil/katalog"

854

847 -#: merge-recursive.c:1763

855 +#: merge-recursive.c:1762

856 msgid "directory/file"

857 msgstr "katalog/fil"

858

851 -#: merge-recursive.c:1768

859 +#: merge-recursive.c:1767

860 #, c-format

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

862 msgstr ""

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

864

857 -#: merge-recursive.c:1778

865 +#: merge-recursive.c:1777

866 #, c-format

867 msgid "Adding %s"

868 msgstr "Lägger till %s"

869

862 -#: merge-recursive.c:1795

870 +#: merge-recursive.c:1794

871 msgid "Fatal merge failure, shouldn't happen."

872 msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa."

873

866 -#: merge-recursive.c:1814

874 +#: merge-recursive.c:1813

875 msgid "Already up-to-date!"

876 msgstr "Redan à jour!"

877

870 -#: merge-recursive.c:1823

878 +#: merge-recursive.c:1822

879 #, c-format

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

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

882

875 -#: merge-recursive.c:1853

883 +#: merge-recursive.c:1852

884 #, c-format

885 msgid "Unprocessed path??? %s"

886 msgstr "Obehandlad sökväg??? %s"

887

880 -#: merge-recursive.c:1901

888 +#: merge-recursive.c:1900

889 msgid "Merging:"

890 msgstr "Slår ihop:"

891

884 -#: merge-recursive.c:1914

892 +#: merge-recursive.c:1913

893 #, c-format

894 msgid "found %u common ancestor:"

895 msgid_plural "found %u common ancestors:"

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

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

898

891 -#: merge-recursive.c:1951

899 +#: merge-recursive.c:1950

900 msgid "merge returned no commit"

901 msgstr "sammanslagningen returnerade ingen incheckning"

902

895 -#: merge-recursive.c:2008

903 +#: merge-recursive.c:2007

904 #, c-format

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

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

907

900 -#: merge-recursive.c:2019 builtin/merge.c:667

908 +#: merge-recursive.c:2018 builtin/merge.c:645

909 msgid "Unable to write index."

910 msgstr "Kunde inte skriva indexet."

911

@@ -922,7 +930,7 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"

930 msgid "Bad %s value: '%s'"

931 msgstr "Felaktigt värde på %s: \"%s\""

932

925 -#: object.c:241

933 +#: object.c:242

934 #, c-format

935 msgid "unable to parse object: %s"

936 msgstr "kunde inte tolka objektet: %s"

@@ -1021,11 +1029,11 @@ msgstr ""

1029 msgid "unable to parse --pretty format"

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

1031

1024 -#: progress.c:225

1032 +#: progress.c:236

1033 msgid "done"

1034 msgstr "klart"

1035

1028 -#: read-cache.c:1275

1036 +#: read-cache.c:1295

1037 #, c-format

1038 msgid ""

1039 "index.version set, but the value is invalid.\n"

@@ -1034,7 +1042,7 @@ msgstr ""

1042 "index.version satt, men värdet är ogiltigt.\n"

1043 "Använder version %i"

1044

1037 -#: read-cache.c:1285

1045 +#: read-cache.c:1305

1046 #, c-format

1047 msgid ""

1048 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -1043,51 +1051,93 @@ msgstr ""

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

1052 "Använder version %i"

1053

1046 -#: remote.c:782

1054 +#: remote.c:792

1055 #, c-format

1056 msgid "Cannot fetch both %s and %s to %s"

1057 msgstr "Kan inte hämta både %s och %s till %s"

1058

1051 -#: remote.c:786

1059 +#: remote.c:796

1060 #, c-format

1061 msgid "%s usually tracks %s, not %s"

1062 msgstr "%s spårar vanligtvis %s, inte %s"

1063

1056 -#: remote.c:790

1064 +#: remote.c:800

1065 #, c-format

1066 msgid "%s tracks both %s and %s"

1067 msgstr "%s spårar både %s och %s"

1068

1061 -#: remote.c:798

1069 +#: remote.c:808

1070 msgid "Internal error"

1071 msgstr "Internt fel"

1072

1065 -#: remote.c:1980

1073 +#: remote.c:1723 remote.c:1766

1074 +msgid "HEAD does not point to a branch"

1075 +msgstr "HEAD pekar inte på en gren"

1076 +

1077 +#: remote.c:1732

1078 +#, c-format

1079 +msgid "no such branch: '%s'"

1080 +msgstr "okänd gren: \"%s\""

1081 +

1082 +#: remote.c:1735

1083 +#, c-format

1084 +msgid "no upstream configured for branch '%s'"

1085 +msgstr "ingen standarduppström angiven för grenen \"%s\""

1086 +

1087 +#: remote.c:1741

1088 +#, c-format

1089 +msgid "upstream branch '%s' not stored as a remote-tracking branch"

1090 +msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"

1091 +

1092 +#: remote.c:1756

1093 +#, c-format

1094 +msgid "push destination '%s' on remote '%s' has no local tracking branch"

1095 +msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"

1096 +

1097 +#: remote.c:1771

1098 +#, c-format

1099 +msgid "branch '%s' has no remote for pushing"

1100 +msgstr "grenen \"%s\" har ingen fjärr för \"push\""

1101 +

1102 +#: remote.c:1782

1103 +#, c-format

1104 +msgid "push refspecs for '%s' do not include '%s'"

1105 +msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""

1106 +

1107 +#: remote.c:1795

1108 +msgid "push has no destination (push.default is 'nothing')"

1109 +msgstr "\"push\" har inget mål (push.default är \"ingenting\")"

1110 +

1111 +#: remote.c:1817

1112 +msgid "cannot resolve 'simple' push to a single destination"

1113 +msgstr "\"enkel push\" motsvarar flera olika mål"

1114 +

1115 +#: remote.c:2124

1116 #, c-format

1117 msgid "Your branch is based on '%s', but the upstream is gone.\n"

1118 msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"

1119

1070 -#: remote.c:1984

1120 +#: remote.c:2128

1121 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

1122 msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"

1123

1074 -#: remote.c:1987

1124 +#: remote.c:2131

1125 #, c-format

1126 msgid "Your branch is up-to-date with '%s'.\n"

1127 msgstr "Din gren är à jour med \"%s\".\n"

1128

1079 -#: remote.c:1991

1129 +#: remote.c:2135

1130 #, c-format

1131 msgid "Your branch is ahead of '%s' by %d commit.\n"

1132 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

1133 msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n"

1134 msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"

1135

1086 -#: remote.c:1997

1136 +#: remote.c:2141

1137 msgid " (use \"git push\" to publish your local commits)\n"

1138 msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n"

1139

1090 -#: remote.c:2000

1140 +#: remote.c:2144

1141 #, c-format

1142 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

1143 msgid_plural ""

@@ -1097,11 +1147,11 @@ msgstr[0] ""

1147 msgstr[1] ""

1148 "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"

1149

1100 -#: remote.c:2008

1150 +#: remote.c:2152

1151 msgid " (use \"git pull\" to update your local branch)\n"

1152 msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n"

1153

1104 -#: remote.c:2011

1154 +#: remote.c:2155

1155 #, c-format

1156 msgid ""

1157 "Your branch and '%s' have diverged,\n"

@@ -1116,11 +1166,11 @@ msgstr[1] ""

1166 "Din gren och \"%s\" har divergerat,\n"

1167 "och har %d respektive %d olika incheckningar.\n"

1168

1119 -#: remote.c:2021

1169 +#: remote.c:2165

1170 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

1171 msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"

1172

1123 -#: revision.c:2348

1173 +#: revision.c:2366

1174 msgid "--first-parent is incompatible with --bisect"

1175 msgstr "--first-parent är inkompatibelt med --bisect"

1176

@@ -1137,22 +1187,22 @@ msgstr "dup2(%d,%d) misslyckades"

1187 msgid "failed to sign the push certificate"

1188 msgstr "misslyckades underteckna push-certifikatet"

1189

1140 -#: send-pack.c:356

1190 +#: send-pack.c:378

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

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

1193

1144 -#: send-pack.c:366

1194 +#: send-pack.c:389

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

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

1197

1148 -#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995

1149 -#: builtin/merge.c:1005

1198 +#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1199 +#: builtin/merge.c:983

1200 #, c-format

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

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

1203

1154 -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997

1155 -#: builtin/merge.c:1010

1204 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975

1205 +#: builtin/merge.c:988

1206 #, c-format

1207 msgid "Could not write to '%s'"

1208 msgstr "Kunde inte skriva till \"%s\""

@@ -1350,7 +1400,7 @@ msgstr "kan inte bestämma HEAD"

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

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

1402

1353 -#: sequencer.c:908 builtin/apply.c:4288

1403 +#: sequencer.c:908 builtin/apply.c:4291

1404 #, c-format

1405 msgid "cannot open %s: %s"

1406 msgstr "kan inte öppna %s: %s"

@@ -1392,7 +1442,12 @@ msgstr "Kan inte ångra som första incheckning"

1442 msgid "Can't cherry-pick into empty head"

1443 msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"

1444

1395 -#: sha1_name.c:440

1445 +#: setup.c:243

1446 +#, c-format

1447 +msgid "failed to read %s"

1448 +msgstr "misslyckades läsa %s"

1449 +

1450 +#: sha1_name.c:453

1451 msgid ""

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

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

@@ -1414,25 +1469,6 @@ msgstr ""

1469 "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"

1470 "genom att köra \"git config advice.objectNameWarning false\""

1471

1417 -#: sha1_name.c:1068

1418 -msgid "HEAD does not point to a branch"

1419 -msgstr "HEAD pekar inte på en gren"

1420 -

1421 -#: sha1_name.c:1071

1422 -#, c-format

1423 -msgid "No such branch: '%s'"

1424 -msgstr "Okänd gren: \"%s\""

1425 -

1426 -#: sha1_name.c:1073

1427 -#, c-format

1428 -msgid "No upstream configured for branch '%s'"

1429 -msgstr "Ingen standarduppström angiven för grenen \"%s\""

1430 -

1431 -#: sha1_name.c:1077

1432 -#, c-format

1433 -msgid "Upstream branch '%s' not stored as a remote-tracking branch"

1434 -msgstr "Uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"

1435 -

1472 #: submodule.c:64 submodule.c:98

1473 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

1474 msgstr ""

@@ -1458,12 +1494,7 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s"

1494 msgid "staging updated .gitmodules failed"

1495 msgstr "misslyckades köa uppdaterad .gitmodules"

1496

1461 -#: submodule.c:1109 builtin/init-db.c:371

1462 -#, c-format

1463 -msgid "Could not create git link %s"

1464 -msgstr "Kunde inte skapa gitlänk %s"

1465 -

1466 -#: submodule.c:1120

1497 +#: submodule.c:1115

1498 #, c-format

1499 msgid "Could not set core.worktree in %s"

1500 msgstr "Kunde inte sätta core.worktree i %s"

@@ -1493,7 +1524,7 @@ msgstr "kunde inte läsa indatafilen \"%s\""

1524 msgid "could not read from stdin"

1525 msgstr "Kunde inte läsa från standard in"

1526

1496 -#: unpack-trees.c:202

1527 +#: unpack-trees.c:203

1528 msgid "Checking out files"

1529 msgstr "Checkar ut filer"

1530

@@ -1549,6 +1580,21 @@ msgstr "okänd användare"

1580 msgid "unable to get current working directory"

1581 msgstr "kan inte hämta aktuell arbetskatalog"

1582

1583 +#: wrapper.c:575

1584 +#, c-format

1585 +msgid "could not open %s for writing"

1586 +msgstr "kunde inte öppna %s för skrivning"

1587 +

1588 +#: wrapper.c:587

1589 +#, c-format

1590 +msgid "could not write to %s"

1591 +msgstr "kunde inte skriva till %s"

1592 +

1593 +#: wrapper.c:593

1594 +#, c-format

1595 +msgid "could not close %s"

1596 +msgstr "kunde inte stänga %s"

1597 +

1598 #: wt-status.c:150

1599 msgid "Unmerged paths:"

1600 msgstr "Ej sammanslagna sökvägar:"

@@ -1574,11 +1620,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)

1620 msgid " (use \"git rm <file>...\" to mark resolution)"

1621 msgstr " (använd \"git rm <fil>...\" för att ange lösning)"

1622

1577 -#: wt-status.c:198 wt-status.c:878

1623 +#: wt-status.c:198 wt-status.c:881

1624 msgid "Changes to be committed:"

1625 msgstr "Ändringar att checka in:"

1626

1581 -#: wt-status.c:216 wt-status.c:887

1627 +#: wt-status.c:216 wt-status.c:890

1628 msgid "Changes not staged for commit:"

1629 msgstr "Ändringar ej i incheckningskön:"

1630

@@ -1692,15 +1738,15 @@ msgstr "ospårat innehåll, "

1738 msgid "bug: unhandled diff status %c"

1739 msgstr "programfel: diff-status %c ej hanterad"

1740

1695 -#: wt-status.c:753

1741 +#: wt-status.c:755

1742 msgid "Submodules changed but not updated:"

1743 msgstr "Undermoduler ändrade men inte uppdaterade:"

1744

1699 -#: wt-status.c:755

1745 +#: wt-status.c:757

1746 msgid "Submodule changes to be committed:"

1747 msgstr "Undermodulers ändringar att checka in:"

1748

1703 -#: wt-status.c:835

1749 +#: wt-status.c:838

1750 msgid ""

1751 "Do not touch the line above.\n"

1752 "Everything below will be removed."

@@ -1708,68 +1754,68 @@ msgstr ""

1754 "Rör inte raden ovan.\n"

1755 "Allt nedan kommer tas bort."

1756

1711 -#: wt-status.c:946

1757 +#: wt-status.c:949

1758 msgid "You have unmerged paths."

1759 msgstr "Du har ej sammanslagna sökvägar."

1760

1715 -#: wt-status.c:949

1761 +#: wt-status.c:952

1762 msgid " (fix conflicts and run \"git commit\")"

1763 msgstr " (rätta konflikter och kör \"git commit\")"

1764

1719 -#: wt-status.c:952

1765 +#: wt-status.c:955

1766 msgid "All conflicts fixed but you are still merging."

1767 msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."

1768

1723 -#: wt-status.c:955

1769 +#: wt-status.c:958

1770 msgid " (use \"git commit\" to conclude merge)"

1771 msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"

1772

1727 -#: wt-status.c:965

1773 +#: wt-status.c:968

1774 msgid "You are in the middle of an am session."

1775 msgstr "Du är i mitten av en körning av \"git am\"."

1776

1731 -#: wt-status.c:968

1777 +#: wt-status.c:971

1778 msgid "The current patch is empty."

1779 msgstr "Aktuell patch är tom."

1780

1735 -#: wt-status.c:972

1781 +#: wt-status.c:975

1782 msgid " (fix conflicts and then run \"git am --continue\")"

1783 msgstr " (rätta konflikter och kör sedan \"git am --continue\")"

1784

1739 -#: wt-status.c:974

1785 +#: wt-status.c:977

1786 msgid " (use \"git am --skip\" to skip this patch)"

1787 msgstr " (använd \"git am --skip\" för att hoppa över patchen)"

1788

1743 -#: wt-status.c:976

1789 +#: wt-status.c:979

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

1791 msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"

1792

1747 -#: wt-status.c:1036 wt-status.c:1053

1793 +#: wt-status.c:1039 wt-status.c:1056

1794 #, c-format

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

1796 msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."

1797

1752 -#: wt-status.c:1041 wt-status.c:1058

1798 +#: wt-status.c:1044 wt-status.c:1061

1799 msgid "You are currently rebasing."

1800 msgstr "Du håller på med en ombasering."

1801

1756 -#: wt-status.c:1044

1802 +#: wt-status.c:1047

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

1804 msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"

1805

1760 -#: wt-status.c:1046

1806 +#: wt-status.c:1049

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

1808 msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"

1809

1764 -#: wt-status.c:1048

1810 +#: wt-status.c:1051

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

1812 msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"

1813

1768 -#: wt-status.c:1061

1814 +#: wt-status.c:1064

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

1816 msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"

1817

1772 -#: wt-status.c:1065

1818 +#: wt-status.c:1068

1819 #, c-format

1820 msgid ""

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

@@ -1777,118 +1823,118 @@ msgstr ""

1823 "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "

1824 "ovanpå \"%s\"."

1825

1780 -#: wt-status.c:1070

1826 +#: wt-status.c:1073

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

1828 msgstr "Du håller på att dela upp en incheckning i en ombasering."

1829

1784 -#: wt-status.c:1073

1830 +#: wt-status.c:1076

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

1832 msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"

1833

1788 -#: wt-status.c:1077

1834 +#: wt-status.c:1080

1835 #, c-format

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

1837 msgstr ""

1838 "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "

1839 "ovanpå \"%s\"."

1840

1795 -#: wt-status.c:1082

1841 +#: wt-status.c:1085

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

1843 msgstr "Du håller på att redigera en incheckning under en ombasering."

1844

1799 -#: wt-status.c:1085

1845 +#: wt-status.c:1088

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

1847 msgstr ""

1848 " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"

1849

1804 -#: wt-status.c:1087

1850 +#: wt-status.c:1090

1851 msgid ""

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

1853 msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"

1854

1809 -#: wt-status.c:1097

1855 +#: wt-status.c:1100

1856 #, c-format

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

1858 msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."

1859

1814 -#: wt-status.c:1102

1860 +#: wt-status.c:1105

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

1862 msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"

1863

1818 -#: wt-status.c:1105

1864 +#: wt-status.c:1108

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

1866 msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"

1867

1822 -#: wt-status.c:1107

1868 +#: wt-status.c:1110

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

1870 msgstr ""

1871 " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"

1872 "operationen)"

1873

1828 -#: wt-status.c:1116

1874 +#: wt-status.c:1119

1875 #, c-format

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

1877 msgstr "Du håller på med att ångra incheckningen %s."

1878

1833 -#: wt-status.c:1121

1879 +#: wt-status.c:1124

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

1881 msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"

1882

1837 -#: wt-status.c:1124

1883 +#: wt-status.c:1127

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

1885 msgstr " (alla konflikter rättade: kör \"git revert --continue\")"

1886

1841 -#: wt-status.c:1126

1887 +#: wt-status.c:1129

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

1889 msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"

1890

1845 -#: wt-status.c:1137

1891 +#: wt-status.c:1140

1892 #, c-format

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

1894 msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."

1895

1850 -#: wt-status.c:1141

1896 +#: wt-status.c:1144

1897 msgid "You are currently bisecting."

1898 msgstr "Du håller på med en \"bisect\"."

1899

1854 -#: wt-status.c:1144

1900 +#: wt-status.c:1147

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

1902 msgstr ""

1903 " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"

1904

1859 -#: wt-status.c:1321

1905 +#: wt-status.c:1324

1906 msgid "On branch "

1907 msgstr "På grenen "

1908

1863 -#: wt-status.c:1328

1909 +#: wt-status.c:1331

1910 msgid "rebase in progress; onto "

1911 msgstr "ombasering pågår; ovanpå"

1912

1867 -#: wt-status.c:1333

1913 +#: wt-status.c:1336

1914 msgid "HEAD detached at "

1915 msgstr "HEAD frånkopplad vid "

1916

1871 -#: wt-status.c:1335

1917 +#: wt-status.c:1338

1918 msgid "HEAD detached from "

1919 msgstr "HEAD frånkopplad från "

1920

1875 -#: wt-status.c:1338

1921 +#: wt-status.c:1341

1922 msgid "Not currently on any branch."

1923 msgstr "Inte på någon gren för närvarande."

1924

1879 -#: wt-status.c:1355

1925 +#: wt-status.c:1358

1926 msgid "Initial commit"

1927 msgstr "Första incheckning"

1928

1883 -#: wt-status.c:1369

1929 +#: wt-status.c:1372

1930 msgid "Untracked files"

1931 msgstr "Ospårade filer"

1932

1887 -#: wt-status.c:1371

1933 +#: wt-status.c:1374

1934 msgid "Ignored files"

1935 msgstr "Ignorerade filer"

1936

1891 -#: wt-status.c:1375

1937 +#: wt-status.c:1378

1938 #, c-format

1939 msgid ""

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

@@ -1900,32 +1946,32 @@ msgstr ""

1946 "lägga till nya filer själv (se \"git help status\")."

1947

1948 # %s är nästa sträng eller tom.

1903 -#: wt-status.c:1381

1949 +#: wt-status.c:1384

1950 #, c-format

1951 msgid "Untracked files not listed%s"

1952 msgstr "Ospårade filer visas ej%s"

1953

1908 -#: wt-status.c:1383

1954 +#: wt-status.c:1386

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

1956 msgstr " (använd flaggan -u för att visa ospårade filer)"

1957

1912 -#: wt-status.c:1389

1958 +#: wt-status.c:1392

1959 msgid "No changes"

1960 msgstr "Inga ändringar"

1961

1916 -#: wt-status.c:1394

1962 +#: wt-status.c:1397

1963 #, c-format

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

1965 msgstr ""

1966 "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"

1967 "\")\n"

1968

1923 -#: wt-status.c:1397

1969 +#: wt-status.c:1400

1970 #, c-format

1971 msgid "no changes added to commit\n"

1972 msgstr "inga ändringar att checka in\n"

1973

1928 -#: wt-status.c:1400

1974 +#: wt-status.c:1403

1975 #, c-format

1976 msgid ""

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

@@ -1934,48 +1980,48 @@ msgstr ""

1980 "inget köat för incheckning, men ospårade filer finns (spåra med \"git add"

1981 "\")\n"

1982

1937 -#: wt-status.c:1403

1983 +#: wt-status.c:1406

1984 #, c-format

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

1986 msgstr "inget köat för incheckning, men ospårade filer finns\n"

1987

1942 -#: wt-status.c:1406

1988 +#: wt-status.c:1409

1989 #, c-format

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

1991 msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"

1992

1947 -#: wt-status.c:1409 wt-status.c:1414

1993 +#: wt-status.c:1412 wt-status.c:1417

1994 #, c-format

1995 msgid "nothing to commit\n"

1996 msgstr "inget att checka in\n"

1997

1952 -#: wt-status.c:1412

1998 +#: wt-status.c:1415

1999 #, c-format

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

2001 msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"

2002

1957 -#: wt-status.c:1416

2003 +#: wt-status.c:1419

2004 #, c-format

2005 msgid "nothing to commit, working directory clean\n"

2006 msgstr "inget att checka in, arbetskatalogen ren\n"

2007

1962 -#: wt-status.c:1525

2008 +#: wt-status.c:1528

2009 msgid "HEAD (no branch)"

2010 msgstr "HEAD (ingen gren)"

2011

1966 -#: wt-status.c:1531

2012 +#: wt-status.c:1534

2013 msgid "Initial commit on "

2014 msgstr "Första incheckning på "

2015

1970 -#: wt-status.c:1563

2016 +#: wt-status.c:1561

2017 msgid "gone"

2018 msgstr "försvunnen"

2019

1974 -#: wt-status.c:1565 wt-status.c:1573

2020 +#: wt-status.c:1563 wt-status.c:1571

2021 msgid "behind "

2022 msgstr "efter "

2023

1978 -#: compat/precompose_utf8.c:55 builtin/clone.c:360

2024 +#: compat/precompose_utf8.c:55 builtin/clone.c:352

2025 #, c-format

2026 msgid "failed to unlink '%s'"

2027 msgstr "misslyckades ta bort länken \"%s\""

@@ -2002,7 +2048,7 @@ msgstr "ta bort \"%s\"\n"

2048 msgid "Unstaged changes after refreshing the index:"

2049 msgstr "Ospårade ändringar efter att ha uppdaterat indexet:"

2050

2005 -#: builtin/add.c:194 builtin/rev-parse.c:785

2051 +#: builtin/add.c:194 builtin/rev-parse.c:796

2052 msgid "Could not read the index"

2053 msgstr "Kunde inte läsa indexet"

2054

@@ -2015,113 +2061,117 @@ msgstr "Kunde inte öppna \"%s\" för skrivning"

2061 msgid "Could not write patch"

2062 msgstr "Kunde inte skriva patch"

2063

2018 -#: builtin/add.c:214

2064 +#: builtin/add.c:212

2065 +msgid "editing patch failed"

2066 +msgstr "redigering av patch misslyckades"

2067 +

2068 +#: builtin/add.c:215

2069 #, c-format

2070 msgid "Could not stat '%s'"

2071 msgstr "Kunde inte ta status på \"%s\""

2072

2023 -#: builtin/add.c:216

2073 +#: builtin/add.c:217

2074 msgid "Empty patch. Aborted."

2075 msgstr "Tom patch. Avbryter."

2076

2027 -#: builtin/add.c:221

2077 +#: builtin/add.c:222

2078 #, c-format

2079 msgid "Could not apply '%s'"

2080 msgstr "Kunde inte tillämpa \"%s\""

2081

2032 -#: builtin/add.c:231

2082 +#: builtin/add.c:232

2083 msgid "The following paths are ignored by one of your .gitignore files:\n"

2084 msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"

2085

2036 -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110

2037 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372

2038 -#: builtin/rm.c:269

2086 +#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110

2087 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369

2088 +#: builtin/rm.c:268

2089 msgid "dry run"

2090 msgstr "testkörning"

2091

2042 -#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19

2043 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608

2092 +#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19

2093 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616

2094 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114

2095 msgid "be verbose"

2096 msgstr "var pratsam"

2097

2048 -#: builtin/add.c:251

2098 +#: builtin/add.c:252

2099 msgid "interactive picking"

2100 msgstr "plocka interaktivt"

2101

2052 -#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286

2102 +#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286

2103 msgid "select hunks interactively"

2104 msgstr "välj stycken interaktivt"

2105

2056 -#: builtin/add.c:253

2106 +#: builtin/add.c:254

2107 msgid "edit current diff and apply"

2108 msgstr "redigera aktuell diff och applicera"

2109

2060 -#: builtin/add.c:254

2110 +#: builtin/add.c:255

2111 msgid "allow adding otherwise ignored files"

2112 msgstr "tillåt lägga till annars ignorerade filer"

2113

2064 -#: builtin/add.c:255

2114 +#: builtin/add.c:256

2115 msgid "update tracked files"

2116 msgstr "uppdatera spårade filer"

2117

2068 -#: builtin/add.c:256

2118 +#: builtin/add.c:257

2119 msgid "record only the fact that the path will be added later"

2120 msgstr "registrera endast att sökvägen kommer läggas till senare"

2121

2072 -#: builtin/add.c:257

2122 +#: builtin/add.c:258

2123 msgid "add changes from all tracked and untracked files"

2124 msgstr "lägg till ändringar från alla spårade och ospårade filer"

2125

2076 -#: builtin/add.c:260

2126 +#: builtin/add.c:261

2127 msgid "ignore paths removed in the working tree (same as --no-all)"

2128 msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)"

2129

2080 -#: builtin/add.c:262

2130 +#: builtin/add.c:263

2131 msgid "don't add, only refresh the index"

2132 msgstr "lägg inte till, uppdatera endast indexet"

2133

2084 -#: builtin/add.c:263

2134 +#: builtin/add.c:264

2135 msgid "just skip files which cannot be added because of errors"

2136 msgstr "hoppa bara över filer som inte kan läggas till på grund av fel"

2137

2088 -#: builtin/add.c:264

2138 +#: builtin/add.c:265

2139 msgid "check if - even missing - files are ignored in dry run"

2140 msgstr "se om - även saknade - filer ignoreras i testkörning"

2141

2092 -#: builtin/add.c:286

2142 +#: builtin/add.c:287

2143 #, c-format

2144 msgid "Use -f if you really want to add them.\n"

2145 msgstr "Använd -f om du verkligen vill lägga till dem.\n"

2146

2097 -#: builtin/add.c:293

2147 +#: builtin/add.c:294

2148 msgid "adding files failed"

2149 msgstr "misslyckades lägga till filer"

2150

2101 -#: builtin/add.c:329

2151 +#: builtin/add.c:330

2152 msgid "-A and -u are mutually incompatible"

2153 msgstr "-A och -u är ömsesidigt inkompatibla"

2154

2105 -#: builtin/add.c:336

2155 +#: builtin/add.c:337

2156 msgid "Option --ignore-missing can only be used together with --dry-run"

2157 msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"

2158

2109 -#: builtin/add.c:357

2159 +#: builtin/add.c:358

2160 #, c-format

2161 msgid "Nothing specified, nothing added.\n"

2162 msgstr "Inget angivet, inget tillagt.\n"

2163

2114 -#: builtin/add.c:358

2164 +#: builtin/add.c:359

2165 #, c-format

2166 msgid "Maybe you wanted to say 'git add .'?\n"

2167 msgstr "Kanske menade du att skriva \"git add .\"?\n"

2168

2119 -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920

2120 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299

2169 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918

2170 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2171 msgid "index file corrupt"

2172 msgstr "indexfilen trasig"

2173

2124 -#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431

2174 +#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2175 msgid "Unable to write new index file"

2176 msgstr "Kunde inte skriva ny indexfil"

2177

@@ -2200,77 +2250,77 @@ msgstr[1] ""

2250 "sökvägskomponenter\n"

2251 "tas bort (rad %d)"

2252

2203 -#: builtin/apply.c:1656

2253 +#: builtin/apply.c:1659

2254 msgid "new file depends on old contents"

2255 msgstr "ny fil beror på gammalt innehåll"

2256

2207 -#: builtin/apply.c:1658

2257 +#: builtin/apply.c:1661

2258 msgid "deleted file still has contents"

2259 msgstr "borttagen fil har fortfarande innehåll"

2260

2211 -#: builtin/apply.c:1684

2261 +#: builtin/apply.c:1687

2262 #, c-format

2263 msgid "corrupt patch at line %d"

2264 msgstr "trasig patch på rad %d"

2265

2216 -#: builtin/apply.c:1720

2266 +#: builtin/apply.c:1723

2267 #, c-format

2268 msgid "new file %s depends on old contents"

2269 msgstr "nya filen %s beror på gammalt innehåll"

2270

2221 -#: builtin/apply.c:1722

2271 +#: builtin/apply.c:1725

2272 #, c-format

2273 msgid "deleted file %s still has contents"

2274 msgstr "borttagna filen %s har fortfarande innehåll"

2275

2226 -#: builtin/apply.c:1725

2276 +#: builtin/apply.c:1728

2277 #, c-format

2278 msgid "** warning: file %s becomes empty but is not deleted"

2279 msgstr "** varning: filen %s blir tom men har inte tagits bort"

2280

2231 -#: builtin/apply.c:1871

2281 +#: builtin/apply.c:1874

2282 #, c-format

2283 msgid "corrupt binary patch at line %d: %.*s"

2284 msgstr "trasig binärpatch på rad %d: %.*s"

2285

2236 -#: builtin/apply.c:1900

2286 +#: builtin/apply.c:1903

2287 #, c-format

2288 msgid "unrecognized binary patch at line %d"

2289 msgstr "binärpatchen på rad %d känns inte igen"

2290

2241 -#: builtin/apply.c:2051

2291 +#: builtin/apply.c:2054

2292 #, c-format

2293 msgid "patch with only garbage at line %d"

2294 msgstr "patch med bara skräp på rad %d"

2295

2246 -#: builtin/apply.c:2141

2296 +#: builtin/apply.c:2144

2297 #, c-format

2298 msgid "unable to read symlink %s"

2299 msgstr "kunde inte läsa symboliska länken %s"

2300

2251 -#: builtin/apply.c:2145

2301 +#: builtin/apply.c:2148

2302 #, c-format

2303 msgid "unable to open or read %s"

2304 msgstr "kunde inte öppna eller läsa %s"

2305

2256 -#: builtin/apply.c:2778

2306 +#: builtin/apply.c:2781

2307 #, c-format

2308 msgid "invalid start of line: '%c'"

2309 msgstr "felaktig inledning på rad: \"%c\""

2310

2261 -#: builtin/apply.c:2897

2311 +#: builtin/apply.c:2900

2312 #, c-format

2313 msgid "Hunk #%d succeeded at %d (offset %d line)."

2314 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."

2315 msgstr[0] "Stycke %d lyckades på %d (offset %d rad)."

2316 msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."

2317

2268 -#: builtin/apply.c:2909

2318 +#: builtin/apply.c:2912

2319 #, c-format

2320 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"

2321 msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"

2322

2273 -#: builtin/apply.c:2915

2323 +#: builtin/apply.c:2918

2324 #, c-format

2325 msgid ""

2326 "while searching for:\n"

@@ -2279,336 +2329,336 @@ msgstr ""

2329 "vid sökning efter:\n"

2330 "%.*s"

2331

2282 -#: builtin/apply.c:2935

2332 +#: builtin/apply.c:2938

2333 #, c-format

2334 msgid "missing binary patch data for '%s'"

2335 msgstr "saknar binära patchdata för \"%s\""

2336

2287 -#: builtin/apply.c:3036

2337 +#: builtin/apply.c:3039

2338 #, c-format

2339 msgid "binary patch does not apply to '%s'"

2340 msgstr "binärpatchen kan inte tillämpas på \"%s\""

2341

2292 -#: builtin/apply.c:3042

2342 +#: builtin/apply.c:3045

2343 #, c-format

2344 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"

2345 msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"

2346

2297 -#: builtin/apply.c:3063

2347 +#: builtin/apply.c:3066

2348 #, c-format

2349 msgid "patch failed: %s:%ld"

2350 msgstr "patch misslyckades: %s:%ld"

2351

2302 -#: builtin/apply.c:3187

2352 +#: builtin/apply.c:3190

2353 #, c-format

2354 msgid "cannot checkout %s"

2355 msgstr "kan inte checka ut %s"

2356

2307 -#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288

2357 +#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291

2358 #, c-format

2359 msgid "read of %s failed"

2360 msgstr "misslyckades läsa %s"

2361

2312 -#: builtin/apply.c:3240

2362 +#: builtin/apply.c:3243

2363 #, c-format

2364 msgid "reading from '%s' beyond a symbolic link"

2365 msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"

2366

2317 -#: builtin/apply.c:3268 builtin/apply.c:3490

2367 +#: builtin/apply.c:3271 builtin/apply.c:3493

2368 #, c-format

2369 msgid "path %s has been renamed/deleted"

2370 msgstr "sökvägen %s har ändrat namn/tagits bort"

2371

2322 -#: builtin/apply.c:3349 builtin/apply.c:3504

2372 +#: builtin/apply.c:3352 builtin/apply.c:3507

2373 #, c-format

2374 msgid "%s: does not exist in index"

2375 msgstr "%s: finns inte i indexet"

2376

2327 -#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518

2377 +#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521

2378 #, c-format

2379 msgid "%s: %s"

2380 msgstr "%s: %s"

2381

2332 -#: builtin/apply.c:3358 builtin/apply.c:3512

2382 +#: builtin/apply.c:3361 builtin/apply.c:3515

2383 #, c-format

2384 msgid "%s: does not match index"

2385 msgstr "%s: motsvarar inte indexet"

2386

2337 -#: builtin/apply.c:3460

2387 +#: builtin/apply.c:3463

2388 msgid "removal patch leaves file contents"

2389 msgstr "patch för borttagning lämnar kvar filinnehåll"

2390

2341 -#: builtin/apply.c:3529

2391 +#: builtin/apply.c:3532

2392 #, c-format

2393 msgid "%s: wrong type"

2394 msgstr "%s: fel typ"

2395

2346 -#: builtin/apply.c:3531

2396 +#: builtin/apply.c:3534

2397 #, c-format

2398 msgid "%s has type %o, expected %o"

2399 msgstr "%s har typen %o, förväntade %o"

2400

2351 -#: builtin/apply.c:3690 builtin/apply.c:3692

2401 +#: builtin/apply.c:3693 builtin/apply.c:3695

2402 #, c-format

2403 msgid "invalid path '%s'"

2404 msgstr "ogiltig sökväg: %s"

2405

2356 -#: builtin/apply.c:3747

2406 +#: builtin/apply.c:3750

2407 #, c-format

2408 msgid "%s: already exists in index"

2409 msgstr "%s: finns redan i indexet"

2410

2361 -#: builtin/apply.c:3750

2411 +#: builtin/apply.c:3753

2412 #, c-format

2413 msgid "%s: already exists in working directory"

2414 msgstr "%s: finns redan i arbetskatalogen"

2415

2366 -#: builtin/apply.c:3770

2416 +#: builtin/apply.c:3773

2417 #, c-format

2418 msgid "new mode (%o) of %s does not match old mode (%o)"

2419 msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"

2420

2371 -#: builtin/apply.c:3775

2421 +#: builtin/apply.c:3778

2422 #, c-format

2423 msgid "new mode (%o) of %s does not match old mode (%o) of %s"

2424 msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"

2425

2376 -#: builtin/apply.c:3795

2426 +#: builtin/apply.c:3798

2427 #, c-format

2428 msgid "affected file '%s' is beyond a symbolic link"

2429 msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"

2430

2381 -#: builtin/apply.c:3799

2431 +#: builtin/apply.c:3802

2432 #, c-format

2433 msgid "%s: patch does not apply"

2434 msgstr "%s: patchen kan inte tillämpas"

2435

2386 -#: builtin/apply.c:3813

2436 +#: builtin/apply.c:3816

2437 #, c-format

2438 msgid "Checking patch %s..."

2439 msgstr "Kontrollerar patchen %s..."

2440

2391 -#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135

2441 +#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135

2442 #, c-format

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

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

2445

2396 -#: builtin/apply.c:4049

2446 +#: builtin/apply.c:4052

2447 #, c-format

2448 msgid "unable to remove %s from index"

2449 msgstr "kan inte ta bort %s från indexet"

2450

2401 -#: builtin/apply.c:4078

2451 +#: builtin/apply.c:4081

2452 #, c-format

2453 msgid "corrupt patch for submodule %s"

2454 msgstr "trasig patch för undermodulen %s"

2455

2406 -#: builtin/apply.c:4082

2456 +#: builtin/apply.c:4085

2457 #, c-format

2458 msgid "unable to stat newly created file '%s'"

2459 msgstr "kan inte ta status på nyligen skapade filen \"%s\""

2460

2411 -#: builtin/apply.c:4087

2461 +#: builtin/apply.c:4090

2462 #, c-format

2463 msgid "unable to create backing store for newly created file %s"

2464 msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"

2465

2416 -#: builtin/apply.c:4090 builtin/apply.c:4198

2466 +#: builtin/apply.c:4093 builtin/apply.c:4201

2467 #, c-format

2468 msgid "unable to add cache entry for %s"

2469 msgstr "kan inte lägga till cachepost för %s"

2470

2421 -#: builtin/apply.c:4123

2471 +#: builtin/apply.c:4126

2472 #, c-format

2473 msgid "closing file '%s'"

2474 msgstr "stänger filen \"%s\""

2475

2426 -#: builtin/apply.c:4172

2476 +#: builtin/apply.c:4175

2477 #, c-format

2478 msgid "unable to write file '%s' mode %o"

2479 msgstr "kan inte skriva filen \"%s\" läge %o"

2480

2431 -#: builtin/apply.c:4259

2481 +#: builtin/apply.c:4262

2482 #, c-format

2483 msgid "Applied patch %s cleanly."

2484 msgstr "Tillämpade patchen %s rent."

2485

2436 -#: builtin/apply.c:4267

2486 +#: builtin/apply.c:4270

2487 msgid "internal error"

2488 msgstr "internt fel"

2489

2440 -#: builtin/apply.c:4270

2490 +#: builtin/apply.c:4273

2491 #, c-format

2492 msgid "Applying patch %%s with %d reject..."

2493 msgid_plural "Applying patch %%s with %d rejects..."

2494 msgstr[0] "Tillämpade patchen %%s med %d refuserad..."

2495 msgstr[1] "Tillämpade patchen %%s med %d refuserade..."

2496

2447 -#: builtin/apply.c:4280

2497 +#: builtin/apply.c:4283

2498 #, c-format

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

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

2501

2452 -#: builtin/apply.c:4301

2502 +#: builtin/apply.c:4304

2503 #, c-format

2504 msgid "Hunk #%d applied cleanly."

2505 msgstr "Stycke %d tillämpades rent."

2506

2457 -#: builtin/apply.c:4304

2507 +#: builtin/apply.c:4307

2508 #, c-format

2509 msgid "Rejected hunk #%d."

2510 msgstr "Refuserar stycke %d."

2511

2462 -#: builtin/apply.c:4394

2512 +#: builtin/apply.c:4397

2513 msgid "unrecognized input"

2514 msgstr "indata känns inte igen"

2515

2466 -#: builtin/apply.c:4405

2516 +#: builtin/apply.c:4408

2517 msgid "unable to read index file"

2518 msgstr "kan inte läsa indexfilen"

2519

2470 -#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92

2520 +#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85

2521 #: builtin/fetch.c:92

2522 msgid "path"

2523 msgstr "sökväg"

2524

2475 -#: builtin/apply.c:4523

2525 +#: builtin/apply.c:4526

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

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

2528

2479 -#: builtin/apply.c:4526

2529 +#: builtin/apply.c:4529

2530 msgid "apply changes matching the given path"

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

2532

2483 -#: builtin/apply.c:4528

2533 +#: builtin/apply.c:4531

2534 msgid "num"

2535 msgstr "antal"

2536

2487 -#: builtin/apply.c:4529

2537 +#: builtin/apply.c:4532

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

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

2540

2491 -#: builtin/apply.c:4532

2541 +#: builtin/apply.c:4535

2542 msgid "ignore additions made by the patch"

2543 msgstr "ignorera tillägg gjorda av patchen"

2544

2495 -#: builtin/apply.c:4534

2545 +#: builtin/apply.c:4537

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

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

2548

2499 -#: builtin/apply.c:4538

2549 +#: builtin/apply.c:4541

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

2551 msgstr "visa antal tillagda och borttagna rader decimalt"

2552

2503 -#: builtin/apply.c:4540

2553 +#: builtin/apply.c:4543

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

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

2556

2507 -#: builtin/apply.c:4542

2557 +#: builtin/apply.c:4545

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

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

2560

2511 -#: builtin/apply.c:4544

2561 +#: builtin/apply.c:4547

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

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

2564

2515 -#: builtin/apply.c:4546

2565 +#: builtin/apply.c:4549

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

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

2568

2519 -#: builtin/apply.c:4548

2569 +#: builtin/apply.c:4551

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

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

2572

2523 -#: builtin/apply.c:4550

2573 +#: builtin/apply.c:4553

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

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

2576

2527 -#: builtin/apply.c:4552

2577 +#: builtin/apply.c:4555

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

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

2580

2531 -#: builtin/apply.c:4554

2581 +#: builtin/apply.c:4557

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

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

2584

2535 -#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412

2585 +#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412

2586 msgid "paths are separated with NUL character"

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

2588

2539 -#: builtin/apply.c:4559

2589 +#: builtin/apply.c:4562

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

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

2592

2543 -#: builtin/apply.c:4560

2593 +#: builtin/apply.c:4563

2594 msgid "action"

2595 msgstr "åtgärd"

2596

2547 -#: builtin/apply.c:4561

2597 +#: builtin/apply.c:4564

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

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

2600

2551 -#: builtin/apply.c:4564 builtin/apply.c:4567

2601 +#: builtin/apply.c:4567 builtin/apply.c:4570

2602 msgid "ignore changes in whitespace when finding context"

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

2604

2555 -#: builtin/apply.c:4570

2605 +#: builtin/apply.c:4573

2606 msgid "apply the patch in reverse"

2607 msgstr "tillämpa patchen baklänges"

2608

2559 -#: builtin/apply.c:4572

2609 +#: builtin/apply.c:4575

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

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

2612

2563 -#: builtin/apply.c:4574

2613 +#: builtin/apply.c:4577

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

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

2616

2567 -#: builtin/apply.c:4576

2617 +#: builtin/apply.c:4579

2618 msgid "allow overlapping hunks"

2619 msgstr "tillåt överlappande stycken"

2620

2571 -#: builtin/apply.c:4579

2621 +#: builtin/apply.c:4582

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

2623 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

2624

2575 -#: builtin/apply.c:4582

2625 +#: builtin/apply.c:4585

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

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

2628

2579 -#: builtin/apply.c:4584

2629 +#: builtin/apply.c:4587

2630 msgid "root"

2631 msgstr "rot"

2632

2583 -#: builtin/apply.c:4585

2633 +#: builtin/apply.c:4588

2634 msgid "prepend <root> to all filenames"

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

2636

2587 -#: builtin/apply.c:4607

2637 +#: builtin/apply.c:4610

2638 msgid "--3way outside a repository"

2639 msgstr "--3way utanför arkiv"

2640

2591 -#: builtin/apply.c:4615

2641 +#: builtin/apply.c:4618

2642 msgid "--index outside a repository"

2643 msgstr "--index utanför arkiv"

2644

2595 -#: builtin/apply.c:4618

2645 +#: builtin/apply.c:4621

2646 msgid "--cached outside a repository"

2647 msgstr "--cached utanför arkiv"

2648

2599 -#: builtin/apply.c:4637

2649 +#: builtin/apply.c:4640

2650 #, c-format

2651 msgid "can't open patch '%s'"

2652 msgstr "kan inte öppna patchen \"%s\""

2653

2604 -#: builtin/apply.c:4651

2654 +#: builtin/apply.c:4654

2655 #, c-format

2656 msgid "squelched %d whitespace error"

2657 msgid_plural "squelched %d whitespace errors"

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

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

2660

2611 -#: builtin/apply.c:4657 builtin/apply.c:4667

2661 +#: builtin/apply.c:4660 builtin/apply.c:4670

2662 #, c-format

2663 msgid "%d line adds whitespace errors."

2664 msgid_plural "%d lines add whitespace errors."

@@ -2662,11 +2712,11 @@ msgstr "utför 'git bisect next'"

2712 msgid "update BISECT_HEAD instead of checking out the current commit"

2713 msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning"

2714

2665 -#: builtin/blame.c:30

2666 -msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file"

2667 -msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] fil"

2715 +#: builtin/blame.c:31

2716 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

2717 +msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"

2718

2669 -#: builtin/blame.c:35

2719 +#: builtin/blame.c:36

2720 msgid "<rev-opts> are documented in git-rev-list(1)"

2721 msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"

2722

@@ -2788,7 +2838,7 @@ msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..."

2838 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

2839 msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>"

2840

2791 -#: builtin/branch.c:152

2841 +#: builtin/branch.c:150

2842 #, c-format

2843 msgid ""

2844 "deleting branch '%s' that has been merged to\n"

@@ -2797,7 +2847,7 @@ msgstr ""

2847 "tar bort grenen \"%s\" som har slagits ihop med\n"

2848 " \"%s\", men ännu inte slagits ihop med HEAD."

2849

2800 -#: builtin/branch.c:156

2850 +#: builtin/branch.c:154

2851 #, c-format

2852 msgid ""

2853 "not deleting branch '%s' that is not yet merged to\n"

@@ -2806,12 +2856,12 @@ msgstr ""

2856 "tar inte bort grenen \"%s\" som inte har slagits ihop med\n"

2857 " \"%s\", trots att den har slagits ihop med HEAD."

2858

2809 -#: builtin/branch.c:170

2859 +#: builtin/branch.c:168

2860 #, c-format

2861 msgid "Couldn't look up commit object for '%s'"

2862 msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""

2863

2814 -#: builtin/branch.c:174

2864 +#: builtin/branch.c:172

2865 #, c-format

2866 msgid ""

2867 "The branch '%s' is not fully merged.\n"

@@ -2820,348 +2870,348 @@ msgstr ""

2870 "Grenen \"%s\" har inte slagits samman i sin helhet.\n"

2871 "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."

2872

2823 -#: builtin/branch.c:187

2873 +#: builtin/branch.c:185

2874 msgid "Update of config-file failed"

2875 msgstr "Misslyckades uppdatera konfigurationsfil"

2876

2827 -#: builtin/branch.c:215

2877 +#: builtin/branch.c:213

2878 msgid "cannot use -a with -d"

2879 msgstr "kan inte ange -a med -d"

2880

2831 -#: builtin/branch.c:221

2881 +#: builtin/branch.c:219

2882 msgid "Couldn't look up commit object for HEAD"

2883 msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"

2884

2835 -#: builtin/branch.c:229

2885 +#: builtin/branch.c:227

2886 #, c-format

2887 msgid "Cannot delete the branch '%s' which you are currently on."

2888 msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande."

2889

2840 -#: builtin/branch.c:245

2890 +#: builtin/branch.c:243

2891 #, c-format

2842 -msgid "remote branch '%s' not found."

2843 -msgstr "fjärrgrenen \"%s\" hittades inte."

2892 +msgid "remote-tracking branch '%s' not found."

2893 +msgstr "fjärrspårande grenen \"%s\" hittades inte."

2894

2845 -#: builtin/branch.c:246

2895 +#: builtin/branch.c:244

2896 #, c-format

2897 msgid "branch '%s' not found."

2898 msgstr "grenen \"%s\" hittades inte."

2899

2850 -#: builtin/branch.c:260

2900 +#: builtin/branch.c:258

2901 #, c-format

2852 -msgid "Error deleting remote branch '%s'"

2853 -msgstr "Fel vid borttagning av fjärrgrenen \"%s\""

2902 +msgid "Error deleting remote-tracking branch '%s'"

2903 +msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""

2904

2855 -#: builtin/branch.c:261

2905 +#: builtin/branch.c:259

2906 #, c-format

2907 msgid "Error deleting branch '%s'"

2908 msgstr "Fel vid borttagning av grenen \"%s\""

2909

2860 -#: builtin/branch.c:268

2910 +#: builtin/branch.c:266

2911 #, c-format

2862 -msgid "Deleted remote branch %s (was %s).\n"

2863 -msgstr "Tog bort fjärrgrenen %s (var %s).\n"

2912 +msgid "Deleted remote-tracking branch %s (was %s).\n"

2913 +msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"

2914

2865 -#: builtin/branch.c:269

2915 +#: builtin/branch.c:267

2916 #, c-format

2917 msgid "Deleted branch %s (was %s).\n"

2918 msgstr "Tog bort grenen %s (var %s).\n"

2919

2870 -#: builtin/branch.c:370

2920 +#: builtin/branch.c:368

2921 #, c-format

2922 msgid "branch '%s' does not point at a commit"

2923 msgstr "grenen \"%s\" pekar inte på en incheckning"

2924

2875 -#: builtin/branch.c:459

2925 +#: builtin/branch.c:451

2926 #, c-format

2927 msgid "[%s: gone]"

2928 msgstr "[%s: försvunnen]"

2929

2880 -#: builtin/branch.c:464

2930 +#: builtin/branch.c:456

2931 #, c-format

2932 msgid "[%s]"

2933 msgstr "[%s]"

2934

2885 -#: builtin/branch.c:469

2935 +#: builtin/branch.c:461

2936 #, c-format

2937 msgid "[%s: behind %d]"

2938 msgstr "[%s: bakom %d] "

2939

2890 -#: builtin/branch.c:471

2940 +#: builtin/branch.c:463

2941 #, c-format

2942 msgid "[behind %d]"

2943 msgstr "[bakom %d] "

2944

2895 -#: builtin/branch.c:475

2945 +#: builtin/branch.c:467

2946 #, c-format

2947 msgid "[%s: ahead %d]"

2948 msgstr "[%s: före %d] "

2949

2900 -#: builtin/branch.c:477

2950 +#: builtin/branch.c:469

2951 #, c-format

2952 msgid "[ahead %d]"

2953 msgstr "[före %d] "

2954

2905 -#: builtin/branch.c:480

2955 +#: builtin/branch.c:472

2956 #, c-format

2957 msgid "[%s: ahead %d, behind %d]"

2958 msgstr "[%s: före %d, bakom %d] "

2959

2910 -#: builtin/branch.c:483

2960 +#: builtin/branch.c:475

2961 #, c-format

2962 msgid "[ahead %d, behind %d]"

2963 msgstr "[före %d, bakom %d] "

2964

2915 -#: builtin/branch.c:496

2965 +#: builtin/branch.c:488

2966 msgid " **** invalid ref ****"

2967 msgstr " **** ogiltig ref ****"

2968

2919 -#: builtin/branch.c:587

2969 +#: builtin/branch.c:579

2970 #, c-format

2971 msgid "(no branch, rebasing %s)"

2972 msgstr "(ingen gren, ombaserar %s)"

2973

2924 -#: builtin/branch.c:590

2974 +#: builtin/branch.c:582

2975 #, c-format

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

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

2978

2929 -#: builtin/branch.c:596

2979 +#: builtin/branch.c:588

2980 #, c-format

2981 msgid "(HEAD detached at %s)"

2982 msgstr "(HEAD frånkopplat vid %s)"

2983

2934 -#: builtin/branch.c:599

2984 +#: builtin/branch.c:591

2985 #, c-format

2986 msgid "(HEAD detached from %s)"

2987 msgstr "(HEAD frånkopplat från %s)"

2988

2939 -#: builtin/branch.c:603

2989 +#: builtin/branch.c:595

2990 msgid "(no branch)"

2991 msgstr "(ingen gren)"

2992

2943 -#: builtin/branch.c:650

2993 +#: builtin/branch.c:642

2994 #, c-format

2995 msgid "object '%s' does not point to a commit"

2996 msgstr "objektet \"%s\" pekar på en incheckning"

2997

2948 -#: builtin/branch.c:698

2998 +#: builtin/branch.c:690

2999 msgid "some refs could not be read"

3000 msgstr "vissa referenser kunde inte läsas"

3001

2952 -#: builtin/branch.c:711

3002 +#: builtin/branch.c:703

3003 msgid "cannot rename the current branch while not on any."

3004 msgstr ""

3005 "kunde inte byta namn på aktuell gren när du inte befinner dig på någon."

3006

2957 -#: builtin/branch.c:721

3007 +#: builtin/branch.c:713

3008 #, c-format

3009 msgid "Invalid branch name: '%s'"

3010 msgstr "Felaktigt namn på gren: \"%s\""

3011

2962 -#: builtin/branch.c:736

3012 +#: builtin/branch.c:728

3013 msgid "Branch rename failed"

3014 msgstr "Misslyckades byta namn på gren"

3015

2966 -#: builtin/branch.c:740

3016 +#: builtin/branch.c:732

3017 #, c-format

3018 msgid "Renamed a misnamed branch '%s' away"

3019 msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""

3020

2971 -#: builtin/branch.c:744

3021 +#: builtin/branch.c:736

3022 #, c-format

3023 msgid "Branch renamed to %s, but HEAD is not updated!"

3024 msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"

3025

2976 -#: builtin/branch.c:751

3026 +#: builtin/branch.c:743

3027 msgid "Branch is renamed, but update of config-file failed"

3028 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

3029

2980 -#: builtin/branch.c:766

3030 +#: builtin/branch.c:758

3031 #, c-format

3032 msgid "malformed object name %s"

3033 msgstr "felformat objektnamn %s"

3034

2985 -#: builtin/branch.c:790

3035 +#: builtin/branch.c:780

3036 #, c-format

3037 msgid "could not write branch description template: %s"

3038 msgstr "kunde inte skriva grenbeskrivningsmall: %s"

3039

2990 -#: builtin/branch.c:820

3040 +#: builtin/branch.c:810

3041 msgid "Generic options"

3042 msgstr "Allmänna flaggor"

3043

2994 -#: builtin/branch.c:822

3044 +#: builtin/branch.c:812

3045 msgid "show hash and subject, give twice for upstream branch"

3046 msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"

3047

2998 -#: builtin/branch.c:823

3048 +#: builtin/branch.c:813

3049 msgid "suppress informational messages"

3050 msgstr "undertryck informationsmeddelanden"

3051

3002 -#: builtin/branch.c:824

3052 +#: builtin/branch.c:814

3053 msgid "set up tracking mode (see git-pull(1))"

3054 msgstr "ställ in spårningsläge (se git-pull(1))"

3055

3006 -#: builtin/branch.c:826

3056 +#: builtin/branch.c:816

3057 msgid "change upstream info"

3058 msgstr "ändra uppströmsinformation"

3059

3010 -#: builtin/branch.c:830

3060 +#: builtin/branch.c:820

3061 msgid "use colored output"

3062 msgstr "använd färgad utdata"

3063

3014 -#: builtin/branch.c:831

3064 +#: builtin/branch.c:821

3065 msgid "act on remote-tracking branches"

3066 msgstr "arbeta på fjärrspårande grenar"

3067

3018 -#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861

3019 -#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583

3020 -#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616

3068 +#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851

3069 +#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582

3070 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616

3071 #: builtin/tag.c:622

3072 msgid "commit"

3073 msgstr "incheckning"

3074

3025 -#: builtin/branch.c:835 builtin/branch.c:841

3075 +#: builtin/branch.c:825 builtin/branch.c:831

3076 msgid "print only branches that contain the commit"

3077 msgstr "visa endast grenar som innehåller incheckningen"

3078

3029 -#: builtin/branch.c:847

3079 +#: builtin/branch.c:837

3080 msgid "Specific git-branch actions:"

3081 msgstr "Specifika git-branch-åtgärder:"

3082

3033 -#: builtin/branch.c:848

3083 +#: builtin/branch.c:838

3084 msgid "list both remote-tracking and local branches"

3085 msgstr "visa både fjärrspårande och lokala grenar"

3086

3037 -#: builtin/branch.c:850

3087 +#: builtin/branch.c:840

3088 msgid "delete fully merged branch"

3089 msgstr "ta bort helt sammanslagen gren"

3090

3041 -#: builtin/branch.c:851

3091 +#: builtin/branch.c:841

3092 msgid "delete branch (even if not merged)"

3093 msgstr "ta bort gren (även om inte helt sammanslagen)"

3094

3045 -#: builtin/branch.c:852

3095 +#: builtin/branch.c:842

3096 msgid "move/rename a branch and its reflog"

3097 msgstr "flytta/ta bort en gren och dess reflogg"

3098

3049 -#: builtin/branch.c:853

3099 +#: builtin/branch.c:843

3100 msgid "move/rename a branch, even if target exists"

3101 msgstr "flytta/ta bort en gren, även om målet finns"

3102

3053 -#: builtin/branch.c:854

3103 +#: builtin/branch.c:844

3104 msgid "list branch names"

3105 msgstr "lista namn på grenar"

3106

3057 -#: builtin/branch.c:855

3107 +#: builtin/branch.c:845

3108 msgid "create the branch's reflog"

3109 msgstr "skapa grenens reflogg"

3110

3061 -#: builtin/branch.c:857

3111 +#: builtin/branch.c:847

3112 msgid "edit the description for the branch"

3113 msgstr "redigera beskrivning för grenen"

3114

3065 -#: builtin/branch.c:858

3115 +#: builtin/branch.c:848

3116 msgid "force creation, move/rename, deletion"

3117 msgstr "tvinga skapande, flytt/namnändring, borttagande"

3118

3069 -#: builtin/branch.c:861

3119 +#: builtin/branch.c:851

3120 msgid "print only not merged branches"

3121 msgstr "visa endast ej sammanslagna grenar"

3122

3073 -#: builtin/branch.c:867

3123 +#: builtin/branch.c:857

3124 msgid "print only merged branches"

3125 msgstr "visa endast sammanslagna grenar"

3126

3077 -#: builtin/branch.c:871

3127 +#: builtin/branch.c:861

3128 msgid "list branches in columns"

3129 msgstr "visa grenar i spalter"

3130

3081 -#: builtin/branch.c:884

3131 +#: builtin/branch.c:874

3132 msgid "Failed to resolve HEAD as a valid ref."

3133 msgstr "Misslyckades slå upp HEAD som giltig referens"

3134

3085 -#: builtin/branch.c:888 builtin/clone.c:637

3135 +#: builtin/branch.c:878 builtin/clone.c:629

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

3137 msgstr "HEAD hittades inte under refs/heads!"

3138

3089 -#: builtin/branch.c:910

3139 +#: builtin/branch.c:900

3140 msgid "--column and --verbose are incompatible"

3141 msgstr "--column och --verbose är inkompatibla"

3142

3093 -#: builtin/branch.c:921 builtin/branch.c:960

3143 +#: builtin/branch.c:911 builtin/branch.c:950

3144 msgid "branch name required"

3145 msgstr "grennamn krävs"

3146

3097 -#: builtin/branch.c:936

3147 +#: builtin/branch.c:926

3148 msgid "Cannot give description to detached HEAD"

3149 msgstr "Kan inte beskriva frånkopplad HEAD"

3150

3101 -#: builtin/branch.c:941

3151 +#: builtin/branch.c:931

3152 msgid "cannot edit description of more than one branch"

3153 msgstr "kan inte redigera beskrivning för mer än en gren"

3154

3105 -#: builtin/branch.c:948

3155 +#: builtin/branch.c:938

3156 #, c-format

3157 msgid "No commit on branch '%s' yet."

3158 msgstr "Inga incheckningar på grenen \"%s\" ännu"

3159

3110 -#: builtin/branch.c:951

3160 +#: builtin/branch.c:941

3161 #, c-format

3162 msgid "No branch named '%s'."

3163 msgstr "Ingen gren vid namnet \"%s\"."

3164

3115 -#: builtin/branch.c:966

3165 +#: builtin/branch.c:956

3166 msgid "too many branches for a rename operation"

3167 msgstr "för många grenar för namnbyte"

3168

3119 -#: builtin/branch.c:971

3169 +#: builtin/branch.c:961

3170 msgid "too many branches to set new upstream"

3171 msgstr "för många grenar för att byta uppström"

3172

3123 -#: builtin/branch.c:975

3173 +#: builtin/branch.c:965

3174 #, c-format

3175 msgid ""

3176 "could not set upstream of HEAD to %s when it does not point to any branch."

3177 msgstr ""

3178 "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."

3179

3130 -#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021

3180 +#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011

3181 #, c-format

3182 msgid "no such branch '%s'"

3183 msgstr "okänd gren \"%s\""

3184

3135 -#: builtin/branch.c:982

3185 +#: builtin/branch.c:972

3186 #, c-format

3187 msgid "branch '%s' does not exist"

3188 msgstr "grenen \"%s\" finns inte"

3189

3140 -#: builtin/branch.c:994

3190 +#: builtin/branch.c:984

3191 msgid "too many branches to unset upstream"

3192 msgstr "för många grenar för att ta bort uppström"

3193

3144 -#: builtin/branch.c:998

3194 +#: builtin/branch.c:988

3195 msgid "could not unset upstream of HEAD when it does not point to any branch."

3196 msgstr ""

3197 "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."

3198

3149 -#: builtin/branch.c:1004

3199 +#: builtin/branch.c:994

3200 #, c-format

3201 msgid "Branch '%s' has no upstream information"

3202 msgstr "Grenen \"%s\" har ingen uppströmsinformation"

3203

3154 -#: builtin/branch.c:1018

3204 +#: builtin/branch.c:1008

3205 msgid "it does not make sense to create 'HEAD' manually"

3206 msgstr "kan inte skapa \"HEAD\" manuellt"

3207

3158 -#: builtin/branch.c:1024

3208 +#: builtin/branch.c:1014

3209 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

3210 msgstr ""

3211 "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "

3212 "grennamn"

3213

3164 -#: builtin/branch.c:1027

3214 +#: builtin/branch.c:1017

3215 #, c-format

3216 msgid ""

3217 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -3170,7 +3220,7 @@ msgstr ""

3220 "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "

3221 "eller --set-upstream-to\n"

3222

3173 -#: builtin/branch.c:1044

3223 +#: builtin/branch.c:1034

3224 #, c-format

3225 msgid ""

3226 "\n"

@@ -3181,69 +3231,85 @@ msgstr ""

3231 "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"

3232 "\n"

3233

3184 -#: builtin/branch.c:1045

3234 +#: builtin/branch.c:1035

3235 #, c-format

3236 msgid " git branch -d %s\n"

3237 msgstr " git branch -d %s\n"

3238

3189 -#: builtin/branch.c:1046

3239 +#: builtin/branch.c:1036

3240 #, c-format

3241 msgid " git branch --set-upstream-to %s\n"

3242 msgstr " git branch --set-upstream-to %s\n"

3243

3194 -#: builtin/bundle.c:47

3244 +#: builtin/bundle.c:51

3245 #, c-format

3246 msgid "%s is okay\n"

3247 msgstr "%s är okej\n"

3248

3199 -#: builtin/bundle.c:56

3249 +#: builtin/bundle.c:64

3250 msgid "Need a repository to create a bundle."

3251 msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."

3252

3203 -#: builtin/bundle.c:60

3253 +#: builtin/bundle.c:68

3254 msgid "Need a repository to unbundle."

3255 msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."

3256

3207 -#: builtin/cat-file.c:326

3208 -msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>"

3209 -msgstr "git cat-file (-t | -s | -e | -p | <typ> | --textconv) <objekt>"

3257 +#: builtin/cat-file.c:369

3258 +msgid ""

3259 +"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"

3260 +"<type>|--textconv) <object>"

3261 +msgstr ""

3262 +"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"

3263 +"<typ>|--textconv) <objekt>"

3264

3211 -#: builtin/cat-file.c:327

3212 -msgid "git cat-file (--batch | --batch-check) < <list-of-objects>"

3213 -msgstr "git cat-file (--batch | --batch-check) < <objektlista>"

3265 +#: builtin/cat-file.c:370

3266 +msgid ""

3267 +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"

3268 +"objects>"

3269 +msgstr ""

3270 +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <objektlista>"

3271

3215 -#: builtin/cat-file.c:364

3272 +#: builtin/cat-file.c:407

3273 msgid "<type> can be one of: blob, tree, commit, tag"

3274 msgstr "<typ> kan vara en av: blob, tree, commit, tag"

3275

3219 -#: builtin/cat-file.c:365

3276 +#: builtin/cat-file.c:408

3277 msgid "show object type"

3278 msgstr "visa objekttyp"

3279

3223 -#: builtin/cat-file.c:366

3280 +#: builtin/cat-file.c:409

3281 msgid "show object size"

3282 msgstr "visa objektstorlek"

3283

3227 -#: builtin/cat-file.c:368

3284 +#: builtin/cat-file.c:411

3285 msgid "exit with zero when there's no error"

3286 msgstr "avsluta med noll när det inte uppstått något fel"

3287

3231 -#: builtin/cat-file.c:369

3288 +#: builtin/cat-file.c:412

3289 msgid "pretty-print object's content"

3290 msgstr "visa objektets innehåll snyggt"

3291

3235 -#: builtin/cat-file.c:371

3292 +#: builtin/cat-file.c:414

3293 msgid "for blob objects, run textconv on object's content"

3294 msgstr "för blob-objekt, kör textconv på objektets innehåll"

3295

3239 -#: builtin/cat-file.c:373

3296 +#: builtin/cat-file.c:416

3297 +msgid "allow -s and -t to work with broken/corrupt objects"

3298 +msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt"

3299 +

3300 +#: builtin/cat-file.c:418

3301 msgid "show info and content of objects fed from the standard input"

3302 msgstr "visa information och innehåll för objekt som listas på standard in"

3303

3243 -#: builtin/cat-file.c:376

3304 +#: builtin/cat-file.c:421

3305 msgid "show info about objects fed from the standard input"

3306 msgstr "visa information för objekt som listas på standard in"

3307

3308 +#: builtin/cat-file.c:424

3309 +msgid "follow in-tree symlinks (used with --batch or --batch-check)"

3310 +msgstr ""

3311 +"följ symboliska länkar i trädet (använd med --batch eller --batch-check)"

3312 +

3313 #: builtin/check-attr.c:11

3314 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."

3315 msgstr "git check-attr [-a | --all | <attr>...] [--] <sökväg>..."

@@ -3260,7 +3326,7 @@ msgstr "visa alla attribut som satts på filen"

3326 msgid "use .gitattributes only from the index"

3327 msgstr "använd .gitattributes endast från indexet"

3328

3263 -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98

3329 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96

3330 msgid "read file names from stdin"

3331 msgstr "läs filnamn från standard in"

3332

@@ -3268,7 +3334,7 @@ msgstr "läs filnamn från standard in"

3334 msgid "terminate input and output records by a NUL character"

3335 msgstr "avsluta in- och utdataposter med NUL-tecken"

3336

3271 -#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274

3337 +#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279

3338 msgid "suppress progress reporting"

3339 msgstr "undertryck förloppsrapportering"

3340

@@ -3365,113 +3431,113 @@ msgstr "när filer skapas, lägg till <sträng> först"

3431 msgid "copy out the files from named stage"

3432 msgstr "kopiera ut filer från namngiven etapp"

3433

3368 -#: builtin/checkout.c:25

3434 +#: builtin/checkout.c:26

3435 msgid "git checkout [<options>] <branch>"

3436 msgstr "git checkout [<flaggor>] <gren>"

3437

3372 -#: builtin/checkout.c:26

3438 +#: builtin/checkout.c:27

3439 msgid "git checkout [<options>] [<branch>] -- <file>..."

3440 msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..."

3441

3376 -#: builtin/checkout.c:132 builtin/checkout.c:165

3442 +#: builtin/checkout.c:138 builtin/checkout.c:171

3443 #, c-format

3444 msgid "path '%s' does not have our version"

3445 msgstr "sökvägen \"%s\" har inte vår version"

3446

3381 -#: builtin/checkout.c:134 builtin/checkout.c:167

3447 +#: builtin/checkout.c:140 builtin/checkout.c:173

3448 #, c-format

3449 msgid "path '%s' does not have their version"

3450 msgstr "sökvägen \"%s\" har inte deras version"

3451

3386 -#: builtin/checkout.c:150

3452 +#: builtin/checkout.c:156

3453 #, c-format

3454 msgid "path '%s' does not have all necessary versions"

3455 msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"

3456

3391 -#: builtin/checkout.c:194

3457 +#: builtin/checkout.c:200

3458 #, c-format

3459 msgid "path '%s' does not have necessary versions"

3460 msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"

3461

3396 -#: builtin/checkout.c:211

3462 +#: builtin/checkout.c:217

3463 #, c-format

3464 msgid "path '%s': cannot merge"

3465 msgstr "sökväg \"%s\": kan inte slå ihop"

3466

3401 -#: builtin/checkout.c:228

3467 +#: builtin/checkout.c:234

3468 #, c-format

3469 msgid "Unable to add merge result for '%s'"

3470 msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""

3471

3406 -#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255

3407 -#: builtin/checkout.c:258

3472 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261

3473 +#: builtin/checkout.c:264 builtin/checkout.c:277

3474 #, c-format

3475 msgid "'%s' cannot be used with updating paths"

3476 msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"

3477

3412 -#: builtin/checkout.c:261 builtin/checkout.c:264

3478 +#: builtin/checkout.c:267 builtin/checkout.c:270

3479 #, c-format

3480 msgid "'%s' cannot be used with %s"

3481 msgstr "\"%s\" kan inte användas med %s"

3482

3417 -#: builtin/checkout.c:267

3483 +#: builtin/checkout.c:273

3484 #, c-format

3485 msgid "Cannot update paths and switch to branch '%s' at the same time."

3486 msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."

3487

3422 -#: builtin/checkout.c:278 builtin/checkout.c:467

3488 +#: builtin/checkout.c:287 builtin/checkout.c:481

3489 msgid "corrupt index file"

3490 msgstr "indexfilen är trasig"

3491

3426 -#: builtin/checkout.c:338 builtin/checkout.c:345

3492 +#: builtin/checkout.c:347 builtin/checkout.c:354

3493 #, c-format

3494 msgid "path '%s' is unmerged"

3495 msgstr "sökvägen \"%s\" har inte slagits ihop"

3496

3431 -#: builtin/checkout.c:489

3497 +#: builtin/checkout.c:503

3498 msgid "you need to resolve your current index first"

3499 msgstr "du måste lösa ditt befintliga index först"

3500

3435 -#: builtin/checkout.c:615

3501 +#: builtin/checkout.c:634

3502 #, c-format

3503 msgid "Can not do reflog for '%s'\n"

3504 msgstr "Kan inte skapa referenslog för \"%s\"\n"

3505

3440 -#: builtin/checkout.c:653

3506 +#: builtin/checkout.c:670

3507 msgid "HEAD is now at"

3508 msgstr "HEAD är nu på"

3509

3444 -#: builtin/checkout.c:660

3510 +#: builtin/checkout.c:677

3511 #, c-format

3512 msgid "Reset branch '%s'\n"

3513 msgstr "Återställ gren \"%s\"\n"

3514

3449 -#: builtin/checkout.c:663

3515 +#: builtin/checkout.c:680

3516 #, c-format

3517 msgid "Already on '%s'\n"

3518 msgstr "Redan på \"%s\"\n"

3519

3454 -#: builtin/checkout.c:667

3520 +#: builtin/checkout.c:684

3521 #, c-format

3522 msgid "Switched to and reset branch '%s'\n"

3523 msgstr "Växlade till och nollställde grenen \"%s\"\n"

3524

3459 -#: builtin/checkout.c:669 builtin/checkout.c:1050

3525 +#: builtin/checkout.c:686 builtin/checkout.c:1285

3526 #, c-format

3527 msgid "Switched to a new branch '%s'\n"

3528 msgstr "Växlade till en ny gren \"%s\"\n"

3529

3464 -#: builtin/checkout.c:671

3530 +#: builtin/checkout.c:688

3531 #, c-format

3532 msgid "Switched to branch '%s'\n"

3533 msgstr "Växlade till grenen \"%s\"\n"

3534

3469 -#: builtin/checkout.c:723

3535 +#: builtin/checkout.c:740

3536 #, c-format

3537 msgid " ... and %d more.\n"

3538 msgstr " ... och %d till.\n"

3539

3474 -#: builtin/checkout.c:729

3540 +#: builtin/checkout.c:746

3541 #, c-format

3542 msgid ""

3543 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3494,154 +3560,205 @@ msgstr[1] ""

3560 "\n"

3561 "%s\n"

3562

3497 -#: builtin/checkout.c:747

3563 +#: builtin/checkout.c:765

3564 #, c-format

3565 msgid ""

3566 +"If you want to keep it by creating a new branch, this may be a good time\n"

3567 +"to do so with:\n"

3568 +"\n"

3569 +" git branch <new-branch-name> %s\n"

3570 +"\n"

3571 +msgid_plural ""

3572 "If you want to keep them by creating a new branch, this may be a good time\n"

3573 "to do so with:\n"

3574 "\n"

3575 " git branch <new-branch-name> %s\n"

3576 "\n"

3505 -msgstr ""

3577 +msgstr[0] ""

3578 +"Om du vill behålla den genom att skapa en ny gren är nu en bra tidpunkt\n"

3579 +"att göra så, med:\n"

3580 +"\n"

3581 +" git branch <nytt_grennamn> %s\n"

3582 +"\n"

3583 +msgstr[1] ""

3584 "Om du vill behålla dem genom att skapa en ny gren är nu en bra tidpunkt\n"

3585 "att göra så, med:\n"

3586 "\n"

3587 " git branch <nytt_grennamn> %s\n"

3588 "\n"

3589

3512 -#: builtin/checkout.c:777

3590 +#: builtin/checkout.c:801

3591 msgid "internal error in revision walk"

3592 msgstr "internt fel vid genomgång av revisioner (revision walk)"

3593

3516 -#: builtin/checkout.c:781

3594 +#: builtin/checkout.c:805

3595 msgid "Previous HEAD position was"

3596 msgstr "Tidigare position för HEAD var"

3597

3520 -#: builtin/checkout.c:808 builtin/checkout.c:1045

3598 +#: builtin/checkout.c:832 builtin/checkout.c:1280

3599 msgid "You are on a branch yet to be born"

3600 msgstr "Du är på en gren som ännu inte är född"

3601

3524 -#: builtin/checkout.c:952

3602 +#: builtin/checkout.c:893

3603 +msgid "no branch specified"

3604 +msgstr "inget grennamn angavs"

3605 +

3606 +#: builtin/checkout.c:895

3607 +#, c-format

3608 +msgid "'%s' already exists"

3609 +msgstr "\"%s\" finns redan"

3610 +

3611 +#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842

3612 +#: builtin/clone.c:853

3613 +#, c-format

3614 +msgid "could not create leading directories of '%s'"

3615 +msgstr "kunde inte skapa inledande kataloger för \"%s\""

3616 +

3617 +#: builtin/checkout.c:924

3618 +#, c-format

3619 +msgid "could not create directory of '%s'"

3620 +msgstr "kunde inte skapa katalogen \"%s\""

3621 +

3622 +#: builtin/checkout.c:960

3623 +#, c-format

3624 +msgid "Enter %s (identifier %s)"

3625 +msgstr "Går in i %s (identifieraren %s)"

3626 +

3627 +#: builtin/checkout.c:1070

3628 +#, c-format

3629 +msgid "'%s' is already checked out at '%s'"

3630 +msgstr "\"%s\" är redan utcheckad på \"%s\""

3631 +

3632 +#: builtin/checkout.c:1176

3633 #, c-format

3634 msgid "only one reference expected, %d given."

3635 msgstr "endast en referens förväntades, %d gavs."

3636

3529 -#: builtin/checkout.c:991

3637 +#: builtin/checkout.c:1215

3638 #, c-format

3639 msgid "invalid reference: %s"

3640 msgstr "felaktig referens: %s"

3641

3534 -#: builtin/checkout.c:1020

3642 +#: builtin/checkout.c:1255

3643 #, c-format

3644 msgid "reference is not a tree: %s"

3645 msgstr "referensen är inte ett träd: %s"

3646

3539 -#: builtin/checkout.c:1059

3647 +#: builtin/checkout.c:1294

3648 msgid "paths cannot be used with switching branches"

3649 msgstr "sökvägar kan inte användas vid byte av gren"

3650

3543 -#: builtin/checkout.c:1062 builtin/checkout.c:1066

3651 +#: builtin/checkout.c:1297 builtin/checkout.c:1301

3652 #, c-format

3653 msgid "'%s' cannot be used with switching branches"

3654 msgstr "\"%s\" kan inte användas vid byte av gren"

3655

3548 -#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078

3549 -#: builtin/checkout.c:1081

3656 +#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313

3657 +#: builtin/checkout.c:1316

3658 #, c-format

3659 msgid "'%s' cannot be used with '%s'"

3660 msgstr "\"%s\" kan inte användas med \"%s\""

3661

3554 -#: builtin/checkout.c:1086

3662 +#: builtin/checkout.c:1321

3663 #, c-format

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

3665 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""

3666

3559 -#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90

3667 +#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83

3668 #: builtin/remote.c:159 builtin/remote.c:161

3669 msgid "branch"

3670 msgstr "gren"

3671

3564 -#: builtin/checkout.c:1109

3672 +#: builtin/checkout.c:1347

3673 msgid "create and checkout a new branch"

3674 msgstr "skapa och checka ut en ny gren"

3675

3568 -#: builtin/checkout.c:1111

3676 +#: builtin/checkout.c:1349

3677 msgid "create/reset and checkout a branch"

3678 msgstr "skapa/nollställ och checka ut en gren"

3679

3572 -#: builtin/checkout.c:1112

3680 +#: builtin/checkout.c:1350

3681 msgid "create reflog for new branch"

3682 msgstr "skapa reflogg för ny gren"

3683

3576 -#: builtin/checkout.c:1113

3684 +#: builtin/checkout.c:1351

3685 msgid "detach the HEAD at named commit"

3686 msgstr "koppla från HEAD vid namngiven incheckning"

3687

3580 -#: builtin/checkout.c:1114

3688 +#: builtin/checkout.c:1352

3689 msgid "set upstream info for new branch"

3690 msgstr "sätt uppströmsinformation för ny gren"

3691

3584 -#: builtin/checkout.c:1116

3692 +#: builtin/checkout.c:1354

3693 msgid "new-branch"

3694 msgstr "ny-gren"

3695

3588 -#: builtin/checkout.c:1116

3696 +#: builtin/checkout.c:1354

3697 msgid "new unparented branch"

3698 msgstr "ny gren utan förälder"

3699

3592 -#: builtin/checkout.c:1117

3700 +#: builtin/checkout.c:1355

3701 msgid "checkout our version for unmerged files"

3702 msgstr "checka ut vår version för ej sammanslagna filer"

3703

3596 -#: builtin/checkout.c:1119

3704 +#: builtin/checkout.c:1357

3705 msgid "checkout their version for unmerged files"

3706 msgstr "checka ut deras version för ej sammanslagna filer"

3707

3600 -#: builtin/checkout.c:1121

3708 +#: builtin/checkout.c:1359

3709 msgid "force checkout (throw away local modifications)"

3710 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"

3711

3604 -#: builtin/checkout.c:1122

3712 +#: builtin/checkout.c:1360

3713 msgid "perform a 3-way merge with the new branch"

3714 msgstr "utför en 3-vägssammanslagning för den nya grenen"

3715

3608 -#: builtin/checkout.c:1123 builtin/merge.c:227

3716 +#: builtin/checkout.c:1361 builtin/merge.c:227

3717 msgid "update ignored files (default)"

3718 msgstr "uppdatera ignorerade filer (standard)"

3719

3612 -#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245

3720 +#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244

3721 msgid "style"

3722 msgstr "stil"

3723

3616 -#: builtin/checkout.c:1125

3724 +#: builtin/checkout.c:1363

3725 msgid "conflict style (merge or diff3)"

3726 msgstr "konfliktstil (merge eller diff3)"

3727

3620 -#: builtin/checkout.c:1128

3728 +#: builtin/checkout.c:1366

3729 msgid "do not limit pathspecs to sparse entries only"

3730 msgstr "begränsa inte sökvägar till endast glesa poster"

3731

3624 -#: builtin/checkout.c:1130

3732 +#: builtin/checkout.c:1368

3733 msgid "second guess 'git checkout <no-such-branch>'"

3734 msgstr "förutspå \"git checkout <gren-saknas>\""

3735

3628 -#: builtin/checkout.c:1153

3736 +#: builtin/checkout.c:1370

3737 +msgid "check a branch out in a separate working directory"

3738 +msgstr "checka ut en gren i separat arbetskatalog"

3739 +

3740 +#: builtin/checkout.c:1372

3741 +msgid "do not check if another worktree is holding the given ref"

3742 +msgstr ""

3743 +"kontrollera inte om en annan arbetskatalog håller den angivna referensen"

3744 +

3745 +#: builtin/checkout.c:1406

3746 msgid "-b, -B and --orphan are mutually exclusive"

3747 msgstr "-b, -B och --orphan är ömsesidigt uteslutande"

3748

3632 -#: builtin/checkout.c:1170

3749 +#: builtin/checkout.c:1423

3750 msgid "--track needs a branch name"

3751 msgstr "--track behöver ett namn på en gren"

3752

3636 -#: builtin/checkout.c:1175

3753 +#: builtin/checkout.c:1428

3754 msgid "Missing branch name; try -b"

3755 msgstr "Grennamn saknas; försök med -b"

3756

3640 -#: builtin/checkout.c:1212

3757 +#: builtin/checkout.c:1464

3758 msgid "invalid path specification"

3759 msgstr "felaktig sökvägsangivelse"

3760

3644 -#: builtin/checkout.c:1219

3761 +#: builtin/checkout.c:1471

3762 #, c-format

3763 msgid ""

3764 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3650,12 +3767,12 @@ msgstr ""

3767 "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"

3768 "Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"

3769

3653 -#: builtin/checkout.c:1224

3770 +#: builtin/checkout.c:1476

3771 #, c-format

3772 msgid "git checkout: --detach does not take a path argument '%s'"

3773 msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""

3774

3658 -#: builtin/checkout.c:1228

3775 +#: builtin/checkout.c:1480

3776 msgid ""

3777 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3778 "checking out of the index."

@@ -3727,36 +3844,36 @@ msgstr ""

3844 "* - välj alla poster\n"

3845 " - (tomt) avsluta markering"

3846

3730 -#: builtin/clean.c:517

3847 +#: builtin/clean.c:515

3848 #, c-format

3849 msgid "Huh (%s)?"

3850 msgstr "Vadå (%s)?"

3851

3735 -#: builtin/clean.c:659

3852 +#: builtin/clean.c:657

3853 #, c-format

3854 msgid "Input ignore patterns>> "

3855 msgstr "Ange ignoreringsmönster>>"

3856

3740 -#: builtin/clean.c:696

3857 +#: builtin/clean.c:694

3858 #, c-format

3859 msgid "WARNING: Cannot find items matched by: %s"

3860 msgstr "VARNING: Hittar inte poster som motsvarar: %s"

3861

3745 -#: builtin/clean.c:717

3862 +#: builtin/clean.c:715

3863 msgid "Select items to delete"

3864 msgstr "Välj poster att ta bort"

3865

3866 #. TRANSLATORS: Make sure to keep [y/N] as is

3750 -#: builtin/clean.c:758

3867 +#: builtin/clean.c:756

3868 #, c-format

3869 msgid "Remove %s [y/N]? "

3870 msgstr "Ta bort %s [Y=ja / N=nej]?"

3871

3755 -#: builtin/clean.c:783

3872 +#: builtin/clean.c:781

3873 msgid "Bye."

3874 msgstr "Hej då."

3875

3759 -#: builtin/clean.c:791

3876 +#: builtin/clean.c:789

3877 msgid ""

3878 "clean - start cleaning\n"

3879 "filter by pattern - exclude items from deletion\n"

@@ -3774,62 +3891,62 @@ msgstr ""

3891 "help - denna skärm\n"

3892 "? - hjälp för kommandoval"

3893

3777 -#: builtin/clean.c:818

3894 +#: builtin/clean.c:816

3895 msgid "*** Commands ***"

3896 msgstr "*** Kommandon ***"

3897

3781 -#: builtin/clean.c:819

3898 +#: builtin/clean.c:817

3899 msgid "What now"

3900 msgstr "Vad nu"

3901

3785 -#: builtin/clean.c:827

3902 +#: builtin/clean.c:825

3903 msgid "Would remove the following item:"

3904 msgid_plural "Would remove the following items:"

3905 msgstr[0] "Skulle ta bort följande post:"

3906 msgstr[1] "Skulle ta bort följande poster:"

3907

3791 -#: builtin/clean.c:844

3908 +#: builtin/clean.c:842

3909 msgid "No more files to clean, exiting."

3910 msgstr "Inga fler filer att städa, avslutar."

3911

3795 -#: builtin/clean.c:875

3912 +#: builtin/clean.c:873

3913 msgid "do not print names of files removed"

3914 msgstr "skriv inte ut namn på borttagna filer"

3915

3799 -#: builtin/clean.c:877

3916 +#: builtin/clean.c:875

3917 msgid "force"

3918 msgstr "tvinga"

3919

3803 -#: builtin/clean.c:878

3920 +#: builtin/clean.c:876

3921 msgid "interactive cleaning"

3922 msgstr "städa interaktivt"

3923

3807 -#: builtin/clean.c:880

3924 +#: builtin/clean.c:878

3925 msgid "remove whole directories"

3926 msgstr "ta bort hela kataloger"

3927

3811 -#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714

3812 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185

3928 +#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714

3929 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187

3930 msgid "pattern"

3931 msgstr "mönster"

3932

3816 -#: builtin/clean.c:882

3933 +#: builtin/clean.c:880

3934 msgid "add <pattern> to ignore rules"

3935 msgstr "lägg till <mönster> till ignoreringsregler"

3936

3820 -#: builtin/clean.c:883

3937 +#: builtin/clean.c:881

3938 msgid "remove ignored files, too"

3939 msgstr "ta även bort ignorerade filer"

3940

3824 -#: builtin/clean.c:885

3941 +#: builtin/clean.c:883

3942 msgid "remove only ignored files"

3943 msgstr "ta endast bort ignorerade filer"

3944

3828 -#: builtin/clean.c:903

3945 +#: builtin/clean.c:901

3946 msgid "-x and -X cannot be used together"

3947 msgstr "-x och -X kan inte användas samtidigt"

3948

3832 -#: builtin/clean.c:907

3949 +#: builtin/clean.c:905

3950 msgid ""

3951 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

3952 "clean"

@@ -3837,7 +3954,7 @@ msgstr ""

3954 "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "

3955 "städa"

3956

3840 -#: builtin/clean.c:910

3957 +#: builtin/clean.c:908

3958 msgid ""

3959 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

3960 "refusing to clean"

@@ -3849,150 +3966,150 @@ msgstr ""

3966 msgid "git clone [<options>] [--] <repo> [<dir>]"

3967 msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"

3968

3852 -#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224

3969 +#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224

3970 #: builtin/push.c:523

3971 msgid "force progress reporting"

3972 msgstr "tvinga förloppsrapportering"

3973

3857 -#: builtin/clone.c:68

3974 +#: builtin/clone.c:59

3975 msgid "don't create a checkout"

3976 msgstr "skapa inte någon utcheckning"

3977

3861 -#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496

3978 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503

3979 msgid "create a bare repository"

3980 msgstr "skapa ett naket (\"bare\") arkiv"

3981

3865 -#: builtin/clone.c:73

3982 +#: builtin/clone.c:64

3983 msgid "create a mirror repository (implies bare)"

3984 msgstr "skapa ett spegelarkiv (implicerar \"bare\")"

3985

3869 -#: builtin/clone.c:75

3986 +#: builtin/clone.c:66

3987 msgid "to clone from a local repository"

3988 msgstr "för att klona från ett lokalt arkiv"

3989

3873 -#: builtin/clone.c:77

3990 +#: builtin/clone.c:68

3991 msgid "don't use local hardlinks, always copy"

3992 msgstr "skapa inte lokala hårda länkar, kopiera alltid"

3993

3877 -#: builtin/clone.c:79

3994 +#: builtin/clone.c:70

3995 msgid "setup as shared repository"

3996 msgstr "skapa som ett delat arkiv"

3997

3881 -#: builtin/clone.c:81 builtin/clone.c:83

3998 +#: builtin/clone.c:72 builtin/clone.c:74

3999 msgid "initialize submodules in the clone"

4000 msgstr "initiera undermoduler i klonen"

4001

3885 -#: builtin/clone.c:84 builtin/init-db.c:493

4002 +#: builtin/clone.c:75 builtin/init-db.c:500

4003 msgid "template-directory"

4004 msgstr "mallkatalog"

4005

3889 -#: builtin/clone.c:85 builtin/init-db.c:494

4006 +#: builtin/clone.c:76 builtin/init-db.c:501

4007 msgid "directory from which templates will be used"

4008 msgstr "katalog att använda mallar från"

4009

3893 -#: builtin/clone.c:87

4010 +#: builtin/clone.c:78

4011 msgid "reference repository"

4012 msgstr "referensarkiv"

4013

3897 -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44

4014 +#: builtin/clone.c:80

4015 +msgid "use --reference only while cloning"

4016 +msgstr "använd --reference endast under kloningen"

4017 +

4018 +#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44

4019 msgid "name"

4020 msgstr "namn"

4021

3901 -#: builtin/clone.c:89

4022 +#: builtin/clone.c:82

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

4024 msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"

4025

3905 -#: builtin/clone.c:91

4026 +#: builtin/clone.c:84

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

4028 msgstr "checka ut <gren> istället för fjärrens HEAD"

4029

3909 -#: builtin/clone.c:93

4030 +#: builtin/clone.c:86

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

4032 msgstr "sökväg till git-upload-pack på fjärren"

4033

3913 -#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659

4034 +#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659

4035 msgid "depth"

4036 msgstr "djup"

4037

3917 -#: builtin/clone.c:95

4038 +#: builtin/clone.c:88

4039 msgid "create a shallow clone of that depth"

4040 msgstr "skapa en grund klon på detta djup"

4041

3921 -#: builtin/clone.c:97

4042 +#: builtin/clone.c:90

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

4044 msgstr "klona endast en gren, HEAD eller --branch"

4045

3925 -#: builtin/clone.c:99

3926 -msgid "use --reference only while cloning"

3927 -msgstr "använd --reference endast under kloningen"

3928 -

3929 -#: builtin/clone.c:100 builtin/init-db.c:502

4046 +#: builtin/clone.c:91 builtin/init-db.c:509

4047 msgid "gitdir"

4048 msgstr "gitkat"

4049

3933 -#: builtin/clone.c:101 builtin/init-db.c:503

4050 +#: builtin/clone.c:92 builtin/init-db.c:510

4051 msgid "separate git dir from working tree"

4052 msgstr "separera gitkatalogen från arbetskatalogen"

4053

3937 -#: builtin/clone.c:102

4054 +#: builtin/clone.c:93

4055 msgid "key=value"

4056 msgstr "nyckel=värde"

4057

3941 -#: builtin/clone.c:103

4058 +#: builtin/clone.c:94

4059 msgid "set config inside the new repository"

4060 msgstr "ställ in konfiguration i det nya arkivet"

4061

3945 -#: builtin/clone.c:256

4062 +#: builtin/clone.c:247

4063 #, c-format

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

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

4066

3950 -#: builtin/clone.c:260

4067 +#: builtin/clone.c:251

4068 #, c-format

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

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

4071

3955 -#: builtin/clone.c:263

4072 +#: builtin/clone.c:254

4073 #, c-format

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

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

4076

3960 -#: builtin/clone.c:325

4077 +#: builtin/clone.c:317

4078 #, c-format

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

4080 msgstr "misslyckades skapa katalogen \"%s\""

4081

3965 -#: builtin/clone.c:327 builtin/diff.c:84

4082 +#: builtin/clone.c:319 builtin/diff.c:84

4083 #, c-format

4084 msgid "failed to stat '%s'"

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

4086

3970 -#: builtin/clone.c:329

4087 +#: builtin/clone.c:321

4088 #, c-format

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

4090 msgstr "%s finns och är ingen katalog"

4091

3975 -#: builtin/clone.c:343

4092 +#: builtin/clone.c:335

4093 #, c-format

4094 msgid "failed to stat %s\n"

4095 msgstr "misslyckades ta status på %s\n"

4096

3980 -#: builtin/clone.c:365

4097 +#: builtin/clone.c:357

4098 #, c-format

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

4100 msgstr "misslyckades skapa länken \"%s\""

4101

3985 -#: builtin/clone.c:369

4102 +#: builtin/clone.c:361

4103 #, c-format

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

4105 msgstr "misslyckades kopiera filen till \"%s\""

4106

3990 -#: builtin/clone.c:392 builtin/clone.c:566

4107 +#: builtin/clone.c:384 builtin/clone.c:558

4108 #, c-format

4109 msgid "done.\n"

4110 msgstr "klart.\n"

4111

3995 -#: builtin/clone.c:404

4112 +#: builtin/clone.c:396

4113 msgid ""

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

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

@@ -4002,123 +4119,118 @@ msgstr ""

4119 "Du kan inspektera det som checkades ut med \"git status\"\n"

4120 "och försöka checka ut igen med \"git checkout -f HEAD\"\n"

4121

4005 -#: builtin/clone.c:481

4122 +#: builtin/clone.c:473

4123 #, c-format

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

4125 msgstr "Kunde inte hitta fjärrgrenen %s för att klona."

4126

4127 # Vague original, not networking-related, but rather related to the actual

4128 # objects in the database.

4012 -#: builtin/clone.c:561

4129 +#: builtin/clone.c:553

4130 #, c-format

4131 msgid "Checking connectivity... "

4132 msgstr "Kontrollerar konnektivitet..."

4133

4017 -#: builtin/clone.c:564

4134 +#: builtin/clone.c:556

4135 msgid "remote did not send all necessary objects"

4136 msgstr "fjärren sände inte alla nödvändiga objekt"

4137

4021 -#: builtin/clone.c:628

4138 +#: builtin/clone.c:620

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

4140 msgstr ""

4141 "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"

4142

4026 -#: builtin/clone.c:659

4143 +#: builtin/clone.c:651

4144 msgid "unable to checkout working tree"

4145 msgstr "kunde inte checka ut arbetskatalogen"

4146

4030 -#: builtin/clone.c:746

4147 +#: builtin/clone.c:738

4148 msgid "cannot repack to clean up"

4149 msgstr "kan inte packa om för att städa upp"

4150

4034 -#: builtin/clone.c:748

4151 +#: builtin/clone.c:740

4152 msgid "cannot unlink temporary alternates file"

4153 msgstr "kunde inte ta bort temporär \"alternates\"-fil"

4154

4038 -#: builtin/clone.c:778

4155 +#: builtin/clone.c:770

4156 msgid "Too many arguments."

4157 msgstr "För många argument."

4158

4042 -#: builtin/clone.c:782

4159 +#: builtin/clone.c:774

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

4161 msgstr "Du måste ange ett arkiv att klona."

4162

4046 -#: builtin/clone.c:793

4163 +#: builtin/clone.c:785

4164 #, c-format

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

4166 msgstr "flaggorna --bare och --origin %s är inkompatibla."

4167

4051 -#: builtin/clone.c:796

4168 +#: builtin/clone.c:788

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

4170 msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."

4171

4055 -#: builtin/clone.c:809

4172 +#: builtin/clone.c:801

4173 #, c-format

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

4175 msgstr "arkivet \"%s\" finns inte"

4176

4060 -#: builtin/clone.c:815 builtin/fetch.c:1156

4177 +#: builtin/clone.c:807 builtin/fetch.c:1160

4178 #, c-format

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

4180 msgstr "djupet %s är inte ett positivt tal"

4181

4065 -#: builtin/clone.c:825

4182 +#: builtin/clone.c:817

4183 #, c-format

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

4185 msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."

4186

4070 -#: builtin/clone.c:835

4187 +#: builtin/clone.c:827

4188 #, c-format

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

4190 msgstr "arbetsträdet \"%s\" finns redan."

4191

4075 -#: builtin/clone.c:850 builtin/clone.c:861

4076 -#, c-format

4077 -msgid "could not create leading directories of '%s'"

4078 -msgstr "kunde inte skapa inledande kataloger för \"%s\""

4079 -

4080 -#: builtin/clone.c:853

4192 +#: builtin/clone.c:845

4193 #, c-format

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

4195 msgstr "kunde inte skapa arbetskatalogen \"%s\""

4196

4085 -#: builtin/clone.c:871

4197 +#: builtin/clone.c:863

4198 #, c-format

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

4200 msgstr "Klonar till ett naket arkiv \"%s\"...\n"

4201

4090 -#: builtin/clone.c:873

4202 +#: builtin/clone.c:865

4203 #, c-format

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

4205 msgstr "Klonar till \"%s\"...\n"

4206

4095 -#: builtin/clone.c:898

4207 +#: builtin/clone.c:890

4208 msgid "--dissociate given, but there is no --reference"

4209 msgstr "--dissociate angavs, men --reference har inte angivits"

4210

4099 -#: builtin/clone.c:913

4211 +#: builtin/clone.c:907

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

4213 msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"

4214

4103 -#: builtin/clone.c:916

4215 +#: builtin/clone.c:910

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

4217 msgstr "källarkivet är grunt, ignorerar --local"

4218

4107 -#: builtin/clone.c:921

4219 +#: builtin/clone.c:915

4220 msgid "--local is ignored"

4221 msgstr "--local ignoreras"

4222

4111 -#: builtin/clone.c:925

4223 +#: builtin/clone.c:919

4224 #, c-format

4225 msgid "Don't know how to clone %s"

4226 msgstr "Vet inte hur man klonar %s"

4227

4116 -#: builtin/clone.c:976 builtin/clone.c:984

4228 +#: builtin/clone.c:968 builtin/clone.c:976

4229 #, c-format

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

4231 msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"

4232

4121 -#: builtin/clone.c:987

4233 +#: builtin/clone.c:979

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

4235 msgstr "Du verkar ha klonat ett tomt arkiv."

4236

@@ -4356,7 +4468,7 @@ msgstr "kunde inte läsa MERGE_MSG"

4468 msgid "could not read SQUASH_MSG"

4469 msgstr "kunde inte läsa SQUASH_MSG"

4470

4359 -#: builtin/commit.c:738

4471 +#: builtin/commit.c:738 builtin/merge.c:1079

4472 #, c-format

4473 msgid "could not read '%s'"

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

@@ -4517,32 +4629,32 @@ msgstr "Felaktigt städningsläge %s"

4629 msgid "Paths with -a does not make sense."

4630 msgstr "Kan inte ange sökvägar med -a."

4631

4520 -#: builtin/commit.c:1324 builtin/commit.c:1604

4632 +#: builtin/commit.c:1324 builtin/commit.c:1603

4633 msgid "show status concisely"

4634 msgstr "visa koncis status"

4635

4524 -#: builtin/commit.c:1326 builtin/commit.c:1606

4636 +#: builtin/commit.c:1326 builtin/commit.c:1605

4637 msgid "show branch information"

4638 msgstr "visa information om gren"

4639

4528 -#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509

4640 +#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509

4641 msgid "machine-readable output"

4642 msgstr "maskinläsbar utdata"

4643

4532 -#: builtin/commit.c:1331 builtin/commit.c:1610

4644 +#: builtin/commit.c:1331 builtin/commit.c:1609

4645 msgid "show status in long format (default)"

4646 msgstr "visa status i långt format (standard)"

4647

4536 -#: builtin/commit.c:1334 builtin/commit.c:1613

4648 +#: builtin/commit.c:1334 builtin/commit.c:1612

4649 msgid "terminate entries with NUL"

4650 msgstr "terminera poster med NUL"

4651

4540 -#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980

4652 +#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980

4653 #: builtin/fast-export.c:983 builtin/tag.c:603

4654 msgid "mode"

4655 msgstr "läge"

4656

4545 -#: builtin/commit.c:1337 builtin/commit.c:1616

4657 +#: builtin/commit.c:1337 builtin/commit.c:1615

4658 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4659 msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"

4660

@@ -4550,7 +4662,7 @@ msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"

4662 msgid "show ignored files"

4663 msgstr "visa ignorerade filer"

4664

4553 -#: builtin/commit.c:1341 parse-options.h:153

4665 +#: builtin/commit.c:1341 parse-options.h:152

4666 msgid "when"

4667 msgstr "när"

4668

@@ -4566,205 +4678,205 @@ msgstr ""

4678 msgid "list untracked files in columns"

4679 msgstr "visa ospårade filer i spalter"

4680

4569 -#: builtin/commit.c:1431

4681 +#: builtin/commit.c:1430

4682 msgid "couldn't look up newly created commit"

4683 msgstr "kunde inte slå upp en precis skapad incheckning"

4684

4573 -#: builtin/commit.c:1433

4685 +#: builtin/commit.c:1432

4686 msgid "could not parse newly created commit"

4687 msgstr "kunde inte tolka en precis skapad incheckning"

4688

4577 -#: builtin/commit.c:1478

4689 +#: builtin/commit.c:1477

4690 msgid "detached HEAD"

4691 msgstr "frånkopplad HEAD"

4692

4581 -#: builtin/commit.c:1481

4693 +#: builtin/commit.c:1480

4694 msgid " (root-commit)"

4695 msgstr " (rotincheckning)"

4696

4585 -#: builtin/commit.c:1574

4697 +#: builtin/commit.c:1573

4698 msgid "suppress summary after successful commit"

4699 msgstr "undertryck sammanfattning efter framgångsrik incheckning"

4700

4589 -#: builtin/commit.c:1575

4701 +#: builtin/commit.c:1574

4702 msgid "show diff in commit message template"

4703 msgstr "visa diff i mallen för incheckningsmeddelandet"

4704

4593 -#: builtin/commit.c:1577

4705 +#: builtin/commit.c:1576

4706 msgid "Commit message options"

4707 msgstr "Alternativ för incheckningsmeddelande"

4708

4597 -#: builtin/commit.c:1578 builtin/tag.c:601

4709 +#: builtin/commit.c:1577 builtin/tag.c:601

4710 msgid "read message from file"

4711 msgstr "läs meddelande från fil"

4712

4601 -#: builtin/commit.c:1579

4713 +#: builtin/commit.c:1578

4714 msgid "author"

4715 msgstr "författare"

4716

4605 -#: builtin/commit.c:1579

4717 +#: builtin/commit.c:1578

4718 msgid "override author for commit"

4719 msgstr "överstyr författare för incheckningen"

4720

4609 -#: builtin/commit.c:1580 builtin/gc.c:275

4721 +#: builtin/commit.c:1579 builtin/gc.c:280

4722 msgid "date"

4723 msgstr "datum"

4724

4613 -#: builtin/commit.c:1580

4725 +#: builtin/commit.c:1579

4726 msgid "override date for commit"

4727 msgstr "överstyr datum för incheckningen"

4728

4617 -#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391

4729 +#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391

4730 #: builtin/notes.c:554 builtin/tag.c:599

4731 msgid "message"

4732 msgstr "meddelande"

4733

4622 -#: builtin/commit.c:1581

4734 +#: builtin/commit.c:1580

4735 msgid "commit message"

4736 msgstr "incheckningsmeddelande"

4737

4626 -#: builtin/commit.c:1582

4738 +#: builtin/commit.c:1581

4739 msgid "reuse and edit message from specified commit"

4740 msgstr "återanvänd och redigera meddelande från angiven incheckning"

4741

4630 -#: builtin/commit.c:1583

4742 +#: builtin/commit.c:1582

4743 msgid "reuse message from specified commit"

4744 msgstr "återanvänd meddelande från angiven incheckning"

4745

4634 -#: builtin/commit.c:1584

4746 +#: builtin/commit.c:1583

4747 msgid "use autosquash formatted message to fixup specified commit"

4748 msgstr ""

4749 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"

4750

4639 -#: builtin/commit.c:1585

4751 +#: builtin/commit.c:1584

4752 msgid "use autosquash formatted message to squash specified commit"

4753 msgstr ""

4754 "använd autosquash-formaterat meddelande för att slå ihop med angiven "

4755 "incheckning"

4756

4645 -#: builtin/commit.c:1586

4757 +#: builtin/commit.c:1585

4758 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4759 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"

4760

4649 -#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86

4761 +#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86

4762 msgid "add Signed-off-by:"

4763 msgstr "lägg till Signed-off-by:"

4764

4653 -#: builtin/commit.c:1588

4765 +#: builtin/commit.c:1587

4766 msgid "use specified template file"

4767 msgstr "använd angiven mallfil"

4768

4657 -#: builtin/commit.c:1589

4769 +#: builtin/commit.c:1588

4770 msgid "force edit of commit"

4771 msgstr "tvinga redigering av incheckning"

4772

4661 -#: builtin/commit.c:1590

4773 +#: builtin/commit.c:1589

4774 msgid "default"

4775 msgstr "standard"

4776

4665 -#: builtin/commit.c:1590 builtin/tag.c:604

4777 +#: builtin/commit.c:1589 builtin/tag.c:604

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

4779 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

4780

4669 -#: builtin/commit.c:1591

4781 +#: builtin/commit.c:1590

4782 msgid "include status in commit message template"

4783 msgstr "inkludera status i mallen för incheckningsmeddelandet"

4784

4673 -#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92

4785 +#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92

4786 #: builtin/tag.c:605

4787 msgid "key-id"

4788 msgstr "nyckel-id"

4789

4678 -#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93

4790 +#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93

4791 msgid "GPG sign commit"

4792 msgstr "GPG-signera incheckning"

4793

4682 -#: builtin/commit.c:1596

4794 +#: builtin/commit.c:1595

4795 msgid "Commit contents options"

4796 msgstr "Alternativ för incheckningens innehåll"

4797

4686 -#: builtin/commit.c:1597

4798 +#: builtin/commit.c:1596

4799 msgid "commit all changed files"

4800 msgstr "checka in alla ändrade filer"

4801

4690 -#: builtin/commit.c:1598

4802 +#: builtin/commit.c:1597

4803 msgid "add specified files to index for commit"

4804 msgstr "lägg till angivna filer till indexet för incheckning"

4805

4694 -#: builtin/commit.c:1599

4806 +#: builtin/commit.c:1598

4807 msgid "interactively add files"

4808 msgstr "lägg till filer interaktivt"

4809

4698 -#: builtin/commit.c:1600

4810 +#: builtin/commit.c:1599

4811 msgid "interactively add changes"

4812 msgstr "lägg till ändringar interaktivt"

4813

4702 -#: builtin/commit.c:1601

4814 +#: builtin/commit.c:1600

4815 msgid "commit only specified files"

4816 msgstr "checka endast in angivna filer"

4817

4706 -#: builtin/commit.c:1602

4818 +#: builtin/commit.c:1601

4819 msgid "bypass pre-commit hook"

4820 msgstr "förbigå pre-commit-krok"

4821

4710 -#: builtin/commit.c:1603

4822 +#: builtin/commit.c:1602

4823 msgid "show what would be committed"

4824 msgstr "visa vad som skulle checkas in"

4825

4714 -#: builtin/commit.c:1614

4826 +#: builtin/commit.c:1613

4827 msgid "amend previous commit"

4828 msgstr "lägg till föregående incheckning"

4829

4718 -#: builtin/commit.c:1615

4830 +#: builtin/commit.c:1614

4831 msgid "bypass post-rewrite hook"

4832 msgstr "förbigå post-rewrite-krok"

4833

4722 -#: builtin/commit.c:1620

4834 +#: builtin/commit.c:1619

4835 msgid "ok to record an empty change"

4836 msgstr "ok att registrera en tom ändring"

4837

4726 -#: builtin/commit.c:1622

4838 +#: builtin/commit.c:1621

4839 msgid "ok to record a change with an empty message"

4840 msgstr "ok att registrera en ändring med tomt meddelande"

4841

4730 -#: builtin/commit.c:1651

4842 +#: builtin/commit.c:1650

4843 msgid "could not parse HEAD commit"

4844 msgstr "kunde inte tolka HEAD:s incheckning"

4845

4734 -#: builtin/commit.c:1690 builtin/merge.c:519

4846 +#: builtin/commit.c:1689 builtin/merge.c:1076

4847 #, c-format

4848 msgid "could not open '%s' for reading"

4849 msgstr "kunde inte öppna \"%s\" för läsning"

4850

4739 -#: builtin/commit.c:1697

4851 +#: builtin/commit.c:1696

4852 #, c-format

4853 msgid "Corrupt MERGE_HEAD file (%s)"

4854 msgstr "Trasig MERGE_HEAD-fil (%s)"

4855

4744 -#: builtin/commit.c:1704

4856 +#: builtin/commit.c:1703

4857 msgid "could not read MERGE_MODE"

4858 msgstr "kunde inte läsa MERGE_MODE"

4859

4748 -#: builtin/commit.c:1723

4860 +#: builtin/commit.c:1722

4861 #, c-format

4862 msgid "could not read commit message: %s"

4863 msgstr "kunde inte läsa incheckningsmeddelande: %s"

4864

4753 -#: builtin/commit.c:1734

4865 +#: builtin/commit.c:1733

4866 #, c-format

4867 msgid "Aborting commit; you did not edit the message.\n"

4868 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"

4869

4758 -#: builtin/commit.c:1739

4870 +#: builtin/commit.c:1738

4871 #, c-format

4872 msgid "Aborting commit due to empty commit message.\n"

4873 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"

4874

4763 -#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876

4875 +#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854

4876 msgid "failed to write commit object"

4877 msgstr "kunde inte skriva incheckningsobjekt"

4878

4767 -#: builtin/commit.c:1787

4879 +#: builtin/commit.c:1786

4880 msgid ""

4881 "Repository has been updated, but unable to write\n"

4882 "new_index file. Check that disk is not full and quota is\n"

@@ -4907,18 +5019,18 @@ msgstr "kan inte tolka standardfärgvärde"

5019 #, c-format

5020 msgid ""

5021 "# This is Git's per-user configuration file.\n"

4910 -"[core]\n"

5022 +"[user]\n"

5023 "# Please adapt and uncomment the following lines:\n"

4912 -"#\tuser = %s\n"

5024 +"#\tname = %s\n"

5025 "#\temail = %s\n"

5026 msgstr ""

5027 "# Detta är Gits användarspecifika konfigurationsfil\n"

4916 -"[core]\n"

5028 +"[user]\n"

5029 "# Justera och ta bort kommenteringsmärket från följande rader:\n"

4918 -"#\tuser = %s\n"

5030 +"#\tname = %s\n"

5031 "#\temail = %s\n"

5032

4921 -#: builtin/config.c:589

5033 +#: builtin/config.c:587

5034 #, c-format

5035 msgid "cannot create configuration file %s"

5036 msgstr "kan inte skapa konfigurationsfilen \"%s\""

@@ -5248,81 +5360,81 @@ msgstr "referenskarta"

5360 msgid "specify fetch refmap"

5361 msgstr "ange referenskarta för \"fetch\""

5362

5251 -#: builtin/fetch.c:375

5363 +#: builtin/fetch.c:377

5364 msgid "Couldn't find remote ref HEAD"

5365 msgstr "Kunde inte hitta fjärr-referensen HEAD"

5366

5255 -#: builtin/fetch.c:455

5367 +#: builtin/fetch.c:457

5368 #, c-format

5369 msgid "object %s not found"

5370 msgstr "objektet %s hittades inte"

5371

5260 -#: builtin/fetch.c:460

5372 +#: builtin/fetch.c:462

5373 msgid "[up to date]"

5374 msgstr "[àjour]"

5375

5264 -#: builtin/fetch.c:474

5376 +#: builtin/fetch.c:476

5377 #, c-format

5378 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5379 msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)"

5380

5269 -#: builtin/fetch.c:475 builtin/fetch.c:561

5381 +#: builtin/fetch.c:477 builtin/fetch.c:563

5382 msgid "[rejected]"

5383 msgstr "[refuserad]"

5384

5273 -#: builtin/fetch.c:486

5385 +#: builtin/fetch.c:488

5386 msgid "[tag update]"

5387 msgstr "[uppdaterad tagg]"

5388

5277 -#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541

5389 +#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543

5390 msgid " (unable to update local ref)"

5391 msgstr " (kunde inte uppdatera lokal ref)"

5392

5281 -#: builtin/fetch.c:506

5393 +#: builtin/fetch.c:508

5394 msgid "[new tag]"

5395 msgstr "[ny tagg]"

5396

5285 -#: builtin/fetch.c:509

5397 +#: builtin/fetch.c:511

5398 msgid "[new branch]"

5399 msgstr "[ny gren]"

5400

5289 -#: builtin/fetch.c:512

5401 +#: builtin/fetch.c:514

5402 msgid "[new ref]"

5403 msgstr "[ny ref]"

5404

5293 -#: builtin/fetch.c:557

5405 +#: builtin/fetch.c:559

5406 msgid "unable to update local ref"

5407 msgstr "kunde inte uppdatera lokal ref"

5408

5297 -#: builtin/fetch.c:557

5409 +#: builtin/fetch.c:559

5410 msgid "forced update"

5411 msgstr "tvingad uppdatering"

5412

5301 -#: builtin/fetch.c:563

5413 +#: builtin/fetch.c:565

5414 msgid "(non-fast-forward)"

5415 msgstr "(ej snabbspolad)"

5416

5305 -#: builtin/fetch.c:596 builtin/fetch.c:829

5417 +#: builtin/fetch.c:599 builtin/fetch.c:832

5418 #, c-format

5419 msgid "cannot open %s: %s\n"

5420 msgstr "kan inte öppna %s: %s\n"

5421

5310 -#: builtin/fetch.c:605

5422 +#: builtin/fetch.c:608

5423 #, c-format

5424 msgid "%s did not send all necessary objects\n"

5425 msgstr "%s sände inte alla nödvändiga objekt\n"

5426

5315 -#: builtin/fetch.c:623

5427 +#: builtin/fetch.c:626

5428 #, c-format

5429 msgid "reject %s because shallow roots are not allowed to be updated"

5430 msgstr "avvisa %s då grunda rötter inte kan uppdateras"

5431

5320 -#: builtin/fetch.c:711 builtin/fetch.c:794

5432 +#: builtin/fetch.c:714 builtin/fetch.c:797

5433 #, c-format

5434 msgid "From %.*s\n"

5435 msgstr "Från %.*s\n"

5436

5325 -#: builtin/fetch.c:722

5437 +#: builtin/fetch.c:725

5438 #, c-format

5439 msgid ""

5440 "some local refs could not be updated; try running\n"

@@ -5331,55 +5443,55 @@ msgstr ""

5443 "vissa lokala referenser kunde inte uppdateras; testa att köra\n"

5444 " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"

5445

5334 -#: builtin/fetch.c:774

5446 +#: builtin/fetch.c:777

5447 #, c-format

5448 msgid " (%s will become dangling)"

5449 msgstr " (%s kommer bli dinglande)"

5450

5339 -#: builtin/fetch.c:775

5451 +#: builtin/fetch.c:778

5452 #, c-format

5453 msgid " (%s has become dangling)"

5454 msgstr " (%s har blivit dinglande)"

5455

5344 -#: builtin/fetch.c:799

5456 +#: builtin/fetch.c:802

5457 msgid "[deleted]"

5458 msgstr "[borttagen]"

5459

5348 -#: builtin/fetch.c:800 builtin/remote.c:1060

5460 +#: builtin/fetch.c:803 builtin/remote.c:1057

5461 msgid "(none)"

5462 msgstr "(ingen)"

5463

5352 -#: builtin/fetch.c:819

5464 +#: builtin/fetch.c:822

5465 #, c-format

5466 msgid "Refusing to fetch into current branch %s of non-bare repository"

5467 msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"

5468

5357 -#: builtin/fetch.c:838

5469 +#: builtin/fetch.c:841

5470 #, c-format

5471 msgid "Option \"%s\" value \"%s\" is not valid for %s"

5472 msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"

5473

5362 -#: builtin/fetch.c:841

5474 +#: builtin/fetch.c:844

5475 #, c-format

5476 msgid "Option \"%s\" is ignored for %s\n"

5477 msgstr "Flaggan \"%s\" ignoreras för %s\n"

5478

5367 -#: builtin/fetch.c:897

5479 +#: builtin/fetch.c:900

5480 #, c-format

5481 msgid "Don't know how to fetch from %s"

5482 msgstr "Vet inte hur man hämtar från %s"

5483

5372 -#: builtin/fetch.c:1059

5484 +#: builtin/fetch.c:1063

5485 #, c-format

5486 msgid "Fetching %s\n"

5487 msgstr "Hämtar %s\n"

5488

5377 -#: builtin/fetch.c:1061 builtin/remote.c:90

5489 +#: builtin/fetch.c:1065 builtin/remote.c:90

5490 #, c-format

5491 msgid "Could not fetch %s"

5492 msgstr "Kunde inte hämta %s"

5493

5382 -#: builtin/fetch.c:1079

5494 +#: builtin/fetch.c:1083

5495 msgid ""

5496 "No remote repository specified. Please, specify either a URL or a\n"

5497 "remote name from which new revisions should be fetched."

@@ -5387,32 +5499,32 @@ msgstr ""

5499 "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"

5500 "fjärrarkiv som nya incheckningar skall hämtas från."

5501

5390 -#: builtin/fetch.c:1102

5502 +#: builtin/fetch.c:1106

5503 msgid "You need to specify a tag name."

5504 msgstr "Du måste ange namnet på en tagg."

5505

5394 -#: builtin/fetch.c:1144

5506 +#: builtin/fetch.c:1148

5507 msgid "--depth and --unshallow cannot be used together"

5508 msgstr "--depth och --unshallow kan inte användas samtidigt"

5509

5398 -#: builtin/fetch.c:1146

5510 +#: builtin/fetch.c:1150

5511 msgid "--unshallow on a complete repository does not make sense"

5512 msgstr "--unshallow kan inte användas på ett komplett arkiv"

5513

5402 -#: builtin/fetch.c:1169

5514 +#: builtin/fetch.c:1173

5515 msgid "fetch --all does not take a repository argument"

5516 msgstr "fetch --all tar inte namnet på ett arkiv som argument"

5517

5406 -#: builtin/fetch.c:1171

5518 +#: builtin/fetch.c:1175

5519 msgid "fetch --all does not make sense with refspecs"

5520 msgstr "fetch --all kan inte anges med referensspecifikationer"

5521

5410 -#: builtin/fetch.c:1182

5522 +#: builtin/fetch.c:1186

5523 #, c-format

5524 msgid "No such remote or remote group: %s"

5525 msgstr "Fjärren eller fjärrgruppen finns inte: %s"

5526

5415 -#: builtin/fetch.c:1190

5527 +#: builtin/fetch.c:1194

5528 msgid "Fetching a group and specifying refspecs does not make sense"

5529 msgstr "Kan inte hämta från grupp och ange referensspecifikationer"

5530

@@ -5422,132 +5534,132 @@ msgid ""

5534 msgstr ""

5535 "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]"

5536

5425 -#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698

5537 +#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698

5538 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182

5427 -#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590

5428 -#: parse-options.h:132 parse-options.h:239

5539 +#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590

5540 +#: parse-options.h:131 parse-options.h:238

5541 msgid "n"

5542 msgstr "n"

5543

5432 -#: builtin/fmt-merge-msg.c:663

5544 +#: builtin/fmt-merge-msg.c:669

5545 msgid "populate log with at most <n> entries from shortlog"

5546 msgstr "fyll i loggen med som mest <n> poster från shortlog"

5547

5436 -#: builtin/fmt-merge-msg.c:666

5548 +#: builtin/fmt-merge-msg.c:672

5549 msgid "alias for --log (deprecated)"

5550 msgstr "alias för --log (avråds)"

5551

5440 -#: builtin/fmt-merge-msg.c:669

5552 +#: builtin/fmt-merge-msg.c:675

5553 msgid "text"

5554 msgstr "text"

5555

5444 -#: builtin/fmt-merge-msg.c:670

5556 +#: builtin/fmt-merge-msg.c:676

5557 msgid "use <text> as start of message"

5558 msgstr "inled meddelande med <text>"

5559

5448 -#: builtin/fmt-merge-msg.c:671

5560 +#: builtin/fmt-merge-msg.c:677

5561 msgid "file to read from"

5562 msgstr "fil att läsa från"

5563

5452 -#: builtin/for-each-ref.c:675

5564 +#: builtin/for-each-ref.c:687

5565 msgid "unable to parse format"

5566 msgstr "kan inte tolka formatet"

5567

5456 -#: builtin/for-each-ref.c:1063

5568 +#: builtin/for-each-ref.c:1083

5569 msgid "git for-each-ref [<options>] [<pattern>]"

5570 msgstr "git for-each-ref [<flaggor>] [<mönster>]"

5571

5460 -#: builtin/for-each-ref.c:1078

5572 +#: builtin/for-each-ref.c:1098

5573 msgid "quote placeholders suitably for shells"

5574 msgstr "citera platshållare passande för skal"

5575

5464 -#: builtin/for-each-ref.c:1080

5576 +#: builtin/for-each-ref.c:1100

5577 msgid "quote placeholders suitably for perl"

5578 msgstr "citera platshållare passande för perl"

5579

5468 -#: builtin/for-each-ref.c:1082

5580 +#: builtin/for-each-ref.c:1102

5581 msgid "quote placeholders suitably for python"

5582 msgstr "citera platshållare passande för python"

5583

5472 -#: builtin/for-each-ref.c:1084

5584 +#: builtin/for-each-ref.c:1104

5585 msgid "quote placeholders suitably for Tcl"

5586 msgstr "citera platshållare passande för Tcl"

5587

5476 -#: builtin/for-each-ref.c:1087

5588 +#: builtin/for-each-ref.c:1107

5589 msgid "show only <n> matched refs"

5590 msgstr "visa endast <n> träffade refs"

5591

5480 -#: builtin/for-each-ref.c:1088 builtin/replace.c:438

5592 +#: builtin/for-each-ref.c:1108 builtin/replace.c:438

5593 msgid "format"

5594 msgstr "format"

5595

5484 -#: builtin/for-each-ref.c:1088

5596 +#: builtin/for-each-ref.c:1108

5597 msgid "format to use for the output"

5598 msgstr "format att använda för utdata"

5599

5488 -#: builtin/for-each-ref.c:1089

5600 +#: builtin/for-each-ref.c:1109

5601 msgid "key"

5602 msgstr "nyckel"

5603

5492 -#: builtin/for-each-ref.c:1090

5604 +#: builtin/for-each-ref.c:1110

5605 msgid "field name to sort on"

5606 msgstr "fältnamn att sortera på"

5607

5608 # Vague original, not networking-related, but rather related to the actual

5609 # objects in the database.

5498 -#: builtin/fsck.c:147 builtin/prune.c:137

5610 +#: builtin/fsck.c:147 builtin/prune.c:236

5611 msgid "Checking connectivity"

5612 msgstr "Kontrollerar konnektivitet"

5613

5502 -#: builtin/fsck.c:540

5614 +#: builtin/fsck.c:548

5615 msgid "Checking object directories"

5616 msgstr "Kontrollerar objektkataloger"

5617

5506 -#: builtin/fsck.c:603

5618 +#: builtin/fsck.c:611

5619 msgid "git fsck [<options>] [<object>...]"

5620 msgstr "git fsck [<flaggor>] [<objekt>...]"

5621

5510 -#: builtin/fsck.c:609

5622 +#: builtin/fsck.c:617

5623 msgid "show unreachable objects"

5624 msgstr "visa onåbara objekt"

5625

5514 -#: builtin/fsck.c:610

5626 +#: builtin/fsck.c:618

5627 msgid "show dangling objects"

5628 msgstr "visa dinglande objekt"

5629

5518 -#: builtin/fsck.c:611

5630 +#: builtin/fsck.c:619

5631 msgid "report tags"

5632 msgstr "rapportera taggar"

5633

5522 -#: builtin/fsck.c:612

5634 +#: builtin/fsck.c:620

5635 msgid "report root nodes"

5636 msgstr "rapportera rotnoder"

5637

5526 -#: builtin/fsck.c:613

5638 +#: builtin/fsck.c:621

5639 msgid "make index objects head nodes"

5640 msgstr "gör indexojekt till huvudnoder"

5641

5530 -#: builtin/fsck.c:614

5642 +#: builtin/fsck.c:622

5643 msgid "make reflogs head nodes (default)"

5644 msgstr "gör refloggar till huvudnoder (standard)"

5645

5534 -#: builtin/fsck.c:615

5646 +#: builtin/fsck.c:623

5647 msgid "also consider packs and alternate objects"

5648 msgstr "ta även hänsyn till paket och alternativa objekt"

5649

5538 -#: builtin/fsck.c:616

5650 +#: builtin/fsck.c:624

5651 msgid "enable more strict checking"

5652 msgstr "aktivera striktare kontroll"

5653

5542 -#: builtin/fsck.c:618

5654 +#: builtin/fsck.c:626

5655 msgid "write dangling objects in .git/lost-found"

5656 msgstr "skriv dinglande objekt i .git/lost-found"

5657

5546 -#: builtin/fsck.c:619 builtin/prune.c:108

5658 +#: builtin/fsck.c:627 builtin/prune.c:198

5659 msgid "show progress"

5660 msgstr "visa förlopp"

5661

5550 -#: builtin/fsck.c:669

5662 +#: builtin/fsck.c:677

5663 msgid "Checking objects"

5664 msgstr "Kontrollerar objekt"

5665

@@ -5555,48 +5667,48 @@ msgstr "Kontrollerar objekt"

5667 msgid "git gc [<options>]"

5668 msgstr "git gc [<flaggor>]"

5669

5558 -#: builtin/gc.c:79

5670 +#: builtin/gc.c:67

5671 #, c-format

5560 -msgid "Invalid gc.pruneexpire: '%s'"

5561 -msgstr "Ogiltig gc.pruneexpire: '%s'"

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

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

5674

5563 -#: builtin/gc.c:107

5675 +#: builtin/gc.c:112

5676 #, c-format

5677 msgid "insanely long object directory %.*s"

5678 msgstr "tokigt lång objektkatalog %.*s"

5679

5568 -#: builtin/gc.c:276

5680 +#: builtin/gc.c:281

5681 msgid "prune unreferenced objects"

5682 msgstr "rensa ej refererade objekt"

5683

5572 -#: builtin/gc.c:278

5684 +#: builtin/gc.c:283

5685 msgid "be more thorough (increased runtime)"

5686 msgstr "var mer grundlig (ökar körtiden)"

5687

5576 -#: builtin/gc.c:279

5688 +#: builtin/gc.c:284

5689 msgid "enable auto-gc mode"

5690 msgstr "aktivera auto-gc-läge"

5691

5580 -#: builtin/gc.c:280

5692 +#: builtin/gc.c:285

5693 msgid "force running gc even if there may be another gc running"

5694 msgstr "tvinga gc-körning även om en annan gc kanske körs"

5695

5584 -#: builtin/gc.c:321

5696 +#: builtin/gc.c:327

5697 #, c-format

5698 msgid "Auto packing the repository in background for optimum performance.\n"

5699 msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"

5700

5589 -#: builtin/gc.c:323

5701 +#: builtin/gc.c:329

5702 #, c-format

5703 msgid "Auto packing the repository for optimum performance.\n"

5704 msgstr "Packar arkivet automatiskt för optimal prestanda.\n"

5705

5594 -#: builtin/gc.c:324

5706 +#: builtin/gc.c:330

5707 #, c-format

5708 msgid "See \"git help gc\" for manual housekeeping.\n"

5709 msgstr "Se \"git help gc\" för manuell hushållning.\n"

5710

5599 -#: builtin/gc.c:342

5711 +#: builtin/gc.c:348

5712 #, c-format

5713 msgid ""

5714 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

@@ -5604,7 +5716,7 @@ msgstr ""

5716 "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "

5717 "är fallet)"

5718

5607 -#: builtin/gc.c:364

5719 +#: builtin/gc.c:376

5720 msgid ""

5721 "There are too many unreachable loose objects; run 'git prune' to remove them."

5722 msgstr ""

@@ -5808,7 +5920,7 @@ msgstr "visa träffade filer i filbläddraren"

5920 msgid "allow calling of grep(1) (ignored by this build)"

5921 msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"

5922

5811 -#: builtin/grep.c:741 builtin/show-ref.c:187

5923 +#: builtin/grep.c:741 builtin/show-ref.c:189

5924 msgid "show usage"

5925 msgstr "visa användning"

5926

@@ -5836,7 +5948,7 @@ msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."

5948 msgid "both --cached and trees are given."

5949 msgstr "både --cached och träd angavs."

5950

5839 -#: builtin/hash-object.c:82

5951 +#: builtin/hash-object.c:80

5952 msgid ""

5953 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "

5954 "[--] <file>..."

@@ -5844,37 +5956,37 @@ msgstr ""

5956 "git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] "

5957 "<fil>..."

5958

5847 -#: builtin/hash-object.c:83

5959 +#: builtin/hash-object.c:81

5960 msgid "git hash-object --stdin-paths < <list-of-paths>"

5961 msgstr "git hash-object --stdin-paths < <sökvägslista>"

5962

5851 -#: builtin/hash-object.c:94 builtin/tag.c:612

5963 +#: builtin/hash-object.c:92 builtin/tag.c:612

5964 msgid "type"

5965 msgstr "typ"

5966

5855 -#: builtin/hash-object.c:94

5967 +#: builtin/hash-object.c:92

5968 msgid "object type"

5969 msgstr "objekttyp"

5970

5859 -#: builtin/hash-object.c:95

5971 +#: builtin/hash-object.c:93

5972 msgid "write the object into the object database"

5973 msgstr "skriv objektet till objektdatabasen"

5974

5863 -#: builtin/hash-object.c:97

5975 +#: builtin/hash-object.c:95

5976 msgid "read the object from stdin"

5977 msgstr "läs objektet från standard in"

5978

5867 -#: builtin/hash-object.c:99

5979 +#: builtin/hash-object.c:97

5980 msgid "store file as is without filters"

5981 msgstr "spara filen som den är utan filer"

5982

5871 -#: builtin/hash-object.c:100

5983 +#: builtin/hash-object.c:98

5984 msgid ""

5985 "just hash any random garbage to create corrupt objects for debugging Git"

5986 msgstr ""

5987 "hasha slumpmässigt skräp för att skapa korrupta objekt för felsökning av Git"

5988

5877 -#: builtin/hash-object.c:101

5989 +#: builtin/hash-object.c:99

5990 msgid "process file as it were from this path"

5991 msgstr "hantera filen som om den kom från sökvägen"

5992

@@ -6002,291 +6114,291 @@ msgstr "användning: %s%s"

6114 msgid "`git %s' is aliased to `%s'"

6115 msgstr "\"git %s\" är ett alias för \"%s\""

6116

6005 -#: builtin/index-pack.c:150

6117 +#: builtin/index-pack.c:151

6118 #, c-format

6119 msgid "unable to open %s"

6120 msgstr "kunde inte öppna %s"

6121

6010 -#: builtin/index-pack.c:200

6122 +#: builtin/index-pack.c:201

6123 #, c-format

6124 msgid "object type mismatch at %s"

6125 msgstr "objekttyp stämmer inte överens vid %s"

6126

6015 -#: builtin/index-pack.c:220

6127 +#: builtin/index-pack.c:221

6128 #, c-format

6129 msgid "did not receive expected object %s"

6130 msgstr "emottog inte det förväntade objektet %s"

6131

6020 -#: builtin/index-pack.c:223

6132 +#: builtin/index-pack.c:224

6133 #, c-format

6134 msgid "object %s: expected type %s, found %s"

6135 msgstr "objektet %s: förväntad typ %s, såg %s"

6136

6025 -#: builtin/index-pack.c:265

6137 +#: builtin/index-pack.c:266

6138 #, c-format

6139 msgid "cannot fill %d byte"

6140 msgid_plural "cannot fill %d bytes"

6141 msgstr[0] "kan inte fylla %d byte"

6142 msgstr[1] "kan inte fylla %d byte"

6143

6032 -#: builtin/index-pack.c:275

6144 +#: builtin/index-pack.c:276

6145 msgid "early EOF"

6146 msgstr "tidigt filslut"

6147

6036 -#: builtin/index-pack.c:276

6148 +#: builtin/index-pack.c:277

6149 msgid "read error on input"

6150 msgstr "indataläsfel"

6151

6040 -#: builtin/index-pack.c:288

6152 +#: builtin/index-pack.c:289

6153 msgid "used more bytes than were available"

6154 msgstr "använde fler byte än tillgängligt"

6155

6044 -#: builtin/index-pack.c:295

6156 +#: builtin/index-pack.c:296

6157 msgid "pack too large for current definition of off_t"

6158 msgstr "paket för stort för nuvarande definition av off_t"

6159

6048 -#: builtin/index-pack.c:311

6160 +#: builtin/index-pack.c:312

6161 #, c-format

6162 msgid "unable to create '%s'"

6163 msgstr "kunde inte skapa \"%s\""

6164

6053 -#: builtin/index-pack.c:316

6165 +#: builtin/index-pack.c:317

6166 #, c-format

6167 msgid "cannot open packfile '%s'"

6168 msgstr "kan inte öppna paketfilen \"%s\""

6169

6058 -#: builtin/index-pack.c:330

6170 +#: builtin/index-pack.c:331

6171 msgid "pack signature mismatch"

6172 msgstr "paketsignatur stämmer inte överens"

6173

6062 -#: builtin/index-pack.c:332

6174 +#: builtin/index-pack.c:333

6175 #, c-format

6176 msgid "pack version %<PRIu32> unsupported"

6177 msgstr "paketversion %<PRIu32> stöds ej"

6178

6067 -#: builtin/index-pack.c:350

6179 +#: builtin/index-pack.c:351

6180 #, c-format

6181 msgid "pack has bad object at offset %lu: %s"

6182 msgstr "paketet har felaktigt objekt vid index %lu: %s"

6183

6072 -#: builtin/index-pack.c:471

6184 +#: builtin/index-pack.c:472

6185 #, c-format

6186 msgid "inflate returned %d"

6187 msgstr "inflate returnerade %d"

6188

6077 -#: builtin/index-pack.c:520

6189 +#: builtin/index-pack.c:521

6190 msgid "offset value overflow for delta base object"

6191 msgstr "indexvärdespill för deltabasobjekt"

6192

6081 -#: builtin/index-pack.c:528

6193 +#: builtin/index-pack.c:529

6194 msgid "delta base offset is out of bound"

6195 msgstr "deltabasindex utanför gränsen"

6196

6085 -#: builtin/index-pack.c:536

6197 +#: builtin/index-pack.c:537

6198 #, c-format

6199 msgid "unknown object type %d"

6200 msgstr "okänd objekttyp %d"

6201

6090 -#: builtin/index-pack.c:567

6202 +#: builtin/index-pack.c:568

6203 msgid "cannot pread pack file"

6204 msgstr "kan inte utföra \"pread\" på paketfil"

6205

6094 -#: builtin/index-pack.c:569

6206 +#: builtin/index-pack.c:570

6207 #, c-format

6208 msgid "premature end of pack file, %lu byte missing"

6209 msgid_plural "premature end of pack file, %lu bytes missing"

6210 msgstr[0] "för tidigt slut på paketfilen, %lu byte saknas"

6211 msgstr[1] "för tidigt slut på paketfilen, %lu byte saknas"

6212

6101 -#: builtin/index-pack.c:595

6213 +#: builtin/index-pack.c:596

6214 msgid "serious inflate inconsistency"

6215 msgstr "allvarlig inflate-inkonsekvens"

6216

6105 -#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715

6106 -#: builtin/index-pack.c:749 builtin/index-pack.c:758

6217 +#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771

6218 +#: builtin/index-pack.c:805 builtin/index-pack.c:814

6219 #, c-format

6220 msgid "SHA1 COLLISION FOUND WITH %s !"

6221 msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"

6222

6111 -#: builtin/index-pack.c:689 builtin/pack-objects.c:162

6223 +#: builtin/index-pack.c:745 builtin/pack-objects.c:162

6224 #: builtin/pack-objects.c:254

6225 #, c-format

6226 msgid "unable to read %s"

6227 msgstr "kunde inte läsa %s"

6228

6117 -#: builtin/index-pack.c:755

6229 +#: builtin/index-pack.c:811

6230 #, c-format

6231 msgid "cannot read existing object %s"

6232 msgstr "kan inte läsa befintligt objekt %s"

6233

6122 -#: builtin/index-pack.c:769

6234 +#: builtin/index-pack.c:825

6235 #, c-format

6236 msgid "invalid blob object %s"

6237 msgstr "ogiltigt blob-objekt %s"

6238

6127 -#: builtin/index-pack.c:783

6239 +#: builtin/index-pack.c:839

6240 #, c-format

6241 msgid "invalid %s"

6242 msgstr "ogiltigt %s"

6243

6132 -#: builtin/index-pack.c:787

6244 +#: builtin/index-pack.c:843

6245 msgid "Error in object"

6246 msgstr "Fel i objekt"

6247

6136 -#: builtin/index-pack.c:789

6248 +#: builtin/index-pack.c:845

6249 #, c-format

6250 msgid "Not all child objects of %s are reachable"

6251 msgstr "Inte alla barnobjekt för %s kan nås"

6252

6141 -#: builtin/index-pack.c:861 builtin/index-pack.c:890

6253 +#: builtin/index-pack.c:917 builtin/index-pack.c:948

6254 msgid "failed to apply delta"

6255 msgstr "misslyckades tillämpa delta"

6256

6145 -#: builtin/index-pack.c:1055

6257 +#: builtin/index-pack.c:1118

6258 msgid "Receiving objects"

6259 msgstr "Tar emot objekt"

6260

6149 -#: builtin/index-pack.c:1055

6261 +#: builtin/index-pack.c:1118

6262 msgid "Indexing objects"

6263 msgstr "Skapar index för objekt"

6264

6153 -#: builtin/index-pack.c:1081

6265 +#: builtin/index-pack.c:1150

6266 msgid "pack is corrupted (SHA1 mismatch)"

6267 msgstr "paketet är trasigt (SHA1 stämmer inte)"

6268

6157 -#: builtin/index-pack.c:1086

6269 +#: builtin/index-pack.c:1155

6270 msgid "cannot fstat packfile"

6271 msgstr "kan inte utföra \"fstat\" på paketfil"

6272

6161 -#: builtin/index-pack.c:1089

6273 +#: builtin/index-pack.c:1158

6274 msgid "pack has junk at the end"

6275 msgstr "paket har skräp i slutet"

6276

6165 -#: builtin/index-pack.c:1100

6277 +#: builtin/index-pack.c:1169

6278 msgid "confusion beyond insanity in parse_pack_objects()"

6279 msgstr "förvirrad bortom vanvett i parse_pack_objects()"

6280

6169 -#: builtin/index-pack.c:1123

6281 +#: builtin/index-pack.c:1194

6282 msgid "Resolving deltas"

6283 msgstr "Analyserar delta"

6284

6173 -#: builtin/index-pack.c:1133

6285 +#: builtin/index-pack.c:1205

6286 #, c-format

6287 msgid "unable to create thread: %s"

6288 msgstr "kunde inte skapa tråd: %s"

6289

6178 -#: builtin/index-pack.c:1175

6290 +#: builtin/index-pack.c:1247

6291 msgid "confusion beyond insanity"

6292 msgstr "förvirrad bortom vanvett"

6293

6182 -#: builtin/index-pack.c:1181

6294 +#: builtin/index-pack.c:1253

6295 #, c-format

6296 msgid "completed with %d local objects"

6297 msgstr "slutfördes med %d lokala objekt"

6298

6187 -#: builtin/index-pack.c:1191

6299 +#: builtin/index-pack.c:1263

6300 #, c-format

6301 msgid "Unexpected tail checksum for %s (disk corruption?)"

6302 msgstr "Oväntad svanschecksumma för %s (trasig disk?)"

6303

6192 -#: builtin/index-pack.c:1195

6304 +#: builtin/index-pack.c:1267

6305 #, c-format

6306 msgid "pack has %d unresolved delta"

6307 msgid_plural "pack has %d unresolved deltas"

6308 msgstr[0] "paketet har %d oanalyserat delta"

6309 msgstr[1] "paketet har %d oanalyserade delta"

6310

6199 -#: builtin/index-pack.c:1219

6311 +#: builtin/index-pack.c:1291

6312 #, c-format

6313 msgid "unable to deflate appended object (%d)"

6314 msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"

6315

6204 -#: builtin/index-pack.c:1298

6316 +#: builtin/index-pack.c:1367

6317 #, c-format

6318 msgid "local object %s is corrupt"

6319 msgstr "lokalt objekt %s är trasigt"

6320

6209 -#: builtin/index-pack.c:1322

6321 +#: builtin/index-pack.c:1391

6322 msgid "error while closing pack file"

6323 msgstr "fel vid stängning av paketfil"

6324

6213 -#: builtin/index-pack.c:1335

6325 +#: builtin/index-pack.c:1404

6326 #, c-format

6327 msgid "cannot write keep file '%s'"

6328 msgstr "kan inte ta skriva \"keep\"-fil \"%s\""

6329

6218 -#: builtin/index-pack.c:1343

6330 +#: builtin/index-pack.c:1412

6331 #, c-format

6332 msgid "cannot close written keep file '%s'"

6333 msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""

6334

6223 -#: builtin/index-pack.c:1356

6335 +#: builtin/index-pack.c:1425

6336 msgid "cannot store pack file"

6337 msgstr "kan inte spara paketfil"

6338

6227 -#: builtin/index-pack.c:1367

6339 +#: builtin/index-pack.c:1436

6340 msgid "cannot store index file"

6341 msgstr "kan inte spara indexfil"

6342

6231 -#: builtin/index-pack.c:1400

6343 +#: builtin/index-pack.c:1469

6344 #, c-format

6345 msgid "bad pack.indexversion=%<PRIu32>"

6346 msgstr "felaktig pack.indexversion=%<PRIu32>"

6347

6236 -#: builtin/index-pack.c:1406

6348 +#: builtin/index-pack.c:1475

6349 #, c-format

6350 msgid "invalid number of threads specified (%d)"

6351 msgstr "felaktigt antal trådar angivet (%d)"

6352

6241 -#: builtin/index-pack.c:1410 builtin/index-pack.c:1589

6353 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1658

6354 #, c-format

6355 msgid "no threads support, ignoring %s"

6356 msgstr "trådstöd saknas, ignorerar %s"

6357

6246 -#: builtin/index-pack.c:1468

6358 +#: builtin/index-pack.c:1537

6359 #, c-format

6360 msgid "Cannot open existing pack file '%s'"

6361 msgstr "Kan inte öppna befintlig paketfil \"%s\""

6362

6251 -#: builtin/index-pack.c:1470

6363 +#: builtin/index-pack.c:1539

6364 #, c-format

6365 msgid "Cannot open existing pack idx file for '%s'"

6366 msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""

6367

6256 -#: builtin/index-pack.c:1517

6368 +#: builtin/index-pack.c:1586

6369 #, c-format

6370 msgid "non delta: %d object"

6371 msgid_plural "non delta: %d objects"

6372 msgstr[0] "icke-delta: %d objekt"

6373 msgstr[1] "icke-delta: %d objekt"

6374

6263 -#: builtin/index-pack.c:1524

6375 +#: builtin/index-pack.c:1593

6376 #, c-format

6377 msgid "chain length = %d: %lu object"

6378 msgid_plural "chain length = %d: %lu objects"

6379 msgstr[0] "kedjelängd = %d: %lu objekt"

6380 msgstr[1] "kedjelängd = %d: %lu objekt"

6381

6270 -#: builtin/index-pack.c:1553

6382 +#: builtin/index-pack.c:1622

6383 msgid "Cannot come back to cwd"

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

6385

6274 -#: builtin/index-pack.c:1601 builtin/index-pack.c:1604

6275 -#: builtin/index-pack.c:1616 builtin/index-pack.c:1620

6386 +#: builtin/index-pack.c:1670 builtin/index-pack.c:1673

6387 +#: builtin/index-pack.c:1685 builtin/index-pack.c:1689

6388 #, c-format

6389 msgid "bad %s"

6390 msgstr "felaktig %s"

6391

6280 -#: builtin/index-pack.c:1634

6392 +#: builtin/index-pack.c:1703

6393 msgid "--fix-thin cannot be used without --stdin"

6394 msgstr "--fix-thin kan inte användas med --stdin"

6395

6284 -#: builtin/index-pack.c:1638 builtin/index-pack.c:1647

6396 +#: builtin/index-pack.c:1707 builtin/index-pack.c:1716

6397 #, c-format

6398 msgid "packfile name '%s' does not end with '.pack'"

6399 msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""

6400

6289 -#: builtin/index-pack.c:1655

6401 +#: builtin/index-pack.c:1724

6402 msgid "--verify with no packfile name given"

6403 msgstr "--verify angavs utan paketfilnamn"

6404

@@ -6355,22 +6467,22 @@ msgstr "mallarna hittades inte %s"

6467 msgid "not copying templates of a wrong format version %d from '%s'"

6468 msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\""

6469

6358 -#: builtin/init-db.c:197

6470 +#: builtin/init-db.c:211

6471 #, c-format

6472 msgid "insane git directory %s"

6473 msgstr "tokig git-katalog %s"

6474

6363 -#: builtin/init-db.c:331 builtin/init-db.c:334

6475 +#: builtin/init-db.c:343 builtin/init-db.c:346

6476 #, c-format

6477 msgid "%s already exists"

6478 msgstr "%s finns redan"

6479

6368 -#: builtin/init-db.c:363

6480 +#: builtin/init-db.c:374

6481 #, c-format

6482 msgid "unable to handle file type %d"

6483 msgstr "kan inte hantera filtyp %d"

6484

6373 -#: builtin/init-db.c:366

6485 +#: builtin/init-db.c:377

6486 #, c-format

6487 msgid "unable to move %s to %s"

6488 msgstr "kan inte flytta %s till %s"

@@ -6378,54 +6490,54 @@ msgstr "kan inte flytta %s till %s"

6490 #. TRANSLATORS: The first '%s' is either "Reinitialized

6491 #. existing" or "Initialized empty", the second " shared" or

6492 #. "", and the last '%s%s' is the verbatim directory name.

6381 -#: builtin/init-db.c:426

6493 +#: builtin/init-db.c:433

6494 #, c-format

6495 msgid "%s%s Git repository in %s%s\n"

6496 msgstr "%s%s Git-arkiv i %s%s\n"

6497

6386 -#: builtin/init-db.c:427

6498 +#: builtin/init-db.c:434

6499 msgid "Reinitialized existing"

6500 msgstr "Ominitierade befintligt"

6501

6390 -#: builtin/init-db.c:427

6502 +#: builtin/init-db.c:434

6503 msgid "Initialized empty"

6504 msgstr "Initierade tomt"

6505

6394 -#: builtin/init-db.c:428

6506 +#: builtin/init-db.c:435

6507 msgid " shared"

6508 msgstr " delat"

6509

6398 -#: builtin/init-db.c:475

6510 +#: builtin/init-db.c:482

6511 msgid ""

6400 -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"

6401 -"[=<permissions>]] [<directory>]"

6512 +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

6513 +"shared[=<permissions>]] [<directory>]"

6514 msgstr ""

6403 -"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--shared"

6404 -"[=<behörigheter>]] [<katalog>]"

6515 +"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"

6516 +"shared[=<behörigheter>]] [<katalog>]"

6517

6406 -#: builtin/init-db.c:498

6518 +#: builtin/init-db.c:505

6519 msgid "permissions"

6520 msgstr "behörigheter"

6521

6410 -#: builtin/init-db.c:499

6522 +#: builtin/init-db.c:506

6523 msgid "specify that the git repository is to be shared amongst several users"

6524 msgstr "ange att git-arkivet skall delas bland flera användare"

6525

6414 -#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171

6526 +#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171

6527 msgid "be quiet"

6528 msgstr "var tyst"

6529

6418 -#: builtin/init-db.c:533 builtin/init-db.c:538

6530 +#: builtin/init-db.c:540 builtin/init-db.c:545

6531 #, c-format

6532 msgid "cannot mkdir %s"

6533 msgstr "kan inte skapa katalogen (mkdir) %s"

6534

6423 -#: builtin/init-db.c:542

6535 +#: builtin/init-db.c:549

6536 #, c-format

6537 msgid "cannot chdir to %s"

6538 msgstr "kan inte byta katalog (chdir) till %s"

6539

6428 -#: builtin/init-db.c:563

6540 +#: builtin/init-db.c:570

6541 #, c-format

6542 msgid ""

6543 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

@@ -6434,7 +6546,7 @@ msgstr ""

6546 "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"

6547 "dir=<katalog>)"

6548

6437 -#: builtin/init-db.c:591

6549 +#: builtin/init-db.c:598

6550 #, c-format

6551 msgid "Cannot access work tree '%s'"

6552 msgstr "Kan inte komma åt arbetskatalogen \"%s\""

@@ -6444,8 +6556,8 @@ msgid ""

6556 "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "

6557 "[<file>...]"

6558 msgstr ""

6447 -"git interpret-trailers [--trim-empty] [(--trailer <symbol>[(=|:)"

6448 -"<värde>])...] [<fil>...]"

6559 +"git interpret-trailers [--trim-empty] [(--trailer "

6560 +"<symbol>[(=|:)<värde>])...] [<fil>...]"

6561

6562 #: builtin/interpret-trailers.c:25

6563 msgid "trim empty trailers"

@@ -6460,7 +6572,7 @@ msgid "trailer(s) to add"

6572 msgstr "släprad(er) att lägga till"

6573

6574 #: builtin/log.c:41

6463 -msgid "git log [<options>] [<revision range>] [[--] <path>...]"

6575 +msgid "git log [<options>] [<revision-range>] [[--] <path>...]"

6576 msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"

6577

6578 #: builtin/log.c:42

@@ -6529,7 +6641,7 @@ msgstr "Kan inte öppna patchfilen %s"

6641 msgid "Need exactly one range."

6642 msgstr "Behöver precis ett intervall."

6643

6532 -#: builtin/log.c:811

6644 +#: builtin/log.c:813

6645 msgid "Not a range."

6646 msgstr "Inte ett intervall."

6647

@@ -6729,13 +6841,13 @@ msgstr "Misslyckades skapa utdatafiler"

6841 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

6842 msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"

6843

6732 -#: builtin/log.c:1638

6844 +#: builtin/log.c:1637

6845 #, c-format

6846 msgid ""

6847 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

6848 msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"

6849

6738 -#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665

6850 +#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662

6851 #, c-format

6852 msgid "Unknown commit %s"

6853 msgstr "Okänd incheckning %s"

@@ -7008,42 +7120,42 @@ msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"

7120 msgid "'%s' does not point to a commit"

7121 msgstr "\"%s\" verkar inte peka på en incheckning"

7122

7011 -#: builtin/merge.c:559

7123 +#: builtin/merge.c:537

7124 #, c-format

7125 msgid "Bad branch.%s.mergeoptions string: %s"

7126 msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"

7127

7016 -#: builtin/merge.c:654

7128 +#: builtin/merge.c:632

7129 msgid "git write-tree failed to write a tree"

7130 msgstr "git write-tree misslyckades skriva ett träd"

7131

7020 -#: builtin/merge.c:678

7132 +#: builtin/merge.c:656

7133 msgid "Not handling anything other than two heads merge."

7134 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."

7135

7024 -#: builtin/merge.c:692

7136 +#: builtin/merge.c:670

7137 #, c-format

7138 msgid "Unknown option for merge-recursive: -X%s"

7139 msgstr "Felaktig flagga för merge-recursive: -X%s"

7140

7029 -#: builtin/merge.c:705

7141 +#: builtin/merge.c:683

7142 #, c-format

7143 msgid "unable to write %s"

7144 msgstr "kunde inte skriva %s"

7145

7034 -#: builtin/merge.c:794

7146 +#: builtin/merge.c:772

7147 #, c-format

7148 msgid "Could not read from '%s'"

7149 msgstr "Kunde inte läsa från \"%s\""

7150

7039 -#: builtin/merge.c:803

7151 +#: builtin/merge.c:781

7152 #, c-format

7153 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

7154 msgstr ""

7155 "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "

7156 "den.\n"

7157

7046 -#: builtin/merge.c:809

7158 +#: builtin/merge.c:787

7159 #, c-format

7160 msgid ""

7161 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -7059,48 +7171,53 @@ msgstr ""

7171 "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"

7172 "avbryter incheckningen.\n"

7173

7062 -#: builtin/merge.c:833

7174 +#: builtin/merge.c:811

7175 msgid "Empty commit message."

7176 msgstr "Tomt incheckningsmeddelande."

7177

7066 -#: builtin/merge.c:845

7178 +#: builtin/merge.c:823

7179 #, c-format

7180 msgid "Wonderful.\n"

7181 msgstr "Underbart.\n"

7182

7071 -#: builtin/merge.c:900

7183 +#: builtin/merge.c:878

7184 #, c-format

7185 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

7186 msgstr ""

7187 "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"

7188

7077 -#: builtin/merge.c:916

7189 +#: builtin/merge.c:894

7190 #, c-format

7191 msgid "'%s' is not a commit"

7192 msgstr "\"%s\" är inte en incheckning"

7193

7082 -#: builtin/merge.c:957

7194 +#: builtin/merge.c:935

7195 msgid "No current branch."

7196 msgstr "Inte på någon gren."

7197

7086 -#: builtin/merge.c:959

7198 +#: builtin/merge.c:937

7199 msgid "No remote for the current branch."

7200 msgstr "Ingen fjärr för aktuell gren."

7201

7090 -#: builtin/merge.c:961

7202 +#: builtin/merge.c:939

7203 msgid "No default upstream defined for the current branch."

7204 msgstr "Ingen standarduppström angiven för aktuell gren."

7205

7094 -#: builtin/merge.c:966

7206 +#: builtin/merge.c:944

7207 #, c-format

7208 msgid "No remote-tracking branch for %s from %s"

7209 msgstr "Ingen fjärrspårande gren för %s från %s"

7210

7099 -#: builtin/merge.c:1122

7211 +#: builtin/merge.c:1081

7212 +#, c-format

7213 +msgid "could not close '%s'"

7214 +msgstr "kunde inte stänga \"%s\""

7215 +

7216 +#: builtin/merge.c:1208

7217 msgid "There is no merge to abort (MERGE_HEAD missing)."

7218 msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)."

7219

7103 -#: builtin/merge.c:1138

7220 +#: builtin/merge.c:1224

7221 msgid ""

7222 "You have not concluded your merge (MERGE_HEAD exists).\n"

7223 "Please, commit your changes before you merge."

@@ -7108,11 +7225,11 @@ msgstr ""

7225 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"

7226 "Checka in dina ändringar innan du slår ihop."

7227

7111 -#: builtin/merge.c:1141 git-pull.sh:34

7228 +#: builtin/merge.c:1227 git-pull.sh:74

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

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

7231

7115 -#: builtin/merge.c:1145

7232 +#: builtin/merge.c:1231

7233 msgid ""

7234 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

7235 "Please, commit your changes before you merge."

@@ -7120,102 +7237,102 @@ msgstr ""

7237 "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"

7238 "Checka in dina ändringar innan du slår ihop."

7239

7123 -#: builtin/merge.c:1148

7240 +#: builtin/merge.c:1234

7241 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

7242 msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."

7243

7127 -#: builtin/merge.c:1157

7244 +#: builtin/merge.c:1243

7245 msgid "You cannot combine --squash with --no-ff."

7246 msgstr "Du kan inte kombinera --squash med --no-ff."

7247

7131 -#: builtin/merge.c:1166

7248 +#: builtin/merge.c:1251

7249 msgid "No commit specified and merge.defaultToUpstream not set."

7250 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."

7251

7135 -#: builtin/merge.c:1198

7136 -msgid "Can merge only exactly one commit into empty head"

7137 -msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."

7138 -

7139 -#: builtin/merge.c:1201

7252 +#: builtin/merge.c:1268

7253 msgid "Squash commit into empty head not supported yet"

7254 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"

7255

7143 -#: builtin/merge.c:1203

7256 +#: builtin/merge.c:1270

7257 msgid "Non-fast-forward commit does not make sense into an empty head"

7258 msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"

7259

7147 -#: builtin/merge.c:1208

7260 +#: builtin/merge.c:1276

7261 #, c-format

7262 msgid "%s - not something we can merge"

7263 msgstr "%s - inte något vi kan slå ihop"

7264

7152 -#: builtin/merge.c:1259

7265 +#: builtin/merge.c:1278

7266 +msgid "Can merge only exactly one commit into empty head"

7267 +msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."

7268 +

7269 +#: builtin/merge.c:1333

7270 #, c-format

7271 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

7272 msgstr ""

7273 "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."

7274

7158 -#: builtin/merge.c:1262

7275 +#: builtin/merge.c:1336

7276 #, c-format

7277 msgid "Commit %s has a bad GPG signature allegedly by %s."

7278 msgstr ""

7279 "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."

7280

7164 -#: builtin/merge.c:1265

7281 +#: builtin/merge.c:1339

7282 #, c-format

7283 msgid "Commit %s does not have a GPG signature."

7284 msgstr "Incheckning %s har inte någon GPG-signatur."

7285

7169 -#: builtin/merge.c:1268

7286 +#: builtin/merge.c:1342

7287 #, c-format

7288 msgid "Commit %s has a good GPG signature by %s\n"

7289 msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"

7290

7174 -#: builtin/merge.c:1349

7291 +#: builtin/merge.c:1423

7292 #, c-format

7293 msgid "Updating %s..%s\n"

7294 msgstr "Uppdaterar %s..%s\n"

7295

7179 -#: builtin/merge.c:1388

7296 +#: builtin/merge.c:1462

7297 #, c-format

7298 msgid "Trying really trivial in-index merge...\n"

7299 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"

7300

7184 -#: builtin/merge.c:1395

7301 +#: builtin/merge.c:1469

7302 #, c-format

7303 msgid "Nope.\n"

7304 msgstr "Nej.\n"

7305

7189 -#: builtin/merge.c:1427

7306 +#: builtin/merge.c:1501

7307 msgid "Not possible to fast-forward, aborting."

7308 msgstr "Kan inte snabbspola, avbryter."

7309

7193 -#: builtin/merge.c:1450 builtin/merge.c:1529

7310 +#: builtin/merge.c:1524 builtin/merge.c:1603

7311 #, c-format

7312 msgid "Rewinding the tree to pristine...\n"

7313 msgstr "Återspolar trädet till orört...\n"

7314

7198 -#: builtin/merge.c:1454

7315 +#: builtin/merge.c:1528

7316 #, c-format

7317 msgid "Trying merge strategy %s...\n"

7318 msgstr "Försöker sammanslagningsstrategin %s...\n"

7319

7203 -#: builtin/merge.c:1520

7320 +#: builtin/merge.c:1594

7321 #, c-format

7322 msgid "No merge strategy handled the merge.\n"

7323 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"

7324

7208 -#: builtin/merge.c:1522

7325 +#: builtin/merge.c:1596

7326 #, c-format

7327 msgid "Merge with strategy %s failed.\n"

7328 msgstr "Sammanslagning med strategin %s misslyckades.\n"

7329

7213 -#: builtin/merge.c:1531

7330 +#: builtin/merge.c:1605

7331 #, c-format

7332 msgid "Using the %s to prepare resolving by hand.\n"

7333 msgstr "Använder %s för att förbereda lösning för hand.\n"

7334

7218 -#: builtin/merge.c:1543

7335 +#: builtin/merge.c:1617

7336 #, c-format

7337 msgid "Automatic merge went well; stopped before committing as requested\n"

7338 msgstr ""

@@ -7405,7 +7522,7 @@ msgstr "%s, källa=%s, mål=%s"

7522 msgid "Renaming %s to %s\n"

7523 msgstr "Byter namn på %s till %s\n"

7524

7408 -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359

7525 +#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361

7526 #, c-format

7527 msgid "renaming '%s' failed"

7528 msgstr "misslyckades byta namn på \"%s\""

@@ -7781,7 +7898,7 @@ msgstr "anteckningar-ref"

7898 msgid "use notes from <notes-ref>"

7899 msgstr "använd anteckningar från <anteckningsref>"

7900

7784 -#: builtin/notes.c:989 builtin/remote.c:1621

7901 +#: builtin/notes.c:989 builtin/remote.c:1618

7902 #, c-format

7903 msgid "Unknown subcommand: %s"

7904 msgstr "Okänt underkommando: %s"

@@ -7803,171 +7920,171 @@ msgstr "fel i deflate (%d)"

7920 msgid "Writing objects"

7921 msgstr "Skriver objekt"

7922

7806 -#: builtin/pack-objects.c:1013

7923 +#: builtin/pack-objects.c:1011

7924 msgid "disabling bitmap writing, as some objects are not being packed"

7925 msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"

7926

7810 -#: builtin/pack-objects.c:2173

7927 +#: builtin/pack-objects.c:2171

7928 msgid "Compressing objects"

7929 msgstr "Komprimerar objekt"

7930

7814 -#: builtin/pack-objects.c:2570

7931 +#: builtin/pack-objects.c:2568

7932 #, c-format

7933 msgid "unsupported index version %s"

7934 msgstr "indexversionen %s stöds ej"

7935

7819 -#: builtin/pack-objects.c:2574

7936 +#: builtin/pack-objects.c:2572

7937 #, c-format

7938 msgid "bad index version '%s'"

7939 msgstr "felaktig indexversion \"%s\""

7940

7824 -#: builtin/pack-objects.c:2597

7941 +#: builtin/pack-objects.c:2595

7942 #, c-format

7943 msgid "option %s does not accept negative form"

7944 msgstr "flaggan %s godtar inte negativ form"

7945

7829 -#: builtin/pack-objects.c:2601

7946 +#: builtin/pack-objects.c:2599

7947 #, c-format

7948 msgid "unable to parse value '%s' for option %s"

7949 msgstr "kunde inte tolka värdet \"%s\" för flaggan %s"

7950

7834 -#: builtin/pack-objects.c:2621

7951 +#: builtin/pack-objects.c:2619

7952 msgid "do not show progress meter"

7953 msgstr "visa inte förloppsindikator"

7954

7838 -#: builtin/pack-objects.c:2623

7955 +#: builtin/pack-objects.c:2621

7956 msgid "show progress meter"

7957 msgstr "visa förloppsindikator"

7958

7842 -#: builtin/pack-objects.c:2625

7959 +#: builtin/pack-objects.c:2623

7960 msgid "show progress meter during object writing phase"

7961 msgstr "visa förloppsindikator under objektskrivningsfasen"

7962

7846 -#: builtin/pack-objects.c:2628

7963 +#: builtin/pack-objects.c:2626

7964 msgid "similar to --all-progress when progress meter is shown"

7965 msgstr "som --all-progress när förloppsmätaren visas"

7966

7850 -#: builtin/pack-objects.c:2629

7967 +#: builtin/pack-objects.c:2627

7968 msgid "version[,offset]"

7969 msgstr "version[,offset]"

7970

7854 -#: builtin/pack-objects.c:2630

7971 +#: builtin/pack-objects.c:2628

7972 msgid "write the pack index file in the specified idx format version"

7973 msgstr "skriv paketindexfilen i angiven indexformatversion"

7974

7858 -#: builtin/pack-objects.c:2633

7975 +#: builtin/pack-objects.c:2631

7976 msgid "maximum size of each output pack file"

7977 msgstr "maximal storlek på varje utdatapaketfil"

7978

7862 -#: builtin/pack-objects.c:2635

7979 +#: builtin/pack-objects.c:2633

7980 msgid "ignore borrowed objects from alternate object store"

7981 msgstr "ignorera lånade objekt från alternativa objektlager"

7982

7866 -#: builtin/pack-objects.c:2637

7983 +#: builtin/pack-objects.c:2635

7984 msgid "ignore packed objects"

7985 msgstr "ignorera packade objekt"

7986

7870 -#: builtin/pack-objects.c:2639

7987 +#: builtin/pack-objects.c:2637

7988 msgid "limit pack window by objects"

7989 msgstr "begränsa paketfönster efter objekt"

7990

7874 -#: builtin/pack-objects.c:2641

7991 +#: builtin/pack-objects.c:2639

7992 msgid "limit pack window by memory in addition to object limit"

7993 msgstr "begränsa paketfönster efter minne förutom objektgräns"

7994

7878 -#: builtin/pack-objects.c:2643

7995 +#: builtin/pack-objects.c:2641

7996 msgid "maximum length of delta chain allowed in the resulting pack"

7997 msgstr "maximal längd på deltakedja tillåten i slutligt paket"

7998

7882 -#: builtin/pack-objects.c:2645

7999 +#: builtin/pack-objects.c:2643

8000 msgid "reuse existing deltas"

8001 msgstr "återanvänd befintliga delta"

8002

7886 -#: builtin/pack-objects.c:2647

8003 +#: builtin/pack-objects.c:2645

8004 msgid "reuse existing objects"

8005 msgstr "återanvänd befintliga objekt"

8006

7890 -#: builtin/pack-objects.c:2649

8007 +#: builtin/pack-objects.c:2647

8008 msgid "use OFS_DELTA objects"

8009 msgstr "använd OFS_DELTA-objekt"

8010

7894 -#: builtin/pack-objects.c:2651

8011 +#: builtin/pack-objects.c:2649

8012 msgid "use threads when searching for best delta matches"

8013 msgstr "använd trådar vid sökning efter bästa deltaträffar"

8014

7898 -#: builtin/pack-objects.c:2653

8015 +#: builtin/pack-objects.c:2651

8016 msgid "do not create an empty pack output"

l10n: sv.po: Update Swedish translation (2355t0f0u)