2a26377047 · matheusbsbs/matheus-bagliano

@@ -1,14 +1,14 @@

1 # Swedish translations for Git.

3 # This file is distributed under the same license as the Git package.

4 -# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014.

4 +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015.

5 #

6 msgid ""

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2014-11-20 09:42+0800\n"

11 -"PO-Revision-Date: 2014-11-20 16:10+0800\n"

10 +"POT-Creation-Date: 2015-01-13 14:05+0800\n"

11 +"PO-Revision-Date: 2015-01-14 22:51+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"

@@ -49,76 +49,76 @@ msgstr ""

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

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

51

52 -#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328

52 +#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328

53 #, c-format

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

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

56

57 -#: archive.c:419

57 +#: archive.c:427

58 msgid "fmt"

59 msgstr "fmt"

60

61 -#: archive.c:419

61 +#: archive.c:427

62 msgid "archive format"

63 msgstr "arkivformat"

64

65 -#: archive.c:420 builtin/log.c:1204

65 +#: archive.c:428 builtin/log.c:1204

66 msgid "prefix"

67 msgstr "prefix"

68

69 -#: archive.c:421

69 +#: archive.c:429

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

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

72

73 -#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517

73 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517

74 #: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986

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

76 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411

77 -#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151

76 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394

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

78 msgid "file"

79 msgstr "fil"

80

81 -#: archive.c:423 builtin/archive.c:89

81 +#: archive.c:431 builtin/archive.c:89

82 msgid "write the archive to this file"

83 msgstr "skriv arkivet till filen"

84

85 -#: archive.c:425

85 +#: archive.c:433

86 msgid "read .gitattributes in working directory"

87 msgstr "läs .gitattributes i arbetskatalogen"

88

89 -#: archive.c:426

89 +#: archive.c:434

90 msgid "report archived files on stderr"

91 msgstr "rapportera arkiverade filer på standard fel"

92

93 -#: archive.c:427

93 +#: archive.c:435

94 msgid "store only"

95 msgstr "endast spara"

96

97 -#: archive.c:428

97 +#: archive.c:436

98 msgid "compress faster"

99 msgstr "komprimera snabbare"

100

101 -#: archive.c:436

101 +#: archive.c:444

102 msgid "compress better"

103 msgstr "komprimera bättre"

104

105 -#: archive.c:439

105 +#: archive.c:447

106 msgid "list supported archive formats"

107 msgstr "visa understödda arkivformat"

108

109 -#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85

109 +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86

110 msgid "repo"

111 msgstr "arkiv"

112

113 -#: archive.c:442 builtin/archive.c:91

113 +#: archive.c:450 builtin/archive.c:91

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

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

116

117 -#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490

117 +#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478

118 msgid "command"

119 msgstr "kommando"

120

121 -#: archive.c:444 builtin/archive.c:93

121 +#: archive.c:452 builtin/archive.c:93

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

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

124

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

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

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

253

254 -#: bundle.c:87 builtin/commit.c:788

254 +#: bundle.c:87 builtin/commit.c:770

255 #, c-format

256 msgid "could not open '%s'"

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

@@ -260,9 +260,9 @@ msgstr "kunde inte öppna \"%s\""

260 msgid "Repository lacks these prerequisite commits:"

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

262

263 -#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706

264 -#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330

265 -#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357

263 +#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706

264 +#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330

265 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358

266 #: builtin/shortlog.c:158

267 msgid "revision walk setup failed"

268 msgstr "misslyckades skapa revisionstraversering"

@@ -320,7 +320,7 @@ msgstr "kan inte skapa \"%s\""

320 msgid "index-pack died"

321 msgstr "index-pack dog"

322

323 -#: color.c:157

323 +#: color.c:259

324 #, c-format

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

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

@@ -369,25 +369,25 @@ msgstr "felaktigt zlib-komprimeringsgrad %d"

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

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

371

372 -#: config.c:1201

372 +#: config.c:1211

373 msgid "unable to parse command-line config"

374 msgstr "kan inte tolka kommandoradskonfiguration"

375

376 -#: config.c:1262

376 +#: config.c:1272

377 msgid "unknown error occured while reading the configuration files"

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

379

380 -#: config.c:1586

380 +#: config.c:1596

381 #, c-format

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

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

384

385 -#: config.c:1588

385 +#: config.c:1598

386 #, c-format

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

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

389

390 -#: config.c:1647

390 +#: config.c:1657

391 #, c-format

392 msgid "%s has multiple values"

393 msgstr "%s har flera värden"

@@ -631,11 +631,11 @@ msgstr[1] ""

631 msgid "%s: %s - %s"

632 msgstr "%s: %s - %s"

633

634 -#: lockfile.c:275

634 +#: lockfile.c:283

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

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

637

638 -#: lockfile.c:277

638 +#: lockfile.c:285

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

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

641

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

643 msgid "failed to read the cache"

644 msgstr "misslyckades läsa cachen"

645

646 -#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562

647 -#: builtin/clone.c:659

646 +#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580

647 +#: builtin/clone.c:662

648 msgid "unable to write new index file"

649 msgstr "kunde inte skriva ny indexfil"

650

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

662 msgid "error building trees"

663 msgstr "fel vid byggande av träd"

664

665 -#: merge-recursive.c:691

665 +#: merge-recursive.c:688

666 #, c-format

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

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

669

670 -#: merge-recursive.c:702

670 +#: merge-recursive.c:699

671 #, c-format

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

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

674

675 -#: merge-recursive.c:716 merge-recursive.c:737

675 +#: merge-recursive.c:713 merge-recursive.c:734

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

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

678

679 -#: merge-recursive.c:727

679 +#: merge-recursive.c:724

680 #, c-format

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

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

683

684 -#: merge-recursive.c:767

684 +#: merge-recursive.c:764

685 #, c-format

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

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

688

689 -#: merge-recursive.c:769

689 +#: merge-recursive.c:766

690 #, c-format

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

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

693

694 -#: merge-recursive.c:792 builtin/clone.c:318

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

695 #, c-format

696 msgid "failed to open '%s'"

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

698

699 -#: merge-recursive.c:800

699 +#: merge-recursive.c:797

700 #, c-format

701 msgid "failed to symlink '%s'"

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

703

704 -#: merge-recursive.c:803

704 +#: merge-recursive.c:800

705 #, c-format

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

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

708

709 -#: merge-recursive.c:941

709 +#: merge-recursive.c:938

710 msgid "Failed to execute internal merge"

711 msgstr "Misslyckades exekvera intern sammanslagning"

712

713 -#: merge-recursive.c:945

713 +#: merge-recursive.c:942

714 #, c-format

715 msgid "Unable to add %s to database"

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

717

718 -#: merge-recursive.c:961

718 +#: merge-recursive.c:958

719 msgid "unsupported object type in the tree"

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

721

722 -#: merge-recursive.c:1036 merge-recursive.c:1050

722 +#: merge-recursive.c:1033 merge-recursive.c:1047

723 #, c-format

724 msgid ""

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

@@ -728,7 +728,7 @@ msgstr ""

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

729 "i trädet."

730

731 -#: merge-recursive.c:1042 merge-recursive.c:1055

731 +#: merge-recursive.c:1039 merge-recursive.c:1052

732 #, c-format

733 msgid ""

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

@@ -737,20 +737,20 @@ msgstr ""

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

738 "i trädet vid %s."

739

740 -#: merge-recursive.c:1096

740 +#: merge-recursive.c:1093

741 msgid "rename"

742 msgstr "namnbyte"

743

744 -#: merge-recursive.c:1096

744 +#: merge-recursive.c:1093

745 msgid "renamed"

746 msgstr "namnbytt"

747

748 -#: merge-recursive.c:1152

748 +#: merge-recursive.c:1149

749 #, c-format

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

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

752

753 -#: merge-recursive.c:1174

753 +#: merge-recursive.c:1171

754 #, c-format

755 msgid ""

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

@@ -759,144 +759,144 @@ msgstr ""

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

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

761

762 -#: merge-recursive.c:1179

762 +#: merge-recursive.c:1176

763 msgid " (left unresolved)"

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

765

766 -#: merge-recursive.c:1233

766 +#: merge-recursive.c:1230

767 #, c-format

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

769 msgstr ""

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

771

772 -#: merge-recursive.c:1263

772 +#: merge-recursive.c:1260

773 #, c-format

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

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

776

777 -#: merge-recursive.c:1462

777 +#: merge-recursive.c:1459

778 #, c-format

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

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

781

782 -#: merge-recursive.c:1472

782 +#: merge-recursive.c:1469

783 #, c-format

784 msgid "Adding merged %s"

785 msgstr "Lägger till sammanslagen %s"

786

787 -#: merge-recursive.c:1477 merge-recursive.c:1675

787 +#: merge-recursive.c:1474 merge-recursive.c:1672

788 #, c-format

789 msgid "Adding as %s instead"

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

791

792 -#: merge-recursive.c:1528

792 +#: merge-recursive.c:1525

793 #, c-format

794 msgid "cannot read object %s"

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

796

797 -#: merge-recursive.c:1531

797 +#: merge-recursive.c:1528

798 #, c-format

799 msgid "object %s is not a blob"

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

801

802 -#: merge-recursive.c:1579

802 +#: merge-recursive.c:1576

803 msgid "modify"

804 msgstr "ändra"

805

806 -#: merge-recursive.c:1579

806 +#: merge-recursive.c:1576

807 msgid "modified"

808 msgstr "ändrad"

809

810 -#: merge-recursive.c:1589

810 +#: merge-recursive.c:1586

811 msgid "content"

812 msgstr "innehåll"

813

814 -#: merge-recursive.c:1596

814 +#: merge-recursive.c:1593

815 msgid "add/add"

816 msgstr "tillägg/tillägg"

817

818 -#: merge-recursive.c:1630

818 +#: merge-recursive.c:1627

819 #, c-format

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

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

822

823 -#: merge-recursive.c:1644

823 +#: merge-recursive.c:1641

824 #, c-format

825 msgid "Auto-merging %s"

826 msgstr "Slår ihop %s automatiskt"

827

828 -#: merge-recursive.c:1648 git-submodule.sh:1150

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

829 msgid "submodule"

830 msgstr "undermodul"

831

832 -#: merge-recursive.c:1649

832 +#: merge-recursive.c:1646

833 #, c-format

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

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

836

837 -#: merge-recursive.c:1735

837 +#: merge-recursive.c:1732

838 #, c-format

839 msgid "Removing %s"

840 msgstr "Tar bort %s"

841

842 -#: merge-recursive.c:1760

842 +#: merge-recursive.c:1757

843 msgid "file/directory"

844 msgstr "fil/katalog"

845

846 -#: merge-recursive.c:1766

846 +#: merge-recursive.c:1763

847 msgid "directory/file"

848 msgstr "katalog/fil"

849

850 -#: merge-recursive.c:1771

850 +#: merge-recursive.c:1768

851 #, c-format

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

853 msgstr ""

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

855

856 -#: merge-recursive.c:1781

856 +#: merge-recursive.c:1778

857 #, c-format

858 msgid "Adding %s"

859 msgstr "Lägger till %s"

860

861 -#: merge-recursive.c:1798

861 +#: merge-recursive.c:1795

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

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

864

865 -#: merge-recursive.c:1817

865 +#: merge-recursive.c:1814

866 msgid "Already up-to-date!"

867 msgstr "Redan à jour!"

868

869 -#: merge-recursive.c:1826

869 +#: merge-recursive.c:1823

870 #, c-format

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

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

873

874 -#: merge-recursive.c:1856

874 +#: merge-recursive.c:1853

875 #, c-format

876 msgid "Unprocessed path??? %s"

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

878

879 -#: merge-recursive.c:1901

879 +#: merge-recursive.c:1898

880 msgid "Merging:"

881 msgstr "Slår ihop:"

882

883 -#: merge-recursive.c:1914

883 +#: merge-recursive.c:1911

884 #, c-format

885 msgid "found %u common ancestor:"

886 msgid_plural "found %u common ancestors:"

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

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

889

890 -#: merge-recursive.c:1951

890 +#: merge-recursive.c:1948

891 msgid "merge returned no commit"

892 msgstr "sammanslagningen returnerade ingen incheckning"

893

894 -#: merge-recursive.c:2008

894 +#: merge-recursive.c:2005

895 #, c-format

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

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

898

899 -#: merge-recursive.c:2019 builtin/merge.c:666

899 +#: merge-recursive.c:2016 builtin/merge.c:667

900 msgid "Unable to write index."

901 msgstr "Kunde inte skriva indexet."

902

@@ -904,19 +904,19 @@ msgstr "Kunde inte skriva indexet."

904 msgid "Cannot commit uninitialized/unreferenced notes tree"

905 msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"

906

907 -#: notes-utils.c:83

907 +#: notes-utils.c:82

908 #, c-format

909 msgid "Bad notes.rewriteMode value: '%s'"

910 msgstr "Felaktigt värde för notes.rewriteMode: '%s'"

911

912 -#: notes-utils.c:93

912 +#: notes-utils.c:92

913 #, c-format

914 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

915 msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"

916

917 #. TRANSLATORS: The first %s is the name of the

918 #. environment variable, the second %s is its value

919 -#: notes-utils.c:120

919 +#: notes-utils.c:119

920 #, c-format

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

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

@@ -1024,7 +1024,7 @@ msgstr "kunde inte tolka format för --pretty"

1024 msgid "done"

1025 msgstr "klart"

1026

1027 -#: read-cache.c:1261

1027 +#: read-cache.c:1267

1028 #, c-format

1029 msgid ""

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

@@ -1033,7 +1033,7 @@ msgstr ""

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

1034 "Använder version %i"

1035

1036 -#: read-cache.c:1271

1036 +#: read-cache.c:1277

1037 #, c-format

1038 msgid ""

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

@@ -1061,32 +1061,32 @@ msgstr "%s spårar både %s och %s"

1061 msgid "Internal error"

1062 msgstr "Internt fel"

1063

1064 -#: remote.c:1968

1064 +#: remote.c:1980

1065 #, c-format

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

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

1068

1069 -#: remote.c:1972

1069 +#: remote.c:1984

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

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

1072

1073 -#: remote.c:1975

1073 +#: remote.c:1987

1074 #, c-format

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

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

1077

1078 -#: remote.c:1979

1078 +#: remote.c:1991

1079 #, c-format

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

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

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

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

1084

1085 -#: remote.c:1985

1085 +#: remote.c:1997

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

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

1088

1089 -#: remote.c:1988

1089 +#: remote.c:2000

1090 #, c-format

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

1092 msgid_plural ""

@@ -1096,11 +1096,11 @@ msgstr[0] ""

1096 msgstr[1] ""

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

1098

1099 -#: remote.c:1996

1099 +#: remote.c:2008

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

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

1102

1103 -#: remote.c:1999

1103 +#: remote.c:2011

1104 #, c-format

1105 msgid ""

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

@@ -1115,7 +1115,7 @@ msgstr[1] ""

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

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

1117

1118 -#: remote.c:2009

1118 +#: remote.c:2021

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

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

1121

@@ -1128,22 +1128,22 @@ msgstr "misslyckades öppna /dev/null"

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

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

1130

1131 -#: send-pack.c:265

1131 +#: send-pack.c:268

1132 msgid "failed to sign the push certificate"

1133 msgstr "misslyckades underteckna push-certifikatet"

1134

1135 -#: send-pack.c:322

1135 +#: send-pack.c:325

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

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

1138

1139 -#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892

1140 -#: builtin/merge.c:1002 builtin/merge.c:1012

1139 +#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995

1140 +#: builtin/merge.c:1005

1141 #, c-format

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

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

1144

1145 -#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784

1146 -#: builtin/merge.c:1004 builtin/merge.c:1017

1145 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997

1146 +#: builtin/merge.c:1010

1147 #, c-format

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

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

@@ -1166,7 +1166,7 @@ msgstr ""

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

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

1168

1169 -#: sequencer.c:211 sequencer.c:852 sequencer.c:935

1169 +#: sequencer.c:211 sequencer.c:856 sequencer.c:939

1170 #, c-format

1171 msgid "Could not write to %s"

1172 msgstr "Kunde inte skriva till %s"

@@ -1189,197 +1189,197 @@ msgid "Commit your changes or stash them to proceed."

1189 msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta."

1190

1191 #. TRANSLATORS: %s will be "revert" or "cherry-pick"

1192 -#: sequencer.c:304

1192 +#: sequencer.c:321

1193 #, c-format

1194 msgid "%s: Unable to write new index file"

1195 msgstr "%s: Kunde inte skriva ny indexfil"

1196

1197 -#: sequencer.c:335

1197 +#: sequencer.c:339

1198 msgid "Could not resolve HEAD commit\n"

1199 msgstr "Kunde inte bestämma HEAD:s incheckning\n"

1200

1201 -#: sequencer.c:355

1201 +#: sequencer.c:359

1202 msgid "Unable to update cache tree\n"

1203 msgstr "Kan inte uppdatera cacheträd\n"

1204

1205 -#: sequencer.c:402

1205 +#: sequencer.c:406

1206 #, c-format

1207 msgid "Could not parse commit %s\n"

1208 msgstr "Kunde inte tolka incheckningen %s\n"

1209

1210 -#: sequencer.c:407

1210 +#: sequencer.c:411

1211 #, c-format

1212 msgid "Could not parse parent commit %s\n"

1213 msgstr "Kunde inte tolka föräldraincheckningen %s\n"

1214

1215 -#: sequencer.c:473

1215 +#: sequencer.c:477

1216 msgid "Your index file is unmerged."

1217 msgstr "Din indexfil har inte slagits ihop."

1218

1219 -#: sequencer.c:492

1219 +#: sequencer.c:496

1220 #, c-format

1221 msgid "Commit %s is a merge but no -m option was given."

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

1223

1224 -#: sequencer.c:500

1224 +#: sequencer.c:504

1225 #, c-format

1226 msgid "Commit %s does not have parent %d"

1227 msgstr "Incheckning %s har inte förälder %d"

1228

1229 -#: sequencer.c:504

1229 +#: sequencer.c:508

1230 #, c-format

1231 msgid "Mainline was specified but commit %s is not a merge."

1232 msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning"

1233

1234 #. TRANSLATORS: The first %s will be "revert" or

1235 #. "cherry-pick", the second %s a SHA1

1236 -#: sequencer.c:517

1236 +#: sequencer.c:521

1237 #, c-format

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

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

1240

1241 -#: sequencer.c:521

1241 +#: sequencer.c:525

1242 #, c-format

1243 msgid "Cannot get commit message for %s"

1244 msgstr "Kan inte hämta incheckningsmeddelande för %s"

1245

1246 -#: sequencer.c:607

1246 +#: sequencer.c:611

1247 #, c-format

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

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

1250

1251 -#: sequencer.c:608

1251 +#: sequencer.c:612

1252 #, c-format

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

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

1255

1256 -#: sequencer.c:644

1256 +#: sequencer.c:648

1257 msgid "empty commit set passed"

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

1259

1260 -#: sequencer.c:652

1260 +#: sequencer.c:656

1261 #, c-format

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

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

1264

1265 -#: sequencer.c:656

1265 +#: sequencer.c:660

1266 #, c-format

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

1268 msgstr "git %s: misslyckades uppdatera indexet"

1269

1270 -#: sequencer.c:716

1270 +#: sequencer.c:720

1271 #, c-format

1272 msgid "Cannot %s during a %s"

1273 msgstr "kan inte %s under en %s"

1274

1275 -#: sequencer.c:738

1275 +#: sequencer.c:742

1276 #, c-format

1277 msgid "Could not parse line %d."

1278 msgstr "Kan inte tolka rad %d."

1279

1280 -#: sequencer.c:743

1280 +#: sequencer.c:747

1281 msgid "No commits parsed."

1282 msgstr "Inga incheckningar lästes."

1283

1284 -#: sequencer.c:756

1284 +#: sequencer.c:760

1285 #, c-format

1286 msgid "Could not open %s"

1287 msgstr "Kunde inte öppna %s"

1288

1289 -#: sequencer.c:760

1289 +#: sequencer.c:764

1290 #, c-format

1291 msgid "Could not read %s."

1292 msgstr "kunde inte läsa %s."

1293

1294 -#: sequencer.c:767

1294 +#: sequencer.c:771

1295 #, c-format

1296 msgid "Unusable instruction sheet: %s"

1297 msgstr "Oanvändbart manus: %s"

1298

1299 -#: sequencer.c:797

1299 +#: sequencer.c:801

1300 #, c-format

1301 msgid "Invalid key: %s"

1302 msgstr "Felaktig nyckel: %s"

1303

1304 -#: sequencer.c:800

1304 +#: sequencer.c:804

1305 #, c-format

1306 msgid "Invalid value for %s: %s"

1307 msgstr "Felaktigt värde för %s: %s"

1308

1309 -#: sequencer.c:812

1309 +#: sequencer.c:816

1310 #, c-format

1311 msgid "Malformed options sheet: %s"

1312 msgstr "Trasigt manus: %s"

1313

1314 -#: sequencer.c:833

1314 +#: sequencer.c:837

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

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

1317

1318 -#: sequencer.c:834

1318 +#: sequencer.c:838

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

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

1321

1322 -#: sequencer.c:838

1322 +#: sequencer.c:842

1323 #, c-format

1324 msgid "Could not create sequencer directory %s"

1325 msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\""

1326

1327 -#: sequencer.c:854 sequencer.c:939

1327 +#: sequencer.c:858 sequencer.c:943

1328 #, c-format

1329 msgid "Error wrapping up %s."

1330 msgstr "Fel vid ombrytning av %s."

1331

1332 -#: sequencer.c:873 sequencer.c:1009

1332 +#: sequencer.c:877 sequencer.c:1013

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

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

1335

1336 -#: sequencer.c:875

1336 +#: sequencer.c:879

1337 msgid "cannot resolve HEAD"

1338 msgstr "kan inte bestämma HEAD"

1339

1340 -#: sequencer.c:877

1340 +#: sequencer.c:881

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

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

1343

1344 -#: sequencer.c:899 builtin/apply.c:4128

1344 +#: sequencer.c:903 builtin/apply.c:4128

1345 #, c-format

1346 msgid "cannot open %s: %s"

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

1348

1349 -#: sequencer.c:902

1349 +#: sequencer.c:906

1350 #, c-format

1351 msgid "cannot read %s: %s"

1352 msgstr "kan inte läsa %s: %s"

1353

1354 -#: sequencer.c:903

1354 +#: sequencer.c:907

1355 msgid "unexpected end of file"

1356 msgstr "oväntat filslut"

1357

1358 -#: sequencer.c:909

1358 +#: sequencer.c:913

1359 #, c-format

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

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

1362

1363 -#: sequencer.c:932

1363 +#: sequencer.c:936

1364 #, c-format

1365 msgid "Could not format %s."

1366 msgstr "Kunde inte formatera %s."

1367

1368 -#: sequencer.c:1077

1368 +#: sequencer.c:1081

1369 #, c-format

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

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

1372

1373 -#: sequencer.c:1080

1373 +#: sequencer.c:1084

1374 #, c-format

1375 msgid "%s: bad revision"

1376 msgstr "%s: felaktig revision"

1377

1378 -#: sequencer.c:1114

1378 +#: sequencer.c:1118

1379 msgid "Can't revert as initial commit"

1380 msgstr "Kan inte ångra som första incheckning"

1381

1382 -#: sequencer.c:1115

1382 +#: sequencer.c:1119

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

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

1385

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

1449 msgid "staging updated .gitmodules failed"

1450 msgstr "misslyckades köa uppdaterad .gitmodules"

1451

1452 -#: submodule.c:1111 builtin/init-db.c:363

1452 +#: submodule.c:1111 builtin/init-db.c:371

1453 #, c-format

1454 msgid "Could not create git link %s"

1455 msgstr "Kunde inte skapa gitlänk %s"

@@ -1459,28 +1459,28 @@ msgstr "Kunde inte skapa gitlänk %s"

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

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

1461

1462 -#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565

1463 -#: trailer.c:569

1462 +#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566

1463 +#: trailer.c:570

1464 #, c-format

1465 msgid "unknown value '%s' for key '%s'"

1466 msgstr "okänt värde \"%s\" för nyckeln \"%s\""

1467

1468 -#: trailer.c:551 trailer.c:556 builtin/remote.c:288

1468 +#: trailer.c:552 trailer.c:557 builtin/remote.c:288

1469 #, c-format

1470 msgid "more than one %s"

1471 msgstr "mer än en %s"

1472

1473 -#: trailer.c:589

1473 +#: trailer.c:590

1474 #, c-format

1475 msgid "empty trailer token in trailer '%.*s'"

1476 msgstr "tom släpradssymbol i släpraden \"%.*s\""

1477

1478 -#: trailer.c:709

1478 +#: trailer.c:710

1479 #, c-format

1480 msgid "could not read input file '%s'"

1481 msgstr "kunde inte läsa indatafilen \"%s\""

1482

1483 -#: trailer.c:712

1483 +#: trailer.c:713

1484 msgid "could not read from stdin"

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

1486

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

1683 msgid "bug: unhandled diff status %c"

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

1685

1686 -#: wt-status.c:761

1686 +#: wt-status.c:758

1687 msgid "Submodules changed but not updated:"

1688 msgstr "Undermoduler ändrade men inte uppdaterade:"

1689

1690 -#: wt-status.c:763

1690 +#: wt-status.c:760

1691 msgid "Submodule changes to be committed:"

1692 msgstr "Undermodulers ändringar att checka in:"

1693

1694 -#: wt-status.c:842

1694 +#: wt-status.c:839

1695 msgid ""

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

1697 "Everything below will be removed."

@@ -1699,68 +1699,68 @@ msgstr ""

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

1700 "Allt nedan kommer tas bort."

1701

1702 -#: wt-status.c:933

1702 +#: wt-status.c:930

1703 msgid "You have unmerged paths."

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

1705

1706 -#: wt-status.c:936

1706 +#: wt-status.c:933

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

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

1709

1710 -#: wt-status.c:939

1710 +#: wt-status.c:936

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

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

1713

1714 -#: wt-status.c:942

1714 +#: wt-status.c:939

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

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

1717

1718 -#: wt-status.c:952

1718 +#: wt-status.c:949

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

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

1721

1722 -#: wt-status.c:955

1722 +#: wt-status.c:952

1723 msgid "The current patch is empty."

1724 msgstr "Aktuell patch är tom."

1725

1726 -#: wt-status.c:959

1726 +#: wt-status.c:956

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

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

1729

1730 -#: wt-status.c:961

1730 +#: wt-status.c:958

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

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

1733

1734 -#: wt-status.c:963

1734 +#: wt-status.c:960

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

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

1737

1738 -#: wt-status.c:1023 wt-status.c:1040

1738 +#: wt-status.c:1020 wt-status.c:1037

1739 #, c-format

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

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

1742

1743 -#: wt-status.c:1028 wt-status.c:1045

1743 +#: wt-status.c:1025 wt-status.c:1042

1744 msgid "You are currently rebasing."

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

1746

1747 -#: wt-status.c:1031

1747 +#: wt-status.c:1028

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

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

1750

1751 -#: wt-status.c:1033

1751 +#: wt-status.c:1030

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

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

1754

1755 -#: wt-status.c:1035

1755 +#: wt-status.c:1032

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

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

1758

1759 -#: wt-status.c:1048

1759 +#: wt-status.c:1045

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

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

1762

1763 -#: wt-status.c:1052

1763 +#: wt-status.c:1049

1764 #, c-format

1765 msgid ""

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

@@ -1768,118 +1768,118 @@ msgstr ""

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

1769 "ovanpå \"%s\"."

1770

1771 -#: wt-status.c:1057

1771 +#: wt-status.c:1054

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

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

1774

1775 -#: wt-status.c:1060

1775 +#: wt-status.c:1057

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

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

1778

1779 -#: wt-status.c:1064

1779 +#: wt-status.c:1061

1780 #, c-format

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

1782 msgstr ""

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

1784 "ovanpå \"%s\"."

1785

1786 -#: wt-status.c:1069

1786 +#: wt-status.c:1066

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

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

1789

1790 -#: wt-status.c:1072

1790 +#: wt-status.c:1069

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

1792 msgstr ""

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

1794

1795 -#: wt-status.c:1074

1795 +#: wt-status.c:1071

1796 msgid ""

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

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

1799

1800 -#: wt-status.c:1084

1800 +#: wt-status.c:1081

1801 #, c-format

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

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

1804

1805 -#: wt-status.c:1089

1805 +#: wt-status.c:1086

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

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

1808

1809 -#: wt-status.c:1092

1809 +#: wt-status.c:1089

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

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

1812

1813 -#: wt-status.c:1094

1813 +#: wt-status.c:1091

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

1815 msgstr ""

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

1817 "operationen)"

1818

1819 -#: wt-status.c:1103

1819 +#: wt-status.c:1100

1820 #, c-format

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

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

1823

1824 -#: wt-status.c:1108

1824 +#: wt-status.c:1105

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

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

1827

1828 -#: wt-status.c:1111

1828 +#: wt-status.c:1108

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

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

1831

1832 -#: wt-status.c:1113

1832 +#: wt-status.c:1110

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

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

1835

1836 -#: wt-status.c:1124

1836 +#: wt-status.c:1121

1837 #, c-format

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

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

1840

1841 -#: wt-status.c:1128

1841 +#: wt-status.c:1125

1842 msgid "You are currently bisecting."

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

1844

1845 -#: wt-status.c:1131

1845 +#: wt-status.c:1128

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

1847 msgstr ""

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

1849

1850 -#: wt-status.c:1306

1850 +#: wt-status.c:1303

1851 msgid "On branch "

1852 msgstr "På grenen "

1853

1854 -#: wt-status.c:1313

1854 +#: wt-status.c:1310

1855 msgid "rebase in progress; onto "

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

1857

1858 -#: wt-status.c:1320

1858 +#: wt-status.c:1317

1859 msgid "HEAD detached at "

1860 msgstr "HEAD frånkopplad vid "

1861

1862 -#: wt-status.c:1322

1862 +#: wt-status.c:1319

1863 msgid "HEAD detached from "

1864 msgstr "HEAD frånkopplad från "

1865

1866 -#: wt-status.c:1325

1866 +#: wt-status.c:1322

1867 msgid "Not currently on any branch."

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

1869

1870 -#: wt-status.c:1342

1870 +#: wt-status.c:1339

1871 msgid "Initial commit"

1872 msgstr "Första incheckning"

1873

1874 -#: wt-status.c:1356

1874 +#: wt-status.c:1353

1875 msgid "Untracked files"

1876 msgstr "Ospårade filer"

1877

1878 -#: wt-status.c:1358

1878 +#: wt-status.c:1355

1879 msgid "Ignored files"

1880 msgstr "Ignorerade filer"

1881

1882 -#: wt-status.c:1362

1882 +#: wt-status.c:1359

1883 #, c-format

1884 msgid ""

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

@@ -1891,32 +1891,32 @@ msgstr ""

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

1892

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

1894 -#: wt-status.c:1368

1894 +#: wt-status.c:1365

1895 #, c-format

1896 msgid "Untracked files not listed%s"

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

1898

1899 -#: wt-status.c:1370

1899 +#: wt-status.c:1367

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

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

1902

1903 -#: wt-status.c:1376

1903 +#: wt-status.c:1373

1904 msgid "No changes"

1905 msgstr "Inga ändringar"

1906

1907 -#: wt-status.c:1381

1907 +#: wt-status.c:1378

1908 #, c-format

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

1910 msgstr ""

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

1912 "\")\n"

1913

1914 -#: wt-status.c:1384

1914 +#: wt-status.c:1381

1915 #, c-format

1916 msgid "no changes added to commit\n"

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

1918

1919 -#: wt-status.c:1387

1919 +#: wt-status.c:1384

1920 #, c-format

1921 msgid ""

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

@@ -1925,48 +1925,48 @@ msgstr ""

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

1926 "\")\n"

1927

1928 -#: wt-status.c:1390

1928 +#: wt-status.c:1387

1929 #, c-format

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

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

1932

1933 -#: wt-status.c:1393

1933 +#: wt-status.c:1390

1934 #, c-format

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

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

1937

1938 -#: wt-status.c:1396 wt-status.c:1401

1938 +#: wt-status.c:1393 wt-status.c:1398

1939 #, c-format

1940 msgid "nothing to commit\n"

1941 msgstr "inget att checka in\n"

1942

1943 -#: wt-status.c:1399

1943 +#: wt-status.c:1396

1944 #, c-format

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

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

1947

1948 -#: wt-status.c:1403

1948 +#: wt-status.c:1400

1949 #, c-format

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

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

1952

1953 -#: wt-status.c:1512

1953 +#: wt-status.c:1509

1954 msgid "HEAD (no branch)"

1955 msgstr "HEAD (ingen gren)"

1956

1957 -#: wt-status.c:1518

1957 +#: wt-status.c:1515

1958 msgid "Initial commit on "

1959 msgstr "Första incheckning på "

1960

1961 -#: wt-status.c:1550

1961 +#: wt-status.c:1547

1962 msgid "gone"

1963 msgstr "försvunnen"

1964

1965 -#: wt-status.c:1552 wt-status.c:1560

1965 +#: wt-status.c:1549 wt-status.c:1557

1966 msgid "behind "

1967 msgstr "efter "

1968

1969 -#: compat/precompose_utf8.c:55 builtin/clone.c:357

1969 +#: compat/precompose_utf8.c:55 builtin/clone.c:360

1970 #, c-format

1971 msgid "failed to unlink '%s'"

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

@@ -2025,13 +2025,13 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

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

2026

2027 #: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110

2028 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375

2028 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1370

2029 #: builtin/rm.c:269

2030 msgid "dry run"

2031 msgstr "testkörning"

2032

2033 #: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19

2034 -#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608

2034 +#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608

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

2036 msgid "be verbose"

2037 msgstr "var pratsam"

@@ -2040,7 +2040,7 @@ msgstr "var pratsam"

2040 msgid "interactive picking"

2041 msgstr "plocka interaktivt"

2042

2043 -#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286

2043 +#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286

2044 msgid "select hunks interactively"

2045 msgstr "välj stycken interaktivt"

2046

@@ -2085,10 +2085,6 @@ msgstr "se om - även saknade - filer ignoreras i testkörning"

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

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

2087

2088 -#: builtin/add.c:287

2089 -msgid "no files added"

2090 -msgstr "inga filer har lagts till"

2091 -

2088 #: builtin/add.c:293

2089 msgid "adding files failed"

2090 msgstr "misslyckades lägga till filer"

@@ -2368,7 +2364,7 @@ msgstr "%s: patchen kan inte tillämpas"

2364 msgid "Checking patch %s..."

2365 msgstr "Kontrollerar patchen %s..."

2366

2371 -#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135

2367 +#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135

2368 #, c-format

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

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

@@ -2447,7 +2443,7 @@ msgstr "indata känns inte igen"

2443 msgid "unable to read index file"

2444 msgstr "kan inte läsa indexfilen"

2445

2450 -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91

2446 +#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92

2447 #: builtin/fetch.c:93

2448 msgid "path"

2449 msgstr "sökväg"

@@ -2987,8 +2983,8 @@ msgid "act on remote-tracking branches"

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

2984

2985 #: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854

2990 -#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623

2991 -#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616

2986 +#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587

2987 +#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616

2988 #: builtin/tag.c:622

2989 msgid "commit"

2990 msgstr "incheckning"

@@ -3034,8 +3030,8 @@ msgid "edit the description for the branch"

3030 msgstr "redigera beskrivning för grenen"

3031

3032 #: builtin/branch.c:851

3037 -msgid "force creation (when already exists)"

3038 -msgstr "tvinga skapande (när den redan finns)"

3033 +msgid "force creation, move/rename, deletion"

3034 +msgstr "tvinga skapande, flytt/namnändring, borttagande"

3035

3036 #: builtin/branch.c:854

3037 msgid "print only not merged branches"

@@ -3053,7 +3049,7 @@ msgstr "visa grenar i spalter"

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

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

3051

3056 -#: builtin/branch.c:881 builtin/clone.c:634

3052 +#: builtin/branch.c:881 builtin/clone.c:637

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

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

3055

@@ -3061,78 +3057,78 @@ msgstr "HEAD hittades inte under refs/heads!"

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

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

3059

3064 -#: builtin/branch.c:909 builtin/branch.c:948

3060 +#: builtin/branch.c:914 builtin/branch.c:953

3061 msgid "branch name required"

3062 msgstr "grennamn krävs"

3063

3068 -#: builtin/branch.c:924

3064 +#: builtin/branch.c:929

3065 msgid "Cannot give description to detached HEAD"

3066 msgstr "Kan inte beskriva frånkopplad HEAD"

3067

3072 -#: builtin/branch.c:929

3068 +#: builtin/branch.c:934

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

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

3071

3076 -#: builtin/branch.c:936

3072 +#: builtin/branch.c:941

3073 #, c-format

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

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

3076

3081 -#: builtin/branch.c:939

3077 +#: builtin/branch.c:944

3078 #, c-format

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

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

3081

3086 -#: builtin/branch.c:954

3082 +#: builtin/branch.c:959

3083 msgid "too many branches for a rename operation"

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

3085

3090 -#: builtin/branch.c:959

3086 +#: builtin/branch.c:964

3087 msgid "too many branches to set new upstream"

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

3089

3094 -#: builtin/branch.c:963

3090 +#: builtin/branch.c:968

3091 #, c-format

3092 msgid ""

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

3094 msgstr ""

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

3096

3101 -#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009

3097 +#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014

3098 #, c-format

3099 msgid "no such branch '%s'"

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

3101

3106 -#: builtin/branch.c:970

3102 +#: builtin/branch.c:975

3103 #, c-format

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

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

3106

3111 -#: builtin/branch.c:982

3107 +#: builtin/branch.c:987

3108 msgid "too many branches to unset upstream"

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

3110

3115 -#: builtin/branch.c:986

3111 +#: builtin/branch.c:991

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

3113 msgstr ""

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

3115

3120 -#: builtin/branch.c:992

3116 +#: builtin/branch.c:997

3117 #, c-format

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

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

3120

3125 -#: builtin/branch.c:1006

3121 +#: builtin/branch.c:1011

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

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

3124

3129 -#: builtin/branch.c:1012

3125 +#: builtin/branch.c:1017

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

3127 msgstr ""

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

3129 "grennamn"

3130

3135 -#: builtin/branch.c:1015

3131 +#: builtin/branch.c:1020

3132 #, c-format

3133 msgid ""

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

@@ -3141,7 +3137,7 @@ msgstr ""

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

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

3139

3144 -#: builtin/branch.c:1032

3140 +#: builtin/branch.c:1037

3141 #, c-format

3142 msgid ""

3143 "\n"

@@ -3152,12 +3148,12 @@ msgstr ""

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

3149 "\n"

3150

3155 -#: builtin/branch.c:1033

3151 +#: builtin/branch.c:1038

3152 #, c-format

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

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

3155

3160 -#: builtin/branch.c:1034

3156 +#: builtin/branch.c:1039

3157 #, c-format

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

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

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

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

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

3237

3242 -#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274

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

3239 msgid "suppress progress reporting"

3240 msgstr "undertryck förloppsrapportering"

3241

@@ -3344,105 +3340,105 @@ msgstr "git checkout [flaggor] <gren>"

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

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

3342

3347 -#: builtin/checkout.c:114 builtin/checkout.c:147

3343 +#: builtin/checkout.c:132 builtin/checkout.c:165

3344 #, c-format

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

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

3347

3352 -#: builtin/checkout.c:116 builtin/checkout.c:149

3348 +#: builtin/checkout.c:134 builtin/checkout.c:167

3349 #, c-format

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

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

3352

3357 -#: builtin/checkout.c:132

3353 +#: builtin/checkout.c:150

3354 #, c-format

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

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

3357

3362 -#: builtin/checkout.c:176

3358 +#: builtin/checkout.c:194

3359 #, c-format

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

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

3362

3367 -#: builtin/checkout.c:193

3363 +#: builtin/checkout.c:211

3364 #, c-format

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

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

3367

3372 -#: builtin/checkout.c:210

3368 +#: builtin/checkout.c:228

3369 #, c-format

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

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

3372

3377 -#: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237

3378 -#: builtin/checkout.c:240

3373 +#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255

3374 +#: builtin/checkout.c:258

3375 #, c-format

3376 msgid "'%s' cannot be used with updating paths"

3377 msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"

3378

3383 -#: builtin/checkout.c:243 builtin/checkout.c:246

3379 +#: builtin/checkout.c:261 builtin/checkout.c:264

3380 #, c-format

3381 msgid "'%s' cannot be used with %s"

3382 msgstr "\"%s\" kan inte användas med %s"

3383

3388 -#: builtin/checkout.c:249

3384 +#: builtin/checkout.c:267

3385 #, c-format

3386 msgid "Cannot update paths and switch to branch '%s' at the same time."

3387 msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."

3388

3393 -#: builtin/checkout.c:260 builtin/checkout.c:449

3389 +#: builtin/checkout.c:278 builtin/checkout.c:467

3390 msgid "corrupt index file"

3391 msgstr "indexfilen är trasig"

3392

3397 -#: builtin/checkout.c:320 builtin/checkout.c:327

3393 +#: builtin/checkout.c:338 builtin/checkout.c:345

3394 #, c-format

3395 msgid "path '%s' is unmerged"

3396 msgstr "sökvägen \"%s\" har inte slagits ihop"

3397

3402 -#: builtin/checkout.c:471

3398 +#: builtin/checkout.c:489

3399 msgid "you need to resolve your current index first"

3400 msgstr "du måste lösa ditt befintliga index först"

3401

3406 -#: builtin/checkout.c:597

3402 +#: builtin/checkout.c:615

3403 #, c-format

3404 msgid "Can not do reflog for '%s'\n"

3405 msgstr "Kan inte skapa referenslog för \"%s\"\n"

3406

3411 -#: builtin/checkout.c:635

3407 +#: builtin/checkout.c:653

3408 msgid "HEAD is now at"

3409 msgstr "HEAD är nu på"

3410

3415 -#: builtin/checkout.c:642

3411 +#: builtin/checkout.c:660

3412 #, c-format

3413 msgid "Reset branch '%s'\n"

3414 msgstr "Återställ gren \"%s\"\n"

3415

3420 -#: builtin/checkout.c:645

3416 +#: builtin/checkout.c:663

3417 #, c-format

3418 msgid "Already on '%s'\n"

3419 msgstr "Redan på \"%s\"\n"

3420

3425 -#: builtin/checkout.c:649

3421 +#: builtin/checkout.c:667

3422 #, c-format

3423 msgid "Switched to and reset branch '%s'\n"

3424 msgstr "Växlade till och nollställde grenen \"%s\"\n"

3425

3430 -#: builtin/checkout.c:651 builtin/checkout.c:1032

3426 +#: builtin/checkout.c:669 builtin/checkout.c:1050

3427 #, c-format

3428 msgid "Switched to a new branch '%s'\n"

3429 msgstr "Växlade till en ny gren \"%s\"\n"

3430

3435 -#: builtin/checkout.c:653

3431 +#: builtin/checkout.c:671

3432 #, c-format

3433 msgid "Switched to branch '%s'\n"

3434 msgstr "Växlade till grenen \"%s\"\n"

3435

3440 -#: builtin/checkout.c:705

3436 +#: builtin/checkout.c:723

3437 #, c-format

3438 msgid " ... and %d more.\n"

3439 msgstr " ... och %d till.\n"

3440

3445 -#: builtin/checkout.c:711

3441 +#: builtin/checkout.c:729

3442 #, c-format

3443 msgid ""

3444 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3465,7 +3461,7 @@ msgstr[1] ""

3461 "\n"

3462 "%s\n"

3463

3468 -#: builtin/checkout.c:729

3464 +#: builtin/checkout.c:747

3465 #, c-format

3466 msgid ""

3467 "If you want to keep them by creating a new branch, this may be a good time\n"

@@ -3480,139 +3476,139 @@ msgstr ""

3476 " git branch nytt_grennamn %s\n"

3477 "\n"

3478

3483 -#: builtin/checkout.c:759

3479 +#: builtin/checkout.c:777

3480 msgid "internal error in revision walk"

3481 msgstr "internt fel vid genomgång av revisioner (revision walk)"

3482

3487 -#: builtin/checkout.c:763

3483 +#: builtin/checkout.c:781

3484 msgid "Previous HEAD position was"

3485 msgstr "Tidigare position för HEAD var"

3486

3491 -#: builtin/checkout.c:790 builtin/checkout.c:1027

3487 +#: builtin/checkout.c:808 builtin/checkout.c:1045

3488 msgid "You are on a branch yet to be born"

3489 msgstr "Du är på en gren som ännu inte är född"

3490

3495 -#: builtin/checkout.c:934

3491 +#: builtin/checkout.c:952

3492 #, c-format

3493 msgid "only one reference expected, %d given."

3494 msgstr "endast en referens förväntades, %d gavs."

3495

3500 -#: builtin/checkout.c:973

3496 +#: builtin/checkout.c:991

3497 #, c-format

3498 msgid "invalid reference: %s"

3499 msgstr "felaktig referens: %s"

3500

3505 -#: builtin/checkout.c:1002

3501 +#: builtin/checkout.c:1020

3502 #, c-format

3503 msgid "reference is not a tree: %s"

3504 msgstr "referensen är inte ett träd: %s"

3505

3510 -#: builtin/checkout.c:1041

3506 +#: builtin/checkout.c:1059

3507 msgid "paths cannot be used with switching branches"

3508 msgstr "sökvägar kan inte användas vid byte av gren"

3509

3514 -#: builtin/checkout.c:1044 builtin/checkout.c:1048

3510 +#: builtin/checkout.c:1062 builtin/checkout.c:1066

3511 #, c-format

3512 msgid "'%s' cannot be used with switching branches"

3513 msgstr "\"%s\" kan inte användas vid byte av gren"

3514

3519 -#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060

3520 -#: builtin/checkout.c:1063

3515 +#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078

3516 +#: builtin/checkout.c:1081

3517 #, c-format

3518 msgid "'%s' cannot be used with '%s'"

3519 msgstr "\"%s\" kan inte användas med \"%s\""

3520

3525 -#: builtin/checkout.c:1068

3521 +#: builtin/checkout.c:1086

3522 #, c-format

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

3524 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""

3525

3530 -#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89

3526 +#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90

3527 #: builtin/remote.c:159 builtin/remote.c:161

3528 msgid "branch"

3529 msgstr "gren"

3530

3535 -#: builtin/checkout.c:1091

3531 +#: builtin/checkout.c:1109

3532 msgid "create and checkout a new branch"

3533 msgstr "skapa och checka ut en ny gren"

3534

3539 -#: builtin/checkout.c:1093

3535 +#: builtin/checkout.c:1111

3536 msgid "create/reset and checkout a branch"

3537 msgstr "skapa/nollställ och checka ut en gren"

3538

3543 -#: builtin/checkout.c:1094

3539 +#: builtin/checkout.c:1112

3540 msgid "create reflog for new branch"

3541 msgstr "skapa reflogg för ny gren"

3542

3547 -#: builtin/checkout.c:1095

3543 +#: builtin/checkout.c:1113

3544 msgid "detach the HEAD at named commit"

3545 msgstr "koppla från HEAD vid namngiven incheckning"

3546

3551 -#: builtin/checkout.c:1096

3547 +#: builtin/checkout.c:1114

3548 msgid "set upstream info for new branch"

3549 msgstr "sätt uppströmsinformation för ny gren"

3550

3555 -#: builtin/checkout.c:1098

3551 +#: builtin/checkout.c:1116

3552 msgid "new-branch"

3553 msgstr "ny-gren"

3554

3559 -#: builtin/checkout.c:1098

3555 +#: builtin/checkout.c:1116

3556 msgid "new unparented branch"

3557 msgstr "ny gren utan förälder"

3558

3563 -#: builtin/checkout.c:1099

3559 +#: builtin/checkout.c:1117

3560 msgid "checkout our version for unmerged files"

3561 msgstr "checka ut vår version för ej sammanslagna filer"

3562

3567 -#: builtin/checkout.c:1101

3563 +#: builtin/checkout.c:1119

3564 msgid "checkout their version for unmerged files"

3565 msgstr "checka ut deras version för ej sammanslagna filer"

3566

3571 -#: builtin/checkout.c:1103

3567 +#: builtin/checkout.c:1121

3568 msgid "force checkout (throw away local modifications)"

3569 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"

3570

3575 -#: builtin/checkout.c:1104

3571 +#: builtin/checkout.c:1122

3572 msgid "perform a 3-way merge with the new branch"

3573 msgstr "utför en 3-vägssammanslagning för den nya grenen"

3574

3579 -#: builtin/checkout.c:1105 builtin/merge.c:226

3575 +#: builtin/checkout.c:1123 builtin/merge.c:227

3576 msgid "update ignored files (default)"

3577 msgstr "uppdatera ignorerade filer (standard)"

3578

3583 -#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245

3579 +#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245

3580 msgid "style"

3581 msgstr "stil"

3582

3587 -#: builtin/checkout.c:1107

3583 +#: builtin/checkout.c:1125

3584 msgid "conflict style (merge or diff3)"

3585 msgstr "konfliktstil (merge eller diff3)"

3586

3591 -#: builtin/checkout.c:1110

3587 +#: builtin/checkout.c:1128

3588 msgid "do not limit pathspecs to sparse entries only"

3589 msgstr "begränsa inte sökvägar till endast glesa poster"

3590

3595 -#: builtin/checkout.c:1112

3591 +#: builtin/checkout.c:1130

3592 msgid "second guess 'git checkout no-such-branch'"

3593 msgstr "förutspå \"git checkout gren-saknas\""

3594

3599 -#: builtin/checkout.c:1135

3595 +#: builtin/checkout.c:1153

3596 msgid "-b, -B and --orphan are mutually exclusive"

3597 msgstr "-b, -B och --orphan är ömsesidigt uteslutande"

3598

3603 -#: builtin/checkout.c:1152

3599 +#: builtin/checkout.c:1170

3600 msgid "--track needs a branch name"

3601 msgstr "--track behöver ett namn på en gren"

3602

3607 -#: builtin/checkout.c:1157

3603 +#: builtin/checkout.c:1175

3604 msgid "Missing branch name; try -b"

3605 msgstr "Grennamn saknas; försök med -b"

3606

3611 -#: builtin/checkout.c:1194

3607 +#: builtin/checkout.c:1212

3608 msgid "invalid path specification"

3609 msgstr "felaktig sökvägsangivelse"

3610

3615 -#: builtin/checkout.c:1201

3611 +#: builtin/checkout.c:1219

3612 #, c-format

3613 msgid ""

3614 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3621,12 +3617,12 @@ msgstr ""

3617 "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"

3618 "Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"

3619

3624 -#: builtin/checkout.c:1206

3620 +#: builtin/checkout.c:1224

3621 #, c-format

3622 msgid "git checkout: --detach does not take a path argument '%s'"

3623 msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""

3624

3629 -#: builtin/checkout.c:1210

3625 +#: builtin/checkout.c:1228

3626 msgid ""

3627 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3628 "checking out of the index."

@@ -3819,146 +3815,150 @@ msgstr ""

3815 msgid "git clone [options] [--] <repo> [<dir>]"

3816 msgstr "git clone [flaggor] [--] <arkiv> [<kat>]"

3817

3822 -#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223

3818 +#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224

3819 #: builtin/push.c:514

3820 msgid "force progress reporting"

3821 msgstr "tvinga förloppsrapportering"

3822

3827 -#: builtin/clone.c:67

3823 +#: builtin/clone.c:68

3824 msgid "don't create a checkout"

3825 msgstr "skapa inte någon utcheckning"

3826

3831 -#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488

3827 +#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496

3828 msgid "create a bare repository"

3829 msgstr "skapa ett naket (\"bare\") arkiv"

3830

3835 -#: builtin/clone.c:72

3831 +#: builtin/clone.c:73

3832 msgid "create a mirror repository (implies bare)"

3833 msgstr "skapa ett spegelarkiv (implicerar \"bare\")"

3834

3839 -#: builtin/clone.c:74

3835 +#: builtin/clone.c:75

3836 msgid "to clone from a local repository"

3837 msgstr "för att klona från ett lokalt arkiv"

3838

3843 -#: builtin/clone.c:76

3839 +#: builtin/clone.c:77

3840 msgid "don't use local hardlinks, always copy"

3841 msgstr "skapa inte lokala hårda länkar, kopiera alltid"

3842

3847 -#: builtin/clone.c:78

3843 +#: builtin/clone.c:79

3844 msgid "setup as shared repository"

3845 msgstr "skapa som ett delat arkiv"

3846

3851 -#: builtin/clone.c:80 builtin/clone.c:82

3847 +#: builtin/clone.c:81 builtin/clone.c:83

3848 msgid "initialize submodules in the clone"

3849 msgstr "initiera undermoduler i klonen"

3850

3855 -#: builtin/clone.c:83 builtin/init-db.c:485

3851 +#: builtin/clone.c:84 builtin/init-db.c:493

3852 msgid "template-directory"

3853 msgstr "mallkatalog"

3854

3859 -#: builtin/clone.c:84 builtin/init-db.c:486

3855 +#: builtin/clone.c:85 builtin/init-db.c:494

3856 msgid "directory from which templates will be used"

3857 msgstr "katalog att använda mallar från"

3858

3863 -#: builtin/clone.c:86

3859 +#: builtin/clone.c:87

3860 msgid "reference repository"

3861 msgstr "referensarkiv"

3862

3867 -#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44

3863 +#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44

3864 msgid "name"

3865 msgstr "namn"

3866

3871 -#: builtin/clone.c:88

3867 +#: builtin/clone.c:89

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

3869 msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"

3870

3875 -#: builtin/clone.c:90

3871 +#: builtin/clone.c:91

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

3873 msgstr "checka ut <gren> istället för fjärrens HEAD"

3874

3879 -#: builtin/clone.c:92

3875 +#: builtin/clone.c:93

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

3877 msgstr "sökväg till git-upload-pack på fjärren"

3878

3883 -#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659

3879 +#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659

3880 msgid "depth"

3881 msgstr "djup"

3882

3887 -#: builtin/clone.c:94

3883 +#: builtin/clone.c:95

3884 msgid "create a shallow clone of that depth"

3885 msgstr "skapa en grund klon på detta djup"

3886

3891 -#: builtin/clone.c:96

3887 +#: builtin/clone.c:97

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

3889 msgstr "klona endast en gren, HEAD eller --branch"

3890

3895 -#: builtin/clone.c:97 builtin/init-db.c:494

3891 +#: builtin/clone.c:99

3892 +msgid "use --reference only while cloning"

3893 +msgstr "använd --reference endast under kloningen"

3894 +

3895 +#: builtin/clone.c:100 builtin/init-db.c:502

3896 msgid "gitdir"

3897 msgstr "gitkat"

3898

3899 -#: builtin/clone.c:98 builtin/init-db.c:495

3899 +#: builtin/clone.c:101 builtin/init-db.c:503

3900 msgid "separate git dir from working tree"

3901 msgstr "separera gitkatalogen från arbetskatalogen"

3902

3903 -#: builtin/clone.c:99

3903 +#: builtin/clone.c:102

3904 msgid "key=value"

3905 msgstr "nyckel=värde"

3906

3907 -#: builtin/clone.c:100

3907 +#: builtin/clone.c:103

3908 msgid "set config inside the new repository"

3909 msgstr "ställ in konfiguration i det nya arkivet"

3910

3911 -#: builtin/clone.c:253

3911 +#: builtin/clone.c:256

3912 #, c-format

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

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

3915

3916 -#: builtin/clone.c:257

3916 +#: builtin/clone.c:260

3917 #, c-format

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

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

3920

3921 -#: builtin/clone.c:260

3921 +#: builtin/clone.c:263

3922 #, c-format

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

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

3925

3926 -#: builtin/clone.c:322

3926 +#: builtin/clone.c:325

3927 #, c-format

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

3929 msgstr "misslyckades skapa katalogen \"%s\""

3930

3931 -#: builtin/clone.c:324 builtin/diff.c:84

3931 +#: builtin/clone.c:327 builtin/diff.c:84

3932 #, c-format

3933 msgid "failed to stat '%s'"

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

3935

3936 -#: builtin/clone.c:326

3936 +#: builtin/clone.c:329

3937 #, c-format

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

3939 msgstr "%s finns och är ingen katalog"

3940

3941 -#: builtin/clone.c:340

3941 +#: builtin/clone.c:343

3942 #, c-format

3943 msgid "failed to stat %s\n"

3944 msgstr "misslyckades ta status på %s\n"

3945

3946 -#: builtin/clone.c:362

3946 +#: builtin/clone.c:365

3947 #, c-format

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

3949 msgstr "misslyckades skapa länken \"%s\""

3950

3951 -#: builtin/clone.c:366

3951 +#: builtin/clone.c:369

3952 #, c-format

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

3954 msgstr "misslyckades kopiera filen till \"%s\""

3955

3956 -#: builtin/clone.c:389 builtin/clone.c:563

3956 +#: builtin/clone.c:392 builtin/clone.c:566

3957 #, c-format

3958 msgid "done.\n"

3959 msgstr "klart.\n"

3960

3961 -#: builtin/clone.c:401

3961 +#: builtin/clone.c:404

3962 msgid ""

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

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

@@ -3968,111 +3968,123 @@ msgstr ""

3968 "Du kan inspektera det som checkades ut med \"git status\"\n"

3969 "och försöka checka ut igen med \"git checkout -f HEAD\"\n"

3970

3971 -#: builtin/clone.c:478

3971 +#: builtin/clone.c:481

3972 #, c-format

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

3974 msgstr "Kunde inte hitta fjärrgrenen %s för att klona."

3975

3976 # Vague original, not networking-related, but rather related to the actual

3977 # objects in the database.

3978 -#: builtin/clone.c:558

3978 +#: builtin/clone.c:561

3979 #, c-format

3980 msgid "Checking connectivity... "

3981 msgstr "Kontrollerar konnektivitet..."

3982

3983 -#: builtin/clone.c:561

3983 +#: builtin/clone.c:564

3984 msgid "remote did not send all necessary objects"

3985 msgstr "fjärren sände inte alla nödvändiga objekt"

3986

3987 -#: builtin/clone.c:625

3987 +#: builtin/clone.c:628

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

3989 msgstr ""

3990 "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"

3991

3992 -#: builtin/clone.c:656

3992 +#: builtin/clone.c:659

3993 msgid "unable to checkout working tree"

3994 msgstr "kunde inte checka ut arbetskatalogen"

3995

3996 -#: builtin/clone.c:765

3996 +#: builtin/clone.c:746

3997 +msgid "cannot repack to clean up"

3998 +msgstr "kan inte packa om för att städa upp"

3999 +

4000 +#: builtin/clone.c:748

4001 +msgid "cannot unlink temporary alternates file"

4002 +msgstr "kunde inte ta bort temporär \"alternates\"-fil"

4003 +

4004 +#: builtin/clone.c:778

4005 msgid "Too many arguments."

4006 msgstr "För många argument."

4007

4000 -#: builtin/clone.c:769

4008 +#: builtin/clone.c:782

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

4010 msgstr "Du måste ange ett arkiv att klona."

4011

4004 -#: builtin/clone.c:780

4012 +#: builtin/clone.c:793

4013 #, c-format

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

4015 msgstr "flaggorna --bare och --origin %s är inkompatibla."

4016

4009 -#: builtin/clone.c:783

4017 +#: builtin/clone.c:796

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

4019 msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."

4020

4013 -#: builtin/clone.c:796

4021 +#: builtin/clone.c:809

4022 #, c-format

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

4024 msgstr "arkivet \"%s\" finns inte"

4025

4018 -#: builtin/clone.c:802 builtin/fetch.c:1155

4026 +#: builtin/clone.c:815 builtin/fetch.c:1155

4027 #, c-format

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

4029 msgstr "djupet %s är inte ett positivt tal"

4030

4023 -#: builtin/clone.c:812

4031 +#: builtin/clone.c:825

4032 #, c-format

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

4034 msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."

4035

4028 -#: builtin/clone.c:822

4036 +#: builtin/clone.c:835

4037 #, c-format

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

4039 msgstr "arbetsträdet \"%s\" finns redan."

4040

4033 -#: builtin/clone.c:835 builtin/clone.c:847

4041 +#: builtin/clone.c:848 builtin/clone.c:860

4042 #, c-format

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

4044 msgstr "kunde inte skapa inledande kataloger för \"%s\""

4045

4038 -#: builtin/clone.c:838

4046 +#: builtin/clone.c:851

4047 #, c-format

4048 msgid "could not create work tree dir '%s'."

4049 msgstr "kunde inte skapa arbetskatalogen \"%s\""

4050

4043 -#: builtin/clone.c:857

4051 +#: builtin/clone.c:870

4052 #, c-format

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

4054 msgstr "Klonar till ett naket arkiv \"%s\"...\n"

4055

4048 -#: builtin/clone.c:859

4056 +#: builtin/clone.c:872

4057 #, c-format

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

4059 msgstr "Klonar till \"%s\"...\n"

4060

4053 -#: builtin/clone.c:895

4061 +#: builtin/clone.c:897

4062 +msgid "--dissociate given, but there is no --reference"

4063 +msgstr "--dissociate angavs, men --reference har inte angivits"

4064 +

4065 +#: builtin/clone.c:912

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

4067 msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"

4068

4057 -#: builtin/clone.c:898

4069 +#: builtin/clone.c:915

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

4071 msgstr "källarkivet är grunt, ignorerar --local"

4072

4061 -#: builtin/clone.c:903

4073 +#: builtin/clone.c:920

4074 msgid "--local is ignored"

4075 msgstr "--local ignoreras"

4076

4065 -#: builtin/clone.c:907

4077 +#: builtin/clone.c:924

4078 #, c-format

4079 msgid "Don't know how to clone %s"

4080 msgstr "Vet inte hur man klonar %s"

4081

4070 -#: builtin/clone.c:958 builtin/clone.c:966

4082 +#: builtin/clone.c:975 builtin/clone.c:983

4083 #, c-format

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

4085 msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"

4086

4075 -#: builtin/clone.c:969

4087 +#: builtin/clone.c:986

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

4089 msgstr "Du verkar ha klonat ett tomt arkiv."

4090

@@ -4256,31 +4268,26 @@ msgstr "kan inte läsa indexet"

4268 msgid "unable to write temporary index file"

4269 msgstr "kunde inte skriva temporär indexfil"

4270

4259 -#: builtin/commit.c:592

4271 +#: builtin/commit.c:584

4272 #, c-format

4273 msgid "commit '%s' lacks author header"

4274 msgstr "incheckningen \"%s\" saknar författarhuvud"

4275

4264 -#: builtin/commit.c:594

4276 +#: builtin/commit.c:586

4277 #, c-format

4278 msgid "commit '%s' has malformed author line"

4279 msgstr "incheckningen \"%s\" har felformaterat författarhuvud"

4280

4269 -#: builtin/commit.c:613

4281 +#: builtin/commit.c:605

4282 msgid "malformed --author parameter"

4283 msgstr "felformad \"--author\"-flagga"

4284

4273 -#: builtin/commit.c:621

4285 +#: builtin/commit.c:613

4286 #, c-format

4287 msgid "invalid date format: %s"

4288 msgstr "felaktigt datumformat: %s"

4289

4278 -#: builtin/commit.c:642

4279 -#, c-format

4280 -msgid "Malformed ident string: '%s'"

4281 -msgstr "Felaktig indragningssträng: \"%s\""

4282 -

4283 -#: builtin/commit.c:675

4290 +#: builtin/commit.c:657

4291 msgid ""

4292 "unable to select a comment character that is not used\n"

4293 "in the current commit message"

@@ -4288,43 +4295,43 @@ msgstr ""

4295 "kunde inte välja ett kommentarstecken som inte använts\n"

4296 "i det befintliga incheckningsmeddelandet"

4297

4291 -#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120

4298 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084

4299 #, c-format

4300 msgid "could not lookup commit %s"

4301 msgstr "kunde inte slå upp incheckningen %s"

4302

4296 -#: builtin/commit.c:724 builtin/shortlog.c:273

4303 +#: builtin/commit.c:706 builtin/shortlog.c:273

4304 #, c-format

4305 msgid "(reading log message from standard input)\n"

4306 msgstr "(läser loggmeddelande från standard in)\n"

4307

4301 -#: builtin/commit.c:726

4308 +#: builtin/commit.c:708

4309 msgid "could not read log from standard input"

4310 msgstr "kunde inte läsa logg från standard in"

4311

4305 -#: builtin/commit.c:730

4312 +#: builtin/commit.c:712

4313 #, c-format

4314 msgid "could not read log file '%s'"

4315 msgstr "kunde inte läsa loggfilen \"%s\""

4316

4310 -#: builtin/commit.c:752

4317 +#: builtin/commit.c:734

4318 msgid "could not read MERGE_MSG"

4319 msgstr "kunde inte läsa MERGE_MSG"

4320

4314 -#: builtin/commit.c:756

4321 +#: builtin/commit.c:738

4322 msgid "could not read SQUASH_MSG"

4323 msgstr "kunde inte läsa SQUASH_MSG"

4324

4318 -#: builtin/commit.c:760

4325 +#: builtin/commit.c:742

4326 #, c-format

4327 msgid "could not read '%s'"

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

4329

4323 -#: builtin/commit.c:831

4330 +#: builtin/commit.c:789

4331 msgid "could not write commit template"

4332 msgstr "kunde inte skriva incheckningsmall"

4333

4327 -#: builtin/commit.c:849

4334 +#: builtin/commit.c:807

4335 #, c-format

4336 msgid ""

4337 "\n"

@@ -4339,7 +4346,7 @@ msgstr ""

4346 "\t%s\n"

4347 "och försöker igen.\n"

4348

4342 -#: builtin/commit.c:854

4349 +#: builtin/commit.c:812

4350 #, c-format

4351 msgid ""

4352 "\n"

@@ -4354,7 +4361,7 @@ msgstr ""

4361 "\t%s\n"

4362 "och försöker igen.\n"

4363

4357 -#: builtin/commit.c:867

4364 +#: builtin/commit.c:825

4365 #, c-format

4366 msgid ""

4367 "Please enter the commit message for your changes. Lines starting\n"

@@ -4364,7 +4371,7 @@ msgstr ""

4371 "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "

4372 "incheckningen.\n"

4373

4367 -#: builtin/commit.c:874

4374 +#: builtin/commit.c:832

4375 #, c-format

4376 msgid ""

4377 "Please enter the commit message for your changes. Lines starting\n"

@@ -4375,144 +4382,144 @@ msgstr ""

4382 "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"

4383 "Ett tomt meddelande avbryter incheckningen.\n"

4384

4378 -#: builtin/commit.c:888

4385 +#: builtin/commit.c:852

4386 #, c-format

4387 msgid "%sAuthor: %.*s <%.*s>"

4388 msgstr "%sFörfattare: %.*s <%.*s>"

4389

4383 -#: builtin/commit.c:896

4390 +#: builtin/commit.c:860

4391 #, c-format

4392 msgid "%sDate: %s"

4393 msgstr "%sDatum: %s"

4394

4388 -#: builtin/commit.c:903

4395 +#: builtin/commit.c:867

4396 #, c-format

4397 msgid "%sCommitter: %.*s <%.*s>"

4398 msgstr "%sIncheckare: %.*s <%.*s>"

4399

4393 -#: builtin/commit.c:921

4400 +#: builtin/commit.c:885

4401 msgid "Cannot read index"

4402 msgstr "Kan inte läsa indexet"

4403

4397 -#: builtin/commit.c:978

4404 +#: builtin/commit.c:942

4405 msgid "Error building trees"

4406 msgstr "Fel vid byggande av träd"

4407

4401 -#: builtin/commit.c:993 builtin/tag.c:495

4408 +#: builtin/commit.c:957 builtin/tag.c:495

4409 #, c-format

4410 msgid "Please supply the message using either -m or -F option.\n"

4411 msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"

4412

4406 -#: builtin/commit.c:1095

4413 +#: builtin/commit.c:1059

4414 #, c-format

4415 msgid "No existing author found with '%s'"

4416 msgstr "Hittade ingen befintlig författare med \"%s\""

4417

4411 -#: builtin/commit.c:1110 builtin/commit.c:1350

4418 +#: builtin/commit.c:1074 builtin/commit.c:1314

4419 #, c-format

4420 msgid "Invalid untracked files mode '%s'"

4421 msgstr "Ogiltigt läge för ospårade filer: \"%s\""

4422

4416 -#: builtin/commit.c:1147

4423 +#: builtin/commit.c:1111

4424 msgid "--long and -z are incompatible"

4425 msgstr "--long och -z är inkompatibla"

4426

4420 -#: builtin/commit.c:1177

4427 +#: builtin/commit.c:1141

4428 msgid "Using both --reset-author and --author does not make sense"

4429 msgstr "Kan inte använda både --reset-author och --author"

4430

4424 -#: builtin/commit.c:1186

4431 +#: builtin/commit.c:1150

4432 msgid "You have nothing to amend."

4433 msgstr "Du har inget att utöka."

4434

4428 -#: builtin/commit.c:1189

4435 +#: builtin/commit.c:1153

4436 msgid "You are in the middle of a merge -- cannot amend."

4437 msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."

4438

4432 -#: builtin/commit.c:1191

4439 +#: builtin/commit.c:1155

4440 msgid "You are in the middle of a cherry-pick -- cannot amend."

4441 msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."

4442

4436 -#: builtin/commit.c:1194

4443 +#: builtin/commit.c:1158

4444 msgid "Options --squash and --fixup cannot be used together"

4445 msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"

4446

4440 -#: builtin/commit.c:1204

4447 +#: builtin/commit.c:1168

4448 msgid "Only one of -c/-C/-F/--fixup can be used."

4449 msgstr "Endast en av -c/-C/-F/--fixup kan användas."

4450

4444 -#: builtin/commit.c:1206

4451 +#: builtin/commit.c:1170

4452 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

4453 msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."

4454

4448 -#: builtin/commit.c:1214

4455 +#: builtin/commit.c:1178

4456 msgid "--reset-author can be used only with -C, -c or --amend."

4457 msgstr "--reset-author kan endast användas med -C, -c eller --amend."

4458

4452 -#: builtin/commit.c:1231

4459 +#: builtin/commit.c:1195

4460 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

4461 msgstr ""

4462 "Endast en av --include/--only/--all/--interactive/--patch kan användas."

4463

4457 -#: builtin/commit.c:1233

4464 +#: builtin/commit.c:1197

4465 msgid "No paths with --include/--only does not make sense."

4466 msgstr "Du måste ange sökvägar tillsammans med --include/--only."

4467

4461 -#: builtin/commit.c:1235

4468 +#: builtin/commit.c:1199

4469 msgid "Clever... amending the last one with dirty index."

4470 msgstr "Smart... utöka den senaste med smutsigt index."

4471

4465 -#: builtin/commit.c:1237

4472 +#: builtin/commit.c:1201

4473 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

4474 msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."

4475

4469 -#: builtin/commit.c:1249 builtin/tag.c:728

4476 +#: builtin/commit.c:1213 builtin/tag.c:728

4477 #, c-format

4478 msgid "Invalid cleanup mode %s"

4479 msgstr "Felaktigt städningsläge %s"

4480

4474 -#: builtin/commit.c:1254

4481 +#: builtin/commit.c:1218

4482 msgid "Paths with -a does not make sense."

4483 msgstr "Kan inte ange sökvägar med -a."

4484

4478 -#: builtin/commit.c:1364 builtin/commit.c:1644

4485 +#: builtin/commit.c:1328 builtin/commit.c:1608

4486 msgid "show status concisely"

4487 msgstr "visa koncis status"

4488

4482 -#: builtin/commit.c:1366 builtin/commit.c:1646

4489 +#: builtin/commit.c:1330 builtin/commit.c:1610

4490 msgid "show branch information"

4491 msgstr "visa information om gren"

4492

4486 -#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500

4493 +#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500

4494 msgid "machine-readable output"

4495 msgstr "maskinläsbar utdata"

4496

4490 -#: builtin/commit.c:1371 builtin/commit.c:1650

4497 +#: builtin/commit.c:1335 builtin/commit.c:1614

4498 msgid "show status in long format (default)"

4499 msgstr "visa status i långt format (standard)"

4500

4494 -#: builtin/commit.c:1374 builtin/commit.c:1653

4501 +#: builtin/commit.c:1338 builtin/commit.c:1617

4502 msgid "terminate entries with NUL"

4503 msgstr "terminera poster med NUL"

4504

4498 -#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980

4505 +#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980

4506 #: builtin/fast-export.c:983 builtin/tag.c:603

4507 msgid "mode"

4508 msgstr "läge"

4509

4503 -#: builtin/commit.c:1377 builtin/commit.c:1656

4510 +#: builtin/commit.c:1341 builtin/commit.c:1620

4511 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4512 msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"

4513

4507 -#: builtin/commit.c:1380

4514 +#: builtin/commit.c:1344

4515 msgid "show ignored files"

4516 msgstr "visa ignorerade filer"

4517

4511 -#: builtin/commit.c:1381 parse-options.h:153

4518 +#: builtin/commit.c:1345 parse-options.h:153

4519 msgid "when"

4520 msgstr "när"

4521

4515 -#: builtin/commit.c:1382

4522 +#: builtin/commit.c:1346

4523 msgid ""

4524 "ignore changes to submodules, optional when: all, dirty, untracked. "

4525 "(Default: all)"

@@ -4520,209 +4527,209 @@ msgstr ""

4527 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "

4528 "(Default: all)"

4529

4523 -#: builtin/commit.c:1384

4530 +#: builtin/commit.c:1348

4531 msgid "list untracked files in columns"

4532 msgstr "visa ospårade filer i spalter"

4533

4527 -#: builtin/commit.c:1471

4534 +#: builtin/commit.c:1435

4535 msgid "couldn't look up newly created commit"

4536 msgstr "kunde inte slå upp en precis skapad incheckning"

4537

4531 -#: builtin/commit.c:1473

4538 +#: builtin/commit.c:1437

4539 msgid "could not parse newly created commit"

4540 msgstr "kunde inte tolka en precis skapad incheckning"

4541

4535 -#: builtin/commit.c:1518

4542 +#: builtin/commit.c:1482

4543 msgid "detached HEAD"

4544 msgstr "frånkopplad HEAD"

4545

4539 -#: builtin/commit.c:1521

4546 +#: builtin/commit.c:1485

4547 msgid " (root-commit)"

4548 msgstr " (rotincheckning)"

4549

4543 -#: builtin/commit.c:1614

4550 +#: builtin/commit.c:1578

4551 msgid "suppress summary after successful commit"

4552 msgstr "undertryck sammanfattning efter framgångsrik incheckning"

4553

4547 -#: builtin/commit.c:1615

4554 +#: builtin/commit.c:1579

4555 msgid "show diff in commit message template"

4556 msgstr "visa diff i mallen för incheckningsmeddelandet"

4557

4551 -#: builtin/commit.c:1617

4558 +#: builtin/commit.c:1581

4559 msgid "Commit message options"

4560 msgstr "Alternativ för incheckningsmeddelande"

4561

4555 -#: builtin/commit.c:1618 builtin/tag.c:601

4562 +#: builtin/commit.c:1582 builtin/tag.c:601

4563 msgid "read message from file"

4564 msgstr "läs meddelande från fil"

4565

4559 -#: builtin/commit.c:1619

4566 +#: builtin/commit.c:1583

4567 msgid "author"

4568 msgstr "författare"

4569

4563 -#: builtin/commit.c:1619

4570 +#: builtin/commit.c:1583

4571 msgid "override author for commit"

4572 msgstr "överstyr författare för incheckningen"

4573

4567 -#: builtin/commit.c:1620 builtin/gc.c:275

4574 +#: builtin/commit.c:1584 builtin/gc.c:275

4575 msgid "date"

4576 msgstr "datum"

4577

4571 -#: builtin/commit.c:1620

4578 +#: builtin/commit.c:1584

4579 msgid "override date for commit"

4580 msgstr "överstyr datum för incheckningen"

4581

4575 -#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408

4576 -#: builtin/notes.c:565 builtin/tag.c:599

4582 +#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391

4583 +#: builtin/notes.c:554 builtin/tag.c:599

4584 msgid "message"

4585 msgstr "meddelande"

4586

4580 -#: builtin/commit.c:1621

4587 +#: builtin/commit.c:1585

4588 msgid "commit message"

4589 msgstr "incheckningsmeddelande"

4590

4584 -#: builtin/commit.c:1622

4591 +#: builtin/commit.c:1586

4592 msgid "reuse and edit message from specified commit"

4593 msgstr "återanvänd och redigera meddelande från angiven incheckning"

4594

4588 -#: builtin/commit.c:1623

4595 +#: builtin/commit.c:1587

4596 msgid "reuse message from specified commit"

4597 msgstr "återanvänd meddelande från angiven incheckning"

4598

4592 -#: builtin/commit.c:1624

4599 +#: builtin/commit.c:1588

4600 msgid "use autosquash formatted message to fixup specified commit"

4601 msgstr ""

4602 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"

4603

4597 -#: builtin/commit.c:1625

4604 +#: builtin/commit.c:1589

4605 msgid "use autosquash formatted message to squash specified commit"

4606 msgstr ""

4607 "använd autosquash-formaterat meddelande för att slå ihop med angiven "

4608 "incheckning"

4609

4603 -#: builtin/commit.c:1626

4610 +#: builtin/commit.c:1590

4611 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4612 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"

4613

4607 -#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86

4614 +#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86

4615 msgid "add Signed-off-by:"

4616 msgstr "lägg till Signed-off-by:"

4617

4611 -#: builtin/commit.c:1628

4618 +#: builtin/commit.c:1592

4619 msgid "use specified template file"

4620 msgstr "använd angiven mallfil"

4621

4615 -#: builtin/commit.c:1629

4622 +#: builtin/commit.c:1593

4623 msgid "force edit of commit"

4624 msgstr "tvinga redigering av incheckning"

4625

4619 -#: builtin/commit.c:1630

4626 +#: builtin/commit.c:1594

4627 msgid "default"

4628 msgstr "standard"

4629

4623 -#: builtin/commit.c:1630 builtin/tag.c:604

4630 +#: builtin/commit.c:1594 builtin/tag.c:604

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

4632 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

4633

4627 -#: builtin/commit.c:1631

4634 +#: builtin/commit.c:1595

4635 msgid "include status in commit message template"

4636 msgstr "inkludera status i mallen för incheckningsmeddelandet"

4637

4631 -#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92

4638 +#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92

4639 #: builtin/tag.c:605

4640 msgid "key-id"

4641 msgstr "nyckel-id"

4642

4636 -#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93

4643 +#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93

4644 msgid "GPG sign commit"

4645 msgstr "GPG-signera incheckning"

4646

4640 -#: builtin/commit.c:1636

4647 +#: builtin/commit.c:1600

4648 msgid "Commit contents options"

4649 msgstr "Alternativ för incheckningens innehåll"

4650

4644 -#: builtin/commit.c:1637

4651 +#: builtin/commit.c:1601

4652 msgid "commit all changed files"

4653 msgstr "checka in alla ändrade filer"

4654

4648 -#: builtin/commit.c:1638

4655 +#: builtin/commit.c:1602

4656 msgid "add specified files to index for commit"

4657 msgstr "lägg till angivna filer till indexet för incheckning"

4658

4652 -#: builtin/commit.c:1639

4659 +#: builtin/commit.c:1603

4660 msgid "interactively add files"

4661 msgstr "lägg till filer interaktivt"

4662

4656 -#: builtin/commit.c:1640

4663 +#: builtin/commit.c:1604

4664 msgid "interactively add changes"

4665 msgstr "lägg till ändringar interaktivt"

4666

4660 -#: builtin/commit.c:1641

4667 +#: builtin/commit.c:1605

4668 msgid "commit only specified files"

4669 msgstr "checka endast in angivna filer"

4670

4664 -#: builtin/commit.c:1642

4671 +#: builtin/commit.c:1606

4672 msgid "bypass pre-commit hook"

4673 msgstr "förbigå pre-commit-krok"

4674

4668 -#: builtin/commit.c:1643

4675 +#: builtin/commit.c:1607

4676 msgid "show what would be committed"

4677 msgstr "visa vad som skulle checkas in"

4678

4672 -#: builtin/commit.c:1654

4679 +#: builtin/commit.c:1618

4680 msgid "amend previous commit"

4681 msgstr "lägg till föregående incheckning"

4682

4676 -#: builtin/commit.c:1655

4683 +#: builtin/commit.c:1619

4684 msgid "bypass post-rewrite hook"

4685 msgstr "förbigå post-rewrite-krok"

4686

4680 -#: builtin/commit.c:1660

4687 +#: builtin/commit.c:1624

4688 msgid "ok to record an empty change"

4689 msgstr "ok att registrera en tom ändring"

4690

4684 -#: builtin/commit.c:1662

4691 +#: builtin/commit.c:1626

4692 msgid "ok to record a change with an empty message"

4693 msgstr "ok att registrera en ändring med tomt meddelande"

4694

4688 -#: builtin/commit.c:1691

4695 +#: builtin/commit.c:1655

4696 msgid "could not parse HEAD commit"

4697 msgstr "kunde inte tolka HEAD:s incheckning"

4698

4692 -#: builtin/commit.c:1730 builtin/merge.c:518

4699 +#: builtin/commit.c:1694 builtin/merge.c:519

4700 #, c-format

4701 msgid "could not open '%s' for reading"

4702 msgstr "kunde inte öppna \"%s\" för läsning"

4703

4697 -#: builtin/commit.c:1737

4704 +#: builtin/commit.c:1701

4705 #, c-format

4706 msgid "Corrupt MERGE_HEAD file (%s)"

4707 msgstr "Trasig MERGE_HEAD-fil (%s)"

4708

4702 -#: builtin/commit.c:1744

4709 +#: builtin/commit.c:1708

4710 msgid "could not read MERGE_MODE"

4711 msgstr "kunde inte läsa MERGE_MODE"

4712

4706 -#: builtin/commit.c:1763

4713 +#: builtin/commit.c:1727

4714 #, c-format

4715 msgid "could not read commit message: %s"

4716 msgstr "kunde inte läsa incheckningsmeddelande: %s"

4717

4711 -#: builtin/commit.c:1774

4718 +#: builtin/commit.c:1738

4719 #, c-format

4720 msgid "Aborting commit; you did not edit the message.\n"

4721 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"

4722

4716 -#: builtin/commit.c:1779

4723 +#: builtin/commit.c:1743

4724 #, c-format

4725 msgid "Aborting commit due to empty commit message.\n"

4726 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"

4727

4721 -#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875

4728 +#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876

4729 msgid "failed to write commit object"

4730 msgstr "kunde inte skriva incheckningsobjekt"

4731

4725 -#: builtin/commit.c:1827

4732 +#: builtin/commit.c:1791

4733 msgid ""

4734 "Repository has been updated, but unable to write\n"

4735 "new_index file. Check that disk is not full and quota is\n"

@@ -4817,17 +4824,13 @@ msgstr "visa alla"

4824 msgid "open an editor"

4825 msgstr "öppna textredigeringsprogram"

4826

4820 -#: builtin/config.c:72 builtin/config.c:73

4821 -msgid "slot"

4822 -msgstr "plats"

4823 -

4827 #: builtin/config.c:72

4825 -msgid "find the color configured: [default]"

4826 -msgstr "hitta den inställda färgen: [default]"

4828 +msgid "find the color configured: slot [default]"

4829 +msgstr "hitta den inställda färgen: slot [default]"

4830

4831 #: builtin/config.c:73

4829 -msgid "find the color setting: [stdout-is-tty]"

4830 -msgstr "hitta färginställningen: [stdout-is-tty]"

4832 +msgid "find the color setting: slot [stdout-is-tty]"

4833 +msgstr "hitta färginställningen: slot [stdout-is-tty]"

4834

4835 #: builtin/config.c:74

4836 msgid "Type"

@@ -4861,11 +4864,11 @@ msgstr "terminera värden med NUL-byte"

4864 msgid "respect include directives on lookup"

4865 msgstr "respektera inkluderingsdirektiv vid uppslag"

4866

4864 -#: builtin/config.c:315

4867 +#: builtin/config.c:316

4868 msgid "unable to parse default color value"

4869 msgstr "kan inte tolka standardfärgvärde"

4870

4868 -#: builtin/config.c:455

4871 +#: builtin/config.c:457

4872 #, c-format

4873 msgid ""

4874 "# This is Git's per-user configuration file.\n"

@@ -4880,7 +4883,7 @@ msgstr ""

4883 "#\tuser = %s\n"

4884 "#\temail = %s\n"

4885

4883 -#: builtin/config.c:590

4886 +#: builtin/config.c:589

4887 #, c-format

4888 msgid "cannot create configuration file %s"

4889 msgstr "kan inte skapa konfigurationsfilen \"%s\""

@@ -5307,7 +5310,7 @@ msgstr " (%s har blivit dinglande)"

5310 msgid "[deleted]"

5311 msgstr "[borttagen]"

5312

5310 -#: builtin/fetch.c:799 builtin/remote.c:1063

5313 +#: builtin/fetch.c:799 builtin/remote.c:1058

5314 msgid "(none)"

5315 msgstr "(ingen)"

5316

@@ -5383,30 +5386,30 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5386 msgstr ""

5387 "git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]"

5388

5386 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698

5387 -#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183

5389 +#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698

5390 +#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182

5391 #: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590

5392 #: parse-options.h:132 parse-options.h:239

5393 msgid "n"

5394 msgstr "n"

5395

5393 -#: builtin/fmt-merge-msg.c:664

5396 +#: builtin/fmt-merge-msg.c:663

5397 msgid "populate log with at most <n> entries from shortlog"

5398 msgstr "fyll i loggen med som mest <n> poster från shortlog"

5399

5397 -#: builtin/fmt-merge-msg.c:667

5400 +#: builtin/fmt-merge-msg.c:666

5401 msgid "alias for --log (deprecated)"

5402 msgstr "alias för --log (avråds)"

5403

5401 -#: builtin/fmt-merge-msg.c:670

5404 +#: builtin/fmt-merge-msg.c:669

5405 msgid "text"

5406 msgstr "text"

5407

5405 -#: builtin/fmt-merge-msg.c:671

5408 +#: builtin/fmt-merge-msg.c:670

5409 msgid "use <text> as start of message"

5410 msgstr "inled meddelande med <text>"

5411

5409 -#: builtin/fmt-merge-msg.c:672

5412 +#: builtin/fmt-merge-msg.c:671

5413 msgid "file to read from"

5414 msgstr "fil att läsa från"

5415

@@ -5431,8 +5434,8 @@ msgid "quote placeholders suitably for python"

5434 msgstr "citera platshållare passande för python"

5435

5436 #: builtin/for-each-ref.c:1078

5434 -msgid "quote placeholders suitably for tcl"

5435 -msgstr "citera platshållare passande för tcl"

5437 +msgid "quote placeholders suitably for Tcl"

5438 +msgstr "citera platshållare passande för Tcl"

5439

5440 #: builtin/for-each-ref.c:1081

5441 msgid "show only <n> matched refs"

@@ -5904,61 +5907,61 @@ msgstr ""

5907 "\"%s\": kommando för man-visare som stöds.\n"

5908 "Använd \"man.<verktyg>.path\" istället."

5909

5907 -#: builtin/help.c:352

5910 +#: builtin/help.c:354

5911 #, c-format

5912 msgid "'%s': unknown man viewer."

5913 msgstr "\"%s\": okänd man-visare."

5914

5912 -#: builtin/help.c:369

5915 +#: builtin/help.c:371

5916 msgid "no man viewer handled the request"

5917 msgstr "ingen man-visare hanterade förfrågan"

5918

5916 -#: builtin/help.c:377

5919 +#: builtin/help.c:379

5920 msgid "no info viewer handled the request"

5921 msgstr "ingen info-visare hanterade förfrågan"

5922

5920 -#: builtin/help.c:423

5923 +#: builtin/help.c:428

5924 msgid "Defining attributes per path"

5925 msgstr "Definierar attribut per sökväg"

5926

5924 -#: builtin/help.c:424

5927 +#: builtin/help.c:429

5928 msgid "Everyday Git With 20 Commands Or So"

5929 msgstr "Git för dagligt bruk i ungefär 20 kommandon"

5930

5928 -#: builtin/help.c:425

5931 +#: builtin/help.c:430

5932 msgid "A Git glossary"

5933 msgstr "En Git-ordlista"

5934

5932 -#: builtin/help.c:426

5935 +#: builtin/help.c:431

5936 msgid "Specifies intentionally untracked files to ignore"

5937 msgstr "Ange avsiktligen ospårade filer att ignorera"

5938

5936 -#: builtin/help.c:427

5939 +#: builtin/help.c:432

5940 msgid "Defining submodule properties"

5941 msgstr "Ange egenskaper för undermoduler"

5942

5940 -#: builtin/help.c:428

5943 +#: builtin/help.c:433

5944 msgid "Specifying revisions and ranges for Git"

5945 msgstr "Ange versioner och intervall i Git"

5946

5944 -#: builtin/help.c:429

5947 +#: builtin/help.c:434

5948 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

5949 msgstr "Introduktion till Git (för version 1.5.1 och senare)"

5950

5948 -#: builtin/help.c:430

5951 +#: builtin/help.c:435

5952 msgid "An overview of recommended workflows with Git"

5953 msgstr "Översikt över rekommenderade arbetsflöden med Git"

5954

5952 -#: builtin/help.c:442

5955 +#: builtin/help.c:447

5956 msgid "The common Git guides are:\n"

5957 msgstr "De vanliga Git-vägledningarna är:\n"

5958

5956 -#: builtin/help.c:463 builtin/help.c:480

5959 +#: builtin/help.c:468 builtin/help.c:485

5960 #, c-format

5961 msgid "usage: %s%s"

5962 msgstr "användning: %s%s"

5963

5961 -#: builtin/help.c:496

5964 +#: builtin/help.c:501

5965 #, c-format

5966 msgid "`git %s' is aliased to `%s'"

5967 msgstr "\"git %s\" är ett alias för \"%s\""

@@ -6301,37 +6304,37 @@ msgstr "kan inte kopiera \"%s\" till \"%s\""

6304 msgid "ignoring template %s"

6305 msgstr "ignorerar mallen %s"

6306

6304 -#: builtin/init-db.c:133

6307 +#: builtin/init-db.c:136

6308 #, c-format

6309 msgid "insanely long template path %s"

6310 msgstr "tokigt lång mallsökväg %s"

6311

6309 -#: builtin/init-db.c:141

6312 +#: builtin/init-db.c:144

6313 #, c-format

6314 msgid "templates not found %s"

6315 msgstr "mallarna hittades inte %s"

6316

6314 -#: builtin/init-db.c:154

6317 +#: builtin/init-db.c:157

6318 #, c-format

6319 msgid "not copying templates of a wrong format version %d from '%s'"

6320 msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\""

6321

6319 -#: builtin/init-db.c:192

6322 +#: builtin/init-db.c:197

6323 #, c-format

6324 msgid "insane git directory %s"

6325 msgstr "tokig git-katalog %s"

6326

6324 -#: builtin/init-db.c:323 builtin/init-db.c:326

6327 +#: builtin/init-db.c:331 builtin/init-db.c:334

6328 #, c-format

6329 msgid "%s already exists"

6330 msgstr "%s finns redan"

6331

6329 -#: builtin/init-db.c:355

6332 +#: builtin/init-db.c:363

6333 #, c-format

6334 msgid "unable to handle file type %d"

6335 msgstr "kan inte hantera filtyp %d"

6336

6334 -#: builtin/init-db.c:358

6337 +#: builtin/init-db.c:366

6338 #, c-format

6339 msgid "unable to move %s to %s"

6340 msgstr "kan inte flytta %s till %s"

@@ -6339,54 +6342,54 @@ msgstr "kan inte flytta %s till %s"

6342 #. TRANSLATORS: The first '%s' is either "Reinitialized

6343 #. existing" or "Initialized empty", the second " shared" or

6344 #. "", and the last '%s%s' is the verbatim directory name.

6342 -#: builtin/init-db.c:418

6345 +#: builtin/init-db.c:426

6346 #, c-format

6347 msgid "%s%s Git repository in %s%s\n"

6348 msgstr "%s%s Git-arkiv i %s%s\n"

6349

6347 -#: builtin/init-db.c:419

6350 +#: builtin/init-db.c:427

6351 msgid "Reinitialized existing"

6352 msgstr "Ominitierade befintligt"

6353

6351 -#: builtin/init-db.c:419

6354 +#: builtin/init-db.c:427

6355 msgid "Initialized empty"

6356 msgstr "Initierade tomt"

6357

6355 -#: builtin/init-db.c:420

6358 +#: builtin/init-db.c:428

6359 msgid " shared"

6360 msgstr " delat"

6361

6359 -#: builtin/init-db.c:467

6362 +#: builtin/init-db.c:475

6363 msgid ""

6361 -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

6362 -"shared[=<permissions>]] [directory]"

6364 +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"

6365 +"[=<permissions>]] [directory]"

6366 msgstr ""

6364 -"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"

6365 -"shared[=<behörigheter>]] [katalog]"

6367 +"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--shared"

6368 +"[=<behörigheter>]] [katalog]"

6369

6367 -#: builtin/init-db.c:490

6370 +#: builtin/init-db.c:498

6371 msgid "permissions"

6372 msgstr "behörigheter"

6373

6371 -#: builtin/init-db.c:491

6374 +#: builtin/init-db.c:499

6375 msgid "specify that the git repository is to be shared amongst several users"

6376 msgstr "ange att git-arkivet skall delas bland flera användare"

6377

6375 -#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172

6378 +#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171

6379 msgid "be quiet"

6380 msgstr "var tyst"

6381

6379 -#: builtin/init-db.c:525 builtin/init-db.c:530

6382 +#: builtin/init-db.c:533 builtin/init-db.c:538

6383 #, c-format

6384 msgid "cannot mkdir %s"

6385 msgstr "kan inte skapa katalogen (mkdir) %s"

6386

6384 -#: builtin/init-db.c:534

6387 +#: builtin/init-db.c:542

6388 #, c-format

6389 msgid "cannot chdir to %s"

6390 msgstr "kan inte byta katalog (chdir) till %s"

6391

6389 -#: builtin/init-db.c:555

6392 +#: builtin/init-db.c:563

6393 #, c-format

6394 msgid ""

6395 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

@@ -6395,7 +6398,7 @@ msgstr ""

6398 "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"

6399 "dir=<katalog>)"

6400

6398 -#: builtin/init-db.c:583

6401 +#: builtin/init-db.c:591

6402 #, c-format

6403 msgid "Cannot access work tree '%s'"

6404 msgstr "Kan inte komma åt arbetskatalogen \"%s\""

@@ -6405,8 +6408,8 @@ msgid ""

6408 "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "

6409 "[<file>...]"

6410 msgstr ""

6408 -"git interpret-trailers [--trim-empty] [(--trailer "

6409 -"<symbol>[(=|:)<värde>])...] [<fil>...]"

6411 +"git interpret-trailers [--trim-empty] [(--trailer <symbol>[(=|:)"

6412 +"<värde>])...] [<fil>...]"

6413

6414 #: builtin/interpret-trailers.c:25

6415 msgid "trim empty trailers"

@@ -6797,214 +6800,214 @@ msgstr "visa felsökningsutdata"

6800 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"

6801 msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]"

6802

6800 -#: builtin/ls-tree.c:126

6803 +#: builtin/ls-tree.c:127

6804 msgid "only show trees"

6805 msgstr "visa endast träd"

6806

6804 -#: builtin/ls-tree.c:128

6807 +#: builtin/ls-tree.c:129

6808 msgid "recurse into subtrees"

6809 msgstr "rekursera ner i underträd"

6810

6808 -#: builtin/ls-tree.c:130

6811 +#: builtin/ls-tree.c:131

6812 msgid "show trees when recursing"

6813 msgstr "visa träd medan rekursering"

6814

6812 -#: builtin/ls-tree.c:133

6815 +#: builtin/ls-tree.c:134

6816 msgid "terminate entries with NUL byte"

6817 msgstr "terminera poster med NUL-byte"

6818

6816 -#: builtin/ls-tree.c:134

6819 +#: builtin/ls-tree.c:135

6820 msgid "include object size"

6821 msgstr "inkludera objektstorlek"

6822

6820 -#: builtin/ls-tree.c:136 builtin/ls-tree.c:138

6823 +#: builtin/ls-tree.c:137 builtin/ls-tree.c:139

6824 msgid "list only filenames"

6825 msgstr "visa endast filnamn"

6826

6824 -#: builtin/ls-tree.c:141

6827 +#: builtin/ls-tree.c:142

6828 msgid "use full path names"

6829 msgstr "använd fullständiga sökvägsnamn"

6830

6828 -#: builtin/ls-tree.c:143

6831 +#: builtin/ls-tree.c:144

6832 msgid "list entire tree; not just current directory (implies --full-name)"

6833 msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)"

6834

6832 -#: builtin/merge.c:44

6835 +#: builtin/merge.c:45

6836 msgid "git merge [options] [<commit>...]"

6837 msgstr "git merge [flaggor] [<incheckning>...]"

6838

6836 -#: builtin/merge.c:45

6839 +#: builtin/merge.c:46

6840 msgid "git merge [options] <msg> HEAD <commit>"

6841 msgstr "git merge [flaggor] <meddelande> HEAD <incheckning>"

6842

6840 -#: builtin/merge.c:46

6843 +#: builtin/merge.c:47

6844 msgid "git merge --abort"

6845 msgstr "git merge --abort"

6846

6844 -#: builtin/merge.c:99

6847 +#: builtin/merge.c:100

6848 msgid "switch `m' requires a value"

6849 msgstr "flaggan \"m\" behöver ett värde"

6850

6848 -#: builtin/merge.c:136

6851 +#: builtin/merge.c:137

6852 #, c-format

6853 msgid "Could not find merge strategy '%s'.\n"

6854 msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"

6855

6853 -#: builtin/merge.c:137

6856 +#: builtin/merge.c:138

6857 #, c-format

6858 msgid "Available strategies are:"

6859 msgstr "Tillgängliga strategier är:"

6860

6858 -#: builtin/merge.c:142

6861 +#: builtin/merge.c:143

6862 #, c-format

6863 msgid "Available custom strategies are:"

6864 msgstr "Tillgängliga skräddarsydda strategier är:"

6865

6863 -#: builtin/merge.c:192

6866 +#: builtin/merge.c:193

6867 msgid "do not show a diffstat at the end of the merge"

6868 msgstr "visa inte en diffstat när sammanslagningen är färdig"

6869

6867 -#: builtin/merge.c:195

6870 +#: builtin/merge.c:196

6871 msgid "show a diffstat at the end of the merge"

6872 msgstr "visa en diffstat när sammanslagningen är färdig"

6873

6871 -#: builtin/merge.c:196

6874 +#: builtin/merge.c:197

6875 msgid "(synonym to --stat)"

6876 msgstr "(synonym till --stat)"

6877

6875 -#: builtin/merge.c:198

6878 +#: builtin/merge.c:199

6879 msgid "add (at most <n>) entries from shortlog to merge commit message"

6880 msgstr ""

6881 "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"

6882

6880 -#: builtin/merge.c:201

6883 +#: builtin/merge.c:202

6884 msgid "create a single commit instead of doing a merge"

6885 msgstr "skapa en ensam incheckning istället för en sammanslagning"

6886

6884 -#: builtin/merge.c:203

6887 +#: builtin/merge.c:204

6888 msgid "perform a commit if the merge succeeds (default)"

6889 msgstr "utför en incheckning om sammanslagningen lyckades (standard)"

6890

6888 -#: builtin/merge.c:205

6891 +#: builtin/merge.c:206

6892 msgid "edit message before committing"

6893 msgstr "redigera meddelande innan incheckning"

6894

6892 -#: builtin/merge.c:206

6895 +#: builtin/merge.c:207

6896 msgid "allow fast-forward (default)"

6897 msgstr "tillåt snabbspolning (standard)"

6898

6896 -#: builtin/merge.c:208

6899 +#: builtin/merge.c:209

6900 msgid "abort if fast-forward is not possible"

6901 msgstr "avbryt om snabbspolning inte är möjlig"

6902

6900 -#: builtin/merge.c:212

6903 +#: builtin/merge.c:213

6904 msgid "Verify that the named commit has a valid GPG signature"

6905 msgstr "Bekräfta att den namngivna incheckningen har en giltig GPG-signatur"

6906

6904 -#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89

6907 +#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89

6908 msgid "strategy"

6909 msgstr "strategi"

6910

6908 -#: builtin/merge.c:214

6911 +#: builtin/merge.c:215

6912 msgid "merge strategy to use"

6913 msgstr "sammanslagningsstrategi att använda"

6914

6912 -#: builtin/merge.c:215

6915 +#: builtin/merge.c:216

6916 msgid "option=value"

6917 msgstr "alternativ=värde"

6918

6916 -#: builtin/merge.c:216

6919 +#: builtin/merge.c:217

6920 msgid "option for selected merge strategy"

6921 msgstr "alternativ för vald sammanslagningsstrategi"

6922

6920 -#: builtin/merge.c:218

6923 +#: builtin/merge.c:219

6924 msgid "merge commit message (for a non-fast-forward merge)"

6925 msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"

6926

6924 -#: builtin/merge.c:222

6927 +#: builtin/merge.c:223

6928 msgid "abort the current in-progress merge"

6929 msgstr "avbryt den pågående sammanslagningen"

6930

6928 -#: builtin/merge.c:250

6931 +#: builtin/merge.c:251

6932 msgid "could not run stash."

6933 msgstr "kunde köra stash."

6934

6932 -#: builtin/merge.c:255

6935 +#: builtin/merge.c:256

6936 msgid "stash failed"

6937 msgstr "stash misslyckades"

6938

6936 -#: builtin/merge.c:260

6939 +#: builtin/merge.c:261

6940 #, c-format

6941 msgid "not a valid object: %s"

6942 msgstr "inte ett giltigt objekt: %s"

6943

6941 -#: builtin/merge.c:279 builtin/merge.c:296

6944 +#: builtin/merge.c:280 builtin/merge.c:297

6945 msgid "read-tree failed"

6946 msgstr "read-tree misslyckades"

6947

6945 -#: builtin/merge.c:326

6948 +#: builtin/merge.c:327

6949 msgid " (nothing to squash)"

6950 msgstr " (inget att platta till)"

6951

6949 -#: builtin/merge.c:339

6952 +#: builtin/merge.c:340

6953 #, c-format

6954 msgid "Squash commit -- not updating HEAD\n"

6955 msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"

6956

6954 -#: builtin/merge.c:371

6957 +#: builtin/merge.c:372

6958 msgid "Writing SQUASH_MSG"

6959 msgstr "Skriver SQUASH_MSG"

6960

6958 -#: builtin/merge.c:373

6961 +#: builtin/merge.c:374

6962 msgid "Finishing SQUASH_MSG"

6963 msgstr "Avslutar SQUASH_MSG"

6964

6962 -#: builtin/merge.c:396

6965 +#: builtin/merge.c:397

6966 #, c-format

6967 msgid "No merge message -- not updating HEAD\n"

6968 msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"

6969

6967 -#: builtin/merge.c:446

6970 +#: builtin/merge.c:447

6971 #, c-format

6972 msgid "'%s' does not point to a commit"

6973 msgstr "\"%s\" verkar inte peka på en incheckning"

6974

6972 -#: builtin/merge.c:558

6975 +#: builtin/merge.c:559

6976 #, c-format

6977 msgid "Bad branch.%s.mergeoptions string: %s"

6978 msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"

6979

6977 -#: builtin/merge.c:653

6980 +#: builtin/merge.c:654

6981 msgid "git write-tree failed to write a tree"

6982 msgstr "git write-tree misslyckades skriva ett träd"

6983

6981 -#: builtin/merge.c:677

6984 +#: builtin/merge.c:678

6985 msgid "Not handling anything other than two heads merge."

6986 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."

6987

6985 -#: builtin/merge.c:691

6988 +#: builtin/merge.c:692

6989 #, c-format

6990 msgid "Unknown option for merge-recursive: -X%s"

6991 msgstr "Felaktig flagga för merge-recursive: -X%s"

6992

6990 -#: builtin/merge.c:704

6993 +#: builtin/merge.c:705

6994 #, c-format

6995 msgid "unable to write %s"

6996 msgstr "kunde inte skriva %s"

6997

6995 -#: builtin/merge.c:793

6998 +#: builtin/merge.c:794

6999 #, c-format

7000 msgid "Could not read from '%s'"

7001 msgstr "Kunde inte läsa från \"%s\""

7002

7000 -#: builtin/merge.c:802

7003 +#: builtin/merge.c:803

7004 #, c-format

7005 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

7006 msgstr ""

7007 "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "

7008 "den.\n"

7009

7007 -#: builtin/merge.c:808

7010 +#: builtin/merge.c:809

7011 #, c-format

7012 msgid ""

7013 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -7020,48 +7023,48 @@ msgstr ""

7023 "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"

7024 "avbryter incheckningen.\n"

7025

7023 -#: builtin/merge.c:832

7026 +#: builtin/merge.c:833

7027 msgid "Empty commit message."

7028 msgstr "Tomt incheckningsmeddelande."

7029

7027 -#: builtin/merge.c:844

7030 +#: builtin/merge.c:845

7031 #, c-format

7032 msgid "Wonderful.\n"

7033 msgstr "Underbart.\n"

7034

7032 -#: builtin/merge.c:907

7035 +#: builtin/merge.c:900

7036 #, c-format

7037 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

7038 msgstr ""

7039 "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"

7040

7038 -#: builtin/merge.c:923

7041 +#: builtin/merge.c:916

7042 #, c-format

7043 msgid "'%s' is not a commit"

7044 msgstr "\"%s\" är inte en incheckning"

7045

7043 -#: builtin/merge.c:964

7046 +#: builtin/merge.c:957

7047 msgid "No current branch."

7048 msgstr "Inte på någon gren."

7049

7047 -#: builtin/merge.c:966

7050 +#: builtin/merge.c:959

7051 msgid "No remote for the current branch."

7052 msgstr "Ingen fjärr för aktuell gren."

7053

7051 -#: builtin/merge.c:968

7054 +#: builtin/merge.c:961

7055 msgid "No default upstream defined for the current branch."

7056 msgstr "Ingen standarduppström angiven för aktuell gren."

7057

7055 -#: builtin/merge.c:973

7058 +#: builtin/merge.c:966

7059 #, c-format

7060 msgid "No remote-tracking branch for %s from %s"

7061 msgstr "Ingen fjärrspårande gren för %s från %s"

7062

7060 -#: builtin/merge.c:1129

7063 +#: builtin/merge.c:1122

7064 msgid "There is no merge to abort (MERGE_HEAD missing)."

7065 msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)."

7066

7064 -#: builtin/merge.c:1145

7067 +#: builtin/merge.c:1138

7068 msgid ""

7069 "You have not concluded your merge (MERGE_HEAD exists).\n"

7070 "Please, commit your changes before you merge."

@@ -7069,11 +7072,11 @@ msgstr ""

7072 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"

7073 "Checka in dina ändringar innan du slår ihop."

7074

7072 -#: builtin/merge.c:1148 git-pull.sh:34

7075 +#: builtin/merge.c:1141 git-pull.sh:34

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

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

7078

7076 -#: builtin/merge.c:1152

7079 +#: builtin/merge.c:1145

7080 msgid ""

7081 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

7082 "Please, commit your changes before you merge."

@@ -7081,102 +7084,102 @@ msgstr ""

7084 "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"

7085 "Checka in dina ändringar innan du slår ihop."

7086

7084 -#: builtin/merge.c:1155

7087 +#: builtin/merge.c:1148

7088 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

7089 msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."

7090

7088 -#: builtin/merge.c:1164

7091 +#: builtin/merge.c:1157

7092 msgid "You cannot combine --squash with --no-ff."

7093 msgstr "Du kan inte kombinera --squash med --no-ff."

7094

7092 -#: builtin/merge.c:1173

7095 +#: builtin/merge.c:1166

7096 msgid "No commit specified and merge.defaultToUpstream not set."

7097 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."

7098

7096 -#: builtin/merge.c:1205

7099 +#: builtin/merge.c:1198

7100 msgid "Can merge only exactly one commit into empty head"

7101 msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."

7102

7100 -#: builtin/merge.c:1208

7103 +#: builtin/merge.c:1201

7104 msgid "Squash commit into empty head not supported yet"

7105 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"

7106

7104 -#: builtin/merge.c:1210

7107 +#: builtin/merge.c:1203

7108 msgid "Non-fast-forward commit does not make sense into an empty head"

7109 msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"

7110

7108 -#: builtin/merge.c:1215

7111 +#: builtin/merge.c:1208

7112 #, c-format

7113 msgid "%s - not something we can merge"

7114 msgstr "%s - inte något vi kan slå ihop"

7115

7113 -#: builtin/merge.c:1266

7116 +#: builtin/merge.c:1259

7117 #, c-format

7118 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

7119 msgstr ""

7120 "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."

7121

7119 -#: builtin/merge.c:1269

7122 +#: builtin/merge.c:1262

7123 #, c-format

7124 msgid "Commit %s has a bad GPG signature allegedly by %s."

7125 msgstr ""

7126 "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."

7127

7125 -#: builtin/merge.c:1272

7128 +#: builtin/merge.c:1265

7129 #, c-format

7130 msgid "Commit %s does not have a GPG signature."

7131 msgstr "Incheckning %s har inte någon GPG-signatur."

7132

7130 -#: builtin/merge.c:1275

7133 +#: builtin/merge.c:1268

7134 #, c-format

7135 msgid "Commit %s has a good GPG signature by %s\n"

7136 msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"

7137

7135 -#: builtin/merge.c:1356

7138 +#: builtin/merge.c:1349

7139 #, c-format

7140 msgid "Updating %s..%s\n"

7141 msgstr "Uppdaterar %s..%s\n"

7142

7140 -#: builtin/merge.c:1395

7143 +#: builtin/merge.c:1388

7144 #, c-format

7145 msgid "Trying really trivial in-index merge...\n"

7146 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"

7147

7145 -#: builtin/merge.c:1402

7148 +#: builtin/merge.c:1395

7149 #, c-format

7150 msgid "Nope.\n"

7151 msgstr "Nej.\n"

7152

7150 -#: builtin/merge.c:1434

7153 +#: builtin/merge.c:1427

7154 msgid "Not possible to fast-forward, aborting."

7155 msgstr "Kan inte snabbspola, avbryter."

7156

7154 -#: builtin/merge.c:1457 builtin/merge.c:1536

7157 +#: builtin/merge.c:1450 builtin/merge.c:1529

7158 #, c-format

7159 msgid "Rewinding the tree to pristine...\n"

7160 msgstr "Återspolar trädet till orört...\n"

7161

7159 -#: builtin/merge.c:1461

7162 +#: builtin/merge.c:1454

7163 #, c-format

7164 msgid "Trying merge strategy %s...\n"

7165 msgstr "Försöker sammanslagningsstrategin %s...\n"

7166

7164 -#: builtin/merge.c:1527

7167 +#: builtin/merge.c:1520

7168 #, c-format

7169 msgid "No merge strategy handled the merge.\n"

7170 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"

7171

7169 -#: builtin/merge.c:1529

7172 +#: builtin/merge.c:1522

7173 #, c-format

7174 msgid "Merge with strategy %s failed.\n"

7175 msgstr "Sammanslagning med strategin %s misslyckades.\n"

7176

7174 -#: builtin/merge.c:1538

7177 +#: builtin/merge.c:1531

7178 #, c-format

7179 msgid "Using the %s to prepare resolving by hand.\n"

7180 msgstr "Använder %s för att förbereda lösning för hand.\n"

7181

7179 -#: builtin/merge.c:1550

7182 +#: builtin/merge.c:1543

7183 #, c-format

7184 msgid "Automatic merge went well; stopped before committing as requested\n"

7185 msgstr ""

@@ -7365,7 +7368,7 @@ msgstr "%s, källa=%s, mål=%s"

7368 msgid "Renaming %s to %s\n"

7369 msgstr "Byter namn på %s till %s\n"

7370

7368 -#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358

7371 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355

7372 #, c-format

7373 msgid "renaming '%s' failed"

7374 msgstr "misslyckades byta namn på \"%s\""

@@ -7416,11 +7419,11 @@ msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]"

7419

7420 #: builtin/notes.c:25

7421 msgid ""

7419 -"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "

7420 -"<object>] [<object>]"

7422 +"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "

7423 +"| (-c | -C) <object>] [<object>]"

7424 msgstr ""

7422 -"git notes [--ref <anteckningsref>] add [-f] [-m <medd> | -F <fil> | (-c | -"

7423 -"C) <objekt>] [<objekt>]"

7425 +"git notes [--ref <anteckningsref>] add [-f] [--allow-empty] [-m <medd> | -F "

7426 +"<fil> | (-c | -C) <objekt>] [<objekt>]"

7427

7428 #: builtin/notes.c:26

7429 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"

@@ -7429,15 +7432,15 @@ msgstr ""

7432

7433 #: builtin/notes.c:27

7434 msgid ""

7432 -"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "

7433 -"<object>] [<object>]"

7435 +"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | "

7436 +"(-c | -C) <object>] [<object>]"

7437 msgstr ""

7435 -"git notes [--ref <anteckningsref>] append [-m <medd> | -F <fil> | (-c | -C) "

7436 -"<objekt>] [<objekt>]"

7438 +"git notes [--ref <anteckningsref>] append [--allow-empty] [-m <medd> | -F "

7439 +"<fil> | (-c | -C) <objekt>] [<objekt>]"

7440

7441 #: builtin/notes.c:28

7439 -msgid "git notes [--ref <notes_ref>] edit [<object>]"

7440 -msgstr "git notes [--ref <anteckningsref>] edit [<objekt>]"

7442 +msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]"

7443 +msgstr "git notes [--ref <anteckningsref>] edit [--allow-empty] [<objekt>]"

7444

7445 #: builtin/notes.c:29

7446 msgid "git notes [--ref <notes_ref>] show [<object>]"

@@ -7522,118 +7525,117 @@ msgstr "git notes prune [<flaggor>]"

7525 msgid "git notes get-ref"

7526 msgstr "git notes get-ref"

7527

7525 -#: builtin/notes.c:136

7528 +#: builtin/notes.c:146

7529 #, c-format

7530 msgid "unable to start 'show' for object '%s'"

7531 msgstr "kunde inte starta \"show\" för objektet \"%s\""

7532

7530 -#: builtin/notes.c:140

7533 +#: builtin/notes.c:150

7534 msgid "could not read 'show' output"

7535 msgstr "kunde inte läsa utdata från \"show\""

7536

7534 -#: builtin/notes.c:148

7537 +#: builtin/notes.c:158

7538 #, c-format

7539 msgid "failed to finish 'show' for object '%s'"

7540 msgstr "kunde inte avsluta \"show\" för objektet \"%s\""

7541

7539 -#: builtin/notes.c:166 builtin/tag.c:477

7542 +#: builtin/notes.c:173 builtin/tag.c:477

7543 #, c-format

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

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

7546

7544 -#: builtin/notes.c:185

7547 +#: builtin/notes.c:192

7548 msgid "Please supply the note contents using either -m or -F option"

7549 msgstr "Ange innehåll för anteckningen med antingen -m eller -F"

7550

7548 -#: builtin/notes.c:206 builtin/notes.c:847

7549 -#, c-format

7550 -msgid "Removing note for object %s\n"

7551 -msgstr "Tar bort anteckning för objektet %s\n"

7552 -

7553 -#: builtin/notes.c:211

7551 +#: builtin/notes.c:201

7552 msgid "unable to write note object"

7553 msgstr "kunde inte skriva anteckningsobjekt"

7554

7557 -#: builtin/notes.c:213

7555 +#: builtin/notes.c:203

7556 #, c-format

7557 msgid "The note contents have been left in %s"

7558 msgstr "Anteckningens innehåll har lämnats kvar i %s"

7559

7562 -#: builtin/notes.c:247 builtin/tag.c:693

7560 +#: builtin/notes.c:231 builtin/tag.c:693

7561 #, c-format

7562 msgid "cannot read '%s'"

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

7564

7567 -#: builtin/notes.c:249 builtin/tag.c:696

7565 +#: builtin/notes.c:233 builtin/tag.c:696

7566 #, c-format

7567 msgid "could not open or read '%s'"

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

7569

7572 -#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321

7573 -#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518

7574 -#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640

7575 -#: builtin/notes.c:842 builtin/tag.c:709

7570 +#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305

7571 +#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506

7572 +#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652

7573 +#: builtin/notes.c:854 builtin/tag.c:709

7574 #, c-format

7575 msgid "Failed to resolve '%s' as a valid ref."

7576 msgstr "Kunde inte slå upp \"%s\" som en giltig referens."

7577

7580 -#: builtin/notes.c:271

7578 +#: builtin/notes.c:255

7579 #, c-format

7580 msgid "Failed to read object '%s'."

7581 msgstr "Kunde inte läsa objektet \"%s\"."

7582

7585 -#: builtin/notes.c:275

7583 +#: builtin/notes.c:259

7584 #, c-format

7585 msgid "Cannot read note data from non-blob object '%s'."

7586 msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"."

7587

7590 -#: builtin/notes.c:315

7588 +#: builtin/notes.c:299

7589 #, c-format

7590 msgid "Malformed input line: '%s'."

7591 msgstr "Felaktig indatarad: \"%s\"."

7592

7595 -#: builtin/notes.c:330

7593 +#: builtin/notes.c:314

7594 #, c-format

7595 msgid "Failed to copy notes from '%s' to '%s'"

7596 msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""

7597

7600 -#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501

7601 -#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633

7602 -#: builtin/notes.c:907

7598 +#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489

7599 +#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645

7600 +#: builtin/notes.c:919

7601 msgid "too many parameters"

7602 msgstr "för många parametrar"

7603

7606 -#: builtin/notes.c:387 builtin/notes.c:646

7604 +#: builtin/notes.c:371 builtin/notes.c:658

7605 #, c-format

7606 msgid "No note found for object %s."

7607 msgstr "Inga anteckningar hittades för objektet %s."

7608

7611 -#: builtin/notes.c:409 builtin/notes.c:566

7609 +#: builtin/notes.c:392 builtin/notes.c:555

7610 msgid "note contents as a string"

7611 msgstr "anteckningsinnehåll som sträng"

7612

7615 -#: builtin/notes.c:412 builtin/notes.c:569

7613 +#: builtin/notes.c:395 builtin/notes.c:558

7614 msgid "note contents in a file"

7615 msgstr "anteckningsinnehåll i en fil"

7616

7619 -#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571

7620 -#: builtin/notes.c:574 builtin/tag.c:628

7617 +#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560

7618 +#: builtin/notes.c:563 builtin/tag.c:628

7619 msgid "object"

7620 msgstr "objekt"

7621

7624 -#: builtin/notes.c:415 builtin/notes.c:572

7622 +#: builtin/notes.c:398 builtin/notes.c:561

7623 msgid "reuse and edit specified note object"

7624 msgstr "återanvänd och redigera angivet anteckningsobjekt"

7625

7628 -#: builtin/notes.c:418 builtin/notes.c:575

7626 +#: builtin/notes.c:401 builtin/notes.c:564

7627 msgid "reuse specified note object"

7628 msgstr "återanvänd angivet anteckningsobjekt"

7629

7632 -#: builtin/notes.c:420 builtin/notes.c:488

7630 +#: builtin/notes.c:404 builtin/notes.c:567

7631 +msgid "allow storing empty note"

7632 +msgstr "tillåt lagra tom anteckning"

7633 +

7634 +#: builtin/notes.c:405 builtin/notes.c:476

7635 msgid "replace existing notes"

7636 msgstr "ersätt befintliga anteckningar"

7637

7636 -#: builtin/notes.c:454

7638 +#: builtin/notes.c:430

7639 #, c-format

7640 msgid ""

7641 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "

@@ -7642,24 +7644,29 @@ msgstr ""

7644 "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för "

7645 "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar"

7646

7645 -#: builtin/notes.c:459 builtin/notes.c:536

7647 +#: builtin/notes.c:445 builtin/notes.c:524

7648 #, c-format

7649 msgid "Overwriting existing notes for object %s\n"

7650 msgstr "Skriver över befintliga anteckningar för objektet %s\n"

7651

7650 -#: builtin/notes.c:489

7652 +#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859

7653 +#, c-format

7654 +msgid "Removing note for object %s\n"

7655 +msgstr "Tar bort anteckning för objektet %s\n"

7656 +

7657 +#: builtin/notes.c:477

7658 msgid "read objects from stdin"

7659 msgstr "läs objekt från standard in"

7660

7654 -#: builtin/notes.c:491

7661 +#: builtin/notes.c:479

7662 msgid "load rewriting config for <command> (implies --stdin)"

7663 msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"

7664

7658 -#: builtin/notes.c:509

7665 +#: builtin/notes.c:497

7666 msgid "too few parameters"

7667 msgstr "för få parametrar"

7668

7662 -#: builtin/notes.c:530

7669 +#: builtin/notes.c:518

7670 #, c-format

7671 msgid ""

7672 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "

@@ -7668,12 +7675,12 @@ msgstr ""

7675 "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "

7676 "%s. Använd \"-f\" för att skriva över befintliga anteckningar"

7677

7671 -#: builtin/notes.c:542

7678 +#: builtin/notes.c:530

7679 #, c-format

7680 msgid "Missing notes on source object %s. Cannot copy."

7681 msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera."

7682

7676 -#: builtin/notes.c:591

7683 +#: builtin/notes.c:582

7684 #, c-format

7685 msgid ""

7686 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"

@@ -7682,15 +7689,15 @@ msgstr ""

7689 "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"

7690 "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"

7691

7685 -#: builtin/notes.c:738

7692 +#: builtin/notes.c:750

7693 msgid "General options"

7694 msgstr "Allmänna flaggor"

7695

7689 -#: builtin/notes.c:740

7696 +#: builtin/notes.c:752

7697 msgid "Merge options"

7698 msgstr "Flaggor för sammanslagning"

7699

7693 -#: builtin/notes.c:742

7700 +#: builtin/notes.c:754

7701 msgid ""

7702 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"

7703 "cat_sort_uniq)"

@@ -7698,46 +7705,46 @@ msgstr ""

7705 "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"

7706 "cat_sort_uniq)"

7707

7701 -#: builtin/notes.c:744

7708 +#: builtin/notes.c:756

7709 msgid "Committing unmerged notes"

7710 msgstr "Checkar in ej sammanslagna anteckningar"

7711

7705 -#: builtin/notes.c:746

7712 +#: builtin/notes.c:758

7713 msgid "finalize notes merge by committing unmerged notes"

7714 msgstr ""

7715 "färdigställ sammanslagning av anteckningar genom att checka in ej "

7716 "sammanslagna anteckningar"

7717

7711 -#: builtin/notes.c:748

7718 +#: builtin/notes.c:760

7719 msgid "Aborting notes merge resolution"

7720 msgstr "Avbryt lösning av sammanslagning av anteckningar"

7721

7715 -#: builtin/notes.c:750

7722 +#: builtin/notes.c:762

7723 msgid "abort notes merge"

7724 msgstr "avbryt sammanslagning av anteckningar"

7725

7719 -#: builtin/notes.c:845

7726 +#: builtin/notes.c:857

7727 #, c-format

7728 msgid "Object %s has no note\n"

7729 msgstr "Objektet %s har ingen anteckning\n"

7730

7724 -#: builtin/notes.c:857

7731 +#: builtin/notes.c:869

7732 msgid "attempt to remove non-existent note is not an error"

7733 msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"

7734

7728 -#: builtin/notes.c:860

7735 +#: builtin/notes.c:872

7736 msgid "read object names from the standard input"

7737 msgstr "läs objektnamn från standard in"

7738

7732 -#: builtin/notes.c:941

7739 +#: builtin/notes.c:953

7740 msgid "notes-ref"

7741 msgstr "anteckningar-ref"

7742

7736 -#: builtin/notes.c:942

7743 +#: builtin/notes.c:954

7744 msgid "use notes from <notes_ref>"

7745 msgstr "använd anteckningar från <anteckningsref>"

7746

7740 -#: builtin/notes.c:977 builtin/remote.c:1624

7747 +#: builtin/notes.c:989 builtin/remote.c:1619

7748 #, c-format

7749 msgid "Unknown subcommand: %s"

7750 msgstr "Okänt underkommando: %s"

@@ -7787,139 +7794,143 @@ msgstr "flaggan %s godtar inte negativ form"

7794 msgid "unable to parse value '%s' for option %s"

7795 msgstr "kunde inte tolka värdet \"%s\" för flaggan %s"

7796

7790 -#: builtin/pack-objects.c:2622

7797 +#: builtin/pack-objects.c:2623

7798 msgid "do not show progress meter"

7799 msgstr "visa inte förloppsindikator"

7800

7794 -#: builtin/pack-objects.c:2624

7801 +#: builtin/pack-objects.c:2625

7802 msgid "show progress meter"

7803 msgstr "visa förloppsindikator"

7804

7798 -#: builtin/pack-objects.c:2626

7805 +#: builtin/pack-objects.c:2627

7806 msgid "show progress meter during object writing phase"

7807 msgstr "visa förloppsindikator under objektskrivningsfasen"

7808

7802 -#: builtin/pack-objects.c:2629

7809 +#: builtin/pack-objects.c:2630

7810 msgid "similar to --all-progress when progress meter is shown"

7811 msgstr "som --all-progress när förloppsmätaren visas"

7812

7806 -#: builtin/pack-objects.c:2630

7813 +#: builtin/pack-objects.c:2631

7814 msgid "version[,offset]"

7815 msgstr "version[,offset]"

7816

7810 -#: builtin/pack-objects.c:2631

7817 +#: builtin/pack-objects.c:2632

7818 msgid "write the pack index file in the specified idx format version"

7819 msgstr "skriv paketindexfilen i angiven indexformatversion"

7820

7814 -#: builtin/pack-objects.c:2634

7821 +#: builtin/pack-objects.c:2635

7822 msgid "maximum size of each output pack file"

7823 msgstr "maximal storlek på varje utdatapaketfil"

7824

7818 -#: builtin/pack-objects.c:2636

7825 +#: builtin/pack-objects.c:2637

7826 msgid "ignore borrowed objects from alternate object store"

7827 msgstr "ignorera lånade objekt från alternativa objektlager"

7828

7822 -#: builtin/pack-objects.c:2638

7829 +#: builtin/pack-objects.c:2639

7830 msgid "ignore packed objects"

7831 msgstr "ignorera packade objekt"

7832

7826 -#: builtin/pack-objects.c:2640

7833 +#: builtin/pack-objects.c:2641

7834 msgid "limit pack window by objects"

7835 msgstr "begränsa paketfönster efter objekt"

7836

7830 -#: builtin/pack-objects.c:2642

7837 +#: builtin/pack-objects.c:2643

7838 msgid "limit pack window by memory in addition to object limit"

7839 msgstr "begränsa paketfönster efter minne förutom objektgräns"

7840

7834 -#: builtin/pack-objects.c:2644

7841 +#: builtin/pack-objects.c:2645

7842 msgid "maximum length of delta chain allowed in the resulting pack"

7843 msgstr "maximal längd på deltakedja tillåten i slutligt paket"

7844

7838 -#: builtin/pack-objects.c:2646

7845 +#: builtin/pack-objects.c:2647

7846 msgid "reuse existing deltas"

7847 msgstr "återanvänd befintliga delta"

7848

7842 -#: builtin/pack-objects.c:2648

7849 +#: builtin/pack-objects.c:2649

7850 msgid "reuse existing objects"

7851 msgstr "återanvänd befintliga objekt"

7852

7846 -#: builtin/pack-objects.c:2650

7853 +#: builtin/pack-objects.c:2651

7854 msgid "use OFS_DELTA objects"

7855 msgstr "använd OFS_DELTA-objekt"

7856

7850 -#: builtin/pack-objects.c:2652

7857 +#: builtin/pack-objects.c:2653

7858 msgid "use threads when searching for best delta matches"

7859 msgstr "använd trådar vid sökning efter bästa deltaträffar"

7860

7854 -#: builtin/pack-objects.c:2654

7861 +#: builtin/pack-objects.c:2655

7862 msgid "do not create an empty pack output"

7863 msgstr "försök inte skapa tom paketutdata"

7864

7858 -#: builtin/pack-objects.c:2656

7865 +#: builtin/pack-objects.c:2657

7866 msgid "read revision arguments from standard input"

7867 msgstr "läs revisionsargument från standard in"

7868

7862 -#: builtin/pack-objects.c:2658

7869 +#: builtin/pack-objects.c:2659

7870 msgid "limit the objects to those that are not yet packed"

7871 msgstr "begränsa objekt till de som ännu inte packats"

7872

7866 -#: builtin/pack-objects.c:2661

7873 +#: builtin/pack-objects.c:2662

7874 msgid "include objects reachable from any reference"

7875 msgstr "inkludera objekt som kan nås från någon referens"

7876

7870 -#: builtin/pack-objects.c:2664

7877 +#: builtin/pack-objects.c:2665

7878 msgid "include objects referred by reflog entries"

7879 msgstr "inkludera objekt som refereras från referensloggposter"

7880

7874 -#: builtin/pack-objects.c:2667

7881 +#: builtin/pack-objects.c:2668

7882 msgid "include objects referred to by the index"

7883 msgstr "inkludera objekt som refereras från indexet"

7884

7878 -#: builtin/pack-objects.c:2670

7885 +#: builtin/pack-objects.c:2671

7886 msgid "output pack to stdout"

7887 msgstr "skriv paket på standard ut"

7888

7882 -#: builtin/pack-objects.c:2672

7889 +#: builtin/pack-objects.c:2673

7890 msgid "include tag objects that refer to objects to be packed"

7891 msgstr "inkludera taggobjekt som refererar objekt som skall packas"

7892

7886 -#: builtin/pack-objects.c:2674

7893 +#: builtin/pack-objects.c:2675

7894 msgid "keep unreachable objects"

7895 msgstr "behåll onåbara objekt"

7896

7890 -#: builtin/pack-objects.c:2675 parse-options.h:140

7897 +#: builtin/pack-objects.c:2676 parse-options.h:140

7898 msgid "time"

7899 msgstr "tid"

7900

7894 -#: builtin/pack-objects.c:2676

7901 +#: builtin/pack-objects.c:2677

7902 msgid "unpack unreachable objects newer than <time>"

7903 msgstr "packa upp onåbara objekt nyare än <tid>"

7904

7898 -#: builtin/pack-objects.c:2679

7905 +#: builtin/pack-objects.c:2680

7906 msgid "create thin packs"

7907 msgstr "skapa tunna paket"

7908

7902 -#: builtin/pack-objects.c:2681

7909 +#: builtin/pack-objects.c:2682

7910 +msgid "create packs suitable for shallow fetches"

7911 +msgstr "skapa packfiler lämpade för grunda hämtningar"

7912 +

7913 +#: builtin/pack-objects.c:2684

7914 msgid "ignore packs that have companion .keep file"

7915 msgstr "ignorera paket som har tillhörande .keep-fil"

7916

7906 -#: builtin/pack-objects.c:2683

7917 +#: builtin/pack-objects.c:2686

7918 msgid "pack compression level"

7919 msgstr "komprimeringsgrad för paket"

7920

7910 -#: builtin/pack-objects.c:2685

7921 +#: builtin/pack-objects.c:2688

7922 msgid "do not hide commits by grafts"

7923 msgstr "göm inte incheckningar med ympningar (\"grafts\")"

7924

7914 -#: builtin/pack-objects.c:2687

7925 +#: builtin/pack-objects.c:2690

7926 msgid "use a bitmap index if available to speed up counting objects"

7927 msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"

7928

7918 -#: builtin/pack-objects.c:2689

7929 +#: builtin/pack-objects.c:2692

7930 msgid "write a bitmap index together with the pack index"

7931 msgstr "använd bitkartindex tillsammans med packindexet"

7932

7922 -#: builtin/pack-objects.c:2778

7933 +#: builtin/pack-objects.c:2783

7934 msgid "Counting objects"

7935 msgstr "Räknar objekt"

7936

@@ -8538,7 +8549,7 @@ msgstr "(ta bort)"

8549 msgid "Could not append '%s' to '%s'"

8550 msgstr "Kunde inte tillämpa \"%s\" på \"%s\""

8551

8541 -#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898

8552 +#: builtin/remote.c:634 builtin/remote.c:793 builtin/remote.c:893

8553 #, c-format

8554 msgid "No such remote: %s"

8555 msgstr "Inget sådant fjärrarkiv: %s"

@@ -8548,7 +8559,7 @@ msgstr "Inget sådant fjärrarkiv: %s"

8559 msgid "Could not rename config section '%s' to '%s'"

8560 msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\""

8561

8551 -#: builtin/remote.c:657 builtin/remote.c:850

8562 +#: builtin/remote.c:657 builtin/remote.c:845

8563 #, c-format

8564 msgid "Could not remove config section '%s'"

8565 msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""

@@ -8584,12 +8595,12 @@ msgstr "misslyckades ta bort \"%s\""

8595 msgid "creating '%s' failed"

8596 msgstr "misslyckades skapa \"%s\""

8597

8587 -#: builtin/remote.c:769

8598 +#: builtin/remote.c:764

8599 #, c-format

8600 msgid "Could not remove branch %s"

8601 msgstr "Kunde inte ta bort grenen %s"

8602

8592 -#: builtin/remote.c:836

8603 +#: builtin/remote.c:831

8604 msgid ""

8605 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"

8606 "to delete it, use:"

@@ -8603,262 +8614,262 @@ msgstr[1] ""

8614 "Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n"

8615 "för att ta bort dem, använd:"

8616

8606 -#: builtin/remote.c:951

8617 +#: builtin/remote.c:946

8618 #, c-format

8619 msgid " new (next fetch will store in remotes/%s)"

8620 msgstr " ny (nästa hämtning sparar i remotes/%s)"

8621

8611 -#: builtin/remote.c:954

8622 +#: builtin/remote.c:949

8623 msgid " tracked"

8624 msgstr " spårad"

8625

8615 -#: builtin/remote.c:956

8626 +#: builtin/remote.c:951

8627 msgid " stale (use 'git remote prune' to remove)"

8628 msgstr " förlegad (använd \"git remote prune\" för att ta bort)"

8629

8619 -#: builtin/remote.c:958

8630 +#: builtin/remote.c:953

8631 msgid " ???"

8632 msgstr " ???"

8633

8623 -#: builtin/remote.c:999

8634 +#: builtin/remote.c:994

8635 #, c-format

8636 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"

8637 msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren"

8638

8628 -#: builtin/remote.c:1006

8639 +#: builtin/remote.c:1001

8640 #, c-format

8641 msgid "rebases onto remote %s"

8642 msgstr "ombaseras på fjärren %s"

8643

8633 -#: builtin/remote.c:1009

8644 +#: builtin/remote.c:1004

8645 #, c-format

8646 msgid " merges with remote %s"

8647 msgstr " sammanslås med fjärren %s"

8648

8638 -#: builtin/remote.c:1010

8649 +#: builtin/remote.c:1005

8650 msgid " and with remote"

8651 msgstr " och med fjärren"

8652

8642 -#: builtin/remote.c:1012

8653 +#: builtin/remote.c:1007

8654 #, c-format

8655 msgid "merges with remote %s"

8656 msgstr "sammanslås med fjärren %s"

8657

8647 -#: builtin/remote.c:1013

8658 +#: builtin/remote.c:1008

8659 msgid " and with remote"

8660 msgstr " och med fjärren"

8661

8651 -#: builtin/remote.c:1059

8662 +#: builtin/remote.c:1054

8663 msgid "create"

8664 msgstr "skapa"

8665

8655 -#: builtin/remote.c:1062

8666 +#: builtin/remote.c:1057

8667 msgid "delete"

8668 msgstr "ta bort"

8669

8659 -#: builtin/remote.c:1066

8670 +#: builtin/remote.c:1061

8671 msgid "up to date"

8672 msgstr "àjour"

8673

8663 -#: builtin/remote.c:1069

8674 +#: builtin/remote.c:1064

8675 msgid "fast-forwardable"

8676 msgstr "kan snabbspolas"

8677

8667 -#: builtin/remote.c:1072

8678 +#: builtin/remote.c:1067

8679 msgid "local out of date"

8680 msgstr "lokal föråldrad"

8681

8671 -#: builtin/remote.c:1079

8682 +#: builtin/remote.c:1074

8683 #, c-format

8684 msgid " %-*s forces to %-*s (%s)"

8685 msgstr " %-*s tvingar till %-*s (%s)"

8686

8676 -#: builtin/remote.c:1082

8687 +#: builtin/remote.c:1077

8688 #, c-format

8689 msgid " %-*s pushes to %-*s (%s)"

8690 msgstr " %-*s sänder till %-*s (%s)"

8691

8681 -#: builtin/remote.c:1086

8692 +#: builtin/remote.c:1081

8693 #, c-format

8694 msgid " %-*s forces to %s"

8695 msgstr " %-*s tvingar till %s"

8696

8686 -#: builtin/remote.c:1089

8697 +#: builtin/remote.c:1084

8698 #, c-format

8699 msgid " %-*s pushes to %s"

8700 msgstr " %-*s sänder till %s"

8701

8691 -#: builtin/remote.c:1157

8702 +#: builtin/remote.c:1152

8703 msgid "do not query remotes"

8704 msgstr "fråga inte fjärrar"

8705

8695 -#: builtin/remote.c:1184

8706 +#: builtin/remote.c:1179

8707 #, c-format

8708 msgid "* remote %s"

8709 msgstr "* fjärr %s"

8710

8700 -#: builtin/remote.c:1185

8711 +#: builtin/remote.c:1180

8712 #, c-format

8713 msgid " Fetch URL: %s"

8714 msgstr " Hämt-URL: %s"

8715

8705 -#: builtin/remote.c:1186 builtin/remote.c:1333

8716 +#: builtin/remote.c:1181 builtin/remote.c:1332

8717 msgid "(no URL)"

8718 msgstr "(ingen URL)"

8719

8709 -#: builtin/remote.c:1195 builtin/remote.c:1197

8720 +#: builtin/remote.c:1190 builtin/remote.c:1192

8721 #, c-format

8722 msgid " Push URL: %s"

8723 msgstr " Sänd-URL: %s"

8724

8714 -#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203

8725 +#: builtin/remote.c:1194 builtin/remote.c:1196 builtin/remote.c:1198

8726 #, c-format

8727 msgid " HEAD branch: %s"

8728 msgstr " HEAD-gren: %s"

8729

8719 -#: builtin/remote.c:1205

8730 +#: builtin/remote.c:1200

8731 #, c-format

8732 msgid ""

8733 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"

8734 msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n"

8735

8725 -#: builtin/remote.c:1217

8736 +#: builtin/remote.c:1212

8737 #, c-format

8738 msgid " Remote branch:%s"

8739 msgid_plural " Remote branches:%s"

8740 msgstr[0] " Fjärrgren:%s"

8741 msgstr[1] " Fjärrgrenar:%s"

8742

8732 -#: builtin/remote.c:1220 builtin/remote.c:1247

8743 +#: builtin/remote.c:1215 builtin/remote.c:1242

8744 msgid " (status not queried)"

8745 msgstr " (status inte förfrågad)"

8746

8736 -#: builtin/remote.c:1229

8747 +#: builtin/remote.c:1224

8748 msgid " Local branch configured for 'git pull':"

8749 msgid_plural " Local branches configured for 'git pull':"

8750 msgstr[0] " Lokal gren konfigurerad för \"git pull\":"

8751 msgstr[1] " Lokala grenar konfigurerade för \"git pull\":"

8752

8742 -#: builtin/remote.c:1237

8753 +#: builtin/remote.c:1232

8754 msgid " Local refs will be mirrored by 'git push'"

8755 msgstr " Lokala referenser speglas av \"git push\""

8756

8746 -#: builtin/remote.c:1244

8757 +#: builtin/remote.c:1239

8758 #, c-format

8759 msgid " Local ref configured for 'git push'%s:"

8760 msgid_plural " Local refs configured for 'git push'%s:"

8761 msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:"

8762 msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:"

8763

8753 -#: builtin/remote.c:1265

8764 +#: builtin/remote.c:1260

8765 msgid "set refs/remotes/<name>/HEAD according to remote"

8766 msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"

8767

8757 -#: builtin/remote.c:1267

8768 +#: builtin/remote.c:1262

8769 msgid "delete refs/remotes/<name>/HEAD"

8770 msgstr "ta bort refs/remotes/<namn>/HEAD"

8771

8761 -#: builtin/remote.c:1282

8772 +#: builtin/remote.c:1277

8773 msgid "Cannot determine remote HEAD"

8774 msgstr "Kan inte bestämma HEAD på fjärren"

8775

8765 -#: builtin/remote.c:1284

8776 +#: builtin/remote.c:1279

8777 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"

8778 msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:"

8779

8769 -#: builtin/remote.c:1294

8780 +#: builtin/remote.c:1289

8781 #, c-format

8782 msgid "Could not delete %s"

8783 msgstr "Kunde inte ta bort %s"

8784

8774 -#: builtin/remote.c:1302

8785 +#: builtin/remote.c:1297

8786 #, c-format

8787 msgid "Not a valid ref: %s"

8788 msgstr "Inte en giltig referens: %s"

8789

8779 -#: builtin/remote.c:1304

8790 +#: builtin/remote.c:1299

8791 #, c-format

8792 msgid "Could not setup %s"

8793 msgstr "Kunde inte ställa in %s"

8794

8784 -#: builtin/remote.c:1322

8795 +#: builtin/remote.c:1317

8796 #, c-format

8797 msgid " %s will become dangling!"

8798 msgstr " %s kommer bli dinglande!"

8799

8789 -#: builtin/remote.c:1323

8800 +#: builtin/remote.c:1318

8801 #, c-format

8802 msgid " %s has become dangling!"

8803 msgstr " %s har blivit dinglande!"

8804

8794 -#: builtin/remote.c:1329

8805 +#: builtin/remote.c:1328

8806 #, c-format

8807 msgid "Pruning %s"

8808 msgstr "Rensar %s"

8809

8799 -#: builtin/remote.c:1330

8810 +#: builtin/remote.c:1329

8811 #, c-format

8812 msgid "URL: %s"

8813 msgstr "URL: %s"

8814

8804 -#: builtin/remote.c:1357

8815 +#: builtin/remote.c:1352

8816 #, c-format

8817 msgid " * [would prune] %s"

8818 msgstr " * [skulle rensa] %s"

8819

8809 -#: builtin/remote.c:1360

8820 +#: builtin/remote.c:1355

8821 #, c-format

8822 msgid " * [pruned] %s"

8823 msgstr " * [rensad] %s"

8824

8814 -#: builtin/remote.c:1405

8825 +#: builtin/remote.c:1400

8826 msgid "prune remotes after fetching"

8827 msgstr "rensa fjärrar efter hämtning"

8828

8818 -#: builtin/remote.c:1471 builtin/remote.c:1545

8829 +#: builtin/remote.c:1466 builtin/remote.c:1540

8830 #, c-format

8831 msgid "No such remote '%s'"

8832 msgstr "Ingen sådan fjärr \"%s\""

8833

8823 -#: builtin/remote.c:1491

8834 +#: builtin/remote.c:1486

8835 msgid "add branch"

8836 msgstr "lägg till gren"

8837

8827 -#: builtin/remote.c:1498

8838 +#: builtin/remote.c:1493

8839 msgid "no remote specified"

8840 msgstr "ingen fjärr angavs"

8841

8831 -#: builtin/remote.c:1520

8842 +#: builtin/remote.c:1515

8843 msgid "manipulate push URLs"

8844 msgstr "manipulera URL:ar för sändning"

8845

8835 -#: builtin/remote.c:1522

8846 +#: builtin/remote.c:1517

8847 msgid "add URL"

8848 msgstr "lägg till URL"

8849

8839 -#: builtin/remote.c:1524

8850 +#: builtin/remote.c:1519

8851 msgid "delete URLs"

8852 msgstr "ta bort URL:ar"

8853

8843 -#: builtin/remote.c:1531

8854 +#: builtin/remote.c:1526

8855 msgid "--add --delete doesn't make sense"

8856 msgstr "--add --delete ger ingen mening"

8857

8847 -#: builtin/remote.c:1571

8858 +#: builtin/remote.c:1566

8859 #, c-format

8860 msgid "Invalid old URL pattern: %s"

8861 msgstr "Felaktig gammalt URL-mönster: %s"

8862

8852 -#: builtin/remote.c:1579

8863 +#: builtin/remote.c:1574

8864 #, c-format

8865 msgid "No such URL found: %s"

8866 msgstr "Ingen sådan URL hittades: %s"

8867

8857 -#: builtin/remote.c:1581

8868 +#: builtin/remote.c:1576

8869 msgid "Will not delete all non-push URLs"

8870 msgstr "Kommer inte ta bort alla icke-sänd-URL:er"

8871

8861 -#: builtin/remote.c:1595

8872 +#: builtin/remote.c:1590

8873 msgid "be verbose; must be placed before a subcommand"

8874 msgstr "var pratsam; måste skrivas före ett underkommando"

8875

@@ -8866,71 +8877,71 @@ msgstr "var pratsam; måste skrivas före ett underkommando"

8877 msgid "git repack [options]"

8878 msgstr "git repack [flaggor]"

8879

8869 -#: builtin/repack.c:160

8880 +#: builtin/repack.c:159

8881 msgid "pack everything in a single pack"

8882 msgstr "packa allt i ett enda paket"

8883

8873 -#: builtin/repack.c:162

8884 +#: builtin/repack.c:161

8885 msgid "same as -a, and turn unreachable objects loose"

8886 msgstr "samma som -a, och gör onåbara objekt lösa"

8887

8877 -#: builtin/repack.c:165

8888 +#: builtin/repack.c:164

8889 msgid "remove redundant packs, and run git-prune-packed"

8890 msgstr "ta bort överflödiga paket, och kör git-prune-packed"

8891

8881 -#: builtin/repack.c:167

8892 +#: builtin/repack.c:166

8893 msgid "pass --no-reuse-delta to git-pack-objects"

8894 msgstr "sänd --no-reuse-delta till git-pack-objects"

8895

8885 -#: builtin/repack.c:169

8896 +#: builtin/repack.c:168

8897 msgid "pass --no-reuse-object to git-pack-objects"

8898 msgstr "sänd --no-reuse-object till git-pack-objects"

8899

8889 -#: builtin/repack.c:171

8900 +#: builtin/repack.c:170

8901 msgid "do not run git-update-server-info"

8902 msgstr "kör inte git-update-server-info"

8903

8893 -#: builtin/repack.c:174

8904 +#: builtin/repack.c:173

8905 msgid "pass --local to git-pack-objects"

8906 msgstr "sänd --local till git-pack-objects"

8907

8897 -#: builtin/repack.c:176

8908 +#: builtin/repack.c:175

8909 msgid "write bitmap index"

8910 msgstr "skriv bitkartindex"

8911

8901 -#: builtin/repack.c:177

8912 +#: builtin/repack.c:176

8913 msgid "approxidate"

8914 msgstr "cirkadatum"

8915

8905 -#: builtin/repack.c:178

8916 +#: builtin/repack.c:177

8917 msgid "with -A, do not loosen objects older than this"

8918 msgstr "med -A, lös inte upp objekt äldre än detta"

8919

8909 -#: builtin/repack.c:180

8920 +#: builtin/repack.c:179

8921 msgid "size of the window used for delta compression"

8922 msgstr "storlek på fönster använt för deltakomprimering"

8923

8913 -#: builtin/repack.c:181 builtin/repack.c:185

8924 +#: builtin/repack.c:180 builtin/repack.c:184

8925 msgid "bytes"

8926 msgstr "byte"

8927

8917 -#: builtin/repack.c:182

8928 +#: builtin/repack.c:181

8929 msgid "same as the above, but limit memory size instead of entries count"

8930 msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal"

8931

8921 -#: builtin/repack.c:184

8932 +#: builtin/repack.c:183

8933 msgid "limits the maximum delta depth"

8934 msgstr "begränsa maximalt deltadjup"

8935

8925 -#: builtin/repack.c:186

8936 +#: builtin/repack.c:185

8937 msgid "maximum size of each packfile"

8938 msgstr "maximal storlek på varje paketfil"

8939

8929 -#: builtin/repack.c:188

8940 +#: builtin/repack.c:187

8941 msgid "repack objects in packs marked with .keep"

8942 msgstr "packa om objekt i paket märkta med .keep"

8943

8933 -#: builtin/repack.c:374

8944 +#: builtin/repack.c:371

8945 #, c-format

8946 msgid "removing '%s' failed"

8947 msgstr "misslyckades ta bort \"%s\""

@@ -9493,11 +9504,11 @@ msgstr "visa <n> nyaste refloggposter med början på bas"

9504

9505 #: builtin/show-ref.c:10

9506 msgid ""

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

9497 -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "

9507 +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"

9508 +"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "

9509 msgstr ""

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

9500 -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] "

9510 +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"

9511 +"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] "

9512

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

9514 msgid "git show-ref --exclude-existing[=pattern] < ref-list"

@@ -9556,11 +9567,11 @@ msgstr "ta bort symbolisk referens"

9567 msgid "shorten ref output"

9568 msgstr "förkorta ref-utdata"

9569

9559 -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362

9570 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358

9571 msgid "reason"

9572 msgstr "skäl"

9573

9563 -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362

9574 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358

9575 msgid "reason of the update"

9576 msgstr "skäl till uppdateringen"

9577

@@ -9918,19 +9929,19 @@ msgstr "git update-ref [flaggor] <refnamn> <gammaltvärde> [<nyttvärde>]"

9929 msgid "git update-ref [options] --stdin [-z]"

9930 msgstr "git update-ref [flaggor] --stdin [-z]"

9931

9921 -#: builtin/update-ref.c:363

9932 +#: builtin/update-ref.c:359

9933 msgid "delete the reference"

9934 msgstr "ta bort referensen"

9935

9925 -#: builtin/update-ref.c:365

9936 +#: builtin/update-ref.c:361

9937 msgid "update <refname> not the one it points to"

9938 msgstr "uppdatera <refnamn> inte det den pekar på"

9939

9929 -#: builtin/update-ref.c:366

9940 +#: builtin/update-ref.c:362

9941 msgid "stdin has NUL-terminated arguments"

9942 msgstr "standard in har NUL-terminerade argument"

9943

9933 -#: builtin/update-ref.c:367

9944 +#: builtin/update-ref.c:363

9945 msgid "read updates from stdin"

9946 msgstr "läs uppdateringar från standard in"

9947

@@ -10108,11 +10119,11 @@ msgstr "använd <n> siffror för att visa SHA-1:or"

10119 msgid "update the index with reused conflict resolution if possible"

10120 msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt"

10121

10111 -#: git-am.sh:52

10122 +#: git-am.sh:53

10123 msgid "You need to set your committer info first"

10124 msgstr "Du måste ställa in din incheckarinformation först"

10125

10115 -#: git-am.sh:97

10126 +#: git-am.sh:98

10127 msgid ""

10128 "You seem to have moved HEAD since the last 'am' failure.\n"

10129 "Not rewinding to ORIG_HEAD"

@@ -10120,7 +10131,7 @@ msgstr ""

10131 "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"

10132 "Återställer inte till ORIG_HEAD"

10133

10123 -#: git-am.sh:107

10134 +#: git-am.sh:108

10135 #, sh-format

10136 msgid ""

10137 "When you have resolved this problem, run \"$cmdline --continue\".\n"

@@ -10131,21 +10142,21 @@ msgstr ""

10142 "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"

10143 "För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."

10144

10134 -#: git-am.sh:123

10145 +#: git-am.sh:124

10146 msgid "Cannot fall back to three-way merge."

10147 msgstr "Kan inte falla tillbaka på trevägssammanslagning."

10148

10138 -#: git-am.sh:139

10149 +#: git-am.sh:140

10150 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

10151 msgstr ""

10152 "Arkivet saknar objekt som behövs för att falla tillbaka på 3-"

10153 "vägssammanslagning."

10154

10144 -#: git-am.sh:141

10155 +#: git-am.sh:142

10156 msgid "Using index info to reconstruct a base tree..."

10157 msgstr "Använder indexinfo för att återskapa ett basträd..."

10158

10148 -#: git-am.sh:156

10159 +#: git-am.sh:157

10160 msgid ""

10161 "Did you hand edit your patch?\n"

10162 "It does not apply to blobs recorded in its index."

@@ -10153,29 +10164,29 @@ msgstr ""

10164 "Har du handredigerat din patch?\n"

10165 "Den kan inte tillämpas på blobbar som antecknats i dess index."

10166

10156 -#: git-am.sh:165

10167 +#: git-am.sh:166

10168 msgid "Falling back to patching base and 3-way merge..."

10169 msgstr ""

10170 "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."

10171

10161 -#: git-am.sh:181

10172 +#: git-am.sh:182

10173 msgid "Failed to merge in the changes."

10174 msgstr "Misslyckades slå ihop ändringarna."

10175

10165 -#: git-am.sh:276

10176 +#: git-am.sh:277

10177 msgid "Only one StGIT patch series can be applied at once"

10178 msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"

10179

10169 -#: git-am.sh:363

10180 +#: git-am.sh:364

10181 #, sh-format

10182 msgid "Patch format $patch_format is not supported."

10183 msgstr "Patchformatet $patch_format stöds inte."

10184

10174 -#: git-am.sh:365

10185 +#: git-am.sh:366

10186 msgid "Patch format detection failed."

10187 msgstr "Misslyckades detektera patchformat."

10188

10178 -#: git-am.sh:392

10189 +#: git-am.sh:398

10190 msgid ""

10191 "The -b/--binary option has been a no-op for long time, and\n"

10192 "it will be removed. Please do not use it anymore."

@@ -10183,16 +10194,16 @@ msgstr ""

10194 "Flaggan -b/--binary har varit utan funktion länge, och\n"

10195 "kommer tas bort. Vi ber dig att inte använda den längre."

10196

10186 -#: git-am.sh:486

10197 +#: git-am.sh:496

10198 #, sh-format

10199 msgid "previous rebase directory $dotest still exists but mbox given."

10200 msgstr "tidigare rebase-katalog $dotest finns fortfarande, men mbox angavs."

10201

10191 -#: git-am.sh:491

10202 +#: git-am.sh:501

10203 msgid "Please make up your mind. --skip or --abort?"

10204 msgstr "Bestäm dig. --skip eller --abort?"

10205

10195 -#: git-am.sh:527

10206 +#: git-am.sh:537

10207 #, sh-format

10208 msgid ""

10209 "Stray $dotest directory found.\n"

@@ -10201,16 +10212,16 @@ msgstr ""

10212 "Kvarbliven katalog $dotest hittades.\n"

10213 "Använd \"git am --abort\" för att ta bort den."

10214

10204 -#: git-am.sh:535

10215 +#: git-am.sh:545

10216 msgid "Resolve operation not in progress, we are not resuming."

10217 msgstr "Lösningsoperation pågår inte, vi återupptar inte."

10218

10208 -#: git-am.sh:601

10219 +#: git-am.sh:612

10220 #, sh-format

10221 msgid "Dirty index: cannot apply patches (dirty: $files)"

10222 msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: $files)"

10223

10213 -#: git-am.sh:705

10224 +#: git-am.sh:722

10225 #, sh-format

10226 msgid ""

10227 "Patch is empty. Was it split wrong?\n"

@@ -10221,32 +10232,32 @@ msgstr ""

10232 "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"

10233 "För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."

10234

10224 -#: git-am.sh:732

10235 +#: git-am.sh:749

10236 msgid "Patch does not have a valid e-mail address."

10237 msgstr "Patchen har inte någon giltig e-postadress."

10238

10228 -#: git-am.sh:779

10239 +#: git-am.sh:796

10240 msgid "cannot be interactive without stdin connected to a terminal."

10241 msgstr ""

10242 "kan inte vara interaktiv om standard in inte är ansluten till en terminal."

10243

10233 -#: git-am.sh:783

10244 +#: git-am.sh:800

10245 msgid "Commit Body is:"

10246 msgstr "Incheckningskroppen är:"

10247

10248 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]

10249 #. in your translation. The program will only accept English

10250 #. input at this point.

10240 -#: git-am.sh:790

10251 +#: git-am.sh:807

10252 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "

10253 msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla "

10254

10244 -#: git-am.sh:826

10255 +#: git-am.sh:843

10256 #, sh-format

10257 msgid "Applying: $FIRSTLINE"

10258 msgstr "Tillämpar: $FIRSTLINE"

10259

10249 -#: git-am.sh:847

10260 +#: git-am.sh:864

10261 msgid ""

10262 "No changes - did you forget to use 'git add'?\n"

10263 "If there is nothing left to stage, chances are that something else\n"

@@ -10256,7 +10267,7 @@ msgstr ""

10267 "Om det inte är något kvar att köa kan det hända att något annat redan\n"

10268 "introducerat samma ändringar; kanske du bör hoppa över patchen."

10269

10259 -#: git-am.sh:855

10270 +#: git-am.sh:872

10271 msgid ""

10272 "You still have unmerged paths in your index\n"

10273 "did you forget to use 'git add'?"

@@ -10264,16 +10275,16 @@ msgstr ""

10275 "Du har fortfarande sökvägar som inte slagits samman i ditt index\n"

10276 "glömde du använda \"git add\"?"

10277

10267 -#: git-am.sh:871

10278 +#: git-am.sh:888

10279 msgid "No changes -- Patch already applied."

10280 msgstr "Inga ändringar -- Patchen har redan tillämpats."

10281

10271 -#: git-am.sh:881

10282 +#: git-am.sh:898

10283 #, sh-format

10284 msgid "Patch failed at $msgnum $FIRSTLINE"

10285 msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE"

10286

10276 -#: git-am.sh:884

10287 +#: git-am.sh:901

10288 #, sh-format

10289 msgid ""

10290 "The copy of the patch that failed is found in:\n"

@@ -10282,7 +10293,7 @@ msgstr ""

10293 "En kopia av patchen som misslyckades finns i:\n"

10294 " $dotest/patch"

10295

10285 -#: git-am.sh:902

10296 +#: git-am.sh:919

10297 msgid "applying to an empty history"

10298 msgstr "tillämpar på en tom historik"

10299

@@ -10347,22 +10358,22 @@ msgstr "Anropa \"bisect_state\" med minst ett argument."

10358 msgid "Bad rev input: $rev"

10359 msgstr "Felaktig rev-indata: $rev"

10360

10350 -#: git-bisect.sh:250

10361 +#: git-bisect.sh:253

10362 msgid "'git bisect bad' can take only one argument."

10363 msgstr "\"git bisect bad\" kan bara ta ett argument."

10364

10354 -#: git-bisect.sh:273

10365 +#: git-bisect.sh:276

10366 msgid "Warning: bisecting only with a bad commit."

10367 msgstr "Varning: utför \"bisect\" med endast en dålig incheckning"

10368

10369 #. TRANSLATORS: Make sure to include [Y] and [n] in your

10370 #. translation. The program will only accept English input

10371 #. at this point.

10361 -#: git-bisect.sh:279

10372 +#: git-bisect.sh:282

10373 msgid "Are you sure [Y/n]? "

10374 msgstr "Är du säker [Y=ja/N=nej]? "

10375

10365 -#: git-bisect.sh:289

10376 +#: git-bisect.sh:292

10377 msgid ""

10378 "You need to give me at least one good and one bad revision.\n"

10379 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"

@@ -10370,7 +10381,7 @@ msgstr ""

10381 "Du måste ange åtminstone en bra och en dålig version.\n"

10382 "(Du kan använda \"git bisect bad\" och \"git bisect good\" för detta.)"

10383

10373 -#: git-bisect.sh:292

10384 +#: git-bisect.sh:295

10385 msgid ""

10386 "You need to start by \"git bisect start\".\n"

10387 "You then need to give me at least one good and one bad revision.\n"

@@ -10380,16 +10391,16 @@ msgstr ""

10391 "Du måste sedan ange åtminstone en bra och en dålig version.\n"

10392 "(Du kan använda \"git bisect bad\" och \"git bisect good\" för detta.)"

10393

10383 -#: git-bisect.sh:363 git-bisect.sh:490

10394 +#: git-bisect.sh:366 git-bisect.sh:493

10395 msgid "We are not bisecting."

10396 msgstr "Vi utför ingen bisect för tillfället."

10397

10387 -#: git-bisect.sh:370

10398 +#: git-bisect.sh:373

10399 #, sh-format

10400 msgid "'$invalid' is not a valid commit"

10401 msgstr "\"$invalid\" är inte en giltig incheckning"

10402

10392 -#: git-bisect.sh:379

10403 +#: git-bisect.sh:382

10404 #, sh-format

10405 msgid ""

10406 "Could not check out original HEAD '$branch'.\n"

@@ -10398,25 +10409,25 @@ msgstr ""

10409 "Kunde inte checka ut original-HEAD \"$branch\".\n"

10410 "Försök \"git bisect reset <incheckning>\"."

10411

10401 -#: git-bisect.sh:406

10412 +#: git-bisect.sh:409

10413 msgid "No logfile given"

10414 msgstr "Ingen loggfil angiven"

10415

10405 -#: git-bisect.sh:407

10416 +#: git-bisect.sh:410

10417 #, sh-format

10418 msgid "cannot read $file for replaying"

10419 msgstr "kan inte läsa $file för uppspelning"

10420

10410 -#: git-bisect.sh:424

10421 +#: git-bisect.sh:427

10422 msgid "?? what are you talking about?"

10423 msgstr "?? vad menar du?"

10424

10414 -#: git-bisect.sh:436

10425 +#: git-bisect.sh:439

10426 #, sh-format

10427 msgid "running $command"

10428 msgstr "kör $command"

10429

10419 -#: git-bisect.sh:443

10430 +#: git-bisect.sh:446

10431 #, sh-format

10432 msgid ""

10433 "bisect run failed:\n"

@@ -10425,11 +10436,11 @@ msgstr ""

10436 "\"bisect\"-körningen misslyckades:\n"

10437 "felkod $res från \"$command\" är < 0 eller >= 128"

10438

10428 -#: git-bisect.sh:469

10439 +#: git-bisect.sh:472

10440 msgid "bisect run cannot continue any more"

10441 msgstr "\"bisect\"-körningen kan inte fortsätta längre"

10442

10432 -#: git-bisect.sh:475

10443 +#: git-bisect.sh:478

10444 #, sh-format

10445 msgid ""

10446 "bisect run failed:\n"

@@ -10438,7 +10449,7 @@ msgstr ""

10449 "\"bisect\"-körningen misslyckades:\n"

10450 "\"bisect_state $state\" avslutades med felkoden $res"

10451

10441 -#: git-bisect.sh:482

10452 +#: git-bisect.sh:485

10453 msgid "bisect run success"

10454 msgstr "\"bisect\"-körningen lyckades"

10455

@@ -11072,6 +11083,18 @@ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""

11083 msgid "Synchronizing submodule url for '$displaypath'"

11084 msgstr "Synkroniserar undermodul-url för \"$displaypath\""

11085

11086 +#~ msgid "no files added"

11087 +#~ msgstr "inga filer har lagts till"

11088 +

11089 +#~ msgid "force creation (when already exists)"

11090 +#~ msgstr "tvinga skapande (när den redan finns)"

11091 +

11092 +#~ msgid "Malformed ident string: '%s'"

11093 +#~ msgstr "Felaktig indragningssträng: \"%s\""

11094 +

11095 +#~ msgid "slot"

11096 +#~ msgstr "plats"

11097 +

11098 #~ msgid "Failed to lock ref for update"

11099 #~ msgstr "Misslyckades låsa referens för uppdatering"

11100

l10n: sv.po: Update Swedish translation (2298t0f0u)