f32ab4e3c9 · matheusbsbs/matheus-bagliano

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2020-05-27 07:23+0800\n"

11 -"PO-Revision-Date: 2020-05-27 07:40+0100\n"

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

11 +"PO-Revision-Date: 2020-07-11 17:50+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"

@@ -111,21 +111,21 @@ msgstr[1] "lade till %d sökvägar\n"

111 msgid "ignoring unmerged: %s"

112 msgstr "ignorerar ej sammanslagen: %s"

113

114 -#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366

114 +#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368

115 #, c-format

116 msgid "Only binary files changed.\n"

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

118

119 -#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368

119 +#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370

120 #, c-format

121 msgid "No changes.\n"

122 msgstr "Inga ändringar.\n"

123

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

124 +#: add-interactive.c:935 git-add--interactive.perl:1378

125 msgid "Patch update"

126 msgstr "Uppdatera patch"

127

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

128 +#: add-interactive.c:974 git-add--interactive.perl:1771

129 msgid "Review diff"

130 msgstr "Granska diff"

131

@@ -193,11 +193,11 @@ msgstr "markera en numrerad post"

193 msgid "(empty) select nothing"

194 msgstr "(tomt) markera ingenting"

195

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

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

197 msgid "*** Commands ***"

198 msgstr "*** Kommandon ***"

199

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

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

201 msgid "What now"

202 msgstr "Vad nu"

203

@@ -214,7 +214,7 @@ msgstr "ej köad"

214 #: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409

215 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397

216 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905

217 -#: builtin/submodule--helper.c:2148 bugreport.c:129

217 +#: builtin/submodule--helper.c:2148 bugreport.c:135

218 #: git-add--interactive.perl:213

219 msgid "path"

220 msgstr "sökväg"

@@ -223,27 +223,32 @@ msgstr "sökväg"

223 msgid "could not refresh index"

224 msgstr "kunde inte uppdatera indexet"

225

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

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

227 #, c-format

228 msgid "Bye.\n"

229 msgstr "Hej då.\n"

230

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

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

232 #, c-format, perl-format

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

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

235

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

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

237 #, c-format, perl-format

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

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

240

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

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

242 +#, c-format, perl-format

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

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

245 +

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

247 #, c-format, perl-format

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

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

250

246 -#: add-patch.c:38

251 +#: add-patch.c:39

252 msgid ""

253 "If the patch applies cleanly, the edited hunk will immediately be marked for "

254 "staging."

@@ -251,7 +256,7 @@ msgstr ""

256 "Om patchen kan appliceras rent kommer det redigerade stycket att köas "

257 "omedelbart."

258

254 -#: add-patch.c:41

259 +#: add-patch.c:42

260 msgid ""

261 "y - stage this hunk\n"

262 "n - do not stage this hunk\n"

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

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

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

272

268 -#: add-patch.c:55 git-add--interactive.perl:1433

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

274 #, c-format, perl-format

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

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

277

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

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

279 #, c-format, perl-format

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

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

282

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

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

284 +#, c-format, perl-format

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

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

287 +

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

289 #, c-format, perl-format

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

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

292

283 -#: add-patch.c:59

293 +#: add-patch.c:61

294 msgid ""

295 "If the patch applies cleanly, the edited hunk will immediately be marked for "

296 "stashing."

@@ -288,7 +298,7 @@ msgstr ""

298 "Om patchen kan appliceras rent kommer det redigerade stycket att läggas till "

299 "i \"stash\" omedelbart."

300

291 -#: add-patch.c:62

301 +#: add-patch.c:64

302 msgid ""

303 "y - stash this hunk\n"

304 "n - do not stash this hunk\n"

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

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

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

314

305 -#: add-patch.c:78 git-add--interactive.perl:1438

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

316 #, c-format, perl-format

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

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

319

310 -#: add-patch.c:79 git-add--interactive.perl:1439

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

321 #, c-format, perl-format

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

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

324

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

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

326 +#, c-format, perl-format

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

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

329 +

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

331 #, c-format, perl-format

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

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

334

320 -#: add-patch.c:82

335 +#: add-patch.c:85

336 msgid ""

337 "If the patch applies cleanly, the edited hunk will immediately be marked for "

338 "unstaging."

@@ -325,7 +340,7 @@ msgstr ""

340 "Om patchen kan appliceras rent kommer det redigerade stycket att tas bort "

341 "från kön omedelbart."

342

328 -#: add-patch.c:85

343 +#: add-patch.c:88

344 msgid ""

345 "y - unstage this hunk\n"

346 "n - do not unstage this hunk\n"

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

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

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

356

342 -#: add-patch.c:100 git-add--interactive.perl:1443

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

358 #, c-format, perl-format

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

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

361

347 -#: add-patch.c:101 git-add--interactive.perl:1444

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

363 #, c-format, perl-format

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

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

366

352 -#: add-patch.c:102 git-add--interactive.perl:1445

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

368 +#, c-format, perl-format

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

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

371 +

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

373 #, c-format, perl-format

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

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

376

357 -#: add-patch.c:104 add-patch.c:169 add-patch.c:212

377 +#: add-patch.c:108 add-patch.c:176 add-patch.c:221

378 msgid ""

379 "If the patch applies cleanly, the edited hunk will immediately be marked for "

380 "applying."

@@ -362,7 +382,7 @@ msgstr ""

382 "Om patchen kan appliceras rent kommer det redigerade stycket att markeras "

383 "för applicering omedelbart."

384

365 -#: add-patch.c:107

385 +#: add-patch.c:111

386 msgid ""

387 "y - apply this hunk to index\n"

388 "n - do not apply this hunk to index\n"

@@ -376,25 +396,31 @@ msgstr ""

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

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

398

379 -#: add-patch.c:122 git-add--interactive.perl:1448

380 -#: git-add--interactive.perl:1463

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

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

401 #, c-format, perl-format

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

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

404

385 -#: add-patch.c:123 git-add--interactive.perl:1449

386 -#: git-add--interactive.perl:1464

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

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

407 #, c-format, perl-format

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

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

410

391 -#: add-patch.c:124 git-add--interactive.perl:1450

392 -#: git-add--interactive.perl:1465

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

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

413 +#, c-format, perl-format

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

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

416 +

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

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

419 #, c-format, perl-format

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

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

422

397 -#: add-patch.c:126 add-patch.c:148 add-patch.c:191

423 +#: add-patch.c:131 add-patch.c:154 add-patch.c:199

424 msgid ""

425 "If the patch applies cleanly, the edited hunk will immediately be marked for "

426 "discarding."

@@ -402,7 +428,7 @@ msgstr ""

428 "Om patchen kan appliceras rent kommer det redigerade stycket att markeras "

429 "för kasta omedelbart."

430

405 -#: add-patch.c:129 add-patch.c:194

431 +#: add-patch.c:134 add-patch.c:202

432 msgid ""

433 "y - discard this hunk from worktree\n"

434 "n - do not discard this hunk from worktree\n"

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

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

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

444

419 -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453

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

446 #, c-format, perl-format

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

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

449

424 -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454

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

451 #, c-format, perl-format

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

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

454

429 -#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455

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

456 +#, c-format, perl-format

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

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

459 +

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

461 #, c-format, perl-format

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

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

464

434 -#: add-patch.c:151

465 +#: add-patch.c:157

466 msgid ""

467 "y - discard this hunk from index and worktree\n"

468 "n - do not discard this hunk from index and worktree\n"

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

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

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

478

448 -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458

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

480 #, c-format, perl-format

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

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

483

453 -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459

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

485 #, c-format, perl-format

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

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

488

458 -#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460

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

490 +#, c-format, perl-format

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

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

493 +

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

495 #, c-format, perl-format

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

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

498

463 -#: add-patch.c:172

499 +#: add-patch.c:179

500 msgid ""

501 "y - apply this hunk to index and worktree\n"

502 "n - do not apply this hunk to index and worktree\n"

@@ -474,7 +510,7 @@ msgstr ""

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

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

512

477 -#: add-patch.c:215

513 +#: add-patch.c:224

514 msgid ""

515 "y - apply this hunk to worktree\n"

516 "n - do not apply this hunk to worktree\n"

@@ -488,34 +524,34 @@ msgstr ""

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

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

526

491 -#: add-patch.c:319

527 +#: add-patch.c:328

528 #, c-format

529 msgid "could not parse hunk header '%.*s'"

530 msgstr "kunde inte tolka styckehuvudet \"%.*s\""

531

496 -#: add-patch.c:338 add-patch.c:342

532 +#: add-patch.c:347 add-patch.c:351

533 #, c-format

534 msgid "could not parse colored hunk header '%.*s'"

535 msgstr "kunde inte tolka färgat styckehuvud \"%.*s\""

536

501 -#: add-patch.c:396

537 +#: add-patch.c:405

538 msgid "could not parse diff"

539 msgstr "kunde inte tolka diff"

540

505 -#: add-patch.c:415

541 +#: add-patch.c:424

542 msgid "could not parse colored diff"

543 msgstr "kunde inte tolka färgad diff"

544

509 -#: add-patch.c:429

545 +#: add-patch.c:438

546 #, c-format

547 msgid "failed to run '%s'"

548 msgstr "misslyckades att köra \"%s\""

549

514 -#: add-patch.c:588

550 +#: add-patch.c:602

551 msgid "mismatched output from interactive.diffFilter"

552 msgstr "omaka utdata från interactive.diffFilter"

553

518 -#: add-patch.c:589

554 +#: add-patch.c:603

555 msgid ""

556 "Your filter must maintain a one-to-one correspondence\n"

557 "between its input and output lines."

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

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

560 "ditt filter."

561

526 -#: add-patch.c:762

562 +#: add-patch.c:776

563 #, c-format

564 msgid ""

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

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

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

569 "%.*s"

570

535 -#: add-patch.c:777

571 +#: add-patch.c:791

572 #, c-format

573 msgid ""

574 "hunks do not overlap:\n"

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

581 "\tavslutas inte med:\n"

582 "%.*s"

583

548 -#: add-patch.c:1053 git-add--interactive.perl:1112

584 +#: add-patch.c:1067 git-add--interactive.perl:1114

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

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

587

552 -#: add-patch.c:1057

588 +#: add-patch.c:1071

589 #, c-format

590 msgid ""

591 "---\n"

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

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

600

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

566 -#: add-patch.c:1071 git-add--interactive.perl:1126

602 +#: add-patch.c:1085 git-add--interactive.perl:1128

603 msgid ""

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

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

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

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

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

611

576 -#: add-patch.c:1104

612 +#: add-patch.c:1118

613 msgid "could not parse hunk header"

614 msgstr "kunde inte tolka styckehuvud"

615

580 -#: add-patch.c:1149

616 +#: add-patch.c:1163

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

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

619

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

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

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

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

596 -#: add-patch.c:1218 git-add--interactive.perl:1239

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

633 msgid ""

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

635 msgstr ""

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

637 "[y/n]? "

638

603 -#: add-patch.c:1261

639 +#: add-patch.c:1275

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

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

642

607 -#: add-patch.c:1262 git-add--interactive.perl:1343

643 +#: add-patch.c:1276 git-add--interactive.perl:1345

644 msgid "Apply them to the worktree anyway? "

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

646

611 -#: add-patch.c:1269 git-add--interactive.perl:1346

647 +#: add-patch.c:1283 git-add--interactive.perl:1348

648 msgid "Nothing was applied.\n"

649 msgstr "Ingenting applicerades.\n"

650

615 -#: add-patch.c:1326

651 +#: add-patch.c:1340

652 msgid ""

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

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

@@ -634,69 +670,69 @@ msgstr ""

670 "e - redigera aktuellt stycke manuellt\n"

671 "? - visa hjälp\n"

672

637 -#: add-patch.c:1447 add-patch.c:1457

673 +#: add-patch.c:1463 add-patch.c:1473

674 msgid "No previous hunk"

675 msgstr "Inget föregående stycke"

676

641 -#: add-patch.c:1452 add-patch.c:1462

677 +#: add-patch.c:1468 add-patch.c:1478

678 msgid "No next hunk"

679 msgstr "Inget följande stycke"

680

645 -#: add-patch.c:1468

681 +#: add-patch.c:1484

682 msgid "No other hunks to goto"

683 msgstr "Inga andra stycken att gå till"

684

649 -#: add-patch.c:1479 git-add--interactive.perl:1577

685 +#: add-patch.c:1495 git-add--interactive.perl:1594

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

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

688

653 -#: add-patch.c:1480 git-add--interactive.perl:1579

689 +#: add-patch.c:1496 git-add--interactive.perl:1596

690 msgid "go to which hunk? "

691 msgstr "gå till vilket stycke? "

692

657 -#: add-patch.c:1491

693 +#: add-patch.c:1507

694 #, c-format

695 msgid "Invalid number: '%s'"

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

697

662 -#: add-patch.c:1496

698 +#: add-patch.c:1512

699 #, c-format

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

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

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

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

704

669 -#: add-patch.c:1505

705 +#: add-patch.c:1521

706 msgid "No other hunks to search"

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

708

673 -#: add-patch.c:1511 git-add--interactive.perl:1623

709 +#: add-patch.c:1527 git-add--interactive.perl:1640

710 msgid "search for regex? "

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

712

677 -#: add-patch.c:1526

713 +#: add-patch.c:1542

714 #, c-format

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

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

717

682 -#: add-patch.c:1543

718 +#: add-patch.c:1559

719 msgid "No hunk matches the given pattern"

720 msgstr "Inga stycken motsvarar givet mönster"

721

686 -#: add-patch.c:1550

722 +#: add-patch.c:1566

723 msgid "Sorry, cannot split this hunk"

724 msgstr "Beklagar, kan inte dela stycket"

725

690 -#: add-patch.c:1554

726 +#: add-patch.c:1570

727 #, c-format

728 msgid "Split into %d hunks."

729 msgstr "Dela i %d stycken."

730

695 -#: add-patch.c:1558

731 +#: add-patch.c:1574

732 msgid "Sorry, cannot edit this hunk"

733 msgstr "Beklagar, kan inte redigera stycket"

734

699 -#: add-patch.c:1609

735 +#: add-patch.c:1625

736 msgid "'git apply' failed"

737 msgstr "\"git apply\" misslyckades"

738

@@ -923,7 +959,7 @@ msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)"

959 #: apply.c:1481

960 #, c-format

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

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

962 +msgstr "recount: oväntad rad: %.*s"

963

964 #: apply.c:1550

965 #, c-format

@@ -1394,7 +1430,7 @@ msgstr "se till att åtminstone <n> rader sammanhang är lika"

1430

1431 #: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98

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

1397 -#: builtin/pack-objects.c:3458 builtin/rebase.c:1332

1433 +#: builtin/pack-objects.c:3530 builtin/rebase.c:1332

1434 msgid "action"

1435 msgstr "åtgärd"

1436

@@ -1483,7 +1519,7 @@ msgstr "sökvägen är inte giltig UTF-8: %s"

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

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

1521

1486 -#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235

1522 +#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246

1523 #, c-format

1524 msgid "deflate error (%d)"

1525 msgstr "fel i deflate (%d)"

@@ -1553,8 +1589,8 @@ msgid "prepend prefix to each pathname in the archive"

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

1590

1591 #: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

1556 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162

1557 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907

1592 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208

1593 +#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907

1594 #: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564

1595 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123

1596 #: parse-options.h:190

@@ -1781,10 +1817,10 @@ msgstr ""

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

1818 "incheckningen"

1819

1784 -#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018

1820 +#: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018

1821 #: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405

1822 #: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235

1787 -#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291

1823 +#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363

1824 #: builtin/shortlog.c:192

1825 msgid "revision walk setup failed"

1826 msgstr "misslyckades skapa revisionstraversering"

@@ -1949,84 +1985,88 @@ msgstr "\"%s\" är redan utcheckad på \"%s\""

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

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

1987

1952 -#: bundle.c:36

1988 +#: bundle.c:47

1989 #, c-format

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

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

1992

1957 -#: bundle.c:64

1993 +#: bundle.c:69

1994 +msgid "unknown hash algorithm length"

1995 +msgstr "okänd hashningsalgoritmlängd"

1996 +

1997 +#: bundle.c:84

1998 #, c-format

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

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

2001

1962 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034

2002 +#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034

2003 #: builtin/commit.c:814

2004 #, c-format

2005 msgid "could not open '%s'"

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

2007

1968 -#: bundle.c:143

2008 +#: bundle.c:163

2009 msgid "Repository lacks these prerequisite commits:"

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

2011

1972 -#: bundle.c:146

2012 +#: bundle.c:166

2013 msgid "need a repository to verify a bundle"

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

2015

1976 -#: bundle.c:197

2016 +#: bundle.c:217

2017 #, c-format

2018 msgid "The bundle contains this ref:"

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

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

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

2022

1983 -#: bundle.c:204

2023 +#: bundle.c:224

2024 msgid "The bundle records a complete history."

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

2026

1987 -#: bundle.c:206

2027 +#: bundle.c:226

2028 #, c-format

2029 msgid "The bundle requires this ref:"

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

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

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

2033

1994 -#: bundle.c:273

2034 +#: bundle.c:293

2035 msgid "unable to dup bundle descriptor"

2036 msgstr "kan inte duplicera pakethandtag"

2037

1998 -#: bundle.c:280

2038 +#: bundle.c:300

2039 msgid "Could not spawn pack-objects"

2040 msgstr "Kunde inte starta pack-objects"

2041

2002 -#: bundle.c:291

2042 +#: bundle.c:311

2043 msgid "pack-objects died"

2044 msgstr "pack-objects misslyckades"

2045

2006 -#: bundle.c:333

2046 +#: bundle.c:353

2047 msgid "rev-list died"

2048 msgstr "rev-list dog"

2049

2010 -#: bundle.c:382

2050 +#: bundle.c:402

2051 #, c-format

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

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

2054

2015 -#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306

2055 +#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306

2056 #, c-format

2057 msgid "unrecognized argument: %s"

2058 msgstr "okänt argument: %s"

2059

2020 -#: bundle.c:469

2060 +#: bundle.c:489

2061 msgid "Refusing to create empty bundle."

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

2063

2024 -#: bundle.c:479

2064 +#: bundle.c:499

2065 #, c-format

2066 msgid "cannot create '%s'"

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

2068

2029 -#: bundle.c:504

2069 +#: bundle.c:524

2070 msgid "index-pack died"

2071 msgstr "index-pack dog"

2072

@@ -2035,258 +2075,250 @@ msgstr "index-pack dog"

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

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

2077

2038 -#: commit-graph.c:183

2078 +#: commit-graph.c:238

2079 msgid "commit-graph file is too small"

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

2081

2042 -#: commit-graph.c:248

2082 +#: commit-graph.c:303

2083 #, c-format

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

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

2086

2047 -#: commit-graph.c:255

2087 +#: commit-graph.c:310

2088 #, c-format

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

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

2091

2052 -#: commit-graph.c:262

2092 +#: commit-graph.c:317

2093 #, c-format

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

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

2096

2057 -#: commit-graph.c:284

2097 +#: commit-graph.c:339

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

2099 msgstr ""

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

2101 "ofullständig"

2102

2063 -#: commit-graph.c:294

2103 +#: commit-graph.c:349

2104 #, c-format

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

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

2107

2068 -#: commit-graph.c:362

2108 +#: commit-graph.c:417

2109 #, c-format

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

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

2112

2073 -#: commit-graph.c:436

2113 +#: commit-graph.c:491

2114 msgid "commit-graph has no base graphs chunk"

2115 msgstr "incheckningsgrafen har inga bas-graf-stycken"

2116

2077 -#: commit-graph.c:446

2117 +#: commit-graph.c:501

2118 msgid "commit-graph chain does not match"

2119 msgstr "incheckningsgrafens kedja stämmer inte"

2120

2081 -#: commit-graph.c:494

2121 +#: commit-graph.c:549

2122 #, c-format

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

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

2125

2086 -#: commit-graph.c:518

2126 +#: commit-graph.c:573

2127 msgid "unable to find all commit-graph files"

2128 msgstr "kan inte hitta alla incheckingsgraffiler"

2129

2090 -#: commit-graph.c:651 commit-graph.c:711

2130 +#: commit-graph.c:706 commit-graph.c:770

2131 msgid "invalid commit position. commit-graph is likely corrupt"

2132 msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"

2133

2094 -#: commit-graph.c:672

2134 +#: commit-graph.c:727

2135 #, c-format

2136 msgid "could not find commit %s"

2137 msgstr "kunde inte hitta incheckningen %s"

2138

2099 -#: commit-graph.c:948 builtin/am.c:1292

2139 +#: commit-graph.c:1009 builtin/am.c:1292

2140 #, c-format

2141 msgid "unable to parse commit %s"

2142 msgstr "kunde inte tolka incheckningen %s"

2143

2104 -#: commit-graph.c:1096

2144 +#: commit-graph.c:1157

2145 msgid "Writing changed paths Bloom filters index"

2146 msgstr "Skriver Bloom-filterindex för ändrade sökvägar"

2147

2108 -#: commit-graph.c:1121

2148 +#: commit-graph.c:1182

2149 msgid "Writing changed paths Bloom filters data"

2150 msgstr "Skriver Bloom-filterdata för ändrade sökvägar"

2151

2112 -#: commit-graph.c:1160 builtin/pack-objects.c:2783

2152 +#: commit-graph.c:1221 builtin/pack-objects.c:2832

2153 #, c-format

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

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

2156

2117 -#: commit-graph.c:1196

2157 +#: commit-graph.c:1257

2158 msgid "Loading known commits in commit graph"

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

2160

2121 -#: commit-graph.c:1213

2161 +#: commit-graph.c:1274

2162 msgid "Expanding reachable commits in commit graph"

2163 msgstr "Expanderar nåbara incheckningar i incheckningsgraf"

2164

2125 -#: commit-graph.c:1233

2165 +#: commit-graph.c:1294

2166 msgid "Clearing commit marks in commit graph"

2167 msgstr "Rensar incheckningsmärken i incheckningsgraf"

2168

2129 -#: commit-graph.c:1252

2169 +#: commit-graph.c:1313

2170 msgid "Computing commit graph generation numbers"

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

2172

2133 -#: commit-graph.c:1300

2173 +#: commit-graph.c:1367

2174 msgid "Computing commit changed paths Bloom filters"

2175 msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen"

2176

2137 -#: commit-graph.c:1359

2177 +#: commit-graph.c:1423

2178 +msgid "Collecting referenced commits"

2179 +msgstr "Samlar refererade incheckningar"

2180 +

2181 +#: commit-graph.c:1447

2182 #, c-format

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

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

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

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

2187

2144 -#: commit-graph.c:1372

2188 +#: commit-graph.c:1460

2189 #, c-format

2190 msgid "error adding pack %s"

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

2192

2149 -#: commit-graph.c:1376

2193 +#: commit-graph.c:1464

2194 #, c-format

2195 msgid "error opening index for %s"

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

2197

2154 -#: commit-graph.c:1405

2155 -#, c-format

2156 -msgid "Finding commits for commit graph from %d ref"

2157 -msgid_plural "Finding commits for commit graph from %d refs"

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

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

2160 -

2161 -#: commit-graph.c:1426

2162 -#, c-format

2163 -msgid "invalid commit object id: %s"

2164 -msgstr "ogiltigt inchecknings-objekt-id %s"

2165 -

2166 -#: commit-graph.c:1442

2198 +#: commit-graph.c:1503

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

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

2201

2170 -#: commit-graph.c:1457

2202 +#: commit-graph.c:1518

2203 msgid "Counting distinct commits in commit graph"

2204 msgstr "Räknar olika incheckningar i incheckningsgraf"

2205

2174 -#: commit-graph.c:1489

2206 +#: commit-graph.c:1550

2207 msgid "Finding extra edges in commit graph"

2208 msgstr "Söker ytterligare kanter i incheckingsgraf"

2209

2178 -#: commit-graph.c:1538

2210 +#: commit-graph.c:1599

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

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

2213

2182 -#: commit-graph.c:1572 midx.c:812

2214 +#: commit-graph.c:1633 midx.c:812

2215 #, c-format

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

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

2218

2187 -#: commit-graph.c:1585

2219 +#: commit-graph.c:1646

2220 msgid "unable to create temporary graph layer"

2221 msgstr "kan inte skapa temporärt graflager"

2222

2191 -#: commit-graph.c:1590

2223 +#: commit-graph.c:1651

2224 #, c-format

2225 msgid "unable to adjust shared permissions for '%s'"

2226 msgstr "kan inte justera delade behörigheter för \"%s\""

2227

2196 -#: commit-graph.c:1667

2228 +#: commit-graph.c:1728

2229 #, c-format

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

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

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

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

2234

2203 -#: commit-graph.c:1712

2235 +#: commit-graph.c:1773

2236 msgid "unable to open commit-graph chain file"

2237 msgstr "Kunde inte öppna incheckningsgrafkedjefilen"

2238

2207 -#: commit-graph.c:1728

2239 +#: commit-graph.c:1789

2240 msgid "failed to rename base commit-graph file"

2241 msgstr "kunde inte byta namn på bas-incheckingsgraffilen"

2242

2211 -#: commit-graph.c:1748

2243 +#: commit-graph.c:1809

2244 msgid "failed to rename temporary commit-graph file"

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

2246

2215 -#: commit-graph.c:1874

2247 +#: commit-graph.c:1935

2248 msgid "Scanning merged commits"

2249 msgstr "Söker sammanslagna incheckningar"

2250

2219 -#: commit-graph.c:1885

2251 +#: commit-graph.c:1946

2252 #, c-format

2253 msgid "unexpected duplicate commit id %s"

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

2255

2224 -#: commit-graph.c:1908

2256 +#: commit-graph.c:1969

2257 msgid "Merging commit-graph"

2258 msgstr "Slår ihop incheckningsgraf"

2259

2228 -#: commit-graph.c:2096

2260 +#: commit-graph.c:2156

2261 #, c-format

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

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

2264

2233 -#: commit-graph.c:2107

2265 +#: commit-graph.c:2167

2266 msgid "too many commits to write graph"

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

2268

2237 -#: commit-graph.c:2200

2269 +#: commit-graph.c:2260

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

2271 msgstr ""

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

2273

2242 -#: commit-graph.c:2210

2274 +#: commit-graph.c:2270

2275 #, c-format

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

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

2278

2247 -#: commit-graph.c:2220 commit-graph.c:2235

2279 +#: commit-graph.c:2280 commit-graph.c:2295

2280 #, c-format

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

2282 msgstr ""

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

2284

2253 -#: commit-graph.c:2227

2285 +#: commit-graph.c:2287

2286 #, c-format

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

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

2289

2258 -#: commit-graph.c:2245

2290 +#: commit-graph.c:2305

2291 msgid "Verifying commits in commit graph"

2292 msgstr "Bekräftar incheckningar i incheckningsgrafen"

2293

2262 -#: commit-graph.c:2259

2294 +#: commit-graph.c:2320

2295 #, c-format

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

2297 msgstr ""

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

2299

2268 -#: commit-graph.c:2266

2300 +#: commit-graph.c:2327

2301 #, c-format

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

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

2304

2273 -#: commit-graph.c:2276

2305 +#: commit-graph.c:2337

2306 #, c-format

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

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

2309

2278 -#: commit-graph.c:2285

2310 +#: commit-graph.c:2346

2311 #, c-format

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

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

2314

2283 -#: commit-graph.c:2298

2315 +#: commit-graph.c:2360

2316 #, c-format

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

2318 msgstr ""

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

2320

2289 -#: commit-graph.c:2303

2321 +#: commit-graph.c:2365

2322 #, c-format

2323 msgid ""

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

@@ -2294,7 +2326,7 @@ msgstr ""

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

2327 "noll på annan plats"

2328

2297 -#: commit-graph.c:2307

2329 +#: commit-graph.c:2369

2330 #, c-format

2331 msgid ""

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

@@ -2302,12 +2334,12 @@ msgstr ""

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

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

2336

2305 -#: commit-graph.c:2322

2337 +#: commit-graph.c:2385

2338 #, c-format

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

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

2341

2310 -#: commit-graph.c:2328

2342 +#: commit-graph.c:2391

2343 #, c-format

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

2345 msgstr ""

@@ -2345,29 +2377,29 @@ msgstr ""

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

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

2379

2348 -#: commit.c:1168

2380 +#: commit.c:1172

2381 #, c-format

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

2383 msgstr ""

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

2385

2354 -#: commit.c:1172

2386 +#: commit.c:1176

2387 #, c-format

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

2389 msgstr ""

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

2391

2360 -#: commit.c:1175

2392 +#: commit.c:1179

2393 #, c-format

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

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

2396

2365 -#: commit.c:1178

2397 +#: commit.c:1182

2398 #, c-format

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

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

2401

2370 -#: commit.c:1432

2402 +#: commit.c:1436

2403 msgid ""

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

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

@@ -2562,7 +2594,7 @@ msgstr "felformat värde för %s: %s"

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

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

2596

2565 -#: config.c:1533 builtin/pack-objects.c:3542

2597 +#: config.c:1533 builtin/pack-objects.c:3617

2598 #, c-format

2599 msgid "bad pack compression level %d"

2600 msgstr "felaktig paketkomprimeringsgrad %d"

@@ -2711,72 +2743,81 @@ msgstr ""

2743 msgid "server doesn't support '%s'"

2744 msgstr "Servern stöder inte \"%s\""

2745

2714 -#: connect.c:103

2746 +#: connect.c:118

2747 #, c-format

2748 msgid "server doesn't support feature '%s'"

2749 msgstr "servern stöder inte funktionen \"%s\""

2750

2719 -#: connect.c:114

2751 +#: connect.c:129

2752 msgid "expected flush after capabilities"

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

2754

2723 -#: connect.c:233

2755 +#: connect.c:263

2756 #, c-format

2757 msgid "ignoring capabilities after first line '%s'"

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

2759

2728 -#: connect.c:252

2760 +#: connect.c:284

2761 msgid "protocol error: unexpected capabilities^{}"

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

2763

2732 -#: connect.c:273

2764 +#: connect.c:306

2765 #, c-format

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

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

2768

2737 -#: connect.c:275

2769 +#: connect.c:308

2770 msgid "repository on the other end cannot be shallow"

2771 msgstr "arkivet på andra sidan kan inte vara grunt"

2772

2741 -#: connect.c:313

2773 +#: connect.c:347

2774 msgid "invalid packet"

2775 msgstr "ogiltigt paket"

2776

2745 -#: connect.c:333

2777 +#: connect.c:367

2778 #, c-format

2779 msgid "protocol error: unexpected '%s'"

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

2781

2750 -#: connect.c:441

2782 +#: connect.c:473

2783 +#, c-format

2784 +msgid "unknown object format '%s' specified by server"

2785 +msgstr "okänt objektformat \"%s\" angavs av servern"

2786 +

2787 +#: connect.c:500

2788 #, c-format

2789 msgid "invalid ls-refs response: %s"

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

2791

2755 -#: connect.c:445

2792 +#: connect.c:504

2793 msgid "expected flush after ref listing"

2794 msgstr "förväntade \"flush\" efter ref-listan"

2795

2759 -#: connect.c:544

2796 +#: connect.c:507

2797 +msgid "expected response end packet after ref listing"

2798 +msgstr "förväntade svarsavslutningspaket efter ref-listan"

2799 +

2800 +#: connect.c:640

2801 #, c-format

2802 msgid "protocol '%s' is not supported"

2803 msgstr "protokollet \"%s\" stöds inte"

2804

2764 -#: connect.c:595

2805 +#: connect.c:691

2806 msgid "unable to set SO_KEEPALIVE on socket"

2807 msgstr "kunde inte sätta SO_KEEPALIVE på uttaget"

2808

2768 -#: connect.c:635 connect.c:698

2809 +#: connect.c:731 connect.c:794

2810 #, c-format

2811 msgid "Looking up %s ... "

2812 msgstr "Slår upp %s..."

2813

2773 -#: connect.c:639

2814 +#: connect.c:735

2815 #, c-format

2816 msgid "unable to look up %s (port %s) (%s)"

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

2818

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

2779 -#: connect.c:643 connect.c:714

2820 +#: connect.c:739 connect.c:810

2821 #, c-format

2822 msgid ""

2823 "done.\n"

@@ -2785,7 +2826,7 @@ msgstr ""

2826 "klart.\n"

2827 "Ansluter till %s (port %s)..."

2828

2788 -#: connect.c:665 connect.c:742

2829 +#: connect.c:761 connect.c:838

2830 #, c-format

2831 msgid ""

2832 "unable to connect to %s:\n"

@@ -2795,75 +2836,75 @@ msgstr ""

2836 "%s"

2837

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

2798 -#: connect.c:671 connect.c:748

2839 +#: connect.c:767 connect.c:844

2840 msgid "done."

2841 msgstr "klart."

2842

2802 -#: connect.c:702

2843 +#: connect.c:798

2844 #, c-format

2845 msgid "unable to look up %s (%s)"

2846 msgstr "kunde inte slå upp %s (%s)"

2847

2807 -#: connect.c:708

2848 +#: connect.c:804

2849 #, c-format

2850 msgid "unknown port %s"

2851 msgstr "okänd port %s"

2852

2812 -#: connect.c:845 connect.c:1175

2853 +#: connect.c:941 connect.c:1271

2854 #, c-format

2855 msgid "strange hostname '%s' blocked"

2856 msgstr "konstigt värdnamn \"%s\" blockerat"

2857

2817 -#: connect.c:847

2858 +#: connect.c:943

2859 #, c-format

2860 msgid "strange port '%s' blocked"

2861 msgstr "konstig port \"%s\" blockerad"

2862

2822 -#: connect.c:857

2863 +#: connect.c:953

2864 #, c-format

2865 msgid "cannot start proxy %s"

2866 msgstr "kan inte starta mellanserver (proxy) %s"

2867

2827 -#: connect.c:928

2868 +#: connect.c:1024

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

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

2871

2831 -#: connect.c:1123

2872 +#: connect.c:1219

2873 msgid "ssh variant 'simple' does not support -4"

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

2875

2835 -#: connect.c:1135

2876 +#: connect.c:1231

2877 msgid "ssh variant 'simple' does not support -6"

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

2879

2839 -#: connect.c:1152

2880 +#: connect.c:1248

2881 msgid "ssh variant 'simple' does not support setting port"

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

2883

2843 -#: connect.c:1264

2884 +#: connect.c:1360

2885 #, c-format

2886 msgid "strange pathname '%s' blocked"

2887 msgstr "konstigt sökvägsnamn \"%s\" blockerat"

2888

2848 -#: connect.c:1311

2889 +#: connect.c:1407

2890 msgid "unable to fork"

2891 msgstr "kunde inte grena (fork)"

2892

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

2894 # objects in the database.

2854 -#: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45

2895 +#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45

2896 msgid "Checking connectivity"

2897 msgstr "Kontrollerar konnektivitet"

2898

2858 -#: connected.c:119

2899 +#: connected.c:121

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

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

2902

2862 -#: connected.c:139

2903 +#: connected.c:141

2904 msgid "failed write to rev-list"

2905 msgstr "kunde inte skriva till rev-list"

2906

2866 -#: connected.c:146

2907 +#: connected.c:148

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

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

2910

@@ -3127,17 +3168,17 @@ msgstr ""

3168 "Inte ett git-arkiv. Använd --no-index för att jämföra två sökvägar utanför "

3169 "en arbetskatalog."

3170

3130 -#: diff.c:155

3171 +#: diff.c:156

3172 #, c-format

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

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

3175

3135 -#: diff.c:160

3176 +#: diff.c:161

3177 #, c-format

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

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

3180

3140 -#: diff.c:296

3181 +#: diff.c:297

3182 msgid ""

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

3184 "'dimmed-zebra', 'plain'"

@@ -3145,7 +3186,7 @@ msgstr ""

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

3187 "\"blocks\", \"zebra\", \"dimmed_zebra\", \"plain\""

3188

3148 -#: diff.c:324

3189 +#: diff.c:325

3190 #, c-format

3191 msgid ""

3192 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "

@@ -3155,7 +3196,7 @@ msgstr ""

3196 "\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change"

3197 "\""

3198

3158 -#: diff.c:332

3199 +#: diff.c:333

3200 msgid ""

3201 "color-moved-ws: allow-indentation-change cannot be combined with other "

3202 "whitespace modes"

@@ -3163,12 +3204,12 @@ msgstr ""

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

3205 "blankstegslägen"

3206

3166 -#: diff.c:405

3207 +#: diff.c:410

3208 #, c-format

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

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

3211

3171 -#: diff.c:465

3212 +#: diff.c:470

3213 #, c-format

3214 msgid ""

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

@@ -3177,35 +3218,35 @@ msgstr ""

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

3219 "%s"

3220

3180 -#: diff.c:4238

3221 +#: diff.c:4243

3222 #, c-format

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

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

3225

3185 -#: diff.c:4583

3226 +#: diff.c:4589

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

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

3229

3189 -#: diff.c:4586

3230 +#: diff.c:4592

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

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

3233

3193 -#: diff.c:4664

3234 +#: diff.c:4670

3235 msgid "--follow requires exactly one pathspec"

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

3237

3197 -#: diff.c:4712

3238 +#: diff.c:4718

3239 #, c-format

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

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

3242

3202 -#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245

3243 +#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250

3244 #: parse-options.c:197 parse-options.c:201

3245 #, c-format

3246 msgid "%s expects a numerical value"

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

3248

3208 -#: diff.c:4749

3249 +#: diff.c:4755

3250 #, c-format

3251 msgid ""

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

@@ -3214,42 +3255,42 @@ msgstr ""

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

3256 "%s"

3257

3217 -#: diff.c:4834

3258 +#: diff.c:4840

3259 #, c-format

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

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

3262

3222 -#: diff.c:4858

3263 +#: diff.c:4864

3264 #, c-format

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

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

3267

3227 -#: diff.c:4872

3268 +#: diff.c:4878

3269 #, c-format

3270 msgid "unable to resolve '%s'"

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

3272

3232 -#: diff.c:4922 diff.c:4928

3273 +#: diff.c:4928 diff.c:4934

3274 #, c-format

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

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

3277

3237 -#: diff.c:4940

3278 +#: diff.c:4946

3279 #, c-format

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

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

3282

3242 -#: diff.c:4961

3283 +#: diff.c:4967

3284 #, c-format

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

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

3287

3247 -#: diff.c:4980

3288 +#: diff.c:4986

3289 #, c-format

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

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

3292

3252 -#: diff.c:5020

3293 +#: diff.c:5026

3294 msgid ""

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

3296 "\"histogram\""

@@ -3257,149 +3298,149 @@ msgstr ""

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

3299 "\"histogram\""

3300

3260 -#: diff.c:5056 diff.c:5076

3301 +#: diff.c:5062 diff.c:5082

3302 #, c-format

3303 msgid "invalid argument to %s"

3304 msgstr "ogiltigt argument för %s"

3305

3265 -#: diff.c:5214

3306 +#: diff.c:5219

3307 #, c-format

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

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

3310

3270 -#: diff.c:5270

3311 +#: diff.c:5275

3312 #, c-format

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

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

3315

3275 -#: diff.c:5293

3316 +#: diff.c:5298

3317 msgid "Diff output format options"

3318 msgstr "Formatflaggor för diff-utdata"

3319

3279 -#: diff.c:5295 diff.c:5301

3320 +#: diff.c:5300 diff.c:5306

3321 msgid "generate patch"

3322 msgstr "skapar patch"

3323

3283 -#: diff.c:5298 builtin/log.c:177

3324 +#: diff.c:5303 builtin/log.c:177

3325 msgid "suppress diff output"

3326 msgstr "undertryck diff-utdata"

3327

3287 -#: diff.c:5303 diff.c:5417 diff.c:5424

3328 +#: diff.c:5308 diff.c:5422 diff.c:5429

3329 msgid "<n>"

3330 msgstr "<n>"

3331

3291 -#: diff.c:5304 diff.c:5307

3332 +#: diff.c:5309 diff.c:5312

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

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

3335

3295 -#: diff.c:5309

3336 +#: diff.c:5314

3337 msgid "generate the diff in raw format"

3338 msgstr "generera diff i råformat"

3339

3299 -#: diff.c:5312

3340 +#: diff.c:5317

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

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

3343

3303 -#: diff.c:5316

3344 +#: diff.c:5321

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

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

3347

3307 -#: diff.c:5320

3348 +#: diff.c:5325

3349 msgid "machine friendly --stat"

3350 msgstr "maskinläsbar --stat"

3351

3311 -#: diff.c:5323

3352 +#: diff.c:5328

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

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

3355

3315 -#: diff.c:5325 diff.c:5333

3356 +#: diff.c:5330 diff.c:5338

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

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

3359

3319 -#: diff.c:5326

3360 +#: diff.c:5331

3361 msgid ""

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

3363 msgstr ""

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

3365

3325 -#: diff.c:5330

3366 +#: diff.c:5335

3367 msgid "synonym for --dirstat=cumulative"

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

3369

3329 -#: diff.c:5334

3370 +#: diff.c:5339

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

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

3373

3333 -#: diff.c:5338

3374 +#: diff.c:5343

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

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

3377

3337 -#: diff.c:5341

3378 +#: diff.c:5346

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

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

3381

3341 -#: diff.c:5344

3382 +#: diff.c:5349

3383 msgid "show only names of changed files"

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

3385

3345 -#: diff.c:5347

3386 +#: diff.c:5352

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

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

3389

3349 -#: diff.c:5349

3390 +#: diff.c:5354

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

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

3393

3353 -#: diff.c:5350

3394 +#: diff.c:5355

3395 msgid "generate diffstat"

3396 msgstr "skapa diffstat"

3397

3357 -#: diff.c:5352 diff.c:5355 diff.c:5358

3398 +#: diff.c:5357 diff.c:5360 diff.c:5363

3399 msgid "<width>"

3400 msgstr "<bredd>"

3401

3361 -#: diff.c:5353

3402 +#: diff.c:5358

3403 msgid "generate diffstat with a given width"

3404 msgstr "generera en diffstat med given bredd"

3405

3365 -#: diff.c:5356

3406 +#: diff.c:5361

3407 msgid "generate diffstat with a given name width"

3408 msgstr "generera en diffstat med given namnbredd"

3409

3369 -#: diff.c:5359

3410 +#: diff.c:5364

3411 msgid "generate diffstat with a given graph width"

3412 msgstr "generera en diffstat med given grafbredd"

3413

3373 -#: diff.c:5361

3414 +#: diff.c:5366

3415 msgid "<count>"

3416 msgstr "<antal>"

3417

3377 -#: diff.c:5362

3418 +#: diff.c:5367

3419 msgid "generate diffstat with limited lines"

3420 msgstr "generera diffstat med begränsade rader"

3421

3381 -#: diff.c:5365

3422 +#: diff.c:5370

3423 msgid "generate compact summary in diffstat"

3424 msgstr "skapa kompakt översikt i diffstat"

3425

3385 -#: diff.c:5368

3426 +#: diff.c:5373

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

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

3429

3389 -#: diff.c:5371

3430 +#: diff.c:5376

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

3432 msgstr ""

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

3434

3394 -#: diff.c:5373

3435 +#: diff.c:5378

3436 msgid "show colored diff"

3437 msgstr "visa färgad diff"

3438

3398 -#: diff.c:5374

3439 +#: diff.c:5379

3440 msgid "<kind>"

3441 msgstr "<typ>"

3442

3402 -#: diff.c:5375

3443 +#: diff.c:5380

3444 msgid ""

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

3446 "diff"

@@ -3407,7 +3448,7 @@ msgstr ""

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

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

3450

3410 -#: diff.c:5378

3451 +#: diff.c:5383

3452 msgid ""

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

3454 "--numstat"

@@ -3415,87 +3456,87 @@ msgstr ""

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

3457 "eller --numstat"

3458

3418 -#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493

3459 +#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498

3460 msgid "<prefix>"

3461 msgstr "<prefix>"

3462

3422 -#: diff.c:5382

3463 +#: diff.c:5387

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

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

3466

3426 -#: diff.c:5385

3467 +#: diff.c:5390

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

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

3470

3430 -#: diff.c:5388

3471 +#: diff.c:5393

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

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

3474

3434 -#: diff.c:5391

3475 +#: diff.c:5396

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

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

3478

3438 -#: diff.c:5394

3479 +#: diff.c:5399

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

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

3482

3442 -#: diff.c:5398 diff.c:5403 diff.c:5408

3483 +#: diff.c:5403 diff.c:5408 diff.c:5413

3484 msgid "<char>"

3485 msgstr "<tecken>"

3486

3446 -#: diff.c:5399

3487 +#: diff.c:5404

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

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

3490

3450 -#: diff.c:5404

3491 +#: diff.c:5409

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

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

3494

3454 -#: diff.c:5409

3495 +#: diff.c:5414

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

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

3498

3458 -#: diff.c:5412

3499 +#: diff.c:5417

3500 msgid "Diff rename options"

3501 msgstr "Diff-namnbytesflaggor"

3502

3462 -#: diff.c:5413

3503 +#: diff.c:5418

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

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

3506

3466 -#: diff.c:5414

3507 +#: diff.c:5419

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

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

3510

3470 -#: diff.c:5418

3511 +#: diff.c:5423

3512 msgid "detect renames"

3513 msgstr "detektera namnändringar"

3514

3474 -#: diff.c:5422

3515 +#: diff.c:5427

3516 msgid "omit the preimage for deletes"

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

3518

3478 -#: diff.c:5425

3519 +#: diff.c:5430

3520 msgid "detect copies"

3521 msgstr "detektera kopior"

3522

3482 -#: diff.c:5429

3523 +#: diff.c:5434

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

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

3526

3486 -#: diff.c:5431

3527 +#: diff.c:5436

3528 msgid "disable rename detection"

3529 msgstr "inaktivera detektering av namnbyten"

3530

3490 -#: diff.c:5434

3531 +#: diff.c:5439

3532 msgid "use empty blobs as rename source"

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

3534

3494 -#: diff.c:5436

3535 +#: diff.c:5441

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

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

3538

3498 -#: diff.c:5439

3539 +#: diff.c:5444

3540 msgid ""

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

3542 "given limit"

@@ -3503,159 +3544,159 @@ msgstr ""

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

3545 "given gräns"

3546

3506 -#: diff.c:5441

3547 +#: diff.c:5446

3548 msgid "Diff algorithm options"

3549 msgstr "Alternativ för diff-algoritm"

3550

3510 -#: diff.c:5443

3551 +#: diff.c:5448

3552 msgid "produce the smallest possible diff"

3553 msgstr "skapa minsta möjliga diff"

3554

3514 -#: diff.c:5446

3555 +#: diff.c:5451

3556 msgid "ignore whitespace when comparing lines"

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

3558

3518 -#: diff.c:5449

3559 +#: diff.c:5454

3560 msgid "ignore changes in amount of whitespace"

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

3562

3522 -#: diff.c:5452

3563 +#: diff.c:5457

3564 msgid "ignore changes in whitespace at EOL"

3565 msgstr "ignorera blanktecken vid radslut"

3566

3526 -#: diff.c:5455

3567 +#: diff.c:5460

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

3569 msgstr "ignorera CR-tecken vid radslut"

3570

3530 -#: diff.c:5458

3571 +#: diff.c:5463

3572 msgid "ignore changes whose lines are all blank"

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

3574

3534 -#: diff.c:5461

3575 +#: diff.c:5466

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

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

3578

3538 -#: diff.c:5464

3579 +#: diff.c:5469

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

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

3582

3542 -#: diff.c:5468

3583 +#: diff.c:5473

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

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

3586

3546 -#: diff.c:5470

3587 +#: diff.c:5475

3588 msgid "<algorithm>"

3589 msgstr "<algoritm>"

3590

3550 -#: diff.c:5471

3591 +#: diff.c:5476

3592 msgid "choose a diff algorithm"

3593 msgstr "välj en diff-algoritm"

3594

3554 -#: diff.c:5473

3595 +#: diff.c:5478

3596 msgid "<text>"

3597 msgstr "<text>"

3598

3558 -#: diff.c:5474

3599 +#: diff.c:5479

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

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

3602

3562 -#: diff.c:5476 diff.c:5485 diff.c:5488

3603 +#: diff.c:5481 diff.c:5490 diff.c:5493

3604 msgid "<mode>"

3605 msgstr "<läge>"

3606

3566 -#: diff.c:5477

3607 +#: diff.c:5482

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

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

3610

3570 -#: diff.c:5479 diff.c:5482 diff.c:5527

3611 +#: diff.c:5484 diff.c:5487 diff.c:5532

3612 msgid "<regex>"

3613 msgstr "<reguttr>"

3614

3574 -#: diff.c:5480

3615 +#: diff.c:5485

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

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

3618

3578 -#: diff.c:5483

3619 +#: diff.c:5488

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

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

3622

3582 -#: diff.c:5486

3623 +#: diff.c:5491

3624 msgid "moved lines of code are colored differently"

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

3626

3586 -#: diff.c:5489

3627 +#: diff.c:5494

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

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

3630

3590 -#: diff.c:5492

3631 +#: diff.c:5497

3632 msgid "Other diff options"

3633 msgstr "Andra diff-flaggor"

3634

3594 -#: diff.c:5494

3635 +#: diff.c:5499

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

3637 msgstr ""

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

3639 "sökvägar"

3640

3600 -#: diff.c:5498

3641 +#: diff.c:5503

3642 msgid "treat all files as text"

3643 msgstr "hantera alla filer som text"

3644

3604 -#: diff.c:5500

3645 +#: diff.c:5505

3646 msgid "swap two inputs, reverse the diff"

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

3648

3608 -#: diff.c:5502

3649 +#: diff.c:5507

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

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

3652

3612 -#: diff.c:5504

3653 +#: diff.c:5509

3654 msgid "disable all output of the program"

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

3656

3616 -#: diff.c:5506

3657 +#: diff.c:5511

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

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

3660

3620 -#: diff.c:5508

3661 +#: diff.c:5513

3662 msgid "run external text conversion filters when comparing binary files"

3663 msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"

3664

3624 -#: diff.c:5510

3665 +#: diff.c:5515

3666 msgid "<when>"

3667 msgstr "<när>"

3668

3628 -#: diff.c:5511

3669 +#: diff.c:5516

3670 msgid "ignore changes to submodules in the diff generation"

3671 msgstr "ignorera ändringar i undermoduler när diffen skapas"

3672

3632 -#: diff.c:5514

3673 +#: diff.c:5519

3674 msgid "<format>"

3675 msgstr "<format>"

3676

3636 -#: diff.c:5515

3677 +#: diff.c:5520

3678 msgid "specify how differences in submodules are shown"

3679 msgstr "ange hur ändringar i undermoduler visas"

3680

3640 -#: diff.c:5519

3681 +#: diff.c:5524

3682 msgid "hide 'git add -N' entries from the index"

3683 msgstr "dölj \"git add -N\"-poster från indexet"

3684

3644 -#: diff.c:5522

3685 +#: diff.c:5527

3686 msgid "treat 'git add -N' entries as real in the index"

3687 msgstr "tolka \"git add -N\"-poster som äkta i indexet"

3688

3648 -#: diff.c:5524

3689 +#: diff.c:5529

3690 msgid "<string>"

3691 msgstr "<sträng>"

3692

3652 -#: diff.c:5525

3693 +#: diff.c:5530

3694 msgid ""

3695 "look for differences that change the number of occurrences of the specified "

3696 "string"

3697 msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng"

3698

3658 -#: diff.c:5528

3699 +#: diff.c:5533

3700 msgid ""

3701 "look for differences that change the number of occurrences of the specified "

3702 "regex"

@@ -3663,54 +3704,54 @@ msgstr ""

3704 "se efter ändringar som ändrar antalet förekomster av angivet reguljärt "

3705 "uttryck"

3706

3666 -#: diff.c:5531

3707 +#: diff.c:5536

3708 msgid "show all changes in the changeset with -S or -G"

3709 msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"

3710

3670 -#: diff.c:5534

3711 +#: diff.c:5539

3712 msgid "treat <string> in -S as extended POSIX regular expression"

3713 msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"

3714

3674 -#: diff.c:5537

3715 +#: diff.c:5542

3716 msgid "control the order in which files appear in the output"

3717 msgstr "styr ordningen i vilken filer visas i utdata"

3718

3678 -#: diff.c:5538

3719 +#: diff.c:5543

3720 msgid "<object-id>"

3721 msgstr "<objekt-id>"

3722

3682 -#: diff.c:5539

3723 +#: diff.c:5544

3724 msgid ""

3725 "look for differences that change the number of occurrences of the specified "

3726 "object"

3727 msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt"

3728

3688 -#: diff.c:5541

3729 +#: diff.c:5546

3730 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3731 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3732

3692 -#: diff.c:5542

3733 +#: diff.c:5547

3734 msgid "select files by diff type"

3735 msgstr "välj filter efter diff-typ"

3736

3696 -#: diff.c:5544

3737 +#: diff.c:5549

3738 msgid "<file>"

3739 msgstr "<fil>"

3740

3700 -#: diff.c:5545

3741 +#: diff.c:5550

3742 msgid "Output to a specific file"

3743 msgstr "Skriv utdata till en specifik fil"

3744

3704 -#: diff.c:6200

3745 +#: diff.c:6205

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

3747 msgstr ""

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

3749

3709 -#: diff.c:6203

3750 +#: diff.c:6208

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

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

3753

3713 -#: diff.c:6206

3754 +#: diff.c:6211

3755 #, c-format

3756 msgid ""

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

@@ -3726,61 +3767,61 @@ msgstr "kunde inte läsa orderfilen \"%s\""

3767 msgid "Performing inexact rename detection"

3768 msgstr "Utför onöjaktig namnbytesdetektering"

3769

3729 -#: dir.c:555

3770 +#: dir.c:573

3771 #, c-format

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

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

3774

3734 -#: dir.c:695 dir.c:724 dir.c:737

3775 +#: dir.c:713 dir.c:742 dir.c:755

3776 #, c-format

3777 msgid "unrecognized pattern: '%s'"

3778 msgstr "okänt mönster: %s"

3779

3739 -#: dir.c:754 dir.c:768

3780 +#: dir.c:772 dir.c:786

3781 #, c-format

3782 msgid "unrecognized negative pattern: '%s'"

3783 msgstr "okänt negativt mönster: %s"

3784

3744 -#: dir.c:786

3785 +#: dir.c:804

3786 #, c-format

3787 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

3788 msgstr ""

3789 "din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera "

3790 "gånger"

3791

3751 -#: dir.c:796

3792 +#: dir.c:814

3793 msgid "disabling cone pattern matching"

3794 msgstr "inaktiverar konmönstermatchning"

3795

3755 -#: dir.c:1173

3796 +#: dir.c:1191

3797 #, c-format

3798 msgid "cannot use %s as an exclude file"

3799 msgstr "kan inte använda %s som exkluderingsfil"

3800

3760 -#: dir.c:2275

3801 +#: dir.c:2296

3802 #, c-format

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

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

3805

3765 -#: dir.c:2575

3806 +#: dir.c:2596

3807 msgid "failed to get kernel name and information"

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

3809

3769 -#: dir.c:2699

3810 +#: dir.c:2720

3811 msgid "untracked cache is disabled on this system or location"

3812 msgstr "ospårad cache är inaktiverad på systemet eller platsen"

3813

3773 -#: dir.c:3481

3814 +#: dir.c:3502

3815 #, c-format

3816 msgid "index file corrupt in repo %s"

3817 msgstr "indexfilen trasig i arkivet %s"

3818

3778 -#: dir.c:3526 dir.c:3531

3819 +#: dir.c:3547 dir.c:3552

3820 #, c-format

3821 msgid "could not create directories for %s"

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

3823

3783 -#: dir.c:3560

3824 +#: dir.c:3581

3825 #, c-format

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

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

@@ -3790,11 +3831,11 @@ msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""

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

3832 msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c"

3833

3793 -#: entry.c:178

3834 +#: entry.c:177

3835 msgid "Filtering content"

3836 msgstr "Filtrerar innehåll"

3837

3797 -#: entry.c:479

3838 +#: entry.c:478

3839 #, c-format

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

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

@@ -3814,228 +3855,246 @@ msgstr "kunde inte ställa in GIT_DIR till \"%s\""

3855 msgid "too many args to run %s"

3856 msgstr "för många flaggor för att köra %s"

3857

3817 -#: fetch-pack.c:151

3858 +#: fetch-pack.c:152

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

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

3861

3821 -#: fetch-pack.c:154

3862 +#: fetch-pack.c:155

3863 msgid "git fetch-pack: expected a flush packet after shallow list"

3864 msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista"

3865

3825 -#: fetch-pack.c:165

3866 +#: fetch-pack.c:166

3867 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

3868 msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket"

3869

3829 -#: fetch-pack.c:185

3870 +#: fetch-pack.c:186

3871 #, c-format

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

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

3874

3834 -#: fetch-pack.c:196

3875 +#: fetch-pack.c:197

3876 msgid "unable to write to remote"

3877 msgstr "kunde inte skriva till fjärren"

3878

3838 -#: fetch-pack.c:258

3879 +#: fetch-pack.c:259

3880 msgid "--stateless-rpc requires multi_ack_detailed"

3881 msgstr "--stateless-rpc kräver \"multi_ack_detailed\""

3882

3842 -#: fetch-pack.c:357 fetch-pack.c:1364

3883 +#: fetch-pack.c:358 fetch-pack.c:1408

3884 #, c-format

3885 msgid "invalid shallow line: %s"

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

3887

3847 -#: fetch-pack.c:363 fetch-pack.c:1370

3888 +#: fetch-pack.c:364 fetch-pack.c:1414

3889 #, c-format

3890 msgid "invalid unshallow line: %s"

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

3892

3852 -#: fetch-pack.c:365 fetch-pack.c:1372

3893 +#: fetch-pack.c:366 fetch-pack.c:1416

3894 #, c-format

3895 msgid "object not found: %s"

3896 msgstr "objektet hittades inte: %s"

3897

3857 -#: fetch-pack.c:368 fetch-pack.c:1375

3898 +#: fetch-pack.c:369 fetch-pack.c:1419

3899 #, c-format

3900 msgid "error in object: %s"

3901 msgstr "fel i objekt: %s"

3902

3862 -#: fetch-pack.c:370 fetch-pack.c:1377

3903 +#: fetch-pack.c:371 fetch-pack.c:1421

3904 #, c-format

3905 msgid "no shallow found: %s"

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

3907

3867 -#: fetch-pack.c:373 fetch-pack.c:1381

3908 +#: fetch-pack.c:374 fetch-pack.c:1425

3909 #, c-format

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

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

3912

3872 -#: fetch-pack.c:415

3913 +#: fetch-pack.c:416

3914 #, c-format

3915 msgid "got %s %d %s"

3916 msgstr "fick %s %d %s"

3917

3877 -#: fetch-pack.c:432

3918 +#: fetch-pack.c:433

3919 #, c-format

3920 msgid "invalid commit %s"

3921 msgstr "ogiltig incheckning %s"

3922

3882 -#: fetch-pack.c:463

3923 +#: fetch-pack.c:464

3924 msgid "giving up"

3925 msgstr "ger upp"

3926

3886 -#: fetch-pack.c:476 progress.c:336

3927 +#: fetch-pack.c:477 progress.c:336

3928 msgid "done"

3929 msgstr "klart"

3930

3890 -#: fetch-pack.c:488

3931 +#: fetch-pack.c:489

3932 #, c-format

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

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

3935

3895 -#: fetch-pack.c:534

3936 +#: fetch-pack.c:535

3937 #, c-format

3938 msgid "Marking %s as complete"

3939 msgstr "Markerar %s som komplett"

3940

3900 -#: fetch-pack.c:755

3941 +#: fetch-pack.c:756

3942 #, c-format

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

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

3945

3905 -#: fetch-pack.c:819

3946 +#: fetch-pack.c:821

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

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

3949

3909 -#: fetch-pack.c:827

3950 +#: fetch-pack.c:829

3951 msgid "protocol error: bad pack header"

3952 msgstr "protokollfel: felaktigt packhuvud"

3953

3913 -#: fetch-pack.c:901

3954 +#: fetch-pack.c:910

3955 #, c-format

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

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

3958

3918 -#: fetch-pack.c:917

3959 +#: fetch-pack.c:927

3960 #, c-format

3961 msgid "%s failed"

3962 msgstr "%s misslyckades"

3963

3923 -#: fetch-pack.c:919

3964 +#: fetch-pack.c:929

3965 msgid "error in sideband demultiplexer"

3966 msgstr "fel i sidbands-avmultiplexare"

3967

3927 -#: fetch-pack.c:966

3968 +#: fetch-pack.c:976

3969 #, c-format

3970 msgid "Server version is %.*s"

3971 msgstr "Serverversionen är %.*s"

3972

3932 -#: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986

3933 -#: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002

3934 -#: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018

3935 -#: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040

3973 +#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996

3974 +#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012

3975 +#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028

3976 +#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050

3977 #, c-format

3978 msgid "Server supports %s"

3979 msgstr "Servern stöder %s"

3980

3940 -#: fetch-pack.c:973

3981 +#: fetch-pack.c:983

3982 msgid "Server does not support shallow clients"

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

3984

3944 -#: fetch-pack.c:1033

3985 +#: fetch-pack.c:1043

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

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

3988

3948 -#: fetch-pack.c:1038

3989 +#: fetch-pack.c:1048

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

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

3992

3952 -#: fetch-pack.c:1042

3993 +#: fetch-pack.c:1052

3994 msgid "Server does not support --deepen"

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

3996

3956 -#: fetch-pack.c:1059

3997 +#: fetch-pack.c:1054

3998 +msgid "Server does not support this repository's object format"

3999 +msgstr "Servern stöder inte det här arkivets objektformat"

4000 +

4001 +#: fetch-pack.c:1071

4002 msgid "no common commits"

4003 msgstr "inga gemensamma incheckningar"

4004

3960 -#: fetch-pack.c:1071 fetch-pack.c:1563

4005 +#: fetch-pack.c:1083 fetch-pack.c:1639

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

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

4008

4009 #: fetch-pack.c:1211

4010 +#, c-format

4011 +msgid "mismatched algorithms: client %s; server %s"

4012 +msgstr "omaka algoritmer: klient %s; server %s"

4013 +

4014 +#: fetch-pack.c:1215

4015 +#, c-format

4016 +msgid "the server does not support algorithm '%s'"

4017 +msgstr "servern stöder inte algoritmen \"%s\""

4018 +

4019 +#: fetch-pack.c:1235

4020 msgid "Server does not support shallow requests"

4021 msgstr "Servern stöder inte grunda förfrågningar"

4022

3968 -#: fetch-pack.c:1218

4023 +#: fetch-pack.c:1242

4024 msgid "Server supports filter"

4025 msgstr "Servern stöder filter"

4026

3972 -#: fetch-pack.c:1242

4027 +#: fetch-pack.c:1286

4028 msgid "unable to write request to remote"

4029 msgstr "kunde inte skriva anrop till fjärren"

4030

3976 -#: fetch-pack.c:1260

4031 +#: fetch-pack.c:1304

4032 #, c-format

4033 msgid "error reading section header '%s'"

4034 msgstr "fel vid läsning av styckehuvudet \"%s\""

4035

3981 -#: fetch-pack.c:1266

4036 +#: fetch-pack.c:1310

4037 #, c-format

4038 msgid "expected '%s', received '%s'"

4039 msgstr "förväntade \"%s\", tog emot \"%s\""

4040

3986 -#: fetch-pack.c:1327

4041 +#: fetch-pack.c:1371

4042 #, c-format

4043 msgid "unexpected acknowledgment line: '%s'"

3989 -msgstr "förväntade bekräftelserad: \"%s\""

4044 +msgstr "oväntad bekräftelserad: \"%s\""

4045

3991 -#: fetch-pack.c:1332

4046 +#: fetch-pack.c:1376

4047 #, c-format

4048 msgid "error processing acks: %d"

4049 msgstr "fel vid hantering av bekräftelser: %d"

4050

3996 -#: fetch-pack.c:1342

4051 +#: fetch-pack.c:1386

4052 msgid "expected packfile to be sent after 'ready'"

4053 msgstr "väntade att paketfil skulle sändas efter \"ready\""

4054

4000 -#: fetch-pack.c:1344

4055 +#: fetch-pack.c:1388

4056 msgid "expected no other sections to be sent after no 'ready'"

4057 msgstr ""

4058 "väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""

4059

4005 -#: fetch-pack.c:1386

4060 +#: fetch-pack.c:1430

4061 #, c-format

4062 msgid "error processing shallow info: %d"

4063 msgstr "fel vid hantering av grund (\"shallow\") info: %d"

4064

4010 -#: fetch-pack.c:1433

4065 +#: fetch-pack.c:1477

4066 #, c-format

4067 msgid "expected wanted-ref, got '%s'"

4068 msgstr "förväntade wanted-ref, fick %s"

4069

4015 -#: fetch-pack.c:1438

4070 +#: fetch-pack.c:1482

4071 #, c-format

4072 msgid "unexpected wanted-ref: '%s'"

4073 msgstr "oväntad wanted-ref: \"%s\""

4074

4020 -#: fetch-pack.c:1443

4075 +#: fetch-pack.c:1487

4076 #, c-format

4077 msgid "error processing wanted refs: %d"

4078 msgstr "fel vid hantering av önskade referenser: %d"

4079

4025 -#: fetch-pack.c:1789

4080 +#: fetch-pack.c:1517

4081 +msgid "git fetch-pack: expected response end packet"

4082 +msgstr "git fetch-pack: förväntade svarsavslutningspaket"

4083 +

4084 +#: fetch-pack.c:1921

4085 msgid "no matching remote head"

4086 msgstr "inget motsvarande fjärrhuvud"

4087

4029 -#: fetch-pack.c:1812 builtin/clone.c:692

4088 +#: fetch-pack.c:1944 builtin/clone.c:692

4089 msgid "remote did not send all necessary objects"

4090 msgstr "fjärren sände inte alla nödvändiga objekt"

4091

4033 -#: fetch-pack.c:1839

4092 +#: fetch-pack.c:1971

4093 #, c-format

4094 msgid "no such remote ref %s"

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

4096

4038 -#: fetch-pack.c:1842

4097 +#: fetch-pack.c:1974

4098 #, c-format

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

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

@@ -4071,7 +4130,7 @@ msgstr ""

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

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

4132

4074 -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82

4133 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89

4134 #: builtin/rm.c:135

4135 #, c-format

4136 msgid "failed to stat '%s'"

@@ -4216,16 +4275,16 @@ msgstr[1] ""

4275 "\n"

4276 "Mest lika kommandon är"

4277

4219 -#: help.c:653

4278 +#: help.c:654

4279 msgid "git version [<options>]"

4280 msgstr "git version [<flaggor>]"

4281

4223 -#: help.c:708

4282 +#: help.c:709

4283 #, c-format

4284 msgid "%s: %s - %s"

4285 msgstr "%s: %s - %s"

4286

4228 -#: help.c:712

4287 +#: help.c:713

4288 msgid ""

4289 "\n"

4290 "Did you mean this?"

@@ -4324,6 +4383,10 @@ msgstr "förväntade någonting efter combine:"

4383 msgid "multiple filter-specs cannot be combined"

4384 msgstr "flera filterspecifikationer kan inte kombineras"

4385

4386 +#: list-objects-filter-options.c:330

4387 +msgid "unable to upgrade repository format to support partial clone"

4388 +msgstr "kunde inte uppgradera arkivformat till att stöda delvis klon"

4389 +

4390 #: list-objects-filter.c:492

4391 #, c-format

4392 msgid "unable to access sparse blob in '%s'"

@@ -4690,7 +4753,7 @@ msgstr "tillägg/tillägg"

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

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

4755

4693 -#: merge-recursive.c:3101 git-submodule.sh:985

4756 +#: merge-recursive.c:3101 git-submodule.sh:959

4757 msgid "submodule"

4758 msgstr "undermodul"

4759

@@ -4817,7 +4880,7 @@ msgid "failed to read the cache"

4880 msgstr "misslyckades läsa cachen"

4881

4882 #: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912

4820 -#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816

4883 +#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816

4884 #: builtin/stash.c:265

4885 msgid "unable to write new index file"

4886 msgstr "kunde inte skriva ny indexfil"

@@ -5064,21 +5127,21 @@ msgstr "kunde inte tolka objektet: %s"

5127 msgid "hash mismatch %s"

5128 msgstr "hashvärde stämmer inte överens %s"

5129

5067 -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135

5130 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184

5131 #, c-format

5132 msgid "unable to get size of %s"

5133 msgstr "kan inte hämta storlek på %s"

5134

5072 -#: packfile.c:629

5135 +#: packfile.c:630

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

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

5138

5076 -#: packfile.c:1899

5139 +#: packfile.c:1900

5140 #, c-format

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

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

5143

5081 -#: packfile.c:1903

5144 +#: packfile.c:1904

5145 #, c-format

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

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

@@ -5283,44 +5346,48 @@ msgid "unable to write delim packet"

5346 msgstr "kan inte skriva delim-paket"

5347

5348 #: pkt-line.c:106

5349 +msgid "unable to write stateless separator packet"

5350 +msgstr "kan inte skriva tillståndslöst avdelarpaket"

5351 +

5352 +#: pkt-line.c:113

5353 msgid "flush packet write failed"

5354 msgstr "fel vid skrivning av \"flush\"-paket"

5355

5289 -#: pkt-line.c:146 pkt-line.c:232

5356 +#: pkt-line.c:153 pkt-line.c:239

5357 msgid "protocol error: impossibly long line"

5358 msgstr "protokollfel: omöjligt lång rad"

5359

5293 -#: pkt-line.c:162 pkt-line.c:164

5360 +#: pkt-line.c:169 pkt-line.c:171

5361 msgid "packet write with format failed"

5362 msgstr "paketskrivning med format misslyckades"

5363

5297 -#: pkt-line.c:196

5364 +#: pkt-line.c:203

5365 msgid "packet write failed - data exceeds max packet size"

5366 msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek"

5367

5301 -#: pkt-line.c:203 pkt-line.c:210

5368 +#: pkt-line.c:210 pkt-line.c:217

5369 msgid "packet write failed"

5370 msgstr "paketskrivning misslyckades"

5371

5305 -#: pkt-line.c:295

5372 +#: pkt-line.c:302

5373 msgid "read error"

5374 msgstr "läsfel"

5375

5309 -#: pkt-line.c:303

5376 +#: pkt-line.c:310

5377 msgid "the remote end hung up unexpectedly"

5378 msgstr "fjärren lade på oväntat"

5379

5313 -#: pkt-line.c:331

5380 +#: pkt-line.c:338

5381 #, c-format

5382 msgid "protocol error: bad line length character: %.4s"

5383 msgstr "protokollfel: felaktig radlängdstecken: %.4s"

5384

5318 -#: pkt-line.c:341 pkt-line.c:346

5385 +#: pkt-line.c:352 pkt-line.c:357

5386 #, c-format

5387 msgid "protocol error: bad line length %d"

5388 msgstr "protokollfel: felaktig radlängd: %d"

5389

5323 -#: pkt-line.c:362

5390 +#: pkt-line.c:373

5391 #, c-format

5392 msgid "remote error: %s"

5393 msgstr "fjärrfel: %s"

@@ -5499,7 +5566,7 @@ msgstr "osorterade köposter för \"%s\""

5566

5567 #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111

5568 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5502 -#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961

5569 +#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991

5570 #: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507

5571 #: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290

5572 #: builtin/submodule--helper.c:332

@@ -5556,7 +5623,7 @@ msgstr "kunde inte uppdatera delat index \"%s\""

5623 msgid "broken index, expect %s in %s, got %s"

5624 msgstr "trasigt index, förväntade %s i %s, fick %s"

5625

5559 -#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130

5626 +#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130

5627 #, c-format

5628 msgid "could not close '%s'"

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

@@ -5743,7 +5810,7 @@ msgstr ""

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

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

5812

5746 -#: ref-filter.c:42 wt-status.c:1936

5813 +#: ref-filter.c:42 wt-status.c:1977

5814 msgid "gone"

5815 msgstr "försvunnen"

5816

@@ -5968,7 +6035,7 @@ msgstr "felformat objekt vid \"%s\""

6035 msgid "ignoring ref with broken name %s"

6036 msgstr "ignorerar referens med trasigt namn %s"

6037

5971 -#: ref-filter.c:2095 refs.c:625

6038 +#: ref-filter.c:2095 refs.c:657

6039 #, c-format

6040 msgid "ignoring broken ref %s"

6041 msgstr "ignorerar trasig referens %s"

@@ -5998,94 +6065,108 @@ msgstr "felformat objektnamn %s"

6065 msgid "option `%s' must point to a commit"

6066 msgstr "flaggan \"%s\" måste peka på en incheckning"

6067

6001 -#: refs.c:262

6068 +#: refs.c:264

6069 #, c-format

6070 msgid "%s does not point to a valid object!"

6071 msgstr "\"%s\" pekar inte på ett giltigt objekt!"

6072

6006 -#: refs.c:623

6073 +#: refs.c:572

6074 +#, c-format

6075 +msgid "could not retrieve `%s`"

6076 +msgstr "kunde inte hämta \"%s\""

6077 +

6078 +#: refs.c:579

6079 +#, c-format

6080 +msgid "invalid branch name: %s = %s"

6081 +msgstr "felaktigt namn på gren: %s = %s"

6082 +

6083 +#: refs.c:655

6084 #, c-format

6085 msgid "ignoring dangling symref %s"

6086 msgstr "ignorerar dinglande symbolisk referens %s"

6087

6011 -#: refs.c:760

6088 +#: refs.c:792

6089 #, c-format

6090 msgid "could not open '%s' for writing: %s"

6091 msgstr "kunde inte öppna \"%s\" för skrivning: %s"

6092

6016 -#: refs.c:770 refs.c:821

6093 +#: refs.c:802 refs.c:853

6094 #, c-format

6095 msgid "could not read ref '%s'"

6096 msgstr "Kunde inte läsa referensen \"%s\""

6097

6021 -#: refs.c:776

6098 +#: refs.c:808

6099 #, c-format

6100 msgid "ref '%s' already exists"

6101 msgstr "referensen \"%s\" finns redan"

6102

6026 -#: refs.c:781

6103 +#: refs.c:813

6104 #, c-format

6105 msgid "unexpected object ID when writing '%s'"

6106 msgstr "oväntat objekt-id vid skrivning \"%s\""

6107

6031 -#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925

6032 -#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173

6033 -#: wrapper.c:620

6108 +#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925

6109 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168

6110 +#: wrapper.c:628

6111 #, c-format

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

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

6114

6038 -#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719

6115 +#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719

6116 #: builtin/rebase.c:852

6117 #, c-format

6118 msgid "could not open '%s' for writing"

6119 msgstr "kunde inte öppna \"%s\" för skrivning"

6120

6044 -#: refs.c:823

6121 +#: refs.c:855

6122 #, c-format

6123 msgid "unexpected object ID when deleting '%s'"

6124 msgstr "oväntat objekt-id vid borttagning \"%s\""

6125

6049 -#: refs.c:954

6126 +#: refs.c:986

6127 #, c-format

6128 msgid "log for ref %s has gap after %s"

6129 msgstr "loggen för referensen %s har lucka efter %s"

6130

6054 -#: refs.c:960

6131 +#: refs.c:992

6132 #, c-format

6133 msgid "log for ref %s unexpectedly ended on %s"

6134 msgstr "loggen för referensen %s slutade oväntat på %s"

6135

6059 -#: refs.c:1019

6136 +#: refs.c:1051

6137 #, c-format

6138 msgid "log for %s is empty"

6139 msgstr "loggen för %s är tom"

6140

6064 -#: refs.c:1111

6141 +#: refs.c:1143

6142 #, c-format

6143 msgid "refusing to update ref with bad name '%s'"

6144 msgstr "vägrar uppdatera referens med trasigt namn \"%s\""

6145

6069 -#: refs.c:1187

6146 +#: refs.c:1219

6147 #, c-format

6148 msgid "update_ref failed for ref '%s': %s"

6149 msgstr "update_ref misslyckades för referensen \"%s\": %s"

6150

6074 -#: refs.c:1979

6151 +#: refs.c:2011

6152 #, c-format

6153 msgid "multiple updates for ref '%s' not allowed"

6154 msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"

6155

6079 -#: refs.c:2011

6156 +#: refs.c:2098

6157 msgid "ref updates forbidden inside quarantine environment"

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

6159

6083 -#: refs.c:2107 refs.c:2137

6160 +#: refs.c:2109

6161 +msgid "ref updates aborted by hook"

6162 +msgstr "referensuppdateringar avbrutna av krok"

6163 +

6164 +#: refs.c:2209 refs.c:2239

6165 #, c-format

6166 msgid "'%s' exists; cannot create '%s'"

6167 msgstr "\"%s\" finns; kan inte skapa \"%s\""

6168

6088 -#: refs.c:2113 refs.c:2148

6169 +#: refs.c:2215 refs.c:2250

6170 #, c-format

6171 msgid "cannot process '%s' and '%s' at the same time"

6172 msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"

@@ -6370,7 +6451,7 @@ msgstr[1] ""

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

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

6453

6373 -#: remote.c:2233

6454 +#: remote.c:2241

6455 #, c-format

6456 msgid "cannot parse expected object name '%s'"

6457 msgstr "kan inte tolka förväntat objektnamn \"%s\""

@@ -6497,20 +6578,20 @@ msgstr "kunde inte bestämma HEAD-revision"

6578 msgid "failed to find tree of %s"

6579 msgstr "kunde inte hitta trädet för %s."

6580

6500 -#: revision.c:2655

6581 +#: revision.c:2661

6582 msgid "your current branch appears to be broken"

6583 msgstr "din nuvarande gren verkar vara trasig"

6584

6504 -#: revision.c:2658

6585 +#: revision.c:2664

6586 #, c-format

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

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

6589

6509 -#: revision.c:2866

6590 +#: revision.c:2873

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

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

6593

6513 -#: revision.c:2870

6594 +#: revision.c:2877

6595 msgid "-L does not yet support diff formats besides -p and -s"

6596 msgstr "-L stöder ännu inte andra diff-format än -p och -s"

6597

@@ -6550,11 +6631,15 @@ msgstr "fjärruppackning misslyckades: %s"

6631 msgid "failed to sign the push certificate"

6632 msgstr "misslyckades underteckna push-certifikatet"

6633

6553 -#: send-pack.c:399

6634 +#: send-pack.c:394

6635 +msgid "the receiving end does not support this repository's hash algorithm"

6636 +msgstr "mottagarsidan stöder inte arkivets hashningsalgoritm"

6637 +

6638 +#: send-pack.c:403

6639 msgid "the receiving end does not support --signed push"

6640 msgstr "mottagarsidan stöder inte push med --signed"

6641

6557 -#: send-pack.c:401

6642 +#: send-pack.c:405

6643 msgid ""

6644 "not sending a push certificate since the receiving end does not support --"

6645 "signed push"

@@ -6562,11 +6647,11 @@ msgstr ""

6647 "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"

6648 "signed"

6649

6565 -#: send-pack.c:413

6650 +#: send-pack.c:417

6651 msgid "the receiving end does not support --atomic push"

6652 msgstr "mottagarsidan stöder inte push med --atomic"

6653

6569 -#: send-pack.c:418

6654 +#: send-pack.c:422

6655 msgid "the receiving end does not support push options"

6656 msgstr "mottagarsidan stöder inte push-flaggor"

6657

@@ -6687,7 +6772,7 @@ msgstr "ingen nyckel i \"%.*s\""

6772 msgid "unable to dequote value of '%s'"

6773 msgstr "kan inte ta bort citering av värdet \"%s\""

6774

6690 -#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6775 +#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710

6776 #: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896

6777 #, c-format

6778 msgid "could not open '%s' for reading"

@@ -7525,84 +7610,84 @@ msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"

7610 msgid "this operation must be run in a work tree"

7611 msgstr "funktionen måste köras i en arbetskatalog"

7612

7528 -#: setup.c:569

7613 +#: setup.c:604

7614 #, c-format

7615 msgid "Expected git repo version <= %d, found %d"

7616 msgstr "Förväntade git-arkivversion <= %d, hittade %d"

7617

7533 -#: setup.c:577

7618 +#: setup.c:612

7619 msgid "unknown repository extensions found:"

7620 msgstr "okända arkivutökningar hittades:"

7621

7537 -#: setup.c:596

7622 +#: setup.c:631

7623 #, c-format

7624 msgid "error opening '%s'"

7625 msgstr "fel vid öppning av \"%s\""

7626

7542 -#: setup.c:598

7627 +#: setup.c:633

7628 #, c-format

7629 msgid "too large to be a .git file: '%s'"

7630 msgstr "för stor för att vara en .git-fil: \"%s\""

7631

7547 -#: setup.c:600

7632 +#: setup.c:635

7633 #, c-format

7634 msgid "error reading %s"

7635 msgstr "fel vid läsning av %s"

7636

7552 -#: setup.c:602

7637 +#: setup.c:637

7638 #, c-format

7639 msgid "invalid gitfile format: %s"

7640 msgstr "ogiltigt gitfilformat: %s"

7641

7557 -#: setup.c:604

7642 +#: setup.c:639

7643 #, c-format

7644 msgid "no path in gitfile: %s"

7645 msgstr "ingen sökväg i gitfil: %s"

7646

7562 -#: setup.c:606

7647 +#: setup.c:641

7648 #, c-format

7649 msgid "not a git repository: %s"

7650 msgstr "inte ett git-arkiv: %s"

7651

7567 -#: setup.c:708

7652 +#: setup.c:743

7653 #, c-format

7654 msgid "'$%s' too big"

7655 msgstr "\"$%s\" för stor"

7656

7572 -#: setup.c:722

7657 +#: setup.c:757

7658 #, c-format

7659 msgid "not a git repository: '%s'"

7660 msgstr "inte ett git-arkiv: \"%s\""

7661

7577 -#: setup.c:751 setup.c:753 setup.c:784

7662 +#: setup.c:786 setup.c:788 setup.c:819

7663 #, c-format

7664 msgid "cannot chdir to '%s'"

7665 msgstr "kan inte byta katalog (chdir) till \"%s\""

7666

7582 -#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869

7667 +#: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904

7668 msgid "cannot come back to cwd"

7669 msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"

7670

7586 -#: setup.c:883

7671 +#: setup.c:918

7672 #, c-format

7673 msgid "failed to stat '%*s%s%s'"

7674 msgstr "misslyckades ta status på \"%*ss%s%s\""

7675

7591 -#: setup.c:1121

7676 +#: setup.c:1156

7677 msgid "Unable to read current working directory"

7678 msgstr "Kan inte läsa aktuell arbetskatalog"

7679

7595 -#: setup.c:1130 setup.c:1136

7680 +#: setup.c:1165 setup.c:1171

7681 #, c-format

7682 msgid "cannot change to '%s'"

7683 msgstr "kan inte byta till \"%s\""

7684

7600 -#: setup.c:1141

7685 +#: setup.c:1176

7686 #, c-format

7687 msgid "not a git repository (or any of the parent directories): %s"

7688 msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"

7689

7605 -#: setup.c:1147

7690 +#: setup.c:1182

7691 #, c-format

7692 msgid ""

7693 "not a git repository (or any parent up to mount point %s)\n"

@@ -7612,7 +7697,7 @@ msgstr ""

7697 "monteringspunkten %s)\n"

7698 "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."

7699

7615 -#: setup.c:1258

7700 +#: setup.c:1293

7701 #, c-format

7702 msgid ""

7703 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -7621,15 +7706,15 @@ msgstr ""

7706 "problem med filläges-värdet i core.sharedRepository (0%.3o).\n"

7707 "Ägaren av filerna måste alltid ha läs- och skrivbehörighet."

7708

7624 -#: setup.c:1304

7709 +#: setup.c:1340

7710 msgid "open /dev/null or dup failed"

7711 msgstr "misslyckades öppna /dev/null eller \"dup\""

7712

7628 -#: setup.c:1319

7713 +#: setup.c:1355

7714 msgid "fork failed"

7715 msgstr "\"fork\" misslyckades"

7716

7632 -#: setup.c:1324

7717 +#: setup.c:1360

7718 msgid "setsid failed"

7719 msgstr "\"setsid\" misslyckades"

7720

@@ -7810,7 +7895,7 @@ msgstr "\"deflateend\" på objektet %s misslyckades (%d)"

7895 msgid "confused by unstable object source data for %s"

7896 msgstr "förvirrad av instabil objektkälldata för %s"

7897

7813 -#: sha1-file.c:1906 builtin/pack-objects.c:1055

7898 +#: sha1-file.c:1906 builtin/pack-objects.c:1085

7899 #, c-format

7900 msgid "failed utime() on %s"

7901 msgstr "\"utime()\" misslyckades på %s"

@@ -7986,43 +8071,43 @@ msgid "invalid object name '%.*s'."

8071 msgstr "felaktigt objektnamn \"%.*s\"."

8072

8073 #. TRANSLATORS: IEC 80000-13:2008 gibibyte

7989 -#: strbuf.c:853

8074 +#: strbuf.c:848

8075 #, c-format

8076 msgid "%u.%2.2u GiB"

8077 msgstr "%u,%2.2u GiB"

8078

8079 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second

7995 -#: strbuf.c:855

8080 +#: strbuf.c:850

8081 #, c-format

8082 msgid "%u.%2.2u GiB/s"

8083 msgstr "%u,%2.2u GiB/s"

8084

8085 #. TRANSLATORS: IEC 80000-13:2008 mebibyte

8001 -#: strbuf.c:863

8086 +#: strbuf.c:858

8087 #, c-format

8088 msgid "%u.%2.2u MiB"

8089 msgstr "%u,%2.2u MiB"

8090

8091 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second

8007 -#: strbuf.c:865

8092 +#: strbuf.c:860

8093 #, c-format

8094 msgid "%u.%2.2u MiB/s"

8095 msgstr "%u,%2.2u MiB/s"

8096

8097 #. TRANSLATORS: IEC 80000-13:2008 kibibyte

8013 -#: strbuf.c:872

8098 +#: strbuf.c:867

8099 #, c-format

8100 msgid "%u.%2.2u KiB"

8101 msgstr "%u,%2.2u KiB"

8102

8103 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second

8019 -#: strbuf.c:874

8104 +#: strbuf.c:869

8105 #, c-format

8106 msgid "%u.%2.2u KiB/s"

8107 msgstr "%u,%2.2u KiB/s"

8108

8109 #. TRANSLATORS: IEC 80000-13:2008 byte

8025 -#: strbuf.c:880

8110 +#: strbuf.c:875

8111 #, c-format

8112 msgid "%u byte"

8113 msgid_plural "%u bytes"

@@ -8030,14 +8115,14 @@ msgstr[0] "%u byte"

8115 msgstr[1] "%u bytes"

8116

8117 #. TRANSLATORS: IEC 80000-13:2008 byte/second

8033 -#: strbuf.c:882

8118 +#: strbuf.c:877

8119 #, c-format

8120 msgid "%u byte/s"

8121 msgid_plural "%u bytes/s"

8122 msgstr[0] "%u byte/s"

8123 msgstr[1] "%u bytes/s"

8124

8040 -#: strbuf.c:1180

8125 +#: strbuf.c:1175

8126 #, c-format

8127 msgid "could not edit '%s'"

8128 msgstr "kunde inte redigera \"%s\""

@@ -8284,7 +8369,7 @@ msgstr "kunde inte läsa indatafilen \"%s\""

8369 msgid "could not read from stdin"

8370 msgstr "kunde inte läsa från standard in"

8371

8287 -#: trailer.c:1011 wrapper.c:665

8372 +#: trailer.c:1011 wrapper.c:673

8373 #, c-format

8374 msgid "could not stat %s"

8375 msgstr "kunde inte ta status på %s"

@@ -8308,20 +8393,20 @@ msgstr "kunde inte öppna temporär fil"

8393 msgid "could not rename temporary file to %s"

8394 msgstr "kunde inte byta namn på temporär fil till %s"

8395

8311 -#: transport-helper.c:61 transport-helper.c:90

8396 +#: transport-helper.c:62 transport-helper.c:91

8397 msgid "full write to remote helper failed"

8398 msgstr "komplett skrivning till fjärrhjälpare misslyckades"

8399

8315 -#: transport-helper.c:144

8400 +#: transport-helper.c:145

8401 #, c-format

8402 msgid "unable to find remote helper for '%s'"

8403 msgstr "kan inte hitta fjärrhjälpare för \"%s\""

8404

8320 -#: transport-helper.c:160 transport-helper.c:571

8405 +#: transport-helper.c:161 transport-helper.c:575

8406 msgid "can't dup helper output fd"

8407 msgstr "kunde inte duplicera utdata-filhandtag"

8408

8324 -#: transport-helper.c:211

8409 +#: transport-helper.c:214

8410 #, c-format

8411 msgid ""

8412 "unknown mandatory capability %s; this remote helper probably needs newer "

@@ -8330,159 +8415,164 @@ msgstr ""

8415 "okänd krävd förmåga (capability) %s; fjärrhjälparen behöver antagligen en "

8416 "nyare version av Git"

8417

8333 -#: transport-helper.c:217

8418 +#: transport-helper.c:220

8419 msgid "this remote helper should implement refspec capability"

8420 msgstr ""

8421 "fjärrhjälparen behöver implementera förmåga för referensspecifikationer "

8422 "(refspec)"

8423

8339 -#: transport-helper.c:284 transport-helper.c:425

8424 +#: transport-helper.c:287 transport-helper.c:429

8425 #, c-format

8426 msgid "%s unexpectedly said: '%s'"

8427 msgstr "%s sade oväntat: \"%s\""

8428

8344 -#: transport-helper.c:414

8429 +#: transport-helper.c:417

8430 #, c-format

8431 msgid "%s also locked %s"

8432 msgstr "%s låste också %s"

8433

8349 -#: transport-helper.c:493

8434 +#: transport-helper.c:497

8435 msgid "couldn't run fast-import"

8436 msgstr "kunde inte köra fast-import"

8437

8353 -#: transport-helper.c:516

8438 +#: transport-helper.c:520

8439 msgid "error while running fast-import"

8440 msgstr "fel när fast-import kördes"

8441

8357 -#: transport-helper.c:545 transport-helper.c:1135

8442 +#: transport-helper.c:549 transport-helper.c:1156

8443 #, c-format

8444 msgid "could not read ref %s"

8445 msgstr "kunde inte läsa referensen %s"

8446

8362 -#: transport-helper.c:590

8447 +#: transport-helper.c:594

8448 #, c-format

8449 msgid "unknown response to connect: %s"

8450 msgstr "okänt svar på ansluntning: %s"

8451

8367 -#: transport-helper.c:612

8452 +#: transport-helper.c:616

8453 msgid "setting remote service path not supported by protocol"

8454 msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst"

8455

8371 -#: transport-helper.c:614

8456 +#: transport-helper.c:618

8457 msgid "invalid remote service path"

8458 msgstr "felaktig sökväg till fjärrtjänst"

8459

8375 -#: transport-helper.c:657 transport.c:1339

8460 +#: transport-helper.c:661 transport.c:1347

8461 msgid "operation not supported by protocol"

8462 msgstr "funktionen stöds inte av protokollet"

8463

8379 -#: transport-helper.c:660

8464 +#: transport-helper.c:664

8465 #, c-format

8466 msgid "can't connect to subservice %s"

8467 msgstr "kan inte ansluta till undertjänsten %s"

8468

8384 -#: transport-helper.c:736

8469 +#: transport-helper.c:740

8470 #, c-format

8471 msgid "expected ok/error, helper said '%s'"

8472 msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\""

8473

8389 -#: transport-helper.c:789

8474 +#: transport-helper.c:793

8475 #, c-format

8476 msgid "helper reported unexpected status of %s"

8477 msgstr "hjälparen returnerade oväntad status %s"

8478

8394 -#: transport-helper.c:850

8479 +#: transport-helper.c:854

8480 #, c-format

8481 msgid "helper %s does not support dry-run"

8482 msgstr "hjälparen %s stöder inte dry-run"

8483

8399 -#: transport-helper.c:853

8484 +#: transport-helper.c:857

8485 #, c-format

8486 msgid "helper %s does not support --signed"

8487 msgstr "hjälparen %s stöder inte --signed"

8488

8404 -#: transport-helper.c:856

8489 +#: transport-helper.c:860

8490 #, c-format

8491 msgid "helper %s does not support --signed=if-asked"

8492 msgstr "hjälparen %s stöder inte --signed=if-asked"

8493

8409 -#: transport-helper.c:861

8494 +#: transport-helper.c:865

8495 #, c-format

8496 msgid "helper %s does not support --atomic"

8497 msgstr "hjälparen %s stöder inte --atomic"

8498

8414 -#: transport-helper.c:867

8499 +#: transport-helper.c:871

8500 #, c-format

8501 msgid "helper %s does not support 'push-option'"

8502 msgstr "hjälparen %s stöder inte \"push-option\""

8503

8419 -#: transport-helper.c:966

8504 +#: transport-helper.c:970

8505 msgid "remote-helper doesn't support push; refspec needed"

8506 msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs"

8507

8423 -#: transport-helper.c:971

8508 +#: transport-helper.c:975

8509 #, c-format

8510 msgid "helper %s does not support 'force'"

8511 msgstr "hjälparen %s stöder inte \"force\""

8512

8428 -#: transport-helper.c:1018

8513 +#: transport-helper.c:1022

8514 msgid "couldn't run fast-export"

8515 msgstr "kunde inte köra fast-export"

8516

8432 -#: transport-helper.c:1023

8517 +#: transport-helper.c:1027

8518 msgid "error while running fast-export"

8519 msgstr "fel vid körning av fast-export"

8520

8436 -#: transport-helper.c:1048

8521 +#: transport-helper.c:1052

8522 #, c-format

8523 msgid ""

8524 "No refs in common and none specified; doing nothing.\n"

8440 -"Perhaps you should specify a branch such as 'master'.\n"

8525 +"Perhaps you should specify a branch.\n"

8526 msgstr ""

8527 "Inga gemensamma referenser och inga angavs; gör inget.\n"

8443 -"Du kanske borde ange en gren såsom \"master\".\n"

8528 +"Du kanske borde ange en gren.\n"

8529 +

8530 +#: transport-helper.c:1133

8531 +#, c-format

8532 +msgid "unsupported object format '%s'"

8533 +msgstr "objektformatet \"%s\" stöds ej"

8534

8445 -#: transport-helper.c:1121

8535 +#: transport-helper.c:1142

8536 #, c-format

8537 msgid "malformed response in ref list: %s"

8538 msgstr "felformat svar i referenslistan: %s"

8539

8450 -#: transport-helper.c:1273

8540 +#: transport-helper.c:1294

8541 #, c-format

8542 msgid "read(%s) failed"

8543 msgstr "läs(%s) misslyckades"

8544

8455 -#: transport-helper.c:1300

8545 +#: transport-helper.c:1321

8546 #, c-format

8547 msgid "write(%s) failed"

8548 msgstr "skriv(%s) misslyckades"

8549

8460 -#: transport-helper.c:1349

8550 +#: transport-helper.c:1370

8551 #, c-format

8552 msgid "%s thread failed"

8553 msgstr "%s-tråden misslyckades"

8554

8465 -#: transport-helper.c:1353

8555 +#: transport-helper.c:1374

8556 #, c-format

8557 msgid "%s thread failed to join: %s"

8558 msgstr "%s-tråden misslyckades ansluta: %s"

8559

8470 -#: transport-helper.c:1372 transport-helper.c:1376

8560 +#: transport-helper.c:1393 transport-helper.c:1397

8561 #, c-format

8562 msgid "can't start thread for copying data: %s"

8563 msgstr "kan inte starta tråd för kopiering av data: %s"

8564

8475 -#: transport-helper.c:1413

8565 +#: transport-helper.c:1434

8566 #, c-format

8567 msgid "%s process failed to wait"

8568 msgstr "processen %s misslyckades vänta"

8569

8480 -#: transport-helper.c:1417

8570 +#: transport-helper.c:1438

8571 #, c-format

8572 msgid "%s process failed"

8573 msgstr "processen %s misslyckades"

8574

8485 -#: transport-helper.c:1435 transport-helper.c:1444

8575 +#: transport-helper.c:1456 transport-helper.c:1465

8576 msgid "can't start thread for copying data"

8577 msgstr "kan inte skapa tråd för kopiering av data"

8578

@@ -8496,33 +8586,33 @@ msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"

8586 msgid "could not read bundle '%s'"

8587 msgstr "kunde inte läsa paketet (bundlen) \"%s\""

8588

8499 -#: transport.c:214

8589 +#: transport.c:220

8590 #, c-format

8591 msgid "transport: invalid depth option '%s'"

8592 msgstr "transport: ogiltig flagga för depth: \"%s\""

8593

8504 -#: transport.c:266

8594 +#: transport.c:272

8595 msgid "see protocol.version in 'git help config' for more details"

8596 msgstr "se protocol.version i \"git help config\" för mer information"

8597

8508 -#: transport.c:267

8598 +#: transport.c:273

8599 msgid "server options require protocol version 2 or later"

8600 msgstr "serverflaggor kräver protokollversion 2 eller senare"

8601

8512 -#: transport.c:632

8602 +#: transport.c:631

8603 msgid "could not parse transport.color.* config"

8604 msgstr "kunde inte tolka inställningen för transport.color.*"

8605

8516 -#: transport.c:705

8606 +#: transport.c:704

8607 msgid "support for protocol v2 not implemented yet"

8608 msgstr "stöd för protokoll v2 ännu ej implementerat"

8609

8520 -#: transport.c:839

8610 +#: transport.c:838

8611 #, c-format

8612 msgid "unknown value for config '%s': %s"

8613 msgstr "okänt värde för inställningen \"%s\": %s"

8614

8525 -#: transport.c:905

8615 +#: transport.c:904

8616 #, c-format

8617 msgid "transport '%s' not allowed"

8618 msgstr "transporten \"%s\" tillåts inte"

@@ -8531,7 +8621,7 @@ msgstr "transporten \"%s\" tillåts inte"

8621 msgid "git-over-rsync is no longer supported"

8622 msgstr "git-over-rsync stöds inte längre"

8623

8534 -#: transport.c:1052

8624 +#: transport.c:1059

8625 #, c-format

8626 msgid ""

8627 "The following submodule paths contain changes that can\n"

@@ -8540,7 +8630,7 @@ msgstr ""

8630 "Följande undermodulsökvägar innehåller ändringar som\n"

8631 "inte kan hittas av fjärrarna:\n"

8632

8543 -#: transport.c:1056

8633 +#: transport.c:1063

8634 #, c-format

8635 msgid ""

8636 "\n"

@@ -8567,11 +8657,11 @@ msgstr ""

8657 "för att sända dem till fjärren.\n"

8658 "\n"

8659

8570 -#: transport.c:1064

8660 +#: transport.c:1071

8661 msgid "Aborting."

8662 msgstr "Avbryter."

8663

8574 -#: transport.c:1209

8664 +#: transport.c:1216

8665 msgid "failed to push all needed submodules"

8666 msgstr "kunde inte sända alla nödvändiga undermoduler"

8667

@@ -8850,7 +8940,7 @@ msgstr ""

8940 msgid "Updating index flags"

8941 msgstr "Uppdaterar indexflaggor"

8942

8853 -#: upload-pack.c:1337

8943 +#: upload-pack.c:1415

8944 msgid "expected flush after fetch arguments"

8945 msgstr "förväntade \"flush\" efter \"fetch\"-argument"

8946

@@ -8887,47 +8977,47 @@ msgstr "felaktigt \"..\"-sökvägssegment"

8977 msgid "Fetching objects"

8978 msgstr "Hämtar objekt"

8979

8890 -#: worktree.c:262 builtin/am.c:2098

8980 +#: worktree.c:248 builtin/am.c:2098

8981 #, c-format

8982 msgid "failed to read '%s'"

8983 msgstr "misslyckades läsa \"%s\""

8984

8895 -#: worktree.c:309

8985 +#: worktree.c:295

8986 #, c-format

8987 msgid "'%s' at main working tree is not the repository directory"

8988 msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen"

8989

8900 -#: worktree.c:320

8990 +#: worktree.c:306

8991 #, c-format

8992 msgid "'%s' file does not contain absolute path to the working tree location"

8993 msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen"

8994

8905 -#: worktree.c:332

8995 +#: worktree.c:318

8996 #, c-format

8997 msgid "'%s' does not exist"

8998 msgstr "\"%s\" finns inte"

8999

8910 -#: worktree.c:338

9000 +#: worktree.c:324

9001 #, c-format

9002 msgid "'%s' is not a .git file, error code %d"

9003 msgstr "\"%s\" är inte en .git-fil, felkod %d"

9004

8915 -#: worktree.c:347

9005 +#: worktree.c:333

9006 #, c-format

9007 msgid "'%s' does not point back to '%s'"

9008 msgstr "\"%s\" pekar inte tillbaka till \"%s\""

9009

8920 -#: wrapper.c:186 wrapper.c:356

9010 +#: wrapper.c:194 wrapper.c:364

9011 #, c-format

9012 msgid "could not open '%s' for reading and writing"

9013 msgstr "kunde inte öppna \"%s\" för läsning och skrivning"

9014

8925 -#: wrapper.c:387 wrapper.c:588

9015 +#: wrapper.c:395 wrapper.c:596

9016 #, c-format

9017 msgid "unable to access '%s'"

9018 msgstr "kan inte komma åt \"%s\""

9019

8930 -#: wrapper.c:596

9020 +#: wrapper.c:604

9021 msgid "unable to get current working directory"

9022 msgstr "kan inte hämta aktuell arbetskatalog"

9023

@@ -9314,39 +9404,44 @@ msgid " (use \"git bisect reset\" to get back to the original branch)"

9404 msgstr ""

9405 " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"

9406

9317 -#: wt-status.c:1692

9407 +#: wt-status.c:1494

9408 +#, c-format

9409 +msgid "You are in a sparse checkout with %d%% of tracked files present."

9410 +msgstr "Du är i en gles utcheckning med %d%% spårade filer på plats."

9411 +

9412 +#: wt-status.c:1733

9413 msgid "On branch "

9414 msgstr "På grenen "

9415

9321 -#: wt-status.c:1699

9416 +#: wt-status.c:1740

9417 msgid "interactive rebase in progress; onto "

9418 msgstr "interaktiv ombasering pågår; ovanpå "

9419

9325 -#: wt-status.c:1701

9420 +#: wt-status.c:1742

9421 msgid "rebase in progress; onto "

9422 msgstr "ombasering pågår; ovanpå "

9423

9329 -#: wt-status.c:1711

9424 +#: wt-status.c:1752

9425 msgid "Not currently on any branch."

9426 msgstr "Inte på någon gren för närvarande."

9427

9333 -#: wt-status.c:1728

9428 +#: wt-status.c:1769

9429 msgid "Initial commit"

9430 msgstr "Första incheckning"

9431

9337 -#: wt-status.c:1729

9432 +#: wt-status.c:1770

9433 msgid "No commits yet"

9434 msgstr "Inga incheckningar ännu"

9435

9341 -#: wt-status.c:1743

9436 +#: wt-status.c:1784

9437 msgid "Untracked files"

9438 msgstr "Ospårade filer"

9439

9345 -#: wt-status.c:1745

9440 +#: wt-status.c:1786

9441 msgid "Ignored files"

9442 msgstr "Ignorerade filer"

9443

9349 -#: wt-status.c:1749

9444 +#: wt-status.c:1790

9445 #, c-format

9446 msgid ""

9447 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -9358,32 +9453,32 @@ msgstr ""

9453 "lägga till nya filer själv (se \"git help status\")."

9454

9455 # %s är nästa sträng eller tom.

9361 -#: wt-status.c:1755

9456 +#: wt-status.c:1796

9457 #, c-format

9458 msgid "Untracked files not listed%s"

9459 msgstr "Ospårade filer visas ej%s"

9460

9366 -#: wt-status.c:1757

9461 +#: wt-status.c:1798

9462 msgid " (use -u option to show untracked files)"

9463 msgstr " (använd flaggan -u för att visa ospårade filer)"

9464

9370 -#: wt-status.c:1763

9465 +#: wt-status.c:1804

9466 msgid "No changes"

9467 msgstr "Inga ändringar"

9468

9374 -#: wt-status.c:1768

9469 +#: wt-status.c:1809

9470 #, c-format

9471 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

9472 msgstr ""

9473 "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"

9474 "\")\n"

9475

9381 -#: wt-status.c:1771

9476 +#: wt-status.c:1812

9477 #, c-format

9478 msgid "no changes added to commit\n"

9479 msgstr "inga ändringar att checka in\n"

9480

9386 -#: wt-status.c:1774

9481 +#: wt-status.c:1815

9482 #, c-format

9483 msgid ""

9484 "nothing added to commit but untracked files present (use \"git add\" to "

@@ -9392,62 +9487,62 @@ msgstr ""

9487 "inget köat för incheckning, men ospårade filer finns (spåra med \"git add"

9488 "\")\n"

9489

9395 -#: wt-status.c:1777

9490 +#: wt-status.c:1818

9491 #, c-format

9492 msgid "nothing added to commit but untracked files present\n"

9493 msgstr "inget köat för incheckning, men ospårade filer finns\n"

9494

9400 -#: wt-status.c:1780

9495 +#: wt-status.c:1821

9496 #, c-format

9497 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

9498 msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"

9499

9405 -#: wt-status.c:1783 wt-status.c:1788

9500 +#: wt-status.c:1824 wt-status.c:1829

9501 #, c-format

9502 msgid "nothing to commit\n"

9503 msgstr "inget att checka in\n"

9504

9410 -#: wt-status.c:1786

9505 +#: wt-status.c:1827

9506 #, c-format

9507 msgid "nothing to commit (use -u to show untracked files)\n"

9508 msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"

9509

9415 -#: wt-status.c:1790

9510 +#: wt-status.c:1831

9511 #, c-format

9512 msgid "nothing to commit, working tree clean\n"

9513 msgstr "inget att checka in, arbetskatalogen ren\n"

9514

9420 -#: wt-status.c:1903

9515 +#: wt-status.c:1944

9516 msgid "No commits yet on "

9517 msgstr "Inga incheckningar ännu på "

9518

9424 -#: wt-status.c:1907

9519 +#: wt-status.c:1948

9520 msgid "HEAD (no branch)"

9521 msgstr "HEAD (ingen gren)"

9522

9428 -#: wt-status.c:1938

9523 +#: wt-status.c:1979

9524 msgid "different"

9525 msgstr "olika"

9526

9432 -#: wt-status.c:1940 wt-status.c:1948

9527 +#: wt-status.c:1981 wt-status.c:1989

9528 msgid "behind "

9529 msgstr "efter "

9530

9436 -#: wt-status.c:1943 wt-status.c:1946

9531 +#: wt-status.c:1984 wt-status.c:1987

9532 msgid "ahead "

9533 msgstr "före "

9534

9535 #. TRANSLATORS: the action is e.g. "pull with rebase"

9441 -#: wt-status.c:2468

9536 +#: wt-status.c:2509

9537 #, c-format

9538 msgid "cannot %s: You have unstaged changes."

9539 msgstr "kan inte %s: Du har oköade ändringar."

9540

9446 -#: wt-status.c:2474

9541 +#: wt-status.c:2515

9542 msgid "additionally, your index contains uncommitted changes."

9543 msgstr "dessutom innehåller dit index ändringar som inte har checkats in."

9544

9450 -#: wt-status.c:2476

9545 +#: wt-status.c:2517

9546 #, c-format

9547 msgid "cannot %s: Your index contains uncommitted changes."

9548 msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."

@@ -9524,7 +9619,7 @@ msgstr "testkörning"

9619 msgid "interactive picking"

9620 msgstr "plocka interaktivt"

9621

9527 -#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308

9622 +#: builtin/add.c:326 builtin/checkout.c:1533 builtin/reset.c:308

9623 msgid "select hunks interactively"

9624 msgstr "välj stycken interaktivt"

9625

@@ -9651,12 +9746,12 @@ msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"

9746 msgid "--chmod param '%s' must be either -x or +x"

9747 msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"

9748

9654 -#: builtin/add.c:501 builtin/checkout.c:1703 builtin/commit.c:351

9749 +#: builtin/add.c:501 builtin/checkout.c:1701 builtin/commit.c:351

9750 #: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506

9751 msgid "--pathspec-from-file is incompatible with pathspec arguments"

9752 msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar"

9753

9659 -#: builtin/add.c:508 builtin/checkout.c:1715 builtin/commit.c:357

9754 +#: builtin/add.c:508 builtin/checkout.c:1713 builtin/commit.c:357

9755 #: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512

9756 msgid "--pathspec-file-nul requires --pathspec-from-file"

9757 msgstr "--pathspec-file-nul kräver --pathspec-from-file"

@@ -9921,7 +10016,7 @@ msgstr "historisk flagga -- no-op"

10016 msgid "allow fall back on 3way merging if needed"

10017 msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"

10018

9924 -#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16

10019 +#: builtin/am.c:2218 builtin/init-db.c:559 builtin/prune-packed.c:16

10020 #: builtin/repack.c:306 builtin/stash.c:816

10021 msgid "be quiet"

10022 msgstr "var tyst"

@@ -9976,7 +10071,7 @@ msgstr "n"

10071

10072 #: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38

10073 #: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38

9979 -#: bugreport.c:131

10074 +#: bugreport.c:137

10075 msgid "format"

10076 msgstr "format"

10077

@@ -10271,113 +10366,117 @@ msgstr ""

10366 "ogiltigt argument %s för \"git bisect terms\".\n"

10367 "Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new."

10368

10274 -#: builtin/bisect--helper.c:478

10369 +#: builtin/bisect--helper.c:460 builtin/bisect--helper.c:473

10370 +msgid "'' is not a valid term"

10371 +msgstr "\"\" är inte en giltig term"

10372 +

10373 +#: builtin/bisect--helper.c:483

10374 #, c-format

10375 msgid "unrecognized option: '%s'"

10376 msgstr "okänd flagga: %s"

10377

10279 -#: builtin/bisect--helper.c:482

10378 +#: builtin/bisect--helper.c:487

10379 #, c-format

10380 msgid "'%s' does not appear to be a valid revision"

10381 msgstr "\"%s\" verkar inte vara en giltig revision"

10382

10284 -#: builtin/bisect--helper.c:514

10383 +#: builtin/bisect--helper.c:519

10384 msgid "bad HEAD - I need a HEAD"

10385 msgstr "felaktigt HEAD - Jag behöver ett HEAD"

10386

10288 -#: builtin/bisect--helper.c:529

10387 +#: builtin/bisect--helper.c:534

10388 #, c-format

10389 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."

10390 msgstr ""

10391 "misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"."

10392

10393 # cogito-relaterat

10295 -#: builtin/bisect--helper.c:550

10394 +#: builtin/bisect--helper.c:555

10395 msgid "won't bisect on cg-seek'ed tree"

10396 msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts"

10397

10299 -#: builtin/bisect--helper.c:553

10398 +#: builtin/bisect--helper.c:558

10399 msgid "bad HEAD - strange symbolic ref"

10400 msgstr "felaktigt HEAD - konstig symbolisk referens"

10401

10303 -#: builtin/bisect--helper.c:577

10402 +#: builtin/bisect--helper.c:582

10403 #, c-format

10404 msgid "invalid ref: '%s'"

10405 msgstr "ogiltig referens: \"%s\""

10406

10308 -#: builtin/bisect--helper.c:633

10407 +#: builtin/bisect--helper.c:638

10408 msgid "perform 'git bisect next'"

10409 msgstr "utför 'git bisect next'"

10410

10312 -#: builtin/bisect--helper.c:635

10411 +#: builtin/bisect--helper.c:640

10412 msgid "write the terms to .git/BISECT_TERMS"

10413 msgstr "skriv termerna i .git/BISECT_TERMS"

10414

10316 -#: builtin/bisect--helper.c:637

10415 +#: builtin/bisect--helper.c:642

10416 msgid "cleanup the bisection state"

10417 msgstr "städar upp bisect-tillstånd"

10418

10320 -#: builtin/bisect--helper.c:639

10419 +#: builtin/bisect--helper.c:644

10420 msgid "check for expected revs"

10421 msgstr "kontrollera för förväntade versioner"

10422

10324 -#: builtin/bisect--helper.c:641

10423 +#: builtin/bisect--helper.c:646

10424 msgid "reset the bisection state"

10425 msgstr "återställ bisect-tillstånd"

10426

10328 -#: builtin/bisect--helper.c:643

10427 +#: builtin/bisect--helper.c:648

10428 msgid "write out the bisection state in BISECT_LOG"

10429 msgstr "skriver bisect-tillståndet i BISECT_LOG"

10430

10332 -#: builtin/bisect--helper.c:645

10431 +#: builtin/bisect--helper.c:650

10432 msgid "check and set terms in a bisection state"

10433 msgstr "visa och ange termer för bisect-tillstånd"

10434

10336 -#: builtin/bisect--helper.c:647

10435 +#: builtin/bisect--helper.c:652

10436 msgid "check whether bad or good terms exist"

10437 msgstr "se efter om termer för rätt och fel finns"

10438

10340 -#: builtin/bisect--helper.c:649

10439 +#: builtin/bisect--helper.c:654

10440 msgid "print out the bisect terms"

10441 msgstr "skriv ut termer för bisect"

10442

10344 -#: builtin/bisect--helper.c:651

10443 +#: builtin/bisect--helper.c:656

10444 msgid "start the bisect session"

10445 msgstr "påbörja bisect-körningen"

10446

10348 -#: builtin/bisect--helper.c:653

10447 +#: builtin/bisect--helper.c:658

10448 msgid "update BISECT_HEAD instead of checking out the current commit"

10449 msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning"

10450

10352 -#: builtin/bisect--helper.c:655

10451 +#: builtin/bisect--helper.c:660

10452 msgid "no log for BISECT_WRITE"

10453 msgstr "ingen logg för BISECT_WRITE"

10454

10356 -#: builtin/bisect--helper.c:673

10455 +#: builtin/bisect--helper.c:678

10456 msgid "--write-terms requires two arguments"

10457 msgstr "--write-terms kräver två argument"

10458

10360 -#: builtin/bisect--helper.c:677

10459 +#: builtin/bisect--helper.c:682

10460 msgid "--bisect-clean-state requires no arguments"

10461 msgstr "--bisect-clean-state tar inga argument"

10462

10364 -#: builtin/bisect--helper.c:684

10463 +#: builtin/bisect--helper.c:689

10464 msgid "--bisect-reset requires either no argument or a commit"

10465 msgstr "--bisect-reset kräver antingen inget argument eller en incheckning"

10466

10368 -#: builtin/bisect--helper.c:688

10467 +#: builtin/bisect--helper.c:693

10468 msgid "--bisect-write requires either 4 or 5 arguments"

10469 msgstr "--bisect-write kräver antingen 4 eller 5 argument"

10470

10372 -#: builtin/bisect--helper.c:694

10471 +#: builtin/bisect--helper.c:699

10472 msgid "--check-and-set-terms requires 3 arguments"

10473 msgstr "--check-and-set-terms kräver tre argument"

10474

10376 -#: builtin/bisect--helper.c:700

10475 +#: builtin/bisect--helper.c:705

10476 msgid "--bisect-next-check requires 2 or 3 arguments"

10477 msgstr "--bisect-next-check kräver 2 eller 3 argument"

10478

10380 -#: builtin/bisect--helper.c:706

10479 +#: builtin/bisect--helper.c:711

10480 msgid "--bisect-terms requires 0 or 1 argument"

10481 msgstr "--bisect-terms kräver noll eller ett argument"

10482

@@ -10977,19 +11076,19 @@ msgstr "git bundle list-heads <fil> [<refnamn>...]"

11076 msgid "git bundle unbundle <file> [<refname>...]"

11077 msgstr "git bundle unbundle <fil> [<refnamn>...]"

11078

10980 -#: builtin/bundle.c:66 builtin/pack-objects.c:3376

11079 +#: builtin/bundle.c:66 builtin/pack-objects.c:3448

11080 msgid "do not show progress meter"

11081 msgstr "visa inte förloppsindikator"

11082

10984 -#: builtin/bundle.c:68 builtin/pack-objects.c:3378

11083 +#: builtin/bundle.c:68 builtin/pack-objects.c:3450

11084 msgid "show progress meter"

11085 msgstr "visa förloppsindikator"

11086

10988 -#: builtin/bundle.c:70 builtin/pack-objects.c:3380

11087 +#: builtin/bundle.c:70 builtin/pack-objects.c:3452

11088 msgid "show progress meter during object writing phase"

11089 msgstr "visa förloppsindikator under objektskrivningsfasen"

11090

10992 -#: builtin/bundle.c:73 builtin/pack-objects.c:3383

11091 +#: builtin/bundle.c:73 builtin/pack-objects.c:3455

11092 msgid "similar to --all-progress when progress meter is shown"

11093 msgstr "som --all-progress när förloppsindikatorn visas"

11094

@@ -11029,11 +11128,11 @@ msgstr ""

11128

11129 #: builtin/cat-file.c:599

11130 msgid ""

11032 -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

11033 -"filters]"

11131 +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"

11132 +"symlinks] [--textconv | --filters]"

11133 msgstr ""

11035 -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

11036 -"filters]"

11134 +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"

11135 +"symlinks] [--textconv | --filters]"

11136

11137 #: builtin/cat-file.c:620

11138 msgid "only one batch option may be specified"

@@ -11067,7 +11166,7 @@ msgstr "för blob-objekt, kör filter på objektets innehåll"

11166 msgid "for blob objects, run filters on object's content"

11167 msgstr "för blob-objekt, kör filger på objektets innehåll"

11168

11070 -#: builtin/cat-file.c:648 git-submodule.sh:984

11169 +#: builtin/cat-file.c:648 git-submodule.sh:958

11170 msgid "blob"

11171 msgstr "blob"

11172

@@ -11128,8 +11227,8 @@ msgstr "läs filnamn från standard in"

11227 msgid "terminate input and output records by a NUL character"

11228 msgstr "avsluta in- och utdataposter med NUL-tecken"

11229

11131 -#: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537

11132 -#: builtin/worktree.c:502

11230 +#: builtin/check-ignore.c:21 builtin/checkout.c:1486 builtin/gc.c:537

11231 +#: builtin/worktree.c:561

11232 msgid "suppress progress reporting"

11233 msgstr "undertryck förloppsrapportering"

11234

@@ -11221,7 +11320,7 @@ msgstr "skriv innehåll till temporära filer"

11320 #: builtin/checkout-index.c:178 builtin/column.c:31

11321 #: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403

11322 #: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909

11224 -#: builtin/worktree.c:675

11323 +#: builtin/worktree.c:754

11324 msgid "string"

11325 msgstr "sträng"

11326

@@ -11336,11 +11435,11 @@ msgstr "\"%s\" eller \"%s\" kan inte användas med %s"

11435 msgid "path '%s' is unmerged"

11436 msgstr "sökvägen \"%s\" har inte slagits ihop"

11437

11339 -#: builtin/checkout.c:704

11438 +#: builtin/checkout.c:702

11439 msgid "you need to resolve your current index first"

11440 msgstr "du måste lösa ditt befintliga index först"

11441

11343 -#: builtin/checkout.c:758

11442 +#: builtin/checkout.c:756

11443 #, c-format

11444 msgid ""

11445 "cannot continue with staged changes in the following files:\n"

@@ -11349,50 +11448,50 @@ msgstr ""

11448 "kan inte fortsätta med köade ändringar i följande filer:\n"

11449 "%s"

11450

11352 -#: builtin/checkout.c:861

11451 +#: builtin/checkout.c:859

11452 #, c-format

11453 msgid "Can not do reflog for '%s': %s\n"

11454 msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"

11455

11357 -#: builtin/checkout.c:903

11456 +#: builtin/checkout.c:901

11457 msgid "HEAD is now at"

11458 msgstr "HEAD är nu på"

11459

11361 -#: builtin/checkout.c:907 builtin/clone.c:720

11460 +#: builtin/checkout.c:905 builtin/clone.c:720

11461 msgid "unable to update HEAD"

11462 msgstr "kan inte uppdatera HEAD"

11463

11365 -#: builtin/checkout.c:911

11464 +#: builtin/checkout.c:909

11465 #, c-format

11466 msgid "Reset branch '%s'\n"

11467 msgstr "Återställ gren \"%s\"\n"

11468

11370 -#: builtin/checkout.c:914

11469 +#: builtin/checkout.c:912

11470 #, c-format

11471 msgid "Already on '%s'\n"

11472 msgstr "Redan på \"%s\"\n"

11473

11375 -#: builtin/checkout.c:918

11474 +#: builtin/checkout.c:916

11475 #, c-format

11476 msgid "Switched to and reset branch '%s'\n"

11477 msgstr "Växlade till och nollställde grenen \"%s\"\n"

11478

11380 -#: builtin/checkout.c:920 builtin/checkout.c:1344

11479 +#: builtin/checkout.c:918 builtin/checkout.c:1342

11480 #, c-format

11481 msgid "Switched to a new branch '%s'\n"

11482 msgstr "Växlade till en ny gren \"%s\"\n"

11483

11385 -#: builtin/checkout.c:922

11484 +#: builtin/checkout.c:920

11485 #, c-format

11486 msgid "Switched to branch '%s'\n"

11487 msgstr "Växlade till grenen \"%s\"\n"

11488

11390 -#: builtin/checkout.c:973

11489 +#: builtin/checkout.c:971

11490 #, c-format

11491 msgid " ... and %d more.\n"

11492 msgstr " ... och %d till.\n"

11493

11395 -#: builtin/checkout.c:979

11494 +#: builtin/checkout.c:977

11495 #, c-format

11496 msgid ""

11497 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -11415,7 +11514,7 @@ msgstr[1] ""

11514 "\n"

11515 "%s\n"

11516

11418 -#: builtin/checkout.c:998

11517 +#: builtin/checkout.c:996

11518 #, c-format

11519 msgid ""

11520 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -11442,19 +11541,19 @@ msgstr[1] ""

11541 " git branch <nytt_grennamn> %s\n"

11542 "\n"

11543

11445 -#: builtin/checkout.c:1033

11544 +#: builtin/checkout.c:1031

11545 msgid "internal error in revision walk"

11546 msgstr "internt fel vid genomgång av revisioner (revision walk)"

11547

11449 -#: builtin/checkout.c:1037

11548 +#: builtin/checkout.c:1035

11549 msgid "Previous HEAD position was"

11550 msgstr "Tidigare position för HEAD var"

11551

11453 -#: builtin/checkout.c:1077 builtin/checkout.c:1339

11552 +#: builtin/checkout.c:1075 builtin/checkout.c:1337

11553 msgid "You are on a branch yet to be born"

11554 msgstr "Du är på en gren som ännu inte är född"

11555

11457 -#: builtin/checkout.c:1152

11556 +#: builtin/checkout.c:1150

11557 #, c-format

11558 msgid ""

11559 "'%s' could be both a local file and a tracking branch.\n"

@@ -11463,7 +11562,7 @@ msgstr ""

11562 "\"%s\" kan vara både en lokal fil och en spårande gren.\n"

11563 "Använd -- (och möjligen --no-guess) för att göra otvetydig"

11564

11466 -#: builtin/checkout.c:1159

11565 +#: builtin/checkout.c:1157

11566 msgid ""

11567 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"

11568 "you can do so by fully qualifying the name with the --track option:\n"

@@ -11483,51 +11582,51 @@ msgstr ""

11582 "föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n"

11583 "checkout.defaultRemote=origin i din konfiguration."

11584

11486 -#: builtin/checkout.c:1169

11585 +#: builtin/checkout.c:1167

11586 #, c-format

11587 msgid "'%s' matched multiple (%d) remote tracking branches"

11588 msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar"

11589

11491 -#: builtin/checkout.c:1235

11590 +#: builtin/checkout.c:1233

11591 msgid "only one reference expected"

11592 msgstr "endast en referens förväntades"

11593

11495 -#: builtin/checkout.c:1252

11594 +#: builtin/checkout.c:1250

11595 #, c-format

11596 msgid "only one reference expected, %d given."

11597 msgstr "endast en referens förväntades, %d gavs."

11598

11500 -#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451

11599 +#: builtin/checkout.c:1296 builtin/worktree.c:342 builtin/worktree.c:510

11600 #, c-format

11601 msgid "invalid reference: %s"

11602 msgstr "felaktig referens: %s"

11603

11505 -#: builtin/checkout.c:1311 builtin/checkout.c:1677

11604 +#: builtin/checkout.c:1309 builtin/checkout.c:1675

11605 #, c-format

11606 msgid "reference is not a tree: %s"

11607 msgstr "referensen är inte ett träd: %s"

11608

11510 -#: builtin/checkout.c:1358

11609 +#: builtin/checkout.c:1356

11610 #, c-format

11611 msgid "a branch is expected, got tag '%s'"

11612 msgstr "förväntade gren, fick taggen \"%s\""

11613

11515 -#: builtin/checkout.c:1360

11614 +#: builtin/checkout.c:1358

11615 #, c-format

11616 msgid "a branch is expected, got remote branch '%s'"

11617 msgstr "förväntade gren, fick fjärrgrenen \"%s\""

11618

11520 -#: builtin/checkout.c:1361 builtin/checkout.c:1369

11619 +#: builtin/checkout.c:1359 builtin/checkout.c:1367

11620 #, c-format

11621 msgid "a branch is expected, got '%s'"

11622 msgstr "förväntade gren, fick \"%s\""

11623

11525 -#: builtin/checkout.c:1364

11624 +#: builtin/checkout.c:1362

11625 #, c-format

11626 msgid "a branch is expected, got commit '%s'"

11627 msgstr "förväntade gren, fick incheckningen \"%s\""

11628

11530 -#: builtin/checkout.c:1380

11629 +#: builtin/checkout.c:1378

11630 msgid ""

11631 "cannot switch branch while merging\n"

11632 "Consider \"git merge --quit\" or \"git worktree add\"."

@@ -11535,7 +11634,7 @@ msgstr ""

11634 "kan inte växla gren vid sammanslagning\n"

11635 "Överväg \"git merge --quit\" eller \"git worktree add\"."

11636

11538 -#: builtin/checkout.c:1384

11637 +#: builtin/checkout.c:1382

11638 msgid ""

11639 "cannot switch branch in the middle of an am session\n"

11640 "Consider \"git am --quit\" or \"git worktree add\"."

@@ -11543,7 +11642,7 @@ msgstr ""

11642 "kan inte växla gren mitt i en \"am\"-körning\n"

11643 "Överväg \"git am --quit\" eller \"git worktree add\"."

11644

11546 -#: builtin/checkout.c:1388

11645 +#: builtin/checkout.c:1386

11646 msgid ""

11647 "cannot switch branch while rebasing\n"

11648 "Consider \"git rebase --quit\" or \"git worktree add\"."

@@ -11551,7 +11650,7 @@ msgstr ""

11650 "kan inte växla gren vid ombasering\n"

11651 "Överväg \"git rebase --quit\" eller \"git worktree add\"."

11652

11554 -#: builtin/checkout.c:1392

11653 +#: builtin/checkout.c:1390

11654 msgid ""

11655 "cannot switch branch while cherry-picking\n"

11656 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."

@@ -11559,7 +11658,7 @@ msgstr ""

11658 "kan inte växla gren i en \"cherry-pick\"\n"

11659 "Överväg \"git cherry-pick --quit\" eller \"git worktree add\"."

11660

11562 -#: builtin/checkout.c:1396

11661 +#: builtin/checkout.c:1394

11662 msgid ""

11663 "cannot switch branch while reverting\n"

11664 "Consider \"git revert --quit\" or \"git worktree add\"."

@@ -11567,146 +11666,146 @@ msgstr ""

11666 "kan inte växla gren i en \"revert\"\n"

11667 "Överväg \"git revert --quit\" eller \"git worktree add\"."

11668

11570 -#: builtin/checkout.c:1400

11669 +#: builtin/checkout.c:1398

11670 msgid "you are switching branch while bisecting"

11671 msgstr "då växlar grenar medan du gör en \"bisect\""

11672

11574 -#: builtin/checkout.c:1407

11673 +#: builtin/checkout.c:1405

11674 msgid "paths cannot be used with switching branches"

11675 msgstr "sökvägar kan inte användas vid byte av gren"

11676

11578 -#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418

11677 +#: builtin/checkout.c:1408 builtin/checkout.c:1412 builtin/checkout.c:1416

11678 #, c-format

11679 msgid "'%s' cannot be used with switching branches"

11680 msgstr "\"%s\" kan inte användas vid byte av gren"

11681

11583 -#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428

11584 -#: builtin/checkout.c:1433 builtin/checkout.c:1438

11682 +#: builtin/checkout.c:1420 builtin/checkout.c:1423 builtin/checkout.c:1426

11683 +#: builtin/checkout.c:1431 builtin/checkout.c:1436

11684 #, c-format

11685 msgid "'%s' cannot be used with '%s'"

11686 msgstr "\"%s\" kan inte användas med \"%s\""

11687

11589 -#: builtin/checkout.c:1435

11688 +#: builtin/checkout.c:1433

11689 #, c-format

11690 msgid "'%s' cannot take <start-point>"

11691 msgstr "\"%s\" kan inte ta <startpunkt>"

11692

11594 -#: builtin/checkout.c:1443

11693 +#: builtin/checkout.c:1441

11694 #, c-format

11695 msgid "Cannot switch branch to a non-commit '%s'"

11696 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""

11697

11599 -#: builtin/checkout.c:1450

11698 +#: builtin/checkout.c:1448

11699 msgid "missing branch or commit argument"

11700 msgstr "saknar gren- eller incheckingsargument"

11701

11603 -#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80

11604 -#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288

11702 +#: builtin/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82

11703 +#: builtin/commit-graph.c:189 builtin/fetch.c:168 builtin/merge.c:288

11704 #: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561

11705 #: builtin/send-pack.c:173

11706 msgid "force progress reporting"

11707 msgstr "tvinga förloppsrapportering"

11708

11610 -#: builtin/checkout.c:1493

11709 +#: builtin/checkout.c:1491

11710 msgid "perform a 3-way merge with the new branch"

11711 msgstr "utför en 3-vägssammanslagning för den nya grenen"

11712

11614 -#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322

11713 +#: builtin/checkout.c:1492 builtin/log.c:1709 parse-options.h:322

11714 msgid "style"

11715 msgstr "stil"

11716

11618 -#: builtin/checkout.c:1495

11717 +#: builtin/checkout.c:1493

11718 msgid "conflict style (merge or diff3)"

11719 msgstr "konfliktstil (merge eller diff3)"

11720

11622 -#: builtin/checkout.c:1507 builtin/worktree.c:499

11721 +#: builtin/checkout.c:1505 builtin/worktree.c:558

11722 msgid "detach HEAD at named commit"

11723 msgstr "koppla från HEAD vid namngiven incheckning"

11724

11626 -#: builtin/checkout.c:1508

11725 +#: builtin/checkout.c:1506

11726 msgid "set upstream info for new branch"

11727 msgstr "sätt uppströmsinformation för ny gren"

11728

11630 -#: builtin/checkout.c:1510

11729 +#: builtin/checkout.c:1508

11730 msgid "force checkout (throw away local modifications)"

11731 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"

11732

11634 -#: builtin/checkout.c:1512

11733 +#: builtin/checkout.c:1510

11734 msgid "new-branch"

11735 msgstr "ny-gren"

11736

11638 -#: builtin/checkout.c:1512

11737 +#: builtin/checkout.c:1510

11738 msgid "new unparented branch"

11739 msgstr "ny gren utan förälder"

11740

11642 -#: builtin/checkout.c:1514 builtin/merge.c:292

11741 +#: builtin/checkout.c:1512 builtin/merge.c:292

11742 msgid "update ignored files (default)"

11743 msgstr "uppdatera ignorerade filer (standard)"

11744

11646 -#: builtin/checkout.c:1517

11745 +#: builtin/checkout.c:1515

11746 msgid "do not check if another worktree is holding the given ref"

11747 msgstr ""

11748 "kontrollera inte om en annan arbetskatalog håller den angivna referensen"

11749

11651 -#: builtin/checkout.c:1530

11750 +#: builtin/checkout.c:1528

11751 msgid "checkout our version for unmerged files"

11752 msgstr "checka ut vår version för ej sammanslagna filer"

11753

11655 -#: builtin/checkout.c:1533

11754 +#: builtin/checkout.c:1531

11755 msgid "checkout their version for unmerged files"

11756 msgstr "checka ut deras version för ej sammanslagna filer"

11757

11659 -#: builtin/checkout.c:1537

11758 +#: builtin/checkout.c:1535

11759 msgid "do not limit pathspecs to sparse entries only"

11760 msgstr "begränsa inte sökvägar till endast glesa poster"

11761

11663 -#: builtin/checkout.c:1592

11762 +#: builtin/checkout.c:1590

11763 #, c-format

11764 msgid "-%c, -%c and --orphan are mutually exclusive"

11765 msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande"

11766

11668 -#: builtin/checkout.c:1596

11767 +#: builtin/checkout.c:1594

11768 msgid "-p and --overlay are mutually exclusive"

11769 msgstr "-p och --overlay är ömsesidigt uteslutande"

11770

11672 -#: builtin/checkout.c:1633

11771 +#: builtin/checkout.c:1631

11772 msgid "--track needs a branch name"

11773 msgstr "--track behöver ett namn på en gren"

11774

11676 -#: builtin/checkout.c:1638

11775 +#: builtin/checkout.c:1636

11776 #, c-format

11777 msgid "missing branch name; try -%c"

11778 msgstr "grennamn saknas; försök med -%c"

11779

11681 -#: builtin/checkout.c:1670

11780 +#: builtin/checkout.c:1668

11781 #, c-format

11782 msgid "could not resolve %s"

11783 msgstr "kunde inte upplösa %s"

11784

11686 -#: builtin/checkout.c:1686

11785 +#: builtin/checkout.c:1684

11786 msgid "invalid path specification"

11787 msgstr "felaktig sökvägsangivelse"

11788

11690 -#: builtin/checkout.c:1693

11789 +#: builtin/checkout.c:1691

11790 #, c-format

11791 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"

11792 msgstr ""

11793 "\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den"

11794

11696 -#: builtin/checkout.c:1697

11795 +#: builtin/checkout.c:1695

11796 #, c-format

11797 msgid "git checkout: --detach does not take a path argument '%s'"

11798 msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""

11799

11701 -#: builtin/checkout.c:1706

11800 +#: builtin/checkout.c:1704

11801 msgid "--pathspec-from-file is incompatible with --detach"

11802 msgstr "--pathspec-from-file är inkompatibelt med --detach"

11803

11705 -#: builtin/checkout.c:1709 builtin/reset.c:325 builtin/stash.c:1503

11804 +#: builtin/checkout.c:1707 builtin/reset.c:325 builtin/stash.c:1503

11805 msgid "--pathspec-from-file is incompatible with --patch"

11806 msgstr "--pathspec-from-file är inkompatibelt med --patch"

11807

11709 -#: builtin/checkout.c:1720

11808 +#: builtin/checkout.c:1718

11809 msgid ""

11810 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

11811 "checking out of the index."

@@ -11714,69 +11813,70 @@ msgstr ""

11813 "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"

11814 "du checkar ut från indexet."

11815

11717 -#: builtin/checkout.c:1725

11816 +#: builtin/checkout.c:1723

11817 msgid "you must specify path(s) to restore"

11818 msgstr "du måste ange katalog(er) att återställa"

11819

11721 -#: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802

11722 -#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170

11723 -#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497

11820 +#: builtin/checkout.c:1749 builtin/checkout.c:1751 builtin/checkout.c:1800

11821 +#: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170

11822 +#: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554

11823 +#: builtin/worktree.c:556

11824 msgid "branch"

11825 msgstr "gren"

11826

11727 -#: builtin/checkout.c:1752

11827 +#: builtin/checkout.c:1750

11828 msgid "create and checkout a new branch"

11829 msgstr "skapa och checka ut en ny gren"

11830

11731 -#: builtin/checkout.c:1754

11831 +#: builtin/checkout.c:1752

11832 msgid "create/reset and checkout a branch"

11833 msgstr "skapa/nollställ och checka ut en gren"

11834

11735 -#: builtin/checkout.c:1755

11835 +#: builtin/checkout.c:1753

11836 msgid "create reflog for new branch"

11837 msgstr "skapa reflogg för ny gren"

11838

11739 -#: builtin/checkout.c:1757

11839 +#: builtin/checkout.c:1755

11840 msgid "second guess 'git checkout <no-such-branch>' (default)"

11841 msgstr "förutspå \"git checkout <gren-saknas>\" (förval)"

11842

11743 -#: builtin/checkout.c:1758

11843 +#: builtin/checkout.c:1756

11844 msgid "use overlay mode (default)"

11845 msgstr "använd överläggsläge (standard)"

11846

11747 -#: builtin/checkout.c:1803

11847 +#: builtin/checkout.c:1801

11848 msgid "create and switch to a new branch"

11849 msgstr "skapa och växla till en ny gren"

11850

11751 -#: builtin/checkout.c:1805

11851 +#: builtin/checkout.c:1803

11852 msgid "create/reset and switch to a branch"

11853 msgstr "skapa/nollställ och växla till en gren"

11854

11755 -#: builtin/checkout.c:1807

11855 +#: builtin/checkout.c:1805

11856 msgid "second guess 'git switch <no-such-branch>'"

11857 msgstr "förutspå \"git checkout <gren-saknas>\""

11858

11759 -#: builtin/checkout.c:1809

11859 +#: builtin/checkout.c:1807

11860 msgid "throw away local modifications"

11861 msgstr "kasta bort lokala ändringar"

11862

11763 -#: builtin/checkout.c:1843

11863 +#: builtin/checkout.c:1841

11864 msgid "which tree-ish to checkout from"

11865 msgstr "vilken träd-igt att checka ut från"

11866

11767 -#: builtin/checkout.c:1845

11867 +#: builtin/checkout.c:1843

11868 msgid "restore the index"

11869 msgstr "återställ indexet"

11870

11771 -#: builtin/checkout.c:1847

11871 +#: builtin/checkout.c:1845

11872 msgid "restore the working tree (default)"

11873 msgstr "återställ arbetskatalogen (förval)"

11874

11775 -#: builtin/checkout.c:1849

11875 +#: builtin/checkout.c:1847

11876 msgid "ignore unmerged entries"

11877 msgstr "ignorera ej sammanslagna poster"

11878

11779 -#: builtin/checkout.c:1850

11879 +#: builtin/checkout.c:1848

11880 msgid "use overlay mode"

11881 msgstr "använd överläggsläge"

11882

@@ -11940,11 +12040,7 @@ msgstr "ta även bort ignorerade filer"

12040 msgid "remove only ignored files"

12041 msgstr "ta endast bort ignorerade filer"

12042

11943 -#: builtin/clean.c:931

11944 -msgid "-x and -X cannot be used together"

11945 -msgstr "-x och -X kan inte användas samtidigt"

11946 -

11947 -#: builtin/clean.c:935

12043 +#: builtin/clean.c:929

12044 msgid ""

12045 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

12046 "clean"

@@ -11952,7 +12048,7 @@ msgstr ""

12048 "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "

12049 "städa"

12050

11955 -#: builtin/clean.c:938

12051 +#: builtin/clean.c:932

12052 msgid ""

12053 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

12054 "refusing to clean"

@@ -11960,6 +12056,10 @@ msgstr ""

12056 "clean.requireForce har standardvärdet true och varken -i, -n eller -f "

12057 "angavs; vägrar städa"

12058

12059 +#: builtin/clean.c:944

12060 +msgid "-x and -X cannot be used together"

12061 +msgstr "-x och -X kan inte användas samtidigt"

12062 +

12063 #: builtin/clone.c:45

12064 msgid "git clone [<options>] [--] <repo> [<dir>]"

12065 msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"

@@ -11968,7 +12068,7 @@ msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"

12068 msgid "don't create a checkout"

12069 msgstr "skapa inte någon utcheckning"

12070

11971 -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536

12071 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:554

12072 msgid "create a bare repository"

12073 msgstr "skapa ett naket (\"bare\") arkiv"

12074

@@ -12000,11 +12100,11 @@ msgstr "initiera undermoduler i klonen"

12100 msgid "number of submodules cloned in parallel"

12101 msgstr "antal undermoduler som klonas parallellt"

12102

12003 -#: builtin/clone.c:111 builtin/init-db.c:533

12103 +#: builtin/clone.c:111 builtin/init-db.c:551

12104 msgid "template-directory"

12105 msgstr "mallkatalog"

12106

12007 -#: builtin/clone.c:112 builtin/init-db.c:534

12107 +#: builtin/clone.c:112 builtin/init-db.c:552

12108 msgid "directory from which templates will be used"

12109 msgstr "katalog att använda mallar från"

12110

@@ -12018,8 +12118,8 @@ msgstr "referensarkiv"

12118 msgid "use --reference only while cloning"

12119 msgstr "använd --reference endast under kloningen"

12120

12021 -#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46

12022 -#: builtin/pack-objects.c:3442 builtin/repack.c:329

12121 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:562

12122 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329

12123 msgid "name"

12124 msgstr "namn"

12125

@@ -12044,7 +12144,7 @@ msgstr "djup"

12144 msgid "create a shallow clone of that depth"

12145 msgstr "skapa en grund klon på detta djup"

12146

12047 -#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431

12147 +#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3503

12148 #: builtin/pull.c:211

12149 msgid "time"

12150 msgstr "tid"

@@ -12075,11 +12175,11 @@ msgstr "klona inga taggar och gör att senare hämtningar inte följer dem"

12175 msgid "any cloned submodules will be shallow"

12176 msgstr "klonade undermoduler kommer vara grunda"

12177

12078 -#: builtin/clone.c:137 builtin/init-db.c:542

12178 +#: builtin/clone.c:137 builtin/init-db.c:560

12179 msgid "gitdir"

12180 msgstr "gitkat"

12181

12082 -#: builtin/clone.c:138 builtin/init-db.c:543

12182 +#: builtin/clone.c:138 builtin/init-db.c:561

12183 msgid "separate git dir from working tree"

12184 msgstr "separera gitkatalogen från arbetskatalogen"

12185

@@ -12209,7 +12309,7 @@ msgstr "kan inte packa om för att städa upp"

12309 msgid "cannot unlink temporary alternates file"

12310 msgstr "kunde inte ta bort temporär \"alternates\"-fil"

12311

12212 -#: builtin/clone.c:971 builtin/receive-pack.c:1972

12312 +#: builtin/clone.c:971 builtin/receive-pack.c:1982

12313 msgid "Too many arguments."

12314 msgstr "För många argument."

12315

@@ -12226,85 +12326,85 @@ msgstr "flaggorna --bare och --origin %s är inkompatibla."

12326 msgid "--bare and --separate-git-dir are incompatible."

12327 msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."

12328

12229 -#: builtin/clone.c:1004

12329 +#: builtin/clone.c:1007

12330 #, c-format

12331 msgid "repository '%s' does not exist"

12332 msgstr "arkivet \"%s\" finns inte"

12333

12234 -#: builtin/clone.c:1010 builtin/fetch.c:1789

12334 +#: builtin/clone.c:1011 builtin/fetch.c:1794

12335 #, c-format

12336 msgid "depth %s is not a positive number"

12337 msgstr "djupet %s är inte ett positivt tal"

12338

12239 -#: builtin/clone.c:1020

12339 +#: builtin/clone.c:1021

12340 #, c-format

12341 msgid "destination path '%s' already exists and is not an empty directory."

12342 msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."

12343

12244 -#: builtin/clone.c:1030

12344 +#: builtin/clone.c:1033

12345 #, c-format

12346 msgid "working tree '%s' already exists."

12347 msgstr "arbetsträdet \"%s\" finns redan."

12348

12249 -#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271

12250 -#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327

12349 +#: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271

12350 +#: builtin/log.c:1886 builtin/worktree.c:354 builtin/worktree.c:386

12351 #, c-format

12352 msgid "could not create leading directories of '%s'"

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

12354

12255 -#: builtin/clone.c:1050

12355 +#: builtin/clone.c:1053

12356 #, c-format

12357 msgid "could not create work tree dir '%s'"

12358 msgstr "kunde inte skapa arbetskatalogen \"%s\""

12359

12260 -#: builtin/clone.c:1070

12360 +#: builtin/clone.c:1073

12361 #, c-format

12362 msgid "Cloning into bare repository '%s'...\n"

12363 msgstr "Klonar till ett naket arkiv \"%s\"...\n"

12364

12265 -#: builtin/clone.c:1072

12365 +#: builtin/clone.c:1075

12366 #, c-format

12367 msgid "Cloning into '%s'...\n"

12368 msgstr "Klonar till \"%s\"...\n"

12369

12270 -#: builtin/clone.c:1096

12370 +#: builtin/clone.c:1099

12371 msgid ""

12372 "clone --recursive is not compatible with both --reference and --reference-if-"

12373 "able"

12374 msgstr ""

12375 "clone --recursive är inte kompatibel med --reference och --reference-if-able"

12376

12277 -#: builtin/clone.c:1160

12377 +#: builtin/clone.c:1164

12378 msgid "--depth is ignored in local clones; use file:// instead."

12379 msgstr "--depth ignoreras i lokala kloningar; använd file:// istället."

12380

12281 -#: builtin/clone.c:1162

12381 +#: builtin/clone.c:1166

12382 msgid "--shallow-since is ignored in local clones; use file:// instead."

12383 msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället."

12384

12285 -#: builtin/clone.c:1164

12385 +#: builtin/clone.c:1168

12386 msgid "--shallow-exclude is ignored in local clones; use file:// instead."

12387 msgstr ""

12388 "--shallow-exclude ignoreras i lokala kloningar; använd file:// istället."

12389

12290 -#: builtin/clone.c:1166

12390 +#: builtin/clone.c:1170

12391 msgid "--filter is ignored in local clones; use file:// instead."

12392 msgstr "--filter ignoreras i lokala kloningar; använd file:// istället."

12393

12294 -#: builtin/clone.c:1169

12394 +#: builtin/clone.c:1173

12395 msgid "source repository is shallow, ignoring --local"

12396 msgstr "källarkivet är grunt, ignorerar --local"

12397

12298 -#: builtin/clone.c:1174

12398 +#: builtin/clone.c:1178

12399 msgid "--local is ignored"

12400 msgstr "--local ignoreras"

12401

12302 -#: builtin/clone.c:1249 builtin/clone.c:1257

12402 +#: builtin/clone.c:1262 builtin/clone.c:1270

12403 #, c-format

12404 msgid "Remote branch %s not found in upstream %s"

12405 msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"

12406

12307 -#: builtin/clone.c:1260

12407 +#: builtin/clone.c:1273

12408 msgid "You appear to have cloned an empty repository."

12409 msgstr "Du verkar ha klonat ett tomt arkiv."

12410

@@ -12340,13 +12440,13 @@ msgstr "Spaltfyllnad mellan spalter"

12440 msgid "--command must be the first argument"

12441 msgstr "--command måste vara första argument"

12442

12343 -#: builtin/commit-graph.c:11 builtin/commit-graph.c:19

12443 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:21

12444 msgid ""

12445 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"

12446 msgstr ""

12447 "git commit-graph verify [--object-dir <objkat>] [--shallow] [--[no-]progress]"

12448

12349 -#: builtin/commit-graph.c:12 builtin/commit-graph.c:24

12449 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:26

12450 msgid ""

12451 "git commit-graph write [--object-dir <objdir>] [--append] [--"

12452 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"

@@ -12356,80 +12456,89 @@ msgstr ""

12456 "split[=<strategi>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"

12457 "paths] [--[no-]progress] <delnings-flaggor>"

12458

12359 -#: builtin/commit-graph.c:60

12459 +#: builtin/commit-graph.c:62

12460 #, c-format

12461 msgid "could not find object directory matching %s"

12462 msgstr "kunde inte hitta objektkatalog för %s"

12463

12364 -#: builtin/commit-graph.c:76 builtin/commit-graph.c:152

12365 -#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678

12464 +#: builtin/commit-graph.c:78 builtin/commit-graph.c:177

12465 +#: builtin/commit-graph.c:276 builtin/fetch.c:180 builtin/log.c:1678

12466 msgid "dir"

12467 msgstr "kat"

12468

12369 -#: builtin/commit-graph.c:77 builtin/commit-graph.c:153

12370 -#: builtin/commit-graph.c:258

12469 +#: builtin/commit-graph.c:79 builtin/commit-graph.c:178

12470 +#: builtin/commit-graph.c:277

12471 msgid "The object directory to store the graph"

12472 msgstr "Objektkatalogen där grafen ska lagras"

12473

12374 -#: builtin/commit-graph.c:79

12474 +#: builtin/commit-graph.c:81

12475 msgid "if the commit-graph is split, only verify the tip file"

12476 msgstr "om inchecknignsgrafen är delad, kontrollera bara spetsfilen"

12477

12378 -#: builtin/commit-graph.c:102

12478 +#: builtin/commit-graph.c:104

12479 #, c-format

12480 msgid "Could not open commit-graph '%s'"

12481 msgstr "Kunde inte öppna incheckningsgrafen \"%s\""

12482

12383 -#: builtin/commit-graph.c:136

12483 +#: builtin/commit-graph.c:138

12484 #, c-format

12485 msgid "unrecognized --split argument, %s"

12486 msgstr "okänt argument för --split, %s"

12487

12388 -#: builtin/commit-graph.c:155

12488 +#: builtin/commit-graph.c:151

12489 +#, c-format

12490 +msgid "unexpected non-hex object ID: %s"

12491 +msgstr "oväntat icke-hexadecimalt objekt-ID: %s"

12492 +

12493 +#: builtin/commit-graph.c:156

12494 +#, c-format

12495 +msgid "invalid object: %s"

12496 +msgstr "ogiltigt objekt: %s"

12497 +

12498 +#: builtin/commit-graph.c:180

12499 msgid "start walk at all refs"

12500 msgstr "starta traversering vid alla referenser"

12501

12392 -#: builtin/commit-graph.c:157

12502 +#: builtin/commit-graph.c:182

12503 msgid "scan pack-indexes listed by stdin for commits"

12504 msgstr "sök paketindex listade på standard in efter incheckningar"

12505

12396 -#: builtin/commit-graph.c:159

12506 +#: builtin/commit-graph.c:184

12507 msgid "start walk at commits listed by stdin"

12508 msgstr "börja gå genom incheckningar listade på standard in"

12509

12400 -#: builtin/commit-graph.c:161

12510 +#: builtin/commit-graph.c:186

12511 msgid "include all commits already in the commit-graph file"

12512 msgstr "ta med alla incheckningar redan i filen commit-graph"

12513

12404 -#: builtin/commit-graph.c:163

12514 +#: builtin/commit-graph.c:188

12515 msgid "enable computation for changed paths"

12516 msgstr "aktivera beräkning av ändrade sökvägar"

12517

12408 -#: builtin/commit-graph.c:166

12518 +#: builtin/commit-graph.c:191

12519 msgid "allow writing an incremental commit-graph file"

12520 msgstr "tillåt skriva en inkrementell incheckningsgraffil"

12521

12412 -#: builtin/commit-graph.c:170

12522 +#: builtin/commit-graph.c:195

12523 msgid "maximum number of commits in a non-base split commit-graph"

12524 msgstr ""

12525 "maximalt antal incheckningar i en delad incheckingsgraf som inte är bad"

12526

12417 -#: builtin/commit-graph.c:172

12527 +#: builtin/commit-graph.c:197

12528 msgid "maximum ratio between two levels of a split commit-graph"

12529 msgstr "maximalt förhållande mellan två nivåer av en delad incheckningsgraf"

12530

12421 -#: builtin/commit-graph.c:174

12531 +#: builtin/commit-graph.c:199

12532 msgid "only expire files older than a given date-time"

12533 msgstr "låt tid endast gå ut för filer äldre än givet datum och tid"

12534

12425 -#: builtin/commit-graph.c:190

12535 +#: builtin/commit-graph.c:215

12536 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"

12537 msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs"

12538

12429 -#: builtin/commit-graph.c:229

12430 -#, c-format

12431 -msgid "unexpected non-hex object ID: %s"

12432 -msgstr "förväntade icke-hexadecimalt objekt-ID: %s"

12539 +#: builtin/commit-graph.c:245

12540 +msgid "Collecting commits from input"

12541 +msgstr "Hämtar incheckningar från indata"

12542

12543 #: builtin/commit-tree.c:18

12544 msgid ""

@@ -12832,7 +12941,7 @@ msgid "version"

12941 msgstr "version"

12942

12943 #: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549

12835 -#: builtin/worktree.c:646

12944 +#: builtin/worktree.c:722

12945 msgid "machine-readable output"

12946 msgstr "maskinläsbar utdata"

12947

@@ -12845,8 +12954,8 @@ msgid "terminate entries with NUL"

12954 msgstr "terminera poster med NUL"

12955

12956 #: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543

12848 -#: builtin/fast-export.c:1153 builtin/fast-export.c:1156

12849 -#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336

12957 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202

12958 +#: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336

12959 msgid "mode"

12960 msgstr "läge"

12961

@@ -13531,35 +13640,45 @@ msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"

13640 msgid "--broken is incompatible with commit-ishes"

13641 msgstr "--broken är inkompatibelt med \"commit-ish\"-värden"

13642

13534 -#: builtin/diff.c:84

13643 +#: builtin/diff.c:91

13644 #, c-format

13645 msgid "'%s': not a regular file or symlink"

13646 msgstr "\"%s\": inte en normal fil eller symbolisk länk"

13647

13539 -#: builtin/diff.c:235

13648 +#: builtin/diff.c:242

13649 #, c-format

13650 msgid "invalid option: %s"

13651 msgstr "ogiltig flagga: %s"

13652

13544 -#: builtin/diff.c:350

13653 +#: builtin/diff.c:359

13654 +#, c-format

13655 +msgid "%s...%s: no merge base"

13656 +msgstr "%s...%s: ingen sammanslagningsbas"

13657 +

13658 +#: builtin/diff.c:469

13659 msgid "Not a git repository"

13660 msgstr "Inte ett git-arkiv"

13661

13548 -#: builtin/diff.c:394

13662 +#: builtin/diff.c:514

13663 #, c-format

13664 msgid "invalid object '%s' given."

13665 msgstr "objektet \"%s\" som angavs är felaktigt."

13666

13553 -#: builtin/diff.c:403

13667 +#: builtin/diff.c:525

13668 #, c-format

13669 msgid "more than two blobs given: '%s'"

13670 msgstr "mer än två blobbar angavs: \"%s\""

13671

13558 -#: builtin/diff.c:408

13672 +#: builtin/diff.c:530

13673 #, c-format

13674 msgid "unhandled object '%s' given."

13675 msgstr "ej hanterat objekt \"%s\" angavs."

13676

13677 +#: builtin/diff.c:564

13678 +#, c-format

13679 +msgid "%s...%s: multiple merge bases, using %s"

13680 +msgstr "%s...%s: flera sammanslagningsbaser, använder %s"

13681 +

13682 #: builtin/difftool.c:30

13683 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"

13684 msgstr ""

@@ -13711,82 +13830,103 @@ msgstr ""

13830 msgid "git fast-export [rev-list-opts]"

13831 msgstr "git fast-export [rev-list-flaggor]"

13832

13714 -#: builtin/fast-export.c:853

13833 +#: builtin/fast-export.c:868

13834 msgid "Error: Cannot export nested tags unless --mark-tags is specified."

13835 msgstr "Fel: Kan inte exportera nästlade taggar såvida inte --mark-tags anges."

13836

13718 -#: builtin/fast-export.c:1152

13837 +#: builtin/fast-export.c:1178

13838 +msgid "--anonymize-map token cannot be empty"

13839 +msgstr "symbolen för --anonymize-map kan inte vara tom"

13840 +

13841 +#: builtin/fast-export.c:1198

13842 msgid "show progress after <n> objects"

13843 msgstr "visa förlopp efter <n> objekt"

13844

13722 -#: builtin/fast-export.c:1154

13845 +#: builtin/fast-export.c:1200

13846 msgid "select handling of signed tags"

13847 msgstr "välj hantering av signerade taggar"

13848

13726 -#: builtin/fast-export.c:1157

13849 +#: builtin/fast-export.c:1203

13850 msgid "select handling of tags that tag filtered objects"

13851 msgstr "välj hantering av taggar som har taggfiltrerade objekt"

13852

13730 -#: builtin/fast-export.c:1160

13853 +#: builtin/fast-export.c:1206

13854 msgid "select handling of commit messages in an alternate encoding"

13855 msgstr "välj hantering av incheckningsmeddelanden i alternativ teckenkodning"

13856

13734 -#: builtin/fast-export.c:1163

13857 +#: builtin/fast-export.c:1209

13858 msgid "Dump marks to this file"

13859 msgstr "Dumpa märken till filen"

13860

13738 -#: builtin/fast-export.c:1165

13861 +#: builtin/fast-export.c:1211

13862 msgid "Import marks from this file"

13863 msgstr "Importera märken från filen"

13864

13742 -#: builtin/fast-export.c:1169

13865 +#: builtin/fast-export.c:1215

13866 msgid "Import marks from this file if it exists"

13867 msgstr "Importera märken från filen, om den finns"

13868

13746 -#: builtin/fast-export.c:1171

13869 +#: builtin/fast-export.c:1217

13870 msgid "Fake a tagger when tags lack one"

13871 msgstr "Fejka taggare när taggen saknar en"

13872

13750 -#: builtin/fast-export.c:1173

13873 +#: builtin/fast-export.c:1219

13874 msgid "Output full tree for each commit"

13875 msgstr "Skriv ut hela trädet för varje incheckning"

13876

13754 -#: builtin/fast-export.c:1175

13877 +#: builtin/fast-export.c:1221

13878 msgid "Use the done feature to terminate the stream"

13879 msgstr "Använd done-funktionen för att avsluta strömmen"

13880

13758 -#: builtin/fast-export.c:1176

13881 +#: builtin/fast-export.c:1222

13882 msgid "Skip output of blob data"

13883 msgstr "Hoppa över skrivning av blob-data"

13884

13762 -#: builtin/fast-export.c:1177 builtin/log.c:1724

13885 +#: builtin/fast-export.c:1223 builtin/log.c:1724

13886 msgid "refspec"

13887 msgstr "referensspecifikation"

13888

13766 -#: builtin/fast-export.c:1178

13889 +#: builtin/fast-export.c:1224

13890 msgid "Apply refspec to exported refs"

13891 msgstr "Applicera referensspecifikation på exporterade referenser"

13892

13770 -#: builtin/fast-export.c:1179

13893 +#: builtin/fast-export.c:1225

13894 msgid "anonymize output"

13895 msgstr "anonymisera utdata"

13896

13774 -#: builtin/fast-export.c:1181

13897 +#: builtin/fast-export.c:1226

13898 +msgid "from:to"

13899 +msgstr "från:till"

13900 +

13901 +#: builtin/fast-export.c:1227

13902 +msgid "convert <from> to <to> in anonymized output"

13903 +msgstr "konvertera <från> till <till> i anonymiserad utdata"

13904 +

13905 +#: builtin/fast-export.c:1230

13906 msgid "Reference parents which are not in fast-export stream by object id"

13907 msgstr "Referera föräldrar som inte finns i fast-export-ström med objekt-id"

13908

13778 -#: builtin/fast-export.c:1183

13909 +#: builtin/fast-export.c:1232

13910 msgid "Show original object ids of blobs/commits"

13911 msgstr "Visa ursprungliga objekt-id för blobbar/incheckningar"

13912

13782 -#: builtin/fast-export.c:1185

13913 +#: builtin/fast-export.c:1234

13914 msgid "Label tags with mark ids"

13915 msgstr "Märk taggar med märke-id"

13916

13786 -#: builtin/fast-export.c:1220

13917 +#: builtin/fast-export.c:1257

13918 +msgid "--anonymize-map without --anonymize does not make sense"

13919 +msgstr "--anonymize-map utan --anonymize ger ingen mening"

13920 +

13921 +#: builtin/fast-export.c:1272

13922 msgid "Cannot pass both --import-marks and --import-marks-if-exists"

13923 msgstr "Kan inte ange både --import-marks och --import-marks-if-exists"

13924

13925 +#: builtin/fetch-pack.c:245

13926 +#, c-format

13927 +msgid "Lockfile created but not reported: %s"

13928 +msgstr "Låsfil skapad men inte rapporterad: %s"

13929 +

13930 #: builtin/fetch.c:35

13931 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

13932 msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"

@@ -14112,40 +14252,40 @@ msgstr ""

14252 msgid "You need to specify a tag name."

14253 msgstr "Du måste ange namnet på en tagg."

14254

14115 -#: builtin/fetch.c:1773

14255 +#: builtin/fetch.c:1778

14256 msgid "Negative depth in --deepen is not supported"

14257 msgstr "Negativa djup stöds inte i --deepen"

14258

14119 -#: builtin/fetch.c:1775

14259 +#: builtin/fetch.c:1780

14260 msgid "--deepen and --depth are mutually exclusive"

14261 msgstr "--deepen och --depth är ömsesidigt uteslutande"

14262

14123 -#: builtin/fetch.c:1780

14263 +#: builtin/fetch.c:1785

14264 msgid "--depth and --unshallow cannot be used together"

14265 msgstr "--depth och --unshallow kan inte användas samtidigt"

14266

14127 -#: builtin/fetch.c:1782

14267 +#: builtin/fetch.c:1787

14268 msgid "--unshallow on a complete repository does not make sense"

14269 msgstr "--unshallow kan inte användas på ett komplett arkiv"

14270

14131 -#: builtin/fetch.c:1798

14271 +#: builtin/fetch.c:1800

14272 msgid "fetch --all does not take a repository argument"

14273 msgstr "fetch --all tar inte namnet på ett arkiv som argument"

14274

14135 -#: builtin/fetch.c:1800

14275 +#: builtin/fetch.c:1802

14276 msgid "fetch --all does not make sense with refspecs"

14277 msgstr "fetch --all kan inte anges med referensspecifikationer"

14278

14139 -#: builtin/fetch.c:1809

14279 +#: builtin/fetch.c:1811

14280 #, c-format

14281 msgid "No such remote or remote group: %s"

14282 msgstr "Fjärren eller fjärrgruppen finns inte: %s"

14283

14144 -#: builtin/fetch.c:1816

14284 +#: builtin/fetch.c:1818

14285 msgid "Fetching a group and specifying refspecs does not make sense"

14286 msgstr "Kan inte hämta från grupp och ange referensspecifikationer"

14287

14148 -#: builtin/fetch.c:1834

14288 +#: builtin/fetch.c:1836

14289 msgid ""

14290 "--filter can only be used with the remote configured in extensions."

14291 "partialclone"

@@ -14604,8 +14744,8 @@ msgstr "felaktigt antal trådar angivet (%d) för %s"

14744 #. variable for tweaking threads, currently

14745 #. grep.threads

14746 #.

14607 -#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730

14608 -#: builtin/pack-objects.c:2855

14747 +#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1727

14748 +#: builtin/pack-objects.c:2904

14749 #, c-format

14750 msgid "no threads support, ignoring %s"

14751 msgstr "trådstöd saknas, ignorerar %s"

@@ -14834,11 +14974,11 @@ msgstr "--untracked stöds inte med --recurse-submodules"

14974 msgid "invalid option combination, ignoring --threads"

14975 msgstr "ogiltig kombination av flaggor, ignorerar --threads"

14976

14837 -#: builtin/grep.c:1084 builtin/pack-objects.c:3548

14977 +#: builtin/grep.c:1084 builtin/pack-objects.c:3623

14978 msgid "no threads support, ignoring --threads"

14979 msgstr "trådstöd saknas, ignorerar --threads"

14980

14841 -#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852

14981 +#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2901

14982 #, c-format

14983 msgid "invalid number of threads specified (%d)"

14984 msgstr "felaktigt antal trådar angivet (%d)"

@@ -15040,7 +15180,7 @@ msgstr "indataläsfel"

15180 msgid "used more bytes than were available"

15181 msgstr "använde fler byte än tillgängligt"

15182

15043 -#: builtin/index-pack.c:288 builtin/pack-objects.c:607

15183 +#: builtin/index-pack.c:288 builtin/pack-objects.c:618

15184 msgid "pack too large for current definition of off_t"

15185 msgstr "paket för stort för nuvarande definition av off_t"

15186

@@ -15111,8 +15251,8 @@ msgstr "allvarlig inflate-inkonsekvens"

15251 msgid "SHA1 COLLISION FOUND WITH %s !"

15252 msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"

15253

15114 -#: builtin/index-pack.c:738 builtin/pack-objects.c:159

15115 -#: builtin/pack-objects.c:219 builtin/pack-objects.c:314

15254 +#: builtin/index-pack.c:738 builtin/pack-objects.c:170

15255 +#: builtin/pack-objects.c:230 builtin/pack-objects.c:325

15256 #, c-format

15257 msgid "unable to read %s"

15258 msgstr "kunde inte läsa %s"

@@ -15173,7 +15313,7 @@ msgstr "förvirrad bortom vanvett i parse_pack_objects()"

15313 msgid "Resolving deltas"

15314 msgstr "Analyserar delta"

15315

15176 -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616

15316 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2665

15317 #, c-format

15318 msgid "unable to create thread: %s"

15319 msgstr "kunde inte skapa tråd: %s"

@@ -15238,58 +15378,67 @@ msgstr "kan inte spara paketfil"

15378 msgid "cannot store index file"

15379 msgstr "kan inte spara indexfil"

15380

15241 -#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863

15381 +#: builtin/index-pack.c:1528 builtin/pack-objects.c:2912

15382 #, c-format

15383 msgid "bad pack.indexversion=%<PRIu32>"

15384 msgstr "felaktig pack.indexversion=%<PRIu32>"

15385

15246 -#: builtin/index-pack.c:1596

15386 +#: builtin/index-pack.c:1592

15387 #, c-format

15388 msgid "Cannot open existing pack file '%s'"

15389 msgstr "Kan inte öppna befintlig paketfil \"%s\""

15390

15251 -#: builtin/index-pack.c:1598

15391 +#: builtin/index-pack.c:1594

15392 #, c-format

15393 msgid "Cannot open existing pack idx file for '%s'"

15394 msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""

15395

15256 -#: builtin/index-pack.c:1646

15396 +#: builtin/index-pack.c:1642

15397 #, c-format

15398 msgid "non delta: %d object"

15399 msgid_plural "non delta: %d objects"

15400 msgstr[0] "icke-delta: %d objekt"

15401 msgstr[1] "icke-delta: %d objekt"

15402

15263 -#: builtin/index-pack.c:1653

15403 +#: builtin/index-pack.c:1649

15404 #, c-format

15405 msgid "chain length = %d: %lu object"

15406 msgid_plural "chain length = %d: %lu objects"

15407 msgstr[0] "kedjelängd = %d: %lu objekt"

15408 msgstr[1] "kedjelängd = %d: %lu objekt"

15409

15270 -#: builtin/index-pack.c:1692

15410 +#: builtin/index-pack.c:1689

15411 msgid "Cannot come back to cwd"

15412 msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"

15413

15274 -#: builtin/index-pack.c:1741 builtin/index-pack.c:1744

15275 -#: builtin/index-pack.c:1760 builtin/index-pack.c:1764

15414 +#: builtin/index-pack.c:1738 builtin/index-pack.c:1741

15415 +#: builtin/index-pack.c:1757 builtin/index-pack.c:1761

15416 #, c-format

15417 msgid "bad %s"

15418 msgstr "felaktig %s"

15419

15280 -#: builtin/index-pack.c:1780

15420 +#: builtin/index-pack.c:1767 builtin/init-db.c:392 builtin/init-db.c:621

15421 +#, c-format

15422 +msgid "unknown hash algorithm '%s'"

15423 +msgstr "okänd hashningsalgoritm \"%s\""

15424 +

15425 +#: builtin/index-pack.c:1782

15426 msgid "--fix-thin cannot be used without --stdin"

15427 msgstr "--fix-thin kan inte användas med --stdin"

15428

15284 -#: builtin/index-pack.c:1782

15429 +#: builtin/index-pack.c:1784

15430 msgid "--stdin requires a git repository"

15431 msgstr "--stdin kräver ett git-arkiv"

15432

15288 -#: builtin/index-pack.c:1788

15433 +#: builtin/index-pack.c:1786

15434 +msgid "--object-format cannot be used with --stdin"

15435 +msgstr "--object-format kan inte användas med --stdin"

15436 +

15437 +#: builtin/index-pack.c:1792

15438 msgid "--verify with no packfile name given"

15439 msgstr "--verify angavs utan paketfilnamn"

15440

15292 -#: builtin/index-pack.c:1836 builtin/unpack-objects.c:582

15441 +#: builtin/index-pack.c:1840 builtin/unpack-objects.c:582

15442 msgid "fsck error in pack objects"

15443 msgstr "fsck-fel i packat objekt"

15444

@@ -15333,51 +15482,56 @@ msgstr "mallarna hittades inte i %s"

15482 msgid "not copying templates from '%s': %s"

15483 msgstr "kopierade inte mallar från \"%s\": %s"

15484

15336 -#: builtin/init-db.c:356

15485 +#: builtin/init-db.c:276

15486 +#, c-format

15487 +msgid "invalid initial branch name: '%s'"

15488 +msgstr "ogiltigt namn på första gren: \"%s\""

15489 +

15490 +#: builtin/init-db.c:368

l10n: sv.po: Update Swedish translation (4931t0f0u)