9e3ea3b555 · matheusbsbs/matheus-bagliano

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

1 # Swedish translations for Git.

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

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

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2017-10-17 09:44+0800\n"

11 -"PO-Revision-Date: 2017-10-18 19:34+0100\n"

10 +"POT-Creation-Date: 2017-12-31 10:45+0800\n"

11 +"PO-Revision-Date: 2018-01-01 09:36+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:58

21 +#: advice.c:62

22 #, c-format

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

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

25

26 -#: advice.c:86

26 +#: advice.c:90

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:88

32 +#: advice.c:92

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:90

38 +#: advice.c:94

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:92

44 +#: advice.c:96

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:94

49 +#: advice.c:98

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:96

55 +#: advice.c:100

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:104

61 +#: advice.c:108

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:112

69 +#: advice.c:116

70 msgid "Exiting because of an unresolved conflict."

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

72

73 -#: advice.c:117 builtin/merge.c:1211

73 +#: advice.c:121 builtin/merge.c:1213

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:119

77 +#: advice.c:123

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

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

80

81 -#: advice.c:120

81 +#: advice.c:124

82 msgid "Exiting because of unfinished merge."

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

84

85 -#: advice.c:126

85 +#: advice.c:130

86 #, c-format

87 msgid ""

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

@@ -121,82 +121,82 @@ msgstr "okänt alternativ för whitespace: \"%s\""

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

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

123

124 -#: apply.c:125

124 +#: apply.c:122

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

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

127

128 -#: apply.c:127

128 +#: apply.c:124

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

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

131

132 -#: apply.c:130

132 +#: apply.c:127

133 msgid "--3way outside a repository"

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

135

136 -#: apply.c:141

136 +#: apply.c:138

137 msgid "--index outside a repository"

138 msgstr "--index utanför arkiv"

139

140 -#: apply.c:144

140 +#: apply.c:141

141 msgid "--cached outside a repository"

142 msgstr "--cached utanför arkiv"

143

144 -#: apply.c:845

144 +#: apply.c:821

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:854

149 +#: apply.c:830

150 #, c-format

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

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

153

154 -#: apply.c:928

154 +#: apply.c:904

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:966

159 +#: apply.c:942

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:972

164 +#: apply.c:948

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:973

169 +#: apply.c:949

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:978

174 +#: apply.c:954

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:1007

179 +#: apply.c:983

180 #, c-format

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

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

183

184 -#: apply.c:1325

184 +#: apply.c:1301

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:1497

189 +#: apply.c:1473

190 #, c-format

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

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

193

194 -#: apply.c:1566

194 +#: apply.c:1542

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:1586

199 +#: apply.c:1562

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:1599

215 +#: apply.c:1575

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:1787

220 +#: apply.c:1763

221 msgid "new file depends on old contents"

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

223

224 -#: apply.c:1789

224 +#: apply.c:1765

225 msgid "deleted file still has contents"

226 msgstr "borttagen fil har fortfarande innehåll"

227

228 -#: apply.c:1823

228 +#: apply.c:1799

229 #, c-format

230 msgid "corrupt patch at line %d"

231 msgstr "trasig patch på rad %d"

232

233 -#: apply.c:1860

233 +#: apply.c:1836

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:1862

238 +#: apply.c:1838

239 #, c-format

240 msgid "deleted file %s still has contents"

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

242

243 -#: apply.c:1865

243 +#: apply.c:1841

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:2012

248 +#: apply.c:1988

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:2049

253 +#: apply.c:2025

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:2209

258 +#: apply.c:2185

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:2295

263 +#: apply.c:2271

264 #, c-format

265 msgid "unable to read symlink %s"

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

267

268 -#: apply.c:2299

268 +#: apply.c:2275

269 #, c-format

270 msgid "unable to open or read %s"

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

272

273 -#: apply.c:2958

273 +#: apply.c:2934

274 #, c-format

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

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

277

278 -#: apply.c:3077

278 +#: apply.c:3055

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:3089

285 +#: apply.c:3067

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:3095

290 +#: apply.c:3073

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:3117

299 +#: apply.c:3095

300 #, c-format

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

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

303

304 -#: apply.c:3125

304 +#: apply.c:3103

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:3171

311 +#: apply.c:3149

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:3181

317 +#: apply.c:3159

318 #, c-format

319 msgid ""

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

@@ -322,420 +322,421 @@ msgstr ""

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

323 "innehållet."

324

325 -#: apply.c:3189

325 +#: apply.c:3167

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:3207

330 +#: apply.c:3185

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:3220

335 +#: apply.c:3198

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:3226

340 +#: apply.c:3204

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:3247

345 +#: apply.c:3225

346 #, c-format

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

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

349

350 -#: apply.c:3369

350 +#: apply.c:3347

351 #, c-format

352 msgid "cannot checkout %s"

353 msgstr "kan inte checka ut %s"

354

355 -#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277

355 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277

356 #, c-format

357 msgid "failed to read %s"

358 msgstr "misslyckades läsa %s"

359

360 -#: apply.c:3426

360 +#: apply.c:3404

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:3455 apply.c:3695

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

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:3538 apply.c:3709

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

371 #, c-format

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

373 msgstr "%s: finns inte i indexet"

374

375 -#: apply.c:3547 apply.c:3717

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

376 #, c-format

377 msgid "%s: does not match index"

378 msgstr "%s: motsvarar inte indexet"

379

380 -#: apply.c:3582

380 +#: apply.c:3560

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:3585

386 +#: apply.c:3563

387 #, c-format

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

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

390

391 -#: apply.c:3601 apply.c:3605

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

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:3617

396 +#: apply.c:3595

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:3631

401 +#: apply.c:3609

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:3636

406 +#: apply.c:3614

407 #, c-format

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

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

410

411 -#: apply.c:3662

411 +#: apply.c:3640

412 msgid "removal patch leaves file contents"

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

414

415 -#: apply.c:3734

415 +#: apply.c:3712

416 #, c-format

417 msgid "%s: wrong type"

418 msgstr "%s: fel typ"

419

420 -#: apply.c:3736

420 +#: apply.c:3714

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:3886 apply.c:3888

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

426 #, c-format

427 msgid "invalid path '%s'"

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

429

430 -#: apply.c:3944

430 +#: apply.c:3922

431 #, c-format

432 msgid "%s: already exists in index"

433 msgstr "%s: finns redan i indexet"

434

435 -#: apply.c:3947

435 +#: apply.c:3925

436 #, c-format

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

438 msgstr "%s: finns redan i arbetskatalogen"

439

440 -#: apply.c:3967

440 +#: apply.c:3945

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:3972

445 +#: apply.c:3950

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:3992

450 +#: apply.c:3970

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:3996

455 +#: apply.c:3974

456 #, c-format

457 msgid "%s: patch does not apply"

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

459

460 -#: apply.c:4011

460 +#: apply.c:3989

461 #, c-format

462 msgid "Checking patch %s..."

463 msgstr "Kontrollerar patchen %s..."

464

465 -#: apply.c:4102

465 +#: apply.c:4080

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:4109

470 +#: apply.c:4087

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:4112

475 +#: apply.c:4090

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:4117 builtin/checkout.c:235 builtin/reset.c:148

480 +#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148

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:4121

485 +#: apply.c:4099

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:4131

490 +#: apply.c:4109

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:4269

495 +#: apply.c:4247

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:4304

500 +#: apply.c:4282

501 #, c-format

502 msgid "corrupt patch for submodule %s"

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

504

505 -#: apply.c:4310

505 +#: apply.c:4288

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:4318

510 +#: apply.c:4296

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:4324 apply.c:4468

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

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:4365

520 +#: apply.c:4343

521 #, c-format

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

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

524

525 -#: apply.c:4369

525 +#: apply.c:4347

526 #, c-format

527 msgid "closing file '%s'"

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

529

530 -#: apply.c:4439

530 +#: apply.c:4417

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:4537

535 +#: apply.c:4515

536 #, c-format

537 msgid "Applied patch %s cleanly."

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

539

540 -#: apply.c:4545

540 +#: apply.c:4523

541 msgid "internal error"

542 msgstr "internt fel"

543

544 -#: apply.c:4548

544 +#: apply.c:4526

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:4559

551 +#: apply.c:4537

552 #, c-format

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

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

555

556 -#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010

556 +#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011

557 #, c-format

558 msgid "cannot open %s"

559 msgstr "kan inte öppna %s"

560

561 -#: apply.c:4581

561 +#: apply.c:4559

562 #, c-format

563 msgid "Hunk #%d applied cleanly."

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

565

566 -#: apply.c:4585

566 +#: apply.c:4563

567 #, c-format

568 msgid "Rejected hunk #%d."

569 msgstr "Refuserar stycke %d."

570

571 -#: apply.c:4695

571 +#: apply.c:4673

572 #, c-format

573 msgid "Skipped patch '%s'."

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

575

576 -#: apply.c:4703

576 +#: apply.c:4681

577 msgid "unrecognized input"

578 msgstr "indata känns inte igen"

579

580 -#: apply.c:4722

580 +#: apply.c:4700

581 msgid "unable to read index file"

582 msgstr "kan inte läsa indexfilen"

583

584 -#: apply.c:4859

584 +#: apply.c:4837

585 #, c-format

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

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

588

589 -#: apply.c:4886

589 +#: apply.c:4864

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:4892 apply.c:4907

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

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:4900

603 +#: apply.c:4878

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:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390

610 +#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390

611 msgid "Unable to write new index file"

612 msgstr "Kunde inte skriva ny indexfil"

613

614 -#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259

615 -#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187

616 -#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622

617 -#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992

618 -#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212

614 +#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260

615 +#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193

616 +#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860

617 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230

618 +#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450

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

620 msgid "path"

621 msgstr "sökväg"

622

623 -#: apply.c:4948

623 +#: apply.c:4922

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:4951

627 +#: apply.c:4925

628 msgid "apply changes matching the given path"

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

630

631 -#: apply.c:4953 builtin/am.c:2265

631 +#: apply.c:4927 builtin/am.c:2266

632 msgid "num"

633 msgstr "antal"

634

635 -#: apply.c:4954

635 +#: apply.c:4928

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:4957

639 +#: apply.c:4931

640 msgid "ignore additions made by the patch"

641 msgstr "ignorera tillägg gjorda av patchen"

642

643 -#: apply.c:4959

643 +#: apply.c:4933

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:4963

647 +#: apply.c:4937

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:4965

651 +#: apply.c:4939

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:4967

655 +#: apply.c:4941

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:4969

659 +#: apply.c:4943

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:4971

663 +#: apply.c:4945

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

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

666

667 -#: apply.c:4973

667 +#: apply.c:4947

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

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

670

671 -#: apply.c:4975

671 +#: apply.c:4949

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

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

674

675 -#: apply.c:4977

675 +#: apply.c:4951

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

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

678

679 -#: apply.c:4979

679 +#: apply.c:4953

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

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

682

683 -#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513

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

684 msgid "paths are separated with NUL character"

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

686

687 -#: apply.c:4984

687 +#: apply.c:4958

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

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

690

691 -#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95

691 +#: apply.c:4959 builtin/am.c:2245 builtin/interpret-trailers.c:95

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

693 +#: builtin/pack-objects.c:3009

694 msgid "action"

695 msgstr "åtgärd"

696

696 -#: apply.c:4986

697 +#: apply.c:4960

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

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

700

700 -#: apply.c:4989 apply.c:4992

701 +#: apply.c:4963 apply.c:4966

702 msgid "ignore changes in whitespace when finding context"

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

704

704 -#: apply.c:4995

705 +#: apply.c:4969

706 msgid "apply the patch in reverse"

707 msgstr "tillämpa patchen baklänges"

708

708 -#: apply.c:4997

709 +#: apply.c:4971

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

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

712

712 -#: apply.c:4999

713 +#: apply.c:4973

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

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

716

716 -#: apply.c:5001

717 +#: apply.c:4975

718 msgid "allow overlapping hunks"

719 msgstr "tillåt överlappande stycken"

720

720 -#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21

721 -#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640

722 -#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125

721 +#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21

722 +#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640

723 +#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125

724 msgid "be verbose"

725 msgstr "var pratsam"

726

726 -#: apply.c:5004

727 +#: apply.c:4978

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

729 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

730

730 -#: apply.c:5007

731 +#: apply.c:4981

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

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

734

734 -#: apply.c:5009 builtin/am.c:2253

735 +#: apply.c:4983 builtin/am.c:2254

736 msgid "root"

737 msgstr "rot"

738

738 -#: apply.c:5010

739 +#: apply.c:4984

740 msgid "prepend <root> to all filenames"

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

742

@@ -758,7 +759,7 @@ msgstr ""

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

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

761

761 -#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299

762 +#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299

763 #, c-format

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

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

@@ -771,7 +772,7 @@ msgstr "fmt"

772 msgid "archive format"

773 msgstr "arkivformat"

774

774 -#: archive.c:437 builtin/log.c:1452

775 +#: archive.c:437 builtin/log.c:1459

776 msgid "prefix"

777 msgstr "prefix"

778

@@ -779,9 +780,9 @@ msgstr "prefix"

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

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

782

782 -#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61

783 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859

784 -#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550

783 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62

784 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861

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

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

787 #: parse-options.h:153

788 msgid "file"

@@ -816,7 +817,7 @@ msgid "list supported archive formats"

817 msgstr "visa understödda arkivformat"

818

819 #: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109

819 -#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001

820 +#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239

821 msgid "repo"

822 msgstr "arkiv"

823

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

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

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

870

870 -#: bisect.c:447

871 +#: bisect.c:458

872 #, c-format

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

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

875

875 -#: bisect.c:655

876 +#: bisect.c:666

877 #, c-format

878 msgid "We cannot bisect more!\n"

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

880

880 -#: bisect.c:708

881 +#: bisect.c:720

882 #, c-format

883 msgid "Not a valid commit name %s"

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

885

885 -#: bisect.c:732

886 +#: bisect.c:744

887 #, c-format

888 msgid ""

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

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

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

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

894

894 -#: bisect.c:737

895 +#: bisect.c:749

896 #, c-format

897 msgid ""

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

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

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

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

903

903 -#: bisect.c:742

904 +#: bisect.c:754

905 #, c-format

906 msgid ""

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

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

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

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

912

912 -#: bisect.c:750

913 +#: bisect.c:762

914 #, c-format

915 msgid ""

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

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

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

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

923

923 -#: bisect.c:763

924 +#: bisect.c:775

925 #, c-format

926 msgid ""

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

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

933 "%s.\n"

934 "Vi fortsätter ändå."

935

935 -#: bisect.c:798

936 +#: bisect.c:810

937 #, c-format

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

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

940

940 -#: bisect.c:850

941 +#: bisect.c:862

942 #, c-format

943 msgid "a %s revision is needed"

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

945

945 -#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234

946 +#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234

947 #, c-format

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

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

950

950 -#: bisect.c:918

951 +#: bisect.c:930

952 #, c-format

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

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

955

955 -#: bisect.c:948

956 +#: bisect.c:960

957 msgid "reading bisect refs failed"

958 msgstr "misslyckades läsa bisect-referenser"

959

959 -#: bisect.c:968

960 +#: bisect.c:979

961 #, c-format

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

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

964

964 -#: bisect.c:976

965 +#: bisect.c:987

966 #, c-format

967 msgid ""

968 "No testable commit found.\n"

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

971 "Ingen testbar incheckning hittades.\n"

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

973

973 -#: bisect.c:995

974 +#: bisect.c:1006

975 #, c-format

976 msgid "(roughly %d step)"

977 msgid_plural "(roughly %d steps)"

@@ -980,7 +981,7 @@ msgstr[1] "(ungefär %d steg)"

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

982 #. steps)" translation.

983 #.

983 -#: bisect.c:1001

984 +#: bisect.c:1012

985 #, c-format

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

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

@@ -1001,9 +1002,9 @@ msgstr ""

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

1003 "incheckningen"

1004

1004 -#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168

1005 -#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911

1006 -#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369

1005 +#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1179

1006 +#: sequencer.c:2367 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918

1007 +#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369

1008 #: builtin/shortlog.c:191

1009 msgid "revision walk setup failed"

1010 msgstr "misslyckades skapa revisionstraversering"

@@ -1099,31 +1100,31 @@ msgstr "Kan inte skriva inställningar för uppströmsgren"

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

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

1102

1102 -#: branch.c:185

1103 +#: branch.c:189

1104 #, c-format

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

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

1107

1107 -#: branch.c:190

1108 +#: branch.c:208

1109 #, c-format

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

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

1112

1112 -#: branch.c:197

1113 +#: branch.c:213

1114 msgid "Cannot force update the current branch."

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

1116

1116 -#: branch.c:217

1117 +#: branch.c:233

1118 #, c-format

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

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

1121

1121 -#: branch.c:219

1122 +#: branch.c:235

1123 #, c-format

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

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

1126

1126 -#: branch.c:221

1127 +#: branch.c:237

1128 msgid ""

1129 "\n"

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

@@ -1143,27 +1144,27 @@ msgstr ""

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

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

1146

1146 -#: branch.c:264

1147 +#: branch.c:280

1148 #, c-format

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

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

1151

1151 -#: branch.c:284

1152 +#: branch.c:300

1153 #, c-format

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

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

1156

1156 -#: branch.c:289

1157 +#: branch.c:305

1158 #, c-format

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

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

1161

1161 -#: branch.c:343

1162 +#: branch.c:359

1163 #, c-format

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

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

1166

1166 -#: branch.c:366

1167 +#: branch.c:382

1168 #, c-format

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

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

@@ -1178,9 +1179,8 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"

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

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

1181

1181 -#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500

1182 -#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807

1183 -#: sequencer.c:2949 builtin/commit.c:782

1182 +#: bundle.c:88 sequencer.c:1357 sequencer.c:1804 sequencer.c:2631

1183 +#: sequencer.c:2657 sequencer.c:2748 sequencer.c:2850 builtin/commit.c:782

1184 #, c-format

1185 msgid "could not open '%s'"

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

@@ -1224,7 +1224,7 @@ msgstr "rev-list dog"

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

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

1226

1227 -#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296

1227 +#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296

1228 #, c-format

1229 msgid "unrecognized argument: %s"

1230 msgstr "okänt argument: %s"

@@ -1247,8 +1247,8 @@ msgstr "index-pack dog"

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

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

1249

1250 -#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465

1251 -#: builtin/am.c:1467 builtin/am.c:2105

1250 +#: commit.c:41 sequencer.c:1611 builtin/am.c:421 builtin/am.c:465

1251 +#: builtin/am.c:1471 builtin/am.c:2106

1252 #, c-format

1253 msgid "could not parse %s"

1254 msgstr "kunde inte tolka %s"

@@ -1258,7 +1258,7 @@ msgstr "kunde inte tolka %s"

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

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

1260

1261 -#: commit.c:1517

1261 +#: commit.c:1524

1262 msgid ""

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

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

@@ -1268,173 +1268,178 @@ msgstr ""

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

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

1270

1271 -#: compat/obstack.c:406 compat/obstack.c:408

1271 +#: compat/obstack.c:405 compat/obstack.c:407

1272 msgid "memory exhausted"

1273 msgstr "minnet slut"

1274

1275 -#: config.c:187

1275 +#: config.c:186

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

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

1278

1279 -#: config.c:721

1279 +#: config.c:720

1280 #, c-format

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

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

1283

1284 -#: config.c:725

1284 +#: config.c:724

1285 #, c-format

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

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

1288

1289 -#: config.c:729

1289 +#: config.c:728

1290 #, c-format

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

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

1293

1294 -#: config.c:733

1294 +#: config.c:732

1295 #, c-format

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

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

1298

1299 -#: config.c:737

1299 +#: config.c:736

1300 #, c-format

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

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

1303

1304 -#: config.c:741

1304 +#: config.c:740

1305 #, c-format

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

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

1308

1309 -#: config.c:869

1309 +#: config.c:868

1310 msgid "out of range"

1311 msgstr "utanför intervallet"

1312

1313 -#: config.c:869

1313 +#: config.c:868

1314 msgid "invalid unit"

1315 msgstr "ogiltig enhet"

1316

1317 -#: config.c:875

1317 +#: config.c:874

1318 #, c-format

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

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

1321

1322 -#: config.c:880

1322 +#: config.c:879

1323 #, c-format

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

1325 msgstr ""

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

1327

1328 -#: config.c:883

1328 +#: config.c:882

1329 #, c-format

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

1331 msgstr ""

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

1333

1334 -#: config.c:886

1334 +#: config.c:885

1335 #, c-format

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

1337 msgstr ""

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

1339

1340 -#: config.c:889

1340 +#: config.c:888

1341 #, c-format

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

1343 msgstr ""

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

1345 "en %s: %s"

1346

1347 -#: config.c:892

1347 +#: config.c:891

1348 #, c-format

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

1350 msgstr ""

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

1352 "%s: %s"

1353

1354 -#: config.c:895

1354 +#: config.c:894

1355 #, c-format

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

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

1358

1359 -#: config.c:990

1359 +#: config.c:989

1360 #, c-format

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

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

1363

1364 -#: config.c:1085 config.c:1096

1364 +#: config.c:998

1365 +#, c-format

1366 +msgid "'%s' for '%s' is not a valid timestamp"

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

1368 +

1369 +#: config.c:1094 config.c:1105

1370 #, c-format

1371 msgid "bad zlib compression level %d"

1372 msgstr "felaktigt zlib-komprimeringsgrad %d"

1373

1369 -#: config.c:1213

1374 +#: config.c:1222

1375 #, c-format

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

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

1378

1374 -#: config.c:1372

1379 +#: config.c:1378

1380 #, c-format

1381 msgid "bad pack compression level %d"

1382 msgstr "felaktig paketkomprimeringsgrad %d"

1383

1379 -#: config.c:1568

1384 +#: config.c:1574

1385 msgid "unable to parse command-line config"

1386 msgstr "kan inte tolka kommandoradskonfiguration"

1387

1383 -#: config.c:1900

1388 +#: config.c:1906

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

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

1391

1387 -#: config.c:2087

1392 +#: config.c:2093

1393 #, c-format

1394 msgid "Invalid %s: '%s'"

1395 msgstr "Felaktigt %s: \"%s\""

1396

1392 -#: config.c:2130

1397 +#: config.c:2136

1398 #, c-format

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

1400 msgstr ""

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

1402

1398 -#: config.c:2156

1403 +#: config.c:2162

1404 #, c-format

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

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

1407

1403 -#: config.c:2167

1408 +#: config.c:2187

1409 #, c-format

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

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

1412

1408 -#: config.c:2169

1413 +#: config.c:2189

1414 #, c-format

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

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

1417

1413 -#: config.c:2228

1418 +#: config.c:2248

1419 #, c-format

1420 msgid "%s has multiple values"

1421 msgstr "%s har flera värden"

1422

1418 -#: config.c:2571 config.c:2789

1423 +#: config.c:2591 config.c:2808

1424 #, c-format

1425 msgid "fstat on %s failed"

1426 msgstr "fstat misslyckades på %s"

1427

1423 -#: config.c:2678

1428 +#: config.c:2698

1429 #, c-format

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

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

1432

1428 -#: config.c:2680 builtin/remote.c:776

1433 +#: config.c:2700 builtin/remote.c:776

1434 #, c-format

1435 msgid "could not unset '%s'"

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

1437

1433 -#: connect.c:50

1438 +#: connect.c:52

1439 msgid "The remote end hung up upon initial contact"

1440 msgstr "Fjärren lade på vid inledande kontakt"

1441

1437 -#: connect.c:52

1442 +#: connect.c:54

1443 msgid ""

1444 "Could not read from remote repository.\n"

1445 "\n"

@@ -1565,7 +1570,7 @@ msgstr[1] "%<PRIuMAX> år sedan"

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

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

1572

1568 -#: diffcore-rename.c:536

1573 +#: diffcore-rename.c:535

1574 msgid "Performing inexact rename detection"

1575 msgstr "Utför onöjaktig namnbytesdetektering"

1576

@@ -1597,7 +1602,7 @@ msgstr ""

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

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

1604

1600 -#: diff.c:398

1605 +#: diff.c:401

1606 #, c-format

1607 msgid ""

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

@@ -1606,20 +1611,20 @@ msgstr ""

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

1612 "%s"

1613

1609 -#: diff.c:3861

1614 +#: diff.c:3799

1615 #, c-format

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

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

1618

1614 -#: diff.c:4189

1619 +#: diff.c:4127

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

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

1622

1618 -#: diff.c:4279

1623 +#: diff.c:4215

1624 msgid "--follow requires exactly one pathspec"

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

1626

1622 -#: diff.c:4445

1627 +#: diff.c:4381

1628 #, c-format

1629 msgid ""

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

@@ -1628,50 +1633,55 @@ msgstr ""

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

1634 "%s"

1635

1631 -#: diff.c:4459

1636 +#: diff.c:4395

1637 #, c-format

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

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

1640

1636 -#: diff.c:5505

1641 +#: diff.c:5446

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

1643 msgstr ""

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

1645

1641 -#: diff.c:5508

1646 +#: diff.c:5449

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

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

1649

1645 -#: diff.c:5511

1650 +#: diff.c:5452

1651 #, c-format

1652 msgid ""

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

1654 msgstr ""

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

1656

1652 -#: dir.c:1983

1657 +#: dir.c:2100

1658 msgid "failed to get kernel name and information"

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

1660

1656 -#: dir.c:2102

1661 +#: dir.c:2219

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

1663 msgstr "Ospårad cache är inaktiverad på systemet eller platsen."

1664

1660 -#: dir.c:2885 dir.c:2890

1665 +#: dir.c:3002 dir.c:3007

1666 #, c-format

1667 msgid "could not create directories for %s"

1668 msgstr "kunde inte skapa kataloger för %s"

1669

1665 -#: dir.c:2915

1670 +#: dir.c:3032

1671 #, c-format

1672 msgid "could not migrate git directory from '%s' to '%s'"

1673 msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""

1674

1670 -#: entry.c:176

1675 +#: editor.c:61

1676 +#, c-format

1677 +msgid "hint: Waiting for your editor to close the file...%c"

1678 +msgstr "tips: Väntar på att textredigeringsprogrammet skall stänga filen...%c"

1679 +

1680 +#: entry.c:177

1681 msgid "Filtering content"

1682 msgstr "Filtrerar innehåll"

1683

1674 -#: entry.c:433

1684 +#: entry.c:435

1685 #, c-format

1686 msgid "could not stat file '%s'"

1687 msgstr "kunde inte ta status på filen \"%s\""

@@ -1742,7 +1752,7 @@ msgstr "ogiltig incheckning %s"

1752 msgid "giving up"

1753 msgstr "ger upp"

1754

1745 -#: fetch-pack.c:534 progress.c:242

1755 +#: fetch-pack.c:534 progress.c:229

1756 msgid "done"

1757 msgstr "klart"

1758

@@ -1756,104 +1766,104 @@ msgstr "fick %s (%d) %s"

1766 msgid "Marking %s as complete"

1767 msgstr "Markerar %s som komplett"

1768

1759 -#: fetch-pack.c:776

1769 +#: fetch-pack.c:777

1770 #, c-format

1771 msgid "already have %s (%s)"

1772 msgstr "har redan %s (%s)"

1773

1764 -#: fetch-pack.c:814

1774 +#: fetch-pack.c:815

1775 msgid "fetch-pack: unable to fork off sideband demultiplexer"

1776 msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"

1777

1768 -#: fetch-pack.c:822

1778 +#: fetch-pack.c:823

1779 msgid "protocol error: bad pack header"

1780 msgstr "protokollfel: felaktigt packhuvud"

1781

1772 -#: fetch-pack.c:878

1782 +#: fetch-pack.c:879

1783 #, c-format

1784 msgid "fetch-pack: unable to fork off %s"

1785 msgstr "fetch-patch: kunde inte grena av %s"

1786

1777 -#: fetch-pack.c:894

1787 +#: fetch-pack.c:895

1788 #, c-format

1789 msgid "%s failed"

1790 msgstr "%s misslyckades"

1791

1782 -#: fetch-pack.c:896

1792 +#: fetch-pack.c:897

1793 msgid "error in sideband demultiplexer"

1794 msgstr "fel i sidbands-avmultiplexare"

1795

1786 -#: fetch-pack.c:923

1796 +#: fetch-pack.c:924

1797 msgid "Server does not support shallow clients"

1798 msgstr "Servern stöder inte klienter med grunda arkiv"

1799

1790 -#: fetch-pack.c:927

1800 +#: fetch-pack.c:928

1801 msgid "Server supports multi_ack_detailed"

1802 msgstr "Servern stöder \"multi_ack_detailed\""

1803

1794 -#: fetch-pack.c:930

1804 +#: fetch-pack.c:931

1805 msgid "Server supports no-done"

1806 msgstr "Servern stöder \"no-done\""

1807

1798 -#: fetch-pack.c:936

1808 +#: fetch-pack.c:937

1809 msgid "Server supports multi_ack"

1810 msgstr "Servern stöder \"multi_ack\""

1811

1802 -#: fetch-pack.c:940

1812 +#: fetch-pack.c:941

1813 msgid "Server supports side-band-64k"

1814 msgstr "Servern stöder \"side-band-64k\""

1815

1806 -#: fetch-pack.c:944

1816 +#: fetch-pack.c:945

1817 msgid "Server supports side-band"

1818 msgstr "Servern stöder \"side-band\""

1819

1810 -#: fetch-pack.c:948

1820 +#: fetch-pack.c:949

1821 msgid "Server supports allow-tip-sha1-in-want"

1822 msgstr "Servern stöder \"allow-tip-sha1-in-want\""

1823

1814 -#: fetch-pack.c:952

1824 +#: fetch-pack.c:953

1825 msgid "Server supports allow-reachable-sha1-in-want"

1826 msgstr "Servern stöder \"allow-reachable-sha1-in-want\""

1827

1818 -#: fetch-pack.c:962

1828 +#: fetch-pack.c:963

1829 msgid "Server supports ofs-delta"

1830 msgstr "Servern stöder \"ofs-delta\""

1831

1822 -#: fetch-pack.c:969

1832 +#: fetch-pack.c:970

1833 #, c-format

1834 msgid "Server version is %.*s"

1835 msgstr "Serverversionen är %.*s"

1836

1827 -#: fetch-pack.c:975

1837 +#: fetch-pack.c:976

1838 msgid "Server does not support --shallow-since"

1839 msgstr "Servern stöder inte --shallow-since"

1840

1831 -#: fetch-pack.c:979

1841 +#: fetch-pack.c:980

1842 msgid "Server does not support --shallow-exclude"

1843 msgstr "Servern stöder inte --shallow-exclude"

1844

1835 -#: fetch-pack.c:981

1845 +#: fetch-pack.c:982

1846 msgid "Server does not support --deepen"

1847 msgstr "Servern stöder inte --deepen"

1848

1839 -#: fetch-pack.c:992

1849 +#: fetch-pack.c:993

1850 msgid "no common commits"

1851 msgstr "inga gemensamma incheckningar"

1852

1843 -#: fetch-pack.c:1004

1853 +#: fetch-pack.c:1005

1854 msgid "git fetch-pack: fetch failed."

1855 msgstr "git fetch-patch: hämtning misslyckades."

1856

1847 -#: fetch-pack.c:1166

1857 +#: fetch-pack.c:1167

1858 msgid "no matching remote head"

1859 msgstr "inget motsvarande fjärrhuvud"

1860

1851 -#: fetch-pack.c:1188

1861 +#: fetch-pack.c:1189

1862 #, c-format

1863 msgid "no such remote ref %s"

1864 msgstr "ingen sådan fjärreferens: %s"

1865

1856 -#: fetch-pack.c:1191

1866 +#: fetch-pack.c:1192

1867 #, c-format

1868 msgid "Server does not allow request for unadvertised object %s"

1869 msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"

@@ -1876,17 +1886,17 @@ msgstr "misslyckades skriva fristående signatur till \"%s\""

1886 msgid "ignore invalid color '%.*s' in log.graphColors"

1887 msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"

1888

1879 -#: grep.c:1970

1889 +#: grep.c:2017

1890 #, c-format

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

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

1893

1884 -#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134

1894 +#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134

1895 #, c-format

1896 msgid "failed to stat '%s'"

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

1898

1889 -#: grep.c:1998

1899 +#: grep.c:2045

1900 #, c-format

1901 msgid "'%s': short read"

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

@@ -1956,12 +1966,12 @@ msgstr[1] ""

1966 msgid "git version [<options>]"

1967 msgstr "git version [<flaggor>]"

1968

1959 -#: help.c:456

1969 +#: help.c:462

1970 #, c-format

1971 msgid "%s: %s - %s"

1972 msgstr "%s: %s - %s"

1973

1964 -#: help.c:460

1974 +#: help.c:466

1975 msgid ""

1976 "\n"

1977 "Did you mean this?"

@@ -2034,6 +2044,15 @@ msgstr "namnet består enbart av ej tillåtna tecken: %s"

2044 msgid "invalid date format: %s"

2045 msgstr "felaktigt datumformat: %s"

2046

2047 +#: list-objects-filter-options.c:30

2048 +msgid "multiple object filter types cannot be combined"

2049 +msgstr "flera objektfiltertyper kan inte kombineras"

2050 +

2051 +#: list-objects-filter-options.c:41 list-objects-filter-options.c:68

2052 +#, c-format

2053 +msgid "invalid filter-spec expression '%s'"

2054 +msgstr "ogiltig filterspec-utryck \"%s\""

2055 +

2056 #: lockfile.c:151

2057 #, c-format

2058 msgid ""

@@ -2063,8 +2082,8 @@ msgstr "Kunde inte skapa \"%s.lock\": %s"

2082 msgid "failed to read the cache"

2083 msgstr "misslyckades läsa cachen"

2084

2066 -#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380

2067 -#: builtin/checkout.c:595 builtin/clone.c:754

2085 +#: merge.c:95 builtin/am.c:1980 builtin/am.c:2014 builtin/checkout.c:379

2086 +#: builtin/checkout.c:600 builtin/clone.c:754

2087 msgid "unable to write new index file"

2088 msgstr "kunde inte skriva ny indexfil"

2089

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

2277 msgid "Auto-merging %s"

2278 msgstr "Slår ihop %s automatiskt"

2279

2261 -#: merge-recursive.c:1775 git-submodule.sh:944

2280 +#: merge-recursive.c:1775 git-submodule.sh:932

2281 msgid "submodule"

2282 msgstr "undermodul"

2283

@@ -2280,47 +2299,47 @@ msgstr "fil/katalog"

2299 msgid "directory/file"

2300 msgstr "katalog/fil"

2301

2283 -#: merge-recursive.c:1908

2302 +#: merge-recursive.c:1909

2303 #, c-format

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

2305 msgstr ""

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

2307

2289 -#: merge-recursive.c:1917

2308 +#: merge-recursive.c:1918

2309 #, c-format

2310 msgid "Adding %s"

2311 msgstr "Lägger till %s"

2312

2294 -#: merge-recursive.c:1954

2313 +#: merge-recursive.c:1955

2314 msgid "Already up to date!"

2315 msgstr "Redan à jour!"

2316

2298 -#: merge-recursive.c:1963

2317 +#: merge-recursive.c:1964

2318 #, c-format

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

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

2321

2303 -#: merge-recursive.c:2060

2322 +#: merge-recursive.c:2061

2323 msgid "Merging:"

2324 msgstr "Slår ihop:"

2325

2307 -#: merge-recursive.c:2073

2326 +#: merge-recursive.c:2074

2327 #, c-format

2328 msgid "found %u common ancestor:"

2329 msgid_plural "found %u common ancestors:"

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

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

2332

2314 -#: merge-recursive.c:2112

2333 +#: merge-recursive.c:2113

2334 msgid "merge returned no commit"

2335 msgstr "sammanslagningen returnerade ingen incheckning"

2336

2318 -#: merge-recursive.c:2175

2337 +#: merge-recursive.c:2176

2338 #, c-format

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

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

2341

2323 -#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814

2342 +#: merge-recursive.c:2190 builtin/merge.c:656 builtin/merge.c:815

2343 msgid "Unable to write index."

2344 msgstr "Kunde inte skriva indexet."

2345

@@ -2488,15 +2507,7 @@ msgstr "\"%s\" (minnesstöd: \"%c\")"

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

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

2509

2491 -#: pathspec.c:571

2492 -msgid ""

2493 -"empty strings as pathspecs will be made invalid in upcoming releases. please "

2494 -"use . instead if you meant to match all paths"

2495 -msgstr ""

2496 -"tomma strängar som sökvägsangivelser kommer bli ogiltiga i en kommande "

2497 -"utgåva. använd istället . om du vill träffa alla sökvägar"

2498 -

2499 -#: pathspec.c:595

2510 +#: pathspec.c:592

2511 #, c-format

2512 msgid "pathspec '%s' is beyond a symbolic link"

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

@@ -2505,7 +2516,7 @@ msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"

2516 msgid "unable to parse --pretty format"

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

2518

2508 -#: read-cache.c:1443

2519 +#: read-cache.c:1472

2520 #, c-format

2521 msgid ""

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

@@ -2514,7 +2525,7 @@ msgstr ""

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

2526 "Använder version %i"

2527

2517 -#: read-cache.c:1453

2528 +#: read-cache.c:1482

2529 #, c-format

2530 msgid ""

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

@@ -2523,52 +2534,52 @@ msgstr ""

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

2535 "Använder version %i"

2536

2526 -#: read-cache.c:2316 builtin/merge.c:1046

2537 +#: read-cache.c:2370 sequencer.c:2725 wrapper.c:658 builtin/merge.c:1048

2538 #, c-format

2539 msgid "could not close '%s'"

2540 msgstr "kunde inte stänga \"%s\""

2541

2531 -#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077

2542 +#: read-cache.c:2442 sequencer.c:1366 sequencer.c:2093

2543 #, c-format

2544 msgid "could not stat '%s'"

2545 msgstr "kunde inte ta status på \"%s\""

2546

2536 -#: read-cache.c:2407

2547 +#: read-cache.c:2455

2548 #, c-format

2549 msgid "unable to open git dir: %s"

2550 msgstr "kunde inte öppna git-katalog: %s"

2551

2541 -#: read-cache.c:2419

2552 +#: read-cache.c:2467

2553 #, c-format

2554 msgid "unable to unlink: %s"

2555 msgstr "misslyckades ta bort länken: %s"

2556

2546 -#: refs.c:638

2557 +#: refs.c:706

2558 #, c-format

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

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

2561

2551 -#: refs.c:1792

2562 +#: refs.c:1850

2563 msgid "ref updates forbidden inside quarantine environment"

2564 msgstr "referensuppdateringar förbjudna i karantänmiljö"

2565

2555 -#: refs/files-backend.c:1136

2566 +#: refs/files-backend.c:1189

2567 #, c-format

2568 msgid "could not remove reference %s"

2569 msgstr "kunde inte ta bort referensen %s"

2570

2560 -#: refs/files-backend.c:1150 refs/packed-backend.c:1430

2561 -#: refs/packed-backend.c:1440

2571 +#: refs/files-backend.c:1203 refs/packed-backend.c:1524

2572 +#: refs/packed-backend.c:1534

2573 #, c-format

2574 msgid "could not delete reference %s: %s"

2575 msgstr "kunde inte ta bort referensen %s: %s"

2576

2566 -#: refs/files-backend.c:1153 refs/packed-backend.c:1443

2577 +#: refs/files-backend.c:1206 refs/packed-backend.c:1537

2578 #, c-format

2579 msgid "could not delete references: %s"

2580 msgstr "kunde inte ta bort referenser: %s"

2581

2571 -#: ref-filter.c:35 wt-status.c:1811

2582 +#: ref-filter.c:35 wt-status.c:1816

2583 msgid "gone"

2584 msgstr "försvunnen"

2585

@@ -2587,157 +2598,157 @@ msgstr "bakom %d"

2598 msgid "ahead %d, behind %d"

2599 msgstr "före %d, bakom %d"

2600

2590 -#: ref-filter.c:105

2601 +#: ref-filter.c:107

2602 #, c-format

2603 msgid "expected format: %%(color:<color>)"

2604 msgstr "förväntat format: %%(color:<color>)"

2605

2595 -#: ref-filter.c:107

2606 +#: ref-filter.c:109

2607 #, c-format

2608 msgid "unrecognized color: %%(color:%s)"

2609 msgstr "okänd färg: %%(color:%s)"

2610

2600 -#: ref-filter.c:127

2611 +#: ref-filter.c:129

2612 #, c-format

2613 msgid "Integer value expected refname:lstrip=%s"

2614 msgstr "Heltalsvärde förväntades refname:lstrip=%s"

2615

2605 -#: ref-filter.c:131

2616 +#: ref-filter.c:133

2617 #, c-format

2618 msgid "Integer value expected refname:rstrip=%s"

2619 msgstr "Heltalsvärde förväntades refname:rstrip=%s"

2620

2610 -#: ref-filter.c:133

2621 +#: ref-filter.c:135

2622 #, c-format

2623 msgid "unrecognized %%(%s) argument: %s"

2624 msgstr "okänt %%(%s)-argument: %s"

2625

2615 -#: ref-filter.c:173

2626 +#: ref-filter.c:184

2627 #, c-format

2628 msgid "%%(body) does not take arguments"

2629 msgstr "%%(body) tar inte argument"

2630

2620 -#: ref-filter.c:180

2631 +#: ref-filter.c:191

2632 #, c-format

2633 msgid "%%(subject) does not take arguments"

2634 msgstr "%%(subject) tar inte argument"

2635

2625 -#: ref-filter.c:198

2636 +#: ref-filter.c:209

2637 #, c-format

2638 msgid "unknown %%(trailers) argument: %s"

2639 msgstr "okänt %%(trailers)-argument: %s"

2640

2630 -#: ref-filter.c:221

2641 +#: ref-filter.c:232

2642 #, c-format

2643 msgid "positive value expected contents:lines=%s"

2644 msgstr "positivt värde förväntat contents:lines=%s"

2645

2635 -#: ref-filter.c:223

2646 +#: ref-filter.c:234

2647 #, c-format

2648 msgid "unrecognized %%(contents) argument: %s"

2649 msgstr "okänt %%(contents)-argument: %s"

2650

2640 -#: ref-filter.c:236

2651 +#: ref-filter.c:247

2652 #, c-format

2653 msgid "positive value expected objectname:short=%s"

2654 msgstr "positivt värde förväntat objectname:short=%s"

2655

2645 -#: ref-filter.c:240

2656 +#: ref-filter.c:251

2657 #, c-format

2658 msgid "unrecognized %%(objectname) argument: %s"

2659 msgstr "okänt %%(objectname)-argument: %s"

2660

2650 -#: ref-filter.c:267

2661 +#: ref-filter.c:278

2662 #, c-format

2663 msgid "expected format: %%(align:<width>,<position>)"

2664 msgstr "förväntat format: %%(align:<bredd>,<position>)"

2665

2655 -#: ref-filter.c:279

2666 +#: ref-filter.c:290

2667 #, c-format

2668 msgid "unrecognized position:%s"

2669 msgstr "okänd position:%s"

2670

2660 -#: ref-filter.c:283

2671 +#: ref-filter.c:294

2672 #, c-format

2673 msgid "unrecognized width:%s"

2674 msgstr "okänd bredd:%s"

2675

2665 -#: ref-filter.c:289

2676 +#: ref-filter.c:300

2677 #, c-format

2678 msgid "unrecognized %%(align) argument: %s"

2679 msgstr "okänt %%(align)-argument: %s"

2680

2670 -#: ref-filter.c:293

2681 +#: ref-filter.c:304

2682 #, c-format

2683 msgid "positive width expected with the %%(align) atom"

2684 msgstr "positiv bredd förväntad med atomen %%(align)"

2685

2675 -#: ref-filter.c:308

2686 +#: ref-filter.c:319

2687 #, c-format

2688 msgid "unrecognized %%(if) argument: %s"

2689 msgstr "okänt %%(if)-argument: %s"

2690

2680 -#: ref-filter.c:398

2691 +#: ref-filter.c:409

2692 #, c-format

2693 msgid "malformed field name: %.*s"

2694 msgstr "felformat fältnamn: %.*s"

2695

2685 -#: ref-filter.c:424

2696 +#: ref-filter.c:435

2697 #, c-format

2698 msgid "unknown field name: %.*s"

2699 msgstr "okänt fältnamn: %.*s"

2700

2690 -#: ref-filter.c:536

2701 +#: ref-filter.c:547

2702 #, c-format

2703 msgid "format: %%(if) atom used without a %%(then) atom"

2704 msgstr "format: atomen %%(if) använd utan en %%(then)-atom"

2705

2695 -#: ref-filter.c:596

2706 +#: ref-filter.c:607

2707 #, c-format

2708 msgid "format: %%(then) atom used without an %%(if) atom"

2709 msgstr "format: atomen %%(then) använd utan en %%(if)-atom"

2710

2700 -#: ref-filter.c:598

2711 +#: ref-filter.c:609

2712 #, c-format

2713 msgid "format: %%(then) atom used more than once"

2714 msgstr "format: atomen %%(then) använd mer än en gång"

2715

2705 -#: ref-filter.c:600

2716 +#: ref-filter.c:611

2717 #, c-format

2718 msgid "format: %%(then) atom used after %%(else)"

2719 msgstr "format: atomen %%(then) använd efter %%(else)"

2720

2710 -#: ref-filter.c:626

2721 +#: ref-filter.c:637

2722 #, c-format

2723 msgid "format: %%(else) atom used without an %%(if) atom"

2724 msgstr "format: atomen %%(else) använd utan en %%(if)-atom"

2725

2715 -#: ref-filter.c:628

2726 +#: ref-filter.c:639

2727 #, c-format

2728 msgid "format: %%(else) atom used without a %%(then) atom"

2729 msgstr "format: atomen %%(else) använd utan en %%(then)-atom"

2730

2720 -#: ref-filter.c:630

2731 +#: ref-filter.c:641

2732 #, c-format

2733 msgid "format: %%(else) atom used more than once"

2734 msgstr "format: atomen %%(else) använd mer än en gång"

2735

2725 -#: ref-filter.c:643

2736 +#: ref-filter.c:654

2737 #, c-format

2738 msgid "format: %%(end) atom used without corresponding atom"

2739 msgstr "format: atomen %%(end) använd utan motsvarande atom"

2740

2730 -#: ref-filter.c:698

2741 +#: ref-filter.c:709

2742 #, c-format

2743 msgid "malformed format string %s"

2744 msgstr "felformad formatsträng %s"

2745

2735 -#: ref-filter.c:1283

2746 +#: ref-filter.c:1313

2747 #, c-format

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

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

2750

2740 -#: ref-filter.c:1286

2751 +#: ref-filter.c:1316

2752 #, c-format

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

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

@@ -2745,7 +2756,7 @@ msgstr "(ingen gren, \"bisect\" startad på %s)"

2756 #. TRANSLATORS: make sure this matches "HEAD

2757 #. detached at " in wt-status.c

2758 #.

2748 -#: ref-filter.c:1294

2759 +#: ref-filter.c:1324

2760 #, c-format

2761 msgid "(HEAD detached at %s)"

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

@@ -2753,137 +2764,137 @@ msgstr "(HEAD frånkopplat vid %s)"

2764 #. TRANSLATORS: make sure this matches "HEAD

2765 #. detached from " in wt-status.c

2766 #.

2756 -#: ref-filter.c:1301

2767 +#: ref-filter.c:1331

2768 #, c-format

2769 msgid "(HEAD detached from %s)"

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

2771

2761 -#: ref-filter.c:1305

2772 +#: ref-filter.c:1335

2773 msgid "(no branch)"

2774 msgstr "(ingen gren)"

2775

2765 -#: ref-filter.c:1454 ref-filter.c:1485

2776 +#: ref-filter.c:1488 ref-filter.c:1519

2777 #, c-format

2778 msgid "missing object %s for %s"

2779 msgstr "objektet %s saknas för %s"

2780

2770 -#: ref-filter.c:1457 ref-filter.c:1488

2781 +#: ref-filter.c:1491 ref-filter.c:1522

2782 #, c-format

2783 msgid "parse_object_buffer failed on %s for %s"

2784 msgstr "parse_object_buffer misslyckades på %s för %s"

2785

2775 -#: ref-filter.c:1788

2786 +#: ref-filter.c:1822

2787 #, c-format

2788 msgid "malformed object at '%s'"

2789 msgstr "felformat objekt vid \"%s\""

2790

2780 -#: ref-filter.c:1855

2791 +#: ref-filter.c:1889

2792 #, c-format

2793 msgid "ignoring ref with broken name %s"

2794 msgstr "ignorerar referens med trasigt namn %s"

2795

2785 -#: ref-filter.c:1860

2796 +#: ref-filter.c:1894

2797 #, c-format

2798 msgid "ignoring broken ref %s"

2799 msgstr "ignorerar trasig referens %s"

2800

2790 -#: ref-filter.c:2122

2801 +#: ref-filter.c:2156

2802 #, c-format

2803 msgid "format: %%(end) atom missing"

2804 msgstr "format: atomen %%(end) saknas"

2805

2795 -#: ref-filter.c:2216

2806 +#: ref-filter.c:2250

2807 #, c-format

2808 msgid "malformed object name %s"

2809 msgstr "felformat objektnamn %s"

2810

2800 -#: remote.c:750

2811 +#: remote.c:780

2812 #, c-format

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

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

2815

2805 -#: remote.c:754

2816 +#: remote.c:784

2817 #, c-format

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

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

2820

2810 -#: remote.c:758

2821 +#: remote.c:788

2822 #, c-format

2823 msgid "%s tracks both %s and %s"

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

2825

2815 -#: remote.c:766

2826 +#: remote.c:796

2827 msgid "Internal error"

2828 msgstr "Internt fel"

2829

2819 -#: remote.c:1681 remote.c:1783

2830 +#: remote.c:1711 remote.c:1813

2831 msgid "HEAD does not point to a branch"

2832 msgstr "HEAD pekar inte på en gren"

2833

2823 -#: remote.c:1690

2834 +#: remote.c:1720

2835 #, c-format

2836 msgid "no such branch: '%s'"

2837 msgstr "okänd gren: \"%s\""

2838

2828 -#: remote.c:1693

2839 +#: remote.c:1723

2840 #, c-format

2841 msgid "no upstream configured for branch '%s'"

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

2843

2833 -#: remote.c:1699

2844 +#: remote.c:1729

2845 #, c-format

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

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

2848

2838 -#: remote.c:1714

2849 +#: remote.c:1744

2850 #, c-format

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

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

2853

2843 -#: remote.c:1726

2854 +#: remote.c:1756

2855 #, c-format

2856 msgid "branch '%s' has no remote for pushing"

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

2858

2848 -#: remote.c:1737

2859 +#: remote.c:1767

2860 #, c-format

2861 msgid "push refspecs for '%s' do not include '%s'"

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

2863

2853 -#: remote.c:1750

2864 +#: remote.c:1780

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

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

2867

2857 -#: remote.c:1772

2868 +#: remote.c:1802

2869 msgid "cannot resolve 'simple' push to a single destination"

2870 msgstr "\"enkel push\" motsvarar flera olika mål"

2871

2861 -#: remote.c:2076

2872 +#: remote.c:2106

2873 #, c-format

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

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

2876

2866 -#: remote.c:2080

2877 +#: remote.c:2110

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

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

2880

2870 -#: remote.c:2083

2881 +#: remote.c:2113

2882 #, c-format

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

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

2885

2875 -#: remote.c:2087

2886 +#: remote.c:2117

2887 #, c-format

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

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

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

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

2892

2882 -#: remote.c:2093

2893 +#: remote.c:2123

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

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

2896

2886 -#: remote.c:2096

2897 +#: remote.c:2126

2898 #, c-format

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

2900 msgid_plural ""

@@ -2893,11 +2904,11 @@ msgstr[0] ""

2904 msgstr[1] ""

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

2906

2896 -#: remote.c:2104

2907 +#: remote.c:2134

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

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

2910

2900 -#: remote.c:2107

2911 +#: remote.c:2137

2912 #, c-format

2913 msgid ""

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

@@ -2912,27 +2923,36 @@ msgstr[1] ""

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

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

2925

2915 -#: remote.c:2117

2926 +#: remote.c:2147

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

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

2929

2919 -#: revision.c:2256

2930 +#: revision.c:2268

2931 msgid "your current branch appears to be broken"

2932 msgstr "din nuvarande gren verkar vara trasig"

2933

2923 -#: revision.c:2259

2934 +#: revision.c:2271

2935 #, c-format

2936 msgid "your current branch '%s' does not have any commits yet"

2937 msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"

2938

2928 -#: revision.c:2453

2939 +#: revision.c:2465

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

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

2942

2932 -#: run-command.c:644

2943 +#: run-command.c:645

2944 msgid "open /dev/null failed"

2945 msgstr "misslyckades öppna /dev/null"

2946

2947 +#: run-command.c:1188

2948 +#, c-format

2949 +msgid ""

2950 +"The '%s' hook was ignored because it's not set as executable.\n"

2951 +"You can disable this warning with `git config advice.ignoredHook false`."

2952 +msgstr ""

2953 +"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"

2954 +"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."

2955 +

2956 #: send-pack.c:151

2957 #, c-format

2958 msgid "unable to parse remote unpack status: %s"

@@ -3002,13 +3022,13 @@ msgstr ""

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

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

3024

3005 -#: sequencer.c:297 sequencer.c:1704

3025 +#: sequencer.c:297 sequencer.c:1715

3026 #, c-format

3027 msgid "could not lock '%s'"

3028 msgstr "kunde inte låsa \"%s\""

3029

3010 -#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723

3011 -#: sequencer.c:2733 sequencer.c:2749

3030 +#: sequencer.c:300 sequencer.c:1592 sequencer.c:1720 sequencer.c:1734

3031 +#: sequencer.c:2723 sequencer.c:2794 wrapper.c:656

3032 #, c-format

3033 msgid "could not write to '%s'"

3034 msgstr "kunde inte skriva till \"%s\""

@@ -3018,13 +3038,13 @@ msgstr "kunde inte skriva till \"%s\""

3038 msgid "could not write eol to '%s'"

3039 msgstr "kunde inte skriva radslut till \"%s\""

3040

3021 -#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711

3041 +#: sequencer.c:308 sequencer.c:1597 sequencer.c:1722

3042 #, c-format

3043 msgid "failed to finalize '%s'."

3044 msgstr "misslyckades färdigställa \"%s\"."

3045

3026 -#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259

3027 -#: builtin/commit.c:754 builtin/merge.c:1044

3046 +#: sequencer.c:332 sequencer.c:829 sequencer.c:1618 builtin/am.c:259

3047 +#: builtin/commit.c:754 builtin/merge.c:1046

3048 #, c-format

3049 msgid "could not read '%s'"

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

@@ -3046,20 +3066,20 @@ msgstr "%s: snabbspola"

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

3067 #. "rebase -i".

3068 #.

3049 -#: sequencer.c:474

3069 +#: sequencer.c:477

3070 #, c-format

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

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

3073

3054 -#: sequencer.c:493

3074 +#: sequencer.c:496

3075 msgid "could not resolve HEAD commit\n"

3076 msgstr "kunde inte bestämma HEAD:s incheckning\n"

3077

3058 -#: sequencer.c:513

3078 +#: sequencer.c:516

3079 msgid "unable to update cache tree\n"

3080 msgstr "kan inte uppdatera cacheträd\n"

3081

3062 -#: sequencer.c:597

3082 +#: sequencer.c:600

3083 #, c-format

3084 msgid ""

3085 "you have staged changes in your working tree\n"

@@ -3088,17 +3108,17 @@ msgstr ""

3108 "\n"

3109 " git rebase --continue\n"

3110

3091 -#: sequencer.c:699

3111 +#: sequencer.c:702

3112 #, c-format

3113 msgid "could not parse commit %s\n"

3114 msgstr "kunde inte tolka incheckningen %s\n"

3115

3096 -#: sequencer.c:704

3116 +#: sequencer.c:707

3117 #, c-format

3118 msgid "could not parse parent commit %s\n"

3119 msgstr "kunde inte tolka föräldraincheckningen %s\n"

3120

3101 -#: sequencer.c:826

3121 +#: sequencer.c:836

3122 #, c-format

3123 msgid ""

3124 "unexpected 1st line of squash message:\n"

@@ -3109,7 +3129,7 @@ msgstr ""

3129 "\n"

3130 "\t%.*s"

3131

3112 -#: sequencer.c:832

3132 +#: sequencer.c:842

3133 #, c-format

3134 msgid ""

3135 "invalid 1st line of squash message:\n"

@@ -3120,232 +3140,232 @@ msgstr ""

3140 "\n"

3141 "\t%.*s"

3142

3123 -#: sequencer.c:838 sequencer.c:863

3143 +#: sequencer.c:848 sequencer.c:873

3144 #, c-format

3145 msgid "This is a combination of %d commits."

3146 msgstr "Det här är en kombination av %d incheckningar."

3147

3128 -#: sequencer.c:847 sequencer.c:2681

3148 +#: sequencer.c:857 sequencer.c:2742

3149 msgid "need a HEAD to fixup"

3150 msgstr "behöver en HEAD-incheckning att rätta"

3151

3132 -#: sequencer.c:849

3152 +#: sequencer.c:859

3153 msgid "could not read HEAD"

3154 msgstr "kunde inte läsa HEAD"

3155

3136 -#: sequencer.c:851

3156 +#: sequencer.c:861

3157 msgid "could not read HEAD's commit message"

3158 msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"

3159

3140 -#: sequencer.c:857

3160 +#: sequencer.c:867

3161 #, c-format

3162 msgid "cannot write '%s'"

3163 msgstr "kan inte skriva \"%s\""

3164

3145 -#: sequencer.c:866 git-rebase--interactive.sh:446

3165 +#: sequencer.c:876 git-rebase--interactive.sh:446

3166 msgid "This is the 1st commit message:"

3167 msgstr "Det här är 1:a incheckningsmeddelandet:"

3168

3149 -#: sequencer.c:874

3169 +#: sequencer.c:884

3170 #, c-format

3171 msgid "could not read commit message of %s"

3172 msgstr "kunde inte läsa incheckningsmeddelande för %s"

3173

3154 -#: sequencer.c:881

3174 +#: sequencer.c:891

3175 #, c-format

3176 msgid "This is the commit message #%d:"

3177 msgstr "Det här är incheckningsmeddelande %d:"

3178

3159 -#: sequencer.c:886

3179 +#: sequencer.c:896

3180 #, c-format

3181 msgid "The commit message #%d will be skipped:"

3182 msgstr "Incheckningsmeddelande %d kommer hoppas över:"

3183

3164 -#: sequencer.c:891

3184 +#: sequencer.c:901

3185 #, c-format

3186 msgid "unknown command: %d"

3187 msgstr "okänt kommando: %d"

3188

3169 -#: sequencer.c:957

3189 +#: sequencer.c:967

3190 msgid "your index file is unmerged."

3191 msgstr "din indexfil har inte slagits ihop."

3192

3173 -#: sequencer.c:975

3193 +#: sequencer.c:986

3194 #, c-format

3195 msgid "commit %s is a merge but no -m option was given."

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

3197

3178 -#: sequencer.c:983

3198 +#: sequencer.c:994

3199 #, c-format

3200 msgid "commit %s does not have parent %d"

3201 msgstr "incheckning %s har inte förälder %d"

3202

3183 -#: sequencer.c:987

3203 +#: sequencer.c:998

3204 #, c-format

3205 msgid "mainline was specified but commit %s is not a merge."

3206 msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning."

3207

3188 -#: sequencer.c:993

3208 +#: sequencer.c:1004

3209 #, c-format

3210 msgid "cannot get commit message for %s"

3211 msgstr "kan inte hämta incheckningsmeddelande för %s"

3212

3213 #. TRANSLATORS: The first %s will be a "todo" command like

3214 #. "revert" or "pick", the second %s a SHA1.

3195 -#: sequencer.c:1014

3215 +#: sequencer.c:1025

3216 #, c-format

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

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

3219

3200 -#: sequencer.c:1077 sequencer.c:1853

3220 +#: sequencer.c:1088 sequencer.c:1864

3221 #, c-format

3222 msgid "could not rename '%s' to '%s'"

3223 msgstr "kunde inte byta namn på \"%s\" till \"%s\""

3224

3205 -#: sequencer.c:1128

3225 +#: sequencer.c:1139

3226 #, c-format

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

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

3229

3210 -#: sequencer.c:1129

3230 +#: sequencer.c:1140

3231 #, c-format

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

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

3234

3215 -#: sequencer.c:1171

3235 +#: sequencer.c:1182

3236 msgid "empty commit set passed"

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

3238

3219 -#: sequencer.c:1181

3239 +#: sequencer.c:1192

3240 #, c-format

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

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

3243

3224 -#: sequencer.c:1188

3244 +#: sequencer.c:1198

3245 #, c-format

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

3247 msgstr "git %s: misslyckades uppdatera indexet"

3248

3229 -#: sequencer.c:1308

3249 +#: sequencer.c:1319

3250 #, c-format

3251 msgid "invalid line %d: %.*s"

3252 msgstr "ogiltig rad %d: %.*s"

3253

3234 -#: sequencer.c:1316

3254 +#: sequencer.c:1327

3255 #, c-format

3256 msgid "cannot '%s' without a previous commit"

3257 msgstr "kan inte utföra \"%s\" utan en föregående incheckning"

3258

3239 -#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614

3240 -#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951

3259 +#: sequencer.c:1360 sequencer.c:2522 sequencer.c:2557 sequencer.c:2636

3260 +#: sequencer.c:2662 sequencer.c:2752 sequencer.c:2853

3261 #, c-format

3262 msgid "could not read '%s'."

3263 msgstr "kunde inte läsa \"%s\"."

3264

3245 -#: sequencer.c:1361

3265 +#: sequencer.c:1372

3266 msgid "please fix this using 'git rebase --edit-todo'."

3267 msgstr "rätta det med \"git rebase --edit-todo\"."

3268

3249 -#: sequencer.c:1363

3269 +#: sequencer.c:1374

3270 #, c-format

3271 msgid "unusable instruction sheet: '%s'"

3272 msgstr "oanvändbart manus: ”%s”"

3273

3254 -#: sequencer.c:1368

3274 +#: sequencer.c:1379

3275 msgid "no commits parsed."

3276 msgstr "inga incheckningar lästes."

3277

3258 -#: sequencer.c:1379

3278 +#: sequencer.c:1390

3279 msgid "cannot cherry-pick during a revert."

3280 msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."

3281

3262 -#: sequencer.c:1381

3282 +#: sequencer.c:1392

3283 msgid "cannot revert during a cherry-pick."

3284 msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."

3285

3266 -#: sequencer.c:1448

3286 +#: sequencer.c:1459

3287 #, c-format

3288 msgid "invalid key: %s"

3289 msgstr "felaktig nyckel: %s"

3290

3271 -#: sequencer.c:1451

3291 +#: sequencer.c:1462

3292 #, c-format

3293 msgid "invalid value for %s: %s"

3294 msgstr "felaktigt värde för %s: %s"

3295

3276 -#: sequencer.c:1517

3296 +#: sequencer.c:1528

3297 #, c-format

3298 msgid "malformed options sheet: '%s'"

3299 msgstr "trasigt manus: ”%s”"

3300

3281 -#: sequencer.c:1555

3301 +#: sequencer.c:1566

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

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

3304

3285 -#: sequencer.c:1556

3305 +#: sequencer.c:1567

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

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

3308

3289 -#: sequencer.c:1559

3309 +#: sequencer.c:1570

3310 #, c-format

3311 msgid "could not create sequencer directory '%s'"

3312 msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""

3313

3294 -#: sequencer.c:1574

3314 +#: sequencer.c:1585

3315 msgid "could not lock HEAD"

3316 msgstr "kunde inte låsa HEAD"

3317

3298 -#: sequencer.c:1632 sequencer.c:2211

3318 +#: sequencer.c:1643 sequencer.c:2227

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

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

3321

3302 -#: sequencer.c:1634

3322 +#: sequencer.c:1645

3323 msgid "cannot resolve HEAD"

3324 msgstr "kan inte bestämma HEAD"

3325

3306 -#: sequencer.c:1636 sequencer.c:1671

3326 +#: sequencer.c:1647 sequencer.c:1682

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

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

3329

3310 -#: sequencer.c:1657 builtin/grep.c:711

3330 +#: sequencer.c:1668 builtin/grep.c:713

3331 #, c-format

3332 msgid "cannot open '%s'"

3333 msgstr "kan inte öppna \"%s\""

3334

3315 -#: sequencer.c:1659

3335 +#: sequencer.c:1670

3336 #, c-format

3337 msgid "cannot read '%s': %s"

3338 msgstr "kan inte läsa \"%s\": %s"

3339

3320 -#: sequencer.c:1660

3340 +#: sequencer.c:1671

3341 msgid "unexpected end of file"

3342 msgstr "oväntat filslut"

3343

3324 -#: sequencer.c:1666

3344 +#: sequencer.c:1677

3345 #, c-format

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

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

3348

3329 -#: sequencer.c:1677

3349 +#: sequencer.c:1688

3350 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3351 msgstr ""

3352 "Du verkar ha flyttat HEAD.\n"

3353 "Spolar inte tillbaka, kontrollera HEAD!"

3354

3335 -#: sequencer.c:1818 sequencer.c:2109

3355 +#: sequencer.c:1829 sequencer.c:2125

3356 msgid "cannot read HEAD"

3357 msgstr "kan inte läsa HEAD"

3358

3339 -#: sequencer.c:1858 builtin/difftool.c:640

3359 +#: sequencer.c:1869 builtin/difftool.c:639

3360 #, c-format

3361 msgid "could not copy '%s' to '%s'"

3362 msgstr "kunde inte kopiera in \"%s\" till \"%s\""

3363

3344 -#: sequencer.c:1874

3364 +#: sequencer.c:1888

3365 msgid "could not read index"

3366 msgstr "kunde inte läsa indexet"

3367

3348 -#: sequencer.c:1879

3368 +#: sequencer.c:1893

3369 #, c-format

3370 msgid ""

3371 "execution failed: %s\n"

@@ -3360,11 +3380,11 @@ msgstr ""

3380 "\tgit rebase --continue\n"

3381 "\n"

3382

3363 -#: sequencer.c:1885

3383 +#: sequencer.c:1899

3384 msgid "and made changes to the index and/or the working tree\n"

3385 msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"

3386

3367 -#: sequencer.c:1891

3387 +#: sequencer.c:1905

3388 #, c-format

3389 msgid ""

3390 "execution succeeded: %s\n"

@@ -3381,17 +3401,17 @@ msgstr ""

3401 "\tgit rebase --continue\n"

3402 "\n"

3403

3384 -#: sequencer.c:1948

3404 +#: sequencer.c:1964

3405 #, c-format

3406 msgid "Applied autostash.\n"

3407 msgstr "Tillämpade autostash.\n"

3408

3389 -#: sequencer.c:1960

3409 +#: sequencer.c:1976

3410 #, c-format

3411 msgid "cannot store %s"

3412 msgstr "kan inte spara %s"

3413

3394 -#: sequencer.c:1963 git-rebase.sh:175

3414 +#: sequencer.c:1979 git-rebase.sh:175

3415 #, c-format

3416 msgid ""

3417 "Applying autostash resulted in conflicts.\n"

@@ -3402,57 +3422,57 @@ msgstr ""

3422 "Dina ändringar är säkra i stashen.\n"

3423 "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"

3424

3405 -#: sequencer.c:2045

3425 +#: sequencer.c:2061

3426 #, c-format

3427 msgid "Stopped at %s... %.*s\n"

3428 msgstr "Stoppade på %s... %.*s\n"

3429

3410 -#: sequencer.c:2087

3430 +#: sequencer.c:2103

3431 #, c-format

3432 msgid "unknown command %d"

3433 msgstr "okänt kommando %d"

3434

3415 -#: sequencer.c:2117

3435 +#: sequencer.c:2133

3436 msgid "could not read orig-head"

3437 msgstr "kunde inte läsa orig-head"

3438

3419 -#: sequencer.c:2122 sequencer.c:2678

3439 +#: sequencer.c:2138 sequencer.c:2739

3440 msgid "could not read 'onto'"

3441 msgstr "kunde inte läsa \"onto\""

3442

3423 -#: sequencer.c:2129

3443 +#: sequencer.c:2145

3444 #, c-format

3445 msgid "could not update %s"

3446 msgstr "kunde inte uppdatera %s"

3447

3428 -#: sequencer.c:2136

3448 +#: sequencer.c:2152

3449 #, c-format

3450 msgid "could not update HEAD to %s"

3451 msgstr "kunde inte uppdatera HEAD till %s"

3452

3433 -#: sequencer.c:2220

3453 +#: sequencer.c:2236

3454 msgid "cannot rebase: You have unstaged changes."

3455 msgstr "kan inte ombasera: Du har oköade ändringar."

3456

3437 -#: sequencer.c:2225

3457 +#: sequencer.c:2241

3458 msgid "could not remove CHERRY_PICK_HEAD"

3459 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"

3460

3441 -#: sequencer.c:2234

3461 +#: sequencer.c:2250

3462 msgid "cannot amend non-existing commit"

3463 msgstr "kan inte lägga till incheckning som inte finns"

3464

3445 -#: sequencer.c:2236

3465 +#: sequencer.c:2252

3466 #, c-format

3467 msgid "invalid file: '%s'"

3468 msgstr "ogiltig fil: \"%s\""

3469

3450 -#: sequencer.c:2238

3470 +#: sequencer.c:2254

3471 #, c-format

3472 msgid "invalid contents: '%s'"

3473 msgstr "ogiltigt innehåll: \"%s\""

3474

3455 -#: sequencer.c:2241

3475 +#: sequencer.c:2257

3476 msgid ""

3477 "\n"

3478 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3462,50 +3482,45 @@ msgstr ""

3482 "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"

3483 "först och kör sedan \"git rebase --continute\" igen."

3484

3465 -#: sequencer.c:2251

3485 +#: sequencer.c:2267

3486 msgid "could not commit staged changes."

3487 msgstr "kunde inte checka in köade ändringar."

3488

3469 -#: sequencer.c:2331

3489 +#: sequencer.c:2347

3490 #, c-format

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

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

3493

3474 -#: sequencer.c:2335

3494 +#: sequencer.c:2351

3495 #, c-format

3496 msgid "%s: bad revision"

3497 msgstr "%s: felaktig revision"

3498

3479 -#: sequencer.c:2368

3499 +#: sequencer.c:2384

3500 msgid "can't revert as initial commit"

3501 msgstr "kan inte ångra som första incheckning"

3502

3483 -#: sequencer.c:2471

3503 +#: sequencer.c:2489

3504 msgid "make_script: unhandled options"

3505 msgstr "make_script: flaggor som inte stöds"

3506

3487 -#: sequencer.c:2474

3507 +#: sequencer.c:2492

3508 msgid "make_script: error preparing revisions"

3509 msgstr "make_script: fel när revisioner skulle förberedas"

3510

3491 -#: sequencer.c:2510

3511 +#: sequencer.c:2526 sequencer.c:2561

3512 #, c-format

3513 msgid "unusable todo list: '%s'"

3514 msgstr "oanvändbar todo-lista: %s"

3515

3496 -#: sequencer.c:2516

3497 -#, c-format

3498 -msgid "unable to open '%s' for writing"

3499 -msgstr "kunde inte öppna \"%s\" för skrivning"

3500 -

3501 -#: sequencer.c:2561

3516 +#: sequencer.c:2609

3517 #, c-format

3518 msgid ""

3519 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

3520 msgstr ""

3521 "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."

3522

3508 -#: sequencer.c:2641

3523 +#: sequencer.c:2689

3524 #, c-format

3525 msgid ""

3526 "Warning: some commits may have been dropped accidentally.\n"

@@ -3514,7 +3529,7 @@ msgstr ""

3529 "Varning: vissa incheckningar kan av misstag ha tappats.\n"

3530 "Tappade incheckningar (nyaste först):\n"

3531

3517 -#: sequencer.c:2648

3532 +#: sequencer.c:2696

3533 #, c-format

3534 msgid ""

3535 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -3534,7 +3549,7 @@ msgstr ""

3549 "\" (fel).\n"

3550 "\n"

3551

3537 -#: sequencer.c:2660

3552 +#: sequencer.c:2708

3553 #, c-format

3554 msgid ""

3555 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -3545,31 +3560,21 @@ msgstr ""

3560 "continue\".\n"

3561 "Avbryt ombaseringen med \"git rebase --abort\".\n"

3562

3548 -#: sequencer.c:2708

3549 -#, c-format

3550 -msgid "could not parse commit '%s'"

3551 -msgstr "kunde inte tolka incheckningen\" %s\""

3552 -

3553 -#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395

3554 -#: builtin/am.c:775

3563 +#: sequencer.c:2721 sequencer.c:2788 wrapper.c:225 wrapper.c:395

3564 +#: builtin/am.c:779

3565 #, c-format

3566 msgid "could not open '%s' for writing"

3567 msgstr "kunde inte öppna \"%s\" för skrivning"

3568

3559 -#: sequencer.c:2756

3569 +#: sequencer.c:2769

3570 #, c-format

3561 -msgid "could not truncate '%s'"

3562 -msgstr "kunde inte trunkera \"%s\""

3571 +msgid "could not parse commit '%s'"

3572 +msgstr "kunde inte tolka incheckningen\" %s\""

3573

3564 -#: sequencer.c:2848

3574 +#: sequencer.c:2891

3575 msgid "the script was already rearranged."

3576 msgstr "skriptet har redan omordnats."

3577

3568 -#: sequencer.c:2953

3569 -#, c-format

3570 -msgid "could not finish '%s'"

3571 -msgstr "kunde inte avsluta \"%s\""

3572 -

3578 #: setup.c:171

3579 #, c-format

3580 msgid ""

@@ -3603,34 +3608,34 @@ msgstr ""

3608 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"

3609 "\"git <kommando> [<revision>...] -- [<fil>...]\""

3610

3606 -#: setup.c:499

3611 +#: setup.c:501

3612 #, c-format

3613 msgid "Expected git repo version <= %d, found %d"

3614 msgstr "Förväntade git-arkivversion <= %d, hittade %d"

3615

3611 -#: setup.c:507

3616 +#: setup.c:509

3617 msgid "unknown repository extensions found:"

3618 msgstr "okända arkivutökningar hittades:"

3619

3615 -#: setup.c:806

3620 +#: setup.c:811

3621 #, c-format

3622 msgid "Not a git repository (or any of the parent directories): %s"

3623 msgstr "Inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"

3624

3620 -#: setup.c:808 builtin/index-pack.c:1653

3625 +#: setup.c:813 builtin/index-pack.c:1653

3626 msgid "Cannot come back to cwd"

3627 msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"

3628

3624 -#: setup.c:1046

3629 +#: setup.c:1052

3630 msgid "Unable to read current working directory"

3631 msgstr "Kan inte läsa aktuell arbetskatalog"

3632

3628 -#: setup.c:1058 setup.c:1064

3633 +#: setup.c:1064 setup.c:1070

3634 #, c-format

3635 msgid "Cannot change to '%s'"

3636 msgstr "Kan inte byta till \"%s\""

3637

3633 -#: setup.c:1077

3638 +#: setup.c:1083

3639 #, c-format

3640 msgid ""

3641 "Not a git repository (or any parent up to mount point %s)\n"

@@ -3640,7 +3645,7 @@ msgstr ""

3645 "monteringspunkten %s)\n"

3646 "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."

3647

3643 -#: setup.c:1159

3648 +#: setup.c:1167

3649 #, c-format

3650 msgid ""

3651 "Problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -3649,41 +3654,41 @@ msgstr ""

3654 "Problem med filläges-värdet i core.sharedRepository (0%.3o).\n"

3655 "Ägaren av filerna måste alltid ha läs- och skrivbehörighet."

3656

3652 -#: sha1_file.c:528

3657 +#: sha1_file.c:598

3658 #, c-format

3659 msgid "path '%s' does not exist"

3660 msgstr "sökvägen \"%s\" finns inte"

3661

3657 -#: sha1_file.c:554

3662 +#: sha1_file.c:624

3663 #, c-format

3664 msgid "reference repository '%s' as a linked checkout is not supported yet."

3665 msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."

3666

3662 -#: sha1_file.c:560

3667 +#: sha1_file.c:630

3668 #, c-format

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

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

3671

3667 -#: sha1_file.c:566

3672 +#: sha1_file.c:636

3673 #, c-format

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

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

3676

3672 -#: sha1_file.c:574

3677 +#: sha1_file.c:644

3678 #, c-format

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

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

3681

3677 -#: sha1_name.c:420

3682 +#: sha1_name.c:422

3683 #, c-format

3684 msgid "short SHA1 %s is ambiguous"

3685 msgstr "kort SHA1 %s är tvetydig"

3686

3682 -#: sha1_name.c:431

3687 +#: sha1_name.c:433

3688 msgid "The candidates are:"

3689 msgstr "Kandidaterna är:"

3690

3686 -#: sha1_name.c:590

3691 +#: sha1_name.c:693

3692 msgid ""

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

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

@@ -3705,71 +3710,71 @@ msgstr ""

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

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

3712

3708 -#: submodule.c:93 submodule.c:127

3713 +#: submodule.c:96 submodule.c:130

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

3715 msgstr ""

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

3717 "sammanslagningskonflikter först"

3718

3714 -#: submodule.c:97 submodule.c:131

3719 +#: submodule.c:100 submodule.c:134

3720 #, c-format

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

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

3723

3719 -#: submodule.c:105

3724 +#: submodule.c:108

3725 #, c-format

3726 msgid "Could not update .gitmodules entry %s"

3727 msgstr "Kunde inte uppdatera .gitmodules-posten %s"

3728

3724 -#: submodule.c:138

3729 +#: submodule.c:141

3730 #, c-format

3731 msgid "Could not remove .gitmodules entry for %s"

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

3733

3729 -#: submodule.c:149

3734 +#: submodule.c:152

3735 msgid "staging updated .gitmodules failed"

3736 msgstr "misslyckades köa uppdaterad .gitmodules"

3737

3733 -#: submodule.c:309

3738 +#: submodule.c:312

3739 #, c-format

3740 msgid "in unpopulated submodule '%s'"

3741 msgstr "i ej utcheckad undermodul \"%s\""

3742

3738 -#: submodule.c:340

3743 +#: submodule.c:343

3744 #, c-format

3745 msgid "Pathspec '%s' is in submodule '%.*s'"

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

3747

3743 -#: submodule.c:799

3748 +#: submodule.c:833

3749 #, c-format

3750 msgid "submodule entry '%s' (%s) is a %s, not a commit"

3751 msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"

3752

3748 -#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149

3753 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387

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

3755 msgstr "Misslyckades slå upp HEAD som giltig referens."

3756

3752 -#: submodule.c:1304

3757 +#: submodule.c:1370

3758 #, c-format

3759 msgid "'%s' not recognized as a git repository"

3760 msgstr "\"%s\" känns inte igen som ett git-arkiv"

3761

3757 -#: submodule.c:1442

3762 +#: submodule.c:1508

3763 #, c-format

3764 msgid "could not start 'git status' in submodule '%s'"

3765 msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""

3766

3762 -#: submodule.c:1455

3767 +#: submodule.c:1521

3768 #, c-format

3769 msgid "could not run 'git status' in submodule '%s'"

3770 msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""

3771

3767 -#: submodule.c:1548

3772 +#: submodule.c:1614

3773 #, c-format

3774 msgid "submodule '%s' has dirty index"

3775 msgstr "undermodulen \"%s\" har ett smutsigt index"

3776

3772 -#: submodule.c:1809

3777 +#: submodule.c:1876

3778 #, c-format

3779 msgid ""

3780 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -3777,18 +3782,18 @@ msgstr ""

3782 "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "

3783 "stöds ej"

3784

3780 -#: submodule.c:1821 submodule.c:1877

3785 +#: submodule.c:1888 submodule.c:1944

3786 #, c-format

3787 msgid "could not lookup name for submodule '%s'"

3788 msgstr "kunde inte slå upp namnet för undermodulen \"%s\""

3789

3785 -#: submodule.c:1825 builtin/submodule--helper.c:671

3786 -#: builtin/submodule--helper.c:681

3790 +#: submodule.c:1892 builtin/submodule--helper.c:909

3791 +#: builtin/submodule--helper.c:919

3792 #, c-format

3793 msgid "could not create directory '%s'"

3794 msgstr "kunde inte skapa katalogen \"%s\""

3795

3791 -#: submodule.c:1828

3796 +#: submodule.c:1895

3797 #, c-format

3798 msgid ""

3799 "Migrating git directory of '%s%s' from\n"

@@ -3799,20 +3804,20 @@ msgstr ""

3804 "\"%s\" till\n"

3805 "\"%s\"\n"

3806

3802 -#: submodule.c:1912

3807 +#: submodule.c:1979

3808 #, c-format

3809 msgid "could not recurse into submodule '%s'"

3810 msgstr "kunde inte rekursera in i undermodulen \"%s\""

3811

3807 -#: submodule.c:1956

3812 +#: submodule.c:2023

3813 msgid "could not start ls-files in .."

3814 msgstr "kunde inte starta ls-files i .."

3815

3811 -#: submodule.c:1976

3816 +#: submodule.c:2043

3817 msgid "BUG: returned path string doesn't match cwd?"

3818 msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"

3819

3815 -#: submodule.c:1995

3820 +#: submodule.c:2062

3821 #, c-format

3822 msgid "ls-tree returned unexpected return code %d"

3823 msgstr "ls-tree returnerade en oväntad returkod %d"

@@ -3873,24 +3878,24 @@ msgstr "filen %s är inte skrivbar av användaren"

3878

3879 #: trailer.c:1024

3880 msgid "could not open temporary file"

3876 -msgstr "kunde inte öppna temporär file"

3881 +msgstr "kunde inte öppna temporär fil"

3882

3883 #: trailer.c:1064

3884 #, c-format

3885 msgid "could not rename temporary file to %s"

3886 msgstr "kunde inte byta namn på temporär fil till %s"

3887

3883 -#: transport.c:62

3888 +#: transport.c:63

3889 #, c-format

3890 msgid "Would set upstream of '%s' to '%s' of '%s'\n"

3891 msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"

3892

3888 -#: transport.c:151

3893 +#: transport.c:152

3894 #, c-format

3895 msgid "transport: invalid depth option '%s'"

3896 msgstr "transport: ogiltig flagga för depth: ”%s”"

3897

3893 -#: transport.c:888

3898 +#: transport.c:904

3899 #, c-format

3900 msgid ""

3901 "The following submodule paths contain changes that can\n"

@@ -3899,7 +3904,7 @@ msgstr ""

3904 "Följande undermodulsökvägar innehåller ändringar som\n"

3905 "inte kan hittas av fjärrarna:\n"

3906

3902 -#: transport.c:892

3907 +#: transport.c:908

3908 #, c-format

3909 msgid ""

3910 "\n"

@@ -3926,11 +3931,11 @@ msgstr ""

3931 "för att sända dem till fjärren.\n"

3932 "\n"

3933

3929 -#: transport.c:900

3934 +#: transport.c:916

3935 msgid "Aborting."

3936 msgstr "Avbryter."

3937

3933 -#: transport-helper.c:1071

3938 +#: transport-helper.c:1074

3939 #, c-format

3940 msgid "Could not read ref %s"

3941 msgstr "Kunde inte läsa referensen %s"

@@ -3951,7 +3956,7 @@ msgstr "tomt filnamn i trädpost"

3956 msgid "too-short tree file"

3957 msgstr "trädfil för kort"

3958

3954 -#: unpack-trees.c:106

3959 +#: unpack-trees.c:107

3960 #, c-format

3961 msgid ""

3962 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3960,7 +3965,7 @@ msgstr ""

3965 "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"

3966 "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."

3967

3963 -#: unpack-trees.c:108

3968 +#: unpack-trees.c:109

3969 #, c-format

3970 msgid ""

3971 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3969,7 +3974,7 @@ msgstr ""

3974 "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"

3975 "%%s"

3976

3972 -#: unpack-trees.c:111

3977 +#: unpack-trees.c:112

3978 #, c-format

3979 msgid ""

3980 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3979,7 +3984,7 @@ msgstr ""

3984 "sammanslagning:\n"

3985 "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."

3986

3982 -#: unpack-trees.c:113

3987 +#: unpack-trees.c:114

3988 #, c-format

3989 msgid ""

3990 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3989,7 +3994,7 @@ msgstr ""

3994 "sammanslagning:\n"

3995 "%%s"

3996

3992 -#: unpack-trees.c:116

3997 +#: unpack-trees.c:117

3998 #, c-format

3999 msgid ""

4000 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3998,7 +4003,7 @@ msgstr ""

4003 "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"

4004 "%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."

4005

4001 -#: unpack-trees.c:118

4006 +#: unpack-trees.c:119

4007 #, c-format

4008 msgid ""

4009 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4007,7 +4012,7 @@ msgstr ""

4012 "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"

4013 "%%s"

4014

4010 -#: unpack-trees.c:123

4015 +#: unpack-trees.c:124

4016 #, c-format

4017 msgid ""

4018 "Updating the following directories would lose untracked files in them:\n"

@@ -4017,7 +4022,7 @@ msgstr ""

4022 "dem:\n"

4023 "%s"

4024

4020 -#: unpack-trees.c:127

4025 +#: unpack-trees.c:128

4026 #, c-format

4027 msgid ""

4028 "The following untracked working tree files would be removed by checkout:\n"

@@ -4026,7 +4031,7 @@ msgstr ""

4031 "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"

4032 "%%sFlytta eller ta bort dem innan du byter gren."

4033

4029 -#: unpack-trees.c:129

4034 +#: unpack-trees.c:130

4035 #, c-format

4036 msgid ""

4037 "The following untracked working tree files would be removed by checkout:\n"

@@ -4035,7 +4040,7 @@ msgstr ""

4040 "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"

4041 "%%s"

4042

4038 -#: unpack-trees.c:132

4043 +#: unpack-trees.c:133

4044 #, c-format

4045 msgid ""

4046 "The following untracked working tree files would be removed by merge:\n"

@@ -4045,7 +4050,7 @@ msgstr ""

4050 "sammanslagningen:\n"

4051 "%%sFlytta eller ta bort dem innan du slår samman."

4052

4048 -#: unpack-trees.c:134

4053 +#: unpack-trees.c:135

4054 #, c-format

4055 msgid ""

4056 "The following untracked working tree files would be removed by merge:\n"

@@ -4055,7 +4060,7 @@ msgstr ""

4060 "sammanslagningen:\n"

4061 "%%s"

4062

4058 -#: unpack-trees.c:137

4063 +#: unpack-trees.c:138

4064 #, c-format

4065 msgid ""

4066 "The following untracked working tree files would be removed by %s:\n"

@@ -4064,7 +4069,7 @@ msgstr ""

4069 "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"

4070 "%%sFlytta eller ta bort dem innan du \"%s\"."

4071

4067 -#: unpack-trees.c:139

4072 +#: unpack-trees.c:140

4073 #, c-format

4074 msgid ""

4075 "The following untracked working tree files would be removed by %s:\n"

@@ -4073,7 +4078,7 @@ msgstr ""

4078 "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"

4079 "%%s"

4080

4076 -#: unpack-trees.c:144

4081 +#: unpack-trees.c:145

4082 #, c-format

4083 msgid ""

4084 "The following untracked working tree files would be overwritten by "

@@ -4084,7 +4089,7 @@ msgstr ""

4089 "utcheckningen:\n"

4090 "%%sFlytta eller ta bort dem innan du byter gren."

4091

4087 -#: unpack-trees.c:146

4092 +#: unpack-trees.c:147

4093 #, c-format

4094 msgid ""

4095 "The following untracked working tree files would be overwritten by "

@@ -4095,7 +4100,7 @@ msgstr ""

4100 "utcheckningen:\n"

4101 "%%s"

4102

4098 -#: unpack-trees.c:149

4103 +#: unpack-trees.c:150

4104 #, c-format

4105 msgid ""

4106 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4105,7 +4110,7 @@ msgstr ""

4110 "sammanslagningen:\n"

4111 "%%sFlytta eller ta bort dem innan du byter gren."

4112

4108 -#: unpack-trees.c:151

4113 +#: unpack-trees.c:152

4114 #, c-format

4115 msgid ""

4116 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4115,7 +4120,7 @@ msgstr ""

4120 "sammanslagningen:\n"

4121 "%%s"

4122

4118 -#: unpack-trees.c:154

4123 +#: unpack-trees.c:155

4124 #, c-format

4125 msgid ""

4126 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4124,7 +4129,7 @@ msgstr ""

4129 "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"

4130 "%%sFlytta eller ta bort dem innan du \"%s\"."

4131

4127 -#: unpack-trees.c:156

4132 +#: unpack-trees.c:157

4133 #, c-format

4134 msgid ""

4135 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4133,12 +4138,12 @@ msgstr ""

4138 "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"

4139 "%%s"

4140

4136 -#: unpack-trees.c:163

4141 +#: unpack-trees.c:164

4142 #, c-format

4143 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

4144 msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."

4145

4141 -#: unpack-trees.c:166

4146 +#: unpack-trees.c:167

4147 #, c-format

4148 msgid ""

4149 "Cannot update sparse checkout: the following entries are not up to date:\n"

@@ -4147,7 +4152,7 @@ msgstr ""

4152 "Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n"

4153 "%s"

4154

4150 -#: unpack-trees.c:168

4155 +#: unpack-trees.c:169

4156 #, c-format

4157 msgid ""

4158 "The following working tree files would be overwritten by sparse checkout "

@@ -4158,7 +4163,7 @@ msgstr ""

4163 "utcheckning:\n"

4164 "%s"

4165

4161 -#: unpack-trees.c:170

4166 +#: unpack-trees.c:171

4167 #, c-format

4168 msgid ""

4169 "The following working tree files would be removed by sparse checkout "

@@ -4169,7 +4174,7 @@ msgstr ""

4174 "utcheckning:\n"

4175 "%s"

4176

4172 -#: unpack-trees.c:172

4177 +#: unpack-trees.c:173

4178 #, c-format

4179 msgid ""

4180 "Cannot update submodule:\n"

@@ -4178,12 +4183,12 @@ msgstr ""

4183 "Kan inte uppdatera undermodul:\n"

4184 "%s"

4185

4181 -#: unpack-trees.c:249

4186 +#: unpack-trees.c:250

4187 #, c-format

4188 msgid "Aborting\n"

4189 msgstr "Avbryter\n"

4190

4186 -#: unpack-trees.c:331

4191 +#: unpack-trees.c:332

4192 msgid "Checking out files"

4193 msgstr "Checkar ut filer"

4194

@@ -4226,8 +4231,8 @@ msgstr "misslyckades läsa \"%s\""

4231 msgid "could not open '%s' for reading and writing"

4232 msgstr "kunde inte öppna \"%s\" för läsning och skrivning"

4233

4229 -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766

4230 -#: builtin/am.c:858 builtin/merge.c:1041

4234 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

4235 +#: builtin/am.c:862 builtin/merge.c:1043

4236 #, c-format

4237 msgid "could not open '%s' for reading"

4238 msgstr "kunde inte öppna \"%s\" för läsning"

@@ -4241,16 +4246,6 @@ msgstr "kan inte komma åt \"%s\""

4246 msgid "unable to get current working directory"

4247 msgstr "kan inte hämta aktuell arbetskatalog"

4248

4244 -#: wrapper.c:656

4245 -#, c-format

4246 -msgid "could not write to %s"

4247 -msgstr "kunde inte skriva till %s"

4248 -

4249 -#: wrapper.c:658

4250 -#, c-format

4251 -msgid "could not close %s"

4252 -msgstr "kunde inte stänga %s"

4253 -

4249 #: wt-status.c:150

4250 msgid "Unmerged paths:"

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

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

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

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

4273

4279 -#: wt-status.c:198 wt-status.c:979

4274 +#: wt-status.c:198 wt-status.c:984

4275 msgid "Changes to be committed:"

4276 msgstr "Ändringar att checka in:"

4277

4283 -#: wt-status.c:216 wt-status.c:988

4278 +#: wt-status.c:216 wt-status.c:993

4279 msgid "Changes not staged for commit:"

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

4281

@@ -4384,22 +4379,22 @@ msgstr "ändrat innehåll, "

4379 msgid "untracked content, "

4380 msgstr "ospårat innehåll, "

4381

4387 -#: wt-status.c:819

4382 +#: wt-status.c:824

4383 #, c-format

4384 msgid "Your stash currently has %d entry"

4385 msgid_plural "Your stash currently has %d entries"

4386 msgstr[0] "Stashen innehåller just nu %d post"

4387 msgstr[1] "Stashen innehåller just nu %d poster"

4388

4394 -#: wt-status.c:851

4389 +#: wt-status.c:856

4390 msgid "Submodules changed but not updated:"

4391 msgstr "Undermoduler ändrade men inte uppdaterade:"

4392

4398 -#: wt-status.c:853

4393 +#: wt-status.c:858

4394 msgid "Submodule changes to be committed:"

4395 msgstr "Undermodulers ändringar att checka in:"

4396

4402 -#: wt-status.c:935

4397 +#: wt-status.c:940

4398 msgid ""

4399 "Do not modify or remove the line above.\n"

4400 "Everything below it will be ignored."

@@ -4407,107 +4402,107 @@ msgstr ""

4402 "Raden ovan får inte ändras eller tas bort.\n"

4403 "Allt under den kommer tas bort."

4404

4410 -#: wt-status.c:1048

4405 +#: wt-status.c:1053

4406 msgid "You have unmerged paths."

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

4408

4414 -#: wt-status.c:1051

4409 +#: wt-status.c:1056

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

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

4412

4418 -#: wt-status.c:1053

4413 +#: wt-status.c:1058

4414 msgid " (use \"git merge --abort\" to abort the merge)"

4415 msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"

4416

4422 -#: wt-status.c:1058

4417 +#: wt-status.c:1063

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

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

4420

4426 -#: wt-status.c:1061

4421 +#: wt-status.c:1066

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

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

4424

4430 -#: wt-status.c:1071

4425 +#: wt-status.c:1076

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

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

4428

4434 -#: wt-status.c:1074

4429 +#: wt-status.c:1079

4430 msgid "The current patch is empty."

4431 msgstr "Aktuell patch är tom."

4432

4438 -#: wt-status.c:1078

4433 +#: wt-status.c:1083

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

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

4436

4442 -#: wt-status.c:1080

4437 +#: wt-status.c:1085

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

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

4440

4446 -#: wt-status.c:1082

4441 +#: wt-status.c:1087

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

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

4444

4450 -#: wt-status.c:1214

4445 +#: wt-status.c:1219

4446 msgid "git-rebase-todo is missing."

4447 msgstr "git-rebase-todo saknas."

4448

4454 -#: wt-status.c:1216

4449 +#: wt-status.c:1221

4450 msgid "No commands done."

4451 msgstr "Inga kommandon utförda."

4452

4458 -#: wt-status.c:1219

4453 +#: wt-status.c:1224

4454 #, c-format

4455 msgid "Last command done (%d command done):"

4456 msgid_plural "Last commands done (%d commands done):"

4457 msgstr[0] "Sista kommandot utfört (%d kommando utfört):"

4458 msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"

4459

4465 -#: wt-status.c:1230

4460 +#: wt-status.c:1235

4461 #, c-format

4462 msgid " (see more in file %s)"

4463 msgstr " (se fler i filen %s)"

4464

4470 -#: wt-status.c:1235

4465 +#: wt-status.c:1240

4466 msgid "No commands remaining."

4467 msgstr "Inga kommandon återstår."

4468

4474 -#: wt-status.c:1238

4469 +#: wt-status.c:1243

4470 #, c-format

4471 msgid "Next command to do (%d remaining command):"

4472 msgid_plural "Next commands to do (%d remaining commands):"

4473 msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"

4474 msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"

4475

4481 -#: wt-status.c:1246

4476 +#: wt-status.c:1251

4477 msgid " (use \"git rebase --edit-todo\" to view and edit)"

4478 msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"

4479

4485 -#: wt-status.c:1259

4480 +#: wt-status.c:1264

4481 #, c-format

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

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

4484

4490 -#: wt-status.c:1264

4485 +#: wt-status.c:1269

4486 msgid "You are currently rebasing."

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

4488

4494 -#: wt-status.c:1278

4489 +#: wt-status.c:1283

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

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

4492

4498 -#: wt-status.c:1280

4493 +#: wt-status.c:1285

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

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

4496

4502 -#: wt-status.c:1282

4497 +#: wt-status.c:1287

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

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

4500

4506 -#: wt-status.c:1288

4501 +#: wt-status.c:1293

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

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

4504

4510 -#: wt-status.c:1292

4505 +#: wt-status.c:1297

4506 #, c-format

4507 msgid ""

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

@@ -4515,126 +4510,126 @@ msgstr ""

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

4511 "ovanpå \"%s\"."

4512

4518 -#: wt-status.c:1297

4513 +#: wt-status.c:1302

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

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

4516

4522 -#: wt-status.c:1300

4517 +#: wt-status.c:1305

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

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

4520

4526 -#: wt-status.c:1304

4521 +#: wt-status.c:1309

4522 #, c-format

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

4524 msgstr ""

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

4526 "ovanpå \"%s\"."

4527

4533 -#: wt-status.c:1309

4528 +#: wt-status.c:1314

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

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

4531

4537 -#: wt-status.c:1312

4532 +#: wt-status.c:1317

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

4534 msgstr ""

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

4536

4542 -#: wt-status.c:1314

4537 +#: wt-status.c:1319

4538 msgid ""

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

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

4541

4547 -#: wt-status.c:1324

4542 +#: wt-status.c:1329

4543 #, c-format

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

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

4546

4552 -#: wt-status.c:1329

4547 +#: wt-status.c:1334

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

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

4550

4556 -#: wt-status.c:1332

4551 +#: wt-status.c:1337

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

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

4554

4560 -#: wt-status.c:1334

4555 +#: wt-status.c:1339

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

4557 msgstr ""

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

4559 "operationen)"

4560

4566 -#: wt-status.c:1343

4561 +#: wt-status.c:1348

4562 #, c-format

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

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

4565

4571 -#: wt-status.c:1348

4566 +#: wt-status.c:1353

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

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

4569

4575 -#: wt-status.c:1351

4570 +#: wt-status.c:1356

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

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

4573

4579 -#: wt-status.c:1353

4574 +#: wt-status.c:1358

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

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

4577

4583 -#: wt-status.c:1364

4578 +#: wt-status.c:1369

4579 #, c-format

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

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

4582

4588 -#: wt-status.c:1368

4583 +#: wt-status.c:1373

4584 msgid "You are currently bisecting."

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

4586

4592 -#: wt-status.c:1371

4587 +#: wt-status.c:1376

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

4589 msgstr ""

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

4591

4597 -#: wt-status.c:1568

4592 +#: wt-status.c:1573

4593 msgid "On branch "

4594 msgstr "På grenen "

4595

4601 -#: wt-status.c:1574

4596 +#: wt-status.c:1579

4597 msgid "interactive rebase in progress; onto "

4598 msgstr "interaktiv ombasering pågår; ovanpå "

4599

4605 -#: wt-status.c:1576

4600 +#: wt-status.c:1581

4601 msgid "rebase in progress; onto "

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

4603

4609 -#: wt-status.c:1581

4604 +#: wt-status.c:1586

4605 msgid "HEAD detached at "

4606 msgstr "HEAD frånkopplad vid "

4607

4613 -#: wt-status.c:1583

4608 +#: wt-status.c:1588

4609 msgid "HEAD detached from "

4610 msgstr "HEAD frånkopplad från "

4611

4617 -#: wt-status.c:1586

4612 +#: wt-status.c:1591

4613 msgid "Not currently on any branch."

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

4615

4621 -#: wt-status.c:1606

4616 +#: wt-status.c:1611

4617 msgid "Initial commit"

4618 msgstr "Första incheckning"

4619

4625 -#: wt-status.c:1607

4620 +#: wt-status.c:1612

4621 msgid "No commits yet"

4622 msgstr "Inga incheckningar ännu"

4623

4629 -#: wt-status.c:1621

4624 +#: wt-status.c:1626

4625 msgid "Untracked files"

4626 msgstr "Ospårade filer"

4627

4633 -#: wt-status.c:1623

4628 +#: wt-status.c:1628

4629 msgid "Ignored files"

4630 msgstr "Ignorerade filer"

4631

4637 -#: wt-status.c:1627

4632 +#: wt-status.c:1632

4633 #, c-format

4634 msgid ""

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

@@ -4646,32 +4641,32 @@ msgstr ""

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

4642

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

4649 -#: wt-status.c:1633

4644 +#: wt-status.c:1638

4645 #, c-format

4646 msgid "Untracked files not listed%s"

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

4648

4654 -#: wt-status.c:1635

4649 +#: wt-status.c:1640

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

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

4652

4658 -#: wt-status.c:1641

4653 +#: wt-status.c:1646

4654 msgid "No changes"

4655 msgstr "Inga ändringar"

4656

4662 -#: wt-status.c:1646

4657 +#: wt-status.c:1651

4658 #, c-format

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

4660 msgstr ""

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

4662 "\")\n"

4663

4669 -#: wt-status.c:1649

4664 +#: wt-status.c:1654

4665 #, c-format

4666 msgid "no changes added to commit\n"

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

4668

4674 -#: wt-status.c:1652

4669 +#: wt-status.c:1657

4670 #, c-format

4671 msgid ""

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

@@ -4680,58 +4675,58 @@ msgstr ""

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

4676 "\")\n"

4677

4683 -#: wt-status.c:1655

4678 +#: wt-status.c:1660

4679 #, c-format

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

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

4682

4688 -#: wt-status.c:1658

4683 +#: wt-status.c:1663

4684 #, c-format

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

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

4687

4693 -#: wt-status.c:1661 wt-status.c:1666

4688 +#: wt-status.c:1666 wt-status.c:1671

4689 #, c-format

4690 msgid "nothing to commit\n"

4691 msgstr "inget att checka in\n"

4692

4698 -#: wt-status.c:1664

4693 +#: wt-status.c:1669

4694 #, c-format

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

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

4697

4703 -#: wt-status.c:1668

4698 +#: wt-status.c:1673

4699 #, c-format

4700 msgid "nothing to commit, working tree clean\n"

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

4702

4708 -#: wt-status.c:1780

4703 +#: wt-status.c:1785

4704 msgid "No commits yet on "

4705 msgstr "Inga incheckningar ännu på "

4706

4712 -#: wt-status.c:1784

4707 +#: wt-status.c:1789

4708 msgid "HEAD (no branch)"

4709 msgstr "HEAD (ingen gren)"

4710

4716 -#: wt-status.c:1813 wt-status.c:1821

4711 +#: wt-status.c:1818 wt-status.c:1826

4712 msgid "behind "

4713 msgstr "efter "

4714

4720 -#: wt-status.c:1816 wt-status.c:1819

4715 +#: wt-status.c:1821 wt-status.c:1824

4716 msgid "ahead "

4717 msgstr "före "

4718

4719 #. TRANSLATORS: the action is e.g. "pull with rebase"

4725 -#: wt-status.c:2311

4720 +#: wt-status.c:2318

4721 #, c-format

4722 msgid "cannot %s: You have unstaged changes."

4723 msgstr "kan inte %s: Du har oköade ändringar."

4724

4730 -#: wt-status.c:2317

4725 +#: wt-status.c:2324

4726 msgid "additionally, your index contains uncommitted changes."

4727 msgstr "dessutom innehåller dit index ändringar som inte har checkats in."

4728

4734 -#: wt-status.c:2319

4729 +#: wt-status.c:2326

4730 #, c-format

4731 msgid "cannot %s: Your index contains uncommitted changes."

4732 msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."

@@ -4745,122 +4740,126 @@ msgstr "misslyckades ta bort länken \"%s\""

4740 msgid "git add [<options>] [--] <pathspec>..."

4741 msgstr "git add [<flaggor>] [--] <sökväg>..."

4742

4748 -#: builtin/add.c:82

4743 +#: builtin/add.c:83

4744 #, c-format

4745 msgid "unexpected diff status %c"

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

4747

4753 -#: builtin/add.c:87 builtin/commit.c:291

4748 +#: builtin/add.c:88 builtin/commit.c:291

4749 msgid "updating files failed"

4750 msgstr "misslyckades uppdatera filer"

4751

4757 -#: builtin/add.c:97

4752 +#: builtin/add.c:98

4753 #, c-format

4754 msgid "remove '%s'\n"

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

4756

4762 -#: builtin/add.c:153

4757 +#: builtin/add.c:173

4758 msgid "Unstaged changes after refreshing the index:"

4759 msgstr "Oköade ändringar efter att ha uppdaterat indexet:"

4760

4766 -#: builtin/add.c:213 builtin/rev-parse.c:888

4761 +#: builtin/add.c:233 builtin/rev-parse.c:888

4762 msgid "Could not read the index"

4763 msgstr "Kunde inte läsa indexet"

4764

4770 -#: builtin/add.c:224

4765 +#: builtin/add.c:244

4766 #, c-format

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

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

4769

4775 -#: builtin/add.c:228

4770 +#: builtin/add.c:248

4771 msgid "Could not write patch"

4772 msgstr "Kunde inte skriva patch"

4773

4779 -#: builtin/add.c:231

4774 +#: builtin/add.c:251

4775 msgid "editing patch failed"

4776 msgstr "redigering av patch misslyckades"

4777

4783 -#: builtin/add.c:234

4778 +#: builtin/add.c:254

4779 #, c-format

4780 msgid "Could not stat '%s'"

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

4782

4788 -#: builtin/add.c:236

4783 +#: builtin/add.c:256

4784 msgid "Empty patch. Aborted."

4785 msgstr "Tom patch. Avbryter."

4786

4792 -#: builtin/add.c:241

4787 +#: builtin/add.c:261

4788 #, c-format

4789 msgid "Could not apply '%s'"

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

4791

4797 -#: builtin/add.c:251

4792 +#: builtin/add.c:271

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

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

4795

4801 -#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124

4802 -#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529

4796 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124

4797 +#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541

4798 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164

4799 msgid "dry run"

4800 msgstr "testkörning"

4801

4807 -#: builtin/add.c:274

4802 +#: builtin/add.c:294

4803 msgid "interactive picking"

4804 msgstr "plocka interaktivt"

4805

4811 -#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310

4806 +#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310

4807 msgid "select hunks interactively"

4808 msgstr "välj stycken interaktivt"

4809

4815 -#: builtin/add.c:276

4810 +#: builtin/add.c:296

4811 msgid "edit current diff and apply"

4812 msgstr "redigera aktuell diff och applicera"

4813

4819 -#: builtin/add.c:277

4814 +#: builtin/add.c:297

4815 msgid "allow adding otherwise ignored files"

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

4817

4823 -#: builtin/add.c:278

4818 +#: builtin/add.c:298

4819 msgid "update tracked files"

4820 msgstr "uppdatera spårade filer"

4821

4827 -#: builtin/add.c:279

4822 +#: builtin/add.c:299

4823 +msgid "renormalize EOL of tracked files (implies -u)"

4824 +msgstr "åternormalisera radslut i spårade filer (implicerar -u)"

4825 +

4826 +#: builtin/add.c:300

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

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

4829

4831 -#: builtin/add.c:280

4830 +#: builtin/add.c:301

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

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

4833

4835 -#: builtin/add.c:283

4834 +#: builtin/add.c:304

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

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

4837

4839 -#: builtin/add.c:285

4838 +#: builtin/add.c:306

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

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

4841

4843 -#: builtin/add.c:286

4842 +#: builtin/add.c:307

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

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

4845

4847 -#: builtin/add.c:287

4846 +#: builtin/add.c:308

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

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

4849

4851 -#: builtin/add.c:288 builtin/update-index.c:954

4850 +#: builtin/add.c:309 builtin/update-index.c:964

4851 msgid "(+/-)x"

4852 msgstr "(+/-)x"

4853

4855 -#: builtin/add.c:288 builtin/update-index.c:955

4854 +#: builtin/add.c:309 builtin/update-index.c:965

4855 msgid "override the executable bit of the listed files"

4856 msgstr "överstyr exekveringsbiten för angivna filer"

4857

4859 -#: builtin/add.c:290

4858 +#: builtin/add.c:311

4859 msgid "warn when adding an embedded repository"

4860 msgstr "varna när ett inbyggt arkiv läggs till"

4861

4863 -#: builtin/add.c:305

4862 +#: builtin/add.c:326

4863 #, c-format

4864 msgid ""

4865 "You've added another git repository inside your current repository.\n"

@@ -4891,47 +4890,47 @@ msgstr ""

4890 "\n"

4891 "Se ”git help submodule” för ytterligare information."

4892

4894 -#: builtin/add.c:333

4893 +#: builtin/add.c:354

4894 #, c-format

4895 msgid "adding embedded git repository: %s"

4896 msgstr "lägger till inbäddat git-arkiv: %s"

4897

4899 -#: builtin/add.c:351

4898 +#: builtin/add.c:372

4899 #, c-format

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

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

4902

4904 -#: builtin/add.c:359

4903 +#: builtin/add.c:380

4904 msgid "adding files failed"

4905 msgstr "misslyckades lägga till filer"

4906

4908 -#: builtin/add.c:396

4907 +#: builtin/add.c:417

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

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

4910

4912 -#: builtin/add.c:403

4911 +#: builtin/add.c:424

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

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

4914

4916 -#: builtin/add.c:407

4915 +#: builtin/add.c:428

4916 #, c-format

4917 msgid "--chmod param '%s' must be either -x or +x"

4918 msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"

4919

4921 -#: builtin/add.c:422

4920 +#: builtin/add.c:443

4921 #, c-format

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

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

4924

4926 -#: builtin/add.c:423

4925 +#: builtin/add.c:444

4926 #, c-format

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

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

4929

4931 -#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282

4932 -#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350

4933 -#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271

4934 -#: builtin/submodule--helper.c:243

4930 +#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281

4931 +#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350

4932 +#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249

4933 +#: builtin/rm.c:271 builtin/submodule--helper.c:311

4934 msgid "index file corrupt"

4935 msgstr "indexfilen trasig"

4936

@@ -4958,85 +4957,85 @@ msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""

4957 msgid "fseek failed"

4958 msgstr "\"fseek\" misslyckades"

4959

4961 -#: builtin/am.c:786

4960 +#: builtin/am.c:790

4961 #, c-format

4962 msgid "could not parse patch '%s'"

4963 msgstr "kunde inte tolka patchen \"%s\""

4964

4966 -#: builtin/am.c:851

4965 +#: builtin/am.c:855

4966 msgid "Only one StGIT patch series can be applied at once"

4967 msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"

4968

4970 -#: builtin/am.c:899

4969 +#: builtin/am.c:903

4970 msgid "invalid timestamp"

4971 msgstr "ogiltig tidsstämpel"

4972

4974 -#: builtin/am.c:904 builtin/am.c:916

4973 +#: builtin/am.c:908 builtin/am.c:920

4974 msgid "invalid Date line"

4975 msgstr "ogiltig \"Date\"-rad"

4976

4978 -#: builtin/am.c:911

4977 +#: builtin/am.c:915

4978 msgid "invalid timezone offset"

4979 msgstr "ogiltig tidszons-offset"

4980

4982 -#: builtin/am.c:1004

4981 +#: builtin/am.c:1008

4982 msgid "Patch format detection failed."

4983 msgstr "Misslyckades detektera patchformat."

4984

4986 -#: builtin/am.c:1009 builtin/clone.c:402

4985 +#: builtin/am.c:1013 builtin/clone.c:402

4986 #, c-format

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

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

4989

4991 -#: builtin/am.c:1013

4990 +#: builtin/am.c:1017

4991 msgid "Failed to split patches."

4992 msgstr "Misslyckades dela patchar."

4993

4995 -#: builtin/am.c:1142 builtin/commit.c:376

4994 +#: builtin/am.c:1146 builtin/commit.c:376

4995 msgid "unable to write index file"

4996 msgstr "kan inte skriva indexfil"

4997

4999 -#: builtin/am.c:1193

4998 +#: builtin/am.c:1197

4999 #, c-format

5000 msgid "When you have resolved this problem, run \"%s --continue\"."

5001 msgstr "När du har löst problemet, kör \"%s --continue\"."

5002

5004 -#: builtin/am.c:1194

5003 +#: builtin/am.c:1198

5004 #, c-format

5005 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

5006 msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."

5007

5009 -#: builtin/am.c:1195

5008 +#: builtin/am.c:1199

5009 #, c-format

5010 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

5011 msgstr ""

5012 "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."

5013

5015 -#: builtin/am.c:1302

5014 +#: builtin/am.c:1306

5015 msgid "Patch is empty."

5016 msgstr "Patchen är tom."

5017

5019 -#: builtin/am.c:1368

5018 +#: builtin/am.c:1372

5019 #, c-format

5020 msgid "invalid ident line: %.*s"

5021 msgstr "ogiltig ident-rad: %.*s"

5022

5024 -#: builtin/am.c:1390

5023 +#: builtin/am.c:1394

5024 #, c-format

5025 msgid "unable to parse commit %s"

5026 msgstr "kunde inte tolka incheckningen %s"

5027

5029 -#: builtin/am.c:1584

5028 +#: builtin/am.c:1587

5029 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

5030 msgstr ""

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

5032 "vägssammanslagning."

5033

5035 -#: builtin/am.c:1586

5034 +#: builtin/am.c:1589

5035 msgid "Using index info to reconstruct a base tree..."

5036 msgstr "Använder indexinfo för att återskapa ett basträd..."

5037

5039 -#: builtin/am.c:1605

5038 +#: builtin/am.c:1608

5039 msgid ""

5040 "Did you hand edit your patch?\n"

5041 "It does not apply to blobs recorded in its index."

@@ -5044,39 +5043,39 @@ msgstr ""

5043 "Har du handredigerat din patch?\n"

5044 "Den kan inte tillämpas på blobbar som antecknats i dess index."

5045

5047 -#: builtin/am.c:1611

5046 +#: builtin/am.c:1614

5047 msgid "Falling back to patching base and 3-way merge..."

5048 msgstr ""

5049 "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."

5050

5052 -#: builtin/am.c:1636

5051 +#: builtin/am.c:1639

5052 msgid "Failed to merge in the changes."

5053 msgstr "Misslyckades slå ihop ändringarna."

5054

5056 -#: builtin/am.c:1660 builtin/merge.c:641

5055 +#: builtin/am.c:1663 builtin/merge.c:642

5056 msgid "git write-tree failed to write a tree"

5057 msgstr "git write-tree misslyckades skriva ett träd"

5058

5060 -#: builtin/am.c:1667

5059 +#: builtin/am.c:1670

5060 msgid "applying to an empty history"

5061 msgstr "tillämpar på en tom historik"

5062

5064 -#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824

5065 -#: builtin/merge.c:849

5063 +#: builtin/am.c:1683 builtin/commit.c:1798 builtin/merge.c:825

5064 +#: builtin/merge.c:850

5065 msgid "failed to write commit object"

5066 msgstr "kunde inte skriva incheckningsobjekt"

5067

5069 -#: builtin/am.c:1713 builtin/am.c:1717

5068 +#: builtin/am.c:1716 builtin/am.c:1720

5069 #, c-format

5070 msgid "cannot resume: %s does not exist."

5071 msgstr "kan inte återuppta: %s finns inte."

5072

5074 -#: builtin/am.c:1733

5073 +#: builtin/am.c:1736

5074 msgid "cannot be interactive without stdin connected to a terminal."

5075 msgstr ""

5076 "kan inte vara interaktiv om standard in inte är ansluten till en terminal."

5077

5079 -#: builtin/am.c:1738

5078 +#: builtin/am.c:1741

5079 msgid "Commit Body is:"

5080 msgstr "Incheckningskroppen är:"

5081

@@ -5084,35 +5083,35 @@ msgstr "Incheckningskroppen är:"

5083 #. in your translation. The program will only accept English

5084 #. input at this point.

5085 #.

5087 -#: builtin/am.c:1748

5086 +#: builtin/am.c:1751

5087 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

5088 msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "

5089

5091 -#: builtin/am.c:1798

5090 +#: builtin/am.c:1801

5091 #, c-format

5092 msgid "Dirty index: cannot apply patches (dirty: %s)"

5093 msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"

5094

5096 -#: builtin/am.c:1838 builtin/am.c:1910

5095 +#: builtin/am.c:1841 builtin/am.c:1913

5096 #, c-format

5097 msgid "Applying: %.*s"

5098 msgstr "Tillämpar: %.*s"

5099

5101 -#: builtin/am.c:1854

5100 +#: builtin/am.c:1857

5101 msgid "No changes -- Patch already applied."

5102 msgstr "Inga ändringar -- Patchen har redan tillämpats."

5103

5105 -#: builtin/am.c:1862

5104 +#: builtin/am.c:1865

5105 #, c-format

5106 msgid "Patch failed at %s %.*s"

5107 msgstr "Patch misslyckades på %s %.*s"

5108

5110 -#: builtin/am.c:1868

5109 +#: builtin/am.c:1871

5110 #, c-format

5111 msgid "The copy of the patch that failed is found in: %s"

5112 msgstr "En kopia av patchen som misslyckades finns i: %s"

5113

5115 -#: builtin/am.c:1913

5114 +#: builtin/am.c:1916

5115 msgid ""

5116 "No changes - did you forget to use 'git add'?\n"

5117 "If there is nothing left to stage, chances are that something else\n"

@@ -5122,7 +5121,7 @@ msgstr ""

5121 "Om det inte är något kvar att köa kan det hända att något annat redan\n"

5122 "introducerat samma ändringar; kanske du bör hoppa över patchen."

5123

5125 -#: builtin/am.c:1920

5124 +#: builtin/am.c:1923

5125 msgid ""

5126 "You still have unmerged paths in your index.\n"

5127 "You should 'git add' each file with resolved conflicts to mark them as "

@@ -5134,17 +5133,17 @@ msgstr ""

5133 "lösta.\n"

5134 "Du kan köra ”git rm” för att godta ”borttagen av dem” för den."

5135

5137 -#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332

5136 +#: builtin/am.c:2030 builtin/am.c:2034 builtin/am.c:2046 builtin/reset.c:332

5137 #: builtin/reset.c:340

5138 #, c-format

5139 msgid "Could not parse object '%s'."

5140 msgstr "Kan inte tolka objektet ”%s”."

5141

5143 -#: builtin/am.c:2081

5142 +#: builtin/am.c:2082

5143 msgid "failed to clean index"

5144 msgstr "misslyckades städa upp indexet"

5145

5147 -#: builtin/am.c:2116

5146 +#: builtin/am.c:2117

5147 msgid ""

5148 "You seem to have moved HEAD since the last 'am' failure.\n"

5149 "Not rewinding to ORIG_HEAD"

@@ -5152,133 +5151,133 @@ msgstr ""

5151 "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"

5152 "Återställer inte till ORIG_HEAD"

5153

5155 -#: builtin/am.c:2179

5154 +#: builtin/am.c:2180

5155 #, c-format

5156 msgid "Invalid value for --patch-format: %s"

5157 msgstr "Felaktigt värde för --patch-format: %s"

5158

5160 -#: builtin/am.c:2212

5159 +#: builtin/am.c:2213

5160 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"

5161 msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"

5162

5164 -#: builtin/am.c:2213

5163 +#: builtin/am.c:2214

5164 msgid "git am [<options>] (--continue | --skip | --abort)"

5165 msgstr "git am [<flaggor>] (--continue | --skip | --abort)"

5166

5168 -#: builtin/am.c:2219

5167 +#: builtin/am.c:2220

5168 msgid "run interactively"

5169 msgstr "kör interaktivt"

5170

5172 -#: builtin/am.c:2221

5171 +#: builtin/am.c:2222

5172 msgid "historical option -- no-op"

5173 msgstr "historisk flagga -- no-op"

5174

5176 -#: builtin/am.c:2223

5175 +#: builtin/am.c:2224

5176 msgid "allow fall back on 3way merging if needed"

5177 msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"

5178

5180 -#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57

5179 +#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57

5180 #: builtin/repack.c:180

5181 msgid "be quiet"

5182 msgstr "var tyst"

5183

5185 -#: builtin/am.c:2226

5184 +#: builtin/am.c:2227

5185 msgid "add a Signed-off-by line to the commit message"

5186 msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"

5187

5189 -#: builtin/am.c:2229

5188 +#: builtin/am.c:2230

5189 msgid "recode into utf8 (default)"

5190 msgstr "koda om till utf8 (standard)"

5191

5193 -#: builtin/am.c:2231

5192 +#: builtin/am.c:2232

5193 msgid "pass -k flag to git-mailinfo"

5194 msgstr "sänd flaggan -k till git-mailinfo"

5195

5197 -#: builtin/am.c:2233

5196 +#: builtin/am.c:2234

5197 msgid "pass -b flag to git-mailinfo"

5198 msgstr "sänd flaggan -b till git-mailinfo"

5199

5201 -#: builtin/am.c:2235

5200 +#: builtin/am.c:2236

5201 msgid "pass -m flag to git-mailinfo"

5202 msgstr "sänd flaggan -m till git-mailinfo"

5203

5205 -#: builtin/am.c:2237

5204 +#: builtin/am.c:2238

5205 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

5206 msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"

5207

5209 -#: builtin/am.c:2240

5208 +#: builtin/am.c:2241

5209 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

5210 msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"

5211

5213 -#: builtin/am.c:2243

5212 +#: builtin/am.c:2244

5213 msgid "strip everything before a scissors line"

5214 msgstr "ta bort allting före en saxlinje"

5215

5217 -#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254

5218 -#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266

5219 -#: builtin/am.c:2272

5216 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255

5217 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267

5218 +#: builtin/am.c:2273

5219 msgid "pass it through git-apply"

5220 msgstr "sänd det genom git-apply"

5221

5223 -#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667

5224 -#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197

5222 +#: builtin/am.c:2263 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

5223 +#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203

5224 #: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195

5225 #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377

5226 #: parse-options.h:132 parse-options.h:134 parse-options.h:245

5227 msgid "n"

5228 msgstr "n"

5229

5231 -#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38

5230 +#: builtin/am.c:2269 builtin/branch.c:629 builtin/for-each-ref.c:38

5231 #: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39

5232 msgid "format"

5233 msgstr "format"

5234

5236 -#: builtin/am.c:2269

5235 +#: builtin/am.c:2270

5236 msgid "format the patch(es) are in"

5237 msgstr "format för patch(ar)"

5238

5240 -#: builtin/am.c:2275

5239 +#: builtin/am.c:2276

5240 msgid "override error message when patch failure occurs"

5241 msgstr "överstyr felmeddelanden när patchfel uppstår"

5242

5244 -#: builtin/am.c:2277

5243 +#: builtin/am.c:2278

5244 msgid "continue applying patches after resolving a conflict"

5245 msgstr "fortsätt applicera patchar efter att ha löst en konflikt"

5246

5248 -#: builtin/am.c:2280

5247 +#: builtin/am.c:2281

5248 msgid "synonyms for --continue"

5249 msgstr "synonymer till --continue"

5250

5252 -#: builtin/am.c:2283

5251 +#: builtin/am.c:2284

5252 msgid "skip the current patch"

5253 msgstr "hoppa över den aktuella grenen"

5254

5256 -#: builtin/am.c:2286

5255 +#: builtin/am.c:2287

5256 msgid "restore the original branch and abort the patching operation."

5257 msgstr "återställ originalgrenen och avbryt patchningen."

5258

5260 -#: builtin/am.c:2290

5259 +#: builtin/am.c:2291

5260 msgid "lie about committer date"

5261 msgstr "ljug om incheckningsdatum"

5262

5264 -#: builtin/am.c:2292

5263 +#: builtin/am.c:2293

5264 msgid "use current timestamp for author date"

5265 msgstr "använd nuvarande tidsstämpel för författardatum"

5266

5268 -#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236

5269 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392

5267 +#: builtin/am.c:2295 builtin/commit.c:1636 builtin/merge.c:236

5268 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392

5269 msgid "key-id"

5270 msgstr "nyckel-id"

5271

5273 -#: builtin/am.c:2295

5272 +#: builtin/am.c:2296

5273 msgid "GPG-sign commits"

5274 msgstr "GPG-signera incheckningar"

5275

5277 -#: builtin/am.c:2298

5276 +#: builtin/am.c:2299

5277 msgid "(internal use for git-rebase)"

5278 msgstr "(används internt av git-rebase)"

5279

5281 -#: builtin/am.c:2316

5280 +#: builtin/am.c:2317

5281 msgid ""

5282 "The -b/--binary option has been a no-op for long time, and\n"

5283 "it will be removed. Please do not use it anymore."

@@ -5286,16 +5285,16 @@ msgstr ""

5285 "Flaggan -b/--binary har varit utan funktion länge, och\n"

5286 "kommer tas bort. Vi ber dig att inte använda den längre."

5287

5289 -#: builtin/am.c:2323

5288 +#: builtin/am.c:2324

5289 msgid "failed to read the index"

5290 msgstr "misslyckades läsa indexet"

5291

5293 -#: builtin/am.c:2338

5292 +#: builtin/am.c:2339

5293 #, c-format

5294 msgid "previous rebase directory %s still exists but mbox given."

5295 msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."

5296

5298 -#: builtin/am.c:2362

5297 +#: builtin/am.c:2363

5298 #, c-format

5299 msgid ""

5300 "Stray %s directory found.\n"

@@ -5304,7 +5303,7 @@ msgstr ""

5303 "Kvarbliven katalog %s hittades.\n"

5304 "Använd \"git am --abort\" för att ta bort den."

5305

5307 -#: builtin/am.c:2368

5306 +#: builtin/am.c:2369

5307 msgid "Resolve operation not in progress, we are not resuming."

5308 msgstr "Lösningsoperation pågår inte, vi återupptar inte."

5309

@@ -5342,18 +5341,69 @@ msgstr "git archive: protokollfel"

5341 msgid "git archive: expected a flush"

5342 msgstr "git archive: förväntade en tömning (flush)"

5343

5345 -#: builtin/bisect--helper.c:7

5344 +#: builtin/bisect--helper.c:12

5345 msgid "git bisect--helper --next-all [--no-checkout]"

5346 msgstr "git bisect--helper --next-all [--no-checkout]"

5347

5349 -#: builtin/bisect--helper.c:17

5348 +#: builtin/bisect--helper.c:13

5349 +msgid "git bisect--helper --write-terms <bad_term> <good_term>"

5350 +msgstr "git bisect--helper --write-terms <term-för-fel> <term-för-rätt>"

5351 +

5352 +#: builtin/bisect--helper.c:14

5353 +msgid "git bisect--helper --bisect-clean-state"

5354 +msgstr "git bisect--helper --bisect-clean-state"

5355 +

5356 +#: builtin/bisect--helper.c:46

5357 +#, c-format

5358 +msgid "'%s' is not a valid term"

5359 +msgstr "\"%s\" är inte en giltig term"

5360 +

5361 +#: builtin/bisect--helper.c:50

5362 +#, c-format

5363 +msgid "can't use the builtin command '%s' as a term"

5364 +msgstr "kan inte använda det inbyggda kommandot \"%s\" som term"

5365 +

5366 +#: builtin/bisect--helper.c:60

5367 +#, c-format

5368 +msgid "can't change the meaning of the term '%s'"

5369 +msgstr "kan inte ändra betydelsen av termen \"%s\""

5370 +

5371 +#: builtin/bisect--helper.c:71

5372 +msgid "please use two different terms"

5373 +msgstr "termerna måste vara olika"

5374 +

5375 +#: builtin/bisect--helper.c:78

5376 +msgid "could not open the file BISECT_TERMS"

5377 +msgstr "kunde inte öppna filen BISECT_TERMS"

5378 +

5379 +#: builtin/bisect--helper.c:120

5380 msgid "perform 'git bisect next'"

5381 msgstr "utför 'git bisect next'"

5382

5353 -#: builtin/bisect--helper.c:19

5383 +#: builtin/bisect--helper.c:122

5384 +msgid "write the terms to .git/BISECT_TERMS"

5385 +msgstr "skriv termerna i .git/BISECT_TERMS"

5386 +

5387 +#: builtin/bisect--helper.c:124

5388 +msgid "cleanup the bisection state"

5389 +msgstr "städar upp bisect-tillstånd"

5390 +

5391 +#: builtin/bisect--helper.c:126

5392 +msgid "check for expected revs"

5393 +msgstr "kontrollera för förväntade versioner"

5394 +

5395 +#: builtin/bisect--helper.c:128

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

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

5398

5399 +#: builtin/bisect--helper.c:143

5400 +msgid "--write-terms requires two arguments"

5401 +msgstr "--write-terms kräver två argument"

5402 +

5403 +#: builtin/bisect--helper.c:147

5404 +msgid "--bisect-clean-state requires no arguments"

5405 +msgstr "--bisect-clean-state tar inga argument"

5406 +

5407 #: builtin/blame.c:27

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

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

@@ -5610,52 +5660,52 @@ msgstr "Grenen %s ombaseras på %s"

5660 msgid "Branch %s is being bisected at %s"

5661 msgstr "Grenen %s är i en \"bisect\" på %s"

5662

5613 -#: builtin/branch.c:470

5663 +#: builtin/branch.c:471

5664 msgid "cannot copy the current branch while not on any."

5665 msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon."

5666

5617 -#: builtin/branch.c:472

5667 +#: builtin/branch.c:473

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

5669 msgstr ""

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

5671

5622 -#: builtin/branch.c:483

5672 +#: builtin/branch.c:484

5673 #, c-format

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

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

5676

5627 -#: builtin/branch.c:504

5677 +#: builtin/branch.c:511

5678 msgid "Branch rename failed"

5679 msgstr "Misslyckades byta namn på gren"

5680

5631 -#: builtin/branch.c:506

5681 +#: builtin/branch.c:513

5682 msgid "Branch copy failed"

5683 msgstr "Misslyckades kopiera gren"

5684

5635 -#: builtin/branch.c:510

5685 +#: builtin/branch.c:517

5686 #, c-format

5637 -msgid "Copied a misnamed branch '%s' away"

5638 -msgstr "Kopierade bort en felaktigt namngiven gren \"%s\""

5687 +msgid "Created a copy of a misnamed branch '%s'"

5688 +msgstr "Skapade kopia av felaktigt namngiven gren \"%s\""

5689

5640 -#: builtin/branch.c:513

5690 +#: builtin/branch.c:520

5691 #, c-format

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

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

5694

5645 -#: builtin/branch.c:519

5695 +#: builtin/branch.c:526

5696 #, c-format

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

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

5699

5650 -#: builtin/branch.c:528

5700 +#: builtin/branch.c:535

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

5702 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

5703

5654 -#: builtin/branch.c:530

5704 +#: builtin/branch.c:537

5705 msgid "Branch is copied, but update of config-file failed"

5706 msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen"

5707

5658 -#: builtin/branch.c:546

5708 +#: builtin/branch.c:553

5709 #, c-format

5710 msgid ""

5711 "Please edit the description for the branch\n"

@@ -5666,225 +5716,221 @@ msgstr ""

5716 " %s\n"

5717 "Rader som inleds med \"%c\" ignoreras.\n"

5718

5669 -#: builtin/branch.c:579

5719 +#: builtin/branch.c:586

5720 msgid "Generic options"

5721 msgstr "Allmänna flaggor"

5722

5673 -#: builtin/branch.c:581

5723 +#: builtin/branch.c:588

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

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

5726

5677 -#: builtin/branch.c:582

5727 +#: builtin/branch.c:589

5728 msgid "suppress informational messages"

5729 msgstr "undertryck informationsmeddelanden"

5730

5681 -#: builtin/branch.c:583

5731 +#: builtin/branch.c:590

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

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

5734

5685 -#: builtin/branch.c:585

5735 +#: builtin/branch.c:592

5736 msgid "do not use"

5737 msgstr "använd ej"

5738

5689 -#: builtin/branch.c:587

5739 +#: builtin/branch.c:594

5740 msgid "upstream"

5741 msgstr "uppströms"

5742

5693 -#: builtin/branch.c:587

5743 +#: builtin/branch.c:594

5744 msgid "change the upstream info"

5745 msgstr "ändra uppströmsinformationen"

5746

5697 -#: builtin/branch.c:588

5747 +#: builtin/branch.c:595

5748 msgid "Unset the upstream info"

5749 msgstr "Ta bort uppströmsinformationen"

5750

5701 -#: builtin/branch.c:589

5751 +#: builtin/branch.c:596

5752 msgid "use colored output"

5753 msgstr "använd färgad utdata"

5754

5705 -#: builtin/branch.c:590

5755 +#: builtin/branch.c:597

5756 msgid "act on remote-tracking branches"

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

5758

5709 -#: builtin/branch.c:592 builtin/branch.c:594

5759 +#: builtin/branch.c:599 builtin/branch.c:601

5760 msgid "print only branches that contain the commit"

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

5762

5713 -#: builtin/branch.c:593 builtin/branch.c:595

5763 +#: builtin/branch.c:600 builtin/branch.c:602

5764 msgid "print only branches that don't contain the commit"

5765 msgstr "visa endast grenar som inte innehåller incheckningen"

5766

5717 -#: builtin/branch.c:598

5767 +#: builtin/branch.c:605

5768 msgid "Specific git-branch actions:"

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

5770

5721 -#: builtin/branch.c:599

5771 +#: builtin/branch.c:606

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

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

5774

5725 -#: builtin/branch.c:601

5775 +#: builtin/branch.c:608

5776 msgid "delete fully merged branch"

5777 msgstr "ta bort helt sammanslagen gren"

5778

5729 -#: builtin/branch.c:602

5779 +#: builtin/branch.c:609

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

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

5782

5733 -#: builtin/branch.c:603

5783 +#: builtin/branch.c:610

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

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

5786

5737 -#: builtin/branch.c:604

5787 +#: builtin/branch.c:611

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

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

5790

5741 -#: builtin/branch.c:605

5791 +#: builtin/branch.c:612

5792 msgid "copy a branch and its reflog"

5793 msgstr "kopiera en gren och dess reflogg"

5794

5745 -#: builtin/branch.c:606

5795 +#: builtin/branch.c:613

5796 msgid "copy a branch, even if target exists"

5797 msgstr "kopiera en gren, även om målet finns"

5798

5749 -#: builtin/branch.c:607

5799 +#: builtin/branch.c:614

5800 msgid "list branch names"

5801 msgstr "lista namn på grenar"

5802

5753 -#: builtin/branch.c:608

5803 +#: builtin/branch.c:615

5804 msgid "create the branch's reflog"

5805 msgstr "skapa grenens reflogg"

5806

5757 -#: builtin/branch.c:610

5807 +#: builtin/branch.c:617

5808 msgid "edit the description for the branch"

5809 msgstr "redigera beskrivning för grenen"

5810

5761 -#: builtin/branch.c:611

5811 +#: builtin/branch.c:618

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

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

5814

5765 -#: builtin/branch.c:612

5815 +#: builtin/branch.c:619

5816 msgid "print only branches that are merged"

5817 msgstr "visa endast sammanslagna grenar"

5818

5769 -#: builtin/branch.c:613

5819 +#: builtin/branch.c:620

5820 msgid "print only branches that are not merged"

5821 msgstr "visa endast ej sammanslagna grenar"

5822

5773 -#: builtin/branch.c:614

5823 +#: builtin/branch.c:621

5824 msgid "list branches in columns"

5825 msgstr "visa grenar i spalter"

5826

5777 -#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405

5827 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405

5828 msgid "key"

5829 msgstr "nyckel"

5830

5781 -#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406

5831 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406

5832 msgid "field name to sort on"

5833 msgstr "fältnamn att sortera på"

5834

5785 -#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408

5835 +#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408

5836 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574

5837 #: builtin/tag.c:408

5838 msgid "object"

5839 msgstr "objekt"

5840

5791 -#: builtin/branch.c:619

5841 +#: builtin/branch.c:626

5842 msgid "print only branches of the object"

5843 msgstr "visa endast grenar för objektet"

5844

5795 -#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415

5845 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415

5846 msgid "sorting and filtering are case insensitive"

5847 msgstr "sortering och filtrering skiljer gemener och VERSALER"

5848

5799 -#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413

5849 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413

5850 #: builtin/verify-tag.c:39

5851 msgid "format to use for the output"

5852 msgstr "format att använda för utdata"

5853

5804 -#: builtin/branch.c:645 builtin/clone.c:729

5854 +#: builtin/branch.c:652 builtin/clone.c:730

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

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

5857

5808 -#: builtin/branch.c:668

5858 +#: builtin/branch.c:675

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

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

5861

5812 -#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741

5862 +#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751

5863 msgid "branch name required"

5864 msgstr "grennamn krävs"

5865

5816 -#: builtin/branch.c:708

5866 +#: builtin/branch.c:718

5867 msgid "Cannot give description to detached HEAD"

5868 msgstr "Kan inte beskriva frånkopplad HEAD"

5869

5820 -#: builtin/branch.c:713

5870 +#: builtin/branch.c:723

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

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

5873

5824 -#: builtin/branch.c:720

5874 +#: builtin/branch.c:730

5875 #, c-format

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

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

5878

5829 -#: builtin/branch.c:723

5879 +#: builtin/branch.c:733

5880 #, c-format

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

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

5883

5834 -#: builtin/branch.c:738

5884 +#: builtin/branch.c:748

5885 msgid "too many branches for a copy operation"

5886 msgstr "för många grenar för kopiering"

5887

5838 -#: builtin/branch.c:747

5888 +#: builtin/branch.c:757

5889 msgid "too many arguments for a rename operation"

5890 msgstr "för många flaggor för namnbyte"

5891

5842 -#: builtin/branch.c:752

5892 +#: builtin/branch.c:762

5893 msgid "too many arguments to set new upstream"

5894 msgstr "för många flaggor för att byta uppström"

5895

5846 -#: builtin/branch.c:756

5896 +#: builtin/branch.c:766

5897 #, c-format

5898 msgid ""

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

5900 msgstr ""

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

5902

5853 -#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800

5903 +#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807

5904 #, c-format

5905 msgid "no such branch '%s'"

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

5907

5858 -#: builtin/branch.c:763

5908 +#: builtin/branch.c:773

5909 #, c-format

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

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

5912

5863 -#: builtin/branch.c:775

5913 +#: builtin/branch.c:785

5914 msgid "too many arguments to unset upstream"

5915 msgstr "för många flaggor för att ta bort uppström"

5916

5867 -#: builtin/branch.c:779

5917 +#: builtin/branch.c:789

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

5919 msgstr ""

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

5921

5872 -#: builtin/branch.c:785

5922 +#: builtin/branch.c:795

5923 #, c-format

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

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

5926

5877 -#: builtin/branch.c:797

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

5879 -msgstr "kan inte skapa \"HEAD\" manuellt"

5880 -

5881 -#: builtin/branch.c:803

5927 +#: builtin/branch.c:810

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

5929 msgstr ""

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

5931 "grennamn"

5932

5887 -#: builtin/branch.c:806

5933 +#: builtin/branch.c:813

5934 msgid ""

5935 "the '--set-upstream' option is no longer supported. Please use '--track' or "

5936 "'--set-upstream-to' instead."

@@ -5949,7 +5995,7 @@ msgstr "för blob-objekt, kör filter på objektets innehåll"

5995 msgid "for blob objects, run filters on object's content"

5996 msgstr "för blob-objekt, kör filger på objektets innehåll"

5997

5952 -#: builtin/cat-file.c:569 git-submodule.sh:943

5998 +#: builtin/cat-file.c:569 git-submodule.sh:931

5999 msgid "blob"

6000 msgstr "blob"

6001

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

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

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

6054

6009 -#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358

6055 +#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358

6056 msgid "suppress progress reporting"

6057 msgstr "undertryck förloppsrapportering"

6058

@@ -6063,160 +6109,160 @@ msgstr "inga kontakter angavs"

6109 msgid "git checkout-index [<options>] [--] [<file>...]"

6110 msgstr "git checkout-index [<flaggor>] [--] [<fil>...]"

6111

6066 -#: builtin/checkout-index.c:145

6112 +#: builtin/checkout-index.c:143

6113 msgid "stage should be between 1 and 3 or all"

6114 msgstr "etapp måste vara mellan 1 och 3 eller \"all\""

6115

6070 -#: builtin/checkout-index.c:161

6116 +#: builtin/checkout-index.c:159

6117 msgid "check out all files in the index"

6118 msgstr "checka ut alla filer i indexet"

6119

6074 -#: builtin/checkout-index.c:162

6120 +#: builtin/checkout-index.c:160

6121 msgid "force overwrite of existing files"

6122 msgstr "tvinga överskrivning av befintliga filer"

6123

6078 -#: builtin/checkout-index.c:164

6124 +#: builtin/checkout-index.c:162

6125 msgid "no warning for existing files and files not in index"

6126 msgstr "ingen varning för existerande filer och filer ej i indexet"

6127

6082 -#: builtin/checkout-index.c:166

6128 +#: builtin/checkout-index.c:164

6129 msgid "don't checkout new files"

6130 msgstr "checka inte ut nya filer"

6131

6086 -#: builtin/checkout-index.c:168

6132 +#: builtin/checkout-index.c:166

6133 msgid "update stat information in the index file"

6134 msgstr "uppdatera stat-information i indexfilen"

6135

6090 -#: builtin/checkout-index.c:172

6136 +#: builtin/checkout-index.c:170

6137 msgid "read list of paths from the standard input"

6138 msgstr "läs listan över sökvägar från standard in"

6139

6094 -#: builtin/checkout-index.c:174

6140 +#: builtin/checkout-index.c:172

6141 msgid "write the content to temporary files"

6142 msgstr "skriv innehåll till temporära filer"

6143

6098 -#: builtin/checkout-index.c:175 builtin/column.c:31

6099 -#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631

6100 -#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999

6101 -#: builtin/worktree.c:498

6144 +#: builtin/checkout-index.c:173 builtin/column.c:31

6145 +#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869

6146 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237

6147 +#: builtin/worktree.c:552

6148 msgid "string"

6149 msgstr "sträng"

6150

6105 -#: builtin/checkout-index.c:176

6151 +#: builtin/checkout-index.c:174

6152 msgid "when creating files, prepend <string>"

6153 msgstr "när filer skapas, lägg till <sträng> först"

6154

6109 -#: builtin/checkout-index.c:178

6155 +#: builtin/checkout-index.c:176

6156 msgid "copy out the files from named stage"

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

6158

6113 -#: builtin/checkout.c:26

6159 +#: builtin/checkout.c:27

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

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

6162

6117 -#: builtin/checkout.c:27

6163 +#: builtin/checkout.c:28

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

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

6166

6121 -#: builtin/checkout.c:135 builtin/checkout.c:168

6167 +#: builtin/checkout.c:136 builtin/checkout.c:169

6168 #, c-format

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

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

6171

6126 -#: builtin/checkout.c:137 builtin/checkout.c:170

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

6173 #, c-format

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

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

6176

6131 -#: builtin/checkout.c:153

6177 +#: builtin/checkout.c:154

6178 #, c-format

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

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

6181

6136 -#: builtin/checkout.c:197

6182 +#: builtin/checkout.c:198

6183 #, c-format

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

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

6186

6141 -#: builtin/checkout.c:214

6187 +#: builtin/checkout.c:215

6188 #, c-format

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

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

6191

6146 -#: builtin/checkout.c:231

l10n: sv.po: Update Swedish translation (3284t0f0u)