bc25f7ae19 · matheusbsbs/matheus-bagliano

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2018-06-16 22:06+0800\n"

11 -"PO-Revision-Date: 2018-06-26 13:28+0100\n"

10 +"POT-Creation-Date: 2018-09-04 08:50+0800\n"

11 +"PO-Revision-Date: 2018-09-04 22:32+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,47 +18,47 @@ msgstr ""

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

19 "X-Generator: Gtranslator 2.91.7\n"

20

21 -#: advice.c:92

21 +#: advice.c:97

22 #, c-format

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

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

25

26 -#: advice.c:137

26 +#: advice.c:150

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

28 msgstr ""

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

30 "samman."

31

32 -#: advice.c:139

32 +#: advice.c:152

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

34 msgstr ""

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

36 "samman."

37

38 -#: advice.c:141

38 +#: advice.c:154

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

40 msgstr ""

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

42 "samman."

43

44 -#: advice.c:143

44 +#: advice.c:156

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

46 msgstr ""

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

48

49 -#: advice.c:145

49 +#: advice.c:158

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

51 msgstr ""

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

53 "samman."

54

55 -#: advice.c:147

55 +#: advice.c:160

56 #, c-format

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

58 msgstr ""

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

60

61 -#: advice.c:155

61 +#: advice.c:168

62 msgid ""

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

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

@@ -66,23 +66,23 @@ msgstr ""

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

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

68

69 -#: advice.c:163

69 +#: advice.c:176

70 msgid "Exiting because of an unresolved conflict."

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

72

73 -#: advice.c:168 builtin/merge.c:1250

73 +#: advice.c:181 builtin/merge.c:1286

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

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

76

77 -#: advice.c:170

77 +#: advice.c:183

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

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

80

81 -#: advice.c:171

81 +#: advice.c:184

82 msgid "Exiting because of unfinished merge."

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

84

85 -#: advice.c:177

85 +#: advice.c:190

86 #, c-format

87 msgid ""

88 "Note: checking out '%s'.\n"

@@ -111,92 +111,92 @@ msgstr ""

111 " git checkout -b <namn-på-ny-gren>\n"

112 "\n"

113

114 -#: apply.c:58

114 +#: apply.c:59

115 #, c-format

116 msgid "unrecognized whitespace option '%s'"

117 msgstr "okänt alternativ för whitespace: \"%s\""

118

119 -#: apply.c:74

119 +#: apply.c:75

120 #, c-format

121 msgid "unrecognized whitespace ignore option '%s'"

122 msgstr "okänt alternativ för ignore-whitespace: \"%s\""

123

124 -#: apply.c:122

124 +#: apply.c:125

125 msgid "--reject and --3way cannot be used together."

126 msgstr "--reject och --3way kan inte användas samtidigt."

127

128 -#: apply.c:124

128 +#: apply.c:127

129 msgid "--cached and --3way cannot be used together."

130 msgstr "--cached och --3way kan inte användas samtidigt."

131

132 -#: apply.c:127

132 +#: apply.c:130

133 msgid "--3way outside a repository"

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

135

136 -#: apply.c:138

136 +#: apply.c:141

137 msgid "--index outside a repository"

138 msgstr "--index utanför arkiv"

139

140 -#: apply.c:141

140 +#: apply.c:144

141 msgid "--cached outside a repository"

142 msgstr "--cached utanför arkiv"

143

144 -#: apply.c:821

144 +#: apply.c:826

145 #, c-format

146 msgid "Cannot prepare timestamp regexp %s"

147 msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"

148

149 -#: apply.c:830

149 +#: apply.c:835

150 #, c-format

151 msgid "regexec returned %d for input: %s"

152 msgstr "regexec returnerade %d för indata: %s"

153

154 -#: apply.c:904

154 +#: apply.c:909

155 #, c-format

156 msgid "unable to find filename in patch at line %d"

157 msgstr "kan inte hitta filnamn i patchen på rad %d"

158

159 -#: apply.c:942

159 +#: apply.c:947

160 #, c-format

161 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

162 msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"

163

164 -#: apply.c:948

164 +#: apply.c:953

165 #, c-format

166 msgid "git apply: bad git-diff - inconsistent new filename on line %d"

167 msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"

168

169 -#: apply.c:949

169 +#: apply.c:954

170 #, c-format

171 msgid "git apply: bad git-diff - inconsistent old filename on line %d"

172 msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"

173

174 -#: apply.c:954

174 +#: apply.c:959

175 #, c-format

176 msgid "git apply: bad git-diff - expected /dev/null on line %d"

177 msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"

178

179 -#: apply.c:983

179 +#: apply.c:988

180 #, c-format

181 msgid "invalid mode on line %d: %s"

182 msgstr "ogiltigt läge på rad %d: %s"

183

184 -#: apply.c:1301

184 +#: apply.c:1306

185 #, c-format

186 msgid "inconsistent header lines %d and %d"

187 msgstr "huvudet är inkonsekvent mellan rad %d och %d"

188

189 -#: apply.c:1473

189 +#: apply.c:1478

190 #, c-format

191 msgid "recount: unexpected line: %.*s"

192 msgstr "recount: förväntade rad: %.*s"

193

194 -#: apply.c:1542

194 +#: apply.c:1547

195 #, c-format

196 msgid "patch fragment without header at line %d: %.*s"

197 msgstr "patch-fragment utan huvud på rad %d: %.*s"

198

199 -#: apply.c:1562

199 +#: apply.c:1567

200 #, c-format

201 msgid ""

202 "git diff header lacks filename information when removing %d leading pathname "

@@ -212,82 +212,82 @@ msgstr[1] ""

212 "sökvägskomponenter\n"

213 "tas bort (rad %d)"

214

215 -#: apply.c:1575

215 +#: apply.c:1580

216 #, c-format

217 msgid "git diff header lacks filename information (line %d)"

218 msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)"

219

220 -#: apply.c:1763

220 +#: apply.c:1768

221 msgid "new file depends on old contents"

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

223

224 -#: apply.c:1765

224 +#: apply.c:1770

225 msgid "deleted file still has contents"

226 msgstr "borttagen fil har fortfarande innehåll"

227

228 -#: apply.c:1799

228 +#: apply.c:1804

229 #, c-format

230 msgid "corrupt patch at line %d"

231 msgstr "trasig patch på rad %d"

232

233 -#: apply.c:1836

233 +#: apply.c:1841

234 #, c-format

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

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

237

238 -#: apply.c:1838

238 +#: apply.c:1843

239 #, c-format

240 msgid "deleted file %s still has contents"

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

242

243 -#: apply.c:1841

243 +#: apply.c:1846

244 #, c-format

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

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

247

248 -#: apply.c:1988

248 +#: apply.c:1993

249 #, c-format

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

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

252

253 -#: apply.c:2025

253 +#: apply.c:2030

254 #, c-format

255 msgid "unrecognized binary patch at line %d"

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

257

258 -#: apply.c:2185

258 +#: apply.c:2190

259 #, c-format

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

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

262

263 -#: apply.c:2271

263 +#: apply.c:2276

264 #, c-format

265 msgid "unable to read symlink %s"

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

267

268 -#: apply.c:2275

268 +#: apply.c:2280

269 #, c-format

270 msgid "unable to open or read %s"

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

272

273 -#: apply.c:2934

273 +#: apply.c:2939

274 #, c-format

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

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

277

278 -#: apply.c:3055

278 +#: apply.c:3060

279 #, c-format

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

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

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

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

284

285 -#: apply.c:3067

285 +#: apply.c:3072

286 #, c-format

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

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

289

290 -#: apply.c:3073

290 +#: apply.c:3078

291 #, c-format

292 msgid ""

293 "while searching for:\n"

@@ -296,25 +296,25 @@ msgstr ""

296 "vid sökning efter:\n"

297 "%.*s"

298

299 -#: apply.c:3095

299 +#: apply.c:3100

300 #, c-format

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

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

303

304 -#: apply.c:3103

304 +#: apply.c:3108

305 #, c-format

306 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

307 msgstr ""

308 "kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s"

309 "\""

310

311 -#: apply.c:3149

311 +#: apply.c:3154

312 #, c-format

313 msgid "cannot apply binary patch to '%s' without full index line"

314 msgstr ""

315 "kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden"

316

317 -#: apply.c:3159

317 +#: apply.c:3164

318 #, c-format

319 msgid ""

320 "the patch applies to '%s' (%s), which does not match the current contents."

@@ -322,539 +322,593 @@ msgstr ""

322 "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande "

323 "innehållet."

324

325 -#: apply.c:3167

325 +#: apply.c:3172

326 #, c-format

327 msgid "the patch applies to an empty '%s' but it is not empty"

328 msgstr "patchen appliceras på en tom \"%s\", men den är inte tom"

329

330 -#: apply.c:3185

330 +#: apply.c:3190

331 #, c-format

332 msgid "the necessary postimage %s for '%s' cannot be read"

333 msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas"

334

335 -#: apply.c:3198

335 +#: apply.c:3203

336 #, c-format

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

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

339

340 -#: apply.c:3204

340 +#: apply.c:3209

341 #, c-format

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

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

344

345 -#: apply.c:3225

345 +#: apply.c:3230

346 #, c-format

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

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

349

350 -#: apply.c:3347

350 +#: apply.c:3352

351 #, c-format

352 msgid "cannot checkout %s"

353 msgstr "kan inte checka ut %s"

354

355 -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278

355 +#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278

356 #, c-format

357 msgid "failed to read %s"

358 msgstr "misslyckades läsa %s"

359

360 -#: apply.c:3404

360 +#: apply.c:3412

361 #, c-format

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

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

364

365 -#: apply.c:3433 apply.c:3673

365 +#: apply.c:3441 apply.c:3681

366 #, c-format

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

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

369

370 -#: apply.c:3516 apply.c:3687

370 +#: apply.c:3524 apply.c:3696

371 #, c-format

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

373 msgstr "%s: finns inte i indexet"

374

375 -#: apply.c:3525 apply.c:3695

375 +#: apply.c:3533 apply.c:3704

376 #, c-format

377 msgid "%s: does not match index"

378 msgstr "%s: motsvarar inte indexet"

379

380 -#: apply.c:3560

380 +#: apply.c:3568

381 msgid "repository lacks the necessary blob to fall back on 3-way merge."

382 msgstr ""

383 "arkivet saknar objekt som behövs för att falla tillbaka på 3-"

384 "vägssammanslagning."

385

386 -#: apply.c:3563

386 +#: apply.c:3571

387 #, c-format

388 msgid "Falling back to three-way merge...\n"

389 msgstr "Faller tillbaka på trevägssammanslagning...\n"

390

391 -#: apply.c:3579 apply.c:3583

391 +#: apply.c:3587 apply.c:3591

392 #, c-format

393 msgid "cannot read the current contents of '%s'"

394 msgstr "kunde inte läsa aktuellt innehåll i \"%s\""

395

396 -#: apply.c:3595

396 +#: apply.c:3603

397 #, c-format

398 msgid "Failed to fall back on three-way merge...\n"

399 msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n"

400

401 -#: apply.c:3609

401 +#: apply.c:3617

402 #, c-format

403 msgid "Applied patch to '%s' with conflicts.\n"

404 msgstr "Applicerade patchen på \"%s\" med konflikter.\n"

405

406 -#: apply.c:3614

406 +#: apply.c:3622

407 #, c-format

408 msgid "Applied patch to '%s' cleanly.\n"

409 msgstr "Tillämpade patchen på \"%s\" rent.\n"

410

411 -#: apply.c:3640

411 +#: apply.c:3648

412 msgid "removal patch leaves file contents"

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

414

415 -#: apply.c:3712

415 +#: apply.c:3721

416 #, c-format

417 msgid "%s: wrong type"

418 msgstr "%s: fel typ"

419

420 -#: apply.c:3714

420 +#: apply.c:3723

421 #, c-format

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

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

424

425 -#: apply.c:3864 apply.c:3866

425 +#: apply.c:3874 apply.c:3876

426 #, c-format

427 msgid "invalid path '%s'"

428 msgstr "ogiltig sökväg ”%s”"

429

430 -#: apply.c:3922

430 +#: apply.c:3932

431 #, c-format

432 msgid "%s: already exists in index"

433 msgstr "%s: finns redan i indexet"

434

435 -#: apply.c:3925

435 +#: apply.c:3935

436 #, c-format

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

438 msgstr "%s: finns redan i arbetskatalogen"

439

440 -#: apply.c:3945

440 +#: apply.c:3955

441 #, c-format

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

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

444

445 -#: apply.c:3950

445 +#: apply.c:3960

446 #, c-format

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

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

449

450 -#: apply.c:3970

450 +#: apply.c:3980

451 #, c-format

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

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

454

455 -#: apply.c:3974

455 +#: apply.c:3984

456 #, c-format

457 msgid "%s: patch does not apply"

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

459

460 -#: apply.c:3989

460 +#: apply.c:3999

461 #, c-format

462 msgid "Checking patch %s..."

463 msgstr "Kontrollerar patchen %s..."

464

465 -#: apply.c:4080

465 +#: apply.c:4091

466 #, c-format

467 msgid "sha1 information is lacking or useless for submodule %s"

468 msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s"

469

470 -#: apply.c:4087

470 +#: apply.c:4098

471 #, c-format

472 msgid "mode change for %s, which is not in current HEAD"

473 msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"

474

475 -#: apply.c:4090

475 +#: apply.c:4101

476 #, c-format

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

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

479

480 -#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140

480 +#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140

481 #, c-format

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

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

484

485 -#: apply.c:4099

485 +#: apply.c:4110

486 #, c-format

487 msgid "could not add %s to temporary index"

488 msgstr "kunde inte lägga till %s till temporärt index"

489

490 -#: apply.c:4109

490 +#: apply.c:4120

491 #, c-format

492 msgid "could not write temporary index to %s"

493 msgstr "kunde inte skriva temporärt index till %s"

494

495 -#: apply.c:4247

495 +#: apply.c:4258

496 #, c-format

497 msgid "unable to remove %s from index"

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

499

500 -#: apply.c:4282

500 +#: apply.c:4292

501 #, c-format

502 msgid "corrupt patch for submodule %s"

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

504

505 -#: apply.c:4288

505 +#: apply.c:4298

506 #, c-format

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

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

509

510 -#: apply.c:4296

510 +#: apply.c:4306

511 #, c-format

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

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

514

515 -#: apply.c:4302 apply.c:4446

515 +#: apply.c:4312 apply.c:4457

516 #, c-format

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

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

519

520 -#: apply.c:4343

520 +#: apply.c:4355

521 #, c-format

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

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

524

525 -#: apply.c:4347

525 +#: apply.c:4359

526 #, c-format

527 msgid "closing file '%s'"

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

529

530 -#: apply.c:4417

530 +#: apply.c:4429

531 #, c-format

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

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

534

535 -#: apply.c:4515

535 +#: apply.c:4527

536 #, c-format

537 msgid "Applied patch %s cleanly."

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

539

540 -#: apply.c:4523

540 +#: apply.c:4535

541 msgid "internal error"

542 msgstr "internt fel"

543

544 -#: apply.c:4526

544 +#: apply.c:4538

545 #, c-format

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

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

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

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

550

551 -#: apply.c:4537

551 +#: apply.c:4549

552 #, c-format

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

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

555

556 -#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036

556 +#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048

557 #, c-format

558 msgid "cannot open %s"

559 msgstr "kan inte öppna %s"

560

561 -#: apply.c:4559

561 +#: apply.c:4571

562 #, c-format

563 msgid "Hunk #%d applied cleanly."

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

565

566 -#: apply.c:4563

566 +#: apply.c:4575

567 #, c-format

568 msgid "Rejected hunk #%d."

569 msgstr "Refuserar stycke %d."

570

571 -#: apply.c:4673

571 +#: apply.c:4685

572 #, c-format

573 msgid "Skipped patch '%s'."

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

575

576 -#: apply.c:4681

576 +#: apply.c:4693

577 msgid "unrecognized input"

578 msgstr "indata känns inte igen"

579

580 -#: apply.c:4700

580 +#: apply.c:4712

581 msgid "unable to read index file"

582 msgstr "kan inte läsa indexfilen"

583

584 -#: apply.c:4837

584 +#: apply.c:4849

585 #, c-format

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

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

588

589 -#: apply.c:4864

589 +#: apply.c:4876

590 #, c-format

591 msgid "squelched %d whitespace error"

592 msgid_plural "squelched %d whitespace errors"

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

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

595

596 -#: apply.c:4870 apply.c:4885

596 +#: apply.c:4882 apply.c:4897

597 #, c-format

598 msgid "%d line adds whitespace errors."

599 msgid_plural "%d lines add whitespace errors."

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

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

602

603 -#: apply.c:4878

603 +#: apply.c:4890

604 #, c-format

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

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

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

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

609

610 -#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

610 +#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389

611 msgid "Unable to write new index file"

612 msgstr "Kunde inte skriva ny indexfil"

613

614 -#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257

615 -#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198

616 -#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210

617 -#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584

618 -#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807

619 -#: git-add--interactive.perl:197

614 +#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257

615 +#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260

616 +#: builtin/pull.c:198 builtin/submodule--helper.c:406

617 +#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358

618 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732

619 +#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197

620 msgid "path"

621 msgstr "sökväg"

622

623 -#: apply.c:4922

623 +#: apply.c:4934

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

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

626

627 -#: apply.c:4925

627 +#: apply.c:4937

628 msgid "apply changes matching the given path"

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

630

631 -#: apply.c:4927 builtin/am.c:2263

631 +#: apply.c:4939 builtin/am.c:2263

632 msgid "num"

633 msgstr "antal"

634

635 -#: apply.c:4928

635 +#: apply.c:4940

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

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

638

639 -#: apply.c:4931

639 +#: apply.c:4943

640 msgid "ignore additions made by the patch"

641 msgstr "ignorera tillägg gjorda av patchen"

642

643 -#: apply.c:4933

643 +#: apply.c:4945

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

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

646

647 -#: apply.c:4937

647 +#: apply.c:4949

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

649 msgstr "visa antal tillagda och borttagna rader decimalt"

650

651 -#: apply.c:4939

651 +#: apply.c:4951

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

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

654

655 -#: apply.c:4941

655 +#: apply.c:4953

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

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

658

659 -#: apply.c:4943

659 +#: apply.c:4955

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

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

662

663 -#: apply.c:4945

663 +#: apply.c:4957

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

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

666 +

667 +#: apply.c:4959

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

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

670

667 -#: apply.c:4947

671 +#: apply.c:4961

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

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

674

671 -#: apply.c:4950

675 +#: apply.c:4964

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

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

678

675 -#: apply.c:4952

679 +#: apply.c:4966

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

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

682

679 -#: apply.c:4954

683 +#: apply.c:4968

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

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

686

683 -#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515

687 +#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516

688 msgid "paths are separated with NUL character"

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

690

687 -#: apply.c:4959

691 +#: apply.c:4973

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

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

694

691 -#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95

695 +#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95

696 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

693 -#: builtin/pack-objects.c:3177

697 +#: builtin/pack-objects.c:3202

698 msgid "action"

699 msgstr "åtgärd"

700

697 -#: apply.c:4961

701 +#: apply.c:4975

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

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

704

701 -#: apply.c:4964 apply.c:4967

705 +#: apply.c:4978 apply.c:4981

706 msgid "ignore changes in whitespace when finding context"

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

708

705 -#: apply.c:4970

709 +#: apply.c:4984

710 msgid "apply the patch in reverse"

711 msgstr "tillämpa patchen baklänges"

712

709 -#: apply.c:4972

713 +#: apply.c:4986

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

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

716

713 -#: apply.c:4974

717 +#: apply.c:4988

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

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

720

717 -#: apply.c:4976

721 +#: apply.c:4990

722 msgid "allow overlapping hunks"

723 msgstr "tillåt överlappande stycken"

724

721 -#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21

722 -#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666

723 -#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124

725 +#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21

726 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671

727 +#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124

728 msgid "be verbose"

729 msgstr "var pratsam"

730

727 -#: apply.c:4979

731 +#: apply.c:4993

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

733 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

734

731 -#: apply.c:4982

735 +#: apply.c:4996

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

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

738

735 -#: apply.c:4984 builtin/am.c:2251

739 +#: apply.c:4998 builtin/am.c:2251

740 msgid "root"

741 msgstr "rot"

742

739 -#: apply.c:4985

743 +#: apply.c:4999

744 msgid "prepend <root> to all filenames"

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

746

743 -#: archive.c:13

747 +#: archive.c:14

748 msgid "git archive [<options>] <tree-ish> [<path>...]"

749 msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]"

750

747 -#: archive.c:14

751 +#: archive.c:15

752 msgid "git archive --list"

753 msgstr "git archive --list"

754

751 -#: archive.c:15

755 +#: archive.c:16

756 msgid ""

757 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"

758 msgstr ""

759 "git archive --remote <arkiv> [--exec <kmd>] [<flaggor>] <träd-igt> "

760 "[<sökväg>...]"

761

758 -#: archive.c:16

762 +#: archive.c:17

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

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

765

762 -#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

766 +#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298

767 #, c-format

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

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

770

767 -#: archive.c:434

771 +#: archive.c:446

772 msgid "fmt"

773 msgstr "fmt"

774

771 -#: archive.c:434

775 +#: archive.c:446

776 msgid "archive format"

777 msgstr "arkivformat"

778

775 -#: archive.c:435 builtin/log.c:1462

779 +#: archive.c:447 builtin/log.c:1473

780 msgid "prefix"

781 msgstr "prefix"

782

779 -#: archive.c:436

783 +#: archive.c:448

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

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

786

783 -#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127

784 -#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869

785 -#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554

786 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119

787 +#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126

788 +#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873

789 +#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555

790 +#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119

791 #: parse-options.h:165

792 msgid "file"

793 msgstr "fil"

794

791 -#: archive.c:438 builtin/archive.c:89

795 +#: archive.c:450 builtin/archive.c:89

796 msgid "write the archive to this file"

797 msgstr "skriv arkivet till filen"

798

795 -#: archive.c:440

799 +#: archive.c:452

800 msgid "read .gitattributes in working directory"

801 msgstr "läs .gitattributes i arbetskatalogen"

802

799 -#: archive.c:441

803 +#: archive.c:453

804 msgid "report archived files on stderr"

805 msgstr "rapportera arkiverade filer på standard fel"

806

803 -#: archive.c:442

807 +#: archive.c:454

808 msgid "store only"

809 msgstr "endast spara"

810

807 -#: archive.c:443

811 +#: archive.c:455

812 msgid "compress faster"

813 msgstr "komprimera snabbare"

814

811 -#: archive.c:451

815 +#: archive.c:463

816 msgid "compress better"

817 msgstr "komprimera bättre"

818

815 -#: archive.c:454

819 +#: archive.c:466

820 msgid "list supported archive formats"

821 msgstr "visa understödda arkivformat"

822

819 -#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113

820 -#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593

823 +#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114

824 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738

825 msgid "repo"

826 msgstr "arkiv"

827

824 -#: archive.c:457 builtin/archive.c:91

828 +#: archive.c:469 builtin/archive.c:91

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

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

831

828 -#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489

832 +#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714

833 +#: builtin/notes.c:491

834 msgid "command"

835 msgstr "kommando"

836

832 -#: archive.c:459 builtin/archive.c:93

837 +#: archive.c:471 builtin/archive.c:93

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

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

840

836 -#: archive.c:466

841 +#: archive.c:478

842 msgid "Unexpected option --remote"

843 msgstr "Oväntad flagga --remote"

844

840 -#: archive.c:468

845 +#: archive.c:480

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

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

848

844 -#: archive.c:470

849 +#: archive.c:482

850 msgid "Unexpected option --output"

851 msgstr "Oväntad flagga --output"

852

848 -#: archive.c:492

853 +#: archive.c:504

854 #, c-format

855 msgid "Unknown archive format '%s'"

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

857

853 -#: archive.c:499

858 +#: archive.c:511

859 #, c-format

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

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

862

863 +#: archive-tar.c:125 archive-zip.c:344

864 +#, c-format

865 +msgid "cannot stream blob %s"

866 +msgstr "kan inte strömma blob:en %s"

867 +

868 +#: archive-tar.c:260 archive-zip.c:361

869 +#, c-format

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

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

872 +

873 +#: archive-tar.c:287 archive-zip.c:352

874 +#, c-format

875 +msgid "cannot read %s"

876 +msgstr "kan inte läsa %s"

877 +

878 +#: archive-tar.c:458

879 +#, c-format

880 +msgid "unable to start '%s' filter"

881 +msgstr "kunde inte starta filtret \"%s\""

882 +

883 +#: archive-tar.c:461

884 +msgid "unable to redirect descriptor"

885 +msgstr "kan inte omdirigera handtag"

886 +

887 +#: archive-tar.c:468

888 +#, c-format

889 +msgid "'%s' filter reported error"

890 +msgstr "filtret \"%s\" rapporterade fel"

891 +

892 +#: archive-zip.c:313

893 +#, c-format

894 +msgid "path is not valid UTF-8: %s"

895 +msgstr "sökvägen är inte giltig UTF-8: %s"

896 +

897 +#: archive-zip.c:317

898 +#, c-format

899 +msgid "path too long (%d chars, SHA1: %s): %s"

900 +msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s"

901 +

902 +#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219

903 +#, c-format

904 +msgid "deflate error (%d)"

905 +msgstr "fel i deflate (%d)"

906 +

907 +#: archive-zip.c:605

908 +#, c-format

909 +msgid "timestamp too large for this system: %<PRIuMAX>"

910 +msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>"

911 +

912 #: attr.c:218

913 #, c-format

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

@@ -868,22 +922,22 @@ msgstr ""

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

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

924

871 -#: bisect.c:461

925 +#: bisect.c:467

926 #, c-format

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

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

929

876 -#: bisect.c:669

930 +#: bisect.c:675

931 #, c-format

932 msgid "We cannot bisect more!\n"

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

934

881 -#: bisect.c:723

935 +#: bisect.c:729

936 #, c-format

937 msgid "Not a valid commit name %s"

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

939

886 -#: bisect.c:747

940 +#: bisect.c:753

941 #, c-format

942 msgid ""

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

@@ -892,7 +946,7 @@ msgstr ""

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

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

948

895 -#: bisect.c:752

949 +#: bisect.c:758

950 #, c-format

951 msgid ""

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

@@ -901,7 +955,7 @@ msgstr ""

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

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

957

904 -#: bisect.c:757

958 +#: bisect.c:763

959 #, c-format

960 msgid ""

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

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

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

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

966

913 -#: bisect.c:765

967 +#: bisect.c:771

968 #, c-format

969 msgid ""

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

@@ -921,7 +975,7 @@ msgstr ""

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

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

977

924 -#: bisect.c:778

978 +#: bisect.c:784

979 #, c-format

980 msgid ""

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

@@ -933,36 +987,36 @@ msgstr ""

987 "%s.\n"

988 "Vi fortsätter ändå."

989

936 -#: bisect.c:811

990 +#: bisect.c:817

991 #, c-format

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

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

994

941 -#: bisect.c:851

995 +#: bisect.c:857

996 #, c-format

997 msgid "a %s revision is needed"

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

999

946 -#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236

1000 +#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237

1001 #, c-format

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

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

1004

951 -#: bisect.c:921

1005 +#: bisect.c:927 builtin/merge.c:137

1006 #, c-format

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

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

1009

956 -#: bisect.c:951

1010 +#: bisect.c:957

1011 msgid "reading bisect refs failed"

1012 msgstr "misslyckades läsa bisect-referenser"

1013

960 -#: bisect.c:970

1014 +#: bisect.c:976

1015 #, c-format

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

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

1018

965 -#: bisect.c:978

1019 +#: bisect.c:984

1020 #, c-format

1021 msgid ""

1022 "No testable commit found.\n"

@@ -971,7 +1025,7 @@ msgstr ""

1025 "Ingen testbar incheckning hittades.\n"

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

1027

974 -#: bisect.c:997

1028 +#: bisect.c:1003

1029 #, c-format

1030 msgid "(roughly %d step)"

1031 msgid_plural "(roughly %d steps)"

@@ -981,52 +1035,53 @@ msgstr[1] "(ungefär %d steg)"

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

1036 #. steps)" translation.

1037 #.

984 -#: bisect.c:1003

1038 +#: bisect.c:1009

1039 #, c-format

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

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

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

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

1044

991 -#: blame.c:1756

1045 +#: blame.c:1784

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

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

1048

995 -#: blame.c:1767

1049 +#: blame.c:1798

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

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

1052

999 -#: blame.c:1787

1053 +#: blame.c:1819

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

1055 msgstr ""

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

1057 "incheckningen"

1058

1005 -#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861

1006 -#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920

1007 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372

1059 +#: blame.c:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874

1060 +#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926

1061 +#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404

1062 +#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044

1063 #: builtin/shortlog.c:192

1064 msgid "revision walk setup failed"

1065 msgstr "misslyckades skapa revisionstraversering"

1066

1012 -#: blame.c:1814

1067 +#: blame.c:1846

1068 msgid ""

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

1070 msgstr ""

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

1072 "kedjan"

1073

1019 -#: blame.c:1825

1074 +#: blame.c:1857

1075 #, c-format

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

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

1078

1024 -#: blame.c:1836

1079 +#: blame.c:1868

1080 #, c-format

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

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

1083

1029 -#: branch.c:54

1084 +#: branch.c:52

1085 #, c-format

1086 msgid ""

1087 "\n"

@@ -1039,92 +1094,92 @@ msgstr ""

1094 "fjärrspårningsinformationen genom att utföra\n"

1095 "\"git branch --set-upstream-to=%s%s%s\"."

1096

1042 -#: branch.c:68

1097 +#: branch.c:66

1098 #, c-format

1099 msgid "Not setting branch %s as its own upstream."

1100 msgstr "Ställer inte in grenen %s som sin egen uppströmsgren."

1101

1047 -#: branch.c:94

1102 +#: branch.c:92

1103 #, c-format

1104 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."

1105 msgstr ""

1106 "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom "

1107 "ombasering."

1108

1054 -#: branch.c:95

1109 +#: branch.c:93

1110 #, c-format

1111 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."

1112 msgstr "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\"."

1113

1059 -#: branch.c:99

1114 +#: branch.c:97

1115 #, c-format

1116 msgid "Branch '%s' set up to track local branch '%s' by rebasing."

1117 msgstr ""

1118 "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\" genom "

1119 "ombasering."

1120

1066 -#: branch.c:100

1121 +#: branch.c:98

1122 #, c-format

1123 msgid "Branch '%s' set up to track local branch '%s'."

1124 msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"."

1125

1071 -#: branch.c:105

1126 +#: branch.c:103

1127 #, c-format

1128 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."

1129 msgstr ""

1130 "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom ombasering."

1131

1077 -#: branch.c:106

1132 +#: branch.c:104

1133 #, c-format

1134 msgid "Branch '%s' set up to track remote ref '%s'."

1135 msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"."

1136

1082 -#: branch.c:110

1137 +#: branch.c:108

1138 #, c-format

1139 msgid "Branch '%s' set up to track local ref '%s' by rebasing."

1140 msgstr ""

1141 "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\" genom "

1142 "ombasering."

1143

1089 -#: branch.c:111

1144 +#: branch.c:109

1145 #, c-format

1146 msgid "Branch '%s' set up to track local ref '%s'."

1147 msgstr "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\"."

1148

1094 -#: branch.c:120

1149 +#: branch.c:118

1150 msgid "Unable to write upstream branch configuration"

1151 msgstr "Kan inte skriva inställningar för uppströmsgren"

1152

1098 -#: branch.c:157

1153 +#: branch.c:155

1154 #, c-format

1155 msgid "Not tracking: ambiguous information for ref %s"

1156 msgstr "Spårar inte: tvetydig information för referensen %s"

1157

1103 -#: branch.c:190

1158 +#: branch.c:188

1159 #, c-format

1160 msgid "'%s' is not a valid branch name."

1161 msgstr "\"%s\" är inte ett giltigt grennamn."

1162

1108 -#: branch.c:209

1163 +#: branch.c:207

1164 #, c-format

1165 msgid "A branch named '%s' already exists."

1166 msgstr "Det finns redan en gren som heter ”%s”."

1167

1113 -#: branch.c:214

1168 +#: branch.c:212

1169 msgid "Cannot force update the current branch."

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

1171

1117 -#: branch.c:234

1172 +#: branch.c:232

1173 #, c-format

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

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

1176

1122 -#: branch.c:236

1177 +#: branch.c:234

1178 #, c-format

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

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

1181

1127 -#: branch.c:238

1182 +#: branch.c:236

1183 msgid ""

1184 "\n"

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

@@ -1144,100 +1199,100 @@ msgstr ""

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

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

1201

1147 -#: branch.c:281

1202 +#: branch.c:279

1203 #, c-format

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

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

1206

1152 -#: branch.c:301

1207 +#: branch.c:299

1208 #, c-format

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

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

1211

1157 -#: branch.c:306

1212 +#: branch.c:304

1213 #, c-format

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

1215 msgstr "Avgreningspunkten är inte giltig: ”%s”."

1216

1162 -#: branch.c:360

1217 +#: branch.c:358

1218 #, c-format

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

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

1221

1167 -#: branch.c:383

1222 +#: branch.c:381

1223 #, c-format

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

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

1226

1172 -#: bundle.c:34

1227 +#: bundle.c:36

1228 #, c-format

1229 msgid "'%s' does not look like a v2 bundle file"

1230 msgstr "'%s' ser inte ut som en v2-bundle-fil"

1231

1177 -#: bundle.c:62

1232 +#: bundle.c:64

1233 #, c-format

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

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

1236

1182 -#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755

1237 +#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768

1238 #, c-format

1239 msgid "could not open '%s'"

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

1241

1187 -#: bundle.c:139

1242 +#: bundle.c:141

1243 msgid "Repository lacks these prerequisite commits:"

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

1245

1191 -#: bundle.c:190

1246 +#: bundle.c:192

1247 #, c-format

1248 msgid "The bundle contains this ref:"

1249 msgid_plural "The bundle contains these %d refs:"

1250 msgstr[0] "Paketet (bundlen) innehåller denna referens:"

1251 msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:"

1252

1198 -#: bundle.c:197

1253 +#: bundle.c:199

1254 msgid "The bundle records a complete history."

1255 msgstr "Paketet (bundlen) beskriver en komplett historik."

1256

1202 -#: bundle.c:199

1257 +#: bundle.c:201

1258 #, c-format

1259 msgid "The bundle requires this ref:"

1260 msgid_plural "The bundle requires these %d refs:"

1261 msgstr[0] "Paketet (bundlen) kräver denna referens:"

1262 msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"

1263

1209 -#: bundle.c:258

1264 +#: bundle.c:260

1265 msgid "Could not spawn pack-objects"

1266 msgstr "Kunde inte starta pack-objects"

1267

1213 -#: bundle.c:269

1268 +#: bundle.c:271

1269 msgid "pack-objects died"

1270 msgstr "pack-objects misslyckades"

1271

1217 -#: bundle.c:311

1272 +#: bundle.c:313

1273 msgid "rev-list died"

1274 msgstr "rev-list dog"

1275

1221 -#: bundle.c:360

1276 +#: bundle.c:362

1277 #, c-format

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

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

1280

1226 -#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303

1281 +#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304

1282 #, c-format

1283 msgid "unrecognized argument: %s"

1284 msgstr "okänt argument: %s"

1285

1231 -#: bundle.c:458

1286 +#: bundle.c:461

1287 msgid "Refusing to create empty bundle."

1288 msgstr "Vägrar skapa ett tomt paket (bundle)."

1289

1235 -#: bundle.c:470

1290 +#: bundle.c:473

1291 #, c-format

1292 msgid "cannot create '%s'"

1293 msgstr "kan inte skapa \"%s\""

1294

1240 -#: bundle.c:498

1295 +#: bundle.c:501

1296 msgid "index-pack died"

1297 msgstr "index-pack dog"

1298

@@ -1246,19 +1301,19 @@ msgstr "index-pack dog"

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

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

1303

1249 -#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465

1250 -#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376

1304 +#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466

1305 +#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376

1306 #: builtin/replace.c:448

1307 #, c-format

1308 msgid "could not parse %s"

1309 msgstr "kunde inte tolka %s"

1310

1256 -#: commit.c:45

1311 +#: commit.c:50

1312 #, c-format

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

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

1315

1261 -#: commit.c:182

1316 +#: commit.c:191

1317 msgid ""

1318 "Support for <GIT_DIR>/info/grafts is deprecated\n"

1319 "and will be removed in a future Git version.\n"

@@ -1278,7 +1333,7 @@ msgstr ""

1333 "Slå av detta meddelande genom att skriva\n"

1334 "\"git config advice.graftFileDeprecated false\""

1335

1281 -#: commit.c:1540

1336 +#: commit.c:1629

1337 msgid ""

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

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

@@ -1288,190 +1343,397 @@ msgstr ""

1343 "Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n"

1344 "i18n.commitencoding till den teckenkodning som används i ditt projekt.\n"

1345

1291 -#: commit-graph.c:669

1346 +#: commit-graph.c:83

1347 +#, c-format

1348 +msgid "graph file %s is too small"

1349 +msgstr "graffilen %s är för liten"

1350 +

1351 +#: commit-graph.c:90

1352 +#, c-format

1353 +msgid "graph signature %X does not match signature %X"

1354 +msgstr "grafsignaturen %X stämmer inte med signaturen %X"

1355 +

1356 +#: commit-graph.c:97

1357 +#, c-format

1358 +msgid "graph version %X does not match version %X"

1359 +msgstr "grafversionen %X stämmer inte med versionen %X"

1360 +

1361 +#: commit-graph.c:104

1362 +#, c-format

1363 +msgid "hash version %X does not match version %X"

1364 +msgstr "hash-versionen %X stämmer inte med versionen %X"

1365 +

1366 +#: commit-graph.c:128

1367 +#, c-format

1368 +msgid "improper chunk offset %08x%08x"

1369 +msgstr "felaktigt offset för stycke %08x%08x"

1370 +

1371 +#: commit-graph.c:164

1372 +#, c-format

1373 +msgid "chunk id %08x appears multiple times"

1374 +msgstr "stycke-id %08x förekommer flera gånger"

1375 +

1376 +#: commit-graph.c:261

1377 +#, c-format

1378 +msgid "could not find commit %s"

1379 +msgstr "kunde inte hitta incheckningen %s"

1380 +

1381 +#: commit-graph.c:565 builtin/pack-objects.c:2568

1382 +#, c-format

1383 +msgid "unable to get type of object %s"

1384 +msgstr "kunde inte hämta typ för objektet %s"

1385 +

1386 +#: commit-graph.c:730

1387 +#, c-format

1388 +msgid "error adding pack %s"

1389 +msgstr "fel vid tillägg av paketet %s"

1390 +

1391 +#: commit-graph.c:732

1392 +#, c-format

1393 +msgid "error opening index for %s"

1394 +msgstr "fel vid öppning av indexet för %s"

1395 +

1396 +#: commit-graph.c:773

1397 #, c-format

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

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

1400

1296 -#: commit-graph.c:696

1401 +#: commit-graph.c:800

1402 msgid "too many commits to write graph"

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

1404

1300 -#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521

1405 +#: commit-graph.c:806

1406 #, c-format

1302 -msgid "cannot mkdir %s"

1303 -msgstr "kan inte skapa katalogen (mkdir) %s"

1407 +msgid "unable to create leading directories of %s"

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

1409 +

1410 +#: commit-graph.c:904

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

1412 +msgstr ""

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

1414

1415 #: compat/obstack.c:405 compat/obstack.c:407

1416 msgid "memory exhausted"

1417 msgstr "minnet slut"

1418

1309 -#: config.c:187

1419 +#: config.c:123

1420 +#, c-format

1421 +msgid ""

1422 +"exceeded maximum include depth (%d) while including\n"

1423 +"\t%s\n"

1424 +"from\n"

1425 +"\t%s\n"

1426 +"This might be due to circular includes."

1427 +msgstr ""

1428 +"överskred maximalt inkluderingsdjup (%d) när\n"

1429 +"\t%s\n"

1430 +"inkluderades från\n"

1431 +"\t%s\n"

1432 +"Det kan bero på cirkulära inkluderingar."

1433 +

1434 +#: config.c:139

1435 +#, c-format

1436 +msgid "could not expand include path '%s'"

1437 +msgstr "kunde inte expandera inkluderingssökväg \"%s\""

1438 +

1439 +#: config.c:150

1440 +msgid "relative config includes must come from files"

1441 +msgstr "relativa konfigureringsinkluderingar måste komma från filer"

1442 +

1443 +#: config.c:190

1444 msgid "relative config include conditionals must come from files"

1445 msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"

1446

1313 -#: config.c:788

1447 +#: config.c:348

1448 +#, c-format

1449 +msgid "key does not contain a section: %s"

1450 +msgstr "nyckeln innehåller inte ett stycke: %s"

1451 +

1452 +#: config.c:354

1453 +#, c-format

1454 +msgid "key does not contain variable name: %s"

1455 +msgstr "nyckeln innehåller inte variabelnamn: %s"

1456 +

1457 +#: config.c:378 sequencer.c:2206

1458 +#, c-format

1459 +msgid "invalid key: %s"

1460 +msgstr "felaktig nyckel: %s"

1461 +

1462 +#: config.c:384

1463 +#, c-format

1464 +msgid "invalid key (newline): %s"

1465 +msgstr "ogiltig nyckel (nyradstecken): %s"

1466 +

1467 +#: config.c:420 config.c:432

1468 +#, c-format

1469 +msgid "bogus config parameter: %s"

1470 +msgstr "falsk konfigureringsparameter: %s"

1471 +

1472 +#: config.c:467

1473 +#, c-format

1474 +msgid "bogus format in %s"

1475 +msgstr "felaktigt format i %s"

1476 +

1477 +#: config.c:793

1478 #, c-format

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

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

1481

1318 -#: config.c:792

1482 +#: config.c:797

1483 #, c-format

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

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

1486

1323 -#: config.c:796

1487 +#: config.c:801

1488 #, c-format

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

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

1491

1328 -#: config.c:800

1492 +#: config.c:805

1493 #, c-format

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

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

1496

1333 -#: config.c:804

1497 +#: config.c:809

1498 #, c-format

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

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

1501

1338 -#: config.c:808

1502 +#: config.c:813

1503 #, c-format

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

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

1506

1343 -#: config.c:936

1507 +#: config.c:952

1508 msgid "out of range"

1509 msgstr "utanför intervallet"

1510

1347 -#: config.c:936

1511 +#: config.c:952

1512 msgid "invalid unit"

1513 msgstr "ogiltig enhet"

1514

1351 -#: config.c:942

1515 +#: config.c:958

1516 #, c-format

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

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

1519

1356 -#: config.c:947

1520 +#: config.c:963

1521 #, c-format

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

1523 msgstr ""

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

1525

1362 -#: config.c:950

1526 +#: config.c:966

1527 #, c-format

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

1529 msgstr ""

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

1531

1368 -#: config.c:953

1532 +#: config.c:969

1533 #, c-format

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

1535 msgstr ""

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

1537

1374 -#: config.c:956

1538 +#: config.c:972

1539 #, c-format

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

1541 msgstr ""

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

1543 "en %s: %s"

1544

1381 -#: config.c:959

1545 +#: config.c:975

1546 #, c-format

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

1548 msgstr ""

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

1550 "%s: %s"

1551

1388 -#: config.c:962

1552 +#: config.c:978

1553 #, c-format

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

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

1556

1393 -#: config.c:1057

1557 +#: config.c:1073

1558 #, c-format

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

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

1561

1398 -#: config.c:1066

1562 +#: config.c:1082

1563 #, c-format

1564 msgid "'%s' for '%s' is not a valid timestamp"

1565 msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"

1566

1403 -#: config.c:1171 config.c:1182

1567 +#: config.c:1173

1568 +#, c-format

1569 +msgid "abbrev length out of range: %d"

1570 +msgstr "förkortningslängd utanför intervallet: %d"

1571 +

1572 +#: config.c:1187 config.c:1198

1573 #, c-format

1574 msgid "bad zlib compression level %d"

1575 msgstr "felaktigt zlib-komprimeringsgrad %d"

1576

1408 -#: config.c:1307

1577 +#: config.c:1290

1578 +msgid "core.commentChar should only be one character"

1579 +msgstr "core.commentChar kan bara vara ett tecken"

1580 +

1581 +#: config.c:1323

1582 #, c-format

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

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

1585

1413 -#: config.c:1473

1586 +#: config.c:1403

1587 +#, c-format

1588 +msgid "malformed value for %s"

1589 +msgstr "felformat värde för %s"

1590 +

1591 +#: config.c:1429

1592 +#, c-format

1593 +msgid "malformed value for %s: %s"

1594 +msgstr "felformat värde för %s: %s"

1595 +

1596 +#: config.c:1430

1597 +msgid "must be one of nothing, matching, simple, upstream or current"

1598 +msgstr "måste vara en av nothing, matching, simple, upstream eller current"

1599 +

1600 +#: config.c:1489 builtin/pack-objects.c:3279

1601 #, c-format

1602 msgid "bad pack compression level %d"

1603 msgstr "felaktig paketkomprimeringsgrad %d"

1604

1418 -#: config.c:1681

1605 +#: config.c:1610

1606 +#, c-format

1607 +msgid "unable to load config blob object '%s'"

1608 +msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""

1609 +

1610 +#: config.c:1613

1611 +#, c-format

1612 +msgid "reference '%s' does not point to a blob"

1613 +msgstr "referensen \"%s\" pekar inte på en blob"

1614 +

1615 +#: config.c:1630

1616 +#, c-format

1617 +msgid "unable to resolve config blob '%s'"

1618 +msgstr "kan inte slå upp konfigurerings-bloben \"%s\""

1619 +

1620 +#: config.c:1660

1621 +#, c-format

1622 +msgid "failed to parse %s"

1623 +msgstr "kunde inte tolka %s"

1624 +

1625 +#: config.c:1700

1626 msgid "unable to parse command-line config"

1627 msgstr "kan inte tolka kommandoradskonfiguration"

1628

1422 -#: config.c:2013

1629 +#: config.c:2032

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

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

1632

1426 -#: config.c:2200

1633 +#: config.c:2202

1634 #, c-format

1635 msgid "Invalid %s: '%s'"

1636 msgstr "Felaktigt %s: \"%s\""

1637

1431 -#: config.c:2243

1638 +#: config.c:2245

1639 #, c-format

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

1641 msgstr ""

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

1643

1437 -#: config.c:2269

1644 +#: config.c:2271

1645 #, c-format

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

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

1648

1442 -#: config.c:2294

1649 +#: config.c:2296

1650 #, c-format

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

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

1653

1447 -#: config.c:2296

1654 +#: config.c:2298

1655 #, c-format

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

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

1658

1452 -#: config.c:2402

1659 +#: config.c:2379

1660 +#, c-format

1661 +msgid "invalid section name '%s'"

1662 +msgstr "felaktigt sektionsnamn \"%s\""

1663 +

1664 +#: config.c:2411

1665 #, c-format

1666 msgid "%s has multiple values"

1667 msgstr "%s har flera värden"

1668

1457 -#: config.c:2766 config.c:3019

1669 +#: config.c:2440

1670 +#, c-format

1671 +msgid "failed to write new configuration file %s"

1672 +msgstr "kan inte skriva nya konfigurationsfilen \"%s\""

1673 +

1674 +#: config.c:2691 config.c:3015

1675 +#, c-format

1676 +msgid "could not lock config file %s"

1677 +msgstr "kunde inte låsa konfigurationsfilen %s"

1678 +

1679 +#: config.c:2702

1680 +#, c-format

1681 +msgid "opening %s"

1682 +msgstr "öppnar %s"

1683 +

1684 +#: config.c:2737 builtin/config.c:324

1685 +#, c-format

1686 +msgid "invalid pattern: %s"

1687 +msgstr "ogiltigt mönster: %s"

1688 +

1689 +#: config.c:2762

1690 +#, c-format

1691 +msgid "invalid config file %s"

1692 +msgstr "ogiltig konfigurationsfil: \"%s\""

1693 +

1694 +#: config.c:2775 config.c:3028

1695 #, c-format

1696 msgid "fstat on %s failed"

1697 msgstr "fstat misslyckades på %s"

1698

1462 -#: config.c:2905

1699 +#: config.c:2786

1700 +#, c-format

1701 +msgid "unable to mmap '%s'"

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

1703 +

1704 +#: config.c:2795 config.c:3033

1705 +#, c-format

1706 +msgid "chmod on %s failed"

1707 +msgstr "chmod misslyckades på %s"

1708 +

1709 +#: config.c:2880 config.c:3130

1710 +#, c-format

1711 +msgid "could not write config file %s"

1712 +msgstr "kunde inte skriva konfigurationsfilen %s"

1713 +

1714 +#: config.c:2914

1715 #, c-format

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

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

1718

1467 -#: config.c:2907 builtin/remote.c:779

1719 +#: config.c:2916 builtin/remote.c:781

1720 #, c-format

1721 msgid "could not unset '%s'"

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

1723

1724 +#: config.c:3006

1725 +#, c-format

1726 +msgid "invalid section name: %s"

1727 +msgstr "felaktigt namn på stycke: %s"

1728 +

1729 +#: config.c:3173

1730 +#, c-format

1731 +msgid "missing value for '%s'"

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

1733 +

1734 #: connect.c:61

1473 -msgid "The remote end hung up upon initial contact"

1474 -msgstr "Fjärren lade på vid inledande kontakt"

1735 +msgid "the remote end hung up upon initial contact"

1736 +msgstr "fjärren lade på vid inledande kontakt"

1737

1738 #: connect.c:63

1739 msgid ""

@@ -1485,58 +1747,211 @@ msgstr ""

1747 "Se till att du har korrekt åtkomstbehörighet\n"

1748 "och att arkivet existerar."

1749

1750 +#: connect.c:81

1751 +#, c-format

1752 +msgid "server doesn't support '%s'"

1753 +msgstr "Servern stöder inte \"%s\""

1754 +

1755 +#: connect.c:103

1756 +#, c-format

1757 +msgid "server doesn't support feature '%s'"

1758 +msgstr "servern stöder inte funktionen \"%s\""

1759 +

1760 +#: connect.c:114

1761 +msgid "expected flush after capabilities"

1762 +msgstr "förväntade \"flush\" efter förmågor"

1763 +

1764 +#: connect.c:233

1765 +#, c-format

1766 +msgid "ignoring capabilities after first line '%s'"

1767 +msgstr "ignorerar förmågor efter första raden \"%s\""

1768 +

1769 +#: connect.c:252

1770 +msgid "protocol error: unexpected capabilities^{}"

1771 +msgstr "protokollfel: förväntade inte capabilities^{}"

1772 +

1773 +#: connect.c:273

1774 +#, c-format

1775 +msgid "protocol error: expected shallow sha-1, got '%s'"

1776 +msgstr "protokollfel: förväntade \"shallow sha-1\" fick \"%s\""

1777 +

1778 +#: connect.c:275

1779 +msgid "repository on the other end cannot be shallow"

1780 +msgstr "arkivet på andra sidan kan inte vara grunt"

1781 +

1782 +#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63

1783 +#, c-format

1784 +msgid "remote error: %s"

1785 +msgstr "fjärrfel: %s"

1786 +

1787 +#: connect.c:316

1788 +msgid "invalid packet"

1789 +msgstr "ogiltigt paket"

1790 +

1791 +#: connect.c:336

1792 +#, c-format

1793 +msgid "protocol error: unexpected '%s'"

1794 +msgstr "protokollfel: förväntade inte \"%s\""

1795 +

1796 +#: connect.c:444

1797 +#, c-format

1798 +msgid "invalid ls-refs response: %s"

1799 +msgstr "ogiltigt svar på ls-refs: %s"

1800 +

1801 +#: connect.c:448

1802 +msgid "expected flush after ref listing"

1803 +msgstr "oväntad \"flush\" efter ref-listan"

1804 +

1805 +#: connect.c:547

1806 +#, c-format

1807 +msgid "protocol '%s' is not supported"

1808 +msgstr "protokollet \"%s\" stöds inte"

1809 +

1810 +#: connect.c:598

1811 +msgid "unable to set SO_KEEPALIVE on socket"

1812 +msgstr "kunde inte sätta SO_KEEPALIVE på uttaget"

1813 +

1814 +#: connect.c:638 connect.c:701

1815 +#, c-format

1816 +msgid "Looking up %s ... "

1817 +msgstr "Slår upp %s..."

1818 +

1819 +#: connect.c:642

1820 +#, c-format

1821 +msgid "unable to look up %s (port %s) (%s)"

1822 +msgstr "kan inte slå upp %s (port %s) (%s)"

1823 +

1824 +#. TRANSLATORS: this is the end of "Looking up %s ... "

1825 +#: connect.c:646 connect.c:717

1826 +#, c-format

1827 +msgid ""

1828 +"done.\n"

1829 +"Connecting to %s (port %s) ... "

1830 +msgstr ""

1831 +"klart.\n"

1832 +"Ansluter till %s (port %s)..."

1833 +

1834 +#: connect.c:668 connect.c:745

1835 +#, c-format

1836 +msgid ""

1837 +"unable to connect to %s:\n"

1838 +"%s"

1839 +msgstr ""

1840 +"kunde inte ansluta till %s:\n"

1841 +"%s"

1842 +

1843 +#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

1844 +#: connect.c:674 connect.c:751

1845 +msgid "done."

1846 +msgstr "klart."

1847 +

1848 +#: connect.c:705

1849 +#, c-format

1850 +msgid "unable to look up %s (%s)"

1851 +msgstr "kunde inte slå upp %s (%s)"

1852 +

1853 +#: connect.c:711

1854 +#, c-format

1855 +msgid "unknown port %s"

1856 +msgstr "okänd port %s"

1857 +

1858 +#: connect.c:848 connect.c:1174

1859 +#, c-format

1860 +msgid "strange hostname '%s' blocked"

1861 +msgstr "konstigt värdnamn \"%s\" blockerat"

1862 +

1863 +#: connect.c:850

1864 +#, c-format

1865 +msgid "strange port '%s' blocked"

1866 +msgstr "konstig port \"%s\" blockerad"

1867 +

1868 +#: connect.c:860

1869 +#, c-format

1870 +msgid "cannot start proxy %s"

1871 +msgstr "kan inte starta mellanserver (proxy) %s"

1872 +

1873 +#: connect.c:927

1874 +msgid "no path specified; see 'git help pull' for valid url syntax"

1875 +msgstr "ingen sökväg angavs; se \"git help pull\" för giltig URL-syntax"

1876 +

1877 +#: connect.c:1122

1878 +msgid "ssh variant 'simple' does not support -4"

1879 +msgstr "ssh-varianten \"simple\" stöder inte -4"

1880 +

1881 +#: connect.c:1134

1882 +msgid "ssh variant 'simple' does not support -6"

1883 +msgstr "ssh-varianten \"simple\" stöder inte -6"

1884 +

1885 +#: connect.c:1151

1886 +msgid "ssh variant 'simple' does not support setting port"

1887 +msgstr "ssh-varianten \"simple\" stöder inte val av port"

1888 +

1889 +#: connect.c:1262

1890 +#, c-format

1891 +msgid "strange pathname '%s' blocked"

1892 +msgstr "konstigt sökvägsnamn \"%s\" blockerat"

1893 +

1894 +#: connect.c:1307

1895 +msgid "unable to fork"

1896 +msgstr "kunde inte grena (fork)"

1897 +

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

1899 # objects in the database.

1490 -#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145

1900 +#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146

1901 msgid "Checking connectivity"

1902 msgstr "Kontrollerar konnektivitet"

1903

1494 -#: connected.c:78

1904 +#: connected.c:80

1905 msgid "Could not run 'git rev-list'"

1906 msgstr "Kunde inte köra \"git rev-list\""

1907

1498 -#: connected.c:98

1908 +#: connected.c:100

1909 msgid "failed write to rev-list"

1910 msgstr "kunde inte skriva till rev-list"

1911

1502 -#: connected.c:105

1912 +#: connected.c:107

1913 msgid "failed to close rev-list's stdin"

1914 msgstr "kunde inte stänga rev-list:s standard in"

1915

1506 -#: convert.c:206

1916 +#: convert.c:194

1917 #, c-format

1508 -msgid "CRLF would be replaced by LF in %s."

1509 -msgstr "CRLF skulle ersättas av LF i %s."

1918 +msgid "illegal crlf_action %d"

1919 +msgstr "felaktig crlf_action %d"

1920

1511 -#: convert.c:208

1921 +#: convert.c:207

1922 +#, c-format

1923 +msgid "CRLF would be replaced by LF in %s"

1924 +msgstr "CRLF skulle ersättas av LF i %s"

1925 +

1926 +#: convert.c:209

1927 #, c-format

1928 msgid ""

1929 "CRLF will be replaced by LF in %s.\n"

1515 -"The file will have its original line endings in your working directory."

1930 +"The file will have its original line endings in your working directory"

1931 msgstr ""

1932 "CRLF kommer att ersättas av LF i %s.\n"

1518 -"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog."

1933 +"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog"

1934

1520 -#: convert.c:216

1935 +#: convert.c:217

1936 #, c-format

1937 msgid "LF would be replaced by CRLF in %s"

1938 msgstr "LF skulle ersättas av CRLF i %s"

1939

1525 -#: convert.c:218

1940 +#: convert.c:219

1941 #, c-format

1942 msgid ""

1943 "LF will be replaced by CRLF in %s.\n"

1529 -"The file will have its original line endings in your working directory."

1944 +"The file will have its original line endings in your working directory"

1945 msgstr ""

1946 "LF kommer att ersättas av CRLF i %s.\n"

1532 -"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog."

1947 +"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog"

1948

1534 -#: convert.c:279

1949 +#: convert.c:280

1950 #, c-format

1951 msgid "BOM is prohibited in '%s' if encoded as %s"

1952 msgstr "BOM är förbjudet i \"%s\" om kodat som %s"

1953

1539 -#: convert.c:286

1954 +#: convert.c:287

1955 #, c-format

1956 msgid ""

1957 "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"

@@ -1545,12 +1960,12 @@ msgstr ""

1960 "Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%s som "

1961 "teckenkodning i arbetskatalogen."

1962

1548 -#: convert.c:304

1963 +#: convert.c:305

1964 #, c-format

1965 msgid "BOM is required in '%s' if encoded as %s"

1966 msgstr "BOM krävs om \"%s\" kodas som %s"

1967

1553 -#: convert.c:306

1968 +#: convert.c:307

1969 #, c-format

1970 msgid ""

1971 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"

@@ -1559,21 +1974,73 @@ msgstr ""

1974 "Filen \"%s\" saknar byte order mark (BOM). Använd UTF-%sBE eller UTF-%sLE "

1975 "(beroende på byteordning) som teckenkodning i arbetskatalogen."

1976

1562 -#: convert.c:424

1977 +#: convert.c:425 convert.c:496

1978 #, c-format

1979 msgid "failed to encode '%s' from %s to %s"

1980 msgstr "misslyckades omkoda \"%s\" från %s till %s"

1981

1567 -#: convert.c:467

1982 +#: convert.c:468

1983 #, c-format

1984 msgid "encoding '%s' from %s to %s and back is not the same"

1985 msgstr ""

1986 "omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat"

1987

1573 -#: convert.c:1225

1988 +#: convert.c:674

1989 +#, c-format

1990 +msgid "cannot fork to run external filter '%s'"

1991 +msgstr "kan inte grena (fork) för att köra externt filter \"%s\""

1992 +

1993 +#: convert.c:694

1994 +#, c-format

1995 +msgid "cannot feed the input to external filter '%s'"

1996 +msgstr "kunde inte skicka indata till externt filter \"%s\""

1997 +

1998 +#: convert.c:701

1999 +#, c-format

2000 +msgid "external filter '%s' failed %d"

2001 +msgstr "externt filter \"%s\" misslyckades %d"

2002 +

2003 +#: convert.c:736 convert.c:739

2004 +#, c-format

2005 +msgid "read from external filter '%s' failed"

2006 +msgstr "läsning från externt filter \"%s\" misslyckades"

2007 +

2008 +#: convert.c:742 convert.c:796

2009 +#, c-format

2010 +msgid "external filter '%s' failed"

2011 +msgstr "externt filter \"%s\" misslyckades"

2012 +

2013 +#: convert.c:844

2014 +msgid "unexpected filter type"

2015 +msgstr "oväntad filtertyp"

2016 +

2017 +#: convert.c:855

2018 +msgid "path name too long for external filter"

2019 +msgstr "sökvägen för lång för externt filter"

2020 +

2021 +#: convert.c:929

2022 +#, c-format

2023 +msgid ""

2024 +"external filter '%s' is not available anymore although not all paths have "

2025 +"been filtered"

2026 +msgstr ""

2027 +"externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar "

2028 +"inte har filtrerats"

2029 +

2030 +#: convert.c:1228

2031 msgid "true/false are no valid working-tree-encodings"

2032 msgstr "true/false är inte giltig teckenkodning för arbetskatalogen"

2033

2034 +#: convert.c:1402 convert.c:1436

2035 +#, c-format

2036 +msgid "%s: clean filter '%s' failed"

2037 +msgstr "%s: \"clean\"-filtret \"%s\" misslyckades"

2038 +

2039 +#: convert.c:1480

2040 +#, c-format

2041 +msgid "%s: smudge filter %s failed"

2042 +msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades"

2043 +

2044 #: date.c:116

2045 msgid "in the future"

2046 msgstr "i framtiden"

@@ -1647,39 +2114,52 @@ msgstr[1] "%<PRIuMAX> år sedan"

2114 msgid "failed to read orderfile '%s'"

2115 msgstr "kunde inte läsa orderfilen \"%s\""

2116

1650 -#: diffcore-rename.c:535

2117 +#: diffcore-rename.c:536

2118 msgid "Performing inexact rename detection"

2119 msgstr "Utför onöjaktig namnbytesdetektering"

2120

1654 -#: diff.c:74

2121 +#: diff.c:108

2122 #, c-format

2123 msgid "option '%s' requires a value"

2124 msgstr "flaggan \"%s\" behöver ett värde"

2125

1659 -#: diff.c:152

2126 +#: diff.c:158

2127 #, c-format

2128 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

2129 msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"

2130

1664 -#: diff.c:157

2131 +#: diff.c:163

2132 #, c-format

2133 msgid " Unknown dirstat parameter '%s'\n"

2134 msgstr " Okänd dirstat-parameter \"%s\"\n"

2135

1669 -#: diff.c:281

2136 +#: diff.c:291

2137 msgid ""

1671 -"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "

1672 -"'plain'"

2138 +"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "

2139 +"'dimmed-zebra', 'plain'"

2140 msgstr ""

2141 "färginställningen för flyttade block måste vara en av \"no\", \"default\", "

1675 -"\"zebra\", \"dimmed_zebra\", \"plain\""

2142 +"\"blocks\", \"zebra\", \"dimmed_zebra\", \"plain\""

2143

1677 -#: diff.c:341

2144 +#: diff.c:316

2145 +#, c-format

2146 +msgid "ignoring unknown color-moved-ws mode '%s'"

2147 +msgstr "ignorerar okänt läge för color-mode-ws \"%s\""

2148 +

2149 +#: diff.c:323

2150 +msgid ""

2151 +"color-moved-ws: allow-indentation-change cannot be combined with other white "

2152 +"space modes"

2153 +msgstr ""

2154 +"color-moved-ws: allow-indentation-change kan inte kombineras med andra "

2155 +"blankstegslägen"

2156 +

2157 +#: diff.c:394

2158 #, c-format

2159 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

2160 msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""

2161

1682 -#: diff.c:401

2162 +#: diff.c:454

2163 #, c-format

2164 msgid ""

2165 "Found errors in 'diff.dirstat' config variable:\n"

@@ -1688,24 +2168,24 @@ msgstr ""

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

2169 "%s"

2170

1691 -#: diff.c:3823

2171 +#: diff.c:4096

2172 #, c-format

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

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

2175

1696 -#: diff.c:4153

2176 +#: diff.c:4427

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

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

2179

1700 -#: diff.c:4156

2180 +#: diff.c:4430

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

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

2183

1704 -#: diff.c:4244

2184 +#: diff.c:4508

2185 msgid "--follow requires exactly one pathspec"

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

2187

1708 -#: diff.c:4410

2188 +#: diff.c:4674

2189 #, c-format

2190 msgid ""

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

@@ -1714,46 +2194,61 @@ msgstr ""

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

2195 "%s"

2196

1717 -#: diff.c:4424

2197 +#: diff.c:4688

2198 #, c-format

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

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

2201

1722 -#: diff.c:5500

2202 +#: diff.c:5766

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

2204 msgstr ""

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

2206

1727 -#: diff.c:5503

2207 +#: diff.c:5769

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

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

2210

1731 -#: diff.c:5506

2211 +#: diff.c:5772

2212 #, c-format

2213 msgid ""

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

2215 msgstr ""

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

2217

1738 -#: dir.c:1867

2218 +#: dir.c:569

2219 +#, c-format

2220 +msgid "pathspec '%s' did not match any file(s) known to git"

2221 +msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer"

2222 +

2223 +#: dir.c:958

2224 +#, c-format

2225 +msgid "cannot use %s as an exclude file"

2226 +msgstr "kan inte använda %s som exkluderingsfil"

2227 +

2228 +#: dir.c:1873

2229 #, c-format

2230 msgid "could not open directory '%s'"

2231 msgstr "kunde inte öppna katalogen \"%s\""

2232

1743 -#: dir.c:2109

2233 +#: dir.c:2115

2234 msgid "failed to get kernel name and information"

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

2236

1747 -#: dir.c:2233

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

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

2237 +#: dir.c:2239

2238 +msgid "untracked cache is disabled on this system or location"

2239 +msgstr "ospårad cache är inaktiverad på systemet eller platsen"

2240

1751 -#: dir.c:3075 dir.c:3080

2241 +#: dir.c:3037

2242 +#, c-format

2243 +msgid "index file corrupt in repo %s"

2244 +msgstr "indexfilen trasig i arkivet %s"

2245 +

2246 +#: dir.c:3082 dir.c:3087

2247 #, c-format

2248 msgid "could not create directories for %s"

2249 msgstr "kunde inte skapa kataloger för %s"

2250

1756 -#: dir.c:3109

2251 +#: dir.c:3116

2252 #, c-format

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

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

@@ -1763,218 +2258,272 @@ msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""

2258 msgid "hint: Waiting for your editor to close the file...%c"

2259 msgstr "tips: Väntar på att textredigeringsprogrammet skall stänga filen...%c"

2260

1766 -#: entry.c:177

2261 +#: entry.c:178

2262 msgid "Filtering content"

2263 msgstr "Filtrerar innehåll"

2264

1770 -#: entry.c:435

2265 +#: entry.c:437

2266 #, c-format

2267 msgid "could not stat file '%s'"

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

2269

2270 +#: environment.c:150

2271 +#, c-format

2272 +msgid "bad git namespace path \"%s\""

2273 +msgstr "felaktig git-namnrymdssökväg \"%s\""

2274 +

2275 +#: environment.c:332

2276 +#, c-format

2277 +msgid "could not set GIT_DIR to '%s'"

2278 +msgstr "kunde inte ställa in GIT_DIR till \"%s\""

2279 +

2280 +#: exec-cmd.c:361

2281 +#, c-format

2282 +msgid "too many args to run %s"

2283 +msgstr "för många flaggor för att köra %s"

2284 +

2285 #: fetch-object.c:17

2286 msgid "Remote with no URL"

2287 msgstr "Fjärr utan URL"

2288

1779 -#: fetch-pack.c:254

2289 +#: fetch-pack.c:152

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

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

2292

1783 -#: fetch-pack.c:266

2293 +#: fetch-pack.c:164

2294 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

2295 msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket"

2296

1787 -#: fetch-pack.c:285 builtin/archive.c:63

1788 -#, c-format

1789 -msgid "remote error: %s"

1790 -msgstr "fjärrfel: %s"

1791 -

1792 -#: fetch-pack.c:286

2297 +#: fetch-pack.c:184

2298 #, c-format

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

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

2301

1797 -#: fetch-pack.c:338

2302 +#: fetch-pack.c:254

2303 msgid "--stateless-rpc requires multi_ack_detailed"

2304 msgstr "--stateless-rpc kräver ”multi_ack_detailed”"

2305

1801 -#: fetch-pack.c:429 fetch-pack.c:1310

2306 +#: fetch-pack.c:342 fetch-pack.c:1257

2307 #, c-format

2308 msgid "invalid shallow line: %s"

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

2310

1806 -#: fetch-pack.c:435 fetch-pack.c:1316

2311 +#: fetch-pack.c:348 fetch-pack.c:1263

2312 #, c-format

2313 msgid "invalid unshallow line: %s"

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

2315

1811 -#: fetch-pack.c:437 fetch-pack.c:1318

2316 +#: fetch-pack.c:350 fetch-pack.c:1265

2317 #, c-format

2318 msgid "object not found: %s"

2319 msgstr "objektet hittades inte: %s"

2320

1816 -#: fetch-pack.c:440 fetch-pack.c:1321

2321 +#: fetch-pack.c:353 fetch-pack.c:1268

2322 #, c-format

2323 msgid "error in object: %s"

2324 msgstr "fel i objekt: %s"

2325

1821 -#: fetch-pack.c:442 fetch-pack.c:1323

2326 +#: fetch-pack.c:355 fetch-pack.c:1270

2327 #, c-format

2328 msgid "no shallow found: %s"

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

2330

1826 -#: fetch-pack.c:445 fetch-pack.c:1326

2331 +#: fetch-pack.c:358 fetch-pack.c:1273

2332 #, c-format

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

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

2335

1831 -#: fetch-pack.c:486

2336 +#: fetch-pack.c:399

2337 #, c-format

2338 msgid "got %s %d %s"

2339 msgstr "fick %s %d %s"

2340

1836 -#: fetch-pack.c:500

2341 +#: fetch-pack.c:416

2342 #, c-format

2343 msgid "invalid commit %s"

2344 msgstr "ogiltig incheckning %s"

2345

1841 -#: fetch-pack.c:533

2346 +#: fetch-pack.c:447

2347 msgid "giving up"

2348 msgstr "ger upp"

2349

1845 -#: fetch-pack.c:543 progress.c:229

2350 +#: fetch-pack.c:459 progress.c:229

2351 msgid "done"

2352 msgstr "klart"

2353

1849 -#: fetch-pack.c:555

2354 +#: fetch-pack.c:471

2355 #, c-format

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

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

2358

1854 -#: fetch-pack.c:601

2359 +#: fetch-pack.c:517

2360 #, c-format

2361 msgid "Marking %s as complete"

2362 msgstr "Markerar %s som komplett"

2363

1859 -#: fetch-pack.c:828

2364 +#: fetch-pack.c:764

2365 #, c-format

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

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

2368

1864 -#: fetch-pack.c:869

2369 +#: fetch-pack.c:803

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

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

2372

1868 -#: fetch-pack.c:877

2373 +#: fetch-pack.c:811

2374 msgid "protocol error: bad pack header"

2375 msgstr "protokollfel: felaktigt packhuvud"

2376

1872 -#: fetch-pack.c:944

2377 +#: fetch-pack.c:879

2378 #, c-format

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

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

2381

1877 -#: fetch-pack.c:960

2382 +#: fetch-pack.c:895

2383 #, c-format

2384 msgid "%s failed"

2385 msgstr "%s misslyckades"

2386

1882 -#: fetch-pack.c:962

2387 +#: fetch-pack.c:897

2388 msgid "error in sideband demultiplexer"

2389 msgstr "fel i sidbands-avmultiplexare"

2390

1886 -#: fetch-pack.c:989

2391 +#: fetch-pack.c:926

2392 msgid "Server does not support shallow clients"

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

2394

1890 -#: fetch-pack.c:993

2395 +#: fetch-pack.c:930

2396 msgid "Server supports multi_ack_detailed"

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

2398

1894 -#: fetch-pack.c:996

2399 +#: fetch-pack.c:933

2400 msgid "Server supports no-done"

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

2402

1898 -#: fetch-pack.c:1002

2403 +#: fetch-pack.c:939

2404 msgid "Server supports multi_ack"

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

2406

1902 -#: fetch-pack.c:1006

2407 +#: fetch-pack.c:943

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

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

2410

1906 -#: fetch-pack.c:1010

2411 +#: fetch-pack.c:947

2412 msgid "Server supports side-band"

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

2414

1910 -#: fetch-pack.c:1014

2415 +#: fetch-pack.c:951

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

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

2418

1914 -#: fetch-pack.c:1018

2419 +#: fetch-pack.c:955

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

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

2422

1918 -#: fetch-pack.c:1028

2423 +#: fetch-pack.c:965

2424 msgid "Server supports ofs-delta"

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

2426

1922 -#: fetch-pack.c:1034 fetch-pack.c:1204

2427 +#: fetch-pack.c:971 fetch-pack.c:1150

2428 msgid "Server supports filter"

2429 msgstr "Servern stöder filter"

2430

1926 -#: fetch-pack.c:1042

2431 +#: fetch-pack.c:979

2432 #, c-format

2433 msgid "Server version is %.*s"

2434 msgstr "Serverversionen är %.*s"

2435

1931 -#: fetch-pack.c:1048

2436 +#: fetch-pack.c:985

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

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

2439

1935 -#: fetch-pack.c:1052

2440 +#: fetch-pack.c:989

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

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

2443

1939 -#: fetch-pack.c:1054

2444 +#: fetch-pack.c:991

2445 msgid "Server does not support --deepen"

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

2447

1943 -#: fetch-pack.c:1065

2448 +#: fetch-pack.c:1004

2449 msgid "no common commits"

2450 msgstr "inga gemensamma incheckningar"

2451

1947 -#: fetch-pack.c:1077 fetch-pack.c:1414

2452 +#: fetch-pack.c:1016 fetch-pack.c:1393

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

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

2455

1951 -#: fetch-pack.c:1199

2456 +#: fetch-pack.c:1145

2457 msgid "Server does not support shallow requests"

2458 msgstr "Servern stöder inte grunda förfrågningar"

2459

1955 -#: fetch-pack.c:1584

2460 +#: fetch-pack.c:1191

2461 +#, c-format

2462 +msgid "error reading section header '%s'"

2463 +msgstr "fel vid läsning av styckehuvudet \"%s\""

2464 +

2465 +#: fetch-pack.c:1197

2466 +#, c-format

2467 +msgid "expected '%s', received '%s'"

2468 +msgstr "förväntade \"%s\", tog emot \"%s\""

2469 +

2470 +#: fetch-pack.c:1236

2471 +#, c-format

2472 +msgid "unexpected acknowledgment line: '%s'"

2473 +msgstr "förväntade bekräftelserad: \"%s\""

2474 +

2475 +#: fetch-pack.c:1241

2476 +#, c-format

2477 +msgid "error processing acks: %d"

2478 +msgstr "fel vid hantering av bekräftelser: %d"

2479 +

2480 +#: fetch-pack.c:1278

2481 +#, c-format

2482 +msgid "error processing shallow info: %d"

2483 +msgstr "fel vid hantering av grund (\"shallow\") info: %d"

2484 +

2485 +#: fetch-pack.c:1294

2486 +#, c-format

2487 +msgid "expected wanted-ref, got '%s'"

2488 +msgstr "förväntade wanted-ref, fick %s"

2489 +

2490 +#: fetch-pack.c:1304

2491 +#, c-format

2492 +msgid "unexpected wanted-ref: '%s'"

2493 +msgstr "oväntad wanted-ref: \"%s\""

2494 +

2495 +#: fetch-pack.c:1308

2496 +#, c-format

2497 +msgid "error processing wanted refs: %d"

2498 +msgstr "fel vid hantering av önskade referenser: %d"

2499 +

2500 +#: fetch-pack.c:1603

2501 msgid "no matching remote head"

2502 msgstr "inget motsvarande fjärrhuvud"

2503

1959 -#: fetch-pack.c:1610

2504 +#: fetch-pack.c:1621 builtin/clone.c:664

2505 +msgid "remote did not send all necessary objects"

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

2507 +

2508 +#: fetch-pack.c:1647

2509 #, c-format

2510 msgid "no such remote ref %s"

2511 msgstr "ingen sådan fjärreferens: %s"

2512

1964 -#: fetch-pack.c:1613

2513 +#: fetch-pack.c:1650

2514 #, c-format

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

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

2517

1969 -#: gpg-interface.c:185

2518 +#: gpg-interface.c:253

2519 msgid "gpg failed to sign the data"

2520 msgstr "gpg misslyckades signera data"

2521

1973 -#: gpg-interface.c:210

2522 +#: gpg-interface.c:279

2523 msgid "could not create temporary file"

2524 msgstr "kunde inte skapa temporära fil"

2525

1977 -#: gpg-interface.c:213

2526 +#: gpg-interface.c:282

2527 #, c-format

2528 msgid "failed writing detached signature to '%s'"

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

@@ -1984,18 +2533,18 @@ msgstr "misslyckades skriva fristående signatur till \"%s\""

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

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

2535

1987 -#: grep.c:2020

2536 +#: grep.c:2115

2537 #, c-format

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

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

2540

1992 -#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81

2541 +#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

2542 #: builtin/rm.c:134

2543 #, c-format

2544 msgid "failed to stat '%s'"

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

2546

1998 -#: grep.c:2048

2547 +#: grep.c:2143

2548 #, c-format

2549 msgid "'%s': short read"

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

@@ -2074,7 +2623,7 @@ msgstr "okänd kommandolisttyp \"%s\""

2623 msgid "The common Git guides are:"

2624 msgstr "De vanliga Git-vägledningarna är:"

2625

2077 -#: help.c:467

2626 +#: help.c:552

2627 #, c-format

2628 msgid ""

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

@@ -2083,32 +2632,32 @@ msgstr ""

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

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

2634

2086 -#: help.c:526

2635 +#: help.c:611

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

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

2638

2090 -#: help.c:548

2639 +#: help.c:633

2640 #, c-format

2641 msgid "WARNING: You called a Git command named '%s', which does not exist."

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

2643

2095 -#: help.c:553

2644 +#: help.c:638

2645 #, c-format

2646 msgid "Continuing under the assumption that you meant '%s'."

2647 msgstr "Fortsätter under förutsättningen att du menade ”%s”."

2648

2100 -#: help.c:558

2649 +#: help.c:643

2650 #, c-format

2651 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

2652 msgstr ""

2653 "Fortsätter om %0.1f sekunder, under förutsättningen att du menade ”%s”."

2654

2106 -#: help.c:566

2655 +#: help.c:651

2656 #, c-format

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

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

2659

2111 -#: help.c:570

2660 +#: help.c:655

2661 msgid ""

2662 "\n"

2663 "The most similar command is"

@@ -2122,16 +2671,16 @@ msgstr[1] ""

2671 "\n"

2672 "Mest lika kommandon är"

2673

2125 -#: help.c:585

2674 +#: help.c:670

2675 msgid "git version [<options>]"

2676 msgstr "git version [<flaggor>]"

2677

2129 -#: help.c:652

2678 +#: help.c:738

2679 #, c-format

2680 msgid "%s: %s - %s"

2681 msgstr "%s: %s - %s"

2682

2134 -#: help.c:656

2683 +#: help.c:742

2684 msgid ""

2685 "\n"

2686 "Did you mean this?"

@@ -2199,7 +2748,7 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet"

2748 msgid "name consists only of disallowed characters: %s"

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

2750

2202 -#: ident.c:416 builtin/commit.c:587

2751 +#: ident.c:416 builtin/commit.c:600

2752 #, c-format

2753 msgid "invalid date format: %s"

2754 msgstr "felaktigt datumformat: %s"

@@ -2237,124 +2786,124 @@ msgstr ""

2786 msgid "Unable to create '%s.lock': %s"

2787 msgstr "Kunde inte skapa \"%s.lock\": %s"

2788

2240 -#: merge.c:71

2789 +#: merge.c:40

2790 msgid "failed to read the cache"

2791 msgstr "misslyckades läsa cachen"

2792

2244 -#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

2245 -#: builtin/checkout.c:606 builtin/clone.c:761

2793 +#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380

2794 +#: builtin/checkout.c:608 builtin/clone.c:763

2795 msgid "unable to write new index file"

2796 msgstr "kunde inte skriva ny indexfil"

2797

2249 -#: merge-recursive.c:298

2798 +#: merge-recursive.c:303

2799 msgid "(bad commit)\n"

2800 msgstr "(felaktig incheckning)\n"

2801

2253 -#: merge-recursive.c:320

2802 +#: merge-recursive.c:325

2803 #, c-format

2804 msgid "add_cacheinfo failed for path '%s'; merge aborting."

2805 msgstr ""

2806 "add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."

2807

2259 -#: merge-recursive.c:328

2808 +#: merge-recursive.c:333

2809 #, c-format

2810 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

2811 msgstr ""

2812 "add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar "

2813 "sammanslagningen."

2814

2266 -#: merge-recursive.c:410

2815 +#: merge-recursive.c:415

2816 msgid "error building trees"

2817 msgstr "fel vid byggande av träd"

2818

2270 -#: merge-recursive.c:881

2819 +#: merge-recursive.c:886

2820 #, c-format

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

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

2823

2275 -#: merge-recursive.c:892

2824 +#: merge-recursive.c:897

2825 #, c-format

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

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

2828

2280 -#: merge-recursive.c:906 merge-recursive.c:925

2829 +#: merge-recursive.c:911 merge-recursive.c:930

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

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

2832

2284 -#: merge-recursive.c:915

2833 +#: merge-recursive.c:920

2834 #, c-format

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

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

2837

2289 -#: merge-recursive.c:957 builtin/cat-file.c:37

2838 +#: merge-recursive.c:962 builtin/cat-file.c:39

2839 #, c-format

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

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

2842

2294 -#: merge-recursive.c:959

2843 +#: merge-recursive.c:964

2844 #, c-format

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

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

2847

2299 -#: merge-recursive.c:983

2848 +#: merge-recursive.c:988

2849 #, c-format

2850 msgid "failed to open '%s': %s"

2851 msgstr "misslyckades öppna \"%s\": %s"

2852

2304 -#: merge-recursive.c:994

2853 +#: merge-recursive.c:999

2854 #, c-format

2855 msgid "failed to symlink '%s': %s"

2856 msgstr "misslyckades skapa symboliska länken \"%s\": %s"

2857

2309 -#: merge-recursive.c:999

2858 +#: merge-recursive.c:1004

2859 #, c-format

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

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

2862

2314 -#: merge-recursive.c:1186

2863 +#: merge-recursive.c:1191

2864 #, c-format

2865 msgid "Failed to merge submodule %s (not checked out)"

2866 msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"

2867

2319 -#: merge-recursive.c:1193

2868 +#: merge-recursive.c:1198

2869 #, c-format

2870 msgid "Failed to merge submodule %s (commits not present)"

2871 msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"

2872

2324 -#: merge-recursive.c:1200

2873 +#: merge-recursive.c:1205

2874 #, c-format

2875 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

2876 msgstr ""

2877 "Misslyckades slå ihop undermodulen %s (incheckningar följer inte "

2878 "sammanslagningsbasen)"

2879

2331 -#: merge-recursive.c:1208 merge-recursive.c:1220

2880 +#: merge-recursive.c:1213 merge-recursive.c:1225

2881 #, c-format

2882 msgid "Fast-forwarding submodule %s to the following commit:"

2883 msgstr "Snabbspolar undermodulen %s till följande incheckning:"

2884

2336 -#: merge-recursive.c:1211 merge-recursive.c:1223

2885 +#: merge-recursive.c:1216 merge-recursive.c:1228

2886 #, c-format

2887 msgid "Fast-forwarding submodule %s"

2888 msgstr "Snabbspolar undermodulen %s"

2889

2341 -#: merge-recursive.c:1245

2890 +#: merge-recursive.c:1250

2891 #, c-format

2892 msgid "Failed to merge submodule %s (merge following commits not found)"

2893 msgstr ""

2894 "Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "

2895 "hittades inte)"

2896

2348 -#: merge-recursive.c:1249

2897 +#: merge-recursive.c:1254

2898 #, c-format

2899 msgid "Failed to merge submodule %s (not fast-forward)"

2900 msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"

2901

2353 -#: merge-recursive.c:1250

2902 +#: merge-recursive.c:1255

2903 msgid "Found a possible merge resolution for the submodule:\n"

2904 msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"

2905

2357 -#: merge-recursive.c:1253

2906 +#: merge-recursive.c:1258

2907 #, c-format

2908 msgid ""

2909 "If this is correct simply add it to the index for example\n"

@@ -2371,32 +2920,32 @@ msgstr ""

2920 "\n"

2921 "vilket godtar lösningen.\n"

2922

2374 -#: merge-recursive.c:1262

2923 +#: merge-recursive.c:1267

2924 #, c-format

2925 msgid "Failed to merge submodule %s (multiple merges found)"

2926 msgstr ""

2927 "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"

2928

2380 -#: merge-recursive.c:1321

2929 +#: merge-recursive.c:1326

2930 msgid "Failed to execute internal merge"

2931 msgstr "Misslyckades exekvera intern sammanslagning"

2932

2384 -#: merge-recursive.c:1326

2933 +#: merge-recursive.c:1331

2934 #, c-format

2935 msgid "Unable to add %s to database"

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

2937

2389 -#: merge-recursive.c:1358

2938 +#: merge-recursive.c:1363

2939 #, c-format

2940 msgid "Auto-merging %s"

2941 msgstr "Slår ihop %s automatiskt"

2942

2394 -#: merge-recursive.c:1423

2943 +#: merge-recursive.c:1434

2944 #, c-format

2945 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

2946 msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."

2947

2399 -#: merge-recursive.c:1475

2948 +#: merge-recursive.c:1501

2949 #, c-format

2950 msgid ""

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

@@ -2405,7 +2954,7 @@ msgstr ""

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

2955 "i trädet."

2956

2408 -#: merge-recursive.c:1480

2957 +#: merge-recursive.c:1506

2958 #, c-format

2959 msgid ""

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

@@ -2414,7 +2963,7 @@ msgstr ""

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

2964 "%s lämnad i trädet."

2965

2417 -#: merge-recursive.c:1487

2966 +#: merge-recursive.c:1513

2967 #, c-format

2968 msgid ""

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

@@ -2423,7 +2972,7 @@ msgstr ""

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

2973 "i trädet vid %s."

2974

2426 -#: merge-recursive.c:1492

2975 +#: merge-recursive.c:1518

2976 #, c-format

2977 msgid ""

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

@@ -2432,31 +2981,31 @@ msgstr ""

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

2982 "%s lämnad i trädet vid %s."

2983

2435 -#: merge-recursive.c:1526

2984 +#: merge-recursive.c:1552

2985 msgid "rename"

2986 msgstr "namnbyte"

2987

2439 -#: merge-recursive.c:1526

2988 +#: merge-recursive.c:1552

2989 msgid "renamed"

2990 msgstr "namnbytt"

2991

2443 -#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368

2444 -#: merge-recursive.c:3086

2992 +#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394

2993 +#: merge-recursive.c:3129

2994 #, c-format

2995 msgid "Refusing to lose dirty file at %s"

2996 msgstr "Vägrar förlora lortig fil vid \"%s\""

2997

2449 -#: merge-recursive.c:1594

2998 +#: merge-recursive.c:1620

2999 #, c-format

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

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

3002

2454 -#: merge-recursive.c:1599

3003 +#: merge-recursive.c:1625

3004 #, c-format

3005 msgid "Refusing to lose untracked file at %s; adding as %s instead"

3006 msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"

3007

2459 -#: merge-recursive.c:1625

3008 +#: merge-recursive.c:1651

3009 #, c-format

3010 msgid ""

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

@@ -2465,27 +3014,27 @@ msgstr ""

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

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

3016

2468 -#: merge-recursive.c:1630

3017 +#: merge-recursive.c:1656

3018 msgid " (left unresolved)"

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

3020

2472 -#: merge-recursive.c:1694

3021 +#: merge-recursive.c:1720

3022 #, c-format

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

3024 msgstr ""

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

3026

2478 -#: merge-recursive.c:1733

3027 +#: merge-recursive.c:1759

3028 #, c-format

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

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

3031

2483 -#: merge-recursive.c:1745

3032 +#: merge-recursive.c:1771

3033 #, c-format

3034 msgid "Refusing to lose untracked file at %s, even though it's in the way."

3035 msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."

3036

2488 -#: merge-recursive.c:1951

3037 +#: merge-recursive.c:1977

3038 #, c-format

3039 msgid ""

3040 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -2496,7 +3045,7 @@ msgstr ""

3045 "katalogen %s bytte namn till flera andra kataloger, utan att någon "

3046 "destination fick en majoritet av filerna."

3047

2499 -#: merge-recursive.c:1983

3048 +#: merge-recursive.c:2009

3049 #, c-format

3050 msgid ""

3051 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -2505,7 +3054,7 @@ msgstr ""

3054 "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "

3055 "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."

3056

2508 -#: merge-recursive.c:1993

3057 +#: merge-recursive.c:2019

3058 #, c-format

3059 msgid ""

3060 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -2514,7 +3063,7 @@ msgstr ""

3063 "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "

3064 "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"

3065

2517 -#: merge-recursive.c:2085

3066 +#: merge-recursive.c:2111

3067 #, c-format

3068 msgid ""

3069 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -2523,7 +3072,7 @@ msgstr ""

3072 "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "

3073 "%s->%s i %s"

3074

2526 -#: merge-recursive.c:2330

3075 +#: merge-recursive.c:2356

3076 #, c-format

3077 msgid ""

3078 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -2532,124 +3081,129 @@ msgstr ""

3081 "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "

3082 "bytt namn."

3083

2535 -#: merge-recursive.c:2736

3084 +#: merge-recursive.c:2762

3085 #, c-format

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

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

3088

2540 -#: merge-recursive.c:2751

3089 +#: merge-recursive.c:2777

3090 #, c-format

3091 msgid "Adding merged %s"

3092 msgstr "Lägger till sammanslagen %s"

3093

2545 -#: merge-recursive.c:2758 merge-recursive.c:3089

3094 +#: merge-recursive.c:2784 merge-recursive.c:3132

3095 #, c-format

3096 msgid "Adding as %s instead"

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

3098

2550 -#: merge-recursive.c:2914

3099 +#: merge-recursive.c:2941

3100 #, c-format

3101 msgid "cannot read object %s"

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

3103

2555 -#: merge-recursive.c:2917

3104 +#: merge-recursive.c:2944

3105 #, c-format

3106 msgid "object %s is not a blob"

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

3108

2560 -#: merge-recursive.c:2986

3109 +#: merge-recursive.c:3013

3110 msgid "modify"

3111 msgstr "ändra"

3112

2564 -#: merge-recursive.c:2986

3113 +#: merge-recursive.c:3013

3114 msgid "modified"

3115 msgstr "ändrad"

3116

2568 -#: merge-recursive.c:2997

3117 +#: merge-recursive.c:3024

3118 msgid "content"

3119 msgstr "innehåll"

3120

2572 -#: merge-recursive.c:3004

3121 +#: merge-recursive.c:3031

3122 msgid "add/add"

3123 msgstr "tillägg/tillägg"

3124

2576 -#: merge-recursive.c:3046

3125 +#: merge-recursive.c:3076

3126 #, c-format

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

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

3129

2581 -#: merge-recursive.c:3055 git-submodule.sh:895

3130 +#: merge-recursive.c:3098 git-submodule.sh:865

3131 msgid "submodule"

3132 msgstr "undermodul"

3133

2585 -#: merge-recursive.c:3056

3134 +#: merge-recursive.c:3099

3135 #, c-format

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

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

3138

2590 -#: merge-recursive.c:3178

3139 +#: merge-recursive.c:3221

3140 #, c-format

3141 msgid "Removing %s"

3142 msgstr "Tar bort %s"

3143

2595 -#: merge-recursive.c:3204

3144 +#: merge-recursive.c:3247

3145 msgid "file/directory"

3146 msgstr "fil/katalog"

3147

2599 -#: merge-recursive.c:3210

3148 +#: merge-recursive.c:3253

3149 msgid "directory/file"

3150 msgstr "katalog/fil"

3151

2603 -#: merge-recursive.c:3217

3152 +#: merge-recursive.c:3260

3153 #, c-format

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

3155 msgstr ""

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

3157

2609 -#: merge-recursive.c:3226

3158 +#: merge-recursive.c:3269

3159 #, c-format

3160 msgid "Adding %s"

3161 msgstr "Lägger till %s"

3162

2614 -#: merge-recursive.c:3267

3163 +#: merge-recursive.c:3303

3164 #, c-format

2616 -msgid "Dirty index: cannot merge (dirty: %s)"

2617 -msgstr "Smutsigt index: kan inte slå ihop (smutsiga: %s)"

3165 +msgid ""

3166 +"Your local changes to the following files would be overwritten by merge:\n"

3167 +" %s"

3168 +msgstr ""

3169 +"Dina lokala ändringar av följande filer skulle skrivas över av "

3170 +"sammanslagning:\n"

3171 +" %s"

3172

2619 -#: merge-recursive.c:3271

3173 +#: merge-recursive.c:3314

3174 msgid "Already up to date!"

3175 msgstr "Redan à jour!"

3176

2623 -#: merge-recursive.c:3280

3177 +#: merge-recursive.c:3323

3178 #, c-format

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

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

3181

2628 -#: merge-recursive.c:3379

3182 +#: merge-recursive.c:3422

3183 msgid "Merging:"

3184 msgstr "Slår ihop:"

3185

2632 -#: merge-recursive.c:3392

3186 +#: merge-recursive.c:3435

3187 #, c-format

3188 msgid "found %u common ancestor:"

3189 msgid_plural "found %u common ancestors:"

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

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

3192

2639 -#: merge-recursive.c:3431

3193 +#: merge-recursive.c:3474

3194 msgid "merge returned no commit"

3195 msgstr "sammanslagningen returnerade ingen incheckning"

3196

2643 -#: merge-recursive.c:3495

3197 +#: merge-recursive.c:3540

3198 #, c-format

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

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

3201

2648 -#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816

3202 +#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846

3203 msgid "Unable to write index."

3204 msgstr "Kunde inte skriva indexet."

3205

2652 -#: notes-merge.c:272

3206 +#: notes-merge.c:274

3207 #, c-format

3208 msgid ""

3209 "You have not concluded your previous notes merge (%s exists).\n"

@@ -2661,21 +3215,21 @@ msgstr ""

3215 "att checka in eller avbryta föregående sammanslagning innan du påbörjar en "

3216 "ny antecknings-sammanslagning."

3217

2664 -#: notes-merge.c:279

3218 +#: notes-merge.c:281

3219 #, c-format

3220 msgid "You have not concluded your notes merge (%s exists)."

3221 msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)."

3222

2669 -#: notes-utils.c:43

3223 +#: notes-utils.c:45

3224 msgid "Cannot commit uninitialized/unreferenced notes tree"

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

3226

2673 -#: notes-utils.c:102

3227 +#: notes-utils.c:104

3228 #, c-format

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

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

3231

2678 -#: notes-utils.c:112

3232 +#: notes-utils.c:114

3233 #, c-format

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

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

@@ -2684,35 +3238,55 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"

3238 #. the environment variable, the second %s is

3239 #. its value.

3240 #.

2687 -#: notes-utils.c:142

3241 +#: notes-utils.c:144

3242 #, c-format

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

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

3245

2692 -#: object.c:242

3246 +#: object.c:54

3247 +#, c-format

3248 +msgid "invalid object type \"%s\""

3249 +msgstr "ogiltig objekttyp \"%s\""

3250 +

3251 +#: object.c:173

3252 +#, c-format

3253 +msgid "object %s is a %s, not a %s"

3254 +msgstr "objektet %s är en %s, inte en %s"

3255 +

3256 +#: object.c:233

3257 +#, c-format

3258 +msgid "object %s has unknown type id %d"

3259 +msgstr "objektet %s har okänd typ-id %d"

3260 +

3261 +#: object.c:246

3262 #, c-format

3263 msgid "unable to parse object: %s"

3264 msgstr "kunde inte tolka objektet: %s"

3265

3266 +#: object.c:266 object.c:277

3267 +#, c-format

3268 +msgid "sha1 mismatch %s"

3269 +msgstr "sha1 stämmer inte överens %s"

3270 +

3271 #: packfile.c:563

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

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

3274

2701 -#: packfile.c:1742

3275 +#: packfile.c:1745

3276 #, c-format

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

3278 msgstr "offset före slutet av packindex för %s (trasigt index?)"

3279

2706 -#: packfile.c:1746

3280 +#: packfile.c:1749

3281 #, c-format

3282 msgid "offset beyond end of pack index for %s (truncated index?)"

3283 msgstr "offset borton slutet av packindex för %s (trunkerat index?)"

3284

2711 -#: parse-options.c:621

3285 +#: parse-options.c:672

3286 msgid "..."

3287 msgstr "..."

3288

2715 -#: parse-options.c:640

3289 +#: parse-options.c:691

3290 #, c-format

3291 msgid "usage: %s"

3292 msgstr "användning: %s"

@@ -2720,17 +3294,17 @@ msgstr "användning: %s"

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

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

3296 #.

2723 -#: parse-options.c:646

3297 +#: parse-options.c:697

3298 #, c-format

3299 msgid " or: %s"

3300 msgstr " eller: %s"

3301

2728 -#: parse-options.c:649

3302 +#: parse-options.c:700

3303 #, c-format

3304 msgid " %s"

3305 msgstr " %s"

3306

2733 -#: parse-options.c:688

3307 +#: parse-options.c:739

3308 msgid "-NUM"

3309 msgstr "-TAL"

3310

@@ -2823,11 +3397,71 @@ msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s"

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

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

3399

3400 +#: pkt-line.c:104

3401 +msgid "flush packet write failed"

3402 +msgstr "fel vid skrivning av \"flush\"-paket"

3403 +

3404 +#: pkt-line.c:142 pkt-line.c:228

3405 +msgid "protocol error: impossibly long line"

3406 +msgstr "protokollfel: omöjligt lång rad"

3407 +

3408 +#: pkt-line.c:158 pkt-line.c:160

3409 +msgid "packet write with format failed"

3410 +msgstr "paketskrivning med format misslyckades"

3411 +

3412 +#: pkt-line.c:192

3413 +msgid "packet write failed - data exceeds max packet size"

3414 +msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek"

3415 +

3416 +#: pkt-line.c:199 pkt-line.c:206

3417 +msgid "packet write failed"

3418 +msgstr "paketskrivning misslyckades"

3419 +

3420 +#: pkt-line.c:291

3421 +msgid "read error"

3422 +msgstr "läsfel"

3423 +

3424 +#: pkt-line.c:299

3425 +msgid "the remote end hung up unexpectedly"

3426 +msgstr "fjärren lade på oväntat"

3427 +

3428 +#: pkt-line.c:327

3429 +#, c-format

3430 +msgid "protocol error: bad line length character: %.4s"

3431 +msgstr "protokollfel: felaktig radlängdstecken: %.4s"

3432 +

3433 +#: pkt-line.c:337 pkt-line.c:342

3434 +#, c-format

3435 +msgid "protocol error: bad line length %d"

3436 +msgstr "protokollfel: felaktig radlängd: %d"

3437 +

3438 #: pretty.c:962

3439 msgid "unable to parse --pretty format"

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

3441

2830 -#: read-cache.c:1500

3442 +#: range-diff.c:48

3443 +msgid "could not start `log`"

3444 +msgstr "kunde inte starta \"log\""

3445 +

3446 +#: range-diff.c:51

3447 +msgid "could not read `log` output"

3448 +msgstr "kunde inte läsa utdata från \"log\""

3449 +

3450 +#: range-diff.c:66 sequencer.c:4540

3451 +#, c-format

3452 +msgid "could not parse commit '%s'"

3453 +msgstr "kunde inte tolka incheckningen\" %s\""

3454 +

3455 +#: range-diff.c:196

3456 +msgid "failed to generate diff"

3457 +msgstr "misslyckades skapa diff"

3458 +

3459 +#: range-diff.c:421 range-diff.c:423

3460 +#, c-format

3461 +msgid "could not parse log for '%s'"

3462 +msgstr "kunde inte tolka loggen för \"%s\""

3463 +

3464 +#: read-cache.c:1579

3465 #, c-format

3466 msgid ""

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

@@ -2836,7 +3470,7 @@ msgstr ""

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

3471 "Använder version %i"

3472

2839 -#: read-cache.c:1510

3473 +#: read-cache.c:1589

3474 #, c-format

3475 msgid ""

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

@@ -2845,227 +3479,329 @@ msgstr ""

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

3480 "Använder version %i"

3481

2848 -#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048

3482 +#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083

3483 #, c-format

3484 msgid "could not close '%s'"

3485 msgstr "kunde inte stänga \"%s\""

3486

2853 -#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234

3487 +#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374

3488 #, c-format

3489 msgid "could not stat '%s'"

3490 msgstr "kunde inte ta status på \"%s\""

3491

2858 -#: read-cache.c:2490

3492 +#: read-cache.c:2666

3493 #, c-format

3494 msgid "unable to open git dir: %s"

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

3496

2863 -#: read-cache.c:2502

3497 +#: read-cache.c:2678

3498 #, c-format

3499 msgid "unable to unlink: %s"

3500 msgstr "misslyckades ta bort länken: %s"

3501

2868 -#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395

2869 -#: builtin/am.c:779

3502 +#: refs.c:192

3503 +#, c-format

3504 +msgid "%s does not point to a valid object!"

3505 +msgstr "\"%s\" pekar inte på ett giltigt objekt!"

3506 +

3507 +#: refs.c:579

3508 +#, c-format

3509 +msgid "ignoring dangling symref %s"

3510 +msgstr "ignorerar dinglande symbolisk referens %s"

3511 +

3512 +#: refs.c:581 ref-filter.c:2067

3513 +#, c-format

3514 +msgid "ignoring broken ref %s"

3515 +msgstr "ignorerar trasig referens %s"

3516 +

3517 +#: refs.c:685

3518 +#, c-format

3519 +msgid "could not open '%s' for writing: %s"

3520 +msgstr "kunde inte öppna \"%s\" för skrivning: %s"

3521 +

3522 +#: refs.c:695 refs.c:746

3523 +#, c-format

3524 +msgid "could not read ref '%s'"

3525 +msgstr "Kunde inte läsa referensen \"%s\""

3526 +

3527 +#: refs.c:701

3528 +#, c-format

3529 +msgid "ref '%s' already exists"

3530 +msgstr "referensen \"%s\" finns redan"

3531 +

3532 +#: refs.c:706

3533 +#, c-format

3534 +msgid "unexpected object ID when writing '%s'"

3535 +msgstr "oväntat objekt-id vid skrivning \"%s\""

3536 +

3537 +#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492

3538 +#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564

3539 +#: wrapper.c:656

3540 +#, c-format

3541 +msgid "could not write to '%s'"

3542 +msgstr "kunde inte skriva till \"%s\""

3543 +

3544 +#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395

3545 +#: builtin/am.c:780

3546 #, c-format

3547 msgid "could not open '%s' for writing"

3548 msgstr "kunde inte öppna \"%s\" för skrivning"

3549

2874 -#: refs.c:1880

3550 +#: refs.c:748

3551 +#, c-format

3552 +msgid "unexpected object ID when deleting '%s'"

3553 +msgstr "oväntat objekt-id vid borttagning \"%s\""

3554 +

3555 +#: refs.c:879

3556 +#, c-format

3557 +msgid "log for ref %s has gap after %s"

3558 +msgstr "loggen för referensen %s har lucka efter %s"

3559 +

3560 +#: refs.c:885

3561 +#, c-format

3562 +msgid "log for ref %s unexpectedly ended on %s"

3563 +msgstr "loggen för referensen %s slutade oväntat på %s"

3564 +

3565 +#: refs.c:943

3566 +#, c-format

3567 +msgid "log for %s is empty"

3568 +msgstr "loggen för %s är tom"

3569 +

3570 +#: refs.c:1035

3571 +#, c-format

3572 +msgid "refusing to update ref with bad name '%s'"

3573 +msgstr "vägrar uppdatera referens med trasigt namn \"%s\""

3574 +

3575 +#: refs.c:1111

3576 +#, c-format

3577 +msgid "update_ref failed for ref '%s': %s"

3578 +msgstr "update_ref misslyckades för referensen \"%s\": %s"

3579 +

3580 +#: refs.c:1853

3581 +#, c-format

3582 +msgid "multiple updates for ref '%s' not allowed"

3583 +msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"

3584 +

3585 +#: refs.c:1885

3586 msgid "ref updates forbidden inside quarantine environment"

3587 msgstr "referensuppdateringar förbjudna i karantänmiljö"

3588

3589 +#: refs.c:1981 refs.c:2011

3590 +#, c-format

3591 +msgid "'%s' exists; cannot create '%s'"

3592 +msgstr "\"%s\" finns; kan inte skapa \"%s\""

3593 +

3594 +#: refs.c:1987 refs.c:2022

3595 +#, c-format

3596 +msgid "cannot process '%s' and '%s' at the same time"

3597 +msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"

3598 +

3599 #: refs/files-backend.c:1191

3600 #, c-format

3601 msgid "could not remove reference %s"

3602 msgstr "kunde inte ta bort referensen %s"

3603

2883 -#: refs/files-backend.c:1205 refs/packed-backend.c:1531

2884 -#: refs/packed-backend.c:1541

3604 +#: refs/files-backend.c:1205 refs/packed-backend.c:1532

3605 +#: refs/packed-backend.c:1542

3606 #, c-format

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

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

3609

2889 -#: refs/files-backend.c:1208 refs/packed-backend.c:1544

3610 +#: refs/files-backend.c:1208 refs/packed-backend.c:1545

3611 #, c-format

3612 msgid "could not delete references: %s"

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

3614

2894 -#: ref-filter.c:35 wt-status.c:1850

3615 +#: refspec.c:137

3616 +#, c-format

3617 +msgid "invalid refspec '%s'"

3618 +msgstr "felaktig referensspecifikation: \"%s\""

3619 +

3620 +#: ref-filter.c:38 wt-status.c:1850

3621 msgid "gone"

3622 msgstr "försvunnen"

3623

2898 -#: ref-filter.c:36

3624 +#: ref-filter.c:39

3625 #, c-format

3626 msgid "ahead %d"

3627 msgstr "före %d"

3628

2903 -#: ref-filter.c:37

3629 +#: ref-filter.c:40

3630 #, c-format

3631 msgid "behind %d"

3632 msgstr "bakom %d"

3633

2908 -#: ref-filter.c:38

3634 +#: ref-filter.c:41

3635 #, c-format

3636 msgid "ahead %d, behind %d"

3637 msgstr "före %d, bakom %d"

3638

2913 -#: ref-filter.c:121

3639 +#: ref-filter.c:137

3640 #, c-format

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

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

3643

2918 -#: ref-filter.c:123

3644 +#: ref-filter.c:139

3645 #, c-format

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

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

3648

2923 -#: ref-filter.c:145

3649 +#: ref-filter.c:161

3650 #, c-format

3651 msgid "Integer value expected refname:lstrip=%s"

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

3653

2928 -#: ref-filter.c:149

3654 +#: ref-filter.c:165

3655 #, c-format

3656 msgid "Integer value expected refname:rstrip=%s"

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

3658

2933 -#: ref-filter.c:151

3659 +#: ref-filter.c:167

3660 #, c-format

3661 msgid "unrecognized %%(%s) argument: %s"

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

3663

2938 -#: ref-filter.c:206

3664 +#: ref-filter.c:222

3665 +#, c-format

3666 +msgid "%%(objecttype) does not take arguments"

3667 +msgstr "%%(objecttype) tar inte argument"

3668 +

3669 +#: ref-filter.c:234

3670 +#, c-format

3671 +msgid "%%(objectsize) does not take arguments"

3672 +msgstr "%%(objectsize) tar inte argument"

3673 +

3674 +#: ref-filter.c:246

3675 #, c-format

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

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

3678

2943 -#: ref-filter.c:215

3679 +#: ref-filter.c:255

3680 #, c-format

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

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

3683

2948 -#: ref-filter.c:235

3684 +#: ref-filter.c:275

3685 #, c-format

3686 msgid "unknown %%(trailers) argument: %s"

3687 msgstr "okänt %%(trailers)-argument: %s"

3688

2953 -#: ref-filter.c:264

3689 +#: ref-filter.c:304

3690 #, c-format

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

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

3693

2958 -#: ref-filter.c:266

3694 +#: ref-filter.c:306

3695 #, c-format

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

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

3698

2963 -#: ref-filter.c:281

3699 +#: ref-filter.c:321

3700 #, c-format

3701 msgid "positive value expected objectname:short=%s"

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

3703

2968 -#: ref-filter.c:285

3704 +#: ref-filter.c:325

3705 #, c-format

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

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

3708

2973 -#: ref-filter.c:315

3709 +#: ref-filter.c:355

3710 #, c-format

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

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

3713

2978 -#: ref-filter.c:327

3714 +#: ref-filter.c:367

3715 #, c-format

3716 msgid "unrecognized position:%s"

3717 msgstr "okänd position:%s"

3718

2983 -#: ref-filter.c:334

3719 +#: ref-filter.c:374

3720 #, c-format

3721 msgid "unrecognized width:%s"

3722 msgstr "okänd bredd:%s"

3723

2988 -#: ref-filter.c:343

3724 +#: ref-filter.c:383

3725 #, c-format

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

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

3728

2993 -#: ref-filter.c:351

3729 +#: ref-filter.c:391

3730 #, c-format

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

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

3733

2998 -#: ref-filter.c:369

3734 +#: ref-filter.c:409

3735 #, c-format

3736 msgid "unrecognized %%(if) argument: %s"

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

3738

3003 -#: ref-filter.c:464

3739 +#: ref-filter.c:505

3740 #, c-format

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

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

3743

3008 -#: ref-filter.c:491

3744 +#: ref-filter.c:532

3745 #, c-format

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

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

3748

3013 -#: ref-filter.c:608

3749 +#: ref-filter.c:656

3750 #, c-format

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

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

3753

3018 -#: ref-filter.c:671

3754 +#: ref-filter.c:719

3755 #, c-format

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

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

3758

3023 -#: ref-filter.c:673

3759 +#: ref-filter.c:721

3760 #, c-format

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

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

3763

3028 -#: ref-filter.c:675

3764 +#: ref-filter.c:723

3765 #, c-format

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

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

3768

3033 -#: ref-filter.c:703

3769 +#: ref-filter.c:751

3770 #, c-format

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

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

3773

3038 -#: ref-filter.c:705

3774 +#: ref-filter.c:753

3775 #, c-format

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

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

3778

3043 -#: ref-filter.c:707

3779 +#: ref-filter.c:755

3780 #, c-format

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

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

3783

3048 -#: ref-filter.c:722

3784 +#: ref-filter.c:770

3785 #, c-format

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

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

3788

3053 -#: ref-filter.c:779

3789 +#: ref-filter.c:827

3790 #, c-format

3791 msgid "malformed format string %s"

3792 msgstr "felformad formatsträng %s"

3793

3058 -#: ref-filter.c:1387

3794 +#: ref-filter.c:1416

3795 #, c-format

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

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

3798

3063 -#: ref-filter.c:1390

3799 +#: ref-filter.c:1419

3800 #, c-format

3801 msgid "(no branch, rebasing detached HEAD %s)"

3802 msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)"

3803

3068 -#: ref-filter.c:1393

3804 +#: ref-filter.c:1422

3805 #, c-format

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

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

@@ -3073,7 +3809,7 @@ msgstr "(ingen gren, \"bisect\" startad på %s)"

3809 #. TRANSLATORS: make sure this matches "HEAD

3810 #. detached at " in wt-status.c

3811 #.

3076 -#: ref-filter.c:1401

3812 +#: ref-filter.c:1430

3813 #, c-format

3814 msgid "(HEAD detached at %s)"

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

@@ -3081,147 +3817,142 @@ msgstr "(HEAD frånkopplat vid %s)"

3817 #. TRANSLATORS: make sure this matches "HEAD

3818 #. detached from " in wt-status.c

3819 #.

3084 -#: ref-filter.c:1408

3820 +#: ref-filter.c:1437

3821 #, c-format

3822 msgid "(HEAD detached from %s)"

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

3824

3089 -#: ref-filter.c:1412

3825 +#: ref-filter.c:1441

3826 msgid "(no branch)"

3827 msgstr "(ingen gren)"

3828

3093 -#: ref-filter.c:1442

3829 +#: ref-filter.c:1475 ref-filter.c:1623

3830 #, c-format

3831 msgid "missing object %s for %s"

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

3833

3098 -#: ref-filter.c:1445

3834 +#: ref-filter.c:1483

3835 #, c-format

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

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

3838

3103 -#: ref-filter.c:1902

3839 +#: ref-filter.c:1980

3840 #, c-format

3841 msgid "malformed object at '%s'"

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

3843

3108 -#: ref-filter.c:1984

3844 +#: ref-filter.c:2062

3845 #, c-format

3846 msgid "ignoring ref with broken name %s"

3847 msgstr "ignorerar referens med trasigt namn %s"

3848

3113 -#: ref-filter.c:1989

3114 -#, c-format

3115 -msgid "ignoring broken ref %s"

3116 -msgstr "ignorerar trasig referens %s"

3117 -

3118 -#: ref-filter.c:2261

3849 +#: ref-filter.c:2340

3850 #, c-format

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

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

3853

3123 -#: ref-filter.c:2365

3854 +#: ref-filter.c:2444

3855 #, c-format

3856 msgid "malformed object name %s"

3857 msgstr "felformat objektnamn %s"

3858

3128 -#: remote.c:605

3859 +#: remote.c:606

3860 #, c-format

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

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

3863

3133 -#: remote.c:609

3864 +#: remote.c:610

3865 #, c-format

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

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

3868

3138 -#: remote.c:613

3869 +#: remote.c:614

3870 #, c-format

3871 msgid "%s tracks both %s and %s"

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

3873

3143 -#: remote.c:621

3874 +#: remote.c:622

3875 msgid "Internal error"

3876 msgstr "Internt fel"

3877

3147 -#: remote.c:1534 remote.c:1635

3878 +#: remote.c:1536 remote.c:1637

3879 msgid "HEAD does not point to a branch"

3880 msgstr "HEAD pekar inte på en gren"

3881

3151 -#: remote.c:1543

3882 +#: remote.c:1545

3883 #, c-format

3884 msgid "no such branch: '%s'"

3885 msgstr "okänd gren: \"%s\""

3886

3156 -#: remote.c:1546

3887 +#: remote.c:1548

3888 #, c-format

3889 msgid "no upstream configured for branch '%s'"

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

3891

3161 -#: remote.c:1552

3892 +#: remote.c:1554

3893 #, c-format

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

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

3896

3166 -#: remote.c:1567

3897 +#: remote.c:1569

3898 #, c-format

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

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

3901

3171 -#: remote.c:1579

3902 +#: remote.c:1581

3903 #, c-format

3904 msgid "branch '%s' has no remote for pushing"

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

3906

3176 -#: remote.c:1589

3907 +#: remote.c:1591

3908 #, c-format

3909 msgid "push refspecs for '%s' do not include '%s'"

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

3911

3181 -#: remote.c:1602

3912 +#: remote.c:1604

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

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

3915

3185 -#: remote.c:1624

3916 +#: remote.c:1626

3917 msgid "cannot resolve 'simple' push to a single destination"

3918 msgstr "\"enkel push\" motsvarar flera olika mål"

3919

3189 -#: remote.c:1939

3920 +#: remote.c:1951

3921 #, c-format

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

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

3924

3194 -#: remote.c:1943

3925 +#: remote.c:1955

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

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

3928

3198 -#: remote.c:1946

3929 +#: remote.c:1958

3930 #, c-format

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

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

3933

3203 -#: remote.c:1950

3934 +#: remote.c:1962

3935 #, c-format

3936 msgid "Your branch and '%s' refer to different commits.\n"

3937 msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"

3938

3208 -#: remote.c:1953

3939 +#: remote.c:1965

3940 #, c-format

3941 msgid " (use \"%s\" for details)\n"

3942 msgstr " (använd \"%s\" för detaljer)\n"

3943

3213 -#: remote.c:1957

3944 +#: remote.c:1969

3945 #, c-format

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

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

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

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

3950

3220 -#: remote.c:1963

3951 +#: remote.c:1975

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

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

3954

3224 -#: remote.c:1966

3955 +#: remote.c:1978

3956 #, c-format

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

3958 msgid_plural ""

@@ -3231,11 +3962,11 @@ msgstr[0] ""

3962 msgstr[1] ""

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

3964

3234 -#: remote.c:1974

3965 +#: remote.c:1986

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

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

3968

3238 -#: remote.c:1977

3969 +#: remote.c:1989

3970 #, c-format

3971 msgid ""

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

@@ -3250,20 +3981,35 @@ msgstr[1] ""

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

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

3983

3253 -#: remote.c:1987

3984 +#: remote.c:1999

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

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

3987

3257 -#: revision.c:2289

3988 +#: replace-object.c:20

3989 +#, c-format

3990 +msgid "bad replace ref name: %s"

3991 +msgstr "felaktig ersättningsreferensnamn: %s"

3992 +

3993 +#: replace-object.c:29

3994 +#, c-format

3995 +msgid "duplicate replace ref: %s"

3996 +msgstr "duplicerat ersättningsreferensnamn: %s"

3997 +

3998 +#: replace-object.c:72

3999 +#, c-format

4000 +msgid "replace depth too high for object %s"

4001 +msgstr "ersättningsdjupet för högt för objektet %s"

4002 +

4003 +#: revision.c:2305

4004 msgid "your current branch appears to be broken"

4005 msgstr "din nuvarande gren verkar vara trasig"

4006

3261 -#: revision.c:2292

4007 +#: revision.c:2308

4008 #, c-format

4009 msgid "your current branch '%s' does not have any commits yet"

4010 msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"

4011

3266 -#: revision.c:2489

4012 +#: revision.c:2505

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

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

4015

@@ -3280,29 +4026,29 @@ msgstr ""

4026 "Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"

4027 "Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."

4028

3283 -#: send-pack.c:141

4029 +#: send-pack.c:142

4030 msgid "unexpected flush packet while reading remote unpack status"

4031 msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"

4032

3287 -#: send-pack.c:143

4033 +#: send-pack.c:144

4034 #, c-format

4035 msgid "unable to parse remote unpack status: %s"

4036 msgstr "kunde inte tolka fjärruppackningsstatus: %s"

4037

3292 -#: send-pack.c:145

4038 +#: send-pack.c:146

4039 #, c-format

4040 msgid "remote unpack failed: %s"

4041 msgstr "fjärruppackning misslyckades: %s"

4042

3297 -#: send-pack.c:308

4043 +#: send-pack.c:309

4044 msgid "failed to sign the push certificate"

4045 msgstr "misslyckades underteckna push-certifikatet"

4046

3301 -#: send-pack.c:421

4047 +#: send-pack.c:422

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

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

4050

3305 -#: send-pack.c:423

4051 +#: send-pack.c:424

4052 msgid ""

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

4054 "signed push"

@@ -3310,42 +4056,42 @@ msgstr ""

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

4057 "signed"

4058

3313 -#: send-pack.c:435

4059 +#: send-pack.c:436

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

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

4062

3317 -#: send-pack.c:440

4063 +#: send-pack.c:441

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

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

4066

3321 -#: sequencer.c:175

4067 +#: sequencer.c:177

4068 #, c-format

4069 msgid "invalid commit message cleanup mode '%s'"

4070 msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""

4071

3326 -#: sequencer.c:275

4072 +#: sequencer.c:278

4073 #, c-format

4074 msgid "could not delete '%s'"

4075 msgstr "kunde inte ta bort \"%s\""

4076

3331 -#: sequencer.c:301

4077 +#: sequencer.c:304

4078 msgid "revert"

4079 msgstr "revert"

4080

3335 -#: sequencer.c:303

4081 +#: sequencer.c:306

4082 msgid "cherry-pick"

4083 msgstr "cherry-pick"

4084

3339 -#: sequencer.c:305

4085 +#: sequencer.c:308

4086 msgid "rebase -i"

4087 msgstr "rebase -i"

4088

3343 -#: sequencer.c:307

4089 +#: sequencer.c:310

4090 #, c-format

3345 -msgid "Unknown action: %d"

3346 -msgstr "Okänd funktion: %d"

4091 +msgid "unknown action: %d"

4092 +msgstr "okänd funktion: %d"

4093

3348 -#: sequencer.c:364

4094 +#: sequencer.c:367

4095 msgid ""

4096 "after resolving the conflicts, mark the corrected paths\n"

4097 "with 'git add <paths>' or 'git rm <paths>'"

@@ -3353,7 +4099,7 @@ msgstr ""

4099 "efter att ha löst konflikterna, markera de rättade sökvägarna\n"

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

4101

3356 -#: sequencer.c:367

4102 +#: sequencer.c:370

4103 msgid ""

4104 "after resolving the conflicts, mark the corrected paths\n"

4105 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -3363,45 +4109,39 @@ msgstr ""

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

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

4111

3366 -#: sequencer.c:380 sequencer.c:2468

4112 +#: sequencer.c:383 sequencer.c:2488

4113 #, c-format

4114 msgid "could not lock '%s'"

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

4116

3371 -#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486

3372 -#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656

3373 -#, c-format

3374 -msgid "could not write to '%s'"

3375 -msgstr "kunde inte skriva till \"%s\""

3376 -

3377 -#: sequencer.c:387

4117 +#: sequencer.c:390

4118 #, c-format

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

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

4121

3382 -#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488

3383 -#: sequencer.c:2702

4122 +#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508

4123 +#: sequencer.c:2741

4124 #, c-format

4125 msgid "failed to finalize '%s'"

4126 msgstr "misslyckades färdigställa \"%s\""

4127

3388 -#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371

3389 -#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727

3390 -#: builtin/merge.c:1046

4128 +#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391

4129 +#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740

4130 +#: builtin/merge.c:1081

4131 #, c-format

4132 msgid "could not read '%s'"

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

4134

3395 -#: sequencer.c:441

4135 +#: sequencer.c:444

4136 #, c-format

4137 msgid "your local changes would be overwritten by %s."

4138 msgstr "dina lokala ändringar skulle skrivas över av %s."

4139

3400 -#: sequencer.c:445

4140 +#: sequencer.c:448

4141 msgid "commit your changes or stash them to proceed."

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

4143

3404 -#: sequencer.c:474

4144 +#: sequencer.c:477

4145 #, c-format

4146 msgid "%s: fast-forward"

4147 msgstr "%s: snabbspola"

@@ -3409,20 +4149,35 @@ msgstr "%s: snabbspola"

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

4150 #. "rebase -i".

4151 #.

3412 -#: sequencer.c:563

4152 +#: sequencer.c:566

4153 #, c-format

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

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

4156

3417 -#: sequencer.c:579

4157 +#: sequencer.c:582

4158 msgid "unable to update cache tree"

4159 msgstr "kan inte uppdatera cacheträd"

4160

3421 -#: sequencer.c:592

4161 +#: sequencer.c:595

4162 msgid "could not resolve HEAD commit"

4163 msgstr "kunde inte bestämma HEAD:s incheckning"

4164

3425 -#: sequencer.c:749

4165 +#: sequencer.c:723 sequencer.c:740

4166 +#, c-format

4167 +msgid "could not parse '%s' (looking for '%s')"

4168 +msgstr "kunde inte tolka \"%s\" (letar efter \"%s\")"

4169 +

4170 +#: sequencer.c:731

4171 +#, c-format

4172 +msgid "bad quoting on %s value in '%s'"

4173 +msgstr "felaktig citering på %s-värde i \"%s\""

4174 +

4175 +#: sequencer.c:747

4176 +#, c-format

4177 +msgid "invalid date format '%s' in '%s'"

4178 +msgstr "ogiltigt datumformat \"%s\" i \"%s\""

4179 +

4180 +#: sequencer.c:761

4181 #, c-format

4182 msgid ""

4183 "you have staged changes in your working tree\n"

@@ -3451,15 +4206,15 @@ msgstr ""

4206 "\n"

4207 " git rebase --continue\n"

4208

3454 -#: sequencer.c:818

4209 +#: sequencer.c:830

4210 msgid "writing root commit"

4211 msgstr "skriver rotincheckning"

4212

3458 -#: sequencer.c:1043

4213 +#: sequencer.c:1055

4214 msgid "'prepare-commit-msg' hook failed"

4215 msgstr "kroken \"prepare-commit-msg\" misslyckades"

4216

3462 -#: sequencer.c:1050

4217 +#: sequencer.c:1062

4218 msgid ""

4219 "Your name and email address were configured automatically based\n"

4220 "on your username and hostname. Please check that they are accurate.\n"

@@ -3486,7 +4241,7 @@ msgstr ""

4241 "\n"

4242 " git commit --amend --reset-author\n"

4243

3489 -#: sequencer.c:1063

4244 +#: sequencer.c:1075

4245 msgid ""

4246 "Your name and email address were configured automatically based\n"

4247 "on your username and hostname. Please check that they are accurate.\n"

@@ -3511,315 +4266,344 @@ msgstr ""

4266 "\n"

4267 " git commit --amend --reset-author\n"

4268

3514 -#: sequencer.c:1103

4269 +#: sequencer.c:1115

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

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

4272

3518 -#: sequencer.c:1105

4273 +#: sequencer.c:1117

4274 msgid "could not parse newly created commit"

4275 msgstr "kunde inte tolka en precis skapad incheckning"

4276

3522 -#: sequencer.c:1151

4277 +#: sequencer.c:1163

4278 msgid "unable to resolve HEAD after creating commit"

4279 msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"

4280

3526 -#: sequencer.c:1153

4281 +#: sequencer.c:1165

4282 msgid "detached HEAD"

4283 msgstr "frånkopplad HEAD"

4284

3530 -#: sequencer.c:1157

4285 +#: sequencer.c:1169

4286 msgid " (root-commit)"

4287 msgstr " (rotincheckning)"

4288

3534 -#: sequencer.c:1178

4289 +#: sequencer.c:1190

4290 msgid "could not parse HEAD"

4291 msgstr "kunde inte tolka HEAD"

4292

3538 -#: sequencer.c:1180

4293 +#: sequencer.c:1192

4294 #, c-format

4295 msgid "HEAD %s is not a commit!"

4296 msgstr "HEAD %s är inte en incheckning!"

4297

3543 -#: sequencer.c:1184 builtin/commit.c:1528

4298 +#: sequencer.c:1196 builtin/commit.c:1528

4299 msgid "could not parse HEAD commit"

4300 msgstr "kunde inte tolka HEAD:s incheckning"

4301

3547 -#: sequencer.c:1235 sequencer.c:1832

4302 +#: sequencer.c:1247 sequencer.c:1845

4303 msgid "unable to parse commit author"

4304 msgstr "kunde inte tolka incheckningens författare"

4305

3551 -#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645

4306 +#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675

4307 msgid "git write-tree failed to write a tree"

4308 msgstr "git write-tree misslyckades skriva ett träd"

4309

3555 -#: sequencer.c:1262 sequencer.c:1317

4310 +#: sequencer.c:1274 sequencer.c:1329

4311 #, c-format

4312 msgid "unable to read commit message from '%s'"

4313 msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""

4314

3560 -#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825

3561 -#: builtin/merge.c:850

4315 +#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855

4316 +#: builtin/merge.c:880

4317 msgid "failed to write commit object"

4318 msgstr "kunde inte skriva incheckningsobjekt"

4319

3565 -#: sequencer.c:1344

4320 +#: sequencer.c:1356

4321 #, c-format

4322 msgid "could not parse commit %s"

4323 msgstr "kunde inte tolka incheckningen %s"

4324

3570 -#: sequencer.c:1349

4325 +#: sequencer.c:1361

4326 #, c-format

4327 msgid "could not parse parent commit %s"

4328 msgstr "kunde inte tolka föräldraincheckningen %s"

4329

3575 -#: sequencer.c:1500 sequencer.c:1525

4330 +#: sequencer.c:1457 sequencer.c:1565

4331 +#, c-format

4332 +msgid "unknown command: %d"

4333 +msgstr "okänt kommando: %d"

4334 +

4335 +#: sequencer.c:1512 sequencer.c:1537

4336 #, c-format

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

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

4339

3580 -#: sequencer.c:1510 sequencer.c:4355

4340 +#: sequencer.c:1522 sequencer.c:4520

4341 msgid "need a HEAD to fixup"

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

4343

3584 -#: sequencer.c:1512 sequencer.c:2729

4344 +#: sequencer.c:1524 sequencer.c:2768

4345 msgid "could not read HEAD"

4346 msgstr "kunde inte läsa HEAD"

4347

3588 -#: sequencer.c:1514

4348 +#: sequencer.c:1526

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

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

4351

3592 -#: sequencer.c:1520

4352 +#: sequencer.c:1532

4353 #, c-format

4354 msgid "cannot write '%s'"

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

4356

3597 -#: sequencer.c:1527 git-rebase--interactive.sh:457

4357 +#: sequencer.c:1539 git-rebase--preserve-merges.sh:441

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

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

4360

3601 -#: sequencer.c:1535

4361 +#: sequencer.c:1547

4362 #, c-format

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

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

4365

3606 -#: sequencer.c:1542

4366 +#: sequencer.c:1554

4367 #, c-format

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

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

4370

3611 -#: sequencer.c:1548

4371 +#: sequencer.c:1560

4372 #, c-format

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

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

4375

3616 -#: sequencer.c:1553

3617 -#, c-format

3618 -msgid "unknown command: %d"

3619 -msgstr "okänt kommando: %d"

3620 -

3621 -#: sequencer.c:1631

4376 +#: sequencer.c:1643

4377 msgid "your index file is unmerged."

4378 msgstr "din indexfil har inte slagits ihop."

4379

3625 -#: sequencer.c:1638

4380 +#: sequencer.c:1650

4381 msgid "cannot fixup root commit"

4382 msgstr "kan inte göra \"fixup\" på rotincheckning"

4383

3629 -#: sequencer.c:1657

4384 +#: sequencer.c:1669

4385 #, c-format

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

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

4388

3634 -#: sequencer.c:1665

4389 +#: sequencer.c:1677

4390 #, c-format

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

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

4393

3639 -#: sequencer.c:1669

4394 +#: sequencer.c:1681

4395 #, c-format

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

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

4398

3644 -#: sequencer.c:1675

4399 +#: sequencer.c:1687

4400 #, c-format

4401 msgid "cannot get commit message for %s"

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

4403

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

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

3651 -#: sequencer.c:1694

4406 +#: sequencer.c:1706

4407 #, c-format

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

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

4410

3656 -#: sequencer.c:1759

4411 +#: sequencer.c:1771

4412 #, c-format

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

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

4415

3661 -#: sequencer.c:1813

4416 +#: sequencer.c:1826

4417 #, c-format

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

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

4420

3666 -#: sequencer.c:1814

4421 +#: sequencer.c:1827

4422 #, c-format

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

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

4425

3671 -#: sequencer.c:1864

3672 -msgid "empty commit set passed"

3673 -msgstr "den angivna uppsättningen incheckningar är tom"

3674 -

3675 -#: sequencer.c:1874

4426 +#: sequencer.c:1885

4427 #, c-format

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

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

4430

3680 -#: sequencer.c:1881

4431 +#: sequencer.c:1892

4432 #, c-format

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

4434 msgstr "git %s: misslyckades uppdatera indexet"

4435

3685 -#: sequencer.c:1961

4436 +#: sequencer.c:1972

4437 #, c-format

4438 msgid "%s does not accept arguments: '%s'"

4439 msgstr "%s tar inte argument: \"%s\""

4440

3690 -#: sequencer.c:1970

4441 +#: sequencer.c:1981

4442 #, c-format

4443 msgid "missing arguments for %s"

4444 msgstr "argument saknas för %s"

4445

3695 -#: sequencer.c:2029

4446 +#: sequencer.c:2040

4447 #, c-format

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

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

4450

3700 -#: sequencer.c:2037

4451 +#: sequencer.c:2048

4452 #, c-format

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

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

4455

3705 -#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173

4456 +#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333

4457 #, c-format

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

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

4460

3710 -#: sequencer.c:2108

4461 +#: sequencer.c:2119

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

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

4464

3714 -#: sequencer.c:2110

4465 +#: sequencer.c:2121

4466 #, c-format

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

4468 msgstr "oanvändbart manus: ”%s”"

4469

3719 -#: sequencer.c:2115

4470 +#: sequencer.c:2126

4471 msgid "no commits parsed."

4472 msgstr "inga incheckningar lästes."

4473

3723 -#: sequencer.c:2126

4474 +#: sequencer.c:2137

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

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

4477

3727 -#: sequencer.c:2128

4478 +#: sequencer.c:2139

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

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

4481

3731 -#: sequencer.c:2195

3732 -#, c-format

3733 -msgid "invalid key: %s"

3734 -msgstr "felaktig nyckel: %s"

3735 -

3736 -#: sequencer.c:2198

4482 +#: sequencer.c:2209

4483 #, c-format

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

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

4486

3741 -#: sequencer.c:2269

4487 +#: sequencer.c:2285

4488 msgid "unusable squash-onto"

4489 msgstr "oanvändbar squash-onto"

4490

3745 -#: sequencer.c:2285

4491 +#: sequencer.c:2301

4492 #, c-format

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

4494 msgstr "trasigt manus: ”%s”"

4495

3750 -#: sequencer.c:2323

4496 +#: sequencer.c:2335 sequencer.c:3775

4497 +msgid "empty commit set passed"

4498 +msgstr "den angivna uppsättningen incheckningar är tom"

4499 +

4500 +#: sequencer.c:2343

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

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

4503

3754 -#: sequencer.c:2324

4504 +#: sequencer.c:2344

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

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

4507

3758 -#: sequencer.c:2327

4508 +#: sequencer.c:2347

4509 #, c-format

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

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

4512

3763 -#: sequencer.c:2341

4513 +#: sequencer.c:2361

4514 msgid "could not lock HEAD"

4515 msgstr "kunde inte låsa HEAD"

4516

3767 -#: sequencer.c:2396 sequencer.c:3403

4517 +#: sequencer.c:2416 sequencer.c:3543

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

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

4520

3771 -#: sequencer.c:2398

4521 +#: sequencer.c:2418

4522 msgid "cannot resolve HEAD"

4523 msgstr "kan inte bestämma HEAD"

4524

3775 -#: sequencer.c:2400 sequencer.c:2435

4525 +#: sequencer.c:2420 sequencer.c:2455

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

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

4528

3779 -#: sequencer.c:2421 builtin/grep.c:720

4529 +#: sequencer.c:2441 builtin/grep.c:721

4530 #, c-format

4531 msgid "cannot open '%s'"

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

4533

3784 -#: sequencer.c:2423

4534 +#: sequencer.c:2443

4535 #, c-format

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

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

4538

3789 -#: sequencer.c:2424

4539 +#: sequencer.c:2444

4540 msgid "unexpected end of file"

4541 msgstr "oväntat filslut"

4542

3793 -#: sequencer.c:2430

4543 +#: sequencer.c:2450

4544 #, c-format

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

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

4547

3798 -#: sequencer.c:2441

4548 +#: sequencer.c:2461

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

4550 msgstr ""

4551 "Du verkar ha flyttat HEAD.\n"

4552 "Spolar inte tillbaka, kontrollera HEAD!"

4553

3804 -#: sequencer.c:2545 sequencer.c:3321

4554 +#: sequencer.c:2565 sequencer.c:3461

4555 #, c-format

4556 msgid "could not update %s"

4557 msgstr "kunde inte uppdatera %s"

4558

3809 -#: sequencer.c:2583 sequencer.c:3301

4559 +#: sequencer.c:2603 sequencer.c:3441

4560 msgid "cannot read HEAD"

4561 msgstr "kan inte läsa HEAD"

4562

3813 -#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639

4563 +#: sequencer.c:2618

4564 +#, c-format

4565 +msgid "unable to copy '%s' to '%s'"

4566 +msgstr "kan inte kopiera in \"%s\" till \"%s\""

4567 +

4568 +#: sequencer.c:2626

4569 +#, c-format

4570 +msgid ""

4571 +"You can amend the commit now, with\n"

4572 +"\n"

4573 +" git commit --amend %s\n"

4574 +"\n"

4575 +"Once you are satisfied with your changes, run\n"

4576 +"\n"

4577 +" git rebase --continue\n"

4578 +msgstr ""

4579 +"Du kan utöka incheckningen nu, med\n"

4580 +"\n"

4581 +"\tgit commit --amend %s\n"

4582 +"\n"

4583 +"När du är nöjd med dina ändringar kör du\n"

4584 +"\n"

4585 +"\tgit rebase --continue\n"

4586 +

4587 +#: sequencer.c:2636

4588 +#, c-format

4589 +msgid "Could not apply %s... %.*s"

4590 +msgstr "Kunde inte tillämpa %s... %.*s"

4591 +

4592 +#: sequencer.c:2643

4593 +#, c-format

4594 +msgid "Could not merge %.*s"

4595 +msgstr "Kunde inte slå ihop %.*s"

4596 +

4597 +#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640

4598 #, c-format

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

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

4601

3818 -#: sequencer.c:2641

4602 +#: sequencer.c:2680 sequencer.c:3095

4603 msgid "could not read index"

4604 msgstr "kunde inte läsa indexet"

4605

3822 -#: sequencer.c:2646

4606 +#: sequencer.c:2685

4607 #, c-format

4608 msgid ""

4609 "execution failed: %s\n"

@@ -3834,11 +4618,11 @@ msgstr ""

4618 "\tgit rebase --continue\n"

4619 "\n"

4620

3837 -#: sequencer.c:2652

4621 +#: sequencer.c:2691

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

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

4624

3841 -#: sequencer.c:2658

4625 +#: sequencer.c:2697

4626 #, c-format

4627 msgid ""

4628 "execution succeeded: %s\n"

@@ -3855,62 +4639,81 @@ msgstr ""

4639 "\tgit rebase --continue\n"

4640 "\n"

4641

3858 -#: sequencer.c:2771

4642 +#: sequencer.c:2758

4643 +#, c-format

4644 +msgid "illegal label name: '%.*s'"

4645 +msgstr "ogiltigt etikettnamn: \"%.*s\""

4646 +

4647 +#: sequencer.c:2810

4648 msgid "writing fake root commit"

4649 msgstr "skriver fejkad rotincheckning"

4650

3862 -#: sequencer.c:2776

4651 +#: sequencer.c:2815

4652 msgid "writing squash-onto"

4653 msgstr "skriver squash-onto"

4654

3866 -#: sequencer.c:2811

4655 +#: sequencer.c:2850

4656 #, c-format

4657 msgid "failed to find tree of %s"

4658 msgstr "kunde inte hitta trädet för %s."

4659

3871 -#: sequencer.c:2829

4660 +#: sequencer.c:2868

4661 msgid "could not write index"

4662 msgstr "kunde inte skriva indexet"

4663

3875 -#: sequencer.c:2861

4664 +#: sequencer.c:2895

4665 +#, c-format

4666 +msgid "could not resolve '%s'"

4667 +msgstr "kunde inte upplösa \"%s\""

4668 +

4669 +#: sequencer.c:2921

4670 msgid "cannot merge without a current revision"

4671 msgstr "kan inte slå ihop utan en aktuell incheckning"

4672

3879 -#: sequencer.c:2884

4673 +#: sequencer.c:2943

4674 #, c-format

3881 -msgid "could not resolve '%s'"

3882 -msgstr "kunde inte upplösa \"%s\""

4675 +msgid "unable to parse '%.*s'"

4676 +msgstr "kan inte tolka \"%.*s\""

4677 +

4678 +#: sequencer.c:2952

4679 +#, c-format

4680 +msgid "nothing to merge: '%.*s'"

4681 +msgstr "inget att slå samman: \"%.*s\""

4682 +

4683 +#: sequencer.c:2964

4684 +msgid "octopus merge cannot be executed on top of a [new root]"

4685 +msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]"

4686

3884 -#: sequencer.c:2906

4687 +#: sequencer.c:2979

4688 #, c-format

4689 msgid "could not get commit message of '%s'"

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

4691

3889 -#: sequencer.c:2916 sequencer.c:2941

4692 +#: sequencer.c:2989 sequencer.c:3015

4693 #, c-format

4694 msgid "could not write '%s'"

4695 msgstr "kunde inte skriva \"%s\""

4696

3894 -#: sequencer.c:3005

4697 +#: sequencer.c:3127

4698 #, c-format

4699 msgid "could not even attempt to merge '%.*s'"

4700 msgstr "kunde inte ens försöka slå ihop \"%.*s\""

4701

3899 -#: sequencer.c:3021

4702 +#: sequencer.c:3143

4703 msgid "merge: Unable to write new index file"

4704 msgstr "sammanslagning: Kunde inte skriva ny indexfil"

4705

3903 -#: sequencer.c:3088

4706 +#: sequencer.c:3211

4707 #, c-format

4708 msgid "Applied autostash.\n"

4709 msgstr "Tillämpade autostash.\n"

4710

3908 -#: sequencer.c:3100

4711 +#: sequencer.c:3223

4712 #, c-format

4713 msgid "cannot store %s"

4714 msgstr "kan inte spara %s"

4715

3913 -#: sequencer.c:3103 git-rebase.sh:188

4716 +#: sequencer.c:3226 git-rebase.sh:188

4717 #, c-format

4718 msgid ""

4719 "Applying autostash resulted in conflicts.\n"

@@ -3921,7 +4724,7 @@ msgstr ""

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

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

4726

3924 -#: sequencer.c:3134

4727 +#: sequencer.c:3257

4728 #, c-format

4729 msgid ""

4730 "Could not execute the todo command\n"

@@ -3942,48 +4745,48 @@ msgstr ""

4745 " git rebase --edit-todo\n"

4746 " git rebase --continue\n"

4747

3945 -#: sequencer.c:3202

4748 +#: sequencer.c:3325

4749 #, c-format

4750 msgid "Stopped at %s... %.*s\n"

4751 msgstr "Stoppade på %s... %.*s\n"

4752

3950 -#: sequencer.c:3264

4753 +#: sequencer.c:3404

4754 #, c-format

4755 msgid "unknown command %d"

4756 msgstr "okänt kommando %d"

4757

3955 -#: sequencer.c:3309

4758 +#: sequencer.c:3449

4759 msgid "could not read orig-head"

4760 msgstr "kunde inte läsa orig-head"

4761

3959 -#: sequencer.c:3314 sequencer.c:4352

4762 +#: sequencer.c:3454 sequencer.c:4517

4763 msgid "could not read 'onto'"

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

4765

3963 -#: sequencer.c:3328

4766 +#: sequencer.c:3468

4767 #, c-format

4768 msgid "could not update HEAD to %s"

4769 msgstr "kunde inte uppdatera HEAD till %s"

4770

3968 -#: sequencer.c:3414

4771 +#: sequencer.c:3554

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

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

4774

3972 -#: sequencer.c:3423

4775 +#: sequencer.c:3563

4776 msgid "cannot amend non-existing commit"

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

4778

3976 -#: sequencer.c:3425

4779 +#: sequencer.c:3565

4780 #, c-format

4781 msgid "invalid file: '%s'"

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

4783

3981 -#: sequencer.c:3427

4784 +#: sequencer.c:3567

4785 #, c-format

4786 msgid "invalid contents: '%s'"

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

4788

3986 -#: sequencer.c:3430

4789 +#: sequencer.c:3570

4790 msgid ""

4791 "\n"

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

@@ -3993,54 +4796,54 @@ msgstr ""

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

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

4798

3996 -#: sequencer.c:3455 sequencer.c:3493

4799 +#: sequencer.c:3595 sequencer.c:3633

4800 #, c-format

4801 msgid "could not write file: '%s'"

4802 msgstr "kunde inte skriva fil: \"%s\""

4803

4001 -#: sequencer.c:3508

4804 +#: sequencer.c:3648

4805 msgid "could not remove CHERRY_PICK_HEAD"

4806 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"

4807

4005 -#: sequencer.c:3515

4808 +#: sequencer.c:3655

4809 msgid "could not commit staged changes."

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

4811

4009 -#: sequencer.c:3612

4812 +#: sequencer.c:3752

4813 #, c-format

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

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

4816

4014 -#: sequencer.c:3616

4817 +#: sequencer.c:3756

4818 #, c-format

4819 msgid "%s: bad revision"

4820 msgstr "%s: felaktig revision"

4821

4019 -#: sequencer.c:3649

l10n: sv.po: Update Swedish translation (3958t0f0u)