6874b9edb1 · 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.

4 +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012.

5 #

6 msgid ""

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2010-09-20 15:16+0000\n"

11 -"PO-Revision-Date: 2010-09-12 21:07+0100\n"

10 +"POT-Creation-Date: 2012-03-08 10:19+0800\n"

11 +"PO-Revision-Date: 2012-03-08 10:53+0100\n"

12 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"

13 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"

14 "Language: sv\n"

@@ -17,250 +17,648 @@ msgstr ""

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

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

19

20 -#: wt-status.c:56

21 -msgid "# Unmerged paths:"

22 -msgstr "# Ej sammanslagna sökvägar:"

20 +#: advice.c:34

21 +#, c-format

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

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

24 +

25 +#.

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

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

28 +#.

29 +#: advice.c:64

30 +msgid ""

31 +"Fix them up in the work tree,\n"

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

33 +"appropriate to mark resolution and make a commit,\n"

34 +"or use 'git commit -a'."

35 +msgstr ""

36 +"Rätta dem i din arbetskatalog,\n"

37 +"och använd sedan \"git add/rm <fil>\" som\n"

38 +"lämpligt för att ange lösning och checka in,\n"

39 +"eller använd \"git commit -a\"."

40 +

41 +#: commit.c:47

42 +#, c-format

43 +msgid "could not parse %s"

44 +msgstr "kunde inte tolka %s"

45 +

46 +#: commit.c:49

47 +#, c-format

48 +msgid "%s %s is not a commit!"

49 +msgstr "%s %s är inte en incheckning!"

50 +

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

52 +msgid "memory exhausted"

53 +msgstr "minnet slut"

54 +

55 +#: connected.c:39

56 +msgid "Could not run 'git rev-list'"

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

58 +

59 +#: connected.c:48

60 +#, c-format

61 +msgid "failed write to rev-list: %s"

62 +msgstr "kunde inte skriva till rev-list: %s"

63 +

64 +#: connected.c:56

65 +#, c-format

66 +msgid "failed to close rev-list's stdin: %s"

67 +msgstr "kunde inte stänga rev-list:s standard in: %s"

68 +

69 +#: diff.c:105

70 +#, c-format

71 +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"

72 +msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%.*s\"\n"

73 +

74 +#: diff.c:110

75 +#, c-format

76 +msgid " Unknown dirstat parameter '%.*s'\n"

77 +msgstr " Okänd dirstat-parameter \"%.*s\"\n"

78 +

79 +#: diff.c:210

80 +#, c-format

81 +msgid ""

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

83 +"%s"

84 +msgstr ""

85 +"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"

86 +"%s"

87 +

88 +#: diff.c:1336

89 +msgid " 0 files changed\n"

90 +msgstr " 0 filer ändrade\n"

91 +

92 +#: diff.c:1340

93 +#, c-format

94 +msgid " %d file changed"

95 +msgid_plural " %d files changed"

96 +msgstr[0] " %d fil ändrad"

97 +msgstr[1] " %d filer ändrade"

98 +

99 +#: diff.c:1357

100 +#, c-format

101 +msgid ", %d insertion(+)"

102 +msgid_plural ", %d insertions(+)"

103 +msgstr[0] ", %d tillägg(+)"

104 +msgstr[1] ", %d tillägg(+)"

105 +

106 +#: diff.c:1368

107 +#, c-format

108 +msgid ", %d deletion(-)"

109 +msgid_plural ", %d deletions(-)"

110 +msgstr[0] ", %d borttagning(-)"

111 +msgstr[1] ", %d borttagningar(-)"

112 +

113 +#: diff.c:3424

114 +#, c-format

115 +msgid ""

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

117 +"%s"

118 +msgstr ""

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

120 +"%s"

121 +

122 +#: gpg-interface.c:59

123 +msgid "could not run gpg."

124 +msgstr "kunde inte köra gpg."

125 +

126 +#: gpg-interface.c:71

127 +msgid "gpg did not accept the data"

128 +msgstr "gpg godtog inte data"

129 +

130 +#: gpg-interface.c:82

131 +msgid "gpg failed to sign the data"

132 +msgstr "gpg misslyckades signera data"

133 +

134 +#: grep.c:1280

135 +#, c-format

136 +msgid "'%s': unable to read %s"

137 +msgstr "\"%s\" kunde inte läsa %s"

138 +

139 +#: grep.c:1297

140 +#, c-format

141 +msgid "'%s': %s"

142 +msgstr "\"%s\": %s"

143 +

144 +#: grep.c:1308

145 +#, c-format

146 +msgid "'%s': short read %s"

147 +msgstr "\"%s\": kort läsning %s"

148 +

149 +#: help.c:287

150 +#, c-format

151 +msgid ""

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

153 +"able to execute it. Maybe git-%s is broken?"

154 +msgstr ""

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

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

157 +

158 +#: remote.c:1607

159 +#, c-format

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

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

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

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

164 +

165 +#: remote.c:1613

166 +#, c-format

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

168 +msgid_plural ""

169 +"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"

170 +msgstr[0] ""

171 +"Din gren ligger efter \"%s\" med %d incheckning, och kan snabbspolas.\n"

172 +msgstr[1] ""

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

174 +

175 +#: remote.c:1621

176 +#, c-format

177 +msgid ""

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

179 +"and have %d and %d different commit each, respectively.\n"

180 +msgid_plural ""

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

182 +"and have %d and %d different commits each, respectively.\n"

183 +msgstr[0] ""

184 +"Din gren och \"%s\" har divergerat,\n"

185 +"och har %d respektive %d olika incheckning.\n"

186 +msgstr[1] ""

187 +"Din gren och \"%s\" har divergerat,\n"

188 +"och har %d respektive %d olika incheckningar.\n"

189 +

190 +#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985

191 +#: builtin/merge.c:1095 builtin/merge.c:1105

192 +#, c-format

193 +msgid "Could not open '%s' for writing"

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

195 +

196 +#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867

197 +#: builtin/merge.c:1097 builtin/merge.c:1110

198 +#, c-format

199 +msgid "Could not write to '%s'"

200 +msgstr "Kunde inte skriva till \"%s\""

201 +

202 +#: sequencer.c:143

203 +msgid ""

204 +"after resolving the conflicts, mark the corrected paths\n"

205 +"with 'git add <paths>' or 'git rm <paths>'"

206 +msgstr ""

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

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

209 +

210 +#: sequencer.c:146

211 +msgid ""

212 +"after resolving the conflicts, mark the corrected paths\n"

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

214 +"and commit the result with 'git commit'"

215 +msgstr ""

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

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

218 +"och checka in resultatet med \"git commit\""

219 +

220 +#: sequencer.c:159 sequencer.c:685 sequencer.c:768

221 +#, c-format

222 +msgid "Could not write to %s"

223 +msgstr "Kunde inte skriva till %s"

224 +

225 +#: sequencer.c:162

226 +#, c-format

227 +msgid "Error wrapping up %s"

228 +msgstr "Fel vid ombrytning av %s"

229 +

230 +#: sequencer.c:177

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

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

233 +

234 +#: sequencer.c:179

235 +msgid "Your local changes would be overwritten by revert."

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

237 +

238 +#: sequencer.c:182

239 +msgid "Commit your changes or stash them to proceed."

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

241 +

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

243 +#: sequencer.c:232

244 +#, c-format

245 +msgid "%s: Unable to write new index file"

246 +msgstr "%s: Kunde inte skriva ny indexfil"

247 +

248 +#: sequencer.c:298

249 +msgid "Your index file is unmerged."

250 +msgstr "Din indexfil har inte slagits ihop."

251 +

252 +#: sequencer.c:301

253 +msgid "You do not have a valid HEAD"

254 +msgstr "Du har ingen giltig HEAD"

255 +

256 +#: sequencer.c:316

257 +#, c-format

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

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

260 +

261 +#: sequencer.c:324

262 +#, c-format

263 +msgid "Commit %s does not have parent %d"

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

265 +

266 +#: sequencer.c:328

267 +#, c-format

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

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

270 +

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

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

273 +#: sequencer.c:339

274 +#, c-format

275 +msgid "%s: cannot parse parent commit %s"

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

277 +

278 +#: sequencer.c:343

279 +#, c-format

280 +msgid "Cannot get commit message for %s"

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

282 +

283 +#: sequencer.c:427

284 +#, c-format

285 +msgid "could not revert %s... %s"

286 +msgstr "kunde inte ångra %s... %s"

287 +

288 +#: sequencer.c:428

289 +#, c-format

290 +msgid "could not apply %s... %s"

291 +msgstr "kunde inte applicera %s... %s"

292 +

293 +#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713

294 +#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348

295 +#: builtin/shortlog.c:181

296 +msgid "revision walk setup failed"

297 +msgstr "misslyckades skapa revisionstraversering"

298 +

299 +#: sequencer.c:453

300 +msgid "empty commit set passed"

301 +msgstr "den angivna uppsättningen incheckningar är tom"

302 +

303 +#: sequencer.c:461

304 +#, c-format

305 +msgid "git %s: failed to read the index"

306 +msgstr "git %s: misslyckades läsa indexet"

307 +

308 +#: sequencer.c:466

309 +#, c-format

310 +msgid "git %s: failed to refresh the index"

311 +msgstr "git %s: misslyckades uppdatera indexet"

312 +

313 +#: sequencer.c:551

314 +#, c-format

315 +msgid "Cannot %s during a %s"

316 +msgstr "kan inte %s under en %s"

317 +

318 +#: sequencer.c:573

319 +#, c-format

320 +msgid "Could not parse line %d."

321 +msgstr "Kan inte tolka rad %d."

322 +

323 +#: sequencer.c:578

324 +msgid "No commits parsed."

325 +msgstr "Inga incheckningar lästes."

326 +

327 +#: sequencer.c:591

328 +#, c-format

329 +msgid "Could not open %s"

330 +msgstr "Kunde inte öppna %s"

331 +

332 +#: sequencer.c:595

333 +#, c-format

334 +msgid "Could not read %s."

335 +msgstr "kunde inte läsa %s."

336 +

337 +#: sequencer.c:602

338 +#, c-format

339 +msgid "Unusable instruction sheet: %s"

340 +msgstr "Oanvändbart manus: %s"

341 +

342 +#: sequencer.c:630

343 +#, c-format

344 +msgid "Invalid key: %s"

345 +msgstr "Felaktig nyckel: %s"

346 +

347 +#: sequencer.c:633

348 +#, c-format

349 +msgid "Invalid value for %s: %s"

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

351 +

352 +#: sequencer.c:645

353 +#, c-format

354 +msgid "Malformed options sheet: %s"

355 +msgstr "Trasigt manus: %s"

356 +

357 +#: sequencer.c:666

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

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

360

24 -#: wt-status.c:62 wt-status.c:79

361 +#: sequencer.c:667

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

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

364 +

365 +#: sequencer.c:671

366 +#, c-format

367 +msgid "Could not create sequencer directory %s"

368 +msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\""

369 +

370 +#: sequencer.c:687 sequencer.c:772

371 +#, c-format

372 +msgid "Error wrapping up %s."

373 +msgstr "Fel vid ombrytning av %s."

374 +

375 +#: sequencer.c:706 sequencer.c:840

376 +msgid "no cherry-pick or revert in progress"

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

378 +

379 +#: sequencer.c:708

380 +msgid "cannot resolve HEAD"

381 +msgstr "kan inte bestämma HEAD"

382 +

383 +#: sequencer.c:710

384 +msgid "cannot abort from a branch yet to be born"

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

386 +

387 +#: sequencer.c:732

388 +#, c-format

389 +msgid "cannot open %s: %s"

390 +msgstr "kan inte öppna %s: %s"

391 +

392 +#: sequencer.c:735

393 +#, c-format

394 +msgid "cannot read %s: %s"

395 +msgstr "kan inte läsa %s: %s"

396 +

397 +#: sequencer.c:736

398 +msgid "unexpected end of file"

399 +msgstr "oväntat filslut"

400 +

401 +#: sequencer.c:742

402 +#, c-format

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

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

405 +

406 +#: sequencer.c:765

407 +#, c-format

408 +msgid "Could not format %s."

409 +msgstr "Kunde inte formatera %s."

410 +

411 +#: sequencer.c:927

412 +msgid "Can't revert as initial commit"

413 +msgstr "Kan inte ångra som första incheckning"

414 +

415 +#: sequencer.c:928

416 +msgid "Can't cherry-pick into empty head"

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

418 +

419 +#: wt-status.c:134

420 +msgid "Unmerged paths:"

421 +msgstr "Ej sammanslagna sökvägar:"

422 +

423 +#: wt-status.c:140 wt-status.c:157

424 #, c-format

26 -msgid "# (use \"git reset %s <file>...\" to unstage)"

27 -msgstr "# (använd \"git reset %s <fil>...\" för att ta bort från kö)"

425 +msgid " (use \"git reset %s <file>...\" to unstage)"

426 +msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)"

427

29 -#: wt-status.c:64 wt-status.c:81

30 -msgid "# (use \"git rm --cached <file>...\" to unstage)"

31 -msgstr "# (använd \"git rm --cached <fil>...\" för att ta bort från kö)"

428 +#: wt-status.c:142 wt-status.c:159

429 +msgid " (use \"git rm --cached <file>...\" to unstage)"

430 +msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)"

431

33 -#: wt-status.c:65

34 -msgid "# (use \"git add/rm <file>...\" as appropriate to mark resolution)"

35 -msgstr "# (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"

432 +#: wt-status.c:143

433 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

434 +msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"

435

37 -#: wt-status.c:73

38 -msgid "# Changes to be committed:"

39 -msgstr "# Ändringar att checka in:"

436 +#: wt-status.c:151

437 +msgid "Changes to be committed:"

438 +msgstr "Ändringar att checka in:"

439

41 -#: wt-status.c:91

42 -msgid "# Changed but not updated:"

43 -msgstr "# Ändrade men inte uppdaterade:"

440 +#: wt-status.c:169

441 +msgid "Changes not staged for commit:"

442 +msgstr "Ändringar ej i incheckningskön:"

443

45 -#: wt-status.c:95

46 -msgid "# (use \"git add <file>...\" to update what will be committed)"

444 +#: wt-status.c:173

445 +msgid " (use \"git add <file>...\" to update what will be committed)"

446 msgstr ""

48 -"# (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"

447 +" (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"

448

50 -#: wt-status.c:97

51 -msgid "# (use \"git add/rm <file>...\" to update what will be committed)"

449 +#: wt-status.c:175

450 +msgid " (use \"git add/rm <file>...\" to update what will be committed)"

451 msgstr ""

53 -"# (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas "

54 -"in)"

452 +" (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"

453

56 -#: wt-status.c:98

454 +#: wt-status.c:176

455 msgid ""

58 -"# (use \"git checkout -- <file>...\" to discard changes in working "

59 -"directory)"

456 +" (use \"git checkout -- <file>...\" to discard changes in working directory)"

457 msgstr ""

61 -"# (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "

458 +" (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "

459 "arbetskatalogen)"

460

64 -#: wt-status.c:100

65 -msgid "# (commit or discard the untracked or modified content in submodules)"

461 +#: wt-status.c:178

462 +msgid " (commit or discard the untracked or modified content in submodules)"

463 msgstr ""

67 -"# (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"

464 +" (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"

465

69 -#: wt-status.c:109

466 +# %s är ett verb ("Untracked"/"Ignored").

467 +#: wt-status.c:187

468 #, c-format

71 -msgid "# %s files:"

72 -msgstr "# %s filer:"

469 +msgid "%s files:"

470 +msgstr "%s filer:"

471

74 -#: wt-status.c:112

472 +#: wt-status.c:190

473 #, c-format

76 -msgid "# (use \"git %s <file>...\" to include in what will be committed)"

474 +msgid " (use \"git %s <file>...\" to include in what will be committed)"

475 msgstr ""

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

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

477

80 -#: wt-status.c:129

478 +#: wt-status.c:207

479 msgid "bug"

480 msgstr "programfel"

481

84 -#: wt-status.c:134

482 +#: wt-status.c:212

483 msgid "both deleted:"

484 msgstr "borttaget av bägge:"

485

88 -#: wt-status.c:135

486 +#: wt-status.c:213

487 msgid "added by us:"

488 msgstr "tillagt av oss:"

489

92 -#: wt-status.c:136

490 +#: wt-status.c:214

491 msgid "deleted by them:"

492 msgstr "borttaget av dem:"

493

96 -#: wt-status.c:137

494 +#: wt-status.c:215

495 msgid "added by them:"

496 msgstr "tillagt av dem:"

497

100 -#: wt-status.c:138

498 +#: wt-status.c:216

499 msgid "deleted by us:"

500 msgstr "borttaget av oss:"

501

104 -#: wt-status.c:139

502 +#: wt-status.c:217

503 msgid "both added:"

504 msgstr "tillagt av bägge:"

505

108 -#: wt-status.c:140

506 +#: wt-status.c:218

507 msgid "both modified:"

508 msgstr "ändrat av bägge:"

509

112 -#: wt-status.c:170

510 +#: wt-status.c:248

511 msgid "new commits, "

512 msgstr "nya incheckningar, "

513

116 -#: wt-status.c:172

514 +#: wt-status.c:250

515 msgid "modified content, "

516 msgstr "ändrat innehåll, "

517

120 -#: wt-status.c:174

518 +#: wt-status.c:252

519 msgid "untracked content, "

520 msgstr "ospårat innehåll, "

521

124 -#: wt-status.c:188

522 +#: wt-status.c:266

523 #, c-format

524 msgid "new file: %s"

525 msgstr "ny fil: %s"

526

129 -#: wt-status.c:191

527 +#: wt-status.c:269

528 #, c-format

529 msgid "copied: %s -> %s"

530 msgstr "kopierad: %s -> %s"

531

134 -#: wt-status.c:194

532 +#: wt-status.c:272

533 #, c-format

534 msgid "deleted: %s"

535 msgstr "borttagen: %s"

536

139 -#: wt-status.c:197

537 +#: wt-status.c:275

538 #, c-format

539 msgid "modified: %s"

540 msgstr "ändrad: %s"

541

144 -#: wt-status.c:200

542 +#: wt-status.c:278

543 #, c-format

544 msgid "renamed: %s -> %s"

545 msgstr "namnbyte: %s -> %s"

546

149 -#: wt-status.c:203

547 +#: wt-status.c:281

548 #, c-format

549 msgid "typechange: %s"

550 msgstr "typbyte: %s"

551

154 -#: wt-status.c:206

552 +#: wt-status.c:284

553 #, c-format

554 msgid "unknown: %s"

555 msgstr "okänd: %s"

556

159 -#: wt-status.c:209

557 +#: wt-status.c:287

558 #, c-format

559 msgid "unmerged: %s"

560 msgstr "osammansl.: %s"

561

164 -#: wt-status.c:212

562 +#: wt-status.c:290

563 #, c-format

564 msgid "bug: unhandled diff status %c"

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

566

169 -#: wt-status.c:635

567 +#: wt-status.c:713

568 msgid "On branch "

569 msgstr "På grenen "

570

173 -#: wt-status.c:642

571 +#: wt-status.c:720

572 msgid "Not currently on any branch."

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

574

177 -#: wt-status.c:652

178 -msgid "# Initial commit"

179 -msgstr "# Grundincheckning"

575 +#: wt-status.c:731

576 +msgid "Initial commit"

577 +msgstr "Första incheckning"

578

181 -#: wt-status.c:666

579 +#: wt-status.c:745

580 msgid "Untracked"

581 msgstr "Ospårad"

582

185 -#: wt-status.c:668

583 +#: wt-status.c:747

584 msgid "Ignored"

585 msgstr "Ignorerad"

586

189 -#: wt-status.c:670

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

588 +#: wt-status.c:749

589 #, c-format

191 -msgid "# Untracked files not listed%s\n"

192 -msgstr "# Ospårade filer visas ej%s\n"

590 +msgid "Untracked files not listed%s"

591 +msgstr "Ospårade filer visas ej%s"

592

194 -#: wt-status.c:672

593 +#: wt-status.c:751

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

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

596

198 -#: wt-status.c:678

199 -#, c-format

200 -msgid "# No changes\n"

201 -msgstr "# Inga ändringar\n"

597 +#: wt-status.c:757

598 +msgid "No changes"

599 +msgstr "Inga ändringar"

600

203 -#: wt-status.c:682

601 +#: wt-status.c:761

602 #, c-format

603 msgid "no changes added to commit%s\n"

604 msgstr "inga ändringar att checka in%s\n"

605

208 -#: wt-status.c:684

606 +#: wt-status.c:763

607 msgid " (use \"git add\" and/or \"git commit -a\")"

608 msgstr " (använd \"git add\" och/eller \"git commit -a\")"

609

212 -#: wt-status.c:686

610 +#: wt-status.c:765

611 #, c-format

612 msgid "nothing added to commit but untracked files present%s\n"

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

614

217 -#: wt-status.c:688

615 +#: wt-status.c:767

616 msgid " (use \"git add\" to track)"

617 msgstr " (använd \"git add\" för att spåra)"

618

221 -#: wt-status.c:690 wt-status.c:693 wt-status.c:696

619 +#: wt-status.c:769 wt-status.c:772 wt-status.c:775

620 #, c-format

621 msgid "nothing to commit%s\n"

622 msgstr "inget att checka in%s\n"

623

226 -#: wt-status.c:691

624 +#: wt-status.c:770

625 msgid " (create/copy files and use \"git add\" to track)"

626 msgstr " (skapa/kopiera filer och använd \"git add\" för att spåra)"

627

230 -#: wt-status.c:694

628 +#: wt-status.c:773

629 msgid " (use -u to show untracked files)"

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

631

234 -#: wt-status.c:697

632 +#: wt-status.c:776

633 msgid " (working directory clean)"

634 msgstr " (arbetskatalogen ren)"

635

238 -#: wt-status.c:795

636 +#: wt-status.c:884

637 msgid "HEAD (no branch)"

638 msgstr "HEAD (ingen gren)"

639

242 -#: wt-status.c:801

640 +#: wt-status.c:890

641 msgid "Initial commit on "

244 -msgstr "Grundincheckning på "

642 +msgstr "Första incheckning på "

643

246 -#: wt-status.c:816

644 +#: wt-status.c:905

645 msgid "behind "

646 msgstr "efter "

647

250 -#: wt-status.c:819 wt-status.c:822

648 +#: wt-status.c:908 wt-status.c:911

649 msgid "ahead "

650 msgstr "före "

651

254 -#: wt-status.c:824

652 +#: wt-status.c:913

653 msgid ", behind "

654 msgstr ", efter "

655

258 -#: builtin/add.c:41

656 +#: builtin/add.c:62

657 #, c-format

658 msgid "unexpected diff status %c"

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

660

263 -#: builtin/add.c:67 builtin/commit.c:244

661 +#: builtin/add.c:67 builtin/commit.c:298

662 msgid "updating files failed"

663 msgstr "misslyckades uppdatera filer"

664

@@ -269,89 +667,93 @@ msgstr "misslyckades uppdatera filer"

667 msgid "remove '%s'\n"

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

669

272 -#: builtin/add.c:175

670 +#: builtin/add.c:176

671 #, c-format

672 msgid "Path '%s' is in submodule '%.*s'"

673 msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\""

674

277 -#: builtin/add.c:191

675 +#: builtin/add.c:192

676 msgid "Unstaged changes after refreshing the index:"

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

678

281 -#: builtin/add.c:194 builtin/add.c:452 builtin/rm.c:194

679 +#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186

680 #, c-format

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

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

683

286 -#: builtin/add.c:208

684 +#: builtin/add.c:209

685 #, c-format

686 msgid "'%s' is beyond a symbolic link"

687 msgstr "\"%s\" är på andra sidan av en symbolisk länk"

688

291 -#: builtin/add.c:275

689 +#: builtin/add.c:276

690 msgid "Could not read the index"

691 msgstr "Kunde inte läsa indexet"

692

295 -#: builtin/add.c:284

693 +#: builtin/add.c:286

694 #, c-format

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

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

697

300 -#: builtin/add.c:288

698 +#: builtin/add.c:290

699 msgid "Could not write patch"

700 msgstr "Kunde inte skriva patch"

701

304 -#: builtin/add.c:293

702 +#: builtin/add.c:295

703 #, c-format

704 msgid "Could not stat '%s'"

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

706

309 -#: builtin/add.c:295

707 +#: builtin/add.c:297

708 msgid "Empty patch. Aborted."

709 msgstr "Tom patch. Avbryter."

710

313 -#: builtin/add.c:301

711 +#: builtin/add.c:303

712 #, c-format

713 msgid "Could not apply '%s'"

714 msgstr "Kunde inte applicera \"%s\""

715

318 -#: builtin/add.c:349

716 +#: builtin/add.c:312

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

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

719 +

720 +#: builtin/add.c:352

721 #, c-format

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

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

724

323 -#: builtin/add.c:350

725 +#: builtin/add.c:353

726 msgid "no files added"

727 msgstr "inga filer har lagts till"

728

327 -#: builtin/add.c:356

729 +#: builtin/add.c:359

730 msgid "adding files failed"

731 msgstr "misslyckades lägga till filer"

732

331 -#: builtin/add.c:388

733 +#: builtin/add.c:391

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

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

736

335 -#: builtin/add.c:390

737 +#: builtin/add.c:393

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

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

740

339 -#: builtin/add.c:410

741 +#: builtin/add.c:413

742 #, c-format

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

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

745

344 -#: builtin/add.c:411

746 +#: builtin/add.c:414

747 #, c-format

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

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

750

349 -#: builtin/add.c:417 builtin/clean.c:95 builtin/commit.c:301

350 -#: builtin/commit.c:310 builtin/mv.c:77 builtin/rm.c:171

751 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82

752 +#: builtin/rm.c:162

753 msgid "index file corrupt"

754 msgstr "indexfilen trasig"

755

354 -#: builtin/add.c:468 builtin/mv.c:223 builtin/rm.c:268

756 +#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260

757 msgid "Unable to write new index file"

758 msgstr "Kunde inte skriva ny indexfil"

759

@@ -364,37 +766,42 @@ msgstr "Kunde inte skapa arkivfilen \"%s\""

766 msgid "could not redirect output"

767 msgstr "kunde inte omdirigera utdata"

768

367 -#: builtin/archive.c:36

769 +#: builtin/archive.c:37

770 msgid "git archive: Remote with no URL"

771 msgstr "git archive: Fjärr utan URL"

772

371 -#: builtin/archive.c:46

773 +#: builtin/archive.c:58

774 msgid "git archive: expected ACK/NAK, got EOF"

775 msgstr "git archive: förväntade ACK/NAK, fick EOF"

776

375 -#: builtin/archive.c:51

777 +#: builtin/archive.c:63

778 #, c-format

779 msgid "git archive: NACK %s"

780 msgstr "git archive: NACK %s"

781

380 -#: builtin/archive.c:52

782 +#: builtin/archive.c:65

783 +#, c-format

784 +msgid "remote error: %s"

785 +msgstr "fjärrfel: %s"

786 +

787 +#: builtin/archive.c:66

788 msgid "git archive: protocol error"

789 msgstr "git archive: protokollfel"

790

384 -#: builtin/archive.c:57

791 +#: builtin/archive.c:71

792 msgid "git archive: expected a flush"

793 msgstr "git archive: förväntade en tömning (flush)"

794

388 -#: builtin/branch.c:136

795 +#: builtin/branch.c:137

796 #, c-format

797 msgid ""

798 "deleting branch '%s' that has been merged to\n"

392 -" '%s', but it is not yet merged to HEAD."

799 +" '%s', but not yet merged to HEAD."

800 msgstr ""

394 -"tar bort grenen \"%s\" som inte har slagits ihop med\n"

395 -" \"%s\", men som ännu inte slagits ihop med HEAD."

801 +"tar bort grenen \"%s\" som har slagits ihop med\n"

802 +" \"%s\", men ännu inte slagits ihop med HEAD."

803

397 -#: builtin/branch.c:140

804 +#: builtin/branch.c:141

805 #, c-format

806 msgid ""

807 "not deleting branch '%s' that is not yet merged to\n"

@@ -404,34 +811,34 @@ msgstr ""

811 " \"%s\", trots att den har slagits ihop med HEAD."

812

813 #. TRANSLATORS: This is "remote " in "remote branch '%s' not found"

407 -#: builtin/branch.c:161

814 +#: builtin/branch.c:163

815 msgid "remote "

816 msgstr "fjärr"

817

411 -#: builtin/branch.c:169

818 +#: builtin/branch.c:171

819 msgid "cannot use -a with -d"

820 msgstr "kan inte ange -a med -d"

821

415 -#: builtin/branch.c:175

822 +#: builtin/branch.c:177

823 msgid "Couldn't look up commit object for HEAD"

824 msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"

825

419 -#: builtin/branch.c:180

826 +#: builtin/branch.c:182

827 #, c-format

828 msgid "Cannot delete the branch '%s' which you are currently on."

829 msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande."

830

424 -#: builtin/branch.c:190

831 +#: builtin/branch.c:192

832 #, c-format

833 msgid "%sbranch '%s' not found."

834 msgstr "%sgrenen \"%s\" hittades inte."

835

429 -#: builtin/branch.c:198

836 +#: builtin/branch.c:200

837 #, c-format

838 msgid "Couldn't look up commit object for '%s'"

839 msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""

840

434 -#: builtin/branch.c:204

841 +#: builtin/branch.c:206

842 #, c-format

843 msgid ""

844 "The branch '%s' is not fully merged.\n"

@@ -440,95 +847,95 @@ msgstr ""

847 "Grenen \"%s\" har inte slagits samman i sin helhet.\n"

848 "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."

849

443 -#: builtin/branch.c:212

850 +#: builtin/branch.c:214

851 #, c-format

852 msgid "Error deleting %sbranch '%s'"

853 msgstr "Fel vid borttagning av %sgrenen \"%s\""

854

448 -#: builtin/branch.c:217

855 +#: builtin/branch.c:219

856 #, c-format

857 msgid "Deleted %sbranch %s (was %s).\n"

858 msgstr "Tog bort %sgrenen %s (var %s).\n"

859

453 -#: builtin/branch.c:222

860 +#: builtin/branch.c:224

861 msgid "Update of config-file failed"

862 msgstr "Misslyckades uppdatera konfigurationsfil"

863

457 -#: builtin/branch.c:304

864 +#: builtin/branch.c:322

865 #, c-format

866 msgid "branch '%s' does not point at a commit"

867 msgstr "grenen \"%s\" pekar inte på en incheckning"

868

462 -#: builtin/branch.c:381

869 +#: builtin/branch.c:394

870 #, c-format

871 msgid "behind %d] "

872 msgstr "bakom %d] "

873

467 -#: builtin/branch.c:383

874 +#: builtin/branch.c:396

875 #, c-format

876 msgid "ahead %d] "

877 msgstr "före %d] "

878

472 -#: builtin/branch.c:385

879 +#: builtin/branch.c:398

880 #, c-format

881 msgid "ahead %d, behind %d] "

882 msgstr "före %d, bakom %d] "

883

477 -#: builtin/branch.c:484

884 +#: builtin/branch.c:501

885 msgid "(no branch)"

886 msgstr "(ingen gren)"

887

481 -#: builtin/branch.c:544

888 +#: builtin/branch.c:566

889 msgid "some refs could not be read"

890 msgstr "vissa referenser kunde inte läsas"

891

485 -#: builtin/branch.c:557

892 +#: builtin/branch.c:579

893 msgid "cannot rename the current branch while not on any."

894 msgstr ""

895 "kunde inte byta namn på aktuell gren när du inte befinner dig på någon."

896

490 -#: builtin/branch.c:567 builtin/branch.c:571

897 +#: builtin/branch.c:589

898 #, c-format

899 msgid "Invalid branch name: '%s'"

900 msgstr "Felaktigt namn på gren: \"%s\""

901

495 -#: builtin/branch.c:574

496 -#, c-format

497 -msgid "A branch named '%s' already exists."

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

499 -

500 -#: builtin/branch.c:580

902 +#: builtin/branch.c:604

903 msgid "Branch rename failed"

904 msgstr "Misslyckades byta namn på gren"

905

504 -#: builtin/branch.c:584

906 +#: builtin/branch.c:608

907 #, c-format

908 msgid "Renamed a misnamed branch '%s' away"

909 msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""

910

509 -#: builtin/branch.c:588

911 +#: builtin/branch.c:612

912 #, c-format

913 msgid "Branch renamed to %s, but HEAD is not updated!"

914 msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"

915

514 -#: builtin/branch.c:595

916 +#: builtin/branch.c:619

917 msgid "Branch is renamed, but update of config-file failed"

918 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

919

518 -#: builtin/branch.c:610

920 +#: builtin/branch.c:634

921 #, c-format

922 msgid "malformed object name %s"

923 msgstr "felformat objektnamn %s"

924

523 -#: builtin/branch.c:680

925 +#: builtin/branch.c:658

926 +#, c-format

927 +msgid "could not write branch description template: %s\n"

928 +msgstr "kunde inte skriva grenbeskrivningsmall: %s\n"

929 +

930 +#: builtin/branch.c:746

931 msgid "Failed to resolve HEAD as a valid ref."

932 msgstr "Misslyckades slå upp HEAD som giltig referens"

933

527 -#: builtin/branch.c:686

934 +#: builtin/branch.c:751 builtin/clone.c:558

935 msgid "HEAD not found below refs/heads!"

936 msgstr "HEAD hittades inte under refs/heads!"

937

531 -#: builtin/branch.c:706

938 +#: builtin/branch.c:809

939 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

940 msgstr ""

941 "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "

@@ -547,145 +954,206 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."

954 msgid "Need a repository to unbundle."

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

956

550 -#: builtin/checkout.c:107 builtin/checkout.c:135

957 +#: builtin/checkout.c:113 builtin/checkout.c:146

958 #, c-format

959 msgid "path '%s' does not have our version"

960 msgstr "sökvägen \"%s\" har inte vår version"

961

555 -#: builtin/checkout.c:109 builtin/checkout.c:137

962 +#: builtin/checkout.c:115 builtin/checkout.c:148

963 #, c-format

964 msgid "path '%s' does not have their version"

965 msgstr "sökvägen \"%s\" har inte deras version"

966

560 -#: builtin/checkout.c:120

967 +#: builtin/checkout.c:131

968 #, c-format

562 -msgid "path '%s' does not have all three versions"

563 -msgstr "sökvägen \"%s\" har inte alla tre versionerna"

969 +msgid "path '%s' does not have all necessary versions"

970 +msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"

971

565 -#: builtin/checkout.c:155

972 +#: builtin/checkout.c:175

973 #, c-format

567 -msgid "path '%s' does not have all 3 versions"

568 -msgstr "sökvägen \"%s\" har inte alla 3 versionerna"

974 +msgid "path '%s' does not have necessary versions"

975 +msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"

976

570 -#: builtin/checkout.c:172

977 +#: builtin/checkout.c:192

978 #, c-format

979 msgid "path '%s': cannot merge"

980 msgstr "sökväg \"%s\": kan inte slå ihop"

981

575 -#: builtin/checkout.c:189

982 +#: builtin/checkout.c:209

983 #, c-format

984 msgid "Unable to add merge result for '%s'"

985 msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""

986

580 -#: builtin/checkout.c:194 builtin/reset.c:170

987 +#: builtin/checkout.c:212 builtin/reset.c:158

988 #, c-format

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

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

991

585 -#: builtin/checkout.c:216 builtin/checkout.c:371

992 +#: builtin/checkout.c:234 builtin/checkout.c:392

993 msgid "corrupt index file"

994 msgstr "indexfilen är trasig"

995

589 -#: builtin/checkout.c:244 builtin/checkout.c:251

996 +#: builtin/checkout.c:264 builtin/checkout.c:271

997 #, c-format

998 msgid "path '%s' is unmerged"

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

1000

594 -#: builtin/checkout.c:280 builtin/checkout.c:475 builtin/clone.c:658

595 -#: builtin/merge.c:737

1001 +#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583

1002 +#: builtin/merge.c:811

1003 msgid "unable to write new index file"

1004 msgstr "kunde inte skriva ny indexfil"

1005

599 -#: builtin/checkout.c:297 builtin/diff.c:307 builtin/merge.c:367

1006 +#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408

1007 msgid "diff_setup_done failed"

1008 msgstr "diff_setup_done misslyckades"

1009

603 -#: builtin/checkout.c:393

1010 +#: builtin/checkout.c:414

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

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

1013

607 -#: builtin/checkout.c:524

1014 +#: builtin/checkout.c:533

1015 #, c-format

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

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

1018

612 -#: builtin/checkout.c:550

1019 +#: builtin/checkout.c:565

1020 +msgid "HEAD is now at"

1021 +msgstr "HEAD är nu på"

1022 +

1023 +#: builtin/checkout.c:572

1024 +#, c-format

1025 +msgid "Reset branch '%s'\n"

1026 +msgstr "Återställ gren \"%s\"\n"

1027 +

1028 +#: builtin/checkout.c:575

1029 #, c-format

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

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

1032

617 -#: builtin/checkout.c:554

1033 +#: builtin/checkout.c:579

1034 #, c-format

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

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

1037

622 -#: builtin/checkout.c:556

1038 +#: builtin/checkout.c:581

1039 #, c-format

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

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

1042

627 -#: builtin/checkout.c:558

1043 +#: builtin/checkout.c:583

1044 #, c-format

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

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

1047

632 -#: builtin/checkout.c:575

633 -msgid "HEAD is now at"

634 -msgstr "HEAD är nu på"

1048 +#: builtin/checkout.c:639

1049 +#, c-format

1050 +msgid " ... and %d more.\n"

1051 +msgstr " ... och %d till.\n"

1052

636 -#: builtin/checkout.c:603

637 -msgid "You are on a branch yet to be born"

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

1053 +#. The singular version

1054 +#: builtin/checkout.c:645

1055 +#, c-format

1056 +msgid ""

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

1058 +"any of your branches:\n"

1059 +"\n"

1060 +"%s\n"

1061 +msgid_plural ""

1062 +"Warning: you are leaving %d commits behind, not connected to\n"

1063 +"any of your branches:\n"

1064 +"\n"

1065 +"%s\n"

1066 +msgstr[0] ""

1067 +"Varning: du lämnar %d incheckning bakom dig som inte är ansluten till\n"

1068 +"någon av dina grenar:\n"

1069 +"\n"

1070 +"%s\n"

1071 +msgstr[1] ""

1072 +"Varning: du lämnar %d incheckningar bakom dig som inte är ansluta till\n"

1073 +"någon av dina grenar:\n"

1074 +"\n"

1075 +"%s\n"

1076 +

1077 +#: builtin/checkout.c:663

1078 +#, c-format

1079 +msgid ""

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

1081 +"to do so with:\n"

1082 +"\n"

1083 +" git branch new_branch_name %s\n"

1084 +"\n"

1085 +msgstr ""

1086 +"Om du vill behålla dem genom att skapa en ny gren är nu en bra tidpunkt\n"

1087 +"att göra så, med:\n"

1088 +"\n"

1089 +" git branch nytt_grennamn %s\n"

1090 +"\n"

1091 +

1092 +#: builtin/checkout.c:692

1093 +msgid "internal error in revision walk"

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

1095

640 -#: builtin/checkout.c:617

1096 +#: builtin/checkout.c:696

1097 msgid "Previous HEAD position was"

1098 msgstr "Tidigare position för HEAD var"

1099

644 -#: builtin/checkout.c:730

1100 +#: builtin/checkout.c:722

1101 +msgid "You are on a branch yet to be born"

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

1103 +

1104 +#. case (1)

1105 +#: builtin/checkout.c:853

1106 +#, c-format

1107 +msgid "invalid reference: %s"

1108 +msgstr "felaktig referens: %s"

1109 +

1110 +#. case (1): want a tree

1111 +#: builtin/checkout.c:892

1112 +#, c-format

1113 +msgid "reference is not a tree: %s"

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

1115 +

1116 +#: builtin/checkout.c:972

1117 msgid "-B cannot be used with -b"

1118 msgstr "-B kan inte användas med -b"

1119

648 -#: builtin/checkout.c:738

1120 +#: builtin/checkout.c:981

1121 msgid "--patch is incompatible with all other options"

1122 msgstr "--patch är inkompatibel med alla andra flaggor"

1123

652 -#: builtin/checkout.c:744

1124 +#: builtin/checkout.c:984

1125 +msgid "--detach cannot be used with -b/-B/--orphan"

1126 +msgstr "--detcah kan inte användas med -b/-B/--orphan"

1127 +

1128 +#: builtin/checkout.c:986

1129 +msgid "--detach cannot be used with -t"

1130 +msgstr "--detach kan inte användas med -t"

1131 +

1132 +#: builtin/checkout.c:992

1133 msgid "--track needs a branch name"

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

1135

656 -#: builtin/checkout.c:751

1136 +#: builtin/checkout.c:999

1137 msgid "Missing branch name; try -b"

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

1139

660 -#: builtin/checkout.c:757

1140 +#: builtin/checkout.c:1005

1141 msgid "--orphan and -b|-B are mutually exclusive"

662 -msgstr "--orphan och --b|-B kan inte användas samtidigt"

1142 +msgstr "--orphan och -b|-B kan inte användas samtidigt"

1143

664 -#: builtin/checkout.c:759

1144 +#: builtin/checkout.c:1007

1145 msgid "--orphan cannot be used with -t"

1146 msgstr "--orphan kan inte användas med -t"

1147

668 -#: builtin/checkout.c:769

1148 +#: builtin/checkout.c:1017

1149 msgid "git checkout: -f and -m are incompatible"

1150 msgstr "git checkout: -f och -m är inkompatibla"

1151

672 -#. case (1)

673 -#: builtin/checkout.c:815

674 -#, c-format

675 -msgid "invalid reference: %s"

676 -msgstr "felaktig referens: %s"

677 -

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

679 -#: builtin/checkout.c:852

680 -#, c-format

681 -msgid "reference is not a tree: %s"

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

683 -

684 -#: builtin/checkout.c:878

1152 +#: builtin/checkout.c:1051

1153 msgid "invalid path specification"

1154 msgstr "felaktig sökvägsangivelse"

1155

688 -#: builtin/checkout.c:886

1156 +#: builtin/checkout.c:1059

1157 #, c-format

1158 msgid ""

1159 "git checkout: updating paths is incompatible with switching branches.\n"

@@ -694,11 +1162,15 @@ msgstr ""

1162 "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren.\n"

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

1164

697 -#: builtin/checkout.c:888

1165 +#: builtin/checkout.c:1061

1166 msgid "git checkout: updating paths is incompatible with switching branches."

1167 msgstr "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren."

1168

701 -#: builtin/checkout.c:893

1169 +#: builtin/checkout.c:1066

1170 +msgid "git checkout: --detach does not take a path argument"

1171 +msgstr "git checkout: --detach tar inte en sökväg som argument"

1172 +

1173 +#: builtin/checkout.c:1069

1174 msgid ""

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

1176 "checking out of the index."

@@ -706,23 +1178,13 @@ msgstr ""

1178 "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"

1179 "du checkar ut från indexet."

1180

709 -#: builtin/checkout.c:904

710 -#, c-format

711 -msgid "git checkout: we do not like '%s' as a branch name."

712 -msgstr "git checkout: vi tycker inte om \"%s\" som namn på en gren."

713 -

714 -#: builtin/checkout.c:909

715 -#, c-format

716 -msgid "git checkout: branch %s already exists"

717 -msgstr "git checkout: grenen %s finns redan"

718 -

719 -#: builtin/checkout.c:916

1181 +#: builtin/checkout.c:1088

1182 msgid "Cannot switch branch to a non-commit."

1183 msgstr "Kan inte växla gren på en icke-incheckning."

1184

723 -#: builtin/checkout.c:919

1185 +#: builtin/checkout.c:1091

1186 msgid "--ours/--theirs is incompatible with switching branches."

725 -msgstr "--ours/--theirs är inkompatibla när du växlar gren."

1187 +msgstr "--ours/--theirs är inkompatibla med att byta gren."

1188

1189 #: builtin/clean.c:78

1190 msgid "-x and -X cannot be used together"

@@ -743,145 +1205,158 @@ msgstr ""

1205 "clean.requireForce har standardvärdet true, men varken -n eller -f angavs; "

1206 "vägrar städa"

1207

746 -#: builtin/clean.c:154 builtin/clean.c:175

1208 +#: builtin/clean.c:155 builtin/clean.c:176

1209 #, c-format

1210 msgid "Would remove %s\n"

1211 msgstr "Skulle ta bort %s\n"

1212

751 -#: builtin/clean.c:158 builtin/clean.c:178

1213 +#: builtin/clean.c:159 builtin/clean.c:179

1214 #, c-format

1215 msgid "Removing %s\n"

1216 msgstr "Tar bort %s\n"

1217

756 -#: builtin/clean.c:161 builtin/clean.c:181

1218 +#: builtin/clean.c:162 builtin/clean.c:182

1219 #, c-format

758 -msgid "failed to remove '%s'"

759 -msgstr "kunde inte ta bort \"%s\""

1220 +msgid "failed to remove %s"

1221 +msgstr "misslyckades ta bort %s"

1222

761 -#: builtin/clean.c:165

1223 +#: builtin/clean.c:166

1224 #, c-format

1225 msgid "Would not remove %s\n"

1226 msgstr "Skulle inte ta bort %s\n"

1227

766 -#: builtin/clean.c:167

1228 +#: builtin/clean.c:168

1229 #, c-format

1230 msgid "Not removing %s\n"

1231 msgstr "Tar inte bort %s\n"

1232

771 -#: builtin/clone.c:208

1233 +#: builtin/clone.c:243

1234 #, c-format

1235 msgid "reference repository '%s' is not a local directory."

1236 msgstr "referensarkivet \"%s\" är inte en lokal katalog."

1237

776 -#: builtin/clone.c:235

1238 +#: builtin/clone.c:302

1239 #, c-format

1240 msgid "failed to open '%s'"

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

1242

781 -#: builtin/clone.c:239

1243 +#: builtin/clone.c:306

1244 #, c-format

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

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

1247

786 -#: builtin/clone.c:241 builtin/diff.c:74

1248 +#: builtin/clone.c:308 builtin/diff.c:75

1249 #, c-format

1250 msgid "failed to stat '%s'"

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

1252

791 -#: builtin/clone.c:243

1253 +#: builtin/clone.c:310

1254 #, c-format

1255 msgid "%s exists and is not a directory"

1256 msgstr "%s finns och är ingen katalog"

1257

796 -#: builtin/clone.c:257

1258 +#: builtin/clone.c:324

1259 #, c-format

1260 msgid "failed to stat %s\n"

1261 msgstr "misslyckades ta status på %s\n"

1262

801 -#: builtin/clone.c:267

1263 +#: builtin/clone.c:341

1264 #, c-format

1265 msgid "failed to unlink '%s'"

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

1267

806 -#: builtin/clone.c:272

1268 +#: builtin/clone.c:346

1269 #, c-format

1270 msgid "failed to create link '%s'"

1271 msgstr "misslyckades skapa länken \"%s\""

1272

811 -#: builtin/clone.c:276

1273 +#: builtin/clone.c:350

1274 #, c-format

1275 msgid "failed to copy file to '%s'"

1276 msgstr "misslyckades kopiera filen till \"%s\""

1277

816 -#: builtin/clone.c:305

1278 +#: builtin/clone.c:373

1279 #, c-format

1280 msgid "done.\n"

1281 msgstr "klart.\n"

1282

821 -#: builtin/clone.c:387

822 -msgid "Too many arguments."

823 -msgstr "För många argument."

1283 +#: builtin/clone.c:440

1284 +#, c-format

1285 +msgid "Could not find remote branch %s to clone."

1286 +msgstr "Kunde inte hitta fjärrgrenen %s för att klona."

1287 +

1288 +#: builtin/clone.c:549

1289 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

1290 +msgstr ""

1291 +"HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"

1292 +

1293 +#: builtin/clone.c:639

1294 +msgid "Too many arguments."

1295 +msgstr "För många argument."

1296

825 -#: builtin/clone.c:391

1297 +#: builtin/clone.c:643

1298 msgid "You must specify a repository to clone."

1299 msgstr "Du måste ange ett arkiv att klona."

1300

829 -#: builtin/clone.c:399

1301 +#: builtin/clone.c:654

1302 #, c-format

1303 msgid "--bare and --origin %s options are incompatible."

1304 msgstr "flaggorna --bare och --origin %s är inkompatibla."

1305

834 -#: builtin/clone.c:428

1306 +#: builtin/clone.c:668

1307 +#, c-format

1308 +msgid "repository '%s' does not exist"

1309 +msgstr "arkivet \"%s\" finns inte"

1310 +

1311 +#: builtin/clone.c:673

1312 +msgid "--depth is ignored in local clones; use file:// instead."

1313 +msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"

1314 +

1315 +#: builtin/clone.c:683

1316 #, c-format

1317 msgid "destination path '%s' already exists and is not an empty directory."

1318 msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."

1319

839 -#: builtin/clone.c:438

1320 +#: builtin/clone.c:693

1321 #, c-format

1322 msgid "working tree '%s' already exists."

1323 msgstr "arbetsträdet \"%s\" finns redan."

1324

844 -#: builtin/clone.c:451 builtin/clone.c:465

1325 +#: builtin/clone.c:706 builtin/clone.c:720

1326 #, c-format

1327 msgid "could not create leading directories of '%s'"

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

1329

849 -#: builtin/clone.c:454

1330 +#: builtin/clone.c:709

1331 #, c-format

1332 msgid "could not create work tree dir '%s'."

1333 msgstr "kunde inte skapa arbetskatalogen \"%s\""

1334

854 -#: builtin/clone.c:470

1335 +#: builtin/clone.c:728

1336 #, c-format

856 -msgid "Cloning into bare repository %s\n"

857 -msgstr "Klonar till ett naket arkiv %s\n"

1337 +msgid "Cloning into bare repository '%s'...\n"

1338 +msgstr "Klonar till ett naket arkiv \"%s\"...\n"

1339

859 -#: builtin/clone.c:472

1340 +#: builtin/clone.c:730

1341 #, c-format

861 -msgid "Cloning into %s\n"

862 -msgstr "Klonar till %s\n"

1342 +msgid "Cloning into '%s'...\n"

1343 +msgstr "Klonar till \"%s\"...\n"

1344

864 -#: builtin/clone.c:530

1345 +#: builtin/clone.c:786

1346 #, c-format

1347 msgid "Don't know how to clone %s"

1348 msgstr "Vet inte hur man klonar %s"

1349

869 -#: builtin/clone.c:569

1350 +#: builtin/clone.c:835

1351 #, c-format

871 -msgid "Remote branch %s not found in upstream %s, using HEAD instead"

872 -msgstr ""

873 -"Fjärrgrenen %s hittades inte i uppströmsarkivet %s, använder HEAD istället"

1352 +msgid "Remote branch %s not found in upstream %s"

1353 +msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"

1354

875 -#: builtin/clone.c:579

1355 +#: builtin/clone.c:842

1356 msgid "You appear to have cloned an empty repository."

1357 msgstr "Du verkar ha klonat ett tomt arkiv."

1358

879 -#: builtin/clone.c:621

880 -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

881 -msgstr ""

882 -"HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"

883 -

884 -#: builtin/commit.c:41

1359 +#: builtin/commit.c:42

1360 msgid ""

1361 "Your name and email address were configured automatically based\n"

1362 "on your username and hostname. Please check that they are accurate.\n"

@@ -890,9 +1365,9 @@ msgid ""

1365 " git config --global user.name \"Your Name\"\n"

1366 " git config --global user.email you@example.com\n"

1367 "\n"

893 -"If the identity used for this commit is wrong, you can fix it with:\n"

1368 +"After doing this, you may fix the identity used for this commit with:\n"

1369 "\n"

895 -" git commit --amend --author='Your Name <you@example.com>'\n"

1370 +" git commit --amend --reset-author\n"

1371 msgstr ""

1372 "Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"

1373 "ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"

@@ -901,12 +1376,12 @@ msgstr ""

1376 " git config --global user.name \"Ditt namn\"\n"

1377 " git config --global user.email du@example.com\n"

1378 "\n"

904 -"Om identiteten som användes för incheckningen är felaktig kan du\n"

905 -"rätta den med:\n"

1379 +"När du gjort det kan du rätta identiteten som användes för den här\n"

1380 +"incheckningen med:\n"

1381 "\n"

907 -" git commit --amend --author='Ditt namn <du@example.com>'\n"

1382 +" git commit --amend --reset-author\n"

1383

909 -#: builtin/commit.c:53

1384 +#: builtin/commit.c:54

1385 msgid ""

1386 "You asked to amend the most recent commit, but doing so would make\n"

1387 "it empty. You can repeat your command with --allow-empty, or you can\n"

@@ -916,279 +1391,302 @@ msgstr ""

1391 "blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n"

1392 "så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n"

1393

919 -#: builtin/commit.c:271

1394 +#: builtin/commit.c:59

1395 +msgid ""

1396 +"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

1397 +"If you wish to commit it anyway, use:\n"

1398 +"\n"

1399 +" git commit --allow-empty\n"

1400 +"\n"

1401 +"Otherwise, please use 'git reset'\n"

1402 +msgstr ""

1403 +"Den tidigare \"cherry-pick\":en är nu tom, kanske på grund av en löst\n"

1404 +"konflikt. Om du vill checka in den ändå använder du:\n"

1405 +"\n"

1406 +" git commit --allow-empty\n"

1407 +"\n"

1408 +"Annars använder du \"git reset\"\n"

1409 +

1410 +#: builtin/commit.c:205 builtin/reset.c:33

1411 +msgid "merge"

1412 +msgstr "sammanslagning"

1413 +

1414 +#: builtin/commit.c:208

1415 +msgid "cherry-pick"

1416 +msgstr "cherry-pick"

1417 +

1418 +#: builtin/commit.c:325

1419 msgid "failed to unpack HEAD tree object"

1420 msgstr "misslyckades packa upp HEAD:s trädobjekt"

1421

923 -#: builtin/commit.c:299

1422 +#: builtin/commit.c:367

1423 +msgid "unable to create temporary index"

1424 +msgstr "kunde inte skapa temporär indexfil"

1425 +

1426 +#: builtin/commit.c:373

1427 msgid "interactive add failed"

1428 msgstr "interaktiv tilläggning misslyckades"

1429

927 -#: builtin/commit.c:330 builtin/commit.c:350 builtin/commit.c:396

1430 +#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473

1431 msgid "unable to write new_index file"

1432 msgstr "kunde inte skriva filen new_index"

1433

931 -#: builtin/commit.c:380

932 -msgid "cannot do a partial commit during a merge."

933 -msgstr "kan inte utföra en delvis incheckning under en sammanslagning."

1434 +# %s är antingen "merge" eller "cherry-pick".

1435 +#: builtin/commit.c:457

1436 +#, c-format

1437 +msgid "cannot do a partial commit during a %s."

1438 +msgstr "kan inte utföra en delvis incheckning under en %s"

1439

935 -#: builtin/commit.c:389

1440 +#: builtin/commit.c:466

1441 msgid "cannot read the index"

1442 msgstr "kan inte läsa indexet"

1443

939 -#: builtin/commit.c:409

1444 +#: builtin/commit.c:486

1445 msgid "unable to write temporary index file"

1446 msgstr "kunde inte skriva temporär indexfil"

1447

943 -#: builtin/commit.c:456 builtin/commit.c:1294

944 -msgid "could not parse HEAD commit"

945 -msgstr "kunde inte tolka HEAD:s incheckning"

946 -

947 -#: builtin/commit.c:475 builtin/commit.c:481

1448 +#: builtin/commit.c:550 builtin/commit.c:556

1449 #, c-format

1450 msgid "invalid commit: %s"

1451 msgstr "felaktig incheckning: %s"

1452

952 -#: builtin/commit.c:499

1453 +#: builtin/commit.c:579

1454 msgid "malformed --author parameter"

1455 msgstr "felformad \"--author\"-flagga"

1456

956 -#: builtin/commit.c:573 builtin/shortlog.c:299

1457 +#: builtin/commit.c:635

1458 +#, c-format

1459 +msgid "Malformed ident string: '%s'"

1460 +msgstr "Felaktig indragningssträng: \"%s\""

1461 +

1462 +#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000

1463 +#, c-format

1464 +msgid "could not lookup commit %s"

1465 +msgstr "kunde inte slå upp incheckningen %s"

1466 +

1467 +#: builtin/commit.c:682 builtin/shortlog.c:296

1468 #, c-format

1469 msgid "(reading log message from standard input)\n"

1470 msgstr "(läser loggmeddelande från standard in)\n"

1471

961 -#: builtin/commit.c:575

1472 +#: builtin/commit.c:684

1473 msgid "could not read log from standard input"

1474 msgstr "kunde inte läsa logg från standard in"

1475

965 -#: builtin/commit.c:579

1476 +#: builtin/commit.c:688

1477 #, c-format

1478 msgid "could not read log file '%s'"

1479 msgstr "kunde inte läsa loggfilen \"%s\""

1480

970 -#: builtin/commit.c:585

1481 +#: builtin/commit.c:694

1482 msgid "commit has empty message"

1483 msgstr "incheckningen har ett tomt meddelande"

1484

974 -#: builtin/commit.c:591

1485 +#: builtin/commit.c:710

1486 msgid "could not read MERGE_MSG"

1487 msgstr "kunde inte läsa MERGE_MSG"

1488

978 -#: builtin/commit.c:595

1489 +#: builtin/commit.c:714

1490 msgid "could not read SQUASH_MSG"

1491 msgstr "kunde inte läsa SQUASH_MSG"

1492

982 -#: builtin/commit.c:599

1493 +#: builtin/commit.c:718

1494 #, c-format

1495 msgid "could not read '%s'"

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

1497

987 -#: builtin/commit.c:612

1498 +#: builtin/commit.c:746

1499 #, c-format

1500 msgid "could not open '%s'"

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

1502

992 -#: builtin/commit.c:636

1503 +#: builtin/commit.c:770

1504 msgid "could not write commit template"

1505 msgstr "kunde inte skriva incheckningsmall"

1506

996 -#: builtin/commit.c:650

997 -#, c-format

998 -msgid ""

999 -"#\n"

1000 -"# It looks like you may be committing a MERGE.\n"

1001 -"# If this is not correct, please remove the file\n"

1002 -"#\t%s\n"

1003 -"# and try again.\n"

1004 -"#\n"

1005 -msgstr ""

1006 -"#\n"

1007 -"# Det verkar som du checkar in en SAMMANSLAGNING.\n"

1008 -"# Om det inte stämmer tar du bort filen\n"

1009 -"#\t%s\n"

1010 -"# och försöker igen.\n"

1011 -"#\n"

1012 -

1013 -#: builtin/commit.c:659

1507 +# %s är "merge" eller "cherry-pick"

1508 +#: builtin/commit.c:783

1509 #, c-format

1510 msgid ""

1511 "\n"

1017 -"# Please enter the commit message for your changes."

1512 +"It looks like you may be committing a %s.\n"

1513 +"If this is not correct, please remove the file\n"

1514 +"\t%s\n"

1515 +"and try again.\n"

1516 msgstr ""

1517 "\n"

1020 -"# Ange ett incheckningsmeddelande för dina ändringar."

1518 +"Det verkar som du checkar in en %s.\n"

1519 +"Om det inte stämmer tar du bort filen\n"

1520 +"\t%s\n"

1521 +"och försöker igen.\n"

1522

1022 -#: builtin/commit.c:663

1023 -#, c-format

1523 +#: builtin/commit.c:796

1524 +msgid "Please enter the commit message for your changes."

1525 +msgstr "Ange ett incheckningsmeddelande för dina ändringar."

1526 +

1527 +#: builtin/commit.c:799

1528 msgid ""

1529 " Lines starting\n"

1026 -"# with '#' will be ignored, and an empty message aborts the commit.\n"

1530 +"with '#' will be ignored, and an empty message aborts the commit.\n"

1531 msgstr ""

1532 " Rader som inleds\n"

1029 -"# med \"#\" kommer ignoreras, och ett tomt meddelande avbryter "

1030 -"incheckningen.\n"

1533 +"med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n"

1534

1032 -#: builtin/commit.c:668

1033 -#, c-format

1535 +#: builtin/commit.c:804

1536 msgid ""

1537 " Lines starting\n"

1036 -"# with '#' will be kept; you may remove them yourself if you want to.\n"

1037 -"# An empty message aborts the commit.\n"

1538 +"with '#' will be kept; you may remove them yourself if you want to.\n"

1539 +"An empty message aborts the commit.\n"

1540 msgstr ""

1541 " Rader som inleds\n"

1040 -"# med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n"

1041 -"# Ett tomt meddelande avbryter incheckningen.\n"

1542 +"med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n"

1543 +"Ett tomt meddelande avbryter incheckningen.\n"

1544

1043 -#: builtin/commit.c:680

1545 +#: builtin/commit.c:816

1546 #, c-format

1045 -msgid "%s# Author: %s\n"

1046 -msgstr "%s# Författare: %s\n"

1547 +msgid "%sAuthor: %s"

1548 +msgstr "%sFörfattare: %s"

1549

1048 -#: builtin/commit.c:688

1550 +#: builtin/commit.c:823

1551 #, c-format

1050 -msgid "%s# Committer: %s\n"

1051 -msgstr "%s# Incheckare: %s\n"

1552 +msgid "%sCommitter: %s"

1553 +msgstr "%sIncheckare: %s"

1554

1053 -#: builtin/commit.c:705

1555 +#: builtin/commit.c:843

1556 msgid "Cannot read index"

1557 msgstr "Kan inte läsa indexet"

1558

1057 -#: builtin/commit.c:737

1559 +#: builtin/commit.c:880

1560 msgid "Error building trees"

1561 msgstr "Fel vid byggande av träd"

1562

1061 -#: builtin/commit.c:752 builtin/tag.c:321

1563 +#: builtin/commit.c:895 builtin/tag.c:357

1564 #, c-format

1565 msgid "Please supply the message using either -m or -F option.\n"

1566 msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"

1567

1066 -#: builtin/commit.c:832

1568 +#: builtin/commit.c:975

1569 #, c-format

1570 msgid "No existing author found with '%s'"

1571 msgstr "Hittade ingen befintlig författare med \"%s\""

1572

1071 -#: builtin/commit.c:847 builtin/commit.c:1039

1573 +#: builtin/commit.c:990 builtin/commit.c:1182

1574 #, c-format

1575 msgid "Invalid untracked files mode '%s'"

1576 msgstr "Ogiltigt läge för ospårade filer: \"%s\""

1577

1076 -#: builtin/commit.c:864

1578 +#: builtin/commit.c:1030

1579 msgid "Using both --reset-author and --author does not make sense"

1580 msgstr "Kan inte använda både --reset-author och --author"

1581

1080 -#: builtin/commit.c:878

1582 +#: builtin/commit.c:1041

1583 msgid "You have nothing to amend."

1584 msgstr "Du har inget att utöka."

1585

1084 -#: builtin/commit.c:880

1085 -msgid "You are in the middle of a merge -- cannot amend."

1086 -msgstr "Du är i mitten av en incheckning -- kan inte utöka."

1586 +#: builtin/commit.c:1043

1587 +#, c-format

1588 +msgid "You are in the middle of a %s -- cannot amend."

1589 +msgstr "Du är i mitten av en %s -- kan inte utöka."

1590

1088 -#: builtin/commit.c:889

1089 -msgid "Only one of -c/-C/-F can be used."

1090 -msgstr "Kan endast använda en av -c/-C/-F."

1591 +#: builtin/commit.c:1045

1592 +msgid "Options --squash and --fixup cannot be used together"

1593 +msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"

1594

1092 -#: builtin/commit.c:891

1093 -msgid "Option -m cannot be combined with -c/-C/-F."

1094 -msgstr "Flaggan -m kan inte kombineras med -c/-C/-F."

1595 +#: builtin/commit.c:1055

1596 +msgid "Only one of -c/-C/-F/--fixup can be used."

1597 +msgstr "Endast en av -c/-C/-F/--fixup kan användas."

1598

1096 -#: builtin/commit.c:897

1599 +#: builtin/commit.c:1057

1600 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

1601 +msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."

1602 +

1603 +#: builtin/commit.c:1063

1604 msgid "--reset-author can be used only with -C, -c or --amend."

1605 msgstr "--reset-author kan endast användas med -C, -c eller --amend."

1606

1100 -#: builtin/commit.c:906

1101 -#, c-format

1102 -msgid "could not lookup commit %s"

1103 -msgstr "kunde inte slå upp incheckningen %s"

1104 -

1105 -#: builtin/commit.c:909

1106 -#, c-format

1107 -msgid "could not parse commit %s"

1108 -msgstr "kunde inte tolka incheckningen %s"

1109 -

1110 -#: builtin/commit.c:937

1111 -msgid "Only one of --include/--only/--all/--interactive can be used."

1112 -msgstr "Endast en av --include/--only/--all/--interactive kan användas."

1607 +#: builtin/commit.c:1080

1608 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

1609 +msgstr ""

1610 +"Endast en av --include/--only/--all/--interactive/--patch kan användas."

1611

1114 -#: builtin/commit.c:939

1612 +#: builtin/commit.c:1082

1613 msgid "No paths with --include/--only does not make sense."

1614 msgstr "Du måste ange sökvägar tillsammans med --include/--only."

1615

1118 -#: builtin/commit.c:941

1616 +#: builtin/commit.c:1084

1617 msgid "Clever... amending the last one with dirty index."

1618 msgstr "Smart... utöka den senaste med smutsigt index."

1619

1122 -#: builtin/commit.c:943

1620 +#: builtin/commit.c:1086

1621 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

1124 -msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only-paths..."

1622 +msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."

1623

1126 -#: builtin/commit.c:953

1624 +#: builtin/commit.c:1096 builtin/tag.c:556

1625 #, c-format

1626 msgid "Invalid cleanup mode %s"

1627 msgstr "Felaktigt städningsläge %s"

1628

1131 -#: builtin/commit.c:958

1629 +#: builtin/commit.c:1101

1630 msgid "Paths with -a does not make sense."

1631 msgstr "Kan inte ange sökvägar med -a."

1632

1135 -#: builtin/commit.c:960

1136 -msgid "Paths with --interactive does not make sense."

1137 -msgstr "Kan inte ange sökvägar med --interactive."

1138 -

1139 -#: builtin/commit.c:1142

1633 +#: builtin/commit.c:1280

1634 msgid "couldn't look up newly created commit"

1635 msgstr "kunde inte slå upp en precis skapad incheckning"

1636

1143 -#: builtin/commit.c:1144

1637 +#: builtin/commit.c:1282

1638 msgid "could not parse newly created commit"

1639 msgstr "kunde inte tolka en precis skapad incheckning"

1640

1147 -#: builtin/commit.c:1185

1641 +#: builtin/commit.c:1323

1642 msgid "detached HEAD"

1643 msgstr "frånkopplad HEAD"

1644

1151 -#: builtin/commit.c:1187

1645 +#: builtin/commit.c:1325

1646 msgid " (root-commit)"

1647 msgstr " (rotincheckning)"

1648

1155 -#: builtin/commit.c:1307 builtin/merge.c:461

1649 +#: builtin/commit.c:1415

1650 +msgid "could not parse HEAD commit"

1651 +msgstr "kunde inte tolka HEAD:s incheckning"

1652 +

1653 +#: builtin/commit.c:1452 builtin/merge.c:509

1654 #, c-format

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

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

1657

1160 -#: builtin/commit.c:1312

1658 +#: builtin/commit.c:1459

1659 #, c-format

1660 msgid "Corrupt MERGE_HEAD file (%s)"

1661 msgstr "Trasig MERGE_HEAD-fil (%s)"

1662

1165 -#: builtin/commit.c:1319

1663 +#: builtin/commit.c:1466

1664 msgid "could not read MERGE_MODE"

1665 msgstr "kunde inte läsa MERGE_MODE"

1666

1169 -#: builtin/commit.c:1336

1667 +#: builtin/commit.c:1485

1668 #, c-format

1669 msgid "could not read commit message: %s"

1670 msgstr "kunde inte läsa incheckningsmeddelande: %s"

1671

1174 -#: builtin/commit.c:1350

1672 +#: builtin/commit.c:1499

1673 #, c-format

1674 msgid "Aborting commit due to empty commit message.\n"

1675 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"

1676

1179 -#: builtin/commit.c:1358

1677 +#: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968

1678 msgid "failed to write commit object"

1679 msgstr "kunde inte skriva incheckningsobjekt"

1680

1183 -#: builtin/commit.c:1375

1681 +#: builtin/commit.c:1535

1682 msgid "cannot lock HEAD ref"

1683 msgstr "kunde inte låsa HEAD-referens"

1684

1187 -#: builtin/commit.c:1379

1685 +#: builtin/commit.c:1539

1686 msgid "cannot update HEAD ref"

1687 msgstr "kunde inte uppdatera HEAD-referens"

1688

1191 -#: builtin/commit.c:1388

1689 +#: builtin/commit.c:1550

1690 msgid ""

1691 "Repository has been updated, but unable to write\n"

1692 "new_index file. Check that disk is not full or quota is\n"

@@ -1199,56 +1697,56 @@ msgstr ""

1697 "att kvoten inte har överskridits, och kör sedan\n"

1698 "\"git reset HEAD\" för att återställa."

1699

1202 -#: builtin/describe.c:205

1700 +#: builtin/describe.c:234

1701 #, c-format

1702 msgid "annotated tag %s not available"

1205 -msgstr "den dekorerade taggen %s inte tillgänglig"

1703 +msgstr "den annoterade taggen %s inte tillgänglig"

1704

1207 -#: builtin/describe.c:209

1705 +#: builtin/describe.c:238

1706 #, c-format

1707 msgid "annotated tag %s has no embedded name"

1210 -msgstr "den dekorerade taggen %s har inget inbäddat namn"

1708 +msgstr "den annoterade taggen %s har inget inbäddat namn"

1709

1212 -#: builtin/describe.c:211

1710 +#: builtin/describe.c:240

1711 #, c-format

1712 msgid "tag '%s' is really '%s' here"

1713 msgstr "taggen \"%s\" är i verkligheten \"%s\" här"

1714

1217 -#: builtin/describe.c:238

1715 +#: builtin/describe.c:267

1716 #, c-format

1717 msgid "Not a valid object name %s"

1718 msgstr "Objektnamnet är inte giltigt: %s"

1719

1222 -#: builtin/describe.c:241

1720 +#: builtin/describe.c:270

1721 #, c-format

1722 msgid "%s is not a valid '%s' object"

1723 msgstr "%s är inte ett giltigt \"%s\"-objekt"

1724

1227 -#: builtin/describe.c:258

1725 +#: builtin/describe.c:287

1726 #, c-format

1727 msgid "no tag exactly matches '%s'"

1728 msgstr "ingen tagg motsvarar \"%s\" exakt"

1729

1232 -#: builtin/describe.c:260

1730 +#: builtin/describe.c:289

1731 #, c-format

1732 msgid "searching to describe %s\n"

1733 msgstr "söker för att beskriva %s\n"

1734

1237 -#: builtin/describe.c:295

1735 +#: builtin/describe.c:329

1736 #, c-format

1737 msgid "finished search at %s\n"

1738 msgstr "avslutade sökning på %s\n"

1739

1242 -#: builtin/describe.c:319

1740 +#: builtin/describe.c:353

1741 #, c-format

1742 msgid ""

1743 "No annotated tags can describe '%s'.\n"

1744 "However, there were unannotated tags: try --tags."

1745 msgstr ""

1248 -"Inga dekorerade taggar kan beskriva \"%s\".\n"

1249 -"Det finns dock odekorerade taggar: testa --tags."

1746 +"Inga annoterade taggar kan beskriva \"%s\".\n"

1747 +"Det finns dock oannoterade taggar: testa --tags."

1748

1251 -#: builtin/describe.c:323

1749 +#: builtin/describe.c:357

1750 #, c-format

1751 msgid ""

1752 "No tags can describe '%s'.\n"

@@ -1257,12 +1755,12 @@ msgstr ""

1755 "Inga taggar kan beskriva \"%s\".\n"

1756 "Testa --always, eller skapa några taggar."

1757

1260 -#: builtin/describe.c:344

1758 +#: builtin/describe.c:378

1759 #, c-format

1760 msgid "traversed %lu commits\n"

1761 msgstr "traverserade %lu incheckningar\n"

1762

1265 -#: builtin/describe.c:347

1763 +#: builtin/describe.c:381

1764 #, c-format

1765 msgid ""

1766 "more than %i tags found; listed %i most recent\n"

@@ -1271,121 +1769,118 @@ msgstr ""

1769 "mer än %i taggar hittades; listar de %i senaste\n"

1770 "gav upp sökningen vid %s\n"

1771

1274 -#: builtin/describe.c:398

1772 +#: builtin/describe.c:436

1773 msgid "--long is incompatible with --abbrev=0"

1774 msgstr "--long är inkompatibel med --abbrev=0"

1775

1278 -#: builtin/describe.c:423

1776 +#: builtin/describe.c:462

1777 msgid "No names found, cannot describe anything."

1778 msgstr "Inga namn hittades, kan inte beskriva något."

1779

1282 -#: builtin/describe.c:430

1780 +#: builtin/describe.c:482

1781 msgid "--dirty is incompatible with committishes"

1782 msgstr "--dirty är inkompatibelt med \"committish\"-värden"

1783

1286 -#: builtin/diff.c:76

1784 +#: builtin/diff.c:77

1785 #, c-format

1786 msgid "'%s': not a regular file or symlink"

1787 msgstr "\"%s\": inte en normal fil eller symbolisk länk"

1788

1291 -#: builtin/diff.c:225

1789 +#: builtin/diff.c:220

1790 #, c-format

1791 msgid "invalid option: %s"

1792 msgstr "ogiltig flagga: %s"

1793

1296 -#: builtin/diff.c:302

1794 +#: builtin/diff.c:297

1795 msgid "Not a git repository"

1796 msgstr "Inte ett git-arkiv"

1797

1300 -#: builtin/diff.c:334

1301 -msgid "No HEAD commit to compare with (yet)"

1302 -msgstr "Ingen HEAD-incheckning att jämföra med (ännu)"

1303 -

1304 -#: builtin/diff.c:349

1798 +#: builtin/diff.c:347

1799 #, c-format

1800 msgid "invalid object '%s' given."

1801 msgstr "objektet \"%s\" som angavs är felaktigt."

1802

1309 -#: builtin/diff.c:354

1803 +#: builtin/diff.c:352

1804 #, c-format

1805 msgid "more than %d trees given: '%s'"

1806 msgstr "mer än %d träd angavs: \"%s\""

1807

1314 -#: builtin/diff.c:364

1808 +#: builtin/diff.c:362

1809 #, c-format

1810 msgid "more than two blobs given: '%s'"

1811 msgstr "mer än två blobbar angavs: \"%s\""

1812

1319 -#: builtin/diff.c:372

1813 +#: builtin/diff.c:370

1814 #, c-format

1815 msgid "unhandled object '%s' given."

1816 msgstr "ej hanterat objekt \"%s\" angavs."

1817

1324 -#: builtin/fetch.c:175

1818 +#: builtin/fetch.c:200

1819 msgid "Couldn't find remote ref HEAD"

1820 msgstr "Kunde inte hitta fjärr-referensen HEAD"

1821

1328 -#: builtin/fetch.c:228

1822 +#: builtin/fetch.c:252

1823 #, c-format

1824 msgid "object %s not found"

1825 msgstr "objektet %s hittades inte"

1826

1333 -#: builtin/fetch.c:233

1827 +#: builtin/fetch.c:258

1828 msgid "[up to date]"

1829 msgstr "[àjour]"

1830

1337 -#.

1338 -#. * If this is the head, and it's not okay to update

1339 -#. * the head, and the old value of the head isn't empty...

1340 -#.

1341 -#: builtin/fetch.c:246

1831 +#: builtin/fetch.c:272

1832 #, c-format

1833 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

1834 msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)"

1835

1346 -#: builtin/fetch.c:247 builtin/fetch.c:309

1836 +#: builtin/fetch.c:273 builtin/fetch.c:351

1837 msgid "[rejected]"

1838 msgstr "[refuserad]"

1839

1350 -#: builtin/fetch.c:257

1840 +#: builtin/fetch.c:284

1841 msgid "[tag update]"

1842 msgstr "[uppdaterad tagg]"

1843

1354 -#: builtin/fetch.c:258 builtin/fetch.c:280 builtin/fetch.c:293

1844 +#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331

1845 msgid " (unable to update local ref)"

1846 msgstr " (kunde inte uppdatera lokal ref)"

1847

1358 -#: builtin/fetch.c:270

1848 +#: builtin/fetch.c:298

1849 msgid "[new tag]"

1850 msgstr "[ny tagg]"

1851

1362 -#: builtin/fetch.c:274

1852 +#: builtin/fetch.c:302

1853 msgid "[new branch]"

1854 msgstr "[ny gren]"

1855

1366 -#: builtin/fetch.c:305

1856 +#: builtin/fetch.c:347

1857 msgid "unable to update local ref"

1858 msgstr "kunde inte uppdatera lokal ref"

1859

1370 -#: builtin/fetch.c:305

1860 +#: builtin/fetch.c:347

1861 msgid "forced update"

1862 msgstr "tvingad uppdatering"

1863

1374 -#: builtin/fetch.c:310

1864 +#: builtin/fetch.c:353

1865 msgid "(non-fast-forward)"

1866 msgstr "(ej snabbspolad)"

1867

1378 -#: builtin/fetch.c:328 builtin/fetch.c:651

1868 +#: builtin/fetch.c:384 builtin/fetch.c:676

1869 #, c-format

1870 msgid "cannot open %s: %s\n"

1381 -msgstr "kan inte öppna %s. %s\n"

1871 +msgstr "kan inte öppna %s: %s\n"

1872 +

1873 +#: builtin/fetch.c:393

1874 +#, c-format

1875 +msgid "%s did not send all necessary objects\n"

1876 +msgstr "%s sände inte alla nödvändiga objekt\n"

1877

1383 -#: builtin/fetch.c:406

1878 +#: builtin/fetch.c:479

1879 #, c-format

1880 msgid "From %.*s\n"

1881 msgstr "Från %.*s\n"

1882

1388 -#: builtin/fetch.c:417

1883 +#: builtin/fetch.c:490

1884 #, c-format

1885 msgid ""

1886 "some local refs could not be updated; try running\n"

@@ -1394,69 +1889,55 @@ msgstr ""

1889 "några lokala referenser kunde inte uppdateras; testa att köra\n"

1890 " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"

1891

1397 -#: builtin/fetch.c:467

1398 -msgid "could not run rev-list"

1399 -msgstr "kunde inte köra rev-list"

1400 -

1401 -#: builtin/fetch.c:481

1402 -#, c-format

1403 -msgid "failed write to rev-list: %s"

1404 -msgstr "kunde inte skriva till rev-list: %s"

1405 -

1406 -#: builtin/fetch.c:488

1407 -#, c-format

1408 -msgid "failed to close rev-list's stdin: %s"

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

1410 -

1411 -#: builtin/fetch.c:515

1892 +#: builtin/fetch.c:540

1893 #, c-format

1894 msgid " (%s will become dangling)\n"

1895 msgstr " (%s kommer bli dinglande)\n"

1896

1416 -#: builtin/fetch.c:516

1897 +#: builtin/fetch.c:541

1898 #, c-format

1899 msgid " (%s has become dangling)\n"

1900 msgstr " (%s har blivit dinglande)\n"

1901

1421 -#: builtin/fetch.c:523

1902 +#: builtin/fetch.c:548

1903 msgid "[deleted]"

1904 msgstr "[borttagen]"

1905

1425 -#: builtin/fetch.c:524

1906 +#: builtin/fetch.c:549

1907 msgid "(none)"

1908 msgstr "(ingen)"

1909

1429 -#: builtin/fetch.c:641

1910 +#: builtin/fetch.c:666

1911 #, c-format

1912 msgid "Refusing to fetch into current branch %s of non-bare repository"

1913 msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"

1914

1434 -#: builtin/fetch.c:675

1915 +#: builtin/fetch.c:700

1916 #, c-format

1917 msgid "Don't know how to fetch from %s"

1918 msgstr "Vet inte hur man hämtar från %s"

1919

1439 -#: builtin/fetch.c:729

1920 +#: builtin/fetch.c:777

1921 #, c-format

1922 msgid "Option \"%s\" value \"%s\" is not valid for %s"

1923 msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"

1924

1444 -#: builtin/fetch.c:732

1925 +#: builtin/fetch.c:780

1926 #, c-format

1927 msgid "Option \"%s\" is ignored for %s\n"

1928 msgstr "Flaggan \"%s\" ignoreras för %s\n"

1929

1449 -#: builtin/fetch.c:821

1930 +#: builtin/fetch.c:879

1931 #, c-format

1932 msgid "Fetching %s\n"

1933 msgstr "Hämtar %s\n"

1934

1454 -#: builtin/fetch.c:823

1935 +#: builtin/fetch.c:881

1936 #, c-format

1937 msgid "Could not fetch %s"

1938 msgstr "Kunde inte hämta %s"

1939

1459 -#: builtin/fetch.c:839

1940 +#: builtin/fetch.c:898

1941 msgid ""

1942 "No remote repository specified. Please, specify either a URL or a\n"

1943 "remote name from which new revisions should be fetched."

@@ -1464,24 +1945,24 @@ msgstr ""

1945 "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"

1946 "fjärrarkiv som nya incheckningar skall hämtas från."

1947

1467 -#: builtin/fetch.c:859

1948 +#: builtin/fetch.c:918

1949 msgid "You need to specify a tag name."

1950 msgstr "Du måste ange namnet på en tagg."

1951

1471 -#: builtin/fetch.c:899

1952 +#: builtin/fetch.c:970

1953 msgid "fetch --all does not take a repository argument"

1954 msgstr "fetch --all tar inte namnet på ett arkiv som argument"

1955

1475 -#: builtin/fetch.c:901

1956 +#: builtin/fetch.c:972

1957 msgid "fetch --all does not make sense with refspecs"

1958 msgstr "fetch --all kan inte anges med referensspecifikationer"

1959

1479 -#: builtin/fetch.c:912

1960 +#: builtin/fetch.c:983

1961 #, c-format

1962 msgid "No such remote or remote group: %s"

1963 msgstr "Fjärren eller fjärrgruppen finns inte: %s"

1964

1484 -#: builtin/fetch.c:920

1965 +#: builtin/fetch.c:991

1966 msgid "Fetching a group and specifying refspecs does not make sense"

1967 msgstr "Kan inte hämta från grupp och ange referensspecifikationer"

1968

@@ -1499,206 +1980,213 @@ msgstr "För många flaggor angavs"

1980 msgid "insanely long object directory %.*s"

1981 msgstr "tokigt lång objektkatalog %.*s"

1982

1502 -#: builtin/gc.c:220

1983 +#: builtin/gc.c:223

1984 #, c-format

1985 msgid "Auto packing the repository for optimum performance.\n"

1986 msgstr "Packar arkivet automatiskt för optimal prestanda.\n"

1987

1507 -#: builtin/gc.c:223

1988 +#: builtin/gc.c:226

1989 #, c-format

1990 msgid ""

1991 "Auto packing the repository for optimum performance. You may also\n"

1511 -"run \"git gc\" manually. See \"git help gc\" for more information."

1992 +"run \"git gc\" manually. See \"git help gc\" for more information.\n"

1993 msgstr ""

1994 "Packar arkivet automatiskt för optimal prestanda. Du kan även\n"

1514 -"köra \"git gc\" manuellt. Se \"git help gc\" för mer information."

1995 +"köra \"git gc\" manuellt. Se \"git help gc\" för mer information.\n"

1996

1516 -#: builtin/gc.c:251

1997 +#: builtin/gc.c:256

1998 msgid ""

1999 "There are too many unreachable loose objects; run 'git prune' to remove them."

2000 msgstr ""

2001 "Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort "

2002 "dem."

2003

1523 -#: builtin/grep.c:252

2004 +#: builtin/grep.c:216

2005 #, c-format

2006 msgid "grep: failed to create thread: %s"

2007 msgstr "grep: misslyckades skapa tråd. %s"

2008

1528 -#: builtin/grep.c:457

1529 -#, c-format

1530 -msgid "'%s': unable to read %s"

1531 -msgstr "\"%s\" kunde inte läsa %s"

1532 -

1533 -#: builtin/grep.c:508

1534 -#, c-format

1535 -msgid "'%s': %s"

1536 -msgstr "\"%s\": %s"

1537 -

1538 -#: builtin/grep.c:519

1539 -#, c-format

1540 -msgid "'%s': short read %s"

1541 -msgstr "\"%s\": kort läsning %s"

1542 -

1543 -#: builtin/grep.c:581

2009 +#: builtin/grep.c:402

2010 #, c-format

2011 msgid "Failed to chdir: %s"

2012 msgstr "Kunde inte byta katalog (chdir): %s"

2013

1548 -#: builtin/grep.c:671 builtin/grep.c:697

2014 +#: builtin/grep.c:478 builtin/grep.c:512

2015 #, c-format

2016 msgid "unable to read tree (%s)"

2017 msgstr "kunde inte läsa träd (%s)"

2018

1553 -#: builtin/grep.c:703

2019 +#: builtin/grep.c:526

2020 #, c-format

2021 msgid "unable to grep from object of type %s"

2022 msgstr "Kunde inte \"grep\" från objekt av typen %s"

2023

1558 -#: builtin/grep.c:755

2024 +#: builtin/grep.c:584

2025 #, c-format

2026 msgid "switch `%c' expects a numerical value"

2027 msgstr "flaggan \"%c\" antar ett numeriskt värde"

2028

1563 -#: builtin/grep.c:771

2029 +#: builtin/grep.c:601

2030 #, c-format

2031 msgid "cannot open '%s'"

2032 msgstr "kan inte öppna \"%s\""

2033

1568 -#: builtin/grep.c:1012

2034 +#: builtin/grep.c:888

2035 msgid "no pattern given."

2036 msgstr "inget mönster angavs."

2037

1572 -#: builtin/grep.c:1016

1573 -msgid "cannot mix --fixed-strings and regexp"

1574 -msgstr "kan inte blanda --fixed-strings och reguljära uttryck"

1575 -

1576 -#: builtin/grep.c:1041

2038 +#: builtin/grep.c:902

2039 #, c-format

2040 msgid "bad object %s"

2041 msgstr "felaktigt objekt %s"

2042

1581 -#: builtin/grep.c:1068

2043 +#: builtin/grep.c:943

2044 msgid "--open-files-in-pager only works on the worktree"

2045 msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"

2046

1585 -#: builtin/grep.c:1093

1586 -msgid "--cached cannot be used with --no-index."

1587 -msgstr "--cached kan inte användas med --no-index."

2047 +#: builtin/grep.c:966

2048 +msgid "--cached or --untracked cannot be used with --no-index."

2049 +msgstr "--cached och --untracked kan inte användas med --no-index."

2050 +

2051 +#: builtin/grep.c:971

2052 +msgid "--no-index or --untracked cannot be used with revs."

2053 +msgstr "--no-index och --untracked kan inte användas med revisioner."

2054

1589 -#: builtin/grep.c:1095

1590 -msgid "--no-index cannot be used with revs."

1591 -msgstr "--no-index kan inte användas med revisioner."

2055 +#: builtin/grep.c:974

2056 +msgid "--[no-]exclude-standard cannot be used for tracked contents."

2057 +msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."

2058

1593 -#: builtin/grep.c:1104

2059 +#: builtin/grep.c:982

2060 msgid "both --cached and trees are given."

2061 msgstr "både --cached och träd angavs."

2062

1597 -#: builtin/init-db.c:34

2063 +#: builtin/init-db.c:35

2064 #, c-format

2065 msgid "Could not make %s writable by group"

1600 -msgstr "Kunde inte göra %s skrivbar för grubben"

2066 +msgstr "Kunde inte göra %s skrivbar för gruppen"

2067

1602 -#: builtin/init-db.c:61

2068 +#: builtin/init-db.c:62

2069 #, c-format

2070 msgid "insanely long template name %s"

2071 msgstr "tokigt långt namn på mallen %s"

2072

1607 -#: builtin/init-db.c:66

2073 +#: builtin/init-db.c:67

2074 #, c-format

2075 msgid "cannot stat '%s'"

2076 msgstr "kan inte ta status på \"%s\""

2077

1612 -#: builtin/init-db.c:72

2078 +#: builtin/init-db.c:73

2079 #, c-format

2080 msgid "cannot stat template '%s'"

2081 msgstr "kan inte ta status på mallen \"%s\""

2082

1617 -#: builtin/init-db.c:79

2083 +#: builtin/init-db.c:80

2084 #, c-format

2085 msgid "cannot opendir '%s'"

2086 msgstr "kan inte öppna katalogen (opendir) \"%s\""

2087

1622 -#: builtin/init-db.c:96

2088 +#: builtin/init-db.c:97

2089 #, c-format

2090 msgid "cannot readlink '%s'"

2091 msgstr "kan inte läsa länk (readlink) \"%s\""

2092

1627 -#: builtin/init-db.c:98

2093 +#: builtin/init-db.c:99

2094 #, c-format

2095 msgid "insanely long symlink %s"

2096 msgstr "tokigt lång symbolisk länk %s"

2097

1632 -#: builtin/init-db.c:101

2098 +#: builtin/init-db.c:102

2099 #, c-format

2100 msgid "cannot symlink '%s' '%s'"

2101 msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\""

2102

1637 -#: builtin/init-db.c:105

2103 +#: builtin/init-db.c:106

2104 #, c-format

2105 msgid "cannot copy '%s' to '%s'"

2106 msgstr "kan inte kopiera \"%s\" till \"%s\""

2107

1642 -#: builtin/init-db.c:109

2108 +#: builtin/init-db.c:110

2109 #, c-format

2110 msgid "ignoring template %s"

2111 msgstr "ignorerar mallen %s"

2112

1647 -#: builtin/init-db.c:132

2113 +#: builtin/init-db.c:133

2114 #, c-format

2115 msgid "insanely long template path %s"

2116 msgstr "tokigt lång mallsökväg %s"

2117

1652 -#: builtin/init-db.c:140

2118 +#: builtin/init-db.c:141

2119 #, c-format

2120 msgid "templates not found %s"

2121 msgstr "mallarna hittades inte %s"

2122

1657 -#: builtin/init-db.c:153

2123 +#: builtin/init-db.c:154

2124 #, c-format

2125 msgid "not copying templates of a wrong format version %d from '%s'"

2126 msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\""

2127

1662 -#: builtin/init-db.c:191

2128 +#: builtin/init-db.c:192

2129 #, c-format

2130 msgid "insane git directory %s"

2131 msgstr "tokig git-katalog %s"

2132

1667 -#. TRANSLATORS: The first '%s' is either "Reinitialized

1668 -#. existing" or "Initialized empty", the second " shared" or

1669 -#. "", and the last '%s%s' is the verbatim directory name.

1670 -#: builtin/init-db.c:355

2133 +#: builtin/init-db.c:322 builtin/init-db.c:325

2134 +#, c-format

2135 +msgid "%s already exists"

2136 +msgstr "%s finns redan"

2137 +

2138 +#: builtin/init-db.c:354

2139 +#, c-format

2140 +msgid "unable to handle file type %d"

2141 +msgstr "kan inte hantera filtyp %d"

2142 +

2143 +#: builtin/init-db.c:357

2144 +#, c-format

2145 +msgid "unable to move %s to %s"

2146 +msgstr "kan inte flytta %s till %s"

2147 +

2148 +#: builtin/init-db.c:362

2149 +#, c-format

2150 +msgid "Could not create git link %s"

2151 +msgstr "Kunde inte skapa gitlänk %s"

2152 +

2153 +#.

2154 +#. * TRANSLATORS: The first '%s' is either "Reinitialized

2155 +#. * existing" or "Initialized empty", the second " shared" or

2156 +#. * "", and the last '%s%s' is the verbatim directory name.

2157 +#.

2158 +#: builtin/init-db.c:419

2159 #, c-format

2160 msgid "%s%s Git repository in %s%s\n"

2161 msgstr "%s%s Git-arkiv i %s%s\n"

2162

1675 -#: builtin/init-db.c:356

2163 +#: builtin/init-db.c:420

2164 msgid "Reinitialized existing"

2165 msgstr "Ominitierade befintligt"

2166

1679 -#: builtin/init-db.c:356

2167 +#: builtin/init-db.c:420

2168 msgid "Initialized empty"

2169 msgstr "Initierade tomt"

2170

1683 -#: builtin/init-db.c:357

2171 +#: builtin/init-db.c:421

2172 msgid " shared"

2173 msgstr " delat"

2174

1687 -#: builtin/init-db.c:376

2175 +#: builtin/init-db.c:440

2176 msgid "cannot tell cwd"

2177 msgstr "kan inte läsa aktuell katalog (cwd)"

2178

1691 -#: builtin/init-db.c:450 builtin/init-db.c:457

2179 +#: builtin/init-db.c:521 builtin/init-db.c:528

2180 #, c-format

2181 msgid "cannot mkdir %s"

2182 msgstr "kan inte skapa katalogen (mkdir) %s"

2183

1696 -#: builtin/init-db.c:461

2184 +#: builtin/init-db.c:532

2185 #, c-format

2186 msgid "cannot chdir to %s"

2187 msgstr "kan inte byta katalog (chdir) till %s"

2188

1701 -#: builtin/init-db.c:483

2189 +#: builtin/init-db.c:554

2190 #, c-format

2191 msgid ""

2192 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

@@ -1707,255 +2195,285 @@ msgstr ""

2195 "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"

2196 "dir=<katalog>)"

2197

1710 -#: builtin/init-db.c:509

2198 +#: builtin/init-db.c:578

2199 msgid "Cannot access current working directory"

2200 msgstr "Kan inte komma åt aktuell arbetskatalog"

2201

1714 -#: builtin/init-db.c:512

2202 +#: builtin/init-db.c:585

2203 #, c-format

2204 msgid "Cannot access work tree '%s'"

2205 msgstr "Kan inte komma åt arbetskatalogen \"%s\""

2206

1719 -#: builtin/log.c:104

1720 -#, c-format

1721 -msgid "invalid --decorate option: %s"

1722 -msgstr "felaktigt värde till --decorate: %s"

1723 -

1724 -#: builtin/log.c:113 builtin/log.c:1138 builtin/shortlog.c:287

1725 -#, c-format

1726 -msgid "unrecognized argument: %s"

1727 -msgstr "okänt argument: %s"

1728 -

1729 -#: builtin/log.c:156

2207 +#: builtin/log.c:187

2208 #, c-format

2209 msgid "Final output: %d %s\n"

2210 msgstr "Slututdata: %d %s\n"

2211

1734 -#: builtin/log.c:255 builtin/log.c:674 builtin/log.c:1222 builtin/log.c:1428

1735 -#: builtin/merge.c:310 builtin/revert.c:556 builtin/shortlog.c:184

1736 -msgid "revision walk setup failed"

1737 -msgstr "misslyckades skapa revisionstraversering"

1738 -

1739 -#: builtin/log.c:347 builtin/log.c:434

2212 +#: builtin/log.c:395 builtin/log.c:483

2213 #, c-format

2214 msgid "Could not read object %s"

2215 msgstr "Kunde inte läsa objektet %s"

2216

1744 -#: builtin/log.c:458

2217 +#: builtin/log.c:507

2218 #, c-format

2219 msgid "Unknown type: %d"

2220 msgstr "Okänd typ: %d"

2221

1749 -#: builtin/log.c:558

2222 +#: builtin/log.c:596

2223 msgid "format.headers without value"

2224 msgstr "format.headers utan värde"

2225

1753 -#: builtin/log.c:630

2226 +#: builtin/log.c:669

2227 msgid "name of output directory is too long"

1755 -msgstr "namn på utdatakatalogen är för lång"

2228 +msgstr "namnet på utdatakatalogen är för långt"

2229

1757 -#: builtin/log.c:641

2230 +#: builtin/log.c:680

2231 #, c-format

2232 msgid "Cannot open patch file %s"

2233 msgstr "Kan inte öppna patchfilen %s"

2234

1762 -#: builtin/log.c:655

2235 +#: builtin/log.c:694

2236 msgid "Need exactly one range."

2237 msgstr "Behöver precis ett intervall."

2238

1766 -#: builtin/log.c:663

2239 +#: builtin/log.c:702

2240 msgid "Not a range."

2241 msgstr "Inte ett intervall."

2242

1770 -#: builtin/log.c:700

2243 +#: builtin/log.c:739

2244 msgid "Could not extract email from committer identity."

2245 msgstr "Kunde inte extrahera e-postadress från incheckarens identitet."

2246

1774 -#: builtin/log.c:732

2247 +#: builtin/log.c:785

2248 msgid "Cover letter needs email format"

2249 msgstr "Omslagsbrevet behöver e-postformat"

2250

1778 -#: builtin/log.c:825

2251 +#: builtin/log.c:879

2252 #, c-format

2253 msgid "insane in-reply-to: %s"

2254 msgstr "tokigt in-reply-to: %s"

2255

1783 -#: builtin/log.c:898

2256 +#: builtin/log.c:952

2257 msgid "Two output directories?"

2258 msgstr "Två utdatakataloger?"

2259

1787 -#: builtin/log.c:1087

2260 +#: builtin/log.c:1173

2261 #, c-format

2262 msgid "bogus committer info %s"

2263 msgstr "felaktig incheckarinformation %s"

2264

1792 -#: builtin/log.c:1132

2265 +#: builtin/log.c:1218

2266 msgid "-n and -k are mutually exclusive."

2267 msgstr "-n och -k kan inte användas samtidigt."

2268

1796 -#: builtin/log.c:1134

2269 +#: builtin/log.c:1220

2270 msgid "--subject-prefix and -k are mutually exclusive."

2271 msgstr "--subject-prefix och -k kan inte användas samtidigt."

2272

1800 -#: builtin/log.c:1141

2273 +#: builtin/log.c:1225 builtin/shortlog.c:284

2274 +#, c-format

2275 +msgid "unrecognized argument: %s"

2276 +msgstr "okänt argument: %s"

2277 +

2278 +#: builtin/log.c:1228

2279 msgid "--name-only does not make sense"

2280 msgstr "kan inte använda --name-only"

2281

1804 -#: builtin/log.c:1143

2282 +#: builtin/log.c:1230

2283 msgid "--name-status does not make sense"

2284 msgstr "kan inte använda --name-status"

2285

1808 -#: builtin/log.c:1145

2286 +#: builtin/log.c:1232

2287 msgid "--check does not make sense"

2288 msgstr "kan inte använda --check"

2289

1812 -#: builtin/log.c:1166

2290 +#: builtin/log.c:1255

2291 msgid "standard output, or directory, which one?"

2292 msgstr "standard ut, eller katalog, vilken skall det vara?"

2293

1816 -#: builtin/log.c:1168

2294 +#: builtin/log.c:1257

2295 #, c-format

2296 msgid "Could not create directory '%s'"

2297 msgstr "Kunde inte skapa katalogen \"%s\""

2298

1821 -#: builtin/log.c:1307

2299 +#: builtin/log.c:1410

2300 msgid "Failed to create output files"

2301 msgstr "Misslyckades skapa utdatafiler"

2302

1825 -#: builtin/log.c:1394

2303 +#: builtin/log.c:1514

2304 #, c-format

2305 msgid ""

2306 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

2307 msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"

2308

1831 -#: builtin/log.c:1410 builtin/log.c:1412 builtin/log.c:1424

2309 +#: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544

2310 #, c-format

2311 msgid "Unknown commit %s"

2312 msgstr "Okänd incheckning %s"

2313

1836 -#: builtin/merge.c:82

2314 +#: builtin/merge.c:91

2315 msgid "switch `m' requires a value"

2316 msgstr "flaggan \"m\" behöver ett värde"

2317

1840 -#: builtin/merge.c:119

2318 +#: builtin/merge.c:128

2319 #, c-format

2320 msgid "Could not find merge strategy '%s'.\n"

2321 msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"

2322

1845 -#: builtin/merge.c:120

2323 +#: builtin/merge.c:129

2324 #, c-format

2325 msgid "Available strategies are:"

2326 msgstr "Tillgängliga strategier är:"

2327

1850 -#: builtin/merge.c:125

2328 +#: builtin/merge.c:134

2329 #, c-format

2330 msgid "Available custom strategies are:"

2331 msgstr "Tillgängliga skräddarsydda strategier är:"

2332

1855 -#: builtin/merge.c:223

2333 +#: builtin/merge.c:241

2334 msgid "could not run stash."

2335 msgstr "kunde köra stash."

2336

1859 -#: builtin/merge.c:228

2337 +#: builtin/merge.c:246

2338 msgid "stash failed"

2339 msgstr "stash misslyckades"

2340

1863 -#: builtin/merge.c:233

2341 +#: builtin/merge.c:251

2342 #, c-format

2343 msgid "not a valid object: %s"

2344 msgstr "inte ett giltigt objekt: %s"

2345

1868 -#: builtin/merge.c:250

2346 +#: builtin/merge.c:270 builtin/merge.c:287

2347 msgid "read-tree failed"

2348 msgstr "read-tree misslyckades"

2349

1872 -#: builtin/merge.c:279

2350 +#: builtin/merge.c:317

2351 msgid " (nothing to squash)"

2352 msgstr " (inget att platta till)"

2353

1876 -#: builtin/merge.c:292

2354 +#: builtin/merge.c:330

2355 #, c-format

2356 msgid "Squash commit -- not updating HEAD\n"

2357 msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"

2358

1881 -#: builtin/merge.c:295 builtin/merge.c:1290 builtin/merge.c:1299

1882 -#: builtin/merge.c:1309

1883 -#, c-format

1884 -msgid "Could not write to '%s'"

1885 -msgstr "Kunde inte skriva till \"%s\""

1886 -

1887 -#: builtin/merge.c:323

2359 +#: builtin/merge.c:362

2360 msgid "Writing SQUASH_MSG"

2361 msgstr "Skriver SQUASH_MSG"

2362

1891 -#: builtin/merge.c:325

2363 +#: builtin/merge.c:364

2364 msgid "Finishing SQUASH_MSG"

2365 msgstr "Avslutar SQUASH_MSG"

2366

1895 -#: builtin/merge.c:345

2367 +#: builtin/merge.c:386

2368 #, c-format

2369 msgid "No merge message -- not updating HEAD\n"

2370 msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"

2371

1900 -#: builtin/merge.c:396

2372 +#: builtin/merge.c:437

2373 #, c-format

2374 msgid "'%s' does not point to a commit"

2375 msgstr "\"%s\" verkar inte peka på en incheckning"

2376

1905 -#: builtin/merge.c:491

2377 +#: builtin/merge.c:536

2378 #, c-format

2379 msgid "Bad branch.%s.mergeoptions string: %s"

2380 msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"

2381

1910 -#: builtin/merge.c:553

2382 +#: builtin/merge.c:629

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

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

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

2385

1914 -#: builtin/merge.c:594

2386 +#: builtin/merge.c:679

2387 msgid "failed to read the cache"

2388 msgstr "misslyckads läsa cachen"

2389

1918 -#: builtin/merge.c:611

2390 +#: builtin/merge.c:696

2391 msgid "Unable to write index."

2392 msgstr "Kunde inte skriva indexet."

2393

1922 -#: builtin/merge.c:624

2394 +#: builtin/merge.c:709

2395 msgid "Not handling anything other than two heads merge."

2396 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."

2397

1926 -#: builtin/merge.c:651

2398 +#: builtin/merge.c:723

2399 #, c-format

2400 msgid "Unknown option for merge-recursive: -X%s"

2401 msgstr "Felaktig flagga för merge-recursive: -X%s"

2402

1931 -#: builtin/merge.c:666

2403 +#: builtin/merge.c:737

2404 #, c-format

2405 msgid "unable to write %s"

2406 msgstr "kunde inte skriva %s"

2407

1936 -#: builtin/merge.c:791

2408 +#: builtin/merge.c:876

2409 #, c-format

1938 -msgid "Wonderful.\n"

1939 -msgstr "Underbart.\n"

2410 +msgid "Could not read from '%s'"

2411 +msgstr "Kunde inte läsa från \"%s\""

2412

1941 -#: builtin/merge.c:840 builtin/merge.c:1287 builtin/merge.c:1295

1942 -#: builtin/merge.c:1303

2413 +#: builtin/merge.c:885

2414 #, c-format

1944 -msgid "Could not open '%s' for writing"

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

2415 +msgid "Not committing merge; use 'git commit' to complete the merge.\n"

2416 +msgstr ""

2417 +"Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "

2418 +"den.\n"

2419 +

2420 +#: builtin/merge.c:891

2421 +msgid ""

2422 +"Please enter a commit message to explain why this merge is necessary,\n"

2423 +"especially if it merges an updated upstream into a topic branch.\n"

2424 +"\n"

2425 +"Lines starting with '#' will be ignored, and an empty message aborts\n"

2426 +"the commit.\n"

2427 +msgstr ""

2428 +"Ange ett incheckningsmeddelande för att förklara varför sammanslagningen\n"

2429 +"är nödvändig, speciellt om den slår in en uppdaterad uppström i en\n"

2430 +"temagren.\n"

2431 +"\n"

2432 +"Rader som inleds med \"#\" kommer ignoreras, och ett tomt meddelande\n"

2433 +"avbryter incheckningen.\n"

2434 +

2435 +#: builtin/merge.c:915

2436 +msgid "Empty commit message."

2437 +msgstr "Tomt incheckningsmeddelande."

2438 +

2439 +#: builtin/merge.c:927

2440 +#, c-format

2441 +msgid "Wonderful.\n"

2442 +msgstr "Underbart.\n"

2443

1947 -#: builtin/merge.c:856

2444 +#: builtin/merge.c:1000

2445 #, c-format

2446 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

2447 msgstr ""

2448 "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"

2449

1953 -#: builtin/merge.c:871

2450 +#: builtin/merge.c:1016

2451 #, c-format

2452 msgid "'%s' is not a commit"

2453 msgstr "\"%s\" är inte en incheckning"

2454

1958 -#: builtin/merge.c:921 git-pull.sh:31

2455 +#: builtin/merge.c:1057

2456 +msgid "No current branch."

2457 +msgstr "Inte på någon gren."

2458 +

2459 +#: builtin/merge.c:1059

2460 +msgid "No remote for the current branch."

2461 +msgstr "Ingen fjärr för aktuell gren."

2462 +

2463 +#: builtin/merge.c:1061

2464 +msgid "No default upstream defined for the current branch."

2465 +msgstr "Ingen standarduppström angiven för aktuell gren."

2466 +

2467 +#: builtin/merge.c:1066

2468 +#, c-format

2469 +msgid "No remote tracking branch for %s from %s"

2470 +msgstr "Ingen fjärrspårande gren för %s från %s"

2471 +

2472 +#: builtin/merge.c:1188

2473 +msgid "There is no merge to abort (MERGE_HEAD missing)."

2474 +msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)."

2475 +

2476 +#: builtin/merge.c:1204 git-pull.sh:31

2477 msgid ""

2478 "You have not concluded your merge (MERGE_HEAD exists).\n"

2479 "Please, commit your changes before you can merge."

@@ -1963,280 +2481,271 @@ msgstr ""

2481 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"

2482 "Checka in dina ändringar innan du kan slå ihop."

2483

1966 -#: builtin/merge.c:924 git-pull.sh:34

2484 +#: builtin/merge.c:1207 git-pull.sh:34

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

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

2487

1970 -#: builtin/merge.c:951

2488 +#: builtin/merge.c:1211

2489 +msgid ""

2490 +"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

2491 +"Please, commit your changes before you can merge."

2492 +msgstr ""

2493 +"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"

2494 +"Checka in dina ändringar innan du kan slå ihop."

2495 +

2496 +#: builtin/merge.c:1214

2497 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

2498 +msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."

2499 +

2500 +#: builtin/merge.c:1223

2501 msgid "You cannot combine --squash with --no-ff."

2502 msgstr "Du kan inte kombinera --squash med --no-ff."

2503

1974 -#: builtin/merge.c:956

2504 +#: builtin/merge.c:1228

2505 msgid "You cannot combine --no-ff with --ff-only."

2506 msgstr "Du kan inte kombinera --no-ff med --ff-only."

2507

1978 -#: builtin/merge.c:984

2508 +#: builtin/merge.c:1235

2509 +msgid "No commit specified and merge.defaultToUpstream not set."

2510 +msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."

2511 +

2512 +#: builtin/merge.c:1266

2513 msgid "Can merge only exactly one commit into empty head"

2514 msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."

2515

1982 -#: builtin/merge.c:987

2516 +#: builtin/merge.c:1269

2517 msgid "Squash commit into empty head not supported yet"

2518 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"

2519

1986 -#: builtin/merge.c:989

2520 +#: builtin/merge.c:1271

2521 msgid "Non-fast-forward commit does not make sense into an empty head"

2522 msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"

2523

1990 -#: builtin/merge.c:993 builtin/merge.c:1041

2524 +#: builtin/merge.c:1275 builtin/merge.c:1319

2525 #, c-format

2526 msgid "%s - not something we can merge"

2527 msgstr "%s - inte något vi kan slå ihop"

2528

1995 -#: builtin/merge.c:1099

2529 +#: builtin/merge.c:1385

2530 #, c-format

2531 msgid "Updating %s..%s\n"

2532 msgstr "Uppdaterar %s..%s\n"

2533

2000 -#: builtin/merge.c:1133

2534 +#: builtin/merge.c:1423

2535 #, c-format

2536 msgid "Trying really trivial in-index merge...\n"

2537 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"

2538

2005 -#: builtin/merge.c:1137

2539 +#: builtin/merge.c:1430

2540 #, c-format

2541 msgid "Nope.\n"

2542 msgstr "Nej.\n"

2543

2010 -#: builtin/merge.c:1170

2544 +#: builtin/merge.c:1462

2545 msgid "Not possible to fast-forward, aborting."

2546 msgstr "Kan inte snabbspola, avbryter."

2547

2014 -#: builtin/merge.c:1196 builtin/merge.c:1269

2548 +#: builtin/merge.c:1485 builtin/merge.c:1562

2549 #, c-format

2550 msgid "Rewinding the tree to pristine...\n"

2017 -msgstr "Återspolar trädet till ofördärvat...\n"

2551 +msgstr "Återspolar trädet till orört...\n"

2552

2019 -#: builtin/merge.c:1200

2553 +#: builtin/merge.c:1489

2554 #, c-format

2555 msgid "Trying merge strategy %s...\n"

2556 msgstr "Försöker sammanslagninsstrategin %s...\n"

2557

2024 -#: builtin/merge.c:1261

2558 +#: builtin/merge.c:1553

2559 #, c-format

2560 msgid "No merge strategy handled the merge.\n"

2561 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"

2562

2029 -#: builtin/merge.c:1263

2563 +#: builtin/merge.c:1555

2564 #, c-format

2565 msgid "Merge with strategy %s failed.\n"

2566 msgstr "Sammanslaning med strategin %s misslyckades.\n"

2567

2034 -#: builtin/merge.c:1271

2568 +#: builtin/merge.c:1564

2569 #, c-format

2570 msgid "Using the %s to prepare resolving by hand.\n"

2571 msgstr "Använder %s för att förbereda lösning för hand.\n"

2572

2039 -#: builtin/merge.c:1314

2573 +#: builtin/merge.c:1575

2574 #, c-format

2575 msgid "Automatic merge went well; stopped before committing as requested\n"

2576 msgstr ""

2577 "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n"

2578

2045 -#: builtin/mv.c:103

2579 +#: builtin/mv.c:108

2580 #, c-format

2581 msgid "Checking rename of '%s' to '%s'\n"

2582 msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"

2583

2050 -#: builtin/mv.c:107

2584 +#: builtin/mv.c:112

2585 msgid "bad source"

2586 msgstr "felaktig källa"

2587

2054 -#: builtin/mv.c:110

2588 +#: builtin/mv.c:115

2589 msgid "can not move directory into itself"

2590 msgstr "kan inte flytta katalog till sig själv"

2591

2058 -#: builtin/mv.c:113

2592 +#: builtin/mv.c:118

2593 msgid "cannot move directory over file"

2594 msgstr "kan inte flytta katalog över fil"

2595

2062 -#: builtin/mv.c:123

2596 +#: builtin/mv.c:128

2597 #, c-format

2598 msgid "Huh? %.*s is in index?"

2599 msgstr "Vad? %.*s är i indexet?"

2600

2067 -#: builtin/mv.c:135

2601 +#: builtin/mv.c:140

2602 msgid "source directory is empty"

2603 msgstr "källkatalogen är tom"

2604

2071 -#: builtin/mv.c:166

2605 +#: builtin/mv.c:171

2606 msgid "not under version control"

2607 msgstr "inte versionshanterad"

2608

2075 -#: builtin/mv.c:168

2609 +#: builtin/mv.c:173

2610 msgid "destination exists"

2611 msgstr "destinationen finns"

2612

2079 -#: builtin/mv.c:175

2613 +#: builtin/mv.c:181

2614 #, c-format

2081 -msgid "%s; will overwrite!"

2082 -msgstr "%s; kommer skriva över!"

2615 +msgid "overwriting '%s'"

2616 +msgstr "skriver över \"%s\""

2617

2084 -#: builtin/mv.c:178

2618 +#: builtin/mv.c:184

2619 msgid "Cannot overwrite"

2620 msgstr "Kan inte skriva över"

2621

2088 -#: builtin/mv.c:181

2622 +#: builtin/mv.c:187

2623 msgid "multiple sources for the same target"

2624 msgstr "flera källor för samma mål"

2625

2092 -#: builtin/mv.c:196

2626 +#: builtin/mv.c:202

2627 #, c-format

2628 msgid "%s, source=%s, destination=%s"

2629 msgstr "%s, källa=%s, mål=%s"

2630

2097 -#: builtin/mv.c:206

2631 +#: builtin/mv.c:212

2632 #, c-format

2633 msgid "Renaming %s to %s\n"

2634 msgstr "Byter namn på %s till %s\n"

2635

2102 -#: builtin/mv.c:209

2636 +#: builtin/mv.c:215

2637 #, c-format

2638 msgid "renaming '%s' failed"

2639 msgstr "misslyckades byta namn på \"%s\""

2640

2107 -#: builtin/notes.c:122

2641 +#: builtin/notes.c:139

2642 #, c-format

2643 msgid "unable to start 'show' for object '%s'"

2110 -msgstr "kunde int estarta \"show\" för objektet \"%s\""

2644 +msgstr "kunde inte starta \"show\" för objektet \"%s\""

2645

2112 -#: builtin/notes.c:128

2646 +#: builtin/notes.c:145

2647 msgid "can't fdopen 'show' output fd"

2648 msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag"

2649

2116 -#: builtin/notes.c:138

2650 +#: builtin/notes.c:155

2651 #, c-format

2652 msgid "failed to close pipe to 'show' for object '%s'"

2653 msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\""

2654

2121 -#: builtin/notes.c:141

2655 +#: builtin/notes.c:158

2656 #, c-format

2657 msgid "failed to finish 'show' for object '%s'"

2658 msgstr "kunde inte avsluta \"show\" för objektet \"%s\""

2659

2126 -#: builtin/notes.c:158 builtin/tag.c:311

2660 +#: builtin/notes.c:175 builtin/tag.c:343

2661 #, c-format

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

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

2664

2131 -#: builtin/notes.c:172

2665 +#: builtin/notes.c:189

2666 msgid "Please supply the note contents using either -m or -F option"

2667 msgstr "Ange innehåll för anteckningen med antingen -m eller -F"

2668

2135 -#: builtin/notes.c:193 builtin/notes.c:797

2669 +#: builtin/notes.c:210 builtin/notes.c:973

2670 #, c-format

2671 msgid "Removing note for object %s\n"

2672 msgstr "Tar bort anteckning för objektet %s\n"

2673

2140 -#: builtin/notes.c:198

2674 +#: builtin/notes.c:215

2675 msgid "unable to write note object"

2676 msgstr "kunde inte skriva anteckningsobjekt"

2677

2144 -#: builtin/notes.c:200

2678 +#: builtin/notes.c:217

2679 #, c-format

2680 msgid "The note contents has been left in %s"

2681 msgstr "Anteckningens innehåll har lämnats kvar i %s"

2682

2149 -#: builtin/notes.c:234 builtin/tag.c:445

2683 +#: builtin/notes.c:251 builtin/tag.c:521

2684 #, c-format

2685 msgid "cannot read '%s'"

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

2687

2154 -#: builtin/notes.c:236 builtin/tag.c:448

2688 +#: builtin/notes.c:253 builtin/tag.c:524

2689 #, c-format

2690 msgid "could not open or read '%s'"

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

2692

2159 -#: builtin/notes.c:255 builtin/notes.c:444 builtin/notes.c:446

2160 -#: builtin/notes.c:508 builtin/notes.c:560 builtin/notes.c:631

2161 -#: builtin/notes.c:636 builtin/notes.c:710 builtin/notes.c:752

2162 -#: builtin/notes.c:789 builtin/reset.c:303 builtin/tag.c:461

2693 +#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447

2694 +#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644

2695 +#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766

2696 +#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537

2697 #, c-format

2698 msgid "Failed to resolve '%s' as a valid ref."

2699 msgstr "Kunde inte slå upp \"%s\" som en giltig referens."

2700

2167 -#: builtin/notes.c:258

2701 +#: builtin/notes.c:275

2702 #, c-format

2703 msgid "Failed to read object '%s'."

2704 msgstr "Kunde inte läsa objektet \"%s\"."

2705

2172 -#: builtin/notes.c:283

2706 +#: builtin/notes.c:299

2707 msgid "Cannot commit uninitialized/unreferenced notes tree"

2708 msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"

2709

2176 -#: builtin/notes.c:295

2177 -msgid "Failed to write current notes tree to database"

2178 -msgstr "Kunde inte skriva aktuellt anteckningsträd till databasen"

2179 -

2180 -#: builtin/notes.c:307

2181 -msgid "Failed to commit notes tree to database"

2182 -msgstr "Kunde inte checka in anteckningsträd i databasen"

2183 -

2184 -#: builtin/notes.c:339

2710 +#: builtin/notes.c:340

2711 #, c-format

2712 msgid "Bad notes.rewriteMode value: '%s'"

2713 msgstr "Felaktigt värde för notes.rewriteMode: '%s'"

2714

2189 -#: builtin/notes.c:349

2715 +#: builtin/notes.c:350

2716 #, c-format

2717 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

2718 msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"

2719

2720 #. TRANSLATORS: The first %s is the name of the

2721 #. environment variable, the second %s is its value

2196 -#: builtin/notes.c:376

2722 +#: builtin/notes.c:377

2723 #, c-format

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

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

2726

2201 -#: builtin/notes.c:440

2727 +#: builtin/notes.c:441

2728 #, c-format

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

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

2731

2206 -#: builtin/notes.c:455

2732 +#: builtin/notes.c:456

2733 #, c-format

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

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

2736

2211 -# FIXME: Untranslatable!

2212 -#

2213 -#. TRANSLATORS: The first %s is one of "git notes ACTION",

2214 -#. e.g. "add", "copy", "append" etc.

2215 -#: builtin/notes.c:481

2216 -#, c-format

2217 -msgid "Refusing to %s notes in %s (outside of refs/notes/)"

2218 -msgstr "Vägrar %s anteckningar i %s (utanför refs/notes/)"

2219 -

2220 -#: builtin/notes.c:501 builtin/notes.c:553 builtin/notes.c:614

2221 -#: builtin/notes.c:626 builtin/notes.c:698 builtin/notes.c:745

2222 -#: builtin/notes.c:782 builtin/notes.c:821

2737 +#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627

2738 +#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759

2739 +#: builtin/notes.c:1033

2740 msgid "too many parameters"

2741 msgstr "för många parametrar"

2742

2226 -#: builtin/notes.c:505

2227 -msgid "list"

2228 -msgstr "list"

2229 -

2230 -#: builtin/notes.c:514 builtin/notes.c:758

2743 +#: builtin/notes.c:513 builtin/notes.c:772

2744 #, c-format

2745 msgid "No note found for object %s."

2746 msgstr "Inga anteckningar hittades för objektet %s."

2747

2235 -#: builtin/notes.c:562

2236 -msgid "add"

2237 -msgstr "add"

2238 -

2239 -#: builtin/notes.c:567

2748 +#: builtin/notes.c:580

2749 #, c-format

2750 msgid ""

2751 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "

@@ -2245,20 +2754,16 @@ msgstr ""

2754 "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för "

2755 "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar"

2756

2248 -#: builtin/notes.c:572 builtin/notes.c:649

2757 +#: builtin/notes.c:585 builtin/notes.c:662

2758 #, c-format

2759 msgid "Overwriting existing notes for object %s\n"

2760 msgstr "Skriver över befintliga anteckningar för objektet %s\n"

2761

2253 -#: builtin/notes.c:622

2762 +#: builtin/notes.c:635

2763 msgid "too few parameters"

2764 msgstr "för få parametrar"

2765

2257 -#: builtin/notes.c:638

2258 -msgid "copy"

2259 -msgstr "copy"

2260 -

2261 -#: builtin/notes.c:643

2766 +#: builtin/notes.c:656

2767 #, c-format

2768 msgid ""

2769 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "

@@ -2267,12 +2772,12 @@ msgstr ""

2772 "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "

2773 "%s. Använd \"-f\" för att skriva över befintliga anteckningar"

2774

2270 -#: builtin/notes.c:655

2775 +#: builtin/notes.c:668

2776 #, c-format

2777 msgid "Missing notes on source object %s. Cannot copy."

2778 msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera."

2779

2275 -#: builtin/notes.c:703

2780 +#: builtin/notes.c:717

2781 #, c-format

2782 msgid ""

2783 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"

@@ -2281,68 +2786,95 @@ msgstr ""

2786 "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"

2787 "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"

2788

2284 -#: builtin/notes.c:754

2285 -msgid "show"

2286 -msgstr "show"

2287 -

2288 -#: builtin/notes.c:791

2289 -msgid "remove"

2290 -msgstr "remove"

2291 -

2292 -#: builtin/notes.c:795

2789 +#: builtin/notes.c:971

2790 #, c-format

2791 msgid "Object %s has no note\n"

2792 msgstr "Objektet %s har ingen anteckning\n"

2793

2297 -#: builtin/notes.c:825

2298 -msgid "prune"

2299 -msgstr "prune"

2300 -

2301 -#: builtin/notes.c:877

2794 +#: builtin/notes.c:1103

2795 #, c-format

2796 msgid "Unknown subcommand: %s"

2797 msgstr "Okänt underkommando: %s"

2798

2306 -#: builtin/push.c:43

2799 +#: builtin/pack-objects.c:2310

2800 +#, c-format

2801 +msgid "unsupported index version %s"

2802 +msgstr "indexversionen %s stöds ej"

2803 +

2804 +#: builtin/pack-objects.c:2314

2805 +#, c-format

2806 +msgid "bad index version '%s'"

2807 +msgstr "felaktig indexversion \"%s\""

2808 +

2809 +#: builtin/pack-objects.c:2322

2810 +#, c-format

2811 +msgid "option %s does not accept negative form"

2812 +msgstr "flaggan %s godtar inte negativ form"

2813 +

2814 +#: builtin/pack-objects.c:2326

2815 +#, c-format

2816 +msgid "unable to parse value '%s' for option %s"

2817 +msgstr "kunde inte tolka värdet \"%s\" för flaggan %s"

2818 +

2819 +#: builtin/push.c:44

2820 msgid "tag shorthand without <tag>"

2821 msgstr "taggförkortning utan <tagg>"

2822

2310 -#: builtin/push.c:62

2823 +#: builtin/push.c:63

2824 msgid "--delete only accepts plain target ref names"

2825 msgstr "--delete godtar endast enkla målreferensnamn"

2826

2314 -#: builtin/push.c:72

2315 -msgid "You are not currently on a branch."

2316 -msgstr "Du är inte på någon gren för närvarande."

2827 +#: builtin/push.c:73

2828 +#, c-format

2829 +msgid ""

2830 +"You are not currently on a branch.\n"

2831 +"To push the history leading to the current (detached HEAD)\n"

2832 +"state now, use\n"

2833 +"\n"

2834 +" git push %s HEAD:<name-of-remote-branch>\n"

2835 +msgstr ""

2836 +"Du är inte på någon gren för närvarande.\n"

2837 +"För att sända in historiken som leder till den aktuella (frånkopplat\n"

2838 +"HEAD) situationen använder du\n"

2839 +"\n"

2840 +" git push %s HEAD:<namn-på-fjärrgren>\n"

2841

2318 -#: builtin/push.c:74

2842 +#: builtin/push.c:80

2843 #, c-format

2320 -msgid "The current branch %s is not tracking anything."

2321 -msgstr "Den aktuella grenen %s spårar ingenting."

2844 +msgid ""

2845 +"The current branch %s has no upstream branch.\n"

2846 +"To push the current branch and set the remote as upstream, use\n"

2847 +"\n"

2848 +" git push --set-upstream %s %s\n"

2849 +msgstr ""

2850 +"Den aktuella grenen %s har ingen uppströmsgren.\n"

2851 +"För att sända aktuell gren och ange fjärrarkiv som uppström använder du\n"

2852 +"\n"

2853 +" git push --set-upstream %s %s\n"

2854

2323 -#: builtin/push.c:77

2855 +#: builtin/push.c:88

2856 #, c-format

2325 -msgid "The current branch %s is tracking multiple branches, refusing to push."

2326 -msgstr "Den aktuella grenen %s spårar flera grenar, vägrar sända."

2857 +msgid "The current branch %s has multiple upstream branches, refusing to push."

2858 +msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända."

2859

2328 -#: builtin/push.c:100

2860 +#: builtin/push.c:111

2861 msgid ""

2862 "You didn't specify any refspecs to push, and push.default is \"nothing\"."

2863 msgstr ""

2864 "Du angav inga referensspecifikationer att sända, och push.default är "

2865 "\"nothing\"."

2866

2335 -#: builtin/push.c:120

2867 +#: builtin/push.c:131

2868 #, c-format

2869 msgid "Pushing to %s\n"

2870 msgstr "Sänder till %s\n"

2871

2340 -#: builtin/push.c:124

2872 +#: builtin/push.c:135

2873 #, c-format

2874 msgid "failed to push some refs to '%s'"

2875 msgstr "misslyckades sända några referenser till \"%s\""

2876

2345 -#: builtin/push.c:132

2877 +#: builtin/push.c:143

2878 #, c-format

2879 msgid ""

2880 "To prevent you from losing history, non-fast-forward updates were rejected\n"

@@ -2356,40 +2888,57 @@ msgstr ""

2888 "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för "

2889 "detaljer.\n"

2890

2359 -#: builtin/push.c:149

2891 +#: builtin/push.c:160

2892 #, c-format

2893 msgid "bad repository '%s'"

2894 msgstr "felaktigt arkiv \"%s\""

2895

2364 -#: builtin/push.c:150

2365 -msgid "No destination configured to push to."

2366 -msgstr "Har inte ställt in någon destination att sända till."

2896 +#: builtin/push.c:161

2897 +msgid ""

2898 +"No configured push destination.\n"

2899 +"Either specify the URL from the command-line or configure a remote "

2900 +"repository using\n"

2901 +"\n"

2902 +" git remote add <name> <url>\n"

2903 +"\n"

2904 +"and then push using the remote name\n"

2905 +"\n"

2906 +" git push <name>\n"

2907 +msgstr ""

2908 +"Ingen destination har angivits.\n"

2909 +"Ange antingen URL:en på kommandoraden eller ställ in ett uppströmsarkiv med\n"

2910 +"\n"

2911 +" git remote add <namn> <url>\n"

2912 +"\n"

2913 +"och sänd sedan med hjälp av fjärrnamnet\n"

2914 +"\n"

2915 +" git push <namn>\n"

2916

2368 -#: builtin/push.c:158

2917 +#: builtin/push.c:176

2918 msgid "--all and --tags are incompatible"

2919 msgstr "--all och --tags är inkompatibla"

2920

2372 -#: builtin/push.c:159

2921 +#: builtin/push.c:177

2922 msgid "--all can't be combined with refspecs"

2923 msgstr "--all kan inte kombineras med referensspecifikationer"

2924

2376 -#: builtin/push.c:164

2925 +#: builtin/push.c:182

2926 msgid "--mirror and --tags are incompatible"

2927 msgstr "--mirror och --tags är inkompatibla"

2928

2380 -#: builtin/push.c:165

2929 +#: builtin/push.c:183

2930 msgid "--mirror can't be combined with refspecs"

2931 msgstr "--mirror kan inte kombineras med referensspecifikationer"

2932

2384 -#: builtin/push.c:170

2933 +#: builtin/push.c:188

2934 msgid "--all and --mirror are incompatible"

2935 msgstr "--all och --mirror är inkompatibla"

2936

2388 -#: builtin/push.c:235

2937 +#: builtin/push.c:274

2938 msgid "--delete is incompatible with --all, --mirror and --tags"

2939 msgstr "--delete är imkompatibel med --all, --mirror och --tags"

2940

2392 -#: builtin/push.c:237

2941 +#: builtin/push.c:276

2942 msgid "--delete doesn't make sense without any refs"

2943 msgstr "--delete kan inte användas utan referenser"

2944

@@ -2405,636 +2954,448 @@ msgstr "mjuk"

2954 msgid "hard"

2955 msgstr "hård"

2956

2408 -#: builtin/reset.c:33

2409 -msgid "merge"

2410 -msgstr "sammanslagning"

2411 -

2957 #: builtin/reset.c:33

2958 msgid "keep"

2959 msgstr "behåll"

2960

2416 -#: builtin/reset.c:95

2961 +#: builtin/reset.c:77

2962 msgid "You do not have a valid HEAD."

2963 msgstr "Du har inte en giltig HEAD."

2964

2420 -#: builtin/reset.c:97

2965 +#: builtin/reset.c:79

2966 msgid "Failed to find tree of HEAD."

2967 msgstr "Kunde inte hitta träder för HEAD."

2968

2424 -#: builtin/reset.c:103

2969 +#: builtin/reset.c:85

2970 #, c-format

2971 msgid "Failed to find tree of %s."

2972 msgstr "Kunde inte hitta träder för %s."

2973

2429 -#: builtin/reset.c:108

2974 +#: builtin/reset.c:96

2975 msgid "Could not write new index file."

2976 msgstr "Kunde inte skriva ny indexfil."

2977

2433 -#: builtin/reset.c:118

2978 +#: builtin/reset.c:106

2979 #, c-format

2980 msgid "HEAD is now at %s"

2981 msgstr "HEAD är nu på %s"

2982

2438 -#: builtin/reset.c:142

2983 +#: builtin/reset.c:130

2984 msgid "Could not read index"

2985 msgstr "Kunde inte läsa indexet"

2986

2442 -#: builtin/reset.c:145

2987 +#: builtin/reset.c:133

2988 msgid "Unstaged changes after reset:"

2989 msgstr "Oköade ändringar efter återställning:"

2990

2446 -#: builtin/reset.c:225

2447 -#, c-format

2448 -msgid "Reflog action message too long: %.*s..."

2449 -msgstr "Reflog-händelsemeddelande för långt: %.*s..."

2450 -

2451 -#: builtin/reset.c:231

2991 +#: builtin/reset.c:223

2992 #, c-format

2993 msgid "Cannot do a %s reset in the middle of a merge."

2994 msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning."

2995

2456 -#: builtin/reset.c:307

2996 +#: builtin/reset.c:297

2997 #, c-format

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

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

3000

2461 -#: builtin/reset.c:312

3001 +#: builtin/reset.c:302

3002 msgid "--patch is incompatible with --{hard,mixed,soft}"

3003 msgstr "--patch är inkompatibel med --{hard,mixed,soft}"

3004

2465 -#: builtin/reset.c:321

3005 +#: builtin/reset.c:311

3006 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."

3007 msgstr ""

3008 "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"."

3009

2470 -#: builtin/reset.c:323

3010 +#: builtin/reset.c:313

3011 #, c-format

3012 msgid "Cannot do %s reset with paths."

3013 msgstr "Kan inte göra %s återställning med sökvägar."

3014

2475 -#: builtin/reset.c:335

3015 +#: builtin/reset.c:325

3016 #, c-format

3017 msgid "%s reset is not allowed in a bare repository"

3018 msgstr "%s återställning tillåts inte i ett naket arkiv"

3019

2480 -#: builtin/reset.c:351

3020 +#: builtin/reset.c:341

3021 #, c-format

3022 msgid "Could not reset index file to revision '%s'."

3023 msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."

3024

2485 -#: builtin/revert.c:82

2486 -msgid "program error"

2487 -msgstr "programfel"

2488 -

2489 -#: builtin/revert.c:154 builtin/revert.c:188

3025 +#: builtin/revert.c:70 builtin/revert.c:91

3026 #, c-format

2491 -msgid "Could not read commit message of %s"

2492 -msgstr "Kunde inte läsa incheckningsmeddelandet för %s"

3027 +msgid "%s: %s cannot be used with %s"

3028 +msgstr "%s: %s kan inte användas med %s"

3029

2494 -#: builtin/revert.c:202

2495 -#, c-format

2496 -msgid "Could not extract author email from %s"

2497 -msgstr "Kunde inte hämta författarens e-postadress från %s"

3030 +#: builtin/revert.c:126

3031 +msgid "program error"

3032 +msgstr "programfel"

3033

2499 -#: builtin/revert.c:214

2500 -#, c-format

2501 -msgid "Could not extract author time from %s"

2502 -msgstr "Kunde inte hämta författartid från %s"

3034 +#: builtin/revert.c:209

3035 +msgid "revert failed"

3036 +msgstr "\"revert\" misslyckades"

3037

2504 -#: builtin/revert.c:230

2505 -#, c-format

2506 -msgid "No author information found in %s"

2507 -msgstr "Hittade ingen författarinformation i %s"

3038 +#: builtin/revert.c:224

3039 +msgid "cherry-pick failed"

3040 +msgstr "\"cherry-pick\" misslyckades"

3041

2509 -#: builtin/revert.c:267

3042 +#: builtin/rm.c:109

3043 #, c-format

2511 -msgid "Could not write to %s."

2512 -msgstr "Kunde inte skriva till %s."

3044 +msgid ""

3045 +"'%s' has staged content different from both the file and the HEAD\n"

3046 +"(use -f to force removal)"

3047 +msgstr ""

3048 +"\"%s\" har köat ändringar som skiljer sig både från filen och HEAD\n"

3049 +"(använd -f för att tvinga borttagning)"

3050

2514 -#: builtin/revert.c:270

3051 +#: builtin/rm.c:115

3052 #, c-format

2516 -msgid "Error wrapping up %s"

2517 -msgstr "Fel vid ombrytning av %s"

2518 -

2519 -#: builtin/revert.c:290

3053 msgid ""

2521 -"Your local changes would be overwritten by revert.\n"

2522 -"Please, commit your changes or stash them to proceed."

3054 +"'%s' has changes staged in the index\n"

3055 +"(use --cached to keep the file, or -f to force removal)"

3056 msgstr ""

2524 -"Dina lokala ändringar skulle skrivas över av \"revert\".\n"

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

3057 +"\"%s\" har köade ändringar i indexet\n"

3058 +"(använd --cached för att behålla filen eller -f för att tvinga borttagning)"

3059

2527 -#: builtin/revert.c:293

3060 +#: builtin/rm.c:119

3061 +#, c-format

3062 msgid ""

2529 -"Your local changes would be overwritten by cherry-pick.\n"

2530 -"Please, commit your changes or stash them to proceed."

3063 +"'%s' has local modifications\n"

3064 +"(use --cached to keep the file, or -f to force removal)"

3065 msgstr ""

2532 -"Dina lokala ändringar skulle skrivas över av \"cherry-pick\".\n"

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

3066 +"\"%s\" har lokala ändringar\n"

3067 +"(använd --cached för att behålla filen eller -f för att tvinga borttagning)"

3068

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

2536 -#: builtin/revert.c:351

3069 +#: builtin/rm.c:194

3070 #, c-format

2538 -msgid "%s: Unable to write new index file"

2539 -msgstr "%s: Kunde inte skriva ny indexfil"

2540 -

2541 -#: builtin/revert.c:417

2542 -msgid "Your index file is unmerged."

2543 -msgstr "Din indexfil har inte slagits ihop."

2544 -

2545 -#: builtin/revert.c:420

2546 -msgid "You do not have a valid HEAD"

2547 -msgstr "Du har ingen giltig HEAD"

3071 +msgid "not removing '%s' recursively without -r"

3072 +msgstr "tar inte bort \"%s\" rekursivt utan -r"

3073

2549 -#: builtin/revert.c:428

2550 -msgid "Cannot revert a root commit"

2551 -msgstr "Kan inte ångra en rotincheckning"

3074 +#: builtin/rm.c:230

3075 +#, c-format

3076 +msgid "git rm: unable to remove %s"

3077 +msgstr "git rm: kan inte ta bort %s"

3078

2553 -#: builtin/revert.c:437

3079 +#: builtin/shortlog.c:157

3080 #, c-format

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

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

3081 +msgid "Missing author: %s"

3082 +msgstr "Författare saknas: %s"

3083

2558 -#: builtin/revert.c:445

3084 +#: builtin/tag.c:58

3085 #, c-format

2560 -msgid "Commit %s does not have parent %d"

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

3086 +msgid "malformed object at '%s'"

3087 +msgstr "felformat objekt vid \"%s\""

3088

2563 -#: builtin/revert.c:449

3089 +#: builtin/tag.c:205

3090 #, c-format

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

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

3091 +msgid "tag name too long: %.*s..."

3092 +msgstr "taggnamnet för långt: %.*s..."

3093

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

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

2570 -#: builtin/revert.c:460

2571 -#, c-format

2572 -msgid "%s: cannot parse parent commit %s"

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

2574 -

2575 -#: builtin/revert.c:464

2576 -#, c-format

2577 -msgid "Cannot get commit message for %s"

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

2579 -

2580 -#: builtin/revert.c:525

2581 -#, c-format

2582 -msgid "could not revert %s... %s"

2583 -msgstr "kunde inte ångra %s... %s"

2584 -

2585 -#: builtin/revert.c:526

2586 -#, c-format

2587 -msgid "could not apply %s... %s"

2588 -msgstr "kunde inte applicera %s... %s"

2589 -

2590 -#: builtin/revert.c:559

2591 -msgid "empty commit set passed"

2592 -msgstr "den angivna uppsättningen incheckningar är tom"

2593 -

2594 -#: builtin/revert.c:573

2595 -msgid "cherry-pick --ff cannot be used with --signoff"

2596 -msgstr "cherry-pick --ff kan inte användas med --signoff"

2597 -

2598 -#: builtin/revert.c:575

2599 -msgid "cherry-pick --ff cannot be used with --no-commit"

2600 -msgstr "cherry-pick --ff kan inte användas med --no-commit"

2601 -

2602 -#: builtin/revert.c:577

2603 -msgid "cherry-pick --ff cannot be used with -x"

2604 -msgstr "cherry-pick --ff kan inte användas med -x"

2605 -

2606 -#: builtin/revert.c:579

2607 -msgid "cherry-pick --ff cannot be used with --edit"

2608 -msgstr "cherry-pick --ff kan inte användas med --edit"

2609 -

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

2611 -#: builtin/revert.c:584

2612 -#, c-format

2613 -msgid "git %s: failed to read the index"

2614 -msgstr "git %s: misslyckades läsa indexet"

2615 -

2616 -#: builtin/rm.c:118

2617 -#, c-format

2618 -msgid ""

2619 -"'%s' has staged content different from both the file and the HEAD\n"

2620 -"(use -f to force removal)"

2621 -msgstr ""

2622 -"\"%s\" har köat ändringar som skiljer sig både från filen och HEAD\n"

2623 -"(använd -f för att tvinga borttagning)"

2624 -

2625 -#: builtin/rm.c:124

2626 -#, c-format

2627 -msgid ""

2628 -"'%s' has changes staged in the index\n"

2629 -"(use --cached to keep the file, or -f to force removal)"

2630 -msgstr ""

2631 -"\"%s\" har köade ändringar i indexet\n"

2632 -"(använd --cached för att behålla filen eller -f för att tvinga borttagning)"

2633 -

2634 -#: builtin/rm.c:128

2635 -#, c-format

2636 -msgid ""

2637 -"'%s' has local modifications\n"

2638 -"(use --cached to keep the file, or -f to force removal)"

2639 -msgstr ""

2640 -"\"%s\" har lokala ändringar\n"

2641 -"(använd --cached för att behålla filen eller -f för att tvinga borttagning)"

2642 -

2643 -#: builtin/rm.c:202

2644 -#, c-format

2645 -msgid "not removing '%s' recursively without -r"

2646 -msgstr "tar inte bort \"%s\" rekursivt utan -r"

2647 -

2648 -#: builtin/rm.c:238

2649 -#, c-format

2650 -msgid "git rm: unable to remove %s"

2651 -msgstr "git rm: kan inte ta bort %s"

2652 -

2653 -#: builtin/shortlog.c:161

2654 -#, c-format

2655 -msgid "Missing author: %s"

2656 -msgstr "Saknad författare: %s"

2657 -

2658 -#: builtin/tag.c:123 builtin/tag.c:464

2659 -#, c-format

2660 -msgid "tag name too long: %.*s..."

2661 -msgstr "taggnamnet för långt: %.*s..."

2662 -

2663 -#: builtin/tag.c:128

3094 +#: builtin/tag.c:210

3095 #, c-format

3096 msgid "tag '%s' not found."

3097 msgstr "taggen \"%s\" hittades inte."

3098

2668 -#: builtin/tag.c:143

3099 +#: builtin/tag.c:225

3100 #, c-format

3101 msgid "Deleted tag '%s' (was %s)\n"

3102 msgstr "Tog bort tagg \"%s\" (var %s)\n"

3103

2673 -#: builtin/tag.c:155

3104 +#: builtin/tag.c:237

3105 #, c-format

3106 msgid "could not verify the tag '%s'"

3107 msgstr "kunde inte bekräfta taggen \"%s\""

3108

2678 -#: builtin/tag.c:170

2679 -msgid "committer info too long."

2680 -msgstr "incheckarinformation för lång."

2681 -

2682 -#: builtin/tag.c:190

2683 -msgid "could not run gpg."

2684 -msgstr "kunde inte köra gpg."

2685 -

2686 -#: builtin/tag.c:196

2687 -msgid "gpg did not accept the tag data"

2688 -msgstr "gpg godtog inte taggdata"

2689 -

2690 -#: builtin/tag.c:203

2691 -msgid "gpg failed to sign the tag"

2692 -msgstr "gpg misslyckades signera taggen"

2693 -

2694 -#: builtin/tag.c:218

3109 +#: builtin/tag.c:247

3110 msgid ""

3111 "\n"

3112 "#\n"

3113 "# Write a tag message\n"

3114 +"# Lines starting with '#' will be ignored.\n"

3115 "#\n"

3116 msgstr ""

3117 "\n"

3118 "#\n"

3119 "# Skriv ett taggmeddelande\n"

3120 +"# Rader som inleds med \"#\" ignoreras.\n"

3121 "#\n"

3122

2706 -#: builtin/tag.c:226

2707 -#, c-format

2708 -msgid "signing key value too long (%.10s...)"

2709 -msgstr "signeringsnyckelvärdet för långt (%.10s...)"

3123 +#: builtin/tag.c:254

3124 +msgid ""

3125 +"\n"

3126 +"#\n"

3127 +"# Write a tag message\n"

3128 +"# Lines starting with '#' will be kept; you may remove them yourself if you "

3129 +"want to.\n"

3130 +"#\n"

3131 +msgstr ""

3132 +"\n"

3133 +"#\n"

3134 +"# Skriv ett taggmeddelande\n"

3135 +"# Rader som inleds med \"#\" kommer behållas; du kan själv ta bort dem om\n"

3136 +"# du vill.\n"

3137 +"#\n"

3138

2711 -#: builtin/tag.c:272

3139 +#: builtin/tag.c:294

3140 msgid "unable to sign the tag"

3141 msgstr "kunde inte signera taggen"

3142

2715 -#: builtin/tag.c:274

3143 +#: builtin/tag.c:296

3144 msgid "unable to write tag file"

3145 msgstr "kunde inte skriva tagg-filen"

3146

2719 -#: builtin/tag.c:289

3147 +#: builtin/tag.c:321

3148 msgid "bad object type."

3149 msgstr "felaktig objekttyp"

3150

2723 -#: builtin/tag.c:302

3151 +#: builtin/tag.c:334

3152 msgid "tag header too big."

3153 msgstr "tagghuvud för stort."

3154

2727 -#: builtin/tag.c:329

3155 +#: builtin/tag.c:366

3156 msgid "no tag message?"

3157 msgstr "inget taggmeddelande?"

3158

2731 -#: builtin/tag.c:335

3159 +#: builtin/tag.c:372

3160 #, c-format

3161 msgid "The tag message has been left in %s\n"

3162 msgstr "Taggmeddelandet har lämnats i %s\n"

3163

2736 -#: builtin/tag.c:428

3164 +#: builtin/tag.c:421

3165 +msgid "switch 'points-at' requires an object"

3166 +msgstr "flaggan \"points-at\" behöver ett object"

3167 +

3168 +#: builtin/tag.c:423

3169 +#, c-format

3170 +msgid "malformed object name '%s'"

3171 +msgstr "felformat objektnamn \"%s\""

3172 +

3173 +#: builtin/tag.c:502

3174 msgid "-n option is only allowed with -l."

3175 msgstr "Flaggan -n är endast tillåten tillsammans med -l."

3176

2740 -#: builtin/tag.c:430

3177 +#: builtin/tag.c:504

3178 msgid "--contains option is only allowed with -l."

3179 msgstr "Flaggan --contains är endast tillåten tillsammans med -l"

3180

2744 -#: builtin/tag.c:438

3181 +#: builtin/tag.c:506

3182 +msgid "--points-at option is only allowed with -l."

3183 +msgstr "Flaggan --points-at är endast tillåten tillsammans med -l."

3184 +

3185 +#: builtin/tag.c:514

3186 msgid "only one -F or -m option is allowed."

3187 msgstr "endast en av flaggorna -F eller -m tillåts."

3188

2748 -#: builtin/tag.c:458

3189 +#: builtin/tag.c:534

3190 msgid "too many params"

3191 msgstr "för många parametrar"

3192

2752 -#: builtin/tag.c:466

3193 +#: builtin/tag.c:540

3194 #, c-format

3195 msgid "'%s' is not a valid tag name."

3196 msgstr "\"%s\" är inte ett giltigt taggnamn."

3197

2757 -#: builtin/tag.c:471

3198 +#: builtin/tag.c:545

3199 #, c-format

3200 msgid "tag '%s' already exists"

3201 msgstr "taggen \"%s\" finns redan"

3202

2762 -#: builtin/tag.c:479

3203 +#: builtin/tag.c:563

3204 #, c-format

3205 msgid "%s: cannot lock the ref"

3206 msgstr "%s: kan inte låsa referensen"

3207

2767 -#: builtin/tag.c:481

3208 +#: builtin/tag.c:565

3209 #, c-format

3210 msgid "%s: cannot update the ref"

3211 msgstr "%s: kan inte uppdatera referensen"

3212

2772 -#: builtin/tag.c:483

3213 +#: builtin/tag.c:567

3214 #, c-format

3215 msgid "Updated tag '%s' (was %s)\n"

3216 msgstr "Uppdaterad tagg \"%s\" (var %s)\n"

3217

2777 -#: git-am.sh:47

3218 +#: git-am.sh:49

3219 msgid "You need to set your committer info first"

3220 msgstr "Du måste ställa in din incheckarinformation först"

3221

2781 -#: git-am.sh:80

2782 -#, sh-format

2783 -msgid ""

2784 -"When you have resolved this problem run \"$cmdline --resolved\".\n"

2785 -"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"

2786 -"To restore the original branch and stop patching run \"$cmdline --abort\"."

2787 -msgstr ""

2788 -"När du har löst problemet kör du \"$cmdline --resolved\".\n"

2789 -"Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"

2790 -"För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."

2791 -

2792 -#: git-am.sh:96

2793 -msgid "Cannot fall back to three-way merge."

2794 -msgstr "Kan inte falla tillbaka på trevägssammanslagning."

2795 -

2796 -#: git-am.sh:111

3222 +#: git-am.sh:136

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

3224 msgstr ""

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

3226 "vägssammanslagning."

3227

2802 -#: git-am.sh:120

3228 +#: git-am.sh:147

3229 msgid ""

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

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

3232 msgstr ""

2807 -"Vill du handredigera din patch?\n"

3233 +"Har du handredigerat din patch?\n"

3234 "Den kan inte appliceras på blobbar som antecknats i dess index."

3235

2810 -#: git-am.sh:236

3236 +#: git-am.sh:156

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

3238 +msgstr ""

3239 +"Faller tillbaka på att pacha grundversionen och trevägssammanslagning..."

3240 +

3241 +#: git-am.sh:268

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

3243 msgstr "Endast en StGIT-patchserie kan appliceras åt gången"

3244

2814 -#: git-am.sh:288

3245 +#: git-am.sh:355

3246 #, sh-format

3247 msgid "Patch format $patch_format is not supported."

3248 msgstr "Patchformatet $patch_format stöds inte."

3249

2819 -#: git-am.sh:290

3250 +#: git-am.sh:357

3251 msgid "Patch format detection failed."

3252 msgstr "Misslyckades detektera patchformat."

3253

2823 -#: git-am.sh:340

3254 +#: git-am.sh:409

3255 msgid "-d option is no longer supported. Do not use."

3256 msgstr "Flaggan -d stöds inte lägre. Använd inte."

3257

2827 -#: git-am.sh:403

3258 +#: git-am.sh:472

3259 #, sh-format

3260 msgid "previous rebase directory $dotest still exists but mbox given."

2830 -msgstr "tidigare rebase-katalog $dotest finns redan, men mbox angavs."

3261 +msgstr "tidigare rebase-katalog $dotest finns fortfarande, men mbox angavs."

3262

2832 -#: git-am.sh:408

3263 +#: git-am.sh:477

3264 msgid "Please make up your mind. --skip or --abort?"

3265 msgstr "Bestäm dig. --skip eller --abort?"

3266

2836 -#: git-am.sh:434

3267 +#: git-am.sh:504

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

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

3270

2840 -#: git-am.sh:499

3271 +#: git-am.sh:570

3272 #, sh-format

3273 msgid "Dirty index: cannot apply patches (dirty: $files)"

3274 msgstr "Smutsigt index: kan inte applicera patchar (smutsiga: $files)"

3275

2845 -#: git-am.sh:595

2846 -#, sh-format

2847 -msgid ""

2848 -"Patch is empty. Was it split wrong?\n"

2849 -"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"

2850 -"To restore the original branch and stop patching run \"$cmdline --abort\"."

2851 -msgstr ""

2852 -"Patchen är tom. Delades den upp felaktigt?\n"

2853 -"Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"

2854 -"För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."

2855 -

2856 -#: git-am.sh:632

2857 -msgid "Patch does not have a valid e-mail address."

2858 -msgstr "Patchen har inte någon giltig e-postadress."

2859 -

2860 -#: git-am.sh:679

3276 +#: git-am.sh:746

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

3278 msgstr ""

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

3280

2865 -#: git-am.sh:683

2866 -msgid "Commit Body is:"

2867 -msgstr "Incheckningskroppen är:"

2868 -

3281 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]

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

3283 #. input at this point.

2872 -#: git-am.sh:690

3284 +#: git-am.sh:757

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

3286 msgstr "Applicera? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla "

3287

2876 -#: git-am.sh:726

3288 +#: git-am.sh:793

3289 #, sh-format

3290 msgid "Applying: $FIRSTLINE"

3291 msgstr "Applicerar: $FIRSTLINE"

3292

2881 -#: git-am.sh:747

2882 -msgid ""

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

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

2885 -"already introduced the same changes; you might want to skip this patch."

2886 -msgstr ""

2887 -"Inga ändrinar - glömde du använda \"git add\"?\n"

2888 -"Om det inte är något kvar att köa kan det hända att någon annan redan\n"

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

2890 -

2891 -#: git-am.sh:755

2892 -msgid ""

2893 -"You still have unmerged paths in your index\n"

2894 -"did you forget to use 'git add'?"

2895 -msgstr ""

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

2897 -"glömde du använda \"git add\"?"

2898 -

2899 -#: git-am.sh:771

3293 +#: git-am.sh:838

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

3295 msgstr "Inga ändringar -- Patchen har redan applicerats."

3296

2903 -#: git-am.sh:781

2904 -#, sh-format

2905 -msgid "Patch failed at $msgnum $FIRSTLINE"

2906 -msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE"

2907 -

2908 -#: git-am.sh:797

3297 +#: git-am.sh:864

3298 msgid "applying to an empty history"

3299 msgstr "applicerar på en tom historik"

3300

2912 -#: git-bisect.sh:39

2913 -#, fuzzy

2914 -msgid "You need to start by \"git bisect start\""

2915 -msgstr "Du måste ställa in din incheckarinformation först"

2916 -

3301 #. TRANSLATORS: Make sure to include [Y] and [n] in your

3302 #. translation. The program will only accept English input

3303 #. at this point.

2920 -#: git-bisect.sh:45

3304 +#: git-bisect.sh:54

3305 msgid "Do you want me to do it for you [Y/n]? "

2922 -msgstr ""

3306 +msgstr "Vill du att jag ska göra det åt dig [Y=ja/N=nej]?"

3307

2924 -#: git-bisect.sh:64

3308 +#: git-bisect.sh:95

3309 +#, sh-format

3310 +msgid "unrecognised option: '$arg'"

3311 +msgstr "flaggan känns inte igen: \"$arg\""

3312 +

3313 +#: git-bisect.sh:99

3314 +#, sh-format

3315 +msgid "'$arg' does not appear to be a valid revision"

3316 +msgstr "\"$arg\" verkar inte vara en giltig revision"

3317 +

3318 +#: git-bisect.sh:117

3319 msgid "Bad HEAD - I need a HEAD"

3320 +msgstr "Felaktigt HEAD - Jag behöver ett HEAD"

3321 +

3322 +#: git-bisect.sh:130

3323 +#, sh-format

3324 +msgid ""

3325 +"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."

3326 msgstr ""

3327 +"Misslyckades checka ut \"$start_head\". Försök \"git bisect reset "

3328 +"<giltiggren>\""

3329

2928 -#: git-bisect.sh:83

3330 +# cogito-relaterat

3331 +#: git-bisect.sh:140

3332 msgid "won't bisect on seeked tree"

2930 -msgstr ""

3333 +msgstr "kör inte \"bisect\" på ett \"seeked\"-träd"

3334

2932 -#: git-bisect.sh:87

3335 +#: git-bisect.sh:144

3336 msgid "Bad HEAD - strange symbolic ref"

2934 -msgstr ""

3337 +msgstr "Felaktigt HEAD - konstig symbolisk referens"

3338

2936 -#: git-bisect.sh:117

2937 -#, sh-format

2938 -msgid "'$arg' does not appear to be a valid revision"

2939 -msgstr ""

2940 -

2941 -#: git-bisect.sh:162

3339 +#: git-bisect.sh:189

3340 #, sh-format

3341 msgid "Bad bisect_write argument: $state"

2944 -msgstr ""

3342 +msgstr "Felaktigt argument till bisect_write: $state"

3343

2946 -#: git-bisect.sh:190

3344 +#: git-bisect.sh:218

3345 #, sh-format

3346 msgid "Bad rev input: $arg"

2949 -msgstr ""

3347 +msgstr "Felaktig rev-indata: $arg"

3348

2951 -#: git-bisect.sh:204

3349 +#: git-bisect.sh:232

3350 msgid "Please call 'bisect_state' with at least one argument."

2953 -msgstr ""

3351 +msgstr "Anropa \"bisect_state\" med minst ett argument."

3352

2955 -#: git-bisect.sh:207

2956 -msgid "Bad rev input: HEAD"

2957 -msgstr ""

2958 -

2959 -#: git-bisect.sh:216

3353 +#: git-bisect.sh:244

3354 #, sh-format

3355 msgid "Bad rev input: $rev"

2962 -msgstr ""

3356 +msgstr "Felaktig rev-indata: $rev"

3357

2964 -#: git-bisect.sh:222

3358 +#: git-bisect.sh:250

3359 msgid "'git bisect bad' can take only one argument."

2966 -msgstr ""

2967 -

2968 -#. have bad but not good. we could bisect although

2969 -#. this is less optimum.

2970 -#: git-bisect.sh:245

2971 -msgid "Warning: bisecting only with a bad commit."

2972 -msgstr ""

3360 +msgstr "\"git bisect bad\" kan bara ta ett argument."

3361

3362 #. TRANSLATORS: Make sure to include [Y] and [n] in your

3363 #. translation. The program will only accept English input

3364 #. at this point.

2977 -#: git-bisect.sh:251

3365 +#: git-bisect.sh:279

3366 msgid "Are you sure [Y/n]? "

2979 -msgstr ""

2980 -

2981 -#: git-bisect.sh:261

2982 -msgid ""

2983 -"You need to give me at least one good and one bad revisions.\n"

2984 -"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"

2985 -msgstr ""

2986 -

2987 -#: git-bisect.sh:264

2988 -msgid ""

2989 -"You need to start by \"git bisect start\".\n"

2990 -"You then need to give me at least one good and one bad revisions.\n"

2991 -"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"

2992 -msgstr ""

2993 -

2994 -#: git-bisect.sh:316

2995 -msgid "We are not bisecting."

2996 -msgstr ""

2997 -

2998 -#: git-bisect.sh:323

2999 -#, fuzzy, sh-format

3000 -msgid "'$invalid' is not a valid commit"

3001 -msgstr "\"%s\" är inte en incheckning"

3002 -

3003 -#: git-bisect.sh:352

3004 -#, fuzzy, sh-format

3005 -msgid "cannot read $file for replaying"

3006 -msgstr "kan inte läsa indexet"

3007 -

3008 -#: git-bisect.sh:368

3009 -msgid "?? what are you talking about?"

3010 -msgstr ""

3367 +msgstr "Är du säker [Y=ja/N=nej]? "

3368

3012 -#: git-bisect.sh:380

3369 +#: git-bisect.sh:354

3370 #, sh-format

3014 -msgid "running $command"

3015 -msgstr ""

3371 +msgid "'$invalid' is not a valid commit"

3372 +msgstr "\"$invalid\" är inte en giltig incheckning"

3373

3017 -#: git-bisect.sh:386

3374 +#: git-bisect.sh:363

3375 #, sh-format

3376 msgid ""

3020 -"bisect run failed:\n"

3021 -"exit code $res from '$command' is < 0 or >= 128"

3377 +"Could not check out original HEAD '$branch'.\n"

3378 +"Try 'git bisect reset <commit>'."

3379 msgstr ""

3380 +"Kunde inte checka ut original-HEAD \"$branch\".\n"

3381 +"Försök \"git bisect reset <incheckning>\"."

3382

3024 -#: git-bisect.sh:409

3025 -msgid "bisect run cannot continue any more"

3026 -msgstr ""

3383 +#: git-bisect.sh:390

3384 +msgid "No logfile given"

3385 +msgstr "Ingen loggfil angiven"

3386

3028 -#: git-bisect.sh:414

3387 +#: git-bisect.sh:391

3388 #, sh-format

3030 -msgid ""

3031 -"bisect run failed:\n"

3032 -"'bisect_state $state' exited with error code $res"

3033 -msgstr ""

3389 +msgid "cannot read $file for replaying"

3390 +msgstr "kan inte läsa $file för uppspelning"

3391

3035 -#: git-bisect.sh:420

3036 -msgid "bisect run success"

3037 -msgstr ""

3392 +#: git-bisect.sh:408

3393 +msgid "?? what are you talking about?"

3394 +msgstr "?? vad menar du?"

3395 +

3396 +#: git-bisect.sh:474

3397 +msgid "We are not bisecting."

3398 +msgstr "Vi utför ingen bisect för tillfället."

3399

3400 #: git-pull.sh:21

3401 msgid ""

@@ -3042,451 +3403,458 @@ msgid ""

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

3404 "as appropriate to mark resolution, or use 'git commit -a'."

3405 msgstr ""

3406 +"Du kan inte göra en \"pull\" då du har ändringar som inte checkats in.\n"

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

3408 +"där det är lämpligt för att ange lösning, eller använd \"git commit -a\"."

3409

3410 #: git-pull.sh:25

3411 msgid "Pull is not possible because you have unmerged files."

3048 -msgstr ""

3049 -

3050 -#: git-pull.sh:141

3051 -msgid ""

3052 -"There is no candidate for rebasing against among the refs that you just "

3053 -"fetched.\n"

3054 -"Generally this means that you provided a wildcard refspec which had no\n"

3055 -"matches on the remote end."

3056 -msgstr ""

3057 -

3058 -#: git-pull.sh:145

3059 -msgid ""

3060 -"There are no candidates for merging against among the refs that you just "

3061 -"fetched.\n"

3062 -"Generally this means that you provided a wildcard refspec which had no\n"

3063 -"matches on the remote end."

3064 -msgstr ""

3065 -

3066 -#. TRANSLATORS: $requested_remote will be a remote name, like

3067 -#. "origin" or "avar"

3068 -#: git-pull.sh:153

3069 -#, sh-format

3070 -msgid ""

3071 -"You asked to pull from the remote '$requested_remote', but did not specify\n"

3072 -"a branch. Because this is not the default configured remote\n"

3073 -"for your current branch, you must specify a branch on the command line."

3074 -msgstr ""

3075 -

3076 -#: git-pull.sh:157

3077 -msgid ""

3078 -"You are not currently on a branch, so I cannot use any\n"

3079 -"'branch.<branchname>.merge' in your configuration file.\n"

3080 -"Please specify which remote branch you want to use on the command\n"

3081 -"line and try again (e.g. 'git pull <repository> <refspec>').\n"

3082 -"See git-pull(1) for details."

3083 -msgstr ""

3084 -

3085 -#: git-pull.sh:165

3086 -#, sh-format

3087 -msgid ""

3088 -"You asked me to pull without telling me which branch you\n"

3089 -"want to rebase against, and 'branch.${curr_branch}.merge' in\n"

3090 -"your configuration file does not tell me, either. Please\n"

3091 -"specify which branch you want to use on the command line and\n"

3092 -"try again (e.g. 'git pull <repository> <refspec>').\n"

3093 -"See git-pull(1) for details.\n"

3094 -"\n"

3095 -"If you often rebase against the same branch, you may want to\n"

3096 -"use something like the following in your configuration file:\n"

3097 -"\n"

3098 -" [branch \"${curr_branch}\"]\n"

3099 -" remote = <nickname>\n"

3100 -" merge = <remote-ref>\n"

3101 -" rebase = true\n"

3102 -"\n"

3103 -" [remote \"<nickname>\"]\n"

3104 -" url = <url>\n"

3105 -" fetch = <refspec>\n"

3106 -"\n"

3107 -"See git-config(1) for details."

3108 -msgstr ""

3412 +msgstr "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in."

3413

3110 -#: git-pull.sh:186

3111 -#, sh-format

3112 -msgid ""

3113 -"You asked me to pull without telling me which branch you\n"

3114 -"want to merge with, and 'branch.${curr_branch}.merge' in\n"

3115 -"your configuration file does not tell me, either. Please\n"

3116 -"specify which branch you want to use on the command line and\n"

3117 -"try again (e.g. 'git pull <repository> <refspec>').\n"

3118 -"See git-pull(1) for details.\n"

3119 -"\n"

3120 -"If you often merge with the same branch, you may want to\n"

3121 -"use something like the following in your configuration file:\n"

3122 -"\n"

3123 -" [branch \"${curr_branch}\"]\n"

3124 -" remote = <nickname>\n"

3125 -" merge = <remote-ref>\n"

3126 -"\n"

3127 -" [remote \"<nickname>\"]\n"

3128 -" url = <url>\n"

3129 -" fetch = <refspec>\n"

3130 -"\n"

3131 -"See git-config(1) for details."

3132 -msgstr ""

3133 -

3134 -#: git-pull.sh:210

3135 -#, sh-format

3136 -msgid ""

3137 -"Your configuration specifies to rebase against the ref '$upstream_branch'\n"

3138 -"from the remote, but no such ref was fetched."

3139 -msgstr ""

3140 -

3141 -#: git-pull.sh:213

3142 -#, sh-format

3143 -msgid ""

3144 -"Your configuration specifies to merge with the ref '$upstream_branch'\n"

3145 -"from the remote, but no such ref was fetched."

3146 -msgstr ""

3147 -

3148 -#: git-pull.sh:226

3414 +#: git-pull.sh:197

3415 msgid "updating an unborn branch with changes added to the index"

3150 -msgstr ""

3151 -

3152 -#: git-pull.sh:232

3153 -msgid "refusing to pull with rebase: your working tree is not up-to-date"

3154 -msgstr ""

3416 +msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet"

3417

3156 -#. The fetch involved updating the current branch.

3157 -#. The working tree and the index file is still based on the

3158 -#. $orig_head commit, but we are merging into $curr_head.

3159 -#. First update the working tree to match $curr_head.

3160 -#: git-pull.sh:260

3161 -#, sh-format

3162 -msgid ""

3163 -"Warning: fetch updated the current branch head.\n"

3164 -"Warning: fast-forwarding your working tree from\n"

3165 -"Warning: commit $orig_head."

3166 -msgstr ""

3167 -

3168 -#: git-pull.sh:285

3169 -#, fuzzy

3418 +#: git-pull.sh:253

3419 msgid "Cannot merge multiple branches into empty head"

3171 -msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."

3420 +msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."

3421

3173 -#: git-pull.sh:289

3422 +#: git-pull.sh:257

3423 msgid "Cannot rebase onto multiple branches"

3175 -msgstr ""

3424 +msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar"

3425

3177 -#: git-stash.sh:41

3426 +#: git-stash.sh:51

3427 msgid "git stash clear with parameters is unimplemented"

3179 -msgstr ""

3428 +msgstr "\"git stash clear\" med parametrar har inte implementerats"

3429

3181 -#: git-stash.sh:63

3182 -#, fuzzy

3430 +#: git-stash.sh:74

3431 msgid "You do not have the initial commit yet"

3184 -msgstr "Du har ingen giltig HEAD"

3432 +msgstr "Du har inte den första incheckningen ännu"

3433

3186 -#: git-stash.sh:78

3187 -#, fuzzy

3434 +#: git-stash.sh:89

3435 msgid "Cannot save the current index state"

3189 -msgstr "Kan inte komma åt aktuell arbetskatalog"

3436 +msgstr "Kan inte spara aktuellt tillstånd för indexet"

3437

3191 -#: git-stash.sh:94 git-stash.sh:107

3192 -#, fuzzy

3438 +#: git-stash.sh:123 git-stash.sh:136

3439 msgid "Cannot save the current worktree state"

3194 -msgstr "Kan inte komma åt aktuell arbetskatalog"

3440 +msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"

3441

3196 -#: git-stash.sh:111

3197 -#, fuzzy

3442 +#: git-stash.sh:140

3443 msgid "No changes selected"

3199 -msgstr "# Inga ändringar\n"

3444 +msgstr "Inga ändringar valda"

3445

3201 -#: git-stash.sh:114

3446 +#: git-stash.sh:143

3447 msgid "Cannot remove temporary index (can't happen)"

3203 -msgstr ""

3448 +msgstr "Kan inte ta bort temporärt index (kan inte inträffa)"

3449

3205 -#: git-stash.sh:127

3206 -#, fuzzy

3450 +#: git-stash.sh:156

3451 msgid "Cannot record working tree state"

3208 -msgstr "Kan inte komma åt arbetskatalogen \"%s\""

3452 +msgstr "Kan inte registrera tillstånd för arbetskatalog"

3453

3210 -#: git-stash.sh:176

3454 +#: git-stash.sh:223

3455 msgid "No local changes to save"

3212 -msgstr ""

3456 +msgstr "Inga lokala ändringar att spara"

3457

3214 -#: git-stash.sh:180

3458 +#: git-stash.sh:227

3459 msgid "Cannot initialize stash"

3216 -msgstr ""

3460 +msgstr "Kan inte initiera \"stash\""

3461

3218 -#: git-stash.sh:188

3462 +#: git-stash.sh:235

3463 msgid "Cannot save the current status"

3220 -msgstr ""

3464 +msgstr "Kan inte spara aktuell status"

3465

3222 -#: git-stash.sh:201

3223 -#, fuzzy

3466 +#: git-stash.sh:253

3467 msgid "Cannot remove worktree changes"

3225 -msgstr "Kan inte komma åt arbetskatalogen \"%s\""

3468 +msgstr "Kan inte ta bort ändringar i arbetskatalogen"

3469

3227 -#: git-stash.sh:303

3470 +#: git-stash.sh:352

3471 msgid "No stash found."

3229 -msgstr ""

3472 +msgstr "Ingen \"stash\" hittades."

3473

3231 -#: git-stash.sh:310

3232 -#, fuzzy, sh-format

3474 +#: git-stash.sh:359

3475 +#, sh-format

3476 msgid "Too many revisions specified: $REV"

3234 -msgstr "För många flaggor angavs"

3477 +msgstr "För många revisioner angivna: $REV"

3478

3236 -#: git-stash.sh:316

3237 -#, fuzzy, sh-format

3479 +#: git-stash.sh:365

3480 +#, sh-format

3481 msgid "$reference is not valid reference"

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

3482 +msgstr "$reference är inte en giltig referens."

3483

3241 -#. maintainers: it would be better if git rev-parse indicated

3242 -#. this condition with a non-zero status code but as of 1.7.2.1 it

3243 -#. it did not. So, we use non-empty stderr output as a proxy for the

3244 -#. condition of interest.

3245 -#: git-stash.sh:337

3484 +#: git-stash.sh:393

3485 #, sh-format

3247 -msgid "$REV does not exist in the stash log"

3248 -msgstr ""

3249 -

3250 -#: git-stash.sh:351

3251 -#, fuzzy, sh-format

3486 msgid "'$args' is not a stash-like commit"

3253 -msgstr "\"%s\" är inte en incheckning"

3487 +msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"

3488

3255 -#: git-stash.sh:362

3489 +#: git-stash.sh:404

3490 #, sh-format

3491 msgid "'$args' is not a stash reference"

3258 -msgstr ""

3492 +msgstr "\"$args\" är inte en \"stash\"-referens"

3493

3260 -#: git-stash.sh:372

3261 -msgid "Cannot apply to a dirty working tree, please stage your changes"

3262 -msgstr ""

3494 +#: git-stash.sh:412

3495 +msgid "unable to refresh index"

3496 +msgstr "kan inte uppdatera indexet"

3497

3264 -#: git-stash.sh:376

3265 -#, fuzzy

3498 +#: git-stash.sh:416

3499 msgid "Cannot apply a stash in the middle of a merge"

3267 -msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning."

3500 +msgstr "Kan inte applicera en \"stash\" mitt i en sammanslagning"

3501

3269 -#: git-stash.sh:384

3502 +#: git-stash.sh:424

3503 msgid "Conflicts in index. Try without --index."

3271 -msgstr ""

3504 +msgstr "Konflikter i indexet. Testa utan --index."

3505

3273 -#: git-stash.sh:386

3274 -#, fuzzy

3506 +#: git-stash.sh:426

3507 msgid "Could not save index tree"

3276 -msgstr "Kunde inte läsa indexet"

3508 +msgstr "Kunde inte spara indexträd"

3509

3278 -#: git-stash.sh:412

3510 +#: git-stash.sh:460

3511 msgid "Cannot unstage modified files"

3280 -msgstr ""

3512 +msgstr "Kan inte ta bort ändrade filer ur kön"

3513

3282 -#: git-stash.sh:426

3283 -#, fuzzy

3284 -msgid "Index was not unstashed."

3285 -msgstr "kunde köra stash."

3286 -

3287 -#: git-stash.sh:443

3514 +#: git-stash.sh:491

3515 #, sh-format

3516 msgid "Dropped ${REV} ($s)"

3290 -msgstr ""

3517 +msgstr "Kastade ${REV} ($s)"

3518

3292 -#: git-stash.sh:444

3519 +#: git-stash.sh:492

3520 #, sh-format

3521 msgid "${REV}: Could not drop stash entry"

3295 -msgstr ""

3522 +msgstr "${REV}: Kunde inte kasta \"stash\"-post"

3523

3297 -#: git-stash.sh:451

3298 -#, fuzzy

3524 +#: git-stash.sh:499

3525 msgid "No branch name specified"

3300 -msgstr "Misslyckades byta namn på gren"

3526 +msgstr "Inget grennamn angavs"

3527

3302 -#: git-stash.sh:522

3528 +#: git-stash.sh:570

3529 msgid "(To restore them type \"git stash apply\")"

3304 -msgstr ""

3530 +msgstr "(För att återställa dem, skriv \"git stash apply\")"

3531

3306 -#: git-submodule.sh:38

3532 +#: git-submodule.sh:56

3533 #, sh-format

3308 -msgid "remote ($remote) does not have a url defined in .git/config"

3309 -msgstr ""

3534 +msgid "cannot strip one component off url '$remoteurl'"

3535 +msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\""

3536

3311 -#: git-submodule.sh:79

3537 +#: git-submodule.sh:108

3538 #, sh-format

3539 msgid "No submodule mapping found in .gitmodules for path '$path'"

3314 -msgstr ""

3315 -

3316 -#: git-submodule.sh:105

3317 -#, sh-format

3318 -msgid "Directory '$path' exists, but is neither empty nor a git repository"

3319 -msgstr ""

3540 +msgstr "Hittade ingen undermodulmappning i .gitmodules för sökvägen \"$path\""

3541

3321 -#: git-submodule.sh:109

3322 -#, sh-format

3323 -msgid "A file already exist at path '$path'"

3324 -msgstr ""

3325 -

3326 -#: git-submodule.sh:117

3542 +#: git-submodule.sh:173

3543 #, sh-format

3544 msgid "Clone of '$url' into submodule path '$path' failed"

3329 -msgstr ""

3545 +msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$path\""

3546

3331 -#: git-submodule.sh:190

3547 +#: git-submodule.sh:247

3548 #, sh-format

3549 msgid "repo URL: '$repo' must be absolute or begin with ./|../"

3334 -msgstr ""

3335 -

3336 -#: git-submodule.sh:207

3337 -#, fuzzy, sh-format

3338 -msgid "'$path' already exists in the index"

3339 -msgstr "kan inte läsa indexet"

3550 +msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"

3551

3341 -#: git-submodule.sh:211

3552 +#: git-submodule.sh:264

3553 #, sh-format

3343 -msgid ""

3344 -"The following path is ignored by one of your .gitignore files:\n"

3345 -"$path\n"

3346 -"Use -f if you really want to add it."

3347 -msgstr ""

3554 +msgid "'$path' already exists in the index"

3555 +msgstr "\"$path\" finns redan i indexet"

3556

3349 -#: git-submodule.sh:222

3557 +#: git-submodule.sh:281

3558 #, sh-format

3351 -msgid "Adding existing repo at '$path' to the index"

3352 -msgstr ""

3353 -

3354 -#: git-submodule.sh:224

3355 -#, fuzzy, sh-format

3559 msgid "'$path' already exists and is not a valid git repo"

3357 -msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."

3560 +msgstr "\"$path\" finns redan och är inte ett giltigt git-arkiv"

3561

3359 -#: git-submodule.sh:247

3562 +#: git-submodule.sh:295

3563 #, sh-format

3564 msgid "Unable to checkout submodule '$path'"

3362 -msgstr ""

3565 +msgstr "Kan inte checka ut undermodul \"$path\""

3566

3364 -#: git-submodule.sh:251

3365 -#, fuzzy, sh-format

3567 +#: git-submodule.sh:300

3568 +#, sh-format

3569 msgid "Failed to add submodule '$path'"

3367 -msgstr "Kunde inte läsa objektet \"%s\"."

3570 +msgstr "Misslyckades lägga till underkatalog \"$path\""

3571

3369 -#: git-submodule.sh:256

3572 +#: git-submodule.sh:305

3573 #, sh-format

3574 msgid "Failed to register submodule '$path'"

3372 -msgstr ""

3575 +msgstr "Misslyckades registrera undermodul \"$path\""

3576

3374 -#: git-submodule.sh:294

3577 +#: git-submodule.sh:347

3578 #, sh-format

3579 msgid "Entering '$prefix$path'"

3377 -msgstr ""

3580 +msgstr "Går in i \"$prefix$path\""

3581

3379 -#: git-submodule.sh:306

3582 +#: git-submodule.sh:359

3583 #, sh-format

3584 msgid "Stopping at '$path'; script returned non-zero status."

3382 -msgstr ""

3585 +msgstr "Stoppar på \"$path\"; skriptet returnerade en status skild från noll."

3586

3384 -#: git-submodule.sh:349

3587 +#: git-submodule.sh:401

3588 #, sh-format

3589 msgid "No url found for submodule path '$path' in .gitmodules"

3387 -msgstr ""

3590 +msgstr "Hittade ingen url för undermodulsökvägen \"$path\" i .gitmodules"

3591

3389 -#: git-submodule.sh:359

3592 +#: git-submodule.sh:410

3593 #, sh-format

3594 msgid "Failed to register url for submodule path '$path'"

3392 -msgstr ""

3595 +msgstr "Misslyckades registrera url för underkatalogsökväg \"$path\""

3596

3394 -#: git-submodule.sh:364

3597 +#: git-submodule.sh:418

3598 #, sh-format

3599 msgid "Failed to register update mode for submodule path '$path'"

3600 msgstr ""

3601 +"Misslyckades registrera uppdateringsläge för undermodulsökväg \"$path\""

3602

3399 -#: git-submodule.sh:366

3603 +#: git-submodule.sh:420

3604 #, sh-format

3605 msgid "Submodule '$name' ($url) registered for path '$path'"

3402 -msgstr ""

3606 +msgstr "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$path\""

3607

3404 -#: git-submodule.sh:444

3608 +#: git-submodule.sh:519

3609 #, sh-format

3610 msgid ""

3611 "Submodule path '$path' not initialized\n"

3612 "Maybe you want to use 'update --init'?"

3613 msgstr ""

3614 +"Undermodulen \"$path\" har inte initierats\n"

3615 +"Kanske du vill köra \"update --init\"?"

3616

3411 -#: git-submodule.sh:456

3617 +#: git-submodule.sh:532

3618 #, sh-format

3619 msgid "Unable to find current revision in submodule path '$path'"

3414 -msgstr ""

3620 +msgstr "Kan inte hitta aktuell revision i undermodulsökväg \"$path\""

3621

3416 -#: git-submodule.sh:476

3622 +#: git-submodule.sh:551

3623 #, sh-format

3624 msgid "Unable to fetch in submodule path '$path'"

3419 -msgstr ""

3625 +msgstr "Kan inte hämta i undermodulsökväg \"$path\""

3626

3421 -#: git-submodule.sh:482 git-submodule.sh:487 git-submodule.sh:492

3627 +#: git-submodule.sh:565

3628 #, sh-format

3629 msgid "Unable to rebase '$sha1' in submodule path '$path'"

3424 -msgstr ""

3630 +msgstr "Kan inte göra \"rebase\" av \"$sha1\" i undermodulsökväg \"$path\""

3631

3426 -#: git-submodule.sh:483

3632 +#: git-submodule.sh:566

3633 #, sh-format

3634 msgid "Submodule path '$path': rebased into '$sha1'"

3429 -msgstr ""

3635 +msgstr "Undermodulsökvägen \"$path\": \"rebase\":ad in i \"$sha1\""

3636

3431 -#: git-submodule.sh:488

3637 +#: git-submodule.sh:571

3638 +#, sh-format

3639 +msgid "Unable to merge '$sha1' in submodule path '$path'"

3640 +msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$path\""

3641 +

3642 +#: git-submodule.sh:572

3643 #, sh-format

3644 msgid "Submodule path '$path': merged in '$sha1'"

3434 -msgstr ""

3645 +msgstr "Undermodulsökvägen \"$path\": sammanslagen i \"$sha1\""

3646

3436 -#: git-submodule.sh:493

3647 +#: git-submodule.sh:577

3648 +#, sh-format

3649 +msgid "Unable to checkout '$sha1' in submodule path '$path'"

3650 +msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$path\""

3651 +

3652 +#: git-submodule.sh:578

3653 #, sh-format

3654 msgid "Submodule path '$path': checked out '$sha1'"

3439 -msgstr ""

3655 +msgstr "Undermodulsökvägen \"$path\": checkade ut \"$sha1\""

3656

3441 -#: git-submodule.sh:504 git-submodule.sh:797

3657 +#: git-submodule.sh:600 git-submodule.sh:923

3658 #, sh-format

3659 msgid "Failed to recurse into submodule path '$path'"

3444 -msgstr ""

3660 +msgstr "Misslyckades rekursera in i undermodulsökvägen \"$path\""

3661

3446 -#: git-submodule.sh:588

3662 +#: git-submodule.sh:708

3663 msgid "--"

3448 -msgstr ""

3664 +msgstr "--"

3665

3450 -#. unexpected type

3451 -#: git-submodule.sh:628

3452 -#, fuzzy, sh-format

3453 -msgid "unexpected mode $mod_dst"

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

3455 -

3456 -#: git-submodule.sh:646

3666 +#: git-submodule.sh:766

3667 #, sh-format

3668 msgid " Warn: $name doesn't contain commit $sha1_src"

3459 -msgstr ""

3669 +msgstr " Varning: $name innehåller inte incheckning $sha1_src"

3670

3461 -#: git-submodule.sh:649

Update Swedish translation (732t0f0u).