#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.16.0\n"
+"Project-Id-Version: git 2.18.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-01-07 07:50+0800\n"
-"PO-Revision-Date: 2018-01-09 20:07+0100\n"
+"POT-Creation-Date: 2018-06-08 09:03+0800\n"
+"PO-Revision-Date: 2018-06-08 22:53+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: advice.c:62
+#: advice.c:92
#, c-format
-msgid "hint: %.*s\n"
-msgstr "tips: %.*s\n"
+msgid "%shint: %.*s%s\n"
+msgstr "%stips: %.*s%s\n"
-#: advice.c:90
+#: advice.c:137
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits "
"samman."
-#: advice.c:92
+#: advice.c:139
msgid "Committing is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en incheckning eftersom du har filer som inte slagits "
"samman."
-#: advice.c:94
+#: advice.c:141
msgid "Merging is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits "
"samman."
-#: advice.c:96
+#: advice.c:143
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman."
-#: advice.c:98
+#: advice.c:145
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits "
"samman."
-#: advice.c:100
+#: advice.c:147
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman."
-#: advice.c:108
+#: advice.c:155
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
"Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
"som lämpligt för att ange lösning och checka in."
-#: advice.c:116
+#: advice.c:163
msgid "Exiting because of an unresolved conflict."
msgstr "Avslutar på grund av olöst konflikgt."
-#: advice.c:121 builtin/merge.c:1213
+#: advice.c:168 builtin/merge.c:1250
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
-#: advice.c:123
+#: advice.c:170
msgid "Please, commit your changes before merging."
msgstr "Checka in dina ändringar innan du utför sammanslagningen."
-#: advice.c:124
+#: advice.c:171
msgid "Exiting because of unfinished merge."
msgstr "Avslutar på grund av ofullbordad sammanslagning."
-#: advice.c:130
+#: advice.c:177
#, c-format
msgid ""
"Note: checking out '%s'.\n"
msgid "cannot checkout %s"
msgstr "kan inte checka ut %s"
-#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277
+#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278
#, c-format
msgid "failed to read %s"
msgstr "misslyckades läsa %s"
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
-#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
+#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
+#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036
#, c-format
msgid "cannot open %s"
msgstr "kan inte öppna %s"
msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."
msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."
-#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390
+#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
-#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
-#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
-#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
-#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
+#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257
+#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210
+#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584
+#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807
#: git-add--interactive.perl:197
msgid "path"
msgstr "sökväg"
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: apply.c:4927 builtin/am.c:2229
+#: apply.c:4927 builtin/am.c:2263
msgid "num"
msgstr "antal"
msgid "accept a patch that touches outside the working area"
msgstr "godta en patch som rör filer utanför arbetskatalogen"
-#: apply.c:4949
+#: apply.c:4950
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
-#: apply.c:4951
+#: apply.c:4952
msgid "attempt three-way merge if a patch does not apply"
msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
-#: apply.c:4953
+#: apply.c:4954
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
+#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
-#: apply.c:4958
+#: apply.c:4959
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
-#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
-#: builtin/pack-objects.c:3009
+#: builtin/pack-objects.c:3177
msgid "action"
msgstr "åtgärd"
-#: apply.c:4960
+#: apply.c:4961
msgid "detect new or modified lines that have whitespace errors"
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
-#: apply.c:4963 apply.c:4966
+#: apply.c:4964 apply.c:4967
msgid "ignore changes in whitespace when finding context"
msgstr "ignorera ändringar i blanktecken för sammanhang"
-#: apply.c:4969
+#: apply.c:4970
msgid "apply the patch in reverse"
msgstr "tillämpa patchen baklänges"
-#: apply.c:4971
+#: apply.c:4972
msgid "don't expect at least one line of context"
msgstr "förvänta inte minst en rad sammanhang"
-#: apply.c:4973
+#: apply.c:4974
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
-#: apply.c:4975
+#: apply.c:4976
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
-#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
-#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
-#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21
+#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666
+#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124
msgid "be verbose"
msgstr "var pratsam"
-#: apply.c:4978
+#: apply.c:4979
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
-#: apply.c:4981
+#: apply.c:4982
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
-#: apply.c:4983 builtin/am.c:2217
+#: apply.c:4984 builtin/am.c:2251
msgid "root"
msgstr "rot"
-#: apply.c:4984
+#: apply.c:4985
msgid "prepend <root> to all filenames"
msgstr "lägg till <rot> i alla filnamn"
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
-#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299
+#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
-#: archive.c:436
+#: archive.c:434
msgid "fmt"
msgstr "fmt"
-#: archive.c:436
+#: archive.c:434
msgid "archive format"
msgstr "arkivformat"
-#: archive.c:437 builtin/log.c:1459
+#: archive.c:435 builtin/log.c:1462
msgid "prefix"
msgstr "prefix"
-#: archive.c:438
+#: archive.c:436
msgid "prepend prefix to each pathname in the archive"
msgstr "lägg till prefix till varje sökväg i arkivet"
-#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
-#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
-#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
-#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
-#: parse-options.h:153
+#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127
+#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869
+#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119
+#: parse-options.h:165
msgid "file"
msgstr "fil"
-#: archive.c:440 builtin/archive.c:89
+#: archive.c:438 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "skriv arkivet till filen"
-#: archive.c:442
+#: archive.c:440
msgid "read .gitattributes in working directory"
msgstr "läs .gitattributes i arbetskatalogen"
-#: archive.c:443
+#: archive.c:441
msgid "report archived files on stderr"
msgstr "rapportera arkiverade filer på standard fel"
-#: archive.c:444
+#: archive.c:442
msgid "store only"
msgstr "endast spara"
-#: archive.c:445
+#: archive.c:443
msgid "compress faster"
msgstr "komprimera snabbare"
-#: archive.c:453
+#: archive.c:451
msgid "compress better"
msgstr "komprimera bättre"
-#: archive.c:456
+#: archive.c:454
msgid "list supported archive formats"
msgstr "visa understödda arkivformat"
-#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
-#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
+#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113
+#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593
msgid "repo"
msgstr "arkiv"
-#: archive.c:459 builtin/archive.c:91
+#: archive.c:457 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "hämta arkivet från fjärrarkivet <arkiv>"
-#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
+#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr "kommando"
-#: archive.c:461 builtin/archive.c:93
+#: archive.c:459 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "sökväg till kommandot git-upload-archive på fjärren"
-#: archive.c:468
+#: archive.c:466
msgid "Unexpected option --remote"
msgstr "Oväntad flagga --remote"
-#: archive.c:470
+#: archive.c:468
msgid "Option --exec can only be used together with --remote"
msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
-#: archive.c:472
+#: archive.c:470
msgid "Unexpected option --output"
msgstr "Oväntad flagga --output"
-#: archive.c:494
+#: archive.c:492
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Okänt arkivformat \"%s\""
-#: archive.c:501
+#: archive.c:499
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
"Negativa mönster ignoreras i git-attribut\n"
"Använd '\\!' för att inleda med ett utropstecken."
-#: bisect.c:458
+#: bisect.c:461
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
-#: bisect.c:666
+#: bisect.c:669
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Det finns inte mer att göra \"bisect\" på!\n"
-#: bisect.c:720
+#: bisect.c:723
#, c-format
msgid "Not a valid commit name %s"
msgstr "Namnet på incheckningen är inte giltigt: %s"
-#: bisect.c:744
+#: bisect.c:747
#, c-format
msgid ""
"The merge base %s is bad.\n"
"Sammanslagningsbasen %s är trasig.\n"
"Det betyder att felet har rättats mellan %s och [%s].\n"
-#: bisect.c:749
+#: bisect.c:752
#, c-format
msgid ""
"The merge base %s is new.\n"
"Sammanslagningsbasen %s är ny.\n"
"Egenskapen har ändrats mellan %s och [%s].\n"
-#: bisect.c:754
+#: bisect.c:757
#, c-format
msgid ""
"The merge base %s is %s.\n"
"Sammanslagningsbasen %s är %s.\n"
"Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
-#: bisect.c:762
+#: bisect.c:765
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
"git bisect kan inte fungera korrekt i detta fall.\n"
"Kanske du skrev fel %s- och %s-revisioner?\n"
-#: bisect.c:775
+#: bisect.c:778
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"%s.\n"
"Vi fortsätter ändå."
-#: bisect.c:810
+#: bisect.c:811
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisect: en sammanslagningsbas måste testas\n"
-#: bisect.c:862
+#: bisect.c:851
#, c-format
msgid "a %s revision is needed"
msgstr "en %s-revision behövs"
-#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
+#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236
#, c-format
msgid "could not create file '%s'"
msgstr "kunde inte skapa filen \"%s\""
-#: bisect.c:930
+#: bisect.c:921
#, c-format
msgid "could not read file '%s'"
msgstr "kunde inte läsa filen \"%s\""
-#: bisect.c:960
+#: bisect.c:951
msgid "reading bisect refs failed"
msgstr "misslyckades läsa bisect-referenser"
-#: bisect.c:979
+#: bisect.c:970
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s var både %s och %s\n"
-#: bisect.c:987
+#: bisect.c:978
#, c-format
msgid ""
"No testable commit found.\n"
"Ingen testbar incheckning hittades.\n"
"Kanske du startade med felaktiga sökvägsparametrar?\n"
-#: bisect.c:1006
+#: bisect.c:997
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1012
+#: bisect.c:1003
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n"
msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n"
-#: blame.c:1757
+#: blame.c:1756
msgid "--contents and --reverse do not blend well."
msgstr "--contents och --reverse fungerar inte så bra tillsammans."
-#: blame.c:1768
+#: blame.c:1767
msgid "cannot use --contents with final commit object name"
msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"
-#: blame.c:1788
+#: blame.c:1787
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse och --first-parent tillsammans kräver att du anger senaste "
"incheckningen"
-#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
-#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
-#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
-#: builtin/shortlog.c:191
+#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861
+#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920
+#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372
+#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
-#: blame.c:1815
+#: blame.c:1814
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent tillsammans kräver ett intervall på första-förälder-"
"kedjan"
-#: blame.c:1826
+#: blame.c:1825
#, c-format
msgid "no such path %s in %s"
msgstr "sökvägen %s i %s finns inte"
-#: blame.c:1837
+#: blame.c:1836
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "kan inte läsa objektet %s för sökvägen %s"
-#: branch.c:53
+#: branch.c:54
#, c-format
msgid ""
"\n"
"fjärrspårningsinformationen genom att utföra\n"
"\"git branch --set-upstream-to=%s%s%s\"."
-#: branch.c:67
+#: branch.c:68
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "Ställer inte in grenen %s som sin egen uppströmsgren."
-#: branch.c:93
+#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
"Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom "
"ombasering."
-#: branch.c:94
+#: branch.c:95
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\"."
-#: branch.c:98
+#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
"Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\" genom "
"ombasering."
-#: branch.c:99
+#: branch.c:100
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"."
-#: branch.c:104
+#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
"Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom ombasering."
-#: branch.c:105
+#: branch.c:106
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"."
-#: branch.c:109
+#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
"Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\" genom "
"ombasering."
-#: branch.c:110
+#: branch.c:111
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\"."
-#: branch.c:119
+#: branch.c:120
msgid "Unable to write upstream branch configuration"
msgstr "Kan inte skriva inställningar för uppströmsgren"
-#: branch.c:156
+#: branch.c:157
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "Spårar inte: tvetydig information för referensen %s"
-#: branch.c:189
+#: branch.c:190
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "\"%s\" är inte ett giltigt grennamn."
-#: branch.c:208
+#: branch.c:209
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Det finns redan en gren som heter ”%s”."
-#: branch.c:213
+#: branch.c:214
msgid "Cannot force update the current branch."
msgstr "Kan inte tvinga uppdatering av aktuell gren."
-#: branch.c:233
+#: branch.c:234
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren."
-#: branch.c:235
+#: branch.c:236
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte"
-#: branch.c:237
+#: branch.c:238
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n"
"för att ställa in uppströmskonfigurationen när du sänder in."
-#: branch.c:280
+#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Objektnamnet är inte giltigt: \"%s\"."
-#: branch.c:300
+#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Objektnamnet är tvetydigt: \"%s\"."
-#: branch.c:305
+#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Avgreningspunkten är inte giltig: ”%s”."
-#: branch.c:359
+#: branch.c:360
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "\"%s\" är redan utcheckad på \"%s\""
-#: branch.c:382
+#: branch.c:383
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
-#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
+#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
-#: bundle.c:140
+#: bundle.c:139
msgid "Repository lacks these prerequisite commits:"
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
-#: bundle.c:193
+#: bundle.c:190
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Paketet (bundlen) innehåller denna referens:"
msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:"
-#: bundle.c:200
+#: bundle.c:197
msgid "The bundle records a complete history."
msgstr "Paketet (bundlen) beskriver en komplett historik."
-#: bundle.c:202
+#: bundle.c:199
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Paketet (bundlen) kräver denna referens:"
msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"
-#: bundle.c:261
+#: bundle.c:258
msgid "Could not spawn pack-objects"
msgstr "Kunde inte starta pack-objects"
-#: bundle.c:272
+#: bundle.c:269
msgid "pack-objects died"
msgstr "pack-objects misslyckades"
-#: bundle.c:314
+#: bundle.c:311
msgid "rev-list died"
msgstr "rev-list dog"
-#: bundle.c:363
+#: bundle.c:360
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
-#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
+#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
-#: bundle.c:461
+#: bundle.c:458
msgid "Refusing to create empty bundle."
msgstr "Vägrar skapa ett tomt paket (bundle)."
-#: bundle.c:473
+#: bundle.c:470
#, c-format
msgid "cannot create '%s'"
msgstr "kan inte skapa \"%s\""
-#: bundle.c:501
+#: bundle.c:498
msgid "index-pack died"
msgstr "index-pack dog"
-#: color.c:301
+#: color.c:296
#, c-format
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
-#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1434 builtin/am.c:2069
+#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376
+#: builtin/replace.c:448
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
-#: commit.c:43
+#: commit.c:45
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s är inte en incheckning!"
-#: commit.c:1524
+#: commit.c:182
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"Stöd för <GIT_DIR>/info/grafts avråds från och\n"
+"kommer tas bort i en framtida version av Git.\n"
+"\n"
+"Använd \"git replace --convert-graft-file\"\n"
+"för att omvandla grafts till ersättningsreferenser.\n"
+"\n"
+"Slå av detta meddelande genom att skriva\n"
+"\"git config advice.graftFileDeprecated false\""
+
+#: commit.c:1537
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n"
"i18n.commitencoding till den teckenkodning som används i ditt projekt.\n"
+#: commit-graph.c:669
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar"
+
+#: commit-graph.c:696
+msgid "too many commits to write graph"
+msgstr "för många incheckningar för att skriva graf"
+
+#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "kan inte skapa katalogen (mkdir) %s"
+
#: compat/obstack.c:405 compat/obstack.c:407
msgid "memory exhausted"
msgstr "minnet slut"
-#: config.c:186
+#: config.c:187
msgid "relative config include conditionals must come from files"
msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
-#: config.c:720
+#: config.c:788
#, c-format
msgid "bad config line %d in blob %s"
msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
-#: config.c:724
+#: config.c:792
#, c-format
msgid "bad config line %d in file %s"
msgstr "felaktig konfigurationsfil rad %d i filen %s"
-#: config.c:728
+#: config.c:796
#, c-format
msgid "bad config line %d in standard input"
msgstr "felaktig konfigurationsfil rad %d i standard in"
-#: config.c:732
+#: config.c:800
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
-#: config.c:736
+#: config.c:804
#, c-format
msgid "bad config line %d in command line %s"
msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
-#: config.c:740
+#: config.c:808
#, c-format
msgid "bad config line %d in %s"
msgstr "felaktig konfigurationsfil rad %d i %s"
-#: config.c:868
+#: config.c:936
msgid "out of range"
msgstr "utanför intervallet"
-#: config.c:868
+#: config.c:936
msgid "invalid unit"
msgstr "ogiltig enhet"
-#: config.c:874
+#: config.c:942
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
-#: config.c:879
+#: config.c:947
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"
-#: config.c:882
+#: config.c:950
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"
-#: config.c:885
+#: config.c:953
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"
-#: config.c:888
+#: config.c:956
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"
"en %s: %s"
-#: config.c:891
+#: config.c:959
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
"%s: %s"
-#: config.c:894
+#: config.c:962
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
-#: config.c:989
+#: config.c:1057
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "misslyckades expandera användarkatalog i: \"%s\""
-#: config.c:998
+#: config.c:1066
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
-#: config.c:1094 config.c:1105
+#: config.c:1171 config.c:1182
#, c-format
msgid "bad zlib compression level %d"
msgstr "felaktigt zlib-komprimeringsgrad %d"
-#: config.c:1222
+#: config.c:1307
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
-#: config.c:1378
+#: config.c:1473
#, c-format
msgid "bad pack compression level %d"
msgstr "felaktig paketkomprimeringsgrad %d"
-#: config.c:1574
+#: config.c:1681
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
-#: config.c:1906
+#: config.c:2013
msgid "unknown error occurred while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: config.c:2093
+#: config.c:2200
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Felaktigt %s: \"%s\""
-#: config.c:2136
+#: config.c:2243
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\""
-#: config.c:2162
+#: config.c:2269
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"
-#: config.c:2187
+#: config.c:2294
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
-#: config.c:2189
+#: config.c:2296
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
-#: config.c:2248
+#: config.c:2402
#, c-format
msgid "%s has multiple values"
msgstr "%s har flera värden"
-#: config.c:2591 config.c:2808
+#: config.c:2766 config.c:3019
#, c-format
msgid "fstat on %s failed"
msgstr "fstat misslyckades på %s"
-#: config.c:2698
+#: config.c:2905
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "kunde inte ställa in \"%s\" till \"%s\""
-#: config.c:2700 builtin/remote.c:776
+#: config.c:2907 builtin/remote.c:779
#, c-format
msgid "could not unset '%s'"
msgstr "kunde inte ta bort inställning för \"%s\""
-#: connect.c:52
+#: connect.c:61
msgid "The remote end hung up upon initial contact"
msgstr "Fjärren lade på vid inledande kontakt"
-#: connect.c:54
+#: connect.c:63
msgid ""
"Could not read from remote repository.\n"
"\n"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
+#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145
msgid "Checking connectivity"
msgstr "Kontrollerar konnektivitet"
-#: connected.c:76
+#: connected.c:78
msgid "Could not run 'git rev-list'"
msgstr "Kunde inte köra \"git rev-list\""
-#: connected.c:96
+#: connected.c:98
msgid "failed write to rev-list"
msgstr "kunde inte skriva till rev-list"
-#: connected.c:103
+#: connected.c:105
msgid "failed to close rev-list's stdin"
msgstr "kunde inte stänga rev-list:s standard in"
-#: convert.c:205
+#: convert.c:206
+#, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "CRLF skulle ersättas av LF i %s."
+
+#: convert.c:208
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
"CRLF kommer att ersättas av LF i %s.\n"
"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog."
-#: convert.c:209
+#: convert.c:216
#, c-format
-msgid "CRLF would be replaced by LF in %s."
-msgstr "CRLF skulle ersättas av LF i %s."
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF skulle ersättas av CRLF i %s"
-#: convert.c:215
+#: convert.c:218
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
"LF kommer att ersättas av CRLF i %s.\n"
"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog."
-#: convert.c:219
+#: convert.c:279
#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "LF skulle ersättas av CRLF i %s"
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "BOM är förbjudet i \"%s\" om kodat som %s"
+
+#: convert.c:286
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
+"tree-encoding."
+msgstr ""
+"Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%s som "
+"teckenkodning i arbetskatalogen."
+
+#: convert.c:304
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "BOM krävs om \"%s\" kodas som %s"
+
+#: convert.c:306
+#, c-format
+msgid ""
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
+"%sLE (depending on the byte order) as working-tree-encoding."
+msgstr ""
+"Filen \"%s\" saknar byte order mark (BOM). Använd UTF-%sBE eller UTF-%sLE "
+"(beroende på byteordning) som teckenkodning i arbetskatalogen."
+
+#: convert.c:424
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "misslyckades omkoda \"%s\" från %s till %s"
+
+#: convert.c:467
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr ""
+"omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat"
+
+#: convert.c:1225
+msgid "true/false are no valid working-tree-encodings"
+msgstr "true/false är inte giltig teckenkodning för arbetskatalogen"
#: date.c:116
msgid "in the future"
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:3799
+#: diff.c:3823
#, c-format
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
-#: diff.c:4127
+#: diff.c:4153
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande"
-#: diff.c:4215
+#: diff.c:4156
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-G, -S och --find-object är ömsesidigt uteslutande"
+
+#: diff.c:4244
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
-#: diff.c:4381
+#: diff.c:4410
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:4395
+#: diff.c:4424
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
-#: diff.c:5446
+#: diff.c:5500
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"onöjaktig namnbytesdetektering utfördes inte på grund av för många filer."
-#: diff.c:5449
+#: diff.c:5503
msgid "only found copies from modified paths due to too many files."
msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer."
-#: diff.c:5452
+#: diff.c:5506
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
"du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt."
-#: dir.c:2100
+#: dir.c:1867
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "kunde inte öppna katalogen \"%s\""
+
+#: dir.c:2109
msgid "failed to get kernel name and information"
msgstr "misslyckades hämta kärnans namn och information"
-#: dir.c:2219
+#: dir.c:2233
msgid "Untracked cache is disabled on this system or location."
msgstr "Ospårad cache är inaktiverad på systemet eller platsen."
-#: dir.c:3002 dir.c:3007
+#: dir.c:3075 dir.c:3080
#, c-format
msgid "could not create directories for %s"
msgstr "kunde inte skapa kataloger för %s"
-#: dir.c:3032
+#: dir.c:3109
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
msgid "could not stat file '%s'"
msgstr "kunde inte ta status på filen \"%s\""
-#: fetch-pack.c:252
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr "Fjärr utan URL"
+
+#: fetch-pack.c:254
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: förväntade grund lista"
-#: fetch-pack.c:264
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
-msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF"
+#: fetch-pack.c:266
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket"
-#: fetch-pack.c:283 builtin/archive.c:63
+#: fetch-pack.c:285 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "fjärrfel: %s"
-#: fetch-pack.c:284
+#: fetch-pack.c:286
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""
-#: fetch-pack.c:336
+#: fetch-pack.c:338
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc kräver ”multi_ack_detailed”"
-#: fetch-pack.c:422
+#: fetch-pack.c:429 fetch-pack.c:1310
#, c-format
msgid "invalid shallow line: %s"
msgstr "ogiltig \"shallow\"-rad: %s"
-#: fetch-pack.c:428
+#: fetch-pack.c:435 fetch-pack.c:1316
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ogiltig \"unshallow\"-rad: %s"
-#: fetch-pack.c:430
+#: fetch-pack.c:437 fetch-pack.c:1318
#, c-format
msgid "object not found: %s"
msgstr "objektet hittades inte: %s"
-#: fetch-pack.c:433
+#: fetch-pack.c:440 fetch-pack.c:1321
#, c-format
msgid "error in object: %s"
msgstr "fel i objekt: %s"
-#: fetch-pack.c:435
+#: fetch-pack.c:442 fetch-pack.c:1323
#, c-format
msgid "no shallow found: %s"
msgstr "ingen \"shallow\" hittades: %s"
-#: fetch-pack.c:438
+#: fetch-pack.c:445 fetch-pack.c:1326
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "förväntade shallow/unshallow, fick %s"
-#: fetch-pack.c:477
+#: fetch-pack.c:486
#, c-format
msgid "got %s %d %s"
msgstr "fick %s %d %s"
-#: fetch-pack.c:491
+#: fetch-pack.c:500
#, c-format
msgid "invalid commit %s"
msgstr "ogiltig incheckning %s"
-#: fetch-pack.c:524
+#: fetch-pack.c:533
msgid "giving up"
msgstr "ger upp"
-#: fetch-pack.c:534 progress.c:229
+#: fetch-pack.c:543 progress.c:229
msgid "done"
msgstr "klart"
-#: fetch-pack.c:546
+#: fetch-pack.c:555
#, c-format
msgid "got %s (%d) %s"
msgstr "fick %s (%d) %s"
-#: fetch-pack.c:592
+#: fetch-pack.c:601
#, c-format
msgid "Marking %s as complete"
msgstr "Markerar %s som komplett"
-#: fetch-pack.c:777
+#: fetch-pack.c:828
#, c-format
msgid "already have %s (%s)"
msgstr "har redan %s (%s)"
-#: fetch-pack.c:815
+#: fetch-pack.c:869
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
-#: fetch-pack.c:823
+#: fetch-pack.c:877
msgid "protocol error: bad pack header"
msgstr "protokollfel: felaktigt packhuvud"
-#: fetch-pack.c:879
+#: fetch-pack.c:944
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-patch: kunde inte grena av %s"
-#: fetch-pack.c:895
+#: fetch-pack.c:960
#, c-format
msgid "%s failed"
msgstr "%s misslyckades"
-#: fetch-pack.c:897
+#: fetch-pack.c:962
msgid "error in sideband demultiplexer"
msgstr "fel i sidbands-avmultiplexare"
-#: fetch-pack.c:924
+#: fetch-pack.c:989
msgid "Server does not support shallow clients"
msgstr "Servern stöder inte klienter med grunda arkiv"
-#: fetch-pack.c:928
+#: fetch-pack.c:993
msgid "Server supports multi_ack_detailed"
msgstr "Servern stöder \"multi_ack_detailed\""
-#: fetch-pack.c:931
+#: fetch-pack.c:996
msgid "Server supports no-done"
msgstr "Servern stöder \"no-done\""
-#: fetch-pack.c:937
+#: fetch-pack.c:1002
msgid "Server supports multi_ack"
msgstr "Servern stöder \"multi_ack\""
-#: fetch-pack.c:941
+#: fetch-pack.c:1006
msgid "Server supports side-band-64k"
msgstr "Servern stöder \"side-band-64k\""
-#: fetch-pack.c:945
+#: fetch-pack.c:1010
msgid "Server supports side-band"
msgstr "Servern stöder \"side-band\""
-#: fetch-pack.c:949
+#: fetch-pack.c:1014
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Servern stöder \"allow-tip-sha1-in-want\""
-#: fetch-pack.c:953
+#: fetch-pack.c:1018
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Servern stöder \"allow-reachable-sha1-in-want\""
-#: fetch-pack.c:963
+#: fetch-pack.c:1028
msgid "Server supports ofs-delta"
msgstr "Servern stöder \"ofs-delta\""
-#: fetch-pack.c:970
+#: fetch-pack.c:1034 fetch-pack.c:1204
+msgid "Server supports filter"
+msgstr "Servern stöder filter"
+
+#: fetch-pack.c:1042
#, c-format
msgid "Server version is %.*s"
msgstr "Serverversionen är %.*s"
-#: fetch-pack.c:976
+#: fetch-pack.c:1048
msgid "Server does not support --shallow-since"
msgstr "Servern stöder inte --shallow-since"
-#: fetch-pack.c:980
+#: fetch-pack.c:1052
msgid "Server does not support --shallow-exclude"
msgstr "Servern stöder inte --shallow-exclude"
-#: fetch-pack.c:982
+#: fetch-pack.c:1054
msgid "Server does not support --deepen"
msgstr "Servern stöder inte --deepen"
-#: fetch-pack.c:993
+#: fetch-pack.c:1065
msgid "no common commits"
msgstr "inga gemensamma incheckningar"
-#: fetch-pack.c:1005
+#: fetch-pack.c:1077 fetch-pack.c:1414
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-patch: hämtning misslyckades."
-#: fetch-pack.c:1167
+#: fetch-pack.c:1199
+msgid "Server does not support shallow requests"
+msgstr "Servern stöder inte grunda förfrågningar"
+
+#: fetch-pack.c:1584
msgid "no matching remote head"
msgstr "inget motsvarande fjärrhuvud"
-#: fetch-pack.c:1189
+#: fetch-pack.c:1610
#, c-format
msgid "no such remote ref %s"
msgstr "ingen sådan fjärreferens: %s"
-#: fetch-pack.c:1192
+#: fetch-pack.c:1613
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"
-#: gpg-interface.c:181
+#: gpg-interface.c:185
msgid "gpg failed to sign the data"
msgstr "gpg misslyckades signera data"
-#: gpg-interface.c:211
+#: gpg-interface.c:210
msgid "could not create temporary file"
msgstr "kunde inte skapa temporära fil"
-#: gpg-interface.c:214
+#: gpg-interface.c:213
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "misslyckades skriva fristående signatur till \"%s\""
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"
-#: grep.c:2017
+#: grep.c:2020
#, c-format
msgid "'%s': unable to read %s"
msgstr "\"%s\" kunde inte läsa %s"
-#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81
+#: builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr "misslyckades ta status på \"%s\""
-#: grep.c:2045
+#: grep.c:2048
#, c-format
msgid "'%s': short read"
msgstr "\"%s\": kort läsning"
-#: help.c:179
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
+msgstr "starta arbetskatalog (se också: git help tutorial)"
+
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
+msgstr "jobba med aktuell förändring (se också: git help everyday)"
+
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "utforska historiken och tillståndet (se också: git help revisions)"
+
+#: help.c:26
+msgid "grow, mark and tweak your common history"
+msgstr "utöka, markera och justera din gemensamma historik"
+
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
+msgstr "samarbeta (se också: git help workflows)"
+
+#: help.c:31
+msgid "Main Porcelain Commands"
+msgstr "Huvudsakliga porslinskommandon"
+
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
+msgstr "Tilläggskommandon / manipulerare"
+
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
+msgstr "Tilläggskommandon / frågare"
+
+#: help.c:34
+msgid "Interacting with Others"
+msgstr "Interaktion med andra"
+
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
+msgstr "Lågnivåkommandon / maniupulerare"
+
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
+msgstr "Lågnivåkommandon / frågare"
+
+#: help.c:37
+msgid "Low-level Commands / Synching Repositories"
+msgstr "Lågnivåkommandon / synka arkiv"
+
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Lågnivåkommandon / interna hjälpare"
+
+#: help.c:293
#, c-format
msgid "available git commands in '%s'"
msgstr "git-kommandon tillgängliga i \"%s\""
-#: help.c:186
+#: help.c:300
msgid "git commands available from elsewhere on your $PATH"
msgstr "git-kommandon från andra platser i din $PATH"
-#: help.c:217
+#: help.c:309
msgid "These are common Git commands used in various situations:"
msgstr "Dessa vanliga Git-kommandon används i olika situationer:"
-#: help.c:281
+#: help.c:358 git.c:90
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "okänd kommandolisttyp \"%s\""
+
+#: help.c:405
+msgid "The common Git guides are:"
+msgstr "De vanliga Git-vägledningarna är:"
+
+#: help.c:467
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
"köra det. Kanske git-%s är trasigt?"
-#: help.c:336
+#: help.c:526
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
-#: help.c:358
+#: help.c:548
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns."
-#: help.c:363
+#: help.c:553
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Fortsätter under förutsättningen att du menade ”%s”."
-#: help.c:368
+#: help.c:558
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
"Fortsätter om %0.1f sekunder, under förutsättningen att du menade ”%s”."
-#: help.c:376
+#: help.c:566
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."
-#: help.c:380
+#: help.c:570
msgid ""
"\n"
"The most similar command is"
"\n"
"Mest lika kommandon är"
-#: help.c:395
+#: help.c:585
msgid "git version [<options>]"
msgstr "git version [<flaggor>]"
-#: help.c:462
+#: help.c:652
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:466
+#: help.c:656
msgid ""
"\n"
"Did you mean this?"
msgid "name consists only of disallowed characters: %s"
msgstr "namnet består enbart av ej tillåtna tecken: %s"
-#: ident.c:416 builtin/commit.c:616
+#: ident.c:416 builtin/commit.c:587
#, c-format
msgid "invalid date format: %s"
msgstr "felaktigt datumformat: %s"
-#: list-objects-filter-options.c:30
-msgid "multiple object filter types cannot be combined"
-msgstr "flera objektfiltertyper kan inte kombineras"
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
+msgstr "flera filterspecifikationer kan inte kombineras"
-#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
-#, c-format
-msgid "invalid filter-spec expression '%s'"
-msgstr "ogiltig filterspec-utryck \"%s\""
+#: list-objects-filter-options.c:126
+msgid "cannot change partial clone promisor remote"
+msgstr "kan inte ändra kontraktsfjärr för delvis kloning"
#: lockfile.c:151
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "Kunde inte skapa \"%s.lock\": %s"
-#: merge.c:74
+#: merge.c:71
msgid "failed to read the cache"
msgstr "misslyckades läsa cachen"
-#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
-#: builtin/checkout.c:600 builtin/clone.c:754
+#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
+#: builtin/checkout.c:606 builtin/clone.c:761
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
-#: merge-recursive.c:235
+#: merge-recursive.c:298
msgid "(bad commit)\n"
msgstr "(felaktig incheckning)\n"
-#: merge-recursive.c:257 merge-recursive.c:265
+#: merge-recursive.c:320
#, c-format
-msgid "addinfo_cache failed for path '%s'"
-msgstr "addinfo_cache misslyckades för sökvägen \"%s\""
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr ""
+"add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."
+
+#: merge-recursive.c:328
+#, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr ""
+"add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar "
+"sammanslagningen."
-#: merge-recursive.c:329
+#: merge-recursive.c:410
msgid "error building trees"
msgstr "fel vid byggande av träd"
-#: merge-recursive.c:752
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "misslyckades skapa sökvägen \"%s\"%s"
-#: merge-recursive.c:763
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Tar bort %s för att göra plats för underkatalog\n"
-#: merge-recursive.c:777 merge-recursive.c:796
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": kanske en K/F-konflikt?"
-#: merge-recursive.c:786
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "vägrar förlora ospårad fil vid \"%s\""
-#: merge-recursive.c:828 builtin/cat-file.c:37
+#: merge-recursive.c:957 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kan inte läsa objektet %s: \"%s\""
-#: merge-recursive.c:830
+#: merge-recursive.c:959
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob förväntades för %s \"%s\""
-#: merge-recursive.c:854
+#: merge-recursive.c:983
#, c-format
msgid "failed to open '%s': %s"
msgstr "misslyckades öppna \"%s\": %s"
-#: merge-recursive.c:865
+#: merge-recursive.c:994
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "misslyckades skapa symboliska länken \"%s\": %s"
-#: merge-recursive.c:870
+#: merge-recursive.c:999
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "vet inte hur %06o %s \"%s\" skall hanteras"
-#: merge-recursive.c:1010
+#: merge-recursive.c:1186
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
+
+#: merge-recursive.c:1193
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"
+
+#: merge-recursive.c:1200
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr ""
+"Misslyckades slå ihop undermodulen %s (incheckningar följer inte "
+"sammanslagningsbasen)"
+
+#: merge-recursive.c:1208 merge-recursive.c:1220
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "Snabbspolar undermodulen %s till följande incheckning:"
+
+#: merge-recursive.c:1211 merge-recursive.c:1223
+#, c-format
+msgid "Fast-forwarding submodule %s to %s"
+msgstr "Snabbspolar undermodulen %s till %s"
+
+#: merge-recursive.c:1245
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr ""
+"Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "
+"hittades inte)"
+
+#: merge-recursive.c:1249
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"
+
+#: merge-recursive.c:1250
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"
+
+#: merge-recursive.c:1253
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+"Om detta är riktigt lägger du bara till det i indexet, till\n"
+"exempel så här:\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"vilket godtar lösningen.\n"
+
+#: merge-recursive.c:1262
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr ""
+"Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"
+
+#: merge-recursive.c:1321
msgid "Failed to execute internal merge"
msgstr "Misslyckades exekvera intern sammanslagning"
-#: merge-recursive.c:1014
+#: merge-recursive.c:1326
#, c-format
msgid "Unable to add %s to database"
msgstr "Kunde inte lägga till %s till databasen"
-#: merge-recursive.c:1117
+#: merge-recursive.c:1358
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Slår ihop %s automatiskt"
+
+#: merge-recursive.c:1423
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."
+
+#: merge-recursive.c:1475
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet."
-#: merge-recursive.c:1122
+#: merge-recursive.c:1480
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
"%s lämnad i trädet."
-#: merge-recursive.c:1129
+#: merge-recursive.c:1487
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet vid %s."
-#: merge-recursive.c:1134
+#: merge-recursive.c:1492
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
"%s lämnad i trädet vid %s."
-#: merge-recursive.c:1168
+#: merge-recursive.c:1526
msgid "rename"
msgstr "namnbyte"
-#: merge-recursive.c:1168
+#: merge-recursive.c:1526
msgid "renamed"
msgstr "namnbytt"
-#: merge-recursive.c:1225
+#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368
+#: merge-recursive.c:3086
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "Vägrar förlora lortig fil vid \"%s\""
+
+#: merge-recursive.c:1594
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s är en katalog i %s lägger till som %s istället"
-#: merge-recursive.c:1250
+#: merge-recursive.c:1599
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"
+
+#: merge-recursive.c:1625
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
-#: merge-recursive.c:1255
+#: merge-recursive.c:1630
msgid " (left unresolved)"
msgstr " (lämnad olöst)"
-#: merge-recursive.c:1317
+#: merge-recursive.c:1694
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"
-#: merge-recursive.c:1350
+#: merge-recursive.c:1733
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Byter namn på %s till %s och %s till %s istället"
-#: merge-recursive.c:1553
+#: merge-recursive.c:1745
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."
+
+#: merge-recursive.c:1951
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+"KONFLIKT (namnändrad delad katalog): Osäker på var %s skall placeras då "
+"katalogen %s bytte namn till flera andra kataloger, utan att någon "
+"destination fick en majoritet av filerna."
+
+#: merge-recursive.c:1983
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
+"implicit directory rename(s) putting the following path(s) there: %s."
+msgstr ""
+"KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "
+"implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."
+
+#: merge-recursive.c:1993
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
+msgstr ""
+"KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "
+"%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"
+
+#: merge-recursive.c:2085
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "
+"%s->%s i %s"
+
+#: merge-recursive.c:2330
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
+"bytt namn."
+
+#: merge-recursive.c:2736
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s"
-#: merge-recursive.c:1568
+#: merge-recursive.c:2751
#, c-format
msgid "Adding merged %s"
msgstr "Lägger till sammanslagen %s"
-#: merge-recursive.c:1575 merge-recursive.c:1805
+#: merge-recursive.c:2758 merge-recursive.c:3089
#, c-format
msgid "Adding as %s instead"
msgstr "Lägger till som %s istället"
-#: merge-recursive.c:1632
+#: merge-recursive.c:2914
#, c-format
msgid "cannot read object %s"
msgstr "kan inte läsa objektet %s"
-#: merge-recursive.c:1635
+#: merge-recursive.c:2917
#, c-format
msgid "object %s is not a blob"
msgstr "objektet %s är inte en blob"
-#: merge-recursive.c:1704
+#: merge-recursive.c:2986
msgid "modify"
msgstr "ändra"
-#: merge-recursive.c:1704
+#: merge-recursive.c:2986
msgid "modified"
msgstr "ändrad"
-#: merge-recursive.c:1714
+#: merge-recursive.c:2997
msgid "content"
msgstr "innehåll"
-#: merge-recursive.c:1721
+#: merge-recursive.c:3004
msgid "add/add"
msgstr "tillägg/tillägg"
-#: merge-recursive.c:1757
+#: merge-recursive.c:3046
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
-#: merge-recursive.c:1771
-#, c-format
-msgid "Auto-merging %s"
-msgstr "Slår ihop %s automatiskt"
-
-#: merge-recursive.c:1775 git-submodule.sh:932
+#: merge-recursive.c:3055 git-submodule.sh:895
msgid "submodule"
msgstr "undermodul"
-#: merge-recursive.c:1776
+#: merge-recursive.c:3056
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
-#: merge-recursive.c:1870
+#: merge-recursive.c:3178
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
-#: merge-recursive.c:1896
+#: merge-recursive.c:3204
msgid "file/directory"
msgstr "fil/katalog"
-#: merge-recursive.c:1902
+#: merge-recursive.c:3210
msgid "directory/file"
msgstr "katalog/fil"
-#: merge-recursive.c:1909
+#: merge-recursive.c:3217
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"
-#: merge-recursive.c:1918
+#: merge-recursive.c:3226
#, c-format
msgid "Adding %s"
msgstr "Lägger till %s"
-#: merge-recursive.c:1958
+#: merge-recursive.c:3267
#, c-format
msgid "Dirty index: cannot merge (dirty: %s)"
msgstr "Smutsigt index: kan inte slå ihop (smutsiga: %s)"
-#: merge-recursive.c:1962
+#: merge-recursive.c:3271
msgid "Already up to date!"
msgstr "Redan à jour!"
-#: merge-recursive.c:1971
+#: merge-recursive.c:3280
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "sammanslagning av träden %s och %s misslyckades"
-#: merge-recursive.c:2068
+#: merge-recursive.c:3379
msgid "Merging:"
msgstr "Slår ihop:"
-#: merge-recursive.c:2081
+#: merge-recursive.c:3392
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "hittade %u gemensam förfader:"
msgstr[1] "hittade %u gemensamma förfäder:"
-#: merge-recursive.c:2120
+#: merge-recursive.c:3431
msgid "merge returned no commit"
msgstr "sammanslagningen returnerade ingen incheckning"
-#: merge-recursive.c:2183
+#: merge-recursive.c:3495
#, c-format
msgid "Could not parse object '%s'"
msgstr "Kunde inte tolka objektet \"%s\""
-#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
+#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)."
-#: notes-utils.c:42
+#: notes-utils.c:43
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"
-#: notes-utils.c:101
+#: notes-utils.c:102
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "Felaktigt värde för notes.rewriteMode: '%s'"
-#: notes-utils.c:111
+#: notes-utils.c:112
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"
#. the environment variable, the second %s is
#. its value.
#.
-#: notes-utils.c:141
+#: notes-utils.c:142
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Felaktigt värde på %s: \"%s\""
-#: object.c:239
+#: object.c:242
#, c-format
msgid "unable to parse object: %s"
msgstr "kunde inte tolka objektet: %s"
-#: packfile.c:556
+#: packfile.c:563
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset före slutet av packfilen (trasig .idx?)"
-#: packfile.c:1683
+#: packfile.c:1742
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset före slutet av packindex för %s (trasigt index?)"
-#: packfile.c:1687
+#: packfile.c:1746
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
-#: parse-options.c:573
+#: parse-options.c:621
msgid "..."
msgstr "..."
-#: parse-options.c:592
+#: parse-options.c:640
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:598
+#: parse-options.c:646
#, c-format
msgid " or: %s"
msgstr " eller: %s"
-#: parse-options.c:601
+#: parse-options.c:649
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:640
+#: parse-options.c:688
msgid "-NUM"
msgstr "-TAL"
-#: parse-options-cb.c:108
+#: parse-options-cb.c:44
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "trasigt utlöpsdatum: ”%s”"
+
+#: parse-options-cb.c:112
#, c-format
msgid "malformed object name '%s'"
msgstr "felformat objektnamn \"%s\""
-#: path.c:891
+#: path.c:892
#, c-format
msgid "Could not make %s writable by group"
msgstr "Kunde inte göra %s skrivbar för gruppen"
msgid "unable to parse --pretty format"
msgstr "kunde inte tolka format för --pretty"
-#: read-cache.c:1472
+#: read-cache.c:1500
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"index.version satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:1482
+#: read-cache.c:1510
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
+#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048
#, c-format
msgid "could not close '%s'"
msgstr "kunde inte stänga \"%s\""
-#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
+#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234
#, c-format
msgid "could not stat '%s'"
msgstr "kunde inte ta status på \"%s\""
-#: read-cache.c:2455
+#: read-cache.c:2490
#, c-format
msgid "unable to open git dir: %s"
msgstr "kunde inte öppna git-katalog: %s"
-#: read-cache.c:2467
+#: read-cache.c:2502
#, c-format
msgid "unable to unlink: %s"
msgstr "misslyckades ta bort länken: %s"
-#: refs.c:706
+#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:779
#, c-format
-msgid "Could not open '%s' for writing"
-msgstr "Kunde inte öppna \"%s\" för skrivning"
+msgid "could not open '%s' for writing"
+msgstr "kunde inte öppna \"%s\" för skrivning"
-#: refs.c:1850
+#: refs.c:1880
msgid "ref updates forbidden inside quarantine environment"
msgstr "referensuppdateringar förbjudna i karantänmiljö"
-#: refs/files-backend.c:1189
+#: refs/files-backend.c:1191
#, c-format
msgid "could not remove reference %s"
msgstr "kunde inte ta bort referensen %s"
-#: refs/files-backend.c:1203 refs/packed-backend.c:1524
-#: refs/packed-backend.c:1534
+#: refs/files-backend.c:1205 refs/packed-backend.c:1531
+#: refs/packed-backend.c:1541
#, c-format
msgid "could not delete reference %s: %s"
msgstr "kunde inte ta bort referensen %s: %s"
-#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#: refs/files-backend.c:1208 refs/packed-backend.c:1544
#, c-format
msgid "could not delete references: %s"
msgstr "kunde inte ta bort referenser: %s"
-#: ref-filter.c:35 wt-status.c:1816
+#: ref-filter.c:35 wt-status.c:1850
msgid "gone"
msgstr "försvunnen"
msgid "ahead %d, behind %d"
msgstr "före %d, bakom %d"
-#: ref-filter.c:107
+#: ref-filter.c:121
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "förväntat format: %%(color:<color>)"
-#: ref-filter.c:109
+#: ref-filter.c:123
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "okänd färg: %%(color:%s)"
-#: ref-filter.c:129
+#: ref-filter.c:145
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Heltalsvärde förväntades refname:lstrip=%s"
-#: ref-filter.c:133
+#: ref-filter.c:149
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Heltalsvärde förväntades refname:rstrip=%s"
-#: ref-filter.c:135
+#: ref-filter.c:151
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "okänt %%(%s)-argument: %s"
-#: ref-filter.c:184
+#: ref-filter.c:206
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) tar inte argument"
-#: ref-filter.c:191
+#: ref-filter.c:215
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) tar inte argument"
-#: ref-filter.c:209
+#: ref-filter.c:235
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "okänt %%(trailers)-argument: %s"
-#: ref-filter.c:232
+#: ref-filter.c:264
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "positivt värde förväntat contents:lines=%s"
-#: ref-filter.c:234
+#: ref-filter.c:266
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "okänt %%(contents)-argument: %s"
-#: ref-filter.c:247
+#: ref-filter.c:281
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "positivt värde förväntat objectname:short=%s"
-#: ref-filter.c:251
+#: ref-filter.c:285
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "okänt %%(objectname)-argument: %s"
-#: ref-filter.c:278
+#: ref-filter.c:315
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "förväntat format: %%(align:<bredd>,<position>)"
-#: ref-filter.c:290
+#: ref-filter.c:327
#, c-format
msgid "unrecognized position:%s"
msgstr "okänd position:%s"
-#: ref-filter.c:294
+#: ref-filter.c:334
#, c-format
msgid "unrecognized width:%s"
msgstr "okänd bredd:%s"
-#: ref-filter.c:300
+#: ref-filter.c:343
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "okänt %%(align)-argument: %s"
-#: ref-filter.c:304
+#: ref-filter.c:351
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "positiv bredd förväntad med atomen %%(align)"
-#: ref-filter.c:319
+#: ref-filter.c:369
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "okänt %%(if)-argument: %s"
-#: ref-filter.c:409
+#: ref-filter.c:464
#, c-format
msgid "malformed field name: %.*s"
msgstr "felformat fältnamn: %.*s"
-#: ref-filter.c:435
+#: ref-filter.c:491
#, c-format
msgid "unknown field name: %.*s"
msgstr "okänt fältnamn: %.*s"
-#: ref-filter.c:547
+#: ref-filter.c:608
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
-#: ref-filter.c:607
+#: ref-filter.c:671
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
-#: ref-filter.c:609
+#: ref-filter.c:673
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: atomen %%(then) använd mer än en gång"
-#: ref-filter.c:611
+#: ref-filter.c:675
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atomen %%(then) använd efter %%(else)"
-#: ref-filter.c:637
+#: ref-filter.c:703
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: atomen %%(else) använd utan en %%(if)-atom"
-#: ref-filter.c:639
+#: ref-filter.c:705
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
-#: ref-filter.c:641
+#: ref-filter.c:707
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format: atomen %%(else) använd mer än en gång"
-#: ref-filter.c:654
+#: ref-filter.c:722
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format: atomen %%(end) använd utan motsvarande atom"
-#: ref-filter.c:709
+#: ref-filter.c:779
#, c-format
msgid "malformed format string %s"
msgstr "felformad formatsträng %s"
-#: ref-filter.c:1313
+#: ref-filter.c:1387
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(ingen gren, ombaserar %s)"
-#: ref-filter.c:1316
+#: ref-filter.c:1390
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)"
+
+#: ref-filter.c:1393
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(ingen gren, \"bisect\" startad på %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1324
+#: ref-filter.c:1401
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD frånkopplat vid %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1331
+#: ref-filter.c:1408
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD frånkopplat från %s)"
-#: ref-filter.c:1335
+#: ref-filter.c:1412
msgid "(no branch)"
msgstr "(ingen gren)"
-#: ref-filter.c:1488 ref-filter.c:1519
+#: ref-filter.c:1442
#, c-format
msgid "missing object %s for %s"
msgstr "objektet %s saknas för %s"
-#: ref-filter.c:1491 ref-filter.c:1522
+#: ref-filter.c:1445
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer misslyckades på %s för %s"
-#: ref-filter.c:1822
+#: ref-filter.c:1902
#, c-format
msgid "malformed object at '%s'"
msgstr "felformat objekt vid \"%s\""
-#: ref-filter.c:1889
+#: ref-filter.c:1984
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorerar referens med trasigt namn %s"
-#: ref-filter.c:1894
+#: ref-filter.c:1989
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorerar trasig referens %s"
-#: ref-filter.c:2156
+#: ref-filter.c:2261
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atomen %%(end) saknas"
-#: ref-filter.c:2250
+#: ref-filter.c:2365
#, c-format
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
-#: remote.c:780
+#: remote.c:605
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Kan inte hämta både %s och %s till %s"
-#: remote.c:784
+#: remote.c:609
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s spårar vanligtvis %s, inte %s"
-#: remote.c:788
+#: remote.c:613
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s spårar både %s och %s"
-#: remote.c:796
+#: remote.c:621
msgid "Internal error"
msgstr "Internt fel"
-#: remote.c:1711 remote.c:1813
+#: remote.c:1534 remote.c:1635
msgid "HEAD does not point to a branch"
msgstr "HEAD pekar inte på en gren"
-#: remote.c:1720
+#: remote.c:1543
#, c-format
msgid "no such branch: '%s'"
msgstr "okänd gren: \"%s\""
-#: remote.c:1723
+#: remote.c:1546
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "ingen standarduppström angiven för grenen \"%s\""
-#: remote.c:1729
+#: remote.c:1552
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"
-#: remote.c:1744
+#: remote.c:1567
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"
-#: remote.c:1756
+#: remote.c:1579
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "grenen \"%s\" har ingen fjärr för \"push\""
-#: remote.c:1767
+#: remote.c:1589
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
-#: remote.c:1780
+#: remote.c:1602
msgid "push has no destination (push.default is 'nothing')"
msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
-#: remote.c:1802
+#: remote.c:1624
msgid "cannot resolve 'simple' push to a single destination"
msgstr "\"enkel push\" motsvarar flera olika mål"
-#: remote.c:2106
+#: remote.c:1939
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"
-#: remote.c:2110
+#: remote.c:1943
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"
-#: remote.c:2113
+#: remote.c:1946
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Din gren är à jour med \"%s\".\n"
-#: remote.c:2117
+#: remote.c:1950
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"
+
+#: remote.c:1953
+#, c-format
+msgid " (use \"%s\" for details)\n"
+msgstr " (använd \"%s\" för detaljer)\n"
+
+#: remote.c:1957
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n"
msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"
-#: remote.c:2123
+#: remote.c:1963
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n"
-#: remote.c:2126
+#: remote.c:1966
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[1] ""
"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
-#: remote.c:2134
+#: remote.c:1974
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n"
-#: remote.c:2137
+#: remote.c:1977
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"Din gren och \"%s\" har divergerat,\n"
"och har %d respektive %d olika incheckningar.\n"
-#: remote.c:2147
+#: remote.c:1987
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
-#: revision.c:2268
+#: revision.c:2289
msgid "your current branch appears to be broken"
msgstr "din nuvarande gren verkar vara trasig"
-#: revision.c:2271
+#: revision.c:2292
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"
-#: revision.c:2465
+#: revision.c:2489
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent är inkompatibelt med --bisect"
-#: run-command.c:645
+#: run-command.c:728
msgid "open /dev/null failed"
msgstr "misslyckades öppna /dev/null"
-#: run-command.c:1188
+#: run-command.c:1271
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."
#: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"
+
+#: send-pack.c:143
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "kunde inte tolka fjärruppackningsstatus: %s"
-#: send-pack.c:143
+#: send-pack.c:145
#, c-format
msgid "remote unpack failed: %s"
msgstr "fjärruppackning misslyckades: %s"
-#: send-pack.c:306
+#: send-pack.c:308
msgid "failed to sign the push certificate"
msgstr "misslyckades underteckna push-certifikatet"
-#: send-pack.c:419
+#: send-pack.c:421
msgid "the receiving end does not support --signed push"
msgstr "mottagarsidan stöder inte push med --signed"
-#: send-pack.c:421
+#: send-pack.c:423
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
"signed"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "the receiving end does not support --atomic push"
msgstr "mottagarsidan stöder inte push med --atomic"
-#: send-pack.c:438
+#: send-pack.c:440
msgid "the receiving end does not support push options"
msgstr "mottagarsidan stöder inte push-flaggor"
-#: sequencer.c:218
+#: sequencer.c:175
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""
+
+#: sequencer.c:275
+#, c-format
+msgid "could not delete '%s'"
+msgstr "kunde inte ta bort \"%s\""
+
+#: sequencer.c:301
msgid "revert"
msgstr "revert"
-#: sequencer.c:220
+#: sequencer.c:303
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:222
+#: sequencer.c:305
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:224
+#: sequencer.c:307
#, c-format
msgid "Unknown action: %d"
msgstr "Okänd funktion: %d"
-#: sequencer.c:281
+#: sequencer.c:364
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"efter att ha löst konflikterna, markera de rättade sökvägarna\n"
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\""
-#: sequencer.c:284
+#: sequencer.c:367
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
"och checka in resultatet med \"git commit\""
-#: sequencer.c:297 sequencer.c:1718
+#: sequencer.c:380 sequencer.c:2468
#, c-format
msgid "could not lock '%s'"
msgstr "kunde inte låsa \"%s\""
-#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
-#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
+#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486
+#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "kunde inte skriva till \"%s\""
-#: sequencer.c:304
+#: sequencer.c:387
#, c-format
msgid "could not write eol to '%s'"
msgstr "kunde inte skriva radslut till \"%s\""
-#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
+#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488
+#: sequencer.c:2702
#, c-format
-msgid "failed to finalize '%s'."
-msgstr "misslyckades färdigställa \"%s\"."
+msgid "failed to finalize '%s'"
+msgstr "misslyckades färdigställa \"%s\""
-#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
-#: builtin/commit.c:754 builtin/merge.c:1046
+#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371
+#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727
+#: builtin/merge.c:1046
#, c-format
msgid "could not read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: sequencer.c:358
+#: sequencer.c:441
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "dina lokala ändringar skulle skrivas över av %s."
-#: sequencer.c:362
+#: sequencer.c:445
msgid "commit your changes or stash them to proceed."
msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta."
-#: sequencer.c:391
+#: sequencer.c:474
#, c-format
msgid "%s: fast-forward"
msgstr "%s: snabbspola"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:477
+#: sequencer.c:563
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Kunde inte skriva ny indexfil"
-#: sequencer.c:496
-msgid "could not resolve HEAD commit"
-msgstr "kunde inte bestämma HEAD:s incheckning"
-
-#: sequencer.c:516
+#: sequencer.c:579
msgid "unable to update cache tree"
msgstr "kan inte uppdatera cacheträd"
-#: sequencer.c:600
+#: sequencer.c:592
+msgid "could not resolve HEAD commit"
+msgstr "kunde inte bestämma HEAD:s incheckning"
+
+#: sequencer.c:749
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:702
-#, c-format
-msgid "could not parse commit %s"
-msgstr "kunde inte tolka incheckningen %s"
+#: sequencer.c:818
+msgid "writing root commit"
+msgstr "skriver rotincheckning"
-#: sequencer.c:707
-#, c-format
-msgid "could not parse parent commit %s"
-msgstr "kunde inte tolka föräldraincheckningen %s"
+#: sequencer.c:1043
+msgid "'prepare-commit-msg' hook failed"
+msgstr "kroken \"prepare-commit-msg\" misslyckades"
-#: sequencer.c:836
-#, c-format
+#: sequencer.c:1050
msgid ""
-"unexpected 1st line of squash message:\n"
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
"\n"
-"\t%.*s"
+" git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
msgstr ""
-"oväntad första rad i squash-meddelande:\n"
+"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"
+"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"
+"kan förhindra det här meddelandet genom att ställa dem explicit.\n"
+"Kör följande kommandon och följ instruktionerna i textredigeraren\n"
+"för att redigera din konfigurationsfil:\n"
+"\n"
+" git config --global --edit\n"
"\n"
-"\t%.*s"
+"När du gjort det kan du rätta identiteten som användes för den här\n"
+"incheckningen med:\n"
+"\n"
+" git commit --amend --reset-author\n"
-#: sequencer.c:842
-#, c-format
+#: sequencer.c:1063
msgid ""
-"invalid 1st line of squash message:\n"
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+" git config --global user.name \"Your Name\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
"\n"
-"\t%.*s"
+" git commit --amend --reset-author\n"
msgstr ""
-"ogiltig första rad i squash-meddelande:\n"
+"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"
+"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"
+"kan förhindra det här meddelandet genom att ställa dem explicit:\n"
"\n"
-"\t%.*s"
-
-#: sequencer.c:848 sequencer.c:873
-#, c-format
-msgid "This is a combination of %d commits."
-msgstr "Det här är en kombination av %d incheckningar."
+" git config --global user.name \"Ditt namn\"\n"
+" git config --global user.email du@example.com\n"
+"\n"
+"När du gjort det kan du rätta identiteten som användes för den här\n"
+"incheckningen med:\n"
+"\n"
+" git commit --amend --reset-author\n"
-#: sequencer.c:857 sequencer.c:2748
-msgid "need a HEAD to fixup"
-msgstr "behöver en HEAD-incheckning att rätta"
+#: sequencer.c:1103
+msgid "couldn't look up newly created commit"
+msgstr "kunde inte slå upp en precis skapad incheckning"
-#: sequencer.c:859
-msgid "could not read HEAD"
-msgstr "kunde inte läsa HEAD"
+#: sequencer.c:1105
+msgid "could not parse newly created commit"
+msgstr "kunde inte tolka en precis skapad incheckning"
-#: sequencer.c:861
+#: sequencer.c:1151
+msgid "unable to resolve HEAD after creating commit"
+msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
+
+#: sequencer.c:1153
+msgid "detached HEAD"
+msgstr "frånkopplad HEAD"
+
+#: sequencer.c:1157
+msgid " (root-commit)"
+msgstr " (rotincheckning)"
+
+#: sequencer.c:1178
+msgid "could not parse HEAD"
+msgstr "kunde inte tolka HEAD"
+
+#: sequencer.c:1180
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s är inte en incheckning!"
+
+#: sequencer.c:1184 builtin/commit.c:1528
+msgid "could not parse HEAD commit"
+msgstr "kunde inte tolka HEAD:s incheckning"
+
+#: sequencer.c:1235 sequencer.c:1832
+msgid "unable to parse commit author"
+msgstr "kunde inte tolka incheckningens författare"
+
+#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree misslyckades skriva ett träd"
+
+#: sequencer.c:1262 sequencer.c:1317
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""
+
+#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825
+#: builtin/merge.c:850
+msgid "failed to write commit object"
+msgstr "kunde inte skriva incheckningsobjekt"
+
+#: sequencer.c:1344
+#, c-format
+msgid "could not parse commit %s"
+msgstr "kunde inte tolka incheckningen %s"
+
+#: sequencer.c:1349
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "kunde inte tolka föräldraincheckningen %s"
+
+#: sequencer.c:1500 sequencer.c:1525
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Det här är en kombination av %d incheckningar."
+
+#: sequencer.c:1510 sequencer.c:4355
+msgid "need a HEAD to fixup"
+msgstr "behöver en HEAD-incheckning att rätta"
+
+#: sequencer.c:1512 sequencer.c:2729
+msgid "could not read HEAD"
+msgstr "kunde inte läsa HEAD"
+
+#: sequencer.c:1514
msgid "could not read HEAD's commit message"
msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
-#: sequencer.c:867
+#: sequencer.c:1520
#, c-format
msgid "cannot write '%s'"
msgstr "kan inte skriva \"%s\""
-#: sequencer.c:876 git-rebase--interactive.sh:446
+#: sequencer.c:1527 git-rebase--interactive.sh:457
msgid "This is the 1st commit message:"
msgstr "Det här är 1:a incheckningsmeddelandet:"
-#: sequencer.c:884
+#: sequencer.c:1535
#, c-format
msgid "could not read commit message of %s"
msgstr "kunde inte läsa incheckningsmeddelande för %s"
-#: sequencer.c:891
+#: sequencer.c:1542
#, c-format
msgid "This is the commit message #%d:"
msgstr "Det här är incheckningsmeddelande %d:"
-#: sequencer.c:896
+#: sequencer.c:1548
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Incheckningsmeddelande %d kommer hoppas över:"
-#: sequencer.c:901
+#: sequencer.c:1553
#, c-format
msgid "unknown command: %d"
msgstr "okänt kommando: %d"
-#: sequencer.c:967
+#: sequencer.c:1631
msgid "your index file is unmerged."
msgstr "din indexfil har inte slagits ihop."
-#: sequencer.c:986
+#: sequencer.c:1638
+msgid "cannot fixup root commit"
+msgstr "kan inte göra \"fixup\" på rotincheckning"
+
+#: sequencer.c:1657
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte."
-#: sequencer.c:994
+#: sequencer.c:1665
#, c-format
msgid "commit %s does not have parent %d"
msgstr "incheckning %s har inte förälder %d"
-#: sequencer.c:998
+#: sequencer.c:1669
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning."
-#: sequencer.c:1004
+#: sequencer.c:1675
#, c-format
msgid "cannot get commit message for %s"
msgstr "kan inte hämta incheckningsmeddelande för %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1023
+#: sequencer.c:1694
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:1086 sequencer.c:1867
+#: sequencer.c:1759
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "kunde inte byta namn på \"%s\" till \"%s\""
-#: sequencer.c:1137
+#: sequencer.c:1813
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:1138
+#: sequencer.c:1814
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:1180
+#: sequencer.c:1864
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:1190
+#: sequencer.c:1874
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:1196
+#: sequencer.c:1881
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:1270
+#: sequencer.c:1961
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s tar inte argument: \"%s\""
-#: sequencer.c:1279
+#: sequencer.c:1970
#, c-format
msgid "missing arguments for %s"
msgstr "argument saknas för %s"
-#: sequencer.c:1322
+#: sequencer.c:2029
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ogiltig rad %d: %.*s"
-#: sequencer.c:1330
+#: sequencer.c:2037
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
-#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
-#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
+#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173
#, c-format
msgid "could not read '%s'."
msgstr "kunde inte läsa \"%s\"."
-#: sequencer.c:1375
+#: sequencer.c:2108
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "rätta det med \"git rebase --edit-todo\"."
-#: sequencer.c:1377
+#: sequencer.c:2110
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "oanvändbart manus: ”%s”"
-#: sequencer.c:1382
+#: sequencer.c:2115
msgid "no commits parsed."
msgstr "inga incheckningar lästes."
-#: sequencer.c:1393
+#: sequencer.c:2126
msgid "cannot cherry-pick during a revert."
msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
-#: sequencer.c:1395
+#: sequencer.c:2128
msgid "cannot revert during a cherry-pick."
msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
-#: sequencer.c:1462
+#: sequencer.c:2195
#, c-format
msgid "invalid key: %s"
msgstr "felaktig nyckel: %s"
-#: sequencer.c:1465
+#: sequencer.c:2198
#, c-format
msgid "invalid value for %s: %s"
msgstr "felaktigt värde för %s: %s"
-#: sequencer.c:1531
+#: sequencer.c:2269
+msgid "unusable squash-onto"
+msgstr "oanvändbar squash-onto"
+
+#: sequencer.c:2285
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "trasigt manus: ”%s”"
-#: sequencer.c:1569
+#: sequencer.c:2323
msgid "a cherry-pick or revert is already in progress"
msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
-#: sequencer.c:1570
+#: sequencer.c:2324
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1573
+#: sequencer.c:2327
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:1588
+#: sequencer.c:2341
msgid "could not lock HEAD"
msgstr "kunde inte låsa HEAD"
-#: sequencer.c:1646 sequencer.c:2230
+#: sequencer.c:2396 sequencer.c:3403
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: sequencer.c:1648
+#: sequencer.c:2398
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:1650 sequencer.c:1685
+#: sequencer.c:2400 sequencer.c:2435
msgid "cannot abort from a branch yet to be born"
msgstr "kan inte avbryta från en gren som ännu inte är född"
-#: sequencer.c:1671 builtin/grep.c:713
+#: sequencer.c:2421 builtin/grep.c:720
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
-#: sequencer.c:1673
+#: sequencer.c:2423
#, c-format
msgid "cannot read '%s': %s"
msgstr "kan inte läsa \"%s\": %s"
-#: sequencer.c:1674
+#: sequencer.c:2424
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:1680
+#: sequencer.c:2430
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
-#: sequencer.c:1691
+#: sequencer.c:2441
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Du verkar ha flyttat HEAD.\n"
"Spolar inte tillbaka, kontrollera HEAD!"
-#: sequencer.c:1832 sequencer.c:2128
+#: sequencer.c:2545 sequencer.c:3321
+#, c-format
+msgid "could not update %s"
+msgstr "kunde inte uppdatera %s"
+
+#: sequencer.c:2583 sequencer.c:3301
msgid "cannot read HEAD"
msgstr "kan inte läsa HEAD"
-#: sequencer.c:1872 builtin/difftool.c:639
+#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "kunde inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:1891
+#: sequencer.c:2641
msgid "could not read index"
msgstr "kunde inte läsa indexet"
-#: sequencer.c:1896
+#: sequencer.c:2646
#, c-format
msgid ""
"execution failed: %s\n"
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:1902
+#: sequencer.c:2652
msgid "and made changes to the index and/or the working tree\n"
msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"
-#: sequencer.c:1908
+#: sequencer.c:2658
#, c-format
msgid ""
"execution succeeded: %s\n"
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:1967
+#: sequencer.c:2771
+msgid "writing fake root commit"
+msgstr "skriver fejkad rotincheckning"
+
+#: sequencer.c:2776
+msgid "writing squash-onto"
+msgstr "skriver squash-onto"
+
+#: sequencer.c:2811
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "kunde inte hitta trädet för %s."
+
+#: sequencer.c:2829
+msgid "could not write index"
+msgstr "kunde inte skriva indexet"
+
+#: sequencer.c:2861
+msgid "cannot merge without a current revision"
+msgstr "kan inte slå ihop utan en aktuell incheckning"
+
+#: sequencer.c:2884
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "kunde inte upplösa \"%s\""
+
+#: sequencer.c:2906
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""
+
+#: sequencer.c:2916 sequencer.c:2941
+#, c-format
+msgid "could not write '%s'"
+msgstr "kunde inte skriva \"%s\""
+
+#: sequencer.c:3005
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "kunde inte ens försöka slå ihop \"%.*s\""
+
+#: sequencer.c:3021
+msgid "merge: Unable to write new index file"
+msgstr "sammanslagning: Kunde inte skriva ny indexfil"
+
+#: sequencer.c:3088
#, c-format
msgid "Applied autostash.\n"
msgstr "Tillämpade autostash.\n"
-#: sequencer.c:1979
+#: sequencer.c:3100
#, c-format
msgid "cannot store %s"
msgstr "kan inte spara %s"
-#: sequencer.c:1982 git-rebase.sh:175
+#: sequencer.c:3103 git-rebase.sh:188
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"Dina ändringar är säkra i stashen.\n"
"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
-#: sequencer.c:2064
+#: sequencer.c:3134
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+" %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+" git rebase --edit-todo\n"
+" git rebase --continue\n"
+msgstr ""
+"Kunde inte köra todo-kommandot\n"
+"\n"
+" %.*s\n"
+"Det har lagts tillbaka i kön; För att redigera kommandot innan du\n"
+"fortsätter, redigera först attgöra-listan:\n"
+"\n"
+" git rebase --edit-todo\n"
+" git rebase --continue\n"
+
+#: sequencer.c:3202
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Stoppade på %s... %.*s\n"
-#: sequencer.c:2106
+#: sequencer.c:3264
#, c-format
msgid "unknown command %d"
msgstr "okänt kommando %d"
-#: sequencer.c:2136
+#: sequencer.c:3309
msgid "could not read orig-head"
msgstr "kunde inte läsa orig-head"
-#: sequencer.c:2141 sequencer.c:2745
+#: sequencer.c:3314 sequencer.c:4352
msgid "could not read 'onto'"
msgstr "kunde inte läsa \"onto\""
-#: sequencer.c:2148
-#, c-format
-msgid "could not update %s"
-msgstr "kunde inte uppdatera %s"
-
-#: sequencer.c:2155
+#: sequencer.c:3328
#, c-format
msgid "could not update HEAD to %s"
msgstr "kunde inte uppdatera HEAD till %s"
-#: sequencer.c:2239
+#: sequencer.c:3414
msgid "cannot rebase: You have unstaged changes."
msgstr "kan inte ombasera: Du har oköade ändringar."
-#: sequencer.c:2244
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
-
-#: sequencer.c:2253
+#: sequencer.c:3423
msgid "cannot amend non-existing commit"
msgstr "kan inte lägga till incheckning som inte finns"
-#: sequencer.c:2255
+#: sequencer.c:3425
#, c-format
msgid "invalid file: '%s'"
msgstr "ogiltig fil: \"%s\""
-#: sequencer.c:2257
+#: sequencer.c:3427
#, c-format
msgid "invalid contents: '%s'"
msgstr "ogiltigt innehåll: \"%s\""
-#: sequencer.c:2260
+#: sequencer.c:3430
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
"först och kör sedan \"git rebase --continute\" igen."
-#: sequencer.c:2270
+#: sequencer.c:3455 sequencer.c:3493
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "kunde inte skriva fil: \"%s\""
+
+#: sequencer.c:3508
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
+
+#: sequencer.c:3515
msgid "could not commit staged changes."
msgstr "kunde inte checka in köade ändringar."
-#: sequencer.c:2350
+#: sequencer.c:3612
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: kan inte göra \"cherry-pick\" på typen ”%s”"
-#: sequencer.c:2354
+#: sequencer.c:3616
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:2387
+#: sequencer.c:3649
msgid "can't revert as initial commit"
msgstr "kan inte ångra som första incheckning"
-#: sequencer.c:2492
+#: sequencer.c:4098
msgid "make_script: unhandled options"
msgstr "make_script: flaggor som inte stöds"
-#: sequencer.c:2495
+#: sequencer.c:4101
msgid "make_script: error preparing revisions"
msgstr "make_script: fel när revisioner skulle förberedas"
-#: sequencer.c:2529 sequencer.c:2564
+#: sequencer.c:4142 sequencer.c:4177
#, c-format
msgid "unusable todo list: '%s'"
msgstr "oanvändbar todo-lista: %s"
-#: sequencer.c:2615
+#: sequencer.c:4236
#, c-format
msgid ""
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
-#: sequencer.c:2695
+#: sequencer.c:4302
#, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Varning: vissa incheckningar kan av misstag ha tappats.\n"
"Tappade incheckningar (nyaste först):\n"
-#: sequencer.c:2702
+#: sequencer.c:4309
#, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\" (fel).\n"
"\n"
-#: sequencer.c:2714
+#: sequencer.c:4321
#, c-format
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue\".\n"
"Avbryt ombaseringen med \"git rebase --abort\".\n"
-#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "kunde inte öppna \"%s\" för skrivning"
-
-#: sequencer.c:2775
+#: sequencer.c:4375
#, c-format
msgid "could not parse commit '%s'"
msgstr "kunde inte tolka incheckningen\" %s\""
-#: sequencer.c:2897
+#: sequencer.c:4490
msgid "the script was already rearranged."
msgstr "skriptet har redan omordnats."
-#: setup.c:171
+#: setup.c:123
+#, c-format
+msgid "'%s' is outside repository"
+msgstr "\"%s\" är utanför arkivet"
+
+#: setup.c:172
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns "
"lokalt."
-#: setup.c:184
+#: setup.c:185
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
"\"git <kommando> [<revision>...] -- [<fil>...]\""
-#: setup.c:252
+#: setup.c:234
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "flaggan \"%s\" måste anges före argument som inte är flaggor"
+
+#: setup.c:253
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
"\"git <kommando> [<revision>...] -- [<fil>...]\""
-#: setup.c:501
+#: setup.c:389
+msgid "unable to set up work tree using invalid config"
+msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"
+
+#: setup.c:393
+msgid "this operation must be run in a work tree"
+msgstr "funktionen måste köras i en arbetskatalog"
+
+#: setup.c:503
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Förväntade git-arkivversion <= %d, hittade %d"
-#: setup.c:509
+#: setup.c:511
msgid "unknown repository extensions found:"
msgstr "okända arkivutökningar hittades:"
-#: setup.c:811
+#: setup.c:530
#, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
-msgstr "Inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"
+msgid "error opening '%s'"
+msgstr "fel vid öppning av \"%s\""
-#: setup.c:813 builtin/index-pack.c:1653
-msgid "Cannot come back to cwd"
-msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
+#: setup.c:532
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "för stor för att vara en .git-fil: \"%s\""
+
+#: setup.c:534
+#, c-format
+msgid "error reading %s"
+msgstr "fel vid läsning av %s"
+
+#: setup.c:536
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "ogiltigt gitfilformat: %s"
+
+#: setup.c:538
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "ingen sökväg i gitfil: %s"
+
+#: setup.c:540
+#, c-format
+msgid "not a git repository: %s"
+msgstr "inte ett git-arkiv: %s"
+
+#: setup.c:639
+#, c-format
+msgid "'$%s' too big"
+msgstr "\"$%s\" för stor"
+
+#: setup.c:653
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "inte ett git-arkiv: \"%s\""
+
+#: setup.c:682 setup.c:684 setup.c:715
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "kan inte byta katalog (chdir) till \"%s\""
+
+#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815
+msgid "cannot come back to cwd"
+msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"
+
+#: setup.c:813
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"
-#: setup.c:1052
+#: setup.c:824
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "misslyckades ta status på \"%*ss%s%s\""
+
+#: setup.c:1054
msgid "Unable to read current working directory"
msgstr "Kan inte läsa aktuell arbetskatalog"
-#: setup.c:1064 setup.c:1070
+#: setup.c:1066 setup.c:1072
#, c-format
-msgid "Cannot change to '%s'"
-msgstr "Kan inte byta till \"%s\""
+msgid "cannot change to '%s'"
+msgstr "kan inte byta till \"%s\""
-#: setup.c:1083
+#: setup.c:1085
#, c-format
msgid ""
-"Not a git repository (or any parent up to mount point %s)\n"
+"not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
-"Inte ett git-arkiv (eller någon av föräldrakatalogerna upp till "
+"inte ett git-arkiv (eller någon av föräldrakatalogerna upp till "
"monteringspunkten %s)\n"
"Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
-#: setup.c:1167
+#: setup.c:1168
#, c-format
msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr ""
-"Problem med filläges-värdet i core.sharedRepository (0%.3o).\n"
+"problem med filläges-värdet i core.sharedRepository (0%.3o).\n"
"Ägaren av filerna måste alltid ha läs- och skrivbehörighet."
-#: sha1_file.c:598
+#: setup.c:1211
+msgid "open /dev/null or dup failed"
+msgstr "misslyckades öppna /dev/null eller \"dup\""
+
+#: setup.c:1226
+msgid "fork failed"
+msgstr "\"fork\" misslyckades"
+
+#: setup.c:1231
+msgid "setsid failed"
+msgstr "\"setsid\" misslyckades"
+
+#: sha1-file.c:625
#, c-format
msgid "path '%s' does not exist"
msgstr "sökvägen \"%s\" finns inte"
-#: sha1_file.c:624
+#: sha1-file.c:651
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."
-#: sha1_file.c:630
+#: sha1-file.c:657
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-#: sha1_file.c:636
+#: sha1-file.c:663
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "referensarkivet \"%s\" är grunt"
-#: sha1_file.c:644
+#: sha1-file.c:671
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "referensarkivet \"%s\" är ympat"
-#: sha1_name.c:422
+#: sha1-name.c:442
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "kort SHA1 %s är tvetydig"
-#: sha1_name.c:433
+#: sha1-name.c:453
msgid "The candidates are:"
msgstr "Kandidaterna är:"
-#: sha1_name.c:693
+#: sha1-name.c:695
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
"genom att köra \"git config advice.objectNameWarning false\""
-#: submodule.c:96 submodule.c:130
+#: submodule.c:97 submodule.c:131
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "
"sammanslagningskonflikter först"
-#: submodule.c:100 submodule.c:134
+#: submodule.c:101 submodule.c:135
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s"
-#: submodule.c:108
+#: submodule.c:109
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Kunde inte uppdatera .gitmodules-posten %s"
-#: submodule.c:141
+#: submodule.c:142
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Kunde inte ta bort .gitmodules-posten för %s"
-#: submodule.c:152
+#: submodule.c:153
msgid "staging updated .gitmodules failed"
msgstr "misslyckades köa uppdaterad .gitmodules"
-#: submodule.c:312
+#: submodule.c:315
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "i ej utcheckad undermodul \"%s\""
-#: submodule.c:343
+#: submodule.c:346
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
-#: submodule.c:833
+#: submodule.c:837
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"
-#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+#: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens."
-#: submodule.c:1370
+#: submodule.c:1375
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "\"%s\" känns inte igen som ett git-arkiv"
-#: submodule.c:1508
+#: submodule.c:1513
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""
-#: submodule.c:1521
+#: submodule.c:1526
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""
-#: submodule.c:1614
+#: submodule.c:1619
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "undermodulen \"%s\" har ett smutsigt index"
-#: submodule.c:1876
+#: submodule.c:1718
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
"relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
"stöds ej"
-#: submodule.c:1888 submodule.c:1944
+#: submodule.c:1730 submodule.c:1786
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
-#: submodule.c:1892 builtin/submodule--helper.c:909
-#: builtin/submodule--helper.c:919
+#: submodule.c:1734 builtin/submodule--helper.c:1261
+#: builtin/submodule--helper.c:1271
#, c-format
msgid "could not create directory '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: submodule.c:1895
+#: submodule.c:1737
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"\"%s\" till\n"
"\"%s\"\n"
-#: submodule.c:1979
+#: submodule.c:1821
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "kunde inte rekursera in i undermodulen \"%s\""
-#: submodule.c:2023
+#: submodule.c:1865
msgid "could not start ls-files in .."
msgstr "kunde inte starta ls-files i .."
-#: submodule.c:2043
-msgid "BUG: returned path string doesn't match cwd?"
-msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"
-
-#: submodule.c:2062
+#: submodule.c:1904
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree returnerade en oväntad returkod %d"
-#: submodule-config.c:263
+#: submodule-config.c:230
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "ignorerar misstänkt undermodulnamn: %s"
+
+#: submodule-config.c:294
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "negativa värden är inte tillåtna för submodule.fetchjobs"
-#: submodule-config.c:436
+#: submodule-config.c:467
#, c-format
msgid "invalid value for %s"
msgstr "ogiltigt värde för %s"
msgid "unknown value '%s' for key '%s'"
msgstr "okänt värde \"%s\" för nyckeln \"%s\""
-#: trailer.c:539 trailer.c:544 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:293
#, c-format
msgid "more than one %s"
msgstr "mer än en %s"
msgid "could not rename temporary file to %s"
msgstr "kunde inte byta namn på temporär fil till %s"
-#: transport.c:63
+#: transport.c:116
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"
-#: transport.c:152
+#: transport.c:208
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: ogiltig flagga för depth: ”%s”"
-#: transport.c:904
+#: transport.c:584
+msgid "could not parse transport.color.* config"
+msgstr "kunde inte tolka inställningen för transport.color.*"
+
+#: transport.c:996
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"Följande undermodulsökvägar innehåller ändringar som\n"
"inte kan hittas av fjärrarna:\n"
-#: transport.c:908
+#: transport.c:1000
#, c-format
msgid ""
"\n"
"för att sända dem till fjärren.\n"
"\n"
-#: transport.c:916
+#: transport.c:1008
msgid "Aborting."
msgstr "Avbryter."
-#: transport-helper.c:1074
+#: transport-helper.c:1087
#, c-format
msgid "Could not read ref %s"
msgstr "Kunde inte läsa referensen %s"
msgid "empty filename in tree entry"
msgstr "tomt filnamn i trädpost"
-#: tree-walk.c:114
+#: tree-walk.c:113
msgid "too-short tree file"
msgstr "trädfil för kort"
-#: unpack-trees.c:107
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
-#: unpack-trees.c:109
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
"%%s"
-#: unpack-trees.c:112
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"sammanslagning:\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
-#: unpack-trees.c:114
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"sammanslagning:\n"
"%%s"
-#: unpack-trees.c:117
+#: unpack-trees.c:121
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."
-#: unpack-trees.c:119
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
"%%s"
-#: unpack-trees.c:124
+#: unpack-trees.c:128
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"dem:\n"
"%s"
-#: unpack-trees.c:128
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:130
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
"%%s"
-#: unpack-trees.c:133
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"sammanslagningen:\n"
"%%sFlytta eller ta bort dem innan du slår samman."
-#: unpack-trees.c:135
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"sammanslagningen:\n"
"%%s"
-#: unpack-trees.c:138
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
"%%sFlytta eller ta bort dem innan du \"%s\"."
-#: unpack-trees.c:140
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
"%%s"
-#: unpack-trees.c:145
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"utcheckningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:147
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"utcheckningen:\n"
"%%s"
-#: unpack-trees.c:150
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"sammanslagningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:152
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"sammanslagningen:\n"
"%%s"
-#: unpack-trees.c:155
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
"%%sFlytta eller ta bort dem innan du \"%s\"."
-#: unpack-trees.c:157
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
"%%s"
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
-#: unpack-trees.c:167
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
"Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n"
"%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:175
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
"utcheckning:\n"
"%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:177
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
"utcheckning:\n"
"%s"
-#: unpack-trees.c:173
+#: unpack-trees.c:179
#, c-format
msgid ""
"Cannot update submodule:\n"
"Kan inte uppdatera undermodul:\n"
"%s"
-#: unpack-trees.c:250
+#: unpack-trees.c:262
#, c-format
msgid "Aborting\n"
msgstr "Avbryter\n"
-#: unpack-trees.c:332
+#: unpack-trees.c:344
msgid "Checking out files"
msgstr "Checkar ut filer"
msgid "invalid '..' path segment"
msgstr "felaktigt \"..\"-sökvägssegment"
-#: worktree.c:245
+#: worktree.c:245 builtin/am.c:2147
#, c-format
msgid "failed to read '%s'"
msgstr "misslyckades läsa \"%s\""
+#: worktree.c:291
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen"
+
+#: worktree.c:302
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen"
+
+#: worktree.c:314
+#, c-format
+msgid "'%s' does not exist"
+msgstr "\"%s\" finns inte"
+
+#: worktree.c:320
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "\"%s\" är inte en .git-fil, felkod %d"
+
+#: worktree.c:328
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "\"%s\" pekar inte tillbaka till \"%s\""
+
#: wrapper.c:223 wrapper.c:393
#, c-format
msgid "could not open '%s' for reading and writing"
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
-#: wt-status.c:150
+#: wt-status.c:154
msgid "Unmerged paths:"
msgstr "Ej sammanslagna sökvägar:"
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:181 wt-status.c:208
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)"
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:183 wt-status.c:210
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
-#: wt-status.c:183
+#: wt-status.c:187
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (använd \"git add <fil>...\" för att ange lösning)"
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:189 wt-status.c:193
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"
-#: wt-status.c:187
+#: wt-status.c:191
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
-#: wt-status.c:198 wt-status.c:984
+#: wt-status.c:202 wt-status.c:1015
msgid "Changes to be committed:"
msgstr "Ändringar att checka in:"
-#: wt-status.c:216 wt-status.c:993
+#: wt-status.c:220 wt-status.c:1024
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
-#: wt-status.c:220
+#: wt-status.c:224
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"
-#: wt-status.c:222
+#: wt-status.c:226
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"
-#: wt-status.c:223
+#: wt-status.c:227
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "
"arbetskatalogen)"
-#: wt-status.c:225
+#: wt-status.c:229
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
-#: wt-status.c:237
+#: wt-status.c:241
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)"
-#: wt-status.c:252
+#: wt-status.c:256
msgid "both deleted:"
msgstr "borttaget av bägge:"
-#: wt-status.c:254
+#: wt-status.c:258
msgid "added by us:"
msgstr "tillagt av oss:"
-#: wt-status.c:256
+#: wt-status.c:260
msgid "deleted by them:"
msgstr "borttaget av dem:"
-#: wt-status.c:258
+#: wt-status.c:262
msgid "added by them:"
msgstr "tillagt av dem:"
-#: wt-status.c:260
+#: wt-status.c:264
msgid "deleted by us:"
msgstr "borttaget av oss:"
-#: wt-status.c:262
+#: wt-status.c:266
msgid "both added:"
msgstr "tillagt av bägge:"
-#: wt-status.c:264
+#: wt-status.c:268
msgid "both modified:"
msgstr "ändrat av bägge:"
-#: wt-status.c:274
+#: wt-status.c:278
msgid "new file:"
msgstr "ny fil:"
-#: wt-status.c:276
+#: wt-status.c:280
msgid "copied:"
msgstr "kopierad:"
-#: wt-status.c:278
+#: wt-status.c:282
msgid "deleted:"
msgstr "borttagen:"
-#: wt-status.c:280
+#: wt-status.c:284
msgid "modified:"
msgstr "ändrad:"
-#: wt-status.c:282
+#: wt-status.c:286
msgid "renamed:"
msgstr "namnbytt:"
-#: wt-status.c:284
+#: wt-status.c:288
msgid "typechange:"
msgstr "typbyte:"
-#: wt-status.c:286
+#: wt-status.c:290
msgid "unknown:"
msgstr "okänd:"
-#: wt-status.c:288
+#: wt-status.c:292
msgid "unmerged:"
msgstr "osammanslagen:"
-#: wt-status.c:370
+#: wt-status.c:372
msgid "new commits, "
msgstr "nya incheckningar, "
-#: wt-status.c:372
+#: wt-status.c:374
msgid "modified content, "
msgstr "ändrat innehåll, "
-#: wt-status.c:374
+#: wt-status.c:376
msgid "untracked content, "
msgstr "ospårat innehåll, "
-#: wt-status.c:824
+#: wt-status.c:853
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Stashen innehåller just nu %d post"
msgstr[1] "Stashen innehåller just nu %d poster"
-#: wt-status.c:856
+#: wt-status.c:885
msgid "Submodules changed but not updated:"
msgstr "Undermoduler ändrade men inte uppdaterade:"
-#: wt-status.c:858
+#: wt-status.c:887
msgid "Submodule changes to be committed:"
msgstr "Undermodulers ändringar att checka in:"
-#: wt-status.c:940
+#: wt-status.c:969
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
"Raden ovan får inte ändras eller tas bort.\n"
"Allt under den kommer tas bort."
-#: wt-status.c:1053
+#: wt-status.c:1084
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
-#: wt-status.c:1056
+#: wt-status.c:1087
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
-#: wt-status.c:1058
+#: wt-status.c:1089
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"
-#: wt-status.c:1063
+#: wt-status.c:1094
msgid "All conflicts fixed but you are still merging."
msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
-#: wt-status.c:1066
+#: wt-status.c:1097
msgid " (use \"git commit\" to conclude merge)"
msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
-#: wt-status.c:1076
+#: wt-status.c:1107
msgid "You are in the middle of an am session."
msgstr "Du är i mitten av en körning av \"git am\"."
-#: wt-status.c:1079
+#: wt-status.c:1110
msgid "The current patch is empty."
msgstr "Aktuell patch är tom."
-#: wt-status.c:1083
+#: wt-status.c:1114
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (rätta konflikter och kör sedan \"git am --continue\")"
-#: wt-status.c:1085
+#: wt-status.c:1116
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
-#: wt-status.c:1087
+#: wt-status.c:1118
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
-#: wt-status.c:1219
+#: wt-status.c:1250
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo saknas."
-#: wt-status.c:1221
+#: wt-status.c:1252
msgid "No commands done."
msgstr "Inga kommandon utförda."
-#: wt-status.c:1224
+#: wt-status.c:1255
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Sista kommandot utfört (%d kommando utfört):"
msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"
-#: wt-status.c:1235
+#: wt-status.c:1266
#, c-format
msgid " (see more in file %s)"
msgstr " (se fler i filen %s)"
-#: wt-status.c:1240
+#: wt-status.c:1271
msgid "No commands remaining."
msgstr "Inga kommandon återstår."
-#: wt-status.c:1243
+#: wt-status.c:1274
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"
msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"
-#: wt-status.c:1251
+#: wt-status.c:1282
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"
-#: wt-status.c:1264
+#: wt-status.c:1295
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."
-#: wt-status.c:1269
+#: wt-status.c:1300
msgid "You are currently rebasing."
msgstr "Du håller på med en ombasering."
-#: wt-status.c:1283
+#: wt-status.c:1314
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
-#: wt-status.c:1285
+#: wt-status.c:1316
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
-#: wt-status.c:1287
+#: wt-status.c:1318
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
-#: wt-status.c:1293
+#: wt-status.c:1324
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
-#: wt-status.c:1297
+#: wt-status.c:1328
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1302
+#: wt-status.c:1333
msgid "You are currently splitting a commit during a rebase."
msgstr "Du håller på att dela upp en incheckning i en ombasering."
-#: wt-status.c:1305
+#: wt-status.c:1336
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
-#: wt-status.c:1309
+#: wt-status.c:1340
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1314
+#: wt-status.c:1345
msgid "You are currently editing a commit during a rebase."
msgstr "Du håller på att redigera en incheckning under en ombasering."
-#: wt-status.c:1317
+#: wt-status.c:1348
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
-#: wt-status.c:1319
+#: wt-status.c:1350
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
-#: wt-status.c:1329
+#: wt-status.c:1360
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."
-#: wt-status.c:1334
+#: wt-status.c:1365
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
-#: wt-status.c:1337
+#: wt-status.c:1368
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"
-#: wt-status.c:1339
+#: wt-status.c:1370
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"
"operationen)"
-#: wt-status.c:1348
+#: wt-status.c:1379
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Du håller på med att ångra incheckningen %s."
-#: wt-status.c:1353
+#: wt-status.c:1384
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"
-#: wt-status.c:1356
+#: wt-status.c:1387
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alla konflikter rättade: kör \"git revert --continue\")"
-#: wt-status.c:1358
+#: wt-status.c:1389
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"
-#: wt-status.c:1369
+#: wt-status.c:1400
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."
-#: wt-status.c:1373
+#: wt-status.c:1404
msgid "You are currently bisecting."
msgstr "Du håller på med en \"bisect\"."
-#: wt-status.c:1376
+#: wt-status.c:1407
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
-#: wt-status.c:1573
+#: wt-status.c:1604
msgid "On branch "
msgstr "På grenen "
-#: wt-status.c:1579
+#: wt-status.c:1610
msgid "interactive rebase in progress; onto "
msgstr "interaktiv ombasering pågår; ovanpå "
-#: wt-status.c:1581
+#: wt-status.c:1612
msgid "rebase in progress; onto "
msgstr "ombasering pågår; ovanpå "
-#: wt-status.c:1586
+#: wt-status.c:1617
msgid "HEAD detached at "
msgstr "HEAD frånkopplad vid "
-#: wt-status.c:1588
+#: wt-status.c:1619
msgid "HEAD detached from "
msgstr "HEAD frånkopplad från "
-#: wt-status.c:1591
+#: wt-status.c:1622
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:1611
+#: wt-status.c:1642
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:1612
+#: wt-status.c:1643
msgid "No commits yet"
msgstr "Inga incheckningar ännu"
-#: wt-status.c:1626
+#: wt-status.c:1657
msgid "Untracked files"
msgstr "Ospårade filer"
-#: wt-status.c:1628
+#: wt-status.c:1659
msgid "Ignored files"
msgstr "Ignorerade filer"
-#: wt-status.c:1632
+#: wt-status.c:1663
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"lägga till nya filer själv (se \"git help status\")."
# %s är nästa sträng eller tom.
-#: wt-status.c:1638
+#: wt-status.c:1669
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:1640
+#: wt-status.c:1671
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
-#: wt-status.c:1646
+#: wt-status.c:1677
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:1651
+#: wt-status.c:1682
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
"\")\n"
-#: wt-status.c:1654
+#: wt-status.c:1685
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
-#: wt-status.c:1657
+#: wt-status.c:1688
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
"\")\n"
-#: wt-status.c:1660
+#: wt-status.c:1691
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "inget köat för incheckning, men ospårade filer finns\n"
-#: wt-status.c:1663
+#: wt-status.c:1694
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
-#: wt-status.c:1666 wt-status.c:1671
+#: wt-status.c:1697 wt-status.c:1702
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
-#: wt-status.c:1669
+#: wt-status.c:1700
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
-#: wt-status.c:1673
+#: wt-status.c:1704
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
-#: wt-status.c:1785
+#: wt-status.c:1817
msgid "No commits yet on "
msgstr "Inga incheckningar ännu på "
-#: wt-status.c:1789
+#: wt-status.c:1821
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:1818 wt-status.c:1826
+#: wt-status.c:1852
+msgid "different"
+msgstr "olika"
+
+#: wt-status.c:1854 wt-status.c:1862
msgid "behind "
msgstr "efter "
-#: wt-status.c:1821 wt-status.c:1824
+#: wt-status.c:1857 wt-status.c:1860
msgid "ahead "
msgstr "före "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2318
+#: wt-status.c:2366
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "kan inte %s: Du har oköade ändringar."
-#: wt-status.c:2324
+#: wt-status.c:2372
msgid "additionally, your index contains uncommitted changes."
msgstr "dessutom innehåller dit index ändringar som inte har checkats in."
-#: wt-status.c:2326
+#: wt-status.c:2374
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."
-#: compat/precompose_utf8.c:58 builtin/clone.c:437
+#: compat/precompose_utf8.c:58 builtin/clone.c:442
#, c-format
msgid "failed to unlink '%s'"
msgstr "misslyckades ta bort länken \"%s\""
msgid "unexpected diff status %c"
msgstr "diff-status %c förväntades inte"
-#: builtin/add.c:88 builtin/commit.c:291
+#: builtin/add.c:88 builtin/commit.c:266
msgid "updating files failed"
msgstr "misslyckades uppdatera filer"
msgid "Unstaged changes after refreshing the index:"
msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
-#: builtin/add.c:233 builtin/rev-parse.c:888
+#: builtin/add.c:233 builtin/rev-parse.c:892
msgid "Could not read the index"
msgstr "Kunde inte läsa indexet"
msgid "Could not apply '%s'"
msgstr "Kunde inte tillämpa \"%s\""
-#: builtin/add.c:271
+#: builtin/add.c:269
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
-#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
-#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123
+#: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557
+#: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165
msgid "dry run"
msgstr "testkörning"
-#: builtin/add.c:294
+#: builtin/add.c:292
msgid "interactive picking"
msgstr "plocka interaktivt"
-#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
+#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302
msgid "select hunks interactively"
msgstr "välj stycken interaktivt"
-#: builtin/add.c:296
+#: builtin/add.c:294
msgid "edit current diff and apply"
msgstr "redigera aktuell diff och applicera"
-#: builtin/add.c:297
+#: builtin/add.c:295
msgid "allow adding otherwise ignored files"
msgstr "tillåt lägga till annars ignorerade filer"
-#: builtin/add.c:298
+#: builtin/add.c:296
msgid "update tracked files"
msgstr "uppdatera spårade filer"
-#: builtin/add.c:299
+#: builtin/add.c:297
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "åternormalisera radslut i spårade filer (implicerar -u)"
-#: builtin/add.c:300
+#: builtin/add.c:298
msgid "record only the fact that the path will be added later"
msgstr "registrera endast att sökvägen kommer läggas till senare"
-#: builtin/add.c:301
+#: builtin/add.c:299
msgid "add changes from all tracked and untracked files"
msgstr "lägg till ändringar från alla spårade och ospårade filer"
-#: builtin/add.c:304
+#: builtin/add.c:302
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)"
-#: builtin/add.c:306
+#: builtin/add.c:304
msgid "don't add, only refresh the index"
msgstr "lägg inte till, uppdatera endast indexet"
-#: builtin/add.c:307
+#: builtin/add.c:305
msgid "just skip files which cannot be added because of errors"
msgstr "hoppa bara över filer som inte kan läggas till på grund av fel"
-#: builtin/add.c:308
+#: builtin/add.c:306
msgid "check if - even missing - files are ignored in dry run"
msgstr "se om - även saknade - filer ignoreras i testkörning"
-#: builtin/add.c:309 builtin/update-index.c:964
+#: builtin/add.c:307 builtin/update-index.c:974
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:309 builtin/update-index.c:965
+#: builtin/add.c:307 builtin/update-index.c:975
msgid "override the executable bit of the listed files"
msgstr "överstyr exekveringsbiten för angivna filer"
-#: builtin/add.c:311
+#: builtin/add.c:309
msgid "warn when adding an embedded repository"
msgstr "varna när ett inbyggt arkiv läggs till"
-#: builtin/add.c:326
+#: builtin/add.c:324
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"\n"
"Se ”git help submodule” för ytterligare information."
-#: builtin/add.c:354
+#: builtin/add.c:352
#, c-format
msgid "adding embedded git repository: %s"
msgstr "lägger till inbäddat git-arkiv: %s"
-#: builtin/add.c:372
+#: builtin/add.c:370
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Använd -f om du verkligen vill lägga till dem.\n"
-#: builtin/add.c:380
+#: builtin/add.c:378
msgid "adding files failed"
msgstr "misslyckades lägga till filer"
-#: builtin/add.c:417
+#: builtin/add.c:416
msgid "-A and -u are mutually incompatible"
msgstr "-A och -u är ömsesidigt inkompatibla"
-#: builtin/add.c:424
+#: builtin/add.c:423
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
-#: builtin/add.c:428
+#: builtin/add.c:427
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"
-#: builtin/add.c:443
+#: builtin/add.c:442
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Inget angivet, inget tillagt.\n"
-#: builtin/add.c:444
+#: builtin/add.c:443
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Kanske menade du att skriva \"git add .\"?\n"
-#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
-#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
-#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
-#: builtin/rm.c:271 builtin/submodule--helper.c:311
+#: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280
+#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325
+#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
+#: builtin/rm.c:270 builtin/submodule--helper.c:328
msgid "index file corrupt"
msgstr "indexfilen trasig"
msgid "Patch format detection failed."
msgstr "Misslyckades detektera patchformat."
-#: builtin/am.c:1013 builtin/clone.c:402
+#: builtin/am.c:1013 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "misslyckades skapa katalogen \"%s\""
-#: builtin/am.c:1017
+#: builtin/am.c:1018
msgid "Failed to split patches."
msgstr "Misslyckades dela patchar."
-#: builtin/am.c:1146 builtin/commit.c:376
+#: builtin/am.c:1148 builtin/commit.c:351
msgid "unable to write index file"
msgstr "kan inte skriva indexfil"
-#: builtin/am.c:1160
+#: builtin/am.c:1162
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "När du har löst problemet, kör \"%s --continue\"."
-#: builtin/am.c:1161
+#: builtin/am.c:1163
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."
-#: builtin/am.c:1162
+#: builtin/am.c:1164
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."
-#: builtin/am.c:1269
+#: builtin/am.c:1271
msgid "Patch is empty."
msgstr "Patchen är tom."
-#: builtin/am.c:1335
+#: builtin/am.c:1337
#, c-format
msgid "invalid ident line: %.*s"
msgstr "ogiltig ident-rad: %.*s"
-#: builtin/am.c:1357
+#: builtin/am.c:1359
#, c-format
msgid "unable to parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: builtin/am.c:1550
+#: builtin/am.c:1554
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Arkivet saknar objekt som behövs för att falla tillbaka på 3-"
"vägssammanslagning."
-#: builtin/am.c:1552
+#: builtin/am.c:1556
msgid "Using index info to reconstruct a base tree..."
msgstr "Använder indexinfo för att återskapa ett basträd..."
-#: builtin/am.c:1571
+#: builtin/am.c:1575
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Har du handredigerat din patch?\n"
"Den kan inte tillämpas på blobbar som antecknats i dess index."
-#: builtin/am.c:1577
+#: builtin/am.c:1581
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
-#: builtin/am.c:1602
+#: builtin/am.c:1606
msgid "Failed to merge in the changes."
msgstr "Misslyckades slå ihop ändringarna."
-#: builtin/am.c:1626 builtin/merge.c:642
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree misslyckades skriva ett träd"
-
-#: builtin/am.c:1633
+#: builtin/am.c:1637
msgid "applying to an empty history"
msgstr "tillämpar på en tom historik"
-#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
-#: builtin/merge.c:850
-msgid "failed to write commit object"
-msgstr "kunde inte skriva incheckningsobjekt"
-
-#: builtin/am.c:1679 builtin/am.c:1683
+#: builtin/am.c:1683 builtin/am.c:1687
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "kan inte återuppta: %s finns inte."
-#: builtin/am.c:1699
+#: builtin/am.c:1703
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"kan inte vara interaktiv om standard in inte är ansluten till en terminal."
-#: builtin/am.c:1704
+#: builtin/am.c:1708
msgid "Commit Body is:"
msgstr "Incheckningskroppen är:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1714
+#: builtin/am.c:1718
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "
-#: builtin/am.c:1764
+#: builtin/am.c:1768
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
-#: builtin/am.c:1804 builtin/am.c:1876
+#: builtin/am.c:1808 builtin/am.c:1879
#, c-format
msgid "Applying: %.*s"
msgstr "Tillämpar: %.*s"
-#: builtin/am.c:1820
+#: builtin/am.c:1824
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
-#: builtin/am.c:1828
+#: builtin/am.c:1832
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch misslyckades på %s %.*s"
-#: builtin/am.c:1834
-#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "En kopia av patchen som misslyckades finns i: %s"
+#: builtin/am.c:1838
+msgid "Use 'git am --show-current-patch' to see the failed patch"
+msgstr ""
+"Använd \"git am --show-current-patch\" för att se patchen som misslyckades"
-#: builtin/am.c:1879
+#: builtin/am.c:1882
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"Om det inte är något kvar att köa kan det hända att något annat redan\n"
"introducerat samma ändringar; kanske du bör hoppa över patchen."
-#: builtin/am.c:1886
+#: builtin/am.c:1889
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"lösta.\n"
"Du kan köra ”git rm” för att godta ”borttagen av dem” för den."
-#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
-#: builtin/reset.c:340
+#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
+#: builtin/reset.c:332
#, c-format
msgid "Could not parse object '%s'."
msgstr "Kan inte tolka objektet ”%s”."
-#: builtin/am.c:2045
+#: builtin/am.c:2048
msgid "failed to clean index"
msgstr "misslyckades städa upp indexet"
-#: builtin/am.c:2080
+#: builtin/am.c:2083
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
"Återställer inte till ORIG_HEAD"
-#: builtin/am.c:2143
+#: builtin/am.c:2174
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Felaktigt värde för --patch-format: %s"
-#: builtin/am.c:2176
+#: builtin/am.c:2210
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2177
+#: builtin/am.c:2211
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
-#: builtin/am.c:2183
+#: builtin/am.c:2217
msgid "run interactively"
msgstr "kör interaktivt"
-#: builtin/am.c:2185
+#: builtin/am.c:2219
msgid "historical option -- no-op"
msgstr "historisk flagga -- no-op"
-#: builtin/am.c:2187
+#: builtin/am.c:2221
msgid "allow fall back on 3way merging if needed"
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
-#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:180
+#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:192
msgid "be quiet"
msgstr "var tyst"
-#: builtin/am.c:2190
+#: builtin/am.c:2224
msgid "add a Signed-off-by line to the commit message"
msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
-#: builtin/am.c:2193
+#: builtin/am.c:2227
msgid "recode into utf8 (default)"
msgstr "koda om till utf8 (standard)"
-#: builtin/am.c:2195
+#: builtin/am.c:2229
msgid "pass -k flag to git-mailinfo"
msgstr "sänd flaggan -k till git-mailinfo"
-#: builtin/am.c:2197
+#: builtin/am.c:2231
msgid "pass -b flag to git-mailinfo"
msgstr "sänd flaggan -b till git-mailinfo"
-#: builtin/am.c:2199
+#: builtin/am.c:2233
msgid "pass -m flag to git-mailinfo"
msgstr "sänd flaggan -m till git-mailinfo"
-#: builtin/am.c:2201
+#: builtin/am.c:2235
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"
-#: builtin/am.c:2204
+#: builtin/am.c:2238
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"
-#: builtin/am.c:2207
+#: builtin/am.c:2241
msgid "strip everything before a scissors line"
msgstr "ta bort allting före en saxlinje"
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
-#: builtin/am.c:2236
+#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
+#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
+#: builtin/am.c:2270
msgid "pass it through git-apply"
msgstr "sänd det genom git-apply"
-#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
-#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
-#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
-#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665
+#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:208
+#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201
+#: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631
+#: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144
+#: parse-options.h:146 parse-options.h:258
msgid "n"
msgstr "n"
-#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
+#: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38
+#: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39
msgid "format"
msgstr "format"
-#: builtin/am.c:2233
+#: builtin/am.c:2267
msgid "format the patch(es) are in"
msgstr "format för patch(ar)"
-#: builtin/am.c:2239
+#: builtin/am.c:2273
msgid "override error message when patch failure occurs"
msgstr "överstyr felmeddelanden när patchfel uppstår"
-#: builtin/am.c:2241
+#: builtin/am.c:2275
msgid "continue applying patches after resolving a conflict"
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
-#: builtin/am.c:2244
+#: builtin/am.c:2278
msgid "synonyms for --continue"
msgstr "synonymer till --continue"
-#: builtin/am.c:2247
+#: builtin/am.c:2281
msgid "skip the current patch"
msgstr "hoppa över den aktuella grenen"
-#: builtin/am.c:2250
+#: builtin/am.c:2284
msgid "restore the original branch and abort the patching operation."
msgstr "återställ originalgrenen och avbryt patchningen."
-#: builtin/am.c:2254
+#: builtin/am.c:2287
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr "avbryt patchningen men behåll HEAD där det är."
+
+#: builtin/am.c:2290
+msgid "show the patch being applied."
+msgstr "visa patchen som tillämpas."
+
+#: builtin/am.c:2294
msgid "lie about committer date"
msgstr "ljug om incheckningsdatum"
-#: builtin/am.c:2256
+#: builtin/am.c:2296
msgid "use current timestamp for author date"
msgstr "använd nuvarande tidsstämpel för författardatum"
-#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
-#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
+#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:239
+#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399
msgid "key-id"
msgstr "nyckel-id"
-#: builtin/am.c:2259
+#: builtin/am.c:2299
msgid "GPG-sign commits"
msgstr "GPG-signera incheckningar"
-#: builtin/am.c:2262
+#: builtin/am.c:2302
msgid "(internal use for git-rebase)"
msgstr "(används internt av git-rebase)"
-#: builtin/am.c:2280
+#: builtin/am.c:2320
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
"Flaggan -b/--binary har varit utan funktion länge, och\n"
"kommer tas bort. Vi ber dig att inte använda den längre."
-#: builtin/am.c:2287
+#: builtin/am.c:2327
msgid "failed to read the index"
msgstr "misslyckades läsa indexet"
-#: builtin/am.c:2302
+#: builtin/am.c:2342
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."
-#: builtin/am.c:2326
+#: builtin/am.c:2366
#, c-format
msgid ""
"Stray %s directory found.\n"
"Kvarbliven katalog %s hittades.\n"
"Använd \"git am --abort\" för att ta bort den."
-#: builtin/am.c:2332
+#: builtin/am.c:2372
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
msgstr "git archive: Fjärr utan URL"
#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive: förväntade ACK/NAK, fick EOF"
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive: förväntade ACK/NAK, fick flush-paket"
#: builtin/archive.c:61
#, c-format
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state tar inga argument"
-#: builtin/blame.c:27
+#: builtin/blame.c:29
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"
-#: builtin/blame.c:32
+#: builtin/blame.c:34
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
-#: builtin/blame.c:668
+#: builtin/blame.c:404
+#, c-format
+msgid "expecting a color: %s"
+msgstr "förväntade en färg: %s"
+
+#: builtin/blame.c:411
+msgid "must end with a color"
+msgstr "måste sluta med en färg"
+
+#: builtin/blame.c:697
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr "felaktig färg \"%s\" i color.blame.repeatedLines"
+
+#: builtin/blame.c:715
+msgid "invalid value for blame.coloring"
+msgstr "ogiltigt värde för blame.coloring"
+
+#: builtin/blame.c:786
msgid "Show blame entries as we find them, incrementally"
msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
-#: builtin/blame.c:669
+#: builtin/blame.c:787
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
-#: builtin/blame.c:670
+#: builtin/blame.c:788
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
-#: builtin/blame.c:671
+#: builtin/blame.c:789
msgid "Show work cost statistics"
msgstr "Visa statistik över arbetskostnad"
-#: builtin/blame.c:672
+#: builtin/blame.c:790
msgid "Force progress reporting"
msgstr "Tvinga förloppsrapportering"
-#: builtin/blame.c:673
+#: builtin/blame.c:791
msgid "Show output score for blame entries"
msgstr "Visa utdatapoäng för klandringsposter"
-#: builtin/blame.c:674
+#: builtin/blame.c:792
msgid "Show original filename (Default: auto)"
msgstr "Visa originalfilnamn (Standard: auto)"
-#: builtin/blame.c:675
+#: builtin/blame.c:793
msgid "Show original linenumber (Default: off)"
msgstr "Visa ursprungligt radnummer (Standard: av)"
-#: builtin/blame.c:676
+#: builtin/blame.c:794
msgid "Show in a format designed for machine consumption"
msgstr "Visa i ett format avsett för maskinkonsumtion"
-#: builtin/blame.c:677
+#: builtin/blame.c:795
msgid "Show porcelain format with per-line commit information"
msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
-#: builtin/blame.c:678
+#: builtin/blame.c:796
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Använd samma utdataläge som git-annotate (Standard: av)"
-#: builtin/blame.c:679
+#: builtin/blame.c:797
msgid "Show raw timestamp (Default: off)"
msgstr "Visa rå tidsstämpel (Standard: av)"
-#: builtin/blame.c:680
+#: builtin/blame.c:798
msgid "Show long commit SHA1 (Default: off)"
msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
-#: builtin/blame.c:681
+#: builtin/blame.c:799
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
-#: builtin/blame.c:682
+#: builtin/blame.c:800
msgid "Show author email instead of name (Default: off)"
msgstr "Visa författarens e-post istället för namn (Standard: av)"
-#: builtin/blame.c:683
+#: builtin/blame.c:801
msgid "Ignore whitespace differences"
msgstr "Ignorera ändringar i blanksteg"
-#: builtin/blame.c:690
+#: builtin/blame.c:802
+msgid "color redundant metadata from previous line differently"
+msgstr "färglägg redundant metadata från tidigare rader annorlunda"
+
+#: builtin/blame.c:803
+msgid "color lines by age"
+msgstr "färglägg rader efter ålder"
+
+#: builtin/blame.c:810
msgid "Use an experimental heuristic to improve diffs"
msgstr "Använd en experimentell algoritm för att förbättra diffar"
-#: builtin/blame.c:692
+#: builtin/blame.c:812
msgid "Spend extra cycles to find better match"
msgstr "Slösa extra cykler med att hitta bättre träff"
-#: builtin/blame.c:693
+#: builtin/blame.c:813
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"
-#: builtin/blame.c:694
+#: builtin/blame.c:814
msgid "Use <file>'s contents as the final image"
msgstr "Använd <fil>s innehåll som slutgiltig bild"
-#: builtin/blame.c:695 builtin/blame.c:696
+#: builtin/blame.c:815 builtin/blame.c:816
msgid "score"
msgstr "poäng"
-#: builtin/blame.c:695
+#: builtin/blame.c:815
msgid "Find line copies within and across files"
msgstr "Hitta kopierade rader inuti och mellan filer"
-#: builtin/blame.c:696
+#: builtin/blame.c:816
msgid "Find line movements within and across files"
msgstr "Hitta flyttade rader inuti och mellan filer"
-#: builtin/blame.c:697
+#: builtin/blame.c:817
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:697
+#: builtin/blame.c:817
msgid "Process only line range n,m, counting from 1"
msgstr "Behandla endast radintervallet n,m, med början på 1"
-#: builtin/blame.c:744
+#: builtin/blame.c:866
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress kan inte användas med --incremental eller porslinsformat"
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:795
+#: builtin/blame.c:917
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
-#: builtin/blame.c:882
+#: builtin/blame.c:1003
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "filen %s har bara %lu rad"
msgstr[1] "filen %s har bara %lu rader"
-#: builtin/blame.c:928
+#: builtin/blame.c:1049
msgid "Blaming lines"
msgstr "Klandra rader"
msgid "Deleted branch %s (was %s).\n"
msgstr "Tog bort grenen %s (var %s).\n"
-#: builtin/branch.c:417 builtin/tag.c:58
+#: builtin/branch.c:416 builtin/tag.c:58
msgid "unable to parse format string"
msgstr "kan inte tolka formatsträng"
-#: builtin/branch.c:450
+#: builtin/branch.c:453
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Grenen %s ombaseras på %s"
-#: builtin/branch.c:454
+#: builtin/branch.c:457
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Grenen %s är i en \"bisect\" på %s"
-#: builtin/branch.c:471
+#: builtin/branch.c:474
msgid "cannot copy the current branch while not on any."
msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:473
+#: builtin/branch.c:476
msgid "cannot rename the current branch while not on any."
msgstr ""
"kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:484
+#: builtin/branch.c:487
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Felaktigt namn på gren: \"%s\""
-#: builtin/branch.c:511
+#: builtin/branch.c:514
msgid "Branch rename failed"
msgstr "Misslyckades byta namn på gren"
-#: builtin/branch.c:513
+#: builtin/branch.c:516
msgid "Branch copy failed"
msgstr "Misslyckades kopiera gren"
-#: builtin/branch.c:517
+#: builtin/branch.c:520
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Skapade kopia av felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:520
+#: builtin/branch.c:523
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:526
+#: builtin/branch.c:529
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
-#: builtin/branch.c:535
+#: builtin/branch.c:538
msgid "Branch is renamed, but update of config-file failed"
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:537
+#: builtin/branch.c:540
msgid "Branch is copied, but update of config-file failed"
msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:553
+#: builtin/branch.c:556
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/branch.c:586
+#: builtin/branch.c:589
msgid "Generic options"
msgstr "Allmänna flaggor"
-#: builtin/branch.c:588
+#: builtin/branch.c:591
msgid "show hash and subject, give twice for upstream branch"
msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"
-#: builtin/branch.c:589
+#: builtin/branch.c:592
msgid "suppress informational messages"
msgstr "undertryck informationsmeddelanden"
-#: builtin/branch.c:590
+#: builtin/branch.c:593
msgid "set up tracking mode (see git-pull(1))"
msgstr "ställ in spårningsläge (se git-pull(1))"
-#: builtin/branch.c:592
+#: builtin/branch.c:595
msgid "do not use"
msgstr "använd ej"
-#: builtin/branch.c:594
+#: builtin/branch.c:597
msgid "upstream"
msgstr "uppströms"
-#: builtin/branch.c:594
+#: builtin/branch.c:597
msgid "change the upstream info"
msgstr "ändra uppströmsinformationen"
-#: builtin/branch.c:595
+#: builtin/branch.c:598
msgid "Unset the upstream info"
msgstr "Ta bort uppströmsinformationen"
-#: builtin/branch.c:596
+#: builtin/branch.c:599
msgid "use colored output"
msgstr "använd färgad utdata"
-#: builtin/branch.c:597
+#: builtin/branch.c:600
msgid "act on remote-tracking branches"
msgstr "arbeta på fjärrspårande grenar"
-#: builtin/branch.c:599 builtin/branch.c:601
+#: builtin/branch.c:602 builtin/branch.c:604
msgid "print only branches that contain the commit"
msgstr "visa endast grenar som innehåller incheckningen"
-#: builtin/branch.c:600 builtin/branch.c:602
+#: builtin/branch.c:603 builtin/branch.c:605
msgid "print only branches that don't contain the commit"
msgstr "visa endast grenar som inte innehåller incheckningen"
-#: builtin/branch.c:605
+#: builtin/branch.c:608
msgid "Specific git-branch actions:"
msgstr "Specifika git-branch-åtgärder:"
-#: builtin/branch.c:606
+#: builtin/branch.c:609
msgid "list both remote-tracking and local branches"
msgstr "visa både fjärrspårande och lokala grenar"
-#: builtin/branch.c:608
+#: builtin/branch.c:611
msgid "delete fully merged branch"
msgstr "ta bort helt sammanslagen gren"
-#: builtin/branch.c:609
+#: builtin/branch.c:612
msgid "delete branch (even if not merged)"
msgstr "ta bort gren (även om inte helt sammanslagen)"
-#: builtin/branch.c:610
+#: builtin/branch.c:613
msgid "move/rename a branch and its reflog"
msgstr "flytta/ta bort en gren och dess reflogg"
-#: builtin/branch.c:611
+#: builtin/branch.c:614
msgid "move/rename a branch, even if target exists"
msgstr "flytta/ta bort en gren, även om målet finns"
-#: builtin/branch.c:612
+#: builtin/branch.c:615
msgid "copy a branch and its reflog"
msgstr "kopiera en gren och dess reflogg"
-#: builtin/branch.c:613
+#: builtin/branch.c:616
msgid "copy a branch, even if target exists"
msgstr "kopiera en gren, även om målet finns"
-#: builtin/branch.c:614
+#: builtin/branch.c:617
msgid "list branch names"
msgstr "lista namn på grenar"
-#: builtin/branch.c:615
+#: builtin/branch.c:618
msgid "create the branch's reflog"
msgstr "skapa grenens reflogg"
-#: builtin/branch.c:617
+#: builtin/branch.c:620
msgid "edit the description for the branch"
msgstr "redigera beskrivning för grenen"
-#: builtin/branch.c:618
+#: builtin/branch.c:621
msgid "force creation, move/rename, deletion"
msgstr "tvinga skapande, flytt/namnändring, borttagande"
-#: builtin/branch.c:619
+#: builtin/branch.c:622
msgid "print only branches that are merged"
msgstr "visa endast sammanslagna grenar"
-#: builtin/branch.c:620
+#: builtin/branch.c:623
msgid "print only branches that are not merged"
msgstr "visa endast ej sammanslagna grenar"
-#: builtin/branch.c:621
+#: builtin/branch.c:624
msgid "list branches in columns"
msgstr "visa grenar i spalter"
-#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
+#: builtin/branch.c:625 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
+#: builtin/tag.c:412
msgid "key"
msgstr "nyckel"
-#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
+#: builtin/branch.c:626 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
+#: builtin/tag.c:413
msgid "field name to sort on"
msgstr "fältnamn att sortera på"
-#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/branch.c:628 builtin/for-each-ref.c:43 builtin/notes.c:408
#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
-#: builtin/tag.c:408
+#: builtin/tag.c:415
msgid "object"
msgstr "objekt"
-#: builtin/branch.c:626
+#: builtin/branch.c:629
msgid "print only branches of the object"
msgstr "visa endast grenar för objektet"
-#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
+#: builtin/branch.c:631 builtin/for-each-ref.c:49 builtin/tag.c:422
msgid "sorting and filtering are case insensitive"
msgstr "sortering och filtrering skiljer gemener och VERSALER"
-#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
+#: builtin/branch.c:632 builtin/for-each-ref.c:38 builtin/tag.c:420
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "format att använda för utdata"
-#: builtin/branch.c:652 builtin/clone.c:730
+#: builtin/branch.c:655 builtin/clone.c:737
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
-#: builtin/branch.c:675
+#: builtin/branch.c:678
msgid "--column and --verbose are incompatible"
msgstr "--column och --verbose är inkompatibla"
-#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751
+#: builtin/branch.c:693 builtin/branch.c:745 builtin/branch.c:754
msgid "branch name required"
msgstr "grennamn krävs"
-#: builtin/branch.c:718
+#: builtin/branch.c:721
msgid "Cannot give description to detached HEAD"
msgstr "Kan inte beskriva frånkopplad HEAD"
-#: builtin/branch.c:723
+#: builtin/branch.c:726
msgid "cannot edit description of more than one branch"
msgstr "kan inte redigera beskrivning för mer än en gren"
-#: builtin/branch.c:730
+#: builtin/branch.c:733
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Inga incheckningar på grenen \"%s\" ännu."
-#: builtin/branch.c:733
+#: builtin/branch.c:736
#, c-format
msgid "No branch named '%s'."
msgstr "Ingen gren vid namnet \"%s\"."
-#: builtin/branch.c:748
+#: builtin/branch.c:751
msgid "too many branches for a copy operation"
msgstr "för många grenar för kopiering"
-#: builtin/branch.c:757
+#: builtin/branch.c:760
msgid "too many arguments for a rename operation"
msgstr "för många flaggor för namnbyte"
-#: builtin/branch.c:762
+#: builtin/branch.c:765
msgid "too many arguments to set new upstream"
msgstr "för många flaggor för att byta uppström"
-#: builtin/branch.c:766
+#: builtin/branch.c:769
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."
-#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807
+#: builtin/branch.c:772 builtin/branch.c:794 builtin/branch.c:810
#, c-format
msgid "no such branch '%s'"
msgstr "okänd gren \"%s\""
-#: builtin/branch.c:773
+#: builtin/branch.c:776
#, c-format
msgid "branch '%s' does not exist"
msgstr "grenen \"%s\" finns inte"
-#: builtin/branch.c:785
+#: builtin/branch.c:788
msgid "too many arguments to unset upstream"
msgstr "för många flaggor för att ta bort uppström"
-#: builtin/branch.c:789
+#: builtin/branch.c:792
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."
-#: builtin/branch.c:795
+#: builtin/branch.c:798
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
-#: builtin/branch.c:810
+#: builtin/branch.c:813
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "
"grennamn"
-#: builtin/branch.c:813
+#: builtin/branch.c:816
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "Need a repository to unbundle."
msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
-#: builtin/cat-file.c:521
+#: builtin/cat-file.c:525
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>"
-#: builtin/cat-file.c:522
+#: builtin/cat-file.c:526
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:563
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<typ> kan vara en av: blob, tree, commit, tag"
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:564
msgid "show object type"
msgstr "visa objekttyp"
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:565
msgid "show object size"
msgstr "visa objektstorlek"
-#: builtin/cat-file.c:563
+#: builtin/cat-file.c:567
msgid "exit with zero when there's no error"
msgstr "avsluta med noll när det inte uppstått något fel"
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:568
msgid "pretty-print object's content"
msgstr "visa objektets innehåll snyggt"
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:570
msgid "for blob objects, run textconv on object's content"
msgstr "för blob-objekt, kör filter på objektets innehåll"
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:572
msgid "for blob objects, run filters on object's content"
msgstr "för blob-objekt, kör filger på objektets innehåll"
-#: builtin/cat-file.c:569 git-submodule.sh:931
+#: builtin/cat-file.c:573 git-submodule.sh:894
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:574
msgid "use a specific path for --textconv/--filters"
msgstr "använd specifik sökväg för --textconv/--filters"
-#: builtin/cat-file.c:572
+#: builtin/cat-file.c:576
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt"
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:577
msgid "buffer --batch output"
msgstr "buffra utdata från --batch"
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:579
msgid "show info and content of objects fed from the standard input"
msgstr "visa information och innehåll för objekt som listas på standard in"
-#: builtin/cat-file.c:578
+#: builtin/cat-file.c:582
msgid "show info about objects fed from the standard input"
msgstr "visa information för objekt som listas på standard in"
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:585
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"följ symboliska länkar i trädet (använd med --batch eller --batch-check)"
-#: builtin/cat-file.c:583
+#: builtin/cat-file.c:587
msgid "show all objects with --batch or --batch-check"
msgstr "visa alla objekt med --batch eller --batch-check"
msgid "use .gitattributes only from the index"
msgstr "använd .gitattributes endast från indexet"
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
msgid "read file names from stdin"
msgstr "läs filnamn från standard in"
msgid "terminate input and output records by a NUL character"
msgstr "avsluta in- och utdataposter med NUL-tecken"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
+#: builtin/check-ignore.c:20 builtin/checkout.c:1113 builtin/gc.c:500
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
msgid "ignore index when checking"
msgstr "ignorera index vid kontroll"
-#: builtin/check-ignore.c:158
+#: builtin/check-ignore.c:159
msgid "cannot specify pathnames with --stdin"
msgstr "kan inte ange sökvägsnamn med --stdin"
-#: builtin/check-ignore.c:161
+#: builtin/check-ignore.c:162
msgid "-z only makes sense with --stdin"
msgstr "-z kan endast användas tillsammans med --stdin"
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:164
msgid "no path specified"
msgstr "ingen sökväg angavs"
-#: builtin/check-ignore.c:167
+#: builtin/check-ignore.c:168
msgid "--quiet is only valid with a single pathname"
msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn"
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:170
msgid "cannot have both --quiet and --verbose"
msgstr "kan inte använda både --quiet och --verbose"
-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:173
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching är endast giltig med --verbose"
msgstr "skriv innehåll till temporära filer"
#: builtin/checkout-index.c:173 builtin/column.c:31
-#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
-#: builtin/worktree.c:552
+#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1219
+#: builtin/submodule--helper.c:1227 builtin/submodule--helper.c:1591
+#: builtin/worktree.c:610
msgid "string"
msgstr "sträng"
msgid "path '%s': cannot merge"
msgstr "sökväg \"%s\": kan inte slå ihop"
-#: builtin/checkout.c:232
+#: builtin/checkout.c:231
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
-#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
-#: builtin/checkout.c:263
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"
-#: builtin/checkout.c:266 builtin/checkout.c:269
+#: builtin/checkout.c:265 builtin/checkout.c:268
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "\"%s\" kan inte användas med %s"
-#: builtin/checkout.c:272
+#: builtin/checkout.c:271
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
-#: builtin/checkout.c:341 builtin/checkout.c:348
+#: builtin/checkout.c:340 builtin/checkout.c:347
#, c-format
msgid "path '%s' is unmerged"
msgstr "sökvägen \"%s\" har inte slagits ihop"
msgid "you need to resolve your current index first"
msgstr "du måste lösa ditt befintliga index först"
-#: builtin/checkout.c:637
+#: builtin/checkout.c:643
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
-#: builtin/checkout.c:678
+#: builtin/checkout.c:684
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:682 builtin/clone.c:684
+#: builtin/checkout.c:688 builtin/clone.c:691
msgid "unable to update HEAD"
msgstr "kan inte uppdatera HEAD"
-#: builtin/checkout.c:686
+#: builtin/checkout.c:692
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:689
+#: builtin/checkout.c:695
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:693
+#: builtin/checkout.c:699
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Växlade till och nollställde grenen \"%s\"\n"
-#: builtin/checkout.c:695 builtin/checkout.c:1051
+#: builtin/checkout.c:701 builtin/checkout.c:1046
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Växlade till en ny gren \"%s\"\n"
-#: builtin/checkout.c:697
+#: builtin/checkout.c:703
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:748
+#: builtin/checkout.c:754
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
-#: builtin/checkout.c:754
+#: builtin/checkout.c:760
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:773
+#: builtin/checkout.c:779
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <nytt_grennamn> %s\n"
"\n"
-#: builtin/checkout.c:814
+#: builtin/checkout.c:811
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:818
+#: builtin/checkout.c:815
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:848 builtin/checkout.c:1046
+#: builtin/checkout.c:843 builtin/checkout.c:1041
msgid "You are on a branch yet to be born"
msgstr "Du är på en gren som ännu inte är född"
-#: builtin/checkout.c:952
+#: builtin/checkout.c:947
#, c-format
msgid "only one reference expected, %d given."
msgstr "endast en referens förväntades, %d gavs."
-#: builtin/checkout.c:992 builtin/worktree.c:247
+#: builtin/checkout.c:987 builtin/worktree.c:240 builtin/worktree.c:389
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1016
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1055
msgid "paths cannot be used with switching branches"
msgstr "sökvägar kan inte användas vid byte av gren"
-#: builtin/checkout.c:1063 builtin/checkout.c:1067
+#: builtin/checkout.c:1058 builtin/checkout.c:1062
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "\"%s\" kan inte användas vid byte av gren"
-#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
-#: builtin/checkout.c:1082
+#: builtin/checkout.c:1066 builtin/checkout.c:1069 builtin/checkout.c:1074
+#: builtin/checkout.c:1077
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1087
+#: builtin/checkout.c:1082
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
-#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
-#: builtin/worktree.c:371
+#: builtin/checkout.c:1114 builtin/checkout.c:1116 builtin/clone.c:118
+#: builtin/remote.c:167 builtin/remote.c:169 builtin/worktree.c:433
+#: builtin/worktree.c:435
msgid "branch"
msgstr "gren"
-#: builtin/checkout.c:1120
+#: builtin/checkout.c:1115
msgid "create and checkout a new branch"
msgstr "skapa och checka ut en ny gren"
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1117
msgid "create/reset and checkout a branch"
msgstr "skapa/nollställ och checka ut en gren"
-#: builtin/checkout.c:1123
+#: builtin/checkout.c:1118
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
-#: builtin/checkout.c:1124 builtin/worktree.c:373
+#: builtin/checkout.c:1119 builtin/worktree.c:437
msgid "detach HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1120
msgid "set upstream info for new branch"
msgstr "sätt uppströmsinformation för ny gren"
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1122
msgid "new-branch"
msgstr "ny-gren"
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1122
msgid "new unparented branch"
msgstr "ny gren utan förälder"
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1123
msgid "checkout our version for unmerged files"
msgstr "checka ut vår version för ej sammanslagna filer"
-#: builtin/checkout.c:1130
+#: builtin/checkout.c:1125
msgid "checkout their version for unmerged files"
msgstr "checka ut deras version för ej sammanslagna filer"
-#: builtin/checkout.c:1132
+#: builtin/checkout.c:1127
msgid "force checkout (throw away local modifications)"
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-#: builtin/checkout.c:1133
+#: builtin/checkout.c:1129
msgid "perform a 3-way merge with the new branch"
msgstr "utför en 3-vägssammanslagning för den nya grenen"
-#: builtin/checkout.c:1134 builtin/merge.c:238
+#: builtin/checkout.c:1131 builtin/merge.c:241
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
-#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
+#: builtin/checkout.c:1133 builtin/log.c:1499 parse-options.h:264
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1134
msgid "conflict style (merge or diff3)"
msgstr "konfliktstil (merge eller diff3)"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1137
msgid "do not limit pathspecs to sparse entries only"
msgstr "begränsa inte sökvägar till endast glesa poster"
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1139
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "förutspå \"git checkout <gren-saknas>\""
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1141
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"kontrollera inte om en annan arbetskatalog håller den angivna referensen"
-#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
-#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
-#: builtin/send-pack.c:173
+#: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149
+#: builtin/merge.c:238 builtin/pull.c:128 builtin/push.c:572
+#: builtin/send-pack.c:174
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1175
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1192
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
-#: builtin/checkout.c:1199
+#: builtin/checkout.c:1197
msgid "Missing branch name; try -b"
msgstr "Grennamn saknas; försök med -b"
-#: builtin/checkout.c:1235
+#: builtin/checkout.c:1233
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1242
+#: builtin/checkout.c:1240
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "”%s” är inte en incheckning och grenen ”%s” kan inte skapas från den"
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1244
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1248
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgid "failed to remove %s"
msgstr "misslyckades ta bort %s"
-#: builtin/clean.c:302 git-add--interactive.perl:572
+#: builtin/clean.c:302 git-add--interactive.perl:579
#, c-format
msgid ""
"Prompt help:\n"
"foo - markera post baserad på unikt prefix\n"
" - (tomt) markera ingenting\n"
-#: builtin/clean.c:306 git-add--interactive.perl:581
+#: builtin/clean.c:306 git-add--interactive.perl:588
#, c-format
msgid ""
"Prompt help:\n"
"* - välj alla poster\n"
" - (tomt) avsluta markering\n"
-#: builtin/clean.c:522 git-add--interactive.perl:547
-#: git-add--interactive.perl:552
+#: builtin/clean.c:522 git-add--interactive.perl:554
+#: git-add--interactive.perl:559
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Vadå (%s)?\n"
msgid "Remove %s [y/N]? "
msgstr "Ta bort %s [Y=ja / N=nej]? "
-#: builtin/clean.c:788 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1717
#, c-format
msgid "Bye.\n"
msgstr "Hej då.\n"
"help - denna skärm\n"
"? - hjälp för kommandoval"
-#: builtin/clean.c:823 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1793
msgid "*** Commands ***"
msgstr "*** Kommandon ***"
-#: builtin/clean.c:824 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1790
msgid "What now"
msgstr "Vad nu"
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
-#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
-#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535
+#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159
#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
#: builtin/show-ref.c:176
msgid "pattern"
"clean.requireForce har standardvärdet true och varken -i, -n eller -f "
"angavs; vägrar städa"
-#: builtin/clone.c:39
+#: builtin/clone.c:42
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
-#: builtin/clone.c:83
+#: builtin/clone.c:87
msgid "don't create a checkout"
msgstr "skapa inte någon utcheckning"
-#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
+#: builtin/clone.c:88 builtin/clone.c:90 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "skapa ett naket (\"bare\") arkiv"
-#: builtin/clone.c:88
+#: builtin/clone.c:92
msgid "create a mirror repository (implies bare)"
msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
-#: builtin/clone.c:90
+#: builtin/clone.c:94
msgid "to clone from a local repository"
msgstr "för att klona från ett lokalt arkiv"
-#: builtin/clone.c:92
+#: builtin/clone.c:96
msgid "don't use local hardlinks, always copy"
msgstr "skapa inte lokala hårda länkar, kopiera alltid"
-#: builtin/clone.c:94
+#: builtin/clone.c:98
msgid "setup as shared repository"
msgstr "skapa som ett delat arkiv"
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:100 builtin/clone.c:104
msgid "pathspec"
msgstr "sökvägsangivelse"
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:100 builtin/clone.c:104
msgid "initialize submodules in the clone"
msgstr "initiera undermoduler i klonen"
-#: builtin/clone.c:103
+#: builtin/clone.c:107
msgid "number of submodules cloned in parallel"
msgstr "antal undermoduler som klonas parallellt"
-#: builtin/clone.c:104 builtin/init-db.c:476
+#: builtin/clone.c:108 builtin/init-db.c:476
msgid "template-directory"
msgstr "mallkatalog"
-#: builtin/clone.c:105 builtin/init-db.c:477
+#: builtin/clone.c:109 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr "katalog att använda mallar från"
-#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
-#: builtin/submodule--helper.c:1240
+#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1223
+#: builtin/submodule--helper.c:1594
msgid "reference repository"
msgstr "referensarkiv"
-#: builtin/clone.c:111
+#: builtin/clone.c:115 builtin/submodule--helper.c:1225
+#: builtin/submodule--helper.c:1596
msgid "use --reference only while cloning"
msgstr "använd --reference endast under kloningen"
-#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/pack-objects.c:3166 builtin/repack.c:213
msgid "name"
msgstr "namn"
-#: builtin/clone.c:113
+#: builtin/clone.c:117
msgid "use <name> instead of 'origin' to track upstream"
msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"
-#: builtin/clone.c:115
+#: builtin/clone.c:119
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checka ut <gren> istället för fjärrens HEAD"
-#: builtin/clone.c:117
+#: builtin/clone.c:121
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
-#: builtin/pull.c:211
+#: builtin/clone.c:122 builtin/fetch.c:150 builtin/grep.c:813
+#: builtin/pull.c:216
msgid "depth"
msgstr "djup"
-#: builtin/clone.c:119
+#: builtin/clone.c:123
msgid "create a shallow clone of that depth"
msgstr "skapa en grund klon på detta djup"
-#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
-#: parse-options.h:142
+#: builtin/clone.c:124 builtin/fetch.c:152 builtin/pack-objects.c:3157
+#: parse-options.h:154
msgid "time"
msgstr "tid"
-#: builtin/clone.c:121
+#: builtin/clone.c:125
msgid "create a shallow clone since a specific time"
msgstr "skapa en grund klon från en angiven tidpunkt"
-#: builtin/clone.c:122 builtin/fetch.c:142
+#: builtin/clone.c:126 builtin/fetch.c:154
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:123 builtin/fetch.c:143
+#: builtin/clone.c:127 builtin/fetch.c:155
msgid "deepen history of shallow clone, excluding rev"
msgstr "fördjupa historik för grund klon, exkludera revisionen"
-#: builtin/clone.c:125
+#: builtin/clone.c:129
msgid "clone only one branch, HEAD or --branch"
msgstr "klona endast en gren, HEAD eller --branch"
-#: builtin/clone.c:127
+#: builtin/clone.c:131
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "klona inga taggar och gör att senare hämtningar inte följer dem"
-#: builtin/clone.c:129
+#: builtin/clone.c:133
msgid "any cloned submodules will be shallow"
msgstr "klonade undermoduler kommer vara grunda"
-#: builtin/clone.c:130 builtin/init-db.c:485
+#: builtin/clone.c:134 builtin/init-db.c:485
msgid "gitdir"
msgstr "gitkat"
-#: builtin/clone.c:131 builtin/init-db.c:486
+#: builtin/clone.c:135 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr "separera gitkatalogen från arbetskatalogen"
-#: builtin/clone.c:132
+#: builtin/clone.c:136
msgid "key=value"
msgstr "nyckel=värde"
-#: builtin/clone.c:133
+#: builtin/clone.c:137
msgid "set config inside the new repository"
msgstr "ställ in konfiguration i det nya arkivet"
-#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
-#: builtin/push.c:567
+#: builtin/clone.c:138 builtin/fetch.c:173 builtin/pull.c:229
+#: builtin/push.c:583
msgid "use IPv4 addresses only"
msgstr "använd endast IPv4-adresser"
-#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
-#: builtin/push.c:569
+#: builtin/clone.c:140 builtin/fetch.c:175 builtin/pull.c:232
+#: builtin/push.c:585
msgid "use IPv6 addresses only"
msgstr "använd endast IPv6-adresser"
-#: builtin/clone.c:273
+#: builtin/clone.c:278
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Kunde inte gissa katalognamn.\n"
"Ange en katalog på kommandoraden"
-#: builtin/clone.c:326
+#: builtin/clone.c:331
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n"
-#: builtin/clone.c:398
+#: builtin/clone.c:403
#, c-format
msgid "failed to open '%s'"
msgstr "misslyckades öppna \"%s\""
-#: builtin/clone.c:406
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s finns och är ingen katalog"
-#: builtin/clone.c:420
+#: builtin/clone.c:425
#, c-format
msgid "failed to stat %s\n"
msgstr "misslyckades ta status på %s\n"
-#: builtin/clone.c:442
+#: builtin/clone.c:447
#, c-format
msgid "failed to create link '%s'"
msgstr "misslyckades skapa länken \"%s\""
-#: builtin/clone.c:446
+#: builtin/clone.c:451
#, c-format
msgid "failed to copy file to '%s'"
msgstr "misslyckades kopiera filen till \"%s\""
-#: builtin/clone.c:472
+#: builtin/clone.c:477
#, c-format
msgid "done.\n"
msgstr "klart.\n"
-#: builtin/clone.c:484
+#: builtin/clone.c:491
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"Du kan inspektera det som checkades ut med \"git status\"\n"
"och försöka checka ut igen med \"git checkout -f HEAD\"\n"
-#: builtin/clone.c:561
+#: builtin/clone.c:568
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
-#: builtin/clone.c:656
+#: builtin/clone.c:663
msgid "remote did not send all necessary objects"
msgstr "fjärren sände inte alla nödvändiga objekt"
-#: builtin/clone.c:672
+#: builtin/clone.c:679
#, c-format
msgid "unable to update %s"
msgstr "kan inte uppdatera %s"
-#: builtin/clone.c:721
+#: builtin/clone.c:728
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"
-#: builtin/clone.c:751
+#: builtin/clone.c:758
msgid "unable to checkout working tree"
msgstr "kunde inte checka ut arbetskatalogen"
-#: builtin/clone.c:796
+#: builtin/clone.c:803
msgid "unable to write parameters to config file"
msgstr "kunde inte skriva parametrar till konfigurationsfilen"
-#: builtin/clone.c:859
+#: builtin/clone.c:866
msgid "cannot repack to clean up"
msgstr "kan inte packa om för att städa upp"
-#: builtin/clone.c:861
+#: builtin/clone.c:868
msgid "cannot unlink temporary alternates file"
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
-#: builtin/clone.c:894 builtin/receive-pack.c:1945
+#: builtin/clone.c:907 builtin/receive-pack.c:1947
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:898
+#: builtin/clone.c:911
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:911
+#: builtin/clone.c:924
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "flaggorna --bare och --origin %s är inkompatibla."
-#: builtin/clone.c:914
+#: builtin/clone.c:927
msgid "--bare and --separate-git-dir are incompatible."
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-#: builtin/clone.c:927
+#: builtin/clone.c:940
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:933 builtin/fetch.c:1358
+#: builtin/clone.c:946 builtin/fetch.c:1460
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
-#: builtin/clone.c:943
+#: builtin/clone.c:956
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
-#: builtin/clone.c:953
+#: builtin/clone.c:966
#, c-format
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
-#: builtin/worktree.c:253 builtin/worktree.c:283
+#: builtin/clone.c:981 builtin/clone.c:1002 builtin/difftool.c:270
+#: builtin/worktree.c:246 builtin/worktree.c:276
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/clone.c:971
+#: builtin/clone.c:986
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:983
+#: builtin/clone.c:1006
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:985
+#: builtin/clone.c:1008
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:1009
+#: builtin/clone.c:1032
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
"clone --recursive är inte kompatibel med --reference och --reference-if-able"
-#: builtin/clone.c:1071
+#: builtin/clone.c:1093
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1073
+#: builtin/clone.c:1095
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1075
+#: builtin/clone.c:1097
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1078
+#: builtin/clone.c:1099
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "--filter ignoreras i lokala kloningar; använd file:// istället."
+
+#: builtin/clone.c:1102
msgid "source repository is shallow, ignoring --local"
msgstr "källarkivet är grunt, ignorerar --local"
-#: builtin/clone.c:1083
+#: builtin/clone.c:1107
msgid "--local is ignored"
msgstr "--local ignoreras"
-#: builtin/clone.c:1139 builtin/clone.c:1147
+#: builtin/clone.c:1169 builtin/clone.c:1177
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
-#: builtin/clone.c:1150
+#: builtin/clone.c:1180
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
msgid "Padding space between columns"
msgstr "Spaltfyllnad mellan spalter"
-#: builtin/column.c:52
+#: builtin/column.c:51
msgid "--command must be the first argument"
msgstr "--command måste vara första argument"
-#: builtin/commit.c:39
+#: builtin/commit.c:37
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<flaggor>] [--] <sökväg>..."
-#: builtin/commit.c:44
+#: builtin/commit.c:42
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<flaggor>] [--] <sökväg>..."
-#: builtin/commit.c:49
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-" git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-" git commit --amend --reset-author\n"
-msgstr ""
-"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"
-"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"
-"kan förhindra det här meddelandet genom att ställa dem explicit.\n"
-"Kör följande kommandon och följ instruktionerna i textredigeraren\n"
-"för att redigera din konfigurationsfil:\n"
-"\n"
-" git config --global --edit\n"
-"\n"
-"När du gjort det kan du rätta identiteten som användes för den här\n"
-"incheckningen med:\n"
-"\n"
-" git commit --amend --reset-author\n"
-
-#: builtin/commit.c:62
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-" git config --global user.name \"Your Name\"\n"
-" git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-" git commit --amend --reset-author\n"
-msgstr ""
-"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"
-"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"
-"kan förhindra det här meddelandet genom att ställa dem explicit:\n"
-"\n"
-" git config --global user.name \"Ditt namn\"\n"
-" git config --global user.email du@example.com\n"
-"\n"
-"När du gjort det kan du rätta identiteten som användes för den här\n"
-"incheckningen med:\n"
-"\n"
-" git commit --amend --reset-author\n"
-
-#: builtin/commit.c:74
+#: builtin/commit.c:47
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n"
"så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n"
-#: builtin/commit.c:79
+#: builtin/commit.c:52
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:86
+#: builtin/commit.c:59
msgid "Otherwise, please use 'git reset'\n"
msgstr "Använd annars \"git reset\"\n"
-#: builtin/commit.c:89
+#: builtin/commit.c:62
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
"\"git cherry-pick --continue\" kommer därefter att återuppta\n"
"cherry-pick för återstående incheckningar.\n"
-#: builtin/commit.c:318
+#: builtin/commit.c:293
msgid "failed to unpack HEAD tree object"
msgstr "misslyckades packa upp HEAD:s trädobjekt"
-#: builtin/commit.c:359
+#: builtin/commit.c:334
msgid "unable to create temporary index"
msgstr "kunde inte skapa temporär indexfil"
-#: builtin/commit.c:365
+#: builtin/commit.c:340
msgid "interactive add failed"
msgstr "interaktiv tilläggning misslyckades"
-#: builtin/commit.c:378
+#: builtin/commit.c:353
msgid "unable to update temporary index"
msgstr "kan inte uppdatera temporärt index"
-#: builtin/commit.c:380
+#: builtin/commit.c:355
msgid "Failed to update main cache tree"
msgstr "Misslyckades uppdatera huvud-cacheträdet"
-#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
+#: builtin/commit.c:380 builtin/commit.c:403 builtin/commit.c:449
msgid "unable to write new_index file"
msgstr "kunde inte skriva filen new_index"
-#: builtin/commit.c:461
+#: builtin/commit.c:432
msgid "cannot do a partial commit during a merge."
msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
-#: builtin/commit.c:463
+#: builtin/commit.c:434
msgid "cannot do a partial commit during a cherry-pick."
msgstr "kan inte utföra en delvis incheckning under en cherry-pick."
-#: builtin/commit.c:471
+#: builtin/commit.c:442
msgid "cannot read the index"
msgstr "kan inte läsa indexet"
-#: builtin/commit.c:490
+#: builtin/commit.c:461
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
-#: builtin/commit.c:587
+#: builtin/commit.c:558
#, c-format
msgid "commit '%s' lacks author header"
msgstr "incheckningen \"%s\" saknar författarhuvud"
-#: builtin/commit.c:589
+#: builtin/commit.c:560
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
-#: builtin/commit.c:608
+#: builtin/commit.c:579
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:660
+#: builtin/commit.c:631
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"kunde inte välja ett kommentarstecken som inte använts\n"
"i det befintliga incheckningsmeddelandet"
-#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
+#: builtin/commit.c:668 builtin/commit.c:701 builtin/commit.c:1029
#, c-format
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
-#: builtin/commit.c:709 builtin/shortlog.c:309
+#: builtin/commit.c:680 builtin/shortlog.c:316
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
-#: builtin/commit.c:711
+#: builtin/commit.c:682
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
-#: builtin/commit.c:715
+#: builtin/commit.c:686
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
-#: builtin/commit.c:742 builtin/commit.c:750
+#: builtin/commit.c:715 builtin/commit.c:723
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
-#: builtin/commit.c:747
+#: builtin/commit.c:720
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
-#: builtin/commit.c:801
+#: builtin/commit.c:774
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
-#: builtin/commit.c:819
+#: builtin/commit.c:792
#, c-format
msgid ""
"\n"
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:824
+#: builtin/commit.c:797
#, c-format
msgid ""
"\n"
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:837
+#: builtin/commit.c:810
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
"incheckningen.\n"
-#: builtin/commit.c:844
+#: builtin/commit.c:818
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
"Ett tomt meddelande avbryter incheckningen.\n"
-#: builtin/commit.c:861
+#: builtin/commit.c:835
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sFörfattare: %.*s <%.*s>"
-#: builtin/commit.c:869
+#: builtin/commit.c:843
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:876
+#: builtin/commit.c:850
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sIncheckare: %.*s <%.*s>"
-#: builtin/commit.c:893
+#: builtin/commit.c:867
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
-#: builtin/commit.c:959
+#: builtin/commit.c:933
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:973 builtin/tag.c:252
+#: builtin/commit.c:947 builtin/tag.c:257
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
-#: builtin/commit.c:1076
+#: builtin/commit.c:991
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"
-#: builtin/commit.c:1090
+#: builtin/commit.c:1005
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Ogiltigt ignorerat läge \"%s\""
-#: builtin/commit.c:1104 builtin/commit.c:1349
+#: builtin/commit.c:1019 builtin/commit.c:1269
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
-#: builtin/commit.c:1142
+#: builtin/commit.c:1057
msgid "--long and -z are incompatible"
msgstr "--long och -z är inkompatibla"
-#: builtin/commit.c:1172
+#: builtin/commit.c:1090
msgid "Using both --reset-author and --author does not make sense"
msgstr "Kan inte använda både --reset-author och --author"
-#: builtin/commit.c:1181
+#: builtin/commit.c:1099
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:1184
+#: builtin/commit.c:1102
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
-#: builtin/commit.c:1186
+#: builtin/commit.c:1104
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
-#: builtin/commit.c:1189
+#: builtin/commit.c:1107
msgid "Options --squash and --fixup cannot be used together"
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
-#: builtin/commit.c:1199
+#: builtin/commit.c:1117
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Endast en av -c/-C/-F/--fixup kan användas."
-#: builtin/commit.c:1201
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
-msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."
+#: builtin/commit.c:1119
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "Flaggan -m kan inte kombineras med -c/-C/-F."
-#: builtin/commit.c:1209
+#: builtin/commit.c:1127
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author kan endast användas med -C, -c eller --amend."
-#: builtin/commit.c:1226
+#: builtin/commit.c:1144
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Endast en av --include/--only/--all/--interactive/--patch kan användas."
-#: builtin/commit.c:1228
+#: builtin/commit.c:1146
msgid "No paths with --include/--only does not make sense."
msgstr "Du måste ange sökvägar tillsammans med --include/--only."
-#: builtin/commit.c:1240 builtin/tag.c:535
+#: builtin/commit.c:1160 builtin/tag.c:543
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
-#: builtin/commit.c:1245
+#: builtin/commit.c:1165
msgid "Paths with -a does not make sense."
msgstr "Kan inte ange sökvägar med -a."
-#: builtin/commit.c:1363 builtin/commit.c:1648
+#: builtin/commit.c:1303 builtin/commit.c:1480
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:1365 builtin/commit.c:1650
+#: builtin/commit.c:1305 builtin/commit.c:1482
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1367
+#: builtin/commit.c:1307
msgid "show stash information"
msgstr "visa information om stash"
-#: builtin/commit.c:1369
+#: builtin/commit.c:1309 builtin/commit.c:1484
+msgid "compute full ahead/behind values"
+msgstr "beräkna fullständiga före-/efter-värden"
+
+#: builtin/commit.c:1311
msgid "version"
msgstr "version"
-#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
-#: builtin/worktree.c:523
+#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558
+#: builtin/worktree.c:581
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1372 builtin/commit.c:1654
+#: builtin/commit.c:1314 builtin/commit.c:1488
msgid "show status in long format (default)"
msgstr "visa status i långt format (standard)"
-#: builtin/commit.c:1375 builtin/commit.c:1657
+#: builtin/commit.c:1317 builtin/commit.c:1491
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
-#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
+#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494
+#: builtin/fast-export.c:1001 builtin/fast-export.c:1004 builtin/tag.c:397
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1378 builtin/commit.c:1660
+#: builtin/commit.c:1320 builtin/commit.c:1494
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "visa ospårade filer, valfria lägen: all, normal, no. (Standard: all)"
-#: builtin/commit.c:1382
+#: builtin/commit.c:1324
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
"visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: "
"traditional)"
-#: builtin/commit.c:1384 parse-options.h:155
+#: builtin/commit.c:1326 parse-options.h:167
msgid "when"
msgstr "när"
-#: builtin/commit.c:1385
+#: builtin/commit.c:1327
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1387
+#: builtin/commit.c:1329
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1406
-msgid "Unsupported combination of ignored and untracked-files arguments"
-msgstr "Kombinationen av argument för ignorerade och ospårade filer stöds ej"
-
-#: builtin/commit.c:1469
-msgid "couldn't look up newly created commit"
-msgstr "kunde inte slå upp en precis skapad incheckning"
-
-#: builtin/commit.c:1471
-msgid "could not parse newly created commit"
-msgstr "kunde inte tolka en precis skapad incheckning"
-
-#: builtin/commit.c:1516
-msgid "unable to resolve HEAD after creating commit"
-msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
+#: builtin/commit.c:1330
+msgid "do not detect renames"
+msgstr "detektera inte namnändringar"
-#: builtin/commit.c:1518
-msgid "detached HEAD"
-msgstr "frånkopplad HEAD"
+#: builtin/commit.c:1332
+msgid "detect renames, optionally set similarity index"
+msgstr "detektera namnändringar, möjligen sätt likhetsindex"
-#: builtin/commit.c:1521
-msgid " (root-commit)"
-msgstr " (rotincheckning)"
+#: builtin/commit.c:1352
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr "Kombinationen av argument för ignorerade och ospårade filer stöds ej"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1450
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1451
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1453
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1622 builtin/tag.c:388
+#: builtin/commit.c:1454 builtin/tag.c:394
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1455
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1455
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1624 builtin/gc.c:359
+#: builtin/commit.c:1456 builtin/gc.c:501
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1456
msgid "override date for commit"
msgstr "överstyr datum för incheckningen"
-#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:386
+#: builtin/commit.c:1457 builtin/merge.c:228 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:392
msgid "message"
msgstr "meddelande"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1457
msgid "commit message"
msgstr "incheckningsmeddelande"
-#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
-#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
+#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460
+#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92
msgid "commit"
msgstr "incheckning"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1458
msgid "reuse and edit message from specified commit"
msgstr "återanvänd och redigera meddelande från angiven incheckning"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1459
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1460
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att fixa angiven incheckning"
-#: builtin/commit.c:1629
+#: builtin/commit.c:1461
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att slå ihop med angiven "
"incheckning"
-#: builtin/commit.c:1630
+#: builtin/commit.c:1462
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
-#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
-#: builtin/pull.c:149 builtin/revert.c:105
+#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:242
+#: builtin/pull.c:154 builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1464
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1465
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1466
msgid "default"
msgstr "standard"
-#: builtin/commit.c:1634 builtin/tag.c:391
+#: builtin/commit.c:1466 builtin/tag.c:398
msgid "how to strip spaces and #comments from message"
msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1467
msgid "include status in commit message template"
msgstr "inkludera status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
+#: builtin/commit.c:1469 builtin/merge.c:240 builtin/pull.c:184
#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1472
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1641
+#: builtin/commit.c:1473
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1642
+#: builtin/commit.c:1474
msgid "add specified files to index for commit"
msgstr "lägg till angivna filer till indexet för incheckning"
-#: builtin/commit.c:1643
+#: builtin/commit.c:1475
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1476
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1477
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1478
msgid "bypass pre-commit and commit-msg hooks"
msgstr "förbigå pre-commit- och commit-msg-krokar"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1479
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:1658
+#: builtin/commit.c:1492
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:1659
+#: builtin/commit.c:1493
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1498
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:1666
+#: builtin/commit.c:1500
msgid "ok to record a change with an empty message"
msgstr "ok att registrera en ändring med tomt meddelande"
-#: builtin/commit.c:1696
-msgid "could not parse HEAD commit"
-msgstr "kunde inte tolka HEAD:s incheckning"
-
-#: builtin/commit.c:1741
+#: builtin/commit.c:1573
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:1748
+#: builtin/commit.c:1580
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:1767
+#: builtin/commit.c:1599
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1610
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
-#: builtin/commit.c:1783
+#: builtin/commit.c:1615
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
-#: builtin/commit.c:1831
+#: builtin/commit.c:1650
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
"att kvoten inte har överskridits, och kör sedan\n"
"\"git reset HEAD\" för att återställa."
+#: builtin/commit-graph.c:9
+msgid "git commit-graph [--object-dir <objdir>]"
+msgstr "git commit-graph [--object-dir <objkat>]"
+
+#: builtin/commit-graph.c:10 builtin/commit-graph.c:16
+msgid "git commit-graph read [--object-dir <objdir>]"
+msgstr "git commit-graph read [--object-dir <objkat>]"
+
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:21
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--"
+"stdin-commits]"
+msgstr ""
+"git commit-graph write [--object-dir <objkat>] [--append] [--stdin-packs|--"
+"stdin-commits]"
+
+#: builtin/commit-graph.c:39 builtin/commit-graph.c:92
+#: builtin/commit-graph.c:147 builtin/fetch.c:161 builtin/log.c:1466
+msgid "dir"
+msgstr "kat"
+
+#: builtin/commit-graph.c:40 builtin/commit-graph.c:93
+#: builtin/commit-graph.c:148
+msgid "The object directory to store the graph"
+msgstr "Objektkatalogen där grafen skall lagras"
+
+#: builtin/commit-graph.c:95
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "sök paketindex listade på standard in efter incheckningar"
+
+#: builtin/commit-graph.c:97
+msgid "start walk at commits listed by stdin"
+msgstr "börja gå genom incheckningar listade på standard in"
+
+#: builtin/commit-graph.c:99
+msgid "include all commits already in the commit-graph file"
+msgstr "ta med alla incheckningar redan i filen commit-graph"
+
+#: builtin/commit-graph.c:108
+msgid "cannot use both --stdin-commits and --stdin-packs"
+msgstr "kan inte använda både --stdin-commit och --stdin-packs"
+
#: builtin/config.c:10
msgid "git config [<options>]"
msgstr "git config [<flaggor>]"
-#: builtin/config.c:58
+#: builtin/config.c:101
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr "okänt argument för --type, %s"
+
+#: builtin/config.c:123
msgid "Config file location"
msgstr "Konfigurationsfilens plats"
-#: builtin/config.c:59
+#: builtin/config.c:124
msgid "use global config file"
msgstr "använd global konfigurationsfil"
-#: builtin/config.c:60
+#: builtin/config.c:125
msgid "use system config file"
msgstr "använd systemets konfigurationsfil"
-#: builtin/config.c:61
+#: builtin/config.c:126
msgid "use repository config file"
msgstr "använd arkivets konfigurationsfil"
-#: builtin/config.c:62
+#: builtin/config.c:127
msgid "use given config file"
msgstr "använd angiven konfigurationsfil"
-#: builtin/config.c:63
+#: builtin/config.c:128
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:63
+#: builtin/config.c:128
msgid "read config from given blob object"
msgstr "läs konfiguration från givet blob-objekt"
-#: builtin/config.c:64
+#: builtin/config.c:129
msgid "Action"
msgstr "Åtgärd"
-#: builtin/config.c:65
+#: builtin/config.c:130
msgid "get value: name [value-regex]"
msgstr "hämta värde: namn [värde-reguttr]"
-#: builtin/config.c:66
+#: builtin/config.c:131
msgid "get all values: key [value-regex]"
msgstr "hämta alla värden: nyckel [värde-reguttr]"
-#: builtin/config.c:67
+#: builtin/config.c:132
msgid "get values for regexp: name-regex [value-regex]"
msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]"
-#: builtin/config.c:68
+#: builtin/config.c:133
msgid "get value specific for the URL: section[.var] URL"
msgstr "hämta värde specifikt URL:en: sektion[.var] URL"
-#: builtin/config.c:69
+#: builtin/config.c:134
msgid "replace all matching variables: name value [value_regex]"
msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"
-#: builtin/config.c:70
+#: builtin/config.c:135
msgid "add a new variable: name value"
msgstr "lägg till en ny variabel: namn värde"
-#: builtin/config.c:71
+#: builtin/config.c:136
msgid "remove a variable: name [value-regex]"
msgstr "ta bort en variabel: namn [värde-reguttr]"
-#: builtin/config.c:72
+#: builtin/config.c:137
msgid "remove all matches: name [value-regex]"
msgstr "ta bort alla träffar: namn [värde-reguttr]"
-#: builtin/config.c:73
+#: builtin/config.c:138
msgid "rename section: old-name new-name"
msgstr "byt namn på sektion: gammalt-namn nytt-namn"
-#: builtin/config.c:74
+#: builtin/config.c:139
msgid "remove a section: name"
msgstr "ta bort en sektion: namn"
-#: builtin/config.c:75
+#: builtin/config.c:140
msgid "list all"
msgstr "visa alla"
-#: builtin/config.c:76
+#: builtin/config.c:141
msgid "open an editor"
msgstr "öppna textredigeringsprogram"
-#: builtin/config.c:77
+#: builtin/config.c:142
msgid "find the color configured: slot [default]"
msgstr "hitta den inställda färgen: slot [default]"
-#: builtin/config.c:78
+#: builtin/config.c:143
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "hitta färginställningen: slot [stdout-is-tty]"
-#: builtin/config.c:79
+#: builtin/config.c:144
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:80
+#: builtin/config.c:145
+msgid "value is given this type"
+msgstr "värdet har givits denna typ"
+
+#: builtin/config.c:146
msgid "value is \"true\" or \"false\""
msgstr "värdet är \"true\" eller \"false\""
-#: builtin/config.c:81
+#: builtin/config.c:147
msgid "value is decimal number"
msgstr "värdet är ett decimalt tal"
-#: builtin/config.c:82
+#: builtin/config.c:148
msgid "value is --bool or --int"
msgstr "värdet är --bool eller --int"
-#: builtin/config.c:83
+#: builtin/config.c:149
msgid "value is a path (file or directory name)"
msgstr "värdet är en sökväg (fil- eller katalognamn)"
-#: builtin/config.c:84
+#: builtin/config.c:150
msgid "value is an expiry date"
msgstr "värdet är ett utgångsdatum"
-#: builtin/config.c:85
+#: builtin/config.c:151
msgid "Other"
msgstr "Andra"
-#: builtin/config.c:86
+#: builtin/config.c:152
msgid "terminate values with NUL byte"
msgstr "terminera värden med NUL-byte"
-#: builtin/config.c:87
+#: builtin/config.c:153
msgid "show variable names only"
msgstr "visa endast variabelnamn"
-#: builtin/config.c:88
+#: builtin/config.c:154
msgid "respect include directives on lookup"
msgstr "respektera inkluderingsdirektiv vid uppslag"
-#: builtin/config.c:89
+#: builtin/config.c:155
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"
-#: builtin/config.c:335
+#: builtin/config.c:156
+msgid "value"
+msgstr "värde"
+
+#: builtin/config.c:156
+msgid "with --get, use default value when missing entry"
+msgstr "med --get, använd standardvärde vid saknad post"
+
+#: builtin/config.c:332
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr "misslyckades formatera standardkonfigurationsvärde: %s"
+
+#: builtin/config.c:431
msgid "unable to parse default color value"
msgstr "kan inte tolka standardfärgvärde"
-#: builtin/config.c:479
+#: builtin/config.c:575
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:507
+#: builtin/config.c:603
msgid "--local can only be used inside a git repository"
msgstr "--local kan bara användas inuti ett git-arkiv"
-#: builtin/config.c:632
+#: builtin/config.c:606
+msgid "--blob can only be used inside a git repository"
+msgstr "--blob kan bara användas inuti ett git-arkiv"
+
+#: builtin/config.c:735
#, c-format
msgid "cannot create configuration file %s"
msgstr "kan inte skapa konfigurationsfilen \"%s\""
-#: builtin/config.c:645
+#: builtin/config.c:748
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
"kan inte skriva över flera värden med ett ensamt värde\n"
" Använd en regexp, --add eller --replace-all för att ändra %s."
-#: builtin/count-objects.c:88
+#: builtin/count-objects.c:90
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:98
+#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
msgstr "skriv storlekar i människoläsbart format"
msgid "tag '%s' is really '%s' here"
msgstr "taggen \"%s\" är i verkligheten \"%s\" här"
-#: builtin/describe.c:314
+#: builtin/describe.c:317
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "ingen tagg motsvarar \"%s\" exakt"
-#: builtin/describe.c:316
+#: builtin/describe.c:319
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
"Ingen exakt träff mot referenser eller taggar, söker för att beskriva\n"
-#: builtin/describe.c:363
+#: builtin/describe.c:366
#, c-format
msgid "finished search at %s\n"
msgstr "avslutade sökning på %s\n"
-#: builtin/describe.c:389
+#: builtin/describe.c:392
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"Inga annoterade taggar kan beskriva \"%s\".\n"
"Det finns dock oannoterade taggar: testa --tags."
-#: builtin/describe.c:393
+#: builtin/describe.c:396
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Inga taggar kan beskriva \"%s\".\n"
"Testa --always, eller skapa några taggar."
-#: builtin/describe.c:423
+#: builtin/describe.c:426
#, c-format
msgid "traversed %lu commits\n"
msgstr "traverserade %lu incheckningar\n"
-#: builtin/describe.c:426
+#: builtin/describe.c:429
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"mer än %i taggar hittades; listar de %i senaste\n"
"gav upp sökningen vid %s\n"
-#: builtin/describe.c:494
+#: builtin/describe.c:497
#, c-format
msgid "describe %s\n"
msgstr "beskriva %s\n"
-#: builtin/describe.c:497 builtin/log.c:500
+#: builtin/describe.c:500 builtin/log.c:502
#, c-format
msgid "Not a valid object name %s"
msgstr "Objektnamnet är inte giltigt: %s"
-#: builtin/describe.c:505
+#: builtin/describe.c:508
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s är varken incheckning eller blob"
-#: builtin/describe.c:519
+#: builtin/describe.c:522
msgid "find the tag that comes after the commit"
msgstr "hitta taggen som kommer efter incheckningen"
-#: builtin/describe.c:520
+#: builtin/describe.c:523
msgid "debug search strategy on stderr"
msgstr "felsök sökstrategin på standard fel"
-#: builtin/describe.c:521
+#: builtin/describe.c:524
msgid "use any ref"
msgstr "använd alla referenser"
-#: builtin/describe.c:522
+#: builtin/describe.c:525
msgid "use any tag, even unannotated"
msgstr "använd alla taggar, även oannoterade"
-#: builtin/describe.c:523
+#: builtin/describe.c:526
msgid "always use long format"
msgstr "använd alltid långt format"
-#: builtin/describe.c:524
+#: builtin/describe.c:527
msgid "only follow first parent"
msgstr "följ endast första föräldern"
-#: builtin/describe.c:527
+#: builtin/describe.c:530
msgid "only output exact matches"
msgstr "skriv endast ut exakta träffar"
-#: builtin/describe.c:529
+#: builtin/describe.c:532
msgid "consider <n> most recent tags (default: 10)"
msgstr "överväg de <n> nyaste taggarna (standard: 10)"
-#: builtin/describe.c:531
+#: builtin/describe.c:534
msgid "only consider tags matching <pattern>"
msgstr "överväg endast taggar som motsvarar <mönster>"
-#: builtin/describe.c:533
+#: builtin/describe.c:536
msgid "do not consider tags matching <pattern>"
msgstr "överväg inte taggar som motsvarar <mönster>"
-#: builtin/describe.c:535 builtin/name-rev.c:406
+#: builtin/describe.c:538 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr "visa förkortade incheckningsobjekt som standard"
-#: builtin/describe.c:536 builtin/describe.c:539
+#: builtin/describe.c:539 builtin/describe.c:542
msgid "mark"
msgstr "märke"
-#: builtin/describe.c:537
+#: builtin/describe.c:540
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")"
-#: builtin/describe.c:540
+#: builtin/describe.c:543
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")"
-#: builtin/describe.c:558
+#: builtin/describe.c:561
msgid "--long is incompatible with --abbrev=0"
msgstr "--long är inkompatibel med --abbrev=0"
-#: builtin/describe.c:587
+#: builtin/describe.c:590
msgid "No names found, cannot describe anything."
msgstr "Inga namn hittades, kan inte beskriva något."
-#: builtin/describe.c:637
+#: builtin/describe.c:640
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
-#: builtin/describe.c:639
+#: builtin/describe.c:642
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken är inkompatibelt med \"commit-ish\"-värden"
msgid "do not prompt before launching a diff tool"
msgstr "fråga inte vid start av diff-verktyg"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:704
msgid "use symlinks in dir-diff mode"
msgstr "använd symboliska länkar i katalogdiffläge"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:705
msgid "<tool>"
msgstr "<verktyg>"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:706
msgid "use the specified diff tool"
msgstr "använd angivet diff-verktyg"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:708
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "visa en lista över diff-verktyg som kan användas med ”--tool”"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:711
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
"låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde "
"skilt från noll"
-#: builtin/difftool.c:714
+#: builtin/difftool.c:713
msgid "<command>"
msgstr "<kommando>"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:714
msgid "specify a custom command for viewing diffs"
msgstr "ange eget kommando för att visa diffar"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:738
msgid "no <tool> given for --tool=<tool>"
msgstr "inget <verktyg> angavs för --tool=<verktyg>"
-#: builtin/difftool.c:746
+#: builtin/difftool.c:745
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "inget <kommando> angavs för --extcmd=<kommando>"
-#: builtin/fast-export.c:26
+#: builtin/fast-export.c:27
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-flaggor]"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1000
msgid "show progress after <n> objects"
msgstr "visa förlopp efter <n> objekt"
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1002
msgid "select handling of signed tags"
msgstr "välj hantering av signerade taggar"
-#: builtin/fast-export.c:1003
+#: builtin/fast-export.c:1005
msgid "select handling of tags that tag filtered objects"
msgstr "välj hantering av taggar som har taggfiltrerade objekt"
-#: builtin/fast-export.c:1006
+#: builtin/fast-export.c:1008
msgid "Dump marks to this file"
msgstr "Dump märken till filen"
-#: builtin/fast-export.c:1008
+#: builtin/fast-export.c:1010
msgid "Import marks from this file"
msgstr "Importera märken från filen"
-#: builtin/fast-export.c:1010
+#: builtin/fast-export.c:1012
msgid "Fake a tagger when tags lack one"
msgstr "Fejka taggare när taggen saknar en"
-#: builtin/fast-export.c:1012
+#: builtin/fast-export.c:1014
msgid "Output full tree for each commit"
msgstr "Skriv ut hela trädet för varje incheckning"
-#: builtin/fast-export.c:1014
+#: builtin/fast-export.c:1016
msgid "Use the done feature to terminate the stream"
msgstr "Använd done-funktionen för att avsluta strömmen"
-#: builtin/fast-export.c:1015
+#: builtin/fast-export.c:1017
msgid "Skip output of blob data"
msgstr "Hoppa över skrivning av blob-data"
-#: builtin/fast-export.c:1016
+#: builtin/fast-export.c:1018
msgid "refspec"
msgstr "referensspecifikation"
-#: builtin/fast-export.c:1017
+#: builtin/fast-export.c:1019
msgid "Apply refspec to exported refs"
msgstr "Applicera referensspecifikation på exporterade referenser"
-#: builtin/fast-export.c:1018
+#: builtin/fast-export.c:1020
msgid "anonymize output"
msgstr "anonymisera utdata"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:26
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/fetch.c:25
+#: builtin/fetch.c:27
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<flaggor>] <grupp>"
-#: builtin/fetch.c:26
+#: builtin/fetch.c:28
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
-#: builtin/fetch.c:27
+#: builtin/fetch.c:29
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<flaggor>]"
-#: builtin/fetch.c:113 builtin/pull.c:188
+#: builtin/fetch.c:123 builtin/pull.c:193
msgid "fetch from all remotes"
msgstr "hämta från alla fjärrar"
-#: builtin/fetch.c:115 builtin/pull.c:191
+#: builtin/fetch.c:125 builtin/pull.c:196
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"
-#: builtin/fetch.c:117 builtin/pull.c:194
+#: builtin/fetch.c:127 builtin/pull.c:199
msgid "path to upload pack on remote end"
msgstr "sökväg till upload pack på fjärren"
-#: builtin/fetch.c:118 builtin/pull.c:196
+#: builtin/fetch.c:128 builtin/pull.c:201
msgid "force overwrite of local branch"
msgstr "tvinga överskrivning av lokal gren"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
-#: builtin/fetch.c:122 builtin/pull.c:198
+#: builtin/fetch.c:132 builtin/pull.c:203
msgid "fetch all tags and associated objects"
msgstr "hämta alla taggar och associerade objekt"
-#: builtin/fetch.c:124
+#: builtin/fetch.c:134
msgid "do not fetch all tags (--no-tags)"
msgstr "hämta inte alla taggar (--no-tags)"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "number of submodules fetched in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/fetch.c:128 builtin/pull.c:201
+#: builtin/fetch.c:138 builtin/pull.c:206
msgid "prune remote-tracking branches no longer on remote"
msgstr "rensa fjärrspårande grenar ej längre på fjärren"
-#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
+#: builtin/fetch.c:140
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr ""
+"rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar"
+
+#: builtin/fetch.c:141 builtin/fetch.c:164 builtin/pull.c:131
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:130
+#: builtin/fetch.c:142
msgid "control recursive fetching of submodules"
msgstr "styr rekursiv hämtning av undermoduler"
-#: builtin/fetch.c:134 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:214
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
-#: builtin/fetch.c:136
+#: builtin/fetch.c:148
msgid "allow updating of HEAD ref"
msgstr "tillåt uppdatering av HEAD-referens"
-#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
+#: builtin/fetch.c:151 builtin/fetch.c:157 builtin/pull.c:217
msgid "deepen history of shallow clone"
msgstr "fördjupa historik för grund klon"
-#: builtin/fetch.c:141
+#: builtin/fetch.c:153
msgid "deepen history of shallow repository based on time"
msgstr "fördjupa historik för grund klon baserad på tid"
-#: builtin/fetch.c:147 builtin/pull.c:215
+#: builtin/fetch.c:159 builtin/pull.c:220
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:149 builtin/log.c:1463
-msgid "dir"
-msgstr "kat"
-
-#: builtin/fetch.c:150
+#: builtin/fetch.c:162
msgid "prepend this to submodule path output"
msgstr "lägg till i början av undermodulens sökvägsutdata"
-#: builtin/fetch.c:153
+#: builtin/fetch.c:165
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
"standard för rekursiv hämtning av undermoduler (lägre prioritet än "
"konfigurationsfiler)"
-#: builtin/fetch.c:157 builtin/pull.c:218
+#: builtin/fetch.c:169 builtin/pull.c:223
msgid "accept refs that update .git/shallow"
msgstr "tar emot referenser som uppdaterar .git/shallow"
-#: builtin/fetch.c:158 builtin/pull.c:220
+#: builtin/fetch.c:170 builtin/pull.c:225
msgid "refmap"
msgstr "referenskarta"
-#: builtin/fetch.c:159 builtin/pull.c:221
+#: builtin/fetch.c:171 builtin/pull.c:226
msgid "specify fetch refmap"
msgstr "ange referenskarta för \"fetch\""
-#: builtin/fetch.c:417
+#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/send-pack.c:172
+msgid "server-specific"
+msgstr "serverspecifik"
+
+#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr ""
+"inget att checka in\n"
+"flagga att sända"
+
+#: builtin/fetch.c:442
msgid "Couldn't find remote ref HEAD"
msgstr "Kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:535
+#: builtin/fetch.c:560
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s"
-#: builtin/fetch.c:628
+#: builtin/fetch.c:653
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
-#: builtin/fetch.c:632
+#: builtin/fetch.c:657
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:645 builtin/fetch.c:725
+#: builtin/fetch.c:670 builtin/fetch.c:750
msgid "[rejected]"
msgstr "[refuserad]"
-#: builtin/fetch.c:646
+#: builtin/fetch.c:671
msgid "can't fetch in current branch"
msgstr "kan inte hämta i aktuell gren"
-#: builtin/fetch.c:655
+#: builtin/fetch.c:680
msgid "[tag update]"
msgstr "[uppdaterad tagg]"
-#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
-#: builtin/fetch.c:720
+#: builtin/fetch.c:681 builtin/fetch.c:714 builtin/fetch.c:730
+#: builtin/fetch.c:745
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:675
+#: builtin/fetch.c:700
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:678
+#: builtin/fetch.c:703
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:681
+#: builtin/fetch.c:706
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:720
+#: builtin/fetch.c:745
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:725
+#: builtin/fetch.c:750
msgid "non-fast-forward"
msgstr "ej snabbspolad"
-#: builtin/fetch.c:770
+#: builtin/fetch.c:795
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s sände inte alla nödvändiga objekt\n"
-#: builtin/fetch.c:790
+#: builtin/fetch.c:815
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "avvisa %s då grunda rötter inte kan uppdateras"
-#: builtin/fetch.c:878 builtin/fetch.c:974
+#: builtin/fetch.c:903 builtin/fetch.c:999
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:914
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"vissa lokala referenser kunde inte uppdateras; testa att köra\n"
" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
-#: builtin/fetch.c:944
+#: builtin/fetch.c:969
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:945
+#: builtin/fetch.c:970
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:977
+#: builtin/fetch.c:1002
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:978 builtin/remote.c:1024
+#: builtin/fetch.c:1003 builtin/remote.c:1033
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:1001
+#: builtin/fetch.c:1026
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
-#: builtin/fetch.c:1020
+#: builtin/fetch.c:1045
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
-#: builtin/fetch.c:1023
+#: builtin/fetch.c:1048
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Flaggan \"%s\" ignoreras för %s\n"
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1287
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:1258 builtin/remote.c:97
+#: builtin/fetch.c:1289 builtin/remote.c:98
#, c-format
msgid "Could not fetch %s"
msgstr "Kunde inte hämta %s"
-#: builtin/fetch.c:1276
+#: builtin/fetch.c:1335 builtin/fetch.c:1503
+msgid ""
+"--filter can only be used with the remote configured in core.partialClone"
+msgstr ""
+"--filter kan endast användas med fjärren konfigurerad i core.partialClone"
+
+#: builtin/fetch.c:1358
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
"fjärrarkiv som nya incheckningar skall hämtas från."
-#: builtin/fetch.c:1299
+#: builtin/fetch.c:1395
msgid "You need to specify a tag name."
msgstr "Du måste ange namnet på en tagg."
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1444
msgid "Negative depth in --deepen is not supported"
msgstr "Negativa djup stöds inte i --deepen"
-#: builtin/fetch.c:1344
+#: builtin/fetch.c:1446
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen och --depth är ömsesidigt uteslutande"
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1451
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth och --unshallow kan inte användas samtidigt"
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1453
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
-#: builtin/fetch.c:1364
+#: builtin/fetch.c:1469
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
-#: builtin/fetch.c:1366
+#: builtin/fetch.c:1471
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:1377
+#: builtin/fetch.c:1480
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Fjärren eller fjärrgruppen finns inte: %s"
-#: builtin/fetch.c:1385
+#: builtin/fetch.c:1487
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
msgid "show only <n> matched refs"
msgstr "visa endast <n> träffade refs"
-#: builtin/for-each-ref.c:39 builtin/tag.c:414
+#: builtin/for-each-ref.c:39 builtin/tag.c:421
msgid "respect format colors"
msgstr "använd formatfärger"
msgid "print only refs which don't contain the commit"
msgstr "visa endast referenser som inte innehåller incheckningen"
-#: builtin/fsck.c:543
+#: builtin/fsck.c:569
msgid "Checking object directories"
msgstr "Kontrollerar objektkataloger"
-#: builtin/fsck.c:635
+#: builtin/fsck.c:661
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<flaggor>] [<objekt>...]"
-#: builtin/fsck.c:641
+#: builtin/fsck.c:667
msgid "show unreachable objects"
msgstr "visa onåbara objekt"
-#: builtin/fsck.c:642
+#: builtin/fsck.c:668
msgid "show dangling objects"
msgstr "visa dinglande objekt"
-#: builtin/fsck.c:643
+#: builtin/fsck.c:669
msgid "report tags"
msgstr "rapportera taggar"
-#: builtin/fsck.c:644
+#: builtin/fsck.c:670
msgid "report root nodes"
msgstr "rapportera rotnoder"
-#: builtin/fsck.c:645
+#: builtin/fsck.c:671
msgid "make index objects head nodes"
msgstr "gör indexojekt till huvudnoder"
-#: builtin/fsck.c:646
+#: builtin/fsck.c:672
msgid "make reflogs head nodes (default)"
msgstr "gör refloggar till huvudnoder (standard)"
-#: builtin/fsck.c:647
+#: builtin/fsck.c:673
msgid "also consider packs and alternate objects"
msgstr "ta även hänsyn till paket och alternativa objekt"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: builtin/fsck.c:648
+#: builtin/fsck.c:674
msgid "check only connectivity"
msgstr "kontrollera endast konnektivitet"
-#: builtin/fsck.c:649
+#: builtin/fsck.c:675
msgid "enable more strict checking"
msgstr "aktivera striktare kontroll"
-#: builtin/fsck.c:651
+#: builtin/fsck.c:677
msgid "write dangling objects in .git/lost-found"
msgstr "skriv dinglande objekt i .git/lost-found"
-#: builtin/fsck.c:652 builtin/prune.c:107
+#: builtin/fsck.c:678 builtin/prune.c:109
msgid "show progress"
msgstr "visa förlopp"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:679
msgid "show verbose names for reachable objects"
msgstr "visa ordrika namn för nåbara objekt"
-#: builtin/fsck.c:714
+#: builtin/fsck.c:745
msgid "Checking objects"
msgstr "Kontrollerar objekt"
-#: builtin/gc.c:27
+#: builtin/gc.c:33
msgid "git gc [<options>]"
msgstr "git gc [<flaggor>]"
-#: builtin/gc.c:80
+#: builtin/gc.c:88
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "Misslyckades ta status (fstat) på %s: %s"
-#: builtin/gc.c:312
+#: builtin/gc.c:452
#, c-format
msgid "Can't stat %s"
msgstr "Kan inte ta status på %s"
-#: builtin/gc.c:321
+#: builtin/gc.c:461
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"\n"
"%s"
-#: builtin/gc.c:360
+#: builtin/gc.c:502
msgid "prune unreferenced objects"
msgstr "rensa ej refererade objekt"
-#: builtin/gc.c:362
+#: builtin/gc.c:504
msgid "be more thorough (increased runtime)"
msgstr "var mer grundlig (ökar körtiden)"
-#: builtin/gc.c:363
+#: builtin/gc.c:505
msgid "enable auto-gc mode"
msgstr "aktivera auto-gc-läge"
-#: builtin/gc.c:364
+#: builtin/gc.c:508
msgid "force running gc even if there may be another gc running"
msgstr "tvinga gc-körning även om en annan gc kanske körs"
-#: builtin/gc.c:381
+#: builtin/gc.c:511
+msgid "repack all other packs except the largest pack"
+msgstr "packa om alla paket förutom det största paketet"
+
+#: builtin/gc.c:528
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
+msgstr "kunde inte tolka värdet %s för gc.logexpiry"
+
+#: builtin/gc.c:539
#, c-format
-msgid "Failed to parse gc.logexpiry value %s"
-msgstr "Kan inte tolka värdet %s för gc.logexpiry"
+msgid "failed to parse prune expiry value %s"
+msgstr "kunde inte tolka värdet %s för prune expiry"
-#: builtin/gc.c:409
+#: builtin/gc.c:559
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"
-#: builtin/gc.c:411
+#: builtin/gc.c:561
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
-#: builtin/gc.c:412
+#: builtin/gc.c:562
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Se \"git help gc\" för manuell hushållning.\n"
-#: builtin/gc.c:437
+#: builtin/gc.c:598
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
"gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
"är fallet)"
-#: builtin/gc.c:481
+#: builtin/gc.c:645
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort "
"dem."
-#: builtin/grep.c:27
+#: builtin/grep.c:28
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
+#: builtin/grep.c:293 builtin/index-pack.c:1531 builtin/index-pack.c:1723
#, c-format
msgid "no threads support, ignoring %s"
msgstr "trådstöd saknas, ignorerar %s"
-#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
+#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623
#, c-format
msgid "unable to read tree (%s)"
msgstr "kunde inte läsa träd (%s)"
-#: builtin/grep.c:630
+#: builtin/grep.c:638
#, c-format
msgid "unable to grep from object of type %s"
msgstr "kunde inte \"grep\" från objekt av typen %s"
-#: builtin/grep.c:696
+#: builtin/grep.c:703
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "flaggan \"%c\" antar ett numeriskt värde"
-#: builtin/grep.c:783
+#: builtin/grep.c:790
msgid "search in index instead of in the work tree"
msgstr "sök i indexet istället för i arbetskatalogen"
-#: builtin/grep.c:785
+#: builtin/grep.c:792
msgid "find in contents not managed by git"
msgstr "sök i innehåll som inte hanteras av git"
-#: builtin/grep.c:787
+#: builtin/grep.c:794
msgid "search in both tracked and untracked files"
msgstr "sök i både spårade och ospårade filer"
-#: builtin/grep.c:789
+#: builtin/grep.c:796
msgid "ignore files specified via '.gitignore'"
msgstr "ignorera filer angivna i \".gitignore\""
-#: builtin/grep.c:791
+#: builtin/grep.c:798
msgid "recursively search in each submodule"
msgstr "sök varje undermodul rekursivt"
-#: builtin/grep.c:794
+#: builtin/grep.c:801
msgid "show non-matching lines"
msgstr "visa rader som inte träffas"
-#: builtin/grep.c:796
+#: builtin/grep.c:803
msgid "case insensitive matching"
msgstr "skiftlägesokänslig sökning"
-#: builtin/grep.c:798
+#: builtin/grep.c:805
msgid "match patterns only at word boundaries"
msgstr "matcha endast mönster vid ordgränser"
-#: builtin/grep.c:800
+#: builtin/grep.c:807
msgid "process binary files as text"
msgstr "hantera binärfiler som text"
-#: builtin/grep.c:802
+#: builtin/grep.c:809
msgid "don't match patterns in binary files"
msgstr "träffa inte mönster i binärfiler"
-#: builtin/grep.c:805
+#: builtin/grep.c:812
msgid "process binary files with textconv filters"
msgstr "hantera binärfiler med textconv-filter"
-#: builtin/grep.c:807
+#: builtin/grep.c:814
msgid "descend at most <depth> levels"
msgstr "gå som mest ned <djup> nivåer"
-#: builtin/grep.c:811
+#: builtin/grep.c:818
msgid "use extended POSIX regular expressions"
msgstr "använd utökade POSIX-reguljära uttryck"
-#: builtin/grep.c:814
+#: builtin/grep.c:821
msgid "use basic POSIX regular expressions (default)"
msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
-#: builtin/grep.c:817
+#: builtin/grep.c:824
msgid "interpret patterns as fixed strings"
msgstr "tolka mönster som fixerade strängar"
-#: builtin/grep.c:820
+#: builtin/grep.c:827
msgid "use Perl-compatible regular expressions"
msgstr "använd Perlkompatibla reguljära uttryck"
-#: builtin/grep.c:823
+#: builtin/grep.c:830
msgid "show line numbers"
msgstr "visa radnummer"
-#: builtin/grep.c:824
+#: builtin/grep.c:831
msgid "don't show filenames"
msgstr "visa inte filnamn"
-#: builtin/grep.c:825
+#: builtin/grep.c:832
msgid "show filenames"
msgstr "visa filnamn"
-#: builtin/grep.c:827
+#: builtin/grep.c:834
msgid "show filenames relative to top directory"
msgstr "visa filnamn relativa till toppkatalogen"
-#: builtin/grep.c:829
+#: builtin/grep.c:836
msgid "show only filenames instead of matching lines"
msgstr "visa endast filnamn istället för träffade rader"
-#: builtin/grep.c:831
+#: builtin/grep.c:838
msgid "synonym for --files-with-matches"
msgstr "synonym för --files-with-matches"
-#: builtin/grep.c:834
+#: builtin/grep.c:841
msgid "show only the names of files without match"
msgstr "visa endast namn på filer utan träffar"
-#: builtin/grep.c:836
+#: builtin/grep.c:843
msgid "print NUL after filenames"
msgstr "skriv NUL efter filnamn"
-#: builtin/grep.c:838
+#: builtin/grep.c:846
msgid "show the number of matches instead of matching lines"
msgstr "visa antal träffar istället för träffade rader"
-#: builtin/grep.c:839
+#: builtin/grep.c:847
msgid "highlight matches"
msgstr "ljusmarkera träffar"
-#: builtin/grep.c:841
+#: builtin/grep.c:849
msgid "print empty line between matches from different files"
msgstr "skriv tomma rader mellan träffar från olika filer"
-#: builtin/grep.c:843
+#: builtin/grep.c:851
msgid "show filename only once above matches from same file"
msgstr "visa filnamn endast en gång ovanför träffar från samma fil"
-#: builtin/grep.c:846
+#: builtin/grep.c:854
msgid "show <n> context lines before and after matches"
msgstr "visa <n> rader sammanhang före och efter träffar"
-#: builtin/grep.c:849
+#: builtin/grep.c:857
msgid "show <n> context lines before matches"
msgstr "visa <n> rader sammanhang före träffar"
-#: builtin/grep.c:851
+#: builtin/grep.c:859
msgid "show <n> context lines after matches"
msgstr "visa <n> rader sammanhang efter träffar"
-#: builtin/grep.c:853
+#: builtin/grep.c:861
msgid "use <n> worker threads"
msgstr "använd <n> jobbtrådar"
-#: builtin/grep.c:854
+#: builtin/grep.c:862
msgid "shortcut for -C NUM"
msgstr "genväg för -C NUM"
-#: builtin/grep.c:857
+#: builtin/grep.c:865
msgid "show a line with the function name before matches"
msgstr "visa en rad med funktionsnamnet före träffen"
-#: builtin/grep.c:859
+#: builtin/grep.c:867
msgid "show the surrounding function"
msgstr "visa den omkringliggande funktionen"
-#: builtin/grep.c:862
+#: builtin/grep.c:870
msgid "read patterns from file"
msgstr "läs mönster från fil"
-#: builtin/grep.c:864
+#: builtin/grep.c:872
msgid "match <pattern>"
msgstr "träffa <mönster>"
-#: builtin/grep.c:866
+#: builtin/grep.c:874
msgid "combine patterns specified with -e"
msgstr "kombinera mönster som anges med -e"
-#: builtin/grep.c:878
+#: builtin/grep.c:886
msgid "indicate hit with exit status without output"
msgstr "ange träff med slutstatuskod utan utdata"
-#: builtin/grep.c:880
+#: builtin/grep.c:888
msgid "show only matches from files that match all patterns"
msgstr "visa endast träffar från filer som träffar alla mönster"
-#: builtin/grep.c:882
+#: builtin/grep.c:890
msgid "show parse tree for grep expression"
msgstr "visa analysträd för grep-uttryck"
-#: builtin/grep.c:886
+#: builtin/grep.c:894
msgid "pager"
msgstr "bläddrare"
-#: builtin/grep.c:886
+#: builtin/grep.c:894
msgid "show matching files in the pager"
msgstr "visa träffade filer i filbläddraren"
-#: builtin/grep.c:889
+#: builtin/grep.c:898
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
-#: builtin/grep.c:952
+#: builtin/grep.c:962
msgid "no pattern given."
msgstr "inget mönster angavs."
-#: builtin/grep.c:984
+#: builtin/grep.c:994
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index och --untracked kan inte användas med revisioner"
-#: builtin/grep.c:991
+#: builtin/grep.c:1001
#, c-format
msgid "unable to resolve revision: %s"
msgstr "kan inte slå upp revision: %s"
-#: builtin/grep.c:1026 builtin/index-pack.c:1491
+#: builtin/grep.c:1036 builtin/index-pack.c:1527
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
-#: builtin/grep.c:1031
+#: builtin/grep.c:1041
msgid "no threads support, ignoring --threads"
msgstr "trådstöd saknas, ignorerar --threads"
-#: builtin/grep.c:1055
+#: builtin/grep.c:1065
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
-#: builtin/grep.c:1078
+#: builtin/grep.c:1088
msgid "option not supported with --recurse-submodules."
msgstr "flaggan stöds inte med --recurse-submodules."
-#: builtin/grep.c:1084
+#: builtin/grep.c:1094
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached och --untracked kan inte användas med --no-index."
-#: builtin/grep.c:1090
+#: builtin/grep.c:1100
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."
-#: builtin/grep.c:1098
+#: builtin/grep.c:1108
msgid "both --cached and trees are given."
msgstr "både --cached och träd angavs."
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
"git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] "
"<fil>..."
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c:84
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
msgid "type"
msgstr "typ"
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
msgid "object type"
msgstr "objekttyp"
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "write the object into the object database"
msgstr "skriv objektet till objektdatabasen"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "read the object from stdin"
msgstr "läs objektet från standard in"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "store file as is without filters"
msgstr "spara filen som den är utan filer"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"hasha slumpmässigt skräp för att skapa korrupta objekt för felsökning av Git"
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
msgid "process file as it were from this path"
msgstr "hantera filen som om den kom från sökvägen"
-#: builtin/help.c:43
+#: builtin/help.c:45
msgid "print all available commands"
msgstr "visa alla tillgängliga kommandon"
-#: builtin/help.c:44
+#: builtin/help.c:46
msgid "exclude guides"
msgstr "uteslut vägledningar"
-#: builtin/help.c:45
+#: builtin/help.c:47
msgid "print list of useful guides"
msgstr "lista användbara vägledningar"
-#: builtin/help.c:46
+#: builtin/help.c:48
msgid "show man page"
msgstr "visa manualsida"
-#: builtin/help.c:47
+#: builtin/help.c:49
msgid "show manual in web browser"
msgstr "visa manual i webbläsare"
-#: builtin/help.c:49
+#: builtin/help.c:51
msgid "show info page"
msgstr "visa info-sida"
-#: builtin/help.c:55
+#: builtin/help.c:53
+msgid "print command description"
+msgstr "visa kommandobeskrivning"
+
+#: builtin/help.c:58
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]"
-#: builtin/help.c:67
+#: builtin/help.c:70
#, c-format
msgid "unrecognized help format '%s'"
msgstr "okänt hjälpformat: ”%s”"
-#: builtin/help.c:94
+#: builtin/help.c:97
msgid "Failed to start emacsclient."
msgstr "Misslyckades starta emacsclient."
-#: builtin/help.c:107
+#: builtin/help.c:110
msgid "Failed to parse emacsclient version."
msgstr "Kunde inte tolka emacsclient-version."
-#: builtin/help.c:115
+#: builtin/help.c:118
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient version \"%d\" för gammal (< 22)."
-#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
+#: builtin/help.c:136 builtin/help.c:158 builtin/help.c:168 builtin/help.c:176
#, c-format
msgid "failed to exec '%s'"
msgstr "exec misslyckades för \"%s\""
-#: builtin/help.c:211
+#: builtin/help.c:214
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"\"%s\": sökväg för man-visare som ej stöds.\n"
"Använd \"man.<verktyg>.cmd\" istället."
-#: builtin/help.c:223
+#: builtin/help.c:226
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"\"%s\": kommando för man-visare som stöds.\n"
"Använd \"man.<verktyg>.path\" istället."
-#: builtin/help.c:340
+#: builtin/help.c:343
#, c-format
msgid "'%s': unknown man viewer."
msgstr "\"%s\": okänd man-visare."
-#: builtin/help.c:357
+#: builtin/help.c:360
msgid "no man viewer handled the request"
msgstr "ingen man-visare hanterade förfrågan"
-#: builtin/help.c:365
+#: builtin/help.c:368
msgid "no info viewer handled the request"
msgstr "ingen info-visare hanterade förfrågan"
-#: builtin/help.c:407
-msgid "Defining attributes per path"
-msgstr "Definierar attribut per sökväg"
-
-#: builtin/help.c:408
-msgid "Everyday Git With 20 Commands Or So"
-msgstr "Git för dagligt bruk i ungefär 20 kommandon"
-
-#: builtin/help.c:409
-msgid "A Git glossary"
-msgstr "En Git-ordlista"
-
-#: builtin/help.c:410
-msgid "Specifies intentionally untracked files to ignore"
-msgstr "Ange avsiktligen ospårade filer att ignorera"
-
-#: builtin/help.c:411
-msgid "Defining submodule properties"
-msgstr "Ange egenskaper för undermoduler"
-
-#: builtin/help.c:412
-msgid "Specifying revisions and ranges for Git"
-msgstr "Ange versioner och intervall i Git"
-
-#: builtin/help.c:413
-msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
-msgstr "Introduktion till Git (för version 1.5.1 och senare)"
-
-#: builtin/help.c:414
-msgid "An overview of recommended workflows with Git"
-msgstr "Översikt över rekommenderade arbetsflöden med Git"
-
-#: builtin/help.c:426
-msgid "The common Git guides are:\n"
-msgstr "De vanliga Git-vägledningarna är:\n"
-
-#: builtin/help.c:444
+#: builtin/help.c:415
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "\"%s\" är ett alias för \"%s\""
-#: builtin/help.c:466 builtin/help.c:483
+#: builtin/help.c:442 builtin/help.c:459
#, c-format
msgid "usage: %s%s"
msgstr "användning: %s%s"
-#: builtin/index-pack.c:156
+#: builtin/index-pack.c:158
#, c-format
msgid "unable to open %s"
msgstr "kunde inte öppna %s"
-#: builtin/index-pack.c:206
+#: builtin/index-pack.c:208
#, c-format
msgid "object type mismatch at %s"
msgstr "objekttyp stämmer inte överens vid %s"
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:228
#, c-format
msgid "did not receive expected object %s"
msgstr "emottog inte det förväntade objektet %s"
-#: builtin/index-pack.c:229
+#: builtin/index-pack.c:231
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objektet %s: förväntad typ %s, såg %s"
-#: builtin/index-pack.c:271
+#: builtin/index-pack.c:273
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "kan inte fylla %d byte"
msgstr[1] "kan inte fylla %d byte"
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:283
msgid "early EOF"
msgstr "tidigt filslut"
-#: builtin/index-pack.c:282
+#: builtin/index-pack.c:284
msgid "read error on input"
msgstr "indataläsfel"
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c:296
msgid "used more bytes than were available"
msgstr "använde fler byte än tillgängligt"
-#: builtin/index-pack.c:301
+#: builtin/index-pack.c:303
msgid "pack too large for current definition of off_t"
msgstr "paket för stort för nuvarande definition av off_t"
-#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:306 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr "paket är större än tillåten maximal storlek"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:321
#, c-format
msgid "unable to create '%s'"
msgstr "kunde inte skapa \"%s\""
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:327
#, c-format
msgid "cannot open packfile '%s'"
msgstr "kan inte öppna paketfilen \"%s\""
-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:341
msgid "pack signature mismatch"
msgstr "paketsignatur stämmer inte överens"
-#: builtin/index-pack.c:341
+#: builtin/index-pack.c:343
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "paketversion %<PRIu32> stöds ej"
-#: builtin/index-pack.c:359
+#: builtin/index-pack.c:361
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s"
-#: builtin/index-pack.c:480
+#: builtin/index-pack.c:482
#, c-format
msgid "inflate returned %d"
msgstr "inflate returnerade %d"
-#: builtin/index-pack.c:529
+#: builtin/index-pack.c:531
msgid "offset value overflow for delta base object"
msgstr "indexvärdespill för deltabasobjekt"
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:539
msgid "delta base offset is out of bound"
msgstr "deltabasindex utanför gränsen"
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:547
#, c-format
msgid "unknown object type %d"
msgstr "okänd objekttyp %d"
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:578
msgid "cannot pread pack file"
msgstr "kan inte utföra \"pread\" på paketfil"
-#: builtin/index-pack.c:578
+#: builtin/index-pack.c:580
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
-#: builtin/index-pack.c:604
+#: builtin/index-pack.c:606
msgid "serious inflate inconsistency"
msgstr "allvarlig inflate-inkonsekvens"
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
-#: builtin/index-pack.c:817 builtin/index-pack.c:826
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780
+#: builtin/index-pack.c:819 builtin/index-pack.c:828
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
-#: builtin/index-pack.c:752 builtin/pack-objects.c:179
-#: builtin/pack-objects.c:273
+#: builtin/index-pack.c:754 builtin/pack-objects.c:198
+#: builtin/pack-objects.c:292
#, c-format
msgid "unable to read %s"
msgstr "kunde inte läsa %s"
-#: builtin/index-pack.c:815
+#: builtin/index-pack.c:817
#, c-format
msgid "cannot read existing object info %s"
msgstr "kan inte läsa information om befintligt objekt %s"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:825
#, c-format
msgid "cannot read existing object %s"
msgstr "kan inte läsa befintligt objekt %s"
-#: builtin/index-pack.c:837
+#: builtin/index-pack.c:839
#, c-format
msgid "invalid blob object %s"
msgstr "ogiltigt blob-objekt %s"
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:842 builtin/index-pack.c:860
+msgid "fsck error in packed object"
+msgstr "fsck-fel i packat objekt"
+
+#: builtin/index-pack.c:857
#, c-format
msgid "invalid %s"
msgstr "ogiltigt %s"
-#: builtin/index-pack.c:855
-msgid "Error in object"
-msgstr "Fel i objekt"
-
-#: builtin/index-pack.c:857
+#: builtin/index-pack.c:862
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Inte alla barnobjekt för %s kan nås"
-#: builtin/index-pack.c:929 builtin/index-pack.c:960
+#: builtin/index-pack.c:934 builtin/index-pack.c:965
msgid "failed to apply delta"
msgstr "misslyckades tillämpa delta"
-#: builtin/index-pack.c:1131
+#: builtin/index-pack.c:1135
msgid "Receiving objects"
msgstr "Tar emot objekt"
-#: builtin/index-pack.c:1131
+#: builtin/index-pack.c:1135
msgid "Indexing objects"
msgstr "Skapar index för objekt"
-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1169
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paketet är trasigt (SHA1 stämmer inte)"
-#: builtin/index-pack.c:1170
+#: builtin/index-pack.c:1174
msgid "cannot fstat packfile"
msgstr "kan inte utföra \"fstat\" på paketfil"
-#: builtin/index-pack.c:1173
+#: builtin/index-pack.c:1177
msgid "pack has junk at the end"
msgstr "paket har skräp i slutet"
-#: builtin/index-pack.c:1185
+#: builtin/index-pack.c:1189
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "förvirrad bortom vanvett i parse_pack_objects()"
-#: builtin/index-pack.c:1208
+#: builtin/index-pack.c:1212
msgid "Resolving deltas"
msgstr "Analyserar delta"
-#: builtin/index-pack.c:1219
+#: builtin/index-pack.c:1223
#, c-format
msgid "unable to create thread: %s"
msgstr "kunde inte skapa tråd: %s"
-#: builtin/index-pack.c:1261
+#: builtin/index-pack.c:1265
msgid "confusion beyond insanity"
msgstr "förvirrad bortom vanvett"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1271
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "slutfördes med %d lokalt objekt"
msgstr[1] "slutfördes med %d lokala objekt"
-#: builtin/index-pack.c:1279
+#: builtin/index-pack.c:1283
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Oväntad svanschecksumma för %s (trasig disk?)"
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1287
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paketet har %d oanalyserat delta"
msgstr[1] "paketet har %d oanalyserade delta"
-#: builtin/index-pack.c:1307
+#: builtin/index-pack.c:1311
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
-#: builtin/index-pack.c:1383
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
-#: builtin/index-pack.c:1409
-msgid "error while closing pack file"
-msgstr "fel vid stängning av paketfil"
+#: builtin/index-pack.c:1402
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
-#: builtin/index-pack.c:1421
+#: builtin/index-pack.c:1427
#, c-format
-msgid "cannot write keep file '%s'"
-msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
+msgid "cannot write %s file '%s'"
+msgstr "kan inte ta skriva %s-fil \"%s\""
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1435
#, c-format
-msgid "cannot close written keep file '%s'"
-msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
+msgid "cannot close written %s file '%s'"
+msgstr "kan inte stänga skriven %s-fil \"%s\""
+
+#: builtin/index-pack.c:1459
+msgid "error while closing pack file"
+msgstr "fel vid stängning av paketfil"
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
-#: builtin/index-pack.c:1447
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1521
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1553
+#: builtin/index-pack.c:1590
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
-#: builtin/index-pack.c:1555
+#: builtin/index-pack.c:1592
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""
-#: builtin/index-pack.c:1603
+#: builtin/index-pack.c:1640
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "icke-delta: %d objekt"
msgstr[1] "icke-delta: %d objekt"
-#: builtin/index-pack.c:1610
+#: builtin/index-pack.c:1647
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "kedjelängd = %d: %lu objekt"
msgstr[1] "kedjelängd = %d: %lu objekt"
-#: builtin/index-pack.c:1623
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
+#: builtin/index-pack.c:1684
+msgid "Cannot come back to cwd"
+msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
-#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
+#: builtin/index-pack.c:1735 builtin/index-pack.c:1738
+#: builtin/index-pack.c:1754 builtin/index-pack.c:1758
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1774
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
-#: builtin/index-pack.c:1741
+#: builtin/index-pack.c:1776
msgid "--stdin requires a git repository"
msgstr "--stdin kräver ett git-arkiv"
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1782
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
+#: builtin/index-pack.c:1832 builtin/unpack-objects.c:578
+msgid "fsck error in pack objects"
+msgstr "fsck-fel i packat objekt"
+
#: builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
#: builtin/init-db.c:120
#, c-format
-msgid "templates not found %s"
-msgstr "mallarna hittades inte %s"
+msgid "templates not found in %s"
+msgstr "mallarna hittades inte i %s"
#: builtin/init-db.c:135
#, c-format
msgid "specify that the git repository is to be shared amongst several users"
msgstr "ange att git-arkivet skall delas bland flera användare"
-#: builtin/init-db.c:516 builtin/init-db.c:521
-#, c-format
-msgid "cannot mkdir %s"
-msgstr "kan inte skapa katalogen (mkdir) %s"
-
#: builtin/init-db.c:525
#, c-format
msgid "cannot chdir to %s"
msgid "no input file given for in-place editing"
msgstr "ingen indatafil angiven för redigering på plats"
-#: builtin/log.c:46
+#: builtin/log.c:48
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
-#: builtin/log.c:47
+#: builtin/log.c:49
msgid "git show [<options>] <object>..."
msgstr "git show [<flaggor>] <objekt>..."
-#: builtin/log.c:91
+#: builtin/log.c:93
#, c-format
msgid "invalid --decorate option: %s"
msgstr "ogiltig flagga för --decorate: %s"
-#: builtin/log.c:151
+#: builtin/log.c:153
msgid "suppress diff output"
msgstr "undertryck diff-utdata"
-#: builtin/log.c:152
+#: builtin/log.c:154
msgid "show source"
msgstr "visa källkod"
-#: builtin/log.c:153
+#: builtin/log.c:155
msgid "Use mail map file"
msgstr "Använd e-postmappningsfil"
-#: builtin/log.c:155
+#: builtin/log.c:157
msgid "only decorate refs that match <pattern>"
msgstr "dekorera endast referenser som motsvarar <mönster>"
-#: builtin/log.c:157
+#: builtin/log.c:159
msgid "do not decorate refs that match <pattern>"
msgstr "dekorera inte referenser som motsvarar <mönster>"
-#: builtin/log.c:158
+#: builtin/log.c:160
msgid "decorate options"
msgstr "dekoreringsflaggor"
-#: builtin/log.c:161
+#: builtin/log.c:163
msgid "Process line range n,m in file, counting from 1"
msgstr "Behandla radintervallet n,m i filen, med början på 1"
-#: builtin/log.c:257
+#: builtin/log.c:259
#, c-format
msgid "Final output: %d %s\n"
msgstr "Slututdata: %d %s\n"
-#: builtin/log.c:508
+#: builtin/log.c:510
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: felaktig fil"
-#: builtin/log.c:523 builtin/log.c:617
+#: builtin/log.c:525 builtin/log.c:619
#, c-format
msgid "Could not read object %s"
msgstr "Kunde inte läsa objektet %s"
-#: builtin/log.c:641
+#: builtin/log.c:643
#, c-format
msgid "Unknown type: %d"
msgstr "Okänd typ: %d"
-#: builtin/log.c:762
+#: builtin/log.c:764
msgid "format.headers without value"
msgstr "format.headers utan värde"
-#: builtin/log.c:863
+#: builtin/log.c:865
msgid "name of output directory is too long"
msgstr "namnet på utdatakatalogen är för långt"
-#: builtin/log.c:879
+#: builtin/log.c:881
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kan inte öppna patchfilen %s"
-#: builtin/log.c:896
+#: builtin/log.c:898
msgid "Need exactly one range."
msgstr "Behöver precis ett intervall."
-#: builtin/log.c:906
+#: builtin/log.c:908
msgid "Not a range."
msgstr "Inte ett intervall."
-#: builtin/log.c:1012
+#: builtin/log.c:1014
msgid "Cover letter needs email format"
msgstr "Omslagsbrevet behöver e-postformat"
-#: builtin/log.c:1092
+#: builtin/log.c:1095
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
-#: builtin/log.c:1119
+#: builtin/log.c:1122
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
-#: builtin/log.c:1169
+#: builtin/log.c:1172
msgid "Two output directories?"
msgstr "Två utdatakataloger?"
-#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
+#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
#, c-format
msgid "Unknown commit %s"
msgstr "Okänd incheckning %s"
-#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
+#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:523
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
-#: builtin/log.c:1291
+#: builtin/log.c:1294
msgid "Could not find exact merge base."
msgstr "Kunde inte hitta exakt sammanslagningsbas."
-#: builtin/log.c:1295
+#: builtin/log.c:1298
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> "
"manuellt."
-#: builtin/log.c:1315
+#: builtin/log.c:1318
msgid "Failed to find exact merge base"
msgstr "Kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1326
+#: builtin/log.c:1329
msgid "base commit should be the ancestor of revision list"
msgstr "basincheckningen bör vara förfader till revisionslistan"
-#: builtin/log.c:1330
+#: builtin/log.c:1333
msgid "base commit shouldn't be in revision list"
msgstr "basincheckningen bör inte vara i revisionslistan"
-#: builtin/log.c:1379
+#: builtin/log.c:1382
msgid "cannot get patch id"
msgstr "kan inte hämta patch-id"
-#: builtin/log.c:1438
+#: builtin/log.c:1441
msgid "use [PATCH n/m] even with a single patch"
msgstr "använd [PATCH n/m] även för en ensam patch"
-#: builtin/log.c:1441
+#: builtin/log.c:1444
msgid "use [PATCH] even with multiple patches"
msgstr "använd [PATCH] även för flera patchar"
-#: builtin/log.c:1445
+#: builtin/log.c:1448
msgid "print patches to standard out"
msgstr "skriv patcharna på standard ut"
-#: builtin/log.c:1447
+#: builtin/log.c:1450
msgid "generate a cover letter"
msgstr "generera ett följebrev"
-#: builtin/log.c:1449
+#: builtin/log.c:1452
msgid "use simple number sequence for output file names"
msgstr "använd enkel nummersekvens för utdatafilnamn"
-#: builtin/log.c:1450
+#: builtin/log.c:1453
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1451
+#: builtin/log.c:1454
msgid "use <sfx> instead of '.patch'"
msgstr "använd <sfx> istället för \".patch\""
-#: builtin/log.c:1453
+#: builtin/log.c:1456
msgid "start numbering patches at <n> instead of 1"
msgstr "börja numrera patchar på <n> istället för 1"
-#: builtin/log.c:1455
+#: builtin/log.c:1458
msgid "mark the series as Nth re-roll"
msgstr "markera serien som N:te försök"
-#: builtin/log.c:1457
+#: builtin/log.c:1460
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Använd [RFC PATCH] istället för [PATCH]"
-#: builtin/log.c:1460
+#: builtin/log.c:1463
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Använd [<prefix>] istället för [PATCH]"
-#: builtin/log.c:1463
+#: builtin/log.c:1466
msgid "store resulting files in <dir>"
msgstr "spara filerna i <katalog>"
-#: builtin/log.c:1466
+#: builtin/log.c:1469
msgid "don't strip/add [PATCH]"
msgstr "ta inte bort eller lägg till [PATCH]"
-#: builtin/log.c:1469
+#: builtin/log.c:1472
msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
-#: builtin/log.c:1471
+#: builtin/log.c:1474
msgid "output all-zero hash in From header"
msgstr "använd hashvärde med nollor i From-huvud"
-#: builtin/log.c:1473
+#: builtin/log.c:1476
msgid "don't include a patch matching a commit upstream"
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
-#: builtin/log.c:1475
+#: builtin/log.c:1478
msgid "show patch format instead of default (patch + stat)"
msgstr "visa patchformat istället för standard (patch + stat)"
-#: builtin/log.c:1477
+#: builtin/log.c:1480
msgid "Messaging"
msgstr "E-post"
-#: builtin/log.c:1478
+#: builtin/log.c:1481
msgid "header"
msgstr "huvud"
-#: builtin/log.c:1479
+#: builtin/log.c:1482
msgid "add email header"
msgstr "lägg till e-posthuvud"
-#: builtin/log.c:1480 builtin/log.c:1482
+#: builtin/log.c:1483 builtin/log.c:1485
msgid "email"
msgstr "epost"
-#: builtin/log.c:1480
+#: builtin/log.c:1483
msgid "add To: header"
msgstr "lägg till mottagarhuvud (\"To:\")"
-#: builtin/log.c:1482
+#: builtin/log.c:1485
msgid "add Cc: header"
msgstr "lägg till kopiehuvud (\"Cc:\")"
-#: builtin/log.c:1484
+#: builtin/log.c:1487
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1485
+#: builtin/log.c:1488
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"
-#: builtin/log.c:1487
+#: builtin/log.c:1490
msgid "message-id"
msgstr "meddelande-id"
-#: builtin/log.c:1488
+#: builtin/log.c:1491
msgid "make first mail a reply to <message-id>"
msgstr "gör det första brevet ett svar till <meddelande-id>"
-#: builtin/log.c:1489 builtin/log.c:1492
+#: builtin/log.c:1492 builtin/log.c:1495
msgid "boundary"
msgstr "gräns"
-#: builtin/log.c:1490
+#: builtin/log.c:1493
msgid "attach the patch"
msgstr "bifoga patchen"
-#: builtin/log.c:1493
+#: builtin/log.c:1496
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
-#: builtin/log.c:1497
+#: builtin/log.c:1500
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
-#: builtin/log.c:1499
+#: builtin/log.c:1502
msgid "signature"
msgstr "signatur"
-#: builtin/log.c:1500
+#: builtin/log.c:1503
msgid "add a signature"
msgstr "lägg till signatur"
-#: builtin/log.c:1501
+#: builtin/log.c:1504
msgid "base-commit"
msgstr "basincheckning"
-#: builtin/log.c:1502
+#: builtin/log.c:1505
msgid "add prerequisite tree info to the patch series"
msgstr "lägg till förhandskrävd trädinfo i patchserien"
-#: builtin/log.c:1504
+#: builtin/log.c:1507
msgid "add a signature from a file"
msgstr "lägg till signatur från fil"
-#: builtin/log.c:1505
+#: builtin/log.c:1508
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
-#: builtin/log.c:1507
+#: builtin/log.c:1510
msgid "show progress while generating patches"
msgstr "visa förloppsindikator medan patchar skapas"
-#: builtin/log.c:1582
+#: builtin/log.c:1585
#, c-format
msgid "invalid ident line: %s"
msgstr "ogiltig ident-rad: %s"
-#: builtin/log.c:1597
+#: builtin/log.c:1600
msgid "-n and -k are mutually exclusive."
msgstr "-n och -k kan inte användas samtidigt."
-#: builtin/log.c:1599
+#: builtin/log.c:1602
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt."
-#: builtin/log.c:1607
+#: builtin/log.c:1610
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:1609
+#: builtin/log.c:1612
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:1611
+#: builtin/log.c:1614
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1641
+#: builtin/log.c:1646
msgid "standard output, or directory, which one?"
msgstr "standard ut, eller katalog, vilken skall det vara?"
-#: builtin/log.c:1643
+#: builtin/log.c:1648
#, c-format
msgid "Could not create directory '%s'"
msgstr "Kunde inte skapa katalogen \"%s\""
-#: builtin/log.c:1736
+#: builtin/log.c:1741
#, c-format
msgid "unable to read signature file '%s'"
msgstr "kunde inte läsa signaturfil \"%s\""
-#: builtin/log.c:1768
+#: builtin/log.c:1773
msgid "Generating patches"
msgstr "Skapar patchar"
-#: builtin/log.c:1812
+#: builtin/log.c:1817
msgid "Failed to create output files"
msgstr "Misslyckades skapa utdatafiler"
-#: builtin/log.c:1862
+#: builtin/log.c:1867
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
-#: builtin/log.c:1916
+#: builtin/log.c:1921
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgid "show debugging data"
msgstr "visa felsökningsutdata"
-#: builtin/ls-remote.c:7
+#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<arkiv> [<referenser>...]]"
-#: builtin/ls-remote.c:52
+#: builtin/ls-remote.c:59
msgid "do not print remote URL"
msgstr "visa inte fjärr-URL"
-#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62
msgid "exec"
msgstr "exec"
-#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
msgid "path of git-upload-pack on the remote host"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/ls-remote.c:58
+#: builtin/ls-remote.c:65
msgid "limit to tags"
msgstr "begränsa till taggar"
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:66
msgid "limit to heads"
msgstr "begränsa till huvuden"
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c:67
msgid "do not show peeled tags"
msgstr "visa inte avskalade taggar"
-#: builtin/ls-remote.c:62
+#: builtin/ls-remote.c:69
msgid "take url.<base>.insteadOf into account"
msgstr "ta hänsyn till url.<bas>.insteadOf"
-#: builtin/ls-remote.c:64
+#: builtin/ls-remote.c:73
msgid "exit with exit code 2 if no matching refs are found"
msgstr "avsluta med felkod 2 om motsvarande referenser inte hittas"
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:76
msgid "show underlying ref in addition to the object pointed by it"
msgstr "visa underliggande referens och objektet det pekar på"
msgid "empty mbox: '%s'"
msgstr "tom mbox: ”%s”"
-#: builtin/merge.c:48
+#: builtin/merge.c:51
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<flaggor>] [<incheckning>...]"
-#: builtin/merge.c:49
+#: builtin/merge.c:52
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:50
+#: builtin/merge.c:53
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:107
+#: builtin/merge.c:110
msgid "switch `m' requires a value"
msgstr "flaggan \"m\" behöver ett värde"
-#: builtin/merge.c:144
+#: builtin/merge.c:147
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
-#: builtin/merge.c:145
+#: builtin/merge.c:148
#, c-format
msgid "Available strategies are:"
msgstr "Tillgängliga strategier är:"
-#: builtin/merge.c:150
+#: builtin/merge.c:153
#, c-format
msgid "Available custom strategies are:"
msgstr "Tillgängliga skräddarsydda strategier är:"
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:142
msgid "do not show a diffstat at the end of the merge"
msgstr "visa inte en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:203 builtin/pull.c:140
+#: builtin/merge.c:206 builtin/pull.c:145
msgid "show a diffstat at the end of the merge"
msgstr "visa en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:204 builtin/pull.c:143
+#: builtin/merge.c:207 builtin/pull.c:148
msgid "(synonym to --stat)"
msgstr "(synonym till --stat)"
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:151
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"
-#: builtin/merge.c:209 builtin/pull.c:152
+#: builtin/merge.c:212 builtin/pull.c:157
msgid "create a single commit instead of doing a merge"
msgstr "skapa en ensam incheckning istället för en sammanslagning"
-#: builtin/merge.c:211 builtin/pull.c:155
+#: builtin/merge.c:214 builtin/pull.c:160
msgid "perform a commit if the merge succeeds (default)"
msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:163
msgid "edit message before committing"
msgstr "redigera meddelande innan incheckning"
-#: builtin/merge.c:214
+#: builtin/merge.c:217
msgid "allow fast-forward (default)"
msgstr "tillåt snabbspolning (standard)"
-#: builtin/merge.c:216 builtin/pull.c:164
+#: builtin/merge.c:219 builtin/pull.c:169
msgid "abort if fast-forward is not possible"
msgstr "avbryt om snabbspolning inte är möjlig"
-#: builtin/merge.c:220 builtin/pull.c:167
+#: builtin/merge.c:223 builtin/pull.c:172
msgid "verify that the named commit has a valid GPG signature"
msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
-#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
+#: builtin/merge.c:224 builtin/notes.c:777 builtin/pull.c:176
#: builtin/revert.c:109
msgid "strategy"
msgstr "strategi"
-#: builtin/merge.c:222 builtin/pull.c:172
+#: builtin/merge.c:225 builtin/pull.c:177
msgid "merge strategy to use"
msgstr "sammanslagningsstrategi att använda"
-#: builtin/merge.c:223 builtin/pull.c:175
+#: builtin/merge.c:226 builtin/pull.c:180
msgid "option=value"
msgstr "alternativ=värde"
-#: builtin/merge.c:224 builtin/pull.c:176
+#: builtin/merge.c:227 builtin/pull.c:181
msgid "option for selected merge strategy"
msgstr "alternativ för vald sammanslagningsstrategi"
-#: builtin/merge.c:226
+#: builtin/merge.c:229
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
-#: builtin/merge.c:230
+#: builtin/merge.c:233
msgid "abort the current in-progress merge"
msgstr "avbryt den pågående sammanslagningen"
-#: builtin/merge.c:232
+#: builtin/merge.c:235
msgid "continue the current in-progress merge"
msgstr "fortsätt den pågående sammanslagningen"
-#: builtin/merge.c:234 builtin/pull.c:183
+#: builtin/merge.c:237 builtin/pull.c:188
msgid "allow merging unrelated histories"
msgstr "tillåt sammanslagning av orelaterade historier"
-#: builtin/merge.c:240
+#: builtin/merge.c:243
msgid "verify commit-msg hook"
msgstr "bekräfta commit-msg-krok"
-#: builtin/merge.c:265
+#: builtin/merge.c:268
msgid "could not run stash."
msgstr "kunde köra stash."
-#: builtin/merge.c:270
+#: builtin/merge.c:273
msgid "stash failed"
msgstr "stash misslyckades"
-#: builtin/merge.c:275
+#: builtin/merge.c:278
#, c-format
msgid "not a valid object: %s"
msgstr "inte ett giltigt objekt: %s"
-#: builtin/merge.c:297 builtin/merge.c:314
+#: builtin/merge.c:300 builtin/merge.c:317
msgid "read-tree failed"
msgstr "read-tree misslyckades"
-#: builtin/merge.c:344
+#: builtin/merge.c:347
msgid " (nothing to squash)"
msgstr " (inget att platta till)"
-#: builtin/merge.c:355
+#: builtin/merge.c:358
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:405
+#: builtin/merge.c:408
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:455
+#: builtin/merge.c:458
#, c-format
msgid "'%s' does not point to a commit"
msgstr "\"%s\" verkar inte peka på en incheckning"
-#: builtin/merge.c:545
+#: builtin/merge.c:548
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
-#: builtin/merge.c:667
+#: builtin/merge.c:669
msgid "Not handling anything other than two heads merge."
msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
-#: builtin/merge.c:681
+#: builtin/merge.c:683
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Felaktig flagga för merge-recursive: -X%s"
-#: builtin/merge.c:696
+#: builtin/merge.c:698
#, c-format
msgid "unable to write %s"
msgstr "kunde inte skriva %s"
-#: builtin/merge.c:748
+#: builtin/merge.c:749
#, c-format
msgid "Could not read from '%s'"
msgstr "Kunde inte läsa från \"%s\""
-#: builtin/merge.c:757
+#: builtin/merge.c:758
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "
"den.\n"
-#: builtin/merge.c:763
+#: builtin/merge.c:764
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
"avbryter incheckningen.\n"
-#: builtin/merge.c:799
+#: builtin/merge.c:800
msgid "Empty commit message."
msgstr "Tomt incheckningsmeddelande."
msgid "not something we can merge"
msgstr "inte något vi kan slå ihop"
-#: builtin/merge.c:1174
+#: builtin/merge.c:1211
msgid "--abort expects no arguments"
msgstr "--abort tar inga argument"
-#: builtin/merge.c:1178
+#: builtin/merge.c:1215
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
-#: builtin/merge.c:1190
+#: builtin/merge.c:1227
msgid "--continue expects no arguments"
msgstr "--continue tar inga argument"
-#: builtin/merge.c:1194
+#: builtin/merge.c:1231
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
-#: builtin/merge.c:1210
+#: builtin/merge.c:1247
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1217
+#: builtin/merge.c:1254
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1220
+#: builtin/merge.c:1257
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."
-#: builtin/merge.c:1229
+#: builtin/merge.c:1266
msgid "You cannot combine --squash with --no-ff."
msgstr "Du kan inte kombinera --squash med --no-ff."
-#: builtin/merge.c:1237
+#: builtin/merge.c:1274
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
-#: builtin/merge.c:1254
+#: builtin/merge.c:1291
msgid "Squash commit into empty head not supported yet"
msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
-#: builtin/merge.c:1256
+#: builtin/merge.c:1293
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
-#: builtin/merge.c:1261
+#: builtin/merge.c:1298
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - inte något vi kan slå ihop"
-#: builtin/merge.c:1263
+#: builtin/merge.c:1300
msgid "Can merge only exactly one commit into empty head"
msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud"
-#: builtin/merge.c:1297
+#: builtin/merge.c:1334
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."
-#: builtin/merge.c:1300
+#: builtin/merge.c:1337
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."
-#: builtin/merge.c:1303
+#: builtin/merge.c:1340
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Incheckning %s har inte någon GPG-signatur."
-#: builtin/merge.c:1306
+#: builtin/merge.c:1343
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
-#: builtin/merge.c:1368
+#: builtin/merge.c:1402
msgid "refusing to merge unrelated histories"
msgstr "vägrar slå samman orelaterad historik"
-#: builtin/merge.c:1377
+#: builtin/merge.c:1411
msgid "Already up to date."
msgstr "Redan à jour."
-#: builtin/merge.c:1387
+#: builtin/merge.c:1421
#, c-format
msgid "Updating %s..%s\n"
msgstr "Uppdaterar %s..%s\n"
-#: builtin/merge.c:1428
+#: builtin/merge.c:1462
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
-#: builtin/merge.c:1435
+#: builtin/merge.c:1469
#, c-format
msgid "Nope.\n"
msgstr "Nej.\n"
-#: builtin/merge.c:1460
+#: builtin/merge.c:1494
msgid "Already up to date. Yeeah!"
msgstr "Redan à jour. Toppen!"
-#: builtin/merge.c:1466
+#: builtin/merge.c:1500
msgid "Not possible to fast-forward, aborting."
msgstr "Kan inte snabbspola, avbryter."
-#: builtin/merge.c:1489 builtin/merge.c:1568
+#: builtin/merge.c:1523 builtin/merge.c:1602
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Återspolar trädet till orört...\n"
-#: builtin/merge.c:1493
+#: builtin/merge.c:1527
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Försöker sammanslagningsstrategin %s...\n"
-#: builtin/merge.c:1559
+#: builtin/merge.c:1593
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
-#: builtin/merge.c:1561
+#: builtin/merge.c:1595
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Sammanslagning med strategin %s misslyckades.\n"
-#: builtin/merge.c:1570
+#: builtin/merge.c:1604
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Använder %s för att förbereda lösning för hand.\n"
-#: builtin/merge.c:1582
+#: builtin/merge.c:1616
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<flaggor>] <källa>... <mål>"
-#: builtin/mv.c:83
+#: builtin/mv.c:82
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "Katalogen %s är i indexet och inte en undermodul?"
-#: builtin/mv.c:85 builtin/rm.c:289
+#: builtin/mv.c:84 builtin/rm.c:288
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
-#: builtin/mv.c:103
+#: builtin/mv.c:102
#, c-format
msgid "%.*s is in index"
msgstr "%.*s är i indexet"
-#: builtin/mv.c:125
+#: builtin/mv.c:124
msgid "force move/rename even if target exists"
msgstr "tvinga flytta/ändra namn även om målet finns"
msgid "skip move/rename errors"
msgstr "hoppa över fel vid flytt/namnändring"
-#: builtin/mv.c:167
+#: builtin/mv.c:168
#, c-format
msgid "destination '%s' is not a directory"
msgstr "destinationen \"%s\" är ingen katalog"
-#: builtin/mv.c:178
+#: builtin/mv.c:179
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"
-#: builtin/mv.c:182
+#: builtin/mv.c:183
msgid "bad source"
msgstr "felaktig källa"
-#: builtin/mv.c:185
+#: builtin/mv.c:186
msgid "can not move directory into itself"
msgstr "kan inte flytta katalog till sig själv"
-#: builtin/mv.c:188
+#: builtin/mv.c:189
msgid "cannot move directory over file"
msgstr "kan inte flytta katalog över fil"
-#: builtin/mv.c:197
+#: builtin/mv.c:198
msgid "source directory is empty"
msgstr "källkatalogen är tom"
-#: builtin/mv.c:222
+#: builtin/mv.c:223
msgid "not under version control"
msgstr "inte versionshanterad"
-#: builtin/mv.c:225
+#: builtin/mv.c:226
msgid "destination exists"
msgstr "destinationen finns"
-#: builtin/mv.c:233
+#: builtin/mv.c:234
#, c-format
msgid "overwriting '%s'"
msgstr "skriver över \"%s\""
-#: builtin/mv.c:236
+#: builtin/mv.c:237
msgid "Cannot overwrite"
msgstr "Kan inte skriva över"
-#: builtin/mv.c:239
+#: builtin/mv.c:240
msgid "multiple sources for the same target"
msgstr "flera källor för samma mål"
-#: builtin/mv.c:241
+#: builtin/mv.c:242
msgid "destination directory does not exist"
msgstr "destinationskatalogen finns inte"
-#: builtin/mv.c:248
+#: builtin/mv.c:249
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, källa=%s, mål=%s"
-#: builtin/mv.c:269
+#: builtin/mv.c:270
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Byter namn på %s till %s\n"
-#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
+#: builtin/mv.c:276 builtin/remote.c:715 builtin/repack.c:409
#, c-format
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
msgid "the note contents have been left in %s"
msgstr "anteckningens innehåll har lämnats kvar i %s"
-#: builtin/notes.c:234 builtin/tag.c:500
+#: builtin/notes.c:234 builtin/tag.c:507
#, c-format
msgid "cannot read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: builtin/notes.c:236 builtin/tag.c:503
+#: builtin/notes.c:236 builtin/tag.c:510
#, c-format
msgid "could not open or read '%s'"
msgstr "kunde inte öppna eller läsa \"%s\""
msgid "read object names from the standard input"
msgstr "läs objektnamn från standard in"
-#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
+#: builtin/notes.c:943 builtin/prune.c:107 builtin/worktree.c:151
msgid "do not remove, show only"
msgstr "ta inte bort, bara visa"
msgid "unknown subcommand: %s"
msgstr "okänt underkommando: %s"
-#: builtin/pack-objects.c:33
+#: builtin/pack-objects.c:48
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]"
-#: builtin/pack-objects.c:34
+#: builtin/pack-objects.c:49
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]"
-#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
+#: builtin/pack-objects.c:211 builtin/pack-objects.c:214
#, c-format
msgid "deflate error (%d)"
msgstr "fel i deflate (%d)"
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:810
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit"
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:823
msgid "Writing objects"
msgstr "Skriver objekt"
-#: builtin/pack-objects.c:1081
+#: builtin/pack-objects.c:1106
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:1765
+msgid "Counting objects"
+msgstr "Räknar objekt"
+
+#: builtin/pack-objects.c:1895
+#, c-format
+msgid "unable to get size of %s"
+msgstr "kan inte hämta storlek på %s"
+
+#: builtin/pack-objects.c:1910
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr "kunde inte tolka objekthuvud för %s"
+
+#: builtin/pack-objects.c:2564
msgid "Compressing objects"
msgstr "Komprimerar objekt"
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2735
msgid "invalid value for --missing"
msgstr "ogiltigt värde för --missing"
-#: builtin/pack-objects.c:2902
+#: builtin/pack-objects.c:3067
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:2906
+#: builtin/pack-objects.c:3071
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:3102
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:3104
msgid "show progress meter"
msgstr "visa förloppsindikator"
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:3106
msgid "show progress meter during object writing phase"
msgstr "visa förloppsindikator under objektskrivningsfasen"
-#: builtin/pack-objects.c:2943
+#: builtin/pack-objects.c:3109
msgid "similar to --all-progress when progress meter is shown"
msgstr "som --all-progress när förloppsindikatorn visas"
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:3110
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2945
+#: builtin/pack-objects.c:3111
msgid "write the pack index file in the specified idx format version"
msgstr "skriv paketindexfilen i angiven indexformatversion"
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:3114
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
-#: builtin/pack-objects.c:2950
+#: builtin/pack-objects.c:3116
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorera lånade objekt från alternativa objektlager"
-#: builtin/pack-objects.c:2952
+#: builtin/pack-objects.c:3118
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
-#: builtin/pack-objects.c:2954
+#: builtin/pack-objects.c:3120
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:3122
msgid "limit pack window by memory in addition to object limit"
msgstr "begränsa paketfönster efter minne förutom objektgräns"
-#: builtin/pack-objects.c:2958
+#: builtin/pack-objects.c:3124
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "maximal längd på deltakedja tillåten i slutligt paket"
-#: builtin/pack-objects.c:2960
+#: builtin/pack-objects.c:3126
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
-#: builtin/pack-objects.c:2962
+#: builtin/pack-objects.c:3128
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
-#: builtin/pack-objects.c:2964
+#: builtin/pack-objects.c:3130
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
-#: builtin/pack-objects.c:2966
+#: builtin/pack-objects.c:3132
msgid "use threads when searching for best delta matches"
msgstr "använd trådar vid sökning efter bästa deltaträffar"
-#: builtin/pack-objects.c:2968
+#: builtin/pack-objects.c:3134
msgid "do not create an empty pack output"
msgstr "försök inte skapa tom paketutdata"
-#: builtin/pack-objects.c:2970
+#: builtin/pack-objects.c:3136
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
-#: builtin/pack-objects.c:2972
+#: builtin/pack-objects.c:3138
msgid "limit the objects to those that are not yet packed"
msgstr "begränsa objekt till de som ännu inte packats"
-#: builtin/pack-objects.c:2975
+#: builtin/pack-objects.c:3141
msgid "include objects reachable from any reference"
msgstr "inkludera objekt som kan nås från någon referens"
-#: builtin/pack-objects.c:2978
+#: builtin/pack-objects.c:3144
msgid "include objects referred by reflog entries"
msgstr "inkludera objekt som refereras från referensloggposter"
-#: builtin/pack-objects.c:2981
+#: builtin/pack-objects.c:3147
msgid "include objects referred to by the index"
msgstr "inkludera objekt som refereras från indexet"
-#: builtin/pack-objects.c:2984
+#: builtin/pack-objects.c:3150
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
-#: builtin/pack-objects.c:2986
+#: builtin/pack-objects.c:3152
msgid "include tag objects that refer to objects to be packed"
msgstr "inkludera taggobjekt som refererar objekt som skall packas"
-#: builtin/pack-objects.c:2988
+#: builtin/pack-objects.c:3154
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3156
msgid "pack loose unreachable objects"
msgstr "packa lösa onåbara objekt"
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3158
msgid "unpack unreachable objects newer than <time>"
msgstr "packa upp onåbara objekt nyare än <tid>"
-#: builtin/pack-objects.c:2995
+#: builtin/pack-objects.c:3161
msgid "create thin packs"
msgstr "skapa tunna paket"
-#: builtin/pack-objects.c:2997
+#: builtin/pack-objects.c:3163
msgid "create packs suitable for shallow fetches"
msgstr "skapa packfiler lämpade för grunda hämtningar"
-#: builtin/pack-objects.c:2999
+#: builtin/pack-objects.c:3165
msgid "ignore packs that have companion .keep file"
msgstr "ignorera paket som har tillhörande .keep-fil"
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3167
+msgid "ignore this pack"
+msgstr "ignorera detta paket"
+
+#: builtin/pack-objects.c:3169
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
-#: builtin/pack-objects.c:3003
+#: builtin/pack-objects.c:3171
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
-#: builtin/pack-objects.c:3005
+#: builtin/pack-objects.c:3173
msgid "use a bitmap index if available to speed up counting objects"
msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"
-#: builtin/pack-objects.c:3007
+#: builtin/pack-objects.c:3175
msgid "write a bitmap index together with the pack index"
msgstr "använd bitkartindex tillsammans med packindexet"
-#: builtin/pack-objects.c:3010
+#: builtin/pack-objects.c:3178
msgid "handling for missing objects"
msgstr "hantering av saknade objekt"
-#: builtin/pack-objects.c:3144
-msgid "Counting objects"
-msgstr "Räknar objekt"
+#: builtin/pack-objects.c:3181
+msgid "do not pack objects in promisor packfiles"
+msgstr "packa inte objekt i kontraktspackfiler"
+
+#: builtin/pack-objects.c:3205
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr "deltakedjedjupet %d är för djupt, påtvingar %d"
-#: builtin/pack-refs.c:6
+#: builtin/pack-objects.c:3210
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr "pack.deltaCacheLimit är för högt, påtvingar %d"
+
+#: builtin/pack-objects.c:3338
+msgid "Enumerating objects"
+msgstr "Räknar upp objekt"
+
+#: builtin/pack-refs.c:7
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<flaggor>]"
-#: builtin/pack-refs.c:14
+#: builtin/pack-refs.c:15
msgid "pack everything"
msgstr "packa allt"
-#: builtin/pack-refs.c:15
+#: builtin/pack-refs.c:16
msgid "prune loose refs (default)"
msgstr "ta bort lösa referenser (standard)"
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]"
-#: builtin/prune.c:106
+#: builtin/prune.c:108
msgid "report pruned objects"
msgstr "rapportera borttagna objekt"
-#: builtin/prune.c:109
+#: builtin/prune.c:111
msgid "expire objects older than <time>"
msgstr "låt tid gå ut för objekt äldre än <tid>"
-#: builtin/prune.c:123
+#: builtin/prune.c:113
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "begränsa vandring av objekt utanför kontraktspackfiler."
+
+#: builtin/prune.c:127
msgid "cannot prune in a precious-objects repo"
msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
-#: builtin/pull.c:54 builtin/pull.c:56
+#: builtin/pull.c:59 builtin/pull.c:61
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Felaktigt värde för %s: %s"
-#: builtin/pull.c:76
+#: builtin/pull.c:81
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/pull.c:127
+#: builtin/pull.c:132
msgid "control for recursive fetching of submodules"
msgstr "styrning för rekursiv hämtning av undermoduler"
-#: builtin/pull.c:131
+#: builtin/pull.c:136
msgid "Options related to merging"
msgstr "Alternativ gällande sammanslagning"
-#: builtin/pull.c:134
+#: builtin/pull.c:139
msgid "incorporate changes by rebasing rather than merging"
msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
-#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121
+#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:121
msgid "allow fast-forward"
msgstr "tillåt snabbspolning"
-#: builtin/pull.c:170
+#: builtin/pull.c:175
msgid "automatically stash/stash pop before and after rebase"
msgstr "utför automatiskt stash/stash pop före och efter ombasering"
-#: builtin/pull.c:186
+#: builtin/pull.c:191
msgid "Options related to fetching"
msgstr "Alternativ gällande hämtningar"
-#: builtin/pull.c:204
+#: builtin/pull.c:209
msgid "number of submodules pulled in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/pull.c:299
+#: builtin/pull.c:304
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Felaktigt värde för pull.ff: %s"
-#: builtin/pull.c:415
+#: builtin/pull.c:420
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
"Det finns ingen kandidat för ombasering bland referenserna du precis har "
"hämtat."
-#: builtin/pull.c:417
+#: builtin/pull.c:422
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Det finns ingen kandidat för sammanslagning bland referenserna du precis har "
"hämtat."
-#: builtin/pull.c:418
+#: builtin/pull.c:423
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n"
"motsvarade något i fjärränden."
-#: builtin/pull.c:421
+#: builtin/pull.c:426
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"gren. Eftersom det inte är den fjärr som är konfigurerad som\n"
"standard för aktuell gren måste du ange en gren på kommandoraden."
-#: builtin/pull.c:426 git-parse-remote.sh:73
+#: builtin/pull.c:431 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Du är inte på någon gren för närvarande."
-#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79
+#: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Ange vilken gren du vill ombasera mot."
-#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82
+#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Ange vilken gren du vill slå samman med."
-#: builtin/pull.c:431 builtin/pull.c:446
+#: builtin/pull.c:436 builtin/pull.c:451
msgid "See git-pull(1) for details."
msgstr "Se git-pull(1) för detaljer."
-#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448
+#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<fjärr>"
-#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
+#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:523
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<gren>"
-#: builtin/pull.c:441 git-parse-remote.sh:75
+#: builtin/pull.c:446 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Det finns ingen spårningsinformation för aktuell gren."
-#: builtin/pull.c:450 git-parse-remote.sh:95
+#: builtin/pull.c:455 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:"
-#: builtin/pull.c:455
+#: builtin/pull.c:460
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"Dina inställningar anger sammanslagning med referensen \"%s\"\n"
"från fjärren, men någon sådan referens togs inte emot."
-#: builtin/pull.c:817
+#: builtin/pull.c:826
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorera --verify-signatures för ombasering"
-#: builtin/pull.c:865
+#: builtin/pull.c:874
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash är endast giltig med --rebase."
-#: builtin/pull.c:873
+#: builtin/pull.c:882
msgid "Updating an unborn branch with changes added to the index."
msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet."
-#: builtin/pull.c:876
+#: builtin/pull.c:885
msgid "pull with rebase"
msgstr "pull med ombasering"
-#: builtin/pull.c:877
+#: builtin/pull.c:886
msgid "please commit or stash them."
msgstr "checka in eller använd \"stash\" på dem."
-#: builtin/pull.c:902
+#: builtin/pull.c:911
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"snabbspolar din arbetskatalog från\n"
"incheckningen %s."
-#: builtin/pull.c:907
+#: builtin/pull.c:916
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"för att återgå."
-#: builtin/pull.c:922
+#: builtin/pull.c:931
msgid "Cannot merge multiple branches into empty head."
msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
-#: builtin/pull.c:926
+#: builtin/pull.c:935
msgid "Cannot rebase onto multiple branches."
msgstr "Kan inte ombasera ovanpå flera grenar."
-#: builtin/pull.c:933
+#: builtin/pull.c:942
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
-#: builtin/push.c:17
+#: builtin/push.c:19
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/push.c:92
+#: builtin/push.c:111
msgid "tag shorthand without <tag>"
msgstr "taggförkortning utan <tagg>"
-#: builtin/push.c:102
+#: builtin/push.c:121
msgid "--delete only accepts plain target ref names"
msgstr "--delete godtar endast enkla målreferensnamn"
-#: builtin/push.c:146
+#: builtin/push.c:165
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
"För att välja ett av alternativen permanent, se push.default i \"git help "
"config\"."
-#: builtin/push.c:149
+#: builtin/push.c:168
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
" git push %s %s\n"
"%s"
-#: builtin/push.c:164
+#: builtin/push.c:183
#, c-format
msgid ""
"You are not currently on a branch.\n"
"\n"
" git push %s HEAD:<namn-på-fjärrgren>\n"
-#: builtin/push.c:178
+#: builtin/push.c:197
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:186
+#: builtin/push.c:205
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända."
-#: builtin/push.c:189
+#: builtin/push.c:208
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
"aktuella grenen \"%s\", utan att tala om för mig vad som\n"
"skall sändas för att uppdatera fjärrgrenen."
-#: builtin/push.c:248
+#: builtin/push.c:267
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Du angav inga referensspecifikationer att sända, och push.default är "
"\"nothing\"."
-#: builtin/push.c:255
+#: builtin/push.c:274
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
"\"git pull ....\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
-#: builtin/push.c:261
+#: builtin/push.c:280
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
"\"git pull ...\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
-#: builtin/push.c:267
+#: builtin/push.c:286
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
"(t.ex. \"git pull ...\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer."
-#: builtin/push.c:274
+#: builtin/push.c:293
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren."
-#: builtin/push.c:277
+#: builtin/push.c:296
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
"pekar på något som inte är en incheckning, utan att använda flaggan\n"
"\"--force\".\n"
-#: builtin/push.c:337
+#: builtin/push.c:357
#, c-format
msgid "Pushing to %s\n"
msgstr "Sänder till %s\n"
-#: builtin/push.c:341
+#: builtin/push.c:361
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "misslyckades sända vissa referenser till \"%s\""
-#: builtin/push.c:372
+#: builtin/push.c:395
#, c-format
msgid "bad repository '%s'"
msgstr "felaktigt arkiv \"%s\""
-#: builtin/push.c:373
+#: builtin/push.c:396
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
"\n"
" git push <namn>\n"
-#: builtin/push.c:391
-msgid "--all and --tags are incompatible"
-msgstr "--all och --tags är inkompatibla"
-
-#: builtin/push.c:392
-msgid "--all can't be combined with refspecs"
-msgstr "--all kan inte kombineras med referensspecifikationer"
-
-#: builtin/push.c:397
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror och --tags är inkompatibla"
-
-#: builtin/push.c:398
-msgid "--mirror can't be combined with refspecs"
-msgstr "--mirror kan inte kombineras med referensspecifikationer"
-
-#: builtin/push.c:403
-msgid "--all and --mirror are incompatible"
-msgstr "--all och --mirror är inkompatibla"
-
-#: builtin/push.c:535
+#: builtin/push.c:551
msgid "repository"
msgstr "arkiv"
-#: builtin/push.c:536 builtin/send-pack.c:163
+#: builtin/push.c:552 builtin/send-pack.c:164
msgid "push all refs"
msgstr "sänd alla referenser"
-#: builtin/push.c:537 builtin/send-pack.c:165
+#: builtin/push.c:553 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr "spegla alla referenser"
-#: builtin/push.c:539
+#: builtin/push.c:555
msgid "delete refs"
msgstr "ta bort referenser"
-#: builtin/push.c:540
+#: builtin/push.c:556
msgid "push tags (can't be used with --all or --mirror)"
msgstr "sänd taggar (kan inte användas med --all eller --mirror)"
-#: builtin/push.c:543 builtin/send-pack.c:166
+#: builtin/push.c:559 builtin/send-pack.c:167
msgid "force updates"
msgstr "tvinga uppdateringar"
-#: builtin/push.c:545 builtin/send-pack.c:180
+#: builtin/push.c:561 builtin/send-pack.c:181
msgid "refname>:<expect"
msgstr "refnamn>:<förvänta"
-#: builtin/push.c:546 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr "kräv att ref:s tidigare värde är detta"
-#: builtin/push.c:549
+#: builtin/push.c:565
msgid "control recursive pushing of submodules"
msgstr "styr rekursiv insändning av undermoduler"
-#: builtin/push.c:551 builtin/send-pack.c:174
+#: builtin/push.c:567 builtin/send-pack.c:175
msgid "use thin pack"
msgstr "använd tunna paket"
-#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160
-#: builtin/send-pack.c:161
+#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "program för att ta emot paket"
-#: builtin/push.c:554
+#: builtin/push.c:570
msgid "set upstream for git pull/status"
msgstr "ställ in uppström för git pull/status"
-#: builtin/push.c:557
+#: builtin/push.c:573
msgid "prune locally removed refs"
msgstr "ta bort lokalt borttagna referenser"
-#: builtin/push.c:559
+#: builtin/push.c:575
msgid "bypass pre-push hook"
msgstr "förbigå pre-push-krok"
-#: builtin/push.c:560
+#: builtin/push.c:576
msgid "push missing but relevant tags"
msgstr "sänd in saknade men relevanta taggar"
-#: builtin/push.c:563 builtin/send-pack.c:168
+#: builtin/push.c:579 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr "GPG-signera insändningen"
-#: builtin/push.c:565 builtin/send-pack.c:175
+#: builtin/push.c:581 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr "begär atomiska transaktioner på fjärrsidan"
-#: builtin/push.c:566 builtin/send-pack.c:171
-msgid "server-specific"
-msgstr "serverspecifik"
-
-#: builtin/push.c:566 builtin/send-pack.c:172
-msgid "option to transmit"
-msgstr ""
-"inget att checka in\n"
-"flagga att sända"
-
-#: builtin/push.c:583
+#: builtin/push.c:599
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete är inkompatibel med --all, --mirror och --tags"
-#: builtin/push.c:585
+#: builtin/push.c:601
msgid "--delete doesn't make sense without any refs"
msgstr "--delete kan inte användas utan referenser"
#: builtin/push.c:604
+msgid "--all and --tags are incompatible"
+msgstr "--all och --tags är inkompatibla"
+
+#: builtin/push.c:606
+msgid "--all can't be combined with refspecs"
+msgstr "--all kan inte kombineras med referensspecifikationer"
+
+#: builtin/push.c:610
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror och --tags är inkompatibla"
+
+#: builtin/push.c:612
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror kan inte kombineras med referensspecifikationer"
+
+#: builtin/push.c:615
+msgid "--all and --mirror are incompatible"
+msgstr "--all och --mirror är inkompatibla"
+
+#: builtin/push.c:634
msgid "push options must not have new line characters"
msgstr "push-flaggor kan inte innehålla radbrytning"
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<fil>] (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])"
-#: builtin/read-tree.c:121
+#: builtin/read-tree.c:120
msgid "write resulting index to <file>"
msgstr "skriv resulterande index till <fil>"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:123
msgid "only empty the index"
msgstr "töm bara indexet"
-#: builtin/read-tree.c:126
+#: builtin/read-tree.c:125
msgid "Merging"
msgstr "Sammanslagning"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:127
msgid "perform a merge in addition to a read"
msgstr "utför en sammanslagning i tillägg till en läsning"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:129
msgid "3-way merge if no file level merging required"
msgstr "3-vägssammanslagning om sammanslagning på filnivå ej krävs"
-#: builtin/read-tree.c:132
+#: builtin/read-tree.c:131
msgid "3-way merge in presence of adds and removes"
msgstr "3-vägssammanslagning när det finns tillägg och borttagningar"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:133
msgid "same as -m, but discard unmerged entries"
msgstr "som -m, men kasta bort ej sammanslagna poster"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:134
msgid "<subdirectory>/"
msgstr "<underkatalog>/"
-#: builtin/read-tree.c:136
+#: builtin/read-tree.c:135
msgid "read the tree into the index under <subdirectory>/"
msgstr "läs in trädet i indexet under <underkatalog>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:138
msgid "update working tree with merge result"
msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen"
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:140
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:141
msgid "allow explicitly ignored files to be overwritten"
msgstr "tillåt explicit ignorerade filer att skrivas över"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:144
msgid "don't check the working tree after merging"
msgstr "kontrollera inte arbetskatalogen efter sammanslagning"
-#: builtin/read-tree.c:146
+#: builtin/read-tree.c:145
msgid "don't update the index or the work tree"
msgstr "uppdatera inte indexet eller arbetskatalogen"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:147
msgid "skip applying sparse checkout filter"
msgstr "hoppa över att applicera filter för gles utcheckning"
-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:149
msgid "debug unpack-trees"
msgstr "felsök unpack-trees"
msgid "keep empty commits"
msgstr "behåll tomma incheckningar"
-#: builtin/rebase--helper.c:25
+#: builtin/rebase--helper.c:26 builtin/revert.c:123
+msgid "allow commits with empty messages"
+msgstr "tillåt incheckningar med tomt meddelande"
+
+#: builtin/rebase--helper.c:27
+msgid "rebase merge commits"
+msgstr "ombasera sammanslagningar"
+
+#: builtin/rebase--helper.c:29
+msgid "keep original branch points of cousins"
+msgstr "behåll ursprungliga förgreningspunkter för kusiner"
+
+#: builtin/rebase--helper.c:30
msgid "continue rebase"
msgstr "fortsätt ombasering"
-#: builtin/rebase--helper.c:27
+#: builtin/rebase--helper.c:32
msgid "abort rebase"
msgstr "avbryt ombasering"
-#: builtin/rebase--helper.c:30
+#: builtin/rebase--helper.c:35
msgid "make rebase script"
msgstr "skapa ombaseringsskript"
-#: builtin/rebase--helper.c:32
+#: builtin/rebase--helper.c:37
msgid "shorten commit ids in the todo list"
msgstr "förkorta inchecknings-id i todo-listan"
-#: builtin/rebase--helper.c:34
+#: builtin/rebase--helper.c:39
msgid "expand commit ids in the todo list"
msgstr "utöka inchecknings-id i todo-listan"
-#: builtin/rebase--helper.c:36
+#: builtin/rebase--helper.c:41
msgid "check the todo list"
msgstr "kontrollera todo-listan"
-#: builtin/rebase--helper.c:38
+#: builtin/rebase--helper.c:43
msgid "skip unnecessary picks"
msgstr "hoppa över onödiga \"pick\"-kommandon"
-#: builtin/rebase--helper.c:40
+#: builtin/rebase--helper.c:45
msgid "rearrange fixup/squash lines"
msgstr "ordna om fixup-/squash-rader"
-#: builtin/rebase--helper.c:42
+#: builtin/rebase--helper.c:47
msgid "insert exec commands in todo list"
msgstr "lägg in exec-kommandon i todo-listan"
-#: builtin/receive-pack.c:30
+#: builtin/rebase--helper.c:68
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges"
+
+#: builtin/receive-pack.c:31
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-katalog>"
-#: builtin/receive-pack.c:840
+#: builtin/receive-pack.c:842
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"För att undvika detta meddelande och fortfarande behålla det\n"
"normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"."
-#: builtin/receive-pack.c:860
+#: builtin/receive-pack.c:862
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"För att undvika detta meddelande kan du sätta det till \"refuse\"."
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1935
msgid "quiet"
msgstr "tyst"
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1949
msgid "You must specify a directory."
msgstr "Du måste ange en katalog."
-#: builtin/reflog.c:531 builtin/reflog.c:536
+#: builtin/reflog.c:532 builtin/reflog.c:537
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "\"%s\" är inte en giltig tidsstämpel"
-#: builtin/remote.c:13
+#: builtin/remote.c:14
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
-#: builtin/remote.c:14
+#: builtin/remote.c:15
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
"git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <namn> <url>"
-#: builtin/remote.c:15 builtin/remote.c:35
+#: builtin/remote.c:16 builtin/remote.c:36
msgid "git remote rename <old> <new>"
msgstr "git remote rename <gammal> <ny>"
-#: builtin/remote.c:16 builtin/remote.c:40
+#: builtin/remote.c:17 builtin/remote.c:41
msgid "git remote remove <name>"
msgstr "git remote remove <namn>"
-#: builtin/remote.c:17 builtin/remote.c:45
+#: builtin/remote.c:18 builtin/remote.c:46
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"
-#: builtin/remote.c:18
+#: builtin/remote.c:19
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <namn>"
-#: builtin/remote.c:19
+#: builtin/remote.c:20
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <namn>"
-#: builtin/remote.c:20
+#: builtin/remote.c:21
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
"git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjärr>)...]"
-#: builtin/remote.c:21
+#: builtin/remote.c:22
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <namn> <gren>..."
-#: builtin/remote.c:22 builtin/remote.c:71
+#: builtin/remote.c:23 builtin/remote.c:72
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <namn>"
-#: builtin/remote.c:23 builtin/remote.c:76
+#: builtin/remote.c:24 builtin/remote.c:77
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]"
-#: builtin/remote.c:24 builtin/remote.c:77
+#: builtin/remote.c:25 builtin/remote.c:78
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <namn> <nyurl>"
-#: builtin/remote.c:25 builtin/remote.c:78
+#: builtin/remote.c:26 builtin/remote.c:79
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <namn> <url>"
-#: builtin/remote.c:30
+#: builtin/remote.c:31
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<flaggor>] <namn> <url>"
-#: builtin/remote.c:50
+#: builtin/remote.c:51
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <namn> <gren>..."
-#: builtin/remote.c:51
+#: builtin/remote.c:52
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <namn> <gren>..."
-#: builtin/remote.c:56
+#: builtin/remote.c:57
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<flaggor>] <namn>"
-#: builtin/remote.c:61
+#: builtin/remote.c:62
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<flaggor>] <namn>"
-#: builtin/remote.c:66
+#: builtin/remote.c:67
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..."
-#: builtin/remote.c:95
+#: builtin/remote.c:96
#, c-format
msgid "Updating %s"
msgstr "Uppdaterar %s"
-#: builtin/remote.c:127
+#: builtin/remote.c:128
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
"--mirror är farlig och föråldrad; använd\n"
"\t --mirror=fetch eller --mirror=push istället"
-#: builtin/remote.c:144
+#: builtin/remote.c:145
#, c-format
msgid "unknown mirror argument: %s"
msgstr "okänt argument till mirror: %s"
-#: builtin/remote.c:160
+#: builtin/remote.c:161
msgid "fetch the remote branches"
msgstr "hämta fjärrgrenarna"
-#: builtin/remote.c:162
+#: builtin/remote.c:163
msgid "import all tags and associated objects when fetching"
msgstr "importera alla taggar och associerade objekt vid hämtning"
-#: builtin/remote.c:165
+#: builtin/remote.c:166
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "eller hämta inte några taggar alls (--no-tags)"
-#: builtin/remote.c:167
+#: builtin/remote.c:168
msgid "branch(es) to track"
msgstr "gren(ar) att spåra"
-#: builtin/remote.c:168
+#: builtin/remote.c:169
msgid "master branch"
msgstr "huvudgren"
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "push|fetch"
msgstr "push|fetch"
-#: builtin/remote.c:170
+#: builtin/remote.c:171
msgid "set up remote as a mirror to push to or fetch from"
msgstr "ställ in arkiv som spegel att sända eller ta emot från"
-#: builtin/remote.c:182
+#: builtin/remote.c:183
msgid "specifying a master branch makes no sense with --mirror"
msgstr "att ange en master-gren ger ingen mening med --mirror"
-#: builtin/remote.c:184
+#: builtin/remote.c:185
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar"
-#: builtin/remote.c:191 builtin/remote.c:631
+#: builtin/remote.c:192 builtin/remote.c:634
#, c-format
msgid "remote %s already exists."
msgstr "fjärrarkivet %s finns redan."
-#: builtin/remote.c:195 builtin/remote.c:635
+#: builtin/remote.c:196 builtin/remote.c:638
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"
-#: builtin/remote.c:235
+#: builtin/remote.c:236
#, c-format
msgid "Could not setup master '%s'"
msgstr "Kunde inte skapa master \"%s\""
-#: builtin/remote.c:337
+#: builtin/remote.c:342
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Kunde inte hämta mappning för referensspecifikation %s"
-#: builtin/remote.c:438 builtin/remote.c:446
+#: builtin/remote.c:441 builtin/remote.c:449
msgid "(matching)"
msgstr "(matchande)"
-#: builtin/remote.c:450
+#: builtin/remote.c:453
msgid "(delete)"
msgstr "(ta bort)"
-#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
+#: builtin/remote.c:627 builtin/remote.c:762 builtin/remote.c:861
#, c-format
msgid "No such remote: %s"
msgstr "Inget sådant fjärrarkiv: %s"
-#: builtin/remote.c:641
+#: builtin/remote.c:644
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\""
-#: builtin/remote.c:661
+#: builtin/remote.c:664
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tUppdatera konfigurationen manuellt om nödvändigt."
-#: builtin/remote.c:697
+#: builtin/remote.c:700
#, c-format
msgid "deleting '%s' failed"
msgstr "misslyckades ta bort \"%s\""
-#: builtin/remote.c:731
+#: builtin/remote.c:734
#, c-format
msgid "creating '%s' failed"
msgstr "misslyckades skapa \"%s\""
-#: builtin/remote.c:796
+#: builtin/remote.c:799
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
"Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n"
"för att ta bort dem, använd:"
-#: builtin/remote.c:810
+#: builtin/remote.c:813
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""
-#: builtin/remote.c:911
+#: builtin/remote.c:914
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " ny (nästa hämtning sparar i remotes/%s)"
-#: builtin/remote.c:914
+#: builtin/remote.c:917
msgid " tracked"
msgstr " spårad"
-#: builtin/remote.c:916
+#: builtin/remote.c:919
msgid " stale (use 'git remote prune' to remove)"
msgstr " förlegad (använd \"git remote prune\" för att ta bort)"
-#: builtin/remote.c:918
+#: builtin/remote.c:921
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:959
+#: builtin/remote.c:962
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren"
-#: builtin/remote.c:967
+#: builtin/remote.c:971
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "ombaseras interaktivt på fjärren %s"
-#: builtin/remote.c:968
+#: builtin/remote.c:973
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr "ombaseras interaktivt (med sammanslagningar) på fjärren %s"
+
+#: builtin/remote.c:976
#, c-format
msgid "rebases onto remote %s"
msgstr "ombaseras på fjärren %s"
-#: builtin/remote.c:971
+#: builtin/remote.c:980
#, c-format
msgid " merges with remote %s"
msgstr " sammanslås med fjärren %s"
-#: builtin/remote.c:974
+#: builtin/remote.c:983
#, c-format
msgid "merges with remote %s"
msgstr "sammanslås med fjärren %s"
-#: builtin/remote.c:977
+#: builtin/remote.c:986
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s och med fjärren %s\n"
-#: builtin/remote.c:1020
+#: builtin/remote.c:1029
msgid "create"
msgstr "skapa"
-#: builtin/remote.c:1023
+#: builtin/remote.c:1032
msgid "delete"
msgstr "ta bort"
-#: builtin/remote.c:1027
+#: builtin/remote.c:1036
msgid "up to date"
msgstr "àjour"
-#: builtin/remote.c:1030
+#: builtin/remote.c:1039
msgid "fast-forwardable"
msgstr "kan snabbspolas"
-#: builtin/remote.c:1033
+#: builtin/remote.c:1042
msgid "local out of date"
msgstr "lokal föråldrad"
-#: builtin/remote.c:1040
+#: builtin/remote.c:1049
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s tvingar till %-*s (%s)"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1052
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s sänder till %-*s (%s)"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1056
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s tvingar till %s"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s sänder till %s"
-#: builtin/remote.c:1118
+#: builtin/remote.c:1127
msgid "do not query remotes"
msgstr "fråga inte fjärrar"
-#: builtin/remote.c:1145
+#: builtin/remote.c:1154
#, c-format
msgid "* remote %s"
msgstr "* fjärr %s"
-#: builtin/remote.c:1146
+#: builtin/remote.c:1155
#, c-format
msgid " Fetch URL: %s"
msgstr " Hämt-URL: %s"
-#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
+#: builtin/remote.c:1156 builtin/remote.c:1172 builtin/remote.c:1311
msgid "(no URL)"
msgstr "(ingen URL)"
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1161 builtin/remote.c:1163
+#: builtin/remote.c:1170 builtin/remote.c:1172
#, c-format
msgid " Push URL: %s"
msgstr " Sänd-URL: %s"
-#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
+#: builtin/remote.c:1174 builtin/remote.c:1176 builtin/remote.c:1178
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD-gren: %s"
-#: builtin/remote.c:1165
+#: builtin/remote.c:1174
msgid "(not queried)"
msgstr "(inte förfrågad)"
-#: builtin/remote.c:1167
+#: builtin/remote.c:1176
msgid "(unknown)"
msgstr "(okänd)"
-#: builtin/remote.c:1171
+#: builtin/remote.c:1180
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n"
-#: builtin/remote.c:1183
+#: builtin/remote.c:1192
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Fjärrgren:%s"
msgstr[1] " Fjärrgrenar:%s"
-#: builtin/remote.c:1186 builtin/remote.c:1212
+#: builtin/remote.c:1195 builtin/remote.c:1221
msgid " (status not queried)"
msgstr " (status inte förfrågad)"
-#: builtin/remote.c:1195
+#: builtin/remote.c:1204
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Lokal gren konfigurerad för \"git pull\":"
msgstr[1] " Lokala grenar konfigurerade för \"git pull\":"
-#: builtin/remote.c:1203
+#: builtin/remote.c:1212
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokala referenser speglas av \"git push\""
-#: builtin/remote.c:1209
+#: builtin/remote.c:1218
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:"
msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:"
-#: builtin/remote.c:1230
+#: builtin/remote.c:1239
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
-#: builtin/remote.c:1232
+#: builtin/remote.c:1241
msgid "delete refs/remotes/<name>/HEAD"
msgstr "ta bort refs/remotes/<namn>/HEAD"
-#: builtin/remote.c:1247
+#: builtin/remote.c:1256
msgid "Cannot determine remote HEAD"
msgstr "Kan inte bestämma HEAD på fjärren"
-#: builtin/remote.c:1249
+#: builtin/remote.c:1258
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1268
#, c-format
msgid "Could not delete %s"
msgstr "Kunde inte ta bort %s"
-#: builtin/remote.c:1267
+#: builtin/remote.c:1276
#, c-format
msgid "Not a valid ref: %s"
msgstr "Inte en giltig referens: %s"
-#: builtin/remote.c:1269
+#: builtin/remote.c:1278
#, c-format
msgid "Could not setup %s"
msgstr "Kunde inte ställa in %s"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1296
#, c-format
msgid " %s will become dangling!"
msgstr " %s kommer bli dinglande!"
-#: builtin/remote.c:1288
+#: builtin/remote.c:1297
#, c-format
msgid " %s has become dangling!"
msgstr " %s har blivit dinglande!"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1307
#, c-format
msgid "Pruning %s"
msgstr "Rensar %s"
-#: builtin/remote.c:1299
+#: builtin/remote.c:1308
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1315
+#: builtin/remote.c:1324
#, c-format
msgid " * [would prune] %s"
msgstr " * [skulle rensa] %s"
-#: builtin/remote.c:1318
+#: builtin/remote.c:1327
#, c-format
msgid " * [pruned] %s"
msgstr " * [rensad] %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1372
msgid "prune remotes after fetching"
msgstr "rensa fjärrar efter hämtning"
-#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
+#: builtin/remote.c:1435 builtin/remote.c:1489 builtin/remote.c:1557
#, c-format
msgid "No such remote '%s'"
msgstr "Ingen sådan fjärr \"%s\""
-#: builtin/remote.c:1442
+#: builtin/remote.c:1451
msgid "add branch"
msgstr "lägg till gren"
-#: builtin/remote.c:1449
+#: builtin/remote.c:1458
msgid "no remote specified"
msgstr "ingen fjärr angavs"
-#: builtin/remote.c:1466
+#: builtin/remote.c:1475
msgid "query push URLs rather than fetch URLs"
msgstr "fråga sänd-URL:er istället för hämta-URL:er"
-#: builtin/remote.c:1468
+#: builtin/remote.c:1477
msgid "return all URLs"
msgstr "returnera alla URL:er"
-#: builtin/remote.c:1496
+#: builtin/remote.c:1505
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "ingen URL:er angivna för fjärren \"%s\""
-#: builtin/remote.c:1522
+#: builtin/remote.c:1531
msgid "manipulate push URLs"
msgstr "manipulera URL:ar för sändning"
-#: builtin/remote.c:1524
+#: builtin/remote.c:1533
msgid "add URL"
msgstr "lägg till URL"
-#: builtin/remote.c:1526
+#: builtin/remote.c:1535
msgid "delete URLs"
msgstr "ta bort URL:ar"
-#: builtin/remote.c:1533
+#: builtin/remote.c:1542
msgid "--add --delete doesn't make sense"
msgstr "--add --delete ger ingen mening"
-#: builtin/remote.c:1572
+#: builtin/remote.c:1581
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Felaktig gammalt URL-mönster: %s"
-#: builtin/remote.c:1580
+#: builtin/remote.c:1589
#, c-format
msgid "No such URL found: %s"
msgstr "Ingen sådan URL hittades: %s"
-#: builtin/remote.c:1582
+#: builtin/remote.c:1591
msgid "Will not delete all non-push URLs"
msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
-#: builtin/remote.c:1598
+#: builtin/remote.c:1607
msgid "be verbose; must be placed before a subcommand"
msgstr "var pratsam; måste skrivas före ett underkommando"
-#: builtin/remote.c:1629
+#: builtin/remote.c:1638
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Okänt underkommando: %s"
"Använd --no-write-bitmap-index eller inaktivera inställningen\n"
"pack.writebitmaps"
-#: builtin/repack.c:168
+#: builtin/repack.c:180
msgid "pack everything in a single pack"
msgstr "packa allt i ett enda paket"
-#: builtin/repack.c:170
+#: builtin/repack.c:182
msgid "same as -a, and turn unreachable objects loose"
msgstr "samma som -a, och gör onåbara objekt lösa"
-#: builtin/repack.c:173
+#: builtin/repack.c:185
msgid "remove redundant packs, and run git-prune-packed"
msgstr "ta bort överflödiga paket, och kör git-prune-packed"
-#: builtin/repack.c:175
+#: builtin/repack.c:187
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "sänd --no-reuse-delta till git-pack-objects"
-#: builtin/repack.c:177
+#: builtin/repack.c:189
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "sänd --no-reuse-object till git-pack-objects"
-#: builtin/repack.c:179
+#: builtin/repack.c:191
msgid "do not run git-update-server-info"
msgstr "kör inte git-update-server-info"
-#: builtin/repack.c:182
+#: builtin/repack.c:194
msgid "pass --local to git-pack-objects"
msgstr "sänd --local till git-pack-objects"
-#: builtin/repack.c:184
+#: builtin/repack.c:196
msgid "write bitmap index"
msgstr "skriv bitkartindex"
-#: builtin/repack.c:185
+#: builtin/repack.c:197
msgid "approxidate"
msgstr "cirkadatum"
-#: builtin/repack.c:186
+#: builtin/repack.c:198
msgid "with -A, do not loosen objects older than this"
msgstr "med -A, lös inte upp objekt äldre än detta"
-#: builtin/repack.c:188
+#: builtin/repack.c:200
msgid "with -a, repack unreachable objects"
msgstr "med -a, packa om onåbara objekt"
-#: builtin/repack.c:190
+#: builtin/repack.c:202
msgid "size of the window used for delta compression"
msgstr "storlek på fönster använt för deltakomprimering"
-#: builtin/repack.c:191 builtin/repack.c:197
+#: builtin/repack.c:203 builtin/repack.c:209
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:192
+#: builtin/repack.c:204
msgid "same as the above, but limit memory size instead of entries count"
msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal"
-#: builtin/repack.c:194
+#: builtin/repack.c:206
msgid "limits the maximum delta depth"
msgstr "begränsa maximalt deltadjup"
-#: builtin/repack.c:196
+#: builtin/repack.c:208
msgid "limits the maximum number of threads"
msgstr "begränsar maximalt antal trådar"
-#: builtin/repack.c:198
+#: builtin/repack.c:210
msgid "maximum size of each packfile"
msgstr "maximal storlek på varje paketfil"
-#: builtin/repack.c:200
+#: builtin/repack.c:212
msgid "repack objects in packs marked with .keep"
msgstr "packa om objekt i paket märkta med .keep"
-#: builtin/repack.c:210
+#: builtin/repack.c:214
+msgid "do not repack this pack"
+msgstr "packa inte om detta paket"
+
+#: builtin/repack.c:224
msgid "cannot delete packs in a precious-objects repo"
msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
-#: builtin/repack.c:214
+#: builtin/repack.c:228
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable och -A kan inte användas samtidigt"
-#: builtin/repack.c:406 builtin/worktree.c:146
+#: builtin/repack.c:425 builtin/worktree.c:139
#, c-format
msgid "failed to remove '%s'"
msgstr "misslyckades ta bort \"%s\""
-#: builtin/replace.c:20
+#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
msgstr "git replace [-f] <objekt> <ersättning>"
-#: builtin/replace.c:21
+#: builtin/replace.c:23
msgid "git replace [-f] --edit <object>"
msgstr "git replace [-f] --edit <objekt>"
-#: builtin/replace.c:22
+#: builtin/replace.c:24
msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr "git replace [-f] --graft <incheckning> [<förälder>...]"
-#: builtin/replace.c:23
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
+msgstr "git replace [-f] --convert-graft-file"
+
+#: builtin/replace.c:26
msgid "git replace -d <object>..."
msgstr "git replace -d <objekt>..."
-#: builtin/replace.c:24
+#: builtin/replace.c:27
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<format>] [-l [<mönster>]]"
-#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
+#: builtin/replace.c:371 builtin/replace.c:415 builtin/replace.c:445
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "Objektnamnet är inte giltigt: \"%s\""
-#: builtin/replace.c:361
+#: builtin/replace.c:407
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "felaktig sammanslagningstagg i incheckningen \"%s\""
-#: builtin/replace.c:363
+#: builtin/replace.c:409
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "felformad sammanslagningstagg i incheckningen \"%s\""
-#: builtin/replace.c:374
+#: builtin/replace.c:421
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s"
"\" som har förkastats; använd --edit istället för --graft"
-#: builtin/replace.c:407
+#: builtin/replace.c:460
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur."
-#: builtin/replace.c:408
+#: builtin/replace.c:461
msgid "the signature will be removed in the replacement commit!"
msgstr "signaturen kommer att tas bort i ersättningsincheckningen!"
-#: builtin/replace.c:414
+#: builtin/replace.c:471
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "kunde inte skriva ersättningsincheckning för: \"%s\""
-#: builtin/replace.c:438
+#: builtin/replace.c:514
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+"kunde inte konvertera följande ympning(ar):\n"
+"%s"
+
+#: builtin/replace.c:535
msgid "list replace refs"
msgstr "visa ersättningsreferenser"
-#: builtin/replace.c:439
+#: builtin/replace.c:536
msgid "delete replace refs"
msgstr "ta bort ersättningsreferenser"
-#: builtin/replace.c:440
+#: builtin/replace.c:537
msgid "edit existing object"
msgstr "redigera befintligt objekt"
-#: builtin/replace.c:441
+#: builtin/replace.c:538
msgid "change a commit's parents"
msgstr "ändra en inchecknings föräldrar"
-#: builtin/replace.c:442
+#: builtin/replace.c:539
+msgid "convert existing graft file"
+msgstr "konvertera befintlig ympningsfil"
+
+#: builtin/replace.c:540
msgid "replace the ref if it exists"
msgstr "ersätt referensen om den finns"
-#: builtin/replace.c:443
+#: builtin/replace.c:542
msgid "do not pretty-print contents for --edit"
msgstr "använd inte snygg visning av innehåll för --edit"
-#: builtin/replace.c:444
+#: builtin/replace.c:543
msgid "use this format"
msgstr "använd detta format"
#: builtin/reset.c:80
msgid "Failed to find tree of HEAD."
-msgstr "Kunde inte hitta träder för HEAD."
+msgstr "Kunde inte hitta trädet för HEAD."
#: builtin/reset.c:86
#, c-format
msgid "Failed to find tree of %s."
-msgstr "Kunde inte hitta träder för %s."
+msgstr "Kunde inte hitta trädet för %s."
-#: builtin/reset.c:113
+#: builtin/reset.c:111
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD är nu på %s"
-#: builtin/reset.c:197
+#: builtin/reset.c:189
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning."
-#: builtin/reset.c:297
+#: builtin/reset.c:289
msgid "be quiet, only report errors"
msgstr "var tyst, rapportera endast fel"
-#: builtin/reset.c:299
+#: builtin/reset.c:291
msgid "reset HEAD and index"
msgstr "återställ HEAD och index"
-#: builtin/reset.c:300
+#: builtin/reset.c:292
msgid "reset only HEAD"
msgstr "återställ endast HEAD"
-#: builtin/reset.c:302 builtin/reset.c:304
+#: builtin/reset.c:294 builtin/reset.c:296
msgid "reset HEAD, index and working tree"
msgstr "återställ HEAD, index och arbetskatalog"
-#: builtin/reset.c:306
+#: builtin/reset.c:298
msgid "reset HEAD but keep local changes"
msgstr "återställ HEAD men behåll lokala ändringar"
-#: builtin/reset.c:312
+#: builtin/reset.c:304
msgid "record only the fact that removed paths will be added later"
msgstr "registrera endast att borttagna sökvägar kommer läggas till senare"
-#: builtin/reset.c:329
+#: builtin/reset.c:321
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Kunde inte slå upp \"%s\" som en giltig revision."
-#: builtin/reset.c:337
+#: builtin/reset.c:329
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd."
-#: builtin/reset.c:346
+#: builtin/reset.c:338
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
-#: builtin/reset.c:355
+#: builtin/reset.c:347
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"."
-#: builtin/reset.c:357
+#: builtin/reset.c:349
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Kan inte göra %s återställning med sökvägar."
-#: builtin/reset.c:367
+#: builtin/reset.c:359
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s återställning tillåts inte i ett naket arkiv"
-#: builtin/reset.c:371
+#: builtin/reset.c:363
msgid "-N can only be used with --mixed"
msgstr "-N kan endast användas med --mixed"
-#: builtin/reset.c:388
+#: builtin/reset.c:380
msgid "Unstaged changes after reset:"
msgstr "Oköade ändringar efter återställning:"
-#: builtin/reset.c:394
+#: builtin/reset.c:386
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
-#: builtin/reset.c:398
+#: builtin/reset.c:390
msgid "Could not write new index file."
msgstr "Kunde inte skriva ny indexfil."
-#: builtin/rev-list.c:399
+#: builtin/rev-list.c:397
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr "kan inte kombinera --exclude-promisor-objects och --missing"
+
+#: builtin/rev-list.c:455
msgid "object filtering requires --objects"
msgstr "objektfiltrering kräver --objects"
-#: builtin/rev-list.c:402
+#: builtin/rev-list.c:458
#, c-format
msgid "invalid sparse value '%s'"
msgstr "ogiltigt värde för sparse: \"%s\""
-#: builtin/rev-list.c:442
+#: builtin/rev-list.c:499
msgid "rev-list does not support display of notes"
msgstr "rev-list stöder inte visning av anteckningar"
-#: builtin/rev-list.c:445
+#: builtin/rev-list.c:502
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering"
-#: builtin/rev-parse.c:402
+#: builtin/rev-parse.c:406
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]"
-#: builtin/rev-parse.c:407
+#: builtin/rev-parse.c:411
msgid "keep the `--` passed as an arg"
msgstr "behåll \"--\" sänt som argument"
-#: builtin/rev-parse.c:409
+#: builtin/rev-parse.c:413
msgid "stop parsing after the first non-option argument"
msgstr "sluta tolka efter första argument som inte är flagga"
-#: builtin/rev-parse.c:412
+#: builtin/rev-parse.c:416
msgid "output in stuck long form"
msgstr "utdata fast i lång form"
-#: builtin/rev-parse.c:545
+#: builtin/rev-parse.c:549
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "preserve initially empty commits"
msgstr "behåll incheckningar som börjar som tomma"
-#: builtin/revert.c:123
-msgid "allow commits with empty messages"
-msgstr "tillåt incheckningar med tomt meddelande"
-
#: builtin/revert.c:124
msgid "keep redundant, empty commits"
msgstr "behåll redundanta, tomma incheckningar"
msgstr[0] "följande fil har lokala ändringar:"
msgstr[1] "följande filer har lokala ändringar:"
-#: builtin/rm.c:243
+#: builtin/rm.c:241
msgid "do not list removed files"
msgstr "lista inte borttagna filer"
-#: builtin/rm.c:244
+#: builtin/rm.c:242
msgid "only remove from the index"
msgstr "ta bara bort från indexet"
-#: builtin/rm.c:245
+#: builtin/rm.c:243
msgid "override the up-to-date check"
msgstr "överstyr àjour-testet"
-#: builtin/rm.c:246
+#: builtin/rm.c:244
msgid "allow recursive removal"
msgstr "tillåt rekursiv borttagning"
-#: builtin/rm.c:248
+#: builtin/rm.c:246
msgid "exit with a zero status even if nothing matched"
msgstr "avsluta med nollstatus även om inget träffades"
-#: builtin/rm.c:307
+#: builtin/rm.c:306
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "tar inte bort \"%s\" rekursivt utan -r"
-#: builtin/rm.c:346
+#: builtin/rm.c:345
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: kan inte ta bort %s"
-#: builtin/rm.c:369
+#: builtin/rm.c:368
#, c-format
msgid "could not remove '%s'"
msgstr "kunde inte ta bort \"%s\""
-#: builtin/send-pack.c:19
+#: builtin/send-pack.c:20
msgid ""
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
"[<ref>...]\n"
" --all och explicit angiven <ref> är ömsesidigt uteslutande."
-#: builtin/send-pack.c:162
+#: builtin/send-pack.c:163
msgid "remote name"
msgstr "fjärrnamn"
-#: builtin/send-pack.c:176
+#: builtin/send-pack.c:177
msgid "use stateless RPC protocol"
msgstr "använd tillståndslöst RPC-protokoll"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:178
msgid "read refs from stdin"
msgstr "läs referenser från standard in"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:179
msgid "print status from remote helper"
msgstr "visa status från fjärrhjälpare"
+#: builtin/serve.c:7
+msgid "git serve [<options>]"
+msgstr "git serve [<flaggor>]"
+
+#: builtin/serve.c:17 builtin/upload-pack.c:23
+msgid "quit after a single request/response exchange"
+msgstr "avsluta omedelbart efter första anrop/svar-utväxling"
+
+#: builtin/serve.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "avsluta omedelbart efter kungörelse av kapabiliteter"
+
#: builtin/shortlog.c:14
-msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
-#: builtin/shortlog.c:263
+#: builtin/shortlog.c:15
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr "git log --pretty=short | git shortlog [<flaggor>]"
+
+#: builtin/shortlog.c:264
msgid "Group by committer rather than author"
msgstr "Gruppera efter incheckare istället för författare"
-#: builtin/shortlog.c:265
+#: builtin/shortlog.c:266
msgid "sort output according to the number of commits per author"
msgstr "sortera utdata enligt antal incheckningar per författare"
-#: builtin/shortlog.c:267
+#: builtin/shortlog.c:268
msgid "Suppress commit descriptions, only provides commit count"
msgstr "Undertryck beskrivningar, visa bara antal incheckningar"
-#: builtin/shortlog.c:269
+#: builtin/shortlog.c:270
msgid "Show the email address of each author"
msgstr "Visa e-postadress för varje författare"
-#: builtin/shortlog.c:270
+#: builtin/shortlog.c:271
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:272
msgid "Linewrap output"
msgstr "Radbryt utdata"
+#: builtin/shortlog.c:298
+msgid "too many arguments given outside repository"
+msgstr "för många flaggor givna utanför arkivet"
+
#: builtin/show-branch.c:12
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
msgid "prepend comment character and space to each line"
msgstr "lägg in kommentarstecken och blanksteg först på varje rad"
-#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
+#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1688
#, c-format
msgid "No such ref: %s"
msgstr "Ingen sådan referens: %s"
-#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1697
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Förväntade fullt referensnamn, fick %s"
-#: builtin/submodule--helper.c:81
+#: builtin/submodule--helper.c:61
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr "submodule--helper print-default-remote tar inga argument"
+
+#: builtin/submodule--helper.c:98
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "kan inte ta bort en komponent från url:en \"%s\""
-#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
+#: builtin/submodule--helper.c:406 builtin/submodule--helper.c:1211
msgid "alternative anchor for relative paths"
msgstr "alternativa ankare för relativa sökvägar"
-#: builtin/submodule--helper.c:375
+#: builtin/submodule--helper.c:411
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
+#: builtin/submodule--helper.c:462 builtin/submodule--helper.c:485
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"
-#: builtin/submodule--helper.c:464
+#: builtin/submodule--helper.c:500
#, c-format
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sn eget "
"officiella uppström."
-#: builtin/submodule--helper.c:475
+#: builtin/submodule--helper.c:511
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Misslyckades registrera url för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:479
+#: builtin/submodule--helper.c:515
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:525
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n"
-#: builtin/submodule--helper.c:496
+#: builtin/submodule--helper.c:532
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:518
+#: builtin/submodule--helper.c:554
msgid "Suppress output for initializing a submodule"
msgstr "Dölj utdata från initiering av undermodul"
-#: builtin/submodule--helper.c:523
+#: builtin/submodule--helper.c:559
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<sökväg>]"
-#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:631 builtin/submodule--helper.c:757
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\""
-#: builtin/submodule--helper.c:626
+#: builtin/submodule--helper.c:670
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\""
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:697 builtin/submodule--helper.c:866
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "misslyckades rekursera in i undermodulen \"%s\""
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:721 builtin/submodule--helper.c:1031
msgid "Suppress submodule status output"
msgstr "Hindra statusutskrift för undermodul"
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:722
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
"Visa incheckning från indexet istället för den som lagrats i undermodulens "
"HEAD"
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:723
msgid "recurse into nested submodules"
msgstr "rekursera in i nästlade undermoduler"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:728
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]"
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:752
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <sökväg>"
-#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
+#: builtin/submodule--helper.c:816
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "Synkroniserar undermodul-url för \"%s\"\n"
+
+#: builtin/submodule--helper.c:822
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "misslyckades registrera url för undermodulsökväg \"%s\""
+
+#: builtin/submodule--helper.c:836
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr "misslyckades hämta standardfjärr för undermodulsökväg \"%s\""
+
+#: builtin/submodule--helper.c:847
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\""
+
+#: builtin/submodule--helper.c:895
+msgid "Suppress output of synchronizing submodule url"
+msgstr "Dölj utdata från synkroniering av undermodul-url"
+
+#: builtin/submodule--helper.c:897
+msgid "Recurse into nested submodules"
+msgstr "Rekursera in i nästlade undermoduler"
+
+#: builtin/submodule--helper.c:902
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]"
+
+#: builtin/submodule--helper.c:956
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
+"really want to remove it including all of its history)"
+msgstr ""
+"Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf"
+"\" om du verkligen vill ta bort den och all dess historik)"
+
+#: builtin/submodule--helper.c:968
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+"Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort "
+"dem"
+
+#: builtin/submodule--helper.c:976
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "Rensade katalogen \"%s\"\n"
+
+#: builtin/submodule--helper.c:978
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n"
+
+#: builtin/submodule--helper.c:987
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "kunde inte skapa tom undermodulskatalog %s"
+
+#: builtin/submodule--helper.c:1003
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
+
+#: builtin/submodule--helper.c:1032
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr ""
+"Ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar"
+
+#: builtin/submodule--helper.c:1033
+msgid "Unregister all submodules"
+msgstr "Avregistrera alla undermoduler"
+
+#: builtin/submodule--helper.c:1038
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]"
+
+#: builtin/submodule--helper.c:1052
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
+
+#: builtin/submodule--helper.c:1145 builtin/submodule--helper.c:1148
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:1184
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte"
-#: builtin/submodule--helper.c:842
+#: builtin/submodule--helper.c:1191
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte"
-#: builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1214
msgid "where the new submodule will be cloned to"
msgstr "var den nya undermodulen skall klonas till"
-#: builtin/submodule--helper.c:867
+#: builtin/submodule--helper.c:1217
msgid "name of the new submodule"
msgstr "namn på den nya undermodulen"
-#: builtin/submodule--helper.c:870
+#: builtin/submodule--helper.c:1220
msgid "url where to clone the submodule from"
msgstr "URL att klona undermodulen från"
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1228
msgid "depth for shallow clones"
msgstr "djup för grunda kloner"
-#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
+#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1606
msgid "force cloning progress"
msgstr "tvinga kloningsförlopp"
-#: builtin/submodule--helper.c:884
+#: builtin/submodule--helper.c:1236
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference "
"<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>"
-#: builtin/submodule--helper.c:915
+#: builtin/submodule--helper.c:1267
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "misslyckades klona \"%s\" till undermodulsökvägen ”%s”"
-#: builtin/submodule--helper.c:930
+#: builtin/submodule--helper.c:1281
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1347
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Undermodulsökvägen \"%s\" har inte initierats"
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1351
msgid "Maybe you want to use 'update --init'?"
msgstr "Kanske menade du att använda \"update --init\"?"
-#: builtin/submodule--helper.c:1028
+#: builtin/submodule--helper.c:1380
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Hoppar över ej sammanslagen undermodul %s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1409
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Hoppar över undermodulen \"%s\""
-#: builtin/submodule--helper.c:1190
+#: builtin/submodule--helper.c:1544
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
-#: builtin/submodule--helper.c:1201
+#: builtin/submodule--helper.c:1555
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Misslyckades klona \"%s\" för andra gången, avbryter"
-#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
+#: builtin/submodule--helper.c:1585 builtin/submodule--helper.c:1808
msgid "path into the working tree"
msgstr "sökväg inuti arbetskatalogen"
-#: builtin/submodule--helper.c:1234
+#: builtin/submodule--helper.c:1588
msgid "path into the working tree, across nested submodule boundaries"
msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser"
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1592
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout eller none"
-#: builtin/submodule--helper.c:1242
+#: builtin/submodule--helper.c:1598
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Skapa en grund klon trunkerad till angivet antal revisioner"
-#: builtin/submodule--helper.c:1245
+#: builtin/submodule--helper.c:1601
msgid "parallel jobs"
msgstr "parallella jobb"
-#: builtin/submodule--helper.c:1247
+#: builtin/submodule--helper.c:1603
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "om den första klonen skall följa rekommendation för grund kloning"
-#: builtin/submodule--helper.c:1248
+#: builtin/submodule--helper.c:1604
msgid "don't print cloning progress"
msgstr "skriv inte klonförlopp"
-#: builtin/submodule--helper.c:1255
+#: builtin/submodule--helper.c:1611
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:1268
+#: builtin/submodule--helper.c:1624
msgid "bad value for update parameter"
msgstr "felaktigt värde för parametern update"
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1692
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men "
"huvudprojektet är inte på någon gren"
-#: builtin/submodule--helper.c:1452
+#: builtin/submodule--helper.c:1809
msgid "recurse into submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:1815
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<sökväg>...]"
-#: builtin/submodule--helper.c:1517
+#: builtin/submodule--helper.c:1901
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s stöder inte --super-prefix"
-#: builtin/submodule--helper.c:1523
+#: builtin/submodule--helper.c:1907
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tog bort tagg \"%s\" (var %s)\n"
-#: builtin/tag.c:131
+#: builtin/tag.c:132
#, c-format
msgid ""
"\n"
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:136
#, c-format
msgid ""
"\n"
"Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n"
"du vill.\n"
-#: builtin/tag.c:189
+#: builtin/tag.c:190
msgid "unable to sign the tag"
msgstr "kunde inte signera taggen"
-#: builtin/tag.c:191
+#: builtin/tag.c:192
msgid "unable to write tag file"
msgstr "kunde inte skriva tagg-filen"
-#: builtin/tag.c:215
+#: builtin/tag.c:217
msgid "bad object type."
msgstr "felaktig objekttyp."
-#: builtin/tag.c:261
+#: builtin/tag.c:266
msgid "no tag message?"
msgstr "inget taggmeddelande?"
-#: builtin/tag.c:268
+#: builtin/tag.c:273
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Taggmeddelandet har lämnats i %s\n"
-#: builtin/tag.c:376
+#: builtin/tag.c:382
msgid "list tag names"
msgstr "lista taggnamn"
-#: builtin/tag.c:378
+#: builtin/tag.c:384
msgid "print <n> lines of each tag message"
msgstr "visa <n> rader från varje taggmeddelande"
-#: builtin/tag.c:380
+#: builtin/tag.c:386
msgid "delete tags"
msgstr "ta bort taggar"
-#: builtin/tag.c:381
+#: builtin/tag.c:387
msgid "verify tags"
msgstr "verifiera taggar"
-#: builtin/tag.c:383
+#: builtin/tag.c:389
msgid "Tag creation options"
msgstr "Alternativ för att skapa taggar"
-#: builtin/tag.c:385
+#: builtin/tag.c:391
msgid "annotated tag, needs a message"
msgstr "annoterad tagg, behöver meddelande"
-#: builtin/tag.c:387
+#: builtin/tag.c:393
msgid "tag message"
msgstr "taggmeddelande"
-#: builtin/tag.c:389
+#: builtin/tag.c:395
+msgid "force edit of tag message"
+msgstr "tvinga redigering av incheckningsmeddelande"
+
+#: builtin/tag.c:396
msgid "annotated and GPG-signed tag"
msgstr "annoterad och GPG-signerad tagg"
-#: builtin/tag.c:393
+#: builtin/tag.c:400
msgid "use another key to sign the tag"
msgstr "använd annan nyckel för att signera taggen"
-#: builtin/tag.c:394
+#: builtin/tag.c:401
msgid "replace the tag if exists"
msgstr "ersätt taggen om den finns"
-#: builtin/tag.c:395 builtin/update-ref.c:368
+#: builtin/tag.c:402 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "skapa en reflog"
-#: builtin/tag.c:397
+#: builtin/tag.c:404
msgid "Tag listing options"
msgstr "Alternativ för listning av taggar"
-#: builtin/tag.c:398
+#: builtin/tag.c:405
msgid "show tag list in columns"
msgstr "lista taggar i spalter"
-#: builtin/tag.c:399 builtin/tag.c:401
+#: builtin/tag.c:406 builtin/tag.c:408
msgid "print only tags that contain the commit"
msgstr "visa endast taggar som innehåller incheckningen"
-#: builtin/tag.c:400 builtin/tag.c:402
+#: builtin/tag.c:407 builtin/tag.c:409
msgid "print only tags that don't contain the commit"
msgstr "visa endast taggar som inte innehåller incheckningen"
-#: builtin/tag.c:403
+#: builtin/tag.c:410
msgid "print only tags that are merged"
msgstr "visa endast taggar som slagits samman"
-#: builtin/tag.c:404
+#: builtin/tag.c:411
msgid "print only tags that are not merged"
msgstr "visa endast taggar som ej slagits samman"
-#: builtin/tag.c:409
+#: builtin/tag.c:416
msgid "print only tags of the object"
msgstr "visa endast taggar för objektet"
-#: builtin/tag.c:453
+#: builtin/tag.c:460
msgid "--column and -n are incompatible"
msgstr "--column och -n är inkompatibla"
-#: builtin/tag.c:475
+#: builtin/tag.c:482
msgid "-n option is only allowed in list mode"
msgstr "Flaggan -n är endast tillåten i listläge"
-#: builtin/tag.c:477
+#: builtin/tag.c:484
msgid "--contains option is only allowed in list mode"
msgstr "Flaggan --contains är endast tillåten i listläge"
-#: builtin/tag.c:479
+#: builtin/tag.c:486
msgid "--no-contains option is only allowed in list mode"
msgstr "Flaggan --no-contains är endast tillåten i listläge"
-#: builtin/tag.c:481
+#: builtin/tag.c:488
msgid "--points-at option is only allowed in list mode"
msgstr "Flaggan --points-at är endast tillåten i listläge"
-#: builtin/tag.c:483
+#: builtin/tag.c:490
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge"
-#: builtin/tag.c:494
+#: builtin/tag.c:501
msgid "only one -F or -m option is allowed."
msgstr "endast en av flaggorna -F eller -m tillåts."
-#: builtin/tag.c:513
+#: builtin/tag.c:520
msgid "too many params"
msgstr "för många parametrar"
-#: builtin/tag.c:519
+#: builtin/tag.c:526
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "\"%s\" är inte ett giltigt taggnamn."
-#: builtin/tag.c:524
+#: builtin/tag.c:531
#, c-format
msgid "tag '%s' already exists"
msgstr "taggen \"%s\" finns redan"
-#: builtin/tag.c:554
+#: builtin/tag.c:562
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
-#: builtin/unpack-objects.c:494
+#: builtin/unpack-objects.c:498
msgid "Unpacking objects"
msgstr "Packar upp objekt"
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:579
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<flaggor>] [--] [<fil>...]"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:946
msgid "continue refresh even when index needs update"
msgstr "fortsätt uppdatera även när index inte är àjour"
-#: builtin/update-index.c:939
+#: builtin/update-index.c:949
msgid "refresh: ignore submodules"
msgstr "refresh: ignorera undermoduler"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:952
msgid "do not ignore new files"
msgstr "ignorera inte nya filer"
-#: builtin/update-index.c:944
+#: builtin/update-index.c:954
msgid "let files replace directories and vice-versa"
msgstr "låt filer ersätta kataloger och omvänt"
-#: builtin/update-index.c:946
+#: builtin/update-index.c:956
msgid "notice files missing from worktree"
msgstr "lägg märke till filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:948
+#: builtin/update-index.c:958
msgid "refresh even if index contains unmerged entries"
msgstr "uppdatera även om indexet innehåller ej sammanslagna poster"
-#: builtin/update-index.c:951
+#: builtin/update-index.c:961
msgid "refresh stat information"
msgstr "uppdatera statusinformation"
-#: builtin/update-index.c:955
+#: builtin/update-index.c:965
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "som --refresh, men ignorera assume-unchanged-inställning"
-#: builtin/update-index.c:959
+#: builtin/update-index.c:969
msgid "<mode>,<object>,<path>"
msgstr "<läge>,<objekt>,<sökväg>"
-#: builtin/update-index.c:960
+#: builtin/update-index.c:970
msgid "add the specified entry to the index"
msgstr "lägg till angiven post i indexet"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:979
msgid "mark files as \"not changing\""
msgstr "markera filer som \"ändras inte\""
-#: builtin/update-index.c:972
+#: builtin/update-index.c:982
msgid "clear assumed-unchanged bit"
msgstr "rensa \"assume-unchanged\"-biten"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:985
msgid "mark files as \"index-only\""
msgstr "markera filer som \"endast index\""
-#: builtin/update-index.c:978
+#: builtin/update-index.c:988
msgid "clear skip-worktree bit"
msgstr "töm \"skip-worktree\"-biten"
-#: builtin/update-index.c:981
+#: builtin/update-index.c:991
msgid "add to index only; do not add content to object database"
msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen"
-#: builtin/update-index.c:983
+#: builtin/update-index.c:993
msgid "remove named paths even if present in worktree"
msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen"
-#: builtin/update-index.c:985
+#: builtin/update-index.c:995
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "med --stdin: indatarader termineras med null-byte"
-#: builtin/update-index.c:987
+#: builtin/update-index.c:997
msgid "read list of paths to be updated from standard input"
msgstr "läs lista över sökvägar att uppdatera från standard in"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1001
msgid "add entries from standard input to the index"
msgstr "lägg poster från standard in till indexet"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1005
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "återfyll etapp 2 och 3 från angivna sökvägar"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1009
msgid "only update entries that differ from HEAD"
msgstr "uppdatera endast poster som skiljer sig från HEAD"
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1013
msgid "ignore files missing from worktree"
msgstr "ignorera filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1016
msgid "report actions to standard output"
msgstr "rapportera åtgärder på standard ut"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1018
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(för porslin) glöm sparade olösta konflikter"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1022
msgid "write index in this format"
msgstr "skriv index i detta format"
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1024
msgid "enable or disable split index"
msgstr "aktivera eller inaktivera delat index"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1026
msgid "enable/disable untracked cache"
msgstr "aktivera/inaktivera ospårad cache"
-#: builtin/update-index.c:1018
+#: builtin/update-index.c:1028
msgid "test if the filesystem supports untracked cache"
msgstr "testa om filsystemet stöder ospårad cache"
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1030
msgid "enable untracked cache without testing the filesystem"
msgstr "aktivera ospårad cache utan att testa filsystemet"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1032
msgid "write out the index even if is not flagged as changed"
msgstr "skriv ut indexet även om det inte angivits som ändrat"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1034
msgid "enable or disable file system monitor"
msgstr "aktivera eller inaktivera filsystemsövervakning"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1036
msgid "mark files as fsmonitor valid"
msgstr "markera filer som \"fsmonitor valid\""
-#: builtin/update-index.c:1029
+#: builtin/update-index.c:1039
msgid "clear fsmonitor valid bit"
msgstr "töm \"fsmonitor valid\"-bit"
-#: builtin/update-index.c:1127
+#: builtin/update-index.c:1138
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
"core.splitIndex är satt till false; ta bort eller ändra det om du verkligen "
"vill aktivera delat index"
-#: builtin/update-index.c:1136
+#: builtin/update-index.c:1147
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
"core.splitIndex är satt till true; ta bort eller ändra det om du verkligen "
"vill inaktivera delat index"
-#: builtin/update-index.c:1147
+#: builtin/update-index.c:1158
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
"core.untrackedCache är satt till true; ta bort eller ändra det om du "
"verkligen vill inaktivera den ospårade cachen"
-#: builtin/update-index.c:1151
+#: builtin/update-index.c:1162
msgid "Untracked cache disabled"
msgstr "Ospårad cache är inaktiverad"
-#: builtin/update-index.c:1159
+#: builtin/update-index.c:1170
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
"core.untrackedCache är satt till false; ta bort eller ändra det om du "
"verkligen vill aktivera den ospårade cachen"
-#: builtin/update-index.c:1163
+#: builtin/update-index.c:1174
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Ospårad cache är aktiverad för \"%s\""
-#: builtin/update-index.c:1171
+#: builtin/update-index.c:1182
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr "core.fsmonitor inte satt; sätt om du verkligen vill aktivera fsmonitor"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1186
msgid "fsmonitor enabled"
msgstr "fsmonitor aktiverat"
-#: builtin/update-index.c:1178
+#: builtin/update-index.c:1189
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor är satt; ta bort om du verkligen vill inaktivera fsmonitor"
-#: builtin/update-index.c:1182
+#: builtin/update-index.c:1193
msgid "fsmonitor disabled"
msgstr "fsmonitor inaktiverat"
msgid "update the info files from scratch"
msgstr "uppdatera informationsfilerna från grunden"
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<flaggor>] <katalog>"
+
+#: builtin/upload-pack.c:25
+msgid "exit immediately after initial ref advertisement"
+msgstr "avsluta omedelbart efter inledande kungörelse av referenser"
+
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog"
+
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "avbryt överföringen efter <n> sekunders inaktivitet"
+
#: builtin/verify-commit.c:18
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <incheckning>..."
msgstr "visa innehåll för tag"
#: builtin/worktree.c:17
-msgid "git worktree add [<options>] <path> [<branch>]"
-msgstr "git worktree add [<flaggor>] <sökväg> [<gren>]"
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<flaggor>] <sökväg> [<incheckning-igt>]"
#: builtin/worktree.c:18
msgid "git worktree list [<options>]"
msgstr "git worktree lock [<flaggor>] <sökväg>"
#: builtin/worktree.c:20
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <arbetskatalog> <ny-sökväg>"
+
+#: builtin/worktree.c:21
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<flaggor>]"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<flaggor>] <arbetskatalog>"
+
+#: builtin/worktree.c:23
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <sökväg>"
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
-#: builtin/worktree.c:112
+#: builtin/worktree.c:105
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"
-#: builtin/worktree.c:159
+#: builtin/worktree.c:152
msgid "report pruned working trees"
msgstr "rapportera borttagna arbetskataloger"
-#: builtin/worktree.c:161
+#: builtin/worktree.c:154
msgid "expire working trees older than <time>"
msgstr "låt tid gå ut för arbetskataloger äldre än <tid>"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:229
#, c-format
msgid "'%s' already exists"
msgstr "\"%s\" finns redan"
-#: builtin/worktree.c:267
+#: builtin/worktree.c:260
#, c-format
msgid "could not create directory of '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/worktree.c:306
+#: builtin/worktree.c:373 builtin/worktree.c:379
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr "Förbereder arbetskatalog (ny gren \"%s\")"
+
+#: builtin/worktree.c:375
#, c-format
-msgid "Preparing %s (identifier %s)"
-msgstr "Förbereder %s (identifieraren %s)"
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
+msgstr "Förbereder arbetskatalog (återställer gren \"%s\"; var på %s)"
-#: builtin/worktree.c:368
+#: builtin/worktree.c:384
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr "Förbereder arbetskatalog (checkar ut \"%s\")"
+
+#: builtin/worktree.c:390
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
+msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)"
+
+#: builtin/worktree.c:431
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
-#: builtin/worktree.c:370
+#: builtin/worktree.c:434
msgid "create a new branch"
msgstr "skapa en ny gren"
-#: builtin/worktree.c:372
+#: builtin/worktree.c:436
msgid "create or reset a branch"
msgstr "skapa eller återställ en gren"
-#: builtin/worktree.c:374
+#: builtin/worktree.c:438
msgid "populate the new working tree"
msgstr "befolka den nya arbetskatalogen"
-#: builtin/worktree.c:375
+#: builtin/worktree.c:439
msgid "keep the new working tree locked"
msgstr "låt arbetskatalogen förbli låst"
-#: builtin/worktree.c:377
+#: builtin/worktree.c:441
msgid "set up tracking mode (see git-branch(1))"
msgstr "ställ in spårningsläge (se git-branch(1))"
-#: builtin/worktree.c:380
+#: builtin/worktree.c:444
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "försök matcha namn på ny gren mot en fjärrspårande gren"
-#: builtin/worktree.c:388
+#: builtin/worktree.c:452
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B och --detach är ömsesidigt uteslutande"
-#: builtin/worktree.c:453
+#: builtin/worktree.c:511
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track kan endast användas när ny gran skapas"
-#: builtin/worktree.c:553
+#: builtin/worktree.c:611
msgid "reason for locking"
msgstr "orsak till lås"
-#: builtin/worktree.c:565 builtin/worktree.c:598
+#: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710
+#: builtin/worktree.c:850
#, c-format
msgid "'%s' is not a working tree"
msgstr "\"%s\" är inte en arbetskatalog"
-#: builtin/worktree.c:567 builtin/worktree.c:600
+#: builtin/worktree.c:625 builtin/worktree.c:658
msgid "The main working tree cannot be locked or unlocked"
msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
-#: builtin/worktree.c:572
+#: builtin/worktree.c:630
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "\"%s\" är redan låst, orsak: %s"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:632
#, c-format
msgid "'%s' is already locked"
msgstr "\"%s\" är redan låst"
-#: builtin/worktree.c:602
+#: builtin/worktree.c:660
#, c-format
msgid "'%s' is not locked"
msgstr "\"%s\" är inte låst"
+#: builtin/worktree.c:685
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort"
+
+#: builtin/worktree.c:712 builtin/worktree.c:852
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "\"%s\" är inte en huvudarbetskatalog"
+
+#: builtin/worktree.c:717
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "kunde inte lista ut målnamn från \"%s\""
+
+#: builtin/worktree.c:723
+#, c-format
+msgid "target '%s' already exists"
+msgstr "målet \"%s\" finns redan"
+
+#: builtin/worktree.c:730
+#, c-format
+msgid "cannot move a locked working tree, lock reason: %s"
+msgstr "kan inte flytta en låst arbetskatalog, orsak till lås: %s"
+
+#: builtin/worktree.c:732
+msgid "cannot move a locked working tree"
+msgstr "kan inte flytta en låst arbetskatalog"
+
+#: builtin/worktree.c:735
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s"
+
+#: builtin/worktree.c:740
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "misslyckades flytta \"%s\" till \"%s\""
+
+#: builtin/worktree.c:788
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "misslyckades köra \"git status\" på \"%s\""
+
+#: builtin/worktree.c:792
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr "\"%s\" är smutsigt, använd --force för att ta bort det"
+
+#: builtin/worktree.c:797
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "misslyckades köra \"git status\" på \"%s\", kod %d"
+
+#: builtin/worktree.c:808 builtin/worktree.c:822
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "misslyckades ta bort \"%s\""
+
+#: builtin/worktree.c:834
+msgid "force removing even if the worktree is dirty"
+msgstr "tvinga ta bort även om arbetskatalogen är smutsig"
+
+#: builtin/worktree.c:856
+#, c-format
+msgid "cannot remove a locked working tree, lock reason: %s"
+msgstr "kan inte ta bort en låst arbetskatalog, orsak till låset: %s"
+
+#: builtin/worktree.c:858
+msgid "cannot remove a locked working tree"
+msgstr "kan inte ta bort en låst arbetskatalog"
+
+#: builtin/worktree.c:861
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s"
+
#: builtin/write-tree.c:14
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgid "only useful for debugging"
msgstr "endast användbart vid felsökning"
-#: upload-pack.c:24
-msgid "git upload-pack [<options>] <dir>"
-msgstr "git upload-pack [<flaggor>] <katalog>"
-
-#: upload-pack.c:1041
-msgid "quit after a single request/response exchange"
-msgstr "avsluta omedelbart efter första anrop/svar-utväxling"
-
-#: upload-pack.c:1043
-msgid "exit immediately after initial ref advertisement"
-msgstr "avsluta omedelbart efter inledande kungörelse av referenser"
-
-#: upload-pack.c:1045
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog"
-
-#: upload-pack.c:1047
-msgid "interrupt transfer after <n> seconds of inactivity"
-msgstr "avbryt överföringen efter <n> sekunders inaktivitet"
-
#: credential-cache--daemon.c:222
#, c-format
msgid ""
msgid "print debugging messages to stderr"
msgstr "skriv felsökningsmeddelanden på standard fel"
-#: git.c:15
+#: git.c:27
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C <sökväg>] [-c <namn>=<värde>]\n"
+" [--exec-path[=<sökväg>]] [--html-path] [--man-path] [--info-"
+"path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+" [--git-dir=<sökväg>] [--work-tree=<sökväg>] [--namespace=<namn>]\n"
+" <kommando> [<flaggor>]"
+
+#: git.c:34
msgid ""
"'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
"<koncept>\" för att läsa mer om specifika underkommandon och koncept."
-#: http.c:339
+#: git.c:173
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "ingen katalog angavs för --git-dir\n"
+
+#: git.c:187
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "ingen namnrymd angavs för --namespace\n"
+
+#: git.c:201
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr "ingen katalog angavs för --work-tree\n"
+
+#: git.c:215
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "inget prefix angavs för --super-prefix\n"
+
+#: git.c:237
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c förväntar en konfigurationssträng\n"
+
+#: git.c:275
+#, c-format
+msgid "no directory given for -C\n"
+msgstr "ingen katalog angavs för -C\n"
+
+#: git.c:300
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "okänd flagga: %s\n"
+
+#: git.c:765
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr ""
+"expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n"
+
+#: git.c:777
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "misslyckades köra kommandot \"%s\": %s\n"
+
+#: http.c:348
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "http.postbuffer har negativt värde; använder förvalet %d"
-#: http.c:360
+#: http.c:369
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Delegerad styrning stöds inte av cURL < 7.22.0"
-#: http.c:369
+#: http.c:378
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0"
-#: http.c:1791
+#: http.c:1854
#, c-format
msgid ""
"unable to update url base from redirection:\n"
" bad om: %s\n"
" omdirigering: %s"
-#: remote-curl.c:324
+#: remote-curl.c:401
#, c-format
msgid "redirecting to %s"
msgstr "omdirigerar till %s"
-#: list-objects-filter-options.h:54
+#: list-objects-filter-options.h:59
msgid "args"
msgstr "argument"
-#: list-objects-filter-options.h:55
+#: list-objects-filter-options.h:60
msgid "object filtering"
msgstr "objektfiltrering"
-#: common-cmds.h:9
-msgid "start a working area (see also: git help tutorial)"
-msgstr "starta arbetskatalog (se också: git help tutorial)"
+#: parse-options.h:157
+msgid "expiry-date"
+msgstr "giltig-till"
+
+#: parse-options.h:172
+msgid "no-op (backward compatibility)"
+msgstr "ingen funktion (bakåtkompatibilitet)"
+
+#: parse-options.h:251
+msgid "be more verbose"
+msgstr "var mer pratsam"
+
+#: parse-options.h:253
+msgid "be more quiet"
+msgstr "var mer tyst"
+
+#: parse-options.h:259
+msgid "use <n> digits to display SHA-1s"
+msgstr "använd <n> siffror för att visa SHA-1:or"
+
+#: command-list.h:50
+msgid "Add file contents to the index"
+msgstr "Lägg filinnehåll till indexet"
+
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
+msgstr "Tillämpa en serie patchar från en brevlåda"
+
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
+msgstr "Kommentera filrader med incheckningsinformation"
+
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
+msgstr "Tillämpa en patch på filer och/eller indexet"
+
+#: command-list.h:54
+msgid "Import an Arch repository into Git"
+msgstr "Importera ett Arch-arkiv till Git"
+
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
+msgstr "Skapa ett arkiv över filer från ett namngivet träd"
+
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
+msgstr "Använd binärsökning för att hitta ändringen som introducerade ett fel"
+
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
+msgstr "Visa version och författare som sist modifierade varje rad i en fil"
+
+#: command-list.h:58
+msgid "List, create, or delete branches"
+msgstr "Visa, skapa eller ta bort grenar"
+
+#: command-list.h:59
+msgid "Move objects and refs by archive"
+msgstr "Flytta objekt och referenser efter arkiv"
+
+#: command-list.h:60
+msgid "Provide content or type and size information for repository objects"
+msgstr ""
+"Visa innehåller eller typ- och storleksinformation för objekt i arkivet."
+
+#: command-list.h:61
+msgid "Display gitattributes information"
+msgstr "Visa information från gitattributes"
+
+#: command-list.h:62
+msgid "Debug gitignore / exclude files"
+msgstr "Felsök gitignore / exkluderings-filer"
+
+#: command-list.h:63
+msgid "Show canonical names and email addresses of contacts"
+msgstr "Visa kanoniska namn och e-postadresser för kontakter"
+
+#: command-list.h:64
+msgid "Switch branches or restore working tree files"
+msgstr "Byt till en ny gren eller återställ filer i arbetskatalogen"
+
+#: command-list.h:65
+msgid "Copy files from the index to the working tree"
+msgstr "Kopiera filer från indexet till arbetskatalogen"
+
+#: command-list.h:66
+msgid "Ensures that a reference name is well formed"
+msgstr "Se till att referensen är välformad"
+
+#: command-list.h:67
+msgid "Find commits yet to be applied to upstream"
+msgstr "Hitta incheckningar som ännu inte applicerats uppströms"
+
+#: command-list.h:68
+msgid "Apply the changes introduced by some existing commits"
+msgstr "Applicera ändringarna introducerade av befintliga incheckningar"
+
+#: command-list.h:69
+msgid "Graphical alternative to git-commit"
+msgstr "Grafiskt alternativ till git-commit"
+
+#: command-list.h:70
+msgid "Remove untracked files from the working tree"
+msgstr "Ta bort ospårade filer från arbetskatalogen"
+
+#: command-list.h:71
+msgid "Clone a repository into a new directory"
+msgstr "Klona ett arkiv till en ny katalog"
+
+#: command-list.h:72
+msgid "Display data in columns"
+msgstr "Visa data i kolumner"
+
+#: command-list.h:73
+msgid "Record changes to the repository"
+msgstr "Protokollför ändringar i arkivet"
+
+#: command-list.h:74
+msgid "Write and verify Git commit graph files"
+msgstr "Skriv och verifiera Git-incheckningsgraffiler"
+
+#: command-list.h:75
+msgid "Create a new commit object"
+msgstr "Skapa ett nytt incheckningsobjekt"
-#: common-cmds.h:10
-msgid "work on the current change (see also: git help everyday)"
-msgstr "jobba med aktuell förändring (se också: git help everyday)"
+#: command-list.h:76
+msgid "Get and set repository or global options"
+msgstr "Läs och skriv alternativ för arkiv eller globalt"
-#: common-cmds.h:11
-msgid "examine the history and state (see also: git help revisions)"
-msgstr "utforska historiken och tillståndet (se också: git help revisions)"
+#: command-list.h:77
+msgid "Count unpacked number of objects and their disk consumption"
+msgstr "Räkna antal opackade objekt och mängd diskutrymme"
-#: common-cmds.h:12
-msgid "grow, mark and tweak your common history"
-msgstr "utöka, markera och justera din gemensamma historik"
+#: command-list.h:78
+msgid "Retrieve and store user credentials"
+msgstr "Hämta och spara användarreferenser"
-#: common-cmds.h:13
-msgid "collaborate (see also: git help workflows)"
-msgstr "samarbeta (se också: git help workflows)"
+#: command-list.h:79
+msgid "Helper to temporarily store passwords in memory"
+msgstr "Hjälpprogram för att tillfälligt lagra lösenord i minnet"
-#: common-cmds.h:17
-msgid "Add file contents to the index"
-msgstr "Lägg filinnehåll till indexet"
+#: command-list.h:80
+msgid "Helper to store credentials on disk"
+msgstr "Hjälpprogram för att lagra användarreferenser på disk"
-#: common-cmds.h:18
-msgid "Use binary search to find the commit that introduced a bug"
-msgstr "Använd binärsökning för att hitta ändringen som introducerade ett fel"
+#: command-list.h:81
+msgid "Export a single commit to a CVS checkout"
+msgstr "Exportera en enkel incheckning i en CVS-utcheckning"
-#: common-cmds.h:19
-msgid "List, create, or delete branches"
-msgstr "Visa, skapa eller ta bort grenar"
+#: command-list.h:82
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr "Rädda dina data ut ur andra SCM folk älskar att hata"
-#: common-cmds.h:20
-msgid "Switch branches or restore working tree files"
-msgstr "Byt till en ny gren eller återställ filer i arbetskatalogen"
+#: command-list.h:83
+msgid "A CVS server emulator for Git"
+msgstr "En CVS-serveremulator för Git"
-#: common-cmds.h:21
-msgid "Clone a repository into a new directory"
-msgstr "Klona ett arkiv till en ny katalog"
+#: command-list.h:84
+msgid "A really simple server for Git repositories"
+msgstr "En riktigt enkel server för Git-arkiv"
-#: common-cmds.h:22
-msgid "Record changes to the repository"
-msgstr "Protokollför ändringar i arkivet"
+#: command-list.h:85
+msgid "Give an object a human readable name based on an available ref"
+msgstr "Ge ett objekt användarläsbara namn baserade på en tillgänglig referens"
-#: common-cmds.h:23
+#: command-list.h:86
msgid "Show changes between commits, commit and working tree, etc"
msgstr "Visa ändringar mellan incheckningar, med arbetskatalogen, osv"
-#: common-cmds.h:24
+#: command-list.h:87
+msgid "Compares files in the working tree and the index"
+msgstr "Jämför filer i arbetskatalogen och indexet"
+
+#: command-list.h:88
+msgid "Compare a tree to the working tree or index"
+msgstr "Jämför en träd med arbetskatalogen eller indexet"
+
+#: command-list.h:89
+msgid "Compares the content and mode of blobs found via two tree objects"
+msgstr "Visar innehåll och läge för blob:ar som hittats via två trädobjekt"
+
+#: command-list.h:90
+msgid "Show changes using common diff tools"
+msgstr "Visa ändringar med vanliga diff-verktyg"
+
+#: command-list.h:91
+msgid "Git data exporter"
+msgstr "Exporterare för Git-data"
+
+#: command-list.h:92
+msgid "Backend for fast Git data importers"
+msgstr "Bakända för snabba Git-dataimporterare"
+
+#: command-list.h:93
msgid "Download objects and refs from another repository"
msgstr "Hämta objekt och referenser från annat arkiv"
-#: common-cmds.h:25
+#: command-list.h:94
+msgid "Receive missing objects from another repository"
+msgstr "Ta emot saknade objekt från annat arkiv"
+
+#: command-list.h:95
+msgid "Rewrite branches"
+msgstr "Skriv om grenar"
+
+#: command-list.h:96
+msgid "Produce a merge commit message"
+msgstr "Skapa incheckningsmeddelande för en sammanslagning"
+
+#: command-list.h:97
+msgid "Output information on each ref"
+msgstr "Visa information för varje referens"
+
+#: command-list.h:98
+msgid "Prepare patches for e-mail submission"
+msgstr "Förbered patchar för insändning via e-post"
+
+#: command-list.h:99
+msgid "Verifies the connectivity and validity of the objects in the database"
+msgstr "Bekräftar konnektivitet och validitet för objektet i databasen"
+
+#: command-list.h:100
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr "Städa onödiga filer och optimera det lokala arkivet"
+
+#: command-list.h:101
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr "Hämta inchecknings-ID från ett arkiv skapat med git-archive"
+
+#: command-list.h:102
msgid "Print lines matching a pattern"
msgstr "Visa rader som motsvarar mönster"
-#: common-cmds.h:26
+#: command-list.h:103
+msgid "A portable graphical interface to Git"
+msgstr "Ett portabelt grafiskt gränssnitt för Git"
+
+#: command-list.h:104
+msgid "Compute object ID and optionally creates a blob from a file"
+msgstr "Beräkna objekt-ID och möjligen skapa en blob från en fil"
+
+#: command-list.h:105
+msgid "Display help information about Git"
+msgstr "Visa hjälpinformation om Git"
+
+#: command-list.h:106
+msgid "Server side implementation of Git over HTTP"
+msgstr "Serversideimplementation av Git över HTTP"
+
+#: command-list.h:107
+msgid "Download from a remote Git repository via HTTP"
+msgstr "Hämta objekt och referenser från annat Git-arkiv över HTTP"
+
+#: command-list.h:108
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr "Sänd objekt över HTTP/DAV till ett annat arkiv"
+
+#: command-list.h:109
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr "Sänd en samling patchar från stdin till en IMAP-mapp"
+
+#: command-list.h:110
+msgid "Build pack index file for an existing packed archive"
+msgstr "SKapa pack-indexfiler för ett befintligt packat arkiv"
+
+#: command-list.h:111
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt"
-#: common-cmds.h:27
+#: command-list.h:112
+msgid "Instantly browse your working repository in gitweb"
+msgstr "Omedelbart bläddra i din arbetskatalog med gitweb"
+
+#: command-list.h:113
+msgid "add or parse structured information in commit messages"
+msgstr ""
+"lägg till eller tolka strukturerad information i incheckningsmeddelanden"
+
+#: command-list.h:114
+msgid "The Git repository browser"
+msgstr "Bläddraren för Git-arkiv"
+
+#: command-list.h:115
msgid "Show commit logs"
msgstr "Visa incheckningsloggar"
-#: common-cmds.h:28
+#: command-list.h:116
+msgid "Show information about files in the index and the working tree"
+msgstr "Visa information om filer i indexet och arbetskatalogen"
+
+#: command-list.h:117
+msgid "List references in a remote repository"
+msgstr "Lista referenser i ett fjärrarkiv"
+
+#: command-list.h:118
+msgid "List the contents of a tree object"
+msgstr "Visa innehållet i ett trädobjekt"
+
+#: command-list.h:119
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr "Hämta patch och ägarskap från ett enkelt e-postmeddelande"
+
+#: command-list.h:120
+msgid "Simple UNIX mbox splitter program"
+msgstr "Enkelt program för att dela en UNIX mbox"
+
+#: command-list.h:121
msgid "Join two or more development histories together"
msgstr "Slå ihop två eller flera utvecklingshistorier"
-#: common-cmds.h:29
+#: command-list.h:122
+msgid "Find as good common ancestors as possible for a merge"
+msgstr "Hitta en så bra anfader som möjligt för sammanslagning"
+
+#: command-list.h:123
+msgid "Run a three-way file merge"
+msgstr "Kör en trevägs-filsammanslagning"
+
+#: command-list.h:124
+msgid "Run a merge for files needing merging"
+msgstr "Kör en sammanslagning för filer som behöver det"
+
+#: command-list.h:125
+msgid "The standard helper program to use with git-merge-index"
+msgstr "Förvalt hjälpprogram att använda tillsammans med git-merge-index"
+
+#: command-list.h:126
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr "Kör verktyg för lösning av sammanslagningskonflikter"
+
+#: command-list.h:127
+msgid "Show three-way merge without touching index"
+msgstr "Visa trevägssammanslagning utan att röra indexet"
+
+#: command-list.h:128
+msgid "Creates a tag object"
+msgstr "Skapar ett taggobjekt"
+
+#: command-list.h:129
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr "Bygg ett trädobjekt från ls-tree-formaterad text"
+
+#: command-list.h:130
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Flytta eller byt namn på en fil, katalog eller symbolisk länk"
-#: common-cmds.h:30
+#: command-list.h:131
+msgid "Find symbolic names for given revs"
+msgstr "Hitta symboliska namn för givna referenser"
+
+#: command-list.h:132
+msgid "Add or inspect object notes"
+msgstr "Lägg till eller inspektera objektanteckningar"
+
+#: command-list.h:133
+msgid "Import from and submit to Perforce repositories"
+msgstr "Importera från eller sänd till Perforce-arkiv"
+
+#: command-list.h:134
+msgid "Create a packed archive of objects"
+msgstr "Skapa ett packat arkiv med objekt"
+
+#: command-list.h:135
+msgid "Find redundant pack files"
+msgstr "Hitta redundanta pack-filer"
+
+#: command-list.h:136
+msgid "Pack heads and tags for efficient repository access"
+msgstr "Packa huvuden och taggar för effektiv arkivåtkomst"
+
+#: command-list.h:137
+msgid "Routines to help parsing remote repository access parameters"
+msgstr ""
+"Rutiner för att göra det lättare att tolka åtkomstparametrar för fjärrarkiv"
+
+#: command-list.h:138
+msgid "Compute unique ID for a patch"
+msgstr "Beräkna unik ID för en patch"
+
+#: command-list.h:139
+msgid "Prune all unreachable objects from the object database"
+msgstr "Ta bort alla onåbara objekt från objektdatabasen"
+
+#: command-list.h:140
+msgid "Remove extra objects that are already in pack files"
+msgstr "Ta bort extraobjekt som redan finns i pack-filerna"
+
+#: command-list.h:141
msgid "Fetch from and integrate with another repository or a local branch"
msgstr "Hämta från och integrera med annat arkiv eller en lokal gren"
-#: common-cmds.h:31
+#: command-list.h:142
msgid "Update remote refs along with associated objects"
msgstr "Uppdatera fjärr-referenser och tillhörande objekt"
-#: common-cmds.h:32
+#: command-list.h:143
+msgid "Applies a quilt patchset onto the current branch"
+msgstr "Tillämpar en quilt-patchuppsättning på aktiv gren"
+
+#: command-list.h:144
+msgid "Reads tree information into the index"
+msgstr "Läser trädinformation in i indexet"
+
+#: command-list.h:145
msgid "Reapply commits on top of another base tip"
msgstr "Applicera incheckningar på nytt ovanpå en annan bastopp"
-#: common-cmds.h:33
+#: command-list.h:146
+msgid "Receive what is pushed into the repository"
+msgstr "Ta emot det som sänds till arkivet"
+
+#: command-list.h:147
+msgid "Manage reflog information"
+msgstr "Hantera referenslogg-information"
+
+#: command-list.h:148
+msgid "Manage set of tracked repositories"
+msgstr "Hantera uppsättningen spårade arkiv"
+
+#: command-list.h:149
+msgid "Pack unpacked objects in a repository"
+msgstr "Packa opackade objekt i ett arkiv"
+
+#: command-list.h:150
+msgid "Create, list, delete refs to replace objects"
+msgstr "Skapa, visa, ta bort referenser för att ersätta objekt"
+
+#: command-list.h:151
+msgid "Generates a summary of pending changes"
+msgstr "Skapar en sammanfattning av väntande ändringar"
+
+#: command-list.h:152
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr "Återanvänd sparad lösning av sammanslagningskonflikter"
+
+#: command-list.h:153
msgid "Reset current HEAD to the specified state"
msgstr "Återställ aktuell HEAD till angivet tillstånd"
-#: common-cmds.h:34
+#: command-list.h:154
+msgid "Revert some existing commits"
+msgstr "Återställ några befintliga incheckningar"
+
+#: command-list.h:155
+msgid "Lists commit objects in reverse chronological order"
+msgstr "Visa incheckningsobjekt i omvänd kronologisk ordning"
+
+#: command-list.h:156
+msgid "Pick out and massage parameters"
+msgstr "Plocka ut och massera parametrar"
+
+#: command-list.h:157
msgid "Remove files from the working tree and from the index"
msgstr "Ta bort filer från arbetskatalogen och från indexet"
-#: common-cmds.h:35
+#: command-list.h:158
+msgid "Send a collection of patches as emails"
+msgstr "Sänd en uppsättning patchar som e-post"
+
+#: command-list.h:159
+msgid "Push objects over Git protocol to another repository"
+msgstr "Sänd objekt över Git-protokollet till annat arkiv"
+
+#: command-list.h:160
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git"
+
+#: command-list.h:161
+msgid "Summarize 'git log' output"
+msgstr "Summera \"git log\"-utdata"
+
+#: command-list.h:162
msgid "Show various types of objects"
msgstr "Visa olika sorters objekt"
-#: common-cmds.h:36
+#: command-list.h:163
+msgid "Show branches and their commits"
+msgstr "Visa grenar och deras incheckningar"
+
+#: command-list.h:164
+msgid "Show packed archive index"
+msgstr "Skapa packat arkivindex"
+
+#: command-list.h:165
+msgid "List references in a local repository"
+msgstr "Visa referenser i ett lokalt arkiv"
+
+#: command-list.h:166
+msgid "Git's i18n setup code for shell scripts"
+msgstr "Git:s i18n-startkod för skalskript"
+
+#: command-list.h:167
+msgid "Common Git shell script setup code"
+msgstr "Gemensam skriptstartkod för Git"
+
+#: command-list.h:168
+msgid "Stash the changes in a dirty working directory away"
+msgstr "Spara undan ändringar i en lortig arbetskatalog"
+
+#: command-list.h:169
+msgid "Add file contents to the staging area"
+msgstr "Lägg filinnehållet till indexet"
+
+#: command-list.h:170
msgid "Show the working tree status"
msgstr "Visa status för arbetskatalogen"
-#: common-cmds.h:37
+#: command-list.h:171
+msgid "Remove unnecessary whitespace"
+msgstr "Ta bort onödiga blanksteg"
+
+#: command-list.h:172
+msgid "Initialize, update or inspect submodules"
+msgstr "Initiera, uppdatera eller inspektera undermoduler"
+
+#: command-list.h:173
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git"
+
+#: command-list.h:174
+msgid "Read, modify and delete symbolic refs"
+msgstr "Läs, modifiera eller ta bort symbolisk referens"
+
+#: command-list.h:175
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt"
-#: parse-options.h:145
-msgid "expiry-date"
-msgstr "giltig-till"
+#: command-list.h:176
+msgid "Creates a temporary file with a blob's contents"
+msgstr "Skapar temporära filer med innehållet från en blob"
-#: parse-options.h:160
-msgid "no-op (backward compatibility)"
-msgstr "ingen funktion (bakåtkompatibilitet)"
+#: command-list.h:177
+msgid "Unpack objects from a packed archive"
+msgstr "Packa upp objekt från ett pakat arkiv"
-#: parse-options.h:238
-msgid "be more verbose"
-msgstr "var mer pratsam"
+#: command-list.h:178
+msgid "Register file contents in the working tree to the index"
+msgstr "Registrera filinnehållet från arbetskatalogen i indexet"
-#: parse-options.h:240
-msgid "be more quiet"
-msgstr "var mer tyst"
+#: command-list.h:179
+msgid "Update the object name stored in a ref safely"
+msgstr "Uppdatera objektnamnet i en referens på ett säkert sätt"
-#: parse-options.h:246
-msgid "use <n> digits to display SHA-1s"
-msgstr "använd <n> siffror för att visa SHA-1:or"
+#: command-list.h:180
+msgid "Update auxiliary info file to help dumb servers"
+msgstr "Uppdatera tilläggsinfofil för att hjälpa dumma servrar"
+
+#: command-list.h:181
+msgid "Send archive back to git-archive"
+msgstr "Sänd arkivet tillbaka till git-archive"
+
+#: command-list.h:182
+msgid "Send objects packed back to git-fetch-pack"
+msgstr "Sänd packade objekt tillbaka till git-fetch-pack"
+
+#: command-list.h:183
+msgid "Show a Git logical variable"
+msgstr "Visa en logisk Git-variabel"
+
+#: command-list.h:184
+msgid "Check the GPG signature of commits"
+msgstr "Kontrollera GPG-signaturer för incheckningar"
+
+#: command-list.h:185
+msgid "Validate packed Git archive files"
+msgstr "Bekräfta packade Git-arkivfiler"
+
+#: command-list.h:186
+msgid "Check the GPG signature of tags"
+msgstr "Kontrollera GPG-signaturer i taggar"
+
+#: command-list.h:187
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)"
+
+#: command-list.h:188
+msgid "Show logs with difference each commit introduces"
+msgstr "Visa loggar med differenser varje incheckning introducerar"
+
+#: command-list.h:189
+msgid "Manage multiple working trees"
+msgstr "Hantera ytterligare arbetskataloger"
+
+#: command-list.h:190
+msgid "Create a tree object from the current index"
+msgstr "Skapa ett trädobjekt från aktuellt index"
+
+#: command-list.h:191
+msgid "Defining attributes per path"
+msgstr "Definierar attribut per sökväg"
+
+#: command-list.h:192
+msgid "Git command-line interface and conventions"
+msgstr "Gits kommandoradsgränssnitt och -konventioner"
+
+#: command-list.h:193
+msgid "A Git core tutorial for developers"
+msgstr "Grundläggande Git-handledning för utvecklare"
+
+#: command-list.h:194
+msgid "Git for CVS users"
+msgstr "Git för CVS-användare"
+
+#: command-list.h:195
+msgid "Tweaking diff output"
+msgstr "Justrea diff-utdata"
+
+#: command-list.h:196
+msgid "A useful minimum set of commands for Everyday Git"
+msgstr "Ett användbart minsta uppsättning kommandon för vardags-Git"
+
+#: command-list.h:197
+msgid "A Git Glossary"
+msgstr "En Git-ordlista"
+
+#: command-list.h:198
+msgid "Hooks used by Git"
+msgstr "Krokar som används av Git"
+
+#: command-list.h:199
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "Ange avsiktligen ospårade filer att ignorera"
+
+#: command-list.h:200
+msgid "Defining submodule properties"
+msgstr "Ange egenskaper för undermoduler"
+
+#: command-list.h:201
+msgid "Git namespaces"
+msgstr "Git-namnrymder"
+
+#: command-list.h:202
+msgid "Git Repository Layout"
+msgstr "Gits arkivlayout"
+
+#: command-list.h:203
+msgid "Specifying revisions and ranges for Git"
+msgstr "Ange versioner och intervall i Git"
+
+#: command-list.h:204
+msgid "A tutorial introduction to Git: part two"
+msgstr "Introduktion till Git: del två"
+
+#: command-list.h:205
+msgid "A tutorial introduction to Git"
+msgstr "Introduktion till Git"
+
+#: command-list.h:206
+msgid "An overview of recommended workflows with Git"
+msgstr "Översikt över rekommenderade arbetsflöden med Git"
#: rerere.h:40
msgid "update the index with reused conflict resolution if possible"
msgid "Simple merge did not work, trying automatic merge."
msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning."
-#: git-rebase.sh:58
+#: git-rebase.sh:61
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"För att avbryta och återgå till där du var före ombaseringen, kör \"git "
"rebase --abort\"."
-#: git-rebase.sh:160 git-rebase.sh:402
+#: git-rebase.sh:173 git-rebase.sh:442
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Kunde inte flytta tillbaka till $head_name"
-#: git-rebase.sh:171
+#: git-rebase.sh:184
msgid "Applied autostash."
msgstr "Tillämpade autostash."
-#: git-rebase.sh:174
+#: git-rebase.sh:187
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Kan inte spara $stash_sha1"
-#: git-rebase.sh:214
+#: git-rebase.sh:229
msgid "The pre-rebase hook refused to rebase."
msgstr "Kroken pre-rebase vägrade ombaseringen."
-#: git-rebase.sh:219
+#: git-rebase.sh:234
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera."
-#: git-rebase.sh:363
+#: git-rebase.sh:403
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
-#: git-rebase.sh:374
+#: git-rebase.sh:414
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
-#: git-rebase.sh:381
+#: git-rebase.sh:421
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
-#: git-rebase.sh:384
+#: git-rebase.sh:424
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"Du måste redigera alla sammanslagningskonflikter och\n"
"därefter markera dem som lösta med git add"
-#: git-rebase.sh:424
+#: git-rebase.sh:468
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
"något av värde där."
-#: git-rebase.sh:480
+#: git-rebase.sh:509
+msgid "error: cannot combine '--signoff' with '--preserve-merges'"
+msgstr "fel: kan inte kombinera \"--signoff\" med \"--preserve-merges\""
+
+#: git-rebase.sh:537
#, sh-format
msgid "invalid upstream '$upstream_name'"
msgstr "ogiltig uppström \"$upstream_name\""
-#: git-rebase.sh:504
+#: git-rebase.sh:561
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: mer än en sammanslagningsbas finns"
-#: git-rebase.sh:507 git-rebase.sh:511
+#: git-rebase.sh:564 git-rebase.sh:568
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: ingen sammanslagningsbas finns"
-#: git-rebase.sh:516
+#: git-rebase.sh:573
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Peka på en giltig incheckning: $onto_name"
-#: git-rebase.sh:542
+#: git-rebase.sh:599
#, sh-format
msgid "fatal: no such branch/commit '$branch_name'"
msgstr "ödesdigert: ingen sådan gren/incheckning: $branch_name"
-#: git-rebase.sh:575
+#: git-rebase.sh:632
msgid "Cannot autostash"
msgstr "Kan inte utföra \"autostash\""
-#: git-rebase.sh:580
+#: git-rebase.sh:637
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Skapade autostash: $stash_abbrev"
-#: git-rebase.sh:584
+#: git-rebase.sh:641
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
-#: git-rebase.sh:607
+#: git-rebase.sh:664
#, sh-format
msgid "HEAD is up to date."
msgstr "HEAD är à jour."
-#: git-rebase.sh:609
+#: git-rebase.sh:666
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Aktuell gren $branch_name är à jour."
-#: git-rebase.sh:617
+#: git-rebase.sh:674
#, sh-format
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD är à jour, ombasering framtvingad."
-#: git-rebase.sh:619
+#: git-rebase.sh:676
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
-#: git-rebase.sh:631
+#: git-rebase.sh:688
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Ändringar från $mb till $onto:"
-#: git-rebase.sh:640
+#: git-rebase.sh:697
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
-#: git-rebase.sh:650
+#: git-rebase.sh:707
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Snabbspolade $branch_name till $onto_name."
msgid "Saved working directory and index state $stash_msg"
msgstr "Sparade arbetskatalogen och indexstatus $stash_msg"
-#: git-stash.sh:341
+#: git-stash.sh:342
msgid "Cannot remove worktree changes"
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
-#: git-stash.sh:489
+#: git-stash.sh:490
#, sh-format
msgid "unknown option: $opt"
msgstr "okänd flagga: $opt"
-#: git-stash.sh:502
+#: git-stash.sh:503
msgid "No stash entries found."
msgstr "Inga \"stash”-poster hittades."
-#: git-stash.sh:509
+#: git-stash.sh:510
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "För många revisioner angivna: $REV"
-#: git-stash.sh:524
+#: git-stash.sh:525
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference är inte en giltig referens"
-#: git-stash.sh:552
+#: git-stash.sh:553
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
-#: git-stash.sh:563
+#: git-stash.sh:564
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "\"$args\" är inte en \"stash\"-referens"
-#: git-stash.sh:571
+#: git-stash.sh:572
msgid "unable to refresh index"
msgstr "kan inte uppdatera indexet"
-#: git-stash.sh:575
+#: git-stash.sh:576
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning"
-#: git-stash.sh:583
+#: git-stash.sh:584
msgid "Conflicts in index. Try without --index."
msgstr "Konflikter i indexet. Testa utan --index."
-#: git-stash.sh:585
+#: git-stash.sh:586
msgid "Could not save index tree"
msgstr "Kunde inte spara indexträd"
-#: git-stash.sh:594
+#: git-stash.sh:595
msgid "Could not restore untracked files from stash entry"
msgstr "Kunde inte återställa ospårade filer från stash-post"
-#: git-stash.sh:619
+#: git-stash.sh:620
msgid "Cannot unstage modified files"
msgstr "Kan inte ta bort ändrade filer ur kön"
-#: git-stash.sh:634
+#: git-stash.sh:635
msgid "Index was not unstashed."
msgstr "Indexet har inte tagits ur kön."
-#: git-stash.sh:648
+#: git-stash.sh:649
msgid "The stash entry is kept in case you need it again."
msgstr "Stash-posten behålls ifall du behöver den igen."
-#: git-stash.sh:657
+#: git-stash.sh:658
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Kastade ${REV} ($s)"
-#: git-stash.sh:658
+#: git-stash.sh:659
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Kunde inte kasta \"stash\"-post"
-#: git-stash.sh:666
+#: git-stash.sh:667
msgid "No branch name specified"
msgstr "Inget grennamn angavs"
-#: git-stash.sh:745
+#: git-stash.sh:746
msgid "(To restore them type \"git stash apply\")"
msgstr "(För att återställa dem, skriv \"git stash apply\")"
-#: git-submodule.sh:181
+#: git-submodule.sh:188
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå"
-#: git-submodule.sh:191
+#: git-submodule.sh:198
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"
-#: git-submodule.sh:210
+#: git-submodule.sh:217
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "\"$sm_path\" finns redan i indexet"
-#: git-submodule.sh:213
+#: git-submodule.sh:220
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "\"$sm_path\" finns redan i indexet och är inte en undermodul"
-#: git-submodule.sh:219
+#: git-submodule.sh:226
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"Använd -f om du verkligen vill lägga till den."
-#: git-submodule.sh:237
+#: git-submodule.sh:249
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"
-#: git-submodule.sh:239
+#: git-submodule.sh:251
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"
-#: git-submodule.sh:247
+#: git-submodule.sh:259
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):"
-#: git-submodule.sh:249
+#: git-submodule.sh:261
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n"
"flaggan \"--name\"."
-#: git-submodule.sh:255
+#: git-submodule.sh:267
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt."
-#: git-submodule.sh:267
+#: git-submodule.sh:279
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kan inte checka ut undermodulen \"$sm_path\""
-#: git-submodule.sh:272
+#: git-submodule.sh:284
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
-#: git-submodule.sh:281
+#: git-submodule.sh:293
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Misslyckades registrera undermodulen \"$sm_path\""
-#: git-submodule.sh:342
+#: git-submodule.sh:354
#, sh-format
msgid "Entering '$displaypath'"
msgstr "Går in i \"$displaypath\""
-#: git-submodule.sh:362
+#: git-submodule.sh:374
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
"Stoppar på \"$displaypath\"; skriptet returnerade en status skild från noll."
-#: git-submodule.sh:433
-#, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr "sökvägsangivelse och --all är inkompatibla"
-
-#: git-submodule.sh:438
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
-
-#: git-submodule.sh:458
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains a .git directory\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-"Undermodulsarbetskatalogen \"$displaypath\" innehåller en .git-katalog\n"
-"(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
-
-#: git-submodule.sh:466
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr ""
-"Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" "
-"kastar bort dem"
-
-#: git-submodule.sh:469
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr "Rensade katalogen \"$displaypath\""
-
-#: git-submodule.sh:470
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\""
-
-#: git-submodule.sh:473
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\""
-
-#: git-submodule.sh:482
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr ""
-"Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\""
-
-#: git-submodule.sh:637
+#: git-submodule.sh:600
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:647
+#: git-submodule.sh:610
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
-#: git-submodule.sh:652
+#: git-submodule.sh:615
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
"undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:670
+#: git-submodule.sh:633
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\""
-#: git-submodule.sh:676
+#: git-submodule.sh:639
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. "
"Direkt hämtning av incheckningen misslyckades."
-#: git-submodule.sh:683
+#: git-submodule.sh:646
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:684
+#: git-submodule.sh:647
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
-#: git-submodule.sh:688
+#: git-submodule.sh:651
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:689
+#: git-submodule.sh:652
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
-#: git-submodule.sh:694
+#: git-submodule.sh:657
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:695
+#: git-submodule.sh:658
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
-#: git-submodule.sh:700
+#: git-submodule.sh:663
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:701
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
-#: git-submodule.sh:732
+#: git-submodule.sh:695
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:828
+#: git-submodule.sh:791
msgid "The --cached option cannot be used with the --files option"
msgstr "Flaggan --cached kan inte användas med flaggan --files"
-#: git-submodule.sh:880
+#: git-submodule.sh:843
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "oväntat läge $mod_dst"
-#: git-submodule.sh:900
+#: git-submodule.sh:863
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src"
-#: git-submodule.sh:903
+#: git-submodule.sh:866
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst"
-#: git-submodule.sh:906
+#: git-submodule.sh:869
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Varning: $display_name innehåller inte incheckningarna $sha1_src och "
"$sha1_dst"
-#: git-submodule.sh:1077
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "Synkroniserar undermodul-url för \"$displaypath\""
-
#: git-parse-remote.sh:89
#, sh-format
msgid "See git-${cmd}(1) for details."
msgstr "Se git-${cmd}(1) för detaljer."
-#: git-rebase--interactive.sh:140
+#: git-rebase--interactive.sh:142
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "Ombaserar ($new_count/$total)"
-#: git-rebase--interactive.sh:156
+#: git-rebase--interactive.sh:158
msgid ""
"\n"
"Commands:\n"
-"p, pick = use commit\n"
-"r, reword = use commit, but edit the commit message\n"
-"e, edit = use commit, but stop for amending\n"
-"s, squash = use commit, but meld into previous commit\n"
-"f, fixup = like \"squash\", but discard this commit's log message\n"
-"x, exec = run command (the rest of the line) using shell\n"
-"d, drop = remove commit\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <command> = run command (the rest of the line) using shell\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". create a merge commit using the original merge commit's\n"
+". message (or the oneline, if no original merge commit was\n"
+". specified). Use -c <commit> to reword the commit message.\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
"\n"
"Kommandon:\n"
-"p, pick = använd incheckning\n"
-"r, reword = använd incheckning, men redigera incheckningsmeddelandet\n"
-"e, edit = använd incheckning, men stanna för tillägg\n"
-"s, squash = använd incheckning, men infoga i föregående incheckning\n"
-"f, fixup = som \"squash\", men förkasta incheckningsmeddelandet\n"
-"x, exec = kör kommando (resten av raden) i skalet\n"
-"d, drop = ta bort incheckning\n"
+"p, pick <incheckning> = använd incheckning\n"
+"r, reword <incheckning> = använd incheckning, men redigera "
+"incheckningsmeddelandet\n"
+"e, edit <incheckning> = använd incheckning, men stanna för tillägg\n"
+"s, squash <incheckning> = använd incheckning, men infoga i föregående "
+"incheckning\n"
+"f, fixup <incheckning> = som \"squash\", men förkasta "
+"incheckningsmeddelandet\n"
+"x, exec <kommando> = kör kommando (resten av raden) i skalet\n"
+"d, drop <incheckning> = ta bort incheckning\n"
+"l, label <etikett> = ge aktuellt HEAD ett namn\n"
+"t, reset <etikett> = återställ HEAD till en etikett\n"
+"m, merge [-C <incheckning> | -c <incheckning>] <etikett> [# <enrads>]\n"
+". skapa en sammanslagning med ursprungligt meddelande (eller\n"
+". enrads, om inget incheckningsmeddelande angavs). Använd\n"
+". -v <incheckning> för att skriva om meddelandet.\n"
"\n"
"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
-#: git-rebase--interactive.sh:171
+#: git-rebase--interactive.sh:179
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
"Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en "
"incheckning.\n"
-#: git-rebase--interactive.sh:175
+#: git-rebase--interactive.sh:183
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
"\n"
"Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"
-#: git-rebase--interactive.sh:211
+#: git-rebase--interactive.sh:221
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:236
+#: git-rebase--interactive.sh:246
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: inte en incheckning som kan väljas"
-#: git-rebase--interactive.sh:275
+#: git-rebase--interactive.sh:285
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Felaktigt incheckningsnamn: $sha1"
-#: git-rebase--interactive.sh:317
+#: git-rebase--interactive.sh:325
msgid "Cannot write current commit's replacement sha1"
msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning"
-#: git-rebase--interactive.sh:369
+#: git-rebase--interactive.sh:376
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Snabbspolade till $sha1"
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:378
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "Kan inte snabbspola till $sha1"
-#: git-rebase--interactive.sh:380
+#: git-rebase--interactive.sh:387
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "Kan inte flytta HEAD till $first_parent"
-#: git-rebase--interactive.sh:385
+#: git-rebase--interactive.sh:392
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1"
-#: git-rebase--interactive.sh:400
+#: git-rebase--interactive.sh:410
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Fel när sammanslagningen $sha1 skulle göras om"
-#: git-rebase--interactive.sh:408
+#: git-rebase--interactive.sh:419
#, sh-format
msgid "Could not pick $sha1"
msgstr "Kunde inte välja $sha1"
-#: git-rebase--interactive.sh:417
+#: git-rebase--interactive.sh:428
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Det här är incheckningsmeddelande ${n}:"
-#: git-rebase--interactive.sh:422
+#: git-rebase--interactive.sh:433
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Incheckningsmeddelande ${n} kommer hoppas över:"
-#: git-rebase--interactive.sh:433
+#: git-rebase--interactive.sh:444
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Det här är en kombination av $count incheckning."
msgstr[1] "Det här är en kombination av $count incheckningar."
-#: git-rebase--interactive.sh:442
+#: git-rebase--interactive.sh:453
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Kan inte skriva $fixup_msg"
-#: git-rebase--interactive.sh:445
+#: git-rebase--interactive.sh:456
msgid "This is a combination of 2 commits."
msgstr "Det här är en kombination av 2 incheckningar."
-#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
-#: git-rebase--interactive.sh:532
+#: git-rebase--interactive.sh:497 git-rebase--interactive.sh:540
+#: git-rebase--interactive.sh:543
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Kunde inte tillämpa $sha1... $rest"
-#: git-rebase--interactive.sh:560
+#: git-rebase--interactive.sh:572
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n"
"du måste lösa problemet innan du kan skriva om incheckningsmeddelandet."
-#: git-rebase--interactive.sh:575
+#: git-rebase--interactive.sh:587
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Stoppade på $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:590
+#: git-rebase--interactive.sh:602
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning"
-#: git-rebase--interactive.sh:632
+#: git-rebase--interactive.sh:644
#, sh-format
msgid "Executing: $rest"
msgstr "Kör: $rest"
-#: git-rebase--interactive.sh:640
+#: git-rebase--interactive.sh:652
#, sh-format
msgid "Execution failed: $rest"
msgstr "Körning misslyckades: $rest"
-#: git-rebase--interactive.sh:642
+#: git-rebase--interactive.sh:654
msgid "and made changes to the index and/or the working tree"
msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen"
-#: git-rebase--interactive.sh:644
+#: git-rebase--interactive.sh:656
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:669
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:680
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Okänt kommando: $command $sha1 $rest"
-#: git-rebase--interactive.sh:669
+#: git-rebase--interactive.sh:681
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Rätta det med \"git rebase --edit-todo\"."
-#: git-rebase--interactive.sh:704
+#: git-rebase--interactive.sh:716
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Lyckades ombasera och uppdatera $head_name."
-#: git-rebase--interactive.sh:728
+#: git-rebase--interactive.sh:740
msgid "could not detach HEAD"
msgstr "kunde inte koppla från HEAD"
-#: git-rebase--interactive.sh:763
+#: git-rebase--interactive.sh:778
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Kunde inte ta bort CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:768
+#: git-rebase--interactive.sh:783
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:785
+#: git-rebase--interactive.sh:800
msgid "Error trying to find the author identity to amend commit"
msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning"
-#: git-rebase--interactive.sh:790
+#: git-rebase--interactive.sh:805
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
"först och kör sedan \"git rebase --continute\" igen."
-#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
+#: git-rebase--interactive.sh:810 git-rebase--interactive.sh:814
msgid "Could not commit staged changes."
msgstr "Kunde inte checka in köade ändringar."
-#: git-rebase--interactive.sh:827
+#: git-rebase--interactive.sh:843
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
+#: git-rebase--interactive.sh:851 git-rebase--interactive.sh:937
msgid "Could not execute editor"
msgstr "Kunde inte starta textredigerare"
-#: git-rebase--interactive.sh:848
+#: git-rebase--interactive.sh:872
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Kunde inte checka ut $switch_to"
-#: git-rebase--interactive.sh:853
+#: git-rebase--interactive.sh:879
msgid "No HEAD?"
msgstr "Inget HEAD?"
-#: git-rebase--interactive.sh:854
+#: git-rebase--interactive.sh:880
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Kunde inte skapa temporär $state_dir"
-#: git-rebase--interactive.sh:856
+#: git-rebase--interactive.sh:883
msgid "Could not mark as interactive"
msgstr "Kunde inte markera som interaktiv"
-#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
-msgid "Could not init rewritten commits"
-msgstr "Kunde inte initiera omskrivna incheckningar"
-
-#: git-rebase--interactive.sh:897
-msgid "Could not generate todo list"
-msgstr "Kunde inte skapa todo-lista"
-
-#: git-rebase--interactive.sh:973
+#: git-rebase--interactive.sh:915
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)"
msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)"
-#: git-rebase--interactive.sh:978
+#: git-rebase--interactive.sh:920
msgid ""
"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
+"\tHowever, if you remove everything, the rebase will be aborted.\n"
"\n"
+"\t"
msgstr ""
"\n"
-"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
+"\tOmbaseringen kommer dock att avbrytas om du tar bort allting.\n"
"\n"
+"\t"
-#: git-rebase--interactive.sh:985
+#: git-rebase--interactive.sh:927
msgid "Note that empty commits are commented out"
msgstr "Observera att tomma incheckningar är utkommenterade"
+#: git-rebase--interactive.sh:980
+msgid "Could not generate todo list"
+msgstr "Kunde inte skapa todo-lista"
+
+#: git-rebase--interactive.sh:1001 git-rebase--interactive.sh:1006
+msgid "Could not init rewritten commits"
+msgstr "Kunde inte initiera omskrivna incheckningar"
+
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
msgid "unstaged"
msgstr "ej köad"
-#: git-add--interactive.perl:246 git-add--interactive.perl:271
+#: git-add--interactive.perl:253 git-add--interactive.perl:278
msgid "binary"
msgstr "binär"
-#: git-add--interactive.perl:255 git-add--interactive.perl:309
+#: git-add--interactive.perl:262 git-add--interactive.perl:316
msgid "nothing"
msgstr "ingenting"
-#: git-add--interactive.perl:291 git-add--interactive.perl:306
+#: git-add--interactive.perl:298 git-add--interactive.perl:313
msgid "unchanged"
msgstr "oändrad"
-#: git-add--interactive.perl:602
+#: git-add--interactive.perl:609
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "lade till %d sökväg\n"
msgstr[1] "lade till %d sökvägar\n"
-#: git-add--interactive.perl:605
+#: git-add--interactive.perl:612
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "uppdaterade %d sökväg\n"
msgstr[1] "uppdaterade %d sökvägar\n"
-#: git-add--interactive.perl:608
+#: git-add--interactive.perl:615
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "återställde %d sökväg\n"
msgstr[1] "återställde %d sökvägar\n"
-#: git-add--interactive.perl:611
+#: git-add--interactive.perl:618
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "rörde %d sökväg\n"
msgstr[1] "rörde %d sökvägar\n"
-#: git-add--interactive.perl:620
+#: git-add--interactive.perl:627
msgid "Update"
msgstr "Uppdatera"
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:639
msgid "Revert"
msgstr "Återställ"
-#: git-add--interactive.perl:655
+#: git-add--interactive.perl:662
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "observera: %s spåras inte längre.\n"
-#: git-add--interactive.perl:666
+#: git-add--interactive.perl:673
msgid "Add untracked"
msgstr "Lägg till ospårad"
-#: git-add--interactive.perl:672
+#: git-add--interactive.perl:679
msgid "No untracked files.\n"
msgstr "Inga ospårade filer.\n"
-#: git-add--interactive.perl:985
+#: git-add--interactive.perl:1033
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"köas omedelbart."
-#: git-add--interactive.perl:988
+#: git-add--interactive.perl:1036
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"läggas till i \"stash\" omedelbart."
-#: git-add--interactive.perl:991
+#: git-add--interactive.perl:1039
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"tas bort från kön omedelbart."
-#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"markeras för applicering omedelbart."
-#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"markeras för kasta omedelbart."
-#: git-add--interactive.perl:1013
+#: git-add--interactive.perl:1085
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s"
-#: git-add--interactive.perl:1014
+#: git-add--interactive.perl:1086
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n"
-#: git-add--interactive.perl:1020
+#: git-add--interactive.perl:1092
#, perl-format
msgid ""
"---\n"
"Rader som börjar med %s kommer att tas bort.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1028
+#: git-add--interactive.perl:1100
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"
"redigeringen och stycket lämnas oförändrat.\n"
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s"
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1134
+#: git-add--interactive.perl:1213
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "
"[y/n]? "
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl:1222
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"a - köa stycket och alla följande i filen\n"
"d - köa inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1149
+#: git-add--interactive.perl:1228
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"a - \"stash\":a stycket och alla följande i filen\n"
"d - \"stash\":a inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1155
+#: git-add--interactive.perl:1234
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"a - ta bort stycket och alla följande i filen från kön\n"
"d - ta inte bort stycket eller något av de följande i filen från kön"
-#: git-add--interactive.perl:1161
+#: git-add--interactive.perl:1240
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1167
+#: git-add--interactive.perl:1246
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1173
+#: git-add--interactive.perl:1252
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1179
+#: git-add--interactive.perl:1258
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1188
+#: git-add--interactive.perl:1273
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"e - redigera aktuellt stycke manuellt\n"
"? - visa hjälp\n"
-#: git-add--interactive.perl:1219
+#: git-add--interactive.perl:1304
msgid "The selected hunks do not apply to the index!\n"
msgstr "Markerade stycken kan inte appliceras på indexet!\n"
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1305
msgid "Apply them to the worktree anyway? "
msgstr "Applicera dem på arbetskatalogen trots det? "
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1308
msgid "Nothing was applied.\n"
msgstr "Ingenting applicerades.\n"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1319
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignorerar ej sammanslagen: %s\n"
-#: git-add--interactive.perl:1243
+#: git-add--interactive.perl:1328
msgid "Only binary files changed.\n"
msgstr "Endast binära filer ändrade.\n"
-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1330
msgid "No changes.\n"
msgstr "Inga ändringar.\n"
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1338
msgid "Patch update"
msgstr "Uppdatera patch"
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1390
#, perl-format
-msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Köa ändrat läge [y,n,q,a,d,/%s,?]? "
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1391
#, perl-format
-msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Köa borttagning [y,n,q,a,d,/%s,?]? "
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Köa borttagning [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1307
+#: git-add--interactive.perl:1392
#, perl-format
-msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Köa stycket [y,n,q,a,d,/%s,?]? "
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Köa stycket [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1310
+#: git-add--interactive.perl:1395
#, perl-format
-msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Stash:a ändrat läge [y,n,q,a,d,/%s,?]? "
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1396
#, perl-format
-msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Stash:a borttagning [y,n,q,a,d,/%s,?]? "
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1397
#, perl-format
-msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Stash:a stycket [y,n,q,a,d,/%s,?]? "
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Stash:a stycket [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1315
+#: git-add--interactive.perl:1400
#, perl-format
-msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Ta bort ändrat läge från kön [y,n,q,a,d,/%s,?]? "
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl:1401
#, perl-format
-msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Ta bort borttagning från kön [y,n,q,a,d,/%s,?]? "
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1317
+#: git-add--interactive.perl:1402
#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Ta bort stycket från kön [y,n,q,a,d,/%s,?]? "
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Ta bort stycket från kön [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1320
+#: git-add--interactive.perl:1405
#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
-msgstr "Applicera ändrat läge på indexet [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1406
#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
-msgstr "Applicera borttagning på indexet [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1322
+#: git-add--interactive.perl:1407
#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
-msgstr "Applicera stycket på indexet [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "Applicera stycket på indexet [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1325
+#: git-add--interactive.perl:1410
#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1326
+#: git-add--interactive.perl:1411
#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1327
+#: git-add--interactive.perl:1412
#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1415
#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1416
#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1332
+#: git-add--interactive.perl:1417
#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1335
+#: git-add--interactive.perl:1420
#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1336
+#: git-add--interactive.perl:1421
#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1337
+#: git-add--interactive.perl:1422
#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1440
+#: git-add--interactive.perl:1522
+msgid "No other hunks to goto\n"
+msgstr "Inga andra stycken att gå till\n"
+
+#: git-add--interactive.perl:1529
msgid "go to which hunk (<ret> to see more)? "
msgstr "gå till vilket stycke (<ret> för att se fler)? "
-#: git-add--interactive.perl:1442
+#: git-add--interactive.perl:1531
msgid "go to which hunk? "
msgstr "gå till vilket stycke? "
-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1540
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Ogiltigt siffervärde: \"%s\"\n"
-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1545
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Beklagar, det finns bara %d stycke.\n"
msgstr[1] "Beklagar, det finns bara %d stycken.\n"
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1571
+msgid "No other hunks to search\n"
+msgstr "Inga andra stycken att söka efter\n"
+
+#: git-add--interactive.perl:1575
msgid "search for regex? "
msgstr "sök efter reguljärt uttryck? "
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1588
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n"
-#: git-add--interactive.perl:1505
+#: git-add--interactive.perl:1598
msgid "No hunk matches the given pattern\n"
msgstr "Inga stycken motsvarar givet mönster\n"
-#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
msgid "No previous hunk\n"
msgstr "Inget föregående stycke\n"
-#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
msgid "No next hunk\n"
msgstr "Inget följande stycke\n"
-#: git-add--interactive.perl:1553
+#: git-add--interactive.perl:1644
+msgid "Sorry, cannot split this hunk\n"
+msgstr "Beklagar, kan inte dela stycket\n"
+
+#: git-add--interactive.perl:1650
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Dela i %d stycke.\n"
msgstr[1] "Dela i %d stycken.\n"
-#: git-add--interactive.perl:1605
+#: git-add--interactive.perl:1660
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "Beklagar, kan inte redigera stycket\n"
+
+#: git-add--interactive.perl:1706
msgid "Review diff"
msgstr "Granska diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl:1725
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"diff - visa diff mellan HEAD och index\n"
"add untracked - lägg till innehåll i ospårade filer till köade ändringar\n"
-#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
-#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
-#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
+#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
+#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
msgid "missing --"
msgstr "saknad --"
-#: git-add--interactive.perl:1662
+#: git-add--interactive.perl:1763
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "okänt läge för --patch: %s"
-#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "felaktigt argument %s, förväntar --"
-#: git-send-email.perl:126
+#: git-send-email.perl:130
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "lokal zon skiljer sig från GMT med delar av minuter\n"
-#: git-send-email.perl:133 git-send-email.perl:139
+#: git-send-email.perl:137 git-send-email.perl:143
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "lokal tidszonförskjutning större än eller lika med 24 timmar\n"
-#: git-send-email.perl:207 git-send-email.perl:213
+#: git-send-email.perl:211 git-send-email.perl:217
msgid "the editor exited uncleanly, aborting everything"
msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting"
-#: git-send-email.perl:290
+#: git-send-email.perl:294
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
"\"%s\" innehåller en mellanliggande version av e-postbrevet du skrev.\n"
-#: git-send-email.perl:295
+#: git-send-email.perl:299
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "\"%s.final\" innehåller det skrivna brevet.\n"
-#: git-send-email.perl:313
+#: git-send-email.perl:317
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-alias är inkompatibelt med andra flaggor\n"
-#: git-send-email.perl:378 git-send-email.perl:629
+#: git-send-email.perl:383 git-send-email.perl:638
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Kan inte köra git format-patch från utanför arkivet\n"
-#: git-send-email.perl:447
+#: git-send-email.perl:386
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+"\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad "
+"eller konfigurationsflagga)\n"
+
+#: git-send-email.perl:456
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Okänt fält i --suppress-cc: \"%s\"\n"
-#: git-send-email.perl:476
+#: git-send-email.perl:485
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Okänd inställning i --confirm: \"%s\"\n"
-#: git-send-email.perl:504
+#: git-send-email.perl:513
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "varning: sendmail-alias med citationstecken stöds inte. %s\n"
-#: git-send-email.perl:506
+#: git-send-email.perl:515
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "varning: \":include:\" stöds inte: %s\n"
-#: git-send-email.perl:508
+#: git-send-email.perl:517
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "varning: omdirigering til \"/fil\" eller \"|rör\" stöds inte: %s\n"
-#: git-send-email.perl:513
+#: git-send-email.perl:522
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "varning: sendmail-raden känns inte igen: %s\n"
-#: git-send-email.perl:595
+#: git-send-email.perl:604
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * Säga \"./%s\" om du menar en fil; eller\n"
" * Ange flaggan --format-patch om du menar ett intervall.\n"
-#: git-send-email.perl:616
+#: git-send-email.perl:625
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Misslyckades utföra opendir %s: %s"
-#: git-send-email.perl:640
+#: git-send-email.perl:649
#, perl-format
msgid ""
"fatal: %s: %s\n"
"ödesdigert: %s: %s\n"
"varning: inga patchar har sänts\n"
-#: git-send-email.perl:651
+#: git-send-email.perl:660
msgid ""
"\n"
"No patch files specified!\n"
"Inga patchfiler angavs!\n"
"\n"
-#: git-send-email.perl:664
+#: git-send-email.perl:673
#, perl-format
msgid "No subject line in %s?"
msgstr "Ingen ärenderad i %s?"
-#: git-send-email.perl:674
+#: git-send-email.perl:683
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Kunde inte öppna för skrivning %s: %s"
-#: git-send-email.perl:684
+#: git-send-email.perl:694
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"Rensa brevkroppen om du inte vill sända någon sammanfattning.\n"
-#: git-send-email.perl:707
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr "Misslyckades öppna %s.final: %s"
-
-#: git-send-email.perl:710
+#: git-send-email.perl:718
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Misslyckades öppna %s: %s"
-#: git-send-email.perl:745
-msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-msgstr "Fälten To/Cc/Bcc tolkas inte ännu, de har ignorerats\n"
+#: git-send-email.perl:735
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "Misslyckades öppna %s.final: %s"
-#: git-send-email.perl:754
+#: git-send-email.perl:778
msgid "Summary email is empty, skipping it\n"
msgstr "Sammanfattande brev tomt, hoppar över\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:786
+#: git-send-email.perl:813
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Är du säker på att du vill använda <%s> [Y=ja, N=nej]? "
-#: git-send-email.perl:815
+#: git-send-email.perl:868
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
"Följande filer är åttabitars, men anger inte en Content-Transfer-Encoding.\n"
-#: git-send-email.perl:820
+#: git-send-email.perl:873
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]? "
-#: git-send-email.perl:828
+#: git-send-email.perl:881
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen "
"vill sända.\n"
-#: git-send-email.perl:847
+#: git-send-email.perl:900
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Till vem skall breven sändas (om någon)?"
-#: git-send-email.perl:865
+#: git-send-email.perl:918
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n"
-#: git-send-email.perl:877
+#: git-send-email.perl:930
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Message-ID att använda som In-Reply-To för det första brevet (om något)? "
-#: git-send-email.perl:929 git-send-email.perl:937
+#: git-send-email.perl:988 git-send-email.perl:996
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "fel: kunde inte få fram en giltig adress från: %s\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:941
+#: git-send-email.perl:1000
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera): "
-#: git-send-email.perl:1262
+#: git-send-email.perl:1317
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA-sökvägen \"%s\" finns inte"
-#: git-send-email.perl:1337
+#: git-send-email.perl:1400
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
" meddelande, kör \"git config --global sendemail.confirm auto\".\n"
"\n"
-#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
+#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1352
-msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
-msgstr "Sända brevet? (y=ja, n=nej, q=avsluta, a=alla): "
+#: git-send-email.perl:1415
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+msgstr "Sända brevet? (y=ja, n=nej, e=redigera, q=avsluta, a=alla): "
-#: git-send-email.perl:1355
+#: git-send-email.perl:1418
msgid "Send this email reply required"
msgstr "Svar krävs på frågan \"Sända brevet?\""
-#: git-send-email.perl:1381
+#: git-send-email.perl:1446
msgid "The required SMTP server is not properly defined."
msgstr "Nödvändig SMTP-server har inte angivits korrekt."
-#: git-send-email.perl:1428
+#: git-send-email.perl:1493
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Servern stöder inte SMARTTLS! %s"
-#: git-send-email.perl:1433 git-send-email.perl:1437
+#: git-send-email.perl:1498 git-send-email.perl:1502
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS misslyckades! %s"
-#: git-send-email.perl:1447
+#: git-send-email.perl:1512
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Kan inte initiera SMTP korrekt. Kontrollera inställningarna och använd --"
"smtp-debug."
-#: git-send-email.perl:1465
+#: git-send-email.perl:1530
#, perl-format
msgid "Failed to send %s\n"
msgstr "Misslyckades sända %s\n"
-#: git-send-email.perl:1468
+#: git-send-email.perl:1533
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Test-Sände %s\n"
-#: git-send-email.perl:1468
+#: git-send-email.perl:1533
#, perl-format
msgid "Sent %s\n"
msgstr "Sände %s\n"
-#: git-send-email.perl:1470
+#: git-send-email.perl:1535
msgid "Dry-OK. Log says:\n"
msgstr "Test-OK. Loggen säger:\n"
-#: git-send-email.perl:1470
+#: git-send-email.perl:1535
msgid "OK. Log says:\n"
msgstr "OK. Loggen säger:\n"
-#: git-send-email.perl:1482
+#: git-send-email.perl:1547
msgid "Result: "
msgstr "Resultat: "
-#: git-send-email.perl:1485
+#: git-send-email.perl:1550
msgid "Result: OK\n"
msgstr "Resultat: OK\n"
-#: git-send-email.perl:1498
+#: git-send-email.perl:1568
#, perl-format
msgid "can't open file %s"
msgstr "kan inte öppna filen %s"
-#: git-send-email.perl:1545 git-send-email.perl:1565
+#: git-send-email.perl:1615 git-send-email.perl:1635
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1551
+#: git-send-email.perl:1621
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Lägger till to: %s från raden \"%s\"\n"
-#: git-send-email.perl:1599
+#: git-send-email.perl:1674
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(icke-mbox) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1624
+#: git-send-email.perl:1699
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1730
+#: git-send-email.perl:1817
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Kunde inte köra \"%s\""
-#: git-send-email.perl:1737
+#: git-send-email.perl:1824
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Lägger till %s: %s från: \"%s\"\n"
-#: git-send-email.perl:1741
+#: git-send-email.perl:1828
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) misslyckades stänga röret till \"%s\""
-#: git-send-email.perl:1768
+#: git-send-email.perl:1855
msgid "cannot send message as 7bit"
msgstr "kan inte sända brev som sjubitars"
-#: git-send-email.perl:1776
+#: git-send-email.perl:1863
msgid "invalid transfer encoding"
msgstr "ogiltig överföringskondning"
-#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
+#: git-send-email.perl:1901 git-send-email.perl:1952 git-send-email.perl:1962
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "kunde inte öppna %s: %s\n"
-#: git-send-email.perl:1817
+#: git-send-email.perl:1904
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: patchen innehåller en rad längre än 998 tecken"
-#: git-send-email.perl:1833
+#: git-send-email.perl:1920
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
"säkerhetskopior.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1837
+#: git-send-email.perl:1924
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
+#~ msgid "Everyday Git With 20 Commands Or So"
+#~ msgstr "Git för dagligt bruk i ungefär 20 kommandon"
+
+#~ msgid "Could not open '%s' for writing"
+#~ msgstr "Kunde inte öppna \"%s\" för skrivning"
+
+#~ msgid ""
+#~ "unexpected 1st line of squash message:\n"
+#~ "\n"
+#~ "\t%.*s"
+#~ msgstr ""
+#~ "oväntad första rad i squash-meddelande:\n"
+#~ "\n"
+#~ "\t%.*s"
+
+#~ msgid ""
+#~ "invalid 1st line of squash message:\n"
+#~ "\n"
+#~ "\t%.*s"
+#~ msgstr ""
+#~ "ogiltig första rad i squash-meddelande:\n"
+#~ "\n"
+#~ "\t%.*s"
+
+#~ msgid "BUG: returned path string doesn't match cwd?"
+#~ msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"
+
+#~ msgid "Error in object"
+#~ msgstr "Fel i objekt"
+
+#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
+#~ msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF"
+
+#~ msgid "invalid filter-spec expression '%s'"
+#~ msgstr "ogiltig filterspec-utryck \"%s\""
+
+#~ msgid "The copy of the patch that failed is found in: %s"
+#~ msgstr "En kopia av patchen som misslyckades finns i: %s"
+
+#~ msgid "pathspec and --all are incompatible"
+#~ msgstr "sökvägsangivelse och --all är inkompatibla"
+
+#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+#~ msgstr ""
+#~ "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\""
+
+#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+#~ msgstr "Fälten To/Cc/Bcc tolkas inte ännu, de har ignorerats\n"
+
#~ msgid ""
#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
#~ "please use . instead if you meant to match all paths"
#~ msgid "blob object"
#~ msgstr "blob-objekt"
-#~ msgid "other tag object"
-#~ msgstr "annat taggobjekt"
-
#~ msgid ""
#~ "There is nothing to exclude from by :(exclude) patterns.\n"
#~ "Perhaps you forgot to add either ':/' or '.' ?"
#~ msgid "Unprocessed path??? %s"
#~ msgstr "Obehandlad sökväg??? %s"
-#~ msgid "Error wrapping up %s"
-#~ msgstr "Fel vid ombrytning av %s"
-
#~ msgid "Cannot %s during a %s"
#~ msgstr "kan inte %s under en %s"
#~ msgstr ""
#~ "Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
-#~ msgid "could not verify the tag '%s'"
-#~ msgstr "kunde inte bekräfta taggen \"%s\""
-
#~ msgid "failed to remove: %s"
#~ msgstr "misslyckades ta bort: %s"
#~ msgid "no branch specified"
#~ msgstr "inget grennamn angavs"
-#~ msgid "check a branch out in a separate working directory"
-#~ msgstr "checka ut en gren i separat arbetskatalog"
-
#~ msgid "prune .git/worktrees"
#~ msgstr "rensa .git/worktrees"
#~ msgid "more than %d trees given: '%s'"
#~ msgstr "mer än %d träd angavs: \"%s\""
-#~ msgid "You cannot combine --no-ff with --ff-only."
-#~ msgstr "Du kan inte kombinera --no-ff med --ff-only."
-
#~ msgid ""
#~ "'%s' has changes staged in the index\n"
#~ "(use --cached to keep the file, or -f to force removal)"