34e65a069f · matheusbsbs/matheus-bagliano

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2017-07-19 22:35+0200\n"

11 -"PO-Revision-Date: 2017-07-20 22:56+0200\n"

10 +"POT-Creation-Date: 2017-10-08 09:48+0800\n"

11 +"PO-Revision-Date: 2017-10-11 11:31+0100\n"

12 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"

13 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"

14 "Language: sv\n"

@@ -16,7 +16,7 @@ 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: Poedit 2.0.2\n"

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

20

21 #: advice.c:58

22 #, c-format

@@ -70,7 +70,7 @@ msgstr ""

70 msgid "Exiting because of an unresolved conflict."

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

72

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

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

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

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

76

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

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

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

123

124 -#: apply.c:126

124 +#: apply.c:125

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

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

127

128 -#: apply.c:128

128 +#: apply.c:127

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

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

131

132 -#: apply.c:131

132 +#: apply.c:130

133 msgid "--3way outside a repository"

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

135

136 -#: apply.c:142

136 +#: apply.c:141

137 msgid "--index outside a repository"

138 msgstr "--index utanför arkiv"

139

140 -#: apply.c:145

140 +#: apply.c:144

141 msgid "--cached outside a repository"

142 msgstr "--cached utanför arkiv"

143

144 -#: apply.c:836

144 +#: apply.c:845

145 #, c-format

146 msgid "Cannot prepare timestamp regexp %s"

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

148

149 -#: apply.c:845

149 +#: apply.c:854

150 #, c-format

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

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

153

154 -#: apply.c:929

154 +#: apply.c:928

155 #, c-format

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

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

158

159 -#: apply.c:967

159 +#: apply.c:966

160 #, c-format

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

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

163

164 -#: apply.c:973

164 +#: apply.c:972

165 #, c-format

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

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

168

169 -#: apply.c:974

169 +#: apply.c:973

170 #, c-format

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

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

173

174 -#: apply.c:979

174 +#: apply.c:978

175 #, c-format

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

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

178

179 -#: apply.c:1008

179 +#: apply.c:1007

180 #, c-format

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

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

183

184 -#: apply.c:1326

184 +#: apply.c:1325

185 #, c-format

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

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

188

189 -#: apply.c:1498

189 +#: apply.c:1497

190 #, c-format

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

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

193

194 -#: apply.c:1567

194 +#: apply.c:1566

195 #, c-format

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

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

198

199 -#: apply.c:1587

199 +#: apply.c:1586

200 #, c-format

201 msgid ""

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

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

212 "sökvägskomponenter\n"

213 "tas bort (rad %d)"

214

215 -#: apply.c:1600

215 +#: apply.c:1599

216 #, c-format

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

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

219

220 -#: apply.c:1770

220 +#: apply.c:1787

221 msgid "new file depends on old contents"

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

223

224 -#: apply.c:1772

224 +#: apply.c:1789

225 msgid "deleted file still has contents"

226 msgstr "borttagen fil har fortfarande innehåll"

227

228 -#: apply.c:1806

228 +#: apply.c:1823

229 #, c-format

230 msgid "corrupt patch at line %d"

231 msgstr "trasig patch på rad %d"

232

233 -#: apply.c:1843

233 +#: apply.c:1860

234 #, c-format

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

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

237

238 -#: apply.c:1845

238 +#: apply.c:1862

239 #, c-format

240 msgid "deleted file %s still has contents"

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

242

243 -#: apply.c:1848

243 +#: apply.c:1865

244 #, c-format

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

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

247

248 -#: apply.c:1995

248 +#: apply.c:2012

249 #, c-format

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

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

252

253 -#: apply.c:2032

253 +#: apply.c:2049

254 #, c-format

255 msgid "unrecognized binary patch at line %d"

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

257

258 -#: apply.c:2193

258 +#: apply.c:2209

259 #, c-format

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

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

262

263 -#: apply.c:2276

263 +#: apply.c:2295

264 #, c-format

265 msgid "unable to read symlink %s"

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

267

268 -#: apply.c:2280

268 +#: apply.c:2299

269 #, c-format

270 msgid "unable to open or read %s"

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

272

273 -#: apply.c:2933

273 +#: apply.c:2958

274 #, c-format

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

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

277

278 -#: apply.c:3052

278 +#: apply.c:3077

279 #, c-format

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

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

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

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

284

285 -#: apply.c:3064

285 +#: apply.c:3089

286 #, c-format

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

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

289

290 -#: apply.c:3070

290 +#: apply.c:3095

291 #, c-format

292 msgid ""

293 "while searching for:\n"

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

296 "vid sökning efter:\n"

297 "%.*s"

298

299 -#: apply.c:3092

299 +#: apply.c:3117

300 #, c-format

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

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

303

304 -#: apply.c:3100

304 +#: apply.c:3125

305 #, c-format

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

307 msgstr ""

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

309 "\""

310

311 -#: apply.c:3146

311 +#: apply.c:3171

312 #, c-format

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

314 msgstr ""

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

316

317 -#: apply.c:3156

317 +#: apply.c:3181

318 #, c-format

319 msgid ""

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

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

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

323 "innehållet."

324

325 -#: apply.c:3164

325 +#: apply.c:3189

326 #, c-format

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

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

329

330 -#: apply.c:3182

330 +#: apply.c:3207

331 #, c-format

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

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

334

335 -#: apply.c:3195

335 +#: apply.c:3220

336 #, c-format

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

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

339

340 -#: apply.c:3201

340 +#: apply.c:3226

341 #, c-format

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

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

344

345 -#: apply.c:3222

345 +#: apply.c:3247

346 #, c-format

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

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

349

350 -#: apply.c:3344

350 +#: apply.c:3369

351 #, c-format

352 msgid "cannot checkout %s"

353 msgstr "kan inte checka ut %s"

354

355 -#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277

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

356 #, c-format

357 msgid "failed to read %s"

358 msgstr "misslyckades läsa %s"

359

360 -#: apply.c:3400

360 +#: apply.c:3426

361 #, c-format

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

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

364

365 -#: apply.c:3429 apply.c:3669

365 +#: apply.c:3455 apply.c:3695

366 #, c-format

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

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

369

370 -#: apply.c:3512 apply.c:3683

370 +#: apply.c:3538 apply.c:3709

371 #, c-format

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

373 msgstr "%s: finns inte i indexet"

374

375 -#: apply.c:3521 apply.c:3691

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

376 #, c-format

377 msgid "%s: does not match index"

378 msgstr "%s: motsvarar inte indexet"

379

380 -#: apply.c:3556

380 +#: apply.c:3582

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

382 msgstr ""

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

384 "vägssammanslagning."

385

386 -#: apply.c:3559

386 +#: apply.c:3585

387 #, c-format

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

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

390

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

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

392 #, c-format

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

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

395

396 -#: apply.c:3591

396 +#: apply.c:3617

397 #, c-format

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

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

400

401 -#: apply.c:3605

401 +#: apply.c:3631

402 #, c-format

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

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

405

406 -#: apply.c:3610

406 +#: apply.c:3636

407 #, c-format

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

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

410

411 -#: apply.c:3636

411 +#: apply.c:3662

412 msgid "removal patch leaves file contents"

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

414

415 -#: apply.c:3708

415 +#: apply.c:3734

416 #, c-format

417 msgid "%s: wrong type"

418 msgstr "%s: fel typ"

419

420 -#: apply.c:3710

420 +#: apply.c:3736

421 #, c-format

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

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

424

425 -#: apply.c:3860 apply.c:3862

425 +#: apply.c:3886 apply.c:3888

426 #, c-format

427 msgid "invalid path '%s'"

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

429

430 -#: apply.c:3918

430 +#: apply.c:3944

431 #, c-format

432 msgid "%s: already exists in index"

433 msgstr "%s: finns redan i indexet"

434

435 -#: apply.c:3921

435 +#: apply.c:3947

436 #, c-format

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

438 msgstr "%s: finns redan i arbetskatalogen"

439

440 -#: apply.c:3941

440 +#: apply.c:3967

441 #, c-format

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

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

444

445 -#: apply.c:3946

445 +#: apply.c:3972

446 #, c-format

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

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

449

450 -#: apply.c:3966

450 +#: apply.c:3992

451 #, c-format

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

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

454

455 -#: apply.c:3970

455 +#: apply.c:3996

456 #, c-format

457 msgid "%s: patch does not apply"

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

459

460 -#: apply.c:3985

460 +#: apply.c:4011

461 #, c-format

462 msgid "Checking patch %s..."

463 msgstr "Kontrollerar patchen %s..."

464

465 -#: apply.c:4076

465 +#: apply.c:4102

466 #, c-format

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

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

469

470 -#: apply.c:4083

470 +#: apply.c:4109

471 #, c-format

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

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

474

475 -#: apply.c:4086

475 +#: apply.c:4112

476 #, c-format

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

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

479

480 -#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138

480 +#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148

481 #, c-format

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

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

484

485 -#: apply.c:4095

485 +#: apply.c:4121

486 #, c-format

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

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

489

490 -#: apply.c:4105

490 +#: apply.c:4131

491 #, c-format

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

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

494

495 -#: apply.c:4243

495 +#: apply.c:4269

496 #, c-format

497 msgid "unable to remove %s from index"

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

499

500 -#: apply.c:4278

500 +#: apply.c:4304

501 #, c-format

502 msgid "corrupt patch for submodule %s"

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

504

505 -#: apply.c:4284

505 +#: apply.c:4310

506 #, c-format

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

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

509

510 -#: apply.c:4292

510 +#: apply.c:4318

511 #, c-format

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

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

514

515 -#: apply.c:4298 apply.c:4442

515 +#: apply.c:4324 apply.c:4468

516 #, c-format

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

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

519

520 -#: apply.c:4339

520 +#: apply.c:4365

521 #, c-format

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

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

524

525 -#: apply.c:4343

525 +#: apply.c:4369

526 #, c-format

527 msgid "closing file '%s'"

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

529

530 -#: apply.c:4413

530 +#: apply.c:4439

531 #, c-format

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

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

534

535 -#: apply.c:4511

535 +#: apply.c:4537

536 #, c-format

537 msgid "Applied patch %s cleanly."

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

539

540 -#: apply.c:4519

540 +#: apply.c:4545

541 msgid "internal error"

542 msgstr "internt fel"

543

544 -#: apply.c:4522

544 +#: apply.c:4548

545 #, c-format

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

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

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

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

550

551 -#: apply.c:4533

551 +#: apply.c:4559

552 #, c-format

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

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

555

556 -#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988

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

557 #, c-format

558 msgid "cannot open %s"

559 msgstr "kan inte öppna %s"

560

561 -#: apply.c:4555

561 +#: apply.c:4581

562 #, c-format

563 msgid "Hunk #%d applied cleanly."

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

565

566 -#: apply.c:4559

566 +#: apply.c:4585

567 #, c-format

568 msgid "Rejected hunk #%d."

569 msgstr "Refuserar stycke %d."

570

571 -#: apply.c:4669

571 +#: apply.c:4695

572 #, c-format

573 msgid "Skipped patch '%s'."

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

575

576 -#: apply.c:4677

576 +#: apply.c:4703

577 msgid "unrecognized input"

578 msgstr "indata känns inte igen"

579

580 -#: apply.c:4696

580 +#: apply.c:4722

581 msgid "unable to read index file"

582 msgstr "kan inte läsa indexfilen"

583

584 -#: apply.c:4833

584 +#: apply.c:4859

585 #, c-format

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

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

588

589 -#: apply.c:4860

589 +#: apply.c:4886

590 #, c-format

591 msgid "squelched %d whitespace error"

592 msgid_plural "squelched %d whitespace errors"

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

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

595

596 -#: apply.c:4866 apply.c:4881

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

597 #, c-format

598 msgid "%d line adds whitespace errors."

599 msgid_plural "%d lines add whitespace errors."

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

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

602

603 -#: apply.c:4874

603 +#: apply.c:4900

604 #, c-format

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

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

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

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

609

610 -#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391

610 +#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390

611 msgid "Unable to write new index file"

612 msgstr "Kunde inte skriva ny indexfil"

613

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

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

616 -#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629

617 -#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973

618 -#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161

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

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

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

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

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

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

620 msgid "path"

621 msgstr "sökväg"

622

623 -#: apply.c:4922

623 +#: apply.c:4948

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

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

626

627 -#: apply.c:4925

627 +#: apply.c:4951

628 msgid "apply changes matching the given path"

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

630

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

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

632 msgid "num"

633 msgstr "antal"

634

635 -#: apply.c:4928

635 +#: apply.c:4954

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

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

638

639 -#: apply.c:4931

639 +#: apply.c:4957

640 msgid "ignore additions made by the patch"

641 msgstr "ignorera tillägg gjorda av patchen"

642

643 -#: apply.c:4933

643 +#: apply.c:4959

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

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

646

647 -#: apply.c:4937

647 +#: apply.c:4963

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

649 msgstr "visa antal tillagda och borttagna rader decimalt"

650

651 -#: apply.c:4939

651 +#: apply.c:4965

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

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

654

655 -#: apply.c:4941

655 +#: apply.c:4967

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

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

658

659 -#: apply.c:4943

659 +#: apply.c:4969

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

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

662

663 -#: apply.c:4945

663 +#: apply.c:4971

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

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

666

667 -#: apply.c:4947

667 +#: apply.c:4973

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

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

670

671 -#: apply.c:4949

671 +#: apply.c:4975

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

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

674

675 -#: apply.c:4951

675 +#: apply.c:4977

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

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

678

679 -#: apply.c:4953

679 +#: apply.c:4979

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

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

682

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

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

684 msgid "paths are separated with NUL character"

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

686

687 -#: apply.c:4958

687 +#: apply.c:4984

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

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

690

691 -#: apply.c:4959 builtin/am.c:2245

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

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

693 msgid "action"

694 msgstr "åtgärd"

695

695 -#: apply.c:4960

696 +#: apply.c:4986

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

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

699

699 -#: apply.c:4963 apply.c:4966

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

701 msgid "ignore changes in whitespace when finding context"

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

703

703 -#: apply.c:4969

704 +#: apply.c:4995

705 msgid "apply the patch in reverse"

706 msgstr "tillämpa patchen baklänges"

707

707 -#: apply.c:4971

708 +#: apply.c:4997

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

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

711

711 -#: apply.c:4973

712 +#: apply.c:4999

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

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

715

715 -#: apply.c:4975

716 +#: apply.c:5001

717 msgid "allow overlapping hunks"

718 msgstr "tillåt överlappande stycken"

719

719 -#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21

720 -#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651

721 -#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125

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

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

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

723 msgid "be verbose"

724 msgstr "var pratsam"

725

725 -#: apply.c:4978

726 +#: apply.c:5004

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

728 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

729

729 -#: apply.c:4981

730 +#: apply.c:5007

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

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

733

733 -#: apply.c:4983 builtin/am.c:2254

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

735 msgid "root"

736 msgstr "rot"

737

737 -#: apply.c:4984

738 +#: apply.c:5010

739 msgid "prepend <root> to all filenames"

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

741

@@ -757,108 +758,108 @@ msgstr ""

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

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

760

760 -#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300

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

762 #, c-format

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

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

765

765 -#: archive.c:418

766 +#: archive.c:436

767 msgid "fmt"

768 msgstr "fmt"

769

769 -#: archive.c:418

770 +#: archive.c:436

771 msgid "archive format"

772 msgstr "arkivformat"

773

773 -#: archive.c:419 builtin/log.c:1446

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

775 msgid "prefix"

776 msgstr "prefix"

777

777 -#: archive.c:420

778 +#: archive.c:438

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

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

781

781 -#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61

782 -#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080

783 -#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552

784 -#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120

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

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

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

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

786 #: parse-options.h:153

787 msgid "file"

788 msgstr "fil"

789

789 -#: archive.c:422 builtin/archive.c:89

790 +#: archive.c:440 builtin/archive.c:89

791 msgid "write the archive to this file"

792 msgstr "skriv arkivet till filen"

793

793 -#: archive.c:424

794 +#: archive.c:442

795 msgid "read .gitattributes in working directory"

796 msgstr "läs .gitattributes i arbetskatalogen"

797

797 -#: archive.c:425

798 +#: archive.c:443

799 msgid "report archived files on stderr"

800 msgstr "rapportera arkiverade filer på standard fel"

801

801 -#: archive.c:426

802 +#: archive.c:444

803 msgid "store only"

804 msgstr "endast spara"

805

805 -#: archive.c:427

806 +#: archive.c:445

807 msgid "compress faster"

808 msgstr "komprimera snabbare"

809

809 -#: archive.c:435

810 +#: archive.c:453

811 msgid "compress better"

812 msgstr "komprimera bättre"

813

813 -#: archive.c:438

814 +#: archive.c:456

815 msgid "list supported archive formats"

816 msgstr "visa understödda arkivformat"

817

817 -#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108

818 -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982

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

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

820 msgid "repo"

821 msgstr "arkiv"

822

822 -#: archive.c:441 builtin/archive.c:91

823 +#: archive.c:459 builtin/archive.c:91

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

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

826

826 -#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488

827 +#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489

828 msgid "command"

829 msgstr "kommando"

830

830 -#: archive.c:443 builtin/archive.c:93

831 +#: archive.c:461 builtin/archive.c:93

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

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

834

834 -#: archive.c:450

835 +#: archive.c:468

836 msgid "Unexpected option --remote"

837 msgstr "Oväntad flagga --remote"

838

838 -#: archive.c:452

839 +#: archive.c:470

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

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

842

842 -#: archive.c:454

843 +#: archive.c:472

844 msgid "Unexpected option --output"

845 msgstr "Oväntad flagga --output"

846

846 -#: archive.c:476

847 +#: archive.c:494

848 #, c-format

849 msgid "Unknown archive format '%s'"

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

851

851 -#: archive.c:483

852 +#: archive.c:501

853 #, c-format

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

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

856

856 -#: attr.c:214

857 +#: attr.c:218

858 #, c-format

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

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

861

861 -#: attr.c:410

862 +#: attr.c:415

863 msgid ""

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

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

@@ -936,31 +937,31 @@ msgstr ""

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

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

939

939 -#: bisect.c:849

940 +#: bisect.c:850

941 #, c-format

942 msgid "a %s revision is needed"

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

944

944 -#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256

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

946 #, c-format

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

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

949

949 -#: bisect.c:917

950 +#: bisect.c:918

951 #, c-format

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

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

954

954 -#: bisect.c:947

955 +#: bisect.c:948

956 msgid "reading bisect refs failed"

957 msgstr "misslyckades läsa bisect-referenser"

958

958 -#: bisect.c:967

959 +#: bisect.c:968

960 #, c-format

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

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

963

963 -#: bisect.c:975

964 +#: bisect.c:976

965 #, c-format

966 msgid ""

967 "No testable commit found.\n"

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

970 "Ingen testbar incheckning hittades.\n"

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

972

972 -#: bisect.c:994

973 +#: bisect.c:995

974 #, c-format

975 msgid "(roughly %d step)"

976 msgid_plural "(roughly %d steps)"

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

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

981 #. steps)" translation.

982 #.

982 -#: bisect.c:1000

983 +#: bisect.c:1001

984 #, c-format

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

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

@@ -1000,10 +1001,10 @@ msgstr ""

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

1002 "incheckningen"

1003

1003 -#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166

1004 -#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907

1005 -#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360

1006 -#: builtin/shortlog.c:177

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

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

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

1007 +#: builtin/shortlog.c:191

1008 msgid "revision walk setup failed"

1009 msgstr "misslyckades skapa revisionstraversering"

1010

@@ -1044,45 +1045,50 @@ msgstr "Ställer inte in grenen %s som sin egen uppströmsgren."

1045

1046 #: branch.c:93

1047 #, c-format

1047 -msgid "Branch %s set up to track remote branch %s from %s by rebasing."

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

1049 msgstr ""

1049 -"Grenen %s ställdes in att spåra fjärrgrenen %s från %s genom ombasering."

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

1051 +"ombasering."

1052

1053 #: branch.c:94

1054 #, c-format

1053 -msgid "Branch %s set up to track remote branch %s from %s."

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

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

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

1057

1058 #: branch.c:98

1059 #, c-format

1058 -msgid "Branch %s set up to track local branch %s by rebasing."

1059 -msgstr "Grenen %s ställdes in att spåra den lokala grenen %s genom ombasering."

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

1061 +msgstr ""

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

1063 +"ombasering."

1064

1065 #: branch.c:99

1066 #, c-format

1063 -msgid "Branch %s set up to track local branch %s."

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

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

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

1069

1070 #: branch.c:104

1071 #, c-format

1068 -msgid "Branch %s set up to track remote ref %s by rebasing."

1069 -msgstr "Grenen %s ställdes in att spåra fjärreferensen %s genom ombasering."

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

1073 +msgstr ""

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

1075

1076 #: branch.c:105

1077 #, c-format

1073 -msgid "Branch %s set up to track remote ref %s."

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

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

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

1080

1081 #: branch.c:109

1082 #, c-format

1078 -msgid "Branch %s set up to track local ref %s by rebasing."

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

1084 msgstr ""

1080 -"Grenen %s ställdes in att spåra den lokala referensen %s genom ombasering."

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

1086 +"ombasering."

1087

1088 #: branch.c:110

1089 #, c-format

1084 -msgid "Branch %s set up to track local ref %s."

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

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

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

1092

1093 #: branch.c:119

1094 msgid "Unable to write upstream branch configuration"

@@ -1103,21 +1109,21 @@ msgstr "\"%s\" är inte ett giltigt grennamn."

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

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

1111

1106 -#: branch.c:198

1112 +#: branch.c:197

1113 msgid "Cannot force update the current branch."

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

1115

1110 -#: branch.c:218

1116 +#: branch.c:217

1117 #, c-format

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

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

1120

1115 -#: branch.c:220

1121 +#: branch.c:219

1122 #, c-format

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

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

1125

1120 -#: branch.c:222

1126 +#: branch.c:221

1127 msgid ""

1128 "\n"

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

@@ -1137,22 +1143,22 @@ msgstr ""

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

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

1145

1140 -#: branch.c:265

1146 +#: branch.c:264

1147 #, c-format

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

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

1150

1145 -#: branch.c:285

1151 +#: branch.c:284

1152 #, c-format

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

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

1155

1150 -#: branch.c:290

1156 +#: branch.c:289

1157 #, c-format

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

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

1160

1155 -#: branch.c:344

1161 +#: branch.c:343

1162 #, c-format

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

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

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

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

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

1180

1175 -#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778

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

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

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

1184 #, c-format

1185 msgid "could not open '%s'"

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

@@ -1181,56 +1189,56 @@ msgstr "kunde inte öppna \"%s\""

1189 msgid "Repository lacks these prerequisite commits:"

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

1191

1184 -#: bundle.c:186

1192 +#: bundle.c:193

1193 #, c-format

1194 msgid "The bundle contains this ref:"

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

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

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

1198

1191 -#: bundle.c:193

1199 +#: bundle.c:200

1200 msgid "The bundle records a complete history."

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

1202

1195 -#: bundle.c:195

1203 +#: bundle.c:202

1204 #, c-format

1205 msgid "The bundle requires this ref:"

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

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

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

1209

1202 -#: bundle.c:254

1210 +#: bundle.c:261

1211 msgid "Could not spawn pack-objects"

1212 msgstr "Kunde inte starta pack-objects"

1213

1206 -#: bundle.c:265

1214 +#: bundle.c:272

1215 msgid "pack-objects died"

1216 msgstr "pack-objects misslyckades"

1217

1210 -#: bundle.c:307

1218 +#: bundle.c:314

1219 msgid "rev-list died"

1220 msgstr "rev-list dog"

1221

1214 -#: bundle.c:356

1222 +#: bundle.c:363

1223 #, c-format

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

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

1226

1219 -#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282

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

1228 #, c-format

1229 msgid "unrecognized argument: %s"

1230 msgstr "okänt argument: %s"

1231

1224 -#: bundle.c:454

1232 +#: bundle.c:461

1233 msgid "Refusing to create empty bundle."

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

1235

1228 -#: bundle.c:466

1236 +#: bundle.c:473

1237 #, c-format

1238 msgid "cannot create '%s'"

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

1240

1233 -#: bundle.c:494

1241 +#: bundle.c:501

1242 msgid "index-pack died"

1243 msgstr "index-pack dog"

1244

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

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

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

1249

1242 -#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456

1243 -#: builtin/am.c:1469 builtin/am.c:2107

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

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

1252 #, c-format

1253 msgid "could not parse %s"

1254 msgstr "kunde inte tolka %s"

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

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

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

1260

1253 -#: commit.c:1511

1261 +#: commit.c:1517

1262 msgid ""

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

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

@@ -1264,160 +1272,160 @@ msgstr ""

1272 msgid "memory exhausted"

1273 msgstr "minnet slut"

1274

1267 -#: config.c:186

1275 +#: config.c:187

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

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

1278

1271 -#: config.c:720

1279 +#: config.c:721

1280 #, c-format

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

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

1283

1276 -#: config.c:724

1284 +#: config.c:725

1285 #, c-format

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

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

1288

1281 -#: config.c:728

1289 +#: config.c:729

1290 #, c-format

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

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

1293

1286 -#: config.c:732

1294 +#: config.c:733

1295 #, c-format

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

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

1298

1291 -#: config.c:736

1299 +#: config.c:737

1300 #, c-format

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

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

1303

1296 -#: config.c:740

1304 +#: config.c:741

1305 #, c-format

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

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

1308

1301 -#: config.c:868

1309 +#: config.c:869

1310 msgid "out of range"

1311 msgstr "utanför intervallet"

1312

1305 -#: config.c:868

1313 +#: config.c:869

1314 msgid "invalid unit"

1315 msgstr "ogiltig enhet"

1316

1309 -#: config.c:874

1317 +#: config.c:875

1318 #, c-format

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

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

1321

1314 -#: config.c:879

1322 +#: config.c:880

1323 #, c-format

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

1325 msgstr ""

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

1327

1320 -#: config.c:882

1328 +#: config.c:883

1329 #, c-format

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

1331 msgstr ""

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

1333

1326 -#: config.c:885

1334 +#: config.c:886

1335 #, c-format

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

1337 msgstr ""

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

1339

1332 -#: config.c:888

1340 +#: config.c:889

1341 #, c-format

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

1343 msgstr ""

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

1345 "en %s: %s"

1346

1339 -#: config.c:891

1347 +#: config.c:892

1348 #, c-format

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

1350 msgstr ""

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

1352 "%s: %s"

1353

1346 -#: config.c:894

1354 +#: config.c:895

1355 #, c-format

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

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

1358

1351 -#: config.c:989

1359 +#: config.c:990

1360 #, c-format

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

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

1363

1356 -#: config.c:1084 config.c:1095

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

1365 #, c-format

1366 msgid "bad zlib compression level %d"

1367 msgstr "felaktigt zlib-komprimeringsgrad %d"

1368

1361 -#: config.c:1212

1369 +#: config.c:1213

1370 #, c-format

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

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

1373

1366 -#: config.c:1368

1374 +#: config.c:1372

1375 #, c-format

1376 msgid "bad pack compression level %d"

1377 msgstr "felaktig paketkomprimeringsgrad %d"

1378

1371 -#: config.c:1564

1379 +#: config.c:1568

1380 msgid "unable to parse command-line config"

1381 msgstr "kan inte tolka kommandoradskonfiguration"

1382

1375 -#: config.c:1894

1383 +#: config.c:1900

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

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

1386

1379 -#: config.c:2064

1387 +#: config.c:2087

1388 #, c-format

1389 msgid "Invalid %s: '%s'"

1390 msgstr "Felaktigt %s: \"%s\""

1391

1384 -#: config.c:2085

1392 +#: config.c:2130

1393 #, c-format

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

1395 msgstr ""

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

1397

1390 -#: config.c:2111

1398 +#: config.c:2156

1399 #, c-format

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

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

1402

1395 -#: config.c:2122

1403 +#: config.c:2167

1404 #, c-format

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

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

1407

1400 -#: config.c:2124

1408 +#: config.c:2169

1409 #, c-format

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

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

1412

1405 -#: config.c:2183

1413 +#: config.c:2228

1414 #, c-format

1415 msgid "%s has multiple values"

1416 msgstr "%s har flera värden"

1417

1410 -#: config.c:2517 config.c:2745

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

1419 #, c-format

1420 msgid "fstat on %s failed"

1421 msgstr "fstat misslyckades på %s"

1422

1415 -#: config.c:2635

1423 +#: config.c:2678

1424 #, c-format

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

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

1427

1420 -#: config.c:2637 builtin/remote.c:775

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

1429 #, c-format

1430 msgid "could not unset '%s'"

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

@@ -1440,19 +1448,19 @@ msgstr ""

1448

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

1450 # objects in the database.

1443 -#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141

1451 +#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141

1452 msgid "Checking connectivity"

1453 msgstr "Kontrollerar konnektivitet"

1454

1447 -#: connected.c:75

1455 +#: connected.c:76

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

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

1458

1451 -#: connected.c:95

1459 +#: connected.c:96

1460 msgid "failed write to rev-list"

1461 msgstr "kunde inte skriva till rev-list"

1462

1455 -#: connected.c:102

1463 +#: connected.c:103

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

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

1466

@@ -1488,19 +1496,69 @@ msgstr "LF skulle ersättas av CRLF i %s"

1496 msgid "in the future"

1497 msgstr "i framtiden"

1498

1491 -#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167

1492 -#: date.c:175 date.c:180

1493 -msgid "%"

1494 -msgid_plural "%"

1495 -msgstr[0] "%"

1496 -msgstr[1] "%"

1499 +#: date.c:122

1500 +#, c-format

1501 +msgid "%<PRIuMAX> second ago"

1502 +msgid_plural "%<PRIuMAX> seconds ago"

1503 +msgstr[0] "%<PRIuMAX> sekund sedan"

1504 +msgstr[1] "%<PRIuMAX> sekunder sedan"

1505 +

1506 +#: date.c:129

1507 +#, c-format

1508 +msgid "%<PRIuMAX> minute ago"

1509 +msgid_plural "%<PRIuMAX> minutes ago"

1510 +msgstr[0] "%<PRIuMAX> minut sedan"

1511 +msgstr[1] "%<PRIuMAX> minuter sedan"

1512 +

1513 +#: date.c:136

1514 +#, c-format

1515 +msgid "%<PRIuMAX> hour ago"

1516 +msgid_plural "%<PRIuMAX> hours ago"

1517 +msgstr[0] "%<PRIuMAX> timme sedan"

1518 +msgstr[1] "%<PRIuMAX> timmar sedan"

1519 +

1520 +#: date.c:143

1521 +#, c-format

1522 +msgid "%<PRIuMAX> day ago"

1523 +msgid_plural "%<PRIuMAX> days ago"

1524 +msgstr[0] "%<PRIuMAX> dag sedan"

1525 +msgstr[1] "%<PRIuMAX> dagar sedan"

1526 +

1527 +#: date.c:149

1528 +#, c-format

1529 +msgid "%<PRIuMAX> week ago"

1530 +msgid_plural "%<PRIuMAX> weeks ago"

1531 +msgstr[0] "%<PRIuMAX> vecka sedan"

1532 +msgstr[1] "%<PRIuMAX> veckor sedan"

1533 +

1534 +#: date.c:156

1535 +#, c-format

1536 +msgid "%<PRIuMAX> month ago"

1537 +msgid_plural "%<PRIuMAX> months ago"

1538 +msgstr[0] "%<PRIuMAX> månad sedan"

1539 +msgstr[1] "%<PRIuMAX> månader sedan"

1540 +

1541 +#: date.c:167

1542 +#, c-format

1543 +msgid "%<PRIuMAX> year"

1544 +msgid_plural "%<PRIuMAX> years"

1545 +msgstr[0] "%<PRIuMAX> år"

1546 +msgstr[1] "%<PRIuMAX> år"

1547

1548 #. TRANSLATORS: "%s" is "<n> years"

1549 #: date.c:170

1500 -msgid "%s, %"

1501 -msgid_plural "%s, %"

1502 -msgstr[0] "%s. %"

1503 -msgstr[1] "%s. %"

1550 +#, c-format

1551 +msgid "%s, %<PRIuMAX> month ago"

1552 +msgid_plural "%s, %<PRIuMAX> months ago"

1553 +msgstr[0] "%s, %<PRIuMAX> månad sedan"

1554 +msgstr[1] "%s, %<PRIuMAX> månader sedan"

1555 +

1556 +#: date.c:175 date.c:180

1557 +#, c-format

1558 +msgid "%<PRIuMAX> year ago"

1559 +msgid_plural "%<PRIuMAX> years ago"

1560 +msgstr[0] "%<PRIuMAX> år sedan"

1561 +msgstr[1] "%<PRIuMAX> år sedan"

1562

1563 #: diffcore-order.c:24

1564 #, c-format

@@ -1511,27 +1569,35 @@ msgstr "kunde inte läsa orderfilen \"%s\""

1569 msgid "Performing inexact rename detection"

1570 msgstr "Utför onöjaktig namnbytesdetektering"

1571

1514 -#: diff.c:63

1572 +#: diff.c:74

1573 #, c-format

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

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

1576

1519 -#: diff.c:125

1577 +#: diff.c:152

1578 #, c-format

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

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

1581

1524 -#: diff.c:130

1582 +#: diff.c:157

1583 #, c-format

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

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

1586

1529 -#: diff.c:282

1587 +#: diff.c:281

1588 +msgid ""

1589 +"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "

1590 +"'plain'"

1591 +msgstr ""

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

1593 +"\"zebra\", \"dimmed_zebra\", \"plain\""

1594 +

1595 +#: diff.c:341

1596 #, c-format

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

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

1599

1534 -#: diff.c:342

1600 +#: diff.c:398

1601 #, c-format

1602 msgid ""

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

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

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

1607 "%s"

1608

1543 -#: diff.c:3101

1609 +#: diff.c:3861

1610 #, c-format

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

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

1613

1548 -#: diff.c:3427

1614 +#: diff.c:4189

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

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

1617

1552 -#: diff.c:3517

1618 +#: diff.c:4279

1619 msgid "--follow requires exactly one pathspec"

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

1621

1556 -#: diff.c:3680

1622 +#: diff.c:4445

1623 #, c-format

1624 msgid ""

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

@@ -1562,228 +1628,232 @@ msgstr ""

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

1629 "%s"

1630

1565 -#: diff.c:3694

1631 +#: diff.c:4459

1632 #, c-format

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

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

1635

1570 -#: diff.c:4716

1636 +#: diff.c:5505

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

1638 msgstr ""

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

1640

1575 -#: diff.c:4719

1641 +#: diff.c:5508

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

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

1644

1579 -#: diff.c:4722

1645 +#: diff.c:5511

1646 #, c-format

1647 msgid ""

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

1649 msgstr ""

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

1651

1586 -#: dir.c:1948

1652 +#: dir.c:1983

1653 msgid "failed to get kernel name and information"

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

1655

1590 -#: dir.c:2067

1656 +#: dir.c:2102

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

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

1659

1594 -#: dir.c:2846 dir.c:2851

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

1661 #, c-format

1662 msgid "could not create directories for %s"

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

1664

1599 -#: dir.c:2876

1665 +#: dir.c:2915

1666 #, c-format

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

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

1669

1604 -#: entry.c:281

1670 +#: entry.c:176

1671 +msgid "Filtering content"

1672 +msgstr "Filtrerar innehåll"

1673 +

1674 +#: entry.c:417

1675 #, c-format

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

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

1678

1609 -#: fetch-pack.c:251

1679 +#: fetch-pack.c:252

1680 msgid "git fetch-pack: expected shallow list"

1681 msgstr "git fetch-pack: förväntade grund lista"

1682

1613 -#: fetch-pack.c:263

1683 +#: fetch-pack.c:264

1684 msgid "git fetch-pack: expected ACK/NAK, got EOF"

1685 msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF"

1686

1617 -#: fetch-pack.c:282 builtin/archive.c:63

1687 +#: fetch-pack.c:283 builtin/archive.c:63

1688 #, c-format

1689 msgid "remote error: %s"

1690 msgstr "fjärrfel: %s"

1691

1622 -#: fetch-pack.c:283

1692 +#: fetch-pack.c:284

1693 #, c-format

1694 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

1695 msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""

1696

1627 -#: fetch-pack.c:335

1697 +#: fetch-pack.c:336

1698 msgid "--stateless-rpc requires multi_ack_detailed"

1699 msgstr "--stateless-rpc kräver ”multi_ack_detailed”"

1700

1631 -#: fetch-pack.c:421

1701 +#: fetch-pack.c:422

1702 #, c-format

1703 msgid "invalid shallow line: %s"

1704 msgstr "ogiltig \"shallow\"-rad: %s"

1705

1636 -#: fetch-pack.c:427

1706 +#: fetch-pack.c:428

1707 #, c-format

1708 msgid "invalid unshallow line: %s"

1709 msgstr "ogiltig \"unshallow\"-rad: %s"

1710

1641 -#: fetch-pack.c:429

1711 +#: fetch-pack.c:430

1712 #, c-format

1713 msgid "object not found: %s"

1714 msgstr "objektet hittades inte: %s"

1715

1646 -#: fetch-pack.c:432

1716 +#: fetch-pack.c:433

1717 #, c-format

1718 msgid "error in object: %s"

1719 msgstr "fel i objekt: %s"

1720

1651 -#: fetch-pack.c:434

1721 +#: fetch-pack.c:435

1722 #, c-format

1723 msgid "no shallow found: %s"

1724 msgstr "ingen \"shallow\" hittades: %s"

1725

1656 -#: fetch-pack.c:437

1726 +#: fetch-pack.c:438

1727 #, c-format

1728 msgid "expected shallow/unshallow, got %s"

1729 msgstr "förväntade shallow/unshallow, fick %s"

1730

1661 -#: fetch-pack.c:476

1731 +#: fetch-pack.c:477

1732 #, c-format

1733 msgid "got %s %d %s"

1734 msgstr "fick %s %d %s"

1735

1666 -#: fetch-pack.c:490

1736 +#: fetch-pack.c:491

1737 #, c-format

1738 msgid "invalid commit %s"

1739 msgstr "ogiltig incheckning %s"

1740

1671 -#: fetch-pack.c:523

1741 +#: fetch-pack.c:524

1742 msgid "giving up"

1743 msgstr "ger upp"

1744

1675 -#: fetch-pack.c:533 progress.c:235

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

1746 msgid "done"

1747 msgstr "klart"

1748

1679 -#: fetch-pack.c:545

1749 +#: fetch-pack.c:546

1750 #, c-format

1751 msgid "got %s (%d) %s"

1752 msgstr "fick %s (%d) %s"

1753

1684 -#: fetch-pack.c:591

1754 +#: fetch-pack.c:592

1755 #, c-format

1756 msgid "Marking %s as complete"

1757 msgstr "Markerar %s som komplett"

1758

1689 -#: fetch-pack.c:775

1759 +#: fetch-pack.c:776

1760 #, c-format

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

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

1763

1694 -#: fetch-pack.c:813

1764 +#: fetch-pack.c:814

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

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

1767

1698 -#: fetch-pack.c:821

1768 +#: fetch-pack.c:822

1769 msgid "protocol error: bad pack header"

1770 msgstr "protokollfel: felaktigt packhuvud"

1771

1702 -#: fetch-pack.c:877

1772 +#: fetch-pack.c:878

1773 #, c-format

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

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

1776

1707 -#: fetch-pack.c:893

1777 +#: fetch-pack.c:894

1778 #, c-format

1779 msgid "%s failed"

1780 msgstr "%s misslyckades"

1781

1712 -#: fetch-pack.c:895

1782 +#: fetch-pack.c:896

1783 msgid "error in sideband demultiplexer"

1784 msgstr "fel i sidbands-avmultiplexare"

1785

1716 -#: fetch-pack.c:922

1786 +#: fetch-pack.c:923

1787 msgid "Server does not support shallow clients"

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

1789

1720 -#: fetch-pack.c:926

1790 +#: fetch-pack.c:927

1791 msgid "Server supports multi_ack_detailed"

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

1793

1724 -#: fetch-pack.c:929

1794 +#: fetch-pack.c:930

1795 msgid "Server supports no-done"

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

1797

1728 -#: fetch-pack.c:935

1798 +#: fetch-pack.c:936

1799 msgid "Server supports multi_ack"

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

1801

1732 -#: fetch-pack.c:939

1802 +#: fetch-pack.c:940

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

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

1805

1736 -#: fetch-pack.c:943

1806 +#: fetch-pack.c:944

1807 msgid "Server supports side-band"

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

1809

1740 -#: fetch-pack.c:947

1810 +#: fetch-pack.c:948

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

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

1813

1744 -#: fetch-pack.c:951

1814 +#: fetch-pack.c:952

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

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

1817

1748 -#: fetch-pack.c:961

1818 +#: fetch-pack.c:962

1819 msgid "Server supports ofs-delta"

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

1821

1752 -#: fetch-pack.c:968

1822 +#: fetch-pack.c:969

1823 #, c-format

1824 msgid "Server version is %.*s"

1825 msgstr "Serverversionen är %.*s"

1826

1757 -#: fetch-pack.c:974

1827 +#: fetch-pack.c:975

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

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

1830

1761 -#: fetch-pack.c:978

1831 +#: fetch-pack.c:979

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

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

1834

1765 -#: fetch-pack.c:980

1835 +#: fetch-pack.c:981

1836 msgid "Server does not support --deepen"

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

1838

1769 -#: fetch-pack.c:991

1839 +#: fetch-pack.c:992

1840 msgid "no common commits"

1841 msgstr "inga gemensamma incheckningar"

1842

1773 -#: fetch-pack.c:1003

1843 +#: fetch-pack.c:1004

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

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

1846

1777 -#: fetch-pack.c:1165

1847 +#: fetch-pack.c:1166

1848 msgid "no matching remote head"

1849 msgstr "inget motsvarande fjärrhuvud"

1850

1781 -#: fetch-pack.c:1187

1851 +#: fetch-pack.c:1188

1852 #, c-format

1853 msgid "no such remote ref %s"

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

1855

1786 -#: fetch-pack.c:1190

1856 +#: fetch-pack.c:1191

1857 #, c-format

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

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

@@ -1796,7 +1866,7 @@ msgstr "gpg misslyckades signera data"

1866 msgid "could not create temporary file"

1867 msgstr "kunde inte skapa temporära fil"

1868

1799 -#: gpg-interface.c:213

1869 +#: gpg-interface.c:214

1870 #, c-format

1871 msgid "failed writing detached signature to '%s'"

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

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

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

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

1878

1809 -#: grep.c:1981

1879 +#: grep.c:1970

1880 #, c-format

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

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

1883

1814 -#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134

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

1885 #, c-format

1886 msgid "failed to stat '%s'"

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

1888

1819 -#: grep.c:2009

1889 +#: grep.c:1998

1890 #, c-format

1891 msgid "'%s': short read"

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

@@ -1959,12 +2029,12 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet"

2029 msgid "name consists only of disallowed characters: %s"

2030 msgstr "namnet består enbart av ej tillåtna tecken: %s"

2031

1962 -#: ident.c:416 builtin/commit.c:612

2032 +#: ident.c:416 builtin/commit.c:616

2033 #, c-format

2034 msgid "invalid date format: %s"

2035 msgstr "felaktigt datumformat: %s"

2036

1967 -#: lockfile.c:152

2037 +#: lockfile.c:151

2038 #, c-format

2039 msgid ""

2040 "Unable to create '%s.lock': %s.\n"

@@ -1984,7 +2054,7 @@ msgstr ""

2054 "tidigare:\n"

2055 "ta bort filen manuellt för att fortsätta."

2056

1987 -#: lockfile.c:160

2057 +#: lockfile.c:159

2058 #, c-format

2059 msgid "Unable to create '%s.lock': %s"

2060 msgstr "Kunde inte skapa \"%s.lock\": %s"

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

2063 msgid "failed to read the cache"

2064 msgstr "misslyckades läsa cachen"

2065

1996 -#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377

1997 -#: builtin/checkout.c:591 builtin/clone.c:753

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

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

2068 msgid "unable to write new index file"

2069 msgstr "kunde inte skriva ny indexfil"

2070

2001 -#: merge-recursive.c:210

2071 +#: merge-recursive.c:235

2072 msgid "(bad commit)\n"

2073 msgstr "(felaktig incheckning)\n"

2074

2005 -#: merge-recursive.c:232 merge-recursive.c:240

2075 +#: merge-recursive.c:257 merge-recursive.c:265

2076 #, c-format

2077 msgid "addinfo_cache failed for path '%s'"

2078 msgstr "addinfo_cache misslyckades för sökvägen \"%s\""

2079

2010 -#: merge-recursive.c:304

2080 +#: merge-recursive.c:329

2081 msgid "error building trees"

2082 msgstr "fel vid byggande av träd"

2083

2014 -#: merge-recursive.c:728

2084 +#: merge-recursive.c:752

2085 #, c-format

2086 msgid "failed to create path '%s'%s"

2087 msgstr "misslyckades skapa sökvägen \"%s\"%s"

2088

2019 -#: merge-recursive.c:739

2089 +#: merge-recursive.c:763

2090 #, c-format

2091 msgid "Removing %s to make room for subdirectory\n"

2092 msgstr "Tar bort %s för att göra plats för underkatalog\n"

2093

2024 -#: merge-recursive.c:753 merge-recursive.c:772

2094 +#: merge-recursive.c:777 merge-recursive.c:796

2095 msgid ": perhaps a D/F conflict?"

2096 msgstr ": kanske en K/F-konflikt?"

2097

2028 -#: merge-recursive.c:762

2098 +#: merge-recursive.c:786

2099 #, c-format

2100 msgid "refusing to lose untracked file at '%s'"

2101 msgstr "vägrar förlora ospårad fil vid \"%s\""

2102

2033 -#: merge-recursive.c:804 builtin/cat-file.c:36

2103 +#: merge-recursive.c:828 builtin/cat-file.c:37

2104 #, c-format

2105 msgid "cannot read object %s '%s'"

2106 msgstr "kan inte läsa objektet %s: \"%s\""

2107

2038 -#: merge-recursive.c:806

2108 +#: merge-recursive.c:830

2109 #, c-format

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

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

2112

2043 -#: merge-recursive.c:830

2113 +#: merge-recursive.c:854

2114 #, c-format

2115 msgid "failed to open '%s': %s"

2116 msgstr "misslyckades öppna \"%s\": %s"

2117

2048 -#: merge-recursive.c:841

2118 +#: merge-recursive.c:865

2119 #, c-format

2120 msgid "failed to symlink '%s': %s"

2121 msgstr "misslyckades skapa symboliska länken \"%s\": %s"

2122

2053 -#: merge-recursive.c:846

2123 +#: merge-recursive.c:870

2124 #, c-format

2125 msgid "do not know what to do with %06o %s '%s'"

2126 msgstr "vet inte hur %06o %s \"%s\" skall hanteras"

2127

2058 -#: merge-recursive.c:986

2128 +#: merge-recursive.c:1010

2129 msgid "Failed to execute internal merge"

2130 msgstr "Misslyckades exekvera intern sammanslagning"

2131

2062 -#: merge-recursive.c:990

2132 +#: merge-recursive.c:1014

2133 #, c-format

2134 msgid "Unable to add %s to database"

2135 msgstr "Kunde inte lägga till %s till databasen"

2136

2067 -#: merge-recursive.c:1093

2137 +#: merge-recursive.c:1117

2138 #, c-format

2139 msgid ""

2140 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -2073,7 +2143,7 @@ msgstr ""

2143 "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "

2144 "i trädet."

2145

2076 -#: merge-recursive.c:1098

2146 +#: merge-recursive.c:1122

2147 #, c-format

2148 msgid ""

2149 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2082,7 +2152,7 @@ msgstr ""

2152 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "

2153 "%s lämnad i trädet."

2154

2085 -#: merge-recursive.c:1105

2155 +#: merge-recursive.c:1129

2156 #, c-format

2157 msgid ""

2158 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -2091,7 +2161,7 @@ msgstr ""

2161 "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "

2162 "i trädet vid %s."

2163

2094 -#: merge-recursive.c:1110

2164 +#: merge-recursive.c:1134

2165 #, c-format

2166 msgid ""

2167 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2100,20 +2170,20 @@ msgstr ""

2170 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "

2171 "%s lämnad i trädet vid %s."

2172

2103 -#: merge-recursive.c:1144

2173 +#: merge-recursive.c:1168

2174 msgid "rename"

2175 msgstr "namnbyte"

2176

2107 -#: merge-recursive.c:1144

2177 +#: merge-recursive.c:1168

2178 msgid "renamed"

2179 msgstr "namnbytt"

2180

2111 -#: merge-recursive.c:1201

2181 +#: merge-recursive.c:1225

2182 #, c-format

2183 msgid "%s is a directory in %s adding as %s instead"

2184 msgstr "%s är en katalog i %s lägger till som %s istället"

2185

2116 -#: merge-recursive.c:1226

2186 +#: merge-recursive.c:1250

2187 #, c-format

2188 msgid ""

2189 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -2122,139 +2192,139 @@ msgstr ""

2192 "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "

2193 "namnbyte \"%s\"->\"%s\" i \"%s\"%s"

2194

2125 -#: merge-recursive.c:1231

2195 +#: merge-recursive.c:1255

2196 msgid " (left unresolved)"

2197 msgstr " (lämnad olöst)"

2198

2129 -#: merge-recursive.c:1293

2199 +#: merge-recursive.c:1317

2200 #, c-format

2201 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

2202 msgstr ""

2203 "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"

2204

2135 -#: merge-recursive.c:1326

2205 +#: merge-recursive.c:1350

2206 #, c-format

2207 msgid "Renaming %s to %s and %s to %s instead"

2208 msgstr "Byter namn på %s till %s och %s till %s istället"

2209

2140 -#: merge-recursive.c:1529

2210 +#: merge-recursive.c:1553

2211 #, c-format

2212 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

2213 msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s"

2214

2145 -#: merge-recursive.c:1544

2215 +#: merge-recursive.c:1568

2216 #, c-format

2217 msgid "Adding merged %s"

2218 msgstr "Lägger till sammanslagen %s"

2219

2150 -#: merge-recursive.c:1551 merge-recursive.c:1781

2220 +#: merge-recursive.c:1575 merge-recursive.c:1805

2221 #, c-format

2222 msgid "Adding as %s instead"

2223 msgstr "Lägger till som %s istället"

2224

2155 -#: merge-recursive.c:1608

2225 +#: merge-recursive.c:1632

2226 #, c-format

2227 msgid "cannot read object %s"

2228 msgstr "kan inte läsa objektet %s"

2229

2160 -#: merge-recursive.c:1611

2230 +#: merge-recursive.c:1635

2231 #, c-format

2232 msgid "object %s is not a blob"

2233 msgstr "objektet %s är inte en blob"

2234

2165 -#: merge-recursive.c:1680

2235 +#: merge-recursive.c:1704

2236 msgid "modify"

2237 msgstr "ändra"

2238

2169 -#: merge-recursive.c:1680

2239 +#: merge-recursive.c:1704

2240 msgid "modified"

2241 msgstr "ändrad"

2242

2173 -#: merge-recursive.c:1690

2243 +#: merge-recursive.c:1714

2244 msgid "content"

2245 msgstr "innehåll"

2246

2177 -#: merge-recursive.c:1697

2247 +#: merge-recursive.c:1721

2248 msgid "add/add"

2249 msgstr "tillägg/tillägg"

2250

2181 -#: merge-recursive.c:1733

2251 +#: merge-recursive.c:1757

2252 #, c-format

2253 msgid "Skipped %s (merged same as existing)"

2254 msgstr "Hoppade över %s (sammanslagen samma som befintlig)"

2255

2186 -#: merge-recursive.c:1747

2256 +#: merge-recursive.c:1771

2257 #, c-format

2258 msgid "Auto-merging %s"

2259 msgstr "Slår ihop %s automatiskt"

2260

2191 -#: merge-recursive.c:1751 git-submodule.sh:945

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

2262 msgid "submodule"

2263 msgstr "undermodul"

2264

2195 -#: merge-recursive.c:1752

2265 +#: merge-recursive.c:1776

2266 #, c-format

2267 msgid "CONFLICT (%s): Merge conflict in %s"

2268 msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"

2269

2200 -#: merge-recursive.c:1846

2270 +#: merge-recursive.c:1870

2271 #, c-format

2272 msgid "Removing %s"

2273 msgstr "Tar bort %s"

2274

2205 -#: merge-recursive.c:1872

2275 +#: merge-recursive.c:1896

2276 msgid "file/directory"

2277 msgstr "fil/katalog"

2278

2209 -#: merge-recursive.c:1878

2279 +#: merge-recursive.c:1902

2280 msgid "directory/file"

2281 msgstr "katalog/fil"

2282

2213 -#: merge-recursive.c:1884

2283 +#: merge-recursive.c:1908

2284 #, c-format

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

2286 msgstr ""

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

2288

2219 -#: merge-recursive.c:1893

2289 +#: merge-recursive.c:1917

2290 #, c-format

2291 msgid "Adding %s"

2292 msgstr "Lägger till %s"

2293

2224 -#: merge-recursive.c:1930

2225 -msgid "Already up-to-date!"

2294 +#: merge-recursive.c:1954

2295 +msgid "Already up to date!"

2296 msgstr "Redan à jour!"

2297

2228 -#: merge-recursive.c:1939

2298 +#: merge-recursive.c:1963

2299 #, c-format

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

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

2302

2233 -#: merge-recursive.c:2022

2303 +#: merge-recursive.c:2060

2304 msgid "Merging:"

2305 msgstr "Slår ihop:"

2306

2237 -#: merge-recursive.c:2035

2307 +#: merge-recursive.c:2073

2308 #, c-format

2309 msgid "found %u common ancestor:"

2310 msgid_plural "found %u common ancestors:"

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

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

2313

2244 -#: merge-recursive.c:2074

2314 +#: merge-recursive.c:2112

2315 msgid "merge returned no commit"

2316 msgstr "sammanslagningen returnerade ingen incheckning"

2317

2248 -#: merge-recursive.c:2137

2318 +#: merge-recursive.c:2175

2319 #, c-format

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

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

2322

2253 -#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793

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

2324 msgid "Unable to write index."

2325 msgstr "Kunde inte skriva indexet."

2326

2257 -#: notes-merge.c:273

2327 +#: notes-merge.c:272

2328 #, c-format

2329 msgid ""

2330 "You have not concluded your previous notes merge (%s exists).\n"

@@ -2266,7 +2336,7 @@ msgstr ""

2336 "att checka in eller avbryta föregående sammanslagning innan du påbörjar en "

2337 "ny antecknings-sammanslagning."

2338

2269 -#: notes-merge.c:280

2339 +#: notes-merge.c:279

2340 #, c-format

2341 msgid "You have not concluded your notes merge (%s exists)."

2342 msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)."

@@ -2294,16 +2364,30 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"

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

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

2366

2297 -#: object.c:240

2367 +#: object.c:239

2368 #, c-format

2369 msgid "unable to parse object: %s"

2370 msgstr "kunde inte tolka objektet: %s"

2371

2372 +#: packfile.c:556

2373 +msgid "offset before end of packfile (broken .idx?)"

2374 +msgstr "offset före slutet av packfilen (trasig .idx?)"

2375 +

2376 +#: packfile.c:1683

2377 +#, c-format

2378 +msgid "offset before start of pack index for %s (corrupt index?)"

2379 +msgstr "offset före slutet av packindex för %s (trasigt index?)"

2380 +

2381 +#: packfile.c:1687

2382 +#, c-format

2383 +msgid "offset beyond end of pack index for %s (truncated index?)"

2384 +msgstr "offset borton slutet av packindex för %s (trunkerat index?)"

2385 +

2386 #: parse-options.c:573

2387 msgid "..."

2388 msgstr "..."

2389

2306 -#: parse-options.c:591

2390 +#: parse-options.c:592

2391 #, c-format

2392 msgid "usage: %s"

2393 msgstr "användning: %s"

@@ -2311,17 +2395,17 @@ msgstr "användning: %s"

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

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

2397 #.

2314 -#: parse-options.c:597

2398 +#: parse-options.c:598

2399 #, c-format

2400 msgid " or: %s"

2401 msgstr " eller: %s"

2402

2319 -#: parse-options.c:600

2403 +#: parse-options.c:601

2404 #, c-format

2405 msgid " %s"

2406 msgstr " %s"

2407

2324 -#: parse-options.c:634

2408 +#: parse-options.c:640

2409 msgid "-NUM"

2410 msgstr "-TAL"

2411

@@ -2330,7 +2414,7 @@ msgstr "-TAL"

2414 msgid "malformed object name '%s'"

2415 msgstr "felformat objektnamn \"%s\""

2416

2333 -#: path.c:890

2417 +#: path.c:891

2418 #, c-format

2419 msgid "Could not make %s writable by group"

2420 msgstr "Kunde inte göra %s skrivbar för gruppen"

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

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

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

2490

2407 -#: pathspec.c:575

2491 +#: pathspec.c:571

2492 msgid ""

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

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

@@ -2412,12 +2496,12 @@ msgstr ""

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

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

2498

2415 -#: pathspec.c:599

2499 +#: pathspec.c:595

2500 #, c-format

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

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

2503

2420 -#: pretty.c:963

2504 +#: pretty.c:962

2505 msgid "unable to parse --pretty format"

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

2507

@@ -2439,50 +2523,51 @@ msgstr ""

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

2524 "Använder version %i"

2525

2442 -#: read-cache.c:2308 builtin/merge.c:1019

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

2527 #, c-format

2528 msgid "could not close '%s'"

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

2530

2447 -#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054

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

2532 #, c-format

2533 msgid "could not stat '%s'"

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

2535

2452 -#: read-cache.c:2396

2536 +#: read-cache.c:2407

2537 #, c-format

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

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

2540

2457 -#: read-cache.c:2408

2541 +#: read-cache.c:2419

2542 #, c-format

2543 msgid "unable to unlink: %s"

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

2545

2462 -#: refs.c:622

2546 +#: refs.c:638

2547 #, c-format

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

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

2550

2467 -#: refs.c:1769

2551 +#: refs.c:1779

2552 msgid "ref updates forbidden inside quarantine environment"

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

2554

2471 -#: refs/files-backend.c:1664

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

2556 +#, c-format

2557 +msgid "could not remove reference %s"

2558 +msgstr "kunde inte ta bort referensen %s"

2559 +

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

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

2562 #, c-format

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

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

2565

2476 -#: refs/files-backend.c:1667

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

2567 #, c-format

2568 msgid "could not delete references: %s"

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

2570

2481 -#: refs/files-backend.c:1676

2482 -#, c-format

2483 -msgid "could not remove reference %s"

2484 -msgstr "kunde inte ta bort referensen %s"

2485 -

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

2572 msgid "gone"

2573 msgstr "försvunnen"

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

2587 msgid "ahead %d, behind %d"

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

2589

2505 -#: ref-filter.c:105

2590 +#: ref-filter.c:104

2591 #, c-format

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

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

2594

2510 -#: ref-filter.c:107

2595 +#: ref-filter.c:106

2596 #, c-format

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

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

2599

2515 -#: ref-filter.c:121

2600 +#: ref-filter.c:126

2601 #, c-format

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

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

2604

2520 -#: ref-filter.c:125

2605 +#: ref-filter.c:130

2606 #, c-format

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

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

2609

2525 -#: ref-filter.c:127

2610 +#: ref-filter.c:132

2611 #, c-format

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

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

2614

2530 -#: ref-filter.c:167

2615 +#: ref-filter.c:172

2616 #, c-format

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

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

2619

2535 -#: ref-filter.c:174

2620 +#: ref-filter.c:179

2621 #, c-format

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

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

2624

2540 -#: ref-filter.c:181

2625 +#: ref-filter.c:186

2626 #, c-format

2627 msgid "%%(trailers) does not take arguments"

2628 msgstr "%%(trailers) tar inte argument"

2629

2545 -#: ref-filter.c:200

2630 +#: ref-filter.c:205

2631 #, c-format

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

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

2634

2550 -#: ref-filter.c:202

2635 +#: ref-filter.c:207

2636 #, c-format

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

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

2639

2555 -#: ref-filter.c:215

2640 +#: ref-filter.c:220

2641 #, c-format

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

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

2644

2560 -#: ref-filter.c:219

2645 +#: ref-filter.c:224

2646 #, c-format

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

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

2649

2565 -#: ref-filter.c:246

2650 +#: ref-filter.c:251

2651 #, c-format

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

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

2654

2570 -#: ref-filter.c:258

2655 +#: ref-filter.c:263

2656 #, c-format

2657 msgid "unrecognized position:%s"

2658 msgstr "okänd position:%s"

2659

2575 -#: ref-filter.c:262

2660 +#: ref-filter.c:267

2661 #, c-format

2662 msgid "unrecognized width:%s"

2663 msgstr "okänd bredd:%s"

2664

2580 -#: ref-filter.c:268

2665 +#: ref-filter.c:273

2666 #, c-format

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

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

2669

2585 -#: ref-filter.c:272

2670 +#: ref-filter.c:277

2671 #, c-format

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

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

2674

2590 -#: ref-filter.c:287

2675 +#: ref-filter.c:292

2676 #, c-format

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

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

2679

2595 -#: ref-filter.c:378

2680 +#: ref-filter.c:382

2681 #, c-format

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

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

2684

2600 -#: ref-filter.c:404

2685 +#: ref-filter.c:408

2686 #, c-format

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

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

2689

2605 -#: ref-filter.c:508

2690 +#: ref-filter.c:520

2691 #, c-format

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

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

2694

2610 -#: ref-filter.c:568

2695 +#: ref-filter.c:580

2696 #, c-format

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

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

2699

2615 -#: ref-filter.c:570

2700 +#: ref-filter.c:582

2701 #, c-format

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

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

2704

2620 -#: ref-filter.c:572

2705 +#: ref-filter.c:584

2706 #, c-format

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

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

2709

2625 -#: ref-filter.c:598

2710 +#: ref-filter.c:610

2711 #, c-format

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

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

2714

2630 -#: ref-filter.c:600

2715 +#: ref-filter.c:612

2716 #, c-format

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

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

2719

2635 -#: ref-filter.c:602

2720 +#: ref-filter.c:614

2721 #, c-format

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

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

2724

2640 -#: ref-filter.c:615

2725 +#: ref-filter.c:627

2726 #, c-format

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

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

2729

2645 -#: ref-filter.c:670

2730 +#: ref-filter.c:682

2731 #, c-format

2732 msgid "malformed format string %s"

2733 msgstr "felformad formatsträng %s"

2734

2650 -#: ref-filter.c:1254

2735 +#: ref-filter.c:1268

2736 #, c-format

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

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

2739

2655 -#: ref-filter.c:1257

2740 +#: ref-filter.c:1271

2741 #, c-format

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

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

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

2745 #. TRANSLATORS: make sure this matches "HEAD

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

2747 #.

2663 -#: ref-filter.c:1265

2748 +#: ref-filter.c:1279

2749 #, c-format

2750 msgid "(HEAD detached at %s)"

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

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

2753 #. TRANSLATORS: make sure this matches "HEAD

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

2755 #.

2671 -#: ref-filter.c:1272

2756 +#: ref-filter.c:1286

2757 #, c-format

2758 msgid "(HEAD detached from %s)"

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

2760

2676 -#: ref-filter.c:1276

2761 +#: ref-filter.c:1290

2762 msgid "(no branch)"

2763 msgstr "(ingen gren)"

2764

2680 -#: ref-filter.c:1426 ref-filter.c:1457

2765 +#: ref-filter.c:1439 ref-filter.c:1470

2766 #, c-format

2767 msgid "missing object %s for %s"

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

2769

2685 -#: ref-filter.c:1429 ref-filter.c:1460

2770 +#: ref-filter.c:1442 ref-filter.c:1473

2771 #, c-format

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

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

2774

2690 -#: ref-filter.c:1760

2775 +#: ref-filter.c:1773

2776 #, c-format

2777 msgid "malformed object at '%s'"

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

2779

2695 -#: ref-filter.c:1827

2780 +#: ref-filter.c:1840

2781 #, c-format

2782 msgid "ignoring ref with broken name %s"

2783 msgstr "ignorerar referens med trasigt namn %s"

2784

2700 -#: ref-filter.c:1832

2785 +#: ref-filter.c:1845

2786 #, c-format

2787 msgid "ignoring broken ref %s"

2788 msgstr "ignorerar trasig referens %s"

2789

2705 -#: ref-filter.c:2095

2790 +#: ref-filter.c:2107

2791 #, c-format

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

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

2794

2710 -#: ref-filter.c:2176

2795 +#: ref-filter.c:2201

2796 #, c-format

2797 msgid "malformed object name %s"

2798 msgstr "felformat objektnamn %s"

2799

2715 -#: remote.c:747

2800 +#: remote.c:750

2801 #, c-format

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

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

2804

2720 -#: remote.c:751

2805 +#: remote.c:754

2806 #, c-format

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

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

2809

2725 -#: remote.c:755

2810 +#: remote.c:758

2811 #, c-format

2812 msgid "%s tracks both %s and %s"

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

2814

2730 -#: remote.c:763

2815 +#: remote.c:766

2816 msgid "Internal error"

2817 msgstr "Internt fel"

2818

2734 -#: remote.c:1680 remote.c:1782

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

2820 msgid "HEAD does not point to a branch"

2821 msgstr "HEAD pekar inte på en gren"

2822

2738 -#: remote.c:1689

2823 +#: remote.c:1690

2824 #, c-format

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

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

2827

2743 -#: remote.c:1692

2828 +#: remote.c:1693

2829 #, c-format

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

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

2832

2748 -#: remote.c:1698

2833 +#: remote.c:1699

2834 #, c-format

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

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

2837

2753 -#: remote.c:1713

2838 +#: remote.c:1714

2839 #, c-format

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

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

2842

2758 -#: remote.c:1725

2843 +#: remote.c:1726

2844 #, c-format

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

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

2847

2763 -#: remote.c:1736

2848 +#: remote.c:1737

2849 #, c-format

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

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

2852

2768 -#: remote.c:1749

2853 +#: remote.c:1750

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

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

2856

2772 -#: remote.c:1771

2857 +#: remote.c:1772

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

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

2860

@@ -2784,7 +2869,7 @@ msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"

2869

2870 #: remote.c:2083

2871 #, c-format

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

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

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

2874

2875 #: remote.c:2087

@@ -2831,16 +2916,16 @@ msgstr[1] ""

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

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

2918

2834 -#: revision.c:2187

2919 +#: revision.c:2256

2920 msgid "your current branch appears to be broken"

2921 msgstr "din nuvarande gren verkar vara trasig"

2922

2838 -#: revision.c:2190

2923 +#: revision.c:2259

2924 #, c-format

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

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

2927

2843 -#: revision.c:2384

2928 +#: revision.c:2453

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

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

2931

@@ -2882,24 +2967,24 @@ msgstr "mottagarsidan stöder inte push med --atomic"

2967 msgid "the receiving end does not support push options"

2968 msgstr "mottagarsidan stöder inte push-flaggor"

2969

2885 -#: sequencer.c:216

2970 +#: sequencer.c:218

2971 msgid "revert"

2972 msgstr "revert"

2973

2889 -#: sequencer.c:218

2974 +#: sequencer.c:220

2975 msgid "cherry-pick"

2976 msgstr "cherry-pick"

2977

2893 -#: sequencer.c:220

2978 +#: sequencer.c:222

2979 msgid "rebase -i"

2980 msgstr "rebase -i"

2981

2897 -#: sequencer.c:222

2982 +#: sequencer.c:224

2983 #, c-format

2984 msgid "Unknown action: %d"

2985 msgstr "Okänd funktion: %d"

2986

2902 -#: sequencer.c:279

2987 +#: sequencer.c:281

2988 msgid ""

2989 "after resolving the conflicts, mark the corrected paths\n"

2990 "with 'git add <paths>' or 'git rm <paths>'"

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

2992 "efter att ha löst konflikterna, markera de rättade sökvägarna\n"

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

2994

2910 -#: sequencer.c:282

2995 +#: sequencer.c:284

2996 msgid ""

2997 "after resolving the conflicts, mark the corrected paths\n"

2998 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -2917,42 +3002,43 @@ msgstr ""

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

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

3004

2920 -#: sequencer.c:295 sequencer.c:1685

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

3006 #, c-format

3007 msgid "could not lock '%s'"

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

3009

2925 -#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704

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

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

3012 #, c-format

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

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

3015

2930 -#: sequencer.c:302

3016 +#: sequencer.c:304

3017 #, c-format

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

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

3020

2935 -#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692

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

3022 #, c-format

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

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

3025

2940 -#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258

2941 -#: builtin/commit.c:750 builtin/merge.c:1017

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

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

3028 #, c-format

3029 msgid "could not read '%s'"

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

3031

2946 -#: sequencer.c:356

3032 +#: sequencer.c:358

3033 #, c-format

3034 msgid "your local changes would be overwritten by %s."

3035 msgstr "dina lokala ändringar skulle skrivas över av %s."

3036

2951 -#: sequencer.c:360

3037 +#: sequencer.c:362

3038 msgid "commit your changes or stash them to proceed."

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

3040

2955 -#: sequencer.c:389

3041 +#: sequencer.c:391

3042 #, c-format

3043 msgid "%s: fast-forward"

3044 msgstr "%s: snabbspola"

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

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

3047 #. "rebase -i".

3048 #.

2963 -#: sequencer.c:472

3049 +#: sequencer.c:474

3050 #, c-format

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

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

3053

2968 -#: sequencer.c:491

3054 +#: sequencer.c:493

3055 msgid "could not resolve HEAD commit\n"

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

3057

2972 -#: sequencer.c:511

3058 +#: sequencer.c:513

3059 msgid "unable to update cache tree\n"

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

3061

2976 -#: sequencer.c:595

3062 +#: sequencer.c:597

3063 #, c-format

3064 msgid ""

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

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

3088 "\n"

3089 " git rebase --continue\n"

3090

3005 -#: sequencer.c:697

3091 +#: sequencer.c:699

3092 #, c-format

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

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

3095

3010 -#: sequencer.c:702

3096 +#: sequencer.c:704

3097 #, c-format

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

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

3100

3015 -#: sequencer.c:824

3101 +#: sequencer.c:826

3102 #, c-format

3103 msgid ""

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

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

3109 "\n"

3110 "\t%.*s"

3111

3026 -#: sequencer.c:830

3112 +#: sequencer.c:832

3113 #, c-format

3114 msgid ""

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

@@ -3034,231 +3120,232 @@ msgstr ""

3120 "\n"

3121 "\t%.*s"

3122

3037 -#: sequencer.c:836 sequencer.c:861

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

3124 #, c-format

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

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

3127

3042 -#: sequencer.c:845

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

3129 msgid "need a HEAD to fixup"

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

3131

3046 -#: sequencer.c:847

3132 +#: sequencer.c:849

3133 msgid "could not read HEAD"

3134 msgstr "kunde inte läsa HEAD"

3135

3050 -#: sequencer.c:849

3136 +#: sequencer.c:851

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

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

3139

3054 -#: sequencer.c:855

3140 +#: sequencer.c:857

3141 #, c-format

3142 msgid "cannot write '%s'"

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

3144

3059 -#: sequencer.c:864 git-rebase--interactive.sh:445

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

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

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

3148

3063 -#: sequencer.c:872

3149 +#: sequencer.c:874

3150 #, c-format

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

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

3153

3068 -#: sequencer.c:879

3154 +#: sequencer.c:881

3155 #, c-format

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

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

3158

3073 -#: sequencer.c:884

3159 +#: sequencer.c:886

3160 #, c-format

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

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

3163

3078 -#: sequencer.c:889

3164 +#: sequencer.c:891

3165 #, c-format

3166 msgid "unknown command: %d"

3167 msgstr "okänt kommando: %d"

3168

3083 -#: sequencer.c:955

3169 +#: sequencer.c:957

3170 msgid "your index file is unmerged."

3171 msgstr "din indexfil har inte slagits ihop."

3172

3087 -#: sequencer.c:973

3173 +#: sequencer.c:975

3174 #, c-format

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

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

3177

3092 -#: sequencer.c:981

3178 +#: sequencer.c:983

3179 #, c-format

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

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

3182

3097 -#: sequencer.c:985

3183 +#: sequencer.c:987

3184 #, c-format

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

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

3187

3102 -#: sequencer.c:991

3188 +#: sequencer.c:993

3189 #, c-format

3190 msgid "cannot get commit message for %s"

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

3192

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

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

3109 -#: sequencer.c:1012

3195 +#: sequencer.c:1014

3196 #, c-format

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

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

3199

3114 -#: sequencer.c:1075 sequencer.c:1830

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

3201 #, c-format

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

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

3204

3119 -#: sequencer.c:1126

3205 +#: sequencer.c:1128

3206 #, c-format

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

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

3209

3124 -#: sequencer.c:1127

3210 +#: sequencer.c:1129

3211 #, c-format

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

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

3214

3129 -#: sequencer.c:1169

3215 +#: sequencer.c:1171

3216 msgid "empty commit set passed"

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

3218

3133 -#: sequencer.c:1179

3219 +#: sequencer.c:1181

3220 #, c-format

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

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

3223

3138 -#: sequencer.c:1186

3224 +#: sequencer.c:1188

3225 #, c-format

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

3227 msgstr "git %s: misslyckades uppdatera indexet"

3228

3143 -#: sequencer.c:1306

3229 +#: sequencer.c:1308

3230 #, c-format

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

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

3233

3148 -#: sequencer.c:1314

3234 +#: sequencer.c:1316

3235 #, c-format

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

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

3238

3153 -#: sequencer.c:1347

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

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

3241 #, c-format

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

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

3244

3158 -#: sequencer.c:1359

3245 +#: sequencer.c:1361

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

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

3248

3162 -#: sequencer.c:1361

3249 +#: sequencer.c:1363

3250 #, c-format

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

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

3253

3167 -#: sequencer.c:1366

3254 +#: sequencer.c:1368

3255 msgid "no commits parsed."

3256 msgstr "inga incheckningar lästes."

3257

3171 -#: sequencer.c:1377

3258 +#: sequencer.c:1379

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

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

3261

3175 -#: sequencer.c:1379

3262 +#: sequencer.c:1381

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

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

3265

3179 -#: sequencer.c:1442

3266 +#: sequencer.c:1448

3267 #, c-format

3268 msgid "invalid key: %s"

3269 msgstr "felaktig nyckel: %s"

3270

3184 -#: sequencer.c:1445

3271 +#: sequencer.c:1451

3272 #, c-format

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

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

3275

3189 -#: sequencer.c:1502

3276 +#: sequencer.c:1517

3277 #, c-format

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

3279 msgstr "trasigt manus: ”%s”"

3280

3194 -#: sequencer.c:1540

3281 +#: sequencer.c:1555

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

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

3284

3198 -#: sequencer.c:1541

3285 +#: sequencer.c:1556

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

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

3288

3202 -#: sequencer.c:1544

3289 +#: sequencer.c:1559

3290 #, c-format

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

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

3293

3207 -#: sequencer.c:1558

3294 +#: sequencer.c:1574

3295 msgid "could not lock HEAD"

3296 msgstr "kunde inte låsa HEAD"

3297

3211 -#: sequencer.c:1614 sequencer.c:2188

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

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

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

3301

3215 -#: sequencer.c:1616

3302 +#: sequencer.c:1634

3303 msgid "cannot resolve HEAD"

3304 msgstr "kan inte bestämma HEAD"

3305

3219 -#: sequencer.c:1618 sequencer.c:1652

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

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

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

3309

3223 -#: sequencer.c:1638 builtin/grep.c:929

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

3311 #, c-format

3312 msgid "cannot open '%s'"

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

3314

3228 -#: sequencer.c:1640

3315 +#: sequencer.c:1659

3316 #, c-format

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

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

3319

3233 -#: sequencer.c:1641

3320 +#: sequencer.c:1660

3321 msgid "unexpected end of file"

3322 msgstr "oväntat filslut"

3323

3237 -#: sequencer.c:1647

3324 +#: sequencer.c:1666

3325 #, c-format

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

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

3328

3242 -#: sequencer.c:1658

3329 +#: sequencer.c:1677

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

3331 msgstr ""

3332 "Du verkar ha flyttat HEAD.\n"

3333 "Spolar inte tillbaka, kontrollera HEAD!"

3334

3248 -#: sequencer.c:1795 sequencer.c:2086

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

3336 msgid "cannot read HEAD"

3337 msgstr "kan inte läsa HEAD"

3338

3252 -#: sequencer.c:1835 builtin/difftool.c:633

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

3340 #, c-format

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

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

3343

3257 -#: sequencer.c:1851

3344 +#: sequencer.c:1874

3345 msgid "could not read index"

3346 msgstr "kunde inte läsa indexet"

3347

3261 -#: sequencer.c:1856

3348 +#: sequencer.c:1879

3349 #, c-format

3350 msgid ""

3351 "execution failed: %s\n"

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

3360 "\tgit rebase --continue\n"

3361 "\n"

3362

3276 -#: sequencer.c:1862

3363 +#: sequencer.c:1885

3364 msgid "and made changes to the index and/or the working tree\n"

3365 msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"

3366

3280 -#: sequencer.c:1868

3367 +#: sequencer.c:1891

3368 #, c-format

3369 msgid ""

3370 "execution succeeded: %s\n"

@@ -3294,17 +3381,17 @@ msgstr ""

3381 "\tgit rebase --continue\n"

3382 "\n"

3383

3297 -#: sequencer.c:1925

3384 +#: sequencer.c:1948

3385 #, c-format

3386 msgid "Applied autostash.\n"

3387 msgstr "Tillämpade autostash.\n"

3388

3302 -#: sequencer.c:1937

3389 +#: sequencer.c:1960

3390 #, c-format

3391 msgid "cannot store %s"

3392 msgstr "kan inte spara %s"

3393

3307 -#: sequencer.c:1940 git-rebase.sh:173

3394 +#: sequencer.c:1963 git-rebase.sh:175

3395 #, c-format

3396 msgid ""

3397 "Applying autostash resulted in conflicts.\n"

@@ -3315,57 +3402,57 @@ msgstr ""

3402 "Dina ändringar är säkra i stashen.\n"

3403 "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"

3404

3318 -#: sequencer.c:2022

3405 +#: sequencer.c:2045

3406 #, c-format

3407 msgid "Stopped at %s... %.*s\n"

3408 msgstr "Stoppade på %s... %.*s\n"

3409

3323 -#: sequencer.c:2064

3410 +#: sequencer.c:2087

3411 #, c-format

3412 msgid "unknown command %d"

3413 msgstr "okänt kommando %d"

3414

3328 -#: sequencer.c:2094

3415 +#: sequencer.c:2117

3416 msgid "could not read orig-head"

3417 msgstr "kunde inte läsa orig-head"

3418

3332 -#: sequencer.c:2099

3419 +#: sequencer.c:2122 sequencer.c:2678

3420 msgid "could not read 'onto'"

3421 msgstr "kunde inte läsa \"onto\""

3422

3336 -#: sequencer.c:2106

3423 +#: sequencer.c:2129

3424 #, c-format

3425 msgid "could not update %s"

3426 msgstr "kunde inte uppdatera %s"

3427

3341 -#: sequencer.c:2113

3428 +#: sequencer.c:2136

3429 #, c-format

3430 msgid "could not update HEAD to %s"

3431 msgstr "kunde inte uppdatera HEAD till %s"

3432

3346 -#: sequencer.c:2197

3433 +#: sequencer.c:2220

3434 msgid "cannot rebase: You have unstaged changes."

3435 msgstr "kan inte ombasera: Du har oköade ändringar."

3436

3350 -#: sequencer.c:2202

3437 +#: sequencer.c:2225

3438 msgid "could not remove CHERRY_PICK_HEAD"

3439 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"

3440

3354 -#: sequencer.c:2211

3441 +#: sequencer.c:2234

3442 msgid "cannot amend non-existing commit"

3443 msgstr "kan inte lägga till incheckning som inte finns"

3444

3358 -#: sequencer.c:2213

3445 +#: sequencer.c:2236

3446 #, c-format

3447 msgid "invalid file: '%s'"

3448 msgstr "ogiltig fil: \"%s\""

3449

3363 -#: sequencer.c:2215

3450 +#: sequencer.c:2238

3451 #, c-format

3452 msgid "invalid contents: '%s'"

3453 msgstr "ogiltigt innehåll: \"%s\""

3454

3368 -#: sequencer.c:2218

3455 +#: sequencer.c:2241

3456 msgid ""

3457 "\n"

3458 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3375,24 +3462,119 @@ msgstr ""

3462 "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"

3463 "först och kör sedan \"git rebase --continute\" igen."

3464

3378 -#: sequencer.c:2228

3465 +#: sequencer.c:2251

3466 msgid "could not commit staged changes."

3467 msgstr "kunde inte checka in köade ändringar."

3468

3382 -#: sequencer.c:2308

3469 +#: sequencer.c:2331

3470 #, c-format

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

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

3473

3387 -#: sequencer.c:2312

3474 +#: sequencer.c:2335

3475 #, c-format

3476 msgid "%s: bad revision"

3477 msgstr "%s: felaktig revision"

3478

3392 -#: sequencer.c:2345

3479 +#: sequencer.c:2368

3480 msgid "can't revert as initial commit"

3481 msgstr "kan inte ångra som första incheckning"

3482

3483 +#: sequencer.c:2471

3484 +msgid "make_script: unhandled options"

3485 +msgstr "make_script: flaggor som inte stöds"

3486 +

3487 +#: sequencer.c:2474

3488 +msgid "make_script: error preparing revisions"

3489 +msgstr "make_script: fel när revisioner skulle förberedas"

3490 +

3491 +#: sequencer.c:2510

3492 +#, c-format

3493 +msgid "unusable todo list: '%s'"

3494 +msgstr "oanvändbar todo-lista: %s"

3495 +

3496 +#: sequencer.c:2516

3497 +#, c-format

3498 +msgid "unable to open '%s' for writing"

3499 +msgstr "kunde inte öppna \"%s\" för skrivning"

3500 +

3501 +#: sequencer.c:2561

3502 +#, c-format

3503 +msgid "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring."

3504 +msgstr ""

3505 +"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."

3506 +

3507 +#: sequencer.c:2561

3508 +#, c-format

3509 +msgid "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

3510 +msgstr ""

3511 +"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."

3512 +

3513 +#: sequencer.c:2641

3514 +#, c-format

3515 +msgid ""

3516 +"Warning: some commits may have been dropped accidentally.\n"

3517 +"Dropped commits (newer to older):\n"

3518 +msgstr ""

3519 +"Varning: vissa incheckningar kan av misstag ha tappats.\n"

3520 +"Tappade incheckningar (nyaste först):\n"

3521 +

3522 +#: sequencer.c:2648

3523 +#, c-format

3524 +msgid ""

3525 +"To avoid this message, use \"drop\" to explicitly remove a commit.\n"

3526 +"\n"

3527 +"Use 'git config rebase.missingCommitsCheck' to change the level of "

3528 +"warnings.\n"

3529 +"The possible behaviours are: ignore, warn, error.\n"

3530 +"\n"

3531 +msgstr ""

3532 +"För att undvika det här meddelandet kan du använda \"drop\" för att "

3533 +"explicit\n"

3534 +"kasta en incheckning.\n"

3535 +"\n"

3536 +"Använd \"git config rebase.missingCommitsCheck\" för att ändra "

3537 +"varningsnivån.\n"

3538 +"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error"

3539 +"\" (fel).\n"

3540 +"\n"

3541 +

3542 +#: sequencer.c:2660

3543 +#, c-format

3544 +msgid ""

3545 +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

3546 +"continue'.\n"

3547 +"Or you can abort the rebase with 'git rebase --abort'.\n"

3548 +msgstr ""

3549 +"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --"

3550 +"continue\".\n"

3551 +"Avbryt ombaseringen med \"git rebase --abort\".\n"

3552 +

3553 +#: sequencer.c:2708

3554 +#, c-format

3555 +msgid "could not parse commit '%s'"

3556 +msgstr "kunde inte tolka incheckningen\" %s\""

3557 +

3558 +#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395

3559 +#: builtin/am.c:775

3560 +#, c-format

3561 +msgid "could not open '%s' for writing"

3562 +msgstr "kunde inte öppna \"%s\" för skrivning"

3563 +

3564 +#: sequencer.c:2756

3565 +#, c-format

3566 +msgid "could not truncate '%s'"

3567 +msgstr "kunde inte trunkera \"%s\""

3568 +

3569 +#: sequencer.c:2848

3570 +msgid "the script was already rearranged."

3571 +msgstr "skriptet har redan omordnats."

3572 +

3573 +#: sequencer.c:2953

3574 +#, c-format

3575 +msgid "could not finish '%s'"

3576 +msgstr "kunde inte avsluta \"%s\""

3577 +

3578 #: setup.c:171

3579 #, c-format

3580 msgid ""

@@ -3426,34 +3608,34 @@ msgstr ""

3608 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"

3609 "\"git <kommando> [<revision>...] -- [<fil>...]\""

3610

3429 -#: setup.c:504

3611 +#: setup.c:499

3612 #, c-format

3613 msgid "Expected git repo version <= %d, found %d"

3614 msgstr "Förväntade git-arkivversion <= %d, hittade %d"

3615

3434 -#: setup.c:512

3616 +#: setup.c:507

3617 msgid "unknown repository extensions found:"

3618 msgstr "okända arkivutökningar hittades:"

3619

3438 -#: setup.c:810

3620 +#: setup.c:806

3621 #, c-format

3622 msgid "Not a git repository (or any of the parent directories): %s"

3623 msgstr "Inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"

3624

3443 -#: setup.c:812 builtin/index-pack.c:1652

3625 +#: setup.c:808 builtin/index-pack.c:1653

3626 msgid "Cannot come back to cwd"

3627 msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"

3628

3447 -#: setup.c:1050

3629 +#: setup.c:1046

3630 msgid "Unable to read current working directory"

3631 msgstr "Kan inte läsa aktuell arbetskatalog"

3632

3451 -#: setup.c:1062 setup.c:1068

3633 +#: setup.c:1058 setup.c:1064

3634 #, c-format

3635 msgid "Cannot change to '%s'"

3636 msgstr "Kan inte byta till \"%s\""

3637

3456 -#: setup.c:1081

3638 +#: setup.c:1077

3639 #, c-format

3640 msgid ""

3641 "Not a git repository (or any parent up to mount point %s)\n"

@@ -3463,7 +3645,7 @@ msgstr ""

3645 "monteringspunkten %s)\n"

3646 "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."

3647

3466 -#: setup.c:1173

3648 +#: setup.c:1159

3649 #, c-format

3650 msgid ""

3651 "Problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -3472,55 +3654,41 @@ msgstr ""

3654 "Problem med filläges-värdet i core.sharedRepository (0%.3o).\n"

3655 "Ägaren av filerna måste alltid ha läs- och skrivbehörighet."

3656

3475 -#: sha1_file.c:560

3657 +#: sha1_file.c:528

3658 #, c-format

3659 msgid "path '%s' does not exist"

3660 msgstr "sökvägen \"%s\" finns inte"

3661

3480 -#: sha1_file.c:586

3662 +#: sha1_file.c:554

3663 #, c-format

3664 msgid "reference repository '%s' as a linked checkout is not supported yet."

3665 msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."

3666

3485 -#: sha1_file.c:592

3667 +#: sha1_file.c:560

3668 #, c-format

3669 msgid "reference repository '%s' is not a local repository."

3670 msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."

3671

3490 -#: sha1_file.c:598

3672 +#: sha1_file.c:566

3673 #, c-format

3674 msgid "reference repository '%s' is shallow"

3675 msgstr "referensarkivet \"%s\" är grunt"

3676

3495 -#: sha1_file.c:606

3677 +#: sha1_file.c:574

3678 #, c-format

3679 msgid "reference repository '%s' is grafted"

3680 msgstr "referensarkivet \"%s\" är ympat"

3681

3500 -#: sha1_file.c:1245

3501 -msgid "offset before end of packfile (broken .idx?)"

3502 -msgstr "offset före slutet av packfilen (trasig .idx?)"

3503 -

3504 -#: sha1_file.c:2729

3505 -#, c-format

3506 -msgid "offset before start of pack index for %s (corrupt index?)"

3507 -msgstr "offset före slutet av packindex för %s (trasigt index?)"

3508 -

3509 -#: sha1_file.c:2733

3510 -#, c-format

3511 -msgid "offset beyond end of pack index for %s (truncated index?)"

3512 -msgstr "offset borton slutet av packindex för %s (trunkerat index?)"

3513 -

3514 -#: sha1_name.c:419

3682 +#: sha1_name.c:420

3683 #, c-format

3684 msgid "short SHA1 %s is ambiguous"

3685 msgstr "kort SHA1 %s är tvetydig"

3686

3519 -#: sha1_name.c:430

3687 +#: sha1_name.c:431

3688 msgid "The candidates are:"

3689 msgstr "Kandidaterna är:"

3690

3523 -#: sha1_name.c:589

3691 +#: sha1_name.c:590

3692 msgid ""

3693 "Git normally never creates a ref that ends with 40 hex characters\n"

3694 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -3542,66 +3710,71 @@ msgstr ""

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

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

3712

3545 -#: submodule.c:70 submodule.c:104

3713 +#: submodule.c:93 submodule.c:127

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

3715 msgstr ""

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

3717 "sammanslagningskonflikter först"

3718

3551 -#: submodule.c:74 submodule.c:108

3719 +#: submodule.c:97 submodule.c:131

3720 #, c-format

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

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

3723

3556 -#: submodule.c:82

3724 +#: submodule.c:105

3725 #, c-format

3726 msgid "Could not update .gitmodules entry %s"

3727 msgstr "Kunde inte uppdatera .gitmodules-posten %s"

3728

3561 -#: submodule.c:115

3729 +#: submodule.c:138

3730 #, c-format

3731 msgid "Could not remove .gitmodules entry for %s"

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

3733

3566 -#: submodule.c:126

3734 +#: submodule.c:149

3735 msgid "staging updated .gitmodules failed"

3736 msgstr "misslyckades köa uppdaterad .gitmodules"

3737

3570 -#: submodule.c:165

3571 -msgid "negative values not allowed for submodule.fetchJobs"

3572 -msgstr "negativa värden är inte tillåtna för submodule.fetchJobs"

3573 -

3574 -#: submodule.c:376

3738 +#: submodule.c:309

3739 #, c-format

3740 msgid "in unpopulated submodule '%s'"

3741 msgstr "i ej utcheckad undermodul \"%s\""

3742

3579 -#: submodule.c:407

3743 +#: submodule.c:340

3744 #, c-format

3745 msgid "Pathspec '%s' is in submodule '%.*s'"

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

3747

3584 -#: submodule.c:1337

3748 +#: submodule.c:799

3749 +#, c-format

3750 +msgid "submodule entry '%s' (%s) is a %s, not a commit"

3751 +msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"

3752 +

3753 +#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149

3754 +msgid "Failed to resolve HEAD as a valid ref."

3755 +msgstr "Misslyckades slå upp HEAD som giltig referens."

3756 +

3757 +#: submodule.c:1304

3758 #, c-format

3759 msgid "'%s' not recognized as a git repository"

3760 msgstr "\"%s\" känns inte igen som ett git-arkiv"

3761

3589 -#: submodule.c:1475

3762 +#: submodule.c:1442

3763 #, c-format

3764 msgid "could not start 'git status' in submodule '%s'"

3765 msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""

3766

3594 -#: submodule.c:1488

3767 +#: submodule.c:1455

3768 #, c-format

3769 msgid "could not run 'git status' in submodule '%s'"

3770 msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""

3771

3599 -#: submodule.c:1581

3772 +#: submodule.c:1548

3773 #, c-format

3774 msgid "submodule '%s' has dirty index"

3775 msgstr "undermodulen \"%s\" har ett smutsigt index"

3776

3604 -#: submodule.c:1845

3777 +#: submodule.c:1809

3778 #, c-format

3779 msgid ""

3780 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -3609,18 +3782,18 @@ msgstr ""

3782 "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "

3783 "stöds ej"

3784

3612 -#: submodule.c:1857 submodule.c:1913

3785 +#: submodule.c:1821 submodule.c:1877

3786 #, c-format

3787 msgid "could not lookup name for submodule '%s'"

3788 msgstr "kunde inte slå upp namnet för undermodulen \"%s\""

3789

3617 -#: submodule.c:1861 builtin/submodule--helper.c:678

3618 -#: builtin/submodule--helper.c:688

3790 +#: submodule.c:1825 builtin/submodule--helper.c:671

3791 +#: builtin/submodule--helper.c:681

3792 #, c-format

3793 msgid "could not create directory '%s'"

3794 msgstr "kunde inte skapa katalogen \"%s\""

3795

3623 -#: submodule.c:1864

3796 +#: submodule.c:1828

3797 #, c-format

3798 msgid ""

3799 "Migrating git directory of '%s%s' from\n"

@@ -3631,94 +3804,98 @@ msgstr ""

3804 "\"%s\" till\n"

3805 "\"%s\"\n"

3806

3634 -#: submodule.c:1948

3807 +#: submodule.c:1912

3808 #, c-format

3809 msgid "could not recurse into submodule '%s'"

3810 msgstr "kunde inte rekursera in i undermodulen \"%s\""

3811

3639 -#: submodule.c:1992

3812 +#: submodule.c:1956

3813 msgid "could not start ls-files in .."

3814 msgstr "kunde inte starta ls-files i .."

3815

3643 -#: submodule.c:2012

3816 +#: submodule.c:1976

3817 msgid "BUG: returned path string doesn't match cwd?"

3818 msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"

3819

3647 -#: submodule.c:2031

3820 +#: submodule.c:1995

3821 #, c-format

3822 msgid "ls-tree returned unexpected return code %d"

3823 msgstr "ls-tree returnerade en oväntad returkod %d"

3824

3652 -#: submodule-config.c:420

3825 +#: submodule-config.c:263

3826 +msgid "negative values not allowed for submodule.fetchjobs"

3827 +msgstr "negativa värden är inte tillåtna för submodule.fetchjobs"

3828 +

3829 +#: submodule-config.c:436

3830 #, c-format

3831 msgid "invalid value for %s"

3832 msgstr "ogiltigt värde för %s"

3833

3657 -#: trailer.c:241

3834 +#: trailer.c:238

3835 #, c-format

3836 msgid "running trailer command '%s' failed"

3837 msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\""

3838

3662 -#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540

3663 -#: trailer.c:544

3839 +#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553

3840 +#: trailer.c:557

3841 #, c-format

3842 msgid "unknown value '%s' for key '%s'"

3843 msgstr "okänt värde \"%s\" för nyckeln \"%s\""

3844

3668 -#: trailer.c:526 trailer.c:531 builtin/remote.c:290

3845 +#: trailer.c:539 trailer.c:544 builtin/remote.c:290

3846 #, c-format

3847 msgid "more than one %s"

3848 msgstr "mer än en %s"

3849

3673 -#: trailer.c:703

3850 +#: trailer.c:730

3851 #, c-format

3852 msgid "empty trailer token in trailer '%.*s'"

3853 msgstr "tom släpradssymbol i släpraden \"%.*s\""

3854

3678 -#: trailer.c:723

3855 +#: trailer.c:750

3856 #, c-format

3857 msgid "could not read input file '%s'"

3858 msgstr "kunde inte läsa indatafilen \"%s\""

3859

3683 -#: trailer.c:726

3860 +#: trailer.c:753

3861 msgid "could not read from stdin"

3862 msgstr "kunde inte läsa från standard in"

3863

3687 -#: trailer.c:950 builtin/am.c:45

3864 +#: trailer.c:1008 builtin/am.c:46

3865 #, c-format

3866 msgid "could not stat %s"

3867 msgstr "kunde inte ta status på %s"

3868

3692 -#: trailer.c:952

3869 +#: trailer.c:1010

3870 #, c-format

3871 msgid "file %s is not a regular file"

3872 msgstr "filen %s är inte en normal fil"

3873

3697 -#: trailer.c:954

3874 +#: trailer.c:1012

3875 #, c-format

3876 msgid "file %s is not writable by user"

3877 msgstr "filen %s är inte skrivbar av användaren"

3878

3702 -#: trailer.c:966

3879 +#: trailer.c:1024

3880 msgid "could not open temporary file"

3881 msgstr "kunde inte öppna temporär file"

3882

3706 -#: trailer.c:1002

3883 +#: trailer.c:1064

3884 #, c-format

3885 msgid "could not rename temporary file to %s"

3886 msgstr "kunde inte byta namn på temporär fil till %s"

3887

3711 -#: transport.c:63

3888 +#: transport.c:62

3889 #, c-format

3890 msgid "Would set upstream of '%s' to '%s' of '%s'\n"

3891 msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"

3892

3716 -#: transport.c:152

3893 +#: transport.c:151

3894 #, c-format

3895 msgid "transport: invalid depth option '%s'"

3896 msgstr "transport: ogiltig flagga för depth: ”%s”"

3897

3721 -#: transport.c:890

3898 +#: transport.c:888

3899 #, c-format

3900 msgid ""

3901 "The following submodule paths contain changes that can\n"

@@ -3727,7 +3904,7 @@ msgstr ""

3904 "Följande undermodulsökvägar innehåller ändringar som\n"

3905 "inte kan hittas av fjärrarna:\n"

3906

3730 -#: transport.c:894

3907 +#: transport.c:892

3908 #, c-format

3909 msgid ""

3910 "\n"

@@ -3754,7 +3931,7 @@ msgstr ""

3931 "för att sända dem till fjärren.\n"

3932 "\n"

3933

3757 -#: transport.c:902

3934 +#: transport.c:900

3935 msgid "Aborting."

3936 msgstr "Avbryter."

3937

@@ -3775,11 +3952,11 @@ msgstr "felformat läge i trädpost"

3952 msgid "empty filename in tree entry"

3953 msgstr "tomt filnamn i trädpost"

3954

3778 -#: tree-walk.c:113

3955 +#: tree-walk.c:114

3956 msgid "too-short tree file"

3957 msgstr "trädfil för kort"

3958

3782 -#: unpack-trees.c:105

3959 +#: unpack-trees.c:106

3960 #, c-format

3961 msgid ""

3962 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3788,7 +3965,7 @@ msgstr ""

3965 "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"

3966 "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."

3967

3791 -#: unpack-trees.c:107

3968 +#: unpack-trees.c:108

3969 #, c-format

3970 msgid ""

3971 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3797,7 +3974,7 @@ msgstr ""

3974 "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"

3975 "%%s"

3976

3800 -#: unpack-trees.c:110

3977 +#: unpack-trees.c:111

3978 #, c-format

3979 msgid ""

3980 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3807,7 +3984,7 @@ msgstr ""

3984 "sammanslagning:\n"

3985 "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."

3986

3810 -#: unpack-trees.c:112

3987 +#: unpack-trees.c:113

3988 #, c-format

3989 msgid ""

3990 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3817,7 +3994,7 @@ msgstr ""

3994 "sammanslagning:\n"

3995 "%%s"

3996

3820 -#: unpack-trees.c:115

3997 +#: unpack-trees.c:116

3998 #, c-format

3999 msgid ""

4000 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3826,7 +4003,7 @@ msgstr ""

4003 "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"

4004 "%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."

4005

3829 -#: unpack-trees.c:117

4006 +#: unpack-trees.c:118

4007 #, c-format

4008 msgid ""

4009 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3835,7 +4012,7 @@ msgstr ""

4012 "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"

4013 "%%s"

4014

3838 -#: unpack-trees.c:122

4015 +#: unpack-trees.c:123

4016 #, c-format

4017 msgid ""

4018 "Updating the following directories would lose untracked files in them:\n"

@@ -3845,7 +4022,7 @@ msgstr ""

4022 "dem:\n"

4023 "%s"

4024

3848 -#: unpack-trees.c:126

4025 +#: unpack-trees.c:127

4026 #, c-format

4027 msgid ""

4028 "The following untracked working tree files would be removed by checkout:\n"

@@ -3854,7 +4031,7 @@ msgstr ""

4031 "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"

4032 "%%sFlytta eller ta bort dem innan du byter gren."

4033

3857 -#: unpack-trees.c:128

4034 +#: unpack-trees.c:129

4035 #, c-format

4036 msgid ""

4037 "The following untracked working tree files would be removed by checkout:\n"

@@ -3863,7 +4040,7 @@ msgstr ""

4040 "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"

4041 "%%s"

4042

3866 -#: unpack-trees.c:131

4043 +#: unpack-trees.c:132

4044 #, c-format

4045 msgid ""

4046 "The following untracked working tree files would be removed by merge:\n"

@@ -3873,7 +4050,7 @@ msgstr ""

4050 "sammanslagningen:\n"

4051 "%%sFlytta eller ta bort dem innan du slår samman."

4052

3876 -#: unpack-trees.c:133

4053 +#: unpack-trees.c:134

4054 #, c-format

4055 msgid ""

4056 "The following untracked working tree files would be removed by merge:\n"

@@ -3883,7 +4060,7 @@ msgstr ""

4060 "sammanslagningen:\n"

4061 "%%s"

4062

3886 -#: unpack-trees.c:136

4063 +#: unpack-trees.c:137

4064 #, c-format

4065 msgid ""

4066 "The following untracked working tree files would be removed by %s:\n"

@@ -3892,7 +4069,7 @@ msgstr ""

4069 "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"

4070 "%%sFlytta eller ta bort dem innan du \"%s\"."

4071

3895 -#: unpack-trees.c:138

4072 +#: unpack-trees.c:139

4073 #, c-format

4074 msgid ""

4075 "The following untracked working tree files would be removed by %s:\n"

@@ -3901,7 +4078,7 @@ msgstr ""

4078 "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"

4079 "%%s"

4080

3904 -#: unpack-trees.c:143

4081 +#: unpack-trees.c:144

4082 #, c-format

4083 msgid ""

4084 "The following untracked working tree files would be overwritten by "

@@ -3912,7 +4089,7 @@ msgstr ""

4089 "utcheckningen:\n"

4090 "%%sFlytta eller ta bort dem innan du byter gren."

4091

3915 -#: unpack-trees.c:145

4092 +#: unpack-trees.c:146

4093 #, c-format

4094 msgid ""

4095 "The following untracked working tree files would be overwritten by "

@@ -3923,7 +4100,7 @@ msgstr ""

4100 "utcheckningen:\n"

4101 "%%s"

4102

3926 -#: unpack-trees.c:148

4103 +#: unpack-trees.c:149

4104 #, c-format

4105 msgid ""

4106 "The following untracked working tree files would be overwritten by merge:\n"

@@ -3933,7 +4110,7 @@ msgstr ""

4110 "sammanslagningen:\n"

4111 "%%sFlytta eller ta bort dem innan du byter gren."

4112

3936 -#: unpack-trees.c:150

4113 +#: unpack-trees.c:151

4114 #, c-format

4115 msgid ""

4116 "The following untracked working tree files would be overwritten by merge:\n"

@@ -3943,7 +4120,7 @@ msgstr ""

4120 "sammanslagningen:\n"

4121 "%%s"

4122

3946 -#: unpack-trees.c:153

4123 +#: unpack-trees.c:154

4124 #, c-format

4125 msgid ""

4126 "The following untracked working tree files would be overwritten by %s:\n"

@@ -3952,7 +4129,7 @@ msgstr ""

4129 "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"

4130 "%%sFlytta eller ta bort dem innan du \"%s\"."

4131

3955 -#: unpack-trees.c:155

4132 +#: unpack-trees.c:156

4133 #, c-format

4134 msgid ""

4135 "The following untracked working tree files would be overwritten by %s:\n"

@@ -3961,21 +4138,21 @@ msgstr ""

4138 "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"

4139 "%%s"

4140

3964 -#: unpack-trees.c:162

4141 +#: unpack-trees.c:163

4142 #, c-format

4143 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

4144 msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."

4145

3969 -#: unpack-trees.c:165

4146 +#: unpack-trees.c:166

4147 #, c-format

4148 msgid ""

3972 -"Cannot update sparse checkout: the following entries are not up-to-date:\n"

4149 +"Cannot update sparse checkout: the following entries are not up to date:\n"

4150 "%s"

4151 msgstr ""

3975 -"Kan inte uppdatera gles utcheckning: följande poster är inte àjour:\n"

4152 +"Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n"

4153 "%s"

4154

3978 -#: unpack-trees.c:167

4155 +#: unpack-trees.c:168

4156 #, c-format

4157 msgid ""

4158 "The following working tree files would be overwritten by sparse checkout "

@@ -3986,7 +4163,7 @@ msgstr ""

4163 "utcheckning:\n"

4164 "%s"

4165

3989 -#: unpack-trees.c:169

4166 +#: unpack-trees.c:170

4167 #, c-format

4168 msgid ""

4169 "The following working tree files would be removed by sparse checkout "

@@ -3997,7 +4174,7 @@ msgstr ""

4174 "utcheckning:\n"

4175 "%s"

4176

4000 -#: unpack-trees.c:171

4177 +#: unpack-trees.c:172

4178 #, c-format

4179 msgid ""

4180 "Cannot update submodule:\n"

@@ -4006,17 +4183,12 @@ msgstr ""

4183 "Kan inte uppdatera undermodul:\n"

4184 "%s"

4185

4009 -#: unpack-trees.c:248

4186 +#: unpack-trees.c:249

4187 #, c-format

4188 msgid "Aborting\n"

4189 msgstr "Avbryter\n"

4190

4014 -#: unpack-trees.c:277

4015 -#, c-format

4016 -msgid "submodule update strategy not supported for submodule '%s'"

4017 -msgstr "uppdateringsstrategi för undermodul stöds inte för undermodulen \"%s\""

4018 -

4019 -#: unpack-trees.c:346

4191 +#: unpack-trees.c:331

4192 msgid "Checking out files"

4193 msgstr "Checkar ut filer"

4194

@@ -4059,13 +4231,8 @@ msgstr "misslyckades läsa \"%s\""

4231 msgid "could not open '%s' for reading and writing"

4232 msgstr "kunde inte öppna \"%s\" för läsning och skrivning"

4233

4062 -#: wrapper.c:225 wrapper.c:395 builtin/am.c:766

4063 -#, c-format

4064 -msgid "could not open '%s' for writing"

4065 -msgstr "kunde inte öppna \"%s\" för skrivning"

4066 -

4067 -#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757

4068 -#: builtin/am.c:849 builtin/merge.c:1014

4234 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766

4235 +#: builtin/am.c:858 builtin/merge.c:1041

4236 #, c-format

4237 msgid "could not open '%s' for reading"

4238 msgstr "kunde inte öppna \"%s\" för läsning"

@@ -4089,199 +4256,199 @@ msgstr "kunde inte skriva till %s"

4256 msgid "could not close %s"

4257 msgstr "kunde inte stänga %s"

4258

4092 -#: wt-status.c:152

4259 +#: wt-status.c:150

4260 msgid "Unmerged paths:"

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

4262

4096 -#: wt-status.c:179 wt-status.c:206

4263 +#: wt-status.c:177 wt-status.c:204

4264 #, c-format

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

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

4267

4101 -#: wt-status.c:181 wt-status.c:208

4268 +#: wt-status.c:179 wt-status.c:206

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

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

4271

4105 -#: wt-status.c:185

4272 +#: wt-status.c:183

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

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

4275

4109 -#: wt-status.c:187 wt-status.c:191

4276 +#: wt-status.c:185 wt-status.c:189

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

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

4279

4113 -#: wt-status.c:189

4280 +#: wt-status.c:187

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

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

4283

4117 -#: wt-status.c:200 wt-status.c:981

4284 +#: wt-status.c:198 wt-status.c:979

4285 msgid "Changes to be committed:"

4286 msgstr "Ändringar att checka in:"

4287

4121 -#: wt-status.c:218 wt-status.c:990

4288 +#: wt-status.c:216 wt-status.c:988

4289 msgid "Changes not staged for commit:"

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

4291

4125 -#: wt-status.c:222

4292 +#: wt-status.c:220

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

4294 msgstr ""

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

4296

4130 -#: wt-status.c:224

4297 +#: wt-status.c:222

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

4299 msgstr ""

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

4301

4135 -#: wt-status.c:225

4302 +#: wt-status.c:223

4303 msgid ""

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

4305 msgstr ""

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

4307 "arbetskatalogen)"

4308

4142 -#: wt-status.c:227

4309 +#: wt-status.c:225

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

4311 msgstr ""

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

4313

4147 -#: wt-status.c:239

4314 +#: wt-status.c:237

4315 #, c-format

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

4317 msgstr ""

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

4319

4153 -#: wt-status.c:254

4320 +#: wt-status.c:252

4321 msgid "both deleted:"

4322 msgstr "borttaget av bägge:"

4323

4157 -#: wt-status.c:256

4324 +#: wt-status.c:254

4325 msgid "added by us:"

4326 msgstr "tillagt av oss:"

4327

4161 -#: wt-status.c:258

4328 +#: wt-status.c:256

4329 msgid "deleted by them:"

4330 msgstr "borttaget av dem:"

4331

4165 -#: wt-status.c:260

4332 +#: wt-status.c:258

4333 msgid "added by them:"

4334 msgstr "tillagt av dem:"

4335

4169 -#: wt-status.c:262

4336 +#: wt-status.c:260

4337 msgid "deleted by us:"

4338 msgstr "borttaget av oss:"

4339

4173 -#: wt-status.c:264

4340 +#: wt-status.c:262

4341 msgid "both added:"

4342 msgstr "tillagt av bägge:"

4343

4177 -#: wt-status.c:266

4344 +#: wt-status.c:264

4345 msgid "both modified:"

4346 msgstr "ändrat av bägge:"

4347

4181 -#: wt-status.c:276

4348 +#: wt-status.c:274

4349 msgid "new file:"

4350 msgstr "ny fil:"

4351

4185 -#: wt-status.c:278

4352 +#: wt-status.c:276

4353 msgid "copied:"

4354 msgstr "kopierad:"

4355

4189 -#: wt-status.c:280

4356 +#: wt-status.c:278

4357 msgid "deleted:"

4358 msgstr "borttagen:"

4359

4193 -#: wt-status.c:282

4360 +#: wt-status.c:280

4361 msgid "modified:"

4362 msgstr "ändrad:"

4363

4197 -#: wt-status.c:284

4364 +#: wt-status.c:282

4365 msgid "renamed:"

4366 msgstr "namnbytt:"

4367

4201 -#: wt-status.c:286

4368 +#: wt-status.c:284

4369 msgid "typechange:"

4370 msgstr "typbyte:"

4371

4205 -#: wt-status.c:288

4372 +#: wt-status.c:286

4373 msgid "unknown:"

4374 msgstr "okänd:"

4375

4209 -#: wt-status.c:290

4376 +#: wt-status.c:288

4377 msgid "unmerged:"

4378 msgstr "osammanslagen:"

4379

4213 -#: wt-status.c:372

4380 +#: wt-status.c:370

4381 msgid "new commits, "

4382 msgstr "nya incheckningar, "

4383

4217 -#: wt-status.c:374

4384 +#: wt-status.c:372

4385 msgid "modified content, "

4386 msgstr "ändrat innehåll, "

4387

4221 -#: wt-status.c:376

4388 +#: wt-status.c:374

4389 msgid "untracked content, "

4390 msgstr "ospårat innehåll, "

4391

4225 -#: wt-status.c:821

4392 +#: wt-status.c:819

4393 #, c-format

4394 msgid "Your stash currently has %d entry"

4395 msgid_plural "Your stash currently has %d entries"

4396 msgstr[0] "Stashen innehåller just nu %d post"

4397 msgstr[1] "Stashen innehåller just nu %d poster"

4398

4232 -#: wt-status.c:853

4399 +#: wt-status.c:851

4400 msgid "Submodules changed but not updated:"

4401 msgstr "Undermoduler ändrade men inte uppdaterade:"

4402

4236 -#: wt-status.c:855

4403 +#: wt-status.c:853

4404 msgid "Submodule changes to be committed:"

4405 msgstr "Undermodulers ändringar att checka in:"

4406

4240 -#: wt-status.c:937

4407 +#: wt-status.c:935

4408 msgid ""

4242 -"Do not touch the line above.\n"

4243 -"Everything below will be removed."

4409 +"Do not modify or remove the line above.\n"

4410 +"Everything below it will be ignored."

4411 msgstr ""

4245 -"Rör inte raden ovan.\n"

4246 -"Allt nedan kommer tas bort."

4412 +"Raden ovan får inte ändras eller tas bort.\n"

4413 +"Allt under den kommer tas bort."

4414

4248 -#: wt-status.c:1049

4415 +#: wt-status.c:1048

4416 msgid "You have unmerged paths."

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

4418

4252 -#: wt-status.c:1052

4419 +#: wt-status.c:1051

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

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

4422

4256 -#: wt-status.c:1054

4423 +#: wt-status.c:1053

4424 msgid " (use \"git merge --abort\" to abort the merge)"

4425 msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"

4426

4260 -#: wt-status.c:1059

4427 +#: wt-status.c:1058

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

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

4430

4264 -#: wt-status.c:1062

4431 +#: wt-status.c:1061

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

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

4434

4268 -#: wt-status.c:1072

4435 +#: wt-status.c:1071

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

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

4438

4272 -#: wt-status.c:1075

4439 +#: wt-status.c:1074

4440 msgid "The current patch is empty."

4441 msgstr "Aktuell patch är tom."

4442

4276 -#: wt-status.c:1079

4443 +#: wt-status.c:1078

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

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

4446

4280 -#: wt-status.c:1081

4447 +#: wt-status.c:1080

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

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

4450

4284 -#: wt-status.c:1083

4451 +#: wt-status.c:1082

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

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

4454

@@ -4574,7 +4741,7 @@ msgstr "dessutom innehåller dit index ändringar som inte har checkats in."

4741 msgid "cannot %s: Your index contains uncommitted changes."

4742 msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."

4743

4577 -#: compat/precompose_utf8.c:58 builtin/clone.c:436

4744 +#: compat/precompose_utf8.c:58 builtin/clone.c:437

4745 #, c-format

4746 msgid "failed to unlink '%s'"

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

@@ -4588,7 +4755,7 @@ msgstr "git add [<flaggor>] [--] <sökväg>..."

4755 msgid "unexpected diff status %c"

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

4757

4591 -#: builtin/add.c:87 builtin/commit.c:292

4758 +#: builtin/add.c:87 builtin/commit.c:291

4759 msgid "updating files failed"

4760 msgstr "misslyckades uppdatera filer"

4761

@@ -4597,108 +4764,108 @@ msgstr "misslyckades uppdatera filer"

4764 msgid "remove '%s'\n"

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

4766

4600 -#: builtin/add.c:151

4767 +#: builtin/add.c:153

4768 msgid "Unstaged changes after refreshing the index:"

4769 msgstr "Oköade ändringar efter att ha uppdaterat indexet:"

4770

4604 -#: builtin/add.c:211 builtin/rev-parse.c:873

4771 +#: builtin/add.c:213 builtin/rev-parse.c:888

4772 msgid "Could not read the index"

4773 msgstr "Kunde inte läsa indexet"

4774

4608 -#: builtin/add.c:222

4775 +#: builtin/add.c:224

4776 #, c-format

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

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

4779

4613 -#: builtin/add.c:226

4780 +#: builtin/add.c:228

4781 msgid "Could not write patch"

4782 msgstr "Kunde inte skriva patch"

4783

4617 -#: builtin/add.c:229

4784 +#: builtin/add.c:231

4785 msgid "editing patch failed"

4786 msgstr "redigering av patch misslyckades"

4787

4621 -#: builtin/add.c:232

4788 +#: builtin/add.c:234

4789 #, c-format

4790 msgid "Could not stat '%s'"

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

4792

4626 -#: builtin/add.c:234

4793 +#: builtin/add.c:236

4794 msgid "Empty patch. Aborted."

4795 msgstr "Tom patch. Avbryter."

4796

4630 -#: builtin/add.c:239

4797 +#: builtin/add.c:241

4798 #, c-format

4799 msgid "Could not apply '%s'"

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

4801

4635 -#: builtin/add.c:249

4802 +#: builtin/add.c:251

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

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

4805

4639 -#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124

4806 +#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124

4807 #: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529

4641 -#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164

4808 +#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164

4809 msgid "dry run"

4810 msgstr "testkörning"

4811

4645 -#: builtin/add.c:272

4812 +#: builtin/add.c:274

4813 msgid "interactive picking"

4814 msgstr "plocka interaktivt"

4815

4649 -#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299

4816 +#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310

4817 msgid "select hunks interactively"

4818 msgstr "välj stycken interaktivt"

4819

4653 -#: builtin/add.c:274

4820 +#: builtin/add.c:276

4821 msgid "edit current diff and apply"

4822 msgstr "redigera aktuell diff och applicera"

4823

4657 -#: builtin/add.c:275

4824 +#: builtin/add.c:277

4825 msgid "allow adding otherwise ignored files"

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

4827

4661 -#: builtin/add.c:276

4828 +#: builtin/add.c:278

4829 msgid "update tracked files"

4830 msgstr "uppdatera spårade filer"

4831

4665 -#: builtin/add.c:277

4832 +#: builtin/add.c:279

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

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

4835

4669 -#: builtin/add.c:278

4836 +#: builtin/add.c:280

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

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

4839

4673 -#: builtin/add.c:281

4840 +#: builtin/add.c:283

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

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

4843

4677 -#: builtin/add.c:283

4844 +#: builtin/add.c:285

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

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

4847

4681 -#: builtin/add.c:284

4848 +#: builtin/add.c:286

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

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

4851

4685 -#: builtin/add.c:285

4852 +#: builtin/add.c:287

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

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

4855

4689 -#: builtin/add.c:286 builtin/update-index.c:952

4856 +#: builtin/add.c:288 builtin/update-index.c:954

4857 msgid "(+/-)x"

4858 msgstr "(+/-)x"

4859

4693 -#: builtin/add.c:286 builtin/update-index.c:953

4860 +#: builtin/add.c:288 builtin/update-index.c:955

4861 msgid "override the executable bit of the listed files"

4862 msgstr "överstyr exekveringsbiten för angivna filer"

4863

4697 -#: builtin/add.c:288

4864 +#: builtin/add.c:290

4865 msgid "warn when adding an embedded repository"

4866 msgstr "varna när ett inbyggt arkiv läggs till"

4867

4701 -#: builtin/add.c:303

4868 +#: builtin/add.c:305

4869 #, c-format

4870 msgid ""

4871 "You've added another git repository inside your current repository.\n"

@@ -4729,152 +4896,152 @@ msgstr ""

4896 "\n"

4897 "Se ”git help submodule” för ytterligare information."

4898

4732 -#: builtin/add.c:331

4899 +#: builtin/add.c:333

4900 #, c-format

4901 msgid "adding embedded git repository: %s"

4902 msgstr "lägger till inbäddat git-arkiv: %s"

4903

4737 -#: builtin/add.c:349

4904 +#: builtin/add.c:351

4905 #, c-format

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

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

4908

4742 -#: builtin/add.c:357

4909 +#: builtin/add.c:359

4910 msgid "adding files failed"

4911 msgstr "misslyckades lägga till filer"

4912

4746 -#: builtin/add.c:394

4913 +#: builtin/add.c:396

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

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

4916

4750 -#: builtin/add.c:401

4917 +#: builtin/add.c:403

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

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

4920

4754 -#: builtin/add.c:405

4921 +#: builtin/add.c:407

4922 #, c-format

4923 msgid "--chmod param '%s' must be either -x or +x"

4924 msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"

4925

4759 -#: builtin/add.c:420

4926 +#: builtin/add.c:422

4927 #, c-format

4928 msgid "Nothing specified, nothing added.\n"

4929 msgstr "Inget angivet, inget tillagt.\n"

4930

4764 -#: builtin/add.c:421

4931 +#: builtin/add.c:423

4932 #, c-format

4933 msgid "Maybe you wanted to say 'git add .'?\n"

4934 msgstr "Kanske menade du att skriva \"git add .\"?\n"

4935

4769 -#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282

4770 -#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351

4771 -#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272

4772 -#: builtin/submodule--helper.c:244

4936 +#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282

4937 +#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350

4938 +#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271

4939 +#: builtin/submodule--helper.c:243

4940 msgid "index file corrupt"

4941 msgstr "indexfilen trasig"

4942

4776 -#: builtin/am.c:413

4943 +#: builtin/am.c:414

4944 msgid "could not parse author script"

4945 msgstr "kunde inte tolka författarskript"

4946

4780 -#: builtin/am.c:489

4947 +#: builtin/am.c:498

4948 #, c-format

4949 msgid "'%s' was deleted by the applypatch-msg hook"

4950 msgstr "\"%s\" togs bort av kroken applypatch-msg"

4951

4785 -#: builtin/am.c:530

4952 +#: builtin/am.c:539

4953 #, c-format

4954 msgid "Malformed input line: '%s'."

4955 msgstr "Felaktig indatarad: \"%s\"."

4956

4790 -#: builtin/am.c:567

4957 +#: builtin/am.c:576

4958 #, c-format

4959 msgid "Failed to copy notes from '%s' to '%s'"

4960 msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""

4961

4795 -#: builtin/am.c:593

4962 +#: builtin/am.c:602

4963 msgid "fseek failed"

4964 msgstr "\"fseek\" misslyckades"

4965

4799 -#: builtin/am.c:777

4966 +#: builtin/am.c:786

4967 #, c-format

4968 msgid "could not parse patch '%s'"

4969 msgstr "kunde inte tolka patchen \"%s\""

4970

4804 -#: builtin/am.c:842

4971 +#: builtin/am.c:851

4972 msgid "Only one StGIT patch series can be applied at once"

4973 msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"

4974

4808 -#: builtin/am.c:889

4975 +#: builtin/am.c:899

4976 msgid "invalid timestamp"

4977 msgstr "ogiltig tidsstämpel"

4978

4812 -#: builtin/am.c:892 builtin/am.c:900

4979 +#: builtin/am.c:904 builtin/am.c:916

4980 msgid "invalid Date line"

4981 msgstr "ogiltig \"Date\"-rad"

4982

4816 -#: builtin/am.c:897

4983 +#: builtin/am.c:911

4984 msgid "invalid timezone offset"

4985 msgstr "ogiltig tidszons-offset"

4986

4820 -#: builtin/am.c:986

4987 +#: builtin/am.c:1004

4988 msgid "Patch format detection failed."

4989 msgstr "Misslyckades detektera patchformat."

4990

4824 -#: builtin/am.c:991 builtin/clone.c:401

4991 +#: builtin/am.c:1009 builtin/clone.c:402

4992 #, c-format

4993 msgid "failed to create directory '%s'"

4994 msgstr "misslyckades skapa katalogen \"%s\""

4995

4829 -#: builtin/am.c:995

4996 +#: builtin/am.c:1013

4997 msgid "Failed to split patches."

4998 msgstr "Misslyckades dela patchar."

4999

4833 -#: builtin/am.c:1120 builtin/commit.c:377

5000 +#: builtin/am.c:1142 builtin/commit.c:376

5001 msgid "unable to write index file"

5002 msgstr "kan inte skriva indexfil"

5003

4837 -#: builtin/am.c:1171

5004 +#: builtin/am.c:1193

5005 #, c-format

5006 msgid "When you have resolved this problem, run \"%s --continue\"."

5007 msgstr "När du har löst problemet, kör \"%s --continue\"."

5008

4842 -#: builtin/am.c:1172

5009 +#: builtin/am.c:1194

5010 #, c-format

5011 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

5012 msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."

5013

4847 -#: builtin/am.c:1173

5014 +#: builtin/am.c:1195

5015 #, c-format

5016 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

5017 msgstr ""

5018 "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."

5019

4853 -#: builtin/am.c:1304

5020 +#: builtin/am.c:1302

5021 msgid "Patch is empty."

5022 msgstr "Patchen är tom."

5023

4857 -#: builtin/am.c:1370

5024 +#: builtin/am.c:1368

5025 #, c-format

5026 msgid "invalid ident line: %.*s"

5027 msgstr "ogiltig ident-rad: %.*s"

5028

4862 -#: builtin/am.c:1392

5029 +#: builtin/am.c:1390

5030 #, c-format

5031 msgid "unable to parse commit %s"

5032 msgstr "kunde inte tolka incheckningen %s"

5033

4867 -#: builtin/am.c:1586

5034 +#: builtin/am.c:1584

5035 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

5036 msgstr ""

5037 "Arkivet saknar objekt som behövs för att falla tillbaka på 3-"

5038 "vägssammanslagning."

5039

4873 -#: builtin/am.c:1588

5040 +#: builtin/am.c:1586

5041 msgid "Using index info to reconstruct a base tree..."

5042 msgstr "Använder indexinfo för att återskapa ett basträd..."

5043

4877 -#: builtin/am.c:1607

5044 +#: builtin/am.c:1605

5045 msgid ""

5046 "Did you hand edit your patch?\n"

5047 "It does not apply to blobs recorded in its index."

@@ -4882,39 +5049,39 @@ msgstr ""

5049 "Har du handredigerat din patch?\n"

5050 "Den kan inte tillämpas på blobbar som antecknats i dess index."

5051

4885 -#: builtin/am.c:1613

5052 +#: builtin/am.c:1611

5053 msgid "Falling back to patching base and 3-way merge..."

5054 msgstr ""

5055 "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."

5056

4890 -#: builtin/am.c:1638

5057 +#: builtin/am.c:1636

5058 msgid "Failed to merge in the changes."

5059 msgstr "Misslyckades slå ihop ändringarna."

5060

4894 -#: builtin/am.c:1662 builtin/merge.c:632

5061 +#: builtin/am.c:1660 builtin/merge.c:641

5062 msgid "git write-tree failed to write a tree"

5063 msgstr "git write-tree misslyckades skriva ett träd"

5064

4898 -#: builtin/am.c:1669

5065 +#: builtin/am.c:1667

5066 msgid "applying to an empty history"

5067 msgstr "tillämpar på en tom historik"

5068

4902 -#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803

4903 -#: builtin/merge.c:828

5069 +#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824

5070 +#: builtin/merge.c:849

5071 msgid "failed to write commit object"

5072 msgstr "kunde inte skriva incheckningsobjekt"

5073

4907 -#: builtin/am.c:1715 builtin/am.c:1719

5074 +#: builtin/am.c:1713 builtin/am.c:1717

5075 #, c-format

5076 msgid "cannot resume: %s does not exist."

5077 msgstr "kan inte återuppta: %s finns inte."

5078

4912 -#: builtin/am.c:1735

5079 +#: builtin/am.c:1733

5080 msgid "cannot be interactive without stdin connected to a terminal."

5081 msgstr ""

5082 "kan inte vara interaktiv om standard in inte är ansluten till en terminal."

5083

4917 -#: builtin/am.c:1740

5084 +#: builtin/am.c:1738

5085 msgid "Commit Body is:"

5086 msgstr "Incheckningskroppen är:"

5087

@@ -4922,35 +5089,35 @@ msgstr "Incheckningskroppen är:"

5089 #. in your translation. The program will only accept English

5090 #. input at this point.

5091 #.

4925 -#: builtin/am.c:1750

5092 +#: builtin/am.c:1748

5093 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

5094 msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "

5095

4929 -#: builtin/am.c:1800

5096 +#: builtin/am.c:1798

5097 #, c-format

5098 msgid "Dirty index: cannot apply patches (dirty: %s)"

5099 msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"

5100

4934 -#: builtin/am.c:1840 builtin/am.c:1912

5101 +#: builtin/am.c:1838 builtin/am.c:1910

5102 #, c-format

5103 msgid "Applying: %.*s"

5104 msgstr "Tillämpar: %.*s"

5105

4939 -#: builtin/am.c:1856

5106 +#: builtin/am.c:1854

5107 msgid "No changes -- Patch already applied."

5108 msgstr "Inga ändringar -- Patchen har redan tillämpats."

5109

4943 -#: builtin/am.c:1864

5110 +#: builtin/am.c:1862

5111 #, c-format

5112 msgid "Patch failed at %s %.*s"

5113 msgstr "Patch misslyckades på %s %.*s"

5114

4948 -#: builtin/am.c:1870

5115 +#: builtin/am.c:1868

5116 #, c-format

5117 msgid "The copy of the patch that failed is found in: %s"

5118 msgstr "En kopia av patchen som misslyckades finns i: %s"

5119

4953 -#: builtin/am.c:1915

5120 +#: builtin/am.c:1913

5121 msgid ""

5122 "No changes - did you forget to use 'git add'?\n"

5123 "If there is nothing left to stage, chances are that something else\n"

@@ -4960,7 +5127,7 @@ msgstr ""

5127 "Om det inte är något kvar att köa kan det hända att något annat redan\n"

5128 "introducerat samma ändringar; kanske du bör hoppa över patchen."

5129

4963 -#: builtin/am.c:1922

5130 +#: builtin/am.c:1920

5131 msgid ""

5132 "You still have unmerged paths in your index.\n"

5133 "You should 'git add' each file with resolved conflicts to mark them as "

@@ -4972,17 +5139,17 @@ msgstr ""

5139 "lösta.\n"

5140 "Du kan köra ”git rm” för att godta ”borttagen av dem” för den."

5141

4975 -#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323

4976 -#: builtin/reset.c:331

5142 +#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332

5143 +#: builtin/reset.c:340

5144 #, c-format

5145 msgid "Could not parse object '%s'."

5146 msgstr "Kan inte tolka objektet ”%s”."

5147

4981 -#: builtin/am.c:2083

5148 +#: builtin/am.c:2081

5149 msgid "failed to clean index"

5150 msgstr "misslyckades städa upp indexet"

5151

4985 -#: builtin/am.c:2117

5152 +#: builtin/am.c:2116

5153 msgid ""

5154 "You seem to have moved HEAD since the last 'am' failure.\n"

5155 "Not rewinding to ORIG_HEAD"

@@ -4990,134 +5157,133 @@ msgstr ""

5157 "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"

5158 "Återställer inte till ORIG_HEAD"

5159

4993 -#: builtin/am.c:2180

5160 +#: builtin/am.c:2179

5161 #, c-format

5162 msgid "Invalid value for --patch-format: %s"

5163 msgstr "Felaktigt värde för --patch-format: %s"

5164

4998 -#: builtin/am.c:2213

5165 +#: builtin/am.c:2212

5166 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"

5167 msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"

5168

5002 -#: builtin/am.c:2214

5169 +#: builtin/am.c:2213

5170 msgid "git am [<options>] (--continue | --skip | --abort)"

5171 msgstr "git am [<flaggor>] (--continue | --skip | --abort)"

5172

5006 -#: builtin/am.c:2220

5173 +#: builtin/am.c:2219

5174 msgid "run interactively"

5175 msgstr "kör interaktivt"

5176

5010 -#: builtin/am.c:2222

5177 +#: builtin/am.c:2221

5178 msgid "historical option -- no-op"

5179 msgstr "historisk flagga -- no-op"

5180

5014 -#: builtin/am.c:2224

5181 +#: builtin/am.c:2223

5182 msgid "allow fall back on 3way merging if needed"

5183 msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"

5184

5018 -#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57

5185 +#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57

5186 #: builtin/repack.c:180

5187 msgid "be quiet"

5188 msgstr "var tyst"

5189

5023 -#: builtin/am.c:2227

5190 +#: builtin/am.c:2226

5191 msgid "add a Signed-off-by line to the commit message"

5192 msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"

5193

5027 -#: builtin/am.c:2230

5194 +#: builtin/am.c:2229

5195 msgid "recode into utf8 (default)"

5196 msgstr "koda om till utf8 (standard)"

5197

5031 -#: builtin/am.c:2232

5198 +#: builtin/am.c:2231

5199 msgid "pass -k flag to git-mailinfo"

5200 msgstr "sänd flaggan -k till git-mailinfo"

5201

5035 -#: builtin/am.c:2234

5202 +#: builtin/am.c:2233

5203 msgid "pass -b flag to git-mailinfo"

5204 msgstr "sänd flaggan -b till git-mailinfo"

5205

5039 -#: builtin/am.c:2236

5206 +#: builtin/am.c:2235

5207 msgid "pass -m flag to git-mailinfo"

5208 msgstr "sänd flaggan -m till git-mailinfo"

5209

5043 -#: builtin/am.c:2238

5210 +#: builtin/am.c:2237

5211 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

5212 msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"

5213

5047 -#: builtin/am.c:2241

5214 +#: builtin/am.c:2240

5215 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

5216 msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"

5217

5051 -#: builtin/am.c:2244

5218 +#: builtin/am.c:2243

5219 msgid "strip everything before a scissors line"

5220 msgstr "ta bort allting före en saxlinje"

5221

5055 -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255

5056 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267

5057 -#: builtin/am.c:2273

5222 +#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254

5223 +#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266

5224 +#: builtin/am.c:2272

5225 msgid "pass it through git-apply"

5226 msgstr "sänd det genom git-apply"

5227

5061 -#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666

5062 -#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142

5063 -#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193

5064 -#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169

5065 -#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134

5066 -#: parse-options.h:245

5228 +#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667

5229 +#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197

5230 +#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195

5231 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377

5232 +#: parse-options.h:132 parse-options.h:134 parse-options.h:245

5233 msgid "n"

5234 msgstr "n"

5235

5070 -#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38

5071 -#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39

5236 +#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38

5237 +#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39

5238 msgid "format"

5239 msgstr "format"

5240

5075 -#: builtin/am.c:2270

5241 +#: builtin/am.c:2269

5242 msgid "format the patch(es) are in"

5243 msgstr "format för patch(ar)"

5244

5079 -#: builtin/am.c:2276

5245 +#: builtin/am.c:2275

5246 msgid "override error message when patch failure occurs"

5247 msgstr "överstyr felmeddelanden när patchfel uppstår"

5248

5083 -#: builtin/am.c:2278

5249 +#: builtin/am.c:2277

5250 msgid "continue applying patches after resolving a conflict"

5251 msgstr "fortsätt applicera patchar efter att ha löst en konflikt"

5252

5087 -#: builtin/am.c:2281

5253 +#: builtin/am.c:2280

5254 msgid "synonyms for --continue"

5255 msgstr "synonymer till --continue"

5256

5091 -#: builtin/am.c:2284

5257 +#: builtin/am.c:2283

5258 msgid "skip the current patch"

5259 msgstr "hoppa över den aktuella grenen"

5260

5095 -#: builtin/am.c:2287

5261 +#: builtin/am.c:2286

5262 msgid "restore the original branch and abort the patching operation."

5263 msgstr "återställ originalgrenen och avbryt patchningen."

5264

5099 -#: builtin/am.c:2291

5265 +#: builtin/am.c:2290

5266 msgid "lie about committer date"

5267 msgstr "ljug om incheckningsdatum"

5268

5103 -#: builtin/am.c:2293

5269 +#: builtin/am.c:2292

5270 msgid "use current timestamp for author date"

5271 msgstr "använd nuvarande tidsstämpel för författardatum"

5272

5107 -#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233

5108 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414

5273 +#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236

5274 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392

5275 msgid "key-id"

5276 msgstr "nyckel-id"

5277

5112 -#: builtin/am.c:2296

5278 +#: builtin/am.c:2295

5279 msgid "GPG-sign commits"

5280 msgstr "GPG-signera incheckningar"

5281

5116 -#: builtin/am.c:2299

5282 +#: builtin/am.c:2298

5283 msgid "(internal use for git-rebase)"

5284 msgstr "(används internt av git-rebase)"

5285

5120 -#: builtin/am.c:2317

5286 +#: builtin/am.c:2316

5287 msgid ""

5288 "The -b/--binary option has been a no-op for long time, and\n"

5289 "it will be removed. Please do not use it anymore."

@@ -5125,16 +5291,16 @@ msgstr ""

5291 "Flaggan -b/--binary har varit utan funktion länge, och\n"

5292 "kommer tas bort. Vi ber dig att inte använda den längre."

5293

5128 -#: builtin/am.c:2324

5294 +#: builtin/am.c:2323

5295 msgid "failed to read the index"

5296 msgstr "misslyckades läsa indexet"

5297

5132 -#: builtin/am.c:2339

5298 +#: builtin/am.c:2338

5299 #, c-format

5300 msgid "previous rebase directory %s still exists but mbox given."

5301 msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."

5302

5137 -#: builtin/am.c:2363

5303 +#: builtin/am.c:2362

5304 #, c-format

5305 msgid ""

5306 "Stray %s directory found.\n"

@@ -5143,7 +5309,7 @@ msgstr ""

5309 "Kvarbliven katalog %s hittades.\n"

5310 "Använd \"git am --abort\" för att ta bort den."

5311

5146 -#: builtin/am.c:2369

5312 +#: builtin/am.c:2368

5313 msgid "Resolve operation not in progress, we are not resuming."

5314 msgstr "Lösningsoperation pågår inte, vi återupptar inte."

5315

@@ -5345,14 +5511,18 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

5511 msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>"

5512

5513 #: builtin/branch.c:31

5514 +msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"

5515 +msgstr "git branch [<flaggor>] (-c | -C) [<gammal_gren>] <ny_gren>"

5516 +

5517 +#: builtin/branch.c:32

5518 msgid "git branch [<options>] [-r | -a] [--points-at]"

5519 msgstr "git branch [<flaggor>] [-r | -a] [--points-at]"

5520

5351 -#: builtin/branch.c:32

5521 +#: builtin/branch.c:33

5522 msgid "git branch [<options>] [-r | -a] [--format]"

5523 msgstr "git branch [<flaggor>] [-r | -a] [--format]"

5524

5355 -#: builtin/branch.c:145

5525 +#: builtin/branch.c:146

5526 #, c-format

5527 msgid ""

5528 "deleting branch '%s' that has been merged to\n"

@@ -5361,7 +5531,7 @@ msgstr ""

5531 "tar bort grenen \"%s\" som har slagits ihop med\n"

5532 " \"%s\", men ännu inte slagits ihop med HEAD."

5533

5364 -#: builtin/branch.c:149

5534 +#: builtin/branch.c:150

5535 #, c-format

5536 msgid ""

5537 "not deleting branch '%s' that is not yet merged to\n"

@@ -5370,12 +5540,12 @@ msgstr ""

5540 "tar inte bort grenen \"%s\" som inte har slagits ihop med\n"

5541 " \"%s\", trots att den har slagits ihop med HEAD."

5542

5373 -#: builtin/branch.c:163

5543 +#: builtin/branch.c:164

5544 #, c-format

5545 msgid "Couldn't look up commit object for '%s'"

5546 msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""

5547

5378 -#: builtin/branch.c:167

5548 +#: builtin/branch.c:168

5549 #, c-format

5550 msgid ""

5551 "The branch '%s' is not fully merged.\n"

@@ -5384,92 +5554,113 @@ msgstr ""

5554 "Grenen \"%s\" har inte slagits samman i sin helhet.\n"

5555 "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."

5556

5387 -#: builtin/branch.c:180

5557 +#: builtin/branch.c:181

5558 msgid "Update of config-file failed"

5559 msgstr "Misslyckades uppdatera konfigurationsfil"

5560

5391 -#: builtin/branch.c:211

5561 +#: builtin/branch.c:212

5562 msgid "cannot use -a with -d"

5563 msgstr "kan inte ange -a med -d"

5564

5395 -#: builtin/branch.c:217

5565 +#: builtin/branch.c:218

5566 msgid "Couldn't look up commit object for HEAD"

5567 msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"

5568

5399 -#: builtin/branch.c:231

5569 +#: builtin/branch.c:232

5570 #, c-format

5571 msgid "Cannot delete branch '%s' checked out at '%s'"

5572 msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\""

l10n: sv.po: Update Swedish translation (3245t0f0u)