d372b5cf6e · matheusbsbs/matheus-bagliano

@@ -7,8 +7,8 @@ msgid ""

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2014-02-01 08:06+0800\n"

11 -"PO-Revision-Date: 2014-02-02 17:21+0100\n"

10 +"POT-Creation-Date: 2014-04-19 12:50+0800\n"

11 +"PO-Revision-Date: 2014-04-22 10:24+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"

@@ -17,16 +17,12 @@ msgstr ""

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

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

19

20 -#: advice.c:57

20 +#: advice.c:55

21 #, c-format

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

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

24

25 -#.

26 -#. * Message used both when 'git commit' fails and when

27 -#. * other commands doing a merge do.

28 -#.

29 -#: advice.c:87

25 +#: advice.c:85

26 msgid ""

27 "Fix them up in the work tree,\n"

28 "and then use 'git add/rm <file>' as\n"

@@ -57,76 +53,76 @@ msgstr ""

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

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

55

60 -#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328

56 +#: archive.c:243 builtin/add.c:136 builtin/add.c:428 builtin/rm.c:328

57 #, c-format

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

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

60

65 -#: archive.c:327

61 +#: archive.c:328

62 msgid "fmt"

63 msgstr "fmt"

64

69 -#: archive.c:327

65 +#: archive.c:328

66 msgid "archive format"

67 msgstr "arkivformat"

68

73 -#: archive.c:328 builtin/log.c:1193

69 +#: archive.c:329 builtin/log.c:1193

70 msgid "prefix"

71 msgstr "prefix"

72

77 -#: archive.c:329

73 +#: archive.c:330

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

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

76

81 -#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265

82 -#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680

83 -#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77

84 -#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408

85 -#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154

77 +#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2258

78 +#: builtin/blame.c:2259 builtin/config.c:57 builtin/fast-export.c:680

79 +#: builtin/fast-export.c:682 builtin/grep.c:714 builtin/hash-object.c:77

80 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412

81 +#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151

82 msgid "file"

83 msgstr "fil"

84

89 -#: archive.c:331 builtin/archive.c:89

85 +#: archive.c:332 builtin/archive.c:89

86 msgid "write the archive to this file"

87 msgstr "skriv arkivet till filen"

88

93 -#: archive.c:333

89 +#: archive.c:334

90 msgid "read .gitattributes in working directory"

91 msgstr "läs .gitattributes i arbetskatalogen"

92

97 -#: archive.c:334

93 +#: archive.c:335

94 msgid "report archived files on stderr"

95 msgstr "rapportera arkiverade filer på standard fel"

96

101 -#: archive.c:335

97 +#: archive.c:336

98 msgid "store only"

99 msgstr "endast spara"

100

105 -#: archive.c:336

101 +#: archive.c:337

102 msgid "compress faster"

103 msgstr "komprimera snabbare"

104

109 -#: archive.c:344

105 +#: archive.c:345

106 msgid "compress better"

107 msgstr "komprimera bättre"

108

113 -#: archive.c:347

109 +#: archive.c:348

110 msgid "list supported archive formats"

111 msgstr "visa understödda arkivformat"

112

117 -#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84

113 +#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84

114 msgid "repo"

115 msgstr "arkiv"

116

121 -#: archive.c:350 builtin/archive.c:91

117 +#: archive.c:351 builtin/archive.c:91

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

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

120

125 -#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487

121 +#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491

122 msgid "command"

123 msgstr "kommando"

124

129 -#: archive.c:352 builtin/archive.c:93

125 +#: archive.c:353 builtin/archive.c:93

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

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

128

@@ -143,83 +139,78 @@ msgstr ""

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

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

141

146 -#: branch.c:82

142 +#: branch.c:83

143 #, c-format

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

145 msgstr ""

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

147

152 -#: branch.c:83

148 +#: branch.c:84

149 #, c-format

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

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

152

157 -#: branch.c:87

153 +#: branch.c:88

154 #, c-format

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

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

157

162 -#: branch.c:88

158 +#: branch.c:89

159 #, c-format

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

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

162

167 -#: branch.c:92

163 +#: branch.c:94

164 #, c-format

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

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

167

172 -#: branch.c:93

168 +#: branch.c:95

169 #, c-format

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

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

172

177 -#: branch.c:97

173 +#: branch.c:99

174 #, c-format

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

176 msgstr ""

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

178

183 -#: branch.c:98

179 +#: branch.c:100

180 #, c-format

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

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

183

188 -#: branch.c:118

189 -#, c-format

190 -msgid "Tracking not set up: name too long: %s"

191 -msgstr "Spårning har inte ställts in: namnet för långt: %s"

192 -

193 -#: branch.c:137

184 +#: branch.c:133

185 #, c-format

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

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

188

198 -#: branch.c:182

189 +#: branch.c:178

190 #, c-format

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

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

193

203 -#: branch.c:187

194 +#: branch.c:183

195 #, c-format

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

197 msgstr "Det finns redan en gren som heter \"%s\""

198

208 -#: branch.c:195

199 +#: branch.c:191

200 msgid "Cannot force update the current branch."

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

202

212 -#: branch.c:215

203 +#: branch.c:211

204 #, c-format

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

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

207

217 -#: branch.c:217

208 +#: branch.c:213

209 #, c-format

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

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

212

222 -#: branch.c:219

213 +#: branch.c:215

214 msgid ""

215 "\n"

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

@@ -239,113 +230,113 @@ msgstr ""

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

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

232

242 -#: branch.c:264

233 +#: branch.c:260

234 #, c-format

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

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

237

247 -#: branch.c:284

238 +#: branch.c:280

239 #, c-format

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

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

242

252 -#: branch.c:289

243 +#: branch.c:285

244 #, c-format

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

246 msgstr "Avgreningspunkten är inte giltig: \"%s\""

247

257 -#: branch.c:295

248 +#: branch.c:291

249 msgid "Failed to lock ref for update"

250 msgstr "Misslyckades låsa referens för uppdatering"

251

261 -#: branch.c:313

252 +#: branch.c:309

253 msgid "Failed to write ref"

254 msgstr "Misslyckades skriva referens"

255

265 -#: bundle.c:37

256 +#: bundle.c:33

257 #, c-format

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

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

260

270 -#: bundle.c:64

261 +#: bundle.c:60

262 #, c-format

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

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

265

275 -#: bundle.c:90 builtin/commit.c:706

266 +#: bundle.c:86 builtin/commit.c:706

267 #, c-format

268 msgid "could not open '%s'"

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

270

280 -#: bundle.c:141

271 +#: bundle.c:138

272 msgid "Repository lacks these prerequisite commits:"

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

274

284 -#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332

275 +#: bundle.c:162 sequencer.c:669 sequencer.c:1123 builtin/log.c:332

276 #: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357

277 #: builtin/shortlog.c:158

278 msgid "revision walk setup failed"

279 msgstr "misslyckades skapa revisionstraversering"

280

290 -#: bundle.c:187

281 +#: bundle.c:184

282 #, c-format

283 msgid "The bundle contains this ref:"

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

285 msgstr[0] "Paketet (bundlen) denna referens:"

286 msgstr[1] "Paketet (bundlen) dessa %d referenser:"

287

297 -#: bundle.c:194

288 +#: bundle.c:191

289 msgid "The bundle records a complete history."

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

291

301 -#: bundle.c:196

292 +#: bundle.c:193

293 #, c-format

294 msgid "The bundle requires this ref:"

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

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

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

298

308 -#: bundle.c:296

299 +#: bundle.c:293

300 msgid "rev-list died"

301 msgstr "rev-list dog"

302

312 -#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261

303 +#: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261

304 #, c-format

305 msgid "unrecognized argument: %s"

306 msgstr "okänt argument: %s"

307

317 -#: bundle.c:337

308 +#: bundle.c:334

309 #, c-format

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

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

312

322 -#: bundle.c:382

313 +#: bundle.c:379

314 msgid "Refusing to create empty bundle."

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

316

326 -#: bundle.c:398

317 +#: bundle.c:395

318 msgid "Could not spawn pack-objects"

319 msgstr "Kunde inte starta pack-objects"

320

330 -#: bundle.c:416

321 +#: bundle.c:413

322 msgid "pack-objects died"

323 msgstr "pack-objects misslyckades"

324

334 -#: bundle.c:419

325 +#: bundle.c:416

326 #, c-format

327 msgid "cannot create '%s'"

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

329

339 -#: bundle.c:441

330 +#: bundle.c:438

331 msgid "index-pack died"

332 msgstr "index-pack dog"

333

343 -#: commit.c:53

334 +#: commit.c:54

335 #, c-format

336 msgid "could not parse %s"

337 msgstr "kunde inte tolka %s"

338

348 -#: commit.c:55

339 +#: commit.c:56

340 #, c-format

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

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

@@ -421,6 +412,7 @@ msgid_plural "%lu years"

412 msgstr[0] "%lu år"

413 msgstr[1] "%lu år"

414

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

416 #: date.c:149

417 #, c-format

418 msgid "%s, %lu month ago"

@@ -440,6 +432,10 @@ msgstr[1] "%lu år sedan"

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

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

434

435 +#: diffcore-rename.c:517

436 +msgid "Performing inexact rename detection"

437 +msgstr "Utför onöjaktig namnbytesdetektering"

438 +

439 #: diff.c:113

440 #, c-format

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

@@ -464,7 +460,7 @@ msgstr ""

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

461 "%s"

462

467 -#: diff.c:3509

463 +#: diff.c:3495

464 #, c-format

465 msgid ""

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

@@ -473,7 +469,7 @@ msgstr ""

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

470 "%s"

471

476 -#: diff.c:3523

472 +#: diff.c:3509

473 #, c-format

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

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

@@ -500,35 +496,35 @@ msgstr "kunde inte skapa temporära filen \"%s\": %s"

496 msgid "failed writing detached signature to '%s': %s"

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

498

503 -#: grep.c:1695

499 +#: grep.c:1698

500 #, c-format

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

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

503

508 -#: grep.c:1712

504 +#: grep.c:1715

505 #, c-format

506 msgid "'%s': %s"

507 msgstr "\"%s\": %s"

508

513 -#: grep.c:1723

509 +#: grep.c:1726

510 #, c-format

511 msgid "'%s': short read %s"

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

513

518 -#: help.c:210

514 +#: help.c:209

515 #, c-format

516 msgid "available git commands in '%s'"

517 msgstr "git-kommandon tillgängliga i \"%s\""

518

523 -#: help.c:217

519 +#: help.c:216

520 msgid "git commands available from elsewhere on your $PATH"

521 msgstr "git-kommandon från andra platser i din $PATH"

522

527 -#: help.c:233

523 +#: help.c:232

524 msgid "The most commonly used git commands are:"

525 msgstr "De mest använda git-kommandona är:"

526

531 -#: help.c:290

527 +#: help.c:289

528 #, c-format

529 msgid ""

530 "'%s' appears to be a git command, but we were not\n"

@@ -537,11 +533,11 @@ msgstr ""

533 "\"%s\" verkar vara ett git-kommando, men vi kan inte\n"

534 "köra det. Kanske git-%s är trasigt?"

535

540 -#: help.c:347

536 +#: help.c:346

537 msgid "Uh oh. Your system reports no Git commands at all."

538 msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."

539

544 -#: help.c:369

540 +#: help.c:368

541 #, c-format

542 msgid ""

543 "WARNING: You called a Git command named '%s', which does not exist.\n"

@@ -550,17 +546,17 @@ msgstr ""

546 "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n"

547 "Fortsätter under förutsättningen att du menade \"%s\""

548

553 -#: help.c:374

549 +#: help.c:373

550 #, c-format

551 msgid "in %0.1f seconds automatically..."

552 msgstr "automatiskt om %0.1f sekunder..."

553

558 -#: help.c:381

554 +#: help.c:380

555 #, c-format

556 msgid "git: '%s' is not a git command. See 'git --help'."

557 msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."

558

563 -#: help.c:385 help.c:444

559 +#: help.c:384 help.c:443

560 msgid ""

561 "\n"

562 "Did you mean this?"

@@ -574,7 +570,7 @@ msgstr[1] ""

570 "\n"

571 "Menade du ett av dessa?"

572

577 -#: help.c:440

573 +#: help.c:439

574 #, c-format

575 msgid "%s: %s - %s"

576 msgstr "%s: %s - %s"

@@ -583,7 +579,7 @@ msgstr "%s: %s - %s"

579 msgid "failed to read the cache"

580 msgstr "misslyckads läsa cachen"

581

586 -#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559

582 +#: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558

583 #: builtin/clone.c:661

584 msgid "unable to write new index file"

585 msgstr "kunde inte skriva ny indexfil"

@@ -593,75 +589,73 @@ msgstr "kunde inte skriva ny indexfil"

589 msgid "(bad commit)\n"

590 msgstr "(felaktig incheckning)\n"

591

596 -#: merge-recursive.c:206

592 +#: merge-recursive.c:208

593 #, c-format

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

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

596

601 -#: merge-recursive.c:269

597 +#: merge-recursive.c:271

598 msgid "error building trees"

599 msgstr "fel vid byggande av träd"

600

605 -#: merge-recursive.c:673

601 +#: merge-recursive.c:675

602 #, c-format

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

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

605

610 -#: merge-recursive.c:684

606 +#: merge-recursive.c:686

607 #, c-format

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

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

610

615 -#. something else exists

616 -#. .. but not some other error (who really cares what?)

617 -#: merge-recursive.c:698 merge-recursive.c:719

611 +#: merge-recursive.c:700 merge-recursive.c:721

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

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

614

621 -#: merge-recursive.c:709

615 +#: merge-recursive.c:711

616 #, c-format

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

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

619

626 -#: merge-recursive.c:749

620 +#: merge-recursive.c:751

621 #, c-format

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

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

624

631 -#: merge-recursive.c:751

625 +#: merge-recursive.c:753

626 #, c-format

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

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

629

636 -#: merge-recursive.c:774 builtin/clone.c:317

630 +#: merge-recursive.c:776 builtin/clone.c:317

631 #, c-format

632 msgid "failed to open '%s'"

633 msgstr "misslyckades öppna \"%s\""

634

641 -#: merge-recursive.c:782

635 +#: merge-recursive.c:784

636 #, c-format

637 msgid "failed to symlink '%s'"

638 msgstr "misslyckades ta skapa symboliska länken \"%s\""

639

646 -#: merge-recursive.c:785

640 +#: merge-recursive.c:787

641 #, c-format

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

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

644

651 -#: merge-recursive.c:923

645 +#: merge-recursive.c:925

646 msgid "Failed to execute internal merge"

647 msgstr "Misslyckades exekvera intern sammanslagning"

648

655 -#: merge-recursive.c:927

649 +#: merge-recursive.c:929

650 #, c-format

651 msgid "Unable to add %s to database"

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

653

660 -#: merge-recursive.c:943

654 +#: merge-recursive.c:945

655 msgid "unsupported object type in the tree"

656 msgstr "objekttyp som ej stöds upptäcktes i trädet"

657

664 -#: merge-recursive.c:1022 merge-recursive.c:1036

658 +#: merge-recursive.c:1024 merge-recursive.c:1038

659 #, c-format

660 msgid ""

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

@@ -670,7 +664,7 @@ msgstr ""

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

665 "i trädet."

666

673 -#: merge-recursive.c:1028 merge-recursive.c:1041

667 +#: merge-recursive.c:1030 merge-recursive.c:1043

668 #, c-format

669 msgid ""

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

@@ -679,20 +673,20 @@ msgstr ""

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

674 "i trädet vid %s."

675

682 -#: merge-recursive.c:1082

676 +#: merge-recursive.c:1084

677 msgid "rename"

678 msgstr "namnbyte"

679

686 -#: merge-recursive.c:1082 wt-status.c:283

680 +#: merge-recursive.c:1084

681 msgid "renamed"

682 msgstr "namnbytt"

683

690 -#: merge-recursive.c:1138

684 +#: merge-recursive.c:1140

685 #, c-format

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

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

688

695 -#: merge-recursive.c:1160

689 +#: merge-recursive.c:1162

690 #, c-format

691 msgid ""

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

@@ -701,144 +695,144 @@ msgstr ""

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

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

697

704 -#: merge-recursive.c:1165

698 +#: merge-recursive.c:1167

699 msgid " (left unresolved)"

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

701

708 -#: merge-recursive.c:1219

702 +#: merge-recursive.c:1221

703 #, c-format

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

705 msgstr ""

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

707

714 -#: merge-recursive.c:1249

708 +#: merge-recursive.c:1251

709 #, c-format

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

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

712

719 -#: merge-recursive.c:1448

713 +#: merge-recursive.c:1450

714 #, c-format

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

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

717

724 -#: merge-recursive.c:1458

718 +#: merge-recursive.c:1460

719 #, c-format

720 msgid "Adding merged %s"

721 msgstr "Lägger till sammanslagen %s"

722

729 -#: merge-recursive.c:1463 merge-recursive.c:1661

723 +#: merge-recursive.c:1465 merge-recursive.c:1663

724 #, c-format

725 msgid "Adding as %s instead"

726 msgstr "Lägger till som %s iställer"

727

734 -#: merge-recursive.c:1514

728 +#: merge-recursive.c:1516

729 #, c-format

730 msgid "cannot read object %s"

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

732

739 -#: merge-recursive.c:1517

733 +#: merge-recursive.c:1519

734 #, c-format

735 msgid "object %s is not a blob"

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

737

744 -#: merge-recursive.c:1565

738 +#: merge-recursive.c:1567

739 msgid "modify"

740 msgstr "ändra"

741

748 -#: merge-recursive.c:1565 wt-status.c:281

742 +#: merge-recursive.c:1567

743 msgid "modified"

744 msgstr "ändrad"

745

752 -#: merge-recursive.c:1575

746 +#: merge-recursive.c:1577

747 msgid "content"

748 msgstr "innehåll"

749

756 -#: merge-recursive.c:1582

750 +#: merge-recursive.c:1584

751 msgid "add/add"

752 msgstr "tillägg/tillägg"

753

760 -#: merge-recursive.c:1616

754 +#: merge-recursive.c:1618

755 #, c-format

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

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

758

765 -#: merge-recursive.c:1630

759 +#: merge-recursive.c:1632

760 #, c-format

761 msgid "Auto-merging %s"

762 msgstr "Slår ihop %s automatiskt"

763

770 -#: merge-recursive.c:1634 git-submodule.sh:1148

764 +#: merge-recursive.c:1636 git-submodule.sh:1149

765 msgid "submodule"

766 msgstr "undermodul"

767

774 -#: merge-recursive.c:1635

768 +#: merge-recursive.c:1637

769 #, c-format

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

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

772

779 -#: merge-recursive.c:1725

773 +#: merge-recursive.c:1727

774 #, c-format

775 msgid "Removing %s"

776 msgstr "Tar bort %s"

777

784 -#: merge-recursive.c:1750

778 +#: merge-recursive.c:1752

779 msgid "file/directory"

780 msgstr "fil/katalog"

781

788 -#: merge-recursive.c:1756

782 +#: merge-recursive.c:1758

783 msgid "directory/file"

784 msgstr "katalog/fil"

785

792 -#: merge-recursive.c:1761

786 +#: merge-recursive.c:1763

787 #, c-format

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

789 msgstr ""

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

791

798 -#: merge-recursive.c:1771

792 +#: merge-recursive.c:1773

793 #, c-format

794 msgid "Adding %s"

795 msgstr "Lägger till %s"

796

803 -#: merge-recursive.c:1788

797 +#: merge-recursive.c:1790

798 msgid "Fatal merge failure, shouldn't happen."

799 msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa."

800

807 -#: merge-recursive.c:1807

801 +#: merge-recursive.c:1809

802 msgid "Already up-to-date!"

803 msgstr "Redan à jour!"

804

811 -#: merge-recursive.c:1816

805 +#: merge-recursive.c:1818

806 #, c-format

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

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

809

816 -#: merge-recursive.c:1846

810 +#: merge-recursive.c:1848

811 #, c-format

812 msgid "Unprocessed path??? %s"

813 msgstr "Obehandlad sökväg??? %s"

814

821 -#: merge-recursive.c:1891

815 +#: merge-recursive.c:1893

816 msgid "Merging:"

817 msgstr "Slår ihop:"

818

825 -#: merge-recursive.c:1904

819 +#: merge-recursive.c:1906

820 #, c-format

821 msgid "found %u common ancestor:"

822 msgid_plural "found %u common ancestors:"

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

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

825

832 -#: merge-recursive.c:1941

826 +#: merge-recursive.c:1943

827 msgid "merge returned no commit"

828 msgstr "sammanslagningen returnerade ingen incheckning"

829

836 -#: merge-recursive.c:1998

830 +#: merge-recursive.c:2000

831 #, c-format

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

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

834

841 -#: merge-recursive.c:2010 builtin/merge.c:665

835 +#: merge-recursive.c:2012 builtin/merge.c:668

836 msgid "Unable to write index."

837 msgstr "Kunde inte skriva indexet."

838

@@ -863,33 +857,33 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"

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

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

859

866 -#: object.c:202

860 +#: object.c:229

861 #, c-format

862 msgid "unable to parse object: %s"

863 msgstr "kunde inte tolka objektet: %s"

864

871 -#: parse-options.c:537

865 +#: parse-options.c:532

866 msgid "..."

867 msgstr "..."

868

875 -#: parse-options.c:555

869 +#: parse-options.c:550

870 #, c-format

871 msgid "usage: %s"

872 msgstr "användning: %s"

873

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

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

882 -#: parse-options.c:559

876 +#: parse-options.c:554

877 #, c-format

878 msgid " or: %s"

879 msgstr " eller: %s"

880

887 -#: parse-options.c:562

881 +#: parse-options.c:557

882 #, c-format

883 msgid " %s"

884 msgstr " %s"

885

892 -#: parse-options.c:596

886 +#: parse-options.c:591

887 msgid "-NUM"

888 msgstr "-TAL"

889

@@ -940,11 +934,6 @@ msgstr "%s: \"%s\" är utanför arkivet"

934 msgid "Pathspec '%s' is in submodule '%.*s'"

935 msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""

936

943 -#.

944 -#. * We may want to substitute "this command" with a command

945 -#. * name. E.g. when add--interactive dies when running

946 -#. * "checkout -p"

947 -#.

937 #: pathspec.c:353

938 #, c-format

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

@@ -963,56 +952,73 @@ msgstr ""

952 "Ingenting att exkludera från med :(exkludera)-mönster.\n"

953 "Glömde du kanske att antingen lägga till \":/\" eller \".\"?"

954

966 -#: remote.c:753

955 +#: progress.c:224

956 +msgid "done"

957 +msgstr "klart"

958 +

959 +#: read-cache.c:1238

960 +#, c-format

961 +msgid ""

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

963 +"Using version %i"

964 +msgstr ""

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

966 +"Använder version %i"

967 +

968 +#: read-cache.c:1248

969 +#, c-format

970 +msgid ""

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

972 +"Using version %i"

973 +msgstr ""

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

975 +"Använder version %i"

976 +

977 +#: remote.c:758

978 #, c-format

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

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

981

971 -#: remote.c:757

982 +#: remote.c:762

983 #, c-format

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

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

986

976 -#: remote.c:761

987 +#: remote.c:766

988 #, c-format

989 msgid "%s tracks both %s and %s"

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

991

981 -#.

982 -#. * This last possibility doesn't occur because

983 -#. * FETCH_HEAD_IGNORE entries always appear at

984 -#. * the end of the list.

985 -#.

986 -#: remote.c:769

992 +#: remote.c:774

993 msgid "Internal error"

994 msgstr "Internt fel"

995

990 -#: remote.c:1871

996 +#: remote.c:1948

997 #, c-format

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

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

1000

995 -#: remote.c:1875

1001 +#: remote.c:1952

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

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

1004

999 -#: remote.c:1878

1005 +#: remote.c:1955

1006 #, c-format

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

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

1009

1004 -#: remote.c:1882

1010 +#: remote.c:1959

1011 #, c-format

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

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

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

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

1016

1011 -#: remote.c:1888

1017 +#: remote.c:1965

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

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

1020

1015 -#: remote.c:1891

1021 +#: remote.c:1968

1022 #, c-format

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

1024 msgid_plural ""

@@ -1022,11 +1028,11 @@ msgstr[0] ""

1028 msgstr[1] ""

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

1030

1025 -#: remote.c:1899

1031 +#: remote.c:1976

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

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

1034

1029 -#: remote.c:1902

1035 +#: remote.c:1979

1036 #, c-format

1037 msgid ""

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

@@ -1041,7 +1047,7 @@ msgstr[1] ""

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

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

1049

1044 -#: remote.c:1912

1050 +#: remote.c:1989

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

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

1053

@@ -1054,14 +1060,14 @@ msgstr "misslyckades öppna /dev/null"

1060 msgid "dup2(%d,%d) failed"

1061 msgstr "dup2(%d,%d) misslyckades"

1062

1057 -#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896

1058 -#: builtin/merge.c:1006 builtin/merge.c:1016

1063 +#: sequencer.c:206 builtin/merge.c:786 builtin/merge.c:899

1064 +#: builtin/merge.c:1009 builtin/merge.c:1019

1065 #, c-format

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

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

1068

1063 -#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786

1064 -#: builtin/merge.c:1008 builtin/merge.c:1021

1069 +#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:789

1070 +#: builtin/merge.c:1011 builtin/merge.c:1024

1071 #, c-format

1072 msgid "Could not write to '%s'"

1073 msgstr "Kunde inte skriva till \"%s\""

@@ -1084,7 +1090,7 @@ msgstr ""

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

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

1092

1087 -#: sequencer.c:245 sequencer.c:870 sequencer.c:953

1093 +#: sequencer.c:245 sequencer.c:879 sequencer.c:962

1094 #, c-format

1095 msgid "Could not write to %s"

1096 msgstr "Kunde inte skriva till %s"

@@ -1120,184 +1126,184 @@ msgstr "Kunde inte bestämma HEAD:s incheckning\n"

1126 msgid "Unable to update cache tree\n"

1127 msgstr "Kan inte uppdatera cacheträd\n"

1128

1123 -#: sequencer.c:423

1129 +#: sequencer.c:430

1130 #, c-format

1131 msgid "Could not parse commit %s\n"

1132 msgstr "Kunde inte tolka incheckningen %s\n"

1133

1128 -#: sequencer.c:428

1134 +#: sequencer.c:435

1135 #, c-format

1136 msgid "Could not parse parent commit %s\n"

1137 msgstr "Kunde inte tolka föräldraincheckningen %s\n"

1138

1133 -#: sequencer.c:494

1139 +#: sequencer.c:501

1140 msgid "Your index file is unmerged."

1141 msgstr "Din indexfil har inte slagits ihop."

1142

1137 -#: sequencer.c:513

1143 +#: sequencer.c:520

1144 #, c-format

1145 msgid "Commit %s is a merge but no -m option was given."

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

1147

1142 -#: sequencer.c:521

1148 +#: sequencer.c:528

1149 #, c-format

1150 msgid "Commit %s does not have parent %d"

1151 msgstr "Incheckning %s har inte förälder %d"

1152

1147 -#: sequencer.c:525

1153 +#: sequencer.c:532

1154 #, c-format

1155 msgid "Mainline was specified but commit %s is not a merge."

1156 msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning"

1157

1158 #. TRANSLATORS: The first %s will be "revert" or

1159 #. "cherry-pick", the second %s a SHA1

1154 -#: sequencer.c:538

1160 +#: sequencer.c:545

1161 #, c-format

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

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

1164

1159 -#: sequencer.c:542

1165 +#: sequencer.c:549

1166 #, c-format

1167 msgid "Cannot get commit message for %s"

1168 msgstr "Kan inte hämta incheckningsmeddelande för %s"

1169

1164 -#: sequencer.c:628

1170 +#: sequencer.c:635

1171 #, c-format

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

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

1174

1169 -#: sequencer.c:629

1175 +#: sequencer.c:636

1176 #, c-format

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

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

1179

1174 -#: sequencer.c:665

1180 +#: sequencer.c:672

1181 msgid "empty commit set passed"

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

1183

1178 -#: sequencer.c:673

1184 +#: sequencer.c:680

1185 #, c-format

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

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

1188

1183 -#: sequencer.c:678

1189 +#: sequencer.c:685

1190 #, c-format

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

1192 msgstr "git %s: misslyckades uppdatera indexet"

1193

1188 -#: sequencer.c:736

1194 +#: sequencer.c:743

1195 #, c-format

1196 msgid "Cannot %s during a %s"

1197 msgstr "kan inte %s under en %s"

1198

1193 -#: sequencer.c:758

1199 +#: sequencer.c:765

1200 #, c-format

1201 msgid "Could not parse line %d."

1202 msgstr "Kan inte tolka rad %d."

1203

1198 -#: sequencer.c:763

1204 +#: sequencer.c:770

1205 msgid "No commits parsed."

1206 msgstr "Inga incheckningar lästes."

1207

1202 -#: sequencer.c:776

1208 +#: sequencer.c:783

1209 #, c-format

1210 msgid "Could not open %s"

1211 msgstr "Kunde inte öppna %s"

1212

1207 -#: sequencer.c:780

1213 +#: sequencer.c:787

1214 #, c-format

1215 msgid "Could not read %s."

1216 msgstr "kunde inte läsa %s."

1217

1212 -#: sequencer.c:787

1218 +#: sequencer.c:794

1219 #, c-format

1220 msgid "Unusable instruction sheet: %s"

1221 msgstr "Oanvändbart manus: %s"

1222

1217 -#: sequencer.c:815

1223 +#: sequencer.c:824

1224 #, c-format

1225 msgid "Invalid key: %s"

1226 msgstr "Felaktig nyckel: %s"

1227

1222 -#: sequencer.c:818

1228 +#: sequencer.c:827

1229 #, c-format

1230 msgid "Invalid value for %s: %s"

1231 msgstr "Felaktigt värde för %s: %s"

1232

1227 -#: sequencer.c:830

1233 +#: sequencer.c:839

1234 #, c-format

1235 msgid "Malformed options sheet: %s"

1236 msgstr "Trasigt manus: %s"

1237

1232 -#: sequencer.c:851

1238 +#: sequencer.c:860

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

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

1241

1236 -#: sequencer.c:852

1242 +#: sequencer.c:861

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

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

1245

1240 -#: sequencer.c:856

1246 +#: sequencer.c:865

1247 #, c-format

1248 msgid "Could not create sequencer directory %s"

1249 msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\""

1250

1245 -#: sequencer.c:872 sequencer.c:957

1251 +#: sequencer.c:881 sequencer.c:966

1252 #, c-format

1253 msgid "Error wrapping up %s."

1254 msgstr "Fel vid ombrytning av %s."

1255

1250 -#: sequencer.c:891 sequencer.c:1025

1256 +#: sequencer.c:900 sequencer.c:1036

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

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

1259

1254 -#: sequencer.c:893

1260 +#: sequencer.c:902

1261 msgid "cannot resolve HEAD"

1262 msgstr "kan inte bestämma HEAD"

1263

1258 -#: sequencer.c:895

1264 +#: sequencer.c:904

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

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

1267

1262 -#: sequencer.c:917 builtin/apply.c:4061

1268 +#: sequencer.c:926 builtin/apply.c:4061

1269 #, c-format

1270 msgid "cannot open %s: %s"

1271 msgstr "kan inte öppna %s: %s"

1272

1267 -#: sequencer.c:920

1273 +#: sequencer.c:929

1274 #, c-format

1275 msgid "cannot read %s: %s"

1276 msgstr "kan inte läsa %s: %s"

1277

1272 -#: sequencer.c:921

1278 +#: sequencer.c:930

1279 msgid "unexpected end of file"

1280 msgstr "oväntat filslut"

1281

1276 -#: sequencer.c:927

1282 +#: sequencer.c:936

1283 #, c-format

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

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

1286

1281 -#: sequencer.c:950

1287 +#: sequencer.c:959

1288 #, c-format

1289 msgid "Could not format %s."

1290 msgstr "Kunde inte formatera %s."

1291

1286 -#: sequencer.c:1093

1292 +#: sequencer.c:1104

1293 #, c-format

1294 msgid "%s: can't cherry-pick a %s"

1295 msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""

1296

1291 -#: sequencer.c:1096

1297 +#: sequencer.c:1107

1298 #, c-format

1299 msgid "%s: bad revision"

1300 msgstr "%s: felaktig revision"

1301

1296 -#: sequencer.c:1130

1302 +#: sequencer.c:1141

1303 msgid "Can't revert as initial commit"

1304 msgstr "Kan inte ångra som första incheckning"

1305

1300 -#: sequencer.c:1131

1306 +#: sequencer.c:1142

1307 msgid "Can't cherry-pick into empty head"

1308 msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"

1309

@@ -1323,21 +1329,21 @@ msgstr ""

1329 "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"

1330 "genom att köra \"git config advice.objectNameWarning false\""

1331

1326 -#: sha1_name.c:1070

1332 +#: sha1_name.c:1072

1333 msgid "HEAD does not point to a branch"

1334 msgstr "HEAD pekar inte på en gren"

1335

1330 -#: sha1_name.c:1073

1336 +#: sha1_name.c:1075

1337 #, c-format

1338 msgid "No such branch: '%s'"

1339 msgstr "Okänd gren: \"%s\""

1340

1335 -#: sha1_name.c:1075

1341 +#: sha1_name.c:1077

1342 #, c-format

1343 msgid "No upstream configured for branch '%s'"

1344 msgstr "Ingen standarduppström angiven för grenen \"%s\""

1345

1340 -#: sha1_name.c:1079

1346 +#: sha1_name.c:1081

1347 #, c-format

1348 msgid "Upstream branch '%s' not stored as a remote-tracking branch"

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

@@ -1353,52 +1359,34 @@ msgstr ""

1359 msgid "Could not find section in .gitmodules where path=%s"

1360 msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s"

1361

1356 -#. Maybe the user already did that, don't error out here

1362 #: submodule.c:76

1363 #, c-format

1364 msgid "Could not update .gitmodules entry %s"

1365 msgstr "Kunde inte uppdatera .gitmodules-posten %s"

1366

1362 -#. Maybe the user already did that, don't error out here

1367 #: submodule.c:109

1368 #, c-format

1369 msgid "Could not remove .gitmodules entry for %s"

1370 msgstr "Kunde inte ta bort .gitmodules-posten för %s"

1371

1368 -#: submodule.c:127

1369 -msgid "could not find .gitmodules in index"

1370 -msgstr "kunde inte hitta .gitmodules i indexet"

1371 -

1372 -#: submodule.c:133

1373 -msgid "reading updated .gitmodules failed"

1374 -msgstr "misslyckades läsa uppdaterad .gitmodules"

1375 -

1376 -#: submodule.c:135

1377 -msgid "unable to stat updated .gitmodules"

1378 -msgstr "kan inte ta status på uppdaterad .gitmodules"

1379 -

1380 -#: submodule.c:139

1381 -msgid "unable to remove .gitmodules from index"

1382 -msgstr "kan inte ta bort .gitmodules från indexet"

1383 -

1384 -#: submodule.c:141

1385 -msgid "adding updated .gitmodules failed"

1386 -msgstr "misslyckades lägga till uppdaterad .gitmodules"

1387 -

1388 -#: submodule.c:143

1372 +#: submodule.c:120

1373 msgid "staging updated .gitmodules failed"

1374 msgstr "misslyckades köa uppdaterad .gitmodules"

1375

1392 -#: submodule.c:1144 builtin/init-db.c:363

1376 +#: submodule.c:1121 builtin/init-db.c:363

1377 #, c-format

1378 msgid "Could not create git link %s"

1379 msgstr "Kunde inte skapa gitlänk %s"

1380

1397 -#: submodule.c:1155

1381 +#: submodule.c:1132

1382 #, c-format

1383 msgid "Could not set core.worktree in %s"

1384 msgstr "Kunde inte sätta core.worktree i %s"

1385

1386 +#: unpack-trees.c:206

1387 +msgid "Checking out files"

1388 +msgstr "Checkar ut filer"

1389 +

1390 #: urlmatch.c:120

1391 msgid "invalid URL scheme name or missing '://' suffix"

1392 msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix"

@@ -1508,88 +1496,97 @@ msgid " (use \"git %s <file>...\" to include in what will be committed)"

1496 msgstr ""

1497 " (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)"

1498

1511 -#: wt-status.c:254

1512 -msgid "bug"

1513 -msgstr "programfel"

1514 -

1515 -#: wt-status.c:259

1499 +#: wt-status.c:252

1500 msgid "both deleted:"

1501 msgstr "borttaget av bägge:"

1502

1519 -#: wt-status.c:260

1503 +#: wt-status.c:254

1504 msgid "added by us:"

1505 msgstr "tillagt av oss:"

1506

1523 -#: wt-status.c:261

1507 +#: wt-status.c:256

1508 msgid "deleted by them:"

1509 msgstr "borttaget av dem:"

1510

1527 -#: wt-status.c:262

1511 +#: wt-status.c:258

1512 msgid "added by them:"

1513 msgstr "tillagt av dem:"

1514

1531 -#: wt-status.c:263

1515 +#: wt-status.c:260

1516 msgid "deleted by us:"

1517 msgstr "borttaget av oss:"

1518

1535 -#: wt-status.c:264

1519 +#: wt-status.c:262

1520 msgid "both added:"

1521 msgstr "tillagt av bägge:"

1522

1539 -#: wt-status.c:265

1523 +#: wt-status.c:264

1524 msgid "both modified:"

1525 msgstr "ändrat av bägge:"

1526

1543 -#: wt-status.c:275

1544 -msgid "new file"

1545 -msgstr "ny fil"

1527 +#: wt-status.c:266

1528 +#, c-format

1529 +msgid "bug: unhandled unmerged status %x"

1530 +msgstr "programfel: ej hanterad \"unmerged\"-status %x"

1531

1547 -#: wt-status.c:277

1548 -msgid "copied"

1549 -msgstr "kopierad"

1532 +#: wt-status.c:274

1533 +msgid "new file:"

1534 +msgstr "ny fil:"

1535

1551 -#: wt-status.c:279

1552 -msgid "deleted"

1553 -msgstr "borttagen"

1536 +#: wt-status.c:276

1537 +msgid "copied:"

1538 +msgstr "kopierad:"

1539

1555 -#: wt-status.c:285

1556 -msgid "typechange"

1557 -msgstr "typbyte"

1540 +#: wt-status.c:278

1541 +msgid "deleted:"

1542 +msgstr "borttagen:"

1543

1559 -#: wt-status.c:287

1560 -msgid "unknown"

1561 -msgstr "okänd"

1544 +#: wt-status.c:280

1545 +msgid "modified:"

1546 +msgstr "ändrad:"

1547

1563 -#: wt-status.c:289

1564 -msgid "unmerged"

1565 -msgstr "osammanslagen"

1548 +#: wt-status.c:282

1549 +msgid "renamed:"

1550 +msgstr "namnbytt:"

1551

1567 -#: wt-status.c:336

1552 +#: wt-status.c:284

1553 +msgid "typechange:"

1554 +msgstr "typbyte:"

1555 +

1556 +#: wt-status.c:286

1557 +msgid "unknown:"

1558 +msgstr "okänd:"

1559 +

1560 +#: wt-status.c:288

1561 +msgid "unmerged:"

1562 +msgstr "osammanslagen:"

1563 +

1564 +#: wt-status.c:370

1565 msgid "new commits, "

1566 msgstr "nya incheckningar, "

1567

1571 -#: wt-status.c:338

1568 +#: wt-status.c:372

1569 msgid "modified content, "

1570 msgstr "ändrat innehåll, "

1571

1575 -#: wt-status.c:340

1572 +#: wt-status.c:374

1573 msgid "untracked content, "

1574 msgstr "ospårat innehåll, "

1575

1579 -#: wt-status.c:357

1576 +#: wt-status.c:391

1577 #, c-format

1578 msgid "bug: unhandled diff status %c"

1579 msgstr "programfel: diff-status %c ej hanterad"

1580

1584 -#: wt-status.c:732

1581 +#: wt-status.c:765

1582 msgid "Submodules changed but not updated:"

1583 msgstr "Undermoduler ändrade men inte uppdaterade:"

1584

1588 -#: wt-status.c:734

1585 +#: wt-status.c:767

1586 msgid "Submodule changes to be committed:"

1587 msgstr "Undermodulers ändringar att checka in:"

1588

1592 -#: wt-status.c:836

1589 +#: wt-status.c:846

1590 msgid ""

1591 "Do not touch the line above.\n"

1592 "Everything below will be removed."

@@ -1597,68 +1594,68 @@ msgstr ""

1594 "Rör inte raden ovan.\n"

1595 "Allt nedan kommer tas bort."

1596

1600 -#: wt-status.c:899

1597 +#: wt-status.c:937

1598 msgid "You have unmerged paths."

1599 msgstr "Du har ej sammanslagna sökvägar."

1600

1604 -#: wt-status.c:902

1601 +#: wt-status.c:940

1602 msgid " (fix conflicts and run \"git commit\")"

1603 msgstr " (rätta konflikter och kör \"git commit\")"

1604

1608 -#: wt-status.c:905

1605 +#: wt-status.c:943

1606 msgid "All conflicts fixed but you are still merging."

1607 msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."

1608

1612 -#: wt-status.c:908

1609 +#: wt-status.c:946

1610 msgid " (use \"git commit\" to conclude merge)"

1611 msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"

1612

1616 -#: wt-status.c:918

1613 +#: wt-status.c:956

1614 msgid "You are in the middle of an am session."

1615 msgstr "Du är i mitten av en körning av \"git am\"."

1616

1620 -#: wt-status.c:921

1617 +#: wt-status.c:959

1618 msgid "The current patch is empty."

1619 msgstr "Aktuell patch är tom."

1620

1624 -#: wt-status.c:925

1621 +#: wt-status.c:963

1622 msgid " (fix conflicts and then run \"git am --continue\")"

1623 msgstr " (rätta konflikter och kör sedan \"git am --continue\")"

1624

1628 -#: wt-status.c:927

1625 +#: wt-status.c:965

1626 msgid " (use \"git am --skip\" to skip this patch)"

1627 msgstr " (använd \"git am --skip\" för att hoppa över patchen)"

1628

1632 -#: wt-status.c:929

1629 +#: wt-status.c:967

1630 msgid " (use \"git am --abort\" to restore the original branch)"

1631 msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"

1632

1636 -#: wt-status.c:989 wt-status.c:1006

1633 +#: wt-status.c:1027 wt-status.c:1044

1634 #, c-format

1635 msgid "You are currently rebasing branch '%s' on '%s'."

1636 msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."

1637

1641 -#: wt-status.c:994 wt-status.c:1011

1638 +#: wt-status.c:1032 wt-status.c:1049

1639 msgid "You are currently rebasing."

1640 msgstr "Du håller på med en ombasering."

1641

1645 -#: wt-status.c:997

1642 +#: wt-status.c:1035

1643 msgid " (fix conflicts and then run \"git rebase --continue\")"

1644 msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"

1645

1649 -#: wt-status.c:999

1646 +#: wt-status.c:1037

1647 msgid " (use \"git rebase --skip\" to skip this patch)"

1648 msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"

1649

1653 -#: wt-status.c:1001

1650 +#: wt-status.c:1039

1651 msgid " (use \"git rebase --abort\" to check out the original branch)"

1652 msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"

1653

1657 -#: wt-status.c:1014

1654 +#: wt-status.c:1052

1655 msgid " (all conflicts fixed: run \"git rebase --continue\")"

1656 msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"

1657

1661 -#: wt-status.c:1018

1658 +#: wt-status.c:1056

1659 #, c-format

1660 msgid ""

1661 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

@@ -1666,118 +1663,118 @@ msgstr ""

1663 "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "

1664 "ovanpå \"%s\"."

1665

1669 -#: wt-status.c:1023

1666 +#: wt-status.c:1061

1667 msgid "You are currently splitting a commit during a rebase."

1668 msgstr "Du håller på att dela upp en incheckning i en ombasering."

1669

1673 -#: wt-status.c:1026

1670 +#: wt-status.c:1064

1671 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

1672 msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"

1673

1677 -#: wt-status.c:1030

1674 +#: wt-status.c:1068

1675 #, c-format

1676 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

1677 msgstr ""

1678 "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "

1679 "ovanpå \"%s\"."

1680

1684 -#: wt-status.c:1035

1681 +#: wt-status.c:1073

1682 msgid "You are currently editing a commit during a rebase."

1683 msgstr "Du håller på att redigera en incheckning under en ombasering."

1684

1688 -#: wt-status.c:1038

1685 +#: wt-status.c:1076

1686 msgid " (use \"git commit --amend\" to amend the current commit)"

1687 msgstr ""

1688 " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"

1689

1693 -#: wt-status.c:1040

1690 +#: wt-status.c:1078

1691 msgid ""

1692 " (use \"git rebase --continue\" once you are satisfied with your changes)"

1693 msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"

1694

1698 -#: wt-status.c:1050

1695 +#: wt-status.c:1088

1696 #, c-format

1697 msgid "You are currently cherry-picking commit %s."

1698 msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."

1699

1703 -#: wt-status.c:1055

1700 +#: wt-status.c:1093

1701 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

1702 msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"

1703

1707 -#: wt-status.c:1058

1704 +#: wt-status.c:1096

1705 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

1706 msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"

1707

1711 -#: wt-status.c:1060

1708 +#: wt-status.c:1098

1709 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

1710 msgstr ""

1711 " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"

1712 "operationen)"

1713

1717 -#: wt-status.c:1069

1714 +#: wt-status.c:1107

1715 #, c-format

1716 msgid "You are currently reverting commit %s."

1717 msgstr "Du håller på med att ångra incheckningen %s."

1718

1722 -#: wt-status.c:1074

1719 +#: wt-status.c:1112

1720 msgid " (fix conflicts and run \"git revert --continue\")"

1721 msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"

1722

1726 -#: wt-status.c:1077

1723 +#: wt-status.c:1115

1724 msgid " (all conflicts fixed: run \"git revert --continue\")"

1725 msgstr " (alla konflikter rättade: kör \"git revert --continue\")"

1726

1730 -#: wt-status.c:1079

1727 +#: wt-status.c:1117

1728 msgid " (use \"git revert --abort\" to cancel the revert operation)"

1729 msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"

1730

1734 -#: wt-status.c:1090

1731 +#: wt-status.c:1128

1732 #, c-format

1733 msgid "You are currently bisecting, started from branch '%s'."

1734 msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."

1735

1739 -#: wt-status.c:1094

1736 +#: wt-status.c:1132

1737 msgid "You are currently bisecting."

1738 msgstr "Du håller på med en \"bisect\"."

1739

1743 -#: wt-status.c:1097

1740 +#: wt-status.c:1135

1741 msgid " (use \"git bisect reset\" to get back to the original branch)"

1742 msgstr ""

1743 " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"

1744

1748 -#: wt-status.c:1272

1745 +#: wt-status.c:1310

1746 msgid "On branch "

1747 msgstr "På grenen "

1748

1752 -#: wt-status.c:1279

1749 +#: wt-status.c:1317

1750 msgid "rebase in progress; onto "

1751 msgstr "ombasering pågår; ovanpå"

1752

1756 -#: wt-status.c:1286

1753 +#: wt-status.c:1324

1754 msgid "HEAD detached at "

1755 msgstr "HEAD frånkopplad vid "

1756

1760 -#: wt-status.c:1288

1757 +#: wt-status.c:1326

1758 msgid "HEAD detached from "

1759 msgstr "HEAD frånkopplad från "

1760

1764 -#: wt-status.c:1291

1761 +#: wt-status.c:1329

1762 msgid "Not currently on any branch."

1763 msgstr "Inte på någon gren för närvarande."

1764

1768 -#: wt-status.c:1308

1765 +#: wt-status.c:1346

1766 msgid "Initial commit"

1767 msgstr "Första incheckning"

1768

1772 -#: wt-status.c:1322

1769 +#: wt-status.c:1360

1770 msgid "Untracked files"

1771 msgstr "Ospårade filer"

1772

1776 -#: wt-status.c:1324

1773 +#: wt-status.c:1362

1774 msgid "Ignored files"

1775 msgstr "Ignorerade filer"

1776

1780 -#: wt-status.c:1328

1777 +#: wt-status.c:1366

1778 #, c-format

1779 msgid ""

1780 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -1789,32 +1786,32 @@ msgstr ""

1786 "lägga till nya filer själv (se \"git help status\")."

1787

1788 # %s är nästa sträng eller tom.

1792 -#: wt-status.c:1334

1789 +#: wt-status.c:1372

1790 #, c-format

1791 msgid "Untracked files not listed%s"

1792 msgstr "Ospårade filer visas ej%s"

1793

1797 -#: wt-status.c:1336

1794 +#: wt-status.c:1374

1795 msgid " (use -u option to show untracked files)"

1796 msgstr " (använd flaggan -u för att visa ospårade filer)"

1797

1801 -#: wt-status.c:1342

1798 +#: wt-status.c:1380

1799 msgid "No changes"

1800 msgstr "Inga ändringar"

1801

1805 -#: wt-status.c:1347

1802 +#: wt-status.c:1385

1803 #, c-format

1804 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

1805 msgstr ""

1806 "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"

1807 "\")\n"

1808

1812 -#: wt-status.c:1350

1809 +#: wt-status.c:1388

1810 #, c-format

1811 msgid "no changes added to commit\n"

1812 msgstr "inga ändringar att checka in\n"

1813

1817 -#: wt-status.c:1353

1814 +#: wt-status.c:1391

1815 #, c-format

1816 msgid ""

1817 "nothing added to commit but untracked files present (use \"git add\" to "

@@ -1823,279 +1820,198 @@ msgstr ""

1820 "inget köat för incheckning, men ospårade filer finns (spåra med \"git add"

1821 "\")\n"

1822

1826 -#: wt-status.c:1356

1823 +#: wt-status.c:1394

1824 #, c-format

1825 msgid "nothing added to commit but untracked files present\n"

1826 msgstr "inget köat för incheckning, men ospårade filer finns\n"

1827

1831 -#: wt-status.c:1359

1828 +#: wt-status.c:1397

1829 #, c-format

1830 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

1831 msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"

1832

1836 -#: wt-status.c:1362 wt-status.c:1367

1833 +#: wt-status.c:1400 wt-status.c:1405

1834 #, c-format

1835 msgid "nothing to commit\n"

1836 msgstr "inget att checka in\n"

1837

1841 -#: wt-status.c:1365

1838 +#: wt-status.c:1403

1839 #, c-format

1840 msgid "nothing to commit (use -u to show untracked files)\n"

1841 msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"

1842

1846 -#: wt-status.c:1369

1843 +#: wt-status.c:1407

1844 #, c-format

1845 msgid "nothing to commit, working directory clean\n"

1846 msgstr "inget att checka in, arbetskatalogen ren\n"

1847

1851 -#: wt-status.c:1478

1848 +#: wt-status.c:1516

1849 msgid "HEAD (no branch)"

1850 msgstr "HEAD (ingen gren)"

1851

1855 -#: wt-status.c:1484

1852 +#: wt-status.c:1522

1853 msgid "Initial commit on "

1854 msgstr "Första incheckning på "

1855

1859 -#: wt-status.c:1514

1856 +#: wt-status.c:1554

1857 msgid "gone"

1858 msgstr "försvunnen"

1859

1863 -#: wt-status.c:1516

1860 +#: wt-status.c:1556 wt-status.c:1564

1861 msgid "behind "

1862 msgstr "efter "

1863

1867 -#: wt-status.c:1519 wt-status.c:1522

1868 -msgid "ahead "

1869 -msgstr "före "

1870 -

1871 -#: wt-status.c:1524

1872 -msgid ", behind "

1873 -msgstr ", efter "

1874 -

1864 #: compat/precompose_utf8.c:55 builtin/clone.c:356

1865 #, c-format

1866 msgid "failed to unlink '%s'"

1867 msgstr "misslyckades ta bort länken \"%s\""

1868

1880 -#: builtin/add.c:20

1869 +#: builtin/add.c:21

1870 msgid "git add [options] [--] <pathspec>..."

1871 msgstr "git add [flaggor] [--] <sökväg>..."

1872

1884 -#.

1885 -#. * To be consistent with "git add -p" and most Git

1886 -#. * commands, we should default to being tree-wide, but

1887 -#. * this is not the original behavior and can't be

1888 -#. * changed until users trained themselves not to type

1889 -#. * "git add -u" or "git add -A". For now, we warn and

1890 -#. * keep the old behavior. Later, the behavior can be changed

1891 -#. * to tree-wide, keeping the warning for a while, and

1892 -#. * eventually we can drop the warning.

1893 -#.

1894 -#: builtin/add.c:58

1895 -#, c-format

1896 -msgid ""

1897 -"The behavior of 'git add %s (or %s)' with no path argument from a\n"

1898 -"subdirectory of the tree will change in Git 2.0 and should not be used "

1899 -"anymore.\n"

1900 -"To add content for the whole tree, run:\n"

1901 -"\n"

1902 -" git add %s :/\n"

1903 -" (or git add %s :/)\n"

1904 -"\n"

1905 -"To restrict the command to the current directory, run:\n"

1906 -"\n"

1907 -" git add %s .\n"

1908 -" (or git add %s .)\n"

1909 -"\n"

1910 -"With the current Git version, the command is restricted to the current "

1911 -"directory.\n"

1912 -msgstr ""

1913 -"Beteendet för \"git add %s (eller %s)\" utan sökvägsargument från en\n"

1914 -"underkatalog i ett träd kommer ändras i Git 2.0 och bör inte längre "

1915 -"användas.\n"

1916 -"För att lägga till innehållet för hela trädet, använd:\n"

1917 -"\n"

1918 -" git add %s :/\n"

1919 -" (eller git add %s :/)\n"

1920 -"\n"

1921 -"För att begränsa kommandot till aktuell katalog, använd:\n"

1922 -"\n"

1923 -" git add %s .\n"

1924 -" (eller git add %s .)\n"

1925 -"\n"

1926 -"I nuvarande version av Git begränsas kommandot till aktuell katalog.\n"

1927 -

1928 -#: builtin/add.c:100

1929 -#, c-format

1930 -msgid ""

1931 -"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"

1932 -"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"

1933 -"Paths like '%s' that are\n"

1934 -"removed from your working tree are ignored with this version of Git.\n"

1935 -"\n"

1936 -"* 'git add --ignore-removal <pathspec>', which is the current default,\n"

1937 -" ignores paths you removed from your working tree.\n"

1938 -"\n"

1939 -"* 'git add --all <pathspec>' will let you also record the removals.\n"

1940 -"\n"

1941 -"Run 'git status' to check the paths you removed from your working tree.\n"

1942 -msgstr ""

1943 -"Du körde \"git add\" utan varken \"-A (--all)\" eller \"--ignore-removal\".\n"

1944 -"Beteendet kommer ändras i Git 2.0 vad gäller sökvägar du tagit bort.\n"

1945 -"Sökvägar som \"%s\", som har\n"

1946 -"tagits bort från din arbetskatalog ignoreras i den här versionen av Git.\n"

1947 -"\n"

1948 -"* \"git add --ignore-removal <sökväg>\", som är förvalet just nu,\n"

1949 -" ignorerar sökvägar du har tagit bort från arbetskatalogen.\n"

1950 -"\n"

1951 -"* \"git add --all <sökväg>\" låter dig även registrera borttagningarna.\n"

1952 -"\n"

1953 -"Kör \"git status\" för att kontrollera sökvägarna du tagit bort från\n"

1954 -"arbetskatalogen.\n"

1955 -

1956 -#: builtin/add.c:144

1873 +#: builtin/add.c:64

1874 #, c-format

1875 msgid "unexpected diff status %c"

1876 msgstr "diff-status %c förväntades inte"

1877

1961 -#: builtin/add.c:149 builtin/commit.c:260

1878 +#: builtin/add.c:69 builtin/commit.c:261

1879 msgid "updating files failed"

1880 msgstr "misslyckades uppdatera filer"

1881

1965 -#: builtin/add.c:163

1882 +#: builtin/add.c:79

1883 #, c-format

1884 msgid "remove '%s'\n"

1885 msgstr "ta bort \"%s\"\n"

1886

1970 -#: builtin/add.c:237

1887 +#: builtin/add.c:133

1888 msgid "Unstaged changes after refreshing the index:"

1889 msgstr "Ospårade ändringar efter att ha uppdaterat indexet:"

1890

1974 -#: builtin/add.c:299

1891 +#: builtin/add.c:193

1892 msgid "Could not read the index"

1893 msgstr "Kunde inte läsa indexet"

1894

1978 -#: builtin/add.c:310

1895 +#: builtin/add.c:204

1896 #, c-format

1897 msgid "Could not open '%s' for writing."

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

1899

1983 -#: builtin/add.c:314

1900 +#: builtin/add.c:208

1901 msgid "Could not write patch"

1902 msgstr "Kunde inte skriva patch"

1903

1987 -#: builtin/add.c:319

1904 +#: builtin/add.c:213

1905 #, c-format

1906 msgid "Could not stat '%s'"

1907 msgstr "Kunde inte ta status på \"%s\""

1908

1992 -#: builtin/add.c:321

1909 +#: builtin/add.c:215

1910 msgid "Empty patch. Aborted."

1911 msgstr "Tom patch. Avbryter."

1912

1996 -#: builtin/add.c:327

1913 +#: builtin/add.c:221

1914 #, c-format

1915 msgid "Could not apply '%s'"

1916 msgstr "Kunde inte tillämpa \"%s\""

1917

2001 -#: builtin/add.c:337

1918 +#: builtin/add.c:231

1919 msgid "The following paths are ignored by one of your .gitignore files:\n"

1920 msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"

1921

2005 -#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70

2006 -#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344

1922 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:93 builtin/mv.c:70

1923 +#: builtin/prune-packed.c:77 builtin/push.c:489 builtin/remote.c:1344

1924 #: builtin/rm.c:269

1925 msgid "dry run"

1926 msgstr "testkörning"

1927

2011 -#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19

2012 -#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612

1928 +#: builtin/add.c:249 builtin/apply.c:4410 builtin/check-ignore.c:19

1929 +#: builtin/commit.c:1256 builtin/count-objects.c:95 builtin/fsck.c:612

1930 #: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113

1931 msgid "be verbose"

1932 msgstr "var pratsam"

1933

2017 -#: builtin/add.c:357

1934 +#: builtin/add.c:251

1935 msgid "interactive picking"

1936 msgstr "plocka interaktivt"

1937

2021 -#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272

1938 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:283

1939 msgid "select hunks interactively"

1940 msgstr "välj stycken interaktivt"

1941

2025 -#: builtin/add.c:359

1942 +#: builtin/add.c:253

1943 msgid "edit current diff and apply"

1944 msgstr "redigera aktuell diff och applicera"

1945

2029 -#: builtin/add.c:360

1946 +#: builtin/add.c:254

1947 msgid "allow adding otherwise ignored files"

1948 msgstr "tillåt lägga till annars ignorerade filer"

1949

2033 -#: builtin/add.c:361

1950 +#: builtin/add.c:255

1951 msgid "update tracked files"

1952 msgstr "uppdatera spårade filer"

1953

2037 -#: builtin/add.c:362

1954 +#: builtin/add.c:256

1955 msgid "record only the fact that the path will be added later"

1956 msgstr "registrera endast att sökvägen kommer läggas till senare"

1957

2041 -#: builtin/add.c:363

1958 +#: builtin/add.c:257

1959 msgid "add changes from all tracked and untracked files"

1960 msgstr "lägg till ändringar från alla spårade och ospårade filer"

1961

2045 -#. takes no arguments

2046 -#: builtin/add.c:366

1962 +#: builtin/add.c:260

1963 msgid "ignore paths removed in the working tree (same as --no-all)"

1964 msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)"

1965

2050 -#: builtin/add.c:368

1966 +#: builtin/add.c:262

1967 msgid "don't add, only refresh the index"

1968 msgstr "lägg inte till, uppdatera endast indexet"

1969

2054 -#: builtin/add.c:369

1970 +#: builtin/add.c:263

1971 msgid "just skip files which cannot be added because of errors"

1972 msgstr "hoppa bara över filer som inte kan läggas till på grund av fel"

1973

2058 -#: builtin/add.c:370

1974 +#: builtin/add.c:264

1975 msgid "check if - even missing - files are ignored in dry run"

1976 msgstr "se om - även saknade - filer ignoreras i testkörning"

1977

2062 -#: builtin/add.c:392

1978 +#: builtin/add.c:286

1979 #, c-format

1980 msgid "Use -f if you really want to add them.\n"

1981 msgstr "Använd -f om du verkligen vill lägga till dem.\n"

1982

2067 -#: builtin/add.c:393

1983 +#: builtin/add.c:287

1984 msgid "no files added"

1985 msgstr "inga filer har lagts till"

1986

2071 -#: builtin/add.c:399

1987 +#: builtin/add.c:293

1988 msgid "adding files failed"

1989 msgstr "misslyckades lägga till filer"

1990

2075 -#: builtin/add.c:438

1991 +#: builtin/add.c:330

1992 msgid "-A and -u are mutually incompatible"

1993 msgstr "-A och -u är ömsesidigt inkompatibla"

1994

2079 -#: builtin/add.c:456

1995 +#: builtin/add.c:337

1996 msgid "Option --ignore-missing can only be used together with --dry-run"

1997 msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"

1998

2083 -#: builtin/add.c:486

1999 +#: builtin/add.c:358

2000 #, c-format

2001 msgid "Nothing specified, nothing added.\n"

2002 msgstr "Inget angivet, inget tillagt.\n"

2003

2088 -#: builtin/add.c:487

2004 +#: builtin/add.c:359

2005 #, c-format

2006 msgid "Maybe you wanted to say 'git add .'?\n"

2007 msgstr "Kanske menade du att skriva \"git add .\"?\n"

2008

2093 -#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919

2094 -#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299

2009 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:920

2010 +#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299

2011 msgid "index file corrupt"

2012 msgstr "indexfilen trasig"

2013

2098 -#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432

2014 +#: builtin/add.c:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432

2015 msgid "Unable to write new index file"

2016 msgstr "Kunde inte skriva ny indexfil"

2017

@@ -2207,7 +2123,6 @@ msgstr "** varning: filen %s blir tom men har inte tagits bort"

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

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

2125

2210 -#. there has to be one hunk (forward hunk)

2126 #: builtin/apply.c:1900

2127 #, c-format

2128 msgid "unrecognized binary patch at line %d"

@@ -2348,7 +2263,7 @@ msgstr "%s: patchen kan inte tillämpas"

2263 msgid "Checking patch %s..."

2264 msgstr "Kontrollerar patchen %s..."

2265

2351 -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127

2266 +#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134

2267 #, c-format

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

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

@@ -2397,7 +2312,6 @@ msgstr "Tillämpade patchen %s rent."

2312 msgid "internal error"

2313 msgstr "internt fel"

2314

2400 -#. Say this even without --verbose

2315 #: builtin/apply.c:4043

2316 #, c-format

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

@@ -2489,7 +2403,7 @@ msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"

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

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

2405

2492 -#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452

2406 +#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455

2407 msgid "paths are separated with NUL character"

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

2409

@@ -2627,95 +2541,95 @@ msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil"

2541 msgid "[rev-opts] are documented in git-rev-list(1)"

2542 msgstr "[rev-flaggor] dokumenteras i git-rev-list(1)"

2543

2630 -#: builtin/blame.c:2249

2544 +#: builtin/blame.c:2242

2545 msgid "Show blame entries as we find them, incrementally"

2546 msgstr "Visa klandringsposter när vi hittar dem, interaktivt"

2547

2634 -#: builtin/blame.c:2250

2548 +#: builtin/blame.c:2243

2549 msgid "Show blank SHA-1 for boundary commits (Default: off)"

2550 msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"

2551

2638 -#: builtin/blame.c:2251

2552 +#: builtin/blame.c:2244

2553 msgid "Do not treat root commits as boundaries (Default: off)"

2554 msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"

2555

2642 -#: builtin/blame.c:2252

2556 +#: builtin/blame.c:2245

2557 msgid "Show work cost statistics"

2558 msgstr "Visa statistik över arbetskostnad"

2559

2646 -#: builtin/blame.c:2253

2560 +#: builtin/blame.c:2246

2561 msgid "Show output score for blame entries"

2562 msgstr "Visa utdatapoäng för klandringsposter"

2563

2650 -#: builtin/blame.c:2254

2564 +#: builtin/blame.c:2247

2565 msgid "Show original filename (Default: auto)"

2566 msgstr "Visa originalfilnamn (Standard: auto)"

2567

2654 -#: builtin/blame.c:2255

2568 +#: builtin/blame.c:2248

2569 msgid "Show original linenumber (Default: off)"

2570 msgstr "Visa ursprungligt radnummer (Standard: av)"

2571

2658 -#: builtin/blame.c:2256

2572 +#: builtin/blame.c:2249

2573 msgid "Show in a format designed for machine consumption"

2574 msgstr "Visa i ett format avsett för maskinkonsumtion"

2575

2662 -#: builtin/blame.c:2257

2576 +#: builtin/blame.c:2250

2577 msgid "Show porcelain format with per-line commit information"

2578 msgstr "Visa porslinsformat med per-rad-incheckningsinformation"

2579

2666 -#: builtin/blame.c:2258

2580 +#: builtin/blame.c:2251

2581 msgid "Use the same output mode as git-annotate (Default: off)"

2582 msgstr "Använd samma utdataläge som git-annotate (Standard: av)"

2583

2670 -#: builtin/blame.c:2259

2584 +#: builtin/blame.c:2252

2585 msgid "Show raw timestamp (Default: off)"

2586 msgstr "Visa rå tidsstämpel (Standard: av)"

2587

2674 -#: builtin/blame.c:2260

2588 +#: builtin/blame.c:2253

2589 msgid "Show long commit SHA1 (Default: off)"

2590 msgstr "Visa lång inchecknings-SHA1 (Standard: av)"

2591

2678 -#: builtin/blame.c:2261

2592 +#: builtin/blame.c:2254

2593 msgid "Suppress author name and timestamp (Default: off)"

2594 msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"

2595

2682 -#: builtin/blame.c:2262

2596 +#: builtin/blame.c:2255

2597 msgid "Show author email instead of name (Default: off)"

2598 msgstr "Visa författarens e-post istället för namn (Standard: av)"

2599

2686 -#: builtin/blame.c:2263

2600 +#: builtin/blame.c:2256

2601 msgid "Ignore whitespace differences"

2602 msgstr "Ignorera ändringar i blanksteg"

2603

2690 -#: builtin/blame.c:2264

2604 +#: builtin/blame.c:2257

2605 msgid "Spend extra cycles to find better match"

2606 msgstr "Slösa extra cykler med att hitta bättre träff"

2607

2694 -#: builtin/blame.c:2265

2608 +#: builtin/blame.c:2258

2609 msgid "Use revisions from <file> instead of calling git-rev-list"

2610 msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"

2611

2698 -#: builtin/blame.c:2266

2612 +#: builtin/blame.c:2259

2613 msgid "Use <file>'s contents as the final image"

2614 msgstr "Använd <fil>s innehåll som slutgiltig bild"

2615

2702 -#: builtin/blame.c:2267 builtin/blame.c:2268

2616 +#: builtin/blame.c:2260 builtin/blame.c:2261

2617 msgid "score"

2618 msgstr "poäng"

2619

2706 -#: builtin/blame.c:2267

2620 +#: builtin/blame.c:2260

2621 msgid "Find line copies within and across files"

2622 msgstr "Hitta kopierade rader inuti och mellan filer"

2623

2710 -#: builtin/blame.c:2268

2624 +#: builtin/blame.c:2261

2625 msgid "Find line movements within and across files"

2626 msgstr "Hitta flyttade rader inuti och mellan filer"

2627

2714 -#: builtin/blame.c:2269

2628 +#: builtin/blame.c:2262

2629 msgid "n,m"

2630 msgstr "n,m"

2631

2718 -#: builtin/blame.c:2269

2632 +#: builtin/blame.c:2262

2633 msgid "Process only line range n,m, counting from 1"

2634 msgstr "Behandla endast radintervallet n,m, med början på 1"

2635

@@ -2958,8 +2872,9 @@ msgid "act on remote-tracking branches"

2872 msgstr "arbeta på fjärrspårande grenar"

2873

2874 #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844

2961 -#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461

2962 -#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468

2875 +#: builtin/branch.c:850 builtin/commit.c:1494 builtin/commit.c:1495

2876 +#: builtin/commit.c:1496 builtin/commit.c:1497 builtin/tag.c:527

2877 +#: builtin/tag.c:533

2878 msgid "commit"

2879 msgstr "incheckning"

2880

@@ -3145,43 +3060,43 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."

3060 msgid "Need a repository to unbundle."

3061 msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."

3062

3148 -#: builtin/cat-file.c:328

3063 +#: builtin/cat-file.c:331

3064 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"

3065 msgstr "git cat-file (-t|-s|-e|-p|<typ>|--textconv) <objekt>"

3066

3152 -#: builtin/cat-file.c:329

3067 +#: builtin/cat-file.c:332

3068 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"

3069 msgstr "git cat-file (--batch|--batch-check) < <objektlista>"

3070

3156 -#: builtin/cat-file.c:366

3071 +#: builtin/cat-file.c:369

3072 msgid "<type> can be one of: blob, tree, commit, tag"

3073 msgstr "<typ> kan vara en av: blob, tree, commit, tag"

3074

3160 -#: builtin/cat-file.c:367

3075 +#: builtin/cat-file.c:370

3076 msgid "show object type"

3077 msgstr "visa objekttyp"

3078

3164 -#: builtin/cat-file.c:368

3079 +#: builtin/cat-file.c:371

3080 msgid "show object size"

3081 msgstr "visa objektstorlek"

3082

3168 -#: builtin/cat-file.c:370

3083 +#: builtin/cat-file.c:373

3084 msgid "exit with zero when there's no error"

3085 msgstr "avsluta med noll när det inte uppstått något fel"

3086

3172 -#: builtin/cat-file.c:371

3087 +#: builtin/cat-file.c:374

3088 msgid "pretty-print object's content"

3089 msgstr "visa objektets innehåll snyggt"

3090

3176 -#: builtin/cat-file.c:373

3091 +#: builtin/cat-file.c:376

3092 msgid "for blob objects, run textconv on object's content"

3093 msgstr "för blob-objekt, kör textconv på objektets innehåll"

3094

3180 -#: builtin/cat-file.c:375

3095 +#: builtin/cat-file.c:378

3096 msgid "show info and content of objects fed from the standard input"

3097 msgstr "visa information och innehåll för objekt som listas på standard in"

3098

3184 -#: builtin/cat-file.c:378

3099 +#: builtin/cat-file.c:381

3100 msgid "show info about objects fed from the standard input"

3101 msgstr "visa information för objekt som listas på standard in"

3102

@@ -3209,7 +3124,7 @@ msgstr "läs filnamn från standard in"

3124 msgid "terminate input and output records by a NUL character"

3125 msgstr "avsluta in- och utdataposter med NUL-tecken"

3126

3212 -#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260

3127 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:271

3128 msgid "suppress progress reporting"

3129 msgstr "undertryck förloppsrapportering"

3130

@@ -3360,60 +3275,59 @@ msgstr "\"%s\" kan inte användas med %s"

3275 msgid "Cannot update paths and switch to branch '%s' at the same time."

3276 msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."

3277

3363 -#: builtin/checkout.c:261 builtin/checkout.c:451

3278 +#: builtin/checkout.c:261 builtin/checkout.c:450

3279 msgid "corrupt index file"

3280 msgstr "indexfilen är trasig"

3281

3367 -#: builtin/checkout.c:322 builtin/checkout.c:329

3282 +#: builtin/checkout.c:321 builtin/checkout.c:328

3283 #, c-format

3284 msgid "path '%s' is unmerged"

3285 msgstr "sökvägen \"%s\" har inte slagits ihop"

3286

3372 -#: builtin/checkout.c:473

3287 +#: builtin/checkout.c:472

3288 msgid "you need to resolve your current index first"

3289 msgstr "du måste lösa ditt befintliga index först"

3290

3376 -#: builtin/checkout.c:594

3291 +#: builtin/checkout.c:593

3292 #, c-format

3293 msgid "Can not do reflog for '%s'\n"

3294 msgstr "Kan inte skapa referenslog för \"%s\"\n"

3295

3381 -#: builtin/checkout.c:632

3296 +#: builtin/checkout.c:631

3297 msgid "HEAD is now at"

3298 msgstr "HEAD är nu på"

3299

3385 -#: builtin/checkout.c:639

3300 +#: builtin/checkout.c:638

3301 #, c-format

3302 msgid "Reset branch '%s'\n"

3303 msgstr "Återställ gren \"%s\"\n"

3304

3390 -#: builtin/checkout.c:642

3305 +#: builtin/checkout.c:641

3306 #, c-format

3307 msgid "Already on '%s'\n"

3308 msgstr "Redan på \"%s\"\n"

3309

3395 -#: builtin/checkout.c:646

3310 +#: builtin/checkout.c:645

3311 #, c-format

3312 msgid "Switched to and reset branch '%s'\n"

3313 msgstr "Växlade till och nollställde grenen \"%s\"\n"

3314

3400 -#: builtin/checkout.c:648 builtin/checkout.c:1033

3315 +#: builtin/checkout.c:647 builtin/checkout.c:1032

3316 #, c-format

3317 msgid "Switched to a new branch '%s'\n"

3318 msgstr "Växlade till en ny gren \"%s\"\n"

3319

3405 -#: builtin/checkout.c:650

3320 +#: builtin/checkout.c:649

3321 #, c-format

3322 msgid "Switched to branch '%s'\n"

3323 msgstr "Växlade till grenen \"%s\"\n"

3324

3410 -#: builtin/checkout.c:706

3325 +#: builtin/checkout.c:705

3326 #, c-format

3327 msgid " ... and %d more.\n"

3328 msgstr " ... och %d till.\n"

3329

3415 -#. The singular version

3416 -#: builtin/checkout.c:712

3330 +#: builtin/checkout.c:711

3331 #, c-format

3332 msgid ""

3333 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3436,7 +3350,7 @@ msgstr[1] ""

3350 "\n"

3351 "%s\n"

3352

3439 -#: builtin/checkout.c:730

3353 +#: builtin/checkout.c:729

3354 #, c-format

3355 msgid ""

3356 "If you want to keep them by creating a new branch, this may be a good time\n"

@@ -3451,140 +3365,139 @@ msgstr ""

3365 " git branch nytt_grennamn %s\n"

3366 "\n"

3367

3454 -#: builtin/checkout.c:760

3368 +#: builtin/checkout.c:759

3369 msgid "internal error in revision walk"

3370 msgstr "internt fel vid genomgång av revisioner (revision walk)"

3371

3458 -#: builtin/checkout.c:764

3372 +#: builtin/checkout.c:763

3373 msgid "Previous HEAD position was"

3374 msgstr "Tidigare position för HEAD var"

3375

3462 -#: builtin/checkout.c:791 builtin/checkout.c:1028

3376 +#: builtin/checkout.c:790 builtin/checkout.c:1027

3377 msgid "You are on a branch yet to be born"

3378 msgstr "Du är på en gren som ännu inte är född"

3379

3466 -#: builtin/checkout.c:935

3380 +#: builtin/checkout.c:934

3381 #, c-format

3382 msgid "only one reference expected, %d given."

3383 msgstr "endast en referens förväntades, %d gavs."

3384

3471 -#: builtin/checkout.c:974

3385 +#: builtin/checkout.c:973

3386 #, c-format

3387 msgid "invalid reference: %s"

3388 msgstr "felaktig referens: %s"

3389

3476 -#. case (1): want a tree

3477 -#: builtin/checkout.c:1003

3390 +#: builtin/checkout.c:1002

3391 #, c-format

3392 msgid "reference is not a tree: %s"

3393 msgstr "referensen är inte ett träd: %s"

3394

3482 -#: builtin/checkout.c:1042

3395 +#: builtin/checkout.c:1041

3396 msgid "paths cannot be used with switching branches"

3397 msgstr "sökvägar kan inte användas vid byte av gren"

3398

3486 -#: builtin/checkout.c:1045 builtin/checkout.c:1049

3399 +#: builtin/checkout.c:1044 builtin/checkout.c:1048

3400 #, c-format

3401 msgid "'%s' cannot be used with switching branches"

3402 msgstr "\"%s\" kan inte användas vid byte av gren"

3403

3491 -#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061

3492 -#: builtin/checkout.c:1064

3404 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060

3405 +#: builtin/checkout.c:1063

3406 #, c-format

3407 msgid "'%s' cannot be used with '%s'"

3408 msgstr "\"%s\" kan inte användas med \"%s\""

3409

3497 -#: builtin/checkout.c:1069

3410 +#: builtin/checkout.c:1068

3411 #, c-format

3412 msgid "Cannot switch branch to a non-commit '%s'"

3413 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""

3414

3502 -#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88

3415 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:88

3416 #: builtin/remote.c:159 builtin/remote.c:161

3417 msgid "branch"

3418 msgstr "gren"

3419

3507 -#: builtin/checkout.c:1092

3420 +#: builtin/checkout.c:1091

3421 msgid "create and checkout a new branch"

3422 msgstr "skapa och checka ut en ny gren"

3423

3511 -#: builtin/checkout.c:1094

3424 +#: builtin/checkout.c:1093

3425 msgid "create/reset and checkout a branch"

3426 msgstr "skapa/nollställ och checka ut en gren"

3427

3515 -#: builtin/checkout.c:1095

3428 +#: builtin/checkout.c:1094

3429 msgid "create reflog for new branch"

3430 msgstr "skapa reflogg för ny gren"

3431

3519 -#: builtin/checkout.c:1096

3432 +#: builtin/checkout.c:1095

3433 msgid "detach the HEAD at named commit"

3434 msgstr "koppla från HEAD vid namngiven incheckning"

3435

3523 -#: builtin/checkout.c:1097

3436 +#: builtin/checkout.c:1096

3437 msgid "set upstream info for new branch"

3438 msgstr "sätt uppströmsinformation för ny gren"

3439

3527 -#: builtin/checkout.c:1099

3528 -msgid "new branch"

3529 -msgstr "ny gren"

3440 +#: builtin/checkout.c:1098

3441 +msgid "new-branch"

3442 +msgstr "ny-gren"

3443

3531 -#: builtin/checkout.c:1099

3444 +#: builtin/checkout.c:1098

3445 msgid "new unparented branch"

3446 msgstr "ny gren utan förälder"

3447

3535 -#: builtin/checkout.c:1100

3448 +#: builtin/checkout.c:1099

3449 msgid "checkout our version for unmerged files"

3450 msgstr "checka ut vår version för ej sammanslagna filer"

3451

3539 -#: builtin/checkout.c:1102

3452 +#: builtin/checkout.c:1101

3453 msgid "checkout their version for unmerged files"

3454 msgstr "checka ut deras version för ej sammanslagna filer"

3455

3543 -#: builtin/checkout.c:1104

3456 +#: builtin/checkout.c:1103

3457 msgid "force checkout (throw away local modifications)"

3458 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"

3459

3547 -#: builtin/checkout.c:1105

3460 +#: builtin/checkout.c:1104

3461 msgid "perform a 3-way merge with the new branch"

3462 msgstr "utför en 3-vägssammanslagning för den nya grenen"

3463

3551 -#: builtin/checkout.c:1106 builtin/merge.c:225

3464 +#: builtin/checkout.c:1105 builtin/merge.c:225

3465 msgid "update ignored files (default)"

3466 msgstr "uppdatera ignorerade filer (standard)"

3467

3555 -#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248

3468 +#: builtin/checkout.c:1106 builtin/log.c:1228 parse-options.h:245

3469 msgid "style"

3470 msgstr "stil"

3471

3559 -#: builtin/checkout.c:1108

3472 +#: builtin/checkout.c:1107

3473 msgid "conflict style (merge or diff3)"

3474 msgstr "konfliktstil (merge eller diff3)"

3475

3563 -#: builtin/checkout.c:1111

3476 +#: builtin/checkout.c:1110

3477 msgid "do not limit pathspecs to sparse entries only"

3478 msgstr "begränsa inte sökvägar till endast glesa poster"

3479

3567 -#: builtin/checkout.c:1113

3480 +#: builtin/checkout.c:1112

3481 msgid "second guess 'git checkout no-such-branch'"

3482 msgstr "förutspå \"git checkout gren-saknas\""

3483

3571 -#: builtin/checkout.c:1136

3484 +#: builtin/checkout.c:1135

3485 msgid "-b, -B and --orphan are mutually exclusive"

3486 msgstr "-b, -B och --orphan är ömsesidigt uteslutande"

3487

3575 -#: builtin/checkout.c:1153

3488 +#: builtin/checkout.c:1152

3489 msgid "--track needs a branch name"

3490 msgstr "--track behöver ett namn på en gren"

3491

3579 -#: builtin/checkout.c:1160

3492 +#: builtin/checkout.c:1159

3493 msgid "Missing branch name; try -b"

3494 msgstr "Grennamn saknas; försök med -b"

3495

3583 -#: builtin/checkout.c:1197

3496 +#: builtin/checkout.c:1196

3497 msgid "invalid path specification"

3498 msgstr "felaktig sökvägsangivelse"

3499

3587 -#: builtin/checkout.c:1204

3500 +#: builtin/checkout.c:1203

3501 #, c-format

3502 msgid ""

3503 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3593,12 +3506,12 @@ msgstr ""

3506 "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"

3507 "Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"

3508

3596 -#: builtin/checkout.c:1209

3509 +#: builtin/checkout.c:1208

3510 #, c-format

3511 msgid "git checkout: --detach does not take a path argument '%s'"

3512 msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""

3513

3601 -#: builtin/checkout.c:1213

3514 +#: builtin/checkout.c:1212

3515 msgid ""

3516 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3517 "checking out of the index."

@@ -3638,7 +3551,7 @@ msgstr "Skulle hoppa över arkivet %s\n"

3551 msgid "failed to remove %s"

3552 msgstr "misslyckades ta bort %s"

3553

3641 -#: builtin/clean.c:294

3554 +#: builtin/clean.c:295

3555 msgid ""

3556 "Prompt help:\n"

3557 "1 - select a numbered item\n"

@@ -3650,7 +3563,7 @@ msgstr ""

3563 "foo - markera post baserad på unikt prefix\n"

3564 " - (tomt) markera ingenting"

3565

3653 -#: builtin/clean.c:298

3566 +#: builtin/clean.c:299

3567 msgid ""

3568 "Prompt help:\n"

3569 "1 - select a single item\n"

@@ -3670,35 +3583,35 @@ msgstr ""

3583 "* - välj alla poster\n"

3584 " - (tomt) avsluta markering"

3585

3673 -#: builtin/clean.c:516

3586 +#: builtin/clean.c:517

3587 #, c-format

3588 msgid "Huh (%s)?"

3589 msgstr "Vadå (%s)?"

3590

3678 -#: builtin/clean.c:659

3591 +#: builtin/clean.c:660

3592 #, c-format

3593 msgid "Input ignore patterns>> "

3594 msgstr "Ange ignoreringsmönster>>"

3595

3683 -#: builtin/clean.c:696

3596 +#: builtin/clean.c:697

3597 #, c-format

3598 msgid "WARNING: Cannot find items matched by: %s"

3599 msgstr "VARNING: Hittar inte poster som motsvarar: %s"

3600

3688 -#: builtin/clean.c:717

3601 +#: builtin/clean.c:718

3602 msgid "Select items to delete"

3603 msgstr "Välj poster att ta bort"

3604

3692 -#: builtin/clean.c:757

3605 +#: builtin/clean.c:758

3606 #, c-format

3607 msgid "remove %s? "

3608 msgstr "ta bort %s?"

3609

3697 -#: builtin/clean.c:782

3610 +#: builtin/clean.c:783

3611 msgid "Bye."

3612 msgstr "Hej då."

3613

3701 -#: builtin/clean.c:790

3614 +#: builtin/clean.c:791

3615 msgid ""

3616 "clean - start cleaning\n"

3617 "filter by pattern - exclude items from deletion\n"

@@ -3716,72 +3629,72 @@ msgstr ""

3629 "help - denna skärm\n"

3630 "? - hjälp för kommandoval"

3631

3719 -#: builtin/clean.c:817

3632 +#: builtin/clean.c:818

3633 msgid "*** Commands ***"

3634 msgstr "*** Kommandon ***"

3635

3723 -#: builtin/clean.c:818

3636 +#: builtin/clean.c:819

3637 msgid "What now"

3638 msgstr "Vad nu"

3639

3727 -#: builtin/clean.c:826

3640 +#: builtin/clean.c:827

3641 msgid "Would remove the following item:"

3642 msgid_plural "Would remove the following items:"

3643 msgstr[0] "Skulle ta bort följande post:"

3644 msgstr[1] "Skulle ta bort följande poster:"

3645

3733 -#: builtin/clean.c:843

3646 +#: builtin/clean.c:844

3647 msgid "No more files to clean, exiting."

3648 msgstr "Inga fler filer att städa, avslutar."

3649

3737 -#: builtin/clean.c:874

3650 +#: builtin/clean.c:875

3651 msgid "do not print names of files removed"

3652 msgstr "skriv inte ut namn på borttagna filer"

3653

3741 -#: builtin/clean.c:876

3654 +#: builtin/clean.c:877

3655 msgid "force"

3656 msgstr "tvinga"

3657

3745 -#: builtin/clean.c:877

3658 +#: builtin/clean.c:878

3659 msgid "interactive cleaning"

3660 msgstr "städa interaktivt"

3661

3749 -#: builtin/clean.c:879

3662 +#: builtin/clean.c:880

3663 msgid "remove whole directories"

3664 msgstr "ta bort hela kataloger"

3665

3753 -#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718

3754 -#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185

3666 +#: builtin/clean.c:881 builtin/describe.c:415 builtin/grep.c:716

3667 +#: builtin/ls-files.c:486 builtin/name-rev.c:314 builtin/show-ref.c:185

3668 msgid "pattern"

3669 msgstr "mönster"

3670

3758 -#: builtin/clean.c:881

3671 +#: builtin/clean.c:882

3672 msgid "add <pattern> to ignore rules"

3673 msgstr "lägg till <mönster> till ignoreringsregler"

3674

3762 -#: builtin/clean.c:882

3675 +#: builtin/clean.c:883

3676 msgid "remove ignored files, too"

3677 msgstr "ta även bort ignorerade filer"

3678

3766 -#: builtin/clean.c:884

3679 +#: builtin/clean.c:885

3680 msgid "remove only ignored files"

3681 msgstr "ta endast bort ignorerade filer"

3682

3770 -#: builtin/clean.c:902

3683 +#: builtin/clean.c:903

3684 msgid "-x and -X cannot be used together"

3685 msgstr "-x och -X kan inte användas samtidigt"

3686

3774 -#: builtin/clean.c:906

3687 +#: builtin/clean.c:907

3688 msgid ""

3776 -"clean.requireForce set to true and neither -i, -n nor -f given; refusing to "

3689 +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

3690 "clean"

3691 msgstr ""

3692 "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "

3693 "städa"

3694

3782 -#: builtin/clean.c:909

3695 +#: builtin/clean.c:910

3696 msgid ""

3784 -"clean.requireForce defaults to true and neither -i, -n nor -f given; "

3697 +"clean.requireForce defaults to true and neither -i, -n, nor -f given; "

3698 "refusing to clean"

3699 msgstr ""

3700 "clean.requireForce har standardvärdet true och varken -i, -n eller -f "

@@ -3792,7 +3705,7 @@ msgid "git clone [options] [--] <repo> [<dir>]"

3705 msgstr "git clone [flaggor] [--] <arkiv> [<kat>]"

3706

3707 #: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222

3795 -#: builtin/push.c:521

3708 +#: builtin/push.c:504

3709 msgid "force progress reporting"

3710 msgstr "tvinga förloppsrapportering"

3711

@@ -3800,7 +3713,7 @@ msgstr "tvinga förloppsrapportering"

3713 msgid "don't create a checkout"

3714 msgstr "skapa inte någon utcheckning"

3715

3803 -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488

3716 +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486

3717 msgid "create a bare repository"

3718 msgstr "skapa ett naket (\"bare\") arkiv"

3719

@@ -3824,11 +3737,11 @@ msgstr "skapa som ett delat arkiv"

3737 msgid "initialize submodules in the clone"

3738 msgstr "initiera undermoduler i klonen"

3739

3827 -#: builtin/clone.c:82 builtin/init-db.c:485

3740 +#: builtin/clone.c:82 builtin/init-db.c:483

3741 msgid "template-directory"

3742 msgstr "mallkatalog"

3743

3831 -#: builtin/clone.c:83 builtin/init-db.c:486

3744 +#: builtin/clone.c:83 builtin/init-db.c:484

3745 msgid "directory from which templates will be used"

3746 msgstr "katalog att använda mallar från"

3747

@@ -3852,7 +3765,7 @@ msgstr "checka ut <gren> istället för fjärrens HEAD"

3765 msgid "path to git-upload-pack on the remote"

3766 msgstr "sökväg till git-upload-pack på fjärren"

3767

3855 -#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663

3768 +#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:661

3769 msgid "depth"

3770 msgstr "djup"

3771

@@ -3864,11 +3777,11 @@ msgstr "skapa en grund klon på detta djup"

3777 msgid "clone only one branch, HEAD or --branch"

3778 msgstr "klona endast en gren, HEAD eller --branch"

3779

3867 -#: builtin/clone.c:96 builtin/init-db.c:494

3780 +#: builtin/clone.c:96 builtin/init-db.c:492

3781 msgid "gitdir"

3782 msgstr "gitkat"

3783

3871 -#: builtin/clone.c:97 builtin/init-db.c:495

3784 +#: builtin/clone.c:97 builtin/init-db.c:493

3785 msgid "separate git dir from working tree"

3786 msgstr "separera gitkatalogen från arbetskatalogen"

3787

@@ -4155,67 +4068,67 @@ msgstr ""

4068 "\"git cherry-pick --continue\" kommer därefter att återuppta\n"

4069 "cherry-pick för återstående incheckningar.\n"

4070

4158 -#: builtin/commit.c:287

4071 +#: builtin/commit.c:288

4072 msgid "failed to unpack HEAD tree object"

4073 msgstr "misslyckades packa upp HEAD:s trädobjekt"

4074

4162 -#: builtin/commit.c:329

4075 +#: builtin/commit.c:330

4076 msgid "unable to create temporary index"

4077 msgstr "kunde inte skapa temporär indexfil"

4078

4166 -#: builtin/commit.c:335

4079 +#: builtin/commit.c:336

4080 msgid "interactive add failed"

4081 msgstr "interaktiv tilläggning misslyckades"

4082

4170 -#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439

4083 +#: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440

4084 msgid "unable to write new_index file"

4085 msgstr "kunde inte skriva filen new_index"

4086

4174 -#: builtin/commit.c:420

4087 +#: builtin/commit.c:421

4088 msgid "cannot do a partial commit during a merge."

4089 msgstr "kan inte utföra en delvis incheckning under en sammanslagning."

4090

4178 -#: builtin/commit.c:422

4091 +#: builtin/commit.c:423

4092 msgid "cannot do a partial commit during a cherry-pick."

4093 msgstr "kan inte utföra en delvis incheckning under en cherry-pick."

4094

4182 -#: builtin/commit.c:432

4095 +#: builtin/commit.c:433

4096 msgid "cannot read the index"

4097 msgstr "kan inte läsa indexet"

4098

4186 -#: builtin/commit.c:452

4099 +#: builtin/commit.c:453

4100 msgid "unable to write temporary index file"

4101 msgstr "kunde inte skriva temporär indexfil"

4102

4190 -#: builtin/commit.c:543 builtin/commit.c:549

4103 +#: builtin/commit.c:544 builtin/commit.c:550

4104 #, c-format

4105 msgid "invalid commit: %s"

4106 msgstr "felaktig incheckning: %s"

4107

4195 -#: builtin/commit.c:571

4108 +#: builtin/commit.c:572

4109 msgid "malformed --author parameter"

4110 msgstr "felformad \"--author\"-flagga"

4111

4199 -#: builtin/commit.c:591

4112 +#: builtin/commit.c:592

4113 #, c-format

4114 msgid "Malformed ident string: '%s'"

4115 msgstr "Felaktig indragningssträng: \"%s\""

4116

4204 -#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007

4117 +#: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014

4118 #, c-format

4119 msgid "could not lookup commit %s"

4120 msgstr "kunde inte slå upp incheckningen %s"

4121

4209 -#: builtin/commit.c:642 builtin/shortlog.c:273

4122 +#: builtin/commit.c:641 builtin/shortlog.c:273

4123 #, c-format

4124 msgid "(reading log message from standard input)\n"

4125 msgstr "(läser loggmeddelande från standard in)\n"

4126

4214 -#: builtin/commit.c:644

4127 +#: builtin/commit.c:643

4128 msgid "could not read log from standard input"

4129 msgstr "kunde inte läsa logg från standard in"

4130

4218 -#: builtin/commit.c:648

4131 +#: builtin/commit.c:647

4132 #, c-format

4133 msgid "could not read log file '%s'"

4134 msgstr "kunde inte läsa loggfilen \"%s\""

@@ -4241,7 +4154,7 @@ msgstr "kunde inte läsa \"%s\""

4154 msgid "could not write commit template"

4155 msgstr "kunde inte skriva incheckningsmall"

4156

4244 -#: builtin/commit.c:760

4157 +#: builtin/commit.c:764

4158 #, c-format

4159 msgid ""

4160 "\n"

@@ -4256,7 +4169,7 @@ msgstr ""

4169 "\t%s\n"

4170 "och försöker igen.\n"

4171

4259 -#: builtin/commit.c:765

4172 +#: builtin/commit.c:769

4173 #, c-format

4174 msgid ""

4175 "\n"

@@ -4271,7 +4184,7 @@ msgstr ""

4184 "\t%s\n"

4185 "och försöker igen.\n"

4186

4274 -#: builtin/commit.c:777

4187 +#: builtin/commit.c:782

4188 #, c-format

4189 msgid ""

4190 "Please enter the commit message for your changes. Lines starting\n"

@@ -4281,7 +4194,7 @@ msgstr ""

4194 "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "

4195 "incheckningen.\n"

4196

4284 -#: builtin/commit.c:782

4197 +#: builtin/commit.c:789

4198 #, c-format

4199 msgid ""

4200 "Please enter the commit message for your changes. Lines starting\n"

@@ -4292,139 +4205,139 @@ msgstr ""

4205 "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"

4206 "Ett tomt meddelande avbryter incheckningen.\n"

4207

4295 -#: builtin/commit.c:795

4208 +#: builtin/commit.c:802

4209 #, c-format

4210 msgid "%sAuthor: %s"

4211 msgstr "%sFörfattare: %s"

4212

4300 -#: builtin/commit.c:802

4213 +#: builtin/commit.c:809

4214 #, c-format

4215 msgid "%sCommitter: %s"

4216 msgstr "%sIncheckare: %s"

4217

4305 -#: builtin/commit.c:822

4218 +#: builtin/commit.c:829

4219 msgid "Cannot read index"

4220 msgstr "Kan inte läsa indexet"

4221

4309 -#: builtin/commit.c:865

4222 +#: builtin/commit.c:872

4223 msgid "Error building trees"

4224 msgstr "Fel vid byggande av träd"

4225

4313 -#: builtin/commit.c:880 builtin/tag.c:359

4226 +#: builtin/commit.c:887 builtin/tag.c:391

4227 #, c-format

4228 msgid "Please supply the message using either -m or -F option.\n"

4229 msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"

4230

4318 -#: builtin/commit.c:982

4231 +#: builtin/commit.c:989

4232 #, c-format

4233 msgid "No existing author found with '%s'"

4234 msgstr "Hittade ingen befintlig författare med \"%s\""

4235

4323 -#: builtin/commit.c:997 builtin/commit.c:1237

4236 +#: builtin/commit.c:1004 builtin/commit.c:1244

4237 #, c-format

4238 msgid "Invalid untracked files mode '%s'"

4239 msgstr "Ogiltigt läge för ospårade filer: \"%s\""

4240

4328 -#: builtin/commit.c:1034

4241 +#: builtin/commit.c:1041

4242 msgid "--long and -z are incompatible"

4243 msgstr "--long och -z är inkompatibla"

4244

4332 -#: builtin/commit.c:1064

4245 +#: builtin/commit.c:1071

4246 msgid "Using both --reset-author and --author does not make sense"

4247 msgstr "Kan inte använda både --reset-author och --author"

4248

4336 -#: builtin/commit.c:1075

4249 +#: builtin/commit.c:1080

4250 msgid "You have nothing to amend."

4251 msgstr "Du har inget att utöka."

4252

4340 -#: builtin/commit.c:1078

4253 +#: builtin/commit.c:1083

4254 msgid "You are in the middle of a merge -- cannot amend."

4255 msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."

4256

4344 -#: builtin/commit.c:1080

4257 +#: builtin/commit.c:1085

4258 msgid "You are in the middle of a cherry-pick -- cannot amend."

4259 msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."

4260

4348 -#: builtin/commit.c:1083

4261 +#: builtin/commit.c:1088

4262 msgid "Options --squash and --fixup cannot be used together"

4263 msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"

4264

4352 -#: builtin/commit.c:1093

4265 +#: builtin/commit.c:1098

4266 msgid "Only one of -c/-C/-F/--fixup can be used."

4267 msgstr "Endast en av -c/-C/-F/--fixup kan användas."

4268

4356 -#: builtin/commit.c:1095

4269 +#: builtin/commit.c:1100

4270 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

4271 msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."

4272

4360 -#: builtin/commit.c:1103

4273 +#: builtin/commit.c:1108

4274 msgid "--reset-author can be used only with -C, -c or --amend."

4275 msgstr "--reset-author kan endast användas med -C, -c eller --amend."

4276

4364 -#: builtin/commit.c:1120

4277 +#: builtin/commit.c:1125

4278 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

4279 msgstr ""

4280 "Endast en av --include/--only/--all/--interactive/--patch kan användas."

4281

4369 -#: builtin/commit.c:1122

4282 +#: builtin/commit.c:1127

4283 msgid "No paths with --include/--only does not make sense."

4284 msgstr "Du måste ange sökvägar tillsammans med --include/--only."

4285

4373 -#: builtin/commit.c:1124

4286 +#: builtin/commit.c:1129

4287 msgid "Clever... amending the last one with dirty index."

4288 msgstr "Smart... utöka den senaste med smutsigt index."

4289

4377 -#: builtin/commit.c:1126

4378 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

4290 +#: builtin/commit.c:1131

4291 +msgid "Explicit paths specified without -i or -o; assuming --only paths..."

4292 msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."

4293

4381 -#: builtin/commit.c:1136 builtin/tag.c:572

4294 +#: builtin/commit.c:1143 builtin/tag.c:639

4295 #, c-format

4296 msgid "Invalid cleanup mode %s"

4297 msgstr "Felaktigt städningsläge %s"

4298

4386 -#: builtin/commit.c:1141

4299 +#: builtin/commit.c:1148

4300 msgid "Paths with -a does not make sense."

4301 msgstr "Kan inte ange sökvägar med -a."

4302

4390 -#: builtin/commit.c:1251 builtin/commit.c:1482

4303 +#: builtin/commit.c:1258 builtin/commit.c:1516

4304 msgid "show status concisely"

4305 msgstr "visa koncis status"

4306

4394 -#: builtin/commit.c:1253 builtin/commit.c:1484

4307 +#: builtin/commit.c:1260 builtin/commit.c:1518

4308 msgid "show branch information"

4309 msgstr "visa information om gren"

4310

4398 -#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507

4311 +#: builtin/commit.c:1262 builtin/commit.c:1520 builtin/push.c:490

4312 msgid "machine-readable output"

4313 msgstr "maskinläsbar utdata"

4314

4402 -#: builtin/commit.c:1258 builtin/commit.c:1488

4315 +#: builtin/commit.c:1265 builtin/commit.c:1522

4316 msgid "show status in long format (default)"

4317 msgstr "visa status i långt format (standard)"

4318

4406 -#: builtin/commit.c:1261 builtin/commit.c:1491

4319 +#: builtin/commit.c:1268 builtin/commit.c:1525

4320 msgid "terminate entries with NUL"

4321 msgstr "terminera poster med NUL"

4322

4410 -#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674

4411 -#: builtin/fast-export.c:677 builtin/tag.c:459

4323 +#: builtin/commit.c:1270 builtin/commit.c:1528 builtin/fast-export.c:674

4324 +#: builtin/fast-export.c:677 builtin/tag.c:514

4325 msgid "mode"

4326 msgstr "läge"

4327

4415 -#: builtin/commit.c:1264 builtin/commit.c:1494

4328 +#: builtin/commit.c:1271 builtin/commit.c:1528

4329 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4330 msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"

4331

4419 -#: builtin/commit.c:1267

4332 +#: builtin/commit.c:1274

4333 msgid "show ignored files"

4334 msgstr "visa ignorerade filer"

4335

4423 -#: builtin/commit.c:1268 parse-options.h:156

4336 +#: builtin/commit.c:1275 parse-options.h:153

4337 msgid "when"

4338 msgstr "när"

4339

4427 -#: builtin/commit.c:1269

4340 +#: builtin/commit.c:1276

4341 msgid ""

4342 "ignore changes to submodules, optional when: all, dirty, untracked. "

4343 "(Default: all)"

@@ -4432,217 +4345,217 @@ msgstr ""

4345 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "

4346 "(Default: all)"

4347

4435 -#: builtin/commit.c:1271

4348 +#: builtin/commit.c:1278

4349 msgid "list untracked files in columns"

4350 msgstr "visa ospårade filer i spalter"

4351

4439 -#: builtin/commit.c:1340

4352 +#: builtin/commit.c:1347

4353 msgid "couldn't look up newly created commit"

4354 msgstr "kunde inte slå upp en precis skapad incheckning"

4355

4443 -#: builtin/commit.c:1342

4356 +#: builtin/commit.c:1349

4357 msgid "could not parse newly created commit"

4358 msgstr "kunde inte tolka en precis skapad incheckning"

4359

4447 -#: builtin/commit.c:1383

4360 +#: builtin/commit.c:1390

4361 msgid "detached HEAD"

4362 msgstr "frånkopplad HEAD"

4363

4451 -#: builtin/commit.c:1385

4364 +#: builtin/commit.c:1392

4365 msgid " (root-commit)"

4366 msgstr " (rotincheckning)"

4367

4455 -#: builtin/commit.c:1452

4368 +#: builtin/commit.c:1486

4369 msgid "suppress summary after successful commit"

4370 msgstr "undertryck sammanfattning efter framgångsrik incheckning"

4371

4459 -#: builtin/commit.c:1453

4372 +#: builtin/commit.c:1487

4373 msgid "show diff in commit message template"

4374 msgstr "visa diff i mallen för incheckningsmeddelandet"

4375

4463 -#: builtin/commit.c:1455

4376 +#: builtin/commit.c:1489

4377 msgid "Commit message options"

4378 msgstr "Alternativ för incheckningsmeddelande"

4379

4467 -#: builtin/commit.c:1456 builtin/tag.c:457

4380 +#: builtin/commit.c:1490 builtin/tag.c:512

4381 msgid "read message from file"

4382 msgstr "läs meddelande från fil"

4383

4471 -#: builtin/commit.c:1457

4384 +#: builtin/commit.c:1491

4385 msgid "author"

4386 msgstr "författare"

4387

4475 -#: builtin/commit.c:1457

4388 +#: builtin/commit.c:1491

4389 msgid "override author for commit"

4390 msgstr "överstyr författare för incheckningen"

4391

4479 -#: builtin/commit.c:1458 builtin/gc.c:261

4392 +#: builtin/commit.c:1492 builtin/gc.c:272

4393 msgid "date"

4394 msgstr "datum"

4395

4483 -#: builtin/commit.c:1458

4396 +#: builtin/commit.c:1492

4397 msgid "override date for commit"

4398 msgstr "överstyr datum för inchecknignen"

4399

4487 -#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405

4488 -#: builtin/notes.c:562 builtin/tag.c:455

4400 +#: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409

4401 +#: builtin/notes.c:566 builtin/tag.c:510

4402 msgid "message"

4403 msgstr "meddelande"

4404

4492 -#: builtin/commit.c:1459

4405 +#: builtin/commit.c:1493

4406 msgid "commit message"

4407 msgstr "incheckningsmeddelande"

4408

4496 -#: builtin/commit.c:1460

4409 +#: builtin/commit.c:1494

4410 msgid "reuse and edit message from specified commit"

4411 msgstr "återanvänd och redigera meddelande från angiven incheckning"

4412

4500 -#: builtin/commit.c:1461

4413 +#: builtin/commit.c:1495

4414 msgid "reuse message from specified commit"

4415 msgstr "återanvänd meddelande från angiven incheckning"

4416

4504 -#: builtin/commit.c:1462

4417 +#: builtin/commit.c:1496

4418 msgid "use autosquash formatted message to fixup specified commit"

4419 msgstr ""

4420 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"

4421

4509 -#: builtin/commit.c:1463

4422 +#: builtin/commit.c:1497

4423 msgid "use autosquash formatted message to squash specified commit"

4424 msgstr ""

4425 "använd autosquash-formaterat meddelande för att slå ihop med angiven "

4426 "incheckning"

4427

4515 -#: builtin/commit.c:1464

4428 +#: builtin/commit.c:1498

4429 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4430 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"

4431

4519 -#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86

4432 +#: builtin/commit.c:1499 builtin/log.c:1180 builtin/revert.c:86

4433 msgid "add Signed-off-by:"

4434 msgstr "lägg till Signed-off-by:"

4435

4523 -#: builtin/commit.c:1466

4436 +#: builtin/commit.c:1500

4437 msgid "use specified template file"

4438 msgstr "använd angiven mallfil"

4439

4527 -#: builtin/commit.c:1467

4440 +#: builtin/commit.c:1501

4441 msgid "force edit of commit"

4442 msgstr "tvinga redigering av incheckning"

4443

4531 -#: builtin/commit.c:1468

4444 +#: builtin/commit.c:1502

4445 msgid "default"

4446 msgstr "standard"

4447

4535 -#: builtin/commit.c:1468 builtin/tag.c:460

4448 +#: builtin/commit.c:1502 builtin/tag.c:515

4449 msgid "how to strip spaces and #comments from message"

4450 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

4451

4539 -#: builtin/commit.c:1469

4452 +#: builtin/commit.c:1503

4453 msgid "include status in commit message template"

4454 msgstr "inkludera status i mallen för incheckningsmeddelandet"

4455

4543 -#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461

4544 -msgid "key id"

4456 +#: builtin/commit.c:1504 builtin/merge.c:223 builtin/revert.c:92

4457 +#: builtin/tag.c:516

4458 +msgid "key-id"

4459 msgstr "nyckel-id"

4460

4547 -#: builtin/commit.c:1471 builtin/merge.c:224

4461 +#: builtin/commit.c:1505 builtin/merge.c:224 builtin/revert.c:93

4462 msgid "GPG sign commit"

4463 msgstr "GPG-signera incheckning"

4464

4551 -#. end commit message options

4552 -#: builtin/commit.c:1474

4465 +#: builtin/commit.c:1508

4466 msgid "Commit contents options"

4467 msgstr "Alternativ för incheckningens innehåll"

4468

4556 -#: builtin/commit.c:1475

4469 +#: builtin/commit.c:1509

4470 msgid "commit all changed files"

4471 msgstr "checka in alla ändrade filer"

4472

4560 -#: builtin/commit.c:1476

4473 +#: builtin/commit.c:1510

4474 msgid "add specified files to index for commit"

4475 msgstr "lägg till angivna filer till indexet för incheckning"

4476

4564 -#: builtin/commit.c:1477

4477 +#: builtin/commit.c:1511

4478 msgid "interactively add files"

4479 msgstr "lägg till filer interaktivt"

4480

4568 -#: builtin/commit.c:1478

4481 +#: builtin/commit.c:1512

4482 msgid "interactively add changes"

4483 msgstr "lägg till ändringar interaktivt"

4484

4572 -#: builtin/commit.c:1479

4485 +#: builtin/commit.c:1513

4486 msgid "commit only specified files"

4487 msgstr "checka endast in angivna filer"

4488

4576 -#: builtin/commit.c:1480

4489 +#: builtin/commit.c:1514

4490 msgid "bypass pre-commit hook"

4491 msgstr "förbigå pre-commit-krok"

4492

4580 -#: builtin/commit.c:1481

4493 +#: builtin/commit.c:1515

4494 msgid "show what would be committed"

4495 msgstr "visa vad som skulle checkas in"

4496

4584 -#: builtin/commit.c:1492

4497 +#: builtin/commit.c:1526

4498 msgid "amend previous commit"

4499 msgstr "lägg till föregående incheckning"

4500

4588 -#: builtin/commit.c:1493

4501 +#: builtin/commit.c:1527

4502 msgid "bypass post-rewrite hook"

4503 msgstr "förbigå post-rewrite-krok"

4504

4592 -#: builtin/commit.c:1498

4505 +#: builtin/commit.c:1532

4506 msgid "ok to record an empty change"

4507 msgstr "ok att registrera en tom ändring"

4508

4596 -#: builtin/commit.c:1500

4509 +#: builtin/commit.c:1534

4510 msgid "ok to record a change with an empty message"

4511 msgstr "ok att registrera en ändring med tomt meddelande"

4512

4600 -#: builtin/commit.c:1529

4513 +#: builtin/commit.c:1562

4514 msgid "could not parse HEAD commit"

4515 msgstr "kunde inte tolka HEAD:s incheckning"

4516

4604 -#: builtin/commit.c:1567 builtin/merge.c:518

4517 +#: builtin/commit.c:1601 builtin/merge.c:518

4518 #, c-format

4519 msgid "could not open '%s' for reading"

4520 msgstr "kunde inte öppna \"%s\" för läsning"

4521

4609 -#: builtin/commit.c:1574

4522 +#: builtin/commit.c:1608

4523 #, c-format

4524 msgid "Corrupt MERGE_HEAD file (%s)"

4525 msgstr "Trasig MERGE_HEAD-fil (%s)"

4526

4614 -#: builtin/commit.c:1581

4527 +#: builtin/commit.c:1615

4528 msgid "could not read MERGE_MODE"

4529 msgstr "kunde inte läsa MERGE_MODE"

4530

4618 -#: builtin/commit.c:1600

4531 +#: builtin/commit.c:1634

4532 #, c-format

4533 msgid "could not read commit message: %s"

4534 msgstr "kunde inte läsa incheckningsmeddelande: %s"

4535

4623 -#: builtin/commit.c:1611

4536 +#: builtin/commit.c:1645

4537 #, c-format

4538 msgid "Aborting commit; you did not edit the message.\n"

4539 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"

4540

4628 -#: builtin/commit.c:1616

4541 +#: builtin/commit.c:1650

4542 #, c-format

4543 msgid "Aborting commit due to empty commit message.\n"

4544 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"

4545

4633 -#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879

4546 +#: builtin/commit.c:1665 builtin/merge.c:857 builtin/merge.c:882

4547 msgid "failed to write commit object"

4548 msgstr "kunde inte skriva incheckningsobjekt"

4549

4637 -#: builtin/commit.c:1652

4550 +#: builtin/commit.c:1686

4551 msgid "cannot lock HEAD ref"

4552 msgstr "kunde inte låsa HEAD-referens"

4553

4641 -#: builtin/commit.c:1656

4554 +#: builtin/commit.c:1690

4555 msgid "cannot update HEAD ref"

4556 msgstr "kunde inte uppdatera HEAD-referens"

4557

4645 -#: builtin/commit.c:1667

4558 +#: builtin/commit.c:1701

4559 msgid ""

4560 "Repository has been updated, but unable to write\n"

4561 "new_index file. Check that disk is not full or quota is\n"

@@ -4657,127 +4570,127 @@ msgstr ""

4570 msgid "git config [options]"

4571 msgstr "git config [flaggor]"

4572

4660 -#: builtin/config.c:54

4573 +#: builtin/config.c:53

4574 msgid "Config file location"

4575 msgstr "Konfigurationsfilens plats"

4576

4664 -#: builtin/config.c:55

4577 +#: builtin/config.c:54

4578 msgid "use global config file"

4579 msgstr "använd global konfigurationsfil"

4580

4668 -#: builtin/config.c:56

4581 +#: builtin/config.c:55

4582 msgid "use system config file"

4583 msgstr "använd systemets konfigurationsfil"

4584

4672 -#: builtin/config.c:57

4585 +#: builtin/config.c:56

4586 msgid "use repository config file"

4587 msgstr "använd arkivets konfigurationsfil"

4588

4676 -#: builtin/config.c:58

4589 +#: builtin/config.c:57

4590 msgid "use given config file"

4591 msgstr "använd angiven konfigurationsil"

4592

4680 -#: builtin/config.c:59

4593 +#: builtin/config.c:58

4594 msgid "blob-id"

4595 msgstr "blob-id"

4596

4684 -#: builtin/config.c:59

4597 +#: builtin/config.c:58

4598 msgid "read config from given blob object"

4599 msgstr "läs konfiguration från givet blob-objekt"

4600

4688 -#: builtin/config.c:60

4601 +#: builtin/config.c:59

4602 msgid "Action"

4603 msgstr "Åtgärd"

4604

4692 -#: builtin/config.c:61

4605 +#: builtin/config.c:60

4606 msgid "get value: name [value-regex]"

4607 msgstr "hämta värde: namn [värde-reguttr]"

4608

4696 -#: builtin/config.c:62

4609 +#: builtin/config.c:61

4610 msgid "get all values: key [value-regex]"

4611 msgstr "hämta alla värden: nyckel [värde-reguttr]"

4612

4700 -#: builtin/config.c:63

4613 +#: builtin/config.c:62

4614 msgid "get values for regexp: name-regex [value-regex]"

4615 msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]"

4616

4704 -#: builtin/config.c:64

4617 +#: builtin/config.c:63

4618 msgid "get value specific for the URL: section[.var] URL"

4619 msgstr "hämta värde specifikt URL:en: sektion[.var] URL"

4620

4708 -#: builtin/config.c:65

4621 +#: builtin/config.c:64

4622 msgid "replace all matching variables: name value [value_regex]"

4623 msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"

4624

4712 -#: builtin/config.c:66

4625 +#: builtin/config.c:65

4626 msgid "add a new variable: name value"

4627 msgstr "lägg till en ny variabel: namn värde"

4628

4716 -#: builtin/config.c:67

4629 +#: builtin/config.c:66

4630 msgid "remove a variable: name [value-regex]"

4631 msgstr "ta bort en variabel: namn [värde-reguttr]"

4632

4720 -#: builtin/config.c:68

4633 +#: builtin/config.c:67

4634 msgid "remove all matches: name [value-regex]"

4635 msgstr "ta bort alla träffar: namn [värde-reguttr]"

4636

4724 -#: builtin/config.c:69

4637 +#: builtin/config.c:68

4638 msgid "rename section: old-name new-name"

4639 msgstr "byt namn på sektion: gammalt-namn nytt-namn"

4640

4728 -#: builtin/config.c:70

4641 +#: builtin/config.c:69

4642 msgid "remove a section: name"

4643 msgstr "ta bort en sektion: namn"

4644

4732 -#: builtin/config.c:71

4645 +#: builtin/config.c:70

4646 msgid "list all"

4647 msgstr "visa alla"

4648

4736 -#: builtin/config.c:72

4649 +#: builtin/config.c:71

4650 msgid "open an editor"

4651 msgstr "öppna textredigeringsprogram"

4652

4740 -#: builtin/config.c:73 builtin/config.c:74

4653 +#: builtin/config.c:72 builtin/config.c:73

4654 msgid "slot"

4655 msgstr "plats"

4656

4744 -#: builtin/config.c:73

4657 +#: builtin/config.c:72

4658 msgid "find the color configured: [default]"

4659 msgstr "hitta den inställda färgen: [default]"

4660

4748 -#: builtin/config.c:74

4661 +#: builtin/config.c:73

4662 msgid "find the color setting: [stdout-is-tty]"

4663 msgstr "hitta färginställningen: [stdout-is-tty]"

4664

4752 -#: builtin/config.c:75

4665 +#: builtin/config.c:74

4666 msgid "Type"

4667 msgstr "Typ"

4668

4756 -#: builtin/config.c:76

4669 +#: builtin/config.c:75

4670 msgid "value is \"true\" or \"false\""

4671 msgstr "värdet är \"true\" eller \"false\""

4672

4760 -#: builtin/config.c:77

4673 +#: builtin/config.c:76

4674 msgid "value is decimal number"

4675 msgstr "värdet är ett decimalt tal"

4676

4764 -#: builtin/config.c:78

4677 +#: builtin/config.c:77

4678 msgid "value is --bool or --int"

4679 msgstr "värdet är --bool eller --int"

4680

4768 -#: builtin/config.c:79

4681 +#: builtin/config.c:78

4682 msgid "value is a path (file or directory name)"

4683 msgstr "värdet är en sökväg (fil- eller katalognamn)"

4684

4772 -#: builtin/config.c:80

4685 +#: builtin/config.c:79

4686 msgid "Other"

4687 msgstr "Andra"

4688

4776 -#: builtin/config.c:81

4689 +#: builtin/config.c:80

4690 msgid "terminate values with NUL byte"

4691 msgstr "terminera värden med NUL-byte"

4692

4780 -#: builtin/config.c:82

4693 +#: builtin/config.c:81

4694 msgid "respect include directives on lookup"

4695 msgstr "respektera inkluderingsdirektiv vid uppslag"

4696

@@ -4797,47 +4710,47 @@ msgstr "git describe [flaggor] <incheckning-igt>*"

4710 msgid "git describe [options] --dirty"

4711 msgstr "git describe [flaggor] --dirty"

4712

4800 -#: builtin/describe.c:237

4713 +#: builtin/describe.c:225

4714 #, c-format

4715 msgid "annotated tag %s not available"

4716 msgstr "den annoterade taggen %s inte tillgänglig"

4717

4805 -#: builtin/describe.c:241

4718 +#: builtin/describe.c:229

4719 #, c-format

4720 msgid "annotated tag %s has no embedded name"

4721 msgstr "den annoterade taggen %s har inget inbäddat namn"

4722

4810 -#: builtin/describe.c:243

4723 +#: builtin/describe.c:231

4724 #, c-format

4725 msgid "tag '%s' is really '%s' here"

4726 msgstr "taggen \"%s\" är i verkligheten \"%s\" här"

4727

4815 -#: builtin/describe.c:270

4728 +#: builtin/describe.c:258

4729 #, c-format

4730 msgid "Not a valid object name %s"

4731 msgstr "Objektnamnet är inte giltigt: %s"

4732

4820 -#: builtin/describe.c:273

4733 +#: builtin/describe.c:261

4734 #, c-format

4735 msgid "%s is not a valid '%s' object"

4736 msgstr "%s är inte ett giltigt \"%s\"-objekt"

4737

4825 -#: builtin/describe.c:290

4738 +#: builtin/describe.c:278

4739 #, c-format

4740 msgid "no tag exactly matches '%s'"

4741 msgstr "ingen tagg motsvarar \"%s\" exakt"

4742

4830 -#: builtin/describe.c:292

4743 +#: builtin/describe.c:280

4744 #, c-format

4745 msgid "searching to describe %s\n"

4746 msgstr "söker för att beskriva %s\n"

4747

4835 -#: builtin/describe.c:332

4748 +#: builtin/describe.c:327

4749 #, c-format

4750 msgid "finished search at %s\n"

4751 msgstr "avslutade sökning på %s\n"

4752

4840 -#: builtin/describe.c:359

4753 +#: builtin/describe.c:354

4754 #, c-format

4755 msgid ""

4756 "No annotated tags can describe '%s'.\n"

@@ -4846,7 +4759,7 @@ msgstr ""

4759 "Inga annoterade taggar kan beskriva \"%s\".\n"

4760 "Det finns dock oannoterade taggar: testa --tags."

4761

4849 -#: builtin/describe.c:363

4762 +#: builtin/describe.c:358

4763 #, c-format

4764 msgid ""

4765 "No tags can describe '%s'.\n"

@@ -4855,12 +4768,12 @@ msgstr ""

4768 "Inga taggar kan beskriva \"%s\".\n"

4769 "Testa --always, eller skapa några taggar."

4770

4858 -#: builtin/describe.c:384

4771 +#: builtin/describe.c:379

4772 #, c-format

4773 msgid "traversed %lu commits\n"

4774 msgstr "traverserade %lu incheckningar\n"

4775

4863 -#: builtin/describe.c:387

4776 +#: builtin/describe.c:382

4777 #, c-format

4778 msgid ""

4779 "more than %i tags found; listed %i most recent\n"

@@ -4869,63 +4782,63 @@ msgstr ""

4782 "mer än %i taggar hittades; listar de %i senaste\n"

4783 "gav upp sökningen vid %s\n"

4784

4872 -#: builtin/describe.c:409

4785 +#: builtin/describe.c:404

4786 msgid "find the tag that comes after the commit"

4787 msgstr "hitta taggen som kommer efter incheckningen"

4788

4876 -#: builtin/describe.c:410

4789 +#: builtin/describe.c:405

4790 msgid "debug search strategy on stderr"

4791 msgstr "felsök sökstrategin på standard fel"

4792

4880 -#: builtin/describe.c:411

4793 +#: builtin/describe.c:406

4794 msgid "use any ref"

4795 msgstr "använd alla referenser"

4796

4884 -#: builtin/describe.c:412

4797 +#: builtin/describe.c:407

4798 msgid "use any tag, even unannotated"

4799 msgstr "använd alla taggar, även oannoterade"

4800

4888 -#: builtin/describe.c:413

4801 +#: builtin/describe.c:408

4802 msgid "always use long format"

4803 msgstr "använd alltid långt format"

4804

4892 -#: builtin/describe.c:414

4805 +#: builtin/describe.c:409

4806 msgid "only follow first parent"

4807 msgstr "följ endast första föräldern"

4808

4896 -#: builtin/describe.c:417

4809 +#: builtin/describe.c:412

4810 msgid "only output exact matches"

4811 msgstr "skriv endast ut exakta träffar"

4812

4900 -#: builtin/describe.c:419

4813 +#: builtin/describe.c:414

4814 msgid "consider <n> most recent tags (default: 10)"

4815 msgstr "överväg de <n> nyaste taggarna (standard: 10)"

4816

4904 -#: builtin/describe.c:421

4817 +#: builtin/describe.c:416

4818 msgid "only consider tags matching <pattern>"

4819 msgstr "överväg endast taggar som motsvarar <mönster>"

4820

4908 -#: builtin/describe.c:423 builtin/name-rev.c:321

4821 +#: builtin/describe.c:418 builtin/name-rev.c:321

4822 msgid "show abbreviated commit object as fallback"

4823 msgstr "visa förkortade incheckningsobjekt som standard"

4824

4912 -#: builtin/describe.c:424

4825 +#: builtin/describe.c:419

4826 msgid "mark"

4827 msgstr "märke"

4828

4916 -#: builtin/describe.c:425

4829 +#: builtin/describe.c:420

4830 msgid "append <mark> on dirty working tree (default: \"-dirty\")"

4831 msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")"

4832

4920 -#: builtin/describe.c:443

4833 +#: builtin/describe.c:438

4834 msgid "--long is incompatible with --abbrev=0"

4835 msgstr "--long är inkompatibel med --abbrev=0"

4836

4924 -#: builtin/describe.c:469

4837 +#: builtin/describe.c:464

4838 msgid "No names found, cannot describe anything."

4839 msgstr "Inga namn hittades, kan inte beskriva något."

4840

4928 -#: builtin/describe.c:489

4841 +#: builtin/describe.c:484

4842 msgid "--dirty is incompatible with commit-ishes"

4843 msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"

4844

@@ -5217,7 +5130,7 @@ msgstr "Hämtar %s\n"

5130 msgid "Could not fetch %s"

5131 msgstr "Kunde inte hämta %s"

5132

5220 -#: builtin/fetch.c:1036

5133 +#: builtin/fetch.c:1035

5134 msgid ""

5135 "No remote repository specified. Please, specify either a URL or a\n"

5136 "remote name from which new revisions should be fetched."

@@ -5259,10 +5172,10 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5172 msgstr ""

5173 "git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]"

5174

5262 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702

5263 -#: builtin/merge.c:196 builtin/repack.c:160 builtin/repack.c:164

5264 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:446

5265 -#: parse-options.h:135 parse-options.h:242

5175 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700

5176 +#: builtin/merge.c:196 builtin/repack.c:175 builtin/repack.c:179

5177 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:501

5178 +#: parse-options.h:132 parse-options.h:239

5179 msgid "n"

5180 msgstr "n"

5181

@@ -5326,6 +5239,14 @@ msgstr "nyckel"

5239 msgid "field name to sort on"

5240 msgstr "fältnamn att sortera på"

5241

5242 +#: builtin/fsck.c:147 builtin/prune.c:172

5243 +msgid "Checking connectivity"

5244 +msgstr "Kontrollerar konnektivitet"

5245 +

5246 +#: builtin/fsck.c:544

5247 +msgid "Checking object directories"

5248 +msgstr "Kontrollerar objektkataloger"

5249 +

5250 #: builtin/fsck.c:607

5251 msgid "git fsck [options] [<object>...]"

5252 msgstr "git fsck [flaggor] [<objekt>...]"

@@ -5370,47 +5291,56 @@ msgstr "skriv dinglande objekt i .git/lost-found"

5291 msgid "show progress"

5292 msgstr "visa förlopp"

5293

5294 +#: builtin/fsck.c:673

5295 +msgid "Checking objects"

5296 +msgstr "Kontrollerar objekt"

5297 +

5298 #: builtin/gc.c:24

5299 msgid "git gc [options]"

5300 msgstr "git gc [flaggor]"

5301

5377 -#: builtin/gc.c:80

5302 +#: builtin/gc.c:90

5303 #, c-format

5304 msgid "Invalid %s: '%s'"

5305 msgstr "Felaktigt %s: \"%s\""

5306

5382 -#: builtin/gc.c:107

5307 +#: builtin/gc.c:117

5308 #, c-format

5309 msgid "insanely long object directory %.*s"

5310 msgstr "tokigt lång objektkatalog %.*s"

5311

5387 -#: builtin/gc.c:262

5312 +#: builtin/gc.c:273

5313 msgid "prune unreferenced objects"

5314 msgstr "rensa ej refererade objekt"

5315

5391 -#: builtin/gc.c:264

5316 +#: builtin/gc.c:275

5317 msgid "be more thorough (increased runtime)"

5318 msgstr "var mer grundlig (ökar körtiden)"

5319

5395 -#: builtin/gc.c:265

5320 +#: builtin/gc.c:276

5321 msgid "enable auto-gc mode"

5322 msgstr "aktivera auto-gc-läge"

5323

5399 -#: builtin/gc.c:266

5324 +#: builtin/gc.c:277

5325 msgid "force running gc even if there may be another gc running"

5326 msgstr "tvinga gc-körning även om en annan gc kanske körs"

5327

5403 -#: builtin/gc.c:306

5328 +#: builtin/gc.c:318

5329 #, c-format

5405 -msgid ""

5406 -"Auto packing the repository for optimum performance. You may also\n"

5407 -"run \"git gc\" manually. See \"git help gc\" for more information.\n"

5408 -msgstr ""

5409 -"Packar arkivet automatiskt för optimal prestanda. Du kan även\n"

5410 -"köra \"git gc\" manuellt. Se \"git help gc\" för mer information.\n"

5330 +msgid "Auto packing the repository in background for optimum performance.\n"

5331 +msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"

5332 +

5333 +#: builtin/gc.c:320

5334 +#, c-format

5335 +msgid "Auto packing the repository for optimum performance.\n"

5336 +msgstr "Packar arkivet automatiskt för optimal prestanda.\n"

5337

5412 -#. be quiet on --auto

5413 -#: builtin/gc.c:316

5338 +#: builtin/gc.c:321

5339 +#, c-format

5340 +msgid "See \"git help gc\" for manual housekeeping.\n"

5341 +msgstr "Se \"git help gc\" för manuell hushållning.\n"

5342 +

5343 +#: builtin/gc.c:336

5344 #, c-format

5345 msgid ""

5346 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

@@ -5418,7 +5348,7 @@ msgstr ""

5348 "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "

5349 "är fallet)"

5350

5421 -#: builtin/gc.c:341

5351 +#: builtin/gc.c:361

5352 msgid ""

5353 "There are too many unreachable loose objects; run 'git prune' to remove them."

5354 msgstr ""

@@ -5449,209 +5379,209 @@ msgstr "kunde inte läsa träd (%s)"

5379 msgid "unable to grep from object of type %s"

5380 msgstr "Kunde inte \"grep\" från objekt av typen %s"

5381

5452 -#: builtin/grep.c:551

5382 +#: builtin/grep.c:549

5383 #, c-format

5384 msgid "switch `%c' expects a numerical value"

5385 msgstr "flaggan \"%c\" antar ett numeriskt värde"

5386

5457 -#: builtin/grep.c:568

5387 +#: builtin/grep.c:566

5388 #, c-format

5389 msgid "cannot open '%s'"

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

5391

5462 -#: builtin/grep.c:642

5392 +#: builtin/grep.c:640

5393 msgid "search in index instead of in the work tree"

5394 msgstr "sök i indexet istället för i arbetskatalogen"

5395

5466 -#: builtin/grep.c:644

5396 +#: builtin/grep.c:642

5397 msgid "find in contents not managed by git"

5398 msgstr "sök i innehål som inte hanteras av git"

5399

5470 -#: builtin/grep.c:646

5400 +#: builtin/grep.c:644

5401 msgid "search in both tracked and untracked files"

5402 msgstr "sök i både spårade och ospårade filer"

5403

5474 -#: builtin/grep.c:648

5404 +#: builtin/grep.c:646

5405 msgid "search also in ignored files"

5406 msgstr "sök även i ignorerade filer"

5407

5478 -#: builtin/grep.c:651

5408 +#: builtin/grep.c:649

5409 msgid "show non-matching lines"

5410 msgstr "visa rader som inte träffas"

5411

5482 -#: builtin/grep.c:653

5412 +#: builtin/grep.c:651

5413 msgid "case insensitive matching"

5414 msgstr "skiftlägesokänslig sökning"

5415

5486 -#: builtin/grep.c:655

5416 +#: builtin/grep.c:653

5417 msgid "match patterns only at word boundaries"

5418 msgstr "matcha endast mönster vid ordgränser"

5419

5490 -#: builtin/grep.c:657

5420 +#: builtin/grep.c:655

5421 msgid "process binary files as text"

5422 msgstr "hantera binärfiler som text"

5423

5494 -#: builtin/grep.c:659

5424 +#: builtin/grep.c:657

5425 msgid "don't match patterns in binary files"

5426 msgstr "träffa inte mönster i binärfiler"

5427

5498 -#: builtin/grep.c:662

5428 +#: builtin/grep.c:660

5429 msgid "process binary files with textconv filters"

5430 msgstr "hantera binärfiler med textconv-filter"

5431

5502 -#: builtin/grep.c:664

5432 +#: builtin/grep.c:662

5433 msgid "descend at most <depth> levels"

5434 msgstr "gå som mest ned <djup> nivåer"

5435

5506 -#: builtin/grep.c:668

5436 +#: builtin/grep.c:666

5437 msgid "use extended POSIX regular expressions"

5438 msgstr "använd utökade POSIX-reguljära uttryck"

5439

5510 -#: builtin/grep.c:671

5440 +#: builtin/grep.c:669

5441 msgid "use basic POSIX regular expressions (default)"

5442 msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"

5443

5514 -#: builtin/grep.c:674

5444 +#: builtin/grep.c:672

5445 msgid "interpret patterns as fixed strings"

5446 msgstr "tolka mönster som fixerade strängar"

5447

5518 -#: builtin/grep.c:677

5448 +#: builtin/grep.c:675

5449 msgid "use Perl-compatible regular expressions"

5450 msgstr "använd Perlkompatibla reguljära uttryck"

5451

5522 -#: builtin/grep.c:680

5452 +#: builtin/grep.c:678

5453 msgid "show line numbers"

5454 msgstr "visa radnummer"

5455

5526 -#: builtin/grep.c:681

5456 +#: builtin/grep.c:679

5457 msgid "don't show filenames"

5458 msgstr "visa inte filnamn"

5459

5530 -#: builtin/grep.c:682

5460 +#: builtin/grep.c:680

5461 msgid "show filenames"

5462 msgstr "visa filnamn"

5463

5534 -#: builtin/grep.c:684

5464 +#: builtin/grep.c:682

5465 msgid "show filenames relative to top directory"

5466 msgstr "visa filnamn relativa till toppkatalogen"

5467

5538 -#: builtin/grep.c:686

5468 +#: builtin/grep.c:684

5469 msgid "show only filenames instead of matching lines"

5470 msgstr "visa endast filnamn istället för träffade rader"

5471

5542 -#: builtin/grep.c:688

5472 +#: builtin/grep.c:686

5473 msgid "synonym for --files-with-matches"

5474 msgstr "synonym för --files-with-matches"

5475

5546 -#: builtin/grep.c:691

5476 +#: builtin/grep.c:689

5477 msgid "show only the names of files without match"

5478 msgstr "visa endast namn på filer utan träffar"

5479

5550 -#: builtin/grep.c:693

5480 +#: builtin/grep.c:691

5481 msgid "print NUL after filenames"

5482 msgstr "skriv NUL efter filnamn"

5483

5554 -#: builtin/grep.c:695

5484 +#: builtin/grep.c:693

5485 msgid "show the number of matches instead of matching lines"

5486 msgstr "visa antal träffar istället för träffade rader"

5487

5558 -#: builtin/grep.c:696

5488 +#: builtin/grep.c:694

5489 msgid "highlight matches"

5490 msgstr "ljusmarkera träffar"

5491

5562 -#: builtin/grep.c:698

5492 +#: builtin/grep.c:696

5493 msgid "print empty line between matches from different files"

5494 msgstr "skriv tomma rader mellan träffar från olika filer"

5495

5566 -#: builtin/grep.c:700

5496 +#: builtin/grep.c:698

5497 msgid "show filename only once above matches from same file"

5498 msgstr "visa filnamn endast en gång ovanför träffar från samma fil"

5499

5570 -#: builtin/grep.c:703

5500 +#: builtin/grep.c:701

5501 msgid "show <n> context lines before and after matches"

5502 msgstr "visa <n> rader sammanhang före och efter träffar"

5503

5574 -#: builtin/grep.c:706

5504 +#: builtin/grep.c:704

5505 msgid "show <n> context lines before matches"

5506 msgstr "visa <n> rader sammanhang före träffar"

5507

5578 -#: builtin/grep.c:708

5508 +#: builtin/grep.c:706

5509 msgid "show <n> context lines after matches"

5510 msgstr "visa <n> rader sammanhang efter träffar"

5511

5582 -#: builtin/grep.c:709

5512 +#: builtin/grep.c:707

5513 msgid "shortcut for -C NUM"

5514 msgstr "genväg för -C NUM"

5515

5586 -#: builtin/grep.c:712

5516 +#: builtin/grep.c:710

5517 msgid "show a line with the function name before matches"

5518 msgstr "visa en rad med funktionsnamnet före träffen"

5519

5590 -#: builtin/grep.c:714

5520 +#: builtin/grep.c:712

5521 msgid "show the surrounding function"

5522 msgstr "visa den omkringliggande funktionen"

5523

5594 -#: builtin/grep.c:717

5524 +#: builtin/grep.c:715

5525 msgid "read patterns from file"

5526 msgstr "läs mönster från fil"

5527

5598 -#: builtin/grep.c:719

5528 +#: builtin/grep.c:717

5529 msgid "match <pattern>"

5530 msgstr "träffa <mönster>"

5531

5602 -#: builtin/grep.c:721

5532 +#: builtin/grep.c:719

5533 msgid "combine patterns specified with -e"

5534 msgstr "kombinera mönster som anges med -e"

5535

5606 -#: builtin/grep.c:733

5536 +#: builtin/grep.c:731

5537 msgid "indicate hit with exit status without output"

5538 msgstr "ange träff med slutstatuskod utan utdata"

5539

5610 -#: builtin/grep.c:735

5540 +#: builtin/grep.c:733

5541 msgid "show only matches from files that match all patterns"

5542 msgstr "visa endast träffar från filer som träffar alla mönster"

5543

5614 -#: builtin/grep.c:737

5544 +#: builtin/grep.c:735

5545 msgid "show parse tree for grep expression"

5546 msgstr "visa analysträd för grep-uttryck"

5547

5618 -#: builtin/grep.c:741

5548 +#: builtin/grep.c:739

5549 msgid "pager"

5550 msgstr "bläddrare"

5551

5622 -#: builtin/grep.c:741

5552 +#: builtin/grep.c:739

5553 msgid "show matching files in the pager"

5554 msgstr "visa träffade filer i filbläddraren"

5555

5626 -#: builtin/grep.c:744

5556 +#: builtin/grep.c:742

5557 msgid "allow calling of grep(1) (ignored by this build)"

5558 msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"

5559

5630 -#: builtin/grep.c:745 builtin/show-ref.c:187

5560 +#: builtin/grep.c:743 builtin/show-ref.c:187

5561 msgid "show usage"

5562 msgstr "visa användning"

5563

5634 -#: builtin/grep.c:812

5564 +#: builtin/grep.c:810

5565 msgid "no pattern given."

5566 msgstr "inget mönster angavs."

5567

5638 -#: builtin/grep.c:870

5568 +#: builtin/grep.c:868

5569 msgid "--open-files-in-pager only works on the worktree"

5570 msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"

5571

5642 -#: builtin/grep.c:893

5572 +#: builtin/grep.c:891

5573 msgid "--cached or --untracked cannot be used with --no-index."

5574 msgstr "--cached och --untracked kan inte användas med --no-index."

5575

5646 -#: builtin/grep.c:898

5576 +#: builtin/grep.c:896

5577 msgid "--no-index or --untracked cannot be used with revs."

5578 msgstr "--no-index och --untracked kan inte användas med revisioner."

5579

5650 -#: builtin/grep.c:901

5580 +#: builtin/grep.c:899

5581 msgid "--[no-]exclude-standard cannot be used for tracked contents."

5582 msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."

5583

5654 -#: builtin/grep.c:909

5584 +#: builtin/grep.c:907

5585 msgid "both --cached and trees are given."

5586 msgstr "både --cached och träd angavs."

5587

@@ -5667,7 +5597,7 @@ msgstr ""

5597 msgid "git hash-object --stdin-paths < <list-of-paths>"

5598 msgstr "git hash-object --stdin-paths < <sökvägslista>"

5599

5670 -#: builtin/hash-object.c:72

5600 +#: builtin/hash-object.c:72 builtin/tag.c:521

5601 msgid "type"

5602 msgstr "typ"

5603

@@ -5906,8 +5836,8 @@ msgstr "allvarlig inflate-inkonsekvens"

5836 msgid "SHA1 COLLISION FOUND WITH %s !"

5837 msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"

5838

5909 -#: builtin/index-pack.c:669 builtin/pack-objects.c:171

5910 -#: builtin/pack-objects.c:263

5839 +#: builtin/index-pack.c:669 builtin/pack-objects.c:162

5840 +#: builtin/pack-objects.c:254

5841 #, c-format

5842 msgid "unable to read %s"

5843 msgstr "kunde inte läsa %s"

@@ -6173,33 +6103,31 @@ msgstr "kan inte hantera filtyp %d"

6103 msgid "unable to move %s to %s"

6104 msgstr "kan inte flytta %s till %s"

6105

6176 -#.

6177 -#. * TRANSLATORS: The first '%s' is either "Reinitialized

6178 -#. * existing" or "Initialized empty", the second " shared" or

6179 -#. * "", and the last '%s%s' is the verbatim directory name.

6180 -#.

6181 -#: builtin/init-db.c:420

6106 +#. TRANSLATORS: The first '%s' is either "Reinitialized

6107 +#. existing" or "Initialized empty", the second " shared" or

6108 +#. "", and the last '%s%s' is the verbatim directory name.

6109 +#: builtin/init-db.c:418

6110 #, c-format

6111 msgid "%s%s Git repository in %s%s\n"

6112 msgstr "%s%s Git-arkiv i %s%s\n"

6113

6186 -#: builtin/init-db.c:421

6114 +#: builtin/init-db.c:419

6115 msgid "Reinitialized existing"

6116 msgstr "Ominitierade befintligt"

6117

6190 -#: builtin/init-db.c:421

6118 +#: builtin/init-db.c:419

6119 msgid "Initialized empty"

6120 msgstr "Initierade tomt"

6121

6194 -#: builtin/init-db.c:422

6122 +#: builtin/init-db.c:420

6123 msgid " shared"

6124 msgstr " delat"

6125

6198 -#: builtin/init-db.c:441

6126 +#: builtin/init-db.c:439

6127 msgid "cannot tell cwd"

6128 msgstr "kan inte läsa aktuell katalog (cwd)"

6129

6202 -#: builtin/init-db.c:467

6130 +#: builtin/init-db.c:465

6131 msgid ""

6132 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"

6133 "[=<permissions>]] [directory]"

@@ -6207,29 +6135,29 @@ msgstr ""

6135 "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--shared"

6136 "[=<behörigheter>]] [katalog]"

6137

6210 -#: builtin/init-db.c:490

6138 +#: builtin/init-db.c:488

6139 msgid "permissions"

6140 msgstr "behörigheter"

6141

6214 -#: builtin/init-db.c:491

6142 +#: builtin/init-db.c:489

6143 msgid "specify that the git repository is to be shared amongst several users"

6144 msgstr "ange att git-arkivet skall delas bland flera användare"

6145

6218 -#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155

6146 +#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:168

6147 msgid "be quiet"

6148 msgstr "var tyst"

6149

6222 -#: builtin/init-db.c:525 builtin/init-db.c:530

6150 +#: builtin/init-db.c:523 builtin/init-db.c:528

6151 #, c-format

6152 msgid "cannot mkdir %s"

6153 msgstr "kan inte skapa katalogen (mkdir) %s"

6154

6227 -#: builtin/init-db.c:534

6155 +#: builtin/init-db.c:532

6156 #, c-format

6157 msgid "cannot chdir to %s"

6158 msgstr "kan inte byta katalog (chdir) till %s"

6159

6232 -#: builtin/init-db.c:556

6160 +#: builtin/init-db.c:554

6161 #, c-format

6162 msgid ""

6163 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

@@ -6238,11 +6166,11 @@ msgstr ""

6166 "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"

6167 "dir=<katalog>)"

6168

6241 -#: builtin/init-db.c:580

6169 +#: builtin/init-db.c:578

6170 msgid "Cannot access current working directory"

6171 msgstr "Kan inte komma åt aktuell arbetskatalog"

6172

6245 -#: builtin/init-db.c:587

6173 +#: builtin/init-db.c:585

6174 #, c-format

6175 msgid "Cannot access work tree '%s'"

6176 msgstr "Kan inte komma åt arbetskatalogen \"%s\""

@@ -6505,95 +6433,95 @@ msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"

6433 msgid "Unknown commit %s"

6434 msgstr "Okänd incheckning %s"

6435

6508 -#: builtin/ls-files.c:398

6436 +#: builtin/ls-files.c:401

6437 msgid "git ls-files [options] [<file>...]"

6438 msgstr "git ls-files [flaggor] [<fil>...]"

6439

6512 -#: builtin/ls-files.c:455

6440 +#: builtin/ls-files.c:458

6441 msgid "identify the file status with tags"

6442 msgstr "identifiera filstatus med taggar"

6443

6516 -#: builtin/ls-files.c:457

6444 +#: builtin/ls-files.c:460

6445 msgid "use lowercase letters for 'assume unchanged' files"

6446 msgstr "använd små bokstäver för \"anta oförändrade\"-filer"

6447

6520 -#: builtin/ls-files.c:459

6448 +#: builtin/ls-files.c:462

6449 msgid "show cached files in the output (default)"

6450 msgstr "visa cachade filer i utdata (standard)"

6451

6524 -#: builtin/ls-files.c:461

6452 +#: builtin/ls-files.c:464

6453 msgid "show deleted files in the output"

6454 msgstr "visa borttagna filer i utdata"

6455

6528 -#: builtin/ls-files.c:463

6456 +#: builtin/ls-files.c:466

6457 msgid "show modified files in the output"

6458 msgstr "visa modifierade filer i utdata"

6459

6532 -#: builtin/ls-files.c:465

6460 +#: builtin/ls-files.c:468

6461 msgid "show other files in the output"

6462 msgstr "visa andra filer i utdata"

6463

6536 -#: builtin/ls-files.c:467

6464 +#: builtin/ls-files.c:470

6465 msgid "show ignored files in the output"

6466 msgstr "visa ignorerade filer i utdata"

6467

6540 -#: builtin/ls-files.c:470

6468 +#: builtin/ls-files.c:473

6469 msgid "show staged contents' object name in the output"

6470 msgstr "visa köat innehålls objektnamn i utdata"

6471

6544 -#: builtin/ls-files.c:472

6472 +#: builtin/ls-files.c:475

6473 msgid "show files on the filesystem that need to be removed"

6474 msgstr "visa filer i filsystemet som behöver tas bort"

6475

6548 -#: builtin/ls-files.c:474

6476 +#: builtin/ls-files.c:477

6477 msgid "show 'other' directories' name only"

6478 msgstr "visa endast namn för \"andra\" kataloger"

6479

6552 -#: builtin/ls-files.c:477

6480 +#: builtin/ls-files.c:480

6481 msgid "don't show empty directories"

6482 msgstr "visa inte tomma kataloger"

6483

6556 -#: builtin/ls-files.c:480

6484 +#: builtin/ls-files.c:483

6485 msgid "show unmerged files in the output"

6486 msgstr "visa ej sammanslagna filer i utdata"

6487

6560 -#: builtin/ls-files.c:482

6488 +#: builtin/ls-files.c:485

6489 msgid "show resolve-undo information"

6490 msgstr "visa \"resolve-undo\"-information"

6491

6564 -#: builtin/ls-files.c:484

6492 +#: builtin/ls-files.c:487

6493 msgid "skip files matching pattern"

6494 msgstr "hoppa över filer som motsvarar mönster"

6495

6568 -#: builtin/ls-files.c:487

6496 +#: builtin/ls-files.c:490

6497 msgid "exclude patterns are read from <file>"

6498 msgstr "exkludera mönster som läses från <fil>"

6499

6572 -#: builtin/ls-files.c:490

6500 +#: builtin/ls-files.c:493

6501 msgid "read additional per-directory exclude patterns in <file>"

6502 msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"

6503

6576 -#: builtin/ls-files.c:492

6504 +#: builtin/ls-files.c:495

6505 msgid "add the standard git exclusions"

6506 msgstr "lägg till git:s standardexkluderingar"

6507

6580 -#: builtin/ls-files.c:495

6508 +#: builtin/ls-files.c:498

6509 msgid "make the output relative to the project top directory"

6510 msgstr "gör utdata relativ till projektets toppkatalog"

6511

6584 -#: builtin/ls-files.c:498

6512 +#: builtin/ls-files.c:501

6513 msgid "if any <file> is not in the index, treat this as an error"

6514 msgstr "om en <fil> inte är indexet, betrakta det som ett fel"

6515

6588 -#: builtin/ls-files.c:499

6516 +#: builtin/ls-files.c:502

6517 msgid "tree-ish"

6518 msgstr "träd-igt"

6519

6592 -#: builtin/ls-files.c:500

6520 +#: builtin/ls-files.c:503

6521 msgid "pretend that paths removed since <tree-ish> are still present"

6522 msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"

6523

6596 -#: builtin/ls-files.c:502

6524 +#: builtin/ls-files.c:505

6525 msgid "show debugging data"

6526 msgstr "visa felsökningsutdata"

6527

@@ -6705,7 +6633,7 @@ msgstr "avbryt om snabbspolning inte är möjlig"

6633 msgid "Verify that the named commit has a valid GPG signature"

6634 msgstr "Bekräfta att den namngivna incheckningen har en giltig GPG-signatur"

6635

6708 -#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89

6636 +#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89

6637 msgid "strategy"

6638 msgstr "strategi"

6639

@@ -6778,37 +6706,37 @@ msgstr "\"%s\" verkar inte peka på en incheckning"

6706 msgid "Bad branch.%s.mergeoptions string: %s"

6707 msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"

6708

6781 -#: builtin/merge.c:650

6709 +#: builtin/merge.c:653

6710 msgid "git write-tree failed to write a tree"

6711 msgstr "git write-tree misslyckades skriva ett träd"

6712

6785 -#: builtin/merge.c:678

6713 +#: builtin/merge.c:681

6714 msgid "Not handling anything other than two heads merge."

6715 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."

6716

6789 -#: builtin/merge.c:692

6717 +#: builtin/merge.c:695

6718 #, c-format

6719 msgid "Unknown option for merge-recursive: -X%s"

6720 msgstr "Felaktig flagga för merge-recursive: -X%s"

6721

6794 -#: builtin/merge.c:706

6722 +#: builtin/merge.c:709

6723 #, c-format

6724 msgid "unable to write %s"

6725 msgstr "kunde inte skriva %s"

6726

6799 -#: builtin/merge.c:795

6727 +#: builtin/merge.c:798

6728 #, c-format

6729 msgid "Could not read from '%s'"

6730 msgstr "Kunde inte läsa från \"%s\""

6731

6804 -#: builtin/merge.c:804

6732 +#: builtin/merge.c:807

6733 #, c-format

6734 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

6735 msgstr ""

6736 "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "

6737 "den.\n"

6738

6811 -#: builtin/merge.c:810

6739 +#: builtin/merge.c:813

6740 #, c-format

6741 msgid ""

6742 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -6824,48 +6752,48 @@ msgstr ""

6752 "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"

6753 "avbryter incheckningen.\n"

6754

6827 -#: builtin/merge.c:834

6755 +#: builtin/merge.c:837

6756 msgid "Empty commit message."

6757 msgstr "Tomt incheckningsmeddelande."

6758

6831 -#: builtin/merge.c:846

6759 +#: builtin/merge.c:849

6760 #, c-format

6761 msgid "Wonderful.\n"

6762 msgstr "Underbart.\n"

6763

6836 -#: builtin/merge.c:911

6764 +#: builtin/merge.c:914

6765 #, c-format

6766 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

6767 msgstr ""

6768 "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"

6769

6842 -#: builtin/merge.c:927

6770 +#: builtin/merge.c:930

6771 #, c-format

6772 msgid "'%s' is not a commit"

6773 msgstr "\"%s\" är inte en incheckning"

6774

6847 -#: builtin/merge.c:968

6775 +#: builtin/merge.c:971

6776 msgid "No current branch."

6777 msgstr "Inte på någon gren."

6778

6851 -#: builtin/merge.c:970

6779 +#: builtin/merge.c:973

6780 msgid "No remote for the current branch."

6781 msgstr "Ingen fjärr för aktuell gren."

6782

6855 -#: builtin/merge.c:972

6783 +#: builtin/merge.c:975

6784 msgid "No default upstream defined for the current branch."

6785 msgstr "Ingen standarduppström angiven för aktuell gren."

6786

6859 -#: builtin/merge.c:977

6787 +#: builtin/merge.c:980

6788 #, c-format

6789 msgid "No remote-tracking branch for %s from %s"

6790 msgstr "Ingen fjärrspårande gren för %s från %s"

6791

6864 -#: builtin/merge.c:1133

6792 +#: builtin/merge.c:1136

6793 msgid "There is no merge to abort (MERGE_HEAD missing)."

6794 msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)."

6795

6868 -#: builtin/merge.c:1149 git-pull.sh:31

6796 +#: builtin/merge.c:1152 git-pull.sh:31

6797 msgid ""

6798 "You have not concluded your merge (MERGE_HEAD exists).\n"

6799 "Please, commit your changes before you can merge."

@@ -6873,11 +6801,11 @@ msgstr ""

6801 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"

6802 "Checka in dina ändringar innan du kan slå ihop."

6803

6876 -#: builtin/merge.c:1152 git-pull.sh:34

6804 +#: builtin/merge.c:1155 git-pull.sh:34

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

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

6807

6880 -#: builtin/merge.c:1156

6808 +#: builtin/merge.c:1159

6809 msgid ""

6810 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

6811 "Please, commit your changes before you can merge."

@@ -6885,103 +6813,102 @@ msgstr ""

6813 "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"

6814 "Checka in dina ändringar innan du kan slå ihop."

6815

6888 -#: builtin/merge.c:1159

6816 +#: builtin/merge.c:1162

6817 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

6818 msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."

6819

6892 -#: builtin/merge.c:1168

6820 +#: builtin/merge.c:1171

6821 msgid "You cannot combine --squash with --no-ff."

6822 msgstr "Du kan inte kombinera --squash med --no-ff."

6823

6896 -#: builtin/merge.c:1177

6824 +#: builtin/merge.c:1180

6825 msgid "No commit specified and merge.defaultToUpstream not set."

6826 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."

6827

6900 -#: builtin/merge.c:1209

6828 +#: builtin/merge.c:1212

6829 msgid "Can merge only exactly one commit into empty head"

6830 msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."

6831

6904 -#: builtin/merge.c:1212

6832 +#: builtin/merge.c:1215

6833 msgid "Squash commit into empty head not supported yet"

6834 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"

6835

6908 -#: builtin/merge.c:1214

6836 +#: builtin/merge.c:1217

6837 msgid "Non-fast-forward commit does not make sense into an empty head"

6838 msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"

6839

6912 -#: builtin/merge.c:1219

6840 +#: builtin/merge.c:1222

6841 #, c-format

6842 msgid "%s - not something we can merge"

6843 msgstr "%s - inte något vi kan slå ihop"

6844

6917 -#: builtin/merge.c:1270

6845 +#: builtin/merge.c:1273

6846 #, c-format

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

6848 msgstr ""

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

6850

6923 -#: builtin/merge.c:1273

6851 +#: builtin/merge.c:1276

6852 #, c-format

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

6854 msgstr ""

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

6856

6929 -#. 'N'

6930 -#: builtin/merge.c:1276

6857 +#: builtin/merge.c:1279

6858 #, c-format

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

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

6861

6935 -#: builtin/merge.c:1279

6862 +#: builtin/merge.c:1282

6863 #, c-format

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

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

6866

6940 -#: builtin/merge.c:1363

6867 +#: builtin/merge.c:1366

6868 #, c-format

6869 msgid "Updating %s..%s\n"

6870 msgstr "Uppdaterar %s..%s\n"

6871

6945 -#: builtin/merge.c:1402

6872 +#: builtin/merge.c:1405

6873 #, c-format

6874 msgid "Trying really trivial in-index merge...\n"

6875 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"

6876

6950 -#: builtin/merge.c:1409

6877 +#: builtin/merge.c:1412

6878 #, c-format

6879 msgid "Nope.\n"

6880 msgstr "Nej.\n"

6881

6955 -#: builtin/merge.c:1441

6882 +#: builtin/merge.c:1444

6883 msgid "Not possible to fast-forward, aborting."

6884 msgstr "Kan inte snabbspola, avbryter."

6885

6959 -#: builtin/merge.c:1464 builtin/merge.c:1543

6886 +#: builtin/merge.c:1467 builtin/merge.c:1546

6887 #, c-format

6888 msgid "Rewinding the tree to pristine...\n"

6889 msgstr "Återspolar trädet till orört...\n"

6890

6964 -#: builtin/merge.c:1468

6891 +#: builtin/merge.c:1471

6892 #, c-format

6893 msgid "Trying merge strategy %s...\n"

6894 msgstr "Försöker sammanslagninsstrategin %s...\n"

6895

6969 -#: builtin/merge.c:1534

6896 +#: builtin/merge.c:1537

6897 #, c-format

6898 msgid "No merge strategy handled the merge.\n"

6899 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"

6900

6974 -#: builtin/merge.c:1536

6901 +#: builtin/merge.c:1539

6902 #, c-format

6903 msgid "Merge with strategy %s failed.\n"

6904 msgstr "Sammanslagning med strategin %s misslyckades.\n"

6905

6979 -#: builtin/merge.c:1545

6906 +#: builtin/merge.c:1548

6907 #, c-format

6908 msgid "Using the %s to prepare resolving by hand.\n"

6909 msgstr "Använder %s för att förbereda lösning för hand.\n"

6910

6984 -#: builtin/merge.c:1557

6911 +#: builtin/merge.c:1560

6912 #, c-format

6913 msgid "Automatic merge went well; stopped before committing as requested\n"

6914 msgstr ""

@@ -7066,19 +6993,19 @@ msgstr "varna inte om konflikter"

6993 msgid "set labels for file1/orig_file/file2"

6994 msgstr "sätt etiketter för fil1/origfil/fil2"

6995

7069 -#: builtin/mktree.c:67

6996 +#: builtin/mktree.c:64

6997 msgid "git mktree [-z] [--missing] [--batch]"

6998 msgstr "git mktree [-z] [--missing] [--batch]"

6999

7073 -#: builtin/mktree.c:153

7000 +#: builtin/mktree.c:150

7001 msgid "input is NUL terminated"

7002 msgstr "indata är NUL-terminerad"

7003

7077 -#: builtin/mktree.c:154 builtin/write-tree.c:24

7004 +#: builtin/mktree.c:151 builtin/write-tree.c:24

7005 msgid "allow missing objects"

7006 msgstr "tillåt saknade objekt"

7007

7081 -#: builtin/mktree.c:155

7008 +#: builtin/mktree.c:152

7009 msgid "allow creation of more than one tree"

7010 msgstr "tillåt skapa mer än ett träd"

7011

@@ -7126,46 +7053,46 @@ msgstr ""

7053 msgid "Huh? %.*s is in index?"

7054 msgstr "Vad? %.*s är i indexet?"

7055

7129 -#: builtin/mv.c:168

7056 +#: builtin/mv.c:169

7057 msgid "source directory is empty"

7058 msgstr "källkatalogen är tom"

7059

7133 -#: builtin/mv.c:200

7060 +#: builtin/mv.c:205

7061 msgid "not under version control"

7062 msgstr "inte versionshanterad"

7063

7137 -#: builtin/mv.c:202

7064 +#: builtin/mv.c:207

7065 msgid "destination exists"

7066 msgstr "destinationen finns"

7067

7141 -#: builtin/mv.c:210

7068 +#: builtin/mv.c:215

7069 #, c-format

7070 msgid "overwriting '%s'"

7071 msgstr "skriver över \"%s\""

7072

7146 -#: builtin/mv.c:213

7073 +#: builtin/mv.c:218

7074 msgid "Cannot overwrite"

7075 msgstr "Kan inte skriva över"

7076

7150 -#: builtin/mv.c:216

7077 +#: builtin/mv.c:221

7078 msgid "multiple sources for the same target"

7079 msgstr "flera källor för samma mål"

7080

7154 -#: builtin/mv.c:218

7081 +#: builtin/mv.c:223

7082 msgid "destination directory does not exist"

7083 msgstr "destinationskatalogen finns inte"

7084

7158 -#: builtin/mv.c:233

7085 +#: builtin/mv.c:243

7086 #, c-format

7087 msgid "%s, source=%s, destination=%s"

7088 msgstr "%s, källa=%s, mål=%s"

7089

7163 -#: builtin/mv.c:243

7090 +#: builtin/mv.c:253

7091 #, c-format

7092 msgid "Renaming %s to %s\n"

7093 msgstr "Byter namn på %s till %s\n"

7094

7168 -#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328

7095 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355

7096 #, c-format

7097 msgid "renaming '%s' failed"

7098 msgstr "misslyckades byta namn på \"%s\""

@@ -7336,7 +7263,7 @@ msgstr "kunde inte läsa utdata från \"show\""

7263 msgid "failed to finish 'show' for object '%s'"

7264 msgstr "kunde inte avsluta \"show\" för objektet \"%s\""

7265

7339 -#: builtin/notes.c:167 builtin/tag.c:341

7266 +#: builtin/notes.c:167 builtin/tag.c:373

7267 #, c-format

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

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

@@ -7345,7 +7272,7 @@ msgstr "kunde inte skapa filen \"%s\""

7272 msgid "Please supply the note contents using either -m or -F option"

7273 msgstr "Ange innehåll för anteckningen med antingen -m eller -F"

7274

7348 -#: builtin/notes.c:207 builtin/notes.c:844

7275 +#: builtin/notes.c:207 builtin/notes.c:848

7276 #, c-format

7277 msgid "Removing note for object %s\n"

7278 msgstr "Tar bort anteckning för objektet %s\n"

@@ -7359,20 +7286,20 @@ msgstr "kunde inte skriva anteckningsobjekt"

7286 msgid "The note contents has been left in %s"

7287 msgstr "Anteckningens innehåll har lämnats kvar i %s"

7288

7362 -#: builtin/notes.c:248 builtin/tag.c:537

7289 +#: builtin/notes.c:248 builtin/tag.c:604

7290 #, c-format

7291 msgid "cannot read '%s'"

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

7293

7367 -#: builtin/notes.c:250 builtin/tag.c:540

7294 +#: builtin/notes.c:250 builtin/tag.c:607

7295 #, c-format

7296 msgid "could not open or read '%s'"

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

7298

7372 -#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318

7373 -#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515

7374 -#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637

7375 -#: builtin/notes.c:839 builtin/tag.c:553

7299 +#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322

7300 +#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519

7301 +#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641

7302 +#: builtin/notes.c:843 builtin/tag.c:620

7303 #, c-format

7304 msgid "Failed to resolve '%s' as a valid ref."

7305 msgstr "Kunde inte slå upp \"%s\" som en giltig referens."

@@ -7382,53 +7309,58 @@ msgstr "Kunde inte slå upp \"%s\" som en giltig referens."

7309 msgid "Failed to read object '%s'."

7310 msgstr "Kunde inte läsa objektet \"%s\"."

7311

7385 -#: builtin/notes.c:312

7312 +#: builtin/notes.c:276

7313 +#, c-format

7314 +msgid "Cannot read note data from non-blob object '%s'."

7315 +msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"."

7316 +

7317 +#: builtin/notes.c:316

7318 #, c-format

7319 msgid "Malformed input line: '%s'."

7320 msgstr "Felaktig indatarad: \"%s\"."

7321

7390 -#: builtin/notes.c:327

7322 +#: builtin/notes.c:331

7323 #, c-format

7324 msgid "Failed to copy notes from '%s' to '%s'"

7325 msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""

7326

7395 -#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498

7396 -#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630

7397 -#: builtin/notes.c:904

7327 +#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502

7328 +#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634

7329 +#: builtin/notes.c:908

7330 msgid "too many parameters"

7331 msgstr "för många parametrar"

7332

7401 -#: builtin/notes.c:384 builtin/notes.c:643

7333 +#: builtin/notes.c:388 builtin/notes.c:647

7334 #, c-format

7335 msgid "No note found for object %s."

7336 msgstr "Inga anteckningar hittades för objektet %s."

7337

7406 -#: builtin/notes.c:406 builtin/notes.c:563

7338 +#: builtin/notes.c:410 builtin/notes.c:567

7339 msgid "note contents as a string"

7340 msgstr "anteckningsinnehåll som sträng"

7341

7410 -#: builtin/notes.c:409 builtin/notes.c:566

7342 +#: builtin/notes.c:413 builtin/notes.c:570

7343 msgid "note contents in a file"

7344 msgstr "anteckningsinnehåll i en fil"

7345

7414 -#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568

7415 -#: builtin/notes.c:571 builtin/tag.c:474

7346 +#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572

7347 +#: builtin/notes.c:575 builtin/tag.c:539

7348 msgid "object"

7349 msgstr "objekt"

7350

7419 -#: builtin/notes.c:412 builtin/notes.c:569

7351 +#: builtin/notes.c:416 builtin/notes.c:573

7352 msgid "reuse and edit specified note object"

7353 msgstr "återanvänd och redigera angivet anteckningsobjekt"

7354

7423 -#: builtin/notes.c:415 builtin/notes.c:572

7355 +#: builtin/notes.c:419 builtin/notes.c:576

7356 msgid "reuse specified note object"

7357 msgstr "återanvänd angivet anteckningsobjekt"

7358

7427 -#: builtin/notes.c:417 builtin/notes.c:485

7359 +#: builtin/notes.c:421 builtin/notes.c:489

7360 msgid "replace existing notes"

7361 msgstr "ersätt befintliga anteckningar"

7362

7431 -#: builtin/notes.c:451

7363 +#: builtin/notes.c:455

7364 #, c-format

7365 msgid ""

7366 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "

@@ -7437,24 +7369,24 @@ msgstr ""

7369 "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för "

7370 "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar"

7371

7440 -#: builtin/notes.c:456 builtin/notes.c:533

7372 +#: builtin/notes.c:460 builtin/notes.c:537

7373 #, c-format

7374 msgid "Overwriting existing notes for object %s\n"

7375 msgstr "Skriver över befintliga anteckningar för objektet %s\n"

7376

7445 -#: builtin/notes.c:486

7377 +#: builtin/notes.c:490

7378 msgid "read objects from stdin"

7379 msgstr "läs objekt från standard in"

7380

7449 -#: builtin/notes.c:488

7381 +#: builtin/notes.c:492

7382 msgid "load rewriting config for <command> (implies --stdin)"

7383 msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"

7384

7453 -#: builtin/notes.c:506

7385 +#: builtin/notes.c:510

7386 msgid "too few parameters"

7387 msgstr "för få parametrar"

7388

7457 -#: builtin/notes.c:527

7389 +#: builtin/notes.c:531

7390 #, c-format

7391 msgid ""

7392 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "

@@ -7463,12 +7395,12 @@ msgstr ""

7395 "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "

7396 "%s. Använd \"-f\" för att skriva över befintliga anteckningar"

7397

7466 -#: builtin/notes.c:539

7398 +#: builtin/notes.c:543

7399 #, c-format

7400 msgid "Missing notes on source object %s. Cannot copy."

7401 msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera."

7402

7471 -#: builtin/notes.c:588

7403 +#: builtin/notes.c:592

7404 #, c-format

7405 msgid ""

7406 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"

@@ -7477,15 +7409,15 @@ msgstr ""

7409 "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"

7410 "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"

7411

7480 -#: builtin/notes.c:735

7412 +#: builtin/notes.c:739

7413 msgid "General options"

7414 msgstr "Allmänna flaggor"

7415

7484 -#: builtin/notes.c:737

7416 +#: builtin/notes.c:741

7417 msgid "Merge options"

7418 msgstr "Flaggor för sammanslagning"

7419

7488 -#: builtin/notes.c:739

7420 +#: builtin/notes.c:743

7421 msgid ""

7422 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"

7423 "cat_sort_uniq)"

@@ -7493,203 +7425,227 @@ msgstr ""

7425 "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"

7426 "cat_sort_uniq)"

7427

7496 -#: builtin/notes.c:741

7428 +#: builtin/notes.c:745

7429 msgid "Committing unmerged notes"

7430 msgstr "Checkar in ej sammanslagna anteckningar"

7431

7500 -#: builtin/notes.c:743

7432 +#: builtin/notes.c:747

7433 msgid "finalize notes merge by committing unmerged notes"

7434 msgstr ""

7435 "färdigställ sammanslagning av anteckningar genom att checka in ej "

7436 "sammanslagna anteckningar"

7437

7506 -#: builtin/notes.c:745

7438 +#: builtin/notes.c:749

7439 msgid "Aborting notes merge resolution"

7440 msgstr "Avbryt lösning av sammanslagning av anteckningar"

7441

7510 -#: builtin/notes.c:747

7442 +#: builtin/notes.c:751

7443 msgid "abort notes merge"

7444 msgstr "avbryt sammanslagning av anteckningar"

7445

7514 -#: builtin/notes.c:842

7446 +#: builtin/notes.c:846

7447 #, c-format

7448 msgid "Object %s has no note\n"

7449 msgstr "Objektet %s har ingen anteckning\n"

7450

7519 -#: builtin/notes.c:854

7451 +#: builtin/notes.c:858

7452 msgid "attempt to remove non-existent note is not an error"

7453 msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"

7454

7523 -#: builtin/notes.c:857

7455 +#: builtin/notes.c:861

7456 msgid "read object names from the standard input"

7457 msgstr "läs objektnamn från standard in"

7458

7527 -#: builtin/notes.c:938

7528 -msgid "notes_ref"

7459 +#: builtin/notes.c:942

7460 +msgid "notes-ref"

7461 msgstr "anteckningar-ref"

7462

7531 -#: builtin/notes.c:939

7463 +#: builtin/notes.c:943

7464 msgid "use notes from <notes_ref>"

7465 msgstr "använd anteckningar från <anteckningsref>"

7466

7535 -#: builtin/notes.c:974 builtin/remote.c:1593

7467 +#: builtin/notes.c:978 builtin/remote.c:1593

7468 #, c-format

7469 msgid "Unknown subcommand: %s"

7470 msgstr "Okänt underkommando: %s"

7471

7540 -#: builtin/pack-objects.c:23

7472 +#: builtin/pack-objects.c:25

7473 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"

7474 msgstr "git pack-objects --stdout [flaggor...] [< reflista | < objektlista]"

7475

7544 -#: builtin/pack-objects.c:24

7476 +#: builtin/pack-objects.c:26

7477 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"

7478 msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]"

7479

7548 -#: builtin/pack-objects.c:184 builtin/pack-objects.c:187

7480 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178

7481 #, c-format

7482 msgid "deflate error (%d)"

7483 msgstr "fel i deflate (%d)"

7484

7553 -#: builtin/pack-objects.c:2396

7485 +#: builtin/pack-objects.c:771

7486 +msgid "Writing objects"

7487 +msgstr "Skriver objekt"

7488 +

7489 +#: builtin/pack-objects.c:1012

7490 +msgid "disabling bitmap writing, as some objects are not being packed"

7491 +msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"

7492 +

7493 +#: builtin/pack-objects.c:2174

7494 +msgid "Compressing objects"

7495 +msgstr "Komprimerar objekt"

7496 +

7497 +#: builtin/pack-objects.c:2530

7498 #, c-format

7499 msgid "unsupported index version %s"

7500 msgstr "indexversionen %s stöds ej"

7501

7558 -#: builtin/pack-objects.c:2400

7502 +#: builtin/pack-objects.c:2534

7503 #, c-format

7504 msgid "bad index version '%s'"

7505 msgstr "felaktig indexversion \"%s\""

7506

7563 -#: builtin/pack-objects.c:2423

7507 +#: builtin/pack-objects.c:2557

7508 #, c-format

7509 msgid "option %s does not accept negative form"

7510 msgstr "flaggan %s godtar inte negativ form"

7511

7568 -#: builtin/pack-objects.c:2427

7512 +#: builtin/pack-objects.c:2561

7513 #, c-format

7514 msgid "unable to parse value '%s' for option %s"

7515 msgstr "kunde inte tolka värdet \"%s\" för flaggan %s"

7516

7573 -#: builtin/pack-objects.c:2446

7517 +#: builtin/pack-objects.c:2580

7518 msgid "do not show progress meter"

7519 msgstr "visa inte förloppsindikator"

7520

7577 -#: builtin/pack-objects.c:2448

7521 +#: builtin/pack-objects.c:2582

7522 msgid "show progress meter"

7523 msgstr "visa förloppsindikator"

7524

7581 -#: builtin/pack-objects.c:2450

7525 +#: builtin/pack-objects.c:2584

7526 msgid "show progress meter during object writing phase"

7527 msgstr "visa förloppsindikator under objektskrivningsfasen"

7528

7585 -#: builtin/pack-objects.c:2453

7529 +#: builtin/pack-objects.c:2587

7530 msgid "similar to --all-progress when progress meter is shown"

7531 msgstr "som --all-progress när förloppsmätaren visas"

7532

7589 -#: builtin/pack-objects.c:2454

7533 +#: builtin/pack-objects.c:2588

7534 msgid "version[,offset]"

7535 msgstr "version[,offset]"

7536

7593 -#: builtin/pack-objects.c:2455

7537 +#: builtin/pack-objects.c:2589

7538 msgid "write the pack index file in the specified idx format version"

7539 msgstr "skriv paketindexfilen i angiven indexformatversion"

7540

7597 -#: builtin/pack-objects.c:2458

7541 +#: builtin/pack-objects.c:2592

7542 msgid "maximum size of each output pack file"

7543 msgstr "maximal storlek på varje utdatapaketfil"

7544

7601 -#: builtin/pack-objects.c:2460

7545 +#: builtin/pack-objects.c:2594

7546 msgid "ignore borrowed objects from alternate object store"

7547 msgstr "ignorera lånade objekt från alternativa objektlager"

7548

7605 -#: builtin/pack-objects.c:2462

7549 +#: builtin/pack-objects.c:2596

7550 msgid "ignore packed objects"

7551 msgstr "ignorera packade objekt"

7552

7609 -#: builtin/pack-objects.c:2464

7553 +#: builtin/pack-objects.c:2598

7554 msgid "limit pack window by objects"

7555 msgstr "begränsa paketfönster efter objekt"

7556

7613 -#: builtin/pack-objects.c:2466

7557 +#: builtin/pack-objects.c:2600

7558 msgid "limit pack window by memory in addition to object limit"

7559 msgstr "begränsa paketfönster efter minne förutom objektgräns"

7560

7617 -#: builtin/pack-objects.c:2468

7561 +#: builtin/pack-objects.c:2602

7562 msgid "maximum length of delta chain allowed in the resulting pack"

7563 msgstr "maximal längd på deltakedja tillåten i slutligt paket"

7564

7621 -#: builtin/pack-objects.c:2470

7565 +#: builtin/pack-objects.c:2604

7566 msgid "reuse existing deltas"

7567 msgstr "återanvänd befintliga delta"

7568

7625 -#: builtin/pack-objects.c:2472

7569 +#: builtin/pack-objects.c:2606

7570 msgid "reuse existing objects"

7571 msgstr "återanvänd befintliga objekt"

7572

7629 -#: builtin/pack-objects.c:2474

7573 +#: builtin/pack-objects.c:2608

7574 msgid "use OFS_DELTA objects"

7575 msgstr "använd OFS_DELTA-objekt"

7576

7633 -#: builtin/pack-objects.c:2476

7577 +#: builtin/pack-objects.c:2610

7578 msgid "use threads when searching for best delta matches"

7579 msgstr "använd trådar vid sökning efter bästa deltaträffar"

7580

7637 -#: builtin/pack-objects.c:2478

7581 +#: builtin/pack-objects.c:2612

7582 msgid "do not create an empty pack output"

7583 msgstr "försök inte skapa tom paketutdata"

7584

7641 -#: builtin/pack-objects.c:2480

7585 +#: builtin/pack-objects.c:2614

7586 msgid "read revision arguments from standard input"

7587 msgstr "läs revisionsargument från standard in"

7588

7645 -#: builtin/pack-objects.c:2482

7589 +#: builtin/pack-objects.c:2616

7590 msgid "limit the objects to those that are not yet packed"

7591 msgstr "begränsa objekt till de som ännu inte packats"

7592

7649 -#: builtin/pack-objects.c:2485

7593 +#: builtin/pack-objects.c:2619

7594 msgid "include objects reachable from any reference"

7595 msgstr "inkludera objekt som kan nås från någon referens"

7596

7653 -#: builtin/pack-objects.c:2488

7597 +#: builtin/pack-objects.c:2622

7598 msgid "include objects referred by reflog entries"

7599 msgstr "inkludera objekt som refereras från referensloggposter"

7600

7657 -#: builtin/pack-objects.c:2491

7601 +#: builtin/pack-objects.c:2625

7602 msgid "output pack to stdout"

7603 msgstr "skriv paket på standard ut"

7604

7661 -#: builtin/pack-objects.c:2493

7605 +#: builtin/pack-objects.c:2627

7606 msgid "include tag objects that refer to objects to be packed"

7607 msgstr "inkludera taggobjekt som refererar objekt som skall packas"

7608

7665 -#: builtin/pack-objects.c:2495

7609 +#: builtin/pack-objects.c:2629

7610 msgid "keep unreachable objects"

7611 msgstr "behåll onåbara objekt"

7612

7669 -#: builtin/pack-objects.c:2496 parse-options.h:143

7613 +#: builtin/pack-objects.c:2630 parse-options.h:140

7614 msgid "time"

7615 msgstr "tid"

7616

7673 -#: builtin/pack-objects.c:2497

7617 +#: builtin/pack-objects.c:2631

7618 msgid "unpack unreachable objects newer than <time>"

7619 msgstr "packa upp onåbara objekt nyare än <tid>"

7620

7677 -#: builtin/pack-objects.c:2500

7621 +#: builtin/pack-objects.c:2634

7622 msgid "create thin packs"

7623 msgstr "skapa tunna paket"

7624

7681 -#: builtin/pack-objects.c:2502

7625 +#: builtin/pack-objects.c:2636

7626 msgid "ignore packs that have companion .keep file"

7627 msgstr "ignorera paket som har tillhörande .keep-fil"

7628

7685 -#: builtin/pack-objects.c:2504

7629 +#: builtin/pack-objects.c:2638

l10n: Update Swedish translation (2228t0f0u)