7f278d8381 · matheusbsbs/matheus-bagliano

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2015-12-22 22:50+0800\n"

11 -"PO-Revision-Date: 2016-02-03 20:27+0100\n"

10 +"POT-Creation-Date: 2016-02-28 20:31+0800\n"

11 +"PO-Revision-Date: 2016-03-04 15:19+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"

@@ -31,7 +31,7 @@ msgstr ""

31 "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"

32 "som lämpligt för att ange lösning och checka in."

33

34 -#: advice.c:101 builtin/merge.c:1225

34 +#: advice.c:101 builtin/merge.c:1226

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

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

37

@@ -75,7 +75,7 @@ msgstr "fmt"

75 msgid "archive format"

76 msgstr "arkivformat"

77

78 -#: archive.c:430 builtin/log.c:1229

78 +#: archive.c:430 builtin/log.c:1232

79 msgid "prefix"

80 msgstr "prefix"

81

@@ -83,11 +83,11 @@ msgstr "prefix"

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

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

85

86 -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535

87 -#: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987

88 -#: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99

89 -#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395

90 -#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153

86 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547

87 +#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987

88 +#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100

89 +#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398

90 +#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153

91 msgid "file"

92 msgstr "fil"

93

@@ -119,7 +119,7 @@ msgstr "komprimera bättre"

119 msgid "list supported archive formats"

120 msgstr "visa understödda arkivformat"

121

122 -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77

122 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78

123 msgid "repo"

124 msgstr "arkiv"

125

@@ -127,7 +127,7 @@ msgstr "arkiv"

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

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

129

130 -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479

130 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482

131 msgid "command"

132 msgstr "kommando"

133

@@ -135,7 +135,7 @@ msgstr "kommando"

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

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

137

138 -#: attr.c:265

138 +#: attr.c:263

139 msgid ""

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

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

@@ -143,83 +143,100 @@ msgstr ""

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

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

145

146 -#: branch.c:61

146 +#: branch.c:53

147 +#, c-format

148 +msgid ""

149 +"\n"

150 +"After fixing the error cause you may try to fix up\n"

151 +"the remote tracking information by invoking\n"

152 +"\"git branch --set-upstream-to=%s%s%s\"."

153 +msgstr ""

154 +"\n"

155 +"När du har rättat felorsaken kan du försöka rätta\n"

156 +"fjärrspårningsinformationen genom att utföra\n"

157 +"\"git branch --set-upstream-to=%s%s%s\"."

158 +

159 +#: branch.c:67

160 #, c-format

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

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

163

151 -#: branch.c:84

164 +#: branch.c:93

165 #, c-format

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

167 msgstr ""

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

169

157 -#: branch.c:85

170 +#: branch.c:94

171 #, c-format

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

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

174

162 -#: branch.c:89

175 +#: branch.c:98

176 #, c-format

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

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

179

167 -#: branch.c:90

180 +#: branch.c:99

181 #, c-format

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

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

184

172 -#: branch.c:95

185 +#: branch.c:104

186 #, c-format

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

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

189

177 -#: branch.c:96

190 +#: branch.c:105

191 #, c-format

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

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

194

182 -#: branch.c:100

195 +#: branch.c:109

196 #, c-format

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

198 msgstr ""

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

200

188 -#: branch.c:101

201 +#: branch.c:110

202 #, c-format

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

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

205

193 -#: branch.c:134

206 +#: branch.c:119

207 +msgid "Unable to write upstream branch configuration"

208 +msgstr "Kan inte skriva inställningar för uppströmsgren"

209 +

210 +#: branch.c:156

211 #, c-format

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

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

214

198 -#: branch.c:163

215 +#: branch.c:185

216 #, c-format

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

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

219

203 -#: branch.c:168

220 +#: branch.c:190

221 #, c-format

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

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

224

208 -#: branch.c:176

225 +#: branch.c:198

226 msgid "Cannot force update the current branch."

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

228

212 -#: branch.c:196

229 +#: branch.c:218

230 #, c-format

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

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

233

217 -#: branch.c:198

234 +#: branch.c:220

235 #, c-format

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

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

238

222 -#: branch.c:200

239 +#: branch.c:222

240 msgid ""

241 "\n"

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

@@ -239,22 +256,22 @@ msgstr ""

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

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

258

242 -#: branch.c:244

259 +#: branch.c:266

260 #, c-format

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

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

263

247 -#: branch.c:264

264 +#: branch.c:286

265 #, c-format

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

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

268

252 -#: branch.c:269

269 +#: branch.c:291

270 #, c-format

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

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

273

257 -#: branch.c:322

274 +#: branch.c:344

275 #, c-format

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

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

@@ -278,10 +295,10 @@ msgstr "kunde inte öppna \"%s\""

295 msgid "Repository lacks these prerequisite commits:"

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

297

281 -#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083

282 -#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334

283 -#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358

284 -#: builtin/shortlog.c:158

298 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074

299 +#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334

300 +#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358

301 +#: builtin/shortlog.c:170

302 msgid "revision walk setup failed"

303 msgstr "misslyckades skapa revisionstraversering"

304

@@ -320,7 +337,7 @@ msgstr "rev-list dog"

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

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

339

323 -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261

340 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273

341 #, c-format

342 msgid "unrecognized argument: %s"

343 msgstr "okänt argument: %s"

@@ -343,8 +360,8 @@ msgstr "index-pack dog"

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

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

362

346 -#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520

347 -#: builtin/am.c:2149

363 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505

364 +#: builtin/am.c:2135

365 #, c-format

366 msgid "could not parse %s"

367 msgstr "kunde inte tolka %s"

@@ -358,59 +375,64 @@ msgstr "%s %s är inte en incheckning!"

375 msgid "memory exhausted"

376 msgstr "minnet slut"

377

361 -#: config.c:474 config.c:476

378 +#: config.c:475 config.c:477

379 #, c-format

363 -msgid "bad config file line %d in %s"

364 -msgstr "felaktig konfigurationsfil rad %d i %s"

380 +msgid "bad config line %d in %s %s"

381 +msgstr "felaktig konfigurationsfil rad %d i %s %s"

382

366 -#: config.c:592

383 +#: config.c:593

384 #, c-format

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

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

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

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

387

371 -#: config.c:594

388 +#: config.c:595

389 #, c-format

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

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

392

376 -#: config.c:679

393 +#: config.c:680

394 #, c-format

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

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

397

381 -#: config.c:757 config.c:768

398 +#: config.c:758 config.c:769

399 #, c-format

400 msgid "bad zlib compression level %d"

401 msgstr "felaktigt zlib-komprimeringsgrad %d"

402

386 -#: config.c:890

403 +#: config.c:891

404 #, c-format

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

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

407

391 -#: config.c:1216

408 +#: config.c:1220

409 msgid "unable to parse command-line config"

410 msgstr "kan inte tolka kommandoradskonfiguration"

411

395 -#: config.c:1277

412 +#: config.c:1281

413 msgid "unknown error occured while reading the configuration files"

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

415

399 -#: config.c:1601

416 +#: config.c:1629

417 #, c-format

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

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

420

404 -#: config.c:1603

421 +#: config.c:1631

422 #, c-format

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

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

425

409 -#: config.c:1662

426 +#: config.c:1690

427 #, c-format

428 msgid "%s has multiple values"

429 msgstr "%s har flera värden"

430

431 +#: config.c:2226

432 +#, c-format

433 +msgid "Could not set '%s' to '%s'"

434 +msgstr "Kunde inte ställa in \"%s\" till \"%s\""

435 +

436 #: connected.c:69

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

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

@@ -526,16 +548,16 @@ msgstr ""

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

549 "%s"

550

529 -#: diff.c:3000

551 +#: diff.c:2997

552 #, c-format

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

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

555

534 -#: diff.c:3396

556 +#: diff.c:3393

557 msgid "--follow requires exactly one pathspec"

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

559

538 -#: diff.c:3559

560 +#: diff.c:3556

561 #, c-format

562 msgid ""

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

@@ -544,18 +566,18 @@ msgstr ""

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

567 "%s"

568

547 -#: diff.c:3573

569 +#: diff.c:3570

570 #, c-format

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

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

573

552 -#: dir.c:1915

574 +#: dir.c:2004

575 msgid "failed to get kernel name and information"

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

577

556 -#: dir.c:1998

557 -msgid "Untracked cache is disabled on this system."

558 -msgstr "Ospårad cache är inaktiverad på detta system."

578 +#: dir.c:2123

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

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

581

582 #: gpg-interface.c:166 gpg-interface.c:237

583 msgid "could not run gpg."

@@ -594,20 +616,20 @@ msgstr "\"%s\": %s"

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

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

618

597 -#: help.c:207

619 +#: help.c:205

620 #, c-format

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

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

623

602 -#: help.c:214

624 +#: help.c:212

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

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

627

606 -#: help.c:246

628 +#: help.c:244

629 msgid "These are common Git commands used in various situations:"

630 msgstr "Dessa vanliga Git-kommandon används i olika situationer:"

631

610 -#: help.c:311

632 +#: help.c:309

633 #, c-format

634 msgid ""

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

@@ -616,11 +638,11 @@ msgstr ""

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

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

640

619 -#: help.c:368

641 +#: help.c:366

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

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

644

623 -#: help.c:390

645 +#: help.c:388

646 #, c-format

647 msgid ""

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

@@ -629,17 +651,17 @@ msgstr ""

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

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

653

632 -#: help.c:395

654 +#: help.c:393

655 #, c-format

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

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

658

637 -#: help.c:402

659 +#: help.c:400

660 #, c-format

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

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

663

642 -#: help.c:406 help.c:466

664 +#: help.c:404 help.c:464

665 msgid ""

666 "\n"

667 "Did you mean this?"

@@ -653,7 +675,7 @@ msgstr[1] ""

675 "\n"

676 "Menade du ett av dessa?"

677

656 -#: help.c:462

678 +#: help.c:460

679 #, c-format

680 msgid "%s: %s - %s"

681 msgstr "%s: %s - %s"

@@ -662,8 +684,8 @@ msgstr "%s: %s - %s"

684 msgid "failed to read the cache"

685 msgstr "misslyckades läsa cachen"

686

665 -#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376

666 -#: builtin/checkout.c:587 builtin/clone.c:722

687 +#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376

688 +#: builtin/checkout.c:587 builtin/clone.c:730

689 msgid "unable to write new index file"

690 msgstr "kunde inte skriva ny indexfil"

691

@@ -681,64 +703,64 @@ msgstr "addinfo_cache misslyckades för sökvägen \"%s\""

703 msgid "error building trees"

704 msgstr "fel vid byggande av träd"

705

684 -#: merge-recursive.c:686

706 +#: merge-recursive.c:689

707 #, c-format

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

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

710

689 -#: merge-recursive.c:697

711 +#: merge-recursive.c:700

712 #, c-format

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

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

715

694 -#: merge-recursive.c:711 merge-recursive.c:732

716 +#: merge-recursive.c:714 merge-recursive.c:735

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

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

719

698 -#: merge-recursive.c:722

720 +#: merge-recursive.c:725

721 #, c-format

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

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

724

703 -#: merge-recursive.c:762

725 +#: merge-recursive.c:765

726 #, c-format

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

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

729

708 -#: merge-recursive.c:764

730 +#: merge-recursive.c:767

731 #, c-format

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

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

734

713 -#: merge-recursive.c:787 builtin/clone.c:369

735 +#: merge-recursive.c:790 builtin/clone.c:374

736 #, c-format

737 msgid "failed to open '%s'"

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

739

718 -#: merge-recursive.c:795

740 +#: merge-recursive.c:798

741 #, c-format

742 msgid "failed to symlink '%s'"

743 msgstr "misslyckades skapa symboliska länken \"%s\""

744

723 -#: merge-recursive.c:798

745 +#: merge-recursive.c:801

746 #, c-format

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

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

749

728 -#: merge-recursive.c:936

750 +#: merge-recursive.c:939

751 msgid "Failed to execute internal merge"

752 msgstr "Misslyckades exekvera intern sammanslagning"

753

732 -#: merge-recursive.c:940

754 +#: merge-recursive.c:943

755 #, c-format

756 msgid "Unable to add %s to database"

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

758

737 -#: merge-recursive.c:956

759 +#: merge-recursive.c:959

760 msgid "unsupported object type in the tree"

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

762

741 -#: merge-recursive.c:1031 merge-recursive.c:1045

763 +#: merge-recursive.c:1034 merge-recursive.c:1048

764 #, c-format

765 msgid ""

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

@@ -747,7 +769,7 @@ msgstr ""

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

770 "i trädet."

771

750 -#: merge-recursive.c:1037 merge-recursive.c:1050

772 +#: merge-recursive.c:1040 merge-recursive.c:1053

773 #, c-format

774 msgid ""

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

@@ -756,20 +778,20 @@ msgstr ""

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

779 "i trädet vid %s."

780

759 -#: merge-recursive.c:1091

781 +#: merge-recursive.c:1094

782 msgid "rename"

783 msgstr "namnbyte"

784

763 -#: merge-recursive.c:1091

785 +#: merge-recursive.c:1094

786 msgid "renamed"

787 msgstr "namnbytt"

788

767 -#: merge-recursive.c:1147

789 +#: merge-recursive.c:1150

790 #, c-format

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

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

793

772 -#: merge-recursive.c:1169

794 +#: merge-recursive.c:1172

795 #, c-format

796 msgid ""

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

@@ -778,144 +800,144 @@ msgstr ""

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

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

802

781 -#: merge-recursive.c:1174

803 +#: merge-recursive.c:1177

804 msgid " (left unresolved)"

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

806

785 -#: merge-recursive.c:1228

807 +#: merge-recursive.c:1231

808 #, c-format

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

810 msgstr ""

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

812

791 -#: merge-recursive.c:1258

813 +#: merge-recursive.c:1261

814 #, c-format

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

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

817

796 -#: merge-recursive.c:1457

818 +#: merge-recursive.c:1460

819 #, c-format

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

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

822

801 -#: merge-recursive.c:1467

823 +#: merge-recursive.c:1470

824 #, c-format

825 msgid "Adding merged %s"

826 msgstr "Lägger till sammanslagen %s"

827

806 -#: merge-recursive.c:1472 merge-recursive.c:1674

828 +#: merge-recursive.c:1475 merge-recursive.c:1677

829 #, c-format

830 msgid "Adding as %s instead"

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

832

811 -#: merge-recursive.c:1523

833 +#: merge-recursive.c:1526

834 #, c-format

835 msgid "cannot read object %s"

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

837

816 -#: merge-recursive.c:1526

838 +#: merge-recursive.c:1529

839 #, c-format

840 msgid "object %s is not a blob"

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

842

821 -#: merge-recursive.c:1578

843 +#: merge-recursive.c:1581

844 msgid "modify"

845 msgstr "ändra"

846

825 -#: merge-recursive.c:1578

847 +#: merge-recursive.c:1581

848 msgid "modified"

849 msgstr "ändrad"

850

829 -#: merge-recursive.c:1588

851 +#: merge-recursive.c:1591

852 msgid "content"

853 msgstr "innehåll"

854

833 -#: merge-recursive.c:1595

855 +#: merge-recursive.c:1598

856 msgid "add/add"

857 msgstr "tillägg/tillägg"

858

837 -#: merge-recursive.c:1629

859 +#: merge-recursive.c:1632

860 #, c-format

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

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

863

842 -#: merge-recursive.c:1643

864 +#: merge-recursive.c:1646

865 #, c-format

866 msgid "Auto-merging %s"

867 msgstr "Slår ihop %s automatiskt"

868

847 -#: merge-recursive.c:1647 git-submodule.sh:1025

869 +#: merge-recursive.c:1650 git-submodule.sh:1048

870 msgid "submodule"

871 msgstr "undermodul"

872

851 -#: merge-recursive.c:1648

873 +#: merge-recursive.c:1651

874 #, c-format

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

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

877

856 -#: merge-recursive.c:1734

878 +#: merge-recursive.c:1737

879 #, c-format

880 msgid "Removing %s"

881 msgstr "Tar bort %s"

882

861 -#: merge-recursive.c:1759

883 +#: merge-recursive.c:1762

884 msgid "file/directory"

885 msgstr "fil/katalog"

886

865 -#: merge-recursive.c:1765

887 +#: merge-recursive.c:1768

888 msgid "directory/file"

889 msgstr "katalog/fil"

890

869 -#: merge-recursive.c:1770

891 +#: merge-recursive.c:1773

892 #, c-format

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

894 msgstr ""

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

896

875 -#: merge-recursive.c:1780

897 +#: merge-recursive.c:1783

898 #, c-format

899 msgid "Adding %s"

900 msgstr "Lägger till %s"

901

880 -#: merge-recursive.c:1797

902 +#: merge-recursive.c:1800

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

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

905

884 -#: merge-recursive.c:1816

906 +#: merge-recursive.c:1819

907 msgid "Already up-to-date!"

908 msgstr "Redan à jour!"

909

888 -#: merge-recursive.c:1825

910 +#: merge-recursive.c:1828

911 #, c-format

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

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

914

893 -#: merge-recursive.c:1855

915 +#: merge-recursive.c:1858

916 #, c-format

917 msgid "Unprocessed path??? %s"

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

919

898 -#: merge-recursive.c:1903

920 +#: merge-recursive.c:1906

921 msgid "Merging:"

922 msgstr "Slår ihop:"

923

902 -#: merge-recursive.c:1916

924 +#: merge-recursive.c:1919

925 #, c-format

926 msgid "found %u common ancestor:"

927 msgid_plural "found %u common ancestors:"

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

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

930

909 -#: merge-recursive.c:1953

931 +#: merge-recursive.c:1956

932 msgid "merge returned no commit"

933 msgstr "sammanslagningen returnerade ingen incheckning"

934

913 -#: merge-recursive.c:2010

935 +#: merge-recursive.c:2013

936 #, c-format

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

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

939

918 -#: merge-recursive.c:2021 builtin/merge.c:645

940 +#: merge-recursive.c:2024 builtin/merge.c:646

941 msgid "Unable to write index."

942 msgstr "Kunde inte skriva indexet."

943

@@ -1032,12 +1054,12 @@ msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""

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

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

1056

1035 -#: pathspec.c:432

1057 +#: pathspec.c:433

1058 #, c-format

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

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

1061

1040 -#: pathspec.c:441

1062 +#: pathspec.c:442

1063 msgid ""

1064 "There is nothing to exclude from by :(exclude) patterns.\n"

1065 "Perhaps you forgot to add either ':/' or '.' ?"

@@ -1071,163 +1093,189 @@ msgstr ""

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

1094 "Använder version %i"

1095

1074 -#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1075 -#: builtin/merge.c:983

1096 +#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974

1097 +#: builtin/merge.c:984

1098 #, c-format

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

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

1101

1080 -#: refs/files-backend.c:2359

1102 +#: refs/files-backend.c:2374

1103 #, c-format

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

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

1106

1085 -#: refs/files-backend.c:2362

1107 +#: refs/files-backend.c:2377

1108 #, c-format

1109 msgid "could not delete references: %s"

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

1111

1090 -#: refs/files-backend.c:2371

1112 +#: refs/files-backend.c:2386

1113 #, c-format

1114 msgid "could not remove reference %s"

1115 msgstr "kunde inte ta bort referensen %s"

1116

1095 -#: ref-filter.c:245

1117 +#: ref-filter.c:55

1118 #, c-format

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

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

1119 +msgid "expected format: %%(color:<color>)"

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

1121 +

1122 +#: ref-filter.c:57

1123 +#, c-format

1124 +msgid "unrecognized color: %%(color:%s)"

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

1126 +

1127 +#: ref-filter.c:71

1128 +#, c-format

1129 +msgid "unrecognized format: %%(%s)"

1130 +msgstr "okänt format: %%(%s)"

1131

1100 -#: ref-filter.c:704

1132 +#: ref-filter.c:101

1133 #, c-format

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

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

1136

1105 -#: ref-filter.c:833

1137 +#: ref-filter.c:103

1138 #, c-format

1107 -msgid "expected format: %%(color:<color>)"

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

1139 +msgid "unrecognized %%(contents) argument: %s"

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

1141

1110 -#: ref-filter.c:835

1111 -msgid "unable to parse format"

1112 -msgstr "kan inte tolka formatet"

1142 +#: ref-filter.c:113

1143 +#, c-format

1144 +msgid "unrecognized %%(objectname) argument: %s"

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

1146

1114 -#: ref-filter.c:870

1147 +#: ref-filter.c:135

1148 #, c-format

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

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

1151

1119 -#: ref-filter.c:893

1152 +#: ref-filter.c:147

1153 +#, c-format

1154 +msgid "unrecognized position:%s"

1155 +msgstr "okänd position:%s"

1156 +

1157 +#: ref-filter.c:151

1158 #, c-format

1121 -msgid "improper format entered align:%s"

1122 -msgstr "felaktigt format angivet align:%s"

1159 +msgid "unrecognized width:%s"

1160 +msgstr "okänd bredd:%s"

1161

1124 -#: ref-filter.c:898

1162 +#: ref-filter.c:157

1163 +#, c-format

1164 +msgid "unrecognized %%(align) argument: %s"

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

1166 +

1167 +#: ref-filter.c:161

1168 #, c-format

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

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

1171

1129 -#: ref-filter.c:1219

1172 +#: ref-filter.c:372

1173 +#, c-format

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

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

1176 +

1177 +#: ref-filter.c:1311

1178 #, c-format

1179 msgid "malformed object at '%s'"

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

1181

1134 -#: ref-filter.c:1561

1182 +#: ref-filter.c:1651

1183 #, c-format

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

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

1186

1139 -#: ref-filter.c:1615

1187 +#: ref-filter.c:1705

1188 #, c-format

1189 msgid "malformed object name %s"

1190 msgstr "felformat objektnamn %s"

1191

1144 -#: remote.c:756

1192 +#: remote.c:745

1193 #, c-format

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

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

1196

1149 -#: remote.c:760

1197 +#: remote.c:749

1198 #, c-format

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

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

1201

1154 -#: remote.c:764

1202 +#: remote.c:753

1203 #, c-format

1204 msgid "%s tracks both %s and %s"

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

1206

1159 -#: remote.c:772

1207 +#: remote.c:761

1208 msgid "Internal error"

1209 msgstr "Internt fel"

1210

1163 -#: remote.c:1687 remote.c:1730

1211 +#: remote.c:1677 remote.c:1720

1212 msgid "HEAD does not point to a branch"

1213 msgstr "HEAD pekar inte på en gren"

1214

1167 -#: remote.c:1696

1215 +#: remote.c:1686

1216 #, c-format

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

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

1219

1172 -#: remote.c:1699

1220 +#: remote.c:1689

1221 #, c-format

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

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

1224

1177 -#: remote.c:1705

1225 +#: remote.c:1695

1226 #, c-format

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

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

1229

1182 -#: remote.c:1720

1230 +#: remote.c:1710

1231 #, c-format

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

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

1234

1187 -#: remote.c:1735

1235 +#: remote.c:1725

1236 #, c-format

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

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

1239

1192 -#: remote.c:1746

1240 +#: remote.c:1736

1241 #, c-format

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

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

1244

1197 -#: remote.c:1759

1245 +#: remote.c:1749

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

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

1248

1201 -#: remote.c:1781

1249 +#: remote.c:1771

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

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

1252

1205 -#: remote.c:2083

1253 +#: remote.c:2073

1254 #, c-format

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

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

1257

1210 -#: remote.c:2087

1258 +#: remote.c:2077

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

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

1261

1214 -#: remote.c:2090

1262 +#: remote.c:2080

1263 #, c-format

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

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

1266

1219 -#: remote.c:2094

1267 +#: remote.c:2084

1268 #, c-format

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

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

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

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

1273

1226 -#: remote.c:2100

1274 +#: remote.c:2090

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

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

1277

1230 -#: remote.c:2103

1278 +#: remote.c:2093

1279 #, c-format

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

1281 msgid_plural ""

@@ -1237,11 +1285,11 @@ msgstr[0] ""

1285 msgstr[1] ""

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

1287

1240 -#: remote.c:2111

1288 +#: remote.c:2101

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

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

1291

1244 -#: remote.c:2114

1292 +#: remote.c:2104

1293 #, c-format

1294 msgid ""

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

@@ -1256,28 +1304,28 @@ msgstr[1] ""

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

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

1306

1259 -#: remote.c:2124

1307 +#: remote.c:2114

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

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

1310

1263 -#: revision.c:2193

1311 +#: revision.c:2131

1312 msgid "your current branch appears to be broken"

1313 msgstr "din nuvarande gren verkar vara trasig"

1314

1267 -#: revision.c:2196

1315 +#: revision.c:2134

1316 #, c-format

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

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

1319

1272 -#: revision.c:2390

1320 +#: revision.c:2328

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

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

1323

1276 -#: run-command.c:90

1324 +#: run-command.c:92

1325 msgid "open /dev/null failed"

1326 msgstr "misslyckades öppna /dev/null"

1327

1280 -#: run-command.c:92

1328 +#: run-command.c:94

1329 #, c-format

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

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

@@ -1302,7 +1350,7 @@ msgstr ""

1350 msgid "the receiving end does not support --atomic push"

1351 msgstr "mottagarsidan stöder inte push med --atomic"

1352

1305 -#: sequencer.c:183

1353 +#: sequencer.c:174

1354 msgid ""

1355 "after resolving the conflicts, mark the corrected paths\n"

1356 "with 'git add <paths>' or 'git rm <paths>'"

@@ -1310,7 +1358,7 @@ msgstr ""

1358 "efter att ha löst konflikterna, markera de rättade sökvägarna\n"

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

1360

1313 -#: sequencer.c:186

1361 +#: sequencer.c:177

1362 msgid ""

1363 "after resolving the conflicts, mark the corrected paths\n"

1364 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -1320,229 +1368,229 @@ msgstr ""

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

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

1370

1323 -#: sequencer.c:199 sequencer.c:842 sequencer.c:922

1371 +#: sequencer.c:190 sequencer.c:833 sequencer.c:913

1372 #, c-format

1373 msgid "Could not write to %s"

1374 msgstr "Kunde inte skriva till %s"

1375

1328 -#: sequencer.c:202

1376 +#: sequencer.c:193

1377 #, c-format

1378 msgid "Error wrapping up %s"

1379 msgstr "Fel vid ombrytning av %s"

1380

1333 -#: sequencer.c:217

1381 +#: sequencer.c:208

1382 msgid "Your local changes would be overwritten by cherry-pick."

1383 msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"."

1384

1337 -#: sequencer.c:219

1385 +#: sequencer.c:210

1386 msgid "Your local changes would be overwritten by revert."

1387 msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"."

1388

1341 -#: sequencer.c:222

1389 +#: sequencer.c:213

1390 msgid "Commit your changes or stash them to proceed."

1391 msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta."

1392

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

1346 -#: sequencer.c:309

1394 +#: sequencer.c:300

1395 #, c-format

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

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

1398

1351 -#: sequencer.c:327

1399 +#: sequencer.c:318

1400 msgid "Could not resolve HEAD commit\n"

1401 msgstr "Kunde inte bestämma HEAD:s incheckning\n"

1402

1355 -#: sequencer.c:347

1403 +#: sequencer.c:338

1404 msgid "Unable to update cache tree\n"

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

1406

1359 -#: sequencer.c:399

1407 +#: sequencer.c:390

1408 #, c-format

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

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

1411

1364 -#: sequencer.c:404

1412 +#: sequencer.c:395

1413 #, c-format

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

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

1416

1369 -#: sequencer.c:469

1417 +#: sequencer.c:460

1418 msgid "Your index file is unmerged."

1419 msgstr "Din indexfil har inte slagits ihop."

1420

1373 -#: sequencer.c:488

1421 +#: sequencer.c:479

1422 #, c-format

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

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

1425

1378 -#: sequencer.c:496

1426 +#: sequencer.c:487

1427 #, c-format

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

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

1430

1383 -#: sequencer.c:500

1431 +#: sequencer.c:491

1432 #, c-format

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

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

1435

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

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

1390 -#: sequencer.c:513

1438 +#: sequencer.c:504

1439 #, c-format

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

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

1442

1395 -#: sequencer.c:517

1443 +#: sequencer.c:508

1444 #, c-format

1445 msgid "Cannot get commit message for %s"

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

1447

1400 -#: sequencer.c:603

1448 +#: sequencer.c:594

1449 #, c-format

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

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

1452

1405 -#: sequencer.c:604

1453 +#: sequencer.c:595

1454 #, c-format

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

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

1457

1410 -#: sequencer.c:639

1458 +#: sequencer.c:630

1459 msgid "empty commit set passed"

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

1461

1414 -#: sequencer.c:647

1462 +#: sequencer.c:638

1463 #, c-format

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

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

1466

1419 -#: sequencer.c:651

1467 +#: sequencer.c:642

1468 #, c-format

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

1470 msgstr "git %s: misslyckades uppdatera indexet"

1471

1424 -#: sequencer.c:711

1472 +#: sequencer.c:702

1473 #, c-format

1474 msgid "Cannot %s during a %s"

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

1476

1429 -#: sequencer.c:733

1477 +#: sequencer.c:724

1478 #, c-format

1479 msgid "Could not parse line %d."

1480 msgstr "Kan inte tolka rad %d."

1481

1434 -#: sequencer.c:738

1482 +#: sequencer.c:729

1483 msgid "No commits parsed."

1484 msgstr "Inga incheckningar lästes."

1485

1438 -#: sequencer.c:750

1486 +#: sequencer.c:741

1487 #, c-format

1488 msgid "Could not open %s"

1489 msgstr "Kunde inte öppna %s"

1490

1443 -#: sequencer.c:754

1491 +#: sequencer.c:745

1492 #, c-format

1493 msgid "Could not read %s."

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

1495

1448 -#: sequencer.c:761

1496 +#: sequencer.c:752

1497 #, c-format

1498 msgid "Unusable instruction sheet: %s"

1499 msgstr "Oanvändbart manus: %s"

1500

1453 -#: sequencer.c:791

1501 +#: sequencer.c:782

1502 #, c-format

1503 msgid "Invalid key: %s"

1504 msgstr "Felaktig nyckel: %s"

1505

1458 -#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49

1506 +#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52

1507 #, c-format

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

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

1510

1463 -#: sequencer.c:804

1511 +#: sequencer.c:795

1512 #, c-format

1513 msgid "Malformed options sheet: %s"

1514 msgstr "Trasigt manus: %s"

1515

1468 -#: sequencer.c:823

1516 +#: sequencer.c:814

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

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

1519

1472 -#: sequencer.c:824

1520 +#: sequencer.c:815

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

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

1523

1476 -#: sequencer.c:828

1524 +#: sequencer.c:819

1525 #, c-format

1526 msgid "Could not create sequencer directory %s"

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

1528

1481 -#: sequencer.c:844 sequencer.c:926

1529 +#: sequencer.c:835 sequencer.c:917

1530 #, c-format

1531 msgid "Error wrapping up %s."

1532 msgstr "Fel vid ombrytning av %s."

1533

1486 -#: sequencer.c:863 sequencer.c:996

1534 +#: sequencer.c:854 sequencer.c:987

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

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

1537

1490 -#: sequencer.c:865

1538 +#: sequencer.c:856

1539 msgid "cannot resolve HEAD"

1540 msgstr "kan inte bestämma HEAD"

1541

1494 -#: sequencer.c:867

1542 +#: sequencer.c:858

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

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

1545

1498 -#: sequencer.c:887 builtin/apply.c:4287

1546 +#: sequencer.c:878 builtin/apply.c:4287

1547 #, c-format

1548 msgid "cannot open %s: %s"

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

1550

1503 -#: sequencer.c:890

1551 +#: sequencer.c:881

1552 #, c-format

1553 msgid "cannot read %s: %s"

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

1555

1508 -#: sequencer.c:891

1556 +#: sequencer.c:882

1557 msgid "unexpected end of file"

1558 msgstr "oväntat filslut"

1559

1512 -#: sequencer.c:897

1560 +#: sequencer.c:888

1561 #, c-format

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

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

1564

1517 -#: sequencer.c:919

1565 +#: sequencer.c:910

1566 #, c-format

1567 msgid "Could not format %s."

1568 msgstr "Kunde inte formatera %s."

1569

1522 -#: sequencer.c:1064

1570 +#: sequencer.c:1055

1571 #, c-format

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

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

1574

1527 -#: sequencer.c:1067

1575 +#: sequencer.c:1058

1576 #, c-format

1577 msgid "%s: bad revision"

1578 msgstr "%s: felaktig revision"

1579

1532 -#: sequencer.c:1101

1580 +#: sequencer.c:1092

1581 msgid "Can't revert as initial commit"

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

1583

1536 -#: sequencer.c:1102

1584 +#: sequencer.c:1093

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

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

1587

1540 -#: setup.c:248

1588 +#: setup.c:246

1589 #, c-format

1590 msgid "failed to read %s"

1591 msgstr "misslyckades läsa %s"

1592

1545 -#: sha1_name.c:463

1593 +#: sha1_name.c:462

1594 msgid ""

1595 "Git normally never creates a ref that ends with 40 hex characters\n"

1596 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -1564,62 +1612,81 @@ msgstr ""

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

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

1614

1567 -#: submodule.c:61 submodule.c:95

1615 +#: submodule.c:62 submodule.c:96

1616 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

1617 msgstr ""

1618 "Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "

1619 "sammanslagningskonflikter först"

1620

1573 -#: submodule.c:65 submodule.c:99

1621 +#: submodule.c:66 submodule.c:100

1622 #, c-format

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

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

1625

1578 -#: submodule.c:73

1626 +#: submodule.c:74

1627 #, c-format

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

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

1630

1583 -#: submodule.c:106

1631 +#: submodule.c:107

1632 #, c-format

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

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

1635

1588 -#: submodule.c:117

1636 +#: submodule.c:118

1637 msgid "staging updated .gitmodules failed"

1638 msgstr "misslyckades köa uppdaterad .gitmodules"

1639

1592 -#: submodule.c:1040

1593 -#, c-format

1594 -msgid "Could not set core.worktree in %s"

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

1596 -

1597 -#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557

1598 -#: trailer.c:561

1640 +#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558

1641 +#: trailer.c:562

1642 #, c-format

1643 msgid "unknown value '%s' for key '%s'"

1644 msgstr "okänt värde \"%s\" för nyckeln \"%s\""

1645

1603 -#: trailer.c:543 trailer.c:548 builtin/remote.c:296

1646 +#: trailer.c:544 trailer.c:549 builtin/remote.c:289

1647 #, c-format

1648 msgid "more than one %s"

1649 msgstr "mer än en %s"

1650

1608 -#: trailer.c:581

1651 +#: trailer.c:582

1652 #, c-format

1653 msgid "empty trailer token in trailer '%.*s'"

1654 msgstr "tom släpradssymbol i släpraden \"%.*s\""

1655

1613 -#: trailer.c:701

1656 +#: trailer.c:702

1657 #, c-format

1658 msgid "could not read input file '%s'"

1659 msgstr "kunde inte läsa indatafilen \"%s\""

1660

1618 -#: trailer.c:704

1661 +#: trailer.c:705

1662 msgid "could not read from stdin"

1663 msgstr "Kunde inte läsa från standard in"

1664

1622 -#: transport-helper.c:1025

1665 +#: trailer.c:857 builtin/am.c:42

1666 +#, c-format

1667 +msgid "could not stat %s"

1668 +msgstr "kunde inte ta status på %s"

1669 +

1670 +#: trailer.c:859

1671 +#, c-format

1672 +msgid "file %s is not a regular file"

1673 +msgstr "filen %s är inte en normal fil"

1674 +

1675 +#: trailer.c:861

1676 +#, c-format

1677 +msgid "file %s is not writable by user"

1678 +msgstr "filen %s är inte skrivbar av användaren"

1679 +

1680 +#: trailer.c:873

1681 +msgid "could not open temporary file"

1682 +msgstr "kunde inte öppna temporär file"

1683 +

1684 +#: trailer.c:912

1685 +#, c-format

1686 +msgid "could not rename temporary file to %s"

1687 +msgstr "kunde inte byta nman på temporära file till %s"

1688 +

1689 +#: transport-helper.c:1041

1690 #, c-format

1691 msgid "Could not read ref %s"

1692 msgstr "Kunde inte läsa referensen %s"

@@ -1657,47 +1724,47 @@ msgstr "felaktigt portnummer"

1724 msgid "invalid '..' path segment"

1725 msgstr "felaktigt \"..\"-sökvägssegment"

1726

1660 -#: wrapper.c:219 wrapper.c:362

1727 +#: wrapper.c:222 wrapper.c:381

1728 #, c-format

1729 msgid "could not open '%s' for reading and writing"

1730 msgstr "kunde inte öppna \"%s\" för läsning och skrivning"

1731

1665 -#: wrapper.c:221 wrapper.c:364

1732 +#: wrapper.c:224 wrapper.c:383

1733 #, c-format

1734 msgid "could not open '%s' for writing"

1735 msgstr "kunde inte öppna \"%s\" för skrivning"

1736

1670 -#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691

1671 -#: builtin/merge.c:1074 builtin/pull.c:380

1737 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691

1738 +#: builtin/merge.c:1075 builtin/pull.c:387

1739 #, c-format

1740 msgid "could not open '%s' for reading"

1741 msgstr "kunde inte öppna \"%s\" för läsning"

1742

1676 -#: wrapper.c:579

1743 +#: wrapper.c:611

1744 #, c-format

1745 msgid "unable to access '%s': %s"

1746 msgstr "kan inte komma åt \"%s\": %s"

1747

1681 -#: wrapper.c:600

1748 +#: wrapper.c:632

1749 #, c-format

1750 msgid "unable to access '%s'"

1751 msgstr "kan inte komma åt \"%s\""

1752

1686 -#: wrapper.c:608

1753 +#: wrapper.c:640

1754 msgid "unable to get current working directory"

1755 msgstr "kan inte hämta aktuell arbetskatalog"

1756

1690 -#: wrapper.c:635

1757 +#: wrapper.c:667

1758 #, c-format

1759 msgid "could not open %s for writing"

1760 msgstr "kunde inte öppna %s för skrivning"

1761

1695 -#: wrapper.c:646 builtin/am.c:425

1762 +#: wrapper.c:678 builtin/am.c:410

1763 #, c-format

1764 msgid "could not write to %s"

1765 msgstr "kunde inte skriva till %s"

1766

1700 -#: wrapper.c:652

1767 +#: wrapper.c:684

1768 #, c-format

1769 msgid "could not close %s"

1770 msgstr "kunde inte stänga %s"

@@ -2163,7 +2230,7 @@ msgstr "försvunnen"

2230 msgid "behind "

2231 msgstr "efter "

2232

2166 -#: compat/precompose_utf8.c:56 builtin/clone.c:408

2233 +#: compat/precompose_utf8.c:57 builtin/clone.c:413

2234 #, c-format

2235 msgid "failed to unlink '%s'"

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

@@ -2190,7 +2257,7 @@ msgstr "ta bort \"%s\"\n"

2257 msgid "Unstaged changes after refreshing the index:"

2258 msgstr "Oköade ändringar efter att ha uppdaterat indexet:"

2259

2193 -#: builtin/add.c:194 builtin/rev-parse.c:796

2260 +#: builtin/add.c:194 builtin/rev-parse.c:797

2261 msgid "Could not read the index"

2262 msgstr "Kunde inte läsa indexet"

2263

@@ -2225,15 +2292,15 @@ msgstr "Kunde inte tillämpa \"%s\""

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

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

2294

2228 -#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110

2229 -#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543

2230 -#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162

2295 +#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111

2296 +#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511

2297 +#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162

2298 msgid "dry run"

2299 msgstr "testkörning"

2300

2234 -#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19

2301 +#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19

2302 #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558

2236 -#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114

2303 +#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114

2304 msgid "be verbose"

2305 msgstr "var pratsam"

2306

@@ -2241,7 +2308,7 @@ msgstr "var pratsam"

2308 msgid "interactive picking"

2309 msgstr "plocka interaktivt"

2310

2244 -#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286

2311 +#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286

2312 msgid "select hunks interactively"

2313 msgstr "välj stycken interaktivt"

2314

@@ -2308,138 +2375,133 @@ msgstr "Inget angivet, inget tillagt.\n"

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

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

2377

2311 -#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938

2312 -#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2313 -#: builtin/submodule--helper.c:40

2378 +#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914

2379 +#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

2380 +#: builtin/submodule--helper.c:35

2381 msgid "index file corrupt"

2382 msgstr "indexfilen trasig"

2383

2317 -#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430

2384 +#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430

2385 msgid "Unable to write new index file"

2386 msgstr "Kunde inte skriva ny indexfil"

2387

2321 -#: builtin/am.c:42

2322 -#, c-format

2323 -msgid "could not stat %s"

2324 -msgstr "kunde inte ta status på %s"

2325 -

2326 -#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077

2388 +#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078

2389 #, c-format

2390 msgid "could not read '%s'"

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

2392

2331 -#: builtin/am.c:445

2393 +#: builtin/am.c:430

2394 msgid "could not parse author script"

2395 msgstr "kunde inte tolka författarskript"

2396

2335 -#: builtin/am.c:522

2397 +#: builtin/am.c:507

2398 #, c-format

2399 msgid "'%s' was deleted by the applypatch-msg hook"

2400 msgstr "\"%s\" togs bort av kroken applypatch-msg"

2401

2340 -#: builtin/am.c:563 builtin/notes.c:300

2402 +#: builtin/am.c:548 builtin/notes.c:300

2403 #, c-format

2404 msgid "Malformed input line: '%s'."

2405 msgstr "Felaktig indatarad: \"%s\"."

2406

2345 -#: builtin/am.c:600 builtin/notes.c:315

2407 +#: builtin/am.c:585 builtin/notes.c:315

2408 #, c-format

2409 msgid "Failed to copy notes from '%s' to '%s'"

2410 msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""

2411

2350 -#: builtin/am.c:626

2412 +#: builtin/am.c:611

2413 msgid "fseek failed"

2414 msgstr "\"fseek\" misslyckades"

2415

2354 -#: builtin/am.c:787 builtin/am.c:875

2416 +#: builtin/am.c:772 builtin/am.c:860

2417 #, c-format

2418 msgid "could not open '%s' for reading: %s"

2419 msgstr "kunde inte öppna \"%s\" för läsning: %s"

2420

2359 -#: builtin/am.c:794

2421 +#: builtin/am.c:779

2422 #, c-format

2423 msgid "could not open '%s' for writing: %s"

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

2425

2364 -#: builtin/am.c:803

2426 +#: builtin/am.c:788

2427 #, c-format

2428 msgid "could not parse patch '%s'"

2429 msgstr "kunde inte tolka patchen \"%s\""

2430

2369 -#: builtin/am.c:868

2431 +#: builtin/am.c:853

2432 msgid "Only one StGIT patch series can be applied at once"

2433 msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"

2434

2373 -#: builtin/am.c:916

2435 +#: builtin/am.c:901

2436 msgid "invalid timestamp"

2437 msgstr "ogiltig tidsstämpel"

2438

2377 -#: builtin/am.c:919 builtin/am.c:927

2439 +#: builtin/am.c:904 builtin/am.c:912

2440 msgid "invalid Date line"

2441 msgstr "ogiltig \"Date\"-rad"

2442

2381 -#: builtin/am.c:924

2443 +#: builtin/am.c:909

2444 msgid "invalid timezone offset"

2445 msgstr "ogiltig tidszons-offset"

2446

2385 -#: builtin/am.c:1011

2447 +#: builtin/am.c:996

2448 msgid "Patch format detection failed."

2449 msgstr "Misslyckades detektera patchformat."

2450

2389 -#: builtin/am.c:1016 builtin/clone.c:373

2451 +#: builtin/am.c:1001 builtin/clone.c:378

2452 #, c-format

2453 msgid "failed to create directory '%s'"

2454 msgstr "misslyckades skapa katalogen \"%s\""

2455

2394 -#: builtin/am.c:1020

2456 +#: builtin/am.c:1005

2457 msgid "Failed to split patches."

2458 msgstr "Misslyckades dela patchar."

2459

2398 -#: builtin/am.c:1152 builtin/commit.c:363

2460 +#: builtin/am.c:1137 builtin/commit.c:363

2461 msgid "unable to write index file"

2462 msgstr "kan inte skriva indexfil"

2463

2402 -#: builtin/am.c:1203

2464 +#: builtin/am.c:1188

2465 #, c-format

2466 msgid "When you have resolved this problem, run \"%s --continue\"."

2467 msgstr "När du har löst problemet, kör \"%s --continue\"."

2468

2407 -#: builtin/am.c:1204

2469 +#: builtin/am.c:1189

2470 #, c-format

2471 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

2472 msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."

2473

2412 -#: builtin/am.c:1205

2474 +#: builtin/am.c:1190

2475 #, c-format

2476 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

2477 msgstr ""

2478 "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."

2479

2418 -#: builtin/am.c:1343

2480 +#: builtin/am.c:1328

2481 msgid "Patch is empty. Was it split wrong?"

2482 msgstr "Patchen är tom. Delades den upp felaktigt?"

2483

2422 -#: builtin/am.c:1417 builtin/log.c:1347

2484 +#: builtin/am.c:1402 builtin/log.c:1350

2485 #, c-format

2486 msgid "invalid ident line: %s"

2487 msgstr "ogiltig ident-rad: %s"

2488

2427 -#: builtin/am.c:1444

2489 +#: builtin/am.c:1429

2490 #, c-format

2491 msgid "unable to parse commit %s"

2492 msgstr "kunde inte tolka incheckningen %s"

2493

2432 -#: builtin/am.c:1646

2494 +#: builtin/am.c:1631

2495 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

2496 msgstr ""

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

2498 "vägssammanslagning."

2499

2438 -#: builtin/am.c:1648

2500 +#: builtin/am.c:1633

2501 msgid "Using index info to reconstruct a base tree..."

2502 msgstr "Använder indexinfo för att återskapa ett basträd..."

2503

2442 -#: builtin/am.c:1667

2504 +#: builtin/am.c:1652

2505 msgid ""

2506 "Did you hand edit your patch?\n"

2507 "It does not apply to blobs recorded in its index."

@@ -2447,39 +2509,39 @@ msgstr ""

2509 "Har du handredigerat din patch?\n"

2510 "Den kan inte tillämpas på blobbar som antecknats i dess index."

2511

2450 -#: builtin/am.c:1673

2512 +#: builtin/am.c:1658

2513 msgid "Falling back to patching base and 3-way merge..."

2514 msgstr ""

2515 "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."

2516

2455 -#: builtin/am.c:1688

2517 +#: builtin/am.c:1673

2518 msgid "Failed to merge in the changes."

2519 msgstr "Misslyckades slå ihop ändringarna."

2520

2459 -#: builtin/am.c:1712 builtin/merge.c:632

2521 +#: builtin/am.c:1697 builtin/merge.c:633

2522 msgid "git write-tree failed to write a tree"

2523 msgstr "git write-tree misslyckades skriva ett träd"

2524

2463 -#: builtin/am.c:1719

2525 +#: builtin/am.c:1704

2526 msgid "applying to an empty history"

2527 msgstr "tillämpar på en tom historik"

2528

2467 -#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829

2468 -#: builtin/merge.c:854

2529 +#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830

2530 +#: builtin/merge.c:855

2531 msgid "failed to write commit object"

2532 msgstr "kunde inte skriva incheckningsobjekt"

2533

2472 -#: builtin/am.c:1764 builtin/am.c:1768

2534 +#: builtin/am.c:1749 builtin/am.c:1753

2535 #, c-format

2536 msgid "cannot resume: %s does not exist."

2537 msgstr "kan inte återuppta: %s finns inte."

2538

2477 -#: builtin/am.c:1784

2539 +#: builtin/am.c:1769

2540 msgid "cannot be interactive without stdin connected to a terminal."

2541 msgstr ""

2542 "kan inte vara interaktiv om standard in inte är ansluten till en terminal."

2543

2482 -#: builtin/am.c:1789

2544 +#: builtin/am.c:1774

2545 msgid "Commit Body is:"

2546 msgstr "Incheckningskroppen är:"

2547

@@ -2487,35 +2549,35 @@ msgstr "Incheckningskroppen är:"

2549 #. in your translation. The program will only accept English

2550 #. input at this point.

2551 #.

2490 -#: builtin/am.c:1799

2552 +#: builtin/am.c:1784

2553 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

2554 msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "

2555

2494 -#: builtin/am.c:1849

2556 +#: builtin/am.c:1834

2557 #, c-format

2558 msgid "Dirty index: cannot apply patches (dirty: %s)"

2559 msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"

2560

2499 -#: builtin/am.c:1884 builtin/am.c:1955

2561 +#: builtin/am.c:1869 builtin/am.c:1941

2562 #, c-format

2563 msgid "Applying: %.*s"

2564 msgstr "Tillämpar: %.*s"

2565

2504 -#: builtin/am.c:1900

2566 +#: builtin/am.c:1885

2567 msgid "No changes -- Patch already applied."

2568 msgstr "Inga ändringar -- Patchen har redan tillämpats."

2569

2508 -#: builtin/am.c:1908

2570 +#: builtin/am.c:1893

2571 #, c-format

2572 msgid "Patch failed at %s %.*s"

2573 msgstr "Patch misslyckades på %s %.*s"

2574

2513 -#: builtin/am.c:1914

2575 +#: builtin/am.c:1899

2576 #, c-format

2577 msgid "The copy of the patch that failed is found in: %s"

2578 msgstr "En kopia av patchen som misslyckades finns i: %s"

2579

2518 -#: builtin/am.c:1958

2580 +#: builtin/am.c:1944

2581 msgid ""

2582 "No changes - did you forget to use 'git add'?\n"

2583 "If there is nothing left to stage, chances are that something else\n"

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

2587 "Om det inte är något kvar att köa kan det hända att något annat redan\n"

2588 "introducerat samma ändringar; kanske du bör hoppa över patchen."

2589

2528 -#: builtin/am.c:1965

2590 +#: builtin/am.c:1951

2591 msgid ""

2592 "You still have unmerged paths in your index.\n"

2593 "Did you forget to use 'git add'?"

@@ -2533,17 +2595,17 @@ msgstr ""

2595 "Du har fortfarande sökvägar som inte slagits samman i ditt index.\n"

2596 "Glömde du använda \"git add\"?"

2597

2536 -#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308

2598 +#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308

2599 #: builtin/reset.c:316

2600 #, c-format

2601 msgid "Could not parse object '%s'."

2602 msgstr "Kan inte tolka objektet \"%s\""

2603

2542 -#: builtin/am.c:2125

2604 +#: builtin/am.c:2111

2605 msgid "failed to clean index"

2606 msgstr "misslyckades städa upp indexet"

2607

2546 -#: builtin/am.c:2159

2608 +#: builtin/am.c:2145

2609 msgid ""

2610 "You seem to have moved HEAD since the last 'am' failure.\n"

2611 "Not rewinding to ORIG_HEAD"

@@ -2551,152 +2613,152 @@ msgstr ""

2613 "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"

2614 "Återställer inte till ORIG_HEAD"

2615

2554 -#: builtin/am.c:2220

2616 +#: builtin/am.c:2206

2617 #, c-format

2618 msgid "Invalid value for --patch-format: %s"

2619 msgstr "Felaktigt värde för --patch-format: %s"

2620

2559 -#: builtin/am.c:2253

2621 +#: builtin/am.c:2239

2622 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"

2623 msgstr "git am [<flaggor>] [(<mbox>|<Maildir>)...]"

2624

2563 -#: builtin/am.c:2254

2625 +#: builtin/am.c:2240

2626 msgid "git am [<options>] (--continue | --skip | --abort)"

2627 msgstr "git am [<flaggor>] (--continue | --skip | --abort)"

2628

2567 -#: builtin/am.c:2260

2629 +#: builtin/am.c:2246

2630 msgid "run interactively"

2631 msgstr "kör interaktivt"

2632

2571 -#: builtin/am.c:2262

2633 +#: builtin/am.c:2248

2634 msgid "historical option -- no-op"

2635 msgstr "historisk flagga -- no-op"

2636

2575 -#: builtin/am.c:2264

2637 +#: builtin/am.c:2250

2638 msgid "allow fall back on 3way merging if needed"

2639 msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"

2640

2579 -#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57

2641 +#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57

2642 #: builtin/repack.c:171

2643 msgid "be quiet"

2644 msgstr "var tyst"

2645

2584 -#: builtin/am.c:2267

2646 +#: builtin/am.c:2253

2647 msgid "add a Signed-off-by line to the commit message"

2648 msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"

2649

2588 -#: builtin/am.c:2270

2650 +#: builtin/am.c:2256

2651 msgid "recode into utf8 (default)"

2652 msgstr "koda om till utf8 (standard)"

2653

2592 -#: builtin/am.c:2272

2654 +#: builtin/am.c:2258

2655 msgid "pass -k flag to git-mailinfo"

2656 msgstr "sänd flaggan -k till git-mailinfo"

2657

2596 -#: builtin/am.c:2274

2658 +#: builtin/am.c:2260

2659 msgid "pass -b flag to git-mailinfo"

2660 msgstr "sänd flaggan -b till git-mailinfo"

2661

2600 -#: builtin/am.c:2276

2662 +#: builtin/am.c:2262

2663 msgid "pass -m flag to git-mailinfo"

2664 msgstr "sänd flaggan -m till git-mailinfo"

2665

2604 -#: builtin/am.c:2278

2666 +#: builtin/am.c:2264

2667 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

2668 msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"

2669

2608 -#: builtin/am.c:2281

2670 +#: builtin/am.c:2267

2671 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

2672 msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"

2673

2612 -#: builtin/am.c:2284

2674 +#: builtin/am.c:2270

2675 msgid "strip everything before a scissors line"

2676 msgstr "ta bort allting före en saxlinje"

2677

2616 -#: builtin/am.c:2285 builtin/apply.c:4554

2678 +#: builtin/am.c:2271 builtin/apply.c:4544

2679 msgid "action"

2680 msgstr "åtgärd"

2681

2620 -#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295

2621 -#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307

2622 -#: builtin/am.c:2313

2682 +#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281

2683 +#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293

2684 +#: builtin/am.c:2299

2685 msgid "pass it through git-apply"

2686 msgstr "sänd det genom git-apply"

2687

2626 -#: builtin/am.c:2294 builtin/apply.c:4578

2688 +#: builtin/am.c:2280 builtin/apply.c:4568

2689 msgid "root"

2690 msgstr "rot"

2691

2630 -#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516

2631 -#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93

2632 -#: builtin/pull.c:167 builtin/submodule--helper.c:78

2633 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169

2692 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506

2693 +#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95

2694 +#: builtin/pull.c:171 builtin/submodule--helper.c:72

2695 +#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163

2696 msgid "path"

2697 msgstr "sökväg"

2698

2637 -#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

2638 -#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127

2639 -#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645

2640 -#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132

2641 -#: parse-options.h:134 parse-options.h:244

2699 +#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

2700 +#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131

2701 +#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182

2702 +#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340

2703 +#: parse-options.h:132 parse-options.h:134 parse-options.h:244

2704 msgid "n"

2705 msgstr "n"

2706

2645 -#: builtin/am.c:2306 builtin/apply.c:4522

2707 +#: builtin/am.c:2292 builtin/apply.c:4512

2708 msgid "num"

2709 msgstr "antal"

2710

2649 -#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438

2711 +#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438

2712 #: builtin/tag.c:372

2713 msgid "format"

2714 msgstr "format"

2715

2654 -#: builtin/am.c:2310

2716 +#: builtin/am.c:2296

2717 msgid "format the patch(es) are in"

2718 msgstr "format för patch(ar)"

2719

2658 -#: builtin/am.c:2316

2720 +#: builtin/am.c:2302

2721 msgid "override error message when patch failure occurs"

2722 msgstr "överstyr felmeddelanden när patchfel uppstår"

2723

2662 -#: builtin/am.c:2318

2724 +#: builtin/am.c:2304

2725 msgid "continue applying patches after resolving a conflict"

2726 msgstr "fortsätt applicera patchar efter att ha löst en konflikt"

2727

2666 -#: builtin/am.c:2321

2728 +#: builtin/am.c:2307

2729 msgid "synonyms for --continue"

2730 msgstr "synonymer till --continue"

2731

2670 -#: builtin/am.c:2324

2732 +#: builtin/am.c:2310

2733 msgid "skip the current patch"

2734 msgstr "hoppa över den aktuella grenen"

2735

2674 -#: builtin/am.c:2327

2736 +#: builtin/am.c:2313

2737 msgid "restore the original branch and abort the patching operation."

2738 msgstr "återställ originalgrenen och avbryt patchningen."

2739

2678 -#: builtin/am.c:2331

2740 +#: builtin/am.c:2317

2741 msgid "lie about committer date"

2742 msgstr "ljug om incheckningsdatum"

2743

2682 -#: builtin/am.c:2333

2744 +#: builtin/am.c:2319

2745 msgid "use current timestamp for author date"

2746 msgstr "använd nuvarande tidsstämpel för författardatum"

2747

2686 -#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225

2687 -#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355

2748 +#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225

2749 +#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355

2750 msgid "key-id"

2751 msgstr "nyckel-id"

2752

2691 -#: builtin/am.c:2336

2753 +#: builtin/am.c:2322

2754 msgid "GPG-sign commits"

2755 msgstr "GPG-signera incheckningar"

2756

2695 -#: builtin/am.c:2339

2757 +#: builtin/am.c:2325

2758 msgid "(internal use for git-rebase)"

2759 msgstr "(används internt av git-rebase)"

2760

2699 -#: builtin/am.c:2354

2761 +#: builtin/am.c:2340

2762 msgid ""

2763 "The -b/--binary option has been a no-op for long time, and\n"

2764 "it will be removed. Please do not use it anymore."

@@ -2704,16 +2766,16 @@ msgstr ""

2766 "Flaggan -b/--binary har varit utan funktion länge, och\n"

2767 "kommer tas bort. Vi ber dig att inte använda den längre."

2768

2707 -#: builtin/am.c:2361

2769 +#: builtin/am.c:2347

2770 msgid "failed to read the index"

2771 msgstr "misslyckades läsa indexet"

2772

2711 -#: builtin/am.c:2376

2773 +#: builtin/am.c:2362

2774 #, c-format

2775 msgid "previous rebase directory %s still exists but mbox given."

2776 msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."

2777

2716 -#: builtin/am.c:2400

2778 +#: builtin/am.c:2386

2779 #, c-format

2780 msgid ""

2781 "Stray %s directory found.\n"

@@ -2722,7 +2784,7 @@ msgstr ""

2784 "Kvarbliven katalog %s hittades.\n"

2785 "Använd \"git am --abort\" för att ta bort den."

2786

2725 -#: builtin/am.c:2406

2787 +#: builtin/am.c:2392

2788 msgid "Resolve operation not in progress, we are not resuming."

2789 msgstr "Lösningsoperation pågår inte, vi återupptar inte."

2790

@@ -3068,131 +3130,131 @@ msgstr "indata känns inte igen"

3130 msgid "unable to read index file"

3131 msgstr "kan inte läsa indexfilen"

3132

3071 -#: builtin/apply.c:4517

3133 +#: builtin/apply.c:4507

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

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

3136

3075 -#: builtin/apply.c:4520

3137 +#: builtin/apply.c:4510

3138 msgid "apply changes matching the given path"

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

3140

3079 -#: builtin/apply.c:4523

3141 +#: builtin/apply.c:4513

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

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

3144

3083 -#: builtin/apply.c:4526

3145 +#: builtin/apply.c:4516

3146 msgid "ignore additions made by the patch"

3147 msgstr "ignorera tillägg gjorda av patchen"

3148

3087 -#: builtin/apply.c:4528

3149 +#: builtin/apply.c:4518

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

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

3152

3091 -#: builtin/apply.c:4532

3153 +#: builtin/apply.c:4522

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

3155 msgstr "visa antal tillagda och borttagna rader decimalt"

3156

3095 -#: builtin/apply.c:4534

3157 +#: builtin/apply.c:4524

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

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

3160

3099 -#: builtin/apply.c:4536

3161 +#: builtin/apply.c:4526

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

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

3164

3103 -#: builtin/apply.c:4538

3165 +#: builtin/apply.c:4528

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

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

3168

3107 -#: builtin/apply.c:4540

3169 +#: builtin/apply.c:4530

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

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

3172

3111 -#: builtin/apply.c:4542

3173 +#: builtin/apply.c:4532

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

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

3176

3115 -#: builtin/apply.c:4544

3177 +#: builtin/apply.c:4534

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

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

3180

3119 -#: builtin/apply.c:4546

3181 +#: builtin/apply.c:4536

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

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

3184

3123 -#: builtin/apply.c:4548

3185 +#: builtin/apply.c:4538

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

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

3188

3127 -#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412

3189 +#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425

3190 msgid "paths are separated with NUL character"

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

3192

3131 -#: builtin/apply.c:4553

3193 +#: builtin/apply.c:4543

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

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

3196

3135 -#: builtin/apply.c:4555

3197 +#: builtin/apply.c:4545

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

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

3200

3139 -#: builtin/apply.c:4558 builtin/apply.c:4561

3201 +#: builtin/apply.c:4548 builtin/apply.c:4551

3202 msgid "ignore changes in whitespace when finding context"

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

3204

3143 -#: builtin/apply.c:4564

3205 +#: builtin/apply.c:4554

3206 msgid "apply the patch in reverse"

3207 msgstr "tillämpa patchen baklänges"

3208

3147 -#: builtin/apply.c:4566

3209 +#: builtin/apply.c:4556

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

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

3212

3151 -#: builtin/apply.c:4568

3213 +#: builtin/apply.c:4558

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

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

3216

3155 -#: builtin/apply.c:4570

3217 +#: builtin/apply.c:4560

3218 msgid "allow overlapping hunks"

3219 msgstr "tillåt överlappande stycken"

3220

3159 -#: builtin/apply.c:4573

3221 +#: builtin/apply.c:4563

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

3223 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

3224

3163 -#: builtin/apply.c:4576

3225 +#: builtin/apply.c:4566

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

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

3228

3167 -#: builtin/apply.c:4579

3229 +#: builtin/apply.c:4569

3230 msgid "prepend <root> to all filenames"

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

3232

3171 -#: builtin/apply.c:4601

3233 +#: builtin/apply.c:4591

3234 msgid "--3way outside a repository"

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

3236

3175 -#: builtin/apply.c:4609

3237 +#: builtin/apply.c:4599

3238 msgid "--index outside a repository"

3239 msgstr "--index utanför arkiv"

3240

3179 -#: builtin/apply.c:4612

3241 +#: builtin/apply.c:4602

3242 msgid "--cached outside a repository"

3243 msgstr "--cached utanför arkiv"

3244

3183 -#: builtin/apply.c:4631

3245 +#: builtin/apply.c:4621

3246 #, c-format

3247 msgid "can't open patch '%s'"

3248 msgstr "kan inte öppna patchen \"%s\""

3249

3188 -#: builtin/apply.c:4645

3250 +#: builtin/apply.c:4635

3251 #, c-format

3252 msgid "squelched %d whitespace error"

3253 msgid_plural "squelched %d whitespace errors"

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

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

3256

3195 -#: builtin/apply.c:4651 builtin/apply.c:4661

3257 +#: builtin/apply.c:4641 builtin/apply.c:4651

3258 #, c-format

3259 msgid "%d line adds whitespace errors."

3260 msgid_plural "%d lines add whitespace errors."

@@ -3246,103 +3308,111 @@ msgstr "utför 'git bisect next'"

3308 msgid "update BISECT_HEAD instead of checking out the current commit"

3309 msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning"

3310

3249 -#: builtin/blame.c:32

3311 +#: builtin/blame.c:33

3312 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

3313 msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"

3314

3253 -#: builtin/blame.c:37

3315 +#: builtin/blame.c:38

3316 msgid "<rev-opts> are documented in git-rev-list(1)"

3317 msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"

3318

3257 -#: builtin/blame.c:2519

3319 +#: builtin/blame.c:1782

3320 +msgid "Blaming lines"

3321 +msgstr "Klandra rader"

3322 +

3323 +#: builtin/blame.c:2530

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

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

3326

3261 -#: builtin/blame.c:2520

3327 +#: builtin/blame.c:2531

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

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

3330

3265 -#: builtin/blame.c:2521

3331 +#: builtin/blame.c:2532

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

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

3334

3269 -#: builtin/blame.c:2522

3335 +#: builtin/blame.c:2533

3336 msgid "Show work cost statistics"

3337 msgstr "Visa statistik över arbetskostnad"

3338

3273 -#: builtin/blame.c:2523

3339 +#: builtin/blame.c:2534

3340 +msgid "Force progress reporting"

3341 +msgstr "Tvinga förloppsrapportering"

3342 +

3343 +#: builtin/blame.c:2535

3344 msgid "Show output score for blame entries"

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

3346

3277 -#: builtin/blame.c:2524

3347 +#: builtin/blame.c:2536

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

3349 msgstr "Visa originalfilnamn (Standard: auto)"

3350

3281 -#: builtin/blame.c:2525

3351 +#: builtin/blame.c:2537

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

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

3354

3285 -#: builtin/blame.c:2526

3355 +#: builtin/blame.c:2538

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

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

3358

3289 -#: builtin/blame.c:2527

3359 +#: builtin/blame.c:2539

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

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

3362

3293 -#: builtin/blame.c:2528

3363 +#: builtin/blame.c:2540

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

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

3366

3297 -#: builtin/blame.c:2529

3367 +#: builtin/blame.c:2541

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

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

3370

3301 -#: builtin/blame.c:2530

3371 +#: builtin/blame.c:2542

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

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

3374

3305 -#: builtin/blame.c:2531

3375 +#: builtin/blame.c:2543

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

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

3378

3309 -#: builtin/blame.c:2532

3379 +#: builtin/blame.c:2544

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

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

3382

3313 -#: builtin/blame.c:2533

3383 +#: builtin/blame.c:2545

3384 msgid "Ignore whitespace differences"

3385 msgstr "Ignorera ändringar i blanksteg"

3386

3317 -#: builtin/blame.c:2534

3387 +#: builtin/blame.c:2546

3388 msgid "Spend extra cycles to find better match"

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

3390

3321 -#: builtin/blame.c:2535

3391 +#: builtin/blame.c:2547

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

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

3394

3325 -#: builtin/blame.c:2536

3395 +#: builtin/blame.c:2548

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

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

3398

3329 -#: builtin/blame.c:2537 builtin/blame.c:2538

3399 +#: builtin/blame.c:2549 builtin/blame.c:2550

3400 msgid "score"

3401 msgstr "poäng"

3402

3333 -#: builtin/blame.c:2537

3403 +#: builtin/blame.c:2549

3404 msgid "Find line copies within and across files"

3405 msgstr "Hitta kopierade rader inuti och mellan filer"

3406

3337 -#: builtin/blame.c:2538

3407 +#: builtin/blame.c:2550

3408 msgid "Find line movements within and across files"

3409 msgstr "Hitta flyttade rader inuti och mellan filer"

3410

3341 -#: builtin/blame.c:2539

3411 +#: builtin/blame.c:2551

3412 msgid "n,m"

3413 msgstr "n,m"

3414

3345 -#: builtin/blame.c:2539

3415 +#: builtin/blame.c:2551

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

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

3418

@@ -3352,7 +3422,7 @@ msgstr "Behandla endast radintervallet n,m, med början på 1"

3422 #. takes 22 places, is the longest among various forms of

3423 #. relative timestamps, but your language may need more or

3424 #. fewer display columns.

3355 -#: builtin/blame.c:2620

3425 +#: builtin/blame.c:2640

3426 msgid "4 years, 11 months ago"

3427 msgstr "4 år, 11 månader sedan"

3428

@@ -3551,197 +3621,197 @@ msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"

3621 msgid "Branch is renamed, but update of config-file failed"

3622 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

3623

3554 -#: builtin/branch.c:587

3624 +#: builtin/branch.c:586

3625 #, c-format

3626 msgid "could not write branch description template: %s"

3627 msgstr "kunde inte skriva grenbeskrivningsmall: %s"

3628

3559 -#: builtin/branch.c:616

3629 +#: builtin/branch.c:615

3630 msgid "Generic options"

3631 msgstr "Allmänna flaggor"

3632

3563 -#: builtin/branch.c:618

3633 +#: builtin/branch.c:617

3634 msgid "show hash and subject, give twice for upstream branch"

3635 msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"

3636

3567 -#: builtin/branch.c:619

3637 +#: builtin/branch.c:618

3638 msgid "suppress informational messages"

3639 msgstr "undertryck informationsmeddelanden"

3640

3571 -#: builtin/branch.c:620

3641 +#: builtin/branch.c:619

3642 msgid "set up tracking mode (see git-pull(1))"

3643 msgstr "ställ in spårningsläge (se git-pull(1))"

3644

3575 -#: builtin/branch.c:622

3645 +#: builtin/branch.c:621

3646 msgid "change upstream info"

3647 msgstr "ändra uppströmsinformation"

3648

3579 -#: builtin/branch.c:626

3649 +#: builtin/branch.c:625

3650 msgid "use colored output"

3651 msgstr "använd färgad utdata"

3652

3583 -#: builtin/branch.c:627

3653 +#: builtin/branch.c:626

3654 msgid "act on remote-tracking branches"

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

3656

3587 -#: builtin/branch.c:629 builtin/branch.c:630

3657 +#: builtin/branch.c:628 builtin/branch.c:629

3658 msgid "print only branches that contain the commit"

3659 msgstr "visa endast grenar som innehåller incheckningen"

3660

3591 -#: builtin/branch.c:633

3661 +#: builtin/branch.c:632

3662 msgid "Specific git-branch actions:"

3663 msgstr "Specifika git-branch-åtgärder:"

3664

3595 -#: builtin/branch.c:634

3665 +#: builtin/branch.c:633

3666 msgid "list both remote-tracking and local branches"

3667 msgstr "visa både fjärrspårande och lokala grenar"

3668

3599 -#: builtin/branch.c:636

3669 +#: builtin/branch.c:635

3670 msgid "delete fully merged branch"

3671 msgstr "ta bort helt sammanslagen gren"

3672

3603 -#: builtin/branch.c:637

3673 +#: builtin/branch.c:636

3674 msgid "delete branch (even if not merged)"

3675 msgstr "ta bort gren (även om inte helt sammanslagen)"

3676

3607 -#: builtin/branch.c:638

3677 +#: builtin/branch.c:637

3678 msgid "move/rename a branch and its reflog"

3679 msgstr "flytta/ta bort en gren och dess reflogg"

3680

3611 -#: builtin/branch.c:639

3681 +#: builtin/branch.c:638

3682 msgid "move/rename a branch, even if target exists"

3683 msgstr "flytta/ta bort en gren, även om målet finns"

3684

3615 -#: builtin/branch.c:640

3685 +#: builtin/branch.c:639

3686 msgid "list branch names"

3687 msgstr "lista namn på grenar"

3688

3619 -#: builtin/branch.c:641

3689 +#: builtin/branch.c:640

3690 msgid "create the branch's reflog"

3691 msgstr "skapa grenens reflogg"

3692

3623 -#: builtin/branch.c:643

3693 +#: builtin/branch.c:642

3694 msgid "edit the description for the branch"

3695 msgstr "redigera beskrivning för grenen"

3696

3627 -#: builtin/branch.c:644

3697 +#: builtin/branch.c:643

3698 msgid "force creation, move/rename, deletion"

3699 msgstr "tvinga skapande, flytt/namnändring, borttagande"

3700

3631 -#: builtin/branch.c:645

3701 +#: builtin/branch.c:644

3702 msgid "print only branches that are merged"

3703 msgstr "visa endast sammanslagna grenar"

3704

3635 -#: builtin/branch.c:646

3705 +#: builtin/branch.c:645

3706 msgid "print only branches that are not merged"

3707 msgstr "visa endast ej sammanslagna grenar"

3708

3639 -#: builtin/branch.c:647

3709 +#: builtin/branch.c:646

3710 msgid "list branches in columns"

3711 msgstr "visa grenar i spalter"

3712

3643 -#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366

3713 +#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366

3714 msgid "key"

3715 msgstr "nyckel"

3716

3647 -#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367

3717 +#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367

3718 msgid "field name to sort on"

3719 msgstr "fältnamn att sortera på"

3720

3651 -#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398

3652 -#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564

3721 +#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401

3722 +#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567

3723 #: builtin/tag.c:369

3724 msgid "object"

3725 msgstr "objekt"

3726

3657 -#: builtin/branch.c:652

3727 +#: builtin/branch.c:651

3728 msgid "print only branches of the object"

3729 msgstr "visa endast grenar för objektet"

3730

3661 -#: builtin/branch.c:670

3731 +#: builtin/branch.c:669

3732 msgid "Failed to resolve HEAD as a valid ref."

3733 msgstr "Misslyckades slå upp HEAD som giltig referens"

3734

3665 -#: builtin/branch.c:674 builtin/clone.c:697

3735 +#: builtin/branch.c:673 builtin/clone.c:705

3736 msgid "HEAD not found below refs/heads!"

3737 msgstr "HEAD hittades inte under refs/heads!"

3738

3669 -#: builtin/branch.c:694

3739 +#: builtin/branch.c:693

3740 msgid "--column and --verbose are incompatible"

3741 msgstr "--column och --verbose är inkompatibla"

3742

3673 -#: builtin/branch.c:705 builtin/branch.c:747

3743 +#: builtin/branch.c:704 builtin/branch.c:746

3744 msgid "branch name required"

3745 msgstr "grennamn krävs"

3746

3677 -#: builtin/branch.c:723

3747 +#: builtin/branch.c:722

3748 msgid "Cannot give description to detached HEAD"

3749 msgstr "Kan inte beskriva frånkopplad HEAD"

3750

3681 -#: builtin/branch.c:728

3751 +#: builtin/branch.c:727

3752 msgid "cannot edit description of more than one branch"

3753 msgstr "kan inte redigera beskrivning för mer än en gren"

3754

3685 -#: builtin/branch.c:735

3755 +#: builtin/branch.c:734

3756 #, c-format

3757 msgid "No commit on branch '%s' yet."

3758 msgstr "Inga incheckningar på grenen \"%s\" ännu"

3759

3690 -#: builtin/branch.c:738

3760 +#: builtin/branch.c:737

3761 #, c-format

3762 msgid "No branch named '%s'."

3763 msgstr "Ingen gren vid namnet \"%s\"."

3764

3695 -#: builtin/branch.c:753

3765 +#: builtin/branch.c:752

3766 msgid "too many branches for a rename operation"

3767 msgstr "för många grenar för namnbyte"

3768

3699 -#: builtin/branch.c:758

3769 +#: builtin/branch.c:757

3770 msgid "too many branches to set new upstream"

3771 msgstr "för många grenar för att byta uppström"

3772

3703 -#: builtin/branch.c:762

3773 +#: builtin/branch.c:761

3774 #, c-format

3775 msgid ""

3776 "could not set upstream of HEAD to %s when it does not point to any branch."

3777 msgstr ""

3778 "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."

3779

3710 -#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808

3780 +#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807

3781 #, c-format

3782 msgid "no such branch '%s'"

3783 msgstr "okänd gren \"%s\""

3784

3715 -#: builtin/branch.c:769

3785 +#: builtin/branch.c:768

3786 #, c-format

3787 msgid "branch '%s' does not exist"

3788 msgstr "grenen \"%s\" finns inte"

3789

3720 -#: builtin/branch.c:781

3790 +#: builtin/branch.c:780

3791 msgid "too many branches to unset upstream"

3792 msgstr "för många grenar för att ta bort uppström"

3793

3724 -#: builtin/branch.c:785

3794 +#: builtin/branch.c:784

3795 msgid "could not unset upstream of HEAD when it does not point to any branch."

3796 msgstr ""

3797 "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."

3798

3729 -#: builtin/branch.c:791

3799 +#: builtin/branch.c:790

3800 #, c-format

3801 msgid "Branch '%s' has no upstream information"

3802 msgstr "Grenen \"%s\" har ingen uppströmsinformation"

3803

3734 -#: builtin/branch.c:805

3804 +#: builtin/branch.c:804

3805 msgid "it does not make sense to create 'HEAD' manually"

3806 msgstr "kan inte skapa \"HEAD\" manuellt"

3807

3738 -#: builtin/branch.c:811

3808 +#: builtin/branch.c:810

3809 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

3810 msgstr ""

3811 "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "

3812 "grennamn"

3813

3744 -#: builtin/branch.c:814

3814 +#: builtin/branch.c:813

3815 #, c-format

3816 msgid ""

3817 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -3750,7 +3820,7 @@ msgstr ""

3820 "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "

3821 "eller --set-upstream-to\n"

3822

3753 -#: builtin/branch.c:831

3823 +#: builtin/branch.c:830

3824 #, c-format

3825 msgid ""

3826 "\n"

@@ -3761,12 +3831,12 @@ msgstr ""

3831 "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"

3832 "\n"

3833

3764 -#: builtin/branch.c:832

3834 +#: builtin/branch.c:831

3835 #, c-format

3836 msgid " git branch -d %s\n"

3837 msgstr " git branch -d %s\n"

3838

3769 -#: builtin/branch.c:833

3839 +#: builtin/branch.c:832

3840 #, c-format

3841 msgid " git branch --set-upstream-to %s\n"

3842 msgstr " git branch --set-upstream-to %s\n"

@@ -3861,7 +3931,7 @@ msgstr "visa alla attribut som satts på filen"

3931 msgid "use .gitattributes only from the index"

3932 msgstr "använd .gitattributes endast från indexet"

3933

3864 -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96

3934 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97

3935 msgid "read file names from stdin"

3936 msgstr "läs filnamn från standard in"

3937

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

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

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

3941

3872 -#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325

3942 +#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325

3943 msgid "suppress progress reporting"

3944 msgstr "undertryck förloppsrapportering"

3945

@@ -3922,49 +3992,53 @@ msgstr "kunde inte tolka kontakt: %s"

3992 msgid "no contacts specified"

3993 msgstr "inga kontakter angavs"

3994

3925 -#: builtin/checkout-index.c:126

3995 +#: builtin/checkout-index.c:127

3996 msgid "git checkout-index [<options>] [--] [<file>...]"

3997 msgstr "git checkout-index [<flaggor>] [--] [<fil>...]"

3998

3929 -#: builtin/checkout-index.c:188

3999 +#: builtin/checkout-index.c:144

4000 +msgid "stage should be between 1 and 3 or all"

4001 +msgstr "etapp måste vara mellan 1 och 3 eller \"all\""

4002 +

4003 +#: builtin/checkout-index.c:160

4004 msgid "check out all files in the index"

4005 msgstr "checka ut alla filer i indexet"

4006

3933 -#: builtin/checkout-index.c:189

4007 +#: builtin/checkout-index.c:161

4008 msgid "force overwrite of existing files"

4009 msgstr "tvinga överskrivning av befintliga filer"

4010

3937 -#: builtin/checkout-index.c:191

4011 +#: builtin/checkout-index.c:163

4012 msgid "no warning for existing files and files not in index"

4013 msgstr "ingen varning för existerande filer och filer ej i indexet"

4014

3941 -#: builtin/checkout-index.c:193

4015 +#: builtin/checkout-index.c:165

4016 msgid "don't checkout new files"

4017 msgstr "checka inte ut nya filer"

4018

3945 -#: builtin/checkout-index.c:195

4019 +#: builtin/checkout-index.c:167

4020 msgid "update stat information in the index file"

4021 msgstr "uppdatera stat-information i indexfilen"

4022

3949 -#: builtin/checkout-index.c:201

4023 +#: builtin/checkout-index.c:171

4024 msgid "read list of paths from the standard input"

4025 msgstr "läs listan över sökvägar från standard in"

4026

3953 -#: builtin/checkout-index.c:203

4027 +#: builtin/checkout-index.c:173

4028 msgid "write the content to temporary files"

4029 msgstr "skriv innehåll till temporära filer"

4030

3957 -#: builtin/checkout-index.c:204 builtin/column.c:30

4031 +#: builtin/checkout-index.c:174 builtin/column.c:30

4032 +#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169

4033 #: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175

3959 -#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181

4034 msgid "string"

4035 msgstr "sträng"

4036

3963 -#: builtin/checkout-index.c:205

4037 +#: builtin/checkout-index.c:175

4038 msgid "when creating files, prepend <string>"

4039 msgstr "när filer skapas, lägg till <sträng> först"

4040

3967 -#: builtin/checkout-index.c:208

4041 +#: builtin/checkout-index.c:177

4042 msgid "copy out the files from named stage"

4043 msgstr "kopiera ut filer från namngiven etapp"

4044

@@ -4044,37 +4118,37 @@ msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"

4118 msgid "HEAD is now at"

4119 msgstr "HEAD är nu på"

4120

4047 -#: builtin/checkout.c:668

4121 +#: builtin/checkout.c:669

4122 #, c-format

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

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

4125

4052 -#: builtin/checkout.c:671

4126 +#: builtin/checkout.c:672

4127 #, c-format

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

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

4130

4057 -#: builtin/checkout.c:675

4131 +#: builtin/checkout.c:676

4132 #, c-format

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

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

4135

4062 -#: builtin/checkout.c:677 builtin/checkout.c:1066

4136 +#: builtin/checkout.c:678 builtin/checkout.c:1068

4137 #, c-format

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

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

4140

4067 -#: builtin/checkout.c:679

4141 +#: builtin/checkout.c:680

4142 #, c-format

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

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

4145

4072 -#: builtin/checkout.c:731

4146 +#: builtin/checkout.c:732

4147 #, c-format

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

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

4150

4077 -#: builtin/checkout.c:737

4151 +#: builtin/checkout.c:738

4152 #, c-format

4153 msgid ""

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

@@ -4097,7 +4171,7 @@ msgstr[1] ""

4171 "\n"

4172 "%s\n"

4173

4100 -#: builtin/checkout.c:756

4174 +#: builtin/checkout.c:757

4175 #, c-format

4176 msgid ""

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

@@ -4124,151 +4198,151 @@ msgstr[1] ""

4198 " git branch <nytt_grennamn> %s\n"

4199 "\n"

4200

4127 -#: builtin/checkout.c:792

4201 +#: builtin/checkout.c:793

4202 msgid "internal error in revision walk"

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

4204

4131 -#: builtin/checkout.c:796

4205 +#: builtin/checkout.c:797

4206 msgid "Previous HEAD position was"

4207 msgstr "Tidigare position för HEAD var"

4208

4135 -#: builtin/checkout.c:823 builtin/checkout.c:1061

4209 +#: builtin/checkout.c:824 builtin/checkout.c:1063

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

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

4212

4139 -#: builtin/checkout.c:968

4213 +#: builtin/checkout.c:969

4214 #, c-format

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

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

4217

4144 -#: builtin/checkout.c:1007 builtin/worktree.c:213

4218 +#: builtin/checkout.c:1009 builtin/worktree.c:211

4219 #, c-format

4220 msgid "invalid reference: %s"

4221 msgstr "felaktig referens: %s"

4222

4149 -#: builtin/checkout.c:1036

4223 +#: builtin/checkout.c:1038

4224 #, c-format

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

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

4227

4154 -#: builtin/checkout.c:1075

4228 +#: builtin/checkout.c:1077

4229 msgid "paths cannot be used with switching branches"

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

4231

4158 -#: builtin/checkout.c:1078 builtin/checkout.c:1082

4232 +#: builtin/checkout.c:1080 builtin/checkout.c:1084

4233 #, c-format

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

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

4236

4163 -#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094

4164 -#: builtin/checkout.c:1097

4237 +#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096

4238 +#: builtin/checkout.c:1099

4239 #, c-format

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

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

4242

4169 -#: builtin/checkout.c:1102

4243 +#: builtin/checkout.c:1104

4244 #, c-format

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

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

4247

4174 -#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83

4175 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320

4176 -#: builtin/worktree.c:322

4248 +#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84

4249 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318

4250 +#: builtin/worktree.c:320

4251 msgid "branch"

4252 msgstr "gren"

4253

4180 -#: builtin/checkout.c:1136

4254 +#: builtin/checkout.c:1138

4255 msgid "create and checkout a new branch"

4256 msgstr "skapa och checka ut en ny gren"

4257

4184 -#: builtin/checkout.c:1138

4258 +#: builtin/checkout.c:1140

4259 msgid "create/reset and checkout a branch"

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

4261

4188 -#: builtin/checkout.c:1139

4262 +#: builtin/checkout.c:1141

4263 msgid "create reflog for new branch"

4264 msgstr "skapa reflogg för ny gren"

4265

4192 -#: builtin/checkout.c:1140

4266 +#: builtin/checkout.c:1142

4267 msgid "detach the HEAD at named commit"

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

4269

4196 -#: builtin/checkout.c:1141

4270 +#: builtin/checkout.c:1143

4271 msgid "set upstream info for new branch"

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

4273

4200 -#: builtin/checkout.c:1143

4274 +#: builtin/checkout.c:1145

4275 msgid "new-branch"

4276 msgstr "ny-gren"

4277

4204 -#: builtin/checkout.c:1143

4278 +#: builtin/checkout.c:1145

4279 msgid "new unparented branch"

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

4281

4208 -#: builtin/checkout.c:1144

4282 +#: builtin/checkout.c:1146

4283 msgid "checkout our version for unmerged files"

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

4285

4212 -#: builtin/checkout.c:1146

4286 +#: builtin/checkout.c:1148

4287 msgid "checkout their version for unmerged files"

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

4289

4216 -#: builtin/checkout.c:1148

4290 +#: builtin/checkout.c:1150

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

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

4293

4220 -#: builtin/checkout.c:1149

4294 +#: builtin/checkout.c:1151

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

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

4297

4224 -#: builtin/checkout.c:1150 builtin/merge.c:227

4298 +#: builtin/checkout.c:1152 builtin/merge.c:227

4299 msgid "update ignored files (default)"

4300 msgstr "uppdatera ignorerade filer (standard)"

4301

4228 -#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250

4302 +#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250

4303 msgid "style"

4304 msgstr "stil"

4305

4232 -#: builtin/checkout.c:1152

4306 +#: builtin/checkout.c:1154

4307 msgid "conflict style (merge or diff3)"

4308 msgstr "konfliktstil (merge eller diff3)"

4309

4236 -#: builtin/checkout.c:1155

4310 +#: builtin/checkout.c:1157

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

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

4313

4240 -#: builtin/checkout.c:1157

4314 +#: builtin/checkout.c:1159

4315 msgid "second guess 'git checkout <no-such-branch>'"

4316 msgstr "förutspå \"git checkout <gren-saknas>\""

4317

4244 -#: builtin/checkout.c:1159

4318 +#: builtin/checkout.c:1161

4319 msgid "do not check if another worktree is holding the given ref"

4320 msgstr ""

4321 "kontrollera inte om en annan arbetskatalog håller den angivna referensen"

4322

4249 -#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112

4250 -#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558

4323 +#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116

4324 +#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526

4325 #: builtin/send-pack.c:168

4326 msgid "force progress reporting"

4327 msgstr "tvinga förloppsrapportering"

4328

4255 -#: builtin/checkout.c:1191

4329 +#: builtin/checkout.c:1193

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

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

4332

4259 -#: builtin/checkout.c:1208

4333 +#: builtin/checkout.c:1210

4334 msgid "--track needs a branch name"

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

4336

4263 -#: builtin/checkout.c:1213

4337 +#: builtin/checkout.c:1215

4338 msgid "Missing branch name; try -b"

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

4340

4267 -#: builtin/checkout.c:1249

4341 +#: builtin/checkout.c:1251

4342 msgid "invalid path specification"

4343 msgstr "felaktig sökvägsangivelse"

4344

4271 -#: builtin/checkout.c:1256

4345 +#: builtin/checkout.c:1258

4346 #, c-format

4347 msgid ""

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

@@ -4277,12 +4351,12 @@ msgstr ""

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

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

4353

4280 -#: builtin/checkout.c:1261

4354 +#: builtin/checkout.c:1263

4355 #, c-format

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

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

4358

4285 -#: builtin/checkout.c:1265

4359 +#: builtin/checkout.c:1267

4360 msgid ""

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

4362 "checking out of the index."

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

4396 msgid "failed to remove %s"

4397 msgstr "misslyckades ta bort %s"

4398

4325 -#: builtin/clean.c:315

4399 +#: builtin/clean.c:291

4400 msgid ""

4401 "Prompt help:\n"

4402 "1 - select a numbered item\n"

@@ -4334,7 +4408,7 @@ msgstr ""

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

4409 " - (tomt) markera ingenting"

4410

4337 -#: builtin/clean.c:319

4411 +#: builtin/clean.c:295

4412 msgid ""

4413 "Prompt help:\n"

4414 "1 - select a single item\n"

@@ -4354,36 +4428,36 @@ msgstr ""

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

4429 " - (tomt) avsluta markering"

4430

4357 -#: builtin/clean.c:535

4431 +#: builtin/clean.c:511

4432 #, c-format

4433 msgid "Huh (%s)?"

4434 msgstr "Vadå (%s)?"

4435

4362 -#: builtin/clean.c:677

4436 +#: builtin/clean.c:653

4437 #, c-format

4438 msgid "Input ignore patterns>> "

4439 msgstr "Ange ignoreringsmönster>>"

4440

4367 -#: builtin/clean.c:714

4441 +#: builtin/clean.c:690

4442 #, c-format

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

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

4445

4372 -#: builtin/clean.c:735

4446 +#: builtin/clean.c:711

4447 msgid "Select items to delete"

4448 msgstr "Välj poster att ta bort"

4449

4450 #. TRANSLATORS: Make sure to keep [y/N] as is

4377 -#: builtin/clean.c:776

4451 +#: builtin/clean.c:752

4452 #, c-format

4453 msgid "Remove %s [y/N]? "

4454 msgstr "Ta bort %s [Y=ja / N=nej]?"

4455

4382 -#: builtin/clean.c:801

4456 +#: builtin/clean.c:777

4457 msgid "Bye."

4458 msgstr "Hej då."

4459

4386 -#: builtin/clean.c:809

4460 +#: builtin/clean.c:785

4461 msgid ""

4462 "clean - start cleaning\n"

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

@@ -4401,62 +4475,62 @@ msgstr ""

4475 "help - denna skärm\n"

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

4477

4404 -#: builtin/clean.c:836

4478 +#: builtin/clean.c:812

4479 msgid "*** Commands ***"

4480 msgstr "*** Kommandon ***"

4481

4408 -#: builtin/clean.c:837

4482 +#: builtin/clean.c:813

4483 msgid "What now"

4484 msgstr "Vad nu"

4485

4412 -#: builtin/clean.c:845

4486 +#: builtin/clean.c:821

4487 msgid "Would remove the following item:"

4488 msgid_plural "Would remove the following items:"

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

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

4491

4418 -#: builtin/clean.c:862

4492 +#: builtin/clean.c:838

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

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

4495

4422 -#: builtin/clean.c:893

4496 +#: builtin/clean.c:869

4497 msgid "do not print names of files removed"

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

4499

4426 -#: builtin/clean.c:895

4500 +#: builtin/clean.c:871

4501 msgid "force"

4502 msgstr "tvinga"

4503

4430 -#: builtin/clean.c:896

4504 +#: builtin/clean.c:872

4505 msgid "interactive cleaning"

4506 msgstr "städa interaktivt"

4507

4434 -#: builtin/clean.c:898

4508 +#: builtin/clean.c:874

4509 msgid "remove whole directories"

4510 msgstr "ta bort hela kataloger"

4511

4438 -#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709

4439 -#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182

4512 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722

4513 +#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182

4514 msgid "pattern"

4515 msgstr "mönster"

4516

4443 -#: builtin/clean.c:900

4517 +#: builtin/clean.c:876

4518 msgid "add <pattern> to ignore rules"

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

4520

4447 -#: builtin/clean.c:901

4521 +#: builtin/clean.c:877

4522 msgid "remove ignored files, too"

4523 msgstr "ta även bort ignorerade filer"

4524

4451 -#: builtin/clean.c:903

4525 +#: builtin/clean.c:879

4526 msgid "remove only ignored files"

4527 msgstr "ta endast bort ignorerade filer"

4528

4455 -#: builtin/clean.c:921

4529 +#: builtin/clean.c:897

4530 msgid "-x and -X cannot be used together"

4531 msgstr "-x och -X kan inte användas samtidigt"

4532

4459 -#: builtin/clean.c:925

4533 +#: builtin/clean.c:901

4534 msgid ""

4535 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

4536 "clean"

@@ -4464,7 +4538,7 @@ msgstr ""

4538 "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "

4539 "städa"

4540

4467 -#: builtin/clean.c:928

4541 +#: builtin/clean.c:904

4542 msgid ""

4543 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

4544 "refusing to clean"

@@ -4476,146 +4550,154 @@ msgstr ""

4550 msgid "git clone [<options>] [--] <repo> [<dir>]"

4551 msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"

4552

4479 -#: builtin/clone.c:59

4553 +#: builtin/clone.c:60

4554 msgid "don't create a checkout"

4555 msgstr "skapa inte någon utcheckning"

4556

4483 -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469

4557 +#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469

4558 msgid "create a bare repository"

4559 msgstr "skapa ett naket (\"bare\") arkiv"

4560

4487 -#: builtin/clone.c:64

4561 +#: builtin/clone.c:65

4562 msgid "create a mirror repository (implies bare)"

4563 msgstr "skapa ett spegelarkiv (implicerar \"bare\")"

4564

4491 -#: builtin/clone.c:66

4565 +#: builtin/clone.c:67

4566 msgid "to clone from a local repository"

4567 msgstr "för att klona från ett lokalt arkiv"

4568

4495 -#: builtin/clone.c:68

4569 +#: builtin/clone.c:69

4570 msgid "don't use local hardlinks, always copy"

4571 msgstr "skapa inte lokala hårda länkar, kopiera alltid"

4572

4499 -#: builtin/clone.c:70

4573 +#: builtin/clone.c:71

4574 msgid "setup as shared repository"

4575 msgstr "skapa som ett delat arkiv"

4576

4503 -#: builtin/clone.c:72 builtin/clone.c:74

4577 +#: builtin/clone.c:73 builtin/clone.c:75

4578 msgid "initialize submodules in the clone"

4579 msgstr "initiera undermoduler i klonen"

4580

4507 -#: builtin/clone.c:75 builtin/init-db.c:466

4581 +#: builtin/clone.c:76 builtin/init-db.c:466

4582 msgid "template-directory"

4583 msgstr "mallkatalog"

4584

4511 -#: builtin/clone.c:76 builtin/init-db.c:467

4585 +#: builtin/clone.c:77 builtin/init-db.c:467

4586 msgid "directory from which templates will be used"

4587 msgstr "katalog att använda mallar från"

4588

4515 -#: builtin/clone.c:78 builtin/submodule--helper.c:179

4589 +#: builtin/clone.c:79 builtin/submodule--helper.c:173

4590 msgid "reference repository"

4591 msgstr "referensarkiv"

4592

4519 -#: builtin/clone.c:80

4593 +#: builtin/clone.c:81

4594 msgid "use --reference only while cloning"

4595 msgstr "använd --reference endast under kloningen"

4596

4523 -#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44

4597 +#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44

4598 msgid "name"

4599 msgstr "namn"

4600

4527 -#: builtin/clone.c:82

4601 +#: builtin/clone.c:83

4602 msgid "use <name> instead of 'origin' to track upstream"

4603 msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"

4604

4531 -#: builtin/clone.c:84

4605 +#: builtin/clone.c:85

4606 msgid "checkout <branch> instead of the remote's HEAD"

4607 msgstr "checka ut <gren> istället för fjärrens HEAD"

4608

4535 -#: builtin/clone.c:86

4609 +#: builtin/clone.c:87

4610 msgid "path to git-upload-pack on the remote"

4611 msgstr "sökväg till git-upload-pack på fjärren"

4612

4539 -#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654

4540 -#: builtin/pull.c:186

4613 +#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665

4614 +#: builtin/pull.c:193

4615 msgid "depth"

4616 msgstr "djup"

4617

4544 -#: builtin/clone.c:88

4618 +#: builtin/clone.c:89

4619 msgid "create a shallow clone of that depth"

4620 msgstr "skapa en grund klon på detta djup"

4621

4548 -#: builtin/clone.c:90

4622 +#: builtin/clone.c:91

4623 msgid "clone only one branch, HEAD or --branch"

4624 msgstr "klona endast en gren, HEAD eller --branch"

4625

4552 -#: builtin/clone.c:91 builtin/init-db.c:475

4626 +#: builtin/clone.c:92 builtin/init-db.c:475

4627 msgid "gitdir"

4628 msgstr "gitkat"

4629

4556 -#: builtin/clone.c:92 builtin/init-db.c:476

4630 +#: builtin/clone.c:93 builtin/init-db.c:476

4631 msgid "separate git dir from working tree"

4632 msgstr "separera gitkatalogen från arbetskatalogen"

4633

4560 -#: builtin/clone.c:93

4634 +#: builtin/clone.c:94

4635 msgid "key=value"

4636 msgstr "nyckel=värde"

4637

4564 -#: builtin/clone.c:94

4638 +#: builtin/clone.c:95

4639 msgid "set config inside the new repository"

4640 msgstr "ställ in konfiguration i det nya arkivet"

4641

4568 -#: builtin/clone.c:300

4642 +#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536

4643 +msgid "use IPv4 addresses only"

4644 +msgstr "använd endast IPv4-adresser"

4645 +

4646 +#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538

4647 +msgid "use IPv6 addresses only"

4648 +msgstr "använd endast IPv6-adresser"

4649 +

4650 +#: builtin/clone.c:305

4651 #, c-format

4652 msgid "reference repository '%s' as a linked checkout is not supported yet."

4653 msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."

4654

4573 -#: builtin/clone.c:302

4655 +#: builtin/clone.c:307

4656 #, c-format

4657 msgid "reference repository '%s' is not a local repository."

4658 msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."

4659

4578 -#: builtin/clone.c:307

4660 +#: builtin/clone.c:312

4661 #, c-format

4662 msgid "reference repository '%s' is shallow"

4663 msgstr "referensarkivet \"%s\" är grunt"

4664

4583 -#: builtin/clone.c:310

4665 +#: builtin/clone.c:315

4666 #, c-format

4667 msgid "reference repository '%s' is grafted"

4668 msgstr "referensarkivet \"%s\" är ympat"

4669

4588 -#: builtin/clone.c:375 builtin/diff.c:84

4670 +#: builtin/clone.c:380 builtin/diff.c:84

4671 #, c-format

4672 msgid "failed to stat '%s'"

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

4674

4593 -#: builtin/clone.c:377

4675 +#: builtin/clone.c:382

4676 #, c-format

4677 msgid "%s exists and is not a directory"

4678 msgstr "%s finns och är ingen katalog"

4679

4598 -#: builtin/clone.c:391

4680 +#: builtin/clone.c:396

4681 #, c-format

4682 msgid "failed to stat %s\n"

4683 msgstr "misslyckades ta status på %s\n"

4684

4603 -#: builtin/clone.c:413

4685 +#: builtin/clone.c:418

4686 #, c-format

4687 msgid "failed to create link '%s'"

4688 msgstr "misslyckades skapa länken \"%s\""

4689

4608 -#: builtin/clone.c:417

4690 +#: builtin/clone.c:422

4691 #, c-format

4692 msgid "failed to copy file to '%s'"

4693 msgstr "misslyckades kopiera filen till \"%s\""

4694

4613 -#: builtin/clone.c:442 builtin/clone.c:626

4695 +#: builtin/clone.c:447 builtin/clone.c:631

4696 #, c-format

4697 msgid "done.\n"

4698 msgstr "klart.\n"

4699

4618 -#: builtin/clone.c:454

4700 +#: builtin/clone.c:459

4701 msgid ""

4702 "Clone succeeded, but checkout failed.\n"

4703 "You can inspect what was checked out with 'git status'\n"

@@ -4625,120 +4707,120 @@ msgstr ""

4707 "Du kan inspektera det som checkades ut med \"git status\"\n"

4708 "och försöka checka ut igen med \"git checkout -f HEAD\"\n"

4709

4628 -#: builtin/clone.c:531

4710 +#: builtin/clone.c:536

4711 #, c-format

4712 msgid "Could not find remote branch %s to clone."

4713 msgstr "Kunde inte hitta fjärrgrenen %s för att klona."

4714

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

4716 # objects downloaded.

4635 -#: builtin/clone.c:621

4717 +#: builtin/clone.c:626

4718 #, c-format

4719 msgid "Checking connectivity... "

4720 msgstr "Kontrollerar om vi fick alla objekt..."

4721

4640 -#: builtin/clone.c:624

4722 +#: builtin/clone.c:629

4723 msgid "remote did not send all necessary objects"

4724 msgstr "fjärren sände inte alla nödvändiga objekt"

4725

4644 -#: builtin/clone.c:688

4726 +#: builtin/clone.c:696

4727 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

4728 msgstr ""

4729 "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"

4730

4649 -#: builtin/clone.c:719

4731 +#: builtin/clone.c:727

4732 msgid "unable to checkout working tree"

4733 msgstr "kunde inte checka ut arbetskatalogen"

4734

4653 -#: builtin/clone.c:808

4735 +#: builtin/clone.c:816

4736 msgid "cannot repack to clean up"

4737 msgstr "kan inte packa om för att städa upp"

4738

4657 -#: builtin/clone.c:810

4739 +#: builtin/clone.c:818

4740 msgid "cannot unlink temporary alternates file"

4741 msgstr "kunde inte ta bort temporär \"alternates\"-fil"

4742

4661 -#: builtin/clone.c:842

4743 +#: builtin/clone.c:850

4744 msgid "Too many arguments."

4745 msgstr "För många argument."

4746

4665 -#: builtin/clone.c:846

4747 +#: builtin/clone.c:854

4748 msgid "You must specify a repository to clone."

4749 msgstr "Du måste ange ett arkiv att klona."

4750

4669 -#: builtin/clone.c:857

4751 +#: builtin/clone.c:865

4752 #, c-format

4753 msgid "--bare and --origin %s options are incompatible."

4754 msgstr "flaggorna --bare och --origin %s är inkompatibla."

4755

4674 -#: builtin/clone.c:860

4756 +#: builtin/clone.c:868

4757 msgid "--bare and --separate-git-dir are incompatible."

4758 msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."

4759

4678 -#: builtin/clone.c:873

4760 +#: builtin/clone.c:881

4761 #, c-format

4762 msgid "repository '%s' does not exist"

4763 msgstr "arkivet \"%s\" finns inte"

4764

4683 -#: builtin/clone.c:879 builtin/fetch.c:1166

4765 +#: builtin/clone.c:887 builtin/fetch.c:1174

4766 #, c-format

4767 msgid "depth %s is not a positive number"

4768 msgstr "djupet %s är inte ett positivt tal"

4769

4688 -#: builtin/clone.c:889

4770 +#: builtin/clone.c:897

4771 #, c-format

4772 msgid "destination path '%s' already exists and is not an empty directory."

4773 msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."

4774

4693 -#: builtin/clone.c:899

4775 +#: builtin/clone.c:907

4776 #, c-format

4777 msgid "working tree '%s' already exists."

4778 msgstr "arbetsträdet \"%s\" finns redan."

4779

4698 -#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224

4699 -#: builtin/worktree.c:221 builtin/worktree.c:248

4780 +#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218

4781 +#: builtin/worktree.c:219 builtin/worktree.c:246

4782 #, c-format

4783 msgid "could not create leading directories of '%s'"

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

4785

4704 -#: builtin/clone.c:917

4786 +#: builtin/clone.c:925

4787 #, c-format

4788 msgid "could not create work tree dir '%s'"

4789 msgstr "kunde inte skapa arbetskatalogen \"%s\""

4790

4709 -#: builtin/clone.c:935

4791 +#: builtin/clone.c:943

4792 #, c-format

4793 msgid "Cloning into bare repository '%s'...\n"

4794 msgstr "Klonar till ett naket arkiv \"%s\"...\n"

4795

4714 -#: builtin/clone.c:937

4796 +#: builtin/clone.c:945

4797 #, c-format

4798 msgid "Cloning into '%s'...\n"

4799 msgstr "Klonar till \"%s\"...\n"

4800

4719 -#: builtin/clone.c:975

4801 +#: builtin/clone.c:984

4802 msgid "--depth is ignored in local clones; use file:// instead."

4803 msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"

4804

4723 -#: builtin/clone.c:978

4805 +#: builtin/clone.c:987

4806 msgid "source repository is shallow, ignoring --local"

4807 msgstr "källarkivet är grunt, ignorerar --local"

4808

4727 -#: builtin/clone.c:983

4809 +#: builtin/clone.c:992

4810 msgid "--local is ignored"

4811 msgstr "--local ignoreras"

4812

4731 -#: builtin/clone.c:987

4813 +#: builtin/clone.c:996

4814 #, c-format

4815 msgid "Don't know how to clone %s"

4816 msgstr "Vet inte hur man klonar %s"

4817

4736 -#: builtin/clone.c:1036 builtin/clone.c:1044

4818 +#: builtin/clone.c:1045 builtin/clone.c:1053

4819 #, c-format

4820 msgid "Remote branch %s not found in upstream %s"

4821 msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"

4822

4741 -#: builtin/clone.c:1047

4823 +#: builtin/clone.c:1056

4824 msgid "You appear to have cloned an empty repository."

4825 msgstr "Du verkar ha klonat ett tomt arkiv."

4826

@@ -4950,7 +5032,7 @@ msgstr ""

5032 msgid "could not lookup commit %s"

5033 msgstr "kunde inte slå upp incheckningen %s"

5034

4953 -#: builtin/commit.c:702 builtin/shortlog.c:273

5035 +#: builtin/commit.c:702 builtin/shortlog.c:285

5036 #, c-format

5037 msgid "(reading log message from standard input)\n"

5038 msgstr "(läser loggmeddelande från standard in)\n"

@@ -5136,8 +5218,8 @@ msgstr "visa koncis status"

5218 msgid "show branch information"

5219 msgstr "visa information om gren"

5220

5139 -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544

5140 -#: builtin/worktree.c:423

5221 +#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512

5222 +#: builtin/worktree.c:430

5223 msgid "machine-readable output"

5224 msgstr "maskinläsbar utdata"

5225

@@ -5226,8 +5308,8 @@ msgstr "datum"

5308 msgid "override date for commit"

5309 msgstr "överstyr datum för incheckningen"

5310

5229 -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392

5230 -#: builtin/notes.c:555 builtin/tag.c:349

5311 +#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395

5312 +#: builtin/notes.c:558 builtin/tag.c:349

5313 msgid "message"

5314 msgstr "meddelande"

5315

@@ -5263,7 +5345,7 @@ msgstr ""

5345 msgid "the commit is authored by me now (used with -C/-c/--amend)"

5346 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"

5347

5266 -#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86

5348 +#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86

5349 msgid "add Signed-off-by:"

5350 msgstr "lägg till Signed-off-by:"

5351

@@ -5287,7 +5369,7 @@ msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

5369 msgid "include status in commit message template"

5370 msgstr "inkludera status i mallen för incheckningsmeddelandet"

5371

5290 -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156

5372 +#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160

5373 #: builtin/revert.c:93

5374 msgid "GPG sign commit"

5375 msgstr "GPG-signera incheckning"

@@ -5379,139 +5461,143 @@ msgstr ""

5461 "att kvoten inte har överskridits, och kör sedan\n"

5462 "\"git reset HEAD\" för att återställa."

5463

5382 -#: builtin/config.c:8

5464 +#: builtin/config.c:9

5465 msgid "git config [<options>]"

5466 msgstr "git config [<flaggor>]"

5467

5386 -#: builtin/config.c:54

5468 +#: builtin/config.c:56

5469 msgid "Config file location"

5470 msgstr "Konfigurationsfilens plats"

5471

5390 -#: builtin/config.c:55

5472 +#: builtin/config.c:57

5473 msgid "use global config file"

5474 msgstr "använd global konfigurationsfil"

5475

5394 -#: builtin/config.c:56

5476 +#: builtin/config.c:58

5477 msgid "use system config file"

5478 msgstr "använd systemets konfigurationsfil"

5479

5398 -#: builtin/config.c:57

5480 +#: builtin/config.c:59

5481 msgid "use repository config file"

5482 msgstr "använd arkivets konfigurationsfil"

5483

5402 -#: builtin/config.c:58

5484 +#: builtin/config.c:60

5485 msgid "use given config file"

5486 msgstr "använd angiven konfigurationsfil"

5487

5406 -#: builtin/config.c:59

5488 +#: builtin/config.c:61

5489 msgid "blob-id"

5490 msgstr "blob-id"

5491

5410 -#: builtin/config.c:59

5492 +#: builtin/config.c:61

5493 msgid "read config from given blob object"

5494 msgstr "läs konfiguration från givet blob-objekt"

5495

5414 -#: builtin/config.c:60

5496 +#: builtin/config.c:62

5497 msgid "Action"

5498 msgstr "Åtgärd"

5499

5418 -#: builtin/config.c:61

5500 +#: builtin/config.c:63

5501 msgid "get value: name [value-regex]"

5502 msgstr "hämta värde: namn [värde-reguttr]"

5503

5422 -#: builtin/config.c:62

5504 +#: builtin/config.c:64

5505 msgid "get all values: key [value-regex]"

5506 msgstr "hämta alla värden: nyckel [värde-reguttr]"

5507

5426 -#: builtin/config.c:63

5508 +#: builtin/config.c:65

5509 msgid "get values for regexp: name-regex [value-regex]"

5510 msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]"

5511

5430 -#: builtin/config.c:64

5512 +#: builtin/config.c:66

5513 msgid "get value specific for the URL: section[.var] URL"

5514 msgstr "hämta värde specifikt URL:en: sektion[.var] URL"

5515

5434 -#: builtin/config.c:65

5516 +#: builtin/config.c:67

5517 msgid "replace all matching variables: name value [value_regex]"

5518 msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"

5519

5438 -#: builtin/config.c:66

5520 +#: builtin/config.c:68

5521 msgid "add a new variable: name value"

5522 msgstr "lägg till en ny variabel: namn värde"

5523

5442 -#: builtin/config.c:67

5524 +#: builtin/config.c:69

5525 msgid "remove a variable: name [value-regex]"

5526 msgstr "ta bort en variabel: namn [värde-reguttr]"

5527

5446 -#: builtin/config.c:68

5528 +#: builtin/config.c:70

5529 msgid "remove all matches: name [value-regex]"

5530 msgstr "ta bort alla träffar: namn [värde-reguttr]"

5531

5450 -#: builtin/config.c:69

5532 +#: builtin/config.c:71

5533 msgid "rename section: old-name new-name"

5534 msgstr "byt namn på sektion: gammalt-namn nytt-namn"

5535

5454 -#: builtin/config.c:70

5536 +#: builtin/config.c:72

5537 msgid "remove a section: name"

5538 msgstr "ta bort en sektion: namn"

5539

5458 -#: builtin/config.c:71

5540 +#: builtin/config.c:73

5541 msgid "list all"

5542 msgstr "visa alla"

5543

5462 -#: builtin/config.c:72

5544 +#: builtin/config.c:74

5545 msgid "open an editor"

5546 msgstr "öppna textredigeringsprogram"

5547

5466 -#: builtin/config.c:73

5548 +#: builtin/config.c:75

5549 msgid "find the color configured: slot [default]"

5550 msgstr "hitta den inställda färgen: slot [default]"

5551

5470 -#: builtin/config.c:74

5552 +#: builtin/config.c:76

5553 msgid "find the color setting: slot [stdout-is-tty]"

5554 msgstr "hitta färginställningen: slot [stdout-is-tty]"

5555

5474 -#: builtin/config.c:75

5556 +#: builtin/config.c:77

5557 msgid "Type"

5558 msgstr "Typ"

5559

5478 -#: builtin/config.c:76

5560 +#: builtin/config.c:78

5561 msgid "value is \"true\" or \"false\""

5562 msgstr "värdet är \"true\" eller \"false\""

5563

5482 -#: builtin/config.c:77

5564 +#: builtin/config.c:79

5565 msgid "value is decimal number"

5566 msgstr "värdet är ett decimalt tal"

5567

5486 -#: builtin/config.c:78

5568 +#: builtin/config.c:80

5569 msgid "value is --bool or --int"

5570 msgstr "värdet är --bool eller --int"

5571

5490 -#: builtin/config.c:79

5572 +#: builtin/config.c:81

5573 msgid "value is a path (file or directory name)"

5574 msgstr "värdet är en sökväg (fil- eller katalognamn)"

5575

5494 -#: builtin/config.c:80

5576 +#: builtin/config.c:82

5577 msgid "Other"

5578 msgstr "Andra"

5579

5498 -#: builtin/config.c:81

5580 +#: builtin/config.c:83

5581 msgid "terminate values with NUL byte"

5582 msgstr "terminera värden med NUL-byte"

5583

5502 -#: builtin/config.c:82

5584 +#: builtin/config.c:84

5585 msgid "show variable names only"

5586 msgstr "visa endast variabelnamn"

5587

5506 -#: builtin/config.c:83

5588 +#: builtin/config.c:85

5589 msgid "respect include directives on lookup"

5590 msgstr "respektera inkluderingsdirektiv vid uppslag"

5591

5510 -#: builtin/config.c:303

5592 +#: builtin/config.c:86

5593 +msgid "show origin of config (file, standard input, blob, command line)"

5594 +msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"

5595 +

5596 +#: builtin/config.c:328

5597 msgid "unable to parse default color value"

5598 msgstr "kan inte tolka standardfärgvärde"

5599

5514 -#: builtin/config.c:441

5600 +#: builtin/config.c:469

5601 #, c-format

5602 msgid ""

5603 "# This is Git's per-user configuration file.\n"

@@ -5526,7 +5612,7 @@ msgstr ""

5612 "#\tname = %s\n"

5613 "#\temail = %s\n"

5614

5529 -#: builtin/config.c:575

5615 +#: builtin/config.c:611

5616 #, c-format

5617 msgid "cannot create configuration file %s"

5618 msgstr "kan inte skapa konfigurationsfilen \"%s\""

@@ -5776,161 +5862,165 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"

5862 msgid "git fetch --all [<options>]"

5863 msgstr "git fetch --all [<flaggor>]"

5864

5779 -#: builtin/fetch.c:90 builtin/pull.c:162

5865 +#: builtin/fetch.c:92 builtin/pull.c:166

5866 msgid "fetch from all remotes"

5867 msgstr "hämta från alla fjärrar"

5868

5783 -#: builtin/fetch.c:92 builtin/pull.c:165

5869 +#: builtin/fetch.c:94 builtin/pull.c:169

5870 msgid "append to .git/FETCH_HEAD instead of overwriting"

5871 msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"

5872

5787 -#: builtin/fetch.c:94 builtin/pull.c:168

5873 +#: builtin/fetch.c:96 builtin/pull.c:172

5874 msgid "path to upload pack on remote end"

5875 msgstr "sökväg till upload pack på fjärren"

5876

5791 -#: builtin/fetch.c:95 builtin/pull.c:170

5877 +#: builtin/fetch.c:97 builtin/pull.c:174

5878 msgid "force overwrite of local branch"

5879 msgstr "tvinga överskrivning av lokal gren"

5880

5795 -#: builtin/fetch.c:97

5881 +#: builtin/fetch.c:99

5882 msgid "fetch from multiple remotes"

5883 msgstr "hämta från flera fjärrar"

5884

5799 -#: builtin/fetch.c:99 builtin/pull.c:172

5885 +#: builtin/fetch.c:101 builtin/pull.c:176

5886 msgid "fetch all tags and associated objects"

5887 msgstr "hämta alla taggar och associerade objekt"

5888

5803 -#: builtin/fetch.c:101

5889 +#: builtin/fetch.c:103

5890 msgid "do not fetch all tags (--no-tags)"

5891 msgstr "hämta inte alla taggar (--no-tags)"

5892

5807 -#: builtin/fetch.c:103 builtin/pull.c:175

5893 +#: builtin/fetch.c:105

5894 +msgid "number of submodules fetched in parallel"

5895 +msgstr "antal undermoduler som hämtas parallellt"

5896 +

5897 +#: builtin/fetch.c:107 builtin/pull.c:179

5898 msgid "prune remote-tracking branches no longer on remote"

5899 msgstr "rensa fjärrspårande grenar ej längre på fjärren"

5900

5811 -#: builtin/fetch.c:104 builtin/pull.c:178

5901 +#: builtin/fetch.c:108 builtin/pull.c:182

5902 msgid "on-demand"

5903 msgstr "on-demand"

5904

5815 -#: builtin/fetch.c:105 builtin/pull.c:179

5905 +#: builtin/fetch.c:109 builtin/pull.c:183

5906 msgid "control recursive fetching of submodules"

5907 msgstr "styr rekursiv hämtning av undermoduler"

5908

5819 -#: builtin/fetch.c:109 builtin/pull.c:184

5909 +#: builtin/fetch.c:113 builtin/pull.c:191

5910 msgid "keep downloaded pack"

5911 msgstr "behåll hämtade paket"

5912

5823 -#: builtin/fetch.c:111

5913 +#: builtin/fetch.c:115

5914 msgid "allow updating of HEAD ref"

5915 msgstr "tillåt uppdatering av HEAD-referens"

5916

5827 -#: builtin/fetch.c:114 builtin/pull.c:187

5917 +#: builtin/fetch.c:118 builtin/pull.c:194

5918 msgid "deepen history of shallow clone"

5919 msgstr "fördjupa historik för grund klon"

5920

5831 -#: builtin/fetch.c:116 builtin/pull.c:190

5921 +#: builtin/fetch.c:120 builtin/pull.c:197

5922 msgid "convert to a complete repository"

5923 msgstr "konvertera till komplett arkiv"

5924

5835 -#: builtin/fetch.c:118 builtin/log.c:1233

5925 +#: builtin/fetch.c:122 builtin/log.c:1236

5926 msgid "dir"

5927 msgstr "kat"

5928

5839 -#: builtin/fetch.c:119

5929 +#: builtin/fetch.c:123

5930 msgid "prepend this to submodule path output"

5931 msgstr "lägg till i början av undermodulens sökvägsutdata"

5932

5843 -#: builtin/fetch.c:122

5933 +#: builtin/fetch.c:126

5934 msgid "default mode for recursion"

5935 msgstr "standardläge för rekursion"

5936

5847 -#: builtin/fetch.c:124 builtin/pull.c:193

5937 +#: builtin/fetch.c:128 builtin/pull.c:200

5938 msgid "accept refs that update .git/shallow"

5939 msgstr "tar emot referenser som uppdaterar .git/shallow"

5940

5851 -#: builtin/fetch.c:125 builtin/pull.c:195

5941 +#: builtin/fetch.c:129 builtin/pull.c:202

5942 msgid "refmap"

5943 msgstr "referenskarta"

5944

5855 -#: builtin/fetch.c:126 builtin/pull.c:196

5945 +#: builtin/fetch.c:130 builtin/pull.c:203

5946 msgid "specify fetch refmap"

5947 msgstr "ange referenskarta för \"fetch\""

5948

5859 -#: builtin/fetch.c:378

5949 +#: builtin/fetch.c:386

5950 msgid "Couldn't find remote ref HEAD"

5951 msgstr "Kunde inte hitta fjärr-referensen HEAD"

5952

5863 -#: builtin/fetch.c:458

5953 +#: builtin/fetch.c:466

5954 #, c-format

5955 msgid "object %s not found"

5956 msgstr "objektet %s hittades inte"

5957

5868 -#: builtin/fetch.c:463

5958 +#: builtin/fetch.c:471

5959 msgid "[up to date]"

5960 msgstr "[àjour]"

5961

5872 -#: builtin/fetch.c:477

5962 +#: builtin/fetch.c:485

5963 #, c-format

5964 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5965 msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)"

5966

5877 -#: builtin/fetch.c:478 builtin/fetch.c:566

5967 +#: builtin/fetch.c:486 builtin/fetch.c:574

5968 msgid "[rejected]"

5969 msgstr "[refuserad]"

5970

5881 -#: builtin/fetch.c:489

5971 +#: builtin/fetch.c:497

5972 msgid "[tag update]"

5973 msgstr "[uppdaterad tagg]"

5974

5885 -#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544

5975 +#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552

5976 msgid " (unable to update local ref)"

5977 msgstr " (kunde inte uppdatera lokal ref)"

5978

5889 -#: builtin/fetch.c:509

5979 +#: builtin/fetch.c:517

5980 msgid "[new tag]"

5981 msgstr "[ny tagg]"

5982

5893 -#: builtin/fetch.c:512

5983 +#: builtin/fetch.c:520

5984 msgid "[new branch]"

5985 msgstr "[ny gren]"

5986

5897 -#: builtin/fetch.c:515

5987 +#: builtin/fetch.c:523

5988 msgid "[new ref]"

5989 msgstr "[ny ref]"

5990

5901 -#: builtin/fetch.c:561

5991 +#: builtin/fetch.c:569

5992 msgid "unable to update local ref"

5993 msgstr "kunde inte uppdatera lokal ref"

5994

5905 -#: builtin/fetch.c:561

5995 +#: builtin/fetch.c:569

5996 msgid "forced update"

5997 msgstr "tvingad uppdatering"

5998

5909 -#: builtin/fetch.c:568

5999 +#: builtin/fetch.c:576

6000 msgid "(non-fast-forward)"

6001 msgstr "(ej snabbspolad)"

6002

5913 -#: builtin/fetch.c:602 builtin/fetch.c:843

6003 +#: builtin/fetch.c:610 builtin/fetch.c:851

6004 #, c-format

6005 msgid "cannot open %s: %s\n"

6006 msgstr "kan inte öppna %s: %s\n"

6007

5918 -#: builtin/fetch.c:611

6008 +#: builtin/fetch.c:619

6009 #, c-format

6010 msgid "%s did not send all necessary objects\n"

6011 msgstr "%s sände inte alla nödvändiga objekt\n"

6012

5923 -#: builtin/fetch.c:629

6013 +#: builtin/fetch.c:637

6014 #, c-format

6015 msgid "reject %s because shallow roots are not allowed to be updated"

6016 msgstr "avvisa %s då grunda rötter inte kan uppdateras"

6017

5928 -#: builtin/fetch.c:716 builtin/fetch.c:808

6018 +#: builtin/fetch.c:724 builtin/fetch.c:816

6019 #, c-format

6020 msgid "From %.*s\n"

6021 msgstr "Från %.*s\n"

6022

5933 -#: builtin/fetch.c:727

6023 +#: builtin/fetch.c:735

6024 #, c-format

6025 msgid ""

6026 "some local refs could not be updated; try running\n"

@@ -5939,55 +6029,55 @@ msgstr ""

6029 "vissa lokala referenser kunde inte uppdateras; testa att köra\n"

6030 " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"

6031

5942 -#: builtin/fetch.c:779

6032 +#: builtin/fetch.c:787

6033 #, c-format

6034 msgid " (%s will become dangling)"

6035 msgstr " (%s kommer bli dinglande)"

6036

5947 -#: builtin/fetch.c:780

6037 +#: builtin/fetch.c:788

6038 #, c-format

6039 msgid " (%s has become dangling)"

6040 msgstr " (%s har blivit dinglande)"

6041

5952 -#: builtin/fetch.c:812

6042 +#: builtin/fetch.c:820

6043 msgid "[deleted]"

6044 msgstr "[borttagen]"

6045

5956 -#: builtin/fetch.c:813 builtin/remote.c:1040

6046 +#: builtin/fetch.c:821 builtin/remote.c:1025

6047 msgid "(none)"

6048 msgstr "(ingen)"

6049

5960 -#: builtin/fetch.c:833

6050 +#: builtin/fetch.c:841

6051 #, c-format

6052 msgid "Refusing to fetch into current branch %s of non-bare repository"

6053 msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"

6054

5965 -#: builtin/fetch.c:852

6055 +#: builtin/fetch.c:860

6056 #, c-format

6057 msgid "Option \"%s\" value \"%s\" is not valid for %s"

6058 msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"

6059

5970 -#: builtin/fetch.c:855

6060 +#: builtin/fetch.c:863

6061 #, c-format

6062 msgid "Option \"%s\" is ignored for %s\n"

6063 msgstr "Flaggan \"%s\" ignoreras för %s\n"

6064

5975 -#: builtin/fetch.c:911

6065 +#: builtin/fetch.c:920

6066 #, c-format

6067 msgid "Don't know how to fetch from %s"

6068 msgstr "Vet inte hur man hämtar från %s"

6069

5980 -#: builtin/fetch.c:1072

6070 +#: builtin/fetch.c:1080

6071 #, c-format

6072 msgid "Fetching %s\n"

6073 msgstr "Hämtar %s\n"

6074

5985 -#: builtin/fetch.c:1074 builtin/remote.c:96

6075 +#: builtin/fetch.c:1082 builtin/remote.c:96

6076 #, c-format

6077 msgid "Could not fetch %s"

6078 msgstr "Kunde inte hämta %s"

6079

5990 -#: builtin/fetch.c:1092

6080 +#: builtin/fetch.c:1100

6081 msgid ""

6082 "No remote repository specified. Please, specify either a URL or a\n"

6083 "remote name from which new revisions should be fetched."

@@ -5995,32 +6085,32 @@ msgstr ""

6085 "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"

6086 "fjärrarkiv som nya incheckningar skall hämtas från."

6087

5998 -#: builtin/fetch.c:1115

6088 +#: builtin/fetch.c:1123

6089 msgid "You need to specify a tag name."

6090 msgstr "Du måste ange namnet på en tagg."

6091

6002 -#: builtin/fetch.c:1157

6092 +#: builtin/fetch.c:1165

6093 msgid "--depth and --unshallow cannot be used together"

6094 msgstr "--depth och --unshallow kan inte användas samtidigt"

6095

6006 -#: builtin/fetch.c:1159

6096 +#: builtin/fetch.c:1167

6097 msgid "--unshallow on a complete repository does not make sense"

6098 msgstr "--unshallow kan inte användas på ett komplett arkiv"

6099

6010 -#: builtin/fetch.c:1179

6100 +#: builtin/fetch.c:1187

6101 msgid "fetch --all does not take a repository argument"

6102 msgstr "fetch --all tar inte namnet på ett arkiv som argument"

6103

6014 -#: builtin/fetch.c:1181

6104 +#: builtin/fetch.c:1189

6105 msgid "fetch --all does not make sense with refspecs"

6106 msgstr "fetch --all kan inte anges med referensspecifikationer"

6107

6018 -#: builtin/fetch.c:1192

6108 +#: builtin/fetch.c:1200

6109 #, c-format

6110 msgid "No such remote or remote group: %s"

6111 msgstr "Fjärren eller fjärrgruppen finns inte: %s"

6112

6023 -#: builtin/fetch.c:1200

6113 +#: builtin/fetch.c:1208

6114 msgid "Fetching a group and specifying refspecs does not make sense"

6115 msgstr "Kan inte hämta från grupp och ange referensspecifikationer"

6116

@@ -6249,224 +6339,238 @@ msgstr ""

6339 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"

6340 msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"

6341

6252 -#: builtin/grep.c:218

6342 +#: builtin/grep.c:219

6343 #, c-format

6344 msgid "grep: failed to create thread: %s"

6345 msgstr "grep: misslyckades skapa tråd. %s"

6346

6257 -#: builtin/grep.c:441 builtin/grep.c:476

6347 +#: builtin/grep.c:277

6348 +#, c-format

6349 +msgid "invalid number of threads specified (%d) for %s"

6350 +msgstr "felaktigt antal trådar angivet (%d) för %s"

6351 +

6352 +#: builtin/grep.c:452 builtin/grep.c:487

6353 #, c-format

6354 msgid "unable to read tree (%s)"

6355 msgstr "kunde inte läsa träd (%s)"

6356

6262 -#: builtin/grep.c:491

6357 +#: builtin/grep.c:502

6358 #, c-format

6359 msgid "unable to grep from object of type %s"

6360 msgstr "Kunde inte \"grep\" från objekt av typen %s"

6361

6267 -#: builtin/grep.c:547

6362 +#: builtin/grep.c:558

6363 #, c-format

6364 msgid "switch `%c' expects a numerical value"

6365 msgstr "flaggan \"%c\" antar ett numeriskt värde"

6366

6272 -#: builtin/grep.c:564

6367 +#: builtin/grep.c:575

6368 #, c-format

6369 msgid "cannot open '%s'"

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

6371

6277 -#: builtin/grep.c:633

6372 +#: builtin/grep.c:644

6373 msgid "search in index instead of in the work tree"

6374 msgstr "sök i indexet istället för i arbetskatalogen"

6375

6281 -#: builtin/grep.c:635

6376 +#: builtin/grep.c:646

6377 msgid "find in contents not managed by git"

6378 msgstr "sök i innehåll som inte hanteras av git"

6379

6285 -#: builtin/grep.c:637

6380 +#: builtin/grep.c:648

6381 msgid "search in both tracked and untracked files"

6382 msgstr "sök i både spårade och ospårade filer"

6383

6289 -#: builtin/grep.c:639

6384 +#: builtin/grep.c:650

6385 msgid "ignore files specified via '.gitignore'"

6386 msgstr "ignorera filer angivna i \".gitignore\""

6387

6293 -#: builtin/grep.c:642

6388 +#: builtin/grep.c:653

6389 msgid "show non-matching lines"

6390 msgstr "visa rader som inte träffas"

6391

6297 -#: builtin/grep.c:644

6392 +#: builtin/grep.c:655

6393 msgid "case insensitive matching"

6394 msgstr "skiftlägesokänslig sökning"

6395

6301 -#: builtin/grep.c:646

6396 +#: builtin/grep.c:657

6397 msgid "match patterns only at word boundaries"

6398 msgstr "matcha endast mönster vid ordgränser"

6399

6305 -#: builtin/grep.c:648

6400 +#: builtin/grep.c:659

6401 msgid "process binary files as text"

6402 msgstr "hantera binärfiler som text"

6403

6309 -#: builtin/grep.c:650

6404 +#: builtin/grep.c:661

6405 msgid "don't match patterns in binary files"

6406 msgstr "träffa inte mönster i binärfiler"

6407

6313 -#: builtin/grep.c:653

6408 +#: builtin/grep.c:664

6409 msgid "process binary files with textconv filters"

6410 msgstr "hantera binärfiler med textconv-filter"

6411

6317 -#: builtin/grep.c:655

6412 +#: builtin/grep.c:666

6413 msgid "descend at most <depth> levels"

6414 msgstr "gå som mest ned <djup> nivåer"

6415

6321 -#: builtin/grep.c:659

6416 +#: builtin/grep.c:670

6417 msgid "use extended POSIX regular expressions"

6418 msgstr "använd utökade POSIX-reguljära uttryck"

6419

6325 -#: builtin/grep.c:662

6420 +#: builtin/grep.c:673

6421 msgid "use basic POSIX regular expressions (default)"

6422 msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"

6423

6329 -#: builtin/grep.c:665

6424 +#: builtin/grep.c:676

6425 msgid "interpret patterns as fixed strings"

6426 msgstr "tolka mönster som fixerade strängar"

6427

6333 -#: builtin/grep.c:668

6428 +#: builtin/grep.c:679

6429 msgid "use Perl-compatible regular expressions"

6430 msgstr "använd Perlkompatibla reguljära uttryck"

6431

6337 -#: builtin/grep.c:671

6432 +#: builtin/grep.c:682

6433 msgid "show line numbers"

6434 msgstr "visa radnummer"

6435

6341 -#: builtin/grep.c:672

6436 +#: builtin/grep.c:683

6437 msgid "don't show filenames"

6438 msgstr "visa inte filnamn"

6439

6345 -#: builtin/grep.c:673

6440 +#: builtin/grep.c:684

6441 msgid "show filenames"

6442 msgstr "visa filnamn"

6443

6349 -#: builtin/grep.c:675

6444 +#: builtin/grep.c:686

6445 msgid "show filenames relative to top directory"

6446 msgstr "visa filnamn relativa till toppkatalogen"

6447

6353 -#: builtin/grep.c:677

6448 +#: builtin/grep.c:688

6449 msgid "show only filenames instead of matching lines"

6450 msgstr "visa endast filnamn istället för träffade rader"

6451

6357 -#: builtin/grep.c:679

6452 +#: builtin/grep.c:690

6453 msgid "synonym for --files-with-matches"

6454 msgstr "synonym för --files-with-matches"

6455

6361 -#: builtin/grep.c:682

6456 +#: builtin/grep.c:693

6457 msgid "show only the names of files without match"

6458 msgstr "visa endast namn på filer utan träffar"

6459

6365 -#: builtin/grep.c:684

6460 +#: builtin/grep.c:695

6461 msgid "print NUL after filenames"

6462 msgstr "skriv NUL efter filnamn"

6463

6369 -#: builtin/grep.c:686

6464 +#: builtin/grep.c:697

6465 msgid "show the number of matches instead of matching lines"

6466 msgstr "visa antal träffar istället för träffade rader"

6467

6373 -#: builtin/grep.c:687

6468 +#: builtin/grep.c:698

6469 msgid "highlight matches"

6470 msgstr "ljusmarkera träffar"

6471

6377 -#: builtin/grep.c:689

6472 +#: builtin/grep.c:700

6473 msgid "print empty line between matches from different files"

6474 msgstr "skriv tomma rader mellan träffar från olika filer"

6475

6381 -#: builtin/grep.c:691

6476 +#: builtin/grep.c:702

6477 msgid "show filename only once above matches from same file"

6478 msgstr "visa filnamn endast en gång ovanför träffar från samma fil"

6479

6385 -#: builtin/grep.c:694

6480 +#: builtin/grep.c:705

6481 msgid "show <n> context lines before and after matches"

6482 msgstr "visa <n> rader sammanhang före och efter träffar"

6483

6389 -#: builtin/grep.c:697

6484 +#: builtin/grep.c:708

6485 msgid "show <n> context lines before matches"

6486 msgstr "visa <n> rader sammanhang före träffar"

6487

6393 -#: builtin/grep.c:699

6488 +#: builtin/grep.c:710

6489 msgid "show <n> context lines after matches"

6490 msgstr "visa <n> rader sammanhang efter träffar"

6491

6397 -#: builtin/grep.c:700

6492 +#: builtin/grep.c:712

6493 +msgid "use <n> worker threads"

6494 +msgstr "använd <n> jobbtrådar"

6495 +

6496 +#: builtin/grep.c:713

6497 msgid "shortcut for -C NUM"

6498 msgstr "genväg för -C NUM"

6499

6401 -#: builtin/grep.c:703

6500 +#: builtin/grep.c:716

6501 msgid "show a line with the function name before matches"

6502 msgstr "visa en rad med funktionsnamnet före träffen"

6503

6405 -#: builtin/grep.c:705

6504 +#: builtin/grep.c:718

6505 msgid "show the surrounding function"

6506 msgstr "visa den omkringliggande funktionen"

6507

6409 -#: builtin/grep.c:708

6508 +#: builtin/grep.c:721

6509 msgid "read patterns from file"

6510 msgstr "läs mönster från fil"

6511

6413 -#: builtin/grep.c:710

6512 +#: builtin/grep.c:723

6513 msgid "match <pattern>"

6514 msgstr "träffa <mönster>"

6515

6417 -#: builtin/grep.c:712

6516 +#: builtin/grep.c:725

6517 msgid "combine patterns specified with -e"

6518 msgstr "kombinera mönster som anges med -e"

6519

6421 -#: builtin/grep.c:724

6520 +#: builtin/grep.c:737

6521 msgid "indicate hit with exit status without output"

6522 msgstr "ange träff med slutstatuskod utan utdata"

6523

6425 -#: builtin/grep.c:726

6524 +#: builtin/grep.c:739

6525 msgid "show only matches from files that match all patterns"

6526 msgstr "visa endast träffar från filer som träffar alla mönster"

6527

6429 -#: builtin/grep.c:728

6528 +#: builtin/grep.c:741

6529 msgid "show parse tree for grep expression"

6530 msgstr "visa analysträd för grep-uttryck"

6531

6433 -#: builtin/grep.c:732

6532 +#: builtin/grep.c:745

6533 msgid "pager"

6534 msgstr "bläddrare"

6535

6437 -#: builtin/grep.c:732

6536 +#: builtin/grep.c:745

6537 msgid "show matching files in the pager"

6538 msgstr "visa träffade filer i filbläddraren"

6539

6441 -#: builtin/grep.c:735

6540 +#: builtin/grep.c:748

6541 msgid "allow calling of grep(1) (ignored by this build)"

6542 msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"

6543

6445 -#: builtin/grep.c:793

6544 +#: builtin/grep.c:811

6545 msgid "no pattern given."

6546 msgstr "inget mönster angavs."

6547

6449 -#: builtin/grep.c:851

6548 +#: builtin/grep.c:843 builtin/index-pack.c:1475

6549 +#, c-format

6550 +msgid "invalid number of threads specified (%d)"

6551 +msgstr "felaktigt antal trådar angivet (%d)"

6552 +

6553 +#: builtin/grep.c:873

6554 msgid "--open-files-in-pager only works on the worktree"

6555 msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"

6556

6453 -#: builtin/grep.c:877

6557 +#: builtin/grep.c:899

6558 msgid "--cached or --untracked cannot be used with --no-index."

6559 msgstr "--cached och --untracked kan inte användas med --no-index."

6560

6457 -#: builtin/grep.c:882

6561 +#: builtin/grep.c:904

6562 msgid "--no-index or --untracked cannot be used with revs."

6563 msgstr "--no-index och --untracked kan inte användas med revisioner."

6564

6461 -#: builtin/grep.c:885

6565 +#: builtin/grep.c:907

6566 msgid "--[no-]exclude-standard cannot be used for tracked contents."

6567 msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."

6568

6465 -#: builtin/grep.c:893

6569 +#: builtin/grep.c:915

6570 msgid "both --cached and trees are given."

6571 msgstr "både --cached och träd angavs."

6572

6469 -#: builtin/hash-object.c:80

6573 +#: builtin/hash-object.c:81

6574 msgid ""

6575 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "

6576 "[--] <file>..."

@@ -6474,37 +6578,37 @@ msgstr ""

6578 "git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] "

6579 "<fil>..."

6580

6477 -#: builtin/hash-object.c:81

6581 +#: builtin/hash-object.c:82

6582 msgid "git hash-object --stdin-paths"

6583 msgstr "git hash-object --stdin-paths"

6584

6481 -#: builtin/hash-object.c:92

6585 +#: builtin/hash-object.c:93

6586 msgid "type"

6587 msgstr "typ"

6588

6485 -#: builtin/hash-object.c:92

6589 +#: builtin/hash-object.c:93

6590 msgid "object type"

6591 msgstr "objekttyp"

6592

6489 -#: builtin/hash-object.c:93

6593 +#: builtin/hash-object.c:94

6594 msgid "write the object into the object database"

6595 msgstr "skriv objektet till objektdatabasen"

6596

6493 -#: builtin/hash-object.c:95

6597 +#: builtin/hash-object.c:96

6598 msgid "read the object from stdin"

6599 msgstr "läs objektet från standard in"

6600

6497 -#: builtin/hash-object.c:97

6601 +#: builtin/hash-object.c:98

6602 msgid "store file as is without filters"

6603 msgstr "spara filen som den är utan filer"

6604

6501 -#: builtin/hash-object.c:98

6605 +#: builtin/hash-object.c:99

6606 msgid ""

6607 "just hash any random garbage to create corrupt objects for debugging Git"

6608 msgstr ""

6609 "hasha slumpmässigt skräp för att skapa korrupta objekt för felsökning av Git"

6610

6507 -#: builtin/hash-object.c:99

6611 +#: builtin/hash-object.c:100

6612 msgid "process file as it were from this path"

6613 msgstr "hantera filen som om den kom från sökvägen"

6614

@@ -6555,7 +6659,7 @@ msgstr "emacsclient version \"%d\" för gammal (< 22)."

6659 msgid "failed to exec '%s': %s"

6660 msgstr "exec misslyckades för \"%s\": %s"

6661

6558 -#: builtin/help.c:208

6662 +#: builtin/help.c:205

6663 #, c-format

6664 msgid ""

6665 "'%s': path for unsupported man viewer.\n"

@@ -6564,7 +6668,7 @@ msgstr ""

6668 "\"%s\": sökväg för man-visare som ej stöds.\n"

6669 "Använd \"man.<verktyg>.cmd\" istället."

6670

6567 -#: builtin/help.c:220

6671 +#: builtin/help.c:217

6672 #, c-format

6673 msgid ""

6674 "'%s': cmd for supported man viewer.\n"

@@ -6573,61 +6677,61 @@ msgstr ""

6677 "\"%s\": kommando för man-visare som stöds.\n"

6678 "Använd \"man.<verktyg>.path\" istället."

6679

6576 -#: builtin/help.c:337

6680 +#: builtin/help.c:334

6681 #, c-format

6682 msgid "'%s': unknown man viewer."

6683 msgstr "\"%s\": okänd man-visare."

6684

6581 -#: builtin/help.c:354

6685 +#: builtin/help.c:351

6686 msgid "no man viewer handled the request"

6687 msgstr "ingen man-visare hanterade förfrågan"

6688

6585 -#: builtin/help.c:362

6689 +#: builtin/help.c:359

6690 msgid "no info viewer handled the request"

6691 msgstr "ingen info-visare hanterade förfrågan"

6692

6589 -#: builtin/help.c:411

6693 +#: builtin/help.c:408

6694 msgid "Defining attributes per path"

6695 msgstr "Definierar attribut per sökväg"

6696

6593 -#: builtin/help.c:412

6697 +#: builtin/help.c:409

6698 msgid "Everyday Git With 20 Commands Or So"

6699 msgstr "Git för dagligt bruk i ungefär 20 kommandon"

6700

6597 -#: builtin/help.c:413

6701 +#: builtin/help.c:410

6702 msgid "A Git glossary"

6703 msgstr "En Git-ordlista"

6704

6601 -#: builtin/help.c:414

6705 +#: builtin/help.c:411

6706 msgid "Specifies intentionally untracked files to ignore"

6707 msgstr "Ange avsiktligen ospårade filer att ignorera"

6708

6605 -#: builtin/help.c:415

6709 +#: builtin/help.c:412

6710 msgid "Defining submodule properties"

6711 msgstr "Ange egenskaper för undermoduler"

6712

6609 -#: builtin/help.c:416

6713 +#: builtin/help.c:413

6714 msgid "Specifying revisions and ranges for Git"

6715 msgstr "Ange versioner och intervall i Git"

6716

6613 -#: builtin/help.c:417

6717 +#: builtin/help.c:414

6718 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

6719 msgstr "Introduktion till Git (för version 1.5.1 och senare)"

6720

6617 -#: builtin/help.c:418

6721 +#: builtin/help.c:415

6722 msgid "An overview of recommended workflows with Git"

6723 msgstr "Översikt över rekommenderade arbetsflöden med Git"

6724

6621 -#: builtin/help.c:430

6725 +#: builtin/help.c:427

6726 msgid "The common Git guides are:\n"

6727 msgstr "De vanliga Git-vägledningarna är:\n"

6728

6625 -#: builtin/help.c:451 builtin/help.c:468

6729 +#: builtin/help.c:448 builtin/help.c:465

6730 #, c-format

6731 msgid "usage: %s%s"

6732 msgstr "användning: %s%s"

6733

6630 -#: builtin/help.c:484

6734 +#: builtin/help.c:481

6735 #, c-format

6736 msgid "`git %s' is aliased to `%s'"

6737 msgstr "\"git %s\" är ett alias för \"%s\""

@@ -6863,11 +6967,6 @@ msgstr "kan inte spara indexfil"

6967 msgid "bad pack.indexversion=%<PRIu32>"

6968 msgstr "felaktig pack.indexversion=%<PRIu32>"

6969

6866 -#: builtin/index-pack.c:1475

6867 -#, c-format

6868 -msgid "invalid number of threads specified (%d)"

6869 -msgstr "felaktigt antal trådar angivet (%d)"

6870 -

6970 #: builtin/index-pack.c:1479 builtin/index-pack.c:1663

6971 #, c-format

6972 msgid "no threads support, ignoring %s"

@@ -7042,24 +7141,32 @@ msgstr "Kan inte komma åt arbetskatalogen \"%s\""

7141

7142 #: builtin/interpret-trailers.c:15

7143 msgid ""

7045 -"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "

7046 -"[<file>...]"

7144 +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "

7145 +"<token>[(=|:)<value>])...] [<file>...]"

7146 msgstr ""

7048 -"git interpret-trailers [--trim-empty] [(--trailer "

7147 +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "

7148 "<symbol>[(=|:)<värde>])...] [<fil>...]"

7149

7051 -#: builtin/interpret-trailers.c:25

7150 +#: builtin/interpret-trailers.c:26

7151 +msgid "edit files in place"

7152 +msgstr "redigera filer på plats"

7153 +

7154 +#: builtin/interpret-trailers.c:27

7155 msgid "trim empty trailers"

7156 msgstr "ta bort tomma släprader"

7157

7055 -#: builtin/interpret-trailers.c:26

7158 +#: builtin/interpret-trailers.c:28

7159 msgid "trailer"

7160 msgstr "släprad"

7161

7059 -#: builtin/interpret-trailers.c:27

7162 +#: builtin/interpret-trailers.c:29

7163 msgid "trailer(s) to add"

7164 msgstr "släprad(er) att lägga till"

7165

7166 +#: builtin/interpret-trailers.c:42

7167 +msgid "no input file given for in-place editing"

7168 +msgstr "ingen indatafil angiven för redigering på plats"

7169 +

7170 #: builtin/log.c:43

7171 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"

7172 msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"

@@ -7113,325 +7220,375 @@ msgstr "Kunde inte läsa objektet %s"

7220 msgid "Unknown type: %d"

7221 msgstr "Okänd typ: %d"

7222

7116 -#: builtin/log.c:714

7223 +#: builtin/log.c:715

7224 msgid "format.headers without value"

7225 msgstr "format.headers utan värde"

7226

7120 -#: builtin/log.c:798

7227 +#: builtin/log.c:801

7228 msgid "name of output directory is too long"

7229 msgstr "namnet på utdatakatalogen är för långt"

7230

7124 -#: builtin/log.c:813

7231 +#: builtin/log.c:816

7232 #, c-format

7233 msgid "Cannot open patch file %s"

7234 msgstr "Kan inte öppna patchfilen %s"

7235

7129 -#: builtin/log.c:827

7236 +#: builtin/log.c:830

7237 msgid "Need exactly one range."

7238 msgstr "Behöver precis ett intervall."

7239

7133 -#: builtin/log.c:837

7240 +#: builtin/log.c:840

7241 msgid "Not a range."

7242 msgstr "Inte ett intervall."

7243

7137 -#: builtin/log.c:943

7244 +#: builtin/log.c:946

7245 msgid "Cover letter needs email format"

7246 msgstr "Omslagsbrevet behöver e-postformat"

7247

7141 -#: builtin/log.c:1022

7248 +#: builtin/log.c:1025

7249 #, c-format

7250 msgid "insane in-reply-to: %s"

7251 msgstr "tokigt in-reply-to: %s"

7252

7146 -#: builtin/log.c:1050

7253 +#: builtin/log.c:1053

7254 msgid "git format-patch [<options>] [<since> | <revision-range>]"

7255 msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"

7256

7150 -#: builtin/log.c:1095

7257 +#: builtin/log.c:1098

7258 msgid "Two output directories?"

7259 msgstr "Två utdatakataloger?"

7260

7154 -#: builtin/log.c:1211

7261 +#: builtin/log.c:1214

7262 msgid "use [PATCH n/m] even with a single patch"

7263 msgstr "använd [PATCH n/m] även för en ensam patch"

7264

7158 -#: builtin/log.c:1214

7265 +#: builtin/log.c:1217

7266 msgid "use [PATCH] even with multiple patches"

7267 msgstr "använd [PATCH] även för flera patchar"

7268

7162 -#: builtin/log.c:1218

7269 +#: builtin/log.c:1221

7270 msgid "print patches to standard out"

7271 msgstr "skriv patcharna på standard ut"

7272

7166 -#: builtin/log.c:1220

7273 +#: builtin/log.c:1223

7274 msgid "generate a cover letter"

7275 msgstr "generera ett följebrev"

7276

7170 -#: builtin/log.c:1222

7277 +#: builtin/log.c:1225

7278 msgid "use simple number sequence for output file names"

7279 msgstr "använd enkel nummersekvens för utdatafilnamn"

7280

7174 -#: builtin/log.c:1223

7281 +#: builtin/log.c:1226

7282 msgid "sfx"

7283 msgstr "sfx"

7284

7178 -#: builtin/log.c:1224

7285 +#: builtin/log.c:1227

7286 msgid "use <sfx> instead of '.patch'"

7287 msgstr "använd <sfx> istället för \".patch\""

7288

7182 -#: builtin/log.c:1226

7289 +#: builtin/log.c:1229

7290 msgid "start numbering patches at <n> instead of 1"

7291 msgstr "börja numrera patchar på <n> istället för 1"

7292

7186 -#: builtin/log.c:1228

7293 +#: builtin/log.c:1231

7294 msgid "mark the series as Nth re-roll"

7295 msgstr "markera serien som N:te försök"

7296

7190 -#: builtin/log.c:1230

7297 +#: builtin/log.c:1233

7298 msgid "Use [<prefix>] instead of [PATCH]"

7299 msgstr "Använd [<prefix>] istället för [PATCH]"

7300

7194 -#: builtin/log.c:1233

7301 +#: builtin/log.c:1236

7302 msgid "store resulting files in <dir>"

7303 msgstr "spara filerna i <katalog>"

7304

7198 -#: builtin/log.c:1236

7305 +#: builtin/log.c:1239

7306 msgid "don't strip/add [PATCH]"

7307 msgstr "ta inte bort eller lägg till [PATCH]"

7308

7202 -#: builtin/log.c:1239

7309 +#: builtin/log.c:1242

7310 msgid "don't output binary diffs"

7311 msgstr "skriv inte binära diffar"

7312

7206 -#: builtin/log.c:1241

7313 +#: builtin/log.c:1244

7314 msgid "output all-zero hash in From header"

7315 msgstr "använd hashvärde med nollor i From-huvud"

7316

7210 -#: builtin/log.c:1243

7317 +#: builtin/log.c:1246

7318 msgid "don't include a patch matching a commit upstream"

7319 msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"

7320

7214 -#: builtin/log.c:1245

7321 +#: builtin/log.c:1248

7322 msgid "show patch format instead of default (patch + stat)"

7323 msgstr "visa patchformat istället för standard (patch + stat)"

7324

7218 -#: builtin/log.c:1247

7325 +#: builtin/log.c:1250

7326 msgid "Messaging"

7327 msgstr "E-post"

7328

7222 -#: builtin/log.c:1248

7329 +#: builtin/log.c:1251

7330 msgid "header"

7331 msgstr "huvud"

7332

7226 -#: builtin/log.c:1249

7333 +#: builtin/log.c:1252

7334 msgid "add email header"

7335 msgstr "lägg till e-posthuvud"

7336

7230 -#: builtin/log.c:1250 builtin/log.c:1252

7337 +#: builtin/log.c:1253 builtin/log.c:1255

7338 msgid "email"

7339 msgstr "epost"

7340

7234 -#: builtin/log.c:1250

7341 +#: builtin/log.c:1253

7342 msgid "add To: header"

7343 msgstr "Lägg till mottagarhuvud (\"To:\")"

7344

7238 -#: builtin/log.c:1252

7345 +#: builtin/log.c:1255

7346 msgid "add Cc: header"

7347 msgstr "Lägg till kopiehuvud (\"Cc:\")"

7348

7242 -#: builtin/log.c:1254

7349 +#: builtin/log.c:1257

7350 msgid "ident"

7351 msgstr "ident"

7352

7246 -#: builtin/log.c:1255

7353 +#: builtin/log.c:1258

7354 msgid "set From address to <ident> (or committer ident if absent)"

7355 msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"

7356

7250 -#: builtin/log.c:1257

7357 +#: builtin/log.c:1260

7358 msgid "message-id"

7359 msgstr "meddelande-id"

7360

7254 -#: builtin/log.c:1258

7361 +#: builtin/log.c:1261

7362 msgid "make first mail a reply to <message-id>"

7363 msgstr "Gör det första brevet ett svar till <meddelande-id>"

7364

7258 -#: builtin/log.c:1259 builtin/log.c:1262

7365 +#: builtin/log.c:1262 builtin/log.c:1265

7366 msgid "boundary"

7367 msgstr "gräns"

7368

7262 -#: builtin/log.c:1260

7369 +#: builtin/log.c:1263

7370 msgid "attach the patch"

7371 msgstr "bifoga patchen"

7372

7266 -#: builtin/log.c:1263

7373 +#: builtin/log.c:1266

7374 msgid "inline the patch"

7375 msgstr "gör patchen ett inline-objekt"

7376

7270 -#: builtin/log.c:1267

7377 +#: builtin/log.c:1270

7378 msgid "enable message threading, styles: shallow, deep"

7379 msgstr "aktivera brevtrådning, typer: shallow, deep"

7380

7274 -#: builtin/log.c:1269

7381 +#: builtin/log.c:1272

7382 msgid "signature"

7383 msgstr "signatur"

7384

7278 -#: builtin/log.c:1270

7385 +#: builtin/log.c:1273

7386 msgid "add a signature"

7387 msgstr "lägg till signatur"

7388

7282 -#: builtin/log.c:1272

7389 +#: builtin/log.c:1275

7390 msgid "add a signature from a file"

7391 msgstr "lägg till signatur från fil"

7392

7286 -#: builtin/log.c:1273

7393 +#: builtin/log.c:1276

7394 msgid "don't print the patch filenames"

7395 msgstr "visa inte filnamn för patchar"

7396

7290 -#: builtin/log.c:1362

7397 +#: builtin/log.c:1365

7398 msgid "-n and -k are mutually exclusive."

7399 msgstr "-n och -k kan inte användas samtidigt."

7400

7294 -#: builtin/log.c:1364

7401 +#: builtin/log.c:1367

7402 msgid "--subject-prefix and -k are mutually exclusive."

7403 msgstr "--subject-prefix och -k kan inte användas samtidigt."

7404

7298 -#: builtin/log.c:1372

7405 +#: builtin/log.c:1375

7406 msgid "--name-only does not make sense"

7407 msgstr "kan inte använda --name-only"

7408

7302 -#: builtin/log.c:1374

7409 +#: builtin/log.c:1377

7410 msgid "--name-status does not make sense"

7411 msgstr "kan inte använda --name-status"

7412

7306 -#: builtin/log.c:1376

7413 +#: builtin/log.c:1379

7414 msgid "--check does not make sense"

7415 msgstr "kan inte använda --check"

7416

7310 -#: builtin/log.c:1401

7417 +#: builtin/log.c:1407

7418 msgid "standard output, or directory, which one?"

7419 msgstr "standard ut, eller katalog, vilken skall det vara?"

7420

7314 -#: builtin/log.c:1403

7421 +#: builtin/log.c:1409

7422 #, c-format

7423 msgid "Could not create directory '%s'"

7424 msgstr "Kunde inte skapa katalogen \"%s\""

7425

7319 -#: builtin/log.c:1500

7426 +#: builtin/log.c:1506

7427 #, c-format

7428 msgid "unable to read signature file '%s'"

7429 msgstr "kunde inte läsa signaturfil \"%s\""

7430

7324 -#: builtin/log.c:1563

7431 +#: builtin/log.c:1569

7432 msgid "Failed to create output files"

7433 msgstr "Misslyckades skapa utdatafiler"

7434

7328 -#: builtin/log.c:1611

7435 +#: builtin/log.c:1617

7436 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

7437 msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"

7438

7332 -#: builtin/log.c:1665

7439 +#: builtin/log.c:1671

7440 #, c-format

7441 msgid ""

7442 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

7443 msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"

7444

7338 -#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690

7445 +#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696

7446 #, c-format

7447 msgid "Unknown commit %s"

7448 msgstr "Okänd incheckning %s"

7449

7343 -#: builtin/ls-files.c:358

7450 +#: builtin/ls-files.c:378

7451 msgid "git ls-files [<options>] [<file>...]"

7452 msgstr "git ls-files [<flaggor>] [<fil>...]"

7453

7347 -#: builtin/ls-files.c:415

7454 +#: builtin/ls-files.c:427

7455 msgid "identify the file status with tags"

7456 msgstr "identifiera filstatus med taggar"

7457

7351 -#: builtin/ls-files.c:417

7458 +#: builtin/ls-files.c:429

7459 msgid "use lowercase letters for 'assume unchanged' files"

7460 msgstr "använd små bokstäver för \"anta oförändrade\"-filer"

7461

7355 -#: builtin/ls-files.c:419

7462 +#: builtin/ls-files.c:431

7463 msgid "show cached files in the output (default)"

7464 msgstr "visa cachade filer i utdata (standard)"

7465

7359 -#: builtin/ls-files.c:421

7466 +#: builtin/ls-files.c:433

7467 msgid "show deleted files in the output"

7468 msgstr "visa borttagna filer i utdata"

7469

7363 -#: builtin/ls-files.c:423

7470 +#: builtin/ls-files.c:435

7471 msgid "show modified files in the output"

7472 msgstr "visa modifierade filer i utdata"

7473

7367 -#: builtin/ls-files.c:425

7474 +#: builtin/ls-files.c:437

7475 msgid "show other files in the output"

7476 msgstr "visa andra filer i utdata"

7477

7371 -#: builtin/ls-files.c:427

7478 +#: builtin/ls-files.c:439

7479 msgid "show ignored files in the output"

7480 msgstr "visa ignorerade filer i utdata"

7481

7375 -#: builtin/ls-files.c:430

7482 +#: builtin/ls-files.c:442

7483 msgid "show staged contents' object name in the output"

7484 msgstr "visa köat innehålls objektnamn i utdata"

7485

7379 -#: builtin/ls-files.c:432

7486 +#: builtin/ls-files.c:444

7487 msgid "show files on the filesystem that need to be removed"

7488 msgstr "visa filer i filsystemet som behöver tas bort"

7489

7383 -#: builtin/ls-files.c:434

7490 +#: builtin/ls-files.c:446

7491 msgid "show 'other' directories' names only"

7492 msgstr "visa endast namn för \"andra\" kataloger"

7493

7387 -#: builtin/ls-files.c:437

7494 +#: builtin/ls-files.c:448

7495 +msgid "show line endings of files"

7496 +msgstr "visa radslut i filer"

7497 +

7498 +#: builtin/ls-files.c:450

7499 msgid "don't show empty directories"

7500 msgstr "visa inte tomma kataloger"

7501

7391 -#: builtin/ls-files.c:440

7502 +#: builtin/ls-files.c:453

7503 msgid "show unmerged files in the output"

7504 msgstr "visa ej sammanslagna filer i utdata"

7505

7395 -#: builtin/ls-files.c:442

7506 +#: builtin/ls-files.c:455

7507 msgid "show resolve-undo information"

7508 msgstr "visa \"resolve-undo\"-information"

7509

7399 -#: builtin/ls-files.c:444

7510 +#: builtin/ls-files.c:457

7511 msgid "skip files matching pattern"

7512 msgstr "hoppa över filer som motsvarar mönster"

7513

7403 -#: builtin/ls-files.c:447

7514 +#: builtin/ls-files.c:460

7515 msgid "exclude patterns are read from <file>"

7516 msgstr "exkludera mönster som läses från <fil>"

7517

7407 -#: builtin/ls-files.c:450

7518 +#: builtin/ls-files.c:463

7519 msgid "read additional per-directory exclude patterns in <file>"

7520 msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"

7521

7411 -#: builtin/ls-files.c:452

7522 +#: builtin/ls-files.c:465

7523 msgid "add the standard git exclusions"

7524 msgstr "lägg till git:s standardexkluderingar"

7525

7415 -#: builtin/ls-files.c:455

7526 +#: builtin/ls-files.c:468

7527 msgid "make the output relative to the project top directory"

7528 msgstr "gör utdata relativ till projektets toppkatalog"

7529

7419 -#: builtin/ls-files.c:458

7530 +#: builtin/ls-files.c:471

7531 msgid "if any <file> is not in the index, treat this as an error"

7532 msgstr "om en <fil> inte är indexet, betrakta det som ett fel"

7533

7423 -#: builtin/ls-files.c:459

7534 +#: builtin/ls-files.c:472

7535 msgid "tree-ish"

7536 msgstr "träd-igt"

7537

7427 -#: builtin/ls-files.c:460

7538 +#: builtin/ls-files.c:473

7539 msgid "pretend that paths removed since <tree-ish> are still present"

7540 msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"

7541

7431 -#: builtin/ls-files.c:462

7542 +#: builtin/ls-files.c:475

7543 msgid "show debugging data"

7544 msgstr "visa felsökningsutdata"

7545

7546 +#: builtin/ls-remote.c:7

7547 +msgid ""

7548 +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"

7549 +" [-q | --quiet] [--exit-code] [--get-url]\n"

7550 +" [--symref] [<repository> [<refs>...]]"

7551 +msgstr ""

7552 +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"

7553 +" [-q | --quiet] [--exit-code] [--get-url]\n"

7554 +" [--symref] [<arkiv> [<referenser>...]]"

7555 +

7556 +#: builtin/ls-remote.c:50

7557 +msgid "do not print remote URL"

7558 +msgstr "visa inte fjärr-URL"

7559 +

7560 +#: builtin/ls-remote.c:51 builtin/ls-remote.c:53

7561 +msgid "exec"

7562 +msgstr "exec"

7563 +

7564 +#: builtin/ls-remote.c:52 builtin/ls-remote.c:54

7565 +msgid "path of git-upload-pack on the remote host"

7566 +msgstr "sökväg till git-upload-pack på fjärren"

7567 +

7568 +#: builtin/ls-remote.c:56

7569 +msgid "limit to tags"

7570 +msgstr "begränsa till taggar"

7571 +

7572 +#: builtin/ls-remote.c:57

7573 +msgid "limit to heads"

7574 +msgstr "begränsa till huvuden"

7575 +

7576 +#: builtin/ls-remote.c:58

7577 +msgid "do not show peeled tags"

7578 +msgstr "visa inte avskalade taggar"

7579 +

7580 +#: builtin/ls-remote.c:60

7581 +msgid "take url.<base>.insteadOf into account"

7582 +msgstr "ta hänsyn till url.<bas>.insteadOf"

7583 +

7584 +#: builtin/ls-remote.c:62

7585 +msgid "exit with exit code 2 if no matching refs are found"

7586 +msgstr "avsluta med felkod 2 om motsvarande referenser inte hittas"

7587 +

7588 +#: builtin/ls-remote.c:64

7589 +msgid "show underlying ref in addition to the object pointed by it"

7590 +msgstr "visa underliggande referens och objektet det pekar på"

7591 +

7592 #: builtin/ls-tree.c:28

7593 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"

7594 msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]"

@@ -7499,32 +7656,32 @@ msgstr "Tillgängliga strategier är:"

7656 msgid "Available custom strategies are:"

7657 msgstr "Tillgängliga skräddarsydda strategier är:"

7658

7502 -#: builtin/merge.c:193 builtin/pull.c:119

7659 +#: builtin/merge.c:193 builtin/pull.c:123

7660 msgid "do not show a diffstat at the end of the merge"

7661 msgstr "visa inte en diffstat när sammanslagningen är färdig"

7662

7506 -#: builtin/merge.c:196 builtin/pull.c:122

7663 +#: builtin/merge.c:196 builtin/pull.c:126

7664 msgid "show a diffstat at the end of the merge"

7665 msgstr "visa en diffstat när sammanslagningen är färdig"

7666

7510 -#: builtin/merge.c:197 builtin/pull.c:125

7667 +#: builtin/merge.c:197 builtin/pull.c:129

7668 msgid "(synonym to --stat)"

7669 msgstr "(synonym till --stat)"

7670

7514 -#: builtin/merge.c:199 builtin/pull.c:128

7671 +#: builtin/merge.c:199 builtin/pull.c:132

7672 msgid "add (at most <n>) entries from shortlog to merge commit message"

7673 msgstr ""

7674 "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"

7675

7519 -#: builtin/merge.c:202 builtin/pull.c:131

7676 +#: builtin/merge.c:202 builtin/pull.c:135

7677 msgid "create a single commit instead of doing a merge"

7678 msgstr "skapa en ensam incheckning istället för en sammanslagning"

7679

7523 -#: builtin/merge.c:204 builtin/pull.c:134

7680 +#: builtin/merge.c:204 builtin/pull.c:138

7681 msgid "perform a commit if the merge succeeds (default)"

7682 msgstr "utför en incheckning om sammanslagningen lyckades (standard)"

7683

7527 -#: builtin/merge.c:206 builtin/pull.c:137

7684 +#: builtin/merge.c:206 builtin/pull.c:141

7685 msgid "edit message before committing"

7686 msgstr "redigera meddelande innan incheckning"

7687

@@ -7532,7 +7689,7 @@ msgstr "redigera meddelande innan incheckning"

7689 msgid "allow fast-forward (default)"

7690 msgstr "tillåt snabbspolning (standard)"

7691

7535 -#: builtin/merge.c:209 builtin/pull.c:143

7692 +#: builtin/merge.c:209 builtin/pull.c:147

7693 msgid "abort if fast-forward is not possible"

7694 msgstr "avbryt om snabbspolning inte är möjlig"

7695

@@ -7540,20 +7697,20 @@ msgstr "avbryt om snabbspolning inte är möjlig"

l10n: sv.po: Update Swedish translation (2509t0f0u)