cc7ca63c04 · matheusbsbs/matheus-bagliano

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

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2013-04-10 15:16+0800\n"

11 -"PO-Revision-Date: 2013-04-11 11:56+0100\n"

10 +"POT-Creation-Date: 2013-04-30 08:25+0800\n"

11 +"PO-Revision-Date: 2013-04-30 12:22+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"

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

65 msgid "archive format"

66 msgstr "arkivformat"

67

68 -#: archive.c:324 builtin/log.c:1117

68 +#: archive.c:324 builtin/log.c:1126

69 msgid "prefix"

70 msgstr "prefix"

71

@@ -73,10 +73,10 @@ msgstr "prefix"

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

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

75

76 -#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2366

77 -#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:659

78 -#: builtin/fast-export.c:661 builtin/grep.c:715 builtin/hash-object.c:77

79 -#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536

76 +#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371

77 +#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665

78 +#: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77

79 +#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536

80 #: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149

81 msgid "file"

82 msgstr "fil"

@@ -133,6 +133,77 @@ msgstr ""

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

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

135

136 +#: branch.c:60

137 +#, c-format

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

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

140 +

141 +#: branch.c:82

142 +#, c-format

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

144 +msgstr ""

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

146 +

147 +#: branch.c:83

148 +#, c-format

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

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

151 +

152 +#: branch.c:87

153 +#, c-format

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

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

156 +

157 +#: branch.c:88

158 +#, c-format

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

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

161 +

162 +#: branch.c:92

163 +#, c-format

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

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

166 +

167 +#: branch.c:93

168 +#, c-format

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

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

171 +

172 +#: branch.c:97

173 +#, c-format

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

175 +msgstr ""

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

177 +

178 +#: branch.c:98

179 +#, c-format

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

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

182 +

183 +#: branch.c:118

184 +#, c-format

185 +msgid "Tracking not set up: name too long: %s"

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

187 +

188 +#: branch.c:137

189 +#, c-format

190 +msgid "Not tracking: ambiguous information for ref %s"

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

192 +

193 +#: branch.c:182

194 +#, c-format

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

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

197 +

198 +#: branch.c:187

199 +#, c-format

200 +msgid "A branch named '%s' already exists."

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

202 +

203 +#: branch.c:195

204 +msgid "Cannot force update the current branch."

205 +msgstr "Kan inte tvinga uppdatering av aktuell gren."

206 +

207 #: branch.c:201

208 #, c-format

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

@@ -163,6 +234,29 @@ msgstr ""

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

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

236

237 +#: branch.c:250

238 +#, c-format

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

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

241 +

242 +#: branch.c:270

243 +#, c-format

244 +msgid "Ambiguous object name: '%s'."

245 +msgstr "Objektnamnet är tvetydigt: \"%s\"."

246 +

247 +#: branch.c:275

248 +#, c-format

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

250 +msgstr "Avgreningspunkten är inte giltig: \"%s\""

251 +

252 +#: branch.c:281

253 +msgid "Failed to lock ref for update"

254 +msgstr "Misslyckades låsa referens för uppdatering"

255 +

256 +#: branch.c:299

257 +msgid "Failed to write ref"

258 +msgstr "Misslyckades skriva referens"

259 +

260 #: bundle.c:36

261 #, c-format

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

@@ -182,9 +276,9 @@ msgstr "kunde inte öppna \"%s\""

276 msgid "Repository lacks these prerequisite commits:"

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

278

185 -#: bundle.c:164 sequencer.c:651 sequencer.c:1083 builtin/log.c:300

186 -#: builtin/log.c:754 builtin/log.c:1350 builtin/log.c:1566 builtin/merge.c:349

187 -#: builtin/shortlog.c:157

279 +#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300

280 +#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349

281 +#: builtin/shortlog.c:155

282 msgid "revision walk setup failed"

283 msgstr "misslyckades skapa revisionstraversering"

284

@@ -210,7 +304,7 @@ msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"

304 msgid "rev-list died"

305 msgstr "rev-list dog"

306

213 -#: bundle.c:300 builtin/log.c:1246 builtin/shortlog.c:260

307 +#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258

308 #, c-format

309 msgid "unrecognized argument: %s"

310 msgstr "okänt argument: %s"

@@ -360,7 +454,7 @@ msgstr ""

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

455 "%s"

456

363 -#: diff.c:3480

457 +#: diff.c:3481

458 #, c-format

459 msgid ""

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

@@ -369,7 +463,7 @@ msgstr ""

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

464 "%s"

465

372 -#: diff.c:3494

466 +#: diff.c:3495

467 #, c-format

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

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

@@ -474,8 +568,8 @@ msgstr[1] ""

568 msgid "failed to read the cache"

569 msgstr "misslyckads läsa cachen"

570

477 -#: merge.c:110 builtin/checkout.c:362 builtin/checkout.c:563

478 -#: builtin/clone.c:635

571 +#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566

572 +#: builtin/clone.c:645

573 msgid "unable to write new index file"

574 msgstr "kunde inte skriva ny indexfil"

575

@@ -524,7 +618,7 @@ msgstr "kan inte läsa objektet %s: \"%s\""

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

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

620

527 -#: merge-recursive.c:773 builtin/clone.c:303

621 +#: merge-recursive.c:773 builtin/clone.c:313

622 #, c-format

623 msgid "failed to open '%s'"

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

@@ -1046,11 +1140,21 @@ msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"

1140 msgid "Could not format %s."

1141 msgstr "Kunde inte formatera %s."

1142

1049 -#: sequencer.c:1101

1143 +#: sequencer.c:1083

1144 +#, c-format

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

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

1147 +

1148 +#: sequencer.c:1085

1149 +#, c-format

1150 +msgid "%s: bad revision"

1151 +msgstr "%s: felaktig revision"

1152 +

1153 +#: sequencer.c:1119

1154 msgid "Can't revert as initial commit"

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

1156

1053 -#: sequencer.c:1102

1157 +#: sequencer.c:1120

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

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

1160

@@ -1242,68 +1346,68 @@ msgstr "osammansl.: %s"

1346 msgid "bug: unhandled diff status %c"

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

1348

1245 -#: wt-status.c:805

1349 +#: wt-status.c:803

1350 msgid "You have unmerged paths."

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

1352

1249 -#: wt-status.c:808 wt-status.c:960

1353 +#: wt-status.c:806 wt-status.c:958

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

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

1356

1253 -#: wt-status.c:811

1357 +#: wt-status.c:809

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

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

1360

1257 -#: wt-status.c:814

1361 +#: wt-status.c:812

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

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

1364

1261 -#: wt-status.c:824

1365 +#: wt-status.c:822

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

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

1368

1265 -#: wt-status.c:827

1369 +#: wt-status.c:825

1370 msgid "The current patch is empty."

1371 msgstr "Aktuell patch är tom."

1372

1269 -#: wt-status.c:831

1373 +#: wt-status.c:829

1374 msgid " (fix conflicts and then run \"git am --resolved\")"

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

1376

1273 -#: wt-status.c:833

1377 +#: wt-status.c:831

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

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

1380

1277 -#: wt-status.c:835

1381 +#: wt-status.c:833

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

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

1384

1281 -#: wt-status.c:895 wt-status.c:912

1385 +#: wt-status.c:893 wt-status.c:910

1386 #, c-format

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

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

1389

1286 -#: wt-status.c:900 wt-status.c:917

1390 +#: wt-status.c:898 wt-status.c:915

1391 msgid "You are currently rebasing."

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

1393

1290 -#: wt-status.c:903

1394 +#: wt-status.c:901

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

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

1397

1294 -#: wt-status.c:905

1398 +#: wt-status.c:903

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

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

1401

1298 -#: wt-status.c:907

1402 +#: wt-status.c:905

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

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

1405

1302 -#: wt-status.c:920

1406 +#: wt-status.c:918

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

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

1409

1306 -#: wt-status.c:924

1410 +#: wt-status.c:922

1411 #, c-format

1412 msgid ""

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

@@ -1311,142 +1415,140 @@ msgstr ""

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

1416 "ovanpå \"%s\"."

1417

1314 -#: wt-status.c:929

1418 +#: wt-status.c:927

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

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

1421

1318 -#: wt-status.c:932

1422 +#: wt-status.c:930

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

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

1425

1322 -#: wt-status.c:936

1426 +#: wt-status.c:934

1427 #, c-format

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

1429 msgstr ""

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

1431 "ovanpå \"%s\"."

1432

1329 -#: wt-status.c:941

1433 +#: wt-status.c:939

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

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

1436

1333 -#: wt-status.c:944

1437 +#: wt-status.c:942

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

1439 msgstr ""

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

1441

1338 -#: wt-status.c:946

1442 +#: wt-status.c:944

1443 msgid ""

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

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

1446

1343 -#: wt-status.c:956

1447 +#: wt-status.c:954

1448 msgid "You are currently cherry-picking."

1449 msgstr "Du håller på med en \"cherry-pick\"."

1450

1347 -#: wt-status.c:963

1451 +#: wt-status.c:961

1452 msgid " (all conflicts fixed: run \"git commit\")"

1453 msgstr " (alla konflikter har rättats: kör \"git commit\")"

1454

1351 -#: wt-status.c:972

1455 +#: wt-status.c:970

1456 #, c-format

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

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

1459

1356 -#: wt-status.c:977

1460 +#: wt-status.c:975

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

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

1463

1360 -#: wt-status.c:980

1464 +#: wt-status.c:978

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

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

1467

1364 -#: wt-status.c:982

1468 +#: wt-status.c:980

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

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

1471

1368 -#: wt-status.c:993

1472 +#: wt-status.c:991

1473 #, c-format

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

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

1476

1373 -#: wt-status.c:997

1477 +#: wt-status.c:995

1478 msgid "You are currently bisecting."

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

1480

1377 -#: wt-status.c:1000

1481 +#: wt-status.c:998

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

1483 msgstr ""

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

1485

1382 -#: wt-status.c:1175

1486 +#: wt-status.c:1173

1487 msgid "On branch "

1488 msgstr "På grenen "

1489

1386 -#: wt-status.c:1186

1490 +#: wt-status.c:1184

1491 msgid "HEAD detached at "

1492 msgstr "HEAD frånkopplad vid "

1493

1390 -#: wt-status.c:1188

1494 +#: wt-status.c:1186

1495 msgid "HEAD detached from "

1496 msgstr "HEAD frånkopplad från "

1497

1394 -#: wt-status.c:1191

1498 +#: wt-status.c:1189

1499 msgid "Not currently on any branch."

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

1501

1398 -#: wt-status.c:1208

1502 +#: wt-status.c:1206

1503 msgid "Initial commit"

1504 msgstr "Första incheckning"

1505

1402 -#: wt-status.c:1222

1506 +#: wt-status.c:1220

1507 msgid "Untracked files"

1508 msgstr "Ospårade filer"

1509

1406 -#: wt-status.c:1224

1510 +#: wt-status.c:1222

1511 msgid "Ignored files"

1512 msgstr "Ignorerade filer"

1513

1410 -#: wt-status.c:1228

1514 +#: wt-status.c:1226

1515 #, c-format

1412 -msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"

1413 -msgstr "Det tog %.2f sekunder att räkna ospårade filer. \"status -uno\""

1414 -

1415 -#: wt-status.c:1232

1416 -msgid "may speed it up, but you have to be careful not to forget to add"

1417 -msgstr "kanske gör det snabbare, men du måste vara försiktig så att du"

1418 -

1419 -#: wt-status.c:1235

1420 -msgid "new files yourself (see 'git help status')."

1421 -msgstr "inte glömmer lägga till filer själv (se \"git help status\")"

1516 +msgid ""

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

1518 +"may speed it up, but you have to be careful not to forget to add\n"

1519 +"new files yourself (see 'git help status')."

1520 +msgstr ""

1521 +"Det tog %.2f sekunder att räkna upp ospårade filer. \"status -uno\"\n"

1522 +"kan gå snabbare, men du måste vara försiktig så du inte glömmer\n"

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

1524

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

1424 -#: wt-status.c:1238

1526 +#: wt-status.c:1232

1527 #, c-format

1528 msgid "Untracked files not listed%s"

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

1530

1429 -#: wt-status.c:1240

1531 +#: wt-status.c:1234

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

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

1534

1433 -#: wt-status.c:1246

1535 +#: wt-status.c:1240

1536 msgid "No changes"

1537 msgstr "Inga ändringar"

1538

1437 -#: wt-status.c:1251

1539 +#: wt-status.c:1245

1540 #, c-format

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

1542 msgstr ""

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

1544 "\")\n"

1545

1444 -#: wt-status.c:1254

1546 +#: wt-status.c:1248

1547 #, c-format

1548 msgid "no changes added to commit\n"

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

1550

1449 -#: wt-status.c:1257

1551 +#: wt-status.c:1251

1552 #, c-format

1553 msgid ""

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

@@ -1455,52 +1557,52 @@ msgstr ""

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

1558 "\")\n"

1559

1458 -#: wt-status.c:1260

1560 +#: wt-status.c:1254

1561 #, c-format

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

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

1564

1463 -#: wt-status.c:1263

1565 +#: wt-status.c:1257

1566 #, c-format

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

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

1569

1468 -#: wt-status.c:1266 wt-status.c:1271

1570 +#: wt-status.c:1260 wt-status.c:1265

1571 #, c-format

1572 msgid "nothing to commit\n"

1573 msgstr "inget att checka in\n"

1574

1473 -#: wt-status.c:1269

1575 +#: wt-status.c:1263

1576 #, c-format

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

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

1579

1478 -#: wt-status.c:1273

1580 +#: wt-status.c:1267

1581 #, c-format

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

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

1584

1483 -#: wt-status.c:1381

1585 +#: wt-status.c:1375

1586 msgid "HEAD (no branch)"

1587 msgstr "HEAD (ingen gren)"

1588

1487 -#: wt-status.c:1387

1589 +#: wt-status.c:1381

1590 msgid "Initial commit on "

1591 msgstr "Första incheckning på "

1592

1491 -#: wt-status.c:1402

1593 +#: wt-status.c:1396

1594 msgid "behind "

1595 msgstr "efter "

1596

1495 -#: wt-status.c:1405 wt-status.c:1408

1597 +#: wt-status.c:1399 wt-status.c:1402

1598 msgid "ahead "

1599 msgstr "före "

1600

1499 -#: wt-status.c:1410

1601 +#: wt-status.c:1404

1602 msgid ", behind "

1603 msgstr ", efter "

1604

1503 -#: compat/precompose_utf8.c:58 builtin/clone.c:342

1605 +#: compat/precompose_utf8.c:58 builtin/clone.c:352

1606 #, c-format

1607 msgid "failed to unlink '%s'"

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

@@ -1509,193 +1611,226 @@ msgstr "misslyckades ta bort länken \"%s\""

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

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

1613

1512 -#: builtin/add.c:63

1614 +#.

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

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

1617 +#. * this is not the original behavior and can't be

1618 +#. * changed until users trained themselves not to type

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

1620 +#. * keep the old behavior. Later, the behavior can be changed

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

1622 +#. * eventually we can drop the warning.

1623 +#.

1624 +#: builtin/add.c:58

1625 +#, c-format

1626 +msgid ""

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

1628 +"subdirectory of the tree will change in Git 2.0 and should not be used "

1629 +"anymore.\n"

1630 +"To add content for the whole tree, run:\n"

1631 +"\n"

1632 +" git add %s :/\n"

1633 +" (or git add %s :/)\n"

1634 +"\n"

1635 +"To restrict the command to the current directory, run:\n"

1636 +"\n"

1637 +" git add %s .\n"

1638 +" (or git add %s .)\n"

1639 +"\n"

1640 +"With the current Git version, the command is restricted to the current "

1641 +"directory.\n"

1642 +msgstr ""

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

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

1645 +"användas.\n"

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

1647 +"\n"

1648 +" git add %s :/\n"

1649 +" (eller git add %s :/)\n"

1650 +"\n"

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

1652 +"\n"

1653 +" git add %s .\n"

1654 +" (eller git add %s .)\n"

1655 +"\n"

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

1657 +

1658 +#: builtin/add.c:100

1659 +#, c-format

1660 +msgid ""

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

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

1663 +"Paths like '%s' that are\n"

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

1665 +"\n"

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

1667 +" ignores paths you removed from your working tree.\n"

1668 +"\n"

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

1670 +"\n"

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

1672 +msgstr ""

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

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

1675 +"Sökvägar som \"%s\", som har\n"

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

1677 +"\n"

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

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

1680 +"\n"

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

1682 +"\n"

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

1684 +"arbetskatalogen.\n"

1685 +

1686 +#: builtin/add.c:144

1687 #, c-format

1688 msgid "unexpected diff status %c"

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

1690

1517 -#: builtin/add.c:68 builtin/commit.c:233

1691 +#: builtin/add.c:149 builtin/commit.c:233

1692 msgid "updating files failed"

1693 msgstr "misslyckades uppdatera filer"

1694

1521 -#: builtin/add.c:78

1695 +#: builtin/add.c:163

1696 #, c-format

1697 msgid "remove '%s'\n"

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

1699

1526 -#: builtin/add.c:148

1700 +#: builtin/add.c:253

1701 msgid "Unstaged changes after refreshing the index:"

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

1703

1530 -#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275

1704 +#: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275

1705 #, c-format

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

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

1708

1535 -#: builtin/add.c:234

1709 +#: builtin/add.c:339

1710 msgid "Could not read the index"

1711 msgstr "Kunde inte läsa indexet"

1712

1539 -#: builtin/add.c:244

1713 +#: builtin/add.c:349

1714 #, c-format

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

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

1717

1544 -#: builtin/add.c:248

1718 +#: builtin/add.c:353

1719 msgid "Could not write patch"

1720 msgstr "Kunde inte skriva patch"

1721

1548 -#: builtin/add.c:253

1722 +#: builtin/add.c:358

1723 #, c-format

1724 msgid "Could not stat '%s'"

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

1726

1553 -#: builtin/add.c:255

1727 +#: builtin/add.c:360

1728 msgid "Empty patch. Aborted."

1729 msgstr "Tom patch. Avbryter."

1730

1557 -#: builtin/add.c:261

1731 +#: builtin/add.c:366

1732 #, c-format

1733 msgid "Could not apply '%s'"

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

1735

1562 -#: builtin/add.c:271

1736 +#: builtin/add.c:376

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

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

1739

1566 -#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63

1740 +#: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63

1741 #: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253

1742 #: builtin/rm.c:206

1743 msgid "dry run"

1744 msgstr "testkörning"

1745

1572 -#: builtin/add.c:278 builtin/apply.c:4409 builtin/check-ignore.c:19

1746 +#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19

1747 #: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613

1574 -#: builtin/log.c:1514 builtin/mv.c:62 builtin/read-tree.c:112

1748 +#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112

1749 msgid "be verbose"

1750 msgstr "var pratsam"

1751

1578 -#: builtin/add.c:280

1752 +#: builtin/add.c:396

1753 msgid "interactive picking"

1754 msgstr "plocka interaktivt"

1755

1582 -#: builtin/add.c:281 builtin/checkout.c:1060 builtin/reset.c:258

1756 +#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258

1757 msgid "select hunks interactively"

1758 msgstr "välj stycken interaktivt"

1759

1586 -#: builtin/add.c:282

1760 +#: builtin/add.c:398

1761 msgid "edit current diff and apply"

1762 msgstr "redigera aktuell diff och applicera"

1763

1590 -#: builtin/add.c:283

1764 +#: builtin/add.c:399

1765 msgid "allow adding otherwise ignored files"

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

1767

1594 -#: builtin/add.c:284

1768 +#: builtin/add.c:400

1769 msgid "update tracked files"

1770 msgstr "uppdatera spårade filer"

1771

1598 -#: builtin/add.c:285

1772 +#: builtin/add.c:401

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

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

1775

1602 -#: builtin/add.c:286

1776 +#: builtin/add.c:402

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

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

1779

1606 -#: builtin/add.c:287

1780 +#. takes no arguments

1781 +#: builtin/add.c:405

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

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

1784 +

1785 +#: builtin/add.c:407

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

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

1788

1610 -#: builtin/add.c:288

1789 +#: builtin/add.c:408

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

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

1792

1614 -#: builtin/add.c:289

1793 +#: builtin/add.c:409

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

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

1796

1618 -#: builtin/add.c:311

1797 +#: builtin/add.c:431

1798 #, c-format

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

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

1801

1623 -#: builtin/add.c:312

1802 +#: builtin/add.c:432

1803 msgid "no files added"

1804 msgstr "inga filer har lagts till"

1805

1627 -#: builtin/add.c:318

1806 +#: builtin/add.c:438

1807 msgid "adding files failed"

1808 msgstr "misslyckades lägga till filer"

1809

1631 -#.

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

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

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

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

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

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

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

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

1640 -#.

1641 -#: builtin/add.c:335

1642 -#, c-format

1643 -msgid ""

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

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

1646 -"anymore.\n"

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

1648 -"\n"

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

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

1651 -"\n"

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

1653 -"\n"

1654 -" git add %s .\n"

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

1656 -"\n"

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

1658 -"directory."

1659 -msgstr ""

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

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

1662 -"användas.\n"

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

1664 -"\n"

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

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

1667 -"\n"

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

1669 -"\n"

1670 -" git add %s .\n"

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

1672 -"\n"

1673 -"I nuvarande version av Git begränsas kommandot till aktuell katalog."

1674 -

1675 -#: builtin/add.c:381

1810 +#: builtin/add.c:477

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

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

1813

1679 -#: builtin/add.c:383

1814 +#: builtin/add.c:495

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

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

1817

1683 -#: builtin/add.c:414

1818 +#: builtin/add.c:525

1819 #, c-format

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

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

1822

1688 -#: builtin/add.c:415

1823 +#: builtin/add.c:526

1824 #, c-format

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

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

1827

1693 -#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204

1828 +#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204

1829 #: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235

1830 msgid "index file corrupt"

1831 msgstr "indexfilen trasig"

1832

1698 -#: builtin/add.c:481 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370

1833 +#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370

1834 msgid "Unable to write new index file"

1835 msgstr "Kunde inte skriva ny indexfil"

1836

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

2083 msgid "Checking patch %s..."

2084 msgstr "Kontrollerar patchen %s..."

2085

1951 -#: builtin/apply.c:3679 builtin/checkout.c:215 builtin/reset.c:124

2086 +#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124

2087 #, c-format

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

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

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

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

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

2226

2092 -#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:463

2227 +#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456

2228 msgid "paths are separated with NUL character"

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

2230

@@ -2223,99 +2358,99 @@ msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning"

2358 msgid "git blame [options] [rev-opts] [rev] [--] file"

2359 msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil"

2360

2226 -#: builtin/blame.c:30 builtin/shortlog.c:15

2361 +#: builtin/blame.c:30

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

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

2364

2230 -#: builtin/blame.c:2350

2365 +#: builtin/blame.c:2355

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

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

2368

2234 -#: builtin/blame.c:2351

2369 +#: builtin/blame.c:2356

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

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

2372

2238 -#: builtin/blame.c:2352

2373 +#: builtin/blame.c:2357

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

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

2376

2242 -#: builtin/blame.c:2353

2377 +#: builtin/blame.c:2358

2378 msgid "Show work cost statistics"

2379 msgstr "Visa statistik över arbetskostnad"

2380

2246 -#: builtin/blame.c:2354

2381 +#: builtin/blame.c:2359

2382 msgid "Show output score for blame entries"

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

2384

2250 -#: builtin/blame.c:2355

2385 +#: builtin/blame.c:2360

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

2387 msgstr "Visa originalfilnamn (Standard: auto)"

2388

2254 -#: builtin/blame.c:2356

2389 +#: builtin/blame.c:2361

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

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

2392

2258 -#: builtin/blame.c:2357

2393 +#: builtin/blame.c:2362

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

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

2396

2262 -#: builtin/blame.c:2358

2397 +#: builtin/blame.c:2363

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

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

2400

2266 -#: builtin/blame.c:2359

2401 +#: builtin/blame.c:2364

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

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

2404

2270 -#: builtin/blame.c:2360

2405 +#: builtin/blame.c:2365

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

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

2408

2274 -#: builtin/blame.c:2361

2409 +#: builtin/blame.c:2366

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

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

2412

2278 -#: builtin/blame.c:2362

2413 +#: builtin/blame.c:2367

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

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

2416

2282 -#: builtin/blame.c:2363

2417 +#: builtin/blame.c:2368

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

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

2420

2286 -#: builtin/blame.c:2364

2421 +#: builtin/blame.c:2369

2422 msgid "Ignore whitespace differences"

2423 msgstr "Ignorera ändringar i blanksteg"

2424

2290 -#: builtin/blame.c:2365

2425 +#: builtin/blame.c:2370

2426 msgid "Spend extra cycles to find better match"

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

2428

2294 -#: builtin/blame.c:2366

2429 +#: builtin/blame.c:2371

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

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

2432

2298 -#: builtin/blame.c:2367

2433 +#: builtin/blame.c:2372

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

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

2436

2302 -#: builtin/blame.c:2368 builtin/blame.c:2369

2437 +#: builtin/blame.c:2373 builtin/blame.c:2374

2438 msgid "score"

2439 msgstr "poäng"

2440

2306 -#: builtin/blame.c:2368

2441 +#: builtin/blame.c:2373

2442 msgid "Find line copies within and across files"

2443 msgstr "Hitta kopierade rader inuti och mellan filer"

2444

2310 -#: builtin/blame.c:2369

2445 +#: builtin/blame.c:2374

2446 msgid "Find line movements within and across files"

2447 msgstr "Hitta flyttade rader inuti och mellan filer"

2448

2314 -#: builtin/blame.c:2370

2449 +#: builtin/blame.c:2375

2450 msgid "n,m"

2451 msgstr "n,m"

2452

2318 -#: builtin/blame.c:2370

2453 +#: builtin/blame.c:2375

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

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

2456

@@ -2335,7 +2470,7 @@ msgstr "git branch [flaggor] [-r] (-d | -D) <grennamn>..."

2470 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"

2471 msgstr "git branch [flaggor] (-m | -M) [<gammal_gren>] <ny_gren>"

2472

2338 -#: builtin/branch.c:146

2473 +#: builtin/branch.c:150

2474 #, c-format

2475 msgid ""

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

@@ -2344,7 +2479,7 @@ msgstr ""

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

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

2481

2347 -#: builtin/branch.c:150

2482 +#: builtin/branch.c:154

2483 #, c-format

2484 msgid ""

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

@@ -2353,12 +2488,12 @@ msgstr ""

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

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

2490

2356 -#: builtin/branch.c:164

2491 +#: builtin/branch.c:168

2492 #, c-format

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

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

2495

2361 -#: builtin/branch.c:168

2496 +#: builtin/branch.c:172

2497 #, c-format

2498 msgid ""

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

@@ -2367,332 +2502,332 @@ msgstr ""

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

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

2504

2370 -#: builtin/branch.c:181

2505 +#: builtin/branch.c:185

2506 msgid "Update of config-file failed"

2507 msgstr "Misslyckades uppdatera konfigurationsfil"

2508

2374 -#: builtin/branch.c:209

2509 +#: builtin/branch.c:213

2510 msgid "cannot use -a with -d"

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

2512

2378 -#: builtin/branch.c:215

2513 +#: builtin/branch.c:219

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

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

2516

2382 -#: builtin/branch.c:223

2517 +#: builtin/branch.c:227

2518 #, c-format

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

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

2521

2387 -#: builtin/branch.c:236

2522 +#: builtin/branch.c:240

2523 #, c-format

2524 msgid "remote branch '%s' not found."

2525 msgstr "fjärrgrenen \"%s\" hittades inte."

2526

2392 -#: builtin/branch.c:237

2527 +#: builtin/branch.c:241

2528 #, c-format

2529 msgid "branch '%s' not found."

2530 msgstr "grenen \"%s\" hittades inte."

2531

2397 -#: builtin/branch.c:251

2532 +#: builtin/branch.c:255

2533 #, c-format

2534 msgid "Error deleting remote branch '%s'"

2535 msgstr "Fel vid borttagning av fjärrgrenen \"%s\""

2536

2402 -#: builtin/branch.c:252

2537 +#: builtin/branch.c:256

2538 #, c-format

2539 msgid "Error deleting branch '%s'"

2540 msgstr "Fel vid borttagning av grenen \"%s\""

2541

2407 -#: builtin/branch.c:259

2542 +#: builtin/branch.c:263

2543 #, c-format

2544 msgid "Deleted remote branch %s (was %s).\n"

2545 msgstr "Tog bort fjärrgrenen %s (var %s).\n"

2546

2412 -#: builtin/branch.c:260

2547 +#: builtin/branch.c:264

2548 #, c-format

2549 msgid "Deleted branch %s (was %s).\n"

2550 msgstr "Tog bort grenen %s (var %s).\n"

2551

2417 -#: builtin/branch.c:362

2552 +#: builtin/branch.c:366

2553 #, c-format

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

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

2556

2422 -#: builtin/branch.c:434

2557 +#: builtin/branch.c:453

2558 #, c-format

2559 msgid "[%s: behind %d]"

2560 msgstr "[%s: bakom %d] "

2561

2427 -#: builtin/branch.c:436

2562 +#: builtin/branch.c:455

2563 #, c-format

2564 msgid "[behind %d]"

2565 msgstr "[bakom %d] "

2566

2432 -#: builtin/branch.c:440

2567 +#: builtin/branch.c:459

2568 #, c-format

2569 msgid "[%s: ahead %d]"

2570 msgstr "[%s: före %d] "

2571

2437 -#: builtin/branch.c:442

2572 +#: builtin/branch.c:461

2573 #, c-format

2574 msgid "[ahead %d]"

2575 msgstr "[före %d] "

2576

2442 -#: builtin/branch.c:445

2577 +#: builtin/branch.c:464

2578 #, c-format

2579 msgid "[%s: ahead %d, behind %d]"

2580 msgstr "[%s: före %d, bakom %d] "

2581

2447 -#: builtin/branch.c:448

2582 +#: builtin/branch.c:467

2583 #, c-format

2584 msgid "[ahead %d, behind %d]"

2585 msgstr "[före %d, bakom %d] "

2586

2452 -#: builtin/branch.c:470

2587 +#: builtin/branch.c:490

2588 msgid " **** invalid ref ****"

2589 msgstr " **** ogiltig ref ****"

2590

2456 -#: builtin/branch.c:562

2591 +#: builtin/branch.c:582

2592 #, c-format

2593 msgid "(no branch, rebasing %s)"

2594 msgstr "(ingen gren, ombaserar %s)"

2595

2461 -#: builtin/branch.c:565

2596 +#: builtin/branch.c:585

2597 #, c-format

2598 msgid "(no branch, bisect started on %s)"

2599 msgstr "(ingen gren, \"bisect\" startad på %s)"

2600

2466 -#: builtin/branch.c:568

2601 +#: builtin/branch.c:588

2602 #, c-format

2603 msgid "(detached from %s)"

2604 msgstr "(frånkopplad från %s)"

2605

2471 -#: builtin/branch.c:571

2606 +#: builtin/branch.c:591

2607 msgid "(no branch)"

2608 msgstr "(ingen gren)"

2609

2475 -#: builtin/branch.c:617

2610 +#: builtin/branch.c:637

2611 #, c-format

2612 msgid "object '%s' does not point to a commit"

2613 msgstr "objektet \"%s\" pekar på en incheckning"

2614

2480 -#: builtin/branch.c:649

2615 +#: builtin/branch.c:669

2616 msgid "some refs could not be read"

2617 msgstr "vissa referenser kunde inte läsas"

2618

2484 -#: builtin/branch.c:662

2619 +#: builtin/branch.c:682

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

2621 msgstr ""

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

2623

2489 -#: builtin/branch.c:672

2624 +#: builtin/branch.c:692

2625 #, c-format

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

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

2628

2494 -#: builtin/branch.c:687

2629 +#: builtin/branch.c:707

2630 msgid "Branch rename failed"

2631 msgstr "Misslyckades byta namn på gren"

2632

2498 -#: builtin/branch.c:691

2633 +#: builtin/branch.c:711

2634 #, c-format

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

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

2637

2503 -#: builtin/branch.c:695

2638 +#: builtin/branch.c:715

2639 #, c-format

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

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

2642

2508 -#: builtin/branch.c:702

2643 +#: builtin/branch.c:722

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

2645 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

2646

2512 -#: builtin/branch.c:717

2647 +#: builtin/branch.c:737

2648 #, c-format

2649 msgid "malformed object name %s"

2650 msgstr "felformat objektnamn %s"

2651

2517 -#: builtin/branch.c:741

2652 +#: builtin/branch.c:761

2653 #, c-format

2654 msgid "could not write branch description template: %s"

2655 msgstr "kunde inte skriva grenbeskrivningsmall: %s"

2656

2522 -#: builtin/branch.c:771

2657 +#: builtin/branch.c:791

2658 msgid "Generic options"

2659 msgstr "Allmänna flaggor"

2660

2526 -#: builtin/branch.c:773

2661 +#: builtin/branch.c:793

2662 msgid "show hash and subject, give twice for upstream branch"

2663 msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"

2664

2530 -#: builtin/branch.c:774

2665 +#: builtin/branch.c:794

2666 msgid "suppress informational messages"

2667 msgstr "undertryck informationsmeddelanden"

2668

2534 -#: builtin/branch.c:775

2669 +#: builtin/branch.c:795

2670 msgid "set up tracking mode (see git-pull(1))"

2671 msgstr "ställ in spårningsläge (se git-pull(1))"

2672

2538 -#: builtin/branch.c:777

2673 +#: builtin/branch.c:797

2674 msgid "change upstream info"

2675 msgstr "ändra uppströmsinformation"

2676

2542 -#: builtin/branch.c:781

2677 +#: builtin/branch.c:801

2678 msgid "use colored output"

2679 msgstr "använd färgad utdata"

2680

2546 -#: builtin/branch.c:782

2681 +#: builtin/branch.c:802

2682 msgid "act on remote-tracking branches"

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

2684

2550 -#: builtin/branch.c:785 builtin/branch.c:791 builtin/branch.c:812

2551 -#: builtin/branch.c:818 builtin/commit.c:1368 builtin/commit.c:1369

2685 +#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832

2686 +#: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369

2687 #: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468

2688 msgid "commit"

2689 msgstr "incheckning"

2690

2556 -#: builtin/branch.c:786 builtin/branch.c:792

2691 +#: builtin/branch.c:806 builtin/branch.c:812

2692 msgid "print only branches that contain the commit"

2693 msgstr "visa endast grenar som innehåller incheckningen"

2694

2560 -#: builtin/branch.c:798

2695 +#: builtin/branch.c:818

2696 msgid "Specific git-branch actions:"

2697 msgstr "Specifika git-branch-åtgärder:"

2698

2564 -#: builtin/branch.c:799

2699 +#: builtin/branch.c:819

2700 msgid "list both remote-tracking and local branches"

2701 msgstr "visa både fjärrspårande och lokala grenar"

2702

2568 -#: builtin/branch.c:801

2703 +#: builtin/branch.c:821

2704 msgid "delete fully merged branch"

2705 msgstr "ta bort helt sammanslagen gren"

2706

2572 -#: builtin/branch.c:802

2707 +#: builtin/branch.c:822

2708 msgid "delete branch (even if not merged)"

2709 msgstr "ta bort gren (även om inte helt sammanslagen)"

2710

2576 -#: builtin/branch.c:803

2711 +#: builtin/branch.c:823

2712 msgid "move/rename a branch and its reflog"

2713 msgstr "flytta/ta bort en gren och dess reflogg"

2714

2580 -#: builtin/branch.c:804

2715 +#: builtin/branch.c:824

2716 msgid "move/rename a branch, even if target exists"

2717 msgstr "flytta/ta bort en gren, även om målet finns"

2718

2584 -#: builtin/branch.c:805

2719 +#: builtin/branch.c:825

2720 msgid "list branch names"

2721 msgstr "lista namn på grenar"

2722

2588 -#: builtin/branch.c:806

2723 +#: builtin/branch.c:826

2724 msgid "create the branch's reflog"

2725 msgstr "skapa grenens reflogg"

2726

2592 -#: builtin/branch.c:808

2727 +#: builtin/branch.c:828

2728 msgid "edit the description for the branch"

2729 msgstr "redigera beskrivning för grenen"

2730

2596 -#: builtin/branch.c:809

2731 +#: builtin/branch.c:829

2732 msgid "force creation (when already exists)"

2733 msgstr "tvinga skapande (när den redan finns)"

2734

2600 -#: builtin/branch.c:812

2735 +#: builtin/branch.c:832

2736 msgid "print only not merged branches"

2737 msgstr "visa endast ej sammanslagna grenar"

2738

2604 -#: builtin/branch.c:818

2739 +#: builtin/branch.c:838

2740 msgid "print only merged branches"

2741 msgstr "visa endast sammanslagna grenar"

2742

2608 -#: builtin/branch.c:822

2743 +#: builtin/branch.c:842

2744 msgid "list branches in columns"

2745 msgstr "visa grenar i spalter"

2746

2612 -#: builtin/branch.c:835

2747 +#: builtin/branch.c:855

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

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

2750

2616 -#: builtin/branch.c:840 builtin/clone.c:609

2751 +#: builtin/branch.c:860 builtin/clone.c:619

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

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

2754

2620 -#: builtin/branch.c:863

2755 +#: builtin/branch.c:883

2756 msgid "--column and --verbose are incompatible"

2757 msgstr "--column och --verbose är inkompatibla"

2758

2624 -#: builtin/branch.c:869 builtin/branch.c:908

2759 +#: builtin/branch.c:889 builtin/branch.c:928

2760 msgid "branch name required"

2761 msgstr "grennamn krävs"

2762

2628 -#: builtin/branch.c:884

2763 +#: builtin/branch.c:904

2764 msgid "Cannot give description to detached HEAD"

2765 msgstr "Kan inte beskriva frånkopplad HEAD"

2766

2632 -#: builtin/branch.c:889

2767 +#: builtin/branch.c:909

2768 msgid "cannot edit description of more than one branch"

2769 msgstr "kan inte redigera beskrivning för mer än en gren"

2770

2636 -#: builtin/branch.c:896

2771 +#: builtin/branch.c:916

2772 #, c-format

2773 msgid "No commit on branch '%s' yet."

2774 msgstr "Inga incheckningar på grenen \"%s\" ännu"

2775

2641 -#: builtin/branch.c:899

2776 +#: builtin/branch.c:919

2777 #, c-format

2778 msgid "No branch named '%s'."

2779 msgstr "Ingen gren vid namnet \"%s\"."

2780

2646 -#: builtin/branch.c:914

2781 +#: builtin/branch.c:934

2782 msgid "too many branches for a rename operation"

2783 msgstr "för många grenar för namnbyte"

2784

2650 -#: builtin/branch.c:919

2785 +#: builtin/branch.c:939

2786 msgid "too many branches to set new upstream"

2787 msgstr "för många grenar för att byta uppström"

2788

2654 -#: builtin/branch.c:923

2789 +#: builtin/branch.c:943

2790 #, c-format

2791 msgid ""

2792 "could not set upstream of HEAD to %s when it does not point to any branch."

2793 msgstr ""

2794 "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."

2795

2661 -#: builtin/branch.c:926 builtin/branch.c:948 builtin/branch.c:970

2796 +#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990

2797 #, c-format

2798 msgid "no such branch '%s'"

2799 msgstr "okänd gren \"%s\""

2800

2666 -#: builtin/branch.c:930

2801 +#: builtin/branch.c:950

2802 #, c-format

2803 msgid "branch '%s' does not exist"

2804 msgstr "grenen \"%s\" finns inte"

2805

2671 -#: builtin/branch.c:942

2806 +#: builtin/branch.c:962

2807 msgid "too many branches to unset upstream"

2808 msgstr "för många grenar för att ta bort uppström"

2809

2675 -#: builtin/branch.c:946

2810 +#: builtin/branch.c:966

2811 msgid "could not unset upstream of HEAD when it does not point to any branch."

2812 msgstr ""

2813 "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."

2814

2680 -#: builtin/branch.c:952

2815 +#: builtin/branch.c:972

2816 #, c-format

2817 msgid "Branch '%s' has no upstream information"

2818 msgstr "Grenen \"%s\" har ingen uppströmsinformation"

2819

2685 -#: builtin/branch.c:967

2820 +#: builtin/branch.c:987

2821 msgid "it does not make sense to create 'HEAD' manually"

2822 msgstr "kan inte skapa \"HEAD\" manuellt"

2823

2689 -#: builtin/branch.c:973

2824 +#: builtin/branch.c:993

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

2826 msgstr ""

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

2828 "grennamn"

2829

2695 -#: builtin/branch.c:976

2830 +#: builtin/branch.c:996

2831 #, c-format

2832 msgid ""

2833 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -2701,7 +2836,7 @@ msgstr ""

2836 "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "

2837 "eller --set-upstream-to\n"

2838

2704 -#: builtin/branch.c:993

2839 +#: builtin/branch.c:1013

2840 #, c-format

2841 msgid ""

2842 "\n"

@@ -2712,12 +2847,12 @@ msgstr ""

2847 "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"

2848 "\n"

2849

2715 -#: builtin/branch.c:994

2850 +#: builtin/branch.c:1014

2851 #, c-format

2852 msgid " git branch -d %s\n"

2853 msgstr " git branch -d %s\n"

2854

2720 -#: builtin/branch.c:995

2855 +#: builtin/branch.c:1015

2856 #, c-format

2857 msgid " git branch --set-upstream-to %s\n"

2858 msgstr " git branch --set-upstream-to %s\n"

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

2870 msgid "Need a repository to unbundle."

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

2872

2738 -#: builtin/cat-file.c:247

2873 +#: builtin/cat-file.c:176

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

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

2876

2742 -#: builtin/cat-file.c:248

2877 +#: builtin/cat-file.c:177

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

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

2880

2746 -#: builtin/cat-file.c:266

2881 +#: builtin/cat-file.c:195

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

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

2884

2750 -#: builtin/cat-file.c:267

2885 +#: builtin/cat-file.c:196

2886 msgid "show object type"

2887 msgstr "visa objekttyp"

2888

2754 -#: builtin/cat-file.c:268

2889 +#: builtin/cat-file.c:197

2890 msgid "show object size"

2891 msgstr "visa objektstorlek"

2892

2758 -#: builtin/cat-file.c:270

2893 +#: builtin/cat-file.c:199

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

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

2896

2762 -#: builtin/cat-file.c:271

2897 +#: builtin/cat-file.c:200

2898 msgid "pretty-print object's content"

2899 msgstr "visa objektets innehåll snyggt"

2900

2766 -#: builtin/cat-file.c:273

2901 +#: builtin/cat-file.c:202

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

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

2904

2770 -#: builtin/cat-file.c:275

2905 +#: builtin/cat-file.c:204

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

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

2908

2774 -#: builtin/cat-file.c:278

2909 +#: builtin/cat-file.c:207

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

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

2912

@@ -2799,27 +2934,27 @@ msgstr "läs filnamn från standard in"

2934 msgid "input paths are terminated by a null character"

2935 msgstr "sökvägar avdelas med null-tecken"

2936

2802 -#: builtin/check-ignore.c:18 builtin/checkout.c:1041 builtin/gc.c:177

2937 +#: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177

2938 msgid "suppress progress reporting"

2939 msgstr "undertryck förloppsrapportering"

2940

2806 -#: builtin/check-ignore.c:151

2941 +#: builtin/check-ignore.c:146

2942 msgid "cannot specify pathnames with --stdin"

2943 msgstr "kan inte ange sökvägsnamn med --stdin"

2944

2810 -#: builtin/check-ignore.c:154

2945 +#: builtin/check-ignore.c:149

2946 msgid "-z only makes sense with --stdin"

2947 msgstr "-z kan endast användas tillsammans med --stdin"

2948

2814 -#: builtin/check-ignore.c:156

2949 +#: builtin/check-ignore.c:151

2950 msgid "no path specified"

2951 msgstr "ingen sökväg angavs"

2952

2818 -#: builtin/check-ignore.c:160

2953 +#: builtin/check-ignore.c:155

2954 msgid "--quiet is only valid with a single pathname"

2955 msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn"

2956

2822 -#: builtin/check-ignore.c:162

2957 +#: builtin/check-ignore.c:157

2958 msgid "cannot have both --quiet and --verbose"

2959 msgstr "kan inte använda både --quiet och --verbose"

2960

@@ -2875,106 +3010,106 @@ msgstr "git checkout [flaggor] <gren>"

3010 msgid "git checkout [options] [<branch>] -- <file>..."

3011 msgstr "git checkout [flaggor] [<gren>] -- <fil>..."

3012

2878 -#: builtin/checkout.c:116 builtin/checkout.c:149

3013 +#: builtin/checkout.c:117 builtin/checkout.c:150

3014 #, c-format

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

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

3017

2883 -#: builtin/checkout.c:118 builtin/checkout.c:151

3018 +#: builtin/checkout.c:119 builtin/checkout.c:152

3019 #, c-format

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

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

3022

2888 -#: builtin/checkout.c:134

3023 +#: builtin/checkout.c:135

3024 #, c-format

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

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

3027

2893 -#: builtin/checkout.c:178

3028 +#: builtin/checkout.c:179

3029 #, c-format

3030 msgid "path '%s' does not have necessary versions"

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

3032

2898 -#: builtin/checkout.c:195

3033 +#: builtin/checkout.c:196

3034 #, c-format

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

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

3037

2903 -#: builtin/checkout.c:212

3038 +#: builtin/checkout.c:213

3039 #, c-format

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

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

3042

2908 -#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242

2909 -#: builtin/checkout.c:245

3043 +#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243

3044 +#: builtin/checkout.c:246

3045 #, c-format

3046 msgid "'%s' cannot be used with updating paths"

3047 msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"

3048

2914 -#: builtin/checkout.c:248 builtin/checkout.c:251

3049 +#: builtin/checkout.c:249 builtin/checkout.c:252

3050 #, c-format

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

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

3053

2919 -#: builtin/checkout.c:254

3054 +#: builtin/checkout.c:255

3055 #, c-format

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

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

3058

2924 -#: builtin/checkout.c:265 builtin/checkout.c:455

3059 +#: builtin/checkout.c:266 builtin/checkout.c:458

3060 msgid "corrupt index file"

3061 msgstr "indexfilen är trasig"

3062

2928 -#: builtin/checkout.c:326 builtin/checkout.c:333

3063 +#: builtin/checkout.c:329 builtin/checkout.c:336

3064 #, c-format

3065 msgid "path '%s' is unmerged"

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

3067

2933 -#: builtin/checkout.c:477

3068 +#: builtin/checkout.c:480

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

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

3071

2937 -#: builtin/checkout.c:598

3072 +#: builtin/checkout.c:601

3073 #, c-format

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

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

3076

2942 -#: builtin/checkout.c:631

3077 +#: builtin/checkout.c:634

3078 msgid "HEAD is now at"

3079 msgstr "HEAD är nu på"

3080

2946 -#: builtin/checkout.c:638

3081 +#: builtin/checkout.c:641

3082 #, c-format

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

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

3085

2951 -#: builtin/checkout.c:641

3086 +#: builtin/checkout.c:644

3087 #, c-format

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

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

3090

2956 -#: builtin/checkout.c:645

3091 +#: builtin/checkout.c:648

3092 #, c-format

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

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

3095

2961 -#: builtin/checkout.c:647 builtin/checkout.c:984

3096 +#: builtin/checkout.c:650 builtin/checkout.c:987

3097 #, c-format

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

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

3100

2966 -#: builtin/checkout.c:649

3101 +#: builtin/checkout.c:652

3102 #, c-format

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

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

3105

2971 -#: builtin/checkout.c:705

3106 +#: builtin/checkout.c:708

3107 #, c-format

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

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

3110

3111 #. The singular version

2977 -#: builtin/checkout.c:711

3112 +#: builtin/checkout.c:714

3113 #, c-format

3114 msgid ""

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

@@ -2997,7 +3132,7 @@ msgstr[1] ""

3132 "\n"

3133 "%s\n"

3134

3000 -#: builtin/checkout.c:729

3135 +#: builtin/checkout.c:732

3136 #, c-format

3137 msgid ""

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

@@ -3012,132 +3147,136 @@ msgstr ""

3147 " git branch nytt_grennamn %s\n"

3148 "\n"

3149

3015 -#: builtin/checkout.c:759

3150 +#: builtin/checkout.c:762

3151 msgid "internal error in revision walk"

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

3153

3019 -#: builtin/checkout.c:763

3154 +#: builtin/checkout.c:766

3155 msgid "Previous HEAD position was"

3156 msgstr "Tidigare position för HEAD var"

3157

3023 -#: builtin/checkout.c:790 builtin/checkout.c:979

3158 +#: builtin/checkout.c:793 builtin/checkout.c:982

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

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

3161

3162 #. case (1)

3028 -#: builtin/checkout.c:915

3163 +#: builtin/checkout.c:918

3164 #, c-format

3165 msgid "invalid reference: %s"

3166 msgstr "felaktig referens: %s"

3167

3168 #. case (1): want a tree

3034 -#: builtin/checkout.c:954

3169 +#: builtin/checkout.c:957

3170 #, c-format

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

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

3173

3039 -#: builtin/checkout.c:993

3174 +#: builtin/checkout.c:996

3175 msgid "paths cannot be used with switching branches"

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

3177

3043 -#: builtin/checkout.c:996 builtin/checkout.c:1000

3178 +#: builtin/checkout.c:999 builtin/checkout.c:1003

3179 #, c-format

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

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

3182

3048 -#: builtin/checkout.c:1004 builtin/checkout.c:1007 builtin/checkout.c:1012

3049 -#: builtin/checkout.c:1015

3183 +#: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015

3184 +#: builtin/checkout.c:1018

3185 #, c-format

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

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

3188

3054 -#: builtin/checkout.c:1020

3189 +#: builtin/checkout.c:1023

3190 #, c-format

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

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

3193

3059 -#: builtin/checkout.c:1042 builtin/checkout.c:1044 builtin/clone.c:90

3194 +#: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90

3195 #: builtin/remote.c:169 builtin/remote.c:171

3196 msgid "branch"

3197 msgstr "gren"

3198

3064 -#: builtin/checkout.c:1043

3199 +#: builtin/checkout.c:1046

3200 msgid "create and checkout a new branch"

3201 msgstr "skapa och checka ut en ny gren"

3202

3068 -#: builtin/checkout.c:1045

3203 +#: builtin/checkout.c:1048

3204 msgid "create/reset and checkout a branch"

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

3206

3072 -#: builtin/checkout.c:1046

3207 +#: builtin/checkout.c:1049

3208 msgid "create reflog for new branch"

3209 msgstr "skapa reflogg för ny gren"

3210

3076 -#: builtin/checkout.c:1047

3211 +#: builtin/checkout.c:1050

3212 msgid "detach the HEAD at named commit"

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

3214

3080 -#: builtin/checkout.c:1048

3215 +#: builtin/checkout.c:1051

3216 msgid "set upstream info for new branch"

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

3218

3084 -#: builtin/checkout.c:1050

3219 +#: builtin/checkout.c:1053

3220 msgid "new branch"

3221 msgstr "ny gren"

3222

3088 -#: builtin/checkout.c:1050

3223 +#: builtin/checkout.c:1053

3224 msgid "new unparented branch"

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

3226

3092 -#: builtin/checkout.c:1051

3227 +#: builtin/checkout.c:1054

3228 msgid "checkout our version for unmerged files"

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

3230

3096 -#: builtin/checkout.c:1053

3231 +#: builtin/checkout.c:1056

3232 msgid "checkout their version for unmerged files"

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

3234

3100 -#: builtin/checkout.c:1055

3235 +#: builtin/checkout.c:1058

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

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

3238

3104 -#: builtin/checkout.c:1056

3239 +#: builtin/checkout.c:1059

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

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

3242

3108 -#: builtin/checkout.c:1057 builtin/merge.c:217

3243 +#: builtin/checkout.c:1060 builtin/merge.c:217

3244 msgid "update ignored files (default)"

3245 msgstr "uppdatera ignorerade filer (standard)"

3246

3112 -#: builtin/checkout.c:1058 builtin/log.c:1149 parse-options.h:245

3247 +#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245

3248 msgid "style"

3249 msgstr "stil"

3250

3116 -#: builtin/checkout.c:1059

3251 +#: builtin/checkout.c:1062

3252 msgid "conflict style (merge or diff3)"

3253 msgstr "konfliktstil (merge eller diff3)"

3254

3120 -#: builtin/checkout.c:1062

3255 +#: builtin/checkout.c:1065

3256 +msgid "do not limit pathspecs to sparse entries only"

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

3258 +

3259 +#: builtin/checkout.c:1067

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

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

3262

3124 -#: builtin/checkout.c:1086

3263 +#: builtin/checkout.c:1091

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

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

3266

3128 -#: builtin/checkout.c:1103

3267 +#: builtin/checkout.c:1108

3268 msgid "--track needs a branch name"

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

3270

3132 -#: builtin/checkout.c:1110

3271 +#: builtin/checkout.c:1115

3272 msgid "Missing branch name; try -b"

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

3274

3136 -#: builtin/checkout.c:1145

3275 +#: builtin/checkout.c:1150

3276 msgid "invalid path specification"

3277 msgstr "felaktig sökvägsangivelse"

3278

3140 -#: builtin/checkout.c:1152

3279 +#: builtin/checkout.c:1157

3280 #, c-format

3281 msgid ""

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

@@ -3146,12 +3285,12 @@ msgstr ""

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

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

3287

3149 -#: builtin/checkout.c:1157

3288 +#: builtin/checkout.c:1162

3289 #, c-format

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

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

3292

3154 -#: builtin/checkout.c:1161

3293 +#: builtin/checkout.c:1166

3294 msgid ""

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

3296 "checking out of the index."

@@ -3202,7 +3341,7 @@ msgid "remove whole directories"

3341 msgstr "ta bort hela kataloger"

3342

3343 #: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717

3205 -#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182

3344 +#: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182

3345 msgid "pattern"

3346 msgstr "mönster"

3347

@@ -3330,47 +3469,47 @@ msgstr "nyckel=värde"

3469 msgid "set config inside the new repository"

3470 msgstr "ställ in konfiguration i det nya arkivet"

3471

3333 -#: builtin/clone.c:244

3472 +#: builtin/clone.c:254

3473 #, c-format

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

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

3474 +msgid "reference repository '%s' is not a local repository."

3475 +msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."

3476

3338 -#: builtin/clone.c:307

3477 +#: builtin/clone.c:317

3478 #, c-format

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

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

3481

3343 -#: builtin/clone.c:309 builtin/diff.c:77

3482 +#: builtin/clone.c:319 builtin/diff.c:77

3483 #, c-format

3484 msgid "failed to stat '%s'"

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

3486

3348 -#: builtin/clone.c:311

3487 +#: builtin/clone.c:321

3488 #, c-format

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

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

3491

3353 -#: builtin/clone.c:325

3492 +#: builtin/clone.c:335

3493 #, c-format

3494 msgid "failed to stat %s\n"

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

3496

3358 -#: builtin/clone.c:347

3497 +#: builtin/clone.c:357

3498 #, c-format

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

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

3501

3363 -#: builtin/clone.c:351

3502 +#: builtin/clone.c:361

3503 #, c-format

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

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

3506

3368 -#: builtin/clone.c:374

3507 +#: builtin/clone.c:384

3508 #, c-format

3509 msgid "done.\n"

3510 msgstr "klart.\n"

3511

3373 -#: builtin/clone.c:387

3512 +#: builtin/clone.c:397

3513 msgid ""

3514 "Clone succeeded, but checkout failed.\n"

3515 "You can inspect what was checked out with 'git status'\n"

@@ -3380,91 +3519,91 @@ msgstr ""

3519 "Du kan inspektera det som checkades ut med \"git status\"\n"

3520 "och försöka checka ut igen med \"git checkout -f HEAD\"\n"

3521

3383 -#: builtin/clone.c:466

3522 +#: builtin/clone.c:476

3523 #, c-format

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

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

3526

3388 -#: builtin/clone.c:540

3527 +#: builtin/clone.c:550

3528 msgid "remote did not send all necessary objects"

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

3530

3392 -#: builtin/clone.c:600

3531 +#: builtin/clone.c:610

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

3533 msgstr ""

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

3535

3397 -#: builtin/clone.c:631

3536 +#: builtin/clone.c:641

3537 msgid "unable to checkout working tree"

3538 msgstr "kunde inte checka ut arbetskatalogen"

3539

3401 -#: builtin/clone.c:739

3540 +#: builtin/clone.c:749

3541 msgid "Too many arguments."

3542 msgstr "För många argument."

3543

3405 -#: builtin/clone.c:743

3544 +#: builtin/clone.c:753

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

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

3547

3409 -#: builtin/clone.c:754

3548 +#: builtin/clone.c:764

3549 #, c-format

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

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

3552

3414 -#: builtin/clone.c:757

3553 +#: builtin/clone.c:767

3554 msgid "--bare and --separate-git-dir are incompatible."

3555 msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."

3556

3418 -#: builtin/clone.c:770

3557 +#: builtin/clone.c:780

3558 #, c-format

3559 msgid "repository '%s' does not exist"

3560 msgstr "arkivet \"%s\" finns inte"

3561

3423 -#: builtin/clone.c:775

3562 +#: builtin/clone.c:785

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

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

3565

3427 -#: builtin/clone.c:785

3566 +#: builtin/clone.c:795

3567 #, c-format

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

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

3570

3432 -#: builtin/clone.c:795

3571 +#: builtin/clone.c:805

3572 #, c-format

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

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

3575

3437 -#: builtin/clone.c:808 builtin/clone.c:820

3576 +#: builtin/clone.c:818 builtin/clone.c:830

3577 #, c-format

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

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

3580

3442 -#: builtin/clone.c:811

3581 +#: builtin/clone.c:821

3582 #, c-format

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

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

3585

3447 -#: builtin/clone.c:830

3586 +#: builtin/clone.c:840

3587 #, c-format

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

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

3590

3452 -#: builtin/clone.c:832

3591 +#: builtin/clone.c:842

3592 #, c-format

3593 msgid "Cloning into '%s'...\n"

3594 msgstr "Klonar till \"%s\"...\n"

3595

3457 -#: builtin/clone.c:867

3596 +#: builtin/clone.c:877

3597 #, c-format

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

3599 msgstr "Vet inte hur man klonar %s"

3600

3462 -#: builtin/clone.c:916

3601 +#: builtin/clone.c:926

3602 #, c-format

3603 msgid "Remote branch %s not found in upstream %s"

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

3605

3467 -#: builtin/clone.c:923

3606 +#: builtin/clone.c:933

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

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

3609

@@ -3610,7 +3749,7 @@ msgstr "Felaktig indragningssträng: \"%s\""

3749 msgid "could not lookup commit %s"

3750 msgstr "kunde inte slå upp incheckningen %s"

3751

3613 -#: builtin/commit.c:612 builtin/shortlog.c:272

3752 +#: builtin/commit.c:612 builtin/shortlog.c:270

3753 #, c-format

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

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

@@ -3811,8 +3950,8 @@ msgstr "visa status i långt format (standard)"

3950 msgid "terminate entries with NUL"

3951 msgstr "terminera poster med NUL"

3952

3814 -#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:653

3815 -#: builtin/fast-export.c:656 builtin/tag.c:459

3953 +#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659

3954 +#: builtin/fast-export.c:662 builtin/tag.c:459

3955 msgid "mode"

3956 msgstr "läge"

3957

@@ -3920,7 +4059,7 @@ msgstr ""

4059 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4060 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"

4061

3923 -#: builtin/commit.c:1373 builtin/log.c:1104 builtin/revert.c:109

4062 +#: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109

4063 msgid "add Signed-off-by:"

4064 msgstr "lägg till Signed-off-by:"

4065

@@ -4174,8 +4313,12 @@ msgid "respect include directives on lookup"

4313 msgstr "respektera inkluderingsdirektiv vid uppslag"

4314

4315 #: builtin/count-objects.c:82

4177 -msgid "git count-objects [-v]"

4178 -msgstr "git count-objects [-v]"

4316 +msgid "git count-objects [-v] [-H | --human-readable]"

4317 +msgstr "git count-objects [-v] [-H | --human-readable]"

4318 +

4319 +#: builtin/count-objects.c:97

4320 +msgid "print sizes in human readable format"

4321 +msgstr "skriv storlekar i människoläsbart format"

4322

4323 #: builtin/describe.c:15

4324 msgid "git describe [options] <committish>*"

@@ -4351,39 +4494,39 @@ msgstr "ej hanterat objekt \"%s\" angavs."

4494 msgid "git fast-export [rev-list-opts]"

4495 msgstr "git fast-export [rev-list-flaggor]"

4496

4354 -#: builtin/fast-export.c:652

4497 +#: builtin/fast-export.c:658

4498 msgid "show progress after <n> objects"

4499 msgstr "visa förlopp efter <n> objekt"

4500

4358 -#: builtin/fast-export.c:654

4501 +#: builtin/fast-export.c:660

4502 msgid "select handling of signed tags"

4503 msgstr "välj hantering av signerade taggar"

4504

4362 -#: builtin/fast-export.c:657

4505 +#: builtin/fast-export.c:663

4506 msgid "select handling of tags that tag filtered objects"

4507 msgstr "välj hantering av taggar som har taggfiltrerade objekt"

4508

4366 -#: builtin/fast-export.c:660

4509 +#: builtin/fast-export.c:666

4510 msgid "Dump marks to this file"

4511 msgstr "Dump märken till filen"

4512

4370 -#: builtin/fast-export.c:662

4513 +#: builtin/fast-export.c:668

4514 msgid "Import marks from this file"

4515 msgstr "Importera märken från filen"

4516

4374 -#: builtin/fast-export.c:664

4517 +#: builtin/fast-export.c:670

4518 msgid "Fake a tagger when tags lack one"

4519 msgstr "Fejka taggare när taggen saknar en"

4520

4378 -#: builtin/fast-export.c:666

4521 +#: builtin/fast-export.c:672

4522 msgid "Output full tree for each commit"

4523 msgstr "Skriv ut hela trädet för varje incheckning"

4524

4382 -#: builtin/fast-export.c:668

4525 +#: builtin/fast-export.c:674

4526 msgid "Use the done feature to terminate the stream"

4527 msgstr "Använd done-funktionen för att avsluta strömmen"

4528

4386 -#: builtin/fast-export.c:669

4529 +#: builtin/fast-export.c:675

4530 msgid "Skip output of blob data"

4531 msgstr "Hoppa över skrivning av blob-data"

4532

@@ -4459,7 +4602,7 @@ msgstr "fördjupa historik för grund klon"

4602 msgid "convert to a complete repository"

4603 msgstr "konvertera till komplett arkiv"

4604

4462 -#: builtin/fetch.c:88 builtin/log.c:1121

4605 +#: builtin/fetch.c:88 builtin/log.c:1130

4606 msgid "dir"

4607 msgstr "kat"

4608

@@ -4639,29 +4782,29 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

4782 msgstr ""

4783 "git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]"

4784

4642 -#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701

4643 -#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175

4785 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701

4786 +#: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175

4787 #: builtin/tag.c:446 parse-options.h:133 parse-options.h:239

4788 msgid "n"

4789 msgstr "n"

4790

4648 -#: builtin/fmt-merge-msg.c:660

4791 +#: builtin/fmt-merge-msg.c:664

4792 msgid "populate log with at most <n> entries from shortlog"

4793 msgstr "fyll i loggen med som mest <n> poster från shortlog"

4794

4652 -#: builtin/fmt-merge-msg.c:663

4795 +#: builtin/fmt-merge-msg.c:667

4796 msgid "alias for --log (deprecated)"

4797 msgstr "alias för --log (avråds)"

4798

4656 -#: builtin/fmt-merge-msg.c:666

4799 +#: builtin/fmt-merge-msg.c:670

4800 msgid "text"

4801 msgstr "text"

4802

4660 -#: builtin/fmt-merge-msg.c:667

4803 +#: builtin/fmt-merge-msg.c:671

4804 msgid "use <text> as start of message"

4805 msgstr "inled meddelande med <text>"

4806

4664 -#: builtin/fmt-merge-msg.c:668

4807 +#: builtin/fmt-merge-msg.c:672

4808 msgid "file to read from"

4809 msgstr "fil att läsa från"

4810

@@ -5053,50 +5196,54 @@ msgstr "spara filen som den är utan filer"

5196 msgid "process file as it were from this path"

5197 msgstr "hantera filen som om den kom från sökvägen"

5198

5056 -#: builtin/help.c:42

5199 +#: builtin/help.c:43

5200 msgid "print all available commands"

5201 msgstr "visa alla tillgängliga kommandon"

5202

5060 -#: builtin/help.c:43

5203 +#: builtin/help.c:44

5204 +msgid "print list of useful guides"

5205 +msgstr "lista användbara vägledningar"

5206 +

5207 +#: builtin/help.c:45

5208 msgid "show man page"

5209 msgstr "visa manualsida"

5210

5064 -#: builtin/help.c:44

5211 +#: builtin/help.c:46

5212 msgid "show manual in web browser"

5213 msgstr "visa manual i webbläsare"

5214

5068 -#: builtin/help.c:46

5215 +#: builtin/help.c:48

5216 msgid "show info page"

5217 msgstr "visa info-sida"

5218

5072 -#: builtin/help.c:52

5073 -msgid "git help [--all] [--man|--web|--info] [command]"

5074 -msgstr "git help [--all] [--man|--web|--info] [kommando]"

5219 +#: builtin/help.c:54

5220 +msgid "git help [--all] [--guides] [--man|--web|--info] [command]"

5221 +msgstr "git help [--all] [--guides] [--man|--web|--info] [kommando]"

5222

5076 -#: builtin/help.c:64

5223 +#: builtin/help.c:66

5224 #, c-format

5225 msgid "unrecognized help format '%s'"

5226 msgstr "okänt hjälpformat: %s"

5227

5081 -#: builtin/help.c:92

5228 +#: builtin/help.c:94

5229 msgid "Failed to start emacsclient."

5230 msgstr "Misslyckades starta emacsclient."

5231

5085 -#: builtin/help.c:105

5232 +#: builtin/help.c:107

5233 msgid "Failed to parse emacsclient version."

5234 msgstr "Kunde inte tolka emacsclient-version."

5235

5089 -#: builtin/help.c:113

5236 +#: builtin/help.c:115

5237 #, c-format

5238 msgid "emacsclient version '%d' too old (< 22)."

5239 msgstr "emacsclient version \"%d\" för gammal (< 22)."

5240

5094 -#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176

5241 +#: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178

5242 #, c-format

5243 msgid "failed to exec '%s': %s"

5244 msgstr "exec misslyckades för \"%s\": %s"

5245

5099 -#: builtin/help.c:216

5246 +#: builtin/help.c:218

5247 #, c-format

5248 msgid ""

5249 "'%s': path for unsupported man viewer.\n"

@@ -5105,7 +5252,7 @@ msgstr ""

5252 "\"%s\": sökväg för man-visare som ej stöds.\n"

5253 "Använd \"man.<verktyg>.cmd\" istället."

5254

5108 -#: builtin/help.c:228

5255 +#: builtin/help.c:230

5256 #, c-format

5257 msgid ""

5258 "'%s': cmd for supported man viewer.\n"

@@ -5114,25 +5261,57 @@ msgstr ""

5261 "\"%s\": kommando för man-visare som stöds.\n"

5262 "Använd \"man.<verktyg>.path\" istället."

5263

5117 -#: builtin/help.c:349

5264 +#: builtin/help.c:351

5265 #, c-format

5266 msgid "'%s': unknown man viewer."

5267 msgstr "\"%s\": okänd man-visare."

5268

5122 -#: builtin/help.c:366

5269 +#: builtin/help.c:368

5270 msgid "no man viewer handled the request"

5271 msgstr "ingen man-visare hanterade förfrågan"

5272

5126 -#: builtin/help.c:374

5273 +#: builtin/help.c:376

5274 msgid "no info viewer handled the request"

5275 msgstr "ingen info-visare hanterade förfrågan"

5276

5130 -#: builtin/help.c:429 builtin/help.c:436

5277 +#: builtin/help.c:422

5278 +msgid "Defining attributes per path"

5279 +msgstr "Definierar attribut per sökväg"

5280 +

5281 +#: builtin/help.c:423

5282 +msgid "A Git glossary"

5283 +msgstr "En Git-ordlista"

5284 +

5285 +#: builtin/help.c:424

5286 +msgid "Specifies intentionally untracked files to ignore"

5287 +msgstr "Ange avsiktligen ospårade filer att ignorera"

5288 +

5289 +#: builtin/help.c:425

5290 +msgid "Defining submodule properties"

5291 +msgstr "Ange egenskaper för undermoduler"

5292 +

5293 +#: builtin/help.c:426

5294 +msgid "Specifying revisions and ranges for Git"

5295 +msgstr "Ange versioner och intervall i Git"

5296 +

5297 +#: builtin/help.c:427

5298 +msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

5299 +msgstr "Introduktion till Git (för version 1.5.1 och senare)"

5300 +

5301 +#: builtin/help.c:428

5302 +msgid "An overview of recommended workflows with Git"

5303 +msgstr "Översikt över rekommenderade arbetsflöden med Git"

5304 +

5305 +#: builtin/help.c:440

5306 +msgid "The common Git guides are:\n"

5307 +msgstr "De vanliga Git-vägledningarna är:\n"

5308 +

5309 +#: builtin/help.c:462 builtin/help.c:478

5310 #, c-format

5311 msgid "usage: %s%s"

5312 msgstr "användning: %s%s"

5313

5135 -#: builtin/help.c:452

5314 +#: builtin/help.c:494

5315 #, c-format

5316 msgid "`git %s' is aliased to `%s'"

5317 msgstr "\"git %s\" är ett alias för \"%s\""

@@ -5579,8 +5758,8 @@ msgid "Cannot access work tree '%s'"

5758 msgstr "Kan inte komma åt arbetskatalogen \"%s\""

5759

5760 #: builtin/log.c:40

5582 -msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"

5583 -msgstr "git log [<flaggor>] [<sedan>..<till>] [[--] <sökväg>...]\n"

5761 +msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"

5762 +msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]\n"

5763

5764 #: builtin/log.c:41

5765 msgid " or: git show [options] <object>..."

@@ -5617,301 +5796,301 @@ msgstr "Kunde inte läsa objektet %s"

5796 msgid "Unknown type: %d"

5797 msgstr "Okänd typ: %d"

5798

5620 -#: builtin/log.c:630

5799 +#: builtin/log.c:638

5800 msgid "format.headers without value"

5801 msgstr "format.headers utan värde"

5802

5624 -#: builtin/log.c:704

5803 +#: builtin/log.c:720

5804 msgid "name of output directory is too long"

5805 msgstr "namnet på utdatakatalogen är för långt"

5806

5628 -#: builtin/log.c:720

5807 +#: builtin/log.c:736

5808 #, c-format

5809 msgid "Cannot open patch file %s"

5810 msgstr "Kan inte öppna patchfilen %s"

5811

5633 -#: builtin/log.c:734

5812 +#: builtin/log.c:750

5813 msgid "Need exactly one range."

5814 msgstr "Behöver precis ett intervall."

5815

5637 -#: builtin/log.c:742

5816 +#: builtin/log.c:758

5817 msgid "Not a range."

5818 msgstr "Inte ett intervall."

5819

5641 -#: builtin/log.c:815

5820 +#: builtin/log.c:860

5821 msgid "Cover letter needs email format"

5822 msgstr "Omslagsbrevet behöver e-postformat"

5823

5645 -#: builtin/log.c:888

5824 +#: builtin/log.c:936

5825 #, c-format

5826 msgid "insane in-reply-to: %s"

5827 msgstr "tokigt in-reply-to: %s"

5828

5650 -#: builtin/log.c:916

5829 +#: builtin/log.c:964

5830 msgid "git format-patch [options] [<since> | <revision range>]"

5831 msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]"

5832

5654 -#: builtin/log.c:961

5833 +#: builtin/log.c:1009

5834 msgid "Two output directories?"

5835 msgstr "Två utdatakataloger?"

5836

5658 -#: builtin/log.c:1099

5837 +#: builtin/log.c:1108

5838 msgid "use [PATCH n/m] even with a single patch"

5839 msgstr "använd [PATCH n/m] även för en ensam patch"

5840

5662 -#: builtin/log.c:1102

5841 +#: builtin/log.c:1111

5842 msgid "use [PATCH] even with multiple patches"

5843 msgstr "använd [PATCH] även för flera patchar"

5844

5666 -#: builtin/log.c:1106

5845 +#: builtin/log.c:1115

5846 msgid "print patches to standard out"

5847 msgstr "skriv patcharna på stnadard ut"

5848

5670 -#: builtin/log.c:1108

5849 +#: builtin/log.c:1117

5850 msgid "generate a cover letter"

5851 msgstr "generera ett följebrev"

5852

5674 -#: builtin/log.c:1110

5853 +#: builtin/log.c:1119

5854 msgid "use simple number sequence for output file names"

5855 msgstr "använd enkel nummersekvens för utdatafilnamn"

5856

5678 -#: builtin/log.c:1111

5857 +#: builtin/log.c:1120

5858 msgid "sfx"

5859 msgstr "sfx"

5860

5682 -#: builtin/log.c:1112

5861 +#: builtin/log.c:1121

5862 msgid "use <sfx> instead of '.patch'"

5863 msgstr "använd <sfx> istället för \".patch\""

5864

5686 -#: builtin/log.c:1114

5865 +#: builtin/log.c:1123

5866 msgid "start numbering patches at <n> instead of 1"

5867 msgstr "börja numrera patchar på <n> istället för 1"

5868

5690 -#: builtin/log.c:1116

5869 +#: builtin/log.c:1125

5870 msgid "mark the series as Nth re-roll"

5871 msgstr "markera serien som N:te försök"

5872

5694 -#: builtin/log.c:1118

5873 +#: builtin/log.c:1127

5874 msgid "Use [<prefix>] instead of [PATCH]"

5875 msgstr "Använd [<prefix>] istället för [PATCH]"

5876

5698 -#: builtin/log.c:1121

5877 +#: builtin/log.c:1130

5878 msgid "store resulting files in <dir>"

5879 msgstr "spara filerna i <katalog>"

5880

5702 -#: builtin/log.c:1124

5881 +#: builtin/log.c:1133

5882 msgid "don't strip/add [PATCH]"

5883 msgstr "ta inte bort eller lägg till [PATCH]"

5884

5706 -#: builtin/log.c:1127

5885 +#: builtin/log.c:1136

5886 msgid "don't output binary diffs"

5887 msgstr "skriv inte binära diffar"

5888

5710 -#: builtin/log.c:1129

5889 +#: builtin/log.c:1138

5890 msgid "don't include a patch matching a commit upstream"

5891 msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"

5892

5714 -#: builtin/log.c:1131

5893 +#: builtin/log.c:1140

5894 msgid "show patch format instead of default (patch + stat)"

5895 msgstr "visa patchformat istället för standard (patch + stat)"

5896

5718 -#: builtin/log.c:1133

5897 +#: builtin/log.c:1142

5898 msgid "Messaging"

5899 msgstr "E-post"

5900

5722 -#: builtin/log.c:1134

5901 +#: builtin/log.c:1143

5902 msgid "header"

5903 msgstr "huvud"

5904

5726 -#: builtin/log.c:1135

5905 +#: builtin/log.c:1144

5906 msgid "add email header"

5907 msgstr "lägg till e-posthuvud"

5908

5730 -#: builtin/log.c:1136 builtin/log.c:1138

5909 +#: builtin/log.c:1145 builtin/log.c:1147

5910 msgid "email"

5911 msgstr "epost"

5912

5734 -#: builtin/log.c:1136

5913 +#: builtin/log.c:1145

5914 msgid "add To: header"

5915 msgstr "Lägg till mottagarhuvud (\"To:\")"

5916

5738 -#: builtin/log.c:1138

5917 +#: builtin/log.c:1147

5918 msgid "add Cc: header"

5919 msgstr "Lägg till kopiehuvud (\"Cc:\")"

5920

5742 -#: builtin/log.c:1140

5921 +#: builtin/log.c:1149

5922 msgid "message-id"

5923 msgstr "meddelande-id"

5924

5746 -#: builtin/log.c:1141

5925 +#: builtin/log.c:1150

5926 msgid "make first mail a reply to <message-id>"

5927 msgstr "Gör det första brevet ett svar till <meddelande-id>"

5928

5750 -#: builtin/log.c:1142 builtin/log.c:1145

5929 +#: builtin/log.c:1151 builtin/log.c:1154

5930 msgid "boundary"

5931 msgstr "gräns"

5932

5754 -#: builtin/log.c:1143

5933 +#: builtin/log.c:1152

5934 msgid "attach the patch"

5935 msgstr "bifoga patchen"

5936

5758 -#: builtin/log.c:1146

5937 +#: builtin/log.c:1155

5938 msgid "inline the patch"

5939 msgstr "gör patchen ett inline-objekt"

5940

5762 -#: builtin/log.c:1150

5941 +#: builtin/log.c:1159

5942 msgid "enable message threading, styles: shallow, deep"

5943 msgstr "aktivera brevtrådning, typer: shallow, deep"

5944

5766 -#: builtin/log.c:1152

5945 +#: builtin/log.c:1161

5946 msgid "signature"

5947 msgstr "signatur"

5948

5770 -#: builtin/log.c:1153

5949 +#: builtin/log.c:1162

5950 msgid "add a signature"

5951 msgstr "lägg till signatur"

5952

5774 -#: builtin/log.c:1155

5953 +#: builtin/log.c:1164

5954 msgid "don't print the patch filenames"

5955 msgstr "visa inte filnamn för patchar"

5956

5778 -#: builtin/log.c:1239

5957 +#: builtin/log.c:1248

5958 msgid "-n and -k are mutually exclusive."

5959 msgstr "-n och -k kan inte användas samtidigt."

5960

5782 -#: builtin/log.c:1241

5961 +#: builtin/log.c:1250

5962 msgid "--subject-prefix and -k are mutually exclusive."

5963 msgstr "--subject-prefix och -k kan inte användas samtidigt."

5964

5786 -#: builtin/log.c:1249

5965 +#: builtin/log.c:1258

5966 msgid "--name-only does not make sense"

5967 msgstr "kan inte använda --name-only"

5968

5790 -#: builtin/log.c:1251

5969 +#: builtin/log.c:1260

5970 msgid "--name-status does not make sense"

5971 msgstr "kan inte använda --name-status"

5972

5794 -#: builtin/log.c:1253

5973 +#: builtin/log.c:1262

5974 msgid "--check does not make sense"

5975 msgstr "kan inte använda --check"

5976

5798 -#: builtin/log.c:1276

5977 +#: builtin/log.c:1285

5978 msgid "standard output, or directory, which one?"

5979 msgstr "standard ut, eller katalog, vilken skall det vara?"

5980

5802 -#: builtin/log.c:1278

5981 +#: builtin/log.c:1287

5982 #, c-format

5983 msgid "Could not create directory '%s'"

5984 msgstr "Kunde inte skapa katalogen \"%s\""

5985

5807 -#: builtin/log.c:1431

5986 +#: builtin/log.c:1435

5987 msgid "Failed to create output files"

5988 msgstr "Misslyckades skapa utdatafiler"

5989

5811 -#: builtin/log.c:1480

5990 +#: builtin/log.c:1484

5991 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

5992 msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"

5993

5815 -#: builtin/log.c:1535

5994 +#: builtin/log.c:1539

5995 #, c-format

5996 msgid ""

5997 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

5998 msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"

5999

5821 -#: builtin/log.c:1548 builtin/log.c:1550 builtin/log.c:1562

6000 +#: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566

6001 #, c-format

6002 msgid "Unknown commit %s"

6003 msgstr "Okänd incheckning %s"

6004

5826 -#: builtin/ls-files.c:409

6005 +#: builtin/ls-files.c:402

6006 msgid "git ls-files [options] [<file>...]"

6007 msgstr "git ls-files [flaggor] [<fil>...]"

6008

5830 -#: builtin/ls-files.c:466

6009 +#: builtin/ls-files.c:459

6010 msgid "identify the file status with tags"

6011 msgstr "identifiera filstatus med taggar"

6012

5834 -#: builtin/ls-files.c:468

6013 +#: builtin/ls-files.c:461

6014 msgid "use lowercase letters for 'assume unchanged' files"

6015 msgstr "använd små bokstäver för \"anta oförändrade\"-filer"

6016

5838 -#: builtin/ls-files.c:470

6017 +#: builtin/ls-files.c:463

6018 msgid "show cached files in the output (default)"

6019 msgstr "visa cachade filer i utdata (standard)"

6020

5842 -#: builtin/ls-files.c:472

6021 +#: builtin/ls-files.c:465

6022 msgid "show deleted files in the output"

6023 msgstr "visa borttagna filer i utdata"

6024

5846 -#: builtin/ls-files.c:474

6025 +#: builtin/ls-files.c:467

6026 msgid "show modified files in the output"

6027 msgstr "visa modifierade filer i utdata"

6028

5850 -#: builtin/ls-files.c:476

6029 +#: builtin/ls-files.c:469

6030 msgid "show other files in the output"

6031 msgstr "visa andra filer i utdata"

6032

5854 -#: builtin/ls-files.c:478

6033 +#: builtin/ls-files.c:471

6034 msgid "show ignored files in the output"

6035 msgstr "visa ignorerade filer i utdata"

6036

5858 -#: builtin/ls-files.c:481

6037 +#: builtin/ls-files.c:474

6038 msgid "show staged contents' object name in the output"

6039 msgstr "visa köat innehålls objektnamn i utdata"

6040

5862 -#: builtin/ls-files.c:483

6041 +#: builtin/ls-files.c:476

6042 msgid "show files on the filesystem that need to be removed"

6043 msgstr "visa filer i filsystemet som behöver tas bort"

6044

5866 -#: builtin/ls-files.c:485

6045 +#: builtin/ls-files.c:478

6046 msgid "show 'other' directories' name only"

6047 msgstr "visa endast namn för \"andra\" kataloger"

6048

5870 -#: builtin/ls-files.c:488

6049 +#: builtin/ls-files.c:481

6050 msgid "don't show empty directories"

6051 msgstr "visa inte tomma kataloger"

6052

5874 -#: builtin/ls-files.c:491

6053 +#: builtin/ls-files.c:484

6054 msgid "show unmerged files in the output"

6055 msgstr "visa ej sammanslagna filer i utdata"

6056

5878 -#: builtin/ls-files.c:493

6057 +#: builtin/ls-files.c:486

6058 msgid "show resolve-undo information"

6059 msgstr "visa \"resolve-undo\"-information"

6060

5882 -#: builtin/ls-files.c:495

6061 +#: builtin/ls-files.c:488

6062 msgid "skip files matching pattern"

6063 msgstr "hoppa över filer som motsvarar mönster"

6064

5886 -#: builtin/ls-files.c:498

6065 +#: builtin/ls-files.c:491

6066 msgid "exclude patterns are read from <file>"

6067 msgstr "exkludera mönster som läses från <fil>"

6068

5890 -#: builtin/ls-files.c:501

6069 +#: builtin/ls-files.c:494

6070 msgid "read additional per-directory exclude patterns in <file>"

6071 msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"

6072

5894 -#: builtin/ls-files.c:503

6073 +#: builtin/ls-files.c:496

6074 msgid "add the standard git exclusions"

6075 msgstr "lägg till git:s standardexkluderingar"

6076

5898 -#: builtin/ls-files.c:506

6077 +#: builtin/ls-files.c:499

6078 msgid "make the output relative to the project top directory"

6079 msgstr "gör utdata relativ till projektets toppkatalog"

6080

5902 -#: builtin/ls-files.c:509

6081 +#: builtin/ls-files.c:502

6082 msgid "if any <file> is not in the index, treat this as an error"

6083 msgstr "om en <fil> inte är indexet, betrakta det som ett fel"

6084

5906 -#: builtin/ls-files.c:510

6085 +#: builtin/ls-files.c:503

6086 msgid "tree-ish"

6087 msgstr "träd-igt"

6088

5910 -#: builtin/ls-files.c:511

6089 +#: builtin/ls-files.c:504

6090 msgid "pretend that paths removed since <tree-ish> are still present"

6091 msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"

6092

5914 -#: builtin/ls-files.c:513

6093 +#: builtin/ls-files.c:506

6094 msgid "show debugging data"

6095 msgstr "visa felsökningsutdata"

6096

@@ -8109,16 +8288,16 @@ msgstr ""

8288 "varianten."

8289

8290 #: builtin/revert.c:22

8112 -msgid "git revert [options] <commit-ish>"

8113 -msgstr "git revert [flaggor] <incheckning-igt>"

8291 +msgid "git revert [options] <commit-ish>..."

8292 +msgstr "git revert [flaggor] <incheckning-igt>..."

8293

8294 #: builtin/revert.c:23

8295 msgid "git revert <subcommand>"

8296 msgstr "git revert <underkommando>"

8297

8298 #: builtin/revert.c:28

8120 -msgid "git cherry-pick [options] <commit-ish>"

8121 -msgstr "git cherry-pick [flaggor] <incheckning-igt>"

8299 +msgid "git cherry-pick [options] <commit-ish>..."

8300 +msgstr "git cherry-pick [flaggor] <incheckning-igt>..."

8301

8302 #: builtin/revert.c:29

8303 msgid "git cherry-pick <subcommand>"

@@ -8269,32 +8448,31 @@ msgid "git rm: unable to remove %s"

8448 msgstr "git rm: kan inte ta bort %s"

8449

8450 #: builtin/shortlog.c:13

8272 -msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"

8273 -msgstr ""

8274 -"git shortlog [-n] [-s] [-e] [-w] [rev-flaggor] [--] [<incheckning-id>... ]"

8451 +msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"

8452 +msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"

8453

8276 -#: builtin/shortlog.c:133

8454 +#: builtin/shortlog.c:131

8455 #, c-format

8456 msgid "Missing author: %s"

8457 msgstr "Författare saknas: %s"

8458

8281 -#: builtin/shortlog.c:229

8459 +#: builtin/shortlog.c:227

8460 msgid "sort output according to the number of commits per author"

8461 msgstr "sortera utdata enligt antal incheckningar per författare"

8462

8285 -#: builtin/shortlog.c:231

8463 +#: builtin/shortlog.c:229

8464 msgid "Suppress commit descriptions, only provides commit count"

8465 msgstr "Undertryck beskrivningar, visa bara antal incheckningar"

8466

8289 -#: builtin/shortlog.c:233

8467 +#: builtin/shortlog.c:231

8468 msgid "Show the email address of each author"

8469 msgstr "Visa e-postadress för varje författare"

8470

8293 -#: builtin/shortlog.c:234

8471 +#: builtin/shortlog.c:232

8472 msgid "w[,i1[,i2]]"

8473 msgstr "w[,i1[,i2]]"

8474

8297 -#: builtin/shortlog.c:235

8475 +#: builtin/shortlog.c:233

8476 msgid "Linewrap output"

8477 msgstr "Radbryt utdata"

8478

@@ -8314,67 +8492,67 @@ msgstr ""

8492 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"

8493 msgstr "git show-branch (-g|--reflog)[=<n>[,<bas>]] [--list] [<ref>]"

8494

8317 -#: builtin/show-branch.c:651

8495 +#: builtin/show-branch.c:650

8496 msgid "show remote-tracking and local branches"

8497 msgstr "visa fjärrspårande och lokala grenar"

8498

8321 -#: builtin/show-branch.c:653

8499 +#: builtin/show-branch.c:652

8500 msgid "show remote-tracking branches"

8501 msgstr "visa fjärrspårande grenar"

8502

8325 -#: builtin/show-branch.c:655

8503 +#: builtin/show-branch.c:654

8504 msgid "color '*!+-' corresponding to the branch"

8505 msgstr "färga \"*!+-\" enligt grenen"

8506

8329 -#: builtin/show-branch.c:657

8507 +#: builtin/show-branch.c:656

8508 msgid "show <n> more commits after the common ancestor"

8509 msgstr "visa <n> ytterligare incheckningar efter gemensam anfader"

8510

8333 -#: builtin/show-branch.c:659

8511 +#: builtin/show-branch.c:658

8512 msgid "synonym to more=-1"

8513 msgstr "synonym till more=-1"

8514

8337 -#: builtin/show-branch.c:660

8515 +#: builtin/show-branch.c:659

8516 msgid "suppress naming strings"

8517 msgstr "undertyck namnsträngar"

8518

8341 -#: builtin/show-branch.c:662

8519 +#: builtin/show-branch.c:661

8520 msgid "include the current branch"

8521 msgstr "inkludera aktuell gren"

8522

8345 -#: builtin/show-branch.c:664

8523 +#: builtin/show-branch.c:663

8524 msgid "name commits with their object names"

8525 msgstr "namnge incheckningar med deras objektnamn"

8526

8349 -#: builtin/show-branch.c:666

8527 +#: builtin/show-branch.c:665

8528 msgid "show possible merge bases"

8529 msgstr "visa möjliga sammanslaningsbaser"

8530

8353 -#: builtin/show-branch.c:668

8531 +#: builtin/show-branch.c:667

8532 msgid "show refs unreachable from any other ref"

8533 msgstr "visa referenser som inte kan nås från någon annan referens"

8534

8357 -#: builtin/show-branch.c:670

8535 +#: builtin/show-branch.c:669

8536 msgid "show commits in topological order"

8537 msgstr "visa incheckningar i topologisk ordning"

8538

8361 -#: builtin/show-branch.c:672

8539 +#: builtin/show-branch.c:671

8540 msgid "show only commits not on the first branch"

8541 msgstr "visa endast incheckningar inte på den första grenen"

8542

8365 -#: builtin/show-branch.c:674

8543 +#: builtin/show-branch.c:673

8544 msgid "show merges reachable from only one tip"

8545 msgstr "visa sammanslagningar som endast kan nås från en spets"

8546

8369 -#: builtin/show-branch.c:676

8547 +#: builtin/show-branch.c:675

8548 msgid "show commits where no parent comes before its children"

8549 msgstr "visa incheckningar där ingen förälder kommer före dess barn"

8550

8373 -#: builtin/show-branch.c:678

8551 +#: builtin/show-branch.c:677

8552 msgid "<n>[,<base>]"

8553 msgstr "<n>[,<bas>]"

8554

8377 -#: builtin/show-branch.c:679

8555 +#: builtin/show-branch.c:678

8556 msgid "show <n> most recent ref-log entries starting at base"

8557 msgstr "visa <n> nyaste refloggposter med början på bas"

8558

@@ -8834,9 +9012,14 @@ msgid "only useful for debugging"

9012 msgstr "endast användbart vid felsökning"

9013

9014 #: git.c:16

8837 -msgid "See 'git help <command>' for more information on a specific command."

9015 +msgid ""

9016 +"'git help -a' and 'git help -g' lists available subcommands and some\n"

9017 +"concept guides. See 'git help <command>' or 'git help <concept>'\n"

9018 +"to read about a specific subcommand or concept."

9019 msgstr ""

8839 -"Se \"git help <kommando>\" för mer information om ett specifikt kommando."

9020 +"\"git help -a\" och \"git help -g\" visar tillgängliga underkommandon och\n"

9021 +"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"

9022 +"<koncept>\" för att läsa mer om specifika underkommandon och koncept."

9023

9024 #: parse-options.h:156

9025 msgid "no-op (backward compatibility)"

@@ -9203,16 +9386,16 @@ msgstr ""

9386 "Du måste sedan ange åtminstone en bra och en dålig version.\n"

9387 "(Du kan använda \"git bisect bad\" och \"git bisect good\" för detta.)"

9388

9206 -#: git-bisect.sh:347 git-bisect.sh:474

9389 +#: git-bisect.sh:363 git-bisect.sh:490

9390 msgid "We are not bisecting."

9391 msgstr "Vi utför ingen bisect för tillfället."

9392

9210 -#: git-bisect.sh:354

9393 +#: git-bisect.sh:370

9394 #, sh-format

9395 msgid "'$invalid' is not a valid commit"

9396 msgstr "\"$invalid\" är inte en giltig incheckning"

9397

9215 -#: git-bisect.sh:363

9398 +#: git-bisect.sh:379

9399 #, sh-format

9400 msgid ""

9401 "Could not check out original HEAD '$branch'.\n"

@@ -9221,25 +9404,25 @@ msgstr ""

9404 "Kunde inte checka ut original-HEAD \"$branch\".\n"

9405 "Försök \"git bisect reset <incheckning>\"."

9406

9224 -#: git-bisect.sh:390

9407 +#: git-bisect.sh:406

9408 msgid "No logfile given"

9409 msgstr "Ingen loggfil angiven"

9410

9228 -#: git-bisect.sh:391

9411 +#: git-bisect.sh:407

9412 #, sh-format

9413 msgid "cannot read $file for replaying"

9414 msgstr "kan inte läsa $file för uppspelning"

9415

9233 -#: git-bisect.sh:408

9416 +#: git-bisect.sh:424

9417 msgid "?? what are you talking about?"

9418 msgstr "?? vad menar du?"

9419

9237 -#: git-bisect.sh:420

9420 +#: git-bisect.sh:436

9421 #, sh-format

9422 msgid "running $command"

9423 msgstr "kör $command"

9424

9242 -#: git-bisect.sh:427

9425 +#: git-bisect.sh:443

9426 #, sh-format

9427 msgid ""

9428 "bisect run failed:\n"

@@ -9248,11 +9431,11 @@ msgstr ""

9431 "\"bisect\"-körningen misslyckades:\n"

9432 "felkod $res från \"$command\" är < 0 eller >= 128"

9433

9251 -#: git-bisect.sh:453

9434 +#: git-bisect.sh:469

9435 msgid "bisect run cannot continue any more"

9436 msgstr "\"bisect\"-körningen kan inte fortsätta längre"

9437

9255 -#: git-bisect.sh:459

9438 +#: git-bisect.sh:475

9439 #, sh-format

9440 msgid ""

9441 "bisect run failed:\n"

@@ -9261,7 +9444,7 @@ msgstr ""

9444 "\"bisect\"-körningen misslyckades:\n"

9445 "\"bisect_state $state\" avslutades med felkoden $res"

9446

9264 -#: git-bisect.sh:466

9447 +#: git-bisect.sh:482

9448 msgid "bisect run success"

9449 msgstr "\"bisect\"-körningen lyckades"

9450

@@ -9845,6 +10028,23 @@ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""

10028 msgid "Synchronizing submodule url for '$prefix$sm_path'"

10029 msgstr "Synkroniserar undermodul-url för \"$prefix$sm_path\""

10030

10031 +#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"

10032 +#~ msgstr "Det tog %.2f sekunder att räkna ospårade filer. \"status -uno\""

10033 +

10034 +#~ msgid "may speed it up, but you have to be careful not to forget to add"

10035 +#~ msgstr "kanske gör det snabbare, men du måste vara försiktig så att du"

10036 +

10037 +#~ msgid "new files yourself (see 'git help status')."

10038 +#~ msgstr "inte glömmer lägga till filer själv (se \"git help status\")"

10039 +

10040 +#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"

10041 +#~ msgstr ""

10042 +#~ "git shortlog [-n] [-s] [-e] [-w] [rev-flaggor] [--] [<incheckning-id>... ]"

10043 +

10044 +#~ msgid "See 'git help <command>' for more information on a specific command."

10045 +#~ msgstr ""

10046 +#~ "Se \"git help <kommando>\" för mer information om ett specifikt kommando."

10047 +

10048 #~ msgid "use any ref in .git/refs"

10049 #~ msgstr "använd alla referenser i .git/refs"

10050

@@ -9964,9 +10164,6 @@ msgstr "Synkroniserar undermodul-url för \"$prefix$sm_path\""

10164 #~ msgid "# Changed but not updated:"

10165 #~ msgstr "# Ändrade men inte uppdaterade:"

10166

9967 -#~ msgid "A branch named '%s' already exists."

9968 -#~ msgstr "Det finns redan en gren som heter \"%s\""

9969 -

10167 #~ msgid "path '%s' does not have all 3 versions"

10168 #~ msgstr "sökvägen \"%s\" har inte alla 3 versionerna"

10169

@@ -10029,9 +10226,6 @@ msgstr "Synkroniserar undermodul-url för \"$prefix$sm_path\""

10226 #~ msgid "Could not extract author time from %s"

10227 #~ msgstr "Kunde inte hämta författartid från %s"

10228

10032 -#~ msgid "No author information found in %s"

10033 -#~ msgstr "Hittade ingen författarinformation i %s"

10034 -

10229 #~ msgid "cherry-pick --ff cannot be used with --signoff"

10230 #~ msgstr "cherry-pick --ff kan inte användas med --signoff"

10231

l10n: Update Swedish translation (2080t0f0u)