diff options
author | Jiang Xin <worldhello.net@gmail.com> | 2021-08-14 07:55:01 +0800 |
---|---|---|
committer | Jiang Xin <worldhello.net@gmail.com> | 2021-08-14 07:55:01 +0800 |
commit | 18c9fced7bf3feb3b326c73e2901e2ad05824c29 (patch) | |
tree | def89f7050282fd820665b76a5fec912ba046c8f | |
parent | Merge branch 'master' of github.com:alshopov/git-po (diff) | |
parent | l10n: sv.po: Update Swedish translation (5227t0f0u) (diff) | |
download | tgif-18c9fced7bf3feb3b326c73e2901e2ad05824c29.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 (5227t0f0u)
-rw-r--r-- | po/sv.po | 4070 |
1 files changed, 2100 insertions, 1970 deletions
@@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.32.0\n" +"Project-Id-Version: git 2.33.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-05-17 16:02+0800\n" -"PO-Revision-Date: 2021-05-20 13:31+0100\n" +"POT-Creation-Date: 2021-08-03 17:06+0800\n" +"PO-Revision-Date: 2021-08-09 20:35+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -24,7 +24,7 @@ msgid "Huh (%s)?" msgstr "Vadå (%s)?" #: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 -#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 +#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 #: builtin/rebase.c:1953 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:3687 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707 msgid "could not write index" msgstr "kunde inte skriva indexet" @@ -111,12 +111,12 @@ msgstr[1] "lade till %d sökvägar\n" msgid "ignoring unmerged: %s" msgstr "ignorerar ej sammanslagen: %s" -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 +#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "Endast binära filer ändrade.\n" -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 +#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "Inga ändringar.\n" @@ -193,11 +193,11 @@ msgstr "markera en numrerad post" msgid "(empty) select nothing" msgstr "(tomt) markera ingenting" -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 +#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 +#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893 msgid "What now" msgstr "Vad nu" @@ -209,12 +209,12 @@ msgstr "köad" msgid "unstaged" msgstr "ej köad" -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 -#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309 +#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 -#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327 -#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:408 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 #: git-add--interactive.perl:213 msgid "path" msgstr "sökväg" @@ -223,7 +223,7 @@ msgstr "sökväg" msgid "could not refresh index" msgstr "kunde inte uppdatera indexet" -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 +#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "Hej då.\n" @@ -524,34 +524,34 @@ msgstr "" "a - applicera stycket och alla följande i filen\n" "d - applicera inte stycket eller något av de följande i filen\n" -#: add-patch.c:342 +#: add-patch.c:343 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "kunde inte tolka styckehuvudet \"%.*s\"" -#: add-patch.c:361 add-patch.c:365 +#: add-patch.c:362 add-patch.c:366 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "kunde inte tolka färgat styckehuvud \"%.*s\"" -#: add-patch.c:419 +#: add-patch.c:420 msgid "could not parse diff" msgstr "kunde inte tolka diff" -#: add-patch.c:438 +#: add-patch.c:439 msgid "could not parse colored diff" msgstr "kunde inte tolka färgad diff" -#: add-patch.c:452 +#: add-patch.c:453 #, c-format msgid "failed to run '%s'" msgstr "misslyckades att köra \"%s\"" -#: add-patch.c:611 +#: add-patch.c:612 msgid "mismatched output from interactive.diffFilter" msgstr "omaka utdata från interactive.diffFilter" -#: add-patch.c:612 +#: add-patch.c:613 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -559,7 +559,7 @@ msgstr "" "Alla rader i indata måste ha en motsvarande rad i utdata från\n" "ditt filter." -#: add-patch.c:790 +#: add-patch.c:791 #, c-format msgid "" "expected context line #%d in\n" @@ -568,7 +568,7 @@ msgstr "" "förväntade sammanhangsrad %d i\n" "%.*s" -#: add-patch.c:805 +#: add-patch.c:806 #, c-format msgid "" "hunks do not overlap:\n" @@ -581,11 +581,11 @@ msgstr "" "\tavslutas inte med:\n" "%.*s" -#: add-patch.c:1081 git-add--interactive.perl:1115 +#: add-patch.c:1082 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n" -#: add-patch.c:1085 +#: add-patch.c:1086 #, c-format msgid "" "---\n" @@ -599,7 +599,7 @@ msgstr "" "Rader som börjar med %c kommer att tas bort.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1099 git-add--interactive.perl:1129 +#: add-patch.c:1100 git-add--interactive.perl:1129 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" @@ -609,11 +609,11 @@ msgstr "" "redigera den igen. Om alla rader i ett stycke tas bort avbryts\n" "redigeringen och stycket lämnas oförändrat.\n" -#: add-patch.c:1132 +#: add-patch.c:1133 msgid "could not parse hunk header" msgstr "kunde inte tolka styckehuvud" -#: add-patch.c:1177 +#: add-patch.c:1178 msgid "'git apply --cached' failed" msgstr "\"git apply --cached\" misslyckades" @@ -629,26 +629,26 @@ msgstr "\"git apply --cached\" misslyckades" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1246 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1242 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]? " -#: add-patch.c:1289 +#: add-patch.c:1290 msgid "The selected hunks do not apply to the index!" msgstr "Markerade stycken kan inte appliceras på indexet!" -#: add-patch.c:1290 git-add--interactive.perl:1346 +#: add-patch.c:1291 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "Applicera dem på arbetskatalogen trots det? " -#: add-patch.c:1297 git-add--interactive.perl:1349 +#: add-patch.c:1298 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "Ingenting applicerades.\n" -#: add-patch.c:1354 +#: add-patch.c:1355 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -670,69 +670,69 @@ msgstr "" "e - redigera aktuellt stycke manuellt\n" "? - visa hjälp\n" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1517 add-patch.c:1527 msgid "No previous hunk" msgstr "Inget föregående stycke" -#: add-patch.c:1521 add-patch.c:1531 +#: add-patch.c:1522 add-patch.c:1532 msgid "No next hunk" msgstr "Inget följande stycke" -#: add-patch.c:1537 +#: add-patch.c:1538 msgid "No other hunks to goto" msgstr "Inga andra stycken att gå till" -#: add-patch.c:1548 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " msgstr "gå till vilket stycke (<ret> för att se fler)? " -#: add-patch.c:1549 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "gå till vilket stycke? " -#: add-patch.c:1560 +#: add-patch.c:1561 #, c-format msgid "Invalid number: '%s'" msgstr "Ogiltigt siffervärde: \"%s\"" -#: add-patch.c:1565 +#: add-patch.c:1566 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "Beklagar, det finns bara %d stycke." msgstr[1] "Beklagar, det finns bara %d stycken." -#: add-patch.c:1574 +#: add-patch.c:1575 msgid "No other hunks to search" msgstr "Inga andra stycken att söka efter" -#: add-patch.c:1580 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "sök efter reguljärt uttryck? " -#: add-patch.c:1595 +#: add-patch.c:1596 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Felaktigt format på reguljärt sökuttryck %s: %s" -#: add-patch.c:1612 +#: add-patch.c:1613 msgid "No hunk matches the given pattern" msgstr "Inga stycken motsvarar givet mönster" -#: add-patch.c:1619 +#: add-patch.c:1620 msgid "Sorry, cannot split this hunk" msgstr "Beklagar, kan inte dela stycket" -#: add-patch.c:1623 +#: add-patch.c:1624 #, c-format msgid "Split into %d hunks." msgstr "Dela i %d stycken." -#: add-patch.c:1627 +#: add-patch.c:1628 msgid "Sorry, cannot edit this hunk" msgstr "Beklagar, kan inte redigera stycket" -#: add-patch.c:1679 +#: add-patch.c:1680 msgid "'git apply' failed" msgstr "\"git apply\" misslyckades" @@ -1189,8 +1189,8 @@ msgstr "%s: fel typ" msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 -#: read-cache.c:1351 +#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892 +#: read-cache.c:1353 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg \"%s\"" @@ -1280,7 +1280,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:4376 builtin/bisect--helper.c:523 +#: apply.c:4376 builtin/bisect--helper.c:525 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" @@ -1370,7 +1370,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:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" @@ -1382,7 +1382,7 @@ msgstr "tillämpa inte ändringar som motsvarar given sökväg" msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:5000 builtin/am.c:2317 +#: apply.c:5000 builtin/am.c:2318 msgid "num" msgstr "antal" @@ -1448,9 +1448,9 @@ msgstr "sökvägar avdelas med NUL-tecken" msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 +#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991 #: builtin/rebase.c:1347 msgid "action" msgstr "åtgärd" @@ -1480,8 +1480,8 @@ msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" #: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 -#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 -#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "var pratsam" @@ -1493,7 +1493,7 @@ msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:5059 builtin/am.c:2305 +#: apply.c:5059 builtin/am.c:2306 msgid "root" msgstr "rot" @@ -1535,7 +1535,7 @@ msgstr "sökvägen är inte giltig UTF-8: %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s" -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" @@ -1570,13 +1570,13 @@ msgid "cannot read %s" msgstr "kan inte läsa %s" #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 -#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 +#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833 #: builtin/merge.c:1143 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 +#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -1618,7 +1618,7 @@ msgstr "fmt" msgid "archive format" msgstr "arkivformat" -#: archive.c:553 builtin/log.c:1772 +#: archive.c:553 builtin/log.c:1775 msgid "prefix" msgstr "prefix" @@ -1629,7 +1629,7 @@ msgstr "lägg till prefix till varje sökväg i arkivet" #: archive.c:555 archive.c:558 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:922 builtin/hash-object.c:105 +#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105 #: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" @@ -1660,7 +1660,7 @@ msgid "list supported archive formats" msgstr "visa understödda arkivformat" #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "arkiv" @@ -1668,7 +1668,7 @@ msgstr "arkiv" msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717 #: builtin/notes.c:498 msgid "command" msgstr "kommando" @@ -1855,11 +1855,11 @@ msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 -#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 -#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 -#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 -#: builtin/pack-objects.c:3661 builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414 +#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346 +#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806 +#: builtin/pack-objects.c:3821 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -2023,118 +2023,118 @@ msgstr "\"%s\" är redan utcheckad på \"%s\"" msgid "HEAD of working tree %s is not updated" msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" -#: bundle.c:41 +#: bundle.c:44 #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "okänd hashningsalgoritm för paket (bundle): \"%s\"" -#: bundle.c:45 +#: bundle.c:48 #, c-format msgid "unknown capability '%s'" msgstr "okänd kapabilitet \"%s\"" -#: bundle.c:71 +#: bundle.c:74 #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "'%s' ser inte ut som en v2- eller v3-paket-fil (bundle)" -#: bundle.c:110 +#: bundle.c:113 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 #: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" -#: bundle.c:189 +#: bundle.c:198 msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:192 +#: bundle.c:201 msgid "need a repository to verify a bundle" msgstr "behöver ett arkiv för att verifiera ett paket (bundle)." -#: bundle.c:243 +#: bundle.c:257 #, 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:250 +#: bundle.c:264 msgid "The bundle records a complete history." msgstr "Paketet (bundlen) beskriver en komplett historik." -#: bundle.c:252 +#: bundle.c:266 #, 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:319 +#: bundle.c:333 msgid "unable to dup bundle descriptor" msgstr "kan inte duplicera pakethandtag" -#: bundle.c:326 +#: bundle.c:340 msgid "Could not spawn pack-objects" msgstr "Kunde inte starta pack-objects" -#: bundle.c:337 +#: bundle.c:351 msgid "pack-objects died" msgstr "pack-objects misslyckades" -#: bundle.c:386 +#: bundle.c:400 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:490 +#: bundle.c:504 #, c-format msgid "unsupported bundle version %d" msgstr "version %d för paket (bundle) stöds ej" -#: bundle.c:492 +#: bundle.c:506 #, 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:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" -#: bundle.c:539 +#: bundle.c:553 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." -#: bundle.c:549 +#: bundle.c:563 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:574 +#: bundle.c:588 msgid "index-pack died" msgstr "index-pack dog" -#: chunk-format.c:113 +#: chunk-format.c:117 msgid "terminating chunk id appears earlier than expected" msgstr "avslutande stycke-id förekommer tidigare än förväntat" -#: chunk-format.c:122 +#: chunk-format.c:126 #, c-format msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" msgstr "felaktigt stycke-offset %<PRIx64> och %<PRIx64>" -#: chunk-format.c:129 +#: chunk-format.c:133 #, c-format msgid "duplicate chunk ID %<PRIx32> found" msgstr "dubblerat stycke-ID %<PRIx32> upptäckt" -#: chunk-format.c:143 +#: chunk-format.c:147 #, c-format msgid "final chunk has non-zero id %<PRIx32>" msgstr "avslutande stycke har id %<PRIx32> som inte är noll" @@ -2202,12 +2202,12 @@ msgstr "kunde inte hitta incheckningen %s" msgid "commit-graph requires overflow generation data but has none" msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen" -#: commit-graph.c:1075 builtin/am.c:1340 +#: commit-graph.c:1075 builtin/am.c:1341 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: commit-graph.c:1337 builtin/pack-objects.c:2897 +#: commit-graph.c:1337 builtin/pack-objects.c:3057 #, c-format msgid "unable to get type of object %s" msgstr "kunde inte hämta typ för objektet %s" @@ -2269,7 +2269,7 @@ msgstr "Söker ytterligare kanter i incheckingsgraf" msgid "failed to write correct number of base graph ids" msgstr "kunde inte skriva korrekt antal bas-graf-id:n" -#: commit-graph.c:1812 midx.c:906 +#: commit-graph.c:1812 midx.c:911 #, c-format msgid "unable to create leading directories of %s" msgstr "kunde inte skapa inledande kataloger för %s" @@ -2319,59 +2319,60 @@ msgstr "" msgid "too many commits to write graph" msgstr "för många incheckningar för att skriva graf" -#: commit-graph.c:2450 +#: commit-graph.c:2449 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -"filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig" +"filen med incheckningsgraf har felaktig kontrollsumma och är troligtvis " +"trasig" -#: commit-graph.c:2460 +#: commit-graph.c:2459 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s" -#: commit-graph.c:2470 commit-graph.c:2485 +#: commit-graph.c:2469 commit-graph.c:2484 #, 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:2477 +#: commit-graph.c:2476 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "kunde inte tolka incheckning %s från incheckningsgraf" -#: commit-graph.c:2495 +#: commit-graph.c:2494 msgid "Verifying commits in commit graph" msgstr "Bekräftar incheckningar i incheckningsgrafen" -#: commit-graph.c:2510 +#: commit-graph.c:2509 #, 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:2517 +#: commit-graph.c:2516 #, 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:2527 +#: commit-graph.c:2526 #, 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:2536 +#: commit-graph.c:2535 #, 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:2550 +#: commit-graph.c:2549 #, 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:2555 +#: commit-graph.c:2554 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2379,7 +2380,7 @@ msgstr "" "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-" "noll på annan plats" -#: commit-graph.c:2559 +#: commit-graph.c:2558 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2387,22 +2388,22 @@ msgstr "" "incheckningsgrafen har generationsnummer skilt från noll för incheckningen " "%s, men noll på annan plats" -#: commit-graph.c:2576 +#: commit-graph.c:2575 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "" "incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < " "%<PRIuMAX>" -#: commit-graph.c:2582 +#: commit-graph.c:2581 #, 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:3088 builtin/am.c:371 builtin/am.c:416 -#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417 +#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -2693,7 +2694,7 @@ msgstr "felformat värde för %s: %s" 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:1687 builtin/pack-objects.c:3924 +#: config.c:1687 builtin/pack-objects.c:4084 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" @@ -2713,110 +2714,111 @@ msgstr "referensen \"%s\" pekar inte på en blob" msgid "unable to resolve config blob '%s'" msgstr "kan inte slå upp konfigurerings-bloben \"%s\"" -#: config.c:1873 +#: config.c:1874 #, c-format msgid "failed to parse %s" msgstr "kunde inte tolka %s" -#: config.c:1929 +#: config.c:1930 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:2293 +#: config.c:2294 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2467 +#: config.c:2468 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2512 +#: config.c:2513 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" -msgstr "värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100" +msgstr "" +"värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100" -#: config.c:2558 +#: config.c:2559 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2560 +#: config.c:2561 #, 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:2644 +#: config.c:2645 #, c-format msgid "invalid section name '%s'" msgstr "felaktigt sektionsnamn \"%s\"" -#: config.c:2676 +#: config.c:2677 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2705 +#: config.c:2706 #, c-format msgid "failed to write new configuration file %s" msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" -#: config.c:2957 config.c:3283 +#: config.c:2958 config.c:3285 #, c-format msgid "could not lock config file %s" msgstr "kunde inte låsa konfigurationsfilen %s" -#: config.c:2968 +#: config.c:2969 #, c-format msgid "opening %s" msgstr "öppnar %s" -#: config.c:3005 builtin/config.c:361 +#: config.c:3006 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "ogiltigt mönster: %s" -#: config.c:3030 +#: config.c:3031 #, c-format msgid "invalid config file %s" msgstr "ogiltig konfigurationsfil: \"%s\"" -#: config.c:3043 config.c:3296 +#: config.c:3044 config.c:3298 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:3054 +#: config.c:3055 #, c-format -msgid "unable to mmap '%s'" -msgstr "kunde inte utföra mmap på \"%s\"" +msgid "unable to mmap '%s'%s" +msgstr "kunde inte utföra mmap på \"%s\"%s" -#: config.c:3063 config.c:3301 +#: config.c:3065 config.c:3303 #, c-format msgid "chmod on %s failed" msgstr "chmod misslyckades på %s" -#: config.c:3148 config.c:3398 +#: config.c:3150 config.c:3400 #, c-format msgid "could not write config file %s" msgstr "kunde inte skriva konfigurationsfilen %s" -#: config.c:3182 +#: config.c:3184 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3186 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:3274 +#: config.c:3276 #, c-format msgid "invalid section name: %s" msgstr "felaktigt namn på stycke: %s" -#: config.c:3441 +#: config.c:3443 #, c-format msgid "missing value for '%s'" msgstr "värde saknas för \"%s\"" @@ -2995,7 +2997,7 @@ msgstr "kunde inte grena (fork)" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" @@ -3259,36 +3261,36 @@ msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)" msgid "Marked %d islands, done.\n" msgstr "Markerade %d öar, klar.\n" -#: diff-merges.c:80 +#: diff-merges.c:70 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "okänt värde för --diff-merges: %s" -#: diff-lib.c:538 +#: diff-lib.c:557 msgid "--merge-base does not work with ranges" msgstr "--merge-base fungerar inte med intervall" -#: diff-lib.c:540 +#: diff-lib.c:559 msgid "--merge-base only works with commits" msgstr "--merge-base fungerar bara med incheckningar" -#: diff-lib.c:557 +#: diff-lib.c:576 msgid "unable to get HEAD" msgstr "kan inte hämta HEAD" -#: diff-lib.c:564 +#: diff-lib.c:583 msgid "no merge base found" msgstr "ingen sammanslagningsbas hittades" -#: diff-lib.c:566 +#: diff-lib.c:585 msgid "multiple merge bases found" msgstr "flera sammanslagningsbaser hittades" -#: diff-no-index.c:238 +#: diff-no-index.c:237 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<flaggor>] <sökväg> <sökväg>" -#: diff-no-index.c:263 +#: diff-no-index.c:262 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" @@ -3346,35 +3348,50 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:4278 +#: diff.c:4282 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4630 +#: diff.c:4634 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:4633 +#: diff.c:4637 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S och --find-object är ömsesidigt uteslutande" -#: diff.c:4712 +#: diff.c:4640 +msgid "" +"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" +msgstr "" +"-G och --pickaxe-regex är ömsesidigt uteslutande, använd --pickaxe-regex med " +"-S" + +#: diff.c:4643 +msgid "" +"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +"with -G and -S" +msgstr "" +"---pickaxe-all och --find-object är ömsesidigt uteslutande, använd --pickaxe-" +"all med -G och -S" + +#: diff.c:4722 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:4760 +#: diff.c:4770 #, c-format msgid "invalid --stat value: %s" msgstr "ogiltigt värde för --stat: %s" -#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 +#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s förväntar ett numeriskt värde" -#: diff.c:4797 +#: diff.c:4807 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3383,42 +3400,42 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4882 +#: diff.c:4892 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s" -#: diff.c:4906 +#: diff.c:4916 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "okänt värde efter ws-error-highlight=%.*s" -#: diff.c:4920 +#: diff.c:4930 #, c-format msgid "unable to resolve '%s'" msgstr "kunde inte slå upp \"%s\"" -#: diff.c:4970 diff.c:4976 +#: diff.c:4980 diff.c:4986 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s förväntar formen <n>/<m>" -#: diff.c:4988 +#: diff.c:4998 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s förväntar ett tecken, fick \"%s\"" -#: diff.c:5009 +#: diff.c:5019 #, c-format msgid "bad --color-moved argument: %s" msgstr "felaktigt argument till --color-moved: %s" -#: diff.c:5028 +#: diff.c:5038 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "ogiltigt läge %s\" i --color-moved-ws" -#: diff.c:5068 +#: diff.c:5078 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3426,154 +3443,154 @@ msgstr "" "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och " "\"histogram\"" -#: diff.c:5104 diff.c:5124 +#: diff.c:5114 diff.c:5134 #, c-format msgid "invalid argument to %s" msgstr "ogiltigt argument för %s" -#: diff.c:5228 +#: diff.c:5238 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\"" -#: diff.c:5277 +#: diff.c:5287 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:5333 +#: diff.c:5343 #, c-format msgid "bad --word-diff argument: %s" msgstr "felaktigt argument --word-diff: %s" -#: diff.c:5369 +#: diff.c:5379 msgid "Diff output format options" msgstr "Formatflaggor för diff-utdata" -#: diff.c:5371 diff.c:5377 +#: diff.c:5381 diff.c:5387 msgid "generate patch" msgstr "skapar patch" -#: diff.c:5374 builtin/log.c:179 +#: diff.c:5384 builtin/log.c:179 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: diff.c:5379 diff.c:5493 diff.c:5500 +#: diff.c:5389 diff.c:5503 diff.c:5510 msgid "<n>" |