summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jiang Xin <worldhello.net@gmail.com>2021-03-01 10:01:02 +0800
committerLibravatar Jiang Xin <worldhello.net@gmail.com>2021-03-01 10:01:02 +0800
commit75f5efcba2471a708b8a3866fe344bea0dfce944 (patch)
tree070f465e0b8e13c3ddb2fa45941b4563beee2161
parentMerge branch 'pl' of github.com:Arusekk/git-po (diff)
parentl10n: sv.po: Update Swedish translation (5103t0f0u) (diff)
downloadtgif-75f5efcba2471a708b8a3866fe344bea0dfce944.tar.xz
Merge branch 'master' of github.com:nafmo/git-l10n-sv
* 'master' of github.com:nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (5103t0f0u)
-rw-r--r--po/sv.po6274
1 files changed, 3348 insertions, 2926 deletions
diff --git a/po/sv.po b/po/sv.po
index f7766d72e5..e9702fa41c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,14 +1,14 @@
# Swedish translations for Git.
-# Copyright (C) 2010-2020 Peter Krefting <peter@softwolves.pp.se>
+# Copyright (C) 2010-2021 Peter Krefting <peter@softwolves.pp.se>
# This file is distributed under the same license as the Git package.
-# Peter Krefting <peter@softwolves.pp.se>, 2010-2020.
+# Peter Krefting <peter@softwolves.pp.se>, 2010-2021.
#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.30.0\n"
+"Project-Id-Version: git 2.31.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-12-21 07:10+0800\n"
-"PO-Revision-Date: 2020-12-21 08:08+0100\n"
+"POT-Creation-Date: 2021-02-26 22:09+0800\n"
+"PO-Revision-Date: 2021-02-28 22:18+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -23,9 +23,9 @@ msgstr ""
msgid "Huh (%s)?"
msgstr "Vadå (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284
-#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532
-#: builtin/rebase.c:1955
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
+#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
+#: builtin/rebase.c:1963
msgid "could not read index"
msgstr "kunde inte läsa indexet"
@@ -53,7 +53,7 @@ msgstr "Uppdatera"
msgid "could not stage '%s'"
msgstr "kunde inte köa \"%s\""
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
msgid "could not write index"
msgstr "kunde inte skriva indexet"
@@ -211,7 +211,7 @@ msgstr "ej köad"
#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
-#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190
+#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190
#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818
#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
@@ -797,7 +797,7 @@ msgstr ""
msgid "Exiting because of an unresolved conflict."
msgstr "Avslutar på grund av olöst konflikgt."
-#: advice.c:281 builtin/merge.c:1369
+#: advice.c:281 builtin/merge.c:1370
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
@@ -1101,7 +1101,8 @@ msgstr "patch misslyckades: %s:%ld"
msgid "cannot checkout %s"
msgstr "kan inte checka ut %s"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 pack-revindex.c:213
+#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "misslyckades läsa %s"
@@ -1262,7 +1263,7 @@ msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
msgid "unable to add cache entry for %s"
msgstr "kan inte lägga till cachepost för %s"
-#: apply.c:4374 builtin/bisect--helper.c:524
+#: apply.c:4374 builtin/bisect--helper.c:523
#, c-format
msgid "failed to write to '%s'"
msgstr "misslyckades skriva till \"%s\""
@@ -1298,7 +1299,7 @@ msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228
+#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
#, c-format
msgid "cannot open %s"
msgstr "kan inte öppna %s"
@@ -1352,7 +1353,7 @@ msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."
msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."
-#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406
+#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
@@ -1420,7 +1421,7 @@ msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525
+#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
@@ -1430,7 +1431,7 @@ msgstr "se till att åtminstone <n> rader sammanhang är lika"
#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3562 builtin/rebase.c:1346
+#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
msgid "action"
msgstr "åtgärd"
@@ -1458,9 +1459,9 @@ msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
-#: apply.c:5045 builtin/add.c:329 builtin/check-ignore.c:22
-#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775
-#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
+#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
+#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "var pratsam"
@@ -1548,14 +1549,14 @@ msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
msgid "cannot read %s"
msgstr "kan inte läsa %s"
-#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886
-#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786
-#: builtin/merge.c:1138
+#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
+#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
+#: builtin/merge.c:1139
#, c-format
msgid "could not read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315
+#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
@@ -1597,7 +1598,7 @@ msgstr "fmt"
msgid "archive format"
msgstr "arkivformat"
-#: archive.c:556 builtin/log.c:1765
+#: archive.c:556 builtin/log.c:1764
msgid "prefix"
msgstr "prefix"
@@ -1605,11 +1606,11 @@ 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:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890
-#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135
+#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
+#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:919 builtin/hash-object.c:105
-#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412
+#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
+#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
msgid "file"
msgstr "fil"
@@ -1775,12 +1776,12 @@ msgstr "Bisect: en sammanslagningsbas måste testas\n"
msgid "a %s revision is needed"
msgstr "en %s-revision behövs"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
#, c-format
msgid "could not create file '%s'"
msgstr "kunde inte skapa filen \"%s\""
-#: bisect.c:987 builtin/merge.c:152
+#: bisect.c:987 builtin/merge.c:153
#, c-format
msgid "could not read file '%s'"
msgstr "kunde inte läsa filen \"%s\""
@@ -1798,10 +1799,10 @@ msgstr "%s var både %s och %s\n"
#, c-format
msgid ""
"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
+"Maybe you started with bad path arguments?\n"
msgstr ""
"Ingen testbar incheckning hittades.\n"
-"Kanske du startade med felaktiga sökvägsparametrar?\n"
+"Kanske du startade med felaktiga sökvägsargument?\n"
#: bisect.c:1095
#, c-format
@@ -1834,11 +1835,11 @@ msgstr ""
"--reverse och --first-parent tillsammans kräver att du anger senaste "
"incheckningen"
-#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138
-#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409
-#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336
-#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395
-#: builtin/shortlog.c:267
+#: blame.c:2821 bundle.c:213 ref-filter.c:2202 remote.c:2041 sequencer.c:2146
+#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
+#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
+#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
@@ -2022,7 +2023,7 @@ msgstr "'%s' ser inte ut som en v2- eller v3-paket-fil (bundle)"
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176
+#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
#: builtin/commit.c:814
#, c-format
msgid "could not open '%s'"
@@ -2066,40 +2067,36 @@ msgstr "Kunde inte starta pack-objects"
msgid "pack-objects died"
msgstr "pack-objects misslyckades"
-#: bundle.c:379
-msgid "rev-list died"
-msgstr "rev-list dog"
-
-#: bundle.c:428
+#: bundle.c:386
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
-#: bundle.c:498
+#: bundle.c:490
#, c-format
msgid "unsupported bundle version %d"
msgstr "version %d för paket (bundle) stöds ej"
-#: bundle.c:500
+#: bundle.c:492
#, c-format
msgid "cannot write bundle version %d with algorithm %s"
msgstr "kan inte skriva paket (bundle) med version %d med algoritmen %s"
-#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408
+#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
-#: bundle.c:530
+#: bundle.c:539
msgid "Refusing to create empty bundle."
msgstr "Vägrar skapa ett tomt paket (bundle)."
-#: bundle.c:540
+#: bundle.c:549
#, c-format
msgid "cannot create '%s'"
msgstr "kan inte skapa \"%s\""
-#: bundle.c:565
+#: bundle.c:574
msgid "index-pack died"
msgstr "index-pack dog"
@@ -2108,236 +2105,257 @@ msgstr "index-pack dog"
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
-#: commit-graph.c:188 midx.c:47
+#: commit-graph.c:198 midx.c:47
msgid "invalid hash version"
msgstr "felaktig hashnings-version"
-#: commit-graph.c:246
+#: commit-graph.c:219
+msgid "repository contains replace objects; skipping commit-graph"
+msgstr "arkivet innehåller replace-objekt; hoppar över incheckningsgraf"
+
+#: commit-graph.c:228
+msgid "repository contains (deprecated) grafts; skipping commit-graph"
+msgstr ""
+"arkivet innehåller ympningar (avråds från); hoppar över incheckningsgraf"
+
+#: commit-graph.c:233
+msgid "repository is shallow; skipping commit-graph"
+msgstr "källarkivet är grunt; hoppar över incheckningsgraf"
+
+#: commit-graph.c:264
msgid "commit-graph file is too small"
msgstr "incheckningsgraffilen %s är för liten"
-#: commit-graph.c:311
+#: commit-graph.c:329
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X"
-#: commit-graph.c:318
+#: commit-graph.c:336
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr "incheckningsgrafens version %X stämmer inte med versionen %X"
-#: commit-graph.c:325
+#: commit-graph.c:343
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X"
-#: commit-graph.c:342
+#: commit-graph.c:360
#, c-format
msgid "commit-graph file is too small to hold %u chunks"
msgstr "incheckningsgraffilen är för liten för att innehålla %u stycken"
-#: commit-graph.c:361
+#: commit-graph.c:379
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen"
-#: commit-graph.c:433
+#: commit-graph.c:465
#, c-format
msgid "commit-graph chunk id %08x appears multiple times"
msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger"
-#: commit-graph.c:499
+#: commit-graph.c:531
msgid "commit-graph has no base graphs chunk"
msgstr "incheckningsgrafen har inga bas-graf-stycken"
-#: commit-graph.c:509
+#: commit-graph.c:541
msgid "commit-graph chain does not match"
msgstr "incheckningsgrafens kedja stämmer inte"
-#: commit-graph.c:557
+#: commit-graph.c:589
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"
-#: commit-graph.c:581
+#: commit-graph.c:613
msgid "unable to find all commit-graph files"
msgstr "kan inte hitta alla incheckingsgraffiler"
-#: commit-graph.c:721 commit-graph.c:785
+#: commit-graph.c:794 commit-graph.c:831
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
-#: commit-graph.c:742
+#: commit-graph.c:815
#, c-format
msgid "could not find commit %s"
msgstr "kunde inte hitta incheckningen %s"
-#: commit-graph.c:1036 builtin/am.c:1292
+#: commit-graph.c:848
+msgid "commit-graph requires overflow generation data but has none"
+msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen"
+
+#: commit-graph.c:1121 builtin/am.c:1292
#, c-format
msgid "unable to parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: commit-graph.c:1252 builtin/pack-objects.c:2864
+#: commit-graph.c:1378 builtin/pack-objects.c:2872
#, c-format
msgid "unable to get type of object %s"
msgstr "kunde inte hämta typ för objektet %s"
-#: commit-graph.c:1283
+#: commit-graph.c:1409
msgid "Loading known commits in commit graph"
msgstr "Läser in kända incheckningar i incheckningsgraf"
-#: commit-graph.c:1300
+#: commit-graph.c:1426
msgid "Expanding reachable commits in commit graph"
msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
-#: commit-graph.c:1320
+#: commit-graph.c:1446
msgid "Clearing commit marks in commit graph"
msgstr "Rensar incheckningsmärken i incheckningsgraf"
-#: commit-graph.c:1339
+#: commit-graph.c:1465
+msgid "Computing commit graph topological levels"
+msgstr "Beräknar topografiska nivåer för incheckningsgraf"
+
+#: commit-graph.c:1518
msgid "Computing commit graph generation numbers"
msgstr "Beräknar generationsvärden för incheckningsgraf"
-#: commit-graph.c:1406
+#: commit-graph.c:1599
msgid "Computing commit changed paths Bloom filters"
msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen"
-#: commit-graph.c:1483
+#: commit-graph.c:1676
msgid "Collecting referenced commits"
msgstr "Samlar refererade incheckningar"
-#: commit-graph.c:1508
+#: commit-graph.c:1701
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket"
msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket"
-#: commit-graph.c:1521
+#: commit-graph.c:1714
#, c-format
msgid "error adding pack %s"
msgstr "fel vid tillägg av paketet %s"
-#: commit-graph.c:1525
+#: commit-graph.c:1718
#, c-format
msgid "error opening index for %s"
msgstr "fel vid öppning av indexet för %s"
-#: commit-graph.c:1562
+#: commit-graph.c:1755
msgid "Finding commits for commit graph among packed objects"
msgstr "Söker incheckningar för incheckingsgraf i packade objekt"
-#: commit-graph.c:1580
+#: commit-graph.c:1773
msgid "Finding extra edges in commit graph"
msgstr "Söker ytterligare kanter i incheckingsgraf"
-#: commit-graph.c:1628
+#: commit-graph.c:1821
msgid "failed to write correct number of base graph ids"
msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
-#: commit-graph.c:1670 midx.c:819
+#: commit-graph.c:1863 midx.c:819
#, c-format
msgid "unable to create leading directories of %s"
msgstr "kunde inte skapa inledande kataloger för %s"
-#: commit-graph.c:1683
+#: commit-graph.c:1876
msgid "unable to create temporary graph layer"
msgstr "kan inte skapa temporärt graflager"
-#: commit-graph.c:1688
+#: commit-graph.c:1881
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "kan inte justera delade behörigheter för \"%s\""
-#: commit-graph.c:1758
+#: commit-graph.c:1966
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Skriver ut incheckningsgraf i %d pass"
msgstr[1] "Skriver ut incheckningsgraf i %d pass"
-#: commit-graph.c:1803
+#: commit-graph.c:2011
msgid "unable to open commit-graph chain file"
msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
-#: commit-graph.c:1819
+#: commit-graph.c:2027
msgid "failed to rename base commit-graph file"
msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
-#: commit-graph.c:1839
+#: commit-graph.c:2047
msgid "failed to rename temporary commit-graph file"
msgstr "kunde inte byta namn på temporär incheckningsgraffil"
-#: commit-graph.c:1965
+#: commit-graph.c:2180
msgid "Scanning merged commits"
msgstr "Söker sammanslagna incheckningar"
-#: commit-graph.c:2009
+#: commit-graph.c:2224
msgid "Merging commit-graph"
msgstr "Slår ihop incheckningsgraf"
-#: commit-graph.c:2115
+#: commit-graph.c:2331
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"försöker skriva en incheckningsgraf, men \"core.commitGraph\" är inaktiverad"
-#: commit-graph.c:2214
+#: commit-graph.c:2438
msgid "too many commits to write graph"
msgstr "för många incheckningar för att skriva graf"
-#: commit-graph.c:2307
+#: commit-graph.c:2536
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig"
-#: commit-graph.c:2317
+#: commit-graph.c:2546
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"
-#: commit-graph.c:2327 commit-graph.c:2342
+#: commit-graph.c:2556 commit-graph.c:2571
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
"incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u"
-#: commit-graph.c:2334
+#: commit-graph.c:2563
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
-#: commit-graph.c:2352
+#: commit-graph.c:2581
msgid "Verifying commits in commit graph"
msgstr "Bekräftar incheckningar i incheckningsgrafen"
-#: commit-graph.c:2367
+#: commit-graph.c:2596
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf"
-#: commit-graph.c:2374
+#: commit-graph.c:2603
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s"
-#: commit-graph.c:2384
+#: commit-graph.c:2613
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång"
-#: commit-graph.c:2393
+#: commit-graph.c:2622
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "incheckningsgrafens förälder för %s är %s != %s"
-#: commit-graph.c:2407
+#: commit-graph.c:2636
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
"incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt"
-#: commit-graph.c:2412
+#: commit-graph.c:2641
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2345,7 +2363,7 @@ msgstr ""
"incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"
"noll på annan plats"
-#: commit-graph.c:2416
+#: commit-graph.c:2645
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2353,19 +2371,21 @@ msgstr ""
"incheckningsgrafen har generationsnummer skilt från noll för incheckningen "
"%s, men noll på annan plats"
-#: commit-graph.c:2432
+#: commit-graph.c:2662
#, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u"
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr ""
+"incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < "
+"%<PRIuMAX>"
-#: commit-graph.c:2438
+#: commit-graph.c:2668
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !"
"= %<PRIuMAX>"
-#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403
+#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403
#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
@@ -2396,29 +2416,29 @@ msgstr ""
"Slå av detta meddelande genom att skriva\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1172
+#: commit.c:1223
#, 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."
-#: commit.c:1176
+#: commit.c:1227
#, 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."
-#: commit.c:1179
+#: commit.c:1230
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Incheckning %s har inte någon GPG-signatur."
-#: commit.c:1182
+#: commit.c:1233
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
-#: commit.c:1436
+#: commit.c:1487
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"
@@ -2432,7 +2452,7 @@ msgstr ""
msgid "memory exhausted"
msgstr "minnet slut"
-#: config.c:125
+#: config.c:126
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2447,296 +2467,340 @@ msgstr ""
"\t%s\n"
"Det kan bero på cirkulära inkluderingar."
-#: config.c:141
+#: config.c:142
#, c-format
msgid "could not expand include path '%s'"
msgstr "kunde inte expandera inkluderingssökväg \"%s\""
-#: config.c:152
+#: config.c:153
msgid "relative config includes must come from files"
msgstr "relativa konfigureringsinkluderingar måste komma från filer"
-#: config.c:198
+#: config.c:199
msgid "relative config include conditionals must come from files"
msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
-#: config.c:378
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "felaktigt konfigurationsformat: %s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "miljövariabelnamn saknas för konfigurationen \"%.*s\""
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "miljövariabeln \"%s\" saknas för konfigurationen \"%.*s\""
+
+#: config.c:442
#, c-format
msgid "key does not contain a section: %s"
msgstr "nyckeln innehåller inte ett stycke: %s"
-#: config.c:384
+#: config.c:448
#, c-format
msgid "key does not contain variable name: %s"
msgstr "nyckeln innehåller inte variabelnamn: %s"
-#: config.c:408 sequencer.c:2580
+#: config.c:472 sequencer.c:2588
#, c-format
msgid "invalid key: %s"
msgstr "felaktig nyckel: %s"
-#: config.c:414
+#: config.c:478
#, c-format
msgid "invalid key (newline): %s"
msgstr "ogiltig nyckel (nyradstecken): %s"
-#: config.c:450 config.c:462
+#: config.c:511
+msgid "empty config key"
+msgstr "tom konfigurationsnyckel"
+
+#: config.c:529 config.c:541
#, c-format
msgid "bogus config parameter: %s"
msgstr "falsk konfigureringsparameter: %s"
-#: config.c:497
+#: config.c:555 config.c:572 config.c:579 config.c:588
#, c-format
msgid "bogus format in %s"
msgstr "felaktigt format i %s"
-#: config.c:836
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "felaktigt antal i %s"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "för många poster i %s"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "konfigurationsnyckel saknas för %s"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "konfigurationsvärde saknas för %s"
+
+#: config.c:995
#, c-format
msgid "bad config line %d in blob %s"
msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
-#: config.c:840
+#: config.c:999
#, c-format
msgid "bad config line %d in file %s"
msgstr "felaktig konfigurationsfil rad %d i filen %s"
-#: config.c:844
+#: config.c:1003
#, c-format
msgid "bad config line %d in standard input"
msgstr "felaktig konfigurationsfil rad %d i standard in"
-#: config.c:848
+#: config.c:1007
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
-#: config.c:852
+#: config.c:1011
#, c-format
msgid "bad config line %d in command line %s"
msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
-#: config.c:856
+#: config.c:1015
#, c-format
msgid "bad config line %d in %s"
msgstr "felaktig konfigurationsfil rad %d i %s"
-#: config.c:993
+#: config.c:1152
msgid "out of range"
msgstr "utanför intervallet"
-#: config.c:993
+#: config.c:1152
msgid "invalid unit"
msgstr "ogiltig enhet"
-#: config.c:994
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
-#: config.c:1013
+#: config.c:1163
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"
-#: config.c:1016
+#: config.c:1166
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"
-#: config.c:1019
+#: config.c:1169
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"
-#: config.c:1022
+#: config.c:1172
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"
"en %s: %s"
-#: config.c:1025
+#: config.c:1175
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
"%s: %s"
-#: config.c:1028
+#: config.c:1178
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
-#: config.c:1123
+#: config.c:1194
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "felaktigt booleskt konfigurationsvärde \"%s\" för \"%s\""
+
+#: config.c:1289
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "misslyckades expandera användarkatalog i: \"%s\""
-#: config.c:1132
+#: config.c:1298
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
-#: config.c:1223
+#: config.c:1391
#, c-format
msgid "abbrev length out of range: %d"
msgstr "förkortningslängd utanför intervallet: %d"
-#: config.c:1237 config.c:1248
+#: config.c:1405 config.c:1416
#, c-format
msgid "bad zlib compression level %d"
msgstr "felaktigt zlib-komprimeringsgrad %d"
-#: config.c:1340
+#: config.c:1508
msgid "core.commentChar should only be one character"
msgstr "core.commentChar kan bara vara ett tecken"
-#: config.c:1373
+#: config.c:1541
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
-#: config.c:1445
+#: config.c:1613
#, c-format
msgid "malformed value for %s"
msgstr "felformat värde för %s"
-#: config.c:1471
+#: config.c:1639
#, c-format
msgid "malformed value for %s: %s"
msgstr "felformat värde för %s: %s"
-#: config.c:1472
+#: config.c:1640
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "måste vara en av nothing, matching, simple, upstream eller current"
-#: config.c:1533 builtin/pack-objects.c:3649
+#: config.c:1701 builtin/pack-objects.c:3666
#, c-format
msgid "bad pack compression level %d"
msgstr "felaktig paketkomprimeringsgrad %d"
-#: config.c:1655
+#: config.c:1823
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""
-#: config.c:1658
+#: config.c:1826
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referensen \"%s\" pekar inte på en blob"
-#: config.c:1675
+#: config.c:1843
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "kan inte slå upp konfigurerings-bloben \"%s\""
-#: config.c:1705
+#: config.c:1873
#, c-format
msgid "failed to parse %s"
msgstr "kunde inte tolka %s"
-#: config.c:1759
+#: config.c:1927
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
-#: config.c:2122
+#: config.c:2290
msgid "unknown error occurred while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: config.c:2296
+#: config.c:2464
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Felaktigt %s: \"%s\""
-#: config.c:2341
+#: config.c:2509
#, 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:2387
+#: config.c:2555
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
-#: config.c:2389
+#: config.c:2557
#, 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:2473
+#: config.c:2641
#, c-format
msgid "invalid section name '%s'"
msgstr "felaktigt sektionsnamn \"%s\""
-#: config.c:2505
+#: config.c:2673
#, c-format
msgid "%s has multiple values"
msgstr "%s har flera värden"
-#: config.c:2534
+#: config.c:2702
#, c-format
msgid "failed to write new configuration file %s"
msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
-#: config.c:2786 config.c:3112
+#: config.c:2954 config.c:3280
#, c-format
msgid "could not lock config file %s"
msgstr "kunde inte låsa konfigurationsfilen %s"
-#: config.c:2797
+#: config.c:2965
#, c-format
msgid "opening %s"
msgstr "öppnar %s"
-#: config.c:2834 builtin/config.c:361
+#: config.c:3002 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "ogiltigt mönster: %s"
-#: config.c:2859
+#: config.c:3027
#, c-format
msgid "invalid config file %s"
msgstr "ogiltig konfigurationsfil: \"%s\""
-#: config.c:2872 config.c:3125
+#: config.c:3040 config.c:3293
#, c-format
msgid "fstat on %s failed"
msgstr "fstat misslyckades på %s"
-#: config.c:2883
+#: config.c:3051
#, c-format
msgid "unable to mmap '%s'"
msgstr "kunde inte utföra mmap på \"%s\""
-#: config.c:2892 config.c:3130
+#: config.c:3060 config.c:3298
#, c-format
msgid "chmod on %s failed"
msgstr "chmod misslyckades på %s"
-#: config.c:2977 config.c:3227
+#: config.c:3145 config.c:3395
#, c-format
msgid "could not write config file %s"
msgstr "kunde inte skriva konfigurationsfilen %s"
-#: config.c:3011
+#: config.c:3179
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "kunde inte ställa in \"%s\" till \"%s\""
-#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
#, c-format
msgid "could not unset '%s'"
msgstr "kunde inte ta bort inställning för \"%s\""
-#: config.c:3103
+#: config.c:3271
#, c-format
msgid "invalid section name: %s"
msgstr "felaktigt namn på stycke: %s"
-#: config.c:3270
+#: config.c:3438
#, c-format
msgid "missing value for '%s'"
msgstr "värde saknas för \"%s\""
@@ -2798,45 +2862,45 @@ msgstr "ogiltigt paket"
msgid "protocol error: unexpected '%s'"
msgstr "protokollfel: förväntade inte \"%s\""
-#: connect.c:473
+#: connect.c:497
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "okänt objektformat \"%s\" angavs av servern"
-#: connect.c:500
+#: connect.c:526
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "ogiltigt svar på ls-refs: %s"
-#: connect.c:504
+#: connect.c:530
msgid "expected flush after ref listing"
msgstr "förväntade \"flush\" efter ref-listan"
-#: connect.c:507
+#: connect.c:533
msgid "expected response end packet after ref listing"
msgstr "förväntade svarsavslutningspaket efter ref-listan"
-#: connect.c:640
+#: connect.c:666
#, c-format
msgid "protocol '%s' is not supported"
msgstr "protokollet \"%s\" stöds inte"