1415174ad5 · matheusbsbs/matheus-bagliano

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2013-01-25 12:33+0800\n"

11 -"PO-Revision-Date: 2013-01-27 22:36+0100\n"

10 +"POT-Creation-Date: 2013-02-14 14:46+0800\n"

11 +"PO-Revision-Date: 2013-02-18 23:00+0100\n"

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

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

14 "Language: sv\n"

@@ -17,7 +17,7 @@ msgstr ""

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

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

19

20 -#: advice.c:45

20 +#: advice.c:49

21 #, c-format

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

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

@@ -26,7 +26,7 @@ msgstr "tips: %.*s\n"

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

27 #. * other commands doing a merge do.

28 #.

29 -#: advice.c:75

29 +#: advice.c:79

30 msgid ""

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

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

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

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

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

75

76 -#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2380

77 -#: builtin/blame.c:2381 builtin/config.c:55 builtin/fast-export.c:653

76 +#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366

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

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

79 -#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540

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

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

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

81 msgid "file"

82 msgstr "fil"

83

@@ -117,7 +117,7 @@ msgstr "arkiv"

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

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

119

120 -#: archive.c:347 builtin/archive.c:95 builtin/notes.c:619

120 +#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615

121 msgid "command"

122 msgstr "kommando"

123

@@ -344,7 +344,7 @@ msgstr ""

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

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

346

347 -#: gpg-interface.c:59

347 +#: gpg-interface.c:59 gpg-interface.c:127

348 msgid "could not run gpg."

349 msgstr "kunde inte köra gpg."

350

@@ -356,6 +356,16 @@ msgstr "gpg godtog inte data"

356 msgid "gpg failed to sign the data"

357 msgstr "gpg misslyckades signera data"

358

359 +#: gpg-interface.c:112

360 +#, c-format

361 +msgid "could not create temporary file '%s': %s"

362 +msgstr "kunde inte skapa temporära filen \"%s\": %s"

363 +

364 +#: gpg-interface.c:115

365 +#, c-format

366 +msgid "failed writing detached signature to '%s': %s"

367 +msgstr "misslyckades skriva fristående signatur till \"%s\": %s"

368 +

369 #: grep.c:1622

370 #, c-format

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

@@ -380,7 +390,11 @@ msgstr "git-kommandon tillgängliga i \"%s\""

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

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

392

383 -#: help.c:275

393 +#: help.c:235

394 +msgid "The most commonly used git commands are:"

395 +msgstr "De mest använda git-kommandona är:"

396 +

397 +#: help.c:292

398 #, c-format

399 msgid ""

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

@@ -389,11 +403,11 @@ msgstr ""

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

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

405

392 -#: help.c:332

406 +#: help.c:349

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

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

409

396 -#: help.c:354

410 +#: help.c:371

411 #, c-format

412 msgid ""

413 "WARNING: You called a Git command named '%s', which does not exist.\n"

@@ -402,17 +416,17 @@ msgstr ""

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

417 "Fortsätter under förutsättningen att du menade \"%s\""

418

405 -#: help.c:359

419 +#: help.c:376

420 #, c-format

421 msgid "in %0.1f seconds automatically..."

422 msgstr "automatiskt om %0.1f sekunder..."

423

410 -#: help.c:366

424 +#: help.c:383

425 #, c-format

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

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

428

415 -#: help.c:370

429 +#: help.c:387

430 msgid ""

431 "\n"

432 "Did you mean this?"

@@ -710,18 +724,28 @@ msgstr " eller: %s"

724 msgid " %s"

725 msgstr " %s"

726

713 -#: remote.c:1686

727 +#: pathspec.c:83

728 +#, c-format

729 +msgid "Path '%s' is in submodule '%.*s'"

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

731 +

732 +#: pathspec.c:99

733 +#, c-format

734 +msgid "'%s' is beyond a symbolic link"

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

736 +

737 +#: remote.c:1653

738 #, c-format

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

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

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

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

743

720 -#: remote.c:1692

744 +#: remote.c:1659

745 msgid " (use \"git push\" to publish your local commits)\n"

746 msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n"

747

724 -#: remote.c:1695

748 +#: remote.c:1662

749 #, c-format

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

751 msgid_plural ""

@@ -731,11 +755,11 @@ msgstr[0] ""

755 msgstr[1] ""

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

757

734 -#: remote.c:1703

758 +#: remote.c:1670

759 msgid " (use \"git pull\" to update your local branch)\n"

760 msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n"

761

738 -#: remote.c:1706

762 +#: remote.c:1673

763 #, c-format

764 msgid ""

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

@@ -750,18 +774,18 @@ msgstr[1] ""

774 "Din gren och \"%s\" har divergerat,\n"

775 "och har %d respektive %d olika incheckningar.\n"

776

753 -#: remote.c:1716

777 +#: remote.c:1683

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

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

780

757 -#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:875 builtin/merge.c:985

758 -#: builtin/merge.c:995

781 +#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984

782 +#: builtin/merge.c:994

783 #, c-format

784 msgid "Could not open '%s' for writing"

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

786

763 -#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:987

764 -#: builtin/merge.c:1000

787 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986

788 +#: builtin/merge.c:999

789 #, c-format

790 msgid "Could not write to '%s'"

791 msgstr "Kunde inte skriva till \"%s\""

@@ -959,7 +983,7 @@ msgstr "kan inte bestämma HEAD"

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

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

985

962 -#: sequencer.c:821 builtin/apply.c:4016

986 +#: sequencer.c:821 builtin/apply.c:4020

987 #, c-format

988 msgid "cannot open %s: %s"

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

@@ -1179,148 +1203,148 @@ msgstr "osammansl.: %s"

1203 msgid "bug: unhandled diff status %c"

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

1205

1182 -#: wt-status.c:787

1206 +#: wt-status.c:789

1207 msgid "You have unmerged paths."

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

1209

1186 -#: wt-status.c:790 wt-status.c:914

1210 +#: wt-status.c:792 wt-status.c:916

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

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

1213

1190 -#: wt-status.c:793

1214 +#: wt-status.c:795

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

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

1217

1194 -#: wt-status.c:796

1218 +#: wt-status.c:798

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

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

1221

1198 -#: wt-status.c:806

1222 +#: wt-status.c:808

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

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

1225

1202 -#: wt-status.c:809

1226 +#: wt-status.c:811

1227 msgid "The current patch is empty."

1228 msgstr "Aktuell patch är tom."

1229

1206 -#: wt-status.c:813

1230 +#: wt-status.c:815

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

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

1233

1210 -#: wt-status.c:815

1234 +#: wt-status.c:817

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

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

1237

1214 -#: wt-status.c:817

1238 +#: wt-status.c:819

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

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

1241

1218 -#: wt-status.c:875 wt-status.c:885

1242 +#: wt-status.c:877 wt-status.c:887

1243 msgid "You are currently rebasing."

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

1245

1222 -#: wt-status.c:878

1246 +#: wt-status.c:880

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

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

1249

1226 -#: wt-status.c:880

1250 +#: wt-status.c:882

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

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

1253

1230 -#: wt-status.c:882

1254 +#: wt-status.c:884

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

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

1257

1234 -#: wt-status.c:888

1258 +#: wt-status.c:890

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

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

1261

1238 -#: wt-status.c:890

1262 +#: wt-status.c:892

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

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

1265

1242 -#: wt-status.c:893

1266 +#: wt-status.c:895

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

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

1269

1246 -#: wt-status.c:895

1270 +#: wt-status.c:897

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

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

1273

1250 -#: wt-status.c:898

1274 +#: wt-status.c:900

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

1276 msgstr ""

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

1278

1255 -#: wt-status.c:900

1279 +#: wt-status.c:902

1280 msgid ""

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

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

1283

1260 -#: wt-status.c:910

1284 +#: wt-status.c:912

1285 msgid "You are currently cherry-picking."

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

1287

1264 -#: wt-status.c:917

1288 +#: wt-status.c:919

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

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

1291

1268 -#: wt-status.c:926

1292 +#: wt-status.c:928

1293 msgid "You are currently bisecting."

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

1295

1272 -#: wt-status.c:929

1296 +#: wt-status.c:931

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

1298 msgstr ""

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

1300

1277 -#: wt-status.c:980

1301 +#: wt-status.c:982

1302 msgid "On branch "

1303 msgstr "På grenen "

1304

1281 -#: wt-status.c:987

1305 +#: wt-status.c:989

1306 msgid "Not currently on any branch."

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

1308

1285 -#: wt-status.c:999

1309 +#: wt-status.c:1001

1310 msgid "Initial commit"

1311 msgstr "Första incheckning"

1312

1289 -#: wt-status.c:1013

1313 +#: wt-status.c:1015

1314 msgid "Untracked files"

1315 msgstr "Ospårade filer"

1316

1293 -#: wt-status.c:1015

1317 +#: wt-status.c:1017

1318 msgid "Ignored files"

1319 msgstr "Ignorerade filer"

1320

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

1298 -#: wt-status.c:1017

1322 +#: wt-status.c:1019

1323 #, c-format

1324 msgid "Untracked files not listed%s"

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

1326

1303 -#: wt-status.c:1019

1327 +#: wt-status.c:1021

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

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

1330

1307 -#: wt-status.c:1025

1331 +#: wt-status.c:1027

1332 msgid "No changes"

1333 msgstr "Inga ändringar"

1334

1311 -#: wt-status.c:1030

1335 +#: wt-status.c:1032

1336 #, c-format

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

1338 msgstr ""

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

1340 "\")\n"

1341

1318 -#: wt-status.c:1033

1342 +#: wt-status.c:1035

1343 #, c-format

1344 msgid "no changes added to commit\n"

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

1346

1323 -#: wt-status.c:1036

1347 +#: wt-status.c:1038

1348 #, c-format

1349 msgid ""

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

@@ -1329,189 +1353,228 @@ msgstr ""

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

1354 "\")\n"

1355

1332 -#: wt-status.c:1039

1356 +#: wt-status.c:1041

1357 #, c-format

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

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

1360

1337 -#: wt-status.c:1042

1361 +#: wt-status.c:1044

1362 #, c-format

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

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

1365

1342 -#: wt-status.c:1045 wt-status.c:1050

1366 +#: wt-status.c:1047 wt-status.c:1052

1367 #, c-format

1368 msgid "nothing to commit\n"

1369 msgstr "inget att checka in\n"

1370

1347 -#: wt-status.c:1048

1371 +#: wt-status.c:1050

1372 #, c-format

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

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

1375

1352 -#: wt-status.c:1052

1376 +#: wt-status.c:1054

1377 #, c-format

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

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

1380

1357 -#: wt-status.c:1160

1381 +#: wt-status.c:1162

1382 msgid "HEAD (no branch)"

1383 msgstr "HEAD (ingen gren)"

1384

1361 -#: wt-status.c:1166

1385 +#: wt-status.c:1168

1386 msgid "Initial commit on "

1387 msgstr "Första incheckning på "

1388

1365 -#: wt-status.c:1181

1389 +#: wt-status.c:1183

1390 msgid "behind "

1391 msgstr "efter "

1392

1369 -#: wt-status.c:1184 wt-status.c:1187

1393 +#: wt-status.c:1186 wt-status.c:1189

1394 msgid "ahead "

1395 msgstr "före "

1396

1373 -#: wt-status.c:1189

1397 +#: wt-status.c:1191

1398 msgid ", behind "

1399 msgstr ", efter "

1400

1377 -#: builtin/add.c:19

1378 -msgid "git add [options] [--] <filepattern>..."

1379 -msgstr "git add [flaggor] [--] <filmönster>..."

1401 +#: compat/precompose_utf8.c:58 builtin/clone.c:341

1402 +#, c-format

1403 +msgid "failed to unlink '%s'"

1404 +msgstr "misslyckades ta bort länken \"%s\""

1405 +

1406 +#: builtin/add.c:20

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

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

1409

1381 -#: builtin/add.c:62

1410 +#: builtin/add.c:63

1411 #, c-format

1412 msgid "unexpected diff status %c"

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

1414

1386 -#: builtin/add.c:67 builtin/commit.c:231

1415 +#: builtin/add.c:68 builtin/commit.c:231

1416 msgid "updating files failed"

1417 msgstr "misslyckades uppdatera filer"

1418

1390 -#: builtin/add.c:77

1419 +#: builtin/add.c:78

1420 #, c-format

1421 msgid "remove '%s'\n"

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

1423

1395 -#: builtin/add.c:176

1396 -#, c-format

1397 -msgid "Path '%s' is in submodule '%.*s'"

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

1399 -

1400 -#: builtin/add.c:192

1424 +#: builtin/add.c:148

1425 msgid "Unstaged changes after refreshing the index:"

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

1427

1404 -#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275

1428 +#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275

1429 #, c-format

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

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

1432

1409 -#: builtin/add.c:209

1410 -#, c-format

1411 -msgid "'%s' is beyond a symbolic link"

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

1413 -

1414 -#: builtin/add.c:276

1433 +#: builtin/add.c:234

1434 msgid "Could not read the index"

1435 msgstr "Kunde inte läsa indexet"

1436

1418 -#: builtin/add.c:286

1437 +#: builtin/add.c:244

1438 #, c-format

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

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

1441

1423 -#: builtin/add.c:290

1442 +#: builtin/add.c:248

1443 msgid "Could not write patch"

1444 msgstr "Kunde inte skriva patch"

1445

1427 -#: builtin/add.c:295

1446 +#: builtin/add.c:253

1447 #, c-format

1448 msgid "Could not stat '%s'"

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

1450

1432 -#: builtin/add.c:297

1451 +#: builtin/add.c:255

1452 msgid "Empty patch. Aborted."

1453 msgstr "Tom patch. Avbryter."

1454

1436 -#: builtin/add.c:303

1455 +#: builtin/add.c:261

1456 #, c-format

1457 msgid "Could not apply '%s'"

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

1459

1441 -#: builtin/add.c:313

1460 +#: builtin/add.c:271

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

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

1463

1445 -#: builtin/add.c:319 builtin/clean.c:160 builtin/fetch.c:78 builtin/mv.c:63

1446 -#: builtin/prune-packed.c:76 builtin/push.c:396 builtin/remote.c:1253

1464 +#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63

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

1466 #: builtin/rm.c:206

1467 msgid "dry run"

1468 msgstr "testkörning"

1469

1451 -#: builtin/add.c:320 builtin/apply.c:4365 builtin/commit.c:1160

1452 -#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1522

1453 -#: builtin/mv.c:62 builtin/read-tree.c:112

1470 +#: builtin/add.c:278 builtin/apply.c:4369 builtin/check-ignore.c:19

1471 +#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613

1472 +#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112

1473 msgid "be verbose"

1474 msgstr "var pratsam"

1475

1457 -#: builtin/add.c:322

1476 +#: builtin/add.c:280

1477 msgid "interactive picking"

1478 msgstr "plocka interaktivt"

1479

1461 -#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:258

1480 +#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258

1481 msgid "select hunks interactively"

1482 msgstr "välj stycken interaktivt"

1483

1465 -#: builtin/add.c:324

1484 +#: builtin/add.c:282

1485 msgid "edit current diff and apply"

1486 msgstr "redigera aktuell diff och applicera"

1487

1469 -#: builtin/add.c:325

1488 +#: builtin/add.c:283

1489 msgid "allow adding otherwise ignored files"

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

1491

1473 -#: builtin/add.c:326

1492 +#: builtin/add.c:284

1493 msgid "update tracked files"

1494 msgstr "uppdatera spårade filer"

1495

1477 -#: builtin/add.c:327

1496 +#: builtin/add.c:285

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

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

1499

1481 -#: builtin/add.c:328

1500 +#: builtin/add.c:286

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

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

1503

1485 -#: builtin/add.c:329

1504 +#: builtin/add.c:287

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

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

1507

1489 -#: builtin/add.c:330

1508 +#: builtin/add.c:288

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

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

1511

1493 -#: builtin/add.c:331

1512 +#: builtin/add.c:289

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

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

1515

1497 -#: builtin/add.c:353

1516 +#: builtin/add.c:311

1517 #, c-format

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

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

1520

1502 -#: builtin/add.c:354

1521 +#: builtin/add.c:312

1522 msgid "no files added"

1523 msgstr "inga filer har lagts till"

1524

1506 -#: builtin/add.c:360

1525 +#: builtin/add.c:318

1526 msgid "adding files failed"

1527 msgstr "misslyckades lägga till filer"

1528

1510 -#: builtin/add.c:392

1529 +#.

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

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

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

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

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

1535 +#. * keep the old behavior. Later, this warning can be

1536 +#. * turned into a die(...), and eventually we may

1537 +#. * reallow the command with a new behavior.

1538 +#.

1539 +#: builtin/add.c:335

1540 +#, c-format

1541 +msgid ""

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

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

1544 +"anymore.\n"

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

1546 +"\n"

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

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

1549 +"\n"

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

1551 +"\n"

1552 +" git add %s .\n"

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

1554 +"\n"

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

1556 +"directory."

1557 +msgstr ""

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

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

1560 +"användas.\n"

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

1562 +"\n"

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

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

1565 +"\n"

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

1567 +"\n"

1568 +" git add %s .\n"

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

1570 +"\n"

1571 +"I nuvarande version av Git begränsas kommandot till aktuell katalog."

1572 +

1573 +#: builtin/add.c:381

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

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

1576

1514 -#: builtin/add.c:394

1577 +#: builtin/add.c:383

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

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

1580

@@ -1525,12 +1588,12 @@ msgstr "Inget angivet, inget tillagt.\n"

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

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

1590

1528 -#: builtin/add.c:421 builtin/clean.c:203 builtin/commit.c:291 builtin/mv.c:82

1529 -#: builtin/rm.c:235

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

1592 +#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235

1593 msgid "index file corrupt"

1594 msgstr "indexfilen trasig"

1595

1533 -#: builtin/add.c:481 builtin/apply.c:4461 builtin/mv.c:229 builtin/rm.c:370

1596 +#: builtin/add.c:481 builtin/apply.c:4465 builtin/mv.c:229 builtin/rm.c:370

1597 msgid "Unable to write new index file"

1598 msgstr "Kunde inte skriva ny indexfil"

1599

@@ -1583,17 +1646,17 @@ msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"

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

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

1648

1586 -#: builtin/apply.c:1420

1649 +#: builtin/apply.c:1422

1650 #, c-format

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

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

1653

1591 -#: builtin/apply.c:1477

1654 +#: builtin/apply.c:1479

1655 #, c-format

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

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

1658

1596 -#: builtin/apply.c:1494

1659 +#: builtin/apply.c:1496

1660 #, c-format

1661 msgid ""

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

@@ -1609,78 +1672,78 @@ msgstr[1] ""

1672 "sökvägskomponenter\n"

1673 "tas bort (rad %d)"

1674

1612 -#: builtin/apply.c:1654

1675 +#: builtin/apply.c:1656

1676 msgid "new file depends on old contents"

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

1678

1616 -#: builtin/apply.c:1656

1679 +#: builtin/apply.c:1658

1680 msgid "deleted file still has contents"

1681 msgstr "borttagen fil har fortfarande innehåll"

1682

1620 -#: builtin/apply.c:1682

1683 +#: builtin/apply.c:1684

1684 #, c-format

1685 msgid "corrupt patch at line %d"

1686 msgstr "trasig patch på rad %d"

1687

1625 -#: builtin/apply.c:1718

1688 +#: builtin/apply.c:1720

1689 #, c-format

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

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

1692

1630 -#: builtin/apply.c:1720

1693 +#: builtin/apply.c:1722

1694 #, c-format

1695 msgid "deleted file %s still has contents"

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

1697

1635 -#: builtin/apply.c:1723

1698 +#: builtin/apply.c:1725

1699 #, c-format

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

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

1702

1640 -#: builtin/apply.c:1869

1703 +#: builtin/apply.c:1871

1704 #, c-format

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

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

1707

1708 #. there has to be one hunk (forward hunk)

1646 -#: builtin/apply.c:1898

1709 +#: builtin/apply.c:1900

1710 #, c-format

1711 msgid "unrecognized binary patch at line %d"

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

1713

1651 -#: builtin/apply.c:1984

1714 +#: builtin/apply.c:1986

1715 #, c-format

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

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

1718

1656 -#: builtin/apply.c:2074

1719 +#: builtin/apply.c:2076

1720 #, c-format

1721 msgid "unable to read symlink %s"

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

1723

1661 -#: builtin/apply.c:2078

1724 +#: builtin/apply.c:2080

1725 #, c-format

1726 msgid "unable to open or read %s"

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

1728

1666 -#: builtin/apply.c:2682

1729 +#: builtin/apply.c:2684

1730 #, c-format

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

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

1733

1671 -#: builtin/apply.c:2800

1734 +#: builtin/apply.c:2802

1735 #, c-format

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

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

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

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

1740

1678 -#: builtin/apply.c:2812

1741 +#: builtin/apply.c:2814

1742 #, c-format

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

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

1745

1683 -#: builtin/apply.c:2818

1746 +#: builtin/apply.c:2820

1747 #, c-format

1748 msgid ""

1749 "while searching for:\n"

@@ -1689,318 +1752,318 @@ msgstr ""

1752 "vid sökning efter:\n"

1753 "%.*s"

1754

1692 -#: builtin/apply.c:2837

1755 +#: builtin/apply.c:2839

1756 #, c-format

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

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

1759

1697 -#: builtin/apply.c:2940

1760 +#: builtin/apply.c:2942

1761 #, c-format

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

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

1764

1702 -#: builtin/apply.c:2946

1765 +#: builtin/apply.c:2948

1766 #, c-format

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

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

1769

1707 -#: builtin/apply.c:2967

1770 +#: builtin/apply.c:2969

1771 #, c-format

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

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

1774

1712 -#: builtin/apply.c:3089

1775 +#: builtin/apply.c:3091

1776 #, c-format

1777 msgid "cannot checkout %s"

1778 msgstr "kan inte checka ut %s"

1779

1717 -#: builtin/apply.c:3134 builtin/apply.c:3143 builtin/apply.c:3187

1780 +#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189

1781 #, c-format

1782 msgid "read of %s failed"

1783 msgstr "misslyckades läsa %s"

1784

1722 -#: builtin/apply.c:3167 builtin/apply.c:3389

1785 +#: builtin/apply.c:3169 builtin/apply.c:3391

1786 #, c-format

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

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

1789

1727 -#: builtin/apply.c:3248 builtin/apply.c:3403

1790 +#: builtin/apply.c:3250 builtin/apply.c:3405

1791 #, c-format

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

1793 msgstr "%s: finns inte i indexet"

1794

1732 -#: builtin/apply.c:3252 builtin/apply.c:3395 builtin/apply.c:3417

1795 +#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419

1796 #, c-format

1797 msgid "%s: %s"

1798 msgstr "%s: %s"

1799

1737 -#: builtin/apply.c:3257 builtin/apply.c:3411

1800 +#: builtin/apply.c:3259 builtin/apply.c:3413

1801 #, c-format

1802 msgid "%s: does not match index"

1803 msgstr "%s: motsvarar inte indexet"

1804

1742 -#: builtin/apply.c:3359

1805 +#: builtin/apply.c:3361

1806 msgid "removal patch leaves file contents"

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

1808

1746 -#: builtin/apply.c:3428

1809 +#: builtin/apply.c:3430

1810 #, c-format

1811 msgid "%s: wrong type"

1812 msgstr "%s: fel typ"

1813

1751 -#: builtin/apply.c:3430

1814 +#: builtin/apply.c:3432

1815 #, c-format

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

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

1818

1756 -#: builtin/apply.c:3531

1819 +#: builtin/apply.c:3533

1820 #, c-format

1821 msgid "%s: already exists in index"

1822 msgstr "%s: finns redan i indexet"

1823

1761 -#: builtin/apply.c:3534

1824 +#: builtin/apply.c:3536

1825 #, c-format

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

1827 msgstr "%s: finns redan i arbetskatalogen"

1828

1766 -#: builtin/apply.c:3554

1829 +#: builtin/apply.c:3556

1830 #, c-format

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

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

1833

1771 -#: builtin/apply.c:3559

1834 +#: builtin/apply.c:3561

1835 #, c-format

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

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

1838

1776 -#: builtin/apply.c:3567

1839 +#: builtin/apply.c:3569

1840 #, c-format

1841 msgid "%s: patch does not apply"

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

1843

1781 -#: builtin/apply.c:3580

1844 +#: builtin/apply.c:3582

1845 #, c-format

1846 msgid "Checking patch %s..."

1847 msgstr "Kontrollerar patchen %s..."

1848

1786 -#: builtin/apply.c:3635 builtin/checkout.c:215 builtin/reset.c:124

1849 +#: builtin/apply.c:3639 builtin/checkout.c:215 builtin/reset.c:124

1850 #, c-format

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

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

1853

1791 -#: builtin/apply.c:3778

1854 +#: builtin/apply.c:3782

1855 #, c-format

1856 msgid "unable to remove %s from index"

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

1858

1796 -#: builtin/apply.c:3806

1859 +#: builtin/apply.c:3810

1860 #, c-format

1861 msgid "corrupt patch for subproject %s"

1862 msgstr "trasig patch för underprojektet %s"

1863

1801 -#: builtin/apply.c:3810

1864 +#: builtin/apply.c:3814

1865 #, c-format

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

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

1868

1806 -#: builtin/apply.c:3815

1869 +#: builtin/apply.c:3819

1870 #, c-format

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

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

1873

1811 -#: builtin/apply.c:3818 builtin/apply.c:3926

1874 +#: builtin/apply.c:3822 builtin/apply.c:3930

1875 #, c-format

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

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

1878

1816 -#: builtin/apply.c:3851

1879 +#: builtin/apply.c:3855

1880 #, c-format

1881 msgid "closing file '%s'"

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

1883

1821 -#: builtin/apply.c:3900

1884 +#: builtin/apply.c:3904

1885 #, c-format

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

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

1888

1826 -#: builtin/apply.c:3987

1889 +#: builtin/apply.c:3991

1890 #, c-format

1891 msgid "Applied patch %s cleanly."

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

1893

1831 -#: builtin/apply.c:3995

1894 +#: builtin/apply.c:3999

1895 msgid "internal error"

1896 msgstr "internt fel"

1897

1898 #. Say this even without --verbose

1836 -#: builtin/apply.c:3998

1899 +#: builtin/apply.c:4002

1900 #, c-format

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

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

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

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

1905

1843 -#: builtin/apply.c:4008

1906 +#: builtin/apply.c:4012

1907 #, c-format

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

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

1910

1848 -#: builtin/apply.c:4029

1911 +#: builtin/apply.c:4033

1912 #, c-format

1913 msgid "Hunk #%d applied cleanly."

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

1915

1853 -#: builtin/apply.c:4032

1916 +#: builtin/apply.c:4036

1917 #, c-format

1918 msgid "Rejected hunk #%d."

1919 msgstr "Refuserar stycke %d."

1920

1858 -#: builtin/apply.c:4182

1921 +#: builtin/apply.c:4186

1922 msgid "unrecognized input"

1923 msgstr "indata känns inte igen"

1924

1862 -#: builtin/apply.c:4193

1925 +#: builtin/apply.c:4197

1926 msgid "unable to read index file"

1927 msgstr "kan inte läsa indexfilen"

1928

1866 -#: builtin/apply.c:4312 builtin/apply.c:4315 builtin/clone.c:91

1929 +#: builtin/apply.c:4316 builtin/apply.c:4319 builtin/clone.c:91

1930 #: builtin/fetch.c:63

1931 msgid "path"

1932 msgstr "sökväg"

1933

1871 -#: builtin/apply.c:4313

1934 +#: builtin/apply.c:4317

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

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

1937

1875 -#: builtin/apply.c:4316

1938 +#: builtin/apply.c:4320

1939 msgid "apply changes matching the given path"

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

1941

1879 -#: builtin/apply.c:4318

1942 +#: builtin/apply.c:4322

1943 msgid "num"

1944 msgstr "antal"

1945

1883 -#: builtin/apply.c:4319

1946 +#: builtin/apply.c:4323

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

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

1949

1887 -#: builtin/apply.c:4322

1950 +#: builtin/apply.c:4326

1951 msgid "ignore additions made by the patch"

1952 msgstr "ignorera tillägg gjorda av patchen"

1953

1891 -#: builtin/apply.c:4324

1954 +#: builtin/apply.c:4328

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

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

1957

1895 -#: builtin/apply.c:4328

1958 +#: builtin/apply.c:4332

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

1960 msgstr "visa antal tillagda och borttagna rader decimalt"

1961

1899 -#: builtin/apply.c:4330

1962 +#: builtin/apply.c:4334

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

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

1965

1903 -#: builtin/apply.c:4332

1966 +#: builtin/apply.c:4336

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

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

1969

1907 -#: builtin/apply.c:4334

1970 +#: builtin/apply.c:4338

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

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

1973

1911 -#: builtin/apply.c:4336

1974 +#: builtin/apply.c:4340

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

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

1977

1915 -#: builtin/apply.c:4338

1978 +#: builtin/apply.c:4342

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

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

1981

1919 -#: builtin/apply.c:4340

1982 +#: builtin/apply.c:4344

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

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

1985

1923 -#: builtin/apply.c:4342

1986 +#: builtin/apply.c:4346

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

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

1989

1927 -#: builtin/apply.c:4344 builtin/checkout-index.c:197 builtin/ls-files.c:460

1990 +#: builtin/apply.c:4348 builtin/checkout-index.c:197 builtin/ls-files.c:463

1991 msgid "paths are separated with NUL character"

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

1993

1931 -#: builtin/apply.c:4347

1994 +#: builtin/apply.c:4351

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

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

1997

1935 -#: builtin/apply.c:4348

1998 +#: builtin/apply.c:4352

1999 msgid "action"

2000 msgstr "åtgärd"

2001

1939 -#: builtin/apply.c:4349

2002 +#: builtin/apply.c:4353

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

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

2005

1943 -#: builtin/apply.c:4352 builtin/apply.c:4355

2006 +#: builtin/apply.c:4356 builtin/apply.c:4359

2007 msgid "ignore changes in whitespace when finding context"

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

2009

1947 -#: builtin/apply.c:4358

2010 +#: builtin/apply.c:4362

2011 msgid "apply the patch in reverse"

2012 msgstr "tillämpa patchen baklänges"

2013

1951 -#: builtin/apply.c:4360

2014 +#: builtin/apply.c:4364

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

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

2017

1955 -#: builtin/apply.c:4362

2018 +#: builtin/apply.c:4366

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

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

2021

1959 -#: builtin/apply.c:4364

2022 +#: builtin/apply.c:4368

2023 msgid "allow overlapping hunks"

2024 msgstr "tillåt överlappande stycken"

2025

1963 -#: builtin/apply.c:4367

2026 +#: builtin/apply.c:4371

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

2028 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

2029

1967 -#: builtin/apply.c:4370

2030 +#: builtin/apply.c:4374

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

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

2033

1971 -#: builtin/apply.c:4372

2034 +#: builtin/apply.c:4376

2035 msgid "root"

2036 msgstr "rot"

2037

1975 -#: builtin/apply.c:4373

2038 +#: builtin/apply.c:4377

2039 msgid "prepend <root> to all filenames"

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

2041

1979 -#: builtin/apply.c:4395

2042 +#: builtin/apply.c:4399

2043 msgid "--3way outside a repository"

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

2045

1983 -#: builtin/apply.c:4403

2046 +#: builtin/apply.c:4407

2047 msgid "--index outside a repository"

2048 msgstr "--index utanför arkiv"

2049

1987 -#: builtin/apply.c:4406

2050 +#: builtin/apply.c:4410

2051 msgid "--cached outside a repository"

2052 msgstr "--cached utanför arkiv"

2053

1991 -#: builtin/apply.c:4422

2054 +#: builtin/apply.c:4426

2055 #, c-format

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

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

2058

1996 -#: builtin/apply.c:4436

2059 +#: builtin/apply.c:4440

2060 #, c-format

2061 msgid "squelched %d whitespace error"

2062 msgid_plural "squelched %d whitespace errors"

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

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

2065

2003 -#: builtin/apply.c:4442 builtin/apply.c:4452

2066 +#: builtin/apply.c:4446 builtin/apply.c:4456

2067 #, c-format

2068 msgid "%d line adds whitespace errors."

2069 msgid_plural "%d lines add whitespace errors."

@@ -2062,95 +2125,95 @@ msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil"

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

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

2127

2065 -#: builtin/blame.c:2364

2128 +#: builtin/blame.c:2350

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

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

2131

2069 -#: builtin/blame.c:2365

2132 +#: builtin/blame.c:2351

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

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

2135

2073 -#: builtin/blame.c:2366

2136 +#: builtin/blame.c:2352

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

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

2139

2077 -#: builtin/blame.c:2367

2140 +#: builtin/blame.c:2353

2141 msgid "Show work cost statistics"

2142 msgstr "Visa statistik över arbetskostnad"

2143

2081 -#: builtin/blame.c:2368

2144 +#: builtin/blame.c:2354

2145 msgid "Show output score for blame entries"

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

2147

2085 -#: builtin/blame.c:2369

2148 +#: builtin/blame.c:2355

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

2150 msgstr "Visa originalfilnamn (Standard: auto)"

2151

2089 -#: builtin/blame.c:2370

2152 +#: builtin/blame.c:2356

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

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

2155

2093 -#: builtin/blame.c:2371

2156 +#: builtin/blame.c:2357

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

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

2159

2097 -#: builtin/blame.c:2372

2160 +#: builtin/blame.c:2358

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

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

2163

2101 -#: builtin/blame.c:2373

2164 +#: builtin/blame.c:2359

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

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

2167

2105 -#: builtin/blame.c:2374

2168 +#: builtin/blame.c:2360

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

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

2171

2109 -#: builtin/blame.c:2375

2172 +#: builtin/blame.c:2361

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

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

2175

2113 -#: builtin/blame.c:2376

2176 +#: builtin/blame.c:2362

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

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

2179

2117 -#: builtin/blame.c:2377

2180 +#: builtin/blame.c:2363

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

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

2183

2121 -#: builtin/blame.c:2378

2184 +#: builtin/blame.c:2364

2185 msgid "Ignore whitespace differences"

2186 msgstr "Ignorera ändringar i blanksteg"

2187

2125 -#: builtin/blame.c:2379

2188 +#: builtin/blame.c:2365

2189 msgid "Spend extra cycles to find better match"

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

2191

2129 -#: builtin/blame.c:2380

2192 +#: builtin/blame.c:2366

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

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

2195

2133 -#: builtin/blame.c:2381

2196 +#: builtin/blame.c:2367

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

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

2199

2137 -#: builtin/blame.c:2382 builtin/blame.c:2383

2200 +#: builtin/blame.c:2368 builtin/blame.c:2369

2201 msgid "score"

2202 msgstr "poäng"

2203

2141 -#: builtin/blame.c:2382

2204 +#: builtin/blame.c:2368

2205 msgid "Find line copies within and across files"

2206 msgstr "Hitta kopierade rader inuti och mellan filer"

2207

2145 -#: builtin/blame.c:2383

2208 +#: builtin/blame.c:2369

2209 msgid "Find line movements within and across files"

2210 msgstr "Hitta flyttade rader inuti och mellan filer"

2211

2149 -#: builtin/blame.c:2384

2212 +#: builtin/blame.c:2370

2213 msgid "n,m"

2214 msgstr "n,m"

2215

2153 -#: builtin/blame.c:2384

2216 +#: builtin/blame.c:2370

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

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

2219

@@ -2284,10 +2347,19 @@ msgstr "[%s: före %d, bakom %d] "

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

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

2349

2350 +#: builtin/branch.c:469

2351 +msgid " **** invalid ref ****"

2352 +msgstr " **** ogiltig ref ****"

2353 +

2354 #: builtin/branch.c:560

2355 msgid "(no branch)"

2356 msgstr "(ingen gren)"

2357

2358 +#: builtin/branch.c:593

2359 +#, c-format

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

2361 +msgstr "objektet \"%s\" pekar på en incheckning"

2362 +

2363 #: builtin/branch.c:625

2364 msgid "some refs could not be read"

2365 msgstr "vissa referenser kunde inte läsas"

@@ -2359,8 +2431,8 @@ msgid "act on remote-tracking branches"

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

2432

2433 #: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788

2362 -#: builtin/branch.c:794 builtin/commit.c:1378 builtin/commit.c:1379

2363 -#: builtin/commit.c:1380 builtin/commit.c:1381 builtin/tag.c:470

2434 +#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367

2435 +#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468

2436 msgid "commit"

2437 msgstr "incheckning"

2438

@@ -2428,27 +2500,53 @@ msgstr "Misslyckades slå upp HEAD som giltig referens"

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

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

2502

2431 -#: builtin/branch.c:836

2503 +#: builtin/branch.c:839

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

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

2506

2435 -#: builtin/branch.c:887

2507 +#: builtin/branch.c:845

2508 +msgid "branch name required"

2509 +msgstr "grennamn krävs"

2510 +

2511 +#: builtin/branch.c:860

2512 +msgid "Cannot give description to detached HEAD"

2513 +msgstr "Kan inte beskriva frånkopplad HEAD"

2514 +

2515 +#: builtin/branch.c:865

2516 +msgid "cannot edit description of more than one branch"

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

2518 +

2519 +#: builtin/branch.c:872

2520 +#, c-format

2521 +msgid "No commit on branch '%s' yet."

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

2523 +

2524 +#: builtin/branch.c:875

2525 +#, c-format

2526 +msgid "No branch named '%s'."

2527 +msgstr "Ingen gren vid namnet \"%s\"."

2528 +

2529 +#: builtin/branch.c:888

2530 +msgid "too many branches for a rename operation"

2531 +msgstr "för många grenar för namnbyte"

2532 +

2533 +#: builtin/branch.c:893

2534 #, c-format

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

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

2537

2440 -#: builtin/branch.c:899

2538 +#: builtin/branch.c:905

2539 #, c-format

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

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

2542

2445 -#: builtin/branch.c:914

2543 +#: builtin/branch.c:920

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

2545 msgstr ""

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

2547 "grennamn"

2548

2451 -#: builtin/branch.c:917

2549 +#: builtin/branch.c:923

2550 #, c-format

2551 msgid ""

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

@@ -2457,7 +2555,7 @@ msgstr ""

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

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

2557

2460 -#: builtin/branch.c:934

2558 +#: builtin/branch.c:940

2559 #, c-format

2560 msgid ""

2561 "\n"

@@ -2468,12 +2566,12 @@ msgstr ""

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

2567 "\n"

2568

2471 -#: builtin/branch.c:935

2569 +#: builtin/branch.c:941

2570 #, c-format

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

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

2573

2476 -#: builtin/branch.c:936

2574 +#: builtin/branch.c:942

2575 #, c-format

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

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

@@ -2547,14 +2645,38 @@ msgstr "visa alla attribut som satts på filen"

2645 msgid "use .gitattributes only from the index"

2646 msgstr "använd .gitattributes endast från indexet"

2647

2550 -#: builtin/check-attr.c:21 builtin/hash-object.c:75

2648 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75

2649 msgid "read file names from stdin"

2650 msgstr "läs filnamn från standard in"

2651

2554 -#: builtin/check-attr.c:23

2652 +#: builtin/check-attr.c:23 builtin/check-ignore.c:24

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

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

2655

2656 +#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177

2657 +msgid "suppress progress reporting"

2658 +msgstr "undertryck förloppsrapportering"

2659 +

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

2661 +msgid "cannot specify pathnames with --stdin"

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

2663 +

2664 +#: builtin/check-ignore.c:154

2665 +msgid "-z only makes sense with --stdin"

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

2667 +

2668 +#: builtin/check-ignore.c:156

2669 +msgid "no path specified"

2670 +msgstr "ingen sökväg angavs"

2671 +

2672 +#: builtin/check-ignore.c:160

2673 +msgid "--quiet is only valid with a single pathname"

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

2675 +

2676 +#: builtin/check-ignore.c:162

2677 +msgid "cannot have both --quiet and --verbose"

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

2679 +

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

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

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

@@ -2788,10 +2910,6 @@ msgstr "\"%s\" kan inte användas med \"%s\""

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

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

2912

2791 -#: builtin/checkout.c:1012 builtin/gc.c:177

2792 -msgid "suppress progress reporting"

2793 -msgstr "undertryck förloppsrapportering"

2794 -

2913 #: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89

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

2915 msgid "branch"

@@ -2925,47 +3043,47 @@ msgstr "Skulle hoppa över arkivet %s\n"

3043 msgid "failed to remove %s"

3044 msgstr "misslyckades ta bort %s"

3045

2928 -#: builtin/clean.c:159

3046 +#: builtin/clean.c:160

3047 msgid "do not print names of files removed"

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

3049

2932 -#: builtin/clean.c:161

3050 +#: builtin/clean.c:162

3051 msgid "force"

3052 msgstr "tvinga"

3053

2936 -#: builtin/clean.c:163

3054 +#: builtin/clean.c:164

3055 msgid "remove whole directories"

3056 msgstr "ta bort hela kataloger"

3057

2940 -#: builtin/clean.c:164 builtin/describe.c:413 builtin/grep.c:717

2941 -#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182

3058 +#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717

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

3060 msgid "pattern"

3061 msgstr "mönster"

3062

2945 -#: builtin/clean.c:165

3063 +#: builtin/clean.c:166

3064 msgid "add <pattern> to ignore rules"

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

3066

2949 -#: builtin/clean.c:166

3067 +#: builtin/clean.c:167

3068 msgid "remove ignored files, too"

3069 msgstr "ta även bort ignorerade filer"

3070

2953 -#: builtin/clean.c:168

3071 +#: builtin/clean.c:169

3072 msgid "remove only ignored files"

3073 msgstr "ta endast bort ignorerade filer"

3074

2957 -#: builtin/clean.c:186

3075 +#: builtin/clean.c:187

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

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

3078

2961 -#: builtin/clean.c:190

3079 +#: builtin/clean.c:191

3080 msgid ""

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

3082 msgstr ""

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

3084 "städa"

3085

2968 -#: builtin/clean.c:193

3086 +#: builtin/clean.c:194

3087 msgid ""

3088 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "

3089 "clean"

@@ -2978,7 +3096,7 @@ msgid "git clone [options] [--] <repo> [<dir>]"

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

3097

3098 #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212

2981 -#: builtin/push.c:407

3099 +#: builtin/push.c:436

3100 msgid "force progress reporting"

3101 msgstr "tvinga förloppsrapportering"

3102

@@ -3091,11 +3209,6 @@ msgstr "%s finns och är ingen katalog"

3209 msgid "failed to stat %s\n"

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

3211

3094 -#: builtin/clone.c:341

3095 -#, c-format

3096 -msgid "failed to unlink '%s'"

3097 -msgstr "misslyckades ta bort länken \"%s\""

3098 -

3212 #: builtin/clone.c:346

3213 #, c-format

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

@@ -3157,7 +3270,7 @@ msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."

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

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

3272

3160 -#: builtin/clone.c:759 builtin/clone.c:773

3273 +#: builtin/clone.c:759 builtin/clone.c:771

3274 #, c-format

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

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

@@ -3167,27 +3280,27 @@ msgstr "kunde inte skapa inledande kataloger för \"%s\""

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

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

3282

3170 -#: builtin/clone.c:783

3283 +#: builtin/clone.c:781

3284 #, c-format

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

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

3287

3175 -#: builtin/clone.c:785

3288 +#: builtin/clone.c:783

3289 #, c-format

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

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

3292

3180 -#: builtin/clone.c:827

3293 +#: builtin/clone.c:818

3294 #, c-format

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

3296 msgstr "Vet inte hur man klonar %s"

3297

3185 -#: builtin/clone.c:876

3298 +#: builtin/clone.c:867

3299 #, c-format

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

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

3302

3190 -#: builtin/clone.c:883

3303 +#: builtin/clone.c:874

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

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

3306

@@ -3224,12 +3337,12 @@ msgid "--command must be the first argument"

3337 msgstr "--command måste vara första argument"

3338

3339 #: builtin/commit.c:34

3227 -msgid "git commit [options] [--] <filepattern>..."

3228 -msgstr "git commit [flaggor] [--] <filmöster>..."

3340 +msgid "git commit [options] [--] <pathspec>..."

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

3342

3343 #: builtin/commit.c:39

3231 -msgid "git status [options] [--] <filepattern>..."

3232 -msgstr "git status [flaggor] [--] <filmönster>..."

3344 +msgid "git status [options] [--] <pathspec>..."

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

3346

3347 #: builtin/commit.c:44

3348 msgid ""

@@ -3399,21 +3512,24 @@ msgstr ""

3512 "och försöker igen.\n"

3513

3514 #: builtin/commit.c:735

3515 +#, c-format

3516 msgid ""

3517 "Please enter the commit message for your changes. Lines starting\n"

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

3518 +"with '%c' will be ignored, and an empty message aborts the commit.\n"

3519 msgstr ""

3520 "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"

3407 -"med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n"

3521 +"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "

3522 +"incheckningen.\n"

3523

3524 #: builtin/commit.c:740

3525 +#, c-format

3526 msgid ""

3527 "Please enter the commit message for your changes. Lines starting\n"

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

3528 +"with '%c' will be kept; you may remove them yourself if you want to.\n"

3529 "An empty message aborts the commit.\n"

3530 msgstr ""

3531 "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"

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

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

3533 "Ett tomt meddelande avbryter incheckningen.\n"

3534

3535 #: builtin/commit.c:753

@@ -3434,7 +3550,7 @@ msgstr "Kan inte läsa indexet"

3550 msgid "Error building trees"

3551 msgstr "Fel vid byggande av träd"

3552

3437 -#: builtin/commit.c:832 builtin/tag.c:361

3553 +#: builtin/commit.c:832 builtin/tag.c:359

3554 #, c-format

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

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

@@ -3444,111 +3560,111 @@ msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"

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

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

3562

3447 -#: builtin/commit.c:944 builtin/commit.c:1148

3563 +#: builtin/commit.c:944 builtin/commit.c:1138

3564 #, c-format

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

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

3567

3452 -#: builtin/commit.c:984

3568 +#: builtin/commit.c:974

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

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

3571

3456 -#: builtin/commit.c:995

3572 +#: builtin/commit.c:985

3573 msgid "You have nothing to amend."

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

3575

3460 -#: builtin/commit.c:998

3576 +#: builtin/commit.c:988

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

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

3579

3464 -#: builtin/commit.c:1000

3580 +#: builtin/commit.c:990

3581 msgid "You are in the middle of a cherry-pick -- cannot amend."

3582 msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."

3583

3468 -#: builtin/commit.c:1003

3584 +#: builtin/commit.c:993

3585 msgid "Options --squash and --fixup cannot be used together"

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

3587

3472 -#: builtin/commit.c:1013

3588 +#: builtin/commit.c:1003

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

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

3591

3476 -#: builtin/commit.c:1015

3592 +#: builtin/commit.c:1005

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

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

3595

3480 -#: builtin/commit.c:1023

3596 +#: builtin/commit.c:1013

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

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

3599

3484 -#: builtin/commit.c:1040

3600 +#: builtin/commit.c:1030

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

3602 msgstr ""

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

3604

3489 -#: builtin/commit.c:1042

3605 +#: builtin/commit.c:1032

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

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

3608

3493 -#: builtin/commit.c:1044

3609 +#: builtin/commit.c:1034

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

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

3612

3497 -#: builtin/commit.c:1046

3613 +#: builtin/commit.c:1036

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

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

3616

3501 -#: builtin/commit.c:1056 builtin/tag.c:577

3617 +#: builtin/commit.c:1046 builtin/tag.c:575

3618 #, c-format

3619 msgid "Invalid cleanup mode %s"

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

3621

3506 -#: builtin/commit.c:1061

3622 +#: builtin/commit.c:1051

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

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

3625

3510 -#: builtin/commit.c:1067 builtin/commit.c:1202

3626 +#: builtin/commit.c:1057 builtin/commit.c:1192

3627 msgid "--long and -z are incompatible"

3628 msgstr "--long och -z är inkompatibla"

3629

3514 -#: builtin/commit.c:1162 builtin/commit.c:1400

3630 +#: builtin/commit.c:1152 builtin/commit.c:1388

3631 msgid "show status concisely"

3632 msgstr "vis koncis status"

3633

3518 -#: builtin/commit.c:1164 builtin/commit.c:1402

3634 +#: builtin/commit.c:1154 builtin/commit.c:1390

3635 msgid "show branch information"

3636 msgstr "visa information om gren"

3637

3522 -#: builtin/commit.c:1166 builtin/commit.c:1404 builtin/push.c:397

3638 +#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426

3639 msgid "machine-readable output"

3640 msgstr "maskinläsbar utdata"

3641

3526 -#: builtin/commit.c:1169 builtin/commit.c:1406

3642 +#: builtin/commit.c:1159 builtin/commit.c:1394

3643 msgid "show status in long format (default)"

3644 msgstr "visa status i långt format (standard)"

3645

3530 -#: builtin/commit.c:1172 builtin/commit.c:1409

3646 +#: builtin/commit.c:1162 builtin/commit.c:1397

3647 msgid "terminate entries with NUL"

3648 msgstr "terminera poster med NUL"

3649

3534 -#: builtin/commit.c:1174 builtin/commit.c:1412 builtin/fast-export.c:647

3535 -#: builtin/fast-export.c:650 builtin/tag.c:461

3650 +#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647

3651 +#: builtin/fast-export.c:650 builtin/tag.c:459

3652 msgid "mode"

3653 msgstr "läge"

3654

3539 -#: builtin/commit.c:1175 builtin/commit.c:1412

3655 +#: builtin/commit.c:1165 builtin/commit.c:1400

3656 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

3657 msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"

3658

3543 -#: builtin/commit.c:1178

3659 +#: builtin/commit.c:1168

3660 msgid "show ignored files"

3661 msgstr "visa ignorerade filer"

3662

3547 -#: builtin/commit.c:1179 parse-options.h:151

3663 +#: builtin/commit.c:1169 parse-options.h:151

3664 msgid "when"

3665 msgstr "när"

3666

3551 -#: builtin/commit.c:1180

3667 +#: builtin/commit.c:1170

3668 msgid ""

3669 "ignore changes to submodules, optional when: all, dirty, untracked. "

3670 "(Default: all)"

@@ -3556,217 +3672,217 @@ msgstr ""

3672 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "

3673 "(Default: all)"

3674

3559 -#: builtin/commit.c:1182

3675 +#: builtin/commit.c:1172

3676 msgid "list untracked files in columns"

3677 msgstr "visa ospårade filer i spalter"

3678

3563 -#: builtin/commit.c:1256

3679 +#: builtin/commit.c:1246

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

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

3682

3567 -#: builtin/commit.c:1258

3683 +#: builtin/commit.c:1248

3684 msgid "could not parse newly created commit"

3685 msgstr "kunde inte tolka en precis skapad incheckning"

3686

3571 -#: builtin/commit.c:1299

3687 +#: builtin/commit.c:1289

3688 msgid "detached HEAD"

3689 msgstr "frånkopplad HEAD"

3690

3575 -#: builtin/commit.c:1301

3691 +#: builtin/commit.c:1291

3692 msgid " (root-commit)"

3693 msgstr " (rotincheckning)"

3694

3579 -#: builtin/commit.c:1370

3695 +#: builtin/commit.c:1358

3696 msgid "suppress summary after successful commit"

3697 msgstr "undertryck sammanfattning efter framgångsrik incheckning"

3698

3583 -#: builtin/commit.c:1371

3699 +#: builtin/commit.c:1359

3700 msgid "show diff in commit message template"

3701 msgstr "visa diff i mallen för incheckningsmeddelandet"

3702

3587 -#: builtin/commit.c:1373

3703 +#: builtin/commit.c:1361

3704 msgid "Commit message options"

3705 msgstr "Alternativ för incheckningsmeddelande"

3706

3591 -#: builtin/commit.c:1374 builtin/tag.c:459

3707 +#: builtin/commit.c:1362 builtin/tag.c:457

3708 msgid "read message from file"

3709 msgstr "läs meddelande från fil"

3710

3595 -#: builtin/commit.c:1375

3711 +#: builtin/commit.c:1363

3712 msgid "author"

3713 msgstr "författare"

3714

3599 -#: builtin/commit.c:1375

3715 +#: builtin/commit.c:1363

3716 msgid "override author for commit"

3717 msgstr "överstyr författare för incheckningen"

3718

3603 -#: builtin/commit.c:1376 builtin/gc.c:178

3719 +#: builtin/commit.c:1364 builtin/gc.c:178

3720 msgid "date"

3721 msgstr "datum"

3722

3607 -#: builtin/commit.c:1376

3723 +#: builtin/commit.c:1364

3724 msgid "override date for commit"

3725 msgstr "överstyr datum för inchecknignen"

3726

3611 -#: builtin/commit.c:1377 builtin/merge.c:206 builtin/notes.c:537

3612 -#: builtin/notes.c:694 builtin/tag.c:457

3727 +#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533

3728 +#: builtin/notes.c:690 builtin/tag.c:455

3729 msgid "message"

3730 msgstr "meddelande"

3731

3616 -#: builtin/commit.c:1377

3732 +#: builtin/commit.c:1365

3733 msgid "commit message"

3734 msgstr "incheckningsmeddelande"

3735

3620 -#: builtin/commit.c:1378

3736 +#: builtin/commit.c:1366

3737 msgid "reuse and edit message from specified commit"

3738 msgstr "återanvänd och redigera meddelande från angiven incheckning"

3739

3624 -#: builtin/commit.c:1379

3740 +#: builtin/commit.c:1367

3741 msgid "reuse message from specified commit"

3742 msgstr "återanvänd meddelande från angiven incheckning"

3743

3628 -#: builtin/commit.c:1380

3744 +#: builtin/commit.c:1368

3745 msgid "use autosquash formatted message to fixup specified commit"

3746 msgstr ""

3747 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"

3748

3633 -#: builtin/commit.c:1381

3749 +#: builtin/commit.c:1369

3750 msgid "use autosquash formatted message to squash specified commit"

3751 msgstr ""

3752 "använd autosquash-formaterat meddelande för att slå ihop med angiven "

3753 "incheckning"

3754

3639 -#: builtin/commit.c:1382

3755 +#: builtin/commit.c:1370

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

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

3758

3643 -#: builtin/commit.c:1383 builtin/log.c:1102 builtin/revert.c:109

3759 +#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109

3760 msgid "add Signed-off-by:"

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

3762

3647 -#: builtin/commit.c:1384

3763 +#: builtin/commit.c:1372

3764 msgid "use specified template file"

3765 msgstr "använd angiven mallfil"

3766

3651 -#: builtin/commit.c:1385

3767 +#: builtin/commit.c:1373

3768 msgid "force edit of commit"

3769 msgstr "tvinga redigering av incheckning"

3770

3655 -#: builtin/commit.c:1386

3771 +#: builtin/commit.c:1374

3772 msgid "default"

3773 msgstr "standard"

3774

3659 -#: builtin/commit.c:1386 builtin/tag.c:462

3775 +#: builtin/commit.c:1374 builtin/tag.c:460

3776 msgid "how to strip spaces and #comments from message"

3777 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

3778

3663 -#: builtin/commit.c:1387

3779 +#: builtin/commit.c:1375

3780 msgid "include status in commit message template"

3781 msgstr "inkludera status i mallen för incheckningsmeddelandet"

3782

3667 -#: builtin/commit.c:1388 builtin/merge.c:213 builtin/tag.c:463

3783 +#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461

3784 msgid "key id"

3785 msgstr "nyckel-id"

3786

3671 -#: builtin/commit.c:1389 builtin/merge.c:214

3787 +#: builtin/commit.c:1377 builtin/merge.c:214

3788 msgid "GPG sign commit"

3789 msgstr "GPG-signera incheckning"

3790

3791 #. end commit message options

3676 -#: builtin/commit.c:1392

3792 +#: builtin/commit.c:1380

3793 msgid "Commit contents options"

3794 msgstr "Alternativ för incheckningens innehåll"

3795

3680 -#: builtin/commit.c:1393

3796 +#: builtin/commit.c:1381

3797 msgid "commit all changed files"

3798 msgstr "checka in alla ändrade filer"

3799

3684 -#: builtin/commit.c:1394

3800 +#: builtin/commit.c:1382

3801 msgid "add specified files to index for commit"

3802 msgstr "lägg till angivna filer till indexet för incheckning"

3803

3688 -#: builtin/commit.c:1395

3804 +#: builtin/commit.c:1383

3805 msgid "interactively add files"

3806 msgstr "lägg till filer interaktivt"

3807

3692 -#: builtin/commit.c:1396

3808 +#: builtin/commit.c:1384

3809 msgid "interactively add changes"

3810 msgstr "lägg till ändringar interaktivt"

3811

3696 -#: builtin/commit.c:1397

3812 +#: builtin/commit.c:1385

3813 msgid "commit only specified files"

3814 msgstr "checka endast in angivna filer"

3815

3700 -#: builtin/commit.c:1398

3816 +#: builtin/commit.c:1386

3817 msgid "bypass pre-commit hook"

3818 msgstr "förbigå pre-commit-krok"

3819

3704 -#: builtin/commit.c:1399

3820 +#: builtin/commit.c:1387

3821 msgid "show what would be committed"

3822 msgstr "visa vad som skulle checkas in"

3823

3708 -#: builtin/commit.c:1410

3824 +#: builtin/commit.c:1398

3825 msgid "amend previous commit"

3826 msgstr "lägg till föregående incheckning"

3827

3712 -#: builtin/commit.c:1411

3828 +#: builtin/commit.c:1399

3829 msgid "bypass post-rewrite hook"

3830 msgstr "förbigå post-rewrite-krok"

3831

3716 -#: builtin/commit.c:1416

3832 +#: builtin/commit.c:1404

3833 msgid "ok to record an empty change"

3834 msgstr "ok att registrera en tom ändring"

3835

3720 -#: builtin/commit.c:1419

3836 +#: builtin/commit.c:1407

3837 msgid "ok to record a change with an empty message"

3838 msgstr "ok att registrera en ändring med tomt meddelande"

3839

3724 -#: builtin/commit.c:1451

3840 +#: builtin/commit.c:1439

3841 msgid "could not parse HEAD commit"

3842 msgstr "kunde inte tolka HEAD:s incheckning"

3843

3728 -#: builtin/commit.c:1489 builtin/merge.c:508

3844 +#: builtin/commit.c:1477 builtin/merge.c:508

3845 #, c-format

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

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

3848

3733 -#: builtin/commit.c:1496

3849 +#: builtin/commit.c:1484

3850 #, c-format

3851 msgid "Corrupt MERGE_HEAD file (%s)"

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

3853

3738 -#: builtin/commit.c:1503

3854 +#: builtin/commit.c:1491

3855 msgid "could not read MERGE_MODE"

3856 msgstr "kunde inte läsa MERGE_MODE"

3857

3742 -#: builtin/commit.c:1522

3858 +#: builtin/commit.c:1510

3859 #, c-format

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

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

3862

3747 -#: builtin/commit.c:1536

3863 +#: builtin/commit.c:1524

3864 #, c-format

3865 msgid "Aborting commit; you did not edit the message.\n"

3866 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"

3867

3752 -#: builtin/commit.c:1541

3868 +#: builtin/commit.c:1529

3869 #, c-format

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

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

3872

3757 -#: builtin/commit.c:1556 builtin/merge.c:833 builtin/merge.c:858

3873 +#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857

3874 msgid "failed to write commit object"

3875 msgstr "kunde inte skriva incheckningsobjekt"

3876

3761 -#: builtin/commit.c:1577

3877 +#: builtin/commit.c:1565

3878 msgid "cannot lock HEAD ref"

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

3880

3765 -#: builtin/commit.c:1581

3881 +#: builtin/commit.c:1569

3882 msgid "cannot update HEAD ref"

3883 msgstr "kunde inte uppdatera HEAD-referens"

3884

3769 -#: builtin/commit.c:1592

3885 +#: builtin/commit.c:1580

3886 msgid ""

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

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

@@ -4175,88 +4291,92 @@ msgstr "tillåt uppdatering av HEAD-referens"

4291 msgid "deepen history of shallow clone"

4292 msgstr "fördjupa historik för grund klon"

4293

4178 -#: builtin/fetch.c:85 builtin/log.c:1119

4294 +#: builtin/fetch.c:86

4295 +msgid "convert to a complete repository"

4296 +msgstr "konvertera till komplett arkiv"

4297 +

4298 +#: builtin/fetch.c:88 builtin/log.c:1119

4299 msgid "dir"

4300 msgstr "kat"

4301

4182 -#: builtin/fetch.c:86

4302 +#: builtin/fetch.c:89

4303 msgid "prepend this to submodule path output"

4304 msgstr "lägg till i början av undermodulens sökvägsutdata"

4305

4186 -#: builtin/fetch.c:89

4306 +#: builtin/fetch.c:92

4307 msgid "default mode for recursion"

4308 msgstr "standardläge för rekursion"

4309

4190 -#: builtin/fetch.c:201

4310 +#: builtin/fetch.c:204

4311 msgid "Couldn't find remote ref HEAD"

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

4313

4194 -#: builtin/fetch.c:254

4314 +#: builtin/fetch.c:257

4315 #, c-format

4316 msgid "object %s not found"

4317 msgstr "objektet %s hittades inte"

4318

4199 -#: builtin/fetch.c:259

4319 +#: builtin/fetch.c:262

4320 msgid "[up to date]"

4321 msgstr "[àjour]"

4322

4203 -#: builtin/fetch.c:273

4323 +#: builtin/fetch.c:276

4324 #, c-format

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

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

4327

4208 -#: builtin/fetch.c:274 builtin/fetch.c:360

4328 +#: builtin/fetch.c:277 builtin/fetch.c:363

4329 msgid "[rejected]"

4330 msgstr "[refuserad]"

4331

4212 -#: builtin/fetch.c:285

4332 +#: builtin/fetch.c:288

4333 msgid "[tag update]"

4334 msgstr "[uppdaterad tagg]"

4335

4216 -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340

4336 +#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343

4337 msgid " (unable to update local ref)"

4338 msgstr " (kunde inte uppdatera lokal ref)"

4339

4220 -#: builtin/fetch.c:305

4340 +#: builtin/fetch.c:308

4341 msgid "[new tag]"

4342 msgstr "[ny tagg]"

4343

4224 -#: builtin/fetch.c:308

4344 +#: builtin/fetch.c:311

4345 msgid "[new branch]"

4346 msgstr "[ny gren]"

4347

4228 -#: builtin/fetch.c:311

4348 +#: builtin/fetch.c:314

4349 msgid "[new ref]"

4350 msgstr "[ny ref]"

4351

4232 -#: builtin/fetch.c:356

4352 +#: builtin/fetch.c:359

4353 msgid "unable to update local ref"

4354 msgstr "kunde inte uppdatera lokal ref"

4355

4236 -#: builtin/fetch.c:356

4356 +#: builtin/fetch.c:359

4357 msgid "forced update"

4358 msgstr "tvingad uppdatering"

4359

4240 -#: builtin/fetch.c:362

4360 +#: builtin/fetch.c:365

4361 msgid "(non-fast-forward)"

4362 msgstr "(ej snabbspolad)"

4363

4244 -#: builtin/fetch.c:393 builtin/fetch.c:685

4364 +#: builtin/fetch.c:396 builtin/fetch.c:688

4365 #, c-format

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

4367 msgstr "kan inte öppna %s: %s\n"

4368

4249 -#: builtin/fetch.c:402

4369 +#: builtin/fetch.c:405

4370 #, c-format

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

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

4373

4254 -#: builtin/fetch.c:488

4374 +#: builtin/fetch.c:491

4375 #, c-format

4376 msgid "From %.*s\n"

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

4378

4259 -#: builtin/fetch.c:499

4379 +#: builtin/fetch.c:502

4380 #, c-format

4381 msgid ""

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

@@ -4265,55 +4385,55 @@ msgstr ""

4385 "vissa lokala referenser kunde inte uppdateras; testa att köra\n"

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

4387

4268 -#: builtin/fetch.c:549

4388 +#: builtin/fetch.c:552

4389 #, c-format

4390 msgid " (%s will become dangling)"

4391 msgstr " (%s kommer bli dinglande)"

4392

4273 -#: builtin/fetch.c:550

4393 +#: builtin/fetch.c:553

4394 #, c-format

4395 msgid " (%s has become dangling)"

4396 msgstr " (%s har blivit dinglande)"

4397

4278 -#: builtin/fetch.c:557

4398 +#: builtin/fetch.c:560

4399 msgid "[deleted]"

4400 msgstr "[borttagen]"

4401

4282 -#: builtin/fetch.c:558 builtin/remote.c:1055

4402 +#: builtin/fetch.c:561 builtin/remote.c:1055

4403 msgid "(none)"

4404 msgstr "(ingen)"

4405

4286 -#: builtin/fetch.c:675

4406 +#: builtin/fetch.c:678

4407 #, c-format

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

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

4410

4291 -#: builtin/fetch.c:709

4411 +#: builtin/fetch.c:712

4412 #, c-format

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

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

4415

4296 -#: builtin/fetch.c:786

4416 +#: builtin/fetch.c:789

4417 #, c-format

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

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

4420

4301 -#: builtin/fetch.c:789

4421 +#: builtin/fetch.c:792

4422 #, c-format

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

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

4425

4306 -#: builtin/fetch.c:891

4426 +#: builtin/fetch.c:894

4427 #, c-format

4428 msgid "Fetching %s\n"

4429 msgstr "Hämtar %s\n"

4430

4311 -#: builtin/fetch.c:893 builtin/remote.c:100

4431 +#: builtin/fetch.c:896 builtin/remote.c:100

4432 #, c-format

4433 msgid "Could not fetch %s"

4434 msgstr "Kunde inte hämta %s"

4435

4316 -#: builtin/fetch.c:912

4436 +#: builtin/fetch.c:915

4437 msgid ""

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

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

@@ -4321,24 +4441,32 @@ msgstr ""

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

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

4443

4324 -#: builtin/fetch.c:932

4444 +#: builtin/fetch.c:935

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

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

4447

4328 -#: builtin/fetch.c:984

4448 +#: builtin/fetch.c:981

4449 +msgid "--depth and --unshallow cannot be used together"

4450 +msgstr "--depth och --unshallow kan inte användas samtidigt"

4451 +

4452 +#: builtin/fetch.c:983

4453 +msgid "--unshallow on a complete repository does not make sense"

4454 +msgstr "--unshallow kan inte användas på ett komplett arkiv"

4455 +

4456 +#: builtin/fetch.c:1002

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

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

4459

4332 -#: builtin/fetch.c:986

4460 +#: builtin/fetch.c:1004

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

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

4463

4336 -#: builtin/fetch.c:997

4464 +#: builtin/fetch.c:1015

4465 #, c-format

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

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

4468

4341 -#: builtin/fetch.c:1005

4469 +#: builtin/fetch.c:1023

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

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

4472

@@ -4349,7 +4477,7 @@ msgstr ""

4477

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

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

4352 -#: builtin/tag.c:448 parse-options.h:133 parse-options.h:239

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

4481 msgid "n"

4482 msgstr "n"

4483

@@ -4710,23 +4838,23 @@ msgstr "inget mönster angavs."

4838 msgid "bad object %s"

4839 msgstr "felaktigt objekt %s"

4840

4713 -#: builtin/grep.c:866

4841 +#: builtin/grep.c:868

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

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

4844

4717 -#: builtin/grep.c:889

4845 +#: builtin/grep.c:891

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

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

4848

4721 -#: builtin/grep.c:894

4849 +#: builtin/grep.c:896

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

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

4852

4725 -#: builtin/grep.c:897

4853 +#: builtin/grep.c:899

4854 msgid "--[no-]exclude-standard cannot be used for tracked contents."

4855 msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."

4856

4729 -#: builtin/grep.c:905

4857 +#: builtin/grep.c:907

4858 msgid "both --cached and trees are given."

4859 msgstr "både --cached och träd angavs."

4860

@@ -4766,50 +4894,50 @@ msgstr "spara filen som den är utan filer"

4894 msgid "process file as it were from this path"

4895 msgstr "hantera filen som om den kom från sökvägen"

4896

4769 -#: builtin/help.c:43

4897 +#: builtin/help.c:42

4898 msgid "print all available commands"

4899 msgstr "visa alla tillgängliga kommandon"

4900

4773 -#: builtin/help.c:44

4901 +#: builtin/help.c:43

4902 msgid "show man page"

4903 msgstr "visa manualsida"

4904

4777 -#: builtin/help.c:45

4905 +#: builtin/help.c:44

4906 msgid "show manual in web browser"

4907 msgstr "visa manual i webbläsare"

4908

4781 -#: builtin/help.c:47

4909 +#: builtin/help.c:46

4910 msgid "show info page"

4911 msgstr "visa info-sida"

4912

4785 -#: builtin/help.c:53

4913 +#: builtin/help.c:52

4914 msgid "git help [--all] [--man|--web|--info] [command]"

4915 msgstr "git help [--all] [--man|--web|--info] [kommando]"

4916

4789 -#: builtin/help.c:65

4917 +#: builtin/help.c:64

4918 #, c-format

4919 msgid "unrecognized help format '%s'"

4920 msgstr "okänt hjälpformat: %s"

4921

4794 -#: builtin/help.c:93

4922 +#: builtin/help.c:92

4923 msgid "Failed to start emacsclient."

4924 msgstr "Misslyckades starta emacsclient."

4925

4798 -#: builtin/help.c:106

4926 +#: builtin/help.c:105

4927 msgid "Failed to parse emacsclient version."

4928 msgstr "Kunde inte tolka emacsclient-version."

4929

4802 -#: builtin/help.c:114

4930 +#: builtin/help.c:113

4931 #, c-format

4932 msgid "emacsclient version '%d' too old (< 22)."

4933 msgstr "emacsclient version \"%d\" för gammal (< 22)."

4934

4807 -#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177

4935 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176

4936 #, c-format

4937 msgid "failed to exec '%s': %s"

4938 msgstr "exec misslyckades för \"%s\": %s"

4939

4812 -#: builtin/help.c:217

4940 +#: builtin/help.c:216

4941 #, c-format

4942 msgid ""

4943 "'%s': path for unsupported man viewer.\n"

@@ -4818,7 +4946,7 @@ msgstr ""

4946 "\"%s\": sökväg för man-visare som ej stöds.\n"

4947 "Använd \"man.<verktyg>.cmd\" istället."

4948

4821 -#: builtin/help.c:229

4949 +#: builtin/help.c:228

4950 #, c-format

4951 msgid ""

4952 "'%s': cmd for supported man viewer.\n"

@@ -4827,29 +4955,25 @@ msgstr ""

4955 "\"%s\": kommando för man-visare som stöds.\n"

4956 "Använd \"man.<verktyg>.path\" istället."

4957

4830 -#: builtin/help.c:299

4831 -msgid "The most commonly used git commands are:"

4832 -msgstr "De mest använda git-kommandona är:"

4833 -

4834 -#: builtin/help.c:367

4958 +#: builtin/help.c:349

4959 #, c-format

4960 msgid "'%s': unknown man viewer."

4961 msgstr "\"%s\": okänd man-visare."

4962

4839 -#: builtin/help.c:384

4963 +#: builtin/help.c:366

4964 msgid "no man viewer handled the request"

4965 msgstr "ingen man-visare hanterade förfrågan"

4966

4843 -#: builtin/help.c:392

4967 +#: builtin/help.c:374

4968 msgid "no info viewer handled the request"

4969 msgstr "ingen info-visare hanterade förfrågan"

4970

4847 -#: builtin/help.c:447 builtin/help.c:454

4971 +#: builtin/help.c:429 builtin/help.c:436

4972 #, c-format

4973 msgid "usage: %s%s"

4974 msgstr "användning: %s%s"

4975

4852 -#: builtin/help.c:470

4976 +#: builtin/help.c:452

4977 #, c-format

4978 msgid "`git %s' is aliased to `%s'"

4979 msgstr "\"git %s\" är ett alias för \"%s\""

@@ -5545,95 +5669,95 @@ msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"

5669 msgid "Unknown commit %s"

5670 msgstr "Okänd incheckning %s"

5671

5548 -#: builtin/ls-files.c:408

5672 +#: builtin/ls-files.c:409

5673 msgid "git ls-files [options] [<file>...]"

5674 msgstr "git ls-files [flaggor] [<fil>...]"

5675

5552 -#: builtin/ls-files.c:463

5676 +#: builtin/ls-files.c:466

5677 msgid "identify the file status with tags"

5678 msgstr "identifiera filstatus med taggar"

5679

5556 -#: builtin/ls-files.c:465

5680 +#: builtin/ls-files.c:468

5681 msgid "use lowercase letters for 'assume unchanged' files"

5682 msgstr "använd små bokstäver för \"anta oförändrade\"-filer"

5683

5560 -#: builtin/ls-files.c:467

5684 +#: builtin/ls-files.c:470

5685 msgid "show cached files in the output (default)"

5686 msgstr "visa cachade filer i utdata (standard)"

5687

5564 -#: builtin/ls-files.c:469

5688 +#: builtin/ls-files.c:472

5689 msgid "show deleted files in the output"

5690 msgstr "visa borttagna filer i utdata"

5691

5568 -#: builtin/ls-files.c:471

5692 +#: builtin/ls-files.c:474

5693 msgid "show modified files in the output"

5694 msgstr "visa modifierade filer i utdata"

5695

5572 -#: builtin/ls-files.c:473

5696 +#: builtin/ls-files.c:476

5697 msgid "show other files in the output"

5698 msgstr "visa andra filer i utdata"

5699

5576 -#: builtin/ls-files.c:475

5700 +#: builtin/ls-files.c:478

5701 msgid "show ignored files in the output"

5702 msgstr "visa ignorerade filer i utdata"

5703

5580 -#: builtin/ls-files.c:478

5704 +#: builtin/ls-files.c:481

5705 msgid "show staged contents' object name in the output"

5706 msgstr "visa köat innehålls objektnamn i utdata"

5707

5584 -#: builtin/ls-files.c:480

5708 +#: builtin/ls-files.c:483

5709 msgid "show files on the filesystem that need to be removed"

5710 msgstr "visa filer i filsystemet som behöver tas bort"

5711

5588 -#: builtin/ls-files.c:482

5712 +#: builtin/ls-files.c:485

5713 msgid "show 'other' directories' name only"

5714 msgstr "visa endast namn för \"andra\" kataloger"

5715

5592 -#: builtin/ls-files.c:485

5716 +#: builtin/ls-files.c:488

5717 msgid "don't show empty directories"

5718 msgstr "visa inte tomma kataloger"

5719

5596 -#: builtin/ls-files.c:488

5720 +#: builtin/ls-files.c:491

5721 msgid "show unmerged files in the output"

5722 msgstr "visa ej sammanslagna filer i utdata"

5723

5600 -#: builtin/ls-files.c:490

5724 +#: builtin/ls-files.c:493

5725 msgid "show resolve-undo information"

5726 msgstr "visa \"resolve-undo\"-information"

5727

5604 -#: builtin/ls-files.c:492

5728 +#: builtin/ls-files.c:495

5729 msgid "skip files matching pattern"

5730 msgstr "hoppa över filer som motsvarar mönster"

5731

5608 -#: builtin/ls-files.c:495

5732 +#: builtin/ls-files.c:498

5733 msgid "exclude patterns are read from <file>"

5734 msgstr "exkludera mönster som läses från <fil>"

5735

5612 -#: builtin/ls-files.c:498

5736 +#: builtin/ls-files.c:501

5737 msgid "read additional per-directory exclude patterns in <file>"

5738 msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"

5739

5616 -#: builtin/ls-files.c:500

5740 +#: builtin/ls-files.c:503

5741 msgid "add the standard git exclusions"

5742 msgstr "lägg till git:s standardexkluderingar"

5743

5620 -#: builtin/ls-files.c:503

5744 +#: builtin/ls-files.c:506

5745 msgid "make the output relative to the project top directory"

5746 msgstr "gör utdata relativ till projektets toppkatalog"

5747

5624 -#: builtin/ls-files.c:506

5748 +#: builtin/ls-files.c:509

5749 msgid "if any <file> is not in the index, treat this as an error"

5750 msgstr "om en <fil> inte är indexet, betrakta det som ett fel"

5751

5628 -#: builtin/ls-files.c:507

5752 +#: builtin/ls-files.c:510

5753 msgid "tree-ish"

5754 msgstr "träd-igt"

5755

5632 -#: builtin/ls-files.c:508

5756 +#: builtin/ls-files.c:511

5757 msgid "pretend that paths removed since <tree-ish> are still present"

5758 msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"

5759

5636 -#: builtin/ls-files.c:510

5760 +#: builtin/ls-files.c:513

5761 msgid "show debugging data"

5762 msgstr "visa felsökningsutdata"

5763

@@ -5741,7 +5865,7 @@ msgstr "tillåt snabbspolning (standard)"

5865 msgid "abort if fast-forward is not possible"

5866 msgstr "avbryt om snabbspolning inte är möjlig"

5867

5744 -#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112

5868 +#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112

5869 msgid "strategy"

5870 msgstr "strategi"

5871

@@ -5845,67 +5969,68 @@ msgstr ""

5969 "den.\n"

5970

5971 #: builtin/merge.c:788

5972 +#, c-format

5973 msgid ""

5974 "Please enter a commit message to explain why this merge is necessary,\n"

5975 "especially if it merges an updated upstream into a topic branch.\n"

5976 "\n"

5852 -"Lines starting with '#' will be ignored, and an empty message aborts\n"

5977 +"Lines starting with '%c' will be ignored, and an empty message aborts\n"

5978 "the commit.\n"

5979 msgstr ""

5980 "Ange ett incheckningsmeddelande för att förklara varför sammanslagningen\n"

5981 "är nödvändig, speciellt om den slår in en uppdaterad uppström i en\n"

5982 "temagren.\n"

5983 "\n"

5859 -"Rader som inleds med \"#\" kommer ignoreras, och ett tomt meddelande\n"

5984 +"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"

5985 "avbryter incheckningen.\n"

5986

5862 -#: builtin/merge.c:813

5987 +#: builtin/merge.c:812

5988 msgid "Empty commit message."

5989 msgstr "Tomt incheckningsmeddelande."

5990

5866 -#: builtin/merge.c:825

5991 +#: builtin/merge.c:824

5992 #, c-format

5993 msgid "Wonderful.\n"

5994 msgstr "Underbart.\n"

5995

5871 -#: builtin/merge.c:890

5996 +#: builtin/merge.c:889

5997 #, c-format

5998 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

5999 msgstr ""

6000 "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"

6001

5877 -#: builtin/merge.c:906

6002 +#: builtin/merge.c:905

6003 #, c-format

6004 msgid "'%s' is not a commit"

6005 msgstr "\"%s\" är inte en incheckning"

6006

5882 -#: builtin/merge.c:947

6007 +#: builtin/merge.c:946

6008 msgid "No current branch."

6009 msgstr "Inte på någon gren."

6010

5886 -#: builtin/merge.c:949

6011 +#: builtin/merge.c:948

6012 msgid "No remote for the current branch."

6013 msgstr "Ingen fjärr för aktuell gren."

6014

5890 -#: builtin/merge.c:951

6015 +#: builtin/merge.c:950

6016 msgid "No default upstream defined for the current branch."

6017 msgstr "Ingen standarduppström angiven för aktuell gren."

6018

5894 -#: builtin/merge.c:956

6019 +#: builtin/merge.c:955

6020 #, c-format

6021 msgid "No remote tracking branch for %s from %s"

6022 msgstr "Ingen fjärrspårande gren för %s från %s"

6023

5899 -#: builtin/merge.c:1043 builtin/merge.c:1200

6024 +#: builtin/merge.c:1042 builtin/merge.c:1199

6025 #, c-format

6026 msgid "%s - not something we can merge"

6027 msgstr "%s - inte något vi kan slå ihop"

6028

5904 -#: builtin/merge.c:1111

6029 +#: builtin/merge.c:1110

6030 msgid "There is no merge to abort (MERGE_HEAD missing)."

6031 msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)."

6032

5908 -#: builtin/merge.c:1127 git-pull.sh:31

6033 +#: builtin/merge.c:1126 git-pull.sh:31

6034 msgid ""

6035 "You have not concluded your merge (MERGE_HEAD exists).\n"

6036 "Please, commit your changes before you can merge."

@@ -5913,11 +6038,11 @@ msgstr ""

6038 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"

6039 "Checka in dina ändringar innan du kan slå ihop."

6040

5916 -#: builtin/merge.c:1130 git-pull.sh:34

6041 +#: builtin/merge.c:1129 git-pull.sh:34

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

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

6044

5920 -#: builtin/merge.c:1134

6045 +#: builtin/merge.c:1133

6046 msgid ""

6047 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

6048 "Please, commit your changes before you can merge."

@@ -5925,79 +6050,79 @@ msgstr ""

6050 "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"

6051 "Checka in dina ändringar innan du kan slå ihop."

6052

5928 -#: builtin/merge.c:1137

6053 +#: builtin/merge.c:1136

6054 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

6055 msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."

6056

5932 -#: builtin/merge.c:1146

6057 +#: builtin/merge.c:1145

6058 msgid "You cannot combine --squash with --no-ff."

6059 msgstr "Du kan inte kombinera --squash med --no-ff."

6060

5936 -#: builtin/merge.c:1151

6061 +#: builtin/merge.c:1150

6062 msgid "You cannot combine --no-ff with --ff-only."

6063 msgstr "Du kan inte kombinera --no-ff med --ff-only."

6064

5940 -#: builtin/merge.c:1158

6065 +#: builtin/merge.c:1157

6066 msgid "No commit specified and merge.defaultToUpstream not set."

6067 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."

6068

5944 -#: builtin/merge.c:1190

6069 +#: builtin/merge.c:1189

6070 msgid "Can merge only exactly one commit into empty head"

6071 msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."

6072

5948 -#: builtin/merge.c:1193

6073 +#: builtin/merge.c:1192

6074 msgid "Squash commit into empty head not supported yet"

6075 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"

6076

5952 -#: builtin/merge.c:1195

6077 +#: builtin/merge.c:1194

6078 msgid "Non-fast-forward commit does not make sense into an empty head"

6079 msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"

6080

5956 -#: builtin/merge.c:1311

6081 +#: builtin/merge.c:1310

6082 #, c-format

6083 msgid "Updating %s..%s\n"

6084 msgstr "Uppdaterar %s..%s\n"

6085

5961 -#: builtin/merge.c:1350

6086 +#: builtin/merge.c:1349

6087 #, c-format

6088 msgid "Trying really trivial in-index merge...\n"

6089 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"

6090

5966 -#: builtin/merge.c:1357

6091 +#: builtin/merge.c:1356

6092 #, c-format

6093 msgid "Nope.\n"

6094 msgstr "Nej.\n"

6095

5971 -#: builtin/merge.c:1389

6096 +#: builtin/merge.c:1388

6097 msgid "Not possible to fast-forward, aborting."

6098 msgstr "Kan inte snabbspola, avbryter."

6099

5975 -#: builtin/merge.c:1412 builtin/merge.c:1491

6100 +#: builtin/merge.c:1411 builtin/merge.c:1490

6101 #, c-format

6102 msgid "Rewinding the tree to pristine...\n"

6103 msgstr "Återspolar trädet till orört...\n"

6104

5980 -#: builtin/merge.c:1416

6105 +#: builtin/merge.c:1415

6106 #, c-format

6107 msgid "Trying merge strategy %s...\n"

6108 msgstr "Försöker sammanslagninsstrategin %s...\n"

6109

5985 -#: builtin/merge.c:1482

6110 +#: builtin/merge.c:1481

6111 #, c-format

6112 msgid "No merge strategy handled the merge.\n"

6113 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"

6114

5990 -#: builtin/merge.c:1484

6115 +#: builtin/merge.c:1483

6116 #, c-format

6117 msgid "Merge with strategy %s failed.\n"

6118 msgstr "Sammanslagning med strategin %s misslyckades.\n"

6119

5995 -#: builtin/merge.c:1493

6120 +#: builtin/merge.c:1492

6121 #, c-format

6122 msgid "Using the %s to prepare resolving by hand.\n"

6123 msgstr "Använder %s för att förbereda lösning för hand.\n"

6124

6000 -#: builtin/merge.c:1505

6125 +#: builtin/merge.c:1504

6126 #, c-format

6127 msgid "Automatic merge went well; stopped before committing as requested\n"

6128 msgstr ""

@@ -6312,139 +6437,134 @@ msgstr "git notes prune [<flaggor>]"

6437 msgid "git notes get-ref"

6438 msgstr "git notes get-ref"

6439

6315 -#: builtin/notes.c:142

6440 +#: builtin/notes.c:139

6441 #, c-format

6442 msgid "unable to start 'show' for object '%s'"

6443 msgstr "kunde inte starta \"show\" för objektet \"%s\""

6444

6320 -#: builtin/notes.c:148

6321 -msgid "can't fdopen 'show' output fd"

6322 -msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag"

6323 -

6324 -#: builtin/notes.c:158

6325 -#, c-format

6326 -msgid "failed to close pipe to 'show' for object '%s'"

6327 -msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\""

6445 +#: builtin/notes.c:143

6446 +msgid "could not read 'show' output"

6447 +msgstr "kunde inte läsa utdata från \"show\""

6448

6329 -#: builtin/notes.c:161

6449 +#: builtin/notes.c:151

6450 #, c-format

6451 msgid "failed to finish 'show' for object '%s'"

6452 msgstr "kunde inte avsluta \"show\" för objektet \"%s\""

6453

6334 -#: builtin/notes.c:178 builtin/tag.c:347

6454 +#: builtin/notes.c:169 builtin/tag.c:341

6455 #, c-format

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

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

6458

6339 -#: builtin/notes.c:192

6459 +#: builtin/notes.c:188

6460 msgid "Please supply the note contents using either -m or -F option"

6461 msgstr "Ange innehåll för anteckningen med antingen -m eller -F"

6462

6343 -#: builtin/notes.c:213 builtin/notes.c:976

6463 +#: builtin/notes.c:209 builtin/notes.c:972

6464 #, c-format

6465 msgid "Removing note for object %s\n"

6466 msgstr "Tar bort anteckning för objektet %s\n"

6467

6348 -#: builtin/notes.c:218

6468 +#: builtin/notes.c:214

6469 msgid "unable to write note object"

6470 msgstr "kunde inte skriva anteckningsobjekt"

6471

6352 -#: builtin/notes.c:220

6472 +#: builtin/notes.c:216

6473 #, c-format

6474 msgid "The note contents has been left in %s"

6475 msgstr "Anteckningens innehåll har lämnats kvar i %s"

6476

6357 -#: builtin/notes.c:254 builtin/tag.c:542

6477 +#: builtin/notes.c:250 builtin/tag.c:540

6478 #, c-format

6479 msgid "cannot read '%s'"

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

6481

6362 -#: builtin/notes.c:256 builtin/tag.c:545

6482 +#: builtin/notes.c:252 builtin/tag.c:543

6483 #, c-format

6484 msgid "could not open or read '%s'"

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

6486

6367 -#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450

6368 -#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647

6369 -#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769

6370 -#: builtin/notes.c:971 builtin/tag.c:558

6487 +#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446

6488 +#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643

6489 +#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765

6490 +#: builtin/notes.c:967 builtin/tag.c:556

6491 #, c-format

6492 msgid "Failed to resolve '%s' as a valid ref."

6493 msgstr "Kunde inte slå upp \"%s\" som en giltig referens."

6494

6375 -#: builtin/notes.c:278

6495 +#: builtin/notes.c:274

6496 #, c-format

6497 msgid "Failed to read object '%s'."

6498 msgstr "Kunde inte läsa objektet \"%s\"."

6499

6380 -#: builtin/notes.c:302

6500 +#: builtin/notes.c:298

6501 msgid "Cannot commit uninitialized/unreferenced notes tree"

6502 msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"

6503

6384 -#: builtin/notes.c:343

6504 +#: builtin/notes.c:339

6505 #, c-format

6506 msgid "Bad notes.rewriteMode value: '%s'"

6507 msgstr "Felaktigt värde för notes.rewriteMode: '%s'"

6508

6389 -#: builtin/notes.c:353

6509 +#: builtin/notes.c:349

6510 #, c-format

6511 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

6512 msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"

6513

6514 #. TRANSLATORS: The first %s is the name of the

6515 #. environment variable, the second %s is its value

6396 -#: builtin/notes.c:380

6516 +#: builtin/notes.c:376

6517 #, c-format

6518 msgid "Bad %s value: '%s'"

6519 msgstr "Felaktigt värde på %s: \"%s\""

6520

6401 -#: builtin/notes.c:444

6521 +#: builtin/notes.c:440

6522 #, c-format

6523 msgid "Malformed input line: '%s'."

6524 msgstr "Felaktig indatarad: \"%s\"."

6525

6406 -#: builtin/notes.c:459

6526 +#: builtin/notes.c:455

6527 #, c-format

6528 msgid "Failed to copy notes from '%s' to '%s'"

6529 msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""

6530

6411 -#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630

6412 -#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762

6413 -#: builtin/notes.c:1036

6531 +#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626

6532 +#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758

6533 +#: builtin/notes.c:1032

6534 msgid "too many parameters"

6535 msgstr "för många parametrar"

6536

6417 -#: builtin/notes.c:516 builtin/notes.c:775

6537 +#: builtin/notes.c:512 builtin/notes.c:771

6538 #, c-format

6539 msgid "No note found for object %s."

6540 msgstr "Inga anteckningar hittades för objektet %s."

6541

6422 -#: builtin/notes.c:538 builtin/notes.c:695

6542 +#: builtin/notes.c:534 builtin/notes.c:691

6543 msgid "note contents as a string"

6544 msgstr "anteckningsinnehåll som sträng"

6545

6426 -#: builtin/notes.c:541 builtin/notes.c:698

6546 +#: builtin/notes.c:537 builtin/notes.c:694

6547 msgid "note contents in a file"

6548 msgstr "anteckningsinnehåll i en fil"

6549

6430 -#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700

6431 -#: builtin/notes.c:703 builtin/tag.c:476

6550 +#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696

6551 +#: builtin/notes.c:699 builtin/tag.c:474

6552 msgid "object"

6553 msgstr "objekt"

6554

6435 -#: builtin/notes.c:544 builtin/notes.c:701

6555 +#: builtin/notes.c:540 builtin/notes.c:697

6556 msgid "reuse and edit specified note object"

6557 msgstr "återanvänd och redigera angivet anteckningsobjekt"

6558

6439 -#: builtin/notes.c:547 builtin/notes.c:704

6559 +#: builtin/notes.c:543 builtin/notes.c:700

6560 msgid "reuse specified note object"

6561 msgstr "återanvänd angivet anteckningsobjekt"

6562

6443 -#: builtin/notes.c:549 builtin/notes.c:617

6563 +#: builtin/notes.c:545 builtin/notes.c:613

6564 msgid "replace existing notes"

6565 msgstr "ersätt befintliga anteckningar"

6566

6447 -#: builtin/notes.c:583

6567 +#: builtin/notes.c:579

6568 #, c-format

6569 msgid ""

6570 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "

@@ -6453,24 +6573,24 @@ msgstr ""

6573 "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för "

6574 "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar"

6575

6456 -#: builtin/notes.c:588 builtin/notes.c:665

6576 +#: builtin/notes.c:584 builtin/notes.c:661

6577 #, c-format

6578 msgid "Overwriting existing notes for object %s\n"

6579 msgstr "Skriver över befintliga anteckningar för objektet %s\n"

6580

6461 -#: builtin/notes.c:618

6581 +#: builtin/notes.c:614

6582 msgid "read objects from stdin"

6583 msgstr "läs objekt från standard in"

6584

6465 -#: builtin/notes.c:620

6585 +#: builtin/notes.c:616

6586 msgid "load rewriting config for <command> (implies --stdin)"

6587 msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"

6588

6469 -#: builtin/notes.c:638

6589 +#: builtin/notes.c:634

6590 msgid "too few parameters"

6591 msgstr "för få parametrar"

6592

6473 -#: builtin/notes.c:659

6593 +#: builtin/notes.c:655

6594 #, c-format

6595 msgid ""

6596 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "

@@ -6479,12 +6599,12 @@ msgstr ""

6599 "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "

6600 "%s. Använd \"-f\" för att skriva över befintliga anteckningar"

6601

6482 -#: builtin/notes.c:671

6602 +#: builtin/notes.c:667

6603 #, c-format

6604 msgid "Missing notes on source object %s. Cannot copy."

6605 msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera."

6606

6487 -#: builtin/notes.c:720

6607 +#: builtin/notes.c:716

6608 #, c-format

6609 msgid ""

6610 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"

@@ -6493,15 +6613,15 @@ msgstr ""

6613 "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"

6614 "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"

6615

6496 -#: builtin/notes.c:867

6616 +#: builtin/notes.c:863

6617 msgid "General options"

6618 msgstr "Allmänna flaggor"

6619

6500 -#: builtin/notes.c:869

6620 +#: builtin/notes.c:865

6621 msgid "Merge options"

6622 msgstr "Flaggor för sammanslagning"

6623

6504 -#: builtin/notes.c:871

6624 +#: builtin/notes.c:867

6625 msgid ""

6626 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"

6627 "cat_sort_uniq)"

@@ -6509,46 +6629,46 @@ msgstr ""

6629 "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"

6630 "cat_sort_uniq)"

6631

6512 -#: builtin/notes.c:873

6632 +#: builtin/notes.c:869

6633 msgid "Committing unmerged notes"

6634 msgstr "Checkar in ej sammanslagna anteckningar"

6635

6516 -#: builtin/notes.c:875

6636 +#: builtin/notes.c:871

6637 msgid "finalize notes merge by committing unmerged notes"

6638 msgstr ""

6639 "färdigställ sammanslagning av anteckningar genom att checka in ej "

6640 "sammanslagna anteckningar"

6641

6522 -#: builtin/notes.c:877

6642 +#: builtin/notes.c:873

6643 msgid "Aborting notes merge resolution"

6644 msgstr "Avbryt lösning av sammanslagning av anteckningar"

6645

6526 -#: builtin/notes.c:879

6646 +#: builtin/notes.c:875

6647 msgid "abort notes merge"

6648 msgstr "avbryt sammanslagning av anteckningar"

6649

6530 -#: builtin/notes.c:974

6650 +#: builtin/notes.c:970

6651 #, c-format

6652 msgid "Object %s has no note\n"

6653 msgstr "Objektet %s har ingen anteckning\n"

6654

6535 -#: builtin/notes.c:986

6655 +#: builtin/notes.c:982

6656 msgid "attempt to remove non-existent note is not an error"

6657 msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"

6658

6539 -#: builtin/notes.c:989

6659 +#: builtin/notes.c:985

6660 msgid "read object names from the standard input"

6661 msgstr "läs objektnamn från standard in"

6662

6543 -#: builtin/notes.c:1070

6663 +#: builtin/notes.c:1066

6664 msgid "notes_ref"

6665 msgstr "anteckningar-ref"

6666

6547 -#: builtin/notes.c:1071

6667 +#: builtin/notes.c:1067

6668 msgid "use notes from <notes_ref>"

6669 msgstr "använd anteckningar från <anteckningsref>"

6670

6551 -#: builtin/notes.c:1106 builtin/remote.c:1598

6671 +#: builtin/notes.c:1102 builtin/remote.c:1598

6672 #, c-format

6673 msgid "Unknown subcommand: %s"

6674 msgstr "Okänt underkommando: %s"

@@ -6909,28 +7029,49 @@ msgstr ""

7029

7030 #: builtin/push.c:224

7031 msgid ""

6912 -"Updates were rejected because the destination reference already exists\n"

6913 -"in the remote."

7032 +"Updates were rejected because the remote contains work that you do\n"

7033 +"not have locally. This is usually caused by another repository pushing\n"

7034 +"to the same ref. You may want to first merge the remote changes (e.g.,\n"

7035 +"'git pull') before pushing again.\n"

7036 +"See the 'Note about fast-forwards' in 'git push --help' for details."

7037 +msgstr ""

7038 +"Uppdateringar avvisades då fjärren innehåller ändringar som du inte\n"

7039 +"har lokalt. Det beror oftast på att ett annat arkiv har sänt in samma\n"

7040 +"referenser. Det kan vara en idé att först slå ihop fjärrändringarna\n"

7041 +"(t.ex. \"git pull\") innan du sänder igen.\n"

7042 +"Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer."

7043 +

7044 +#: builtin/push.c:231

7045 +msgid "Updates were rejected because the tag already exists in the remote."

7046 +msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren."

7047 +

7048 +#: builtin/push.c:234

7049 +msgid ""

7050 +"You cannot update a remote ref that points at a non-commit object,\n"

7051 +"or update a remote ref to make it point at a non-commit object,\n"

7052 +"without using the '--force' option.\n"

7053 msgstr ""

6915 -"Uppdateringarna avvisades eftersom målreferensen redan finns på\n"

6916 -"fjärren."

7054 +"Du kan inte uppdatera en fjärr-referens som pekar på ett objekt som\n"

7055 +"inte är en incheckning, eller uppdatera en fjärr-referens så att den\n"

7056 +"pekar på något som inte är en incheckning, utan att använda flaggan\n"

7057 +"\"--force\".\n"

7058

6918 -#: builtin/push.c:269

7059 +#: builtin/push.c:294

7060 #, c-format

7061 msgid "Pushing to %s\n"

7062 msgstr "Sänder till %s\n"

7063

6923 -#: builtin/push.c:273

7064 +#: builtin/push.c:298

7065 #, c-format

7066 msgid "failed to push some refs to '%s'"

7067 msgstr "misslyckades sända vissa referenser till \"%s\""

7068

6928 -#: builtin/push.c:302

7069 +#: builtin/push.c:331

7070 #, c-format

7071 msgid "bad repository '%s'"

7072 msgstr "felaktigt arkiv \"%s\""

7073

6933 -#: builtin/push.c:303

7074 +#: builtin/push.c:332

7075 msgid ""

7076 "No configured push destination.\n"

7077 "Either specify the URL from the command-line or configure a remote "

@@ -6951,79 +7092,83 @@ msgstr ""

7092 "\n"

7093 " git push <namn>\n"

7094

6954 -#: builtin/push.c:318

7095 +#: builtin/push.c:347

7096 msgid "--all and --tags are incompatible"

7097 msgstr "--all och --tags är inkompatibla"

7098

6958 -#: builtin/push.c:319

7099 +#: builtin/push.c:348

7100 msgid "--all can't be combined with refspecs"

7101 msgstr "--all kan inte kombineras med referensspecifikationer"

7102

6962 -#: builtin/push.c:324

7103 +#: builtin/push.c:353

7104 msgid "--mirror and --tags are incompatible"

7105 msgstr "--mirror och --tags är inkompatibla"

7106

6966 -#: builtin/push.c:325

7107 +#: builtin/push.c:354

7108 msgid "--mirror can't be combined with refspecs"

7109 msgstr "--mirror kan inte kombineras med referensspecifikationer"

7110

6970 -#: builtin/push.c:330

7111 +#: builtin/push.c:359

7112 msgid "--all and --mirror are incompatible"

7113 msgstr "--all och --mirror är inkompatibla"

7114

6974 -#: builtin/push.c:390

7115 +#: builtin/push.c:419

7116 msgid "repository"

7117 msgstr "arkiv"

7118

6978 -#: builtin/push.c:391

7119 +#: builtin/push.c:420

7120 msgid "push all refs"

7121 msgstr "sänd alla referenser"

7122

6982 -#: builtin/push.c:392

7123 +#: builtin/push.c:421

7124 msgid "mirror all refs"

7125 msgstr "spegla alla referenser"

7126

6986 -#: builtin/push.c:394

7127 +#: builtin/push.c:423

7128 msgid "delete refs"

7129 msgstr "ta bort referenser"

7130

6990 -#: builtin/push.c:395

7131 +#: builtin/push.c:424

7132 msgid "push tags (can't be used with --all or --mirror)"

7133 msgstr "sänd taggar (kan inte användas med --all eller --mirror)"

7134

6994 -#: builtin/push.c:398

7135 +#: builtin/push.c:427

7136 msgid "force updates"

7137 msgstr "tvinga uppdateringar"

7138

6998 -#: builtin/push.c:399

7139 +#: builtin/push.c:428

7140 msgid "check"

7141 msgstr "kontrollera"

7142

7002 -#: builtin/push.c:400

7143 +#: builtin/push.c:429

7144 msgid "control recursive pushing of submodules"

7145 msgstr "styr rekursiv insändning av undermoduler"

7146

7006 -#: builtin/push.c:402

7147 +#: builtin/push.c:431

7148 msgid "use thin pack"

7149 msgstr "använd tunna paket"

7150

7010 -#: builtin/push.c:403 builtin/push.c:404

7151 +#: builtin/push.c:432 builtin/push.c:433

7152 msgid "receive pack program"

7153 msgstr "program för att ta emot paket"

7154

7014 -#: builtin/push.c:405

7155 +#: builtin/push.c:434

7156 msgid "set upstream for git pull/status"

7157 msgstr "ställ in uppström för git pull/status"

7158

7018 -#: builtin/push.c:408

7159 +#: builtin/push.c:437

7160 msgid "prune locally removed refs"

7161 msgstr "ta bort lokalt borttagna referenser"

7162

7022 -#: builtin/push.c:418

7163 +#: builtin/push.c:439

7164 +msgid "bypass pre-push hook"

7165 +msgstr "förbigå pre-push-krok"

7166 +

7167 +#: builtin/push.c:448

7168 msgid "--delete is incompatible with --all, --mirror and --tags"

7169 msgstr "--delete är imkompatibel med --all, --mirror och --tags"

7170

7026 -#: builtin/push.c:420

7171 +#: builtin/push.c:450

7172 msgid "--delete doesn't make sense without any refs"

7173 msgstr "--delete kan inte användas utan referenser"

7174

@@ -8169,170 +8314,164 @@ msgid "could not verify the tag '%s'"

8314 msgstr "kunde inte bekräfta taggen \"%s\""

8315

8316 #: builtin/tag.c:249

8317 +#, c-format

8318 msgid ""

8319 "\n"

8174 -"#\n"

8175 -"# Write a tag message\n"

8176 -"# Lines starting with '#' will be ignored.\n"

8177 -"#\n"

8320 +"Write a tag message\n"

8321 +"Lines starting with '%c' will be ignored.\n"

8322 msgstr ""

8323 "\n"

8180 -"#\n"

8181 -"# Skriv ett taggmeddelande\n"

8182 -"# Rader som inleds med \"#\" ignoreras.\n"

8183 -"#\n"

8324 +"Skriv ett taggmeddelande\n"

8325 +"Rader som inleds med \"%c\" ignoreras.\n"

8326

8185 -#: builtin/tag.c:256

8327 +#: builtin/tag.c:253

8328 +#, c-format

8329 msgid ""

8330 "\n"

8188 -"#\n"

8189 -"# Write a tag message\n"

8190 -"# Lines starting with '#' will be kept; you may remove them yourself if you "

8331 +"Write a tag message\n"

8332 +"Lines starting with '%c' will be kept; you may remove them yourself if you "

8333 "want to.\n"

8192 -"#\n"

8334 msgstr ""

8335 "\n"

8195 -"#\n"

8196 -"# Skriv ett taggmeddelande\n"

8197 -"# Rader som inleds med \"#\" kommer behållas; du kan själv ta bort dem om\n"

8198 -"# du vill.\n"

8199 -"#\n"

8336 +"Skriv ett taggmeddelande\n"

8337 +"Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n"

8338 +"du vill.\n"

8339

8201 -#: builtin/tag.c:298

8340 +#: builtin/tag.c:292

8341 msgid "unable to sign the tag"

8342 msgstr "kunde inte signera taggen"

8343

8205 -#: builtin/tag.c:300

8344 +#: builtin/tag.c:294

8345 msgid "unable to write tag file"

8346 msgstr "kunde inte skriva tagg-filen"

8347

8209 -#: builtin/tag.c:325

8348 +#: builtin/tag.c:319

8349 msgid "bad object type."

8350 msgstr "felaktig objekttyp"

8351

8213 -#: builtin/tag.c:338

8352 +#: builtin/tag.c:332

8353 msgid "tag header too big."

8354 msgstr "tagghuvud för stort."

8355

8217 -#: builtin/tag.c:370

8356 +#: builtin/tag.c:368

8357 msgid "no tag message?"

8358 msgstr "inget taggmeddelande?"

8359

8221 -#: builtin/tag.c:376

8360 +#: builtin/tag.c:374

8361 #, c-format

8362 msgid "The tag message has been left in %s\n"

8363 msgstr "Taggmeddelandet har lämnats i %s\n"

8364

8226 -#: builtin/tag.c:425

8365 +#: builtin/tag.c:423

8366 msgid "switch 'points-at' requires an object"

8367 msgstr "flaggan \"points-at\" behöver ett object"

8368

8230 -#: builtin/tag.c:427

8369 +#: builtin/tag.c:425

8370 #, c-format

8371 msgid "malformed object name '%s'"

8372 msgstr "felformat objektnamn \"%s\""

8373

8235 -#: builtin/tag.c:447

8374 +#: builtin/tag.c:445

8375 msgid "list tag names"

8376 msgstr "lista taggnamn"

8377

8239 -#: builtin/tag.c:449

8378 +#: builtin/tag.c:447

8379 msgid "print <n> lines of each tag message"

8380 msgstr "visa <n> rader från varje taggmeddelande"

8381

8243 -#: builtin/tag.c:451

8382 +#: builtin/tag.c:449

8383 msgid "delete tags"

8384 msgstr "ta bort taggar"

8385

8247 -#: builtin/tag.c:452

8386 +#: builtin/tag.c:450

8387 msgid "verify tags"

8388 msgstr "verifiera taggar"

8389

8251 -#: builtin/tag.c:454

8390 +#: builtin/tag.c:452

8391 msgid "Tag creation options"

8392 msgstr "Alternativ för att skapa taggar"

8393

8255 -#: builtin/tag.c:456

8394 +#: builtin/tag.c:454

8395 msgid "annotated tag, needs a message"

8396 msgstr "annoterad tagg, behöver meddelande"

8397

8259 -#: builtin/tag.c:458

8398 +#: builtin/tag.c:456

8399 msgid "tag message"

8400 msgstr "taggmeddelande"

8401

8263 -#: builtin/tag.c:460

8402 +#: builtin/tag.c:458

8403 msgid "annotated and GPG-signed tag"

8404 msgstr "annoterad och GPG-signerad tagg"

8405

8267 -#: builtin/tag.c:464

8406 +#: builtin/tag.c:462

8407 msgid "use another key to sign the tag"

8408 msgstr "använd annan nyckel för att signera taggen"

8409

8271 -#: builtin/tag.c:465

8410 +#: builtin/tag.c:463

8411 msgid "replace the tag if exists"

8412 msgstr "ersätt taggen om den finns"

8413

8275 -#: builtin/tag.c:466

8414 +#: builtin/tag.c:464

8415 msgid "show tag list in columns"

8416 msgstr "lista taggar i spalter"

8417

8279 -#: builtin/tag.c:468

8418 +#: builtin/tag.c:466

8419 msgid "Tag listing options"

8420 msgstr "Alternativ för listning av taggar"

8421

8283 -#: builtin/tag.c:471

8422 +#: builtin/tag.c:469

8423 msgid "print only tags that contain the commit"

8424 msgstr "visa endast taggar som innehåller incheckningen"

8425

8287 -#: builtin/tag.c:477

8426 +#: builtin/tag.c:475

8427 msgid "print only tags of the object"

8428 msgstr "visa endast taggar för objektet"

8429

8291 -#: builtin/tag.c:506

8430 +#: builtin/tag.c:504

8431 msgid "--column and -n are incompatible"

8432 msgstr "--column och -n är inkompatibla"

8433

8295 -#: builtin/tag.c:523

8434 +#: builtin/tag.c:521

8435 msgid "-n option is only allowed with -l."

8436 msgstr "Flaggan -n är endast tillåten tillsammans med -l."

8437

8299 -#: builtin/tag.c:525

8438 +#: builtin/tag.c:523

8439 msgid "--contains option is only allowed with -l."

8440 msgstr "Flaggan --contains är endast tillåten tillsammans med -l"

8441

8303 -#: builtin/tag.c:527

8442 +#: builtin/tag.c:525

8443 msgid "--points-at option is only allowed with -l."

8444 msgstr "Flaggan --points-at är endast tillåten tillsammans med -l."

8445

8307 -#: builtin/tag.c:535

8446 +#: builtin/tag.c:533

8447 msgid "only one -F or -m option is allowed."

8448 msgstr "endast en av flaggorna -F eller -m tillåts."

8449

8311 -#: builtin/tag.c:555

8450 +#: builtin/tag.c:553

8451 msgid "too many params"

8452 msgstr "för många parametrar"

8453

8315 -#: builtin/tag.c:561

8454 +#: builtin/tag.c:559

8455 #, c-format

8456 msgid "'%s' is not a valid tag name."

8457 msgstr "\"%s\" är inte ett giltigt taggnamn."

8458

8320 -#: builtin/tag.c:566

8459 +#: builtin/tag.c:564

8460 #, c-format

8461 msgid "tag '%s' already exists"

8462 msgstr "taggen \"%s\" finns redan"

8463

8325 -#: builtin/tag.c:584

8464 +#: builtin/tag.c:582

8465 #, c-format

8466 msgid "%s: cannot lock the ref"

8467 msgstr "%s: kan inte låsa referensen"

8468

8330 -#: builtin/tag.c:586

8469 +#: builtin/tag.c:584

8470 #, c-format

8471 msgid "%s: cannot update the ref"

8472 msgstr "%s: kan inte uppdatera referensen"

8473

8335 -#: builtin/tag.c:588

8474 +#: builtin/tag.c:586

8475 #, c-format

8476 msgid "Updated tag '%s' (was %s)\n"

8477 msgstr "Uppdaterad tagg \"%s\" (var %s)\n"

@@ -8567,8 +8706,8 @@ msgid "Print lines matching a pattern"

8706 msgstr "Visa rader som motsvarar mönster"

8707

8708 #: common-cmds.h:17

8570 -msgid "Create an empty git repository or reinitialize an existing one"

8571 -msgstr "Skapa tomt git-arkiv eller ominitiera ett befintligt"

8709 +msgid "Create an empty Git repository or reinitialize an existing one"

8710 +msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt"

8711

8712 #: common-cmds.h:18

8713 msgid "Show commit logs"

@@ -9452,18 +9591,24 @@ msgid "blob"

9591 msgstr "blob"

9592

9593 #: git-submodule.sh:979

9455 -msgid "# Submodules changed but not updated:"

9456 -msgstr "# Undermoduler ändrade men inte uppdaterade:"

9594 +msgid "Submodules changed but not updated:"

9595 +msgstr "Undermoduler ändrade men inte uppdaterade:"

9596

9597 #: git-submodule.sh:981

9459 -msgid "# Submodule changes to be committed:"

9460 -msgstr "# Undermodulers ändringar att checka in:"

9598 +msgid "Submodule changes to be committed:"

9599 +msgstr "Undermodulers ändringar att checka in:"

9600

9601 #: git-submodule.sh:1129

9602 #, sh-format

9603 msgid "Synchronizing submodule url for '$prefix$sm_path'"

9604 msgstr "Synkroniserar undermodul-url för \"$prefix$sm_path\""

9605

9606 +#~ msgid "can't fdopen 'show' output fd"

9607 +#~ msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag"

9608 +

9609 +#~ msgid "failed to close pipe to 'show' for object '%s'"

9610 +#~ msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\""

9611 +

9612 #~ msgid "You do not have a valid HEAD"

9613 #~ msgstr "Du har ingen giltig HEAD"

9614

l10n: Update Swedish translation (2004t0f0u)