2613f067dc · matheusbsbs/matheus-bagliano

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2019-05-14 17:09+0800\n"

11 -"PO-Revision-Date: 2019-05-14 15:44+0100\n"

10 +"POT-Creation-Date: 2019-07-30 09:59+0800\n"

11 +"PO-Revision-Date: 2019-07-31 12:40+0200\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"

@@ -16,49 +16,49 @@ msgstr ""

16 "Content-Type: text/plain; charset=UTF-8\n"

17 "Content-Transfer-Encoding: 8bit\n"

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

19 -"X-Generator: Gtranslator 2.91.7\n"

19 +"X-Generator: Poedit 2.0.2\n"

20

21 -#: advice.c:103

21 +#: advice.c:109

22 #, c-format

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

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

25

26 -#: advice.c:156

26 +#: advice.c:162

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

32 +#: advice.c:164

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

38 +#: advice.c:166

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

44 +#: advice.c:168

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

49 +#: advice.c:170

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

55 +#: advice.c:172

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

61 +#: advice.c:180

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,49 +66,63 @@ 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:182

69 +#: advice.c:188

70 msgid "Exiting because of an unresolved conflict."

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

72

73 -#: advice.c:187 builtin/merge.c:1320

73 +#: advice.c:193 builtin/merge.c:1327

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

77 +#: advice.c:195

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

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

80

81 -#: advice.c:190

81 +#: advice.c:196

82 msgid "Exiting because of unfinished merge."

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

84

85 -#: advice.c:196

85 +#: advice.c:202

86 #, c-format

87 msgid ""

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

88 +"Note: switching to '%s'.\n"

89 "\n"

90 "You are in 'detached HEAD' state. You can look around, make experimental\n"

91 "changes and commit them, and you can discard any commits you make in this\n"

92 -"state without impacting any branches by performing another checkout.\n"

92 +"state without impacting any branches by switching back to a branch.\n"

93 "\n"

94 "If you want to create a new branch to retain commits you create, you may\n"

95 -"do so (now or later) by using -b with the checkout command again. Example:\n"

95 +"do so (now or later) by using -c with the switch command. Example:\n"

96 "\n"

97 -" git checkout -b <new-branch-name>\n"

97 +" git switch -c <new-branch-name>\n"

98 +"\n"

99 +"Or undo this operation with:\n"

100 +"\n"

101 +" git switch -\n"

102 +"\n"

103 +"Turn off this advice by setting config variable advice.detachedHead to "

104 +"false\n"

105 "\n"

106 msgstr ""

107 "Observera: checkar ut \"%s\".\n"

108 "\n"

109 "Du har nu ett \"frånkopplat HEAD\". Du kan se dig omkring, experimentera\n"

110 "med ändringar och checka in dem, och du kan kasta incheckningar du gör\n"

104 -"i det här läget utan att det påverkar grenar genom att checka ut på\n"

105 -"nytt.\n"

111 +"i det här läget utan att det påverkar grenar genom att växla tillbaka\n"

112 +"till en gren.\n"

113 "\n"

114 "Om du vill skapa en ny gren för att behålla ändringarna du skapar, kan\n"

108 -"du göra det (nu eller senare) genom att använda checkout-kommandot igen\n"

109 -"med -b. Till exempel:\n"

115 +"du göra det (nu eller senare) genom att använda switch-kommandot med -c.\n"

116 +"Exempel:\n"

117 +"\n"

118 +" git switch -c <namn-på-ny-gren>\n"

119 "\n"

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

120 +"Eller gör den här ändringen ogjord med:\n"

121 +"\n"

122 +" git switch -\n"

123 +"\n"

124 +"Stäng av den här hjälptexten genom att sätta konfigurationsvariabeln\n"

125 +"advice.detachedHead till false\n"

126 "\n"

127

128 #: alias.c:50

@@ -119,92 +133,92 @@ msgstr "kommandorad avslutas med \\"

133 msgid "unclosed quote"

134 msgstr "citat ej stängt"

135

122 -#: apply.c:63

136 +#: apply.c:69

137 #, c-format

138 msgid "unrecognized whitespace option '%s'"

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

140

127 -#: apply.c:79

141 +#: apply.c:85

142 #, c-format

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

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

145

132 -#: apply.c:129

146 +#: apply.c:135

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

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

149

136 -#: apply.c:131

150 +#: apply.c:137

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

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

153

140 -#: apply.c:134

154 +#: apply.c:140

155 msgid "--3way outside a repository"

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

157

144 -#: apply.c:145

158 +#: apply.c:151

159 msgid "--index outside a repository"

160 msgstr "--index utanför arkiv"

161

148 -#: apply.c:148

162 +#: apply.c:154

163 msgid "--cached outside a repository"

164 msgstr "--cached utanför arkiv"

165

152 -#: apply.c:829

166 +#: apply.c:801

167 #, c-format

168 msgid "Cannot prepare timestamp regexp %s"

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

170

157 -#: apply.c:838

171 +#: apply.c:810

172 #, c-format

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

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

175

162 -#: apply.c:912

176 +#: apply.c:884

177 #, c-format

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

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

180

167 -#: apply.c:950

181 +#: apply.c:922

182 #, c-format

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

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

185

172 -#: apply.c:956

186 +#: apply.c:928

187 #, c-format

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

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

190

177 -#: apply.c:957

191 +#: apply.c:929

192 #, c-format

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

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

195

182 -#: apply.c:962

196 +#: apply.c:934

197 #, c-format

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

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

200

187 -#: apply.c:991

201 +#: apply.c:963

202 #, c-format

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

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

205

192 -#: apply.c:1310

206 +#: apply.c:1282

207 #, c-format

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

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

210

197 -#: apply.c:1482

211 +#: apply.c:1460

212 #, c-format

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

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

215

202 -#: apply.c:1551

216 +#: apply.c:1529

217 #, c-format

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

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

220

207 -#: apply.c:1571

221 +#: apply.c:1551

222 #, c-format

223 msgid ""

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

@@ -220,82 +234,82 @@ msgstr[1] ""

234 "sökvägskomponenter\n"

235 "tas bort (rad %d)"

236

223 -#: apply.c:1584

237 +#: apply.c:1564

238 #, c-format

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

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

241

228 -#: apply.c:1772

242 +#: apply.c:1752

243 msgid "new file depends on old contents"

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

245

232 -#: apply.c:1774

246 +#: apply.c:1754

247 msgid "deleted file still has contents"

248 msgstr "borttagen fil har fortfarande innehåll"

249

236 -#: apply.c:1808

250 +#: apply.c:1788

251 #, c-format

252 msgid "corrupt patch at line %d"

253 msgstr "trasig patch på rad %d"

254

241 -#: apply.c:1845

255 +#: apply.c:1825

256 #, c-format

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

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

259

246 -#: apply.c:1847

260 +#: apply.c:1827

261 #, c-format

262 msgid "deleted file %s still has contents"

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

264

251 -#: apply.c:1850

265 +#: apply.c:1830

266 #, c-format

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

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

269

256 -#: apply.c:1997

270 +#: apply.c:1977

271 #, c-format

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

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

274

261 -#: apply.c:2034

275 +#: apply.c:2014

276 #, c-format

277 msgid "unrecognized binary patch at line %d"

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

279

266 -#: apply.c:2196

280 +#: apply.c:2176

281 #, c-format

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

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

284

271 -#: apply.c:2282

285 +#: apply.c:2262

286 #, c-format

287 msgid "unable to read symlink %s"

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

289

276 -#: apply.c:2286

290 +#: apply.c:2266

291 #, c-format

292 msgid "unable to open or read %s"

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

294

281 -#: apply.c:2945

295 +#: apply.c:2925

296 #, c-format

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

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

299

286 -#: apply.c:3066

300 +#: apply.c:3046

301 #, c-format

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

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

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

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

306

293 -#: apply.c:3078

307 +#: apply.c:3058

308 #, c-format

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

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

311

298 -#: apply.c:3084

312 +#: apply.c:3064

313 #, c-format

314 msgid ""

315 "while searching for:\n"

@@ -304,25 +318,25 @@ msgstr ""

318 "vid sökning efter:\n"

319 "%.*s"

320

307 -#: apply.c:3106

321 +#: apply.c:3086

322 #, c-format

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

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

325

312 -#: apply.c:3114

326 +#: apply.c:3094

327 #, c-format

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

329 msgstr ""

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

331 "\""

332

319 -#: apply.c:3161

333 +#: apply.c:3141

334 #, c-format

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

336 msgstr ""

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

338

325 -#: apply.c:3171

339 +#: apply.c:3151

340 #, c-format

341 msgid ""

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

@@ -330,426 +344,426 @@ msgstr ""

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

345 "innehållet."

346

333 -#: apply.c:3179

347 +#: apply.c:3159

348 #, c-format

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

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

351

338 -#: apply.c:3197

352 +#: apply.c:3177

353 #, c-format

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

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

356

343 -#: apply.c:3210

357 +#: apply.c:3190

358 #, c-format

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

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

361

348 -#: apply.c:3216

362 +#: apply.c:3196

363 #, c-format

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

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

366

353 -#: apply.c:3237

367 +#: apply.c:3217

368 #, c-format

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

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

371

358 -#: apply.c:3360

372 +#: apply.c:3340

373 #, c-format

374 msgid "cannot checkout %s"

375 msgstr "kan inte checka ut %s"

376

363 -#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279

377 +#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279

378 #, c-format

379 msgid "failed to read %s"

380 msgstr "misslyckades läsa %s"

381

368 -#: apply.c:3420

382 +#: apply.c:3400

383 #, c-format

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

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

386

373 -#: apply.c:3449 apply.c:3692

387 +#: apply.c:3429 apply.c:3672

388 #, c-format

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

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

391

378 -#: apply.c:3535 apply.c:3707

392 +#: apply.c:3515 apply.c:3687

393 #, c-format

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

395 msgstr "%s: finns inte i indexet"

396

383 -#: apply.c:3544 apply.c:3715

397 +#: apply.c:3524 apply.c:3695

398 #, c-format

399 msgid "%s: does not match index"

400 msgstr "%s: motsvarar inte indexet"

401

388 -#: apply.c:3579

402 +#: apply.c:3559

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

404 msgstr ""

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

406 "vägssammanslagning."

407

394 -#: apply.c:3582

408 +#: apply.c:3562

409 #, c-format

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

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

412

399 -#: apply.c:3598 apply.c:3602

413 +#: apply.c:3578 apply.c:3582

414 #, c-format

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

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

417

404 -#: apply.c:3614

418 +#: apply.c:3594

419 #, c-format

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

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

422

409 -#: apply.c:3628

423 +#: apply.c:3608

424 #, c-format

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

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

427

414 -#: apply.c:3633

428 +#: apply.c:3613

429 #, c-format

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

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

432

419 -#: apply.c:3659

433 +#: apply.c:3639

434 msgid "removal patch leaves file contents"

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

436

423 -#: apply.c:3732

437 +#: apply.c:3712

438 #, c-format

439 msgid "%s: wrong type"

440 msgstr "%s: fel typ"

441

428 -#: apply.c:3734

442 +#: apply.c:3714

443 #, c-format

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

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

446

433 -#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856

447 +#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856

448 #: read-cache.c:1309

449 #, c-format

450 msgid "invalid path '%s'"

437 -msgstr "ogiltig sökväg ”%s”"

451 +msgstr "ogiltig sökväg \"%s\""

452

439 -#: apply.c:3943

453 +#: apply.c:3923

454 #, c-format

455 msgid "%s: already exists in index"

456 msgstr "%s: finns redan i indexet"

457

444 -#: apply.c:3946

458 +#: apply.c:3926

459 #, c-format

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

461 msgstr "%s: finns redan i arbetskatalogen"

462

449 -#: apply.c:3966

463 +#: apply.c:3946

464 #, c-format

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

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

467

454 -#: apply.c:3971

468 +#: apply.c:3951

469 #, c-format

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

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

472

459 -#: apply.c:3991

473 +#: apply.c:3971

474 #, c-format

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

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

477

464 -#: apply.c:3995

478 +#: apply.c:3975

479 #, c-format

480 msgid "%s: patch does not apply"

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

482

469 -#: apply.c:4010

483 +#: apply.c:3990

484 #, c-format

485 msgid "Checking patch %s..."

486 msgstr "Kontrollerar patchen %s..."

487

474 -#: apply.c:4102

488 +#: apply.c:4082

489 #, c-format

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

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

492

479 -#: apply.c:4109

493 +#: apply.c:4089

494 #, c-format

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

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

497

484 -#: apply.c:4112

498 +#: apply.c:4092

499 #, c-format

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

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

502

489 -#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143

503 +#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143

504 #, c-format

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

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

507

494 -#: apply.c:4121

508 +#: apply.c:4101

509 #, c-format

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

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

512

499 -#: apply.c:4131

513 +#: apply.c:4111

514 #, c-format

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

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

517

504 -#: apply.c:4269

518 +#: apply.c:4249

519 #, c-format

520 msgid "unable to remove %s from index"

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

522

509 -#: apply.c:4303

523 +#: apply.c:4283

524 #, c-format

525 msgid "corrupt patch for submodule %s"

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

527

514 -#: apply.c:4309

528 +#: apply.c:4289

529 #, c-format

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

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

532

519 -#: apply.c:4317

533 +#: apply.c:4297

534 #, c-format

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

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

537

524 -#: apply.c:4323 apply.c:4468

538 +#: apply.c:4303 apply.c:4448

539 #, c-format

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

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

542

529 -#: apply.c:4366

543 +#: apply.c:4346

544 #, c-format

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

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

547

534 -#: apply.c:4370

548 +#: apply.c:4350

549 #, c-format

550 msgid "closing file '%s'"

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

552

539 -#: apply.c:4440

553 +#: apply.c:4420

554 #, c-format

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

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

557

544 -#: apply.c:4538

558 +#: apply.c:4518

559 #, c-format

560 msgid "Applied patch %s cleanly."

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

562

549 -#: apply.c:4546

563 +#: apply.c:4526

564 msgid "internal error"

565 msgstr "internt fel"

566

553 -#: apply.c:4549

567 +#: apply.c:4529

568 #, c-format

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

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

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

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

573

560 -#: apply.c:4560

574 +#: apply.c:4540

575 #, c-format

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

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

578

565 -#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118

579 +#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161

580 #, c-format

581 msgid "cannot open %s"

582 msgstr "kan inte öppna %s"

583

570 -#: apply.c:4582

584 +#: apply.c:4562

585 #, c-format

586 msgid "Hunk #%d applied cleanly."

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

588

575 -#: apply.c:4586

589 +#: apply.c:4566

590 #, c-format

591 msgid "Rejected hunk #%d."

592 msgstr "Refuserar stycke %d."

593

580 -#: apply.c:4696

594 +#: apply.c:4676

595 #, c-format

596 msgid "Skipped patch '%s'."

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

598

585 -#: apply.c:4704

599 +#: apply.c:4684

600 msgid "unrecognized input"

601 msgstr "indata känns inte igen"

602

589 -#: apply.c:4724

603 +#: apply.c:4704

604 msgid "unable to read index file"

605 msgstr "kan inte läsa indexfilen"

606

593 -#: apply.c:4879

607 +#: apply.c:4859

608 #, c-format

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

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

611

598 -#: apply.c:4906

612 +#: apply.c:4886

613 #, c-format

614 msgid "squelched %d whitespace error"

615 msgid_plural "squelched %d whitespace errors"

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

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

618

605 -#: apply.c:4912 apply.c:4927

619 +#: apply.c:4892 apply.c:4907

620 #, c-format

621 msgid "%d line adds whitespace errors."

622 msgid_plural "%d lines add whitespace errors."

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

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

625

612 -#: apply.c:4920

626 +#: apply.c:4900

627 #, c-format

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

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

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

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

632

619 -#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

633 +#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

634 msgid "Unable to write new index file"

635 msgstr "Kunde inte skriva ny indexfil"

636

623 -#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213

624 -#: builtin/clone.c:123 builtin/fetch.c:118 builtin/merge.c:271

625 -#: builtin/pull.c:207 builtin/submodule--helper.c:407

626 -#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369

627 -#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852

628 -#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197

637 +#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211

638 +#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273

639 +#: builtin/pull.c:208 builtin/submodule--helper.c:407

640 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370

641 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853

642 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211

643 msgid "path"

644 msgstr "sökväg"

645

632 -#: apply.c:4964

646 +#: apply.c:4944

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

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

649

636 -#: apply.c:4967

650 +#: apply.c:4947

651 msgid "apply changes matching the given path"

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

653

640 -#: apply.c:4969 builtin/am.c:2219

654 +#: apply.c:4949 builtin/am.c:2217

655 msgid "num"

656 msgstr "antal"

657

644 -#: apply.c:4970

658 +#: apply.c:4950

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

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

661

648 -#: apply.c:4973

662 +#: apply.c:4953

663 msgid "ignore additions made by the patch"

664 msgstr "ignorera tillägg gjorda av patchen"

665

652 -#: apply.c:4975

666 +#: apply.c:4955

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

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

669

656 -#: apply.c:4979

670 +#: apply.c:4959

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

672 msgstr "visa antal tillagda och borttagna rader decimalt"

673

660 -#: apply.c:4981

674 +#: apply.c:4961

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

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

677

664 -#: apply.c:4983

678 +#: apply.c:4963

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

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

681

668 -#: apply.c:4985

682 +#: apply.c:4965

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

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

685

672 -#: apply.c:4987

686 +#: apply.c:4967

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

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

689

676 -#: apply.c:4989

690 +#: apply.c:4969

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

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

693

680 -#: apply.c:4991

694 +#: apply.c:4971

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

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

697

684 -#: apply.c:4994

698 +#: apply.c:4974

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

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

701

688 -#: apply.c:4996

702 +#: apply.c:4976

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

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

705

692 -#: apply.c:4998

706 +#: apply.c:4978

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

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

709

696 -#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524

710 +#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524

711 msgid "paths are separated with NUL character"

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

713

700 -#: apply.c:5003

714 +#: apply.c:4983

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

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

717

704 -#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97

705 -#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101

706 -#: builtin/pack-objects.c:3317 builtin/rebase.c:1415

718 +#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98

719 +#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

720 +#: builtin/pack-objects.c:3319 builtin/rebase.c:1421

721 msgid "action"

722 msgstr "åtgärd"

723

710 -#: apply.c:5005

724 +#: apply.c:4985

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

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

727

714 -#: apply.c:5008 apply.c:5011

728 +#: apply.c:4988 apply.c:4991

729 msgid "ignore changes in whitespace when finding context"

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

731

718 -#: apply.c:5014

732 +#: apply.c:4994

733 msgid "apply the patch in reverse"

734 msgstr "tillämpa patchen baklänges"

735

722 -#: apply.c:5016

736 +#: apply.c:4996

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

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

739

726 -#: apply.c:5018

740 +#: apply.c:4998

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

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

743

730 -#: apply.c:5020

744 +#: apply.c:5000

745 msgid "allow overlapping hunks"

746 msgstr "tillåt överlappande stycken"

747

734 -#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22

735 -#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786

736 -#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128

748 +#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22

749 +#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786

750 +#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128

751 msgid "be verbose"

752 msgstr "var pratsam"

753

740 -#: apply.c:5023

754 +#: apply.c:5003

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

756 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

757

744 -#: apply.c:5026

758 +#: apply.c:5006

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

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

761

748 -#: apply.c:5028 builtin/am.c:2207

762 +#: apply.c:5008 builtin/am.c:2205

763 msgid "root"

764 msgstr "rot"

765

752 -#: apply.c:5029

766 +#: apply.c:5009

767 msgid "prepend <root> to all filenames"

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

769

@@ -792,98 +806,98 @@ msgstr "objektnamnet är inte giltigt: %s"

806 msgid "not a tree object: %s"

807 msgstr "inte ett trädobjekt: %s"

808

795 -#: archive.c:424

809 +#: archive.c:426

810 msgid "current working directory is untracked"

811 msgstr "aktuell arbetskatalog är inte spårad"

812

799 -#: archive.c:455

813 +#: archive.c:457

814 msgid "fmt"

815 msgstr "fmt"

816

803 -#: archive.c:455

817 +#: archive.c:457

818 msgid "archive format"

819 msgstr "arkivformat"

820

807 -#: archive.c:456 builtin/log.c:1557

821 +#: archive.c:458 builtin/log.c:1597

822 msgid "prefix"

823 msgstr "prefix"

824

811 -#: archive.c:457

825 +#: archive.c:459

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

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

828

815 -#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822

816 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091

817 -#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105

829 +#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875

830 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134

831 +#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105

832 #: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412

819 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:176

833 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177

834 msgid "file"

835 msgstr "fil"

836

823 -#: archive.c:459 builtin/archive.c:90

837 +#: archive.c:461 builtin/archive.c:90

838 msgid "write the archive to this file"

839 msgstr "skriv arkivet till filen"

840

827 -#: archive.c:461

841 +#: archive.c:463

842 msgid "read .gitattributes in working directory"

843 msgstr "läs .gitattributes i arbetskatalogen"

844

831 -#: archive.c:462

845 +#: archive.c:464

846 msgid "report archived files on stderr"

847 msgstr "rapportera arkiverade filer på standard fel"

848

835 -#: archive.c:463

849 +#: archive.c:465

850 msgid "store only"

851 msgstr "endast spara"

852

839 -#: archive.c:464

853 +#: archive.c:466

854 msgid "compress faster"

855 msgstr "komprimera snabbare"

856

843 -#: archive.c:472

857 +#: archive.c:474

858 msgid "compress better"

859 msgstr "komprimera bättre"

860

847 -#: archive.c:475

861 +#: archive.c:477

862 msgid "list supported archive formats"

863 msgstr "visa understödda arkivformat"

864

851 -#: archive.c:477 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

852 -#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858

865 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

866 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859

867 msgid "repo"

868 msgstr "arkiv"

869

856 -#: archive.c:478 builtin/archive.c:92

870 +#: archive.c:480 builtin/archive.c:92

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

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

873

860 -#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:713

874 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707

875 #: builtin/notes.c:498

876 msgid "command"

877 msgstr "kommando"

878

865 -#: archive.c:480 builtin/archive.c:94

879 +#: archive.c:482 builtin/archive.c:94

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

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

882

869 -#: archive.c:487

883 +#: archive.c:489

884 msgid "Unexpected option --remote"

885 msgstr "Oväntad flagga --remote"

886

873 -#: archive.c:489

887 +#: archive.c:491

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

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

890

877 -#: archive.c:491

891 +#: archive.c:493

892 msgid "Unexpected option --output"

893 msgstr "Oväntad flagga --output"

894

881 -#: archive.c:513

895 +#: archive.c:515

896 #, c-format

897 msgid "Unknown archive format '%s'"

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

899

886 -#: archive.c:520

900 +#: archive.c:522

901 #, c-format

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

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

@@ -1030,12 +1044,12 @@ msgstr "Bisect: en sammanslagningsbas måste testas\n"

1044 msgid "a %s revision is needed"

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

1046

1033 -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248

1047 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254

1048 #, c-format

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

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

1051

1038 -#: bisect.c:928 builtin/merge.c:146

1052 +#: bisect.c:928 builtin/merge.c:148

1053 #, c-format

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

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

@@ -1075,41 +1089,41 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"

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

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

1091

1078 -#: blame.c:1794

1092 +#: blame.c:2697

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

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

1095

1082 -#: blame.c:1808

1096 +#: blame.c:2711

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

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

1099

1086 -#: blame.c:1829

1100 +#: blame.c:2732

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

1102 msgstr ""

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

1104 "incheckningen"

1105

1092 -#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030

1093 -#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940

1094 -#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415

1095 -#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155

1106 +#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033

1107 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980

1108 +#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411

1109 +#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157

1110 #: builtin/shortlog.c:192

1111 msgid "revision walk setup failed"

1112 msgstr "misslyckades skapa revisionstraversering"

1113

1100 -#: blame.c:1856

1114 +#: blame.c:2759

1115 msgid ""

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

1117 msgstr ""

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

1119 "kedjan"

1120

1107 -#: blame.c:1867

1121 +#: blame.c:2770

1122 #, c-format

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

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

1125

1112 -#: blame.c:1878

1126 +#: blame.c:2781

1127 #, c-format

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

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

@@ -1196,7 +1210,7 @@ msgstr "\"%s\" är inte ett giltigt grennamn."

1210 #: branch.c:208

1211 #, c-format

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

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

1213 +msgstr "Det finns redan en gren som heter \"%s\"."

1214

1215 #: branch.c:213

1216 msgid "Cannot force update the current branch."

@@ -1245,14 +1259,14 @@ msgstr "Objektnamnet är tvetydigt: \"%s\"."

1259 #: branch.c:306

1260 #, c-format

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

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

1262 +msgstr "Avgreningspunkten är inte giltig: \"%s\"."

1263

1250 -#: branch.c:359

1264 +#: branch.c:364

1265 #, c-format

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

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

1268

1255 -#: branch.c:382

1269 +#: branch.c:387

1270 #, c-format

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

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

@@ -1267,8 +1281,8 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"

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

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

1283

1270 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916

1271 -#: builtin/commit.c:788

1284 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024

1285 +#: builtin/commit.c:791

1286 #, c-format

1287 msgid "could not open '%s'"

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

@@ -1277,60 +1291,64 @@ msgstr "kunde inte öppna \"%s\""

1291 msgid "Repository lacks these prerequisite commits:"

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

1293

1280 -#: bundle.c:194

1294 +#: bundle.c:146

1295 +msgid "need a repository to verify a bundle"

1296 +msgstr "behöver ett arkiv för att verifiera ett paket (bundle)."

1297 +

1298 +#: bundle.c:197

1299 #, c-format

1300 msgid "The bundle contains this ref:"

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

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

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

1304

1287 -#: bundle.c:201

1305 +#: bundle.c:204

1306 msgid "The bundle records a complete history."

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

1308

1291 -#: bundle.c:203

1309 +#: bundle.c:206

1310 #, c-format

1311 msgid "The bundle requires this ref:"

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

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

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

1315

1298 -#: bundle.c:269

1316 +#: bundle.c:272

1317 msgid "unable to dup bundle descriptor"

1318 msgstr "kan inte duplicera pakethandtag"

1319

1302 -#: bundle.c:276

1320 +#: bundle.c:279

1321 msgid "Could not spawn pack-objects"

1322 msgstr "Kunde inte starta pack-objects"

1323

1306 -#: bundle.c:287

1324 +#: bundle.c:290

1325 msgid "pack-objects died"

1326 msgstr "pack-objects misslyckades"

1327

1310 -#: bundle.c:329

1328 +#: bundle.c:332

1329 msgid "rev-list died"

1330 msgstr "rev-list dog"

1331

1314 -#: bundle.c:378

1332 +#: bundle.c:381

1333 #, c-format

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

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

1336

1319 -#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306

1337 +#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306

1338 #, c-format

1339 msgid "unrecognized argument: %s"

1340 msgstr "okänt argument: %s"

1341

1324 -#: bundle.c:465

1342 +#: bundle.c:468

1343 msgid "Refusing to create empty bundle."

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

1345

1328 -#: bundle.c:475

1346 +#: bundle.c:478

1347 #, c-format

1348 msgid "cannot create '%s'"

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

1350

1333 -#: bundle.c:500

1351 +#: bundle.c:503

1352 msgid "index-pack died"

1353 msgstr "index-pack dog"

1354

@@ -1339,8 +1357,8 @@ msgstr "index-pack dog"

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

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

1359

1342 -#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399

1343 -#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455

1360 +#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399

1361 +#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455

1362 #, c-format

1363 msgid "could not parse %s"

1364 msgstr "kunde inte tolka %s"

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

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

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

1370

1353 -#: commit.c:193

1371 +#: commit.c:192

1372 msgid ""

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

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

@@ -1370,29 +1388,29 @@ msgstr ""

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

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

1390

1373 -#: commit.c:1128

1391 +#: commit.c:1127

1392 #, c-format

1393 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

1394 msgstr ""

1395 "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."

1396

1379 -#: commit.c:1131

1397 +#: commit.c:1130

1398 #, c-format

1399 msgid "Commit %s has a bad GPG signature allegedly by %s."

1400 msgstr ""

1401 "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."

1402

1385 -#: commit.c:1134

1403 +#: commit.c:1133

1404 #, c-format

1405 msgid "Commit %s does not have a GPG signature."

1406 msgstr "Incheckning %s har inte någon GPG-signatur."

1407

1390 -#: commit.c:1137

1408 +#: commit.c:1136

1409 #, c-format

1410 msgid "Commit %s has a good GPG signature by %s\n"

1411 msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"

1412

1395 -#: commit.c:1391

1413 +#: commit.c:1390

1414 msgid ""

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

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

@@ -1402,177 +1420,232 @@ msgstr ""

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

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

1422

1405 -#: commit-graph.c:105

1423 +#: commit-graph.c:127

1424 msgid "commit-graph file is too small"

1425 msgstr "incheckningsgraffilen %s är för liten"

1426

1409 -#: commit-graph.c:170

1427 +#: commit-graph.c:192

1428 #, c-format

1429 msgid "commit-graph signature %X does not match signature %X"

1430 msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X"

1431

1414 -#: commit-graph.c:177

1432 +#: commit-graph.c:199

1433 #, c-format

1434 msgid "commit-graph version %X does not match version %X"

1435 msgstr "incheckningsgrafens version %X stämmer inte med versionen %X"

1436

1419 -#: commit-graph.c:184

1437 +#: commit-graph.c:206

1438 #, c-format

1439 msgid "commit-graph hash version %X does not match version %X"

1440 msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X"

1441

1424 -#: commit-graph.c:207

1442 +#: commit-graph.c:229

1443 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"

1444 msgstr ""

1445 "incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara "

1446 "ofullständig"

1447

1430 -#: commit-graph.c:218

1448 +#: commit-graph.c:240

1449 #, c-format

1450 msgid "commit-graph improper chunk offset %08x%08x"

1451 msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen"

1452

1435 -#: commit-graph.c:255

1453 +#: commit-graph.c:283

1454 #, c-format

1455 msgid "commit-graph chunk id %08x appears multiple times"

1456 msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger"

1457

1440 -#: commit-graph.c:388

1458 +#: commit-graph.c:347

1459 +msgid "commit-graph has no base graphs chunk"

1460 +msgstr "incheckningsgrafen har inga bas-graf-stycken"

1461 +

1462 +#: commit-graph.c:357

1463 +msgid "commit-graph chain does not match"

1464 +msgstr "incheckningsgrafens kedja stämmer inte"

1465 +

1466 +#: commit-graph.c:404

1467 +#, c-format

1468 +msgid "invalid commit-graph chain: line '%s' not a hash"

1469 +msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"

1470 +

1471 +#: commit-graph.c:430

1472 +msgid "unable to find all commit-graph files"

1473 +msgstr "kan inte hitta alla incheckingsgraffiler"

1474 +

1475 +#: commit-graph.c:553 commit-graph.c:613

1476 +msgid "invalid commit position. commit-graph is likely corrupt"

1477 +msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"

1478 +

1479 +#: commit-graph.c:574

1480 #, c-format

1481 msgid "could not find commit %s"

1482 msgstr "kunde inte hitta incheckningen %s"

1483

1445 -#: commit-graph.c:730 builtin/pack-objects.c:2649

1484 +#: commit-graph.c:1001 builtin/pack-objects.c:2651

1485 #, c-format

1486 msgid "unable to get type of object %s"

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

1488

1450 -#: commit-graph.c:763

1489 +#: commit-graph.c:1033

1490 msgid "Loading known commits in commit graph"

1491 msgstr "Läser in kända incheckningar i incheckningsgraf"

1492

1454 -#: commit-graph.c:779

1493 +#: commit-graph.c:1050

1494 msgid "Expanding reachable commits in commit graph"

1495 msgstr "Expanderar nåbara incheckningar i incheckningsgraf"

1496

1458 -#: commit-graph.c:791

1497 +#: commit-graph.c:1069

1498 msgid "Clearing commit marks in commit graph"

1499 msgstr "Rensar incheckningsmärken i incheckningsgraf"

1500

1462 -#: commit-graph.c:811

1501 +#: commit-graph.c:1088

1502 msgid "Computing commit graph generation numbers"

1503 msgstr "Beräknar generationsvärden för incheckningsgraf"

1504

1466 -#: commit-graph.c:928

1505 +#: commit-graph.c:1162

1506 #, c-format

1507 msgid "Finding commits for commit graph in %d pack"

1508 msgid_plural "Finding commits for commit graph in %d packs"

1509 msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket"

1510 msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket"

1511

1473 -#: commit-graph.c:941

1512 +#: commit-graph.c:1175

1513 #, c-format

1514 msgid "error adding pack %s"

1515 msgstr "fel vid tillägg av paketet %s"

1516

1478 -#: commit-graph.c:943

1517 +#: commit-graph.c:1179

1518 #, c-format

1519 msgid "error opening index for %s"

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

1521

1483 -#: commit-graph.c:957

1522 +#: commit-graph.c:1203

1523 #, c-format

1524 msgid "Finding commits for commit graph from %d ref"

1525 msgid_plural "Finding commits for commit graph from %d refs"

1526 msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens"

1527 msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser"

1528

1490 -#: commit-graph.c:989

1529 +#: commit-graph.c:1237

1530 msgid "Finding commits for commit graph among packed objects"

1531 msgstr "Söker incheckningar för incheckingsgraf i packade objekt"

1532

1494 -#: commit-graph.c:1002

1533 +#: commit-graph.c:1252

1534 msgid "Counting distinct commits in commit graph"

1535 msgstr "Räknar olika incheckningar i incheckningsgraf"

1536

1498 -#: commit-graph.c:1015

1499 -#, c-format

1500 -msgid "the commit graph format cannot write %d commits"

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

1502 -

1503 -#: commit-graph.c:1024

1537 +#: commit-graph.c:1283

1538 msgid "Finding extra edges in commit graph"

1539 msgstr "Söker ytterligare kanter i incheckingsgraf"

1540

1507 -#: commit-graph.c:1048

1508 -msgid "too many commits to write graph"

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

1541 +#: commit-graph.c:1331

1542 +msgid "failed to write correct number of base graph ids"

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

1544

1511 -#: commit-graph.c:1055 midx.c:805

1545 +#: commit-graph.c:1364 midx.c:811

1546 #, c-format

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

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

1549

1516 -#: commit-graph.c:1095

1550 +#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251

1551 +#, c-format

1552 +msgid "unable to create '%s'"

1553 +msgstr "kunde inte skapa \"%s\""

1554 +

1555 +#: commit-graph.c:1436

1556 #, c-format

1557 msgid "Writing out commit graph in %d pass"

1558 msgid_plural "Writing out commit graph in %d passes"

1559 msgstr[0] "Skriver ut incheckningsgraf i %d pass"

1560 msgstr[1] "Skriver ut incheckningsgraf i %d pass"

1561

1523 -#: commit-graph.c:1160

1562 +#: commit-graph.c:1477

1563 +msgid "unable to open commit-graph chain file"

1564 +msgstr "Kunde inte öppna incheckningsgrafkedjefilen"

1565 +

1566 +#: commit-graph.c:1489

1567 +msgid "failed to rename base commit-graph file"

1568 +msgstr "kunde inte byta namn på bas-incheckingsgraffilen"

1569 +

1570 +#: commit-graph.c:1509

1571 +msgid "failed to rename temporary commit-graph file"

1572 +msgstr "kunde inte byta namn på temporär incheckningsgraffil"

1573 +

1574 +#: commit-graph.c:1620

1575 +msgid "Scanning merged commits"

1576 +msgstr "Söker sammanslagna incheckningar"

1577 +

1578 +#: commit-graph.c:1631

1579 +#, c-format

1580 +msgid "unexpected duplicate commit id %s"

1581 +msgstr "oväntat duplicerat inchecknings-id %s"

1582 +

1583 +#: commit-graph.c:1656

1584 +msgid "Merging commit-graph"

1585 +msgstr "Slår ihop incheckningsgraf"

1586 +

1587 +#: commit-graph.c:1842

1588 +#, c-format

1589 +msgid "the commit graph format cannot write %d commits"

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

1591 +

1592 +#: commit-graph.c:1853

1593 +msgid "too many commits to write graph"

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

1595 +

1596 +#: commit-graph.c:1943

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

1598 msgstr ""

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

1600

1528 -#: commit-graph.c:1170

1601 +#: commit-graph.c:1953

1602 #, c-format

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

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

1605

1533 -#: commit-graph.c:1180 commit-graph.c:1195

1606 +#: commit-graph.c:1963 commit-graph.c:1978

1607 #, c-format

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

1609 msgstr ""

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

1611

1539 -#: commit-graph.c:1187

1612 +#: commit-graph.c:1970

1613 #, c-format

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

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

1616

1544 -#: commit-graph.c:1204

1617 +#: commit-graph.c:1987

1618 msgid "Verifying commits in commit graph"

1619 msgstr "Bekräftar incheckningar i incheckningsgrafen"

1620

1548 -#: commit-graph.c:1217

1621 +#: commit-graph.c:2000

1622 #, c-format

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

1624 msgstr ""

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

1626

1554 -#: commit-graph.c:1224

1627 +#: commit-graph.c:2007

1628 #, c-format

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

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

1631

1559 -#: commit-graph.c:1234

1632 +#: commit-graph.c:2017

1633 #, c-format

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

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

1636

1564 -#: commit-graph.c:1240

1637 +#: commit-graph.c:2026

1638 #, c-format

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

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

1641

1569 -#: commit-graph.c:1253

1642 +#: commit-graph.c:2039

1643 #, c-format

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

1645 msgstr ""

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

1647

1575 -#: commit-graph.c:1258

1648 +#: commit-graph.c:2044

1649 #, c-format

1650 msgid ""

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

@@ -1580,7 +1653,7 @@ msgstr ""

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

1654 "noll på annan plats"

1655

1583 -#: commit-graph.c:1262

1656 +#: commit-graph.c:2048

1657 #, c-format

1658 msgid ""

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

@@ -1588,12 +1661,12 @@ msgstr ""

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

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

1663

1591 -#: commit-graph.c:1277

1664 +#: commit-graph.c:2063

1665 #, c-format

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

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

1668

1596 -#: commit-graph.c:1283

1669 +#: commit-graph.c:2069

1670 #, c-format

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

1672 msgstr ""

@@ -1604,7 +1677,7 @@ msgstr ""

1677 msgid "memory exhausted"

1678 msgstr "minnet slut"

1679

1607 -#: config.c:123

1680 +#: config.c:124

1681 #, c-format

1682 msgid ""

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

@@ -1619,302 +1692,302 @@ msgstr ""

1692 "\t%s\n"

1693 "Det kan bero på cirkulära inkluderingar."

1694

1622 -#: config.c:139

1695 +#: config.c:140

1696 #, c-format

1697 msgid "could not expand include path '%s'"

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

1699

1627 -#: config.c:150

1700 +#: config.c:151

1701 msgid "relative config includes must come from files"

1702 msgstr "relativa konfigureringsinkluderingar måste komma från filer"

1703

1631 -#: config.c:190

1704 +#: config.c:197

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

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

1707

1635 -#: config.c:348

1708 +#: config.c:375

1709 #, c-format

1710 msgid "key does not contain a section: %s"

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

1712

1640 -#: config.c:354

1713 +#: config.c:381

1714 #, c-format

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

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

1717

1645 -#: config.c:378 sequencer.c:2459

1718 +#: config.c:405 sequencer.c:2463

1719 #, c-format

1720 msgid "invalid key: %s"

1721 msgstr "felaktig nyckel: %s"

1722

1650 -#: config.c:384

1723 +#: config.c:411

1724 #, c-format

1725 msgid "invalid key (newline): %s"

1726 msgstr "ogiltig nyckel (nyradstecken): %s"

1727

1655 -#: config.c:420 config.c:432

1728 +#: config.c:447 config.c:459

1729 #, c-format

1730 msgid "bogus config parameter: %s"

1731 msgstr "falsk konfigureringsparameter: %s"

1732

1660 -#: config.c:467

1733 +#: config.c:494

1734 #, c-format

1735 msgid "bogus format in %s"

1736 msgstr "felaktigt format i %s"

1737

1665 -#: config.c:793

1738 +#: config.c:820

1739 #, c-format

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

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

1742

1670 -#: config.c:797

1743 +#: config.c:824

1744 #, c-format

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

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

1747

1675 -#: config.c:801

1748 +#: config.c:828

1749 #, c-format

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

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

1752

1680 -#: config.c:805

1753 +#: config.c:832

1754 #, c-format

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

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

1757

1685 -#: config.c:809

1758 +#: config.c:836

1759 #, c-format

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

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

1762

1690 -#: config.c:813

1763 +#: config.c:840

1764 #, c-format

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

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

1767

1695 -#: config.c:952

1768 +#: config.c:977

1769 msgid "out of range"

1770 msgstr "utanför intervallet"

1771

1699 -#: config.c:952

1772 +#: config.c:977

1773 msgid "invalid unit"

1774 msgstr "ogiltig enhet"

1775

1703 -#: config.c:958

1776 +#: config.c:978

1777 #, c-format

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

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

1780

1708 -#: config.c:963

1781 +#: config.c:997

1782 #, c-format

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

1784 msgstr ""

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

1786

1714 -#: config.c:966

1787 +#: config.c:1000

1788 #, c-format

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

1790 msgstr ""

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

1792

1720 -#: config.c:969

1793 +#: config.c:1003

1794 #, c-format

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

1796 msgstr ""

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

1798

1726 -#: config.c:972

1799 +#: config.c:1006

1800 #, c-format

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

1802 msgstr ""

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

1804 "en %s: %s"

1805

1733 -#: config.c:975

1806 +#: config.c:1009

1807 #, c-format

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

1809 msgstr ""

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

1811 "%s: %s"

1812

1740 -#: config.c:978

1813 +#: config.c:1012

1814 #, c-format

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

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

1817

1745 -#: config.c:1073

1818 +#: config.c:1107

1819 #, c-format

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

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

1822

1750 -#: config.c:1082

1823 +#: config.c:1116

1824 #, c-format

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

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

1827

1755 -#: config.c:1173

1828 +#: config.c:1207

1829 #, c-format

1830 msgid "abbrev length out of range: %d"

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

1832

1760 -#: config.c:1187 config.c:1198

1833 +#: config.c:1221 config.c:1232

1834 #, c-format

1835 msgid "bad zlib compression level %d"

1836 msgstr "felaktigt zlib-komprimeringsgrad %d"

1837

1765 -#: config.c:1290

1838 +#: config.c:1324

1839 msgid "core.commentChar should only be one character"

1840 msgstr "core.commentChar kan bara vara ett tecken"

1841

1769 -#: config.c:1323

1842 +#: config.c:1357

1843 #, c-format

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

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

1846

1774 -#: config.c:1395

1847 +#: config.c:1429

1848 #, c-format

1849 msgid "malformed value for %s"

1850 msgstr "felformat värde för %s"

1851

1779 -#: config.c:1421

1852 +#: config.c:1455

1853 #, c-format

1854 msgid "malformed value for %s: %s"

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

1856

1784 -#: config.c:1422

1857 +#: config.c:1456

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

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

1860

1788 -#: config.c:1483 builtin/pack-objects.c:3397

1861 +#: config.c:1517 builtin/pack-objects.c:3399

1862 #, c-format

1863 msgid "bad pack compression level %d"

1864 msgstr "felaktig paketkomprimeringsgrad %d"

1865

1793 -#: config.c:1604

1866 +#: config.c:1638

1867 #, c-format

1868 msgid "unable to load config blob object '%s'"

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

1870

1798 -#: config.c:1607

1871 +#: config.c:1641

1872 #, c-format

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

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

1875

1803 -#: config.c:1624

1876 +#: config.c:1658

1877 #, c-format

1878 msgid "unable to resolve config blob '%s'"

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

1880

1808 -#: config.c:1654

1881 +#: config.c:1688

1882 #, c-format

1883 msgid "failed to parse %s"

1884 msgstr "kunde inte tolka %s"

1885

1813 -#: config.c:1710

1886 +#: config.c:1744

1887 msgid "unable to parse command-line config"

1888 msgstr "kan inte tolka kommandoradskonfiguration"

1889

1817 -#: config.c:2059

1890 +#: config.c:2093

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

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

1893

1821 -#: config.c:2229

1894 +#: config.c:2263

1895 #, c-format

1896 msgid "Invalid %s: '%s'"

1897 msgstr "Felaktigt %s: \"%s\""

1898

1826 -#: config.c:2272

1899 +#: config.c:2306

1900 #, c-format

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

1902 msgstr ""

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

1904

1832 -#: config.c:2298

1905 +#: config.c:2332

1906 #, c-format

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

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

1909

1837 -#: config.c:2344

1910 +#: config.c:2378

1911 #, c-format

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

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

1914

1842 -#: config.c:2346

1915 +#: config.c:2380

1916 #, c-format

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

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

1919

1847 -#: config.c:2427

1920 +#: config.c:2461

1921 #, c-format

1922 msgid "invalid section name '%s'"

1923 msgstr "felaktigt sektionsnamn \"%s\""

1924

1852 -#: config.c:2459

1925 +#: config.c:2493

1926 #, c-format

1927 msgid "%s has multiple values"

1928 msgstr "%s har flera värden"

1929

1857 -#: config.c:2488

1930 +#: config.c:2522

1931 #, c-format

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

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

1934

1862 -#: config.c:2740 config.c:3064

1935 +#: config.c:2774 config.c:3098

1936 #, c-format

1937 msgid "could not lock config file %s"

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

1939

1867 -#: config.c:2751

1940 +#: config.c:2785

1941 #, c-format

1942 msgid "opening %s"

1943 msgstr "öppnar %s"

1944

1872 -#: config.c:2786 builtin/config.c:328

1945 +#: config.c:2820 builtin/config.c:328

1946 #, c-format

1947 msgid "invalid pattern: %s"

1948 msgstr "ogiltigt mönster: %s"

1949

1877 -#: config.c:2811

1950 +#: config.c:2845

1951 #, c-format

1952 msgid "invalid config file %s"

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

1954

1882 -#: config.c:2824 config.c:3077

1955 +#: config.c:2858 config.c:3111

1956 #, c-format

1957 msgid "fstat on %s failed"

1958 msgstr "fstat misslyckades på %s"

1959

1887 -#: config.c:2835

1960 +#: config.c:2869

1961 #, c-format

1962 msgid "unable to mmap '%s'"

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

1964

1892 -#: config.c:2844 config.c:3082

1965 +#: config.c:2878 config.c:3116

1966 #, c-format

1967 msgid "chmod on %s failed"

1968 msgstr "chmod misslyckades på %s"

1969

1897 -#: config.c:2929 config.c:3179

1970 +#: config.c:2963 config.c:3213

1971 #, c-format

1972 msgid "could not write config file %s"

1973 msgstr "kunde inte skriva konfigurationsfilen %s"

1974

1902 -#: config.c:2963

1975 +#: config.c:2997

1976 #, c-format

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

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

1979

1907 -#: config.c:2965 builtin/remote.c:782

1980 +#: config.c:2999 builtin/remote.c:782

1981 #, c-format

1982 msgid "could not unset '%s'"

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

1984

1912 -#: config.c:3055

1985 +#: config.c:3089

1986 #, c-format

1987 msgid "invalid section name: %s"

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

1989

1917 -#: config.c:3222

1990 +#: config.c:3256

1991 #, c-format

1992 msgid "missing value for '%s'"

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

@@ -2080,19 +2153,19 @@ msgstr "kunde inte grena (fork)"

2153

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

2155 # objects in the database.

2083 -#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43

2156 +#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43

2157 msgid "Checking connectivity"

2158 msgstr "Kontrollerar konnektivitet"

2159

2087 -#: connected.c:97

2160 +#: connected.c:98

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

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

2163

2091 -#: connected.c:117

2164 +#: connected.c:118

2165 msgid "failed write to rev-list"

2166 msgstr "kunde inte skriva till rev-list"

2167

2095 -#: connected.c:124

2168 +#: connected.c:125

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

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

2171

@@ -2311,7 +2384,7 @@ msgstr "kunde inte hämta ö-regex för \"%s\": %s"

2384 msgid "island regex from config has too many capture groups (max=%d)"

2385 msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)"

2386

2314 -#: delta-islands.c:466

2387 +#: delta-islands.c:467

2388 #, c-format

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

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

@@ -2387,35 +2460,35 @@ msgstr ""

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

2461 "%s"

2462

2390 -#: diff.c:4210

2463 +#: diff.c:4215

2464 #, c-format

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

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

2467

2395 -#: diff.c:4555

2468 +#: diff.c:4560

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

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

2471

2399 -#: diff.c:4558

2472 +#: diff.c:4563

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

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

2475

2403 -#: diff.c:4636

2476 +#: diff.c:4641

2477 msgid "--follow requires exactly one pathspec"

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

2479

2407 -#: diff.c:4684

2480 +#: diff.c:4689

2481 #, c-format

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

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

2484

2412 -#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5216

2413 -#: parse-options.c:200

2485 +#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222

2486 +#: parse-options.c:199 parse-options.c:203

2487 #, c-format

2488 msgid "%s expects a numerical value"

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

2490

2418 -#: diff.c:4721

2491 +#: diff.c:4726

2492 #, c-format

2493 msgid ""

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

@@ -2424,42 +2497,42 @@ msgstr ""

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

2498 "%s"

2499

2427 -#: diff.c:4806

2500 +#: diff.c:4811

2501 #, c-format

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

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

2504

2432 -#: diff.c:4830

2505 +#: diff.c:4835

2506 #, c-format

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

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

2509

2437 -#: diff.c:4844

2510 +#: diff.c:4849

2511 #, c-format

2512 msgid "unable to resolve '%s'"

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

2514

2442 -#: diff.c:4894 diff.c:4900

2515 +#: diff.c:4899 diff.c:4905

2516 #, c-format

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

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

2519

2447 -#: diff.c:4912

2520 +#: diff.c:4917

2521 #, c-format

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

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

2524

2452 -#: diff.c:4933

2525 +#: diff.c:4938

2526 #, c-format

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

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

2529

2457 -#: diff.c:4952

2530 +#: diff.c:4957

2531 #, c-format

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

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

2534

2462 -#: diff.c:4992

2535 +#: diff.c:4997

2536 msgid ""

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

2538 "\"histogram\""

@@ -2467,149 +2540,149 @@ msgstr ""

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

2541 "\"histogram\""

2542

2470 -#: diff.c:5028 diff.c:5048

2543 +#: diff.c:5033 diff.c:5053

2544 #, c-format

2545 msgid "invalid argument to %s"

2546 msgstr "ogiltigt argument för %s"

2547

2475 -#: diff.c:5186

2548 +#: diff.c:5191

2549 #, c-format

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

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

2552

2480 -#: diff.c:5240

2553 +#: diff.c:5247

2554 #, c-format

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

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

2557

2485 -#: diff.c:5263

2558 +#: diff.c:5270

2559 msgid "Diff output format options"

2560 msgstr "Formatflaggor för diff-utdata"

2561

2489 -#: diff.c:5265 diff.c:5271

2562 +#: diff.c:5272 diff.c:5278

2563 msgid "generate patch"

2564 msgstr "skapar patch"

2565

2493 -#: diff.c:5268 builtin/log.c:167

2566 +#: diff.c:5275 builtin/log.c:182

2567 msgid "suppress diff output"

2568 msgstr "undertryck diff-utdata"

2569

2497 -#: diff.c:5273 diff.c:5387 diff.c:5394

2570 +#: diff.c:5280 diff.c:5394 diff.c:5401

2571 msgid "<n>"

2572 msgstr "<n>"

2573

2501 -#: diff.c:5274 diff.c:5277

2574 +#: diff.c:5281 diff.c:5284

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

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

2577

2505 -#: diff.c:5279

2578 +#: diff.c:5286

2579 msgid "generate the diff in raw format"

2580 msgstr "generera diff i råformat"

2581

2509 -#: diff.c:5282

2582 +#: diff.c:5289

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

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

2585

2513 -#: diff.c:5286

2586 +#: diff.c:5293

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

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

2589

2517 -#: diff.c:5290

2590 +#: diff.c:5297

2591 msgid "machine friendly --stat"

2592 msgstr "maskinläsbar --stat"

2593

2521 -#: diff.c:5293

2594 +#: diff.c:5300

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

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

2597

2525 -#: diff.c:5295 diff.c:5303

2598 +#: diff.c:5302 diff.c:5310

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

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

2601

2529 -#: diff.c:5296

2602 +#: diff.c:5303

2603 msgid ""

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

2605 msgstr ""

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

2607

2535 -#: diff.c:5300

2608 +#: diff.c:5307

2609 msgid "synonym for --dirstat=cumulative"

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

2611

2539 -#: diff.c:5304

2612 +#: diff.c:5311

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

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

2615

2543 -#: diff.c:5308

2616 +#: diff.c:5315

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

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

2619

2547 -#: diff.c:5311

2620 +#: diff.c:5318

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

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

2623

2551 -#: diff.c:5314

2624 +#: diff.c:5321

2625 msgid "show only names of changed files"

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

2627

2555 -#: diff.c:5317

2628 +#: diff.c:5324

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

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

2631

2559 -#: diff.c:5319

2632 +#: diff.c:5326

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

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

2635

2563 -#: diff.c:5320

2636 +#: diff.c:5327

2637 msgid "generate diffstat"

2638 msgstr "skapa diffstat"

2639

2567 -#: diff.c:5322 diff.c:5325 diff.c:5328

2640 +#: diff.c:5329 diff.c:5332 diff.c:5335

2641 msgid "<width>"

2642 msgstr "<bredd>"

2643

2571 -#: diff.c:5323

2644 +#: diff.c:5330

2645 msgid "generate diffstat with a given width"

2646 msgstr "generera en diffstat med given bredd"

2647

2575 -#: diff.c:5326

2648 +#: diff.c:5333

2649 msgid "generate diffstat with a given name width"

2650 msgstr "generera en diffstat med given namnbredd"

2651

2579 -#: diff.c:5329

2652 +#: diff.c:5336

2653 msgid "generate diffstat with a given graph width"

2654 msgstr "generera en diffstat med given grafbredd"

2655

2583 -#: diff.c:5331

2656 +#: diff.c:5338

2657 msgid "<count>"

2658 msgstr "<antal>"

2659

2587 -#: diff.c:5332

2660 +#: diff.c:5339

2661 msgid "generate diffstat with limited lines"

2662 msgstr "generera diffstat med begränsade rader"

2663

2591 -#: diff.c:5335

2664 +#: diff.c:5342

2665 msgid "generate compact summary in diffstat"

2666 msgstr "skapa kompakt översikt i diffstat"

2667

2595 -#: diff.c:5338

2668 +#: diff.c:5345

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

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

2671

2599 -#: diff.c:5341

2672 +#: diff.c:5348

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

2674 msgstr ""

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

2676

2604 -#: diff.c:5343

2677 +#: diff.c:5350

2678 msgid "show colored diff"

2679 msgstr "visa färgad diff"

2680

2608 -#: diff.c:5344

2681 +#: diff.c:5351

2682 msgid "<kind>"

2683 msgstr "<typ>"

2684

2612 -#: diff.c:5345

2685 +#: diff.c:5352

2686 msgid ""

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

2688 "diff"

@@ -2617,7 +2690,7 @@ msgstr ""

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

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

2692

2620 -#: diff.c:5348

2693 +#: diff.c:5355

2694 msgid ""

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

2696 "--numstat"

@@ -2625,87 +2698,87 @@ msgstr ""

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

2699 "eller --numstat"

2700

2628 -#: diff.c:5351 diff.c:5354 diff.c:5357 diff.c:5463

2701 +#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470

2702 msgid "<prefix>"

2703 msgstr "<prefix>"

2704

2632 -#: diff.c:5352

2705 +#: diff.c:5359

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

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

2708

2636 -#: diff.c:5355

2637 -msgid "show the given source prefix instead of \"b/\""

2638 -msgstr "visa givet källprefix istället för \"b/\""

2709 +#: diff.c:5362

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

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

2712

2640 -#: diff.c:5358

2713 +#: diff.c:5365

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

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

2716

2644 -#: diff.c:5361

2717 +#: diff.c:5368

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

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

2720

2648 -#: diff.c:5364

2721 +#: diff.c:5371

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

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

2724

2652 -#: diff.c:5368 diff.c:5373 diff.c:5378

2725 +#: diff.c:5375 diff.c:5380 diff.c:5385

2726 msgid "<char>"

2727 msgstr "<tecken>"

2728

2656 -#: diff.c:5369

2729 +#: diff.c:5376

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

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

2732

2660 -#: diff.c:5374

2733 +#: diff.c:5381

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

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

2736

2664 -#: diff.c:5379

2737 +#: diff.c:5386

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

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

2740

2668 -#: diff.c:5382

2741 +#: diff.c:5389

2742 msgid "Diff rename options"

2743 msgstr "Diff-namnbytesflaggor"

2744

2672 -#: diff.c:5383

2745 +#: diff.c:5390

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

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

2748

2676 -#: diff.c:5384

2749 +#: diff.c:5391

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

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

2752

2680 -#: diff.c:5388

2753 +#: diff.c:5395

2754 msgid "detect renames"

2755 msgstr "detektera namnändringar"

2756

2684 -#: diff.c:5392

2757 +#: diff.c:5399

2758 msgid "omit the preimage for deletes"

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

2760

2688 -#: diff.c:5395

2761 +#: diff.c:5402

2762 msgid "detect copies"

2763 msgstr "detektera kopior"

2764

2692 -#: diff.c:5399

2765 +#: diff.c:5406

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

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

2768

2696 -#: diff.c:5401

2769 +#: diff.c:5408

2770 msgid "disable rename detection"

2771 msgstr "inaktivera detektering av namnbyten"

2772

2700 -#: diff.c:5404

2773 +#: diff.c:5411

2774 msgid "use empty blobs as rename source"

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

2776

2704 -#: diff.c:5406

2777 +#: diff.c:5413

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

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

2780

2708 -#: diff.c:5409

2781 +#: diff.c:5416

2782 msgid ""

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

2784 "given limit"

@@ -2713,159 +2786,159 @@ msgstr ""

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

2787 "given gräns"

2788

2716 -#: diff.c:5411

2789 +#: diff.c:5418

2790 msgid "Diff algorithm options"

2791 msgstr "Alternativ för diff-algoritm"

2792

2720 -#: diff.c:5413

2793 +#: diff.c:5420

2794 msgid "produce the smallest possible diff"

2795 msgstr "skapa minsta möjliga diff"

2796

2724 -#: diff.c:5416

2797 +#: diff.c:5423

2798 msgid "ignore whitespace when comparing lines"

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

2800

2728 -#: diff.c:5419

2801 +#: diff.c:5426

2802 msgid "ignore changes in amount of whitespace"

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

2804

2732 -#: diff.c:5422

2805 +#: diff.c:5429

2806 msgid "ignore changes in whitespace at EOL"

2807 msgstr "ignorera blanktecken vid radslut"

2808

2736 -#: diff.c:5425

2809 +#: diff.c:5432

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

2811 msgstr "ignorera CR-tecken vid radslut"

2812

2740 -#: diff.c:5428

2813 +#: diff.c:5435

2814 msgid "ignore changes whose lines are all blank"

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

2816

2744 -#: diff.c:5431

2817 +#: diff.c:5438

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

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

2820

2748 -#: diff.c:5434

2821 +#: diff.c:5441

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

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

2824

2752 -#: diff.c:5438

2825 +#: diff.c:5445

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

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

2828

2756 -#: diff.c:5440

2829 +#: diff.c:5447

2830 msgid "<algorithm>"

2831 msgstr "<algoritm>"

2832

2760 -#: diff.c:5441

2833 +#: diff.c:5448

2834 msgid "choose a diff algorithm"

2835 msgstr "välj en diff-algoritm"

2836

2764 -#: diff.c:5443

2837 +#: diff.c:5450

2838 msgid "<text>"

2839 msgstr "<text>"

2840

2768 -#: diff.c:5444

2841 +#: diff.c:5451

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

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

2844

2772 -#: diff.c:5446 diff.c:5455 diff.c:5458

2845 +#: diff.c:5453 diff.c:5462 diff.c:5465

2846 msgid "<mode>"

2847 msgstr "<läge>"

2848

2776 -#: diff.c:5447

2849 +#: diff.c:5454

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

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

2852

2780 -#: diff.c:5449 diff.c:5452 diff.c:5497

2853 +#: diff.c:5456 diff.c:5459 diff.c:5504

2854 msgid "<regex>"

2855 msgstr "<reguttr>"

2856

2784 -#: diff.c:5450

2857 +#: diff.c:5457

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

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

2860

2788 -#: diff.c:5453

2861 +#: diff.c:5460

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

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

2864

2792 -#: diff.c:5456

2793 -msgid "move lines of code are colored differently"

2865 +#: diff.c:5463

2866 +msgid "moved lines of code are colored differently"

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

2868

2796 -#: diff.c:5459

2869 +#: diff.c:5466

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

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

2872

2800 -#: diff.c:5462

2801 -msgid "Diff other options"

2873 +#: diff.c:5469

2874 +msgid "Other diff options"

2875 msgstr "Andra diff-flaggor"

2876

2804 -#: diff.c:5464

2877 +#: diff.c:5471

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

2879 msgstr ""

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

2881 "sökvägar"

2882

2810 -#: diff.c:5468

2883 +#: diff.c:5475

2884 msgid "treat all files as text"

2885 msgstr "hantera alla filer som text"

2886

2814 -#: diff.c:5470

2887 +#: diff.c:5477

2888 msgid "swap two inputs, reverse the diff"

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

2890

2818 -#: diff.c:5472

2891 +#: diff.c:5479

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

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

2894

2822 -#: diff.c:5474

2895 +#: diff.c:5481

2896 msgid "disable all output of the program"

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

2898

2826 -#: diff.c:5476

2899 +#: diff.c:5483

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

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

2902

2830 -#: diff.c:5478

2903 +#: diff.c:5485

2904 msgid "run external text conversion filters when comparing binary files"

2905 msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"

2906

2834 -#: diff.c:5480

2907 +#: diff.c:5487

2908 msgid "<when>"

2909 msgstr "<när>"

2910

2838 -#: diff.c:5481

2911 +#: diff.c:5488

2912 msgid "ignore changes to submodules in the diff generation"

2913 msgstr "ignorera ändringar i undermoduler när diffen skapas"

2914

2842 -#: diff.c:5484

2915 +#: diff.c:5491

2916 msgid "<format>"

2917 msgstr "<format>"

2918

2846 -#: diff.c:5485

2919 +#: diff.c:5492

2920 msgid "specify how differences in submodules are shown"

2921 msgstr "ange hur ändringar i undermoduler visas"

2922

2850 -#: diff.c:5489

2923 +#: diff.c:5496

2924 msgid "hide 'git add -N' entries from the index"

2925 msgstr "dölj \"git add -N\"-poster från indexet"

2926

2854 -#: diff.c:5492

2927 +#: diff.c:5499

2928 msgid "treat 'git add -N' entries as real in the index"

2929 msgstr "tolka \"git add -N\"-poster som äkta i indexet"

2930

2858 -#: diff.c:5494

2931 +#: diff.c:5501

2932 msgid "<string>"

2933 msgstr "<sträng>"

2934

2862 -#: diff.c:5495

2935 +#: diff.c:5502

2936 msgid ""

2937 "look for differences that change the number of occurrences of the specified "

2938 "string"

2939 msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng"

2940

2868 -#: diff.c:5498

2941 +#: diff.c:5505

2942 msgid ""

2943 "look for differences that change the number of occurrences of the specified "

2944 "regex"

@@ -2873,54 +2946,54 @@ msgstr ""

2946 "se efter ändringar som ändrar antalet förekomster av angivet reguljärt "

2947 "uttryck"

2948

2876 -#: diff.c:5501

2949 +#: diff.c:5508

2950 msgid "show all changes in the changeset with -S or -G"

2951 msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"

2952

2880 -#: diff.c:5504

2953 +#: diff.c:5511

2954 msgid "treat <string> in -S as extended POSIX regular expression"

2955 msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"

2956

2884 -#: diff.c:5507

2957 +#: diff.c:5514

2958 msgid "control the order in which files appear in the output"

2959 msgstr "styr ordningen i vilken filer visas i utdata"

2960

2888 -#: diff.c:5508

2961 +#: diff.c:5515

2962 msgid "<object-id>"

2963 msgstr "<objekt-id>"

2964

2892 -#: diff.c:5509

2965 +#: diff.c:5516

2966 msgid ""

2967 "look for differences that change the number of occurrences of the specified "

2968 "object"

2969 msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt"

2970

2898 -#: diff.c:5511

2971 +#: diff.c:5518

2972 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

2973 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

2974

2902 -#: diff.c:5512

2975 +#: diff.c:5519

2976 msgid "select files by diff type"

2977 msgstr "välj filter efter diff-typ"

2978

2906 -#: diff.c:5514

2979 +#: diff.c:5521

2980 msgid "<file>"

2981 msgstr "<fil>"

2982

2910 -#: diff.c:5515

2983 +#: diff.c:5522

2984 msgid "Output to a specific file"

2985 msgstr "Skriv utdata till en specifik fil"

2986

2914 -#: diff.c:6148

2987 +#: diff.c:6177

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

2989 msgstr ""

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

2991

2919 -#: diff.c:6151

2992 +#: diff.c:6180

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

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

2995

2923 -#: diff.c:6154

2996 +#: diff.c:6183

2997 #, c-format

2998 msgid ""

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

@@ -3021,34 +3094,34 @@ msgstr "kunde inte skriva till fjärren"

3094

3095 #: fetch-pack.c:258

3096 msgid "--stateless-rpc requires multi_ack_detailed"

3024 -msgstr "--stateless-rpc kräver ”multi_ack_detailed”"

3097 +msgstr "--stateless-rpc kräver \"multi_ack_detailed\""

3098

3026 -#: fetch-pack.c:360 fetch-pack.c:1271

3099 +#: fetch-pack.c:360 fetch-pack.c:1284

3100 #, c-format

3101 msgid "invalid shallow line: %s"

3102 msgstr "ogiltig \"shallow\"-rad: %s"

3103

3031 -#: fetch-pack.c:366 fetch-pack.c:1277

3104 +#: fetch-pack.c:366 fetch-pack.c:1290

3105 #, c-format

3106 msgid "invalid unshallow line: %s"

3107 msgstr "ogiltig \"unshallow\"-rad: %s"

3108

3036 -#: fetch-pack.c:368 fetch-pack.c:1279

3109 +#: fetch-pack.c:368 fetch-pack.c:1292

3110 #, c-format

3111 msgid "object not found: %s"

3112 msgstr "objektet hittades inte: %s"

3113

3041 -#: fetch-pack.c:371 fetch-pack.c:1282

3114 +#: fetch-pack.c:371 fetch-pack.c:1295

3115 #, c-format

3116 msgid "error in object: %s"

3117 msgstr "fel i objekt: %s"

3118

3046 -#: fetch-pack.c:373 fetch-pack.c:1284

3119 +#: fetch-pack.c:373 fetch-pack.c:1297

3120 #, c-format

3121 msgid "no shallow found: %s"

3122 msgstr "ingen \"shallow\" hittades: %s"

3123

3051 -#: fetch-pack.c:376 fetch-pack.c:1288

3124 +#: fetch-pack.c:376 fetch-pack.c:1301

3125 #, c-format

3126 msgid "expected shallow/unshallow, got %s"

3127 msgstr "förväntade shallow/unshallow, fick %s"

@@ -3067,7 +3140,7 @@ msgstr "ogiltig incheckning %s"

3140 msgid "giving up"

3141 msgstr "ger upp"

3142

3070 -#: fetch-pack.c:477 progress.c:284

3143 +#: fetch-pack.c:477 progress.c:277

3144 msgid "done"

3145 msgstr "klart"

3146

@@ -3108,155 +3181,131 @@ msgstr "%s misslyckades"

3181 msgid "error in sideband demultiplexer"

3182 msgstr "fel i sidbands-avmultiplexare"

3183

3111 -#: fetch-pack.c:906

3112 -msgid "Server does not support shallow clients"

3113 -msgstr "Servern stöder inte klienter med grunda arkiv"

3114 -

3115 -#: fetch-pack.c:910

3116 -msgid "Server supports multi_ack_detailed"

3117 -msgstr "Servern stöder \"multi_ack_detailed\""

3118 -

3119 -#: fetch-pack.c:913

3120 -msgid "Server supports no-done"

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

3122 -

3123 -#: fetch-pack.c:919

3124 -msgid "Server supports multi_ack"

3125 -msgstr "Servern stöder \"multi_ack\""

3126 -

3127 -#: fetch-pack.c:923

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

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

3130 -

3131 -#: fetch-pack.c:927

3132 -msgid "Server supports side-band"

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

3134 -

3135 -#: fetch-pack.c:931

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

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

3138 -

3139 -#: fetch-pack.c:935

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

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

3142 -

3143 -#: fetch-pack.c:945

3144 -msgid "Server supports ofs-delta"

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

3146 -

3147 -#: fetch-pack.c:951 fetch-pack.c:1144

3148 -msgid "Server supports filter"

3149 -msgstr "Servern stöder filter"

3150 -

3151 -#: fetch-pack.c:959

3184 +#: fetch-pack.c:908

3185 #, c-format

3186 msgid "Server version is %.*s"

3187 msgstr "Serverversionen är %.*s"

3188

3156 -#: fetch-pack.c:965

3189 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928

3190 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944

3191 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960

3192 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982

3193 +#, c-format

3194 +msgid "Server supports %s"

3195 +msgstr "Servern stöder %s"

3196 +

3197 +#: fetch-pack.c:915

3198 +msgid "Server does not support shallow clients"

3199 +msgstr "Servern stöder inte klienter med grunda arkiv"

3200 +

3201 +#: fetch-pack.c:975

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

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

3204

3160 -#: fetch-pack.c:969

3205 +#: fetch-pack.c:980

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

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

3208

3164 -#: fetch-pack.c:971

3209 +#: fetch-pack.c:984

3210 msgid "Server does not support --deepen"

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

3212

3168 -#: fetch-pack.c:988

3213 +#: fetch-pack.c:1001

3214 msgid "no common commits"

3215 msgstr "inga gemensamma incheckningar"

3216

3172 -#: fetch-pack.c:1000 fetch-pack.c:1449

3217 +#: fetch-pack.c:1013 fetch-pack.c:1462

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

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

3220

3176 -#: fetch-pack.c:1138

3221 +#: fetch-pack.c:1151

3222 msgid "Server does not support shallow requests"

3223 msgstr "Servern stöder inte grunda förfrågningar"

3224

3180 -#: fetch-pack.c:1171

3225 +#: fetch-pack.c:1157

3226 +msgid "Server supports filter"

3227 +msgstr "Servern stöder filter"

3228 +

3229 +#: fetch-pack.c:1184

3230 msgid "unable to write request to remote"

3231 msgstr "kunde inte skriva anrop till fjärren"

3232

3184 -#: fetch-pack.c:1189

3233 +#: fetch-pack.c:1202

3234 #, c-format

3235 msgid "error reading section header '%s'"

3236 msgstr "fel vid läsning av styckehuvudet \"%s\""

3237

3189 -#: fetch-pack.c:1195

3238 +#: fetch-pack.c:1208

3239 #, c-format

3240 msgid "expected '%s', received '%s'"

3241 msgstr "förväntade \"%s\", tog emot \"%s\""

3242

3194 -#: fetch-pack.c:1234

3243 +#: fetch-pack.c:1247

3244 #, c-format

3245 msgid "unexpected acknowledgment line: '%s'"

3246 msgstr "förväntade bekräftelserad: \"%s\""

3247

3199 -#: fetch-pack.c:1239

3248 +#: fetch-pack.c:1252

3249 #, c-format

3250 msgid "error processing acks: %d"

3251 msgstr "fel vid hantering av bekräftelser: %d"

3252

3204 -#: fetch-pack.c:1249

3253 +#: fetch-pack.c:1262

3254 msgid "expected packfile to be sent after 'ready'"

3255 msgstr "väntade att paketfil skulle sändas efter \"ready\""

3256

3208 -#: fetch-pack.c:1251

3257 +#: fetch-pack.c:1264

3258 msgid "expected no other sections to be sent after no 'ready'"

3259 msgstr ""

3260 "väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""

3261

3213 -#: fetch-pack.c:1293

3262 +#: fetch-pack.c:1306

3263 #, c-format

3264 msgid "error processing shallow info: %d"

3265 msgstr "fel vid hantering av grund (\"shallow\") info: %d"

3266

3218 -#: fetch-pack.c:1340

3267 +#: fetch-pack.c:1353

3268 #, c-format

3269 msgid "expected wanted-ref, got '%s'"

3270 msgstr "förväntade wanted-ref, fick %s"

3271

3223 -#: fetch-pack.c:1345

3272 +#: fetch-pack.c:1358

3273 #, c-format

3274 msgid "unexpected wanted-ref: '%s'"

3275 msgstr "oväntad wanted-ref: \"%s\""

3276

3228 -#: fetch-pack.c:1350

3277 +#: fetch-pack.c:1363

3278 #, c-format

3279 msgid "error processing wanted refs: %d"

3280 msgstr "fel vid hantering av önskade referenser: %d"

3281

3233 -#: fetch-pack.c:1676

3282 +#: fetch-pack.c:1689

3283 msgid "no matching remote head"

3284 msgstr "inget motsvarande fjärrhuvud"

3285

3237 -#: fetch-pack.c:1699 builtin/clone.c:676

3286 +#: fetch-pack.c:1712 builtin/clone.c:686

3287 msgid "remote did not send all necessary objects"

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

3289

3241 -#: fetch-pack.c:1726

3290 +#: fetch-pack.c:1739

3291 #, c-format

3292 msgid "no such remote ref %s"

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

3294

3246 -#: fetch-pack.c:1729

3295 +#: fetch-pack.c:1742

3296 #, c-format

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

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

3299

3251 -#: gpg-interface.c:318

3300 +#: gpg-interface.c:321

3301 msgid "gpg failed to sign the data"

3302 msgstr "gpg misslyckades signera data"

3303

3255 -#: gpg-interface.c:344

3304 +#: gpg-interface.c:347

3305 msgid "could not create temporary file"

3306 msgstr "kunde inte skapa temporära fil"

3307

3259 -#: gpg-interface.c:347

3308 +#: gpg-interface.c:350

3309 #, c-format

3310 msgid "failed writing detached signature to '%s'"

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

@@ -3266,18 +3315,18 @@ msgstr "misslyckades skriva fristående signatur till \"%s\""

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

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

3317

3269 -#: grep.c:2113

3318 +#: grep.c:2117

3319 #, c-format

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

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

3322

3274 -#: grep.c:2130 setup.c:164 builtin/clone.c:414 builtin/diff.c:82

3323 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82

3324 #: builtin/rm.c:135

3325 #, c-format

3326 msgid "failed to stat '%s'"

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

3328

3280 -#: grep.c:2141

3329 +#: grep.c:2145

3330 #, c-format

3331 msgid "'%s': short read"

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

@@ -3347,7 +3396,7 @@ msgstr "git-kommandon från andra platser i din $PATH"

3396 msgid "These are common Git commands used in various situations:"

3397 msgstr "Dessa vanliga Git-kommandon används i olika situationer:"

3398

3350 -#: help.c:363 git.c:97

3399 +#: help.c:363 git.c:98

3400 #, c-format

3401 msgid "unsupported command listing type '%s'"

3402 msgstr "okänd kommandolisttyp \"%s\""

@@ -3389,13 +3438,13 @@ msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns."

3438 #: help.c:682

3439 #, c-format

3440 msgid "Continuing under the assumption that you meant '%s'."

3392 -msgstr "Fortsätter under förutsättningen att du menade ”%s”."

3441 +msgstr "Fortsätter under förutsättningen att du menade \"%s\"."

3442

3443 #: help.c:687

3444 #, c-format

3445 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

3446 msgstr ""

3398 -"Fortsätter om %0.1f sekunder, under förutsättningen att du menade ”%s”."

3447 +"Fortsätter om %0.1f sekunder, under förutsättningen att du menade \"%s\"."

3448

3449 #: help.c:695

3450 #, c-format

@@ -3493,7 +3542,7 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet"

3542 msgid "name consists only of disallowed characters: %s"

3543 msgstr "namnet består enbart av ej tillåtna tecken: %s"

3544

3496 -#: ident.c:436 builtin/commit.c:608

3545 +#: ident.c:436 builtin/commit.c:611

3546 #, c-format

3547 msgid "invalid date format: %s"

3548 msgstr "felaktigt datumformat: %s"

@@ -3521,7 +3570,16 @@ msgstr "flera filterspecifikationer kan inte kombineras"

3570 msgid "expected 'tree:<depth>'"

3571 msgstr "förväntade \"tree:<djup>\""

3572

3524 -#: list-objects-filter-options.c:156

3573 +#: list-objects-filter-options.c:84

3574 +msgid "sparse:path filters support has been dropped"

3575 +msgstr "sparse:sökväg-filter stöds inte längre"

3576 +

3577 +#: list-objects-filter-options.c:94

3578 +#, c-format

3579 +msgid "invalid filter-spec '%s'"

3580 +msgstr "felaktig filterspecifikation: \"%s\""

3581 +

3582 +#: list-objects-filter-options.c:158

3583 msgid "cannot change partial clone promisor remote"

3584 msgstr "kan inte ändra kontraktsfjärr för delvis kloning"

3585

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

3612 msgid "failed to read the cache"

3613 msgstr "misslyckades läsa cachen"

3614

3557 -#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921

3558 -#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:776

3615 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919

3616 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786

3617 #: builtin/stash.c:264

3618 msgid "unable to write new index file"

3619 msgstr "kunde inte skriva ny indexfil"

@@ -3581,94 +3639,94 @@ msgstr ""

3639 msgid "error building trees"

3640 msgstr "fel vid byggande av träd"

3641

3584 -#: merge-recursive.c:861

3642 +#: merge-recursive.c:863

3643 #, c-format

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

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

3646

3589 -#: merge-recursive.c:872

3647 +#: merge-recursive.c:874

3648 #, c-format

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

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

3651

3594 -#: merge-recursive.c:886 merge-recursive.c:905

3652 +#: merge-recursive.c:888 merge-recursive.c:907

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

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

3655

3598 -#: merge-recursive.c:895

3656 +#: merge-recursive.c:897

3657 #, c-format

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

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

3660

3603 -#: merge-recursive.c:936 builtin/cat-file.c:40

3661 +#: merge-recursive.c:938 builtin/cat-file.c:40

3662 #, c-format

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

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

3665

3608 -#: merge-recursive.c:939

3666 +#: merge-recursive.c:941

3667 #, c-format

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

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

3670

3613 -#: merge-recursive.c:963

3671 +#: merge-recursive.c:965

3672 #, c-format

3673 msgid "failed to open '%s': %s"

3674 msgstr "misslyckades öppna \"%s\": %s"

3675

3618 -#: merge-recursive.c:974

3676 +#: merge-recursive.c:976

3677 #, c-format

3678 msgid "failed to symlink '%s': %s"

3679 msgstr "misslyckades skapa symboliska länken \"%s\": %s"

3680

3623 -#: merge-recursive.c:979

3681 +#: merge-recursive.c:981

3682 #, c-format

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

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

3685

3628 -#: merge-recursive.c:1175

3686 +#: merge-recursive.c:1177

3687 #, c-format

3688 msgid "Failed to merge submodule %s (not checked out)"

3689 msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"

3690

3633 -#: merge-recursive.c:1182

3691 +#: merge-recursive.c:1184

3692 #, c-format

3693 msgid "Failed to merge submodule %s (commits not present)"

3694 msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"

3695

3638 -#: merge-recursive.c:1189

3696 +#: merge-recursive.c:1191

3697 #, c-format

3698 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

3699 msgstr ""

3700 "Misslyckades slå ihop undermodulen %s (incheckningar följer inte "

3701 "sammanslagningsbasen)"

3702

3645 -#: merge-recursive.c:1197 merge-recursive.c:1209

3703 +#: merge-recursive.c:1199 merge-recursive.c:1211

3704 #, c-format

3705 msgid "Fast-forwarding submodule %s to the following commit:"

3706 msgstr "Snabbspolar undermodulen %s till följande incheckning:"

3707

3650 -#: merge-recursive.c:1200 merge-recursive.c:1212

3708 +#: merge-recursive.c:1202 merge-recursive.c:1214

3709 #, c-format

3710 msgid "Fast-forwarding submodule %s"

3711 msgstr "Snabbspolar undermodulen %s"

3712

3655 -#: merge-recursive.c:1235

3713 +#: merge-recursive.c:1237

3714 #, c-format

3715 msgid "Failed to merge submodule %s (merge following commits not found)"

3716 msgstr ""

3717 "Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "

3718 "hittades inte)"

3719

3662 -#: merge-recursive.c:1239

3720 +#: merge-recursive.c:1241

3721 #, c-format

3722 msgid "Failed to merge submodule %s (not fast-forward)"

3723 msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"

3724

3667 -#: merge-recursive.c:1240

3725 +#: merge-recursive.c:1242

3726 msgid "Found a possible merge resolution for the submodule:\n"

3727 msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"

3728

3671 -#: merge-recursive.c:1243

3729 +#: merge-recursive.c:1245

3730 #, c-format

3731 msgid ""

3732 "If this is correct simply add it to the index for example\n"

@@ -3685,32 +3743,32 @@ msgstr ""

3743 "\n"

3744 "vilket godtar lösningen.\n"

3745

3688 -#: merge-recursive.c:1252

3746 +#: merge-recursive.c:1254

3747 #, c-format

3748 msgid "Failed to merge submodule %s (multiple merges found)"

3749 msgstr ""

3750 "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"

3751

3694 -#: merge-recursive.c:1325

3752 +#: merge-recursive.c:1327

3753 msgid "Failed to execute internal merge"

3754 msgstr "Misslyckades exekvera intern sammanslagning"

3755

3698 -#: merge-recursive.c:1330

3756 +#: merge-recursive.c:1332

3757 #, c-format

3758 msgid "Unable to add %s to database"

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

3760

3703 -#: merge-recursive.c:1362

3761 +#: merge-recursive.c:1364

3762 #, c-format

3763 msgid "Auto-merging %s"

3764 msgstr "Slår ihop %s automatiskt"

3765

3708 -#: merge-recursive.c:1385

3766 +#: merge-recursive.c:1387

3767 #, c-format

3768 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

3769 msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."

3770

3713 -#: merge-recursive.c:1457

3771 +#: merge-recursive.c:1459

3772 #, c-format

3773 msgid ""

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

@@ -3719,7 +3777,7 @@ msgstr ""

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

3778 "i trädet."

3779

3722 -#: merge-recursive.c:1462

3780 +#: merge-recursive.c:1464

3781 #, c-format

3782 msgid ""

3783 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -3728,7 +3786,7 @@ msgstr ""

3786 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "

3787 "%s lämnad i trädet."

3788

3731 -#: merge-recursive.c:1469

3789 +#: merge-recursive.c:1471

3790 #, c-format

3791 msgid ""

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

@@ -3737,7 +3795,7 @@ msgstr ""

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

3796 "i trädet vid %s."

3797

3740 -#: merge-recursive.c:1474

3798 +#: merge-recursive.c:1476

3799 #, c-format

3800 msgid ""

3801 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -3746,40 +3804,40 @@ msgstr ""

3804 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "

3805 "%s lämnad i trädet vid %s."

3806

3749 -#: merge-recursive.c:1509

3807 +#: merge-recursive.c:1511

3808 msgid "rename"

3809 msgstr "namnbyte"

3810

3753 -#: merge-recursive.c:1509

3811 +#: merge-recursive.c:1511

3812 msgid "renamed"

3813 msgstr "namnbytt"

3814

3757 -#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085

3815 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093

3816 #, c-format

3817 msgid "Refusing to lose dirty file at %s"

3818 msgstr "Vägrar förlora lortig fil vid \"%s\""

3819

3762 -#: merge-recursive.c:1599

3820 +#: merge-recursive.c:1601

3821 #, c-format

3822 msgid "Refusing to lose untracked file at %s, even though it's in the way."

3823 msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."

3824

3767 -#: merge-recursive.c:1657

3825 +#: merge-recursive.c:1659

3826 #, c-format

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

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

3829

3772 -#: merge-recursive.c:1687

3830 +#: merge-recursive.c:1690

3831 #, c-format

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

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

3834

3777 -#: merge-recursive.c:1692

3835 +#: merge-recursive.c:1695

3836 #, c-format

3837 msgid "Refusing to lose untracked file at %s; adding as %s instead"

3838 msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"

3839

3782 -#: merge-recursive.c:1711

3840 +#: merge-recursive.c:1714

3841 #, c-format

3842 msgid ""

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

@@ -3788,17 +3846,17 @@ msgstr ""

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

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

3848

3791 -#: merge-recursive.c:1716

3849 +#: merge-recursive.c:1719

3850 msgid " (left unresolved)"

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

3852

3795 -#: merge-recursive.c:1825

3853 +#: merge-recursive.c:1828

3854 #, c-format

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

3856 msgstr ""

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

3858

3801 -#: merge-recursive.c:2030

3859 +#: merge-recursive.c:2035

3860 #, c-format

3861 msgid ""

3862 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -3809,7 +3867,7 @@ msgstr ""

3867 "katalogen %s bytte namn till flera andra kataloger, utan att någon "

3868 "destination fick en majoritet av filerna."

3869

3812 -#: merge-recursive.c:2062

3870 +#: merge-recursive.c:2067

3871 #, c-format

3872 msgid ""

3873 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -3818,7 +3876,7 @@ msgstr ""

3876 "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "

3877 "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."

3878

3821 -#: merge-recursive.c:2072

3879 +#: merge-recursive.c:2077

3880 #, c-format

3881 msgid ""

3882 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -3827,7 +3885,7 @@ msgstr ""

3885 "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "

3886 "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"

3887

3830 -#: merge-recursive.c:2164

3888 +#: merge-recursive.c:2169

3889 #, c-format

3890 msgid ""

3891 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -3836,7 +3894,7 @@ msgstr ""

3894 "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "

3895 "%s->%s i %s"

3896

3839 -#: merge-recursive.c:2408

3897 +#: merge-recursive.c:2413

3898 #, c-format

3899 msgid ""

3900 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -3845,52 +3903,52 @@ msgstr ""

3903 "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "

3904 "bytt namn."

3905

3848 -#: merge-recursive.c:2929

3906 +#: merge-recursive.c:2937

3907 #, c-format

3908 msgid "cannot read object %s"

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

3910

3853 -#: merge-recursive.c:2932

3911 +#: merge-recursive.c:2940

3912 #, c-format

3913 msgid "object %s is not a blob"

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

3915

3858 -#: merge-recursive.c:2996

3916 +#: merge-recursive.c:3004

3917 msgid "modify"

3918 msgstr "ändra"

3919

3862 -#: merge-recursive.c:2996

3920 +#: merge-recursive.c:3004

3921 msgid "modified"

3922 msgstr "ändrad"

3923

3866 -#: merge-recursive.c:3008

3924 +#: merge-recursive.c:3016

3925 msgid "content"

3926 msgstr "innehåll"

3927

3870 -#: merge-recursive.c:3012

3928 +#: merge-recursive.c:3020

3929 msgid "add/add"

3930 msgstr "tillägg/tillägg"

3931

3874 -#: merge-recursive.c:3035

3932 +#: merge-recursive.c:3043

3933 #, c-format

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

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

3936

3879 -#: merge-recursive.c:3057 git-submodule.sh:937

3937 +#: merge-recursive.c:3065 git-submodule.sh:937

3938 msgid "submodule"

3939 msgstr "undermodul"

3940

3883 -#: merge-recursive.c:3058

3941 +#: merge-recursive.c:3066

3942 #, c-format

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

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

3945

3888 -#: merge-recursive.c:3088

3946 +#: merge-recursive.c:3096

3947 #, c-format

3948 msgid "Adding as %s instead"

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

3950

3893 -#: merge-recursive.c:3170

3951 +#: merge-recursive.c:3178

3952 #, c-format

3953 msgid ""

3954 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -3899,7 +3957,7 @@ msgstr ""

3957 "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "

3958 "flyttar den till %s."

3959

3902 -#: merge-recursive.c:3173

3960 +#: merge-recursive.c:3181

3961 #, c-format

3962 msgid ""

3963 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -3908,7 +3966,7 @@ msgstr ""

3966 "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "

3967 "%s, föreslår att den bör flyttas till%s."

3968

3911 -#: merge-recursive.c:3177

3969 +#: merge-recursive.c:3185

3970 #, c-format

3971 msgid ""

3972 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -3917,7 +3975,7 @@ msgstr ""

3975 "Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "

3976 "namn i %s; flyttar den till %s."

3977

3920 -#: merge-recursive.c:3180

3978 +#: merge-recursive.c:3188

3979 #, c-format

3980 msgid ""

3981 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -3926,36 +3984,36 @@ msgstr ""

3984 "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "

3985 "bytte namn i %s; flyttar den till %s."

3986

3929 -#: merge-recursive.c:3294

3987 +#: merge-recursive.c:3302

3988 #, c-format

3989 msgid "Removing %s"

3990 msgstr "Tar bort %s"

3991

3934 -#: merge-recursive.c:3317

3992 +#: merge-recursive.c:3325

3993 msgid "file/directory"

3994 msgstr "fil/katalog"

3995

3938 -#: merge-recursive.c:3322

3996 +#: merge-recursive.c:3330

3997 msgid "directory/file"

3998 msgstr "katalog/fil"

3999

3942 -#: merge-recursive.c:3329

4000 +#: merge-recursive.c:3337

4001 #, c-format

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

4003 msgstr ""

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

4005

3948 -#: merge-recursive.c:3338

4006 +#: merge-recursive.c:3346

4007 #, c-format

4008 msgid "Adding %s"

4009 msgstr "Lägger till %s"

4010

3953 -#: merge-recursive.c:3347

4011 +#: merge-recursive.c:3355

4012 #, c-format

4013 msgid "CONFLICT (add/add): Merge conflict in %s"

4014 msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"

4015

3958 -#: merge-recursive.c:3385

4016 +#: merge-recursive.c:3393

4017 #, c-format

4018 msgid ""

4019 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3965,175 +4023,188 @@ msgstr ""

4023 "sammanslagning:\n"

4024 " %s"

4025

3968 -#: merge-recursive.c:3396

4026 +#: merge-recursive.c:3404

4027 msgid "Already up to date!"

4028 msgstr "Redan à jour!"

4029

3972 -#: merge-recursive.c:3405

4030 +#: merge-recursive.c:3413

4031 #, c-format

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

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

4034

3977 -#: merge-recursive.c:3504

4035 +#: merge-recursive.c:3512

4036 msgid "Merging:"

4037 msgstr "Slår ihop:"

4038

3981 -#: merge-recursive.c:3517

4039 +#: merge-recursive.c:3525

4040 #, c-format

4041 msgid "found %u common ancestor:"

4042 msgid_plural "found %u common ancestors:"

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

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

4045

3988 -#: merge-recursive.c:3556

4046 +#: merge-recursive.c:3564

4047 msgid "merge returned no commit"

4048 msgstr "sammanslagningen returnerade ingen incheckning"

4049

3992 -#: merge-recursive.c:3622

4050 +#: merge-recursive.c:3630

4051 #, c-format

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

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

4054

3997 -#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873

4055 +#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869

4056 msgid "Unable to write index."

4057 msgstr "Kunde inte skriva indexet."

4058

4001 -#: midx.c:66

4059 +#: midx.c:69

4060 #, c-format

4061 msgid "multi-pack-index file %s is too small"

4062 msgstr "multi-pack-indexfilen %s är för liten"

4063

4006 -#: midx.c:82

4064 +#: midx.c:85

4065 #, c-format

4066 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

4067 msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x"

4068

4011 -#: midx.c:87

4069 +#: midx.c:90

4070 #, c-format

4071 msgid "multi-pack-index version %d not recognized"

4072 msgstr "multi-pack-indexversionen %d stöds inte"

4073

4016 -#: midx.c:92

4074 +#: midx.c:95

4075 #, c-format

4076 msgid "hash version %u does not match"

4077 msgstr "hash-versionen %u stämmer inte"

4078

4021 -#: midx.c:106

4079 +#: midx.c:109

4080 msgid "invalid chunk offset (too large)"

4081 msgstr "felaktigt offset för stycke (för stort)"

4082

4025 -#: midx.c:130

4083 +#: midx.c:133

4084 msgid "terminating multi-pack-index chunk id appears earlier than expected"

4085 msgstr "avslutande multi-pack-index-stycke-ID förekommer tidigare än förväntat"

4086

4029 -#: midx.c:143

4087 +#: midx.c:146

4088 msgid "multi-pack-index missing required pack-name chunk"

4089 msgstr "multi-pack-index saknar krävd paketnamn-stycke"

4090

4033 -#: midx.c:145

4091 +#: midx.c:148

4092 msgid "multi-pack-index missing required OID fanout chunk"

4093 msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"

4094

4037 -#: midx.c:147

4095 +#: midx.c:150

4096 msgid "multi-pack-index missing required OID lookup chunk"

4097 msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"

4098

4041 -#: midx.c:149

4099 +#: midx.c:152

4100 msgid "multi-pack-index missing required object offsets chunk"

4101 msgstr "multi-pack-index saknar krävt objekt-offsetstycke"

4102

4045 -#: midx.c:163

4103 +#: midx.c:166

4104 #, c-format

4105 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4106 msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\""

4107

4050 -#: midx.c:209

4108 +#: midx.c:211

4109 #, c-format

4110 msgid "bad pack-int-id: %u (%u total packs)"

4111 msgstr "bad pack-int-id: %u (%u paket totalt)"

4112

4055 -#: midx.c:250

4113 +#: midx.c:261

4114 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

4115 msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten"

4116

4059 -#: midx.c:275

4117 +#: midx.c:289

4118 msgid "error preparing packfile from multi-pack-index"

4119 msgstr "fel när paketfiler från multi-pack-index skulle förberedas"

4120

4063 -#: midx.c:443

4121 +#: midx.c:470

4122 #, c-format

4123 msgid "failed to add packfile '%s'"

4124 msgstr "misslyckades läsa paketfilen \"%s\""

4125

4068 -#: midx.c:449

4126 +#: midx.c:476

4127 #, c-format

4128 msgid "failed to open pack-index '%s'"

4129 msgstr "misslyckades öppna paketindexet \"%s\""

4130

4073 -#: midx.c:543

4131 +#: midx.c:536

4132 #, c-format

4133 msgid "failed to locate object %d in packfile"

4134 msgstr "misslyckades hitta objekt %d i paketfilen"

4135

4078 -#: midx.c:979

4136 +#: midx.c:865

4137 +#, c-format

4138 +msgid "did not see pack-file %s to drop"

4139 +msgstr "såg inte paketfilen %s som skulle kastas"

4140 +

4141 +#: midx.c:1036

4142 #, c-format

4143 msgid "failed to clear multi-pack-index at %s"

4144 msgstr "misslyckades städa multi-pack-index på %s"

4145

4083 -#: midx.c:1034

4146 +#: midx.c:1091

4147 msgid "Looking for referenced packfiles"

4148 msgstr "Ser efter refererade packfiler"

4149

4087 -#: midx.c:1049

4150 +#: midx.c:1106

4151 #, c-format

4152 msgid ""

4153 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4154 msgstr ""

4155 "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4156

4094 -#: midx.c:1053

4157 +#: midx.c:1110

4158 msgid "Verifying OID order in MIDX"

4159 msgstr "Bekräftar OID-ordning i MIDX"

4160

4098 -#: midx.c:1062

4161 +#: midx.c:1119

4162 #, c-format

4163 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4164 msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"

4165

4103 -#: midx.c:1081

4166 +#: midx.c:1138

4167 msgid "Sorting objects by packfile"

4168 msgstr "Sorterar objekt efter packfil"

4169

4107 -#: midx.c:1087

4170 +#: midx.c:1144

4171 msgid "Verifying object offsets"

4172 msgstr "Bekräftar offset för objekt"

4173

4111 -#: midx.c:1103

4174 +#: midx.c:1160

4175 #, c-format

4176 msgid "failed to load pack entry for oid[%d] = %s"

4177 msgstr "misslyckades läsa paketpost för oid[%d] = %s"

4178

4116 -#: midx.c:1109

4179 +#: midx.c:1166

4180 #, c-format

4181 msgid "failed to load pack-index for packfile %s"

4182 msgstr "misslyckades läsa paketindex för paketfil %s"

4183

4121 -#: midx.c:1118

4184 +#: midx.c:1175

4185 #, c-format

4186 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4187 msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4188

4126 -#: name-hash.c:531

4189 +#: midx.c:1350

4190 +msgid "could not start pack-objects"

4191 +msgstr "kunde inte starta pack-objects"

4192 +

4193 +#: midx.c:1369

4194 +msgid "could not finish pack-objects"

4195 +msgstr "kunde inte avsluta pack-objects"

4196 +

4197 +#: name-hash.c:532

4198 #, c-format

4199 msgid "unable to create lazy_dir thread: %s"

4200 msgstr "misslyckades skapa lazy_dir-tråd: %s"

4201

4131 -#: name-hash.c:553

4202 +#: name-hash.c:554

4203 #, c-format

4204 msgid "unable to create lazy_name thread: %s"

4205 msgstr "misslyckades skapa lazy_name-tråd: %s"

4206

4136 -#: name-hash.c:559

4207 +#: name-hash.c:560

4208 #, c-format

4209 msgid "unable to join lazy_name thread: %s"

4210 msgstr "misslyckades utföra join på lazy_name-tråd: %s"

@@ -4203,16 +4274,16 @@ msgstr "kunde inte tolka objektet: %s"

4274 msgid "hash mismatch %s"

4275 msgstr "hashvärde stämmer inte överens %s"

4276

4206 -#: packfile.c:617

4277 +#: packfile.c:648

4278 msgid "offset before end of packfile (broken .idx?)"

4279 msgstr "offset före slutet av packfilen (trasig .idx?)"

4280

4210 -#: packfile.c:1880

4281 +#: packfile.c:1899

4282 #, c-format

4283 msgid "offset before start of pack index for %s (corrupt index?)"

4284 msgstr "offset före slutet av packindex för %s (trasigt index?)"

4285

4215 -#: packfile.c:1884

4286 +#: packfile.c:1903

4287 #, c-format

4288 msgid "offset beyond end of pack index for %s (truncated index?)"

4289 msgstr "offset borton slutet av packindex för %s (trunkerat index?)"

@@ -4232,7 +4303,7 @@ msgstr "%s är inkompatibel med %s"

4303 msgid "%s : incompatible with something else"

4304 msgstr "%s: inkompatibelt med något annat"

4305

4235 -#: parse-options.c:92 parse-options.c:96 parse-options.c:287

4306 +#: parse-options.c:92 parse-options.c:96 parse-options.c:319

4307 #, c-format

4308 msgid "%s takes no value"

4309 msgstr "%s tar inget värde"

@@ -4242,41 +4313,41 @@ msgstr "%s tar inget värde"

4313 msgid "%s isn't available"

4314 msgstr "%s är inte tillgängligt"

4315

4245 -#: parse-options.c:216

4316 +#: parse-options.c:219

4317 #, c-format

4318 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

4319 msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix"

4320

4250 -#: parse-options.c:356

4321 +#: parse-options.c:389

4322 #, c-format

4323 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

4324 msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"

4325

4255 -#: parse-options.c:390 parse-options.c:398

4326 +#: parse-options.c:423 parse-options.c:431

4327 #, c-format

4328 msgid "did you mean `--%s` (with two dashes ?)"

4329 msgstr "menade du \"--%s\" (med två bindestreck?)"

4330

4260 -#: parse-options.c:733

4331 +#: parse-options.c:859

4332 #, c-format

4333 msgid "unknown option `%s'"

4334 msgstr "okänd flagga \"%s\""

4335

4265 -#: parse-options.c:735

4336 +#: parse-options.c:861

4337 #, c-format

4338 msgid "unknown switch `%c'"

4339 msgstr "okänd flagga \"%c\""

4340

4270 -#: parse-options.c:737

4341 +#: parse-options.c:863

4342 #, c-format

4343 msgid "unknown non-ascii option in string: `%s'"

4344 msgstr "okänd icke-ascii-flagga i strängen: \"%s\""

4345

4275 -#: parse-options.c:759

4346 +#: parse-options.c:887

4347 msgid "..."

4348 msgstr "..."

4349

4279 -#: parse-options.c:778

4350 +#: parse-options.c:906

4351 #, c-format

4352 msgid "usage: %s"

4353 msgstr "användning: %s"

@@ -4284,37 +4355,42 @@ msgstr "användning: %s"

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

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

4357 #.

4287 -#: parse-options.c:784

4358 +#: parse-options.c:912

4359 #, c-format

4360 msgid " or: %s"

4361 msgstr " eller: %s"

4362

4292 -#: parse-options.c:787

4363 +#: parse-options.c:915

4364 #, c-format

4365 msgid " %s"

4366 msgstr " %s"

4367

4297 -#: parse-options.c:826

4368 +#: parse-options.c:954

4369 msgid "-NUM"

4370 msgstr "-TAL"

4371

4301 -#: parse-options-cb.c:21

4372 +#: parse-options.c:968

4373 +#, c-format

4374 +msgid "alias of --%s"

4375 +msgstr "alias för --%s"

4376 +

4377 +#: parse-options-cb.c:20 parse-options-cb.c:24

4378 #, c-format

4379 msgid "option `%s' expects a numerical value"

4380 msgstr "flaggan \"%s\" antar ett numeriskt värde"

4381

4306 -#: parse-options-cb.c:38

4382 +#: parse-options-cb.c:41

4383 #, c-format

4384 msgid "malformed expiration date '%s'"

4309 -msgstr "trasigt utlöpsdatum: ”%s”"

4385 +msgstr "trasigt utlöpsdatum: \"%s\""

4386

4311 -#: parse-options-cb.c:51

4387 +#: parse-options-cb.c:54

4388 #, c-format

4389 msgid "option `%s' expects \"always\", \"auto\", or \"never\""

4390 msgstr ""

4391 "flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)"

4392

4317 -#: parse-options-cb.c:127 parse-options-cb.c:144

4393 +#: parse-options-cb.c:130 parse-options-cb.c:147

4394 #, c-format

4395 msgid "malformed object name '%s'"

4396 msgstr "felformat objektnamn \"%s\""

@@ -4371,7 +4447,7 @@ msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\""

4447 #: pathspec.c:368

4448 #, c-format

4449 msgid "Unimplemented pathspec magic '%c' in '%s'"

4374 -msgstr "Ej implementerat sökvägsuttryckmagi ”%c” i ”%s”"

4450 +msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\""

4451

4452 #: pathspec.c:427

4453 #, c-format

@@ -4462,24 +4538,29 @@ msgstr "kunde inte skapa trådad lstat: %s"

4538 msgid "unable to parse --pretty format"

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

4540

4465 -#: range-diff.c:56

4541 +#: range-diff.c:70

4542 msgid "could not start `log`"

4543 msgstr "kunde inte starta \"log\""

4544

4469 -#: range-diff.c:59

4545 +#: range-diff.c:72

4546 msgid "could not read `log` output"

4547 msgstr "kunde inte läsa utdata från \"log\""

4548

4473 -#: range-diff.c:74 sequencer.c:4897

4549 +#: range-diff.c:91 sequencer.c:5021

4550 #, c-format

4551 msgid "could not parse commit '%s'"

4552 msgstr "kunde inte tolka incheckningen \"%s\""

4553

4478 -#: range-diff.c:224

4554 +#: range-diff.c:117

4555 +#, c-format

4556 +msgid "could not parse git header '%.*s'"

4557 +msgstr "kunde inte tolka git-huvudet \"%.*s\""

4558 +

4559 +#: range-diff.c:274

4560 msgid "failed to generate diff"

4561 msgstr "misslyckades skapa diff"

4562

4482 -#: range-diff.c:455 range-diff.c:457

4563 +#: range-diff.c:506 range-diff.c:508

4564 #, c-format

4565 msgid "could not parse log for '%s'"

4566 msgstr "kunde inte tolka loggen för \"%s\""

@@ -4595,11 +4676,10 @@ msgid "unordered stage entries for '%s'"

4676 msgstr "osorterade köposter för \"%s\""

4677

4678 #: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111

4598 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358

4599 -#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955

4600 -#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498

4601 -#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271

4602 -#: builtin/submodule--helper.c:330

4679 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467

4680 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347

4681 +#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145

4682 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330

4683 msgid "index file corrupt"

4684 msgstr "indexfilen trasig"

4685

@@ -4653,32 +4733,32 @@ msgstr "kunde inte uppdatera delat index \"%s\""

4733 msgid "broken index, expect %s in %s, got %s"

4734 msgstr "trasigt index, förväntade %s i %s, fick %s"

4735

4656 -#: read-cache.c:2988 wrapper.c:658 builtin/merge.c:1117

4736 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114

4737 #, c-format

4738 msgid "could not close '%s'"

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

4740

4661 -#: read-cache.c:3091 sequencer.c:2354 sequencer.c:3807

4741 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928

4742 #, c-format

4743 msgid "could not stat '%s'"

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

4745

4666 -#: read-cache.c:3104

4746 +#: read-cache.c:3105

4747 #, c-format

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

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

4750

4671 -#: read-cache.c:3116

4751 +#: read-cache.c:3117

4752 #, c-format

4753 msgid "unable to unlink: %s"

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

4755

4676 -#: read-cache.c:3141

4756 +#: read-cache.c:3142

4757 #, c-format

4758 msgid "cannot fix permission bits on '%s'"

4759 msgstr "kan inte rätta behörighetsbitar på \"%s\""

4760

4681 -#: read-cache.c:3290

4761 +#: read-cache.c:3291

4762 #, c-format

4763 msgid "%s: cannot drop to stage #0"

4764 msgstr "%s: kan inte återgå till kö 0"

@@ -4741,7 +4821,7 @@ msgid_plural "Rebase %s onto %s (%d commands)"

4821 msgstr[0] "Ombasera %s på %s (%d kommando)"

4822 msgstr[1] "Ombasera %s på %s (%d kommandon)"

4823

4744 -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173

4824 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228

4825 msgid ""

4826 "\n"

4827 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

@@ -4750,7 +4830,7 @@ msgstr ""

4830 "Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en "

4831 "incheckning.\n"

4832

4753 -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177

4833 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232

4834 msgid ""

4835 "\n"

4836 "If you remove a line here THAT COMMIT WILL BE LOST.\n"

@@ -4758,7 +4838,7 @@ msgstr ""

4838 "\n"

4839 "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"

4840

4761 -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816

4841 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871

4842 msgid ""

4843 "\n"

4844 "You are editing the todo file of an ongoing interactive rebase.\n"

@@ -4772,7 +4852,7 @@ msgstr ""

4852 " git rebase --continue\n"

4853 "\n"

4854

4775 -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893

4855 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948

4856 msgid ""

4857 "\n"

4858 "However, if you remove everything, the rebase will be aborted.\n"

@@ -4782,12 +4862,12 @@ msgstr ""

4862 "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"

4863 "\n"

4864

4785 -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900

4865 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955

4866 msgid "Note that empty commits are commented out"

4867 msgstr "Observera att tomma incheckningar är utkommenterade"

4868

4789 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339

4790 -#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235

4869 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447

4870 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235

4871 #, c-format

4872 msgid "could not write '%s'"

4873 msgstr "kunde inte skriva \"%s\""

@@ -4826,97 +4906,98 @@ msgstr ""

4906 "\" (fel).\n"

4907 "\n"

4908

4829 -#: refs.c:192

4909 +#: refs.c:262

4910 #, c-format

4911 msgid "%s does not point to a valid object!"

4912 msgstr "\"%s\" pekar inte på ett giltigt objekt!"

4913

4834 -#: refs.c:597

4914 +#: refs.c:667

4915 #, c-format

4916 msgid "ignoring dangling symref %s"

4917 msgstr "ignorerar dinglande symbolisk referens %s"

4918

4839 -#: refs.c:599 ref-filter.c:1982

4919 +#: refs.c:669 ref-filter.c:2092

4920 #, c-format

4921 msgid "ignoring broken ref %s"

4922 msgstr "ignorerar trasig referens %s"

4923

4844 -#: refs.c:734

4924 +#: refs.c:804

4925 #, c-format

4926 msgid "could not open '%s' for writing: %s"

4927 msgstr "kunde inte öppna \"%s\" för skrivning: %s"

4928

4849 -#: refs.c:744 refs.c:795

4929 +#: refs.c:814 refs.c:865

4930 #, c-format

4931 msgid "could not read ref '%s'"

4932 msgstr "Kunde inte läsa referensen \"%s\""

4933

4854 -#: refs.c:750

4934 +#: refs.c:820

4935 #, c-format

4936 msgid "ref '%s' already exists"

4937 msgstr "referensen \"%s\" finns redan"

4938

4859 -#: refs.c:755

4939 +#: refs.c:825

4940 #, c-format

4941 msgid "unexpected object ID when writing '%s'"

4942 msgstr "oväntat objekt-id vid skrivning \"%s\""

4943

4864 -#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805

4865 -#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656

4944 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913

4945 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656

4946 #, c-format

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

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

4949

4870 -#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993

4950 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715

4951 +#: builtin/rebase.c:1003

4952 #, c-format

4953 msgid "could not open '%s' for writing"

4954 msgstr "kunde inte öppna \"%s\" för skrivning"

4955

4875 -#: refs.c:797

4956 +#: refs.c:867

4957 #, c-format

4958 msgid "unexpected object ID when deleting '%s'"

4959 msgstr "oväntat objekt-id vid borttagning \"%s\""

4960

4880 -#: refs.c:928

4961 +#: refs.c:998

4962 #, c-format

4963 msgid "log for ref %s has gap after %s"

4964 msgstr "loggen för referensen %s har lucka efter %s"

4965

4885 -#: refs.c:934

4966 +#: refs.c:1004

4967 #, c-format

4968 msgid "log for ref %s unexpectedly ended on %s"

4969 msgstr "loggen för referensen %s slutade oväntat på %s"

4970

4890 -#: refs.c:993

4971 +#: refs.c:1063

4972 #, c-format

4973 msgid "log for %s is empty"

4974 msgstr "loggen för %s är tom"

4975

4895 -#: refs.c:1085

4976 +#: refs.c:1155

4977 #, c-format

4978 msgid "refusing to update ref with bad name '%s'"

4979 msgstr "vägrar uppdatera referens med trasigt namn \"%s\""

4980

4900 -#: refs.c:1161

4981 +#: refs.c:1231

4982 #, c-format

4983 msgid "update_ref failed for ref '%s': %s"

4984 msgstr "update_ref misslyckades för referensen \"%s\": %s"

4985

4905 -#: refs.c:1942

4986 +#: refs.c:2012

4987 #, c-format

4988 msgid "multiple updates for ref '%s' not allowed"

4989 msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"

4990

4910 -#: refs.c:1974

4991 +#: refs.c:2044

4992 msgid "ref updates forbidden inside quarantine environment"

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

4994

4914 -#: refs.c:2070 refs.c:2100

4995 +#: refs.c:2140 refs.c:2170

4996 #, c-format

4997 msgid "'%s' exists; cannot create '%s'"

4998 msgstr "\"%s\" finns; kan inte skapa \"%s\""

4999

4919 -#: refs.c:2076 refs.c:2111

5000 +#: refs.c:2146 refs.c:2181

5001 #, c-format

5002 msgid "cannot process '%s' and '%s' at the same time"

5003 msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"

@@ -4942,268 +5023,252 @@ msgstr "kunde inte ta bort referenser: %s"

5023 msgid "invalid refspec '%s'"

5024 msgstr "felaktig referensspecifikation: \"%s\""

5025

4945 -#: ref-filter.c:39 wt-status.c:1907

5026 +#: ref-filter.c:42 wt-status.c:1934

5027 msgid "gone"

5028 msgstr "försvunnen"

5029

4949 -#: ref-filter.c:40

5030 +#: ref-filter.c:43

5031 #, c-format

5032 msgid "ahead %d"

5033 msgstr "före %d"

5034

4954 -#: ref-filter.c:41

5035 +#: ref-filter.c:44

5036 #, c-format

5037 msgid "behind %d"

5038 msgstr "bakom %d"

5039

4959 -#: ref-filter.c:42

5040 +#: ref-filter.c:45

5041 #, c-format

5042 msgid "ahead %d, behind %d"

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

5044

4964 -#: ref-filter.c:138

5045 +#: ref-filter.c:162

5046 #, c-format

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

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

5049

4969 -#: ref-filter.c:140

5050 +#: ref-filter.c:164

5051 #, c-format

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

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

5054

4974 -#: ref-filter.c:162

5055 +#: ref-filter.c:186

5056 #, c-format

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

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

5059

4979 -#: ref-filter.c:166

5060 +#: ref-filter.c:190

5061 #, c-format

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

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

5064

4984 -#: ref-filter.c:168

5065 +#: ref-filter.c:192

5066 #, c-format

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

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

5069

4989 -#: ref-filter.c:223

5070 +#: ref-filter.c:247

5071 #, c-format

5072 msgid "%%(objecttype) does not take arguments"

5073 msgstr "%%(objecttype) tar inte argument"

5074

4994 -#: ref-filter.c:245

5075 +#: ref-filter.c:269

5076 #, c-format

5077 msgid "unrecognized %%(objectsize) argument: %s"

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

5079

4999 -#: ref-filter.c:253

5080 +#: ref-filter.c:277

5081 #, c-format

5082 msgid "%%(deltabase) does not take arguments"

5083 msgstr "%%(deltabase) tar inte argument"

5084

5004 -#: ref-filter.c:265

5085 +#: ref-filter.c:289

5086 #, c-format

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

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

5089

5009 -#: ref-filter.c:274

5090 +#: ref-filter.c:298

5091 #, c-format

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

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

5094

5014 -#: ref-filter.c:296

5095 +#: ref-filter.c:320

5096 #, c-format

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

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

5099

5019 -#: ref-filter.c:325

5100 +#: ref-filter.c:349

5101 #, c-format

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

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

5104

5024 -#: ref-filter.c:327

5105 +#: ref-filter.c:351

5106 #, c-format

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

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

5109

5029 -#: ref-filter.c:342

5110 +#: ref-filter.c:366

5111 #, c-format

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

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

5114

5034 -#: ref-filter.c:346

5115 +#: ref-filter.c:370

5116 #, c-format

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

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

5119

5039 -#: ref-filter.c:376

5120 +#: ref-filter.c:400

5121 #, c-format

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

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

5124

5044 -#: ref-filter.c:388

5125 +#: ref-filter.c:412

5126 #, c-format

5127 msgid "unrecognized position:%s"

5128 msgstr "okänd position:%s"

5129

5049 -#: ref-filter.c:395

5130 +#: ref-filter.c:419

5131 #, c-format

5132 msgid "unrecognized width:%s"

5133 msgstr "okänd bredd:%s"

5134

5054 -#: ref-filter.c:404

5135 +#: ref-filter.c:428

5136 #, c-format

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

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

5139

5059 -#: ref-filter.c:412

5140 +#: ref-filter.c:436

5141 #, c-format

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

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

5144

5064 -#: ref-filter.c:430

5145 +#: ref-filter.c:454

5146 #, c-format

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

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

5149

5069 -#: ref-filter.c:531

5150 +#: ref-filter.c:556

5151 #, c-format

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

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

5154

5074 -#: ref-filter.c:558

5155 +#: ref-filter.c:583

5156 #, c-format

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

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

5159

5079 -#: ref-filter.c:562

5160 +#: ref-filter.c:587

5161 #, c-format

5162 msgid ""

5163 "not a git repository, but the field '%.*s' requires access to object data"

5164 msgstr ""

5165 "inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata"

5166

5086 -#: ref-filter.c:686

5167 +#: ref-filter.c:711

5168 #, c-format

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

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

5171

5091 -#: ref-filter.c:749

5172 +#: ref-filter.c:774

5173 #, c-format

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

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

5176

5096 -#: ref-filter.c:751

5177 +#: ref-filter.c:776

5178 #, c-format

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

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

5181

5101 -#: ref-filter.c:753

5182 +#: ref-filter.c:778

5183 #, c-format

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

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

5186

5106 -#: ref-filter.c:781

5187 +#: ref-filter.c:806

5188 #, c-format

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

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

5191

5111 -#: ref-filter.c:783

5192 +#: ref-filter.c:808

5193 #, c-format

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

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

5196

5116 -#: ref-filter.c:785

5197 +#: ref-filter.c:810

5198 #, c-format

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

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

5201

5121 -#: ref-filter.c:800

5202 +#: ref-filter.c:825

5203 #, c-format

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

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

5206

5126 -#: ref-filter.c:857

5207 +#: ref-filter.c:882

5208 #, c-format

5209 msgid "malformed format string %s"

5210 msgstr "felformad formatsträng %s"

5211

5131 -#: ref-filter.c:1453

5132 -#, c-format

5133 -msgid "(no branch, rebasing %s)"

5134 -msgstr "(ingen gren, ombaserar %s)"

5135 -

5136 -#: ref-filter.c:1456

5137 -#, c-format

5138 -msgid "(no branch, rebasing detached HEAD %s)"

5139 -msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)"

5140 -

5141 -#: ref-filter.c:1459

5212 +#: ref-filter.c:1485

5213 #, c-format

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

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

5214 +msgid "no branch, rebasing %s"

5215 +msgstr "ingen gren, ombaserar %s"

5216

5146 -#. TRANSLATORS: make sure this matches "HEAD

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

5148 -#.

5149 -#: ref-filter.c:1467

5217 +#: ref-filter.c:1488

5218 #, c-format

5151 -msgid "(HEAD detached at %s)"

5152 -msgstr "(HEAD frånkopplat vid %s)"

5219 +msgid "no branch, rebasing detached HEAD %s"

5220 +msgstr "ingen gren, ombaserar frånkopplat HEAD %s"

5221

5154 -#. TRANSLATORS: make sure this matches "HEAD

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

5156 -#.

5157 -#: ref-filter.c:1474

5222 +#: ref-filter.c:1491

5223 #, c-format

5159 -msgid "(HEAD detached from %s)"

5160 -msgstr "(HEAD frånkopplat från %s)"

5224 +msgid "no branch, bisect started on %s"

5225 +msgstr "ingen gren, \"bisect\" startad på %s"

5226

5162 -#: ref-filter.c:1478

5163 -msgid "(no branch)"

5164 -msgstr "(ingen gren)"

5227 +#: ref-filter.c:1501

5228 +msgid "no branch"

5229 +msgstr "ingen gren"

5230

5166 -#: ref-filter.c:1512 ref-filter.c:1669

5231 +#: ref-filter.c:1537 ref-filter.c:1743

5232 #, c-format

5233 msgid "missing object %s for %s"

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

5235

5171 -#: ref-filter.c:1522

5236 +#: ref-filter.c:1547

5237 #, c-format

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

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

5240

5176 -#: ref-filter.c:1888

5241 +#: ref-filter.c:1998

5242 #, c-format

5243 msgid "malformed object at '%s'"

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

5245

5181 -#: ref-filter.c:1977

5246 +#: ref-filter.c:2087

5247 #, c-format

5248 msgid "ignoring ref with broken name %s"

5249 msgstr "ignorerar referens med trasigt namn %s"

5250

5186 -#: ref-filter.c:2263

5251 +#: ref-filter.c:2382

5252 #, c-format

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

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

5255

5191 -#: ref-filter.c:2363

5256 +#: ref-filter.c:2482

5257 #, c-format

5258 msgid "option `%s' is incompatible with --merged"

5259 msgstr "flaggan \"%s\" är inkompatibel med --merged"

5260

5196 -#: ref-filter.c:2366

5261 +#: ref-filter.c:2485

5262 #, c-format

5263 msgid "option `%s' is incompatible with --no-merged"

5264 msgstr "flaggan \"%s\" är inkompatibel med --no-merged"

5265

5201 -#: ref-filter.c:2376

5266 +#: ref-filter.c:2495

5267 #, c-format

5268 msgid "malformed object name %s"

5269 msgstr "felformat objektnamn %s"

5270

5206 -#: ref-filter.c:2381

5271 +#: ref-filter.c:2500

5272 #, c-format

5273 msgid "option `%s' must point to a commit"

5274 msgstr "flaggan \"%s\" måste peka på en incheckning"

@@ -5545,8 +5610,8 @@ msgstr "kan inte ta bort lös länk \"%s\""

5610 msgid "Recorded preimage for '%s'"

5611 msgstr "Sparade förhandsbild för \"%s\""

5612

5548 -#: rerere.c:881 submodule.c:2024 builtin/log.c:1750

5549 -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427

5613 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1790

5614 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428

5615 #, c-format

5616 msgid "could not create directory '%s'"

5617 msgstr "kunde inte skapa katalogen \"%s\""

@@ -5580,20 +5645,20 @@ msgstr "Glömde lösning för \"%s\"\n"

5645 msgid "unable to open rr-cache directory"

5646 msgstr "kan inte uppdatera katalogen rr-cache"

5647

5583 -#: revision.c:2476

5648 +#: revision.c:2507

5649 msgid "your current branch appears to be broken"

5650 msgstr "din nuvarande gren verkar vara trasig"

5651

5587 -#: revision.c:2479

5652 +#: revision.c:2510

5653 #, c-format

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

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

5656

5592 -#: revision.c:2679

5657 +#: revision.c:2710

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

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

5660

5596 -#: revision.c:2683

5661 +#: revision.c:2714

5662 msgid "-L does not yet support diff formats besides -p and -s"

5663 msgstr "-L stöder ännu inte andra diff-format än -p och -s"

5664

@@ -5663,24 +5728,29 @@ msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""

5728 msgid "could not delete '%s'"

5729 msgstr "kunde inte ta bort \"%s\""

5730

5666 -#: sequencer.c:318

5731 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369

5732 +#, c-format

5733 +msgid "could not remove '%s'"

5734 +msgstr "kunde inte ta bort \"%s\""

5735 +

5736 +#: sequencer.c:321

5737 msgid "revert"

5738 msgstr "revert"

5739

5670 -#: sequencer.c:320

5740 +#: sequencer.c:323

5741 msgid "cherry-pick"

5742 msgstr "cherry-pick"

5743

5674 -#: sequencer.c:322

5744 +#: sequencer.c:325

5745 msgid "rebase -i"

5746 msgstr "rebase -i"

5747

5678 -#: sequencer.c:324

5748 +#: sequencer.c:327

5749 #, c-format

5750 msgid "unknown action: %d"

5751 msgstr "okänd funktion: %d"

5752

5683 -#: sequencer.c:382

5753 +#: sequencer.c:385

5754 msgid ""

5755 "after resolving the conflicts, mark the corrected paths\n"

5756 "with 'git add <paths>' or 'git rm <paths>'"

@@ -5688,7 +5758,7 @@ msgstr ""

5758 "efter att ha löst konflikterna, markera de rättade sökvägarna\n"

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

5760

5691 -#: sequencer.c:385

5761 +#: sequencer.c:388

5762 msgid ""

5763 "after resolving the conflicts, mark the corrected paths\n"

5764 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -5698,44 +5768,44 @@ msgstr ""

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

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

5770

5701 -#: sequencer.c:398 sequencer.c:2801

5771 +#: sequencer.c:401 sequencer.c:2909

5772 #, c-format

5773 msgid "could not lock '%s'"

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

5775

5706 -#: sequencer.c:405

5776 +#: sequencer.c:408

5777 #, c-format

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

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

5780

5711 -#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821

5712 -#: sequencer.c:3084

5781 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929

5782 +#: sequencer.c:3192

5783 #, c-format

5784 msgid "failed to finalize '%s'"

5785 msgstr "misslyckades färdigställa \"%s\""

5786

5717 -#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704

5718 -#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760

5719 -#: builtin/merge.c:1115 builtin/rebase.c:567

5787 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734

5788 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763

5789 +#: builtin/merge.c:1112 builtin/rebase.c:567

5790 #, c-format

5791 msgid "could not read '%s'"

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

5793

5724 -#: sequencer.c:459

5794 +#: sequencer.c:462

5795 #, c-format

5796 msgid "your local changes would be overwritten by %s."

5797 msgstr "dina lokala ändringar skulle skrivas över av %s."

5798

5729 -#: sequencer.c:463

5799 +#: sequencer.c:466

5800 msgid "commit your changes or stash them to proceed."

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

5802

5733 -#: sequencer.c:495

5803 +#: sequencer.c:498

5804 #, c-format

5805 msgid "%s: fast-forward"

5806 msgstr "%s: snabbspola"

5807

5738 -#: sequencer.c:534 builtin/tag.c:555

5808 +#: sequencer.c:537 builtin/tag.c:565

5809 #, c-format

5810 msgid "Invalid cleanup mode %s"

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

@@ -5743,70 +5813,70 @@ msgstr "Felaktigt städningsläge %s"

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

5814 #. "rebase -i".

5815 #.

5746 -#: sequencer.c:629

5816 +#: sequencer.c:632

5817 #, c-format

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

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

5820

5751 -#: sequencer.c:646

5821 +#: sequencer.c:649

5822 msgid "unable to update cache tree"

5823 msgstr "kan inte uppdatera cacheträd"

5824

5755 -#: sequencer.c:660

5825 +#: sequencer.c:663

5826 msgid "could not resolve HEAD commit"

5827 msgstr "kunde inte bestämma HEAD:s incheckning"

5828

5759 -#: sequencer.c:740

5829 +#: sequencer.c:743

5830 #, c-format

5831 msgid "no key present in '%.*s'"

5832 msgstr "ingen nyckel i \"%.*s\""

5833

5764 -#: sequencer.c:751

5834 +#: sequencer.c:754

5835 #, c-format

5836 msgid "unable to dequote value of '%s'"

5837 msgstr "kan inte ta bort citering av värdet \"%s\""

5838

5769 -#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706

5770 -#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035

5839 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706

5840 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045

5841 #, c-format

5842 msgid "could not open '%s' for reading"

5843 msgstr "kunde inte öppna \"%s\" för läsning"

5844

5775 -#: sequencer.c:798

5845 +#: sequencer.c:801

5846 msgid "'GIT_AUTHOR_NAME' already given"

5847 msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"

5848

5779 -#: sequencer.c:803

5849 +#: sequencer.c:806

5850 msgid "'GIT_AUTHOR_EMAIL' already given"

5851 msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"

5852

5783 -#: sequencer.c:808

5853 +#: sequencer.c:811

5854 msgid "'GIT_AUTHOR_DATE' already given"

5855 msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"

5856

5787 -#: sequencer.c:812

5857 +#: sequencer.c:815

5858 #, c-format

5859 msgid "unknown variable '%s'"

5860 msgstr "okänd variabel \"%s\""

5861

5792 -#: sequencer.c:817

5862 +#: sequencer.c:820

5863 msgid "missing 'GIT_AUTHOR_NAME'"

5864 msgstr "\"GIT_AUTHOR_NAME\" saknas"

5865

5796 -#: sequencer.c:819

5866 +#: sequencer.c:822

5867 msgid "missing 'GIT_AUTHOR_EMAIL'"

5868 msgstr "\"GIT_AUTHOR_EMAIL\" saknas"

5869

5800 -#: sequencer.c:821

5870 +#: sequencer.c:824

5871 msgid "missing 'GIT_AUTHOR_DATE'"

5872 msgstr "\"GIT_AUTHOR_DATE\" saknas"

5873

5804 -#: sequencer.c:881

5874 +#: sequencer.c:884

5875 #, c-format

5876 msgid "invalid date format '%s' in '%s'"

5877 msgstr "ogiltigt datumformat \"%s\" i \"%s\""

5878

5809 -#: sequencer.c:898

5879 +#: sequencer.c:901

5880 #, c-format

5881 msgid ""

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

@@ -5835,15 +5905,15 @@ msgstr ""

5905 "\n"

5906 " git rebase --continue\n"

5907

5838 -#: sequencer.c:992

5908 +#: sequencer.c:995

5909 msgid "writing root commit"

5910 msgstr "skriver rotincheckning"

5911

5842 -#: sequencer.c:1213

5912 +#: sequencer.c:1216

5913 msgid "'prepare-commit-msg' hook failed"

5914 msgstr "kroken \"prepare-commit-msg\" misslyckades"

5915

5846 -#: sequencer.c:1220

5916 +#: sequencer.c:1223

5917 msgid ""

5918 "Your name and email address were configured automatically based\n"

5919 "on your username and hostname. Please check that they are accurate.\n"

@@ -5870,7 +5940,7 @@ msgstr ""

5940 "\n"

5941 " git commit --amend --reset-author\n"

5942

5873 -#: sequencer.c:1233

5943 +#: sequencer.c:1236

5944 msgid ""

5945 "Your name and email address were configured automatically based\n"

5946 "on your username and hostname. Please check that they are accurate.\n"

@@ -5895,307 +5965,350 @@ msgstr ""

5965 "\n"

5966 " git commit --amend --reset-author\n"

5967

5898 -#: sequencer.c:1275

5968 +#: sequencer.c:1278

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

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

5971

5902 -#: sequencer.c:1277

5972 +#: sequencer.c:1280

5973 msgid "could not parse newly created commit"

5974 msgstr "kunde inte tolka en precis skapad incheckning"

5975

5906 -#: sequencer.c:1323

5976 +#: sequencer.c:1326

5977 msgid "unable to resolve HEAD after creating commit"

5978 msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"

5979

5910 -#: sequencer.c:1325

5980 +#: sequencer.c:1328

5981 msgid "detached HEAD"

5982 msgstr "frånkopplad HEAD"

5983

5914 -#: sequencer.c:1329

5984 +#: sequencer.c:1332

5985 msgid " (root-commit)"

5986 msgstr " (rotincheckning)"

5987

5918 -#: sequencer.c:1350

5988 +#: sequencer.c:1353

5989 msgid "could not parse HEAD"

5990 msgstr "kunde inte tolka HEAD"

5991

5922 -#: sequencer.c:1352

5992 +#: sequencer.c:1355

5993 #, c-format

5994 msgid "HEAD %s is not a commit!"

5995 msgstr "HEAD %s är inte en incheckning!"

5996

5927 -#: sequencer.c:1356 builtin/commit.c:1551

5997 +#: sequencer.c:1359 builtin/commit.c:1571

5998 msgid "could not parse HEAD commit"

5999 msgstr "kunde inte tolka HEAD:s incheckning"

6000

5931 -#: sequencer.c:1408 sequencer.c:2001

6001 +#: sequencer.c:1411 sequencer.c:2004

6002 msgid "unable to parse commit author"

6003 msgstr "kunde inte tolka incheckningens författare"

6004

5935 -#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688

6005 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684

6006 msgid "git write-tree failed to write a tree"

6007 msgstr "git write-tree misslyckades skriva ett träd"

6008

5939 -#: sequencer.c:1435 sequencer.c:1496

6009 +#: sequencer.c:1438 sequencer.c:1499

6010 #, c-format

6011 msgid "unable to read commit message from '%s'"

6012 msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""

6013

5944 -#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882

5945 -#: builtin/merge.c:906

6014 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878

6015 +#: builtin/merge.c:903

6016 msgid "failed to write commit object"

6017 msgstr "kunde inte skriva incheckningsobjekt"

6018

5949 -#: sequencer.c:1523

6019 +#: sequencer.c:1526

6020 #, c-format

6021 msgid "could not parse commit %s"

6022 msgstr "kunde inte tolka incheckningen %s"

6023

5954 -#: sequencer.c:1528

6024 +#: sequencer.c:1531

6025 #, c-format

6026 msgid "could not parse parent commit %s"

6027 msgstr "kunde inte tolka föräldraincheckningen %s"

6028

5959 -#: sequencer.c:1602 sequencer.c:1712

6029 +#: sequencer.c:1605 sequencer.c:1715

6030 #, c-format

6031 msgid "unknown command: %d"

6032 msgstr "okänt kommando: %d"

6033

5964 -#: sequencer.c:1659 sequencer.c:1684

6034 +#: sequencer.c:1662 sequencer.c:1687

6035 #, c-format

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

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

6038

5969 -#: sequencer.c:1669

6039 +#: sequencer.c:1672

6040 msgid "need a HEAD to fixup"

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

6042

5973 -#: sequencer.c:1671 sequencer.c:3111

6043 +#: sequencer.c:1674 sequencer.c:3219

6044 msgid "could not read HEAD"

6045 msgstr "kunde inte läsa HEAD"

6046

5977 -#: sequencer.c:1673

6047 +#: sequencer.c:1676

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

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

6050

5981 -#: sequencer.c:1679

6051 +#: sequencer.c:1682

6052 #, c-format

6053 msgid "cannot write '%s'"

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

6055

5986 -#: sequencer.c:1686 git-rebase--preserve-merges.sh:441

6056 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496

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

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

6059

5990 -#: sequencer.c:1694

6060 +#: sequencer.c:1697

6061 #, c-format

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

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

6064

5995 -#: sequencer.c:1701

6065 +#: sequencer.c:1704

6066 #, c-format

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

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

6069

6000 -#: sequencer.c:1707

6070 +#: sequencer.c:1710

6071 #, c-format

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

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

6074

6005 -#: sequencer.c:1795

6075 +#: sequencer.c:1798

6076 msgid "your index file is unmerged."

6077 msgstr "din indexfil har inte slagits ihop."

6078

6009 -#: sequencer.c:1802

6079 +#: sequencer.c:1805

6080 msgid "cannot fixup root commit"

6081 msgstr "kan inte göra \"fixup\" på rotincheckning"

6082

6013 -#: sequencer.c:1821

6083 +#: sequencer.c:1824

6084 #, c-format

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

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

6087

6018 -#: sequencer.c:1829 sequencer.c:1837

6088 +#: sequencer.c:1832 sequencer.c:1840

6089 #, c-format

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

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

6092

6023 -#: sequencer.c:1843

6093 +#: sequencer.c:1846

6094 #, c-format

6095 msgid "cannot get commit message for %s"

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

6097

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

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

6030 -#: sequencer.c:1862

6100 +#: sequencer.c:1865

6101 #, c-format

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

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

6104

6035 -#: sequencer.c:1927

6105 +#: sequencer.c:1930

6106 #, c-format

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

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

6109

6040 -#: sequencer.c:1982

6110 +#: sequencer.c:1985

6111 #, c-format

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

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

6114

6045 -#: sequencer.c:1983

6115 +#: sequencer.c:1986

6116 #, c-format

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

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

6119

6050 -#: sequencer.c:2042

6120 +#: sequencer.c:2045

6121 #, c-format

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

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

6124

6055 -#: sequencer.c:2049

6125 +#: sequencer.c:2052

6126 #, c-format

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

6128 msgstr "git %s: misslyckades uppdatera indexet"

6129

6060 -#: sequencer.c:2118

6130 +#: sequencer.c:2128

6131 #, c-format

6132 msgid "%s does not accept arguments: '%s'"

6133 msgstr "%s tar inte argument: \"%s\""

6134

6065 -#: sequencer.c:2127

6135 +#: sequencer.c:2137

6136 #, c-format

6137 msgid "missing arguments for %s"

6138 msgstr "argument saknas för %s"

6139

6070 -#: sequencer.c:2164

6140 +#: sequencer.c:2174

6141 #, c-format

6142 msgid "could not parse '%.*s'"

6143 msgstr "kunde inte tolka \"%.*s\""

6144

6075 -#: sequencer.c:2226

6145 +#: sequencer.c:2228

6146 #, c-format

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

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

6149

6080 -#: sequencer.c:2237

6150 +#: sequencer.c:2239

6151 #, c-format

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

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

6154

6085 -#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178

6155 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178

6156 #: builtin/rebase.c:204 builtin/rebase.c:229

6157 #, c-format

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

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

6160

6091 -#: sequencer.c:2360

6161 +#: sequencer.c:2323

6162 +msgid "cancelling a cherry picking in progress"

6163 +msgstr "avbryter pågående \"cherry-pick\""

6164 +

6165 +#: sequencer.c:2330

6166 +msgid "cancelling a revert in progress"

6167 +msgstr "avbryter pågående \"revert\""

6168 +

6169 +#: sequencer.c:2364

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

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

6172

6095 -#: sequencer.c:2362

6173 +#: sequencer.c:2366

6174 #, c-format

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

6098 -msgstr "oanvändbart manus: ”%s”"

6176 +msgstr "oanvändbart manus: \"%s\""

6177

6100 -#: sequencer.c:2367

6178 +#: sequencer.c:2371

6179 msgid "no commits parsed."

6180 msgstr "inga incheckningar lästes."

6181

6104 -#: sequencer.c:2378

6182 +#: sequencer.c:2382

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

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

6185

6108 -#: sequencer.c:2380

6186 +#: sequencer.c:2384

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

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

6189

6112 -#: sequencer.c:2462

6190 +#: sequencer.c:2466

6191 #, c-format

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

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

6194

6117 -#: sequencer.c:2549

6195 +#: sequencer.c:2553

6196 msgid "unusable squash-onto"

6197 msgstr "oanvändbar squash-onto"

6198

6121 -#: sequencer.c:2565

6199 +#: sequencer.c:2569

6200 #, c-format

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

6124 -msgstr "trasigt manus: ”%s”"

6202 +msgstr "trasigt manus: \"%s\""

6203

6126 -#: sequencer.c:2648 sequencer.c:4227

6204 +#: sequencer.c:2652 sequencer.c:4351

6205 msgid "empty commit set passed"

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

6207

6130 -#: sequencer.c:2656

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

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

6208 +#: sequencer.c:2668

6209 +msgid "revert is already in progress"

6210 +msgstr "en \"revert\" pågår redan"

6211

6134 -#: sequencer.c:2657

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

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

6212 +#: sequencer.c:2670

6213 +#, c-format

6214 +msgid "try \"git revert (--continue | %s--abort | --quit)\""

6215 +msgstr "testa \"git revert (--continue | %s--abort | --quit)\""

6216 +

6217 +#: sequencer.c:2673

6218 +msgid "cherry-pick is already in progress"

6219 +msgstr "en \"cherry-pick\" pågår redan"

6220 +

6221 +#: sequencer.c:2675

6222 +#, c-format

6223 +msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

6224 +msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\""

6225

6138 -#: sequencer.c:2660

6226 +#: sequencer.c:2689

6227 #, c-format

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

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

6230

6143 -#: sequencer.c:2674

6231 +#: sequencer.c:2704

6232 msgid "could not lock HEAD"

6233 msgstr "kunde inte låsa HEAD"

6234

6147 -#: sequencer.c:2729 sequencer.c:3979

6235 +#: sequencer.c:2764 sequencer.c:4103

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

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

6238

6151 -#: sequencer.c:2731

6239 +#: sequencer.c:2766 sequencer.c:2777

6240 msgid "cannot resolve HEAD"

6241 msgstr "kan inte bestämma HEAD"

6242

6155 -#: sequencer.c:2733 sequencer.c:2768

6243 +#: sequencer.c:2768 sequencer.c:2812

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

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

6246

6159 -#: sequencer.c:2754 builtin/grep.c:732

6247 +#: sequencer.c:2798 builtin/grep.c:734

6248 #, c-format

6249 msgid "cannot open '%s'"

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

6251

6164 -#: sequencer.c:2756

6252 +#: sequencer.c:2800

6253 #, c-format

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

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

6256

6169 -#: sequencer.c:2757

6257 +#: sequencer.c:2801

6258 msgid "unexpected end of file"

6259 msgstr "oväntat filslut"

6260

6173 -#: sequencer.c:2763

6261 +#: sequencer.c:2807

6262 #, c-format

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

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

6265

6178 -#: sequencer.c:2774

6266 +#: sequencer.c:2818

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

6268 msgstr ""

6269 "Du verkar ha flyttat HEAD.\n"

6270 "Spolar inte tillbaka, kontrollera HEAD!"

6271

6184 -#: sequencer.c:2903 sequencer.c:3894

6272 +#: sequencer.c:2859

6273 +msgid "no revert in progress"

6274 +msgstr "ingen \"revers\" pågår"

6275 +

6276 +#: sequencer.c:2867

6277 +msgid "no cherry-pick in progress"

6278 +msgstr "ingen \"cherry-pick\" pågår"

6279 +

6280 +#: sequencer.c:2877

6281 +msgid "failed to skip the commit"

6282 +msgstr "kunde inte hoppa över incheckningen"

6283 +

6284 +#: sequencer.c:2884

6285 +msgid "there is nothing to skip"

6286 +msgstr "ingenting att hoppa över"

6287 +

l10n: sv.po: Update Swedish translation (4676t0f0u)