d7d8b208da · matheusbsbs/matheus-bagliano

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

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2020-03-06 14:25+0800\n"

11 -"PO-Revision-Date: 2020-03-09 20:54+0100\n"

10 +"POT-Creation-Date: 2020-03-11 15:26+0800\n"

11 +"PO-Revision-Date: 2020-03-17 18:30+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"

@@ -210,8 +210,8 @@ msgstr "köad"

210 msgid "unstaged"

211 msgstr "ej köad"

212

213 -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2197

214 -#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144

213 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251

214 +#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144

215 #: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409

216 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397

217 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905

@@ -1307,7 +1307,7 @@ msgid_plural "%d lines applied after fixing whitespace errors."

1307 msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."

1308 msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."

1309

1310 -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:390

1310 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406

1311 msgid "Unable to write new index file"

1312 msgstr "Kunde inte skriva ny indexfil"

1313

@@ -1319,7 +1319,7 @@ msgstr "tillämpa inte ändringar som motsvarar given sökväg"

1319 msgid "apply changes matching the given path"

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

1321

1322 -#: apply.c:4973 builtin/am.c:2206

1322 +#: apply.c:4973 builtin/am.c:2260

1323 msgid "num"

1324 msgstr "antal"

1325

@@ -1383,7 +1383,7 @@ msgstr "sökvägar avdelas med NUL-tecken"

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

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

1385

1386 -#: apply.c:5008 builtin/am.c:2185 builtin/interpret-trailers.c:98

1386 +#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98

1387 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

1388 #: builtin/pack-objects.c:3457 builtin/rebase.c:1508

1389 msgid "action"

@@ -1427,7 +1427,7 @@ msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

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

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

1429

1430 -#: apply.c:5032 builtin/am.c:2194

1430 +#: apply.c:5032 builtin/am.c:2248

1431 msgid "root"

1432 msgstr "rot"

1433

@@ -1454,7 +1454,7 @@ msgstr ""

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

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

1456

1457 -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:299

1457 +#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1458 #, c-format

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

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

@@ -1911,7 +1911,7 @@ msgstr ""

1911 "som redan finns på fjärren kan du behöva köra \"git fetch\"\n"

1912 "för att hämta den.\n"

1913 "\n"

1914 -"Om du har tänkt sända in en ny lokal gren som skall\n"

1914 +"Om du har tänkt sända in en ny lokal gren som ska\n"

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

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

1917

@@ -2026,8 +2026,8 @@ msgstr "index-pack dog"

2026 msgid "invalid color value: %.*s"

2027 msgstr "felaktigt färgvärde: %.*s"

2028

2029 -#: commit.c:51 sequencer.c:2719 builtin/am.c:354 builtin/am.c:398

2030 -#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:457

2029 +#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403

2030 +#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457

2031 #, c-format

2032 msgid "could not parse %s"

2033 msgstr "kunde inte tolka %s"

@@ -2150,7 +2150,7 @@ msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"

2150 msgid "could not find commit %s"

2151 msgstr "kunde inte hitta incheckningen %s"

2152

2153 -#: commit-graph.c:852 builtin/am.c:1287

2153 +#: commit-graph.c:852 builtin/am.c:1292

2154 #, c-format

2155 msgid "unable to parse commit %s"

2156 msgstr "kunde inte tolka incheckningen %s"

@@ -3156,7 +3156,7 @@ msgid "invalid --stat value: %s"

3156 msgstr "ogiltigt värde för --stat: %s"

3157

3158 #: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209

3159 -#: parse-options.c:199 parse-options.c:203

3159 +#: parse-options.c:197 parse-options.c:201

3160 #, c-format

3161 msgid "%s expects a numerical value"

3162 msgstr "%s förväntar ett numeriskt värde"

@@ -3735,7 +3735,7 @@ msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""

3735 #: editor.c:73

3736 #, c-format

3737 msgid "hint: Waiting for your editor to close the file...%c"

3738 -msgstr "tips: Väntar på att textredigeringsprogrammet skall stänga filen...%c"

3738 +msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c"

3739

3740 #: entry.c:178

3741 msgid "Filtering content"

@@ -4325,9 +4325,9 @@ msgstr "Kunde inte skapa \"%s.lock\": %s"

4325 msgid "failed to read the cache"

4326 msgstr "misslyckades läsa cachen"

4327

4328 -#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908

4328 +#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913

4329 #: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810

4330 -#: builtin/stash.c:264

4330 +#: builtin/stash.c:265

4331 msgid "unable to write new index file"

4332 msgstr "kunde inte skriva ny indexfil"

4333

@@ -4390,7 +4390,7 @@ msgstr "misslyckades skapa symboliska länken \"%s\": %s"

4390 #: merge-recursive.c:995

4391 #, c-format

4392 msgid "do not know what to do with %06o %s '%s'"

4393 -msgstr "vet inte hur %06o %s \"%s\" skall hanteras"

4393 +msgstr "vet inte hur %06o %s \"%s\" ska hanteras"

4394

4395 #: merge-recursive.c:1191

4396 #, c-format

@@ -4521,32 +4521,32 @@ msgstr "namnbyte"

4521 msgid "renamed"

4522 msgstr "namnbytt"

4523

4524 -#: merge-recursive.c:1606 merge-recursive.c:2530 merge-recursive.c:3175

4524 +#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117

4525 #, c-format

4526 msgid "Refusing to lose dirty file at %s"

4527 msgstr "Vägrar förlora lortig fil vid \"%s\""

4528

4529 -#: merge-recursive.c:1616

4529 +#: merge-recursive.c:1587

4530 #, c-format

4531 msgid "Refusing to lose untracked file at %s, even though it's in the way."

4532 msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."

4533

4534 -#: merge-recursive.c:1674

4534 +#: merge-recursive.c:1645

4535 #, c-format

4536 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

4537 msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s"

4538

4539 -#: merge-recursive.c:1705

4539 +#: merge-recursive.c:1676

4540 #, c-format

4541 msgid "%s is a directory in %s adding as %s instead"

4542 msgstr "%s är en katalog i %s lägger till som %s istället"

4543

4544 -#: merge-recursive.c:1710

4544 +#: merge-recursive.c:1681

4545 #, c-format

4546 msgid "Refusing to lose untracked file at %s; adding as %s instead"

4547 msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"

4548

4549 -#: merge-recursive.c:1737

4549 +#: merge-recursive.c:1708

4550 #, c-format

4551 msgid ""

4552 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -4555,28 +4555,28 @@ msgstr ""

4555 "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "

4556 "namnbyte \"%s\"->\"%s\" i \"%s\"%s"

4557

4558 -#: merge-recursive.c:1742

4558 +#: merge-recursive.c:1713

4559 msgid " (left unresolved)"

4560 msgstr " (lämnad olöst)"

4561

4562 -#: merge-recursive.c:1851

4562 +#: merge-recursive.c:1793

4563 #, c-format

4564 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

4565 msgstr ""

4566 "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"

4567

4568 -#: merge-recursive.c:2114

4568 +#: merge-recursive.c:2056

4569 #, c-format

4570 msgid ""

4571 "CONFLICT (directory rename split): Unclear where to place %s because "

4572 "directory %s was renamed to multiple other directories, with no destination "

4573 "getting a majority of the files."

4574 msgstr ""

4575 -"KONFLIKT (namnändrad delad katalog): Osäker på var %s skall placeras då "

4575 +"KONFLIKT (namnändrad delad katalog): Osäker på var %s ska placeras då "

4576 "katalogen %s bytte namn till flera andra kataloger, utan att någon "

4577 "destination fick en majoritet av filerna."

4578

4579 -#: merge-recursive.c:2146

4579 +#: merge-recursive.c:2088

4580 #, c-format

4581 msgid ""

4582 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -4585,7 +4585,7 @@ msgstr ""

4585 "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "

4586 "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."

4587

4588 -#: merge-recursive.c:2156

4588 +#: merge-recursive.c:2098

4589 #, c-format

4590 msgid ""

4591 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -4594,7 +4594,7 @@ msgstr ""

4594 "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "

4595 "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"

4596

4597 -#: merge-recursive.c:2248

4597 +#: merge-recursive.c:2190

4598 #, c-format

4599 msgid ""

4600 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -4603,7 +4603,7 @@ msgstr ""

4603 "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "

4604 "%s->%s i %s"

4605

4606 -#: merge-recursive.c:2493

4606 +#: merge-recursive.c:2435

4607 #, c-format

4608 msgid ""

4609 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -4612,52 +4612,52 @@ msgstr ""

4612 "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "

4613 "bytt namn."

4614

4615 -#: merge-recursive.c:3019

4615 +#: merge-recursive.c:2961

4616 #, c-format

4617 msgid "cannot read object %s"

4618 msgstr "kan inte läsa objektet %s"

4619

4620 -#: merge-recursive.c:3022

4620 +#: merge-recursive.c:2964

4621 #, c-format

4622 msgid "object %s is not a blob"

4623 msgstr "objektet %s är inte en blob"

4624

4625 -#: merge-recursive.c:3086

4625 +#: merge-recursive.c:3028

4626 msgid "modify"

4627 msgstr "ändra"

4628

4629 -#: merge-recursive.c:3086

4629 +#: merge-recursive.c:3028

4630 msgid "modified"

4631 msgstr "ändrad"

4632

4633 -#: merge-recursive.c:3098

4633 +#: merge-recursive.c:3040

4634 msgid "content"

4635 msgstr "innehåll"

4636

4637 -#: merge-recursive.c:3102

4637 +#: merge-recursive.c:3044

4638 msgid "add/add"

4639 msgstr "tillägg/tillägg"

4640

4641 -#: merge-recursive.c:3125

4641 +#: merge-recursive.c:3067

4642 #, c-format

4643 msgid "Skipped %s (merged same as existing)"

4644 msgstr "Hoppade över %s (sammanslagen samma som befintlig)"

4645

4646 -#: merge-recursive.c:3147 git-submodule.sh:1003

4646 +#: merge-recursive.c:3089 git-submodule.sh:1003

4647 msgid "submodule"

4648 msgstr "undermodul"

4649

4650 -#: merge-recursive.c:3148

4650 +#: merge-recursive.c:3090

4651 #, c-format

4652 msgid "CONFLICT (%s): Merge conflict in %s"

4653 msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"

4654

4655 -#: merge-recursive.c:3178

4655 +#: merge-recursive.c:3120

4656 #, c-format

4657 msgid "Adding as %s instead"

4658 msgstr "Lägger till som %s istället"

4659

4660 -#: merge-recursive.c:3261

4660 +#: merge-recursive.c:3203

4661 #, c-format

4662 msgid ""

4663 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -4666,7 +4666,7 @@ msgstr ""

4666 "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "

4667 "flyttar den till %s."

4668

4669 -#: merge-recursive.c:3264

4669 +#: merge-recursive.c:3206

4670 #, c-format

4671 msgid ""

4672 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -4675,7 +4675,7 @@ msgstr ""

4675 "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "

4676 "%s, föreslår att den bör flyttas till%s."

4677

4678 -#: merge-recursive.c:3268

4678 +#: merge-recursive.c:3210

4679 #, c-format

4680 msgid ""

4681 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4684,7 +4684,7 @@ msgstr ""

4684 "Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "

4685 "namn i %s; flyttar den till %s."

4686

4687 -#: merge-recursive.c:3271

4687 +#: merge-recursive.c:3213

4688 #, c-format

4689 msgid ""

4690 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4693,60 +4693,60 @@ msgstr ""

4693 "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "

4694 "bytte namn i %s; flyttar den till %s."

4695

4696 -#: merge-recursive.c:3385

4696 +#: merge-recursive.c:3327

4697 #, c-format

4698 msgid "Removing %s"

4699 msgstr "Tar bort %s"

4700

4701 -#: merge-recursive.c:3408

4701 +#: merge-recursive.c:3350

4702 msgid "file/directory"

4703 msgstr "fil/katalog"

4704

4705 -#: merge-recursive.c:3413

4705 +#: merge-recursive.c:3355

4706 msgid "directory/file"

4707 msgstr "katalog/fil"

4708

4709 -#: merge-recursive.c:3420

4709 +#: merge-recursive.c:3362

4710 #, c-format

4711 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

4712 msgstr ""

4713 "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"

4714

4715 -#: merge-recursive.c:3429

4715 +#: merge-recursive.c:3371

4716 #, c-format

4717 msgid "Adding %s"

4718 msgstr "Lägger till %s"

4719

4720 -#: merge-recursive.c:3438

4720 +#: merge-recursive.c:3380

4721 #, c-format

4722 msgid "CONFLICT (add/add): Merge conflict in %s"

4723 msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"

4724

4725 -#: merge-recursive.c:3482

4725 +#: merge-recursive.c:3424

4726 msgid "Already up to date!"

4727 msgstr "Redan à jour!"

4728

4729 -#: merge-recursive.c:3491

4729 +#: merge-recursive.c:3433

4730 #, c-format

4731 msgid "merging of trees %s and %s failed"

4732 msgstr "sammanslagning av träden %s och %s misslyckades"

4733

4734 -#: merge-recursive.c:3595

4734 +#: merge-recursive.c:3537

4735 msgid "Merging:"

4736 msgstr "Slår ihop:"

4737

4738 -#: merge-recursive.c:3608

4738 +#: merge-recursive.c:3550

4739 #, c-format

4740 msgid "found %u common ancestor:"

4741 msgid_plural "found %u common ancestors:"

4742 msgstr[0] "hittade %u gemensam förfader:"

4743 msgstr[1] "hittade %u gemensamma förfäder:"

4744

4745 -#: merge-recursive.c:3658

4745 +#: merge-recursive.c:3600

4746 msgid "merge returned no commit"

4747 msgstr "sammanslagningen returnerade ingen incheckning"

4748

4749 -#: merge-recursive.c:3717

4749 +#: merge-recursive.c:3659

4750 #, c-format

4751 msgid ""

4752 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4756,12 +4756,12 @@ msgstr ""

4756 "sammanslagning:\n"

4757 " %s"

4758

4759 -#: merge-recursive.c:3814

4759 +#: merge-recursive.c:3756

4760 #, c-format

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

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

4763

4764 -#: merge-recursive.c:3832 builtin/merge.c:697 builtin/merge.c:877

4764 +#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877

4765 msgid "Unable to write index."

4766 msgstr "Kunde inte skriva indexet."

4767

@@ -5033,7 +5033,7 @@ msgstr "%s är inkompatibel med %s"

5033 msgid "%s : incompatible with something else"

5034 msgstr "%s: inkompatibelt med något annat"

5035

5036 -#: parse-options.c:92 parse-options.c:96 parse-options.c:319

5036 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317

5037 #, c-format

5038 msgid "%s takes no value"

5039 msgstr "%s tar inget värde"

@@ -5043,41 +5043,41 @@ msgstr "%s tar inget värde"

5043 msgid "%s isn't available"

5044 msgstr "%s är inte tillgängligt"

5045

5046 -#: parse-options.c:219

5046 +#: parse-options.c:217

5047 #, c-format

5048 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

5049 msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix"

5050

5051 -#: parse-options.c:388

5051 +#: parse-options.c:386

5052 #, c-format

5053 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

5054 msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"

5055

5056 -#: parse-options.c:422 parse-options.c:430

5056 +#: parse-options.c:420 parse-options.c:428

5057 #, c-format

5058 msgid "did you mean `--%s` (with two dashes)?"

5059 msgstr "menade du \"--%s\" (med två bindestreck)?"

5060

5061 -#: parse-options.c:859

5061 +#: parse-options.c:857

5062 #, c-format

5063 msgid "unknown option `%s'"

5064 msgstr "okänd flagga \"%s\""

5065

5066 -#: parse-options.c:861

5066 +#: parse-options.c:859

5067 #, c-format

5068 msgid "unknown switch `%c'"

5069 msgstr "okänd flagga \"%c\""

5070

5071 -#: parse-options.c:863

5071 +#: parse-options.c:861

5072 #, c-format

5073 msgid "unknown non-ascii option in string: `%s'"

5074 msgstr "okänd icke-ascii-flagga i strängen: \"%s\""

5075

5076 -#: parse-options.c:887

5076 +#: parse-options.c:885

5077 msgid "..."

5078 msgstr "..."

5079

5080 -#: parse-options.c:906

5080 +#: parse-options.c:904

5081 #, c-format

5082 msgid "usage: %s"

5083 msgstr "användning: %s"

@@ -5085,21 +5085,21 @@ msgstr "användning: %s"

5085 #. TRANSLATORS: the colon here should align with the

5086 #. one in "usage: %s" translation.

5087 #.

5088 -#: parse-options.c:912

5088 +#: parse-options.c:910

5089 #, c-format

5090 msgid " or: %s"

5091 msgstr " eller: %s"

5092

5093 -#: parse-options.c:915

5093 +#: parse-options.c:913

5094 #, c-format

5095 msgid " %s"

5096 msgstr " %s"

5097

5098 -#: parse-options.c:954

5098 +#: parse-options.c:952

5099 msgid "-NUM"

5100 msgstr "-TAL"

5101

5102 -#: parse-options.c:968

5102 +#: parse-options.c:966

5103 #, c-format

5104 msgid "alias of --%s"

5105 msgstr "alias för --%s"

@@ -5423,7 +5423,7 @@ msgstr "osorterade köposter för \"%s\""

5423 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5424 #: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967

5425 #: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485

5426 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:271

5426 +#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290

5427 #: builtin/submodule--helper.c:332

5428 msgid "index file corrupt"

5429 msgstr "indexfilen trasig"

@@ -5707,7 +5707,7 @@ msgstr "oväntat objekt-id vid skrivning \"%s\""

5707 msgid "could not write to '%s'"

5708 msgstr "kunde inte skriva till \"%s\""

5709

5710 -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:714

5710 +#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719

5711 #: builtin/rebase.c:1029

5712 #, c-format

5713 msgid "could not open '%s' for writing"

@@ -6488,7 +6488,7 @@ msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""

6488 msgid "could not delete '%s'"

6489 msgstr "kunde inte ta bort \"%s\""

6490

6491 -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:369

6491 +#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385

6492 #, c-format

6493 msgid "could not remove '%s'"

6494 msgstr "kunde inte ta bort \"%s\""

@@ -6545,7 +6545,7 @@ msgid "failed to finalize '%s'"

6545 msgstr "misslyckades färdigställa \"%s\""

6546

6547 #: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167

6548 -#: sequencer.c:3276 builtin/am.c:244 builtin/commit.c:787 builtin/merge.c:1120

6548 +#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120

6549 #: builtin/rebase.c:593

6550 #, c-format

6551 msgid "could not read '%s'"

@@ -6596,8 +6596,8 @@ msgstr "ingen nyckel i \"%.*s\""

6596 msgid "unable to dequote value of '%s'"

6597 msgstr "kan inte ta bort citering av värdet \"%s\""

6598

6599 -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:705

6600 -#: builtin/am.c:797 builtin/merge.c:1117 builtin/rebase.c:1072

6599 +#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6600 +#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072

6601 #, c-format

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

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

@@ -6648,11 +6648,11 @@ msgid ""

6648 " git rebase --continue\n"

6649 msgstr ""

6650 "du har köade ändringar i din arbetskatalog.\n"

6651 -"Om ändringarna skall läggas in i föregående incheckning, kör:\n"

6651 +"Om ändringarna ska läggas in i föregående incheckning, kör:\n"

6652 "\n"

6653 " git commit --amend %s\n"

6654 "\n"

6655 -"Om de skall checkas in i en egen incheckning, kör:\n"

6655 +"Om de ska checkas in i en egen incheckning, kör:\n"

6656 "\n"

6657 " git commit %s\n"

6658 "\n"

@@ -6753,7 +6753,7 @@ msgstr "kunde inte tolka HEAD:s incheckning"

6753 msgid "unable to parse commit author"

6754 msgstr "kunde inte tolka incheckningens författare"

6755

6756 -#: sequencer.c:1353 builtin/am.c:1561 builtin/merge.c:687

6756 +#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687

6757 msgid "git write-tree failed to write a tree"

6758 msgstr "git write-tree misslyckades skriva ett träd"

6759

@@ -6762,7 +6762,7 @@ msgstr "git write-tree misslyckades skriva ett träd"

6762 msgid "unable to read commit message from '%s'"

6763 msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""

6764

6765 -#: sequencer.c:1413 builtin/am.c:1583 builtin/commit.c:1673 builtin/merge.c:886

6765 +#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886

6766 #: builtin/merge.c:911

6767 msgid "failed to write commit object"

6768 msgstr "kunde inte skriva incheckningsobjekt"

@@ -8738,7 +8738,11 @@ msgstr "felaktigt portnummer"

8738 msgid "invalid '..' path segment"

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

8740

8741 -#: worktree.c:259 builtin/am.c:2084

8741 +#: walker.c:170

8742 +msgid "Fetching objects"

8743 +msgstr "Hämtar objekt"

8744 +

8745 +#: worktree.c:259 builtin/am.c:2099

8746 #, c-format

8747 msgid "failed to read '%s'"

8748 msgstr "misslyckades läsa \"%s\""

@@ -8824,12 +8828,12 @@ msgstr "Ändringar ej i incheckningskön:"

8828 #: wt-status.c:238

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

8830 msgstr ""

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

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

8832

8833 #: wt-status.c:240

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

8835 msgstr ""

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

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

8837

8838 #: wt-status.c:241

8839 msgid ""

@@ -8847,7 +8851,7 @@ msgstr ""

8851 #, c-format

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

8853 msgstr ""

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

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

8855

8856 #: wt-status.c:268

8857 msgid "both deleted:"

@@ -9368,7 +9372,7 @@ msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"

9372

9373 #: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124

9374 #: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548

9371 -#: builtin/remote.c:1421 builtin/rm.c:241 builtin/send-pack.c:165

9375 +#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165

9376 msgid "dry run"

9377 msgstr "testkörning"

9378

@@ -9504,12 +9508,12 @@ msgid "--chmod param '%s' must be either -x or +x"

9508 msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"

9509

9510 #: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354

9507 -#: builtin/reset.c:327

9511 +#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509

9512 msgid "--pathspec-from-file is incompatible with pathspec arguments"

9513 msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar"

9514

9515 #: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360

9512 -#: builtin/reset.c:333

9516 +#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515

9517 msgid "--pathspec-file-nul requires --pathspec-from-file"

9518 msgstr "--pathspec-file-nul kräver --pathspec-from-file"

9519

@@ -9528,109 +9532,109 @@ msgstr ""

9532 "Slå av detta meddelande genom att köra\n"

9533 "\"git config advice.addEmptyPathspec false\""

9534

9531 -#: builtin/am.c:347

9535 +#: builtin/am.c:352

9536 msgid "could not parse author script"

9537 msgstr "kunde inte tolka författarskript"

9538

9535 -#: builtin/am.c:431

9539 +#: builtin/am.c:436

9540 #, c-format

9541 msgid "'%s' was deleted by the applypatch-msg hook"

9542 msgstr "\"%s\" togs bort av kroken applypatch-msg"

9543

9540 -#: builtin/am.c:473

9544 +#: builtin/am.c:478

9545 #, c-format

9546 msgid "Malformed input line: '%s'."

9547 msgstr "Felaktig indatarad: \"%s\"."

9548

9545 -#: builtin/am.c:511

9549 +#: builtin/am.c:516

9550 #, c-format

9551 msgid "Failed to copy notes from '%s' to '%s'"

9552 msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""

9553

9550 -#: builtin/am.c:537

9554 +#: builtin/am.c:542

9555 msgid "fseek failed"

9556 msgstr "\"fseek\" misslyckades"

9557

9554 -#: builtin/am.c:725

9558 +#: builtin/am.c:730

9559 #, c-format

9560 msgid "could not parse patch '%s'"

9561 msgstr "kunde inte tolka patchen \"%s\""

9562

9559 -#: builtin/am.c:790

9563 +#: builtin/am.c:795

9564 msgid "Only one StGIT patch series can be applied at once"

9565 msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"

9566

9563 -#: builtin/am.c:838

9567 +#: builtin/am.c:843

9568 msgid "invalid timestamp"

9569 msgstr "ogiltig tidsstämpel"

9570

9567 -#: builtin/am.c:843 builtin/am.c:855

9571 +#: builtin/am.c:848 builtin/am.c:860

9572 msgid "invalid Date line"

9573 msgstr "ogiltig \"Date\"-rad"

9574

9571 -#: builtin/am.c:850

9575 +#: builtin/am.c:855

9576 msgid "invalid timezone offset"

9577 msgstr "ogiltig tidszons-offset"

9578

9575 -#: builtin/am.c:943

9579 +#: builtin/am.c:948

9580 msgid "Patch format detection failed."

9581 msgstr "Misslyckades detektera patchformat."

9582

9579 -#: builtin/am.c:948 builtin/clone.c:409

9583 +#: builtin/am.c:953 builtin/clone.c:409

9584 #, c-format

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

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

9587

9584 -#: builtin/am.c:953

9588 +#: builtin/am.c:958

9589 msgid "Failed to split patches."

9590 msgstr "Misslyckades dela patchar."

9591

9588 -#: builtin/am.c:1084

9592 +#: builtin/am.c:1089

9593 #, c-format

9594 msgid "When you have resolved this problem, run \"%s --continue\"."

9595 msgstr "När du har löst problemet, kör \"%s --continue\"."

9596

9593 -#: builtin/am.c:1085

9597 +#: builtin/am.c:1090

9598 #, c-format

9599 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

9600 msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."

9601

9598 -#: builtin/am.c:1086

9602 +#: builtin/am.c:1091

9603 #, c-format

9604 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

9605 msgstr ""

9606 "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."

9607

9604 -#: builtin/am.c:1169

9608 +#: builtin/am.c:1174

9609 msgid "Patch sent with format=flowed; space at the end of lines might be lost."

9610 msgstr ""

9611 "Patch sänd med format=flowed; blanksteg på slut av rader kan ha tappats."

9612

9609 -#: builtin/am.c:1197

9613 +#: builtin/am.c:1202

9614 msgid "Patch is empty."

9615 msgstr "Patchen är tom."

9616

9613 -#: builtin/am.c:1262

9617 +#: builtin/am.c:1267

9618 #, c-format

9619 msgid "missing author line in commit %s"

9620 msgstr "saknad \"author\"-rad i incheckningen %s"

9621

9618 -#: builtin/am.c:1265

9622 +#: builtin/am.c:1270

9623 #, c-format

9624 msgid "invalid ident line: %.*s"

9625 msgstr "ogiltig ident-rad: %.*s"

9626

9623 -#: builtin/am.c:1484

9627 +#: builtin/am.c:1489

9628 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

9629 msgstr ""

9630 "Arkivet saknar objekt som behövs för att falla tillbaka på 3-"

9631 "vägssammanslagning."

9632

9629 -#: builtin/am.c:1486

9633 +#: builtin/am.c:1491

9634 msgid "Using index info to reconstruct a base tree..."

9635 msgstr "Använder indexinfo för att återskapa ett basträd..."

9636

9633 -#: builtin/am.c:1505

9637 +#: builtin/am.c:1510

9638 msgid ""

9639 "Did you hand edit your patch?\n"

9640 "It does not apply to blobs recorded in its index."

@@ -9638,25 +9642,25 @@ msgstr ""

9642 "Har du handredigerat din patch?\n"

9643 "Den kan inte tillämpas på blobbar som antecknats i dess index."

9644

9641 -#: builtin/am.c:1511

9645 +#: builtin/am.c:1516

9646 msgid "Falling back to patching base and 3-way merge..."

9647 msgstr ""

9648 "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."

9649

9646 -#: builtin/am.c:1537

9650 +#: builtin/am.c:1542

9651 msgid "Failed to merge in the changes."

9652 msgstr "Misslyckades slå ihop ändringarna."

9653

9650 -#: builtin/am.c:1569

9654 +#: builtin/am.c:1574

9655 msgid "applying to an empty history"

9656 msgstr "tillämpar på en tom historik"

9657

9654 -#: builtin/am.c:1616 builtin/am.c:1620

9658 +#: builtin/am.c:1621 builtin/am.c:1625

9659 #, c-format

9660 msgid "cannot resume: %s does not exist."

9661 msgstr "kan inte återuppta: %s finns inte."

9662

9659 -#: builtin/am.c:1638

9663 +#: builtin/am.c:1643

9664 msgid "Commit Body is:"

9665 msgstr "Incheckningskroppen är:"

9666

@@ -9664,40 +9668,41 @@ msgstr "Incheckningskroppen är:"

9668 #. in your translation. The program will only accept English

9669 #. input at this point.

9670 #.

9667 -#: builtin/am.c:1648

9671 +#: builtin/am.c:1653

9672 #, c-format

9673 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

9674 msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "

9675

9672 -#: builtin/am.c:1695 builtin/commit.c:398

9676 +#: builtin/am.c:1700 builtin/commit.c:398

9677 msgid "unable to write index file"

9678 msgstr "kan inte skriva indexfil"

9679

9676 -#: builtin/am.c:1699

9680 +#: builtin/am.c:1704

9681 #, c-format

9682 msgid "Dirty index: cannot apply patches (dirty: %s)"

9683 msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"

9684

9681 -#: builtin/am.c:1739 builtin/am.c:1807

9685 +#: builtin/am.c:1744 builtin/am.c:1812

9686 #, c-format

9687 msgid "Applying: %.*s"

9688 msgstr "Tillämpar: %.*s"

9689

9686 -#: builtin/am.c:1756

9690 +#: builtin/am.c:1761

9691 msgid "No changes -- Patch already applied."

9692 msgstr "Inga ändringar -- Patchen har redan tillämpats."

9693

9690 -#: builtin/am.c:1762

9694 +#: builtin/am.c:1767

9695 #, c-format

9696 msgid "Patch failed at %s %.*s"

9697 msgstr "Patch misslyckades på %s %.*s"

9698

9695 -#: builtin/am.c:1766

9696 -msgid "Use 'git am --show-current-patch' to see the failed patch"

9699 +#: builtin/am.c:1771

9700 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch"

9701 msgstr ""

9698 -"Använd \"git am --show-current-patch\" för att se patchen som misslyckades"

9702 +"Använd \"git am --show-current-patch=diff\" för att se patchen som "

9703 +"misslyckades"

9704

9700 -#: builtin/am.c:1810

9705 +#: builtin/am.c:1815

9706 msgid ""

9707 "No changes - did you forget to use 'git add'?\n"

9708 "If there is nothing left to stage, chances are that something else\n"

@@ -9707,7 +9712,7 @@ msgstr ""

9712 "Om det inte är något kvar att köa kan det hända att något annat redan\n"

9713 "introducerat samma ändringar; kanske du bör hoppa över patchen."

9714

9710 -#: builtin/am.c:1817

9715 +#: builtin/am.c:1822

9716 msgid ""

9717 "You still have unmerged paths in your index.\n"

9718 "You should 'git add' each file with resolved conflicts to mark them as "

@@ -9719,17 +9724,17 @@ msgstr ""

9724 "lösta.\n"

9725 "Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den."

9726

9722 -#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346

9727 +#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346

9728 #: builtin/reset.c:354

9729 #, c-format

9730 msgid "Could not parse object '%s'."

9731 msgstr "Kan inte tolka objektet \"%s\"."

9732

9728 -#: builtin/am.c:1976

9733 +#: builtin/am.c:1981

9734 msgid "failed to clean index"

9735 msgstr "misslyckades städa upp indexet"

9736

9732 -#: builtin/am.c:2020

9737 +#: builtin/am.c:2025

9738 msgid ""

9739 "You seem to have moved HEAD since the last 'am' failure.\n"

9740 "Not rewinding to ORIG_HEAD"

@@ -9737,75 +9742,85 @@ msgstr ""

9742 "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"

9743 "Återställer inte till ORIG_HEAD"

9744

9740 -#: builtin/am.c:2117

9745 +#: builtin/am.c:2132

9746 #, c-format

9747 msgid "Invalid value for --patch-format: %s"

9748 msgstr "Felaktigt värde för --patch-format: %s"

9749

9745 -#: builtin/am.c:2153

9750 +#: builtin/am.c:2172

9751 +#, c-format

9752 +msgid "Invalid value for --show-current-patch: %s"

9753 +msgstr "Felaktigt värde för --show-current-patch: %s"

9754 +

9755 +#: builtin/am.c:2176

9756 +#, c-format

9757 +msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"

9758 +msgstr "--show-current-patch=%s är inkompatibelt med --show-current-patch=%s"

9759 +

9760 +#: builtin/am.c:2207

9761 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"

9762 msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"

9763

9749 -#: builtin/am.c:2154

9764 +#: builtin/am.c:2208

9765 msgid "git am [<options>] (--continue | --skip | --abort)"

9766 msgstr "git am [<flaggor>] (--continue | --skip | --abort)"

9767

9753 -#: builtin/am.c:2160

9768 +#: builtin/am.c:2214

9769 msgid "run interactively"

9770 msgstr "kör interaktivt"

9771

9757 -#: builtin/am.c:2162

9772 +#: builtin/am.c:2216

9773 msgid "historical option -- no-op"

9774 msgstr "historisk flagga -- no-op"

9775

9761 -#: builtin/am.c:2164

9776 +#: builtin/am.c:2218

9777 msgid "allow fall back on 3way merging if needed"

9778 msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"

9779

9765 -#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58

9766 -#: builtin/repack.c:304 builtin/stash.c:811

9780 +#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58

9781 +#: builtin/repack.c:304 builtin/stash.c:812

9782 msgid "be quiet"

9783 msgstr "var tyst"

9784

9770 -#: builtin/am.c:2167

9785 +#: builtin/am.c:2221

9786 msgid "add a Signed-off-by line to the commit message"

9787 msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"

9788

9774 -#: builtin/am.c:2170

9789 +#: builtin/am.c:2224

9790 msgid "recode into utf8 (default)"

9791 msgstr "koda om till utf8 (standard)"

9792

9778 -#: builtin/am.c:2172

9793 +#: builtin/am.c:2226

9794 msgid "pass -k flag to git-mailinfo"

9795 msgstr "sänd flaggan -k till git-mailinfo"

9796

9782 -#: builtin/am.c:2174

9797 +#: builtin/am.c:2228

9798 msgid "pass -b flag to git-mailinfo"

9799 msgstr "sänd flaggan -b till git-mailinfo"

9800

9786 -#: builtin/am.c:2176

9801 +#: builtin/am.c:2230

9802 msgid "pass -m flag to git-mailinfo"

9803 msgstr "sänd flaggan -m till git-mailinfo"

9804

9790 -#: builtin/am.c:2178

9805 +#: builtin/am.c:2232

9806 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

9807 msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"

9808

9794 -#: builtin/am.c:2181

9809 +#: builtin/am.c:2235

9810 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

9811 msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"

9812

9798 -#: builtin/am.c:2184

9813 +#: builtin/am.c:2238

9814 msgid "strip everything before a scissors line"

9815 msgstr "ta bort allting före en saxlinje"

9816

9802 -#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195

9803 -#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207

9804 -#: builtin/am.c:2213

9817 +#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249

9818 +#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261

9819 +#: builtin/am.c:2267

9820 msgid "pass it through git-apply"

9821 msgstr "sänd det genom git-apply"

9822

9808 -#: builtin/am.c:2203 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670

9823 +#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670

9824 #: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250

9825 #: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505

9826 #: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321

@@ -9814,66 +9829,66 @@ msgstr "sänd det genom git-apply"

9829 msgid "n"

9830 msgstr "n"

9831

9817 -#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38

9832 +#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38

9833 #: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38

9834 msgid "format"

9835 msgstr "format"

9836

9822 -#: builtin/am.c:2210

9837 +#: builtin/am.c:2264

9838 msgid "format the patch(es) are in"

9839 msgstr "format för patch(ar)"

9840

9826 -#: builtin/am.c:2216

9841 +#: builtin/am.c:2270

9842 msgid "override error message when patch failure occurs"

9843 msgstr "överstyr felmeddelanden när patchfel uppstår"

9844

9830 -#: builtin/am.c:2218

9845 +#: builtin/am.c:2272

9846 msgid "continue applying patches after resolving a conflict"

9847 msgstr "fortsätt applicera patchar efter att ha löst en konflikt"

9848

9834 -#: builtin/am.c:2221

9849 +#: builtin/am.c:2275

9850 msgid "synonyms for --continue"

9851 msgstr "synonymer till --continue"

9852

9838 -#: builtin/am.c:2224

9853 +#: builtin/am.c:2278

9854 msgid "skip the current patch"

9855 msgstr "hoppa över den aktuella grenen"

9856

9842 -#: builtin/am.c:2227

9857 +#: builtin/am.c:2281

9858 msgid "restore the original branch and abort the patching operation."

9859 msgstr "återställ originalgrenen och avbryt patchningen."

9860

9846 -#: builtin/am.c:2230

9861 +#: builtin/am.c:2284

9862 msgid "abort the patching operation but keep HEAD where it is."

9863 msgstr "avbryt patchningen men behåll HEAD där det är."

9864

9850 -#: builtin/am.c:2233

9851 -msgid "show the patch being applied."

9852 -msgstr "visa patchen som tillämpas."

9865 +#: builtin/am.c:2288

9866 +msgid "show the patch being applied"

9867 +msgstr "visa patchen som tillämpas"

9868

9854 -#: builtin/am.c:2237

9869 +#: builtin/am.c:2293

9870 msgid "lie about committer date"

9871 msgstr "ljug om incheckningsdatum"

9872

9858 -#: builtin/am.c:2239

9873 +#: builtin/am.c:2295

9874 msgid "use current timestamp for author date"

9875 msgstr "använd nuvarande tidsstämpel för författardatum"

9876

9862 -#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1512

9877 +#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512

9878 #: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517

9879 #: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418

9880 msgid "key-id"

9881 msgstr "nyckel-id"

9882

9868 -#: builtin/am.c:2242 builtin/rebase.c:518 builtin/rebase.c:1557

9883 +#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557

9884 msgid "GPG-sign commits"

9885 msgstr "GPG-signera incheckningar"

9886

9872 -#: builtin/am.c:2245

9887 +#: builtin/am.c:2301

9888 msgid "(internal use for git-rebase)"

9889 msgstr "(används internt av git-rebase)"

9890

9876 -#: builtin/am.c:2263

9891 +#: builtin/am.c:2319

9892 msgid ""

9893 "The -b/--binary option has been a no-op for long time, and\n"

9894 "it will be removed. Please do not use it anymore."

@@ -9881,16 +9896,16 @@ msgstr ""

9896 "Flaggan -b/--binary har varit utan funktion länge, och\n"

9897 "kommer tas bort. Vi ber dig att inte använda den längre."

9898

9884 -#: builtin/am.c:2270

9899 +#: builtin/am.c:2326

9900 msgid "failed to read the index"

9901 msgstr "misslyckades läsa indexet"

9902

9888 -#: builtin/am.c:2285

9903 +#: builtin/am.c:2341

9904 #, c-format

9905 msgid "previous rebase directory %s still exists but mbox given."

9906 msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."

9907

9893 -#: builtin/am.c:2309

9908 +#: builtin/am.c:2365

9909 #, c-format

9910 msgid ""

9911 "Stray %s directory found.\n"

@@ -9899,11 +9914,11 @@ msgstr ""

9914 "Kvarbliven katalog %s hittades.\n"

9915 "Använd \"git am --abort\" för att ta bort den."

9916

9902 -#: builtin/am.c:2315

9917 +#: builtin/am.c:2371

9918 msgid "Resolve operation not in progress, we are not resuming."

9919 msgstr "Lösningsoperation pågår inte, vi återupptar inte."

9920

9906 -#: builtin/am.c:2325

9921 +#: builtin/am.c:2381

9922 msgid "interactive mode requires patches on the command line"

9923 msgstr "interaktivt läge kräver patchar på kommandoraden"

9924

@@ -11318,7 +11333,7 @@ msgstr ""

11333 "\n"

11334 " git checkout --track origin/<namn>\n"

11335 "\n"

11321 -"Om du alltid vill att utcheckningar med tvetydiga <namn> skall\n"

11336 +"Om du alltid vill att utcheckningar med tvetydiga <namn> ska\n"

11337 "föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n"

11338 "checkout.defaultRemote=origin i din konfiguration."

11339

@@ -11539,7 +11554,7 @@ msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""

11554 msgid "--pathspec-from-file is incompatible with --detach"

11555 msgstr "--pathspec-from-file är inkompatibelt med --detach"

11556

11542 -#: builtin/checkout.c:1681 builtin/reset.c:324

11557 +#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506

11558 msgid "--pathspec-from-file is incompatible with --patch"

11559 msgstr "--pathspec-from-file är inkompatibelt med --patch"

11560

@@ -12218,7 +12233,7 @@ msgid "id of a parent commit object"

12233 msgstr "id på ett förälderincheckningsobjekt"

12234

12235 #: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271

12221 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1472

12236 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477

12237 #: builtin/tag.c:412

12238 msgid "message"

12239 msgstr "meddelande"

@@ -12810,7 +12825,7 @@ msgstr "kat"

12825 #: builtin/commit-graph.c:69 builtin/commit-graph.c:126

12826 #: builtin/commit-graph.c:211

12827 msgid "The object directory to store the graph"

12813 -msgstr "Objektkatalogen där grafen skall lagras"

12828 +msgstr "Objektkatalogen där grafen ska lagras"

12829

12830 #: builtin/commit-graph.c:71

12831 msgid "if the commit-graph is split, only verify the tip file"

@@ -13914,7 +13929,7 @@ msgid ""

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

13930 msgstr ""

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

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

13932 +"fjärrarkiv som nya incheckningar ska hämtas från."

13933

13934 #: builtin/fetch.c:1730

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

@@ -15185,7 +15200,7 @@ msgstr "behörigheter"

15200

15201 #: builtin/init-db.c:492

15202 msgid "specify that the git repository is to be shared amongst several users"

15188 -msgstr "ange att git-arkivet skall delas bland flera användare"

15203 +msgstr "ange att git-arkivet ska delas bland flera användare"

15204

15205 #: builtin/init-db.c:529 builtin/init-db.c:534

15206 #, c-format

@@ -15229,7 +15244,7 @@ msgstr "ta bort tomma släprader"

15244

15245 #: builtin/interpret-trailers.c:99

15246 msgid "where to place the new trailer"

15232 -msgstr "var nya släprader skall placeras"

15247 +msgstr "var nya släprader ska placeras"

15248

15249 #: builtin/interpret-trailers.c:101

15250 msgid "action if trailer already exists"

@@ -15623,7 +15638,7 @@ msgstr "kan inte använda --check"

15638

15639 #: builtin/log.c:1854

15640 msgid "standard output, or directory, which one?"

15626 -msgstr "standard ut, eller katalog, vilken skall det vara?"

15641 +msgstr "standard ut, eller katalog, vilken ska det vara?"

15642

15643 #: builtin/log.c:1958

15644 msgid "--interdiff requires --cover-letter or single patch"

@@ -16963,7 +16978,7 @@ msgstr "anteckningar-ref"

16978 msgid "use notes from <notes-ref>"

16979 msgstr "använd anteckningar från <anteckningsref>"

16980

16966 -#: builtin/notes.c:1034 builtin/stash.c:1610

16981 +#: builtin/notes.c:1034 builtin/stash.c:1643

16982 #, c-format

16983 msgid "unknown subcommand: %s"

16984 msgstr "okänt underkommando: %s"

@@ -17212,7 +17227,7 @@ msgstr "skriv paket på standard ut"

17227

17228 #: builtin/pack-objects.c:3425

17229 msgid "include tag objects that refer to objects to be packed"

17215 -msgstr "inkludera taggobjekt som refererar objekt som skall packas"

17230 +msgstr "inkludera taggobjekt som refererar objekt som ska packas"

17231

17232 #: builtin/pack-objects.c:3427

17233 msgid "keep unreachable objects"

@@ -17291,7 +17306,7 @@ msgstr "pack.deltaCacheLimit är för högt, påtvingar %d"

17306 #: builtin/pack-objects.c:3551

17307 msgid "--max-pack-size cannot be used to build a pack for transfer"

17308 msgstr ""

17294 -"--max-pack-size kan inte användas för att bygga ett paket som skall överföras"

17309 +"--max-pack-size kan inte användas för att bygga ett paket som ska överföras"

17310

17311 #: builtin/pack-objects.c:3553

17312 msgid "minimum pack size limit is 1 MiB"

@@ -17639,7 +17654,7 @@ msgid ""

17654 msgstr ""

17655 "Du sänder till fjärren \"%s\", som inte är uppströms för den\n"

17656 "aktuella grenen \"%s\", utan att tala om för mig vad som\n"

17642 -"skall sändas för att uppdatera fjärrgrenen."

17657 +"ska sändas för att uppdatera fjärrgrenen."

17658

17659 #: builtin/push.c:270

17660 msgid ""

@@ -18336,10 +18351,6 @@ msgid "(DEPRECATED) try to recreate merges instead of ignoring them"

18351 msgstr ""

18352 "(AVRÅDS) försök återskapa sammanslagningar istället för att ignorera dem"

18353

18339 -#: builtin/rebase.c:1546

18340 -msgid "{drop,keep,ask}"

18341 -msgstr "{drop,keep,ask}"

18342 -

18354 #: builtin/rebase.c:1547

18355 msgid "how to handle commits that become empty"

18356 msgstr "hur incheckningar som blir tomma ska hanteras"

@@ -19721,8 +19732,8 @@ msgstr "HEAD är nu på %s"

19732 msgid "Cannot do a %s reset in the middle of a merge."

19733 msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning."

19734

19724 -#: builtin/reset.c:294 builtin/stash.c:519 builtin/stash.c:594

19725 -#: builtin/stash.c:618

19735 +#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595

19736 +#: builtin/stash.c:619

19737 msgid "be quiet, only report errors"

19738 msgstr "var tyst, rapportera endast fel"

19739

@@ -19983,37 +19994,41 @@ msgid_plural "the following files have local modifications:"

19994 msgstr[0] "följande fil har lokala ändringar:"

19995 msgstr[1] "följande filer har lokala ändringar:"

19996

19986 -#: builtin/rm.c:242

19997 +#: builtin/rm.c:243

19998 msgid "do not list removed files"

19999 msgstr "lista inte borttagna filer"

20000

19990 -#: builtin/rm.c:243

20001 +#: builtin/rm.c:244

20002 msgid "only remove from the index"

20003 msgstr "ta bara bort från indexet"

20004

19994 -#: builtin/rm.c:244

20005 +#: builtin/rm.c:245

20006 msgid "override the up-to-date check"

20007 msgstr "överstyr àjour-testet"

20008

19998 -#: builtin/rm.c:245

20009 +#: builtin/rm.c:246

20010 msgid "allow recursive removal"

20011 msgstr "tillåt rekursiv borttagning"

20012

20002 -#: builtin/rm.c:247

20013 +#: builtin/rm.c:248

20014 msgid "exit with a zero status even if nothing matched"

20015 msgstr "avsluta med nollstatus även om inget träffades"

20016

20006 -#: builtin/rm.c:289

20017 +#: builtin/rm.c:282

20018 +msgid "No pathspec was given. Which files should I remove?"

20019 +msgstr "Ingen sökvägsangivelse gavs. Vilka filer ska jag ta bort?"

20020 +

20021 +#: builtin/rm.c:305

20022 msgid "please stage your changes to .gitmodules or stash them to proceed"

20023 msgstr ""

20024 "löa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"

20025

20011 -#: builtin/rm.c:307

20026 +#: builtin/rm.c:323

20027 #, c-format

20028 msgid "not removing '%s' recursively without -r"

20029 msgstr "tar inte bort \"%s\" rekursivt utan -r"

20030

20016 -#: builtin/rm.c:346

20031 +#: builtin/rm.c:362

20032 #, c-format

20033 msgid "git rm: unable to remove %s"

20034 msgstr "git rm: kan inte ta bort %s"

@@ -20330,15 +20345,15 @@ msgstr "inaktivera gles utcheckning"

20345 msgid "error while refreshing working directory"

20346 msgstr "fel vid uppdatering av arbetskatalog"

20347

20333 -#: builtin/stash.c:22 builtin/stash.c:37

20348 +#: builtin/stash.c:22 builtin/stash.c:38

20349 msgid "git stash list [<options>]"

20350 msgstr "git stash list [<flaggor>]"

20351

20337 -#: builtin/stash.c:23 builtin/stash.c:42

20352 +#: builtin/stash.c:23 builtin/stash.c:43

20353 msgid "git stash show [<options>] [<stash>]"

20354 msgstr "git stash show [<flaggor>] [<stash>]"

20355

20341 -#: builtin/stash.c:24 builtin/stash.c:47

20356 +#: builtin/stash.c:24 builtin/stash.c:48

20357 msgid "git stash drop [-q|--quiet] [<stash>]"

20358 msgstr "git stash drop [-q|--quiet] [<stash>]"

20359

@@ -20346,25 +20361,27 @@ msgstr "git stash drop [-q|--quiet] [<stash>]"

20361 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"

20362 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"

20363

20349 -#: builtin/stash.c:26 builtin/stash.c:62

20364 +#: builtin/stash.c:26 builtin/stash.c:63

20365 msgid "git stash branch <branchname> [<stash>]"

20366 msgstr "git stash branch <grennamn> [<stash>]"

20367

20353 -#: builtin/stash.c:27 builtin/stash.c:67

20368 +#: builtin/stash.c:27 builtin/stash.c:68

20369 msgid "git stash clear"

20370 msgstr "git stash clear"

20371

20357 -#: builtin/stash.c:28 builtin/stash.c:77

20372 +#: builtin/stash.c:28

20373 msgid ""

20374 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

20375 " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"

20376 +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"

20377 " [--] [<pathspec>...]]"

20378 msgstr ""

20379 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

20380 " [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n"

20381 +" [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n"

20382 " [--] [<sökväg>...]]"

20383

20367 -#: builtin/stash.c:31 builtin/stash.c:84

20384 +#: builtin/stash.c:32 builtin/stash.c:85

20385 msgid ""

20386 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

20387 " [-u|--include-untracked] [-a|--all] [<message>]"

@@ -20372,186 +20389,196 @@ msgstr ""

20389 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

20390 " [-u|--include-untracked] [-a|--all] [<meddelande>]"

20391

20375 -#: builtin/stash.c:52

20392 +#: builtin/stash.c:53

20393 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"

20394 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"

20395

20379 -#: builtin/stash.c:57

20396 +#: builtin/stash.c:58

20397 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"

20398 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"

20399

20383 -#: builtin/stash.c:72

20400 +#: builtin/stash.c:73

20401 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"

20402 msgstr "git stash store [-m|--message <meddelande>] [-q|--quiet] <incheckning>"

20403

20387 -#: builtin/stash.c:127

20404 +#: builtin/stash.c:78

20405 +msgid ""

20406 +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

20407 +" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"

20408 +" [--] [<pathspec>...]]"

20409 +msgstr ""

20410 +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

20411 +" [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n"

20412 +" [--] [<sökväg>...]]"

20413 +

20414 +#: builtin/stash.c:128

20415 #, c-format

20416 msgid "'%s' is not a stash-like commit"

20417 msgstr "\"%s\" är inte en \"stash\"-liknande incheckning"

20418

20392 -#: builtin/stash.c:147

20419 +#: builtin/stash.c:148

20420 #, c-format

20421 msgid "Too many revisions specified:%s"

20422 msgstr "För många revisioner angivna:%s"

20423

20397 -#: builtin/stash.c:161 git-legacy-stash.sh:549

20424 +#: builtin/stash.c:162 git-legacy-stash.sh:549

20425 msgid "No stash entries found."

20426 msgstr "Inga \"stash\"-poster hittades."

20427

20401 -#: builtin/stash.c:175

20428 +#: builtin/stash.c:176

20429 #, c-format

20430 msgid "%s is not a valid reference"

20431 msgstr "%s är inte en giltigt referens"

20432

20406 -#: builtin/stash.c:224 git-legacy-stash.sh:75

20433 +#: builtin/stash.c:225 git-legacy-stash.sh:75

20434 msgid "git stash clear with parameters is unimplemented"

20435 msgstr "\"git stash clear\" med parametrar har inte implementerats"

20436

20410 -#: builtin/stash.c:403

20437 +#: builtin/stash.c:404

20438 msgid "cannot apply a stash in the middle of a merge"

20439 msgstr "kan inte tillämpa en \"stash\" mitt i en sammanslagning"

20440

20414 -#: builtin/stash.c:414

20441 +#: builtin/stash.c:415

20442 #, c-format

20443 msgid "could not generate diff %s^!."

20444 msgstr "kunde inte skapa diff %s^!."

20445

20419 -#: builtin/stash.c:421

20446 +#: builtin/stash.c:422

20447 msgid "conflicts in index.Try without --index."

20448 msgstr "konflikter i indexet. Testa utan --index."

20449

20423 -#: builtin/stash.c:427

20450 +#: builtin/stash.c:428

20451 msgid "could not save index tree"

20452 msgstr "kunde inte spara indexträd"

20453

20427 -#: builtin/stash.c:436

20454 +#: builtin/stash.c:437

20455 msgid "could not restore untracked files from stash"

20456 msgstr "kunde inte återställa ospårade filer från stash-post"

20457

20431 -#: builtin/stash.c:450

20458 +#: builtin/stash.c:451

20459 #, c-format

20460 msgid "Merging %s with %s"

20461 msgstr "Slår ihop %s med %s"

20462

20436 -#: builtin/stash.c:460 git-legacy-stash.sh:681

20463 +#: builtin/stash.c:461 git-legacy-stash.sh:681

20464 msgid "Index was not unstashed."

20465 msgstr "Indexet har inte tagits upp ur \"stash\":en"

20466

20440 -#: builtin/stash.c:521 builtin/stash.c:620

20467 +#: builtin/stash.c:522 builtin/stash.c:621

20468 msgid "attempt to recreate the index"

20469 msgstr "försök återskapa indexet"

20470

20444 -#: builtin/stash.c:554

20471 +#: builtin/stash.c:555

20472 #, c-format

20473 msgid "Dropped %s (%s)"

20474 msgstr "Kastade %s (%s)"

20475

20449 -#: builtin/stash.c:557

20476 +#: builtin/stash.c:558

20477 #, c-format

20478 msgid "%s: Could not drop stash entry"

20479 msgstr "%s: Kunde inte kasta \"stash\"-post"

20480

20454 -#: builtin/stash.c:582

20481 +#: builtin/stash.c:583

20482 #, c-format

20483 msgid "'%s' is not a stash reference"

20484 msgstr "\"%s\" är inte en \"stash\"-referens"

20485

20459 -#: builtin/stash.c:632 git-legacy-stash.sh:695

20486 +#: builtin/stash.c:633 git-legacy-stash.sh:695

20487 msgid "The stash entry is kept in case you need it again."

20488 msgstr "Stash-posten behålls ifall du behöver den igen."

20489

20463 -#: builtin/stash.c:655 git-legacy-stash.sh:713

20490 +#: builtin/stash.c:656 git-legacy-stash.sh:713

20491 msgid "No branch name specified"

20492 msgstr "Inget grennamn angavs"

20493

20467 -#: builtin/stash.c:795 builtin/stash.c:832

20494 +#: builtin/stash.c:796 builtin/stash.c:833

20495 #, c-format

20496 msgid "Cannot update %s with %s"

20497 msgstr "Kan inte uppdatera %s med %s"

20498

20472 -#: builtin/stash.c:813 builtin/stash.c:1473 builtin/stash.c:1509

20499 +#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543

20500 msgid "stash message"

20501 msgstr "\"stash\"-meddelande"

20502

20476 -#: builtin/stash.c:823

20503 +#: builtin/stash.c:824

20504 msgid "\"git stash store\" requires one <commit> argument"

20505 msgstr "\"git stash store\" kräver ett <incheckning>-argument"

20506

20480 -#: builtin/stash.c:1048 git-legacy-stash.sh:218

20507 +#: builtin/stash.c:1049 git-legacy-stash.sh:218

20508 msgid "No changes selected"

20509 msgstr "Inga ändringar valda"

20510

20484 -#: builtin/stash.c:1148 git-legacy-stash.sh:150

20511 +#: builtin/stash.c:1149 git-legacy-stash.sh:150

20512 msgid "You do not have the initial commit yet"

20513 msgstr "Du har inte den första incheckningen ännu"

20514

20488 -#: builtin/stash.c:1175 git-legacy-stash.sh:165

20515 +#: builtin/stash.c:1176 git-legacy-stash.sh:165

20516 msgid "Cannot save the current index state"

20517 msgstr "Kan inte spara aktuellt tillstånd för indexet"

20518

20492 -#: builtin/stash.c:1184 git-legacy-stash.sh:180

20519 +#: builtin/stash.c:1185 git-legacy-stash.sh:180

20520 msgid "Cannot save the untracked files"

20521 msgstr "Kan inte spara ospårade filer"

20522

20496 -#: builtin/stash.c:1195 builtin/stash.c:1204 git-legacy-stash.sh:201

20523 +#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201

20524 #: git-legacy-stash.sh:214

20525 msgid "Cannot save the current worktree state"

20526 msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"

20527

20501 -#: builtin/stash.c:1232 git-legacy-stash.sh:234

20528 +#: builtin/stash.c:1233 git-legacy-stash.sh:234

20529 msgid "Cannot record working tree state"

20530 msgstr "Kan inte registrera tillstånd för arbetskatalog"

20531

20505 -#: builtin/stash.c:1281 git-legacy-stash.sh:338

20532 +#: builtin/stash.c:1282 git-legacy-stash.sh:338

20533 msgid "Can't use --patch and --include-untracked or --all at the same time"

20534 msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt"

20535

20509 -#: builtin/stash.c:1297

20536 +#: builtin/stash.c:1298

20537 msgid "Did you forget to 'git add'?"

20538 msgstr "Glömde du använda \"git add\"?"

20539

20513 -#: builtin/stash.c:1312 git-legacy-stash.sh:346

20540 +#: builtin/stash.c:1313 git-legacy-stash.sh:346

20541 msgid "No local changes to save"

20542 msgstr "Inga lokala ändringar att spara"

20543

20517 -#: builtin/stash.c:1319 git-legacy-stash.sh:351

20544 +#: builtin/stash.c:1320 git-legacy-stash.sh:351

20545 msgid "Cannot initialize stash"

20546 msgstr "Kan inte initiera \"stash\""

20547

20521 -#: builtin/stash.c:1334 git-legacy-stash.sh:355

20548 +#: builtin/stash.c:1335 git-legacy-stash.sh:355

20549 msgid "Cannot save the current status"

20550 msgstr "Kan inte spara aktuell status"

20551

20525 -#: builtin/stash.c:1339

20552 +#: builtin/stash.c:1340

20553 #, c-format

20554 msgid "Saved working directory and index state %s"

20555 msgstr "Sparade arbetskatalogen och indexstatus %s"

20556

20530 -#: builtin/stash.c:1429 git-legacy-stash.sh:385

20557 +#: builtin/stash.c:1430 git-legacy-stash.sh:385

20558 msgid "Cannot remove worktree changes"

20559 msgstr "Kan inte ta bort ändringar i arbetskatalogen"

20560

20534 -#: builtin/stash.c:1464 builtin/stash.c:1500

20561 +#: builtin/stash.c:1469 builtin/stash.c:1534

20562 msgid "keep index"

20563 msgstr "behåll indexet"

20564

20538 -#: builtin/stash.c:1466 builtin/stash.c:1502

20565 +#: builtin/stash.c:1471 builtin/stash.c:1536

20566 msgid "stash in patch mode"

20567 msgstr "\"stash\" i \"patch\"-läge"

20568

20542 -#: builtin/stash.c:1467 builtin/stash.c:1503

20569 +#: builtin/stash.c:1472 builtin/stash.c:1537

20570 msgid "quiet mode"

20571 msgstr "tyst läge"

20572

20546 -#: builtin/stash.c:1469 builtin/stash.c:1505

20573 +#: builtin/stash.c:1474 builtin/stash.c:1539

20574 msgid "include untracked files in stash"

20575 msgstr "ta med ospårade filer i \"stash\""

20576

20550 -#: builtin/stash.c:1471 builtin/stash.c:1507

20577 +#: builtin/stash.c:1476 builtin/stash.c:1541

20578 msgid "include ignore files"

20579 msgstr "ta med ignorerade filer"

20580

20554 -#: builtin/stash.c:1567

20581 +#: builtin/stash.c:1600

20582 #, c-format

20583 msgid "could not exec %s"

20584 msgstr "kunde inte köra %s"

@@ -20827,7 +20854,7 @@ msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte"

20854

20855 #: builtin/submodule--helper.c:1398

20856 msgid "where the new submodule will be cloned to"

20830 -msgstr "var den nya undermodulen skall klonas till"

20857 +msgstr "var den nya undermodulen ska klonas till"

20858

20859 #: builtin/submodule--helper.c:1401

20860 msgid "name of the new submodule"

@@ -20941,7 +20968,7 @@ msgstr "parallella jobb"

20968

20969 #: builtin/submodule--helper.c:1921

20970 msgid "whether the initial clone should follow the shallow recommendation"

20944 -msgstr "om den första klonen skall följa rekommendation för grund kloning"

20971 +msgstr "om den första klonen ska följa rekommendation för grund kloning"

20972

20973 #: builtin/submodule--helper.c:1922

20974 msgid "don't print cloning progress"

@@ -22210,41 +22237,41 @@ msgstr "kan inte packa upp anrop; zlib-slutfel %d"

22237 msgid "dumb http transport does not support shallow capabilities"

22238 msgstr "dum http-transport stöder inte grunda arkiv"

22239

22213 -#: remote-curl.c:1037

22240 +#: remote-curl.c:1038

22241 msgid "fetch failed."

22242 msgstr "mottagning misslyckades."

22243

22217 -#: remote-curl.c:1085

22244 +#: remote-curl.c:1086

22245 msgid "cannot fetch by sha1 over smart http"

22246 msgstr "kan inte hämta med sha1 över smart http"

22247

22221 -#: remote-curl.c:1129 remote-curl.c:1135

22248 +#: remote-curl.c:1130 remote-curl.c:1136

22249 #, c-format

22250 msgid "protocol error: expected sha/ref, got '%s'"

22251 msgstr "protokollfel: förväntade sha/ref, fick \"%s\""

22252

22226 -#: remote-curl.c:1147 remote-curl.c:1262

22253 +#: remote-curl.c:1148 remote-curl.c:1263

22254 #, c-format

22255 msgid "http transport does not support %s"

22256 msgstr "http-transporten stöder inte %s"

22257

22231 -#: remote-curl.c:1183

22258 +#: remote-curl.c:1184

22259 msgid "git-http-push failed"

22260 msgstr "git-http-push misslyckades"

22261

22235 -#: remote-curl.c:1368

22262 +#: remote-curl.c:1369

22263 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"

22264 msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]"

22265

22239 -#: remote-curl.c:1400

22266 +#: remote-curl.c:1401

22267 msgid "remote-curl: error reading command stream from git"

22268 msgstr "remote-curl: fel vid läsning av kommandoström från git"

22269

22243 -#: remote-curl.c:1407

22270 +#: remote-curl.c:1408

22271 msgid "remote-curl: fetch attempted without a local repo"

22272 msgstr "remote-curl: försökte ta emot utan lokalt arkiv"

22273

22247 -#: remote-curl.c:1447

22274 +#: remote-curl.c:1448

22275 #, c-format

22276 msgid "remote-curl: unknown command '%s' from git"

22277 msgstr "remote-curl: okänt kommando \"%s\" från git"

@@ -22279,7 +22306,7 @@ msgstr "använd <n> siffror för att visa SHA-1:or"

22306

22307 #: parse-options.h:336

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

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

22309 +msgstr "hur blanksteg och #kommentarer ska tas bort från meddelande"

22310

22311 #: parse-options.h:337

22312 msgid "read pathspec from file"

@@ -23612,11 +23639,11 @@ msgid ""

23639 msgstr ""

23640 "Du har köade ändringar i din arbetskatalog.\n"

23641 "Om det är meningen att ändringarna\n"

23615 -"skall läggas in i föregående incheckning, kör:\n"

23642 +"ska läggas in i föregående incheckning, kör:\n"

23643 "\n"

23644 " git commit --amend $gpg_sign_opt_quoted\n"

23645 "\n"

23619 -"Om de skall checkas in i en egen incheckning, kör:\n"

23646 +"Om de ska checkas in i en egen incheckning, kör:\n"

23647 "\n"

23648 " git commit $gpg_sign_opt_quoted\n"

23649 "\n"

@@ -24223,7 +24250,7 @@ msgstr ""

24250

24251 #: git-send-email.perl:918

24252 msgid "Which 8bit encoding should I declare [UTF-8]? "

24226 -msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]? "

24253 +msgstr "Vilken åttabitarsteckenkodning ska jag ange [UTF-8]? "

24254

24255 #: git-send-email.perl:926

24256 #, perl-format

@@ -24240,7 +24267,7 @@ msgstr ""

24267

24268 #: git-send-email.perl:945

24269 msgid "To whom should the emails be sent (if anyone)?"

24243 -msgstr "Till vem skall breven sändas (om någon)?"

24270 +msgstr "Till vem ska breven sändas (om någon)?"

24271

24272 #: git-send-email.perl:963

24273 #, perl-format

@@ -24426,6 +24453,9 @@ msgstr ""

24453 msgid "Do you really want to send %s? [y|N]: "

24454 msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "

24455

24456 +#~ msgid "{drop,keep,ask}"

24457 +#~ msgstr "{drop,keep,ask}"

24458 +

24459 #~ msgid "Stage mode change [y,n,a,q,d%s,?]? "

24460 #~ msgstr "Köa ändrat läge [y,n,a,q,d%s,?]? "

24461

l10n: sv.po: Update Swedish translation (4839t0f0u)