bafe27cf07 · matheusbsbs/matheus-bagliano

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2020-10-10 09:32+0800\n"

11 -"PO-Revision-Date: 2020-10-11 11:52+0100\n"

10 +"POT-Creation-Date: 2020-12-15 16:27+0800\n"

11 +"PO-Revision-Date: 2020-12-15 21:41+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"

@@ -18,200 +18,200 @@ msgstr ""

18 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

19 "X-Generator: Gtranslator 3.30.1\n"

20

21 -#: add-interactive.c:368

21 +#: add-interactive.c:376

22 #, c-format

23 msgid "Huh (%s)?"

24 msgstr "Vadå (%s)?"

25

26 -#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250

27 -#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526

28 -#: builtin/rebase.c:1944

26 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284

27 +#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532

28 +#: builtin/rebase.c:1955

29 msgid "could not read index"

30 msgstr "kunde inte läsa indexet"

31

32 -#: add-interactive.c:576 git-add--interactive.perl:269

32 +#: add-interactive.c:584 git-add--interactive.perl:269

33 #: git-add--interactive.perl:294

34 msgid "binary"

35 msgstr "binär"

36

37 -#: add-interactive.c:634 git-add--interactive.perl:278

37 +#: add-interactive.c:642 git-add--interactive.perl:278

38 #: git-add--interactive.perl:332

39 msgid "nothing"

40 msgstr "ingenting"

41

42 -#: add-interactive.c:635 git-add--interactive.perl:314

42 +#: add-interactive.c:643 git-add--interactive.perl:314

43 #: git-add--interactive.perl:329

44 msgid "unchanged"

45 msgstr "oändrad"

46

47 -#: add-interactive.c:672 git-add--interactive.perl:643

47 +#: add-interactive.c:680 git-add--interactive.perl:641

48 msgid "Update"

49 msgstr "Uppdatera"

50

51 -#: add-interactive.c:689 add-interactive.c:877

51 +#: add-interactive.c:697 add-interactive.c:885

52 #, c-format

53 msgid "could not stage '%s'"

54 msgstr "kunde inte köa \"%s\""

55

56 -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444

56 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478

57 msgid "could not write index"

58 msgstr "kunde inte skriva indexet"

59

60 -#: add-interactive.c:698 git-add--interactive.perl:628

60 +#: add-interactive.c:706 git-add--interactive.perl:626

61 #, c-format, perl-format

62 msgid "updated %d path\n"

63 msgid_plural "updated %d paths\n"

64 msgstr[0] "uppdaterade %d sökväg\n"

65 msgstr[1] "uppdaterade %d sökvägar\n"

66

67 -#: add-interactive.c:716 git-add--interactive.perl:678

67 +#: add-interactive.c:724 git-add--interactive.perl:676

68 #, c-format, perl-format

69 msgid "note: %s is untracked now.\n"

70 msgstr "observera: %s spåras inte längre.\n"

71

72 -#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295

72 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:295

73 #: builtin/reset.c:145

74 #, c-format

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

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

77

78 -#: add-interactive.c:751 git-add--interactive.perl:655

78 +#: add-interactive.c:759 git-add--interactive.perl:653

79 msgid "Revert"

80 msgstr "Återställ"

81

82 -#: add-interactive.c:767

82 +#: add-interactive.c:775

83 msgid "Could not parse HEAD^{tree}"

84 msgstr "kunde inte tolka HEAD^{tree}"

85

86 -#: add-interactive.c:805 git-add--interactive.perl:631

86 +#: add-interactive.c:813 git-add--interactive.perl:629

87 #, c-format, perl-format

88 msgid "reverted %d path\n"

89 msgid_plural "reverted %d paths\n"

90 msgstr[0] "återställde %d sökväg\n"

91 msgstr[1] "återställde %d sökvägar\n"

92

93 -#: add-interactive.c:856 git-add--interactive.perl:695

93 +#: add-interactive.c:864 git-add--interactive.perl:693

94 #, c-format

95 msgid "No untracked files.\n"

96 msgstr "Inga ospårade filer.\n"

97

98 -#: add-interactive.c:860 git-add--interactive.perl:689

98 +#: add-interactive.c:868 git-add--interactive.perl:687

99 msgid "Add untracked"

100 msgstr "Lägg till ospårad"

101

102 -#: add-interactive.c:887 git-add--interactive.perl:625

102 +#: add-interactive.c:895 git-add--interactive.perl:623

103 #, c-format, perl-format

104 msgid "added %d path\n"

105 msgid_plural "added %d paths\n"

106 msgstr[0] "lade till %d sökväg\n"

107 msgstr[1] "lade till %d sökvägar\n"

108

109 -#: add-interactive.c:917

109 +#: add-interactive.c:925

110 #, c-format

111 msgid "ignoring unmerged: %s"

112 msgstr "ignorerar ej sammanslagen: %s"

113

114 -#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371

114 +#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369

115 #, c-format

116 msgid "Only binary files changed.\n"

117 msgstr "Endast binära filer ändrade.\n"

118

119 -#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373

119 +#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371

120 #, c-format

121 msgid "No changes.\n"

122 msgstr "Inga ändringar.\n"

123

124 -#: add-interactive.c:935 git-add--interactive.perl:1381

124 +#: add-interactive.c:943 git-add--interactive.perl:1379

125 msgid "Patch update"

126 msgstr "Uppdatera patch"

127

128 -#: add-interactive.c:974 git-add--interactive.perl:1794

128 +#: add-interactive.c:982 git-add--interactive.perl:1792

129 msgid "Review diff"

130 msgstr "Granska diff"

131

132 -#: add-interactive.c:1002

132 +#: add-interactive.c:1010

133 msgid "show paths with changes"

134 msgstr "visa sökvägar med ändringar"

135

136 -#: add-interactive.c:1004

136 +#: add-interactive.c:1012

137 msgid "add working tree state to the staged set of changes"

138 msgstr "lägg arbetskatalogens tillstånd till köade ändringar"

139

140 -#: add-interactive.c:1006

140 +#: add-interactive.c:1014

141 msgid "revert staged set of changes back to the HEAD version"

142 msgstr "återställ köade ändringar tillbaka till HEAD-versionen"

143

144 -#: add-interactive.c:1008

144 +#: add-interactive.c:1016

145 msgid "pick hunks and update selectively"

146 msgstr "välj stycken och uppdatera selektivt"

147

148 -#: add-interactive.c:1010

148 +#: add-interactive.c:1018

149 msgid "view diff between HEAD and index"

150 msgstr "visa skillnad mellan HEAD och index"

151

152 -#: add-interactive.c:1012

152 +#: add-interactive.c:1020

153 msgid "add contents of untracked files to the staged set of changes"

154 msgstr "lägg innehåll i ospårade filer till köade ändringar"

155

156 -#: add-interactive.c:1020 add-interactive.c:1069

156 +#: add-interactive.c:1028 add-interactive.c:1077

157 msgid "Prompt help:"

158 msgstr "Kommandoradshjälp:"

159

160 -#: add-interactive.c:1022

160 +#: add-interactive.c:1030

161 msgid "select a single item"

162 msgstr "markera en post"

163

164 -#: add-interactive.c:1024

164 +#: add-interactive.c:1032

165 msgid "select a range of items"

166 msgstr "markera intervall av poster"

167

168 -#: add-interactive.c:1026

168 +#: add-interactive.c:1034

169 msgid "select multiple ranges"

170 msgstr "markera flera intervall"

171

172 -#: add-interactive.c:1028 add-interactive.c:1073

172 +#: add-interactive.c:1036 add-interactive.c:1081

173 msgid "select item based on unique prefix"

174 msgstr "markera post baserad på unikt prefix"

175

176 -#: add-interactive.c:1030

176 +#: add-interactive.c:1038

177 msgid "unselect specified items"

178 msgstr "avmarkera angivna poster"

179

180 -#: add-interactive.c:1032

180 +#: add-interactive.c:1040

181 msgid "choose all items"

182 msgstr "välj alla poster"

183

184 -#: add-interactive.c:1034

184 +#: add-interactive.c:1042

185 msgid "(empty) finish selecting"

186 msgstr "(tomt) avsluta markering"

187

188 -#: add-interactive.c:1071

188 +#: add-interactive.c:1079

189 msgid "select a numbered item"

190 msgstr "markera en numrerad post"

191

192 -#: add-interactive.c:1075

192 +#: add-interactive.c:1083

193 msgid "(empty) select nothing"

194 msgstr "(tomt) markera ingenting"

195

196 -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891

196 +#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896

197 msgid "*** Commands ***"

198 msgstr "*** Kommandon ***"

199

200 -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888

200 +#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893

201 msgid "What now"

202 msgstr "Vad nu"

203

204 -#: add-interactive.c:1136 git-add--interactive.perl:213

204 +#: add-interactive.c:1144 git-add--interactive.perl:213

205 msgid "staged"

206 msgstr "köad"

207

208 -#: add-interactive.c:1136 git-add--interactive.perl:213

208 +#: add-interactive.c:1144 git-add--interactive.perl:213

209 msgid "unstaged"

210 msgstr "ej köad"

211

212 -#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270

213 -#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123

214 -#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190

212 +#: add-interactive.c:1144 apply.c:4989 apply.c:4992 builtin/am.c:2257

213 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124

214 +#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190

215 #: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818

216 #: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326

217 #: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572

@@ -219,31 +219,31 @@ msgstr "ej köad"

219 msgid "path"

220 msgstr "sökväg"

221

222 -#: add-interactive.c:1143

222 +#: add-interactive.c:1151

223 msgid "could not refresh index"

224 msgstr "kunde inte uppdatera indexet"

225

226 -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805

226 +#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803

227 #, c-format

228 msgid "Bye.\n"

229 msgstr "Hej då.\n"

230

231 -#: add-patch.c:34 git-add--interactive.perl:1433

231 +#: add-patch.c:34 git-add--interactive.perl:1431

232 #, c-format, perl-format

233 msgid "Stage mode change [y,n,q,a,d%s,?]? "

234 msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? "

235

236 -#: add-patch.c:35 git-add--interactive.perl:1434

236 +#: add-patch.c:35 git-add--interactive.perl:1432

237 #, c-format, perl-format

238 msgid "Stage deletion [y,n,q,a,d%s,?]? "

239 msgstr "Köa borttagning [y,n,q,a,d%s,?]? "

240

241 -#: add-patch.c:36 git-add--interactive.perl:1435

241 +#: add-patch.c:36 git-add--interactive.perl:1433

242 #, c-format, perl-format

243 msgid "Stage addition [y,n,q,a,d%s,?]? "

244 msgstr "Köa tillägg [y,n,q,a,d%s,?]? "

245

246 -#: add-patch.c:37 git-add--interactive.perl:1436

246 +#: add-patch.c:37 git-add--interactive.perl:1434

247 #, c-format, perl-format

248 msgid "Stage this hunk [y,n,q,a,d%s,?]? "

249 msgstr "Köa stycket [y,n,q,a,d%s,?]? "

@@ -270,22 +270,22 @@ msgstr ""

270 "a - köa stycket och alla följande i filen\n"

271 "d - köa inte stycket eller något av de följande i filen\n"

272

273 -#: add-patch.c:56 git-add--interactive.perl:1439

273 +#: add-patch.c:56 git-add--interactive.perl:1437

274 #, c-format, perl-format

275 msgid "Stash mode change [y,n,q,a,d%s,?]? "

276 msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? "

277

278 -#: add-patch.c:57 git-add--interactive.perl:1440

278 +#: add-patch.c:57 git-add--interactive.perl:1438

279 #, c-format, perl-format

280 msgid "Stash deletion [y,n,q,a,d%s,?]? "

281 msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? "

282

283 -#: add-patch.c:58 git-add--interactive.perl:1441

283 +#: add-patch.c:58 git-add--interactive.perl:1439

284 #, c-format, perl-format

285 msgid "Stash addition [y,n,q,a,d%s,?]? "

286 msgstr "Stash:a tillägg [y,n,q,a,d%s,?]? "

287

288 -#: add-patch.c:59 git-add--interactive.perl:1442

288 +#: add-patch.c:59 git-add--interactive.perl:1440

289 #, c-format, perl-format

290 msgid "Stash this hunk [y,n,q,a,d%s,?]? "

291 msgstr "Stash:a stycket [y,n,q,a,d%s,?]? "

@@ -312,22 +312,22 @@ msgstr ""

312 "a - \"stash\":a stycket och alla följande i filen\n"

313 "d - \"stash\":a inte stycket eller något av de följande i filen\n"

314

315 -#: add-patch.c:80 git-add--interactive.perl:1445

315 +#: add-patch.c:80 git-add--interactive.perl:1443

316 #, c-format, perl-format

317 msgid "Unstage mode change [y,n,q,a,d%s,?]? "

318 msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? "

319

320 -#: add-patch.c:81 git-add--interactive.perl:1446

320 +#: add-patch.c:81 git-add--interactive.perl:1444

321 #, c-format, perl-format

322 msgid "Unstage deletion [y,n,q,a,d%s,?]? "

323 msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? "

324

325 -#: add-patch.c:82 git-add--interactive.perl:1447

325 +#: add-patch.c:82 git-add--interactive.perl:1445

326 #, c-format, perl-format

327 msgid "Unstage addition [y,n,q,a,d%s,?]? "

328 msgstr "Ta bort tillägg från kön [y,n,q,a,d%s,?]? "

329

330 -#: add-patch.c:83 git-add--interactive.perl:1448

330 +#: add-patch.c:83 git-add--interactive.perl:1446

331 #, c-format, perl-format

332 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "

333 msgstr "Ta bort stycket från kön [y,n,q,a,d%s,?]? "

@@ -354,22 +354,22 @@ msgstr ""

354 "a - ta bort stycket och alla följande i filen från kön\n"

355 "d - ta inte bort stycket eller något av de följande i filen från kön\n"

356

357 -#: add-patch.c:103 git-add--interactive.perl:1451

357 +#: add-patch.c:103 git-add--interactive.perl:1449

358 #, c-format, perl-format

359 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "

360 msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? "

361

362 -#: add-patch.c:104 git-add--interactive.perl:1452

362 +#: add-patch.c:104 git-add--interactive.perl:1450

363 #, c-format, perl-format

364 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "

365 msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? "

366

367 -#: add-patch.c:105 git-add--interactive.perl:1453

367 +#: add-patch.c:105 git-add--interactive.perl:1451

368 #, c-format, perl-format

369 msgid "Apply addition to index [y,n,q,a,d%s,?]? "

370 msgstr "Applicera tillägg på indexet [y,n,q,a,d%s,?]? "

371

372 -#: add-patch.c:106 git-add--interactive.perl:1454

372 +#: add-patch.c:106 git-add--interactive.perl:1452

373 #, c-format, perl-format

374 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "

375 msgstr "Applicera stycket på indexet [y,n,q,a,d%s,?]? "

@@ -396,26 +396,26 @@ msgstr ""

396 "a - applicera stycket och alla följande i filen\n"

397 "d - applicera inte stycket eller något av de följande i filen\n"

398

399 -#: add-patch.c:126 git-add--interactive.perl:1457

400 -#: git-add--interactive.perl:1475

399 +#: add-patch.c:126 git-add--interactive.perl:1455

400 +#: git-add--interactive.perl:1473

401 #, c-format, perl-format

402 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "

403 msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? "

404

405 -#: add-patch.c:127 git-add--interactive.perl:1458

406 -#: git-add--interactive.perl:1476

405 +#: add-patch.c:127 git-add--interactive.perl:1456

406 +#: git-add--interactive.perl:1474

407 #, c-format, perl-format

408 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "

409 msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? "

410

411 -#: add-patch.c:128 git-add--interactive.perl:1459

412 -#: git-add--interactive.perl:1477

411 +#: add-patch.c:128 git-add--interactive.perl:1457

412 +#: git-add--interactive.perl:1475

413 #, c-format, perl-format

414 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "

415 msgstr "Kasta tillägg från arbetskatalogen [y,n,q,a,d%s,?]? "

416

417 -#: add-patch.c:129 git-add--interactive.perl:1460

418 -#: git-add--interactive.perl:1478

417 +#: add-patch.c:129 git-add--interactive.perl:1458

418 +#: git-add--interactive.perl:1476

419 #, c-format, perl-format

420 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "

421 msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d%s,?]? "

@@ -442,22 +442,22 @@ msgstr ""

442 "a - förkasta stycket och alla följande i filen\n"

443 "d - förkasta inte stycket eller något av de följande i filen\n"

444

445 -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463

445 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461

446 #, c-format, perl-format

447 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "

448 msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "

449

450 -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464

450 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462

451 #, c-format, perl-format

452 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "

453 msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "

454

455 -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465

455 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463

456 #, c-format, perl-format

457 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "

458 msgstr "Kasta tillägg från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "

459

460 -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466

460 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464

461 #, c-format, perl-format

462 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "

463 msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "

@@ -476,22 +476,22 @@ msgstr ""

476 "a - förkasta stycket och alla följande i filen\n"

477 "d - förkasta inte stycket eller något av de följande i filen\n"

478

479 -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469

479 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467

480 #, c-format, perl-format

481 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "

482 msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "

483

484 -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470

484 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468

485 #, c-format, perl-format

486 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "

487 msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "

488

489 -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471

489 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469

490 #, c-format, perl-format

491 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "

492 msgstr "Applicera tillägg på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "

493

494 -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472

494 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470

495 #, c-format, perl-format

496 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "

497 msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "

@@ -559,7 +559,7 @@ msgstr ""

559 "Alla rader i indata måste ha en motsvarande rad i utdata från\n"

560 "ditt filter."

561

562 -#: add-patch.c:785

562 +#: add-patch.c:790

563 #, c-format

564 msgid ""

565 "expected context line #%d in\n"

@@ -568,7 +568,7 @@ msgstr ""

568 "förväntade sammanhangsrad %d i\n"

569 "%.*s"

570

571 -#: add-patch.c:800

571 +#: add-patch.c:805

572 #, c-format

573 msgid ""

574 "hunks do not overlap:\n"

@@ -581,11 +581,11 @@ msgstr ""

581 "\tavslutas inte med:\n"

582 "%.*s"

583

584 -#: add-patch.c:1076 git-add--interactive.perl:1117

584 +#: add-patch.c:1081 git-add--interactive.perl:1115

585 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"

586 msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n"

587

588 -#: add-patch.c:1080

588 +#: add-patch.c:1085

589 #, c-format

590 msgid ""

591 "---\n"

@@ -599,7 +599,7 @@ msgstr ""

599 "Rader som börjar med %c kommer att tas bort.\n"

600

601 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

602 -#: add-patch.c:1094 git-add--interactive.perl:1131

602 +#: add-patch.c:1099 git-add--interactive.perl:1129

603 msgid ""

604 "If it does not apply cleanly, you will be given an opportunity to\n"

605 "edit again. If all lines of the hunk are removed, then the edit is\n"

@@ -609,11 +609,11 @@ msgstr ""

609 "redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"

610 "redigeringen och stycket lämnas oförändrat.\n"

611

612 -#: add-patch.c:1127

612 +#: add-patch.c:1132

613 msgid "could not parse hunk header"

614 msgstr "kunde inte tolka styckehuvud"

615

616 -#: add-patch.c:1172

616 +#: add-patch.c:1177

617 msgid "'git apply --cached' failed"

618 msgstr "\"git apply --cached\" misslyckades"

619

@@ -629,26 +629,26 @@ msgstr "\"git apply --cached\" misslyckades"

629 #. Consider translating (saying "no" discards!) as

630 #. (saying "n" for "no" discards!) if the translation

631 #. of the word "no" does not start with n.

632 -#: add-patch.c:1241 git-add--interactive.perl:1244

632 +#: add-patch.c:1246 git-add--interactive.perl:1242

633 msgid ""

634 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "

635 msgstr ""

636 "Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "

637 "[y/n]? "

638

639 -#: add-patch.c:1284

639 +#: add-patch.c:1289

640 msgid "The selected hunks do not apply to the index!"

641 msgstr "Markerade stycken kan inte appliceras på indexet!"

642

643 -#: add-patch.c:1285 git-add--interactive.perl:1348

643 +#: add-patch.c:1290 git-add--interactive.perl:1346

644 msgid "Apply them to the worktree anyway? "

645 msgstr "Applicera dem på arbetskatalogen trots det? "

646

647 -#: add-patch.c:1292 git-add--interactive.perl:1351

647 +#: add-patch.c:1297 git-add--interactive.perl:1349

648 msgid "Nothing was applied.\n"

649 msgstr "Ingenting applicerades.\n"

650

651 -#: add-patch.c:1349

651 +#: add-patch.c:1354

652 msgid ""

653 "j - leave this hunk undecided, see next undecided hunk\n"

654 "J - leave this hunk undecided, see next hunk\n"

@@ -670,73 +670,73 @@ msgstr ""

670 "e - redigera aktuellt stycke manuellt\n"

671 "? - visa hjälp\n"

672

673 -#: add-patch.c:1511 add-patch.c:1521

673 +#: add-patch.c:1516 add-patch.c:1526

674 msgid "No previous hunk"

675 msgstr "Inget föregående stycke"

676

677 -#: add-patch.c:1516 add-patch.c:1526

677 +#: add-patch.c:1521 add-patch.c:1531

678 msgid "No next hunk"

679 msgstr "Inget följande stycke"

680

681 -#: add-patch.c:1532

681 +#: add-patch.c:1537

682 msgid "No other hunks to goto"

683 msgstr "Inga andra stycken att gå till"

684

685 -#: add-patch.c:1543 git-add--interactive.perl:1608

685 +#: add-patch.c:1548 git-add--interactive.perl:1606

686 msgid "go to which hunk (<ret> to see more)? "

687 msgstr "gå till vilket stycke (<ret> för att se fler)? "

688

689 -#: add-patch.c:1544 git-add--interactive.perl:1610

689 +#: add-patch.c:1549 git-add--interactive.perl:1608

690 msgid "go to which hunk? "

691 msgstr "gå till vilket stycke? "

692

693 -#: add-patch.c:1555

693 +#: add-patch.c:1560

694 #, c-format

695 msgid "Invalid number: '%s'"

696 msgstr "Ogiltigt siffervärde: \"%s\""

697

698 -#: add-patch.c:1560

698 +#: add-patch.c:1565

699 #, c-format

700 msgid "Sorry, only %d hunk available."

701 msgid_plural "Sorry, only %d hunks available."

702 msgstr[0] "Beklagar, det finns bara %d stycke."

703 msgstr[1] "Beklagar, det finns bara %d stycken."

704

705 -#: add-patch.c:1569

705 +#: add-patch.c:1574

706 msgid "No other hunks to search"

707 msgstr "Inga andra stycken att söka efter"

708

709 -#: add-patch.c:1575 git-add--interactive.perl:1663

709 +#: add-patch.c:1580 git-add--interactive.perl:1661

710 msgid "search for regex? "

711 msgstr "sök efter reguljärt uttryck? "

712

713 -#: add-patch.c:1590

713 +#: add-patch.c:1595

714 #, c-format

715 msgid "Malformed search regexp %s: %s"

716 msgstr "Felaktigt format på reguljärt sökuttryck %s: %s"

717

718 -#: add-patch.c:1607

718 +#: add-patch.c:1612

719 msgid "No hunk matches the given pattern"

720 msgstr "Inga stycken motsvarar givet mönster"

721

722 -#: add-patch.c:1614

722 +#: add-patch.c:1619

723 msgid "Sorry, cannot split this hunk"

724 msgstr "Beklagar, kan inte dela stycket"

725

726 -#: add-patch.c:1618

726 +#: add-patch.c:1623

727 #, c-format

728 msgid "Split into %d hunks."

729 msgstr "Dela i %d stycken."

730

731 -#: add-patch.c:1622

731 +#: add-patch.c:1627

732 msgid "Sorry, cannot edit this hunk"

733 msgstr "Beklagar, kan inte redigera stycket"

734

735 -#: add-patch.c:1674

735 +#: add-patch.c:1679

736 msgid "'git apply' failed"

737 msgstr "\"git apply\" misslyckades"

738

739 -#: advice.c:140

739 +#: advice.c:143

740 #, c-format

741 msgid ""

742 "\n"

@@ -745,47 +745,47 @@ msgstr ""

745 "\n"

746 "Slå av meddelandet med \"git config advice.%s false\""

747

748 -#: advice.c:156

748 +#: advice.c:159

749 #, c-format

750 msgid "%shint: %.*s%s\n"

751 msgstr "%stips: %.*s%s\n"

752

753 -#: advice.c:247

753 +#: advice.c:250

754 msgid "Cherry-picking is not possible because you have unmerged files."

755 msgstr ""

756 "Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits "

757 "samman."

758

759 -#: advice.c:249

759 +#: advice.c:252

760 msgid "Committing is not possible because you have unmerged files."

761 msgstr ""

762 "Du kan inte utföra en incheckning eftersom du har filer som inte slagits "

763 "samman."

764

765 -#: advice.c:251

765 +#: advice.c:254

766 msgid "Merging is not possible because you have unmerged files."

767 msgstr ""

768 "Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits "

769 "samman."

770

771 -#: advice.c:253

771 +#: advice.c:256

772 msgid "Pulling is not possible because you have unmerged files."

773 msgstr ""

774 "Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman."

775

776 -#: advice.c:255

776 +#: advice.c:258

777 msgid "Reverting is not possible because you have unmerged files."

778 msgstr ""

779 "Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits "

780 "samman."

781

782 -#: advice.c:257

782 +#: advice.c:260

783 #, c-format

784 msgid "It is not possible to %s because you have unmerged files."

785 msgstr ""

786 "Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman."

787

788 -#: advice.c:265

788 +#: advice.c:268

789 msgid ""

790 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

791 "as appropriate to mark resolution and make a commit."

@@ -793,23 +793,23 @@ msgstr ""

793 "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"

794 "som lämpligt för att ange lösning och checka in."

795

796 -#: advice.c:273

796 +#: advice.c:276

797 msgid "Exiting because of an unresolved conflict."

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

799

800 -#: advice.c:278 builtin/merge.c:1349

800 +#: advice.c:281 builtin/merge.c:1369

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

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

803

804 -#: advice.c:280

804 +#: advice.c:283

805 msgid "Please, commit your changes before merging."

806 msgstr "Checka in dina ändringar innan du utför sammanslagningen."

807

808 -#: advice.c:281

808 +#: advice.c:284

809 msgid "Exiting because of unfinished merge."

810 msgstr "Avslutar på grund av ofullbordad sammanslagning."

811

812 -#: advice.c:287

812 +#: advice.c:290

813 #, c-format

814 msgid ""

815 "Note: switching to '%s'.\n"

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

1101 msgid "cannot checkout %s"

1102 msgstr "kan inte checka ut %s"

1103

1104 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308

1104 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308

1105 #, c-format

1106 msgid "failed to read %s"

1107 msgstr "misslyckades läsa %s"

@@ -1262,7 +1262,7 @@ msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"

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

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

1264

1265 -#: apply.c:4376 builtin/bisect--helper.c:537

1265 +#: apply.c:4376 builtin/bisect--helper.c:524

1266 #, c-format

1267 msgid "failed to write to '%s'"

1268 msgstr "misslyckades skriva till \"%s\""

@@ -1313,170 +1313,170 @@ msgstr "Stycke %d tillämpades rent."

1313 msgid "Rejected hunk #%d."

1314 msgstr "Refuserar stycke %d."

1315

1316 -#: apply.c:4715

1316 +#: apply.c:4720

1317 #, c-format

1318 msgid "Skipped patch '%s'."

1319 msgstr "Ignorerar patch \"%s\"."

1320

1321 -#: apply.c:4723

1321 +#: apply.c:4728

1322 msgid "unrecognized input"

1323 msgstr "indata känns inte igen"

1324

1325 -#: apply.c:4743

1325 +#: apply.c:4748

1326 msgid "unable to read index file"

1327 msgstr "kan inte läsa indexfilen"

1328

1329 -#: apply.c:4900

1329 +#: apply.c:4905

1330 #, c-format

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

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

1333

1334 -#: apply.c:4927

1334 +#: apply.c:4932

1335 #, c-format

1336 msgid "squelched %d whitespace error"

1337 msgid_plural "squelched %d whitespace errors"

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

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

1340

1341 -#: apply.c:4933 apply.c:4948

1341 +#: apply.c:4938 apply.c:4953

1342 #, c-format

1343 msgid "%d line adds whitespace errors."

1344 msgid_plural "%d lines add whitespace errors."

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

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

1347

1348 -#: apply.c:4941

1348 +#: apply.c:4946

1349 #, c-format

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

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

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

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

1354

1355 -#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406

1355 +#: apply.c:4962 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406

1356 msgid "Unable to write new index file"

1357 msgstr "Kunde inte skriva ny indexfil"

1358

1359 -#: apply.c:4985

1359 +#: apply.c:4990

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

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

1362

1363 -#: apply.c:4988

1363 +#: apply.c:4993

1364 msgid "apply changes matching the given path"

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

1366

1367 -#: apply.c:4990 builtin/am.c:2279

1367 +#: apply.c:4995 builtin/am.c:2266

1368 msgid "num"

1369 msgstr "antal"

1370

1371 -#: apply.c:4991

1371 +#: apply.c:4996

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

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

1374

1375 -#: apply.c:4994

1375 +#: apply.c:4999

1376 msgid "ignore additions made by the patch"

1377 msgstr "ignorera tillägg gjorda av patchen"

1378

1379 -#: apply.c:4996

1379 +#: apply.c:5001

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

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

1382

1383 -#: apply.c:5000

1383 +#: apply.c:5005

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

1385 msgstr "visa antal tillagda och borttagna rader decimalt"

1386

1387 -#: apply.c:5002

1387 +#: apply.c:5007

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

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

1390

1391 -#: apply.c:5004

1391 +#: apply.c:5009

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

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

1394

1395 -#: apply.c:5006

1395 +#: apply.c:5011

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

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

1398

1399 -#: apply.c:5008

1399 +#: apply.c:5013

1400 msgid "mark new files with `git add --intent-to-add`"

1401 msgstr "markera nya filer med \"git add --intent-to-add\""

1402

1403 -#: apply.c:5010

1403 +#: apply.c:5015

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

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

1406

1407 -#: apply.c:5012

1407 +#: apply.c:5017

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

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

1410

1411 -#: apply.c:5015

1411 +#: apply.c:5020

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

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

1414

1415 -#: apply.c:5017

1415 +#: apply.c:5022

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

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

1418

1419 -#: apply.c:5019

1419 +#: apply.c:5024

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

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

1422

1423 -#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525

1423 +#: apply.c:5027 builtin/checkout-index.c:182 builtin/ls-files.c:525

1424 msgid "paths are separated with NUL character"

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

1426

1427 -#: apply.c:5024

1427 +#: apply.c:5029

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

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

1430

1431 -#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98

1431 +#: apply.c:5030 builtin/am.c:2245 builtin/interpret-trailers.c:98

1432 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

1433 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1340

1433 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1346

1434 msgid "action"

1435 msgstr "åtgärd"

1436

1437 -#: apply.c:5026

1437 +#: apply.c:5031

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

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

1440

1441 -#: apply.c:5029 apply.c:5032

1441 +#: apply.c:5034 apply.c:5037

1442 msgid "ignore changes in whitespace when finding context"

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

1444

1445 -#: apply.c:5035

1445 +#: apply.c:5040

1446 msgid "apply the patch in reverse"

1447 msgstr "tillämpa patchen baklänges"

1448

1449 -#: apply.c:5037

1449 +#: apply.c:5042

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

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

1452

1453 -#: apply.c:5039

1453 +#: apply.c:5044

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

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

1456

1457 -#: apply.c:5041

1457 +#: apply.c:5046

1458 msgid "allow overlapping hunks"

1459 msgstr "tillåt överlappande stycken"

1460

1461 -#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22

1461 +#: apply.c:5047 builtin/add.c:329 builtin/check-ignore.c:22

1462 #: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775

1463 -#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128

1463 +#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128

1464 msgid "be verbose"

1465 msgstr "var pratsam"

1466

1467 -#: apply.c:5044

1467 +#: apply.c:5049

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

1469 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

1470

1471 -#: apply.c:5047

1471 +#: apply.c:5052

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

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

1474

1475 -#: apply.c:5049 builtin/am.c:2267

1475 +#: apply.c:5054 builtin/am.c:2254

1476 msgid "root"

1477 msgstr "rot"

1478

1479 -#: apply.c:5050

1479 +#: apply.c:5055

1480 msgid "prepend <root> to all filenames"

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

1482

@@ -1490,16 +1490,16 @@ msgstr "kan inte strömma blob:en %s"

1490 msgid "unsupported file mode: 0%o (SHA1: %s)"

1491 msgstr "filens läge stöds ej: 0%o (SHA1: %s)"

1492

1493 -#: archive-tar.c:449

1493 +#: archive-tar.c:450

1494 #, c-format

1495 msgid "unable to start '%s' filter"

1496 msgstr "kunde inte starta filtret \"%s\""

1497

1498 -#: archive-tar.c:452

1498 +#: archive-tar.c:453

1499 msgid "unable to redirect descriptor"

1500 msgstr "kan inte omdirigera handtag"

1501

1502 -#: archive-tar.c:459

1502 +#: archive-tar.c:460

1503 #, c-format

1504 msgid "'%s' filter reported error"

1505 msgstr "filtret \"%s\" rapporterade fel"

@@ -1548,9 +1548,9 @@ msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"

1548 msgid "cannot read %s"

1549 msgstr "kan inte läsa %s"

1550

1551 -#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852

1552 -#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786

1553 -#: builtin/merge.c:1124

1551 +#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886

1552 +#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786

1553 +#: builtin/merge.c:1138

1554 #, c-format

1555 msgid "could not read '%s'"

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

@@ -1589,118 +1589,110 @@ msgstr "Hittar inte filen: %s"

1589 msgid "Not a regular file: %s"

1590 msgstr "Inte en vanlig fil: %s"

1591

1592 -#: archive.c:553

1592 +#: archive.c:555

1593 msgid "fmt"

1594 msgstr "fmt"

1595

1596 -#: archive.c:553

1596 +#: archive.c:555

1597 msgid "archive format"

1598 msgstr "arkivformat"

1599

1600 -#: archive.c:554 builtin/log.c:1760

1600 +#: archive.c:556 builtin/log.c:1765

1601 msgid "prefix"

1602 msgstr "prefix"

1603

1604 -#: archive.c:555

1604 +#: archive.c:557

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

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

1607

1608 -#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888

1609 -#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133

1608 +#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890

1609 +#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135

1610 #: builtin/fast-export.c:1208 builtin/fast-export.c:1210

1611 -#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105

1611 +#: builtin/fast-export.c:1214 builtin/grep.c:919 builtin/hash-object.c:105

1612 #: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412

1613 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190

1614 msgid "file"

1615 msgstr "fil"

1616

1617 -#: archive.c:557

1617 +#: archive.c:559

1618 msgid "add untracked file to archive"

1619 msgstr "ta med ospårade filer i arkivet"

1620

1621 -#: archive.c:560 builtin/archive.c:90

1621 +#: archive.c:562 builtin/archive.c:90

1622 msgid "write the archive to this file"

1623 msgstr "skriv arkivet till filen"

1624

1625 -#: archive.c:562

1625 +#: archive.c:564

1626 msgid "read .gitattributes in working directory"

1627 msgstr "läs .gitattributes i arbetskatalogen"

1628

1629 -#: archive.c:563

1629 +#: archive.c:565

1630 msgid "report archived files on stderr"

1631 msgstr "rapportera arkiverade filer på standard fel"

1632

1633 -#: archive.c:564

1634 -msgid "store only"

1635 -msgstr "endast spara"

1636 -

1637 -#: archive.c:565

1638 -msgid "compress faster"

1639 -msgstr "komprimera snabbare"

1633 +#: archive.c:567

1634 +msgid "set compression level"

1635 +msgstr "välj komprimeringsgrad"

1636

1641 -#: archive.c:573

1642 -msgid "compress better"

1643 -msgstr "komprimera bättre"

1644 -

1645 -#: archive.c:576

1637 +#: archive.c:570

1638 msgid "list supported archive formats"

1639 msgstr "visa understödda arkivformat"

1640

1649 -#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1641 +#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117

1642 #: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335

1643 msgid "repo"

1644 msgstr "arkiv"

1645

1654 -#: archive.c:579 builtin/archive.c:92

1646 +#: archive.c:573 builtin/archive.c:92

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

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

1649

1658 -#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715

1650 +#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714

1651 #: builtin/notes.c:498

1652 msgid "command"

1653 msgstr "kommando"

1654

1663 -#: archive.c:581 builtin/archive.c:94

1655 +#: archive.c:575 builtin/archive.c:94

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

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

1658

1667 -#: archive.c:588

1659 +#: archive.c:582

1660 msgid "Unexpected option --remote"

1661 msgstr "Oväntad flagga --remote"

1662

1671 -#: archive.c:590

1663 +#: archive.c:584

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

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

1666

1675 -#: archive.c:592

1667 +#: archive.c:586

1668 msgid "Unexpected option --output"

1669 msgstr "Oväntad flagga --output"

1670

1679 -#: archive.c:594

1671 +#: archive.c:588

1672 msgid "Options --add-file and --remote cannot be used together"

1673 msgstr "Flaggorna --add-file och --remote kan inte användas samtidigt"

1674

1683 -#: archive.c:616

1675 +#: archive.c:610

1676 #, c-format

1677 msgid "Unknown archive format '%s'"

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

1679

1688 -#: archive.c:623

1680 +#: archive.c:619

1681 #, c-format

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

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

1684

1693 -#: attr.c:212

1685 +#: attr.c:202

1686 #, c-format

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

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

1689

1698 -#: attr.c:369

1690 +#: attr.c:359

1691 #, c-format

1692 msgid "%s not allowed: %s:%d"

1693 msgstr "%s inte tillåtet: %s:%d"

1694

1703 -#: attr.c:409

1695 +#: attr.c:399

1696 msgid ""

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

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

@@ -1708,22 +1700,22 @@ msgstr ""

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

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

1702

1711 -#: bisect.c:476

1703 +#: bisect.c:489

1704 #, c-format

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

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

1707

1716 -#: bisect.c:686

1708 +#: bisect.c:699

1709 #, c-format

1710 msgid "We cannot bisect more!\n"

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

1712

1721 -#: bisect.c:753

1713 +#: bisect.c:766

1714 #, c-format

1715 msgid "Not a valid commit name %s"

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

1717

1726 -#: bisect.c:778

1718 +#: bisect.c:791

1719 #, c-format

1720 msgid ""

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

@@ -1732,7 +1724,7 @@ msgstr ""

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

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

1726

1735 -#: bisect.c:783

1727 +#: bisect.c:796

1728 #, c-format

1729 msgid ""

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

@@ -1741,7 +1733,7 @@ msgstr ""

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

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

1735

1744 -#: bisect.c:788

1736 +#: bisect.c:801

1737 #, c-format

1738 msgid ""

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

@@ -1750,7 +1742,7 @@ msgstr ""

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

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

1744

1753 -#: bisect.c:796

1745 +#: bisect.c:809

1746 #, c-format

1747 msgid ""

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

@@ -1761,7 +1753,7 @@ msgstr ""

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

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

1755

1764 -#: bisect.c:809

1756 +#: bisect.c:822

1757 #, c-format

1758 msgid ""

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

@@ -1773,36 +1765,36 @@ msgstr ""

1765 "%s.\n"

1766 "Vi fortsätter ändå."

1767

1776 -#: bisect.c:848

1768 +#: bisect.c:861

1769 #, c-format

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

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

1772

1781 -#: bisect.c:898

1773 +#: bisect.c:911

1774 #, c-format

1775 msgid "a %s revision is needed"

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

1777

1786 -#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255

1778 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255

1779 #, c-format

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

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

1782

1791 -#: bisect.c:974 builtin/merge.c:150

1783 +#: bisect.c:987 builtin/merge.c:152

1784 #, c-format

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

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

1787

1796 -#: bisect.c:1014

1788 +#: bisect.c:1027

1789 msgid "reading bisect refs failed"

1790 msgstr "misslyckades läsa bisect-referenser"

1791

1800 -#: bisect.c:1044

1792 +#: bisect.c:1057

1793 #, c-format

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

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

1796

1805 -#: bisect.c:1053

1797 +#: bisect.c:1066

1798 #, c-format

1799 msgid ""

1800 "No testable commit found.\n"

@@ -1811,7 +1803,7 @@ msgstr ""

1803 "Ingen testbar incheckning hittades.\n"

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

1805

1814 -#: bisect.c:1082

1806 +#: bisect.c:1095

1807 #, c-format

1808 msgid "(roughly %d step)"

1809 msgid_plural "(roughly %d steps)"

@@ -1821,48 +1813,48 @@ msgstr[1] "(ungefär %d steg)"

1813 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

1814 #. steps)" translation.

1815 #.

1824 -#: bisect.c:1088

1816 +#: bisect.c:1101

1817 #, c-format

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

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

1820 msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n"

1821 msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n"

1822

1831 -#: blame.c:2778

1823 +#: blame.c:2777

1824 msgid "--contents and --reverse do not blend well."

1825 msgstr "--contents och --reverse fungerar inte så bra tillsammans."

1826

1835 -#: blame.c:2792

1827 +#: blame.c:2791

1828 msgid "cannot use --contents with final commit object name"

1829 msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"

1830

1839 -#: blame.c:2813

1831 +#: blame.c:2812

1832 msgid "--reverse and --first-parent together require specified latest commit"

1833 msgstr ""

1834 "--reverse och --first-parent tillsammans kräver att du anger senaste "

1835 "incheckningen"

1836

1845 -#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105

1846 -#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404

1847 -#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319

1848 -#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395

1849 -#: builtin/shortlog.c:320

1837 +#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138

1838 +#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409

1839 +#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336

1840 +#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395

1841 +#: builtin/shortlog.c:267

1842 msgid "revision walk setup failed"

1843 msgstr "misslyckades skapa revisionstraversering"

1844

1853 -#: blame.c:2840

1845 +#: blame.c:2839

1846 msgid ""

1847 "--reverse --first-parent together require range along first-parent chain"

1848 msgstr ""

1849 "--reverse --first-parent tillsammans kräver ett intervall på första-förälder-"

1850 "kedjan"

1851

1860 -#: blame.c:2851

1852 +#: blame.c:2850

1853 #, c-format

1854 msgid "no such path %s in %s"

1855 msgstr "sökvägen %s i %s finns inte"

1856

1865 -#: blame.c:2862

1857 +#: blame.c:2861

1858 #, c-format

1859 msgid "cannot read blob %s for path %s"

1860 msgstr "kan inte läsa objektet %s för sökvägen %s"

@@ -2030,7 +2022,7 @@ msgstr "'%s' ser inte ut som en v2- eller v3-paket-fil (bundle)"

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

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

2024

2033 -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142

2025 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176

2026 #: builtin/commit.c:814

2027 #, c-format

2028 msgid "could not open '%s'"

@@ -2093,7 +2085,7 @@ msgstr "version %d för paket (bundle) stöds ej"

2085 msgid "cannot write bundle version %d with algorithm %s"

2086 msgstr "kan inte skriva paket (bundle) med version %d med algoritmen %s"

2087

2096 -#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461

2088 +#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408

2089 #, c-format

2090 msgid "unrecognized argument: %s"

2091 msgstr "okänt argument: %s"

@@ -2116,7 +2108,7 @@ msgstr "index-pack dog"

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

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

2110

2119 -#: commit-graph.c:188 midx.c:46

2111 +#: commit-graph.c:188 midx.c:47

2112 msgid "invalid hash version"

2113 msgstr "felaktig hashnings-version"

2114

@@ -2180,7 +2172,7 @@ msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"

2172 msgid "could not find commit %s"

2173 msgstr "kunde inte hitta incheckningen %s"

2174

2183 -#: commit-graph.c:1042 builtin/am.c:1306

2175 +#: commit-graph.c:1042 builtin/am.c:1292

2176 #, c-format

2177 msgid "unable to parse commit %s"

2178 msgstr "kunde inte tolka incheckningen %s"

@@ -2247,7 +2239,7 @@ msgstr "Söker ytterligare kanter i incheckingsgraf"

2239 msgid "failed to write correct number of base graph ids"

2240 msgstr "kunde inte skriva korrekt antal bas-graf-id:n"

2241

2250 -#: commit-graph.c:1720 midx.c:826

2242 +#: commit-graph.c:1720 midx.c:819

2243 #, c-format

2244 msgid "unable to create leading directories of %s"

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

@@ -2284,77 +2276,77 @@ msgstr "kunde inte byta namn på temporär incheckningsgraffil"

2276 msgid "Scanning merged commits"

2277 msgstr "Söker sammanslagna incheckningar"

2278

2287 -#: commit-graph.c:2026

2288 -#, c-format

2289 -msgid "unexpected duplicate commit id %s"

2290 -msgstr "oväntat duplicerat inchecknings-id %s"

2291 -

2292 -#: commit-graph.c:2049

2279 +#: commit-graph.c:2059

2280 msgid "Merging commit-graph"

2281 msgstr "Slår ihop incheckningsgraf"

2282

2296 -#: commit-graph.c:2259

2283 +#: commit-graph.c:2165

2284 +msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"

2285 +msgstr ""

2286 +"försöker skriva en incheckningsgraf, men \"core.commitGraph\" är inaktiverad"

2287 +

2288 +#: commit-graph.c:2274

2289 #, c-format

2290 msgid "the commit graph format cannot write %d commits"

2291 msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar"

2292

2301 -#: commit-graph.c:2270

2293 +#: commit-graph.c:2285

2294 msgid "too many commits to write graph"

2295 msgstr "för många incheckningar för att skriva graf"

2296

2305 -#: commit-graph.c:2363

2297 +#: commit-graph.c:2378

2298 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

2299 msgstr ""

2300 "filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig"

2301

2310 -#: commit-graph.c:2373

2302 +#: commit-graph.c:2388

2303 #, c-format

2304 msgid "commit-graph has incorrect OID order: %s then %s"

2305 msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"

2306

2315 -#: commit-graph.c:2383 commit-graph.c:2398

2307 +#: commit-graph.c:2398 commit-graph.c:2413

2308 #, c-format

2309 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

2310 msgstr ""

2311 "incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u"

2312

2321 -#: commit-graph.c:2390

2313 +#: commit-graph.c:2405

2314 #, c-format

2315 msgid "failed to parse commit %s from commit-graph"

2316 msgstr "kunde inte tolka incheckning %s från incheckningsgraf"

2317

2326 -#: commit-graph.c:2408

2318 +#: commit-graph.c:2423

2319 msgid "Verifying commits in commit graph"

2320 msgstr "Bekräftar incheckningar i incheckningsgrafen"

2321

2330 -#: commit-graph.c:2423

2322 +#: commit-graph.c:2438

2323 #, c-format

2324 msgid "failed to parse commit %s from object database for commit-graph"

2325 msgstr ""

2326 "misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf"

2327

2336 -#: commit-graph.c:2430

2328 +#: commit-graph.c:2445

2329 #, c-format

2330 msgid "root tree OID for commit %s in commit-graph is %s != %s"

2331 msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s"

2332

2341 -#: commit-graph.c:2440

2333 +#: commit-graph.c:2455

2334 #, c-format

2335 msgid "commit-graph parent list for commit %s is too long"

2336 msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång"

2337

2346 -#: commit-graph.c:2449

2338 +#: commit-graph.c:2464

2339 #, c-format

2340 msgid "commit-graph parent for %s is %s != %s"

2341 msgstr "incheckningsgrafens förälder för %s är %s != %s"

2342

2351 -#: commit-graph.c:2463

2343 +#: commit-graph.c:2478

2344 #, c-format

2345 msgid "commit-graph parent list for commit %s terminates early"

2346 msgstr ""

2347 "incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt"

2348

2357 -#: commit-graph.c:2468

2349 +#: commit-graph.c:2483

2350 #, c-format

2351 msgid ""

2352 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"

@@ -2362,7 +2354,7 @@ msgstr ""

2354 "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"

2355 "noll på annan plats"

2356

2365 -#: commit-graph.c:2472

2357 +#: commit-graph.c:2487

2358 #, c-format

2359 msgid ""

2360 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"

@@ -2370,20 +2362,20 @@ msgstr ""

2362 "incheckningsgrafen har generationsnummer skilt från noll för incheckningen "

2363 "%s, men noll på annan plats"

2364

2373 -#: commit-graph.c:2488

2365 +#: commit-graph.c:2503

2366 #, c-format

2367 msgid "commit-graph generation for commit %s is %u != %u"

2368 msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u"

2369

2378 -#: commit-graph.c:2494

2370 +#: commit-graph.c:2509

2371 #, c-format

2372 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

2373 msgstr ""

2374 "incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !"

2375 "= %<PRIuMAX>"

2376

2385 -#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417

2386 -#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457

2377 +#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403

2378 +#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457

2379 #, c-format

2380 msgid "could not parse %s"

2381 msgstr "kunde inte tolka %s"

@@ -2487,7 +2479,7 @@ msgstr "nyckeln innehåller inte ett stycke: %s"

2479 msgid "key does not contain variable name: %s"

2480 msgstr "nyckeln innehåller inte variabelnamn: %s"

2481

2490 -#: config.c:408 sequencer.c:2547

2482 +#: config.c:408 sequencer.c:2580

2483 #, c-format

2484 msgid "invalid key: %s"

2485 msgstr "felaktig nyckel: %s"

@@ -2683,77 +2675,77 @@ msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"

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

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

2677

2686 -#: config.c:2470

2678 +#: config.c:2473

2679 #, c-format

2680 msgid "invalid section name '%s'"

2681 msgstr "felaktigt sektionsnamn \"%s\""

2682

2691 -#: config.c:2502

2683 +#: config.c:2505

2684 #, c-format

2685 msgid "%s has multiple values"

2686 msgstr "%s har flera värden"

2687

2696 -#: config.c:2531

2688 +#: config.c:2534

2689 #, c-format

2690 msgid "failed to write new configuration file %s"

2691 msgstr "kan inte skriva nya konfigurationsfilen \"%s\""

2692

2701 -#: config.c:2783 config.c:3107

2693 +#: config.c:2786 config.c:3112

2694 #, c-format

2695 msgid "could not lock config file %s"

2696 msgstr "kunde inte låsa konfigurationsfilen %s"

2697

2706 -#: config.c:2794

2698 +#: config.c:2797

2699 #, c-format

2700 msgid "opening %s"

2701 msgstr "öppnar %s"

2702

2711 -#: config.c:2829 builtin/config.c:354

2703 +#: config.c:2834 builtin/config.c:361

2704 #, c-format

2705 msgid "invalid pattern: %s"

2706 msgstr "ogiltigt mönster: %s"

2707

2716 -#: config.c:2854

2708 +#: config.c:2859

2709 #, c-format

2710 msgid "invalid config file %s"

2711 msgstr "ogiltig konfigurationsfil: \"%s\""

2712

2721 -#: config.c:2867 config.c:3120

2713 +#: config.c:2872 config.c:3125

2714 #, c-format

2715 msgid "fstat on %s failed"

2716 msgstr "fstat misslyckades på %s"

2717

2726 -#: config.c:2878

2718 +#: config.c:2883

2719 #, c-format

2720 msgid "unable to mmap '%s'"

2721 msgstr "kunde inte utföra mmap på \"%s\""

2722

2731 -#: config.c:2887 config.c:3125

2723 +#: config.c:2892 config.c:3130

2724 #, c-format

2725 msgid "chmod on %s failed"

2726 msgstr "chmod misslyckades på %s"

2727

2736 -#: config.c:2972 config.c:3222

2728 +#: config.c:2977 config.c:3227

2729 #, c-format

2730 msgid "could not write config file %s"

2731 msgstr "kunde inte skriva konfigurationsfilen %s"

2732

2741 -#: config.c:3006

2733 +#: config.c:3011

2734 #, c-format

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

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

2737

2746 -#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858

2738 +#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2739 #, c-format

2740 msgid "could not unset '%s'"

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

2742

2751 -#: config.c:3098

2743 +#: config.c:3103

2744 #, c-format

2745 msgid "invalid section name: %s"

2746 msgstr "felaktigt namn på stycke: %s"

2747

2756 -#: config.c:3265

2748 +#: config.c:3270

2749 #, c-format

2750 msgid "missing value for '%s'"

2751 msgstr "värde saknas för \"%s\""

@@ -3192,6 +3184,26 @@ msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)"

3184 msgid "Marked %d islands, done.\n"

3185 msgstr "Markerade %d öar, klar.\n"

3186

3187 +#: diff-lib.c:534

3188 +msgid "--merge-base does not work with ranges"

3189 +msgstr "--merge-base fungerar inte med intervall"

3190 +

3191 +#: diff-lib.c:536

3192 +msgid "--merge-base only works with commits"

3193 +msgstr "--merge-base fungerar bara med incheckningar"

3194 +

3195 +#: diff-lib.c:553

3196 +msgid "unable to get HEAD"

3197 +msgstr "kan inte hämta HEAD"

3198 +

3199 +#: diff-lib.c:560

3200 +msgid "no merge base found"

3201 +msgstr "ingen sammanslagningsbas hittades"

3202 +

3203 +#: diff-lib.c:562

3204 +msgid "multiple merge bases found"

3205 +msgstr "flera sammanslagningsbaser hittades"

3206 +

3207 #: diff-no-index.c:238

3208 msgid "git diff --no-index [<options>] <path> <path>"

3209 msgstr "git diff --no-index [<flaggor>] <sökväg> <sökväg>"

@@ -3254,35 +3266,35 @@ msgstr ""

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

3267 "%s"

3268

3257 -#: diff.c:4269

3269 +#: diff.c:4276

3270 #, c-format

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

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

3273

3262 -#: diff.c:4618

3274 +#: diff.c:4625

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

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

3277

3266 -#: diff.c:4621

3278 +#: diff.c:4628

3279 msgid "-G, -S and --find-object are mutually exclusive"

3280 msgstr "-G, -S och --find-object är ömsesidigt uteslutande"

3281

3270 -#: diff.c:4699

3282 +#: diff.c:4706

3283 msgid "--follow requires exactly one pathspec"

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

3285

3274 -#: diff.c:4747

3286 +#: diff.c:4754

3287 #, c-format

3288 msgid "invalid --stat value: %s"

3289 msgstr "ogiltigt värde för --stat: %s"

3290

3279 -#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279

3291 +#: diff.c:4759 diff.c:4764 diff.c:4769 diff.c:4774 diff.c:5302

3292 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180

3293 #, c-format

3294 msgid "%s expects a numerical value"

3295 msgstr "%s förväntar ett numeriskt värde"

3296

3285 -#: diff.c:4784

3297 +#: diff.c:4791

3298 #, c-format

3299 msgid ""

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

@@ -3291,42 +3303,42 @@ msgstr ""

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

3304 "%s"

3305

3294 -#: diff.c:4869

3306 +#: diff.c:4876

3307 #, c-format

3308 msgid "unknown change class '%c' in --diff-filter=%s"

3309 msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s"

3310

3299 -#: diff.c:4893

3311 +#: diff.c:4900

3312 #, c-format

3313 msgid "unknown value after ws-error-highlight=%.*s"

3314 msgstr "okänt värde efter ws-error-highlight=%.*s"

3315

3304 -#: diff.c:4907

3316 +#: diff.c:4914

3317 #, c-format

3318 msgid "unable to resolve '%s'"

3319 msgstr "kunde inte slå upp \"%s\""

3320

3309 -#: diff.c:4957 diff.c:4963

3321 +#: diff.c:4964 diff.c:4970

3322 #, c-format

3323 msgid "%s expects <n>/<m> form"

3324 msgstr "%s förväntar formen <n>/<m>"

3325

3314 -#: diff.c:4975

3326 +#: diff.c:4982

3327 #, c-format

3328 msgid "%s expects a character, got '%s'"

3329 msgstr "%s förväntar ett tecken, fick \"%s\""

3330

3319 -#: diff.c:4996

3331 +#: diff.c:5003

3332 #, c-format

3333 msgid "bad --color-moved argument: %s"

3334 msgstr "felaktigt argument till --color-moved: %s"

3335

3324 -#: diff.c:5015

3336 +#: diff.c:5022

3337 #, c-format

3338 msgid "invalid mode '%s' in --color-moved-ws"

3339 msgstr "ogiltigt läge %s\" i --color-moved-ws"

3340

3329 -#: diff.c:5055

3341 +#: diff.c:5062

3342 msgid ""

3343 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3344 "\"histogram\""

@@ -3334,149 +3346,154 @@ msgstr ""

3346 "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "

3347 "\"histogram\""

3348

3337 -#: diff.c:5091 diff.c:5111

3349 +#: diff.c:5098 diff.c:5118

3350 #, c-format

3351 msgid "invalid argument to %s"

3352 msgstr "ogiltigt argument för %s"

3353

3342 -#: diff.c:5248

3354 +#: diff.c:5222

3355 +#, c-format

3356 +msgid "invalid regex given to -I: '%s'"

3357 +msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\""

3358 +

3359 +#: diff.c:5271

3360 #, c-format

3361 msgid "failed to parse --submodule option parameter: '%s'"

3362 msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""

3363

3347 -#: diff.c:5304

3364 +#: diff.c:5327

3365 #, c-format

3366 msgid "bad --word-diff argument: %s"

3367 msgstr "felaktigt argument --word-diff: %s"

3368

3352 -#: diff.c:5327

3369 +#: diff.c:5350

3370 msgid "Diff output format options"

3371 msgstr "Formatflaggor för diff-utdata"

3372

3356 -#: diff.c:5329 diff.c:5335

3373 +#: diff.c:5352 diff.c:5358

3374 msgid "generate patch"

3375 msgstr "skapar patch"

3376

3360 -#: diff.c:5332 builtin/log.c:176

3377 +#: diff.c:5355 builtin/log.c:178

3378 msgid "suppress diff output"

3379 msgstr "undertryck diff-utdata"

3380

3364 -#: diff.c:5337 diff.c:5451 diff.c:5458

3381 +#: diff.c:5360 diff.c:5474 diff.c:5481

3382 msgid "<n>"

3383 msgstr "<n>"

3384

3368 -#: diff.c:5338 diff.c:5341

3385 +#: diff.c:5361 diff.c:5364

3386 msgid "generate diffs with <n> lines context"

3387 msgstr "skapa diffar med <n> rader sammanhang"

3388

3372 -#: diff.c:5343

3389 +#: diff.c:5366

3390 msgid "generate the diff in raw format"

3391 msgstr "generera diff i råformat"

3392

3376 -#: diff.c:5346

3393 +#: diff.c:5369

3394 msgid "synonym for '-p --raw'"

3395 msgstr "synonym till \"-p --raw\""

3396

3380 -#: diff.c:5350

3397 +#: diff.c:5373

3398 msgid "synonym for '-p --stat'"

3399 msgstr "synonym till \"-p --stat\""

3400

3384 -#: diff.c:5354

3401 +#: diff.c:5377

3402 msgid "machine friendly --stat"

3403 msgstr "maskinläsbar --stat"

3404

3388 -#: diff.c:5357

3405 +#: diff.c:5380

3406 msgid "output only the last line of --stat"

3407 msgstr "skriv bara ut den sista raden för --stat"

3408

3392 -#: diff.c:5359 diff.c:5367

3409 +#: diff.c:5382 diff.c:5390

3410 msgid "<param1,param2>..."

3411 msgstr "<param1,param2>..."

3412

3396 -#: diff.c:5360

3413 +#: diff.c:5383

3414 msgid ""

3415 "output the distribution of relative amount of changes for each sub-directory"

3416 msgstr ""

3417 "skriv ut distributionen av relativa mängder ändringar för varje underkatalog"

3418

3402 -#: diff.c:5364

3419 +#: diff.c:5387

3420 msgid "synonym for --dirstat=cumulative"

3421 msgstr "synonym för --dirstat=cumulative"

3422

3406 -#: diff.c:5368

3423 +#: diff.c:5391

3424 msgid "synonym for --dirstat=files,param1,param2..."

3425 msgstr "synonym för --dirstat=filer,param1,param2..."

3426

3410 -#: diff.c:5372

3427 +#: diff.c:5395

3428 msgid "warn if changes introduce conflict markers or whitespace errors"

3429 msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"

3430

3414 -#: diff.c:5375

3431 +#: diff.c:5398

3432 msgid "condensed summary such as creations, renames and mode changes"

3433 msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"

3434

3418 -#: diff.c:5378

3435 +#: diff.c:5401

3436 msgid "show only names of changed files"

3437 msgstr "visa endast namnen på ändrade filer"

3438

3422 -#: diff.c:5381

3439 +#: diff.c:5404

3440 msgid "show only names and status of changed files"

3441 msgstr "visa endast namn och status för ändrade filer"

3442

3426 -#: diff.c:5383

3443 +#: diff.c:5406

3444 msgid "<width>[,<name-width>[,<count>]]"

3445 msgstr "<bredd>[,<namn-bredd>[,<antal>]]"

3446

3430 -#: diff.c:5384

3447 +#: diff.c:5407

3448 msgid "generate diffstat"

3449 msgstr "skapa diffstat"

3450

3434 -#: diff.c:5386 diff.c:5389 diff.c:5392

3451 +#: diff.c:5409 diff.c:5412 diff.c:5415

3452 msgid "<width>"

3453 msgstr "<bredd>"

3454

3438 -#: diff.c:5387

3455 +#: diff.c:5410

3456 msgid "generate diffstat with a given width"

3457 msgstr "generera en diffstat med given bredd"

3458

3442 -#: diff.c:5390

3459 +#: diff.c:5413

3460 msgid "generate diffstat with a given name width"

3461 msgstr "generera en diffstat med given namnbredd"

3462

3446 -#: diff.c:5393

3463 +#: diff.c:5416

3464 msgid "generate diffstat with a given graph width"

3465 msgstr "generera en diffstat med given grafbredd"

3466

3450 -#: diff.c:5395

3467 +#: diff.c:5418

3468 msgid "<count>"

3469 msgstr "<antal>"

3470

3454 -#: diff.c:5396

3471 +#: diff.c:5419

3472 msgid "generate diffstat with limited lines"

3473 msgstr "generera diffstat med begränsade rader"

3474

3458 -#: diff.c:5399

3475 +#: diff.c:5422

3476 msgid "generate compact summary in diffstat"

3477 msgstr "skapa kompakt översikt i diffstat"

3478

3462 -#: diff.c:5402

3479 +#: diff.c:5425

3480 msgid "output a binary diff that can be applied"

3481 msgstr "skapa en binärdiff som kan appliceras"

3482

3466 -#: diff.c:5405

3483 +#: diff.c:5428

3484 msgid "show full pre- and post-image object names on the \"index\" lines"

3485 msgstr ""

3486 "visa fullständiga objektnamn i \"index\"-rader för läget både före och efter"

3487

3471 -#: diff.c:5407

3488 +#: diff.c:5430

3489 msgid "show colored diff"

3490 msgstr "visa färgad diff"

3491

3475 -#: diff.c:5408

3492 +#: diff.c:5431

3493 msgid "<kind>"

3494 msgstr "<typ>"

3495

3479 -#: diff.c:5409

3496 +#: diff.c:5432

3497 msgid ""

3498 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3499 "diff"

@@ -3484,7 +3501,7 @@ msgstr ""

3501 "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "

3502 "\"new\" (nya) rader i diffen"

3503

3487 -#: diff.c:5412

3504 +#: diff.c:5435

3505 msgid ""

3506 "do not munge pathnames and use NULs as output field terminators in --raw or "

3507 "--numstat"

@@ -3492,87 +3509,87 @@ msgstr ""

3509 "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "

3510 "eller --numstat"

3511

3495 -#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527

3512 +#: diff.c:5438 diff.c:5441 diff.c:5444 diff.c:5553

3513 msgid "<prefix>"

3514 msgstr "<prefix>"

3515

3499 -#: diff.c:5416

3516 +#: diff.c:5439

3517 msgid "show the given source prefix instead of \"a/\""

3518 msgstr "visa givet källprefix istället för \"a/\""

3519

3503 -#: diff.c:5419

3520 +#: diff.c:5442

3521 msgid "show the given destination prefix instead of \"b/\""

3522 msgstr "visa givet målprefix istället för \"b/\""

3523

3507 -#: diff.c:5422

3524 +#: diff.c:5445

3525 msgid "prepend an additional prefix to every line of output"

3526 msgstr "lägg till ytterligare prefix på alla rader i utdata"

3527

3511 -#: diff.c:5425

3528 +#: diff.c:5448

3529 msgid "do not show any source or destination prefix"

3530 msgstr "visa inte käll- eller målprefix"

3531

3515 -#: diff.c:5428

3532 +#: diff.c:5451

3533 msgid "show context between diff hunks up to the specified number of lines"

3534 msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader"

3535

3519 -#: diff.c:5432 diff.c:5437 diff.c:5442

3536 +#: diff.c:5455 diff.c:5460 diff.c:5465

3537 msgid "<char>"

3538 msgstr "<tecken>"

3539

3523 -#: diff.c:5433

3540 +#: diff.c:5456

3541 msgid "specify the character to indicate a new line instead of '+'"

3542 msgstr "ange tecken för att ange ny rad istället för \"+\""

3543

3527 -#: diff.c:5438

3544 +#: diff.c:5461

3545 msgid "specify the character to indicate an old line instead of '-'"

3546 msgstr "ange tecken för att ange gammal rad istället för \"-\""

3547

3531 -#: diff.c:5443

3548 +#: diff.c:5466

3549 msgid "specify the character to indicate a context instead of ' '"

3550 msgstr "ange tecken för att ange sammanhang istället för \" \""

3551

3535 -#: diff.c:5446

3552 +#: diff.c:5469

3553 msgid "Diff rename options"

3554 msgstr "Diff-namnbytesflaggor"

3555

3539 -#: diff.c:5447

3556 +#: diff.c:5470

3557 msgid "<n>[/<m>]"

3558 msgstr "<n>[/<m>]"

3559

3543 -#: diff.c:5448

3560 +#: diff.c:5471

3561 msgid "break complete rewrite changes into pairs of delete and create"

3562 msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"

3563

3547 -#: diff.c:5452

3564 +#: diff.c:5475

3565 msgid "detect renames"

3566 msgstr "detektera namnändringar"

3567

3551 -#: diff.c:5456

3568 +#: diff.c:5479

3569 msgid "omit the preimage for deletes"

3570 msgstr "ta bort för-version för borttagningar"

3571

3555 -#: diff.c:5459

3572 +#: diff.c:5482

3573 msgid "detect copies"

3574 msgstr "detektera kopior"

3575

3559 -#: diff.c:5463

3576 +#: diff.c:5486

3577 msgid "use unmodified files as source to find copies"

3578 msgstr "använd oförändrade som källa för att hitta kopior"

3579

3563 -#: diff.c:5465

3580 +#: diff.c:5488

3581 msgid "disable rename detection"

3582 msgstr "inaktivera detektering av namnbyten"

3583

3567 -#: diff.c:5468

3584 +#: diff.c:5491

3585 msgid "use empty blobs as rename source"

3586 msgstr "använd tomma blob:ar som namnändringskälla"

3587

3571 -#: diff.c:5470

3588 +#: diff.c:5493

3589 msgid "continue listing the history of a file beyond renames"

3590 msgstr "fortsätt lista historiken för en fil bortom namnändringar"

3591

3575 -#: diff.c:5473

3592 +#: diff.c:5496

3593 msgid ""

3594 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3595 "given limit"

@@ -3580,159 +3597,163 @@ msgstr ""

3597 "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "

3598 "given gräns"

3599

3583 -#: diff.c:5475

3600 +#: diff.c:5498

3601 msgid "Diff algorithm options"

3602 msgstr "Alternativ för diff-algoritm"

3603

3587 -#: diff.c:5477

3604 +#: diff.c:5500

3605 msgid "produce the smallest possible diff"

3606 msgstr "skapa minsta möjliga diff"

3607

3591 -#: diff.c:5480

3608 +#: diff.c:5503

3609 msgid "ignore whitespace when comparing lines"

3610 msgstr "ignorera blanktecken vid radjämförelse"

3611

3595 -#: diff.c:5483

3612 +#: diff.c:5506

3613 msgid "ignore changes in amount of whitespace"

3614 msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"

3615

3599 -#: diff.c:5486

3616 +#: diff.c:5509

3617 msgid "ignore changes in whitespace at EOL"

3618 msgstr "ignorera blanktecken vid radslut"

3619

3603 -#: diff.c:5489

3620 +#: diff.c:5512

3621 msgid "ignore carrier-return at the end of line"

3622 msgstr "ignorera CR-tecken vid radslut"

3623

3607 -#: diff.c:5492

3624 +#: diff.c:5515

3625 msgid "ignore changes whose lines are all blank"

3626 msgstr "ignorera ändringar i rader som är helt blanka"

3627

3611 -#: diff.c:5495

3628 +#: diff.c:5517 diff.c:5539 diff.c:5542 diff.c:5587

3629 +msgid "<regex>"

3630 +msgstr "<reguttr>"

3631 +

3632 +#: diff.c:5518

3633 +msgid "ignore changes whose all lines match <regex>"

3634 +msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>"

3635 +

3636 +#: diff.c:5521

3637 msgid "heuristic to shift diff hunk boundaries for easy reading"

3638 msgstr "heuristik för att flytta diff-gränser för lättare läsning"

3639

3615 -#: diff.c:5498

3640 +#: diff.c:5524

3641 msgid "generate diff using the \"patience diff\" algorithm"

3642 msgstr "skapa diffar med algoritmen \"patience diff\""

3643

3619 -#: diff.c:5502

3644 +#: diff.c:5528

3645 msgid "generate diff using the \"histogram diff\" algorithm"

3646 msgstr "skapa diffar med algoritmen \"histogram diff\""

3647

3623 -#: diff.c:5504

3648 +#: diff.c:5530

3649 msgid "<algorithm>"

3650 msgstr "<algoritm>"

3651

3627 -#: diff.c:5505

3652 +#: diff.c:5531

3653 msgid "choose a diff algorithm"

3654 msgstr "välj en diff-algoritm"

3655

3631 -#: diff.c:5507

3656 +#: diff.c:5533

3657 msgid "<text>"

3658 msgstr "<text>"

3659

3635 -#: diff.c:5508

3660 +#: diff.c:5534

3661 msgid "generate diff using the \"anchored diff\" algorithm"

3662 msgstr "skapa diffar med algoritmen \"anchored diff\""

3663

3639 -#: diff.c:5510 diff.c:5519 diff.c:5522

3664 +#: diff.c:5536 diff.c:5545 diff.c:5548

3665 msgid "<mode>"

3666 msgstr "<läge>"

3667

3643 -#: diff.c:5511

3668 +#: diff.c:5537

3669 msgid "show word diff, using <mode> to delimit changed words"

3670 msgstr "visa orddiff, där <läge> avgränsar ändrade ord"

3671

3647 -#: diff.c:5513 diff.c:5516 diff.c:5561

3648 -msgid "<regex>"

3649 -msgstr "<reguttr>"

3650 -

3651 -#: diff.c:5514

3672 +#: diff.c:5540

3673 msgid "use <regex> to decide what a word is"

3674 msgstr "använd <reguttr> för att bestämma vad som är ett ord"

3675

3655 -#: diff.c:5517

3676 +#: diff.c:5543

3677 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3678 msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"

3679

3659 -#: diff.c:5520

3680 +#: diff.c:5546

3681 msgid "moved lines of code are colored differently"

3682 msgstr "flyttade kodrader färgas på annat sätt"

3683

3663 -#: diff.c:5523

3684 +#: diff.c:5549

3685 msgid "how white spaces are ignored in --color-moved"

3686 msgstr "hur blanktecken ignoreras i --color-moved"

3687

3667 -#: diff.c:5526

3688 +#: diff.c:5552

3689 msgid "Other diff options"

3690 msgstr "Andra diff-flaggor"

3691

3671 -#: diff.c:5528

3692 +#: diff.c:5554

3693 msgid "when run from subdir, exclude changes outside and show relative paths"

3694 msgstr ""

3695 "vid start från underkatalog, uteslut ändringar utanför och visa relativa "

3696 "sökvägar"

3697

3677 -#: diff.c:5532

3698 +#: diff.c:5558

3699 msgid "treat all files as text"

3700 msgstr "hantera alla filer som text"

3701

3681 -#: diff.c:5534

3702 +#: diff.c:5560

3703 msgid "swap two inputs, reverse the diff"

3704 msgstr "växla två indatafiler, vänd diffen"

3705

3685 -#: diff.c:5536

3706 +#: diff.c:5562

3707 msgid "exit with 1 if there were differences, 0 otherwise"

3708 msgstr "avsluta med 1 vid ändringar, annars 0"

3709

3689 -#: diff.c:5538

3710 +#: diff.c:5564

3711 msgid "disable all output of the program"

3712 msgstr "slå av alla utdata från programmet"

3713

3693 -#: diff.c:5540

3714 +#: diff.c:5566

3715 msgid "allow an external diff helper to be executed"

3716 msgstr "tillåt köra en extern diff-hjälpare"

3717

3697 -#: diff.c:5542

3718 +#: diff.c:5568

3719 msgid "run external text conversion filters when comparing binary files"

3720 msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"

3721

3701 -#: diff.c:5544

3722 +#: diff.c:5570

3723 msgid "<when>"

3724 msgstr "<när>"

3725

3705 -#: diff.c:5545

3726 +#: diff.c:5571

3727 msgid "ignore changes to submodules in the diff generation"

3728 msgstr "ignorera ändringar i undermoduler när diffen skapas"

3729

3709 -#: diff.c:5548

3730 +#: diff.c:5574

3731 msgid "<format>"

3732 msgstr "<format>"

3733

3713 -#: diff.c:5549

3734 +#: diff.c:5575

3735 msgid "specify how differences in submodules are shown"

3736 msgstr "ange hur ändringar i undermoduler visas"

3737

3717 -#: diff.c:5553

3738 +#: diff.c:5579

3739 msgid "hide 'git add -N' entries from the index"

3740 msgstr "dölj \"git add -N\"-poster från indexet"

3741

3721 -#: diff.c:5556

3742 +#: diff.c:5582

3743 msgid "treat 'git add -N' entries as real in the index"

3744 msgstr "tolka \"git add -N\"-poster som äkta i indexet"

3745

3725 -#: diff.c:5558

3746 +#: diff.c:5584

3747 msgid "<string>"

3748 msgstr "<sträng>"

3749

3729 -#: diff.c:5559

3750 +#: diff.c:5585

3751 msgid ""

3752 "look for differences that change the number of occurrences of the specified "

3753 "string"

3754 msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng"

3755

3735 -#: diff.c:5562

3756 +#: diff.c:5588

3757 msgid ""

3758 "look for differences that change the number of occurrences of the specified "

3759 "regex"

@@ -3740,54 +3761,54 @@ msgstr ""

3761 "se efter ändringar som ändrar antalet förekomster av angivet reguljärt "

3762 "uttryck"

3763

3743 -#: diff.c:5565

3764 +#: diff.c:5591

3765 msgid "show all changes in the changeset with -S or -G"

3766 msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"

3767

3747 -#: diff.c:5568

3768 +#: diff.c:5594

3769 msgid "treat <string> in -S as extended POSIX regular expression"

3770 msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"

3771

3751 -#: diff.c:5571

3772 +#: diff.c:5597

3773 msgid "control the order in which files appear in the output"

3774 msgstr "styr ordningen i vilken filer visas i utdata"

3775

3755 -#: diff.c:5572

3776 +#: diff.c:5598

3777 msgid "<object-id>"

3778 msgstr "<objekt-id>"

3779

3759 -#: diff.c:5573

3780 +#: diff.c:5599

3781 msgid ""

3782 "look for differences that change the number of occurrences of the specified "

3783 "object"

3784 msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt"

3785

3765 -#: diff.c:5575

3786 +#: diff.c:5601

3787 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3788 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3789

3769 -#: diff.c:5576

3790 +#: diff.c:5602

3791 msgid "select files by diff type"

3792 msgstr "välj filter efter diff-typ"

3793

3773 -#: diff.c:5578

3794 +#: diff.c:5604

3795 msgid "<file>"

3796 msgstr "<fil>"

3797

3777 -#: diff.c:5579

3798 +#: diff.c:5605

3799 msgid "Output to a specific file"

3800 msgstr "Skriv utdata till en specifik fil"

3801

3781 -#: diff.c:6236

3802 +#: diff.c:6262

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

3804 msgstr ""

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

3806

3786 -#: diff.c:6239

3807 +#: diff.c:6265

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

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

3810

3790 -#: diff.c:6242

3811 +#: diff.c:6268

3812 #, c-format

3813 msgid ""

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

@@ -3891,246 +3912,246 @@ msgstr "kunde inte ställa in GIT_DIR till \"%s\""

3912 msgid "too many args to run %s"

3913 msgstr "för många flaggor för att köra %s"

3914

3894 -#: fetch-pack.c:176

3915 +#: fetch-pack.c:177

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

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

3918

3898 -#: fetch-pack.c:179

3919 +#: fetch-pack.c:180

3920 msgid "git fetch-pack: expected a flush packet after shallow list"

3921 msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista"

3922

3902 -#: fetch-pack.c:190

3923 +#: fetch-pack.c:191

3924 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

3925 msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket"

3926

3906 -#: fetch-pack.c:210

3927 +#: fetch-pack.c:211

3928 #, c-format

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

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

3931

3911 -#: fetch-pack.c:221

3932 +#: fetch-pack.c:222

3933 msgid "unable to write to remote"

3934 msgstr "kunde inte skriva till fjärren"

3935

3915 -#: fetch-pack.c:282

3936 +#: fetch-pack.c:283

3937 msgid "--stateless-rpc requires multi_ack_detailed"

3938 msgstr "--stateless-rpc kräver \"multi_ack_detailed\""

3939

3919 -#: fetch-pack.c:375 fetch-pack.c:1397

3940 +#: fetch-pack.c:378 fetch-pack.c:1406

3941 #, c-format

3942 msgid "invalid shallow line: %s"

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

3944

3924 -#: fetch-pack.c:381 fetch-pack.c:1403

3945 +#: fetch-pack.c:384 fetch-pack.c:1412

3946 #, c-format

3947 msgid "invalid unshallow line: %s"

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

3949

3929 -#: fetch-pack.c:383 fetch-pack.c:1405

3950 +#: fetch-pack.c:386 fetch-pack.c:1414

3951 #, c-format

3952 msgid "object not found: %s"

3953 msgstr "objektet hittades inte: %s"

3954

3934 -#: fetch-pack.c:386 fetch-pack.c:1408

3955 +#: fetch-pack.c:389 fetch-pack.c:1417

3956 #, c-format

3957 msgid "error in object: %s"

3958 msgstr "fel i objekt: %s"

3959

3939 -#: fetch-pack.c:388 fetch-pack.c:1410

3960 +#: fetch-pack.c:391 fetch-pack.c:1419

3961 #, c-format

3962 msgid "no shallow found: %s"

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

3964

3944 -#: fetch-pack.c:391 fetch-pack.c:1414

3965 +#: fetch-pack.c:394 fetch-pack.c:1423

3966 #, c-format

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

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

3969

3949 -#: fetch-pack.c:431

3970 +#: fetch-pack.c:434

3971 #, c-format

3972 msgid "got %s %d %s"

3973 msgstr "fick %s %d %s"

3974

3954 -#: fetch-pack.c:448

3975 +#: fetch-pack.c:451

3976 #, c-format

3977 msgid "invalid commit %s"

3978 msgstr "ogiltig incheckning %s"

3979

3959 -#: fetch-pack.c:479

3980 +#: fetch-pack.c:482

3981 msgid "giving up"

3982 msgstr "ger upp"

3983

3963 -#: fetch-pack.c:492 progress.c:339

3984 +#: fetch-pack.c:495 progress.c:339

3985 msgid "done"

3986 msgstr "klart"

3987

3967 -#: fetch-pack.c:504

3988 +#: fetch-pack.c:507

3989 #, c-format

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

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

3992

3972 -#: fetch-pack.c:540

3993 +#: fetch-pack.c:543

3994 #, c-format

3995 msgid "Marking %s as complete"

3996 msgstr "Markerar %s som komplett"

3997

3977 -#: fetch-pack.c:755

3998 +#: fetch-pack.c:758

3999 #, c-format

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

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

4002

3982 -#: fetch-pack.c:824

4003 +#: fetch-pack.c:827

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

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

4006

3986 -#: fetch-pack.c:832

4007 +#: fetch-pack.c:835

4008 msgid "protocol error: bad pack header"

4009 msgstr "protokollfel: felaktigt packhuvud"

4010

3990 -#: fetch-pack.c:916

4011 +#: fetch-pack.c:919

4012 #, c-format

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

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

4015

3995 -#: fetch-pack.c:933

4016 +#: fetch-pack.c:937

4017 #, c-format

4018 msgid "%s failed"

4019 msgstr "%s misslyckades"

4020

4000 -#: fetch-pack.c:935

4021 +#: fetch-pack.c:939

4022 msgid "error in sideband demultiplexer"

4023 msgstr "fel i sidbands-avmultiplexare"

4024

4004 -#: fetch-pack.c:978

4025 +#: fetch-pack.c:982

4026 #, c-format

4027 msgid "Server version is %.*s"

4028 msgstr "Serverversionen är %.*s"

4029

4009 -#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998

4010 -#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014

4011 -#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030

4012 -#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052

4030 +#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005

4031 +#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021

4032 +#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037

4033 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059

4034 #, c-format

4035 msgid "Server supports %s"

4036 msgstr "Servern stöder %s"

4037

4017 -#: fetch-pack.c:985

4038 +#: fetch-pack.c:992

4039 msgid "Server does not support shallow clients"

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

4041

4021 -#: fetch-pack.c:1045

4042 +#: fetch-pack.c:1052

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

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

4045

4025 -#: fetch-pack.c:1050

4046 +#: fetch-pack.c:1057

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

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

4049

4029 -#: fetch-pack.c:1054

4050 +#: fetch-pack.c:1061

4051 msgid "Server does not support --deepen"

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

4053

4033 -#: fetch-pack.c:1056

4054 +#: fetch-pack.c:1063

4055 msgid "Server does not support this repository's object format"

4056 msgstr "Servern stöder inte det här arkivets objektformat"

4057

4037 -#: fetch-pack.c:1069

4058 +#: fetch-pack.c:1076

4059 msgid "no common commits"

4060 msgstr "inga gemensamma incheckningar"

4061

4041 -#: fetch-pack.c:1081 fetch-pack.c:1619

4062 +#: fetch-pack.c:1088 fetch-pack.c:1628

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

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

4065

4045 -#: fetch-pack.c:1205

4066 +#: fetch-pack.c:1214

4067 #, c-format

4068 msgid "mismatched algorithms: client %s; server %s"

4069 msgstr "omaka algoritmer: klient %s; server %s"

4070

4050 -#: fetch-pack.c:1209

4071 +#: fetch-pack.c:1218

4072 #, c-format

4073 msgid "the server does not support algorithm '%s'"

4074 msgstr "servern stöder inte algoritmen \"%s\""

4075

4055 -#: fetch-pack.c:1229

4076 +#: fetch-pack.c:1238

4077 msgid "Server does not support shallow requests"

4078 msgstr "Servern stöder inte grunda förfrågningar"

4079

4059 -#: fetch-pack.c:1236

4080 +#: fetch-pack.c:1245

4081 msgid "Server supports filter"

4082 msgstr "Servern stöder filter"

4083

4063 -#: fetch-pack.c:1275

4084 +#: fetch-pack.c:1284

4085 msgid "unable to write request to remote"

4086 msgstr "kunde inte skriva anrop till fjärren"

4087

4067 -#: fetch-pack.c:1293

4088 +#: fetch-pack.c:1302

4089 #, c-format

4090 msgid "error reading section header '%s'"

4091 msgstr "fel vid läsning av styckehuvudet \"%s\""

4092

4072 -#: fetch-pack.c:1299

4093 +#: fetch-pack.c:1308

4094 #, c-format

4095 msgid "expected '%s', received '%s'"

4096 msgstr "förväntade \"%s\", tog emot \"%s\""

4097

4077 -#: fetch-pack.c:1360

4098 +#: fetch-pack.c:1369

4099 #, c-format

4100 msgid "unexpected acknowledgment line: '%s'"

4101 msgstr "oväntad bekräftelserad: \"%s\""

4102

4082 -#: fetch-pack.c:1365

4103 +#: fetch-pack.c:1374

4104 #, c-format

4105 msgid "error processing acks: %d"

4106 msgstr "fel vid hantering av bekräftelser: %d"

4107

4087 -#: fetch-pack.c:1375

4108 +#: fetch-pack.c:1384

4109 msgid "expected packfile to be sent after 'ready'"

4110 msgstr "väntade att paketfil skulle sändas efter \"ready\""

4111

4091 -#: fetch-pack.c:1377

4112 +#: fetch-pack.c:1386

4113 msgid "expected no other sections to be sent after no 'ready'"

4114 msgstr ""

4115 "väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""

4116

4096 -#: fetch-pack.c:1419

4117 +#: fetch-pack.c:1428

4118 #, c-format

4119 msgid "error processing shallow info: %d"

4120 msgstr "fel vid hantering av grund (\"shallow\") info: %d"

4121

4101 -#: fetch-pack.c:1466

4122 +#: fetch-pack.c:1475

4123 #, c-format

4124 msgid "expected wanted-ref, got '%s'"

4125 msgstr "förväntade wanted-ref, fick %s"

4126

4106 -#: fetch-pack.c:1471

4127 +#: fetch-pack.c:1480

4128 #, c-format

4129 msgid "unexpected wanted-ref: '%s'"

4130 msgstr "oväntad wanted-ref: \"%s\""

4131

4111 -#: fetch-pack.c:1476

4132 +#: fetch-pack.c:1485

4133 #, c-format

4134 msgid "error processing wanted refs: %d"

4135 msgstr "fel vid hantering av önskade referenser: %d"

4136

4116 -#: fetch-pack.c:1506

4137 +#: fetch-pack.c:1515

4138 msgid "git fetch-pack: expected response end packet"

4139 msgstr "git fetch-pack: förväntade svarsavslutningspaket"

4140

4120 -#: fetch-pack.c:1887

4141 +#: fetch-pack.c:1897

4142 msgid "no matching remote head"

4143 msgstr "inget motsvarande fjärrhuvud"

4144

4124 -#: fetch-pack.c:1910 builtin/clone.c:692

4145 +#: fetch-pack.c:1920 builtin/clone.c:693

4146 msgid "remote did not send all necessary objects"

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

4148

4128 -#: fetch-pack.c:1937

4149 +#: fetch-pack.c:1947

4150 #, c-format

4151 msgid "no such remote ref %s"

4152 msgstr "ingen sådan fjärreferens: %s"

4153

4133 -#: fetch-pack.c:1940

4154 +#: fetch-pack.c:1950

4155 #, c-format

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

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

@@ -4153,7 +4174,7 @@ msgstr "gpg misslyckades signera data"

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

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

4176

4156 -#: grep.c:668

4177 +#: grep.c:640

4178 msgid ""

4179 "given pattern contains NULL byte (via -f <file>). This is only supported "

4180 "with -P under PCRE v2"

@@ -4161,18 +4182,18 @@ msgstr ""

4182 "angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -"

4183 "P under PCRE v2"

4184

4164 -#: grep.c:2128

4185 +#: grep.c:2100

4186 #, c-format

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

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

4189

4169 -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89

4190 +#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89

4191 #: builtin/rm.c:135

4192 #, c-format

4193 msgid "failed to stat '%s'"

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

4195

4175 -#: grep.c:2156

4196 +#: grep.c:2128

4197 #, c-format

4198 msgid "'%s': short read"

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

@@ -4263,7 +4284,7 @@ msgstr "Externa kommandon"

4284 msgid "Command aliases"

4285 msgstr "Kommadoalias"

4286

4266 -#: help.c:513

4287 +#: help.c:527

4288 #, c-format

4289 msgid ""

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

@@ -4272,32 +4293,32 @@ msgstr ""

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

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

4295

4275 -#: help.c:572

4296 +#: help.c:543 help.c:631

4297 +#, c-format

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

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

4300 +

4301 +#: help.c:591

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

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

4304

4279 -#: help.c:594

4305 +#: help.c:613

4306 #, c-format

4307 msgid "WARNING: You called a Git command named '%s', which does not exist."

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

4309

4284 -#: help.c:599

4310 +#: help.c:618

4311 #, c-format

4312 msgid "Continuing under the assumption that you meant '%s'."

4313 msgstr "Fortsätter under förutsättningen att du menade \"%s\"."

4314

4289 -#: help.c:604

4315 +#: help.c:623

4316 #, c-format

4317 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

4318 msgstr ""

4319 "Fortsätter om %0.1f sekunder, under förutsättningen att du menade \"%s\"."

4320

4295 -#: help.c:612

4296 -#, c-format

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

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

4299 -

4300 -#: help.c:616

4321 +#: help.c:635

4322 msgid ""

4323 "\n"

4324 "The most similar command is"

@@ -4311,16 +4332,16 @@ msgstr[1] ""

4332 "\n"

4333 "Mest lika kommandon är"

4334

4314 -#: help.c:656

4335 +#: help.c:675

4336 msgid "git version [<options>]"

4337 msgstr "git version [<flaggor>]"

4338

4318 -#: help.c:711

4339 +#: help.c:730

4340 #, c-format

4341 msgid "%s: %s - %s"

4342 msgstr "%s: %s - %s"

4343

4323 -#: help.c:715

4344 +#: help.c:734

4345 msgid ""

4346 "\n"

4347 "Did you mean this?"

@@ -4485,6 +4506,21 @@ msgstr "Kunde inte skapa \"%s.lock\": %s"

4506 msgid "expected flush after ls-refs arguments"

4507 msgstr "förväntade \"flush\" efter ls-refs-argument"

4508

4509 +#: merge-ort-wrappers.c:13 merge-recursive.c:3672

4510 +#, c-format

4511 +msgid ""

4512 +"Your local changes to the following files would be overwritten by merge:\n"

4513 +" %s"

4514 +msgstr ""

4515 +"Dina lokala ändringar av följande filer skulle skrivas över av "

4516 +"sammanslagning:\n"

4517 +" %s"

4518 +

4519 +#: merge-ort-wrappers.c:33 merge-recursive.c:3436

4520 +#, c-format

4521 +msgid "Already up to date!"

4522 +msgstr "Redan à jour!"

4523 +

4524 #: merge-recursive.c:356

4525 msgid "(bad commit)\n"

4526 msgstr "(felaktig incheckning)\n"

@@ -4876,10 +4912,6 @@ msgstr "Lägger till %s"

4912 msgid "CONFLICT (add/add): Merge conflict in %s"

4913 msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"

4914

4879 -#: merge-recursive.c:3436

4880 -msgid "Already up to date!"

4881 -msgstr "Redan à jour!"

4882 -

4915 #: merge-recursive.c:3445

4916 #, c-format

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

@@ -4900,22 +4932,12 @@ msgstr[1] "hittade %u gemensamma förfäder:"

4932 msgid "merge returned no commit"

4933 msgstr "sammanslagningen returnerade ingen incheckning"

4934

4903 -#: merge-recursive.c:3672

4904 -#, c-format

4905 -msgid ""

4906 -"Your local changes to the following files would be overwritten by merge:\n"

4907 -" %s"

4908 -msgstr ""

4909 -"Dina lokala ändringar av följande filer skulle skrivas över av "

4910 -"sammanslagning:\n"

4911 -" %s"

4912 -

4935 #: merge-recursive.c:3769

4936 #, c-format

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

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

4939

4918 -#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881

4940 +#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895

4941 msgid "Unable to write index."

4942 msgstr "Kunde inte skriva indexet."

4943

@@ -4923,175 +4945,171 @@ msgstr "Kunde inte skriva indexet."

4945 msgid "failed to read the cache"

4946 msgstr "misslyckades läsa cachen"

4947

4926 -#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930

4927 -#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816

4948 +#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917

4949 +#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817

4950 #: builtin/stash.c:265

4951 msgid "unable to write new index file"

4952 msgstr "kunde inte skriva ny indexfil"

4953

4932 -#: midx.c:79

4954 +#: midx.c:80

4955 #, c-format

4956 msgid "multi-pack-index file %s is too small"

4957 msgstr "multi-pack-indexfilen %s är för liten"

4958

4937 -#: midx.c:95

4959 +#: midx.c:96

4960 #, c-format

4961 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

4962 msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x"

4963

4942 -#: midx.c:100

4964 +#: midx.c:101

4965 #, c-format

4966 msgid "multi-pack-index version %d not recognized"

4967 msgstr "multi-pack-indexversionen %d stöds inte"

4968

4947 -#: midx.c:105

4969 +#: midx.c:106

4970 #, c-format

4971 msgid "multi-pack-index hash version %u does not match version %u"

4972 msgstr "multi-pack-index-hashversionen %u stämmer inte med versionen %u"

4973

4952 -#: midx.c:122

4974 +#: midx.c:123

4975 msgid "invalid chunk offset (too large)"

4976 msgstr "felaktigt offset för stycke (för stort)"

4977

4956 -#: midx.c:146

4978 +#: midx.c:147

4979 msgid "terminating multi-pack-index chunk id appears earlier than expected"

4980 msgstr "avslutande multi-pack-index-stycke-id förekommer tidigare än förväntat"

4981

4960 -#: midx.c:159

4982 +#: midx.c:160

4983 msgid "multi-pack-index missing required pack-name chunk"

4984 msgstr "multi-pack-index saknar krävd paketnamn-stycke"

4985

4964 -#: midx.c:161

4986 +#: midx.c:162

4987 msgid "multi-pack-index missing required OID fanout chunk"

4988 msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"

4989

4968 -#: midx.c:163

4990 +#: midx.c:164

4991 msgid "multi-pack-index missing required OID lookup chunk"

4992 msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"

4993

4972 -#: midx.c:165

4994 +#: midx.c:166

4995 msgid "multi-pack-index missing required object offsets chunk"

4996 msgstr "multi-pack-index saknar krävt objekt-offsetstycke"

4997

4976 -#: midx.c:179

4998 +#: midx.c:180

4999 #, c-format

5000 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

5001 msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\""

5002

4981 -#: midx.c:222

5003 +#: midx.c:223

5004 #, c-format

5005 msgid "bad pack-int-id: %u (%u total packs)"

5006 msgstr "bad pack-int-id: %u (%u paket totalt)"

5007

4986 -#: midx.c:272

5008 +#: midx.c:273

5009 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

5010 msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten"

5011

4990 -#: midx.c:300

4991 -msgid "error preparing packfile from multi-pack-index"

4992 -msgstr "fel när paketfiler från multi-pack-index skulle förberedas"

4993 -

4994 -#: midx.c:485

5012 +#: midx.c:480

5013 #, c-format

5014 msgid "failed to add packfile '%s'"

5015 msgstr "misslyckades läsa paketfilen \"%s\""

5016

4999 -#: midx.c:491

5017 +#: midx.c:486

5018 #, c-format

5019 msgid "failed to open pack-index '%s'"

5020 msgstr "misslyckades öppna paketindexet \"%s\""

5021

5004 -#: midx.c:551

5022 +#: midx.c:546

5023 #, c-format

5024 msgid "failed to locate object %d in packfile"

5025 msgstr "misslyckades hitta objekt %d i paketfilen"

5026

5009 -#: midx.c:853

5027 +#: midx.c:846

5028 msgid "Adding packfiles to multi-pack-index"

5029 msgstr "Lägger till paketfiler till multi-pack-index"

5030

5013 -#: midx.c:886

5031 +#: midx.c:879

5032 #, c-format

5033 msgid "did not see pack-file %s to drop"

5034 msgstr "såg inte paketfilen %s som skulle kastas"

5035

5018 -#: midx.c:938

5036 +#: midx.c:931

5037 msgid "no pack files to index."

5038 msgstr "inga paketfiler att indexera."

5039

5022 -#: midx.c:990

5040 +#: midx.c:982

5041 msgid "Writing chunks to multi-pack-index"

5042 msgstr "Skriver stycken till multi-pack-index"

5043

5026 -#: midx.c:1068

5044 +#: midx.c:1060

5045 #, c-format

5046 msgid "failed to clear multi-pack-index at %s"

5047 msgstr "misslyckades städa multi-pack-index på %s"

5048

5031 -#: midx.c:1124

5049 +#: midx.c:1116

5050 msgid "multi-pack-index file exists, but failed to parse"

5051 msgstr "multi-pack-indexfilen finns, men kunde inte tolkas"

5052

5035 -#: midx.c:1132

5053 +#: midx.c:1124

5054 msgid "Looking for referenced packfiles"

5055 msgstr "Ser efter refererade packfiler"

5056

5039 -#: midx.c:1147

5057 +#: midx.c:1139

5058 #, c-format

5059 msgid ""

5060 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5061 msgstr ""

5062 "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5063

5046 -#: midx.c:1152

5064 +#: midx.c:1144

5065 msgid "the midx contains no oid"

5066 msgstr "midx saknar oid"

5067

5050 -#: midx.c:1161

5068 +#: midx.c:1153

5069 msgid "Verifying OID order in multi-pack-index"

5070 msgstr "Bekräftar OID-ordning i multi-pack-index"

5071

5054 -#: midx.c:1170

5072 +#: midx.c:1162

5073 #, c-format

5074 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5075 msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"

5076

5059 -#: midx.c:1190

5077 +#: midx.c:1182

5078 msgid "Sorting objects by packfile"

5079 msgstr "Sorterar objekt efter packfil"

5080

5063 -#: midx.c:1197

5081 +#: midx.c:1189

5082 msgid "Verifying object offsets"

5083 msgstr "Bekräftar offset för objekt"

5084

5067 -#: midx.c:1213

5085 +#: midx.c:1205

5086 #, c-format

5087 msgid "failed to load pack entry for oid[%d] = %s"

5088 msgstr "misslyckades läsa paketpost för oid[%d] = %s"

5089

5072 -#: midx.c:1219

5090 +#: midx.c:1211

5091 #, c-format

5092 msgid "failed to load pack-index for packfile %s"

5093 msgstr "misslyckades läsa paketindex för paketfil %s"

5094

5077 -#: midx.c:1228

5095 +#: midx.c:1220

5096 #, c-format

5097 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5098 msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5099

5082 -#: midx.c:1253

5100 +#: midx.c:1245

5101 msgid "Counting referenced objects"

5102 msgstr "Räknar refererade objekt"

5103

5086 -#: midx.c:1263

5104 +#: midx.c:1255

5105 msgid "Finding and deleting unreferenced packfiles"

5106 msgstr "Ser efter och tar bort orefererade packfiler"

5107

5090 -#: midx.c:1454

5108 +#: midx.c:1446

5109 msgid "could not start pack-objects"

5110 msgstr "kunde inte starta pack-objects"

5111

5094 -#: midx.c:1474

5112 +#: midx.c:1466

5113 msgid "could not finish pack-objects"

5114 msgstr "kunde inte avsluta pack-objects"

5115

@@ -5180,16 +5198,16 @@ msgstr "hashvärde stämmer inte överens %s"

5198 msgid "unable to get size of %s"

5199 msgstr "kan inte hämta storlek på %s"

5200

5183 -#: packfile.c:630

5201 +#: packfile.c:615

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

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

5204

5187 -#: packfile.c:1922

5205 +#: packfile.c:1907

5206 #, c-format

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

5208 msgstr "offset före slutet av packindex för %s (trasigt index?)"

5209

5192 -#: packfile.c:1926

5210 +#: packfile.c:1911

5211 #, c-format

5212 msgid "offset beyond end of pack index for %s (truncated index?)"

5213 msgstr "offset borton slutet av packindex för %s (trunkerat index?)"

@@ -5435,7 +5453,7 @@ msgstr "protokollfel: felaktig radlängdstecken: %.4s"

5453 msgid "protocol error: bad line length %d"

5454 msgstr "protokollfel: felaktig radlängd: %d"

5455

5438 -#: pkt-line.c:373 sideband.c:150

5456 +#: pkt-line.c:373 sideband.c:165

5457 #, c-format

5458 msgid "remote error: %s"

5459 msgstr "fjärrfel: %s"

@@ -5483,7 +5501,7 @@ msgstr "kunde inte starta \"log\""

5501 msgid "could not read `log` output"

5502 msgstr "kunde inte läsa utdata från \"log\""

5503

5486 -#: range-diff.c:98 sequencer.c:5283

5504 +#: range-diff.c:98 sequencer.c:5310

5505 #, c-format

5506 msgid "could not parse commit '%s'"

5507 msgstr "kunde inte tolka incheckningen \"%s\""

@@ -5502,11 +5520,11 @@ msgstr ""

5520 msgid "could not parse git header '%.*s'"

5521 msgstr "kunde inte tolka git-huvudet \"%.*s\""

5522

5505 -#: range-diff.c:301

5523 +#: range-diff.c:299

5524 msgid "failed to generate diff"

5525 msgstr "misslyckades skapa diff"

5526

5509 -#: range-diff.c:534 range-diff.c:536

5527 +#: range-diff.c:532 range-diff.c:534

5528 #, c-format

5529 msgid "could not parse log for '%s'"

5530 msgstr "kunde inte tolka loggen för \"%s\""

@@ -5623,8 +5641,8 @@ msgstr "osorterade köposter för \"%s\""

5641

5642 #: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111

5643 #: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181

5626 -#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991

5627 -#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507

5644 +#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991

5645 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507

5646 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290

5647 #: builtin/submodule--helper.c:332

5648 msgid "index file corrupt"

@@ -5680,12 +5698,12 @@ msgstr "kunde inte uppdatera delat index \"%s\""

5698 msgid "broken index, expect %s in %s, got %s"

5699 msgstr "trasigt index, förväntade %s i %s, fick %s"

5700

5683 -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126

5701 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140

5702 #, c-format

5703 msgid "could not close '%s'"

5704 msgstr "kunde inte stänga \"%s\""

5705

5688 -#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185

5706 +#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231

5707 #, c-format

5708 msgid "could not stat '%s'"

5709 msgstr "kunde inte ta status på \"%s\""

@@ -5819,14 +5837,14 @@ msgstr ""

5837 "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"

5838 "\n"

5839

5822 -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571

5823 -#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264

5840 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607

5841 +#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270

5842 #, c-format

5843 msgid "could not write '%s'"

5844 msgstr "kunde inte skriva \"%s\""

5845

5828 -#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222

5829 -#: builtin/rebase.c:246

5846 +#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228

5847 +#: builtin/rebase.c:252

5848 #, c-format

5849 msgid "could not write '%s'."

5850 msgstr "kunde inte skriva \"%s\"."

@@ -5860,9 +5878,9 @@ msgstr ""

5878 "\" (fel).\n"

5879 "\n"

5880

5863 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361

5864 -#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233

5865 -#: builtin/rebase.c:258

5881 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394

5882 +#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239

5883 +#: builtin/rebase.c:264

5884 #, c-format

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

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

@@ -6058,61 +6076,61 @@ msgstr "format: atomen %%(end) använd utan motsvarande atom"

6076 msgid "malformed format string %s"

6077 msgstr "felformad formatsträng %s"

6078

6061 -#: ref-filter.c:1541

6079 +#: ref-filter.c:1549

6080 #, c-format

6081 msgid "no branch, rebasing %s"

6082 msgstr "ingen gren, ombaserar %s"

6083

6066 -#: ref-filter.c:1544

6084 +#: ref-filter.c:1552

6085 #, c-format

6086 msgid "no branch, rebasing detached HEAD %s"

6087 msgstr "ingen gren, ombaserar frånkopplat HEAD %s"

6088

6071 -#: ref-filter.c:1547

6089 +#: ref-filter.c:1555

6090 #, c-format

6091 msgid "no branch, bisect started on %s"

6092 msgstr "ingen gren, \"bisect\" startad på %s"

6093

6076 -#: ref-filter.c:1557

6094 +#: ref-filter.c:1565

6095 msgid "no branch"

6096 msgstr "ingen gren"

6097

6080 -#: ref-filter.c:1591 ref-filter.c:1800

6098 +#: ref-filter.c:1599 ref-filter.c:1808

6099 #, c-format

6100 msgid "missing object %s for %s"

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

6102

6085 -#: ref-filter.c:1601

6103 +#: ref-filter.c:1609

6104 #, c-format

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

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

6107

6090 -#: ref-filter.c:2054

6108 +#: ref-filter.c:2062

6109 #, c-format

6110 msgid "malformed object at '%s'"

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

6112

6095 -#: ref-filter.c:2143

6113 +#: ref-filter.c:2151

6114 #, c-format

6115 msgid "ignoring ref with broken name %s"

6116 msgstr "ignorerar referens med trasigt namn %s"

6117

6100 -#: ref-filter.c:2148 refs.c:657

6118 +#: ref-filter.c:2156 refs.c:660

6119 #, c-format

6120 msgid "ignoring broken ref %s"

6121 msgstr "ignorerar trasig referens %s"

6122

6105 -#: ref-filter.c:2464

6123 +#: ref-filter.c:2472

6124 #, c-format

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

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

6127

6110 -#: ref-filter.c:2563

6128 +#: ref-filter.c:2571

6129 #, c-format

6130 msgid "malformed object name %s"

6131 msgstr "felformat objektnamn %s"

6132

6115 -#: ref-filter.c:2568

6133 +#: ref-filter.c:2576

6134 #, c-format

6135 msgid "option `%s' must point to a commit"

6136 msgstr "flaggan \"%s\" måste peka på en incheckning"

@@ -6122,65 +6140,65 @@ msgstr "flaggan \"%s\" måste peka på en incheckning"

6140 msgid "%s does not point to a valid object!"

6141 msgstr "\"%s\" pekar inte på ett giltigt objekt!"

6142

6125 -#: refs.c:572

6143 +#: refs.c:575

6144 #, c-format

6145 msgid "could not retrieve `%s`"

6146 msgstr "kunde inte hämta \"%s\""

6147

6130 -#: refs.c:579

6148 +#: refs.c:582

6149 #, c-format

6150 msgid "invalid branch name: %s = %s"

6151 msgstr "felaktigt namn på gren: %s = %s"

6152

6135 -#: refs.c:655

6153 +#: refs.c:658

6154 #, c-format

6155 msgid "ignoring dangling symref %s"

6156 msgstr "ignorerar dinglande symbolisk referens %s"

6157

6140 -#: refs.c:892

6158 +#: refs.c:895

6159 #, c-format

6160 msgid "log for ref %s has gap after %s"

6161 msgstr "loggen för referensen %s har lucka efter %s"

6162

6145 -#: refs.c:898

6163 +#: refs.c:901

6164 #, c-format

6165 msgid "log for ref %s unexpectedly ended on %s"

6166 msgstr "loggen för referensen %s slutade oväntat på %s"

6167

6150 -#: refs.c:957

6168 +#: refs.c:960

6169 #, c-format

6170 msgid "log for %s is empty"

6171 msgstr "loggen för %s är tom"

6172

6155 -#: refs.c:1049

6173 +#: refs.c:1052

6174 #, c-format

6175 msgid "refusing to update ref with bad name '%s'"

6176 msgstr "vägrar uppdatera referens med trasigt namn \"%s\""

6177

6160 -#: refs.c:1120

6178 +#: refs.c:1123

6179 #, c-format

6180 msgid "update_ref failed for ref '%s': %s"

6181 msgstr "update_ref misslyckades för referensen \"%s\": %s"

6182

6165 -#: refs.c:1944

6183 +#: refs.c:1947

6184 #, c-format

6185 msgid "multiple updates for ref '%s' not allowed"

6186 msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"

6187

6170 -#: refs.c:2024

6188 +#: refs.c:2027

6189 msgid "ref updates forbidden inside quarantine environment"

6190 msgstr "referensuppdateringar förbjudna i karantänmiljö"

6191

6174 -#: refs.c:2035

6192 +#: refs.c:2038

6193 msgid "ref updates aborted by hook"

6194 msgstr "referensuppdateringar avbrutna av krok"

6195

6178 -#: refs.c:2135 refs.c:2165

6196 +#: refs.c:2138 refs.c:2168

6197 #, c-format

6198 msgid "'%s' exists; cannot create '%s'"

6199 msgstr "\"%s\" finns; kan inte skapa \"%s\""

6200

6183 -#: refs.c:2141 refs.c:2176

6201 +#: refs.c:2144 refs.c:2179

6202 #, c-format

6203 msgid "cannot process '%s' and '%s' at the same time"

6204 msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"

@@ -6201,7 +6219,7 @@ msgstr "kunde inte ta bort referensen %s: %s"

6219 msgid "could not delete references: %s"

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

6221

6204 -#: refspec.c:167

6222 +#: refspec.c:170

6223 #, c-format

6224 msgid "invalid refspec '%s'"

6225 msgstr "felaktig referensspecifikation: \"%s\""

@@ -6345,94 +6363,94 @@ msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en"

6363 msgid "dst ref %s receives from more than one src"

6364 msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa"

6365

6348 -#: remote.c:1703 remote.c:1804

6366 +#: remote.c:1714 remote.c:1815

6367 msgid "HEAD does not point to a branch"

6368 msgstr "HEAD pekar inte på en gren"

6369

6352 -#: remote.c:1712

6370 +#: remote.c:1723

6371 #, c-format

6372 msgid "no such branch: '%s'"

6373 msgstr "okänd gren: \"%s\""

6374

6357 -#: remote.c:1715

6375 +#: remote.c:1726

6376 #, c-format

6377 msgid "no upstream configured for branch '%s'"

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

6379

6362 -#: remote.c:1721

6380 +#: remote.c:1732

6381 #, c-format

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

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

6384

6367 -#: remote.c:1736

6385 +#: remote.c:1747

6386 #, c-format

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

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

6389

6372 -#: remote.c:1748

6390 +#: remote.c:1759

6391 #, c-format

6392 msgid "branch '%s' has no remote for pushing"

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

6394

6377 -#: remote.c:1758

6395 +#: remote.c:1769

6396 #, c-format

6397 msgid "push refspecs for '%s' do not include '%s'"

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

6399

6382 -#: remote.c:1771

6400 +#: remote.c:1782

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

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

6403

6386 -#: remote.c:1793

6404 +#: remote.c:1804

6405 msgid "cannot resolve 'simple' push to a single destination"

6406 msgstr "\"enkel push\" motsvarar flera olika mål"

6407

6390 -#: remote.c:1922

6408 +#: remote.c:1933

6409 #, c-format

6410 msgid "couldn't find remote ref %s"

6411 msgstr "Kunde inte hitta fjärr-referensen %s"

6412

6395 -#: remote.c:1935

6413 +#: remote.c:1946

6414 #, c-format

6415 msgid "* Ignoring funny ref '%s' locally"

6416 msgstr "* Ignorerar märklig referens \"%s\" lokalt"

6417

6400 -#: remote.c:2098

6418 +#: remote.c:2109

6419 #, c-format

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

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

6422

6405 -#: remote.c:2102

6423 +#: remote.c:2113

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

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

6426

6409 -#: remote.c:2105

6427 +#: remote.c:2116

6428 #, c-format

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

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

6431

6414 -#: remote.c:2109

6432 +#: remote.c:2120

6433 #, c-format

6434 msgid "Your branch and '%s' refer to different commits.\n"

6435 msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"

6436

6419 -#: remote.c:2112

6437 +#: remote.c:2123

6438 #, c-format

6439 msgid " (use \"%s\" for details)\n"

6440 msgstr " (använd \"%s\" för detaljer)\n"

6441

6424 -#: remote.c:2116

6442 +#: remote.c:2127

6443 #, c-format

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

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

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

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

6448

6431 -#: remote.c:2122

6449 +#: remote.c:2133

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

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

6452

6435 -#: remote.c:2125

6453 +#: remote.c:2136

6454 #, c-format

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

6456 msgid_plural ""

@@ -6442,11 +6460,11 @@ msgstr[0] ""

6460 msgstr[1] ""

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

6462

6445 -#: remote.c:2133

6463 +#: remote.c:2144

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

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

6466

6449 -#: remote.c:2136

6467 +#: remote.c:2147

6468 #, c-format

6469 msgid ""

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

@@ -6461,11 +6479,11 @@ msgstr[1] ""

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

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

6481

6464 -#: remote.c:2146

6482 +#: remote.c:2157

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

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

6485

6468 -#: remote.c:2337

6486 +#: remote.c:2348

6487 #, c-format

6488 msgid "cannot parse expected object name '%s'"

6489 msgstr "kan inte tolka förväntat objektnamn \"%s\""

@@ -6543,7 +6561,7 @@ msgstr "kan inte ta bort lös länk \"%s\""

6561 msgid "Recorded preimage for '%s'"

6562 msgstr "Sparade förhandsbild för \"%s\""

6563

6546 -#: rerere.c:881 submodule.c:2082 builtin/log.c:1975

6564 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1992

6565 #: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890

6566 #, c-format

6567 msgid "could not create directory '%s'"

@@ -6582,43 +6600,43 @@ msgstr "kan inte uppdatera katalogen rr-cache"

6600 msgid "could not determine HEAD revision"

6601 msgstr "kunde inte bestämma HEAD-revision"

6602

6585 -#: reset.c:70 reset.c:76 sequencer.c:3426

6603 +#: reset.c:70 reset.c:76 sequencer.c:3460

6604 #, c-format

6605 msgid "failed to find tree of %s"

6606 msgstr "kunde inte hitta trädet för %s."

6607

6590 -#: revision.c:2344

6608 +#: revision.c:2336

6609 msgid "--unpacked=<packfile> no longer supported"

6610 msgstr "--unpacked=<paketfil> stöds inte längre"

6611

6594 -#: revision.c:2364

6612 +#: revision.c:2356

6613 #, c-format

6614 msgid "unknown value for --diff-merges: %s"

6615 msgstr "okänt värde för --diff-merges: %s"

6616

6599 -#: revision.c:2702

6617 +#: revision.c:2694

6618 msgid "your current branch appears to be broken"

6619 msgstr "din nuvarande gren verkar vara trasig"

6620

6603 -#: revision.c:2705

6621 +#: revision.c:2697

6622 #, c-format

6623 msgid "your current branch '%s' does not have any commits yet"

6624 msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"

6625

6608 -#: revision.c:2915

6626 +#: revision.c:2907

6627 msgid "-L does not yet support diff formats besides -p and -s"

6628 msgstr "-L stöder ännu inte andra diff-format än -p och -s"

6629

6612 -#: run-command.c:763

6630 +#: run-command.c:764

6631 msgid "open /dev/null failed"

6632 msgstr "misslyckades öppna /dev/null"

6633

6616 -#: run-command.c:1270

6634 +#: run-command.c:1271

6635 #, c-format

6636 msgid "cannot create async thread: %s"

6637 msgstr "kan inte skapa asynkron tråd: %s"

6638

6621 -#: run-command.c:1334

6639 +#: run-command.c:1335

6640 #, c-format

6641 msgid ""

6642 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -6627,33 +6645,33 @@ msgstr ""

6645 "Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"

6646 "Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."

6647

6630 -#: send-pack.c:145

6648 +#: send-pack.c:146

6649 msgid "unexpected flush packet while reading remote unpack status"

6650 msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"

6651

6634 -#: send-pack.c:147

6652 +#: send-pack.c:148

6653 #, c-format

6654 msgid "unable to parse remote unpack status: %s"

6655 msgstr "kunde inte tolka fjärruppackningsstatus: %s"

6656

6639 -#: send-pack.c:149

6657 +#: send-pack.c:150

6658 #, c-format

6659 msgid "remote unpack failed: %s"

6660 msgstr "fjärruppackning misslyckades: %s"

6661

6644 -#: send-pack.c:372

6662 +#: send-pack.c:374

6663 msgid "failed to sign the push certificate"

6664 msgstr "misslyckades underteckna push-certifikatet"

6665

6648 -#: send-pack.c:460

6666 +#: send-pack.c:467

6667 msgid "the receiving end does not support this repository's hash algorithm"

6668 msgstr "mottagarsidan stöder inte arkivets hashningsalgoritm"

6669

6652 -#: send-pack.c:469

6670 +#: send-pack.c:476

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

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

6673

6656 -#: send-pack.c:471

6674 +#: send-pack.c:478

6675 msgid ""

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

6677 "signed push"

@@ -6661,47 +6679,47 @@ msgstr ""

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

6680 "signed"

6681

6664 -#: send-pack.c:483

6682 +#: send-pack.c:490

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

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

6685

6668 -#: send-pack.c:488

6686 +#: send-pack.c:495

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

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

6689

6672 -#: sequencer.c:194

6690 +#: sequencer.c:195

6691 #, c-format

6692 msgid "invalid commit message cleanup mode '%s'"

6693 msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""

6694

6677 -#: sequencer.c:308

6695 +#: sequencer.c:323

6696 #, c-format

6697 msgid "could not delete '%s'"

6698 msgstr "kunde inte ta bort \"%s\""

6699

6682 -#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385

6700 +#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385

6701 #, c-format

6702 msgid "could not remove '%s'"

6703 msgstr "kunde inte ta bort \"%s\""

6704

6687 -#: sequencer.c:339

6705 +#: sequencer.c:353

6706 msgid "revert"

6707 msgstr "revert"

6708

6691 -#: sequencer.c:341

6709 +#: sequencer.c:355

6710 msgid "cherry-pick"

6711 msgstr "cherry-pick"

6712

6695 -#: sequencer.c:343

6713 +#: sequencer.c:357

6714 msgid "rebase"

6715 msgstr "rebase"

6716

6699 -#: sequencer.c:345

6717 +#: sequencer.c:359

6718 #, c-format

6719 msgid "unknown action: %d"

6720 msgstr "okänd funktion: %d"

6721

6704 -#: sequencer.c:404

6722 +#: sequencer.c:418

6723 msgid ""

6724 "after resolving the conflicts, mark the corrected paths\n"

6725 "with 'git add <paths>' or 'git rm <paths>'"

@@ -6709,7 +6727,7 @@ msgstr ""

6727 "efter att ha löst konflikterna, markera de rättade sökvägarna\n"

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

6729

6712 -#: sequencer.c:407

6730 +#: sequencer.c:421

6731 msgid ""

6732 "after resolving the conflicts, mark the corrected paths\n"

6733 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -6719,43 +6737,43 @@ msgstr ""

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

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

6739

6722 -#: sequencer.c:420 sequencer.c:3028

6740 +#: sequencer.c:434 sequencer.c:3062

6741 #, c-format

6742 msgid "could not lock '%s'"

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

6744

6727 -#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046

6728 -#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631

6745 +#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080

6746 +#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631

6747 #, c-format

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

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

6750

6733 -#: sequencer.c:427

6751 +#: sequencer.c:441

6752 #, c-format

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

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

6755

6738 -#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048

6739 -#: sequencer.c:3311

6756 +#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082

6757 +#: sequencer.c:3345

6758 #, c-format

6759 msgid "failed to finalize '%s'"

6760 msgstr "misslyckades färdigställa \"%s\""

6761

6744 -#: sequencer.c:471

6762 +#: sequencer.c:485

6763 #, c-format

6764 msgid "your local changes would be overwritten by %s."

6765 msgstr "dina lokala ändringar skulle skrivas över av %s."

6766

6749 -#: sequencer.c:475

6767 +#: sequencer.c:489

6768 msgid "commit your changes or stash them to proceed."

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

6770

6753 -#: sequencer.c:507

6771 +#: sequencer.c:521

6772 #, c-format

6773 msgid "%s: fast-forward"

6774 msgstr "%s: snabbspola"

6775

6758 -#: sequencer.c:546 builtin/tag.c:566

6776 +#: sequencer.c:560 builtin/tag.c:566

6777 #, c-format

6778 msgid "Invalid cleanup mode %s"

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

@@ -6763,65 +6781,65 @@ msgstr "Felaktigt städningsläge %s"

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

6782 #. "rebase".

6783 #.

6766 -#: sequencer.c:640

6784 +#: sequencer.c:670

6785 #, c-format

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

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

6788

6771 -#: sequencer.c:657

6789 +#: sequencer.c:687

6790 msgid "unable to update cache tree"

6791 msgstr "kan inte uppdatera cacheträd"

6792

6775 -#: sequencer.c:671

6793 +#: sequencer.c:701

6794 msgid "could not resolve HEAD commit"

6795 msgstr "kunde inte bestämma HEAD:s incheckning"

6796

6779 -#: sequencer.c:751

6797 +#: sequencer.c:781

6798 #, c-format

6799 msgid "no key present in '%.*s'"

6800 msgstr "ingen nyckel i \"%.*s\""

6801

6784 -#: sequencer.c:762

6802 +#: sequencer.c:792

6803 #, c-format

6804 msgid "unable to dequote value of '%s'"

6805 msgstr "kan inte ta bort citering av värdet \"%s\""

6806

6789 -#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724

6790 -#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902

6807 +#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710

6808 +#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908

6809 #, c-format

6810 msgid "could not open '%s' for reading"

6811 msgstr "kunde inte öppna \"%s\" för läsning"

6812

6795 -#: sequencer.c:809

6813 +#: sequencer.c:839

6814 msgid "'GIT_AUTHOR_NAME' already given"

6815 msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"

6816

6799 -#: sequencer.c:814

6817 +#: sequencer.c:844

6818 msgid "'GIT_AUTHOR_EMAIL' already given"

6819 msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"

6820

6803 -#: sequencer.c:819

6821 +#: sequencer.c:849

6822 msgid "'GIT_AUTHOR_DATE' already given"

6823 msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"

6824

6807 -#: sequencer.c:823

6825 +#: sequencer.c:853

6826 #, c-format

6827 msgid "unknown variable '%s'"

6828 msgstr "okänd variabel \"%s\""

6829

6812 -#: sequencer.c:828

6830 +#: sequencer.c:858

6831 msgid "missing 'GIT_AUTHOR_NAME'"

6832 msgstr "\"GIT_AUTHOR_NAME\" saknas"

6833

6816 -#: sequencer.c:830

6834 +#: sequencer.c:860

6835 msgid "missing 'GIT_AUTHOR_EMAIL'"

6836 msgstr "\"GIT_AUTHOR_EMAIL\" saknas"

6837

6820 -#: sequencer.c:832

6838 +#: sequencer.c:862

6839 msgid "missing 'GIT_AUTHOR_DATE'"

6840 msgstr "\"GIT_AUTHOR_DATE\" saknas"

6841

6824 -#: sequencer.c:897

6842 +#: sequencer.c:927

6843 #, c-format

6844 msgid ""

6845 "you have staged changes in your working tree\n"

@@ -6850,11 +6868,11 @@ msgstr ""

6868 "\n"

6869 " git rebase --continue\n"

6870

6853 -#: sequencer.c:1178

6871 +#: sequencer.c:1208

6872 msgid "'prepare-commit-msg' hook failed"

6873 msgstr "kroken \"prepare-commit-msg\" misslyckades"

6874

6857 -#: sequencer.c:1184

6875 +#: sequencer.c:1214

6876 msgid ""

6877 "Your name and email address were configured automatically based\n"

6878 "on your username and hostname. Please check that they are accurate.\n"

@@ -6881,7 +6899,7 @@ msgstr ""

6899 "\n"

6900 " git commit --amend --reset-author\n"

6901

6884 -#: sequencer.c:1197

6902 +#: sequencer.c:1227

6903 msgid ""

6904 "Your name and email address were configured automatically based\n"

6905 "on your username and hostname. Please check that they are accurate.\n"

@@ -6906,340 +6924,340 @@ msgstr ""

6924 "\n"

6925 " git commit --amend --reset-author\n"

6926

6909 -#: sequencer.c:1239

6927 +#: sequencer.c:1269

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

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

6930

6913 -#: sequencer.c:1241

6931 +#: sequencer.c:1271

6932 msgid "could not parse newly created commit"

6933 msgstr "kunde inte tolka en precis skapad incheckning"

6934

6917 -#: sequencer.c:1287

6935 +#: sequencer.c:1317

6936 msgid "unable to resolve HEAD after creating commit"

6937 msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"

6938

6921 -#: sequencer.c:1289

6939 +#: sequencer.c:1319

6940 msgid "detached HEAD"

6941 msgstr "frånkopplad HEAD"

6942

6925 -#: sequencer.c:1293

6943 +#: sequencer.c:1323

6944 msgid " (root-commit)"

6945 msgstr " (rotincheckning)"

6946

6929 -#: sequencer.c:1314

6947 +#: sequencer.c:1344

6948 msgid "could not parse HEAD"

6949 msgstr "kunde inte tolka HEAD"

6950

6933 -#: sequencer.c:1316

6951 +#: sequencer.c:1346

6952 #, c-format

6953 msgid "HEAD %s is not a commit!"

6954 msgstr "HEAD %s är inte en incheckning!"

6955

6938 -#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577

6956 +#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577

6957 msgid "could not parse HEAD commit"

6958 msgstr "kunde inte tolka HEAD:s incheckning"

6959

6942 -#: sequencer.c:1373 sequencer.c:2067

6960 +#: sequencer.c:1403 sequencer.c:2100

6961 msgid "unable to parse commit author"

6962 msgstr "kunde inte tolka incheckningens författare"

6963

6946 -#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692

6964 +#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701

6965 msgid "git write-tree failed to write a tree"

6966 msgstr "git write-tree misslyckades skriva ett träd"

6967

6950 -#: sequencer.c:1417 sequencer.c:1535

6968 +#: sequencer.c:1447 sequencer.c:1565

6969 #, c-format

6970 msgid "unable to read commit message from '%s'"

6971 msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""

6972

6955 -#: sequencer.c:1446 sequencer.c:1478

6973 +#: sequencer.c:1476 sequencer.c:1508

6974 #, c-format

6975 msgid "invalid author identity '%s'"

6976 msgstr "ogiltig författar-identitet \"%s\""

6977

6960 -#: sequencer.c:1452

6978 +#: sequencer.c:1482

6979 msgid "corrupt author: missing date information"

6980 msgstr "trasig författare: saknar datuminformation"

6981

6964 -#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890

6965 -#: builtin/merge.c:915

6982 +#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904

6983 +#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78

6984 msgid "failed to write commit object"

6985 msgstr "kunde inte skriva incheckningsobjekt"

6986

6969 -#: sequencer.c:1518 sequencer.c:4237

6987 +#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198

6988 #, c-format

6989 msgid "could not update %s"

6990 msgstr "kunde inte uppdatera %s"

6991

6974 -#: sequencer.c:1567

6992 +#: sequencer.c:1597

6993 #, c-format

6994 msgid "could not parse commit %s"

6995 msgstr "kunde inte tolka incheckningen %s"

6996

6979 -#: sequencer.c:1572

6997 +#: sequencer.c:1602

6998 #, c-format

6999 msgid "could not parse parent commit %s"

7000 msgstr "kunde inte tolka föräldraincheckningen %s"

7001

6984 -#: sequencer.c:1655 sequencer.c:1766

7002 +#: sequencer.c:1685 sequencer.c:1796

7003 #, c-format

7004 msgid "unknown command: %d"

7005 msgstr "okänt kommando: %d"

7006

6989 -#: sequencer.c:1713 sequencer.c:1738

7007 +#: sequencer.c:1743 sequencer.c:1768

7008 #, c-format

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

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

7011

6994 -#: sequencer.c:1723

7012 +#: sequencer.c:1753

7013 msgid "need a HEAD to fixup"

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

7015

6998 -#: sequencer.c:1725 sequencer.c:3338

7016 +#: sequencer.c:1755 sequencer.c:3372

7017 msgid "could not read HEAD"

7018 msgstr "kunde inte läsa HEAD"

7019

7002 -#: sequencer.c:1727

7020 +#: sequencer.c:1757

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

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

7023

7006 -#: sequencer.c:1733

7024 +#: sequencer.c:1763

7025 #, c-format

7026 msgid "cannot write '%s'"

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

7028

7011 -#: sequencer.c:1740 git-rebase--preserve-merges.sh:486

7029 +#: sequencer.c:1770 git-rebase--preserve-merges.sh:486

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

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

7032

7015 -#: sequencer.c:1748

7033 +#: sequencer.c:1778

7034 #, c-format

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

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

7037

7020 -#: sequencer.c:1755

7038 +#: sequencer.c:1785

7039 #, c-format

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

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

7042

7025 -#: sequencer.c:1761

7043 +#: sequencer.c:1791

7044 #, c-format

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

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

7047

7030 -#: sequencer.c:1849

7048 +#: sequencer.c:1879

7049 msgid "your index file is unmerged."

7050 msgstr "din indexfil har inte slagits ihop."

7051

7034 -#: sequencer.c:1856

7052 +#: sequencer.c:1886

7053 msgid "cannot fixup root commit"

7054 msgstr "kan inte göra \"fixup\" på rotincheckning"

7055

7038 -#: sequencer.c:1875

7056 +#: sequencer.c:1905

7057 #, c-format

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

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

7060

7043 -#: sequencer.c:1883 sequencer.c:1891

7061 +#: sequencer.c:1913 sequencer.c:1921

7062 #, c-format

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

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

7065

7048 -#: sequencer.c:1897

7066 +#: sequencer.c:1927

7067 #, c-format

7068 msgid "cannot get commit message for %s"

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

7070

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

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

7055 -#: sequencer.c:1916

7073 +#: sequencer.c:1946

7074 #, c-format

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

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

7077

7060 -#: sequencer.c:1981

7078 +#: sequencer.c:2011

7079 #, c-format

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

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

7082

7065 -#: sequencer.c:2038

7083 +#: sequencer.c:2071

7084 #, c-format

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

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

7087

7070 -#: sequencer.c:2039

7088 +#: sequencer.c:2072

7089 #, c-format

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

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

7092

7075 -#: sequencer.c:2059

7093 +#: sequencer.c:2092

7094 #, c-format

7095 msgid "dropping %s %s -- patch contents already upstream\n"

7096 msgstr "utelämnar %s %s -- patchinnehållet finns redan uppströms\n"

7097

7080 -#: sequencer.c:2117

7098 +#: sequencer.c:2150

7099 #, c-format

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

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

7102

7085 -#: sequencer.c:2124

7103 +#: sequencer.c:2157

7104 #, c-format

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

7106 msgstr "git %s: misslyckades uppdatera indexet"

7107

7090 -#: sequencer.c:2201

7108 +#: sequencer.c:2234

7109 #, c-format

7110 msgid "%s does not accept arguments: '%s'"

7111 msgstr "%s tar inte argument: \"%s\""

7112

7095 -#: sequencer.c:2210

7113 +#: sequencer.c:2243

7114 #, c-format

7115 msgid "missing arguments for %s"

7116 msgstr "argument saknas för %s"

7117

7100 -#: sequencer.c:2241

7118 +#: sequencer.c:2274

7119 #, c-format

7120 msgid "could not parse '%s'"

7121 msgstr "kunde inte tolka \"%s\""

7122

7105 -#: sequencer.c:2302

7123 +#: sequencer.c:2335

7124 #, c-format

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

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

7127

7110 -#: sequencer.c:2313

7128 +#: sequencer.c:2346

7129 #, c-format

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

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

7132

7115 -#: sequencer.c:2399

7133 +#: sequencer.c:2432

7134 msgid "cancelling a cherry picking in progress"

7135 msgstr "avbryter pågående \"cherry-pick\""

7136

7119 -#: sequencer.c:2408

7137 +#: sequencer.c:2441

7138 msgid "cancelling a revert in progress"

7139 msgstr "avbryter pågående \"revert\""

7140

7123 -#: sequencer.c:2452

7141 +#: sequencer.c:2485

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

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

7144

7127 -#: sequencer.c:2454

7145 +#: sequencer.c:2487

7146 #, c-format

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

7148 msgstr "oanvändbart manus: \"%s\""

7149

7132 -#: sequencer.c:2459

7150 +#: sequencer.c:2492

7151 msgid "no commits parsed."

7152 msgstr "inga incheckningar lästes."

7153

7136 -#: sequencer.c:2470

7154 +#: sequencer.c:2503

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

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

7157

7140 -#: sequencer.c:2472

7158 +#: sequencer.c:2505

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

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

7161

7144 -#: sequencer.c:2550

7162 +#: sequencer.c:2583

7163 #, c-format

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

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

7166

7149 -#: sequencer.c:2657

7167 +#: sequencer.c:2690

7168 msgid "unusable squash-onto"

7169 msgstr "oanvändbar squash-onto"

7170

7153 -#: sequencer.c:2677

7171 +#: sequencer.c:2710

7172 #, c-format

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

7174 msgstr "trasigt manus: \"%s\""

7175

7158 -#: sequencer.c:2769 sequencer.c:4609

7176 +#: sequencer.c:2803 sequencer.c:4636

7177 msgid "empty commit set passed"

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

7179

7162 -#: sequencer.c:2786

7180 +#: sequencer.c:2820

7181 msgid "revert is already in progress"

7182 msgstr "en \"revert\" pågår redan"

7183

7166 -#: sequencer.c:2788

7184 +#: sequencer.c:2822

7185 #, c-format

7186 msgid "try \"git revert (--continue | %s--abort | --quit)\""

7187 msgstr "testa \"git revert (--continue | %s--abort | --quit)\""

7188

7171 -#: sequencer.c:2791

7189 +#: sequencer.c:2825

7190 msgid "cherry-pick is already in progress"

7191 msgstr "en \"cherry-pick\" pågår redan"

7192

7175 -#: sequencer.c:2793

7193 +#: sequencer.c:2827

7194 #, c-format

7195 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

7196 msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\""

7197

7180 -#: sequencer.c:2807

7198 +#: sequencer.c:2841

7199 #, c-format

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

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

7202

7185 -#: sequencer.c:2822

7203 +#: sequencer.c:2856

7204 msgid "could not lock HEAD"

7205 msgstr "kunde inte låsa HEAD"

7206

7189 -#: sequencer.c:2882 sequencer.c:4325

7207 +#: sequencer.c:2916 sequencer.c:4371

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

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

7210

7193 -#: sequencer.c:2884 sequencer.c:2895

7211 +#: sequencer.c:2918 sequencer.c:2929

7212 msgid "cannot resolve HEAD"

7213 msgstr "kan inte bestämma HEAD"

7214

7197 -#: sequencer.c:2886 sequencer.c:2930

7215 +#: sequencer.c:2920 sequencer.c:2964

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

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

7218

7201 -#: sequencer.c:2916 builtin/grep.c:745

7219 +#: sequencer.c:2950 builtin/grep.c:756

7220 #, c-format

7221 msgid "cannot open '%s'"

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

7223

7206 -#: sequencer.c:2918

7224 +#: sequencer.c:2952

7225 #, c-format

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

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

7228

7211 -#: sequencer.c:2919

7229 +#: sequencer.c:2953

7230 msgid "unexpected end of file"

7231 msgstr "oväntat filslut"

7232

7215 -#: sequencer.c:2925

7233 +#: sequencer.c:2959

7234 #, c-format

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

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

7237

7220 -#: sequencer.c:2936

7238 +#: sequencer.c:2970

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

7240 msgstr ""

7241 "Du verkar ha flyttat HEAD.\n"

7242 "Spolar inte tillbaka, kontrollera HEAD!"

7243

7226 -#: sequencer.c:2977

7244 +#: sequencer.c:3011

7245 msgid "no revert in progress"

7246 msgstr "ingen \"revers\" pågår"

7247

7230 -#: sequencer.c:2986

7248 +#: sequencer.c:3020

7249 msgid "no cherry-pick in progress"

7250 msgstr "ingen \"cherry-pick\" pågår"

7251

7234 -#: sequencer.c:2996

7252 +#: sequencer.c:3030

7253 msgid "failed to skip the commit"

7254 msgstr "kunde inte hoppa över incheckningen"

7255

7238 -#: sequencer.c:3003

7256 +#: sequencer.c:3037

7257 msgid "there is nothing to skip"

7258 msgstr "ingenting att hoppa över"

7259

7242 -#: sequencer.c:3006

7260 +#: sequencer.c:3040

7261 #, c-format

7262 msgid ""

7263 "have you committed already?\n"

@@ -7248,16 +7266,16 @@ msgstr ""

7266 "har du redan checkat in?\n"

7267 "testa \"git %s --continue\""

7268

7251 -#: sequencer.c:3168 sequencer.c:4217

7269 +#: sequencer.c:3202 sequencer.c:4263

7270 msgid "cannot read HEAD"

7271 msgstr "kan inte läsa HEAD"

7272

7255 -#: sequencer.c:3185

7273 +#: sequencer.c:3219

7274 #, c-format

7275 msgid "unable to copy '%s' to '%s'"

7276 msgstr "kan inte kopiera in \"%s\" till \"%s\""

7277

7260 -#: sequencer.c:3193

7278 +#: sequencer.c:3227

7279 #, c-format

7280 msgid ""

7281 "You can amend the commit now, with\n"

@@ -7276,27 +7294,27 @@ msgstr ""

7294 "\n"

7295 "\tgit rebase --continue\n"

7296

7279 -#: sequencer.c:3203

7297 +#: sequencer.c:3237

7298 #, c-format

7299 msgid "Could not apply %s... %.*s"

7300 msgstr "Kunde inte tillämpa %s... %.*s"

7301

7284 -#: sequencer.c:3210

7302 +#: sequencer.c:3244

7303 #, c-format

7304 msgid "Could not merge %.*s"

7305 msgstr "Kunde inte slå ihop %.*s"

7306

7289 -#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641

7307 +#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640

7308 #, c-format

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

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

7311

7294 -#: sequencer.c:3240

7312 +#: sequencer.c:3274

7313 #, c-format

7314 msgid "Executing: %s\n"

7315 msgstr "Kör: %s\n"

7316

7299 -#: sequencer.c:3255

7317 +#: sequencer.c:3289

7318 #, c-format

7319 msgid ""

7320 "execution failed: %s\n"

@@ -7311,11 +7329,11 @@ msgstr ""

7329 "\tgit rebase --continue\n"

7330 "\n"

7331

7314 -#: sequencer.c:3261

7332 +#: sequencer.c:3295

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

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

7335

7318 -#: sequencer.c:3267

7336 +#: sequencer.c:3301

7337 #, c-format

7338 msgid ""

7339 "execution succeeded: %s\n"

@@ -7332,90 +7350,90 @@ msgstr ""

7350 "\tgit rebase --continue\n"

7351 "\n"

7352

7335 -#: sequencer.c:3328

7353 +#: sequencer.c:3362

7354 #, c-format

7355 msgid "illegal label name: '%.*s'"

7356 msgstr "ogiltigt etikettnamn: \"%.*s\""

7357

7340 -#: sequencer.c:3382

7358 +#: sequencer.c:3416

7359 msgid "writing fake root commit"

7360 msgstr "skriver fejkad rotincheckning"

7361

7344 -#: sequencer.c:3387

7362 +#: sequencer.c:3421

7363 msgid "writing squash-onto"

7364 msgstr "skriver squash-onto"

7365

7348 -#: sequencer.c:3471

7366 +#: sequencer.c:3505

7367 #, c-format

7368 msgid "could not resolve '%s'"

7369 msgstr "kunde inte upplösa \"%s\""

7370

7353 -#: sequencer.c:3502

7371 +#: sequencer.c:3538

7372 msgid "cannot merge without a current revision"

7373 msgstr "kan inte slå ihop utan en aktuell incheckning"

7374

7357 -#: sequencer.c:3524

7375 +#: sequencer.c:3560

7376 #, c-format

7377 msgid "unable to parse '%.*s'"

7378 msgstr "kan inte tolka \"%.*s\""

7379

7362 -#: sequencer.c:3533

7380 +#: sequencer.c:3569

7381 #, c-format

7382 msgid "nothing to merge: '%.*s'"

7383 msgstr "inget att slå samman: \"%.*s\""

7384

7367 -#: sequencer.c:3545

7385 +#: sequencer.c:3581

7386 msgid "octopus merge cannot be executed on top of a [new root]"

7387 msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]"

7388

7371 -#: sequencer.c:3561

7389 +#: sequencer.c:3597

7390 #, c-format

7391 msgid "could not get commit message of '%s'"

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

7393

7376 -#: sequencer.c:3730

7394 +#: sequencer.c:3780

7395 #, c-format

7396 msgid "could not even attempt to merge '%.*s'"

7397 msgstr "kunde inte ens försöka slå ihop \"%.*s\""

7398

7381 -#: sequencer.c:3746

7399 +#: sequencer.c:3796

7400 msgid "merge: Unable to write new index file"

7401 msgstr "sammanslagning: Kunde inte skriva ny indexfil"

7402

7385 -#: sequencer.c:3820

7403 +#: sequencer.c:3870

7404 msgid "Cannot autostash"

7405 msgstr "Kan inte utföra \"autostash\""

7406

7389 -#: sequencer.c:3823

7407 +#: sequencer.c:3873

7408 #, c-format

7409 msgid "Unexpected stash response: '%s'"

7410 msgstr "Oväntat svar från stash: \"%s\""

7411

7394 -#: sequencer.c:3829

7412 +#: sequencer.c:3879

7413 #, c-format

7414 msgid "Could not create directory for '%s'"

7415 msgstr "Kunde inte skapa katalog för \"%s\""

7416

7399 -#: sequencer.c:3832

7417 +#: sequencer.c:3882

7418 #, c-format

7419 msgid "Created autostash: %s\n"

7420 msgstr "Skapade autostash: %s\n"

7421

7404 -#: sequencer.c:3836

7422 +#: sequencer.c:3886

7423 msgid "could not reset --hard"

7424 msgstr "kunde inte utföra \"reset --hard\""

7425

7408 -#: sequencer.c:3861

7426 +#: sequencer.c:3911

7427 #, c-format

7428 msgid "Applied autostash.\n"

7429 msgstr "Tillämpade autostash.\n"

7430

7413 -#: sequencer.c:3873

7431 +#: sequencer.c:3923

7432 #, c-format

7433 msgid "cannot store %s"

7434 msgstr "kan inte spara %s"

7435

7418 -#: sequencer.c:3876

7436 +#: sequencer.c:3926

7437 #, c-format

7438 msgid ""

7439 "%s\n"

@@ -7426,34 +7444,29 @@ msgstr ""

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

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

7446

7429 -#: sequencer.c:3881

7447 +#: sequencer.c:3931

7448 msgid "Applying autostash resulted in conflicts."

7449 msgstr "Tillämpning av autostash gav konflikter."

7450

7433 -#: sequencer.c:3882

7451 +#: sequencer.c:3932

7452 msgid "Autostash exists; creating a new stash entry."

7453 msgstr "Autostash finns; skapar ny stash-post."

7454

7437 -#: sequencer.c:3974

7438 -#, c-format

7439 -msgid "%s: not a valid OID"

7440 -msgstr "%s: inte ett giltigt OID"

7441 -

7442 -#: sequencer.c:3979 git-rebase--preserve-merges.sh:769

7455 +#: sequencer.c:4025 git-rebase--preserve-merges.sh:769

7456 msgid "could not detach HEAD"

7457 msgstr "kunde inte koppla från HEAD"

7458

7446 -#: sequencer.c:3994

7459 +#: sequencer.c:4040

7460 #, c-format

7461 msgid "Stopped at HEAD\n"

7462 msgstr "Stoppade på HEAD\n"

7463

7451 -#: sequencer.c:3996

7464 +#: sequencer.c:4042

7465 #, c-format

7466 msgid "Stopped at %s\n"

7467 msgstr "Stoppade på %s\n"

7468

7456 -#: sequencer.c:4004

7469 +#: sequencer.c:4050

7470 #, c-format

7471 msgid ""

7472 "Could not execute the todo command\n"

@@ -7474,58 +7487,58 @@ msgstr ""

7487 " git rebase --edit-todo\n"

7488 " git rebase --continue\n"

7489

7477 -#: sequencer.c:4050

7490 +#: sequencer.c:4096

7491 #, c-format

7492 msgid "Rebasing (%d/%d)%s"

7493 msgstr "Ombaserar (%d/%d)%s"

7494

7482 -#: sequencer.c:4095

7495 +#: sequencer.c:4141

7496 #, c-format

7497 msgid "Stopped at %s... %.*s\n"

7498 msgstr "Stoppade på %s... %.*s\n"

7499

7487 -#: sequencer.c:4166

7500 +#: sequencer.c:4212

7501 #, c-format

7502 msgid "unknown command %d"

7503 msgstr "okänt kommando %d"

7504

7492 -#: sequencer.c:4225

7505 +#: sequencer.c:4271

7506 msgid "could not read orig-head"

7507 msgstr "kunde inte läsa orig-head"

7508

7496 -#: sequencer.c:4230

7509 +#: sequencer.c:4276

7510 msgid "could not read 'onto'"

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

7512

7500 -#: sequencer.c:4244

7513 +#: sequencer.c:4290

7514 #, c-format

7515 msgid "could not update HEAD to %s"

7516 msgstr "kunde inte uppdatera HEAD till %s"

7517

7505 -#: sequencer.c:4304

7518 +#: sequencer.c:4350

7519 #, c-format

7520 msgid "Successfully rebased and updated %s.\n"

7521 msgstr "Lyckades ombasera och uppdatera %s.\n"

7522

7510 -#: sequencer.c:4337

7523 +#: sequencer.c:4383

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

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

7526

7514 -#: sequencer.c:4346

7527 +#: sequencer.c:4392

7528 msgid "cannot amend non-existing commit"

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

7530

7518 -#: sequencer.c:4348

7531 +#: sequencer.c:4394

7532 #, c-format

7533 msgid "invalid file: '%s'"

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

7535

7523 -#: sequencer.c:4350

7536 +#: sequencer.c:4396

7537 #, c-format

7538 msgid "invalid contents: '%s'"

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

7540

7528 -#: sequencer.c:4353

7541 +#: sequencer.c:4399

7542 msgid ""

7543 "\n"

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

@@ -7535,55 +7548,50 @@ msgstr ""

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

7549 "först och kör sedan \"git rebase --continue\" igen."

7550

7538 -#: sequencer.c:4389 sequencer.c:4428

7551 +#: sequencer.c:4435 sequencer.c:4474

7552 #, c-format

7553 msgid "could not write file: '%s'"

7554 msgstr "kunde inte skriva fil: \"%s\""

7555

7543 -#: sequencer.c:4444

7556 +#: sequencer.c:4490

7557 msgid "could not remove CHERRY_PICK_HEAD"

7558 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"

7559

7547 -#: sequencer.c:4451

7560 +#: sequencer.c:4497

7561 msgid "could not commit staged changes."

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

7563

7551 -#: sequencer.c:4477

7552 -#, c-format

7553 -msgid "invalid committer '%s'"

7554 -msgstr "ogiltig incheckare %s"

7555 -

7556 -#: sequencer.c:4586

7564 +#: sequencer.c:4613

7565 #, c-format

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

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

7568

7561 -#: sequencer.c:4590

7569 +#: sequencer.c:4617

7570 #, c-format

7571 msgid "%s: bad revision"

7572 msgstr "%s: felaktig revision"

7573

7566 -#: sequencer.c:4625

7574 +#: sequencer.c:4652

7575 msgid "can't revert as initial commit"

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

7577

7570 -#: sequencer.c:5102

7578 +#: sequencer.c:5129

7579 msgid "make_script: unhandled options"

7580 msgstr "make_script: flaggor som inte stöds"

7581

7574 -#: sequencer.c:5105

7582 +#: sequencer.c:5132

7583 msgid "make_script: error preparing revisions"

7584 msgstr "make_script: fel när revisioner skulle förberedas"

7585

7578 -#: sequencer.c:5347 sequencer.c:5364

7586 +#: sequencer.c:5374 sequencer.c:5391

7587 msgid "nothing to do"

7588 msgstr "inget att göra"

7589

7582 -#: sequencer.c:5383

7590 +#: sequencer.c:5410

7591 msgid "could not skip unnecessary pick commands"

7592 msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"

7593

7586 -#: sequencer.c:5480

7594 +#: sequencer.c:5504

7595 msgid "the script was already rearranged."

7596 msgstr "skriptet har redan omordnats."

7597

@@ -7750,257 +7758,257 @@ msgstr "\"fork\" misslyckades"

7758 msgid "setsid failed"

7759 msgstr "\"setsid\" misslyckades"

7760

7753 -#: sha1-file.c:470

7761 +#: sha1-file.c:480

7762 #, c-format

7763 msgid "object directory %s does not exist; check .git/objects/info/alternates"

7764 msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"

7765

7758 -#: sha1-file.c:521

7766 +#: sha1-file.c:531

7767 #, c-format

7768 msgid "unable to normalize alternate object path: %s"

7769 msgstr "kunde inte normalisera supplerande objektsökväg: %s"

7770

7763 -#: sha1-file.c:593

7771 +#: sha1-file.c:603

7772 #, c-format

7773 msgid "%s: ignoring alternate object stores, nesting too deep"

7774 msgstr "%s: ignorerar supplerande objektlager, för djup nästling"

7775

7768 -#: sha1-file.c:600

7776 +#: sha1-file.c:610

7777 #, c-format

7778 msgid "unable to normalize object directory: %s"

7779 msgstr "kan inte normalisera objektkatalogen: %s"

7780

7773 -#: sha1-file.c:643

7781 +#: sha1-file.c:653

7782 msgid "unable to fdopen alternates lockfile"

7783 msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil"

7784

7777 -#: sha1-file.c:661

7785 +#: sha1-file.c:671

7786 msgid "unable to read alternates file"

7787 msgstr "kan inte läsa \"alternates\"-filen"

7788

7781 -#: sha1-file.c:668

7789 +#: sha1-file.c:678

7790 msgid "unable to move new alternates file into place"

7791 msgstr "kan inte flytta ny \"alternates\"-fil på plats"

7792

7785 -#: sha1-file.c:703

7793 +#: sha1-file.c:713

7794 #, c-format

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

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

7797

7790 -#: sha1-file.c:724

7798 +#: sha1-file.c:734

7799 #, c-format

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

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

7802

7795 -#: sha1-file.c:730

7803 +#: sha1-file.c:740

7804 #, c-format

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

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

7807

7800 -#: sha1-file.c:736

7808 +#: sha1-file.c:746

7809 #, c-format

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

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

7812

7805 -#: sha1-file.c:744

7813 +#: sha1-file.c:754

7814 #, c-format

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

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

7817

7810 -#: sha1-file.c:804

7818 +#: sha1-file.c:814

7819 #, c-format

7820 msgid "invalid line while parsing alternate refs: %s"

7821 msgstr "felaktig rad vid tolkning av supplerande referenser: %s"

7822

7815 -#: sha1-file.c:954

7823 +#: sha1-file.c:964

7824 #, c-format

7825 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

7826 msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>"

7827

7820 -#: sha1-file.c:975

7828 +#: sha1-file.c:985

7829 msgid "mmap failed"

7830 msgstr "mmap misslyckades"

7831

7824 -#: sha1-file.c:1139

7832 +#: sha1-file.c:1149

7833 #, c-format

7834 msgid "object file %s is empty"

7835 msgstr "objektfilen %s är tom"

7836

7829 -#: sha1-file.c:1274 sha1-file.c:2467

7837 +#: sha1-file.c:1284 sha1-file.c:2477

7838 #, c-format

7839 msgid "corrupt loose object '%s'"

7840 msgstr "trasigt löst objekt \"%s\""

7841

7834 -#: sha1-file.c:1276 sha1-file.c:2471

7842 +#: sha1-file.c:1286 sha1-file.c:2481

7843 #, c-format

7844 msgid "garbage at end of loose object '%s'"

7845 msgstr "skräp i slutet av löst objekt \"%s\""

7846

7839 -#: sha1-file.c:1318

7847 +#: sha1-file.c:1328

7848 msgid "invalid object type"

7849 msgstr "felaktig objekttyp"

7850

7843 -#: sha1-file.c:1402

7851 +#: sha1-file.c:1412

7852 #, c-format

7853 msgid "unable to unpack %s header with --allow-unknown-type"

7854 msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"

7855

7848 -#: sha1-file.c:1405

7856 +#: sha1-file.c:1415

7857 #, c-format

7858 msgid "unable to unpack %s header"

7859 msgstr "kan inte packa upp %s-huvudet"

7860

7853 -#: sha1-file.c:1411

7861 +#: sha1-file.c:1421

7862 #, c-format

7863 msgid "unable to parse %s header with --allow-unknown-type"

7864 msgstr "kan inte tolka %s-huvud med --allow-unknown-type"

7865

7858 -#: sha1-file.c:1414

7866 +#: sha1-file.c:1424

7867 #, c-format

7868 msgid "unable to parse %s header"

7869 msgstr "kan inte tolka %s-huvud"

7870

7863 -#: sha1-file.c:1641

7871 +#: sha1-file.c:1651

7872 #, c-format

7873 msgid "failed to read object %s"

7874 msgstr "misslyckades läsa objektet %s"

7875

7868 -#: sha1-file.c:1645

7876 +#: sha1-file.c:1655

7877 #, c-format

7878 msgid "replacement %s not found for %s"

7879 msgstr "ersättningen %s hittades inte för %s"

7880

7873 -#: sha1-file.c:1649

7881 +#: sha1-file.c:1659

7882 #, c-format

7883 msgid "loose object %s (stored in %s) is corrupt"

7884 msgstr "löst objekt %s (lagrat i %s) är trasigt"

7885

7878 -#: sha1-file.c:1653

7886 +#: sha1-file.c:1663

7887 #, c-format

7888 msgid "packed object %s (stored in %s) is corrupt"

7889 msgstr "packat objekt %s (lagrat i %s) är trasigt"

7890

7883 -#: sha1-file.c:1758

7891 +#: sha1-file.c:1768

7892 #, c-format

7893 msgid "unable to write file %s"

7894 msgstr "kunde inte skriva filen %s"

7895

7888 -#: sha1-file.c:1765

7896 +#: sha1-file.c:1775

7897 #, c-format

7898 msgid "unable to set permission to '%s'"

7899 msgstr "kan inte sätta behörigheten till \"%s\""

7900

7893 -#: sha1-file.c:1772

7901 +#: sha1-file.c:1782

7902 msgid "file write error"

7903 msgstr "fel vid skrivning av fil"

7904

7897 -#: sha1-file.c:1792

7905 +#: sha1-file.c:1802

7906 msgid "error when closing loose object file"

7907 msgstr "fel vid stängning av fil för löst objekt"

7908

7901 -#: sha1-file.c:1857

7909 +#: sha1-file.c:1867

7910 #, c-format

7911 msgid "insufficient permission for adding an object to repository database %s"

7912 msgstr ""

7913 "otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s"

7914

7907 -#: sha1-file.c:1859

7915 +#: sha1-file.c:1869

7916 msgid "unable to create temporary file"

7917 msgstr "kan inte skapa temporär fil"

7918

7911 -#: sha1-file.c:1883

7919 +#: sha1-file.c:1893

7920 msgid "unable to write loose object file"

7921 msgstr "kunde inte skriva fil för löst objekt"

7922

7915 -#: sha1-file.c:1889

7923 +#: sha1-file.c:1899

7924 #, c-format

7925 msgid "unable to deflate new object %s (%d)"

7926 msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"

7927

7920 -#: sha1-file.c:1893

7928 +#: sha1-file.c:1903

7929 #, c-format

7930 msgid "deflateEnd on object %s failed (%d)"

7931 msgstr "\"deflateend\" på objektet %s misslyckades (%d)"

7932

7925 -#: sha1-file.c:1897

7933 +#: sha1-file.c:1907

7934 #, c-format

7935 msgid "confused by unstable object source data for %s"

7936 msgstr "förvirrad av instabil objektkälldata för %s"

7937

7930 -#: sha1-file.c:1907 builtin/pack-objects.c:1086

7938 +#: sha1-file.c:1917 builtin/pack-objects.c:1086

7939 #, c-format

7940 msgid "failed utime() on %s"

7941 msgstr "\"utime()\" misslyckades på %s"

7942

7935 -#: sha1-file.c:1984

7943 +#: sha1-file.c:1994

7944 #, c-format

7945 msgid "cannot read object for %s"

7946 msgstr "kan inte läsa objekt för %s"

7947

7940 -#: sha1-file.c:2035

7948 +#: sha1-file.c:2045

7949 msgid "corrupt commit"

7950 msgstr "trasik incheckning"

7951

7944 -#: sha1-file.c:2043

7952 +#: sha1-file.c:2053

7953 msgid "corrupt tag"

7954 msgstr "trasig tagg"

7955

7948 -#: sha1-file.c:2143

7956 +#: sha1-file.c:2153

7957 #, c-format

7958 msgid "read error while indexing %s"

7959 msgstr "läsfel vid indexering av %s"

7960

7953 -#: sha1-file.c:2146

7961 +#: sha1-file.c:2156

7962 #, c-format

7963 msgid "short read while indexing %s"

7964 msgstr "för lite lästes vid indexering av %s"

7965

7958 -#: sha1-file.c:2219 sha1-file.c:2229

7966 +#: sha1-file.c:2229 sha1-file.c:2239

7967 #, c-format

7968 msgid "%s: failed to insert into database"

7969 msgstr "%s: misslyckades lägga in i databasen"

7970

7963 -#: sha1-file.c:2235

7971 +#: sha1-file.c:2245

7972 #, c-format

7973 msgid "%s: unsupported file type"

7974 msgstr "%s: filtypen stöds ej"

7975

7968 -#: sha1-file.c:2259

7976 +#: sha1-file.c:2269

7977 #, c-format

7978 msgid "%s is not a valid object"

7979 msgstr "%s är inte ett giltigt objekt"

7980

7973 -#: sha1-file.c:2261

7981 +#: sha1-file.c:2271

7982 #, c-format

7983 msgid "%s is not a valid '%s' object"

7984 msgstr "%s är inte ett giltigt \"%s\"-objekt"

7985

7978 -#: sha1-file.c:2288 builtin/index-pack.c:192

7986 +#: sha1-file.c:2298 builtin/index-pack.c:192

7987 #, c-format

7988 msgid "unable to open %s"

7989 msgstr "kan inte öppna %s"

7990

7983 -#: sha1-file.c:2478 sha1-file.c:2531

7991 +#: sha1-file.c:2488 sha1-file.c:2541

7992 #, c-format

7993 msgid "hash mismatch for %s (expected %s)"

7994 msgstr "hash stämmer inte för %s (förväntade %s)"

7995

7988 -#: sha1-file.c:2502

7996 +#: sha1-file.c:2512

7997 #, c-format

7998 msgid "unable to mmap %s"

7999 msgstr "kan inte utföra \"mmap\" för %s"

8000

7993 -#: sha1-file.c:2507

8001 +#: sha1-file.c:2517

8002 #, c-format

8003 msgid "unable to unpack header of %s"

8004 msgstr "kan inte packa upp huvud för %s"

8005

7998 -#: sha1-file.c:2513

8006 +#: sha1-file.c:2523

8007 #, c-format

8008 msgid "unable to parse header of %s"

8009 msgstr "kan inte tolka huvud för %s"

8010

8003 -#: sha1-file.c:2524

8011 +#: sha1-file.c:2534

8012 #, c-format

8013 msgid "unable to unpack contents of %s"

8014 msgstr "kan inte tolka innehåll i %s"

@@ -8154,8 +8162,8 @@ msgid_plural "%u bytes/s"

8162 msgstr[0] "%u byte/s"

8163 msgstr[1] "%u bytes/s"

8164

8157 -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733

8158 -#: builtin/rebase.c:858

8165 +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719

8166 +#: builtin/rebase.c:864

8167 #, c-format

8168 msgid "could not open '%s' for writing"

8169 msgstr "kunde inte öppna \"%s\" för skrivning"

@@ -8380,7 +8388,7 @@ msgstr "ls-tree returnerade en oväntad returkod %d"

8388 #: trailer.c:236

8389 #, c-format

8390 msgid "running trailer command '%s' failed"

8383 -msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\""

8391 +msgstr "misslyckades utföra släpradskommandot \"%s\""

8392

8393 #: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551

8394 #: trailer.c:555

@@ -8388,7 +8396,7 @@ msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\""

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

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

8398

8391 -#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323

8399 +#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324

8400 #, c-format

8401 msgid "more than one %s"

8402 msgstr "mer än en %s"

@@ -8477,7 +8485,7 @@ msgstr "kunde inte köra fast-import"

8485 msgid "error while running fast-import"

8486 msgstr "fel när fast-import kördes"

8487

8480 -#: transport-helper.c:549 transport-helper.c:1226

8488 +#: transport-helper.c:549 transport-helper.c:1236

8489 #, c-format

8490 msgid "could not read ref %s"

8491 msgstr "kunde inte läsa referensen %s"

@@ -8495,7 +8503,7 @@ msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst"

8503 msgid "invalid remote service path"

8504 msgstr "felaktig sökväg till fjärrtjänst"

8505

8498 -#: transport-helper.c:661 transport.c:1428

8506 +#: transport-helper.c:661 transport.c:1446

8507 msgid "operation not supported by protocol"

8508 msgstr "funktionen stöds inte av protokollet"

8509

@@ -8506,61 +8514,66 @@ msgstr "kan inte ansluta till undertjänsten %s"

8514

8515 #: transport-helper.c:745

8516 msgid "'option' without a matching 'ok/error' directive"

8509 -msgstr "\"option\" utan matchande \"ok/error\"-direktiv"

8517 +msgstr "\"option\" utan mostsvarande \"ok/error\"-direktiv"

8518

8519 #: transport-helper.c:788

8520 #, c-format

8521 msgid "expected ok/error, helper said '%s'"

8522 msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\""

8523

8516 -#: transport-helper.c:841

8524 +#: transport-helper.c:845

8525 #, c-format

8526 msgid "helper reported unexpected status of %s"

8527 msgstr "hjälparen returnerade oväntad status %s"

8528

8521 -#: transport-helper.c:924

8529 +#: transport-helper.c:928

8530 #, c-format

8531 msgid "helper %s does not support dry-run"

8532 msgstr "hjälparen %s stöder inte dry-run"

8533

8526 -#: transport-helper.c:927

8534 +#: transport-helper.c:931

8535 #, c-format

8536 msgid "helper %s does not support --signed"

8537 msgstr "hjälparen %s stöder inte --signed"

8538

8531 -#: transport-helper.c:930

8539 +#: transport-helper.c:934

8540 #, c-format

8541 msgid "helper %s does not support --signed=if-asked"

8542 msgstr "hjälparen %s stöder inte --signed=if-asked"

8543

8536 -#: transport-helper.c:935

8544 +#: transport-helper.c:939

8545 #, c-format

8546 msgid "helper %s does not support --atomic"

8547 msgstr "hjälparen %s stöder inte --atomic"

8548

8541 -#: transport-helper.c:941

8549 +#: transport-helper.c:943

8550 +#, c-format

8551 +msgid "helper %s does not support --%s"

8552 +msgstr "hjälparen %s stöder inte --%s"

8553 +

8554 +#: transport-helper.c:950

8555 #, c-format

8556 msgid "helper %s does not support 'push-option'"

8557 msgstr "hjälparen %s stöder inte \"push-option\""

8558

8546 -#: transport-helper.c:1040

8559 +#: transport-helper.c:1050

8560 msgid "remote-helper doesn't support push; refspec needed"

8561 msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs"

8562

8550 -#: transport-helper.c:1045

8563 +#: transport-helper.c:1055

8564 #, c-format

8565 msgid "helper %s does not support 'force'"

8566 msgstr "hjälparen %s stöder inte \"force\""

8567

8555 -#: transport-helper.c:1092

8568 +#: transport-helper.c:1102

8569 msgid "couldn't run fast-export"

8570 msgstr "kunde inte köra fast-export"

8571

8559 -#: transport-helper.c:1097

8572 +#: transport-helper.c:1107

8573 msgid "error while running fast-export"

8574 msgstr "fel vid körning av fast-export"

8575

8563 -#: transport-helper.c:1122

8576 +#: transport-helper.c:1132

8577 #, c-format

8578 msgid ""

8579 "No refs in common and none specified; doing nothing.\n"

@@ -8569,52 +8582,52 @@ msgstr ""

8582 "Inga gemensamma referenser och inga angavs; gör inget.\n"

8583 "Du kanske borde ange en gren.\n"

8584

8572 -#: transport-helper.c:1203

8585 +#: transport-helper.c:1213

8586 #, c-format

8587 msgid "unsupported object format '%s'"

8588 msgstr "objektformatet \"%s\" stöds ej"

8589

8577 -#: transport-helper.c:1212

8590 +#: transport-helper.c:1222

8591 #, c-format

8592 msgid "malformed response in ref list: %s"

8593 msgstr "felformat svar i referenslistan: %s"

8594

8582 -#: transport-helper.c:1364

8595 +#: transport-helper.c:1374

8596 #, c-format

8597 msgid "read(%s) failed"

8598 msgstr "läs(%s) misslyckades"

8599

8587 -#: transport-helper.c:1391

8600 +#: transport-helper.c:1401

8601 #, c-format

8602 msgid "write(%s) failed"

8603 msgstr "skriv(%s) misslyckades"

8604

8592 -#: transport-helper.c:1440

8605 +#: transport-helper.c:1450

8606 #, c-format

8607 msgid "%s thread failed"

8608 msgstr "%s-tråden misslyckades"

8609

8597 -#: transport-helper.c:1444

8610 +#: transport-helper.c:1454

8611 #, c-format

8612 msgid "%s thread failed to join: %s"

8613 msgstr "%s-tråden misslyckades ansluta: %s"

8614

8602 -#: transport-helper.c:1463 transport-helper.c:1467

8615 +#: transport-helper.c:1473 transport-helper.c:1477

8616 #, c-format

8617 msgid "can't start thread for copying data: %s"

8618 msgstr "kan inte starta tråd för kopiering av data: %s"

8619

8607 -#: transport-helper.c:1504

8620 +#: transport-helper.c:1514

8621 #, c-format

8622 msgid "%s process failed to wait"

8623 msgstr "processen %s misslyckades vänta"

8624

8612 -#: transport-helper.c:1508

8625 +#: transport-helper.c:1518

8626 #, c-format

8627 msgid "%s process failed"

8628 msgstr "processen %s misslyckades"

8629

8617 -#: transport-helper.c:1526 transport-helper.c:1535

8630 +#: transport-helper.c:1536 transport-helper.c:1545

8631 msgid "can't start thread for copying data"

8632 msgstr "kan inte skapa tråd för kopiering av data"

8633

@@ -8641,29 +8654,29 @@ msgstr "se protocol.version i \"git help config\" för mer information"

8654 msgid "server options require protocol version 2 or later"

8655 msgstr "serverflaggor kräver protokollversion 2 eller senare"

8656

8644 -#: transport.c:712

8657 +#: transport.c:727

8658 msgid "could not parse transport.color.* config"

8659 msgstr "kunde inte tolka inställningen för transport.color.*"

8660

8648 -#: transport.c:785

8661 +#: transport.c:802

8662 msgid "support for protocol v2 not implemented yet"

l10n: sv.po: Update Swedish translation (5038t0f0u)