d74d01808a · matheusbsbs/matheus-bagliano

@@ -1,14 +1,14 @@

1 # Swedish translations for Git.

3 # This file is distributed under the same license as the Git package.

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

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

5 #

6 msgid ""

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2013-11-02 08:06+0800\n"

11 -"PO-Revision-Date: 2013-11-09 19:02+0100\n"

10 +"POT-Creation-Date: 2014-01-18 07:42+0800\n"

11 +"PO-Revision-Date: 2014-01-21 09:24+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"

@@ -57,7 +57,7 @@ msgstr ""

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

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

59

60 -#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328

60 +#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328

61 #, c-format

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

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

@@ -78,8 +78,8 @@ msgstr "prefix"

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

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

80

81 -#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264

82 -#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680

81 +#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265

82 +#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680

83 #: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77

84 #: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408

85 #: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154

@@ -262,64 +262,64 @@ msgstr "Misslyckades låsa referens för uppdatering"

262 msgid "Failed to write ref"

263 msgstr "Misslyckades skriva referens"

264

265 -#: bundle.c:36

265 +#: bundle.c:37

266 #, c-format

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

268 msgstr "'%s' ser inte ut som en v2-bundle-fil"

269

270 -#: bundle.c:63

270 +#: bundle.c:64

271 #, c-format

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

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

274

275 -#: bundle.c:89 builtin/commit.c:706

275 +#: bundle.c:90 builtin/commit.c:706

276 #, c-format

277 msgid "could not open '%s'"

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

279

280 -#: bundle.c:140

280 +#: bundle.c:141

281 msgid "Repository lacks these prerequisite commits:"

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

283

284 -#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332

285 -#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364

284 +#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332

285 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357

286 #: builtin/shortlog.c:158

287 msgid "revision walk setup failed"

288 msgstr "misslyckades skapa revisionstraversering"

289

290 -#: bundle.c:186

290 +#: bundle.c:187

291 #, c-format

292 msgid "The bundle contains this ref:"

293 msgid_plural "The bundle contains these %d refs:"

294 msgstr[0] "Paketet (bundlen) denna referens:"

295 msgstr[1] "Paketet (bundlen) dessa %d referenser:"

296

297 -#: bundle.c:193

297 +#: bundle.c:194

298 msgid "The bundle records a complete history."

299 msgstr "Paketet (bundlen) beskriver en komplett historik."

300

301 -#: bundle.c:195

301 +#: bundle.c:196

302 #, c-format

303 msgid "The bundle requires this ref:"

304 msgid_plural "The bundle requires these %d refs:"

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

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

307

308 -#: bundle.c:294

308 +#: bundle.c:296

309 msgid "rev-list died"

310 msgstr "rev-list dog"

311

312 -#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261

312 +#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261

313 #, c-format

314 msgid "unrecognized argument: %s"

315 msgstr "okänt argument: %s"

316

317 -#: bundle.c:335

317 +#: bundle.c:337

318 #, c-format

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

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

321

322 -#: bundle.c:380

322 +#: bundle.c:382

323 msgid "Refusing to create empty bundle."

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

325

@@ -354,16 +354,16 @@ msgstr "%s %s är inte en incheckning!"

354 msgid "memory exhausted"

355 msgstr "minnet slut"

356

357 -#: connected.c:60

357 +#: connected.c:70

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

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

360

361 -#: connected.c:80

361 +#: connected.c:90

362 #, c-format

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

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

365

366 -#: connected.c:88

366 +#: connected.c:98

367 #, c-format

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

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

@@ -435,22 +435,27 @@ msgid_plural "%lu years ago"

435 msgstr[0] "%lu år sedan"

436 msgstr[1] "%lu år sedan"

437

438 -#: diff.c:112

438 +#: diffcore-order.c:24

439 +#, c-format

440 +msgid "failed to read orderfile '%s'"

441 +msgstr "kunde inte läsa orderfilen \"%s\""

442 +

443 +#: diff.c:113

444 #, c-format

445 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

446 msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"

447

443 -#: diff.c:117

448 +#: diff.c:118

449 #, c-format

450 msgid " Unknown dirstat parameter '%s'\n"

451 msgstr " Okänd dirstat-parameter \"%s\"\n"

452

448 -#: diff.c:210

453 +#: diff.c:213

454 #, c-format

455 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

456 msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""

457

453 -#: diff.c:260

458 +#: diff.c:263

459 #, c-format

460 msgid ""

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

@@ -459,7 +464,7 @@ msgstr ""

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

465 "%s"

466

462 -#: diff.c:3490

467 +#: diff.c:3509

468 #, c-format

469 msgid ""

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

@@ -468,7 +473,7 @@ msgstr ""

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

474 "%s"

475

471 -#: diff.c:3504

476 +#: diff.c:3523

477 #, c-format

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

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

@@ -579,7 +584,7 @@ msgid "failed to read the cache"

584 msgstr "misslyckads läsa cachen"

585

586 #: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559

582 -#: builtin/clone.c:655

587 +#: builtin/clone.c:661

588 msgid "unable to write new index file"

589 msgstr "kunde inte skriva ny indexfil"

590

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

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

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

635

631 -#: merge-recursive.c:774 builtin/clone.c:311

636 +#: merge-recursive.c:774 builtin/clone.c:317

637 #, c-format

638 msgid "failed to open '%s'"

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

@@ -678,7 +683,7 @@ msgstr ""

683 msgid "rename"

684 msgstr "namnbyte"

685

681 -#: merge-recursive.c:1082

686 +#: merge-recursive.c:1082 wt-status.c:283

687 msgid "renamed"

688 msgstr "namnbytt"

689

@@ -740,7 +745,7 @@ msgstr "objektet %s är inte en blob"

745 msgid "modify"

746 msgstr "ändra"

747

743 -#: merge-recursive.c:1565

748 +#: merge-recursive.c:1565 wt-status.c:281

749 msgid "modified"

750 msgstr "ändrad"

751

@@ -762,7 +767,7 @@ msgstr "Hoppade över %s (sammanslagen samma som befintlig)"

767 msgid "Auto-merging %s"

768 msgstr "Slår ihop %s automatiskt"

769

765 -#: merge-recursive.c:1634 git-submodule.sh:1125

770 +#: merge-recursive.c:1634 git-submodule.sh:1148

771 msgid "submodule"

772 msgstr "undermodul"

773

@@ -833,7 +838,7 @@ msgstr "sammanslagningen returnerade ingen incheckning"

838 msgid "Could not parse object '%s'"

839 msgstr "Kunde inte tolka objektet \"%s\""

840

836 -#: merge-recursive.c:2010 builtin/merge.c:672

841 +#: merge-recursive.c:2010 builtin/merge.c:665

842 msgid "Unable to write index."

843 msgstr "Kunde inte skriva indexet."

844

@@ -888,12 +893,12 @@ msgstr " %s"

893 msgid "-NUM"

894 msgstr "-TAL"

895

891 -#: pathspec.c:118

896 +#: pathspec.c:133

897 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

898 msgstr ""

899 "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla"

900

896 -#: pathspec.c:128

901 +#: pathspec.c:143

902 msgid ""

903 "global 'literal' pathspec setting is incompatible with all other global "

904 "pathspec settings"

@@ -901,36 +906,36 @@ msgstr ""

906 "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra "

907 "globala sökvägsinställningar"

908

904 -#: pathspec.c:158

909 +#: pathspec.c:177

910 msgid "invalid parameter for pathspec magic 'prefix'"

911 msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""

912

908 -#: pathspec.c:164

913 +#: pathspec.c:183

914 #, c-format

915 msgid "Invalid pathspec magic '%.*s' in '%s'"

916 msgstr "felaktigt sökvägsuttryck \"%.*s\" i \"%s\""

917

913 -#: pathspec.c:168

918 +#: pathspec.c:187

919 #, c-format

920 msgid "Missing ')' at the end of pathspec magic in '%s'"

921 msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\""

922

918 -#: pathspec.c:186

923 +#: pathspec.c:205

924 #, c-format

925 msgid "Unimplemented pathspec magic '%c' in '%s'"

926 msgstr "Tecknet \"%c\" i sökvägsuttrycket i \"%s\" har inte implementerats"

927

923 -#: pathspec.c:211

928 +#: pathspec.c:230

929 #, c-format

930 msgid "%s: 'literal' and 'glob' are incompatible"

931 msgstr "%s: \"literal\" och \"glob\" är inkompatibla"

932

928 -#: pathspec.c:222

933 +#: pathspec.c:241

934 #, c-format

935 msgid "%s: '%s' is outside repository"

936 msgstr "%s: \"%s\" är utanför arkivet"

937

933 -#: pathspec.c:278

938 +#: pathspec.c:291

939 #, c-format

940 msgid "Pathspec '%s' is in submodule '%.*s'"

941 msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""

@@ -940,42 +945,74 @@ msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""

945 #. * name. E.g. when add--interactive dies when running

946 #. * "checkout -p"

947 #.

943 -#: pathspec.c:340

948 +#: pathspec.c:353

949 #, c-format

950 msgid "%s: pathspec magic not supported by this command: %s"

951 msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s"

952

948 -#: pathspec.c:415

953 +#: pathspec.c:433

954 #, c-format

955 msgid "pathspec '%s' is beyond a symbolic link"

956 msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"

957

953 -#: remote.c:1833

958 +#: pathspec.c:442

959 +msgid ""

960 +"There is nothing to exclude from by :(exclude) patterns.\n"

961 +"Perhaps you forgot to add either ':/' or '.' ?"

962 +msgstr ""

963 +"Ingenting att exkludera från med :(exkludera)-mönster.\n"

964 +"Glömde du kanske att antingen lägga till \":/\" eller \".\"?"

965 +

966 +#: remote.c:753

967 +#, c-format

968 +msgid "Cannot fetch both %s and %s to %s"

969 +msgstr "Kan inte hämta både %s och %s till %s"

970 +

971 +#: remote.c:757

972 +#, c-format

973 +msgid "%s usually tracks %s, not %s"

974 +msgstr "%s spårar vanligtvis %s, inte %s"

975 +

976 +#: remote.c:761

977 +#, c-format

978 +msgid "%s tracks both %s and %s"

979 +msgstr "%s spårar både %s och %s"

980 +

981 +#.

982 +#. * This last possibility doesn't occur because

983 +#. * FETCH_HEAD_IGNORE entries always appear at

984 +#. * the end of the list.

985 +#.

986 +#: remote.c:769

987 +msgid "Internal error"

988 +msgstr "Internt fel"

989 +

990 +#: remote.c:1871

991 #, c-format

992 msgid "Your branch is based on '%s', but the upstream is gone.\n"

993 msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"

994

958 -#: remote.c:1837

995 +#: remote.c:1875

996 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

997 msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"

998

962 -#: remote.c:1840

999 +#: remote.c:1878

1000 #, c-format

1001 msgid "Your branch is up-to-date with '%s'.\n"

1002 msgstr "Din gren är à jour med \"%s\".\n"

1003

967 -#: remote.c:1844

1004 +#: remote.c:1882

1005 #, c-format

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

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

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

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

1010

974 -#: remote.c:1850

1011 +#: remote.c:1888

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

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

1014

978 -#: remote.c:1853

1015 +#: remote.c:1891

1016 #, c-format

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

1018 msgid_plural ""

@@ -985,11 +1022,11 @@ msgstr[0] ""

1022 msgstr[1] ""

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

1024

988 -#: remote.c:1861

1025 +#: remote.c:1899

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

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

1028

992 -#: remote.c:1864

1029 +#: remote.c:1902

1030 #, c-format

1031 msgid ""

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

@@ -1004,7 +1041,7 @@ msgstr[1] ""

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

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

1043

1007 -#: remote.c:1874

1044 +#: remote.c:1912

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

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

1047

@@ -1017,14 +1054,14 @@ msgstr "misslyckades öppna /dev/null"

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

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

1056

1020 -#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903

1021 -#: builtin/merge.c:1013 builtin/merge.c:1023

1057 +#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896

1058 +#: builtin/merge.c:1006 builtin/merge.c:1016

1059 #, c-format

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

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

1062

1026 -#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793

1027 -#: builtin/merge.c:1015 builtin/merge.c:1028

1063 +#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786

1064 +#: builtin/merge.c:1008 builtin/merge.c:1021

1065 #, c-format

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

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

@@ -1264,7 +1301,7 @@ msgstr "Kan inte ångra som första incheckning"

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

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

1303

1267 -#: sha1_name.c:440

1304 +#: sha1_name.c:439

1305 msgid ""

1306 "Git normally never creates a ref that ends with 40 hex characters\n"

1307 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -1286,21 +1323,21 @@ msgstr ""

1323 "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"

1324 "genom att köra \"git config advice.objectNameWarning false\""

1325

1289 -#: sha1_name.c:1112

1326 +#: sha1_name.c:1109

1327 msgid "HEAD does not point to a branch"

1328 msgstr "HEAD pekar inte på en gren"

1329

1293 -#: sha1_name.c:1115

1330 +#: sha1_name.c:1112

1331 #, c-format

1332 msgid "No such branch: '%s'"

1333 msgstr "Okänd gren: \"%s\""

1334

1298 -#: sha1_name.c:1117

1335 +#: sha1_name.c:1114

1336 #, c-format

1337 msgid "No upstream configured for branch '%s'"

1338 msgstr "Ingen standarduppström angiven för grenen \"%s\""

1339

1303 -#: sha1_name.c:1121

1340 +#: sha1_name.c:1118

1341 #, c-format

1342 msgid "Upstream branch '%s' not stored as a remote-tracking branch"

1343 msgstr "Uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"

@@ -1410,226 +1447,218 @@ msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"

1447 msgid "no such user"

1448 msgstr "okänd användare"

1449

1413 -#: wt-status.c:146

1450 +#: wt-status.c:150

1451 msgid "Unmerged paths:"

1452 msgstr "Ej sammanslagna sökvägar:"

1453

1417 -#: wt-status.c:173 wt-status.c:200

1454 +#: wt-status.c:177 wt-status.c:204

1455 #, c-format

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

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

1458

1422 -#: wt-status.c:175 wt-status.c:202

1459 +#: wt-status.c:179 wt-status.c:206

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

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

1462

1426 -#: wt-status.c:179

1463 +#: wt-status.c:183

1464 msgid " (use \"git add <file>...\" to mark resolution)"

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

1466

1430 -#: wt-status.c:181 wt-status.c:185

1467 +#: wt-status.c:185 wt-status.c:189

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

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

1470

1434 -#: wt-status.c:183

1471 +#: wt-status.c:187

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

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

1474

1438 -#: wt-status.c:194

1475 +#: wt-status.c:198

1476 msgid "Changes to be committed:"

1477 msgstr "Ändringar att checka in:"

1478

1442 -#: wt-status.c:212

1479 +#: wt-status.c:216

1480 msgid "Changes not staged for commit:"

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

1482

1446 -#: wt-status.c:216

1483 +#: wt-status.c:220

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

1485 msgstr ""

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

1487

1451 -#: wt-status.c:218

1488 +#: wt-status.c:222

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

1490 msgstr ""

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

1492

1456 -#: wt-status.c:219

1493 +#: wt-status.c:223

1494 msgid ""

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

1496 msgstr ""

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

1498 "arbetskatalogen)"

1499

1463 -#: wt-status.c:221

1500 +#: wt-status.c:225

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

1502 msgstr ""

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

1504

1468 -#: wt-status.c:233

1505 +#: wt-status.c:237

1506 #, c-format

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

1508 msgstr ""

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

1510

1474 -#: wt-status.c:250

1511 +#: wt-status.c:254

1512 msgid "bug"

1513 msgstr "programfel"

1514

1478 -#: wt-status.c:255

1515 +#: wt-status.c:259

1516 msgid "both deleted:"

1517 msgstr "borttaget av bägge:"

1518

1482 -#: wt-status.c:256

1519 +#: wt-status.c:260

1520 msgid "added by us:"

1521 msgstr "tillagt av oss:"

1522

1486 -#: wt-status.c:257

1523 +#: wt-status.c:261

1524 msgid "deleted by them:"

1525 msgstr "borttaget av dem:"

1526

1490 -#: wt-status.c:258

1527 +#: wt-status.c:262

1528 msgid "added by them:"

1529 msgstr "tillagt av dem:"

1530

1494 -#: wt-status.c:259

1531 +#: wt-status.c:263

1532 msgid "deleted by us:"

1533 msgstr "borttaget av oss:"

1534

1498 -#: wt-status.c:260

1535 +#: wt-status.c:264

1536 msgid "both added:"

1537 msgstr "tillagt av bägge:"

1538

1502 -#: wt-status.c:261

1539 +#: wt-status.c:265

1540 msgid "both modified:"

1541 msgstr "ändrat av bägge:"

1542

1506 -#: wt-status.c:291

1507 -msgid "new commits, "

1508 -msgstr "nya incheckningar, "

1509 -

1510 -#: wt-status.c:293

1511 -msgid "modified content, "

1512 -msgstr "ändrat innehåll, "

1543 +#: wt-status.c:275

1544 +msgid "new file"

1545 +msgstr "ny fil"

1546

1514 -#: wt-status.c:295

1515 -msgid "untracked content, "

1516 -msgstr "ospårat innehåll, "

1517 -

1518 -#: wt-status.c:312

1519 -#, c-format

1520 -msgid "new file: %s"

1521 -msgstr "ny fil: %s"

1547 +#: wt-status.c:277

1548 +msgid "copied"

1549 +msgstr "kopierad"

1550

1523 -#: wt-status.c:315

1524 -#, c-format

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

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

1551 +#: wt-status.c:279

1552 +msgid "deleted"

1553 +msgstr "borttagen"

1554

1528 -#: wt-status.c:318

1529 -#, c-format

1530 -msgid "deleted: %s"

1531 -msgstr "borttagen: %s"

1555 +#: wt-status.c:285

1556 +msgid "typechange"

1557 +msgstr "typbyte"

1558

1533 -#: wt-status.c:321

1534 -#, c-format

1535 -msgid "modified: %s"

1536 -msgstr "ändrad: %s"

1559 +#: wt-status.c:287

1560 +msgid "unknown"

1561 +msgstr "okänd"

1562

1538 -#: wt-status.c:324

1539 -#, c-format

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

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

1563 +#: wt-status.c:289

1564 +msgid "unmerged"

1565 +msgstr "osammanslagen"

1566

1543 -#: wt-status.c:327

1544 -#, c-format

1545 -msgid "typechange: %s"

1546 -msgstr "typbyte: %s"

1567 +#: wt-status.c:336

1568 +msgid "new commits, "

1569 +msgstr "nya incheckningar, "

1570

1548 -#: wt-status.c:330

1549 -#, c-format

1550 -msgid "unknown: %s"

1551 -msgstr "okänd: %s"

1571 +#: wt-status.c:338

1572 +msgid "modified content, "

1573 +msgstr "ändrat innehåll, "

1574

1553 -#: wt-status.c:333

1554 -#, c-format

1555 -msgid "unmerged: %s"

1556 -msgstr "osammansl.: %s"

1575 +#: wt-status.c:340

1576 +msgid "untracked content, "

1577 +msgstr "ospårat innehåll, "

1578

1558 -#: wt-status.c:336

1579 +#: wt-status.c:357

1580 #, c-format

1581 msgid "bug: unhandled diff status %c"

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

1583

1563 -#: wt-status.c:703

1584 +#: wt-status.c:732

1585 msgid "Submodules changed but not updated:"

1586 msgstr "Undermoduler ändrade men inte uppdaterade:"

1587

1567 -#: wt-status.c:705

1588 +#: wt-status.c:734

1589 msgid "Submodule changes to be committed:"

1590 msgstr "Undermodulers ändringar att checka in:"

1591

1571 -#: wt-status.c:848

1592 +#: wt-status.c:836

1593 +msgid ""

1594 +"Do not touch the line above.\n"

1595 +"Everything below will be removed."

1596 +msgstr ""

1597 +"Rör inte raden ovan.\n"

1598 +"Allt nedan kommer tas bort."

1599 +

1600 +#: wt-status.c:899

1601 msgid "You have unmerged paths."

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

1603

1575 -#: wt-status.c:851

1604 +#: wt-status.c:902

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

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

1607

1579 -#: wt-status.c:854

1608 +#: wt-status.c:905

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

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

1611

1583 -#: wt-status.c:857

1612 +#: wt-status.c:908

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

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

1615

1587 -#: wt-status.c:867

1616 +#: wt-status.c:918

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

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

1619

1591 -#: wt-status.c:870

1620 +#: wt-status.c:921

1621 msgid "The current patch is empty."

1622 msgstr "Aktuell patch är tom."

1623

1595 -#: wt-status.c:874

1624 +#: wt-status.c:925

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

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

1627

1599 -#: wt-status.c:876

1628 +#: wt-status.c:927

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

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

1631

1603 -#: wt-status.c:878

1632 +#: wt-status.c:929

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

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

1635

1607 -#: wt-status.c:938 wt-status.c:955

1636 +#: wt-status.c:989 wt-status.c:1006

1637 #, c-format

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

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

1640

1612 -#: wt-status.c:943 wt-status.c:960

1641 +#: wt-status.c:994 wt-status.c:1011

1642 msgid "You are currently rebasing."

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

1644

1616 -#: wt-status.c:946

1645 +#: wt-status.c:997

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

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

1648

1620 -#: wt-status.c:948

1649 +#: wt-status.c:999

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

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

1652

1624 -#: wt-status.c:950

1653 +#: wt-status.c:1001

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

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

1656

1628 -#: wt-status.c:963

1657 +#: wt-status.c:1014

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

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

1660

1632 -#: wt-status.c:967

1661 +#: wt-status.c:1018

1662 #, c-format

1663 msgid ""

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

@@ -1637,118 +1666,118 @@ msgstr ""

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

1667 "ovanpå \"%s\"."

1668

1640 -#: wt-status.c:972

1669 +#: wt-status.c:1023

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

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

1672

1644 -#: wt-status.c:975

1673 +#: wt-status.c:1026

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

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

1676

1648 -#: wt-status.c:979

1677 +#: wt-status.c:1030

1678 #, c-format

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

1680 msgstr ""

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

1682 "ovanpå \"%s\"."

1683

1655 -#: wt-status.c:984

1684 +#: wt-status.c:1035

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

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

1687

1659 -#: wt-status.c:987

1688 +#: wt-status.c:1038

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

1690 msgstr ""

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

1692

1664 -#: wt-status.c:989

1693 +#: wt-status.c:1040

1694 msgid ""

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

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

1697

1669 -#: wt-status.c:999

1698 +#: wt-status.c:1050

1699 #, c-format

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

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

1702

1674 -#: wt-status.c:1004

1703 +#: wt-status.c:1055

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

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

1706

1678 -#: wt-status.c:1007

1707 +#: wt-status.c:1058

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

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

1710

1682 -#: wt-status.c:1009

1711 +#: wt-status.c:1060

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

1713 msgstr ""

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

1715 "operationen)"

1716

1688 -#: wt-status.c:1018

1717 +#: wt-status.c:1069

1718 #, c-format

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

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

1721

1693 -#: wt-status.c:1023

1722 +#: wt-status.c:1074

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

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

1725

1697 -#: wt-status.c:1026

1726 +#: wt-status.c:1077

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

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

1729

1701 -#: wt-status.c:1028

1730 +#: wt-status.c:1079

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

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

1733

1705 -#: wt-status.c:1039

1734 +#: wt-status.c:1090

1735 #, c-format

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

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

1738

1710 -#: wt-status.c:1043

1739 +#: wt-status.c:1094

1740 msgid "You are currently bisecting."

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

1742

1714 -#: wt-status.c:1046

1743 +#: wt-status.c:1097

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

1745 msgstr ""

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

1747

1719 -#: wt-status.c:1221

1748 +#: wt-status.c:1272

1749 msgid "On branch "

1750 msgstr "På grenen "

1751

1723 -#: wt-status.c:1228

1752 +#: wt-status.c:1279

1753 msgid "rebase in progress; onto "

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

1755

1727 -#: wt-status.c:1235

1756 +#: wt-status.c:1286

1757 msgid "HEAD detached at "

1758 msgstr "HEAD frånkopplad vid "

1759

1731 -#: wt-status.c:1237

1760 +#: wt-status.c:1288

1761 msgid "HEAD detached from "

1762 msgstr "HEAD frånkopplad från "

1763

1735 -#: wt-status.c:1240

1764 +#: wt-status.c:1291

1765 msgid "Not currently on any branch."

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

1767

1739 -#: wt-status.c:1257

1768 +#: wt-status.c:1308

1769 msgid "Initial commit"

1770 msgstr "Första incheckning"

1771

1743 -#: wt-status.c:1271

1772 +#: wt-status.c:1322

1773 msgid "Untracked files"

1774 msgstr "Ospårade filer"

1775

1747 -#: wt-status.c:1273

1776 +#: wt-status.c:1324

1777 msgid "Ignored files"

1778 msgstr "Ignorerade filer"

1779

1751 -#: wt-status.c:1277

1780 +#: wt-status.c:1328

1781 #, c-format

1782 msgid ""

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

@@ -1760,32 +1789,32 @@ msgstr ""

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

1790

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

1763 -#: wt-status.c:1283

1792 +#: wt-status.c:1334

1793 #, c-format

1794 msgid "Untracked files not listed%s"

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

1796

1768 -#: wt-status.c:1285

1797 +#: wt-status.c:1336

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

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

1800

1772 -#: wt-status.c:1291

1801 +#: wt-status.c:1342

1802 msgid "No changes"

1803 msgstr "Inga ändringar"

1804

1776 -#: wt-status.c:1296

1805 +#: wt-status.c:1347

1806 #, c-format

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

1808 msgstr ""

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

1810 "\")\n"

1811

1783 -#: wt-status.c:1299

1812 +#: wt-status.c:1350

1813 #, c-format

1814 msgid "no changes added to commit\n"

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

1816

1788 -#: wt-status.c:1302

1817 +#: wt-status.c:1353

1818 #, c-format

1819 msgid ""

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

@@ -1794,56 +1823,56 @@ msgstr ""

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

1824 "\")\n"

1825

1797 -#: wt-status.c:1305

1826 +#: wt-status.c:1356

1827 #, c-format

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

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

1830

1802 -#: wt-status.c:1308

1831 +#: wt-status.c:1359

1832 #, c-format

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

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

1835

1807 -#: wt-status.c:1311 wt-status.c:1316

1836 +#: wt-status.c:1362 wt-status.c:1367

1837 #, c-format

1838 msgid "nothing to commit\n"

1839 msgstr "inget att checka in\n"

1840

1812 -#: wt-status.c:1314

1841 +#: wt-status.c:1365

1842 #, c-format

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

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

1845

1817 -#: wt-status.c:1318

1846 +#: wt-status.c:1369

1847 #, c-format

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

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

1850

1822 -#: wt-status.c:1427

1851 +#: wt-status.c:1478

1852 msgid "HEAD (no branch)"

1853 msgstr "HEAD (ingen gren)"

1854

1826 -#: wt-status.c:1433

1855 +#: wt-status.c:1484

1856 msgid "Initial commit on "

1857 msgstr "Första incheckning på "

1858

1830 -#: wt-status.c:1463

1859 +#: wt-status.c:1514

1860 msgid "gone"

1861 msgstr "försvunnen"

1862

1834 -#: wt-status.c:1465

1863 +#: wt-status.c:1516

1864 msgid "behind "

1865 msgstr "efter "

1866

1838 -#: wt-status.c:1468 wt-status.c:1471

1867 +#: wt-status.c:1519 wt-status.c:1522

1868 msgid "ahead "

1869 msgstr "före "

1870

1842 -#: wt-status.c:1473

1871 +#: wt-status.c:1524

1872 msgid ", behind "

1873 msgstr ", efter "

1874

1846 -#: compat/precompose_utf8.c:55 builtin/clone.c:350

1875 +#: compat/precompose_utf8.c:55 builtin/clone.c:356

1876 #, c-format

1877 msgid "failed to unlink '%s'"

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

@@ -1973,15 +2002,15 @@ msgstr "Kunde inte tillämpa \"%s\""

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

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

2004

1976 -#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66

1977 -#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253

2005 +#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70

2006 +#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344

2007 #: builtin/rm.c:269

2008 msgid "dry run"

2009 msgstr "testkörning"

2010

2011 #: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19

2012 #: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612

1984 -#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113

2013 +#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113

2014 msgid "be verbose"

2015 msgstr "var pratsam"

2016

@@ -2062,11 +2091,11 @@ msgid "Maybe you wanted to say 'git add .'?\n"

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

2092

2093 #: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919

2065 -#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299

2094 +#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299

2095 msgid "index file corrupt"

2096 msgstr "indexfilen trasig"

2097

2069 -#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432

2098 +#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432

2099 msgid "Unable to write new index file"

2100 msgstr "Kunde inte skriva ny indexfil"

2101

@@ -2400,7 +2429,7 @@ msgid "unable to read index file"

2429 msgstr "kan inte läsa indexfilen"

2430

2431 #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90

2403 -#: builtin/fetch.c:77

2432 +#: builtin/fetch.c:78

2433 msgid "path"

2434 msgstr "sökväg"

2435

@@ -2598,95 +2627,95 @@ msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil"

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

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

2629

2601 -#: builtin/blame.c:2248

2630 +#: builtin/blame.c:2249

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

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

2633

2605 -#: builtin/blame.c:2249

2634 +#: builtin/blame.c:2250

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

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

2637

2609 -#: builtin/blame.c:2250

2638 +#: builtin/blame.c:2251

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

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

2641

2613 -#: builtin/blame.c:2251

2642 +#: builtin/blame.c:2252

2643 msgid "Show work cost statistics"

2644 msgstr "Visa statistik över arbetskostnad"

2645

2617 -#: builtin/blame.c:2252

2646 +#: builtin/blame.c:2253

2647 msgid "Show output score for blame entries"

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

2649

2621 -#: builtin/blame.c:2253

2650 +#: builtin/blame.c:2254

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

2652 msgstr "Visa originalfilnamn (Standard: auto)"

2653

2625 -#: builtin/blame.c:2254

2654 +#: builtin/blame.c:2255

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

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

2657

2629 -#: builtin/blame.c:2255

2658 +#: builtin/blame.c:2256

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

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

2661

2633 -#: builtin/blame.c:2256

2662 +#: builtin/blame.c:2257

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

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

2665

2637 -#: builtin/blame.c:2257

2666 +#: builtin/blame.c:2258

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

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

2669

2641 -#: builtin/blame.c:2258

2670 +#: builtin/blame.c:2259

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

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

2673

2645 -#: builtin/blame.c:2259

2674 +#: builtin/blame.c:2260

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

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

2677

2649 -#: builtin/blame.c:2260

2678 +#: builtin/blame.c:2261

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

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

2681

2653 -#: builtin/blame.c:2261

2682 +#: builtin/blame.c:2262

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

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

2685

2657 -#: builtin/blame.c:2262

2686 +#: builtin/blame.c:2263

2687 msgid "Ignore whitespace differences"

2688 msgstr "Ignorera ändringar i blanksteg"

2689

2661 -#: builtin/blame.c:2263

2690 +#: builtin/blame.c:2264

2691 msgid "Spend extra cycles to find better match"

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

2693

2665 -#: builtin/blame.c:2264

2694 +#: builtin/blame.c:2265

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

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

2697

2669 -#: builtin/blame.c:2265

2698 +#: builtin/blame.c:2266

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

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

2701

2673 -#: builtin/blame.c:2266 builtin/blame.c:2267

2702 +#: builtin/blame.c:2267 builtin/blame.c:2268

2703 msgid "score"

2704 msgstr "poäng"

2705

2677 -#: builtin/blame.c:2266

2706 +#: builtin/blame.c:2267

2707 msgid "Find line copies within and across files"

2708 msgstr "Hitta kopierade rader inuti och mellan filer"

2709

2681 -#: builtin/blame.c:2267

2710 +#: builtin/blame.c:2268

2711 msgid "Find line movements within and across files"

2712 msgstr "Hitta flyttade rader inuti och mellan filer"

2713

2685 -#: builtin/blame.c:2268

2714 +#: builtin/blame.c:2269

2715 msgid "n,m"

2716 msgstr "n,m"

2717

2689 -#: builtin/blame.c:2268

2718 +#: builtin/blame.c:2269

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

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

2721

@@ -2790,290 +2819,290 @@ msgstr "Tog bort grenen %s (var %s).\n"

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

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

2821

2793 -#: builtin/branch.c:453

2822 +#: builtin/branch.c:454

2823 #, c-format

2824 msgid "[%s: gone]"

2825 msgstr "[%s: försvunnen]"

2826

2798 -#: builtin/branch.c:456

2827 +#: builtin/branch.c:459

2828 #, c-format

2829 msgid "[%s]"

2830 msgstr "[%s]"

2831

2803 -#: builtin/branch.c:459

2832 +#: builtin/branch.c:464

2833 #, c-format

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

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

2836

2808 -#: builtin/branch.c:461

2837 +#: builtin/branch.c:466

2838 #, c-format

2839 msgid "[behind %d]"

2840 msgstr "[bakom %d] "

2841

2813 -#: builtin/branch.c:465

2842 +#: builtin/branch.c:470

2843 #, c-format

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

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

2846

2818 -#: builtin/branch.c:467

2847 +#: builtin/branch.c:472

2848 #, c-format

2849 msgid "[ahead %d]"

2850 msgstr "[före %d] "

2851

2823 -#: builtin/branch.c:470

2852 +#: builtin/branch.c:475

2853 #, c-format

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

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

2856

2828 -#: builtin/branch.c:473

2857 +#: builtin/branch.c:478

2858 #, c-format

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

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

2861

2833 -#: builtin/branch.c:496

2862 +#: builtin/branch.c:502

2863 msgid " **** invalid ref ****"

2864 msgstr " **** ogiltig ref ****"

2865

2837 -#: builtin/branch.c:588

2866 +#: builtin/branch.c:594

2867 #, c-format

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

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

2870

2842 -#: builtin/branch.c:591

2871 +#: builtin/branch.c:597

2872 #, c-format

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

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

2875

2847 -#: builtin/branch.c:594

2876 +#: builtin/branch.c:600

2877 #, c-format

2878 msgid "(detached from %s)"

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

2880

2852 -#: builtin/branch.c:597

2881 +#: builtin/branch.c:603

2882 msgid "(no branch)"

2883 msgstr "(ingen gren)"

2884

2856 -#: builtin/branch.c:643

2885 +#: builtin/branch.c:649

2886 #, c-format

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

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

2889

2861 -#: builtin/branch.c:675

2890 +#: builtin/branch.c:681

2891 msgid "some refs could not be read"

2892 msgstr "vissa referenser kunde inte läsas"

2893

2865 -#: builtin/branch.c:688

2894 +#: builtin/branch.c:694

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

2896 msgstr ""

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

2898

2870 -#: builtin/branch.c:698

2899 +#: builtin/branch.c:704

2900 #, c-format

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

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

2903

2875 -#: builtin/branch.c:713

2904 +#: builtin/branch.c:719

2905 msgid "Branch rename failed"

2906 msgstr "Misslyckades byta namn på gren"

2907

2879 -#: builtin/branch.c:717

2908 +#: builtin/branch.c:723

2909 #, c-format

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

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

2912

2884 -#: builtin/branch.c:721

2913 +#: builtin/branch.c:727

2914 #, c-format

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

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

2917

2889 -#: builtin/branch.c:728

2918 +#: builtin/branch.c:734

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

2920 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

2921

2893 -#: builtin/branch.c:743

2922 +#: builtin/branch.c:749

2923 #, c-format

2924 msgid "malformed object name %s"

2925 msgstr "felformat objektnamn %s"

2926

2898 -#: builtin/branch.c:767

2927 +#: builtin/branch.c:773

2928 #, c-format

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

2930 msgstr "kunde inte skriva grenbeskrivningsmall: %s"

2931

2903 -#: builtin/branch.c:797

2932 +#: builtin/branch.c:803

2933 msgid "Generic options"

2934 msgstr "Allmänna flaggor"

2935

2907 -#: builtin/branch.c:799

2936 +#: builtin/branch.c:805

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

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

2939

2911 -#: builtin/branch.c:800

2940 +#: builtin/branch.c:806

2941 msgid "suppress informational messages"

2942 msgstr "undertryck informationsmeddelanden"

2943

2915 -#: builtin/branch.c:801

2944 +#: builtin/branch.c:807

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

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

2947

2919 -#: builtin/branch.c:803

2948 +#: builtin/branch.c:809

2949 msgid "change upstream info"

2950 msgstr "ändra uppströmsinformation"

2951

2923 -#: builtin/branch.c:807

2952 +#: builtin/branch.c:813

2953 msgid "use colored output"

2954 msgstr "använd färgad utdata"

2955

2927 -#: builtin/branch.c:808

2956 +#: builtin/branch.c:814

2957 msgid "act on remote-tracking branches"

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

2959

2931 -#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838

2932 -#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461

2960 +#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844

2961 +#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461

2962 #: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468

2963 msgid "commit"

2964 msgstr "incheckning"

2965

2937 -#: builtin/branch.c:812 builtin/branch.c:818

2966 +#: builtin/branch.c:818 builtin/branch.c:824

2967 msgid "print only branches that contain the commit"

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

2969

2941 -#: builtin/branch.c:824

2970 +#: builtin/branch.c:830

2971 msgid "Specific git-branch actions:"

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

2973

2945 -#: builtin/branch.c:825

2974 +#: builtin/branch.c:831

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

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

2977

2949 -#: builtin/branch.c:827

2978 +#: builtin/branch.c:833

2979 msgid "delete fully merged branch"

2980 msgstr "ta bort helt sammanslagen gren"

2981

2953 -#: builtin/branch.c:828

2982 +#: builtin/branch.c:834

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

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

2985

2957 -#: builtin/branch.c:829

2986 +#: builtin/branch.c:835

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

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

2989

2961 -#: builtin/branch.c:830

2990 +#: builtin/branch.c:836

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

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

2993

2965 -#: builtin/branch.c:831

2994 +#: builtin/branch.c:837

2995 msgid "list branch names"

2996 msgstr "lista namn på grenar"

2997

2969 -#: builtin/branch.c:832

2998 +#: builtin/branch.c:838

2999 msgid "create the branch's reflog"

3000 msgstr "skapa grenens reflogg"

3001

2973 -#: builtin/branch.c:834

3002 +#: builtin/branch.c:840

3003 msgid "edit the description for the branch"

3004 msgstr "redigera beskrivning för grenen"

3005

2977 -#: builtin/branch.c:835

3006 +#: builtin/branch.c:841

3007 msgid "force creation (when already exists)"

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

3009

2981 -#: builtin/branch.c:838

3010 +#: builtin/branch.c:844

3011 msgid "print only not merged branches"

3012 msgstr "visa endast ej sammanslagna grenar"

3013

2985 -#: builtin/branch.c:844

3014 +#: builtin/branch.c:850

3015 msgid "print only merged branches"

3016 msgstr "visa endast sammanslagna grenar"

3017

2989 -#: builtin/branch.c:848

3018 +#: builtin/branch.c:854

3019 msgid "list branches in columns"

3020 msgstr "visa grenar i spalter"

3021

2993 -#: builtin/branch.c:861

3022 +#: builtin/branch.c:867

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

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

3025

2997 -#: builtin/branch.c:866 builtin/clone.c:629

3026 +#: builtin/branch.c:872 builtin/clone.c:635

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

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

3029

3001 -#: builtin/branch.c:890

3030 +#: builtin/branch.c:896

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

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

3033

3005 -#: builtin/branch.c:896 builtin/branch.c:935

3034 +#: builtin/branch.c:902 builtin/branch.c:941

3035 msgid "branch name required"

3036 msgstr "grennamn krävs"

3037

3009 -#: builtin/branch.c:911

3038 +#: builtin/branch.c:917

3039 msgid "Cannot give description to detached HEAD"

3040 msgstr "Kan inte beskriva frånkopplad HEAD"

3041

3013 -#: builtin/branch.c:916

3042 +#: builtin/branch.c:922

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

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

3045

3017 -#: builtin/branch.c:923

3046 +#: builtin/branch.c:929

3047 #, c-format

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

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

3050

3022 -#: builtin/branch.c:926

3051 +#: builtin/branch.c:932

3052 #, c-format

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

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

3055

3027 -#: builtin/branch.c:941

3056 +#: builtin/branch.c:947

3057 msgid "too many branches for a rename operation"

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

3059

3031 -#: builtin/branch.c:946

3060 +#: builtin/branch.c:952

3061 msgid "too many branches to set new upstream"

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

3063

3035 -#: builtin/branch.c:950

3064 +#: builtin/branch.c:956

3065 #, c-format

3066 msgid ""

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

3068 msgstr ""

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

3070

3042 -#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997

3071 +#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002

3072 #, c-format

3073 msgid "no such branch '%s'"

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

3075

3047 -#: builtin/branch.c:957

3076 +#: builtin/branch.c:963

3077 #, c-format

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

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

3080

3052 -#: builtin/branch.c:969

3081 +#: builtin/branch.c:975

3082 msgid "too many branches to unset upstream"

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

3084

3056 -#: builtin/branch.c:973

3085 +#: builtin/branch.c:979

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

3087 msgstr ""

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

3089

3061 -#: builtin/branch.c:979

3090 +#: builtin/branch.c:985

3091 #, c-format

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

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

3094

3066 -#: builtin/branch.c:994

3095 +#: builtin/branch.c:999

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

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

3098

3070 -#: builtin/branch.c:1000

3099 +#: builtin/branch.c:1005

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

3101 msgstr ""

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

3103 "grennamn"

3104

3076 -#: builtin/branch.c:1003

3105 +#: builtin/branch.c:1008

3106 #, c-format

3107 msgid ""

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

@@ -3082,7 +3111,7 @@ msgstr ""

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

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

3113

3085 -#: builtin/branch.c:1020

3114 +#: builtin/branch.c:1025

3115 #, c-format

3116 msgid ""

3117 "\n"

@@ -3093,12 +3122,12 @@ msgstr ""

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

3123 "\n"

3124

3096 -#: builtin/branch.c:1021

3125 +#: builtin/branch.c:1026

3126 #, c-format

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

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

3129

3101 -#: builtin/branch.c:1022

3130 +#: builtin/branch.c:1027

3131 #, c-format

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

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

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

3145 msgid "Need a repository to unbundle."

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

3147

3119 -#: builtin/cat-file.c:312

3148 +#: builtin/cat-file.c:328

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

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

3151

3123 -#: builtin/cat-file.c:313

3152 +#: builtin/cat-file.c:329

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

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

3155

3127 -#: builtin/cat-file.c:350

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

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

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

3159

3131 -#: builtin/cat-file.c:351

3160 +#: builtin/cat-file.c:367

3161 msgid "show object type"

3162 msgstr "visa objekttyp"

3163

3135 -#: builtin/cat-file.c:352

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

3165 msgid "show object size"

3166 msgstr "visa objektstorlek"

3167

3139 -#: builtin/cat-file.c:354

3168 +#: builtin/cat-file.c:370

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

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

3171

3143 -#: builtin/cat-file.c:355

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

3173 msgid "pretty-print object's content"

3174 msgstr "visa objektets innehåll snyggt"

3175

3147 -#: builtin/cat-file.c:357

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

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

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

3179

3151 -#: builtin/cat-file.c:359

3180 +#: builtin/cat-file.c:375

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

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

3183

3155 -#: builtin/cat-file.c:362

3184 +#: builtin/cat-file.c:378

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

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

3187

@@ -3180,7 +3209,7 @@ msgstr "läs filnamn från standard in"

3209 msgid "terminate input and output records by a NUL character"

3210 msgstr "avsluta in- och utdataposter med NUL-tecken"

3211

3183 -#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259

3212 +#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260

3213 msgid "suppress progress reporting"

3214 msgstr "undertryck förloppsrapportering"

3215

@@ -3471,7 +3500,7 @@ msgid "Cannot switch branch to a non-commit '%s'"

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

3501

3502 #: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88

3474 -#: builtin/remote.c:169 builtin/remote.c:171

3503 +#: builtin/remote.c:159 builtin/remote.c:161

3504 msgid "branch"

3505 msgstr "gren"

3506

@@ -3519,11 +3548,11 @@ msgstr "tvinga utcheckning (kasta bort lokala ändringar)"

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

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

3550

3522 -#: builtin/checkout.c:1106 builtin/merge.c:232

3551 +#: builtin/checkout.c:1106 builtin/merge.c:225

3552 msgid "update ignored files (default)"

3553 msgstr "uppdatera ignorerade filer (standard)"

3554

3526 -#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251

3555 +#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248

3556 msgid "style"

3557 msgstr "stil"

3558

@@ -3722,7 +3751,7 @@ msgid "remove whole directories"

3751 msgstr "ta bort hela kataloger"

3752

3753 #: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718

3725 -#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185

3754 +#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185

3755 msgid "pattern"

3756 msgstr "mönster"

3757

@@ -3762,8 +3791,8 @@ msgstr ""

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

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

3793

3765 -#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229

3766 -#: builtin/push.c:474

3794 +#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222

3795 +#: builtin/push.c:521

3796 msgid "force progress reporting"

3797 msgstr "tvinga förloppsrapportering"

3798

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

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

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

3854

3826 -#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663

3855 +#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663

3856 msgid "depth"

3857 msgstr "djup"

3858

@@ -3856,42 +3885,52 @@ msgstr "ställ in konfiguration i det nya arkivet"

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

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

3887

3859 -#: builtin/clone.c:315

3888 +#: builtin/clone.c:256

3889 +#, c-format

3890 +msgid "reference repository '%s' is shallow"

3891 +msgstr "referensarkivet \"%s\" är grunt"

3892 +

3893 +#: builtin/clone.c:259

3894 +#, c-format

3895 +msgid "reference repository '%s' is grafted"

3896 +msgstr "referensarkivet \"%s\" är ympat"

3897 +

3898 +#: builtin/clone.c:321

3899 #, c-format

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

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

3902

3864 -#: builtin/clone.c:317 builtin/diff.c:77

3903 +#: builtin/clone.c:323 builtin/diff.c:83

3904 #, c-format

3905 msgid "failed to stat '%s'"

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

3907

3869 -#: builtin/clone.c:319

3908 +#: builtin/clone.c:325

3909 #, c-format

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

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

3912

3874 -#: builtin/clone.c:333

3913 +#: builtin/clone.c:339

3914 #, c-format

3915 msgid "failed to stat %s\n"

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

3917

3879 -#: builtin/clone.c:355

3918 +#: builtin/clone.c:361

3919 #, c-format

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

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

3922

3884 -#: builtin/clone.c:359

3923 +#: builtin/clone.c:365

3924 #, c-format

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

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

3927

3889 -#: builtin/clone.c:382 builtin/clone.c:559

3928 +#: builtin/clone.c:388 builtin/clone.c:565

3929 #, c-format

3930 msgid "done.\n"

3931 msgstr "klart.\n"

3932

3894 -#: builtin/clone.c:395

3933 +#: builtin/clone.c:401

3934 msgid ""

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

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

@@ -3901,100 +3940,109 @@ msgstr ""

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

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

3942

3904 -#: builtin/clone.c:474

3943 +#: builtin/clone.c:480

3944 #, c-format

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

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

3947

3909 -#: builtin/clone.c:554

3948 +#: builtin/clone.c:560

3949 #, c-format

3950 msgid "Checking connectivity... "

3951 msgstr "Kontrollerar anslutning..."

3952

3914 -#: builtin/clone.c:557

3953 +#: builtin/clone.c:563

3954 msgid "remote did not send all necessary objects"

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

3956

3918 -#: builtin/clone.c:620

3957 +#: builtin/clone.c:626

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

3959 msgstr ""

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

3961

3923 -#: builtin/clone.c:651

3962 +#: builtin/clone.c:657

3963 msgid "unable to checkout working tree"

3964 msgstr "kunde inte checka ut arbetskatalogen"

3965

3927 -#: builtin/clone.c:759

3966 +#: builtin/clone.c:765

3967 msgid "Too many arguments."

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

3969

3931 -#: builtin/clone.c:763

3970 +#: builtin/clone.c:769

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

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

3973

3935 -#: builtin/clone.c:774

3974 +#: builtin/clone.c:780

3975 #, c-format

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

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

3978

3940 -#: builtin/clone.c:777

3979 +#: builtin/clone.c:783

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

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

3982

3944 -#: builtin/clone.c:790

3983 +#: builtin/clone.c:796

3984 #, c-format

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

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

3987

3949 -#: builtin/clone.c:795

3988 +#: builtin/clone.c:802

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

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

3991

3953 -#: builtin/clone.c:797

3992 +#: builtin/clone.c:805

3993 +msgid "source repository is shallow, ignoring --local"

3994 +msgstr "källarkivet är grunt, ignorerar --local"

3995 +

3996 +#: builtin/clone.c:810

3997 msgid "--local is ignored"

3998 msgstr "--local ignoreras"

3999

3957 -#: builtin/clone.c:807

4000 +#: builtin/clone.c:814 builtin/fetch.c:1119

4001 +#, c-format

4002 +msgid "depth %s is not a positive number"

4003 +msgstr "djupet %s är inte ett positivt tal"

4004 +

4005 +#: builtin/clone.c:824

4006 #, c-format

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

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

4009

3962 -#: builtin/clone.c:817

4010 +#: builtin/clone.c:834

4011 #, c-format

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

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

4014

3967 -#: builtin/clone.c:830 builtin/clone.c:842

4015 +#: builtin/clone.c:847 builtin/clone.c:859

4016 #, c-format

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

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

4019

3972 -#: builtin/clone.c:833

4020 +#: builtin/clone.c:850

4021 #, c-format

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

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

4024

3977 -#: builtin/clone.c:852

4025 +#: builtin/clone.c:869

4026 #, c-format

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

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

4029

3982 -#: builtin/clone.c:854

4030 +#: builtin/clone.c:871

4031 #, c-format

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

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

4034

3987 -#: builtin/clone.c:888

4035 +#: builtin/clone.c:906

4036 #, c-format

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

4038 msgstr "Vet inte hur man klonar %s"

4039

3992 -#: builtin/clone.c:939 builtin/clone.c:947

4040 +#: builtin/clone.c:957 builtin/clone.c:965

4041 #, c-format

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

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

4044

3997 -#: builtin/clone.c:950

4045 +#: builtin/clone.c:968

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

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

4048

@@ -4347,7 +4395,7 @@ msgstr "visa koncis status"

4395 msgid "show branch information"

4396 msgstr "visa information om gren"

4397

4350 -#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460

4398 +#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507

4399 msgid "machine-readable output"

4400 msgstr "maskinläsbar utdata"

4401

@@ -4428,7 +4476,7 @@ msgstr "författare"

4476 msgid "override author for commit"

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

4478

4431 -#: builtin/commit.c:1458 builtin/gc.c:260

4479 +#: builtin/commit.c:1458 builtin/gc.c:261

4480 msgid "date"

4481 msgstr "datum"

4482

@@ -4436,7 +4484,7 @@ msgstr "datum"

4484 msgid "override date for commit"

4485 msgstr "överstyr datum för inchecknignen"

4486

4439 -#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405

4487 +#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405

4488 #: builtin/notes.c:562 builtin/tag.c:455

4489 msgid "message"

4490 msgstr "meddelande"

@@ -4492,11 +4540,11 @@ msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

4540 msgid "include status in commit message template"

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

4542

4495 -#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461

4543 +#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461

4544 msgid "key id"

4545 msgstr "nyckel-id"

4546

4499 -#: builtin/commit.c:1471 builtin/merge.c:231

4547 +#: builtin/commit.c:1471 builtin/merge.c:224

4548 msgid "GPG sign commit"

4549 msgstr "GPG-signera incheckning"

4550

@@ -4553,7 +4601,7 @@ msgstr "ok att registrera en ändring med tomt meddelande"

4601 msgid "could not parse HEAD commit"

4602 msgstr "kunde inte tolka HEAD:s incheckning"

4603

4556 -#: builtin/commit.c:1567 builtin/merge.c:525

4604 +#: builtin/commit.c:1567 builtin/merge.c:518

4605 #, c-format

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

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

@@ -4572,29 +4620,29 @@ msgstr "kunde inte läsa MERGE_MODE"

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

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

4622

4575 -#: builtin/commit.c:1614

4623 +#: builtin/commit.c:1611

4624 #, c-format

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

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

4627

4580 -#: builtin/commit.c:1619

4628 +#: builtin/commit.c:1616

4629 #, c-format

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

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

4632

4585 -#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886

4633 +#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879

4634 msgid "failed to write commit object"

4635 msgstr "kunde inte skriva incheckningsobjekt"

4636

4589 -#: builtin/commit.c:1655

4637 +#: builtin/commit.c:1652

4638 msgid "cannot lock HEAD ref"

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

4640

4593 -#: builtin/commit.c:1659

4641 +#: builtin/commit.c:1656

4642 msgid "cannot update HEAD ref"

4643 msgstr "kunde inte uppdatera HEAD-referens"

4644

4597 -#: builtin/commit.c:1670

4645 +#: builtin/commit.c:1667

4646 msgid ""

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

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

@@ -4857,7 +4905,7 @@ msgstr "överväg de <n> nyaste taggarna (standard: 10)"

4905 msgid "only consider tags matching <pattern>"

4906 msgstr "överväg endast taggar som motsvarar <mönster>"

4907

4860 -#: builtin/describe.c:423 builtin/name-rev.c:322

4908 +#: builtin/describe.c:423 builtin/name-rev.c:321

4909 msgid "show abbreviated commit object as fallback"

4910 msgstr "visa förkortade incheckningsobjekt som standard"

4911

@@ -4881,31 +4929,31 @@ msgstr "Inga namn hittades, kan inte beskriva något."

4929 msgid "--dirty is incompatible with commit-ishes"

4930 msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"

4931

4884 -#: builtin/diff.c:79

4932 +#: builtin/diff.c:85

4933 #, c-format

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

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

4936

4889 -#: builtin/diff.c:230

4937 +#: builtin/diff.c:236

4938 #, c-format

4939 msgid "invalid option: %s"

4940 msgstr "ogiltig flagga: %s"

4941

4894 -#: builtin/diff.c:307

4942 +#: builtin/diff.c:357

4943 msgid "Not a git repository"

4944 msgstr "Inte ett git-arkiv"

4945

4898 -#: builtin/diff.c:350

4946 +#: builtin/diff.c:400

4947 #, c-format

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

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

4950

4903 -#: builtin/diff.c:359

4951 +#: builtin/diff.c:409

4952 #, c-format

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

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

4955

4908 -#: builtin/diff.c:366

4956 +#: builtin/diff.c:416

4957 #, c-format

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

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

@@ -4966,144 +5014,153 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"

5014 msgid "git fetch --all [<options>]"

5015 msgstr "git fetch --all [<flaggor>]"

5016

4969 -#: builtin/fetch.c:74

5017 +#: builtin/fetch.c:75

5018 msgid "fetch from all remotes"

5019 msgstr "hämta från alla fjärrar"

5020

4973 -#: builtin/fetch.c:76

5021 +#: builtin/fetch.c:77

5022 msgid "append to .git/FETCH_HEAD instead of overwriting"

5023 msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"

5024

4977 -#: builtin/fetch.c:78

5025 +#: builtin/fetch.c:79

5026 msgid "path to upload pack on remote end"

5027 msgstr "sökväg till upload pack på fjärren"

5028

4981 -#: builtin/fetch.c:79

5029 +#: builtin/fetch.c:80

5030 msgid "force overwrite of local branch"

5031 msgstr "tvinga överskrivning av lokal gren"

5032

4985 -#: builtin/fetch.c:81

5033 +#: builtin/fetch.c:82

5034 msgid "fetch from multiple remotes"

5035 msgstr "hämta från flera fjärrar"

5036

4989 -#: builtin/fetch.c:83

5037 +#: builtin/fetch.c:84

5038 msgid "fetch all tags and associated objects"

5039 msgstr "hämta alla taggar och associerade objekt"

5040

4993 -#: builtin/fetch.c:85

5041 +#: builtin/fetch.c:86

5042 msgid "do not fetch all tags (--no-tags)"

5043 msgstr "hämta inte alla taggar (--no-tags)"

5044

4997 -#: builtin/fetch.c:87

5045 +#: builtin/fetch.c:88

5046 msgid "prune remote-tracking branches no longer on remote"

5047 msgstr "rensa fjärrspårande grenar ej längre på fjärren"

5048

5001 -#: builtin/fetch.c:88

5049 +#: builtin/fetch.c:89

5050 msgid "on-demand"

5051 msgstr "on-demand"

5052

5005 -#: builtin/fetch.c:89

5053 +#: builtin/fetch.c:90

5054 msgid "control recursive fetching of submodules"

5055 msgstr "styr rekursiv hämtning av undermoduler"

5056

5009 -#: builtin/fetch.c:93

5057 +#: builtin/fetch.c:94

5058 msgid "keep downloaded pack"

5059 msgstr "behåll hämtade paket"

5060

5013 -#: builtin/fetch.c:95

5061 +#: builtin/fetch.c:96

5062 msgid "allow updating of HEAD ref"

5063 msgstr "tillåt uppdatering av HEAD-referens"

5064

5017 -#: builtin/fetch.c:98

5065 +#: builtin/fetch.c:99

5066 msgid "deepen history of shallow clone"

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

5068

5021 -#: builtin/fetch.c:100

5069 +#: builtin/fetch.c:101

5070 msgid "convert to a complete repository"

5071 msgstr "konvertera till komplett arkiv"

5072

5025 -#: builtin/fetch.c:102 builtin/log.c:1197

5073 +#: builtin/fetch.c:103 builtin/log.c:1197

5074 msgid "dir"

5075 msgstr "kat"

5076

5029 -#: builtin/fetch.c:103

5077 +#: builtin/fetch.c:104

5078 msgid "prepend this to submodule path output"

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

5080

5033 -#: builtin/fetch.c:106

5081 +#: builtin/fetch.c:107

5082 msgid "default mode for recursion"

5083 msgstr "standardläge för rekursion"

5084

5037 -#: builtin/fetch.c:236

5085 +#: builtin/fetch.c:109

5086 +msgid "accept refs that update .git/shallow"

5087 +msgstr "tar emot referenser som uppdaterar .git/shallow"

5088 +

5089 +#: builtin/fetch.c:347

5090 msgid "Couldn't find remote ref HEAD"

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

5092

5041 -#: builtin/fetch.c:290

5093 +#: builtin/fetch.c:411

5094 #, c-format

5095 msgid "object %s not found"

5096 msgstr "objektet %s hittades inte"

5097

5046 -#: builtin/fetch.c:295

5098 +#: builtin/fetch.c:416

5099 msgid "[up to date]"

5100 msgstr "[àjour]"

5101

5050 -#: builtin/fetch.c:309

5102 +#: builtin/fetch.c:430

5103 #, c-format

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

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

5106

5055 -#: builtin/fetch.c:310 builtin/fetch.c:396

5107 +#: builtin/fetch.c:431 builtin/fetch.c:517

5108 msgid "[rejected]"

5109 msgstr "[refuserad]"

5110

5059 -#: builtin/fetch.c:321

5111 +#: builtin/fetch.c:442

5112 msgid "[tag update]"

5113 msgstr "[uppdaterad tagg]"

5114

5063 -#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376

5115 +#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497

5116 msgid " (unable to update local ref)"

5117 msgstr " (kunde inte uppdatera lokal ref)"

5118

5067 -#: builtin/fetch.c:341

5119 +#: builtin/fetch.c:462

5120 msgid "[new tag]"

5121 msgstr "[ny tagg]"

5122

5071 -#: builtin/fetch.c:344

5123 +#: builtin/fetch.c:465

5124 msgid "[new branch]"

5125 msgstr "[ny gren]"

5126

5075 -#: builtin/fetch.c:347

5127 +#: builtin/fetch.c:468

5128 msgid "[new ref]"

5129 msgstr "[ny ref]"

5130

5079 -#: builtin/fetch.c:392

5131 +#: builtin/fetch.c:513

5132 msgid "unable to update local ref"

5133 msgstr "kunde inte uppdatera lokal ref"

5134

5083 -#: builtin/fetch.c:392

5135 +#: builtin/fetch.c:513

5136 msgid "forced update"

5137 msgstr "tvingad uppdatering"

5138

5087 -#: builtin/fetch.c:398

5139 +#: builtin/fetch.c:519

5140 msgid "(non-fast-forward)"

5141 msgstr "(ej snabbspolad)"

5142

5091 -#: builtin/fetch.c:429 builtin/fetch.c:735

5143 +#: builtin/fetch.c:552 builtin/fetch.c:785

5144 #, c-format

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

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

5147

5096 -#: builtin/fetch.c:438

5148 +#: builtin/fetch.c:561

5149 #, c-format

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

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

5152

5101 -#: builtin/fetch.c:537

5153 +#: builtin/fetch.c:579

5154 +#, c-format

5155 +msgid "reject %s because shallow roots are not allowed to be updated"

5156 +msgstr "avvisa %s då grunda rötter inte kan uppdateras"

5157 +

5158 +#: builtin/fetch.c:667 builtin/fetch.c:750

5159 #, c-format

5160 msgid "From %.*s\n"

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

5162

5106 -#: builtin/fetch.c:548

5163 +#: builtin/fetch.c:678

5164 #, c-format

5165 msgid ""

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

@@ -5112,55 +5169,55 @@ msgstr ""

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

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

5171

5115 -#: builtin/fetch.c:598

5172 +#: builtin/fetch.c:730

5173 #, c-format

5174 msgid " (%s will become dangling)"

5175 msgstr " (%s kommer bli dinglande)"

5176

5120 -#: builtin/fetch.c:599

5177 +#: builtin/fetch.c:731

5178 #, c-format

5179 msgid " (%s has become dangling)"

5180 msgstr " (%s har blivit dinglande)"

5181

5125 -#: builtin/fetch.c:606

5182 +#: builtin/fetch.c:755

5183 msgid "[deleted]"

5184 msgstr "[borttagen]"

5185

5129 -#: builtin/fetch.c:607 builtin/remote.c:1055

5186 +#: builtin/fetch.c:756 builtin/remote.c:1050

5187 msgid "(none)"

5188 msgstr "(ingen)"

5189

5133 -#: builtin/fetch.c:725

5190 +#: builtin/fetch.c:775

5191 #, c-format

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

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

5194

5138 -#: builtin/fetch.c:744

5195 +#: builtin/fetch.c:794

5196 #, c-format

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

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

5199

5143 -#: builtin/fetch.c:747

5200 +#: builtin/fetch.c:797

5201 #, c-format

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

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

5204

5148 -#: builtin/fetch.c:801

5205 +#: builtin/fetch.c:853

5206 #, c-format

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

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

5209

5153 -#: builtin/fetch.c:976

5210 +#: builtin/fetch.c:1015

5211 #, c-format

5212 msgid "Fetching %s\n"

5213 msgstr "Hämtar %s\n"

5214

5158 -#: builtin/fetch.c:978 builtin/remote.c:100

5215 +#: builtin/fetch.c:1017 builtin/remote.c:90

5216 #, c-format

5217 msgid "Could not fetch %s"

5218 msgstr "Kunde inte hämta %s"

5219

5163 -#: builtin/fetch.c:997

5220 +#: builtin/fetch.c:1036

5221 msgid ""

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

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

@@ -5168,32 +5225,32 @@ msgstr ""

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

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

5227

5171 -#: builtin/fetch.c:1020

5228 +#: builtin/fetch.c:1059

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

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

5231

5175 -#: builtin/fetch.c:1068

5232 +#: builtin/fetch.c:1107

5233 msgid "--depth and --unshallow cannot be used together"

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

5235

5179 -#: builtin/fetch.c:1070

5236 +#: builtin/fetch.c:1109

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

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

5239

5183 -#: builtin/fetch.c:1089

5240 +#: builtin/fetch.c:1132

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

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

5243

5187 -#: builtin/fetch.c:1091

5244 +#: builtin/fetch.c:1134

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

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

5247

5191 -#: builtin/fetch.c:1102

5248 +#: builtin/fetch.c:1145

5249 #, c-format

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

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

5252

5196 -#: builtin/fetch.c:1110

5253 +#: builtin/fetch.c:1153

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

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

5256

@@ -5203,8 +5260,8 @@ msgstr ""

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

5261

5262 #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702

5206 -#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178

5207 -#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245

5263 +#: builtin/merge.c:196 builtin/show-branch.c:654 builtin/show-ref.c:178

5264 +#: builtin/tag.c:446 parse-options.h:135 parse-options.h:242

5265 msgid "n"

5266 msgstr "n"

5267

@@ -5228,43 +5285,43 @@ msgstr "inled meddelande med <text>"

5285 msgid "file to read from"

5286 msgstr "fil att läsa från"

5287

5231 -#: builtin/for-each-ref.c:995

5288 +#: builtin/for-each-ref.c:1063

5289 msgid "git for-each-ref [options] [<pattern>]"

5290 msgstr "git for-each-ref [flaggor] [<mönster>]"

5291

5235 -#: builtin/for-each-ref.c:1010

5292 +#: builtin/for-each-ref.c:1078

5293 msgid "quote placeholders suitably for shells"

5294 msgstr "citera platshållare passande för skal"

5295

5239 -#: builtin/for-each-ref.c:1012

5296 +#: builtin/for-each-ref.c:1080

5297 msgid "quote placeholders suitably for perl"

5298 msgstr "citera platshållare passande för perl"

5299

5243 -#: builtin/for-each-ref.c:1014

5300 +#: builtin/for-each-ref.c:1082

5301 msgid "quote placeholders suitably for python"

5302 msgstr "citera platshållare passande för python"

5303

5247 -#: builtin/for-each-ref.c:1016

5304 +#: builtin/for-each-ref.c:1084

5305 msgid "quote placeholders suitably for tcl"

5306 msgstr "citera platshållare passande för tcl"

5307

5251 -#: builtin/for-each-ref.c:1019

5308 +#: builtin/for-each-ref.c:1087

5309 msgid "show only <n> matched refs"

5310 msgstr "visa endast <n> träffade refs"

5311

5255 -#: builtin/for-each-ref.c:1020

5312 +#: builtin/for-each-ref.c:1088 builtin/replace.c:177

5313 msgid "format"

5314 msgstr "format"

5315

5259 -#: builtin/for-each-ref.c:1020

5316 +#: builtin/for-each-ref.c:1088

5317 msgid "format to use for the output"

5318 msgstr "format att använda för utdata"

5319

5263 -#: builtin/for-each-ref.c:1021

5320 +#: builtin/for-each-ref.c:1089

5321 msgid "key"

5322 msgstr "nyckel"

5323

5267 -#: builtin/for-each-ref.c:1022

5324 +#: builtin/for-each-ref.c:1090

5325 msgid "field name to sort on"

5326 msgstr "fältnamn att sortera på"

5327

@@ -5308,41 +5365,41 @@ msgstr "aktivera striktare kontroll"

5365 msgid "write dangling objects in .git/lost-found"

5366 msgstr "skriv dinglande objekt i .git/lost-found"

5367

5311 -#: builtin/fsck.c:623 builtin/prune.c:134

5368 +#: builtin/fsck.c:623 builtin/prune.c:144

5369 msgid "show progress"

5370 msgstr "visa förlopp"

5371

5315 -#: builtin/gc.c:23

5372 +#: builtin/gc.c:24

5373 msgid "git gc [options]"

5374 msgstr "git gc [flaggor]"

5375

5319 -#: builtin/gc.c:79

5376 +#: builtin/gc.c:80

5377 #, c-format

5378 msgid "Invalid %s: '%s'"

5379 msgstr "Felaktigt %s: \"%s\""

5380

5324 -#: builtin/gc.c:106

5381 +#: builtin/gc.c:107

5382 #, c-format

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

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

5385

5329 -#: builtin/gc.c:261

5386 +#: builtin/gc.c:262

5387 msgid "prune unreferenced objects"

5388 msgstr "rensa ej refererade objekt"

5389

5333 -#: builtin/gc.c:263

5390 +#: builtin/gc.c:264

5391 msgid "be more thorough (increased runtime)"

5392 msgstr "var mer grundlig (ökar körtiden)"

5393

5337 -#: builtin/gc.c:264

5394 +#: builtin/gc.c:265

5395 msgid "enable auto-gc mode"

5396 msgstr "aktivera auto-gc-läge"

5397

5341 -#: builtin/gc.c:265

5398 +#: builtin/gc.c:266

5399 msgid "force running gc even if there may be another gc running"

5400 msgstr "tvinga gc-körning även om en annan gc kanske körs"

5401

5345 -#: builtin/gc.c:305

5402 +#: builtin/gc.c:306

5403 #, c-format

5404 msgid ""

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

@@ -5352,7 +5409,7 @@ msgstr ""

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

5410

5411 #. be quiet on --auto

5355 -#: builtin/gc.c:315

5412 +#: builtin/gc.c:316

5413 #, c-format

5414 msgid ""

5415 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

@@ -5360,7 +5417,7 @@ msgstr ""

5417 "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "

5418 "är fallet)"

5419

5363 -#: builtin/gc.c:340

5420 +#: builtin/gc.c:341

5421 msgid ""

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

5423 msgstr ""

@@ -5698,57 +5755,57 @@ msgstr ""

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

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

5757

5701 -#: builtin/help.c:349

5758 +#: builtin/help.c:353

5759 #, c-format

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

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

5762

5706 -#: builtin/help.c:366

5763 +#: builtin/help.c:370

5764 msgid "no man viewer handled the request"

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

5766

5710 -#: builtin/help.c:374

5767 +#: builtin/help.c:378

5768 msgid "no info viewer handled the request"

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

5770

5714 -#: builtin/help.c:420

5771 +#: builtin/help.c:424

5772 msgid "Defining attributes per path"

5773 msgstr "Definierar attribut per sökväg"

5774

5718 -#: builtin/help.c:421

5775 +#: builtin/help.c:425

5776 msgid "A Git glossary"

5777 msgstr "En Git-ordlista"

5778

5722 -#: builtin/help.c:422

5779 +#: builtin/help.c:426

5780 msgid "Specifies intentionally untracked files to ignore"

5781 msgstr "Ange avsiktligen ospårade filer att ignorera"

5782

5726 -#: builtin/help.c:423

5783 +#: builtin/help.c:427

5784 msgid "Defining submodule properties"

5785 msgstr "Ange egenskaper för undermoduler"

5786

5730 -#: builtin/help.c:424

5787 +#: builtin/help.c:428

5788 msgid "Specifying revisions and ranges for Git"

5789 msgstr "Ange versioner och intervall i Git"

5790

5734 -#: builtin/help.c:425

5791 +#: builtin/help.c:429

5792 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

5793 msgstr "Introduktion till Git (för version 1.5.1 och senare)"

5794

5738 -#: builtin/help.c:426

5795 +#: builtin/help.c:430

5796 msgid "An overview of recommended workflows with Git"

5797 msgstr "Översikt över rekommenderade arbetsflöden med Git"

5798

5742 -#: builtin/help.c:438

5799 +#: builtin/help.c:442

5800 msgid "The common Git guides are:\n"

5801 msgstr "De vanliga Git-vägledningarna är:\n"

5802

5746 -#: builtin/help.c:460 builtin/help.c:476

5803 +#: builtin/help.c:463 builtin/help.c:480

5804 #, c-format

5805 msgid "usage: %s%s"

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

5807

5751 -#: builtin/help.c:492

5808 +#: builtin/help.c:496

5809 #, c-format

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

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

@@ -6157,7 +6214,7 @@ msgstr "behörigheter"

6214 msgid "specify that the git repository is to be shared amongst several users"

6215 msgstr "ange att git-arkivet skall delas bland flera användare"

6216

6160 -#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155

6217 +#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155

6218 msgid "be quiet"

6219 msgstr "var tyst"

6220

@@ -6606,151 +6663,151 @@ msgstr "Tillgängliga strategier är:"

6663 msgid "Available custom strategies are:"

6664 msgstr "Tillgängliga skräddarsydda strategier är:"

6665

6609 -#: builtin/merge.c:198

6666 +#: builtin/merge.c:191

6667 msgid "do not show a diffstat at the end of the merge"

6668 msgstr "visa inte en diffstat när sammanslagningen är färdig"

6669

6613 -#: builtin/merge.c:201

6670 +#: builtin/merge.c:194

6671 msgid "show a diffstat at the end of the merge"

6672 msgstr "visa en diffstat när sammanslagningen är färdig"

6673

6617 -#: builtin/merge.c:202

6674 +#: builtin/merge.c:195

6675 msgid "(synonym to --stat)"

6676 msgstr "(synonym till --stat)"

6677

6621 -#: builtin/merge.c:204

6678 +#: builtin/merge.c:197

6679 msgid "add (at most <n>) entries from shortlog to merge commit message"

6680 msgstr ""

6681 "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"

6682

6626 -#: builtin/merge.c:207

6683 +#: builtin/merge.c:200

6684 msgid "create a single commit instead of doing a merge"

6685 msgstr "skapa en ensam incheckning istället för en sammanslagning"

6686

6630 -#: builtin/merge.c:209

6687 +#: builtin/merge.c:202

6688 msgid "perform a commit if the merge succeeds (default)"

6689 msgstr "utför en incheckning om sammanslagningen lyckades (standard)"

6690

6634 -#: builtin/merge.c:211

6691 +#: builtin/merge.c:204

6692 msgid "edit message before committing"

6693 msgstr "redigera meddelande innan incheckning"

6694

6638 -#: builtin/merge.c:212

6695 +#: builtin/merge.c:205

6696 msgid "allow fast-forward (default)"

6697 msgstr "tillåt snabbspolning (standard)"

6698

6642 -#: builtin/merge.c:214

6699 +#: builtin/merge.c:207

6700 msgid "abort if fast-forward is not possible"

6701 msgstr "avbryt om snabbspolning inte är möjlig"

6702

6646 -#: builtin/merge.c:218

6703 +#: builtin/merge.c:211

6704 msgid "Verify that the named commit has a valid GPG signature"

6705 msgstr "Bekräfta att den namngivna incheckningen har en giltig GPG-signatur"

6706

6650 -#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89

6707 +#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89

6708 msgid "strategy"

6709 msgstr "strategi"

6710

6654 -#: builtin/merge.c:220

6711 +#: builtin/merge.c:213

6712 msgid "merge strategy to use"

6713 msgstr "sammanslagninsstrategi att använda"

6714

6658 -#: builtin/merge.c:221

6715 +#: builtin/merge.c:214

6716 msgid "option=value"

6717 msgstr "alternativ=värde"

6718

6662 -#: builtin/merge.c:222

6719 +#: builtin/merge.c:215

6720 msgid "option for selected merge strategy"

6721 msgstr "alternativ för vald sammanslagningsstrategi"

6722

6666 -#: builtin/merge.c:224

6723 +#: builtin/merge.c:217

6724 msgid "merge commit message (for a non-fast-forward merge)"

6725 msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"

6726

6670 -#: builtin/merge.c:228

6727 +#: builtin/merge.c:221

6728 msgid "abort the current in-progress merge"

6729 msgstr "avbryt den pågående sammanslagningen"

6730

6674 -#: builtin/merge.c:257

6731 +#: builtin/merge.c:250

6732 msgid "could not run stash."

6733 msgstr "kunde köra stash."

6734

6678 -#: builtin/merge.c:262

6735 +#: builtin/merge.c:255

6736 msgid "stash failed"

6737 msgstr "stash misslyckades"

6738

6682 -#: builtin/merge.c:267

6739 +#: builtin/merge.c:260

6740 #, c-format

6741 msgid "not a valid object: %s"

6742 msgstr "inte ett giltigt objekt: %s"

6743

6687 -#: builtin/merge.c:286 builtin/merge.c:303

6744 +#: builtin/merge.c:279 builtin/merge.c:296

6745 msgid "read-tree failed"

6746 msgstr "read-tree misslyckades"

6747

6691 -#: builtin/merge.c:333

6748 +#: builtin/merge.c:326

6749 msgid " (nothing to squash)"

6750 msgstr " (inget att platta till)"

6751

6695 -#: builtin/merge.c:346

6752 +#: builtin/merge.c:339

6753 #, c-format

6754 msgid "Squash commit -- not updating HEAD\n"

6755 msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"

6756

6700 -#: builtin/merge.c:378

6757 +#: builtin/merge.c:371

6758 msgid "Writing SQUASH_MSG"

6759 msgstr "Skriver SQUASH_MSG"

6760

6704 -#: builtin/merge.c:380

6761 +#: builtin/merge.c:373

6762 msgid "Finishing SQUASH_MSG"

6763 msgstr "Avslutar SQUASH_MSG"

6764

6708 -#: builtin/merge.c:403

6765 +#: builtin/merge.c:396

6766 #, c-format

6767 msgid "No merge message -- not updating HEAD\n"

6768 msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"

6769

6713 -#: builtin/merge.c:453

6770 +#: builtin/merge.c:446

6771 #, c-format

6772 msgid "'%s' does not point to a commit"

6773 msgstr "\"%s\" verkar inte peka på en incheckning"

6774

6718 -#: builtin/merge.c:565

6775 +#: builtin/merge.c:558

6776 #, c-format

6777 msgid "Bad branch.%s.mergeoptions string: %s"

6778 msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"

6779

6723 -#: builtin/merge.c:657

6780 +#: builtin/merge.c:650

6781 msgid "git write-tree failed to write a tree"

6782 msgstr "git write-tree misslyckades skriva ett träd"

6783

6727 -#: builtin/merge.c:685

6784 +#: builtin/merge.c:678

6785 msgid "Not handling anything other than two heads merge."

6786 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."

6787

6731 -#: builtin/merge.c:699

6788 +#: builtin/merge.c:692

6789 #, c-format

6790 msgid "Unknown option for merge-recursive: -X%s"

6791 msgstr "Felaktig flagga för merge-recursive: -X%s"

6792

6736 -#: builtin/merge.c:713

6793 +#: builtin/merge.c:706

6794 #, c-format

6795 msgid "unable to write %s"

6796 msgstr "kunde inte skriva %s"

6797

6741 -#: builtin/merge.c:802

6798 +#: builtin/merge.c:795

6799 #, c-format

6800 msgid "Could not read from '%s'"

6801 msgstr "Kunde inte läsa från \"%s\""

6802

6746 -#: builtin/merge.c:811

6803 +#: builtin/merge.c:804

6804 #, c-format

6805 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

6806 msgstr ""

6807 "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "

6808 "den.\n"

6809

6753 -#: builtin/merge.c:817

6810 +#: builtin/merge.c:810

6811 #, c-format

6812 msgid ""

6813 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -6766,48 +6823,48 @@ msgstr ""

6823 "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"

6824 "avbryter incheckningen.\n"

6825

6769 -#: builtin/merge.c:841

6826 +#: builtin/merge.c:834

6827 msgid "Empty commit message."

6828 msgstr "Tomt incheckningsmeddelande."

6829

6773 -#: builtin/merge.c:853

6830 +#: builtin/merge.c:846

6831 #, c-format

6832 msgid "Wonderful.\n"

6833 msgstr "Underbart.\n"

6834

6778 -#: builtin/merge.c:918

6835 +#: builtin/merge.c:911

6836 #, c-format

6837 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

6838 msgstr ""

6839 "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"

6840

6784 -#: builtin/merge.c:934

6841 +#: builtin/merge.c:927

6842 #, c-format

6843 msgid "'%s' is not a commit"

6844 msgstr "\"%s\" är inte en incheckning"

6845

6789 -#: builtin/merge.c:975

6846 +#: builtin/merge.c:968

6847 msgid "No current branch."

6848 msgstr "Inte på någon gren."

6849

6793 -#: builtin/merge.c:977

6850 +#: builtin/merge.c:970

6851 msgid "No remote for the current branch."

6852 msgstr "Ingen fjärr för aktuell gren."

6853

6797 -#: builtin/merge.c:979

6854 +#: builtin/merge.c:972

6855 msgid "No default upstream defined for the current branch."

6856 msgstr "Ingen standarduppström angiven för aktuell gren."

6857

6801 -#: builtin/merge.c:984

6858 +#: builtin/merge.c:977

6859 #, c-format

6860 msgid "No remote-tracking branch for %s from %s"

6861 msgstr "Ingen fjärrspårande gren för %s från %s"

6862

6806 -#: builtin/merge.c:1140

6863 +#: builtin/merge.c:1133

6864 msgid "There is no merge to abort (MERGE_HEAD missing)."

6865 msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)."

6866

6810 -#: builtin/merge.c:1156 git-pull.sh:31

6867 +#: builtin/merge.c:1149 git-pull.sh:31

6868 msgid ""

6869 "You have not concluded your merge (MERGE_HEAD exists).\n"

6870 "Please, commit your changes before you can merge."

@@ -6815,11 +6872,11 @@ msgstr ""

6872 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"

6873 "Checka in dina ändringar innan du kan slå ihop."

6874

6818 -#: builtin/merge.c:1159 git-pull.sh:34

6875 +#: builtin/merge.c:1152 git-pull.sh:34

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

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

6878

6822 -#: builtin/merge.c:1163

6879 +#: builtin/merge.c:1156

6880 msgid ""

6881 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

6882 "Please, commit your changes before you can merge."

@@ -6827,140 +6884,148 @@ msgstr ""

6884 "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"

6885 "Checka in dina ändringar innan du kan slå ihop."

6886

6830 -#: builtin/merge.c:1166

6887 +#: builtin/merge.c:1159

6888 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

6889 msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."

6890

6834 -#: builtin/merge.c:1175

6891 +#: builtin/merge.c:1168

6892 msgid "You cannot combine --squash with --no-ff."

6893 msgstr "Du kan inte kombinera --squash med --no-ff."

6894

6838 -#: builtin/merge.c:1184

6895 +#: builtin/merge.c:1177

6896 msgid "No commit specified and merge.defaultToUpstream not set."

6897 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."

6898

6842 -#: builtin/merge.c:1216

6899 +#: builtin/merge.c:1209

6900 msgid "Can merge only exactly one commit into empty head"

6901 msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."

6902

6846 -#: builtin/merge.c:1219

6903 +#: builtin/merge.c:1212

6904 msgid "Squash commit into empty head not supported yet"

6905 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"

6906

6850 -#: builtin/merge.c:1221

6907 +#: builtin/merge.c:1214

6908 msgid "Non-fast-forward commit does not make sense into an empty head"

6909 msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"

6910

6854 -#: builtin/merge.c:1226

6911 +#: builtin/merge.c:1219

6912 #, c-format

6913 msgid "%s - not something we can merge"

6914 msgstr "%s - inte något vi kan slå ihop"

6915

6859 -#: builtin/merge.c:1277

6916 +#: builtin/merge.c:1270

6917 #, c-format

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

6919 msgstr ""

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

6921

6865 -#: builtin/merge.c:1280

6922 +#: builtin/merge.c:1273

6923 #, c-format

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

6925 msgstr ""

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

6927

6928 #. 'N'

6872 -#: builtin/merge.c:1283

6929 +#: builtin/merge.c:1276

6930 #, c-format

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

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

6933

6877 -#: builtin/merge.c:1286

6934 +#: builtin/merge.c:1279

6935 #, c-format

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

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

6938

6882 -#: builtin/merge.c:1370

6939 +#: builtin/merge.c:1363

6940 #, c-format

6941 msgid "Updating %s..%s\n"

6942 msgstr "Uppdaterar %s..%s\n"

6943

6887 -#: builtin/merge.c:1409

6944 +#: builtin/merge.c:1402

6945 #, c-format

6946 msgid "Trying really trivial in-index merge...\n"

6947 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"

6948

6892 -#: builtin/merge.c:1416

6949 +#: builtin/merge.c:1409

6950 #, c-format

6951 msgid "Nope.\n"

6952 msgstr "Nej.\n"

6953

6897 -#: builtin/merge.c:1448

6954 +#: builtin/merge.c:1441

6955 msgid "Not possible to fast-forward, aborting."

6956 msgstr "Kan inte snabbspola, avbryter."

6957

6901 -#: builtin/merge.c:1471 builtin/merge.c:1550

6958 +#: builtin/merge.c:1464 builtin/merge.c:1543

6959 #, c-format

6960 msgid "Rewinding the tree to pristine...\n"

6961 msgstr "Återspolar trädet till orört...\n"

6962

6906 -#: builtin/merge.c:1475

6963 +#: builtin/merge.c:1468

6964 #, c-format

6965 msgid "Trying merge strategy %s...\n"

6966 msgstr "Försöker sammanslagninsstrategin %s...\n"

6967

6911 -#: builtin/merge.c:1541

6968 +#: builtin/merge.c:1534

6969 #, c-format

6970 msgid "No merge strategy handled the merge.\n"

6971 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"

6972

6916 -#: builtin/merge.c:1543

6973 +#: builtin/merge.c:1536

6974 #, c-format

6975 msgid "Merge with strategy %s failed.\n"

6976 msgstr "Sammanslagning med strategin %s misslyckades.\n"

6977

6921 -#: builtin/merge.c:1552

6978 +#: builtin/merge.c:1545

6979 #, c-format

6980 msgid "Using the %s to prepare resolving by hand.\n"

6981 msgstr "Använder %s för att förbereda lösning för hand.\n"

6982

6926 -#: builtin/merge.c:1564

6983 +#: builtin/merge.c:1557

6984 #, c-format

6985 msgid "Automatic merge went well; stopped before committing as requested\n"

6986 msgstr ""

6987 "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n"

6988

6932 -#: builtin/merge-base.c:26

6989 +#: builtin/merge-base.c:29

6990 msgid "git merge-base [-a|--all] <commit> <commit>..."

6991 msgstr "git merge-base [-a|--all] <incheckning> <incheckning>..."

6992

6936 -#: builtin/merge-base.c:27

6993 +#: builtin/merge-base.c:30

6994 msgid "git merge-base [-a|--all] --octopus <commit>..."

6995 msgstr "git merge-base [-a|--all] --octopus <incheckning>..."

6996

6940 -#: builtin/merge-base.c:28

6997 +#: builtin/merge-base.c:31

6998 msgid "git merge-base --independent <commit>..."

6999 msgstr "git merge-base --independent <incheckning>..."

7000

6944 -#: builtin/merge-base.c:29

7001 +#: builtin/merge-base.c:32

7002 msgid "git merge-base --is-ancestor <commit> <commit>"

7003 msgstr "git merge-base --is-ancestor <incheckning> <incheckning>"

7004

6948 -#: builtin/merge-base.c:98

7005 +#: builtin/merge-base.c:33

7006 +msgid "git merge-base --fork-point <ref> [<commit>]"

7007 +msgstr "git merge-base --fork-point <ref> <incheckning>"

7008 +

7009 +#: builtin/merge-base.c:214

7010 msgid "output all common ancestors"

7011 msgstr "skriv ut alla gemensamma anfäder"

7012

6952 -#: builtin/merge-base.c:99

7013 +#: builtin/merge-base.c:216

7014 msgid "find ancestors for a single n-way merge"

7015 msgstr "hitta anfader för enkel n-vägssammanslagning"

7016

6956 -#: builtin/merge-base.c:100

7017 +#: builtin/merge-base.c:218

7018 msgid "list revs not reachable from others"

7019 msgstr "visa revisioner som inte kan nås från andra"

7020

6960 -#: builtin/merge-base.c:102

7021 +#: builtin/merge-base.c:220

7022 msgid "is the first one ancestor of the other?"

7023 msgstr "är den första anfader till den andra?"

7024

7025 +#: builtin/merge-base.c:222

7026 +msgid "find where <commit> forked from reflog of <ref>"

7027 +msgstr "se var <incheckning> grenades av från referensloggen från <ref>"

7028 +

7029 #: builtin/merge-file.c:8

7030 msgid ""

7031 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "

@@ -7020,123 +7085,127 @@ msgstr "tillåt skapa mer än ett träd"

7085 msgid "git mv [options] <source>... <destination>"

7086 msgstr "git mv [flaggor] <källa>... <mål>"

7087

7023 -#: builtin/mv.c:67

7088 +#: builtin/mv.c:71

7089 msgid "force move/rename even if target exists"

7090 msgstr "tvinga flytta/ändra namn även om målet finns"

7091

7027 -#: builtin/mv.c:68

7092 +#: builtin/mv.c:72

7093 msgid "skip move/rename errors"

7094 msgstr "hoppa över fel vid flytt/namnändring"

7095

7031 -#: builtin/mv.c:113

7096 +#: builtin/mv.c:122

7097 #, c-format

7098 msgid "Checking rename of '%s' to '%s'\n"

7099 msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"

7100

7036 -#: builtin/mv.c:117

7101 +#: builtin/mv.c:126

7102 msgid "bad source"

7103 msgstr "felaktig källa"

7104

7040 -#: builtin/mv.c:120

7105 +#: builtin/mv.c:129

7106 msgid "can not move directory into itself"

7107 msgstr "kan inte flytta katalog till sig själv"

7108

7044 -#: builtin/mv.c:123

7109 +#: builtin/mv.c:132

7110 msgid "cannot move directory over file"

7111 msgstr "kan inte flytta katalog över fil"

7112

7048 -#: builtin/mv.c:129

7113 +#: builtin/mv.c:138

7114 #, c-format

7115 msgid "Huh? Directory %s is in index and no submodule?"

7116 msgstr "Vad? Katalogen %s är i indexet och inte en undermodul?"

7117

7053 -#: builtin/mv.c:131 builtin/rm.c:318

7118 +#: builtin/mv.c:140 builtin/rm.c:318

7119 msgid "Please, stage your changes to .gitmodules or stash them to proceed"

7120 msgstr ""

7121 "Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"

7122

7058 -#: builtin/mv.c:147

7123 +#: builtin/mv.c:156

7124 #, c-format

7125 msgid "Huh? %.*s is in index?"

7126 msgstr "Vad? %.*s är i indexet?"

7127

7063 -#: builtin/mv.c:159

7128 +#: builtin/mv.c:168

7129 msgid "source directory is empty"

7130 msgstr "källkatalogen är tom"

7131

7067 -#: builtin/mv.c:191

7132 +#: builtin/mv.c:200

7133 msgid "not under version control"

7134 msgstr "inte versionshanterad"

7135

7071 -#: builtin/mv.c:193

7136 +#: builtin/mv.c:202

7137 msgid "destination exists"

7138 msgstr "destinationen finns"

7139

7075 -#: builtin/mv.c:201

7140 +#: builtin/mv.c:210

7141 #, c-format

7142 msgid "overwriting '%s'"

7143 msgstr "skriver över \"%s\""

7144

7080 -#: builtin/mv.c:204

7145 +#: builtin/mv.c:213

7146 msgid "Cannot overwrite"

7147 msgstr "Kan inte skriva över"

7148

7084 -#: builtin/mv.c:207

7149 +#: builtin/mv.c:216

7150 msgid "multiple sources for the same target"

7151 msgstr "flera källor för samma mål"

7152

7088 -#: builtin/mv.c:222

7153 +#: builtin/mv.c:218

7154 +msgid "destination directory does not exist"

7155 +msgstr "destinationskatalogen finns inte"

7156 +

7157 +#: builtin/mv.c:233

7158 #, c-format

7159 msgid "%s, source=%s, destination=%s"

7160 msgstr "%s, källa=%s, mål=%s"

7161

7093 -#: builtin/mv.c:232

7162 +#: builtin/mv.c:243

7163 #, c-format

7164 msgid "Renaming %s to %s\n"

7165 msgstr "Byter namn på %s till %s\n"

7166

7098 -#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330

7167 +#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328

7168 #, c-format

7169 msgid "renaming '%s' failed"

7170 msgstr "misslyckades byta namn på \"%s\""

7171

7103 -#: builtin/name-rev.c:259

7172 +#: builtin/name-rev.c:258

7173 msgid "git name-rev [options] <commit>..."

7174 msgstr "git name-rev [flaggor] <incheckning>..."

7175

7107 -#: builtin/name-rev.c:260

7176 +#: builtin/name-rev.c:259

7177 msgid "git name-rev [options] --all"

7178 msgstr "git name-rev [flaggor] --all"

7179

7111 -#: builtin/name-rev.c:261

7180 +#: builtin/name-rev.c:260

7181 msgid "git name-rev [options] --stdin"

7182 msgstr "git name-rev [flaggor] --stdin"

7183

7115 -#: builtin/name-rev.c:313

7184 +#: builtin/name-rev.c:312

7185 msgid "print only names (no SHA-1)"

7186 msgstr "skriv endast namn (ingen SHA-1)"

7187

7119 -#: builtin/name-rev.c:314

7188 +#: builtin/name-rev.c:313

7189 msgid "only use tags to name the commits"

7190 msgstr "använd endast taggar för att namnge incheckningar"

7191

7123 -#: builtin/name-rev.c:316

7192 +#: builtin/name-rev.c:315

7193 msgid "only use refs matching <pattern>"

7194 msgstr "använd endast referenser som motsvarar <mönster>"

7195

7127 -#: builtin/name-rev.c:318

7196 +#: builtin/name-rev.c:317

7197 msgid "list all commits reachable from all refs"

7198 msgstr "lista alla incheckningar som kan nås alla referenser"

7199

7131 -#: builtin/name-rev.c:319

7200 +#: builtin/name-rev.c:318

7201 msgid "read from stdin"

7202 msgstr "läs från standard in"

7203

7135 -#: builtin/name-rev.c:320

7204 +#: builtin/name-rev.c:319

7205 msgid "allow to print `undefined` names (default)"

7206 msgstr "tillåt att skriva \"odefinierade\" namn (standard)"

7207

7139 -#: builtin/name-rev.c:326

7208 +#: builtin/name-rev.c:325

7209 msgid "dereference tags in the input (internal use)"

7210 msgstr "avreferera taggar i indata (används internt)"

7211

@@ -7462,7 +7531,7 @@ msgstr "anteckningar-ref"

7531 msgid "use notes from <notes_ref>"

7532 msgstr "använd anteckningar från <anteckningsref>"

7533

7465 -#: builtin/notes.c:974 builtin/remote.c:1598

7534 +#: builtin/notes.c:974 builtin/remote.c:1593

7535 #, c-format

7536 msgid "Unknown subcommand: %s"

7537 msgstr "Okänt underkommando: %s"

@@ -7480,143 +7549,143 @@ msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]"

7549 msgid "deflate error (%d)"

7550 msgstr "fel i deflate (%d)"

7551

7483 -#: builtin/pack-objects.c:2398

7552 +#: builtin/pack-objects.c:2396

7553 #, c-format

7554 msgid "unsupported index version %s"

7555 msgstr "indexversionen %s stöds ej"

7556

7488 -#: builtin/pack-objects.c:2402

7557 +#: builtin/pack-objects.c:2400

7558 #, c-format

7559 msgid "bad index version '%s'"

7560 msgstr "felaktig indexversion \"%s\""

7561

7493 -#: builtin/pack-objects.c:2425

7562 +#: builtin/pack-objects.c:2423

7563 #, c-format

7564 msgid "option %s does not accept negative form"

7565 msgstr "flaggan %s godtar inte negativ form"

7566

7498 -#: builtin/pack-objects.c:2429

7567 +#: builtin/pack-objects.c:2427

7568 #, c-format

7569 msgid "unable to parse value '%s' for option %s"

7570 msgstr "kunde inte tolka värdet \"%s\" för flaggan %s"

7571

7503 -#: builtin/pack-objects.c:2448

7572 +#: builtin/pack-objects.c:2446

7573 msgid "do not show progress meter"

7574 msgstr "visa inte förloppsindikator"

7575

7507 -#: builtin/pack-objects.c:2450

7576 +#: builtin/pack-objects.c:2448

7577 msgid "show progress meter"

7578 msgstr "visa förloppsindikator"

7579

7511 -#: builtin/pack-objects.c:2452

7580 +#: builtin/pack-objects.c:2450

7581 msgid "show progress meter during object writing phase"

7582 msgstr "visa förloppsindikator under objektskrivningsfasen"

7583

7515 -#: builtin/pack-objects.c:2455

7584 +#: builtin/pack-objects.c:2453

7585 msgid "similar to --all-progress when progress meter is shown"

7586 msgstr "som --all-progress när förloppsmätaren visas"

7587

7519 -#: builtin/pack-objects.c:2456

7588 +#: builtin/pack-objects.c:2454

7589 msgid "version[,offset]"

7590 msgstr "version[,offset]"

7591

7523 -#: builtin/pack-objects.c:2457

7592 +#: builtin/pack-objects.c:2455

7593 msgid "write the pack index file in the specified idx format version"

7594 msgstr "skriv paketindexfilen i angiven indexformatversion"

7595

7527 -#: builtin/pack-objects.c:2460

7596 +#: builtin/pack-objects.c:2458

7597 msgid "maximum size of each output pack file"

7598 msgstr "maximal storlek på varje utdatapaketfil"

7599

7531 -#: builtin/pack-objects.c:2462

7600 +#: builtin/pack-objects.c:2460

7601 msgid "ignore borrowed objects from alternate object store"

7602 msgstr "ignorera lånade objekt från alternativa objektlager"

7603

7535 -#: builtin/pack-objects.c:2464

7604 +#: builtin/pack-objects.c:2462

7605 msgid "ignore packed objects"

7606 msgstr "ignorera packade objekt"

7607

7539 -#: builtin/pack-objects.c:2466

7608 +#: builtin/pack-objects.c:2464

7609 msgid "limit pack window by objects"

7610 msgstr "begränsa paketfönster efter objekt"

7611

7543 -#: builtin/pack-objects.c:2468

7612 +#: builtin/pack-objects.c:2466

7613 msgid "limit pack window by memory in addition to object limit"

7614 msgstr "begränsa paketfönster efter minne förutom objektgräns"

7615

7547 -#: builtin/pack-objects.c:2470

7616 +#: builtin/pack-objects.c:2468

7617 msgid "maximum length of delta chain allowed in the resulting pack"

7618 msgstr "maximal längd på deltakedja tillåten i slutligt paket"

7619

7551 -#: builtin/pack-objects.c:2472

7620 +#: builtin/pack-objects.c:2470

7621 msgid "reuse existing deltas"

7622 msgstr "återanvänd befintliga delta"

7623

7555 -#: builtin/pack-objects.c:2474

7624 +#: builtin/pack-objects.c:2472

7625 msgid "reuse existing objects"

7626 msgstr "återanvänd befintliga objekt"

7627

7559 -#: builtin/pack-objects.c:2476

7628 +#: builtin/pack-objects.c:2474

7629 msgid "use OFS_DELTA objects"

7630 msgstr "använd OFS_DELTA-objekt"

7631

7563 -#: builtin/pack-objects.c:2478

7632 +#: builtin/pack-objects.c:2476

7633 msgid "use threads when searching for best delta matches"

7634 msgstr "använd trådar vid sökning efter bästa deltaträffar"

7635

7567 -#: builtin/pack-objects.c:2480

7636 +#: builtin/pack-objects.c:2478

7637 msgid "do not create an empty pack output"

7638 msgstr "försök inte skapa tom paketutdata"

7639

7571 -#: builtin/pack-objects.c:2482

7640 +#: builtin/pack-objects.c:2480

7641 msgid "read revision arguments from standard input"

7642 msgstr "läs revisionsargument från standard in"

7643

7575 -#: builtin/pack-objects.c:2484

7644 +#: builtin/pack-objects.c:2482

7645 msgid "limit the objects to those that are not yet packed"

7646 msgstr "begränsa objekt till de som ännu inte packats"

7647

7579 -#: builtin/pack-objects.c:2487

7648 +#: builtin/pack-objects.c:2485

7649 msgid "include objects reachable from any reference"

7650 msgstr "inkludera objekt som kan nås från någon referens"

7651

7583 -#: builtin/pack-objects.c:2490

7652 +#: builtin/pack-objects.c:2488

7653 msgid "include objects referred by reflog entries"

7654 msgstr "inkludera objekt som refereras från referensloggposter"

7655

7587 -#: builtin/pack-objects.c:2493

7656 +#: builtin/pack-objects.c:2491

7657 msgid "output pack to stdout"

7658 msgstr "skriv paket på standard ut"

7659

7591 -#: builtin/pack-objects.c:2495

7660 +#: builtin/pack-objects.c:2493

7661 msgid "include tag objects that refer to objects to be packed"

7662 msgstr "inkludera taggobjekt som refererar objekt som skall packas"

7663

7595 -#: builtin/pack-objects.c:2497

7664 +#: builtin/pack-objects.c:2495

7665 msgid "keep unreachable objects"

7666 msgstr "behåll onåbara objekt"

7667

7599 -#: builtin/pack-objects.c:2498 parse-options.h:143

7668 +#: builtin/pack-objects.c:2496 parse-options.h:143

7669 msgid "time"

7670 msgstr "tid"

7671

7603 -#: builtin/pack-objects.c:2499

7672 +#: builtin/pack-objects.c:2497

7673 msgid "unpack unreachable objects newer than <time>"

7674 msgstr "packa upp onåbara objekt nyare än <tid>"

7675

7607 -#: builtin/pack-objects.c:2502

7676 +#: builtin/pack-objects.c:2500

7677 msgid "create thin packs"

7678 msgstr "skapa tunna paket"

7679

7611 -#: builtin/pack-objects.c:2504

7680 +#: builtin/pack-objects.c:2502

7681 msgid "ignore packs that have companion .keep file"

7682 msgstr "ignorera paket som har tillhörande .keep-fil"

7683

7615 -#: builtin/pack-objects.c:2506

7684 +#: builtin/pack-objects.c:2504

7685 msgid "pack compression level"

7686 msgstr "komprimeringsgrad för paket"

7687

7619 -#: builtin/pack-objects.c:2508

7688 +#: builtin/pack-objects.c:2506

7689 msgid "do not hide commits by grafts"

7690 msgstr "göm inte incheckningar med ympningar (\"grafts\")"

7691

@@ -7640,15 +7709,15 @@ msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"

7709 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"

7710 msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]"

7711

7643 -#: builtin/prune.c:132

7712 +#: builtin/prune.c:142

7713 msgid "do not remove, show only"

7714 msgstr "ta inte bort, bara visa"

7715

7647 -#: builtin/prune.c:133

7716 +#: builtin/prune.c:143

7717 msgid "report pruned objects"

7718 msgstr "rapportera borttagna objekt"

7719

7651 -#: builtin/prune.c:136

7720 +#: builtin/prune.c:146

7721 msgid "expire objects older than <time>"

7722 msgstr "låt tid gå ut för objekt äldre än <tid>"

7723

@@ -7656,15 +7725,15 @@ msgstr "låt tid gå ut för objekt äldre än <tid>"

7725 msgid "git push [<options>] [<repository> [<refspec>...]]"

7726 msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]"

7727

7659 -#: builtin/push.c:47

7728 +#: builtin/push.c:86

7729 msgid "tag shorthand without <tag>"

7730 msgstr "taggförkortning utan <tagg>"

7731

7663 -#: builtin/push.c:66

7732 +#: builtin/push.c:96

7733 msgid "--delete only accepts plain target ref names"

7734 msgstr "--delete godtar endast enkla målreferensnamn"

7735

7667 -#: builtin/push.c:101

7736 +#: builtin/push.c:141

7737 msgid ""

7738 "\n"

7739 "To choose either option permanently, see push.default in 'git help config'."

@@ -7673,7 +7742,7 @@ msgstr ""

7742 "För att välja ett av alternativen permanent, se push.default i \"git help "

7743 "config\"."

7744

7676 -#: builtin/push.c:104

7745 +#: builtin/push.c:144

7746 #, c-format

7747 msgid ""

7748 "The upstream branch of your current branch does not match\n"

@@ -7698,7 +7767,7 @@ msgstr ""

7767 " git push %s %s\n"

7768 "%s"

7769

7701 -#: builtin/push.c:119

7770 +#: builtin/push.c:159

7771 #, c-format

7772 msgid ""

7773 "You are not currently on a branch.\n"

@@ -7713,7 +7782,7 @@ msgstr ""

7782 "\n"

7783 " git push %s HEAD:<namn-på-fjärrgren>\n"

7784

7716 -#: builtin/push.c:133

7785 +#: builtin/push.c:173

7786 #, c-format

7787 msgid ""

7788 "The current branch %s has no upstream branch.\n"

@@ -7726,12 +7795,12 @@ msgstr ""

7795 "\n"

7796 " git push --set-upstream %s %s\n"

7797

7729 -#: builtin/push.c:141

7798 +#: builtin/push.c:181

7799 #, c-format

7800 msgid "The current branch %s has multiple upstream branches, refusing to push."

7801 msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända."

7802

7734 -#: builtin/push.c:144

7803 +#: builtin/push.c:184

7804 #, c-format

7805 msgid ""

7806 "You are pushing to remote '%s', which is not the upstream of\n"

@@ -7742,7 +7811,7 @@ msgstr ""

7811 "aktuella grenen \"%s\", utan att tala om för mig vad som\n"

7812 "skall sändas för att uppdatera fjärrgrenen."

7813

7745 -#: builtin/push.c:167

7814 +#: builtin/push.c:207

7815 msgid ""

7816 "push.default is unset; its implicit value is changing in\n"

7817 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"

@@ -7754,6 +7823,13 @@ msgid ""

7823 "\n"

7824 " git config --global push.default simple\n"

7825 "\n"

7826 +"When push.default is set to 'matching', git will push local branches\n"

7827 +"to the remote branches that already exist with the same name.\n"

7828 +"\n"

7829 +"In Git 2.0, Git will default to the more conservative 'simple'\n"

7830 +"behavior, which only pushes the current branch to the corresponding\n"

7831 +"remote branch that 'git pull' uses to update the current branch.\n"

7832 +"\n"

7833 "See 'git help config' and search for 'push.default' for further "

7834 "information.\n"

7835 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"

@@ -7771,19 +7847,27 @@ msgstr ""

7847 "\n"

7848 " git config --global push.default simple\n"

7849 "\n"

7850 +"Nör push.default är satt till \"matching\" kommer git att sända lokala "

7851 +"grenar\n"

7852 +"till fjärrgrenar som redan finns och som har samma namn.\n"

7853 +"\n"

7854 +"Git 2.0 kommer som standard välja den mer konservativa inställningen\n"

7855 +"\"simple\", vilket bara sänder in den aktuella grenen till den motsvarande\n"

7856 +"fjärrgren \"git pull\" använder för att uppdatera den aktuella grenen.\n"

7857 +"\n"

7858 "Se \"git help config\" och sök efter \"push.default\" för ytterligare \n"

7859 "information. (Läget \"simple\" introducerades i Git 1.7.11. Använd det\n"

7860 "liknande läget \"current\" istället för \"simple\" om du ibland använder\n"

7861 "äldre versioner av Git.)"

7862

7779 -#: builtin/push.c:227

7863 +#: builtin/push.c:274

7864 msgid ""

7865 "You didn't specify any refspecs to push, and push.default is \"nothing\"."

7866 msgstr ""

7867 "Du angav inga referensspecifikationer att sända, och push.default är "

7868 "\"nothing\"."

7869

7786 -#: builtin/push.c:234

7870 +#: builtin/push.c:281

7871 msgid ""

7872 "Updates were rejected because the tip of your current branch is behind\n"

7873 "its remote counterpart. Integrate the remote changes (e.g.\n"

@@ -7795,7 +7879,7 @@ msgstr ""

7879 "\"git pull ....\") innan du sänder igen.\n"

7880 "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."

7881

7798 -#: builtin/push.c:240

7882 +#: builtin/push.c:287

7883 msgid ""

7884 "Updates were rejected because a pushed branch tip is behind its remote\n"

7885 "counterpart. If you did not intend to push that branch, you may want to\n"

@@ -7809,7 +7893,7 @@ msgstr ""

7893 "endast\n"

7894 "sända aktuell gren."

7895

7812 -#: builtin/push.c:246

7896 +#: builtin/push.c:293

7897 msgid ""

7898 "Updates were rejected because a pushed branch tip is behind its remote\n"

7899 "counterpart. Check out this branch and integrate the remote changes\n"

@@ -7821,7 +7905,7 @@ msgstr ""

7905 "\"git pull ...\") innan du sänder igen.\n"

7906 "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."

7907

7824 -#: builtin/push.c:252

7908 +#: builtin/push.c:299

7909 msgid ""

7910 "Updates were rejected because the remote contains work that you do\n"

7911 "not have locally. This is usually caused by another repository pushing\n"

@@ -7835,11 +7919,11 @@ msgstr ""

7919 "(t.ex. \"git pull ...\") innan du sänder igen.\n"

7920 "Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer."

7921

7838 -#: builtin/push.c:259

7922 +#: builtin/push.c:306

7923 msgid "Updates were rejected because the tag already exists in the remote."

7924 msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren."

7925

7842 -#: builtin/push.c:262

7926 +#: builtin/push.c:309

7927 msgid ""

7928 "You cannot update a remote ref that points at a non-commit object,\n"

7929 "or update a remote ref to make it point at a non-commit object,\n"

@@ -7850,22 +7934,22 @@ msgstr ""

7934 "pekar på något som inte är en incheckning, utan att använda flaggan\n"

7935 "\"--force\".\n"

7936

7853 -#: builtin/push.c:328

7937 +#: builtin/push.c:375

7938 #, c-format

7939 msgid "Pushing to %s\n"

7940 msgstr "Sänder till %s\n"

7941

7858 -#: builtin/push.c:332

7942 +#: builtin/push.c:379

7943 #, c-format

7944 msgid "failed to push some refs to '%s'"

7945 msgstr "misslyckades sända vissa referenser till \"%s\""

7946

7863 -#: builtin/push.c:365

7947 +#: builtin/push.c:412

7948 #, c-format

7949 msgid "bad repository '%s'"

7950 msgstr "felaktigt arkiv \"%s\""

7951

7868 -#: builtin/push.c:366

7952 +#: builtin/push.c:413

7953 msgid ""

7954 "No configured push destination.\n"

7955 "Either specify the URL from the command-line or configure a remote "

@@ -7886,95 +7970,95 @@ msgstr ""

7970 "\n"

7971 " git push <namn>\n"

7972

7889 -#: builtin/push.c:381

7973 +#: builtin/push.c:428

7974 msgid "--all and --tags are incompatible"

7975 msgstr "--all och --tags är inkompatibla"

7976

7893 -#: builtin/push.c:382

7977 +#: builtin/push.c:429

7978 msgid "--all can't be combined with refspecs"

7979 msgstr "--all kan inte kombineras med referensspecifikationer"

7980

7897 -#: builtin/push.c:387

7981 +#: builtin/push.c:434

7982 msgid "--mirror and --tags are incompatible"

7983 msgstr "--mirror och --tags är inkompatibla"

7984

7901 -#: builtin/push.c:388

7985 +#: builtin/push.c:435

7986 msgid "--mirror can't be combined with refspecs"

7987 msgstr "--mirror kan inte kombineras med referensspecifikationer"

7988

7905 -#: builtin/push.c:393

7989 +#: builtin/push.c:440

7990 msgid "--all and --mirror are incompatible"

7991 msgstr "--all och --mirror är inkompatibla"

7992

7909 -#: builtin/push.c:453

7993 +#: builtin/push.c:500

7994 msgid "repository"

7995 msgstr "arkiv"

7996

7913 -#: builtin/push.c:454

7997 +#: builtin/push.c:501

7998 msgid "push all refs"

7999 msgstr "sänd alla referenser"

8000

7917 -#: builtin/push.c:455

8001 +#: builtin/push.c:502

8002 msgid "mirror all refs"

8003 msgstr "spegla alla referenser"

8004

7921 -#: builtin/push.c:457

8005 +#: builtin/push.c:504

8006 msgid "delete refs"

8007 msgstr "ta bort referenser"

8008

7925 -#: builtin/push.c:458

8009 +#: builtin/push.c:505

8010 msgid "push tags (can't be used with --all or --mirror)"

8011 msgstr "sänd taggar (kan inte användas med --all eller --mirror)"

8012

7929 -#: builtin/push.c:461

8013 +#: builtin/push.c:508

8014 msgid "force updates"

8015 msgstr "tvinga uppdateringar"

8016

7933 -#: builtin/push.c:463

8017 +#: builtin/push.c:510

8018 msgid "refname>:<expect"

8019 msgstr "refnamn>:<förvänta"

8020

7937 -#: builtin/push.c:464

8021 +#: builtin/push.c:511

8022 msgid "require old value of ref to be at this value"

8023 msgstr "kräv att ref:s tidigare värde är detta"

8024

7941 -#: builtin/push.c:466

8025 +#: builtin/push.c:513

8026 msgid "check"

8027 msgstr "kontrollera"

8028

7945 -#: builtin/push.c:467

8029 +#: builtin/push.c:514

8030 msgid "control recursive pushing of submodules"

8031 msgstr "styr rekursiv insändning av undermoduler"

8032

7949 -#: builtin/push.c:469

8033 +#: builtin/push.c:516

8034 msgid "use thin pack"

8035 msgstr "använd tunna paket"

8036

7953 -#: builtin/push.c:470 builtin/push.c:471

8037 +#: builtin/push.c:517 builtin/push.c:518

8038 msgid "receive pack program"

8039 msgstr "program för att ta emot paket"

8040

7957 -#: builtin/push.c:472

8041 +#: builtin/push.c:519

8042 msgid "set upstream for git pull/status"

8043 msgstr "ställ in uppström för git pull/status"

8044

7961 -#: builtin/push.c:475

8045 +#: builtin/push.c:522

8046 msgid "prune locally removed refs"

8047 msgstr "ta bort lokalt borttagna referenser"

8048

7965 -#: builtin/push.c:477

8049 +#: builtin/push.c:524

8050 msgid "bypass pre-push hook"

8051 msgstr "förbigå pre-push-krok"

8052

7969 -#: builtin/push.c:478

8053 +#: builtin/push.c:525

8054 msgid "push missing but relevant tags"

8055 msgstr "sänd in saknade men relevanta taggar"

8056

7973 -#: builtin/push.c:488

8057 +#: builtin/push.c:535

8058 msgid "--delete is incompatible with --all, --mirror and --tags"

8059 msgstr "--delete är imkompatibel med --all, --mirror och --tags"

8060

7977 -#: builtin/push.c:490

8061 +#: builtin/push.c:537

8062 msgid "--delete doesn't make sense without any refs"

8063 msgstr "--delete kan inte användas utan referenser"

8064

@@ -8062,11 +8146,11 @@ msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"

8146 msgid "'%s' is not a valid timestamp"

8147 msgstr "\"%s\" är inte en giltig tidsstämpel"

8148

8065 -#: builtin/remote.c:11

8149 +#: builtin/remote.c:12

8150 msgid "git remote [-v | --verbose]"

8151 msgstr "git remote [-v | --verbose]"

8152

8069 -#: builtin/remote.c:12

8153 +#: builtin/remote.c:13

8154 msgid ""

8155 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"

8156 "mirror=<fetch|push>] <name> <url>"

@@ -8074,82 +8158,82 @@ msgstr ""

8158 "git remote add [-t <gren>] [-m <master>] [-f] [--tags|--no-tags] [--"

8159 "mirror=<fetch|push>] <namn> <url>"

8160

8077 -#: builtin/remote.c:13 builtin/remote.c:32

8161 +#: builtin/remote.c:14 builtin/remote.c:33

8162 msgid "git remote rename <old> <new>"

8163 msgstr "git remote rename <gammal> <ny>"

8164

8081 -#: builtin/remote.c:14 builtin/remote.c:37

8165 +#: builtin/remote.c:15 builtin/remote.c:38

8166 msgid "git remote remove <name>"

8167 msgstr "git remote remove <namn>"

8168

8085 -#: builtin/remote.c:15

8169 +#: builtin/remote.c:16

8170 msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"

8171 msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"

8172

8089 -#: builtin/remote.c:16

8173 +#: builtin/remote.c:17

8174 msgid "git remote [-v | --verbose] show [-n] <name>"

8175 msgstr "git remote [-v | --verbose] show [-n] <namn>"

8176

8093 -#: builtin/remote.c:17

8177 +#: builtin/remote.c:18

8178 msgid "git remote prune [-n | --dry-run] <name>"

8179 msgstr "git remote prune [-n | --dry-run] <namn>"

8180

8097 -#: builtin/remote.c:18

8181 +#: builtin/remote.c:19

8182 msgid ""

8183 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"

8184 msgstr ""

8185 "git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjärr>)...]"

8186

8103 -#: builtin/remote.c:19

8187 +#: builtin/remote.c:20

8188 msgid "git remote set-branches [--add] <name> <branch>..."

8189 msgstr "git remote set-branches [--add] <namn> <gren>..."

8190

8107 -#: builtin/remote.c:20 builtin/remote.c:68

8191 +#: builtin/remote.c:21 builtin/remote.c:69

8192 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"

8193 msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]"

8194

8111 -#: builtin/remote.c:21 builtin/remote.c:69

8195 +#: builtin/remote.c:22 builtin/remote.c:70

8196 msgid "git remote set-url --add <name> <newurl>"

8197 msgstr "git remote set-url --add <namn> <nyurl>"

8198

8115 -#: builtin/remote.c:22 builtin/remote.c:70

8199 +#: builtin/remote.c:23 builtin/remote.c:71

8200 msgid "git remote set-url --delete <name> <url>"

8201 msgstr "git remote set-url --delete <namn> <url>"

8202

8119 -#: builtin/remote.c:27

8203 +#: builtin/remote.c:28

8204 msgid "git remote add [<options>] <name> <url>"

8205 msgstr "git remote add [<flaggor>] <namn> <url>"

8206

8123 -#: builtin/remote.c:42

8207 +#: builtin/remote.c:43

8208 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"

8209 msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"

8210

8127 -#: builtin/remote.c:47

8211 +#: builtin/remote.c:48

8212 msgid "git remote set-branches <name> <branch>..."

8213 msgstr "git remote set-branches <namn> <gren>..."

8214

8131 -#: builtin/remote.c:48

8215 +#: builtin/remote.c:49

8216 msgid "git remote set-branches --add <name> <branch>..."

8217 msgstr "git remote set-branches --add <namn> <gren>..."

8218

8135 -#: builtin/remote.c:53

8219 +#: builtin/remote.c:54

8220 msgid "git remote show [<options>] <name>"

8221 msgstr "git remote show [<flaggor>] <namn>"

8222

8139 -#: builtin/remote.c:58

8223 +#: builtin/remote.c:59

8224 msgid "git remote prune [<options>] <name>"

8225 msgstr "git remote prune [<flaggor>] <namn>"

8226

8143 -#: builtin/remote.c:63

8227 +#: builtin/remote.c:64

8228 msgid "git remote update [<options>] [<group> | <remote>]..."

8229 msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..."

8230

8147 -#: builtin/remote.c:98

8231 +#: builtin/remote.c:88

8232 #, c-format

8233 msgid "Updating %s"

8234 msgstr "Uppdaterar %s"

8235

8152 -#: builtin/remote.c:130

8236 +#: builtin/remote.c:120

8237 msgid ""

8238 "--mirror is dangerous and deprecated; please\n"

8239 "\t use --mirror=fetch or --mirror=push instead"

@@ -8157,101 +8241,101 @@ msgstr ""

8241 "--mirror är farlig och föråldrad; använd\n"

8242 "\t --mirror=fetch eller --mirror=push istället"

8243

8160 -#: builtin/remote.c:147

8244 +#: builtin/remote.c:137

8245 #, c-format

8246 msgid "unknown mirror argument: %s"

8247 msgstr "okänt argument till mirror: %s"

8248

8165 -#: builtin/remote.c:163

8249 +#: builtin/remote.c:153

8250 msgid "fetch the remote branches"

8251 msgstr "hämta fjärrgrenarna"

8252

8169 -#: builtin/remote.c:165

8253 +#: builtin/remote.c:155

8254 msgid "import all tags and associated objects when fetching"

8255 msgstr "importera alla taggar och associerade objekt vid hämtning"

8256

8173 -#: builtin/remote.c:168

8257 +#: builtin/remote.c:158

8258 msgid "or do not fetch any tag at all (--no-tags)"

8259 msgstr "eller hämta inte några taggar alls (--no-tags)"

8260

8177 -#: builtin/remote.c:170

8261 +#: builtin/remote.c:160

8262 msgid "branch(es) to track"

8263 msgstr "gren(ar) att spåra"

8264

8181 -#: builtin/remote.c:171

8265 +#: builtin/remote.c:161

8266 msgid "master branch"

8267 msgstr "huvudgren"

8268

8185 -#: builtin/remote.c:172

8269 +#: builtin/remote.c:162

8270 msgid "push|fetch"

8271 msgstr "push|fetch"

8272

8189 -#: builtin/remote.c:173

8273 +#: builtin/remote.c:163

8274 msgid "set up remote as a mirror to push to or fetch from"

8275 msgstr "ställ in arkiv som spegel att sända eller ta emot från"

8276

8193 -#: builtin/remote.c:185

8277 +#: builtin/remote.c:175

8278 msgid "specifying a master branch makes no sense with --mirror"

8279 msgstr "att ange en master-gren ger ingen mening med --mirror"

8280

8197 -#: builtin/remote.c:187

8281 +#: builtin/remote.c:177

8282 msgid "specifying branches to track makes sense only with fetch mirrors"

8283 msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar"

8284

8201 -#: builtin/remote.c:195 builtin/remote.c:646

8285 +#: builtin/remote.c:185 builtin/remote.c:641

8286 #, c-format

8287 msgid "remote %s already exists."

8288 msgstr "fjärrarkivet %s finns redan."

8289

8206 -#: builtin/remote.c:199 builtin/remote.c:650

8290 +#: builtin/remote.c:189 builtin/remote.c:645

8291 #, c-format

8292 msgid "'%s' is not a valid remote name"

8293 msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"

8294

8211 -#: builtin/remote.c:243

8295 +#: builtin/remote.c:233

8296 #, c-format

8297 msgid "Could not setup master '%s'"

8298 msgstr "Kunde inte skapa master \"%s\""

8299

8216 -#: builtin/remote.c:299

8300 +#: builtin/remote.c:289

8301 #, c-format

8302 msgid "more than one %s"

8303 msgstr "mer än en %s"

8304

8221 -#: builtin/remote.c:339

8305 +#: builtin/remote.c:334

8306 #, c-format

8307 msgid "Could not get fetch map for refspec %s"

8308 msgstr "Kunde inte hämta mappning för referensspecifikation %s"

8309

8226 -#: builtin/remote.c:440 builtin/remote.c:448

8310 +#: builtin/remote.c:435 builtin/remote.c:443

8311 msgid "(matching)"

8312 msgstr "(matchande)"

8313

8230 -#: builtin/remote.c:452

8314 +#: builtin/remote.c:447

8315 msgid "(delete)"

8316 msgstr "(ta bort)"

8317

8234 -#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607

8318 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602

8319 #, c-format

8320 msgid "Could not append '%s' to '%s'"

8321 msgstr "Kunde inte tillämpa \"%s\" på \"%s\""

8322

8239 -#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890

8323 +#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885

8324 #, c-format

8325 msgid "No such remote: %s"

8326 msgstr "Inget sådant fjärrarkiv: %s"

8327

8244 -#: builtin/remote.c:656

8328 +#: builtin/remote.c:651

8329 #, c-format

8330 msgid "Could not rename config section '%s' to '%s'"

8331 msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\""

8332

8249 -#: builtin/remote.c:662 builtin/remote.c:799

8333 +#: builtin/remote.c:657 builtin/remote.c:794

8334 #, c-format

8335 msgid "Could not remove config section '%s'"

8336 msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""

8337

8254 -#: builtin/remote.c:677

8338 +#: builtin/remote.c:672

8339 #, c-format

8340 msgid ""

8341 "Not updating non-default fetch refspec\n"

@@ -8262,32 +8346,32 @@ msgstr ""

8346 "\t%s\n"

8347 "\tUppdatera konfigurationen manuellt om nödvändigt."

8348

8265 -#: builtin/remote.c:683

8349 +#: builtin/remote.c:678

8350 #, c-format

8351 msgid "Could not append '%s'"

8352 msgstr "Kunde inte lägga till på \"%s\""

8353

8270 -#: builtin/remote.c:694

8354 +#: builtin/remote.c:689

8355 #, c-format

8356 msgid "Could not set '%s'"

8357 msgstr "Kunde inte sätta \"%s\""

8358

8275 -#: builtin/remote.c:716

8359 +#: builtin/remote.c:711

8360 #, c-format

8361 msgid "deleting '%s' failed"

8362 msgstr "misslyckades ta bort \"%s\""

8363

8280 -#: builtin/remote.c:750

8364 +#: builtin/remote.c:745

8365 #, c-format

8366 msgid "creating '%s' failed"

8367 msgstr "misslyckades skapa \"%s\""

8368

8285 -#: builtin/remote.c:764

8369 +#: builtin/remote.c:759

8370 #, c-format

8371 msgid "Could not remove branch %s"

8372 msgstr "Kunde inte ta bort grenen %s"

8373

8290 -#: builtin/remote.c:834

8374 +#: builtin/remote.c:829

8375 msgid ""

8376 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"

8377 "to delete it, use:"

@@ -8301,262 +8385,262 @@ msgstr[1] ""

8385 "Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n"

8386 "för att ta bort dem, använd:"

8387

8304 -#: builtin/remote.c:943

8388 +#: builtin/remote.c:938

8389 #, c-format

8390 msgid " new (next fetch will store in remotes/%s)"

8391 msgstr " ny (nästa hämtning sparar i remotes/%s)"

8392

8309 -#: builtin/remote.c:946

8393 +#: builtin/remote.c:941

8394 msgid " tracked"

8395 msgstr " spårad"

8396

8313 -#: builtin/remote.c:948

8397 +#: builtin/remote.c:943

8398 msgid " stale (use 'git remote prune' to remove)"

8399 msgstr " förlegad (använd \"git remote prune\" för att ta bort)"

8400

8317 -#: builtin/remote.c:950

8401 +#: builtin/remote.c:945

8402 msgid " ???"

8403 msgstr " ???"

8404

8321 -#: builtin/remote.c:991

8405 +#: builtin/remote.c:986

8406 #, c-format

8407 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"

8408 msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren"

8409

8326 -#: builtin/remote.c:998

8410 +#: builtin/remote.c:993

8411 #, c-format

8412 msgid "rebases onto remote %s"

8413 msgstr "ombaseras på fjärren %s"

8414

8331 -#: builtin/remote.c:1001

8415 +#: builtin/remote.c:996

8416 #, c-format

8417 msgid " merges with remote %s"

8418 msgstr " sammanslås med fjärren %s"

8419

8336 -#: builtin/remote.c:1002

8420 +#: builtin/remote.c:997

8421 msgid " and with remote"

8422 msgstr " och med fjärren"

8423

8340 -#: builtin/remote.c:1004

8424 +#: builtin/remote.c:999

8425 #, c-format

8426 msgid "merges with remote %s"

8427 msgstr "sammanslås med fjärren %s"

8428

8345 -#: builtin/remote.c:1005

8429 +#: builtin/remote.c:1000

8430 msgid " and with remote"

8431 msgstr " och med fjärren"

8432

8349 -#: builtin/remote.c:1051

8433 +#: builtin/remote.c:1046

8434 msgid "create"

8435 msgstr "skapa"

8436

8353 -#: builtin/remote.c:1054

8437 +#: builtin/remote.c:1049

8438 msgid "delete"

8439 msgstr "ta bort"

8440

8357 -#: builtin/remote.c:1058

8441 +#: builtin/remote.c:1053

8442 msgid "up to date"

8443 msgstr "àjour"

8444

8361 -#: builtin/remote.c:1061

8445 +#: builtin/remote.c:1056

8446 msgid "fast-forwardable"

8447 msgstr "kan snabbspolas"

8448

8365 -#: builtin/remote.c:1064

8449 +#: builtin/remote.c:1059

8450 msgid "local out of date"

8451 msgstr "lokal föråldrad"

8452

8369 -#: builtin/remote.c:1071

8453 +#: builtin/remote.c:1066

8454 #, c-format

8455 msgid " %-*s forces to %-*s (%s)"

8456 msgstr " %-*s tvingar till %-*s (%s)"

8457

8374 -#: builtin/remote.c:1074

8458 +#: builtin/remote.c:1069

8459 #, c-format

8460 msgid " %-*s pushes to %-*s (%s)"

8461 msgstr " %-*s sänder till %-*s (%s)"

8462

8379 -#: builtin/remote.c:1078

8463 +#: builtin/remote.c:1073

8464 #, c-format

8465 msgid " %-*s forces to %s"

8466 msgstr " %-*s tvingar till %s"

8467

8384 -#: builtin/remote.c:1081

8468 +#: builtin/remote.c:1076

8469 #, c-format

8470 msgid " %-*s pushes to %s"

8471 msgstr " %-*s sänder till %s"

8472

8389 -#: builtin/remote.c:1091

8473 +#: builtin/remote.c:1144

8474 msgid "do not query remotes"

8475 msgstr "fråga inte fjärrar"

8476

8393 -#: builtin/remote.c:1118

8477 +#: builtin/remote.c:1171

8478 #, c-format

8479 msgid "* remote %s"

8480 msgstr "* fjärr %s"

8481

8398 -#: builtin/remote.c:1119

8482 +#: builtin/remote.c:1172

8483 #, c-format

8484 msgid " Fetch URL: %s"

8485 msgstr " Hämt-URL: %s"

8486

8403 -#: builtin/remote.c:1120 builtin/remote.c:1285

8487 +#: builtin/remote.c:1173 builtin/remote.c:1318

8488 msgid "(no URL)"

8489 msgstr "(ingen URL)"

8490

8407 -#: builtin/remote.c:1129 builtin/remote.c:1131

8491 +#: builtin/remote.c:1182 builtin/remote.c:1184

8492 #, c-format

8493 msgid " Push URL: %s"

8494 msgstr " Sänd-URL: %s"

8495

8412 -#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137

8496 +#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190

8497 #, c-format

8498 msgid " HEAD branch: %s"

8499 msgstr " HEAD-gren: %s"

8500

8417 -#: builtin/remote.c:1139

8501 +#: builtin/remote.c:1192

8502 #, c-format

8503 msgid ""

8504 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"

8505 msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n"

8506

8423 -#: builtin/remote.c:1151

8507 +#: builtin/remote.c:1204

8508 #, c-format

8509 msgid " Remote branch:%s"

8510 msgid_plural " Remote branches:%s"

8511 msgstr[0] " Fjärrgren:%s"

8512 msgstr[1] " Fjärrgrenar:%s"

8513

8430 -#: builtin/remote.c:1154 builtin/remote.c:1181

8514 +#: builtin/remote.c:1207 builtin/remote.c:1234

8515 msgid " (status not queried)"

8516 msgstr " (status inte förfrågad)"

8517

8434 -#: builtin/remote.c:1163

8518 +#: builtin/remote.c:1216

8519 msgid " Local branch configured for 'git pull':"

8520 msgid_plural " Local branches configured for 'git pull':"

8521 msgstr[0] " Lokal gren konfigurerad för \"git pull\":"

8522 msgstr[1] " Lokala grenar konfigurerade för \"git pull\":"

8523

8440 -#: builtin/remote.c:1171

8524 +#: builtin/remote.c:1224

8525 msgid " Local refs will be mirrored by 'git push'"

8526 msgstr " Lokala referenser speglas av \"git push\""

8527

8444 -#: builtin/remote.c:1178

8528 +#: builtin/remote.c:1231

8529 #, c-format

8530 msgid " Local ref configured for 'git push'%s:"

8531 msgid_plural " Local refs configured for 'git push'%s:"

8532 msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:"

8533 msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:"

8534

8451 -#: builtin/remote.c:1199

8535 +#: builtin/remote.c:1252

8536 msgid "set refs/remotes/<name>/HEAD according to remote"

8537 msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"

8538

8455 -#: builtin/remote.c:1201

8539 +#: builtin/remote.c:1254

8540 msgid "delete refs/remotes/<name>/HEAD"

8541 msgstr "ta bort refs/remotes/<namn>/HEAD"

8542

8459 -#: builtin/remote.c:1216

8543 +#: builtin/remote.c:1269

8544 msgid "Cannot determine remote HEAD"

8545 msgstr "Kan inte bestämma HEAD på fjärren"

8546

8463 -#: builtin/remote.c:1218

8547 +#: builtin/remote.c:1271

8548 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"

8549 msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:"

8550

8467 -#: builtin/remote.c:1228

8551 +#: builtin/remote.c:1281

8552 #, c-format

8553 msgid "Could not delete %s"

8554 msgstr "Kunde inte ta bort %s"

8555

8472 -#: builtin/remote.c:1236

8556 +#: builtin/remote.c:1289

8557 #, c-format

8558 msgid "Not a valid ref: %s"

8559 msgstr "Inte en giltig referens: %s"

8560

8477 -#: builtin/remote.c:1238

8561 +#: builtin/remote.c:1291

8562 #, c-format

8563 msgid "Could not setup %s"

8564 msgstr "Kunde inte ställa in %s"

8565

8482 -#: builtin/remote.c:1274

8566 +#: builtin/remote.c:1307

8567 #, c-format

8568 msgid " %s will become dangling!"

8569 msgstr " %s kommer bli dinglande!"

8570

8487 -#: builtin/remote.c:1275

8571 +#: builtin/remote.c:1308

8572 #, c-format

8573 msgid " %s has become dangling!"

8574 msgstr " %s har blivit dinglande!"

8575

8492 -#: builtin/remote.c:1281

8576 +#: builtin/remote.c:1314

8577 #, c-format

8578 msgid "Pruning %s"

8579 msgstr "Rensar %s"

8580

8497 -#: builtin/remote.c:1282

8581 +#: builtin/remote.c:1315

8582 #, c-format

8583 msgid "URL: %s"

8584 msgstr "URL: %s"

8585

8502 -#: builtin/remote.c:1295

8586 +#: builtin/remote.c:1328

8587 #, c-format

8588 msgid " * [would prune] %s"

8589 msgstr " * [skulle rensa] %s"

8590

8507 -#: builtin/remote.c:1298

8591 +#: builtin/remote.c:1331

8592 #, c-format

8593 msgid " * [pruned] %s"

8594 msgstr " * [rensad] %s"

8595

8512 -#: builtin/remote.c:1321

8596 +#: builtin/remote.c:1374

8597 msgid "prune remotes after fetching"

8598 msgstr "rensa fjärrar efter hämtning"

8599

8516 -#: builtin/remote.c:1387 builtin/remote.c:1461

8600 +#: builtin/remote.c:1440 builtin/remote.c:1514

8601 #, c-format

8602 msgid "No such remote '%s'"

8603 msgstr "Ingen sådan fjärr \"%s\""

8604

8521 -#: builtin/remote.c:1407

8605 +#: builtin/remote.c:1460

8606 msgid "add branch"

8607 msgstr "lägg till gren"

8608

8525 -#: builtin/remote.c:1414

8609 +#: builtin/remote.c:1467

8610 msgid "no remote specified"

8611 msgstr "ingen fjärr angavs"

8612

8529 -#: builtin/remote.c:1436

8613 +#: builtin/remote.c:1489

8614 msgid "manipulate push URLs"

8615 msgstr "manipulera URL:ar för sändning"

8616

8533 -#: builtin/remote.c:1438

8617 +#: builtin/remote.c:1491

8618 msgid "add URL"

8619 msgstr "lägg till URL"

8620

8537 -#: builtin/remote.c:1440

8621 +#: builtin/remote.c:1493

8622 msgid "delete URLs"

8623 msgstr "ta bort URL:ar"

8624

8541 -#: builtin/remote.c:1447

8625 +#: builtin/remote.c:1500

8626 msgid "--add --delete doesn't make sense"

8627 msgstr "--add --delete ger ingen mening"

8628

8545 -#: builtin/remote.c:1487

8629 +#: builtin/remote.c:1540

8630 #, c-format

8631 msgid "Invalid old URL pattern: %s"

8632 msgstr "Felaktig gammalt URL-mönster: %s"

8633

8550 -#: builtin/remote.c:1495

8634 +#: builtin/remote.c:1548

8635 #, c-format

8636 msgid "No such URL found: %s"

8637 msgstr "Ingen sådan URL hittades: %s"

8638

8555 -#: builtin/remote.c:1497

8639 +#: builtin/remote.c:1550

8640 msgid "Will not delete all non-push URLs"

8641 msgstr "Kommer inte ta bort alla icke-sänd-URL:er"

8642

8559 -#: builtin/remote.c:1569

8643 +#: builtin/remote.c:1564

8644 msgid "be verbose; must be placed before a subcommand"

8645 msgstr "var pratsam; måste skrivas före ett underkommando"

8646

@@ -8616,7 +8700,7 @@ msgstr "begränsa maximalt deltadjup"

8700 msgid "maximum size of each packfile"

8701 msgstr "maximal storlek på varje paketfil"

8702

8619 -#: builtin/repack.c:345

8703 +#: builtin/repack.c:343

8704 #, c-format

8705 msgid "removing '%s' failed"

8706 msgstr "misslyckades ta bort \"%s\""

@@ -8630,21 +8714,25 @@ msgid "git replace -d <object>..."

8714 msgstr "git replace -d <objekt>..."

8715

8716 #: builtin/replace.c:19

8633 -msgid "git replace -l [<pattern>]"

8634 -msgstr "git replace -l [<mönster>]"

8717 +msgid "git replace [--format=<format>] [-l [<pattern>]]"

8718 +msgstr "git replace [--format=<format>] [-l [<mönster>]]"

8719

8636 -#: builtin/replace.c:131

8720 +#: builtin/replace.c:174

8721 msgid "list replace refs"

8722 msgstr "visa ersättningsreferenser"

8723

8640 -#: builtin/replace.c:132

8724 +#: builtin/replace.c:175

8725 msgid "delete replace refs"

8726 msgstr "ta bort ersättningsreferenser"

8727

8644 -#: builtin/replace.c:133

8728 +#: builtin/replace.c:176

8729 msgid "replace the ref if it exists"

8730 msgstr "ersätt referensen om den finns"

8731

8732 +#: builtin/replace.c:177

8733 +msgid "use this format"

8734 +msgstr "använd detta format"

8735 +

8736 #: builtin/rerere.c:12

@@ -8777,19 +8865,23 @@ msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."

8865 msgid "Could not write new index file."

8866 msgstr "Kunde inte skriva ny indexfil."

8867

8780 -#: builtin/rev-parse.c:345

8868 +#: builtin/rev-parse.c:359

8869 msgid "git rev-parse --parseopt [options] -- [<args>...]"

8870 msgstr "git rev-parse --parseopt [options] -- [<argument>...]"

8871

8784 -#: builtin/rev-parse.c:350

8872 +#: builtin/rev-parse.c:364

8873 msgid "keep the `--` passed as an arg"

8874 msgstr "behåll \"--\" sänt som argument"

8875

8788 -#: builtin/rev-parse.c:352

8876 +#: builtin/rev-parse.c:366

8877 msgid "stop parsing after the first non-option argument"

8878 msgstr "sluta tolka efter första argument som inte är flagga"

8879

8792 -#: builtin/rev-parse.c:470

8880 +#: builtin/rev-parse.c:369

8881 +msgid "output in stuck long form"

8882 +msgstr "utdata fast i lång form"

8883 +

8884 +#: builtin/rev-parse.c:486

8885 msgid ""

8886 "git rev-parse --parseopt [options] -- [<args>...]\n"

8887 " or: git rev-parse --sq-quote [<arg>...]\n"

@@ -9034,67 +9126,67 @@ msgstr ""

9126 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"

9127 msgstr "git show-branch (-g|--reflog)[=<n>[,<bas>]] [--list] [<ref>]"

9128

9037 -#: builtin/show-branch.c:650

9129 +#: builtin/show-branch.c:649

9130 msgid "show remote-tracking and local branches"

9131 msgstr "visa fjärrspårande och lokala grenar"

9132

9041 -#: builtin/show-branch.c:652

9133 +#: builtin/show-branch.c:651

9134 msgid "show remote-tracking branches"

9135 msgstr "visa fjärrspårande grenar"

9136

9045 -#: builtin/show-branch.c:654

9137 +#: builtin/show-branch.c:653

9138 msgid "color '*!+-' corresponding to the branch"

9139 msgstr "färga \"*!+-\" enligt grenen"

9140

9049 -#: builtin/show-branch.c:656

9141 +#: builtin/show-branch.c:655

9142 msgid "show <n> more commits after the common ancestor"

9143 msgstr "visa <n> ytterligare incheckningar efter gemensam anfader"

9144

9053 -#: builtin/show-branch.c:658

9145 +#: builtin/show-branch.c:657

9146 msgid "synonym to more=-1"

9147 msgstr "synonym till more=-1"

9148

9057 -#: builtin/show-branch.c:659

9149 +#: builtin/show-branch.c:658

9150 msgid "suppress naming strings"

9151 msgstr "undertyck namnsträngar"

9152

9061 -#: builtin/show-branch.c:661

9153 +#: builtin/show-branch.c:660

9154 msgid "include the current branch"

9155 msgstr "inkludera aktuell gren"

9156

9065 -#: builtin/show-branch.c:663

9157 +#: builtin/show-branch.c:662

9158 msgid "name commits with their object names"

9159 msgstr "namnge incheckningar med deras objektnamn"

9160

9069 -#: builtin/show-branch.c:665

9161 +#: builtin/show-branch.c:664

9162 msgid "show possible merge bases"

9163 msgstr "visa möjliga sammanslaningsbaser"

9164

9073 -#: builtin/show-branch.c:667

9165 +#: builtin/show-branch.c:666

9166 msgid "show refs unreachable from any other ref"

9167 msgstr "visa referenser som inte kan nås från någon annan referens"

9168

9077 -#: builtin/show-branch.c:669

9169 +#: builtin/show-branch.c:668

9170 msgid "show commits in topological order"

9171 msgstr "visa incheckningar i topologisk ordning"

9172

9081 -#: builtin/show-branch.c:672

9173 +#: builtin/show-branch.c:671

9174 msgid "show only commits not on the first branch"

9175 msgstr "visa endast incheckningar inte på den första grenen"

9176

9085 -#: builtin/show-branch.c:674

9177 +#: builtin/show-branch.c:673

9178 msgid "show merges reachable from only one tip"

9179 msgstr "visa sammanslagningar som endast kan nås från en spets"

9180

9089 -#: builtin/show-branch.c:676

9181 +#: builtin/show-branch.c:675

9182 msgid "topologically sort, maintaining date order where possible"

9183 msgstr "sortera topologiskt, behåll datumordning när möjligt"

9184

9093 -#: builtin/show-branch.c:679

9185 +#: builtin/show-branch.c:678

9186 msgid "<n>[,<base>]"

9187 msgstr "<n>[,<bas>]"

9188

9097 -#: builtin/show-branch.c:680

9189 +#: builtin/show-branch.c:679

9190 msgid "show <n> most recent ref-log entries starting at base"

9191 msgstr "visa <n> nyaste refloggposter med början på bas"

9192

@@ -9583,15 +9675,15 @@ msgstr "giltig till"

9675 msgid "no-op (backward compatibility)"

9676 msgstr "ingen funktion (bakåtkompatibilitet)"

9677

9586 -#: parse-options.h:238

9678 +#: parse-options.h:235

9679 msgid "be more verbose"

9680 msgstr "var mer pratsam"

9681

9590 -#: parse-options.h:240

9682 +#: parse-options.h:237

9683 msgid "be more quiet"

9684 msgstr "var mer tyst"

9685

9594 -#: parse-options.h:246

9686 +#: parse-options.h:243

9687 msgid "use <n> digits to display SHA-1s"

9688 msgstr "använd <n> siffror för att visa SHA-1:or"

9689

@@ -9892,8 +9984,8 @@ msgstr ""

9984

9985 # cogito-relaterat

9986 #: git-bisect.sh:140

9895 -msgid "won't bisect on seeked tree"

9896 -msgstr "kör inte \"bisect\" på ett \"seeked\"-träd"

9987 +msgid "won't bisect on cg-seek'ed tree"

9988 +msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts"

9989

9990 #: git-bisect.sh:144

9991 msgid "Bad HEAD - strange symbolic ref"

@@ -10037,7 +10129,7 @@ msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet"

10129 #. The working tree and the index file is still based on the

10130 #. $orig_head commit, but we are merging into $curr_head.

10131 #. First update the working tree to match $curr_head.

10040 -#: git-pull.sh:255

10132 +#: git-pull.sh:247

10133 #, sh-format

10134 msgid ""

10135 "Warning: fetch updated the current branch head.\n"

@@ -10048,15 +10140,15 @@ msgstr ""

10140 "Varning: snabbspolar din arbetskatalog från\n"

10141 "Varning: incheckningen $orig_head."

10142

10051 -#: git-pull.sh:280

10143 +#: git-pull.sh:272

10144 msgid "Cannot merge multiple branches into empty head"

10145 msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."

10146

10055 -#: git-pull.sh:284

10147 +#: git-pull.sh:276

10148 msgid "Cannot rebase onto multiple branches"

10149 msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar"

10150

10059 -#: git-rebase.sh:54

10151 +#: git-rebase.sh:55

10152 msgid ""

10153 "When you have resolved this problem, run \"git rebase --continue\".\n"

10154 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"

@@ -10067,16 +10159,16 @@ msgstr ""

10159 "Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n"

10160 "För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"."

10161

10070 -#: git-rebase.sh:156

10162 +#: git-rebase.sh:158

10163 msgid "Applied autostash."

10164 msgstr "Tillämpade autostash."

10165

10074 -#: git-rebase.sh:159

10166 +#: git-rebase.sh:161

10167 #, sh-format

10168 msgid "Cannot store $stash_sha1"

10169 msgstr "Kan inte spara $stash_sha1"

10170

10079 -#: git-rebase.sh:160

10171 +#: git-rebase.sh:162

10172 msgid ""

10173 "Applying autostash resulted in conflicts.\n"

10174 "Your changes are safe in the stash.\n"

@@ -10086,31 +10178,31 @@ msgstr ""

10178 "Dina ändringar är säkra i stashen.\n"

10179 "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"

10180

10089 -#: git-rebase.sh:199

10181 +#: git-rebase.sh:201

10182 msgid "The pre-rebase hook refused to rebase."

10183 msgstr "Kroken pre-rebase vägrade ombaseringen."

10184

10093 -#: git-rebase.sh:204

10185 +#: git-rebase.sh:206

10186 msgid "It looks like git-am is in progress. Cannot rebase."

10187 msgstr "Det verkar som en git-am körs. Kan inte ombasera."

10188

10097 -#: git-rebase.sh:338

10189 +#: git-rebase.sh:346

10190 msgid "The --exec option must be used with the --interactive option"

10191 msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive"

10192

10101 -#: git-rebase.sh:343

10193 +#: git-rebase.sh:351

10194 msgid "No rebase in progress?"

10195 msgstr "Ingen ombasering pågår?"

10196

10105 -#: git-rebase.sh:354

10197 +#: git-rebase.sh:362

10198 msgid "The --edit-todo action can only be used during interactive rebase."

10199 msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."

10200

10109 -#: git-rebase.sh:361

10201 +#: git-rebase.sh:369

10202 msgid "Cannot read HEAD"

10203 msgstr "Kan inte läsa HEAD"

10204

10113 -#: git-rebase.sh:364

10205 +#: git-rebase.sh:372

10206 msgid ""

10207 "You must edit all merge conflicts and then\n"

10208 "mark them as resolved using git add"

@@ -10118,12 +10210,12 @@ msgstr ""

10210 "Du måste redigera alla sammanslagningskonflikter och\n"

10211 "därefter markera dem som lösta med git add"

10212

10121 -#: git-rebase.sh:382

10213 +#: git-rebase.sh:390

10214 #, sh-format

10215 msgid "Could not move back to $head_name"

10216 msgstr "Kunde inte flytta tillbaka till $head_name"

10217

10126 -#: git-rebase.sh:401

10218 +#: git-rebase.sh:409

10219 #, sh-format

10220 msgid ""

10221 "It seems that there is already a $state_dir_base directory, and\n"

@@ -10144,66 +10236,66 @@ msgstr ""

10236 "och kör programmet igen. Jag avslutar ifall du fortfarande har\n"

10237 "något av värde där."

10238

10147 -#: git-rebase.sh:446

10239 +#: git-rebase.sh:456

10240 #, sh-format

10241 msgid "invalid upstream $upstream_name"

10242 msgstr "ogiltig uppström $upstream_name"

10243

10152 -#: git-rebase.sh:470

10244 +#: git-rebase.sh:480

10245 #, sh-format

10246 msgid "$onto_name: there are more than one merge bases"

10247 msgstr "$onto_name: mer än en sammanslagningsbas finns"

10248

10157 -#: git-rebase.sh:473 git-rebase.sh:477

10249 +#: git-rebase.sh:483 git-rebase.sh:487

10250 #, sh-format

10251 msgid "$onto_name: there is no merge base"

10252 msgstr "$onto_name: ingen sammanslagningsbas finns"

10253

10162 -#: git-rebase.sh:482

10254 +#: git-rebase.sh:492

10255 #, sh-format

10256 msgid "Does not point to a valid commit: $onto_name"

10257 msgstr "Peka på en giltig incheckning: $onto_name"

10258

10167 -#: git-rebase.sh:505

10259 +#: git-rebase.sh:515

10260 #, sh-format

10261 msgid "fatal: no such branch: $branch_name"

10262 msgstr "ödesdigert: ingen sådan gren: $branch_name"

10263

10172 -#: git-rebase.sh:528

10264 +#: git-rebase.sh:548

10265 msgid "Cannot autostash"

10266 msgstr "Kan inte utföra \"autostash\""

10267

10176 -#: git-rebase.sh:533

10268 +#: git-rebase.sh:553

10269 #, sh-format

10270 msgid "Created autostash: $stash_abbrev"

10271 msgstr "Skapade autostash: $stash_abbrev"

10272

10181 -#: git-rebase.sh:537

10273 +#: git-rebase.sh:557

10274 msgid "Please commit or stash them."

10275 msgstr "Checka in eller använd \"stash\" på dem."

10276

10185 -#: git-rebase.sh:557

10277 +#: git-rebase.sh:577

10278 #, sh-format

10279 msgid "Current branch $branch_name is up to date."

10280 msgstr "Aktuell gren $branch_name är à jour."

10281

10190 -#: git-rebase.sh:561

10282 +#: git-rebase.sh:581

10283 #, sh-format

10284 msgid "Current branch $branch_name is up to date, rebase forced."

10285 msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."

10286

10195 -#: git-rebase.sh:572

10287 +#: git-rebase.sh:592

10288 #, sh-format

10289 msgid "Changes from $mb to $onto:"

10290 msgstr "Ändringar från $mb till $onto:"

10291

10292 #. Detach HEAD and reset the tree

10201 -#: git-rebase.sh:581

10293 +#: git-rebase.sh:601

10294 msgid "First, rewinding head to replay your work on top of it..."

10295 msgstr ""

10296 "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."

10297

10206 -#: git-rebase.sh:591

10298 +#: git-rebase.sh:611

10299 #, sh-format

10300 msgid "Fast-forwarded $branch_name to $onto_name."

10301 msgstr "Snabbspolade $branch_name till $onto_name."

@@ -10452,56 +10544,56 @@ msgstr "Misslyckades registrera undermodulen \"$sm_path\""

10544 msgid "Entering '$prefix$displaypath'"

10545 msgstr "Går in i \"$prefix$displaypath\""

10546

10455 -#: git-submodule.sh:554

10547 +#: git-submodule.sh:559

10548 #, sh-format

10549 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."

10550 msgstr ""

10551 "Stoppar på \"$prefix$displaypath\"; skriptet returnerade en status skild "

10552 "från noll."

10553

10462 -#: git-submodule.sh:600

10554 +#: git-submodule.sh:605

10555 #, sh-format

10556 msgid "No url found for submodule path '$displaypath' in .gitmodules"

10557 msgstr ""

10558 "Hittade ingen url för undermodulsökvägen \"$displaypath\" i .gitmodules"

10559

10468 -#: git-submodule.sh:609

10560 +#: git-submodule.sh:614

10561 #, sh-format

10562 msgid "Failed to register url for submodule path '$displaypath'"

10563 msgstr "Misslyckades registrera url för undermodulsökväg \"$displaypath\""

10564

10473 -#: git-submodule.sh:611

10565 +#: git-submodule.sh:616

10566 #, sh-format

10567 msgid "Submodule '$name' ($url) registered for path '$displaypath'"

10568 msgstr ""

10569 "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$displaypath\""

10570

10479 -#: git-submodule.sh:619

10571 +#: git-submodule.sh:633

10572 #, sh-format

10573 msgid "Failed to register update mode for submodule path '$displaypath'"

10574 msgstr ""

10575 "Misslyckades registrera uppdateringsläge för undermodulsökväg \"$displaypath"

10576 "\""

10577

10486 -#: git-submodule.sh:656

10578 +#: git-submodule.sh:671

10579 #, sh-format

10580 msgid "Use '.' if you really want to deinitialize all submodules"

10581 msgstr "Använd \".\" om du verkligen vill avinitiera alla undermoduler"

10582

10491 -#: git-submodule.sh:673

10583 +#: git-submodule.sh:688

10584 #, sh-format

10585 msgid "Submodule work tree '$displaypath' contains a .git directory"

10586 msgstr ""

10587 "Undermodulens arbetskatalog \"$displaypath\" innehåller katalogen \".git\""

10588

10497 -#: git-submodule.sh:674

10589 +#: git-submodule.sh:689

10590 #, sh-format

10591 msgid ""

10592 "(use 'rm -rf' if you really want to remove it including all of its history)"

10593 msgstr ""

10594 "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"

10595

10504 -#: git-submodule.sh:680

10596 +#: git-submodule.sh:695

10597 #, sh-format

10598 msgid ""

10599 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "

@@ -10510,28 +10602,28 @@ msgstr ""

10602 "Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" "

10603 "kastar bort dem"

10604

10513 -#: git-submodule.sh:683

10605 +#: git-submodule.sh:698

10606 #, sh-format

10607 msgid "Cleared directory '$displaypath'"

10608 msgstr "Rensade katalogen \"$displaypath\""

10609

10518 -#: git-submodule.sh:684

10610 +#: git-submodule.sh:699

10611 #, sh-format

10612 msgid "Could not remove submodule work tree '$displaypath'"

10613 msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\""

10614

10523 -#: git-submodule.sh:687

10615 +#: git-submodule.sh:702

10616 #, sh-format

10617 msgid "Could not create empty submodule directory '$displaypath'"

10618 msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\""

10619

10528 -#: git-submodule.sh:696

10620 +#: git-submodule.sh:711

10621 #, sh-format

10622 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"

10623 msgstr ""

10624 "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\""

10625

10534 -#: git-submodule.sh:811

10626 +#: git-submodule.sh:834

10627 #, sh-format

10628 msgid ""

10629 "Submodule path '$displaypath' not initialized\n"

@@ -10540,109 +10632,124 @@ msgstr ""

10632 "Undermodulen \"$displaypath\" har inte initierats\n"

10633 "Kanske du vill köra \"update --init\"?"

10634

10543 -#: git-submodule.sh:824

10635 +#: git-submodule.sh:847

10636 #, sh-format

10637 msgid "Unable to find current revision in submodule path '$displaypath'"

10638 msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\""

10639

10548 -#: git-submodule.sh:833

10640 +#: git-submodule.sh:856

10641 #, sh-format

10642 msgid "Unable to fetch in submodule path '$sm_path'"

10643 msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""

10644

10553 -#: git-submodule.sh:857

10645 +#: git-submodule.sh:880

10646 #, sh-format

10647 msgid "Unable to fetch in submodule path '$displaypath'"

10648 msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\""

10649

10558 -#: git-submodule.sh:871

10650 +#: git-submodule.sh:894

10651 #, sh-format

10652 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"

10653 msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""

10654

10563 -#: git-submodule.sh:872

10655 +#: git-submodule.sh:895

10656 #, sh-format

10657 msgid "Submodule path '$displaypath': rebased into '$sha1'"

10658 msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""

10659

10568 -#: git-submodule.sh:877

10660 +#: git-submodule.sh:900

10661 #, sh-format

10662 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"

10663 msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\""

10664

10573 -#: git-submodule.sh:878

10665 +#: git-submodule.sh:901

10666 #, sh-format

10667 msgid "Submodule path '$displaypath': merged in '$sha1'"

10668 msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""

10669

10578 -#: git-submodule.sh:883

10670 +#: git-submodule.sh:906

10671 #, sh-format

10672 msgid ""

10673 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"

10674 msgstr ""

10675 "Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$prefix$sm_path\""

10676

10585 -#: git-submodule.sh:884

10677 +#: git-submodule.sh:907

10678 #, sh-format

10679 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"

10680 msgstr "Undermodulsökvägen \"$prefix$sm_path\": \"$command $sha1\""

10681

10590 -#: git-submodule.sh:889

10682 +#: git-submodule.sh:912

10683 #, sh-format

10684 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"

10685 msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\""

10686

10595 -#: git-submodule.sh:890

10687 +#: git-submodule.sh:913

10688 #, sh-format

10689 msgid "Submodule path '$displaypath': checked out '$sha1'"

10690 msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""

10691

10600 -#: git-submodule.sh:917

10692 +#: git-submodule.sh:940

10693 #, sh-format

10694 msgid "Failed to recurse into submodule path '$displaypath'"

10695 msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""

10696

10605 -#: git-submodule.sh:1025

10697 +#: git-submodule.sh:1048

10698 msgid "The --cached option cannot be used with the --files option"

10699 msgstr "Flaggan --cached kan inte användas med flaggan --files"

10700

10701 #. unexpected type

10610 -#: git-submodule.sh:1073

10702 +#: git-submodule.sh:1096

10703 #, sh-format

10704 msgid "unexpected mode $mod_dst"

10705 msgstr "oväntat läge $mod_dst"

10706

10615 -#: git-submodule.sh:1093

10707 +#: git-submodule.sh:1116

10708 #, sh-format

10709 msgid " Warn: $display_name doesn't contain commit $sha1_src"

10710 msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src"

10711

10620 -#: git-submodule.sh:1096

10712 +#: git-submodule.sh:1119

10713 #, sh-format

10714 msgid " Warn: $display_name doesn't contain commit $sha1_dst"

10715 msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst"

10716

10625 -#: git-submodule.sh:1099

10717 +#: git-submodule.sh:1122

10718 #, sh-format

10719 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"

10720 msgstr ""

10721 " Varning: $display_name innehåller inte incheckningarna $sha1_src och "

10722 "$sha1_dst"

10723

10632 -#: git-submodule.sh:1124

10724 +#: git-submodule.sh:1147

10725 msgid "blob"

10726 msgstr "blob"

10727

10636 -#: git-submodule.sh:1238

10728 +#: git-submodule.sh:1261

10729 #, sh-format

10730 msgid "Failed to recurse into submodule path '$sm_path'"

10731 msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""

10732

10641 -#: git-submodule.sh:1302

10733 +#: git-submodule.sh:1325

10734 #, sh-format

10735 msgid "Synchronizing submodule url for '$displaypath'"

10736 msgstr "Synkroniserar undermodul-url för \"$displaypath\""

10737

10738 +#~ msgid "copied: %s -> %s"

10739 +#~ msgstr "kopierad: %s -> %s"

10740 +

10741 +#~ msgid "deleted: %s"

10742 +#~ msgstr "borttagen: %s"

10743 +

10744 +#~ msgid "modified: %s"

10745 +#~ msgstr "ändrad: %s"

10746 +

10747 +#~ msgid "renamed: %s -> %s"

10748 +#~ msgstr "namnbyte: %s -> %s"

10749 +

10750 +#~ msgid "unmerged: %s"

10751 +#~ msgstr "osammansl.: %s"

10752 +

10753 #~ msgid "input paths are terminated by a null character"

10754 #~ msgstr "sökvägar avdelas med null-tecken"

10755

l10n: Update Swedish translation (2210t0f0u)