1f32de1e14 · matheusbsbs/matheus-bagliano

@@ -7,8 +7,8 @@ msgid ""

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2013-08-06 14:10+0800\n"

11 -"PO-Revision-Date: 2013-08-06 12:37+0100\n"

10 +"POT-Creation-Date: 2013-11-02 08:06+0800\n"

11 +"PO-Revision-Date: 2013-11-09 19:02+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"

@@ -57,71 +57,76 @@ msgstr ""

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

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

59

60 -#: archive.c:323

60 +#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328

61 +#, c-format

62 +msgid "pathspec '%s' did not match any files"

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

64 +

65 +#: archive.c:327

66 msgid "fmt"

67 msgstr "fmt"

68

64 -#: archive.c:323

69 +#: archive.c:327

70 msgid "archive format"

71 msgstr "arkivformat"

72

68 -#: archive.c:324 builtin/log.c:1173

73 +#: archive.c:328 builtin/log.c:1193

74 msgid "prefix"

75 msgstr "prefix"

76

72 -#: archive.c:325

77 +#: archive.c:329

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

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

80

76 -#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292

77 -#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673

78 -#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77

79 -#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408

80 -#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152

81 +#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264

82 +#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680

83 +#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77

84 +#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408

85 +#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154

86 msgid "file"

87 msgstr "fil"

88

84 -#: archive.c:327 builtin/archive.c:89

89 +#: archive.c:331 builtin/archive.c:89

90 msgid "write the archive to this file"

91 msgstr "skriv arkivet till filen"

92

88 -#: archive.c:329

93 +#: archive.c:333

94 msgid "read .gitattributes in working directory"

95 msgstr "läs .gitattributes i arbetskatalogen"

96

92 -#: archive.c:330

97 +#: archive.c:334

98 msgid "report archived files on stderr"

99 msgstr "rapportera arkiverade filer på standard fel"

100

96 -#: archive.c:331

101 +#: archive.c:335

102 msgid "store only"

103 msgstr "endast spara"

104

100 -#: archive.c:332

105 +#: archive.c:336

106 msgid "compress faster"

107 msgstr "komprimera snabbare"

108

104 -#: archive.c:340

109 +#: archive.c:344

110 msgid "compress better"

111 msgstr "komprimera bättre"

112

108 -#: archive.c:343

113 +#: archive.c:347

114 msgid "list supported archive formats"

115 msgstr "visa understödda arkivformat"

116

112 -#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85

117 +#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84

118 msgid "repo"

119 msgstr "arkiv"

120

116 -#: archive.c:346 builtin/archive.c:91

121 +#: archive.c:350 builtin/archive.c:91

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

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

124

120 -#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487

125 +#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487

126 msgid "command"

127 msgstr "kommando"

128

124 -#: archive.c:348 builtin/archive.c:93

129 +#: archive.c:352 builtin/archive.c:93

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

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

132

@@ -204,17 +209,17 @@ msgstr "Det finns redan en gren som heter \"%s\""

209 msgid "Cannot force update the current branch."

210 msgstr "Kan inte tvinga uppdatering av aktuell gren."

211

207 -#: branch.c:216

212 +#: branch.c:215

213 #, c-format

214 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

215 msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren."

216

212 -#: branch.c:218

217 +#: branch.c:217

218 #, c-format

219 msgid "the requested upstream branch '%s' does not exist"

220 msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte"

221

217 -#: branch.c:220

222 +#: branch.c:219

223 msgid ""

224 "\n"

225 "If you are planning on basing your work on an upstream\n"

@@ -234,26 +239,26 @@ msgstr ""

239 "spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n"

240 "för att ställa in uppströmskonfigurationen när du sänder in."

241

237 -#: branch.c:265

242 +#: branch.c:264

243 #, c-format

244 msgid "Not a valid object name: '%s'."

245 msgstr "Objektnamnet är inte giltigt: \"%s\"."

246

242 -#: branch.c:285

247 +#: branch.c:284

248 #, c-format

249 msgid "Ambiguous object name: '%s'."

250 msgstr "Objektnamnet är tvetydigt: \"%s\"."

251

247 -#: branch.c:290

252 +#: branch.c:289

253 #, c-format

254 msgid "Not a valid branch point: '%s'."

255 msgstr "Avgreningspunkten är inte giltig: \"%s\""

256

252 -#: branch.c:296

257 +#: branch.c:295

258 msgid "Failed to lock ref for update"

259 msgstr "Misslyckades låsa referens för uppdatering"

260

256 -#: branch.c:314

261 +#: branch.c:313

262 msgid "Failed to write ref"

263 msgstr "Misslyckades skriva referens"

264

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

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

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

274

270 -#: bundle.c:89 builtin/commit.c:697

275 +#: bundle.c:89 builtin/commit.c:706

276 #, c-format

277 msgid "could not open '%s'"

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

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

281 msgid "Repository lacks these prerequisite commits:"

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

283

279 -#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331

280 -#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364

281 -#: builtin/shortlog.c:156

284 +#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332

285 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364

286 +#: builtin/shortlog.c:158

287 msgid "revision walk setup failed"

288 msgstr "misslyckades skapa revisionstraversering"

289

@@ -304,7 +309,7 @@ msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"

309 msgid "rev-list died"

310 msgstr "rev-list dog"

311

307 -#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259

312 +#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261

313 #, c-format

314 msgid "unrecognized argument: %s"

315 msgstr "okänt argument: %s"

@@ -454,7 +459,7 @@ msgstr ""

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

460 "%s"

461

457 -#: diff.c:3487

462 +#: diff.c:3490

463 #, c-format

464 msgid ""

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

@@ -463,7 +468,7 @@ msgstr ""

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

469 "%s"

470

466 -#: diff.c:3501

471 +#: diff.c:3504

472 #, c-format

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

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

@@ -490,17 +495,17 @@ msgstr "kunde inte skapa temporära filen \"%s\": %s"

495 msgid "failed writing detached signature to '%s': %s"

496 msgstr "misslyckades skriva fristående signatur till \"%s\": %s"

497

493 -#: grep.c:1623

498 +#: grep.c:1695

499 #, c-format

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

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

502

498 -#: grep.c:1640

503 +#: grep.c:1712

504 #, c-format

505 msgid "'%s': %s"

506 msgstr "\"%s\": %s"

507

503 -#: grep.c:1651

508 +#: grep.c:1723

509 #, c-format

510 msgid "'%s': short read %s"

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

@@ -573,8 +578,8 @@ msgstr "%s: %s - %s"

578 msgid "failed to read the cache"

579 msgstr "misslyckads läsa cachen"

580

576 -#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566

577 -#: builtin/clone.c:656

581 +#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559

582 +#: builtin/clone.c:655

583 msgid "unable to write new index file"

584 msgstr "kunde inte skriva ny indexfil"

585

@@ -623,7 +628,7 @@ msgstr "kan inte läsa objektet %s: \"%s\""

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

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

630

626 -#: merge-recursive.c:774 builtin/clone.c:312

631 +#: merge-recursive.c:774 builtin/clone.c:311

632 #, c-format

633 msgid "failed to open '%s'"

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

@@ -757,7 +762,7 @@ msgstr "Hoppade över %s (sammanslagen samma som befintlig)"

762 msgid "Auto-merging %s"

763 msgstr "Slår ihop %s automatiskt"

764

760 -#: merge-recursive.c:1634 git-submodule.sh:1118

765 +#: merge-recursive.c:1634 git-submodule.sh:1125

766 msgid "submodule"

767 msgstr "undermodul"

768

@@ -853,58 +858,124 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"

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

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

860

856 -#: object.c:204

861 +#: object.c:202

862 #, c-format

863 msgid "unable to parse object: %s"

864 msgstr "kunde inte tolka objektet: %s"

865

861 -#: parse-options.c:489

866 +#: parse-options.c:537

867 msgid "..."

868 msgstr "..."

869

865 -#: parse-options.c:507

870 +#: parse-options.c:555

871 #, c-format

872 msgid "usage: %s"

873 msgstr "användning: %s"

874

875 #. TRANSLATORS: the colon here should align with the

876 #. one in "usage: %s" translation

872 -#: parse-options.c:511

877 +#: parse-options.c:559

878 #, c-format

879 msgid " or: %s"

880 msgstr " eller: %s"

881

877 -#: parse-options.c:514

882 +#: parse-options.c:562

883 #, c-format

884 msgid " %s"

885 msgstr " %s"

886

882 -#: parse-options.c:548

887 +#: parse-options.c:596

888 msgid "-NUM"

889 msgstr "-TAL"

890

886 -#: pathspec.c:83

891 +#: pathspec.c:118

892 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

893 +msgstr ""

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

895 +

896 +#: pathspec.c:128

897 +msgid ""

898 +"global 'literal' pathspec setting is incompatible with all other global "

899 +"pathspec settings"

900 +msgstr ""

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

902 +"globala sökvägsinställningar"

903 +

904 +#: pathspec.c:158

905 +msgid "invalid parameter for pathspec magic 'prefix'"

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

907 +

908 +#: pathspec.c:164

909 +#, c-format

910 +msgid "Invalid pathspec magic '%.*s' in '%s'"

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

912 +

913 +#: pathspec.c:168

914 +#, c-format

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

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

917 +

918 +#: pathspec.c:186

919 +#, c-format

920 +msgid "Unimplemented pathspec magic '%c' in '%s'"

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

922 +

923 +#: pathspec.c:211

924 +#, c-format

925 +msgid "%s: 'literal' and 'glob' are incompatible"

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

927 +

928 +#: pathspec.c:222

929 +#, c-format

930 +msgid "%s: '%s' is outside repository"

931 +msgstr "%s: \"%s\" är utanför arkivet"

932 +

933 +#: pathspec.c:278

934 +#, c-format

935 +msgid "Pathspec '%s' is in submodule '%.*s'"

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

937 +

938 +#.

939 +#. * We may want to substitute "this command" with a command

940 +#. * name. E.g. when add--interactive dies when running

941 +#. * "checkout -p"

942 +#.

943 +#: pathspec.c:340

944 +#, c-format

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

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

947 +

948 +#: pathspec.c:415

949 +#, c-format

950 +msgid "pathspec '%s' is beyond a symbolic link"

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

952 +

953 +#: remote.c:1833

954 #, c-format

888 -msgid "Path '%s' is in submodule '%.*s'"

889 -msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\""

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

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

957

891 -#: pathspec.c:99

958 +#: remote.c:1837

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

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

961 +

962 +#: remote.c:1840

963 #, c-format

893 -msgid "'%s' is beyond a symbolic link"

894 -msgstr "\"%s\" är på andra sidan av en symbolisk länk"

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

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

966

896 -#: remote.c:1788

967 +#: remote.c:1844

968 #, c-format

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

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

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

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

973

903 -#: remote.c:1794

974 +#: remote.c:1850

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

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

977

907 -#: remote.c:1797

978 +#: remote.c:1853

979 #, c-format

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

981 msgid_plural ""

@@ -914,11 +985,11 @@ msgstr[0] ""

985 msgstr[1] ""

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

987

917 -#: remote.c:1805

988 +#: remote.c:1861

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

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

991

921 -#: remote.c:1808

992 +#: remote.c:1864

993 #, c-format

994 msgid ""

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

@@ -933,7 +1004,7 @@ msgstr[1] ""

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

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

1006

936 -#: remote.c:1818

1007 +#: remote.c:1874

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

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

1010

@@ -976,7 +1047,7 @@ msgstr ""

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

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

1049

979 -#: sequencer.c:245 sequencer.c:869 sequencer.c:952

1050 +#: sequencer.c:245 sequencer.c:870 sequencer.c:953

1051 #, c-format

1052 msgid "Could not write to %s"

1053 msgstr "Kunde inte skriva till %s"

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

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

1071

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

1002 -#: sequencer.c:324

1073 +#: sequencer.c:325

1074 #, c-format

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

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

1077

1007 -#: sequencer.c:355

1078 +#: sequencer.c:356

1079 msgid "Could not resolve HEAD commit\n"

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

1081

1011 -#: sequencer.c:377

1082 +#: sequencer.c:378

1083 msgid "Unable to update cache tree\n"

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

1085

1015 -#: sequencer.c:422

1086 +#: sequencer.c:423

1087 #, c-format

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

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

1090

1020 -#: sequencer.c:427

1091 +#: sequencer.c:428

1092 #, c-format

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

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

1095

1025 -#: sequencer.c:493

1096 +#: sequencer.c:494

1097 msgid "Your index file is unmerged."

1098 msgstr "Din indexfil har inte slagits ihop."

1099

1029 -#: sequencer.c:512

1100 +#: sequencer.c:513

1101 #, c-format

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

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

1104

1034 -#: sequencer.c:520

1105 +#: sequencer.c:521

1106 #, c-format

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

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

1109

1039 -#: sequencer.c:524

1110 +#: sequencer.c:525

1111 #, c-format

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

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

1114

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

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

1046 -#: sequencer.c:537

1117 +#: sequencer.c:538

1118 #, c-format

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

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

1121

1051 -#: sequencer.c:541

1122 +#: sequencer.c:542

1123 #, c-format

1124 msgid "Cannot get commit message for %s"

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

1126

1056 -#: sequencer.c:627

1127 +#: sequencer.c:628

1128 #, c-format

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

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

1131

1061 -#: sequencer.c:628

1132 +#: sequencer.c:629

1133 #, c-format

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

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

1136

1066 -#: sequencer.c:664

1137 +#: sequencer.c:665

1138 msgid "empty commit set passed"

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

1140

1070 -#: sequencer.c:672

1141 +#: sequencer.c:673

1142 #, c-format

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

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

1145

1075 -#: sequencer.c:677

1146 +#: sequencer.c:678

1147 #, c-format

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

1149 msgstr "git %s: misslyckades uppdatera indexet"

1150

1080 -#: sequencer.c:735

1151 +#: sequencer.c:736

1152 #, c-format

1153 msgid "Cannot %s during a %s"

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

1155

1085 -#: sequencer.c:757

1156 +#: sequencer.c:758

1157 #, c-format

1158 msgid "Could not parse line %d."

1159 msgstr "Kan inte tolka rad %d."

1160

1090 -#: sequencer.c:762

1161 +#: sequencer.c:763

1162 msgid "No commits parsed."

1163 msgstr "Inga incheckningar lästes."

1164

1094 -#: sequencer.c:775

1165 +#: sequencer.c:776

1166 #, c-format

1167 msgid "Could not open %s"

1168 msgstr "Kunde inte öppna %s"

1169

1099 -#: sequencer.c:779

1170 +#: sequencer.c:780

1171 #, c-format

1172 msgid "Could not read %s."

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

1174

1104 -#: sequencer.c:786

1175 +#: sequencer.c:787

1176 #, c-format

1177 msgid "Unusable instruction sheet: %s"

1178 msgstr "Oanvändbart manus: %s"

1179

1109 -#: sequencer.c:814

1180 +#: sequencer.c:815

1181 #, c-format

1182 msgid "Invalid key: %s"

1183 msgstr "Felaktig nyckel: %s"

1184

1114 -#: sequencer.c:817

1185 +#: sequencer.c:818

1186 #, c-format

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

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

1189

1119 -#: sequencer.c:829

1190 +#: sequencer.c:830

1191 #, c-format

1192 msgid "Malformed options sheet: %s"

1193 msgstr "Trasigt manus: %s"

1194

1124 -#: sequencer.c:850

1195 +#: sequencer.c:851

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

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

1198

1128 -#: sequencer.c:851

1199 +#: sequencer.c:852

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

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

1202

1132 -#: sequencer.c:855

1203 +#: sequencer.c:856

1204 #, c-format

1205 msgid "Could not create sequencer directory %s"

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

1207

1137 -#: sequencer.c:871 sequencer.c:956

1208 +#: sequencer.c:872 sequencer.c:957

1209 #, c-format

1210 msgid "Error wrapping up %s."

1211 msgstr "Fel vid ombrytning av %s."

1212

1142 -#: sequencer.c:890 sequencer.c:1024

1213 +#: sequencer.c:891 sequencer.c:1025

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

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

1216

1146 -#: sequencer.c:892

1217 +#: sequencer.c:893

1218 msgid "cannot resolve HEAD"

1219 msgstr "kan inte bestämma HEAD"

1220

1150 -#: sequencer.c:894

1221 +#: sequencer.c:895

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

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

1224

1154 -#: sequencer.c:916 builtin/apply.c:4061

1225 +#: sequencer.c:917 builtin/apply.c:4061

1226 #, c-format

1227 msgid "cannot open %s: %s"

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

1229

1159 -#: sequencer.c:919

1230 +#: sequencer.c:920

1231 #, c-format

1232 msgid "cannot read %s: %s"

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

1234

1164 -#: sequencer.c:920

1235 +#: sequencer.c:921

1236 msgid "unexpected end of file"

1237 msgstr "oväntat filslut"

1238

1168 -#: sequencer.c:926

1239 +#: sequencer.c:927

1240 #, c-format

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

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

1243

1173 -#: sequencer.c:949

1244 +#: sequencer.c:950

1245 #, c-format

1246 msgid "Could not format %s."

1247 msgstr "Kunde inte formatera %s."

1248

1178 -#: sequencer.c:1092

1249 +#: sequencer.c:1093

1250 #, c-format

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

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

1253

1183 -#: sequencer.c:1095

1254 +#: sequencer.c:1096

1255 #, c-format

1256 msgid "%s: bad revision"

1257 msgstr "%s: felaktig revision"

1258

1188 -#: sequencer.c:1129

1259 +#: sequencer.c:1130

1260 msgid "Can't revert as initial commit"

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

1262

1192 -#: sequencer.c:1130

1263 +#: sequencer.c:1131

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

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

1266

@@ -1215,256 +1286,350 @@ msgstr ""

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

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

1288

1218 -#: sha1_name.c:1097

1289 +#: sha1_name.c:1112

1290 msgid "HEAD does not point to a branch"

1291 msgstr "HEAD pekar inte på en gren"

1292

1222 -#: sha1_name.c:1100

1293 +#: sha1_name.c:1115

1294 #, c-format

1295 msgid "No such branch: '%s'"

1296 msgstr "Okänd gren: \"%s\""

1297

1227 -#: sha1_name.c:1102

1298 +#: sha1_name.c:1117

1299 #, c-format

1300 msgid "No upstream configured for branch '%s'"

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

1302

1232 -#: sha1_name.c:1106

1303 +#: sha1_name.c:1121

1304 #, c-format

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

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

1307

1237 -#: wrapper.c:408

1308 +#: submodule.c:64 submodule.c:98

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

1310 +msgstr ""

1311 +"Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "

1312 +"sammanslagningskonflikter först"

1313 +

1314 +#: submodule.c:68 submodule.c:102

1315 +#, c-format

1316 +msgid "Could not find section in .gitmodules where path=%s"

1317 +msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s"

1318 +

1319 +#. Maybe the user already did that, don't error out here

1320 +#: submodule.c:76

1321 +#, c-format

1322 +msgid "Could not update .gitmodules entry %s"

1323 +msgstr "Kunde inte uppdatera .gitmodules-posten %s"

1324 +

1325 +#. Maybe the user already did that, don't error out here

1326 +#: submodule.c:109

1327 +#, c-format

1328 +msgid "Could not remove .gitmodules entry for %s"

1329 +msgstr "Kunde inte ta bort .gitmodules-posten för %s"

1330 +

1331 +#: submodule.c:127

1332 +msgid "could not find .gitmodules in index"

1333 +msgstr "kunde inte hitta .gitmodules i indexet"

1334 +

1335 +#: submodule.c:133

1336 +msgid "reading updated .gitmodules failed"

1337 +msgstr "misslyckades läsa uppdaterad .gitmodules"

1338 +

1339 +#: submodule.c:135

1340 +msgid "unable to stat updated .gitmodules"

1341 +msgstr "kan inte ta status på uppdaterad .gitmodules"

1342 +

1343 +#: submodule.c:139

1344 +msgid "unable to remove .gitmodules from index"

1345 +msgstr "kan inte ta bort .gitmodules från indexet"

1346 +

1347 +#: submodule.c:141

1348 +msgid "adding updated .gitmodules failed"

1349 +msgstr "misslyckades lägga till uppdaterad .gitmodules"

1350 +

1351 +#: submodule.c:143

1352 +msgid "staging updated .gitmodules failed"

1353 +msgstr "misslyckades köa uppdaterad .gitmodules"

1354 +

1355 +#: submodule.c:1144 builtin/init-db.c:363

1356 +#, c-format

1357 +msgid "Could not create git link %s"

1358 +msgstr "Kunde inte skapa gitlänk %s"

1359 +

1360 +#: submodule.c:1155

1361 +#, c-format

1362 +msgid "Could not set core.worktree in %s"

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

1364 +

1365 +#: urlmatch.c:120

1366 +msgid "invalid URL scheme name or missing '://' suffix"

1367 +msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix"

1368 +

1369 +#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356

1370 +#, c-format

1371 +msgid "invalid %XX escape sequence"

1372 +msgstr "ogiltig %XX-teckensekvens"

1373 +

1374 +#: urlmatch.c:172

1375 +msgid "missing host and scheme is not 'file:'"

1376 +msgstr "värd saknas och schemat är inte \"file:\""

1377 +

1378 +#: urlmatch.c:189

1379 +msgid "a 'file:' URL may not have a port number"

1380 +msgstr "en \"file:\"-URL kan inte innehålla portnummer"

1381 +

1382 +#: urlmatch.c:199

1383 +msgid "invalid characters in host name"

1384 +msgstr "ogiltiga tecken i värdnamnet"

1385 +

1386 +#: urlmatch.c:244 urlmatch.c:255

1387 +msgid "invalid port number"

1388 +msgstr "felaktigt portnummer"

1389 +

1390 +#: urlmatch.c:322

1391 +msgid "invalid '..' path segment"

1392 +msgstr "felaktit \"..\"-sökvägssegment"

1393 +

1394 +#: wrapper.c:422

1395 #, c-format

1396 msgid "unable to access '%s': %s"

1397 msgstr "kan inte komma åt \"%s\": %s"

1398

1242 -#: wrapper.c:429

1399 +#: wrapper.c:443

1400 #, c-format

1401 msgid "unable to access '%s'"

1402 msgstr "kan inte komma åt \"%s\""

1403

1247 -#: wrapper.c:440

1404 +#: wrapper.c:454

1405 #, c-format

1406 msgid "unable to look up current user in the passwd file: %s"

1407 msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"

1408

1252 -#: wrapper.c:441

1409 +#: wrapper.c:455

1410 msgid "no such user"

1411 msgstr "okänd användare"

1412

1256 -#: wt-status.c:141

1413 +#: wt-status.c:146

1414 msgid "Unmerged paths:"

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

1416

1260 -#: wt-status.c:168 wt-status.c:195

1417 +#: wt-status.c:173 wt-status.c:200

1418 #, c-format

1419 msgid " (use \"git reset %s <file>...\" to unstage)"

1420 msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)"

1421

1265 -#: wt-status.c:170 wt-status.c:197

1422 +#: wt-status.c:175 wt-status.c:202

1423 msgid " (use \"git rm --cached <file>...\" to unstage)"

1424 msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)"

1425

1269 -#: wt-status.c:174

1426 +#: wt-status.c:179

1427 msgid " (use \"git add <file>...\" to mark resolution)"

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

1429

1273 -#: wt-status.c:176 wt-status.c:180

1430 +#: wt-status.c:181 wt-status.c:185

1431 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

1432 msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"

1433

1277 -#: wt-status.c:178

1434 +#: wt-status.c:183

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

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

1437

1281 -#: wt-status.c:189

1438 +#: wt-status.c:194

1439 msgid "Changes to be committed:"

1440 msgstr "Ändringar att checka in:"

1441

1285 -#: wt-status.c:207

1442 +#: wt-status.c:212

1443 msgid "Changes not staged for commit:"

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

1445

1289 -#: wt-status.c:211

1446 +#: wt-status.c:216

1447 msgid " (use \"git add <file>...\" to update what will be committed)"

1448 msgstr ""

1449 " (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"

1450

1294 -#: wt-status.c:213

1451 +#: wt-status.c:218

1452 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

1453 msgstr ""

1454 " (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"

1455

1299 -#: wt-status.c:214

1456 +#: wt-status.c:219

1457 msgid ""

1458 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

1459 msgstr ""

1460 " (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "

1461 "arbetskatalogen)"

1462

1306 -#: wt-status.c:216

1463 +#: wt-status.c:221

1464 msgid " (commit or discard the untracked or modified content in submodules)"

1465 msgstr ""

1466 " (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"

1467

1311 -#: wt-status.c:228

1468 +#: wt-status.c:233

1469 #, c-format

1470 msgid " (use \"git %s <file>...\" to include in what will be committed)"

1471 msgstr ""

1472 " (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)"

1473

1317 -#: wt-status.c:245

1474 +#: wt-status.c:250

1475 msgid "bug"

1476 msgstr "programfel"

1477

1321 -#: wt-status.c:250

1478 +#: wt-status.c:255

1479 msgid "both deleted:"

1480 msgstr "borttaget av bägge:"

1481

1325 -#: wt-status.c:251

1482 +#: wt-status.c:256

1483 msgid "added by us:"

1484 msgstr "tillagt av oss:"

1485

1329 -#: wt-status.c:252

1486 +#: wt-status.c:257

1487 msgid "deleted by them:"

1488 msgstr "borttaget av dem:"

1489

1333 -#: wt-status.c:253

1490 +#: wt-status.c:258

1491 msgid "added by them:"

1492 msgstr "tillagt av dem:"

1493

1337 -#: wt-status.c:254

1494 +#: wt-status.c:259

1495 msgid "deleted by us:"

1496 msgstr "borttaget av oss:"

1497

1341 -#: wt-status.c:255

1498 +#: wt-status.c:260

1499 msgid "both added:"

1500 msgstr "tillagt av bägge:"

1501

1345 -#: wt-status.c:256

1502 +#: wt-status.c:261

1503 msgid "both modified:"

1504 msgstr "ändrat av bägge:"

1505

1349 -#: wt-status.c:286

1506 +#: wt-status.c:291

1507 msgid "new commits, "

1508 msgstr "nya incheckningar, "

1509

1353 -#: wt-status.c:288

1510 +#: wt-status.c:293

1511 msgid "modified content, "

1512 msgstr "ändrat innehåll, "

1513

1357 -#: wt-status.c:290

1514 +#: wt-status.c:295

1515 msgid "untracked content, "

1516 msgstr "ospårat innehåll, "

1517

1361 -#: wt-status.c:307

1518 +#: wt-status.c:312

1519 #, c-format

1520 msgid "new file: %s"

1521 msgstr "ny fil: %s"

1522

1366 -#: wt-status.c:310

1523 +#: wt-status.c:315

1524 #, c-format

1525 msgid "copied: %s -> %s"

1526 msgstr "kopierad: %s -> %s"

1527

1371 -#: wt-status.c:313

1528 +#: wt-status.c:318

1529 #, c-format

1530 msgid "deleted: %s"

1531 msgstr "borttagen: %s"

1532

1376 -#: wt-status.c:316

1533 +#: wt-status.c:321

1534 #, c-format

1535 msgid "modified: %s"

1536 msgstr "ändrad: %s"

1537

1381 -#: wt-status.c:319

1538 +#: wt-status.c:324

1539 #, c-format

1540 msgid "renamed: %s -> %s"

1541 msgstr "namnbyte: %s -> %s"

1542

1386 -#: wt-status.c:322

1543 +#: wt-status.c:327

1544 #, c-format

1545 msgid "typechange: %s"

1546 msgstr "typbyte: %s"

1547

1391 -#: wt-status.c:325

1548 +#: wt-status.c:330

1549 #, c-format

1550 msgid "unknown: %s"

1551 msgstr "okänd: %s"

1552

1396 -#: wt-status.c:328

1553 +#: wt-status.c:333

1554 #, c-format

1555 msgid "unmerged: %s"

1556 msgstr "osammansl.: %s"

1557

1401 -#: wt-status.c:331

1558 +#: wt-status.c:336

1559 #, c-format

1560 msgid "bug: unhandled diff status %c"

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

1562

1406 -#: wt-status.c:803

1563 +#: wt-status.c:703

1564 +msgid "Submodules changed but not updated:"

1565 +msgstr "Undermoduler ändrade men inte uppdaterade:"

1566 +

1567 +#: wt-status.c:705

1568 +msgid "Submodule changes to be committed:"

1569 +msgstr "Undermodulers ändringar att checka in:"

1570 +

1571 +#: wt-status.c:848

1572 msgid "You have unmerged paths."

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

1574

1410 -#: wt-status.c:806

1575 +#: wt-status.c:851

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

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

1578

1414 -#: wt-status.c:809

1579 +#: wt-status.c:854

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

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

1582

1418 -#: wt-status.c:812

1583 +#: wt-status.c:857

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

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

1586

1422 -#: wt-status.c:822

1587 +#: wt-status.c:867

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

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

1590

1426 -#: wt-status.c:825

1591 +#: wt-status.c:870

1592 msgid "The current patch is empty."

1593 msgstr "Aktuell patch är tom."

1594

1430 -#: wt-status.c:829

1595 +#: wt-status.c:874

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

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

1598

1434 -#: wt-status.c:831

1599 +#: wt-status.c:876

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

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

1602

1438 -#: wt-status.c:833

1603 +#: wt-status.c:878

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

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

1606

1442 -#: wt-status.c:893 wt-status.c:910

1607 +#: wt-status.c:938 wt-status.c:955

1608 #, c-format

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

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

1611

1447 -#: wt-status.c:898 wt-status.c:915

1612 +#: wt-status.c:943 wt-status.c:960

1613 msgid "You are currently rebasing."

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

1615

1451 -#: wt-status.c:901

1616 +#: wt-status.c:946

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

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

1619

1455 -#: wt-status.c:903

1620 +#: wt-status.c:948

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

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

1623

1459 -#: wt-status.c:905

1624 +#: wt-status.c:950

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

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

1627

1463 -#: wt-status.c:918

1628 +#: wt-status.c:963

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

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

1631

1467 -#: wt-status.c:922

1632 +#: wt-status.c:967

1633 #, c-format

1634 msgid ""

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

@@ -1472,117 +1637,118 @@ msgstr ""

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

1638 "ovanpå \"%s\"."

1639

1475 -#: wt-status.c:927

1640 +#: wt-status.c:972

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

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

1643

1479 -#: wt-status.c:930

1644 +#: wt-status.c:975

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

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

1647

1483 -#: wt-status.c:934

1648 +#: wt-status.c:979

1649 #, c-format

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

1651 msgstr ""

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

1653 "ovanpå \"%s\"."

1654

1490 -#: wt-status.c:939

1655 +#: wt-status.c:984

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

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

1658

1494 -#: wt-status.c:942

1659 +#: wt-status.c:987

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

1661 msgstr ""

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

1663

1499 -#: wt-status.c:944

1664 +#: wt-status.c:989

1665 msgid ""

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

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

1668

1504 -#: wt-status.c:954

1505 -msgid "You are currently cherry-picking."

1506 -msgstr "Du håller på med en \"cherry-pick\"."

1669 +#: wt-status.c:999

1670 +#, c-format

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

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

1673

1508 -#: wt-status.c:958

1674 +#: wt-status.c:1004

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

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

1677

1512 -#: wt-status.c:961

1678 +#: wt-status.c:1007

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

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

1681

1516 -#: wt-status.c:963

1682 +#: wt-status.c:1009

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

1684 msgstr ""

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

1686 "operationen)"

1687

1522 -#: wt-status.c:972

1688 +#: wt-status.c:1018

1689 #, c-format

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

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

1692

1527 -#: wt-status.c:977

1693 +#: wt-status.c:1023

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

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

1696

1531 -#: wt-status.c:980

1697 +#: wt-status.c:1026

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

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

1700

1535 -#: wt-status.c:982

1701 +#: wt-status.c:1028

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

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

1704

1539 -#: wt-status.c:993

1705 +#: wt-status.c:1039

1706 #, c-format

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

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

1709

1544 -#: wt-status.c:997

1710 +#: wt-status.c:1043

1711 msgid "You are currently bisecting."

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

1713

1548 -#: wt-status.c:1000

1714 +#: wt-status.c:1046

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

1716 msgstr ""

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

1718

1553 -#: wt-status.c:1173

1719 +#: wt-status.c:1221

1720 msgid "On branch "

1721 msgstr "På grenen "

1722

1557 -#: wt-status.c:1180

1723 +#: wt-status.c:1228

1724 msgid "rebase in progress; onto "

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

1726

1561 -#: wt-status.c:1187

1727 +#: wt-status.c:1235

1728 msgid "HEAD detached at "

1729 msgstr "HEAD frånkopplad vid "

1730

1565 -#: wt-status.c:1189

1731 +#: wt-status.c:1237

1732 msgid "HEAD detached from "

1733 msgstr "HEAD frånkopplad från "

1734

1569 -#: wt-status.c:1192

1735 +#: wt-status.c:1240

1736 msgid "Not currently on any branch."

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

1738

1573 -#: wt-status.c:1209

1739 +#: wt-status.c:1257

1740 msgid "Initial commit"

1741 msgstr "Första incheckning"

1742

1577 -#: wt-status.c:1223

1743 +#: wt-status.c:1271

1744 msgid "Untracked files"

1745 msgstr "Ospårade filer"

1746

1581 -#: wt-status.c:1225

1747 +#: wt-status.c:1273

1748 msgid "Ignored files"

1749 msgstr "Ignorerade filer"

1750

1585 -#: wt-status.c:1229

1751 +#: wt-status.c:1277

1752 #, c-format

1753 msgid ""

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

@@ -1594,32 +1760,32 @@ msgstr ""

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

1761

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

1597 -#: wt-status.c:1235

1763 +#: wt-status.c:1283

1764 #, c-format

1765 msgid "Untracked files not listed%s"

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

1767

1602 -#: wt-status.c:1237

1768 +#: wt-status.c:1285

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

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

1771

1606 -#: wt-status.c:1243

1772 +#: wt-status.c:1291

1773 msgid "No changes"

1774 msgstr "Inga ändringar"

1775

1610 -#: wt-status.c:1248

1776 +#: wt-status.c:1296

1777 #, c-format

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

1779 msgstr ""

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

1781 "\")\n"

1782

1617 -#: wt-status.c:1251

1783 +#: wt-status.c:1299

1784 #, c-format

1785 msgid "no changes added to commit\n"

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

1787

1622 -#: wt-status.c:1254

1788 +#: wt-status.c:1302

1789 #, c-format

1790 msgid ""

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

@@ -1628,52 +1794,56 @@ msgstr ""

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

1795 "\")\n"

1796

1631 -#: wt-status.c:1257

1797 +#: wt-status.c:1305

1798 #, c-format

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

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

1801

1636 -#: wt-status.c:1260

1802 +#: wt-status.c:1308

1803 #, c-format

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

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

1806

1641 -#: wt-status.c:1263 wt-status.c:1268

1807 +#: wt-status.c:1311 wt-status.c:1316

1808 #, c-format

1809 msgid "nothing to commit\n"

1810 msgstr "inget att checka in\n"

1811

1646 -#: wt-status.c:1266

1812 +#: wt-status.c:1314

1813 #, c-format

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

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

1816

1651 -#: wt-status.c:1270

1817 +#: wt-status.c:1318

1818 #, c-format

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

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

1821

1656 -#: wt-status.c:1378

1822 +#: wt-status.c:1427

1823 msgid "HEAD (no branch)"

1824 msgstr "HEAD (ingen gren)"

1825

1660 -#: wt-status.c:1384

1826 +#: wt-status.c:1433

1827 msgid "Initial commit on "

1828 msgstr "Första incheckning på "

1829

1664 -#: wt-status.c:1399

1830 +#: wt-status.c:1463

1831 +msgid "gone"

1832 +msgstr "försvunnen"

1833 +

1834 +#: wt-status.c:1465

1835 msgid "behind "

1836 msgstr "efter "

1837

1668 -#: wt-status.c:1402 wt-status.c:1405

1838 +#: wt-status.c:1468 wt-status.c:1471

1839 msgid "ahead "

1840 msgstr "före "

1841

1672 -#: wt-status.c:1407

1842 +#: wt-status.c:1473

1843 msgid ", behind "

1844 msgstr ", efter "

1845

1676 -#: compat/precompose_utf8.c:58 builtin/clone.c:351

1846 +#: compat/precompose_utf8.c:55 builtin/clone.c:350

1847 #, c-format

1848 msgid "failed to unlink '%s'"

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

@@ -1759,7 +1929,7 @@ msgstr ""

1929 msgid "unexpected diff status %c"

1930 msgstr "diff-status %c förväntades inte"

1931

1762 -#: builtin/add.c:149 builtin/commit.c:252

1932 +#: builtin/add.c:149 builtin/commit.c:260

1933 msgid "updating files failed"

1934 msgstr "misslyckades uppdatera filer"

1935

@@ -1768,140 +1938,135 @@ msgstr "misslyckades uppdatera filer"

1938 msgid "remove '%s'\n"

1939 msgstr "ta bort \"%s\"\n"

1940

1771 -#: builtin/add.c:253

1941 +#: builtin/add.c:237

1942 msgid "Unstaged changes after refreshing the index:"

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

1944

1775 -#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337

1776 -#, c-format

1777 -msgid "pathspec '%s' did not match any files"

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

1779 -

1780 -#: builtin/add.c:339

1945 +#: builtin/add.c:299

1946 msgid "Could not read the index"

1947 msgstr "Kunde inte läsa indexet"

1948

1784 -#: builtin/add.c:350

1949 +#: builtin/add.c:310

1950 #, c-format

1951 msgid "Could not open '%s' for writing."

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

1953

1789 -#: builtin/add.c:354

1954 +#: builtin/add.c:314

1955 msgid "Could not write patch"

1956 msgstr "Kunde inte skriva patch"

1957

1793 -#: builtin/add.c:359

1958 +#: builtin/add.c:319

1959 #, c-format

1960 msgid "Could not stat '%s'"

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

1962

1798 -#: builtin/add.c:361

1963 +#: builtin/add.c:321

1964 msgid "Empty patch. Aborted."

1965 msgstr "Tom patch. Avbryter."

1966

1802 -#: builtin/add.c:367

1967 +#: builtin/add.c:327

1968 #, c-format

1969 msgid "Could not apply '%s'"

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

1971

1807 -#: builtin/add.c:377

1972 +#: builtin/add.c:337

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

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

1975

1811 -#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63

1812 -#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253

1813 -#: builtin/rm.c:268

1976 +#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66

1977 +#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253

1978 +#: builtin/rm.c:269

1979 msgid "dry run"

1980 msgstr "testkörning"

1981

1817 -#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19

1818 -#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613

1819 -#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113

1982 +#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19

1983 +#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612

1984 +#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113

1985 msgid "be verbose"

1986 msgstr "var pratsam"

1987

1823 -#: builtin/add.c:397

1988 +#: builtin/add.c:357

1989 msgid "interactive picking"

1990 msgstr "plocka interaktivt"

1991

1827 -#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261

1992 +#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272

1993 msgid "select hunks interactively"

1994 msgstr "välj stycken interaktivt"

1995

1831 -#: builtin/add.c:399

1996 +#: builtin/add.c:359

1997 msgid "edit current diff and apply"

1998 msgstr "redigera aktuell diff och applicera"

1999

1835 -#: builtin/add.c:400

2000 +#: builtin/add.c:360

2001 msgid "allow adding otherwise ignored files"

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

2003

1839 -#: builtin/add.c:401

2004 +#: builtin/add.c:361

2005 msgid "update tracked files"

2006 msgstr "uppdatera spårade filer"

2007

1843 -#: builtin/add.c:402

2008 +#: builtin/add.c:362

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

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

2011

1847 -#: builtin/add.c:403

2012 +#: builtin/add.c:363

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

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

2015

2016 #. takes no arguments

1852 -#: builtin/add.c:406

2017 +#: builtin/add.c:366

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

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

2020

1856 -#: builtin/add.c:408

2021 +#: builtin/add.c:368

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

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

2024

1860 -#: builtin/add.c:409

2025 +#: builtin/add.c:369

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

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

2028

1864 -#: builtin/add.c:410

2029 +#: builtin/add.c:370

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

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

2032

1868 -#: builtin/add.c:432

2033 +#: builtin/add.c:392

2034 #, c-format

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

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

2037

1873 -#: builtin/add.c:433

2038 +#: builtin/add.c:393

2039 msgid "no files added"

2040 msgstr "inga filer har lagts till"

2041

1877 -#: builtin/add.c:439

2042 +#: builtin/add.c:399

2043 msgid "adding files failed"

2044 msgstr "misslyckades lägga till filer"

2045

1881 -#: builtin/add.c:478

2046 +#: builtin/add.c:438

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

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

2049

1885 -#: builtin/add.c:496

2050 +#: builtin/add.c:456

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

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

2053

1889 -#: builtin/add.c:526

2054 +#: builtin/add.c:486

2055 #, c-format

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

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

2058

1894 -#: builtin/add.c:527

2059 +#: builtin/add.c:487

2060 #, c-format

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

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

2063

1899 -#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919

1900 -#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297

2064 +#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919

2065 +#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299

2066 msgid "index file corrupt"

2067 msgstr "indexfilen trasig"

2068

1904 -#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432

2069 +#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432

2070 msgid "Unable to write new index file"

2071 msgstr "Kunde inte skriva ny indexfil"

2072

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

2319 msgid "Checking patch %s..."

2320 msgstr "Kontrollerar patchen %s..."

2321

2157 -#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127

2322 +#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127

2323 #, c-format

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

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

@@ -2234,8 +2399,8 @@ msgstr "indata känns inte igen"

2399 msgid "unable to read index file"

2400 msgstr "kan inte läsa indexfilen"

2401

2237 -#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91

2238 -#: builtin/fetch.c:63

2402 +#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90

2403 +#: builtin/fetch.c:77

2404 msgid "path"

2405 msgstr "sökväg"

2406

@@ -2295,7 +2460,7 @@ msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"

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

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

2462

2298 -#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462

2463 +#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452

2464 msgid "paths are separated with NUL character"

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

2466

@@ -2425,103 +2590,103 @@ msgstr "utför 'git bisect next'"

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

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

2592

2428 -#: builtin/blame.c:26

2593 +#: builtin/blame.c:27

2594 msgid "git blame [options] [rev-opts] [rev] [--] file"

2595 msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil"

2596

2432 -#: builtin/blame.c:31

2597 +#: builtin/blame.c:32

2598 msgid "[rev-opts] are documented in git-rev-list(1)"

2599 msgstr "[rev-flaggor] dokumenteras i git-rev-list(1)"

2600

2436 -#: builtin/blame.c:2276

2601 +#: builtin/blame.c:2248

2602 msgid "Show blame entries as we find them, incrementally"

2603 msgstr "Visa klandringsposter när vi hittar dem, interaktivt"

2604

2440 -#: builtin/blame.c:2277

2605 +#: builtin/blame.c:2249

2606 msgid "Show blank SHA-1 for boundary commits (Default: off)"

2607 msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"

2608

2444 -#: builtin/blame.c:2278

2609 +#: builtin/blame.c:2250

2610 msgid "Do not treat root commits as boundaries (Default: off)"

2611 msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"

2612

2448 -#: builtin/blame.c:2279

2613 +#: builtin/blame.c:2251

2614 msgid "Show work cost statistics"

2615 msgstr "Visa statistik över arbetskostnad"

2616

2452 -#: builtin/blame.c:2280

2617 +#: builtin/blame.c:2252

2618 msgid "Show output score for blame entries"

2619 msgstr "Visa utdatapoäng för klandringsposter"

2620

2456 -#: builtin/blame.c:2281

2621 +#: builtin/blame.c:2253

2622 msgid "Show original filename (Default: auto)"

2623 msgstr "Visa originalfilnamn (Standard: auto)"

2624

2460 -#: builtin/blame.c:2282

2625 +#: builtin/blame.c:2254

2626 msgid "Show original linenumber (Default: off)"

2627 msgstr "Visa ursprungligt radnummer (Standard: av)"

2628

2464 -#: builtin/blame.c:2283

2629 +#: builtin/blame.c:2255

2630 msgid "Show in a format designed for machine consumption"

2631 msgstr "Visa i ett format avsett för maskinkonsumtion"

2632

2468 -#: builtin/blame.c:2284

2633 +#: builtin/blame.c:2256

2634 msgid "Show porcelain format with per-line commit information"

2635 msgstr "Visa porslinsformat med per-rad-incheckningsinformation"

2636

2472 -#: builtin/blame.c:2285

2637 +#: builtin/blame.c:2257

2638 msgid "Use the same output mode as git-annotate (Default: off)"

2639 msgstr "Använd samma utdataläge som git-annotate (Standard: av)"

2640

2476 -#: builtin/blame.c:2286

2641 +#: builtin/blame.c:2258

2642 msgid "Show raw timestamp (Default: off)"

2643 msgstr "Visa rå tidsstämpel (Standard: av)"

2644

2480 -#: builtin/blame.c:2287

2645 +#: builtin/blame.c:2259

2646 msgid "Show long commit SHA1 (Default: off)"

2647 msgstr "Visa lång inchecknings-SHA1 (Standard: av)"

2648

2484 -#: builtin/blame.c:2288

2649 +#: builtin/blame.c:2260

2650 msgid "Suppress author name and timestamp (Default: off)"

2651 msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"

2652

2488 -#: builtin/blame.c:2289

2653 +#: builtin/blame.c:2261

2654 msgid "Show author email instead of name (Default: off)"

2655 msgstr "Visa författarens e-post istället för namn (Standard: av)"

2656

2492 -#: builtin/blame.c:2290

2657 +#: builtin/blame.c:2262

2658 msgid "Ignore whitespace differences"

2659 msgstr "Ignorera ändringar i blanksteg"

2660

2496 -#: builtin/blame.c:2291

2661 +#: builtin/blame.c:2263

2662 msgid "Spend extra cycles to find better match"

2663 msgstr "Slösa extra cykler med att hitta bättre träff"

2664

2500 -#: builtin/blame.c:2292

2665 +#: builtin/blame.c:2264

2666 msgid "Use revisions from <file> instead of calling git-rev-list"

2667 msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"

2668

2504 -#: builtin/blame.c:2293

2669 +#: builtin/blame.c:2265

2670 msgid "Use <file>'s contents as the final image"

2671 msgstr "Använd <fil>s innehåll som slutgiltig bild"

2672

2508 -#: builtin/blame.c:2294 builtin/blame.c:2295

2673 +#: builtin/blame.c:2266 builtin/blame.c:2267

2674 msgid "score"

2675 msgstr "poäng"

2676

2512 -#: builtin/blame.c:2294

2677 +#: builtin/blame.c:2266

2678 msgid "Find line copies within and across files"

2679 msgstr "Hitta kopierade rader inuti och mellan filer"

2680

2516 -#: builtin/blame.c:2295

2681 +#: builtin/blame.c:2267

2682 msgid "Find line movements within and across files"

2683 msgstr "Hitta flyttade rader inuti och mellan filer"

2684

2520 -#: builtin/blame.c:2296

2685 +#: builtin/blame.c:2268

2686 msgid "n,m"

2687 msgstr "n,m"

2688

2524 -#: builtin/blame.c:2296

2689 +#: builtin/blame.c:2268

2690 msgid "Process only line range n,m, counting from 1"

2691 msgstr "Behandla endast radintervallet n,m, med början på 1"

2692

@@ -2627,278 +2792,288 @@ msgstr "grenen \"%s\" pekar inte på en incheckning"

2792

2793 #: builtin/branch.c:453

2794 #, c-format

2795 +msgid "[%s: gone]"

2796 +msgstr "[%s: försvunnen]"

2797 +

2798 +#: builtin/branch.c:456

2799 +#, c-format

2800 +msgid "[%s]"

2801 +msgstr "[%s]"

2802 +

2803 +#: builtin/branch.c:459

2804 +#, c-format

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

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

2807

2633 -#: builtin/branch.c:455

2808 +#: builtin/branch.c:461

2809 #, c-format

2810 msgid "[behind %d]"

2811 msgstr "[bakom %d] "

2812

2638 -#: builtin/branch.c:459

2813 +#: builtin/branch.c:465

2814 #, c-format

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

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

2817

2643 -#: builtin/branch.c:461

2818 +#: builtin/branch.c:467

2819 #, c-format

2820 msgid "[ahead %d]"

2821 msgstr "[före %d] "

2822

2648 -#: builtin/branch.c:464

2823 +#: builtin/branch.c:470

2824 #, c-format

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

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

2827

2653 -#: builtin/branch.c:467

2828 +#: builtin/branch.c:473

2829 #, c-format

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

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

2832

2658 -#: builtin/branch.c:490

2833 +#: builtin/branch.c:496

2834 msgid " **** invalid ref ****"

2835 msgstr " **** ogiltig ref ****"

2836

2662 -#: builtin/branch.c:582

2837 +#: builtin/branch.c:588

2838 #, c-format

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

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

2841

2667 -#: builtin/branch.c:585

2842 +#: builtin/branch.c:591

2843 #, c-format

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

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

2846

2672 -#: builtin/branch.c:588

2847 +#: builtin/branch.c:594

2848 #, c-format

2849 msgid "(detached from %s)"

2850 msgstr "(frånkopplad från %s)"

2851

2677 -#: builtin/branch.c:591

2852 +#: builtin/branch.c:597

2853 msgid "(no branch)"

2854 msgstr "(ingen gren)"

2855

2681 -#: builtin/branch.c:637

2856 +#: builtin/branch.c:643

2857 #, c-format

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

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

2860

2686 -#: builtin/branch.c:669

2861 +#: builtin/branch.c:675

2862 msgid "some refs could not be read"

2863 msgstr "vissa referenser kunde inte läsas"

2864

2690 -#: builtin/branch.c:682

2865 +#: builtin/branch.c:688

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

2867 msgstr ""

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

2869

2695 -#: builtin/branch.c:692

2870 +#: builtin/branch.c:698

2871 #, c-format

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

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

2874

2700 -#: builtin/branch.c:707

2875 +#: builtin/branch.c:713

2876 msgid "Branch rename failed"

2877 msgstr "Misslyckades byta namn på gren"

2878

2704 -#: builtin/branch.c:711

2879 +#: builtin/branch.c:717

2880 #, c-format

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

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

2883

2709 -#: builtin/branch.c:715

2884 +#: builtin/branch.c:721

2885 #, c-format

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

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

2888

2714 -#: builtin/branch.c:722

2889 +#: builtin/branch.c:728

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

2891 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

2892

2718 -#: builtin/branch.c:737

2893 +#: builtin/branch.c:743

2894 #, c-format

2895 msgid "malformed object name %s"

2896 msgstr "felformat objektnamn %s"

2897

2723 -#: builtin/branch.c:761

2898 +#: builtin/branch.c:767

2899 #, c-format

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

2901 msgstr "kunde inte skriva grenbeskrivningsmall: %s"

2902

2728 -#: builtin/branch.c:791

2903 +#: builtin/branch.c:797

2904 msgid "Generic options"

2905 msgstr "Allmänna flaggor"

2906

2732 -#: builtin/branch.c:793

2907 +#: builtin/branch.c:799

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

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

2910

2736 -#: builtin/branch.c:794

2911 +#: builtin/branch.c:800

2912 msgid "suppress informational messages"

2913 msgstr "undertryck informationsmeddelanden"

2914

2740 -#: builtin/branch.c:795

2915 +#: builtin/branch.c:801

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

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

2918

2744 -#: builtin/branch.c:797

2919 +#: builtin/branch.c:803

2920 msgid "change upstream info"

2921 msgstr "ändra uppströmsinformation"

2922

2748 -#: builtin/branch.c:801

2923 +#: builtin/branch.c:807

2924 msgid "use colored output"

2925 msgstr "använd färgad utdata"

2926

2752 -#: builtin/branch.c:802

2927 +#: builtin/branch.c:808

2928 msgid "act on remote-tracking branches"

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

2930

2756 -#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832

2757 -#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434

2758 -#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468

2931 +#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838

2932 +#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461

2933 +#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468

2934 msgid "commit"

2935 msgstr "incheckning"

2936

2762 -#: builtin/branch.c:806 builtin/branch.c:812

2937 +#: builtin/branch.c:812 builtin/branch.c:818

2938 msgid "print only branches that contain the commit"

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

2940

2766 -#: builtin/branch.c:818

2941 +#: builtin/branch.c:824

2942 msgid "Specific git-branch actions:"

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

2944

2770 -#: builtin/branch.c:819

2945 +#: builtin/branch.c:825

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

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

2948

2774 -#: builtin/branch.c:821

2949 +#: builtin/branch.c:827

2950 msgid "delete fully merged branch"

2951 msgstr "ta bort helt sammanslagen gren"

2952

2778 -#: builtin/branch.c:822

2953 +#: builtin/branch.c:828

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

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

2956

2782 -#: builtin/branch.c:823

2957 +#: builtin/branch.c:829

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

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

2960

2786 -#: builtin/branch.c:824

2961 +#: builtin/branch.c:830

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

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

2964

2790 -#: builtin/branch.c:825

2965 +#: builtin/branch.c:831

2966 msgid "list branch names"

2967 msgstr "lista namn på grenar"

2968

2794 -#: builtin/branch.c:826

2969 +#: builtin/branch.c:832

2970 msgid "create the branch's reflog"

2971 msgstr "skapa grenens reflogg"

2972

2798 -#: builtin/branch.c:828

2973 +#: builtin/branch.c:834

2974 msgid "edit the description for the branch"

2975 msgstr "redigera beskrivning för grenen"

2976

2802 -#: builtin/branch.c:829

2977 +#: builtin/branch.c:835

2978 msgid "force creation (when already exists)"

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

2980

2806 -#: builtin/branch.c:832

2981 +#: builtin/branch.c:838

2982 msgid "print only not merged branches"

2983 msgstr "visa endast ej sammanslagna grenar"

2984

2810 -#: builtin/branch.c:838

2985 +#: builtin/branch.c:844

2986 msgid "print only merged branches"

2987 msgstr "visa endast sammanslagna grenar"

2988

2814 -#: builtin/branch.c:842

2989 +#: builtin/branch.c:848

2990 msgid "list branches in columns"

2991 msgstr "visa grenar i spalter"

2992

2818 -#: builtin/branch.c:855

2993 +#: builtin/branch.c:861

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

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

2996

2822 -#: builtin/branch.c:860 builtin/clone.c:630

2997 +#: builtin/branch.c:866 builtin/clone.c:629

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

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

3000

2826 -#: builtin/branch.c:883

3001 +#: builtin/branch.c:890

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

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

3004

2830 -#: builtin/branch.c:889 builtin/branch.c:928

3005 +#: builtin/branch.c:896 builtin/branch.c:935

3006 msgid "branch name required"

3007 msgstr "grennamn krävs"

3008

2834 -#: builtin/branch.c:904

3009 +#: builtin/branch.c:911

3010 msgid "Cannot give description to detached HEAD"

3011 msgstr "Kan inte beskriva frånkopplad HEAD"

3012

2838 -#: builtin/branch.c:909

3013 +#: builtin/branch.c:916

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

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

3016

2842 -#: builtin/branch.c:916

3017 +#: builtin/branch.c:923

3018 #, c-format

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

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

3021

2847 -#: builtin/branch.c:919

3022 +#: builtin/branch.c:926

3023 #, c-format

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

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

3026

2852 -#: builtin/branch.c:934

3027 +#: builtin/branch.c:941

3028 msgid "too many branches for a rename operation"

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

3030

2856 -#: builtin/branch.c:939

3031 +#: builtin/branch.c:946

3032 msgid "too many branches to set new upstream"

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

3034

2860 -#: builtin/branch.c:943

3035 +#: builtin/branch.c:950

3036 #, c-format

3037 msgid ""

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

3039 msgstr ""

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

3041

2867 -#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990

3042 +#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997

3043 #, c-format

3044 msgid "no such branch '%s'"

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

3046

2872 -#: builtin/branch.c:950

3047 +#: builtin/branch.c:957

3048 #, c-format

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

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

3051

2877 -#: builtin/branch.c:962

3052 +#: builtin/branch.c:969

3053 msgid "too many branches to unset upstream"

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

3055

2881 -#: builtin/branch.c:966

3056 +#: builtin/branch.c:973

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

3058 msgstr ""

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

3060

2886 -#: builtin/branch.c:972

3061 +#: builtin/branch.c:979

3062 #, c-format

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

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

3065

2891 -#: builtin/branch.c:987

3066 +#: builtin/branch.c:994

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

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

3069

2895 -#: builtin/branch.c:993

3070 +#: builtin/branch.c:1000

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

3072 msgstr ""

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

3074 "grennamn"

3075

2901 -#: builtin/branch.c:996

3076 +#: builtin/branch.c:1003

3077 #, c-format

3078 msgid ""

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

@@ -2907,7 +3082,7 @@ msgstr ""

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

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

3084

2910 -#: builtin/branch.c:1013

3085 +#: builtin/branch.c:1020

3086 #, c-format

3087 msgid ""

3088 "\n"

@@ -2918,12 +3093,12 @@ msgstr ""

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

3094 "\n"

3095

2921 -#: builtin/branch.c:1014

3096 +#: builtin/branch.c:1021

3097 #, c-format

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

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

3100

2926 -#: builtin/branch.c:1015

3101 +#: builtin/branch.c:1022

3102 #, c-format

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

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

@@ -2941,43 +3116,43 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."

3116 msgid "Need a repository to unbundle."

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

3118

2944 -#: builtin/cat-file.c:285

3119 +#: builtin/cat-file.c:312

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

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

3122

2948 -#: builtin/cat-file.c:286

3123 +#: builtin/cat-file.c:313

3124 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"

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

3126

2952 -#: builtin/cat-file.c:323

3127 +#: builtin/cat-file.c:350

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

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

3130

2956 -#: builtin/cat-file.c:324

3131 +#: builtin/cat-file.c:351

3132 msgid "show object type"

3133 msgstr "visa objekttyp"

3134

2960 -#: builtin/cat-file.c:325

3135 +#: builtin/cat-file.c:352

3136 msgid "show object size"

3137 msgstr "visa objektstorlek"

3138

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

3139 +#: builtin/cat-file.c:354

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

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

3142

2968 -#: builtin/cat-file.c:328

3143 +#: builtin/cat-file.c:355

3144 msgid "pretty-print object's content"

3145 msgstr "visa objektets innehåll snyggt"

3146

2972 -#: builtin/cat-file.c:330

3147 +#: builtin/cat-file.c:357

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

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

3150

2976 -#: builtin/cat-file.c:332

3151 +#: builtin/cat-file.c:359

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

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

3154

2980 -#: builtin/cat-file.c:335

3155 +#: builtin/cat-file.c:362

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

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

3158

@@ -3002,10 +3177,10 @@ msgid "read file names from stdin"

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

3178

3179 #: builtin/check-attr.c:23 builtin/check-ignore.c:24

3005 -msgid "input paths are terminated by a null character"

3006 -msgstr "sökvägar avdelas med null-tecken"

3180 +msgid "terminate input and output records by a NUL character"

3181 +msgstr "avsluta in- och utdataposter med NUL-tecken"

3182

3008 -#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177

3183 +#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259

3184 msgid "suppress progress reporting"

3185 msgstr "undertryck förloppsrapportering"

3186

@@ -3013,27 +3188,31 @@ msgstr "undertryck förloppsrapportering"

3188 msgid "show non-matching input paths"

3189 msgstr "visa indatasökvägar som inte träffas"

3190

3016 -#: builtin/check-ignore.c:143

3191 +#: builtin/check-ignore.c:28

3192 +msgid "ignore index when checking"

3193 +msgstr "ignorera index vid kontroll"

3194 +

3195 +#: builtin/check-ignore.c:154

3196 msgid "cannot specify pathnames with --stdin"

3197 msgstr "kan inte ange sökvägsnamn med --stdin"

3198

3020 -#: builtin/check-ignore.c:146

3199 +#: builtin/check-ignore.c:157

3200 msgid "-z only makes sense with --stdin"

3201 msgstr "-z kan endast användas tillsammans med --stdin"

3202

3024 -#: builtin/check-ignore.c:148

3203 +#: builtin/check-ignore.c:159

3204 msgid "no path specified"

3205 msgstr "ingen sökväg angavs"

3206

3028 -#: builtin/check-ignore.c:152

3207 +#: builtin/check-ignore.c:163

3208 msgid "--quiet is only valid with a single pathname"

3209 msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn"

3210

3032 -#: builtin/check-ignore.c:154

3211 +#: builtin/check-ignore.c:165

3212 msgid "cannot have both --quiet and --verbose"

3213 msgstr "kan inte använda både --quiet och --verbose"

3214

3036 -#: builtin/check-ignore.c:157

3215 +#: builtin/check-ignore.c:168

3216 msgid "--non-matching is only valid with --verbose"

3217 msgstr "--non-matching är endast giltig med --verbose"

3218

@@ -3106,106 +3285,106 @@ msgstr "git checkout [flaggor] <gren>"

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

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

3287

3109 -#: builtin/checkout.c:117 builtin/checkout.c:150

3288 +#: builtin/checkout.c:114 builtin/checkout.c:147

3289 #, c-format

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

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

3292

3114 -#: builtin/checkout.c:119 builtin/checkout.c:152

3293 +#: builtin/checkout.c:116 builtin/checkout.c:149

3294 #, c-format

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

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

3297

3119 -#: builtin/checkout.c:135

3298 +#: builtin/checkout.c:132

3299 #, c-format

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

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

3302

3124 -#: builtin/checkout.c:179

3303 +#: builtin/checkout.c:176

3304 #, c-format

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

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

3307

3129 -#: builtin/checkout.c:196

3308 +#: builtin/checkout.c:193

3309 #, c-format

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

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

3312

3134 -#: builtin/checkout.c:213

3313 +#: builtin/checkout.c:210

3314 #, c-format

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

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

3317

3139 -#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243

3140 -#: builtin/checkout.c:246

3318 +#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238

3319 +#: builtin/checkout.c:241

3320 #, c-format

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

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

3323

3145 -#: builtin/checkout.c:249 builtin/checkout.c:252

3324 +#: builtin/checkout.c:244 builtin/checkout.c:247

3325 #, c-format

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

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

3328

3150 -#: builtin/checkout.c:255

3329 +#: builtin/checkout.c:250

3330 #, c-format

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

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

3333

3155 -#: builtin/checkout.c:266 builtin/checkout.c:458

3334 +#: builtin/checkout.c:261 builtin/checkout.c:451

3335 msgid "corrupt index file"

3336 msgstr "indexfilen är trasig"

3337

3159 -#: builtin/checkout.c:329 builtin/checkout.c:336

3338 +#: builtin/checkout.c:322 builtin/checkout.c:329

3339 #, c-format

3340 msgid "path '%s' is unmerged"

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

3342

3164 -#: builtin/checkout.c:480

3343 +#: builtin/checkout.c:473

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

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

3346

3168 -#: builtin/checkout.c:601

3347 +#: builtin/checkout.c:594

3348 #, c-format

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

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

3351

3173 -#: builtin/checkout.c:639

3352 +#: builtin/checkout.c:632

3353 msgid "HEAD is now at"

3354 msgstr "HEAD är nu på"

3355

3177 -#: builtin/checkout.c:646

3356 +#: builtin/checkout.c:639

3357 #, c-format

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

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

3360

3182 -#: builtin/checkout.c:649

3361 +#: builtin/checkout.c:642

3362 #, c-format

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

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

3365

3187 -#: builtin/checkout.c:653

3366 +#: builtin/checkout.c:646

3367 #, c-format

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

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

3370

3192 -#: builtin/checkout.c:655 builtin/checkout.c:997

3371 +#: builtin/checkout.c:648 builtin/checkout.c:1033

3372 #, c-format

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

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

3375

3197 -#: builtin/checkout.c:657

3376 +#: builtin/checkout.c:650

3377 #, c-format

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

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

3380

3202 -#: builtin/checkout.c:713

3381 +#: builtin/checkout.c:706

3382 #, c-format

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

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

3385

3386 #. The singular version

3208 -#: builtin/checkout.c:719

3387 +#: builtin/checkout.c:712

3388 #, c-format

3389 msgid ""

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

@@ -3228,7 +3407,7 @@ msgstr[1] ""

3407 "\n"

3408 "%s\n"

3409

3231 -#: builtin/checkout.c:737

3410 +#: builtin/checkout.c:730

3411 #, c-format

3412 msgid ""

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

@@ -3243,136 +3422,140 @@ msgstr ""

3422 " git branch nytt_grennamn %s\n"

3423 "\n"

3424

3246 -#: builtin/checkout.c:767

3425 +#: builtin/checkout.c:760

3426 msgid "internal error in revision walk"

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

3428

3250 -#: builtin/checkout.c:771

3429 +#: builtin/checkout.c:764

3430 msgid "Previous HEAD position was"

3431 msgstr "Tidigare position för HEAD var"

3432

3254 -#: builtin/checkout.c:798 builtin/checkout.c:992

3433 +#: builtin/checkout.c:791 builtin/checkout.c:1028

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

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

3436

3258 -#. case (1)

3259 -#: builtin/checkout.c:928

3437 +#: builtin/checkout.c:935

3438 +#, c-format

3439 +msgid "only one reference expected, %d given."

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

3441 +

3442 +#: builtin/checkout.c:974

3443 #, c-format

3444 msgid "invalid reference: %s"

3445 msgstr "felaktig referens: %s"

3446

3447 #. case (1): want a tree

3265 -#: builtin/checkout.c:967

3448 +#: builtin/checkout.c:1003

3449 #, c-format

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

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

3452

3270 -#: builtin/checkout.c:1006

3453 +#: builtin/checkout.c:1042

3454 msgid "paths cannot be used with switching branches"

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

3456

3274 -#: builtin/checkout.c:1009 builtin/checkout.c:1013

3457 +#: builtin/checkout.c:1045 builtin/checkout.c:1049

3458 #, c-format

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

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

3461

3279 -#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025

3280 -#: builtin/checkout.c:1028

3462 +#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061

3463 +#: builtin/checkout.c:1064

3464 #, c-format

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

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

3467

3285 -#: builtin/checkout.c:1033

3468 +#: builtin/checkout.c:1069

3469 #, c-format

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

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

3472

3290 -#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89

3473 +#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88

3474 #: builtin/remote.c:169 builtin/remote.c:171

3475 msgid "branch"

3476 msgstr "gren"

3477

3295 -#: builtin/checkout.c:1056

3478 +#: builtin/checkout.c:1092

3479 msgid "create and checkout a new branch"

3480 msgstr "skapa och checka ut en ny gren"

3481

3299 -#: builtin/checkout.c:1058

3482 +#: builtin/checkout.c:1094

3483 msgid "create/reset and checkout a branch"

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

3485

3303 -#: builtin/checkout.c:1059

3486 +#: builtin/checkout.c:1095

3487 msgid "create reflog for new branch"

3488 msgstr "skapa reflogg för ny gren"

3489

3307 -#: builtin/checkout.c:1060

3490 +#: builtin/checkout.c:1096

3491 msgid "detach the HEAD at named commit"

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

3493

3311 -#: builtin/checkout.c:1061

3494 +#: builtin/checkout.c:1097

3495 msgid "set upstream info for new branch"

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

3497

3315 -#: builtin/checkout.c:1063

3498 +#: builtin/checkout.c:1099

3499 msgid "new branch"

3500 msgstr "ny gren"

3501

3319 -#: builtin/checkout.c:1063

3502 +#: builtin/checkout.c:1099

3503 msgid "new unparented branch"

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

3505

3323 -#: builtin/checkout.c:1064

3506 +#: builtin/checkout.c:1100

3507 msgid "checkout our version for unmerged files"

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

3509

3327 -#: builtin/checkout.c:1066

3510 +#: builtin/checkout.c:1102

3511 msgid "checkout their version for unmerged files"

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

3513

3331 -#: builtin/checkout.c:1068

3514 +#: builtin/checkout.c:1104

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

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

3517

3335 -#: builtin/checkout.c:1069

3518 +#: builtin/checkout.c:1105

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

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

3521

3339 -#: builtin/checkout.c:1070 builtin/merge.c:232

3522 +#: builtin/checkout.c:1106 builtin/merge.c:232

3523 msgid "update ignored files (default)"

3524 msgstr "uppdatera ignorerade filer (standard)"

3525

3343 -#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249

3526 +#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251

3527 msgid "style"

3528 msgstr "stil"

3529

3347 -#: builtin/checkout.c:1072

3530 +#: builtin/checkout.c:1108

3531 msgid "conflict style (merge or diff3)"

3532 msgstr "konfliktstil (merge eller diff3)"

3533

3351 -#: builtin/checkout.c:1075

3534 +#: builtin/checkout.c:1111

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

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

3537

3355 -#: builtin/checkout.c:1077

3538 +#: builtin/checkout.c:1113

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

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

3541

3359 -#: builtin/checkout.c:1101

3542 +#: builtin/checkout.c:1136

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

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

3545

3363 -#: builtin/checkout.c:1118

3546 +#: builtin/checkout.c:1153

3547 msgid "--track needs a branch name"

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

3549

3367 -#: builtin/checkout.c:1125

3550 +#: builtin/checkout.c:1160

3551 msgid "Missing branch name; try -b"

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

3553

3371 -#: builtin/checkout.c:1160

3554 +#: builtin/checkout.c:1197

3555 msgid "invalid path specification"

3556 msgstr "felaktig sökvägsangivelse"

3557

3375 -#: builtin/checkout.c:1167

3558 +#: builtin/checkout.c:1204

3559 #, c-format

3560 msgid ""

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

@@ -3381,12 +3564,12 @@ msgstr ""

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

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

3566

3384 -#: builtin/checkout.c:1172

3567 +#: builtin/checkout.c:1209

3568 #, c-format

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

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

3571

3389 -#: builtin/checkout.c:1176

3572 +#: builtin/checkout.c:1213

3573 msgid ""

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

3575 "checking out of the index."

@@ -3394,39 +3577,39 @@ msgstr ""

3577 "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"

3578 "du checkar ut från indexet."

3579

3397 -#: builtin/clean.c:25

3580 +#: builtin/clean.c:26

3581 msgid ""

3582 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."

3583 msgstr ""

3584 "git clean [-d] [-f] [-i] [-n] [-q] [-e <mönster>] [-x | -X] [--] "

3585 "<sökvägar>..."

3586

3404 -#: builtin/clean.c:29

3587 +#: builtin/clean.c:30

3588 #, c-format

3589 msgid "Removing %s\n"

3590 msgstr "Tar bort %s\n"

3591

3409 -#: builtin/clean.c:30

3592 +#: builtin/clean.c:31

3593 #, c-format

3594 msgid "Would remove %s\n"

3595 msgstr "Skulle ta bort %s\n"

3596

3414 -#: builtin/clean.c:31

3597 +#: builtin/clean.c:32

3598 #, c-format

3599 msgid "Skipping repository %s\n"

3600 msgstr "Hoppar över arkivet %s\n"

3601

3419 -#: builtin/clean.c:32

3602 +#: builtin/clean.c:33

3603 #, c-format

3604 msgid "Would skip repository %s\n"

3605 msgstr "Skulle hoppa över arkivet %s\n"

3606

3424 -#: builtin/clean.c:33

3607 +#: builtin/clean.c:34

3608 #, c-format

3609 msgid "failed to remove %s"

3610 msgstr "misslyckades ta bort %s"

3611

3429 -#: builtin/clean.c:293

3612 +#: builtin/clean.c:294

3613 msgid ""

3614 "Prompt help:\n"

3615 "1 - select a numbered item\n"

@@ -3438,7 +3621,7 @@ msgstr ""

3621 "foo - markera post baserad på unikt prefix\n"

3622 " - (tomt) markera ingenting"

3623

3441 -#: builtin/clean.c:297

3624 +#: builtin/clean.c:298

3625 msgid ""

3626 "Prompt help:\n"

3627 "1 - select a single item\n"

@@ -3458,35 +3641,35 @@ msgstr ""

3641 "* - välj alla poster\n"

3642 " - (tomt) avsluta markering"

3643

3461 -#: builtin/clean.c:515

3644 +#: builtin/clean.c:516

3645 #, c-format

3646 msgid "Huh (%s)?"

3647 msgstr "Vadå (%s)?"

3648

3466 -#: builtin/clean.c:658

3649 +#: builtin/clean.c:659

3650 #, c-format

3651 msgid "Input ignore patterns>> "

3652 msgstr "Ange ignoreringsmönster>>"

3653

3471 -#: builtin/clean.c:695

3654 +#: builtin/clean.c:696

3655 #, c-format

3656 msgid "WARNING: Cannot find items matched by: %s"

3657 msgstr "VARNING: Hittar inte poster som motsvarar: %s"

3658

3476 -#: builtin/clean.c:716

3659 +#: builtin/clean.c:717

3660 msgid "Select items to delete"

3661 msgstr "Välj poster att ta bort"

3662

3480 -#: builtin/clean.c:756

3663 +#: builtin/clean.c:757

3664 #, c-format

3665 msgid "remove %s? "

3666 msgstr "ta bort %s?"

3667

3485 -#: builtin/clean.c:781

3668 +#: builtin/clean.c:782

3669 msgid "Bye."

3670 msgstr "Hej då."

3671

3489 -#: builtin/clean.c:789

3672 +#: builtin/clean.c:790

3673 msgid ""

3674 "clean - start cleaning\n"

3675 "filter by pattern - exclude items from deletion\n"

@@ -3504,21 +3687,21 @@ msgstr ""

3687 "help - denna skärm\n"

3688 "? - hjälp för kommandoval"

3689

3507 -#: builtin/clean.c:816

3690 +#: builtin/clean.c:817

3691 msgid "*** Commands ***"

3692 msgstr "*** Kommandon ***"

3693

3511 -#: builtin/clean.c:817

3694 +#: builtin/clean.c:818

3695 msgid "What now"

3696 msgstr "Vad nu"

3697

3515 -#: builtin/clean.c:825

3698 +#: builtin/clean.c:826

3699 msgid "Would remove the following item:"

3700 msgid_plural "Would remove the following items:"

3701 msgstr[0] "Skulle ta bort följande post:"

3702 msgstr[1] "Skulle ta bort följande poster:"

3703

3521 -#: builtin/clean.c:842

3704 +#: builtin/clean.c:843

3705 msgid "No more files to clean, exiting."

3706 msgstr "Inga fler filer att städa, avslutar."

3707

@@ -3538,8 +3721,8 @@ msgstr "städa interaktivt"

3721 msgid "remove whole directories"

3722 msgstr "ta bort hela kataloger"

3723

3541 -#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716

3542 -#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186

3724 +#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718

3725 +#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185

3726 msgid "pattern"

3727 msgstr "mönster"

3728

@@ -3579,8 +3762,8 @@ msgstr ""

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

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

3764

3582 -#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229

3583 -#: builtin/push.c:462

3765 +#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229

3766 +#: builtin/push.c:474

3767 msgid "force progress reporting"

3768 msgstr "tvinga förloppsrapportering"

3769

@@ -3592,123 +3775,123 @@ msgstr "skapa inte någon utcheckning"

3775 msgid "create a bare repository"

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

3777

3595 -#: builtin/clone.c:72

3778 +#: builtin/clone.c:71

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

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

3781

3599 -#: builtin/clone.c:74

3782 +#: builtin/clone.c:73

3783 msgid "to clone from a local repository"

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

3785

3603 -#: builtin/clone.c:76

3786 +#: builtin/clone.c:75

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

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

3789

3607 -#: builtin/clone.c:78

3790 +#: builtin/clone.c:77

3791 msgid "setup as shared repository"

3792 msgstr "skapa som ett delat arkiv"

3793

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

3794 +#: builtin/clone.c:79 builtin/clone.c:81

3795 msgid "initialize submodules in the clone"

3796 msgstr "initiera undermoduler i klonen"

3797

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

3798 +#: builtin/clone.c:82 builtin/init-db.c:485

3799 msgid "template-directory"

3800 msgstr "mallkatalog"

3801

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

3802 +#: builtin/clone.c:83 builtin/init-db.c:486

3803 msgid "directory from which templates will be used"

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

3805

3623 -#: builtin/clone.c:86

3806 +#: builtin/clone.c:85

3807 msgid "reference repository"

3808 msgstr "referensarkiv"

3809

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

3810 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44

3811 msgid "name"

3812 msgstr "namn"

3813

3631 -#: builtin/clone.c:88

3814 +#: builtin/clone.c:87

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

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

3817

3635 -#: builtin/clone.c:90

3818 +#: builtin/clone.c:89

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

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

3821

3639 -#: builtin/clone.c:92

3822 +#: builtin/clone.c:91

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

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

3825

3643 -#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661

3826 +#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663

3827 msgid "depth"

3828 msgstr "djup"

3829

3647 -#: builtin/clone.c:94

3830 +#: builtin/clone.c:93

3831 msgid "create a shallow clone of that depth"

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

3833

3651 -#: builtin/clone.c:96

3834 +#: builtin/clone.c:95

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

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

3837

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

3838 +#: builtin/clone.c:96 builtin/init-db.c:494

3839 msgid "gitdir"

3840 msgstr "gitkat"

3841

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

3842 +#: builtin/clone.c:97 builtin/init-db.c:495

3843 msgid "separate git dir from working tree"

3844 msgstr "separera gitkatalogen från arbetskatalogen"

3845

3663 -#: builtin/clone.c:99

3846 +#: builtin/clone.c:98

3847 msgid "key=value"

3848 msgstr "nyckel=värde"

3849

3667 -#: builtin/clone.c:100

3850 +#: builtin/clone.c:99

3851 msgid "set config inside the new repository"

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

3853

3671 -#: builtin/clone.c:253

3854 +#: builtin/clone.c:252

3855 #, c-format

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

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

3858

3676 -#: builtin/clone.c:316

3859 +#: builtin/clone.c:315

3860 #, c-format

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

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

3863

3681 -#: builtin/clone.c:318 builtin/diff.c:77

3864 +#: builtin/clone.c:317 builtin/diff.c:77

3865 #, c-format

3866 msgid "failed to stat '%s'"

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

3868

3686 -#: builtin/clone.c:320

3869 +#: builtin/clone.c:319

3870 #, c-format

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

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

3873

3691 -#: builtin/clone.c:334

3874 +#: builtin/clone.c:333

3875 #, c-format

3876 msgid "failed to stat %s\n"

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

3878

3696 -#: builtin/clone.c:356

3879 +#: builtin/clone.c:355

3880 #, c-format

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

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

3883

3701 -#: builtin/clone.c:360

3884 +#: builtin/clone.c:359

3885 #, c-format

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

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

3888

3706 -#: builtin/clone.c:383

3889 +#: builtin/clone.c:382 builtin/clone.c:559

3890 #, c-format

3891 msgid "done.\n"

3892 msgstr "klart.\n"

3893

3711 -#: builtin/clone.c:396

3894 +#: builtin/clone.c:395

3895 msgid ""

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

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

@@ -3718,105 +3901,100 @@ msgstr ""

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

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

3903

3721 -#: builtin/clone.c:475

3904 +#: builtin/clone.c:474

3905 #, c-format

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

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

3908

3726 -#: builtin/clone.c:555

3909 +#: builtin/clone.c:554

3910 #, c-format

3911 msgid "Checking connectivity... "

3912 msgstr "Kontrollerar anslutning..."

3913

3731 -#: builtin/clone.c:558

3914 +#: builtin/clone.c:557

3915 msgid "remote did not send all necessary objects"

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

3917

3735 -#: builtin/clone.c:560

3736 -#, c-format

3737 -msgid "done\n"

3738 -msgstr "klart\n"

3739 -

3740 -#: builtin/clone.c:621

3918 +#: builtin/clone.c:620

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

3920 msgstr ""

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

3922

3745 -#: builtin/clone.c:652

3923 +#: builtin/clone.c:651

3924 msgid "unable to checkout working tree"

3925 msgstr "kunde inte checka ut arbetskatalogen"

3926

3749 -#: builtin/clone.c:760

3927 +#: builtin/clone.c:759

3928 msgid "Too many arguments."

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

3930

3753 -#: builtin/clone.c:764

3931 +#: builtin/clone.c:763

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

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

3934

3757 -#: builtin/clone.c:775

3935 +#: builtin/clone.c:774

3936 #, c-format

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

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

3939

3762 -#: builtin/clone.c:778

3940 +#: builtin/clone.c:777

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

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

3943

3766 -#: builtin/clone.c:791

3944 +#: builtin/clone.c:790

3945 #, c-format

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

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

3948

3771 -#: builtin/clone.c:796

3949 +#: builtin/clone.c:795

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

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

3952

3775 -#: builtin/clone.c:798

3953 +#: builtin/clone.c:797

3954 msgid "--local is ignored"

3955 msgstr "--local ignoreras"

3956

3779 -#: builtin/clone.c:808

3957 +#: builtin/clone.c:807

3958 #, c-format

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

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

3961

3784 -#: builtin/clone.c:818

3962 +#: builtin/clone.c:817

3963 #, c-format

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

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

3966

3789 -#: builtin/clone.c:831 builtin/clone.c:843

3967 +#: builtin/clone.c:830 builtin/clone.c:842

3968 #, c-format

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

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

3971

3794 -#: builtin/clone.c:834

3972 +#: builtin/clone.c:833

3973 #, c-format

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

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

3976

3799 -#: builtin/clone.c:853

3977 +#: builtin/clone.c:852

3978 #, c-format

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

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

3981

3804 -#: builtin/clone.c:855

3982 +#: builtin/clone.c:854

3983 #, c-format

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

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

3986

3809 -#: builtin/clone.c:890

3987 +#: builtin/clone.c:888

3988 #, c-format

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

3990 msgstr "Vet inte hur man klonar %s"

3991

3814 -#: builtin/clone.c:942

3992 +#: builtin/clone.c:939 builtin/clone.c:947

3993 #, c-format

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

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

3996

3819 -#: builtin/clone.c:949

3997 +#: builtin/clone.c:950

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

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

4000

@@ -3852,15 +4030,15 @@ msgstr "Spaltfyllnad mellan spalter"

4030 msgid "--command must be the first argument"

4031 msgstr "--command måste vara första argument"

4032

3855 -#: builtin/commit.c:35

4033 +#: builtin/commit.c:36

4034 msgid "git commit [options] [--] <pathspec>..."

4035 msgstr "git commit [flaggor] [--] <sökväg>..."

4036

3859 -#: builtin/commit.c:40

4037 +#: builtin/commit.c:41

4038 msgid "git status [options] [--] <pathspec>..."

4039 msgstr "git status [flaggor] [--] <sökväg>..."

4040

3863 -#: builtin/commit.c:45

4041 +#: builtin/commit.c:46

4042 msgid ""

4043 "Your name and email address were configured automatically based\n"

4044 "on your username and hostname. Please check that they are accurate.\n"

@@ -3885,7 +4063,7 @@ msgstr ""

4063 "\n"

4064 " git commit --amend --reset-author\n"

4065

3888 -#: builtin/commit.c:57

4066 +#: builtin/commit.c:58

4067 msgid ""

4068 "You asked to amend the most recent commit, but doing so would make\n"

4069 "it empty. You can repeat your command with --allow-empty, or you can\n"

@@ -3895,7 +4073,7 @@ msgstr ""

4073 "blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n"

4074 "så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n"

4075

3898 -#: builtin/commit.c:62

4076 +#: builtin/commit.c:63

4077 msgid ""

4078 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

4079 "If you wish to commit it anyway, use:\n"

@@ -3909,11 +4087,11 @@ msgstr ""

4087 " git commit --allow-empty\n"

4088 "\n"

4089

3912 -#: builtin/commit.c:69

4090 +#: builtin/commit.c:70

4091 msgid "Otherwise, please use 'git reset'\n"

4092 msgstr "Använd annars \"git reset\"\n"

4093

3916 -#: builtin/commit.c:72

4094 +#: builtin/commit.c:73

4095 msgid ""

4096 "If you wish to skip this commit, use:\n"

4097 "\n"

@@ -3929,93 +4107,93 @@ msgstr ""

4107 "\"git cherry-pick --continue\" kommer därefter att återuppta\n"

4108 "cherry-pick för återstående incheckningar.\n"

4109

3932 -#: builtin/commit.c:279

4110 +#: builtin/commit.c:287

4111 msgid "failed to unpack HEAD tree object"

4112 msgstr "misslyckades packa upp HEAD:s trädobjekt"

4113

3936 -#: builtin/commit.c:321

4114 +#: builtin/commit.c:329

4115 msgid "unable to create temporary index"

4116 msgstr "kunde inte skapa temporär indexfil"

4117

3940 -#: builtin/commit.c:327

4118 +#: builtin/commit.c:335

4119 msgid "interactive add failed"

4120 msgstr "interaktiv tilläggning misslyckades"

4121

3944 -#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431

4122 +#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439

4123 msgid "unable to write new_index file"

4124 msgstr "kunde inte skriva filen new_index"

4125

3948 -#: builtin/commit.c:412

4126 +#: builtin/commit.c:420

4127 msgid "cannot do a partial commit during a merge."

4128 msgstr "kan inte utföra en delvis incheckning under en sammanslagning."

4129

3952 -#: builtin/commit.c:414

4130 +#: builtin/commit.c:422

4131 msgid "cannot do a partial commit during a cherry-pick."

4132 msgstr "kan inte utföra en delvis incheckning under en cherry-pick."

4133

3956 -#: builtin/commit.c:424

4134 +#: builtin/commit.c:432

4135 msgid "cannot read the index"

4136 msgstr "kan inte läsa indexet"

4137

3960 -#: builtin/commit.c:444

4138 +#: builtin/commit.c:452

4139 msgid "unable to write temporary index file"

4140 msgstr "kunde inte skriva temporär indexfil"

4141

3964 -#: builtin/commit.c:535 builtin/commit.c:541

4142 +#: builtin/commit.c:543 builtin/commit.c:549

4143 #, c-format

4144 msgid "invalid commit: %s"

4145 msgstr "felaktig incheckning: %s"

4146

3969 -#: builtin/commit.c:563

4147 +#: builtin/commit.c:571

4148 msgid "malformed --author parameter"

4149 msgstr "felformad \"--author\"-flagga"

4150

3973 -#: builtin/commit.c:583

4151 +#: builtin/commit.c:591

4152 #, c-format

4153 msgid "Malformed ident string: '%s'"

4154 msgstr "Felaktig indragningssträng: \"%s\""

4155

3978 -#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982

4156 +#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007

4157 #, c-format

4158 msgid "could not lookup commit %s"

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

4160

3983 -#: builtin/commit.c:633 builtin/shortlog.c:271

4161 +#: builtin/commit.c:642 builtin/shortlog.c:273

4162 #, c-format

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

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

4165

3988 -#: builtin/commit.c:635

4166 +#: builtin/commit.c:644

4167 msgid "could not read log from standard input"

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

4169

3992 -#: builtin/commit.c:639

4170 +#: builtin/commit.c:648

4171 #, c-format

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

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

4174

3997 -#: builtin/commit.c:645

4175 +#: builtin/commit.c:654

4176 msgid "commit has empty message"

4177 msgstr "incheckningen har ett tomt meddelande"

4178

4001 -#: builtin/commit.c:661

4179 +#: builtin/commit.c:670

4180 msgid "could not read MERGE_MSG"

4181 msgstr "kunde inte läsa MERGE_MSG"

4182

4005 -#: builtin/commit.c:665

4183 +#: builtin/commit.c:674

4184 msgid "could not read SQUASH_MSG"

4185 msgstr "kunde inte läsa SQUASH_MSG"

4186

4009 -#: builtin/commit.c:669

4187 +#: builtin/commit.c:678

4188 #, c-format

4189 msgid "could not read '%s'"

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

4191

4014 -#: builtin/commit.c:730

4192 +#: builtin/commit.c:749

4193 msgid "could not write commit template"

4194 msgstr "kunde inte skriva incheckningsmall"

4195

4018 -#: builtin/commit.c:741

4196 +#: builtin/commit.c:760

4197 #, c-format

4198 msgid ""

4199 "\n"

@@ -4030,7 +4208,7 @@ msgstr ""

4208 "\t%s\n"

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

4210

4033 -#: builtin/commit.c:746

4211 +#: builtin/commit.c:765

4212 #, c-format

4213 msgid ""

4214 "\n"

@@ -4045,7 +4223,7 @@ msgstr ""

4223 "\t%s\n"

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

4225

4048 -#: builtin/commit.c:758

4226 +#: builtin/commit.c:777

4227 #, c-format

4228 msgid ""

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

@@ -4055,7 +4233,7 @@ msgstr ""

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

4234 "incheckningen.\n"

4235

4058 -#: builtin/commit.c:763

4236 +#: builtin/commit.c:782

4237 #, c-format

4238 msgid ""

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

@@ -4066,139 +4244,139 @@ msgstr ""

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

4245 "Ett tomt meddelande avbryter incheckningen.\n"

4246

4069 -#: builtin/commit.c:776

4247 +#: builtin/commit.c:795

4248 #, c-format

4249 msgid "%sAuthor: %s"

4250 msgstr "%sFörfattare: %s"

4251

4074 -#: builtin/commit.c:783

4252 +#: builtin/commit.c:802

4253 #, c-format

4254 msgid "%sCommitter: %s"

4255 msgstr "%sIncheckare: %s"

4256

4079 -#: builtin/commit.c:803

4257 +#: builtin/commit.c:822

4258 msgid "Cannot read index"

4259 msgstr "Kan inte läsa indexet"

4260

4083 -#: builtin/commit.c:845

4261 +#: builtin/commit.c:865

4262 msgid "Error building trees"

4263 msgstr "Fel vid byggande av träd"

4264

4087 -#: builtin/commit.c:860 builtin/tag.c:359

4265 +#: builtin/commit.c:880 builtin/tag.c:359

4266 #, c-format

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

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

4269

4092 -#: builtin/commit.c:957

4270 +#: builtin/commit.c:982

4271 #, c-format

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

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

4274

4097 -#: builtin/commit.c:972 builtin/commit.c:1208

4275 +#: builtin/commit.c:997 builtin/commit.c:1237

4276 #, c-format

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

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

4279

4102 -#: builtin/commit.c:1009

4280 +#: builtin/commit.c:1034

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

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

4283

4106 -#: builtin/commit.c:1039

4284 +#: builtin/commit.c:1064

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

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

4287

4110 -#: builtin/commit.c:1050

4288 +#: builtin/commit.c:1075

4289 msgid "You have nothing to amend."

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

4291

4114 -#: builtin/commit.c:1053

4292 +#: builtin/commit.c:1078

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

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

4295

4118 -#: builtin/commit.c:1055

4296 +#: builtin/commit.c:1080

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

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

4299

4122 -#: builtin/commit.c:1058

4300 +#: builtin/commit.c:1083

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

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

4303

4126 -#: builtin/commit.c:1068

4304 +#: builtin/commit.c:1093

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

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

4307

4130 -#: builtin/commit.c:1070

4308 +#: builtin/commit.c:1095

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

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

4311

4134 -#: builtin/commit.c:1078

4312 +#: builtin/commit.c:1103

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

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

4315

4138 -#: builtin/commit.c:1095

4316 +#: builtin/commit.c:1120

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

4318 msgstr ""

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

4320

4143 -#: builtin/commit.c:1097

4321 +#: builtin/commit.c:1122

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

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

4324

4147 -#: builtin/commit.c:1099

4325 +#: builtin/commit.c:1124

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

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

4328

4151 -#: builtin/commit.c:1101

4329 +#: builtin/commit.c:1126

4330 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

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

4332

4155 -#: builtin/commit.c:1111 builtin/tag.c:575

4333 +#: builtin/commit.c:1136 builtin/tag.c:572

4334 #, c-format

4335 msgid "Invalid cleanup mode %s"

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

4337

4160 -#: builtin/commit.c:1116

4338 +#: builtin/commit.c:1141

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

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

4341

4164 -#: builtin/commit.c:1222 builtin/commit.c:1455

4342 +#: builtin/commit.c:1251 builtin/commit.c:1482

4343 msgid "show status concisely"

4344 msgstr "visa koncis status"

4345

4168 -#: builtin/commit.c:1224 builtin/commit.c:1457

4346 +#: builtin/commit.c:1253 builtin/commit.c:1484

4347 msgid "show branch information"

4348 msgstr "visa information om gren"

4349

4172 -#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452

4350 +#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460

4351 msgid "machine-readable output"

4352 msgstr "maskinläsbar utdata"

4353

4176 -#: builtin/commit.c:1229 builtin/commit.c:1461

4354 +#: builtin/commit.c:1258 builtin/commit.c:1488

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

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

4357

4180 -#: builtin/commit.c:1232 builtin/commit.c:1464

4358 +#: builtin/commit.c:1261 builtin/commit.c:1491

4359 msgid "terminate entries with NUL"

4360 msgstr "terminera poster med NUL"

4361

4184 -#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667

4185 -#: builtin/fast-export.c:670 builtin/tag.c:459

4362 +#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674

4363 +#: builtin/fast-export.c:677 builtin/tag.c:459

4364 msgid "mode"

4365 msgstr "läge"

4366

4189 -#: builtin/commit.c:1235 builtin/commit.c:1467

4367 +#: builtin/commit.c:1264 builtin/commit.c:1494

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

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

4370

4193 -#: builtin/commit.c:1238

4371 +#: builtin/commit.c:1267

4372 msgid "show ignored files"

4373 msgstr "visa ignorerade filer"

4374

4197 -#: builtin/commit.c:1239 parse-options.h:154

4375 +#: builtin/commit.c:1268 parse-options.h:156

4376 msgid "when"

4377 msgstr "när"

4378

4201 -#: builtin/commit.c:1240

4379 +#: builtin/commit.c:1269

4380 msgid ""

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

4382 "(Default: all)"

@@ -4206,217 +4384,217 @@ msgstr ""

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

4385 "(Default: all)"

4386

4209 -#: builtin/commit.c:1242

4387 +#: builtin/commit.c:1271

4388 msgid "list untracked files in columns"

4389 msgstr "visa ospårade filer i spalter"

4390

4213 -#: builtin/commit.c:1313

4391 +#: builtin/commit.c:1340

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

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

4394

4217 -#: builtin/commit.c:1315

4395 +#: builtin/commit.c:1342

4396 msgid "could not parse newly created commit"

4397 msgstr "kunde inte tolka en precis skapad incheckning"

4398

4221 -#: builtin/commit.c:1356

4399 +#: builtin/commit.c:1383

4400 msgid "detached HEAD"

4401 msgstr "frånkopplad HEAD"

4402

4225 -#: builtin/commit.c:1358

4403 +#: builtin/commit.c:1385

4404 msgid " (root-commit)"

4405 msgstr " (rotincheckning)"

4406

4229 -#: builtin/commit.c:1425

4407 +#: builtin/commit.c:1452

4408 msgid "suppress summary after successful commit"

4409 msgstr "undertryck sammanfattning efter framgångsrik incheckning"

4410

4233 -#: builtin/commit.c:1426

4411 +#: builtin/commit.c:1453

4412 msgid "show diff in commit message template"

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

4414

4237 -#: builtin/commit.c:1428

4415 +#: builtin/commit.c:1455

4416 msgid "Commit message options"

4417 msgstr "Alternativ för incheckningsmeddelande"

4418

4241 -#: builtin/commit.c:1429 builtin/tag.c:457

4419 +#: builtin/commit.c:1456 builtin/tag.c:457

4420 msgid "read message from file"

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

4422

4245 -#: builtin/commit.c:1430

4423 +#: builtin/commit.c:1457

4424 msgid "author"

4425 msgstr "författare"

4426

4249 -#: builtin/commit.c:1430

4427 +#: builtin/commit.c:1457

4428 msgid "override author for commit"

4429 msgstr "överstyr författare för incheckningen"

4430

4253 -#: builtin/commit.c:1431 builtin/gc.c:178

4431 +#: builtin/commit.c:1458 builtin/gc.c:260

4432 msgid "date"

4433 msgstr "datum"

4434

4257 -#: builtin/commit.c:1431

4435 +#: builtin/commit.c:1458

4436 msgid "override date for commit"

4437 msgstr "överstyr datum för inchecknignen"

4438

4261 -#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405

4439 +#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405

4440 #: builtin/notes.c:562 builtin/tag.c:455

4441 msgid "message"

4442 msgstr "meddelande"

4443

4266 -#: builtin/commit.c:1432

4444 +#: builtin/commit.c:1459

4445 msgid "commit message"

4446 msgstr "incheckningsmeddelande"

4447

4270 -#: builtin/commit.c:1433

4448 +#: builtin/commit.c:1460

4449 msgid "reuse and edit message from specified commit"

4450 msgstr "återanvänd och redigera meddelande från angiven incheckning"

4451

4274 -#: builtin/commit.c:1434

4452 +#: builtin/commit.c:1461

4453 msgid "reuse message from specified commit"

4454 msgstr "återanvänd meddelande från angiven incheckning"

4455

4278 -#: builtin/commit.c:1435

4456 +#: builtin/commit.c:1462

4457 msgid "use autosquash formatted message to fixup specified commit"

4458 msgstr ""

4459 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"

4460

4283 -#: builtin/commit.c:1436

4461 +#: builtin/commit.c:1463

4462 msgid "use autosquash formatted message to squash specified commit"

4463 msgstr ""

4464 "använd autosquash-formaterat meddelande för att slå ihop med angiven "

4465 "incheckning"

4466

4289 -#: builtin/commit.c:1437

4467 +#: builtin/commit.c:1464

4468 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4469 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"

4470

4293 -#: builtin/commit.c:1438 builtin/log.c:1160 builtin/revert.c:111

4471 +#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86

4472 msgid "add Signed-off-by:"

4473 msgstr "lägg till Signed-off-by:"

4474

4297 -#: builtin/commit.c:1439

4475 +#: builtin/commit.c:1466

4476 msgid "use specified template file"

4477 msgstr "använd angiven mallfil"

4478

4301 -#: builtin/commit.c:1440

4479 +#: builtin/commit.c:1467

4480 msgid "force edit of commit"

4481 msgstr "tvinga redigering av incheckning"

4482

4305 -#: builtin/commit.c:1441

4483 +#: builtin/commit.c:1468

4484 msgid "default"

4485 msgstr "standard"

4486

4309 -#: builtin/commit.c:1441 builtin/tag.c:460

4487 +#: builtin/commit.c:1468 builtin/tag.c:460

4488 msgid "how to strip spaces and #comments from message"

4489 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

4490

4313 -#: builtin/commit.c:1442

4491 +#: builtin/commit.c:1469

4492 msgid "include status in commit message template"

4493 msgstr "inkludera status i mallen för incheckningsmeddelandet"

4494

4317 -#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461

4495 +#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461

4496 msgid "key id"

4497 msgstr "nyckel-id"

4498

4321 -#: builtin/commit.c:1444 builtin/merge.c:231

4499 +#: builtin/commit.c:1471 builtin/merge.c:231

4500 msgid "GPG sign commit"

4501 msgstr "GPG-signera incheckning"

4502

4503 #. end commit message options

4326 -#: builtin/commit.c:1447

4504 +#: builtin/commit.c:1474

4505 msgid "Commit contents options"

4506 msgstr "Alternativ för incheckningens innehåll"

4507

4330 -#: builtin/commit.c:1448

4508 +#: builtin/commit.c:1475

4509 msgid "commit all changed files"

4510 msgstr "checka in alla ändrade filer"

4511

4334 -#: builtin/commit.c:1449

4512 +#: builtin/commit.c:1476

4513 msgid "add specified files to index for commit"

4514 msgstr "lägg till angivna filer till indexet för incheckning"

4515

4338 -#: builtin/commit.c:1450

4516 +#: builtin/commit.c:1477

4517 msgid "interactively add files"

4518 msgstr "lägg till filer interaktivt"

4519

4342 -#: builtin/commit.c:1451

4520 +#: builtin/commit.c:1478

4521 msgid "interactively add changes"

4522 msgstr "lägg till ändringar interaktivt"

4523

4346 -#: builtin/commit.c:1452

4524 +#: builtin/commit.c:1479

4525 msgid "commit only specified files"

4526 msgstr "checka endast in angivna filer"

4527

4350 -#: builtin/commit.c:1453

4528 +#: builtin/commit.c:1480

4529 msgid "bypass pre-commit hook"

4530 msgstr "förbigå pre-commit-krok"

4531

4354 -#: builtin/commit.c:1454

4532 +#: builtin/commit.c:1481

4533 msgid "show what would be committed"

4534 msgstr "visa vad som skulle checkas in"

4535

4358 -#: builtin/commit.c:1465

4536 +#: builtin/commit.c:1492

4537 msgid "amend previous commit"

4538 msgstr "lägg till föregående incheckning"

4539

4362 -#: builtin/commit.c:1466

4540 +#: builtin/commit.c:1493

4541 msgid "bypass post-rewrite hook"

4542 msgstr "förbigå post-rewrite-krok"

4543

4366 -#: builtin/commit.c:1471

4544 +#: builtin/commit.c:1498

4545 msgid "ok to record an empty change"

4546 msgstr "ok att registrera en tom ändring"

4547

4370 -#: builtin/commit.c:1474

4548 +#: builtin/commit.c:1500

4549 msgid "ok to record a change with an empty message"

4550 msgstr "ok att registrera en ändring med tomt meddelande"

4551

4374 -#: builtin/commit.c:1507

4552 +#: builtin/commit.c:1529

4553 msgid "could not parse HEAD commit"

4554 msgstr "kunde inte tolka HEAD:s incheckning"

4555

4378 -#: builtin/commit.c:1545 builtin/merge.c:525

4556 +#: builtin/commit.c:1567 builtin/merge.c:525

4557 #, c-format

4558 msgid "could not open '%s' for reading"

4559 msgstr "kunde inte öppna \"%s\" för läsning"

4560

4383 -#: builtin/commit.c:1552

4561 +#: builtin/commit.c:1574

4562 #, c-format

4563 msgid "Corrupt MERGE_HEAD file (%s)"

4564 msgstr "Trasig MERGE_HEAD-fil (%s)"

4565

4388 -#: builtin/commit.c:1559

4566 +#: builtin/commit.c:1581

4567 msgid "could not read MERGE_MODE"

4568 msgstr "kunde inte läsa MERGE_MODE"

4569

4392 -#: builtin/commit.c:1578

4570 +#: builtin/commit.c:1600

4571 #, c-format

4572 msgid "could not read commit message: %s"

4573 msgstr "kunde inte läsa incheckningsmeddelande: %s"

4574

4397 -#: builtin/commit.c:1592

4575 +#: builtin/commit.c:1614

4576 #, c-format

4577 msgid "Aborting commit; you did not edit the message.\n"

4578 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"

4579

4402 -#: builtin/commit.c:1597

4580 +#: builtin/commit.c:1619

4581 #, c-format

4582 msgid "Aborting commit due to empty commit message.\n"

4583 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"

4584

4407 -#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886

4585 +#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886

4586 msgid "failed to write commit object"

4587 msgstr "kunde inte skriva incheckningsobjekt"

4588

4411 -#: builtin/commit.c:1633

4589 +#: builtin/commit.c:1655

4590 msgid "cannot lock HEAD ref"

4591 msgstr "kunde inte låsa HEAD-referens"

4592

4415 -#: builtin/commit.c:1637

4593 +#: builtin/commit.c:1659

4594 msgid "cannot update HEAD ref"

4595 msgstr "kunde inte uppdatera HEAD-referens"

4596

4419 -#: builtin/commit.c:1648

4597 +#: builtin/commit.c:1670

4598 msgid ""

4599 "Repository has been updated, but unable to write\n"

4600 "new_index file. Check that disk is not full or quota is\n"

@@ -4427,127 +4605,131 @@ msgstr ""

4605 "att kvoten inte har överskridits, och kör sedan\n"

4606 "\"git reset HEAD\" för att återställa."

4607

4430 -#: builtin/config.c:7

4608 +#: builtin/config.c:8

4609 msgid "git config [options]"

4610 msgstr "git config [flaggor]"

4611

4434 -#: builtin/config.c:52

4612 +#: builtin/config.c:54

4613 msgid "Config file location"

4614 msgstr "Konfigurationsfilens plats"

4615

4438 -#: builtin/config.c:53

4616 +#: builtin/config.c:55

4617 msgid "use global config file"

4618 msgstr "använd global konfigurationsfil"

4619

4442 -#: builtin/config.c:54

4620 +#: builtin/config.c:56

4621 msgid "use system config file"

4622 msgstr "använd systemets konfigurationsfil"

4623

4446 -#: builtin/config.c:55

4624 +#: builtin/config.c:57

4625 msgid "use repository config file"

4626 msgstr "använd arkivets konfigurationsfil"

4627

4450 -#: builtin/config.c:56

4628 +#: builtin/config.c:58

4629 msgid "use given config file"

4630 msgstr "använd angiven konfigurationsil"

4631

4454 -#: builtin/config.c:57

4632 +#: builtin/config.c:59

4633 msgid "blob-id"

4634 msgstr "blob-id"

4635

4458 -#: builtin/config.c:57

4636 +#: builtin/config.c:59

4637 msgid "read config from given blob object"

4638 msgstr "läs konfiguration från givet blob-objekt"

4639

4462 -#: builtin/config.c:58

4640 +#: builtin/config.c:60

4641 msgid "Action"

4642 msgstr "Åtgärd"

4643

4466 -#: builtin/config.c:59

4644 +#: builtin/config.c:61

4645 msgid "get value: name [value-regex]"

4646 msgstr "hämta värde: namn [värde-reguttr]"

4647

4470 -#: builtin/config.c:60

4648 +#: builtin/config.c:62

4649 msgid "get all values: key [value-regex]"

4650 msgstr "hämta alla värden: nyckel [värde-reguttr]"

4651

4474 -#: builtin/config.c:61

4652 +#: builtin/config.c:63

4653 msgid "get values for regexp: name-regex [value-regex]"

4654 msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]"

4655

4478 -#: builtin/config.c:62

4656 +#: builtin/config.c:64

4657 +msgid "get value specific for the URL: section[.var] URL"

4658 +msgstr "hämta värde specifikt URL:en: sektion[.var] URL"

4659 +

4660 +#: builtin/config.c:65

4661 msgid "replace all matching variables: name value [value_regex]"

4662 msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"

4663

4482 -#: builtin/config.c:63

4664 +#: builtin/config.c:66

4665 msgid "add a new variable: name value"

4666 msgstr "lägg till en ny variabel: namn värde"

4667

4486 -#: builtin/config.c:64

4668 +#: builtin/config.c:67

4669 msgid "remove a variable: name [value-regex]"

4670 msgstr "ta bort en variabel: namn [värde-reguttr]"

4671

4490 -#: builtin/config.c:65

4672 +#: builtin/config.c:68

4673 msgid "remove all matches: name [value-regex]"

4674 msgstr "ta bort alla träffar: namn [värde-reguttr]"

4675

4494 -#: builtin/config.c:66

4676 +#: builtin/config.c:69

4677 msgid "rename section: old-name new-name"

4678 msgstr "byt namn på sektion: gammalt-namn nytt-namn"

4679

4498 -#: builtin/config.c:67

4680 +#: builtin/config.c:70

4681 msgid "remove a section: name"

4682 msgstr "ta bort en sektion: namn"

4683

4502 -#: builtin/config.c:68

4684 +#: builtin/config.c:71

4685 msgid "list all"

4686 msgstr "visa alla"

4687

4506 -#: builtin/config.c:69

4688 +#: builtin/config.c:72

4689 msgid "open an editor"

4690 msgstr "öppna textredigeringsprogram"

4691

4510 -#: builtin/config.c:70 builtin/config.c:71

4692 +#: builtin/config.c:73 builtin/config.c:74

4693 msgid "slot"

4694 msgstr "plats"

4695

4514 -#: builtin/config.c:70

4696 +#: builtin/config.c:73

4697 msgid "find the color configured: [default]"

4698 msgstr "hitta den inställda färgen: [default]"

4699

4518 -#: builtin/config.c:71

4700 +#: builtin/config.c:74

4701 msgid "find the color setting: [stdout-is-tty]"

4702 msgstr "hitta färginställningen: [stdout-is-tty]"

4703

4522 -#: builtin/config.c:72

4704 +#: builtin/config.c:75

4705 msgid "Type"

4706 msgstr "Typ"

4707

4526 -#: builtin/config.c:73

4708 +#: builtin/config.c:76

4709 msgid "value is \"true\" or \"false\""

4710 msgstr "värdet är \"true\" eller \"false\""

4711

4530 -#: builtin/config.c:74

4712 +#: builtin/config.c:77

4713 msgid "value is decimal number"

4714 msgstr "värdet är ett decimalt tal"

4715

4534 -#: builtin/config.c:75

4716 +#: builtin/config.c:78

4717 msgid "value is --bool or --int"

4718 msgstr "värdet är --bool eller --int"

4719

4538 -#: builtin/config.c:76

4720 +#: builtin/config.c:79

4721 msgid "value is a path (file or directory name)"

4722 msgstr "värdet är en sökväg (fil- eller katalognamn)"

4723

4542 -#: builtin/config.c:77

4724 +#: builtin/config.c:80

4725 msgid "Other"

4726 msgstr "Andra"

4727

4546 -#: builtin/config.c:78

4728 +#: builtin/config.c:81

4729 msgid "terminate values with NUL byte"

4730 msgstr "terminera värden med NUL-byte"

4731

4550 -#: builtin/config.c:79

4732 +#: builtin/config.c:82

4733 msgid "respect include directives on lookup"

4734 msgstr "respektera inkluderingsdirektiv vid uppslag"

4735

@@ -4732,39 +4914,39 @@ msgstr "ej hanterat objekt \"%s\" angavs."

4914 msgid "git fast-export [rev-list-opts]"

4915 msgstr "git fast-export [rev-list-flaggor]"

4916

4735 -#: builtin/fast-export.c:666

4917 +#: builtin/fast-export.c:673

4918 msgid "show progress after <n> objects"

4919 msgstr "visa förlopp efter <n> objekt"

4920

4739 -#: builtin/fast-export.c:668

4921 +#: builtin/fast-export.c:675

4922 msgid "select handling of signed tags"

4923 msgstr "välj hantering av signerade taggar"

4924

4743 -#: builtin/fast-export.c:671

4925 +#: builtin/fast-export.c:678

4926 msgid "select handling of tags that tag filtered objects"

4927 msgstr "välj hantering av taggar som har taggfiltrerade objekt"

4928

4747 -#: builtin/fast-export.c:674

4929 +#: builtin/fast-export.c:681

4930 msgid "Dump marks to this file"

4931 msgstr "Dump märken till filen"

4932

4751 -#: builtin/fast-export.c:676

4933 +#: builtin/fast-export.c:683

4934 msgid "Import marks from this file"

4935 msgstr "Importera märken från filen"

4936

4755 -#: builtin/fast-export.c:678

4937 +#: builtin/fast-export.c:685

4938 msgid "Fake a tagger when tags lack one"

4939 msgstr "Fejka taggare när taggen saknar en"

4940

4759 -#: builtin/fast-export.c:680

4941 +#: builtin/fast-export.c:687

4942 msgid "Output full tree for each commit"

4943 msgstr "Skriv ut hela trädet för varje incheckning"

4944

4763 -#: builtin/fast-export.c:682

4945 +#: builtin/fast-export.c:689

4946 msgid "Use the done feature to terminate the stream"

4947 msgstr "Använd done-funktionen för att avsluta strömmen"

4948

4767 -#: builtin/fast-export.c:683

4949 +#: builtin/fast-export.c:690

4950 msgid "Skip output of blob data"

4951 msgstr "Hoppa över skrivning av blob-data"

4952

@@ -4784,144 +4966,144 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"

4966 msgid "git fetch --all [<options>]"

4967 msgstr "git fetch --all [<flaggor>]"

4968

4787 -#: builtin/fetch.c:60

4969 +#: builtin/fetch.c:74

4970 msgid "fetch from all remotes"

4971 msgstr "hämta från alla fjärrar"

4972

4791 -#: builtin/fetch.c:62

4973 +#: builtin/fetch.c:76

4974 msgid "append to .git/FETCH_HEAD instead of overwriting"

4975 msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"

4976

4795 -#: builtin/fetch.c:64

4977 +#: builtin/fetch.c:78

4978 msgid "path to upload pack on remote end"

4979 msgstr "sökväg till upload pack på fjärren"

4980

4799 -#: builtin/fetch.c:65

4981 +#: builtin/fetch.c:79

4982 msgid "force overwrite of local branch"

4983 msgstr "tvinga överskrivning av lokal gren"

4984

4803 -#: builtin/fetch.c:67

4985 +#: builtin/fetch.c:81

4986 msgid "fetch from multiple remotes"

4987 msgstr "hämta från flera fjärrar"

4988

4807 -#: builtin/fetch.c:69

4989 +#: builtin/fetch.c:83

4990 msgid "fetch all tags and associated objects"

4991 msgstr "hämta alla taggar och associerade objekt"

4992

4811 -#: builtin/fetch.c:71

4993 +#: builtin/fetch.c:85

4994 msgid "do not fetch all tags (--no-tags)"

4995 msgstr "hämta inte alla taggar (--no-tags)"

4996

4815 -#: builtin/fetch.c:73

4997 +#: builtin/fetch.c:87

4998 msgid "prune remote-tracking branches no longer on remote"

4999 msgstr "rensa fjärrspårande grenar ej längre på fjärren"

5000

4819 -#: builtin/fetch.c:74

5001 +#: builtin/fetch.c:88

5002 msgid "on-demand"

5003 msgstr "on-demand"

5004

4823 -#: builtin/fetch.c:75

5005 +#: builtin/fetch.c:89

5006 msgid "control recursive fetching of submodules"

5007 msgstr "styr rekursiv hämtning av undermoduler"

5008

4827 -#: builtin/fetch.c:79

5009 +#: builtin/fetch.c:93

5010 msgid "keep downloaded pack"

5011 msgstr "behåll hämtade paket"

5012

4831 -#: builtin/fetch.c:81

5013 +#: builtin/fetch.c:95

5014 msgid "allow updating of HEAD ref"

5015 msgstr "tillåt uppdatering av HEAD-referens"

5016

4835 -#: builtin/fetch.c:84

5017 +#: builtin/fetch.c:98

5018 msgid "deepen history of shallow clone"

5019 msgstr "fördjupa historik för grund klon"

5020

4839 -#: builtin/fetch.c:86

5021 +#: builtin/fetch.c:100

5022 msgid "convert to a complete repository"

5023 msgstr "konvertera till komplett arkiv"

5024

4843 -#: builtin/fetch.c:88 builtin/log.c:1177

5025 +#: builtin/fetch.c:102 builtin/log.c:1197

5026 msgid "dir"

5027 msgstr "kat"

5028

4847 -#: builtin/fetch.c:89

5029 +#: builtin/fetch.c:103

5030 msgid "prepend this to submodule path output"

5031 msgstr "lägg till i början av undermodulens sökvägsutdata"

5032

4851 -#: builtin/fetch.c:92

5033 +#: builtin/fetch.c:106

5034 msgid "default mode for recursion"

5035 msgstr "standardläge för rekursion"

5036

4855 -#: builtin/fetch.c:220

5037 +#: builtin/fetch.c:236

5038 msgid "Couldn't find remote ref HEAD"

5039 msgstr "Kunde inte hitta fjärr-referensen HEAD"

5040

4859 -#: builtin/fetch.c:273

5041 +#: builtin/fetch.c:290

5042 #, c-format

5043 msgid "object %s not found"

5044 msgstr "objektet %s hittades inte"

5045

4864 -#: builtin/fetch.c:278

5046 +#: builtin/fetch.c:295

5047 msgid "[up to date]"

5048 msgstr "[àjour]"

5049

4868 -#: builtin/fetch.c:292

5050 +#: builtin/fetch.c:309

5051 #, c-format

5052 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5053 msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)"

5054

4873 -#: builtin/fetch.c:293 builtin/fetch.c:379

5055 +#: builtin/fetch.c:310 builtin/fetch.c:396

5056 msgid "[rejected]"

5057 msgstr "[refuserad]"

5058

4877 -#: builtin/fetch.c:304

5059 +#: builtin/fetch.c:321

5060 msgid "[tag update]"

5061 msgstr "[uppdaterad tagg]"

5062

4881 -#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359

5063 +#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376

5064 msgid " (unable to update local ref)"

5065 msgstr " (kunde inte uppdatera lokal ref)"

5066

4885 -#: builtin/fetch.c:324

5067 +#: builtin/fetch.c:341

5068 msgid "[new tag]"

5069 msgstr "[ny tagg]"

5070

4889 -#: builtin/fetch.c:327

5071 +#: builtin/fetch.c:344

5072 msgid "[new branch]"

5073 msgstr "[ny gren]"

5074

4893 -#: builtin/fetch.c:330

5075 +#: builtin/fetch.c:347

5076 msgid "[new ref]"

5077 msgstr "[ny ref]"

5078

4897 -#: builtin/fetch.c:375

5079 +#: builtin/fetch.c:392

5080 msgid "unable to update local ref"

5081 msgstr "kunde inte uppdatera lokal ref"

5082

4901 -#: builtin/fetch.c:375

5083 +#: builtin/fetch.c:392

5084 msgid "forced update"

5085 msgstr "tvingad uppdatering"

5086

4905 -#: builtin/fetch.c:381

5087 +#: builtin/fetch.c:398

5088 msgid "(non-fast-forward)"

5089 msgstr "(ej snabbspolad)"

5090

4909 -#: builtin/fetch.c:412 builtin/fetch.c:718

5091 +#: builtin/fetch.c:429 builtin/fetch.c:735

5092 #, c-format

5093 msgid "cannot open %s: %s\n"

5094 msgstr "kan inte öppna %s: %s\n"

5095

4914 -#: builtin/fetch.c:421

5096 +#: builtin/fetch.c:438

5097 #, c-format

5098 msgid "%s did not send all necessary objects\n"

5099 msgstr "%s sände inte alla nödvändiga objekt\n"

5100

4919 -#: builtin/fetch.c:520

5101 +#: builtin/fetch.c:537

5102 #, c-format

5103 msgid "From %.*s\n"

5104 msgstr "Från %.*s\n"

5105

4924 -#: builtin/fetch.c:531

5106 +#: builtin/fetch.c:548

5107 #, c-format

5108 msgid ""

5109 "some local refs could not be updated; try running\n"

@@ -4930,55 +5112,55 @@ msgstr ""

5112 "vissa lokala referenser kunde inte uppdateras; testa att köra\n"

5113 " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"

5114

4933 -#: builtin/fetch.c:581

5115 +#: builtin/fetch.c:598

5116 #, c-format

5117 msgid " (%s will become dangling)"

5118 msgstr " (%s kommer bli dinglande)"

5119

4938 -#: builtin/fetch.c:582

5120 +#: builtin/fetch.c:599

5121 #, c-format

5122 msgid " (%s has become dangling)"

5123 msgstr " (%s har blivit dinglande)"

5124

4943 -#: builtin/fetch.c:589

5125 +#: builtin/fetch.c:606

5126 msgid "[deleted]"

5127 msgstr "[borttagen]"

5128

4947 -#: builtin/fetch.c:590 builtin/remote.c:1055

5129 +#: builtin/fetch.c:607 builtin/remote.c:1055

5130 msgid "(none)"

5131 msgstr "(ingen)"

5132

4951 -#: builtin/fetch.c:708

5133 +#: builtin/fetch.c:725

5134 #, c-format

5135 msgid "Refusing to fetch into current branch %s of non-bare repository"

5136 msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"

5137

4956 -#: builtin/fetch.c:742

4957 -#, c-format

4958 -msgid "Don't know how to fetch from %s"

4959 -msgstr "Vet inte hur man hämtar från %s"

4960 -

4961 -#: builtin/fetch.c:823

5138 +#: builtin/fetch.c:744

5139 #, c-format

5140 msgid "Option \"%s\" value \"%s\" is not valid for %s"

5141 msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"

5142

4966 -#: builtin/fetch.c:826

5143 +#: builtin/fetch.c:747

5144 #, c-format

5145 msgid "Option \"%s\" is ignored for %s\n"

5146 msgstr "Flaggan \"%s\" ignoreras för %s\n"

5147

4971 -#: builtin/fetch.c:928

5148 +#: builtin/fetch.c:801

5149 +#, c-format

5150 +msgid "Don't know how to fetch from %s"

5151 +msgstr "Vet inte hur man hämtar från %s"

5152 +

5153 +#: builtin/fetch.c:976

5154 #, c-format

5155 msgid "Fetching %s\n"

5156 msgstr "Hämtar %s\n"

5157

4976 -#: builtin/fetch.c:930 builtin/remote.c:100

5158 +#: builtin/fetch.c:978 builtin/remote.c:100

5159 #, c-format

5160 msgid "Could not fetch %s"

5161 msgstr "Kunde inte hämta %s"

5162

4981 -#: builtin/fetch.c:949

5163 +#: builtin/fetch.c:997

5164 msgid ""

5165 "No remote repository specified. Please, specify either a URL or a\n"

5166 "remote name from which new revisions should be fetched."

@@ -4986,32 +5168,32 @@ msgstr ""

5168 "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"

5169 "fjärrarkiv som nya incheckningar skall hämtas från."

5170

4989 -#: builtin/fetch.c:969

5171 +#: builtin/fetch.c:1020

5172 msgid "You need to specify a tag name."

5173 msgstr "Du måste ange namnet på en tagg."

5174

4993 -#: builtin/fetch.c:1015

5175 +#: builtin/fetch.c:1068

5176 msgid "--depth and --unshallow cannot be used together"

5177 msgstr "--depth och --unshallow kan inte användas samtidigt"

5178

4997 -#: builtin/fetch.c:1017

5179 +#: builtin/fetch.c:1070

5180 msgid "--unshallow on a complete repository does not make sense"

5181 msgstr "--unshallow kan inte användas på ett komplett arkiv"

5182

5001 -#: builtin/fetch.c:1036

5183 +#: builtin/fetch.c:1089

5184 msgid "fetch --all does not take a repository argument"

5185 msgstr "fetch --all tar inte namnet på ett arkiv som argument"

5186

5005 -#: builtin/fetch.c:1038

5187 +#: builtin/fetch.c:1091

5188 msgid "fetch --all does not make sense with refspecs"

5189 msgstr "fetch --all kan inte anges med referensspecifikationer"

5190

5009 -#: builtin/fetch.c:1049

5191 +#: builtin/fetch.c:1102

5192 #, c-format

5193 msgid "No such remote or remote group: %s"

5194 msgstr "Fjärren eller fjärrgruppen finns inte: %s"

5195

5014 -#: builtin/fetch.c:1057

5196 +#: builtin/fetch.c:1110

5197 msgid "Fetching a group and specifying refspecs does not make sense"

5198 msgstr "Kan inte hämta från grupp och ange referensspecifikationer"

5199

@@ -5020,9 +5202,9 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5202 msgstr ""

5203 "git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]"

5204

5023 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700

5024 -#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179

5025 -#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243

5205 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702

5206 +#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178

5207 +#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245

5208 msgid "n"

5209 msgstr "n"

5210

@@ -5046,117 +5228,121 @@ msgstr "inled meddelande med <text>"

5228 msgid "file to read from"

5229 msgstr "fil att läsa från"

5230

5049 -#: builtin/for-each-ref.c:979

5231 +#: builtin/for-each-ref.c:995

5232 msgid "git for-each-ref [options] [<pattern>]"

5233 msgstr "git for-each-ref [flaggor] [<mönster>]"

5234

5053 -#: builtin/for-each-ref.c:994

5235 +#: builtin/for-each-ref.c:1010

5236 msgid "quote placeholders suitably for shells"

5237 msgstr "citera platshållare passande för skal"

5238

5057 -#: builtin/for-each-ref.c:996

5239 +#: builtin/for-each-ref.c:1012

5240 msgid "quote placeholders suitably for perl"

5241 msgstr "citera platshållare passande för perl"

5242

5061 -#: builtin/for-each-ref.c:998

5243 +#: builtin/for-each-ref.c:1014

5244 msgid "quote placeholders suitably for python"

5245 msgstr "citera platshållare passande för python"

5246

5065 -#: builtin/for-each-ref.c:1000

5247 +#: builtin/for-each-ref.c:1016

5248 msgid "quote placeholders suitably for tcl"

5249 msgstr "citera platshållare passande för tcl"

5250

5069 -#: builtin/for-each-ref.c:1003

5251 +#: builtin/for-each-ref.c:1019

5252 msgid "show only <n> matched refs"

5253 msgstr "visa endast <n> träffade refs"

5254

5073 -#: builtin/for-each-ref.c:1004

5255 +#: builtin/for-each-ref.c:1020

5256 msgid "format"

5257 msgstr "format"

5258

5077 -#: builtin/for-each-ref.c:1004

5259 +#: builtin/for-each-ref.c:1020

5260 msgid "format to use for the output"

5261 msgstr "format att använda för utdata"

5262

5081 -#: builtin/for-each-ref.c:1005

5263 +#: builtin/for-each-ref.c:1021

5264 msgid "key"

5265 msgstr "nyckel"

5266

5085 -#: builtin/for-each-ref.c:1006

5267 +#: builtin/for-each-ref.c:1022

5268 msgid "field name to sort on"

5269 msgstr "fältnamn att sortera på"

5270

5089 -#: builtin/fsck.c:608

5271 +#: builtin/fsck.c:607

5272 msgid "git fsck [options] [<object>...]"

5273 msgstr "git fsck [flaggor] [<objekt>...]"

5274

5093 -#: builtin/fsck.c:614

5275 +#: builtin/fsck.c:613

5276 msgid "show unreachable objects"

5277 msgstr "visa onåbara objekt"

5278

5097 -#: builtin/fsck.c:615

5279 +#: builtin/fsck.c:614

5280 msgid "show dangling objects"

5281 msgstr "visa dinglande objekt"

5282

5101 -#: builtin/fsck.c:616

5283 +#: builtin/fsck.c:615

5284 msgid "report tags"

5285 msgstr "rapportera taggar"

5286

5105 -#: builtin/fsck.c:617

5287 +#: builtin/fsck.c:616

5288 msgid "report root nodes"

5289 msgstr "rapportera rotnoder"

5290

5109 -#: builtin/fsck.c:618

5291 +#: builtin/fsck.c:617

5292 msgid "make index objects head nodes"

5293 msgstr "gör indexojekt till huvudnoder"

5294

5113 -#: builtin/fsck.c:619

5295 +#: builtin/fsck.c:618

5296 msgid "make reflogs head nodes (default)"

5297 msgstr "gör refloggar till huvudnoder (standard)"

5298

5117 -#: builtin/fsck.c:620

5299 +#: builtin/fsck.c:619

5300 msgid "also consider packs and alternate objects"

5301 msgstr "ta även hänsyn till paket och alternativa objekt"

5302

5121 -#: builtin/fsck.c:621

5303 +#: builtin/fsck.c:620

5304 msgid "enable more strict checking"

5305 msgstr "aktivera striktare kontroll"

5306

5125 -#: builtin/fsck.c:623

5307 +#: builtin/fsck.c:622

5308 msgid "write dangling objects in .git/lost-found"

5309 msgstr "skriv dinglande objekt i .git/lost-found"

5310

5129 -#: builtin/fsck.c:624 builtin/prune.c:134

5311 +#: builtin/fsck.c:623 builtin/prune.c:134

5312 msgid "show progress"

5313 msgstr "visa förlopp"

5314

5133 -#: builtin/gc.c:22

5315 +#: builtin/gc.c:23

5316 msgid "git gc [options]"

5317 msgstr "git gc [flaggor]"

5318

5137 -#: builtin/gc.c:63

5319 +#: builtin/gc.c:79

5320 #, c-format

5321 msgid "Invalid %s: '%s'"

5322 msgstr "Felaktigt %s: \"%s\""

5323

5142 -#: builtin/gc.c:90

5324 +#: builtin/gc.c:106

5325 #, c-format

5326 msgid "insanely long object directory %.*s"

5327 msgstr "tokigt lång objektkatalog %.*s"

5328

5147 -#: builtin/gc.c:179

5329 +#: builtin/gc.c:261

5330 msgid "prune unreferenced objects"

5331 msgstr "rensa ej refererade objekt"

5332

5151 -#: builtin/gc.c:181

5333 +#: builtin/gc.c:263

5334 msgid "be more thorough (increased runtime)"

5335 msgstr "var mer grundlig (ökar körtiden)"

5336

5155 -#: builtin/gc.c:182

5337 +#: builtin/gc.c:264

5338 msgid "enable auto-gc mode"

5339 msgstr "aktivera auto-gc-läge"

5340

5159 -#: builtin/gc.c:222

5341 +#: builtin/gc.c:265

5342 +msgid "force running gc even if there may be another gc running"

5343 +msgstr "tvinga gc-körning även om en annan gc kanske körs"

5344 +

5345 +#: builtin/gc.c:305

5346 #, c-format

5347 msgid ""

5348 "Auto packing the repository for optimum performance. You may also\n"

@@ -5165,43 +5351,52 @@ msgstr ""

5351 "Packar arkivet automatiskt för optimal prestanda. Du kan även\n"

5352 "köra \"git gc\" manuellt. Se \"git help gc\" för mer information.\n"

5353

5168 -#: builtin/gc.c:249

5354 +#. be quiet on --auto

5355 +#: builtin/gc.c:315

5356 +#, c-format

5357 +msgid ""

5358 +"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

5359 +msgstr ""

5360 +"gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "

5361 +"är fallet)"

5362 +

5363 +#: builtin/gc.c:340

5364 msgid ""

5365 "There are too many unreachable loose objects; run 'git prune' to remove them."

5366 msgstr ""

5367 "Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort "

5368 "dem."

5369

5175 -#: builtin/grep.c:22

5370 +#: builtin/grep.c:23

5371 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"

5372 msgstr "git grep [flaggor] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"

5373

5179 -#: builtin/grep.c:217

5374 +#: builtin/grep.c:218

5375 #, c-format

5376 msgid "grep: failed to create thread: %s"

5377 msgstr "grep: misslyckades skapa tråd. %s"

5378

5184 -#: builtin/grep.c:364

5379 +#: builtin/grep.c:365

5380 #, c-format

5381 msgid "Failed to chdir: %s"

5382 msgstr "Kunde inte byta katalog (chdir): %s"

5383

5189 -#: builtin/grep.c:442 builtin/grep.c:477

5384 +#: builtin/grep.c:443 builtin/grep.c:478

5385 #, c-format

5386 msgid "unable to read tree (%s)"

5387 msgstr "kunde inte läsa träd (%s)"

5388

5194 -#: builtin/grep.c:492

5389 +#: builtin/grep.c:493

5390 #, c-format

5391 msgid "unable to grep from object of type %s"

5392 msgstr "Kunde inte \"grep\" från objekt av typen %s"

5393

5199 -#: builtin/grep.c:550

5394 +#: builtin/grep.c:551

5395 #, c-format

5396 msgid "switch `%c' expects a numerical value"

5397 msgstr "flaggan \"%c\" antar ett numeriskt värde"

5398

5204 -#: builtin/grep.c:567

5399 +#: builtin/grep.c:568

5400 #, c-format

5401 msgid "cannot open '%s'"

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

@@ -5243,158 +5438,162 @@ msgid "don't match patterns in binary files"

5438 msgstr "träffa inte mönster i binärfiler"

5439

5440 #: builtin/grep.c:662

5441 +msgid "process binary files with textconv filters"

5442 +msgstr "hantera binärfiler med textconv-filter"

5443 +

5444 +#: builtin/grep.c:664

5445 msgid "descend at most <depth> levels"

5446 msgstr "gå som mest ned <djup> nivåer"

5447

5249 -#: builtin/grep.c:666

5448 +#: builtin/grep.c:668

5449 msgid "use extended POSIX regular expressions"

5450 msgstr "använd utökade POSIX-reguljära uttryck"

5451

5253 -#: builtin/grep.c:669

5452 +#: builtin/grep.c:671

5453 msgid "use basic POSIX regular expressions (default)"

5454 msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"

5455

5257 -#: builtin/grep.c:672

5456 +#: builtin/grep.c:674

5457 msgid "interpret patterns as fixed strings"

5458 msgstr "tolka mönster som fixerade strängar"

5459

5261 -#: builtin/grep.c:675

5460 +#: builtin/grep.c:677

5461 msgid "use Perl-compatible regular expressions"

5462 msgstr "använd Perlkompatibla reguljära uttryck"

5463

5265 -#: builtin/grep.c:678

5464 +#: builtin/grep.c:680

5465 msgid "show line numbers"

5466 msgstr "visa radnummer"

5467

5269 -#: builtin/grep.c:679

5468 +#: builtin/grep.c:681

5469 msgid "don't show filenames"

5470 msgstr "visa inte filnamn"

5471

5273 -#: builtin/grep.c:680

5472 +#: builtin/grep.c:682

5473 msgid "show filenames"

5474 msgstr "visa filnamn"

5475

5277 -#: builtin/grep.c:682

5476 +#: builtin/grep.c:684

5477 msgid "show filenames relative to top directory"

5478 msgstr "visa filnamn relativa till toppkatalogen"

5479

5281 -#: builtin/grep.c:684

5480 +#: builtin/grep.c:686

5481 msgid "show only filenames instead of matching lines"

5482 msgstr "visa endast filnamn istället för träffade rader"

5483

5285 -#: builtin/grep.c:686

5484 +#: builtin/grep.c:688

5485 msgid "synonym for --files-with-matches"

5486 msgstr "synonym för --files-with-matches"

5487

5289 -#: builtin/grep.c:689

5488 +#: builtin/grep.c:691

5489 msgid "show only the names of files without match"

5490 msgstr "visa endast namn på filer utan träffar"

5491

5293 -#: builtin/grep.c:691

5492 +#: builtin/grep.c:693

5493 msgid "print NUL after filenames"

5494 msgstr "skriv NUL efter filnamn"

5495

5297 -#: builtin/grep.c:693

5496 +#: builtin/grep.c:695

5497 msgid "show the number of matches instead of matching lines"

5498 msgstr "visa antal träffar istället för träffade rader"

5499

5301 -#: builtin/grep.c:694

5500 +#: builtin/grep.c:696

5501 msgid "highlight matches"

5502 msgstr "ljusmarkera träffar"

5503

5305 -#: builtin/grep.c:696

5504 +#: builtin/grep.c:698

5505 msgid "print empty line between matches from different files"

5506 msgstr "skriv tomma rader mellan träffar från olika filer"

5507

5309 -#: builtin/grep.c:698

5508 +#: builtin/grep.c:700

5509 msgid "show filename only once above matches from same file"

5510 msgstr "visa filnamn endast en gång ovanför träffar från samma fil"

5511

5313 -#: builtin/grep.c:701

5512 +#: builtin/grep.c:703

5513 msgid "show <n> context lines before and after matches"

5514 msgstr "visa <n> rader sammanhang före och efter träffar"

5515

5317 -#: builtin/grep.c:704

5516 +#: builtin/grep.c:706

5517 msgid "show <n> context lines before matches"

5518 msgstr "visa <n> rader sammanhang före träffar"

5519

5321 -#: builtin/grep.c:706

5520 +#: builtin/grep.c:708

5521 msgid "show <n> context lines after matches"

5522 msgstr "visa <n> rader sammanhang efter träffar"

5523

5325 -#: builtin/grep.c:707

5524 +#: builtin/grep.c:709

5525 msgid "shortcut for -C NUM"

5526 msgstr "genväg för -C NUM"

5527

5329 -#: builtin/grep.c:710

5528 +#: builtin/grep.c:712

5529 msgid "show a line with the function name before matches"

5530 msgstr "visa en rad med funktionsnamnet före träffen"

5531

5333 -#: builtin/grep.c:712

5532 +#: builtin/grep.c:714

5533 msgid "show the surrounding function"

5534 msgstr "visa den omkringliggande funktionen"

5535

5337 -#: builtin/grep.c:715

5536 +#: builtin/grep.c:717

5537 msgid "read patterns from file"

5538 msgstr "läs mönster från fil"

5539

5341 -#: builtin/grep.c:717

5540 +#: builtin/grep.c:719

5541 msgid "match <pattern>"

5542 msgstr "träffa <mönster>"

5543

5345 -#: builtin/grep.c:719

5544 +#: builtin/grep.c:721

5545 msgid "combine patterns specified with -e"

5546 msgstr "kombinera mönster som anges med -e"

5547

5349 -#: builtin/grep.c:731

5548 +#: builtin/grep.c:733

5549 msgid "indicate hit with exit status without output"

5550 msgstr "ange träff med slutstatuskod utan utdata"

5551

5353 -#: builtin/grep.c:733

5552 +#: builtin/grep.c:735

5553 msgid "show only matches from files that match all patterns"

5554 msgstr "visa endast träffar från filer som träffar alla mönster"

5555

5357 -#: builtin/grep.c:735

5556 +#: builtin/grep.c:737

5557 msgid "show parse tree for grep expression"

5558 msgstr "visa analysträd för grep-uttryck"

5559

5361 -#: builtin/grep.c:739

5560 +#: builtin/grep.c:741

5561 msgid "pager"

5562 msgstr "bläddrare"

5563

5365 -#: builtin/grep.c:739

5564 +#: builtin/grep.c:741

5565 msgid "show matching files in the pager"

5566 msgstr "visa träffade filer i filbläddraren"

5567

5369 -#: builtin/grep.c:742

5568 +#: builtin/grep.c:744

5569 msgid "allow calling of grep(1) (ignored by this build)"

5570 msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"

5571

5373 -#: builtin/grep.c:743 builtin/show-ref.c:188

5572 +#: builtin/grep.c:745 builtin/show-ref.c:187

5573 msgid "show usage"

5574 msgstr "visa användning"

5575

5377 -#: builtin/grep.c:810

5576 +#: builtin/grep.c:812

5577 msgid "no pattern given."

5578 msgstr "inget mönster angavs."

5579

5381 -#: builtin/grep.c:865

5580 +#: builtin/grep.c:870

5581 msgid "--open-files-in-pager only works on the worktree"

5582 msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"

5583

5385 -#: builtin/grep.c:888

5584 +#: builtin/grep.c:893

5585 msgid "--cached or --untracked cannot be used with --no-index."

5586 msgstr "--cached och --untracked kan inte användas med --no-index."

5587

5389 -#: builtin/grep.c:893

5588 +#: builtin/grep.c:898

5589 msgid "--no-index or --untracked cannot be used with revs."

5590 msgstr "--no-index och --untracked kan inte användas med revisioner."

5591

5393 -#: builtin/grep.c:896

5592 +#: builtin/grep.c:901

5593 msgid "--[no-]exclude-standard cannot be used for tracked contents."

5594 msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."

5595

5397 -#: builtin/grep.c:904

5596 +#: builtin/grep.c:909

5597 msgid "both --cached and trees are given."

5598 msgstr "både --cached och träd angavs."

5599

@@ -5649,8 +5848,8 @@ msgstr "allvarlig inflate-inkonsekvens"

5848 msgid "SHA1 COLLISION FOUND WITH %s !"

5849 msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"

5850

5652 -#: builtin/index-pack.c:669 builtin/pack-objects.c:170

5653 -#: builtin/pack-objects.c:262

5851 +#: builtin/index-pack.c:669 builtin/pack-objects.c:171

5852 +#: builtin/pack-objects.c:263

5853 #, c-format

5854 msgid "unable to read %s"

5855 msgstr "kunde inte läsa %s"

@@ -5679,155 +5878,155 @@ msgstr "Fel i objekt"

5878 msgid "Not all child objects of %s are reachable"

5879 msgstr "Inte alla barnobjekt för %s kan nås"

5880

5682 -#: builtin/index-pack.c:838 builtin/index-pack.c:868

5881 +#: builtin/index-pack.c:839 builtin/index-pack.c:869

5882 msgid "failed to apply delta"

5883 msgstr "misslyckades tillämpa delta"

5884

5686 -#: builtin/index-pack.c:1009

5885 +#: builtin/index-pack.c:1010

5886 msgid "Receiving objects"

5887 msgstr "Tar emot objekt"

5888

5690 -#: builtin/index-pack.c:1009

5889 +#: builtin/index-pack.c:1010

5890 msgid "Indexing objects"

5891 msgstr "Skapar index för objekt"

5892

5694 -#: builtin/index-pack.c:1035

5893 +#: builtin/index-pack.c:1036

5894 msgid "pack is corrupted (SHA1 mismatch)"

5895 msgstr "paketet är trasigt (SHA1 stämmer inte)"

5896

5698 -#: builtin/index-pack.c:1040

5897 +#: builtin/index-pack.c:1041

5898 msgid "cannot fstat packfile"

5899 msgstr "kan inte utföra \"fstat\" på paketfil"

5900

5702 -#: builtin/index-pack.c:1043

5901 +#: builtin/index-pack.c:1044

5902 msgid "pack has junk at the end"

5903 msgstr "paket har skräp i slutet"

5904

5706 -#: builtin/index-pack.c:1054

5905 +#: builtin/index-pack.c:1055

5906 msgid "confusion beyond insanity in parse_pack_objects()"

5907 msgstr "förvirrad bortom vanvett i parse_pack_objects()"

5908

5710 -#: builtin/index-pack.c:1077

5909 +#: builtin/index-pack.c:1078

5910 msgid "Resolving deltas"

5911 msgstr "Analyserar delta"

5912

5714 -#: builtin/index-pack.c:1087

5913 +#: builtin/index-pack.c:1088

5914 #, c-format

5915 msgid "unable to create thread: %s"

5916 msgstr "kunde inte skapa tråd: %s"

5917

5719 -#: builtin/index-pack.c:1129

5918 +#: builtin/index-pack.c:1130

5919 msgid "confusion beyond insanity"

5920 msgstr "förvirrad bortom vanvett"

5921

5723 -#: builtin/index-pack.c:1137

5922 +#: builtin/index-pack.c:1138

5923 #, c-format

5924 msgid "completed with %d local objects"

5925 msgstr "slutfördes med %d lokala objekt"

5926

5728 -#: builtin/index-pack.c:1147

5927 +#: builtin/index-pack.c:1148

5928 #, c-format

5929 msgid "Unexpected tail checksum for %s (disk corruption?)"

5930 msgstr "Oväntad svanschecksumma för %s (trasig disk?)"

5931

5733 -#: builtin/index-pack.c:1151

5932 +#: builtin/index-pack.c:1152

5933 #, c-format

5934 msgid "pack has %d unresolved delta"

5935 msgid_plural "pack has %d unresolved deltas"

5936 msgstr[0] "paketet har %d oanalyserat delta"

5937 msgstr[1] "paketet har %d oanalyserade delta"

5938

5740 -#: builtin/index-pack.c:1176

5939 +#: builtin/index-pack.c:1177

5940 #, c-format

5941 msgid "unable to deflate appended object (%d)"

5942 msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"

5943

5745 -#: builtin/index-pack.c:1255

5944 +#: builtin/index-pack.c:1256

5945 #, c-format

5946 msgid "local object %s is corrupt"

5947 msgstr "lokalt objekt %s är trasigt"

5948

5750 -#: builtin/index-pack.c:1279

5949 +#: builtin/index-pack.c:1280

5950 msgid "error while closing pack file"

5951 msgstr "fel vid stängning av paketfil"

5952

5754 -#: builtin/index-pack.c:1292

5953 +#: builtin/index-pack.c:1293

5954 #, c-format

5955 msgid "cannot write keep file '%s'"

5956 msgstr "kan inte ta skriva \"keep\"-fil \"%s\""

5957

5759 -#: builtin/index-pack.c:1300

5958 +#: builtin/index-pack.c:1301

5959 #, c-format

5960 msgid "cannot close written keep file '%s'"

5961 msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""

5962

5764 -#: builtin/index-pack.c:1313

5963 +#: builtin/index-pack.c:1314

5964 msgid "cannot store pack file"

5965 msgstr "kan inte spara paketfil"

5966

5768 -#: builtin/index-pack.c:1324

5967 +#: builtin/index-pack.c:1325

5968 msgid "cannot store index file"

5969 msgstr "kan inte spara indexfil"

5970

5772 -#: builtin/index-pack.c:1357

5971 +#: builtin/index-pack.c:1358

5972 #, c-format

5973 msgid "bad pack.indexversion=%<PRIu32>"

5974 msgstr "felaktig pack.indexversion=%<PRIu32>"

5975

5777 -#: builtin/index-pack.c:1363

5976 +#: builtin/index-pack.c:1364

5977 #, c-format

5978 msgid "invalid number of threads specified (%d)"

5979 msgstr "felaktigt antal trådar angivet (%d)"

5980

5782 -#: builtin/index-pack.c:1367 builtin/index-pack.c:1545

5981 +#: builtin/index-pack.c:1368 builtin/index-pack.c:1546

5982 #, c-format

5983 msgid "no threads support, ignoring %s"

5984 msgstr "trådstöd saknas, ignorerar %s"

5985

5787 -#: builtin/index-pack.c:1425

5986 +#: builtin/index-pack.c:1426

5987 #, c-format

5988 msgid "Cannot open existing pack file '%s'"

5989 msgstr "Kan inte öppna befintlig paketfil \"%s\""

5990

5792 -#: builtin/index-pack.c:1427

5991 +#: builtin/index-pack.c:1428

5992 #, c-format

5993 msgid "Cannot open existing pack idx file for '%s'"

5994 msgstr "Kan inte öppna befintligt paket-idx-fil för \"%s\""

5995

5797 -#: builtin/index-pack.c:1474

5996 +#: builtin/index-pack.c:1475

5997 #, c-format

5998 msgid "non delta: %d object"

5999 msgid_plural "non delta: %d objects"

6000 msgstr[0] "icke-delta: %d objekt"

6001 msgstr[1] "icke-delta: %d objekt"

6002

5804 -#: builtin/index-pack.c:1481

6003 +#: builtin/index-pack.c:1482

6004 #, c-format

6005 msgid "chain length = %d: %lu object"

6006 msgid_plural "chain length = %d: %lu objects"

6007 msgstr[0] "kedjelängd = %d: %lu objekt"

6008 msgstr[1] "kedjelängd = %d: %lu objekt"

6009

5811 -#: builtin/index-pack.c:1509

6010 +#: builtin/index-pack.c:1510

6011 msgid "Cannot come back to cwd"

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

6013

5815 -#: builtin/index-pack.c:1557 builtin/index-pack.c:1560

5816 -#: builtin/index-pack.c:1572 builtin/index-pack.c:1576

6014 +#: builtin/index-pack.c:1558 builtin/index-pack.c:1561

6015 +#: builtin/index-pack.c:1573 builtin/index-pack.c:1577

6016 #, c-format

6017 msgid "bad %s"

6018 msgstr "felaktig %s"

6019

5821 -#: builtin/index-pack.c:1590

6020 +#: builtin/index-pack.c:1591

6021 msgid "--fix-thin cannot be used without --stdin"

6022 msgstr "--fix-thin kan inte användas med --stdin"

6023

5825 -#: builtin/index-pack.c:1594 builtin/index-pack.c:1604

6024 +#: builtin/index-pack.c:1595 builtin/index-pack.c:1605

6025 #, c-format

6026 msgid "packfile name '%s' does not end with '.pack'"

6027 msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""

6028

5830 -#: builtin/index-pack.c:1613

6029 +#: builtin/index-pack.c:1614

6030 msgid "--verify with no packfile name given"

6031 msgstr "--verify angavs utan paketfilnamn"

6032

@@ -5916,11 +6115,6 @@ msgstr "kan inte hantera filtyp %d"

6115 msgid "unable to move %s to %s"

6116 msgstr "kan inte flytta %s till %s"

6117

5919 -#: builtin/init-db.c:363

5920 -#, c-format

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

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

5923 -

6118 #.

6119 #. * TRANSLATORS: The first '%s' is either "Reinitialized

6120 #. * existing" or "Initialized empty", the second " shared" or

@@ -5963,7 +6157,7 @@ msgstr "behörigheter"

6157 msgid "specify that the git repository is to be shared amongst several users"

6158 msgstr "ange att git-arkivet skall delas bland flera användare"

6159

5966 -#: builtin/init-db.c:493 builtin/prune-packed.c:75

6160 +#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155

6161 msgid "be quiet"

6162 msgstr "var tyst"

6163

@@ -6003,381 +6197,381 @@ msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]\n"

6197 msgid " or: git show [options] <object>..."

6198 msgstr " eller: git show [flaggor] <objekt>..."

6199

6006 -#: builtin/log.c:124

6200 +#: builtin/log.c:125

6201 msgid "suppress diff output"

6202 msgstr "undertryck diff-utdata"

6203

6010 -#: builtin/log.c:125

6204 +#: builtin/log.c:126

6205 msgid "show source"

6206 msgstr "visa källkod"

6207

6014 -#: builtin/log.c:126

6208 +#: builtin/log.c:127

6209 msgid "Use mail map file"

6210 msgstr "Använd e-postmappningsfil"

6211

6018 -#: builtin/log.c:127

6212 +#: builtin/log.c:128

6213 msgid "decorate options"

6214 msgstr "dekoreringsflaggor"

6215

6022 -#: builtin/log.c:230

6216 +#: builtin/log.c:231

6217 #, c-format

6218 msgid "Final output: %d %s\n"

6219 msgstr "Slututdata: %d %s\n"

6220

6027 -#: builtin/log.c:453 builtin/log.c:545

6221 +#: builtin/log.c:473 builtin/log.c:565

6222 #, c-format

6223 msgid "Could not read object %s"

6224 msgstr "Kunde inte läsa objektet %s"

6225

6032 -#: builtin/log.c:569

6226 +#: builtin/log.c:589

6227 #, c-format

6228 msgid "Unknown type: %d"

6229 msgstr "Okänd typ: %d"

6230

6037 -#: builtin/log.c:669

6231 +#: builtin/log.c:689

6232 msgid "format.headers without value"

6233 msgstr "format.headers utan värde"

6234

6041 -#: builtin/log.c:751

6235 +#: builtin/log.c:771

6236 msgid "name of output directory is too long"

6237 msgstr "namnet på utdatakatalogen är för långt"

6238

6045 -#: builtin/log.c:767

6239 +#: builtin/log.c:787

6240 #, c-format

6241 msgid "Cannot open patch file %s"

6242 msgstr "Kan inte öppna patchfilen %s"

6243

6050 -#: builtin/log.c:781

6244 +#: builtin/log.c:801

6245 msgid "Need exactly one range."

6246 msgstr "Behöver precis ett intervall."

6247

6054 -#: builtin/log.c:789

6248 +#: builtin/log.c:809

6249 msgid "Not a range."

6250 msgstr "Inte ett intervall."

6251

6058 -#: builtin/log.c:891

6252 +#: builtin/log.c:911

6253 msgid "Cover letter needs email format"

6254 msgstr "Omslagsbrevet behöver e-postformat"

6255

6062 -#: builtin/log.c:967

6256 +#: builtin/log.c:987

6257 #, c-format

6258 msgid "insane in-reply-to: %s"

6259 msgstr "tokigt in-reply-to: %s"

6260

6067 -#: builtin/log.c:995

6261 +#: builtin/log.c:1015

6262 msgid "git format-patch [options] [<since> | <revision range>]"

6263 msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]"

6264

6071 -#: builtin/log.c:1040

6265 +#: builtin/log.c:1060

6266 msgid "Two output directories?"

6267 msgstr "Två utdatakataloger?"

6268

6075 -#: builtin/log.c:1155

6269 +#: builtin/log.c:1175

6270 msgid "use [PATCH n/m] even with a single patch"

6271 msgstr "använd [PATCH n/m] även för en ensam patch"

6272

6079 -#: builtin/log.c:1158

6273 +#: builtin/log.c:1178

6274 msgid "use [PATCH] even with multiple patches"

6275 msgstr "använd [PATCH] även för flera patchar"

6276

6083 -#: builtin/log.c:1162

6277 +#: builtin/log.c:1182

6278 msgid "print patches to standard out"

6279 msgstr "skriv patcharna på stnadard ut"

6280

6087 -#: builtin/log.c:1164

6281 +#: builtin/log.c:1184

6282 msgid "generate a cover letter"

6283 msgstr "generera ett följebrev"

6284

6091 -#: builtin/log.c:1166

6285 +#: builtin/log.c:1186

6286 msgid "use simple number sequence for output file names"

6287 msgstr "använd enkel nummersekvens för utdatafilnamn"

6288

6095 -#: builtin/log.c:1167

6289 +#: builtin/log.c:1187

6290 msgid "sfx"

6291 msgstr "sfx"

6292

6099 -#: builtin/log.c:1168

6293 +#: builtin/log.c:1188

6294 msgid "use <sfx> instead of '.patch'"

6295 msgstr "använd <sfx> istället för \".patch\""

6296

6103 -#: builtin/log.c:1170

6297 +#: builtin/log.c:1190

6298 msgid "start numbering patches at <n> instead of 1"

6299 msgstr "börja numrera patchar på <n> istället för 1"

6300

6107 -#: builtin/log.c:1172

6301 +#: builtin/log.c:1192

6302 msgid "mark the series as Nth re-roll"

6303 msgstr "markera serien som N:te försök"

6304

6111 -#: builtin/log.c:1174

6305 +#: builtin/log.c:1194

6306 msgid "Use [<prefix>] instead of [PATCH]"

6307 msgstr "Använd [<prefix>] istället för [PATCH]"

6308

6115 -#: builtin/log.c:1177

6309 +#: builtin/log.c:1197

6310 msgid "store resulting files in <dir>"

6311 msgstr "spara filerna i <katalog>"

6312

6119 -#: builtin/log.c:1180

6313 +#: builtin/log.c:1200

6314 msgid "don't strip/add [PATCH]"

6315 msgstr "ta inte bort eller lägg till [PATCH]"

6316

6123 -#: builtin/log.c:1183

6317 +#: builtin/log.c:1203

6318 msgid "don't output binary diffs"

6319 msgstr "skriv inte binära diffar"

6320

6127 -#: builtin/log.c:1185

6321 +#: builtin/log.c:1205

6322 msgid "don't include a patch matching a commit upstream"

6323 msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"

6324

6131 -#: builtin/log.c:1187

6325 +#: builtin/log.c:1207

6326 msgid "show patch format instead of default (patch + stat)"

6327 msgstr "visa patchformat istället för standard (patch + stat)"

6328

6135 -#: builtin/log.c:1189

6329 +#: builtin/log.c:1209

6330 msgid "Messaging"

6331 msgstr "E-post"

6332

6139 -#: builtin/log.c:1190

6333 +#: builtin/log.c:1210

6334 msgid "header"

6335 msgstr "huvud"

6336

6143 -#: builtin/log.c:1191

6337 +#: builtin/log.c:1211

6338 msgid "add email header"

6339 msgstr "lägg till e-posthuvud"

6340

6147 -#: builtin/log.c:1192 builtin/log.c:1194

6341 +#: builtin/log.c:1212 builtin/log.c:1214

6342 msgid "email"

6343 msgstr "epost"

6344

6151 -#: builtin/log.c:1192

6345 +#: builtin/log.c:1212

6346 msgid "add To: header"

6347 msgstr "Lägg till mottagarhuvud (\"To:\")"

6348

6155 -#: builtin/log.c:1194

6349 +#: builtin/log.c:1214

6350 msgid "add Cc: header"

6351 msgstr "Lägg till kopiehuvud (\"Cc:\")"

6352

6159 -#: builtin/log.c:1196

6353 +#: builtin/log.c:1216

6354 msgid "ident"

6355 msgstr "ident"

6356

6163 -#: builtin/log.c:1197

6357 +#: builtin/log.c:1217

6358 msgid "set From address to <ident> (or committer ident if absent)"

6359 msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"

6360

6167 -#: builtin/log.c:1199

6361 +#: builtin/log.c:1219

6362 msgid "message-id"

6363 msgstr "meddelande-id"

6364

6171 -#: builtin/log.c:1200

6365 +#: builtin/log.c:1220

6366 msgid "make first mail a reply to <message-id>"

6367 msgstr "Gör det första brevet ett svar till <meddelande-id>"

6368

6175 -#: builtin/log.c:1201 builtin/log.c:1204

6369 +#: builtin/log.c:1221 builtin/log.c:1224

6370 msgid "boundary"

6371 msgstr "gräns"

6372

6179 -#: builtin/log.c:1202

6373 +#: builtin/log.c:1222

6374 msgid "attach the patch"

6375 msgstr "bifoga patchen"

6376

6183 -#: builtin/log.c:1205

6377 +#: builtin/log.c:1225

6378 msgid "inline the patch"

6379 msgstr "gör patchen ett inline-objekt"

6380

6187 -#: builtin/log.c:1209

6381 +#: builtin/log.c:1229

6382 msgid "enable message threading, styles: shallow, deep"

6383 msgstr "aktivera brevtrådning, typer: shallow, deep"

6384

6191 -#: builtin/log.c:1211

6385 +#: builtin/log.c:1231

6386 msgid "signature"

6387 msgstr "signatur"

6388

6195 -#: builtin/log.c:1212

6389 +#: builtin/log.c:1232

6390 msgid "add a signature"

6391 msgstr "lägg till signatur"

6392

6199 -#: builtin/log.c:1214

6393 +#: builtin/log.c:1233

6394 msgid "don't print the patch filenames"

6395 msgstr "visa inte filnamn för patchar"

6396

6203 -#: builtin/log.c:1288

6397 +#: builtin/log.c:1307

6398 #, c-format

6399 msgid "invalid ident line: %s"

6400 msgstr "ogiltig ident-rad: %s"

6401

6208 -#: builtin/log.c:1303

6402 +#: builtin/log.c:1322

6403 msgid "-n and -k are mutually exclusive."

6404 msgstr "-n och -k kan inte användas samtidigt."

6405

6212 -#: builtin/log.c:1305

6406 +#: builtin/log.c:1324

6407 msgid "--subject-prefix and -k are mutually exclusive."

6408 msgstr "--subject-prefix och -k kan inte användas samtidigt."

6409

6216 -#: builtin/log.c:1313

6410 +#: builtin/log.c:1332

6411 msgid "--name-only does not make sense"

6412 msgstr "kan inte använda --name-only"

6413

6220 -#: builtin/log.c:1315

6414 +#: builtin/log.c:1334

6415 msgid "--name-status does not make sense"

6416 msgstr "kan inte använda --name-status"

6417

6224 -#: builtin/log.c:1317

6418 +#: builtin/log.c:1336

6419 msgid "--check does not make sense"

6420 msgstr "kan inte använda --check"

6421

6228 -#: builtin/log.c:1340

6422 +#: builtin/log.c:1359

6423 msgid "standard output, or directory, which one?"

6424 msgstr "standard ut, eller katalog, vilken skall det vara?"

6425

6232 -#: builtin/log.c:1342

6426 +#: builtin/log.c:1361

6427 #, c-format

6428 msgid "Could not create directory '%s'"

6429 msgstr "Kunde inte skapa katalogen \"%s\""

6430

6237 -#: builtin/log.c:1490

6431 +#: builtin/log.c:1509

6432 msgid "Failed to create output files"

6433 msgstr "Misslyckades skapa utdatafiler"

6434

6241 -#: builtin/log.c:1539

6435 +#: builtin/log.c:1558

6436 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

6437 msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"

6438

6245 -#: builtin/log.c:1594

6439 +#: builtin/log.c:1613

6440 #, c-format

6441 msgid ""

6442 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

l10n: Update Swedish translation (2194t0f0u)