34692d22fa · matheusbsbs/matheus-bagliano

@@ -1,14 +1,14 @@

1 # Swedish translations for Git.

3 # This file is distributed under the same license as the Git package.

4 -# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018.

4 +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019.

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2018-12-02 10:55+0800\n"

11 -"PO-Revision-Date: 2018-12-02 15:41+0100\n"

10 +"POT-Creation-Date: 2019-02-15 10:09+0800\n"

11 +"PO-Revision-Date: 2019-02-15 09:03+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"

@@ -18,47 +18,47 @@ msgstr ""

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

19 "X-Generator: Gtranslator 2.91.7\n"

20

21 -#: advice.c:99

21 +#: advice.c:101

22 #, c-format

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

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

25

26 -#: advice.c:152

26 +#: advice.c:154

27 msgid "Cherry-picking is not possible because you have unmerged files."

28 msgstr ""

29 "Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits "

30 "samman."

31

32 -#: advice.c:154

32 +#: advice.c:156

33 msgid "Committing is not possible because you have unmerged files."

34 msgstr ""

35 "Du kan inte utföra en incheckning eftersom du har filer som inte slagits "

36 "samman."

37

38 -#: advice.c:156

38 +#: advice.c:158

39 msgid "Merging is not possible because you have unmerged files."

40 msgstr ""

41 "Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits "

42 "samman."

43

44 -#: advice.c:158

44 +#: advice.c:160

45 msgid "Pulling is not possible because you have unmerged files."

46 msgstr ""

47 "Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman."

48

49 -#: advice.c:160

49 +#: advice.c:162

50 msgid "Reverting is not possible because you have unmerged files."

51 msgstr ""

52 "Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits "

53 "samman."

54

55 -#: advice.c:162

55 +#: advice.c:164

56 #, c-format

57 msgid "It is not possible to %s because you have unmerged files."

58 msgstr ""

59 "Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman."

60

61 -#: advice.c:170

61 +#: advice.c:172

62 msgid ""

63 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

64 "as appropriate to mark resolution and make a commit."

@@ -66,23 +66,23 @@ msgstr ""

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

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

68

69 -#: advice.c:178

69 +#: advice.c:180

70 msgid "Exiting because of an unresolved conflict."

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

72

73 -#: advice.c:183 builtin/merge.c:1289

73 +#: advice.c:185 builtin/merge.c:1290

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

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

76

77 -#: advice.c:185

77 +#: advice.c:187

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

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

80

81 -#: advice.c:186

81 +#: advice.c:188

82 msgid "Exiting because of unfinished merge."

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

84

85 -#: advice.c:192

85 +#: advice.c:194

86 #, c-format

87 msgid ""

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

@@ -111,6 +111,14 @@ msgstr ""

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

112 "\n"

113

114 +#: alias.c:50

115 +msgid "cmdline ends with \\"

116 +msgstr "kommandorad avslutas med \\"

117 +

118 +#: alias.c:51

119 +msgid "unclosed quote"

120 +msgstr "citat ej stängt"

121 +

122 #: apply.c:59

123 #, c-format

124 msgid "unrecognized whitespace option '%s'"

@@ -141,62 +149,62 @@ msgstr "--index utanför arkiv"

149 msgid "--cached outside a repository"

150 msgstr "--cached utanför arkiv"

151

144 -#: apply.c:826

152 +#: apply.c:825

153 #, c-format

154 msgid "Cannot prepare timestamp regexp %s"

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

156

149 -#: apply.c:835

157 +#: apply.c:834

158 #, c-format

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

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

161

154 -#: apply.c:909

162 +#: apply.c:908

163 #, c-format

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

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

166

159 -#: apply.c:947

167 +#: apply.c:946

168 #, c-format

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

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

171

164 -#: apply.c:953

172 +#: apply.c:952

173 #, c-format

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

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

176

169 -#: apply.c:954

177 +#: apply.c:953

178 #, c-format

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

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

181

174 -#: apply.c:959

182 +#: apply.c:958

183 #, c-format

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

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

186

179 -#: apply.c:988

187 +#: apply.c:987

188 #, c-format

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

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

191

184 -#: apply.c:1307

192 +#: apply.c:1306

193 #, c-format

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

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

196

189 -#: apply.c:1479

197 +#: apply.c:1478

198 #, c-format

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

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

201

194 -#: apply.c:1548

202 +#: apply.c:1547

203 #, c-format

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

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

206

199 -#: apply.c:1568

207 +#: apply.c:1567

208 #, c-format

209 msgid ""

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

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

220 "sökvägskomponenter\n"

221 "tas bort (rad %d)"

222

215 -#: apply.c:1581

223 +#: apply.c:1580

224 #, c-format

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

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

227

220 -#: apply.c:1769

228 +#: apply.c:1768

229 msgid "new file depends on old contents"

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

231

224 -#: apply.c:1771

232 +#: apply.c:1770

233 msgid "deleted file still has contents"

234 msgstr "borttagen fil har fortfarande innehåll"

235

228 -#: apply.c:1805

236 +#: apply.c:1804

237 #, c-format

238 msgid "corrupt patch at line %d"

239 msgstr "trasig patch på rad %d"

240

233 -#: apply.c:1842

241 +#: apply.c:1841

242 #, c-format

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

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

245

238 -#: apply.c:1844

246 +#: apply.c:1843

247 #, c-format

248 msgid "deleted file %s still has contents"

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

250

243 -#: apply.c:1847

251 +#: apply.c:1846

252 #, c-format

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

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

255

248 -#: apply.c:1994

256 +#: apply.c:1993

257 #, c-format

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

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

260

253 -#: apply.c:2031

261 +#: apply.c:2030

262 #, c-format

263 msgid "unrecognized binary patch at line %d"

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

265

258 -#: apply.c:2193

266 +#: apply.c:2192

267 #, c-format

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

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

270

263 -#: apply.c:2279

271 +#: apply.c:2278

272 #, c-format

273 msgid "unable to read symlink %s"

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

275

268 -#: apply.c:2283

276 +#: apply.c:2282

277 #, c-format

278 msgid "unable to open or read %s"

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

280

273 -#: apply.c:2942

281 +#: apply.c:2941

282 #, c-format

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

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

285

278 -#: apply.c:3063

286 +#: apply.c:3062

287 #, c-format

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

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

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

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

292

285 -#: apply.c:3075

293 +#: apply.c:3074

294 #, c-format

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

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

297

290 -#: apply.c:3081

298 +#: apply.c:3080

299 #, c-format

300 msgid ""

301 "while searching for:\n"

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

304 "vid sökning efter:\n"

305 "%.*s"

306

299 -#: apply.c:3103

307 +#: apply.c:3102

308 #, c-format

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

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

311

304 -#: apply.c:3111

312 +#: apply.c:3110

313 #, c-format

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

315 msgstr ""

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

317 "\""

318

311 -#: apply.c:3158

319 +#: apply.c:3157

320 #, c-format

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

322 msgstr ""

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

324

317 -#: apply.c:3168

325 +#: apply.c:3167

326 #, c-format

327 msgid ""

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

@@ -322,27 +330,27 @@ msgstr ""

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

331 "innehållet."

332

325 -#: apply.c:3176

333 +#: apply.c:3175

334 #, c-format

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

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

337

330 -#: apply.c:3194

338 +#: apply.c:3193

339 #, c-format

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

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

342

335 -#: apply.c:3207

343 +#: apply.c:3206

344 #, c-format

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

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

347

340 -#: apply.c:3213

348 +#: apply.c:3212

349 #, c-format

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

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

352

345 -#: apply.c:3234

353 +#: apply.c:3233

354 #, c-format

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

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

@@ -422,7 +430,8 @@ msgstr "%s: fel typ"

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

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

432

425 -#: apply.c:3881 apply.c:3883

433 +#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846

434 +#: read-cache.c:1299

435 #, c-format

436 msgid "invalid path '%s'"

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

@@ -477,7 +486,7 @@ msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"

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

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

488

480 -#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142

489 +#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143

490 #, c-format

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

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

@@ -553,7 +562,7 @@ msgstr[1] "Tillämpade patchen %%s med %d refuserade..."

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

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

564

556 -#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122

565 +#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118

566 #, c-format

567 msgid "cannot open %s"

568 msgstr "kan inte öppna %s"

@@ -577,171 +586,171 @@ msgstr "Ignorerar patch \"%s\"."

586 msgid "unrecognized input"

587 msgstr "indata känns inte igen"

588

580 -#: apply.c:4719

589 +#: apply.c:4720

590 msgid "unable to read index file"

591 msgstr "kan inte läsa indexfilen"

592

584 -#: apply.c:4874

593 +#: apply.c:4875

594 #, c-format

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

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

597

589 -#: apply.c:4901

598 +#: apply.c:4902

599 #, c-format

600 msgid "squelched %d whitespace error"

601 msgid_plural "squelched %d whitespace errors"

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

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

604

596 -#: apply.c:4907 apply.c:4922

605 +#: apply.c:4908 apply.c:4923

606 #, c-format

607 msgid "%d line adds whitespace errors."

608 msgid_plural "%d lines add whitespace errors."

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

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

611

603 -#: apply.c:4915

612 +#: apply.c:4916

613 #, c-format

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

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

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

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

618

610 -#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

619 +#: apply.c:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390

620 msgid "Unable to write new index file"

621 msgstr "Kunde inte skriva ny indexfil"

622

614 -#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212

615 -#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262

616 -#: builtin/pull.c:199 builtin/submodule--helper.c:406

617 -#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365

618 -#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849

619 -#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197

623 +#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206

624 +#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263

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

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

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

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

629 msgid "path"

630 msgstr "sökväg"

631

623 -#: apply.c:4959

632 +#: apply.c:4960

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

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

635

627 -#: apply.c:4962

636 +#: apply.c:4963

637 msgid "apply changes matching the given path"

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

639

631 -#: apply.c:4964 builtin/am.c:2218

640 +#: apply.c:4965 builtin/am.c:2212

641 msgid "num"

642 msgstr "antal"

643

635 -#: apply.c:4965

644 +#: apply.c:4966

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

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

647

639 -#: apply.c:4968

648 +#: apply.c:4969

649 msgid "ignore additions made by the patch"

650 msgstr "ignorera tillägg gjorda av patchen"

651

643 -#: apply.c:4970

652 +#: apply.c:4971

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

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

655

647 -#: apply.c:4974

656 +#: apply.c:4975

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

658 msgstr "visa antal tillagda och borttagna rader decimalt"

659

651 -#: apply.c:4976

660 +#: apply.c:4977

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

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

663

655 -#: apply.c:4978

664 +#: apply.c:4979

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

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

667

659 -#: apply.c:4980

668 +#: apply.c:4981

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

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

671

663 -#: apply.c:4982

672 +#: apply.c:4983

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

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

675

667 -#: apply.c:4984

676 +#: apply.c:4985

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

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

679

671 -#: apply.c:4986

680 +#: apply.c:4987

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

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

683

675 -#: apply.c:4989

684 +#: apply.c:4990

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

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

687

679 -#: apply.c:4991

688 +#: apply.c:4992

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

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

691

683 -#: apply.c:4993

692 +#: apply.c:4994

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

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

695

687 -#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523

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

697 msgid "paths are separated with NUL character"

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

699

691 -#: apply.c:4998

700 +#: apply.c:4999

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

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

703

695 -#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97

704 +#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97

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

697 -#: builtin/pack-objects.c:3312 builtin/rebase.c:857

706 +#: builtin/pack-objects.c:3314 builtin/rebase.c:1065

707 msgid "action"

708 msgstr "åtgärd"

709

701 -#: apply.c:5000

710 +#: apply.c:5001

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

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

713

705 -#: apply.c:5003 apply.c:5006

714 +#: apply.c:5004 apply.c:5007

715 msgid "ignore changes in whitespace when finding context"

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

717

709 -#: apply.c:5009

718 +#: apply.c:5010

719 msgid "apply the patch in reverse"

720 msgstr "tillämpa patchen baklänges"

721

713 -#: apply.c:5011

722 +#: apply.c:5012

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

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

725

717 -#: apply.c:5013

726 +#: apply.c:5014

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

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

729

721 -#: apply.c:5015

730 +#: apply.c:5016

731 msgid "allow overlapping hunks"

732 msgstr "tillåt överlappande stycken"

733

725 -#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21

726 -#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698

727 -#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127

728 -#: builtin/rebase--interactive.c:157

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

735 +#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724

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

737 +#: builtin/rebase--interactive.c:159

738 msgid "be verbose"

739 msgstr "var pratsam"

740

732 -#: apply.c:5018

741 +#: apply.c:5019

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

743 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

744

736 -#: apply.c:5021

745 +#: apply.c:5022

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

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

748

740 -#: apply.c:5023 builtin/am.c:2206

749 +#: apply.c:5024 builtin/am.c:2200

750 msgid "root"

751 msgstr "rot"

752

744 -#: apply.c:5024

753 +#: apply.c:5025

754 msgid "prepend <root> to all filenames"

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

756

@@ -764,99 +773,118 @@ msgstr ""

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

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

775

767 -#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

776 +#: archive.c:372 builtin/add.c:177 builtin/add.c:515 builtin/rm.c:299

777 #, c-format

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

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

780

772 -#: archive.c:453

781 +#: archive.c:396

782 +#, c-format

783 +msgid "no such ref: %.*s"

784 +msgstr "ingen sådan referens: %.*s"

785 +

786 +#: archive.c:401

787 +#, c-format

788 +msgid "not a valid object name: %s"

789 +msgstr "objektnamnet är inte giltigt: %s"

790 +

791 +#: archive.c:414

792 +#, c-format

793 +msgid "not a tree object: %s"

794 +msgstr "inte ett trädobjekt: %s"

795 +

796 +#: archive.c:424

797 +msgid "current working directory is untracked"

798 +msgstr "aktuell arbetskatalog är inte spårad"

799 +

800 +#: archive.c:455

801 msgid "fmt"

802 msgstr "fmt"

803

776 -#: archive.c:453

804 +#: archive.c:455

805 msgid "archive format"

806 msgstr "arkivformat"

807

780 -#: archive.c:454 builtin/log.c:1536

808 +#: archive.c:456 builtin/log.c:1549

809 msgid "prefix"

810 msgstr "prefix"

811

784 -#: archive.c:455

812 +#: archive.c:457

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

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

815

788 -#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129

789 -#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884

790 -#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562

791 -#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122

816 +#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129

817 +#: builtin/fast-export.c:1091 builtin/fast-export.c:1093 builtin/grep.c:895

818 +#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563

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

820 #: parse-options.h:162

821 msgid "file"

822 msgstr "fil"

823

796 -#: archive.c:457 builtin/archive.c:89

824 +#: archive.c:459 builtin/archive.c:90

825 msgid "write the archive to this file"

826 msgstr "skriv arkivet till filen"

827

800 -#: archive.c:459

828 +#: archive.c:461

829 msgid "read .gitattributes in working directory"

830 msgstr "läs .gitattributes i arbetskatalogen"

831

804 -#: archive.c:460

832 +#: archive.c:462

833 msgid "report archived files on stderr"

834 msgstr "rapportera arkiverade filer på standard fel"

835

808 -#: archive.c:461

836 +#: archive.c:463

837 msgid "store only"

838 msgstr "endast spara"

839

812 -#: archive.c:462

840 +#: archive.c:464

841 msgid "compress faster"

842 msgstr "komprimera snabbare"

843

816 -#: archive.c:470

844 +#: archive.c:472

845 msgid "compress better"

846 msgstr "komprimera bättre"

847

820 -#: archive.c:473

848 +#: archive.c:475

849 msgid "list supported archive formats"

850 msgstr "visa understödda arkivformat"

851

824 -#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114

825 -#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855

852 +#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115

853 +#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859

854 msgid "repo"

855 msgstr "arkiv"

856

829 -#: archive.c:476 builtin/archive.c:91

857 +#: archive.c:478 builtin/archive.c:92

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

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

860

833 -#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714

834 -#: builtin/notes.c:496

861 +#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715

862 +#: builtin/notes.c:498

863 msgid "command"

864 msgstr "kommando"

865

838 -#: archive.c:478 builtin/archive.c:93

866 +#: archive.c:480 builtin/archive.c:94

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

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

869

842 -#: archive.c:485

870 +#: archive.c:487

871 msgid "Unexpected option --remote"

872 msgstr "Oväntad flagga --remote"

873

846 -#: archive.c:487

874 +#: archive.c:489

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

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

877

850 -#: archive.c:489

878 +#: archive.c:491

879 msgid "Unexpected option --output"

880 msgstr "Oväntad flagga --output"

881

854 -#: archive.c:511

882 +#: archive.c:513

883 #, c-format

884 msgid "Unknown archive format '%s'"

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

886

859 -#: archive.c:518

887 +#: archive.c:520

888 #, c-format

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

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

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

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

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

930

903 -#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227

931 +#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228

932 #, c-format

933 msgid "deflate error (%d)"

934 msgstr "fel i deflate (%d)"

@@ -910,12 +938,17 @@ msgstr "fel i deflate (%d)"

938 msgid "timestamp too large for this system: %<PRIuMAX>"

939 msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>"

940

913 -#: attr.c:212

941 +#: attr.c:211

942 #, c-format

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

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

945

918 -#: attr.c:409

946 +#: attr.c:368

947 +#, c-format

948 +msgid "%s not allowed: %s:%d"

949 +msgstr "%s inte tillåtet: %s:%d"

950 +

951 +#: attr.c:408

952 msgid ""

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

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

@@ -928,17 +961,17 @@ msgstr ""

961 msgid "Badly quoted content in file '%s': %s"

962 msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"

963

931 -#: bisect.c:676

964 +#: bisect.c:678

965 #, c-format

966 msgid "We cannot bisect more!\n"

967 msgstr "Det finns inte mer att göra \"bisect\" på!\n"

968

936 -#: bisect.c:730

969 +#: bisect.c:733

970 #, c-format

971 msgid "Not a valid commit name %s"

972 msgstr "Namnet på incheckningen är inte giltigt: %s"

973

941 -#: bisect.c:754

974 +#: bisect.c:758

975 #, c-format

976 msgid ""

977 "The merge base %s is bad.\n"

@@ -947,7 +980,7 @@ msgstr ""

980 "Sammanslagningsbasen %s är trasig.\n"

981 "Det betyder att felet har rättats mellan %s och [%s].\n"

982

950 -#: bisect.c:759

983 +#: bisect.c:763

984 #, c-format

985 msgid ""

986 "The merge base %s is new.\n"

@@ -956,7 +989,7 @@ msgstr ""

989 "Sammanslagningsbasen %s är ny.\n"

990 "Egenskapen har ändrats mellan %s och [%s].\n"

991

959 -#: bisect.c:764

992 +#: bisect.c:768

993 #, c-format

994 msgid ""

995 "The merge base %s is %s.\n"

@@ -965,7 +998,7 @@ msgstr ""

998 "Sammanslagningsbasen %s är %s.\n"

999 "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"

1000

968 -#: bisect.c:772

1001 +#: bisect.c:776

1002 #, c-format

1003 msgid ""

1004 "Some %s revs are not ancestors of the %s rev.\n"

@@ -976,7 +1009,7 @@ msgstr ""

1009 "git bisect kan inte fungera korrekt i detta fall.\n"

1010 "Kanske du skrev fel %s- och %s-revisioner?\n"

1011

979 -#: bisect.c:785

1012 +#: bisect.c:789

1013 #, c-format

1014 msgid ""

1015 "the merge base between %s and [%s] must be skipped.\n"

@@ -988,36 +1021,36 @@ msgstr ""

1021 "%s.\n"

1022 "Vi fortsätter ändå."

1023

991 -#: bisect.c:818

1024 +#: bisect.c:822

1025 #, c-format

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

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

1028

996 -#: bisect.c:858

1029 +#: bisect.c:865

1030 #, c-format

1031 msgid "a %s revision is needed"

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

1033

1001 -#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237

1034 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:237

1035 #, c-format

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

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

1038

1006 -#: bisect.c:928 builtin/merge.c:138

1039 +#: bisect.c:937 builtin/merge.c:139

1040 #, c-format

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

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

1043

1011 -#: bisect.c:958

1044 +#: bisect.c:967

1045 msgid "reading bisect refs failed"

1046 msgstr "misslyckades läsa bisect-referenser"

1047

1015 -#: bisect.c:977

1048 +#: bisect.c:986

1049 #, c-format

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

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

1052

1020 -#: bisect.c:985

1053 +#: bisect.c:994

1054 #, c-format

1055 msgid ""

1056 "No testable commit found.\n"

@@ -1026,7 +1059,7 @@ msgstr ""

1059 "Ingen testbar incheckning hittades.\n"

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

1061

1029 -#: bisect.c:1004

1062 +#: bisect.c:1013

1063 #, c-format

1064 msgid "(roughly %d step)"

1065 msgid_plural "(roughly %d steps)"

@@ -1036,48 +1069,48 @@ msgstr[1] "(ungefär %d steg)"

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

1070 #. steps)" translation.

1071 #.

1039 -#: bisect.c:1010

1072 +#: bisect.c:1019

1073 #, c-format

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

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

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

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

1078

1046 -#: blame.c:1787

1079 +#: blame.c:1792

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

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

1082

1050 -#: blame.c:1801

1083 +#: blame.c:1806

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

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

1086

1054 -#: blame.c:1822

1087 +#: blame.c:1827

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

1089 msgstr ""

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

1091 "incheckningen"

1092

1060 -#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963

1061 -#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932

1062 -#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406

1093 +#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993

1094 +#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936

1095 +#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407

1096 #: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152

1097 #: builtin/shortlog.c:192

1098 msgid "revision walk setup failed"

1099 msgstr "misslyckades skapa revisionstraversering"

1100

1068 -#: blame.c:1849

1101 +#: blame.c:1854

1102 msgid ""

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

1104 msgstr ""

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

1106 "kedjan"

1107

1075 -#: blame.c:1860

1108 +#: blame.c:1865

1109 #, c-format

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

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

1112

1080 -#: blame.c:1871

1113 +#: blame.c:1876

1114 #, c-format

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

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

@@ -1200,27 +1233,27 @@ msgstr ""

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

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

1235

1203 -#: branch.c:279

1236 +#: branch.c:280

1237 #, c-format

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

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

1240

1208 -#: branch.c:299

1241 +#: branch.c:300

1242 #, c-format

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

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

1245

1213 -#: branch.c:304

1246 +#: branch.c:305

1247 #, c-format

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

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

1250

1218 -#: branch.c:358

1251 +#: branch.c:359

1252 #, c-format

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

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

1255

1223 -#: branch.c:381

1256 +#: branch.c:382

1257 #, c-format

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

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

@@ -1235,70 +1268,70 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"

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

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

1270

1238 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722

1239 -#: builtin/commit.c:774

1271 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2215 sequencer.c:2763

1272 +#: builtin/commit.c:776

1273 #, c-format

1274 msgid "could not open '%s'"

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

1276

1244 -#: bundle.c:141

1277 +#: bundle.c:143

1278 msgid "Repository lacks these prerequisite commits:"

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

1280

1248 -#: bundle.c:192

1281 +#: bundle.c:194

1282 #, c-format

1283 msgid "The bundle contains this ref:"

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

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

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

1287

1255 -#: bundle.c:199

1288 +#: bundle.c:201

1289 msgid "The bundle records a complete history."

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

1291

1259 -#: bundle.c:201

1292 +#: bundle.c:203

1293 #, c-format

1294 msgid "The bundle requires this ref:"

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

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

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

1298

1266 -#: bundle.c:267

1299 +#: bundle.c:269

1300 msgid "unable to dup bundle descriptor"

1301 msgstr "kan inte duplicera pakethandtag"

1302

1270 -#: bundle.c:274

1303 +#: bundle.c:276

1304 msgid "Could not spawn pack-objects"

1305 msgstr "Kunde inte starta pack-objects"

1306

1274 -#: bundle.c:285

1307 +#: bundle.c:287

1308 msgid "pack-objects died"

1309 msgstr "pack-objects misslyckades"

1310

1278 -#: bundle.c:327

1311 +#: bundle.c:329

1312 msgid "rev-list died"

1313 msgstr "rev-list dog"

1314

1282 -#: bundle.c:376

1315 +#: bundle.c:378

1316 #, c-format

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

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

1319

1287 -#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304

1320 +#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306

1321 #, c-format

1322 msgid "unrecognized argument: %s"

1323 msgstr "okänt argument: %s"

1324

1292 -#: bundle.c:464

1325 +#: bundle.c:465

1326 msgid "Refusing to create empty bundle."

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

1328

1296 -#: bundle.c:474

1329 +#: bundle.c:475

1330 #, c-format

1331 msgid "cannot create '%s'"

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

1333

1301 -#: bundle.c:498

1334 +#: bundle.c:500

1335 msgid "index-pack died"

1336 msgstr "index-pack dog"

1337

@@ -1307,8 +1340,8 @@ msgstr "index-pack dog"

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

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

1342

1310 -#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414

1311 -#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376

1343 +#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399

1344 +#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376

1345 #: builtin/replace.c:448

1346 #, c-format

1347 msgid "could not parse %s"

@@ -1339,29 +1372,29 @@ msgstr ""

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

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

1374

1342 -#: commit.c:1115

1375 +#: commit.c:1122

1376 #, c-format

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

1378 msgstr ""

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

1380

1348 -#: commit.c:1118

1381 +#: commit.c:1125

1382 #, c-format

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

1384 msgstr ""

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

1386

1354 -#: commit.c:1121

1387 +#: commit.c:1128

1388 #, c-format

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

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

1391

1359 -#: commit.c:1124

1392 +#: commit.c:1131

1393 #, c-format

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

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

1396

1364 -#: commit.c:1378

1397 +#: commit.c:1385

1398 msgid ""

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

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

@@ -1371,92 +1404,134 @@ msgstr ""

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

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

1406

1374 -#: commit-graph.c:108

1407 +#: commit-graph.c:101

1408 #, c-format

1409 msgid "graph file %s is too small"

1410 msgstr "graffilen %s är för liten"

1411

1379 -#: commit-graph.c:115

1412 +#: commit-graph.c:136

1413 #, c-format

1414 msgid "graph signature %X does not match signature %X"

1415 msgstr "grafsignaturen %X stämmer inte med signaturen %X"

1416

1384 -#: commit-graph.c:122

1417 +#: commit-graph.c:143

1418 #, c-format

1419 msgid "graph version %X does not match version %X"

1420 msgstr "grafversionen %X stämmer inte med versionen %X"

1421

1389 -#: commit-graph.c:129

1422 +#: commit-graph.c:150

1423 #, c-format

1424 msgid "hash version %X does not match version %X"

1425 msgstr "hash-versionen %X stämmer inte med versionen %X"

1426

1394 -#: commit-graph.c:153

1427 +#: commit-graph.c:173

1428 +msgid "chunk lookup table entry missing; graph file may be incomplete"

1429 +msgstr ""

1430 +"post saknas i styckeuppslagningstabell; graffilen kan vara ofullständig"

1431 +

1432 +#: commit-graph.c:184

1433 #, c-format

1434 msgid "improper chunk offset %08x%08x"

1435 msgstr "felaktigt offset för stycke %08x%08x"

1436

1399 -#: commit-graph.c:189

1437 +#: commit-graph.c:221

1438 #, c-format

1439 msgid "chunk id %08x appears multiple times"

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

1441

1404 -#: commit-graph.c:308

1442 +#: commit-graph.c:334

1443 #, c-format

1444 msgid "could not find commit %s"

1445 msgstr "kunde inte hitta incheckningen %s"

1446

1409 -#: commit-graph.c:617 builtin/pack-objects.c:2652

1447 +#: commit-graph.c:671 builtin/pack-objects.c:2646

1448 #, c-format

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

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

1451

1414 -#: commit-graph.c:651

1415 -msgid "Annotating commits in commit graph"

1416 -msgstr "Dekorerar incheckningar i incheckningsgraf"

1452 +#: commit-graph.c:704

1453 +msgid "Loading known commits in commit graph"

1454 +msgstr "Läser in kända incheckningar i incheckningsgraf"

1455 +

1456 +#: commit-graph.c:720

1457 +msgid "Expanding reachable commits in commit graph"

1458 +msgstr "Expanderar nåbara incheckningar i incheckningsgraf"

1459

1418 -#: commit-graph.c:691

1460 +#: commit-graph.c:732

1461 +msgid "Clearing commit marks in commit graph"

1462 +msgstr "Rensar incheckningsmärken i incheckningsgraf"

1463 +

1464 +#: commit-graph.c:752

1465 msgid "Computing commit graph generation numbers"

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

1467

1422 -#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852

1423 -msgid "Finding commits for commit graph"

1424 -msgstr "Söker incheckningar för incheckingsgraf"

1468 +#: commit-graph.c:869

1469 +#, c-format

1470 +msgid "Finding commits for commit graph in %d pack"

1471 +msgid_plural "Finding commits for commit graph in %d packs"

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

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

1474

1426 -#: commit-graph.c:812

1475 +#: commit-graph.c:882

1476 #, c-format

1477 msgid "error adding pack %s"

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

1479

1431 -#: commit-graph.c:814

1480 +#: commit-graph.c:884

1481 #, c-format

1482 msgid "error opening index for %s"

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

1484

1436 -#: commit-graph.c:868

1485 +#: commit-graph.c:898

1486 +#, c-format

1487 +msgid "Finding commits for commit graph from %d ref"

1488 +msgid_plural "Finding commits for commit graph from %d refs"

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

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

1491 +

1492 +#: commit-graph.c:930

1493 +msgid "Finding commits for commit graph among packed objects"

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

1495 +

1496 +#: commit-graph.c:943

1497 +msgid "Counting distinct commits in commit graph"

1498 +msgstr "Räknar olika incheckningar i incheckningsgraf"

1499 +

1500 +#: commit-graph.c:956

1501 #, c-format

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

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

1504

1441 -#: commit-graph.c:895

1505 +#: commit-graph.c:965

1506 +msgid "Finding extra edges in commit graph"

1507 +msgstr "Söker ytterligare kanter i incheckingsgraf"

1508 +

1509 +#: commit-graph.c:989

1510 msgid "too many commits to write graph"

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

1512

1445 -#: commit-graph.c:902 midx.c:769

1513 +#: commit-graph.c:996 midx.c:769

1514 #, c-format

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

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

1517

1450 -#: commit-graph.c:1002

1518 +#: commit-graph.c:1036

1519 +#, c-format

1520 +msgid "Writing out commit graph in %d pass"

1521 +msgid_plural "Writing out commit graph in %d passes"

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

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

1524 +

1525 +#: commit-graph.c:1109

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

1527 msgstr ""

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

1529

1455 -#: commit-graph.c:1046

1530 +#: commit-graph.c:1153

1531 msgid "Verifying commits in commit graph"

1532 msgstr "Bekräftar incheckningar i incheckningsgraf"

1533

1459 -#: compat/obstack.c:405 compat/obstack.c:407

1534 +#: compat/obstack.c:406 compat/obstack.c:408

1535 msgid "memory exhausted"

1536 msgstr "minnet slut"

1537

@@ -1498,7 +1573,7 @@ msgstr "nyckeln innehåller inte ett stycke: %s"

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

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

1575

1501 -#: config.c:378 sequencer.c:2296

1576 +#: config.c:378 sequencer.c:2330

1577 #, c-format

1578 msgid "invalid key: %s"

1579 msgstr "felaktig nyckel: %s"

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

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

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

1718

1644 -#: config.c:1481 builtin/pack-objects.c:3391

1719 +#: config.c:1481 builtin/pack-objects.c:3394

1720 #, c-format

1721 msgid "bad pack compression level %d"

1722 msgstr "felaktig paketkomprimeringsgrad %d"

@@ -1715,62 +1790,62 @@ msgstr "%s har flera värden"

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

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

1792

1718 -#: config.c:2717 config.c:3041

1793 +#: config.c:2716 config.c:3040

1794 #, c-format

1795 msgid "could not lock config file %s"

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

1797

1723 -#: config.c:2728

1798 +#: config.c:2727

1799 #, c-format

1800 msgid "opening %s"

1801 msgstr "öppnar %s"

1802

1728 -#: config.c:2763 builtin/config.c:327

1803 +#: config.c:2762 builtin/config.c:328

1804 #, c-format

1805 msgid "invalid pattern: %s"

1806 msgstr "ogiltigt mönster: %s"

1807

1733 -#: config.c:2788

1808 +#: config.c:2787

1809 #, c-format

1810 msgid "invalid config file %s"

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

1812

1738 -#: config.c:2801 config.c:3054

1813 +#: config.c:2800 config.c:3053

1814 #, c-format

1815 msgid "fstat on %s failed"

1816 msgstr "fstat misslyckades på %s"

1817

1743 -#: config.c:2812

1818 +#: config.c:2811

1819 #, c-format

1820 msgid "unable to mmap '%s'"

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

1822

1748 -#: config.c:2821 config.c:3059

1823 +#: config.c:2820 config.c:3058

1824 #, c-format

1825 msgid "chmod on %s failed"

1826 msgstr "chmod misslyckades på %s"

1827

1753 -#: config.c:2906 config.c:3156

1828 +#: config.c:2905 config.c:3155

1829 #, c-format

1830 msgid "could not write config file %s"

1831 msgstr "kunde inte skriva konfigurationsfilen %s"

1832

1758 -#: config.c:2940

1833 +#: config.c:2939

1834 #, c-format

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

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

1837

1763 -#: config.c:2942 builtin/remote.c:782

1838 +#: config.c:2941 builtin/remote.c:782

1839 #, c-format

1840 msgid "could not unset '%s'"

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

1842

1768 -#: config.c:3032

1843 +#: config.c:3031

1844 #, c-format

1845 msgid "invalid section name: %s"

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

1847

1773 -#: config.c:3199

1848 +#: config.c:3198

1849 #, c-format

1850 msgid "missing value for '%s'"

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

@@ -1823,50 +1898,45 @@ msgstr "protokollfel: förväntade \"shallow sha-1\" fick \"%s\""

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

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

1900

1826 -#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63

1827 -#, c-format

1828 -msgid "remote error: %s"

1829 -msgstr "fjärrfel: %s"

1830 -

1831 -#: connect.c:316

1901 +#: connect.c:313

1902 msgid "invalid packet"

1903 msgstr "ogiltigt paket"

1904

1835 -#: connect.c:336

1905 +#: connect.c:333

1906 #, c-format

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

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

1909

1840 -#: connect.c:444

1910 +#: connect.c:441

1911 #, c-format

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

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

1914

1845 -#: connect.c:448

1915 +#: connect.c:445

1916 msgid "expected flush after ref listing"

1917 msgstr "oväntad \"flush\" efter ref-listan"

1918

1849 -#: connect.c:547

1919 +#: connect.c:544

1920 #, c-format

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

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

1923

1854 -#: connect.c:598

1924 +#: connect.c:595

1925 msgid "unable to set SO_KEEPALIVE on socket"

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

1927

1858 -#: connect.c:638 connect.c:701

1928 +#: connect.c:635 connect.c:698

1929 #, c-format

1930 msgid "Looking up %s ... "

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

1932

1863 -#: connect.c:642

1933 +#: connect.c:639

1934 #, c-format

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

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

1937

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

1869 -#: connect.c:646 connect.c:717

1939 +#: connect.c:643 connect.c:714

1940 #, c-format

1941 msgid ""

1942 "done.\n"

@@ -1875,7 +1945,7 @@ msgstr ""

1945 "klart.\n"

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

1947

1878 -#: connect.c:668 connect.c:745

1948 +#: connect.c:665 connect.c:742

1949 #, c-format

1950 msgid ""

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

@@ -1885,63 +1955,63 @@ msgstr ""

1955 "%s"

1956

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

1888 -#: connect.c:674 connect.c:751

1958 +#: connect.c:671 connect.c:748

1959 msgid "done."

1960 msgstr "klart."

1961

1892 -#: connect.c:705

1962 +#: connect.c:702

1963 #, c-format

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

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

1966

1897 -#: connect.c:711

1967 +#: connect.c:708

1968 #, c-format

1969 msgid "unknown port %s"

1970 msgstr "okänd port %s"

1971

1902 -#: connect.c:848 connect.c:1174

1972 +#: connect.c:845 connect.c:1171

1973 #, c-format

1974 msgid "strange hostname '%s' blocked"

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

1976

1907 -#: connect.c:850

1977 +#: connect.c:847

1978 #, c-format

1979 msgid "strange port '%s' blocked"

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

1981

1912 -#: connect.c:860

1982 +#: connect.c:857

1983 #, c-format

1984 msgid "cannot start proxy %s"

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

1986

1917 -#: connect.c:927

1987 +#: connect.c:924

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

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

1990

1921 -#: connect.c:1122

1991 +#: connect.c:1119

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

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

1994

1925 -#: connect.c:1134

1995 +#: connect.c:1131

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

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

1998

1929 -#: connect.c:1151

1999 +#: connect.c:1148

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

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

2002

1933 -#: connect.c:1262

2003 +#: connect.c:1259

2004 #, c-format

2005 msgid "strange pathname '%s' blocked"

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

2007

1938 -#: connect.c:1307

2008 +#: connect.c:1304

2009 msgid "unable to fork"

2010 msgstr "kunde inte grena (fork)"

2011

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

2013 # objects in the database.

1944 -#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147

2014 +#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146

2015 msgid "Checking connectivity"

2016 msgstr "Kontrollerar konnektivitet"

2017

@@ -1957,17 +2027,17 @@ msgstr "kunde inte skriva till rev-list"

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

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

2029

1960 -#: convert.c:194

2030 +#: convert.c:193

2031 #, c-format

2032 msgid "illegal crlf_action %d"

2033 msgstr "felaktig crlf_action %d"

2034

1965 -#: convert.c:207

2035 +#: convert.c:206

2036 #, c-format

2037 msgid "CRLF would be replaced by LF in %s"

2038 msgstr "CRLF skulle ersättas av LF i %s"

2039

1970 -#: convert.c:209

2040 +#: convert.c:208

2041 #, c-format

2042 msgid ""

2043 "CRLF will be replaced by LF in %s.\n"

@@ -1976,12 +2046,12 @@ msgstr ""

2046 "CRLF kommer att ersättas av LF i %s.\n"

2047 "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog"

2048

1979 -#: convert.c:217

2049 +#: convert.c:216

2050 #, c-format

2051 msgid "LF would be replaced by CRLF in %s"

2052 msgstr "LF skulle ersättas av CRLF i %s"

2053

1984 -#: convert.c:219

2054 +#: convert.c:218

2055 #, c-format

2056 msgid ""

2057 "LF will be replaced by CRLF in %s.\n"

@@ -1990,12 +2060,12 @@ msgstr ""

2060 "LF kommer att ersättas av CRLF i %s.\n"

2061 "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog"

2062

1993 -#: convert.c:280

2063 +#: convert.c:279

2064 #, c-format

2065 msgid "BOM is prohibited in '%s' if encoded as %s"

2066 msgstr "BOM är förbjudet i \"%s\" om kodat som %s"

2067

1998 -#: convert.c:287

2068 +#: convert.c:286

2069 #, c-format

2070 msgid ""

2071 "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"

@@ -2004,12 +2074,12 @@ msgstr ""

2074 "Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%s som "

2075 "teckenkodning i arbetskatalogen."

2076

2007 -#: convert.c:305

2077 +#: convert.c:304

2078 #, c-format

2079 msgid "BOM is required in '%s' if encoded as %s"

2080 msgstr "BOM krävs om \"%s\" kodas som %s"

2081

2012 -#: convert.c:307

2082 +#: convert.c:306

2083 #, c-format

2084 msgid ""

2085 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"

@@ -2018,38 +2088,38 @@ msgstr ""

2088 "Filen \"%s\" saknar byte order mark (BOM). Använd UTF-%sBE eller UTF-%sLE "

2089 "(beroende på byteordning) som teckenkodning i arbetskatalogen."

2090

2021 -#: convert.c:425 convert.c:496

2091 +#: convert.c:424 convert.c:495

2092 #, c-format

2093 msgid "failed to encode '%s' from %s to %s"

2094 msgstr "misslyckades omkoda \"%s\" från %s till %s"

2095

2026 -#: convert.c:468

2096 +#: convert.c:467

2097 #, c-format

2098 msgid "encoding '%s' from %s to %s and back is not the same"

2099 msgstr ""

2100 "omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat"

2101

2032 -#: convert.c:674

2102 +#: convert.c:673

2103 #, c-format

2104 msgid "cannot fork to run external filter '%s'"

2105 msgstr "kan inte grena (fork) för att köra externt filter \"%s\""

2106

2037 -#: convert.c:694

2107 +#: convert.c:693

2108 #, c-format

2109 msgid "cannot feed the input to external filter '%s'"

2110 msgstr "kunde inte skicka indata till externt filter \"%s\""

2111

2042 -#: convert.c:701

2112 +#: convert.c:700

2113 #, c-format

2114 msgid "external filter '%s' failed %d"

2115 msgstr "externt filter \"%s\" misslyckades %d"

2116

2047 -#: convert.c:736 convert.c:739

2117 +#: convert.c:735 convert.c:738

2118 #, c-format

2119 msgid "read from external filter '%s' failed"

2120 msgstr "läsning från externt filter \"%s\" misslyckades"

2121

2052 -#: convert.c:742 convert.c:796

2122 +#: convert.c:741 convert.c:796

2123 #, c-format

2124 msgid "external filter '%s' failed"

2125 msgstr "externt filter \"%s\" misslyckades"

@@ -2085,53 +2155,53 @@ msgstr "%s: \"clean\"-filtret \"%s\" misslyckades"

2155 msgid "%s: smudge filter %s failed"

2156 msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades"

2157

2088 -#: date.c:116

2158 +#: date.c:137

2159 msgid "in the future"

2160 msgstr "i framtiden"

2161

2092 -#: date.c:122

2162 +#: date.c:143

2163 #, c-format

2164 msgid "%<PRIuMAX> second ago"

2165 msgid_plural "%<PRIuMAX> seconds ago"

2166 msgstr[0] "%<PRIuMAX> sekund sedan"

2167 msgstr[1] "%<PRIuMAX> sekunder sedan"

2168

2099 -#: date.c:129

2169 +#: date.c:150

2170 #, c-format

2171 msgid "%<PRIuMAX> minute ago"

2172 msgid_plural "%<PRIuMAX> minutes ago"

2173 msgstr[0] "%<PRIuMAX> minut sedan"

2174 msgstr[1] "%<PRIuMAX> minuter sedan"

2175

2106 -#: date.c:136

2176 +#: date.c:157

2177 #, c-format

2178 msgid "%<PRIuMAX> hour ago"

2179 msgid_plural "%<PRIuMAX> hours ago"

2180 msgstr[0] "%<PRIuMAX> timme sedan"

2181 msgstr[1] "%<PRIuMAX> timmar sedan"

2182

2113 -#: date.c:143

2183 +#: date.c:164

2184 #, c-format

2185 msgid "%<PRIuMAX> day ago"

2186 msgid_plural "%<PRIuMAX> days ago"

2187 msgstr[0] "%<PRIuMAX> dag sedan"

2188 msgstr[1] "%<PRIuMAX> dagar sedan"

2189

2120 -#: date.c:149

2190 +#: date.c:170

2191 #, c-format

2192 msgid "%<PRIuMAX> week ago"

2193 msgid_plural "%<PRIuMAX> weeks ago"

2194 msgstr[0] "%<PRIuMAX> vecka sedan"

2195 msgstr[1] "%<PRIuMAX> veckor sedan"

2196

2127 -#: date.c:156

2197 +#: date.c:177

2198 #, c-format

2199 msgid "%<PRIuMAX> month ago"

2200 msgid_plural "%<PRIuMAX> months ago"

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

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

2203

2134 -#: date.c:167

2204 +#: date.c:188

2205 #, c-format

2206 msgid "%<PRIuMAX> year"

2207 msgid_plural "%<PRIuMAX> years"

@@ -2139,40 +2209,40 @@ msgstr[0] "%<PRIuMAX> år"

2209 msgstr[1] "%<PRIuMAX> år"

2210

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

2142 -#: date.c:170

2212 +#: date.c:191

2213 #, c-format

2214 msgid "%s, %<PRIuMAX> month ago"

2215 msgid_plural "%s, %<PRIuMAX> months ago"

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

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

2218

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

2219 +#: date.c:196 date.c:201

2220 #, c-format

2221 msgid "%<PRIuMAX> year ago"

2222 msgid_plural "%<PRIuMAX> years ago"

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

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

2225

2156 -#: delta-islands.c:268

2226 +#: delta-islands.c:272

2227 msgid "Propagating island marks"

2228 msgstr "Sprider ö-markeringar"

2229

2160 -#: delta-islands.c:286

2230 +#: delta-islands.c:290

2231 #, c-format

2232 msgid "bad tree object %s"

2233 msgstr "felaktigt trädobjektet %s"

2234

2165 -#: delta-islands.c:330

2235 +#: delta-islands.c:334

2236 #, c-format

2237 msgid "failed to load island regex for '%s': %s"

2238 msgstr "kunde inte hämta ö-regex för \"%s\": %s"

2239

2170 -#: delta-islands.c:386

2240 +#: delta-islands.c:390

2241 #, c-format

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

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

2244

2175 -#: delta-islands.c:462

2245 +#: delta-islands.c:466

2246 #, c-format

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

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

@@ -2209,25 +2279,30 @@ msgstr ""

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

2280 "\"blocks\", \"zebra\", \"dimmed_zebra\", \"plain\""

2281

2212 -#: diff.c:316

2282 +#: diff.c:319

2283 #, c-format

2214 -msgid "ignoring unknown color-moved-ws mode '%s'"

2215 -msgstr "ignorerar okänt läge för color-mode-ws \"%s\""

2284 +msgid ""

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

2286 +"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"

2287 +msgstr ""

2288 +"okänt läge \"%s\" för color-moved-ws, möjliga värden är \"ignore-space-change"

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

2290 +"\""

2291

2217 -#: diff.c:323

2292 +#: diff.c:327

2293 msgid ""

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

2220 -"space modes"

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

2295 +"whitespace modes"

2296 msgstr ""

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

2298 "blankstegslägen"

2299

2225 -#: diff.c:394

2300 +#: diff.c:400

2301 #, c-format

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

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

2304

2230 -#: diff.c:454

2305 +#: diff.c:460

2306 #, c-format

2307 msgid ""

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

@@ -2236,24 +2311,24 @@ msgstr ""

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

2312 "%s"

2313

2239 -#: diff.c:4140

2314 +#: diff.c:4211

2315 #, c-format

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

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

2318

2244 -#: diff.c:4482

2319 +#: diff.c:4553

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

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

2322

2248 -#: diff.c:4485

2323 +#: diff.c:4556

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

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

2326

2252 -#: diff.c:4563

2327 +#: diff.c:4634

2328 msgid "--follow requires exactly one pathspec"

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

2330

2256 -#: diff.c:4729

2331 +#: diff.c:4800

2332 #, c-format

2333 msgid ""

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

@@ -2262,61 +2337,61 @@ msgstr ""

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

2338 "%s"

2339

2265 -#: diff.c:4743

2340 +#: diff.c:4814

2341 #, c-format

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

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

2344

2270 -#: diff.c:5823

2345 +#: diff.c:5900

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

2347 msgstr ""

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

2349

2275 -#: diff.c:5826

2350 +#: diff.c:5903

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

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

2353

2279 -#: diff.c:5829

2354 +#: diff.c:5906

2355 #, c-format

2356 msgid ""

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

2358 msgstr ""

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

2360

2286 -#: dir.c:576

2361 +#: dir.c:538

2362 #, c-format

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

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

2365

2291 -#: dir.c:965

2366 +#: dir.c:927

2367 #, c-format

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

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

2370

2296 -#: dir.c:1880

2371 +#: dir.c:1842

2372 #, c-format

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

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

2375

2301 -#: dir.c:2122

2376 +#: dir.c:2084

2377 msgid "failed to get kernel name and information"

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

2379

2305 -#: dir.c:2246

2380 +#: dir.c:2208

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

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

2383

2309 -#: dir.c:3047

2384 +#: dir.c:3009

2385 #, c-format

2386 msgid "index file corrupt in repo %s"

2387 msgstr "indexfilen trasig i arkivet %s"

2388

2314 -#: dir.c:3092 dir.c:3097

2389 +#: dir.c:3054 dir.c:3059

2390 #, c-format

2391 msgid "could not create directories for %s"

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

2393

2319 -#: dir.c:3126

2394 +#: dir.c:3088

2395 #, c-format

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

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

@@ -2358,236 +2433,240 @@ msgstr "Fjärr utan URL"

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

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

2435

2361 -#: fetch-pack.c:163

2436 +#: fetch-pack.c:154

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

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

2439 +

2440 +#: fetch-pack.c:165

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

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

2443

2365 -#: fetch-pack.c:183

2444 +#: fetch-pack.c:185

2445 #, c-format

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

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

2448

2370 -#: fetch-pack.c:253

2449 +#: fetch-pack.c:256

2450 msgid "--stateless-rpc requires multi_ack_detailed"

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

2452

2374 -#: fetch-pack.c:347 fetch-pack.c:1277

2453 +#: fetch-pack.c:358 fetch-pack.c:1264

2454 #, c-format

2455 msgid "invalid shallow line: %s"

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

2457

2379 -#: fetch-pack.c:353 fetch-pack.c:1283

2458 +#: fetch-pack.c:364 fetch-pack.c:1271

2459 #, c-format

2460 msgid "invalid unshallow line: %s"

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

2462

2384 -#: fetch-pack.c:355 fetch-pack.c:1285

2463 +#: fetch-pack.c:366 fetch-pack.c:1273

2464 #, c-format

2465 msgid "object not found: %s"

2466 msgstr "objektet hittades inte: %s"

2467

2389 -#: fetch-pack.c:358 fetch-pack.c:1288

2468 +#: fetch-pack.c:369 fetch-pack.c:1276

2469 #, c-format

2470 msgid "error in object: %s"

2471 msgstr "fel i objekt: %s"

2472

2394 -#: fetch-pack.c:360 fetch-pack.c:1290

2473 +#: fetch-pack.c:371 fetch-pack.c:1278

2474 #, c-format

2475 msgid "no shallow found: %s"

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

2477

2399 -#: fetch-pack.c:363 fetch-pack.c:1293

2478 +#: fetch-pack.c:374 fetch-pack.c:1282

2479 #, c-format

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

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

2482

2404 -#: fetch-pack.c:404

2483 +#: fetch-pack.c:415

2484 #, c-format

2485 msgid "got %s %d %s"

2486 msgstr "fick %s %d %s"

2487

2409 -#: fetch-pack.c:421

2488 +#: fetch-pack.c:432

2489 #, c-format

2490 msgid "invalid commit %s"

2491 msgstr "ogiltig incheckning %s"

2492

2414 -#: fetch-pack.c:452

2493 +#: fetch-pack.c:463

2494 msgid "giving up"

2495 msgstr "ger upp"

2496

2418 -#: fetch-pack.c:464 progress.c:229

2497 +#: fetch-pack.c:475 progress.c:229

2498 msgid "done"

2499 msgstr "klart"

2500

2422 -#: fetch-pack.c:476

2501 +#: fetch-pack.c:487

2502 #, c-format

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

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

2505

2427 -#: fetch-pack.c:522

2506 +#: fetch-pack.c:533

2507 #, c-format

2508 msgid "Marking %s as complete"

2509 msgstr "Markerar %s som komplett"

2510

2432 -#: fetch-pack.c:764

2511 +#: fetch-pack.c:740

2512 #, c-format

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

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

2515

2437 -#: fetch-pack.c:803

2516 +#: fetch-pack.c:779

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

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

2519

2441 -#: fetch-pack.c:811

2520 +#: fetch-pack.c:787

2521 msgid "protocol error: bad pack header"

2522 msgstr "protokollfel: felaktigt packhuvud"

2523

2445 -#: fetch-pack.c:879

2524 +#: fetch-pack.c:855

2525 #, c-format

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

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

2528

2450 -#: fetch-pack.c:895

2529 +#: fetch-pack.c:871

2530 #, c-format

2531 msgid "%s failed"

2532 msgstr "%s misslyckades"

2533

2455 -#: fetch-pack.c:897

2534 +#: fetch-pack.c:873

2535 msgid "error in sideband demultiplexer"

2536 msgstr "fel i sidbands-avmultiplexare"

2537

2459 -#: fetch-pack.c:926

2538 +#: fetch-pack.c:902

2539 msgid "Server does not support shallow clients"

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

2541

2463 -#: fetch-pack.c:930

2542 +#: fetch-pack.c:906

2543 msgid "Server supports multi_ack_detailed"

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

2545

2467 -#: fetch-pack.c:933

2546 +#: fetch-pack.c:909

2547 msgid "Server supports no-done"

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

2549

2471 -#: fetch-pack.c:939

2550 +#: fetch-pack.c:915

2551 msgid "Server supports multi_ack"

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

2553

2475 -#: fetch-pack.c:943

2554 +#: fetch-pack.c:919

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

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

2557

2479 -#: fetch-pack.c:947

2558 +#: fetch-pack.c:923

2559 msgid "Server supports side-band"

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

2561

2483 -#: fetch-pack.c:951

2562 +#: fetch-pack.c:927

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

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

2565

2487 -#: fetch-pack.c:955

2566 +#: fetch-pack.c:931

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

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

2569

2491 -#: fetch-pack.c:965

2570 +#: fetch-pack.c:941

2571 msgid "Server supports ofs-delta"

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

2573

2495 -#: fetch-pack.c:971 fetch-pack.c:1158

2574 +#: fetch-pack.c:947 fetch-pack.c:1140

2575 msgid "Server supports filter"

2576 msgstr "Servern stöder filter"

2577

2499 -#: fetch-pack.c:979

2578 +#: fetch-pack.c:955

2579 #, c-format

2580 msgid "Server version is %.*s"

2581 msgstr "Serverversionen är %.*s"

2582

2504 -#: fetch-pack.c:985

2583 +#: fetch-pack.c:961

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

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

2586

2508 -#: fetch-pack.c:989

2587 +#: fetch-pack.c:965

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

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

2590

2512 -#: fetch-pack.c:991

2591 +#: fetch-pack.c:967

2592 msgid "Server does not support --deepen"

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

2594

2516 -#: fetch-pack.c:1008

2595 +#: fetch-pack.c:984

2596 msgid "no common commits"

2597 msgstr "inga gemensamma incheckningar"

2598

2520 -#: fetch-pack.c:1020 fetch-pack.c:1418

2599 +#: fetch-pack.c:996 fetch-pack.c:1419

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

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

2602

2524 -#: fetch-pack.c:1153

2603 +#: fetch-pack.c:1134

2604 msgid "Server does not support shallow requests"

2605 msgstr "Servern stöder inte grunda förfrågningar"

2606

2528 -#: fetch-pack.c:1199

2607 +#: fetch-pack.c:1184

2608 #, c-format

2609 msgid "error reading section header '%s'"

2610 msgstr "fel vid läsning av styckehuvudet \"%s\""

2611

2533 -#: fetch-pack.c:1205

2612 +#: fetch-pack.c:1190

2613 #, c-format

2614 msgid "expected '%s', received '%s'"

2615 msgstr "förväntade \"%s\", tog emot \"%s\""

2616

2538 -#: fetch-pack.c:1244

2617 +#: fetch-pack.c:1229

2618 #, c-format

2619 msgid "unexpected acknowledgment line: '%s'"

2620 msgstr "förväntade bekräftelserad: \"%s\""

2621

2543 -#: fetch-pack.c:1249

2622 +#: fetch-pack.c:1234

2623 #, c-format

2624 msgid "error processing acks: %d"

2625 msgstr "fel vid hantering av bekräftelser: %d"

2626

2548 -#: fetch-pack.c:1259

2627 +#: fetch-pack.c:1244

2628 msgid "expected packfile to be sent after 'ready'"

2629 msgstr "väntade att paketfil skulle sändas efter \"ready\""

2630

2552 -#: fetch-pack.c:1261

2631 +#: fetch-pack.c:1246

2632 msgid "expected no other sections to be sent after no 'ready'"

2633 msgstr ""

2634 "väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""

2635

2557 -#: fetch-pack.c:1298

2636 +#: fetch-pack.c:1287

2637 #, c-format

2638 msgid "error processing shallow info: %d"

2639 msgstr "fel vid hantering av grund (\"shallow\") info: %d"

2640

2562 -#: fetch-pack.c:1314

2641 +#: fetch-pack.c:1308

2642 #, c-format

2643 msgid "expected wanted-ref, got '%s'"

2644 msgstr "förväntade wanted-ref, fick %s"

2645

2567 -#: fetch-pack.c:1324

2646 +#: fetch-pack.c:1318

2647 #, c-format

2648 msgid "unexpected wanted-ref: '%s'"

2649 msgstr "oväntad wanted-ref: \"%s\""

2650

2572 -#: fetch-pack.c:1328

2651 +#: fetch-pack.c:1322

2652 #, c-format

2653 msgid "error processing wanted refs: %d"

2654 msgstr "fel vid hantering av önskade referenser: %d"

2655

2577 -#: fetch-pack.c:1642

2656 +#: fetch-pack.c:1646

2657 msgid "no matching remote head"

2658 msgstr "inget motsvarande fjärrhuvud"

2659

2581 -#: fetch-pack.c:1660 builtin/clone.c:664

2660 +#: fetch-pack.c:1664 builtin/clone.c:671

2661 msgid "remote did not send all necessary objects"

2662 msgstr "fjärren sände inte alla nödvändiga objekt"

2663

2585 -#: fetch-pack.c:1686

2664 +#: fetch-pack.c:1690

2665 #, c-format

2666 msgid "no such remote ref %s"

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

2668

2590 -#: fetch-pack.c:1689

2669 +#: fetch-pack.c:1693

2670 #, c-format

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

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

@@ -2615,8 +2694,8 @@ msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"

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

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

2696

2618 -#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

2619 -#: builtin/rm.c:134

2697 +#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82

2698 +#: builtin/rm.c:135

2699 #, c-format

2700 msgid "failed to stat '%s'"

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

@@ -2678,41 +2757,41 @@ msgstr "Lågnivåkommandon / synka arkiv"

2757 msgid "Low-level Commands / Internal Helpers"

2758 msgstr "Lågnivåkommandon / interna hjälpare"

2759

2681 -#: help.c:296

2760 +#: help.c:298

2761 #, c-format

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

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

2764

2686 -#: help.c:303

2765 +#: help.c:305

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

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

2768

2690 -#: help.c:312

2769 +#: help.c:314

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

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

2772

2694 -#: help.c:361 git.c:90

2773 +#: help.c:363 git.c:90

2774 #, c-format

2775 msgid "unsupported command listing type '%s'"

2776 msgstr "okänd kommandolisttyp \"%s\""

2777

2699 -#: help.c:408

2778 +#: help.c:410

2779 msgid "The common Git guides are:"

2780 msgstr "De vanliga Git-vägledningarna är:"

2781

2703 -#: help.c:517

2782 +#: help.c:519

2783 msgid "See 'git help <command>' to read about a specific subcommand"

2784 msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando"

2785

2707 -#: help.c:522

2786 +#: help.c:524

2787 msgid "External commands"

2788 msgstr "Externa kommandon"

2789

2711 -#: help.c:530

2790 +#: help.c:539

2791 msgid "Command aliases"

2792 msgstr "Kommadoalias"

2793

2715 -#: help.c:594

2794 +#: help.c:603

2795 #, c-format

2796 msgid ""

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

@@ -2721,32 +2800,32 @@ msgstr ""

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

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

2802

2724 -#: help.c:653

2803 +#: help.c:662

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

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

2806

2728 -#: help.c:675

2807 +#: help.c:684

2808 #, c-format

2809 msgid "WARNING: You called a Git command named '%s', which does not exist."

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

2811

2733 -#: help.c:680

2812 +#: help.c:689

2813 #, c-format

2814 msgid "Continuing under the assumption that you meant '%s'."

2815 msgstr "Fortsätter under förutsättningen att du menade ”%s”."

2816

2738 -#: help.c:685

2817 +#: help.c:694

2818 #, c-format

2819 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

2820 msgstr ""

2821 "Fortsätter om %0.1f sekunder, under förutsättningen att du menade ”%s”."

2822

2744 -#: help.c:693

2823 +#: help.c:702

2824 #, c-format

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

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

2827

2749 -#: help.c:697

2828 +#: help.c:706

2829 msgid ""

2830 "\n"

2831 "The most similar command is"

@@ -2760,16 +2839,16 @@ msgstr[1] ""

2839 "\n"

2840 "Mest lika kommandon är"

2841

2763 -#: help.c:712

2842 +#: help.c:721

2843 msgid "git version [<options>]"

2844 msgstr "git version [<flaggor>]"

2845

2767 -#: help.c:780

2846 +#: help.c:789

2847 #, c-format

2848 msgid "%s: %s - %s"

2849 msgstr "%s: %s - %s"

2850

2772 -#: help.c:784

2851 +#: help.c:793

2852 msgid ""

2853 "\n"

2854 "Did you mean this?"

@@ -2837,20 +2916,20 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet"

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

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

2918

2840 -#: ident.c:419 builtin/commit.c:606

2919 +#: ident.c:419 builtin/commit.c:608

2920 #, c-format

2921 msgid "invalid date format: %s"

2922 msgstr "felaktigt datumformat: %s"

2923

2845 -#: list-objects-filter-options.c:35

2924 +#: list-objects-filter-options.c:36

2925 msgid "multiple filter-specs cannot be combined"

2926 msgstr "flera filterspecifikationer kan inte kombineras"

2927

2928 #: list-objects-filter-options.c:58

2850 -msgid "only 'tree:0' is supported"

2851 -msgstr "endast \"tree:0\" stöds"

2929 +msgid "expected 'tree:<depth>'"

2930 +msgstr "förväntade \"tree:<djup>\""

2931

2853 -#: list-objects-filter-options.c:137

2932 +#: list-objects-filter-options.c:152

2933 msgid "cannot change partial clone promisor remote"

2934 msgstr "kan inte ändra kontraktsfjärr för delvis kloning"

2935

@@ -2883,99 +2962,99 @@ msgstr "Kunde inte skapa \"%s.lock\": %s"

2962 msgid "failed to read the cache"

2963 msgstr "misslyckades läsa cachen"

2964

2886 -#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933

2887 -#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764

2965 +#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918

2966 +#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771

2967 msgid "unable to write new index file"

2968 msgstr "kunde inte skriva ny indexfil"

2969

2891 -#: merge-recursive.c:323

2970 +#: merge-recursive.c:332

2971 msgid "(bad commit)\n"

2972 msgstr "(felaktig incheckning)\n"

2973

2895 -#: merge-recursive.c:345

2974 +#: merge-recursive.c:355

2975 #, c-format

2976 msgid "add_cacheinfo failed for path '%s'; merge aborting."

2977 msgstr ""

2978 "add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."

2979

2901 -#: merge-recursive.c:353

2980 +#: merge-recursive.c:364

2981 #, c-format

2982 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

2983 msgstr ""

2984 "add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar "

2985 "sammanslagningen."

2986

2908 -#: merge-recursive.c:435

2987 +#: merge-recursive.c:447

2988 msgid "error building trees"

2989 msgstr "fel vid byggande av träd"

2990

2912 -#: merge-recursive.c:906

2991 +#: merge-recursive.c:902

2992 #, c-format

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

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

2995

2917 -#: merge-recursive.c:917

2996 +#: merge-recursive.c:913

2997 #, c-format

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

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

3000

2922 -#: merge-recursive.c:931 merge-recursive.c:950

3001 +#: merge-recursive.c:927 merge-recursive.c:946

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

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

3004

2926 -#: merge-recursive.c:940

3005 +#: merge-recursive.c:936

3006 #, c-format

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

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

3009

2931 -#: merge-recursive.c:982 builtin/cat-file.c:39

3010 +#: merge-recursive.c:978 builtin/cat-file.c:40

3011 #, c-format

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

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

3014

2936 -#: merge-recursive.c:984

3015 +#: merge-recursive.c:980

3016 #, c-format

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

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

3019

2941 -#: merge-recursive.c:1008

3020 +#: merge-recursive.c:1004

3021 #, c-format

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

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

3024

2946 -#: merge-recursive.c:1019

3025 +#: merge-recursive.c:1015

3026 #, c-format

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

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

3029

2951 -#: merge-recursive.c:1024

3030 +#: merge-recursive.c:1020

3031 #, c-format

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

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

3034

2956 -#: merge-recursive.c:1212

3035 +#: merge-recursive.c:1211

3036 #, c-format

3037 msgid "Failed to merge submodule %s (not checked out)"

3038 msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"

3039

2961 -#: merge-recursive.c:1219

3040 +#: merge-recursive.c:1218

3041 #, c-format

3042 msgid "Failed to merge submodule %s (commits not present)"

3043 msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"

3044

2966 -#: merge-recursive.c:1226

3045 +#: merge-recursive.c:1225

3046 #, c-format

3047 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

3048 msgstr ""

3049 "Misslyckades slå ihop undermodulen %s (incheckningar följer inte "

3050 "sammanslagningsbasen)"

3051

2973 -#: merge-recursive.c:1234 merge-recursive.c:1246

3052 +#: merge-recursive.c:1233 merge-recursive.c:1245

3053 #, c-format

3054 msgid "Fast-forwarding submodule %s to the following commit:"

3055 msgstr "Snabbspolar undermodulen %s till följande incheckning:"

3056

2978 -#: merge-recursive.c:1237 merge-recursive.c:1249

3057 +#: merge-recursive.c:1236 merge-recursive.c:1248

3058 #, c-format

3059 msgid "Fast-forwarding submodule %s"

3060 msgstr "Snabbspolar undermodulen %s"

@@ -3019,26 +3098,26 @@ msgid "Failed to merge submodule %s (multiple merges found)"

3098 msgstr ""

3099 "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"

3100

3022 -#: merge-recursive.c:1358

3101 +#: merge-recursive.c:1361

3102 msgid "Failed to execute internal merge"

3103 msgstr "Misslyckades exekvera intern sammanslagning"

3104

3026 -#: merge-recursive.c:1363

3105 +#: merge-recursive.c:1366

3106 #, c-format

3107 msgid "Unable to add %s to database"

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

3109

3031 -#: merge-recursive.c:1395

3110 +#: merge-recursive.c:1398

3111 #, c-format

3112 msgid "Auto-merging %s"

3113 msgstr "Slår ihop %s automatiskt"

3114

3036 -#: merge-recursive.c:1416

3115 +#: merge-recursive.c:1419

3116 #, c-format

3117 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

3118 msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."

3119

3041 -#: merge-recursive.c:1483

3120 +#: merge-recursive.c:1486

3121 #, c-format

3122 msgid ""

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

@@ -3047,7 +3126,7 @@ msgstr ""

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

3127 "i trädet."

3128

3050 -#: merge-recursive.c:1488

3129 +#: merge-recursive.c:1491

3130 #, c-format

3131 msgid ""

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

@@ -3056,7 +3135,7 @@ msgstr ""

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

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

3137

3059 -#: merge-recursive.c:1495

3138 +#: merge-recursive.c:1498

3139 #, c-format

3140 msgid ""

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

@@ -3065,7 +3144,7 @@ msgstr ""

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

3145 "i trädet vid %s."

3146

3068 -#: merge-recursive.c:1500

3147 +#: merge-recursive.c:1503

3148 #, c-format

3149 msgid ""

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

@@ -3074,31 +3153,40 @@ msgstr ""

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

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

3155

3077 -#: merge-recursive.c:1534

3156 +#: merge-recursive.c:1537

3157 msgid "rename"

3158 msgstr "namnbyte"

3159

3081 -#: merge-recursive.c:1534

3160 +#: merge-recursive.c:1537

3161 msgid "renamed"

3162 msgstr "namnbytt"

3163

3085 -#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369

3086 -#: merge-recursive.c:3124

3164 +#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213

3165 #, c-format

3166 msgid "Refusing to lose dirty file at %s"

3167 msgstr "Vägrar förlora lortig fil vid \"%s\""

3168

3091 -#: merge-recursive.c:1602

3169 +#: merge-recursive.c:1643

3170 +#, c-format

3171 +msgid "Refusing to lose untracked file at %s, even though it's in the way."

3172 +msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."

3173 +

3174 +#: merge-recursive.c:1706

3175 +#, c-format

3176 +msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

3177 +msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s"

3178 +

3179 +#: merge-recursive.c:1734

3180 #, c-format

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

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

3183

3096 -#: merge-recursive.c:1607

3184 +#: merge-recursive.c:1739

3185 #, c-format

3186 msgid "Refusing to lose untracked file at %s; adding as %s instead"

3187 msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"

3188

3101 -#: merge-recursive.c:1633

3189 +#: merge-recursive.c:1759

3190 #, c-format

3191 msgid ""

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

@@ -3107,27 +3195,17 @@ msgstr ""

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

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

3197

3110 -#: merge-recursive.c:1638

3198 +#: merge-recursive.c:1764

3199 msgid " (left unresolved)"

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

3201

3114 -#: merge-recursive.c:1699

3202 +#: merge-recursive.c:1868

3203 #, c-format

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

3205 msgstr ""

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

3207

3120 -#: merge-recursive.c:1734

3121 -#, c-format

3122 -msgid "Renaming %s to %s and %s to %s instead"

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

3124 -

3125 -#: merge-recursive.c:1746

3126 -#, c-format

3127 -msgid "Refusing to lose untracked file at %s, even though it's in the way."

3128 -msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."

3129 -

3130 -#: merge-recursive.c:1952

3208 +#: merge-recursive.c:2064

3209 #, c-format

3210 msgid ""

3211 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -3138,7 +3216,7 @@ msgstr ""

3216 "katalogen %s bytte namn till flera andra kataloger, utan att någon "

3217 "destination fick en majoritet av filerna."

3218

3141 -#: merge-recursive.c:1984

3219 +#: merge-recursive.c:2096

3220 #, c-format

3221 msgid ""

3222 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -3147,7 +3225,7 @@ msgstr ""

3225 "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "

3226 "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."

3227

3150 -#: merge-recursive.c:1994

3228 +#: merge-recursive.c:2106

3229 #, c-format

3230 msgid ""

3231 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -3156,7 +3234,7 @@ msgstr ""

3234 "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "

3235 "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"

3236

3159 -#: merge-recursive.c:2086

3237 +#: merge-recursive.c:2198

3238 #, c-format

3239 msgid ""

3240 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -3165,7 +3243,7 @@ msgstr ""

3243 "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "

3244 "%s->%s i %s"

3245

3168 -#: merge-recursive.c:2331

3246 +#: merge-recursive.c:2443

3247 #, c-format

3248 msgid ""

3249 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -3174,86 +3252,81 @@ msgstr ""

3252 "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "

3253 "bytt namn."

3254

3177 -#: merge-recursive.c:2737

3178 -#, c-format

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

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

3181 -

3182 -#: merge-recursive.c:2763

3183 -#, c-format

3184 -msgid "Adding merged %s"

3185 -msgstr "Lägger till sammanslagen %s"

3186 -

3187 -#: merge-recursive.c:2770 merge-recursive.c:3127

3188 -#, c-format

3189 -msgid "Adding as %s instead"

3190 -msgstr "Lägger till som %s istället"

3191 -

3192 -#: merge-recursive.c:2934

3255 +#: merge-recursive.c:3022

3256 #, c-format

3257 msgid "cannot read object %s"

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

3259

3197 -#: merge-recursive.c:2937

3260 +#: merge-recursive.c:3025

3261 #, c-format

3262 msgid "object %s is not a blob"

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

3264

3202 -#: merge-recursive.c:3006

3265 +#: merge-recursive.c:3094

3266 msgid "modify"

3267 msgstr "ändra"

3268

3206 -#: merge-recursive.c:3006

3269 +#: merge-recursive.c:3094

3270 msgid "modified"

3271 msgstr "ändrad"

3272

3210 -#: merge-recursive.c:3017

3273 +#: merge-recursive.c:3105

3274 msgid "content"

3275 msgstr "innehåll"

3276

3214 -#: merge-recursive.c:3024

3277 +#: merge-recursive.c:3112

3278 msgid "add/add"

3279 msgstr "tillägg/tillägg"

3280

3218 -#: merge-recursive.c:3071

3281 +#: merge-recursive.c:3160

3282 #, c-format

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

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

3285

3223 -#: merge-recursive.c:3093 git-submodule.sh:858

3286 +#: merge-recursive.c:3182 git-submodule.sh:861

3287 msgid "submodule"

3288 msgstr "undermodul"

3289

3227 -#: merge-recursive.c:3094

3290 +#: merge-recursive.c:3183

3291 #, c-format

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

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

3294

3295 #: merge-recursive.c:3216

3296 #, c-format

3297 +msgid "Adding as %s instead"

3298 +msgstr "Lägger till som %s istället"

3299 +

3300 +#: merge-recursive.c:3319

3301 +#, c-format

3302 msgid "Removing %s"

3303 msgstr "Tar bort %s"

3304

3237 -#: merge-recursive.c:3242

3305 +#: merge-recursive.c:3345

3306 msgid "file/directory"

3307 msgstr "fil/katalog"

3308

3241 -#: merge-recursive.c:3248

3309 +#: merge-recursive.c:3351

3310 msgid "directory/file"

3311 msgstr "katalog/fil"

3312

3245 -#: merge-recursive.c:3255

3313 +#: merge-recursive.c:3358

3314 #, c-format

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

3316 msgstr ""

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

3318

3251 -#: merge-recursive.c:3264

3319 +#: merge-recursive.c:3367

3320 #, c-format

3321 msgid "Adding %s"

3322 msgstr "Lägger till %s"

3323

3256 -#: merge-recursive.c:3300

3324 +#: merge-recursive.c:3376

3325 +#, c-format

3326 +msgid "CONFLICT (add/add): Merge conflict in %s"

3327 +msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"

3328 +

3329 +#: merge-recursive.c:3417

3330 #, c-format

3331 msgid ""

3332 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3263,36 +3336,36 @@ msgstr ""

3336 "sammanslagning:\n"

3337 " %s"

3338

3266 -#: merge-recursive.c:3311

3339 +#: merge-recursive.c:3428

3340 msgid "Already up to date!"

3341 msgstr "Redan à jour!"

3342

3270 -#: merge-recursive.c:3320

3343 +#: merge-recursive.c:3437

3344 #, c-format

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

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

3347

3275 -#: merge-recursive.c:3419

3348 +#: merge-recursive.c:3536

3349 msgid "Merging:"

3350 msgstr "Slår ihop:"

3351

3279 -#: merge-recursive.c:3432

3352 +#: merge-recursive.c:3549

3353 #, c-format

3354 msgid "found %u common ancestor:"

3355 msgid_plural "found %u common ancestors:"

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

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

3358

3286 -#: merge-recursive.c:3471

3359 +#: merge-recursive.c:3588

3360 msgid "merge returned no commit"

3361 msgstr "sammanslagningen returnerade ingen incheckning"

3362

3290 -#: merge-recursive.c:3537

3363 +#: merge-recursive.c:3654

3364 #, c-format

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

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

3367

3295 -#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849

3368 +#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850

3369 msgid "Unable to write index."

3370 msgstr "Kunde inte skriva indexet."

3371

@@ -3409,22 +3482,22 @@ msgstr "misslyckades läsa paketindex för paketfil %s"

3482 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

3483 msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"

3484

3412 -#: name-hash.c:532

3485 +#: name-hash.c:531

3486 #, c-format

3487 msgid "unable to create lazy_dir thread: %s"

3488 msgstr "misslyckades skapa lazy_dir-tråd: %s"

3489

3417 -#: name-hash.c:554

3490 +#: name-hash.c:553

3491 #, c-format

3492 msgid "unable to create lazy_name thread: %s"

3493 msgstr "misslyckades skapa lazy_name-tråd: %s"

3494

3422 -#: name-hash.c:560

3495 +#: name-hash.c:559

3496 #, c-format

3497 msgid "unable to join lazy_name thread: %s"

3498 msgstr "misslyckades utföra join på lazy_name-tråd: %s"

3499

3427 -#: notes-merge.c:275

3500 +#: notes-merge.c:277

3501 #, c-format

3502 msgid ""

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

@@ -3436,21 +3509,21 @@ msgstr ""

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

3510 "ny antecknings-sammanslagning."

3511

3439 -#: notes-merge.c:282

3512 +#: notes-merge.c:284

3513 #, c-format

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

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

3516

3444 -#: notes-utils.c:45

3517 +#: notes-utils.c:46

3518 msgid "Cannot commit uninitialized/unreferenced notes tree"

3519 msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"

3520

3448 -#: notes-utils.c:104

3521 +#: notes-utils.c:105

3522 #, c-format

3523 msgid "Bad notes.rewriteMode value: '%s'"

3524 msgstr "Felaktigt värde för notes.rewriteMode: '%s'"

3525

3453 -#: notes-utils.c:114

3526 +#: notes-utils.c:115

3527 #, c-format

3528 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

3529 msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"

@@ -3459,7 +3532,7 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"

3532 #. the environment variable, the second %s is

3533 #. its value.

3534 #.

3462 -#: notes-utils.c:144

3535 +#: notes-utils.c:145

3536 #, c-format

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

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

@@ -3469,45 +3542,105 @@ msgstr "Felaktigt värde på %s: \"%s\""

3542 msgid "invalid object type \"%s\""

3543 msgstr "ogiltig objekttyp \"%s\""

3544

3472 -#: object.c:173

3545 +#: object.c:174

3546 #, c-format

3547 msgid "object %s is a %s, not a %s"

3548 msgstr "objektet %s är en %s, inte en %s"

3549

3477 -#: object.c:233

3550 +#: object.c:234

3551 #, c-format

3552 msgid "object %s has unknown type id %d"

3553 msgstr "objektet %s har okänd typ-id %d"

3554

3482 -#: object.c:246

3555 +#: object.c:247

3556 #, c-format

3557 msgid "unable to parse object: %s"

3558 msgstr "kunde inte tolka objektet: %s"

3559

3487 -#: object.c:266 object.c:277

3560 +#: object.c:267 object.c:278

3561 #, c-format

3489 -msgid "sha1 mismatch %s"

3490 -msgstr "sha1 stämmer inte överens %s"

3562 +msgid "hash mismatch %s"

3563 +msgstr "hashvärde stämmer inte överens %s"

3564

3565 #: packfile.c:607

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

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

3568

3496 -#: packfile.c:1864

3569 +#: packfile.c:1870

3570 #, c-format

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

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

3573

3501 -#: packfile.c:1868

3574 +#: packfile.c:1874

3575 #, c-format

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

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

3578

3506 -#: parse-options.c:672

3579 +#: parse-options.c:35

3580 +#, c-format

3581 +msgid "%s requires a value"

3582 +msgstr "%s behöver ett värde"

3583 +

3584 +#: parse-options.c:69

3585 +#, c-format

3586 +msgid "%s is incompatible with %s"

3587 +msgstr "%s är inkompatibel med %s"

3588 +

3589 +#: parse-options.c:74

3590 +#, c-format

3591 +msgid "%s : incompatible with something else"

3592 +msgstr "%s: inkompatibelt med något annat"

3593 +

3594 +#: parse-options.c:88 parse-options.c:92 parse-options.c:260

3595 +#, c-format

3596 +msgid "%s takes no value"

3597 +msgstr "%s tar inget värde"

3598 +

3599 +#: parse-options.c:90

3600 +#, c-format

3601 +msgid "%s isn't available"

3602 +msgstr "%s är inte tillgängligt"

3603 +

3604 +#: parse-options.c:178

3605 +#, c-format

3606 +msgid "%s expects a numerical value"

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

3608 +

3609 +#: parse-options.c:194

3610 +#, c-format

3611 +msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

3612 +msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix"

3613 +

3614 +#: parse-options.c:322

3615 +#, c-format

3616 +msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

3617 +msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"

3618 +

3619 +#: parse-options.c:356 parse-options.c:364

3620 +#, c-format

3621 +msgid "did you mean `--%s` (with two dashes ?)"

3622 +msgstr "menade du \"--%s\" (med två bindestreck?)"

3623 +

3624 +#: parse-options.c:649

3625 +#, c-format

3626 +msgid "unknown option `%s'"

3627 +msgstr "okänd flagga \"%s\""

3628 +

3629 +#: parse-options.c:651

3630 +#, c-format

3631 +msgid "unknown switch `%c'"

3632 +msgstr "okänd flagga \"%c\""

3633 +

3634 +#: parse-options.c:653

3635 +#, c-format

3636 +msgid "unknown non-ascii option in string: `%s'"

3637 +msgstr "okänd icke-ascii-flagga i strängen: \"%s\""

3638 +

3639 +#: parse-options.c:675

3640 msgid "..."

3641 msgstr "..."

3642

3510 -#: parse-options.c:691

3643 +#: parse-options.c:694

3644 #, c-format

3645 msgid "usage: %s"

3646 msgstr "användning: %s"

@@ -3515,26 +3648,37 @@ msgstr "användning: %s"

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

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

3650 #.

3518 -#: parse-options.c:697

3651 +#: parse-options.c:700

3652 #, c-format

3653 msgid " or: %s"

3654 msgstr " eller: %s"

3655

3523 -#: parse-options.c:700

3656 +#: parse-options.c:703

3657 #, c-format

3658 msgid " %s"

3659 msgstr " %s"

3660

3528 -#: parse-options.c:739

3661 +#: parse-options.c:742

3662 msgid "-NUM"

3663 msgstr "-TAL"

3664

3532 -#: parse-options-cb.c:37

3665 +#: parse-options-cb.c:21

3666 +#, c-format

3667 +msgid "option `%s' expects a numerical value"

3668 +msgstr "flaggan \"%s\" antar ett numeriskt värde"

3669 +

3670 +#: parse-options-cb.c:38

3671 #, c-format

3672 msgid "malformed expiration date '%s'"

3673 msgstr "trasigt utlöpsdatum: ”%s”"

3674

3537 -#: parse-options-cb.c:109

3675 +#: parse-options-cb.c:51

3676 +#, c-format

3677 +msgid "option `%s' expects \"always\", \"auto\", or \"never\""

3678 +msgstr ""

3679 +"flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)"

3680 +

3681 +#: parse-options-cb.c:110

3682 #, c-format

3683 msgid "malformed object name '%s'"

3684 msgstr "felformat objektnamn \"%s\""

@@ -3544,29 +3688,29 @@ msgstr "felformat objektnamn \"%s\""

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

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

3690

3547 -#: pathspec.c:129

3691 +#: pathspec.c:128

3692 msgid "Escape character '\\' not allowed as last character in attr value"

3693 msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde"

3694

3551 -#: pathspec.c:147

3695 +#: pathspec.c:146

3696 msgid "Only one 'attr:' specification is allowed."

3697 msgstr "Endast en \"attr:\"-angivelse tillåten."

3698

3555 -#: pathspec.c:150

3699 +#: pathspec.c:149

3700 msgid "attr spec must not be empty"

3701 msgstr "attr-angivelse kan inte vara tom"

3702

3559 -#: pathspec.c:193

3703 +#: pathspec.c:192

3704 #, c-format

3705 msgid "invalid attribute name %s"

3706 msgstr "ogiltigt attributnamn %s"

3707

3564 -#: pathspec.c:258

3708 +#: pathspec.c:257

3709 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

3710 msgstr ""

3711 "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla"

3712

3569 -#: pathspec.c:265

3713 +#: pathspec.c:264

3714 msgid ""

3715 "global 'literal' pathspec setting is incompatible with all other global "

3716 "pathspec settings"

@@ -3574,46 +3718,46 @@ msgstr ""

3718 "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra "

3719 "globala sökvägsinställningar"

3720

3577 -#: pathspec.c:305

3721 +#: pathspec.c:304

3722 msgid "invalid parameter for pathspec magic 'prefix'"

3723 msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""

3724

3581 -#: pathspec.c:326

3725 +#: pathspec.c:325

3726 #, c-format

3727 msgid "Invalid pathspec magic '%.*s' in '%s'"

3728 msgstr "Felaktigt sökvägsuttryck \"%.*s\" i \"%s\""

3729

3586 -#: pathspec.c:331

3730 +#: pathspec.c:330

3731 #, c-format

3732 msgid "Missing ')' at the end of pathspec magic in '%s'"

3733 msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\""

3734

3591 -#: pathspec.c:369

3735 +#: pathspec.c:368

3736 #, c-format

3737 msgid "Unimplemented pathspec magic '%c' in '%s'"

3738 msgstr "Ej implementerat sökvägsuttryckmagi ”%c” i ”%s”"

3739

3596 -#: pathspec.c:428

3740 +#: pathspec.c:427

3741 #, c-format

3742 msgid "%s: 'literal' and 'glob' are incompatible"

3743 msgstr "%s: \"literal\" och \"glob\" är inkompatibla"

3744

3601 -#: pathspec.c:441

3745 +#: pathspec.c:440

3746 #, c-format

3747 msgid "%s: '%s' is outside repository"

3748 msgstr "%s: \"%s\" är utanför arkivet"

3749

3606 -#: pathspec.c:515

3750 +#: pathspec.c:514

3751 #, c-format

3752 msgid "'%s' (mnemonic: '%c')"

3753 msgstr "\"%s\" (minnesstöd: \"%c\")"

3754

3611 -#: pathspec.c:525

3755 +#: pathspec.c:524

3756 #, c-format

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

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

3759

3616 -#: pathspec.c:592

3760 +#: pathspec.c:591

3761 #, c-format

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

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

@@ -3622,50 +3766,55 @@ msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"

3766 msgid "flush packet write failed"

3767 msgstr "fel vid skrivning av \"flush\"-paket"

3768

3625 -#: pkt-line.c:142 pkt-line.c:228

3769 +#: pkt-line.c:144 pkt-line.c:230

3770 msgid "protocol error: impossibly long line"

3771 msgstr "protokollfel: omöjligt lång rad"

3772

3629 -#: pkt-line.c:158 pkt-line.c:160

3773 +#: pkt-line.c:160 pkt-line.c:162

3774 msgid "packet write with format failed"

3775 msgstr "paketskrivning med format misslyckades"

3776

3633 -#: pkt-line.c:192

3777 +#: pkt-line.c:194

3778 msgid "packet write failed - data exceeds max packet size"

3779 msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek"

3780

3637 -#: pkt-line.c:199 pkt-line.c:206

3781 +#: pkt-line.c:201 pkt-line.c:208

3782 msgid "packet write failed"

3783 msgstr "paketskrivning misslyckades"

3784

3641 -#: pkt-line.c:291

3785 +#: pkt-line.c:293

3786 msgid "read error"

3787 msgstr "läsfel"

3788

3645 -#: pkt-line.c:299

3789 +#: pkt-line.c:301

3790 msgid "the remote end hung up unexpectedly"

3791 msgstr "fjärren lade på oväntat"

3792

3649 -#: pkt-line.c:327

3793 +#: pkt-line.c:329

3794 #, c-format

3795 msgid "protocol error: bad line length character: %.4s"

3796 msgstr "protokollfel: felaktig radlängdstecken: %.4s"

3797

3654 -#: pkt-line.c:337 pkt-line.c:342

3798 +#: pkt-line.c:339 pkt-line.c:344

3799 #, c-format

3800 msgid "protocol error: bad line length %d"

3801 msgstr "protokollfel: felaktig radlängd: %d"

3802

3659 -#: preload-index.c:118

3803 +#: pkt-line.c:353

3804 +#, c-format

3805 +msgid "remote error: %s"

3806 +msgstr "fjärrfel: %s"

3807 +

3808 +#: preload-index.c:119

3809 msgid "Refreshing index"

3810 msgstr "Uppdaterar indexet"

3811

3663 -#: preload-index.c:137

3812 +#: preload-index.c:138

3813 #, c-format

3814 msgid "unable to create threaded lstat: %s"

3815 msgstr "kunde inte skapa trådad lstat: %s"

3816

3668 -#: pretty.c:962

3817 +#: pretty.c:963

3818 msgid "unable to parse --pretty format"

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

3820

@@ -3677,7 +3826,7 @@ msgstr "kunde inte starta \"log\""

3826 msgid "could not read `log` output"

3827 msgstr "kunde inte läsa utdata från \"log\""

3828

3680 -#: range-diff.c:74 sequencer.c:4764

3829 +#: range-diff.c:74 sequencer.c:4828

3830 #, c-format

3831 msgid "could not parse commit '%s'"

3832 msgstr "kunde inte tolka incheckningen \"%s\""

@@ -3691,11 +3840,46 @@ msgstr "misslyckades skapa diff"

3840 msgid "could not parse log for '%s'"

3841 msgstr "kunde inte tolka loggen för \"%s\""

3842

3694 -#: read-cache.c:1490

3843 +#: read-cache.c:673

3844 +#, c-format

3845 +msgid "will not add file alias '%s' ('%s' already exists in index)"

3846 +msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)"

3847 +

3848 +#: read-cache.c:689

3849 +msgid "cannot create an empty blob in the object database"

3850 +msgstr "kan inte skapa tom blob i objektdatabasen"

3851 +

3852 +#: read-cache.c:710

3853 +#, c-format

3854 +msgid "%s: can only add regular files, symbolic links or git-directories"

3855 +msgstr ""

3856 +"%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger"

3857 +

3858 +#: read-cache.c:765

3859 +#, c-format

3860 +msgid "unable to index file '%s'"

3861 +msgstr "kan inte indexera filen \"%s\""

3862 +

3863 +#: read-cache.c:784

3864 +#, c-format

3865 +msgid "unable to add '%s' to index"

3866 +msgstr "kan inte lägga till \"%s\" till indexet"

3867 +

3868 +#: read-cache.c:795

3869 +#, c-format

3870 +msgid "unable to stat '%s'"

3871 +msgstr "kan inte ta status på \"%s\""

3872 +

3873 +#: read-cache.c:1304

3874 +#, c-format

3875 +msgid "'%s' appears as both a file and as a directory"

3876 +msgstr "\"%s\" finns både som en fil och en katalog"

3877 +

3878 +#: read-cache.c:1489

3879 msgid "Refresh index"

3880 msgstr "Uppdatera indexet"

3881

3698 -#: read-cache.c:1604

3882 +#: read-cache.c:1603

3883 #, c-format

3884 msgid ""

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

@@ -3704,7 +3888,7 @@ msgstr ""

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

3889 "Använder version %i"

3890

3707 -#: read-cache.c:1614

3891 +#: read-cache.c:1613

3892 #, c-format

3893 msgid ""

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

@@ -3713,59 +3897,143 @@ msgstr ""

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

3898 "Använder version %i"

3899

3716 -#: read-cache.c:1792

3900 +#: read-cache.c:1684

3901 +#, c-format

3902 +msgid "bad signature 0x%08x"

3903 +msgstr "felaktig signatur 0x%08x"

3904 +

3905 +#: read-cache.c:1687

3906 +#, c-format

3907 +msgid "bad index version %d"

3908 +msgstr "felaktig indexversion %d"

3909 +

3910 +#: read-cache.c:1696

3911 +msgid "bad index file sha1 signature"

3912 +msgstr "felaktig sha1-signatur för indexfil"

3913 +

3914 +#: read-cache.c:1726

3915 +#, c-format

3916 +msgid "index uses %.4s extension, which we do not understand"

3917 +msgstr "index använder filtillägget %.4s, vilket vi inte förstår"

3918 +

3919 +#: read-cache.c:1728

3920 +#, c-format

3921 +msgid "ignoring %.4s extension"

3922 +msgstr "ignorerar filtillägget %.4s"

3923 +

3924 +#: read-cache.c:1765

3925 +#, c-format

3926 +msgid "unknown index entry format 0x%08x"

3927 +msgstr "okänt format 0x%08x på indexpost"

3928 +

3929 +#: read-cache.c:1781

3930 #, c-format

3931 msgid "malformed name field in the index, near path '%s'"

3932 msgstr "felformat namnfält i indexet, nära sökvägen \"%s\""

3933

3721 -#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458

3722 -#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585

3723 -#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343

3724 -#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144

3725 -#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329

3934 +#: read-cache.c:1836

3935 +msgid "unordered stage entries in index"

3936 +msgstr "osorterade köposter i index"

3937 +

3938 +#: read-cache.c:1839

3939 +#, c-format

3940 +msgid "multiple stage entries for merged file '%s'"

3941 +msgstr "flera köposter för den sammanslagna filen \"%s\""

3942 +

3943 +#: read-cache.c:1842

3944 +#, c-format

3945 +msgid "unordered stage entries for '%s'"

3946 +msgstr "osorterade köposter för \"%s\""

3947 +

3948 +#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111

3949 +#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294

3950 +#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955

3951 +#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498

3952 +#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271

3953 +#: builtin/submodule--helper.c:330

3954 msgid "index file corrupt"

3955 msgstr "indexfilen trasig"

3956

3729 -#: read-cache.c:2101

3957 +#: read-cache.c:2090

3958 #, c-format

3959 msgid "unable to create load_cache_entries thread: %s"

3960 msgstr "kunde inte läsa in cache_entries-tråden: %s"

3961

3734 -#: read-cache.c:2114

3962 +#: read-cache.c:2103

3963 #, c-format

3964 msgid "unable to join load_cache_entries thread: %s"

3965 msgstr "kunde inte utföra join på cache_entries-tråden: %s"

3966

3739 -#: read-cache.c:2201

3967 +#: read-cache.c:2136

3968 +#, c-format

3969 +msgid "%s: index file open failed"

3970 +msgstr "%s: öppning av indexfilen misslyckades"

3971 +

3972 +#: read-cache.c:2140

3973 +#, c-format

3974 +msgid "%s: cannot stat the open index"

3975 +msgstr "%s: kan inte ta startus på det öppna indexet"

3976 +

3977 +#: read-cache.c:2144

3978 +#, c-format

3979 +msgid "%s: index file smaller than expected"

3980 +msgstr "%s: indexfilen mindre än förväntat"

3981 +

3982 +#: read-cache.c:2148

3983 +#, c-format

3984 +msgid "%s: unable to map index file"

3985 +msgstr "%s: kan inte koppla indexfilen"

3986 +

3987 +#: read-cache.c:2190

3988 #, c-format

3989 msgid "unable to create load_index_extensions thread: %s"

3990 msgstr "kunde inte skapa load_index_extensions-tråden: %s"

3991

3744 -#: read-cache.c:2228

3992 +#: read-cache.c:2217

3993 #, c-format

3994 msgid "unable to join load_index_extensions thread: %s"

3995 msgstr "kunde inte utföra join på load_index_extensions-tråden: %s"

3996

3749 -#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086

3997 +#: read-cache.c:2239

3998 +#, c-format

3999 +msgid "could not freshen shared index '%s'"

4000 +msgstr "kunde inte uppdatera delat index \"%s\""

4001 +

4002 +#: read-cache.c:2274

4003 +#, c-format

4004 +msgid "broken index, expect %s in %s, got %s"

4005 +msgstr "trasigt index, förväntade %s i %s, fick %s"

4006 +

4007 +#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087

4008 #, c-format

4009 msgid "could not close '%s'"

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

4011

3754 -#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592

4012 +#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647

4013 #, c-format

4014 msgid "could not stat '%s'"

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

4016

3759 -#: read-cache.c:3068

4017 +#: read-cache.c:3057

4018 #, c-format

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

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

4021

3764 -#: read-cache.c:3080

4022 +#: read-cache.c:3069

4023 #, c-format

4024 msgid "unable to unlink: %s"

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

4026

4027 +#: read-cache.c:3088

4028 +#, c-format

4029 +msgid "cannot fix permission bits on '%s'"

4030 +msgstr "kan inte rätta behörighetsbitar på \"%s\""

4031 +

4032 +#: read-cache.c:3237

4033 +#, c-format

4034 +msgid "%s: cannot drop to stage #0"

4035 +msgstr "%s: kan inte återgå till kö 0"

4036 +

4037 #: rebase-interactive.c:10

4038 msgid ""

4039 "\n"

@@ -3855,8 +4123,8 @@ msgstr ""

4123 msgid "Note that empty commits are commented out"

4124 msgstr "Observera att tomma incheckningar är utkommenterade"

4125

3858 -#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186

3859 -#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836

4126 +#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219

4127 +#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900

4128 #, c-format

4129 msgid "could not read '%s'."

4130 msgstr "kunde inte läsa \"%s\"."

@@ -3871,7 +4139,7 @@ msgstr "\"%s\" pekar inte på ett giltigt objekt!"

4139 msgid "ignoring dangling symref %s"

4140 msgstr "ignorerar dinglande symbolisk referens %s"

4141

3874 -#: refs.c:585 ref-filter.c:1951

4142 +#: refs.c:585 ref-filter.c:1976

4143 #, c-format

4144 msgid "ignoring broken ref %s"

4145 msgstr "ignorerar trasig referens %s"

@@ -3896,15 +4164,15 @@ msgstr "referensen \"%s\" finns redan"

4164 msgid "unexpected object ID when writing '%s'"

4165 msgstr "oväntat objekt-id vid skrivning \"%s\""

4166

3899 -#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636

3900 -#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788

4167 +#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675

4168 +#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852

4169 #: wrapper.c:656

4170 #, c-format

4171 msgid "could not write to '%s'"

4172 msgstr "kunde inte skriva till \"%s\""

4173

3906 -#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395

3907 -#: builtin/am.c:728

4174 +#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395

4175 +#: builtin/am.c:713 builtin/rebase.c:575

4176 #, c-format

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

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

@@ -3979,7 +4247,7 @@ msgstr "kunde inte ta bort referenser: %s"

4247 msgid "invalid refspec '%s'"

4248 msgstr "felaktig referensspecifikation: \"%s\""

4249

3982 -#: ref-filter.c:39 wt-status.c:1855

4250 +#: ref-filter.c:39 wt-status.c:1861

4251 msgid "gone"

4252 msgstr "försvunnen"

4253

@@ -4028,149 +4296,154 @@ msgstr "okänt %%(%s)-argument: %s"

4296 msgid "%%(objecttype) does not take arguments"

4297 msgstr "%%(objecttype) tar inte argument"

4298

4031 -#: ref-filter.c:235

4299 +#: ref-filter.c:245

4300 #, c-format

4033 -msgid "%%(objectsize) does not take arguments"

4034 -msgstr "%%(objectsize) tar inte argument"

4301 +msgid "unrecognized %%(objectsize) argument: %s"

4302 +msgstr "okänt %%(objectsize)-argument: %s"

4303

4036 -#: ref-filter.c:247

4304 +#: ref-filter.c:253

4305 +#, c-format

4306 +msgid "%%(deltabase) does not take arguments"

4307 +msgstr "%%(deltabase) tar inte argument"

4308 +

4309 +#: ref-filter.c:265

4310 #, c-format

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

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

4313

4041 -#: ref-filter.c:256

4314 +#: ref-filter.c:274

4315 #, c-format

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

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

4318

4046 -#: ref-filter.c:278

4319 +#: ref-filter.c:296

4320 #, c-format

4321 msgid "unknown %%(trailers) argument: %s"

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

4323

4051 -#: ref-filter.c:307

4324 +#: ref-filter.c:325

4325 #, c-format

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

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

4328

4056 -#: ref-filter.c:309

4329 +#: ref-filter.c:327

4330 #, c-format

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

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

4333

4061 -#: ref-filter.c:324

4334 +#: ref-filter.c:342

4335 #, c-format

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

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

4338

4066 -#: ref-filter.c:328

4339 +#: ref-filter.c:346

4340 #, c-format

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

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

4343

4071 -#: ref-filter.c:358

4344 +#: ref-filter.c:376

4345 #, c-format

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

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

4348

4076 -#: ref-filter.c:370

4349 +#: ref-filter.c:388

4350 #, c-format

4351 msgid "unrecognized position:%s"

4352 msgstr "okänd position:%s"

4353

4081 -#: ref-filter.c:377

4354 +#: ref-filter.c:395

4355 #, c-format

4356 msgid "unrecognized width:%s"

4357 msgstr "okänd bredd:%s"

4358

4086 -#: ref-filter.c:386

4359 +#: ref-filter.c:404

4360 #, c-format

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

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

4363

4091 -#: ref-filter.c:394

4364 +#: ref-filter.c:412

4365 #, c-format

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

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

4368

4096 -#: ref-filter.c:412

4369 +#: ref-filter.c:430

4370 #, c-format

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

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

4373

4101 -#: ref-filter.c:508

4374 +#: ref-filter.c:527

4375 #, c-format

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

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

4378

4106 -#: ref-filter.c:535

4379 +#: ref-filter.c:554

4380 #, c-format

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

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

4383

4111 -#: ref-filter.c:539

4384 +#: ref-filter.c:558

4385 #, c-format

4386 msgid ""

4387 "not a git repository, but the field '%.*s' requires access to object data"

4388 msgstr ""

4389 "inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata"

4390

4118 -#: ref-filter.c:663

4391 +#: ref-filter.c:682

4392 #, c-format

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

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

4395

4123 -#: ref-filter.c:726

4396 +#: ref-filter.c:745

4397 #, c-format

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

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

4400

4128 -#: ref-filter.c:728

4401 +#: ref-filter.c:747

4402 #, c-format

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

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

4405

4133 -#: ref-filter.c:730

4406 +#: ref-filter.c:749

4407 #, c-format

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

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

4410

4138 -#: ref-filter.c:758

4411 +#: ref-filter.c:777

4412 #, c-format

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

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

4415

4143 -#: ref-filter.c:760

4416 +#: ref-filter.c:779

4417 #, c-format

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

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

4420

4148 -#: ref-filter.c:762

4421 +#: ref-filter.c:781

4422 #, c-format

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

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

4425

4153 -#: ref-filter.c:777

4426 +#: ref-filter.c:796

4427 #, c-format

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

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

4430

4158 -#: ref-filter.c:834

4431 +#: ref-filter.c:853

4432 #, c-format

4433 msgid "malformed format string %s"

4434 msgstr "felformad formatsträng %s"

4435

4163 -#: ref-filter.c:1424

4436 +#: ref-filter.c:1447

4437 #, c-format

4438 msgid "(no branch, rebasing %s)"

4439 msgstr "(ingen gren, ombaserar %s)"

4440

4168 -#: ref-filter.c:1427

4441 +#: ref-filter.c:1450

4442 #, c-format

4443 msgid "(no branch, rebasing detached HEAD %s)"

4444 msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)"

4445

4173 -#: ref-filter.c:1430

4446 +#: ref-filter.c:1453

4447 #, c-format

4448 msgid "(no branch, bisect started on %s)"

4449 msgstr "(ingen gren, \"bisect\" startad på %s)"

@@ -4178,7 +4451,7 @@ msgstr "(ingen gren, \"bisect\" startad på %s)"

4451 #. TRANSLATORS: make sure this matches "HEAD

4452 #. detached at " in wt-status.c

4453 #.

4181 -#: ref-filter.c:1438

4454 +#: ref-filter.c:1461

4455 #, c-format

4456 msgid "(HEAD detached at %s)"

4457 msgstr "(HEAD frånkopplat vid %s)"

@@ -4186,142 +4459,287 @@ msgstr "(HEAD frånkopplat vid %s)"

4459 #. TRANSLATORS: make sure this matches "HEAD

4460 #. detached from " in wt-status.c

4461 #.

4189 -#: ref-filter.c:1445

4462 +#: ref-filter.c:1468

4463 #, c-format

4464 msgid "(HEAD detached from %s)"

4465 msgstr "(HEAD frånkopplat från %s)"

4466

4194 -#: ref-filter.c:1449

4467 +#: ref-filter.c:1472

4468 msgid "(no branch)"

4469 msgstr "(ingen gren)"

4470

4198 -#: ref-filter.c:1483 ref-filter.c:1638

4471 +#: ref-filter.c:1506 ref-filter.c:1663

4472 #, c-format

4473 msgid "missing object %s for %s"

4474 msgstr "objektet %s saknas för %s"

4475

4203 -#: ref-filter.c:1491

4476 +#: ref-filter.c:1516

4477 #, c-format

4478 msgid "parse_object_buffer failed on %s for %s"

4479 msgstr "parse_object_buffer misslyckades på %s för %s"

4480

4208 -#: ref-filter.c:1857

4481 +#: ref-filter.c:1882

4482 #, c-format

4483 msgid "malformed object at '%s'"

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

4485

4213 -#: ref-filter.c:1946

4486 +#: ref-filter.c:1971

4487 #, c-format

4488 msgid "ignoring ref with broken name %s"

4489 msgstr "ignorerar referens med trasigt namn %s"

4490

4218 -#: ref-filter.c:2232

4491 +#: ref-filter.c:2257

4492 #, c-format

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

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

4495

4223 -#: ref-filter.c:2338

4496 +#: ref-filter.c:2352

4497 +#, c-format

4498 +msgid "option `%s' is incompatible with --merged"

4499 +msgstr "flaggan \"%s\" är inkompatibel med --merged"

4500 +

4501 +#: ref-filter.c:2355

4502 +#, c-format

4503 +msgid "option `%s' is incompatible with --no-merged"

4504 +msgstr "flaggan \"%s\" är inkompatibel med --no-merged"

4505 +

4506 +#: ref-filter.c:2365

4507 #, c-format

4508 msgid "malformed object name %s"

4509 msgstr "felformat objektnamn %s"

4510

4228 -#: remote.c:607

4511 +#: ref-filter.c:2370

4512 +#, c-format

4513 +msgid "option `%s' must point to a commit"

4514 +msgstr "flaggan \"%s\" måste peka på en incheckning"

4515 +

4516 +#: remote.c:363

4517 +#, c-format

4518 +msgid "config remote shorthand cannot begin with '/': %s"

4519 +msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s"

4520 +

4521 +#: remote.c:410

4522 +msgid "more than one receivepack given, using the first"

4523 +msgstr "mer än en receivepack angavs, använder den första"

4524 +

4525 +#: remote.c:418

4526 +msgid "more than one uploadpack given, using the first"

4527 +msgstr "mer än en uploadpack angavs, använder den första"

4528 +

4529 +#: remote.c:608

4530 #, c-format

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

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

4533

4233 -#: remote.c:611

4534 +#: remote.c:612

4535 #, c-format

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

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

4538

4238 -#: remote.c:615

4539 +#: remote.c:616

4540 #, c-format

4541 msgid "%s tracks both %s and %s"

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

4543

4243 -#: remote.c:623

4244 -msgid "Internal error"

4245 -msgstr "Internt fel"

4544 +#: remote.c:684

4545 +#, c-format

4546 +msgid "key '%s' of pattern had no '*'"

4547 +msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\""

4548 +

4549 +#: remote.c:694

4550 +#, c-format

4551 +msgid "value '%s' of pattern has no '*'"

4552 +msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\""

4553 +

4554 +#: remote.c:1000

4555 +#, c-format

4556 +msgid "src refspec %s does not match any"

4557 +msgstr "käll-referensspecifikationen %s motsvarar ingen"

4558 +

4559 +#: remote.c:1005

4560 +#, c-format

4561 +msgid "src refspec %s matches more than one"

4562 +msgstr "käll-referensspecifikationen %s motsvarar mer än en"

4563 +

4564 +#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push

4565 +#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

4566 +#. the <src>.

4567 +#.

4568 +#: remote.c:1020

4569 +#, c-format

4570 +msgid ""

4571 +"The destination you provided is not a full refname (i.e.,\n"

4572 +"starting with \"refs/\"). We tried to guess what you meant by:\n"

4573 +"\n"

4574 +"- Looking for a ref that matches '%s' on the remote side.\n"

4575 +"- Checking if the <src> being pushed ('%s')\n"

4576 +" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"

4577 +" refs/{heads,tags}/ prefix on the remote side.\n"

4578 +"\n"

4579 +"Neither worked, so we gave up. You must fully qualify the ref."

4580 +msgstr ""

4581 +"Målet du angav är inte ett komplett referensamn (dvs.,\n"

4582 +"startar med \"refs/\"). Vi försökte gissa vad du menade genom att:\n"

4583 +"\n"

4584 +"- Se efter en referens som motsvarar \"%s\" på fjärrsidan.\n"

4585 +"- Se om <källan> som sänds (\"%s\")\n"

4586 +" är en referens i \"refs/{heads,tags}/\". Om så lägger vi till\n"

4587 +" motsvarande refs/{heads,tags}/-prefix på fjärrsidan.\n"

4588 +"\n"

4589 +"Inget av dem fungerade, så vi gav upp. Ange fullständig referens."

4590 +

4591 +#: remote.c:1040

4592 +#, c-format

4593 +msgid ""

4594 +"The <src> part of the refspec is a commit object.\n"

4595 +"Did you mean to create a new branch by pushing to\n"

4596 +"'%s:refs/heads/%s'?"

4597 +msgstr ""

4598 +"<Källa>-delen av ref.spec-en är ett incheckningsobjekt.\n"

4599 +"Var det meningen att skapa en ny gren genom att sända\n"

4600 +"till \"%s:refs/heads/%s\"?"

4601 +

4602 +#: remote.c:1045

4603 +#, c-format

4604 +msgid ""

4605 +"The <src> part of the refspec is a tag object.\n"

4606 +"Did you mean to create a new tag by pushing to\n"

4607 +"'%s:refs/tags/%s'?"

4608 +msgstr ""

4609 +"<Källa>-delen av ref.spec-en är ett taggobjekt.\n"

4610 +"Var det meningen att skapa en ny tagg genom att sända\n"

4611 +"till \"%s:refs/tags/%s\"?"

4612 +

4613 +#: remote.c:1050

4614 +#, c-format

4615 +msgid ""

4616 +"The <src> part of the refspec is a tree object.\n"

4617 +"Did you mean to tag a new tree by pushing to\n"

4618 +"'%s:refs/tags/%s'?"

4619 +msgstr ""

4620 +"<Källa>-delen av ref.spec-en är ett trädobjekt.\n"

4621 +"Var det meningen att tagga ett nytt träd genom att sända\n"

4622 +"till \"%s:refs/tags/%s\"?"

4623 +

4624 +#: remote.c:1055

4625 +#, c-format

4626 +msgid ""

4627 +"The <src> part of the refspec is a blob object.\n"

4628 +"Did you mean to tag a new blob by pushing to\n"

4629 +"'%s:refs/tags/%s'?"

4630 +msgstr ""

4631 +"<Källa>-delen av ref.spec-en är ett blobobjekt.\n"

4632 +"Var det meningen att tagga en ny blob genom att sända\n"

4633 +"till \"%s:refs/tags/%s\"?"

4634 +

4635 +#: remote.c:1091

4636 +#, c-format

4637 +msgid "%s cannot be resolved to branch"

4638 +msgstr "%s kan inte slås upp till en gren"

4639 +

4640 +#: remote.c:1102

4641 +#, c-format

4642 +msgid "unable to delete '%s': remote ref does not exist"

4643 +msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte"

4644 +

4645 +#: remote.c:1114

4646 +#, c-format

4647 +msgid "dst refspec %s matches more than one"

4648 +msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en"

4649 +

4650 +#: remote.c:1121

4651 +#, c-format

4652 +msgid "dst ref %s receives from more than one src"

4653 +msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa"

4654

4247 -#: remote.c:1569 remote.c:1670

4655 +#: remote.c:1624 remote.c:1725

4656 msgid "HEAD does not point to a branch"

4657 msgstr "HEAD pekar inte på en gren"

4658

4251 -#: remote.c:1578

4659 +#: remote.c:1633

4660 #, c-format

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

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

4663

4256 -#: remote.c:1581

4664 +#: remote.c:1636

4665 #, c-format

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

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

4668

4261 -#: remote.c:1587

4669 +#: remote.c:1642

4670 #, c-format

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

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

4673

4266 -#: remote.c:1602

4674 +#: remote.c:1657

4675 #, c-format

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

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

4678

4271 -#: remote.c:1614

4679 +#: remote.c:1669

4680 #, c-format

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

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

4683

4276 -#: remote.c:1624

4684 +#: remote.c:1679

4685 #, c-format

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

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

4688

4281 -#: remote.c:1637

4689 +#: remote.c:1692

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

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

4692

4285 -#: remote.c:1659

4693 +#: remote.c:1714

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

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

4696

4289 -#: remote.c:1935

4697 +#: remote.c:1840

4698 +#, c-format

4699 +msgid "couldn't find remote ref %s"

4700 +msgstr "Kunde inte hitta fjärr-referensen %s"

4701 +

4702 +#: remote.c:1853

4703 +#, c-format

4704 +msgid "* Ignoring funny ref '%s' locally"

4705 +msgstr "* Ignorerar märklig referens \"%s\" lokalt"

4706 +

4707 +#: remote.c:1990

4708 #, c-format

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

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

4711

4294 -#: remote.c:1939

4712 +#: remote.c:1994

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

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

4715

4298 -#: remote.c:1942

4716 +#: remote.c:1997

4717 #, c-format

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

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

4720

4303 -#: remote.c:1946

4721 +#: remote.c:2001

4722 #, c-format

4723 msgid "Your branch and '%s' refer to different commits.\n"

4724 msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"

4725

4308 -#: remote.c:1949

4726 +#: remote.c:2004

4727 #, c-format

4728 msgid " (use \"%s\" for details)\n"

4729 msgstr " (använd \"%s\" för detaljer)\n"

4730

4313 -#: remote.c:1953

4731 +#: remote.c:2008

4732 #, c-format

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

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

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

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

4737

4320 -#: remote.c:1959

4738 +#: remote.c:2014

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

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

4741

4324 -#: remote.c:1962

4742 +#: remote.c:2017

4743 #, c-format

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

4745 msgid_plural ""

@@ -4331,11 +4749,11 @@ msgstr[0] ""

4749 msgstr[1] ""

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

4751

4334 -#: remote.c:1970

4752 +#: remote.c:2025

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

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

4755

4338 -#: remote.c:1973

4756 +#: remote.c:2028

4757 #, c-format

4758 msgid ""

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

@@ -4350,10 +4768,15 @@ msgstr[1] ""

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

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

4770

4353 -#: remote.c:1983

4771 +#: remote.c:2038

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

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

4774

4775 +#: remote.c:2221

4776 +#, c-format

4777 +msgid "cannot parse expected object name '%s'"

4778 +msgstr "kan inte tolka förväntat objektnamn \"%s\""

4779 +

4780 #: replace-object.c:21

4781 #, c-format

4782 msgid "bad replace ref name: %s"

@@ -4377,7 +4800,8 @@ msgstr "trasig MERGE_RR"

4800 msgid "unable to write rerere record"

4801 msgstr "kunde inte skriva rerere-post"

4802

4380 -#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162

4803 +#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212

4804 +#: builtin/fsck.c:314

4805 #, c-format

4806 msgid "could not write '%s'"

4807 msgstr "kunde inte skriva \"%s\""

@@ -4432,8 +4856,8 @@ msgstr "kan inte ta bort lös länk \"%s\""

4856 msgid "Recorded preimage for '%s'"

4857 msgstr "Sparade förhandsbild för \"%s\""

4858

4435 -#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413

4436 -#: builtin/submodule--helper.c:1423

4859 +#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417

4860 +#: builtin/submodule--helper.c:1427

4861 #, c-format

4862 msgid "could not create directory '%s'"

4863 msgstr "kunde inte skapa katalogen \"%s\""

@@ -4467,29 +4891,29 @@ msgstr "Glömde lösning för \"%s\"\n"

4891 msgid "unable to open rr-cache directory"

4892 msgstr "kan inte uppdatera katalogen rr-cache"

4893

4470 -#: revision.c:2324

4894 +#: revision.c:2484

4895 msgid "your current branch appears to be broken"

4896 msgstr "din nuvarande gren verkar vara trasig"

4897

4474 -#: revision.c:2327

4898 +#: revision.c:2487

4899 #, c-format

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

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

4902

4479 -#: revision.c:2523

4903 +#: revision.c:2684

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

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

4906

4483 -#: run-command.c:740

4907 +#: run-command.c:742

4908 msgid "open /dev/null failed"

4909 msgstr "misslyckades öppna /dev/null"

4910

4487 -#: run-command.c:1229

4911 +#: run-command.c:1231

4912 #, c-format

4913 msgid "cannot create async thread: %s"

4914 msgstr "kan inte skapa asynkron tråd: %s"

4915

4492 -#: run-command.c:1293

4916 +#: run-command.c:1295

4917 #, c-format

4918 msgid ""

4919 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -4498,29 +4922,29 @@ msgstr ""

4922 "Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"

4923 "Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."

4924

4501 -#: send-pack.c:142

4925 +#: send-pack.c:141

4926 msgid "unexpected flush packet while reading remote unpack status"

4927 msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"

4928

4505 -#: send-pack.c:144

4929 +#: send-pack.c:143

4930 #, c-format

4931 msgid "unable to parse remote unpack status: %s"

4932 msgstr "kunde inte tolka fjärruppackningsstatus: %s"

4933

4510 -#: send-pack.c:146

4934 +#: send-pack.c:145

4935 #, c-format

4936 msgid "remote unpack failed: %s"

4937 msgstr "fjärruppackning misslyckades: %s"

4938

4515 -#: send-pack.c:308

4939 +#: send-pack.c:306

4940 msgid "failed to sign the push certificate"

4941 msgstr "misslyckades underteckna push-certifikatet"

4942

4519 -#: send-pack.c:421

4943 +#: send-pack.c:420

4944 msgid "the receiving end does not support --signed push"

4945 msgstr "mottagarsidan stöder inte push med --signed"

4946

4523 -#: send-pack.c:423

4947 +#: send-pack.c:422

4948 msgid ""

4949 "not sending a push certificate since the receiving end does not support --"

4950 "signed push"

@@ -4528,42 +4952,42 @@ msgstr ""

4952 "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"

4953 "signed"

4954

4531 -#: send-pack.c:435

4955 +#: send-pack.c:434

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

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

4958

4535 -#: send-pack.c:440

4959 +#: send-pack.c:439

4960 msgid "the receiving end does not support push options"

4961 msgstr "mottagarsidan stöder inte push-flaggor"

4962

4539 -#: sequencer.c:183

4963 +#: sequencer.c:184

4964 #, c-format

4965 msgid "invalid commit message cleanup mode '%s'"

4966 msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""

4967

4544 -#: sequencer.c:287

4968 +#: sequencer.c:288

4969 #, c-format

4970 msgid "could not delete '%s'"

4971 msgstr "kunde inte ta bort \"%s\""

4972

4549 -#: sequencer.c:313

4973 +#: sequencer.c:314

4974 msgid "revert"

4975 msgstr "revert"

4976

4553 -#: sequencer.c:315

4977 +#: sequencer.c:316

4978 msgid "cherry-pick"

4979 msgstr "cherry-pick"

4980

4557 -#: sequencer.c:317

4981 +#: sequencer.c:318

4982 msgid "rebase -i"

4983 msgstr "rebase -i"

4984

4561 -#: sequencer.c:319

4985 +#: sequencer.c:320

4986 #, c-format

4987 msgid "unknown action: %d"

4988 msgstr "okänd funktion: %d"

4989

4566 -#: sequencer.c:376

4990 +#: sequencer.c:378

4991 msgid ""

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

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

@@ -4571,7 +4995,7 @@ msgstr ""

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

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

4997

4574 -#: sequencer.c:379

4998 +#: sequencer.c:381

4999 msgid ""

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

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

@@ -4581,39 +5005,39 @@ msgstr ""

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

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

5007

4584 -#: sequencer.c:392 sequencer.c:2632

5008 +#: sequencer.c:394 sequencer.c:2671

5009 #, c-format

5010 msgid "could not lock '%s'"

5011 msgstr "kunde inte låsa \"%s\""

5012

4589 -#: sequencer.c:399

5013 +#: sequencer.c:401

5014 #, c-format

5015 msgid "could not write eol to '%s'"

5016 msgstr "kunde inte skriva radslut till \"%s\""

5017

4594 -#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652

4595 -#: sequencer.c:2885

5018 +#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691

5019 +#: sequencer.c:2931

5020 #, c-format

5021 msgid "failed to finalize '%s'"

5022 msgstr "misslyckades färdigställa \"%s\""

5023

4600 -#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535

4601 -#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746

4602 -#: builtin/merge.c:1084 builtin/rebase.c:152

5024 +#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574

5025 +#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748

5026 +#: builtin/merge.c:1085 builtin/rebase.c:154

5027 #, c-format

5028 msgid "could not read '%s'"

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

5030

4607 -#: sequencer.c:453

5031 +#: sequencer.c:455

5032 #, c-format

5033 msgid "your local changes would be overwritten by %s."

5034 msgstr "dina lokala ändringar skulle skrivas över av %s."

5035

4612 -#: sequencer.c:457

5036 +#: sequencer.c:459

5037 msgid "commit your changes or stash them to proceed."

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

5039

4616 -#: sequencer.c:486

5040 +#: sequencer.c:491

5041 #, c-format

5042 msgid "%s: fast-forward"

5043 msgstr "%s: snabbspola"

@@ -4621,70 +5045,70 @@ msgstr "%s: snabbspola"

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

5046 #. "rebase -i".

5047 #.

4624 -#: sequencer.c:575

5048 +#: sequencer.c:582

5049 #, c-format

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

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

5052

4629 -#: sequencer.c:591

5053 +#: sequencer.c:598

5054 msgid "unable to update cache tree"

5055 msgstr "kan inte uppdatera cacheträd"

5056

4633 -#: sequencer.c:604

5057 +#: sequencer.c:612

5058 msgid "could not resolve HEAD commit"

5059 msgstr "kunde inte bestämma HEAD:s incheckning"

5060

4637 -#: sequencer.c:684

5061 +#: sequencer.c:692

5062 #, c-format

5063 msgid "no key present in '%.*s'"

5064 msgstr "ingen nyckel i \"%.*s\""

5065

4642 -#: sequencer.c:695

5066 +#: sequencer.c:703

5067 #, c-format

5068 msgid "unable to dequote value of '%s'"

5069 msgstr "kan inte ta bort citering av värdet \"%s\""

5070

4647 -#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719

4648 -#: builtin/am.c:811 builtin/merge.c:1081

5071 +#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704

5072 +#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617

5073 #, c-format

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

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

5076

4653 -#: sequencer.c:742

5077 +#: sequencer.c:750

5078 msgid "'GIT_AUTHOR_NAME' already given"

5079 msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"

5080

4657 -#: sequencer.c:747

5081 +#: sequencer.c:755

5082 msgid "'GIT_AUTHOR_EMAIL' already given"

5083 msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"

5084

4661 -#: sequencer.c:752

5085 +#: sequencer.c:760

5086 msgid "'GIT_AUTHOR_DATE' already given"

5087 msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"

5088

4665 -#: sequencer.c:756

5089 +#: sequencer.c:764

5090 #, c-format

5091 msgid "unknown variable '%s'"

5092 msgstr "okänd variabel \"%s\""

5093

4670 -#: sequencer.c:761

5094 +#: sequencer.c:769

5095 msgid "missing 'GIT_AUTHOR_NAME'"

5096 msgstr "\"GIT_AUTHOR_NAME\" saknas"

5097

4674 -#: sequencer.c:763

5098 +#: sequencer.c:771

5099 msgid "missing 'GIT_AUTHOR_EMAIL'"

5100 msgstr "\"GIT_AUTHOR_EMAIL\" saknas"

5101

4678 -#: sequencer.c:765

5102 +#: sequencer.c:773

5103 msgid "missing 'GIT_AUTHOR_DATE'"

5104 msgstr "\"GIT_AUTHOR_DATE\" saknas"

5105

4682 -#: sequencer.c:825

5106 +#: sequencer.c:833

5107 #, c-format

5108 msgid "invalid date format '%s' in '%s'"

5109 msgstr "ogiltigt datumformat \"%s\" i \"%s\""

5110

4687 -#: sequencer.c:842

5111 +#: sequencer.c:850

5112 #, c-format

5113 msgid ""

5114 "you have staged changes in your working tree\n"

@@ -4713,15 +5137,15 @@ msgstr ""

5137 "\n"

5138 " git rebase --continue\n"

5139

4716 -#: sequencer.c:935

5140 +#: sequencer.c:945

5141 msgid "writing root commit"

5142 msgstr "skriver rotincheckning"

5143

4720 -#: sequencer.c:1142

5144 +#: sequencer.c:1155

5145 msgid "'prepare-commit-msg' hook failed"

5146 msgstr "kroken \"prepare-commit-msg\" misslyckades"

5147

4724 -#: sequencer.c:1149

5148 +#: sequencer.c:1162

5149 msgid ""

5150 "Your name and email address were configured automatically based\n"

5151 "on your username and hostname. Please check that they are accurate.\n"

@@ -4748,7 +5172,7 @@ msgstr ""

5172 "\n"

5173 " git commit --amend --reset-author\n"

5174

4751 -#: sequencer.c:1162

5175 +#: sequencer.c:1175

5176 msgid ""

5177 "Your name and email address were configured automatically based\n"

5178 "on your username and hostname. Please check that they are accurate.\n"

@@ -4773,301 +5197,296 @@ msgstr ""

5197 "\n"

5198 " git commit --amend --reset-author\n"

5199

4776 -#: sequencer.c:1202

5200 +#: sequencer.c:1217

5201 msgid "couldn't look up newly created commit"

5202 msgstr "kunde inte slå upp en precis skapad incheckning"

5203

4780 -#: sequencer.c:1204

5204 +#: sequencer.c:1219

5205 msgid "could not parse newly created commit"

5206 msgstr "kunde inte tolka en precis skapad incheckning"

5207

4784 -#: sequencer.c:1250

5208 +#: sequencer.c:1265

5209 msgid "unable to resolve HEAD after creating commit"

5210 msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"

5211

4788 -#: sequencer.c:1252

5212 +#: sequencer.c:1267

5213 msgid "detached HEAD"

5214 msgstr "frånkopplad HEAD"

5215

4792 -#: sequencer.c:1256

5216 +#: sequencer.c:1271

5217 msgid " (root-commit)"

5218 msgstr " (rotincheckning)"

5219

4796 -#: sequencer.c:1277

5220 +#: sequencer.c:1292

5221 msgid "could not parse HEAD"

5222 msgstr "kunde inte tolka HEAD"

5223

4800 -#: sequencer.c:1279

5224 +#: sequencer.c:1294

5225 #, c-format

5226 msgid "HEAD %s is not a commit!"

5227 msgstr "HEAD %s är inte en incheckning!"

5228

4805 -#: sequencer.c:1283 builtin/commit.c:1543

5229 +#: sequencer.c:1298 builtin/commit.c:1546

5230 msgid "could not parse HEAD commit"

5231 msgstr "kunde inte tolka HEAD:s incheckning"

5232

4809 -#: sequencer.c:1334 sequencer.c:1934

5233 +#: sequencer.c:1350 sequencer.c:1964

5234 msgid "unable to parse commit author"

5235 msgstr "kunde inte tolka incheckningens författare"

5236

4813 -#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677

5237 +#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678

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

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

5240

4817 -#: sequencer.c:1361 sequencer.c:1416

5241 +#: sequencer.c:1377 sequencer.c:1433

5242 #, c-format

5243 msgid "unable to read commit message from '%s'"

5244 msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""

5245

4822 -#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858

4823 -#: builtin/merge.c:883

5246 +#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859

5247 +#: builtin/merge.c:884

5248 msgid "failed to write commit object"

5249 msgstr "kunde inte skriva incheckningsobjekt"

5250

4827 -#: sequencer.c:1443

5251 +#: sequencer.c:1460

5252 #, c-format

5253 msgid "could not parse commit %s"

5254 msgstr "kunde inte tolka incheckningen %s"

5255

4832 -#: sequencer.c:1448

5256 +#: sequencer.c:1465

5257 #, c-format

5258 msgid "could not parse parent commit %s"

5259 msgstr "kunde inte tolka föräldraincheckningen %s"

5260

4837 -#: sequencer.c:1546 sequencer.c:1654

5261 +#: sequencer.c:1565 sequencer.c:1675

5262 #, c-format

5263 msgid "unknown command: %d"

5264 msgstr "okänt kommando: %d"

5265

4842 -#: sequencer.c:1601 sequencer.c:1626

5266 +#: sequencer.c:1622 sequencer.c:1647

5267 #, c-format

5268 msgid "This is a combination of %d commits."

5269 msgstr "Det här är en kombination av %d incheckningar."

5270

4847 -#: sequencer.c:1611 sequencer.c:4744

5271 +#: sequencer.c:1632 sequencer.c:4808

5272 msgid "need a HEAD to fixup"

5273 msgstr "behöver en HEAD-incheckning att rätta"

5274

4851 -#: sequencer.c:1613 sequencer.c:2912

5275 +#: sequencer.c:1634 sequencer.c:2958

5276 msgid "could not read HEAD"

5277 msgstr "kunde inte läsa HEAD"

5278

4855 -#: sequencer.c:1615

5279 +#: sequencer.c:1636

5280 msgid "could not read HEAD's commit message"

5281 msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"

5282

4859 -#: sequencer.c:1621

5283 +#: sequencer.c:1642

5284 #, c-format

5285 msgid "cannot write '%s'"

5286 msgstr "kan inte skriva \"%s\""

5287

4864 -#: sequencer.c:1628 git-rebase--preserve-merges.sh:441

5288 +#: sequencer.c:1649 git-rebase--preserve-merges.sh:441

5289 msgid "This is the 1st commit message:"

5290 msgstr "Det här är 1:a incheckningsmeddelandet:"

5291

4868 -#: sequencer.c:1636

5292 +#: sequencer.c:1657

5293 #, c-format

5294 msgid "could not read commit message of %s"

5295 msgstr "kunde inte läsa incheckningsmeddelande för %s"

5296

4873 -#: sequencer.c:1643

5297 +#: sequencer.c:1664

5298 #, c-format

5299 msgid "This is the commit message #%d:"

5300 msgstr "Det här är incheckningsmeddelande %d:"

5301

4878 -#: sequencer.c:1649

5302 +#: sequencer.c:1670

5303 #, c-format

5304 msgid "The commit message #%d will be skipped:"

5305 msgstr "Incheckningsmeddelande %d kommer hoppas över:"

5306

4883 -#: sequencer.c:1732

5307 +#: sequencer.c:1758

5308 msgid "your index file is unmerged."

5309 msgstr "din indexfil har inte slagits ihop."

5310

4887 -#: sequencer.c:1739

5311 +#: sequencer.c:1765

5312 msgid "cannot fixup root commit"

5313 msgstr "kan inte göra \"fixup\" på rotincheckning"

5314

4891 -#: sequencer.c:1758

5315 +#: sequencer.c:1784

5316 #, c-format

5317 msgid "commit %s is a merge but no -m option was given."

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

5319

4896 -#: sequencer.c:1766

5320 +#: sequencer.c:1792 sequencer.c:1800

5321 #, c-format

5322 msgid "commit %s does not have parent %d"

5323 msgstr "incheckning %s har inte förälder %d"

5324

4901 -#: sequencer.c:1770

4902 -#, c-format

4903 -msgid "mainline was specified but commit %s is not a merge."

4904 -msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning."

4905 -

4906 -#: sequencer.c:1776

5325 +#: sequencer.c:1806

5326 #, c-format

5327 msgid "cannot get commit message for %s"

5328 msgstr "kan inte hämta incheckningsmeddelande för %s"

5329

5330 #. TRANSLATORS: The first %s will be a "todo" command like

5331 #. "revert" or "pick", the second %s a SHA1.

4913 -#: sequencer.c:1795

5332 +#: sequencer.c:1825

5333 #, c-format

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

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

5336

4918 -#: sequencer.c:1860

5337 +#: sequencer.c:1890

5338 #, c-format

5339 msgid "could not rename '%s' to '%s'"

5340 msgstr "kunde inte byta namn på \"%s\" till \"%s\""

5341

4923 -#: sequencer.c:1915

5342 +#: sequencer.c:1945

5343 #, c-format

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

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

5346

4928 -#: sequencer.c:1916

5347 +#: sequencer.c:1946

5348 #, c-format

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

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

5351

4933 -#: sequencer.c:1974

5352 +#: sequencer.c:2005

5353 #, c-format

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

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

5356

4938 -#: sequencer.c:1981

5357 +#: sequencer.c:2012

5358 #, c-format

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

5360 msgstr "git %s: misslyckades uppdatera indexet"

5361

4943 -#: sequencer.c:2062

5362 +#: sequencer.c:2094

5363 #, c-format

5364 msgid "%s does not accept arguments: '%s'"

5365 msgstr "%s tar inte argument: \"%s\""

5366

4948 -#: sequencer.c:2071

5367 +#: sequencer.c:2103

5368 #, c-format

5369 msgid "missing arguments for %s"

5370 msgstr "argument saknas för %s"

5371

4953 -#: sequencer.c:2130

5372 +#: sequencer.c:2163

5373 #, c-format

5374 msgid "invalid line %d: %.*s"

5375 msgstr "ogiltig rad %d: %.*s"

5376

4958 -#: sequencer.c:2138

5377 +#: sequencer.c:2171

5378 #, c-format

5379 msgid "cannot '%s' without a previous commit"

5380 msgstr "kan inte utföra \"%s\" utan en föregående incheckning"

5381

4963 -#: sequencer.c:2209

5382 +#: sequencer.c:2243

5383 msgid "please fix this using 'git rebase --edit-todo'."

5384 msgstr "rätta det med \"git rebase --edit-todo\"."

5385

4967 -#: sequencer.c:2211

5386 +#: sequencer.c:2245

5387 #, c-format

5388 msgid "unusable instruction sheet: '%s'"

5389 msgstr "oanvändbart manus: ”%s”"

5390

4972 -#: sequencer.c:2216

5391 +#: sequencer.c:2250

5392 msgid "no commits parsed."

5393 msgstr "inga incheckningar lästes."

5394

4976 -#: sequencer.c:2227

5395 +#: sequencer.c:2261

5396 msgid "cannot cherry-pick during a revert."

5397 msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."

5398

4980 -#: sequencer.c:2229

5399 +#: sequencer.c:2263

5400 msgid "cannot revert during a cherry-pick."

5401 msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."

5402

4984 -#: sequencer.c:2299

5403 +#: sequencer.c:2333

5404 #, c-format

5405 msgid "invalid value for %s: %s"

5406 msgstr "felaktigt värde för %s: %s"

5407

4989 -#: sequencer.c:2380

5408 +#: sequencer.c:2420

5409 msgid "unusable squash-onto"

5410 msgstr "oanvändbar squash-onto"

5411

4993 -#: sequencer.c:2396

5412 +#: sequencer.c:2436

5413 #, c-format

5414 msgid "malformed options sheet: '%s'"

5415 msgstr "trasigt manus: ”%s”"

5416

4998 -#: sequencer.c:2479 sequencer.c:4005

5417 +#: sequencer.c:2518 sequencer.c:4067

5418 msgid "empty commit set passed"

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

5420

5002 -#: sequencer.c:2487

5421 +#: sequencer.c:2526

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

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

5424

5006 -#: sequencer.c:2488

5425 +#: sequencer.c:2527

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

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

5428

5010 -#: sequencer.c:2491

5429 +#: sequencer.c:2530

5430 #, c-format

5431 msgid "could not create sequencer directory '%s'"

5432 msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""

5433

5015 -#: sequencer.c:2505

5434 +#: sequencer.c:2544

5435 msgid "could not lock HEAD"

5436 msgstr "kunde inte låsa HEAD"

5437

5019 -#: sequencer.c:2560 sequencer.c:3761

5438 +#: sequencer.c:2599 sequencer.c:3819

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

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

5441

5023 -#: sequencer.c:2562

5442 +#: sequencer.c:2601

5443 msgid "cannot resolve HEAD"

5444 msgstr "kan inte bestämma HEAD"

5445

5027 -#: sequencer.c:2564 sequencer.c:2599

5446 +#: sequencer.c:2603 sequencer.c:2638

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

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

5449

5031 -#: sequencer.c:2585 builtin/grep.c:721

5450 +#: sequencer.c:2624 builtin/grep.c:732

5451 #, c-format

5452 msgid "cannot open '%s'"

5453 msgstr "kan inte öppna \"%s\""

5454

5036 -#: sequencer.c:2587

5455 +#: sequencer.c:2626

5456 #, c-format

5457 msgid "cannot read '%s': %s"

5458 msgstr "kan inte läsa \"%s\": %s"

5459

5041 -#: sequencer.c:2588

5460 +#: sequencer.c:2627

5461 msgid "unexpected end of file"

5462 msgstr "oväntat filslut"

5463

5045 -#: sequencer.c:2594

5464 +#: sequencer.c:2633

5465 #, c-format

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

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

5468

5050 -#: sequencer.c:2605

5469 +#: sequencer.c:2644

5470 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

5471 msgstr ""

5472 "Du verkar ha flyttat HEAD.\n"

5473 "Spolar inte tillbaka, kontrollera HEAD!"

5474

5056 -#: sequencer.c:2709 sequencer.c:3679

5475 +#: sequencer.c:2750 sequencer.c:3735

5476 #, c-format

5477 msgid "could not update %s"

5478 msgstr "kunde inte uppdatera %s"

5479

5061 -#: sequencer.c:2747 sequencer.c:3659

5480 +#: sequencer.c:2788 sequencer.c:3715

5481 msgid "cannot read HEAD"

5482 msgstr "kan inte läsa HEAD"

5483

5065 -#: sequencer.c:2762

5484 +#: sequencer.c:2805

5485 #, c-format

5486 msgid "unable to copy '%s' to '%s'"

5487 msgstr "kan inte kopiera in \"%s\" till \"%s\""

5488

5070 -#: sequencer.c:2770

5489 +#: sequencer.c:2813

5490 #, c-format

5491 msgid ""

5492 "You can amend the commit now, with\n"

@@ -5086,27 +5505,27 @@ msgstr ""

5505 "\n"

5506 "\tgit rebase --continue\n"

5507

5089 -#: sequencer.c:2780

5508 +#: sequencer.c:2823

5509 #, c-format

5510 msgid "Could not apply %s... %.*s"

5511 msgstr "Kunde inte tillämpa %s... %.*s"

5512

5094 -#: sequencer.c:2787

5513 +#: sequencer.c:2830

5514 #, c-format

5515 msgid "Could not merge %.*s"

5516 msgstr "Kunde inte slå ihop %.*s"

5517

5099 -#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640

5518 +#: sequencer.c:2844 sequencer.c:2848 builtin/difftool.c:641

5519 #, c-format

5520 msgid "could not copy '%s' to '%s'"

5521 msgstr "kunde inte kopiera in \"%s\" till \"%s\""

5522

5104 -#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019

5105 -#: builtin/rebase.c:1372 builtin/rebase.c:1426

5523 +#: sequencer.c:2870 sequencer.c:3293 builtin/rebase.c:424 builtin/rebase.c:1230

5524 +#: builtin/rebase.c:1591 builtin/rebase.c:1646

5525 msgid "could not read index"

5526 msgstr "kunde inte läsa indexet"

5527

5109 -#: sequencer.c:2829

5528 +#: sequencer.c:2875

5529 #, c-format

5530 msgid ""

5531 "execution failed: %s\n"

@@ -5121,11 +5540,11 @@ msgstr ""

5540 "\tgit rebase --continue\n"

5541 "\n"

5542

5124 -#: sequencer.c:2835

5543 +#: sequencer.c:2881

5544 msgid "and made changes to the index and/or the working tree\n"

5545 msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"

5546

5128 -#: sequencer.c:2841

5547 +#: sequencer.c:2887

5548 #, c-format

5549 msgid ""

5550 "execution succeeded: %s\n"

@@ -5142,76 +5561,76 @@ msgstr ""

5561 "\tgit rebase --continue\n"

5562 "\n"

5563

5145 -#: sequencer.c:2902

5564 +#: sequencer.c:2948

5565 #, c-format

5566 msgid "illegal label name: '%.*s'"

5567 msgstr "ogiltigt etikettnamn: \"%.*s\""

5568

5150 -#: sequencer.c:2954

5569 +#: sequencer.c:3002

5570 msgid "writing fake root commit"

5571 msgstr "skriver fejkad rotincheckning"

5572

5154 -#: sequencer.c:2959

5573 +#: sequencer.c:3007

5574 msgid "writing squash-onto"

5575 msgstr "skriver squash-onto"

5576

5158 -#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591

5577 +#: sequencer.c:3045 builtin/rebase.c:429 builtin/rebase.c:435

5578 #, c-format

5579 msgid "failed to find tree of %s"

5580 msgstr "kunde inte hitta trädet för %s."

5581

5163 -#: sequencer.c:3015 builtin/rebase.c:604

5582 +#: sequencer.c:3063 builtin/rebase.c:448

5583 msgid "could not write index"

5584 msgstr "kunde inte skriva indexet"

5585

5167 -#: sequencer.c:3042

5586 +#: sequencer.c:3090

5587 #, c-format

5588 msgid "could not resolve '%s'"

5589 msgstr "kunde inte upplösa \"%s\""

5590

5172 -#: sequencer.c:3068

5591 +#: sequencer.c:3118

5592 msgid "cannot merge without a current revision"

5593 msgstr "kan inte slå ihop utan en aktuell incheckning"

5594

5176 -#: sequencer.c:3090

5595 +#: sequencer.c:3140

5596 #, c-format

5597 msgid "unable to parse '%.*s'"

5598 msgstr "kan inte tolka \"%.*s\""

5599

5181 -#: sequencer.c:3099

5600 +#: sequencer.c:3149

5601 #, c-format

5602 msgid "nothing to merge: '%.*s'"

5603 msgstr "inget att slå samman: \"%.*s\""

5604

5186 -#: sequencer.c:3111

5605 +#: sequencer.c:3161

5606 msgid "octopus merge cannot be executed on top of a [new root]"

5607 msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]"

5608

5190 -#: sequencer.c:3126

5609 +#: sequencer.c:3176

5610 #, c-format

5611 msgid "could not get commit message of '%s'"

5612 msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""

5613

5195 -#: sequencer.c:3274

5614 +#: sequencer.c:3325

5615 #, c-format

5616 msgid "could not even attempt to merge '%.*s'"

5617 msgstr "kunde inte ens försöka slå ihop \"%.*s\""

5618

5200 -#: sequencer.c:3290

5619 +#: sequencer.c:3341

5620 msgid "merge: Unable to write new index file"

5621 msgstr "sammanslagning: Kunde inte skriva ny indexfil"

5622

5204 -#: sequencer.c:3358 builtin/rebase.c:268

5623 +#: sequencer.c:3409 builtin/rebase.c:298

5624 #, c-format

5625 msgid "Applied autostash.\n"

5626 msgstr "Tillämpade autostash.\n"

5627

5209 -#: sequencer.c:3370

5628 +#: sequencer.c:3421

5629 #, c-format

5630 msgid "cannot store %s"

5631 msgstr "kan inte spara %s"

5632

5214 -#: sequencer.c:3373 builtin/rebase.c:284

5633 +#: sequencer.c:3424 builtin/rebase.c:314

5634 #, c-format

5635 msgid ""

5636 "Applying autostash resulted in conflicts.\n"

@@ -5222,31 +5641,31 @@ msgstr ""

5641 "Dina ändringar är säkra i stashen.\n"

5642 "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"

5643

5225 -#: sequencer.c:3427

5644 +#: sequencer.c:3478

5645 #, c-format

5646 msgid "could not checkout %s"

5647 msgstr "kunde inte checka ut %s"

5648

5230 -#: sequencer.c:3441

5649 +#: sequencer.c:3492

5650 #, c-format

5651 msgid "%s: not a valid OID"

5652 msgstr "%s: inte ett giltigt OID"

5653

5235 -#: sequencer.c:3446 git-rebase--preserve-merges.sh:724

5654 +#: sequencer.c:3497 git-rebase--preserve-merges.sh:724

5655 msgid "could not detach HEAD"

5656 msgstr "kunde inte koppla från HEAD"

5657

5239 -#: sequencer.c:3461

5658 +#: sequencer.c:3512

5659 #, c-format

5660 msgid "Stopped at HEAD\n"

5661 msgstr "Stoppade på HEAD\n"

5662

5244 -#: sequencer.c:3463

5663 +#: sequencer.c:3514

5664 #, c-format

5665 msgid "Stopped at %s\n"

5666 msgstr "Stoppade på %s\n"

5667

5249 -#: sequencer.c:3471

5668 +#: sequencer.c:3522

5669 #, c-format

5670 msgid ""

5671 "Could not execute the todo command\n"

@@ -5267,48 +5686,48 @@ msgstr ""

5686 " git rebase --edit-todo\n"

5687 " git rebase --continue\n"

5688

5270 -#: sequencer.c:3543

5689 +#: sequencer.c:3597

5690 #, c-format

5691 msgid "Stopped at %s... %.*s\n"

5692 msgstr "Stoppade på %s... %.*s\n"

5693

5275 -#: sequencer.c:3622

5694 +#: sequencer.c:3677

5695 #, c-format

5696 msgid "unknown command %d"

5697 msgstr "okänt kommando %d"

5698

5280 -#: sequencer.c:3667

5699 +#: sequencer.c:3723

5700 msgid "could not read orig-head"

5701 msgstr "kunde inte läsa orig-head"

5702

5284 -#: sequencer.c:3672 sequencer.c:4741

5703 +#: sequencer.c:3728 sequencer.c:4805

5704 msgid "could not read 'onto'"

5705 msgstr "kunde inte läsa \"onto\""

5706

5288 -#: sequencer.c:3686

5707 +#: sequencer.c:3742

5708 #, c-format

5709 msgid "could not update HEAD to %s"

5710 msgstr "kunde inte uppdatera HEAD till %s"

5711

5293 -#: sequencer.c:3772

5712 +#: sequencer.c:3831

5713 msgid "cannot rebase: You have unstaged changes."

5714 msgstr "kan inte ombasera: Du har oköade ändringar."

5715

5297 -#: sequencer.c:3781

5716 +#: sequencer.c:3840

5717 msgid "cannot amend non-existing commit"

5718 msgstr "kan inte lägga till incheckning som inte finns"

5719

5301 -#: sequencer.c:3783

5720 +#: sequencer.c:3842

5721 #, c-format

5722 msgid "invalid file: '%s'"

5723 msgstr "ogiltig fil: \"%s\""

5724

5306 -#: sequencer.c:3785

5725 +#: sequencer.c:3844

5726 #, c-format

5727 msgid "invalid contents: '%s'"

5728 msgstr "ogiltigt innehåll: \"%s\""

5729

5311 -#: sequencer.c:3788

5730 +#: sequencer.c:3847

5731 msgid ""

5732 "\n"

5733 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -5318,54 +5737,54 @@ msgstr ""

5737 "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"

5738 "först och kör sedan \"git rebase --continute\" igen."

5739

5321 -#: sequencer.c:3824 sequencer.c:3862

5740 +#: sequencer.c:3883 sequencer.c:3921

5741 #, c-format

5742 msgid "could not write file: '%s'"

5743 msgstr "kunde inte skriva fil: \"%s\""

5744

5326 -#: sequencer.c:3877

5745 +#: sequencer.c:3936

5746 msgid "could not remove CHERRY_PICK_HEAD"

5747 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"

5748

5330 -#: sequencer.c:3884

5749 +#: sequencer.c:3943

5750 msgid "could not commit staged changes."

5751 msgstr "kunde inte checka in köade ändringar."

5752

5334 -#: sequencer.c:3982

5753 +#: sequencer.c:4044

5754 #, c-format

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

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

5757

5339 -#: sequencer.c:3986

5758 +#: sequencer.c:4048

5759 #, c-format

5760 msgid "%s: bad revision"

5761 msgstr "%s: felaktig revision"

5762

5344 -#: sequencer.c:4021

5763 +#: sequencer.c:4083

5764 msgid "can't revert as initial commit"

5765 msgstr "kan inte ångra som första incheckning"

5766

5348 -#: sequencer.c:4466

5767 +#: sequencer.c:4529

5768 msgid "make_script: unhandled options"

5769 msgstr "make_script: flaggor som inte stöds"

5770

5352 -#: sequencer.c:4469

5771 +#: sequencer.c:4532

5772 msgid "make_script: error preparing revisions"

5773 msgstr "make_script: fel när revisioner skulle förberedas"

5774

5356 -#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840

5775 +#: sequencer.c:4573 sequencer.c:4629 sequencer.c:4904

5776 #, c-format

5777 msgid "unusable todo list: '%s'"

5778 msgstr "oanvändbar todo-lista: %s"

5779

5361 -#: sequencer.c:4620

5780 +#: sequencer.c:4684

5781 #, c-format

5782 msgid ""

5783 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

5784 msgstr ""

5785 "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."

5786

5368 -#: sequencer.c:4690

5787 +#: sequencer.c:4754

5788 #, c-format

5789 msgid ""

5790 "Warning: some commits may have been dropped accidentally.\n"

@@ -5374,7 +5793,7 @@ msgstr ""

5793 "Varning: vissa incheckningar kan av misstag ha tappats.\n"

5794 "Tappade incheckningar (nyaste först):\n"

5795

5377 -#: sequencer.c:4697

5796 +#: sequencer.c:4761

5797 #, c-format

5798 msgid ""

5799 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -5394,7 +5813,7 @@ msgstr ""

5813 "\" (fel).\n"

5814 "\n"

5815

5397 -#: sequencer.c:4710

5816 +#: sequencer.c:4774

5817 #, c-format

5818 msgid ""

5819 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -5405,31 +5824,31 @@ msgstr ""

5824 "continue\".\n"

5825 "Avbryt ombaseringen med \"git rebase --abort\".\n"

5826

5408 -#: sequencer.c:4848 sequencer.c:4886

5827 +#: sequencer.c:4912 sequencer.c:4950

5828 msgid "nothing to do"

5829 msgstr "inget att göra"

5830

5412 -#: sequencer.c:4852

5831 +#: sequencer.c:4916

5832 #, c-format

5833 msgid "Rebase %s onto %s (%d command)"

5834 msgid_plural "Rebase %s onto %s (%d commands)"

5835 msgstr[0] "Ombasera %s på %s (%d kommando)"

5836 msgstr[1] "Ombasera %s på %s (%d kommandon)"

5837

5419 -#: sequencer.c:4864

5838 +#: sequencer.c:4928

5839 #, c-format

5840 msgid "could not copy '%s' to '%s'."

5841 msgstr "kunde inte kopiera \"%s\" till \"%s\"."

5842

5424 -#: sequencer.c:4868 sequencer.c:4897

5843 +#: sequencer.c:4932 sequencer.c:4961

5844 msgid "could not transform the todo list"

5845 msgstr "kunde inte transformera att göra-listan"

5846

5428 -#: sequencer.c:4900

5847 +#: sequencer.c:4964

l10n: Update Swedish translation (4363t0f0u)