msgstr ""
"Project-Id-Version: git 2.16.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-03-16 07:29+0800\n"
+"PO-Revision-Date: 2018-03-18 20:55+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
msgid "Exiting because of an unresolved conflict."
msgstr "Avslutar på grund av olöst konflikgt."
-#: advice.c:121 builtin/merge.c:1213
+#: advice.c:121 builtin/merge.c:1251
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
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:775 builtin/fetch.c:1025
#, c-format
msgid "cannot open %s"
msgstr "kan inte öppna %s"
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:118 builtin/fetch.c:127 builtin/pull.c:193
+#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197
+#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787
#: 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:3035
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:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665
+#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125
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 "archive format"
msgstr "arkivformat"
-#: archive.c:437 builtin/log.c:1459
+#: archive.c:437 builtin/log.c:1462
msgid "prefix"
msgstr "prefix"
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
+#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 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:120
-#: parse-options.h:153
+#: parse-options.h:165
msgid "file"
msgstr "fil"
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:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111
+#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576
msgid "repo"
msgstr "arkiv"
"Negativa mönster ignoreras i git-attribut\n"
"Använd '\\!' för att inleda med ett utropstecken."
-#: bisect.c:458
+#: bisect.c:460
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
-#: bisect.c:666
+#: bisect.c:668
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Det finns inte mer att göra \"bisect\" på!\n"
-#: bisect.c:720
+#: bisect.c:722
#, c-format
msgid "Not a valid commit name %s"
msgstr "Namnet på incheckningen är inte giltigt: %s"
-#: bisect.c:744
+#: bisect.c:746
#, 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:751
#, 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:756
#, 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:764
#, 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:777
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisect: en sammanslagningsbas måste testas\n"
-#: bisect.c:862
+#: bisect.c:850
#, 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:869 builtin/notes.c:175 builtin/tag.c:235
#, c-format
msgid "could not create file '%s'"
msgstr "kunde inte skapa filen \"%s\""
-#: bisect.c:930
+#: bisect.c:920
#, c-format
msgid "could not read file '%s'"
msgstr "kunde inte läsa filen \"%s\""
-#: bisect.c:960
+#: bisect.c:950
msgid "reading bisect refs failed"
msgstr "misslyckades läsa bisect-referenser"
-#: bisect.c:979
+#: bisect.c:969
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s var både %s och %s\n"
-#: bisect.c:987
+#: bisect.c:977
#, 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:996
#, 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:1002
#, 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:1758
msgid "--contents and --reverse do not blend well."
msgstr "--contents och --reverse fungerar inte så bra tillsammans."
-#: blame.c:1768
+#: blame.c:1769
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:1789
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
+#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699
+#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920
+#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370
#: builtin/shortlog.c:191
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
-#: blame.c:1815
+#: blame.c:1816
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:1827
#, c-format
msgid "no such path %s in %s"
msgstr "sökvägen %s i %s finns inte"
-#: blame.c:1837
+#: blame.c:1838
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "kan inte läsa objektet %s för sökvägen %s"
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:1879 sequencer.c:2337 builtin/commit.c:750
#, 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:296
#, 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:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1436 builtin/am.c:2072
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
msgid "%s %s is not a commit!"
msgstr "%s %s är inte en incheckning!"
-#: commit.c:1524
+#: commit.c:1506
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"
msgid "bad zlib compression level %d"
msgstr "felaktigt zlib-komprimeringsgrad %d"
-#: config.c:1222
+#: config.c:1225
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
-#: config.c:1378
+#: config.c:1386
#, c-format
msgid "bad pack compression level %d"
msgstr "felaktig paketkomprimeringsgrad %d"
-#: config.c:1574
+#: config.c:1582
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
-#: config.c:1906
+#: config.c:1914
msgid "unknown error occurred while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: config.c:2093
+#: config.c:2101
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Felaktigt %s: \"%s\""
-#: config.c:2136
+#: config.c:2144
#, 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:2170
#, 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:2195
#, 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:2197
#, 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:2256
#, c-format
msgid "%s has multiple values"
msgstr "%s har flera värden"
-#: config.c:2591 config.c:2808
+#: config.c:2599 config.c:2816
#, c-format
msgid "fstat on %s failed"
msgstr "fstat misslyckades på %s"
-#: config.c:2698
+#: config.c:2706
#, 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:2708 builtin/remote.c:776
#, c-format
msgid "could not unset '%s'"
msgstr "kunde inte ta bort inställning för \"%s\""
# 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:198 builtin/prune.c:144
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
#, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "CRLF skulle ersättas av LF i %s."
+
+#: convert.c:207
+#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
"The file will have its original line endings in your working directory."
"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:215
#, 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:217
#, 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
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "LF skulle ersättas av CRLF i %s"
-
#: date.c:116
msgid "in the future"
msgstr "i framtiden"
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:3799
+#: diff.c:3822
#, c-format
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
-#: diff.c:4127
+#: diff.c:4146
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:4149
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-G, -S och --find-object är ömsesidigt uteslutande"
+
+#: diff.c:4237
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
-#: diff.c:4381
+#: diff.c:4403
#, 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:4417
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
-#: diff.c:5446
+#: diff.c:5493
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:5496
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:5499
#, 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:1866
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "kunde inte öppna katalogen \"%s\""
+
+#: dir.c:2108
msgid "failed to get kernel name and information"
msgstr "misslyckades hämta kärnans namn och information"
-#: dir.c:2219
+#: dir.c:2232
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:3024 dir.c:3029
#, c-format
msgid "could not create directories for %s"
msgstr "kunde inte skapa kataloger för %s"
-#: dir.c:3032
+#: dir.c:3054
#, 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:253
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:265
+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:284 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "fjärrfel: %s"
-#: fetch-pack.c:284
+#: fetch-pack.c:285
#, 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:337
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc kräver ”multi_ack_detailed”"
-#: fetch-pack.c:422
+#: fetch-pack.c:428
#, c-format
msgid "invalid shallow line: %s"
msgstr "ogiltig \"shallow\"-rad: %s"
-#: fetch-pack.c:428
+#: fetch-pack.c:434
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ogiltig \"unshallow\"-rad: %s"
-#: fetch-pack.c:430
+#: fetch-pack.c:436
#, c-format
msgid "object not found: %s"
msgstr "objektet hittades inte: %s"
-#: fetch-pack.c:433
+#: fetch-pack.c:439
#, c-format
msgid "error in object: %s"
msgstr "fel i objekt: %s"
-#: fetch-pack.c:435
+#: fetch-pack.c:441
#, c-format
msgid "no shallow found: %s"
msgstr "ingen \"shallow\" hittades: %s"
-#: fetch-pack.c:438
+#: fetch-pack.c:444
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "förväntade shallow/unshallow, fick %s"
-#: fetch-pack.c:477
+#: fetch-pack.c:485
#, c-format
msgid "got %s %d %s"
msgstr "fick %s %d %s"
-#: fetch-pack.c:491
+#: fetch-pack.c:499
#, c-format
msgid "invalid commit %s"
msgstr "ogiltig incheckning %s"
-#: fetch-pack.c:524
+#: fetch-pack.c:532
msgid "giving up"
msgstr "ger upp"
-#: fetch-pack.c:534 progress.c:229
+#: fetch-pack.c:542 progress.c:229
msgid "done"
msgstr "klart"
-#: fetch-pack.c:546
+#: fetch-pack.c:554
#, c-format
msgid "got %s (%d) %s"
msgstr "fick %s (%d) %s"
-#: fetch-pack.c:592
+#: fetch-pack.c:600
#, c-format
msgid "Marking %s as complete"
msgstr "Markerar %s som komplett"
-#: fetch-pack.c:777
+#: fetch-pack.c:788
#, c-format
msgid "already have %s (%s)"
msgstr "har redan %s (%s)"
-#: fetch-pack.c:815
+#: fetch-pack.c:829
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
-#: fetch-pack.c:823
+#: fetch-pack.c:837
msgid "protocol error: bad pack header"
msgstr "protokollfel: felaktigt packhuvud"
-#: fetch-pack.c:879
+#: fetch-pack.c:895
#, 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:911
#, c-format
msgid "%s failed"
msgstr "%s misslyckades"
-#: fetch-pack.c:897
+#: fetch-pack.c:913
msgid "error in sideband demultiplexer"
msgstr "fel i sidbands-avmultiplexare"
-#: fetch-pack.c:924
+#: fetch-pack.c:940
msgid "Server does not support shallow clients"
msgstr "Servern stöder inte klienter med grunda arkiv"
-#: fetch-pack.c:928
+#: fetch-pack.c:944
msgid "Server supports multi_ack_detailed"
msgstr "Servern stöder \"multi_ack_detailed\""
-#: fetch-pack.c:931
+#: fetch-pack.c:947
msgid "Server supports no-done"
msgstr "Servern stöder \"no-done\""
-#: fetch-pack.c:937
+#: fetch-pack.c:953
msgid "Server supports multi_ack"
msgstr "Servern stöder \"multi_ack\""
-#: fetch-pack.c:941
+#: fetch-pack.c:957
msgid "Server supports side-band-64k"
msgstr "Servern stöder \"side-band-64k\""
-#: fetch-pack.c:945
+#: fetch-pack.c:961
msgid "Server supports side-band"
msgstr "Servern stöder \"side-band\""
-#: fetch-pack.c:949
+#: fetch-pack.c:965
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Servern stöder \"allow-tip-sha1-in-want\""
-#: fetch-pack.c:953
+#: fetch-pack.c:969
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Servern stöder \"allow-reachable-sha1-in-want\""
-#: fetch-pack.c:963
+#: fetch-pack.c:979
msgid "Server supports ofs-delta"
msgstr "Servern stöder \"ofs-delta\""
-#: fetch-pack.c:970
+#: fetch-pack.c:985
+msgid "Server supports filter"
+msgstr "Servern stöder filter"
+
+#: fetch-pack.c:993
#, c-format
msgid "Server version is %.*s"
msgstr "Serverversionen är %.*s"
-#: fetch-pack.c:976
+#: fetch-pack.c:999
msgid "Server does not support --shallow-since"
msgstr "Servern stöder inte --shallow-since"
-#: fetch-pack.c:980
+#: fetch-pack.c:1003
msgid "Server does not support --shallow-exclude"
msgstr "Servern stöder inte --shallow-exclude"
-#: fetch-pack.c:982
+#: fetch-pack.c:1005
msgid "Server does not support --deepen"
msgstr "Servern stöder inte --deepen"
-#: fetch-pack.c:993
+#: fetch-pack.c:1016
msgid "no common commits"
msgstr "inga gemensamma incheckningar"
-#: fetch-pack.c:1005
+#: fetch-pack.c:1028
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-patch: hämtning misslyckades."
-#: fetch-pack.c:1167
+#: fetch-pack.c:1190
msgid "no matching remote head"
msgstr "inget motsvarande fjärrhuvud"
-#: fetch-pack.c:1189
+#: fetch-pack.c:1212
#, c-format
msgid "no such remote ref %s"
msgstr "ingen sådan fjärreferens: %s"
-#: fetch-pack.c:1192
+#: fetch-pack.c:1215
#, 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"
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"
-#: grep.c:2017
+#: grep.c:2022
#, 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:2039 setup.c:163 builtin/clone.c:407 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:2050
#, c-format
msgid "'%s': short read"
msgstr "\"%s\": kort läsning"
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:582
#, 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 "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:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
+#: builtin/checkout.c:599 builtin/clone.c:759
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
msgid "error building trees"
msgstr "fel vid byggande av träd"
-#: merge-recursive.c:752
+#: merge-recursive.c:771
#, c-format
msgid "failed to create path '%s'%s"
msgstr "misslyckades skapa sökvägen \"%s\"%s"
-#: merge-recursive.c:763
+#: merge-recursive.c:782
#, 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:796 merge-recursive.c:815
msgid ": perhaps a D/F conflict?"
msgstr ": kanske en K/F-konflikt?"
-#: merge-recursive.c:786
+#: merge-recursive.c:805
#, 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:847 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:849
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob förväntades för %s \"%s\""
-#: merge-recursive.c:854
+#: merge-recursive.c:873
#, c-format
msgid "failed to open '%s': %s"
msgstr "misslyckades öppna \"%s\": %s"
-#: merge-recursive.c:865
+#: merge-recursive.c:884
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "misslyckades skapa symboliska länken \"%s\": %s"
-#: merge-recursive.c:870
+#: merge-recursive.c:889
#, 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:1029
msgid "Failed to execute internal merge"
msgstr "Misslyckades exekvera intern sammanslagning"
-#: merge-recursive.c:1014
+#: merge-recursive.c:1034
#, 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:1146
#, 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:1151
#, 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:1158
#, 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:1163
#, 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:1197
msgid "rename"
msgstr "namnbyte"
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
msgid "renamed"
msgstr "namnbytt"
-#: merge-recursive.c:1225
+#: merge-recursive.c:1254
#, 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:1279
#, 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:1284
msgid " (left unresolved)"
msgstr " (lämnad olöst)"
-#: merge-recursive.c:1317
+#: merge-recursive.c:1346
#, 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:1379
#, 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:1582
#, 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:1597
#, c-format
msgid "Adding merged %s"
msgstr "Lägger till sammanslagen %s"
-#: merge-recursive.c:1575 merge-recursive.c:1805
+#: merge-recursive.c:1604 merge-recursive.c:1834
#, c-format
msgid "Adding as %s instead"
msgstr "Lägger till som %s istället"
-#: merge-recursive.c:1632
+#: merge-recursive.c:1661
#, c-format
msgid "cannot read object %s"
msgstr "kan inte läsa objektet %s"
-#: merge-recursive.c:1635
+#: merge-recursive.c:1664
#, c-format
msgid "object %s is not a blob"
msgstr "objektet %s är inte en blob"
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
msgid "modify"
msgstr "ändra"
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
msgid "modified"
msgstr "ändrad"
-#: merge-recursive.c:1714
+#: merge-recursive.c:1743
msgid "content"
msgstr "innehåll"
-#: merge-recursive.c:1721
+#: merge-recursive.c:1750
msgid "add/add"
msgstr "tillägg/tillägg"
-#: merge-recursive.c:1757
+#: merge-recursive.c:1786
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
-#: merge-recursive.c:1771
+#: merge-recursive.c:1800
#, c-format
msgid "Auto-merging %s"
msgstr "Slår ihop %s automatiskt"
-#: merge-recursive.c:1775 git-submodule.sh:932
+#: merge-recursive.c:1804 git-submodule.sh:879
msgid "submodule"
msgstr "undermodul"
-#: merge-recursive.c:1776
+#: merge-recursive.c:1805
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
-#: merge-recursive.c:1870
+#: merge-recursive.c:1899
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
-#: merge-recursive.c:1896
+#: merge-recursive.c:1925
msgid "file/directory"
msgstr "fil/katalog"
-#: merge-recursive.c:1902
+#: merge-recursive.c:1931
msgid "directory/file"
msgstr "katalog/fil"
-#: merge-recursive.c:1909
+#: merge-recursive.c:1938
#, 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:1947
#, c-format
msgid "Adding %s"
msgstr "Lägger till %s"
-#: merge-recursive.c:1958
+#: merge-recursive.c:1987
#, 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:1991
msgid "Already up to date!"
msgstr "Redan à jour!"
-#: merge-recursive.c:1971
+#: merge-recursive.c:2000
#, 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:2097
msgid "Merging:"
msgstr "Slår ihop:"
-#: merge-recursive.c:2081
+#: merge-recursive.c:2110
#, 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:2149
msgid "merge returned no commit"
msgstr "sammanslagningen returnerade ingen incheckning"
-#: merge-recursive.c:2183
+#: merge-recursive.c:2212
#, 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:2228 builtin/merge.c:657 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\""
msgid "unable to parse object: %s"
msgstr "kunde inte tolka objektet: %s"
-#: packfile.c:556
+#: packfile.c:561
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset före slutet av packfilen (trasig .idx?)"
-#: packfile.c:1683
+#: packfile.c:1694
#, 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:1698
#, 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:619
msgid "..."
msgstr "..."
-#: parse-options.c:592
+#: parse-options.c:638
#, 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:644
#, c-format
msgid " or: %s"
msgstr " eller: %s"
-#: parse-options.c:601
+#: parse-options.c:647
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:640
+#: parse-options.c:686
msgid "-NUM"
msgstr "-TAL"
msgid "unable to parse --pretty format"
msgstr "kunde inte tolka format för --pretty"
-#: read-cache.c:1472
+#: read-cache.c:1473
#, 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:1483
#, 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:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049
#, 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:2448 sequencer.c:1900 sequencer.c:2627
#, c-format
msgid "could not stat '%s'"
msgstr "kunde inte ta status på \"%s\""
-#: read-cache.c:2455
+#: read-cache.c:2461
#, c-format
msgid "unable to open git dir: %s"
msgstr "kunde inte öppna git-katalog: %s"
-#: read-cache.c:2467
+#: read-cache.c:2473
#, c-format
msgid "unable to unlink: %s"
msgstr "misslyckades ta bort länken: %s"
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:1203 refs/packed-backend.c:1528
+#: refs/packed-backend.c:1538
#, 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:1206 refs/packed-backend.c:1541
#, 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:1842
msgid "gone"
msgstr "försvunnen"
msgid "(no branch)"
msgstr "(ingen gren)"
-#: ref-filter.c:1488 ref-filter.c:1519
+#: ref-filter.c:1364
#, 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:1367
#, 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:1819
#, c-format
msgid "malformed object at '%s'"
msgstr "felformat objekt vid \"%s\""
-#: ref-filter.c:1889
+#: ref-filter.c:1886
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorerar referens med trasigt namn %s"
-#: ref-filter.c:1894
+#: ref-filter.c:1891
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorerar trasig referens %s"
-#: ref-filter.c:2156
+#: ref-filter.c:2152
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atomen %%(end) saknas"
-#: ref-filter.c:2250
+#: ref-filter.c:2246
#, c-format
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
-#: remote.c:780
+#: remote.c:795
#, 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:799
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s spårar vanligtvis %s, inte %s"
-#: remote.c:788
+#: remote.c:803
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s spårar både %s och %s"
-#: remote.c:796
+#: remote.c:811
msgid "Internal error"
msgstr "Internt fel"
-#: remote.c:1711 remote.c:1813
+#: remote.c:1726 remote.c:1828
msgid "HEAD does not point to a branch"
msgstr "HEAD pekar inte på en gren"
-#: remote.c:1720
+#: remote.c:1735
#, c-format
msgid "no such branch: '%s'"
msgstr "okänd gren: \"%s\""
-#: remote.c:1723
+#: remote.c:1738
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "ingen standarduppström angiven för grenen \"%s\""
-#: remote.c:1729
+#: remote.c:1744
#, 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:1759
#, 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:1771
#, 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:1782
#, 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:1795
msgid "push has no destination (push.default is 'nothing')"
msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
-#: remote.c:1802
+#: remote.c:1817
msgid "cannot resolve 'simple' push to a single destination"
msgstr "\"enkel push\" motsvarar flera olika mål"
-#: remote.c:2106
+#: remote.c:2132
#, 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:2136
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:2139
#, 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:2143
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"
+
+#: remote.c:2146
+#, c-format
+msgid " (use \"%s\" for details)\n"
+msgstr " (använd \"%s\" för detaljer)\n"
+
+#: remote.c:2150
#, 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:2156
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:2159
#, 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:2167
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:2170
#, 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:2180
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:2277
msgid "your current branch appears to be broken"
msgstr "din nuvarande gren verkar vara trasig"
-#: revision.c:2271
+#: revision.c:2280
#, 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:2477
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent är inkompatibelt med --bisect"
-#: run-command.c:645
+#: run-command.c:731
msgid "open /dev/null failed"
msgstr "misslyckades öppna /dev/null"
-#: run-command.c:1188
+#: run-command.c:1274
#, 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:158
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""
+
+#: sequencer.c:267
msgid "revert"
msgstr "revert"
-#: sequencer.c:220
+#: sequencer.c:269
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:222
+#: sequencer.c:271
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:224
+#: sequencer.c:273
#, c-format
msgid "Unknown action: %d"
msgstr "Okänd funktion: %d"
-#: sequencer.c:281
+#: sequencer.c:330
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:333
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:346 sequencer.c:2245
#, 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:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264
+#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "kunde inte skriva till \"%s\""
-#: sequencer.c:304
+#: sequencer.c:353
#, 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:356 sequencer.c:2128 sequencer.c:2252
#, 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:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259
+#: builtin/commit.c:722 builtin/merge.c:1047
#, c-format
msgid "could not read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: sequencer.c:358
+#: sequencer.c:405
#, 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:409
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:438
#, c-format
msgid "%s: fast-forward"
msgstr "%s: snabbspola"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:477
+#: sequencer.c:526
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Kunde inte skriva ny indexfil"
-#: sequencer.c:496
+#: sequencer.c:542
msgid "could not resolve HEAD commit"
msgstr "kunde inte bestämma HEAD:s incheckning"
-#: sequencer.c:516
+#: sequencer.c:562
msgid "unable to update cache tree"
msgstr "kan inte uppdatera cacheträd"
-#: sequencer.c:600
+#: sequencer.c:658
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:702
+#: sequencer.c:915
+msgid "'prepare-commit-msg' hook failed"
+msgstr "kroken \"prepare-commit-msg\" misslyckades"
+
+#: sequencer.c:922
+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"
+
+#: sequencer.c:935
+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"
+
+#: sequencer.c:975
+msgid "couldn't look up newly created commit"
+msgstr "kunde inte slå upp en precis skapad incheckning"
+
+#: sequencer.c:977
+msgid "could not parse newly created commit"
+msgstr "kunde inte tolka en precis skapad incheckning"
+
+#: sequencer.c:1023
+msgid "unable to resolve HEAD after creating commit"
+msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
+
+#: sequencer.c:1025
+msgid "detached HEAD"
+msgstr "frånkopplad HEAD"
+
+#: sequencer.c:1029
+msgid " (root-commit)"
+msgstr " (rotincheckning)"
+
+#: sequencer.c:1050
+msgid "could not parse HEAD"
+msgstr "kunde inte tolka HEAD"
+
+#: sequencer.c:1052
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s är inte en incheckning!"
+
+#: sequencer.c:1056 builtin/commit.c:1491
+msgid "could not parse HEAD commit"
+msgstr "kunde inte tolka HEAD:s incheckning"
+
+#: sequencer.c:1107 sequencer.c:1673
+msgid "unable to parse commit author"
+msgstr "kunde inte tolka incheckningens författare"
+
+#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree misslyckades skriva ett träd"
+
+#: sequencer.c:1134 sequencer.c:1186
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""
+
+#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826
+#: builtin/merge.c:851
+msgid "failed to write commit object"
+msgstr "kunde inte skriva incheckningsobjekt"
+
+#: sequencer.c:1213
#, c-format
msgid "could not parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: sequencer.c:707
+#: sequencer.c:1218
#, c-format
msgid "could not parse parent commit %s"
msgstr "kunde inte tolka föräldraincheckningen %s"
-#: sequencer.c:836
+#: sequencer.c:1347
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
"\n"
"\t%.*s"
-#: sequencer.c:842
+#: sequencer.c:1353
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
"\n"
"\t%.*s"
-#: sequencer.c:848 sequencer.c:873
+#: sequencer.c:1359 sequencer.c:1384
#, c-format
msgid "This is a combination of %d commits."
msgstr "Det här är en kombination av %d incheckningar."
-#: sequencer.c:857 sequencer.c:2748
+#: sequencer.c:1368 sequencer.c:3265
msgid "need a HEAD to fixup"
msgstr "behöver en HEAD-incheckning att rätta"
-#: sequencer.c:859
+#: sequencer.c:1370
msgid "could not read HEAD"
msgstr "kunde inte läsa HEAD"
-#: sequencer.c:861
+#: sequencer.c:1372
msgid "could not read HEAD's commit message"
msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
-#: sequencer.c:867
+#: sequencer.c:1378
#, c-format
msgid "cannot write '%s'"
msgstr "kan inte skriva \"%s\""
-#: sequencer.c:876 git-rebase--interactive.sh:446
+#: sequencer.c:1387 git-rebase--interactive.sh:452
msgid "This is the 1st commit message:"
msgstr "Det här är 1:a incheckningsmeddelandet:"
-#: sequencer.c:884
+#: sequencer.c:1395
#, c-format
msgid "could not read commit message of %s"
msgstr "kunde inte läsa incheckningsmeddelande för %s"
-#: sequencer.c:891
+#: sequencer.c:1402
#, c-format
msgid "This is the commit message #%d:"
msgstr "Det här är incheckningsmeddelande %d:"
-#: sequencer.c:896
+#: sequencer.c:1407
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Incheckningsmeddelande %d kommer hoppas över:"
-#: sequencer.c:901
+#: sequencer.c:1412
#, c-format
msgid "unknown command: %d"
msgstr "okänt kommando: %d"
-#: sequencer.c:967
+#: sequencer.c:1479
msgid "your index file is unmerged."
msgstr "din indexfil har inte slagits ihop."
-#: sequencer.c:986
+#: sequencer.c:1498
#, 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:1506
#, c-format
msgid "commit %s does not have parent %d"
msgstr "incheckning %s har inte förälder %d"
-#: sequencer.c:998
+#: sequencer.c:1510
#, 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:1516
#, 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:1535
#, 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:1600 sequencer.c:2397
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "kunde inte byta namn på \"%s\" till \"%s\""
-#: sequencer.c:1137
+#: sequencer.c:1654
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:1138
+#: sequencer.c:1655
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:1180
+#: sequencer.c:1702
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:1190
+#: sequencer.c:1712
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:1196
+#: sequencer.c:1718
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:1270
+#: sequencer.c:1792
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s tar inte argument: \"%s\""
-#: sequencer.c:1279
+#: sequencer.c:1801
#, c-format
msgid "missing arguments for %s"
msgstr "argument saknas för %s"
-#: sequencer.c:1322
+#: sequencer.c:1844
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ogiltig rad %d: %.*s"
-#: sequencer.c:1330
+#: sequencer.c:1852
#, 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:1883 sequencer.c:3056 sequencer.c:3091
#, c-format
msgid "could not read '%s'."
msgstr "kunde inte läsa \"%s\"."
-#: sequencer.c:1375
+#: sequencer.c:1906
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "rätta det med \"git rebase --edit-todo\"."
-#: sequencer.c:1377
+#: sequencer.c:1908
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "oanvändbart manus: ”%s”"
-#: sequencer.c:1382
+#: sequencer.c:1913
msgid "no commits parsed."
msgstr "inga incheckningar lästes."
-#: sequencer.c:1393
+#: sequencer.c:1924
msgid "cannot cherry-pick during a revert."
msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
-#: sequencer.c:1395
+#: sequencer.c:1926
msgid "cannot revert during a cherry-pick."
msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
-#: sequencer.c:1462
+#: sequencer.c:1993
#, c-format
msgid "invalid key: %s"
msgstr "felaktig nyckel: %s"
-#: sequencer.c:1465
+#: sequencer.c:1996
#, c-format
msgid "invalid value for %s: %s"
msgstr "felaktigt värde för %s: %s"
-#: sequencer.c:1531
+#: sequencer.c:2062
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "trasigt manus: ”%s”"
-#: sequencer.c:1569
+#: sequencer.c:2100
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:2101
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1573
+#: sequencer.c:2104
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:1588
+#: sequencer.c:2118
msgid "could not lock HEAD"
msgstr "kunde inte låsa HEAD"
-#: sequencer.c:1646 sequencer.c:2230
+#: sequencer.c:2173 sequencer.c:2761
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: sequencer.c:1648
+#: sequencer.c:2175
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:1650 sequencer.c:1685
+#: sequencer.c:2177 sequencer.c:2212
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:2198 builtin/grep.c:720
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
-#: sequencer.c:1673
+#: sequencer.c:2200
#, c-format
msgid "cannot read '%s': %s"
msgstr "kan inte läsa \"%s\": %s"
-#: sequencer.c:1674
+#: sequencer.c:2201
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:1680
+#: sequencer.c:2207
#, 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:2218
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:2324 sequencer.c:2679
+#, c-format
+msgid "could not update %s"
+msgstr "kunde inte uppdatera %s"
+
+#: sequencer.c:2362 sequencer.c:2659
msgid "cannot read HEAD"
msgstr "kan inte läsa HEAD"
-#: sequencer.c:1872 builtin/difftool.c:639
+#: sequencer.c:2402 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:2421
msgid "could not read index"
msgstr "kunde inte läsa indexet"
-#: sequencer.c:1896
+#: sequencer.c:2426
#, c-format
msgid ""
"execution failed: %s\n"
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:1902
+#: sequencer.c:2432
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:2438
#, c-format
msgid ""
"execution succeeded: %s\n"
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:1967
+#: sequencer.c:2497
#, c-format
msgid "Applied autostash.\n"
msgstr "Tillämpade autostash.\n"
-#: sequencer.c:1979
+#: sequencer.c:2509
#, c-format
msgid "cannot store %s"
msgstr "kan inte spara %s"
-#: sequencer.c:1982 git-rebase.sh:175
+#: sequencer.c:2512 git-rebase.sh:178
#, 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:2595
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Stoppade på %s... %.*s\n"
-#: sequencer.c:2106
+#: sequencer.c:2637
#, c-format
msgid "unknown command %d"
msgstr "okänt kommando %d"
-#: sequencer.c:2136
+#: sequencer.c:2667
msgid "could not read orig-head"
msgstr "kunde inte läsa orig-head"
-#: sequencer.c:2141 sequencer.c:2745
+#: sequencer.c:2672 sequencer.c:3262
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:2686
#, c-format
msgid "could not update HEAD to %s"
msgstr "kunde inte uppdatera HEAD till %s"
-#: sequencer.c:2239
+#: sequencer.c:2770
msgid "cannot rebase: You have unstaged changes."
msgstr "kan inte ombasera: Du har oköade ändringar."
-#: sequencer.c:2244
+#: sequencer.c:2775
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
-#: sequencer.c:2253
+#: sequencer.c:2784
msgid "cannot amend non-existing commit"
msgstr "kan inte lägga till incheckning som inte finns"
-#: sequencer.c:2255
+#: sequencer.c:2786
#, c-format
msgid "invalid file: '%s'"
msgstr "ogiltig fil: \"%s\""
-#: sequencer.c:2257
+#: sequencer.c:2788
#, c-format
msgid "invalid contents: '%s'"
msgstr "ogiltigt innehåll: \"%s\""
-#: sequencer.c:2260
+#: sequencer.c:2791
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:2801
msgid "could not commit staged changes."
msgstr "kunde inte checka in köade ändringar."
-#: sequencer.c:2350
+#: sequencer.c:2881
#, 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:2885
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:2387
+#: sequencer.c:2918
msgid "can't revert as initial commit"
msgstr "kan inte ångra som första incheckning"
-#: sequencer.c:2492
+#: sequencer.c:3023
msgid "make_script: unhandled options"
msgstr "make_script: flaggor som inte stöds"
-#: sequencer.c:2495
+#: sequencer.c:3026
msgid "make_script: error preparing revisions"
msgstr "make_script: fel när revisioner skulle förberedas"
-#: sequencer.c:2529 sequencer.c:2564
+#: sequencer.c:3060 sequencer.c:3095
#, c-format
msgid "unusable todo list: '%s'"
msgstr "oanvändbar todo-lista: %s"
-#: sequencer.c:2615
+#: sequencer.c:3146
#, 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:3212
#, 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:3219
#, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\" (fel).\n"
"\n"
-#: sequencer.c:2714
+#: sequencer.c:3231
#, 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
+#: sequencer.c:3244 sequencer.c:3304 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:3285
#, c-format
msgid "could not parse commit '%s'"
msgstr "kunde inte tolka incheckningen\" %s\""
-#: sequencer.c:2897
+#: sequencer.c:3401
msgid "the script was already rearranged."
msgstr "skriptet har redan omordnats."
+#: setup.c:122
+#, c-format
+msgid "'%s' is outside repository"
+msgstr "\"%s\" är utanför arkivet"
+
#: setup.c:171
#, c-format
msgid ""
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
"\"git <kommando> [<revision>...] -- [<fil>...]\""
+#: setup.c:233
+#, 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:252
#, c-format
msgid ""
"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:388
+msgid "unable to set up work tree using invalid config"
+msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"
+
+#: setup.c:395
+msgid "this operation must be run in a work tree"
+msgstr "funktionen måste köras i en arbetskatalog"
+
+#: setup.c:506
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Förväntade git-arkivversion <= %d, hittade %d"
-#: setup.c:509
+#: setup.c:514
msgid "unknown repository extensions found:"
msgstr "okända arkivutökningar hittades:"
-#: setup.c:811
+#: setup.c:533
#, 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:535
+#, 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:537
+#, c-format
+msgid "error reading %s"
+msgstr "fel vid läsning av %s"
+
+#: setup.c:539
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "ogiltigt gitfilformat: %s"
+
+#: setup.c:541
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "ingen sökväg i gitfil: %s"
+
+#: setup.c:543
+#, c-format
+msgid "not a git repository: %s"
+msgstr "inte ett git-arkiv: %s"
+
+#: setup.c:642
+#, c-format
+msgid "'$%s' too big"
+msgstr "\"$%s\" för stor"
+
+#: setup.c:656
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "inte ett git-arkiv: \"%s\""
+
+#: setup.c:685 setup.c:687 setup.c:718
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "kan inte byta katalog (chdir) till \"%s\""
+
+#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818
+msgid "cannot come back to cwd"
+msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"
+
+#: setup.c:816
+#, 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:827
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "misslyckades ta status på \"%*ss%s%s\""
-#: setup.c:1052
+#: setup.c:1057
msgid "Unable to read current working directory"
msgstr "Kan inte läsa aktuell arbetskatalog"
-#: setup.c:1064 setup.c:1070
+#: setup.c:1069 setup.c:1075
#, 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:1088
#, 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:1172
#, 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:1215
+msgid "open /dev/null or dup failed"
+msgstr "misslyckades öppna /dev/null eller \"dup\""
+
+#: setup.c:1230
+msgid "fork failed"
+msgstr "\"fork\" misslyckades"
+
+#: setup.c:1235
+msgid "setsid failed"
+msgstr "\"setsid\" misslyckades"
+
+#: sha1_file.c:592
#, c-format
msgid "path '%s' does not exist"
msgstr "sökvägen \"%s\" finns inte"
-#: sha1_file.c:624
+#: sha1_file.c:618
#, 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:624
#, 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:630
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "referensarkivet \"%s\" är grunt"
-#: sha1_file.c:644
+#: sha1_file.c:638
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "referensarkivet \"%s\" är ympat"
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:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens."
msgid "submodule '%s' has dirty index"
msgstr "undermodulen \"%s\" har ett smutsigt index"
-#: submodule.c:1876
+#: submodule.c:1878
#, 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:1890 submodule.c:1946
#, 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:1894 builtin/submodule--helper.c:1246
+#: builtin/submodule--helper.c:1256
#, c-format
msgid "could not create directory '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: submodule.c:1895
+#: submodule.c:1897
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"\"%s\" till\n"
"\"%s\"\n"
-#: submodule.c:1979
+#: submodule.c:1981
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "kunde inte rekursera in i undermodulen \"%s\""
-#: submodule.c:2023
+#: submodule.c:2025
msgid "could not start ls-files in .."
msgstr "kunde inte starta ls-files i .."
-#: submodule.c:2043
+#: submodule.c:2045
msgid "BUG: returned path string doesn't match cwd?"
msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"
-#: submodule.c:2062
+#: submodule.c:2064
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree returnerade en oväntad returkod %d"
msgid "transport: invalid depth option '%s'"
msgstr "transport: ogiltig flagga för depth: ”%s”"
-#: transport.c:904
+#: transport.c:916
#, 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:920
#, c-format
msgid ""
"\n"
"för att sända dem till fjärren.\n"
"\n"
-#: transport.c:916
+#: transport.c:928
msgid "Aborting."
msgstr "Avbryter."
-#: transport-helper.c:1074
+#: transport-helper.c:1079
#, c-format
msgid "Could not read ref %s"
msgstr "Kunde inte läsa referensen %s"
msgid "too-short tree file"
msgstr "trädfil för kort"
-#: unpack-trees.c:107
+#: unpack-trees.c:108
#, 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:110
#, 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:113
#, 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:115
#, 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:118
#, 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:120
#, 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:125
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"dem:\n"
"%s"
-#: unpack-trees.c:128
+#: unpack-trees.c:129
#, 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:131
#, 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:134
#, 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:136
#, 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:139
#, 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:141
#, 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:146
#, 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:148
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"utcheckningen:\n"
"%%s"
-#: unpack-trees.c:150
+#: unpack-trees.c:151
#, 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:153
#, 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:156
#, 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:158
#, 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:165
#, 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:168
#, 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:170
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
"utcheckning:\n"
"%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
"utcheckning:\n"
"%s"
-#: unpack-trees.c:173
+#: unpack-trees.c:174
#, c-format
msgid ""
"Cannot update submodule:\n"
"Kan inte uppdatera undermodul:\n"
"%s"
-#: unpack-trees.c:250
+#: unpack-trees.c:251
#, c-format
msgid "Aborting\n"
msgstr "Avbryter\n"
-#: unpack-trees.c:332
+#: unpack-trees.c:333
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"
msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
-#: builtin/am.c:862 builtin/merge.c:1043
+#: builtin/am.c:862 builtin/merge.c:1044
#, c-format
msgid "could not open '%s' for reading"
msgstr "kunde inte öppna \"%s\" för läsning"
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
-#: wt-status.c:150
+#: wt-status.c:151
msgid "Unmerged paths:"
msgstr "Ej sammanslagna sökvägar:"
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:178 wt-status.c:205
#, 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:180 wt-status.c:207
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:184
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:186 wt-status.c:190
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:188
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:199 wt-status.c:1007
msgid "Changes to be committed:"
msgstr "Ändringar att checka in:"
-#: wt-status.c:216 wt-status.c:993
+#: wt-status.c:217 wt-status.c:1016
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
-#: wt-status.c:220
+#: wt-status.c:221
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:223
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:224
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:226
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:238
#, 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:253
msgid "both deleted:"
msgstr "borttaget av bägge:"
-#: wt-status.c:254
+#: wt-status.c:255
msgid "added by us:"
msgstr "tillagt av oss:"
-#: wt-status.c:256
+#: wt-status.c:257
msgid "deleted by them:"
msgstr "borttaget av dem:"
-#: wt-status.c:258
+#: wt-status.c:259
msgid "added by them:"
msgstr "tillagt av dem:"
-#: wt-status.c:260
+#: wt-status.c:261
msgid "deleted by us:"
msgstr "borttaget av oss:"
-#: wt-status.c:262
+#: wt-status.c:263
msgid "both added:"
msgstr "tillagt av bägge:"
-#: wt-status.c:264
+#: wt-status.c:265
msgid "both modified:"
msgstr "ändrat av bägge:"
-#: wt-status.c:274
+#: wt-status.c:275
msgid "new file:"
msgstr "ny fil:"
-#: wt-status.c:276
+#: wt-status.c:277
msgid "copied:"
msgstr "kopierad:"
-#: wt-status.c:278
+#: wt-status.c:279
msgid "deleted:"
msgstr "borttagen:"
-#: wt-status.c:280
+#: wt-status.c:281
msgid "modified:"
msgstr "ändrad:"
-#: wt-status.c:282
+#: wt-status.c:283
msgid "renamed:"
msgstr "namnbytt:"
-#: wt-status.c:284
+#: wt-status.c:285
msgid "typechange:"
msgstr "typbyte:"
-#: wt-status.c:286
+#: wt-status.c:287
msgid "unknown:"
msgstr "okänd:"
-#: wt-status.c:288
+#: wt-status.c:289
msgid "unmerged:"
msgstr "osammanslagen:"
-#: wt-status.c:370
+#: wt-status.c:369
msgid "new commits, "
msgstr "nya incheckningar, "
-#: wt-status.c:372
+#: wt-status.c:371
msgid "modified content, "
msgstr "ändrat innehåll, "
-#: wt-status.c:374
+#: wt-status.c:373
msgid "untracked content, "
msgstr "ospårat innehåll, "
-#: wt-status.c:824
+#: wt-status.c:847
#, 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:879
msgid "Submodules changed but not updated:"
msgstr "Undermoduler ändrade men inte uppdaterade:"
-#: wt-status.c:858
+#: wt-status.c:881
msgid "Submodule changes to be committed:"
msgstr "Undermodulers ändringar att checka in:"
-#: wt-status.c:940
+#: wt-status.c:963
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:1076
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
-#: wt-status.c:1056
+#: wt-status.c:1079
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
-#: wt-status.c:1058
+#: wt-status.c:1081
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:1086
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:1089
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:1099
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:1102
msgid "The current patch is empty."
msgstr "Aktuell patch är tom."
-#: wt-status.c:1083
+#: wt-status.c:1106
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:1108
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:1110
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:1242
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo saknas."
-#: wt-status.c:1221
+#: wt-status.c:1244
msgid "No commands done."
msgstr "Inga kommandon utförda."
-#: wt-status.c:1224
+#: wt-status.c:1247
#, 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:1258
#, c-format
msgid " (see more in file %s)"
msgstr " (se fler i filen %s)"
-#: wt-status.c:1240
+#: wt-status.c:1263
msgid "No commands remaining."
msgstr "Inga kommandon återstår."
-#: wt-status.c:1243
+#: wt-status.c:1266
#, 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:1274
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:1287
#, 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:1292
msgid "You are currently rebasing."
msgstr "Du håller på med en ombasering."
-#: wt-status.c:1283
+#: wt-status.c:1306
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:1308
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:1310
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:1316
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:1320
#, 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:1325
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:1328
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:1332
#, 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:1337
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:1340
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:1342
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:1352
#, 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:1357
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:1360
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:1362
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:1371
#, 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:1376
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:1379
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:1381
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:1392
#, 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:1396
msgid "You are currently bisecting."
msgstr "Du håller på med en \"bisect\"."
-#: wt-status.c:1376
+#: wt-status.c:1399
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:1596
msgid "On branch "
msgstr "På grenen "
-#: wt-status.c:1579
+#: wt-status.c:1602
msgid "interactive rebase in progress; onto "
msgstr "interaktiv ombasering pågår; ovanpå "
-#: wt-status.c:1581
+#: wt-status.c:1604
msgid "rebase in progress; onto "
msgstr "ombasering pågår; ovanpå "
-#: wt-status.c:1586
+#: wt-status.c:1609
msgid "HEAD detached at "
msgstr "HEAD frånkopplad vid "
-#: wt-status.c:1588
+#: wt-status.c:1611
msgid "HEAD detached from "
msgstr "HEAD frånkopplad från "
-#: wt-status.c:1591
+#: wt-status.c:1614
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:1611
+#: wt-status.c:1634
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:1612
+#: wt-status.c:1635
msgid "No commits yet"
msgstr "Inga incheckningar ännu"
-#: wt-status.c:1626
+#: wt-status.c:1649
msgid "Untracked files"
msgstr "Ospårade filer"
-#: wt-status.c:1628
+#: wt-status.c:1651
msgid "Ignored files"
msgstr "Ignorerade filer"
-#: wt-status.c:1632
+#: wt-status.c:1655
#, 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:1661
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:1640
+#: wt-status.c:1663
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:1669
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:1651
+#: wt-status.c:1674
#, 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:1677
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
-#: wt-status.c:1657
+#: wt-status.c:1680
#, 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:1683
#, 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:1686
#, 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:1689 wt-status.c:1694
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
-#: wt-status.c:1669
+#: wt-status.c:1692
#, 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:1696
#, 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:1809
msgid "No commits yet on "
msgstr "Inga incheckningar ännu på "
-#: wt-status.c:1789
+#: wt-status.c:1813
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:1818 wt-status.c:1826
+#: wt-status.c:1844
+msgid "different"
+msgstr "olika"
+
+#: wt-status.c:1846 wt-status.c:1854
msgid "behind "
msgstr "efter "
-#: wt-status.c:1821 wt-status.c:1824
+#: wt-status.c:1849 wt-status.c:1852
msgid "ahead "
msgstr "före "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2318
+#: wt-status.c:2358
#, 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:2364
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:2366
#, 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:440
#, 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:257
msgid "updating files failed"
msgstr "misslyckades uppdatera filer"
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/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 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
msgid "dry run"
msgid "interactive picking"
msgstr "plocka interaktivt"
-#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
+#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302
msgid "select hunks interactively"
msgstr "välj stycken interaktivt"
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:449 builtin/check-ignore.c:177 builtin/checkout.c:280
+#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316
+#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
+#: builtin/rm.c:271 builtin/submodule--helper.c:326
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:405
#, 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:342
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:182
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/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382
+#: parse-options.h:144 parse-options.h:146 parse-options.h:257
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:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:445 builtin/tag.c:418 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:1431 builtin/merge.c:237
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398
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 "<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:677
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:678
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:679
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:680
msgid "Show work cost statistics"
msgstr "Visa statistik över arbetskostnad"
-#: builtin/blame.c:672
+#: builtin/blame.c:681
msgid "Force progress reporting"
msgstr "Tvinga förloppsrapportering"
-#: builtin/blame.c:673
+#: builtin/blame.c:682
msgid "Show output score for blame entries"
msgstr "Visa utdatapoäng för klandringsposter"
-#: builtin/blame.c:674
+#: builtin/blame.c:683
msgid "Show original filename (Default: auto)"
msgstr "Visa originalfilnamn (Standard: auto)"
-#: builtin/blame.c:675
+#: builtin/blame.c:684
msgid "Show original linenumber (Default: off)"
msgstr "Visa ursprungligt radnummer (Standard: av)"
-#: builtin/blame.c:676
+#: builtin/blame.c:685
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:686
msgid "Show porcelain format with per-line commit information"
msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
-#: builtin/blame.c:678
+#: builtin/blame.c:687
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:688
msgid "Show raw timestamp (Default: off)"
msgstr "Visa rå tidsstämpel (Standard: av)"
-#: builtin/blame.c:680
+#: builtin/blame.c:689
msgid "Show long commit SHA1 (Default: off)"
msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
-#: builtin/blame.c:681
+#: builtin/blame.c:690
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
-#: builtin/blame.c:682
+#: builtin/blame.c:691
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:692
msgid "Ignore whitespace differences"
msgstr "Ignorera ändringar i blanksteg"
-#: builtin/blame.c:690
+#: builtin/blame.c:699
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:701
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:702
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:703
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:704 builtin/blame.c:705
msgid "score"
msgstr "poäng"
-#: builtin/blame.c:695
+#: builtin/blame.c:704
msgid "Find line copies within and across files"
msgstr "Hitta kopierade rader inuti och mellan filer"
-#: builtin/blame.c:696
+#: builtin/blame.c:705
msgid "Find line movements within and across files"
msgstr "Hitta flyttade rader inuti och mellan filer"
-#: builtin/blame.c:697
+#: builtin/blame.c:706
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:697
+#: builtin/blame.c:706
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:753
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:804
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
-#: builtin/blame.c:882
+#: builtin/blame.c:890
#, 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:936
msgid "Blaming lines"
msgstr "Klandra rader"
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:622 builtin/for-each-ref.c:40 builtin/tag.c:411
msgid "key"
msgstr "nyckel"
-#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412
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/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
-#: builtin/tag.c:408
+#: builtin/tag.c:414
msgid "object"
msgstr "objekt"
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:628 builtin/for-each-ref.c:49 builtin/tag.c:421
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:629 builtin/for-each-ref.c:38 builtin/tag.c:419
#: 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:652 builtin/clone.c:735
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
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:523
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:524
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:561
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:562
msgid "show object type"
msgstr "visa objekttyp"
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
msgid "show object size"
msgstr "visa objektstorlek"
-#: builtin/cat-file.c:563
+#: builtin/cat-file.c:565
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:566
msgid "pretty-print object's content"
msgstr "visa objektets innehåll snyggt"
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
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:570
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:571 git-submodule.sh:878
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
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:574
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:575
msgid "buffer --batch output"
msgstr "buffra utdata från --batch"
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:577
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:580
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:583
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:585
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:1106 builtin/gc.c:358
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:1203 builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574
+#: builtin/worktree.c:570
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"
-#: builtin/checkout.c:506
+#: builtin/checkout.c:505
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:636
#, 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:677
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:682 builtin/clone.c:684
+#: builtin/checkout.c:681 builtin/clone.c:689
msgid "unable to update HEAD"
msgstr "kan inte uppdatera HEAD"
-#: builtin/checkout.c:686
+#: builtin/checkout.c:685
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:689
+#: builtin/checkout.c:688
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:693
+#: builtin/checkout.c:692
#, 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:694 builtin/checkout.c:1039
#, 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:696
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:748
+#: builtin/checkout.c:747
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
-#: builtin/checkout.c:754
+#: builtin/checkout.c:753
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:773
+#: builtin/checkout.c:772
#, 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:804
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:818
+#: builtin/checkout.c:808
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:848 builtin/checkout.c:1046
+#: builtin/checkout.c:836 builtin/checkout.c:1034
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:940
#, 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:980 builtin/worktree.c:249
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1048
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:1051 builtin/checkout.c:1055
#, 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:1059 builtin/checkout.c:1062 builtin/checkout.c:1067
+#: builtin/checkout.c:1070
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1087
+#: builtin/checkout.c:1075
#, 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:1107 builtin/checkout.c:1109 builtin/clone.c:116
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387
+#: builtin/worktree.c:389
msgid "branch"
msgstr "gren"
-#: builtin/checkout.c:1120
+#: builtin/checkout.c:1108
msgid "create and checkout a new branch"
msgstr "skapa och checka ut en ny gren"
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1110
msgid "create/reset and checkout a branch"
msgstr "skapa/nollställ och checka ut en gren"
-#: builtin/checkout.c:1123
+#: builtin/checkout.c:1111
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
-#: builtin/checkout.c:1124 builtin/worktree.c:373
+#: builtin/checkout.c:1112 builtin/worktree.c:391
msgid "detach HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1113
msgid "set upstream info for new branch"
msgstr "sätt uppströmsinformation för ny gren"
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
msgid "new-branch"
msgstr "ny-gren"
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
msgid "new unparented branch"
msgstr "ny gren utan förälder"
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1116
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:1118
msgid "checkout their version for unmerged files"
msgstr "checka ut deras version för ej sammanslagna filer"
-#: builtin/checkout.c:1132
+#: builtin/checkout.c:1120
msgid "force checkout (throw away local modifications)"
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-#: builtin/checkout.c:1133
+#: builtin/checkout.c:1122
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:1124 builtin/merge.c:239
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:1126 builtin/log.c:1499 parse-options.h:263
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1127
msgid "conflict style (merge or diff3)"
msgstr "konfliktstil (merge eller diff3)"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1130
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:1132
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "förutspå \"git checkout <gren-saknas>\""
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1134
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/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150
+#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556
#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1168
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1185
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
-#: builtin/checkout.c:1199
+#: builtin/checkout.c:1190
msgid "Missing branch name; try -b"
msgstr "Grennamn saknas; försök med -b"
-#: builtin/checkout.c:1235
+#: builtin/checkout.c:1226
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1242
+#: builtin/checkout.c:1233
#, 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:1237
#, 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:1241
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
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:1710
#, 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:1786
msgid "*** Commands ***"
msgstr "*** Kommandon ***"
-#: builtin/clean.c:824 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1783
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:40
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
-#: builtin/clone.c:83
+#: builtin/clone.c:85
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:86 builtin/clone.c:88 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "skapa ett naket (\"bare\") arkiv"
-#: builtin/clone.c:88
+#: builtin/clone.c:90
msgid "create a mirror repository (implies bare)"
msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
-#: builtin/clone.c:90
+#: builtin/clone.c:92
msgid "to clone from a local repository"
msgstr "för att klona från ett lokalt arkiv"
-#: builtin/clone.c:92
+#: builtin/clone.c:94
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:96
msgid "setup as shared repository"
msgstr "skapa som ett delat arkiv"
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
msgid "pathspec"
msgstr "sökvägsangivelse"
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
msgid "initialize submodules in the clone"
msgstr "initiera undermoduler i klonen"
-#: builtin/clone.c:103
+#: builtin/clone.c:105
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:106 builtin/init-db.c:476
msgid "template-directory"
msgstr "mallkatalog"
-#: builtin/clone.c:105 builtin/init-db.c:477
+#: builtin/clone.c:107 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:109 builtin/clone.c:111 builtin/submodule--helper.c:1210
+#: builtin/submodule--helper.c:1577
msgid "reference repository"
msgstr "referensarkiv"
-#: builtin/clone.c:111
+#: builtin/clone.c:113
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:114 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr "namn"
-#: builtin/clone.c:113
+#: builtin/clone.c:115
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:117
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:119
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/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813
#: builtin/pull.c:211
msgid "depth"
msgstr "djup"
-#: builtin/clone.c:119
+#: builtin/clone.c:121
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:122 builtin/fetch.c:153 builtin/pack-objects.c:3017
+#: parse-options.h:154
msgid "time"
msgstr "tid"
-#: builtin/clone.c:121
+#: builtin/clone.c:123
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:124 builtin/fetch.c:155
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:123 builtin/fetch.c:143
+#: builtin/clone.c:125 builtin/fetch.c:156
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:127
msgid "clone only one branch, HEAD or --branch"
msgstr "klona endast en gren, HEAD eller --branch"
-#: builtin/clone.c:127
+#: builtin/clone.c:129
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:131
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:132 builtin/init-db.c:485
msgid "gitdir"
msgstr "gitkat"
-#: builtin/clone.c:131 builtin/init-db.c:486
+#: builtin/clone.c:133 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:134
msgid "key=value"
msgstr "nyckel=värde"
-#: builtin/clone.c:133
+#: builtin/clone.c:135
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/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224
#: builtin/push.c:567
msgid "use IPv4 addresses only"
msgstr "använd endast IPv4-adresser"
-#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227
#: builtin/push.c:569
msgid "use IPv6 addresses only"
msgstr "använd endast IPv6-adresser"
-#: builtin/clone.c:273
+#: builtin/clone.c:276
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:329
#, 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:401
#, c-format
msgid "failed to open '%s'"
msgstr "misslyckades öppna \"%s\""
-#: builtin/clone.c:406
+#: builtin/clone.c:409
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s finns och är ingen katalog"
-#: builtin/clone.c:420
+#: builtin/clone.c:423
#, c-format
msgid "failed to stat %s\n"
msgstr "misslyckades ta status på %s\n"
-#: builtin/clone.c:442
+#: builtin/clone.c:445
#, c-format
msgid "failed to create link '%s'"
msgstr "misslyckades skapa länken \"%s\""
-#: builtin/clone.c:446
+#: builtin/clone.c:449
#, c-format
msgid "failed to copy file to '%s'"
msgstr "misslyckades kopiera filen till \"%s\""
-#: builtin/clone.c:472
+#: builtin/clone.c:475
#, c-format
msgid "done.\n"
msgstr "klart.\n"
-#: builtin/clone.c:484
+#: builtin/clone.c:489
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:566
#, 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:661
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:677
#, c-format
msgid "unable to update %s"
msgstr "kan inte uppdatera %s"
-#: builtin/clone.c:721
+#: builtin/clone.c:726
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:756
msgid "unable to checkout working tree"
msgstr "kunde inte checka ut arbetskatalogen"
-#: builtin/clone.c:796
+#: builtin/clone.c:801
msgid "unable to write parameters to config file"
msgstr "kunde inte skriva parametrar till konfigurationsfilen"
-#: builtin/clone.c:859
+#: builtin/clone.c:864
msgid "cannot repack to clean up"
msgstr "kan inte packa om för att städa upp"
-#: builtin/clone.c:861
+#: builtin/clone.c:866
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:906 builtin/receive-pack.c:1946
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:898
+#: builtin/clone.c:910
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:911
+#: builtin/clone.c:923
#, 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:926
msgid "--bare and --separate-git-dir are incompatible."
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-#: builtin/clone.c:927
+#: builtin/clone.c:939
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:933 builtin/fetch.c:1358
+#: builtin/clone.c:945 builtin/fetch.c:1455
#, 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:955
#, 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:965
#, 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:980 builtin/clone.c:1001 builtin/difftool.c:270
+#: builtin/worktree.c:255 builtin/worktree.c:285
#, 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:985
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:983
+#: builtin/clone.c:1005
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:985
+#: builtin/clone.c:1007
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:1009
+#: builtin/clone.c:1031
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 "--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:284
msgid "failed to unpack HEAD tree object"
msgstr "misslyckades packa upp HEAD:s trädobjekt"
-#: builtin/commit.c:359
+#: builtin/commit.c:325
msgid "unable to create temporary index"
msgstr "kunde inte skapa temporär indexfil"
-#: builtin/commit.c:365
+#: builtin/commit.c:331
msgid "interactive add failed"
msgstr "interaktiv tilläggning misslyckades"
-#: builtin/commit.c:378
+#: builtin/commit.c:344
msgid "unable to update temporary index"
msgstr "kan inte uppdatera temporärt index"
-#: builtin/commit.c:380
+#: builtin/commit.c:346
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:371 builtin/commit.c:395 builtin/commit.c:444
msgid "unable to write new_index file"
msgstr "kunde inte skriva filen new_index"
-#: builtin/commit.c:461
+#: builtin/commit.c:427
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:429
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:437
msgid "cannot read the index"
msgstr "kan inte läsa indexet"
-#: builtin/commit.c:490
+#: builtin/commit.c:456
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
-#: builtin/commit.c:587
+#: builtin/commit.c:553
#, c-format
msgid "commit '%s' lacks author header"
msgstr "incheckningen \"%s\" saknar författarhuvud"
-#: builtin/commit.c:589
+#: builtin/commit.c:555
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
-#: builtin/commit.c:608
+#: builtin/commit.c:574
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:660
+#: builtin/commit.c:626
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:663 builtin/commit.c:696 builtin/commit.c:1024
#, 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:675 builtin/shortlog.c:309
#, 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:677
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:681
#, 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:710 builtin/commit.c:718
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
-#: builtin/commit.c:747
+#: builtin/commit.c:715
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
-#: builtin/commit.c:801
+#: builtin/commit.c:769
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
-#: builtin/commit.c:819
+#: builtin/commit.c:787
#, c-format
msgid ""
"\n"
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:824
+#: builtin/commit.c:792
#, c-format
msgid ""
"\n"
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:837
+#: builtin/commit.c:805
#, 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:813
#, 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:830
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sFörfattare: %.*s <%.*s>"
-#: builtin/commit.c:869
+#: builtin/commit.c:838
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:876
+#: builtin/commit.c:845
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sIncheckare: %.*s <%.*s>"
-#: builtin/commit.c:893
+#: builtin/commit.c:862
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
-#: builtin/commit.c:959
+#: builtin/commit.c:928
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:973 builtin/tag.c:252
+#: builtin/commit.c:942 builtin/tag.c:256
#, 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:986
#, 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:1000
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Ogiltigt ignorerat läge \"%s\""
-#: builtin/commit.c:1104 builtin/commit.c:1349
+#: builtin/commit.c:1014 builtin/commit.c:1264
#, 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:1052
msgid "--long and -z are incompatible"
msgstr "--long och -z är inkompatibla"
-#: builtin/commit.c:1172
+#: builtin/commit.c:1085
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:1094
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:1184
+#: builtin/commit.c:1097
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:1099
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:1102
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:1112
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:1114
+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:1122
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:1139
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:1141
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:1155 builtin/tag.c:542
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
-#: builtin/commit.c:1245
+#: builtin/commit.c:1160
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:1278 builtin/commit.c:1443
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:1365 builtin/commit.c:1650
+#: builtin/commit.c:1280 builtin/commit.c:1445
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1367
+#: builtin/commit.c:1282
msgid "show stash information"
msgstr "visa information om stash"
-#: builtin/commit.c:1369
+#: builtin/commit.c:1284 builtin/commit.c:1447
+msgid "compute full ahead/behind values"
+msgstr "beräkna fullständiga före-/efter-värden"
+
+#: builtin/commit.c:1286
msgid "version"
msgstr "version"
-#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
-#: builtin/worktree.c:523
+#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542
+#: builtin/worktree.c:541
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1372 builtin/commit.c:1654
+#: builtin/commit.c:1289 builtin/commit.c:1451
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:1292 builtin/commit.c:1454
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:1294 builtin/commit.c:1298 builtin/commit.c:1457
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1378 builtin/commit.c:1660
+#: builtin/commit.c:1295 builtin/commit.c:1457
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:1299
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:1301 parse-options.h:167
msgid "when"
msgstr "när"
-#: builtin/commit.c:1385
+#: builtin/commit.c:1302
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:1304
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1406
+#: builtin/commit.c:1323
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:1518
-msgid "detached HEAD"
-msgstr "frånkopplad HEAD"
-
-#: builtin/commit.c:1521
-msgid " (root-commit)"
-msgstr " (rotincheckning)"
-
-#: builtin/commit.c:1618
+#: builtin/commit.c:1413
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1414
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1416
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1622 builtin/tag.c:388
+#: builtin/commit.c:1417 builtin/tag.c:393
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1624 builtin/gc.c:359
+#: builtin/commit.c:1419 builtin/gc.c:359
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1419
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:1420 builtin/merge.c:226 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:391
msgid "message"
msgstr "meddelande"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1420
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:1421 builtin/commit.c:1422 builtin/commit.c:1423
+#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92
msgid "commit"
msgstr "incheckning"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1421
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:1422
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1423
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:1424
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:1425
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/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240
#: builtin/pull.c:149 builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1427
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1428
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1429
msgid "default"
msgstr "standard"
-#: builtin/commit.c:1634 builtin/tag.c:391
+#: builtin/commit.c:1429 builtin/tag.c:397
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:1430
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:1432 builtin/merge.c:238 builtin/pull.c:179
#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1435
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1641
+#: builtin/commit.c:1436
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1642
+#: builtin/commit.c:1437
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:1438
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1439
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1440
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1441
msgid "bypass pre-commit and commit-msg hooks"
msgstr "förbigå pre-commit- och commit-msg-krokar"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1442
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:1658
+#: builtin/commit.c:1455
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:1659
+#: builtin/commit.c:1456
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1461
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:1666
+#: builtin/commit.c:1463
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:1536
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:1748
+#: builtin/commit.c:1543
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:1767
+#: builtin/commit.c:1562
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1573
#, 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:1578
#, 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:1613
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
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 "anonymize output"
msgstr "anonymisera utdata"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<flaggor>] <grupp>"
-#: builtin/fetch.c:26
+#: builtin/fetch.c:27
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
-#: builtin/fetch.c:27
+#: builtin/fetch.c:28
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<flaggor>]"
-#: builtin/fetch.c:113 builtin/pull.c:188
+#: builtin/fetch.c:124 builtin/pull.c:188
msgid "fetch from all remotes"
msgstr "hämta från alla fjärrar"
-#: builtin/fetch.c:115 builtin/pull.c:191
+#: builtin/fetch.c:126 builtin/pull.c:191
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:128 builtin/pull.c:194
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:129 builtin/pull.c:196
msgid "force overwrite of local branch"
msgstr "tvinga överskrivning av lokal gren"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:131
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
-#: builtin/fetch.c:122 builtin/pull.c:198
+#: builtin/fetch.c:133 builtin/pull.c:198
msgid "fetch all tags and associated objects"
msgstr "hämta alla taggar och associerade objekt"
-#: builtin/fetch.c:124
+#: builtin/fetch.c:135
msgid "do not fetch all tags (--no-tags)"
msgstr "hämta inte alla taggar (--no-tags)"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:137
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:139 builtin/pull.c:201
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:141
+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:142 builtin/fetch.c:165 builtin/pull.c:126
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:130
+#: builtin/fetch.c:143
msgid "control recursive fetching of submodules"
msgstr "styr rekursiv hämtning av undermoduler"
-#: builtin/fetch.c:134 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:209
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
-#: builtin/fetch.c:136
+#: builtin/fetch.c:149
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:152 builtin/fetch.c:158 builtin/pull.c:212
msgid "deepen history of shallow clone"
msgstr "fördjupa historik för grund klon"
-#: builtin/fetch.c:141
+#: builtin/fetch.c:154
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:160 builtin/pull.c:215
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:149 builtin/log.c:1463
+#: builtin/fetch.c:162 builtin/log.c:1466
msgid "dir"
msgstr "kat"
-#: builtin/fetch.c:150
+#: builtin/fetch.c:163
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:166
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:170 builtin/pull.c:218
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:171 builtin/pull.c:220
msgid "refmap"
msgstr "referenskarta"
-#: builtin/fetch.c:159 builtin/pull.c:221
+#: builtin/fetch.c:172 builtin/pull.c:221
msgid "specify fetch refmap"
msgstr "ange referenskarta för \"fetch\""
-#: builtin/fetch.c:417
+#: builtin/fetch.c:431
msgid "Couldn't find remote ref HEAD"
msgstr "Kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:535
+#: builtin/fetch.c:549
#, 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:642
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
-#: builtin/fetch.c:632
+#: builtin/fetch.c:646
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:645 builtin/fetch.c:725
+#: builtin/fetch.c:659 builtin/fetch.c:739
msgid "[rejected]"
msgstr "[refuserad]"
-#: builtin/fetch.c:646
+#: builtin/fetch.c:660
msgid "can't fetch in current branch"
msgstr "kan inte hämta i aktuell gren"
-#: builtin/fetch.c:655
+#: builtin/fetch.c:669
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:670 builtin/fetch.c:703 builtin/fetch.c:719
+#: builtin/fetch.c:734
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:675
+#: builtin/fetch.c:689
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:678
+#: builtin/fetch.c:692
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:681
+#: builtin/fetch.c:695
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:720
+#: builtin/fetch.c:734
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:725
+#: builtin/fetch.c:739
msgid "non-fast-forward"
msgstr "ej snabbspolad"
-#: builtin/fetch.c:770
+#: builtin/fetch.c:784
#, 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:804
#, 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:892 builtin/fetch.c:988
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:903
#, 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:958
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:945
+#: builtin/fetch.c:959
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:977
+#: builtin/fetch.c:991
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:978 builtin/remote.c:1024
+#: builtin/fetch.c:992 builtin/remote.c:1024
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:1001
+#: builtin/fetch.c:1015
#, 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:1034
#, 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:1037
#, 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:1277
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:1258 builtin/remote.c:97
+#: builtin/fetch.c:1279 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr "Kunde inte hämta %s"
-#: builtin/fetch.c:1276
+#: builtin/fetch.c:1325 builtin/fetch.c:1498
+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:1350
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:1394
msgid "You need to specify a tag name."
msgstr "Du måste ange namnet på en tagg."
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1439
msgid "Negative depth in --deepen is not supported"
msgstr "Negativa djup stöds inte i --deepen"
-#: builtin/fetch.c:1344
+#: builtin/fetch.c:1441
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen och --depth är ömsesidigt uteslutande"
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1446
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth och --unshallow kan inte användas samtidigt"
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1448
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:1464
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:1466
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:1377
+#: builtin/fetch.c:1475
#, 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:1482
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:420
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:568
msgid "Checking object directories"
msgstr "Kontrollerar objektkataloger"
-#: builtin/fsck.c:635
+#: builtin/fsck.c:660
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<flaggor>] [<objekt>...]"
-#: builtin/fsck.c:641
+#: builtin/fsck.c:666
msgid "show unreachable objects"
msgstr "visa onåbara objekt"
-#: builtin/fsck.c:642
+#: builtin/fsck.c:667
msgid "show dangling objects"
msgstr "visa dinglande objekt"
-#: builtin/fsck.c:643
+#: builtin/fsck.c:668
msgid "report tags"
msgstr "rapportera taggar"
-#: builtin/fsck.c:644
+#: builtin/fsck.c:669
msgid "report root nodes"
msgstr "rapportera rotnoder"
-#: builtin/fsck.c:645
+#: builtin/fsck.c:670
msgid "make index objects head nodes"
msgstr "gör indexojekt till huvudnoder"
-#: builtin/fsck.c:646
+#: builtin/fsck.c:671
msgid "make reflogs head nodes (default)"
msgstr "gör refloggar till huvudnoder (standard)"
-#: builtin/fsck.c:647
+#: builtin/fsck.c:672
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:673
msgid "check only connectivity"
msgstr "kontrollera endast konnektivitet"
-#: builtin/fsck.c:649
+#: builtin/fsck.c:674
msgid "enable more strict checking"
msgstr "aktivera striktare kontroll"
-#: builtin/fsck.c:651
+#: builtin/fsck.c:676
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:677 builtin/prune.c:108
msgid "show progress"
msgstr "visa förlopp"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:678
msgid "show verbose names for reachable objects"
msgstr "visa ordrika namn för nåbara objekt"
-#: builtin/fsck.c:714
+#: builtin/fsck.c:742
msgid "Checking objects"
msgstr "Kontrollerar objekt"
msgid "enable auto-gc mode"
msgstr "aktivera auto-gc-läge"
-#: builtin/gc.c:364
+#: builtin/gc.c:366
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:384
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "Kan inte tolka värdet %s för gc.logexpiry"
-#: builtin/gc.c:409
+#: builtin/gc.c:412
#, 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:414
#, 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:415
#, 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:440
#, 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:487
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
-#: builtin/grep.c:226
+#: builtin/grep.c:225
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: misslyckades skapa tråd. %s"
-#: builtin/grep.c:284
+#: builtin/grep.c:283
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "felaktigt antal trådar angivet (%d) för %s"
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
+#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712
#, 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:460 builtin/grep.c:580 builtin/grep.c:622
#, c-format
msgid "unable to read tree (%s)"
msgstr "kunde inte läsa träd (%s)"
-#: builtin/grep.c:630
+#: builtin/grep.c:637
#, 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:1519
#, 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"
msgid "usage: %s%s"
msgstr "användning: %s%s"
-#: builtin/index-pack.c:156
+#: builtin/index-pack.c:157
#, c-format
msgid "unable to open %s"
msgstr "kunde inte öppna %s"
-#: builtin/index-pack.c:206
+#: builtin/index-pack.c:207
#, 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:227
#, 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:230
#, 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:272
#, 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:282
msgid "early EOF"
msgstr "tidigt filslut"
-#: builtin/index-pack.c:282
+#: builtin/index-pack.c:283
msgid "read error on input"
msgstr "indataläsfel"
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c:295
msgid "used more bytes than were available"
msgstr "använde fler byte än tillgängligt"
-#: builtin/index-pack.c:301
+#: builtin/index-pack.c:302
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:305 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:320
#, c-format
msgid "unable to create '%s'"
msgstr "kunde inte skapa \"%s\""
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
#, c-format
msgid "cannot open packfile '%s'"
msgstr "kan inte öppna paketfilen \"%s\""
-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:340
msgid "pack signature mismatch"
msgstr "paketsignatur stämmer inte överens"
-#: builtin/index-pack.c:341
+#: builtin/index-pack.c:342
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "paketversion %<PRIu32> stöds ej"
-#: builtin/index-pack.c:359
+#: builtin/index-pack.c:360
#, 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:481
#, c-format
msgid "inflate returned %d"
msgstr "inflate returnerade %d"
-#: builtin/index-pack.c:529
+#: builtin/index-pack.c:530
msgid "offset value overflow for delta base object"
msgstr "indexvärdespill för deltabasobjekt"
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:538
msgid "delta base offset is out of bound"
msgstr "deltabasindex utanför gränsen"
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:546
#, c-format
msgid "unknown object type %d"
msgstr "okänd objekttyp %d"
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
msgid "cannot pread pack file"
msgstr "kan inte utföra \"pread\" på paketfil"
-#: builtin/index-pack.c:578
+#: builtin/index-pack.c:579
#, 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:605
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:750 builtin/index-pack.c:756 builtin/index-pack.c:779
+#: builtin/index-pack.c:818 builtin/index-pack.c:827
#, 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:753 builtin/pack-objects.c:182
+#: builtin/pack-objects.c:276
#, c-format
msgid "unable to read %s"
msgstr "kunde inte läsa %s"
-#: builtin/index-pack.c:815
+#: builtin/index-pack.c:816
#, 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:824
#, 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:838
#, c-format
msgid "invalid blob object %s"
msgstr "ogiltigt blob-objekt %s"
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:853
#, c-format
msgid "invalid %s"
msgstr "ogiltigt %s"
-#: builtin/index-pack.c:855
+#: builtin/index-pack.c:856
msgid "Error in object"
msgstr "Fel i objekt"
-#: builtin/index-pack.c:857
+#: builtin/index-pack.c:858
#, 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:930 builtin/index-pack.c:961
msgid "failed to apply delta"
msgstr "misslyckades tillämpa delta"
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:1397
+#, 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:1422
#, 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:1430
#, 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:1439
+#: builtin/index-pack.c:1454
+msgid "error while closing pack file"
+msgstr "fel vid stängning av paketfil"
+
+#: builtin/index-pack.c:1468
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
-#: builtin/index-pack.c:1447
+#: builtin/index-pack.c:1476
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1513
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1553
+#: builtin/index-pack.c:1581
#, 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:1583
#, 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:1631
#, 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:1638
#, 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:1675
+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:1724 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1743 builtin/index-pack.c:1747
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1763
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:1765
msgid "--stdin requires a git repository"
msgstr "--stdin kräver ett git-arkiv"
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1771
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
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:522
#, 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 "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:67
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:49
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<flaggor>] [<incheckning>...]"
-#: builtin/merge.c:49
+#: builtin/merge.c:50
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:50
+#: builtin/merge.c:51
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:107
+#: builtin/merge.c:108
msgid "switch `m' requires a value"
msgstr "flaggan \"m\" behöver ett värde"
-#: builtin/merge.c:144
+#: builtin/merge.c:145
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
-#: builtin/merge.c:145
+#: builtin/merge.c:146
#, c-format
msgid "Available strategies are:"
msgstr "Tillgängliga strategier är:"
-#: builtin/merge.c:150
+#: builtin/merge.c:151
#, 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:201 builtin/pull.c:137
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:204 builtin/pull.c:140
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:205 builtin/pull.c:143
msgid "(synonym to --stat)"
msgstr "(synonym till --stat)"
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:207 builtin/pull.c:146
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:210 builtin/pull.c:152
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:212 builtin/pull.c:155
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:214 builtin/pull.c:158
msgid "edit message before committing"
msgstr "redigera meddelande innan incheckning"
-#: builtin/merge.c:214
+#: builtin/merge.c:215
msgid "allow fast-forward (default)"
msgstr "tillåt snabbspolning (standard)"
-#: builtin/merge.c:216 builtin/pull.c:164
+#: builtin/merge.c:217 builtin/pull.c:164
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:221 builtin/pull.c:167
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:222 builtin/notes.c:777 builtin/pull.c:171
#: builtin/revert.c:109
msgid "strategy"
msgstr "strategi"
-#: builtin/merge.c:222 builtin/pull.c:172
+#: builtin/merge.c:223 builtin/pull.c:172
msgid "merge strategy to use"
msgstr "sammanslagningsstrategi att använda"
-#: builtin/merge.c:223 builtin/pull.c:175
+#: builtin/merge.c:224 builtin/pull.c:175
msgid "option=value"
msgstr "alternativ=värde"
-#: builtin/merge.c:224 builtin/pull.c:176
+#: builtin/merge.c:225 builtin/pull.c:176
msgid "option for selected merge strategy"
msgstr "alternativ för vald sammanslagningsstrategi"
-#: builtin/merge.c:226
+#: builtin/merge.c:227
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
-#: builtin/merge.c:230
+#: builtin/merge.c:231
msgid "abort the current in-progress merge"
msgstr "avbryt den pågående sammanslagningen"
-#: builtin/merge.c:232
+#: builtin/merge.c:233
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:235 builtin/pull.c:183
msgid "allow merging unrelated histories"
msgstr "tillåt sammanslagning av orelaterade historier"
-#: builtin/merge.c:240
+#: builtin/merge.c:241
msgid "verify commit-msg hook"
msgstr "bekräfta commit-msg-krok"
-#: builtin/merge.c:265
+#: builtin/merge.c:266
msgid "could not run stash."
msgstr "kunde köra stash."
-#: builtin/merge.c:270
+#: builtin/merge.c:271
msgid "stash failed"
msgstr "stash misslyckades"
-#: builtin/merge.c:275
+#: builtin/merge.c:276
#, 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:298 builtin/merge.c:315
msgid "read-tree failed"
msgstr "read-tree misslyckades"
-#: builtin/merge.c:344
+#: builtin/merge.c:345
msgid " (nothing to squash)"
msgstr " (inget att platta till)"
-#: builtin/merge.c:355
+#: builtin/merge.c:356
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:405
+#: builtin/merge.c:406
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:455
+#: builtin/merge.c:456
#, 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:546
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
-#: builtin/merge.c:667
+#: builtin/merge.c:668
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:682
#, 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:697
#, 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."
-#: builtin/merge.c:819
+#: builtin/merge.c:820
#, c-format
msgid "Wonderful.\n"
msgstr "Underbart.\n"
-#: builtin/merge.c:872
+#: builtin/merge.c:873
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
-#: builtin/merge.c:911
+#: builtin/merge.c:912
msgid "No current branch."
msgstr "Inte på någon gren."
-#: builtin/merge.c:913
+#: builtin/merge.c:914
msgid "No remote for the current branch."
msgstr "Ingen fjärr för aktuell gren."
-#: builtin/merge.c:915
+#: builtin/merge.c:916
msgid "No default upstream defined for the current branch."
msgstr "Ingen standarduppström angiven för aktuell gren."
-#: builtin/merge.c:920
+#: builtin/merge.c:921
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Ingen fjärrspårande gren för %s från %s"
-#: builtin/merge.c:973
+#: builtin/merge.c:974
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
-#: builtin/merge.c:1075
+#: builtin/merge.c:1076
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "inte något vi kan slå ihop med %s: %s"
-#: builtin/merge.c:1109
+#: builtin/merge.c:1110
msgid "not something we can merge"
msgstr "inte något vi kan slå ihop"
-#: builtin/merge.c:1174
+#: builtin/merge.c:1212
msgid "--abort expects no arguments"
msgstr "--abort tar inga argument"
-#: builtin/merge.c:1178
+#: builtin/merge.c:1216
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:1228
msgid "--continue expects no arguments"
msgstr "--continue tar inga argument"
-#: builtin/merge.c:1194
+#: builtin/merge.c:1232
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:1248
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:1255
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:1258
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:1267
msgid "You cannot combine --squash with --no-ff."
msgstr "Du kan inte kombinera --squash med --no-ff."
-#: builtin/merge.c:1237
+#: builtin/merge.c:1275
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:1292
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:1294
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:1299
#, 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:1301
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:1335
#, 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:1338
#, 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:1341
#, 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:1344
#, 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:1403
msgid "refusing to merge unrelated histories"
msgstr "vägrar slå samman orelaterad historik"
-#: builtin/merge.c:1377
+#: builtin/merge.c:1412
msgid "Already up to date."
msgstr "Redan à jour."
-#: builtin/merge.c:1387
+#: builtin/merge.c:1422
#, c-format
msgid "Updating %s..%s\n"
msgstr "Uppdaterar %s..%s\n"
-#: builtin/merge.c:1428
+#: builtin/merge.c:1463
#, 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:1470
#, c-format
msgid "Nope.\n"
msgstr "Nej.\n"
-#: builtin/merge.c:1460
+#: builtin/merge.c:1495
msgid "Already up to date. Yeeah!"
msgstr "Redan à jour. Toppen!"
-#: builtin/merge.c:1466
+#: builtin/merge.c:1501
msgid "Not possible to fast-forward, aborting."
msgstr "Kan inte snabbspola, avbryter."
-#: builtin/merge.c:1489 builtin/merge.c:1568
+#: builtin/merge.c:1524 builtin/merge.c:1603
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Återspolar trädet till orört...\n"
-#: builtin/merge.c:1493
+#: builtin/merge.c:1528
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Försöker sammanslagningsstrategin %s...\n"
-#: builtin/merge.c:1559
+#: builtin/merge.c:1594
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
-#: builtin/merge.c:1561
+#: builtin/merge.c:1596
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Sammanslagning med strategin %s misslyckades.\n"
-#: builtin/merge.c:1570
+#: builtin/merge.c:1605
#, 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:1617
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "force move/rename even if target exists"
msgstr "tvinga flytta/ändra namn även om målet finns"
-#: builtin/mv.c:126
+#: builtin/mv.c:127
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:712 builtin/repack.c:394
#, 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:506
#, 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:509
#, 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:106 builtin/worktree.c:160
msgid "do not remove, show only"
msgstr "ta inte bort, bara visa"
msgstr ""
"git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]"
-#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
+#: builtin/pack-objects.c:195 builtin/pack-objects.c:198
#, c-format
msgid "deflate error (%d)"
msgstr "fel i deflate (%d)"
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:791
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:804
msgid "Writing objects"
msgstr "Skriver objekt"
-#: builtin/pack-objects.c:1081
+#: builtin/pack-objects.c:1084
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:2454
msgid "Compressing objects"
msgstr "Komprimerar objekt"
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2625
msgid "invalid value for --missing"
msgstr "ogiltigt värde för --missing"
-#: builtin/pack-objects.c:2902
+#: builtin/pack-objects.c:2928
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:2906
+#: builtin/pack-objects.c:2932
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2962
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2964
msgid "show progress meter"
msgstr "visa förloppsindikator"
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2966
msgid "show progress meter during object writing phase"
msgstr "visa förloppsindikator under objektskrivningsfasen"
-#: builtin/pack-objects.c:2943
+#: builtin/pack-objects.c:2969
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:2970
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2945
+#: builtin/pack-objects.c:2971
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:2974
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
-#: builtin/pack-objects.c:2950
+#: builtin/pack-objects.c:2976
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:2978
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
-#: builtin/pack-objects.c:2954
+#: builtin/pack-objects.c:2980
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:2982
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:2984
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:2986
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
-#: builtin/pack-objects.c:2962
+#: builtin/pack-objects.c:2988
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
-#: builtin/pack-objects.c:2964
+#: builtin/pack-objects.c:2990
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
-#: builtin/pack-objects.c:2966
+#: builtin/pack-objects.c:2992
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:2994
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:2996
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
-#: builtin/pack-objects.c:2972
+#: builtin/pack-objects.c:2998
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:3001
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:3004
msgid "include objects referred by reflog entries"
msgstr "inkludera objekt som refereras från referensloggposter"
-#: builtin/pack-objects.c:2981
+#: builtin/pack-objects.c:3007
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:3010
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
-#: builtin/pack-objects.c:2986
+#: builtin/pack-objects.c:3012
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:3014
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3016
msgid "pack loose unreachable objects"
msgstr "packa lösa onåbara objekt"
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3018
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:3021
msgid "create thin packs"
msgstr "skapa tunna paket"
-#: builtin/pack-objects.c:2997
+#: builtin/pack-objects.c:3023
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:3025
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:3027
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
-#: builtin/pack-objects.c:3003
+#: builtin/pack-objects.c:3029
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
-#: builtin/pack-objects.c:3005
+#: builtin/pack-objects.c:3031
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:3033
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:3036
msgid "handling for missing objects"
msgstr "hantering av saknade objekt"
-#: builtin/pack-objects.c:3144
+#: builtin/pack-objects.c:3039
+msgid "do not pack objects in promisor packfiles"
+msgstr "packa inte objekt i kontraktspackfiler"
+
+#: builtin/pack-objects.c:3178
msgid "Counting objects"
msgstr "Räknar objekt"
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:107
msgid "report pruned objects"
msgstr "rapportera borttagna objekt"
-#: builtin/prune.c:109
+#: builtin/prune.c:110
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:112
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "begränsa vandring av objekt utanför kontraktspackfiler."
+
+#: builtin/prune.c:126
msgid "cannot prune in a precious-objects repo"
msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
msgid "<remote>"
msgstr "<fjärr>"
-#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<gren>"
"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:819
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorera --verify-signatures för ombasering"
-#: builtin/pull.c:865
+#: builtin/pull.c:867
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash är endast giltig med --rebase."
-#: builtin/pull.c:873
+#: builtin/pull.c:875
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:878
msgid "pull with rebase"
msgstr "pull med ombasering"
-#: builtin/pull.c:877
+#: builtin/pull.c:879
msgid "please commit or stash them."
msgstr "checka in eller använd \"stash\" på dem."
-#: builtin/pull.c:902
+#: builtin/pull.c:904
#, 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:909
#, 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:924
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:928
msgid "Cannot rebase onto multiple branches."
msgstr "Kan inte ombasera ovanpå flera grenar."
-#: builtin/pull.c:933
+#: builtin/pull.c:935
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
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 "continue rebase"
msgstr "fortsätt ombasering"
-#: builtin/rebase--helper.c:27
+#: builtin/rebase--helper.c:29
msgid "abort rebase"
msgstr "avbryt ombasering"
-#: builtin/rebase--helper.c:30
+#: builtin/rebase--helper.c:32
msgid "make rebase script"
msgstr "skapa ombaseringsskript"
-#: builtin/rebase--helper.c:32
+#: builtin/rebase--helper.c:34
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:36
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:38
msgid "check the todo list"
msgstr "kontrollera todo-listan"
-#: builtin/rebase--helper.c:38
+#: builtin/rebase--helper.c:40
msgid "skip unnecessary picks"
msgstr "hoppa över onödiga \"pick\"-kommandon"
-#: builtin/rebase--helper.c:40
+#: builtin/rebase--helper.c:42
msgid "rearrange fixup/squash lines"
msgstr "ordna om fixup-/squash-rader"
-#: builtin/rebase--helper.c:42
+#: builtin/rebase--helper.c:44
msgid "insert exec commands in todo list"
msgstr "lägg in exec-kommandon i todo-listan"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-katalog>"
-#: builtin/receive-pack.c:840
+#: builtin/receive-pack.c:841
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:861
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:1934
msgid "quiet"
msgstr "tyst"
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1948
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"
"Använd --no-write-bitmap-index eller inaktivera inställningen\n"
"pack.writebitmaps"
-#: builtin/repack.c:168
+#: builtin/repack.c:170
msgid "pack everything in a single pack"
msgstr "packa allt i ett enda paket"
-#: builtin/repack.c:170
+#: builtin/repack.c:172
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:175
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:177
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:179
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:181
msgid "do not run git-update-server-info"
msgstr "kör inte git-update-server-info"
-#: builtin/repack.c:182
+#: builtin/repack.c:184
msgid "pass --local to git-pack-objects"
msgstr "sänd --local till git-pack-objects"
-#: builtin/repack.c:184
+#: builtin/repack.c:186
msgid "write bitmap index"
msgstr "skriv bitkartindex"
-#: builtin/repack.c:185
+#: builtin/repack.c:187
msgid "approxidate"
msgstr "cirkadatum"
-#: builtin/repack.c:186
+#: builtin/repack.c:188
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:190
msgid "with -a, repack unreachable objects"
msgstr "med -a, packa om onåbara objekt"
-#: builtin/repack.c:190
+#: builtin/repack.c:192
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:193 builtin/repack.c:199
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:192
+#: builtin/repack.c:194
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:196
msgid "limits the maximum delta depth"
msgstr "begränsa maximalt deltadjup"
-#: builtin/repack.c:196
+#: builtin/repack.c:198
msgid "limits the maximum number of threads"
msgstr "begränsar maximalt antal trådar"
-#: builtin/repack.c:198
+#: builtin/repack.c:200
msgid "maximum size of each packfile"
msgstr "maximal storlek på varje paketfil"
-#: builtin/repack.c:200
+#: builtin/repack.c:202
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:212
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:216
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:410 builtin/worktree.c:148
#, c-format
msgid "failed to remove '%s'"
msgstr "misslyckades ta bort \"%s\""
msgid "replace the ref if it exists"
msgstr "ersätt referensen om den finns"
-#: builtin/replace.c:443
+#: builtin/replace.c:444
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:445
msgid "use this format"
msgstr "använd detta format"
msgid "Failed to find tree of %s."
msgstr "Kunde inte hitta träder 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"
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"
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:35 builtin/submodule--helper.c:1669
#, 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:42 builtin/submodule--helper.c:1678
#, 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:59
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr "submodule--helper print-default-remote tar inga argument"
+
+#: builtin/submodule--helper.c:96
#, 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:404 builtin/submodule--helper.c:1198
msgid "alternative anchor for relative paths"
msgstr "alternativa ankare för relativa sökvägar"
-#: builtin/submodule--helper.c:375
+#: builtin/submodule--helper.c:409
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:460 builtin/submodule--helper.c:483
#, 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:498
#, 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:509
#, 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:513
#, 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:523
#, 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:530
#, 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:552
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:557
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:625 builtin/submodule--helper.c:747
#, 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:660
#, 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:687 builtin/submodule--helper.c:856
#, 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:711 builtin/submodule--helper.c:1021
msgid "Suppress submodule status output"
msgstr "Hindra statusutskrift för undermodul"
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:712
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:713
msgid "recurse into nested submodules"
msgstr "rekursera in i nästlade undermoduler"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:718
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:742
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:806
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "Synkroniserar undermodul-url för \"%s\"\n"
+
+#: builtin/submodule--helper.c:812
+#, 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:826
+#, 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:837
+#, 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:885
+msgid "Suppress output of synchronizing submodule url"
+msgstr "Dölj utdata från synkroniering av undermodul-url"
+
+#: builtin/submodule--helper.c:887
+msgid "Recurse into nested submodules"
+msgstr "Rekursera in i nästlade undermoduler"
+
+#: builtin/submodule--helper.c:892
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]"
+
+#: builtin/submodule--helper.c:946
+#, 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:958
+#, 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:966
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "Rensade katalogen \"%s\"\n"
+
+#: builtin/submodule--helper.c:968
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n"
+
+#: builtin/submodule--helper.c:977
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "kunde inte skapa tom undermodulskatalog %s"
+
+#: builtin/submodule--helper.c:993
+#, 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:1022
+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:1023
+msgid "Unregister all submodules"
+msgstr "Avregistrera alla undermoduler"
+
+#: builtin/submodule--helper.c:1028
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]"
+
+#: builtin/submodule--helper.c:1042
+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:1133 builtin/submodule--helper.c:1136
#, 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:1172
#, 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:1179
#, 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:1201
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:1204
msgid "name of the new submodule"
msgstr "namn på den nya undermodulen"
-#: builtin/submodule--helper.c:870
+#: builtin/submodule--helper.c:1207
msgid "url where to clone the submodule from"
msgstr "URL att klona undermodulen från"
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1213
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:1216 builtin/submodule--helper.c:1587
msgid "force cloning progress"
msgstr "tvinga kloningsförlopp"
-#: builtin/submodule--helper.c:884
+#: builtin/submodule--helper.c:1221
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:1252
#, 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:1267
#, 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:1332
#, 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:1336
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:1365
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Hoppar över ej sammanslagen undermodul %s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1394
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Hoppar över undermodulen \"%s\""
-#: builtin/submodule--helper.c:1190
+#: builtin/submodule--helper.c:1527
#, 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:1538
#, 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:1568 builtin/submodule--helper.c:1788
msgid "path into the working tree"
msgstr "sökväg inuti arbetskatalogen"
-#: builtin/submodule--helper.c:1234
+#: builtin/submodule--helper.c:1571
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:1575
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout eller none"
-#: builtin/submodule--helper.c:1242
+#: builtin/submodule--helper.c:1579
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:1582
msgid "parallel jobs"
msgstr "parallella jobb"
-#: builtin/submodule--helper.c:1247
+#: builtin/submodule--helper.c:1584
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:1585
msgid "don't print cloning progress"
msgstr "skriv inte klonförlopp"
-#: builtin/submodule--helper.c:1255
+#: builtin/submodule--helper.c:1592
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:1605
msgid "bad value for update parameter"
msgstr "felaktigt värde för parametern update"
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1673
#, 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:1789
msgid "recurse into submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:1795
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:1857
#, 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:1863
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
msgid "unable to write tag file"
msgstr "kunde inte skriva tagg-filen"
-#: builtin/tag.c:215
+#: builtin/tag.c:216
msgid "bad object type."
msgstr "felaktig objekttyp."
-#: builtin/tag.c:261
+#: builtin/tag.c:265
msgid "no tag message?"
msgstr "inget taggmeddelande?"
-#: builtin/tag.c:268
+#: builtin/tag.c:272
#, 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:381
msgid "list tag names"
msgstr "lista taggnamn"
-#: builtin/tag.c:378
+#: builtin/tag.c:383
msgid "print <n> lines of each tag message"
msgstr "visa <n> rader från varje taggmeddelande"
-#: builtin/tag.c:380
+#: builtin/tag.c:385
msgid "delete tags"
msgstr "ta bort taggar"
-#: builtin/tag.c:381
+#: builtin/tag.c:386
msgid "verify tags"
msgstr "verifiera taggar"
-#: builtin/tag.c:383
+#: builtin/tag.c:388
msgid "Tag creation options"
msgstr "Alternativ för att skapa taggar"
-#: builtin/tag.c:385
+#: builtin/tag.c:390
msgid "annotated tag, needs a message"
msgstr "annoterad tagg, behöver meddelande"
-#: builtin/tag.c:387
+#: builtin/tag.c:392
msgid "tag message"
msgstr "taggmeddelande"
-#: builtin/tag.c:389
+#: builtin/tag.c:394
+msgid "force edit of tag message"
+msgstr "tvinga redigering av incheckningsmeddelande"
+
+#: builtin/tag.c:395
msgid "annotated and GPG-signed tag"
msgstr "annoterad och GPG-signerad tagg"
-#: builtin/tag.c:393
+#: builtin/tag.c:399
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:400
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:401 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "skapa en reflog"
-#: builtin/tag.c:397
+#: builtin/tag.c:403
msgid "Tag listing options"
msgstr "Alternativ för listning av taggar"
-#: builtin/tag.c:398
+#: builtin/tag.c:404
msgid "show tag list in columns"
msgstr "lista taggar i spalter"
-#: builtin/tag.c:399 builtin/tag.c:401
+#: builtin/tag.c:405 builtin/tag.c:407
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:406 builtin/tag.c:408
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:409
msgid "print only tags that are merged"
msgstr "visa endast taggar som slagits samman"
-#: builtin/tag.c:404
+#: builtin/tag.c:410
msgid "print only tags that are not merged"
msgstr "visa endast taggar som ej slagits samman"
-#: builtin/tag.c:409
+#: builtin/tag.c:415
msgid "print only tags of the object"
msgstr "visa endast taggar för objektet"
-#: builtin/tag.c:453
+#: builtin/tag.c:459
msgid "--column and -n are incompatible"
msgstr "--column och -n är inkompatibla"
-#: builtin/tag.c:475
+#: builtin/tag.c:481
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:483
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:485
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:487
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:489
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:500
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:519
msgid "too many params"
msgstr "för många parametrar"
-#: builtin/tag.c:519
+#: builtin/tag.c:525
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "\"%s\" är inte ett giltigt taggnamn."
-#: builtin/tag.c:524
+#: builtin/tag.c:530
#, c-format
msgid "tag '%s' already exists"
msgstr "taggen \"%s\" finns redan"
-#: builtin/tag.c:554
+#: builtin/tag.c:561
#, 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"
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>"
-#: builtin/worktree.c:58
+#: builtin/worktree.c:60
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Tar bort worktrees/%s: inte en giltig katalog"
-#: builtin/worktree.c:64
+#: builtin/worktree.c:66
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
-#: builtin/worktree.c:69 builtin/worktree.c:78
+#: builtin/worktree.c:71 builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
-#: builtin/worktree.c:88
+#: builtin/worktree.c:90
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
"Tar bort worktrees/%s: kort läsning (förväntade %<PRIuMAX> byte, läste "
"%<PRIuMAX>)"
-#: builtin/worktree.c:96
+#: builtin/worktree.c:98
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
-#: builtin/worktree.c:112
+#: builtin/worktree.c:114
#, 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:161
msgid "report pruned working trees"
msgstr "rapportera borttagna arbetskataloger"
-#: builtin/worktree.c:161
+#: builtin/worktree.c:163
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:238
#, c-format
msgid "'%s' already exists"
msgstr "\"%s\" finns redan"
-#: builtin/worktree.c:267
+#: builtin/worktree.c:269
#, c-format
msgid "could not create directory of '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/worktree.c:306
+#: builtin/worktree.c:308
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Förbereder %s (identifieraren %s)"
-#: builtin/worktree.c:368
+#: builtin/worktree.c:385
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:388
msgid "create a new branch"
msgstr "skapa en ny gren"
-#: builtin/worktree.c:372
+#: builtin/worktree.c:390
msgid "create or reset a branch"
msgstr "skapa eller återställ en gren"
-#: builtin/worktree.c:374
+#: builtin/worktree.c:392
msgid "populate the new working tree"
msgstr "befolka den nya arbetskatalogen"
-#: builtin/worktree.c:375
+#: builtin/worktree.c:393
msgid "keep the new working tree locked"
msgstr "låt arbetskatalogen förbli låst"
-#: builtin/worktree.c:377
+#: builtin/worktree.c:395
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:398
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:406
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B och --detach är ömsesidigt uteslutande"
-#: builtin/worktree.c:453
+#: builtin/worktree.c:471
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:571
msgid "reason for locking"
msgstr "orsak till lås"
-#: builtin/worktree.c:565 builtin/worktree.c:598
+#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670
+#: builtin/worktree.c:809
#, 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:585 builtin/worktree.c:618
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:590
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "\"%s\" är redan låst, orsak: %s"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:592
#, c-format
msgid "'%s' is already locked"
msgstr "\"%s\" är redan låst"
-#: builtin/worktree.c:602
+#: builtin/worktree.c:620
#, c-format
msgid "'%s' is not locked"
msgstr "\"%s\" är inte låst"
+#: builtin/worktree.c:645
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort"
+
+#: builtin/worktree.c:672 builtin/worktree.c:811
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "\"%s\" är inte en huvudarbetskatalog"
+
+#: builtin/worktree.c:677
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "kunde inte lista ut målnamn från \"%s\""
+
+#: builtin/worktree.c:683
+#, c-format
+msgid "target '%s' already exists"
+msgstr "målet \"%s\" finns redan"
+
+#: builtin/worktree.c:690
+#, 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:692
+msgid "cannot move a locked working tree"
+msgstr "kan inte flytta en låst arbetskatalog"
+
+#: builtin/worktree.c:695
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s"
+
+#: builtin/worktree.c:700
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "misslyckades flytta \"%s\" till \"%s\""
+
+#: builtin/worktree.c:748
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "misslyckades köra \"git status\" på \"%s\""
+
+#: builtin/worktree.c:752
+#, 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:757
+#, 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:768 builtin/worktree.c:782
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "misslyckades ta bort \"%s\""
+
+#: builtin/worktree.c:794
+msgid "force removing even if the worktree is dirty"
+msgstr "tvinga ta bort även om arbetskatalogen är smutsig"
+
+#: builtin/worktree.c:815
+#, 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:817
+msgid "cannot remove a locked working tree"
+msgstr "kan inte ta bort en låst arbetskatalog"
+
+#: builtin/worktree.c:820
+#, 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
+#: upload-pack.c:27
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<flaggor>] <katalog>"
-#: upload-pack.c:1041
+#: upload-pack.c:1070
msgid "quit after a single request/response exchange"
msgstr "avsluta omedelbart efter första anrop/svar-utväxling"
-#: upload-pack.c:1043
+#: upload-pack.c:1072
msgid "exit immediately after initial ref advertisement"
msgstr "avsluta omedelbart efter inledande kungörelse av referenser"
-#: upload-pack.c:1045
+#: upload-pack.c:1074
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
+#: upload-pack.c:1076
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "avbryt överföringen efter <n> sekunders inaktivitet"
msgid "print debugging messages to stderr"
msgstr "skriv felsökningsmeddelanden på standard fel"
+#: git.c:8
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+" [-p | --paginate | --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 | --no-pager] [--no-replace-objects] [--bare]\n"
+" [--git-dir=<sökväg>] [--work-tree=<sökväg>] [--namespace=<namn>]\n"
+" <kommando> [<flaggor>]"
+
#: git.c:15
msgid ""
"'git help -a' and 'git help -g' list available subcommands and some\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:95
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "ingen katalog angavs för --git-dir\n"
+
+#: git.c:109
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "ingen namnrymd angavs för --namespace\n"
+
+#: git.c:123
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr "ingen katalog angavs för --work-tree\n"
+
+#: git.c:137
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "inget prefix angavs för --super-prefix\n"
+
+#: git.c:159
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c förväntar en konfigurationssträng\n"
+
+#: git.c:197
+#, c-format
+msgid "no directory given for -C\n"
+msgstr "ingen katalog angavs för -C\n"
+
+#: git.c:212
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "okänd flagga: %s\n"
+
+#: git.c:687
+#, 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:699
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "misslyckades köra kommandot \"%s\": %s\n"
+
+#: http.c:342
#, 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:363
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:372
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:1857
#, c-format
msgid ""
"unable to update url base from redirection:\n"
" bad om: %s\n"
" omdirigering: %s"
-#: remote-curl.c:324
+#: remote-curl.c:345
#, 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"
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
+#: parse-options.h:157
msgid "expiry-date"
msgstr "giltig-till"
-#: parse-options.h:160
+#: parse-options.h:172
msgid "no-op (backward compatibility)"
msgstr "ingen funktion (bakåtkompatibilitet)"
-#: parse-options.h:238
+#: parse-options.h:250
msgid "be more verbose"
msgstr "var mer pratsam"
-#: parse-options.h:240
+#: parse-options.h:252
msgid "be more quiet"
msgstr "var mer tyst"
-#: parse-options.h:246
+#: parse-options.h:258
msgid "use <n> digits to display SHA-1s"
msgstr "använd <n> siffror för att visa SHA-1:or"
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:60
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:163 git-rebase.sh:409
#, 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:174
msgid "Applied autostash."
msgstr "Tillämpade autostash."
-#: git-rebase.sh:174
+#: git-rebase.sh:177
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Kan inte spara $stash_sha1"
-#: git-rebase.sh:214
+#: git-rebase.sh:218
msgid "The pre-rebase hook refused to rebase."
msgstr "Kroken pre-rebase vägrade ombaseringen."
-#: git-rebase.sh:219
+#: git-rebase.sh:223
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:370
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
-#: git-rebase.sh:374
+#: git-rebase.sh:381
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:388
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
-#: git-rebase.sh:384
+#: git-rebase.sh:391
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:435
#, 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:491
#, sh-format
msgid "invalid upstream '$upstream_name'"
msgstr "ogiltig uppström \"$upstream_name\""
-#: git-rebase.sh:504
+#: git-rebase.sh:515
#, 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:518 git-rebase.sh:522
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: ingen sammanslagningsbas finns"
-#: git-rebase.sh:516
+#: git-rebase.sh:527
#, 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:553
#, 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:586
msgid "Cannot autostash"
msgstr "Kan inte utföra \"autostash\""
-#: git-rebase.sh:580
+#: git-rebase.sh:591
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Skapade autostash: $stash_abbrev"
-#: git-rebase.sh:584
+#: git-rebase.sh:595
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
-#: git-rebase.sh:607
+#: git-rebase.sh:618
#, sh-format
msgid "HEAD is up to date."
msgstr "HEAD är à jour."
-#: git-rebase.sh:609
+#: git-rebase.sh:620
#, 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:628
#, sh-format
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD är à jour, ombasering framtvingad."
-#: git-rebase.sh:619
+#: git-rebase.sh:630
#, 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:642
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Ändringar från $mb till $onto:"
-#: git-rebase.sh:640
+#: git-rebase.sh:651
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:661
#, 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:340
msgid "Cannot remove worktree changes"
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
-#: git-stash.sh:489
+#: git-stash.sh:488
#, sh-format
msgid "unknown option: $opt"
msgstr "okänd flagga: $opt"
-#: git-stash.sh:502
+#: git-stash.sh:501
msgid "No stash entries found."
msgstr "Inga \"stash”-poster hittades."
-#: git-stash.sh:509
+#: git-stash.sh:508
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "För många revisioner angivna: $REV"
-#: git-stash.sh:524
+#: git-stash.sh:523
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference är inte en giltig referens"
-#: git-stash.sh:552
+#: git-stash.sh:551
#, 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:562
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "\"$args\" är inte en \"stash\"-referens"
-#: git-stash.sh:571
+#: git-stash.sh:570
msgid "unable to refresh index"
msgstr "kan inte uppdatera indexet"
-#: git-stash.sh:575
+#: git-stash.sh:574
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:582
msgid "Conflicts in index. Try without --index."
msgstr "Konflikter i indexet. Testa utan --index."
-#: git-stash.sh:585
+#: git-stash.sh:584
msgid "Could not save index tree"
msgstr "Kunde inte spara indexträd"
-#: git-stash.sh:594
+#: git-stash.sh:593
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:618
msgid "Cannot unstage modified files"
msgstr "Kan inte ta bort ändrade filer ur kön"
-#: git-stash.sh:634
+#: git-stash.sh:633
msgid "Index was not unstashed."
msgstr "Indexet har inte tagits ur kön."
-#: git-stash.sh:648
+#: git-stash.sh:647
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:656
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Kastade ${REV} ($s)"
-#: git-stash.sh:658
+#: git-stash.sh:657
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Kunde inte kasta \"stash\"-post"
-#: git-stash.sh:666
+#: git-stash.sh:665
msgid "No branch name specified"
msgstr "Inget grennamn angavs"
-#: git-stash.sh:745
+#: git-stash.sh:744
msgid "(To restore them type \"git stash apply\")"
msgstr "(För att återställa dem, skriv \"git stash apply\")"
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:584
#, 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:594
#, 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:599
#, 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:617
#, 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:623
#, 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:630
#, 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:631
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
-#: git-submodule.sh:688
+#: git-submodule.sh:635
#, 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:636
#, 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:641
#, 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:642
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
-#: git-submodule.sh:700
+#: git-submodule.sh:647
#, 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:648
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
-#: git-submodule.sh:732
+#: git-submodule.sh:679
#, 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:775
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:827
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "oväntat läge $mod_dst"
-#: git-submodule.sh:900
+#: git-submodule.sh:847
#, 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:850
#, 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:853
#, 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."
"\n"
"Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"
-#: git-rebase--interactive.sh:211
+#: git-rebase--interactive.sh:213
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:236
+#: git-rebase--interactive.sh:238
#, 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:277
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Felaktigt incheckningsnamn: $sha1"
-#: git-rebase--interactive.sh:317
+#: git-rebase--interactive.sh:319
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:371
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Snabbspolade till $sha1"
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:373
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "Kan inte snabbspola till $sha1"
-#: git-rebase--interactive.sh:380
+#: git-rebase--interactive.sh:382
#, 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:387
#, 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:405
#, 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:414
#, sh-format
msgid "Could not pick $sha1"
msgstr "Kunde inte välja $sha1"
-#: git-rebase--interactive.sh:417
+#: git-rebase--interactive.sh:423
#, 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:428
#, 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:439
#, 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:448
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Kan inte skriva $fixup_msg"
-#: git-rebase--interactive.sh:445
+#: git-rebase--interactive.sh:451
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:492 git-rebase--interactive.sh:535
+#: git-rebase--interactive.sh:538
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Kunde inte tillämpa $sha1... $rest"
-#: git-rebase--interactive.sh:560
+#: git-rebase--interactive.sh:567
#, 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:582
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Stoppade på $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:590
+#: git-rebase--interactive.sh:597
#, 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:639
#, sh-format
msgid "Executing: $rest"
msgstr "Kör: $rest"
-#: git-rebase--interactive.sh:640
+#: git-rebase--interactive.sh:647
#, sh-format
msgid "Execution failed: $rest"
msgstr "Körning misslyckades: $rest"
-#: git-rebase--interactive.sh:642
+#: git-rebase--interactive.sh:649
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:651
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:664
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:675
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Okänt kommando: $command $sha1 $rest"
-#: git-rebase--interactive.sh:669
+#: git-rebase--interactive.sh:676
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:711
#, 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:735
msgid "could not detach HEAD"
msgstr "kunde inte koppla från HEAD"
-#: git-rebase--interactive.sh:763
+#: git-rebase--interactive.sh:771
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Kunde inte ta bort CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:768
+#: git-rebase--interactive.sh:776
#, 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:793
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:798
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:803 git-rebase--interactive.sh:807
msgid "Could not commit staged changes."
msgstr "Kunde inte checka in köade ändringar."
-#: git-rebase--interactive.sh:827
+#: git-rebase--interactive.sh:836
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:844 git-rebase--interactive.sh:1008
msgid "Could not execute editor"
msgstr "Kunde inte starta textredigerare"
-#: git-rebase--interactive.sh:848
+#: git-rebase--interactive.sh:860
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Kunde inte checka ut $switch_to"
-#: git-rebase--interactive.sh:853
+#: git-rebase--interactive.sh:865
msgid "No HEAD?"
msgstr "Inget HEAD?"
-#: git-rebase--interactive.sh:854
+#: git-rebase--interactive.sh:866
#, 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:869
msgid "Could not mark as interactive"
msgstr "Kunde inte markera som interaktiv"
-#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
+#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884
msgid "Could not init rewritten commits"
msgstr "Kunde inte initiera omskrivna incheckningar"
-#: git-rebase--interactive.sh:897
+#: git-rebase--interactive.sh:910
msgid "Could not generate todo list"
msgstr "Kunde inte skapa todo-lista"
-#: git-rebase--interactive.sh:973
+#: git-rebase--interactive.sh:986
#, 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:991
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
"\n"
-#: git-rebase--interactive.sh:985
+#: git-rebase--interactive.sh:998
msgid "Note that empty commits are commented out"
msgstr "Observera att tomma incheckningar är utkommenterade"
msgid "No untracked files.\n"
msgstr "Inga ospårade filer.\n"
-#: git-add--interactive.perl:985
+#: git-add--interactive.perl:1026
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:1029
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:1032
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:1035 git-add--interactive.perl:1044
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:1038 git-add--interactive.perl:1041
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:1078
#, 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:1079
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:1085
#, 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:1093
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:1107
#, 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:1206
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:1215
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:1221
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:1227
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:1233
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:1239
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:1245
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:1251
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:1266
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:1297
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:1298
msgid "Apply them to the worktree anyway? "
msgstr "Applicera dem på arbetskatalogen trots det? "
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1301
msgid "Nothing was applied.\n"
msgstr "Ingenting applicerades.\n"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1312
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignorerar ej sammanslagen: %s\n"
-#: git-add--interactive.perl:1243
+#: git-add--interactive.perl:1321
msgid "Only binary files changed.\n"
msgstr "Endast binära filer ändrade.\n"
-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1323
msgid "No changes.\n"
msgstr "Inga ändringar.\n"
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1331
msgid "Patch update"
msgstr "Uppdatera patch"
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1383
#, 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:1384
#, 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:1385
#, 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:1388
#, 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:1389
#, 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:1390
#, 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:1393
#, 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:1394
#, 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:1395
#, 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:1398
#, 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:1399
#, 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:1400
#, 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:1403
#, 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:1404
#, 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:1405
#, 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:1408
#, 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:1409
#, 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:1410
#, 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:1413
#, 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:1414
#, 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:1415
#, 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:1515
+msgid "No other hunks to goto\n"
+msgstr "Inga andra stycken att gå till\n"
+
+#: git-add--interactive.perl:1522
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:1524
msgid "go to which hunk? "
msgstr "gå till vilket stycke? "
-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1533
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Ogiltigt siffervärde: \"%s\"\n"
-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1538
#, 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:1564
+msgid "No other hunks to search\n"
+msgstr "Inga andra stycken att söka efter\n"
+
+#: git-add--interactive.perl:1568
msgid "search for regex? "
msgstr "sök efter reguljärt uttryck? "
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1581
#, 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:1591
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:1603 git-add--interactive.perl:1625
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:1612 git-add--interactive.perl:1631
msgid "No next hunk\n"
msgstr "Inget följande stycke\n"
-#: git-add--interactive.perl:1553
+#: git-add--interactive.perl:1637
+msgid "Sorry, cannot split this hunk\n"
+msgstr "Beklagar, kan inte dela stycket\n"
+
+#: git-add--interactive.perl:1643
#, 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:1653
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "Beklagar, kan inte redigera stycket\n"
+
+#: git-add--interactive.perl:1699
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:1718
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:1735 git-add--interactive.perl:1740
+#: git-add--interactive.perl:1743 git-add--interactive.perl:1750
+#: git-add--interactive.perl:1754 git-add--interactive.perl:1760
msgid "missing --"
msgstr "saknad --"
-#: git-add--interactive.perl:1662
+#: git-add--interactive.perl:1756
#, 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:1762 git-add--interactive.perl:1768
#, 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:1395
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1352
+#: git-send-email.perl:1410
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:1355
+#: git-send-email.perl:1413
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:1439
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:1486
#, 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:1491 git-send-email.perl:1495
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS misslyckades! %s"
-#: git-send-email.perl:1447
+#: git-send-email.perl:1505
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:1523
#, perl-format
msgid "Failed to send %s\n"
msgstr "Misslyckades sända %s\n"
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Test-Sände %s\n"
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
#, perl-format
msgid "Sent %s\n"
msgstr "Sände %s\n"
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
msgid "Dry-OK. Log says:\n"
msgstr "Test-OK. Loggen säger:\n"
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
msgid "OK. Log says:\n"
msgstr "OK. Loggen säger:\n"
-#: git-send-email.perl:1482
+#: git-send-email.perl:1540
msgid "Result: "
msgstr "Resultat: "
-#: git-send-email.perl:1485
+#: git-send-email.perl:1543
msgid "Result: OK\n"
msgstr "Resultat: OK\n"
-#: git-send-email.perl:1498
+#: git-send-email.perl:1556
#, 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:1603 git-send-email.perl:1623
#, 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:1609
#, 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:1657
#, 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:1682
#, 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:1788
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Kunde inte köra \"%s\""
-#: git-send-email.perl:1737
+#: git-send-email.perl:1795
#, 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:1799
#, 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:1826
msgid "cannot send message as 7bit"
msgstr "kan inte sända brev som sjubitars"
-#: git-send-email.perl:1776
+#: git-send-email.perl:1834
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:1872 git-send-email.perl:1923 git-send-email.perl:1933
#, 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:1875
#, 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:1891
#, 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:1895
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
+#~ 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 "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"