dc76d8fec9 · matheusbsbs/matheus-bagliano

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2015-01-21 14:21+0800\n"

11 -"PO-Revision-Date: 2015-01-21 14:57+0800\n"

10 +"POT-Creation-Date: 2015-03-27 13:33+0800\n"

11 +"PO-Revision-Date: 2015-03-27 09:56+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"

@@ -16,6 +16,7 @@ msgstr ""

16 "Content-Type: text/plain; charset=UTF-8\n"

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

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

19 +"X-Generator: Gtranslator 2.91.6\n"

20

21 #: advice.c:55

22 #, c-format

@@ -31,8 +32,8 @@ msgstr ""

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

33

34 #: archive.c:11

34 -msgid "git archive [options] <tree-ish> [<path>...]"

35 -msgstr "git archive [flaggor] <träd-igt> [<sökväg>...]"

35 +msgid "git archive [<options>] <tree-ish> [<path>...]"

36 +msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]"

37

38 #: archive.c:12

39 msgid "git archive --list"

@@ -40,9 +41,9 @@ msgstr "git archive --list"

41

42 #: archive.c:13

43 msgid ""

43 -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"

44 +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"

45 msgstr ""

45 -"git archive --remote <arkiv> [--exec <kmd>] [flaggor] <träd-igt> "

46 +"git archive --remote <arkiv> [--exec <kmd>] [<flaggor>] <träd-igt> "

47 "[<sökväg>...]"

48

49 #: archive.c:14

@@ -70,10 +71,10 @@ msgstr "prefix"

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

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

73

73 -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517

74 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986

74 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516

75 +#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986

76 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101

76 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394

77 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394

78 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151

79 msgid "file"

80 msgstr "fil"

@@ -122,7 +123,7 @@ msgstr "kommando"

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

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

125

125 -#: attr.c:258

126 +#: attr.c:264

127 msgid ""

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

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

@@ -251,7 +252,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"

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

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

254

254 -#: bundle.c:87 builtin/commit.c:770

255 +#: bundle.c:87 builtin/commit.c:764

256 #, c-format

257 msgid "could not open '%s'"

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

@@ -260,8 +261,8 @@ msgstr "kunde inte öppna \"%s\""

261 msgid "Repository lacks these prerequisite commits:"

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

263

263 -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706

264 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330

264 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705

265 +#: builtin/branch.c:659 builtin/commit.c:1043 builtin/log.c:330

266 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358

267 #: builtin/shortlog.c:158

268 msgid "revision walk setup failed"

@@ -302,21 +303,21 @@ msgstr "rev-list dog"

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

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

305

305 -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261

306 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261

307 #, c-format

308 msgid "unrecognized argument: %s"

309 msgstr "okänt argument: %s"

310

310 -#: bundle.c:444

311 +#: bundle.c:443

312 msgid "Refusing to create empty bundle."

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

314

314 -#: bundle.c:454

315 +#: bundle.c:453

316 #, c-format

317 msgid "cannot create '%s'"

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

319

319 -#: bundle.c:475

320 +#: bundle.c:474

321 msgid "index-pack died"

322 msgstr "index-pack dog"

323

@@ -339,55 +340,55 @@ msgstr "%s %s är inte en incheckning!"

340 msgid "memory exhausted"

341 msgstr "minnet slut"

342

342 -#: config.c:469 config.c:471

343 +#: config.c:474 config.c:476

344 #, c-format

345 msgid "bad config file line %d in %s"

346 msgstr "felaktig konfigurationsfil rad %d i %s"

347

347 -#: config.c:587

348 +#: config.c:592

349 #, c-format

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

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

352

352 -#: config.c:589

353 +#: config.c:594

354 #, c-format

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

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

357

357 -#: config.c:674

358 +#: config.c:679

359 #, c-format

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

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

362

362 -#: config.c:752 config.c:763

363 +#: config.c:757 config.c:768

364 #, c-format

365 msgid "bad zlib compression level %d"

366 msgstr "felaktigt zlib-komprimeringsgrad %d"

367

367 -#: config.c:885

368 +#: config.c:890

369 #, c-format

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

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

372

372 -#: config.c:1211

373 +#: config.c:1216

374 msgid "unable to parse command-line config"

375 msgstr "kan inte tolka kommandoradskonfiguration"

376

376 -#: config.c:1272

377 +#: config.c:1277

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

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

380

380 -#: config.c:1596

381 +#: config.c:1601

382 #, c-format

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

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

385

385 -#: config.c:1598

386 +#: config.c:1603

387 #, c-format

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

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

390

390 -#: config.c:1657

391 +#: config.c:1662

392 #, c-format

393 msgid "%s has multiple values"

394 msgstr "%s har flera värden"

@@ -479,7 +480,7 @@ msgstr[1] "%lu år sedan"

480 msgid "failed to read orderfile '%s'"

481 msgstr "kunde inte läsa orderfilen \"%s\""

482

482 -#: diffcore-rename.c:516

483 +#: diffcore-rename.c:536

484 msgid "Performing inexact rename detection"

485 msgstr "Utför onöjaktig namnbytesdetektering"

486

@@ -507,16 +508,16 @@ msgstr ""

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

509 "%s"

510

510 -#: diff.c:2957

511 +#: diff.c:2956

512 #, c-format

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

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

515

515 -#: diff.c:3352

516 +#: diff.c:3351

517 msgid "--follow requires exactly one pathspec"

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

519

519 -#: diff.c:3515

520 +#: diff.c:3514

521 #, c-format

522 msgid ""

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

@@ -525,7 +526,7 @@ msgstr ""

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

527 "%s"

528

528 -#: diff.c:3529

529 +#: diff.c:3528

530 #, c-format

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

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

@@ -1024,7 +1025,7 @@ msgstr "kunde inte tolka format för --pretty"

1025 msgid "done"

1026 msgstr "klart"

1027

1027 -#: read-cache.c:1267

1028 +#: read-cache.c:1273

1029 #, c-format

1030 msgid ""

1031 "index.version set, but the value is invalid.\n"

@@ -1033,7 +1034,7 @@ msgstr ""

1034 "index.version satt, men värdet är ogiltigt.\n"

1035 "Använder version %i"

1036

1036 -#: read-cache.c:1277

1037 +#: read-cache.c:1283

1038 #, c-format

1039 msgid ""

1040 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -1119,23 +1120,31 @@ msgstr[1] ""

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

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

1122

1122 -#: run-command.c:87

1123 +#: revision.c:2348

1124 +msgid "--first-parent is incompatible with --bisect"

1125 +msgstr "--first-parent är inkompatibelt med --bisect"

1126 +

1127 +#: run-command.c:83

1128 msgid "open /dev/null failed"

1129 msgstr "misslyckades öppna /dev/null"

1130

1126 -#: run-command.c:89

1131 +#: run-command.c:85

1132 #, c-format

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

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

1135

1131 -#: send-pack.c:268

1136 +#: send-pack.c:272

1137 msgid "failed to sign the push certificate"

1138 msgstr "misslyckades underteckna push-certifikatet"

1139

1135 -#: send-pack.c:325

1140 +#: send-pack.c:356

1141 msgid "the receiving end does not support --signed push"

1142 msgstr "mottagarsidan stöder inte push med --signed"

1143

1144 +#: send-pack.c:366

1145 +msgid "server does not support --atomic push"

1146 +msgstr "servern stöder inte push med --atomic"

1147 +

1148 #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995

1149 #: builtin/merge.c:1005

1150 #, c-format

@@ -1166,7 +1175,7 @@ msgstr ""

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

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

1177

1169 -#: sequencer.c:211 sequencer.c:856 sequencer.c:939

1178 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944

1179 #, c-format

1180 msgid "Could not write to %s"

1181 msgstr "Kunde inte skriva till %s"

@@ -1202,184 +1211,184 @@ msgstr "Kunde inte bestämma HEAD:s incheckning\n"

1211 msgid "Unable to update cache tree\n"

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

1213

1205 -#: sequencer.c:406

1214 +#: sequencer.c:411

1215 #, c-format

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

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

1218

1210 -#: sequencer.c:411

1219 +#: sequencer.c:416

1220 #, c-format

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

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

1223

1215 -#: sequencer.c:477

1224 +#: sequencer.c:482

1225 msgid "Your index file is unmerged."

1226 msgstr "Din indexfil har inte slagits ihop."

1227

1219 -#: sequencer.c:496

1228 +#: sequencer.c:501

1229 #, c-format

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

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

1232

1224 -#: sequencer.c:504

1233 +#: sequencer.c:509

1234 #, c-format

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

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

1237

1229 -#: sequencer.c:508

1238 +#: sequencer.c:513

1239 #, c-format

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

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

1242

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

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

1236 -#: sequencer.c:521

1245 +#: sequencer.c:526

1246 #, c-format

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

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

1249

1241 -#: sequencer.c:525

1250 +#: sequencer.c:530

1251 #, c-format

1252 msgid "Cannot get commit message for %s"

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

1254

1246 -#: sequencer.c:611

1255 +#: sequencer.c:616

1256 #, c-format

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

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

1259

1251 -#: sequencer.c:612

1260 +#: sequencer.c:617

1261 #, c-format

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

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

1264

1256 -#: sequencer.c:648

1265 +#: sequencer.c:653

1266 msgid "empty commit set passed"

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

1268

1260 -#: sequencer.c:656

1269 +#: sequencer.c:661

1270 #, c-format

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

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

1273

1265 -#: sequencer.c:660

1274 +#: sequencer.c:665

1275 #, c-format

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

1277 msgstr "git %s: misslyckades uppdatera indexet"

1278

1270 -#: sequencer.c:720

1279 +#: sequencer.c:725

1280 #, c-format

1281 msgid "Cannot %s during a %s"

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

1283

1275 -#: sequencer.c:742

1284 +#: sequencer.c:747

1285 #, c-format

1286 msgid "Could not parse line %d."

1287 msgstr "Kan inte tolka rad %d."

1288

1280 -#: sequencer.c:747

1289 +#: sequencer.c:752

1290 msgid "No commits parsed."

1291 msgstr "Inga incheckningar lästes."

1292

1284 -#: sequencer.c:760

1293 +#: sequencer.c:765

1294 #, c-format

1295 msgid "Could not open %s"

1296 msgstr "Kunde inte öppna %s"

1297

1289 -#: sequencer.c:764

1298 +#: sequencer.c:769

1299 #, c-format

1300 msgid "Could not read %s."

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

1302

1294 -#: sequencer.c:771

1303 +#: sequencer.c:776

1304 #, c-format

1305 msgid "Unusable instruction sheet: %s"

1306 msgstr "Oanvändbart manus: %s"

1307

1299 -#: sequencer.c:801

1308 +#: sequencer.c:806

1309 #, c-format

1310 msgid "Invalid key: %s"

1311 msgstr "Felaktig nyckel: %s"

1312

1304 -#: sequencer.c:804

1313 +#: sequencer.c:809

1314 #, c-format

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

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

1317

1309 -#: sequencer.c:816

1318 +#: sequencer.c:821

1319 #, c-format

1320 msgid "Malformed options sheet: %s"

1321 msgstr "Trasigt manus: %s"

1322

1314 -#: sequencer.c:837

1323 +#: sequencer.c:842

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

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

1326

1318 -#: sequencer.c:838

1327 +#: sequencer.c:843

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

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

1330

1322 -#: sequencer.c:842

1331 +#: sequencer.c:847

1332 #, c-format

1333 msgid "Could not create sequencer directory %s"

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

1335

1327 -#: sequencer.c:858 sequencer.c:943

1336 +#: sequencer.c:863 sequencer.c:948

1337 #, c-format

1338 msgid "Error wrapping up %s."

1339 msgstr "Fel vid ombrytning av %s."

1340

1332 -#: sequencer.c:877 sequencer.c:1013

1341 +#: sequencer.c:882 sequencer.c:1018

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

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

1344

1336 -#: sequencer.c:879

1345 +#: sequencer.c:884

1346 msgid "cannot resolve HEAD"

1347 msgstr "kan inte bestämma HEAD"

1348

1340 -#: sequencer.c:881

1349 +#: sequencer.c:886

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

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

1352

1344 -#: sequencer.c:903 builtin/apply.c:4128

1353 +#: sequencer.c:908 builtin/apply.c:4286

1354 #, c-format

1355 msgid "cannot open %s: %s"

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

1357

1349 -#: sequencer.c:906

1358 +#: sequencer.c:911

1359 #, c-format

1360 msgid "cannot read %s: %s"

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

1362

1354 -#: sequencer.c:907

1363 +#: sequencer.c:912

1364 msgid "unexpected end of file"

1365 msgstr "oväntat filslut"

1366

1358 -#: sequencer.c:913

1367 +#: sequencer.c:918

1368 #, c-format

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

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

1371

1363 -#: sequencer.c:936

1372 +#: sequencer.c:941

1373 #, c-format

1374 msgid "Could not format %s."

1375 msgstr "Kunde inte formatera %s."

1376

1368 -#: sequencer.c:1081

1377 +#: sequencer.c:1086

1378 #, c-format

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

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

1381

1373 -#: sequencer.c:1084

1382 +#: sequencer.c:1089

1383 #, c-format

1384 msgid "%s: bad revision"

1385 msgstr "%s: felaktig revision"

1386

1378 -#: sequencer.c:1118

1387 +#: sequencer.c:1123

1388 msgid "Can't revert as initial commit"

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

1390

1382 -#: sequencer.c:1119

1391 +#: sequencer.c:1124

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

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

1394

@@ -1449,38 +1458,38 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s"

1458 msgid "staging updated .gitmodules failed"

1459 msgstr "misslyckades köa uppdaterad .gitmodules"

1460

1452 -#: submodule.c:1111 builtin/init-db.c:371

1461 +#: submodule.c:1109 builtin/init-db.c:371

1462 #, c-format

1463 msgid "Could not create git link %s"

1464 msgstr "Kunde inte skapa gitlänk %s"

1465

1457 -#: submodule.c:1122

1466 +#: submodule.c:1120

1467 #, c-format

1468 msgid "Could not set core.worktree in %s"

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

1470

1462 -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566

1463 -#: trailer.c:570

1471 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557

1472 +#: trailer.c:561

1473 #, c-format

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

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

1476

1468 -#: trailer.c:552 trailer.c:557 builtin/remote.c:290

1477 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290

1478 #, c-format

1479 msgid "more than one %s"

1480 msgstr "mer än en %s"

1481

1473 -#: trailer.c:590

1482 +#: trailer.c:581

1483 #, c-format

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

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

1486

1478 -#: trailer.c:710

1487 +#: trailer.c:701

1488 #, c-format

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

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

1491

1483 -#: trailer.c:713

1492 +#: trailer.c:704

1493 msgid "could not read from stdin"

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

1495

@@ -1517,26 +1526,26 @@ msgstr "felaktigt portnummer"

1526 msgid "invalid '..' path segment"

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

1528

1520 -#: wrapper.c:509

1529 +#: wrapper.c:523

1530 #, c-format

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

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

1533

1525 -#: wrapper.c:530

1534 +#: wrapper.c:544

1535 #, c-format

1536 msgid "unable to access '%s'"

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

1538

1530 -#: wrapper.c:541

1539 +#: wrapper.c:555

1540 #, c-format

1541 msgid "unable to look up current user in the passwd file: %s"

1542 msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"

1543

1535 -#: wrapper.c:542

1544 +#: wrapper.c:556

1545 msgid "no such user"

1546 msgstr "okänd användare"

1547

1539 -#: wrapper.c:550

1548 +#: wrapper.c:564

1549 msgid "unable to get current working directory"

1550 msgstr "kan inte hämta aktuell arbetskatalog"

1551

@@ -1565,11 +1574,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)

1574 msgid " (use \"git rm <file>...\" to mark resolution)"

1575 msgstr " (använd \"git rm <fil>...\" för att ange lösning)"

1576

1568 -#: wt-status.c:198

1577 +#: wt-status.c:198 wt-status.c:878

1578 msgid "Changes to be committed:"

1579 msgstr "Ändringar att checka in:"

1580

1572 -#: wt-status.c:216

1581 +#: wt-status.c:216 wt-status.c:887

1582 msgid "Changes not staged for commit:"

1583 msgstr "Ändringar ej i incheckningskön:"

1584

@@ -1683,15 +1692,15 @@ msgstr "ospårat innehåll, "

1692 msgid "bug: unhandled diff status %c"

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

1694

1686 -#: wt-status.c:758

1695 +#: wt-status.c:753

1696 msgid "Submodules changed but not updated:"

1697 msgstr "Undermoduler ändrade men inte uppdaterade:"

1698

1690 -#: wt-status.c:760

1699 +#: wt-status.c:755

1700 msgid "Submodule changes to be committed:"

1701 msgstr "Undermodulers ändringar att checka in:"

1702

1694 -#: wt-status.c:839

1703 +#: wt-status.c:835

1704 msgid ""

1705 "Do not touch the line above.\n"

1706 "Everything below will be removed."

@@ -1699,68 +1708,68 @@ msgstr ""

1708 "Rör inte raden ovan.\n"

1709 "Allt nedan kommer tas bort."

1710

1702 -#: wt-status.c:930

1711 +#: wt-status.c:946

1712 msgid "You have unmerged paths."

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

1714

1706 -#: wt-status.c:933

1715 +#: wt-status.c:949

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

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

1718

1710 -#: wt-status.c:936

1719 +#: wt-status.c:952

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

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

1722

1714 -#: wt-status.c:939

1723 +#: wt-status.c:955

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

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

1726

1718 -#: wt-status.c:949

1727 +#: wt-status.c:965

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

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

1730

1722 -#: wt-status.c:952

1731 +#: wt-status.c:968

1732 msgid "The current patch is empty."

1733 msgstr "Aktuell patch är tom."

1734

1726 -#: wt-status.c:956

1735 +#: wt-status.c:972

1736 msgid " (fix conflicts and then run \"git am --continue\")"

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

1738

1730 -#: wt-status.c:958

1739 +#: wt-status.c:974

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

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

1742

1734 -#: wt-status.c:960

1743 +#: wt-status.c:976

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

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

1746

1738 -#: wt-status.c:1020 wt-status.c:1037

1747 +#: wt-status.c:1036 wt-status.c:1053

1748 #, c-format

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

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

1751

1743 -#: wt-status.c:1025 wt-status.c:1042

1752 +#: wt-status.c:1041 wt-status.c:1058

1753 msgid "You are currently rebasing."

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

1755

1747 -#: wt-status.c:1028

1756 +#: wt-status.c:1044

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

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

1759

1751 -#: wt-status.c:1030

1760 +#: wt-status.c:1046

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

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

1763

1755 -#: wt-status.c:1032

1764 +#: wt-status.c:1048

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

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

1767

1759 -#: wt-status.c:1045

1768 +#: wt-status.c:1061

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

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

1771

1763 -#: wt-status.c:1049

1772 +#: wt-status.c:1065

1773 #, c-format

1774 msgid ""

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

@@ -1768,118 +1777,118 @@ msgstr ""

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

1778 "ovanpå \"%s\"."

1779

1771 -#: wt-status.c:1054

1780 +#: wt-status.c:1070

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

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

1783

1775 -#: wt-status.c:1057

1784 +#: wt-status.c:1073

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

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

1787

1779 -#: wt-status.c:1061

1788 +#: wt-status.c:1077

1789 #, c-format

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

1791 msgstr ""

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

1793 "ovanpå \"%s\"."

1794

1786 -#: wt-status.c:1066

1795 +#: wt-status.c:1082

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

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

1798

1790 -#: wt-status.c:1069

1799 +#: wt-status.c:1085

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

1801 msgstr ""

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

1803

1795 -#: wt-status.c:1071

1804 +#: wt-status.c:1087

1805 msgid ""

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

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

1808

1800 -#: wt-status.c:1081

1809 +#: wt-status.c:1097

1810 #, c-format

1811 msgid "You are currently cherry-picking commit %s."

1812 msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."

1813

1805 -#: wt-status.c:1086

1814 +#: wt-status.c:1102

1815 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

1816 msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"

1817

1809 -#: wt-status.c:1089

1818 +#: wt-status.c:1105

1819 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

1820 msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"

1821

1813 -#: wt-status.c:1091

1822 +#: wt-status.c:1107

1823 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

1824 msgstr ""

1825 " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"

1826 "operationen)"

1827

1819 -#: wt-status.c:1100

1828 +#: wt-status.c:1116

1829 #, c-format

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

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

1832

1824 -#: wt-status.c:1105

1833 +#: wt-status.c:1121

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

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

1836

1828 -#: wt-status.c:1108

1837 +#: wt-status.c:1124

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

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

1840

1832 -#: wt-status.c:1110

1841 +#: wt-status.c:1126

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

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

1844

1836 -#: wt-status.c:1121

1845 +#: wt-status.c:1137

1846 #, c-format

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

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

1849

1841 -#: wt-status.c:1125

1850 +#: wt-status.c:1141

1851 msgid "You are currently bisecting."

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

1853

1845 -#: wt-status.c:1128

1854 +#: wt-status.c:1144

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

1856 msgstr ""

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

1858

1850 -#: wt-status.c:1303

1859 +#: wt-status.c:1321

1860 msgid "On branch "

1861 msgstr "På grenen "

1862

1854 -#: wt-status.c:1310

1863 +#: wt-status.c:1328

1864 msgid "rebase in progress; onto "

1865 msgstr "ombasering pågår; ovanpå"

1866

1858 -#: wt-status.c:1317

1867 +#: wt-status.c:1333

1868 msgid "HEAD detached at "

1869 msgstr "HEAD frånkopplad vid "

1870

1862 -#: wt-status.c:1319

1871 +#: wt-status.c:1335

1872 msgid "HEAD detached from "

1873 msgstr "HEAD frånkopplad från "

1874

1866 -#: wt-status.c:1322

1875 +#: wt-status.c:1338

1876 msgid "Not currently on any branch."

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

1878

1870 -#: wt-status.c:1339

1879 +#: wt-status.c:1355

1880 msgid "Initial commit"

1881 msgstr "Första incheckning"

1882

1874 -#: wt-status.c:1353

1883 +#: wt-status.c:1369

1884 msgid "Untracked files"

1885 msgstr "Ospårade filer"

1886

1878 -#: wt-status.c:1355

1887 +#: wt-status.c:1371

1888 msgid "Ignored files"

1889 msgstr "Ignorerade filer"

1890

1882 -#: wt-status.c:1359

1891 +#: wt-status.c:1375

1892 #, c-format

1893 msgid ""

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

@@ -1891,32 +1900,32 @@ msgstr ""

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

1901

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

1894 -#: wt-status.c:1365

1903 +#: wt-status.c:1381

1904 #, c-format

1905 msgid "Untracked files not listed%s"

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

1907

1899 -#: wt-status.c:1367

1908 +#: wt-status.c:1383

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

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

1911

1903 -#: wt-status.c:1373

1912 +#: wt-status.c:1389

1913 msgid "No changes"

1914 msgstr "Inga ändringar"

1915

1907 -#: wt-status.c:1378

1916 +#: wt-status.c:1394

1917 #, c-format

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

1919 msgstr ""

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

1921 "\")\n"

1922

1914 -#: wt-status.c:1381

1923 +#: wt-status.c:1397

1924 #, c-format

1925 msgid "no changes added to commit\n"

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

1927

1919 -#: wt-status.c:1384

1928 +#: wt-status.c:1400

1929 #, c-format

1930 msgid ""

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

@@ -1925,44 +1934,44 @@ msgstr ""

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

1935 "\")\n"

1936

1928 -#: wt-status.c:1387

1937 +#: wt-status.c:1403

1938 #, c-format

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

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

1941

1933 -#: wt-status.c:1390

1942 +#: wt-status.c:1406

1943 #, c-format

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

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

1946

1938 -#: wt-status.c:1393 wt-status.c:1398

1947 +#: wt-status.c:1409 wt-status.c:1414

1948 #, c-format

1949 msgid "nothing to commit\n"

1950 msgstr "inget att checka in\n"

1951

1943 -#: wt-status.c:1396

1952 +#: wt-status.c:1412

1953 #, c-format

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

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

1956

1948 -#: wt-status.c:1400

1957 +#: wt-status.c:1416

1958 #, c-format

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

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

1961

1953 -#: wt-status.c:1509

1962 +#: wt-status.c:1525

1963 msgid "HEAD (no branch)"

1964 msgstr "HEAD (ingen gren)"

1965

1957 -#: wt-status.c:1515

1966 +#: wt-status.c:1531

1967 msgid "Initial commit on "

1968 msgstr "Första incheckning på "

1969

1961 -#: wt-status.c:1547

1970 +#: wt-status.c:1563

1971 msgid "gone"

1972 msgstr "försvunnen"

1973

1965 -#: wt-status.c:1549 wt-status.c:1557

1974 +#: wt-status.c:1565 wt-status.c:1573

1975 msgid "behind "

1976 msgstr "efter "

1977

@@ -1972,8 +1981,8 @@ msgid "failed to unlink '%s'"

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

1982

1983 #: builtin/add.c:22

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

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

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

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

1986

1987 #: builtin/add.c:65

1988 #, c-format

@@ -2024,14 +2033,14 @@ msgstr "Kunde inte tillämpa \"%s\""

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

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

2035

2027 -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110

2028 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372

2036 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110

2037 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372

2038 #: builtin/rm.c:269

2039 msgid "dry run"

2040 msgstr "testkörning"

2041

2033 -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19

2034 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608

2042 +#: builtin/add.c:249 builtin/apply.c:4575 builtin/check-ignore.c:19

2043 +#: builtin/commit.c:1320 builtin/count-objects.c:63 builtin/fsck.c:608

2044 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114

2045 msgid "be verbose"

2046 msgstr "var pratsam"

@@ -2107,75 +2116,75 @@ msgstr "Inget angivet, inget tillagt.\n"

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

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

2118

2110 -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919

2119 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920

2120 #: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299

2121 msgid "index file corrupt"

2122 msgstr "indexfilen trasig"

2123

2115 -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431

2124 +#: builtin/add.c:446 builtin/apply.c:4673 builtin/mv.c:279 builtin/rm.c:431

2125 msgid "Unable to write new index file"

2126 msgstr "Kunde inte skriva ny indexfil"

2127

2119 -#: builtin/apply.c:58

2120 -msgid "git apply [options] [<patch>...]"

2121 -msgstr "git apply [flaggor] [<patch>...]"

2128 +#: builtin/apply.c:59

2129 +msgid "git apply [<options>] [<patch>...]"

2130 +msgstr "git apply [<flaggor>] [<patch>...]"

2131

2123 -#: builtin/apply.c:111

2132 +#: builtin/apply.c:112

2133 #, c-format

2134 msgid "unrecognized whitespace option '%s'"

2135 msgstr "okänt alternativ för whitespace: \"%s\""

2136

2128 -#: builtin/apply.c:126

2137 +#: builtin/apply.c:127

2138 #, c-format

2139 msgid "unrecognized whitespace ignore option '%s'"

2140 msgstr "okänt alternativ för ignore-whitespace: \"%s\""

2141

2133 -#: builtin/apply.c:826

2142 +#: builtin/apply.c:822

2143 #, c-format

2144 msgid "Cannot prepare timestamp regexp %s"

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

2146

2138 -#: builtin/apply.c:835

2147 +#: builtin/apply.c:831

2148 #, c-format

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

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

2151

2143 -#: builtin/apply.c:916

2152 +#: builtin/apply.c:912

2153 #, c-format

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

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

2156

2148 -#: builtin/apply.c:948

2157 +#: builtin/apply.c:944

2158 #, c-format

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

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

2161

2153 -#: builtin/apply.c:952

2162 +#: builtin/apply.c:948

2163 #, c-format

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

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

2166

2158 -#: builtin/apply.c:953

2167 +#: builtin/apply.c:949

2168 #, c-format

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

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

2171

2163 -#: builtin/apply.c:960

2172 +#: builtin/apply.c:956

2173 #, c-format

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

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

2176

2168 -#: builtin/apply.c:1423

2177 +#: builtin/apply.c:1419

2178 #, c-format

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

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

2181

2173 -#: builtin/apply.c:1480

2182 +#: builtin/apply.c:1476

2183 #, c-format

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

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

2186

2178 -#: builtin/apply.c:1497

2187 +#: builtin/apply.c:1493

2188 #, c-format

2189 msgid ""

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

@@ -2191,77 +2200,77 @@ msgstr[1] ""

2200 "sökvägskomponenter\n"

2201 "tas bort (rad %d)"

2202

2194 -#: builtin/apply.c:1657

2203 +#: builtin/apply.c:1656

2204 msgid "new file depends on old contents"

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

2206

2198 -#: builtin/apply.c:1659

2207 +#: builtin/apply.c:1658

2208 msgid "deleted file still has contents"

2209 msgstr "borttagen fil har fortfarande innehåll"

2210

2202 -#: builtin/apply.c:1685

2211 +#: builtin/apply.c:1684

2212 #, c-format

2213 msgid "corrupt patch at line %d"

2214 msgstr "trasig patch på rad %d"

2215

2207 -#: builtin/apply.c:1721

2216 +#: builtin/apply.c:1720

2217 #, c-format

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

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

2220

2212 -#: builtin/apply.c:1723

2221 +#: builtin/apply.c:1722

2222 #, c-format

2223 msgid "deleted file %s still has contents"

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

2225

2217 -#: builtin/apply.c:1726

2226 +#: builtin/apply.c:1725

2227 #, c-format

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

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

2230

2222 -#: builtin/apply.c:1872

2231 +#: builtin/apply.c:1871

2232 #, c-format

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

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

2235

2227 -#: builtin/apply.c:1901

2236 +#: builtin/apply.c:1900

2237 #, c-format

2238 msgid "unrecognized binary patch at line %d"

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

2240

2232 -#: builtin/apply.c:2052

2241 +#: builtin/apply.c:2051

2242 #, c-format

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

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

2245

2237 -#: builtin/apply.c:2142

2246 +#: builtin/apply.c:2141

2247 #, c-format

2248 msgid "unable to read symlink %s"

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

2250

2242 -#: builtin/apply.c:2146

2251 +#: builtin/apply.c:2145

2252 #, c-format

2253 msgid "unable to open or read %s"

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

2255

2247 -#: builtin/apply.c:2754

2256 +#: builtin/apply.c:2778

2257 #, c-format

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

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

2260

2252 -#: builtin/apply.c:2872

2261 +#: builtin/apply.c:2896

2262 #, c-format

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

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

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

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

2267

2259 -#: builtin/apply.c:2884

2268 +#: builtin/apply.c:2908

2269 #, c-format

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

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

2272

2264 -#: builtin/apply.c:2890

2273 +#: builtin/apply.c:2914

2274 #, c-format

2275 msgid ""

2276 "while searching for:\n"

@@ -2270,317 +2279,336 @@ msgstr ""

2279 "vid sökning efter:\n"

2280 "%.*s"

2281

2273 -#: builtin/apply.c:2909

2282 +#: builtin/apply.c:2933

2283 #, c-format

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

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

2286

2278 -#: builtin/apply.c:3010

2287 +#: builtin/apply.c:3034

2288 #, c-format

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

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

2291

2283 -#: builtin/apply.c:3016

2292 +#: builtin/apply.c:3040

2293 #, c-format

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

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

2296

2288 -#: builtin/apply.c:3037

2297 +#: builtin/apply.c:3061

2298 #, c-format

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

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

2301

2293 -#: builtin/apply.c:3161

2302 +#: builtin/apply.c:3185

2303 #, c-format

2304 msgid "cannot checkout %s"

2305 msgstr "kan inte checka ut %s"

2306

2298 -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260

2307 +#: builtin/apply.c:3230 builtin/apply.c:3241 builtin/apply.c:3286

2308 #, c-format

2309 msgid "read of %s failed"

2310 msgstr "misslyckades läsa %s"

2311

2303 -#: builtin/apply.c:3240 builtin/apply.c:3462

2312 +#: builtin/apply.c:3238

2313 +#, c-format

2314 +msgid "reading from '%s' beyond a symbolic link"

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

2316 +

2317 +#: builtin/apply.c:3266 builtin/apply.c:3488

2318 #, c-format

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

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

2321

2308 -#: builtin/apply.c:3321 builtin/apply.c:3476

2322 +#: builtin/apply.c:3347 builtin/apply.c:3502

2323 #, c-format

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

2325 msgstr "%s: finns inte i indexet"

2326

2313 -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490

2327 +#: builtin/apply.c:3351 builtin/apply.c:3494 builtin/apply.c:3516

2328 #, c-format

2329 msgid "%s: %s"

2330 msgstr "%s: %s"

2331

2318 -#: builtin/apply.c:3330 builtin/apply.c:3484

2332 +#: builtin/apply.c:3356 builtin/apply.c:3510

2333 #, c-format

2334 msgid "%s: does not match index"

2335 msgstr "%s: motsvarar inte indexet"

2336

2323 -#: builtin/apply.c:3432

2337 +#: builtin/apply.c:3458

2338 msgid "removal patch leaves file contents"

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

2340

2327 -#: builtin/apply.c:3501

2341 +#: builtin/apply.c:3527

2342 #, c-format

2343 msgid "%s: wrong type"

2344 msgstr "%s: fel typ"

2345

2332 -#: builtin/apply.c:3503

2346 +#: builtin/apply.c:3529

2347 #, c-format

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

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

2350

2337 -#: builtin/apply.c:3604

2351 +#: builtin/apply.c:3688 builtin/apply.c:3690

2352 +#, c-format

2353 +msgid "invalid path '%s'"

2354 +msgstr "ogiltig sökväg: %s"

2355 +

2356 +#: builtin/apply.c:3745

2357 #, c-format

2358 msgid "%s: already exists in index"

2359 msgstr "%s: finns redan i indexet"

2360

2342 -#: builtin/apply.c:3607

2361 +#: builtin/apply.c:3748

2362 #, c-format

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

2364 msgstr "%s: finns redan i arbetskatalogen"

2365

2347 -#: builtin/apply.c:3627

2366 +#: builtin/apply.c:3768

2367 #, c-format

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

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

2370

2352 -#: builtin/apply.c:3632

2371 +#: builtin/apply.c:3773

2372 #, c-format

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

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

2375

2357 -#: builtin/apply.c:3640

2376 +#: builtin/apply.c:3793

2377 +#, c-format

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

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

2380 +

2381 +#: builtin/apply.c:3797

2382 #, c-format

2383 msgid "%s: patch does not apply"

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

2385

2362 -#: builtin/apply.c:3653

2386 +#: builtin/apply.c:3811

2387 #, c-format

2388 msgid "Checking patch %s..."

2389 msgstr "Kontrollerar patchen %s..."

2390

2367 -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135

2391 +#: builtin/apply.c:3904 builtin/checkout.c:231 builtin/reset.c:135

2392 #, c-format

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

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

2395

2372 -#: builtin/apply.c:3889

2396 +#: builtin/apply.c:4047

2397 #, c-format

2398 msgid "unable to remove %s from index"

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

2400

2377 -#: builtin/apply.c:3918

2401 +#: builtin/apply.c:4076

2402 #, c-format

2403 msgid "corrupt patch for submodule %s"

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

2405

2382 -#: builtin/apply.c:3922

2406 +#: builtin/apply.c:4080

2407 #, c-format

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

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

2410

2387 -#: builtin/apply.c:3927

2411 +#: builtin/apply.c:4085

2412 #, c-format

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

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

2415

2392 -#: builtin/apply.c:3930 builtin/apply.c:4038

2416 +#: builtin/apply.c:4088 builtin/apply.c:4196

2417 #, c-format

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

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

2420

2397 -#: builtin/apply.c:3963

2421 +#: builtin/apply.c:4121

2422 #, c-format

2423 msgid "closing file '%s'"

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

2425

2402 -#: builtin/apply.c:4012

2426 +#: builtin/apply.c:4170

2427 #, c-format

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

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

2430

2407 -#: builtin/apply.c:4099

2431 +#: builtin/apply.c:4257

2432 #, c-format

2433 msgid "Applied patch %s cleanly."

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

2435

2412 -#: builtin/apply.c:4107

2436 +#: builtin/apply.c:4265

2437 msgid "internal error"

2438 msgstr "internt fel"

2439

2416 -#: builtin/apply.c:4110

2440 +#: builtin/apply.c:4268

2441 #, c-format

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

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

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

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

2446

2423 -#: builtin/apply.c:4120

2447 +#: builtin/apply.c:4278

2448 #, c-format

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

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

2451

2428 -#: builtin/apply.c:4141

2452 +#: builtin/apply.c:4299

2453 #, c-format

2454 msgid "Hunk #%d applied cleanly."

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

2456

2433 -#: builtin/apply.c:4144

2457 +#: builtin/apply.c:4302

2458 #, c-format

2459 msgid "Rejected hunk #%d."

2460 msgstr "Refuserar stycke %d."

2461

2438 -#: builtin/apply.c:4234

2462 +#: builtin/apply.c:4392

2463 msgid "unrecognized input"

2464 msgstr "indata känns inte igen"

2465

2442 -#: builtin/apply.c:4245

2466 +#: builtin/apply.c:4403

2467 msgid "unable to read index file"

2468 msgstr "kan inte läsa indexfilen"

2469

2446 -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92

2447 -#: builtin/fetch.c:93

2470 +#: builtin/apply.c:4520 builtin/apply.c:4523 builtin/clone.c:92

2471 +#: builtin/fetch.c:92

2472 msgid "path"

2473 msgstr "sökväg"

2474

2451 -#: builtin/apply.c:4363

2475 +#: builtin/apply.c:4521

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

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

2478

2455 -#: builtin/apply.c:4366

2479 +#: builtin/apply.c:4524

2480 msgid "apply changes matching the given path"

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

2482

2459 -#: builtin/apply.c:4368

2483 +#: builtin/apply.c:4526

2484 msgid "num"

2485 msgstr "antal"

2486

2463 -#: builtin/apply.c:4369

2487 +#: builtin/apply.c:4527

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

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

2490

2467 -#: builtin/apply.c:4372

2491 +#: builtin/apply.c:4530

2492 msgid "ignore additions made by the patch"

2493 msgstr "ignorera tillägg gjorda av patchen"

2494

2471 -#: builtin/apply.c:4374

2495 +#: builtin/apply.c:4532

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

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

2498

2475 -#: builtin/apply.c:4378

2499 +#: builtin/apply.c:4536

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

2501 msgstr "visa antal tillagda och borttagna rader decimalt"

2502

2479 -#: builtin/apply.c:4380

2503 +#: builtin/apply.c:4538

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

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

2506

2483 -#: builtin/apply.c:4382

2507 +#: builtin/apply.c:4540

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

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

2510

2487 -#: builtin/apply.c:4384

2511 +#: builtin/apply.c:4542

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

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

2514

2491 -#: builtin/apply.c:4386

2515 +#: builtin/apply.c:4544

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

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

2518

2495 -#: builtin/apply.c:4388

2519 +#: builtin/apply.c:4546

2520 +msgid "accept a patch that touches outside the working area"

2521 +msgstr "godta en patch som rör filer utanför arbetskatalogen"

2522 +

2523 +#: builtin/apply.c:4548

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

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

2526

2499 -#: builtin/apply.c:4390

2527 +#: builtin/apply.c:4550

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

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

2530

2503 -#: builtin/apply.c:4392

2531 +#: builtin/apply.c:4552

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

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

2534

2507 -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455

2535 +#: builtin/apply.c:4554 builtin/checkout-index.c:198 builtin/ls-files.c:412

2536 msgid "paths are separated with NUL character"

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

2538

2511 -#: builtin/apply.c:4397

2539 +#: builtin/apply.c:4557

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

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

2542

2515 -#: builtin/apply.c:4398

2543 +#: builtin/apply.c:4558

2544 msgid "action"

2545 msgstr "åtgärd"

2546

2519 -#: builtin/apply.c:4399

2547 +#: builtin/apply.c:4559

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

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

2550

2523 -#: builtin/apply.c:4402 builtin/apply.c:4405

2551 +#: builtin/apply.c:4562 builtin/apply.c:4565

2552 msgid "ignore changes in whitespace when finding context"

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

2554

2527 -#: builtin/apply.c:4408

2555 +#: builtin/apply.c:4568

2556 msgid "apply the patch in reverse"

2557 msgstr "tillämpa patchen baklänges"

2558

2531 -#: builtin/apply.c:4410

2559 +#: builtin/apply.c:4570

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

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

2562

2535 -#: builtin/apply.c:4412

2563 +#: builtin/apply.c:4572

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

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

2566

2539 -#: builtin/apply.c:4414

2567 +#: builtin/apply.c:4574

2568 msgid "allow overlapping hunks"

2569 msgstr "tillåt överlappande stycken"

2570

2543 -#: builtin/apply.c:4417

2571 +#: builtin/apply.c:4577

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

2573 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

2574

2547 -#: builtin/apply.c:4420

2575 +#: builtin/apply.c:4580

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

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

2578

2551 -#: builtin/apply.c:4422

2579 +#: builtin/apply.c:4582

2580 msgid "root"

2581 msgstr "rot"

2582

2555 -#: builtin/apply.c:4423

2583 +#: builtin/apply.c:4583

2584 msgid "prepend <root> to all filenames"

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

2586

2559 -#: builtin/apply.c:4445

2587 +#: builtin/apply.c:4605

2588 msgid "--3way outside a repository"

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

2590

2563 -#: builtin/apply.c:4453

2591 +#: builtin/apply.c:4613

2592 msgid "--index outside a repository"

2593 msgstr "--index utanför arkiv"

2594

2567 -#: builtin/apply.c:4456

2595 +#: builtin/apply.c:4616

2596 msgid "--cached outside a repository"

2597 msgstr "--cached utanför arkiv"

2598

2571 -#: builtin/apply.c:4472

2599 +#: builtin/apply.c:4635

2600 #, c-format

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

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

2603

2576 -#: builtin/apply.c:4486

2604 +#: builtin/apply.c:4649

2605 #, c-format

2606 msgid "squelched %d whitespace error"

2607 msgid_plural "squelched %d whitespace errors"

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

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

2610

2583 -#: builtin/apply.c:4492 builtin/apply.c:4502

2611 +#: builtin/apply.c:4655 builtin/apply.c:4665

2612 #, c-format

2613 msgid "%d line adds whitespace errors."

2614 msgid_plural "%d lines add whitespace errors."

@@ -2635,102 +2663,102 @@ msgid "update BISECT_HEAD instead of checking out the current commit"

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

2664

2665 #: builtin/blame.c:30

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

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

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

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

2668

2669 #: builtin/blame.c:35

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

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

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

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

2672

2645 -#: builtin/blame.c:2501

2673 +#: builtin/blame.c:2500

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

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

2676

2649 -#: builtin/blame.c:2502

2677 +#: builtin/blame.c:2501

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

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

2680

2653 -#: builtin/blame.c:2503

2681 +#: builtin/blame.c:2502

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

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

2684

2657 -#: builtin/blame.c:2504

2685 +#: builtin/blame.c:2503

2686 msgid "Show work cost statistics"

2687 msgstr "Visa statistik över arbetskostnad"

2688

2661 -#: builtin/blame.c:2505

2689 +#: builtin/blame.c:2504

2690 msgid "Show output score for blame entries"

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

2692

2665 -#: builtin/blame.c:2506

2693 +#: builtin/blame.c:2505

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

2695 msgstr "Visa originalfilnamn (Standard: auto)"

2696

2669 -#: builtin/blame.c:2507

2697 +#: builtin/blame.c:2506

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

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

2700

2673 -#: builtin/blame.c:2508

2701 +#: builtin/blame.c:2507

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

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

2704

2677 -#: builtin/blame.c:2509

2705 +#: builtin/blame.c:2508

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

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

2708

2681 -#: builtin/blame.c:2510

2709 +#: builtin/blame.c:2509

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

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

2712

2685 -#: builtin/blame.c:2511

2713 +#: builtin/blame.c:2510

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

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

2716

2689 -#: builtin/blame.c:2512

2717 +#: builtin/blame.c:2511

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

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

2720

2693 -#: builtin/blame.c:2513

2721 +#: builtin/blame.c:2512

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

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

2724

2697 -#: builtin/blame.c:2514

2725 +#: builtin/blame.c:2513

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

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

2728

2701 -#: builtin/blame.c:2515

2729 +#: builtin/blame.c:2514

2730 msgid "Ignore whitespace differences"

2731 msgstr "Ignorera ändringar i blanksteg"

2732

2705 -#: builtin/blame.c:2516

2733 +#: builtin/blame.c:2515

2734 msgid "Spend extra cycles to find better match"

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

2736

2709 -#: builtin/blame.c:2517

2737 +#: builtin/blame.c:2516

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

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

2740

2713 -#: builtin/blame.c:2518

2741 +#: builtin/blame.c:2517

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

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

2744

2717 -#: builtin/blame.c:2519 builtin/blame.c:2520

2745 +#: builtin/blame.c:2518 builtin/blame.c:2519

2746 msgid "score"

2747 msgstr "poäng"

2748

2721 -#: builtin/blame.c:2519

2749 +#: builtin/blame.c:2518

2750 msgid "Find line copies within and across files"

2751 msgstr "Hitta kopierade rader inuti och mellan filer"

2752

2725 -#: builtin/blame.c:2520

2753 +#: builtin/blame.c:2519

2754 msgid "Find line movements within and across files"

2755 msgstr "Hitta flyttade rader inuti och mellan filer"

2756

2729 -#: builtin/blame.c:2521

2757 +#: builtin/blame.c:2520

2758 msgid "n,m"

2759 msgstr "n,m"

2760

2733 -#: builtin/blame.c:2521

2761 +#: builtin/blame.c:2520

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

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

2764

@@ -2740,25 +2768,25 @@ msgstr "Behandla endast radintervallet n,m, med början på 1"

2768 #. takes 22 places, is the longest among various forms of

2769 #. relative timestamps, but your language may need more or

2770 #. fewer display columns.

2743 -#: builtin/blame.c:2602

2771 +#: builtin/blame.c:2601

2772 msgid "4 years, 11 months ago"

2773 msgstr "4 år, 11 månader sedan"

2774

2775 #: builtin/branch.c:24

2748 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]"

2749 -msgstr "git branch [flaggor] [-r | -a] [--merged | --no-merged]"

2776 +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"

2777 +msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]"

2778

2779 #: builtin/branch.c:25

2752 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"

2753 -msgstr "git branch [flaggor] [-l] [-f] <grennamn> [<startpunkt>]"

2780 +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"

2781 +msgstr "git branch [<flaggor>] [-l] [-f] <grennamn> [<startpunkt>]"

2782

2783 #: builtin/branch.c:26

2756 -msgid "git branch [options] [-r] (-d | -D) <branchname>..."

2757 -msgstr "git branch [flaggor] [-r] (-d | -D) <grennamn>..."

2784 +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."

2785 +msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..."

2786

2787 #: builtin/branch.c:27

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

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

2788 +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

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

2790

2791 #: builtin/branch.c:152

2792 #, c-format

@@ -2898,237 +2926,242 @@ msgstr "(ingen gren, ombaserar %s)"

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

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

2928

2901 -#: builtin/branch.c:593

2929 +#: builtin/branch.c:596

2930 #, c-format

2903 -msgid "(detached from %s)"

2904 -msgstr "(frånkopplad från %s)"

2931 +msgid "(HEAD detached at %s)"

2932 +msgstr "(HEAD frånkopplat vid %s)"

2933

2906 -#: builtin/branch.c:596

2934 +#: builtin/branch.c:599

2935 +#, c-format

2936 +msgid "(HEAD detached from %s)"

2937 +msgstr "(HEAD frånkopplat från %s)"

2938 +

2939 +#: builtin/branch.c:603

2940 msgid "(no branch)"

2941 msgstr "(ingen gren)"

2942

2910 -#: builtin/branch.c:643

2943 +#: builtin/branch.c:650

2944 #, c-format

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

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

2947

2915 -#: builtin/branch.c:691

2948 +#: builtin/branch.c:698

2949 msgid "some refs could not be read"

2950 msgstr "vissa referenser kunde inte läsas"

2951

2919 -#: builtin/branch.c:704

2952 +#: builtin/branch.c:711

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

2954 msgstr ""

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

2956

2924 -#: builtin/branch.c:714

2957 +#: builtin/branch.c:721

2958 #, c-format

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

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

2961

2929 -#: builtin/branch.c:729

2962 +#: builtin/branch.c:736

2963 msgid "Branch rename failed"

2964 msgstr "Misslyckades byta namn på gren"

2965

2933 -#: builtin/branch.c:733

2966 +#: builtin/branch.c:740

2967 #, c-format

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

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

2970

2938 -#: builtin/branch.c:737

2971 +#: builtin/branch.c:744

2972 #, c-format

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

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

2975

2943 -#: builtin/branch.c:744

2976 +#: builtin/branch.c:751

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

2978 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

2979

2947 -#: builtin/branch.c:759

2980 +#: builtin/branch.c:766

2981 #, c-format

2982 msgid "malformed object name %s"

2983 msgstr "felformat objektnamn %s"

2984

2952 -#: builtin/branch.c:783

2985 +#: builtin/branch.c:790

2986 #, c-format

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

2988 msgstr "kunde inte skriva grenbeskrivningsmall: %s"

2989

2957 -#: builtin/branch.c:813

2990 +#: builtin/branch.c:820

2991 msgid "Generic options"

2992 msgstr "Allmänna flaggor"

2993

2961 -#: builtin/branch.c:815

2994 +#: builtin/branch.c:822

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

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

2997

2965 -#: builtin/branch.c:816

2998 +#: builtin/branch.c:823

2999 msgid "suppress informational messages"

3000 msgstr "undertryck informationsmeddelanden"

3001

2969 -#: builtin/branch.c:817

3002 +#: builtin/branch.c:824

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

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

3005

2973 -#: builtin/branch.c:819

3006 +#: builtin/branch.c:826

3007 msgid "change upstream info"

3008 msgstr "ändra uppströmsinformation"

3009

2977 -#: builtin/branch.c:823

3010 +#: builtin/branch.c:830

3011 msgid "use colored output"

3012 msgstr "använd färgad utdata"

3013

2981 -#: builtin/branch.c:824

3014 +#: builtin/branch.c:831

3015 msgid "act on remote-tracking branches"

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

3017

2985 -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854

2986 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587

2987 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616

3018 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861

3019 +#: builtin/branch.c:867 builtin/commit.c:1580 builtin/commit.c:1581

3020 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:616

3021 #: builtin/tag.c:622

3022 msgid "commit"

3023 msgstr "incheckning"

3024

2992 -#: builtin/branch.c:828 builtin/branch.c:834

3025 +#: builtin/branch.c:835 builtin/branch.c:841

3026 msgid "print only branches that contain the commit"

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

3028

2996 -#: builtin/branch.c:840

3029 +#: builtin/branch.c:847

3030 msgid "Specific git-branch actions:"

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

3032

3000 -#: builtin/branch.c:841

3033 +#: builtin/branch.c:848

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

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

3036

3004 -#: builtin/branch.c:843

3037 +#: builtin/branch.c:850

3038 msgid "delete fully merged branch"

3039 msgstr "ta bort helt sammanslagen gren"

3040

3008 -#: builtin/branch.c:844

3041 +#: builtin/branch.c:851

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

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

3044

3012 -#: builtin/branch.c:845

3045 +#: builtin/branch.c:852

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

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

3048

3016 -#: builtin/branch.c:846

3049 +#: builtin/branch.c:853

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

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

3052

3020 -#: builtin/branch.c:847

3053 +#: builtin/branch.c:854

3054 msgid "list branch names"

3055 msgstr "lista namn på grenar"

3056

3024 -#: builtin/branch.c:848

3057 +#: builtin/branch.c:855

3058 msgid "create the branch's reflog"

3059 msgstr "skapa grenens reflogg"

3060

3028 -#: builtin/branch.c:850

3061 +#: builtin/branch.c:857

3062 msgid "edit the description for the branch"

3063 msgstr "redigera beskrivning för grenen"

3064

3032 -#: builtin/branch.c:851

3065 +#: builtin/branch.c:858

3066 msgid "force creation, move/rename, deletion"

3067 msgstr "tvinga skapande, flytt/namnändring, borttagande"

3068

3036 -#: builtin/branch.c:854

3069 +#: builtin/branch.c:861

3070 msgid "print only not merged branches"

3071 msgstr "visa endast ej sammanslagna grenar"

3072

3040 -#: builtin/branch.c:860

3073 +#: builtin/branch.c:867

3074 msgid "print only merged branches"

3075 msgstr "visa endast sammanslagna grenar"

3076

3044 -#: builtin/branch.c:864

3077 +#: builtin/branch.c:871

3078 msgid "list branches in columns"

3079 msgstr "visa grenar i spalter"

3080

3048 -#: builtin/branch.c:877

3081 +#: builtin/branch.c:884

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

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

3084

3052 -#: builtin/branch.c:881 builtin/clone.c:637

3085 +#: builtin/branch.c:888 builtin/clone.c:637

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

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

3088

3056 -#: builtin/branch.c:903

3089 +#: builtin/branch.c:910

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

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

3092

3060 -#: builtin/branch.c:914 builtin/branch.c:953

3093 +#: builtin/branch.c:921 builtin/branch.c:960

3094 msgid "branch name required"

3095 msgstr "grennamn krävs"

3096

3064 -#: builtin/branch.c:929

3097 +#: builtin/branch.c:936

3098 msgid "Cannot give description to detached HEAD"

3099 msgstr "Kan inte beskriva frånkopplad HEAD"

3100

3068 -#: builtin/branch.c:934

3101 +#: builtin/branch.c:941

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

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

3104

3072 -#: builtin/branch.c:941

3105 +#: builtin/branch.c:948

3106 #, c-format

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

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

3109

3077 -#: builtin/branch.c:944

3110 +#: builtin/branch.c:951

3111 #, c-format

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

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

3114

3082 -#: builtin/branch.c:959

3115 +#: builtin/branch.c:966

3116 msgid "too many branches for a rename operation"

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

3118

3086 -#: builtin/branch.c:964

3119 +#: builtin/branch.c:971

3120 msgid "too many branches to set new upstream"

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

3122

3090 -#: builtin/branch.c:968

3123 +#: builtin/branch.c:975

3124 #, c-format

3125 msgid ""

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

3127 msgstr ""

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

3129

3097 -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014

3130 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021

3131 #, c-format

3132 msgid "no such branch '%s'"

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

3134

3102 -#: builtin/branch.c:975

3135 +#: builtin/branch.c:982

3136 #, c-format

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

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

3139

3107 -#: builtin/branch.c:987

3140 +#: builtin/branch.c:994

3141 msgid "too many branches to unset upstream"

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

3143

3111 -#: builtin/branch.c:991

3144 +#: builtin/branch.c:998

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

3146 msgstr ""

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

3148

3116 -#: builtin/branch.c:997

3149 +#: builtin/branch.c:1004

3150 #, c-format

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

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

3153

3121 -#: builtin/branch.c:1011

3154 +#: builtin/branch.c:1018

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

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

3157

3125 -#: builtin/branch.c:1017

3158 +#: builtin/branch.c:1024

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

3160 msgstr ""

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

3162 "grennamn"

3163

3131 -#: builtin/branch.c:1020

3164 +#: builtin/branch.c:1027

3165 #, c-format

3166 msgid ""

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

@@ -3137,7 +3170,7 @@ msgstr ""

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

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

3172

3140 -#: builtin/branch.c:1037

3173 +#: builtin/branch.c:1044

3174 #, c-format

3175 msgid ""

3176 "\n"

@@ -3148,12 +3181,12 @@ msgstr ""

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

3182 "\n"

3183

3151 -#: builtin/branch.c:1038

3184 +#: builtin/branch.c:1045

3185 #, c-format

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

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

3188

3156 -#: builtin/branch.c:1039

3189 +#: builtin/branch.c:1046

3190 #, c-format

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

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

@@ -3171,53 +3204,53 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."

3204 msgid "Need a repository to unbundle."

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

3206

3174 -#: builtin/cat-file.c:328

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

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

3207 +#: builtin/cat-file.c:326

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

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

3210

3178 -#: builtin/cat-file.c:329

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

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

3211 +#: builtin/cat-file.c:327

3212 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>"

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

3214

3182 -#: builtin/cat-file.c:366

3215 +#: builtin/cat-file.c:364

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

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

3218

3186 -#: builtin/cat-file.c:367

3219 +#: builtin/cat-file.c:365

3220 msgid "show object type"

3221 msgstr "visa objekttyp"

3222

3190 -#: builtin/cat-file.c:368

3223 +#: builtin/cat-file.c:366

3224 msgid "show object size"

3225 msgstr "visa objektstorlek"

3226

3194 -#: builtin/cat-file.c:370

3227 +#: builtin/cat-file.c:368

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

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

3230

3198 -#: builtin/cat-file.c:371

3231 +#: builtin/cat-file.c:369

3232 msgid "pretty-print object's content"

3233 msgstr "visa objektets innehåll snyggt"

3234

3202 -#: builtin/cat-file.c:373

3235 +#: builtin/cat-file.c:371

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

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

3238

3206 -#: builtin/cat-file.c:375

3239 +#: builtin/cat-file.c:373

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

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

3242

3210 -#: builtin/cat-file.c:378

3243 +#: builtin/cat-file.c:376

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

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

3246

3247 #: builtin/check-attr.c:11

3215 -msgid "git check-attr [-a | --all | attr...] [--] pathname..."

3216 -msgstr "git check-attr [-a | --all | attr...] [--] sökväg..."

3248 +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."

3249 +msgstr "git check-attr [-a | --all | <attr>...] [--] <sökväg>..."

3250

3251 #: builtin/check-attr.c:12

3219 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"

3220 -msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <sökvägslista>"

3252 +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"

3253 +msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...] < <sökvägslista>"

3254

3255 #: builtin/check-attr.c:19

3256 msgid "report all attributes set on file"

@@ -3272,8 +3305,8 @@ msgid "--non-matching is only valid with --verbose"

3305 msgstr "--non-matching är endast giltig med --verbose"

3306

3307 #: builtin/check-mailmap.c:8

3275 -msgid "git check-mailmap [options] <contact>..."

3276 -msgstr "git check-mailmap [flaggor] <kontakt>..."

3308 +msgid "git check-mailmap [<options>] <contact>..."

3309 +msgstr "git check-mailmap [<flaggor>] <kontakt>..."

3310

3311 #: builtin/check-mailmap.c:13

3312 msgid "also read contacts from stdin"

@@ -3289,8 +3322,8 @@ msgid "no contacts specified"

3322 msgstr "inga kontakter angavs"

3323

3324 #: builtin/checkout-index.c:126

3292 -msgid "git checkout-index [options] [--] [<file>...]"

3293 -msgstr "git checkout-index [flaggor] [--] [<fil>...]"

3325 +msgid "git checkout-index [<options>] [--] [<file>...]"

3326 +msgstr "git checkout-index [<flaggor>] [--] [<fil>...]"

3327

3328 #: builtin/checkout-index.c:188

3329 msgid "check out all files in the index"

@@ -3333,12 +3366,12 @@ msgid "copy out the files from named stage"

3366 msgstr "kopiera ut filer från namngiven etapp"

3367

3368 #: builtin/checkout.c:25

3336 -msgid "git checkout [options] <branch>"

3337 -msgstr "git checkout [flaggor] <gren>"

3369 +msgid "git checkout [<options>] <branch>"

3370 +msgstr "git checkout [<flaggor>] <gren>"

3371

3372 #: builtin/checkout.c:26

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

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

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

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

3375

3376 #: builtin/checkout.c:132 builtin/checkout.c:165

3377 #, c-format

@@ -3467,13 +3500,13 @@ msgid ""

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

3501 "to do so with:\n"

3502 "\n"

3470 -" git branch new_branch_name %s\n"

3503 +" git branch <new-branch-name> %s\n"

3504 "\n"

3505 msgstr ""

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

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

3508 "\n"

3476 -" git branch nytt_grennamn %s\n"

3509 +" git branch <nytt_grennamn> %s\n"

3510 "\n"

3511

3512 #: builtin/checkout.c:777

@@ -3589,8 +3622,8 @@ msgid "do not limit pathspecs to sparse entries only"

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

3623

3624 #: builtin/checkout.c:1130

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

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

3625 +msgid "second guess 'git checkout <no-such-branch>'"

3626 +msgstr "förutspå \"git checkout <gren-saknas>\""

3627

3628 #: builtin/checkout.c:1153

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

@@ -3713,16 +3746,17 @@ msgstr "VARNING: Hittar inte poster som motsvarar: %s"

3746 msgid "Select items to delete"

3747 msgstr "Välj poster att ta bort"

3748

3716 -#: builtin/clean.c:757

3749 +#. TRANSLATORS: Make sure to keep [y/N] as is

3750 +#: builtin/clean.c:758

3751 #, c-format

3718 -msgid "remove %s? "

3719 -msgstr "ta bort %s?"

3752 +msgid "Remove %s [y/N]? "

3753 +msgstr "Ta bort %s [Y=ja / N=nej]?"

3754

3721 -#: builtin/clean.c:782

3755 +#: builtin/clean.c:783

3756 msgid "Bye."

3757 msgstr "Hej då."

3758

3725 -#: builtin/clean.c:790

3759 +#: builtin/clean.c:791

3760 msgid ""

3761 "clean - start cleaning\n"

3762 "filter by pattern - exclude items from deletion\n"

@@ -3740,62 +3774,62 @@ msgstr ""

3774 "help - denna skärm\n"

3775 "? - hjälp för kommandoval"

3776

3743 -#: builtin/clean.c:817

3777 +#: builtin/clean.c:818

3778 msgid "*** Commands ***"

3779 msgstr "*** Kommandon ***"

3780

3747 -#: builtin/clean.c:818

3781 +#: builtin/clean.c:819

3782 msgid "What now"

3783 msgstr "Vad nu"

3784

3751 -#: builtin/clean.c:826

3785 +#: builtin/clean.c:827

3786 msgid "Would remove the following item:"

3787 msgid_plural "Would remove the following items:"

3788 msgstr[0] "Skulle ta bort följande post:"

3789 msgstr[1] "Skulle ta bort följande poster:"

3790

3757 -#: builtin/clean.c:843

3791 +#: builtin/clean.c:844

3792 msgid "No more files to clean, exiting."

3793 msgstr "Inga fler filer att städa, avslutar."

3794

3761 -#: builtin/clean.c:874

3795 +#: builtin/clean.c:875

3796 msgid "do not print names of files removed"

3797 msgstr "skriv inte ut namn på borttagna filer"

3798

3765 -#: builtin/clean.c:876

3799 +#: builtin/clean.c:877

3800 msgid "force"

3801 msgstr "tvinga"

3802

3769 -#: builtin/clean.c:877

3803 +#: builtin/clean.c:878

3804 msgid "interactive cleaning"

3805 msgstr "städa interaktivt"

3806

3773 -#: builtin/clean.c:879

3807 +#: builtin/clean.c:880

3808 msgid "remove whole directories"

3809 msgstr "ta bort hela kataloger"

3810

3777 -#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714

3778 -#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185

3811 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714

3812 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185

3813 msgid "pattern"

3814 msgstr "mönster"

3815

3782 -#: builtin/clean.c:881

3816 +#: builtin/clean.c:882

3817 msgid "add <pattern> to ignore rules"

3818 msgstr "lägg till <mönster> till ignoreringsregler"

3819

3786 -#: builtin/clean.c:882

3820 +#: builtin/clean.c:883

3821 msgid "remove ignored files, too"

3822 msgstr "ta även bort ignorerade filer"

3823

3790 -#: builtin/clean.c:884

3824 +#: builtin/clean.c:885

3825 msgid "remove only ignored files"

3826 msgstr "ta endast bort ignorerade filer"

3827

3794 -#: builtin/clean.c:902

3828 +#: builtin/clean.c:903

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

3830 msgstr "-x och -X kan inte användas samtidigt"

3831

3798 -#: builtin/clean.c:906

3832 +#: builtin/clean.c:907

3833 msgid ""

3834 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

3835 "clean"

@@ -3803,7 +3837,7 @@ msgstr ""

3837 "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "

3838 "städa"

3839

3806 -#: builtin/clean.c:909

3840 +#: builtin/clean.c:910

3841 msgid ""

3842 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

3843 "refusing to clean"

@@ -3812,11 +3846,11 @@ msgstr ""

3846 "angavs; vägrar städa"

3847

3848 #: builtin/clone.c:37

3815 -msgid "git clone [options] [--] <repo> [<dir>]"

3816 -msgstr "git clone [flaggor] [--] <arkiv> [<kat>]"

3849 +msgid "git clone [<options>] [--] <repo> [<dir>]"

3850 +msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"

3851

3818 -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224

3819 -#: builtin/push.c:514

3852 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224

3853 +#: builtin/push.c:523

3854 msgid "force progress reporting"

3855 msgstr "tvinga förloppsrapportering"

3856

@@ -3876,7 +3910,7 @@ msgstr "checka ut <gren> istället för fjärrens HEAD"

3910 msgid "path to git-upload-pack on the remote"

3911 msgstr "sökväg till git-upload-pack på fjärren"

3912

3879 -#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659

3913 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659

3914 msgid "depth"

3915 msgstr "djup"

3916

@@ -4023,7 +4057,7 @@ msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."

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

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

4059

4026 -#: builtin/clone.c:815 builtin/fetch.c:1155

4060 +#: builtin/clone.c:815 builtin/fetch.c:1156

4061 #, c-format

4062 msgid "depth %s is not a positive number"

4063 msgstr "djupet %s är inte ett positivt tal"

@@ -4038,59 +4072,59 @@ msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."

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

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

4074

4041 -#: builtin/clone.c:848 builtin/clone.c:860

4075 +#: builtin/clone.c:850 builtin/clone.c:861

4076 #, c-format

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

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

4079

4046 -#: builtin/clone.c:851

4080 +#: builtin/clone.c:853

4081 #, c-format

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

4082 +msgid "could not create work tree dir '%s'"

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

4084

4051 -#: builtin/clone.c:870

4085 +#: builtin/clone.c:871

4086 #, c-format

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

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

4089

4056 -#: builtin/clone.c:872

4090 +#: builtin/clone.c:873

4091 #, c-format

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

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

4094

4061 -#: builtin/clone.c:897

4095 +#: builtin/clone.c:898

4096 msgid "--dissociate given, but there is no --reference"

4097 msgstr "--dissociate angavs, men --reference har inte angivits"

4098

4065 -#: builtin/clone.c:912

4099 +#: builtin/clone.c:913

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

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

4102

4069 -#: builtin/clone.c:915

4103 +#: builtin/clone.c:916

4104 msgid "source repository is shallow, ignoring --local"

4105 msgstr "källarkivet är grunt, ignorerar --local"

4106

4073 -#: builtin/clone.c:920

4107 +#: builtin/clone.c:921

4108 msgid "--local is ignored"

4109 msgstr "--local ignoreras"

4110

4077 -#: builtin/clone.c:924

4111 +#: builtin/clone.c:925

4112 #, c-format

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

4114 msgstr "Vet inte hur man klonar %s"

4115

4082 -#: builtin/clone.c:975 builtin/clone.c:983

4116 +#: builtin/clone.c:976 builtin/clone.c:984

4117 #, c-format

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

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

4120

4087 -#: builtin/clone.c:986

4121 +#: builtin/clone.c:987

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

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

4124

4125 #: builtin/column.c:9

4092 -msgid "git column [options]"

4093 -msgstr "git column [flaggor]"

4126 +msgid "git column [<options>]"

4127 +msgstr "git column [<flaggor>]"

4128

4129 #: builtin/column.c:26

4130 msgid "lookup config vars"

@@ -4121,12 +4155,12 @@ msgid "--command must be the first argument"

4155 msgstr "--command måste vara första argument"

4156

4157 #: builtin/commit.c:37

4124 -msgid "git commit [options] [--] <pathspec>..."

4125 -msgstr "git commit [flaggor] [--] <sökväg>..."

4158 +msgid "git commit [<options>] [--] <pathspec>..."

4159 +msgstr "git commit [<flaggor>] [--] <sökväg>..."

4160

4161 #: builtin/commit.c:42

4128 -msgid "git status [options] [--] <pathspec>..."

4129 -msgstr "git status [flaggor] [--] <sökväg>..."

4162 +msgid "git status [<options>] [--] <pathspec>..."

4163 +msgstr "git status [<flaggor>] [--] <sökväg>..."

4164

4165 #: builtin/commit.c:47

4166 msgid ""

@@ -4268,26 +4302,26 @@ msgstr "kan inte läsa indexet"

4302 msgid "unable to write temporary index file"

4303 msgstr "kunde inte skriva temporär indexfil"

4304

4271 -#: builtin/commit.c:584

4305 +#: builtin/commit.c:578

4306 #, c-format

4307 msgid "commit '%s' lacks author header"

4308 msgstr "incheckningen \"%s\" saknar författarhuvud"

4309

4276 -#: builtin/commit.c:586

4310 +#: builtin/commit.c:580

4311 #, c-format

4312 msgid "commit '%s' has malformed author line"

4313 msgstr "incheckningen \"%s\" har felformaterat författarhuvud"

4314

4281 -#: builtin/commit.c:605

4315 +#: builtin/commit.c:599

4316 msgid "malformed --author parameter"

4317 msgstr "felformad \"--author\"-flagga"

4318

4285 -#: builtin/commit.c:613

4319 +#: builtin/commit.c:607

4320 #, c-format

4321 msgid "invalid date format: %s"

4322 msgstr "felaktigt datumformat: %s"

4323

4290 -#: builtin/commit.c:657

4324 +#: builtin/commit.c:651

4325 msgid ""

4326 "unable to select a comment character that is not used\n"

4327 "in the current commit message"

@@ -4295,43 +4329,43 @@ msgstr ""

4329 "kunde inte välja ett kommentarstecken som inte använts\n"

4330 "i det befintliga incheckningsmeddelandet"

4331

4298 -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084

4332 +#: builtin/commit.c:688 builtin/commit.c:721 builtin/commit.c:1078

4333 #, c-format

4334 msgid "could not lookup commit %s"

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

4336

4303 -#: builtin/commit.c:706 builtin/shortlog.c:273

4337 +#: builtin/commit.c:700 builtin/shortlog.c:273

4338 #, c-format

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

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

4341

4308 -#: builtin/commit.c:708

4342 +#: builtin/commit.c:702

4343 msgid "could not read log from standard input"

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

4345

4312 -#: builtin/commit.c:712

4346 +#: builtin/commit.c:706

4347 #, c-format

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

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

4350

4317 -#: builtin/commit.c:734

4351 +#: builtin/commit.c:728

4352 msgid "could not read MERGE_MSG"

4353 msgstr "kunde inte läsa MERGE_MSG"

4354

4321 -#: builtin/commit.c:738

4355 +#: builtin/commit.c:732

4356 msgid "could not read SQUASH_MSG"

4357 msgstr "kunde inte läsa SQUASH_MSG"

4358

4325 -#: builtin/commit.c:742

4359 +#: builtin/commit.c:736

4360 #, c-format

4361 msgid "could not read '%s'"

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

4363

4330 -#: builtin/commit.c:789

4364 +#: builtin/commit.c:783

4365 msgid "could not write commit template"

4366 msgstr "kunde inte skriva incheckningsmall"

4367

4334 -#: builtin/commit.c:807

4368 +#: builtin/commit.c:801

4369 #, c-format

4370 msgid ""

4371 "\n"

@@ -4346,7 +4380,7 @@ msgstr ""

4380 "\t%s\n"

4381 "och försöker igen.\n"

4382

4349 -#: builtin/commit.c:812

4383 +#: builtin/commit.c:806

4384 #, c-format

4385 msgid ""

4386 "\n"

@@ -4361,7 +4395,7 @@ msgstr ""

4395 "\t%s\n"

4396 "och försöker igen.\n"

4397

4364 -#: builtin/commit.c:825

4398 +#: builtin/commit.c:819

4399 #, c-format

4400 msgid ""

4401 "Please enter the commit message for your changes. Lines starting\n"

@@ -4371,7 +4405,7 @@ msgstr ""

4405 "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "

4406 "incheckningen.\n"

4407

4374 -#: builtin/commit.c:832

4408 +#: builtin/commit.c:826

4409 #, c-format

4410 msgid ""

4411 "Please enter the commit message for your changes. Lines starting\n"

@@ -4382,144 +4416,145 @@ msgstr ""

4416 "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"

4417 "Ett tomt meddelande avbryter incheckningen.\n"

4418

4385 -#: builtin/commit.c:852

4419 +#: builtin/commit.c:846

4420 #, c-format

4421 msgid "%sAuthor: %.*s <%.*s>"

4422 msgstr "%sFörfattare: %.*s <%.*s>"

4423

4390 -#: builtin/commit.c:860

4424 +#: builtin/commit.c:854

4425 #, c-format

4426 msgid "%sDate: %s"

4427 msgstr "%sDatum: %s"

4428

4395 -#: builtin/commit.c:867

4429 +#: builtin/commit.c:861

4430 #, c-format

4431 msgid "%sCommitter: %.*s <%.*s>"

4432 msgstr "%sIncheckare: %.*s <%.*s>"

4433

4400 -#: builtin/commit.c:885

4434 +#: builtin/commit.c:879

4435 msgid "Cannot read index"

4436 msgstr "Kan inte läsa indexet"

4437

4404 -#: builtin/commit.c:942

4438 +#: builtin/commit.c:936

4439 msgid "Error building trees"

4440 msgstr "Fel vid byggande av träd"

4441

4408 -#: builtin/commit.c:957 builtin/tag.c:495

4442 +#: builtin/commit.c:951 builtin/tag.c:495

4443 #, c-format

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

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

4446

4413 -#: builtin/commit.c:1059

4447 +#: builtin/commit.c:1053

4448 #, c-format

4415 -msgid "No existing author found with '%s'"

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

4449 +msgid "--author '%s' is not 'Name <email>' and matches no existing author"

4450 +msgstr ""

4451 +"--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"

4452

4418 -#: builtin/commit.c:1074 builtin/commit.c:1314

4453 +#: builtin/commit.c:1068 builtin/commit.c:1308

4454 #, c-format

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

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

4457

4423 -#: builtin/commit.c:1111

4458 +#: builtin/commit.c:1105

4459 msgid "--long and -z are incompatible"

4460 msgstr "--long och -z är inkompatibla"

4461

4427 -#: builtin/commit.c:1141

4462 +#: builtin/commit.c:1135

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

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

4465

4431 -#: builtin/commit.c:1150

4466 +#: builtin/commit.c:1144

4467 msgid "You have nothing to amend."

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

4469

4435 -#: builtin/commit.c:1153

4470 +#: builtin/commit.c:1147

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

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

4473

4439 -#: builtin/commit.c:1155

4474 +#: builtin/commit.c:1149

4475 msgid "You are in the middle of a cherry-pick -- cannot amend."

4476 msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."

4477

4443 -#: builtin/commit.c:1158

4478 +#: builtin/commit.c:1152

4479 msgid "Options --squash and --fixup cannot be used together"

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

4481

4447 -#: builtin/commit.c:1168

4482 +#: builtin/commit.c:1162

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

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

4485

4451 -#: builtin/commit.c:1170

4486 +#: builtin/commit.c:1164

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

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

4489

4455 -#: builtin/commit.c:1178

4490 +#: builtin/commit.c:1172

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

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

4493

4459 -#: builtin/commit.c:1195

4494 +#: builtin/commit.c:1189

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

4496 msgstr ""

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

4498

4464 -#: builtin/commit.c:1197

4499 +#: builtin/commit.c:1191

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

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

4502

4468 -#: builtin/commit.c:1199

4503 +#: builtin/commit.c:1193

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

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

4506

4472 -#: builtin/commit.c:1201

4507 +#: builtin/commit.c:1195

4508 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

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

4510

4476 -#: builtin/commit.c:1213 builtin/tag.c:728

4511 +#: builtin/commit.c:1207 builtin/tag.c:728

4512 #, c-format

4513 msgid "Invalid cleanup mode %s"

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

4515

4481 -#: builtin/commit.c:1218

4516 +#: builtin/commit.c:1212

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

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

4519

4485 -#: builtin/commit.c:1328 builtin/commit.c:1608

4520 +#: builtin/commit.c:1322 builtin/commit.c:1602

4521 msgid "show status concisely"

4522 msgstr "visa koncis status"

4523

4489 -#: builtin/commit.c:1330 builtin/commit.c:1610

4524 +#: builtin/commit.c:1324 builtin/commit.c:1604

4525 msgid "show branch information"

4526 msgstr "visa information om gren"

4527

4493 -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500

4528 +#: builtin/commit.c:1326 builtin/commit.c:1606 builtin/push.c:509

4529 msgid "machine-readable output"

4530 msgstr "maskinläsbar utdata"

4531

4497 -#: builtin/commit.c:1335 builtin/commit.c:1614

4532 +#: builtin/commit.c:1329 builtin/commit.c:1608

4533 msgid "show status in long format (default)"

4534 msgstr "visa status i långt format (standard)"

4535

4501 -#: builtin/commit.c:1338 builtin/commit.c:1617

4536 +#: builtin/commit.c:1332 builtin/commit.c:1611

4537 msgid "terminate entries with NUL"

4538 msgstr "terminera poster med NUL"

4539

4505 -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980

4540 +#: builtin/commit.c:1334 builtin/commit.c:1614 builtin/fast-export.c:980

4541 #: builtin/fast-export.c:983 builtin/tag.c:603

4542 msgid "mode"

4543 msgstr "läge"

4544

4510 -#: builtin/commit.c:1341 builtin/commit.c:1620

4545 +#: builtin/commit.c:1335 builtin/commit.c:1614

4546 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4547 msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"

4548

4514 -#: builtin/commit.c:1344

4549 +#: builtin/commit.c:1338

4550 msgid "show ignored files"

4551 msgstr "visa ignorerade filer"

4552

4518 -#: builtin/commit.c:1345 parse-options.h:153

4553 +#: builtin/commit.c:1339 parse-options.h:153

4554 msgid "when"

4555 msgstr "när"

4556

4522 -#: builtin/commit.c:1346

4557 +#: builtin/commit.c:1340

4558 msgid ""

4559 "ignore changes to submodules, optional when: all, dirty, untracked. "

4560 "(Default: all)"

@@ -4527,209 +4562,209 @@ msgstr ""

4562 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "

4563 "(Default: all)"

4564

4530 -#: builtin/commit.c:1348

4565 +#: builtin/commit.c:1342

4566 msgid "list untracked files in columns"

4567 msgstr "visa ospårade filer i spalter"

4568

4534 -#: builtin/commit.c:1435

4569 +#: builtin/commit.c:1429

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

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

4572

4538 -#: builtin/commit.c:1437

4573 +#: builtin/commit.c:1431

4574 msgid "could not parse newly created commit"

4575 msgstr "kunde inte tolka en precis skapad incheckning"

4576

4542 -#: builtin/commit.c:1482

4577 +#: builtin/commit.c:1476

4578 msgid "detached HEAD"

4579 msgstr "frånkopplad HEAD"

4580

4546 -#: builtin/commit.c:1485

4581 +#: builtin/commit.c:1479

4582 msgid " (root-commit)"

4583 msgstr " (rotincheckning)"

4584

4550 -#: builtin/commit.c:1578

4585 +#: builtin/commit.c:1572

4586 msgid "suppress summary after successful commit"

4587 msgstr "undertryck sammanfattning efter framgångsrik incheckning"

4588

4554 -#: builtin/commit.c:1579

4589 +#: builtin/commit.c:1573

4590 msgid "show diff in commit message template"

4591 msgstr "visa diff i mallen för incheckningsmeddelandet"

4592

4558 -#: builtin/commit.c:1581

4593 +#: builtin/commit.c:1575

4594 msgid "Commit message options"

4595 msgstr "Alternativ för incheckningsmeddelande"

4596

4562 -#: builtin/commit.c:1582 builtin/tag.c:601

4597 +#: builtin/commit.c:1576 builtin/tag.c:601

4598 msgid "read message from file"

4599 msgstr "läs meddelande från fil"

4600

4566 -#: builtin/commit.c:1583

4601 +#: builtin/commit.c:1577

4602 msgid "author"

4603 msgstr "författare"

4604

4570 -#: builtin/commit.c:1583

4605 +#: builtin/commit.c:1577

4606 msgid "override author for commit"

4607 msgstr "överstyr författare för incheckningen"

4608

4574 -#: builtin/commit.c:1584 builtin/gc.c:275

4609 +#: builtin/commit.c:1578 builtin/gc.c:275

4610 msgid "date"

4611 msgstr "datum"

4612

4578 -#: builtin/commit.c:1584

4613 +#: builtin/commit.c:1578

4614 msgid "override date for commit"

4615 msgstr "överstyr datum för incheckningen"

4616

4582 -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391

4617 +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:391

4618 #: builtin/notes.c:554 builtin/tag.c:599

4619 msgid "message"

4620 msgstr "meddelande"

4621

4587 -#: builtin/commit.c:1585

4622 +#: builtin/commit.c:1579

4623 msgid "commit message"

4624 msgstr "incheckningsmeddelande"

4625

4591 -#: builtin/commit.c:1586

4626 +#: builtin/commit.c:1580

4627 msgid "reuse and edit message from specified commit"

4628 msgstr "återanvänd och redigera meddelande från angiven incheckning"

4629

4595 -#: builtin/commit.c:1587

4630 +#: builtin/commit.c:1581

4631 msgid "reuse message from specified commit"

4632 msgstr "återanvänd meddelande från angiven incheckning"

4633

4599 -#: builtin/commit.c:1588

4634 +#: builtin/commit.c:1582

4635 msgid "use autosquash formatted message to fixup specified commit"

4636 msgstr ""

4637 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"

4638

4604 -#: builtin/commit.c:1589

4639 +#: builtin/commit.c:1583

4640 msgid "use autosquash formatted message to squash specified commit"

4641 msgstr ""

4642 "använd autosquash-formaterat meddelande för att slå ihop med angiven "

4643 "incheckning"

4644

4610 -#: builtin/commit.c:1590

4645 +#: builtin/commit.c:1584

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

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

4648

4614 -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86

4649 +#: builtin/commit.c:1585 builtin/log.c:1191 builtin/revert.c:86

4650 msgid "add Signed-off-by:"

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

4652

4618 -#: builtin/commit.c:1592

4653 +#: builtin/commit.c:1586

4654 msgid "use specified template file"

4655 msgstr "använd angiven mallfil"

4656

4622 -#: builtin/commit.c:1593

4657 +#: builtin/commit.c:1587

4658 msgid "force edit of commit"

4659 msgstr "tvinga redigering av incheckning"

4660

4626 -#: builtin/commit.c:1594

4661 +#: builtin/commit.c:1588

4662 msgid "default"

4663 msgstr "standard"

4664

4630 -#: builtin/commit.c:1594 builtin/tag.c:604

4665 +#: builtin/commit.c:1588 builtin/tag.c:604

4666 msgid "how to strip spaces and #comments from message"

4667 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

4668

4634 -#: builtin/commit.c:1595

4669 +#: builtin/commit.c:1589

4670 msgid "include status in commit message template"

4671 msgstr "inkludera status i mallen för incheckningsmeddelandet"

4672

4638 -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92

4673 +#: builtin/commit.c:1590 builtin/merge.c:225 builtin/revert.c:92

4674 #: builtin/tag.c:605

4675 msgid "key-id"

4676 msgstr "nyckel-id"

4677

4643 -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93

4678 +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/revert.c:93

4679 msgid "GPG sign commit"

4680 msgstr "GPG-signera incheckning"

4681

4647 -#: builtin/commit.c:1600

4682 +#: builtin/commit.c:1594

4683 msgid "Commit contents options"

4684 msgstr "Alternativ för incheckningens innehåll"

4685

4651 -#: builtin/commit.c:1601

4686 +#: builtin/commit.c:1595

4687 msgid "commit all changed files"

4688 msgstr "checka in alla ändrade filer"

4689

4655 -#: builtin/commit.c:1602

4690 +#: builtin/commit.c:1596

4691 msgid "add specified files to index for commit"

4692 msgstr "lägg till angivna filer till indexet för incheckning"

4693

4659 -#: builtin/commit.c:1603

4694 +#: builtin/commit.c:1597

4695 msgid "interactively add files"

4696 msgstr "lägg till filer interaktivt"

4697

4663 -#: builtin/commit.c:1604

4698 +#: builtin/commit.c:1598

4699 msgid "interactively add changes"

4700 msgstr "lägg till ändringar interaktivt"

4701

4667 -#: builtin/commit.c:1605

4702 +#: builtin/commit.c:1599

4703 msgid "commit only specified files"

4704 msgstr "checka endast in angivna filer"

4705

4671 -#: builtin/commit.c:1606

4706 +#: builtin/commit.c:1600

4707 msgid "bypass pre-commit hook"

4708 msgstr "förbigå pre-commit-krok"

4709

4675 -#: builtin/commit.c:1607

4710 +#: builtin/commit.c:1601

4711 msgid "show what would be committed"

4712 msgstr "visa vad som skulle checkas in"

4713

4679 -#: builtin/commit.c:1618

4714 +#: builtin/commit.c:1612

4715 msgid "amend previous commit"

4716 msgstr "lägg till föregående incheckning"

4717

4683 -#: builtin/commit.c:1619

4718 +#: builtin/commit.c:1613

4719 msgid "bypass post-rewrite hook"

4720 msgstr "förbigå post-rewrite-krok"

4721

4687 -#: builtin/commit.c:1624

4722 +#: builtin/commit.c:1618

4723 msgid "ok to record an empty change"

4724 msgstr "ok att registrera en tom ändring"

4725

4691 -#: builtin/commit.c:1626

4726 +#: builtin/commit.c:1620

4727 msgid "ok to record a change with an empty message"

4728 msgstr "ok att registrera en ändring med tomt meddelande"

4729

4695 -#: builtin/commit.c:1655

4730 +#: builtin/commit.c:1649

4731 msgid "could not parse HEAD commit"

4732 msgstr "kunde inte tolka HEAD:s incheckning"

4733

4699 -#: builtin/commit.c:1694 builtin/merge.c:519

4734 +#: builtin/commit.c:1688 builtin/merge.c:519

4735 #, c-format

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

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

4738

4704 -#: builtin/commit.c:1701

4739 +#: builtin/commit.c:1695

4740 #, c-format

4741 msgid "Corrupt MERGE_HEAD file (%s)"

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

4743

4709 -#: builtin/commit.c:1708

4744 +#: builtin/commit.c:1702

4745 msgid "could not read MERGE_MODE"

4746 msgstr "kunde inte läsa MERGE_MODE"

4747

4713 -#: builtin/commit.c:1727

4748 +#: builtin/commit.c:1721

4749 #, c-format

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

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

4752

4718 -#: builtin/commit.c:1738

4753 +#: builtin/commit.c:1732

4754 #, c-format

4755 msgid "Aborting commit; you did not edit the message.\n"

4756 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"

4757

4723 -#: builtin/commit.c:1743

4758 +#: builtin/commit.c:1737

4759 #, c-format

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

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

4762

4728 -#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876

4763 +#: builtin/commit.c:1752 builtin/merge.c:851 builtin/merge.c:876

4764 msgid "failed to write commit object"

4765 msgstr "kunde inte skriva incheckningsobjekt"

4766

4732 -#: builtin/commit.c:1791

4767 +#: builtin/commit.c:1785

4768 msgid ""

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

4770 "new_index file. Check that disk is not full and quota is\n"

@@ -4741,8 +4776,8 @@ msgstr ""

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

4777

4778 #: builtin/config.c:8

4744 -msgid "git config [options]"

4745 -msgstr "git config [flaggor]"

4779 +msgid "git config [<options>]"

4780 +msgstr "git config [<flaggor>]"

4781

4782 #: builtin/config.c:53

4783 msgid "Config file location"

@@ -4897,12 +4932,12 @@ msgid "print sizes in human readable format"

4932 msgstr "skriv storlekar i människoläsbart format"

4933

4934 #: builtin/describe.c:17

4900 -msgid "git describe [options] <commit-ish>*"

4901 -msgstr "git describe [flaggor] <incheckning-igt>*"

4935 +msgid "git describe [<options>] [<commit-ish>...]"

4936 +msgstr "git describe [<flaggor>] [<incheckning-igt>...]"

4937

4938 #: builtin/describe.c:18

4904 -msgid "git describe [options] --dirty"

4905 -msgstr "git describe [flaggor] --dirty"

4939 +msgid "git describe [<options>] --dirty"

4940 +msgstr "git describe [<flaggor>] --dirty"

4941

4942 #: builtin/describe.c:217

4943 #, c-format

@@ -5117,177 +5152,177 @@ msgstr "Applicera referensspecifikation på exporterade referenser"

5152 msgid "anonymize output"

5153 msgstr "anonymisera utdata"

5154

5120 -#: builtin/fetch.c:20

5155 +#: builtin/fetch.c:19

5156 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

5157 msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"

5158

5124 -#: builtin/fetch.c:21

5159 +#: builtin/fetch.c:20

5160 msgid "git fetch [<options>] <group>"

5161 msgstr "git fetch [<flaggor>] <grupp>"

5162

5128 -#: builtin/fetch.c:22

5163 +#: builtin/fetch.c:21

5164 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"

5165 msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"

5166

5132 -#: builtin/fetch.c:23

5167 +#: builtin/fetch.c:22

5168 msgid "git fetch --all [<options>]"

5169 msgstr "git fetch --all [<flaggor>]"

5170

5136 -#: builtin/fetch.c:90

5171 +#: builtin/fetch.c:89

5172 msgid "fetch from all remotes"

5173 msgstr "hämta från alla fjärrar"

5174

5140 -#: builtin/fetch.c:92

5175 +#: builtin/fetch.c:91

5176 msgid "append to .git/FETCH_HEAD instead of overwriting"

5177 msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"

5178

5144 -#: builtin/fetch.c:94

5179 +#: builtin/fetch.c:93

5180 msgid "path to upload pack on remote end"

5181 msgstr "sökväg till upload pack på fjärren"

5182

5148 -#: builtin/fetch.c:95

5183 +#: builtin/fetch.c:94

5184 msgid "force overwrite of local branch"

5185 msgstr "tvinga överskrivning av lokal gren"

5186

5152 -#: builtin/fetch.c:97

5187 +#: builtin/fetch.c:96

5188 msgid "fetch from multiple remotes"

5189 msgstr "hämta från flera fjärrar"

5190

5156 -#: builtin/fetch.c:99

5191 +#: builtin/fetch.c:98

5192 msgid "fetch all tags and associated objects"

5193 msgstr "hämta alla taggar och associerade objekt"

5194

5160 -#: builtin/fetch.c:101

5195 +#: builtin/fetch.c:100

5196 msgid "do not fetch all tags (--no-tags)"

5197 msgstr "hämta inte alla taggar (--no-tags)"

5198

5164 -#: builtin/fetch.c:103

5199 +#: builtin/fetch.c:102

5200 msgid "prune remote-tracking branches no longer on remote"

5201 msgstr "rensa fjärrspårande grenar ej längre på fjärren"

5202

5168 -#: builtin/fetch.c:104

5203 +#: builtin/fetch.c:103

5204 msgid "on-demand"

5205 msgstr "on-demand"

5206

5172 -#: builtin/fetch.c:105

5207 +#: builtin/fetch.c:104

5208 msgid "control recursive fetching of submodules"

5209 msgstr "styr rekursiv hämtning av undermoduler"

5210

5176 -#: builtin/fetch.c:109

5211 +#: builtin/fetch.c:108

5212 msgid "keep downloaded pack"

5213 msgstr "behåll hämtade paket"

5214

5180 -#: builtin/fetch.c:111

5215 +#: builtin/fetch.c:110

5216 msgid "allow updating of HEAD ref"

5217 msgstr "tillåt uppdatering av HEAD-referens"

5218

5184 -#: builtin/fetch.c:114

5219 +#: builtin/fetch.c:113

5220 msgid "deepen history of shallow clone"

5221 msgstr "fördjupa historik för grund klon"

5222

5188 -#: builtin/fetch.c:116

5223 +#: builtin/fetch.c:115

5224 msgid "convert to a complete repository"

5225 msgstr "konvertera till komplett arkiv"

5226

5192 -#: builtin/fetch.c:118 builtin/log.c:1208

5227 +#: builtin/fetch.c:117 builtin/log.c:1208

5228 msgid "dir"

5229 msgstr "kat"

5230

5196 -#: builtin/fetch.c:119

5231 +#: builtin/fetch.c:118

5232 msgid "prepend this to submodule path output"

5233 msgstr "lägg till i början av undermodulens sökvägsutdata"

5234

5200 -#: builtin/fetch.c:122

5235 +#: builtin/fetch.c:121

5236 msgid "default mode for recursion"

5237 msgstr "standardläge för rekursion"

5238

5204 -#: builtin/fetch.c:124

5239 +#: builtin/fetch.c:123

5240 msgid "accept refs that update .git/shallow"

5241 msgstr "tar emot referenser som uppdaterar .git/shallow"

5242

5208 -#: builtin/fetch.c:125

5243 +#: builtin/fetch.c:124

5244 msgid "refmap"

5245 msgstr "referenskarta"

5246

5212 -#: builtin/fetch.c:126

5247 +#: builtin/fetch.c:125

5248 msgid "specify fetch refmap"

5249 msgstr "ange referenskarta för \"fetch\""

5250

5216 -#: builtin/fetch.c:376

5251 +#: builtin/fetch.c:375

5252 msgid "Couldn't find remote ref HEAD"

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

5254

5220 -#: builtin/fetch.c:454

5255 +#: builtin/fetch.c:455

5256 #, c-format

5257 msgid "object %s not found"

5258 msgstr "objektet %s hittades inte"

5259

5225 -#: builtin/fetch.c:459

5260 +#: builtin/fetch.c:460

5261 msgid "[up to date]"

5262 msgstr "[àjour]"

5263

5229 -#: builtin/fetch.c:473

5264 +#: builtin/fetch.c:474

5265 #, c-format

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

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

5268

5234 -#: builtin/fetch.c:474 builtin/fetch.c:560

5269 +#: builtin/fetch.c:475 builtin/fetch.c:561

5270 msgid "[rejected]"

5271 msgstr "[refuserad]"

5272

5238 -#: builtin/fetch.c:485

5273 +#: builtin/fetch.c:486

5274 msgid "[tag update]"

5275 msgstr "[uppdaterad tagg]"

5276

5242 -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540

5277 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541

5278 msgid " (unable to update local ref)"

5279 msgstr " (kunde inte uppdatera lokal ref)"

5280

5246 -#: builtin/fetch.c:505

5281 +#: builtin/fetch.c:506

5282 msgid "[new tag]"

5283 msgstr "[ny tagg]"

5284

5250 -#: builtin/fetch.c:508

5285 +#: builtin/fetch.c:509

5286 msgid "[new branch]"

5287 msgstr "[ny gren]"

5288

5254 -#: builtin/fetch.c:511

5289 +#: builtin/fetch.c:512

5290 msgid "[new ref]"

5291 msgstr "[ny ref]"

5292

5258 -#: builtin/fetch.c:556

5293 +#: builtin/fetch.c:557

5294 msgid "unable to update local ref"

5295 msgstr "kunde inte uppdatera lokal ref"

5296

5262 -#: builtin/fetch.c:556

5297 +#: builtin/fetch.c:557

5298 msgid "forced update"

5299 msgstr "tvingad uppdatering"

5300

5266 -#: builtin/fetch.c:562

5301 +#: builtin/fetch.c:563

5302 msgid "(non-fast-forward)"

5303 msgstr "(ej snabbspolad)"

5304

5270 -#: builtin/fetch.c:595 builtin/fetch.c:828

5305 +#: builtin/fetch.c:596 builtin/fetch.c:829

5306 #, c-format

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

5308 msgstr "kan inte öppna %s: %s\n"

5309

5275 -#: builtin/fetch.c:604

5310 +#: builtin/fetch.c:605

5311 #, c-format

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

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

5314

5280 -#: builtin/fetch.c:622

5315 +#: builtin/fetch.c:623

5316 #, c-format

5317 msgid "reject %s because shallow roots are not allowed to be updated"

5318 msgstr "avvisa %s då grunda rötter inte kan uppdateras"

5319

5285 -#: builtin/fetch.c:710 builtin/fetch.c:793

5320 +#: builtin/fetch.c:711 builtin/fetch.c:794

5321 #, c-format

5322 msgid "From %.*s\n"

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

5324

5290 -#: builtin/fetch.c:721

5325 +#: builtin/fetch.c:722

5326 #, c-format

5327 msgid ""

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

@@ -5296,55 +5331,55 @@ msgstr ""

5331 "vissa lokala referenser kunde inte uppdateras; testa att köra\n"

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

5333

5299 -#: builtin/fetch.c:773

5334 +#: builtin/fetch.c:774

5335 #, c-format

5336 msgid " (%s will become dangling)"

5337 msgstr " (%s kommer bli dinglande)"

5338

5304 -#: builtin/fetch.c:774

5339 +#: builtin/fetch.c:775

5340 #, c-format

5341 msgid " (%s has become dangling)"

5342 msgstr " (%s har blivit dinglande)"

5343

5309 -#: builtin/fetch.c:798

5344 +#: builtin/fetch.c:799

5345 msgid "[deleted]"

5346 msgstr "[borttagen]"

5347

5313 -#: builtin/fetch.c:799 builtin/remote.c:1060

5348 +#: builtin/fetch.c:800 builtin/remote.c:1060

5349 msgid "(none)"

5350 msgstr "(ingen)"

5351

5317 -#: builtin/fetch.c:818

5352 +#: builtin/fetch.c:819

5353 #, c-format

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

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

5356

5322 -#: builtin/fetch.c:837

5357 +#: builtin/fetch.c:838

5358 #, c-format

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

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

5361

5327 -#: builtin/fetch.c:840

5362 +#: builtin/fetch.c:841

5363 #, c-format

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

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

5366

5332 -#: builtin/fetch.c:896

5367 +#: builtin/fetch.c:897

5368 #, c-format

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

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

5371

5337 -#: builtin/fetch.c:1058

5372 +#: builtin/fetch.c:1059

5373 #, c-format

5374 msgid "Fetching %s\n"

5375 msgstr "Hämtar %s\n"

5376

5342 -#: builtin/fetch.c:1060 builtin/remote.c:90

5377 +#: builtin/fetch.c:1061 builtin/remote.c:90

5378 #, c-format

5379 msgid "Could not fetch %s"

5380 msgstr "Kunde inte hämta %s"

5381

5347 -#: builtin/fetch.c:1078

5382 +#: builtin/fetch.c:1079

5383 msgid ""

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

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

@@ -5352,39 +5387,40 @@ msgstr ""

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

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

5389

5355 -#: builtin/fetch.c:1101

5390 +#: builtin/fetch.c:1102

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

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

5393

5359 -#: builtin/fetch.c:1143

5394 +#: builtin/fetch.c:1144

5395 msgid "--depth and --unshallow cannot be used together"

5396 msgstr "--depth och --unshallow kan inte användas samtidigt"

5397

5363 -#: builtin/fetch.c:1145

5398 +#: builtin/fetch.c:1146

5399 msgid "--unshallow on a complete repository does not make sense"

5400 msgstr "--unshallow kan inte användas på ett komplett arkiv"

5401

5367 -#: builtin/fetch.c:1168

5402 +#: builtin/fetch.c:1169

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

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

5405

5371 -#: builtin/fetch.c:1170

5406 +#: builtin/fetch.c:1171

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

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

5409

5375 -#: builtin/fetch.c:1181

5410 +#: builtin/fetch.c:1182

5411 #, c-format

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

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

5414

5380 -#: builtin/fetch.c:1189

5415 +#: builtin/fetch.c:1190

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

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

5418

5419 #: builtin/fmt-merge-msg.c:13

5385 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5420 +msgid ""

5421 +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"

5422 msgstr ""

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

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

5424

5425 #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698

5426 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182

@@ -5413,53 +5449,53 @@ msgstr "inled meddelande med <text>"

5449 msgid "file to read from"

5450 msgstr "fil att läsa från"

5451

5416 -#: builtin/for-each-ref.c:676

5452 +#: builtin/for-each-ref.c:675

5453 msgid "unable to parse format"

5454 msgstr "kan inte tolka formatet"

5455

5420 -#: builtin/for-each-ref.c:1064

5421 -msgid "git for-each-ref [options] [<pattern>]"

5422 -msgstr "git for-each-ref [flaggor] [<mönster>]"

5456 +#: builtin/for-each-ref.c:1063

5457 +msgid "git for-each-ref [<options>] [<pattern>]"

5458 +msgstr "git for-each-ref [<flaggor>] [<mönster>]"

5459

5424 -#: builtin/for-each-ref.c:1079

5460 +#: builtin/for-each-ref.c:1078

5461 msgid "quote placeholders suitably for shells"

5462 msgstr "citera platshållare passande för skal"

5463

5428 -#: builtin/for-each-ref.c:1081

5464 +#: builtin/for-each-ref.c:1080

5465 msgid "quote placeholders suitably for perl"

5466 msgstr "citera platshållare passande för perl"

5467

5432 -#: builtin/for-each-ref.c:1083

5468 +#: builtin/for-each-ref.c:1082

5469 msgid "quote placeholders suitably for python"

5470 msgstr "citera platshållare passande för python"

5471

5436 -#: builtin/for-each-ref.c:1085

5472 +#: builtin/for-each-ref.c:1084

5473 msgid "quote placeholders suitably for Tcl"

5474 msgstr "citera platshållare passande för Tcl"

5475

5440 -#: builtin/for-each-ref.c:1088

5476 +#: builtin/for-each-ref.c:1087

5477 msgid "show only <n> matched refs"

5478 msgstr "visa endast <n> träffade refs"

5479

5444 -#: builtin/for-each-ref.c:1089 builtin/replace.c:438

5480 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438

5481 msgid "format"

5482 msgstr "format"

5483

5448 -#: builtin/for-each-ref.c:1089

5484 +#: builtin/for-each-ref.c:1088

5485 msgid "format to use for the output"

5486 msgstr "format att använda för utdata"

5487

5452 -#: builtin/for-each-ref.c:1090

5488 +#: builtin/for-each-ref.c:1089

5489 msgid "key"

5490 msgstr "nyckel"

5491

5456 -#: builtin/for-each-ref.c:1091

5492 +#: builtin/for-each-ref.c:1090

5493 msgid "field name to sort on"

5494 msgstr "fältnamn att sortera på"

5495

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

5497 # objects in the database.

5462 -#: builtin/fsck.c:147 builtin/prune.c:136

5498 +#: builtin/fsck.c:147 builtin/prune.c:137

5499 msgid "Checking connectivity"

5500 msgstr "Kontrollerar konnektivitet"

5501

@@ -5468,8 +5504,8 @@ msgid "Checking object directories"

5504 msgstr "Kontrollerar objektkataloger"

5505

5506 #: builtin/fsck.c:603

5471 -msgid "git fsck [options] [<object>...]"

5472 -msgstr "git fsck [flaggor] [<objekt>...]"

5507 +msgid "git fsck [<options>] [<object>...]"

5508 +msgstr "git fsck [<flaggor>] [<objekt>...]"

5509

5510 #: builtin/fsck.c:609

5511 msgid "show unreachable objects"

@@ -5516,8 +5552,8 @@ msgid "Checking objects"

5552 msgstr "Kontrollerar objekt"

5553

5554 #: builtin/gc.c:24

5519 -msgid "git gc [options]"

5520 -msgstr "git gc [flaggor]"

5555 +msgid "git gc [<options>]"

5556 +msgstr "git gc [<flaggor>]"

5557

5558 #: builtin/gc.c:79

5559 #, c-format

@@ -5576,8 +5612,8 @@ msgstr ""

5612 "dem."

5613

5614 #: builtin/grep.c:23

5579 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"

5580 -msgstr "git grep [flaggor] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"

5615 +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"

5616 +msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"

5617

5618 #: builtin/grep.c:218

5619 #, c-format

@@ -5617,8 +5653,8 @@ msgid "search in both tracked and untracked files"

5653 msgstr "sök i både spårade och ospårade filer"

5654

5655 #: builtin/grep.c:644

5620 -msgid "search also in ignored files"

5621 -msgstr "sök även i ignorerade filer"

5656 +msgid "ignore files specified via '.gitignore'"

5657 +msgstr "ignorera filer angivna i \".gitignore\""

5658

5659 #: builtin/grep.c:647

5660 msgid "show non-matching lines"

@@ -5802,17 +5838,17 @@ msgstr "både --cached och träd angavs."

5838

5839 #: builtin/hash-object.c:82

5840 msgid ""

5805 -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "

5806 -"<file>..."

5841 +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "

5842 +"[--] <file>..."

5843 msgstr ""

5808 -"git hash-object [-t <typ>] [-w] [--path=<fil>|--no-filters] [--stdin] [--] "

5844 +"git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] "

5845 "<fil>..."

5846

5847 #: builtin/hash-object.c:83

5848 msgid "git hash-object --stdin-paths < <list-of-paths>"

5849 msgstr "git hash-object --stdin-paths < <sökvägslista>"

5850

5815 -#: builtin/hash-object.c:94 builtin/tag.c:610

5851 +#: builtin/hash-object.c:94 builtin/tag.c:612

5852 msgid "type"

5853 msgstr "typ"

5854

@@ -5863,8 +5899,8 @@ msgid "show info page"

5899 msgstr "visa info-sida"

5900

5901 #: builtin/help.c:52

5866 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]"

5867 -msgstr "git help [--all] [--guides] [--man|--web|--info] [kommando]"

5902 +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"

5903 +msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]"

5904

5905 #: builtin/help.c:64

5906 #, c-format

@@ -6072,8 +6108,8 @@ msgstr "allvarlig inflate-inkonsekvens"

6108 msgid "SHA1 COLLISION FOUND WITH %s !"

6109 msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"

6110

6075 -#: builtin/index-pack.c:689 builtin/pack-objects.c:164

6076 -#: builtin/pack-objects.c:256

6111 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162

6112 +#: builtin/pack-objects.c:254

6113 #, c-format

6114 msgid "unable to read %s"

6115 msgstr "kunde inte läsa %s"

@@ -6160,97 +6196,97 @@ msgid_plural "pack has %d unresolved deltas"

6196 msgstr[0] "paketet har %d oanalyserat delta"

6197 msgstr[1] "paketet har %d oanalyserade delta"

6198

6163 -#: builtin/index-pack.c:1220

6199 +#: builtin/index-pack.c:1219

6200 #, c-format

6201 msgid "unable to deflate appended object (%d)"

6202 msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"

6203

6168 -#: builtin/index-pack.c:1299

6204 +#: builtin/index-pack.c:1298

6205 #, c-format

6206 msgid "local object %s is corrupt"

6207 msgstr "lokalt objekt %s är trasigt"

6208

6173 -#: builtin/index-pack.c:1323

6209 +#: builtin/index-pack.c:1322

6210 msgid "error while closing pack file"

6211 msgstr "fel vid stängning av paketfil"

6212

6177 -#: builtin/index-pack.c:1336

6213 +#: builtin/index-pack.c:1335

6214 #, c-format

6215 msgid "cannot write keep file '%s'"

6216 msgstr "kan inte ta skriva \"keep\"-fil \"%s\""

6217

6182 -#: builtin/index-pack.c:1344

6218 +#: builtin/index-pack.c:1343

6219 #, c-format

6220 msgid "cannot close written keep file '%s'"

6221 msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""

6222

6187 -#: builtin/index-pack.c:1357

6223 +#: builtin/index-pack.c:1356

6224 msgid "cannot store pack file"

6225 msgstr "kan inte spara paketfil"

6226

6191 -#: builtin/index-pack.c:1368

6227 +#: builtin/index-pack.c:1367

6228 msgid "cannot store index file"

6229 msgstr "kan inte spara indexfil"

6230

6195 -#: builtin/index-pack.c:1401

6231 +#: builtin/index-pack.c:1400

6232 #, c-format

6233 msgid "bad pack.indexversion=%<PRIu32>"

6234 msgstr "felaktig pack.indexversion=%<PRIu32>"

6235

6200 -#: builtin/index-pack.c:1407

6236 +#: builtin/index-pack.c:1406

6237 #, c-format

6238 msgid "invalid number of threads specified (%d)"

6239 msgstr "felaktigt antal trådar angivet (%d)"

6240

6205 -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590

6241 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589

6242 #, c-format

6243 msgid "no threads support, ignoring %s"

6244 msgstr "trådstöd saknas, ignorerar %s"

6245

6210 -#: builtin/index-pack.c:1469

6246 +#: builtin/index-pack.c:1468

6247 #, c-format

6248 msgid "Cannot open existing pack file '%s'"

6249 msgstr "Kan inte öppna befintlig paketfil \"%s\""

6250

6215 -#: builtin/index-pack.c:1471

6251 +#: builtin/index-pack.c:1470

6252 #, c-format

6253 msgid "Cannot open existing pack idx file for '%s'"

6254 msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""

6255

6220 -#: builtin/index-pack.c:1518

6256 +#: builtin/index-pack.c:1517

6257 #, c-format

6258 msgid "non delta: %d object"

6259 msgid_plural "non delta: %d objects"

6260 msgstr[0] "icke-delta: %d objekt"

6261 msgstr[1] "icke-delta: %d objekt"

6262

6227 -#: builtin/index-pack.c:1525

6263 +#: builtin/index-pack.c:1524

6264 #, c-format

6265 msgid "chain length = %d: %lu object"

6266 msgid_plural "chain length = %d: %lu objects"

6267 msgstr[0] "kedjelängd = %d: %lu objekt"

6268 msgstr[1] "kedjelängd = %d: %lu objekt"

6269

6234 -#: builtin/index-pack.c:1554

6270 +#: builtin/index-pack.c:1553

6271 msgid "Cannot come back to cwd"

6272 msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"

6273

6238 -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605

6239 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621

6274 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604

6275 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620

6276 #, c-format

6277 msgid "bad %s"

6278 msgstr "felaktig %s"

6279

6244 -#: builtin/index-pack.c:1635

6280 +#: builtin/index-pack.c:1634

6281 msgid "--fix-thin cannot be used without --stdin"

6282 msgstr "--fix-thin kan inte användas med --stdin"

6283

6248 -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648

6284 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647

6285 #, c-format

6286 msgid "packfile name '%s' does not end with '.pack'"

6287 msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""

6288

6253 -#: builtin/index-pack.c:1656

6289 +#: builtin/index-pack.c:1655

6290 msgid "--verify with no packfile name given"

6291 msgstr "--verify angavs utan paketfilnamn"

6292

@@ -6362,10 +6398,10 @@ msgstr " delat"

6398 #: builtin/init-db.c:475

6399 msgid ""

6400 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

6365 -"shared[=<permissions>]] [directory]"

6401 +"shared[=<permissions>]] [<directory>]"

6402 msgstr ""

6403 "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"

6368 -"shared[=<behörigheter>]] [katalog]"

6404 +"shared[=<behörigheter>]] [<katalog>]"

6405

6406 #: builtin/init-db.c:498

6407 msgid "permissions"

@@ -6428,8 +6464,8 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]"

6464 msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"

6465

6466 #: builtin/log.c:42

6431 -msgid "git show [options] <object>..."

6432 -msgstr "git show [flaggor] <objekt>..."

6467 +msgid "git show [<options>] <object>..."

6468 +msgstr "git show [<flaggor>] <objekt>..."

6469

6470 #: builtin/log.c:81

6471 #, c-format

@@ -6507,8 +6543,8 @@ msgid "insane in-reply-to: %s"

6543 msgstr "tokigt in-reply-to: %s"

6544

6545 #: builtin/log.c:1026

6510 -msgid "git format-patch [options] [<since> | <revision range>]"

6511 -msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]"

6546 +msgid "git format-patch [<options>] [<since> | <revision-range>]"

6547 +msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"

6548

6549 #: builtin/log.c:1071

6550 msgid "Two output directories?"

@@ -6704,95 +6740,95 @@ msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"

6740 msgid "Unknown commit %s"

6741 msgstr "Okänd incheckning %s"

6742

6707 -#: builtin/ls-files.c:401

6708 -msgid "git ls-files [options] [<file>...]"

6709 -msgstr "git ls-files [flaggor] [<fil>...]"

6743 +#: builtin/ls-files.c:358

6744 +msgid "git ls-files [<options>] [<file>...]"

6745 +msgstr "git ls-files [<flaggor>] [<fil>...]"

6746

6711 -#: builtin/ls-files.c:458

6747 +#: builtin/ls-files.c:415

6748 msgid "identify the file status with tags"

6749 msgstr "identifiera filstatus med taggar"

6750

6715 -#: builtin/ls-files.c:460

6751 +#: builtin/ls-files.c:417

6752 msgid "use lowercase letters for 'assume unchanged' files"

6753 msgstr "använd små bokstäver för \"anta oförändrade\"-filer"

6754

6719 -#: builtin/ls-files.c:462

6755 +#: builtin/ls-files.c:419

6756 msgid "show cached files in the output (default)"

6757 msgstr "visa cachade filer i utdata (standard)"

6758

6723 -#: builtin/ls-files.c:464

6759 +#: builtin/ls-files.c:421

6760 msgid "show deleted files in the output"

6761 msgstr "visa borttagna filer i utdata"

6762

6727 -#: builtin/ls-files.c:466

6763 +#: builtin/ls-files.c:423

6764 msgid "show modified files in the output"

6765 msgstr "visa modifierade filer i utdata"

6766

6731 -#: builtin/ls-files.c:468

6767 +#: builtin/ls-files.c:425

6768 msgid "show other files in the output"

6769 msgstr "visa andra filer i utdata"

6770

6735 -#: builtin/ls-files.c:470

6771 +#: builtin/ls-files.c:427

6772 msgid "show ignored files in the output"

6773 msgstr "visa ignorerade filer i utdata"

6774

6739 -#: builtin/ls-files.c:473

6775 +#: builtin/ls-files.c:430

6776 msgid "show staged contents' object name in the output"

6777 msgstr "visa köat innehålls objektnamn i utdata"

6778

6743 -#: builtin/ls-files.c:475

6779 +#: builtin/ls-files.c:432

6780 msgid "show files on the filesystem that need to be removed"

6781 msgstr "visa filer i filsystemet som behöver tas bort"

6782

6747 -#: builtin/ls-files.c:477

6783 +#: builtin/ls-files.c:434

6784 msgid "show 'other' directories' names only"

6785 msgstr "visa endast namn för \"andra\" kataloger"

6786

6751 -#: builtin/ls-files.c:480

6787 +#: builtin/ls-files.c:437

6788 msgid "don't show empty directories"

6789 msgstr "visa inte tomma kataloger"

6790

6755 -#: builtin/ls-files.c:483

6791 +#: builtin/ls-files.c:440

6792 msgid "show unmerged files in the output"

6793 msgstr "visa ej sammanslagna filer i utdata"

6794

6759 -#: builtin/ls-files.c:485

6795 +#: builtin/ls-files.c:442

6796 msgid "show resolve-undo information"

6797 msgstr "visa \"resolve-undo\"-information"

6798

6763 -#: builtin/ls-files.c:487

6799 +#: builtin/ls-files.c:444

6800 msgid "skip files matching pattern"

6801 msgstr "hoppa över filer som motsvarar mönster"

6802

6767 -#: builtin/ls-files.c:490

6803 +#: builtin/ls-files.c:447

6804 msgid "exclude patterns are read from <file>"

6805 msgstr "exkludera mönster som läses från <fil>"

6806

6771 -#: builtin/ls-files.c:493

6807 +#: builtin/ls-files.c:450

6808 msgid "read additional per-directory exclude patterns in <file>"

6809 msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"

6810

6775 -#: builtin/ls-files.c:495

6811 +#: builtin/ls-files.c:452

6812 msgid "add the standard git exclusions"

6813 msgstr "lägg till git:s standardexkluderingar"

6814

6779 -#: builtin/ls-files.c:498

6815 +#: builtin/ls-files.c:455

6816 msgid "make the output relative to the project top directory"

6817 msgstr "gör utdata relativ till projektets toppkatalog"

6818

6783 -#: builtin/ls-files.c:501

6819 +#: builtin/ls-files.c:458

6820 msgid "if any <file> is not in the index, treat this as an error"

6821 msgstr "om en <fil> inte är indexet, betrakta det som ett fel"

6822

6787 -#: builtin/ls-files.c:502

6823 +#: builtin/ls-files.c:459

6824 msgid "tree-ish"

6825 msgstr "träd-igt"

6826

6791 -#: builtin/ls-files.c:503

6827 +#: builtin/ls-files.c:460

6828 msgid "pretend that paths removed since <tree-ish> are still present"

6829 msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"

6830

6795 -#: builtin/ls-files.c:505

6831 +#: builtin/ls-files.c:462

6832 msgid "show debugging data"

6833 msgstr "visa felsökningsutdata"

6834

@@ -6833,12 +6869,12 @@ msgid "list entire tree; not just current directory (implies --full-name)"

6869 msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)"

6870

6871 #: builtin/merge.c:45

6836 -msgid "git merge [options] [<commit>...]"

6837 -msgstr "git merge [flaggor] [<incheckning>...]"

6872 +msgid "git merge [<options>] [<commit>...]"

6873 +msgstr "git merge [<flaggor>] [<incheckning>...]"

6874

6875 #: builtin/merge.c:46

6840 -msgid "git merge [options] <msg> HEAD <commit>"

6841 -msgstr "git merge [flaggor] <meddelande> HEAD <incheckning>"

6876 +msgid "git merge [<options>] <msg> HEAD <commit>"

6877 +msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>"

6878

6879 #: builtin/merge.c:47

6880 msgid "git merge --abort"

@@ -7186,12 +7222,12 @@ msgstr ""

7222 "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n"

7223

7224 #: builtin/merge-base.c:29

7189 -msgid "git merge-base [-a|--all] <commit> <commit>..."

7190 -msgstr "git merge-base [-a|--all] <incheckning> <incheckning>..."

7225 +msgid "git merge-base [-a | --all] <commit> <commit>..."

7226 +msgstr "git merge-base [-a | --all] <incheckning> <incheckning>..."

7227

7228 #: builtin/merge-base.c:30

7193 -msgid "git merge-base [-a|--all] --octopus <commit>..."

7194 -msgstr "git merge-base [-a|--all] --octopus <incheckning>..."

7229 +msgid "git merge-base [-a | --all] --octopus <commit>..."

7230 +msgstr "git merge-base [-a | --all] --octopus <incheckning>..."

7231

7232 #: builtin/merge-base.c:31

7233 msgid "git merge-base --independent <commit>..."

@@ -7227,10 +7263,11 @@ msgstr "se var <incheckning> grenades av från referensloggen från <ref>"

7263

7264 #: builtin/merge-file.c:8

7265 msgid ""

7230 -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "

7231 -"file2"

7266 +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "

7267 +"<orig-file> <file2>"

7268 msgstr ""

7233 -"git merge-file [alternativ] [-L namn1 [-L orig [-L namn2]]] fil1 origfil fil2"

7269 +"git merge-file [<alternativ>] [-L <namn1> [-L <orig> [-L <namn2>]]] <fil1> "

7270 +"<origfil> <fil2>"

7271

7272 #: builtin/merge-file.c:33

7273 msgid "send results to standard output"

@@ -7261,7 +7298,7 @@ msgid "do not warn about conflicts"

7298 msgstr "varna inte om konflikter"

7299

7300 #: builtin/merge-file.c:45

7264 -msgid "set labels for file1/orig_file/file2"

7301 +msgid "set labels for file1/orig-file/file2"

7302 msgstr "sätt etiketter för fil1/origfil/fil2"

7303

7304 #: builtin/mktree.c:64

@@ -7281,8 +7318,8 @@ msgid "allow creation of more than one tree"

7318 msgstr "tillåt skapa mer än ett träd"

7319

7320 #: builtin/mv.c:15

7284 -msgid "git mv [options] <source>... <destination>"

7285 -msgstr "git mv [flaggor] <källa>... <mål>"

7321 +msgid "git mv [<options>] <source>... <destination>"

7322 +msgstr "git mv [<flaggor>] <källa>... <mål>"

7323

7324 #: builtin/mv.c:69

7325 #, c-format

@@ -7368,22 +7405,22 @@ msgstr "%s, källa=%s, mål=%s"

7405 msgid "Renaming %s to %s\n"

7406 msgstr "Byter namn på %s till %s\n"

7407

7371 -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355

7408 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359

7409 #, c-format

7410 msgid "renaming '%s' failed"

7411 msgstr "misslyckades byta namn på \"%s\""

7412

7413 #: builtin/name-rev.c:255

7377 -msgid "git name-rev [options] <commit>..."

7378 -msgstr "git name-rev [flaggor] <incheckning>..."

7414 +msgid "git name-rev [<options>] <commit>..."

7415 +msgstr "git name-rev [<flaggor>] <incheckning>..."

7416

7417 #: builtin/name-rev.c:256

7381 -msgid "git name-rev [options] --all"

7382 -msgstr "git name-rev [flaggor] --all"

7418 +msgid "git name-rev [<options>] --all"

7419 +msgstr "git name-rev [<flaggor>] --all"

7420

7421 #: builtin/name-rev.c:257

7385 -msgid "git name-rev [options] --stdin"

7386 -msgstr "git name-rev [flaggor] --stdin"

7422 +msgid "git name-rev [<options>] --stdin"

7423 +msgstr "git name-rev [<flaggor>] --stdin"

7424

7425 #: builtin/name-rev.c:309

7426 msgid "print only names (no SHA-1)"

@@ -7414,43 +7451,43 @@ msgid "dereference tags in the input (internal use)"

7451 msgstr "avreferera taggar i indata (används internt)"

7452

7453 #: builtin/notes.c:24

7417 -msgid "git notes [--ref <notes_ref>] [list [<object>]]"

7454 +msgid "git notes [--ref <notes-ref>] [list [<object>]]"

7455 msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]"

7456

7457 #: builtin/notes.c:25

7458 msgid ""

7422 -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "

7459 +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "

7460 "| (-c | -C) <object>] [<object>]"

7461 msgstr ""

7462 "git notes [--ref <anteckningsref>] add [-f] [--allow-empty] [-m <medd> | -F "

7463 "<fil> | (-c | -C) <objekt>] [<objekt>]"

7464

7465 #: builtin/notes.c:26

7429 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"

7466 +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"

7467 msgstr ""

7468 "git notes [--ref <anteckningsref>] copy [-f] <från-objekt> <till-objekt>"

7469

7470 #: builtin/notes.c:27

7471 msgid ""

7435 -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | "

7472 +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "

7473 "(-c | -C) <object>] [<object>]"

7474 msgstr ""

7475 "git notes [--ref <anteckningsref>] append [--allow-empty] [-m <medd> | -F "

7476 "<fil> | (-c | -C) <objekt>] [<objekt>]"

7477

7478 #: builtin/notes.c:28

7442 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]"

7479 +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"

7480 msgstr "git notes [--ref <anteckningsref>] edit [--allow-empty] [<objekt>]"

7481

7482 #: builtin/notes.c:29

7446 -msgid "git notes [--ref <notes_ref>] show [<object>]"

7483 +msgid "git notes [--ref <notes-ref>] show [<object>]"

7484 msgstr "git notes [--ref <anteckningsref>] show [<objekt>]"

7485

7486 #: builtin/notes.c:30

7487 msgid ""

7451 -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"

7488 +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"

7489 msgstr ""

7453 -"git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi> ] "

7490 +"git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi>] "

7491 "<anteckningsref>"

7492

7493 #: builtin/notes.c:31

@@ -7462,15 +7499,15 @@ msgid "git notes merge --abort [-v | -q]"

7499 msgstr "git notes merge --abort [-v | -q]"

7500

7501 #: builtin/notes.c:33

7465 -msgid "git notes [--ref <notes_ref>] remove [<object>...]"

7502 +msgid "git notes [--ref <notes-ref>] remove [<object>...]"

7503 msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]"

7504

7505 #: builtin/notes.c:34

7469 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]"

7506 +msgid "git notes [--ref <notes-ref>] prune [-n | -v]"

7507 msgstr "git notes [--ref <anteckningsref>] prune [-n | -v]"

7508

7509 #: builtin/notes.c:35

7473 -msgid "git notes [--ref <notes_ref>] get-ref"

7510 +msgid "git notes [--ref <notes-ref>] get-ref"

7511 msgstr "git notes [--ref <anteckningsref>] get-ref"

7512

7513 #: builtin/notes.c:40

@@ -7502,7 +7539,7 @@ msgid "git notes show [<object>]"

7539 msgstr "git notes show [<objekt>]"

7540

7541 #: builtin/notes.c:71

7505 -msgid "git notes merge [<options>] <notes_ref>"

7542 +msgid "git notes merge [<options>] <notes-ref>"

7543 msgstr "git notes merge [<flaggor>] <anteckningsref>"

7544

7545 #: builtin/notes.c:72

@@ -7741,7 +7778,7 @@ msgid "notes-ref"

7778 msgstr "anteckningar-ref"

7779

7780 #: builtin/notes.c:954

7744 -msgid "use notes from <notes_ref>"

7781 +msgid "use notes from <notes-ref>"

7782 msgstr "använd anteckningar från <anteckningsref>"

7783

7784 #: builtin/notes.c:989 builtin/remote.c:1621

@@ -7757,186 +7794,186 @@ msgstr "git pack-objects --stdout [flaggor...] [< reflista | < objektlista]"

7794 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"

7795 msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]"

7796

7760 -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180

7797 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178

7798 #, c-format

7799 msgid "deflate error (%d)"

7800 msgstr "fel i deflate (%d)"

7801

7765 -#: builtin/pack-objects.c:773

7802 +#: builtin/pack-objects.c:771

7803 msgid "Writing objects"

7804 msgstr "Skriver objekt"

7805

7769 -#: builtin/pack-objects.c:1015

7806 +#: builtin/pack-objects.c:1013

7807 msgid "disabling bitmap writing, as some objects are not being packed"

7808 msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"

7809

7773 -#: builtin/pack-objects.c:2175

7810 +#: builtin/pack-objects.c:2173

7811 msgid "Compressing objects"

7812 msgstr "Komprimerar objekt"

7813

7777 -#: builtin/pack-objects.c:2572

7814 +#: builtin/pack-objects.c:2570

7815 #, c-format

7816 msgid "unsupported index version %s"

7817 msgstr "indexversionen %s stöds ej"

7818

7782 -#: builtin/pack-objects.c:2576

7819 +#: builtin/pack-objects.c:2574

7820 #, c-format

7821 msgid "bad index version '%s'"

7822 msgstr "felaktig indexversion \"%s\""

7823

7787 -#: builtin/pack-objects.c:2599

7824 +#: builtin/pack-objects.c:2597

7825 #, c-format

7826 msgid "option %s does not accept negative form"

7827 msgstr "flaggan %s godtar inte negativ form"

7828

7792 -#: builtin/pack-objects.c:2603

7829 +#: builtin/pack-objects.c:2601

7830 #, c-format

7831 msgid "unable to parse value '%s' for option %s"

7832 msgstr "kunde inte tolka värdet \"%s\" för flaggan %s"

7833

7797 -#: builtin/pack-objects.c:2623

7834 +#: builtin/pack-objects.c:2621

7835 msgid "do not show progress meter"

7836 msgstr "visa inte förloppsindikator"

7837

7801 -#: builtin/pack-objects.c:2625

7838 +#: builtin/pack-objects.c:2623

7839 msgid "show progress meter"

7840 msgstr "visa förloppsindikator"

7841

7805 -#: builtin/pack-objects.c:2627

7842 +#: builtin/pack-objects.c:2625

7843 msgid "show progress meter during object writing phase"

7844 msgstr "visa förloppsindikator under objektskrivningsfasen"

7845

7809 -#: builtin/pack-objects.c:2630

7846 +#: builtin/pack-objects.c:2628

7847 msgid "similar to --all-progress when progress meter is shown"

7848 msgstr "som --all-progress när förloppsmätaren visas"

7849

7813 -#: builtin/pack-objects.c:2631

7850 +#: builtin/pack-objects.c:2629

7851 msgid "version[,offset]"

7852 msgstr "version[,offset]"

7853

7817 -#: builtin/pack-objects.c:2632

7854 +#: builtin/pack-objects.c:2630

7855 msgid "write the pack index file in the specified idx format version"

7856 msgstr "skriv paketindexfilen i angiven indexformatversion"

7857

7821 -#: builtin/pack-objects.c:2635

7858 +#: builtin/pack-objects.c:2633

7859 msgid "maximum size of each output pack file"

7860 msgstr "maximal storlek på varje utdatapaketfil"

7861

7825 -#: builtin/pack-objects.c:2637

7862 +#: builtin/pack-objects.c:2635

7863 msgid "ignore borrowed objects from alternate object store"

7864 msgstr "ignorera lånade objekt från alternativa objektlager"

7865

7829 -#: builtin/pack-objects.c:2639

7866 +#: builtin/pack-objects.c:2637

7867 msgid "ignore packed objects"

7868 msgstr "ignorera packade objekt"

7869

7833 -#: builtin/pack-objects.c:2641

7870 +#: builtin/pack-objects.c:2639

7871 msgid "limit pack window by objects"

7872 msgstr "begränsa paketfönster efter objekt"

7873

7837 -#: builtin/pack-objects.c:2643

7874 +#: builtin/pack-objects.c:2641

7875 msgid "limit pack window by memory in addition to object limit"

7876 msgstr "begränsa paketfönster efter minne förutom objektgräns"

7877

7841 -#: builtin/pack-objects.c:2645

7878 +#: builtin/pack-objects.c:2643

7879 msgid "maximum length of delta chain allowed in the resulting pack"

7880 msgstr "maximal längd på deltakedja tillåten i slutligt paket"

7881

7845 -#: builtin/pack-objects.c:2647

7882 +#: builtin/pack-objects.c:2645

7883 msgid "reuse existing deltas"

7884 msgstr "återanvänd befintliga delta"

7885

7849 -#: builtin/pack-objects.c:2649

7886 +#: builtin/pack-objects.c:2647

7887 msgid "reuse existing objects"

7888 msgstr "återanvänd befintliga objekt"

7889

7853 -#: builtin/pack-objects.c:2651

7890 +#: builtin/pack-objects.c:2649

7891 msgid "use OFS_DELTA objects"

7892 msgstr "använd OFS_DELTA-objekt"

7893

7857 -#: builtin/pack-objects.c:2653

7894 +#: builtin/pack-objects.c:2651

7895 msgid "use threads when searching for best delta matches"

7896 msgstr "använd trådar vid sökning efter bästa deltaträffar"

7897

7861 -#: builtin/pack-objects.c:2655

7898 +#: builtin/pack-objects.c:2653

7899 msgid "do not create an empty pack output"

7900 msgstr "försök inte skapa tom paketutdata"

7901

7865 -#: builtin/pack-objects.c:2657

7902 +#: builtin/pack-objects.c:2655

7903 msgid "read revision arguments from standard input"

7904 msgstr "läs revisionsargument från standard in"

7905

7869 -#: builtin/pack-objects.c:2659

7906 +#: builtin/pack-objects.c:2657

7907 msgid "limit the objects to those that are not yet packed"

7908 msgstr "begränsa objekt till de som ännu inte packats"

7909

7873 -#: builtin/pack-objects.c:2662

7910 +#: builtin/pack-objects.c:2660

7911 msgid "include objects reachable from any reference"

7912 msgstr "inkludera objekt som kan nås från någon referens"

7913

7877 -#: builtin/pack-objects.c:2665

7914 +#: builtin/pack-objects.c:2663

7915 msgid "include objects referred by reflog entries"

7916 msgstr "inkludera objekt som refereras från referensloggposter"

7917

7881 -#: builtin/pack-objects.c:2668

7918 +#: builtin/pack-objects.c:2666

7919 msgid "include objects referred to by the index"

7920 msgstr "inkludera objekt som refereras från indexet"

7921

7885 -#: builtin/pack-objects.c:2671

7922 +#: builtin/pack-objects.c:2669

7923 msgid "output pack to stdout"

7924 msgstr "skriv paket på standard ut"

7925

7889 -#: builtin/pack-objects.c:2673

7926 +#: builtin/pack-objects.c:2671

7927 msgid "include tag objects that refer to objects to be packed"

7928 msgstr "inkludera taggobjekt som refererar objekt som skall packas"

7929

7893 -#: builtin/pack-objects.c:2675

7930 +#: builtin/pack-objects.c:2673

7931 msgid "keep unreachable objects"

7932 msgstr "behåll onåbara objekt"

7933

7897 -#: builtin/pack-objects.c:2676 parse-options.h:140

7934 +#: builtin/pack-objects.c:2674 parse-options.h:140

7935 msgid "time"

7936 msgstr "tid"

7937

7901 -#: builtin/pack-objects.c:2677

7938 +#: builtin/pack-objects.c:2675

7939 msgid "unpack unreachable objects newer than <time>"

7940 msgstr "packa upp onåbara objekt nyare än <tid>"

7941

7905 -#: builtin/pack-objects.c:2680

7942 +#: builtin/pack-objects.c:2678

7943 msgid "create thin packs"

7944 msgstr "skapa tunna paket"

7945

7909 -#: builtin/pack-objects.c:2682

7946 +#: builtin/pack-objects.c:2680

7947 msgid "create packs suitable for shallow fetches"

7948 msgstr "skapa packfiler lämpade för grunda hämtningar"

7949

7913 -#: builtin/pack-objects.c:2684

7950 +#: builtin/pack-objects.c:2682

7951 msgid "ignore packs that have companion .keep file"

7952 msgstr "ignorera paket som har tillhörande .keep-fil"

7953

7917 -#: builtin/pack-objects.c:2686

7954 +#: builtin/pack-objects.c:2684

7955 msgid "pack compression level"

7956 msgstr "komprimeringsgrad för paket"

7957

7921 -#: builtin/pack-objects.c:2688

7958 +#: builtin/pack-objects.c:2686

7959 msgid "do not hide commits by grafts"

7960 msgstr "göm inte incheckningar med ympningar (\"grafts\")"

7961

7925 -#: builtin/pack-objects.c:2690

7962 +#: builtin/pack-objects.c:2688

7963 msgid "use a bitmap index if available to speed up counting objects"

7964 msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"

7965

7929 -#: builtin/pack-objects.c:2692

7966 +#: builtin/pack-objects.c:2690

7967 msgid "write a bitmap index together with the pack index"

7968 msgstr "använd bitkartindex tillsammans med packindexet"

7969

7933 -#: builtin/pack-objects.c:2783

7970 +#: builtin/pack-objects.c:2781

7971 msgid "Counting objects"

7972 msgstr "Räknar objekt"

7973

7974 #: builtin/pack-refs.c:6

7938 -msgid "git pack-refs [options]"

7939 -msgstr "git pack-refs [flaggor]"

7975 +msgid "git pack-refs [<options>]"

7976 +msgstr "git pack-refs [<flaggor>]"

7977

7978 #: builtin/pack-refs.c:14

7979 msgid "pack everything"

@@ -7947,8 +7984,8 @@ msgid "prune loose refs (default)"

7984 msgstr "ta bort lösa referenser (standard)"

7985

7986 #: builtin/prune-packed.c:7

7950 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"

7951 -msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"

7987 +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"

7988 +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"

7989

7990 #: builtin/prune-packed.c:40

7991 msgid "Removing duplicate objects"

@@ -8224,75 +8261,79 @@ msgstr "--mirror kan inte kombineras med referensspecifikationer"

8261 msgid "--all and --mirror are incompatible"

8262 msgstr "--all och --mirror är inkompatibla"

8263

8227 -#: builtin/push.c:493

8264 +#: builtin/push.c:502

8265 msgid "repository"

8266 msgstr "arkiv"

8267

8231 -#: builtin/push.c:494

8268 +#: builtin/push.c:503

8269 msgid "push all refs"

8270 msgstr "sänd alla referenser"

8271

8235 -#: builtin/push.c:495

8272 +#: builtin/push.c:504

8273 msgid "mirror all refs"

8274 msgstr "spegla alla referenser"

8275

8239 -#: builtin/push.c:497

8276 +#: builtin/push.c:506

8277 msgid "delete refs"

8278 msgstr "ta bort referenser"

8279

8243 -#: builtin/push.c:498

8280 +#: builtin/push.c:507

8281 msgid "push tags (can't be used with --all or --mirror)"

8282 msgstr "sänd taggar (kan inte användas med --all eller --mirror)"

8283

8247 -#: builtin/push.c:501

8284 +#: builtin/push.c:510

8285 msgid "force updates"

8286 msgstr "tvinga uppdateringar"

8287

8251 -#: builtin/push.c:503

8288 +#: builtin/push.c:512

8289 msgid "refname>:<expect"

8290 msgstr "refnamn>:<förvänta"

8291

8255 -#: builtin/push.c:504

8292 +#: builtin/push.c:513

8293 msgid "require old value of ref to be at this value"

8294 msgstr "kräv att ref:s tidigare värde är detta"

8295

8259 -#: builtin/push.c:507

8296 +#: builtin/push.c:516

8297 msgid "control recursive pushing of submodules"

8298 msgstr "styr rekursiv insändning av undermoduler"

8299

8263 -#: builtin/push.c:509

8300 +#: builtin/push.c:518

8301 msgid "use thin pack"

8302 msgstr "använd tunna paket"

8303

8267 -#: builtin/push.c:510 builtin/push.c:511

8304 +#: builtin/push.c:519 builtin/push.c:520

8305 msgid "receive pack program"

8306 msgstr "program för att ta emot paket"

8307

8271 -#: builtin/push.c:512

8308 +#: builtin/push.c:521

8309 msgid "set upstream for git pull/status"

8310 msgstr "ställ in uppström för git pull/status"

8311

8275 -#: builtin/push.c:515

8312 +#: builtin/push.c:524

8313 msgid "prune locally removed refs"

8314 msgstr "ta bort lokalt borttagna referenser"

8315

8279 -#: builtin/push.c:517

8316 +#: builtin/push.c:526

8317 msgid "bypass pre-push hook"

8318 msgstr "förbigå pre-push-krok"

8319

8283 -#: builtin/push.c:518

8320 +#: builtin/push.c:527

8321 msgid "push missing but relevant tags"

8322 msgstr "sänd in saknade men relevanta taggar"

8323

8287 -#: builtin/push.c:520

8324 +#: builtin/push.c:529

8325 msgid "GPG sign the push"

8326 msgstr "GPG-signera insändningen"

8327

8291 -#: builtin/push.c:529

8328 +#: builtin/push.c:530

8329 +msgid "request atomic transaction on remote side"

8330 +msgstr "begär atomiska transaktioner på fjärrsidan"

8331 +

8332 +#: builtin/push.c:539

8333 msgid "--delete is incompatible with --all, --mirror and --tags"

8334 msgstr "--delete är inkompatibel med --all, --mirror och --tags"

8335

8295 -#: builtin/push.c:531

8336 +#: builtin/push.c:541

8337 msgid "--delete doesn't make sense without any refs"

8338 msgstr "--delete kan inte användas utan referenser"

8339

@@ -8370,12 +8411,12 @@ msgstr "hoppa över att applicera filter för gles utcheckning"

8411 msgid "debug unpack-trees"

8412 msgstr "felsök unpack-trees"

8413

8373 -#: builtin/reflog.c:499

8414 +#: builtin/reflog.c:429

8415 #, c-format

8416 msgid "%s' for '%s' is not a valid timestamp"

8417 msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"

8418

8378 -#: builtin/reflog.c:615 builtin/reflog.c:620

8419 +#: builtin/reflog.c:546 builtin/reflog.c:551

8420 #, c-format

8421 msgid "'%s' is not a valid timestamp"

8422 msgstr "\"%s\" är inte en giltig tidsstämpel"

@@ -8386,10 +8427,10 @@ msgstr "git remote [-v | --verbose]"

8427

8428 #: builtin/remote.c:13

8429 msgid ""

8389 -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"

8430 +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"

8431 "mirror=<fetch|push>] <name> <url>"

8432 msgstr ""

8392 -"git remote add [-t <gren>] [-m <master>] [-f] [--tags|--no-tags] [--"

8433 +"git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--"

8434 "mirror=<fetch|push>] <namn> <url>"

8435

8436 #: builtin/remote.c:14 builtin/remote.c:33

@@ -8400,8 +8441,8 @@ msgstr "git remote rename <gammal> <ny>"

8441 msgid "git remote remove <name>"

8442 msgstr "git remote remove <namn>"

8443

8403 -#: builtin/remote.c:16

8404 -msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"

8444 +#: builtin/remote.c:16 builtin/remote.c:43

8445 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"

8446 msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"

8447

8448 #: builtin/remote.c:17

@@ -8438,10 +8479,6 @@ msgstr "git remote set-url --delete <namn> <url>"

8479 msgid "git remote add [<options>] <name> <url>"

8480 msgstr "git remote add [<flaggor>] <namn> <url>"

8481

8441 -#: builtin/remote.c:43

8442 -msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"

8443 -msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"

8444 -

8482 #: builtin/remote.c:48

8483 msgid "git remote set-branches <name> <branch>..."

8484 msgstr "git remote set-branches <namn> <gren>..."

@@ -8874,8 +8911,8 @@ msgid "be verbose; must be placed before a subcommand"

8911 msgstr "var pratsam; måste skrivas före ett underkommando"

8912

8913 #: builtin/repack.c:17

8877 -msgid "git repack [options]"

8878 -msgstr "git repack [flaggor]"

8914 +msgid "git repack [<options>]"

8915 +msgstr "git repack [<flaggor>]"

8916

8917 #: builtin/repack.c:159

8918 msgid "pack everything in a single pack"

@@ -8941,7 +8978,7 @@ msgstr "maximal storlek på varje paketfil"

8978 msgid "repack objects in packs marked with .keep"

8979 msgstr "packa om objekt i paket märkta med .keep"

8980

8944 -#: builtin/repack.c:371

8981 +#: builtin/repack.c:375

8982 #, c-format

8983 msgid "removing '%s' failed"

8984 msgstr "misslyckades ta bort \"%s\""

@@ -9033,8 +9070,8 @@ msgid "use this format"

9070 msgstr "använd detta format"

9071

9072 #: builtin/rerere.c:12

9075

9076 #: builtin/rerere.c:57

9077 msgid "register clean resolutions in index"

@@ -9173,8 +9210,8 @@ msgid "Could not write new index file."

9210 msgstr "Kunde inte skriva ny indexfil."

9211

9212 #: builtin/rev-parse.c:361

9176 -msgid "git rev-parse --parseopt [options] -- [<args>...]"

9177 -msgstr "git rev-parse --parseopt [options] -- [<argument>...]"

9213 +msgid "git rev-parse --parseopt [<options>] -- [<args>...]"

9214 +msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]"

9215

9216 #: builtin/rev-parse.c:366

9217 msgid "keep the `--` passed as an arg"

@@ -9190,30 +9227,30 @@ msgstr "utdata fast i lång form"

9227

9228 #: builtin/rev-parse.c:499

9229 msgid ""

9193 -"git rev-parse --parseopt [options] -- [<args>...]\n"

9230 +"git rev-parse --parseopt [<options>] -- [<args>...]\n"

9231 " or: git rev-parse --sq-quote [<arg>...]\n"

9195 -" or: git rev-parse [options] [<arg>...]\n"

9232 +" or: git rev-parse [<options>] [<arg>...]\n"

9233 "\n"

9234 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."

9235 msgstr ""

9199 -"git rev-parse --parseopt [flaggor] -- [<argument>...]\n"

9236 +"git rev-parse --parseopt [<flaggor>] -- [<argument>...]\n"

9237 " eller: git rev-parse --sq-quote [<argument>...]\n"

9201 -" eller: git rev-parse [flaggor] [<argument>...]\n"

9238 +" eller: git rev-parse [<flaggor>] [<argument>...]\n"

9239 "\n"

9240 "Kör \"git rev-parse --parseopt -h\" för mer information om den första "

9241 "varianten."

9242

9243 #: builtin/revert.c:22

9207 -msgid "git revert [options] <commit-ish>..."

9208 -msgstr "git revert [flaggor] <incheckning-igt>..."

9244 +msgid "git revert [<options>] <commit-ish>..."

9245 +msgstr "git revert [<flaggor>] <incheckning-igt>..."

9246

9247 #: builtin/revert.c:23

9248 msgid "git revert <subcommand>"

9249 msgstr "git revert <underkommando>"

9250

9251 #: builtin/revert.c:28

9215 -msgid "git cherry-pick [options] <commit-ish>..."

9216 -msgstr "git cherry-pick [flaggor] <incheckning-igt>..."

9252 +msgid "git cherry-pick [<options>] <commit-ish>..."

9253 +msgstr "git cherry-pick [<flaggor>] <incheckning-igt>..."

9254

9255 #: builtin/revert.c:29

9256 msgid "git cherry-pick <subcommand>"

@@ -9293,8 +9330,8 @@ msgid "cherry-pick failed"

9330 msgstr "\"cherry-pick\" misslyckades"

9331

9332 #: builtin/rm.c:17

9296 -msgid "git rm [options] [--] <file>..."

9297 -msgstr "git rm [flaggor] [--] <fil>..."

9333 +msgid "git rm [<options>] [--] <file>..."

9334 +msgstr "git rm [<flaggor>] [--] <fil>..."

9335

9336 #: builtin/rm.c:65

9337 msgid ""

@@ -9394,7 +9431,7 @@ msgid "git rm: unable to remove %s"

9431 msgstr "git rm: kan inte ta bort %s"

9432

9433 #: builtin/shortlog.c:13

9397 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"

9434 +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"

9435 msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"

9436

9437 #: builtin/shortlog.c:131

@@ -9424,19 +9461,19 @@ msgstr "Radbryt utdata"

9461

9462 #: builtin/show-branch.c:9

9463 msgid ""

9427 -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"

9464 +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"

9465 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"

9466 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"

9467 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"

9468 msgstr ""

9432 -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"

9469 +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"

9470 "\t\t[--current] [--color[=<när>] | --no-color] [--sparse]\n"

9471 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"

9472 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"

9473

9474 #: builtin/show-branch.c:13

9438 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"

9439 -msgstr "git show-branch (-g|--reflog)[=<n>[,<bas>]] [--list] [<ref>]"

9475 +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"

9476 +msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]"

9477

9478 #: builtin/show-branch.c:652

9479 msgid "show remote-tracking and local branches"

@@ -9504,11 +9541,11 @@ msgstr "visa <n> nyaste refloggposter med början på bas"

9541

9542 #: builtin/show-ref.c:10

9543 msgid ""

9507 -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"

9508 -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "

9544 +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"

9545 +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"

9546 msgstr ""

9510 -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"

9511 -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] "

9547 +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"

9548 +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mönster>...]"

9549

9550 #: builtin/show-ref.c:11

9551 msgid "git show-ref --exclude-existing[=pattern] < ref-list"

@@ -9547,12 +9584,12 @@ msgid "show refs from stdin that aren't in local repository"

9584 msgstr "visa referenser från standard in som inte finns i lokalt arkiv"

9585

9586 #: builtin/symbolic-ref.c:7

9550 -msgid "git symbolic-ref [options] name [ref]"

9551 -msgstr "git symbolic-ref [flaggor] namn [ref]"

9587 +msgid "git symbolic-ref [<options>] <name> [<ref>]"

9588 +msgstr "git symbolic-ref [<flaggor>] <namn> [<ref>]"

9589

9590 #: builtin/symbolic-ref.c:8

9554 -msgid "git symbolic-ref -d [-q] name"

9555 -msgstr "git symbolic-ref -d [-q] namn"

9591 +msgid "git symbolic-ref -d [-q] <name>"

9592 +msgstr "git symbolic-ref -d [-q] <namn>"

9593

9594 #: builtin/symbolic-ref.c:40

9595 msgid "suppress error message for non-symbolic (detached) refs"

@@ -9577,9 +9614,11 @@ msgstr "skäl till uppdateringen"

9614

9615 #: builtin/tag.c:22

9616 msgid ""

9580 -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"

9617 +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "

9618 +"[<head>]"

9619 msgstr ""

9582 -"git tag [-a|-s|-u <nyckel-id>] [-f] [-m <medd>|-F <fil>] <taggnamn> [<huvud>]"

9620 +"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>] <taggnamn> "

9621 +"[<huvud>]"

9622

9623 #: builtin/tag.c:23

9624 msgid "git tag -d <tagname>..."

@@ -9587,10 +9626,10 @@ msgstr "git tag -d <taggnamn>..."

9626

9627 #: builtin/tag.c:24

9628 msgid ""

9590 -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"

9629 +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"

9630 "\t\t[<pattern>...]"

9631 msgstr ""

9593 -"git tag -l [-n[<antal>]] [--contains <incheckning>] [--points-at <objekt>] \n"

9632 +"git tag -l [-n[<antal>]] [--contains <incheckning>] [--points-at <objekt>]\n"

9633 "\t\t[<mönster>...]"

9634

9635 #: builtin/tag.c:26

@@ -9734,18 +9773,18 @@ msgstr "använd annan nyckel för att signera taggen"

9773 msgid "replace the tag if exists"

9774 msgstr "ersätt taggen om den finns"

9775

9737 -#: builtin/tag.c:608

9776 +#: builtin/tag.c:609

9777 +msgid "Tag listing options"

9778 +msgstr "Alternativ för listning av taggar"

9779 +

9780 +#: builtin/tag.c:610

9781 msgid "show tag list in columns"

9782 msgstr "lista taggar i spalter"

9783

9741 -#: builtin/tag.c:610

9784 +#: builtin/tag.c:612

9785 msgid "sort tags"

9786 msgstr "sortera taggar"

9787

9745 -#: builtin/tag.c:614

9746 -msgid "Tag listing options"

9747 -msgstr "Alternativ för listning av taggar"

9748 -

9788 #: builtin/tag.c:617 builtin/tag.c:623

9789 msgid "print only tags that contain the commit"

9790 msgstr "visa endast taggar som innehåller incheckningen"

@@ -9802,8 +9841,8 @@ msgid "Unpacking objects"

9841 msgstr "Packar upp objekt"

9842

9843 #: builtin/update-index.c:403

9805 -msgid "git update-index [options] [--] [<file>...]"

9806 -msgstr "git update-index [flaggor] [--] [<fil>...]"

9844 +msgid "git update-index [<options>] [--] [<file>...]"

9845 +msgstr "git update-index [<flaggor>] [--] [<fil>...]"

9846

9847 #: builtin/update-index.c:756

9848 msgid "continue refresh even when index needs update"

@@ -9918,16 +9957,16 @@ msgid "enable or disable split index"

9957 msgstr "aktivera eller inaktivera delat index"

9958

9959 #: builtin/update-ref.c:9

9921 -msgid "git update-ref [options] -d <refname> [<oldval>]"

9922 -msgstr "git update-ref [flaggor] -d <refnamn> [<gammaltvärde>]"

9960 +msgid "git update-ref [<options>] -d <refname> [<old-val>]"

9961 +msgstr "git update-ref [<flaggor>] -d <refnamn> [<gammaltvärde>]"

9962

9963 #: builtin/update-ref.c:10

9925 -msgid "git update-ref [options] <refname> <newval> [<oldval>]"

9926 -msgstr "git update-ref [flaggor] <refnamn> <gammaltvärde> [<nyttvärde>]"

9964 +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"

9965 +msgstr "git update-ref [<flaggor>] <refnamn> <gammaltvärde> [<nyttvärde>]"

9966

9967 #: builtin/update-ref.c:11

9929 -msgid "git update-ref [options] --stdin [-z]"

9930 -msgstr "git update-ref [flaggor] --stdin [-z]"

9968 +msgid "git update-ref [<options>] --stdin [-z]"

9969 +msgstr "git update-ref [<flaggor>] --stdin [-z]"

9970

9971 #: builtin/update-ref.c:359

9972 msgid "delete the reference"

@@ -9954,16 +9993,16 @@ msgid "update the info files from scratch"

9993 msgstr "uppdatera informationsfilerna från grunden"

9994

9995 #: builtin/verify-commit.c:17

9957 -msgid "git verify-commit [-v|--verbose] <commit>..."

9958 -msgstr "git verify-commit [-v|--verbose] <incheckning>..."

9996 +msgid "git verify-commit [-v | --verbose] <commit>..."

9997 +msgstr "git verify-commit [-v | --verbose] <incheckning>..."

9998

9999 #: builtin/verify-commit.c:75

10000 msgid "print commit contents"

10001 msgstr "visa innehåll för incheckning"

10002

10003 #: builtin/verify-pack.c:54

9965 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."

9966 -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <paket>..."

10004 +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."

10005 +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paket>..."

10006

10007 #: builtin/verify-pack.c:64

10008 msgid "verbose"

@@ -9974,8 +10013,8 @@ msgid "show statistics only"

10013 msgstr "visa endast statistik"

10014

10015 #: builtin/verify-tag.c:17

9977 -msgid "git verify-tag [-v|--verbose] <tag>..."

9978 -msgstr "git verify-tag [-v|--verbose] <tagg>..."

10016 +msgid "git verify-tag [-v | --verbose] <tag>..."

10017 +msgstr "git verify-tag [-v | --verbose] <tagg>..."

10018

10019 #: builtin/verify-tag.c:73

10020 msgid "print tag contents"

@@ -10325,10 +10364,10 @@ msgstr "Felaktigt HEAD - Jag behöver ett HEAD"

10364 #: git-bisect.sh:130

10365 #, sh-format

10366 msgid ""

10328 -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."

10367 +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."

10368 msgstr ""

10369 "Misslyckades checka ut \"$start_head\". Försök \"git bisect reset "

10331 -"<giltiggren>\""

10370 +"<giltig_gren>\""

10371

10372 # cogito-relaterat

10373 #: git-bisect.sh:140

@@ -11083,6 +11122,18 @@ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""

11122 msgid "Synchronizing submodule url for '$displaypath'"

11123 msgstr "Synkroniserar undermodul-url för \"$displaypath\""

11124

11125 +#~ msgid "(detached from %s)"

11126 +#~ msgstr "(frånkopplad från %s)"

11127 +

11128 +#~ msgid "No existing author found with '%s'"

11129 +#~ msgstr "Hittade ingen befintlig författare med \"%s\""

11130 +

11131 +#~ msgid "search also in ignored files"

11132 +#~ msgstr "sök även i ignorerade filer"

11133 +

11134 +#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"

11135 +#~ msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"

11136 +

11137 #~ msgid "no files added"

11138 #~ msgstr "inga filer har lagts till"

11139

l10n: sv.po: Update Swedish translation (2305t0f0u)