9d48668cd5 · 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, 2019.

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2019-10-28 13:19+0800\n"

11 -"PO-Revision-Date: 2019-10-30 23:18+0100\n"

10 +"POT-Creation-Date: 2019-12-30 08:48+0800\n"

11 +"PO-Revision-Date: 2020-01-04 19:51+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,473 @@ msgstr ""

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

19 "X-Generator: Gtranslator 2.91.7\n"

20

21 -#: advice.c:109

21 +#: add-interactive.c:347

22 +#, c-format

23 +msgid "Huh (%s)?"

24 +msgstr "Vadå (%s)?"

25 +

26 +#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216

27 +#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643

28 +#: builtin/rebase.c:2019 builtin/rebase.c:2063

29 +msgid "could not read index"

30 +msgstr "kunde inte läsa indexet"

31 +

32 +#: add-interactive.c:555 git-add--interactive.perl:269

33 +#: git-add--interactive.perl:294

34 +msgid "binary"

35 +msgstr "binär"

36 +

37 +#: add-interactive.c:613 git-add--interactive.perl:278

38 +#: git-add--interactive.perl:332

39 +msgid "nothing"

40 +msgstr "ingenting"

41 +

42 +#: add-interactive.c:614 git-add--interactive.perl:314

43 +#: git-add--interactive.perl:329

44 +msgid "unchanged"

45 +msgstr "oändrad"

46 +

47 +#: add-interactive.c:651 git-add--interactive.perl:643

48 +msgid "Update"

49 +msgstr "Uppdatera"

50 +

51 +#: add-interactive.c:668 add-interactive.c:856

52 +#, c-format

53 +msgid "could not stage '%s'"

54 +msgstr "kunde inte köa \"%s\""

55 +

56 +#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409

57 +#: builtin/rebase.c:895

58 +msgid "could not write index"

59 +msgstr "kunde inte skriva indexet"

60 +

61 +#: add-interactive.c:677 git-add--interactive.perl:628

62 +#, c-format, perl-format

63 +msgid "updated %d path\n"

64 +msgid_plural "updated %d paths\n"

65 +msgstr[0] "uppdaterade %d sökväg\n"

66 +msgstr[1] "uppdaterade %d sökvägar\n"

67 +

68 +#: add-interactive.c:695 git-add--interactive.perl:678

69 +#, c-format, perl-format

70 +msgid "note: %s is untracked now.\n"

71 +msgstr "observera: %s spåras inte längre.\n"

72 +

73 +#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281

74 +#: builtin/reset.c:144

75 +#, c-format

76 +msgid "make_cache_entry failed for path '%s'"

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

78 +

79 +#: add-interactive.c:730 git-add--interactive.perl:655

80 +msgid "Revert"

81 +msgstr "Återställ"

82 +

83 +#: add-interactive.c:746

84 +msgid "Could not parse HEAD^{tree}"

85 +msgstr "kunde inte tolka HEAD^{tree}"

86 +

87 +#: add-interactive.c:784 git-add--interactive.perl:631

88 +#, c-format, perl-format

89 +msgid "reverted %d path\n"

90 +msgid_plural "reverted %d paths\n"

91 +msgstr[0] "återställde %d sökväg\n"

92 +msgstr[1] "återställde %d sökvägar\n"

93 +

94 +#: add-interactive.c:835 git-add--interactive.perl:695

95 +#, c-format

96 +msgid "No untracked files.\n"

97 +msgstr "Inga ospårade filer.\n"

98 +

99 +#: add-interactive.c:839 git-add--interactive.perl:689

100 +msgid "Add untracked"

101 +msgstr "Lägg till ospårad"

102 +

103 +#: add-interactive.c:866 git-add--interactive.perl:625

104 +#, c-format, perl-format

105 +msgid "added %d path\n"

106 +msgid_plural "added %d paths\n"

107 +msgstr[0] "lade till %d sökväg\n"

108 +msgstr[1] "lade till %d sökvägar\n"

109 +

110 +#: add-interactive.c:896

111 +#, c-format

112 +msgid "ignoring unmerged: %s"

113 +msgstr "ignorerar ej sammanslagen: %s"

114 +

115 +#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366

116 +#, c-format

117 +msgid "Only binary files changed.\n"

118 +msgstr "Endast binära filer ändrade.\n"

119 +

120 +#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368

121 +#, c-format

122 +msgid "No changes.\n"

123 +msgstr "Inga ändringar.\n"

124 +

125 +#: add-interactive.c:914 git-add--interactive.perl:1376

126 +msgid "Patch update"

127 +msgstr "Uppdatera patch"

128 +

129 +#: add-interactive.c:953 git-add--interactive.perl:1754

130 +msgid "Review diff"

131 +msgstr "Granska diff"

132 +

133 +#: add-interactive.c:981

134 +msgid "show paths with changes"

135 +msgstr "visa sökvägar med ändringar"

136 +

137 +#: add-interactive.c:983

138 +msgid "add working tree state to the staged set of changes"

139 +msgstr "lägg arbetskatalogens tillstånd till köade ändringar"

140 +

141 +#: add-interactive.c:985

142 +msgid "revert staged set of changes back to the HEAD version"

143 +msgstr "återställ köade ändringar tillbaka till HEAD-versionen"

144 +

145 +#: add-interactive.c:987

146 +msgid "pick hunks and update selectively"

147 +msgstr "välj stycken och uppdatera selektivt"

148 +

149 +#: add-interactive.c:989

150 +msgid "view diff between HEAD and index"

151 +msgstr "visa skillnad mellan HEAD och index"

152 +

153 +#: add-interactive.c:991

154 +msgid "add contents of untracked files to the staged set of changes"

155 +msgstr "lägg innehåll i ospårade filer till köade ändringar"

156 +

157 +#: add-interactive.c:999 add-interactive.c:1048

158 +msgid "Prompt help:"

159 +msgstr "Kommandoradshjälp:"

160 +

161 +#: add-interactive.c:1001

162 +msgid "select a single item"

163 +msgstr "markera en post"

164 +

165 +#: add-interactive.c:1003

166 +msgid "select a range of items"

167 +msgstr "markera intervall av poster"

168 +

169 +#: add-interactive.c:1005

170 +msgid "select multiple ranges"

171 +msgstr "markera flera intervall"

172 +

173 +#: add-interactive.c:1007 add-interactive.c:1052

174 +msgid "select item based on unique prefix"

175 +msgstr "markera post baserad på unikt prefix"

176 +

177 +#: add-interactive.c:1009

178 +msgid "unselect specified items"

179 +msgstr "avmarkera angivna poster"

180 +

181 +#: add-interactive.c:1011

182 +msgid "choose all items"

183 +msgstr "välj alla poster"

184 +

185 +#: add-interactive.c:1013

186 +msgid "(empty) finish selecting"

187 +msgstr "(tomt) avsluta markering"

188 +

189 +#: add-interactive.c:1050

190 +msgid "select a numbered item"

191 +msgstr "markera en numrerad post"

192 +

193 +#: add-interactive.c:1054

194 +msgid "(empty) select nothing"

195 +msgstr "(tomt) markera ingenting"

196 +

197 +#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851

198 +msgid "*** Commands ***"

199 +msgstr "*** Kommandon ***"

200 +

201 +#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848

202 +msgid "What now"

203 +msgstr "Vad nu"

204 +

205 +#: add-interactive.c:1115 git-add--interactive.perl:213

206 +msgid "staged"

207 +msgstr "köad"

208 +

209 +#: add-interactive.c:1115 git-add--interactive.perl:213

210 +msgid "unstaged"

211 +msgstr "ej köad"

212 +

213 +#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197

214 +#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144

215 +#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409

216 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382

217 +#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878

218 +#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213

219 +msgid "path"

220 +msgstr "sökväg"

221 +

222 +#: add-interactive.c:1122

223 +msgid "could not refresh index"

224 +msgstr "kunde inte uppdatera indexet"

225 +

226 +#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765

227 +#, c-format

228 +msgid "Bye.\n"

229 +msgstr "Hej då.\n"

230 +

231 +#: add-patch.c:15

232 +#, c-format

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

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

235 +

236 +#: add-patch.c:16

237 +#, c-format

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

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

240 +

241 +#: add-patch.c:17

242 +#, c-format

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

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

245 +

246 +#: add-patch.c:111

247 +#, c-format

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

249 +msgstr "kunde inte tolka styckehuvudet \"%.*s\""

250 +

251 +#: add-patch.c:130 add-patch.c:134

252 +#, c-format

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

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

255 +

256 +#: add-patch.c:176

257 +msgid "could not parse diff"

258 +msgstr "kunde inte tolka diff"

259 +

260 +#: add-patch.c:194

261 +msgid "could not parse colored diff"

262 +msgstr "kunde inte tolka färgad diff"

263 +

264 +#: add-patch.c:508

265 +#, c-format

266 +msgid ""

267 +"expected context line #%d in\n"

268 +"%.*s"

269 +msgstr ""

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

271 +"%.*s"

272 +

273 +#: add-patch.c:523

274 +#, c-format

275 +msgid ""

276 +"hunks do not overlap:\n"

277 +"%.*s\n"

278 +"\tdoes not end with:\n"

279 +"%.*s"

280 +msgstr ""

281 +"stycken överlappar inte:\n"

282 +"%.*s\n"

283 +"\tavslutas inte med:\n"

284 +"%.*s"

285 +

286 +#: add-patch.c:799 git-add--interactive.perl:1112

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

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

289 +

290 +#: add-patch.c:803

291 +#, c-format

292 +msgid ""

293 +"---\n"

294 +"To remove '%c' lines, make them ' ' lines (context).\n"

295 +"To remove '%c' lines, delete them.\n"

296 +"Lines starting with %c will be removed.\n"

297 +msgstr ""

298 +"---\n"

299 +"Ta bort \"%c\" rader genom att göra dem \" \"-rader (sammanhang).\n"

300 +"Ta bort \"%c\" rader genom att radera dem.\n"

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

302 +

303 +#: add-patch.c:810

304 +msgid ""

305 +"If the patch applies cleanly, the edited hunk will immediately be\n"

306 +"marked for staging.\n"

307 +msgstr ""

308 +"Om patchen kan appliceras rent kommer det redigerade stycket att\n"

309 +"köas omedelbart.\n"

310 +

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

312 +#: add-patch.c:818 git-add--interactive.perl:1126

313 +msgid ""

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

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

316 +"aborted and the hunk is left unchanged.\n"

317 +msgstr ""

318 +"Om patchen inte kan appliceras rent kommer du få en möjlighet att\n"

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

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

321 +

322 +#: add-patch.c:851

323 +msgid "could not parse hunk header"

324 +msgstr "kunde inte tolka styckehuvud"

325 +

326 +#: add-patch.c:895 add-patch.c:1294

327 +msgid "'git apply --cached' failed"

328 +msgstr "\"git apply --cached\" misslyckades"

329 +

330 +#. TRANSLATORS: do not translate [y/n]

331 +#. The program will only accept that input at this point.

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

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

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

335 +#.

336 +#. TRANSLATORS: do not translate [y/n]

337 +#. The program will only accept that input

338 +#. at this point.

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

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

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

342 +#: add-patch.c:952 git-add--interactive.perl:1239

343 +msgid ""

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

345 +msgstr ""

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

347 +"[y/n]? "

348 +

349 +#: add-patch.c:1009

350 +msgid ""

351 +"y - stage this hunk\n"

352 +"n - do not stage this hunk\n"

353 +"q - quit; do not stage this hunk or any of the remaining ones\n"

354 +"a - stage this and all the remaining hunks\n"

355 +"d - do not stage this hunk nor any of the remaining hunks\n"

356 +msgstr ""

357 +"y - köa stycket\n"

358 +"n - köa inte stycket\n"

359 +"q - avsluta; köa inte stycket eller något av de följande\n"

360 +"a - köa detta och alla följande stycken\n"

361 +"d - köa inte stycket eller något av de stycken som följer\n"

362 +

363 +#: add-patch.c:1016

364 +msgid ""

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

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

367 +"k - leave this hunk undecided, see previous undecided hunk\n"

368 +"K - leave this hunk undecided, see previous hunk\n"

369 +"g - select a hunk to go to\n"

370 +"/ - search for a hunk matching the given regex\n"

371 +"s - split the current hunk into smaller hunks\n"

372 +"e - manually edit the current hunk\n"

373 +"? - print help\n"

374 +msgstr ""

375 +"j - lämna stycket obestämt, se nästa obestämda stycke\n"

376 +"J - lämna stycket obestämt, se nästa stycke\n"

377 +"k - lämna stycket obestämt, se föregående obestämda stycke\n"

378 +"K - lämna stycket obestämt, se föregående stycke\n"

379 +"g - välj ett stycke att gå till\n"

380 +"/ - sök efter stycke som motsvarar angivet reguljärt uttryck\n"

381 +"s - dela aktuellt stycke i mindre styckens\n"

382 +"e - redigera aktuellt stycke manuellt\n"

383 +"? - visa hjälp\n"

384 +

385 +#: add-patch.c:1137 add-patch.c:1147

386 +msgid "No previous hunk"

387 +msgstr "Inget föregående stycke"

388 +

389 +#: add-patch.c:1142 add-patch.c:1152

390 +msgid "No next hunk"

391 +msgstr "Inget följande stycke"

392 +

393 +#: add-patch.c:1158

394 +msgid "No other hunks to goto"

395 +msgstr "Inga andra stycken att gå till"

396 +

397 +#: add-patch.c:1169 git-add--interactive.perl:1577

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

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

400 +

401 +#: add-patch.c:1170 git-add--interactive.perl:1579

402 +msgid "go to which hunk? "

403 +msgstr "gå till vilket stycke? "

404 +

405 +#: add-patch.c:1181

406 +#, c-format

407 +msgid "Invalid number: '%s'"

408 +msgstr "Ogiltigt siffervärde: \"%s\""

409 +

410 +#: add-patch.c:1186

411 +#, c-format

412 +msgid "Sorry, only %d hunk available."

413 +msgid_plural "Sorry, only %d hunks available."

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

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

416 +

417 +#: add-patch.c:1195

418 +msgid "No other hunks to search"

419 +msgstr "Inga andra stycken att söka efter"

420 +

421 +#: add-patch.c:1201 git-add--interactive.perl:1623

422 +msgid "search for regex? "

423 +msgstr "sök efter reguljärt uttryck? "

424 +

425 +#: add-patch.c:1216

426 +#, c-format

427 +msgid "Malformed search regexp %s: %s"

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

429 +

430 +#: add-patch.c:1233

431 +msgid "No hunk matches the given pattern"

432 +msgstr "Inga stycken motsvarar givet mönster"

433 +

434 +#: add-patch.c:1240

435 +msgid "Sorry, cannot split this hunk"

436 +msgstr "Beklagar, kan inte dela stycket"

437 +

438 +#: add-patch.c:1244

439 +#, c-format

440 +msgid "Split into %d hunks."

441 +msgstr "Dela i %d stycken."

442 +

443 +#: add-patch.c:1248

444 +msgid "Sorry, cannot edit this hunk"

445 +msgstr "Beklagar, kan inte redigera stycket"

446 +

447 +#: advice.c:111

448 #, c-format

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

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

451

26 -#: advice.c:162

452 +#: advice.c:164

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

454 msgstr ""

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

456 "samman."

457

32 -#: advice.c:164

458 +#: advice.c:166

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

460 msgstr ""

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

462 "samman."

463

38 -#: advice.c:166

464 +#: advice.c:168

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

466 msgstr ""

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

468 "samman."

469

44 -#: advice.c:168

470 +#: advice.c:170

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

472 msgstr ""

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

474

49 -#: advice.c:170

475 +#: advice.c:172

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

477 msgstr ""

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

479 "samman."

480

55 -#: advice.c:172

481 +#: advice.c:174

482 #, c-format

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

484 msgstr ""

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

486

61 -#: advice.c:180

487 +#: advice.c:182

488 msgid ""

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

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

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

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

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

494

69 -#: advice.c:188

495 +#: advice.c:190

496 msgid "Exiting because of an unresolved conflict."

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

498

73 -#: advice.c:193 builtin/merge.c:1332

499 +#: advice.c:195 builtin/merge.c:1332

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

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

502

77 -#: advice.c:195

503 +#: advice.c:197

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

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

506

81 -#: advice.c:196

507 +#: advice.c:198

508 msgid "Exiting because of unfinished merge."

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

510

85 -#: advice.c:202

511 +#: advice.c:204

512 #, c-format

513 msgid ""

514 "Note: switching to '%s'.\n"

@@ -292,24 +718,24 @@ msgstr "kunde inte läsa symboliska länken %s"

718 msgid "unable to open or read %s"

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

720

295 -#: apply.c:2926

721 +#: apply.c:2936

722 #, c-format

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

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

725

300 -#: apply.c:3047

726 +#: apply.c:3057

727 #, c-format

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

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

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

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

732

307 -#: apply.c:3059

733 +#: apply.c:3069

734 #, c-format

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

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

737

312 -#: apply.c:3065

738 +#: apply.c:3075

739 #, c-format

740 msgid ""

741 "while searching for:\n"

@@ -318,25 +744,25 @@ msgstr ""

744 "vid sökning efter:\n"

745 "%.*s"

746

321 -#: apply.c:3087

747 +#: apply.c:3097

748 #, c-format

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

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

751

326 -#: apply.c:3095

752 +#: apply.c:3105

753 #, c-format

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

755 msgstr ""

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

757 "\""

758

333 -#: apply.c:3142

759 +#: apply.c:3152

760 #, c-format

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

762 msgstr ""

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

764

339 -#: apply.c:3152

765 +#: apply.c:3162

766 #, c-format

767 msgid ""

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

@@ -344,426 +770,412 @@ msgstr ""

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

771 "innehållet."

772

347 -#: apply.c:3160

773 +#: apply.c:3170

774 #, c-format

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

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

777

352 -#: apply.c:3178

778 +#: apply.c:3188

779 #, c-format

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

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

782

357 -#: apply.c:3191

783 +#: apply.c:3201

784 #, c-format

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

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

787

362 -#: apply.c:3197

788 +#: apply.c:3207

789 #, c-format

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

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

792

367 -#: apply.c:3218

793 +#: apply.c:3228

794 #, c-format

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

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

797

372 -#: apply.c:3341

798 +#: apply.c:3351

799 #, c-format

800 msgid "cannot checkout %s"

801 msgstr "kan inte checka ut %s"

802

377 -#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280

803 +#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280

804 #, c-format

805 msgid "failed to read %s"

806 msgstr "misslyckades läsa %s"

807

382 -#: apply.c:3401

808 +#: apply.c:3411

809 #, c-format

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

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

812

387 -#: apply.c:3430 apply.c:3673

813 +#: apply.c:3440 apply.c:3683

814 #, c-format

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

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

817

392 -#: apply.c:3516 apply.c:3688

818 +#: apply.c:3526 apply.c:3698

819 #, c-format

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

821 msgstr "%s: finns inte i indexet"

822

397 -#: apply.c:3525 apply.c:3696

823 +#: apply.c:3535 apply.c:3706

824 #, c-format

825 msgid "%s: does not match index"

826 msgstr "%s: motsvarar inte indexet"

827

402 -#: apply.c:3560

828 +#: apply.c:3570

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

830 msgstr ""

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

832 "vägssammanslagning."

833

408 -#: apply.c:3563

834 +#: apply.c:3573

835 #, c-format

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

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

838

413 -#: apply.c:3579 apply.c:3583

839 +#: apply.c:3589 apply.c:3593

840 #, c-format

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

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

843

418 -#: apply.c:3595

844 +#: apply.c:3605

845 #, c-format

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

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

848

423 -#: apply.c:3609

849 +#: apply.c:3619

850 #, c-format

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

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

853

428 -#: apply.c:3614

854 +#: apply.c:3624

855 #, c-format

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

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

858

433 -#: apply.c:3640

859 +#: apply.c:3650

860 msgid "removal patch leaves file contents"

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

862

437 -#: apply.c:3713

863 +#: apply.c:3723

864 #, c-format

865 msgid "%s: wrong type"

866 msgstr "%s: fel typ"

867

442 -#: apply.c:3715

868 +#: apply.c:3725

869 #, c-format

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

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

872

447 -#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856

448 -#: read-cache.c:1309

873 +#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856

874 +#: read-cache.c:1320

875 #, c-format

876 msgid "invalid path '%s'"

877 msgstr "ogiltig sökväg \"%s\""

878

453 -#: apply.c:3924

879 +#: apply.c:3934

880 #, c-format

881 msgid "%s: already exists in index"

882 msgstr "%s: finns redan i indexet"

883

458 -#: apply.c:3927

884 +#: apply.c:3937

885 #, c-format

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

887 msgstr "%s: finns redan i arbetskatalogen"

888

463 -#: apply.c:3947

889 +#: apply.c:3957

890 #, c-format

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

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

893

468 -#: apply.c:3952

894 +#: apply.c:3962

895 #, c-format

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

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

898

473 -#: apply.c:3972

899 +#: apply.c:3982

900 #, c-format

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

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

903

478 -#: apply.c:3976

904 +#: apply.c:3986

905 #, c-format

906 msgid "%s: patch does not apply"

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

908

483 -#: apply.c:3991

909 +#: apply.c:4001

910 #, c-format

911 msgid "Checking patch %s..."

912 msgstr "Kontrollerar patchen %s..."

913

488 -#: apply.c:4083

914 +#: apply.c:4093

915 #, c-format

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

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

918

493 -#: apply.c:4090

919 +#: apply.c:4100

920 #, c-format

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

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

923

498 -#: apply.c:4093

924 +#: apply.c:4103

925 #, c-format

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

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

928

503 -#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143

504 -#, c-format

505 -msgid "make_cache_entry failed for path '%s'"

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

507 -

508 -#: apply.c:4102

929 +#: apply.c:4112

930 #, c-format

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

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

933

513 -#: apply.c:4112

934 +#: apply.c:4122

935 #, c-format

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

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

938

518 -#: apply.c:4250

939 +#: apply.c:4260

940 #, c-format

941 msgid "unable to remove %s from index"

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

943

523 -#: apply.c:4284

944 +#: apply.c:4294

945 #, c-format

946 msgid "corrupt patch for submodule %s"

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

948

528 -#: apply.c:4290

949 +#: apply.c:4300

950 #, c-format

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

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

953

533 -#: apply.c:4298

954 +#: apply.c:4308

955 #, c-format

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

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

958

538 -#: apply.c:4304 apply.c:4449

959 +#: apply.c:4314 apply.c:4459

960 #, c-format

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

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

963

543 -#: apply.c:4347

964 +#: apply.c:4357

965 #, c-format

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

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

968

548 -#: apply.c:4351

969 +#: apply.c:4361

970 #, c-format

971 msgid "closing file '%s'"

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

973

553 -#: apply.c:4421

974 +#: apply.c:4431

975 #, c-format

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

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

978

558 -#: apply.c:4519

979 +#: apply.c:4529

980 #, c-format

981 msgid "Applied patch %s cleanly."

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

983

563 -#: apply.c:4527

984 +#: apply.c:4537

985 msgid "internal error"

986 msgstr "internt fel"

987

567 -#: apply.c:4530

988 +#: apply.c:4540

989 #, c-format

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

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

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

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

994

574 -#: apply.c:4541

995 +#: apply.c:4551

996 #, c-format

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

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

999

579 -#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194

1000 +#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192

1001 #, c-format

1002 msgid "cannot open %s"

1003 msgstr "kan inte öppna %s"

1004

584 -#: apply.c:4563

1005 +#: apply.c:4573

1006 #, c-format

1007 msgid "Hunk #%d applied cleanly."

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

1009

589 -#: apply.c:4567

1010 +#: apply.c:4577

1011 #, c-format

1012 msgid "Rejected hunk #%d."

1013 msgstr "Refuserar stycke %d."

1014

594 -#: apply.c:4686

1015 +#: apply.c:4696

1016 #, c-format

1017 msgid "Skipped patch '%s'."

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

1019

599 -#: apply.c:4694

1020 +#: apply.c:4704

1021 msgid "unrecognized input"

1022 msgstr "indata känns inte igen"

1023

603 -#: apply.c:4714

1024 +#: apply.c:4724

1025 msgid "unable to read index file"

1026 msgstr "kan inte läsa indexfilen"

1027

607 -#: apply.c:4871

1028 +#: apply.c:4881

1029 #, c-format

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

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

1032

612 -#: apply.c:4898

1033 +#: apply.c:4908

1034 #, c-format

1035 msgid "squelched %d whitespace error"

1036 msgid_plural "squelched %d whitespace errors"

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

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

1039

619 -#: apply.c:4904 apply.c:4919

1040 +#: apply.c:4914 apply.c:4929

1041 #, c-format

1042 msgid "%d line adds whitespace errors."

1043 msgid_plural "%d lines add whitespace errors."

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

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

1046

626 -#: apply.c:4912

1047 +#: apply.c:4922

1048 #, c-format

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

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

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

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

1053

633 -#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

1054 +#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390

1055 msgid "Unable to write new index file"

1056 msgstr "Kunde inte skriva ny indexfil"

1057

637 -#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200

638 -#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273

639 -#: builtin/pull.c:209 builtin/submodule--helper.c:407

640 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370

641 -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853

642 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211

643 -msgid "path"

644 -msgstr "sökväg"

645 -

646 -#: apply.c:4956

1058 +#: apply.c:4966

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

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

1061

650 -#: apply.c:4959

1062 +#: apply.c:4969

1063 msgid "apply changes matching the given path"

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

1065

654 -#: apply.c:4961 builtin/am.c:2206

1066 +#: apply.c:4971 builtin/am.c:2206

1067 msgid "num"

1068 msgstr "antal"

1069

658 -#: apply.c:4962

1070 +#: apply.c:4972

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

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

1073

662 -#: apply.c:4965

1074 +#: apply.c:4975

1075 msgid "ignore additions made by the patch"

1076 msgstr "ignorera tillägg gjorda av patchen"

1077

666 -#: apply.c:4967

1078 +#: apply.c:4977

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

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

1081

670 -#: apply.c:4971

1082 +#: apply.c:4981

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

1084 msgstr "visa antal tillagda och borttagna rader decimalt"

1085

674 -#: apply.c:4973

1086 +#: apply.c:4983

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

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

1089

678 -#: apply.c:4975

1090 +#: apply.c:4985

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

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

1093

682 -#: apply.c:4977

1094 +#: apply.c:4987

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

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

1097

686 -#: apply.c:4979

1098 +#: apply.c:4989

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

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

1101

690 -#: apply.c:4981

1102 +#: apply.c:4991

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

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

1105

694 -#: apply.c:4983

1106 +#: apply.c:4993

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

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

1109

698 -#: apply.c:4986

1110 +#: apply.c:4996

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

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

1113

702 -#: apply.c:4988

1114 +#: apply.c:4998

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

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

1117

706 -#: apply.c:4990

1118 +#: apply.c:5000

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

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

1121

710 -#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524

1122 +#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524

1123 msgid "paths are separated with NUL character"

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

1125

714 -#: apply.c:4995

1126 +#: apply.c:5005

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

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

1129

718 -#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98

1130 +#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98

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

720 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1445

1132 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1474

1133 msgid "action"

1134 msgstr "åtgärd"

1135

724 -#: apply.c:4997

1136 +#: apply.c:5007

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

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

1139

728 -#: apply.c:5000 apply.c:5003

1140 +#: apply.c:5010 apply.c:5013

1141 msgid "ignore changes in whitespace when finding context"

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

1143

732 -#: apply.c:5006

1144 +#: apply.c:5016

1145 msgid "apply the patch in reverse"

1146 msgstr "tillämpa patchen baklänges"

1147

736 -#: apply.c:5008

1148 +#: apply.c:5018

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

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

1151

740 -#: apply.c:5010

1152 +#: apply.c:5020

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

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

1155

744 -#: apply.c:5012

1156 +#: apply.c:5022

1157 msgid "allow overlapping hunks"

1158 msgstr "tillåt överlappande stycken"

1159

748 -#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22

749 -#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786

750 -#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128

1160 +#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22

1161 +#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774

1162 +#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128

1163 msgid "be verbose"

1164 msgstr "var pratsam"

1165

754 -#: apply.c:5015

1166 +#: apply.c:5025

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

1168 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

1169

758 -#: apply.c:5018

1170 +#: apply.c:5028

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

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

1173

762 -#: apply.c:5020 builtin/am.c:2194

1174 +#: apply.c:5030 builtin/am.c:2194

1175 msgid "root"

1176 msgstr "rot"

1177

766 -#: apply.c:5021

1178 +#: apply.c:5031

1179 msgid "prepend <root> to all filenames"

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

1181

@@ -786,7 +1198,7 @@ msgstr ""

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

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

1200

789 -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299

1201 +#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299

1202 #, c-format

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

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

@@ -818,7 +1230,7 @@ msgstr "fmt"

1230 msgid "archive format"

1231 msgstr "arkivformat"

1232

821 -#: archive.c:458 builtin/log.c:1581

1233 +#: archive.c:458 builtin/log.c:1653

1234 msgid "prefix"

1235 msgstr "prefix"

1236

@@ -826,12 +1238,12 @@ msgstr "prefix"

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

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

1240

829 -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874

1241 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

1242 #: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162

1243 #: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899

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

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

834 -#: parse-options.h:186

1246 +#: parse-options.h:190

1247 msgid "file"

1248 msgstr "fil"

1249

@@ -863,8 +1275,8 @@ msgstr "komprimera bättre"

1275 msgid "list supported archive formats"

1276 msgstr "visa understödda arkivformat"

1277

866 -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115

867 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859

1278 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1279 +#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884

1280 msgid "repo"

1281 msgstr "arkiv"

1282

@@ -903,17 +1315,17 @@ msgstr "Okänt arkivformat \"%s\""

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

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

1317

906 -#: archive-tar.c:125 archive-zip.c:345

1318 +#: archive-tar.c:125 archive-zip.c:350

1319 #, c-format

1320 msgid "cannot stream blob %s"

1321 msgstr "kan inte strömma blob:en %s"

1322

911 -#: archive-tar.c:266 archive-zip.c:363

1323 +#: archive-tar.c:266 archive-zip.c:368

1324 #, c-format

1325 msgid "unsupported file mode: 0%o (SHA1: %s)"

1326 msgstr "filens läge stöds ej: 0%o (SHA1: %s)"

1327

916 -#: archive-tar.c:293 archive-zip.c:353

1328 +#: archive-tar.c:293 archive-zip.c:358

1329 #, c-format

1330 msgid "cannot read %s"

1331 msgstr "kan inte läsa %s"

@@ -932,37 +1344,37 @@ msgstr "kan inte omdirigera handtag"

1344 msgid "'%s' filter reported error"

1345 msgstr "filtret \"%s\" rapporterade fel"

1346

935 -#: archive-zip.c:314

1347 +#: archive-zip.c:319

1348 #, c-format

1349 msgid "path is not valid UTF-8: %s"

1350 msgstr "sökvägen är inte giltig UTF-8: %s"

1351

940 -#: archive-zip.c:318

1352 +#: archive-zip.c:323

1353 #, c-format

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

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

1356

945 -#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233

1357 +#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233

1358 #, c-format

1359 msgid "deflate error (%d)"

1360 msgstr "fel i deflate (%d)"

1361

950 -#: archive-zip.c:609

1362 +#: archive-zip.c:614

1363 #, c-format

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

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

1366

955 -#: attr.c:213

1367 +#: attr.c:212

1368 #, c-format

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

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

1371

960 -#: attr.c:370

1372 +#: attr.c:369

1373 #, c-format

1374 msgid "%s not allowed: %s:%d"

1375 msgstr "%s inte tillåtet: %s:%d"

1376

965 -#: attr.c:410

1377 +#: attr.c:409

1378 msgid ""

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

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

@@ -1104,9 +1516,9 @@ msgstr ""

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

1517 "incheckningen"

1518

1107 -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971

1108 -#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964

1109 -#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411

1519 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093

1520 +#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991

1521 +#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411

1522 #: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143

1523 #: builtin/shortlog.c:192

1524 msgid "revision walk setup failed"

@@ -1282,8 +1694,8 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"

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

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

1696

1285 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962

1286 -#: builtin/commit.c:791

1697 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108

1698 +#: builtin/commit.c:811

1699 #, c-format

1700 msgid "could not open '%s'"

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

@@ -1314,42 +1726,42 @@ msgid_plural "The bundle requires these %d refs:"

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

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

1728

1317 -#: bundle.c:272

1729 +#: bundle.c:273

1730 msgid "unable to dup bundle descriptor"

1731 msgstr "kan inte duplicera pakethandtag"

1732

1321 -#: bundle.c:279

1733 +#: bundle.c:280

1734 msgid "Could not spawn pack-objects"

1735 msgstr "Kunde inte starta pack-objects"

1736

1325 -#: bundle.c:290

1737 +#: bundle.c:291

1738 msgid "pack-objects died"

1739 msgstr "pack-objects misslyckades"

1740

1329 -#: bundle.c:332

1741 +#: bundle.c:333

1742 msgid "rev-list died"

1743 msgstr "rev-list dog"

1744

1333 -#: bundle.c:381

1745 +#: bundle.c:382

1746 #, c-format

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

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

1749

1338 -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306

1750 +#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306

1751 #, c-format

1752 msgid "unrecognized argument: %s"

1753 msgstr "okänt argument: %s"

1754

1343 -#: bundle.c:468

1755 +#: bundle.c:469

1756 msgid "Refusing to create empty bundle."

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

1758

1347 -#: bundle.c:478

1759 +#: bundle.c:479

1760 #, c-format

1761 msgid "cannot create '%s'"

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

1763

1352 -#: bundle.c:503

1764 +#: bundle.c:504

1765 msgid "index-pack died"

1766 msgstr "index-pack dog"

1767

@@ -1358,18 +1770,18 @@ msgstr "index-pack dog"

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

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

1772

1361 -#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398

1773 +#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398

1774 #: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456

1775 #, c-format

1776 msgid "could not parse %s"

1777 msgstr "kunde inte tolka %s"

1778

1367 -#: commit.c:52

1779 +#: commit.c:53

1780 #, c-format

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

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

1783

1372 -#: commit.c:192

1784 +#: commit.c:193

1785 msgid ""

1786 "Support for <GIT_DIR>/info/grafts is deprecated\n"

1787 "and will be removed in a future Git version.\n"

@@ -1389,29 +1801,29 @@ msgstr ""

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

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

1803

1392 -#: commit.c:1128

1804 +#: commit.c:1152

1805 #, c-format

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

1807 msgstr ""

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

1809

1398 -#: commit.c:1131

1810 +#: commit.c:1155

1811 #, c-format

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

1813 msgstr ""

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

1815

1404 -#: commit.c:1134

1816 +#: commit.c:1158

1817 #, c-format

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

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

1820

1409 -#: commit.c:1137

1821 +#: commit.c:1161

1822 #, c-format

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

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

1825

1414 -#: commit.c:1391

1826 +#: commit.c:1415

1827 msgid ""

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

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

@@ -1421,77 +1833,72 @@ msgstr ""

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

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

1835

1424 -#: commit-graph.c:127

1836 +#: commit-graph.c:130

1837 msgid "commit-graph file is too small"

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

1839

1428 -#: commit-graph.c:192

1840 +#: commit-graph.c:195

1841 #, c-format

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

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

1844

1433 -#: commit-graph.c:199

1845 +#: commit-graph.c:202

1846 #, c-format

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

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

1849

1438 -#: commit-graph.c:206

1850 +#: commit-graph.c:209

1851 #, c-format

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

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

1854

1443 -#: commit-graph.c:229

1855 +#: commit-graph.c:232

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

1857 msgstr ""

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

1859 "ofullständig"

1860

1449 -#: commit-graph.c:240

1861 +#: commit-graph.c:243

1862 #, c-format

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

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

1865

1454 -#: commit-graph.c:283

1866 +#: commit-graph.c:286

1867 #, c-format

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

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

1870

1459 -#: commit-graph.c:347

1871 +#: commit-graph.c:350

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

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

1874

1463 -#: commit-graph.c:357

1875 +#: commit-graph.c:360

1876 msgid "commit-graph chain does not match"

1877 msgstr "incheckningsgrafens kedja stämmer inte"

1878

1467 -#: commit-graph.c:404

1879 +#: commit-graph.c:407

1880 #, c-format

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

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

1883

1472 -#: commit-graph.c:430

1884 +#: commit-graph.c:433

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

1886 msgstr "kan inte hitta alla incheckingsgraffiler"

1887

1476 -#: commit-graph.c:561 commit-graph.c:621

1888 +#: commit-graph.c:564 commit-graph.c:624

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

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

1891

1480 -#: commit-graph.c:582

1892 +#: commit-graph.c:585

1893 #, c-format

1894 msgid "could not find commit %s"

1895 msgstr "kunde inte hitta incheckningen %s"

1896

1485 -#: commit-graph.c:855 builtin/am.c:1287

1897 +#: commit-graph.c:858 builtin/am.c:1287

1898 #, c-format

1899 msgid "unable to parse commit %s"

1900 msgstr "kunde inte tolka incheckningen %s"

1901

1490 -#: commit-graph.c:859

1491 -#, c-format

1492 -msgid "unable to get tree for %s"

1493 -msgstr "kunde inte hämta trädet på %s"

1494 -

1902 #: commit-graph.c:1017 builtin/pack-objects.c:2641

1903 #, c-format

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

@@ -1558,12 +1965,12 @@ msgstr "Söker ytterligare kanter i incheckingsgraf"

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

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

1967

1561 -#: commit-graph.c:1379 midx.c:810

1968 +#: commit-graph.c:1379 midx.c:814

1969 #, c-format

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

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

1972

1566 -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241

1973 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248

1974 #, c-format

1975 msgid "unable to create '%s'"

1976 msgstr "kunde inte skapa \"%s\""

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

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

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

2140

1734 -#: config.c:406 sequencer.c:2401

2141 +#: config.c:406 sequencer.c:2530

2142 #, c-format

2143 msgid "invalid key: %s"

2144 msgstr "felaktig nyckel: %s"

@@ -1860,144 +2267,144 @@ msgstr "core.commentChar kan bara vara ett tecken"

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

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

2269

1863 -#: config.c:1425

2270 +#: config.c:1430

2271 #, c-format

2272 msgid "malformed value for %s"

2273 msgstr "felformat värde för %s"

2274

1868 -#: config.c:1451

2275 +#: config.c:1456

2276 #, c-format

2277 msgid "malformed value for %s: %s"

2278 msgstr "felformat värde för %s: %s"

2279

1873 -#: config.c:1452

2280 +#: config.c:1457

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

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

2283

1877 -#: config.c:1513 builtin/pack-objects.c:3394

2284 +#: config.c:1518 builtin/pack-objects.c:3394

2285 #, c-format

2286 msgid "bad pack compression level %d"

2287 msgstr "felaktig paketkomprimeringsgrad %d"

2288

1882 -#: config.c:1634

2289 +#: config.c:1639

2290 #, c-format

2291 msgid "unable to load config blob object '%s'"

2292 msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""

2293

1887 -#: config.c:1637

2294 +#: config.c:1642

2295 #, c-format

2296 msgid "reference '%s' does not point to a blob"

2297 msgstr "referensen \"%s\" pekar inte på en blob"

2298

1892 -#: config.c:1654

2299 +#: config.c:1659

2300 #, c-format

2301 msgid "unable to resolve config blob '%s'"

2302 msgstr "kan inte slå upp konfigurerings-bloben \"%s\""

2303

1897 -#: config.c:1684

2304 +#: config.c:1689

2305 #, c-format

2306 msgid "failed to parse %s"

2307 msgstr "kunde inte tolka %s"

2308

1902 -#: config.c:1740

2309 +#: config.c:1745

2310 msgid "unable to parse command-line config"

2311 msgstr "kan inte tolka kommandoradskonfiguration"

2312

1906 -#: config.c:2091

2313 +#: config.c:2096

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

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

2316

1910 -#: config.c:2261

2317 +#: config.c:2266

2318 #, c-format

2319 msgid "Invalid %s: '%s'"

2320 msgstr "Felaktigt %s: \"%s\""

2321

1915 -#: config.c:2306

2322 +#: config.c:2311

2323 #, c-format

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

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

2326

1920 -#: config.c:2352

2327 +#: config.c:2357

2328 #, c-format

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

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

2331

1925 -#: config.c:2354

2332 +#: config.c:2359

2333 #, c-format

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

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

2336

1930 -#: config.c:2435

2337 +#: config.c:2440

2338 #, c-format

2339 msgid "invalid section name '%s'"

2340 msgstr "felaktigt sektionsnamn \"%s\""

2341

1935 -#: config.c:2467

2342 +#: config.c:2472

2343 #, c-format

2344 msgid "%s has multiple values"

2345 msgstr "%s har flera värden"

2346

1940 -#: config.c:2496

2347 +#: config.c:2501

2348 #, c-format

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

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

2351

1945 -#: config.c:2748 config.c:3072

2352 +#: config.c:2753 config.c:3077

2353 #, c-format

2354 msgid "could not lock config file %s"

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

2356

1950 -#: config.c:2759

2357 +#: config.c:2764

2358 #, c-format

2359 msgid "opening %s"

2360 msgstr "öppnar %s"

2361

1955 -#: config.c:2794 builtin/config.c:328

2362 +#: config.c:2799 builtin/config.c:328

2363 #, c-format

2364 msgid "invalid pattern: %s"

2365 msgstr "ogiltigt mönster: %s"

2366

1960 -#: config.c:2819

2367 +#: config.c:2824

2368 #, c-format

2369 msgid "invalid config file %s"

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

2371

1965 -#: config.c:2832 config.c:3085

2372 +#: config.c:2837 config.c:3090

2373 #, c-format

2374 msgid "fstat on %s failed"

2375 msgstr "fstat misslyckades på %s"

2376

1970 -#: config.c:2843

2377 +#: config.c:2848

2378 #, c-format

2379 msgid "unable to mmap '%s'"

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

2381

1975 -#: config.c:2852 config.c:3090

2382 +#: config.c:2857 config.c:3095

2383 #, c-format

2384 msgid "chmod on %s failed"

2385 msgstr "chmod misslyckades på %s"

2386

1980 -#: config.c:2937 config.c:3187

2387 +#: config.c:2942 config.c:3192

2388 #, c-format

2389 msgid "could not write config file %s"

2390 msgstr "kunde inte skriva konfigurationsfilen %s"

2391

1985 -#: config.c:2971

2392 +#: config.c:2976

2393 #, c-format

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

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

2396

1990 -#: config.c:2973 builtin/remote.c:782

2397 +#: config.c:2978 builtin/remote.c:781

2398 #, c-format

2399 msgid "could not unset '%s'"

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

2401

1995 -#: config.c:3063

2402 +#: config.c:3068

2403 #, c-format

2404 msgid "invalid section name: %s"

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

2406

2000 -#: config.c:3230

2407 +#: config.c:3235

2408 #, c-format

2409 msgid "missing value for '%s'"

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

@@ -2163,19 +2570,19 @@ msgstr "kunde inte grena (fork)"

2570

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

2572 # objects in the database.

2166 -#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43

2573 +#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43

2574 msgid "Checking connectivity"

2575 msgstr "Kontrollerar konnektivitet"

2576

2170 -#: connected.c:100

2577 +#: connected.c:101

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

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

2580

2174 -#: connected.c:120

2581 +#: connected.c:121

2582 msgid "failed write to rev-list"

2583 msgstr "kunde inte skriva till rev-list"

2584

2178 -#: connected.c:127

2585 +#: connected.c:128

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

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

2588

@@ -2212,26 +2619,26 @@ msgstr ""

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

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

2621

2215 -#: convert.c:280

2622 +#: convert.c:284

2623 #, c-format

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

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

2626

2220 -#: convert.c:287

2627 +#: convert.c:291

2628 #, c-format

2629 msgid ""

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

2224 -"tree-encoding."

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

2631 +"working-tree-encoding."

2632 msgstr ""

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

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

2634 "teckenkodning i arbetskatalogen."

2635

2229 -#: convert.c:305

2636 +#: convert.c:304

2637 #, c-format

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

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

2640

2234 -#: convert.c:307

2641 +#: convert.c:306

2642 #, c-format

2643 msgid ""

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

@@ -2240,51 +2647,51 @@ msgstr ""

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

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

2649

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

2650 +#: convert.c:419 convert.c:490

2651 #, c-format

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

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

2654

2248 -#: convert.c:468

2655 +#: convert.c:462

2656 #, c-format

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

2658 msgstr ""

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

2660

2254 -#: convert.c:674

2661 +#: convert.c:668

2662 #, c-format

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

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

2665

2259 -#: convert.c:694

2666 +#: convert.c:688

2667 #, c-format

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

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

2670

2264 -#: convert.c:701

2671 +#: convert.c:695

2672 #, c-format

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

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

2675

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

2676 +#: convert.c:730 convert.c:733

2677 #, c-format

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

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

2680

2274 -#: convert.c:742 convert.c:797

2681 +#: convert.c:736 convert.c:791

2682 #, c-format

2683 msgid "external filter '%s' failed"

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

2685

2279 -#: convert.c:845

2686 +#: convert.c:839

2687 msgid "unexpected filter type"

2688 msgstr "oväntad filtertyp"

2689

2283 -#: convert.c:856

2690 +#: convert.c:850

2691 msgid "path name too long for external filter"

2692 msgstr "sökvägen för lång för externt filter"

2693

2287 -#: convert.c:930

2694 +#: convert.c:924

2695 #, c-format

2696 msgid ""

2697 "external filter '%s' is not available anymore although not all paths have "

@@ -2293,16 +2700,16 @@ msgstr ""

2700 "externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar "

2701 "inte har filtrerats"

2702

2296 -#: convert.c:1229

2703 +#: convert.c:1223

2704 msgid "true/false are no valid working-tree-encodings"

2705 msgstr "true/false är inte giltig teckenkodning för arbetskatalogen"

2706

2300 -#: convert.c:1417 convert.c:1451

2707 +#: convert.c:1411 convert.c:1445

2708 #, c-format

2709 msgid "%s: clean filter '%s' failed"

2710 msgstr "%s: \"clean\"-filtret \"%s\" misslyckades"

2711

2305 -#: convert.c:1495

2712 +#: convert.c:1489

2713 #, c-format

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

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

@@ -2470,35 +2877,35 @@ msgstr ""

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

2878 "%s"

2879

2473 -#: diff.c:4218

2880 +#: diff.c:4202

2881 #, c-format

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

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

2884

2478 -#: diff.c:4563

2885 +#: diff.c:4547

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

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

2888

2482 -#: diff.c:4566

2889 +#: diff.c:4550

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

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

2892

2486 -#: diff.c:4644

2893 +#: diff.c:4628

2894 msgid "--follow requires exactly one pathspec"

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

2896

2490 -#: diff.c:4692

2897 +#: diff.c:4676

2898 #, c-format

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

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

2901

2495 -#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225

2902 +#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209

2903 #: parse-options.c:199 parse-options.c:203

2904 #, c-format

2905 msgid "%s expects a numerical value"

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

2907

2501 -#: diff.c:4729

2908 +#: diff.c:4713

2909 #, c-format

2910 msgid ""

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

@@ -2507,42 +2914,42 @@ msgstr ""

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

2915 "%s"

2916

2510 -#: diff.c:4814

2917 +#: diff.c:4798

2918 #, c-format

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

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

2921

2515 -#: diff.c:4838

2922 +#: diff.c:4822

2923 #, c-format

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

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

2926

2520 -#: diff.c:4852

2927 +#: diff.c:4836

2928 #, c-format

2929 msgid "unable to resolve '%s'"

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

2931

2525 -#: diff.c:4902 diff.c:4908

2932 +#: diff.c:4886 diff.c:4892

2933 #, c-format

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

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

2936

2530 -#: diff.c:4920

2937 +#: diff.c:4904

2938 #, c-format

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

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

2941

2535 -#: diff.c:4941

2942 +#: diff.c:4925

2943 #, c-format

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

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

2946

2540 -#: diff.c:4960

2947 +#: diff.c:4944

2948 #, c-format

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

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

2951

2545 -#: diff.c:5000

2952 +#: diff.c:4984

2953 msgid ""

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

2955 "\"histogram\""

@@ -2550,149 +2957,149 @@ msgstr ""

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

2958 "\"histogram\""

2959

2553 -#: diff.c:5036 diff.c:5056

2960 +#: diff.c:5020 diff.c:5040

2961 #, c-format

2962 msgid "invalid argument to %s"

2963 msgstr "ogiltigt argument för %s"

2964

2558 -#: diff.c:5194

2965 +#: diff.c:5178

2966 #, c-format

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

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

2969

2563 -#: diff.c:5250

2970 +#: diff.c:5234

2971 #, c-format

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

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

2974

2568 -#: diff.c:5273

2975 +#: diff.c:5257

2976 msgid "Diff output format options"

2977 msgstr "Formatflaggor för diff-utdata"

2978

2572 -#: diff.c:5275 diff.c:5281

2979 +#: diff.c:5259 diff.c:5265

2980 msgid "generate patch"

2981 msgstr "skapar patch"

2982

2576 -#: diff.c:5278 builtin/log.c:172

2983 +#: diff.c:5262 builtin/log.c:173

2984 msgid "suppress diff output"

2985 msgstr "undertryck diff-utdata"

2986

2580 -#: diff.c:5283 diff.c:5397 diff.c:5404

2987 +#: diff.c:5267 diff.c:5381 diff.c:5388

2988 msgid "<n>"

2989 msgstr "<n>"

2990

2584 -#: diff.c:5284 diff.c:5287

2991 +#: diff.c:5268 diff.c:5271

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

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

2994

2588 -#: diff.c:5289

2995 +#: diff.c:5273

2996 msgid "generate the diff in raw format"

2997 msgstr "generera diff i råformat"

2998

2592 -#: diff.c:5292

2999 +#: diff.c:5276

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

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

3002

2596 -#: diff.c:5296

3003 +#: diff.c:5280

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

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

3006

2600 -#: diff.c:5300

3007 +#: diff.c:5284

3008 msgid "machine friendly --stat"

3009 msgstr "maskinläsbar --stat"

3010

2604 -#: diff.c:5303

3011 +#: diff.c:5287

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

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

3014

2608 -#: diff.c:5305 diff.c:5313

3015 +#: diff.c:5289 diff.c:5297

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

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

3018

2612 -#: diff.c:5306

3019 +#: diff.c:5290

3020 msgid ""

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

3022 msgstr ""

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

3024

2618 -#: diff.c:5310

3025 +#: diff.c:5294

3026 msgid "synonym for --dirstat=cumulative"

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

3028

2622 -#: diff.c:5314

3029 +#: diff.c:5298

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

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

3032

2626 -#: diff.c:5318

3033 +#: diff.c:5302

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

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

3036

2630 -#: diff.c:5321

3037 +#: diff.c:5305

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

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

3040

2634 -#: diff.c:5324

3041 +#: diff.c:5308

3042 msgid "show only names of changed files"

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

3044

2638 -#: diff.c:5327

3045 +#: diff.c:5311

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

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

3048

2642 -#: diff.c:5329

3049 +#: diff.c:5313

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

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

3052

2646 -#: diff.c:5330

3053 +#: diff.c:5314

3054 msgid "generate diffstat"

3055 msgstr "skapa diffstat"

3056

2650 -#: diff.c:5332 diff.c:5335 diff.c:5338

3057 +#: diff.c:5316 diff.c:5319 diff.c:5322

3058 msgid "<width>"

3059 msgstr "<bredd>"

3060

2654 -#: diff.c:5333

3061 +#: diff.c:5317

3062 msgid "generate diffstat with a given width"

3063 msgstr "generera en diffstat med given bredd"

3064

2658 -#: diff.c:5336

3065 +#: diff.c:5320

3066 msgid "generate diffstat with a given name width"

3067 msgstr "generera en diffstat med given namnbredd"

3068

2662 -#: diff.c:5339

3069 +#: diff.c:5323

3070 msgid "generate diffstat with a given graph width"

3071 msgstr "generera en diffstat med given grafbredd"

3072

2666 -#: diff.c:5341

3073 +#: diff.c:5325

3074 msgid "<count>"

3075 msgstr "<antal>"

3076

2670 -#: diff.c:5342

3077 +#: diff.c:5326

3078 msgid "generate diffstat with limited lines"

3079 msgstr "generera diffstat med begränsade rader"

3080

2674 -#: diff.c:5345

3081 +#: diff.c:5329

3082 msgid "generate compact summary in diffstat"

3083 msgstr "skapa kompakt översikt i diffstat"

3084

2678 -#: diff.c:5348

3085 +#: diff.c:5332

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

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

3088

2682 -#: diff.c:5351

3089 +#: diff.c:5335

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

3091 msgstr ""

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

3093

2687 -#: diff.c:5353

3094 +#: diff.c:5337

3095 msgid "show colored diff"

3096 msgstr "visa färgad diff"

3097

2691 -#: diff.c:5354

3098 +#: diff.c:5338

3099 msgid "<kind>"

3100 msgstr "<typ>"

3101

2695 -#: diff.c:5355

3102 +#: diff.c:5339

3103 msgid ""

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

3105 "diff"

@@ -2700,7 +3107,7 @@ msgstr ""

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

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

3109

2703 -#: diff.c:5358

3110 +#: diff.c:5342

3111 msgid ""

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

3113 "--numstat"

@@ -2708,87 +3115,87 @@ msgstr ""

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

3116 "eller --numstat"

3117

2711 -#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473

3118 +#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457

3119 msgid "<prefix>"

3120 msgstr "<prefix>"

3121

2715 -#: diff.c:5362

3122 +#: diff.c:5346

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

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

3125

2719 -#: diff.c:5365

3126 +#: diff.c:5349

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

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

3129

2723 -#: diff.c:5368

3130 +#: diff.c:5352

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

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

3133

2727 -#: diff.c:5371

3134 +#: diff.c:5355

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

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

3137

2731 -#: diff.c:5374

3138 +#: diff.c:5358

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

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

3141

2735 -#: diff.c:5378 diff.c:5383 diff.c:5388

3142 +#: diff.c:5362 diff.c:5367 diff.c:5372

3143 msgid "<char>"

3144 msgstr "<tecken>"

3145

2739 -#: diff.c:5379

3146 +#: diff.c:5363

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

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

3149

2743 -#: diff.c:5384

3150 +#: diff.c:5368

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

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

3153

2747 -#: diff.c:5389

3154 +#: diff.c:5373

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

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

3157

2751 -#: diff.c:5392

3158 +#: diff.c:5376

3159 msgid "Diff rename options"

3160 msgstr "Diff-namnbytesflaggor"

3161

2755 -#: diff.c:5393

3162 +#: diff.c:5377

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

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

3165

2759 -#: diff.c:5394

3166 +#: diff.c:5378

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

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

3169

2763 -#: diff.c:5398

3170 +#: diff.c:5382

3171 msgid "detect renames"

3172 msgstr "detektera namnändringar"

3173

2767 -#: diff.c:5402

3174 +#: diff.c:5386

3175 msgid "omit the preimage for deletes"

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

3177

2771 -#: diff.c:5405

3178 +#: diff.c:5389

3179 msgid "detect copies"

3180 msgstr "detektera kopior"

3181

2775 -#: diff.c:5409

3182 +#: diff.c:5393

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

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

3185

2779 -#: diff.c:5411

3186 +#: diff.c:5395

3187 msgid "disable rename detection"

3188 msgstr "inaktivera detektering av namnbyten"

3189

2783 -#: diff.c:5414

3190 +#: diff.c:5398

3191 msgid "use empty blobs as rename source"

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

3193

2787 -#: diff.c:5416

3194 +#: diff.c:5400

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

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

3197

2791 -#: diff.c:5419

3198 +#: diff.c:5403

3199 msgid ""

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

3201 "given limit"

@@ -2796,159 +3203,159 @@ msgstr ""

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

3204 "given gräns"

3205

2799 -#: diff.c:5421

3206 +#: diff.c:5405

3207 msgid "Diff algorithm options"

3208 msgstr "Alternativ för diff-algoritm"

3209

2803 -#: diff.c:5423

3210 +#: diff.c:5407

3211 msgid "produce the smallest possible diff"

3212 msgstr "skapa minsta möjliga diff"

3213

2807 -#: diff.c:5426

3214 +#: diff.c:5410

3215 msgid "ignore whitespace when comparing lines"

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

3217

2811 -#: diff.c:5429

3218 +#: diff.c:5413

3219 msgid "ignore changes in amount of whitespace"

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

3221

2815 -#: diff.c:5432

3222 +#: diff.c:5416

3223 msgid "ignore changes in whitespace at EOL"

3224 msgstr "ignorera blanktecken vid radslut"

3225

2819 -#: diff.c:5435

3226 +#: diff.c:5419

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

3228 msgstr "ignorera CR-tecken vid radslut"

3229

2823 -#: diff.c:5438

3230 +#: diff.c:5422

3231 msgid "ignore changes whose lines are all blank"

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

3233

2827 -#: diff.c:5441

3234 +#: diff.c:5425

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

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

3237

2831 -#: diff.c:5444

3238 +#: diff.c:5428

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

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

3241

2835 -#: diff.c:5448

3242 +#: diff.c:5432

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

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

3245

2839 -#: diff.c:5450

3246 +#: diff.c:5434

3247 msgid "<algorithm>"

3248 msgstr "<algoritm>"

3249

2843 -#: diff.c:5451

3250 +#: diff.c:5435

3251 msgid "choose a diff algorithm"

3252 msgstr "välj en diff-algoritm"

3253

2847 -#: diff.c:5453

3254 +#: diff.c:5437

3255 msgid "<text>"

3256 msgstr "<text>"

3257

2851 -#: diff.c:5454

3258 +#: diff.c:5438

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

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

3261

2855 -#: diff.c:5456 diff.c:5465 diff.c:5468

3262 +#: diff.c:5440 diff.c:5449 diff.c:5452

3263 msgid "<mode>"

3264 msgstr "<läge>"

3265

2859 -#: diff.c:5457

3266 +#: diff.c:5441

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

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

3269

2863 -#: diff.c:5459 diff.c:5462 diff.c:5507

3270 +#: diff.c:5443 diff.c:5446 diff.c:5491

3271 msgid "<regex>"

3272 msgstr "<reguttr>"

3273

2867 -#: diff.c:5460

3274 +#: diff.c:5444

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

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

3277

2871 -#: diff.c:5463

3278 +#: diff.c:5447

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

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

3281

2875 -#: diff.c:5466

3282 +#: diff.c:5450

3283 msgid "moved lines of code are colored differently"

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

3285

2879 -#: diff.c:5469

3286 +#: diff.c:5453

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

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

3289

2883 -#: diff.c:5472

3290 +#: diff.c:5456

3291 msgid "Other diff options"

3292 msgstr "Andra diff-flaggor"

3293

2887 -#: diff.c:5474

3294 +#: diff.c:5458

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

3296 msgstr ""

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

3298 "sökvägar"

3299

2893 -#: diff.c:5478

3300 +#: diff.c:5462

3301 msgid "treat all files as text"

3302 msgstr "hantera alla filer som text"

3303

2897 -#: diff.c:5480

3304 +#: diff.c:5464

3305 msgid "swap two inputs, reverse the diff"

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

3307

2901 -#: diff.c:5482

3308 +#: diff.c:5466

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

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

3311

2905 -#: diff.c:5484

3312 +#: diff.c:5468

3313 msgid "disable all output of the program"

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

3315

2909 -#: diff.c:5486

3316 +#: diff.c:5470

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

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

3319

2913 -#: diff.c:5488

3320 +#: diff.c:5472

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

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

3323

2917 -#: diff.c:5490

3324 +#: diff.c:5474

3325 msgid "<when>"

3326 msgstr "<när>"

3327

2921 -#: diff.c:5491

3328 +#: diff.c:5475

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

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

3331

2925 -#: diff.c:5494

3332 +#: diff.c:5478

3333 msgid "<format>"

3334 msgstr "<format>"

3335

2929 -#: diff.c:5495

3336 +#: diff.c:5479

3337 msgid "specify how differences in submodules are shown"

3338 msgstr "ange hur ändringar i undermoduler visas"

3339

2933 -#: diff.c:5499

3340 +#: diff.c:5483

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

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

3343

2937 -#: diff.c:5502

3344 +#: diff.c:5486

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

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

3347

2941 -#: diff.c:5504

3348 +#: diff.c:5488

3349 msgid "<string>"

3350 msgstr "<sträng>"

3351

2945 -#: diff.c:5505

3352 +#: diff.c:5489

3353 msgid ""

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

3355 "string"

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

3357

2951 -#: diff.c:5508

3358 +#: diff.c:5492

3359 msgid ""

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

3361 "regex"

@@ -2956,94 +3363,115 @@ msgstr ""

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

3364 "uttryck"

3365

2959 -#: diff.c:5511

3366 +#: diff.c:5495

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

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

3369

2963 -#: diff.c:5514

3370 +#: diff.c:5498

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

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

3373

2967 -#: diff.c:5517

3374 +#: diff.c:5501

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

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

3377

2971 -#: diff.c:5518

3378 +#: diff.c:5502

3379 msgid "<object-id>"

3380 msgstr "<objekt-id>"

3381

2975 -#: diff.c:5519

3382 +#: diff.c:5503

3383 msgid ""

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

3385 "object"

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

3387

2981 -#: diff.c:5521

3388 +#: diff.c:5505

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

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

3391

2985 -#: diff.c:5522

3392 +#: diff.c:5506

3393 msgid "select files by diff type"

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

3395

2989 -#: diff.c:5524

3396 +#: diff.c:5508

3397 msgid "<file>"

3398 msgstr "<fil>"

3399

2993 -#: diff.c:5525

3400 +#: diff.c:5509

3401 msgid "Output to a specific file"

3402 msgstr "Skriv utdata till en specifik fil"

3403

2997 -#: diff.c:6180

3404 +#: diff.c:6164

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

3406 msgstr ""

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

3408

3002 -#: diff.c:6183

3409 +#: diff.c:6167

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

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

3412

3006 -#: diff.c:6186

3413 +#: diff.c:6170

3414 #, c-format

3415 msgid ""

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

3417 msgstr ""

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

3419

3013 -#: dir.c:549

3420 +#: dir.c:554

3421 #, c-format

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

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

3424

3018 -#: dir.c:938

3425 +#: dir.c:664

3426 +#, c-format

3427 +msgid "unrecognized pattern: '%s'"

3428 +msgstr "okänt mönster: %s"

3429 +

3430 +#: dir.c:682 dir.c:696

3431 +#, c-format

3432 +msgid "unrecognized negative pattern: '%s'"

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

3434 +

3435 +#: dir.c:714

3436 +#, c-format

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

3438 +msgstr ""

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

3440 +"gånger"

3441 +

3442 +#: dir.c:724

3443 +msgid "disabling cone pattern matching"

3444 +msgstr "inaktiverar konmönstermatchning"

3445 +

3446 +#: dir.c:1101

3447 #, c-format

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

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

3450

3023 -#: dir.c:1877

3451 +#: dir.c:2078

3452 #, c-format

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

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

3455

3028 -#: dir.c:2128

3456 +#: dir.c:2415

3457 msgid "failed to get kernel name and information"

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

3459

3032 -#: dir.c:2252

3460 +#: dir.c:2539

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

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

3463

3036 -#: dir.c:3056

3464 +#: dir.c:3343

3465 #, c-format

3466 msgid "index file corrupt in repo %s"

3467 msgstr "indexfilen trasig i arkivet %s"

3468

3041 -#: dir.c:3101 dir.c:3106

3469 +#: dir.c:3388 dir.c:3393

3470 #, c-format

3471 msgid "could not create directories for %s"

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

3473

3046 -#: dir.c:3135

3474 +#: dir.c:3422

3475 #, c-format

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

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

@@ -3062,12 +3490,12 @@ msgstr "Filtrerar innehåll"

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

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

3492

3065 -#: environment.c:148

3493 +#: environment.c:149

3494 #, c-format

3495 msgid "bad git namespace path \"%s\""

3496 msgstr "felaktig git-namnrymdssökväg \"%s\""

3497

3070 -#: environment.c:330

3498 +#: environment.c:331

3499 #, c-format

3500 msgid "could not set GIT_DIR to '%s'"

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

@@ -3102,32 +3530,32 @@ msgstr "kunde inte skriva till fjärren"

3530 msgid "--stateless-rpc requires multi_ack_detailed"

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

3532

3105 -#: fetch-pack.c:356 fetch-pack.c:1280

3533 +#: fetch-pack.c:356 fetch-pack.c:1340

3534 #, c-format

3535 msgid "invalid shallow line: %s"

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

3537

3110 -#: fetch-pack.c:362 fetch-pack.c:1286

3538 +#: fetch-pack.c:362 fetch-pack.c:1346

3539 #, c-format

3540 msgid "invalid unshallow line: %s"

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

3542

3115 -#: fetch-pack.c:364 fetch-pack.c:1288

3543 +#: fetch-pack.c:364 fetch-pack.c:1348

3544 #, c-format

3545 msgid "object not found: %s"

3546 msgstr "objektet hittades inte: %s"

3547

3120 -#: fetch-pack.c:367 fetch-pack.c:1291

3548 +#: fetch-pack.c:367 fetch-pack.c:1351

3549 #, c-format

3550 msgid "error in object: %s"

3551 msgstr "fel i objekt: %s"

3552

3125 -#: fetch-pack.c:369 fetch-pack.c:1293

3553 +#: fetch-pack.c:369 fetch-pack.c:1353

3554 #, c-format

3555 msgid "no shallow found: %s"

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

3557

3130 -#: fetch-pack.c:372 fetch-pack.c:1297

3558 +#: fetch-pack.c:372 fetch-pack.c:1357

3559 #, c-format

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

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

@@ -3146,7 +3574,7 @@ msgstr "ogiltig incheckning %s"

3574 msgid "giving up"

3575 msgstr "ger upp"

3576

3149 -#: fetch-pack.c:475 progress.c:312

3577 +#: fetch-pack.c:475 progress.c:323

3578 msgid "done"

3579 msgstr "klart"

3580

@@ -3160,163 +3588,163 @@ msgstr "fick %s (%d) %s"

3588 msgid "Marking %s as complete"

3589 msgstr "Markerar %s som komplett"

3590

3163 -#: fetch-pack.c:742

3591 +#: fetch-pack.c:754

3592 #, c-format

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

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

3595

3168 -#: fetch-pack.c:781

3596 +#: fetch-pack.c:818

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

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

3599

3172 -#: fetch-pack.c:789

3600 +#: fetch-pack.c:826

3601 msgid "protocol error: bad pack header"

3602 msgstr "protokollfel: felaktigt packhuvud"

3603

3176 -#: fetch-pack.c:857

3604 +#: fetch-pack.c:900

3605 #, c-format

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

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

3608

3181 -#: fetch-pack.c:873

3609 +#: fetch-pack.c:916

3610 #, c-format

3611 msgid "%s failed"

3612 msgstr "%s misslyckades"

3613

3186 -#: fetch-pack.c:875

3614 +#: fetch-pack.c:918

3615 msgid "error in sideband demultiplexer"

3616 msgstr "fel i sidbands-avmultiplexare"

3617

3190 -#: fetch-pack.c:907

3618 +#: fetch-pack.c:965

3619 #, c-format

3620 msgid "Server version is %.*s"

3621 msgstr "Serverversionen är %.*s"

3622

3195 -#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927

3196 -#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943

3197 -#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959

3198 -#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981

3623 +#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985

3624 +#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001

3625 +#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017

3626 +#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039

3627 #, c-format

3628 msgid "Server supports %s"

3629 msgstr "Servern stöder %s"

3630

3203 -#: fetch-pack.c:914

3631 +#: fetch-pack.c:972

3632 msgid "Server does not support shallow clients"

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

3634

3207 -#: fetch-pack.c:974

3635 +#: fetch-pack.c:1032

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

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

3638

3211 -#: fetch-pack.c:979

3639 +#: fetch-pack.c:1037

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

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

3642

3215 -#: fetch-pack.c:983

3643 +#: fetch-pack.c:1041

3644 msgid "Server does not support --deepen"

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

3646

3219 -#: fetch-pack.c:1000

3647 +#: fetch-pack.c:1058

3648 msgid "no common commits"

3649 msgstr "inga gemensamma incheckningar"

3650

3223 -#: fetch-pack.c:1012 fetch-pack.c:1468

3651 +#: fetch-pack.c:1070 fetch-pack.c:1536

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

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

3654

3227 -#: fetch-pack.c:1150

3655 +#: fetch-pack.c:1209

3656 msgid "Server does not support shallow requests"

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

3658

3231 -#: fetch-pack.c:1157

3659 +#: fetch-pack.c:1216

3660 msgid "Server supports filter"

3661 msgstr "Servern stöder filter"

3662

3235 -#: fetch-pack.c:1180

3663 +#: fetch-pack.c:1239

3664 msgid "unable to write request to remote"

3665 msgstr "kunde inte skriva anrop till fjärren"

3666

3239 -#: fetch-pack.c:1198

3667 +#: fetch-pack.c:1257

3668 #, c-format

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

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

3671

3244 -#: fetch-pack.c:1204

3672 +#: fetch-pack.c:1263

3673 #, c-format

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

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

3676

3249 -#: fetch-pack.c:1243

3677 +#: fetch-pack.c:1303

3678 #, c-format

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

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

3681

3254 -#: fetch-pack.c:1248

3682 +#: fetch-pack.c:1308

3683 #, c-format

3684 msgid "error processing acks: %d"

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

3686

3259 -#: fetch-pack.c:1258

3687 +#: fetch-pack.c:1318

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

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

3690

3263 -#: fetch-pack.c:1260

3691 +#: fetch-pack.c:1320

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

3693 msgstr ""

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

3695

3268 -#: fetch-pack.c:1302

3696 +#: fetch-pack.c:1362

3697 #, c-format

3698 msgid "error processing shallow info: %d"

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

3700

3273 -#: fetch-pack.c:1349

3701 +#: fetch-pack.c:1409

3702 #, c-format

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

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

3705

3278 -#: fetch-pack.c:1354

3706 +#: fetch-pack.c:1414

3707 #, c-format

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

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

3710

3283 -#: fetch-pack.c:1359

3711 +#: fetch-pack.c:1419

3712 #, c-format

3713 msgid "error processing wanted refs: %d"

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

3715

3288 -#: fetch-pack.c:1693

3716 +#: fetch-pack.c:1762

3717 msgid "no matching remote head"

3718 msgstr "inget motsvarande fjärrhuvud"

3719

3292 -#: fetch-pack.c:1716 builtin/clone.c:685

3720 +#: fetch-pack.c:1785 builtin/clone.c:688

3721 msgid "remote did not send all necessary objects"

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

3723

3296 -#: fetch-pack.c:1743

3724 +#: fetch-pack.c:1812

3725 #, c-format

3726 msgid "no such remote ref %s"

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

3728

3301 -#: fetch-pack.c:1746

3729 +#: fetch-pack.c:1815

3730 #, c-format

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

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

3733

3306 -#: gpg-interface.c:321

3307 -msgid "gpg failed to sign the data"

3308 -msgstr "gpg misslyckades signera data"

3309 -

3310 -#: gpg-interface.c:347

3734 +#: gpg-interface.c:223

3735 msgid "could not create temporary file"

3736 msgstr "kunde inte skapa temporära fil"

3737

3314 -#: gpg-interface.c:350

3738 +#: gpg-interface.c:226

3739 #, c-format

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

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

3742

3319 -#: graph.c:97

3743 +#: gpg-interface.c:390

3744 +msgid "gpg failed to sign the data"

3745 +msgstr "gpg misslyckades signera data"

3746 +

3747 +#: graph.c:98

3748 #, c-format

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

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

@@ -3334,7 +3762,7 @@ msgstr ""

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

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

3764

3337 -#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82

3765 +#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82

3766 #: builtin/rm.c:135

3767 #, c-format

3768 msgid "failed to stat '%s'"

@@ -3390,7 +3818,7 @@ msgid "Low-level Commands / Interrogators"

3818 msgstr "Lågnivåkommandon / frågare"

3819

3820 #: help.c:37

3393 -msgid "Low-level Commands / Synching Repositories"

3821 +msgid "Low-level Commands / Syncing Repositories"

3822 msgstr "Lågnivåkommandon / synka arkiv"

3823

3824 #: help.c:38

@@ -3556,7 +3984,7 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet"

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

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

3986

3559 -#: ident.c:436 builtin/commit.c:611

3987 +#: ident.c:436 builtin/commit.c:631

3988 #, c-format

3989 msgid "invalid date format: %s"

3990 msgstr "felaktigt datumformat: %s"

@@ -3642,7 +4070,7 @@ msgid "failed to read the cache"

4070 msgstr "misslyckades läsa cachen"

4071

4072 #: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908

3645 -#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785

4073 +#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809

4074 #: builtin/stash.c:264

4075 msgid "unable to write new index file"

4076 msgstr "kunde inte skriva ny indexfil"

@@ -3837,7 +4265,7 @@ msgstr "namnbyte"

4265 msgid "renamed"

4266 msgstr "namnbytt"

4267

3840 -#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117

4268 +#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175

4269 #, c-format

4270 msgid "Refusing to lose dirty file at %s"

4271 msgstr "Vägrar förlora lortig fil vid \"%s\""

@@ -3881,7 +4309,7 @@ msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

4309 msgstr ""

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

4311

3884 -#: merge-recursive.c:2056

4312 +#: merge-recursive.c:2114

4313 #, c-format

4314 msgid ""

4315 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -3892,7 +4320,7 @@ msgstr ""

4320 "katalogen %s bytte namn till flera andra kataloger, utan att någon "

4321 "destination fick en majoritet av filerna."

4322

3895 -#: merge-recursive.c:2088

4323 +#: merge-recursive.c:2146

4324 #, c-format

4325 msgid ""

4326 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -3901,7 +4329,7 @@ msgstr ""

4329 "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "

4330 "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."

4331

3904 -#: merge-recursive.c:2098

4332 +#: merge-recursive.c:2156

4333 #, c-format

4334 msgid ""

4335 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -3910,7 +4338,7 @@ msgstr ""

4338 "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "

4339 "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"

4340

3913 -#: merge-recursive.c:2190

4341 +#: merge-recursive.c:2248

4342 #, c-format

4343 msgid ""

4344 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -3919,7 +4347,7 @@ msgstr ""

4347 "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "

4348 "%s->%s i %s"

4349

3922 -#: merge-recursive.c:2435

4350 +#: merge-recursive.c:2493

4351 #, c-format

4352 msgid ""

4353 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -3928,52 +4356,52 @@ msgstr ""

4356 "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "

4357 "bytt namn."

4358

3931 -#: merge-recursive.c:2961

4359 +#: merge-recursive.c:3019

4360 #, c-format

4361 msgid "cannot read object %s"

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

4363

3936 -#: merge-recursive.c:2964

4364 +#: merge-recursive.c:3022

4365 #, c-format

4366 msgid "object %s is not a blob"

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

4368

3941 -#: merge-recursive.c:3028

4369 +#: merge-recursive.c:3086

4370 msgid "modify"

4371 msgstr "ändra"

4372

3945 -#: merge-recursive.c:3028

4373 +#: merge-recursive.c:3086

4374 msgid "modified"

4375 msgstr "ändrad"

4376

3949 -#: merge-recursive.c:3040

4377 +#: merge-recursive.c:3098

4378 msgid "content"

4379 msgstr "innehåll"

4380

3953 -#: merge-recursive.c:3044

4381 +#: merge-recursive.c:3102

4382 msgid "add/add"

4383 msgstr "tillägg/tillägg"

4384

3957 -#: merge-recursive.c:3067

4385 +#: merge-recursive.c:3125

4386 #, c-format

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

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

4389

3962 -#: merge-recursive.c:3089 git-submodule.sh:937

4390 +#: merge-recursive.c:3147 git-submodule.sh:993

4391 msgid "submodule"

4392 msgstr "undermodul"

4393

3966 -#: merge-recursive.c:3090

4394 +#: merge-recursive.c:3148

4395 #, c-format

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

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

4398

3971 -#: merge-recursive.c:3120

4399 +#: merge-recursive.c:3178

4400 #, c-format

4401 msgid "Adding as %s instead"

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

4403

3976 -#: merge-recursive.c:3203

4404 +#: merge-recursive.c:3261

4405 #, c-format

4406 msgid ""

4407 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -3982,7 +4410,7 @@ msgstr ""

4410 "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "

4411 "flyttar den till %s."

4412

3985 -#: merge-recursive.c:3206

4413 +#: merge-recursive.c:3264

4414 #, c-format

4415 msgid ""

4416 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -3991,7 +4419,7 @@ msgstr ""

4419 "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "

4420 "%s, föreslår att den bör flyttas till%s."

4421

3994 -#: merge-recursive.c:3210

4422 +#: merge-recursive.c:3268

4423 #, c-format

4424 msgid ""

4425 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4000,7 +4428,7 @@ msgstr ""

4428 "Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "

4429 "namn i %s; flyttar den till %s."

4430

4003 -#: merge-recursive.c:3213

4431 +#: merge-recursive.c:3271

4432 #, c-format

4433 msgid ""

4434 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4009,60 +4437,60 @@ msgstr ""

4437 "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "

4438 "bytte namn i %s; flyttar den till %s."

4439

4012 -#: merge-recursive.c:3327

4440 +#: merge-recursive.c:3385

4441 #, c-format

4442 msgid "Removing %s"

4443 msgstr "Tar bort %s"

4444

4017 -#: merge-recursive.c:3350

4445 +#: merge-recursive.c:3408

4446 msgid "file/directory"

4447 msgstr "fil/katalog"

4448

4021 -#: merge-recursive.c:3355

4449 +#: merge-recursive.c:3413

4450 msgid "directory/file"

4451 msgstr "katalog/fil"

4452

4025 -#: merge-recursive.c:3362

4453 +#: merge-recursive.c:3420

4454 #, c-format

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

4456 msgstr ""

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

4458

4031 -#: merge-recursive.c:3371

4459 +#: merge-recursive.c:3429

4460 #, c-format

4461 msgid "Adding %s"

4462 msgstr "Lägger till %s"

4463

4036 -#: merge-recursive.c:3380

4464 +#: merge-recursive.c:3438

4465 #, c-format

4466 msgid "CONFLICT (add/add): Merge conflict in %s"

4467 msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"

4468

4041 -#: merge-recursive.c:3424

4469 +#: merge-recursive.c:3482

4470 msgid "Already up to date!"

4471 msgstr "Redan à jour!"

4472

4045 -#: merge-recursive.c:3433

4473 +#: merge-recursive.c:3491

4474 #, c-format

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

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

4477

4050 -#: merge-recursive.c:3537

4478 +#: merge-recursive.c:3595

4479 msgid "Merging:"

4480 msgstr "Slår ihop:"

4481

4054 -#: merge-recursive.c:3550

4482 +#: merge-recursive.c:3608

4483 #, c-format

4484 msgid "found %u common ancestor:"

4485 msgid_plural "found %u common ancestors:"

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

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

4488

4061 -#: merge-recursive.c:3600

4489 +#: merge-recursive.c:3658

4490 msgid "merge returned no commit"

4491 msgstr "sammanslagningen returnerade ingen incheckning"

4492

4065 -#: merge-recursive.c:3659

4493 +#: merge-recursive.c:3717

4494 #, c-format

4495 msgid ""

4496 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4072,12 +4500,12 @@ msgstr ""

4500 "sammanslagning:\n"

4501 " %s"

4502

4075 -#: merge-recursive.c:3756

4503 +#: merge-recursive.c:3814

4504 #, c-format

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

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

4507

4080 -#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874

4508 +#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874

4509 msgid "Unable to write index."

4510 msgstr "Kunde inte skriva indexet."

4511

@@ -4143,79 +4571,95 @@ msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten"

4571 msgid "error preparing packfile from multi-pack-index"

4572 msgstr "fel när paketfiler från multi-pack-index skulle förberedas"

4573

4146 -#: midx.c:469

4574 +#: midx.c:472

4575 #, c-format

4576 msgid "failed to add packfile '%s'"

4577 msgstr "misslyckades läsa paketfilen \"%s\""

4578

4151 -#: midx.c:475

4579 +#: midx.c:478

4580 #, c-format

4581 msgid "failed to open pack-index '%s'"

4582 msgstr "misslyckades öppna paketindexet \"%s\""

4583

4156 -#: midx.c:535

4584 +#: midx.c:538

4585 #, c-format

4586 msgid "failed to locate object %d in packfile"

4587 msgstr "misslyckades hitta objekt %d i paketfilen"

4588

4161 -#: midx.c:864

4589 +#: midx.c:842

4590 +msgid "Adding packfiles to multi-pack-index"

4591 +msgstr "Lägger till paketfiler till multi-pack-index"

4592 +

4593 +#: midx.c:875

4594 #, c-format

4595 msgid "did not see pack-file %s to drop"

4596 msgstr "såg inte paketfilen %s som skulle kastas"

4597

4166 -#: midx.c:1035

4598 +#: midx.c:973

4599 +msgid "Writing chunks to multi-pack-index"

4600 +msgstr "Skriver stycken till multi-pack-index"

4601 +

4602 +#: midx.c:1052

4603 #, c-format

4604 msgid "failed to clear multi-pack-index at %s"

4605 msgstr "misslyckades städa multi-pack-index på %s"

4606

4171 -#: midx.c:1090

4607 +#: midx.c:1108

4608 msgid "Looking for referenced packfiles"

4609 msgstr "Ser efter refererade packfiler"

4610

4175 -#: midx.c:1105

4611 +#: midx.c:1123

4612 #, c-format

4613 msgid ""

4614 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4615 msgstr ""

4616 "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4617

4182 -#: midx.c:1109

4183 -msgid "Verifying OID order in MIDX"

4184 -msgstr "Bekräftar OID-ordning i MIDX"

4618 +#: midx.c:1128

4619 +msgid "Verifying OID order in multi-pack-index"

4620 +msgstr "Bekräftar OID-ordning i multi-pack-index"

4621

4186 -#: midx.c:1118

4622 +#: midx.c:1137

4623 #, c-format

4624 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4625 msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"

4626

4191 -#: midx.c:1137

4627 +#: midx.c:1157

4628 msgid "Sorting objects by packfile"

4629 msgstr "Sorterar objekt efter packfil"

4630

4195 -#: midx.c:1143

4631 +#: midx.c:1164

4632 msgid "Verifying object offsets"

4633 msgstr "Bekräftar offset för objekt"

4634

4199 -#: midx.c:1159

4635 +#: midx.c:1180

4636 #, c-format

4637 msgid "failed to load pack entry for oid[%d] = %s"

4638 msgstr "misslyckades läsa paketpost för oid[%d] = %s"

4639

4204 -#: midx.c:1165

4640 +#: midx.c:1186

4641 #, c-format

4642 msgid "failed to load pack-index for packfile %s"

4643 msgstr "misslyckades läsa paketindex för paketfil %s"

4644

4209 -#: midx.c:1174

4645 +#: midx.c:1195

4646 #, c-format

4647 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4648 msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4649

4214 -#: midx.c:1349

4650 +#: midx.c:1220

4651 +msgid "Counting referenced objects"

4652 +msgstr "Räknar refererade objekt"

4653 +

4654 +#: midx.c:1230

4655 +msgid "Finding and deleting unreferenced packfiles"

4656 +msgstr "Ser efter och tar bort orefererade packfiler"

4657 +

4658 +#: midx.c:1388

4659 msgid "could not start pack-objects"

4660 msgstr "kunde inte starta pack-objects"

4661

4218 -#: midx.c:1368

4662 +#: midx.c:1407

4663 msgid "could not finish pack-objects"

4664 msgstr "kunde inte avsluta pack-objects"

4665

@@ -4303,12 +4747,12 @@ msgstr "hashvärde stämmer inte överens %s"

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

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

4749

4306 -#: packfile.c:1887

4750 +#: packfile.c:1888

4751 #, c-format

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

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

4754

4311 -#: packfile.c:1891

4755 +#: packfile.c:1892

4756 #, c-format

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

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

@@ -4420,34 +4864,34 @@ msgstr ""

4864 msgid "malformed object name '%s'"

4865 msgstr "felformat objektnamn \"%s\""

4866

4423 -#: path.c:897

4867 +#: path.c:915

4868 #, c-format

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

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

4871

4428 -#: pathspec.c:128

4872 +#: pathspec.c:130

4873 msgid "Escape character '\\' not allowed as last character in attr value"

4874 msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde"

4875

4432 -#: pathspec.c:146

4876 +#: pathspec.c:148

4877 msgid "Only one 'attr:' specification is allowed."

4878 msgstr "Endast en \"attr:\"-angivelse tillåten."

4879

4436 -#: pathspec.c:149

4880 +#: pathspec.c:151

4881 msgid "attr spec must not be empty"

4882 msgstr "attr-angivelse kan inte vara tom"

4883

4440 -#: pathspec.c:192

4884 +#: pathspec.c:194

4885 #, c-format

4886 msgid "invalid attribute name %s"

4887 msgstr "ogiltigt attributnamn %s"

4888

4445 -#: pathspec.c:257

4889 +#: pathspec.c:259

4890 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

4891 msgstr ""

4892 "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla"

4893

4450 -#: pathspec.c:264

4894 +#: pathspec.c:266

4895 msgid ""

4896 "global 'literal' pathspec setting is incompatible with all other global "

4897 "pathspec settings"

@@ -4455,50 +4899,55 @@ msgstr ""

4899 "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra "

4900 "globala sökvägsinställningar"

4901

4458 -#: pathspec.c:304

4902 +#: pathspec.c:306

4903 msgid "invalid parameter for pathspec magic 'prefix'"

4904 msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""

4905

4462 -#: pathspec.c:325

4906 +#: pathspec.c:327

4907 #, c-format

4908 msgid "Invalid pathspec magic '%.*s' in '%s'"

4909 msgstr "Felaktigt sökvägsuttryck \"%.*s\" i \"%s\""

4910

4467 -#: pathspec.c:330

4911 +#: pathspec.c:332

4912 #, c-format

4913 msgid "Missing ')' at the end of pathspec magic in '%s'"

4914 msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\""

4915

4472 -#: pathspec.c:368

4916 +#: pathspec.c:370

4917 #, c-format

4918 msgid "Unimplemented pathspec magic '%c' in '%s'"

4919 msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\""

4920

4477 -#: pathspec.c:427

4921 +#: pathspec.c:429

4922 #, c-format

4923 msgid "%s: 'literal' and 'glob' are incompatible"

4924 msgstr "%s: \"literal\" och \"glob\" är inkompatibla"

4925

4482 -#: pathspec.c:440

4926 +#: pathspec.c:442

4927 #, c-format

4928 msgid "%s: '%s' is outside repository"

4929 msgstr "%s: \"%s\" är utanför arkivet"

4930

4487 -#: pathspec.c:514

4931 +#: pathspec.c:516

4932 #, c-format

4933 msgid "'%s' (mnemonic: '%c')"

4934 msgstr "\"%s\" (minnesstöd: \"%c\")"

4935

4492 -#: pathspec.c:524

4936 +#: pathspec.c:526

4937 #, c-format

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

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

4940

4497 -#: pathspec.c:591

4941 +#: pathspec.c:593

4942 #, c-format

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

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

4945

4946 +#: pathspec.c:638

4947 +#, c-format

4948 +msgid "line is badly quoted: %s"

4949 +msgstr "linjen er felaktigt citerad: %s"

4950 +

4951 #: pkt-line.c:92

4952 msgid "unable to write flush packet"

4953 msgstr "kan inte skriva flush-paket"

@@ -4559,42 +5008,42 @@ msgstr "Uppdaterar indexet"

5008 msgid "unable to create threaded lstat: %s"

5009 msgstr "kunde inte skapa trådad lstat: %s"

5010

4562 -#: pretty.c:966

5011 +#: pretty.c:981

5012 msgid "unable to parse --pretty format"

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

5014

4566 -#: promisor-remote.c:25

5015 +#: promisor-remote.c:23

5016 msgid "Remote with no URL"

5017 msgstr "Fjärr utan URL"

5018

4570 -#: promisor-remote.c:61

5019 +#: promisor-remote.c:58

5020 #, c-format

5021 msgid "promisor remote name cannot begin with '/': %s"

5022 msgstr "kontraktsfjärr kan inte börja med \"/\": %s"

5023

4575 -#: range-diff.c:71

5024 +#: range-diff.c:75

5025 msgid "could not start `log`"

5026 msgstr "kunde inte starta \"log\""

5027

4579 -#: range-diff.c:73

5028 +#: range-diff.c:77

5029 msgid "could not read `log` output"

5030 msgstr "kunde inte läsa utdata från \"log\""

5031

4583 -#: range-diff.c:92 sequencer.c:4985

5032 +#: range-diff.c:96 sequencer.c:5163

5033 #, c-format

5034 msgid "could not parse commit '%s'"

5035 msgstr "kunde inte tolka incheckningen \"%s\""

5036

4588 -#: range-diff.c:118

5037 +#: range-diff.c:122

5038 #, c-format

5039 msgid "could not parse git header '%.*s'"

5040 msgstr "kunde inte tolka git-huvudet \"%.*s\""

5041

4593 -#: range-diff.c:275

5042 +#: range-diff.c:285

5043 msgid "failed to generate diff"

5044 msgstr "misslyckades skapa diff"

5045

4597 -#: range-diff.c:507 range-diff.c:509

5046 +#: range-diff.c:518 range-diff.c:520

5047 #, c-format

5048 msgid "could not parse log for '%s'"

5049 msgstr "kunde inte tolka loggen för \"%s\""

@@ -4634,16 +5083,16 @@ msgstr "kan inte lägga till \"%s\" till indexet"

5083 msgid "unable to stat '%s'"

5084 msgstr "kan inte ta status på \"%s\""

5085

4637 -#: read-cache.c:1314

5086 +#: read-cache.c:1325

5087 #, c-format

5088 msgid "'%s' appears as both a file and as a directory"

5089 msgstr "\"%s\" finns både som en fil och en katalog"

5090

4642 -#: read-cache.c:1520

5091 +#: read-cache.c:1531

5092 msgid "Refresh index"

5093 msgstr "Uppdatera indexet"

5094

4646 -#: read-cache.c:1635

5095 +#: read-cache.c:1646

5096 #, c-format

5097 msgid ""

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

@@ -4652,7 +5101,7 @@ msgstr ""

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

5102 "Använder version %i"

5103

4655 -#: read-cache.c:1645

5104 +#: read-cache.c:1656

5105 #, c-format

5106 msgid ""

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

@@ -4661,138 +5110,138 @@ msgstr ""

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

5111 "Använder version %i"

5112

4664 -#: read-cache.c:1701

5113 +#: read-cache.c:1712

5114 #, c-format

5115 msgid "bad signature 0x%08x"

5116 msgstr "felaktig signatur 0x%08x"

5117

4669 -#: read-cache.c:1704

5118 +#: read-cache.c:1715

5119 #, c-format

5120 msgid "bad index version %d"

5121 msgstr "felaktig indexversion %d"

5122

4674 -#: read-cache.c:1713

5123 +#: read-cache.c:1724

5124 msgid "bad index file sha1 signature"

5125 msgstr "felaktig sha1-signatur för indexfil"

5126

4678 -#: read-cache.c:1743

5127 +#: read-cache.c:1754

5128 #, c-format

5129 msgid "index uses %.4s extension, which we do not understand"

5130 msgstr "index använder filtillägget %.4s, vilket vi inte förstår"

5131

4683 -#: read-cache.c:1745

5132 +#: read-cache.c:1756

5133 #, c-format

5134 msgid "ignoring %.4s extension"

5135 msgstr "ignorerar filtillägget %.4s"

5136

4688 -#: read-cache.c:1782

5137 +#: read-cache.c:1793

5138 #, c-format

5139 msgid "unknown index entry format 0x%08x"

5140 msgstr "okänt format 0x%08x på indexpost"

5141

4693 -#: read-cache.c:1798

5142 +#: read-cache.c:1809

5143 #, c-format

5144 msgid "malformed name field in the index, near path '%s'"

5145 msgstr "felformat namnfält i indexet, nära sökvägen \"%s\""

5146

4698 -#: read-cache.c:1855

5147 +#: read-cache.c:1866

5148 msgid "unordered stage entries in index"

5149 msgstr "osorterade köposter i index"

5150

4702 -#: read-cache.c:1858

5151 +#: read-cache.c:1869

5152 #, c-format

5153 msgid "multiple stage entries for merged file '%s'"

5154 msgstr "flera köposter för den sammanslagna filen \"%s\""

5155

4707 -#: read-cache.c:1861

5156 +#: read-cache.c:1872

5157 #, c-format

5158 msgid "unordered stage entries for '%s'"

5159 msgstr "osorterade köposter för \"%s\""

5160

4712 -#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111

4713 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468

4714 -#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347

5161 +#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111

5162 +#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470

5163 +#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367

5164 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145

4716 -#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330

5165 +#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332

5166 msgid "index file corrupt"

5167 msgstr "indexfilen trasig"

5168

4720 -#: read-cache.c:2108

5169 +#: read-cache.c:2119

5170 #, c-format

5171 msgid "unable to create load_cache_entries thread: %s"

5172 msgstr "kunde inte läsa in cache_entries-tråden: %s"

5173

4725 -#: read-cache.c:2121

5174 +#: read-cache.c:2132

5175 #, c-format

5176 msgid "unable to join load_cache_entries thread: %s"

5177 msgstr "kunde inte utföra join på cache_entries-tråden: %s"

5178

4730 -#: read-cache.c:2154

5179 +#: read-cache.c:2165

5180 #, c-format

5181 msgid "%s: index file open failed"

5182 msgstr "%s: öppning av indexfilen misslyckades"

5183

4735 -#: read-cache.c:2158

5184 +#: read-cache.c:2169

5185 #, c-format

5186 msgid "%s: cannot stat the open index"

5187 msgstr "%s: kan inte ta startus på det öppna indexet"

5188

4740 -#: read-cache.c:2162

5189 +#: read-cache.c:2173

5190 #, c-format

5191 msgid "%s: index file smaller than expected"

5192 msgstr "%s: indexfilen mindre än förväntat"

5193

4745 -#: read-cache.c:2166

5194 +#: read-cache.c:2177

5195 #, c-format

5196 msgid "%s: unable to map index file"

5197 msgstr "%s: kan inte koppla indexfilen"

5198

4750 -#: read-cache.c:2208

5199 +#: read-cache.c:2219

5200 #, c-format

5201 msgid "unable to create load_index_extensions thread: %s"

5202 msgstr "kunde inte skapa load_index_extensions-tråden: %s"

5203

4755 -#: read-cache.c:2235

5204 +#: read-cache.c:2246

5205 #, c-format

5206 msgid "unable to join load_index_extensions thread: %s"

5207 msgstr "kunde inte utföra join på load_index_extensions-tråden: %s"

5208

4760 -#: read-cache.c:2267

5209 +#: read-cache.c:2278

5210 #, c-format

5211 msgid "could not freshen shared index '%s'"

5212 msgstr "kunde inte uppdatera delat index \"%s\""

5213

4765 -#: read-cache.c:2314

5214 +#: read-cache.c:2325

5215 #, c-format

5216 msgid "broken index, expect %s in %s, got %s"

5217 msgstr "trasigt index, förväntade %s i %s, fick %s"

5218

4770 -#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119

5219 +#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119

5220 #, c-format

5221 msgid "could not close '%s'"

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

5223

4775 -#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917

5224 +#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069

5225 #, c-format

5226 msgid "could not stat '%s'"

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

5228

4780 -#: read-cache.c:3126

5229 +#: read-cache.c:3137

5230 #, c-format

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

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

5233

4785 -#: read-cache.c:3138

5234 +#: read-cache.c:3149

5235 #, c-format

5236 msgid "unable to unlink: %s"

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

5238

4790 -#: read-cache.c:3163

5239 +#: read-cache.c:3174

5240 #, c-format

5241 msgid "cannot fix permission bits on '%s'"

5242 msgstr "kan inte rätta behörighetsbitar på \"%s\""

5243

4795 -#: read-cache.c:3312

5244 +#: read-cache.c:3323

5245 #, c-format

5246 msgid "%s: cannot drop to stage #0"

5247 msgstr "%s: kan inte återgå till kö 0"

@@ -4900,8 +5349,8 @@ msgstr ""

5349 msgid "Note that empty commits are commented out"

5350 msgstr "Observera att tomma incheckningar är utkommenterade"

5351

4903 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388

4904 -#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235

5352 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536

5353 +#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254

5354 #, c-format

5355 msgid "could not write '%s'"

5356 msgstr "kunde inte skriva \"%s\""

@@ -4975,14 +5424,15 @@ msgstr "referensen \"%s\" finns redan"

5424 msgid "unexpected object ID when writing '%s'"

5425 msgstr "oväntat objekt-id vid skrivning \"%s\""

5426

4978 -#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851

4979 -#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620

5427 +#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997

5428 +#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142

5429 +#: wrapper.c:620

5430 #, c-format

5431 msgid "could not write to '%s'"

5432 msgstr "kunde inte skriva till \"%s\""

5433

4984 -#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714

4985 -#: builtin/rebase.c:1004

5434 +#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714

5435 +#: builtin/rebase.c:1031

5436 #, c-format

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

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

@@ -5644,8 +6094,8 @@ msgstr "kan inte ta bort lös länk \"%s\""

6094 msgid "Recorded preimage for '%s'"

6095 msgstr "Sparade förhandsbild för \"%s\""

6096

5647 -#: rerere.c:881 submodule.c:2023 builtin/log.c:1790

5648 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428

6097 +#: rerere.c:881 submodule.c:2067 builtin/log.c:1871

6098 +#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448

6099 #, c-format

6100 msgid "could not create directory '%s'"

6101 msgstr "kunde inte skapa katalogen \"%s\""

@@ -5679,33 +6129,33 @@ msgstr "Glömde lösning för \"%s\"\n"

6129 msgid "unable to open rr-cache directory"

6130 msgstr "kan inte uppdatera katalogen rr-cache"

6131

5682 -#: revision.c:2509

6132 +#: revision.c:2497

6133 msgid "your current branch appears to be broken"

6134 msgstr "din nuvarande gren verkar vara trasig"

6135

5686 -#: revision.c:2512

6136 +#: revision.c:2500

6137 #, c-format

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

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

6140

5691 -#: revision.c:2720

6141 +#: revision.c:2708

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

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

6144

5695 -#: revision.c:2724

6145 +#: revision.c:2712

6146 msgid "-L does not yet support diff formats besides -p and -s"

6147 msgstr "-L stöder ännu inte andra diff-format än -p och -s"

6148

5699 -#: run-command.c:763

6149 +#: run-command.c:762

6150 msgid "open /dev/null failed"

6151 msgstr "misslyckades öppna /dev/null"

6152

5703 -#: run-command.c:1269

6153 +#: run-command.c:1268

6154 #, c-format

6155 msgid "cannot create async thread: %s"

6156 msgstr "kan inte skapa asynkron tråd: %s"

6157

5708 -#: run-command.c:1333

6158 +#: run-command.c:1332

6159 #, c-format

6160 msgid ""

6161 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -5714,29 +6164,29 @@ msgstr ""

6164 "Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"

6165 "Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."

6166

5717 -#: send-pack.c:142

6167 +#: send-pack.c:144

6168 msgid "unexpected flush packet while reading remote unpack status"

6169 msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"

6170

5721 -#: send-pack.c:144

6171 +#: send-pack.c:146

6172 #, c-format

6173 msgid "unable to parse remote unpack status: %s"

6174 msgstr "kunde inte tolka fjärruppackningsstatus: %s"

6175

5726 -#: send-pack.c:146

6176 +#: send-pack.c:148

6177 #, c-format

6178 msgid "remote unpack failed: %s"

6179 msgstr "fjärruppackning misslyckades: %s"

6180

5731 -#: send-pack.c:307

6181 +#: send-pack.c:309

6182 msgid "failed to sign the push certificate"

6183 msgstr "misslyckades underteckna push-certifikatet"

6184

5735 -#: send-pack.c:421

6185 +#: send-pack.c:423

6186 msgid "the receiving end does not support --signed push"

6187 msgstr "mottagarsidan stöder inte push med --signed"

6188

5739 -#: send-pack.c:423

6189 +#: send-pack.c:425

6190 msgid ""

6191 "not sending a push certificate since the receiving end does not support --"

6192 "signed push"

@@ -5744,47 +6194,47 @@ msgstr ""

6194 "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"

6195 "signed"

6196

5747 -#: send-pack.c:435

6197 +#: send-pack.c:437

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

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

6200

5751 -#: send-pack.c:440

6201 +#: send-pack.c:442

6202 msgid "the receiving end does not support push options"

6203 msgstr "mottagarsidan stöder inte push-flaggor"

6204

5755 -#: sequencer.c:187

6205 +#: sequencer.c:189

6206 #, c-format

6207 msgid "invalid commit message cleanup mode '%s'"

6208 msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""

6209

5760 -#: sequencer.c:292

6210 +#: sequencer.c:294

6211 #, c-format

6212 msgid "could not delete '%s'"

6213 msgstr "kunde inte ta bort \"%s\""

6214

5765 -#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369

6215 +#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369

6216 #, c-format

6217 msgid "could not remove '%s'"

6218 msgstr "kunde inte ta bort \"%s\""

6219

5770 -#: sequencer.c:321

6220 +#: sequencer.c:323

6221 msgid "revert"

6222 msgstr "revert"

6223

5774 -#: sequencer.c:323

6224 +#: sequencer.c:325

6225 msgid "cherry-pick"

6226 msgstr "cherry-pick"

6227

5778 -#: sequencer.c:325

6228 +#: sequencer.c:327

6229 msgid "rebase -i"

6230 msgstr "rebase -i"

6231

5782 -#: sequencer.c:327

6232 +#: sequencer.c:329

6233 #, c-format

6234 msgid "unknown action: %d"

6235 msgstr "okänd funktion: %d"

6236

5787 -#: sequencer.c:385

6237 +#: sequencer.c:387

6238 msgid ""

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

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

@@ -5792,7 +6242,7 @@ msgstr ""

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

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

6244

5795 -#: sequencer.c:388

6245 +#: sequencer.c:390

6246 msgid ""

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

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

@@ -5802,44 +6252,44 @@ msgstr ""

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

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

6254

5805 -#: sequencer.c:401 sequencer.c:2847

6255 +#: sequencer.c:403 sequencer.c:2993

6256 #, c-format

6257 msgid "could not lock '%s'"

6258 msgstr "kunde inte låsa \"%s\""

6259

5810 -#: sequencer.c:408

6260 +#: sequencer.c:410

6261 #, c-format

6262 msgid "could not write eol to '%s'"

6263 msgstr "kunde inte skriva radslut till \"%s\""

6264

5815 -#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867

5816 -#: sequencer.c:3130

6265 +#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013

6266 +#: sequencer.c:3277

6267 #, c-format

6268 msgid "failed to finalize '%s'"

6269 msgstr "misslyckades färdigställa \"%s\""

6270

5821 -#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112

5822 -#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117

5823 -#: builtin/rebase.c:568

6271 +#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259

6272 +#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117

6273 +#: builtin/rebase.c:589

6274 #, c-format

6275 msgid "could not read '%s'"

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

6277

5828 -#: sequencer.c:462

6278 +#: sequencer.c:464

6279 #, c-format

6280 msgid "your local changes would be overwritten by %s."

6281 msgstr "dina lokala ändringar skulle skrivas över av %s."

6282

5833 -#: sequencer.c:466

6283 +#: sequencer.c:468

6284 msgid "commit your changes or stash them to proceed."

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

6286

5837 -#: sequencer.c:498

6287 +#: sequencer.c:500

6288 #, c-format

6289 msgid "%s: fast-forward"

6290 msgstr "%s: snabbspola"

6291

5842 -#: sequencer.c:537 builtin/tag.c:565

6292 +#: sequencer.c:539 builtin/tag.c:565

6293 #, c-format

6294 msgid "Invalid cleanup mode %s"

6295 msgstr "Felaktigt städningsläge %s"

@@ -5847,65 +6297,69 @@ msgstr "Felaktigt städningsläge %s"

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

6298 #. "rebase -i".

6299 #.

5850 -#: sequencer.c:631

6300 +#: sequencer.c:633

6301 #, c-format

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

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

6304

5855 -#: sequencer.c:648

6305 +#: sequencer.c:650

6306 msgid "unable to update cache tree"

6307 msgstr "kan inte uppdatera cacheträd"

6308

5859 -#: sequencer.c:662

6309 +#: sequencer.c:664

6310 msgid "could not resolve HEAD commit"

6311 msgstr "kunde inte bestämma HEAD:s incheckning"

6312

5863 -#: sequencer.c:742

6313 +#: sequencer.c:744

6314 #, c-format

6315 msgid "no key present in '%.*s'"

6316 msgstr "ingen nyckel i \"%.*s\""

6317

5868 -#: sequencer.c:753

6318 +#: sequencer.c:755

6319 #, c-format

6320 msgid "unable to dequote value of '%s'"

6321 msgstr "kan inte ta bort citering av värdet \"%s\""

6322

5873 -#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705

5874 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046

6323 +#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705

6324 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074

6325 #, c-format

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

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

6328

5879 -#: sequencer.c:800

6329 +#: sequencer.c:802

6330 msgid "'GIT_AUTHOR_NAME' already given"

6331 msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"

6332

5883 -#: sequencer.c:805

6333 +#: sequencer.c:807

6334 msgid "'GIT_AUTHOR_EMAIL' already given"

6335 msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"

6336

5887 -#: sequencer.c:810

6337 +#: sequencer.c:812

6338 msgid "'GIT_AUTHOR_DATE' already given"

6339 msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"

6340

5891 -#: sequencer.c:814

6341 +#: sequencer.c:816

6342 #, c-format

6343 msgid "unknown variable '%s'"

6344 msgstr "okänd variabel \"%s\""

6345

5896 -#: sequencer.c:819

6346 +#: sequencer.c:821

6347 msgid "missing 'GIT_AUTHOR_NAME'"

6348 msgstr "\"GIT_AUTHOR_NAME\" saknas"

6349

5900 -#: sequencer.c:821

6350 +#: sequencer.c:823

6351 msgid "missing 'GIT_AUTHOR_EMAIL'"

6352 msgstr "\"GIT_AUTHOR_EMAIL\" saknas"

6353

5904 -#: sequencer.c:823

6354 +#: sequencer.c:825

6355 msgid "missing 'GIT_AUTHOR_DATE'"

6356 msgstr "\"GIT_AUTHOR_DATE\" saknas"

6357

5908 -#: sequencer.c:872

6358 +#: sequencer.c:902 sequencer.c:1427

6359 +msgid "malformed ident line"

6360 +msgstr "felaktig ident-rad"

6361 +

6362 +#: sequencer.c:925

6363 #, c-format

6364 msgid ""

6365 "you have staged changes in your working tree\n"

@@ -5934,11 +6388,11 @@ msgstr ""

6388 "\n"

6389 " git rebase --continue\n"

6390

5937 -#: sequencer.c:1146

6391 +#: sequencer.c:1218

6392 msgid "'prepare-commit-msg' hook failed"

6393 msgstr "kroken \"prepare-commit-msg\" misslyckades"

6394

5941 -#: sequencer.c:1153

6395 +#: sequencer.c:1224

6396 msgid ""

6397 "Your name and email address were configured automatically based\n"

6398 "on your username and hostname. Please check that they are accurate.\n"

@@ -5965,7 +6419,7 @@ msgstr ""

6419 "\n"

6420 " git commit --amend --reset-author\n"

6421

5968 -#: sequencer.c:1166

6422 +#: sequencer.c:1237

6423 msgid ""

6424 "Your name and email address were configured automatically based\n"

6425 "on your username and hostname. Please check that they are accurate.\n"

@@ -5990,327 +6444,331 @@ msgstr ""

6444 "\n"

6445 " git commit --amend --reset-author\n"

6446

5993 -#: sequencer.c:1208

6447 +#: sequencer.c:1279

6448 msgid "couldn't look up newly created commit"

6449 msgstr "kunde inte slå upp en precis skapad incheckning"

6450

5997 -#: sequencer.c:1210

6451 +#: sequencer.c:1281

6452 msgid "could not parse newly created commit"

6453 msgstr "kunde inte tolka en precis skapad incheckning"

6454

6001 -#: sequencer.c:1256

6455 +#: sequencer.c:1327

6456 msgid "unable to resolve HEAD after creating commit"

6457 msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"

6458

6005 -#: sequencer.c:1258

6459 +#: sequencer.c:1329

6460 msgid "detached HEAD"

6461 msgstr "frånkopplad HEAD"

6462

6009 -#: sequencer.c:1262

6463 +#: sequencer.c:1333

6464 msgid " (root-commit)"

6465 msgstr " (rotincheckning)"

6466

6013 -#: sequencer.c:1283

6467 +#: sequencer.c:1354

6468 msgid "could not parse HEAD"

6469 msgstr "kunde inte tolka HEAD"

6470

6017 -#: sequencer.c:1285

6471 +#: sequencer.c:1356

6472 #, c-format

6473 msgid "HEAD %s is not a commit!"

6474 msgstr "HEAD %s är inte en incheckning!"

6475

6022 -#: sequencer.c:1289 builtin/commit.c:1571

6476 +#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569

6477 msgid "could not parse HEAD commit"

6478 msgstr "kunde inte tolka HEAD:s incheckning"

6479

6026 -#: sequencer.c:1341 sequencer.c:1933

6480 +#: sequencer.c:1411 sequencer.c:2055

6481 msgid "unable to parse commit author"

6482 msgstr "kunde inte tolka incheckningens författare"

6483

6030 -#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684

6484 +#: sequencer.c:1431

6485 +msgid "corrupted author without date information"

6486 +msgstr "trasig författare utan datuminformation"

6487 +

6488 +#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684

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

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

6491

6034 -#: sequencer.c:1369 sequencer.c:1429

6492 +#: sequencer.c:1480 sequencer.c:1550

6493 #, c-format

6494 msgid "unable to read commit message from '%s'"

6495 msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""

6496

6039 -#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883

6497 +#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883

6498 #: builtin/merge.c:908

6499 msgid "failed to write commit object"

6500 msgstr "kunde inte skriva incheckningsobjekt"

6501

6044 -#: sequencer.c:1456

6502 +#: sequencer.c:1577

6503 #, c-format

6504 msgid "could not parse commit %s"

6505 msgstr "kunde inte tolka incheckningen %s"

6506

6049 -#: sequencer.c:1461

6507 +#: sequencer.c:1582

6508 #, c-format

6509 msgid "could not parse parent commit %s"

6510 msgstr "kunde inte tolka föräldraincheckningen %s"

6511

6054 -#: sequencer.c:1535 sequencer.c:1645

6512 +#: sequencer.c:1656 sequencer.c:1767

6513 #, c-format

6514 msgid "unknown command: %d"

6515 msgstr "okänt kommando: %d"

6516

6059 -#: sequencer.c:1592 sequencer.c:1617

6517 +#: sequencer.c:1714 sequencer.c:1739

6518 #, c-format

6519 msgid "This is a combination of %d commits."

6520 msgstr "Det här är en kombination av %d incheckningar."

6521

6064 -#: sequencer.c:1602

6522 +#: sequencer.c:1724

6523 msgid "need a HEAD to fixup"

6524 msgstr "behöver en HEAD-incheckning att rätta"

6525

6068 -#: sequencer.c:1604 sequencer.c:3157

6526 +#: sequencer.c:1726 sequencer.c:3304

6527 msgid "could not read HEAD"

6528 msgstr "kunde inte läsa HEAD"

6529

6072 -#: sequencer.c:1606

6530 +#: sequencer.c:1728

6531 msgid "could not read HEAD's commit message"

6532 msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"

6533

6076 -#: sequencer.c:1612

6534 +#: sequencer.c:1734

6535 #, c-format

6536 msgid "cannot write '%s'"

6537 msgstr "kan inte skriva \"%s\""

6538

6081 -#: sequencer.c:1619 git-rebase--preserve-merges.sh:496

6539 +#: sequencer.c:1741 git-rebase--preserve-merges.sh:496

6540 msgid "This is the 1st commit message:"

6541 msgstr "Det här är 1:a incheckningsmeddelandet:"

6542

6085 -#: sequencer.c:1627

6543 +#: sequencer.c:1749

6544 #, c-format

6545 msgid "could not read commit message of %s"

6546 msgstr "kunde inte läsa incheckningsmeddelande för %s"

6547

6090 -#: sequencer.c:1634

6548 +#: sequencer.c:1756

6549 #, c-format

6550 msgid "This is the commit message #%d:"

6551 msgstr "Det här är incheckningsmeddelande %d:"

6552

6095 -#: sequencer.c:1640

6553 +#: sequencer.c:1762

6554 #, c-format

6555 msgid "The commit message #%d will be skipped:"

6556 msgstr "Incheckningsmeddelande %d kommer hoppas över:"

6557

6100 -#: sequencer.c:1728

6558 +#: sequencer.c:1850

6559 msgid "your index file is unmerged."

6560 msgstr "din indexfil har inte slagits ihop."

6561

6104 -#: sequencer.c:1735

6562 +#: sequencer.c:1857

6563 msgid "cannot fixup root commit"

6564 msgstr "kan inte göra \"fixup\" på rotincheckning"

6565

6108 -#: sequencer.c:1754

6566 +#: sequencer.c:1876

6567 #, c-format

6568 msgid "commit %s is a merge but no -m option was given."

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

6570

6113 -#: sequencer.c:1762 sequencer.c:1770

6571 +#: sequencer.c:1884 sequencer.c:1892

6572 #, c-format

6573 msgid "commit %s does not have parent %d"

6574 msgstr "incheckning %s har inte förälder %d"

6575

6118 -#: sequencer.c:1776

6576 +#: sequencer.c:1898

6577 #, c-format

6578 msgid "cannot get commit message for %s"

6579 msgstr "kan inte hämta incheckningsmeddelande för %s"

6580

6581 #. TRANSLATORS: The first %s will be a "todo" command like

6582 #. "revert" or "pick", the second %s a SHA1.

6125 -#: sequencer.c:1795

6583 +#: sequencer.c:1917

6584 #, c-format

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

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

6587

6130 -#: sequencer.c:1860

6588 +#: sequencer.c:1982

6589 #, c-format

6590 msgid "could not rename '%s' to '%s'"

6591 msgstr "kunde inte byta namn på \"%s\" till \"%s\""

6592

6135 -#: sequencer.c:1915

6593 +#: sequencer.c:2037

6594 #, c-format

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

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

6597

6140 -#: sequencer.c:1916

6598 +#: sequencer.c:2038

6599 #, c-format

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

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

6602

6145 -#: sequencer.c:1983

6603 +#: sequencer.c:2105

6604 #, c-format

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

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

6607

6150 -#: sequencer.c:1990

6608 +#: sequencer.c:2112

6609 #, c-format

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

6611 msgstr "git %s: misslyckades uppdatera indexet"

6612

6155 -#: sequencer.c:2066

6613 +#: sequencer.c:2189

6614 #, c-format

6615 msgid "%s does not accept arguments: '%s'"

6616 msgstr "%s tar inte argument: \"%s\""

6617

6160 -#: sequencer.c:2075

6618 +#: sequencer.c:2198

6619 #, c-format

6620 msgid "missing arguments for %s"

6621 msgstr "argument saknas för %s"

6622

6165 -#: sequencer.c:2112

6623 +#: sequencer.c:2235

6624 #, c-format

6625 msgid "could not parse '%.*s'"

6626 msgstr "kunde inte tolka \"%.*s\""

6627

6170 -#: sequencer.c:2166

6628 +#: sequencer.c:2289

6629 #, c-format

6630 msgid "invalid line %d: %.*s"

6631 msgstr "ogiltig rad %d: %.*s"

6632

6175 -#: sequencer.c:2177

6633 +#: sequencer.c:2300

6634 #, c-format

6635 msgid "cannot '%s' without a previous commit"

6636 msgstr "kan inte utföra \"%s\" utan en föregående incheckning"

6637

6180 -#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178

6181 -#: builtin/rebase.c:204 builtin/rebase.c:229

6638 +#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197

6639 +#: builtin/rebase.c:223 builtin/rebase.c:248

6640 #, c-format

6641 msgid "could not read '%s'."

6642 msgstr "kunde inte läsa \"%s\"."

6643

6186 -#: sequencer.c:2261

6644 +#: sequencer.c:2384

6645 msgid "cancelling a cherry picking in progress"

6646 msgstr "avbryter pågående \"cherry-pick\""

6647

6190 -#: sequencer.c:2268

6648 +#: sequencer.c:2391

6649 msgid "cancelling a revert in progress"

6650 msgstr "avbryter pågående \"revert\""

6651

6194 -#: sequencer.c:2302

6652 +#: sequencer.c:2435

6653 msgid "please fix this using 'git rebase --edit-todo'."

6654 msgstr "rätta det med \"git rebase --edit-todo\"."

6655

6198 -#: sequencer.c:2304

6656 +#: sequencer.c:2437

6657 #, c-format

6658 msgid "unusable instruction sheet: '%s'"

6659 msgstr "oanvändbart manus: \"%s\""

6660

6203 -#: sequencer.c:2309

6661 +#: sequencer.c:2442

6662 msgid "no commits parsed."

6663 msgstr "inga incheckningar lästes."

6664

6207 -#: sequencer.c:2320

6665 +#: sequencer.c:2453

6666 msgid "cannot cherry-pick during a revert."

6667 msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."

6668

6211 -#: sequencer.c:2322

6669 +#: sequencer.c:2455

6670 msgid "cannot revert during a cherry-pick."

6671 msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."

6672

6215 -#: sequencer.c:2404

6673 +#: sequencer.c:2533

6674 #, c-format

6675 msgid "invalid value for %s: %s"

6676 msgstr "felaktigt värde för %s: %s"

6677

6220 -#: sequencer.c:2491

6678 +#: sequencer.c:2630

6679 msgid "unusable squash-onto"

6680 msgstr "oanvändbar squash-onto"

6681

6224 -#: sequencer.c:2507

6682 +#: sequencer.c:2646

6683 #, c-format

6684 msgid "malformed options sheet: '%s'"

6685 msgstr "trasigt manus: \"%s\""

6686

6229 -#: sequencer.c:2590 sequencer.c:4308

6687 +#: sequencer.c:2736 sequencer.c:4463

6688 msgid "empty commit set passed"

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

6690

6233 -#: sequencer.c:2606

6691 +#: sequencer.c:2752

6692 msgid "revert is already in progress"

6693 msgstr "en \"revert\" pågår redan"

6694

6237 -#: sequencer.c:2608

6695 +#: sequencer.c:2754

6696 #, c-format

6697 msgid "try \"git revert (--continue | %s--abort | --quit)\""

6698 msgstr "testa \"git revert (--continue | %s--abort | --quit)\""

6699

6242 -#: sequencer.c:2611

6700 +#: sequencer.c:2757

6701 msgid "cherry-pick is already in progress"

6702 msgstr "en \"cherry-pick\" pågår redan"

6703

6246 -#: sequencer.c:2613

6704 +#: sequencer.c:2759

6705 #, c-format

6706 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

6707 msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\""

6708

6251 -#: sequencer.c:2627

6709 +#: sequencer.c:2773

6710 #, c-format

6711 msgid "could not create sequencer directory '%s'"

6712 msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""

6713

6256 -#: sequencer.c:2642

6714 +#: sequencer.c:2788

6715 msgid "could not lock HEAD"

6716 msgstr "kunde inte låsa HEAD"

6717

6260 -#: sequencer.c:2702 sequencer.c:4057

6718 +#: sequencer.c:2848 sequencer.c:4209

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

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

6721

6264 -#: sequencer.c:2704 sequencer.c:2715

6722 +#: sequencer.c:2850 sequencer.c:2861

6723 msgid "cannot resolve HEAD"

6724 msgstr "kan inte bestämma HEAD"

6725

6268 -#: sequencer.c:2706 sequencer.c:2750

6726 +#: sequencer.c:2852 sequencer.c:2896

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

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

6729

6272 -#: sequencer.c:2736 builtin/grep.c:736

6730 +#: sequencer.c:2882 builtin/grep.c:736

6731 #, c-format

6732 msgid "cannot open '%s'"

6733 msgstr "kan inte öppna \"%s\""

6734

6277 -#: sequencer.c:2738

6735 +#: sequencer.c:2884

6736 #, c-format

6737 msgid "cannot read '%s': %s"

6738 msgstr "kan inte läsa \"%s\": %s"

6739

6282 -#: sequencer.c:2739

6740 +#: sequencer.c:2885

6741 msgid "unexpected end of file"

6742 msgstr "oväntat filslut"

6743

6286 -#: sequencer.c:2745

6744 +#: sequencer.c:2891

6745 #, c-format

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

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

6748

6291 -#: sequencer.c:2756

6749 +#: sequencer.c:2902

6750 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

6751 msgstr ""

6752 "Du verkar ha flyttat HEAD.\n"

6753 "Spolar inte tillbaka, kontrollera HEAD!"

6754

6297 -#: sequencer.c:2797

6755 +#: sequencer.c:2943

6756 msgid "no revert in progress"

6757 msgstr "ingen \"revers\" pågår"

6758

6301 -#: sequencer.c:2805

6759 +#: sequencer.c:2951

6760 msgid "no cherry-pick in progress"

6761 msgstr "ingen \"cherry-pick\" pågår"

6762

6305 -#: sequencer.c:2815

6763 +#: sequencer.c:2961

6764 msgid "failed to skip the commit"

6765 msgstr "kunde inte hoppa över incheckningen"

6766

6309 -#: sequencer.c:2822

6767 +#: sequencer.c:2968

6768 msgid "there is nothing to skip"

6769 msgstr "ingenting att hoppa över"

6770

6313 -#: sequencer.c:2825

6771 +#: sequencer.c:2971

6772 #, c-format

6773 msgid ""

6774 "have you committed already?\n"

@@ -6319,21 +6777,21 @@ msgstr ""

6777 "har du redan checkat in?\n"

6778 "testa \"git %s --continue\""

6779

6322 -#: sequencer.c:2949 sequencer.c:3969

6780 +#: sequencer.c:3095 sequencer.c:4121

6781 #, c-format

6782 msgid "could not update %s"

6783 msgstr "kunde inte uppdatera %s"

6784

6327 -#: sequencer.c:2987 sequencer.c:3949

6785 +#: sequencer.c:3134 sequencer.c:4101

6786 msgid "cannot read HEAD"

6787 msgstr "kan inte läsa HEAD"

6788

6331 -#: sequencer.c:3004

6789 +#: sequencer.c:3151

6790 #, c-format

6791 msgid "unable to copy '%s' to '%s'"

6792 msgstr "kan inte kopiera in \"%s\" till \"%s\""

6793

6336 -#: sequencer.c:3012

6794 +#: sequencer.c:3159

6795 #, c-format

6796 msgid ""

6797 "You can amend the commit now, with\n"

@@ -6352,27 +6810,22 @@ msgstr ""

6810 "\n"

6811 "\tgit rebase --continue\n"

6812

6355 -#: sequencer.c:3022

6813 +#: sequencer.c:3169

6814 #, c-format

6815 msgid "Could not apply %s... %.*s"

6816 msgstr "Kunde inte tillämpa %s... %.*s"

6817

6360 -#: sequencer.c:3029

6818 +#: sequencer.c:3176

6819 #, c-format

6820 msgid "Could not merge %.*s"

6821 msgstr "Kunde inte slå ihop %.*s"

6822

6365 -#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641

6823 +#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641

6824 #, c-format

6825 msgid "could not copy '%s' to '%s'"

6826 msgstr "kunde inte kopiera in \"%s\" till \"%s\""

6827

6370 -#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613

6371 -#: builtin/rebase.c:1987 builtin/rebase.c:2031

6372 -msgid "could not read index"

6373 -msgstr "kunde inte läsa indexet"

6374 -

6375 -#: sequencer.c:3074

6828 +#: sequencer.c:3221

6829 #, c-format

6830 msgid ""

6831 "execution failed: %s\n"

@@ -6387,11 +6840,11 @@ msgstr ""

6840 "\tgit rebase --continue\n"

6841 "\n"

6842

6390 -#: sequencer.c:3080

6843 +#: sequencer.c:3227

6844 msgid "and made changes to the index and/or the working tree\n"

6845 msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"

6846

6394 -#: sequencer.c:3086

6847 +#: sequencer.c:3233

6848 #, c-format

6849 msgid ""

6850 "execution succeeded: %s\n"

@@ -6408,76 +6861,72 @@ msgstr ""

6861 "\tgit rebase --continue\n"

6862 "\n"

6863

6411 -#: sequencer.c:3147

6864 +#: sequencer.c:3294

6865 #, c-format

6866 msgid "illegal label name: '%.*s'"

6867 msgstr "ogiltigt etikettnamn: \"%.*s\""

6868

6416 -#: sequencer.c:3201

6869 +#: sequencer.c:3348

6870 msgid "writing fake root commit"

6871 msgstr "skriver fejkad rotincheckning"

6872

6420 -#: sequencer.c:3206

6873 +#: sequencer.c:3353

6874 msgid "writing squash-onto"

6875 msgstr "skriver squash-onto"

6876

6424 -#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861

6877 +#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882

6878 #, c-format

6879 msgid "failed to find tree of %s"

6880 msgstr "kunde inte hitta trädet för %s."

6881

6429 -#: sequencer.c:3262 builtin/rebase.c:874

6430 -msgid "could not write index"

6431 -msgstr "kunde inte skriva indexet"

6432 -

6433 -#: sequencer.c:3289

6882 +#: sequencer.c:3436

6883 #, c-format

6884 msgid "could not resolve '%s'"

6885 msgstr "kunde inte upplösa \"%s\""

6886

6438 -#: sequencer.c:3320

6887 +#: sequencer.c:3467

6888 msgid "cannot merge without a current revision"

6889 msgstr "kan inte slå ihop utan en aktuell incheckning"

6890

6442 -#: sequencer.c:3342

6891 +#: sequencer.c:3489

6892 #, c-format

6893 msgid "unable to parse '%.*s'"

6894 msgstr "kan inte tolka \"%.*s\""

6895

6447 -#: sequencer.c:3351

6896 +#: sequencer.c:3498

6897 #, c-format

6898 msgid "nothing to merge: '%.*s'"

6899 msgstr "inget att slå samman: \"%.*s\""

6900

6452 -#: sequencer.c:3363

6901 +#: sequencer.c:3510

6902 msgid "octopus merge cannot be executed on top of a [new root]"

6903 msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]"

6904

6456 -#: sequencer.c:3378

6905 +#: sequencer.c:3526

6906 #, c-format

6907 msgid "could not get commit message of '%s'"

6908 msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""

6909

6461 -#: sequencer.c:3538

6910 +#: sequencer.c:3688

6911 #, c-format

6912 msgid "could not even attempt to merge '%.*s'"

6913 msgstr "kunde inte ens försöka slå ihop \"%.*s\""

6914

6466 -#: sequencer.c:3554

6915 +#: sequencer.c:3704

6916 msgid "merge: Unable to write new index file"

6917 msgstr "sammanslagning: Kunde inte skriva ny indexfil"

6918

6470 -#: sequencer.c:3623 builtin/rebase.c:712

6919 +#: sequencer.c:3773 builtin/rebase.c:733

6920 #, c-format

6921 msgid "Applied autostash.\n"

6922 msgstr "Tillämpade autostash.\n"

6923

6475 -#: sequencer.c:3635

6924 +#: sequencer.c:3785

6925 #, c-format

6926 msgid "cannot store %s"

6927 msgstr "kan inte spara %s"

6928

6480 -#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113

6929 +#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113

6930 #, c-format

6931 msgid ""

6932 "Applying autostash resulted in conflicts.\n"

@@ -6488,31 +6937,31 @@ msgstr ""

6937 "Dina ändringar är säkra i stashen.\n"

6938 "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"

6939

6491 -#: sequencer.c:3699

6940 +#: sequencer.c:3849

6941 #, c-format

6942 msgid "could not checkout %s"

6943 msgstr "kunde inte checka ut %s"

6944

6496 -#: sequencer.c:3713

6945 +#: sequencer.c:3863

6946 #, c-format

6947 msgid "%s: not a valid OID"

6948 msgstr "%s: inte ett giltigt OID"

6949

6501 -#: sequencer.c:3718 git-rebase--preserve-merges.sh:779

6950 +#: sequencer.c:3868 git-rebase--preserve-merges.sh:779

6951 msgid "could not detach HEAD"

6952 msgstr "kunde inte koppla från HEAD"

6953

6505 -#: sequencer.c:3733

6954 +#: sequencer.c:3883

6955 #, c-format

6956 msgid "Stopped at HEAD\n"

6957 msgstr "Stoppade på HEAD\n"

6958

6510 -#: sequencer.c:3735

6959 +#: sequencer.c:3885

6960 #, c-format

6961 msgid "Stopped at %s\n"

6962 msgstr "Stoppade på %s\n"

6963

6515 -#: sequencer.c:3743

6964 +#: sequencer.c:3893

6965 #, c-format

6966 msgid ""

6967 "Could not execute the todo command\n"

@@ -6533,48 +6982,48 @@ msgstr ""

6982 " git rebase --edit-todo\n"

6983 " git rebase --continue\n"

6984

6536 -#: sequencer.c:3827

6985 +#: sequencer.c:3979

6986 #, c-format

6987 msgid "Stopped at %s... %.*s\n"

6988 msgstr "Stoppade på %s... %.*s\n"

6989

6541 -#: sequencer.c:3898

6990 +#: sequencer.c:4050

6991 #, c-format

6992 msgid "unknown command %d"

6993 msgstr "okänt kommando %d"

6994

6546 -#: sequencer.c:3957

6995 +#: sequencer.c:4109

6996 msgid "could not read orig-head"

6997 msgstr "kunde inte läsa orig-head"

6998

6550 -#: sequencer.c:3962

6999 +#: sequencer.c:4114

7000 msgid "could not read 'onto'"

7001 msgstr "kunde inte läsa \"onto\""

7002

6554 -#: sequencer.c:3976

7003 +#: sequencer.c:4128

7004 #, c-format

7005 msgid "could not update HEAD to %s"

7006 msgstr "kunde inte uppdatera HEAD till %s"

7007

6559 -#: sequencer.c:4069

7008 +#: sequencer.c:4221

7009 msgid "cannot rebase: You have unstaged changes."

7010 msgstr "kan inte ombasera: Du har oköade ändringar."

7011

6563 -#: sequencer.c:4078

7012 +#: sequencer.c:4230

7013 msgid "cannot amend non-existing commit"

7014 msgstr "kan inte lägga till incheckning som inte finns"

7015

6567 -#: sequencer.c:4080

7016 +#: sequencer.c:4232

7017 #, c-format

7018 msgid "invalid file: '%s'"

7019 msgstr "ogiltig fil: \"%s\""

7020

6572 -#: sequencer.c:4082

7021 +#: sequencer.c:4234

7022 #, c-format

7023 msgid "invalid contents: '%s'"

7024 msgstr "ogiltigt innehåll: \"%s\""

7025

6577 -#: sequencer.c:4085

7026 +#: sequencer.c:4237

7027 msgid ""

7028 "\n"

7029 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -6584,42 +7033,42 @@ msgstr ""

7033 "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"

7034 "först och kör sedan \"git rebase --continue\" igen."

7035

6587 -#: sequencer.c:4121 sequencer.c:4159

7036 +#: sequencer.c:4273 sequencer.c:4312

7037 #, c-format

7038 msgid "could not write file: '%s'"

7039 msgstr "kunde inte skriva fil: \"%s\""

7040

6592 -#: sequencer.c:4174

7041 +#: sequencer.c:4327

7042 msgid "could not remove CHERRY_PICK_HEAD"

7043 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"

7044

6596 -#: sequencer.c:4181

7045 +#: sequencer.c:4334

7046 msgid "could not commit staged changes."

7047 msgstr "kunde inte checka in köade ändringar."

7048

6600 -#: sequencer.c:4285

7049 +#: sequencer.c:4440

7050 #, c-format

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

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

7053

6605 -#: sequencer.c:4289

7054 +#: sequencer.c:4444

7055 #, c-format

7056 msgid "%s: bad revision"

7057 msgstr "%s: felaktig revision"

7058

6610 -#: sequencer.c:4324

7059 +#: sequencer.c:4479

7060 msgid "can't revert as initial commit"

7061 msgstr "kan inte ångra som första incheckning"

7062

6614 -#: sequencer.c:4774

7063 +#: sequencer.c:4952

7064 msgid "make_script: unhandled options"

7065 msgstr "make_script: flaggor som inte stöds"

7066

6618 -#: sequencer.c:4777

7067 +#: sequencer.c:4955

7068 msgid "make_script: error preparing revisions"

7069 msgstr "make_script: fel när revisioner skulle förberedas"

7070

6622 -#: sequencer.c:4935

7071 +#: sequencer.c:5113

7072 msgid ""

7073 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

7074 "continue'.\n"

@@ -6629,15 +7078,15 @@ msgstr ""

7078 "continue\".\n"

7079 "Avbryt ombaseringen med \"git rebase --abort\".\n"

7080

6632 -#: sequencer.c:5047 sequencer.c:5064

7081 +#: sequencer.c:5226 sequencer.c:5243

7082 msgid "nothing to do"

7083 msgstr "inget att göra"

7084

6636 -#: sequencer.c:5078

7085 +#: sequencer.c:5257

7086 msgid "could not skip unnecessary pick commands"

7087 msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"

7088

6640 -#: sequencer.c:5166

7089 +#: sequencer.c:5351

7090 msgid "the script was already rearranged."

7091 msgstr "skriptet har redan omordnats."

7092

@@ -6808,12 +7257,12 @@ msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"

7257 #: sha1-file.c:503

7258 #, c-format

7259 msgid "unable to normalize alternate object path: %s"

6811 -msgstr "kunde inte normalisera alternativ objektsökväg: %s"

7260 +msgstr "kunde inte normalisera supplerande objektsökväg: %s"

7261

7262 #: sha1-file.c:575

7263 #, c-format

7264 msgid "%s: ignoring alternate object stores, nesting too deep"

6816 -msgstr "%s: ignorerar alternativa objektlagringar, för djup nästling"

7265 +msgstr "%s: ignorerar supplerande objektlager, för djup nästling"

7266

7267 #: sha1-file.c:582

7268 #, c-format

@@ -6822,7 +7271,7 @@ msgstr "kan inte normalisera objektkatalogen: %s"

7271

7272 #: sha1-file.c:625

7273 msgid "unable to fdopen alternates lockfile"

6825 -msgstr "kan inte utföra \"fdopen\" på låsfil för \"alternates\""

7274 +msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil"

7275

7276 #: sha1-file.c:643

7277 msgid "unable to read alternates file"

@@ -6860,7 +7309,7 @@ msgstr "referensarkivet \"%s\" är ympat"

7309 #: sha1-file.c:791

7310 #, c-format

7311 msgid "invalid line while parsing alternate refs: %s"

6863 -msgstr "felaktig rad vid tolkning av alternativa referenser: %s"

7312 +msgstr "felaktig rad vid tolkning av supplerande referenser: %s"

7313

7314 #: sha1-file.c:943

7315 #, c-format

@@ -7138,6 +7587,11 @@ msgid_plural "%u bytes/s"

7587 msgstr[0] "%u byte/s"

7588 msgstr[1] "%u bytes/s"

7589

7590 +#: strbuf.c:1149

7591 +#, c-format

7592 +msgid "could not edit '%s'"

7593 +msgstr "kunde inte redigera \"%s\""

7594 +

7595 #: submodule.c:114 submodule.c:143

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

7597 msgstr ""

@@ -7173,7 +7627,7 @@ msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""

7627 msgid "submodule entry '%s' (%s) is a %s, not a commit"

7628 msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"

7629

7176 -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989

7630 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016

7631 msgid "Failed to resolve HEAD as a valid ref."

7632 msgstr "Misslyckades slå upp HEAD som giltig referens."

7633

@@ -7212,7 +7666,12 @@ msgstr "undermodulen \"%s\" har ett smutsigt index"

7666 msgid "Submodule '%s' could not be updated."

7667 msgstr "Undermoduler \"%s\" kunde inte uppdateras."

7668

7215 -#: submodule.c:2007

7669 +#: submodule.c:2027

7670 +#, c-format

7671 +msgid "submodule git dir '%s' is inside git dir '%.*s'"

7672 +msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\""

7673 +

7674 +#: submodule.c:2048

7675 #, c-format

7676 msgid ""

7677 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -7220,12 +7679,17 @@ msgstr ""

7679 "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "

7680 "stöds ej"

7681

7223 -#: submodule.c:2019 submodule.c:2074

7682 +#: submodule.c:2060 submodule.c:2119

7683 #, c-format

7684 msgid "could not lookup name for submodule '%s'"

7685 msgstr "kunde inte slå upp namnet för undermodulen \"%s\""

7686

7228 -#: submodule.c:2026

7687 +#: submodule.c:2064

7688 +#, c-format

7689 +msgid "refusing to move '%s' into an existing git dir"

7690 +msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog"

7691 +

7692 +#: submodule.c:2071

7693 #, c-format

7694 msgid ""

7695 "Migrating git directory of '%s%s' from\n"

@@ -7236,16 +7700,16 @@ msgstr ""

7700 "\"%s\" till\n"

7701 "\"%s\"\n"

7702

7239 -#: submodule.c:2109

7703 +#: submodule.c:2154

7704 #, c-format

7705 msgid "could not recurse into submodule '%s'"

7706 msgstr "kunde inte rekursera in i undermodulen \"%s\""

7707

7244 -#: submodule.c:2153

7708 +#: submodule.c:2198

7709 msgid "could not start ls-files in .."

7710 msgstr "kunde inte starta ls-files i .."

7711

7248 -#: submodule.c:2192

7712 +#: submodule.c:2237

7713 #, c-format

7714 msgid "ls-tree returned unexpected return code %d"

7715 msgstr "ls-tree returnerade en oväntad returkod %d"

@@ -7264,12 +7728,12 @@ msgstr "negativa värden är inte tillåtna för submodule.fetchjobs"

7728 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"

7729 msgstr "ignorerar \"%s\" som kan tolkas som en kommandoradsflagga: %s"

7730

7267 -#: submodule-config.c:490

7731 +#: submodule-config.c:498

7732 #, c-format

7733 msgid "invalid value for %s"

7734 msgstr "ogiltigt värde för %s"

7735

7272 -#: submodule-config.c:761

7736 +#: submodule-config.c:769

7737 #, c-format

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

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

@@ -7417,7 +7881,7 @@ msgstr "Avbryter."

7881 msgid "failed to push all needed submodules"

7882 msgstr "kunde inte sända alla nödvändiga undermoduler"

7883

7420 -#: transport.c:1345 transport-helper.c:655

7884 +#: transport.c:1345 transport-helper.c:656

7885 msgid "operation not supported by protocol"

7886 msgstr "funktionen stöds inte av protokollet"

7887

@@ -7430,7 +7894,7 @@ msgstr "komplett skrivning till fjärrhjälpare misslyckades"

7894 msgid "unable to find remote helper for '%s'"

7895 msgstr "kan inte hitta fjärrhjälpare för \"%s\""

7896

7433 -#: transport-helper.c:160 transport-helper.c:569

7897 +#: transport-helper.c:160 transport-helper.c:570

7898 msgid "can't dup helper output fd"

7899 msgstr "kunde inte duplicera utdata-filhandtag"

7900

@@ -7459,90 +7923,90 @@ msgstr "%s sade oväntat: \"%s\""

7923 msgid "%s also locked %s"

7924 msgstr "%s låste också %s"

7925

7462 -#: transport-helper.c:491

7926 +#: transport-helper.c:492

7927 msgid "couldn't run fast-import"

7928 msgstr "kunde inte köra fast-import"

7929

7466 -#: transport-helper.c:514

7930 +#: transport-helper.c:515

7931 msgid "error while running fast-import"

7932 msgstr "fel när fast-import kördes"

7933

7470 -#: transport-helper.c:543 transport-helper.c:1132

7934 +#: transport-helper.c:544 transport-helper.c:1133

7935 #, c-format

7936 msgid "could not read ref %s"

7937 msgstr "kunde inte läsa referensen %s"

7938

7475 -#: transport-helper.c:588

7939 +#: transport-helper.c:589

7940 #, c-format

7941 msgid "unknown response to connect: %s"

7942 msgstr "okänt svar på ansluntning: %s"

7943

7480 -#: transport-helper.c:610

7944 +#: transport-helper.c:611

7945 msgid "setting remote service path not supported by protocol"

7946 msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst"

7947

7484 -#: transport-helper.c:612

7948 +#: transport-helper.c:613

7949 msgid "invalid remote service path"

7950 msgstr "felaktig sökväg till fjärrtjänst"

7951

7488 -#: transport-helper.c:658

7952 +#: transport-helper.c:659

7953 #, c-format

7954 msgid "can't connect to subservice %s"

7955 msgstr "kan inte ansluta till undertjänsten %s"

7956

7493 -#: transport-helper.c:734

7957 +#: transport-helper.c:735

7958 #, c-format

7959 msgid "expected ok/error, helper said '%s'"

7960 msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\""

7961

7498 -#: transport-helper.c:787

7962 +#: transport-helper.c:788

7963 #, c-format

7964 msgid "helper reported unexpected status of %s"

7965 msgstr "hjälparen returnerade oväntad status %s"

7966

7503 -#: transport-helper.c:848

7967 +#: transport-helper.c:849

7968 #, c-format

7969 msgid "helper %s does not support dry-run"

7970 msgstr "hjälparen %s stöder inte dry-run"

7971

7508 -#: transport-helper.c:851

7972 +#: transport-helper.c:852

7973 #, c-format

7974 msgid "helper %s does not support --signed"

7975 msgstr "hjälparen %s stöder inte --signed"

7976

7513 -#: transport-helper.c:854

7977 +#: transport-helper.c:855

7978 #, c-format

7979 msgid "helper %s does not support --signed=if-asked"

7980 msgstr "hjälparen %s stöder inte --signed=if-asked"

7981

7518 -#: transport-helper.c:859

7982 +#: transport-helper.c:860

7983 #, c-format

7984 msgid "helper %s does not support --atomic"

7985 msgstr "hjälparen %s stöder inte --atomic"

7986

7523 -#: transport-helper.c:865

7987 +#: transport-helper.c:866

7988 #, c-format

7989 msgid "helper %s does not support 'push-option'"

7990 msgstr "hjälparen %s stöder inte \"push-option\""

7991

7528 -#: transport-helper.c:963

7992 +#: transport-helper.c:964

7993 msgid "remote-helper doesn't support push; refspec needed"

7994 msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs"

7995

7532 -#: transport-helper.c:968

7996 +#: transport-helper.c:969

7997 #, c-format

7998 msgid "helper %s does not support 'force'"

7999 msgstr "hjälparen %s stöder inte \"force\""

8000

7537 -#: transport-helper.c:1015

8001 +#: transport-helper.c:1016

8002 msgid "couldn't run fast-export"

8003 msgstr "kunde inte köra fast-export"

8004

7541 -#: transport-helper.c:1020

8005 +#: transport-helper.c:1021

8006 msgid "error while running fast-export"

8007 msgstr "fel vid körning av fast-export"

8008

7545 -#: transport-helper.c:1045

8009 +#: transport-helper.c:1046

8010 #, c-format

8011 msgid ""

8012 "No refs in common and none specified; doing nothing.\n"

@@ -7551,47 +8015,47 @@ msgstr ""

8015 "Inga gemensamma referenser och inga angavs; gör inget.\n"

8016 "Du kanske borde ange en gren såsom \"master\".\n"

8017

7554 -#: transport-helper.c:1118

8018 +#: transport-helper.c:1119

8019 #, c-format

8020 msgid "malformed response in ref list: %s"

8021 msgstr "felformat svar i referenslistan: %s"

8022

7559 -#: transport-helper.c:1270

8023 +#: transport-helper.c:1271

8024 #, c-format

8025 msgid "read(%s) failed"

8026 msgstr "läs(%s) misslyckades"

8027

7564 -#: transport-helper.c:1297

8028 +#: transport-helper.c:1298

8029 #, c-format

8030 msgid "write(%s) failed"

8031 msgstr "skriv(%s) misslyckades"

8032

7569 -#: transport-helper.c:1346

8033 +#: transport-helper.c:1347

8034 #, c-format

8035 msgid "%s thread failed"

8036 msgstr "%s-tråden misslyckades"

8037

7574 -#: transport-helper.c:1350

8038 +#: transport-helper.c:1351

8039 #, c-format

8040 msgid "%s thread failed to join: %s"

8041 msgstr "%s-tråden misslyckades ansluta: %s"

8042

7579 -#: transport-helper.c:1369 transport-helper.c:1373

8043 +#: transport-helper.c:1370 transport-helper.c:1374

8044 #, c-format

8045 msgid "can't start thread for copying data: %s"

8046 msgstr "kan inte starta tråd för kopiering av data: %s"

8047

7584 -#: transport-helper.c:1410

8048 +#: transport-helper.c:1411

8049 #, c-format

8050 msgid "%s process failed to wait"

8051 msgstr "processen %s misslyckades vänta"

8052

7589 -#: transport-helper.c:1414

8053 +#: transport-helper.c:1415

8054 #, c-format

8055 msgid "%s process failed"

8056 msgstr "processen %s misslyckades"

8057

7594 -#: transport-helper.c:1432 transport-helper.c:1441

8058 +#: transport-helper.c:1433 transport-helper.c:1442

8059 msgid "can't start thread for copying data"

8060 msgstr "kan inte skapa tråd för kopiering av data"

8061

@@ -7607,7 +8071,12 @@ msgstr "felformat läge i trädpost"

8071 msgid "empty filename in tree entry"

8072 msgstr "tomt filnamn i trädpost"

8073

7610 -#: tree-walk.c:118

8074 +#: tree-walk.c:48

8075 +#, c-format

8076 +msgid "filename in tree entry contains backslash: '%s'"

8077 +msgstr "filnamnet i trädet innehåller omvänt snedstreck: \"%s\""

8078 +

8079 +#: tree-walk.c:124

8080 msgid "too-short tree file"

8081 msgstr "trädfil för kort"

8082

@@ -7857,6 +8326,10 @@ msgstr ""

8326 "sökvägar på ett okänsligt filsystem) och endast en från samma\n"

8327 "kollisionsgrupp finns i arbetskatalogen:\n"

8328

8329 +#: unpack-trees.c:1441

8330 +msgid "Updating index flags"

8331 +msgstr "Uppdaterar indexflaggor"

8332 +

8333 #: urlmatch.c:163

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

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

@@ -8452,131 +8925,131 @@ msgstr "dessutom innehåller dit index ändringar som inte har checkats in."

8925 msgid "cannot %s: Your index contains uncommitted changes."

8926 msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."

8927

8455 -#: compat/precompose_utf8.c:58 builtin/clone.c:452

8928 +#: compat/precompose_utf8.c:58 builtin/clone.c:455

8929 #, c-format

8930 msgid "failed to unlink '%s'"

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

8932

8460 -#: builtin/add.c:25

8933 +#: builtin/add.c:26

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

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

8936

8464 -#: builtin/add.c:84

8937 +#: builtin/add.c:87

8938 #, c-format

8939 msgid "unexpected diff status %c"

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

8941

8469 -#: builtin/add.c:89 builtin/commit.c:288

8942 +#: builtin/add.c:92 builtin/commit.c:288

8943 msgid "updating files failed"

8944 msgstr "misslyckades uppdatera filer"

8945

8473 -#: builtin/add.c:99

8946 +#: builtin/add.c:102

8947 #, c-format

8948 msgid "remove '%s'\n"

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

8950

8478 -#: builtin/add.c:174

8951 +#: builtin/add.c:177

8952 msgid "Unstaged changes after refreshing the index:"

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

8954

8482 -#: builtin/add.c:234 builtin/rev-parse.c:897

8955 +#: builtin/add.c:252 builtin/rev-parse.c:899

8956 msgid "Could not read the index"

8957 msgstr "Kunde inte läsa indexet"

8958

8486 -#: builtin/add.c:245

8959 +#: builtin/add.c:263

8960 #, c-format

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

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

l10n: sv.po: Update Swedish translation (4800t0f0u)